From 835d64d797411141a1b21948566651d6dace882e Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Sat, 16 Jan 2021 19:29:47 +0000
Subject: [PATCH 001/713] Initial draft for TensorAlgebra

---
 .gitignore                                    |  1 +
 .../kmath/structures/TensorAlgebra.kt         | 49 +++++++++++++++++++
 .../kmath/structures/TensorStructure.kt       | 11 +++++
 3 files changed, 61 insertions(+)
 create mode 100644 kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorAlgebra.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorStructure.kt

diff --git a/.gitignore b/.gitignore
index bade7f08c..ea8e65fb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 build/
 out/
 .idea/
+.vscode/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
diff --git a/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorAlgebra.kt
new file mode 100644
index 000000000..f960742ee
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorAlgebra.kt
@@ -0,0 +1,49 @@
+package kscience.kmath.structures
+
+
+import kscience.kmath.operations.*
+
+public interface TensorAlgebra<T, TorchTensorType : TensorStructure<T>> : Ring<TorchTensorType> {
+
+    public operator fun T.plus(other: TorchTensorType): TorchTensorType
+    public operator fun TorchTensorType.plus(value: T): TorchTensorType
+    public operator fun TorchTensorType.plusAssign(value: T): Unit
+    public operator fun TorchTensorType.plusAssign(b: TorchTensorType): Unit
+
+    public operator fun T.minus(other: TorchTensorType): TorchTensorType
+    public operator fun TorchTensorType.minus(value: T): TorchTensorType
+    public operator fun TorchTensorType.minusAssign(value: T): Unit
+    public operator fun TorchTensorType.minusAssign(b: TorchTensorType): Unit
+
+    public operator fun T.times(other: TorchTensorType): TorchTensorType
+    public operator fun TorchTensorType.times(value: T): TorchTensorType
+    public operator fun TorchTensorType.timesAssign(value: T): Unit
+    public operator fun TorchTensorType.timesAssign(b: TorchTensorType): Unit
+
+    public infix fun TorchTensorType.dot(b: TorchTensorType): TorchTensorType
+
+    public fun diagonalEmbedding(
+        diagonalEntries: TorchTensorType,
+        offset: Int = 0, dim1: Int = -2, dim2: Int = -1
+    ): TorchTensorType
+
+    public fun TorchTensorType.transpose(i: Int, j: Int): TorchTensorType
+    public fun TorchTensorType.view(shape: IntArray): TorchTensorType
+
+    public fun TorchTensorType.abs(): TorchTensorType
+    public fun TorchTensorType.sum(): TorchTensorType
+
+}
+
+public interface TensorFieldAlgebra<T, TorchTensorType : TensorStructure<T>> :
+    TensorAlgebra<T, TorchTensorType>, Field<TorchTensorType> {
+
+    public operator fun TorchTensorType.divAssign(b: TorchTensorType)
+
+    public fun TorchTensorType.exp(): TorchTensorType
+    public fun TorchTensorType.log(): TorchTensorType
+
+    public fun TorchTensorType.svd(): Triple<TorchTensorType, TorchTensorType, TorchTensorType>
+    public fun TorchTensorType.symEig(eigenvectors: Boolean = true): Pair<TorchTensorType, TorchTensorType>
+
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorStructure.kt b/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorStructure.kt
new file mode 100644
index 000000000..6e3ac0b7b
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorStructure.kt
@@ -0,0 +1,11 @@
+package kscience.kmath.structures
+
+public abstract class TensorStructure<T>: MutableNDStructure<T> {
+
+    // A tensor can have empty shape, in which case it represents just a value
+    public abstract fun value(): T
+
+    // Tensors are mutable and might hold shared resources
+    override fun equals(other: Any?): Boolean = false
+    override fun hashCode(): Int = 0
+}
\ No newline at end of file
-- 
2.34.1


From ecf813803b04f55b602ad50d23d53d13e0b300cb Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 18 Jan 2021 07:57:13 +0000
Subject: [PATCH 002/713] Correcting terminology and failed connection to
 Algebra<T>

---
 .gitignore                                    |  3 +
 .../kmath/structures/TensorAlgebra.kt         | 99 +++++++++++--------
 .../kmath/structures/TensorStructure.kt       | 11 ---
 3 files changed, 62 insertions(+), 51 deletions(-)
 delete mode 100644 kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorStructure.kt

diff --git a/.gitignore b/.gitignore
index ea8e65fb4..f32005cd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ out/
 
 # Cache of project
 .gradletasknamecache
+
+# Generated by javac -h
+*.class
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorAlgebra.kt
index f960742ee..ca7619429 100644
--- a/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorAlgebra.kt
@@ -1,49 +1,68 @@
 package kscience.kmath.structures
 
-
-import kscience.kmath.operations.*
-
-public interface TensorAlgebra<T, TorchTensorType : TensorStructure<T>> : Ring<TorchTensorType> {
-
-    public operator fun T.plus(other: TorchTensorType): TorchTensorType
-    public operator fun TorchTensorType.plus(value: T): TorchTensorType
-    public operator fun TorchTensorType.plusAssign(value: T): Unit
-    public operator fun TorchTensorType.plusAssign(b: TorchTensorType): Unit
-
-    public operator fun T.minus(other: TorchTensorType): TorchTensorType
-    public operator fun TorchTensorType.minus(value: T): TorchTensorType
-    public operator fun TorchTensorType.minusAssign(value: T): Unit
-    public operator fun TorchTensorType.minusAssign(b: TorchTensorType): Unit
-
-    public operator fun T.times(other: TorchTensorType): TorchTensorType
-    public operator fun TorchTensorType.times(value: T): TorchTensorType
-    public operator fun TorchTensorType.timesAssign(value: T): Unit
-    public operator fun TorchTensorType.timesAssign(b: TorchTensorType): Unit
-
-    public infix fun TorchTensorType.dot(b: TorchTensorType): TorchTensorType
-
-    public fun diagonalEmbedding(
-        diagonalEntries: TorchTensorType,
-        offset: Int = 0, dim1: Int = -2, dim2: Int = -1
-    ): TorchTensorType
-
-    public fun TorchTensorType.transpose(i: Int, j: Int): TorchTensorType
-    public fun TorchTensorType.view(shape: IntArray): TorchTensorType
-
-    public fun TorchTensorType.abs(): TorchTensorType
-    public fun TorchTensorType.sum(): TorchTensorType
-
+public interface TensorStructure<T> : MutableNDStructure<T> {
+    // A tensor can have empty shape, in which case it represents just a value
+    public abstract fun value(): T
 }
 
-public interface TensorFieldAlgebra<T, TorchTensorType : TensorStructure<T>> :
-    TensorAlgebra<T, TorchTensorType>, Field<TorchTensorType> {
+// https://proofwiki.org/wiki/Definition:Algebra_over_Ring
 
-    public operator fun TorchTensorType.divAssign(b: TorchTensorType)
+public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
-    public fun TorchTensorType.exp(): TorchTensorType
-    public fun TorchTensorType.log(): TorchTensorType
+    public operator fun T.plus(other: TensorType): TensorType
+    public operator fun TensorType.plus(value: T): TensorType
+    public operator fun TensorType.plus(other: TensorType): TensorType
+    public operator fun TensorType.plusAssign(value: T): Unit
+    public operator fun TensorType.plusAssign(other: TensorType): Unit
 
-    public fun TorchTensorType.svd(): Triple<TorchTensorType, TorchTensorType, TorchTensorType>
-    public fun TorchTensorType.symEig(eigenvectors: Boolean = true): Pair<TorchTensorType, TorchTensorType>
+    public operator fun T.minus(other: TensorType): TensorType
+    public operator fun TensorType.minus(value: T): TensorType
+    public operator fun TensorType.minus(other: TensorType): TensorType
+    public operator fun TensorType.minusAssign(value: T): Unit
+    public operator fun TensorType.minusAssign(other: TensorType): Unit
+
+    public operator fun T.times(other: TensorType): TensorType
+    public operator fun TensorType.times(value: T): TensorType
+    public operator fun TensorType.times(other: TensorType): TensorType
+    public operator fun TensorType.timesAssign(value: T): Unit
+    public operator fun TensorType.timesAssign(other: TensorType): Unit
+    public operator fun TensorType.unaryMinus(): TensorType
+
+
+    public infix fun TensorType.dot(other: TensorType): TensorType
+    public infix fun TensorType.dotAssign(other: TensorType): Unit
+    public infix fun TensorType.dotRightAssign(other: TensorType): Unit
+
+    public fun diagonalEmbedding(
+        diagonalEntries: TensorType,
+        offset: Int = 0, dim1: Int = -2, dim2: Int = -1
+    ): TensorType
+
+    public fun TensorType.transpose(i: Int, j: Int): TensorType
+    public fun TensorType.transposeAssign(i: Int, j: Int): Unit
+
+    public fun TensorType.view(shape: IntArray): TensorType
+
+    public fun TensorType.abs(): TensorType
+    public fun TensorType.absAssign(): Unit
+    public fun TensorType.sum(): TensorType
+    public fun TensorType.sumAssign(): Unit
+}
+
+// https://proofwiki.org/wiki/Definition:Division_Algebra
+
+public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>> :
+    TensorAlgebra<T, TensorType> {
+
+    public operator fun TensorType.div(other: TensorType): TensorType
+    public operator fun TensorType.divAssign(other: TensorType)
+
+    public fun TensorType.exp(): TensorType
+    public fun TensorType.expAssign(): Unit
+    public fun TensorType.log(): TensorType
+    public fun TensorType.logAssign(): Unit
+
+    public fun TensorType.svd(): Triple<TensorType, TensorType, TensorType>
+    public fun TensorType.symEig(eigenvectors: Boolean = true): Pair<TensorType, TensorType>
 
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorStructure.kt b/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorStructure.kt
deleted file mode 100644
index 6e3ac0b7b..000000000
--- a/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorStructure.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package kscience.kmath.structures
-
-public abstract class TensorStructure<T>: MutableNDStructure<T> {
-
-    // A tensor can have empty shape, in which case it represents just a value
-    public abstract fun value(): T
-
-    // Tensors are mutable and might hold shared resources
-    override fun equals(other: Any?): Boolean = false
-    override fun hashCode(): Int = 0
-}
\ No newline at end of file
-- 
2.34.1


From 360e0e17e94d997088915fda214a663a0928bfb9 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 19 Jan 2021 22:24:42 +0300
Subject: [PATCH 003/713] Minor optimization for RealNDAlgebra

---
 .../ast/ExpressionsInterpretersBenchmark.kt   |  4 +-
 .../kscience/kmath/benchmarks/DotBenchmark.kt | 20 ++++-----
 .../kmath/benchmarks/LargeNDBenchmark.kt      | 25 -----------
 .../benchmarks/LinearAlgebraBenchmark.kt      |  8 +---
 .../FunctionalExpressionAlgebra.kt            |  5 ++-
 .../kscience/kmath/linear/LupDecomposition.kt |  1 +
 .../kscience/kmath/operations/Complex.kt      |  2 +
 .../kscience/kmath/structures/RealNDField.kt  | 41 +++++++++----------
 .../kscience/kmath/linear/MatrixTest.kt       |  1 +
 .../kmath/structures/NumberNDFieldTest.kt     |  1 +
 .../kscience/dimensions/DMatrixContextTest.kt |  1 +
 11 files changed, 42 insertions(+), 67 deletions(-)
 delete mode 100644 examples/src/benchmarks/kotlin/kscience/kmath/benchmarks/LargeNDBenchmark.kt

diff --git a/examples/src/benchmarks/kotlin/kscience/kmath/ast/ExpressionsInterpretersBenchmark.kt b/examples/src/benchmarks/kotlin/kscience/kmath/ast/ExpressionsInterpretersBenchmark.kt
index 6acaca84d..c5edcdedf 100644
--- a/examples/src/benchmarks/kotlin/kscience/kmath/ast/ExpressionsInterpretersBenchmark.kt
+++ b/examples/src/benchmarks/kotlin/kscience/kmath/ast/ExpressionsInterpretersBenchmark.kt
@@ -28,7 +28,7 @@ internal class ExpressionsInterpretersBenchmark {
     @Benchmark
     fun mstExpression() {
         val expr = algebra.mstInField {
-            symbol("x") * number(2.0) + number(2.0) / symbol("x") - number(16.0)
+            symbol("x") * 2.0 + 2.0 / symbol("x") - 16.0
         }
 
         invokeAndSum(expr)
@@ -37,7 +37,7 @@ internal class ExpressionsInterpretersBenchmark {
     @Benchmark
     fun asmExpression() {
         val expr = algebra.mstInField {
-            symbol("x") * number(2.0) + number(2.0) / symbol("x") - number(16.0)
+            symbol("x") * 2.0 + 2.0 / symbol("x") - 16.0
         }.compile()
 
         invokeAndSum(expr)
diff --git a/examples/src/benchmarks/kotlin/kscience/kmath/benchmarks/DotBenchmark.kt b/examples/src/benchmarks/kotlin/kscience/kmath/benchmarks/DotBenchmark.kt
index 8823e86db..5c59afaee 100644
--- a/examples/src/benchmarks/kotlin/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/examples/src/benchmarks/kotlin/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -2,9 +2,8 @@ package kscience.kmath.benchmarks
 
 import kotlinx.benchmark.Benchmark
 import kscience.kmath.commons.linear.CMMatrixContext
-import kscience.kmath.commons.linear.toCM
 import kscience.kmath.ejml.EjmlMatrixContext
-import kscience.kmath.ejml.toEjml
+
 import kscience.kmath.linear.BufferMatrixContext
 import kscience.kmath.linear.RealMatrixContext
 import kscience.kmath.linear.real
@@ -26,11 +25,11 @@ class DotBenchmark {
         val matrix1 = Matrix.real(dim, dim) { i, j -> if (i <= j) random.nextDouble() else 0.0 }
         val matrix2 = Matrix.real(dim, dim) { i, j -> if (i <= j) random.nextDouble() else 0.0 }
 
-        val cmMatrix1 = matrix1.toCM()
-        val cmMatrix2 = matrix2.toCM()
+        val cmMatrix1 = CMMatrixContext { matrix1.toCM() }
+        val cmMatrix2 = CMMatrixContext { matrix2.toCM() }
 
-        val ejmlMatrix1 = matrix1.toEjml()
-        val ejmlMatrix2 = matrix2.toEjml()
+        val ejmlMatrix1 = EjmlMatrixContext { matrix1.toEjml() }
+        val ejmlMatrix2 = EjmlMatrixContext { matrix2.toEjml() }
     }
 
     @Benchmark
@@ -49,22 +48,23 @@ class DotBenchmark {
 
     @Benchmark
     fun ejmlMultiplicationwithConversion() {
-        val ejmlMatrix1 = matrix1.toEjml()
-        val ejmlMatrix2 = matrix2.toEjml()
         EjmlMatrixContext {
+            val ejmlMatrix1 = matrix1.toEjml()
+            val ejmlMatrix2 = matrix2.toEjml()
+
             ejmlMatrix1 dot ejmlMatrix2
         }
     }
 
     @Benchmark
     fun bufferedMultiplication() {
-        BufferMatrixContext(RealField, Buffer.Companion::real).invoke{
+        BufferMatrixContext(RealField, Buffer.Companion::real).invoke {
             matrix1 dot matrix2
         }
     }
 
     @Benchmark
-    fun realMultiplication(){
+    fun realMultiplication() {
         RealMatrixContext {
             matrix1 dot matrix2
         }
diff --git a/examples/src/benchmarks/kotlin/kscience/kmath/benchmarks/LargeNDBenchmark.kt b/examples/src/benchmarks/kotlin/kscience/kmath/benchmarks/LargeNDBenchmark.kt
deleted file mode 100644
index 395fde619..000000000
--- a/examples/src/benchmarks/kotlin/kscience/kmath/benchmarks/LargeNDBenchmark.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package kscience.kmath.benchmarks
-
-import kscience.kmath.structures.NDField
-import org.openjdk.jmh.annotations.Benchmark
-import org.openjdk.jmh.annotations.Scope
-import org.openjdk.jmh.annotations.State
-import org.openjdk.jmh.infra.Blackhole
-import kotlin.random.Random
-
-@State(Scope.Benchmark)
-class LargeNDBenchmark {
-    val arraySize = 10000
-    val RANDOM = Random(222)
-    val src1 = DoubleArray(arraySize) { RANDOM.nextDouble() }
-    val src2 = DoubleArray(arraySize) { RANDOM.nextDouble() }
-    val field = NDField.real(arraySize)
-    val kmathArray1 = field.produce { (a) -> src1[a] }
-    val kmathArray2 = field.produce { (a) -> src2[a] }
-
-    @Benchmark
-    fun test10000(bh: Blackhole) {
-        bh.consume(field.add(kmathArray1, kmathArray2))
-    }
-
-}
\ No newline at end of file
diff --git a/examples/src/benchmarks/kotlin/kscience/kmath/benchmarks/LinearAlgebraBenchmark.kt b/examples/src/benchmarks/kotlin/kscience/kmath/benchmarks/LinearAlgebraBenchmark.kt
index ec8714617..5ff43ef80 100644
--- a/examples/src/benchmarks/kotlin/kscience/kmath/benchmarks/LinearAlgebraBenchmark.kt
+++ b/examples/src/benchmarks/kotlin/kscience/kmath/benchmarks/LinearAlgebraBenchmark.kt
@@ -5,10 +5,8 @@ import kotlinx.benchmark.Benchmark
 import kscience.kmath.commons.linear.CMMatrixContext
 import kscience.kmath.commons.linear.CMMatrixContext.dot
 import kscience.kmath.commons.linear.inverse
-import kscience.kmath.commons.linear.toCM
 import kscience.kmath.ejml.EjmlMatrixContext
 import kscience.kmath.ejml.inverse
-import kscience.kmath.ejml.toEjml
 import kscience.kmath.operations.invoke
 import kscience.kmath.structures.Matrix
 import org.openjdk.jmh.annotations.Scope
@@ -35,16 +33,14 @@ class LinearAlgebraBenchmark {
     @Benchmark
     fun cmLUPInversion() {
         CMMatrixContext {
-            val cm = matrix.toCM()             //avoid overhead on conversion
-            inverse(cm)
+            inverse(matrix)
         }
     }
 
     @Benchmark
     fun ejmlInverse() {
         EjmlMatrixContext {
-            val km = matrix.toEjml()      //avoid overhead on conversion
-            inverse(km)
+            inverse(matrix)
         }
     }
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt b/kmath-core/src/commonMain/kotlin/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
index 880a4e34c..1a3668855 100644
--- a/kmath-core/src/commonMain/kotlin/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
@@ -95,8 +95,9 @@ public open class FunctionalExpressionRing<T, A : Ring<T>>(
         super<FunctionalExpressionSpace>.binaryOperationFunction(operation)
 }
 
-public open class FunctionalExpressionField<T, A : Field<T>>(algebra: A) :
-    FunctionalExpressionRing<T, A>(algebra), Field<Expression<T>> {
+public open class FunctionalExpressionField<T, A : Field<T>>(
+    algebra: A,
+) : FunctionalExpressionRing<T, A>(algebra), Field<Expression<T>> {
     /**
      * Builds an Expression of division an expression by another one.
      */
diff --git a/kmath-core/src/commonMain/kotlin/kscience/kmath/linear/LupDecomposition.kt b/kmath-core/src/commonMain/kotlin/kscience/kmath/linear/LupDecomposition.kt
index f4f998da2..5cf7c8f70 100644
--- a/kmath-core/src/commonMain/kotlin/kscience/kmath/linear/LupDecomposition.kt
+++ b/kmath-core/src/commonMain/kotlin/kscience/kmath/linear/LupDecomposition.kt
@@ -224,6 +224,7 @@ public inline fun <reified T : Comparable<T>, F : Field<T>> GenericMatrixContext
 ): Matrix<T> = solveWithLUP(matrix, one(matrix.rowNum, matrix.colNum), bufferFactory, checkSingular)
 
 
+@OptIn(UnstableKMathAPI::class)
 public fun RealMatrixContext.solveWithLUP(a: Matrix<Double>, b: Matrix<Double>): Matrix<Double> {
     // Use existing decomposition if it is provided by matrix
     val bufferFactory: MutableBufferFactory<Double> = MutableBuffer.Companion::real
diff --git a/kmath-core/src/commonMain/kotlin/kscience/kmath/operations/Complex.kt b/kmath-core/src/commonMain/kotlin/kscience/kmath/operations/Complex.kt
index 5695e6696..c6409c015 100644
--- a/kmath-core/src/commonMain/kotlin/kscience/kmath/operations/Complex.kt
+++ b/kmath-core/src/commonMain/kotlin/kscience/kmath/operations/Complex.kt
@@ -3,6 +3,7 @@ package kscience.kmath.operations
 import kscience.kmath.memory.MemoryReader
 import kscience.kmath.memory.MemorySpec
 import kscience.kmath.memory.MemoryWriter
+import kscience.kmath.misc.UnstableKMathAPI
 import kscience.kmath.structures.Buffer
 import kscience.kmath.structures.MemoryBuffer
 import kscience.kmath.structures.MutableBuffer
@@ -41,6 +42,7 @@ private val PI_DIV_2 = Complex(PI / 2, 0)
 /**
  * A field of [Complex].
  */
+@OptIn(UnstableKMathAPI::class)
 public object ComplexField : ExtendedField<Complex>, Norm<Complex, Complex>, RingWithNumbers<Complex> {
     override val zero: Complex = 0.0.toComplex()
     override val one: Complex = 1.0.toComplex()
diff --git a/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/RealNDField.kt b/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/RealNDField.kt
index 3eb1dc4ca..60e6de440 100644
--- a/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/RealNDField.kt
+++ b/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/RealNDField.kt
@@ -11,7 +11,7 @@ public typealias RealNDElement = BufferedNDFieldElement<Double, RealField>
 public class RealNDField(override val shape: IntArray) :
     BufferedNDField<Double, RealField>,
     ExtendedNDField<Double, RealField, NDBuffer<Double>>,
-    RingWithNumbers<NDBuffer<Double>>{
+    RingWithNumbers<NDBuffer<Double>> {
 
     override val strides: Strides = DefaultStrides(shape)
 
@@ -24,35 +24,31 @@ public class RealNDField(override val shape: IntArray) :
         return produce { d }
     }
 
-    private inline fun buildBuffer(size: Int, crossinline initializer: (Int) -> Double): Buffer<Double> =
-        RealBuffer(DoubleArray(size) { initializer(it) })
-
-    /**
-     * Inline transform an NDStructure to
-     */
-    override fun map(
+    @Suppress("OVERRIDE_BY_INLINE")
+    override inline fun map(
         arg: NDBuffer<Double>,
-        transform: RealField.(Double) -> Double
+        transform: RealField.(Double) -> Double,
     ): RealNDElement {
         check(arg)
-        val array = buildBuffer(arg.strides.linearSize) { offset -> RealField.transform(arg.buffer[offset]) }
+        val array = RealBuffer(arg.strides.linearSize) { offset -> RealField.transform(arg.buffer[offset]) }
         return BufferedNDFieldElement(this, array)
     }
 
-    override fun produce(initializer: RealField.(IntArray) -> Double): RealNDElement {
-        val array = buildBuffer(strides.linearSize) { offset -> elementContext.initializer(strides.index(offset)) }
+    @Suppress("OVERRIDE_BY_INLINE")
+    override inline fun produce(initializer: RealField.(IntArray) -> Double): RealNDElement {
+        val array = RealBuffer(strides.linearSize) { offset -> elementContext.initializer(strides.index(offset)) }
         return BufferedNDFieldElement(this, array)
     }
 
-    override fun mapIndexed(
+    @Suppress("OVERRIDE_BY_INLINE")
+    override inline fun mapIndexed(
         arg: NDBuffer<Double>,
-        transform: RealField.(index: IntArray, Double) -> Double
+        transform: RealField.(index: IntArray, Double) -> Double,
     ): RealNDElement {
         check(arg)
-
         return BufferedNDFieldElement(
             this,
-            buildBuffer(arg.strides.linearSize) { offset ->
+            RealBuffer(arg.strides.linearSize) { offset ->
                 elementContext.transform(
                     arg.strides.index(offset),
                     arg.buffer[offset]
@@ -60,16 +56,17 @@ public class RealNDField(override val shape: IntArray) :
             })
     }
 
-    override fun combine(
+    @Suppress("OVERRIDE_BY_INLINE")
+    override inline fun combine(
         a: NDBuffer<Double>,
         b: NDBuffer<Double>,
-        transform: RealField.(Double, Double) -> Double
+        transform: RealField.(Double, Double) -> Double,
     ): RealNDElement {
         check(a, b)
-        return BufferedNDFieldElement(
-            this,
-            buildBuffer(strides.linearSize) { offset -> elementContext.transform(a.buffer[offset], b.buffer[offset]) }
-        )
+        val buffer = RealBuffer(strides.linearSize) { offset ->
+            elementContext.transform(a.buffer[offset], b.buffer[offset])
+        }
+        return BufferedNDFieldElement(this, buffer)
     }
 
     override fun NDBuffer<Double>.toElement(): FieldElement<NDBuffer<Double>, *, out BufferedNDField<Double, RealField>> =
diff --git a/kmath-core/src/commonTest/kotlin/kscience/kmath/linear/MatrixTest.kt b/kmath-core/src/commonTest/kotlin/kscience/kmath/linear/MatrixTest.kt
index 0a582e339..d7755dcb5 100644
--- a/kmath-core/src/commonTest/kotlin/kscience/kmath/linear/MatrixTest.kt
+++ b/kmath-core/src/commonTest/kotlin/kscience/kmath/linear/MatrixTest.kt
@@ -7,6 +7,7 @@ import kscience.kmath.structures.as2D
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
+@Suppress("UNUSED_VARIABLE")
 class MatrixTest {
     @Test
     fun testTranspose() {
diff --git a/kmath-core/src/commonTest/kotlin/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/kscience/kmath/structures/NumberNDFieldTest.kt
index f5e008ef3..22a0d3629 100644
--- a/kmath-core/src/commonTest/kotlin/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -8,6 +8,7 @@ import kotlin.math.pow
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
+@Suppress("UNUSED_VARIABLE")
 class NumberNDFieldTest {
     val array1: RealNDElement = real2D(3, 3) { i, j -> (i + j).toDouble() }
     val array2: RealNDElement = real2D(3, 3) { i, j -> (i - j).toDouble() }
diff --git a/kmath-dimensions/src/commonTest/kotlin/kscience/dimensions/DMatrixContextTest.kt b/kmath-dimensions/src/commonTest/kotlin/kscience/dimensions/DMatrixContextTest.kt
index 5b330fcce..b9193d4dd 100644
--- a/kmath-dimensions/src/commonTest/kotlin/kscience/dimensions/DMatrixContextTest.kt
+++ b/kmath-dimensions/src/commonTest/kotlin/kscience/dimensions/DMatrixContextTest.kt
@@ -6,6 +6,7 @@ import kscience.kmath.dimensions.DMatrixContext
 import kscience.kmath.dimensions.one
 import kotlin.test.Test
 
+@Suppress("UNUSED_VARIABLE")
 internal class DMatrixContextTest {
     @Test
     fun testDimensionSafeMatrix() {
-- 
2.34.1


From a11711c336e7698a7cf418e5e727d3ed338cb45c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 19 Jan 2021 22:25:04 +0300
Subject: [PATCH 004/713] Tensor algebra refactoring

---
 .../{structures => tensors}/TensorAlgebra.kt  | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)
 rename kmath-core/src/commonMain/kotlin/kscience/kmath/{structures => tensors}/TensorAlgebra.kt (76%)

diff --git a/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/kscience/kmath/tensors/TensorAlgebra.kt
similarity index 76%
rename from kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorAlgebra.kt
rename to kmath-core/src/commonMain/kotlin/kscience/kmath/tensors/TensorAlgebra.kt
index ca7619429..c40544579 100644
--- a/kmath-core/src/commonMain/kotlin/kscience/kmath/structures/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/kscience/kmath/tensors/TensorAlgebra.kt
@@ -1,32 +1,36 @@
-package kscience.kmath.structures
+package kscience.kmath.tensors
 
-public interface TensorStructure<T> : MutableNDStructure<T> {
-    // A tensor can have empty shape, in which case it represents just a value
-    public abstract fun value(): T
-}
+import kscience.kmath.operations.Ring
+import kscience.kmath.structures.MutableNDStructure
+
+public typealias Tensor<T> = MutableNDStructure<T>
+
+public val <T : Any> Tensor<T>.value: T
+    get() {
+        require(shape.contentEquals(intArrayOf(1))) { "Value available only for a tensor with no dimensions" }
+        return get(intArrayOf(0))
+    }
 
 // https://proofwiki.org/wiki/Definition:Algebra_over_Ring
-
-public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
+/**
+ * To be moved to a separate project
+ */
+public interface TensorAlgebra<T, TensorType : Tensor<T>> : Ring<TensorType> {
 
     public operator fun T.plus(other: TensorType): TensorType
     public operator fun TensorType.plus(value: T): TensorType
-    public operator fun TensorType.plus(other: TensorType): TensorType
     public operator fun TensorType.plusAssign(value: T): Unit
     public operator fun TensorType.plusAssign(other: TensorType): Unit
 
     public operator fun T.minus(other: TensorType): TensorType
     public operator fun TensorType.minus(value: T): TensorType
-    public operator fun TensorType.minus(other: TensorType): TensorType
     public operator fun TensorType.minusAssign(value: T): Unit
     public operator fun TensorType.minusAssign(other: TensorType): Unit
 
     public operator fun T.times(other: TensorType): TensorType
     public operator fun TensorType.times(value: T): TensorType
-    public operator fun TensorType.times(other: TensorType): TensorType
     public operator fun TensorType.timesAssign(value: T): Unit
     public operator fun TensorType.timesAssign(other: TensorType): Unit
-    public operator fun TensorType.unaryMinus(): TensorType
 
 
     public infix fun TensorType.dot(other: TensorType): TensorType
@@ -35,7 +39,7 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
     public fun diagonalEmbedding(
         diagonalEntries: TensorType,
-        offset: Int = 0, dim1: Int = -2, dim2: Int = -1
+        offset: Int = 0, dim1: Int = -2, dim2: Int = -1,
     ): TensorType
 
     public fun TensorType.transpose(i: Int, j: Int): TensorType
@@ -51,8 +55,7 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
 // https://proofwiki.org/wiki/Definition:Division_Algebra
 
-public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>> :
-    TensorAlgebra<T, TensorType> {
+public interface TensorPartialDivisionAlgebra<T, TensorType : Tensor<T>> : TensorAlgebra<T, TensorType> {
 
     public operator fun TensorType.div(other: TensorType): TensorType
     public operator fun TensorType.divAssign(other: TensorType)
-- 
2.34.1


From 9011579d2c777b4844e4fbb10da9c077ce027c24 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 20 Jan 2021 11:43:01 +0300
Subject: [PATCH 005/713] [WIP] Tensor algebra design

---
 build.gradle.kts                              |  2 +-
 .../kscience/kmath/tensors/TensorAlgebra.kt   | 74 ++++++++++---------
 2 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d171bd608..0572217af 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("ru.mipt.npm.project")
 }
 
-internal val kmathVersion: String by extra("0.2.0-dev-5")
+internal val kmathVersion: String by extra("0.2.0-dev-6")
 internal val bintrayRepo: String by extra("kscience")
 internal val githubProject: String by extra("kmath")
 
diff --git a/kmath-core/src/commonMain/kotlin/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/kscience/kmath/tensors/TensorAlgebra.kt
index c40544579..c14f0ee0d 100644
--- a/kmath-core/src/commonMain/kotlin/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/kscience/kmath/tensors/TensorAlgebra.kt
@@ -1,10 +1,13 @@
 package kscience.kmath.tensors
 
+import kscience.kmath.misc.UnstableKMathAPI
+import kscience.kmath.operations.Field
 import kscience.kmath.operations.Ring
 import kscience.kmath.structures.MutableNDStructure
 
 public typealias Tensor<T> = MutableNDStructure<T>
 
+@UnstableKMathAPI
 public val <T : Any> Tensor<T>.value: T
     get() {
         require(shape.contentEquals(intArrayOf(1))) { "Value available only for a tensor with no dimensions" }
@@ -13,59 +16,60 @@ public val <T : Any> Tensor<T>.value: T
 
 // https://proofwiki.org/wiki/Definition:Algebra_over_Ring
 /**
- * To be moved to a separate project
+ * TODO To be moved to a separate project
  */
-public interface TensorAlgebra<T, TensorType : Tensor<T>> : Ring<TensorType> {
+@UnstableKMathAPI
+public interface TensorAlgebra<T, TT : Tensor<T>> : Ring<TT> {
 
-    public operator fun T.plus(other: TensorType): TensorType
-    public operator fun TensorType.plus(value: T): TensorType
-    public operator fun TensorType.plusAssign(value: T): Unit
-    public operator fun TensorType.plusAssign(other: TensorType): Unit
+    public operator fun T.plus(other: TT): TT
+    public operator fun TT.plus(value: T): TT
+    public operator fun TT.plusAssign(value: T): Unit
+    public operator fun TT.plusAssign(other: TT): Unit
 
-    public operator fun T.minus(other: TensorType): TensorType
-    public operator fun TensorType.minus(value: T): TensorType
-    public operator fun TensorType.minusAssign(value: T): Unit
-    public operator fun TensorType.minusAssign(other: TensorType): Unit
+    public operator fun T.minus(other: TT): TT
+    public operator fun TT.minus(value: T): TT
+    public operator fun TT.minusAssign(value: T): Unit
+    public operator fun TT.minusAssign(other: TT): Unit
 
-    public operator fun T.times(other: TensorType): TensorType
-    public operator fun TensorType.times(value: T): TensorType
-    public operator fun TensorType.timesAssign(value: T): Unit
-    public operator fun TensorType.timesAssign(other: TensorType): Unit
+    public operator fun T.times(other: TT): TT
+    public operator fun TT.times(value: T): TT
+    public operator fun TT.timesAssign(value: T): Unit
+    public operator fun TT.timesAssign(other: TT): Unit
 
 
-    public infix fun TensorType.dot(other: TensorType): TensorType
-    public infix fun TensorType.dotAssign(other: TensorType): Unit
-    public infix fun TensorType.dotRightAssign(other: TensorType): Unit
+    public infix fun TT.dot(other: TT): TT
+    public infix fun TT.dotAssign(other: TT): Unit
+    public infix fun TT.dotRightAssign(other: TT): Unit
 
     public fun diagonalEmbedding(
-        diagonalEntries: TensorType,
+        diagonalEntries: TT,
         offset: Int = 0, dim1: Int = -2, dim2: Int = -1,
-    ): TensorType
+    ): TT
 
-    public fun TensorType.transpose(i: Int, j: Int): TensorType
-    public fun TensorType.transposeAssign(i: Int, j: Int): Unit
+    public fun TT.transpose(i: Int, j: Int): TT
+    public fun TT.transposeAssign(i: Int, j: Int): Unit
 
-    public fun TensorType.view(shape: IntArray): TensorType
+    public fun TT.view(shape: IntArray): TT
 
-    public fun TensorType.abs(): TensorType
-    public fun TensorType.absAssign(): Unit
-    public fun TensorType.sum(): TensorType
-    public fun TensorType.sumAssign(): Unit
+    public fun abs(tensor: TT): TT
+    public fun TT.absAssign(): Unit
+    public fun TT.sum(): TT
+    public fun TT.sumAssign(): Unit
 }
 
 // https://proofwiki.org/wiki/Definition:Division_Algebra
 
-public interface TensorPartialDivisionAlgebra<T, TensorType : Tensor<T>> : TensorAlgebra<T, TensorType> {
+public interface TensorPartialDivisionAlgebra<T, TT : Tensor<T>> :
+    TensorAlgebra<T, TT>, Field<TT> {
 
-    public operator fun TensorType.div(other: TensorType): TensorType
-    public operator fun TensorType.divAssign(other: TensorType)
+    public operator fun TT.divAssign(other: TT)
 
-    public fun TensorType.exp(): TensorType
-    public fun TensorType.expAssign(): Unit
-    public fun TensorType.log(): TensorType
-    public fun TensorType.logAssign(): Unit
+    public fun exp(tensor: TT): TT
+    public fun TT.expAssign(): Unit
+    public fun log(tensor: TT): TT
+    public fun TT.logAssign(): Unit
 
-    public fun TensorType.svd(): Triple<TensorType, TensorType, TensorType>
-    public fun TensorType.symEig(eigenvectors: Boolean = true): Pair<TensorType, TensorType>
+    public fun svd(tensor: TT): Triple<TT, TT, TT>
+    public fun symEig(tensor: TT, eigenvectors: Boolean = true): Pair<TT, TT>
 
 }
\ No newline at end of file
-- 
2.34.1


From f15ac203236355117e72f81159af7a496f5c6706 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 1 Mar 2021 22:52:58 +0000
Subject: [PATCH 006/713] Cannot afford to inherit from RingWithNumbers

---
 .../kmath/tensors/RealTensorAlgebra.kt        | 35 +++++++++----------
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  9 ++---
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index 0a28ace4f..6023d2b72 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -19,25 +19,6 @@ public class RealTensor(
 
 public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
 
-    override fun add(a: RealTensor, b: RealTensor): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun multiply(a: RealTensor, k: Number): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override val zero: RealTensor
-        get() = TODO("Not yet implemented")
-
-    override fun multiply(a: RealTensor, b: RealTensor): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override val one: RealTensor
-        get() = TODO("Not yet implemented")
-
-
     override fun Double.plus(other: RealTensor): RealTensor {
         val n = other.buffer.size
         val arr = other.buffer.array
@@ -51,6 +32,10 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
+    override fun RealTensor.plus(other: RealTensor): RealTensor {
+        TODO("Not yet implemented")
+    }
+
     override fun RealTensor.plusAssign(value: Double) {
         TODO("Not yet implemented")
     }
@@ -67,6 +52,10 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
+    override fun RealTensor.minus(other: RealTensor): RealTensor {
+        TODO("Not yet implemented")
+    }
+
     override fun RealTensor.minusAssign(value: Double) {
         TODO("Not yet implemented")
     }
@@ -83,6 +72,10 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
+    override fun RealTensor.times(other: RealTensor): RealTensor {
+        TODO("Not yet implemented")
+    }
+
     override fun RealTensor.timesAssign(value: Double) {
         TODO("Not yet implemented")
     }
@@ -91,6 +84,10 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
+    override fun RealTensor.unaryMinus(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
     override fun RealTensor.dot(other: RealTensor): RealTensor {
         TODO("Not yet implemented")
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 83c45feec..137230d29 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -1,25 +1,26 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.RingWithNumbers
-
 // https://proofwiki.org/wiki/Definition:Algebra_over_Ring
-public interface TensorAlgebra<T, TensorType : TensorStructure<T>>: RingWithNumbers<TensorType> {
+public interface TensorAlgebra<T, TensorType : TensorStructure<T>>{
 
     public operator fun T.plus(other: TensorType): TensorType
     public operator fun TensorType.plus(value: T): TensorType
+    public operator fun TensorType.plus(other: TensorType): TensorType
     public operator fun TensorType.plusAssign(value: T): Unit
     public operator fun TensorType.plusAssign(other: TensorType): Unit
 
     public operator fun T.minus(other: TensorType): TensorType
     public operator fun TensorType.minus(value: T): TensorType
+    public operator fun TensorType.minus(other: TensorType): TensorType
     public operator fun TensorType.minusAssign(value: T): Unit
     public operator fun TensorType.minusAssign(other: TensorType): Unit
 
     public operator fun T.times(other: TensorType): TensorType
     public operator fun TensorType.times(value: T): TensorType
+    public operator fun TensorType.times(other: TensorType): TensorType
     public operator fun TensorType.timesAssign(value: T): Unit
     public operator fun TensorType.timesAssign(other: TensorType): Unit
+    public operator fun TensorType.unaryMinus(): TensorType
 
 
     //https://pytorch.org/docs/stable/generated/torch.matmul.html
-- 
2.34.1


From 4aa1df0628c5d531b518691eb8ab22b907946eb0 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 2 Mar 2021 09:32:36 +0000
Subject: [PATCH 007/713] Safe item method and view_as added

---
 .../space/kscience/kmath/tensors/RealTensorAlgebra.kt  | 10 +++++++++-
 .../space/kscience/kmath/tensors/TensorAlgebra.kt      |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index 6023d2b72..24612a6aa 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -14,9 +14,13 @@ public class RealTensor(
         TensorStrides(shape),
         RealBuffer(buffer)
     ) {
-    override fun item(): Double = buffer[0]
+    override fun item(): Double {
+        check(buffer.size > 0) { "The tensor is empty" }
+        return buffer[0]
+    }
 }
 
+
 public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
 
     override fun Double.plus(other: RealTensor): RealTensor {
@@ -116,6 +120,10 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
+    override fun RealTensor.view_as(other: RealTensor): RealTensor {
+        TODO("Not yet implemented")
+    }
+
     override fun RealTensor.abs(): RealTensor {
         TODO("Not yet implemented")
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 137230d29..cddda7670 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -40,6 +40,7 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>>{
 
     //https://pytorch.org/docs/stable/tensor_view.html
     public fun TensorType.view(shape: IntArray): TensorType
+    public fun TensorType.view_as(other: TensorType): TensorType
 
     //https://pytorch.org/docs/stable/generated/torch.abs.html
     public fun TensorType.abs(): TensorType
-- 
2.34.1


From ed007589cfc97d4b6c8d01a51719f2511d0ee3b3 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 2 Mar 2021 14:54:07 +0000
Subject: [PATCH 008/713] LU decomposition set up

---
 .../kscience/kmath/tensors/RealTensorAlgebra.kt     | 13 +++++++++++++
 .../space/kscience/kmath/tensors/TensorAlgebra.kt   |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index 24612a6aa..f234d7d6a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -1,5 +1,6 @@
 package space.kscience.kmath.tensors
 
+import space.kscience.kmath.linear.LupDecompositionFeature
 import space.kscience.kmath.nd.MutableNDBuffer
 import space.kscience.kmath.structures.RealBuffer
 import space.kscience.kmath.structures.array
@@ -164,7 +165,19 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
+    override fun RealTensor.lu(): Pair<RealTensor, RealTensor> {
+        /**
+         * Main first task for @AndreiKingsley
+         * Compare with the implementation of [LupDecomposition]
+         * and provide a common API
+         */
+        TODO("Not yet implemented")
+    }
+
     override fun RealTensor.svd(): Triple<RealTensor, RealTensor, RealTensor> {
+        /**
+         * Main first task for @AlyaNovikova
+         */
         TODO("Not yet implemented")
     }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index cddda7670..03f6f05c2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -66,6 +66,9 @@ public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>
     public fun TensorType.log(): TensorType
     public fun TensorType.logAssign(): Unit
 
+    //https://pytorch.org/docs/stable/generated/torch.lu.html
+    public fun TensorType.lu(): Pair<TensorType, TensorType>
+
     //https://pytorch.org/docs/stable/generated/torch.svd.html
     public fun TensorType.svd(): Triple<TensorType, TensorType, TensorType>
 
-- 
2.34.1


From 90f4ff06fd76fb60f4966d8d60fa31c6b4ebf96f Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Thu, 4 Mar 2021 13:22:28 +0000
Subject: [PATCH 009/713] Basic tasks for Alya and Andrei

---
 .../kmath/tensors/RealTensorAlgebra.kt        | 58 +++++++++++--------
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  7 ++-
 .../kscience/kmath/tensors/TensorStructure.kt |  4 ++
 3 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index f234d7d6a..cad01c4d0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -1,6 +1,5 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.linear.LupDecompositionFeature
 import space.kscience.kmath.nd.MutableNDBuffer
 import space.kscience.kmath.structures.RealBuffer
 import space.kscience.kmath.structures.array
@@ -15,6 +14,9 @@ public class RealTensor(
         TensorStrides(shape),
         RealBuffer(buffer)
     ) {
+    /*
+     * TODO: Andrei remove item()
+     */
     override fun item(): Double {
         check(buffer.size > 0) { "The tensor is empty" }
         return buffer[0]
@@ -24,6 +26,10 @@ public class RealTensor(
 
 public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
 
+    override fun RealTensor.value(): Double {
+        TODO("Andrei")
+    }
+
     override fun Double.plus(other: RealTensor): RealTensor {
         val n = other.buffer.size
         val arr = other.buffer.array
@@ -34,95 +40,95 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
     }
 
     override fun RealTensor.plus(value: Double): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Andrei")
     }
 
     override fun RealTensor.plus(other: RealTensor): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Andrei")
     }
 
     override fun RealTensor.plusAssign(value: Double) {
-        TODO("Not yet implemented")
+        TODO("Andrei")
     }
 
     override fun RealTensor.plusAssign(other: RealTensor) {
-        TODO("Not yet implemented")
+        TODO("Andrei")
     }
 
     override fun Double.minus(other: RealTensor): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Alya")
     }
 
     override fun RealTensor.minus(value: Double): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Alya")
     }
 
     override fun RealTensor.minus(other: RealTensor): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Alya")
     }
 
     override fun RealTensor.minusAssign(value: Double) {
-        TODO("Not yet implemented")
+        TODO("Alya")
     }
 
     override fun RealTensor.minusAssign(other: RealTensor) {
-        TODO("Not yet implemented")
+        TODO("Alya")
     }
 
     override fun Double.times(other: RealTensor): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Andrei")
     }
 
     override fun RealTensor.times(value: Double): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Andrei")
     }
 
     override fun RealTensor.times(other: RealTensor): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Andrei")
     }
 
     override fun RealTensor.timesAssign(value: Double) {
-        TODO("Not yet implemented")
+        TODO("Andrei")
     }
 
     override fun RealTensor.timesAssign(other: RealTensor) {
-        TODO("Not yet implemented")
+        TODO("Andrei")
     }
 
     override fun RealTensor.unaryMinus(): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Andrei")
     }
 
     override fun RealTensor.dot(other: RealTensor): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Alya")
     }
 
     override fun RealTensor.dotAssign(other: RealTensor) {
-        TODO("Not yet implemented")
+        TODO("Alya")
     }
 
     override fun RealTensor.dotRightAssign(other: RealTensor) {
-        TODO("Not yet implemented")
+        TODO("Alya")
     }
 
     override fun diagonalEmbedding(diagonalEntries: RealTensor, offset: Int, dim1: Int, dim2: Int): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Alya")
     }
 
     override fun RealTensor.transpose(i: Int, j: Int): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Alya")
     }
 
     override fun RealTensor.transposeAssign(i: Int, j: Int) {
-        TODO("Not yet implemented")
+        TODO("Alya")
     }
 
     override fun RealTensor.view(shape: IntArray): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Andrei")
     }
 
     override fun RealTensor.view_as(other: RealTensor): RealTensor {
-        TODO("Not yet implemented")
+        TODO("Andrei")
     }
 
     override fun RealTensor.abs(): RealTensor {
@@ -174,6 +180,10 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
+    override fun lu_unpack(A_LU: RealTensor, pivots: RealTensor): Triple<RealTensor, RealTensor, RealTensor> {
+        TODO("Not yet implemented")
+    }
+
     override fun RealTensor.svd(): Triple<RealTensor, RealTensor, RealTensor> {
         /**
          * Main first task for @AlyaNovikova
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 03f6f05c2..b2586e1e9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -1,7 +1,9 @@
 package space.kscience.kmath.tensors
 
 // https://proofwiki.org/wiki/Definition:Algebra_over_Ring
-public interface TensorAlgebra<T, TensorType : TensorStructure<T>>{
+public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
+
+    public fun TensorType.value(): T
 
     public operator fun T.plus(other: TensorType): TensorType
     public operator fun TensorType.plus(value: T): TensorType
@@ -69,6 +71,9 @@ public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>
     //https://pytorch.org/docs/stable/generated/torch.lu.html
     public fun TensorType.lu(): Pair<TensorType, TensorType>
 
+    //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
+    public fun lu_unpack(A_LU: TensorType, pivots: TensorType): Triple<TensorType, TensorType, TensorType>
+
     //https://pytorch.org/docs/stable/generated/torch.svd.html
     public fun TensorType.svd(): Triple<TensorType, TensorType, TensorType>
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
index 6d2d855b6..3775ea2e5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
@@ -3,6 +3,10 @@ package space.kscience.kmath.tensors
 import space.kscience.kmath.nd.MutableNDStructure
 
 public interface TensorStructure<T> : MutableNDStructure<T> {
+
+    /*
+    * TODO: Andrei remove item() and value()
+     */
     public fun item(): T
 
     // A tensor can have empty shape, in which case it represents just a value
-- 
2.34.1


From fe55856a26bd92c7389c57a17df9f908ea2cc343 Mon Sep 17 00:00:00 2001
From: Your Name <kisandy@yandex.ru>
Date: Tue, 9 Mar 2021 22:18:46 +0300
Subject: [PATCH 010/713] basic implements & refactor tensor structure & and
 new tensor algebra methods

---
 .../kmath/tensors/RealTensorAlgebra.kt        | 137 ++++++++++++------
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  14 +-
 .../kscience/kmath/tensors/TensorStrides.kt   |   4 +-
 .../kscience/kmath/tensors/TensorStructure.kt |  23 +--
 4 files changed, 111 insertions(+), 67 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index cad01c4d0..13c57fc18 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -3,6 +3,8 @@ package space.kscience.kmath.tensors
 import space.kscience.kmath.nd.MutableNDBuffer
 import space.kscience.kmath.structures.RealBuffer
 import space.kscience.kmath.structures.array
+import kotlin.js.JsName
+import kotlin.math.abs
 
 
 public class RealTensor(
@@ -13,46 +15,80 @@ public class RealTensor(
     MutableNDBuffer<Double>(
         TensorStrides(shape),
         RealBuffer(buffer)
-    ) {
-    /*
-     * TODO: Andrei remove item()
-     */
-    override fun item(): Double {
-        check(buffer.size > 0) { "The tensor is empty" }
-        return buffer[0]
-    }
-}
-
+    )
 
 public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
 
+    //rename to item?
     override fun RealTensor.value(): Double {
-        TODO("Andrei")
+        check(this.dimension == 0) {
+            // todo change message
+            "This tensor has shape ${shape.toList()}"
+        }
+        return this.buffer.array[0]
+    }
+
+    override fun eye(n: Int): RealTensor {
+        val shape = intArrayOf(n, n)
+        val buffer = DoubleArray(n * n) { 0.0 }
+        val res = RealTensor(shape, buffer)
+        for (i in 0 until n) {
+            res[intArrayOf(i, i)] = 1.0
+        }
+        return res
+    }
+
+    override fun zeros(shape: IntArray): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun zeroesLike(other: RealTensor): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun ones(shape: IntArray): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun onesLike(shape: IntArray): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.copy(): RealTensor {
+        TODO("Not yet implemented")
     }
 
     override fun Double.plus(other: RealTensor): RealTensor {
-        val n = other.buffer.size
-        val arr = other.buffer.array
-        val res = DoubleArray(n)
-        for (i in 1..n)
-            res[i - 1] = arr[i - 1] + this
-        return RealTensor(other.shape, res)
+        //todo should be change with broadcasting
+        val resBuffer = DoubleArray(other.buffer.size) { i ->
+            other.buffer.array[i] + this
+        }
+        return RealTensor(other.shape, resBuffer)
     }
 
-    override fun RealTensor.plus(value: Double): RealTensor {
-        TODO("Andrei")
-    }
+    //todo should be change with broadcasting
+    override fun RealTensor.plus(value: Double): RealTensor = value + this
 
     override fun RealTensor.plus(other: RealTensor): RealTensor {
-        TODO("Andrei")
+        //todo should be change with broadcasting
+        val resBuffer = DoubleArray(this.buffer.size) { i ->
+            this.buffer.array[i] + other.buffer.array[i]
+        }
+        return RealTensor(this.shape, resBuffer)
     }
 
     override fun RealTensor.plusAssign(value: Double) {
-        TODO("Andrei")
+        //todo should be change with broadcasting
+        for (i in this.buffer.array.indices) {
+            this.buffer.array[i] += value
+        }
     }
 
     override fun RealTensor.plusAssign(other: RealTensor) {
-        TODO("Andrei")
+        //todo should be change with broadcasting
+        for (i in this.buffer.array.indices) {
+            this.buffer.array[i] += other.buffer.array[i]
+        }
     }
 
     override fun Double.minus(other: RealTensor): RealTensor {
@@ -76,27 +112,43 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
     }
 
     override fun Double.times(other: RealTensor): RealTensor {
-        TODO("Andrei")
+        //todo should be change with broadcasting
+        val resBuffer = DoubleArray(other.buffer.size) { i ->
+            other.buffer.array[i] * this
+        }
+        return RealTensor(other.shape, resBuffer)
     }
 
-    override fun RealTensor.times(value: Double): RealTensor {
-        TODO("Andrei")
-    }
+    //todo should be change with broadcasting
+    override fun RealTensor.times(value: Double): RealTensor = value * this
 
     override fun RealTensor.times(other: RealTensor): RealTensor {
-        TODO("Andrei")
+        //todo should be change with broadcasting
+        val resBuffer = DoubleArray(this.buffer.size) { i ->
+            this.buffer.array[i] * other.buffer.array[i]
+        }
+        return RealTensor(this.shape, resBuffer)
     }
 
     override fun RealTensor.timesAssign(value: Double) {
-        TODO("Andrei")
+        //todo should be change with broadcasting
+        for (i in this.buffer.array.indices) {
+            this.buffer.array[i] *= value
+        }
     }
 
     override fun RealTensor.timesAssign(other: RealTensor) {
-        TODO("Andrei")
+        //todo should be change with broadcasting
+        for (i in this.buffer.array.indices) {
+            this.buffer.array[i] *= other.buffer.array[i]
+        }
     }
 
     override fun RealTensor.unaryMinus(): RealTensor {
-        TODO("Andrei")
+        val resBuffer = DoubleArray(this.buffer.size) { i ->
+            this.buffer.array[i].unaryMinus()
+        }
+        return RealTensor(this.shape, resBuffer)
     }
 
     override fun RealTensor.dot(other: RealTensor): RealTensor {
@@ -124,11 +176,11 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
     }
 
     override fun RealTensor.view(shape: IntArray): RealTensor {
-        TODO("Andrei")
+        return RealTensor(shape, this.buffer.array)
     }
 
-    override fun RealTensor.view_as(other: RealTensor): RealTensor {
-        TODO("Andrei")
+    override fun RealTensor.viewAs(other: RealTensor): RealTensor {
+        return this.view(other.shape)
     }
 
     override fun RealTensor.abs(): RealTensor {
@@ -147,10 +199,18 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
+    override fun RealTensor.div(value: Double): RealTensor {
+        TODO("Not yet implemented")
+    }
+
     override fun RealTensor.div(other: RealTensor): RealTensor {
         TODO("Not yet implemented")
     }
 
+    override fun RealTensor.divAssign(value: Double) {
+        TODO("Not yet implemented")
+    }
+
     override fun RealTensor.divAssign(other: RealTensor) {
         TODO("Not yet implemented")
     }
@@ -172,15 +232,10 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
     }
 
     override fun RealTensor.lu(): Pair<RealTensor, RealTensor> {
-        /**
-         * Main first task for @AndreiKingsley
-         * Compare with the implementation of [LupDecomposition]
-         * and provide a common API
-         */
-        TODO("Not yet implemented")
+        TODO()
     }
 
-    override fun lu_unpack(A_LU: RealTensor, pivots: RealTensor): Triple<RealTensor, RealTensor, RealTensor> {
+    override fun luUnpack(A_LU: RealTensor, pivots: RealTensor): Triple<RealTensor, RealTensor, RealTensor> {
         TODO("Not yet implemented")
     }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index b2586e1e9..6f42623e0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -5,6 +5,14 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
     public fun TensorType.value(): T
 
+    public fun eye(n: Int): TensorType
+    public fun zeros(shape: IntArray): TensorType
+    public fun zeroesLike(other: TensorType): TensorType
+    public fun ones(shape: IntArray): TensorType
+    public fun onesLike(shape: IntArray): TensorType
+
+    public fun TensorType.copy(): TensorType
+
     public operator fun T.plus(other: TensorType): TensorType
     public operator fun TensorType.plus(value: T): TensorType
     public operator fun TensorType.plus(other: TensorType): TensorType
@@ -42,7 +50,7 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
     //https://pytorch.org/docs/stable/tensor_view.html
     public fun TensorType.view(shape: IntArray): TensorType
-    public fun TensorType.view_as(other: TensorType): TensorType
+    public fun TensorType.viewAs(other: TensorType): TensorType
 
     //https://pytorch.org/docs/stable/generated/torch.abs.html
     public fun TensorType.abs(): TensorType
@@ -57,7 +65,9 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>> :
     TensorAlgebra<T, TensorType> {
 
+    public operator fun TensorType.div(value: T): TensorType
     public operator fun TensorType.div(other: TensorType): TensorType
+    public operator fun TensorType.divAssign(value: T)
     public operator fun TensorType.divAssign(other: TensorType)
 
     //https://pytorch.org/docs/stable/generated/torch.exp.html
@@ -72,7 +82,7 @@ public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>
     public fun TensorType.lu(): Pair<TensorType, TensorType>
 
     //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
-    public fun lu_unpack(A_LU: TensorType, pivots: TensorType): Triple<TensorType, TensorType, TensorType>
+    public fun luUnpack(A_LU: TensorType, pivots: TensorType): Triple<TensorType, TensorType, TensorType>
 
     //https://pytorch.org/docs/stable/generated/torch.svd.html
     public fun TensorType.svd(): Triple<TensorType, TensorType, TensorType>
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
index 3ea8f4bf0..dbaefe907 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
@@ -5,7 +5,7 @@ import space.kscience.kmath.nd.offsetFromIndex
 import kotlin.math.max
 
 
-inline public fun stridesFromShape(shape: IntArray): IntArray {
+public inline fun stridesFromShape(shape: IntArray): IntArray {
     val nDim = shape.size
     val res = IntArray(nDim)
     if (nDim == 0)
@@ -22,7 +22,7 @@ inline public fun stridesFromShape(shape: IntArray): IntArray {
 
 }
 
-inline public fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): IntArray {
+public inline fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): IntArray {
     val res = IntArray(nDim)
     var current = offset
     var strideIndex = 0
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
index 3775ea2e5..5463877ce 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
@@ -2,26 +2,5 @@ package space.kscience.kmath.tensors
 
 import space.kscience.kmath.nd.MutableNDStructure
 
-public interface TensorStructure<T> : MutableNDStructure<T> {
+public typealias TensorStructure<T> = MutableNDStructure<T>
 
-    /*
-    * TODO: Andrei remove item() and value()
-     */
-    public fun item(): T
-
-    // A tensor can have empty shape, in which case it represents just a value
-    public fun value(): T {
-        checkIsValue()
-        return item()
-    }
-}
-
-public inline fun <T> TensorStructure<T>.isValue(): Boolean {
-    return (dimension == 0)
-}
-
-public inline fun <T> TensorStructure<T>.isNotValue(): Boolean = !this.isValue()
-
-public inline fun <T> TensorStructure<T>.checkIsValue(): Unit = check(this.isValue()) {
-    "This tensor has shape ${shape.toList()}"
-}
\ No newline at end of file
-- 
2.34.1


From 3a37b88b5c4808107e2522d5f33eb07440169fb9 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 9 Mar 2021 21:13:48 +0000
Subject: [PATCH 011/713] Fixed getting value test for tensors

---
 .../space/kscience/kmath/tensors/RealTensorAlgebra.kt     | 8 ++------
 .../kotlin/space/kscience/kmath/tensors/TensorStrides.kt  | 2 +-
 .../kotlin/space/kscience/kmath/tensors/TestRealTensor.kt | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index 13c57fc18..366acfb62 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -3,8 +3,6 @@ package space.kscience.kmath.tensors
 import space.kscience.kmath.nd.MutableNDBuffer
 import space.kscience.kmath.structures.RealBuffer
 import space.kscience.kmath.structures.array
-import kotlin.js.JsName
-import kotlin.math.abs
 
 
 public class RealTensor(
@@ -19,11 +17,9 @@ public class RealTensor(
 
 public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
 
-    //rename to item?
     override fun RealTensor.value(): Double {
-        check(this.dimension == 0) {
-            // todo change message
-            "This tensor has shape ${shape.toList()}"
+        check(this.shape contentEquals  intArrayOf(1)) {
+            "Inconsistent value for tensor of shape ${shape.toList()}"
         }
         return this.buffer.array[0]
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
index dbaefe907..0c10203f0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
@@ -48,5 +48,5 @@ public class TensorStrides(override val shape: IntArray): Strides
         indexFromOffset(offset, strides, shape.size)
 
     override val linearSize: Int
-        get() = shape.fold(1) { acc, i -> acc * i }
+        get() = shape.reduce(Int::times)
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
index 7938eb864..d96b00baf 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
@@ -9,9 +9,9 @@ import kotlin.test.assertTrue
 class TestRealTensor {
 
     @Test
-    fun valueTest(){
+    fun valueTest() = RealTensorAlgebra {
         val value = 12.5
-        val tensor = RealTensor(IntArray(0), doubleArrayOf(value))
+        val tensor = RealTensor(intArrayOf(1), doubleArrayOf(value))
         assertEquals(tensor.value(), value)
     }
 
-- 
2.34.1


From 723e0e458e7be15e3388e4bef6654db487d2cf03 Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Thu, 11 Mar 2021 23:04:42 +0300
Subject: [PATCH 012/713] add functions transpose and transposeAssign

---
 .../space/kscience/kmath/nd/NDStructure.kt    |  9 ++++
 .../kmath/tensors/RealTensorAlgebra.kt        | 26 +++++++++-
 .../kscience/kmath/tensors/TensorStrides.kt   | 20 ++++++++
 .../kmath/tensors/TestRealTensorAlgebra.kt    | 51 +++++++++++++++++++
 4 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/NDStructure.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/NDStructure.kt
index 54e410ade..e458d0606 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/NDStructure.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/NDStructure.kt
@@ -174,6 +174,11 @@ public interface Strides {
      */
     public fun index(offset: Int): IntArray
 
+    /**
+     * Get next multidimensional index from the current multidimensional index
+     */
+    public fun nextIndex(index: IntArray): IntArray
+
     /**
      * The size of linear buffer to accommodate all elements of ND-structure corresponding to strides
      */
@@ -232,6 +237,10 @@ public class DefaultStrides private constructor(override val shape: IntArray) :
         return res
     }
 
+    override fun nextIndex(index: IntArray): IntArray {
+        TODO("Not yet implemented")
+    }
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other !is DefaultStrides) return false
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index 366acfb62..a5c00e8ec 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -164,11 +164,33 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
     }
 
     override fun RealTensor.transpose(i: Int, j: Int): RealTensor {
-        TODO("Alya")
+        val n = this.buffer.size
+        val resBuffer = DoubleArray(n)
+
+        val resShape = this.shape.copyOf()
+        resShape[i] = resShape[j].also { resShape[j] = resShape[i] }
+
+        val resTensor = RealTensor(resShape, resBuffer)
+
+        for (offset in 0 until n) {
+            val oldMultiIndex = this.strides.index(offset)
+            val newMultiIndex = oldMultiIndex.copyOf()
+            newMultiIndex[i] = newMultiIndex[j].also { newMultiIndex[j] = newMultiIndex[i] }
+
+            val linearIndex = resTensor.strides.offset(newMultiIndex)
+            resTensor.buffer.array[linearIndex] = this.buffer.array[offset]
+        }
+        return resTensor
     }
 
     override fun RealTensor.transposeAssign(i: Int, j: Int) {
-        TODO("Alya")
+        val transposedTensor = this.transpose(i, j)
+        for (i in transposedTensor.shape.indices) {
+            this.shape[i] = transposedTensor.shape[i]
+        }
+        for (i in transposedTensor.buffer.array.indices) {
+            this.buffer.array[i] = transposedTensor.buffer.array[i]
+        }
     }
 
     override fun RealTensor.view(shape: IntArray): RealTensor {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
index 0c10203f0..d6a6f5f16 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
@@ -35,6 +35,23 @@ public inline fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): In
     return res
 }
 
+public inline fun nextIndex(index: IntArray, shape: IntArray, nDim: Int): IntArray {
+    val res = index.copyOf()
+    var current = nDim - 1
+    var carry = 0
+
+    do {
+        res[current]++
+        if (res[current] >= shape[current]) {
+            carry = 1
+            res[current] = 0
+        }
+        current--
+    } while(carry != 0 && current >= 0)
+
+    return res
+}
+
 
 
 public class TensorStrides(override val shape: IntArray): Strides
@@ -47,6 +64,9 @@ public class TensorStrides(override val shape: IntArray): Strides
     override fun index(offset: Int): IntArray =
         indexFromOffset(offset, strides, shape.size)
 
+    override fun nextIndex(index: IntArray): IntArray =
+        nextIndex(index, shape, shape.size)
+
     override val linearSize: Int
         get() = shape.reduce(Int::times)
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
index 86caa0338..8e95922b8 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
@@ -13,4 +13,55 @@ class TestRealTensorAlgebra {
         assertTrue(res.buffer.array contentEquals doubleArrayOf(11.0,12.0))
     }
 
+    @Test
+    fun transpose1x1() = RealTensorAlgebra {
+        val tensor = RealTensor(intArrayOf(1), doubleArrayOf(0.0))
+        val res = tensor.transpose(0, 0)
+
+        assertTrue(res.buffer.array contentEquals doubleArrayOf(0.0))
+        assertTrue(res.shape contentEquals intArrayOf(1))
+    }
+
+    @Test
+    fun transpose3x2() = RealTensorAlgebra {
+        val tensor = RealTensor(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val res = tensor.transpose(1, 0)
+
+        assertTrue(res.buffer.array contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
+        assertTrue(res.shape contentEquals intArrayOf(2, 3))
+    }
+
+    @Test
+    fun transpose1x2x3() = RealTensorAlgebra {
+        val tensor = RealTensor(intArrayOf(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val res01 = tensor.transpose(0, 1)
+        val res02 = tensor.transpose(0, 2)
+        val res12 = tensor.transpose(1, 2)
+
+        assertTrue(res01.shape contentEquals intArrayOf(2, 1, 3))
+        assertTrue(res02.shape contentEquals intArrayOf(3, 2, 1))
+        assertTrue(res12.shape contentEquals intArrayOf(1, 3, 2))
+
+        assertTrue(res01.buffer.array contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res02.buffer.array contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res12.buffer.array contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+    }
+
+    @Test
+    fun transposeAssign1x2() = RealTensorAlgebra {
+        val tensor = RealTensor(intArrayOf(1,2), doubleArrayOf(1.0, 2.0))
+        tensor.transposeAssign(0, 1)
+
+        assertTrue(tensor.buffer.array contentEquals doubleArrayOf(1.0, 2.0))
+        assertTrue(tensor.shape contentEquals intArrayOf(2, 1))
+    }
+
+    @Test
+    fun transposeAssign2x3() = RealTensorAlgebra {
+        val tensor = RealTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        tensor.transposeAssign(1, 0)
+
+        assertTrue(tensor.buffer.array contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(tensor.shape contentEquals intArrayOf(3, 2))
+    }
 }
\ No newline at end of file
-- 
2.34.1


From bb4894b87ea5d4ed64b290ae0ddcd35c9ebe6d1a Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Thu, 11 Mar 2021 21:46:35 +0000
Subject: [PATCH 013/713] removing assignement for non operator members

---
 .../kmath/tensors/RealTensorAlgebra.kt        | 31 +------------------
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  7 -----
 .../kmath/tensors/TestRealTensorAlgebra.kt    | 18 -----------
 3 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index a5c00e8ec..16f90341b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -151,14 +151,6 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Alya")
     }
 
-    override fun RealTensor.dotAssign(other: RealTensor) {
-        TODO("Alya")
-    }
-
-    override fun RealTensor.dotRightAssign(other: RealTensor) {
-        TODO("Alya")
-    }
-
     override fun diagonalEmbedding(diagonalEntries: RealTensor, offset: Int, dim1: Int, dim2: Int): RealTensor {
         TODO("Alya")
     }
@@ -183,15 +175,6 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         return resTensor
     }
 
-    override fun RealTensor.transposeAssign(i: Int, j: Int) {
-        val transposedTensor = this.transpose(i, j)
-        for (i in transposedTensor.shape.indices) {
-            this.shape[i] = transposedTensor.shape[i]
-        }
-        for (i in transposedTensor.buffer.array.indices) {
-            this.buffer.array[i] = transposedTensor.buffer.array[i]
-        }
-    }
 
     override fun RealTensor.view(shape: IntArray): RealTensor {
         return RealTensor(shape, this.buffer.array)
@@ -205,17 +188,12 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.absAssign() {
-        TODO("Not yet implemented")
-    }
+
 
     override fun RealTensor.sum(): RealTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.sumAssign() {
-        TODO("Not yet implemented")
-    }
 
     override fun RealTensor.div(value: Double): RealTensor {
         TODO("Not yet implemented")
@@ -237,17 +215,10 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.expAssign() {
-        TODO("Not yet implemented")
-    }
-
     override fun RealTensor.log(): RealTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.logAssign() {
-        TODO("Not yet implemented")
-    }
 
     override fun RealTensor.lu(): Pair<RealTensor, RealTensor> {
         TODO()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 6f42623e0..f1d401f6e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -35,8 +35,6 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
     //https://pytorch.org/docs/stable/generated/torch.matmul.html
     public infix fun TensorType.dot(other: TensorType): TensorType
-    public infix fun TensorType.dotAssign(other: TensorType): Unit
-    public infix fun TensorType.dotRightAssign(other: TensorType): Unit
 
     //https://pytorch.org/docs/stable/generated/torch.diag_embed.html
     public fun diagonalEmbedding(
@@ -46,7 +44,6 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
     //https://pytorch.org/docs/stable/generated/torch.transpose.html
     public fun TensorType.transpose(i: Int, j: Int): TensorType
-    public fun TensorType.transposeAssign(i: Int, j: Int): Unit
 
     //https://pytorch.org/docs/stable/tensor_view.html
     public fun TensorType.view(shape: IntArray): TensorType
@@ -54,11 +51,9 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
     //https://pytorch.org/docs/stable/generated/torch.abs.html
     public fun TensorType.abs(): TensorType
-    public fun TensorType.absAssign(): Unit
 
     //https://pytorch.org/docs/stable/generated/torch.sum.html
     public fun TensorType.sum(): TensorType
-    public fun TensorType.sumAssign(): Unit
 }
 
 // https://proofwiki.org/wiki/Definition:Division_Algebra
@@ -72,11 +67,9 @@ public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.exp.html
     public fun TensorType.exp(): TensorType
-    public fun TensorType.expAssign(): Unit
 
     //https://pytorch.org/docs/stable/generated/torch.log.html
     public fun TensorType.log(): TensorType
-    public fun TensorType.logAssign(): Unit
 
     //https://pytorch.org/docs/stable/generated/torch.lu.html
     public fun TensorType.lu(): Pair<TensorType, TensorType>
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
index 8e95922b8..19f0c0ef0 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
@@ -46,22 +46,4 @@ class TestRealTensorAlgebra {
         assertTrue(res02.buffer.array contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
         assertTrue(res12.buffer.array contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
     }
-
-    @Test
-    fun transposeAssign1x2() = RealTensorAlgebra {
-        val tensor = RealTensor(intArrayOf(1,2), doubleArrayOf(1.0, 2.0))
-        tensor.transposeAssign(0, 1)
-
-        assertTrue(tensor.buffer.array contentEquals doubleArrayOf(1.0, 2.0))
-        assertTrue(tensor.shape contentEquals intArrayOf(2, 1))
-    }
-
-    @Test
-    fun transposeAssign2x3() = RealTensorAlgebra {
-        val tensor = RealTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        tensor.transposeAssign(1, 0)
-
-        assertTrue(tensor.buffer.array contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
-        assertTrue(tensor.shape contentEquals intArrayOf(3, 2))
-    }
 }
\ No newline at end of file
-- 
2.34.1


From f9500f44ec6fc811a17e76104a9bea7ed6f790cc Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Fri, 12 Mar 2021 13:50:06 +0300
Subject: [PATCH 014/713] new tensor def

---
 .../kscience/kmath/tensors/BufferTensor.kt    | 28 +++++++++++++++++++
 .../kmath/tensors/RealTensorAlgebra.kt        | 14 +++++-----
 2 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferTensor.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferTensor.kt
new file mode 100644
index 000000000..4d8aea32c
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferTensor.kt
@@ -0,0 +1,28 @@
+package space.kscience.kmath.tensors
+
+import space.kscience.kmath.linear.BufferMatrix
+import space.kscience.kmath.linear.RealMatrixContext.toBufferMatrix
+import space.kscience.kmath.nd.MutableNDBuffer
+import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.structures.MutableBuffer
+import space.kscience.kmath.structures.toList
+
+public open class BufferTensor<T>(
+    override val shape: IntArray,
+    buffer: MutableBuffer<T>
+) :
+    TensorStructure<T>,
+    MutableNDBuffer<T>(
+        TensorStrides(shape),
+        buffer
+    )
+
+
+public fun <T : Any> BufferTensor<T>.toBufferMatrix(): BufferMatrix<T> {
+    return BufferMatrix(shape[0], shape[1], this.buffer)
+}
+
+public fun  <T : Any> BufferMatrix<T>.BufferTensor(): BufferTensor<T> {
+    return BufferTensor(intArrayOf(rowNum, colNum), buffer)
+}
+
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index a5c00e8ec..e38056097 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -1,19 +1,19 @@
 package space.kscience.kmath.tensors
 
+import space.kscience.kmath.linear.BufferMatrix
+import space.kscience.kmath.linear.RealMatrixContext.toBufferMatrix
 import space.kscience.kmath.nd.MutableNDBuffer
+import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.RealBuffer
 import space.kscience.kmath.structures.array
+import space.kscience.kmath.structures.toList
 
 
 public class RealTensor(
-    override val shape: IntArray,
+    shape: IntArray,
     buffer: DoubleArray
-) :
-    TensorStructure<Double>,
-    MutableNDBuffer<Double>(
-        TensorStrides(shape),
-        RealBuffer(buffer)
-    )
+) : BufferTensor<Double>(shape, RealBuffer(buffer))
 
 public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
 
-- 
2.34.1


From 95b814e1637c281b6cc771b0c89e3475a27323c9 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Fri, 12 Mar 2021 14:29:51 +0300
Subject: [PATCH 015/713] add fromMatrix

---
 .../kotlin/space/kscience/kmath/tensors/BufferTensor.kt  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferTensor.kt
index 4d8aea32c..817c51f11 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferTensor.kt
@@ -2,8 +2,12 @@ package space.kscience.kmath.tensors
 
 import space.kscience.kmath.linear.BufferMatrix
 import space.kscience.kmath.linear.RealMatrixContext.toBufferMatrix
+import space.kscience.kmath.nd.Matrix
 import space.kscience.kmath.nd.MutableNDBuffer
+import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.BufferAccessor2D
 import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.structures.toList
 
@@ -22,7 +26,8 @@ public fun <T : Any> BufferTensor<T>.toBufferMatrix(): BufferMatrix<T> {
     return BufferMatrix(shape[0], shape[1], this.buffer)
 }
 
-public fun  <T : Any> BufferMatrix<T>.BufferTensor(): BufferTensor<T> {
-    return BufferTensor(intArrayOf(rowNum, colNum), buffer)
+// T???
+public fun BufferMatrix<Double>.BufferTensor(): BufferTensor<Double> {
+    return BufferTensor(intArrayOf(rowNum, colNum),  BufferAccessor2D(rowNum, colNum, Buffer.Companion::real).create(this))
 }
 
-- 
2.34.1


From 454d574ccd8876982753e8e09782ff1f4fb0c564 Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Fri, 12 Mar 2021 15:20:46 +0300
Subject: [PATCH 016/713] add broadcast and functions plus and minus

---
 .../kmath/tensors/RealTensorAlgebra.kt        | 96 ++++++++++++++++---
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  3 +
 .../kmath/tensors/TestRealTensorAlgebra.kt    | 47 +++++++++
 3 files changed, 135 insertions(+), 11 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index a5c00e8ec..a4ad54bfc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -2,7 +2,9 @@ package space.kscience.kmath.tensors
 
 import space.kscience.kmath.nd.MutableNDBuffer
 import space.kscience.kmath.structures.RealBuffer
+import space.kscience.kmath.structures.ValueFlag
 import space.kscience.kmath.structures.array
+import kotlin.math.max
 
 
 public class RealTensor(
@@ -54,27 +56,85 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
+    override fun broadcastShapes(vararg shapes: IntArray): IntArray {
+        var totalDim = 0
+        for (shape in shapes) {
+            totalDim = max(totalDim, shape.size)
+        }
+
+        val totalShape = IntArray(totalDim) {0}
+        for (shape in shapes) {
+            for (i in shape.indices) {
+                val curDim = shape[i]
+                val offset = totalDim - shape.size
+                totalShape[i + offset] = max(totalShape[i + offset], curDim)
+            }
+        }
+
+        for (shape in shapes) {
+            for (i in shape.indices) {
+                val curDim = shape[i]
+                val offset = totalDim - shape.size
+                if (curDim != 1 && totalShape[i + offset] != curDim) {
+                    throw IllegalArgumentException("Shapes are not compatible and cannot be broadcast")
+                }
+            }
+        }
+
+        return totalShape
+    }
+
+    override fun broadcastTensors(vararg tensors: RealTensor): List<RealTensor> {
+        val totalShape = broadcastShapes(*(tensors.map { it.shape }).toTypedArray())
+        val n = totalShape.reduce{ acc, i ->  acc * i }
+
+        val res = ArrayList<RealTensor>(0)
+        for (tensor in tensors) {
+            val resTensor = RealTensor(totalShape, DoubleArray(n))
+
+            for (linearIndex in 0 until n) {
+                val totalMultiIndex = resTensor.strides.index(linearIndex)
+                val curMultiIndex = tensor.shape.copyOf()
+
+                val offset = totalMultiIndex.size - curMultiIndex.size
+
+                for (i in curMultiIndex.indices) {
+                    if (curMultiIndex[i] != 1) {
+                        curMultiIndex[i] = totalMultiIndex[i + offset]
+                    } else {
+                        curMultiIndex[i] = 0
+                    }
+                }
+
+                val curLinearIndex = tensor.strides.offset(curMultiIndex)
+                resTensor.buffer.array[linearIndex] = tensor.buffer.array[curLinearIndex]
+            }
+            res.add(resTensor)
+        }
+
+        return res
+    }
+
     override fun Double.plus(other: RealTensor): RealTensor {
-        //todo should be change with broadcasting
         val resBuffer = DoubleArray(other.buffer.size) { i ->
             other.buffer.array[i] + this
         }
         return RealTensor(other.shape, resBuffer)
     }
 
-    //todo should be change with broadcasting
     override fun RealTensor.plus(value: Double): RealTensor = value + this
 
     override fun RealTensor.plus(other: RealTensor): RealTensor {
-        //todo should be change with broadcasting
-        val resBuffer = DoubleArray(this.buffer.size) { i ->
-            this.buffer.array[i] + other.buffer.array[i]
+        val broadcast = broadcastTensors(this, other)
+        val newThis = broadcast[0]
+        val newOther = broadcast[1]
+        val resBuffer = DoubleArray(newThis.buffer.size) { i ->
+            newThis.buffer.array[i] + newOther.buffer.array[i]
         }
-        return RealTensor(this.shape, resBuffer)
+        return RealTensor(newThis.shape, resBuffer)
     }
 
     override fun RealTensor.plusAssign(value: Double) {
-        //todo should be change with broadcasting
         for (i in this.buffer.array.indices) {
             this.buffer.array[i] += value
         }
@@ -88,19 +148,33 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
     }
 
     override fun Double.minus(other: RealTensor): RealTensor {
-        TODO("Alya")
+        val resBuffer = DoubleArray(other.buffer.size) { i ->
+            this - other.buffer.array[i]
+        }
+        return RealTensor(other.shape, resBuffer)
     }
 
     override fun RealTensor.minus(value: Double): RealTensor {
-        TODO("Alya")
+        val resBuffer = DoubleArray(this.buffer.size) { i ->
+            this.buffer.array[i] - value
+        }
+        return RealTensor(this.shape, resBuffer)
     }
 
     override fun RealTensor.minus(other: RealTensor): RealTensor {
-        TODO("Alya")
+        val broadcast = broadcastTensors(this, other)
+        val newThis = broadcast[0]
+        val newOther = broadcast[1]
+        val resBuffer = DoubleArray(newThis.buffer.size) { i ->
+            newThis.buffer.array[i] - newOther.buffer.array[i]
+        }
+        return RealTensor(newThis.shape, resBuffer)
     }
 
     override fun RealTensor.minusAssign(value: Double) {
-        TODO("Alya")
+        for (i in this.buffer.array.indices) {
+            this.buffer.array[i] -= value
+        }
     }
 
     override fun RealTensor.minusAssign(other: RealTensor) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 6f42623e0..bd47a1b76 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -13,6 +13,9 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
     public fun TensorType.copy(): TensorType
 
+    public fun broadcastShapes(vararg shapes: IntArray): IntArray
+    public fun broadcastTensors(vararg tensors: RealTensor): List<TensorType>
+
     public operator fun T.plus(other: TensorType): TensorType
     public operator fun TensorType.plus(value: T): TensorType
     public operator fun TensorType.plus(other: TensorType): TensorType
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
index 8e95922b8..18639bf3c 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
@@ -2,6 +2,8 @@ package space.kscience.kmath.tensors
 
 import space.kscience.kmath.structures.array
 import kotlin.test.Test
+import kotlin.test.assertFails
+import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
 
 class TestRealTensorAlgebra {
@@ -64,4 +66,49 @@ class TestRealTensorAlgebra {
         assertTrue(tensor.buffer.array contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
         assertTrue(tensor.shape contentEquals intArrayOf(3, 2))
     }
+
+    @Test
+    fun broadcastShapes() = RealTensorAlgebra {
+        assertTrue(this.broadcastShapes(
+            intArrayOf(2, 3), intArrayOf(1, 3), intArrayOf(1, 1, 1)
+        ) contentEquals intArrayOf(1, 2, 3))
+
+        assertTrue(this.broadcastShapes(
+            intArrayOf(6, 7), intArrayOf(5, 6, 1), intArrayOf(7,), intArrayOf(5, 1, 7)
+        ) contentEquals intArrayOf(5, 6, 7))
+    }
+
+    @Test
+    fun broadcastTensors() = RealTensorAlgebra {
+        val tensor1 = RealTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = RealTensor(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = RealTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
+
+        val res = this.broadcastTensors(tensor1, tensor2, tensor3)
+
+        assertTrue(res[0].shape contentEquals intArrayOf(1, 2, 3))
+        assertTrue(res[1].shape contentEquals intArrayOf(1, 2, 3))
+        assertTrue(res[2].shape contentEquals intArrayOf(1, 2, 3))
+
+        assertTrue(res[0].buffer.array contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res[1].buffer.array contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
+        assertTrue(res[2].buffer.array contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
+    }
+
+    @Test
+    fun minusTensor() = RealTensorAlgebra {
+        val tensor1 = RealTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = RealTensor(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = RealTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
+
+        assertTrue((tensor2 - tensor1).shape contentEquals intArrayOf(2, 3))
+        assertTrue((tensor2 - tensor1).buffer.array contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
+
+        assertTrue((tensor3 - tensor1).shape contentEquals intArrayOf(1, 2, 3))
+        assertTrue((tensor3 - tensor1).buffer.array
+                contentEquals doubleArrayOf(499.0, 498.0, 497.0, 496.0, 495.0, 494.0))
+
+        assertTrue((tensor3 - tensor2).shape contentEquals intArrayOf(1, 1, 3))
+        assertTrue((tensor3 - tensor2).buffer.array contentEquals doubleArrayOf(490.0, 480.0, 470.0))
+    }
 }
\ No newline at end of file
-- 
2.34.1


From 70e1861e536febfe9792fcbd3dde3dbd66cb4682 Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Fri, 12 Mar 2021 15:25:47 +0300
Subject: [PATCH 017/713] remove extra import

---
 .../kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index a4ad54bfc..afe78ae08 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -2,7 +2,6 @@ package space.kscience.kmath.tensors
 
 import space.kscience.kmath.nd.MutableNDBuffer
 import space.kscience.kmath.structures.RealBuffer
-import space.kscience.kmath.structures.ValueFlag
 import space.kscience.kmath.structures.array
 import kotlin.math.max
 
-- 
2.34.1


From 626d5c98fa843fe6833cf300f8b71871d54474b1 Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Fri, 12 Mar 2021 15:43:44 +0300
Subject: [PATCH 018/713] change IllegalArgumentException to RuntimeException

---
 .../kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index afe78ae08..9e090e376 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -75,7 +75,7 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
                 val curDim = shape[i]
                 val offset = totalDim - shape.size
                 if (curDim != 1 && totalShape[i + offset] != curDim) {
-                    throw IllegalArgumentException("Shapes are not compatible and cannot be broadcast")
+                    throw RuntimeException("Shapes are not compatible and cannot be broadcast")
                 }
             }
         }
-- 
2.34.1


From 0911efd4aa1944c89cb9df4913c251daef98d31c Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Sat, 13 Mar 2021 19:30:58 +0300
Subject: [PATCH 019/713] add buffered tensor + lu

---
 .../kscience/kmath/tensors/BufferTensor.kt    | 33 ---------
 .../kscience/kmath/tensors/BufferedTensor.kt  | 33 +++++++++
 .../kmath/tensors/RealTensorAlgebra.kt        | 69 +++++++++++++++----
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  5 +-
 4 files changed, 92 insertions(+), 48 deletions(-)
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferTensor.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferTensor.kt
deleted file mode 100644
index 817c51f11..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferTensor.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package space.kscience.kmath.tensors
-
-import space.kscience.kmath.linear.BufferMatrix
-import space.kscience.kmath.linear.RealMatrixContext.toBufferMatrix
-import space.kscience.kmath.nd.Matrix
-import space.kscience.kmath.nd.MutableNDBuffer
-import space.kscience.kmath.nd.Structure2D
-import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.BufferAccessor2D
-import space.kscience.kmath.structures.MutableBuffer
-import space.kscience.kmath.structures.toList
-
-public open class BufferTensor<T>(
-    override val shape: IntArray,
-    buffer: MutableBuffer<T>
-) :
-    TensorStructure<T>,
-    MutableNDBuffer<T>(
-        TensorStrides(shape),
-        buffer
-    )
-
-
-public fun <T : Any> BufferTensor<T>.toBufferMatrix(): BufferMatrix<T> {
-    return BufferMatrix(shape[0], shape[1], this.buffer)
-}
-
-// T???
-public fun BufferMatrix<Double>.BufferTensor(): BufferTensor<Double> {
-    return BufferTensor(intArrayOf(rowNum, colNum),  BufferAccessor2D(rowNum, colNum, Buffer.Companion::real).create(this))
-}
-
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
new file mode 100644
index 000000000..9ffe2db61
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
@@ -0,0 +1,33 @@
+package space.kscience.kmath.tensors
+
+import space.kscience.kmath.linear.BufferMatrix
+import space.kscience.kmath.nd.MutableNDBuffer
+import space.kscience.kmath.structures.*
+import space.kscience.kmath.structures.BufferAccessor2D
+
+public open class BufferedTensor<T>(
+    override val shape: IntArray,
+    buffer: MutableBuffer<T>
+) :
+    TensorStructure<T>,
+    MutableNDBuffer<T>(
+        TensorStrides(shape),
+        buffer
+    ) {
+
+    public operator fun get(i: Int, j: Int): T{
+            check(this.dimension == 2) {"Not matrix"}
+            return this[intArrayOf(i, j)]
+    }
+
+    public operator fun set(i: Int, j: Int, value: T): Unit{
+        check(this.dimension == 2) {"Not matrix"}
+        this[intArrayOf(i, j)] = value
+    }
+
+}
+
+public class IntTensor(
+    shape: IntArray,
+    buffer: IntArray
+) : BufferedTensor<Int>(shape, IntBuffer(buffer))
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index e38056097..3e21a3a98 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -1,24 +1,19 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.linear.BufferMatrix
-import space.kscience.kmath.linear.RealMatrixContext.toBufferMatrix
-import space.kscience.kmath.nd.MutableNDBuffer
-import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.RealBuffer
 import space.kscience.kmath.structures.array
-import space.kscience.kmath.structures.toList
+import kotlin.math.abs
 
 
 public class RealTensor(
     shape: IntArray,
     buffer: DoubleArray
-) : BufferTensor<Double>(shape, RealBuffer(buffer))
+) : BufferedTensor<Double>(shape, RealBuffer(buffer))
 
 public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
 
     override fun RealTensor.value(): Double {
-        check(this.shape contentEquals  intArrayOf(1)) {
+        check(this.shape contentEquals intArrayOf(1)) {
             "Inconsistent value for tensor of shape ${shape.toList()}"
         }
         return this.buffer.array[0]
@@ -51,7 +46,8 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
     }
 
     override fun RealTensor.copy(): RealTensor {
-        TODO("Not yet implemented")
+        // should be rework as soon as copy() method for NDBuffer will be available
+        return RealTensor(this.shape, this.buffer.array.copyOf())
     }
 
     override fun Double.plus(other: RealTensor): RealTensor {
@@ -249,12 +245,59 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.lu(): Pair<RealTensor, RealTensor> {
-        TODO()
+    override fun RealTensor.lu(): Pair<RealTensor, IntTensor> {
+        // todo checks
+        val lu = this.copy()
+        val m = this.shape[0]
+        val pivot = IntArray(m)
+
+
+        // Initialize permutation array and parity
+        for (row in 0 until m) pivot[row] = row
+        var even = true
+
+        for (i in 0 until m) {
+            var maxA = -1.0
+            var iMax = i
+
+            for (k in i until m) {
+                val absA = abs(lu[k, i])
+                if (absA > maxA) {
+                    maxA = absA
+                    iMax = k
+                }
+            }
+
+            //todo check singularity
+
+            if (iMax != i) {
+
+                val j = pivot[i]
+                pivot[i] = pivot[iMax]
+                pivot[iMax] = j
+                even != even
+
+                for (k in 0 until m) {
+                    val tmp = lu[i, k]
+                    lu[i, k] = lu[iMax, k]
+                    lu[iMax, k] = tmp
+                }
+
+            }
+
+            for (j in i + 1 until m) {
+                lu[j, i] /= lu[i, i]
+                for (k in i + 1 until m) {
+                    lu[j, k] -= lu[j, i] * lu[i, k]
+                }
+            }
+        }
+        return Pair(lu, IntTensor(intArrayOf(m), pivot))
     }
 
-    override fun luUnpack(A_LU: RealTensor, pivots: RealTensor): Triple<RealTensor, RealTensor, RealTensor> {
-        TODO("Not yet implemented")
+    override fun luUnpack(A_LU: RealTensor, pivots: IntTensor): Triple<RealTensor, RealTensor, RealTensor> {
+        // todo checks
+
     }
 
     override fun RealTensor.svd(): Triple<RealTensor, RealTensor, RealTensor> {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 6f42623e0..0dbcae044 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -78,11 +78,12 @@ public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>
     public fun TensorType.log(): TensorType
     public fun TensorType.logAssign(): Unit
 
+    // todo change type of pivots
     //https://pytorch.org/docs/stable/generated/torch.lu.html
-    public fun TensorType.lu(): Pair<TensorType, TensorType>
+    public fun TensorType.lu(): Pair<TensorType, IntTensor>
 
     //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
-    public fun luUnpack(A_LU: TensorType, pivots: TensorType): Triple<TensorType, TensorType, TensorType>
+    public fun luUnpack(A_LU: TensorType, pivots: IntTensor): Triple<TensorType, TensorType, TensorType>
 
     //https://pytorch.org/docs/stable/generated/torch.svd.html
     public fun TensorType.svd(): Triple<TensorType, TensorType, TensorType>
-- 
2.34.1


From 8f88a101d24faee0504228c57642bb980a7d48e4 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Sat, 13 Mar 2021 20:51:15 +0300
Subject: [PATCH 020/713] complete lu for matrix

---
 .../kmath/tensors/RealTensorAlgebra.kt        | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index 9e040fcd8..f91f44519 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -35,7 +35,10 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
     }
 
     override fun zeroesLike(other: RealTensor): RealTensor {
-        TODO("Not yet implemented")
+        // TODO refactor very bad!!!
+        val shape = other.shape
+        val buffer = DoubleArray(other.buffer.size) { 0.0 }
+        return RealTensor(shape, buffer)
     }
 
     override fun ones(shape: IntArray): RealTensor {
@@ -340,9 +343,30 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         return Pair(lu, IntTensor(intArrayOf(m), pivot))
     }
 
-    override fun luUnpack(A_LU: RealTensor, pivots: IntTensor): Triple<RealTensor, RealTensor, RealTensor> {
+    override fun luUnpack(lu: RealTensor, pivots: IntTensor): Triple<RealTensor, RealTensor, RealTensor> {
         // todo checks
+        val n = lu.shape[0]
+        val p = zeroesLike(lu)
+        pivots.buffer.array.forEachIndexed { i, pivot ->
+            p[i, pivot] = 1.0
+        }
+        val l = zeroesLike(lu)
+        val u = zeroesLike(lu)
 
+        for (i in 0 until n){
+            for (j in 0 until n){
+                if (i == j) {
+                    l[i, j] = 1.0
+                }
+                if (j < i) {
+                    l[i, j] = lu[i, j]
+                }
+                if (j >= i) {
+                    u[i, j] = lu[i, j]
+                }
+            }
+        }
+        return Triple(p, l, u)
     }
 
     override fun RealTensor.svd(): Triple<RealTensor, RealTensor, RealTensor> {
-- 
2.34.1


From 384415dc98ae27125f894798057f6052103e2594 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Sat, 13 Mar 2021 19:16:13 +0000
Subject: [PATCH 021/713] utils module for tensors

---
 .../kscience/kmath/tensors/BufferedTensor.kt  | 28 ++++--
 .../kmath/tensors/RealTensorAlgebra.kt        | 63 ------------
 .../kscience/kmath/tensors/TensorAlgebra.kt   | 46 +--------
 .../kscience/kmath/tensors/TensorStrides.kt   |  6 +-
 .../space/kscience/kmath/tensors/utils.kt     | 96 +++++++++++++++++++
 .../kmath/tensors/TestRealTensorAlgebra.kt    |  8 +-
 6 files changed, 124 insertions(+), 123 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
index 9ffe2db61..29605024d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
@@ -1,9 +1,8 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.linear.BufferMatrix
 import space.kscience.kmath.nd.MutableNDBuffer
 import space.kscience.kmath.structures.*
-import space.kscience.kmath.structures.BufferAccessor2D
+
 
 public open class BufferedTensor<T>(
     override val shape: IntArray,
@@ -15,13 +14,13 @@ public open class BufferedTensor<T>(
         buffer
     ) {
 
-    public operator fun get(i: Int, j: Int): T{
-            check(this.dimension == 2) {"Not matrix"}
-            return this[intArrayOf(i, j)]
+    public operator fun get(i: Int, j: Int): T {
+        check(this.dimension == 2) { "Not matrix" }
+        return this[intArrayOf(i, j)]
     }
 
-    public operator fun set(i: Int, j: Int, value: T): Unit{
-        check(this.dimension == 2) {"Not matrix"}
+    public operator fun set(i: Int, j: Int, value: T): Unit {
+        check(this.dimension == 2) { "Not matrix" }
         this[intArrayOf(i, j)] = value
     }
 
@@ -31,3 +30,18 @@ public class IntTensor(
     shape: IntArray,
     buffer: IntArray
 ) : BufferedTensor<Int>(shape, IntBuffer(buffer))
+
+public class LongTensor(
+    shape: IntArray,
+    buffer: LongArray
+) : BufferedTensor<Long>(shape, LongBuffer(buffer))
+
+public class FloatTensor(
+    shape: IntArray,
+    buffer: FloatArray
+) : BufferedTensor<Float>(shape, FloatBuffer(buffer))
+
+public class RealTensor(
+    shape: IntArray,
+    buffer: DoubleArray
+) : BufferedTensor<Double>(shape, RealBuffer(buffer))
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index f91f44519..b3e54f077 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -6,11 +6,6 @@ import kotlin.math.abs
 import kotlin.math.max
 
 
-public class RealTensor(
-    shape: IntArray,
-    buffer: DoubleArray
-) : BufferedTensor<Double>(shape, RealBuffer(buffer))
-
 public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
 
     override fun RealTensor.value(): Double {
@@ -54,64 +49,6 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         return RealTensor(this.shape, this.buffer.array.copyOf())
     }
 
-    override fun broadcastShapes(vararg shapes: IntArray): IntArray {
-        var totalDim = 0
-        for (shape in shapes) {
-            totalDim = max(totalDim, shape.size)
-        }
-
-        val totalShape = IntArray(totalDim) {0}
-        for (shape in shapes) {
-            for (i in shape.indices) {
-                val curDim = shape[i]
-                val offset = totalDim - shape.size
-                totalShape[i + offset] = max(totalShape[i + offset], curDim)
-            }
-        }
-
-        for (shape in shapes) {
-            for (i in shape.indices) {
-                val curDim = shape[i]
-                val offset = totalDim - shape.size
-                if (curDim != 1 && totalShape[i + offset] != curDim) {
-                    throw RuntimeException("Shapes are not compatible and cannot be broadcast")
-                }
-            }
-        }
-
-        return totalShape
-    }
-
-    override fun broadcastTensors(vararg tensors: RealTensor): List<RealTensor> {
-        val totalShape = broadcastShapes(*(tensors.map { it.shape }).toTypedArray())
-        val n = totalShape.reduce{ acc, i ->  acc * i }
-
-        val res = ArrayList<RealTensor>(0)
-        for (tensor in tensors) {
-            val resTensor = RealTensor(totalShape, DoubleArray(n))
-
-            for (linearIndex in 0 until n) {
-                val totalMultiIndex = resTensor.strides.index(linearIndex)
-                val curMultiIndex = tensor.shape.copyOf()
-
-                val offset = totalMultiIndex.size - curMultiIndex.size
-
-                for (i in curMultiIndex.indices) {
-                    if (curMultiIndex[i] != 1) {
-                        curMultiIndex[i] = totalMultiIndex[i + offset]
-                    } else {
-                        curMultiIndex[i] = 0
-                    }
-                }
-
-                val curLinearIndex = tensor.strides.offset(curMultiIndex)
-                resTensor.buffer.array[linearIndex] = tensor.buffer.array[curLinearIndex]
-            }
-            res.add(resTensor)
-        }
-
-        return res
-    }
 
     override fun Double.plus(other: RealTensor): RealTensor {
         val resBuffer = DoubleArray(other.buffer.size) { i ->
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index ec257e45c..280acf8ea 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -13,9 +13,6 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
     public fun TensorType.copy(): TensorType
 
-    public fun broadcastShapes(vararg shapes: IntArray): IntArray
-    public fun broadcastTensors(vararg tensors: RealTensor): List<TensorType>
-
     public operator fun T.plus(other: TensorType): TensorType
     public operator fun TensorType.plus(value: T): TensorType
     public operator fun TensorType.plus(other: TensorType): TensorType
@@ -87,45 +84,4 @@ public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>
     //https://pytorch.org/docs/stable/generated/torch.symeig.html
     public fun TensorType.symEig(eigenvectors: Boolean = true): Pair<TensorType, TensorType>
 
-}
-
-public inline fun <T, TensorType : TensorStructure<T>,
-        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
-        TorchTensorAlgebraType.checkShapeCompatible(
-    a: TensorType, b: TensorType
-): Unit =
-    check(a.shape contentEquals b.shape) {
-        "Tensors must be of identical shape"
-    }
-
-public inline fun <T, TensorType : TensorStructure<T>,
-        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
-        TorchTensorAlgebraType.checkDot(a: TensorType, b: TensorType): Unit {
-    val sa = a.shape
-    val sb = b.shape
-    val na = sa.size
-    val nb = sb.size
-    var status: Boolean
-    if (nb == 1) {
-        status = sa.last() == sb[0]
-    } else {
-        status = sa.last() == sb[nb - 2]
-        if ((na > 2) and (nb > 2)) {
-            status = status and
-                    (sa.take(nb - 2).toIntArray() contentEquals sb.take(nb - 2).toIntArray())
-        }
-    }
-    check(status) { "Incompatible shapes $sa and $sb for dot product" }
-}
-
-public inline fun <T, TensorType : TensorStructure<T>,
-        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
-        TorchTensorAlgebraType.checkTranspose(dim: Int, i: Int, j: Int): Unit =
-    check((i < dim) and (j < dim)) {
-        "Cannot transpose $i to $j for a tensor of dim $dim"
-    }
-
-public inline fun <T, TensorType : TensorStructure<T>,
-        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
-        TorchTensorAlgebraType.checkView(a: TensorType, shape: IntArray): Unit =
-    check(a.shape.reduce(Int::times) == shape.reduce(Int::times))
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
index d6a6f5f16..d1d1204b4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
@@ -5,7 +5,7 @@ import space.kscience.kmath.nd.offsetFromIndex
 import kotlin.math.max
 
 
-public inline fun stridesFromShape(shape: IntArray): IntArray {
+internal inline fun stridesFromShape(shape: IntArray): IntArray {
     val nDim = shape.size
     val res = IntArray(nDim)
     if (nDim == 0)
@@ -22,7 +22,7 @@ public inline fun stridesFromShape(shape: IntArray): IntArray {
 
 }
 
-public inline fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): IntArray {
+internal inline fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): IntArray {
     val res = IntArray(nDim)
     var current = offset
     var strideIndex = 0
@@ -35,7 +35,7 @@ public inline fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): In
     return res
 }
 
-public inline fun nextIndex(index: IntArray, shape: IntArray, nDim: Int): IntArray {
+internal inline fun nextIndex(index: IntArray, shape: IntArray, nDim: Int): IntArray {
     val res = index.copyOf()
     var current = nDim - 1
     var carry = 0
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
new file mode 100644
index 000000000..65409bb15
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
@@ -0,0 +1,96 @@
+package space.kscience.kmath.tensors
+
+import space.kscience.kmath.structures.array
+import kotlin.math.max
+
+
+internal inline fun broadcastShapes(vararg shapes: IntArray): IntArray {
+    var totalDim = 0
+    for (shape in shapes) {
+        totalDim = max(totalDim, shape.size)
+    }
+
+    val totalShape = IntArray(totalDim) { 0 }
+    for (shape in shapes) {
+        for (i in shape.indices) {
+            val curDim = shape[i]
+            val offset = totalDim - shape.size
+            totalShape[i + offset] = max(totalShape[i + offset], curDim)
+        }
+    }
+
+    for (shape in shapes) {
+        for (i in shape.indices) {
+            val curDim = shape[i]
+            val offset = totalDim - shape.size
+            if (curDim != 1 && totalShape[i + offset] != curDim) {
+                throw RuntimeException("Shapes are not compatible and cannot be broadcast")
+            }
+        }
+    }
+
+    return totalShape
+}
+
+internal inline fun broadcastTensors(vararg tensors: RealTensor): List<RealTensor> {
+    val totalShape = broadcastShapes(*(tensors.map { it.shape }).toTypedArray())
+    val n = totalShape.reduce { acc, i -> acc * i }
+
+    val res = ArrayList<RealTensor>(0)
+    for (tensor in tensors) {
+        val resTensor = RealTensor(totalShape, DoubleArray(n))
+
+        for (linearIndex in 0 until n) {
+            val totalMultiIndex = resTensor.strides.index(linearIndex)
+            val curMultiIndex = tensor.shape.copyOf()
+
+            val offset = totalMultiIndex.size - curMultiIndex.size
+
+            for (i in curMultiIndex.indices) {
+                if (curMultiIndex[i] != 1) {
+                    curMultiIndex[i] = totalMultiIndex[i + offset]
+                } else {
+                    curMultiIndex[i] = 0
+                }
+            }
+
+            val curLinearIndex = tensor.strides.offset(curMultiIndex)
+            resTensor.buffer.array[linearIndex] = tensor.buffer.array[curLinearIndex]
+        }
+        res.add(resTensor)
+    }
+
+    return res
+}
+
+internal inline fun <T, TensorType : TensorStructure<T>,
+        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
+        TorchTensorAlgebraType.checkDot(a: TensorType, b: TensorType): Unit {
+    val sa = a.shape
+    val sb = b.shape
+    val na = sa.size
+    val nb = sb.size
+    var status: Boolean
+    if (nb == 1) {
+        status = sa.last() == sb[0]
+    } else {
+        status = sa.last() == sb[nb - 2]
+        if ((na > 2) and (nb > 2)) {
+            status = status and
+                    (sa.take(nb - 2).toIntArray() contentEquals sb.take(nb - 2).toIntArray())
+        }
+    }
+    check(status) { "Incompatible shapes $sa and $sb for dot product" }
+}
+
+internal inline fun <T, TensorType : TensorStructure<T>,
+        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
+        TorchTensorAlgebraType.checkTranspose(dim: Int, i: Int, j: Int): Unit =
+    check((i < dim) and (j < dim)) {
+        "Cannot transpose $i to $j for a tensor of dim $dim"
+    }
+
+internal inline fun <T, TensorType : TensorStructure<T>,
+        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
+        TorchTensorAlgebraType.checkView(a: TensorType, shape: IntArray): Unit =
+    check(a.shape.reduce(Int::times) == shape.reduce(Int::times))
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
index c9fd6bb3a..7c27f5fa9 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
@@ -2,8 +2,6 @@ package space.kscience.kmath.tensors
 
 import space.kscience.kmath.structures.array
 import kotlin.test.Test
-import kotlin.test.assertFails
-import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
 
 class TestRealTensorAlgebra {
@@ -51,11 +49,11 @@ class TestRealTensorAlgebra {
 
     @Test
     fun broadcastShapes() = RealTensorAlgebra {
-        assertTrue(this.broadcastShapes(
+        assertTrue(broadcastShapes(
             intArrayOf(2, 3), intArrayOf(1, 3), intArrayOf(1, 1, 1)
         ) contentEquals intArrayOf(1, 2, 3))
 
-        assertTrue(this.broadcastShapes(
+        assertTrue(broadcastShapes(
             intArrayOf(6, 7), intArrayOf(5, 6, 1), intArrayOf(7,), intArrayOf(5, 1, 7)
         ) contentEquals intArrayOf(5, 6, 7))
     }
@@ -66,7 +64,7 @@ class TestRealTensorAlgebra {
         val tensor2 = RealTensor(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor3 = RealTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
 
-        val res = this.broadcastTensors(tensor1, tensor2, tensor3)
+        val res = broadcastTensors(tensor1, tensor2, tensor3)
 
         assertTrue(res[0].shape contentEquals intArrayOf(1, 2, 3))
         assertTrue(res[1].shape contentEquals intArrayOf(1, 2, 3))
-- 
2.34.1


From c02f71263ded2c41806c821c351c58fd40d868ec Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Sun, 14 Mar 2021 21:18:20 +0000
Subject: [PATCH 022/713] Adding the interfaces for AnalyticTensorAlgebra and
 LinearOpsTensorAlgebra

---
 .../kmath/tensors/AnalyticTensorAlgebra.kt    | 112 +++++++++++
 .../kmath/tensors/LinearOpsTensorAlgebra.kt   |  43 ++++
 .../tensors/RealAnalyticTensorAlgebra.kt      | 148 ++++++++++++++
 .../tensors/RealLinearOpsTensorAlgebra.kt     | 133 +++++++++++++
 .../kmath/tensors/RealTensorAlgebra.kt        | 185 +++++++-----------
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  93 +++++----
 .../tensors/TensorPartialDivisionAlgebra.kt   |  27 +++
 7 files changed, 586 insertions(+), 155 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
new file mode 100644
index 000000000..17a25b6b3
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
@@ -0,0 +1,112 @@
+package space.kscience.kmath.tensors
+
+
+public interface AnalyticTensorAlgebra<T, TensorType : TensorStructure<T>> :
+    TensorPartialDivisionAlgebra<T, TensorType> {
+
+    //https://pytorch.org/docs/stable/generated/torch.exp.html
+    public fun TensorType.exp(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.log.html
+    public fun TensorType.log(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.sqrt.html
+    public fun TensorType.sqrt(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.square.html
+    public fun TensorType.square(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.acos.html#torch.cos
+    public fun TensorType.cos(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.acos.html#torch.acos
+    public fun TensorType.acos(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.cosh
+    public fun TensorType.cosh(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.acosh
+    public fun TensorType.acosh(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sin
+    public fun TensorType.sin(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asin
+    public fun TensorType.asin(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sinh
+    public fun TensorType.sinh(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asinh
+    public fun TensorType.asinh(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.atan.html#torch.tan
+    public fun TensorType.tan(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.atan.html#torch.atan
+    public fun TensorType.atan(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.tanh
+    public fun TensorType.tanh(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.atanh
+    public fun TensorType.atanh(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.ceil.html#torch.ceil
+    public fun TensorType.ceil(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.floor.html#torch.floor
+    public fun TensorType.floor(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.clamp.html#torch.clamp
+    public fun TensorType.clamp(min: T, max: T): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.erf.html#torch.erf
+    public fun TensorType.erf(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.erfinv.html#torch.erfinv
+    public fun TensorType.erfinv(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.erfc.html#torch.erfc
+    public fun TensorType.erfc(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.lerp.html#torch.lerp
+    public fun TensorType.lerp(end: TensorType, weight: TensorType): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.lgamma.html#torch.lgamma
+    public fun TensorType.lgamma(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.logit.html#torch.logit
+    public fun TensorType.logit(eps: T): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.igamma.html#torch.igamma
+    public fun TensorType.igamma(other: TensorType): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.igammac.html#torch.igammac
+    public fun TensorType.igammac(other: TensorType): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.mvlgamma.html#torch.mvlgamma
+    public fun TensorType.mvlgamma(dimensions: Int): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.polygamma.html#torch.polygamma
+    public fun TensorType.polygamma(order: Int): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.pow.html#torch.pow
+    public fun TensorType.pow(exponent: T): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.round.html#torch.round
+    public fun TensorType.round(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.sigmoid.html#torch.sigmoid
+    public fun TensorType.sigmoid(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.sinc.html#torch.sinc
+    public fun TensorType.sinc(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.heaviside.html#torch.heaviside
+    public fun TensorType.heaviside(values: TensorType): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.trapz.html#torch.trapz
+    public fun TensorType.trapz(xValues: TensorType, dim: Int): TensorType
+
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
new file mode 100644
index 000000000..bd9cbfd45
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
@@ -0,0 +1,43 @@
+package space.kscience.kmath.tensors
+
+
+public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>> :
+    TensorPartialDivisionAlgebra<T, TensorType> {
+
+    //https://pytorch.org/docs/stable/generated/torch.eye.html
+    public fun eye(n: Int): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.matmul.html
+    public infix fun TensorType.dot(other: TensorType): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.diag_embed.html
+    public fun diagonalEmbedding(
+        diagonalEntries: TensorType,
+        offset: Int = 0, dim1: Int = -2, dim2: Int = -1
+    ): TensorType
+
+    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.det
+    public fun TensorType.det(): TensorType
+
+    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.inv
+    public fun TensorType.inv(): TensorType
+
+    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.cholesky
+    public fun TensorType.cholesky(): TensorType
+
+    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.qr
+    public fun TensorType.qr(): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.lu.html
+    public fun TensorType.lu(): Pair<TensorType, IntTensor>
+
+    //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
+    public fun luPivot(aLU: TensorType, pivots: IntTensor): Triple<TensorType, TensorType, TensorType>
+
+    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.svd
+    public fun TensorType.svd(): Triple<TensorType, TensorType, TensorType>
+
+    //https://pytorch.org/docs/stable/generated/torch.symeig.html
+    public fun TensorType.symEig(eigenvectors: Boolean = true): Pair<TensorType, TensorType>
+
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt
new file mode 100644
index 000000000..cfecac0f4
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt
@@ -0,0 +1,148 @@
+package space.kscience.kmath.tensors
+
+public class RealAnalyticTensorAlgebra:
+    AnalyticTensorAlgebra<Double, RealTensor>,
+    RealTensorAlgebra()
+{
+    override fun RealTensor.exp(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.log(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.sqrt(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.square(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.cos(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.acos(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.cosh(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.acosh(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.sin(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.asin(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.sinh(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.asinh(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.tan(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.atan(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.tanh(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.atanh(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.ceil(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.floor(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.clamp(min: Double, max: Double): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.erf(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.erfinv(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.erfc(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.lerp(end: RealTensor, weight: RealTensor): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.lgamma(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.logit(eps: Double): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.igamma(other: RealTensor): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.igammac(other: RealTensor): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.mvlgamma(dimensions: Int): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.polygamma(order: Int): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.pow(exponent: Double): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.round(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.sigmoid(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.sinc(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.heaviside(values: RealTensor): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.trapz(xValues: RealTensor, dim: Int): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
new file mode 100644
index 000000000..18c2050c0
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
@@ -0,0 +1,133 @@
+package space.kscience.kmath.tensors
+
+import space.kscience.kmath.structures.array
+
+public class RealLinearOpsTensorAlgebra :
+    LinearOpsTensorAlgebra<Double, RealTensor>,
+    RealTensorAlgebra()
+{
+    override fun eye(n: Int): RealTensor {
+        val shape = intArrayOf(n, n)
+        val buffer = DoubleArray(n * n) { 0.0 }
+        val res = RealTensor(shape, buffer)
+        for (i in 0 until n) {
+            res[intArrayOf(i, i)] = 1.0
+        }
+        return res
+    }
+
+
+    override fun RealTensor.dot(other: RealTensor): RealTensor {
+        TODO("Alya")
+    }
+
+    override fun diagonalEmbedding(diagonalEntries: RealTensor, offset: Int, dim1: Int, dim2: Int): RealTensor {
+        TODO("Alya")
+    }
+
+
+    override fun RealTensor.lu(): Pair<RealTensor, IntTensor> {
+        // todo checks
+        val lu = this.copy()
+        val m = this.shape[0]
+        val pivot = IntArray(m)
+
+
+        // Initialize permutation array and parity
+        for (row in 0 until m) pivot[row] = row
+        var even = true
+
+        for (i in 0 until m) {
+            var maxA = -1.0
+            var iMax = i
+
+            for (k in i until m) {
+                val absA = kotlin.math.abs(lu[k, i])
+                if (absA > maxA) {
+                    maxA = absA
+                    iMax = k
+                }
+            }
+
+            //todo check singularity
+
+            if (iMax != i) {
+
+                val j = pivot[i]
+                pivot[i] = pivot[iMax]
+                pivot[iMax] = j
+                even != even
+
+                for (k in 0 until m) {
+                    val tmp = lu[i, k]
+                    lu[i, k] = lu[iMax, k]
+                    lu[iMax, k] = tmp
+                }
+
+            }
+
+            for (j in i + 1 until m) {
+                lu[j, i] /= lu[i, i]
+                for (k in i + 1 until m) {
+                    lu[j, k] -= lu[j, i] * lu[i, k]
+                }
+            }
+        }
+        return Pair(lu, IntTensor(intArrayOf(m), pivot))
+    }
+
+    override fun luPivot(lu: RealTensor, pivots: IntTensor): Triple<RealTensor, RealTensor, RealTensor> {
+        // todo checks
+        val n = lu.shape[0]
+        val p = lu.zeroesLike()
+        pivots.buffer.array.forEachIndexed { i, pivot ->
+            p[i, pivot] = 1.0
+        }
+        val l = lu.zeroesLike()
+        val u = lu.zeroesLike()
+
+        for (i in 0 until n) {
+            for (j in 0 until n) {
+                if (i == j) {
+                    l[i, j] = 1.0
+                }
+                if (j < i) {
+                    l[i, j] = lu[i, j]
+                }
+                if (j >= i) {
+                    u[i, j] = lu[i, j]
+                }
+            }
+        }
+        return Triple(p, l, u)
+    }
+
+    override fun RealTensor.det(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.inv(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.cholesky(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.qr(): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+
+    override fun RealTensor.svd(): Triple<RealTensor, RealTensor, RealTensor> {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.symEig(eigenvectors: Boolean): Pair<RealTensor, RealTensor> {
+        TODO("Not yet implemented")
+    }
+
+}
+
+public inline fun <R> RealLinearOpsTensorAlgebra(block: RealTensorAlgebra.() -> R): R =
+    RealTensorAlgebra().block()
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index b3e54f077..05e2b57d2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -1,12 +1,9 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.structures.RealBuffer
 import space.kscience.kmath.structures.array
-import kotlin.math.abs
-import kotlin.math.max
 
 
-public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
+public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
 
     override fun RealTensor.value(): Double {
         check(this.shape contentEquals intArrayOf(1)) {
@@ -15,24 +12,13 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         return this.buffer.array[0]
     }
 
-    override fun eye(n: Int): RealTensor {
-        val shape = intArrayOf(n, n)
-        val buffer = DoubleArray(n * n) { 0.0 }
-        val res = RealTensor(shape, buffer)
-        for (i in 0 until n) {
-            res[intArrayOf(i, i)] = 1.0
-        }
-        return res
-    }
-
     override fun zeros(shape: IntArray): RealTensor {
         TODO("Not yet implemented")
     }
 
-    override fun zeroesLike(other: RealTensor): RealTensor {
-        // TODO refactor very bad!!!
-        val shape = other.shape
-        val buffer = DoubleArray(other.buffer.size) { 0.0 }
+    override fun RealTensor.zeroesLike(): RealTensor {
+        val shape = this.shape
+        val buffer = DoubleArray(this.buffer.size) { 0.0 }
         return RealTensor(shape, buffer)
     }
 
@@ -40,7 +26,7 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
-    override fun onesLike(shape: IntArray): RealTensor {
+    override fun RealTensor.onesLike(): RealTensor {
         TODO("Not yet implemented")
     }
 
@@ -156,14 +142,6 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         return RealTensor(this.shape, resBuffer)
     }
 
-    override fun RealTensor.dot(other: RealTensor): RealTensor {
-        TODO("Alya")
-    }
-
-    override fun diagonalEmbedding(diagonalEntries: RealTensor, offset: Int, dim1: Int, dim2: Int): RealTensor {
-        TODO("Alya")
-    }
-
     override fun RealTensor.transpose(i: Int, j: Int): RealTensor {
         checkTranspose(this.dimension, i, j)
         val n = this.buffer.size
@@ -198,9 +176,64 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
+    override fun full(shape: IntArray, value: Double): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.fullLike(value: Double): RealTensor {
+        TODO("Not yet implemented")
+    }
 
 
-    override fun RealTensor.sum(): RealTensor {
+    override fun RealTensor.sum(dim: Int, keepDim: Boolean): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.cumsum(dim: Int): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.prod(dim: Int, keepDim: Boolean): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.cumprod(dim: Int): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.max(dim: Int, keepDim: Boolean): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.cummax(dim: Int): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.min(dim: Int, keepDim: Boolean): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.cummin(dim: Int): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.median(dim: Int, keepDim: Boolean): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun maximum(lhs: RealTensor, rhs: RealTensor) {
+        TODO("Not yet implemented")
+    }
+
+    override fun minimum(lhs: RealTensor, rhs: RealTensor) {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.sort(dim: Int, keepDim: Boolean, descending: Boolean): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun cat(tensors: List<RealTensor>, dim: Int): RealTensor {
         TODO("Not yet implemented")
     }
 
@@ -213,6 +246,10 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
+    override fun RealTensor.flatten(startDim: Int, endDim: Int): RealTensor {
+        TODO("Not yet implemented")
+    }
+
     override fun RealTensor.divAssign(value: Double) {
         TODO("Not yet implemented")
     }
@@ -221,99 +258,23 @@ public class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.exp(): RealTensor {
+    override fun RealTensor.mean(dim: Int, keepDim: Boolean): RealTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.log(): RealTensor {
+    override fun RealTensor.quantile(q: Double, dim: Int, keepDim: Boolean): RealTensor {
         TODO("Not yet implemented")
     }
 
-
-    override fun RealTensor.lu(): Pair<RealTensor, IntTensor> {
-        // todo checks
-        val lu = this.copy()
-        val m = this.shape[0]
-        val pivot = IntArray(m)
-
-
-        // Initialize permutation array and parity
-        for (row in 0 until m) pivot[row] = row
-        var even = true
-
-        for (i in 0 until m) {
-            var maxA = -1.0
-            var iMax = i
-
-            for (k in i until m) {
-                val absA = abs(lu[k, i])
-                if (absA > maxA) {
-                    maxA = absA
-                    iMax = k
-                }
-            }
-
-            //todo check singularity
-
-            if (iMax != i) {
-
-                val j = pivot[i]
-                pivot[i] = pivot[iMax]
-                pivot[iMax] = j
-                even != even
-
-                for (k in 0 until m) {
-                    val tmp = lu[i, k]
-                    lu[i, k] = lu[iMax, k]
-                    lu[iMax, k] = tmp
-                }
-
-            }
-
-            for (j in i + 1 until m) {
-                lu[j, i] /= lu[i, i]
-                for (k in i + 1 until m) {
-                    lu[j, k] -= lu[j, i] * lu[i, k]
-                }
-            }
-        }
-        return Pair(lu, IntTensor(intArrayOf(m), pivot))
-    }
-
-    override fun luUnpack(lu: RealTensor, pivots: IntTensor): Triple<RealTensor, RealTensor, RealTensor> {
-        // todo checks
-        val n = lu.shape[0]
-        val p = zeroesLike(lu)
-        pivots.buffer.array.forEachIndexed { i, pivot ->
-            p[i, pivot] = 1.0
-        }
-        val l = zeroesLike(lu)
-        val u = zeroesLike(lu)
-
-        for (i in 0 until n){
-            for (j in 0 until n){
-                if (i == j) {
-                    l[i, j] = 1.0
-                }
-                if (j < i) {
-                    l[i, j] = lu[i, j]
-                }
-                if (j >= i) {
-                    u[i, j] = lu[i, j]
-                }
-            }
-        }
-        return Triple(p, l, u)
-    }
-
-    override fun RealTensor.svd(): Triple<RealTensor, RealTensor, RealTensor> {
-        /**
-         * Main first task for @AlyaNovikova
-         */
+    override fun RealTensor.std(dim: Int, unbiased: Boolean, keepDim: Boolean): RealTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.symEig(eigenvectors: Boolean): Pair<RealTensor, RealTensor> {
+    override fun RealTensor.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): RealTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun RealTensor.histc(bins: Int, min: Double, max: Double): RealTensor {
         TODO("Not yet implemented")
     }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 280acf8ea..a53054e21 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -5,11 +5,17 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
     public fun TensorType.value(): T
 
-    public fun eye(n: Int): TensorType
     public fun zeros(shape: IntArray): TensorType
-    public fun zeroesLike(other: TensorType): TensorType
+    public fun TensorType.zeroesLike(): TensorType
     public fun ones(shape: IntArray): TensorType
-    public fun onesLike(shape: IntArray): TensorType
+    public fun TensorType.onesLike(): TensorType
+
+
+    //https://pytorch.org/docs/stable/generated/torch.full.html
+    public fun full(shape: IntArray, value: T): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.full_like.html#torch.full_like
+    public fun TensorType.fullLike(value: T): TensorType
 
     public fun TensorType.copy(): TensorType
 
@@ -33,15 +39,6 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     public operator fun TensorType.unaryMinus(): TensorType
 
 
-    //https://pytorch.org/docs/stable/generated/torch.matmul.html
-    public infix fun TensorType.dot(other: TensorType): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.diag_embed.html
-    public fun diagonalEmbedding(
-        diagonalEntries: TensorType,
-        offset: Int = 0, dim1: Int = -2, dim2: Int = -1
-    ): TensorType
-
     //https://pytorch.org/docs/stable/generated/torch.transpose.html
     public fun TensorType.transpose(i: Int, j: Int): TensorType
 
@@ -53,35 +50,45 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     public fun TensorType.abs(): TensorType
 
     //https://pytorch.org/docs/stable/generated/torch.sum.html
-    public fun TensorType.sum(): TensorType
+    public fun TensorType.sum(dim: Int, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.cumsum.html#torch.cumsum
+    public fun TensorType.cumsum(dim: Int): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.prod.html#torch.prod
+    public fun TensorType.prod(dim: Int, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.cumprod.html#torch.cumprod
+    public fun TensorType.cumprod(dim: Int): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.max.html#torch.max
+    public fun TensorType.max(dim: Int, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.cummax.html#torch.cummax
+    public fun TensorType.cummax(dim: Int): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.min.html#torch.min
+    public fun TensorType.min(dim: Int, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.cummin.html#torch.cummin
+    public fun TensorType.cummin(dim: Int): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.median.html#torch.median
+    public fun TensorType.median(dim: Int, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.maximum.html#torch.maximum
+    public fun maximum(lhs: TensorType, rhs: TensorType)
+
+    //https://pytorch.org/docs/stable/generated/torch.minimum.html#torch.minimum
+    public fun minimum(lhs: TensorType, rhs: TensorType)
+
+    //https://pytorch.org/docs/stable/generated/torch.sort.html#torch.sort
+    public fun TensorType.sort(dim: Int, keepDim: Boolean, descending: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.cat.html#torch.cat
+    public fun cat(tensors: List<TensorType>, dim: Int): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.flatten.html#torch.flatten
+    public fun TensorType.flatten(startDim: Int, endDim: Int): TensorType
+
 }
-
-// https://proofwiki.org/wiki/Definition:Division_Algebra
-public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>> :
-    TensorAlgebra<T, TensorType> {
-
-    public operator fun TensorType.div(value: T): TensorType
-    public operator fun TensorType.div(other: TensorType): TensorType
-    public operator fun TensorType.divAssign(value: T)
-    public operator fun TensorType.divAssign(other: TensorType)
-
-    //https://pytorch.org/docs/stable/generated/torch.exp.html
-    public fun TensorType.exp(): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.log.html
-    public fun TensorType.log(): TensorType
-
-    // todo change type of pivots
-    //https://pytorch.org/docs/stable/generated/torch.lu.html
-    public fun TensorType.lu(): Pair<TensorType, IntTensor>
-
-    //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
-    public fun luUnpack(A_LU: TensorType, pivots: IntTensor): Triple<TensorType, TensorType, TensorType>
-
-    //https://pytorch.org/docs/stable/generated/torch.svd.html
-    public fun TensorType.svd(): Triple<TensorType, TensorType, TensorType>
-
-    //https://pytorch.org/docs/stable/generated/torch.symeig.html
-    public fun TensorType.symEig(eigenvectors: Boolean = true): Pair<TensorType, TensorType>
-
-}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
new file mode 100644
index 000000000..2d448fa8c
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
@@ -0,0 +1,27 @@
+package space.kscience.kmath.tensors
+
+// https://proofwiki.org/wiki/Definition:Division_Algebra
+public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>> :
+    TensorAlgebra<T, TensorType> {
+
+    public operator fun TensorType.div(value: T): TensorType
+    public operator fun TensorType.div(other: TensorType): TensorType
+    public operator fun TensorType.divAssign(value: T)
+    public operator fun TensorType.divAssign(other: TensorType)
+
+    //https://pytorch.org/docs/stable/generated/torch.mean.html#torch.mean
+    public fun TensorType.mean(dim: Int, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.quantile.html#torch.quantile
+    public fun TensorType.quantile(q: T, dim: Int, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.std.html#torch.std
+    public fun TensorType.std(dim: Int, unbiased: Boolean, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.var.html#torch.var
+    public fun TensorType.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.histc.html#torch.histc
+    public fun TensorType.histc(bins: Int, min: T, max: T): TensorType
+
+}
-- 
2.34.1


From 39a088912346078f3c3647ac262b2cf8c490aa4a Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 15 Mar 2021 07:50:20 +0000
Subject: [PATCH 023/713] Dev merge assemble fixed, tests still broken

---
 .../kmath/tensors/LinearOpsTensorAlgebra.kt   |  2 +-
 .../tensors/RealAnalyticTensorAlgebra.kt      |  4 +-
 .../tensors/RealLinearOpsTensorAlgebra.kt     |  7 +--
 .../kmath/tensors/RealTensorAlgebra.kt        | 46 +++++++++----------
 .../space/kscience/kmath/tensors/utils.kt     |  4 +-
 .../kscience/kmath/tensors/TestRealTensor.kt  |  4 +-
 .../kmath/tensors/TestRealTensorAlgebra.kt    | 26 +++++------
 7 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
index bd9cbfd45..db1135a33 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
@@ -32,7 +32,7 @@ public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>> :
     public fun TensorType.lu(): Pair<TensorType, IntTensor>
 
     //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
-    public fun luPivot(aLU: TensorType, pivots: IntTensor): Triple<TensorType, TensorType, TensorType>
+    public fun luPivot(lu: TensorType, pivots: IntTensor): Triple<TensorType, TensorType, TensorType>
 
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.svd
     public fun TensorType.svd(): Triple<TensorType, TensorType, TensorType>
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt
index cfecac0f4..a93ebcb89 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt
@@ -144,5 +144,7 @@ public class RealAnalyticTensorAlgebra:
         TODO("Not yet implemented")
     }
 
+}
 
-}
\ No newline at end of file
+public inline fun <R> RealAnalyticTensorAlgebra(block: RealTensorAlgebra.() -> R): R =
+    RealAnalyticTensorAlgebra().block()
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
index 18c2050c0..98a5e581f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
@@ -1,6 +1,7 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.structures.array
+import space.kscience.kmath.structures.toDoubleArray
+import space.kscience.kmath.structures.toIntArray
 
 public class RealLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double, RealTensor>,
@@ -80,7 +81,7 @@ public class RealLinearOpsTensorAlgebra :
         // todo checks
         val n = lu.shape[0]
         val p = lu.zeroesLike()
-        pivots.buffer.array.forEachIndexed { i, pivot ->
+        pivots.buffer.toIntArray().forEachIndexed { i, pivot ->
             p[i, pivot] = 1.0
         }
         val l = lu.zeroesLike()
@@ -130,4 +131,4 @@ public class RealLinearOpsTensorAlgebra :
 }
 
 public inline fun <R> RealLinearOpsTensorAlgebra(block: RealTensorAlgebra.() -> R): R =
-    RealTensorAlgebra().block()
\ No newline at end of file
+    RealLinearOpsTensorAlgebra().block()
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index 05e2b57d2..10cc0edad 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.structures.array
+import space.kscience.kmath.structures.toDoubleArray
 
 
 public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
@@ -9,7 +9,7 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
         check(this.shape contentEquals intArrayOf(1)) {
             "Inconsistent value for tensor of shape ${shape.toList()}"
         }
-        return this.buffer.array[0]
+        return this.buffer.toDoubleArray()[0]
     }
 
     override fun zeros(shape: IntArray): RealTensor {
@@ -32,13 +32,13 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
 
     override fun RealTensor.copy(): RealTensor {
         // should be rework as soon as copy() method for NDBuffer will be available
-        return RealTensor(this.shape, this.buffer.array.copyOf())
+        return RealTensor(this.shape, this.buffer.toDoubleArray().copyOf())
     }
 
 
     override fun Double.plus(other: RealTensor): RealTensor {
         val resBuffer = DoubleArray(other.buffer.size) { i ->
-            other.buffer.array[i] + this
+            other.buffer.toDoubleArray()[i] + this
         }
         return RealTensor(other.shape, resBuffer)
     }
@@ -50,34 +50,34 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.buffer.size) { i ->
-            newThis.buffer.array[i] + newOther.buffer.array[i]
+            newThis.buffer.toDoubleArray()[i] + newOther.buffer.toDoubleArray()[i]
         }
         return RealTensor(newThis.shape, resBuffer)
     }
 
     override fun RealTensor.plusAssign(value: Double) {
-        for (i in this.buffer.array.indices) {
-            this.buffer.array[i] += value
+        for (i in this.buffer.toDoubleArray().indices) {
+            this.buffer.toDoubleArray()[i] += value
         }
     }
 
     override fun RealTensor.plusAssign(other: RealTensor) {
         //todo should be change with broadcasting
-        for (i in this.buffer.array.indices) {
-            this.buffer.array[i] += other.buffer.array[i]
+        for (i in this.buffer.toDoubleArray().indices) {
+            this.buffer.toDoubleArray()[i] += other.buffer.toDoubleArray()[i]
         }
     }
 
     override fun Double.minus(other: RealTensor): RealTensor {
         val resBuffer = DoubleArray(other.buffer.size) { i ->
-            this - other.buffer.array[i]
+            this - other.buffer.toDoubleArray()[i]
         }
         return RealTensor(other.shape, resBuffer)
     }
 
     override fun RealTensor.minus(value: Double): RealTensor {
         val resBuffer = DoubleArray(this.buffer.size) { i ->
-            this.buffer.array[i] - value
+            this.buffer.toDoubleArray()[i] - value
         }
         return RealTensor(this.shape, resBuffer)
     }
@@ -87,14 +87,14 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.buffer.size) { i ->
-            newThis.buffer.array[i] - newOther.buffer.array[i]
+            newThis.buffer.toDoubleArray()[i] - newOther.buffer.toDoubleArray()[i]
         }
         return RealTensor(newThis.shape, resBuffer)
     }
 
     override fun RealTensor.minusAssign(value: Double) {
-        for (i in this.buffer.array.indices) {
-            this.buffer.array[i] -= value
+        for (i in this.buffer.toDoubleArray().indices) {
+            this.buffer.toDoubleArray()[i] -= value
         }
     }
 
@@ -105,7 +105,7 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
     override fun Double.times(other: RealTensor): RealTensor {
         //todo should be change with broadcasting
         val resBuffer = DoubleArray(other.buffer.size) { i ->
-            other.buffer.array[i] * this
+            other.buffer.toDoubleArray()[i] * this
         }
         return RealTensor(other.shape, resBuffer)
     }
@@ -116,28 +116,28 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
     override fun RealTensor.times(other: RealTensor): RealTensor {
         //todo should be change with broadcasting
         val resBuffer = DoubleArray(this.buffer.size) { i ->
-            this.buffer.array[i] * other.buffer.array[i]
+            this.buffer.toDoubleArray()[i] * other.buffer.toDoubleArray()[i]
         }
         return RealTensor(this.shape, resBuffer)
     }
 
     override fun RealTensor.timesAssign(value: Double) {
         //todo should be change with broadcasting
-        for (i in this.buffer.array.indices) {
-            this.buffer.array[i] *= value
+        for (i in this.buffer.toDoubleArray().indices) {
+            this.buffer.toDoubleArray()[i] *= value
         }
     }
 
     override fun RealTensor.timesAssign(other: RealTensor) {
         //todo should be change with broadcasting
-        for (i in this.buffer.array.indices) {
-            this.buffer.array[i] *= other.buffer.array[i]
+        for (i in this.buffer.toDoubleArray().indices) {
+            this.buffer.toDoubleArray()[i] *= other.buffer.toDoubleArray()[i]
         }
     }
 
     override fun RealTensor.unaryMinus(): RealTensor {
         val resBuffer = DoubleArray(this.buffer.size) { i ->
-            this.buffer.array[i].unaryMinus()
+            this.buffer.toDoubleArray()[i].unaryMinus()
         }
         return RealTensor(this.shape, resBuffer)
     }
@@ -158,14 +158,14 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
             newMultiIndex[i] = newMultiIndex[j].also { newMultiIndex[j] = newMultiIndex[i] }
 
             val linearIndex = resTensor.strides.offset(newMultiIndex)
-            resTensor.buffer.array[linearIndex] = this.buffer.array[offset]
+            resTensor.buffer.toDoubleArray()[linearIndex] = this.buffer.toDoubleArray()[offset]
         }
         return resTensor
     }
 
 
     override fun RealTensor.view(shape: IntArray): RealTensor {
-        return RealTensor(shape, this.buffer.array)
+        return RealTensor(shape, this.buffer.toDoubleArray())
     }
 
     override fun RealTensor.viewAs(other: RealTensor): RealTensor {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
index 65409bb15..f61bdbd01 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.structures.array
+import space.kscience.kmath.structures.toDoubleArray
 import kotlin.math.max
 
 
@@ -55,7 +55,7 @@ internal inline fun broadcastTensors(vararg tensors: RealTensor): List<RealTenso
             }
 
             val curLinearIndex = tensor.strides.offset(curMultiIndex)
-            resTensor.buffer.array[linearIndex] = tensor.buffer.array[curLinearIndex]
+            resTensor.buffer.toDoubleArray()[linearIndex] = tensor.buffer.toDoubleArray()[curLinearIndex]
         }
         res.add(resTensor)
     }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
index d96b00baf..473a3da8b 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
@@ -1,7 +1,7 @@
 package space.kscience.kmath.tensors
 
 
-import space.kscience.kmath.structures.array
+import space.kscience.kmath.structures.toDoubleArray
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -19,6 +19,6 @@ class TestRealTensor {
     fun stridesTest(){
         val tensor = RealTensor(intArrayOf(2,2), doubleArrayOf(3.5,5.8,58.4,2.4))
         assertEquals(tensor[intArrayOf(0,1)], 5.8)
-        assertTrue(tensor.elements().map{ it.second }.toList().toDoubleArray() contentEquals tensor.buffer.array)
+        assertTrue(tensor.elements().map{ it.second }.toList().toDoubleArray() contentEquals tensor.buffer.toDoubleArray())
     }
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
index 7c27f5fa9..80e3c3eab 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.structures.array
+import space.kscience.kmath.structures.toDoubleArray
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
@@ -10,7 +10,7 @@ class TestRealTensorAlgebra {
     fun doublePlus() = RealTensorAlgebra {
         val tensor = RealTensor(intArrayOf(2), doubleArrayOf(1.0, 2.0))
         val res = 10.0 + tensor
-        assertTrue(res.buffer.array contentEquals doubleArrayOf(11.0,12.0))
+        assertTrue(res.buffer.toDoubleArray() contentEquals doubleArrayOf(11.0,12.0))
     }
 
     @Test
@@ -18,7 +18,7 @@ class TestRealTensorAlgebra {
         val tensor = RealTensor(intArrayOf(1), doubleArrayOf(0.0))
         val res = tensor.transpose(0, 0)
 
-        assertTrue(res.buffer.array contentEquals doubleArrayOf(0.0))
+        assertTrue(res.buffer.toDoubleArray() contentEquals doubleArrayOf(0.0))
         assertTrue(res.shape contentEquals intArrayOf(1))
     }
 
@@ -27,7 +27,7 @@ class TestRealTensorAlgebra {
         val tensor = RealTensor(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res = tensor.transpose(1, 0)
 
-        assertTrue(res.buffer.array contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
+        assertTrue(res.buffer.toDoubleArray() contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
         assertTrue(res.shape contentEquals intArrayOf(2, 3))
     }
 
@@ -42,9 +42,9 @@ class TestRealTensorAlgebra {
         assertTrue(res02.shape contentEquals intArrayOf(3, 2, 1))
         assertTrue(res12.shape contentEquals intArrayOf(1, 3, 2))
 
-        assertTrue(res01.buffer.array contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res02.buffer.array contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
-        assertTrue(res12.buffer.array contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res01.buffer.toDoubleArray() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res02.buffer.toDoubleArray() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res12.buffer.toDoubleArray() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
     }
 
     @Test
@@ -70,9 +70,9 @@ class TestRealTensorAlgebra {
         assertTrue(res[1].shape contentEquals intArrayOf(1, 2, 3))
         assertTrue(res[2].shape contentEquals intArrayOf(1, 2, 3))
 
-        assertTrue(res[0].buffer.array contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res[1].buffer.array contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
-        assertTrue(res[2].buffer.array contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
+        assertTrue(res[0].buffer.toDoubleArray() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res[1].buffer.toDoubleArray() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
+        assertTrue(res[2].buffer.toDoubleArray() contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
     }
 
     @Test
@@ -82,14 +82,14 @@ class TestRealTensorAlgebra {
         val tensor3 = RealTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
 
         assertTrue((tensor2 - tensor1).shape contentEquals intArrayOf(2, 3))
-        assertTrue((tensor2 - tensor1).buffer.array contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
+        assertTrue((tensor2 - tensor1).buffer.toDoubleArray() contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
 
         assertTrue((tensor3 - tensor1).shape contentEquals intArrayOf(1, 2, 3))
-        assertTrue((tensor3 - tensor1).buffer.array
+        assertTrue((tensor3 - tensor1).buffer.toDoubleArray()
                 contentEquals doubleArrayOf(499.0, 498.0, 497.0, 496.0, 495.0, 494.0))
 
         assertTrue((tensor3 - tensor2).shape contentEquals intArrayOf(1, 1, 3))
-        assertTrue((tensor3 - tensor2).buffer.array contentEquals doubleArrayOf(490.0, 480.0, 470.0))
+        assertTrue((tensor3 - tensor2).buffer.toDoubleArray() contentEquals doubleArrayOf(490.0, 480.0, 470.0))
     }
 
 }
\ No newline at end of file
-- 
2.34.1


From 04f6ef1ed0c691d9510ce0c5ff87c16afe4894e6 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 15 Mar 2021 08:31:19 +0000
Subject: [PATCH 024/713] Fixed tests with unsafe accessors

---
 .../kscience/kmath/structures/FloatBuffer.kt  |  8 ++++
 .../kscience/kmath/structures/IntBuffer.kt    |  8 ++++
 .../kscience/kmath/structures/LongBuffer.kt   |  8 ++++
 .../kscience/kmath/structures/RealBuffer.kt   |  8 ++++
 .../tensors/RealLinearOpsTensorAlgebra.kt     |  5 +-
 .../kmath/tensors/RealTensorAlgebra.kt        | 46 +++++++++----------
 .../space/kscience/kmath/tensors/utils.kt     |  4 +-
 7 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
index 9fc7d55f3..dbcf35504 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
@@ -43,6 +43,14 @@ public fun Buffer<Float>.toFloatArray(): FloatArray = when(this) {
     else -> FloatArray(size, ::get)
 }
 
+/**
+ * Returns a reference to [FloatArray] containing all of the elements of this [Buffer].
+ */
+public fun Buffer<Float>.unsafeToFloatArray(): FloatArray = when(this) {
+    is FloatBuffer -> array
+    else -> throw RuntimeException("Failed to cast Buffer to FloatArray")
+}
+
 /**
  * Returns [FloatBuffer] over this array.
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
index d3d0f79a5..d58451bc4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
@@ -42,6 +42,14 @@ public fun Buffer<Int>.toIntArray(): IntArray = when(this) {
     else -> IntArray(size, ::get)
 }
 
+/**
+ * Returns a reference to [IntArray] containing all of the elements of this [Buffer].
+ */
+public fun Buffer<Int>.unsafeToIntArray(): IntArray = when(this) {
+    is IntBuffer -> array
+    else -> throw RuntimeException("Failed to cast Buffer to IntArray")
+}
+
 /**
  * Returns [IntBuffer] over this array.
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
index fec358421..3fa9bf861 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
@@ -42,6 +42,14 @@ public fun Buffer<Long>.toLongArray(): LongArray = when(this) {
     else -> LongArray(size, ::get)
 }
 
+/**
+ * Returns a reference to [LongArray] containing all of the elements of this [Buffer].
+ */
+public fun Buffer<Long>.unsafeToLongArray(): LongArray = when(this) {
+    is LongBuffer -> array
+    else -> throw RuntimeException("Failed to cast Buffer to LongArray")
+}
+
 /**
  * Returns [LongBuffer] over this array.
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/RealBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/RealBuffer.kt
index 01b533138..69e1ae9cd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/RealBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/RealBuffer.kt
@@ -47,6 +47,14 @@ public fun Buffer<Double>.toDoubleArray(): DoubleArray = when(this) {
     else -> DoubleArray(size, ::get)
 }
 
+/**
+ * Returns a reference to [DoubleArray] containing all of the elements of this [Buffer].
+ */
+public fun Buffer<Double>.unsafeToDoubleArray(): DoubleArray = when(this) {
+    is RealBuffer -> array
+    else -> throw RuntimeException("Failed to cast Buffer to DoubleArray")
+}
+
 /**
  * Returns [RealBuffer] over this array.
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
index 98a5e581f..f73e4c4cd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
@@ -1,7 +1,6 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.structures.toDoubleArray
-import space.kscience.kmath.structures.toIntArray
+import space.kscience.kmath.structures.unsafeToIntArray
 
 public class RealLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double, RealTensor>,
@@ -81,7 +80,7 @@ public class RealLinearOpsTensorAlgebra :
         // todo checks
         val n = lu.shape[0]
         val p = lu.zeroesLike()
-        pivots.buffer.toIntArray().forEachIndexed { i, pivot ->
+        pivots.buffer.unsafeToIntArray().forEachIndexed { i, pivot ->
             p[i, pivot] = 1.0
         }
         val l = lu.zeroesLike()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index 10cc0edad..ee0733577 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.structures.toDoubleArray
+import space.kscience.kmath.structures.unsafeToDoubleArray
 
 
 public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
@@ -9,7 +9,7 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
         check(this.shape contentEquals intArrayOf(1)) {
             "Inconsistent value for tensor of shape ${shape.toList()}"
         }
-        return this.buffer.toDoubleArray()[0]
+        return this.buffer.unsafeToDoubleArray()[0]
     }
 
     override fun zeros(shape: IntArray): RealTensor {
@@ -32,13 +32,13 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
 
     override fun RealTensor.copy(): RealTensor {
         // should be rework as soon as copy() method for NDBuffer will be available
-        return RealTensor(this.shape, this.buffer.toDoubleArray().copyOf())
+        return RealTensor(this.shape, this.buffer.unsafeToDoubleArray().copyOf())
     }
 
 
     override fun Double.plus(other: RealTensor): RealTensor {
         val resBuffer = DoubleArray(other.buffer.size) { i ->
-            other.buffer.toDoubleArray()[i] + this
+            other.buffer.unsafeToDoubleArray()[i] + this
         }
         return RealTensor(other.shape, resBuffer)
     }
@@ -50,34 +50,34 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.buffer.size) { i ->
-            newThis.buffer.toDoubleArray()[i] + newOther.buffer.toDoubleArray()[i]
+            newThis.buffer.unsafeToDoubleArray()[i] + newOther.buffer.unsafeToDoubleArray()[i]
         }
         return RealTensor(newThis.shape, resBuffer)
     }
 
     override fun RealTensor.plusAssign(value: Double) {
-        for (i in this.buffer.toDoubleArray().indices) {
-            this.buffer.toDoubleArray()[i] += value
+        for (i in this.buffer.unsafeToDoubleArray().indices) {
+            this.buffer.unsafeToDoubleArray()[i] += value
         }
     }
 
     override fun RealTensor.plusAssign(other: RealTensor) {
         //todo should be change with broadcasting
-        for (i in this.buffer.toDoubleArray().indices) {
-            this.buffer.toDoubleArray()[i] += other.buffer.toDoubleArray()[i]
+        for (i in this.buffer.unsafeToDoubleArray().indices) {
+            this.buffer.unsafeToDoubleArray()[i] += other.buffer.unsafeToDoubleArray()[i]
         }
     }
 
     override fun Double.minus(other: RealTensor): RealTensor {
         val resBuffer = DoubleArray(other.buffer.size) { i ->
-            this - other.buffer.toDoubleArray()[i]
+            this - other.buffer.unsafeToDoubleArray()[i]
         }
         return RealTensor(other.shape, resBuffer)
     }
 
     override fun RealTensor.minus(value: Double): RealTensor {
         val resBuffer = DoubleArray(this.buffer.size) { i ->
-            this.buffer.toDoubleArray()[i] - value
+            this.buffer.unsafeToDoubleArray()[i] - value
         }
         return RealTensor(this.shape, resBuffer)
     }
@@ -87,14 +87,14 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.buffer.size) { i ->
-            newThis.buffer.toDoubleArray()[i] - newOther.buffer.toDoubleArray()[i]
+            newThis.buffer.unsafeToDoubleArray()[i] - newOther.buffer.unsafeToDoubleArray()[i]
         }
         return RealTensor(newThis.shape, resBuffer)
     }
 
     override fun RealTensor.minusAssign(value: Double) {
-        for (i in this.buffer.toDoubleArray().indices) {
-            this.buffer.toDoubleArray()[i] -= value
+        for (i in this.buffer.unsafeToDoubleArray().indices) {
+            this.buffer.unsafeToDoubleArray()[i] -= value
         }
     }
 
@@ -105,7 +105,7 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
     override fun Double.times(other: RealTensor): RealTensor {
         //todo should be change with broadcasting
         val resBuffer = DoubleArray(other.buffer.size) { i ->
-            other.buffer.toDoubleArray()[i] * this
+            other.buffer.unsafeToDoubleArray()[i] * this
         }
         return RealTensor(other.shape, resBuffer)
     }
@@ -116,28 +116,28 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
     override fun RealTensor.times(other: RealTensor): RealTensor {
         //todo should be change with broadcasting
         val resBuffer = DoubleArray(this.buffer.size) { i ->
-            this.buffer.toDoubleArray()[i] * other.buffer.toDoubleArray()[i]
+            this.buffer.unsafeToDoubleArray()[i] * other.buffer.unsafeToDoubleArray()[i]
         }
         return RealTensor(this.shape, resBuffer)
     }
 
     override fun RealTensor.timesAssign(value: Double) {
         //todo should be change with broadcasting
-        for (i in this.buffer.toDoubleArray().indices) {
-            this.buffer.toDoubleArray()[i] *= value
+        for (i in this.buffer.unsafeToDoubleArray().indices) {
+            this.buffer.unsafeToDoubleArray()[i] *= value
         }
     }
 
     override fun RealTensor.timesAssign(other: RealTensor) {
         //todo should be change with broadcasting
-        for (i in this.buffer.toDoubleArray().indices) {
-            this.buffer.toDoubleArray()[i] *= other.buffer.toDoubleArray()[i]
+        for (i in this.buffer.unsafeToDoubleArray().indices) {
+            this.buffer.unsafeToDoubleArray()[i] *= other.buffer.unsafeToDoubleArray()[i]
         }
     }
 
     override fun RealTensor.unaryMinus(): RealTensor {
         val resBuffer = DoubleArray(this.buffer.size) { i ->
-            this.buffer.toDoubleArray()[i].unaryMinus()
+            this.buffer.unsafeToDoubleArray()[i].unaryMinus()
         }
         return RealTensor(this.shape, resBuffer)
     }
@@ -158,14 +158,14 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
             newMultiIndex[i] = newMultiIndex[j].also { newMultiIndex[j] = newMultiIndex[i] }
 
             val linearIndex = resTensor.strides.offset(newMultiIndex)
-            resTensor.buffer.toDoubleArray()[linearIndex] = this.buffer.toDoubleArray()[offset]
+            resTensor.buffer.unsafeToDoubleArray()[linearIndex] = this.buffer.unsafeToDoubleArray()[offset]
         }
         return resTensor
     }
 
 
     override fun RealTensor.view(shape: IntArray): RealTensor {
-        return RealTensor(shape, this.buffer.toDoubleArray())
+        return RealTensor(shape, this.buffer.unsafeToDoubleArray())
     }
 
     override fun RealTensor.viewAs(other: RealTensor): RealTensor {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
index f61bdbd01..04b4ddcbf 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.structures.toDoubleArray
+import space.kscience.kmath.structures.unsafeToDoubleArray
 import kotlin.math.max
 
 
@@ -55,7 +55,7 @@ internal inline fun broadcastTensors(vararg tensors: RealTensor): List<RealTenso
             }
 
             val curLinearIndex = tensor.strides.offset(curMultiIndex)
-            resTensor.buffer.toDoubleArray()[linearIndex] = tensor.buffer.toDoubleArray()[curLinearIndex]
+            resTensor.buffer.unsafeToDoubleArray()[linearIndex] = tensor.buffer.unsafeToDoubleArray()[curLinearIndex]
         }
         res.add(resTensor)
     }
-- 
2.34.1


From 4e4690e5104af58d48fd8f08d2fdbbb132f26751 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 15 Mar 2021 08:48:31 +0000
Subject: [PATCH 025/713] unsafe buffer casts moved to internal utils

---
 .../kscience/kmath/structures/FloatBuffer.kt  |  8 -----
 .../kscience/kmath/structures/IntBuffer.kt    |  8 -----
 .../kscience/kmath/structures/LongBuffer.kt   |  8 -----
 .../kscience/kmath/structures/RealBuffer.kt   |  8 -----
 .../tensors/RealLinearOpsTensorAlgebra.kt     |  2 --
 .../kmath/tensors/RealTensorAlgebra.kt        |  2 --
 .../space/kscience/kmath/tensors/utils.kt     | 36 +++++++++++++++++--
 .../kmath/tensors/TestRealTensorAlgebra.kt    | 26 +++++++-------
 8 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
index dbcf35504..9fc7d55f3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
@@ -43,14 +43,6 @@ public fun Buffer<Float>.toFloatArray(): FloatArray = when(this) {
     else -> FloatArray(size, ::get)
 }
 
-/**
- * Returns a reference to [FloatArray] containing all of the elements of this [Buffer].
- */
-public fun Buffer<Float>.unsafeToFloatArray(): FloatArray = when(this) {
-    is FloatBuffer -> array
-    else -> throw RuntimeException("Failed to cast Buffer to FloatArray")
-}
-
 /**
  * Returns [FloatBuffer] over this array.
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
index d58451bc4..d3d0f79a5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
@@ -42,14 +42,6 @@ public fun Buffer<Int>.toIntArray(): IntArray = when(this) {
     else -> IntArray(size, ::get)
 }
 
-/**
- * Returns a reference to [IntArray] containing all of the elements of this [Buffer].
- */
-public fun Buffer<Int>.unsafeToIntArray(): IntArray = when(this) {
-    is IntBuffer -> array
-    else -> throw RuntimeException("Failed to cast Buffer to IntArray")
-}
-
 /**
  * Returns [IntBuffer] over this array.
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
index 3fa9bf861..fec358421 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
@@ -42,14 +42,6 @@ public fun Buffer<Long>.toLongArray(): LongArray = when(this) {
     else -> LongArray(size, ::get)
 }
 
-/**
- * Returns a reference to [LongArray] containing all of the elements of this [Buffer].
- */
-public fun Buffer<Long>.unsafeToLongArray(): LongArray = when(this) {
-    is LongBuffer -> array
-    else -> throw RuntimeException("Failed to cast Buffer to LongArray")
-}
-
 /**
  * Returns [LongBuffer] over this array.
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/RealBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/RealBuffer.kt
index 69e1ae9cd..01b533138 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/RealBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/RealBuffer.kt
@@ -47,14 +47,6 @@ public fun Buffer<Double>.toDoubleArray(): DoubleArray = when(this) {
     else -> DoubleArray(size, ::get)
 }
 
-/**
- * Returns a reference to [DoubleArray] containing all of the elements of this [Buffer].
- */
-public fun Buffer<Double>.unsafeToDoubleArray(): DoubleArray = when(this) {
-    is RealBuffer -> array
-    else -> throw RuntimeException("Failed to cast Buffer to DoubleArray")
-}
-
 /**
  * Returns [RealBuffer] over this array.
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
index f73e4c4cd..dcd740356 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
@@ -1,7 +1,5 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.structures.unsafeToIntArray
-
 public class RealLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double, RealTensor>,
     RealTensorAlgebra()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
index ee0733577..83a513a7a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
@@ -1,7 +1,5 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.structures.unsafeToDoubleArray
-
 
 public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
index 04b4ddcbf..b03fb7dd7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.structures.unsafeToDoubleArray
+import space.kscience.kmath.structures.*
 import kotlin.math.max
 
 
@@ -93,4 +93,36 @@ internal inline fun <T, TensorType : TensorStructure<T>,
 internal inline fun <T, TensorType : TensorStructure<T>,
         TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
         TorchTensorAlgebraType.checkView(a: TensorType, shape: IntArray): Unit =
-    check(a.shape.reduce(Int::times) == shape.reduce(Int::times))
\ No newline at end of file
+    check(a.shape.reduce(Int::times) == shape.reduce(Int::times))
+
+/**
+ * Returns a reference to [IntArray] containing all of the elements of this [Buffer].
+ */
+internal fun Buffer<Int>.unsafeToIntArray(): IntArray = when(this) {
+    is IntBuffer -> array
+    else -> throw RuntimeException("Failed to cast Buffer to IntArray")
+}
+
+/**
+ * Returns a reference to [LongArray] containing all of the elements of this [Buffer].
+ */
+internal fun Buffer<Long>.unsafeToLongArray(): LongArray = when(this) {
+    is LongBuffer -> array
+    else -> throw RuntimeException("Failed to cast Buffer to LongArray")
+}
+
+/**
+ * Returns a reference to [FloatArray] containing all of the elements of this [Buffer].
+ */
+internal fun Buffer<Float>.unsafeToFloatArray(): FloatArray = when(this) {
+    is FloatBuffer -> array
+    else -> throw RuntimeException("Failed to cast Buffer to FloatArray")
+}
+
+/**
+ * Returns a reference to [DoubleArray] containing all of the elements of this [Buffer].
+ */
+internal fun Buffer<Double>.unsafeToDoubleArray(): DoubleArray = when(this) {
+    is RealBuffer -> array
+    else -> throw RuntimeException("Failed to cast Buffer to DoubleArray")
+}
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
index 80e3c3eab..72bbf1787 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.structures.toDoubleArray
+
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
@@ -10,7 +10,7 @@ class TestRealTensorAlgebra {
     fun doublePlus() = RealTensorAlgebra {
         val tensor = RealTensor(intArrayOf(2), doubleArrayOf(1.0, 2.0))
         val res = 10.0 + tensor
-        assertTrue(res.buffer.toDoubleArray() contentEquals doubleArrayOf(11.0,12.0))
+        assertTrue(res.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(11.0,12.0))
     }
 
     @Test
@@ -18,7 +18,7 @@ class TestRealTensorAlgebra {
         val tensor = RealTensor(intArrayOf(1), doubleArrayOf(0.0))
         val res = tensor.transpose(0, 0)
 
-        assertTrue(res.buffer.toDoubleArray() contentEquals doubleArrayOf(0.0))
+        assertTrue(res.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(0.0))
         assertTrue(res.shape contentEquals intArrayOf(1))
     }
 
@@ -27,7 +27,7 @@ class TestRealTensorAlgebra {
         val tensor = RealTensor(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res = tensor.transpose(1, 0)
 
-        assertTrue(res.buffer.toDoubleArray() contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
+        assertTrue(res.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
         assertTrue(res.shape contentEquals intArrayOf(2, 3))
     }
 
@@ -42,9 +42,9 @@ class TestRealTensorAlgebra {
         assertTrue(res02.shape contentEquals intArrayOf(3, 2, 1))
         assertTrue(res12.shape contentEquals intArrayOf(1, 3, 2))
 
-        assertTrue(res01.buffer.toDoubleArray() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res02.buffer.toDoubleArray() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
-        assertTrue(res12.buffer.toDoubleArray() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res01.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res02.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res12.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
     }
 
     @Test
@@ -70,9 +70,9 @@ class TestRealTensorAlgebra {
         assertTrue(res[1].shape contentEquals intArrayOf(1, 2, 3))
         assertTrue(res[2].shape contentEquals intArrayOf(1, 2, 3))
 
-        assertTrue(res[0].buffer.toDoubleArray() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res[1].buffer.toDoubleArray() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
-        assertTrue(res[2].buffer.toDoubleArray() contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
+        assertTrue(res[0].buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res[1].buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
+        assertTrue(res[2].buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
     }
 
     @Test
@@ -82,14 +82,14 @@ class TestRealTensorAlgebra {
         val tensor3 = RealTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
 
         assertTrue((tensor2 - tensor1).shape contentEquals intArrayOf(2, 3))
-        assertTrue((tensor2 - tensor1).buffer.toDoubleArray() contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
+        assertTrue((tensor2 - tensor1).buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
 
         assertTrue((tensor3 - tensor1).shape contentEquals intArrayOf(1, 2, 3))
-        assertTrue((tensor3 - tensor1).buffer.toDoubleArray()
+        assertTrue((tensor3 - tensor1).buffer.unsafeToDoubleArray()
                 contentEquals doubleArrayOf(499.0, 498.0, 497.0, 496.0, 495.0, 494.0))
 
         assertTrue((tensor3 - tensor2).shape contentEquals intArrayOf(1, 1, 3))
-        assertTrue((tensor3 - tensor2).buffer.toDoubleArray() contentEquals doubleArrayOf(490.0, 480.0, 470.0))
+        assertTrue((tensor3 - tensor2).buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(490.0, 480.0, 470.0))
     }
 
 }
\ No newline at end of file
-- 
2.34.1


From 2d2c5aa6840902db6c5688d19e2960b124b5e0d3 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Mon, 15 Mar 2021 15:18:21 +0300
Subject: [PATCH 026/713] matrixhelper

---
 .../kscience/kmath/tensors/BufferedTensor.kt  |  53 ++++++++
 .../tensors/RealLinearOpsTensorAlgebra.kt     | 116 ++++++++++--------
 2 files changed, 120 insertions(+), 49 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
index 29605024d..4d89996a0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
@@ -13,6 +13,7 @@ public open class BufferedTensor<T>(
         TensorStrides(shape),
         buffer
     ) {
+    /*
 
     public operator fun get(i: Int, j: Int): T {
         check(this.dimension == 2) { "Not matrix" }
@@ -24,8 +25,60 @@ public open class BufferedTensor<T>(
         this[intArrayOf(i, j)] = value
     }
 
+     */
 }
 
+//todo make generator mb nextMatrixIndex?
+public class InnerMatrix<T>(private val tensor: BufferedTensor<T>){
+    private var offset: Int = 0
+    private val n : Int = tensor.shape.size
+    //stride?
+    private val step = tensor.shape[n - 1] * tensor.shape[n - 2]
+
+    public operator fun get(i: Int, j: Int): T {
+        val index = tensor.strides.index(offset)
+        index[n - 2] = i
+        index[n - 1] = j
+        return tensor[index]
+    }
+
+    public operator fun set(i: Int, j: Int, value: T): Unit {
+        val index = tensor.strides.index(offset)
+        index[n - 2] = i
+        index[n - 1] = j
+        tensor[index] = value
+    }
+
+    public fun makeStep(){
+        offset += step
+    }
+}
+
+public class InnerVector<T>(private val tensor: BufferedTensor<T>){
+    private var offset: Int = 0
+    private val n : Int = tensor.shape.size
+    //stride?
+    private val step = tensor.shape[n - 1]
+
+    public operator fun get(i: Int): T {
+        val index = tensor.strides.index(offset)
+        index[n - 1] = i
+        return tensor[index]
+    }
+
+    public operator fun set(i: Int, value: T): Unit {
+        val index = tensor.strides.index(offset)
+        index[n - 1] = i
+        tensor[index] = value
+    }
+
+    public fun makeStep(){
+        offset += step
+    }
+}
+
+
+//todo default buffer = arrayOf(0)???
 public class IntTensor(
     shape: IntArray,
     buffer: IntArray
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
index dcd740356..ab39fc6ac 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
@@ -2,8 +2,7 @@ package space.kscience.kmath.tensors
 
 public class RealLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double, RealTensor>,
-    RealTensorAlgebra()
-{
+    RealTensorAlgebra() {
     override fun eye(n: Int): RealTensor {
         val shape = intArrayOf(n, n)
         val buffer = DoubleArray(n * n) { 0.0 }
@@ -26,55 +25,71 @@ public class RealLinearOpsTensorAlgebra :
 
     override fun RealTensor.lu(): Pair<RealTensor, IntTensor> {
         // todo checks
-        val lu = this.copy()
-        val m = this.shape[0]
-        val pivot = IntArray(m)
-
-
-        // Initialize permutation array and parity
-        for (row in 0 until m) pivot[row] = row
-        var even = true
-
-        for (i in 0 until m) {
-            var maxA = -1.0
-            var iMax = i
-
-            for (k in i until m) {
-                val absA = kotlin.math.abs(lu[k, i])
-                if (absA > maxA) {
-                    maxA = absA
-                    iMax = k
-                }
-            }
-
-            //todo check singularity
-
-            if (iMax != i) {
-
-                val j = pivot[i]
-                pivot[i] = pivot[iMax]
-                pivot[iMax] = j
-                even != even
-
-                for (k in 0 until m) {
-                    val tmp = lu[i, k]
-                    lu[i, k] = lu[iMax, k]
-                    lu[iMax, k] = tmp
-                }
-
-            }
-
-            for (j in i + 1 until m) {
-                lu[j, i] /= lu[i, i]
-                for (k in i + 1 until m) {
-                    lu[j, k] -= lu[j, i] * lu[i, k]
-                }
-            }
+        val luTensor = this.copy()
+        val lu = InnerMatrix(luTensor)
+        //stride TODO!!! move to generator?
+        var matCnt = 1
+        for (i in 0 until this.shape.size - 2) {
+            matCnt *= this.shape[i]
         }
-        return Pair(lu, IntTensor(intArrayOf(m), pivot))
+        val n = this.shape.size
+        val m = this.shape[n - 1]
+        val pivotsShape = IntArray(n - 1) { i ->
+            this.shape[i]
+        }
+        val pivotsTensor = IntTensor(
+            pivotsShape,
+            IntArray(matCnt * m) { 0 }
+        )
+        val pivot = InnerVector(pivotsTensor)
+        for (i in 0 until matCnt) {
+            for (row in 0 until m) pivot[row] = row
+
+            for (i in 0 until m) {
+                var maxA = -1.0
+                var iMax = i
+
+                for (k in i until m) {
+                    val absA = kotlin.math.abs(lu[k, i])
+                    if (absA > maxA) {
+                        maxA = absA
+                        iMax = k
+                    }
+                }
+
+                //todo check singularity
+
+                if (iMax != i) {
+
+                    val j = pivot[i]
+                    pivot[i] = pivot[iMax]
+                    pivot[iMax] = j
+
+                    for (k in 0 until m) {
+                        val tmp = lu[i, k]
+                        lu[i, k] = lu[iMax, k]
+                        lu[iMax, k] = tmp
+                    }
+
+                }
+
+                for (j in i + 1 until m) {
+                    lu[j, i] /= lu[i, i]
+                    for (k in i + 1 until m) {
+                        lu[j, k] -= lu[j, i] * lu[i, k]
+                    }
+                }
+            }
+            lu.makeStep()
+            pivot.makeStep()
+        }
+
+        return Pair(luTensor, pivotsTensor)
     }
 
     override fun luPivot(lu: RealTensor, pivots: IntTensor): Triple<RealTensor, RealTensor, RealTensor> {
+        TODO()
+        /*
         // todo checks
         val n = lu.shape[0]
         val p = lu.zeroesLike()
@@ -97,9 +112,12 @@ public class RealLinearOpsTensorAlgebra :
                 }
             }
         }
-        return Triple(p, l, u)
+
+        return Triple(p, l, u)*/
     }
 
+
+
     override fun RealTensor.det(): RealTensor {
         TODO("Not yet implemented")
     }
@@ -127,5 +145,5 @@ public class RealLinearOpsTensorAlgebra :
 
 }
 
-public inline fun <R> RealLinearOpsTensorAlgebra(block: RealTensorAlgebra.() -> R): R =
+public inline fun <R> RealLinearOpsTensorAlgebra(block: RealLinearOpsTensorAlgebra.() -> R): R =
     RealLinearOpsTensorAlgebra().block()
\ No newline at end of file
-- 
2.34.1


From 50ed7ce28bb072f33a3527879fe8d9453cba6ac4 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 15 Mar 2021 12:54:46 +0000
Subject: [PATCH 027/713] ComplexTensorAlgebra interface

---
 .../kmath/tensors/ComplexTensorAlgebra.kt     | 47 +++++++++++++++++++
 .../kmath/tensors/ComplexTensorStructure.kt   | 14 ++++++
 .../tensors/RealAnalyticTensorAlgebra.kt      |  2 +-
 .../tensors/RealLinearOpsTensorAlgebra.kt     |  2 +-
 4 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorStructure.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt
new file mode 100644
index 000000000..3f5b7d667
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt
@@ -0,0 +1,47 @@
+package space.kscience.kmath.tensors
+
+public interface ComplexTensorAlgebra<T,
+        RealTensorType : TensorStructure<T>,
+        ComplexTensorType : ComplexTensorStructure<T, RealTensorType>>
+    : TensorPartialDivisionAlgebra<T, ComplexTensorType>{
+
+    //https://pytorch.org/docs/stable/generated/torch.view_as_complex.html
+    public fun RealTensorType.viewAsComplex(): ComplexTensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.angle.html
+    public fun ComplexTensorType.angle(): RealTensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.stft.html#torch.stft
+    public fun ComplexTensorType.stft(
+        nFFT: Int,
+        hopLength: Int,
+        winLength: Int,
+        window: RealTensorType,
+        normalised: Boolean,
+        oneSided: Boolean
+    )
+
+    //https://pytorch.org/docs/stable/generated/torch.istft.html#torch.istft
+    public fun ComplexTensorType.istft(
+        nFFT: Int,
+        hopLength: Int,
+        winLength: Int,
+        window: RealTensorType,
+        center: Boolean,
+        normalised: Boolean,
+        oneSided: Boolean,
+        length: Int
+    )
+
+    //https://pytorch.org/docs/stable/generated/torch.bartlett_window.html#torch.bartlett_window
+    public fun bartlettWindow(windowLength: Int, periodic: Boolean): RealTensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.blackman_window.html#torch.blackman_window
+    public fun blackmanWindow(windowLength: Int, periodic: Boolean): RealTensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.hamming_window.html#torch.hamming_window
+    public fun hammingWindow(windowLength: Int, periodic: Boolean, alpha: T, beta: T): RealTensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.kaiser_window.html#torch.kaiser_window
+    public fun kaiserWindow(windowLength: Int, periodic: Boolean, beta: T): RealTensorType
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorStructure.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorStructure.kt
new file mode 100644
index 000000000..0e0975830
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorStructure.kt
@@ -0,0 +1,14 @@
+package space.kscience.kmath.tensors
+
+public interface ComplexTensorStructure<T, RealTensorType: TensorStructure<T>> : TensorStructure<T> {
+
+    //https://pytorch.org/docs/master/generated/torch.view_as_real.html
+    public fun viewAsReal(): RealTensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.real.html
+    public fun realPart(): RealTensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.imag.html
+    public fun imaginaryPart(): RealTensorType
+
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt
index a93ebcb89..f610361fc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt
@@ -146,5 +146,5 @@ public class RealAnalyticTensorAlgebra:
 
 }
 
-public inline fun <R> RealAnalyticTensorAlgebra(block: RealTensorAlgebra.() -> R): R =
+public inline fun <R> RealAnalyticTensorAlgebra(block: RealAnalyticTensorAlgebra.() -> R): R =
     RealAnalyticTensorAlgebra().block()
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
index dcd740356..6b1957b8c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
@@ -127,5 +127,5 @@ public class RealLinearOpsTensorAlgebra :
 
 }
 
-public inline fun <R> RealLinearOpsTensorAlgebra(block: RealTensorAlgebra.() -> R): R =
+public inline fun <R> RealLinearOpsTensorAlgebra(block: RealLinearOpsTensorAlgebra.() -> R): R =
     RealLinearOpsTensorAlgebra().block()
\ No newline at end of file
-- 
2.34.1


From a3ca861ebe034fc1a8b08f18c2613df3ef81c785 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 15 Mar 2021 13:05:45 +0000
Subject: [PATCH 028/713] Rename FFTs

---
 .../space/kscience/kmath/tensors/ComplexTensorAlgebra.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt
index 3f5b7d667..8399511a5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt
@@ -12,7 +12,7 @@ public interface ComplexTensorAlgebra<T,
     public fun ComplexTensorType.angle(): RealTensorType
 
     //https://pytorch.org/docs/stable/generated/torch.stft.html#torch.stft
-    public fun ComplexTensorType.stft(
+    public fun ComplexTensorType.shortTimeFourierTransform(
         nFFT: Int,
         hopLength: Int,
         winLength: Int,
@@ -22,7 +22,7 @@ public interface ComplexTensorAlgebra<T,
     )
 
     //https://pytorch.org/docs/stable/generated/torch.istft.html#torch.istft
-    public fun ComplexTensorType.istft(
+    public fun ComplexTensorType.inverseShortTimeFourierTransform(
         nFFT: Int,
         hopLength: Int,
         winLength: Int,
-- 
2.34.1


From f66ac653e0264881d1197a395be84bdb37902b23 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 15 Mar 2021 16:59:50 +0000
Subject: [PATCH 029/713] RealTensor to DoubleTensor rename

---
 .../kscience/kmath/tensors/BufferedTensor.kt  |   2 +-
 .../tensors/DoubleAnalyticTensorAlgebra.kt    | 150 ++++++++++++++++++
 ...bra.kt => DoubleLinearOpsTensorAlgebra.kt} |  26 +--
 ...ensorAlgebra.kt => DoubleTensorAlgebra.kt} | 128 +++++++--------
 .../tensors/RealAnalyticTensorAlgebra.kt      | 150 ------------------
 .../space/kscience/kmath/tensors/utils.kt     |   6 +-
 .../kscience/kmath/tensors/TestRealTensor.kt  |   4 +-
 .../kmath/tensors/TestRealTensorAlgebra.kt    |  20 +--
 8 files changed, 243 insertions(+), 243 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/{RealLinearOpsTensorAlgebra.kt => DoubleLinearOpsTensorAlgebra.kt} (73%)
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/{RealTensorAlgebra.kt => DoubleTensorAlgebra.kt} (54%)
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
index 29605024d..066fb8708 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
@@ -41,7 +41,7 @@ public class FloatTensor(
     buffer: FloatArray
 ) : BufferedTensor<Float>(shape, FloatBuffer(buffer))
 
-public class RealTensor(
+public class DoubleTensor(
     shape: IntArray,
     buffer: DoubleArray
 ) : BufferedTensor<Double>(shape, RealBuffer(buffer))
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
new file mode 100644
index 000000000..702049a20
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
@@ -0,0 +1,150 @@
+package space.kscience.kmath.tensors
+
+public class RealAnalyticTensorAlgebra:
+    AnalyticTensorAlgebra<Double, DoubleTensor>,
+    RealTensorAlgebra()
+{
+    override fun DoubleTensor.exp(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.log(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.sqrt(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.square(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.cos(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.acos(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.cosh(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.acosh(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.sin(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.asin(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.sinh(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.asinh(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.tan(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.atan(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.tanh(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.atanh(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.ceil(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.floor(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.clamp(min: Double, max: Double): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.erf(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.erfinv(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.erfc(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.lerp(end: DoubleTensor, weight: DoubleTensor): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.lgamma(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.logit(eps: Double): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.igamma(other: DoubleTensor): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.igammac(other: DoubleTensor): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.mvlgamma(dimensions: Int): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.polygamma(order: Int): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.pow(exponent: Double): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.round(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.sigmoid(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.sinc(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.heaviside(values: DoubleTensor): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.trapz(xValues: DoubleTensor, dim: Int): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+}
+
+public inline fun <R> RealAnalyticTensorAlgebra(block: RealAnalyticTensorAlgebra.() -> R): R =
+    RealAnalyticTensorAlgebra().block()
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
similarity index 73%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
index 6b1957b8c..5fd8c4151 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
@@ -1,13 +1,13 @@
 package space.kscience.kmath.tensors
 
 public class RealLinearOpsTensorAlgebra :
-    LinearOpsTensorAlgebra<Double, RealTensor>,
+    LinearOpsTensorAlgebra<Double, DoubleTensor>,
     RealTensorAlgebra()
 {
-    override fun eye(n: Int): RealTensor {
+    override fun eye(n: Int): DoubleTensor {
         val shape = intArrayOf(n, n)
         val buffer = DoubleArray(n * n) { 0.0 }
-        val res = RealTensor(shape, buffer)
+        val res = DoubleTensor(shape, buffer)
         for (i in 0 until n) {
             res[intArrayOf(i, i)] = 1.0
         }
@@ -15,16 +15,16 @@ public class RealLinearOpsTensorAlgebra :
     }
 
 
-    override fun RealTensor.dot(other: RealTensor): RealTensor {
+    override fun DoubleTensor.dot(other: DoubleTensor): DoubleTensor {
         TODO("Alya")
     }
 
-    override fun diagonalEmbedding(diagonalEntries: RealTensor, offset: Int, dim1: Int, dim2: Int): RealTensor {
+    override fun diagonalEmbedding(diagonalEntries: DoubleTensor, offset: Int, dim1: Int, dim2: Int): DoubleTensor {
         TODO("Alya")
     }
 
 
-    override fun RealTensor.lu(): Pair<RealTensor, IntTensor> {
+    override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
         // todo checks
         val lu = this.copy()
         val m = this.shape[0]
@@ -74,7 +74,7 @@ public class RealLinearOpsTensorAlgebra :
         return Pair(lu, IntTensor(intArrayOf(m), pivot))
     }
 
-    override fun luPivot(lu: RealTensor, pivots: IntTensor): Triple<RealTensor, RealTensor, RealTensor> {
+    override fun luPivot(lu: DoubleTensor, pivots: IntTensor): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         // todo checks
         val n = lu.shape[0]
         val p = lu.zeroesLike()
@@ -100,28 +100,28 @@ public class RealLinearOpsTensorAlgebra :
         return Triple(p, l, u)
     }
 
-    override fun RealTensor.det(): RealTensor {
+    override fun DoubleTensor.det(): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.inv(): RealTensor {
+    override fun DoubleTensor.inv(): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.cholesky(): RealTensor {
+    override fun DoubleTensor.cholesky(): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.qr(): RealTensor {
+    override fun DoubleTensor.qr(): DoubleTensor {
         TODO("Not yet implemented")
     }
 
 
-    override fun RealTensor.svd(): Triple<RealTensor, RealTensor, RealTensor> {
+    override fun DoubleTensor.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.symEig(eigenvectors: Boolean): Pair<RealTensor, RealTensor> {
+    override fun DoubleTensor.symEig(eigenvectors: Boolean): Pair<DoubleTensor, DoubleTensor> {
         TODO("Not yet implemented")
     }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
similarity index 54%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
index 83a513a7a..dd15a257c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
@@ -1,146 +1,146 @@
 package space.kscience.kmath.tensors
 
 
-public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealTensor> {
+public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, DoubleTensor> {
 
-    override fun RealTensor.value(): Double {
+    override fun DoubleTensor.value(): Double {
         check(this.shape contentEquals intArrayOf(1)) {
             "Inconsistent value for tensor of shape ${shape.toList()}"
         }
         return this.buffer.unsafeToDoubleArray()[0]
     }
 
-    override fun zeros(shape: IntArray): RealTensor {
+    override fun zeros(shape: IntArray): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.zeroesLike(): RealTensor {
+    override fun DoubleTensor.zeroesLike(): DoubleTensor {
         val shape = this.shape
         val buffer = DoubleArray(this.buffer.size) { 0.0 }
-        return RealTensor(shape, buffer)
+        return DoubleTensor(shape, buffer)
     }
 
-    override fun ones(shape: IntArray): RealTensor {
+    override fun ones(shape: IntArray): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.onesLike(): RealTensor {
+    override fun DoubleTensor.onesLike(): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.copy(): RealTensor {
+    override fun DoubleTensor.copy(): DoubleTensor {
         // should be rework as soon as copy() method for NDBuffer will be available
-        return RealTensor(this.shape, this.buffer.unsafeToDoubleArray().copyOf())
+        return DoubleTensor(this.shape, this.buffer.unsafeToDoubleArray().copyOf())
     }
 
 
-    override fun Double.plus(other: RealTensor): RealTensor {
+    override fun Double.plus(other: DoubleTensor): DoubleTensor {
         val resBuffer = DoubleArray(other.buffer.size) { i ->
             other.buffer.unsafeToDoubleArray()[i] + this
         }
-        return RealTensor(other.shape, resBuffer)
+        return DoubleTensor(other.shape, resBuffer)
     }
 
-    override fun RealTensor.plus(value: Double): RealTensor = value + this
+    override fun DoubleTensor.plus(value: Double): DoubleTensor = value + this
 
-    override fun RealTensor.plus(other: RealTensor): RealTensor {
+    override fun DoubleTensor.plus(other: DoubleTensor): DoubleTensor {
         val broadcast = broadcastTensors(this, other)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.buffer.size) { i ->
             newThis.buffer.unsafeToDoubleArray()[i] + newOther.buffer.unsafeToDoubleArray()[i]
         }
-        return RealTensor(newThis.shape, resBuffer)
+        return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun RealTensor.plusAssign(value: Double) {
+    override fun DoubleTensor.plusAssign(value: Double) {
         for (i in this.buffer.unsafeToDoubleArray().indices) {
             this.buffer.unsafeToDoubleArray()[i] += value
         }
     }
 
-    override fun RealTensor.plusAssign(other: RealTensor) {
+    override fun DoubleTensor.plusAssign(other: DoubleTensor) {
         //todo should be change with broadcasting
         for (i in this.buffer.unsafeToDoubleArray().indices) {
             this.buffer.unsafeToDoubleArray()[i] += other.buffer.unsafeToDoubleArray()[i]
         }
     }
 
-    override fun Double.minus(other: RealTensor): RealTensor {
+    override fun Double.minus(other: DoubleTensor): DoubleTensor {
         val resBuffer = DoubleArray(other.buffer.size) { i ->
             this - other.buffer.unsafeToDoubleArray()[i]
         }
-        return RealTensor(other.shape, resBuffer)
+        return DoubleTensor(other.shape, resBuffer)
     }
 
-    override fun RealTensor.minus(value: Double): RealTensor {
+    override fun DoubleTensor.minus(value: Double): DoubleTensor {
         val resBuffer = DoubleArray(this.buffer.size) { i ->
             this.buffer.unsafeToDoubleArray()[i] - value
         }
-        return RealTensor(this.shape, resBuffer)
+        return DoubleTensor(this.shape, resBuffer)
     }
 
-    override fun RealTensor.minus(other: RealTensor): RealTensor {
+    override fun DoubleTensor.minus(other: DoubleTensor): DoubleTensor {
         val broadcast = broadcastTensors(this, other)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.buffer.size) { i ->
             newThis.buffer.unsafeToDoubleArray()[i] - newOther.buffer.unsafeToDoubleArray()[i]
         }
-        return RealTensor(newThis.shape, resBuffer)
+        return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun RealTensor.minusAssign(value: Double) {
+    override fun DoubleTensor.minusAssign(value: Double) {
         for (i in this.buffer.unsafeToDoubleArray().indices) {
             this.buffer.unsafeToDoubleArray()[i] -= value
         }
     }
 
-    override fun RealTensor.minusAssign(other: RealTensor) {
+    override fun DoubleTensor.minusAssign(other: DoubleTensor) {
         TODO("Alya")
     }
 
-    override fun Double.times(other: RealTensor): RealTensor {
+    override fun Double.times(other: DoubleTensor): DoubleTensor {
         //todo should be change with broadcasting
         val resBuffer = DoubleArray(other.buffer.size) { i ->
             other.buffer.unsafeToDoubleArray()[i] * this
         }
-        return RealTensor(other.shape, resBuffer)
+        return DoubleTensor(other.shape, resBuffer)
     }
 
     //todo should be change with broadcasting
-    override fun RealTensor.times(value: Double): RealTensor = value * this
+    override fun DoubleTensor.times(value: Double): DoubleTensor = value * this
 
-    override fun RealTensor.times(other: RealTensor): RealTensor {
+    override fun DoubleTensor.times(other: DoubleTensor): DoubleTensor {
         //todo should be change with broadcasting
         val resBuffer = DoubleArray(this.buffer.size) { i ->
             this.buffer.unsafeToDoubleArray()[i] * other.buffer.unsafeToDoubleArray()[i]
         }
-        return RealTensor(this.shape, resBuffer)
+        return DoubleTensor(this.shape, resBuffer)
     }
 
-    override fun RealTensor.timesAssign(value: Double) {
+    override fun DoubleTensor.timesAssign(value: Double) {
         //todo should be change with broadcasting
         for (i in this.buffer.unsafeToDoubleArray().indices) {
             this.buffer.unsafeToDoubleArray()[i] *= value
         }
     }
 
-    override fun RealTensor.timesAssign(other: RealTensor) {
+    override fun DoubleTensor.timesAssign(other: DoubleTensor) {
         //todo should be change with broadcasting
         for (i in this.buffer.unsafeToDoubleArray().indices) {
             this.buffer.unsafeToDoubleArray()[i] *= other.buffer.unsafeToDoubleArray()[i]
         }
     }
 
-    override fun RealTensor.unaryMinus(): RealTensor {
+    override fun DoubleTensor.unaryMinus(): DoubleTensor {
         val resBuffer = DoubleArray(this.buffer.size) { i ->
             this.buffer.unsafeToDoubleArray()[i].unaryMinus()
         }
-        return RealTensor(this.shape, resBuffer)
+        return DoubleTensor(this.shape, resBuffer)
     }
 
-    override fun RealTensor.transpose(i: Int, j: Int): RealTensor {
+    override fun DoubleTensor.transpose(i: Int, j: Int): DoubleTensor {
         checkTranspose(this.dimension, i, j)
         val n = this.buffer.size
         val resBuffer = DoubleArray(n)
@@ -148,7 +148,7 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
         val resShape = this.shape.copyOf()
         resShape[i] = resShape[j].also { resShape[j] = resShape[i] }
 
-        val resTensor = RealTensor(resShape, resBuffer)
+        val resTensor = DoubleTensor(resShape, resBuffer)
 
         for (offset in 0 until n) {
             val oldMultiIndex = this.strides.index(offset)
@@ -162,117 +162,117 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, RealT
     }
 
 
-    override fun RealTensor.view(shape: IntArray): RealTensor {
-        return RealTensor(shape, this.buffer.unsafeToDoubleArray())
+    override fun DoubleTensor.view(shape: IntArray): DoubleTensor {
+        return DoubleTensor(shape, this.buffer.unsafeToDoubleArray())
     }
 
-    override fun RealTensor.viewAs(other: RealTensor): RealTensor {
+    override fun DoubleTensor.viewAs(other: DoubleTensor): DoubleTensor {
         return this.view(other.shape)
     }
 
-    override fun RealTensor.abs(): RealTensor {
+    override fun DoubleTensor.abs(): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun full(shape: IntArray, value: Double): RealTensor {
+    override fun full(shape: IntArray, value: Double): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.fullLike(value: Double): RealTensor {
+    override fun DoubleTensor.fullLike(value: Double): DoubleTensor {
         TODO("Not yet implemented")
     }
 
 
-    override fun RealTensor.sum(dim: Int, keepDim: Boolean): RealTensor {
+    override fun DoubleTensor.sum(dim: Int, keepDim: Boolean): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.cumsum(dim: Int): RealTensor {
+    override fun DoubleTensor.cumsum(dim: Int): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.prod(dim: Int, keepDim: Boolean): RealTensor {
+    override fun DoubleTensor.prod(dim: Int, keepDim: Boolean): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.cumprod(dim: Int): RealTensor {
+    override fun DoubleTensor.cumprod(dim: Int): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.max(dim: Int, keepDim: Boolean): RealTensor {
+    override fun DoubleTensor.max(dim: Int, keepDim: Boolean): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.cummax(dim: Int): RealTensor {
+    override fun DoubleTensor.cummax(dim: Int): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.min(dim: Int, keepDim: Boolean): RealTensor {
+    override fun DoubleTensor.min(dim: Int, keepDim: Boolean): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.cummin(dim: Int): RealTensor {
+    override fun DoubleTensor.cummin(dim: Int): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.median(dim: Int, keepDim: Boolean): RealTensor {
+    override fun DoubleTensor.median(dim: Int, keepDim: Boolean): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun maximum(lhs: RealTensor, rhs: RealTensor) {
+    override fun maximum(lhs: DoubleTensor, rhs: DoubleTensor) {
         TODO("Not yet implemented")
     }
 
-    override fun minimum(lhs: RealTensor, rhs: RealTensor) {
+    override fun minimum(lhs: DoubleTensor, rhs: DoubleTensor) {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.sort(dim: Int, keepDim: Boolean, descending: Boolean): RealTensor {
+    override fun DoubleTensor.sort(dim: Int, keepDim: Boolean, descending: Boolean): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun cat(tensors: List<RealTensor>, dim: Int): RealTensor {
+    override fun cat(tensors: List<DoubleTensor>, dim: Int): DoubleTensor {
         TODO("Not yet implemented")
     }
 
 
-    override fun RealTensor.div(value: Double): RealTensor {
+    override fun DoubleTensor.div(value: Double): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.div(other: RealTensor): RealTensor {
+    override fun DoubleTensor.div(other: DoubleTensor): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.flatten(startDim: Int, endDim: Int): RealTensor {
+    override fun DoubleTensor.flatten(startDim: Int, endDim: Int): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.divAssign(value: Double) {
+    override fun DoubleTensor.divAssign(value: Double) {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.divAssign(other: RealTensor) {
+    override fun DoubleTensor.divAssign(other: DoubleTensor) {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.mean(dim: Int, keepDim: Boolean): RealTensor {
+    override fun DoubleTensor.mean(dim: Int, keepDim: Boolean): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.quantile(q: Double, dim: Int, keepDim: Boolean): RealTensor {
+    override fun DoubleTensor.quantile(q: Double, dim: Int, keepDim: Boolean): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.std(dim: Int, unbiased: Boolean, keepDim: Boolean): RealTensor {
+    override fun DoubleTensor.std(dim: Int, unbiased: Boolean, keepDim: Boolean): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): RealTensor {
+    override fun DoubleTensor.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun RealTensor.histc(bins: Int, min: Double, max: Double): RealTensor {
+    override fun DoubleTensor.histc(bins: Int, min: Double, max: Double): DoubleTensor {
         TODO("Not yet implemented")
     }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt
deleted file mode 100644
index f610361fc..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/RealAnalyticTensorAlgebra.kt
+++ /dev/null
@@ -1,150 +0,0 @@
-package space.kscience.kmath.tensors
-
-public class RealAnalyticTensorAlgebra:
-    AnalyticTensorAlgebra<Double, RealTensor>,
-    RealTensorAlgebra()
-{
-    override fun RealTensor.exp(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.log(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.sqrt(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.square(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.cos(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.acos(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.cosh(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.acosh(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.sin(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.asin(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.sinh(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.asinh(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.tan(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.atan(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.tanh(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.atanh(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.ceil(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.floor(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.clamp(min: Double, max: Double): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.erf(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.erfinv(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.erfc(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.lerp(end: RealTensor, weight: RealTensor): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.lgamma(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.logit(eps: Double): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.igamma(other: RealTensor): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.igammac(other: RealTensor): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.mvlgamma(dimensions: Int): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.polygamma(order: Int): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.pow(exponent: Double): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.round(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.sigmoid(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.sinc(): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.heaviside(values: RealTensor): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun RealTensor.trapz(xValues: RealTensor, dim: Int): RealTensor {
-        TODO("Not yet implemented")
-    }
-
-}
-
-public inline fun <R> RealAnalyticTensorAlgebra(block: RealAnalyticTensorAlgebra.() -> R): R =
-    RealAnalyticTensorAlgebra().block()
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
index b03fb7dd7..9f7e811db 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
@@ -32,13 +32,13 @@ internal inline fun broadcastShapes(vararg shapes: IntArray): IntArray {
     return totalShape
 }
 
-internal inline fun broadcastTensors(vararg tensors: RealTensor): List<RealTensor> {
+internal inline fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleTensor> {
     val totalShape = broadcastShapes(*(tensors.map { it.shape }).toTypedArray())
     val n = totalShape.reduce { acc, i -> acc * i }
 
-    val res = ArrayList<RealTensor>(0)
+    val res = ArrayList<DoubleTensor>(0)
     for (tensor in tensors) {
-        val resTensor = RealTensor(totalShape, DoubleArray(n))
+        val resTensor = DoubleTensor(totalShape, DoubleArray(n))
 
         for (linearIndex in 0 until n) {
             val totalMultiIndex = resTensor.strides.index(linearIndex)
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
index 473a3da8b..5d42e6d0f 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
@@ -11,13 +11,13 @@ class TestRealTensor {
     @Test
     fun valueTest() = RealTensorAlgebra {
         val value = 12.5
-        val tensor = RealTensor(intArrayOf(1), doubleArrayOf(value))
+        val tensor = DoubleTensor(intArrayOf(1), doubleArrayOf(value))
         assertEquals(tensor.value(), value)
     }
 
     @Test
     fun stridesTest(){
-        val tensor = RealTensor(intArrayOf(2,2), doubleArrayOf(3.5,5.8,58.4,2.4))
+        val tensor = DoubleTensor(intArrayOf(2,2), doubleArrayOf(3.5,5.8,58.4,2.4))
         assertEquals(tensor[intArrayOf(0,1)], 5.8)
         assertTrue(tensor.elements().map{ it.second }.toList().toDoubleArray() contentEquals tensor.buffer.toDoubleArray())
     }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
index 72bbf1787..3e27a1cc2 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
@@ -8,14 +8,14 @@ class TestRealTensorAlgebra {
 
     @Test
     fun doublePlus() = RealTensorAlgebra {
-        val tensor = RealTensor(intArrayOf(2), doubleArrayOf(1.0, 2.0))
+        val tensor = DoubleTensor(intArrayOf(2), doubleArrayOf(1.0, 2.0))
         val res = 10.0 + tensor
         assertTrue(res.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(11.0,12.0))
     }
 
     @Test
     fun transpose1x1() = RealTensorAlgebra {
-        val tensor = RealTensor(intArrayOf(1), doubleArrayOf(0.0))
+        val tensor = DoubleTensor(intArrayOf(1), doubleArrayOf(0.0))
         val res = tensor.transpose(0, 0)
 
         assertTrue(res.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(0.0))
@@ -24,7 +24,7 @@ class TestRealTensorAlgebra {
 
     @Test
     fun transpose3x2() = RealTensorAlgebra {
-        val tensor = RealTensor(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor = DoubleTensor(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res = tensor.transpose(1, 0)
 
         assertTrue(res.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
@@ -33,7 +33,7 @@ class TestRealTensorAlgebra {
 
     @Test
     fun transpose1x2x3() = RealTensorAlgebra {
-        val tensor = RealTensor(intArrayOf(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor = DoubleTensor(intArrayOf(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res01 = tensor.transpose(0, 1)
         val res02 = tensor.transpose(0, 2)
         val res12 = tensor.transpose(1, 2)
@@ -60,9 +60,9 @@ class TestRealTensorAlgebra {
 
     @Test
     fun broadcastTensors() = RealTensorAlgebra {
-        val tensor1 = RealTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = RealTensor(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor3 = RealTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
+        val tensor1 = DoubleTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = DoubleTensor(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = DoubleTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
 
         val res = broadcastTensors(tensor1, tensor2, tensor3)
 
@@ -77,9 +77,9 @@ class TestRealTensorAlgebra {
 
     @Test
     fun minusTensor() = RealTensorAlgebra {
-        val tensor1 = RealTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = RealTensor(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor3 = RealTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
+        val tensor1 = DoubleTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = DoubleTensor(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = DoubleTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
 
         assertTrue((tensor2 - tensor1).shape contentEquals intArrayOf(2, 3))
         assertTrue((tensor2 - tensor1).buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
-- 
2.34.1


From b227a82a80d406fa3c4b4e50373a02363f161954 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 15 Mar 2021 19:06:33 +0000
Subject: [PATCH 030/713] OrderedTensorAlgebra

---
 .../kmath/tensors/ComplexTensorAlgebra.kt     |  6 +++
 .../tensors/DoubleAnalyticTensorAlgebra.kt    |  8 +--
 .../tensors/DoubleLinearOpsTensorAlgebra.kt   | 32 ++----------
 .../tensors/DoubleOrderedTensorAlgebra.kt     | 41 +++++++++++++++
 .../kmath/tensors/DoubleTensorAlgebra.kt      | 51 ++++++++-----------
 .../kmath/tensors/LinearOpsTensorAlgebra.kt   | 15 ------
 .../kmath/tensors/OrderedTensorAlgebra.kt     | 29 +++++++++++
 .../kscience/kmath/tensors/TensorAlgebra.kt   | 35 +++++--------
 .../kscience/kmath/tensors/TestRealTensor.kt  |  2 +-
 .../kmath/tensors/TestRealTensorAlgebra.kt    | 14 ++---
 10 files changed, 125 insertions(+), 108 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleOrderedTensorAlgebra.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/OrderedTensorAlgebra.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt
index 8399511a5..e56920916 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt
@@ -8,6 +8,12 @@ public interface ComplexTensorAlgebra<T,
     //https://pytorch.org/docs/stable/generated/torch.view_as_complex.html
     public fun RealTensorType.viewAsComplex(): ComplexTensorType
 
+    // Embed a real tensor as real + i * imaginary
+    public fun RealTensorType.cartesianEmbedding(imaginary: RealTensorType): ComplexTensorType
+
+    // Embed a real tensor as real * exp(i * angle)
+    public fun RealTensorType.polarEmbedding(angle: RealTensorType): ComplexTensorType
+
     //https://pytorch.org/docs/stable/generated/torch.angle.html
     public fun ComplexTensorType.angle(): RealTensorType
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
index 702049a20..00e7a7fbd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
@@ -1,8 +1,8 @@
 package space.kscience.kmath.tensors
 
-public class RealAnalyticTensorAlgebra:
+public class DoubleAnalyticTensorAlgebra:
     AnalyticTensorAlgebra<Double, DoubleTensor>,
-    RealTensorAlgebra()
+    DoubleTensorAlgebra()
 {
     override fun DoubleTensor.exp(): DoubleTensor {
         TODO("Not yet implemented")
@@ -146,5 +146,5 @@ public class RealAnalyticTensorAlgebra:
 
 }
 
-public inline fun <R> RealAnalyticTensorAlgebra(block: RealAnalyticTensorAlgebra.() -> R): R =
-    RealAnalyticTensorAlgebra().block()
\ No newline at end of file
+public inline fun <R> DoubleAnalyticTensorAlgebra(block: DoubleAnalyticTensorAlgebra.() -> R): R =
+    DoubleAnalyticTensorAlgebra().block()
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
index ddb3dfa12..1aaf8df9d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
@@ -2,27 +2,12 @@ package space.kscience.kmath.tensors
 
 public class DoubleLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double, DoubleTensor>,
-    RealTensorAlgebra() {
-    override fun eye(n: Int): DoubleTensor {
-        val shape = intArrayOf(n, n)
-        val buffer = DoubleArray(n * n) { 0.0 }
-        val res = DoubleTensor(shape, buffer)
-        for (i in 0 until n) {
-            res[intArrayOf(i, i)] = 1.0
-        }
-        return res
+    DoubleTensorAlgebra() {
+
+    override fun DoubleTensor.inv(): DoubleTensor {
+        TODO("Not yet implemented")
     }
 
-
-    override fun DoubleTensor.dot(other: DoubleTensor): DoubleTensor {
-        TODO("Alya")
-    }
-
-    override fun diagonalEmbedding(diagonalEntries: DoubleTensor, offset: Int, dim1: Int, dim2: Int): DoubleTensor {
-        TODO("Alya")
-    }
-
-
     override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
         // todo checks
         val luTensor = this.copy()
@@ -115,15 +100,6 @@ public class DoubleLinearOpsTensorAlgebra :
         return Triple(p, l, u)
     }
 
-    override fun DoubleTensor.det(): DoubleTensor {
-
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.inv(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
     override fun DoubleTensor.cholesky(): DoubleTensor {
         TODO("Not yet implemented")
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleOrderedTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleOrderedTensorAlgebra.kt
new file mode 100644
index 000000000..e7ebf6c56
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleOrderedTensorAlgebra.kt
@@ -0,0 +1,41 @@
+package space.kscience.kmath.tensors
+
+public class DoubleOrderedTensorAlgebra:
+    OrderedTensorAlgebra<Double, DoubleTensor>,
+    DoubleTensorAlgebra()
+{
+    override fun DoubleTensor.max(dim: Int, keepDim: Boolean): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.cummax(dim: Int): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.min(dim: Int, keepDim: Boolean): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.cummin(dim: Int): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.median(dim: Int, keepDim: Boolean): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun maximum(lhs: DoubleTensor, rhs: DoubleTensor) {
+        TODO("Not yet implemented")
+    }
+
+    override fun minimum(lhs: DoubleTensor, rhs: DoubleTensor) {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.sort(dim: Int, keepDim: Boolean, descending: Boolean): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+}
+
+public inline fun <R> DoubleOrderedTensorAlgebra(block: DoubleOrderedTensorAlgebra.() -> R): R =
+    DoubleOrderedTensorAlgebra().block()
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
index dd15a257c..8b9701127 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
@@ -1,7 +1,7 @@
 package space.kscience.kmath.tensors
 
 
-public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, DoubleTensor> {
+public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, DoubleTensor> {
 
     override fun DoubleTensor.value(): Double {
         check(this.shape contentEquals intArrayOf(1)) {
@@ -27,6 +27,15 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, Doubl
     override fun DoubleTensor.onesLike(): DoubleTensor {
         TODO("Not yet implemented")
     }
+    override fun eye(n: Int): DoubleTensor {
+        val shape = intArrayOf(n, n)
+        val buffer = DoubleArray(n * n) { 0.0 }
+        val res = DoubleTensor(shape, buffer)
+        for (i in 0 until n) {
+            res[intArrayOf(i, i)] = 1.0
+        }
+        return res
+    }
 
     override fun DoubleTensor.copy(): DoubleTensor {
         // should be rework as soon as copy() method for NDBuffer will be available
@@ -199,36 +208,12 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, Doubl
         TODO("Not yet implemented")
     }
 
-    override fun DoubleTensor.max(dim: Int, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
+    override fun DoubleTensor.dot(other: DoubleTensor): DoubleTensor {
+        TODO("Alya")
     }
 
-    override fun DoubleTensor.cummax(dim: Int): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.min(dim: Int, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.cummin(dim: Int): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.median(dim: Int, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun maximum(lhs: DoubleTensor, rhs: DoubleTensor) {
-        TODO("Not yet implemented")
-    }
-
-    override fun minimum(lhs: DoubleTensor, rhs: DoubleTensor) {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.sort(dim: Int, keepDim: Boolean, descending: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
+    override fun diagonalEmbedding(diagonalEntries: DoubleTensor, offset: Int, dim1: Int, dim2: Int): DoubleTensor {
+        TODO("Alya")
     }
 
     override fun cat(tensors: List<DoubleTensor>, dim: Int): DoubleTensor {
@@ -276,7 +261,11 @@ public open class RealTensorAlgebra : TensorPartialDivisionAlgebra<Double, Doubl
         TODO("Not yet implemented")
     }
 
+    override fun DoubleTensor.det(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
 }
 
-public inline fun <R> RealTensorAlgebra(block: RealTensorAlgebra.() -> R): R =
-    RealTensorAlgebra().block()
\ No newline at end of file
+public inline fun <R> DoubleTensorAlgebra(block: DoubleTensorAlgebra.() -> R): R =
+    DoubleTensorAlgebra().block()
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
index db1135a33..7450c09c1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
@@ -4,21 +4,6 @@ package space.kscience.kmath.tensors
 public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>> :
     TensorPartialDivisionAlgebra<T, TensorType> {
 
-    //https://pytorch.org/docs/stable/generated/torch.eye.html
-    public fun eye(n: Int): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.matmul.html
-    public infix fun TensorType.dot(other: TensorType): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.diag_embed.html
-    public fun diagonalEmbedding(
-        diagonalEntries: TensorType,
-        offset: Int = 0, dim1: Int = -2, dim2: Int = -1
-    ): TensorType
-
-    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.det
-    public fun TensorType.det(): TensorType
-
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.inv
     public fun TensorType.inv(): TensorType
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/OrderedTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/OrderedTensorAlgebra.kt
new file mode 100644
index 000000000..3320c3a1e
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/OrderedTensorAlgebra.kt
@@ -0,0 +1,29 @@
+package space.kscience.kmath.tensors
+
+public interface OrderedTensorAlgebra<T, TensorType : TensorStructure<T>> :
+    TensorAlgebra<T, TensorType> {
+
+    //https://pytorch.org/docs/stable/generated/torch.max.html#torch.max
+    public fun TensorType.max(dim: Int, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.cummax.html#torch.cummax
+    public fun TensorType.cummax(dim: Int): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.min.html#torch.min
+    public fun TensorType.min(dim: Int, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.cummin.html#torch.cummin
+    public fun TensorType.cummin(dim: Int): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.median.html#torch.median
+    public fun TensorType.median(dim: Int, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.maximum.html#torch.maximum
+    public fun maximum(lhs: TensorType, rhs: TensorType)
+
+    //https://pytorch.org/docs/stable/generated/torch.minimum.html#torch.minimum
+    public fun minimum(lhs: TensorType, rhs: TensorType)
+
+    //https://pytorch.org/docs/stable/generated/torch.sort.html#torch.sort
+    public fun TensorType.sort(dim: Int, keepDim: Boolean, descending: Boolean): TensorType
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index a53054e21..6f368f332 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -17,6 +17,9 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     //https://pytorch.org/docs/stable/generated/torch.full_like.html#torch.full_like
     public fun TensorType.fullLike(value: T): TensorType
 
+    //https://pytorch.org/docs/stable/generated/torch.eye.html
+    public fun eye(n: Int): TensorType
+
     public fun TensorType.copy(): TensorType
 
     public operator fun T.plus(other: TensorType): TensorType
@@ -46,6 +49,9 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     public fun TensorType.view(shape: IntArray): TensorType
     public fun TensorType.viewAs(other: TensorType): TensorType
 
+    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.det
+    public fun TensorType.det(): TensorType
+
     //https://pytorch.org/docs/stable/generated/torch.abs.html
     public fun TensorType.abs(): TensorType
 
@@ -61,29 +67,14 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     //https://pytorch.org/docs/stable/generated/torch.cumprod.html#torch.cumprod
     public fun TensorType.cumprod(dim: Int): TensorType
 
-    //https://pytorch.org/docs/stable/generated/torch.max.html#torch.max
-    public fun TensorType.max(dim: Int, keepDim: Boolean): TensorType
+    //https://pytorch.org/docs/stable/generated/torch.matmul.html
+    public infix fun TensorType.dot(other: TensorType): TensorType
 
-    //https://pytorch.org/docs/stable/generated/torch.cummax.html#torch.cummax
-    public fun TensorType.cummax(dim: Int): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.min.html#torch.min
-    public fun TensorType.min(dim: Int, keepDim: Boolean): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.cummin.html#torch.cummin
-    public fun TensorType.cummin(dim: Int): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.median.html#torch.median
-    public fun TensorType.median(dim: Int, keepDim: Boolean): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.maximum.html#torch.maximum
-    public fun maximum(lhs: TensorType, rhs: TensorType)
-
-    //https://pytorch.org/docs/stable/generated/torch.minimum.html#torch.minimum
-    public fun minimum(lhs: TensorType, rhs: TensorType)
-
-    //https://pytorch.org/docs/stable/generated/torch.sort.html#torch.sort
-    public fun TensorType.sort(dim: Int, keepDim: Boolean, descending: Boolean): TensorType
+    //https://pytorch.org/docs/stable/generated/torch.diag_embed.html
+    public fun diagonalEmbedding(
+        diagonalEntries: TensorType,
+        offset: Int = 0, dim1: Int = -2, dim2: Int = -1
+    ): TensorType
 
     //https://pytorch.org/docs/stable/generated/torch.cat.html#torch.cat
     public fun cat(tensors: List<TensorType>, dim: Int): TensorType
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
index 5d42e6d0f..72179ecbc 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
@@ -9,7 +9,7 @@ import kotlin.test.assertTrue
 class TestRealTensor {
 
     @Test
-    fun valueTest() = RealTensorAlgebra {
+    fun valueTest() = DoubleTensorAlgebra {
         val value = 12.5
         val tensor = DoubleTensor(intArrayOf(1), doubleArrayOf(value))
         assertEquals(tensor.value(), value)
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
index 3e27a1cc2..9dddcf59e 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
@@ -7,14 +7,14 @@ import kotlin.test.assertTrue
 class TestRealTensorAlgebra {
 
     @Test
-    fun doublePlus() = RealTensorAlgebra {
+    fun doublePlus() = DoubleTensorAlgebra {
         val tensor = DoubleTensor(intArrayOf(2), doubleArrayOf(1.0, 2.0))
         val res = 10.0 + tensor
         assertTrue(res.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(11.0,12.0))
     }
 
     @Test
-    fun transpose1x1() = RealTensorAlgebra {
+    fun transpose1x1() = DoubleTensorAlgebra {
         val tensor = DoubleTensor(intArrayOf(1), doubleArrayOf(0.0))
         val res = tensor.transpose(0, 0)
 
@@ -23,7 +23,7 @@ class TestRealTensorAlgebra {
     }
 
     @Test
-    fun transpose3x2() = RealTensorAlgebra {
+    fun transpose3x2() = DoubleTensorAlgebra {
         val tensor = DoubleTensor(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res = tensor.transpose(1, 0)
 
@@ -32,7 +32,7 @@ class TestRealTensorAlgebra {
     }
 
     @Test
-    fun transpose1x2x3() = RealTensorAlgebra {
+    fun transpose1x2x3() = DoubleTensorAlgebra {
         val tensor = DoubleTensor(intArrayOf(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res01 = tensor.transpose(0, 1)
         val res02 = tensor.transpose(0, 2)
@@ -48,7 +48,7 @@ class TestRealTensorAlgebra {
     }
 
     @Test
-    fun broadcastShapes() = RealTensorAlgebra {
+    fun broadcastShapes() = DoubleTensorAlgebra {
         assertTrue(broadcastShapes(
             intArrayOf(2, 3), intArrayOf(1, 3), intArrayOf(1, 1, 1)
         ) contentEquals intArrayOf(1, 2, 3))
@@ -59,7 +59,7 @@ class TestRealTensorAlgebra {
     }
 
     @Test
-    fun broadcastTensors() = RealTensorAlgebra {
+    fun broadcastTensors() = DoubleTensorAlgebra {
         val tensor1 = DoubleTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = DoubleTensor(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor3 = DoubleTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
@@ -76,7 +76,7 @@ class TestRealTensorAlgebra {
     }
 
     @Test
-    fun minusTensor() = RealTensorAlgebra {
+    fun minusTensor() = DoubleTensorAlgebra {
         val tensor1 = DoubleTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = DoubleTensor(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor3 = DoubleTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
-- 
2.34.1


From f8e0d4be17baac7e2f5930083b2bfeb7338f99e8 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 15 Mar 2021 21:18:15 +0000
Subject: [PATCH 031/713] MutableStructure 2D & 1D

---
 .../space/kscience/kmath/nd/Structure1D.kt    | 56 +++++++++++++++++++
 .../space/kscience/kmath/nd/Structure2D.kt    | 53 +++++++++++++++++-
 .../space/kscience/kmath/structures/Buffer.kt |  5 ++
 .../kscience/kmath/tensors/BufferedTensor.kt  |  1 -
 .../kmath/tensors/DoubleTensorAlgebra.kt      |  4 ++
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  2 +
 .../kscience/kmath/tensors/TensorStructure.kt |  1 -
 7 files changed, 118 insertions(+), 4 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index 1335a4933..2926b3d1b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -1,6 +1,8 @@
 package space.kscience.kmath.nd
 
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.MutableBuffer
+import space.kscience.kmath.structures.asMutableBuffer
 import space.kscience.kmath.structures.asSequence
 
 /**
@@ -17,6 +19,16 @@ public interface Structure1D<T> : NDStructure<T>, Buffer<T> {
     public override operator fun iterator(): Iterator<T> = (0 until size).asSequence().map(::get).iterator()
 }
 
+/**
+ * A mutable structure that is guaranteed to be one-dimensional
+ */
+public interface MutableStructure1D<T> : Structure1D<T>, MutableNDStructure<T>, MutableBuffer<T> {
+    public override operator fun set(index: IntArray, value: T) {
+        require(index.size == 1) { "Index dimension mismatch. Expected 1 but found ${index.size}" }
+        set(index[0], value)
+    }
+}
+
 /**
  * A 1D wrapper for nd-structure
  */
@@ -28,6 +40,25 @@ private inline class Structure1DWrapper<T>(val structure: NDStructure<T>) : Stru
     override fun elements(): Sequence<Pair<IntArray, T>> = structure.elements()
 }
 
+/**
+ * A 1D wrapper for a mutable nd-structure
+ */
+private inline class MutableStructure1DWrapper<T>(val structure: MutableNDStructure<T>) : MutableStructure1D<T> {
+    override val shape: IntArray get() = structure.shape
+    override val size: Int get() = structure.shape[0]
+    override fun elements(): Sequence<Pair<IntArray, T>> {
+        TODO("Not yet implemented")
+    }
+
+    override fun get(index: Int): T = structure[index]
+    override fun set(index: Int, value: T) {
+        set(index, value)
+    }
+
+    override fun copy(): MutableBuffer<T> =
+        structure.elements().map { it.second }.toMutableList().asMutableBuffer()
+}
+
 
 /**
  * A structure wrapper for buffer
@@ -42,6 +73,21 @@ private inline class Buffer1DWrapper<T>(val buffer: Buffer<T>) : Structure1D<T>
     override operator fun get(index: Int): T = buffer[index]
 }
 
+private inline class MutableBuffer1DWrapper<T>(val buffer: MutableBuffer<T>) : MutableStructure1D<T> {
+    override val shape: IntArray get() = intArrayOf(buffer.size)
+    override val size: Int get() = buffer.size
+
+    override fun elements(): Sequence<Pair<IntArray, T>> =
+        buffer.asSequence().mapIndexed { index, value -> intArrayOf(index) to value }
+
+    override operator fun get(index: Int): T = buffer[index]
+    override fun set(index: Int, value: T) {
+        buffer[index] = value
+    }
+
+    override fun copy(): MutableBuffer<T> = buffer.copy()
+}
+
 /**
  * Represent a [NDStructure] as [Structure1D]. Throw error in case of dimension mismatch
  */
@@ -52,7 +98,17 @@ public fun <T> NDStructure<T>.as1D(): Structure1D<T> = this as? Structure1D<T> ?
     }
 } else error("Can't create 1d-structure from ${shape.size}d-structure")
 
+public fun <T> MutableNDStructure<T>.as1D(): MutableStructure1D<T> =
+    this as? MutableStructure1D<T> ?: if (shape.size == 1) {
+        when (this) {
+            is MutableNDBuffer -> MutableBuffer1DWrapper(this.buffer)
+            else -> MutableStructure1DWrapper(this)
+        }
+    } else error("Can't create 1d-structure from ${shape.size}d-structure")
+
 /**
  * Represent this buffer as 1D structure
  */
 public fun <T> Buffer<T>.asND(): Structure1D<T> = Buffer1DWrapper(this)
+
+public fun <T> MutableBuffer<T>.asND(): MutableStructure1D<T> = MutableBuffer1DWrapper(this)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index e9f8234e5..2f2fd653e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -57,6 +57,20 @@ public interface Structure2D<T> : NDStructure<T> {
     public companion object
 }
 
+/**
+ * Represents mutable [Structure2D].
+ */
+public interface MutableStructure2D<T> : Structure2D<T>, MutableNDStructure<T> {
+    /**
+     * Inserts an item at the specified indices.
+     *
+     * @param i the first index.
+     * @param j the second index.
+     * @param value the value.
+     */
+    public operator fun set(i: Int, j: Int, value: T)
+}
+
 /**
  * A 2D wrapper for nd-structure
  */
@@ -79,11 +93,46 @@ private class Structure2DWrapper<T>(val structure: NDStructure<T>) : Structure2D
 }
 
 /**
- * Represent a [NDStructure] as [Structure1D]. Throw error in case of dimension mismatch
+ * A 2D wrapper for a mutable nd-structure
+ */
+private class MutableStructure2DWrapper<T>(val structure: MutableNDStructure<T>): MutableStructure2D<T>
+{
+    override val shape: IntArray get() = structure.shape
+
+    override val rowNum: Int get() = shape[0]
+    override val colNum: Int get() = shape[1]
+
+    override operator fun get(i: Int, j: Int): T = structure[i, j]
+
+    override fun set(index: IntArray, value: T) {
+        structure[index] = value
+    }
+
+    override operator fun set(i: Int, j: Int, value: T){
+        structure[intArrayOf(i, j)] = value
+    }
+
+    override fun elements(): Sequence<Pair<IntArray, T>> = structure.elements()
+
+    override fun equals(other: Any?): Boolean = false
+
+    override fun hashCode(): Int = 0
+}
+
+/**
+ * Represent a [NDStructure] as [Structure2D]. Throw error in case of dimension mismatch
  */
 public fun <T> NDStructure<T>.as2D(): Structure2D<T> = this as? Structure2D<T> ?: when (shape.size) {
     2 -> Structure2DWrapper(this)
     else -> error("Can't create 2d-structure from ${shape.size}d-structure")
 }
 
-internal fun <T> Structure2D<T>.unwrap(): NDStructure<T> = if (this is Structure2DWrapper) structure else this
\ No newline at end of file
+internal fun <T> Structure2D<T>.unwrap(): NDStructure<T> = if (this is Structure2DWrapper) structure else this
+
+public fun <T> MutableNDStructure<T>.as2D(): MutableStructure2D<T> = this as? MutableStructure2D<T> ?: when (shape.size) {
+    2 -> MutableStructure2DWrapper(this)
+    else -> error("Can't create 2d-structure from ${shape.size}d-structure")
+}
+
+internal fun <T> MutableStructure2D<T>.unwrap(): MutableNDStructure<T> =
+    if (this is MutableStructure2DWrapper) structure else this
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index 2bde18fce..c62fa30ba 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -236,6 +236,11 @@ public inline class MutableListBuffer<T>(public val list: MutableList<T>) : Muta
     override fun copy(): MutableBuffer<T> = MutableListBuffer(ArrayList(list))
 }
 
+/**
+ * Returns an [MutableListBuffer] that wraps the original list.
+ */
+public fun <T> MutableList<T>.asMutableBuffer(): MutableListBuffer<T> = MutableListBuffer(this)
+
 /**
  * [MutableBuffer] implementation over [Array].
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
index d5adf380c..68fc0412e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
@@ -25,7 +25,6 @@ public open class BufferedTensor<T>(
         this[intArrayOf(i, j)] = value
     }
 
-
 }
 
 //todo make generator mb nextMatrixIndex?
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
index 8b9701127..76a3c4c9c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
@@ -10,6 +10,10 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return this.buffer.unsafeToDoubleArray()[0]
     }
 
+    override fun DoubleTensor.get(i: Int): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
     override fun zeros(shape: IntArray): DoubleTensor {
         TODO("Not yet implemented")
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 6f368f332..02e1a0742 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -41,6 +41,8 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     public operator fun TensorType.timesAssign(other: TensorType): Unit
     public operator fun TensorType.unaryMinus(): TensorType
 
+    //https://pytorch.org/cppdocs/notes/tensor_indexing.html
+    public fun TensorType.get(i: Int): TensorType
 
     //https://pytorch.org/docs/stable/generated/torch.transpose.html
     public fun TensorType.transpose(i: Int, j: Int): TensorType
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
index 5463877ce..f5ea39d1b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
@@ -3,4 +3,3 @@ package space.kscience.kmath.tensors
 import space.kscience.kmath.nd.MutableNDStructure
 
 public typealias TensorStructure<T> = MutableNDStructure<T>
-
-- 
2.34.1


From 7cb5cd8f71721e5eb5e77e0849311a3fd3c2374f Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 15 Mar 2021 22:11:15 +0000
Subject: [PATCH 032/713] BufferedTensor revisited

---
 .../kscience/kmath/tensors/BufferedTensor.kt  | 54 ++++++++-------
 .../tensors/DoubleLinearOpsTensorAlgebra.kt   | 10 ++-
 .../kmath/tensors/DoubleTensorAlgebra.kt      | 69 ++++++++++---------
 .../space/kscience/kmath/tensors/utils.kt     |  3 +-
 ...{TestRealTensor.kt => TestDoubleTensor.kt} |  2 +-
 ...rAlgebra.kt => TestDoubleTensorAlgebra.kt} |  2 +-
 6 files changed, 78 insertions(+), 62 deletions(-)
 rename kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/{TestRealTensor.kt => TestDoubleTensor.kt} (96%)
 rename kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/{TestRealTensorAlgebra.kt => TestDoubleTensorAlgebra.kt} (99%)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
index 68fc0412e..264692d0c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
@@ -1,32 +1,34 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.nd.MutableNDBuffer
 import space.kscience.kmath.structures.*
 
 
 public open class BufferedTensor<T>(
     override val shape: IntArray,
-    buffer: MutableBuffer<T>
-) :
-    TensorStructure<T>,
-    MutableNDBuffer<T>(
-        TensorStrides(shape),
-        buffer
-    ) {
+    public val buffer: MutableBuffer<T>,
+    internal val bufferStart: Int
+) : TensorStructure<T>
+{
+    public val strides: TensorStrides
+        get() = TensorStrides(shape)
 
+    override fun get(index: IntArray): T = buffer[bufferStart + strides.offset(index)]
 
-    public operator fun get(i: Int, j: Int): T {
-        check(this.dimension == 2) { "Not matrix" }
-        return this[intArrayOf(i, j)]
+    override fun set(index: IntArray, value: T) {
+        buffer[bufferStart + strides.offset(index)] = value
     }
 
-    public operator fun set(i: Int, j: Int, value: T): Unit {
-        check(this.dimension == 2) { "Not matrix" }
-        this[intArrayOf(i, j)] = value
+    override fun elements(): Sequence<Pair<IntArray, T>> = strides.indices().map {
+        it to this[it]
     }
 
+    override fun equals(other: Any?): Boolean = false
+
+    override fun hashCode(): Int = 0
+
 }
 
+/*
 //todo make generator mb nextMatrixIndex?
 public class InnerMatrix<T>(private val tensor: BufferedTensor<T>){
     private var offset: Int = 0
@@ -75,25 +77,29 @@ public class InnerVector<T>(private val tensor: BufferedTensor<T>){
         offset += step
     }
 }
-
-
 //todo default buffer = arrayOf(0)???
+ */
+
 public class IntTensor(
     shape: IntArray,
-    buffer: IntArray
-) : BufferedTensor<Int>(shape, IntBuffer(buffer))
+    buffer: IntArray,
+    offset: Int = 0
+) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset)
 
 public class LongTensor(
     shape: IntArray,
-    buffer: LongArray
-) : BufferedTensor<Long>(shape, LongBuffer(buffer))
+    buffer: LongArray,
+    offset: Int = 0
+) : BufferedTensor<Long>(shape, LongBuffer(buffer), offset)
 
 public class FloatTensor(
     shape: IntArray,
-    buffer: FloatArray
-) : BufferedTensor<Float>(shape, FloatBuffer(buffer))
+    buffer: FloatArray,
+    offset: Int = 0
+) : BufferedTensor<Float>(shape, FloatBuffer(buffer), offset)
 
 public class DoubleTensor(
     shape: IntArray,
-    buffer: DoubleArray
-) : BufferedTensor<Double>(shape, RealBuffer(buffer))
\ No newline at end of file
+    buffer: DoubleArray,
+    offset: Int = 0
+) : BufferedTensor<Double>(shape, RealBuffer(buffer), offset)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
index 1aaf8df9d..eceb28459 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
@@ -9,6 +9,7 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
+        /*
         // todo checks
         val luTensor = this.copy()
         val lu = InnerMatrix(luTensor)
@@ -69,11 +70,13 @@ public class DoubleLinearOpsTensorAlgebra :
             pivot.makeStep()
         }
 
-        return Pair(luTensor, pivotsTensor)
+        return Pair(luTensor, pivotsTensor)*/
+
+        TODO("Andrei, first we need to view and get(Int)")
     }
 
     override fun luPivot(lu: DoubleTensor, pivots: IntTensor): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-
+        /*
         // todo checks
         val n = lu.shape[0]
         val p = lu.zeroesLike()
@@ -97,7 +100,8 @@ public class DoubleLinearOpsTensorAlgebra :
             }
         }
 
-        return Triple(p, l, u)
+        return Triple(p, l, u)*/
+        TODO("Andrei, first we need implement get(Int)")
     }
 
     override fun DoubleTensor.cholesky(): DoubleTensor {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
index 76a3c4c9c..391c2895f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
@@ -7,11 +7,11 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         check(this.shape contentEquals intArrayOf(1)) {
             "Inconsistent value for tensor of shape ${shape.toList()}"
         }
-        return this.buffer.unsafeToDoubleArray()[0]
+        return this.buffer.unsafeToDoubleArray()[this.bufferStart]
     }
 
     override fun DoubleTensor.get(i: Int): DoubleTensor {
-        TODO("Not yet implemented")
+        TODO("TOP PRIORITY")
     }
 
     override fun zeros(shape: IntArray): DoubleTensor {
@@ -20,7 +20,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
 
     override fun DoubleTensor.zeroesLike(): DoubleTensor {
         val shape = this.shape
-        val buffer = DoubleArray(this.buffer.size) { 0.0 }
+        val buffer = DoubleArray(this.strides.linearSize) { 0.0 }
         return DoubleTensor(shape, buffer)
     }
 
@@ -31,6 +31,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     override fun DoubleTensor.onesLike(): DoubleTensor {
         TODO("Not yet implemented")
     }
+
     override fun eye(n: Int): DoubleTensor {
         val shape = intArrayOf(n, n)
         val buffer = DoubleArray(n * n) { 0.0 }
@@ -42,14 +43,13 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun DoubleTensor.copy(): DoubleTensor {
-        // should be rework as soon as copy() method for NDBuffer will be available
-        return DoubleTensor(this.shape, this.buffer.unsafeToDoubleArray().copyOf())
+        return DoubleTensor(this.shape, this.buffer.unsafeToDoubleArray().copyOf(), this.bufferStart)
     }
 
 
     override fun Double.plus(other: DoubleTensor): DoubleTensor {
-        val resBuffer = DoubleArray(other.buffer.size) { i ->
-            other.buffer.unsafeToDoubleArray()[i] + this
+        val resBuffer = DoubleArray(other.strides.linearSize) { i ->
+            other.buffer.unsafeToDoubleArray()[other.bufferStart + i] + this
         }
         return DoubleTensor(other.shape, resBuffer)
     }
@@ -60,35 +60,36 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         val broadcast = broadcastTensors(this, other)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.buffer.size) { i ->
+        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
             newThis.buffer.unsafeToDoubleArray()[i] + newOther.buffer.unsafeToDoubleArray()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
     override fun DoubleTensor.plusAssign(value: Double) {
-        for (i in this.buffer.unsafeToDoubleArray().indices) {
-            this.buffer.unsafeToDoubleArray()[i] += value
+        for (i in 0 until this.strides.linearSize) {
+            this.buffer.unsafeToDoubleArray()[this.bufferStart + i] += value
         }
     }
 
     override fun DoubleTensor.plusAssign(other: DoubleTensor) {
         //todo should be change with broadcasting
-        for (i in this.buffer.unsafeToDoubleArray().indices) {
-            this.buffer.unsafeToDoubleArray()[i] += other.buffer.unsafeToDoubleArray()[i]
+        for (i in 0 until this.strides.linearSize) {
+            this.buffer.unsafeToDoubleArray()[this.bufferStart + i] +=
+                other.buffer.unsafeToDoubleArray()[this.bufferStart + i]
         }
     }
 
     override fun Double.minus(other: DoubleTensor): DoubleTensor {
-        val resBuffer = DoubleArray(other.buffer.size) { i ->
-            this - other.buffer.unsafeToDoubleArray()[i]
+        val resBuffer = DoubleArray(other.strides.linearSize) { i ->
+            this - other.buffer.unsafeToDoubleArray()[other.bufferStart + i]
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
     override fun DoubleTensor.minus(value: Double): DoubleTensor {
-        val resBuffer = DoubleArray(this.buffer.size) { i ->
-            this.buffer.unsafeToDoubleArray()[i] - value
+        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+            this.buffer.unsafeToDoubleArray()[this.bufferStart + i] - value
         }
         return DoubleTensor(this.shape, resBuffer)
     }
@@ -97,15 +98,15 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         val broadcast = broadcastTensors(this, other)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.buffer.size) { i ->
+        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
             newThis.buffer.unsafeToDoubleArray()[i] - newOther.buffer.unsafeToDoubleArray()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
     override fun DoubleTensor.minusAssign(value: Double) {
-        for (i in this.buffer.unsafeToDoubleArray().indices) {
-            this.buffer.unsafeToDoubleArray()[i] -= value
+        for (i in 0 until this.strides.linearSize) {
+            this.buffer.unsafeToDoubleArray()[this.bufferStart + i] -= value
         }
     }
 
@@ -115,8 +116,8 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
 
     override fun Double.times(other: DoubleTensor): DoubleTensor {
         //todo should be change with broadcasting
-        val resBuffer = DoubleArray(other.buffer.size) { i ->
-            other.buffer.unsafeToDoubleArray()[i] * this
+        val resBuffer = DoubleArray(other.strides.linearSize) { i ->
+            other.buffer.unsafeToDoubleArray()[other.bufferStart + i] * this
         }
         return DoubleTensor(other.shape, resBuffer)
     }
@@ -126,36 +127,38 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
 
     override fun DoubleTensor.times(other: DoubleTensor): DoubleTensor {
         //todo should be change with broadcasting
-        val resBuffer = DoubleArray(this.buffer.size) { i ->
-            this.buffer.unsafeToDoubleArray()[i] * other.buffer.unsafeToDoubleArray()[i]
+        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+            this.buffer.unsafeToDoubleArray()[other.bufferStart + i] *
+                    other.buffer.unsafeToDoubleArray()[other.bufferStart + i]
         }
         return DoubleTensor(this.shape, resBuffer)
     }
 
     override fun DoubleTensor.timesAssign(value: Double) {
         //todo should be change with broadcasting
-        for (i in this.buffer.unsafeToDoubleArray().indices) {
-            this.buffer.unsafeToDoubleArray()[i] *= value
+        for (i in 0 until this.strides.linearSize) {
+            this.buffer.unsafeToDoubleArray()[this.bufferStart + i] *= value
         }
     }
 
     override fun DoubleTensor.timesAssign(other: DoubleTensor) {
         //todo should be change with broadcasting
-        for (i in this.buffer.unsafeToDoubleArray().indices) {
-            this.buffer.unsafeToDoubleArray()[i] *= other.buffer.unsafeToDoubleArray()[i]
+        for (i in 0 until this.strides.linearSize) {
+            this.buffer.unsafeToDoubleArray()[this.bufferStart + i] *=
+                other.buffer.unsafeToDoubleArray()[this.bufferStart + i]
         }
     }
 
     override fun DoubleTensor.unaryMinus(): DoubleTensor {
-        val resBuffer = DoubleArray(this.buffer.size) { i ->
-            this.buffer.unsafeToDoubleArray()[i].unaryMinus()
+        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+            this.buffer.unsafeToDoubleArray()[this.bufferStart + i].unaryMinus()
         }
         return DoubleTensor(this.shape, resBuffer)
     }
 
     override fun DoubleTensor.transpose(i: Int, j: Int): DoubleTensor {
         checkTranspose(this.dimension, i, j)
-        val n = this.buffer.size
+        val n = this.strides.linearSize
         val resBuffer = DoubleArray(n)
 
         val resShape = this.shape.copyOf()
@@ -169,14 +172,16 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
             newMultiIndex[i] = newMultiIndex[j].also { newMultiIndex[j] = newMultiIndex[i] }
 
             val linearIndex = resTensor.strides.offset(newMultiIndex)
-            resTensor.buffer.unsafeToDoubleArray()[linearIndex] = this.buffer.unsafeToDoubleArray()[offset]
+            resTensor.buffer.unsafeToDoubleArray()[linearIndex] =
+                this.buffer.unsafeToDoubleArray()[this.bufferStart + offset]
         }
         return resTensor
     }
 
 
     override fun DoubleTensor.view(shape: IntArray): DoubleTensor {
-        return DoubleTensor(shape, this.buffer.unsafeToDoubleArray())
+        checkView(this, shape)
+        return DoubleTensor(shape, this.buffer.unsafeToDoubleArray(), this.bufferStart)
     }
 
     override fun DoubleTensor.viewAs(other: DoubleTensor): DoubleTensor {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
index 9f7e811db..74a774f45 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
@@ -55,7 +55,8 @@ internal inline fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleT
             }
 
             val curLinearIndex = tensor.strides.offset(curMultiIndex)
-            resTensor.buffer.unsafeToDoubleArray()[linearIndex] = tensor.buffer.unsafeToDoubleArray()[curLinearIndex]
+            resTensor.buffer.unsafeToDoubleArray()[linearIndex] =
+                tensor.buffer.unsafeToDoubleArray()[tensor.bufferStart + curLinearIndex]
         }
         res.add(resTensor)
     }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
similarity index 96%
rename from kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
rename to kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
index 72179ecbc..31c6ccbbf 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensor.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
@@ -6,7 +6,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
-class TestRealTensor {
+class TestDoubleTensor {
 
     @Test
     fun valueTest() = DoubleTensorAlgebra {
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt
similarity index 99%
rename from kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
rename to kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt
index 9dddcf59e..91181484c 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestRealTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt
@@ -4,7 +4,7 @@ package space.kscience.kmath.tensors
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
-class TestRealTensorAlgebra {
+class TestDoubleTensorAlgebra {
 
     @Test
     fun doublePlus() = DoubleTensorAlgebra {
-- 
2.34.1


From 791f55ee8a87f2822769099b22e70e04f4daa2f5 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 15 Mar 2021 22:39:29 +0000
Subject: [PATCH 033/713] get dim 0 operator for tensors

---
 .../tensors/DoubleLinearOpsTensorAlgebra.kt   |  2 +-
 .../kmath/tensors/DoubleTensorAlgebra.kt      | 49 ++++++++++---------
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  2 +-
 .../space/kscience/kmath/tensors/utils.kt     | 12 ++---
 .../kmath/tensors/TestDoubleTensor.kt         |  6 +++
 .../kmath/tensors/TestDoubleTensorAlgebra.kt  | 24 ++++-----
 6 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
index eceb28459..d6b202556 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
@@ -72,7 +72,7 @@ public class DoubleLinearOpsTensorAlgebra :
 
         return Pair(luTensor, pivotsTensor)*/
 
-        TODO("Andrei, first we need to view and get(Int)")
+        TODO("Andrei, use view, get, as2D, as1D")
     }
 
     override fun luPivot(lu: DoubleTensor, pivots: IntTensor): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
index 391c2895f..3b65e89da 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
@@ -7,11 +7,14 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         check(this.shape contentEquals intArrayOf(1)) {
             "Inconsistent value for tensor of shape ${shape.toList()}"
         }
-        return this.buffer.unsafeToDoubleArray()[this.bufferStart]
+        return this.buffer.array()[this.bufferStart]
     }
 
-    override fun DoubleTensor.get(i: Int): DoubleTensor {
-        TODO("TOP PRIORITY")
+    override operator fun DoubleTensor.get(i: Int): DoubleTensor {
+        val lastShape = this.shape.drop(1).toIntArray()
+        val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
+        val newStart = newShape.reduce(Int::times) * i + this.bufferStart
+        return DoubleTensor(newShape, this.buffer.array(), newStart)
     }
 
     override fun zeros(shape: IntArray): DoubleTensor {
@@ -43,13 +46,13 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun DoubleTensor.copy(): DoubleTensor {
-        return DoubleTensor(this.shape, this.buffer.unsafeToDoubleArray().copyOf(), this.bufferStart)
+        return DoubleTensor(this.shape, this.buffer.array().copyOf(), this.bufferStart)
     }
 
 
     override fun Double.plus(other: DoubleTensor): DoubleTensor {
         val resBuffer = DoubleArray(other.strides.linearSize) { i ->
-            other.buffer.unsafeToDoubleArray()[other.bufferStart + i] + this
+            other.buffer.array()[other.bufferStart + i] + this
         }
         return DoubleTensor(other.shape, resBuffer)
     }
@@ -61,35 +64,35 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
-            newThis.buffer.unsafeToDoubleArray()[i] + newOther.buffer.unsafeToDoubleArray()[i]
+            newThis.buffer.array()[i] + newOther.buffer.array()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
     override fun DoubleTensor.plusAssign(value: Double) {
         for (i in 0 until this.strides.linearSize) {
-            this.buffer.unsafeToDoubleArray()[this.bufferStart + i] += value
+            this.buffer.array()[this.bufferStart + i] += value
         }
     }
 
     override fun DoubleTensor.plusAssign(other: DoubleTensor) {
         //todo should be change with broadcasting
         for (i in 0 until this.strides.linearSize) {
-            this.buffer.unsafeToDoubleArray()[this.bufferStart + i] +=
-                other.buffer.unsafeToDoubleArray()[this.bufferStart + i]
+            this.buffer.array()[this.bufferStart + i] +=
+                other.buffer.array()[this.bufferStart + i]
         }
     }
 
     override fun Double.minus(other: DoubleTensor): DoubleTensor {
         val resBuffer = DoubleArray(other.strides.linearSize) { i ->
-            this - other.buffer.unsafeToDoubleArray()[other.bufferStart + i]
+            this - other.buffer.array()[other.bufferStart + i]
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
     override fun DoubleTensor.minus(value: Double): DoubleTensor {
         val resBuffer = DoubleArray(this.strides.linearSize) { i ->
-            this.buffer.unsafeToDoubleArray()[this.bufferStart + i] - value
+            this.buffer.array()[this.bufferStart + i] - value
         }
         return DoubleTensor(this.shape, resBuffer)
     }
@@ -99,14 +102,14 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
-            newThis.buffer.unsafeToDoubleArray()[i] - newOther.buffer.unsafeToDoubleArray()[i]
+            newThis.buffer.array()[i] - newOther.buffer.array()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
     override fun DoubleTensor.minusAssign(value: Double) {
         for (i in 0 until this.strides.linearSize) {
-            this.buffer.unsafeToDoubleArray()[this.bufferStart + i] -= value
+            this.buffer.array()[this.bufferStart + i] -= value
         }
     }
 
@@ -117,7 +120,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     override fun Double.times(other: DoubleTensor): DoubleTensor {
         //todo should be change with broadcasting
         val resBuffer = DoubleArray(other.strides.linearSize) { i ->
-            other.buffer.unsafeToDoubleArray()[other.bufferStart + i] * this
+            other.buffer.array()[other.bufferStart + i] * this
         }
         return DoubleTensor(other.shape, resBuffer)
     }
@@ -128,8 +131,8 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     override fun DoubleTensor.times(other: DoubleTensor): DoubleTensor {
         //todo should be change with broadcasting
         val resBuffer = DoubleArray(this.strides.linearSize) { i ->
-            this.buffer.unsafeToDoubleArray()[other.bufferStart + i] *
-                    other.buffer.unsafeToDoubleArray()[other.bufferStart + i]
+            this.buffer.array()[other.bufferStart + i] *
+                    other.buffer.array()[other.bufferStart + i]
         }
         return DoubleTensor(this.shape, resBuffer)
     }
@@ -137,21 +140,21 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     override fun DoubleTensor.timesAssign(value: Double) {
         //todo should be change with broadcasting
         for (i in 0 until this.strides.linearSize) {
-            this.buffer.unsafeToDoubleArray()[this.bufferStart + i] *= value
+            this.buffer.array()[this.bufferStart + i] *= value
         }
     }
 
     override fun DoubleTensor.timesAssign(other: DoubleTensor) {
         //todo should be change with broadcasting
         for (i in 0 until this.strides.linearSize) {
-            this.buffer.unsafeToDoubleArray()[this.bufferStart + i] *=
-                other.buffer.unsafeToDoubleArray()[this.bufferStart + i]
+            this.buffer.array()[this.bufferStart + i] *=
+                other.buffer.array()[this.bufferStart + i]
         }
     }
 
     override fun DoubleTensor.unaryMinus(): DoubleTensor {
         val resBuffer = DoubleArray(this.strides.linearSize) { i ->
-            this.buffer.unsafeToDoubleArray()[this.bufferStart + i].unaryMinus()
+            this.buffer.array()[this.bufferStart + i].unaryMinus()
         }
         return DoubleTensor(this.shape, resBuffer)
     }
@@ -172,8 +175,8 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
             newMultiIndex[i] = newMultiIndex[j].also { newMultiIndex[j] = newMultiIndex[i] }
 
             val linearIndex = resTensor.strides.offset(newMultiIndex)
-            resTensor.buffer.unsafeToDoubleArray()[linearIndex] =
-                this.buffer.unsafeToDoubleArray()[this.bufferStart + offset]
+            resTensor.buffer.array()[linearIndex] =
+                this.buffer.array()[this.bufferStart + offset]
         }
         return resTensor
     }
@@ -181,7 +184,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
 
     override fun DoubleTensor.view(shape: IntArray): DoubleTensor {
         checkView(this, shape)
-        return DoubleTensor(shape, this.buffer.unsafeToDoubleArray(), this.bufferStart)
+        return DoubleTensor(shape, this.buffer.array(), this.bufferStart)
     }
 
     override fun DoubleTensor.viewAs(other: DoubleTensor): DoubleTensor {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 02e1a0742..e56abfaaa 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -42,7 +42,7 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     public operator fun TensorType.unaryMinus(): TensorType
 
     //https://pytorch.org/cppdocs/notes/tensor_indexing.html
-    public fun TensorType.get(i: Int): TensorType
+    public operator fun TensorType.get(i: Int): TensorType
 
     //https://pytorch.org/docs/stable/generated/torch.transpose.html
     public fun TensorType.transpose(i: Int, j: Int): TensorType
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
index 74a774f45..3e32e2b72 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
@@ -55,8 +55,8 @@ internal inline fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleT
             }
 
             val curLinearIndex = tensor.strides.offset(curMultiIndex)
-            resTensor.buffer.unsafeToDoubleArray()[linearIndex] =
-                tensor.buffer.unsafeToDoubleArray()[tensor.bufferStart + curLinearIndex]
+            resTensor.buffer.array()[linearIndex] =
+                tensor.buffer.array()[tensor.bufferStart + curLinearIndex]
         }
         res.add(resTensor)
     }
@@ -99,7 +99,7 @@ internal inline fun <T, TensorType : TensorStructure<T>,
 /**
  * Returns a reference to [IntArray] containing all of the elements of this [Buffer].
  */
-internal fun Buffer<Int>.unsafeToIntArray(): IntArray = when(this) {
+internal fun Buffer<Int>.array(): IntArray = when(this) {
     is IntBuffer -> array
     else -> throw RuntimeException("Failed to cast Buffer to IntArray")
 }
@@ -107,7 +107,7 @@ internal fun Buffer<Int>.unsafeToIntArray(): IntArray = when(this) {
 /**
  * Returns a reference to [LongArray] containing all of the elements of this [Buffer].
  */
-internal fun Buffer<Long>.unsafeToLongArray(): LongArray = when(this) {
+internal fun Buffer<Long>.array(): LongArray = when(this) {
     is LongBuffer -> array
     else -> throw RuntimeException("Failed to cast Buffer to LongArray")
 }
@@ -115,7 +115,7 @@ internal fun Buffer<Long>.unsafeToLongArray(): LongArray = when(this) {
 /**
  * Returns a reference to [FloatArray] containing all of the elements of this [Buffer].
  */
-internal fun Buffer<Float>.unsafeToFloatArray(): FloatArray = when(this) {
+internal fun Buffer<Float>.array(): FloatArray = when(this) {
     is FloatBuffer -> array
     else -> throw RuntimeException("Failed to cast Buffer to FloatArray")
 }
@@ -123,7 +123,7 @@ internal fun Buffer<Float>.unsafeToFloatArray(): FloatArray = when(this) {
 /**
  * Returns a reference to [DoubleArray] containing all of the elements of this [Buffer].
  */
-internal fun Buffer<Double>.unsafeToDoubleArray(): DoubleArray = when(this) {
+internal fun Buffer<Double>.array(): DoubleArray = when(this) {
     is RealBuffer -> array
     else -> throw RuntimeException("Failed to cast Buffer to DoubleArray")
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
index 31c6ccbbf..b1c8cd6dd 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
@@ -21,4 +21,10 @@ class TestDoubleTensor {
         assertEquals(tensor[intArrayOf(0,1)], 5.8)
         assertTrue(tensor.elements().map{ it.second }.toList().toDoubleArray() contentEquals tensor.buffer.toDoubleArray())
     }
+
+    @Test
+    fun getTest() = DoubleTensorAlgebra {
+        val tensor = DoubleTensor(intArrayOf(2,2), doubleArrayOf(3.5,5.8,58.4,2.4))
+        assertTrue(tensor[0].elements().map{ it.second }.toList().toDoubleArray() contentEquals doubleArrayOf(3.5,5.8))
+    }
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt
index 91181484c..226454bf4 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt
@@ -10,7 +10,7 @@ class TestDoubleTensorAlgebra {
     fun doublePlus() = DoubleTensorAlgebra {
         val tensor = DoubleTensor(intArrayOf(2), doubleArrayOf(1.0, 2.0))
         val res = 10.0 + tensor
-        assertTrue(res.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(11.0,12.0))
+        assertTrue(res.buffer.array() contentEquals doubleArrayOf(11.0,12.0))
     }
 
     @Test
@@ -18,7 +18,7 @@ class TestDoubleTensorAlgebra {
         val tensor = DoubleTensor(intArrayOf(1), doubleArrayOf(0.0))
         val res = tensor.transpose(0, 0)
 
-        assertTrue(res.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(0.0))
+        assertTrue(res.buffer.array() contentEquals doubleArrayOf(0.0))
         assertTrue(res.shape contentEquals intArrayOf(1))
     }
 
@@ -27,7 +27,7 @@ class TestDoubleTensorAlgebra {
         val tensor = DoubleTensor(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res = tensor.transpose(1, 0)
 
-        assertTrue(res.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
+        assertTrue(res.buffer.array() contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
         assertTrue(res.shape contentEquals intArrayOf(2, 3))
     }
 
@@ -42,9 +42,9 @@ class TestDoubleTensorAlgebra {
         assertTrue(res02.shape contentEquals intArrayOf(3, 2, 1))
         assertTrue(res12.shape contentEquals intArrayOf(1, 3, 2))
 
-        assertTrue(res01.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res02.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
-        assertTrue(res12.buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res01.buffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res02.buffer.array() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res12.buffer.array() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
     }
 
     @Test
@@ -70,9 +70,9 @@ class TestDoubleTensorAlgebra {
         assertTrue(res[1].shape contentEquals intArrayOf(1, 2, 3))
         assertTrue(res[2].shape contentEquals intArrayOf(1, 2, 3))
 
-        assertTrue(res[0].buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res[1].buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
-        assertTrue(res[2].buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
+        assertTrue(res[0].buffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res[1].buffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
+        assertTrue(res[2].buffer.array() contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
     }
 
     @Test
@@ -82,14 +82,14 @@ class TestDoubleTensorAlgebra {
         val tensor3 = DoubleTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
 
         assertTrue((tensor2 - tensor1).shape contentEquals intArrayOf(2, 3))
-        assertTrue((tensor2 - tensor1).buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
+        assertTrue((tensor2 - tensor1).buffer.array() contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
 
         assertTrue((tensor3 - tensor1).shape contentEquals intArrayOf(1, 2, 3))
-        assertTrue((tensor3 - tensor1).buffer.unsafeToDoubleArray()
+        assertTrue((tensor3 - tensor1).buffer.array()
                 contentEquals doubleArrayOf(499.0, 498.0, 497.0, 496.0, 495.0, 494.0))
 
         assertTrue((tensor3 - tensor2).shape contentEquals intArrayOf(1, 1, 3))
-        assertTrue((tensor3 - tensor2).buffer.unsafeToDoubleArray() contentEquals doubleArrayOf(490.0, 480.0, 470.0))
+        assertTrue((tensor3 - tensor2).buffer.array() contentEquals doubleArrayOf(490.0, 480.0, 470.0))
     }
 
 }
\ No newline at end of file
-- 
2.34.1


From f4454a6cf6b8d54b1ecd818e2c39e6287b382189 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 15 Mar 2021 22:45:55 +0000
Subject: [PATCH 034/713] Matrices from tensors test

---
 .../kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
index b1c8cd6dd..3050f064a 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
@@ -1,6 +1,7 @@
 package space.kscience.kmath.tensors
 
 
+import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.structures.toDoubleArray
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -24,7 +25,8 @@ class TestDoubleTensor {
 
     @Test
     fun getTest() = DoubleTensorAlgebra {
-        val tensor = DoubleTensor(intArrayOf(2,2), doubleArrayOf(3.5,5.8,58.4,2.4))
-        assertTrue(tensor[0].elements().map{ it.second }.toList().toDoubleArray() contentEquals doubleArrayOf(3.5,5.8))
+        val tensor = DoubleTensor(intArrayOf(1,2,2), doubleArrayOf(3.5,5.8,58.4,2.4))
+        val matrix = tensor[0].as2D()
+        assertEquals(matrix[0,1], 5.8)
     }
 }
\ No newline at end of file
-- 
2.34.1


From 0553a28ee89e0d55f498c578882fece47bc620fe Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 16 Mar 2021 07:47:02 +0000
Subject: [PATCH 035/713] ReduceOpsTensorAlgebra

---
 .../kmath/tensors/AnalyticTensorAlgebra.kt    | 15 +++++++++++-
 .../tensors/DoubleAnalyticTensorAlgebra.kt    | 18 ++++++++++++++-
 .../tensors/DoubleOrderedTensorAlgebra.kt     |  2 +-
 .../tensors/DoubleReduceOpsTensorAlgebra.kt   | 16 +++++++++++++
 .../kmath/tensors/DoubleTensorAlgebra.kt      | 23 -------------------
 .../kmath/tensors/ReduceOpsTensorAlgebra.kt   |  7 ++++++
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  1 -
 .../tensors/TensorPartialDivisionAlgebra.kt   | 14 -----------
 .../kmath/tensors/TestDoubleTensor.kt         | 12 +++++++++-
 9 files changed, 66 insertions(+), 42 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleReduceOpsTensorAlgebra.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ReduceOpsTensorAlgebra.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
index 17a25b6b3..41772da44 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
@@ -2,7 +2,17 @@ package space.kscience.kmath.tensors
 
 
 public interface AnalyticTensorAlgebra<T, TensorType : TensorStructure<T>> :
-    TensorPartialDivisionAlgebra<T, TensorType> {
+    TensorPartialDivisionAlgebra<T, TensorType>,
+    OrderedTensorAlgebra<T, TensorType>{
+
+    //https://pytorch.org/docs/stable/generated/torch.quantile.html#torch.quantile
+    public fun TensorType.quantile(q: T, dim: Int, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.std.html#torch.std
+    public fun TensorType.std(dim: Int, unbiased: Boolean, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.var.html#torch.var
+    public fun TensorType.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): TensorType
 
     //https://pytorch.org/docs/stable/generated/torch.exp.html
     public fun TensorType.exp(): TensorType
@@ -109,4 +119,7 @@ public interface AnalyticTensorAlgebra<T, TensorType : TensorStructure<T>> :
     //https://pytorch.org/docs/stable/generated/torch.trapz.html#torch.trapz
     public fun TensorType.trapz(xValues: TensorType, dim: Int): TensorType
 
+    //https://pytorch.org/docs/stable/generated/torch.histc.html#torch.histc
+    public fun TensorType.histc(bins: Int, min: T, max: T): TensorType
+
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
index 00e7a7fbd..cccc02789 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
@@ -2,7 +2,7 @@ package space.kscience.kmath.tensors
 
 public class DoubleAnalyticTensorAlgebra:
     AnalyticTensorAlgebra<Double, DoubleTensor>,
-    DoubleTensorAlgebra()
+    DoubleOrderedTensorAlgebra()
 {
     override fun DoubleTensor.exp(): DoubleTensor {
         TODO("Not yet implemented")
@@ -144,6 +144,22 @@ public class DoubleAnalyticTensorAlgebra:
         TODO("Not yet implemented")
     }
 
+    override fun DoubleTensor.quantile(q: Double, dim: Int, keepDim: Boolean): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.std(dim: Int, unbiased: Boolean, keepDim: Boolean): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.histc(bins: Int, min: Double, max: Double): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
 }
 
 public inline fun <R> DoubleAnalyticTensorAlgebra(block: DoubleAnalyticTensorAlgebra.() -> R): R =
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleOrderedTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleOrderedTensorAlgebra.kt
index e7ebf6c56..bd6bcfe8f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleOrderedTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleOrderedTensorAlgebra.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.tensors
 
-public class DoubleOrderedTensorAlgebra:
+public open class DoubleOrderedTensorAlgebra:
     OrderedTensorAlgebra<Double, DoubleTensor>,
     DoubleTensorAlgebra()
 {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleReduceOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleReduceOpsTensorAlgebra.kt
new file mode 100644
index 000000000..00d9b3ff8
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleReduceOpsTensorAlgebra.kt
@@ -0,0 +1,16 @@
+package space.kscience.kmath.tensors
+
+public class DoubleReduceOpsTensorAlgebra:
+    DoubleTensorAlgebra(),
+    ReduceOpsTensorAlgebra<Double, DoubleTensor>  {
+
+    override fun DoubleTensor.value(): Double {
+        check(this.shape contentEquals intArrayOf(1)) {
+            "Inconsistent value for tensor of shape ${shape.toList()}"
+        }
+        return this.buffer.array()[this.bufferStart]
+    }
+}
+
+public inline fun <R> DoubleReduceOpsTensorAlgebra(block: DoubleReduceOpsTensorAlgebra.() -> R): R =
+    DoubleReduceOpsTensorAlgebra().block()
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
index 3b65e89da..c383387ef 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
@@ -3,13 +3,6 @@ package space.kscience.kmath.tensors
 
 public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, DoubleTensor> {
 
-    override fun DoubleTensor.value(): Double {
-        check(this.shape contentEquals intArrayOf(1)) {
-            "Inconsistent value for tensor of shape ${shape.toList()}"
-        }
-        return this.buffer.array()[this.bufferStart]
-    }
-
     override operator fun DoubleTensor.get(i: Int): DoubleTensor {
         val lastShape = this.shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
@@ -257,22 +250,6 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         TODO("Not yet implemented")
     }
 
-    override fun DoubleTensor.quantile(q: Double, dim: Int, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.std(dim: Int, unbiased: Boolean, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.histc(bins: Int, min: Double, max: Double): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
     override fun DoubleTensor.det(): DoubleTensor {
         TODO("Not yet implemented")
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ReduceOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ReduceOpsTensorAlgebra.kt
new file mode 100644
index 000000000..820b9b25b
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ReduceOpsTensorAlgebra.kt
@@ -0,0 +1,7 @@
+package space.kscience.kmath.tensors
+
+public interface ReduceOpsTensorAlgebra<T, TensorType : TensorStructure<T>> :
+    TensorAlgebra<T, TensorType> {
+    public fun TensorType.value(): T
+
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index e56abfaaa..60f0b3379 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -3,7 +3,6 @@ package space.kscience.kmath.tensors
 // https://proofwiki.org/wiki/Definition:Algebra_over_Ring
 public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
-    public fun TensorType.value(): T
 
     public fun zeros(shape: IntArray): TensorType
     public fun TensorType.zeroesLike(): TensorType
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
index 2d448fa8c..ca3876e2c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
@@ -3,7 +3,6 @@ package space.kscience.kmath.tensors
 // https://proofwiki.org/wiki/Definition:Division_Algebra
 public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>> :
     TensorAlgebra<T, TensorType> {
-
     public operator fun TensorType.div(value: T): TensorType
     public operator fun TensorType.div(other: TensorType): TensorType
     public operator fun TensorType.divAssign(value: T)
@@ -11,17 +10,4 @@ public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.mean.html#torch.mean
     public fun TensorType.mean(dim: Int, keepDim: Boolean): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.quantile.html#torch.quantile
-    public fun TensorType.quantile(q: T, dim: Int, keepDim: Boolean): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.std.html#torch.std
-    public fun TensorType.std(dim: Int, unbiased: Boolean, keepDim: Boolean): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.var.html#torch.var
-    public fun TensorType.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.histc.html#torch.histc
-    public fun TensorType.histc(bins: Int, min: T, max: T): TensorType
-
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
index 3050f064a..006b0273a 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
@@ -1,6 +1,7 @@
 package space.kscience.kmath.tensors
 
 
+import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.structures.toDoubleArray
 import kotlin.test.Test
@@ -10,7 +11,7 @@ import kotlin.test.assertTrue
 class TestDoubleTensor {
 
     @Test
-    fun valueTest() = DoubleTensorAlgebra {
+    fun valueTest() = DoubleReduceOpsTensorAlgebra {
         val value = 12.5
         val tensor = DoubleTensor(intArrayOf(1), doubleArrayOf(value))
         assertEquals(tensor.value(), value)
@@ -28,5 +29,14 @@ class TestDoubleTensor {
         val tensor = DoubleTensor(intArrayOf(1,2,2), doubleArrayOf(3.5,5.8,58.4,2.4))
         val matrix = tensor[0].as2D()
         assertEquals(matrix[0,1], 5.8)
+
+        val vector = tensor[0][1].as1D()
+        assertEquals(vector[0], 58.4)
+
+        matrix[0,1] = 77.89
+        assertEquals(tensor[intArrayOf(0,0,1)], 77.89)
+
+        //vector[0] = 109.56
+        //println(tensor[intArrayOf(0,1,0)])
     }
 }
\ No newline at end of file
-- 
2.34.1


From 99ee5aa54a043427d8ade94c82107cdc18e48819 Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Tue, 16 Mar 2021 14:57:19 +0300
Subject: [PATCH 036/713] add broadcast to functions

---
 .../kmath/tensors/DoubleTensorAlgebra.kt      | 30 ++++++++-------
 .../space/kscience/kmath/tensors/utils.kt     | 37 +++++++++++++++++++
 .../kmath/tensors/TestDoubleTensorAlgebra.kt  | 10 +++++
 3 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
index c383387ef..794a06102 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
@@ -69,10 +69,10 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun DoubleTensor.plusAssign(other: DoubleTensor) {
-        //todo should be change with broadcasting
+        val newOther = broadcastTo(other, this.shape)
         for (i in 0 until this.strides.linearSize) {
             this.buffer.array()[this.bufferStart + i] +=
-                other.buffer.array()[this.bufferStart + i]
+                newOther.buffer.array()[this.bufferStart + i]
         }
     }
 
@@ -107,41 +107,45 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun DoubleTensor.minusAssign(other: DoubleTensor) {
-        TODO("Alya")
+        val newOther = broadcastTo(other, this.shape)
+        for (i in 0 until this.strides.linearSize) {
+            this.buffer.array()[this.bufferStart + i] -=
+                newOther.buffer.array()[this.bufferStart + i]
+        }
     }
 
     override fun Double.times(other: DoubleTensor): DoubleTensor {
-        //todo should be change with broadcasting
         val resBuffer = DoubleArray(other.strides.linearSize) { i ->
             other.buffer.array()[other.bufferStart + i] * this
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
-    //todo should be change with broadcasting
     override fun DoubleTensor.times(value: Double): DoubleTensor = value * this
 
     override fun DoubleTensor.times(other: DoubleTensor): DoubleTensor {
-        //todo should be change with broadcasting
-        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
-            this.buffer.array()[other.bufferStart + i] *
-                    other.buffer.array()[other.bufferStart + i]
+        val broadcast = broadcastTensors(this, other)
+        val newThis = broadcast[0]
+        val newOther = broadcast[1]
+
+        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
+            newThis.buffer.array()[newOther.bufferStart + i] *
+                    newOther.buffer.array()[newOther.bufferStart + i]
         }
-        return DoubleTensor(this.shape, resBuffer)
+        return DoubleTensor(newThis.shape, resBuffer)
     }
 
     override fun DoubleTensor.timesAssign(value: Double) {
-        //todo should be change with broadcasting
         for (i in 0 until this.strides.linearSize) {
             this.buffer.array()[this.bufferStart + i] *= value
         }
     }
 
     override fun DoubleTensor.timesAssign(other: DoubleTensor) {
-        //todo should be change with broadcasting
+        val newOther = broadcastTo(other, this.shape)
         for (i in 0 until this.strides.linearSize) {
             this.buffer.array()[this.bufferStart + i] *=
-                other.buffer.array()[this.bufferStart + i]
+                newOther.buffer.array()[this.bufferStart + i]
         }
     }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
index 3e32e2b72..e7e043463 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
@@ -32,6 +32,43 @@ internal inline fun broadcastShapes(vararg shapes: IntArray): IntArray {
     return totalShape
 }
 
+internal inline fun broadcastTo(tensor: DoubleTensor, newShape: IntArray): DoubleTensor {
+    if (tensor.shape.size > newShape.size) {
+        throw RuntimeException("Tensor is not compatible with the new shape")
+    }
+
+    val n = newShape.reduce { acc, i -> acc * i }
+    val resTensor = DoubleTensor(newShape, DoubleArray(n))
+
+    for (i in tensor.shape.indices) {
+        val curDim = tensor.shape[i]
+        val offset = newShape.size - tensor.shape.size
+        if (curDim != 1 && newShape[i + offset] != curDim) {
+            throw RuntimeException("Tensor is not compatible with the new shape and cannot be broadcast")
+        }
+    }
+
+    for (linearIndex in 0 until n) {
+        val totalMultiIndex = resTensor.strides.index(linearIndex)
+        val curMultiIndex = tensor.shape.copyOf()
+
+        val offset = totalMultiIndex.size - curMultiIndex.size
+
+        for (i in curMultiIndex.indices) {
+            if (curMultiIndex[i] != 1) {
+                curMultiIndex[i] = totalMultiIndex[i + offset]
+            } else {
+                curMultiIndex[i] = 0
+            }
+        }
+
+        val curLinearIndex = tensor.strides.offset(curMultiIndex)
+        resTensor.buffer.array()[linearIndex] =
+            tensor.buffer.array()[tensor.bufferStart + curLinearIndex]
+    }
+    return resTensor
+}
+
 internal inline fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleTensor> {
     val totalShape = broadcastShapes(*(tensors.map { it.shape }).toTypedArray())
     val n = totalShape.reduce { acc, i -> acc * i }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt
index 226454bf4..a060a970f 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt
@@ -58,6 +58,16 @@ class TestDoubleTensorAlgebra {
         ) contentEquals intArrayOf(5, 6, 7))
     }
 
+    @Test
+    fun broadcastTo() = DoubleTensorAlgebra {
+        val tensor1 = DoubleTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = DoubleTensor(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+
+        val res = broadcastTo(tensor2, tensor1.shape)
+        assertTrue(res.shape contentEquals intArrayOf(2, 3))
+        assertTrue(res.buffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
+    }
+
     @Test
     fun broadcastTensors() = DoubleTensorAlgebra {
         val tensor1 = DoubleTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-- 
2.34.1


From 70bebbe8488840a38e84855ca3d3eea1ddb4eebb Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 16 Mar 2021 12:12:28 +0000
Subject: [PATCH 037/713] 1D mutable structure setter fixed

---
 .../kotlin/space/kscience/kmath/nd/Structure1D.kt         | 2 +-
 .../space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt | 6 ------
 .../kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt | 8 --------
 .../space/kscience/kmath/tensors/DoubleTensorAlgebra.kt   | 8 ++++++++
 .../kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt  | 3 +++
 .../kmath/tensors/TensorPartialDivisionAlgebra.kt         | 3 +++
 .../space/kscience/kmath/tensors/TestDoubleTensor.kt      | 4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index 2926b3d1b..fd965a668 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -52,7 +52,7 @@ private inline class MutableStructure1DWrapper<T>(val structure: MutableNDStruct
 
     override fun get(index: Int): T = structure[index]
     override fun set(index: Int, value: T) {
-        set(index, value)
+        structure[intArrayOf(index)] = value
     }
 
     override fun copy(): MutableBuffer<T> =
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
index 41772da44..c3a558298 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
@@ -11,9 +11,6 @@ public interface AnalyticTensorAlgebra<T, TensorType : TensorStructure<T>> :
     //https://pytorch.org/docs/stable/generated/torch.std.html#torch.std
     public fun TensorType.std(dim: Int, unbiased: Boolean, keepDim: Boolean): TensorType
 
-    //https://pytorch.org/docs/stable/generated/torch.var.html#torch.var
-    public fun TensorType.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): TensorType
-
     //https://pytorch.org/docs/stable/generated/torch.exp.html
     public fun TensorType.exp(): TensorType
 
@@ -23,9 +20,6 @@ public interface AnalyticTensorAlgebra<T, TensorType : TensorStructure<T>> :
     //https://pytorch.org/docs/stable/generated/torch.sqrt.html
     public fun TensorType.sqrt(): TensorType
 
-    //https://pytorch.org/docs/stable/generated/torch.square.html
-    public fun TensorType.square(): TensorType
-
     //https://pytorch.org/docs/stable/generated/torch.acos.html#torch.cos
     public fun TensorType.cos(): TensorType
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
index cccc02789..5349a9923 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
@@ -16,10 +16,6 @@ public class DoubleAnalyticTensorAlgebra:
         TODO("Not yet implemented")
     }
 
-    override fun DoubleTensor.square(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
     override fun DoubleTensor.cos(): DoubleTensor {
         TODO("Not yet implemented")
     }
@@ -152,10 +148,6 @@ public class DoubleAnalyticTensorAlgebra:
         TODO("Not yet implemented")
     }
 
-    override fun DoubleTensor.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
     override fun DoubleTensor.histc(bins: Int, min: Double, max: Double): DoubleTensor {
         TODO("Not yet implemented")
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
index c383387ef..bafbd9a96 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
@@ -254,6 +254,14 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         TODO("Not yet implemented")
     }
 
+    override fun DoubleTensor.square(): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
+    override fun DoubleTensor.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
 }
 
 public inline fun <R> DoubleTensorAlgebra(block: DoubleTensorAlgebra.() -> R): R =
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 60f0b3379..0af757d1a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -40,6 +40,9 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     public operator fun TensorType.timesAssign(other: TensorType): Unit
     public operator fun TensorType.unaryMinus(): TensorType
 
+    //https://pytorch.org/docs/stable/generated/torch.square.html
+    public fun TensorType.square(): TensorType
+
     //https://pytorch.org/cppdocs/notes/tensor_indexing.html
     public operator fun TensorType.get(i: Int): TensorType
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
index ca3876e2c..9f70f9621 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
@@ -10,4 +10,7 @@ public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.mean.html#torch.mean
     public fun TensorType.mean(dim: Int, keepDim: Boolean): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.var.html#torch.var
+    public fun TensorType.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): TensorType
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
index 006b0273a..6b20027c7 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
@@ -36,7 +36,7 @@ class TestDoubleTensor {
         matrix[0,1] = 77.89
         assertEquals(tensor[intArrayOf(0,0,1)], 77.89)
 
-        //vector[0] = 109.56
-        //println(tensor[intArrayOf(0,1,0)])
+        vector[0] = 109.56
+        assertEquals(tensor[intArrayOf(0,1,0)], 109.56)
     }
 }
\ No newline at end of file
-- 
2.34.1


From bd3425e7a545622c117740bba178ec1b1b531eab Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 16 Mar 2021 14:43:20 +0000
Subject: [PATCH 038/713] IndexTensor type added to LinearOps

---
 .../kotlin/space/kscience/kmath/tensors/BufferedTensor.kt     | 3 +++
 .../kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt    | 2 +-
 .../space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt    | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
index 264692d0c..c9a401ad5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
@@ -12,6 +12,9 @@ public open class BufferedTensor<T>(
     public val strides: TensorStrides
         get() = TensorStrides(shape)
 
+    public val numel: Int
+        get() = strides.linearSize
+
     override fun get(index: IntArray): T = buffer[bufferStart + strides.offset(index)]
 
     override fun set(index: IntArray, value: T) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
index d6b202556..689eda9e0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
@@ -1,7 +1,7 @@
 package space.kscience.kmath.tensors
 
 public class DoubleLinearOpsTensorAlgebra :
-    LinearOpsTensorAlgebra<Double, DoubleTensor>,
+    LinearOpsTensorAlgebra<Double, DoubleTensor, IntTensor>,
     DoubleTensorAlgebra() {
 
     override fun DoubleTensor.inv(): DoubleTensor {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
index 7450c09c1..2e1c4a92c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
@@ -1,7 +1,7 @@
 package space.kscience.kmath.tensors
 
 
-public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>> :
+public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>, IndexTensorType: TensorStructure<Int>> :
     TensorPartialDivisionAlgebra<T, TensorType> {
 
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.inv
@@ -14,7 +14,7 @@ public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>> :
     public fun TensorType.qr(): TensorType
 
     //https://pytorch.org/docs/stable/generated/torch.lu.html
-    public fun TensorType.lu(): Pair<TensorType, IntTensor>
+    public fun TensorType.lu(): Pair<TensorType, IndexTensorType>
 
     //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
     public fun luPivot(lu: TensorType, pivots: IntTensor): Triple<TensorType, TensorType, TensorType>
-- 
2.34.1


From efb23591a9efebe3bf86b2757ac482032b5047a7 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 17 Mar 2021 07:36:35 +0000
Subject: [PATCH 039/713] Added squeeze

---
 .../space/kscience/kmath/tensors/DoubleTensorAlgebra.kt       | 4 ++++
 .../kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt      | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
index 888f12923..675be2f33 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
@@ -266,6 +266,10 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         TODO("Not yet implemented")
     }
 
+    override fun DoubleTensor.squeeze(dim: Int): DoubleTensor {
+        TODO("Not yet implemented")
+    }
+
 }
 
 public inline fun <R> DoubleTensorAlgebra(block: DoubleTensorAlgebra.() -> R): R =
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 0af757d1a..b1adf2962 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -86,4 +86,6 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     //https://pytorch.org/docs/stable/generated/torch.flatten.html#torch.flatten
     public fun TensorType.flatten(startDim: Int, endDim: Int): TensorType
 
+    //https://pytorch.org/docs/stable/generated/torch.squeeze.html
+    public fun TensorType.squeeze(dim: Int): TensorType
 }
-- 
2.34.1


From 1fa0da2810d69aa6d9dac669b4ebc353dd5265d1 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Wed, 17 Mar 2021 17:53:14 +0300
Subject: [PATCH 040/713] complete lu and matrix mapping

---
 .../kscience/kmath/tensors/BufferedTensor.kt  | 95 +++++++++----------
 .../tensors/DoubleLinearOpsTensorAlgebra.kt   | 83 ++++++++--------
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  2 +-
 3 files changed, 85 insertions(+), 95 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
index c9a401ad5..c48e47f4c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
@@ -1,5 +1,7 @@
 package space.kscience.kmath.tensors
 
+import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.structures.*
 
 
@@ -29,59 +31,50 @@ public open class BufferedTensor<T>(
 
     override fun hashCode(): Int = 0
 
+    // todo rename to vector
+    public inline fun forEachVector(vectorAction : (MutableStructure1D<T>) -> Unit): Unit {
+        check(shape.size >= 1) {"todo"}
+        val vectorOffset = strides.strides[0]
+        val vectorShape = intArrayOf(shape.last())
+        for (offset in 0 until numel step vectorOffset) {
+            val vector = BufferedTensor<T>(vectorShape, buffer, offset).as1D()
+            vectorAction(vector)
+        }
+    }
+
+    public inline fun forEachMatrix(matrixAction : (MutableStructure2D<T>) -> Unit): Unit {
+        check(shape.size >= 2) {"todo"}
+        val matrixOffset = strides.strides[1]
+        val matrixShape = intArrayOf(shape[shape.size - 2], shape.last()) //todo better way?
+        for (offset in 0 until numel step matrixOffset) {
+            val matrix = BufferedTensor<T>(matrixShape, buffer, offset).as2D()
+            matrixAction(matrix)
+        }
+    }
+    // todo remove code copy-pasting
+
+    public fun vectorSequence(): Sequence<MutableStructure1D<T>> = sequence {
+        check(shape.size >= 1) {"todo"}
+        val vectorOffset = strides.strides[0]
+        val vectorShape = intArrayOf(shape.last())
+        for (offset in 0 until numel step vectorOffset) {
+            val vector = BufferedTensor<T>(vectorShape, buffer, offset).as1D()
+            yield(vector)
+        }
+    }
+
+    public fun matrixSequence(): Sequence<MutableStructure2D<T>> = sequence {
+        check(shape.size >= 2) {"todo"}
+        val matrixOffset = strides.strides[1]
+        val matrixShape = intArrayOf(shape[shape.size - 2], shape.last()) //todo better way?
+        for (offset in 0 until numel step matrixOffset) {
+            val matrix = BufferedTensor<T>(matrixShape, buffer, offset).as2D()
+            yield(matrix)
+        }
+    }
+
 }
 
-/*
-//todo make generator mb nextMatrixIndex?
-public class InnerMatrix<T>(private val tensor: BufferedTensor<T>){
-    private var offset: Int = 0
-    private val n : Int = tensor.shape.size
-    //stride?
-    private val step = tensor.shape[n - 1] * tensor.shape[n - 2]
-
-    public operator fun get(i: Int, j: Int): T {
-        val index = tensor.strides.index(offset)
-        index[n - 2] = i
-        index[n - 1] = j
-        return tensor[index]
-    }
-
-    public operator fun set(i: Int, j: Int, value: T): Unit {
-        val index = tensor.strides.index(offset)
-        index[n - 2] = i
-        index[n - 1] = j
-        tensor[index] = value
-    }
-
-    public fun makeStep(){
-        offset += step
-    }
-}
-
-public class InnerVector<T>(private val tensor: BufferedTensor<T>){
-    private var offset: Int = 0
-    private val n : Int = tensor.shape.size
-    //stride?
-    private val step = tensor.shape[n - 1]
-
-    public operator fun get(i: Int): T {
-        val index = tensor.strides.index(offset)
-        index[n - 1] = i
-        return tensor[index]
-    }
-
-    public operator fun set(i: Int, value: T): Unit {
-        val index = tensor.strides.index(offset)
-        index[n - 1] = i
-        tensor[index] = value
-    }
-
-    public fun makeStep(){
-        offset += step
-    }
-}
-//todo default buffer = arrayOf(0)???
- */
 
 public class IntTensor(
     shape: IntArray,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
index 689eda9e0..3f44305b1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
@@ -9,27 +9,21 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
-        /*
+
         // todo checks
+
         val luTensor = this.copy()
-        val lu = InnerMatrix(luTensor)
-        //stride TODO!!! move to generator?
-        var matCnt = 1
-        for (i in 0 until this.shape.size - 2) {
-            matCnt *= this.shape[i]
-        }
+
         val n = this.shape.size
-        val m = this.shape[n - 1]
-        val pivotsShape = IntArray(n - 1) { i ->
-            this.shape[i]
-        }
+        val m = this.shape.last()
+        val pivotsShape = IntArray(n - 1) { i -> this.shape[i] }
         val pivotsTensor = IntTensor(
             pivotsShape,
-            IntArray(matCnt * m) { 0 }
+            IntArray(pivotsShape.reduce(Int::times)) { 0 } //todo default???
         )
-        val pivot = InnerVector(pivotsTensor)
-        for (i in 0 until matCnt) {
-            for (row in 0 until m) pivot[row] = row
+
+        for ((lu, pivots) in luTensor.matrixSequence().zip(pivotsTensor.vectorSequence())){
+            for (row in 0 until m) pivots[row] = row
 
             for (i in 0 until m) {
                 var maxA = -1.0
@@ -47,9 +41,9 @@ public class DoubleLinearOpsTensorAlgebra :
 
                 if (iMax != i) {
 
-                    val j = pivot[i]
-                    pivot[i] = pivot[iMax]
-                    pivot[iMax] = j
+                    val j = pivots[i]
+                    pivots[i] = pivots[iMax]
+                    pivots[iMax] = j
 
                     for (k in 0 until m) {
                         val tmp = lu[i, k]
@@ -66,42 +60,45 @@ public class DoubleLinearOpsTensorAlgebra :
                     }
                 }
             }
-            lu.makeStep()
-            pivot.makeStep()
         }
 
-        return Pair(luTensor, pivotsTensor)*/
 
-        TODO("Andrei, use view, get, as2D, as1D")
+        return Pair(luTensor, pivotsTensor)
+
     }
 
-    override fun luPivot(lu: DoubleTensor, pivots: IntTensor): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        /*
-        // todo checks
-        val n = lu.shape[0]
-        val p = lu.zeroesLike()
-        pivots.buffer.unsafeToIntArray().forEachIndexed { i, pivot ->
-            p[i, pivot] = 1.0
+    override fun luPivot(luTensor: DoubleTensor, pivotsTensor: IntTensor): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+        //todo checks
+        val n = luTensor.shape.last()
+        val pTensor = luTensor.zeroesLike()
+        for ((p, pivot) in pTensor.matrixSequence().zip(pivotsTensor.vectorSequence())){
+            for (i in 0 until n){
+                p[i, pivot[i]] = 1.0
+            }
         }
-        val l = lu.zeroesLike()
-        val u = lu.zeroesLike()
 
-        for (i in 0 until n) {
-            for (j in 0 until n) {
-                if (i == j) {
-                    l[i, j] = 1.0
-                }
-                if (j < i) {
-                    l[i, j] = lu[i, j]
-                }
-                if (j >= i) {
-                    u[i, j] = lu[i, j]
+        val lTensor = luTensor.zeroesLike()
+        val uTensor = luTensor.zeroesLike()
+
+        for ((pairLU, lu) in lTensor.matrixSequence().zip(uTensor.matrixSequence()).zip(luTensor.matrixSequence())){
+            val (l, u) = pairLU
+            for (i in 0 until n) {
+                for (j in 0 until n) {
+                    if (i == j) {
+                        l[i, j] = 1.0
+                    }
+                    if (j < i) {
+                        l[i, j] = lu[i, j]
+                    }
+                    if (j >= i) {
+                        u[i, j] = lu[i, j]
+                    }
                 }
             }
         }
 
-        return Triple(p, l, u)*/
-        TODO("Andrei, first we need implement get(Int)")
+        return Triple(pTensor, lTensor, uTensor)
+
     }
 
     override fun DoubleTensor.cholesky(): DoubleTensor {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index b1adf2962..7ec920d88 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -5,7 +5,7 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
 
     public fun zeros(shape: IntArray): TensorType
-    public fun TensorType.zeroesLike(): TensorType
+    public fun TensorType.zeroesLike(): TensorType // mb it shouldn't be tensor but algebra method (like in numpy/torch) ?
     public fun ones(shape: IntArray): TensorType
     public fun TensorType.onesLike(): TensorType
 
-- 
2.34.1


From 5e94610e2862fc2ecfe5e4f9e709ecc2ab3f428a Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Fri, 19 Mar 2021 17:51:30 +0300
Subject: [PATCH 041/713] imp full and remove copypaste in geners

---
 .../kscience/kmath/tensors/BufferedTensor.kt  | 34 +++++++------------
 .../kmath/tensors/DoubleTensorAlgebra.kt      | 34 +++++++------------
 .../kscience/kmath/tensors/TensorAlgebra.kt   | 12 +++----
 3 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
index c48e47f4c..b9ebf578a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
@@ -31,28 +31,6 @@ public open class BufferedTensor<T>(
 
     override fun hashCode(): Int = 0
 
-    // todo rename to vector
-    public inline fun forEachVector(vectorAction : (MutableStructure1D<T>) -> Unit): Unit {
-        check(shape.size >= 1) {"todo"}
-        val vectorOffset = strides.strides[0]
-        val vectorShape = intArrayOf(shape.last())
-        for (offset in 0 until numel step vectorOffset) {
-            val vector = BufferedTensor<T>(vectorShape, buffer, offset).as1D()
-            vectorAction(vector)
-        }
-    }
-
-    public inline fun forEachMatrix(matrixAction : (MutableStructure2D<T>) -> Unit): Unit {
-        check(shape.size >= 2) {"todo"}
-        val matrixOffset = strides.strides[1]
-        val matrixShape = intArrayOf(shape[shape.size - 2], shape.last()) //todo better way?
-        for (offset in 0 until numel step matrixOffset) {
-            val matrix = BufferedTensor<T>(matrixShape, buffer, offset).as2D()
-            matrixAction(matrix)
-        }
-    }
-    // todo remove code copy-pasting
-
     public fun vectorSequence(): Sequence<MutableStructure1D<T>> = sequence {
         check(shape.size >= 1) {"todo"}
         val vectorOffset = strides.strides[0]
@@ -73,6 +51,18 @@ public open class BufferedTensor<T>(
         }
     }
 
+    public inline fun forEachVector(vectorAction : (MutableStructure1D<T>) -> Unit): Unit {
+        for (vector in vectorSequence()){
+            vectorAction(vector)
+        }
+    }
+
+    public inline fun forEachMatrix(matrixAction : (MutableStructure2D<T>) -> Unit): Unit {
+        for (matrix in matrixSequence()){
+            matrixAction(matrix)
+        }
+    }
+
 }
 
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
index 675be2f33..6459f4510 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
@@ -10,23 +10,24 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return DoubleTensor(newShape, this.buffer.array(), newStart)
     }
 
-    override fun zeros(shape: IntArray): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.zeroesLike(): DoubleTensor {
-        val shape = this.shape
-        val buffer = DoubleArray(this.strides.linearSize) { 0.0 }
+    override fun full(shape: IntArray, value: Double): DoubleTensor {
+        val buffer = DoubleArray(TensorStrides(shape).linearSize) { value }
         return DoubleTensor(shape, buffer)
     }
 
-    override fun ones(shape: IntArray): DoubleTensor {
-        TODO("Not yet implemented")
+    override fun zeros(shape: IntArray): DoubleTensor = full(shape, 0.0)
+
+    override fun ones(shape: IntArray): DoubleTensor = full(shape, 1.0)
+
+    override fun DoubleTensor.fullLike(value: Double): DoubleTensor {
+        val shape = this.shape
+        val buffer = DoubleArray(this.strides.linearSize) { value }
+        return DoubleTensor(shape, buffer)
     }
 
-    override fun DoubleTensor.onesLike(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.zeroesLike(): DoubleTensor = this.fullLike(0.0)
+
+    override fun DoubleTensor.onesLike(): DoubleTensor = this.fullLike(1.0)
 
     override fun eye(n: Int): DoubleTensor {
         val shape = intArrayOf(n, n)
@@ -192,15 +193,6 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         TODO("Not yet implemented")
     }
 
-    override fun full(shape: IntArray, value: Double): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.fullLike(value: Double): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-
     override fun DoubleTensor.sum(dim: Int, keepDim: Boolean): DoubleTensor {
         TODO("Not yet implemented")
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 7ec920d88..7172acfaf 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -4,18 +4,18 @@ package space.kscience.kmath.tensors
 public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
 
-    public fun zeros(shape: IntArray): TensorType
-    public fun TensorType.zeroesLike(): TensorType // mb it shouldn't be tensor but algebra method (like in numpy/torch) ?
-    public fun ones(shape: IntArray): TensorType
-    public fun TensorType.onesLike(): TensorType
-
-
     //https://pytorch.org/docs/stable/generated/torch.full.html
     public fun full(shape: IntArray, value: T): TensorType
 
+    public fun ones(shape: IntArray): TensorType
+    public fun zeros(shape: IntArray): TensorType
+
     //https://pytorch.org/docs/stable/generated/torch.full_like.html#torch.full_like
     public fun TensorType.fullLike(value: T): TensorType
 
+    public fun TensorType.zeroesLike(): TensorType
+    public fun TensorType.onesLike(): TensorType
+
     //https://pytorch.org/docs/stable/generated/torch.eye.html
     public fun eye(n: Int): TensorType
 
-- 
2.34.1


From 274be613302d8cdef5f8a81fc8aeee5c88bf8ccd Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 19 Mar 2021 19:40:17 +0000
Subject: [PATCH 042/713] Explicit broadcasting enforced

---
 .../kmath/tensors/LinearOpsTensorAlgebra.kt   |   2 +-
 .../BroadcastDoubleTensorAlgebra.kt}          | 151 ++++++++++--------
 .../tensors/{ => core}/BufferedTensor.kt      |  12 +-
 .../{ => core}/DoubleAnalyticTensorAlgebra.kt |   4 +-
 .../DoubleLinearOpsTensorAlgebra.kt           |   4 +-
 .../{ => core}/DoubleOrderedTensorAlgebra.kt  |   4 +-
 .../DoubleReduceOpsTensorAlgebra.kt           |   6 +-
 .../tensors/{ => core}/DoubleTensorAlgebra.kt | 107 +++++++------
 .../kscience/kmath/tensors/core/checks.kt     |  67 ++++++++
 .../kscience/kmath/tensors/core/utils.kt      |  36 +++++
 .../kmath/tensors/TestDoubleTensorAlgebra.kt  | 105 ------------
 .../kmath/tensors/core/TestBroadcasting.kt    |  82 ++++++++++
 .../tensors/{ => core}/TestDoubleTensor.kt    |  10 +-
 .../tensors/core/TestDoubleTensorAlgebra.kt   |  50 ++++++
 14 files changed, 407 insertions(+), 233 deletions(-)
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/{utils.kt => core/BroadcastDoubleTensorAlgebra.kt} (50%)
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/{ => core}/BufferedTensor.kt (88%)
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/{ => core}/DoubleAnalyticTensorAlgebra.kt (96%)
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/{ => core}/DoubleLinearOpsTensorAlgebra.kt (96%)
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/{ => core}/DoubleOrderedTensorAlgebra.kt (89%)
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/{ => core}/DoubleReduceOpsTensorAlgebra.kt (68%)
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/{ => core}/DoubleTensorAlgebra.kt (77%)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
 delete mode 100644 kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt
 create mode 100644 kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
 rename kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/{ => core}/TestDoubleTensor.kt (74%)
 create mode 100644 kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
index 2e1c4a92c..94176564c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
@@ -17,7 +17,7 @@ public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>, Inde
     public fun TensorType.lu(): Pair<TensorType, IndexTensorType>
 
     //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
-    public fun luPivot(lu: TensorType, pivots: IntTensor): Triple<TensorType, TensorType, TensorType>
+    public fun luPivot(lu: TensorType, pivots: IndexTensorType): Triple<TensorType, TensorType, TensorType>
 
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.svd
     public fun TensorType.svd(): Triple<TensorType, TensorType, TensorType>
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
similarity index 50%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index e7e043463..a4767a612 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/utils.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -1,10 +1,91 @@
-package space.kscience.kmath.tensors
+package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.structures.*
 import kotlin.math.max
 
+public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
+
+    override fun DoubleTensor.plus(other: DoubleTensor): DoubleTensor {
+        val broadcast = broadcastTensors(this, other)
+        val newThis = broadcast[0]
+        val newOther = broadcast[1]
+        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
+            newThis.buffer.array()[i] + newOther.buffer.array()[i]
+        }
+        return DoubleTensor(newThis.shape, resBuffer)
+    }
+
+    override fun DoubleTensor.plusAssign(other: DoubleTensor) {
+        val newOther = broadcastTo(other, this.shape)
+        for (i in 0 until this.strides.linearSize) {
+            this.buffer.array()[this.bufferStart + i] +=
+                newOther.buffer.array()[this.bufferStart + i]
+        }
+    }
+
+    override fun DoubleTensor.minus(other: DoubleTensor): DoubleTensor {
+        val broadcast = broadcastTensors(this, other)
+        val newThis = broadcast[0]
+        val newOther = broadcast[1]
+        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
+            newThis.buffer.array()[i] - newOther.buffer.array()[i]
+        }
+        return DoubleTensor(newThis.shape, resBuffer)
+    }
+
+    override fun DoubleTensor.minusAssign(other: DoubleTensor) {
+        val newOther = broadcastTo(other, this.shape)
+        for (i in 0 until this.strides.linearSize) {
+            this.buffer.array()[this.bufferStart + i] -=
+                newOther.buffer.array()[this.bufferStart + i]
+        }
+    }
+
+    override fun DoubleTensor.times(other: DoubleTensor): DoubleTensor {
+        val broadcast = broadcastTensors(this, other)
+        val newThis = broadcast[0]
+        val newOther = broadcast[1]
+        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
+            newThis.buffer.array()[newOther.bufferStart + i] *
+                    newOther.buffer.array()[newOther.bufferStart + i]
+        }
+        return DoubleTensor(newThis.shape, resBuffer)
+    }
+
+    override fun DoubleTensor.timesAssign(other: DoubleTensor) {
+        val newOther = broadcastTo(other, this.shape)
+        for (i in 0 until this.strides.linearSize) {
+            this.buffer.array()[this.bufferStart + i] *=
+                newOther.buffer.array()[this.bufferStart + i]
+        }
+    }
+
+    override fun DoubleTensor.div(other: DoubleTensor): DoubleTensor {
+        val broadcast = broadcastTensors(this, other)
+        val newThis = broadcast[0]
+        val newOther = broadcast[1]
+        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
+            newThis.buffer.array()[newOther.bufferStart + i] /
+                    newOther.buffer.array()[newOther.bufferStart + i]
+        }
+        return DoubleTensor(newThis.shape, resBuffer)
+    }
+
+    override fun DoubleTensor.divAssign(other: DoubleTensor) {
+        val newOther = broadcastTo(other, this.shape)
+        for (i in 0 until this.strides.linearSize) {
+            this.buffer.array()[this.bufferStart + i] /=
+                newOther.buffer.array()[this.bufferStart + i]
+        }
+    }
+
+}
+
+public inline fun <R> broadcastDoubleTensorAlgebra(block: BroadcastDoubleTensorAlgebra.() -> R): R =
+    BroadcastDoubleTensorAlgebra().block()
+
 
 internal inline fun broadcastShapes(vararg shapes: IntArray): IntArray {
+    println(shapes)
     var totalDim = 0
     for (shape in shapes) {
         totalDim = max(totalDim, shape.size)
@@ -99,68 +180,4 @@ internal inline fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleT
     }
 
     return res
-}
-
-internal inline fun <T, TensorType : TensorStructure<T>,
-        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
-        TorchTensorAlgebraType.checkDot(a: TensorType, b: TensorType): Unit {
-    val sa = a.shape
-    val sb = b.shape
-    val na = sa.size
-    val nb = sb.size
-    var status: Boolean
-    if (nb == 1) {
-        status = sa.last() == sb[0]
-    } else {
-        status = sa.last() == sb[nb - 2]
-        if ((na > 2) and (nb > 2)) {
-            status = status and
-                    (sa.take(nb - 2).toIntArray() contentEquals sb.take(nb - 2).toIntArray())
-        }
-    }
-    check(status) { "Incompatible shapes $sa and $sb for dot product" }
-}
-
-internal inline fun <T, TensorType : TensorStructure<T>,
-        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
-        TorchTensorAlgebraType.checkTranspose(dim: Int, i: Int, j: Int): Unit =
-    check((i < dim) and (j < dim)) {
-        "Cannot transpose $i to $j for a tensor of dim $dim"
-    }
-
-internal inline fun <T, TensorType : TensorStructure<T>,
-        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
-        TorchTensorAlgebraType.checkView(a: TensorType, shape: IntArray): Unit =
-    check(a.shape.reduce(Int::times) == shape.reduce(Int::times))
-
-/**
- * Returns a reference to [IntArray] containing all of the elements of this [Buffer].
- */
-internal fun Buffer<Int>.array(): IntArray = when(this) {
-    is IntBuffer -> array
-    else -> throw RuntimeException("Failed to cast Buffer to IntArray")
-}
-
-/**
- * Returns a reference to [LongArray] containing all of the elements of this [Buffer].
- */
-internal fun Buffer<Long>.array(): LongArray = when(this) {
-    is LongBuffer -> array
-    else -> throw RuntimeException("Failed to cast Buffer to LongArray")
-}
-
-/**
- * Returns a reference to [FloatArray] containing all of the elements of this [Buffer].
- */
-internal fun Buffer<Float>.array(): FloatArray = when(this) {
-    is FloatBuffer -> array
-    else -> throw RuntimeException("Failed to cast Buffer to FloatArray")
-}
-
-/**
- * Returns a reference to [DoubleArray] containing all of the elements of this [Buffer].
- */
-internal fun Buffer<Double>.array(): DoubleArray = when(this) {
-    is RealBuffer -> array
-    else -> throw RuntimeException("Failed to cast Buffer to DoubleArray")
-}
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
similarity index 88%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index c48e47f4c..cbfb15be0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -1,8 +1,10 @@
-package space.kscience.kmath.tensors
+package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.linear.Matrix
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.structures.*
+import space.kscience.kmath.tensors.TensorStrides
+import space.kscience.kmath.tensors.TensorStructure
 
 
 public open class BufferedTensor<T>(
@@ -76,25 +78,25 @@ public open class BufferedTensor<T>(
 }
 
 
-public class IntTensor(
+public class IntTensor internal constructor(
     shape: IntArray,
     buffer: IntArray,
     offset: Int = 0
 ) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset)
 
-public class LongTensor(
+public class LongTensor internal constructor(
     shape: IntArray,
     buffer: LongArray,
     offset: Int = 0
 ) : BufferedTensor<Long>(shape, LongBuffer(buffer), offset)
 
-public class FloatTensor(
+public class FloatTensor internal constructor(
     shape: IntArray,
     buffer: FloatArray,
     offset: Int = 0
 ) : BufferedTensor<Float>(shape, FloatBuffer(buffer), offset)
 
-public class DoubleTensor(
+public class DoubleTensor internal constructor(
     shape: IntArray,
     buffer: DoubleArray,
     offset: Int = 0
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
similarity index 96%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
index 5349a9923..a34fe4b6c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
@@ -1,4 +1,6 @@
-package space.kscience.kmath.tensors
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.tensors.AnalyticTensorAlgebra
 
 public class DoubleAnalyticTensorAlgebra:
     AnalyticTensorAlgebra<Double, DoubleTensor>,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
similarity index 96%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 3f44305b1..8a16dc3ed 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -1,4 +1,6 @@
-package space.kscience.kmath.tensors
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.tensors.LinearOpsTensorAlgebra
 
 public class DoubleLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double, DoubleTensor, IntTensor>,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleOrderedTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleOrderedTensorAlgebra.kt
similarity index 89%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleOrderedTensorAlgebra.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleOrderedTensorAlgebra.kt
index bd6bcfe8f..a6bea59f4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleOrderedTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleOrderedTensorAlgebra.kt
@@ -1,4 +1,6 @@
-package space.kscience.kmath.tensors
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.tensors.OrderedTensorAlgebra
 
 public open class DoubleOrderedTensorAlgebra:
     OrderedTensorAlgebra<Double, DoubleTensor>,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleReduceOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleReduceOpsTensorAlgebra.kt
similarity index 68%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleReduceOpsTensorAlgebra.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleReduceOpsTensorAlgebra.kt
index 00d9b3ff8..9a8aa9ebf 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleReduceOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleReduceOpsTensorAlgebra.kt
@@ -1,8 +1,10 @@
-package space.kscience.kmath.tensors
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.tensors.ReduceOpsTensorAlgebra
 
 public class DoubleReduceOpsTensorAlgebra:
     DoubleTensorAlgebra(),
-    ReduceOpsTensorAlgebra<Double, DoubleTensor>  {
+    ReduceOpsTensorAlgebra<Double, DoubleTensor> {
 
     override fun DoubleTensor.value(): Double {
         check(this.shape contentEquals intArrayOf(1)) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
similarity index 77%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 675be2f33..9decc0e6a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -1,8 +1,18 @@
-package space.kscience.kmath.tensors
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.tensors.TensorPartialDivisionAlgebra
 
 
 public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, DoubleTensor> {
 
+    public fun fromArray(shape: IntArray, buffer: DoubleArray): DoubleTensor {
+        checkEmptyShape(shape)
+        checkEmptyDoubleBuffer(buffer)
+        checkBufferShapeConsistency(shape, buffer)
+        return DoubleTensor(shape, buffer, 0)
+    }
+
+
     override operator fun DoubleTensor.get(i: Int): DoubleTensor {
         val lastShape = this.shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
@@ -53,13 +63,11 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     override fun DoubleTensor.plus(value: Double): DoubleTensor = value + this
 
     override fun DoubleTensor.plus(other: DoubleTensor): DoubleTensor {
-        val broadcast = broadcastTensors(this, other)
-        val newThis = broadcast[0]
-        val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
-            newThis.buffer.array()[i] + newOther.buffer.array()[i]
+        checkShapesCompatible(this, other)
+        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+            this.buffer.array()[i] + other.buffer.array()[i]
         }
-        return DoubleTensor(newThis.shape, resBuffer)
+        return DoubleTensor(this.shape, resBuffer)
     }
 
     override fun DoubleTensor.plusAssign(value: Double) {
@@ -69,10 +77,10 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun DoubleTensor.plusAssign(other: DoubleTensor) {
-        val newOther = broadcastTo(other, this.shape)
+        checkShapesCompatible(this, other)
         for (i in 0 until this.strides.linearSize) {
             this.buffer.array()[this.bufferStart + i] +=
-                newOther.buffer.array()[this.bufferStart + i]
+                other.buffer.array()[this.bufferStart + i]
         }
     }
 
@@ -91,13 +99,11 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun DoubleTensor.minus(other: DoubleTensor): DoubleTensor {
-        val broadcast = broadcastTensors(this, other)
-        val newThis = broadcast[0]
-        val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
-            newThis.buffer.array()[i] - newOther.buffer.array()[i]
+        checkShapesCompatible(this, other)
+        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+            this.buffer.array()[i] - other.buffer.array()[i]
         }
-        return DoubleTensor(newThis.shape, resBuffer)
+        return DoubleTensor(this.shape, resBuffer)
     }
 
     override fun DoubleTensor.minusAssign(value: Double) {
@@ -107,10 +113,10 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun DoubleTensor.minusAssign(other: DoubleTensor) {
-        val newOther = broadcastTo(other, this.shape)
+        checkShapesCompatible(this, other)
         for (i in 0 until this.strides.linearSize) {
             this.buffer.array()[this.bufferStart + i] -=
-                newOther.buffer.array()[this.bufferStart + i]
+                other.buffer.array()[this.bufferStart + i]
         }
     }
 
@@ -124,15 +130,12 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     override fun DoubleTensor.times(value: Double): DoubleTensor = value * this
 
     override fun DoubleTensor.times(other: DoubleTensor): DoubleTensor {
-        val broadcast = broadcastTensors(this, other)
-        val newThis = broadcast[0]
-        val newOther = broadcast[1]
-
-        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
-            newThis.buffer.array()[newOther.bufferStart + i] *
-                    newOther.buffer.array()[newOther.bufferStart + i]
+        checkShapesCompatible(this, other)
+        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+            this.buffer.array()[other.bufferStart + i] *
+                    other.buffer.array()[other.bufferStart + i]
         }
-        return DoubleTensor(newThis.shape, resBuffer)
+        return DoubleTensor(this.shape, resBuffer)
     }
 
     override fun DoubleTensor.timesAssign(value: Double) {
@@ -142,10 +145,40 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun DoubleTensor.timesAssign(other: DoubleTensor) {
-        val newOther = broadcastTo(other, this.shape)
+        checkShapesCompatible(this, other)
         for (i in 0 until this.strides.linearSize) {
             this.buffer.array()[this.bufferStart + i] *=
-                newOther.buffer.array()[this.bufferStart + i]
+                other.buffer.array()[this.bufferStart + i]
+        }
+    }
+
+    override fun DoubleTensor.div(value: Double): DoubleTensor {
+        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+            this.buffer.array()[this.bufferStart + i] / value
+        }
+        return DoubleTensor(this.shape, resBuffer)
+    }
+
+    override fun DoubleTensor.div(other: DoubleTensor): DoubleTensor {
+        checkShapesCompatible(this, other)
+        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+            this.buffer.array()[other.bufferStart + i] /
+                    other.buffer.array()[other.bufferStart + i]
+        }
+        return DoubleTensor(this.shape, resBuffer)
+    }
+
+    override fun DoubleTensor.divAssign(value: Double) {
+        for (i in 0 until this.strides.linearSize) {
+            this.buffer.array()[this.bufferStart + i] /= value
+        }
+    }
+
+    override fun DoubleTensor.divAssign(other: DoubleTensor) {
+        checkShapesCompatible(this, other)
+        for (i in 0 until this.strides.linearSize) {
+            this.buffer.array()[this.bufferStart + i] /=
+                other.buffer.array()[this.bufferStart + i]
         }
     }
 
@@ -229,27 +262,10 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         TODO("Not yet implemented")
     }
 
-
-    override fun DoubleTensor.div(value: Double): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.div(other: DoubleTensor): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
     override fun DoubleTensor.flatten(startDim: Int, endDim: Int): DoubleTensor {
         TODO("Not yet implemented")
     }
 
-    override fun DoubleTensor.divAssign(value: Double) {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.divAssign(other: DoubleTensor) {
-        TODO("Not yet implemented")
-    }
-
     override fun DoubleTensor.mean(dim: Int, keepDim: Boolean): DoubleTensor {
         TODO("Not yet implemented")
     }
@@ -272,5 +288,6 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
 
 }
 
+
 public inline fun <R> DoubleTensorAlgebra(block: DoubleTensorAlgebra.() -> R): R =
-    DoubleTensorAlgebra().block()
\ No newline at end of file
+    DoubleTensorAlgebra().block()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
new file mode 100644
index 000000000..f1ae89490
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -0,0 +1,67 @@
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.tensors.TensorAlgebra
+import space.kscience.kmath.tensors.TensorStructure
+
+
+internal inline fun <T, TensorType : TensorStructure<T>,
+        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
+        TorchTensorAlgebraType.checkEmptyShape(shape: IntArray): Unit =
+    check(shape.isNotEmpty()) {
+        "Illegal empty shape provided"
+    }
+
+internal inline fun < TensorType : TensorStructure<Double>,
+        TorchTensorAlgebraType : TensorAlgebra<Double, TensorType>>
+        TorchTensorAlgebraType.checkEmptyDoubleBuffer(buffer: DoubleArray): Unit =
+    check(buffer.isNotEmpty()) {
+        "Illegal empty buffer provided"
+    }
+
+internal inline fun < TensorType : TensorStructure<Double>,
+        TorchTensorAlgebraType : TensorAlgebra<Double, TensorType>>
+        TorchTensorAlgebraType.checkBufferShapeConsistency(shape: IntArray, buffer: DoubleArray): Unit =
+    check(buffer.size == shape.reduce(Int::times)) {
+        "Inconsistent shape ${shape.toList()} for buffer of size ${buffer.size} provided"
+    }
+
+
+internal inline fun <T, TensorType : TensorStructure<T>,
+        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
+        TorchTensorAlgebraType.checkShapesCompatible(a: TensorType, b: TensorType): Unit =
+    check(a.shape contentEquals b.shape) {
+        "Incompatible shapes ${a.shape.toList()} and ${b.shape.toList()} "
+    }
+
+
+internal inline fun <T, TensorType : TensorStructure<T>,
+        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
+        TorchTensorAlgebraType.checkDot(a: TensorType, b: TensorType): Unit {
+    val sa = a.shape
+    val sb = b.shape
+    val na = sa.size
+    val nb = sb.size
+    var status: Boolean
+    if (nb == 1) {
+        status = sa.last() == sb[0]
+    } else {
+        status = sa.last() == sb[nb - 2]
+        if ((na > 2) and (nb > 2)) {
+            status = status and
+                    (sa.take(nb - 2).toIntArray() contentEquals sb.take(nb - 2).toIntArray())
+        }
+    }
+    check(status) { "Incompatible shapes ${sa.toList()} and ${sb.toList()} provided for dot product" }
+}
+
+internal inline fun <T, TensorType : TensorStructure<T>,
+        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
+        TorchTensorAlgebraType.checkTranspose(dim: Int, i: Int, j: Int): Unit =
+    check((i < dim) and (j < dim)) {
+        "Cannot transpose $i to $j for a tensor of dim $dim"
+    }
+
+internal inline fun <T, TensorType : TensorStructure<T>,
+        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
+        TorchTensorAlgebraType.checkView(a: TensorType, shape: IntArray): Unit =
+    check(a.shape.reduce(Int::times) == shape.reduce(Int::times))
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
new file mode 100644
index 000000000..69c8afde5
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -0,0 +1,36 @@
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.structures.*
+
+
+/**
+ * Returns a reference to [IntArray] containing all of the elements of this [Buffer].
+ */
+internal fun Buffer<Int>.array(): IntArray = when (this) {
+    is IntBuffer -> array
+    else -> throw RuntimeException("Failed to cast Buffer to IntArray")
+}
+
+/**
+ * Returns a reference to [LongArray] containing all of the elements of this [Buffer].
+ */
+internal fun Buffer<Long>.array(): LongArray = when (this) {
+    is LongBuffer -> array
+    else -> throw RuntimeException("Failed to cast Buffer to LongArray")
+}
+
+/**
+ * Returns a reference to [FloatArray] containing all of the elements of this [Buffer].
+ */
+internal fun Buffer<Float>.array(): FloatArray = when (this) {
+    is FloatBuffer -> array
+    else -> throw RuntimeException("Failed to cast Buffer to FloatArray")
+}
+
+/**
+ * Returns a reference to [DoubleArray] containing all of the elements of this [Buffer].
+ */
+internal fun Buffer<Double>.array(): DoubleArray = when (this) {
+    is RealBuffer -> array
+    else -> throw RuntimeException("Failed to cast Buffer to DoubleArray")
+}
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt
deleted file mode 100644
index a060a970f..000000000
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensorAlgebra.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package space.kscience.kmath.tensors
-
-
-import kotlin.test.Test
-import kotlin.test.assertTrue
-
-class TestDoubleTensorAlgebra {
-
-    @Test
-    fun doublePlus() = DoubleTensorAlgebra {
-        val tensor = DoubleTensor(intArrayOf(2), doubleArrayOf(1.0, 2.0))
-        val res = 10.0 + tensor
-        assertTrue(res.buffer.array() contentEquals doubleArrayOf(11.0,12.0))
-    }
-
-    @Test
-    fun transpose1x1() = DoubleTensorAlgebra {
-        val tensor = DoubleTensor(intArrayOf(1), doubleArrayOf(0.0))
-        val res = tensor.transpose(0, 0)
-
-        assertTrue(res.buffer.array() contentEquals doubleArrayOf(0.0))
-        assertTrue(res.shape contentEquals intArrayOf(1))
-    }
-
-    @Test
-    fun transpose3x2() = DoubleTensorAlgebra {
-        val tensor = DoubleTensor(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val res = tensor.transpose(1, 0)
-
-        assertTrue(res.buffer.array() contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
-        assertTrue(res.shape contentEquals intArrayOf(2, 3))
-    }
-
-    @Test
-    fun transpose1x2x3() = DoubleTensorAlgebra {
-        val tensor = DoubleTensor(intArrayOf(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val res01 = tensor.transpose(0, 1)
-        val res02 = tensor.transpose(0, 2)
-        val res12 = tensor.transpose(1, 2)
-
-        assertTrue(res01.shape contentEquals intArrayOf(2, 1, 3))
-        assertTrue(res02.shape contentEquals intArrayOf(3, 2, 1))
-        assertTrue(res12.shape contentEquals intArrayOf(1, 3, 2))
-
-        assertTrue(res01.buffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res02.buffer.array() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
-        assertTrue(res12.buffer.array() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
-    }
-
-    @Test
-    fun broadcastShapes() = DoubleTensorAlgebra {
-        assertTrue(broadcastShapes(
-            intArrayOf(2, 3), intArrayOf(1, 3), intArrayOf(1, 1, 1)
-        ) contentEquals intArrayOf(1, 2, 3))
-
-        assertTrue(broadcastShapes(
-            intArrayOf(6, 7), intArrayOf(5, 6, 1), intArrayOf(7,), intArrayOf(5, 1, 7)
-        ) contentEquals intArrayOf(5, 6, 7))
-    }
-
-    @Test
-    fun broadcastTo() = DoubleTensorAlgebra {
-        val tensor1 = DoubleTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = DoubleTensor(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
-
-        val res = broadcastTo(tensor2, tensor1.shape)
-        assertTrue(res.shape contentEquals intArrayOf(2, 3))
-        assertTrue(res.buffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
-    }
-
-    @Test
-    fun broadcastTensors() = DoubleTensorAlgebra {
-        val tensor1 = DoubleTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = DoubleTensor(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor3 = DoubleTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
-
-        val res = broadcastTensors(tensor1, tensor2, tensor3)
-
-        assertTrue(res[0].shape contentEquals intArrayOf(1, 2, 3))
-        assertTrue(res[1].shape contentEquals intArrayOf(1, 2, 3))
-        assertTrue(res[2].shape contentEquals intArrayOf(1, 2, 3))
-
-        assertTrue(res[0].buffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res[1].buffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
-        assertTrue(res[2].buffer.array() contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
-    }
-
-    @Test
-    fun minusTensor() = DoubleTensorAlgebra {
-        val tensor1 = DoubleTensor(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = DoubleTensor(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor3 = DoubleTensor(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
-
-        assertTrue((tensor2 - tensor1).shape contentEquals intArrayOf(2, 3))
-        assertTrue((tensor2 - tensor1).buffer.array() contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
-
-        assertTrue((tensor3 - tensor1).shape contentEquals intArrayOf(1, 2, 3))
-        assertTrue((tensor3 - tensor1).buffer.array()
-                contentEquals doubleArrayOf(499.0, 498.0, 497.0, 496.0, 495.0, 494.0))
-
-        assertTrue((tensor3 - tensor2).shape contentEquals intArrayOf(1, 1, 3))
-        assertTrue((tensor3 - tensor2).buffer.array() contentEquals doubleArrayOf(490.0, 480.0, 470.0))
-    }
-
-}
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
new file mode 100644
index 000000000..2633229ea
--- /dev/null
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -0,0 +1,82 @@
+package space.kscience.kmath.tensors.core
+
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+class TestBroadcasting {
+
+    @Test
+    fun broadcastShapes() = DoubleTensorAlgebra {
+        assertTrue(
+            broadcastShapes(
+                intArrayOf(2, 3), intArrayOf(1, 3), intArrayOf(1, 1, 1)
+            ) contentEquals intArrayOf(1, 2, 3)
+        )
+
+        assertTrue(
+            broadcastShapes(
+                intArrayOf(6, 7), intArrayOf(5, 6, 1), intArrayOf(7), intArrayOf(5, 1, 7)
+            ) contentEquals intArrayOf(5, 6, 7)
+        )
+    }
+
+    @Test
+    fun broadcastTo() = DoubleTensorAlgebra {
+        val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+
+        val res = broadcastTo(tensor2, tensor1.shape)
+        assertTrue(res.shape contentEquals intArrayOf(2, 3))
+        assertTrue(res.buffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
+    }
+
+    @Test
+    fun broadcastTensors() = DoubleTensorAlgebra {
+        val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
+
+        val res = broadcastTensors(tensor1, tensor2, tensor3)
+
+        assertTrue(res[0].shape contentEquals intArrayOf(1, 2, 3))
+        assertTrue(res[1].shape contentEquals intArrayOf(1, 2, 3))
+        assertTrue(res[2].shape contentEquals intArrayOf(1, 2, 3))
+
+        assertTrue(res[0].buffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res[1].buffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
+        assertTrue(res[2].buffer.array() contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
+    }
+
+    @Test
+    fun minusTensor() = DoubleTensorAlgebra {
+        val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
+
+        val tensor21 = broadcastDoubleTensorAlgebra {
+            tensor2 - tensor1
+        }
+
+        val tensor31 = broadcastDoubleTensorAlgebra {
+            tensor3 - tensor1
+        }
+
+        val tensor32 = broadcastDoubleTensorAlgebra {
+            tensor3 - tensor2
+        }
+
+
+        assertTrue(tensor21.shape contentEquals intArrayOf(2, 3))
+        assertTrue(tensor21.buffer.array() contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
+
+        assertTrue(tensor31.shape contentEquals intArrayOf(1, 2, 3))
+        assertTrue(
+            tensor31.buffer.array()
+                    contentEquals doubleArrayOf(499.0, 498.0, 497.0, 496.0, 495.0, 494.0)
+        )
+
+        assertTrue(tensor32.shape contentEquals intArrayOf(1, 1, 3))
+        assertTrue(tensor32.buffer.array() contentEquals doubleArrayOf(490.0, 480.0, 470.0))
+    }
+
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
similarity index 74%
rename from kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
rename to kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 6b20027c7..b12b08b52 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/TestDoubleTensor.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -1,4 +1,4 @@
-package space.kscience.kmath.tensors
+package space.kscience.kmath.tensors.core
 
 
 import space.kscience.kmath.nd.as1D
@@ -13,20 +13,20 @@ class TestDoubleTensor {
     @Test
     fun valueTest() = DoubleReduceOpsTensorAlgebra {
         val value = 12.5
-        val tensor = DoubleTensor(intArrayOf(1), doubleArrayOf(value))
+        val tensor = fromArray(intArrayOf(1), doubleArrayOf(value))
         assertEquals(tensor.value(), value)
     }
 
     @Test
-    fun stridesTest(){
-        val tensor = DoubleTensor(intArrayOf(2,2), doubleArrayOf(3.5,5.8,58.4,2.4))
+    fun stridesTest() = DoubleTensorAlgebra {
+        val tensor = fromArray(intArrayOf(2,2), doubleArrayOf(3.5,5.8,58.4,2.4))
         assertEquals(tensor[intArrayOf(0,1)], 5.8)
         assertTrue(tensor.elements().map{ it.second }.toList().toDoubleArray() contentEquals tensor.buffer.toDoubleArray())
     }
 
     @Test
     fun getTest() = DoubleTensorAlgebra {
-        val tensor = DoubleTensor(intArrayOf(1,2,2), doubleArrayOf(3.5,5.8,58.4,2.4))
+        val tensor = fromArray(intArrayOf(1,2,2), doubleArrayOf(3.5,5.8,58.4,2.4))
         val matrix = tensor[0].as2D()
         assertEquals(matrix[0,1], 5.8)
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
new file mode 100644
index 000000000..8b4d5ca16
--- /dev/null
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -0,0 +1,50 @@
+package space.kscience.kmath.tensors.core
+
+
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+class TestDoubleTensorAlgebra {
+
+    @Test
+    fun doublePlus() = DoubleTensorAlgebra {
+        val tensor = fromArray(intArrayOf(2), doubleArrayOf(1.0, 2.0))
+        val res = 10.0 + tensor
+        assertTrue(res.buffer.array() contentEquals doubleArrayOf(11.0, 12.0))
+    }
+
+    @Test
+    fun transpose1x1() = DoubleTensorAlgebra {
+        val tensor = fromArray(intArrayOf(1), doubleArrayOf(0.0))
+        val res = tensor.transpose(0, 0)
+
+        assertTrue(res.buffer.array() contentEquals doubleArrayOf(0.0))
+        assertTrue(res.shape contentEquals intArrayOf(1))
+    }
+
+    @Test
+    fun transpose3x2() = DoubleTensorAlgebra {
+        val tensor = fromArray(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val res = tensor.transpose(1, 0)
+
+        assertTrue(res.buffer.array() contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
+        assertTrue(res.shape contentEquals intArrayOf(2, 3))
+    }
+
+    @Test
+    fun transpose1x2x3() = DoubleTensorAlgebra {
+        val tensor = fromArray(intArrayOf(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val res01 = tensor.transpose(0, 1)
+        val res02 = tensor.transpose(0, 2)
+        val res12 = tensor.transpose(1, 2)
+
+        assertTrue(res01.shape contentEquals intArrayOf(2, 1, 3))
+        assertTrue(res02.shape contentEquals intArrayOf(3, 2, 1))
+        assertTrue(res12.shape contentEquals intArrayOf(1, 3, 2))
+
+        assertTrue(res01.buffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res02.buffer.array() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res12.buffer.array() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+    }
+
+}
\ No newline at end of file
-- 
2.34.1


From 3535e512483b74f00867858b18e38a2150f3451c Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 19 Mar 2021 19:52:58 +0000
Subject: [PATCH 043/713] Broadcasting as its own algebra

---
 .../core/BroadcastDoubleTensorAlgebra.kt        |  2 +-
 .../kmath/tensors/core/TestBroadcasting.kt      | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index a4767a612..20f64f469 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -80,7 +80,7 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
 }
 
-public inline fun <R> broadcastDoubleTensorAlgebra(block: BroadcastDoubleTensorAlgebra.() -> R): R =
+public inline fun <R> BroadcastDoubleTensorAlgebra(block: BroadcastDoubleTensorAlgebra.() -> R): R =
     BroadcastDoubleTensorAlgebra().block()
 
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 2633229ea..73e3993a1 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -48,23 +48,14 @@ class TestBroadcasting {
     }
 
     @Test
-    fun minusTensor() = DoubleTensorAlgebra {
+    fun minusTensor() = BroadcastDoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
 
-        val tensor21 = broadcastDoubleTensorAlgebra {
-            tensor2 - tensor1
-        }
-
-        val tensor31 = broadcastDoubleTensorAlgebra {
-            tensor3 - tensor1
-        }
-
-        val tensor32 = broadcastDoubleTensorAlgebra {
-            tensor3 - tensor2
-        }
-
+        val tensor21 = tensor2 - tensor1
+        val tensor31 = tensor3 - tensor1
+        val tensor32 = tensor3 - tensor2
 
         assertTrue(tensor21.shape contentEquals intArrayOf(2, 3))
         assertTrue(tensor21.buffer.array() contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
-- 
2.34.1


From 93d3cb47bed67d95c75d6e9f54283f7428dd150e Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 19 Mar 2021 20:10:08 +0000
Subject: [PATCH 044/713] Testing linear structure

---
 .../kscience/kmath/tensors/TensorAlgebra.kt   | 12 +++----
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 35 ++++++++-----------
 .../tensors/core/TestDoubleTensorAlgebra.kt   | 32 +++++++++++++++++
 3 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 7ec920d88..1673657d3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -3,19 +3,17 @@ package space.kscience.kmath.tensors
 // https://proofwiki.org/wiki/Definition:Algebra_over_Ring
 public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
+    //https://pytorch.org/docs/stable/generated/torch.full.html
+    public fun full(value: T, shape: IntArray): TensorType
+
+    //https://pytorch.org/docs/stable/generated/torch.full_like.html#torch.full_like
+    public fun TensorType.fullLike(value: T): TensorType
 
     public fun zeros(shape: IntArray): TensorType
     public fun TensorType.zeroesLike(): TensorType // mb it shouldn't be tensor but algebra method (like in numpy/torch) ?
     public fun ones(shape: IntArray): TensorType
     public fun TensorType.onesLike(): TensorType
 
-
-    //https://pytorch.org/docs/stable/generated/torch.full.html
-    public fun full(shape: IntArray, value: T): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.full_like.html#torch.full_like
-    public fun TensorType.fullLike(value: T): TensorType
-
     //https://pytorch.org/docs/stable/generated/torch.eye.html
     public fun eye(n: Int): TensorType
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 9decc0e6a..1c156b4e3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -20,23 +20,25 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return DoubleTensor(newShape, this.buffer.array(), newStart)
     }
 
-    override fun zeros(shape: IntArray): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.zeroesLike(): DoubleTensor {
-        val shape = this.shape
-        val buffer = DoubleArray(this.strides.linearSize) { 0.0 }
+    override fun full(value: Double, shape: IntArray): DoubleTensor {
+        checkEmptyShape(shape)
+        val buffer = DoubleArray(shape.reduce(Int::times)) { value }
         return DoubleTensor(shape, buffer)
     }
 
-    override fun ones(shape: IntArray): DoubleTensor {
-        TODO("Not yet implemented")
+    override fun DoubleTensor.fullLike(value: Double): DoubleTensor {
+        val shape = this.shape
+        val buffer = DoubleArray(this.strides.linearSize) { value }
+        return DoubleTensor(shape, buffer)
     }
 
-    override fun DoubleTensor.onesLike(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun zeros(shape: IntArray): DoubleTensor = full(0.0, shape)
+
+    override fun DoubleTensor.zeroesLike(): DoubleTensor = this.fullLike(0.0)
+
+    override fun ones(shape: IntArray): DoubleTensor = full(1.0, shape)
+
+    override fun DoubleTensor.onesLike(): DoubleTensor = this.fullLike(1.0)
 
     override fun eye(n: Int): DoubleTensor {
         val shape = intArrayOf(n, n)
@@ -225,15 +227,6 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         TODO("Not yet implemented")
     }
 
-    override fun full(shape: IntArray, value: Double): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.fullLike(value: Double): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-
     override fun DoubleTensor.sum(dim: Int, keepDim: Boolean): DoubleTensor {
         TODO("Not yet implemented")
     }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 8b4d5ca16..ddfba0d59 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -47,4 +47,36 @@ class TestDoubleTensorAlgebra {
         assertTrue(res12.buffer.array() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
     }
 
+    @Test
+    fun linearStructure() = DoubleTensorAlgebra {
+        val shape = intArrayOf(3)
+        val tensorA = full(value = -4.5, shape = shape)
+        val tensorB = full(value = 10.9, shape = shape)
+        val tensorC = full(value = 789.3, shape = shape)
+        val tensorD = full(value = -72.9, shape = shape)
+        val tensorE = full(value = 553.1, shape = shape)
+        val result = 15.8 * tensorA - 1.5 * tensorB * (-tensorD) + 0.02 * tensorC / tensorE - 39.4
+
+        val expected = fromArray(
+            shape,
+            (1..3).map {
+                15.8 * (-4.5) - 1.5 * 10.9 * 72.9 + 0.02 * 789.3 / 553.1 - 39.4
+            }.toDoubleArray()
+        )
+
+        val assignResult = zeros(shape)
+        tensorA *= 15.8
+        tensorB *= 1.5
+        tensorB *= -tensorD
+        tensorC *= 0.02
+        tensorC /= tensorE
+        assignResult += tensorA
+        assignResult -= tensorB
+        assignResult += tensorC
+        assignResult += -39.4
+
+        assertTrue(expected.buffer.array() contentEquals result.buffer.array())
+        assertTrue(expected.buffer.array() contentEquals assignResult.buffer.array())
+    }
+
 }
\ No newline at end of file
-- 
2.34.1


From 8933c820b371b9b03d096c016bb55c104d3b2a9d Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 19 Mar 2021 20:32:57 +0000
Subject: [PATCH 045/713] merge PR

---
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 465c2ddc1..875f21687 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -12,7 +12,6 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return DoubleTensor(shape, buffer, 0)
     }
 
-
     override operator fun DoubleTensor.get(i: Int): DoubleTensor {
         val lastShape = this.shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
@@ -20,41 +19,24 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return DoubleTensor(newShape, this.buffer.array(), newStart)
     }
 
-<<<<<<< HEAD:kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
-    override fun full(shape: IntArray, value: Double): DoubleTensor {
-        val buffer = DoubleArray(TensorStrides(shape).linearSize) { value }
-        return DoubleTensor(shape, buffer)
-    }
-
-    override fun zeros(shape: IntArray): DoubleTensor = full(shape, 0.0)
-
-    override fun ones(shape: IntArray): DoubleTensor = full(shape, 1.0)
-
-=======
     override fun full(value: Double, shape: IntArray): DoubleTensor {
         checkEmptyShape(shape)
         val buffer = DoubleArray(shape.reduce(Int::times)) { value }
         return DoubleTensor(shape, buffer)
     }
 
->>>>>>> ups/feature/tensor-algebra:kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
     override fun DoubleTensor.fullLike(value: Double): DoubleTensor {
         val shape = this.shape
         val buffer = DoubleArray(this.strides.linearSize) { value }
         return DoubleTensor(shape, buffer)
     }
 
-<<<<<<< HEAD:kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/DoubleTensorAlgebra.kt
-    override fun DoubleTensor.zeroesLike(): DoubleTensor = this.fullLike(0.0)
-
-=======
     override fun zeros(shape: IntArray): DoubleTensor = full(0.0, shape)
 
     override fun DoubleTensor.zeroesLike(): DoubleTensor = this.fullLike(0.0)
 
     override fun ones(shape: IntArray): DoubleTensor = full(1.0, shape)
 
->>>>>>> ups/feature/tensor-algebra:kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
     override fun DoubleTensor.onesLike(): DoubleTensor = this.fullLike(1.0)
 
     override fun eye(n: Int): DoubleTensor {
@@ -71,7 +53,6 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return DoubleTensor(this.shape, this.buffer.array().copyOf(), this.bufferStart)
     }
 
-
     override fun Double.plus(other: DoubleTensor): DoubleTensor {
         val resBuffer = DoubleArray(other.strides.linearSize) { i ->
             other.buffer.array()[other.bufferStart + i] + this
-- 
2.34.1


From b7e1349eadc0cfe9b573006c79e714333655a2d1 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Sat, 20 Mar 2021 18:59:54 +0000
Subject: [PATCH 046/713] atanh as example

---
 .../kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
index a34fe4b6c..8a579b7da 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
@@ -1,6 +1,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.tensors.AnalyticTensorAlgebra
+import kotlin.math.*
 
 public class DoubleAnalyticTensorAlgebra:
     AnalyticTensorAlgebra<Double, DoubleTensor>,
@@ -63,7 +64,11 @@ public class DoubleAnalyticTensorAlgebra:
     }
 
     override fun DoubleTensor.atanh(): DoubleTensor {
-        TODO("Not yet implemented")
+        return DoubleTensor(
+            this.shape,
+            this.buffer.array().map(::atanh).toDoubleArray(),
+            this.bufferStart
+        )
     }
 
     override fun DoubleTensor.ceil(): DoubleTensor {
-- 
2.34.1


From 94e5ee4a6de020d77c49ce57e7795d3a33abe80e Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Sun, 21 Mar 2021 08:01:52 +0000
Subject: [PATCH 047/713] TensorLinearStructure introduced

---
 .../space/kscience/kmath/nd/StructureND.kt    | 17 +++----
 .../core/BroadcastDoubleTensorAlgebra.kt      | 24 +++++-----
 .../kmath/tensors/core/BufferedTensor.kt      | 18 ++++----
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 44 +++++++++----------
 .../TensorLinearStructure.kt}                 | 33 ++++++++------
 5 files changed, 69 insertions(+), 67 deletions(-)
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/{TensorStrides.kt => core/TensorLinearStructure.kt} (55%)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 86b867130..f28d29e47 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -177,7 +177,7 @@ public interface Strides {
     /**
      * Array strides
      */
-    public val strides: IntArray
+    public val strides: List<Int>
 
     /**
      * Get linear index from multidimensional index
@@ -209,12 +209,6 @@ public interface Strides {
     }
 }
 
-internal inline fun offsetFromIndex(index: IntArray, shape: IntArray, strides: IntArray): Int =
-    index.mapIndexed { i, value ->
-        if (value < 0 || value >= shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0,${shape[i]})")
-        value * strides[i]
-    }.sum()
-
 /**
  * Simple implementation of [Strides].
  */
@@ -225,7 +219,7 @@ public class DefaultStrides private constructor(override val shape: IntArray) :
     /**
      * Strides for memory access
      */
-    override val strides: IntArray by lazy {
+    override val strides: List<Int> by lazy {
         sequence {
             var current = 1
             yield(1)
@@ -234,10 +228,13 @@ public class DefaultStrides private constructor(override val shape: IntArray) :
                 current *= it
                 yield(current)
             }
-        }.toList().toIntArray()
+        }.toList()
     }
 
-    override fun offset(index: IntArray): Int = offsetFromIndex(index, shape, strides)
+    override fun offset(index: IntArray): Int = index.mapIndexed { i, value ->
+        if (value < 0 || value >= shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0,${shape[i]})")
+        value * strides[i]
+    }.sum()
 
     override fun index(offset: Int): IntArray {
         val res = IntArray(shape.size)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index 20f64f469..4bfbe5863 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -8,7 +8,7 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(this, other)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
             newThis.buffer.array()[i] + newOther.buffer.array()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
@@ -16,7 +16,7 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun DoubleTensor.plusAssign(other: DoubleTensor) {
         val newOther = broadcastTo(other, this.shape)
-        for (i in 0 until this.strides.linearSize) {
+        for (i in 0 until this.linearStructure.size) {
             this.buffer.array()[this.bufferStart + i] +=
                 newOther.buffer.array()[this.bufferStart + i]
         }
@@ -26,7 +26,7 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(this, other)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
             newThis.buffer.array()[i] - newOther.buffer.array()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
@@ -34,7 +34,7 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun DoubleTensor.minusAssign(other: DoubleTensor) {
         val newOther = broadcastTo(other, this.shape)
-        for (i in 0 until this.strides.linearSize) {
+        for (i in 0 until this.linearStructure.size) {
             this.buffer.array()[this.bufferStart + i] -=
                 newOther.buffer.array()[this.bufferStart + i]
         }
@@ -44,7 +44,7 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(this, other)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
             newThis.buffer.array()[newOther.bufferStart + i] *
                     newOther.buffer.array()[newOther.bufferStart + i]
         }
@@ -53,7 +53,7 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun DoubleTensor.timesAssign(other: DoubleTensor) {
         val newOther = broadcastTo(other, this.shape)
-        for (i in 0 until this.strides.linearSize) {
+        for (i in 0 until this.linearStructure.size) {
             this.buffer.array()[this.bufferStart + i] *=
                 newOther.buffer.array()[this.bufferStart + i]
         }
@@ -63,7 +63,7 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(this, other)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
             newThis.buffer.array()[newOther.bufferStart + i] /
                     newOther.buffer.array()[newOther.bufferStart + i]
         }
@@ -72,7 +72,7 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun DoubleTensor.divAssign(other: DoubleTensor) {
         val newOther = broadcastTo(other, this.shape)
-        for (i in 0 until this.strides.linearSize) {
+        for (i in 0 until this.linearStructure.size) {
             this.buffer.array()[this.bufferStart + i] /=
                 newOther.buffer.array()[this.bufferStart + i]
         }
@@ -130,7 +130,7 @@ internal inline fun broadcastTo(tensor: DoubleTensor, newShape: IntArray): Doubl
     }
 
     for (linearIndex in 0 until n) {
-        val totalMultiIndex = resTensor.strides.index(linearIndex)
+        val totalMultiIndex = resTensor.linearStructure.index(linearIndex)
         val curMultiIndex = tensor.shape.copyOf()
 
         val offset = totalMultiIndex.size - curMultiIndex.size
@@ -143,7 +143,7 @@ internal inline fun broadcastTo(tensor: DoubleTensor, newShape: IntArray): Doubl
             }
         }
 
-        val curLinearIndex = tensor.strides.offset(curMultiIndex)
+        val curLinearIndex = tensor.linearStructure.offset(curMultiIndex)
         resTensor.buffer.array()[linearIndex] =
             tensor.buffer.array()[tensor.bufferStart + curLinearIndex]
     }
@@ -159,7 +159,7 @@ internal inline fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleT
         val resTensor = DoubleTensor(totalShape, DoubleArray(n))
 
         for (linearIndex in 0 until n) {
-            val totalMultiIndex = resTensor.strides.index(linearIndex)
+            val totalMultiIndex = resTensor.linearStructure.index(linearIndex)
             val curMultiIndex = tensor.shape.copyOf()
 
             val offset = totalMultiIndex.size - curMultiIndex.size
@@ -172,7 +172,7 @@ internal inline fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleT
                 }
             }
 
-            val curLinearIndex = tensor.strides.offset(curMultiIndex)
+            val curLinearIndex = tensor.linearStructure.offset(curMultiIndex)
             resTensor.buffer.array()[linearIndex] =
                 tensor.buffer.array()[tensor.bufferStart + curLinearIndex]
         }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 8717e0f7e..1893ea3da 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -1,9 +1,7 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.linear.Matrix
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.structures.*
-import space.kscience.kmath.tensors.TensorStrides
 import space.kscience.kmath.tensors.TensorStructure
 
 
@@ -13,19 +11,19 @@ public open class BufferedTensor<T>(
     internal val bufferStart: Int
 ) : TensorStructure<T>
 {
-    public val strides: TensorStrides
-        get() = TensorStrides(shape)
+    public val linearStructure: TensorLinearStructure
+        get() = TensorLinearStructure(shape)
 
     public val numel: Int
-        get() = strides.linearSize
+        get() = linearStructure.size
 
-    override fun get(index: IntArray): T = buffer[bufferStart + strides.offset(index)]
+    override fun get(index: IntArray): T = buffer[bufferStart + linearStructure.offset(index)]
 
     override fun set(index: IntArray, value: T) {
-        buffer[bufferStart + strides.offset(index)] = value
+        buffer[bufferStart + linearStructure.offset(index)] = value
     }
 
-    override fun elements(): Sequence<Pair<IntArray, T>> = strides.indices().map {
+    override fun elements(): Sequence<Pair<IntArray, T>> = linearStructure.indices().map {
         it to this[it]
     }
 
@@ -35,7 +33,7 @@ public open class BufferedTensor<T>(
 
     public fun vectorSequence(): Sequence<MutableStructure1D<T>> = sequence {
         check(shape.size >= 1) {"todo"}
-        val vectorOffset = strides.strides[0]
+        val vectorOffset = linearStructure.strides[0]
         val vectorShape = intArrayOf(shape.last())
         for (offset in 0 until numel step vectorOffset) {
             val vector = BufferedTensor<T>(vectorShape, buffer, offset).as1D()
@@ -45,7 +43,7 @@ public open class BufferedTensor<T>(
 
     public fun matrixSequence(): Sequence<MutableStructure2D<T>> = sequence {
         check(shape.size >= 2) {"todo"}
-        val matrixOffset = strides.strides[1]
+        val matrixOffset = linearStructure.strides[1]
         val matrixShape = intArrayOf(shape[shape.size - 2], shape.last()) //todo better way?
         for (offset in 0 until numel step matrixOffset) {
             val matrix = BufferedTensor<T>(matrixShape, buffer, offset).as2D()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 875f21687..385118d97 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -27,7 +27,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
 
     override fun DoubleTensor.fullLike(value: Double): DoubleTensor {
         val shape = this.shape
-        val buffer = DoubleArray(this.strides.linearSize) { value }
+        val buffer = DoubleArray(this.linearStructure.size) { value }
         return DoubleTensor(shape, buffer)
     }
 
@@ -54,7 +54,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun Double.plus(other: DoubleTensor): DoubleTensor {
-        val resBuffer = DoubleArray(other.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(other.linearStructure.size) { i ->
             other.buffer.array()[other.bufferStart + i] + this
         }
         return DoubleTensor(other.shape, resBuffer)
@@ -64,35 +64,35 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
 
     override fun DoubleTensor.plus(other: DoubleTensor): DoubleTensor {
         checkShapesCompatible(this, other)
-        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
             this.buffer.array()[i] + other.buffer.array()[i]
         }
         return DoubleTensor(this.shape, resBuffer)
     }
 
     override fun DoubleTensor.plusAssign(value: Double) {
-        for (i in 0 until this.strides.linearSize) {
+        for (i in 0 until this.linearStructure.size) {
             this.buffer.array()[this.bufferStart + i] += value
         }
     }
 
     override fun DoubleTensor.plusAssign(other: DoubleTensor) {
         checkShapesCompatible(this, other)
-        for (i in 0 until this.strides.linearSize) {
+        for (i in 0 until this.linearStructure.size) {
             this.buffer.array()[this.bufferStart + i] +=
                 other.buffer.array()[this.bufferStart + i]
         }
     }
 
     override fun Double.minus(other: DoubleTensor): DoubleTensor {
-        val resBuffer = DoubleArray(other.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(other.linearStructure.size) { i ->
             this - other.buffer.array()[other.bufferStart + i]
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
     override fun DoubleTensor.minus(value: Double): DoubleTensor {
-        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
             this.buffer.array()[this.bufferStart + i] - value
         }
         return DoubleTensor(this.shape, resBuffer)
@@ -100,28 +100,28 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
 
     override fun DoubleTensor.minus(other: DoubleTensor): DoubleTensor {
         checkShapesCompatible(this, other)
-        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
             this.buffer.array()[i] - other.buffer.array()[i]
         }
         return DoubleTensor(this.shape, resBuffer)
     }
 
     override fun DoubleTensor.minusAssign(value: Double) {
-        for (i in 0 until this.strides.linearSize) {
+        for (i in 0 until this.linearStructure.size) {
             this.buffer.array()[this.bufferStart + i] -= value
         }
     }
 
     override fun DoubleTensor.minusAssign(other: DoubleTensor) {
         checkShapesCompatible(this, other)
-        for (i in 0 until this.strides.linearSize) {
+        for (i in 0 until this.linearStructure.size) {
             this.buffer.array()[this.bufferStart + i] -=
                 other.buffer.array()[this.bufferStart + i]
         }
     }
 
     override fun Double.times(other: DoubleTensor): DoubleTensor {
-        val resBuffer = DoubleArray(other.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(other.linearStructure.size) { i ->
             other.buffer.array()[other.bufferStart + i] * this
         }
         return DoubleTensor(other.shape, resBuffer)
@@ -131,7 +131,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
 
     override fun DoubleTensor.times(other: DoubleTensor): DoubleTensor {
         checkShapesCompatible(this, other)
-        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
             this.buffer.array()[other.bufferStart + i] *
                     other.buffer.array()[other.bufferStart + i]
         }
@@ -139,21 +139,21 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun DoubleTensor.timesAssign(value: Double) {
-        for (i in 0 until this.strides.linearSize) {
+        for (i in 0 until this.linearStructure.size) {
             this.buffer.array()[this.bufferStart + i] *= value
         }
     }
 
     override fun DoubleTensor.timesAssign(other: DoubleTensor) {
         checkShapesCompatible(this, other)
-        for (i in 0 until this.strides.linearSize) {
+        for (i in 0 until this.linearStructure.size) {
             this.buffer.array()[this.bufferStart + i] *=
                 other.buffer.array()[this.bufferStart + i]
         }
     }
 
     override fun DoubleTensor.div(value: Double): DoubleTensor {
-        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
             this.buffer.array()[this.bufferStart + i] / value
         }
         return DoubleTensor(this.shape, resBuffer)
@@ -161,7 +161,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
 
     override fun DoubleTensor.div(other: DoubleTensor): DoubleTensor {
         checkShapesCompatible(this, other)
-        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
             this.buffer.array()[other.bufferStart + i] /
                     other.buffer.array()[other.bufferStart + i]
         }
@@ -169,21 +169,21 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun DoubleTensor.divAssign(value: Double) {
-        for (i in 0 until this.strides.linearSize) {
+        for (i in 0 until this.linearStructure.size) {
             this.buffer.array()[this.bufferStart + i] /= value
         }
     }
 
     override fun DoubleTensor.divAssign(other: DoubleTensor) {
         checkShapesCompatible(this, other)
-        for (i in 0 until this.strides.linearSize) {
+        for (i in 0 until this.linearStructure.size) {
             this.buffer.array()[this.bufferStart + i] /=
                 other.buffer.array()[this.bufferStart + i]
         }
     }
 
     override fun DoubleTensor.unaryMinus(): DoubleTensor {
-        val resBuffer = DoubleArray(this.strides.linearSize) { i ->
+        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
             this.buffer.array()[this.bufferStart + i].unaryMinus()
         }
         return DoubleTensor(this.shape, resBuffer)
@@ -191,7 +191,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
 
     override fun DoubleTensor.transpose(i: Int, j: Int): DoubleTensor {
         checkTranspose(this.dimension, i, j)
-        val n = this.strides.linearSize
+        val n = this.linearStructure.size
         val resBuffer = DoubleArray(n)
 
         val resShape = this.shape.copyOf()
@@ -200,11 +200,11 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         val resTensor = DoubleTensor(resShape, resBuffer)
 
         for (offset in 0 until n) {
-            val oldMultiIndex = this.strides.index(offset)
+            val oldMultiIndex = this.linearStructure.index(offset)
             val newMultiIndex = oldMultiIndex.copyOf()
             newMultiIndex[i] = newMultiIndex[j].also { newMultiIndex[j] = newMultiIndex[i] }
 
-            val linearIndex = resTensor.strides.offset(newMultiIndex)
+            val linearIndex = resTensor.linearStructure.offset(newMultiIndex)
             resTensor.buffer.array()[linearIndex] =
                 this.buffer.array()[this.bufferStart + offset]
         }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
similarity index 55%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
index d1d1204b4..97ce29657 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStrides.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
@@ -1,10 +1,14 @@
-package space.kscience.kmath.tensors
+package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.nd.Strides
-import space.kscience.kmath.nd.offsetFromIndex
 import kotlin.math.max
 
 
+internal inline fun offsetFromIndex(index: IntArray, shape: IntArray, strides: IntArray): Int =
+    index.mapIndexed { i, value ->
+        if (value < 0 || value >= shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0,${shape[i]})")
+        value * strides[i]
+    }.sum()
+
 internal inline fun stridesFromShape(shape: IntArray): IntArray {
     val nDim = shape.size
     val res = IntArray(nDim)
@@ -35,7 +39,7 @@ internal inline fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int):
     return res
 }
 
-internal inline fun nextIndex(index: IntArray, shape: IntArray, nDim: Int): IntArray {
+internal inline fun stepIndex(index: IntArray, shape: IntArray, nDim: Int): IntArray {
     val res = index.copyOf()
     var current = nDim - 1
     var carry = 0
@@ -47,26 +51,29 @@ internal inline fun nextIndex(index: IntArray, shape: IntArray, nDim: Int): IntA
             res[current] = 0
         }
         current--
-    } while(carry != 0 && current >= 0)
+    } while (carry != 0 && current >= 0)
 
     return res
 }
 
 
-
-public class TensorStrides(override val shape: IntArray): Strides
+public class TensorLinearStructure(public val shape: IntArray)
 {
-    override val strides: IntArray
+    public val strides: IntArray
         get() = stridesFromShape(shape)
 
-    override fun offset(index: IntArray): Int  = offsetFromIndex(index, shape, strides)
+    public fun offset(index: IntArray): Int = offsetFromIndex(index, shape, strides)
 
-    override fun index(offset: Int): IntArray =
+    public fun index(offset: Int): IntArray =
         indexFromOffset(offset, strides, shape.size)
 
-    override fun nextIndex(index: IntArray): IntArray =
-        nextIndex(index, shape, shape.size)
+    public fun stepIndex(index: IntArray): IntArray =
+        stepIndex(index, shape, shape.size)
 
-    override val linearSize: Int
+    public val size: Int
         get() = shape.reduce(Int::times)
+
+    public fun indices(): Sequence<IntArray> = (0 until size).asSequence().map {
+        index(it)
+    }
 }
\ No newline at end of file
-- 
2.34.1


From d8ef190ed8912476aaf7901431cc7e24d6449d94 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Sun, 21 Mar 2021 08:07:17 +0000
Subject: [PATCH 048/713] UnaryPlus fails API check

---
 .../kotlin/space/kscience/kmath/nd/StructureND.kt    | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index f28d29e47..78eac1809 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -189,11 +189,6 @@ public interface Strides {
      */
     public fun index(offset: Int): IntArray
 
-    /**
-     * Get next multidimensional index from the current multidimensional index
-     */
-    public fun nextIndex(index: IntArray): IntArray
-
     /**
      * The size of linear buffer to accommodate all elements of ND-structure corresponding to strides
      */
@@ -232,7 +227,7 @@ public class DefaultStrides private constructor(override val shape: IntArray) :
     }
 
     override fun offset(index: IntArray): Int = index.mapIndexed { i, value ->
-        if (value < 0 || value >= shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0,${shape[i]})")
+        if (value < 0 || value >= shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0,${this.shape[i]})")
         value * strides[i]
     }.sum()
 
@@ -250,10 +245,6 @@ public class DefaultStrides private constructor(override val shape: IntArray) :
         return res
     }
 
-    override fun nextIndex(index: IntArray): IntArray {
-        TODO("Not yet implemented")
-    }
-
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other !is DefaultStrides) return false
@@ -275,7 +266,6 @@ public class DefaultStrides private constructor(override val shape: IntArray) :
     }
 }
 
-
 public inline fun <reified T : Any> StructureND<T>.combine(
     struct: StructureND<T>,
     crossinline block: (T, T) -> T,
-- 
2.34.1


From fa78ed1f45f3598e26d74d21d6f79c623c9e8e8e Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Sun, 21 Mar 2021 19:05:11 +0300
Subject: [PATCH 049/713] map and analytic funcions

---
 .../kmath/tensors/LinearOpsTensorAlgebra.kt   |  4 +-
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  5 ++
 .../kmath/tensors/core/BufferedTensor.kt      |  1 +
 .../core/DoubleAnalyticTensorAlgebra.kt       | 73 +++++--------------
 .../core/DoubleLinearOpsTensorAlgebra.kt      | 63 +++++++++++-----
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 39 +++++++++-
 .../kscience/kmath/tensors/core/checks.kt     | 14 +++-
 7 files changed, 122 insertions(+), 77 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
index 94176564c..c4fa3e0a8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
@@ -14,10 +14,10 @@ public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>, Inde
     public fun TensorType.qr(): TensorType
 
     //https://pytorch.org/docs/stable/generated/torch.lu.html
-    public fun TensorType.lu(): Pair<TensorType, IndexTensorType>
+    public fun TensorType.lu(tol: T): Pair<TensorType, IndexTensorType>
 
     //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
-    public fun luPivot(lu: TensorType, pivots: IndexTensorType): Triple<TensorType, TensorType, TensorType>
+    public fun luPivot(luTensor: TensorType, pivotsTensor: IndexTensorType): Triple<TensorType, TensorType, TensorType>
 
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.svd
     public fun TensorType.svd(): Triple<TensorType, TensorType, TensorType>
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index e41b7546c..8be0dc149 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -3,6 +3,11 @@ package space.kscience.kmath.tensors
 // https://proofwiki.org/wiki/Definition:Algebra_over_Ring
 public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
+    public fun TensorType.map(transform: (T) -> T): TensorType
+
+    public fun TensorType.eq(other: TensorType, eqFunction: (T, T) -> Boolean): Boolean
+    public fun TensorType.contentEquals(other: TensorType, eqFunction: (T, T) -> Boolean): Boolean
+
     //https://pytorch.org/docs/stable/generated/torch.full.html
     public fun full(value: T, shape: IntArray): TensorType
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 5a0fc6c75..ca9168c91 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -5,6 +5,7 @@ import space.kscience.kmath.nd.*
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.TensorStrides
 import space.kscience.kmath.tensors.TensorStructure
+import kotlin.math.atanh
 
 
 public open class BufferedTensor<T>(
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
index 8a579b7da..1eb4c3b63 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
@@ -7,77 +7,40 @@ public class DoubleAnalyticTensorAlgebra:
     AnalyticTensorAlgebra<Double, DoubleTensor>,
     DoubleOrderedTensorAlgebra()
 {
-    override fun DoubleTensor.exp(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.exp(): DoubleTensor = this.map(::exp)
 
-    override fun DoubleTensor.log(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    // todo log with other base????
+    override fun DoubleTensor.log(): DoubleTensor = this.map(::ln)
 
-    override fun DoubleTensor.sqrt(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.sqrt(): DoubleTensor = this.map(::sqrt)
 
-    override fun DoubleTensor.cos(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.cos(): DoubleTensor = this.map(::cos)
 
-    override fun DoubleTensor.acos(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.acos(): DoubleTensor = this.map(::acos)
 
-    override fun DoubleTensor.cosh(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.cosh(): DoubleTensor = this.map(::cosh)
 
-    override fun DoubleTensor.acosh(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.acosh(): DoubleTensor = this.map(::acosh)
 
-    override fun DoubleTensor.sin(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.sin(): DoubleTensor = this.map(::sin)
 
-    override fun DoubleTensor.asin(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.asin(): DoubleTensor = this.map(::asin)
 
-    override fun DoubleTensor.sinh(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.sinh(): DoubleTensor = this.map(::sinh)
 
-    override fun DoubleTensor.asinh(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.asinh(): DoubleTensor = this.map(::asinh)
 
-    override fun DoubleTensor.tan(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.tan(): DoubleTensor = this.map(::tan)
 
-    override fun DoubleTensor.atan(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.atan(): DoubleTensor = this.map(::atan)
 
-    override fun DoubleTensor.tanh(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.tanh(): DoubleTensor = this.map(::tanh)
 
-    override fun DoubleTensor.atanh(): DoubleTensor {
-        return DoubleTensor(
-            this.shape,
-            this.buffer.array().map(::atanh).toDoubleArray(),
-            this.bufferStart
-        )
-    }
+    override fun DoubleTensor.atanh(): DoubleTensor = this.map(::atanh)
 
-    override fun DoubleTensor.ceil(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.ceil(): DoubleTensor = this.map(::ceil)
 
-    override fun DoubleTensor.floor(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
+    override fun DoubleTensor.floor(): DoubleTensor = this.map(::floor)
 
     override fun DoubleTensor.clamp(min: Double, max: Double): DoubleTensor {
         TODO("Not yet implemented")
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 8a16dc3ed..e0abc49b7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -1,6 +1,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.tensors.LinearOpsTensorAlgebra
+import kotlin.math.sqrt
 
 public class DoubleLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double, DoubleTensor, IntTensor>,
@@ -10,47 +11,47 @@ public class DoubleLinearOpsTensorAlgebra :
         TODO("Not yet implemented")
     }
 
-    override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
+    override fun DoubleTensor.lu(tol: Double): Pair<DoubleTensor, IntTensor> {
 
-        // todo checks
+        checkSquareMatrix(shape)
 
-        val luTensor = this.copy()
+        val luTensor = copy()
 
-        val n = this.shape.size
-        val m = this.shape.last()
-        val pivotsShape = IntArray(n - 1) { i -> this.shape[i] }
+        val n = shape.size
+        val m = shape.last()
+        val pivotsShape = IntArray(n - 1) { i -> shape[i] }
         val pivotsTensor = IntTensor(
             pivotsShape,
-            IntArray(pivotsShape.reduce(Int::times)) { 0 } //todo default???
+            IntArray(pivotsShape.reduce(Int::times)) { 0 }
         )
 
         for ((lu, pivots) in luTensor.matrixSequence().zip(pivotsTensor.vectorSequence())){
             for (row in 0 until m) pivots[row] = row
 
             for (i in 0 until m) {
-                var maxA = -1.0
-                var iMax = i
+                var maxVal = -1.0
+                var maxInd = i
 
                 for (k in i until m) {
                     val absA = kotlin.math.abs(lu[k, i])
-                    if (absA > maxA) {
-                        maxA = absA
-                        iMax = k
+                    if (absA > maxVal) {
+                        maxVal = absA
+                        maxInd = k
                     }
                 }
 
                 //todo check singularity
 
-                if (iMax != i) {
+                if (maxInd != i) {
 
                     val j = pivots[i]
-                    pivots[i] = pivots[iMax]
-                    pivots[iMax] = j
+                    pivots[i] = pivots[maxInd]
+                    pivots[maxInd] = j
 
                     for (k in 0 until m) {
                         val tmp = lu[i, k]
-                        lu[i, k] = lu[iMax, k]
-                        lu[iMax, k] = tmp
+                        lu[i, k] = lu[maxInd, k]
+                        lu[maxInd, k] = tmp
                     }
 
                 }
@@ -71,6 +72,9 @@ public class DoubleLinearOpsTensorAlgebra :
 
     override fun luPivot(luTensor: DoubleTensor, pivotsTensor: IntTensor): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         //todo checks
+        checkSquareMatrix(luTensor.shape)
+        check(luTensor.shape.dropLast(1).toIntArray() contentEquals pivotsTensor.shape) { "Bed shapes (("} //todo rewrite
+
         val n = luTensor.shape.last()
         val pTensor = luTensor.zeroesLike()
         for ((p, pivot) in pTensor.matrixSequence().zip(pivotsTensor.vectorSequence())){
@@ -104,7 +108,30 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     override fun DoubleTensor.cholesky(): DoubleTensor {
-        TODO("Not yet implemented")
+        // todo checks
+        checkSquareMatrix(shape)
+
+        val n = shape.last()
+        val lTensor = zeroesLike()
+
+        for ((a, l) in this.matrixSequence().zip(lTensor.matrixSequence())) {
+            for (i in 0 until n) {
+                for (j in 0 until i) {
+                    var h = a[i, j]
+                    for (k in 0 until j) {
+                        h -= l[i, k] * l[j, k]
+                    }
+                    l[i, j] = h / l[j, j]
+                }
+                var h = a[i, i]
+                for (j in 0 until i) {
+                    h -= l[i, j] * l[i, j]
+                }
+                l[i, i] = sqrt(h)
+            }
+        }
+
+        return lTensor
     }
 
     override fun DoubleTensor.qr(): DoubleTensor {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 875f21687..daa8b6d74 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -1,7 +1,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.tensors.TensorPartialDivisionAlgebra
-
+import kotlin.math.abs
 
 public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, DoubleTensor> {
 
@@ -277,6 +277,43 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         TODO("Not yet implemented")
     }
 
+    override fun DoubleTensor.map(transform: (Double) -> Double): DoubleTensor {
+        return DoubleTensor(
+            this.shape,
+            this.buffer.array().map { transform(it) }.toDoubleArray(),
+            this.bufferStart
+        )
+    }
+
+    public fun DoubleTensor.contentEquals(other: DoubleTensor, delta: Double = 1e-5): Boolean {
+        return this.contentEquals(other) { x, y -> abs(x - y) < delta }
+    }
+
+    public fun DoubleTensor.eq(other: DoubleTensor, delta: Double = 1e-5): Boolean {
+        return this.eq(other) { x, y -> abs(x - y) < delta }
+    }
+
+    override fun DoubleTensor.contentEquals(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
+        if (!(this.shape contentEquals other.shape)){
+            return false
+        }
+        return this.eq(other, eqFunction)
+    }
+
+    override fun DoubleTensor.eq(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
+        // todo broadcasting checking
+        val n = this.strides.linearSize
+        if (n != other.strides.linearSize){
+            return false
+        }
+        for (i in 0 until n){
+            if (!eqFunction(this.buffer[this.bufferStart + i], other.buffer[other.bufferStart + i])) {
+                return false
+            }
+        }
+        return true
+    }
+
 }
 
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index f1ae89490..ec7a123a9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -64,4 +64,16 @@ internal inline fun <T, TensorType : TensorStructure<T>,
 internal inline fun <T, TensorType : TensorStructure<T>,
         TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
         TorchTensorAlgebraType.checkView(a: TensorType, shape: IntArray): Unit =
-    check(a.shape.reduce(Int::times) == shape.reduce(Int::times))
\ No newline at end of file
+    check(a.shape.reduce(Int::times) == shape.reduce(Int::times))
+
+internal inline fun <T, TensorType : TensorStructure<T>,
+        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
+        TorchTensorAlgebraType.checkSquareMatrix(shape: IntArray): Unit {
+    val n = shape.size
+    check(n >= 2) {
+        "Expected tensor with 2 or more dimensions, got size $n instead"
+    }
+    check(shape[n - 1] == shape[n - 2]) {
+        "Tensor must be batches of square matrices, but they are ${shape[n - 1]} by ${shape[n - 1]} matrices"
+    }
+}
-- 
2.34.1


From df402086daeb0b15c78a1a0d987cd46dd5122801 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Sun, 21 Mar 2021 19:08:30 +0300
Subject: [PATCH 050/713] init test for analytic algebra

---
 .../core/TestDoubleAnalyticTensorAlgebra.kt   | 35 +++++++++++++++++++
 .../tensors/core/TestDoubleTensorAlgebra.kt   |  4 +++
 2 files changed, 39 insertions(+)
 create mode 100644 kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt

diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
new file mode 100644
index 000000000..8028ce175
--- /dev/null
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -0,0 +1,35 @@
+package space.kscience.kmath.tensors.core
+
+import kotlin.math.abs
+import kotlin.math.exp
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class TestDoubleAnalyticTensorAlgebra {
+
+    val shape = intArrayOf(2, 1, 3, 2)
+    val buffer = doubleArrayOf(27.1, 20.0, 19.84, 23.123, 0.0, 1.0, 3.23, 133.7, 25.3, 100.3, 11.0, 12.012)
+    val tensor = DoubleTensor(shape, buffer)
+
+    fun DoubleArray.fmap(transform: (Double) -> Double): DoubleArray {
+        return this.map(transform).toDoubleArray()
+    }
+
+    fun DoubleArray.deltaEqual(other: DoubleArray, delta: Double = 1e-5): Boolean {
+        for ((elem1, elem2) in this.asSequence().zip(other.asSequence())) {
+            if (abs(elem1 - elem2) > delta) {
+                return false
+            }
+        }
+        return true
+    }
+
+    @Test
+    fun testExp() = DoubleAnalyticTensorAlgebra {
+        tensor.exp().let {
+            assertTrue { shape contentEquals it.shape }
+            assertTrue { buffer.fmap(::exp).deltaEqual(it.buffer.array())}
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index ddfba0d59..06aa3ebf7 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -79,4 +79,8 @@ class TestDoubleTensorAlgebra {
         assertTrue(expected.buffer.array() contentEquals assignResult.buffer.array())
     }
 
+    @Test
+    fun testContentEqual() = DoubleTensorAlgebra {
+        //TODO()
+    }
 }
\ No newline at end of file
-- 
2.34.1


From 0365d41f317af785f4963611f4c3899171618720 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Sun, 21 Mar 2021 17:57:19 +0000
Subject: [PATCH 051/713] Merged PR

---
 kmath-core/api/kmath-core.api                 | 485 ++++++++++++++++++
 .../kscience/kmath/tensors/TensorAlgebra.kt   |   5 -
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  10 +-
 3 files changed, 490 insertions(+), 10 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 04325379e..70bec600d 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -972,6 +972,30 @@ public final class space/kscience/kmath/nd/GroupND$DefaultImpls {
 	public static fun unaryPlus (Lspace/kscience/kmath/nd/GroupND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
 }
 
+public abstract interface class space/kscience/kmath/nd/MutableStructure1D : space/kscience/kmath/nd/MutableStructureND, space/kscience/kmath/nd/Structure1D, space/kscience/kmath/structures/MutableBuffer {
+	public abstract fun set ([ILjava/lang/Object;)V
+}
+
+public final class space/kscience/kmath/nd/MutableStructure1D$DefaultImpls {
+	public static fun get (Lspace/kscience/kmath/nd/MutableStructure1D;[I)Ljava/lang/Object;
+	public static fun getDimension (Lspace/kscience/kmath/nd/MutableStructure1D;)I
+	public static fun iterator (Lspace/kscience/kmath/nd/MutableStructure1D;)Ljava/util/Iterator;
+	public static fun set (Lspace/kscience/kmath/nd/MutableStructure1D;[ILjava/lang/Object;)V
+}
+
+public abstract interface class space/kscience/kmath/nd/MutableStructure2D : space/kscience/kmath/nd/MutableStructureND, space/kscience/kmath/nd/Structure2D {
+	public abstract fun set (IILjava/lang/Object;)V
+}
+
+public final class space/kscience/kmath/nd/MutableStructure2D$DefaultImpls {
+	public static fun elements (Lspace/kscience/kmath/nd/MutableStructure2D;)Lkotlin/sequences/Sequence;
+	public static fun get (Lspace/kscience/kmath/nd/MutableStructure2D;[I)Ljava/lang/Object;
+	public static fun getColumns (Lspace/kscience/kmath/nd/MutableStructure2D;)Ljava/util/List;
+	public static fun getDimension (Lspace/kscience/kmath/nd/MutableStructure2D;)I
+	public static fun getRows (Lspace/kscience/kmath/nd/MutableStructure2D;)Ljava/util/List;
+	public static fun getShape (Lspace/kscience/kmath/nd/MutableStructure2D;)[I
+}
+
 public abstract interface class space/kscience/kmath/nd/MutableStructureND : space/kscience/kmath/nd/StructureND {
 	public abstract fun set ([ILjava/lang/Object;)V
 }
@@ -1072,6 +1096,7 @@ public final class space/kscience/kmath/nd/Structure1D$DefaultImpls {
 }
 
 public final class space/kscience/kmath/nd/Structure1DKt {
+	public static final fun as1D (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructure1D;
 	public static final fun as1D (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/Structure1D;
 	public static final fun asND (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/nd/Structure1D;
 }
@@ -1101,6 +1126,7 @@ public final class space/kscience/kmath/nd/Structure2D$DefaultImpls {
 }
 
 public final class space/kscience/kmath/nd/Structure2DKt {
+	public static final fun as2D (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructure2D;
 	public static final fun as2D (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/Structure2D;
 }
 
@@ -2582,3 +2608,462 @@ public final class space/kscience/kmath/structures/VirtualBuffer : space/kscienc
 	public fun iterator ()Ljava/util/Iterator;
 }
 
+public abstract interface class space/kscience/kmath/tensors/AnalyticTensorAlgebra : space/kscience/kmath/tensors/OrderedTensorAlgebra, space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
+	public abstract fun acos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun acosh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun asin (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun asinh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun atan (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun atanh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun ceil (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun clamp (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun cos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun cosh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun erf (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun erfc (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun erfinv (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun exp (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun floor (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun heaviside (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun histc (Lspace/kscience/kmath/nd/MutableStructureND;ILjava/lang/Object;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun igamma (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun igammac (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun lerp (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun lgamma (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun log (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun logit (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun mvlgamma (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun polygamma (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun pow (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun quantile (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun round (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun sigmoid (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun sin (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun sinc (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun sinh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun sqrt (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun std (Lspace/kscience/kmath/nd/MutableStructureND;IZZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun tan (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun tanh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun trapz (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+}
+
+public abstract interface class space/kscience/kmath/tensors/ComplexTensorAlgebra : space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
+	public abstract fun angle (Lspace/kscience/kmath/tensors/ComplexTensorStructure;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun bartlettWindow (IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun blackmanWindow (IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun cartesianEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/tensors/ComplexTensorStructure;
+	public abstract fun hammingWindow (IZLjava/lang/Object;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun inverseShortTimeFourierTransform (Lspace/kscience/kmath/tensors/ComplexTensorStructure;IIILspace/kscience/kmath/nd/MutableStructureND;ZZZI)V
+	public abstract fun kaiserWindow (IZLjava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun polarEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/tensors/ComplexTensorStructure;
+	public abstract fun shortTimeFourierTransform (Lspace/kscience/kmath/tensors/ComplexTensorStructure;IIILspace/kscience/kmath/nd/MutableStructureND;ZZ)V
+	public abstract fun viewAsComplex (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/tensors/ComplexTensorStructure;
+}
+
+public abstract interface class space/kscience/kmath/tensors/ComplexTensorStructure : space/kscience/kmath/nd/MutableStructureND {
+	public abstract fun imaginaryPart ()Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun realPart ()Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun viewAsReal ()Lspace/kscience/kmath/nd/MutableStructureND;
+}
+
+public final class space/kscience/kmath/tensors/ComplexTensorStructure$DefaultImpls {
+	public static fun getDimension (Lspace/kscience/kmath/tensors/ComplexTensorStructure;)I
+}
+
+public abstract interface class space/kscience/kmath/tensors/LinearOpsTensorAlgebra : space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
+	public abstract fun cholesky (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun inv (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun lu (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lkotlin/Pair;
+	public abstract fun luPivot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
+	public abstract fun qr (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun svd (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
+	public abstract fun symEig (Lspace/kscience/kmath/nd/MutableStructureND;Z)Lkotlin/Pair;
+}
+
+public final class space/kscience/kmath/tensors/LinearOpsTensorAlgebra$DefaultImpls {
+	public static synthetic fun symEig$default (Lspace/kscience/kmath/tensors/LinearOpsTensorAlgebra;Lspace/kscience/kmath/nd/MutableStructureND;ZILjava/lang/Object;)Lkotlin/Pair;
+}
+
+public abstract interface class space/kscience/kmath/tensors/OrderedTensorAlgebra : space/kscience/kmath/tensors/TensorAlgebra {
+	public abstract fun cummax (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun cummin (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun max (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun maximum (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public abstract fun median (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun min (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun minimum (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public abstract fun sort (Lspace/kscience/kmath/nd/MutableStructureND;IZZ)Lspace/kscience/kmath/nd/MutableStructureND;
+}
+
+public abstract interface class space/kscience/kmath/tensors/ReduceOpsTensorAlgebra : space/kscience/kmath/tensors/TensorAlgebra {
+	public abstract fun value (Lspace/kscience/kmath/nd/MutableStructureND;)Ljava/lang/Object;
+}
+
+public abstract interface class space/kscience/kmath/tensors/TensorAlgebra {
+	public abstract fun abs (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun cat (Ljava/util/List;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun copy (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun cumprod (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun cumsum (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun det (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun diagonalEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;III)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun dot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun eye (I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun flatten (Lspace/kscience/kmath/nd/MutableStructureND;II)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun full (Ljava/lang/Object;[I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun fullLike (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun get (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun minus (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun minus (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun minus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
+	public abstract fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public abstract fun ones ([I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun onesLike (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun plus (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun plusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
+	public abstract fun plusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public abstract fun prod (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun square (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun squeeze (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun sum (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun times (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun times (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun times (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun timesAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
+	public abstract fun timesAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public abstract fun transpose (Lspace/kscience/kmath/nd/MutableStructureND;II)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun unaryMinus (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun view (Lspace/kscience/kmath/nd/MutableStructureND;[I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun viewAs (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun zeroesLike (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun zeros ([I)Lspace/kscience/kmath/nd/MutableStructureND;
+}
+
+public final class space/kscience/kmath/tensors/TensorAlgebra$DefaultImpls {
+	public static synthetic fun diagonalEmbedding$default (Lspace/kscience/kmath/tensors/TensorAlgebra;Lspace/kscience/kmath/nd/MutableStructureND;IIIILjava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+}
+
+public abstract interface class space/kscience/kmath/tensors/TensorPartialDivisionAlgebra : space/kscience/kmath/tensors/TensorAlgebra {
+	public abstract fun div (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun div (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun divAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
+	public abstract fun divAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public abstract fun mean (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun variance (Lspace/kscience/kmath/nd/MutableStructureND;IZZ)Lspace/kscience/kmath/nd/MutableStructureND;
+}
+
+public final class space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra {
+	public fun <init> ()V
+	public synthetic fun div (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun div (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun divAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public fun divAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
+	public synthetic fun minus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun minus (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public fun minusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
+	public synthetic fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun plus (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun plusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public fun plusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
+	public synthetic fun times (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun times (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun timesAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public fun timesAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
+}
+
+public final class space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebraKt {
+	public static final fun BroadcastDoubleTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+}
+
+public class space/kscience/kmath/tensors/core/BufferedTensor : space/kscience/kmath/nd/MutableStructureND {
+	public fun <init> ([ILspace/kscience/kmath/structures/MutableBuffer;I)V
+	public fun elements ()Lkotlin/sequences/Sequence;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun forEachMatrix (Lkotlin/jvm/functions/Function1;)V
+	public final fun forEachVector (Lkotlin/jvm/functions/Function1;)V
+	public fun get ([I)Ljava/lang/Object;
+	public final fun getBuffer ()Lspace/kscience/kmath/structures/MutableBuffer;
+	public fun getDimension ()I
+	public final fun getLinearStructure ()Lspace/kscience/kmath/tensors/core/TensorLinearStructure;
+	public final fun getNumel ()I
+	public fun getShape ()[I
+	public fun hashCode ()I
+	public final fun matrixSequence ()Lkotlin/sequences/Sequence;
+	public fun set ([ILjava/lang/Object;)V
+	public final fun vectorSequence ()Lkotlin/sequences/Sequence;
+}
+
+public final class space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra : space/kscience/kmath/tensors/core/DoubleOrderedTensorAlgebra, space/kscience/kmath/tensors/AnalyticTensorAlgebra {
+	public fun <init> ()V
+	public synthetic fun acos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun acos (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun acosh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun acosh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun asin (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun asin (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun asinh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun asinh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun atan (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun atan (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun atanh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun atanh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun ceil (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun ceil (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun clamp (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun clamp (Lspace/kscience/kmath/tensors/core/DoubleTensor;DD)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun cos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun cos (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun cosh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun cosh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun erf (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun erf (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun erfc (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun erfc (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun erfinv (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun erfinv (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun exp (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun exp (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun floor (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun floor (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun heaviside (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun heaviside (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun histc (Lspace/kscience/kmath/nd/MutableStructureND;ILjava/lang/Object;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun histc (Lspace/kscience/kmath/tensors/core/DoubleTensor;IDD)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun igamma (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun igamma (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun igammac (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun igammac (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun lerp (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun lerp (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun lgamma (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun lgamma (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun log (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun log (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun logit (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun logit (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun mvlgamma (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun mvlgamma (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun polygamma (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun polygamma (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun pow (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun pow (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun quantile (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun quantile (Lspace/kscience/kmath/tensors/core/DoubleTensor;DIZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun round (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun round (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun sigmoid (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun sigmoid (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun sin (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun sin (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun sinc (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun sinc (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun sinh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun sinh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun sqrt (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun sqrt (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun std (Lspace/kscience/kmath/nd/MutableStructureND;IZZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun std (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun tan (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun tan (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun tanh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun tanh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun trapz (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun trapz (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+}
+
+public final class space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebraKt {
+	public static final fun DoubleAnalyticTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+}
+
+public final class space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra, space/kscience/kmath/tensors/LinearOpsTensorAlgebra {
+	public fun <init> ()V
+	public synthetic fun cholesky (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun cholesky (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun inv (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun inv (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun lu (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lkotlin/Pair;
+	public fun lu (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lkotlin/Pair;
+	public synthetic fun luPivot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
+	public fun luPivot (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/IntTensor;)Lkotlin/Triple;
+	public synthetic fun qr (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun qr (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun svd (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
+	public fun svd (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lkotlin/Triple;
+	public synthetic fun symEig (Lspace/kscience/kmath/nd/MutableStructureND;Z)Lkotlin/Pair;
+	public fun symEig (Lspace/kscience/kmath/tensors/core/DoubleTensor;Z)Lkotlin/Pair;
+}
+
+public final class space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebraKt {
+	public static final fun DoubleLinearOpsTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+}
+
+public class space/kscience/kmath/tensors/core/DoubleOrderedTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra, space/kscience/kmath/tensors/OrderedTensorAlgebra {
+	public fun <init> ()V
+	public synthetic fun cummax (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun cummax (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun cummin (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun cummin (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun max (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun max (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun maximum (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public fun maximum (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
+	public synthetic fun median (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun median (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun min (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun min (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun minimum (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public fun minimum (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
+	public synthetic fun sort (Lspace/kscience/kmath/nd/MutableStructureND;IZZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun sort (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+}
+
+public final class space/kscience/kmath/tensors/core/DoubleOrderedTensorAlgebraKt {
+	public static final fun DoubleOrderedTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+}
+
+public final class space/kscience/kmath/tensors/core/DoubleReduceOpsTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra, space/kscience/kmath/tensors/ReduceOpsTensorAlgebra {
+	public fun <init> ()V
+	public synthetic fun value (Lspace/kscience/kmath/nd/MutableStructureND;)Ljava/lang/Object;
+	public fun value (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Ljava/lang/Double;
+}
+
+public final class space/kscience/kmath/tensors/core/DoubleReduceOpsTensorAlgebraKt {
+	public static final fun DoubleReduceOpsTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+}
+
+public final class space/kscience/kmath/tensors/core/DoubleTensor : space/kscience/kmath/tensors/core/BufferedTensor {
+}
+
+public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
+	public fun <init> ()V
+	public synthetic fun abs (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun abs (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun cat (Ljava/util/List;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun cat (Ljava/util/List;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public final fun contentEquals (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Z
+	public final fun contentEquals (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lkotlin/jvm/functions/Function2;)Z
+	public static synthetic fun contentEquals$default (Lspace/kscience/kmath/tensors/core/DoubleTensorAlgebra;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;DILjava/lang/Object;)Z
+	public synthetic fun copy (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun copy (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun cumprod (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun cumprod (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun cumsum (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun cumsum (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun det (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun det (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun diagonalEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;III)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun diagonalEmbedding (Lspace/kscience/kmath/tensors/core/DoubleTensor;III)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun div (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public synthetic fun div (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun div (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public fun div (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun divAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
+	public synthetic fun divAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public fun divAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)V
+	public fun divAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
+	public synthetic fun dot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun dot (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public final fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Z
+	public final fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lkotlin/jvm/functions/Function2;)Z
+	public static synthetic fun eq$default (Lspace/kscience/kmath/tensors/core/DoubleTensorAlgebra;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;DILjava/lang/Object;)Z
+	public synthetic fun eye (I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun eye (I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun flatten (Lspace/kscience/kmath/nd/MutableStructureND;II)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun flatten (Lspace/kscience/kmath/tensors/core/DoubleTensor;II)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public final fun fromArray ([I[D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public fun full (D[I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun full (Ljava/lang/Object;[I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public synthetic fun fullLike (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun fullLike (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun get (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun get (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public final fun map (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun mean (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun mean (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public fun minus (DLspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun minus (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public synthetic fun minus (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public synthetic fun minus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun minus (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public fun minus (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
+	public synthetic fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public fun minusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)V
+	public fun minusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
+	public synthetic fun ones ([I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun ones ([I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun onesLike (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun onesLike (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public fun plus (DLspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun plus (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public synthetic fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public synthetic fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun plus (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public fun plus (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun plusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
+	public synthetic fun plusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public fun plusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)V
+	public fun plusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
+	public synthetic fun prod (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun prod (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun square (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun square (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun squeeze (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun squeeze (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun sum (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun sum (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public fun times (DLspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun times (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public synthetic fun times (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public synthetic fun times (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun times (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public fun times (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun timesAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
+	public synthetic fun timesAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
+	public fun timesAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)V
+	public fun timesAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
+	public synthetic fun transpose (Lspace/kscience/kmath/nd/MutableStructureND;II)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun transpose (Lspace/kscience/kmath/tensors/core/DoubleTensor;II)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun unaryMinus (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun unaryMinus (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun variance (Lspace/kscience/kmath/nd/MutableStructureND;IZZ)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun variance (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun view (Lspace/kscience/kmath/nd/MutableStructureND;[I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun view (Lspace/kscience/kmath/tensors/core/DoubleTensor;[I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun viewAs (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun viewAs (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun zeroesLike (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun zeroesLike (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun zeros ([I)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun zeros ([I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+}
+
+public final class space/kscience/kmath/tensors/core/DoubleTensorAlgebraKt {
+	public static final fun DoubleTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+}
+
+public final class space/kscience/kmath/tensors/core/FloatTensor : space/kscience/kmath/tensors/core/BufferedTensor {
+}
+
+public final class space/kscience/kmath/tensors/core/IntTensor : space/kscience/kmath/tensors/core/BufferedTensor {
+}
+
+public final class space/kscience/kmath/tensors/core/LongTensor : space/kscience/kmath/tensors/core/BufferedTensor {
+}
+
+public final class space/kscience/kmath/tensors/core/TensorLinearStructure {
+	public fun <init> ([I)V
+	public final fun getShape ()[I
+	public final fun getSize ()I
+	public final fun getStrides ()[I
+	public final fun index (I)[I
+	public final fun indices ()Lkotlin/sequences/Sequence;
+	public final fun offset ([I)I
+	public final fun stepIndex ([I)[I
+}
+
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 8be0dc149..e41b7546c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -3,11 +3,6 @@ package space.kscience.kmath.tensors
 // https://proofwiki.org/wiki/Definition:Algebra_over_Ring
 public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
-    public fun TensorType.map(transform: (T) -> T): TensorType
-
-    public fun TensorType.eq(other: TensorType, eqFunction: (T, T) -> Boolean): Boolean
-    public fun TensorType.contentEquals(other: TensorType, eqFunction: (T, T) -> Boolean): Boolean
-
     //https://pytorch.org/docs/stable/generated/torch.full.html
     public fun full(value: T, shape: IntArray): TensorType
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 57339adfa..67b50970b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -277,7 +277,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         TODO("Not yet implemented")
     }
 
-    override fun DoubleTensor.map(transform: (Double) -> Double): DoubleTensor {
+    public fun DoubleTensor.map(transform: (Double) -> Double): DoubleTensor {
         return DoubleTensor(
             this.shape,
             this.buffer.array().map { transform(it) }.toDoubleArray(),
@@ -293,17 +293,17 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return this.eq(other) { x, y -> abs(x - y) < delta }
     }
 
-    override fun DoubleTensor.contentEquals(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
+    public fun DoubleTensor.contentEquals(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
         if (!(this.shape contentEquals other.shape)){
             return false
         }
         return this.eq(other, eqFunction)
     }
 
-    override fun DoubleTensor.eq(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
+    public fun DoubleTensor.eq(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
         // todo broadcasting checking
-        val n = this.strides.linearSize
-        if (n != other.strides.linearSize){
+        val n = this.linearStructure.size
+        if (n != other.linearStructure.size){
             return false
         }
         for (i in 0 until n){
-- 
2.34.1


From 2d2c4bd4744af9f3d841571d213170b1d661fa8f Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Tue, 23 Mar 2021 14:53:54 +0300
Subject: [PATCH 052/713] add broadcast of all dims except the last 2, add
 tensors dot, fix bug in function times

---
 .../core/BroadcastDoubleTensorAlgebra.kt      | 59 +++++++++++++-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 80 ++++++++++++++++++-
 .../kmath/tensors/core/TestBroadcasting.kt    | 30 +++++++
 .../tensors/core/TestDoubleTensorAlgebra.kt   | 14 ++++
 4 files changed, 180 insertions(+), 3 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index 4bfbe5863..425178fc1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -85,7 +85,6 @@ public inline fun <R> BroadcastDoubleTensorAlgebra(block: BroadcastDoubleTensorA
 
 
 internal inline fun broadcastShapes(vararg shapes: IntArray): IntArray {
-    println(shapes)
     var totalDim = 0
     for (shape in shapes) {
         totalDim = max(totalDim, shape.size)
@@ -179,5 +178,63 @@ internal inline fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleT
         res.add(resTensor)
     }
 
+    return res
+}
+
+internal inline fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTensor> {
+    var onlyTwoDims = true
+    for (tensor in tensors) {
+        if (tensor.shape.size < 2) {
+            throw RuntimeException("Tensors must have at least 2 dimensions")
+        }
+        if (tensor.shape.size != 2) {
+            onlyTwoDims = false
+        }
+    }
+
+    if (onlyTwoDims) {
+        return tensors.asList()
+    }
+
+    val totalShape = broadcastShapes(*(tensors.map { it.shape.sliceArray(0..it.shape.size - 3) }).toTypedArray())
+    val n = totalShape.reduce { acc, i -> acc * i }
+
+    val res = ArrayList<DoubleTensor>(0)
+    for (tensor in tensors) {
+        val matrixShape = tensor.shape.sliceArray(tensor.shape.size - 2 until tensor.shape.size).copyOf()
+        val matrixSize = matrixShape[0] * matrixShape[1]
+        val matrix = DoubleTensor(matrixShape, DoubleArray(matrixSize))
+
+        val outerTensor = DoubleTensor(totalShape, DoubleArray(n))
+        val resTensor = DoubleTensor(totalShape + matrixShape, DoubleArray(n * matrixSize))
+
+        for (linearIndex in 0 until n) {
+            val totalMultiIndex = outerTensor.linearStructure.index(linearIndex)
+            var curMultiIndex = tensor.shape.sliceArray(0..tensor.shape.size - 3).copyOf()
+            curMultiIndex = IntArray(totalMultiIndex.size - curMultiIndex.size) {1} + curMultiIndex
+
+            val newTensor = DoubleTensor(curMultiIndex + matrixShape, tensor.buffer.array())
+
+            for (i in curMultiIndex.indices) {
+                if (curMultiIndex[i] != 1) {
+                    curMultiIndex[i] = totalMultiIndex[i]
+                } else {
+                    curMultiIndex[i] = 0
+                }
+            }
+
+            for (i in 0 until matrixSize) {
+                val curLinearIndex = newTensor.linearStructure.offset(curMultiIndex +
+                        matrix.linearStructure.index(i))
+                val newLinearIndex = resTensor.linearStructure.offset(totalMultiIndex +
+                        matrix.linearStructure.index(i))
+
+                resTensor.buffer.array()[resTensor.bufferStart + newLinearIndex] =
+                    newTensor.buffer.array()[newTensor.bufferStart + curLinearIndex]
+            }
+        }
+        res.add(resTensor)
+    }
+
     return res
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 67b50970b..9cdc6c130 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -132,7 +132,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     override fun DoubleTensor.times(other: DoubleTensor): DoubleTensor {
         checkShapesCompatible(this, other)
         val resBuffer = DoubleArray(this.linearStructure.size) { i ->
-            this.buffer.array()[other.bufferStart + i] *
+            this.buffer.array()[this.bufferStart + i] *
                     other.buffer.array()[other.bufferStart + i]
         }
         return DoubleTensor(this.shape, resBuffer)
@@ -241,8 +241,84 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         TODO("Not yet implemented")
     }
 
+    private fun DoubleTensor.dotTwoDimensionalTensors(other: DoubleTensor): DoubleTensor {
+        if (this.shape.size > 2 || other.shape.size > 2) {
+            throw RuntimeException("Both tensors must have a maximum of 2 dimensions")
+        }
+
+        if (this.shape[1] != other.shape[0]) {
+            throw RuntimeException("Tensors dot operation dimension mismatch: " +
+                    "(${this.shape[0]}, ${this.shape[1]}) x (${other.shape[0]}, ${other.shape[1]})")
+        }
+
+        val l = this.shape[0]
+        val m = this.shape[1]
+        val n = other.shape[1]
+
+        val res = DoubleTensor(intArrayOf(l, n), DoubleArray(l * n))
+
+        for (i in 0 until l) {
+            for (j in 0 until n) {
+                var curr = 0.0
+                for (k in 0 until m) {
+                    val ik = this.linearStructure.offset(intArrayOf(i, k))
+                    val kj = other.linearStructure.offset(intArrayOf(k, j))
+                    curr += this.buffer.array()[ik] * other.buffer.array()[kj]
+                }
+                val linearIndex = res.linearStructure.offset(intArrayOf(i, j))
+                res.buffer.array()[linearIndex] = curr
+            }
+        }
+        return res
+    }
+
     override fun DoubleTensor.dot(other: DoubleTensor): DoubleTensor {
-        TODO("Alya")
+        if (this.shape.size == 1 && other.shape.size == 1) {
+            return DoubleTensor(intArrayOf(1), doubleArrayOf(this.times(other).buffer.array().sum()))
+        }
+
+        var newThis = this.copy()
+        var newOther = other.copy()
+        if (this.shape.size == 1) {
+            newThis = this.view(intArrayOf(1) + this.shape)
+        }
+        if (other.shape.size == 1) {
+            newOther = other.view(other.shape + intArrayOf(1) )
+        }
+
+        val broadcastTensors = broadcastOuterTensors(newThis, newOther)
+        newThis = broadcastTensors[0]
+        newOther = broadcastTensors[1]
+
+        val l = newThis.shape[newThis.shape.size - 2]
+        val m1= newThis.shape[newThis.shape.size - 1]
+        val m2 = newOther.shape[newOther.shape.size - 2]
+        val n = newOther.shape[newOther.shape.size - 1]
+        if (m1 != m2) {
+            throw RuntimeException("Tensors dot operation dimension mismatch: ($l, $m1) x ($m2, $n)")
+        }
+        val m = m1
+
+        var resShape = newThis.shape.sliceArray(0..(newThis.shape.size - 2)) + intArrayOf(newOther.shape.last())
+        val resSize = resShape.reduce { acc, i -> acc * i }
+        val resTensor = DoubleTensor(resShape, DoubleArray(resSize))
+
+        for ((res, ab) in resTensor.matrixSequence().zip(newThis.matrixSequence().zip(newOther.matrixSequence()))) {
+            val a = ab.first
+            val b = ab.second
+
+            for (i in 0 until l) {
+                for (j in 0 until n) {
+                    var curr = 0.0
+                    for (k in 0 until m) {
+                        curr += a[i, k] * b[k, j]
+                    }
+                   res[i, j] = curr
+                }
+            }
+        }
+
+        return resTensor
     }
 
     override fun diagonalEmbedding(diagonalEntries: DoubleTensor, offset: Int, dim1: Int, dim2: Int): DoubleTensor {
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 73e3993a1..41c9b72f7 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -47,6 +47,36 @@ class TestBroadcasting {
         assertTrue(res[2].buffer.array() contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
     }
 
+    @Test
+    fun broadcastOuterTensors() = DoubleTensorAlgebra {
+        val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
+
+        val res = broadcastOuterTensors(tensor1, tensor2, tensor3)
+
+        assertTrue(res[0].shape contentEquals intArrayOf(1, 2, 3))
+        assertTrue(res[1].shape contentEquals intArrayOf(1, 1, 3))
+        assertTrue(res[2].shape contentEquals intArrayOf(1, 1, 1))
+
+        assertTrue(res[0].buffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res[1].buffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0))
+        assertTrue(res[2].buffer.array() contentEquals doubleArrayOf(500.0))
+    }
+
+    @Test
+    fun broadcastOuterTensorsShapes() = DoubleTensorAlgebra {
+        val tensor1 = fromArray(intArrayOf(2, 1, 3, 2, 3), DoubleArray(2 * 1 * 3 * 2 * 3) {0.0})
+        val tensor2 = fromArray(intArrayOf(4, 2, 5, 1, 3, 3), DoubleArray(4 * 2 * 5 * 1 * 3 * 3) {0.0})
+        val tensor3 = fromArray(intArrayOf(1, 1), doubleArrayOf(500.0))
+
+        val res = broadcastOuterTensors(tensor1, tensor2, tensor3)
+
+        assertTrue(res[0].shape contentEquals intArrayOf(4, 2, 5, 3, 2, 3))
+        assertTrue(res[1].shape contentEquals intArrayOf(4, 2, 5, 3, 3, 3))
+        assertTrue(res[2].shape contentEquals intArrayOf(4, 2, 5, 3, 1, 1))
+    }
+
     @Test
     fun minusTensor() = BroadcastDoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 06aa3ebf7..aa3c14412 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -79,6 +79,20 @@ class TestDoubleTensorAlgebra {
         assertTrue(expected.buffer.array() contentEquals assignResult.buffer.array())
     }
 
+    @Test
+    fun dot() = DoubleTensorAlgebra {
+        val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(intArrayOf(3), doubleArrayOf(10.0, 20.0, 30.0))
+        val res12 = tensor1.dot(tensor2)
+
+        assertTrue(res12.buffer.array() contentEquals doubleArrayOf(140.0, 320.0))
+        assertTrue(res12.shape contentEquals intArrayOf(2, 1))
+
+        val tensor4 = fromArray(intArrayOf(10, 3, 4), DoubleArray(10 * 3 * 4) {0.0})
+        val tensor5 = fromArray(intArrayOf(10, 4, 5), DoubleArray(10 * 4 * 5) {0.0})
+        assertTrue(tensor4.dot(tensor5).shape contentEquals intArrayOf(10, 3, 5))
+    }
+
     @Test
     fun testContentEqual() = DoubleTensorAlgebra {
         //TODO()
-- 
2.34.1


From 078686a04660e78b9929d2ed9a3c61f3fa888e62 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Tue, 23 Mar 2021 15:59:55 +0300
Subject: [PATCH 053/713] hotfix sequence

---
 .../space/kscience/kmath/tensors/core/BufferedTensor.kt   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 4f5e1f9f0..160c61260 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -34,7 +34,8 @@ public open class BufferedTensor<T>(
 
     public fun vectorSequence(): Sequence<MutableStructure1D<T>> = sequence {
         check(shape.size >= 1) {"todo"}
-        val vectorOffset = linearStructure.strides[0]
+        val n = shape.size
+        val vectorOffset = shape[n - 1]
         val vectorShape = intArrayOf(shape.last())
         for (offset in 0 until numel step vectorOffset) {
             val vector = BufferedTensor<T>(vectorShape, buffer, offset).as1D()
@@ -44,8 +45,9 @@ public open class BufferedTensor<T>(
 
     public fun matrixSequence(): Sequence<MutableStructure2D<T>> = sequence {
         check(shape.size >= 2) {"todo"}
-        val matrixOffset = linearStructure.strides[1]
-        val matrixShape = intArrayOf(shape[shape.size - 2], shape.last()) //todo better way?
+        val n = shape.size
+        val matrixOffset = shape[n - 1] * shape[n - 2]
+        val matrixShape = intArrayOf(shape[n - 2], shape[n - 1]) //todo better way?
         for (offset in 0 until numel step matrixOffset) {
             val matrix = BufferedTensor<T>(matrixShape, buffer, offset).as2D()
             yield(matrix)
-- 
2.34.1


From e01ca38fb3a7b05037582f561298928be552100e Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 23 Mar 2021 13:51:52 +0000
Subject: [PATCH 054/713] Tasks for Andrei and Alya

---
 .../kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt    | 8 ++++----
 .../kscience/kmath/tensors/core/DoubleTensorAlgebra.kt    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index e0abc49b7..8a16a991d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -8,7 +8,7 @@ public class DoubleLinearOpsTensorAlgebra :
     DoubleTensorAlgebra() {
 
     override fun DoubleTensor.inv(): DoubleTensor {
-        TODO("Not yet implemented")
+        TODO("ANDREI")
     }
 
     override fun DoubleTensor.lu(tol: Double): Pair<DoubleTensor, IntTensor> {
@@ -135,16 +135,16 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     override fun DoubleTensor.qr(): DoubleTensor {
-        TODO("Not yet implemented")
+        TODO("ANDREI")
     }
 
 
     override fun DoubleTensor.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        TODO("Not yet implemented")
+        TODO("ALYA")
     }
 
     override fun DoubleTensor.symEig(eigenvectors: Boolean): Pair<DoubleTensor, DoubleTensor> {
-        TODO("Not yet implemented")
+        TODO("ANDREI")
     }
 
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 67b50970b..c67687a09 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -262,7 +262,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun DoubleTensor.det(): DoubleTensor {
-        TODO("Not yet implemented")
+        TODO("ANDREI")
     }
 
     override fun DoubleTensor.square(): DoubleTensor {
-- 
2.34.1


From fea53af0eeaa3522a5754bfe83688f010a37a5f4 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Wed, 24 Mar 2021 14:00:47 +0300
Subject: [PATCH 055/713] fix

---
 .../space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt     | 2 +-
 .../kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt         | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
index c4fa3e0a8..e412af7c6 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
@@ -14,7 +14,7 @@ public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>, Inde
     public fun TensorType.qr(): TensorType
 
     //https://pytorch.org/docs/stable/generated/torch.lu.html
-    public fun TensorType.lu(tol: T): Pair<TensorType, IndexTensorType>
+    public fun TensorType.lu(): Pair<TensorType, IndexTensorType>
 
     //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
     public fun luPivot(luTensor: TensorType, pivotsTensor: IndexTensorType): Triple<TensorType, TensorType, TensorType>
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index e0abc49b7..d090ce79c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -11,7 +11,7 @@ public class DoubleLinearOpsTensorAlgebra :
         TODO("Not yet implemented")
     }
 
-    override fun DoubleTensor.lu(tol: Double): Pair<DoubleTensor, IntTensor> {
+    override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
 
         checkSquareMatrix(shape)
 
@@ -138,7 +138,6 @@ public class DoubleLinearOpsTensorAlgebra :
         TODO("Not yet implemented")
     }
 
-
     override fun DoubleTensor.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         TODO("Not yet implemented")
     }
-- 
2.34.1


From 206bcfc909d56a859ec783a30cc75a8ade178786 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Wed, 24 Mar 2021 18:08:36 +0300
Subject: [PATCH 056/713] lu inv and det complete + tests

---
 .../kmath/tensors/LinearOpsTensorAlgebra.kt   |  2 +-
 .../core/DoubleLinearOpsTensorAlgebra.kt      | 79 +++++++++++++++++++
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 35 +++++++-
 .../core/TestDoubleAnalyticTensorAlgebra.kt   |  7 +-
 .../core/TestDoubleLinearOpsAlgebra.kt        | 73 +++++++++++++++++
 5 files changed, 187 insertions(+), 9 deletions(-)
 create mode 100644 kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
index e412af7c6..f551d524a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
@@ -13,7 +13,7 @@ public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>, Inde
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.qr
     public fun TensorType.qr(): TensorType
 
-    //https://pytorch.org/docs/stable/generated/torch.lu.html
+    //htt   ps://pytorch.org/docs/stable/generated/torch.lu.html
     public fun TensorType.lu(): Pair<TensorType, IndexTensorType>
 
     //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 7779ad029..c8c4c413f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -1,5 +1,8 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.nd.MutableStructure2D
+import space.kscience.kmath.nd.Structure1D
+import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.tensors.LinearOpsTensorAlgebra
 import kotlin.math.sqrt
 
@@ -20,6 +23,8 @@ public class DoubleLinearOpsTensorAlgebra :
         val n = shape.size
         val m = shape.last()
         val pivotsShape = IntArray(n - 1) { i -> shape[i] }
+        pivotsShape[n - 2] = m + 1
+
         val pivotsTensor = IntTensor(
             pivotsShape,
             IntArray(pivotsShape.reduce(Int::times)) { 0 }
@@ -54,6 +59,8 @@ public class DoubleLinearOpsTensorAlgebra :
                         lu[maxInd, k] = tmp
                     }
 
+                    pivots[m] += 1
+
                 }
 
                 for (j in i + 1 until m) {
@@ -146,6 +153,78 @@ public class DoubleLinearOpsTensorAlgebra :
         TODO("ANDREI")
     }
 
+    private fun luMatrixDet(lu: Structure2D<Double>, pivots: Structure1D<Int>): Double {
+        val m = lu.shape[0]
+        val sign = if((pivots[m] - m) % 2 == 0) 1.0 else -1.0
+        var det = sign
+        for (i in 0 until m){
+            det *= lu[i, i]
+        }
+        return det
+    }
+
+    public fun DoubleTensor.detLU(): DoubleTensor {
+        val (luTensor, pivotsTensor) = this.lu()
+        val n = shape.size
+
+        val detTensorShape = IntArray(n - 1) { i -> shape[i] }
+        detTensorShape[n - 2] = 1
+        val resBuffer =  DoubleArray(detTensorShape.reduce(Int::times)) { 0.0 }
+
+        val detTensor = DoubleTensor(
+            detTensorShape,
+            resBuffer
+        )
+
+        luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).forEachIndexed { index, (luMatrix, pivots) ->
+            resBuffer[index] = luMatrixDet(luMatrix, pivots)
+        }
+
+        return detTensor
+    }
+
+    private fun luMatrixInv(
+        lu: Structure2D<Double>,
+        pivots: Structure1D<Int>,
+        invMatrix : MutableStructure2D<Double>
+    ): Unit {
+        val m = lu.shape[0]
+
+        for (j in 0 until m) {
+            for (i in 0 until m) {
+                if (pivots[i] == j){
+                    invMatrix[i, j] = 1.0
+                }
+
+                for (k in 0 until i){
+                    invMatrix[i, j] -= lu[i, k] * invMatrix[k, j]
+                }
+            }
+
+            for (i in m - 1 downTo 0) {
+                for (k in i + 1 until m) {
+                    invMatrix[i, j] -= lu[i, k] * invMatrix[k, j]
+                }
+                invMatrix[i, j] /= lu[i, i]
+            }
+        }
+    }
+
+    public fun DoubleTensor.invLU(): DoubleTensor {
+        val (luTensor, pivotsTensor) = this.lu()
+        val n = shape.size
+        val invTensor = luTensor.zeroesLike()
+
+        for (
+        (luP, invMatrix) in
+        luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).zip(invTensor.matrixSequence())
+        ) {
+            val (lu, pivots) = luP
+            luMatrixInv(lu, pivots, invMatrix)
+        }
+
+        return invTensor
+    }
 }
 
 public inline fun <R> DoubleLinearOpsTensorAlgebra(block: DoubleLinearOpsTensorAlgebra.() -> R): R =
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index c67687a09..ff65ca027 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -1,5 +1,8 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.nd.MutableStructure2D
+import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.tensors.TensorPartialDivisionAlgebra
 import kotlin.math.abs
 
@@ -262,7 +265,31 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun DoubleTensor.det(): DoubleTensor {
-        TODO("ANDREI")
+        TODO()
+        /*
+        checkSquareMatrix(shape)
+
+        val n = shape.size
+        val m = shape.last()
+
+        val detTensorShape = IntArray(n - 1) { i -> shape[i] }
+        detTensorShape[n - 1] = 1
+        val resBuffer =  DoubleArray(detTensorShape.reduce(Int::times)) { 0.0 }
+
+        val detTensor = DoubleTensor(
+            detTensorShape,
+            resBuffer
+        )
+
+        this.matrixSequence().forEachIndexed{i, matrix ->
+            // todo need Matrix determinant algo
+            // todo resBuffer[i] = matrix.det()
+        }
+
+
+        return detTensor
+
+         */
     }
 
     override fun DoubleTensor.square(): DoubleTensor {
@@ -294,7 +321,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     public fun DoubleTensor.contentEquals(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
-        if (!(this.shape contentEquals other.shape)){
+        if (!(this.shape contentEquals other.shape)) {
             return false
         }
         return this.eq(other, eqFunction)
@@ -303,10 +330,10 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     public fun DoubleTensor.eq(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
         // todo broadcasting checking
         val n = this.linearStructure.size
-        if (n != other.linearStructure.size){
+        if (n != other.linearStructure.size) {
             return false
         }
-        for (i in 0 until n){
+        for (i in 0 until n) {
             if (!eqFunction(this.buffer[this.bufferStart + i], other.buffer[other.bufferStart + i])) {
                 return false
             }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index 8028ce175..4dcdb7848 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -3,7 +3,6 @@ package space.kscience.kmath.tensors.core
 import kotlin.math.abs
 import kotlin.math.exp
 import kotlin.test.Test
-import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
 class TestDoubleAnalyticTensorAlgebra {
@@ -16,9 +15,9 @@ class TestDoubleAnalyticTensorAlgebra {
         return this.map(transform).toDoubleArray()
     }
 
-    fun DoubleArray.deltaEqual(other: DoubleArray, delta: Double = 1e-5): Boolean {
+    fun DoubleArray.epsEqual(other: DoubleArray, eps: Double = 1e-5): Boolean {
         for ((elem1, elem2) in this.asSequence().zip(other.asSequence())) {
-            if (abs(elem1 - elem2) > delta) {
+            if (abs(elem1 - elem2) > eps) {
                 return false
             }
         }
@@ -29,7 +28,7 @@ class TestDoubleAnalyticTensorAlgebra {
     fun testExp() = DoubleAnalyticTensorAlgebra {
         tensor.exp().let {
             assertTrue { shape contentEquals it.shape }
-            assertTrue { buffer.fmap(::exp).deltaEqual(it.buffer.array())}
+            assertTrue { buffer.fmap(::exp).epsEqual(it.buffer.array())}
         }
     }
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
new file mode 100644
index 000000000..2da79382f
--- /dev/null
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -0,0 +1,73 @@
+package space.kscience.kmath.tensors.core
+
+import kotlin.math.abs
+import kotlin.math.exp
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class TestDoubleLinearOpsTensorAlgebra {
+
+    private val eps = 1e-5
+
+    private fun Double.epsEqual(other: Double): Boolean {
+        return abs(this - other) < eps
+    }
+
+    fun DoubleArray.epsEqual(other: DoubleArray, eps: Double = 1e-5): Boolean {
+        for ((elem1, elem2) in this.asSequence().zip(other.asSequence())) {
+            if (abs(elem1 - elem2) > eps) {
+                return false
+            }
+        }
+        return true
+    }
+
+    @Test
+    fun testDetLU() = DoubleLinearOpsTensorAlgebra {
+        val tensor = fromArray(
+            intArrayOf(2, 2, 2),
+            doubleArrayOf(
+                1.0, 3.0,
+                1.0, 2.0,
+                1.5, 1.0,
+                10.0, 2.0
+            )
+        )
+
+        val expectedShape = intArrayOf(2, 1)
+        val expectedBuffer = doubleArrayOf(
+            -1.0,
+            -7.0
+        )
+        val detTensor = tensor.detLU()
+
+        assertTrue { detTensor.shape contentEquals expectedShape }
+        assertTrue { detTensor.buffer.array().epsEqual(expectedBuffer) }
+    }
+
+    @Test
+    fun testInvLU() = DoubleLinearOpsTensorAlgebra {
+        val tensor = fromArray(
+            intArrayOf(2, 2, 2),
+            doubleArrayOf(
+                1.0, 0.0,
+                0.0, 2.0,
+                1.0, 1.0,
+                1.0, 0.0
+            )
+        )
+
+        val expectedShape = intArrayOf(2, 2, 2)
+        val expectedBuffer = doubleArrayOf(
+            1.0, 0.0,
+            0.0, 0.5,
+            0.0, 1.0,
+            1.0, -1.0
+        )
+
+        val invTensor = tensor.invLU()
+        assertTrue { invTensor.shape contentEquals expectedShape }
+        assertTrue { invTensor.buffer.array().epsEqual(expectedBuffer) }
+    }
+}
-- 
2.34.1


From ab8137000146c52f10b3213c960b03917a0ada4f Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Wed, 24 Mar 2021 18:42:41 +0300
Subject: [PATCH 057/713] fixes

---
 .../kmath/tensors/LinearOpsTensorAlgebra.kt   |  2 +-
 .../core/DoubleLinearOpsTensorAlgebra.kt      | 22 +++++++------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
index f551d524a..e412af7c6 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
@@ -13,7 +13,7 @@ public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>, Inde
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.qr
     public fun TensorType.qr(): TensorType
 
-    //htt   ps://pytorch.org/docs/stable/generated/torch.lu.html
+    //https://pytorch.org/docs/stable/generated/torch.lu.html
     public fun TensorType.lu(): Pair<TensorType, IndexTensorType>
 
     //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index c8c4c413f..0b9d824f0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -10,9 +10,9 @@ public class DoubleLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double, DoubleTensor, IntTensor>,
     DoubleTensorAlgebra() {
 
-    override fun DoubleTensor.inv(): DoubleTensor {
-        TODO("ANDREI")
-    }
+    override fun DoubleTensor.inv(): DoubleTensor = invLU()
+
+    override fun DoubleTensor.det(): DoubleTensor = detLU()
 
     override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
 
@@ -156,15 +156,11 @@ public class DoubleLinearOpsTensorAlgebra :
     private fun luMatrixDet(lu: Structure2D<Double>, pivots: Structure1D<Int>): Double {
         val m = lu.shape[0]
         val sign = if((pivots[m] - m) % 2 == 0) 1.0 else -1.0
-        var det = sign
-        for (i in 0 until m){
-            det *= lu[i, i]
-        }
-        return det
+        return (0 until m).asSequence().map { lu[it, it] }.fold(sign) { left, right -> left * right }
     }
 
     public fun DoubleTensor.detLU(): DoubleTensor {
-        val (luTensor, pivotsTensor) = this.lu()
+        val (luTensor, pivotsTensor) = lu()
         val n = shape.size
 
         val detTensorShape = IntArray(n - 1) { i -> shape[i] }
@@ -211,14 +207,12 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     public fun DoubleTensor.invLU(): DoubleTensor {
-        val (luTensor, pivotsTensor) = this.lu()
+        val (luTensor, pivotsTensor) = lu()
         val n = shape.size
         val invTensor = luTensor.zeroesLike()
 
-        for (
-        (luP, invMatrix) in
-        luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).zip(invTensor.matrixSequence())
-        ) {
+        val seq = luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).zip(invTensor.matrixSequence())
+        for ((luP, invMatrix) in seq) {
             val (lu, pivots) = luP
             luMatrixInv(lu, pivots, invMatrix)
         }
-- 
2.34.1


From a4aa4b80d27cecef092a1a411163e24ff70d08ec Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 24 Mar 2021 15:51:58 +0000
Subject: [PATCH 058/713] Updated API

---
 kmath-core/api/kmath-core.api | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 70bec600d..295df69e3 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -2674,7 +2674,7 @@ public final class space/kscience/kmath/tensors/ComplexTensorStructure$DefaultIm
 public abstract interface class space/kscience/kmath/tensors/LinearOpsTensorAlgebra : space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
 	public abstract fun cholesky (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun inv (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun lu (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lkotlin/Pair;
+	public abstract fun lu (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Pair;
 	public abstract fun luPivot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
 	public abstract fun qr (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun svd (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
@@ -2884,10 +2884,14 @@ public final class space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebr
 	public fun <init> ()V
 	public synthetic fun cholesky (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun cholesky (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun det (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public fun det (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public final fun detLU (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun inv (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun inv (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun lu (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lkotlin/Pair;
-	public fun lu (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lkotlin/Pair;
+	public final fun invLU (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun lu (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Pair;
+	public fun lu (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lkotlin/Pair;
 	public synthetic fun luPivot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
 	public fun luPivot (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/IntTensor;)Lkotlin/Triple;
 	public synthetic fun qr (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-- 
2.34.1


From f70f60c0e8d5a3c830bc1ce577a63fa5ddfad290 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 24 Mar 2021 15:58:25 +0000
Subject: [PATCH 059/713] Moved det to LinearOps

---
 kmath-core/api/kmath-core.api                 |  4 +--
 .../kmath/tensors/LinearOpsTensorAlgebra.kt   |  3 ++
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  3 --
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 28 -------------------
 4 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 295df69e3..502628920 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -2673,6 +2673,7 @@ public final class space/kscience/kmath/tensors/ComplexTensorStructure$DefaultIm
 
 public abstract interface class space/kscience/kmath/tensors/LinearOpsTensorAlgebra : space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
 	public abstract fun cholesky (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun det (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun inv (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun lu (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Pair;
 	public abstract fun luPivot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
@@ -2706,7 +2707,6 @@ public abstract interface class space/kscience/kmath/tensors/TensorAlgebra {
 	public abstract fun copy (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun cumprod (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun cumsum (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun det (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun diagonalEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;III)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun dot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun eye (I)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -2958,8 +2958,6 @@ public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscie
 	public fun cumprod (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun cumsum (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun cumsum (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun det (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun det (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun diagonalEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;III)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun diagonalEmbedding (Lspace/kscience/kmath/tensors/core/DoubleTensor;III)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun div (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
index e412af7c6..3d1625a50 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
@@ -4,6 +4,9 @@ package space.kscience.kmath.tensors
 public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>, IndexTensorType: TensorStructure<Int>> :
     TensorPartialDivisionAlgebra<T, TensorType> {
 
+    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.det
+    public fun TensorType.det(): TensorType
+
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.inv
     public fun TensorType.inv(): TensorType
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index e41b7546c..702dc15e2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -52,9 +52,6 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     public fun TensorType.view(shape: IntArray): TensorType
     public fun TensorType.viewAs(other: TensorType): TensorType
 
-    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.det
-    public fun TensorType.det(): TensorType
-
     //https://pytorch.org/docs/stable/generated/torch.abs.html
     public fun TensorType.abs(): TensorType
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 3ac09c8c7..df4a32bd8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -320,34 +320,6 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         TODO("Not yet implemented")
     }
 
-    override fun DoubleTensor.det(): DoubleTensor {
-        TODO()
-        /*
-        checkSquareMatrix(shape)
-
-        val n = shape.size
-        val m = shape.last()
-
-        val detTensorShape = IntArray(n - 1) { i -> shape[i] }
-        detTensorShape[n - 1] = 1
-        val resBuffer =  DoubleArray(detTensorShape.reduce(Int::times)) { 0.0 }
-
-        val detTensor = DoubleTensor(
-            detTensorShape,
-            resBuffer
-        )
-
-        this.matrixSequence().forEachIndexed{i, matrix ->
-            // todo need Matrix determinant algo
-            // todo resBuffer[i] = matrix.det()
-        }
-
-
-        return detTensor
-
-         */
-    }
-
     override fun DoubleTensor.square(): DoubleTensor {
         TODO("Not yet implemented")
     }
-- 
2.34.1


From 94b5afa6c475c4595ecb602f3ac1b66938ab04e6 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 24 Mar 2021 18:39:40 +0000
Subject: [PATCH 060/713] eq moved to interface

---
 .../kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt      | 4 ++++
 .../space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt  | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 702dc15e2..37c6a34f8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -1,5 +1,7 @@
 package space.kscience.kmath.tensors
 
+import space.kscience.kmath.tensors.core.DoubleTensor
+
 // https://proofwiki.org/wiki/Definition:Algebra_over_Ring
 public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
@@ -52,6 +54,8 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     public fun TensorType.view(shape: IntArray): TensorType
     public fun TensorType.viewAs(other: TensorType): TensorType
 
+    public fun TensorType.eq(other: TensorType, delta: T): Boolean
+
     //https://pytorch.org/docs/stable/generated/torch.abs.html
     public fun TensorType.abs(): TensorType
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index df4a32bd8..0c82ec9c8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -344,10 +344,12 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return this.contentEquals(other) { x, y -> abs(x - y) < delta }
     }
 
-    public fun DoubleTensor.eq(other: DoubleTensor, delta: Double = 1e-5): Boolean {
+    override fun DoubleTensor.eq(other: DoubleTensor, delta: Double): Boolean {
         return this.eq(other) { x, y -> abs(x - y) < delta }
     }
 
+    public fun DoubleTensor.eq(other: DoubleTensor): Boolean = this.eq(other, 1e-5)
+
     public fun DoubleTensor.contentEquals(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
         if (!(this.shape contentEquals other.shape)) {
             return false
-- 
2.34.1


From daa077718299839d80256ef1705cb48f31d36c9f Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 24 Mar 2021 18:43:03 +0000
Subject: [PATCH 061/713] removed unused code

---
 .../kscience/kmath/tensors/core/checks.kt     | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index ec7a123a9..c644a295c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -34,26 +34,6 @@ internal inline fun <T, TensorType : TensorStructure<T>,
     }
 
 
-internal inline fun <T, TensorType : TensorStructure<T>,
-        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
-        TorchTensorAlgebraType.checkDot(a: TensorType, b: TensorType): Unit {
-    val sa = a.shape
-    val sb = b.shape
-    val na = sa.size
-    val nb = sb.size
-    var status: Boolean
-    if (nb == 1) {
-        status = sa.last() == sb[0]
-    } else {
-        status = sa.last() == sb[nb - 2]
-        if ((na > 2) and (nb > 2)) {
-            status = status and
-                    (sa.take(nb - 2).toIntArray() contentEquals sb.take(nb - 2).toIntArray())
-        }
-    }
-    check(status) { "Incompatible shapes ${sa.toList()} and ${sb.toList()} provided for dot product" }
-}
-
 internal inline fun <T, TensorType : TensorStructure<T>,
         TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
         TorchTensorAlgebraType.checkTranspose(dim: Int, i: Int, j: Int): Unit =
-- 
2.34.1


From 1056fc7200b5fbbb03b75c66ca09c30483f12e5c Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 26 Mar 2021 13:48:59 +0000
Subject: [PATCH 062/713] Test for scalar product

---
 .../kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 2da79382f..d77f33f9d 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -70,4 +70,14 @@ class TestDoubleLinearOpsTensorAlgebra {
         assertTrue { invTensor.shape contentEquals expectedShape }
         assertTrue { invTensor.buffer.array().epsEqual(expectedBuffer) }
     }
+
+    @Test
+    fun testScalarProduct() = DoubleLinearOpsTensorAlgebra {
+        val a = fromArray(intArrayOf(3), doubleArrayOf(1.8,2.5, 6.8))
+        val b = fromArray(intArrayOf(3), doubleArrayOf(5.5,2.6, 6.4))
+        DoubleReduceOpsTensorAlgebra {
+            assertEquals(a.dot(b).value(), 59.92)
+        }
+
+    }
 }
-- 
2.34.1


From 9162867fc28a4e948b0a520c67fca6cdf20ce53e Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 26 Mar 2021 14:37:27 +0000
Subject: [PATCH 063/713] Mutable structures 2D functionality added

---
 kmath-core/api/kmath-core.api                 | 17 ++++++++++++--
 .../kscience/kmath/linear/LinearSpace.kt      |  1 +
 .../space/kscience/kmath/nd/Structure2D.kt    | 14 ++++++++++++
 .../space/kscience/kmath/structures/Buffer.kt | 22 +++++++++++++++----
 .../tensors/TensorPartialDivisionAlgebra.kt   |  4 ++--
 5 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 502628920..a109aaab5 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -984,6 +984,8 @@ public final class space/kscience/kmath/nd/MutableStructure1D$DefaultImpls {
 }
 
 public abstract interface class space/kscience/kmath/nd/MutableStructure2D : space/kscience/kmath/nd/MutableStructureND, space/kscience/kmath/nd/Structure2D {
+	public abstract fun getColumns ()Ljava/util/List;
+	public abstract fun getRows ()Ljava/util/List;
 	public abstract fun set (IILjava/lang/Object;)V
 }
 
@@ -2608,6 +2610,15 @@ public final class space/kscience/kmath/structures/VirtualBuffer : space/kscienc
 	public fun iterator ()Ljava/util/Iterator;
 }
 
+public final class space/kscience/kmath/structures/VirtualMutableBuffer : space/kscience/kmath/structures/MutableBuffer {
+	public fun <init> (ILkotlin/jvm/functions/Function1;)V
+	public fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
+	public fun get (I)Ljava/lang/Object;
+	public fun getSize ()I
+	public fun iterator ()Ljava/util/Iterator;
+	public fun set (ILjava/lang/Object;)V
+}
+
 public abstract interface class space/kscience/kmath/tensors/AnalyticTensorAlgebra : space/kscience/kmath/tensors/OrderedTensorAlgebra, space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
 	public abstract fun acos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun acosh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -2709,6 +2720,7 @@ public abstract interface class space/kscience/kmath/tensors/TensorAlgebra {
 	public abstract fun cumsum (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun diagonalEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;III)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun dot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun eq (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Z
 	public abstract fun eye (I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun flatten (Lspace/kscience/kmath/nd/MutableStructureND;II)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun full (Ljava/lang/Object;[I)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -2970,9 +2982,10 @@ public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscie
 	public fun divAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
 	public synthetic fun dot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun dot (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public final fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Z
+	public synthetic fun eq (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Z
+	public final fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Z
+	public fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Z
 	public final fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lkotlin/jvm/functions/Function2;)Z
-	public static synthetic fun eq$default (Lspace/kscience/kmath/tensors/core/DoubleTensorAlgebra;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;DILjava/lang/Object;)Z
 	public synthetic fun eye (I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun eye (I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun flatten (Lspace/kscience/kmath/nd/MutableStructureND;II)Lspace/kscience/kmath/nd/MutableStructureND;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
index 6a587270b..4f2afc6fa 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
@@ -14,6 +14,7 @@ import kotlin.reflect.KClass
  * @param T the type of items.
  */
 public typealias Matrix<T> = Structure2D<T>
+public typealias MutableMatrix<T> = MutableStructure2D<T>
 
 /**
  * Alias or using [Buffer] as a point/vector in a many-dimensional space.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index d49438b2c..762b59b28 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -2,7 +2,9 @@ package space.kscience.kmath.nd
 
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.structures.VirtualBuffer
+import space.kscience.kmath.structures.VirtualMutableBuffer
 import kotlin.reflect.KClass
 
 /**
@@ -69,6 +71,18 @@ public interface MutableStructure2D<T> : Structure2D<T>, MutableStructureND<T> {
      * @param value the value.
      */
     public operator fun set(i: Int, j: Int, value: T)
+
+    /**
+     * The buffer of rows of this structure. It gets elements from the structure dynamically.
+     */
+    override val rows: List<MutableBuffer<T>>
+        get() = List(rowNum) { i -> VirtualMutableBuffer(colNum) { j -> get(i, j) } }
+
+    /**
+     * The buffer of columns of this structure. It gets elements from the structure dynamically.
+     */
+    override val columns: List<MutableBuffer<T>>
+        get() = List(colNum) { j -> VirtualMutableBuffer(rowNum) { i -> get(i, j) } }
 }
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index c85c6c5e3..72a6e3cae 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -223,11 +223,7 @@ public inline class MutableListBuffer<T>(public val list: MutableList<T>) : Muta
 }
 
 /**
-<<<<<<< HEAD
  * Returns an [MutableListBuffer] that wraps the original list.
-=======
- * Returns an [ListBuffer] that wraps the original list.
->>>>>>> dev
  */
 public fun <T> MutableList<T>.asMutableBuffer(): MutableListBuffer<T> = MutableListBuffer(this)
 
@@ -286,6 +282,24 @@ public class VirtualBuffer<T>(override val size: Int, private val generator: (In
     override operator fun iterator(): Iterator<T> = (0 until size).asSequence().map(generator).iterator()
 }
 
+public class VirtualMutableBuffer<T>(override val size: Int, private val generator: (Int) -> T) : MutableBuffer<T> {
+
+    private val bufferHolder: MutableListBuffer<T> = (0 until size).map(generator).toMutableList().asMutableBuffer()
+
+    override operator fun get(index: Int): T {
+        if (index < 0 || index >= size) throw IndexOutOfBoundsException("Expected index from 0 to ${size - 1}, but found $index")
+        return bufferHolder[index]
+    }
+
+    override operator fun iterator(): Iterator<T> = bufferHolder.iterator()
+
+    override fun set(index: Int, value: T) {
+        bufferHolder[index] = value
+    }
+
+    override fun copy(): MutableBuffer<T> = bufferHolder.copy()
+}
+
 /**
  * Convert this buffer to read-only buffer.
  */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
index 9f70f9621..54417e842 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
@@ -9,8 +9,8 @@ public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>
     public operator fun TensorType.divAssign(other: TensorType)
 
     //https://pytorch.org/docs/stable/generated/torch.mean.html#torch.mean
-    public fun TensorType.mean(dim: Int, keepDim: Boolean): TensorType
+    public fun TensorType.mean(dim: Int = 0, keepDim: Boolean = false): TensorType
 
     //https://pytorch.org/docs/stable/generated/torch.var.html#torch.var
-    public fun TensorType.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): TensorType
+    public fun TensorType.variance(dim: Int = 0, unbiased: Boolean = true, keepDim: Boolean = false): TensorType
 }
-- 
2.34.1


From 1f19ac88aee34ed5b790356a81f762b21c1752f3 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Fri, 26 Mar 2021 17:43:08 +0300
Subject: [PATCH 064/713] qr fix

---
 .../kmath/tensors/LinearOpsTensorAlgebra.kt        |  2 +-
 .../tensors/core/DoubleLinearOpsTensorAlgebra.kt   | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
index 3d1625a50..d980c510f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
@@ -14,7 +14,7 @@ public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>, Inde
     public fun TensorType.cholesky(): TensorType
 
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.qr
-    public fun TensorType.qr(): TensorType
+    public fun TensorType.qr(): Pair<TensorType, TensorType>
 
     //https://pytorch.org/docs/stable/generated/torch.lu.html
     public fun TensorType.lu(): Pair<TensorType, IndexTensorType>
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 0b9d824f0..d49fc941a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -1,8 +1,10 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.linear.Matrix
 import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.Structure1D
 import space.kscience.kmath.nd.Structure2D
+import space.kscience.kmath.nd.asND
 import space.kscience.kmath.tensors.LinearOpsTensorAlgebra
 import kotlin.math.sqrt
 
@@ -141,7 +143,15 @@ public class DoubleLinearOpsTensorAlgebra :
         return lTensor
     }
 
-    override fun DoubleTensor.qr(): DoubleTensor {
+    private fun matrixQR(
+        matrix: Structure2D<Double>,
+        q: MutableStructure2D<Double>,
+        r: MutableStructure2D<Double>
+    ) {
+
+    }
+
+    override fun DoubleTensor.qr(): Pair<DoubleTensor, DoubleTensor> {
         TODO("ANDREI")
     }
 
@@ -154,6 +164,7 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     private fun luMatrixDet(lu: Structure2D<Double>, pivots: Structure1D<Int>): Double {
+        // todo check
         val m = lu.shape[0]
         val sign = if((pivots[m] - m) % 2 == 0) 1.0 else -1.0
         return (0 until m).asSequence().map { lu[it, it] }.fold(sign) { left, right -> left * right }
@@ -184,6 +195,7 @@ public class DoubleLinearOpsTensorAlgebra :
         pivots: Structure1D<Int>,
         invMatrix : MutableStructure2D<Double>
     ): Unit {
+        //todo check
         val m = lu.shape[0]
 
         for (j in 0 until m) {
-- 
2.34.1


From a6354623ec08bb0c66d1e2a45eacde3b08e29c57 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 26 Mar 2021 15:06:05 +0000
Subject: [PATCH 065/713] returning cols/rows as vectors

---
 kmath-core/api/kmath-core.api                     |  5 +++++
 .../kotlin/space/kscience/kmath/nd/Structure1D.kt | 15 +++++++++++++++
 .../kotlin/space/kscience/kmath/nd/Structure2D.kt |  8 ++++----
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index a109aaab5..0a3e3721d 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -2768,6 +2768,11 @@ public abstract interface class space/kscience/kmath/tensors/TensorPartialDivisi
 	public abstract fun variance (Lspace/kscience/kmath/nd/MutableStructureND;IZZ)Lspace/kscience/kmath/nd/MutableStructureND;
 }
 
+public final class space/kscience/kmath/tensors/TensorPartialDivisionAlgebra$DefaultImpls {
+	public static synthetic fun mean$default (Lspace/kscience/kmath/tensors/TensorPartialDivisionAlgebra;Lspace/kscience/kmath/nd/MutableStructureND;IZILjava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public static synthetic fun variance$default (Lspace/kscience/kmath/tensors/TensorPartialDivisionAlgebra;Lspace/kscience/kmath/nd/MutableStructureND;IZZILjava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
+}
+
 public final class space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra {
 	public fun <init> ()V
 	public synthetic fun div (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index c157f9a2f..354f3d802 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -71,6 +71,21 @@ private inline class Buffer1DWrapper<T>(val buffer: Buffer<T>) : Structure1D<T>
     override operator fun get(index: Int): T = buffer[index]
 }
 
+internal inline class MutableBuffer1DWrapper<T>(val buffer: MutableBuffer<T>) : MutableStructure1D<T> {
+    override val shape: IntArray get() = intArrayOf(buffer.size)
+    override val size: Int get() = buffer.size
+
+    override fun elements(): Sequence<Pair<IntArray, T>> =
+        buffer.asSequence().mapIndexed { index, value -> intArrayOf(index) to value }
+
+    override operator fun get(index: Int): T = buffer[index]
+    override fun set(index: Int, value: T) {
+        buffer[index] = value
+    }
+
+    override fun copy(): MutableBuffer<T> = buffer.copy()
+}
+
 /**
  * Represent a [StructureND] as [Structure1D]. Throw error in case of dimension mismatch
  */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index 762b59b28..e1a1d37de 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -75,14 +75,14 @@ public interface MutableStructure2D<T> : Structure2D<T>, MutableStructureND<T> {
     /**
      * The buffer of rows of this structure. It gets elements from the structure dynamically.
      */
-    override val rows: List<MutableBuffer<T>>
-        get() = List(rowNum) { i -> VirtualMutableBuffer(colNum) { j -> get(i, j) } }
+    override val rows: List<MutableStructure1D<T>>
+        get() = List(rowNum) { i -> MutableBuffer1DWrapper(VirtualMutableBuffer(colNum) { j -> get(i, j) })}
 
     /**
      * The buffer of columns of this structure. It gets elements from the structure dynamically.
      */
-    override val columns: List<MutableBuffer<T>>
-        get() = List(colNum) { j -> VirtualMutableBuffer(rowNum) { i -> get(i, j) } }
+    override val columns: List<MutableStructure1D<T>>
+        get() = List(colNum) { j -> MutableBuffer1DWrapper(VirtualMutableBuffer(rowNum) { i -> get(i, j) }) }
 }
 
 /**
-- 
2.34.1


From 1588b5d94ff751fdf2d1d91686173068430723cd Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 26 Mar 2021 15:09:18 +0000
Subject: [PATCH 066/713] once mutable stay it and enjoy

---
 .../kotlin/space/kscience/kmath/nd/Structure2D.kt         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index e1a1d37de..8e41110fe 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -75,14 +75,14 @@ public interface MutableStructure2D<T> : Structure2D<T>, MutableStructureND<T> {
     /**
      * The buffer of rows of this structure. It gets elements from the structure dynamically.
      */
-    override val rows: List<MutableStructure1D<T>>
-        get() = List(rowNum) { i -> MutableBuffer1DWrapper(VirtualMutableBuffer(colNum) { j -> get(i, j) })}
+    override val rows: MutableList<MutableStructure1D<T>>
+        get() = MutableList(rowNum) { i -> MutableBuffer1DWrapper(VirtualMutableBuffer(colNum) { j -> get(i, j) })}
 
     /**
      * The buffer of columns of this structure. It gets elements from the structure dynamically.
      */
-    override val columns: List<MutableStructure1D<T>>
-        get() = List(colNum) { j -> MutableBuffer1DWrapper(VirtualMutableBuffer(rowNum) { i -> get(i, j) }) }
+    override val columns: MutableList<MutableStructure1D<T>>
+        get() = MutableList(colNum) { j -> MutableBuffer1DWrapper(VirtualMutableBuffer(rowNum) { i -> get(i, j) }) }
 }
 
 /**
-- 
2.34.1


From e03910354e5ba02b6ec5551357ba629fa8cd8cca Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 26 Mar 2021 15:14:23 +0000
Subject: [PATCH 067/713] ok reverting

---
 .../kotlin/space/kscience/kmath/nd/Structure2D.kt         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index 8e41110fe..e1a1d37de 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -75,14 +75,14 @@ public interface MutableStructure2D<T> : Structure2D<T>, MutableStructureND<T> {
     /**
      * The buffer of rows of this structure. It gets elements from the structure dynamically.
      */
-    override val rows: MutableList<MutableStructure1D<T>>
-        get() = MutableList(rowNum) { i -> MutableBuffer1DWrapper(VirtualMutableBuffer(colNum) { j -> get(i, j) })}
+    override val rows: List<MutableStructure1D<T>>
+        get() = List(rowNum) { i -> MutableBuffer1DWrapper(VirtualMutableBuffer(colNum) { j -> get(i, j) })}
 
     /**
      * The buffer of columns of this structure. It gets elements from the structure dynamically.
      */
-    override val columns: MutableList<MutableStructure1D<T>>
-        get() = MutableList(colNum) { j -> MutableBuffer1DWrapper(VirtualMutableBuffer(rowNum) { i -> get(i, j) }) }
+    override val columns: List<MutableStructure1D<T>>
+        get() = List(colNum) { j -> MutableBuffer1DWrapper(VirtualMutableBuffer(rowNum) { i -> get(i, j) }) }
 }
 
 /**
-- 
2.34.1


From 516cd90677700d3f49096194bffa2cfd17ea78eb Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 26 Mar 2021 15:36:53 +0000
Subject: [PATCH 068/713] Moved out to archive unimplemented API

---
 kmath-core/api/kmath-core.api                 | 160 +-----------------
 .../kmath/tensors/AnalyticTensorAlgebra.kt    |  63 +------
 .../kmath/tensors/ComplexTensorAlgebra.kt     |  53 ------
 .../kmath/tensors/ComplexTensorStructure.kt   |  14 --
 .../kmath/tensors/OrderedTensorAlgebra.kt     |  29 ----
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  26 ---
 .../tensors/TensorPartialDivisionAlgebra.kt   |   6 -
 .../core/DoubleAnalyticTensorAlgebra.kt       |  83 +--------
 .../core/DoubleOrderedTensorAlgebra.kt        |  43 -----
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  43 -----
 10 files changed, 4 insertions(+), 516 deletions(-)
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorStructure.kt
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/OrderedTensorAlgebra.kt
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleOrderedTensorAlgebra.kt

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 0a3e3721d..a45f00a55 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -2619,7 +2619,7 @@ public final class space/kscience/kmath/structures/VirtualMutableBuffer : space/
 	public fun set (ILjava/lang/Object;)V
 }
 
-public abstract interface class space/kscience/kmath/tensors/AnalyticTensorAlgebra : space/kscience/kmath/tensors/OrderedTensorAlgebra, space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
+public abstract interface class space/kscience/kmath/tensors/AnalyticTensorAlgebra : space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
 	public abstract fun acos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun acosh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun asin (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -2627,59 +2627,16 @@ public abstract interface class space/kscience/kmath/tensors/AnalyticTensorAlgeb
 	public abstract fun atan (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun atanh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun ceil (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun clamp (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun cos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun cosh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun erf (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun erfc (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun erfinv (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun exp (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun floor (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun heaviside (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun histc (Lspace/kscience/kmath/nd/MutableStructureND;ILjava/lang/Object;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun igamma (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun igammac (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun lerp (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun lgamma (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun log (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun logit (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun mvlgamma (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun polygamma (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun pow (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun quantile (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun round (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun sigmoid (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun sin (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun sinc (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun sinh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun sqrt (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun std (Lspace/kscience/kmath/nd/MutableStructureND;IZZ)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun tan (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun tanh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun trapz (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-}
-
-public abstract interface class space/kscience/kmath/tensors/ComplexTensorAlgebra : space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
-	public abstract fun angle (Lspace/kscience/kmath/tensors/ComplexTensorStructure;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun bartlettWindow (IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun blackmanWindow (IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun cartesianEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/tensors/ComplexTensorStructure;
-	public abstract fun hammingWindow (IZLjava/lang/Object;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun inverseShortTimeFourierTransform (Lspace/kscience/kmath/tensors/ComplexTensorStructure;IIILspace/kscience/kmath/nd/MutableStructureND;ZZZI)V
-	public abstract fun kaiserWindow (IZLjava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun polarEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/tensors/ComplexTensorStructure;
-	public abstract fun shortTimeFourierTransform (Lspace/kscience/kmath/tensors/ComplexTensorStructure;IIILspace/kscience/kmath/nd/MutableStructureND;ZZ)V
-	public abstract fun viewAsComplex (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/tensors/ComplexTensorStructure;
-}
-
-public abstract interface class space/kscience/kmath/tensors/ComplexTensorStructure : space/kscience/kmath/nd/MutableStructureND {
-	public abstract fun imaginaryPart ()Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun realPart ()Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun viewAsReal ()Lspace/kscience/kmath/nd/MutableStructureND;
-}
-
-public final class space/kscience/kmath/tensors/ComplexTensorStructure$DefaultImpls {
-	public static fun getDimension (Lspace/kscience/kmath/tensors/ComplexTensorStructure;)I
 }
 
 public abstract interface class space/kscience/kmath/tensors/LinearOpsTensorAlgebra : space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
@@ -2697,32 +2654,16 @@ public final class space/kscience/kmath/tensors/LinearOpsTensorAlgebra$DefaultIm
 	public static synthetic fun symEig$default (Lspace/kscience/kmath/tensors/LinearOpsTensorAlgebra;Lspace/kscience/kmath/nd/MutableStructureND;ZILjava/lang/Object;)Lkotlin/Pair;
 }
 
-public abstract interface class space/kscience/kmath/tensors/OrderedTensorAlgebra : space/kscience/kmath/tensors/TensorAlgebra {
-	public abstract fun cummax (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun cummin (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun max (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun maximum (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public abstract fun median (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun min (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun minimum (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public abstract fun sort (Lspace/kscience/kmath/nd/MutableStructureND;IZZ)Lspace/kscience/kmath/nd/MutableStructureND;
-}
-
 public abstract interface class space/kscience/kmath/tensors/ReduceOpsTensorAlgebra : space/kscience/kmath/tensors/TensorAlgebra {
 	public abstract fun value (Lspace/kscience/kmath/nd/MutableStructureND;)Ljava/lang/Object;
 }
 
 public abstract interface class space/kscience/kmath/tensors/TensorAlgebra {
-	public abstract fun abs (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun cat (Ljava/util/List;I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun copy (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun cumprod (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun cumsum (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun diagonalEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;III)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun dot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun eq (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Z
 	public abstract fun eye (I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun flatten (Lspace/kscience/kmath/nd/MutableStructureND;II)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun full (Ljava/lang/Object;[I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun fullLike (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun get (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -2738,10 +2679,6 @@ public abstract interface class space/kscience/kmath/tensors/TensorAlgebra {
 	public abstract fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun plusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
 	public abstract fun plusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public abstract fun prod (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun square (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun squeeze (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun sum (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun times (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun times (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun times (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -2764,13 +2701,6 @@ public abstract interface class space/kscience/kmath/tensors/TensorPartialDivisi
 	public abstract fun div (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun divAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
 	public abstract fun divAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public abstract fun mean (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun variance (Lspace/kscience/kmath/nd/MutableStructureND;IZZ)Lspace/kscience/kmath/nd/MutableStructureND;
-}
-
-public final class space/kscience/kmath/tensors/TensorPartialDivisionAlgebra$DefaultImpls {
-	public static synthetic fun mean$default (Lspace/kscience/kmath/tensors/TensorPartialDivisionAlgebra;Lspace/kscience/kmath/nd/MutableStructureND;IZILjava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public static synthetic fun variance$default (Lspace/kscience/kmath/tensors/TensorPartialDivisionAlgebra;Lspace/kscience/kmath/nd/MutableStructureND;IZZILjava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
 }
 
 public final class space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra {
@@ -2815,7 +2745,7 @@ public class space/kscience/kmath/tensors/core/BufferedTensor : space/kscience/k
 	public final fun vectorSequence ()Lkotlin/sequences/Sequence;
 }
 
-public final class space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra : space/kscience/kmath/tensors/core/DoubleOrderedTensorAlgebra, space/kscience/kmath/tensors/AnalyticTensorAlgebra {
+public final class space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra, space/kscience/kmath/tensors/AnalyticTensorAlgebra {
 	public fun <init> ()V
 	public synthetic fun acos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun acos (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
@@ -2831,66 +2761,26 @@ public final class space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra
 	public fun atanh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun ceil (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun ceil (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun clamp (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun clamp (Lspace/kscience/kmath/tensors/core/DoubleTensor;DD)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun cos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun cos (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun cosh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun cosh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun erf (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun erf (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun erfc (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun erfc (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun erfinv (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun erfinv (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun exp (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun exp (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun floor (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun floor (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun heaviside (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun heaviside (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun histc (Lspace/kscience/kmath/nd/MutableStructureND;ILjava/lang/Object;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun histc (Lspace/kscience/kmath/tensors/core/DoubleTensor;IDD)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun igamma (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun igamma (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun igammac (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun igammac (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun lerp (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun lerp (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun lgamma (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun lgamma (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun log (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun log (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun logit (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun logit (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun mvlgamma (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun mvlgamma (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun polygamma (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun polygamma (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun pow (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun pow (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun quantile (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun quantile (Lspace/kscience/kmath/tensors/core/DoubleTensor;DIZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun round (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun round (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun sigmoid (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun sigmoid (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun sin (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun sin (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun sinc (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun sinc (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun sinh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun sinh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun sqrt (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun sqrt (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun std (Lspace/kscience/kmath/nd/MutableStructureND;IZZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun std (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun tan (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun tan (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun tanh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun tanh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun trapz (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun trapz (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 }
 
 public final class space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebraKt {
@@ -2923,30 +2813,6 @@ public final class space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebr
 	public static final fun DoubleLinearOpsTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
-public class space/kscience/kmath/tensors/core/DoubleOrderedTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra, space/kscience/kmath/tensors/OrderedTensorAlgebra {
-	public fun <init> ()V
-	public synthetic fun cummax (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun cummax (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun cummin (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun cummin (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun max (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun max (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun maximum (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public fun maximum (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
-	public synthetic fun median (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun median (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun min (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun min (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun minimum (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public fun minimum (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
-	public synthetic fun sort (Lspace/kscience/kmath/nd/MutableStructureND;IZZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun sort (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-}
-
-public final class space/kscience/kmath/tensors/core/DoubleOrderedTensorAlgebraKt {
-	public static final fun DoubleOrderedTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
-}
-
 public final class space/kscience/kmath/tensors/core/DoubleReduceOpsTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra, space/kscience/kmath/tensors/ReduceOpsTensorAlgebra {
 	public fun <init> ()V
 	public synthetic fun value (Lspace/kscience/kmath/nd/MutableStructureND;)Ljava/lang/Object;
@@ -2962,19 +2828,11 @@ public final class space/kscience/kmath/tensors/core/DoubleTensor : space/kscien
 
 public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
 	public fun <init> ()V
-	public synthetic fun abs (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun abs (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun cat (Ljava/util/List;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun cat (Ljava/util/List;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public final fun contentEquals (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Z
 	public final fun contentEquals (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lkotlin/jvm/functions/Function2;)Z
 	public static synthetic fun contentEquals$default (Lspace/kscience/kmath/tensors/core/DoubleTensorAlgebra;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;DILjava/lang/Object;)Z
 	public synthetic fun copy (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun copy (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun cumprod (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun cumprod (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun cumsum (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun cumsum (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun diagonalEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;III)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun diagonalEmbedding (Lspace/kscience/kmath/tensors/core/DoubleTensor;III)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun div (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -2993,8 +2851,6 @@ public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscie
 	public final fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lkotlin/jvm/functions/Function2;)Z
 	public synthetic fun eye (I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun eye (I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun flatten (Lspace/kscience/kmath/nd/MutableStructureND;II)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun flatten (Lspace/kscience/kmath/tensors/core/DoubleTensor;II)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public final fun fromArray ([I[D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public fun full (D[I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun full (Ljava/lang/Object;[I)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -3003,8 +2859,6 @@ public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscie
 	public synthetic fun get (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun get (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public final fun map (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun mean (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun mean (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public fun minus (DLspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun minus (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public synthetic fun minus (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -3029,14 +2883,6 @@ public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscie
 	public synthetic fun plusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
 	public fun plusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)V
 	public fun plusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
-	public synthetic fun prod (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun prod (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun square (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun square (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun squeeze (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun squeeze (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun sum (Lspace/kscience/kmath/nd/MutableStructureND;IZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun sum (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public fun times (DLspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun times (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public synthetic fun times (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -3051,8 +2897,6 @@ public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscie
 	public fun transpose (Lspace/kscience/kmath/tensors/core/DoubleTensor;II)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun unaryMinus (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun unaryMinus (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun variance (Lspace/kscience/kmath/nd/MutableStructureND;IZZ)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun variance (Lspace/kscience/kmath/tensors/core/DoubleTensor;IZZ)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun view (Lspace/kscience/kmath/nd/MutableStructureND;[I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun view (Lspace/kscience/kmath/tensors/core/DoubleTensor;[I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun viewAs (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
index c3a558298..fa1de81fa 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
@@ -2,14 +2,7 @@ package space.kscience.kmath.tensors
 
 
 public interface AnalyticTensorAlgebra<T, TensorType : TensorStructure<T>> :
-    TensorPartialDivisionAlgebra<T, TensorType>,
-    OrderedTensorAlgebra<T, TensorType>{
-
-    //https://pytorch.org/docs/stable/generated/torch.quantile.html#torch.quantile
-    public fun TensorType.quantile(q: T, dim: Int, keepDim: Boolean): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.std.html#torch.std
-    public fun TensorType.std(dim: Int, unbiased: Boolean, keepDim: Boolean): TensorType
+    TensorPartialDivisionAlgebra<T, TensorType> {
 
     //https://pytorch.org/docs/stable/generated/torch.exp.html
     public fun TensorType.exp(): TensorType
@@ -62,58 +55,4 @@ public interface AnalyticTensorAlgebra<T, TensorType : TensorStructure<T>> :
     //https://pytorch.org/docs/stable/generated/torch.floor.html#torch.floor
     public fun TensorType.floor(): TensorType
 
-    //https://pytorch.org/docs/stable/generated/torch.clamp.html#torch.clamp
-    public fun TensorType.clamp(min: T, max: T): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.erf.html#torch.erf
-    public fun TensorType.erf(): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.erfinv.html#torch.erfinv
-    public fun TensorType.erfinv(): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.erfc.html#torch.erfc
-    public fun TensorType.erfc(): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.lerp.html#torch.lerp
-    public fun TensorType.lerp(end: TensorType, weight: TensorType): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.lgamma.html#torch.lgamma
-    public fun TensorType.lgamma(): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.logit.html#torch.logit
-    public fun TensorType.logit(eps: T): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.igamma.html#torch.igamma
-    public fun TensorType.igamma(other: TensorType): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.igammac.html#torch.igammac
-    public fun TensorType.igammac(other: TensorType): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.mvlgamma.html#torch.mvlgamma
-    public fun TensorType.mvlgamma(dimensions: Int): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.polygamma.html#torch.polygamma
-    public fun TensorType.polygamma(order: Int): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.pow.html#torch.pow
-    public fun TensorType.pow(exponent: T): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.round.html#torch.round
-    public fun TensorType.round(): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.sigmoid.html#torch.sigmoid
-    public fun TensorType.sigmoid(): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.sinc.html#torch.sinc
-    public fun TensorType.sinc(): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.heaviside.html#torch.heaviside
-    public fun TensorType.heaviside(values: TensorType): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.trapz.html#torch.trapz
-    public fun TensorType.trapz(xValues: TensorType, dim: Int): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.histc.html#torch.histc
-    public fun TensorType.histc(bins: Int, min: T, max: T): TensorType
-
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt
deleted file mode 100644
index e56920916..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorAlgebra.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package space.kscience.kmath.tensors
-
-public interface ComplexTensorAlgebra<T,
-        RealTensorType : TensorStructure<T>,
-        ComplexTensorType : ComplexTensorStructure<T, RealTensorType>>
-    : TensorPartialDivisionAlgebra<T, ComplexTensorType>{
-
-    //https://pytorch.org/docs/stable/generated/torch.view_as_complex.html
-    public fun RealTensorType.viewAsComplex(): ComplexTensorType
-
-    // Embed a real tensor as real + i * imaginary
-    public fun RealTensorType.cartesianEmbedding(imaginary: RealTensorType): ComplexTensorType
-
-    // Embed a real tensor as real * exp(i * angle)
-    public fun RealTensorType.polarEmbedding(angle: RealTensorType): ComplexTensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.angle.html
-    public fun ComplexTensorType.angle(): RealTensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.stft.html#torch.stft
-    public fun ComplexTensorType.shortTimeFourierTransform(
-        nFFT: Int,
-        hopLength: Int,
-        winLength: Int,
-        window: RealTensorType,
-        normalised: Boolean,
-        oneSided: Boolean
-    )
-
-    //https://pytorch.org/docs/stable/generated/torch.istft.html#torch.istft
-    public fun ComplexTensorType.inverseShortTimeFourierTransform(
-        nFFT: Int,
-        hopLength: Int,
-        winLength: Int,
-        window: RealTensorType,
-        center: Boolean,
-        normalised: Boolean,
-        oneSided: Boolean,
-        length: Int
-    )
-
-    //https://pytorch.org/docs/stable/generated/torch.bartlett_window.html#torch.bartlett_window
-    public fun bartlettWindow(windowLength: Int, periodic: Boolean): RealTensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.blackman_window.html#torch.blackman_window
-    public fun blackmanWindow(windowLength: Int, periodic: Boolean): RealTensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.hamming_window.html#torch.hamming_window
-    public fun hammingWindow(windowLength: Int, periodic: Boolean, alpha: T, beta: T): RealTensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.kaiser_window.html#torch.kaiser_window
-    public fun kaiserWindow(windowLength: Int, periodic: Boolean, beta: T): RealTensorType
-}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorStructure.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorStructure.kt
deleted file mode 100644
index 0e0975830..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ComplexTensorStructure.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package space.kscience.kmath.tensors
-
-public interface ComplexTensorStructure<T, RealTensorType: TensorStructure<T>> : TensorStructure<T> {
-
-    //https://pytorch.org/docs/master/generated/torch.view_as_real.html
-    public fun viewAsReal(): RealTensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.real.html
-    public fun realPart(): RealTensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.imag.html
-    public fun imaginaryPart(): RealTensorType
-
-}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/OrderedTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/OrderedTensorAlgebra.kt
deleted file mode 100644
index 3320c3a1e..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/OrderedTensorAlgebra.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package space.kscience.kmath.tensors
-
-public interface OrderedTensorAlgebra<T, TensorType : TensorStructure<T>> :
-    TensorAlgebra<T, TensorType> {
-
-    //https://pytorch.org/docs/stable/generated/torch.max.html#torch.max
-    public fun TensorType.max(dim: Int, keepDim: Boolean): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.cummax.html#torch.cummax
-    public fun TensorType.cummax(dim: Int): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.min.html#torch.min
-    public fun TensorType.min(dim: Int, keepDim: Boolean): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.cummin.html#torch.cummin
-    public fun TensorType.cummin(dim: Int): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.median.html#torch.median
-    public fun TensorType.median(dim: Int, keepDim: Boolean): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.maximum.html#torch.maximum
-    public fun maximum(lhs: TensorType, rhs: TensorType)
-
-    //https://pytorch.org/docs/stable/generated/torch.minimum.html#torch.minimum
-    public fun minimum(lhs: TensorType, rhs: TensorType)
-
-    //https://pytorch.org/docs/stable/generated/torch.sort.html#torch.sort
-    public fun TensorType.sort(dim: Int, keepDim: Boolean, descending: Boolean): TensorType
-}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 37c6a34f8..b05105ed8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -41,9 +41,6 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     public operator fun TensorType.timesAssign(other: TensorType): Unit
     public operator fun TensorType.unaryMinus(): TensorType
 
-    //https://pytorch.org/docs/stable/generated/torch.square.html
-    public fun TensorType.square(): TensorType
-
     //https://pytorch.org/cppdocs/notes/tensor_indexing.html
     public operator fun TensorType.get(i: Int): TensorType
 
@@ -56,21 +53,6 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
     public fun TensorType.eq(other: TensorType, delta: T): Boolean
 
-    //https://pytorch.org/docs/stable/generated/torch.abs.html
-    public fun TensorType.abs(): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.sum.html
-    public fun TensorType.sum(dim: Int, keepDim: Boolean): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.cumsum.html#torch.cumsum
-    public fun TensorType.cumsum(dim: Int): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.prod.html#torch.prod
-    public fun TensorType.prod(dim: Int, keepDim: Boolean): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.cumprod.html#torch.cumprod
-    public fun TensorType.cumprod(dim: Int): TensorType
-
     //https://pytorch.org/docs/stable/generated/torch.matmul.html
     public infix fun TensorType.dot(other: TensorType): TensorType
 
@@ -80,12 +62,4 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
         offset: Int = 0, dim1: Int = -2, dim2: Int = -1
     ): TensorType
 
-    //https://pytorch.org/docs/stable/generated/torch.cat.html#torch.cat
-    public fun cat(tensors: List<TensorType>, dim: Int): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.flatten.html#torch.flatten
-    public fun TensorType.flatten(startDim: Int, endDim: Int): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.squeeze.html
-    public fun TensorType.squeeze(dim: Int): TensorType
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
index 54417e842..67b9c9d73 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
@@ -7,10 +7,4 @@ public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>
     public operator fun TensorType.div(other: TensorType): TensorType
     public operator fun TensorType.divAssign(value: T)
     public operator fun TensorType.divAssign(other: TensorType)
-
-    //https://pytorch.org/docs/stable/generated/torch.mean.html#torch.mean
-    public fun TensorType.mean(dim: Int = 0, keepDim: Boolean = false): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.var.html#torch.var
-    public fun TensorType.variance(dim: Int = 0, unbiased: Boolean = true, keepDim: Boolean = false): TensorType
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
index 1eb4c3b63..b46c7fa9c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
@@ -5,11 +5,10 @@ import kotlin.math.*
 
 public class DoubleAnalyticTensorAlgebra:
     AnalyticTensorAlgebra<Double, DoubleTensor>,
-    DoubleOrderedTensorAlgebra()
+        DoubleTensorAlgebra()
 {
     override fun DoubleTensor.exp(): DoubleTensor = this.map(::exp)
 
-    // todo log with other base????
     override fun DoubleTensor.log(): DoubleTensor = this.map(::ln)
 
     override fun DoubleTensor.sqrt(): DoubleTensor = this.map(::sqrt)
@@ -42,86 +41,6 @@ public class DoubleAnalyticTensorAlgebra:
 
     override fun DoubleTensor.floor(): DoubleTensor = this.map(::floor)
 
-    override fun DoubleTensor.clamp(min: Double, max: Double): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.erf(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.erfinv(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.erfc(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.lerp(end: DoubleTensor, weight: DoubleTensor): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.lgamma(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.logit(eps: Double): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.igamma(other: DoubleTensor): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.igammac(other: DoubleTensor): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.mvlgamma(dimensions: Int): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.polygamma(order: Int): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.pow(exponent: Double): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.round(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.sigmoid(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.sinc(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.heaviside(values: DoubleTensor): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.trapz(xValues: DoubleTensor, dim: Int): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.quantile(q: Double, dim: Int, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.std(dim: Int, unbiased: Boolean, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.histc(bins: Int, min: Double, max: Double): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
 }
 
 public inline fun <R> DoubleAnalyticTensorAlgebra(block: DoubleAnalyticTensorAlgebra.() -> R): R =
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleOrderedTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleOrderedTensorAlgebra.kt
deleted file mode 100644
index a6bea59f4..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleOrderedTensorAlgebra.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package space.kscience.kmath.tensors.core
-
-import space.kscience.kmath.tensors.OrderedTensorAlgebra
-
-public open class DoubleOrderedTensorAlgebra:
-    OrderedTensorAlgebra<Double, DoubleTensor>,
-    DoubleTensorAlgebra()
-{
-    override fun DoubleTensor.max(dim: Int, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.cummax(dim: Int): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.min(dim: Int, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.cummin(dim: Int): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.median(dim: Int, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun maximum(lhs: DoubleTensor, rhs: DoubleTensor) {
-        TODO("Not yet implemented")
-    }
-
-    override fun minimum(lhs: DoubleTensor, rhs: DoubleTensor) {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.sort(dim: Int, keepDim: Boolean, descending: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-}
-
-public inline fun <R> DoubleOrderedTensorAlgebra(block: DoubleOrderedTensorAlgebra.() -> R): R =
-    DoubleOrderedTensorAlgebra().block()
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 0c82ec9c8..0a2e8c86c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -224,26 +224,6 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return this.view(other.shape)
     }
 
-    override fun DoubleTensor.abs(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.sum(dim: Int, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.cumsum(dim: Int): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.prod(dim: Int, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.cumprod(dim: Int): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
     override fun DoubleTensor.dot(other: DoubleTensor): DoubleTensor {
         if (this.shape.size == 1 && other.shape.size == 1) {
             return DoubleTensor(intArrayOf(1), doubleArrayOf(this.times(other).buffer.array().sum()))
@@ -308,29 +288,6 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         TODO("Alya")
     }
 
-    override fun cat(tensors: List<DoubleTensor>, dim: Int): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.flatten(startDim: Int, endDim: Int): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.mean(dim: Int, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.square(): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.variance(dim: Int, unbiased: Boolean, keepDim: Boolean): DoubleTensor {
-        TODO("Not yet implemented")
-    }
-
-    override fun DoubleTensor.squeeze(dim: Int): DoubleTensor {
-        TODO("Not yet implemented")
-    }
 
     public fun DoubleTensor.map(transform: (Double) -> Double): DoubleTensor {
         return DoubleTensor(
-- 
2.34.1


From 22b68e5ca469038e8ee6c2083aafa2f54d51d032 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 26 Mar 2021 20:36:21 +0000
Subject: [PATCH 069/713] BufferedTensor2D & BufferedTensor1D

---
 kmath-core/api/kmath-core.api                 |  28 ++++
 .../kmath/tensors/core/BufferedTensor.kt      | 133 ++++++++++++++++--
 .../core/DoubleLinearOpsTensorAlgebra.kt      |  11 +-
 .../core/TestDoubleLinearOpsAlgebra.kt        |   1 -
 .../kmath/tensors/core/TestDoubleTensor.kt    |   3 -
 5 files changed, 152 insertions(+), 24 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index a45f00a55..fc0905bd0 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -2745,6 +2745,34 @@ public class space/kscience/kmath/tensors/core/BufferedTensor : space/kscience/k
 	public final fun vectorSequence ()Lkotlin/sequences/Sequence;
 }
 
+public final class space/kscience/kmath/tensors/core/BufferedTensor1D : space/kscience/kmath/tensors/core/BufferedTensor, space/kscience/kmath/nd/MutableStructure1D {
+	public fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
+	public fun get (I)Ljava/lang/Object;
+	public fun get ([I)Ljava/lang/Object;
+	public fun getDimension ()I
+	public fun getSize ()I
+	public fun iterator ()Ljava/util/Iterator;
+	public fun set (ILjava/lang/Object;)V
+	public fun set ([ILjava/lang/Object;)V
+}
+
+public final class space/kscience/kmath/tensors/core/BufferedTensor2D : space/kscience/kmath/tensors/core/BufferedTensor, space/kscience/kmath/nd/MutableStructure2D {
+	public fun elements ()Lkotlin/sequences/Sequence;
+	public fun get (II)Ljava/lang/Object;
+	public fun get ([I)Ljava/lang/Object;
+	public fun getColNum ()I
+	public fun getColumns ()Ljava/util/List;
+	public fun getRowNum ()I
+	public fun getRows ()Ljava/util/List;
+	public fun getShape ()[I
+	public fun set (IILjava/lang/Object;)V
+}
+
+public final class space/kscience/kmath/tensors/core/BufferedTensorKt {
+	public static final fun as1D (Lspace/kscience/kmath/tensors/core/BufferedTensor;)Lspace/kscience/kmath/tensors/core/BufferedTensor1D;
+	public static final fun as2D (Lspace/kscience/kmath/tensors/core/BufferedTensor;)Lspace/kscience/kmath/tensors/core/BufferedTensor2D;
+}
+
 public final class space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra, space/kscience/kmath/tensors/AnalyticTensorAlgebra {
 	public fun <init> ()V
 	public synthetic fun acos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 160c61260..aa6e58ef6 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -1,23 +1,26 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.nd.*
+import space.kscience.kmath.nd.MutableStructure1D
+import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.TensorStructure
-import kotlin.math.atanh
+
 
 
 public open class BufferedTensor<T>(
     override val shape: IntArray,
     public val buffer: MutableBuffer<T>,
     internal val bufferStart: Int
-) : TensorStructure<T>
-{
+) : TensorStructure<T> {
     public val linearStructure: TensorLinearStructure
         get() = TensorLinearStructure(shape)
 
     public val numel: Int
         get() = linearStructure.size
 
+    internal constructor(tensor: BufferedTensor<T>) :
+            this(tensor.shape, tensor.buffer, tensor.bufferStart)
+
     override fun get(index: IntArray): T = buffer[bufferStart + linearStructure.offset(index)]
 
     override fun set(index: IntArray, value: T) {
@@ -32,8 +35,8 @@ public open class BufferedTensor<T>(
 
     override fun hashCode(): Int = 0
 
-    public fun vectorSequence(): Sequence<MutableStructure1D<T>> = sequence {
-        check(shape.size >= 1) {"todo"}
+    public fun vectorSequence(): Sequence<BufferedTensor1D<T>> = sequence {
+        check(shape.size >= 1) { "todo" }
         val n = shape.size
         val vectorOffset = shape[n - 1]
         val vectorShape = intArrayOf(shape.last())
@@ -43,8 +46,8 @@ public open class BufferedTensor<T>(
         }
     }
 
-    public fun matrixSequence(): Sequence<MutableStructure2D<T>> = sequence {
-        check(shape.size >= 2) {"todo"}
+    public fun matrixSequence(): Sequence<BufferedTensor2D<T>> = sequence {
+        check(shape.size >= 2) { "todo" }
         val n = shape.size
         val matrixOffset = shape[n - 1] * shape[n - 2]
         val matrixShape = intArrayOf(shape[n - 2], shape[n - 1]) //todo better way?
@@ -54,14 +57,14 @@ public open class BufferedTensor<T>(
         }
     }
 
-    public inline fun forEachVector(vectorAction : (MutableStructure1D<T>) -> Unit): Unit {
-        for (vector in vectorSequence()){
+    public inline fun forEachVector(vectorAction: (BufferedTensor1D<T>) -> Unit): Unit {
+        for (vector in vectorSequence()) {
             vectorAction(vector)
         }
     }
 
-    public inline fun forEachMatrix(matrixAction : (MutableStructure2D<T>) -> Unit): Unit {
-        for (matrix in matrixSequence()){
+    public inline fun forEachMatrix(matrixAction: (BufferedTensor2D<T>) -> Unit): Unit {
+        for (matrix in matrixSequence()) {
             matrixAction(matrix)
         }
     }
@@ -74,21 +77,125 @@ public class IntTensor internal constructor(
     buffer: IntArray,
     offset: Int = 0
 ) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset)
+{
+    internal constructor(bufferedTensor: BufferedTensor<Int>):
+            this(bufferedTensor.shape, bufferedTensor.buffer.array(), bufferedTensor.bufferStart)
+}
 
 public class LongTensor internal constructor(
     shape: IntArray,
     buffer: LongArray,
     offset: Int = 0
 ) : BufferedTensor<Long>(shape, LongBuffer(buffer), offset)
+{
+    internal constructor(bufferedTensor: BufferedTensor<Long>):
+            this(bufferedTensor.shape, bufferedTensor.buffer.array(), bufferedTensor.bufferStart)
+}
 
 public class FloatTensor internal constructor(
     shape: IntArray,
     buffer: FloatArray,
     offset: Int = 0
 ) : BufferedTensor<Float>(shape, FloatBuffer(buffer), offset)
+{
+    internal constructor(bufferedTensor: BufferedTensor<Float>):
+            this(bufferedTensor.shape, bufferedTensor.buffer.array(), bufferedTensor.bufferStart)
+}
 
 public class DoubleTensor internal constructor(
     shape: IntArray,
     buffer: DoubleArray,
     offset: Int = 0
-) : BufferedTensor<Double>(shape, DoubleBuffer(buffer), offset)
\ No newline at end of file
+) : BufferedTensor<Double>(shape, DoubleBuffer(buffer), offset)
+{
+    internal constructor(bufferedTensor: BufferedTensor<Double>):
+            this(bufferedTensor.shape, bufferedTensor.buffer.array(), bufferedTensor.bufferStart)
+}
+
+
+public class BufferedTensor2D<T> internal constructor(
+    private val tensor: BufferedTensor<T>,
+) : BufferedTensor<T>(tensor), MutableStructure2D<T> {
+    init {
+        check(shape.size == 2) {
+            "Shape ${shape.toList()} not compatible with DoubleTensor2D"
+        }
+    }
+
+    override val shape: IntArray
+        get() = tensor.shape
+
+    override val rowNum: Int
+        get() = shape[0]
+    override val colNum: Int
+        get() = shape[1]
+
+    override fun get(i: Int, j: Int): T = tensor[intArrayOf(i, j)]
+
+    override fun get(index: IntArray): T = tensor[index]
+
+    override fun elements(): Sequence<Pair<IntArray, T>> = tensor.elements()
+
+    override fun set(i: Int, j: Int, value: T) {
+        tensor[intArrayOf(i, j)] = value
+    }
+
+    override val rows: List<BufferedTensor1D<T>>
+        get() = List(rowNum) { i ->
+            BufferedTensor1D(
+                BufferedTensor(
+                    shape = intArrayOf(colNum),
+                    buffer = VirtualMutableBuffer(colNum) { j -> get(i, j) },
+                    bufferStart = 0
+                )
+            )
+        }
+
+    override val columns: List<BufferedTensor1D<T>>
+        get() = List(colNum) { j ->
+            BufferedTensor1D(
+                BufferedTensor(
+                    shape = intArrayOf(rowNum),
+                    buffer = VirtualMutableBuffer(rowNum) { i -> get(i, j) },
+                    bufferStart = 0
+                )
+            )
+        }
+}
+
+public class BufferedTensor1D<T> internal constructor(
+    private val tensor: BufferedTensor<T>
+) : BufferedTensor<T>(tensor), MutableStructure1D<T> {
+    init {
+        check(shape.size == 1) {
+            "Shape ${shape.toList()} not compatible with DoubleTensor1D"
+        }
+    }
+
+    override fun get(index: IntArray): T = tensor[index]
+
+    override fun set(index: IntArray, value: T) {
+        tensor[index] = value
+    }
+
+    override val size: Int
+        get() = tensor.linearStructure.size
+
+    override fun get(index: Int): T = tensor[intArrayOf(index)]
+
+    override fun set(index: Int, value: T) {
+        tensor[intArrayOf(index)] = value
+    }
+
+    override fun copy(): MutableBuffer<T> = tensor.buffer.copy()
+
+}
+
+internal fun BufferedTensor<Int>.asIntTensor(): IntTensor = IntTensor(this)
+internal fun BufferedTensor<Long>.asLongTensor(): LongTensor = LongTensor(this)
+internal fun BufferedTensor<Float>.asFloatTensor(): FloatTensor = FloatTensor(this)
+internal fun BufferedTensor<Double>.asDoubleTensor(): DoubleTensor = DoubleTensor(this)
+
+
+public fun <T> BufferedTensor<T>.as2D(): BufferedTensor2D<T> = BufferedTensor2D(this)
+public fun <T> BufferedTensor<T>.as1D(): BufferedTensor1D<T> = BufferedTensor1D(this)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 0b9d824f0..70fe8a1cc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -1,8 +1,5 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.nd.MutableStructure2D
-import space.kscience.kmath.nd.Structure1D
-import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.tensors.LinearOpsTensorAlgebra
 import kotlin.math.sqrt
 
@@ -153,7 +150,7 @@ public class DoubleLinearOpsTensorAlgebra :
         TODO("ANDREI")
     }
 
-    private fun luMatrixDet(lu: Structure2D<Double>, pivots: Structure1D<Int>): Double {
+    private fun luMatrixDet(lu: BufferedTensor2D<Double>, pivots: BufferedTensor1D<Int>): Double {
         val m = lu.shape[0]
         val sign = if((pivots[m] - m) % 2 == 0) 1.0 else -1.0
         return (0 until m).asSequence().map { lu[it, it] }.fold(sign) { left, right -> left * right }
@@ -180,9 +177,9 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     private fun luMatrixInv(
-        lu: Structure2D<Double>,
-        pivots: Structure1D<Int>,
-        invMatrix : MutableStructure2D<Double>
+        lu: BufferedTensor2D<Double>,
+        pivots: BufferedTensor1D<Int>,
+        invMatrix : BufferedTensor2D<Double>
     ): Unit {
         val m = lu.shape[0]
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index d77f33f9d..3a129b03c 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -1,7 +1,6 @@
 package space.kscience.kmath.tensors.core
 
 import kotlin.math.abs
-import kotlin.math.exp
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index b12b08b52..40597f539 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -1,8 +1,5 @@
 package space.kscience.kmath.tensors.core
 
-
-import space.kscience.kmath.nd.as1D
-import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.structures.toDoubleArray
 import kotlin.test.Test
 import kotlin.test.assertEquals
-- 
2.34.1


From 92710097f06d0ec6161e4f3518a2fd0815ff157a Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 29 Mar 2021 21:58:56 +0100
Subject: [PATCH 070/713] Fixing 2D and 1D casts

---
 kmath-core/api/kmath-core.api                 |  33 ---
 .../kmath/tensors/core/BufferedTensor.kt      | 107 +--------
 .../core/DoubleLinearOpsTensorAlgebra.kt      | 220 ++++++++++--------
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  53 +++--
 .../kscience/kmath/tensors/core/checks.kt     |   6 +-
 .../kmath/tensors/core/TestDoubleTensor.kt    |   2 +
 6 files changed, 173 insertions(+), 248 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index fc0905bd0..786b81d19 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -2731,8 +2731,6 @@ public class space/kscience/kmath/tensors/core/BufferedTensor : space/kscience/k
 	public fun <init> ([ILspace/kscience/kmath/structures/MutableBuffer;I)V
 	public fun elements ()Lkotlin/sequences/Sequence;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun forEachMatrix (Lkotlin/jvm/functions/Function1;)V
-	public final fun forEachVector (Lkotlin/jvm/functions/Function1;)V
 	public fun get ([I)Ljava/lang/Object;
 	public final fun getBuffer ()Lspace/kscience/kmath/structures/MutableBuffer;
 	public fun getDimension ()I
@@ -2740,37 +2738,7 @@ public class space/kscience/kmath/tensors/core/BufferedTensor : space/kscience/k
 	public final fun getNumel ()I
 	public fun getShape ()[I
 	public fun hashCode ()I
-	public final fun matrixSequence ()Lkotlin/sequences/Sequence;
 	public fun set ([ILjava/lang/Object;)V
-	public final fun vectorSequence ()Lkotlin/sequences/Sequence;
-}
-
-public final class space/kscience/kmath/tensors/core/BufferedTensor1D : space/kscience/kmath/tensors/core/BufferedTensor, space/kscience/kmath/nd/MutableStructure1D {
-	public fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
-	public fun get (I)Ljava/lang/Object;
-	public fun get ([I)Ljava/lang/Object;
-	public fun getDimension ()I
-	public fun getSize ()I
-	public fun iterator ()Ljava/util/Iterator;
-	public fun set (ILjava/lang/Object;)V
-	public fun set ([ILjava/lang/Object;)V
-}
-
-public final class space/kscience/kmath/tensors/core/BufferedTensor2D : space/kscience/kmath/tensors/core/BufferedTensor, space/kscience/kmath/nd/MutableStructure2D {
-	public fun elements ()Lkotlin/sequences/Sequence;
-	public fun get (II)Ljava/lang/Object;
-	public fun get ([I)Ljava/lang/Object;
-	public fun getColNum ()I
-	public fun getColumns ()Ljava/util/List;
-	public fun getRowNum ()I
-	public fun getRows ()Ljava/util/List;
-	public fun getShape ()[I
-	public fun set (IILjava/lang/Object;)V
-}
-
-public final class space/kscience/kmath/tensors/core/BufferedTensorKt {
-	public static final fun as1D (Lspace/kscience/kmath/tensors/core/BufferedTensor;)Lspace/kscience/kmath/tensors/core/BufferedTensor1D;
-	public static final fun as2D (Lspace/kscience/kmath/tensors/core/BufferedTensor;)Lspace/kscience/kmath/tensors/core/BufferedTensor2D;
 }
 
 public final class space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra, space/kscience/kmath/tensors/AnalyticTensorAlgebra {
@@ -2876,7 +2844,6 @@ public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscie
 	public synthetic fun eq (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Z
 	public final fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Z
 	public fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Z
-	public final fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lkotlin/jvm/functions/Function2;)Z
 	public synthetic fun eye (I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun eye (I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public final fun fromArray ([I[D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index aa6e58ef6..d99c35569 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -35,35 +35,34 @@ public open class BufferedTensor<T>(
 
     override fun hashCode(): Int = 0
 
-    public fun vectorSequence(): Sequence<BufferedTensor1D<T>> = sequence {
-        check(shape.size >= 1) { "todo" }
+    internal fun vectorSequence(): Sequence<BufferedTensor<T>> = sequence {
         val n = shape.size
         val vectorOffset = shape[n - 1]
         val vectorShape = intArrayOf(shape.last())
         for (offset in 0 until numel step vectorOffset) {
-            val vector = BufferedTensor<T>(vectorShape, buffer, offset).as1D()
+            val vector = BufferedTensor(vectorShape, buffer, offset)
             yield(vector)
         }
     }
 
-    public fun matrixSequence(): Sequence<BufferedTensor2D<T>> = sequence {
+    internal fun matrixSequence(): Sequence<BufferedTensor<T>> = sequence {
         check(shape.size >= 2) { "todo" }
         val n = shape.size
         val matrixOffset = shape[n - 1] * shape[n - 2]
-        val matrixShape = intArrayOf(shape[n - 2], shape[n - 1]) //todo better way?
+        val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
         for (offset in 0 until numel step matrixOffset) {
-            val matrix = BufferedTensor<T>(matrixShape, buffer, offset).as2D()
+            val matrix = BufferedTensor(matrixShape, buffer, offset)
             yield(matrix)
         }
     }
 
-    public inline fun forEachVector(vectorAction: (BufferedTensor1D<T>) -> Unit): Unit {
+    internal inline fun forEachVector(vectorAction: (BufferedTensor<T>) -> Unit): Unit {
         for (vector in vectorSequence()) {
             vectorAction(vector)
         }
     }
 
-    public inline fun forEachMatrix(matrixAction: (BufferedTensor2D<T>) -> Unit): Unit {
+    internal inline fun forEachMatrix(matrixAction: (BufferedTensor<T>) -> Unit): Unit {
         for (matrix in matrixSequence()) {
             matrixAction(matrix)
         }
@@ -71,7 +70,6 @@ public open class BufferedTensor<T>(
 
 }
 
-
 public class IntTensor internal constructor(
     shape: IntArray,
     buffer: IntArray,
@@ -112,90 +110,7 @@ public class DoubleTensor internal constructor(
             this(bufferedTensor.shape, bufferedTensor.buffer.array(), bufferedTensor.bufferStart)
 }
 
-
-public class BufferedTensor2D<T> internal constructor(
-    private val tensor: BufferedTensor<T>,
-) : BufferedTensor<T>(tensor), MutableStructure2D<T> {
-    init {
-        check(shape.size == 2) {
-            "Shape ${shape.toList()} not compatible with DoubleTensor2D"
-        }
-    }
-
-    override val shape: IntArray
-        get() = tensor.shape
-
-    override val rowNum: Int
-        get() = shape[0]
-    override val colNum: Int
-        get() = shape[1]
-
-    override fun get(i: Int, j: Int): T = tensor[intArrayOf(i, j)]
-
-    override fun get(index: IntArray): T = tensor[index]
-
-    override fun elements(): Sequence<Pair<IntArray, T>> = tensor.elements()
-
-    override fun set(i: Int, j: Int, value: T) {
-        tensor[intArrayOf(i, j)] = value
-    }
-
-    override val rows: List<BufferedTensor1D<T>>
-        get() = List(rowNum) { i ->
-            BufferedTensor1D(
-                BufferedTensor(
-                    shape = intArrayOf(colNum),
-                    buffer = VirtualMutableBuffer(colNum) { j -> get(i, j) },
-                    bufferStart = 0
-                )
-            )
-        }
-
-    override val columns: List<BufferedTensor1D<T>>
-        get() = List(colNum) { j ->
-            BufferedTensor1D(
-                BufferedTensor(
-                    shape = intArrayOf(rowNum),
-                    buffer = VirtualMutableBuffer(rowNum) { i -> get(i, j) },
-                    bufferStart = 0
-                )
-            )
-        }
-}
-
-public class BufferedTensor1D<T> internal constructor(
-    private val tensor: BufferedTensor<T>
-) : BufferedTensor<T>(tensor), MutableStructure1D<T> {
-    init {
-        check(shape.size == 1) {
-            "Shape ${shape.toList()} not compatible with DoubleTensor1D"
-        }
-    }
-
-    override fun get(index: IntArray): T = tensor[index]
-
-    override fun set(index: IntArray, value: T) {
-        tensor[index] = value
-    }
-
-    override val size: Int
-        get() = tensor.linearStructure.size
-
-    override fun get(index: Int): T = tensor[intArrayOf(index)]
-
-    override fun set(index: Int, value: T) {
-        tensor[intArrayOf(index)] = value
-    }
-
-    override fun copy(): MutableBuffer<T> = tensor.buffer.copy()
-
-}
-
-internal fun BufferedTensor<Int>.asIntTensor(): IntTensor = IntTensor(this)
-internal fun BufferedTensor<Long>.asLongTensor(): LongTensor = LongTensor(this)
-internal fun BufferedTensor<Float>.asFloatTensor(): FloatTensor = FloatTensor(this)
-internal fun BufferedTensor<Double>.asDoubleTensor(): DoubleTensor = DoubleTensor(this)
-
-
-public fun <T> BufferedTensor<T>.as2D(): BufferedTensor2D<T> = BufferedTensor2D(this)
-public fun <T> BufferedTensor<T>.as1D(): BufferedTensor1D<T> = BufferedTensor1D(this)
\ No newline at end of file
+internal fun BufferedTensor<Int>.asTensor(): IntTensor = IntTensor(this)
+internal fun BufferedTensor<Long>.asTensor(): LongTensor = LongTensor(this)
+internal fun BufferedTensor<Float>.asTensor(): FloatTensor = FloatTensor(this)
+internal fun BufferedTensor<Double>.asTensor(): DoubleTensor = DoubleTensor(this)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 70fe8a1cc..0d19fd3f6 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -1,5 +1,9 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.nd.MutableStructure1D
+import space.kscience.kmath.nd.MutableStructure2D
+import space.kscience.kmath.nd.as1D
+import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.tensors.LinearOpsTensorAlgebra
 import kotlin.math.sqrt
 
@@ -11,6 +15,48 @@ public class DoubleLinearOpsTensorAlgebra :
 
     override fun DoubleTensor.det(): DoubleTensor = detLU()
 
+    private inline fun luHelper(lu: MutableStructure2D<Double>, pivots: MutableStructure1D<Int>, m: Int) {
+        for (row in 0 until m) pivots[row] = row
+
+        for (i in 0 until m) {
+            var maxVal = -1.0
+            var maxInd = i
+
+            for (k in i until m) {
+                val absA = kotlin.math.abs(lu[k, i])
+                if (absA > maxVal) {
+                    maxVal = absA
+                    maxInd = k
+                }
+            }
+
+            //todo check singularity
+
+            if (maxInd != i) {
+
+                val j = pivots[i]
+                pivots[i] = pivots[maxInd]
+                pivots[maxInd] = j
+
+                for (k in 0 until m) {
+                    val tmp = lu[i, k]
+                    lu[i, k] = lu[maxInd, k]
+                    lu[maxInd, k] = tmp
+                }
+
+                pivots[m] += 1
+
+            }
+
+            for (j in i + 1 until m) {
+                lu[j, i] /= lu[i, i]
+                for (k in i + 1 until m) {
+                    lu[j, k] -= lu[j, i] * lu[i, k]
+                }
+            }
+        }
+    }
+
     override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
 
         checkSquareMatrix(shape)
@@ -27,90 +73,93 @@ public class DoubleLinearOpsTensorAlgebra :
             IntArray(pivotsShape.reduce(Int::times)) { 0 }
         )
 
-        for ((lu, pivots) in luTensor.matrixSequence().zip(pivotsTensor.vectorSequence())){
-            for (row in 0 until m) pivots[row] = row
-
-            for (i in 0 until m) {
-                var maxVal = -1.0
-                var maxInd = i
-
-                for (k in i until m) {
-                    val absA = kotlin.math.abs(lu[k, i])
-                    if (absA > maxVal) {
-                        maxVal = absA
-                        maxInd = k
-                    }
-                }
-
-                //todo check singularity
-
-                if (maxInd != i) {
-
-                    val j = pivots[i]
-                    pivots[i] = pivots[maxInd]
-                    pivots[maxInd] = j
-
-                    for (k in 0 until m) {
-                        val tmp = lu[i, k]
-                        lu[i, k] = lu[maxInd, k]
-                        lu[maxInd, k] = tmp
-                    }
-
-                    pivots[m] += 1
-
-                }
-
-                for (j in i + 1 until m) {
-                    lu[j, i] /= lu[i, i]
-                    for (k in i + 1 until m) {
-                        lu[j, k] -= lu[j, i] * lu[i, k]
-                    }
-                }
-            }
-        }
-
+        for ((lu, pivots) in luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()))
+            luHelper(lu.as2D(), pivots.as1D(), m)
 
         return Pair(luTensor, pivotsTensor)
 
     }
 
-    override fun luPivot(luTensor: DoubleTensor, pivotsTensor: IntTensor): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+    private inline fun pivInit(
+        p: MutableStructure2D<Double>,
+        pivot: MutableStructure1D<Int>,
+        n: Int
+    ) {
+        for (i in 0 until n) {
+            p[i, pivot[i]] = 1.0
+        }
+    }
+
+    private inline fun luPivotHelper(
+        l: MutableStructure2D<Double>,
+        u: MutableStructure2D<Double>,
+        lu: MutableStructure2D<Double>,
+        n: Int
+    ) {
+        for (i in 0 until n) {
+            for (j in 0 until n) {
+                if (i == j) {
+                    l[i, j] = 1.0
+                }
+                if (j < i) {
+                    l[i, j] = lu[i, j]
+                }
+                if (j >= i) {
+                    u[i, j] = lu[i, j]
+                }
+            }
+        }
+    }
+
+    override fun luPivot(
+        luTensor: DoubleTensor,
+        pivotsTensor: IntTensor
+    ): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         //todo checks
         checkSquareMatrix(luTensor.shape)
-        check(luTensor.shape.dropLast(1).toIntArray() contentEquals pivotsTensor.shape) { "Bed shapes (("} //todo rewrite
+        check(
+            luTensor.shape.dropLast(1).toIntArray() contentEquals pivotsTensor.shape
+        ) { "Bed shapes ((" } //todo rewrite
 
         val n = luTensor.shape.last()
         val pTensor = luTensor.zeroesLike()
-        for ((p, pivot) in pTensor.matrixSequence().zip(pivotsTensor.vectorSequence())){
-            for (i in 0 until n){
-                p[i, pivot[i]] = 1.0
-            }
-        }
+        for ((p, pivot) in pTensor.matrixSequence().zip(pivotsTensor.vectorSequence()))
+            pivInit(p.as2D(), pivot.as1D(), n)
 
         val lTensor = luTensor.zeroesLike()
         val uTensor = luTensor.zeroesLike()
 
-        for ((pairLU, lu) in lTensor.matrixSequence().zip(uTensor.matrixSequence()).zip(luTensor.matrixSequence())){
+        for ((pairLU, lu) in lTensor.matrixSequence().zip(uTensor.matrixSequence())
+            .zip(luTensor.matrixSequence())) {
             val (l, u) = pairLU
-            for (i in 0 until n) {
-                for (j in 0 until n) {
-                    if (i == j) {
-                        l[i, j] = 1.0
-                    }
-                    if (j < i) {
-                        l[i, j] = lu[i, j]
-                    }
-                    if (j >= i) {
-                        u[i, j] = lu[i, j]
-                    }
-                }
-            }
+            luPivotHelper(l.as2D(), u.as2D(), lu.as2D(), n)
         }
 
         return Triple(pTensor, lTensor, uTensor)
 
     }
 
+    private inline fun choleskyHelper(
+        a: MutableStructure2D<Double>,
+        l: MutableStructure2D<Double>,
+        n: Int
+    ) {
+        for (i in 0 until n) {
+            for (j in 0 until i) {
+                var h = a[i, j]
+                for (k in 0 until j) {
+                    h -= l[i, k] * l[j, k]
+                }
+                l[i, j] = h / l[j, j]
+            }
+            var h = a[i, i]
+            for (j in 0 until i) {
+                h -= l[i, j] * l[i, j]
+            }
+            l[i, i] = sqrt(h)
+        }
+    }
+
     override fun DoubleTensor.cholesky(): DoubleTensor {
         // todo checks
         checkSquareMatrix(shape)
@@ -118,22 +167,8 @@ public class DoubleLinearOpsTensorAlgebra :
         val n = shape.last()
         val lTensor = zeroesLike()
 
-        for ((a, l) in this.matrixSequence().zip(lTensor.matrixSequence())) {
-            for (i in 0 until n) {
-                for (j in 0 until i) {
-                    var h = a[i, j]
-                    for (k in 0 until j) {
-                        h -= l[i, k] * l[j, k]
-                    }
-                    l[i, j] = h / l[j, j]
-                }
-                var h = a[i, i]
-                for (j in 0 until i) {
-                    h -= l[i, j] * l[i, j]
-                }
-                l[i, i] = sqrt(h)
-            }
-        }
+        for ((a, l) in this.matrixSequence().zip(lTensor.matrixSequence()))
+            for (i in 0 until n) choleskyHelper(a.as2D(), l.as2D(), n)
 
         return lTensor
     }
@@ -150,9 +185,11 @@ public class DoubleLinearOpsTensorAlgebra :
         TODO("ANDREI")
     }
 
-    private fun luMatrixDet(lu: BufferedTensor2D<Double>, pivots: BufferedTensor1D<Int>): Double {
+    private fun luMatrixDet(luTensor: MutableStructure2D<Double>, pivotsTensor: MutableStructure1D<Int>): Double {
+        val lu = luTensor.as2D()
+        val pivots = pivotsTensor.as1D()
         val m = lu.shape[0]
-        val sign = if((pivots[m] - m) % 2 == 0) 1.0 else -1.0
+        val sign = if ((pivots[m] - m) % 2 == 0) 1.0 else -1.0
         return (0 until m).asSequence().map { lu[it, it] }.fold(sign) { left, right -> left * right }
     }
 
@@ -162,34 +199,34 @@ public class DoubleLinearOpsTensorAlgebra :
 
         val detTensorShape = IntArray(n - 1) { i -> shape[i] }
         detTensorShape[n - 2] = 1
-        val resBuffer =  DoubleArray(detTensorShape.reduce(Int::times)) { 0.0 }
+        val resBuffer = DoubleArray(detTensorShape.reduce(Int::times)) { 0.0 }
 
         val detTensor = DoubleTensor(
             detTensorShape,
             resBuffer
         )
 
-        luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).forEachIndexed { index, (luMatrix, pivots) ->
-            resBuffer[index] = luMatrixDet(luMatrix, pivots)
+        luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).forEachIndexed { index, (lu, pivots) ->
+            resBuffer[index] = luMatrixDet(lu.as2D(), pivots.as1D())
         }
 
         return detTensor
     }
 
     private fun luMatrixInv(
-        lu: BufferedTensor2D<Double>,
-        pivots: BufferedTensor1D<Int>,
-        invMatrix : BufferedTensor2D<Double>
-    ): Unit {
+        lu: MutableStructure2D<Double>,
+        pivots: MutableStructure1D<Int>,
+        invMatrix: MutableStructure2D<Double>
+    ) {
         val m = lu.shape[0]
 
         for (j in 0 until m) {
             for (i in 0 until m) {
-                if (pivots[i] == j){
+                if (pivots[i] == j) {
                     invMatrix[i, j] = 1.0
                 }
 
-                for (k in 0 until i){
+                for (k in 0 until i) {
                     invMatrix[i, j] -= lu[i, k] * invMatrix[k, j]
                 }
             }
@@ -205,13 +242,12 @@ public class DoubleLinearOpsTensorAlgebra :
 
     public fun DoubleTensor.invLU(): DoubleTensor {
         val (luTensor, pivotsTensor) = lu()
-        val n = shape.size
         val invTensor = luTensor.zeroesLike()
 
         val seq = luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).zip(invTensor.matrixSequence())
         for ((luP, invMatrix) in seq) {
             val (lu, pivots) = luP
-            luMatrixInv(lu, pivots, invMatrix)
+            luMatrixInv(lu.as2D(), pivots.as1D(), invMatrix.as2D())
         }
 
         return invTensor
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 0a2e8c86c..b25f0164b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -1,8 +1,7 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.linear.Matrix
 import space.kscience.kmath.nd.MutableStructure2D
-import space.kscience.kmath.nd.Structure2D
+import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.tensors.TensorPartialDivisionAlgebra
 import kotlin.math.abs
 
@@ -224,6 +223,23 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return this.view(other.shape)
     }
 
+    private inline fun dotHelper(
+        a: MutableStructure2D<Double>,
+        b: MutableStructure2D<Double>,
+        res: MutableStructure2D<Double>,
+        l: Int, m: Int, n: Int
+    ) {
+        for (i in 0 until l) {
+            for (j in 0 until n) {
+                var curr = 0.0
+                for (k in 0 until m) {
+                    curr += a[i, k] * b[k, j]
+                }
+                res[i, j] = curr
+            }
+        }
+    }
+
     override fun DoubleTensor.dot(other: DoubleTensor): DoubleTensor {
         if (this.shape.size == 1 && other.shape.size == 1) {
             return DoubleTensor(intArrayOf(1), doubleArrayOf(this.times(other).buffer.array().sum()))
@@ -240,7 +256,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         }
         if (other.shape.size == 1) {
             lastDim = true
-            newOther = other.view(other.shape + intArrayOf(1) )
+            newOther = other.view(other.shape + intArrayOf(1))
         }
 
         val broadcastTensors = broadcastOuterTensors(newThis, newOther)
@@ -248,7 +264,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         newOther = broadcastTensors[1]
 
         val l = newThis.shape[newThis.shape.size - 2]
-        val m1= newThis.shape[newThis.shape.size - 1]
+        val m1 = newThis.shape[newThis.shape.size - 1]
         val m2 = newOther.shape[newOther.shape.size - 2]
         val n = newOther.shape[newOther.shape.size - 1]
         if (m1 != m2) {
@@ -262,21 +278,14 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
 
         for ((res, ab) in resTensor.matrixSequence().zip(newThis.matrixSequence().zip(newOther.matrixSequence()))) {
             val (a, b) = ab
-
-            for (i in 0 until l) {
-                for (j in 0 until n) {
-                    var curr = 0.0
-                    for (k in 0 until m) {
-                        curr += a[i, k] * b[k, j]
-                    }
-                   res[i, j] = curr
-                }
-            }
+            dotHelper(a.as2D(), b.as2D(), res.as2D(), l, m, n)
         }
 
         if (penultimateDim) {
-            return resTensor.view(resTensor.shape.dropLast(2).toIntArray() +
-                    intArrayOf(resTensor.shape.last()))
+            return resTensor.view(
+                resTensor.shape.dropLast(2).toIntArray() +
+                        intArrayOf(resTensor.shape.last())
+            )
         }
         if (lastDim) {
             return resTensor.view(resTensor.shape.dropLast(1).toIntArray())
@@ -307,15 +316,11 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
 
     public fun DoubleTensor.eq(other: DoubleTensor): Boolean = this.eq(other, 1e-5)
 
-    public fun DoubleTensor.contentEquals(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
-        if (!(this.shape contentEquals other.shape)) {
-            return false
-        }
-        return this.eq(other, eqFunction)
-    }
+    public fun DoubleTensor.contentEquals(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean =
+        this.eq(other, eqFunction)
 
-    public fun DoubleTensor.eq(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
-        // todo broadcasting checking
+    private fun DoubleTensor.eq(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
+        checkShapesCompatible(this, other)
         val n = this.linearStructure.size
         if (n != other.linearStructure.size) {
             return false
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index c644a295c..247ed3913 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -11,14 +11,14 @@ internal inline fun <T, TensorType : TensorStructure<T>,
         "Illegal empty shape provided"
     }
 
-internal inline fun < TensorType : TensorStructure<Double>,
+internal inline fun <TensorType : TensorStructure<Double>,
         TorchTensorAlgebraType : TensorAlgebra<Double, TensorType>>
         TorchTensorAlgebraType.checkEmptyDoubleBuffer(buffer: DoubleArray): Unit =
     check(buffer.isNotEmpty()) {
         "Illegal empty buffer provided"
     }
 
-internal inline fun < TensorType : TensorStructure<Double>,
+internal inline fun <TensorType : TensorStructure<Double>,
         TorchTensorAlgebraType : TensorAlgebra<Double, TensorType>>
         TorchTensorAlgebraType.checkBufferShapeConsistency(shape: IntArray, buffer: DoubleArray): Unit =
     check(buffer.size == shape.reduce(Int::times)) {
@@ -56,4 +56,4 @@ internal inline fun <T, TensorType : TensorStructure<T>,
     check(shape[n - 1] == shape[n - 2]) {
         "Tensor must be batches of square matrices, but they are ${shape[n - 1]} by ${shape[n - 1]} matrices"
     }
-}
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 40597f539..5e6fdcdc5 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -1,5 +1,7 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.nd.as1D
+import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.structures.toDoubleArray
 import kotlin.test.Test
 import kotlin.test.assertEquals
-- 
2.34.1


From 51eca003af9daeb72a53fc05867d955d1167154c Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 29 Mar 2021 22:11:34 +0100
Subject: [PATCH 071/713] Moved back value to main algebra context

---
 kmath-core/api/kmath-core.api                  | 17 +++--------------
 .../kmath/tensors/ReduceOpsTensorAlgebra.kt    |  7 -------
 .../kscience/kmath/tensors/TensorAlgebra.kt    |  2 ++
 .../core/DoubleReduceOpsTensorAlgebra.kt       | 18 ------------------
 .../kmath/tensors/core/DoubleTensorAlgebra.kt  |  7 +++++++
 .../tensors/core/TestDoubleLinearOpsAlgebra.kt |  9 +++------
 .../kmath/tensors/core/TestDoubleTensor.kt     | 10 +++++++++-
 7 files changed, 24 insertions(+), 46 deletions(-)
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ReduceOpsTensorAlgebra.kt
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleReduceOpsTensorAlgebra.kt

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 786b81d19..373920204 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -2654,10 +2654,6 @@ public final class space/kscience/kmath/tensors/LinearOpsTensorAlgebra$DefaultIm
 	public static synthetic fun symEig$default (Lspace/kscience/kmath/tensors/LinearOpsTensorAlgebra;Lspace/kscience/kmath/nd/MutableStructureND;ZILjava/lang/Object;)Lkotlin/Pair;
 }
 
-public abstract interface class space/kscience/kmath/tensors/ReduceOpsTensorAlgebra : space/kscience/kmath/tensors/TensorAlgebra {
-	public abstract fun value (Lspace/kscience/kmath/nd/MutableStructureND;)Ljava/lang/Object;
-}
-
 public abstract interface class space/kscience/kmath/tensors/TensorAlgebra {
 	public abstract fun copy (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun diagonalEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;III)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -2686,6 +2682,7 @@ public abstract interface class space/kscience/kmath/tensors/TensorAlgebra {
 	public abstract fun timesAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
 	public abstract fun transpose (Lspace/kscience/kmath/nd/MutableStructureND;II)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun unaryMinus (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun value (Lspace/kscience/kmath/nd/MutableStructureND;)Ljava/lang/Object;
 	public abstract fun view (Lspace/kscience/kmath/nd/MutableStructureND;[I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun viewAs (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun zeroesLike (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -2809,16 +2806,6 @@ public final class space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebr
 	public static final fun DoubleLinearOpsTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
-public final class space/kscience/kmath/tensors/core/DoubleReduceOpsTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra, space/kscience/kmath/tensors/ReduceOpsTensorAlgebra {
-	public fun <init> ()V
-	public synthetic fun value (Lspace/kscience/kmath/nd/MutableStructureND;)Ljava/lang/Object;
-	public fun value (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Ljava/lang/Double;
-}
-
-public final class space/kscience/kmath/tensors/core/DoubleReduceOpsTensorAlgebraKt {
-	public static final fun DoubleReduceOpsTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
-}
-
 public final class space/kscience/kmath/tensors/core/DoubleTensor : space/kscience/kmath/tensors/core/BufferedTensor {
 }
 
@@ -2892,6 +2879,8 @@ public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscie
 	public fun transpose (Lspace/kscience/kmath/tensors/core/DoubleTensor;II)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun unaryMinus (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun unaryMinus (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun value (Lspace/kscience/kmath/nd/MutableStructureND;)Ljava/lang/Object;
+	public fun value (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Ljava/lang/Double;
 	public synthetic fun view (Lspace/kscience/kmath/nd/MutableStructureND;[I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun view (Lspace/kscience/kmath/tensors/core/DoubleTensor;[I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun viewAs (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ReduceOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ReduceOpsTensorAlgebra.kt
deleted file mode 100644
index 820b9b25b..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/ReduceOpsTensorAlgebra.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package space.kscience.kmath.tensors
-
-public interface ReduceOpsTensorAlgebra<T, TensorType : TensorStructure<T>> :
-    TensorAlgebra<T, TensorType> {
-    public fun TensorType.value(): T
-
-}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index b05105ed8..5b7515b20 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -5,6 +5,8 @@ import space.kscience.kmath.tensors.core.DoubleTensor
 // https://proofwiki.org/wiki/Definition:Algebra_over_Ring
 public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
+    public fun TensorType.value(): T
+
     //https://pytorch.org/docs/stable/generated/torch.full.html
     public fun full(value: T, shape: IntArray): TensorType
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleReduceOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleReduceOpsTensorAlgebra.kt
deleted file mode 100644
index 9a8aa9ebf..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleReduceOpsTensorAlgebra.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package space.kscience.kmath.tensors.core
-
-import space.kscience.kmath.tensors.ReduceOpsTensorAlgebra
-
-public class DoubleReduceOpsTensorAlgebra:
-    DoubleTensorAlgebra(),
-    ReduceOpsTensorAlgebra<Double, DoubleTensor> {
-
-    override fun DoubleTensor.value(): Double {
-        check(this.shape contentEquals intArrayOf(1)) {
-            "Inconsistent value for tensor of shape ${shape.toList()}"
-        }
-        return this.buffer.array()[this.bufferStart]
-    }
-}
-
-public inline fun <R> DoubleReduceOpsTensorAlgebra(block: DoubleReduceOpsTensorAlgebra.() -> R): R =
-    DoubleReduceOpsTensorAlgebra().block()
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index b25f0164b..b418f3647 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -7,6 +7,13 @@ import kotlin.math.abs
 
 public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, DoubleTensor> {
 
+    override fun DoubleTensor.value(): Double {
+        check(this.shape contentEquals intArrayOf(1)) {
+            "Inconsistent value for tensor of shape ${shape.toList()}"
+        }
+        return this.buffer.array()[this.bufferStart]
+    }
+
     public fun fromArray(shape: IntArray, buffer: DoubleArray): DoubleTensor {
         checkEmptyShape(shape)
         checkEmptyDoubleBuffer(buffer)
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 3a129b03c..d2d4ffb67 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -72,11 +72,8 @@ class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testScalarProduct() = DoubleLinearOpsTensorAlgebra {
-        val a = fromArray(intArrayOf(3), doubleArrayOf(1.8,2.5, 6.8))
-        val b = fromArray(intArrayOf(3), doubleArrayOf(5.5,2.6, 6.4))
-        DoubleReduceOpsTensorAlgebra {
-            assertEquals(a.dot(b).value(), 59.92)
-        }
-
+        val a = fromArray(intArrayOf(3), doubleArrayOf(1.8, 2.5, 6.8))
+        val b = fromArray(intArrayOf(3), doubleArrayOf(5.5, 2.6, 6.4))
+        assertEquals(a.dot(b).value(), 59.92)
     }
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 5e6fdcdc5..4f4d9bbdf 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -10,7 +10,7 @@ import kotlin.test.assertTrue
 class TestDoubleTensor {
 
     @Test
-    fun valueTest() = DoubleReduceOpsTensorAlgebra {
+    fun valueTest() = DoubleTensorAlgebra {
         val value = 12.5
         val tensor = fromArray(intArrayOf(1), doubleArrayOf(value))
         assertEquals(tensor.value(), value)
@@ -37,5 +37,13 @@ class TestDoubleTensor {
 
         vector[0] = 109.56
         assertEquals(tensor[intArrayOf(0,1,0)], 109.56)
+
+        tensor.matrixSequence().forEach {
+            val a = it.asTensor()
+            val secondRow = a[1].as1D()
+            val secondColumn = a.transpose(0,1)[1].as1D()
+            assertEquals(secondColumn[0], 77.89)
+            assertEquals(secondRow[1], secondColumn[1])
+        }
     }
 }
\ No newline at end of file
-- 
2.34.1


From d281dfca3ab869fcfb16181f82cc91b57bb4d26d Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 30 Mar 2021 11:22:55 +0100
Subject: [PATCH 072/713] Separate linear algebra utils into dedicated module

---
 .../kmath/tensors/core/BufferedTensor.kt      |  38 ----
 .../core/DoubleLinearOpsTensorAlgebra.kt      | 134 +------------
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  20 +-
 .../kscience/kmath/tensors/core/linutils.kt   | 188 ++++++++++++++++++
 4 files changed, 190 insertions(+), 190 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index d99c35569..9a4d13d2c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -1,7 +1,5 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.nd.MutableStructure1D
-import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.TensorStructure
 
@@ -18,9 +16,6 @@ public open class BufferedTensor<T>(
     public val numel: Int
         get() = linearStructure.size
 
-    internal constructor(tensor: BufferedTensor<T>) :
-            this(tensor.shape, tensor.buffer, tensor.bufferStart)
-
     override fun get(index: IntArray): T = buffer[bufferStart + linearStructure.offset(index)]
 
     override fun set(index: IntArray, value: T) {
@@ -35,39 +30,6 @@ public open class BufferedTensor<T>(
 
     override fun hashCode(): Int = 0
 
-    internal fun vectorSequence(): Sequence<BufferedTensor<T>> = sequence {
-        val n = shape.size
-        val vectorOffset = shape[n - 1]
-        val vectorShape = intArrayOf(shape.last())
-        for (offset in 0 until numel step vectorOffset) {
-            val vector = BufferedTensor(vectorShape, buffer, offset)
-            yield(vector)
-        }
-    }
-
-    internal fun matrixSequence(): Sequence<BufferedTensor<T>> = sequence {
-        check(shape.size >= 2) { "todo" }
-        val n = shape.size
-        val matrixOffset = shape[n - 1] * shape[n - 2]
-        val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
-        for (offset in 0 until numel step matrixOffset) {
-            val matrix = BufferedTensor(matrixShape, buffer, offset)
-            yield(matrix)
-        }
-    }
-
-    internal inline fun forEachVector(vectorAction: (BufferedTensor<T>) -> Unit): Unit {
-        for (vector in vectorSequence()) {
-            vectorAction(vector)
-        }
-    }
-
-    internal inline fun forEachMatrix(matrixAction: (BufferedTensor<T>) -> Unit): Unit {
-        for (matrix in matrixSequence()) {
-            matrixAction(matrix)
-        }
-    }
-
 }
 
 public class IntTensor internal constructor(
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 0d19fd3f6..b81cf0364 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -1,11 +1,8 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.nd.MutableStructure1D
-import space.kscience.kmath.nd.MutableStructure2D
+import space.kscience.kmath.tensors.LinearOpsTensorAlgebra
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.tensors.LinearOpsTensorAlgebra
-import kotlin.math.sqrt
 
 public class DoubleLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double, DoubleTensor, IntTensor>,
@@ -15,48 +12,6 @@ public class DoubleLinearOpsTensorAlgebra :
 
     override fun DoubleTensor.det(): DoubleTensor = detLU()
 
-    private inline fun luHelper(lu: MutableStructure2D<Double>, pivots: MutableStructure1D<Int>, m: Int) {
-        for (row in 0 until m) pivots[row] = row
-
-        for (i in 0 until m) {
-            var maxVal = -1.0
-            var maxInd = i
-
-            for (k in i until m) {
-                val absA = kotlin.math.abs(lu[k, i])
-                if (absA > maxVal) {
-                    maxVal = absA
-                    maxInd = k
-                }
-            }
-
-            //todo check singularity
-
-            if (maxInd != i) {
-
-                val j = pivots[i]
-                pivots[i] = pivots[maxInd]
-                pivots[maxInd] = j
-
-                for (k in 0 until m) {
-                    val tmp = lu[i, k]
-                    lu[i, k] = lu[maxInd, k]
-                    lu[maxInd, k] = tmp
-                }
-
-                pivots[m] += 1
-
-            }
-
-            for (j in i + 1 until m) {
-                lu[j, i] /= lu[i, i]
-                for (k in i + 1 until m) {
-                    lu[j, k] -= lu[j, i] * lu[i, k]
-                }
-            }
-        }
-    }
-
     override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
 
         checkSquareMatrix(shape)
@@ -80,37 +35,6 @@ public class DoubleLinearOpsTensorAlgebra :
 
     }
 
-    private inline fun pivInit(
-        p: MutableStructure2D<Double>,
-        pivot: MutableStructure1D<Int>,
-        n: Int
-    ) {
-        for (i in 0 until n) {
-            p[i, pivot[i]] = 1.0
-        }
-    }
-
-    private inline fun luPivotHelper(
-        l: MutableStructure2D<Double>,
-        u: MutableStructure2D<Double>,
-        lu: MutableStructure2D<Double>,
-        n: Int
-    ) {
-        for (i in 0 until n) {
-            for (j in 0 until n) {
-                if (i == j) {
-                    l[i, j] = 1.0
-                }
-                if (j < i) {
-                    l[i, j] = lu[i, j]
-                }
-                if (j >= i) {
-                    u[i, j] = lu[i, j]
-                }
-            }
-        }
-    }
-
     override fun luPivot(
         luTensor: DoubleTensor,
         pivotsTensor: IntTensor
@@ -139,27 +63,6 @@ public class DoubleLinearOpsTensorAlgebra :
 
     }
 
-    private inline fun choleskyHelper(
-        a: MutableStructure2D<Double>,
-        l: MutableStructure2D<Double>,
-        n: Int
-    ) {
-        for (i in 0 until n) {
-            for (j in 0 until i) {
-                var h = a[i, j]
-                for (k in 0 until j) {
-                    h -= l[i, k] * l[j, k]
-                }
-                l[i, j] = h / l[j, j]
-            }
-            var h = a[i, i]
-            for (j in 0 until i) {
-                h -= l[i, j] * l[i, j]
-            }
-            l[i, i] = sqrt(h)
-        }
-    }
-
     override fun DoubleTensor.cholesky(): DoubleTensor {
         // todo checks
         checkSquareMatrix(shape)
@@ -185,14 +88,6 @@ public class DoubleLinearOpsTensorAlgebra :
         TODO("ANDREI")
     }
 
-    private fun luMatrixDet(luTensor: MutableStructure2D<Double>, pivotsTensor: MutableStructure1D<Int>): Double {
-        val lu = luTensor.as2D()
-        val pivots = pivotsTensor.as1D()
-        val m = lu.shape[0]
-        val sign = if ((pivots[m] - m) % 2 == 0) 1.0 else -1.0
-        return (0 until m).asSequence().map { lu[it, it] }.fold(sign) { left, right -> left * right }
-    }
-
     public fun DoubleTensor.detLU(): DoubleTensor {
         val (luTensor, pivotsTensor) = lu()
         val n = shape.size
@@ -213,33 +108,6 @@ public class DoubleLinearOpsTensorAlgebra :
         return detTensor
     }
 
-    private fun luMatrixInv(
-        lu: MutableStructure2D<Double>,
-        pivots: MutableStructure1D<Int>,
-        invMatrix: MutableStructure2D<Double>
-    ) {
-        val m = lu.shape[0]
-
-        for (j in 0 until m) {
-            for (i in 0 until m) {
-                if (pivots[i] == j) {
-                    invMatrix[i, j] = 1.0
-                }
-
-                for (k in 0 until i) {
-                    invMatrix[i, j] -= lu[i, k] * invMatrix[k, j]
-                }
-            }
-
-            for (i in m - 1 downTo 0) {
-                for (k in i + 1 until m) {
-                    invMatrix[i, j] -= lu[i, k] * invMatrix[k, j]
-                }
-                invMatrix[i, j] /= lu[i, i]
-            }
-        }
-    }
-
     public fun DoubleTensor.invLU(): DoubleTensor {
         val (luTensor, pivotsTensor) = lu()
         val invTensor = luTensor.zeroesLike()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index b418f3647..c878fc58c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -1,8 +1,7 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.nd.MutableStructure2D
-import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.tensors.TensorPartialDivisionAlgebra
+import space.kscience.kmath.nd.as2D
 import kotlin.math.abs
 
 public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, DoubleTensor> {
@@ -230,23 +229,6 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return this.view(other.shape)
     }
 
-    private inline fun dotHelper(
-        a: MutableStructure2D<Double>,
-        b: MutableStructure2D<Double>,
-        res: MutableStructure2D<Double>,
-        l: Int, m: Int, n: Int
-    ) {
-        for (i in 0 until l) {
-            for (j in 0 until n) {
-                var curr = 0.0
-                for (k in 0 until m) {
-                    curr += a[i, k] * b[k, j]
-                }
-                res[i, j] = curr
-            }
-        }
-    }
-
     override fun DoubleTensor.dot(other: DoubleTensor): DoubleTensor {
         if (this.shape.size == 1 && other.shape.size == 1) {
             return DoubleTensor(intArrayOf(1), doubleArrayOf(this.times(other).buffer.array().sum()))
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
new file mode 100644
index 000000000..e78cc33c7
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
@@ -0,0 +1,188 @@
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.nd.MutableStructure1D
+import space.kscience.kmath.nd.MutableStructure2D
+import space.kscience.kmath.nd.as1D
+import space.kscience.kmath.nd.as2D
+import kotlin.math.sqrt
+
+
+internal inline fun <T> BufferedTensor<T>.vectorSequence(): Sequence<BufferedTensor<T>> = sequence {
+    val n = shape.size
+    val vectorOffset = shape[n - 1]
+    val vectorShape = intArrayOf(shape.last())
+    for (offset in 0 until numel step vectorOffset) {
+        val vector = BufferedTensor(vectorShape, buffer, offset)
+        yield(vector)
+    }
+}
+
+internal inline fun <T> BufferedTensor<T>.matrixSequence(): Sequence<BufferedTensor<T>> = sequence {
+    check(shape.size >= 2) { "todo" }
+    val n = shape.size
+    val matrixOffset = shape[n - 1] * shape[n - 2]
+    val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
+    for (offset in 0 until numel step matrixOffset) {
+        val matrix = BufferedTensor(matrixShape, buffer, offset)
+        yield(matrix)
+    }
+}
+
+internal inline fun <T> BufferedTensor<T>.forEachVector(vectorAction: (BufferedTensor<T>) -> Unit): Unit {
+    for (vector in vectorSequence()) {
+        vectorAction(vector)
+    }
+}
+
+internal inline fun <T> BufferedTensor<T>.forEachMatrix(matrixAction: (BufferedTensor<T>) -> Unit): Unit {
+    for (matrix in matrixSequence()) {
+        matrixAction(matrix)
+    }
+}
+
+
+internal inline fun dotHelper(
+    a: MutableStructure2D<Double>,
+    b: MutableStructure2D<Double>,
+    res: MutableStructure2D<Double>,
+    l: Int, m: Int, n: Int
+) {
+    for (i in 0 until l) {
+        for (j in 0 until n) {
+            var curr = 0.0
+            for (k in 0 until m) {
+                curr += a[i, k] * b[k, j]
+            }
+            res[i, j] = curr
+        }
+    }
+}
+
+internal inline fun luHelper(lu: MutableStructure2D<Double>, pivots: MutableStructure1D<Int>, m: Int) {
+    for (row in 0 until m) pivots[row] = row
+
+    for (i in 0 until m) {
+        var maxVal = -1.0
+        var maxInd = i
+
+        for (k in i until m) {
+            val absA = kotlin.math.abs(lu[k, i])
+            if (absA > maxVal) {
+                maxVal = absA
+                maxInd = k
+            }
+        }
+
+        //todo check singularity
+
+        if (maxInd != i) {
+
+            val j = pivots[i]
+            pivots[i] = pivots[maxInd]
+            pivots[maxInd] = j
+
+            for (k in 0 until m) {
+                val tmp = lu[i, k]
+                lu[i, k] = lu[maxInd, k]
+                lu[maxInd, k] = tmp
+            }
+
+            pivots[m] += 1
+
+        }
+
+        for (j in i + 1 until m) {
+            lu[j, i] /= lu[i, i]
+            for (k in i + 1 until m) {
+                lu[j, k] -= lu[j, i] * lu[i, k]
+            }
+        }
+    }
+}
+
+internal inline fun pivInit(
+    p: MutableStructure2D<Double>,
+    pivot: MutableStructure1D<Int>,
+    n: Int
+) {
+    for (i in 0 until n) {
+        p[i, pivot[i]] = 1.0
+    }
+}
+
+internal inline fun luPivotHelper(
+    l: MutableStructure2D<Double>,
+    u: MutableStructure2D<Double>,
+    lu: MutableStructure2D<Double>,
+    n: Int
+) {
+    for (i in 0 until n) {
+        for (j in 0 until n) {
+            if (i == j) {
+                l[i, j] = 1.0
+            }
+            if (j < i) {
+                l[i, j] = lu[i, j]
+            }
+            if (j >= i) {
+                u[i, j] = lu[i, j]
+            }
+        }
+    }
+}
+
+internal inline fun choleskyHelper(
+    a: MutableStructure2D<Double>,
+    l: MutableStructure2D<Double>,
+    n: Int
+) {
+    for (i in 0 until n) {
+        for (j in 0 until i) {
+            var h = a[i, j]
+            for (k in 0 until j) {
+                h -= l[i, k] * l[j, k]
+            }
+            l[i, j] = h / l[j, j]
+        }
+        var h = a[i, i]
+        for (j in 0 until i) {
+            h -= l[i, j] * l[i, j]
+        }
+        l[i, i] = sqrt(h)
+    }
+}
+
+internal inline fun luMatrixDet(luTensor: MutableStructure2D<Double>, pivotsTensor: MutableStructure1D<Int>): Double {
+    val lu = luTensor.as2D()
+    val pivots = pivotsTensor.as1D()
+    val m = lu.shape[0]
+    val sign = if ((pivots[m] - m) % 2 == 0) 1.0 else -1.0
+    return (0 until m).asSequence().map { lu[it, it] }.fold(sign) { left, right -> left * right }
+}
+
+internal inline fun luMatrixInv(
+    lu: MutableStructure2D<Double>,
+    pivots: MutableStructure1D<Int>,
+    invMatrix: MutableStructure2D<Double>
+) {
+    val m = lu.shape[0]
+
+    for (j in 0 until m) {
+        for (i in 0 until m) {
+            if (pivots[i] == j) {
+                invMatrix[i, j] = 1.0
+            }
+
+            for (k in 0 until i) {
+                invMatrix[i, j] -= lu[i, k] * invMatrix[k, j]
+            }
+        }
+
+        for (i in m - 1 downTo 0) {
+            for (k in i + 1 until m) {
+                invMatrix[i, j] -= lu[i, k] * invMatrix[k, j]
+            }
+            invMatrix[i, j] /= lu[i, i]
+        }
+    }
+}
-- 
2.34.1


From 2503d35ba8629055aaffc03f6b2e12e2030d7dd3 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Tue, 30 Mar 2021 14:53:19 +0300
Subject: [PATCH 073/713] complete qr + test qr and lu

---
 .../core/DoubleLinearOpsTensorAlgebra.kt      | 51 +++++++++++++++++--
 .../core/TestDoubleLinearOpsAlgebra.kt        | 46 +++++++++++++++++
 2 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 1558e6af9..59ec944f2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -118,7 +118,8 @@ public class DoubleLinearOpsTensorAlgebra :
         //todo checks
         checkSquareMatrix(luTensor.shape)
         check(
-            luTensor.shape.dropLast(1).toIntArray() contentEquals pivotsTensor.shape
+            luTensor.shape.dropLast(2).toIntArray() contentEquals pivotsTensor.shape.dropLast(1).toIntArray() ||
+                    luTensor.shape.last() == pivotsTensor.shape.last() - 1
         ) { "Bed shapes ((" } //todo rewrite
 
         val n = luTensor.shape.last()
@@ -173,16 +174,56 @@ public class DoubleLinearOpsTensorAlgebra :
         return lTensor
     }
 
-    private fun matrixQR(
-        matrix: Structure2D<Double>,
+    private fun MutableStructure1D<Double>.dot(other: MutableStructure1D<Double>): Double {
+        var res = 0.0
+        for (i in 0 until size) {
+            res += this[i] * other[i]
+        }
+        return res
+    }
+
+    private fun MutableStructure1D<Double>.l2Norm(): Double {
+        var squareSum = 0.0
+        for (i in 0 until size) {
+            squareSum += this[i] * this[i]
+        }
+        return sqrt(squareSum)
+    }
+
+    fun qrHelper(
+        matrix: MutableStructure2D<Double>,
         q: MutableStructure2D<Double>,
         r: MutableStructure2D<Double>
     ) {
-
+        //todo check square
+        val n = matrix.colNum
+        for (j in 0 until n) {
+            val v = matrix.columns[j]
+            if (j > 0) {
+                for (i in 0 until j) {
+                    r[i, j] = q.columns[i].dot(matrix.columns[j])
+                    for (k in 0 until n) {
+                        v[k] = v[k] - r[i, j] * q.columns[i][k]
+                    }
+                }
+            }
+            r[j, j] = v.l2Norm()
+            for (i in 0 until n) {
+                q[i, j] = v[i] / r[j, j]
+            }
+        }
     }
 
     override fun DoubleTensor.qr(): Pair<DoubleTensor, DoubleTensor> {
-        TODO("ANDREI")
+        checkSquareMatrix(shape)
+        val qTensor = zeroesLike()
+        val rTensor = zeroesLike()
+        val seq = matrixSequence().zip((qTensor.matrixSequence().zip(rTensor.matrixSequence())))
+        for ((matrix, qr) in seq) {
+            val (q, r) = qr
+            qrHelper(matrix.as2D(), q.as2D(), r.as2D())
+        }
+        return Pair(qTensor, rTensor)
     }
 
     override fun DoubleTensor.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index d2d4ffb67..b79c54dd1 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -76,4 +76,50 @@ class TestDoubleLinearOpsTensorAlgebra {
         val b = fromArray(intArrayOf(3), doubleArrayOf(5.5, 2.6, 6.4))
         assertEquals(a.dot(b).value(), 59.92)
     }
+
+    @Test
+    fun testQR() = DoubleLinearOpsTensorAlgebra {
+        val shape = intArrayOf(2, 2, 2)
+        val buffer = doubleArrayOf(
+            1.0, 3.0,
+            1.0, 2.0,
+            1.5, 1.0,
+            10.0, 2.0
+        )
+
+        val tensor = fromArray(shape, buffer)
+
+        val (q, r) = tensor.qr()
+
+        assertTrue { q.shape contentEquals shape }
+        assertTrue { r.shape contentEquals shape }
+
+        assertTrue { q.dot(r).buffer.array().epsEqual(buffer) }
+
+        //todo check orthogonality/upper triang.
+    }
+
+    @Test
+    fun testLU() = DoubleLinearOpsTensorAlgebra {
+        val shape = intArrayOf(2, 2, 2)
+        val buffer = doubleArrayOf(
+            1.0, 3.0,
+            1.0, 2.0,
+            1.5, 1.0,
+            10.0, 2.0
+        )
+        val tensor = fromArray(shape, buffer)
+
+        val (lu, pivots) = tensor.lu()
+
+        // todo check lu
+
+        val (p, l, u) = luPivot(lu, pivots)
+
+        assertTrue { p.shape contentEquals shape }
+        assertTrue { l.shape contentEquals shape }
+        assertTrue { u.shape contentEquals shape }
+
+        assertTrue { p.dot(tensor).buffer.array().epsEqual(l.dot(u).buffer.array()) }
+    }
 }
-- 
2.34.1


From 139534fdb343b984c94f5bc089df34b9e1d5946b Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Tue, 30 Mar 2021 15:13:45 +0300
Subject: [PATCH 074/713] fix

---
 .../kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 59ec944f2..6be50e710 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -183,11 +183,7 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     private fun MutableStructure1D<Double>.l2Norm(): Double {
-        var squareSum = 0.0
-        for (i in 0 until size) {
-            squareSum += this[i] * this[i]
-        }
-        return sqrt(squareSum)
+        return sqrt((0 until size).sumOf { this[it] * this[it] })
     }
 
     fun qrHelper(
@@ -223,7 +219,7 @@ public class DoubleLinearOpsTensorAlgebra :
             val (q, r) = qr
             qrHelper(matrix.as2D(), q.as2D(), r.as2D())
         }
-        return Pair(qTensor, rTensor)
+        return qTensor to rTensor
     }
 
     override fun DoubleTensor.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-- 
2.34.1


From 370bab462cae6d883677d0ed5cda7e0b885caa96 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 30 Mar 2021 13:14:09 +0100
Subject: [PATCH 075/713] merged pull request

---
 .../core/DoubleLinearOpsTensorAlgebra.kt      | 40 -------------------
 .../kscience/kmath/tensors/core/linutils.kt   | 40 +++++++++++++++++++
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 46ab5f80f..13fb18c01 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -77,46 +77,6 @@ public class DoubleLinearOpsTensorAlgebra :
         return lTensor
     }
 
-    private fun MutableStructure1D<Double>.dot(other: MutableStructure1D<Double>): Double {
-        var res = 0.0
-        for (i in 0 until size) {
-            res += this[i] * other[i]
-        }
-        return res
-    }
-
-    private fun MutableStructure1D<Double>.l2Norm(): Double {
-        var squareSum = 0.0
-        for (i in 0 until size) {
-            squareSum += this[i] * this[i]
-        }
-        return sqrt(squareSum)
-    }
-
-    fun qrHelper(
-        matrix: MutableStructure2D<Double>,
-        q: MutableStructure2D<Double>,
-        r: MutableStructure2D<Double>
-    ) {
-        //todo check square
-        val n = matrix.colNum
-        for (j in 0 until n) {
-            val v = matrix.columns[j]
-            if (j > 0) {
-                for (i in 0 until j) {
-                    r[i, j] = q.columns[i].dot(matrix.columns[j])
-                    for (k in 0 until n) {
-                        v[k] = v[k] - r[i, j] * q.columns[i][k]
-                    }
-                }
-            }
-            r[j, j] = v.l2Norm()
-            for (i in 0 until n) {
-                q[i, j] = v[i] / r[j, j]
-            }
-        }
-    }
-
     override fun DoubleTensor.qr(): Pair<DoubleTensor, DoubleTensor> {
         checkSquareMatrix(shape)
         val qTensor = zeroesLike()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
index e78cc33c7..49a4384c2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
@@ -186,3 +186,43 @@ internal inline fun luMatrixInv(
         }
     }
 }
+
+internal inline fun MutableStructure1D<Double>.dot(other: MutableStructure1D<Double>): Double {
+    var res = 0.0
+    for (i in 0 until size) {
+        res += this[i] * other[i]
+    }
+    return res
+}
+
+internal inline fun MutableStructure1D<Double>.l2Norm(): Double {
+    var squareSum = 0.0
+    for (i in 0 until size) {
+        squareSum += this[i] * this[i]
+    }
+    return sqrt(squareSum)
+}
+
+internal inline fun qrHelper(
+    matrix: MutableStructure2D<Double>,
+    q: MutableStructure2D<Double>,
+    r: MutableStructure2D<Double>
+) {
+    //todo check square
+    val n = matrix.colNum
+    for (j in 0 until n) {
+        val v = matrix.columns[j]
+        if (j > 0) {
+            for (i in 0 until j) {
+                r[i, j] = q.columns[i].dot(matrix.columns[j])
+                for (k in 0 until n) {
+                    v[k] = v[k] - r[i, j] * q.columns[i][k]
+                }
+            }
+        }
+        r[j, j] = v.l2Norm()
+        for (i in 0 until n) {
+            q[i, j] = v[i] / r[j, j]
+        }
+    }
+}
-- 
2.34.1


From 581c13c573179dd9b2b67e65a4a2c84047ed9171 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 30 Mar 2021 14:14:05 +0100
Subject: [PATCH 076/713] drop code duplication

---
 kmath-core/api/kmath-core.api                 |  6 +--
 .../core/DoubleLinearOpsTensorAlgebra.kt      |  2 +-
 .../kscience/kmath/tensors/core/linutils.kt   | 42 +++++++------------
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 373920204..634f38bed 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -2645,7 +2645,7 @@ public abstract interface class space/kscience/kmath/tensors/LinearOpsTensorAlge
 	public abstract fun inv (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun lu (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Pair;
 	public abstract fun luPivot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
-	public abstract fun qr (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
+	public abstract fun qr (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Pair;
 	public abstract fun svd (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
 	public abstract fun symEig (Lspace/kscience/kmath/nd/MutableStructureND;Z)Lkotlin/Pair;
 }
@@ -2794,8 +2794,8 @@ public final class space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebr
 	public fun lu (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lkotlin/Pair;
 	public synthetic fun luPivot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
 	public fun luPivot (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/IntTensor;)Lkotlin/Triple;
-	public synthetic fun qr (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun qr (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public synthetic fun qr (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Pair;
+	public fun qr (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lkotlin/Pair;
 	public synthetic fun svd (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
 	public fun svd (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lkotlin/Triple;
 	public synthetic fun symEig (Lspace/kscience/kmath/nd/MutableStructureND;Z)Lkotlin/Pair;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 13fb18c01..3d2d21e0c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -84,7 +84,7 @@ public class DoubleLinearOpsTensorAlgebra :
         val seq = matrixSequence().zip((qTensor.matrixSequence().zip(rTensor.matrixSequence())))
         for ((matrix, qr) in seq) {
             val (q, r) = qr
-            qrHelper(matrix.as2D(), q.as2D(), r.as2D())
+            qrHelper(matrix.asTensor(), q.asTensor(), r.as2D())
         }
         return Pair(qTensor, rTensor)
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
index 49a4384c2..4067de5f4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
@@ -187,42 +187,32 @@ internal inline fun luMatrixInv(
     }
 }
 
-internal inline fun MutableStructure1D<Double>.dot(other: MutableStructure1D<Double>): Double {
-    var res = 0.0
-    for (i in 0 until size) {
-        res += this[i] * other[i]
-    }
-    return res
-}
-
-internal inline fun MutableStructure1D<Double>.l2Norm(): Double {
-    var squareSum = 0.0
-    for (i in 0 until size) {
-        squareSum += this[i] * this[i]
-    }
-    return sqrt(squareSum)
-}
-
-internal inline fun qrHelper(
-    matrix: MutableStructure2D<Double>,
-    q: MutableStructure2D<Double>,
+internal inline fun DoubleLinearOpsTensorAlgebra.qrHelper(
+    matrix: DoubleTensor,
+    q: DoubleTensor,
     r: MutableStructure2D<Double>
 ) {
-    //todo check square
-    val n = matrix.colNum
+    checkSquareMatrix(matrix.shape)
+    val n = matrix.shape[0]
+    val qM = q.as2D()
+    val matrixT = matrix.transpose(0,1)
+    val qT = q.transpose(0,1)
+
     for (j in 0 until n) {
-        val v = matrix.columns[j]
+        val v = matrixT[j]
+        val vv = v.as1D()
         if (j > 0) {
             for (i in 0 until j) {
-                r[i, j] = q.columns[i].dot(matrix.columns[j])
+                r[i, j] = qT[i].dot(matrixT[j]).value()
                 for (k in 0 until n) {
-                    v[k] = v[k] - r[i, j] * q.columns[i][k]
+                    val qTi = qT[i].as1D()
+                    vv[k] = vv[k] - r[i, j] * qTi[k]
                 }
             }
         }
-        r[j, j] = v.l2Norm()
+        r[j, j] = DoubleAnalyticTensorAlgebra { v.dot(v).sqrt().value() }
         for (i in 0 until n) {
-            q[i, j] = v[i] / r[j, j]
+            qM[i, j] = vv[i] / r[j, j]
         }
     }
 }
-- 
2.34.1


From 03455a3bebc617e09392e6da7ac361040babf67a Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 30 Mar 2021 14:36:59 +0100
Subject: [PATCH 077/713] infix dot forgotten

---
 .../space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt  | 2 +-
 .../kotlin/space/kscience/kmath/tensors/core/linutils.kt      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index c878fc58c..965aef1ea 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -229,7 +229,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return this.view(other.shape)
     }
 
-    override fun DoubleTensor.dot(other: DoubleTensor): DoubleTensor {
+    override infix fun DoubleTensor.dot(other: DoubleTensor): DoubleTensor {
         if (this.shape.size == 1 && other.shape.size == 1) {
             return DoubleTensor(intArrayOf(1), doubleArrayOf(this.times(other).buffer.array().sum()))
         }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
index 4067de5f4..f6cf71b07 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
@@ -203,14 +203,14 @@ internal inline fun DoubleLinearOpsTensorAlgebra.qrHelper(
         val vv = v.as1D()
         if (j > 0) {
             for (i in 0 until j) {
-                r[i, j] = qT[i].dot(matrixT[j]).value()
+                r[i, j] = (qT[i] dot matrixT[j]).value()
                 for (k in 0 until n) {
                     val qTi = qT[i].as1D()
                     vv[k] = vv[k] - r[i, j] * qTi[k]
                 }
             }
         }
-        r[j, j] = DoubleAnalyticTensorAlgebra { v.dot(v).sqrt().value() }
+        r[j, j] = DoubleAnalyticTensorAlgebra { (v dot v).sqrt().value() }
         for (i in 0 until n) {
             qM[i, j] = vv[i] / r[j, j]
         }
-- 
2.34.1


From b5d3ca76db28552aa534f04813234047b2b6a9ae Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 30 Mar 2021 19:20:20 +0100
Subject: [PATCH 078/713] Dropping creation methods from interface

---
 .../kscience/kmath/tensors/TensorAlgebra.kt   | 21 -------------------
 .../tensors/TensorPartialDivisionAlgebra.kt   |  2 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 18 ++++++++--------
 .../kscience/kmath/tensors/core/utils.kt      |  8 ++++++-
 4 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 5b7515b20..d7c6eaefd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -1,29 +1,10 @@
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.tensors.core.DoubleTensor
-
 // https://proofwiki.org/wiki/Definition:Algebra_over_Ring
 public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
 
     public fun TensorType.value(): T
 
-    //https://pytorch.org/docs/stable/generated/torch.full.html
-    public fun full(value: T, shape: IntArray): TensorType
-
-    public fun ones(shape: IntArray): TensorType
-    public fun zeros(shape: IntArray): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.full_like.html#torch.full_like
-    public fun TensorType.fullLike(value: T): TensorType
-
-    public fun TensorType.zeroesLike(): TensorType
-    public fun TensorType.onesLike(): TensorType
-
-    //https://pytorch.org/docs/stable/generated/torch.eye.html
-    public fun eye(n: Int): TensorType
-
-    public fun TensorType.copy(): TensorType
-
     public operator fun T.plus(other: TensorType): TensorType
     public operator fun TensorType.plus(value: T): TensorType
     public operator fun TensorType.plus(other: TensorType): TensorType
@@ -53,8 +34,6 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     public fun TensorType.view(shape: IntArray): TensorType
     public fun TensorType.viewAs(other: TensorType): TensorType
 
-    public fun TensorType.eq(other: TensorType, delta: T): Boolean
-
     //https://pytorch.org/docs/stable/generated/torch.matmul.html
     public infix fun TensorType.dot(other: TensorType): TensorType
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
index 67b9c9d73..0b9079967 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
@@ -2,7 +2,7 @@ package space.kscience.kmath.tensors
 
 // https://proofwiki.org/wiki/Definition:Division_Algebra
 public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>> :
-    TensorAlgebra<T, TensorType> {
+        TensorAlgebra<T, TensorType> {
     public operator fun TensorType.div(value: T): TensorType
     public operator fun TensorType.div(other: TensorType): TensorType
     public operator fun TensorType.divAssign(value: T)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 965aef1ea..323ade45d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -27,27 +27,27 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return DoubleTensor(newShape, this.buffer.array(), newStart)
     }
 
-    override fun full(value: Double, shape: IntArray): DoubleTensor {
+    public fun full(value: Double, shape: IntArray): DoubleTensor {
         checkEmptyShape(shape)
         val buffer = DoubleArray(shape.reduce(Int::times)) { value }
         return DoubleTensor(shape, buffer)
     }
 
-    override fun DoubleTensor.fullLike(value: Double): DoubleTensor {
+    public fun DoubleTensor.fullLike(value: Double): DoubleTensor {
         val shape = this.shape
         val buffer = DoubleArray(this.linearStructure.size) { value }
         return DoubleTensor(shape, buffer)
     }
 
-    override fun zeros(shape: IntArray): DoubleTensor = full(0.0, shape)
+    public fun zeros(shape: IntArray): DoubleTensor = full(0.0, shape)
 
-    override fun DoubleTensor.zeroesLike(): DoubleTensor = this.fullLike(0.0)
+    public fun DoubleTensor.zeroesLike(): DoubleTensor = this.fullLike(0.0)
 
-    override fun ones(shape: IntArray): DoubleTensor = full(1.0, shape)
+    public fun ones(shape: IntArray): DoubleTensor = full(1.0, shape)
 
-    override fun DoubleTensor.onesLike(): DoubleTensor = this.fullLike(1.0)
+    public fun DoubleTensor.onesLike(): DoubleTensor = this.fullLike(1.0)
 
-    override fun eye(n: Int): DoubleTensor {
+    public fun eye(n: Int): DoubleTensor {
         val shape = intArrayOf(n, n)
         val buffer = DoubleArray(n * n) { 0.0 }
         val res = DoubleTensor(shape, buffer)
@@ -57,7 +57,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return res
     }
 
-    override fun DoubleTensor.copy(): DoubleTensor {
+    public fun DoubleTensor.copy(): DoubleTensor {
         return DoubleTensor(this.shape, this.buffer.array().copyOf(), this.bufferStart)
     }
 
@@ -299,7 +299,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return this.contentEquals(other) { x, y -> abs(x - y) < delta }
     }
 
-    override fun DoubleTensor.eq(other: DoubleTensor, delta: Double): Boolean {
+    public fun DoubleTensor.eq(other: DoubleTensor, delta: Double): Boolean {
         return this.eq(other) { x, y -> abs(x - y) < delta }
     }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index 591ebb89c..33e78db33 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -1,7 +1,8 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.structures.*
-
+import kotlin.random.Random
+import kotlin.math.*
 
 /**
  * Returns a reference to [IntArray] containing all of the elements of this [Buffer].
@@ -34,3 +35,8 @@ internal fun Buffer<Double>.array(): DoubleArray = when (this) {
     is DoubleBuffer -> array
     else -> throw RuntimeException("Failed to cast Buffer to DoubleArray")
 }
+
+internal inline fun getRandomNormals(n: Int, seed: Long): DoubleArray {
+    val u = Random(seed)
+    return (0 until n).map { sqrt(-2.0 * u.nextDouble()) * cos(2.0 * PI * u.nextDouble()) }.toDoubleArray()
+}
-- 
2.34.1


From 07b6f988c296592cc28c93de12009fced255f43d Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 30 Mar 2021 19:31:42 +0100
Subject: [PATCH 079/713] forgot ln

---
 .../kotlin/space/kscience/kmath/tensors/core/utils.kt           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index 33e78db33..d8a073d64 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -38,5 +38,5 @@ internal fun Buffer<Double>.array(): DoubleArray = when (this) {
 
 internal inline fun getRandomNormals(n: Int, seed: Long): DoubleArray {
     val u = Random(seed)
-    return (0 until n).map { sqrt(-2.0 * u.nextDouble()) * cos(2.0 * PI * u.nextDouble()) }.toDoubleArray()
+    return (0 until n).map { sqrt(-2.0 * ln(u.nextDouble())) * cos(2.0 * PI * u.nextDouble()) }.toDoubleArray()
 }
-- 
2.34.1


From 6305acea68a8b34e9ddd01b7daf1711f17829151 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 31 Mar 2021 08:32:53 +0100
Subject: [PATCH 080/713] API dump

---
 kmath-core/api/kmath-core.api | 36 +++++++++--------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 634f38bed..f0e749d2b 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -2655,21 +2655,14 @@ public final class space/kscience/kmath/tensors/LinearOpsTensorAlgebra$DefaultIm
 }
 
 public abstract interface class space/kscience/kmath/tensors/TensorAlgebra {
-	public abstract fun copy (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun diagonalEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;III)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun dot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun eq (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Z
-	public abstract fun eye (I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun full (Ljava/lang/Object;[I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun fullLike (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun get (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun minus (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun minus (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun minus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
 	public abstract fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public abstract fun ones ([I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun onesLike (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun plus (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -2685,8 +2678,6 @@ public abstract interface class space/kscience/kmath/tensors/TensorAlgebra {
 	public abstract fun value (Lspace/kscience/kmath/nd/MutableStructureND;)Ljava/lang/Object;
 	public abstract fun view (Lspace/kscience/kmath/nd/MutableStructureND;[I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public abstract fun viewAs (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun zeroesLike (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun zeros ([I)Lspace/kscience/kmath/nd/MutableStructureND;
 }
 
 public final class space/kscience/kmath/tensors/TensorAlgebra$DefaultImpls {
@@ -2814,8 +2805,7 @@ public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscie
 	public final fun contentEquals (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Z
 	public final fun contentEquals (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lkotlin/jvm/functions/Function2;)Z
 	public static synthetic fun contentEquals$default (Lspace/kscience/kmath/tensors/core/DoubleTensorAlgebra;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;DILjava/lang/Object;)Z
-	public synthetic fun copy (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun copy (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public final fun copy (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun diagonalEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;III)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun diagonalEmbedding (Lspace/kscience/kmath/tensors/core/DoubleTensor;III)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun div (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -2828,16 +2818,12 @@ public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscie
 	public fun divAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
 	public synthetic fun dot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun dot (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun eq (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Z
 	public final fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Z
-	public fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Z
-	public synthetic fun eye (I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun eye (I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public final fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Z
+	public final fun eye (I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public final fun fromArray ([I[D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public fun full (D[I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun full (Ljava/lang/Object;[I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public synthetic fun fullLike (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun fullLike (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public final fun full (D[I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public final fun fullLike (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun get (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun get (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public final fun map (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
@@ -2851,10 +2837,8 @@ public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscie
 	public synthetic fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
 	public fun minusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)V
 	public fun minusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
-	public synthetic fun ones ([I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun ones ([I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun onesLike (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun onesLike (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public final fun ones ([I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public final fun onesLike (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public fun plus (DLspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun plus (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public synthetic fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
@@ -2885,10 +2869,8 @@ public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscie
 	public fun view (Lspace/kscience/kmath/tensors/core/DoubleTensor;[I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 	public synthetic fun viewAs (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
 	public fun viewAs (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun zeroesLike (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun zeroesLike (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun zeros ([I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun zeros ([I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public final fun zeroesLike (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
+	public final fun zeros ([I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
 }
 
 public final class space/kscience/kmath/tensors/core/DoubleTensorAlgebraKt {
-- 
2.34.1


From 5abd63cde28fcf63e72809799b10211647adb73b Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 31 Mar 2021 09:07:45 +0100
Subject: [PATCH 081/713] moving to kmath-tensors module

---
 kmath-core/api/kmath-core.api                 | 278 ------------------
 kmath-tensors/build.gradle.kts                |  16 +
 .../kmath/tensors/AnalyticTensorAlgebra.kt    |   0
 .../kmath/tensors/LinearOpsTensorAlgebra.kt   |   0
 .../kscience/kmath/tensors/TensorAlgebra.kt   |   0
 .../tensors/TensorPartialDivisionAlgebra.kt   |   0
 .../kscience/kmath/tensors/TensorStructure.kt |   0
 .../core/BroadcastDoubleTensorAlgebra.kt      |   0
 .../kmath/tensors/core/BufferedTensor.kt      |   0
 .../core/DoubleAnalyticTensorAlgebra.kt       |   0
 .../core/DoubleLinearOpsTensorAlgebra.kt      |   0
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |   0
 .../tensors/core/TensorLinearStructure.kt     |   0
 .../kscience/kmath/tensors/core/checks.kt     |   0
 .../kscience/kmath/tensors/core/linutils.kt   |   0
 .../kscience/kmath/tensors/core/utils.kt      |   0
 .../kmath/tensors/core/TestBroadcasting.kt    |   0
 .../core/TestDoubleAnalyticTensorAlgebra.kt   |   0
 .../core/TestDoubleLinearOpsAlgebra.kt        |   0
 .../kmath/tensors/core/TestDoubleTensor.kt    |   0
 .../tensors/core/TestDoubleTensorAlgebra.kt   |   0
 settings.gradle.kts                           |   1 +
 22 files changed, 17 insertions(+), 278 deletions(-)
 create mode 100644 kmath-tensors/build.gradle.kts
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt (100%)
 rename {kmath-core => kmath-tensors}/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt (100%)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index cc6c93c20..fee874b12 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -2602,281 +2602,3 @@ public final class space/kscience/kmath/structures/VirtualMutableBuffer : space/
 	public fun set (ILjava/lang/Object;)V
 }
 
-public abstract interface class space/kscience/kmath/tensors/AnalyticTensorAlgebra : space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
-	public abstract fun acos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun acosh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun asin (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun asinh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun atan (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun atanh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun ceil (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun cos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun cosh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun exp (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun floor (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun log (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun sin (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun sinh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun sqrt (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun tan (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun tanh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-}
-
-public abstract interface class space/kscience/kmath/tensors/LinearOpsTensorAlgebra : space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
-	public abstract fun cholesky (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun det (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun inv (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun lu (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Pair;
-	public abstract fun luPivot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
-	public abstract fun qr (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Pair;
-	public abstract fun svd (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
-	public abstract fun symEig (Lspace/kscience/kmath/nd/MutableStructureND;Z)Lkotlin/Pair;
-}
-
-public final class space/kscience/kmath/tensors/LinearOpsTensorAlgebra$DefaultImpls {
-	public static synthetic fun symEig$default (Lspace/kscience/kmath/tensors/LinearOpsTensorAlgebra;Lspace/kscience/kmath/nd/MutableStructureND;ZILjava/lang/Object;)Lkotlin/Pair;
-}
-
-public abstract interface class space/kscience/kmath/tensors/TensorAlgebra {
-	public abstract fun diagonalEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;III)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun dot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun get (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun minus (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun minus (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun minus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
-	public abstract fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public abstract fun plus (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun plusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
-	public abstract fun plusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public abstract fun times (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun times (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun times (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun timesAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
-	public abstract fun timesAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public abstract fun transpose (Lspace/kscience/kmath/nd/MutableStructureND;II)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun unaryMinus (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun value (Lspace/kscience/kmath/nd/MutableStructureND;)Ljava/lang/Object;
-	public abstract fun view (Lspace/kscience/kmath/nd/MutableStructureND;[I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun viewAs (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-}
-
-public final class space/kscience/kmath/tensors/TensorAlgebra$DefaultImpls {
-	public static synthetic fun diagonalEmbedding$default (Lspace/kscience/kmath/tensors/TensorAlgebra;Lspace/kscience/kmath/nd/MutableStructureND;IIIILjava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-}
-
-public abstract interface class space/kscience/kmath/tensors/TensorPartialDivisionAlgebra : space/kscience/kmath/tensors/TensorAlgebra {
-	public abstract fun div (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun div (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public abstract fun divAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
-	public abstract fun divAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-}
-
-public final class space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra {
-	public fun <init> ()V
-	public synthetic fun div (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun div (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun divAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public fun divAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
-	public synthetic fun minus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun minus (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public fun minusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
-	public synthetic fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun plus (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun plusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public fun plusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
-	public synthetic fun times (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun times (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun timesAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public fun timesAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
-}
-
-public final class space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebraKt {
-	public static final fun BroadcastDoubleTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
-}
-
-public class space/kscience/kmath/tensors/core/BufferedTensor : space/kscience/kmath/nd/MutableStructureND {
-	public fun <init> ([ILspace/kscience/kmath/structures/MutableBuffer;I)V
-	public fun elements ()Lkotlin/sequences/Sequence;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun get ([I)Ljava/lang/Object;
-	public final fun getBuffer ()Lspace/kscience/kmath/structures/MutableBuffer;
-	public fun getDimension ()I
-	public final fun getLinearStructure ()Lspace/kscience/kmath/tensors/core/TensorLinearStructure;
-	public final fun getNumel ()I
-	public fun getShape ()[I
-	public fun hashCode ()I
-	public fun set ([ILjava/lang/Object;)V
-}
-
-public final class space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra, space/kscience/kmath/tensors/AnalyticTensorAlgebra {
-	public fun <init> ()V
-	public synthetic fun acos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun acos (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun acosh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun acosh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun asin (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun asin (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun asinh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun asinh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun atan (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun atan (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun atanh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun atanh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun ceil (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun ceil (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun cos (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun cos (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun cosh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun cosh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun exp (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun exp (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun floor (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun floor (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun log (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun log (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun sin (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun sin (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun sinh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun sinh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun sqrt (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun sqrt (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun tan (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun tan (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun tanh (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun tanh (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-}
-
-public final class space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebraKt {
-	public static final fun DoubleAnalyticTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
-}
-
-public final class space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra : space/kscience/kmath/tensors/core/DoubleTensorAlgebra, space/kscience/kmath/tensors/LinearOpsTensorAlgebra {
-	public fun <init> ()V
-	public synthetic fun cholesky (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun cholesky (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun det (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun det (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public final fun detLU (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun inv (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun inv (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public final fun invLU (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun lu (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Pair;
-	public fun lu (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lkotlin/Pair;
-	public synthetic fun luPivot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
-	public fun luPivot (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/IntTensor;)Lkotlin/Triple;
-	public synthetic fun qr (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Pair;
-	public fun qr (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lkotlin/Pair;
-	public synthetic fun svd (Lspace/kscience/kmath/nd/MutableStructureND;)Lkotlin/Triple;
-	public fun svd (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lkotlin/Triple;
-	public synthetic fun symEig (Lspace/kscience/kmath/nd/MutableStructureND;Z)Lkotlin/Pair;
-	public fun symEig (Lspace/kscience/kmath/tensors/core/DoubleTensor;Z)Lkotlin/Pair;
-}
-
-public final class space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebraKt {
-	public static final fun DoubleLinearOpsTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
-}
-
-public final class space/kscience/kmath/tensors/core/DoubleTensor : space/kscience/kmath/tensors/core/BufferedTensor {
-}
-
-public class space/kscience/kmath/tensors/core/DoubleTensorAlgebra : space/kscience/kmath/tensors/TensorPartialDivisionAlgebra {
-	public fun <init> ()V
-	public final fun contentEquals (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Z
-	public final fun contentEquals (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lkotlin/jvm/functions/Function2;)Z
-	public static synthetic fun contentEquals$default (Lspace/kscience/kmath/tensors/core/DoubleTensorAlgebra;Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;DILjava/lang/Object;)Z
-	public final fun copy (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun diagonalEmbedding (Lspace/kscience/kmath/nd/MutableStructureND;III)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun diagonalEmbedding (Lspace/kscience/kmath/tensors/core/DoubleTensor;III)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun div (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public synthetic fun div (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun div (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public fun div (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun divAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
-	public synthetic fun divAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public fun divAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)V
-	public fun divAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
-	public synthetic fun dot (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun dot (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public final fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Z
-	public final fun eq (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Z
-	public final fun eye (I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public final fun fromArray ([I[D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public final fun full (D[I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public final fun fullLike (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun get (Lspace/kscience/kmath/nd/MutableStructureND;I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun get (Lspace/kscience/kmath/tensors/core/DoubleTensor;I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public final fun map (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public fun minus (DLspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun minus (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public synthetic fun minus (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public synthetic fun minus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun minus (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public fun minus (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
-	public synthetic fun minusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public fun minusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)V
-	public fun minusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
-	public final fun ones ([I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public final fun onesLike (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public fun plus (DLspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun plus (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public synthetic fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public synthetic fun plus (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun plus (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public fun plus (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun plusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
-	public synthetic fun plusAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public fun plusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)V
-	public fun plusAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
-	public fun times (DLspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun times (Ljava/lang/Object;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public synthetic fun times (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public synthetic fun times (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun times (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public fun times (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun timesAssign (Lspace/kscience/kmath/nd/MutableStructureND;Ljava/lang/Object;)V
-	public synthetic fun timesAssign (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)V
-	public fun timesAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;D)V
-	public fun timesAssign (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)V
-	public synthetic fun transpose (Lspace/kscience/kmath/nd/MutableStructureND;II)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun transpose (Lspace/kscience/kmath/tensors/core/DoubleTensor;II)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun unaryMinus (Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun unaryMinus (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun value (Lspace/kscience/kmath/nd/MutableStructureND;)Ljava/lang/Object;
-	public fun value (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Ljava/lang/Double;
-	public synthetic fun view (Lspace/kscience/kmath/nd/MutableStructureND;[I)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun view (Lspace/kscience/kmath/tensors/core/DoubleTensor;[I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public synthetic fun viewAs (Lspace/kscience/kmath/nd/MutableStructureND;Lspace/kscience/kmath/nd/MutableStructureND;)Lspace/kscience/kmath/nd/MutableStructureND;
-	public fun viewAs (Lspace/kscience/kmath/tensors/core/DoubleTensor;Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public final fun zeroesLike (Lspace/kscience/kmath/tensors/core/DoubleTensor;)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-	public final fun zeros ([I)Lspace/kscience/kmath/tensors/core/DoubleTensor;
-}
-
-public final class space/kscience/kmath/tensors/core/DoubleTensorAlgebraKt {
-	public static final fun DoubleTensorAlgebra (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
-}
-
-public final class space/kscience/kmath/tensors/core/FloatTensor : space/kscience/kmath/tensors/core/BufferedTensor {
-}
-
-public final class space/kscience/kmath/tensors/core/IntTensor : space/kscience/kmath/tensors/core/BufferedTensor {
-}
-
-public final class space/kscience/kmath/tensors/core/LongTensor : space/kscience/kmath/tensors/core/BufferedTensor {
-}
-
-public final class space/kscience/kmath/tensors/core/TensorLinearStructure {
-	public fun <init> ([I)V
-	public final fun getShape ()[I
-	public final fun getSize ()I
-	public final fun getStrides ()[I
-	public final fun index (I)[I
-	public final fun indices ()Lkotlin/sequences/Sequence;
-	public final fun offset ([I)I
-	public final fun stepIndex ([I)[I
-}
-
diff --git a/kmath-tensors/build.gradle.kts b/kmath-tensors/build.gradle.kts
new file mode 100644
index 000000000..8e823416b
--- /dev/null
+++ b/kmath-tensors/build.gradle.kts
@@ -0,0 +1,16 @@
+plugins {
+    id("ru.mipt.npm.gradle.mpp")
+}
+
+kotlin.sourceSets {
+    commonMain {
+        dependencies {
+            api(project(":kmath-core"))
+            api(project(":kmath-stat"))
+        }
+    }
+}
+
+readme {
+    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
similarity index 100%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
similarity index 100%
rename from kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
rename to kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
similarity index 100%
rename from kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
rename to kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
similarity index 100%
rename from kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
rename to kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
similarity index 100%
rename from kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
rename to kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
similarity index 100%
rename from kmath-core/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
rename to kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4467d5ed6..ffc93d576 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -40,5 +40,6 @@ include(
     ":kmath-ast",
     ":kmath-ejml",
     ":kmath-kotlingrad",
+    ":kmath-tensors",
     ":examples"
 )
-- 
2.34.1


From 706a44fd3300f050115e4b40042fe32046b181e0 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 31 Mar 2021 09:15:55 +0100
Subject: [PATCH 082/713] get normals TBD

---
 .../space/kscience/kmath/tensors/core/utils.kt       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index d8a073d64..e46d39cf2 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -1,5 +1,7 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.stat.samplers.BoxMullerNormalizedGaussianSampler
 import space.kscience.kmath.structures.*
 import kotlin.random.Random
 import kotlin.math.*
@@ -35,8 +37,10 @@ internal fun Buffer<Double>.array(): DoubleArray = when (this) {
     is DoubleBuffer -> array
     else -> throw RuntimeException("Failed to cast Buffer to DoubleArray")
 }
-
-internal inline fun getRandomNormals(n: Int, seed: Long): DoubleArray {
-    val u = Random(seed)
-    return (0 until n).map { sqrt(-2.0 * ln(u.nextDouble())) * cos(2.0 * PI * u.nextDouble()) }.toDoubleArray()
+/*
+internal inline fun getRandomNormals(n: Int,): DoubleArray {
+    val sampler = BoxMullerNormalizedGaussianSampler.of()
+    val chain = sampler.sample(RandomGenerator.default)
+    return (0 until n).map { chain.next() }.toDoubleArray()
 }
+*/
\ No newline at end of file
-- 
2.34.1


From b36281fa39d810ae1e60d2e7a9e042be754b8687 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 31 Mar 2021 09:23:41 +0100
Subject: [PATCH 083/713] roll back

---
 .../space/kscience/kmath/tensors/core/utils.kt       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index e46d39cf2..fc0ebe7fa 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -37,10 +37,8 @@ internal fun Buffer<Double>.array(): DoubleArray = when (this) {
     is DoubleBuffer -> array
     else -> throw RuntimeException("Failed to cast Buffer to DoubleArray")
 }
-/*
-internal inline fun getRandomNormals(n: Int,): DoubleArray {
-    val sampler = BoxMullerNormalizedGaussianSampler.of()
-    val chain = sampler.sample(RandomGenerator.default)
-    return (0 until n).map { chain.next() }.toDoubleArray()
-}
-*/
\ No newline at end of file
+
+internal inline fun getRandomNormals(n: Int, seed: Long): DoubleArray {
+    val u = Random(seed)
+    return (0 until n).map { sqrt(-2.0 * ln(u.nextDouble())) * cos(2.0 * PI * u.nextDouble()) }.toDoubleArray()
+}
\ No newline at end of file
-- 
2.34.1


From 3e98240b94b99170ffd8525d9b307ac6c715ebd6 Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Thu, 1 Apr 2021 20:21:14 +0300
Subject: [PATCH 084/713] add function diagonalEmbedding with tests

---
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 42 ++++++++++++++++++-
 .../tensors/core/TestDoubleTensorAlgebra.kt   | 33 +++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 323ade45d..ab692c0f9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -283,7 +283,47 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun diagonalEmbedding(diagonalEntries: DoubleTensor, offset: Int, dim1: Int, dim2: Int): DoubleTensor {
-        TODO("Alya")
+        val n = diagonalEntries.shape.size
+        if (dim1 == dim2) {
+            throw RuntimeException("Diagonal dimensions cannot be identical $dim1, $dim2")
+        }
+        if (dim1 > n || dim2 > n) {
+            throw RuntimeException("Dimension out of range")
+        }
+
+        var lessDim = dim1
+        var greaterDim = dim2
+        var realOffset = offset
+        if (lessDim > greaterDim) {
+            realOffset *= -1
+            lessDim = greaterDim.also {greaterDim = lessDim}
+        }
+
+        val resShape = diagonalEntries.shape.slice(0 until lessDim).toIntArray() +
+                intArrayOf(diagonalEntries.shape[n - 1] + abs(realOffset)) +
+                diagonalEntries.shape.slice(lessDim until greaterDim - 1).toIntArray() +
+                intArrayOf(diagonalEntries.shape[n - 1] + abs(realOffset)) +
+                diagonalEntries.shape.slice(greaterDim - 1 until n - 1).toIntArray()
+        val resTensor = zeros(resShape)
+
+        for (i in 0 until diagonalEntries.linearStructure.size) {
+            val multiIndex = diagonalEntries.linearStructure.index(i)
+
+            var offset1 = 0
+            var offset2 = abs(realOffset)
+            if (realOffset < 0) {
+                offset1 = offset2.also {offset2 = offset1}
+            }
+            val diagonalMultiIndex = multiIndex.slice(0 until lessDim).toIntArray() +
+                    intArrayOf(multiIndex[n - 1] + offset1) +
+                    multiIndex.slice(lessDim until greaterDim - 1).toIntArray() +
+                    intArrayOf(multiIndex[n - 1] + offset2) +
+                    multiIndex.slice(greaterDim - 1 until n - 1).toIntArray()
+
+            resTensor[diagonalMultiIndex] = diagonalEntries[multiIndex]
+        }
+
+        return resTensor
     }
 
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 168d80a9d..692db69af 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -115,6 +115,39 @@ class TestDoubleTensorAlgebra {
         assertTrue(tensor4.dot(tensor5).shape contentEquals intArrayOf(5, 4, 2, 8, 3, 8, 5))
     }
 
+    @Test
+    fun diagonalEmbedding() = DoubleTensorAlgebra {
+        val tensor1 = fromArray(intArrayOf(3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor3 = zeros(intArrayOf(2, 3, 4, 5))
+
+        assertTrue(diagonalEmbedding(tensor3, 0, 3, 4).shape contentEquals
+                intArrayOf(2, 3, 4, 5, 5))
+        assertTrue(diagonalEmbedding(tensor3, 1, 3, 4).shape contentEquals
+                intArrayOf(2, 3, 4, 6, 6))
+        assertTrue(diagonalEmbedding(tensor3, 2, 0, 3).shape contentEquals
+                intArrayOf(7, 2, 3, 7, 4))
+
+        val diagonal1 = diagonalEmbedding(tensor1, 0, 1, 0)
+        assertTrue(diagonal1.shape contentEquals intArrayOf(3, 3))
+        assertTrue(diagonal1.buffer.array() contentEquals
+                doubleArrayOf(10.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 30.0))
+
+        val diagonal1_offset = diagonalEmbedding(tensor1, 1, 1, 0)
+        assertTrue(diagonal1_offset.shape contentEquals intArrayOf(4, 4))
+        assertTrue(diagonal1_offset.buffer.array() contentEquals
+                doubleArrayOf(0.0, 0.0, 0.0, 0.0, 10.0, 0.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 0.0, 30.0, 0.0))
+
+        val diagonal2 = diagonalEmbedding(tensor2, 1, 0, 2)
+        assertTrue(diagonal2.shape contentEquals intArrayOf(4, 2, 4))
+        assertTrue(diagonal2.buffer.array() contentEquals
+                doubleArrayOf(
+                    0.0, 1.0, 0.0, 0.0, 0.0, 4.0, 0.0, 0.0,
+                    0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 5.0, 0.0,
+                    0.0, 0.0, 0.0, 3.0, 0.0, 0.0, 0.0, 6.0,
+                    0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0))
+    }
+
     @Test
     fun testContentEqual() = DoubleTensorAlgebra {
         //TODO()
-- 
2.34.1


From 814eab8cde1dff4b94b49efbb8d93c6b0bc06002 Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Tue, 6 Apr 2021 00:06:14 +0300
Subject: [PATCH 085/713] implement svd function and tests for it

---
 .../core/DoubleLinearOpsTensorAlgebra.kt      | 77 ++++++++++++++++++-
 .../core/TestDoubleLinearOpsAlgebra.kt        | 32 ++++++++
 2 files changed, 108 insertions(+), 1 deletion(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index c571fe446..fbd9da18e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -3,6 +3,8 @@ package space.kscience.kmath.tensors.core
 import space.kscience.kmath.tensors.LinearOpsTensorAlgebra
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
+import kotlin.math.abs
+import kotlin.math.min
 
 public class DoubleLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double, DoubleTensor, IntTensor>,
@@ -89,8 +91,81 @@ public class DoubleLinearOpsTensorAlgebra :
         return qTensor to rTensor
     }
 
+    internal fun svd1d(a: DoubleTensor, epsilon: Double = 1e-10): DoubleTensor {
+        val (n, m) = a.shape
+        var v: DoubleTensor
+        val b: DoubleTensor
+        if (n > m) {
+            b = a.transpose(0, 1).dot(a)
+            v = DoubleTensor(intArrayOf(m), getRandomNormals(m, 0))
+        } else {
+            b = a.dot(a.transpose(0, 1))
+            v = DoubleTensor(intArrayOf(n), getRandomNormals(n, 0))
+        }
+
+        var lastV: DoubleTensor
+        while (true) {
+            lastV = v
+            v = b.dot(lastV)
+            val norm = DoubleAnalyticTensorAlgebra { (v dot v).sqrt().value() }
+            v = v.times(1.0 / norm)
+            if (abs(v.dot(lastV).value()) > 1 - epsilon) {
+                return v
+            }
+        }
+    }
+
     override fun DoubleTensor.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        TODO("ALYA")
+        val size = this.shape.size
+        val commonShape = this.shape.sliceArray(0 until size - 2)
+        val (n, m) = this.shape.sliceArray(size - 2 until size)
+        val resU = zeros(commonShape + intArrayOf(n, min(n, m)))
+        val resS = zeros(commonShape + intArrayOf(min(n, m)))
+        val resV = zeros(commonShape + intArrayOf(min(n, m), m))
+
+        for ((matrix, USV) in this.matrixSequence()
+            .zip(resU.matrixSequence().zip(resS.vectorSequence().zip(resV.matrixSequence())))) {
+            val res = ArrayList<Triple<Double, DoubleTensor, DoubleTensor>>(0)
+            val (matrixU, SV) = USV
+            val (matrixS, matrixV) = SV
+
+            for (k in 0 until min(n, m)) {
+                var a = matrix.asTensor().copy()
+                for ((singularValue, u, v) in res.slice(0 until k)) {
+                    val outerProduct = DoubleArray(u.shape[0] * v.shape[0])
+                    for (i in 0 until u.shape[0]) {
+                        for (j in 0 until v.shape[0]) {
+                            outerProduct[i * v.shape[0] + j] = u[i].value() * v[j].value()
+                        }
+                    }
+                    a = a - singularValue.times(DoubleTensor(intArrayOf(u.shape[0], v.shape[0]), outerProduct))
+                }
+                var v: DoubleTensor
+                var u: DoubleTensor
+                var norm: Double
+                if (n > m) {
+                    v = svd1d(a)
+                    u = matrix.asTensor().dot(v)
+                    norm = DoubleAnalyticTensorAlgebra { (u dot u).sqrt().value() }
+                    u = u.times(1.0 / norm)
+                } else {
+                    u = svd1d(a)
+                    v = matrix.asTensor().transpose(0, 1).dot(u)
+                    norm = DoubleAnalyticTensorAlgebra { (v dot v).sqrt().value() }
+                    v = v.times(1.0 / norm)
+                }
+
+                res.add(Triple(norm, u, v))
+            }
+
+            val s = res.map { it.first }.toDoubleArray()
+            val uBuffer = res.map { it.second }.flatMap { it.buffer.array().toList() }.toDoubleArray()
+            val vBuffer = res.map { it.third }.flatMap { it.buffer.array().toList() }.toDoubleArray()
+            uBuffer.copyInto(matrixU.buffer.array())
+            s.copyInto(matrixS.buffer.array())
+            vBuffer.copyInto(matrixV.buffer.array())
+        }
+        return Triple(resU, resS, resV.transpose(size - 2, size - 1))
     }
 
     override fun DoubleTensor.symEig(eigenvectors: Boolean): Pair<DoubleTensor, DoubleTensor> {
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index b79c54dd1..843707153 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -122,4 +122,36 @@ class TestDoubleLinearOpsTensorAlgebra {
 
         assertTrue { p.dot(tensor).buffer.array().epsEqual(l.dot(u).buffer.array()) }
     }
+
+    @Test
+    fun svd1d() = DoubleLinearOpsTensorAlgebra {
+        val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+
+        val res = svd1d(tensor2)
+
+        assertTrue(res.shape contentEquals intArrayOf(2))
+        assertTrue { abs(abs(res.buffer.array()[res.bufferStart]) -  0.386) < 0.01}
+        assertTrue { abs(abs(res.buffer.array()[res.bufferStart + 1]) -  0.922) < 0.01}
+    }
+
+    @Test
+    fun svd() = DoubleLinearOpsTensorAlgebra {
+        val epsilon = 1e-10
+        fun test_tensor(tensor: DoubleTensor) {
+            val svd = tensor.svd()
+
+            val tensorSVD = svd.first
+                .dot(
+                    diagonalEmbedding(svd.second, 0, 0, 1)
+                        .dot(svd.third.transpose(0, 1))
+                )
+
+            for ((x1, x2) in tensor.buffer.array() zip tensorSVD.buffer.array()) {
+                assertTrue { abs(x1 - x2) < epsilon }
+            }
+        }
+        test_tensor(fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0)))
+        test_tensor(fromArray(intArrayOf(2, 2), doubleArrayOf(-1.0, 0.0, 239.0, 238.0)))
+
+    }
 }
-- 
2.34.1


From 4336788a6ba846af6a63be1352d1bec1c1f39b56 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 6 Apr 2021 09:00:13 +0100
Subject: [PATCH 086/713] Moving Alya's SVD implementation to linutils

---
 .../core/DoubleLinearOpsTensorAlgebra.kt      | 66 +---------------
 .../kscience/kmath/tensors/core/linutils.kt   | 76 ++++++++++++++++++-
 .../core/TestDoubleLinearOpsAlgebra.kt        |  4 +-
 3 files changed, 78 insertions(+), 68 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index fbd9da18e..7db812d9d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -91,29 +91,6 @@ public class DoubleLinearOpsTensorAlgebra :
         return qTensor to rTensor
     }
 
-    internal fun svd1d(a: DoubleTensor, epsilon: Double = 1e-10): DoubleTensor {
-        val (n, m) = a.shape
-        var v: DoubleTensor
-        val b: DoubleTensor
-        if (n > m) {
-            b = a.transpose(0, 1).dot(a)
-            v = DoubleTensor(intArrayOf(m), getRandomNormals(m, 0))
-        } else {
-            b = a.dot(a.transpose(0, 1))
-            v = DoubleTensor(intArrayOf(n), getRandomNormals(n, 0))
-        }
-
-        var lastV: DoubleTensor
-        while (true) {
-            lastV = v
-            v = b.dot(lastV)
-            val norm = DoubleAnalyticTensorAlgebra { (v dot v).sqrt().value() }
-            v = v.times(1.0 / norm)
-            if (abs(v.dot(lastV).value()) > 1 - epsilon) {
-                return v
-            }
-        }
-    }
 
     override fun DoubleTensor.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         val size = this.shape.size
@@ -124,47 +101,8 @@ public class DoubleLinearOpsTensorAlgebra :
         val resV = zeros(commonShape + intArrayOf(min(n, m), m))
 
         for ((matrix, USV) in this.matrixSequence()
-            .zip(resU.matrixSequence().zip(resS.vectorSequence().zip(resV.matrixSequence())))) {
-            val res = ArrayList<Triple<Double, DoubleTensor, DoubleTensor>>(0)
-            val (matrixU, SV) = USV
-            val (matrixS, matrixV) = SV
-
-            for (k in 0 until min(n, m)) {
-                var a = matrix.asTensor().copy()
-                for ((singularValue, u, v) in res.slice(0 until k)) {
-                    val outerProduct = DoubleArray(u.shape[0] * v.shape[0])
-                    for (i in 0 until u.shape[0]) {
-                        for (j in 0 until v.shape[0]) {
-                            outerProduct[i * v.shape[0] + j] = u[i].value() * v[j].value()
-                        }
-                    }
-                    a = a - singularValue.times(DoubleTensor(intArrayOf(u.shape[0], v.shape[0]), outerProduct))
-                }
-                var v: DoubleTensor
-                var u: DoubleTensor
-                var norm: Double
-                if (n > m) {
-                    v = svd1d(a)
-                    u = matrix.asTensor().dot(v)
-                    norm = DoubleAnalyticTensorAlgebra { (u dot u).sqrt().value() }
-                    u = u.times(1.0 / norm)
-                } else {
-                    u = svd1d(a)
-                    v = matrix.asTensor().transpose(0, 1).dot(u)
-                    norm = DoubleAnalyticTensorAlgebra { (v dot v).sqrt().value() }
-                    v = v.times(1.0 / norm)
-                }
-
-                res.add(Triple(norm, u, v))
-            }
-
-            val s = res.map { it.first }.toDoubleArray()
-            val uBuffer = res.map { it.second }.flatMap { it.buffer.array().toList() }.toDoubleArray()
-            val vBuffer = res.map { it.third }.flatMap { it.buffer.array().toList() }.toDoubleArray()
-            uBuffer.copyInto(matrixU.buffer.array())
-            s.copyInto(matrixS.buffer.array())
-            vBuffer.copyInto(matrixV.buffer.array())
-        }
+            .zip(resU.matrixSequence().zip(resS.vectorSequence().zip(resV.matrixSequence()))))
+            svdHelper(matrix.asTensor(), USV, m, n)
         return Triple(resU, resS, resV.transpose(size - 2, size - 1))
     }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
index f6cf71b07..e1d5c1819 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
@@ -4,6 +4,8 @@ import space.kscience.kmath.nd.MutableStructure1D
 import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
+import kotlin.math.abs
+import kotlin.math.min
 import kotlin.math.sqrt
 
 
@@ -195,8 +197,8 @@ internal inline fun DoubleLinearOpsTensorAlgebra.qrHelper(
     checkSquareMatrix(matrix.shape)
     val n = matrix.shape[0]
     val qM = q.as2D()
-    val matrixT = matrix.transpose(0,1)
-    val qT = q.transpose(0,1)
+    val matrixT = matrix.transpose(0, 1)
+    val qT = q.transpose(0, 1)
 
     for (j in 0 until n) {
         val v = matrixT[j]
@@ -216,3 +218,73 @@ internal inline fun DoubleLinearOpsTensorAlgebra.qrHelper(
         }
     }
 }
+
+internal inline fun DoubleLinearOpsTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double = 1e-10): DoubleTensor {
+    val (n, m) = a.shape
+    var v: DoubleTensor
+    val b: DoubleTensor
+    if (n > m) {
+        b = a.transpose(0, 1).dot(a)
+        v = DoubleTensor(intArrayOf(m), getRandomNormals(m, 0))
+    } else {
+        b = a.dot(a.transpose(0, 1))
+        v = DoubleTensor(intArrayOf(n), getRandomNormals(n, 0))
+    }
+
+    var lastV: DoubleTensor
+    while (true) {
+        lastV = v
+        v = b.dot(lastV)
+        val norm = DoubleAnalyticTensorAlgebra { (v dot v).sqrt().value() }
+        v = v.times(1.0 / norm)
+        if (abs(v.dot(lastV).value()) > 1 - epsilon) {
+            return v
+        }
+    }
+}
+
+internal inline fun DoubleLinearOpsTensorAlgebra.svdHelper(
+    matrix: DoubleTensor,
+    USV: Pair<BufferedTensor<Double>, Pair<BufferedTensor<Double>, BufferedTensor<Double>>>,
+    m: Int, n: Int
+): Unit {
+    val res = ArrayList<Triple<Double, DoubleTensor, DoubleTensor>>(0)
+    val (matrixU, SV) = USV
+    val (matrixS, matrixV) = SV
+
+    for (k in 0 until min(n, m)) {
+        var a = matrix.copy()
+        for ((singularValue, u, v) in res.slice(0 until k)) {
+            val outerProduct = DoubleArray(u.shape[0] * v.shape[0])
+            for (i in 0 until u.shape[0]) {
+                for (j in 0 until v.shape[0]) {
+                    outerProduct[i * v.shape[0] + j] = u[i].value() * v[j].value()
+                }
+            }
+            a = a - singularValue.times(DoubleTensor(intArrayOf(u.shape[0], v.shape[0]), outerProduct))
+        }
+        var v: DoubleTensor
+        var u: DoubleTensor
+        var norm: Double
+        if (n > m) {
+            v = svd1d(a)
+            u = matrix.dot(v)
+            norm = DoubleAnalyticTensorAlgebra { (u dot u).sqrt().value() }
+            u = u.times(1.0 / norm)
+        } else {
+            u = svd1d(a)
+            v = matrix.transpose(0, 1).dot(u)
+            norm = DoubleAnalyticTensorAlgebra { (v dot v).sqrt().value() }
+            v = v.times(1.0 / norm)
+        }
+
+        res.add(Triple(norm, u, v))
+    }
+
+    val s = res.map { it.first }.toDoubleArray()
+    val uBuffer = res.map { it.second }.flatMap { it.buffer.array().toList() }.toDoubleArray()
+    val vBuffer = res.map { it.third }.flatMap { it.buffer.array().toList() }.toDoubleArray()
+    uBuffer.copyInto(matrixU.buffer.array())
+    s.copyInto(matrixS.buffer.array())
+    vBuffer.copyInto(matrixV.buffer.array())
+}
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 843707153..60f7f4a97 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -124,7 +124,7 @@ class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun svd1d() = DoubleLinearOpsTensorAlgebra {
+    fun testSVD1D() = DoubleLinearOpsTensorAlgebra {
         val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
 
         val res = svd1d(tensor2)
@@ -135,7 +135,7 @@ class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun svd() = DoubleLinearOpsTensorAlgebra {
+    fun testSVD() = DoubleLinearOpsTensorAlgebra {
         val epsilon = 1e-10
         fun test_tensor(tensor: DoubleTensor) {
             val svd = tensor.svd()
-- 
2.34.1


From dcdc22dd9dddf8d3157fb51f1ee7b6bf226b3b8c Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 6 Apr 2021 11:04:00 +0100
Subject: [PATCH 087/713] SVD test to be fixed

---
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  2 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  6 ++
 .../kscience/kmath/tensors/core/utils.kt      |  2 -
 .../core/TestDoubleLinearOpsAlgebra.kt        | 65 +++++++++++--------
 4 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index d7c6eaefd..966806de1 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -40,7 +40,7 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     //https://pytorch.org/docs/stable/generated/torch.diag_embed.html
     public fun diagonalEmbedding(
         diagonalEntries: TensorType,
-        offset: Int = 0, dim1: Int = -2, dim2: Int = -1
+        offset: Int = 0, dim1: Int = 0, dim2: Int = 1
     ): TensorType
 
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index ab692c0f9..53063a066 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -362,6 +362,12 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return true
     }
 
+    public fun randNormal(shape: IntArray, seed: Long = 0): DoubleTensor =
+        DoubleTensor(shape, getRandomNormals(shape.reduce(Int::times), seed))
+
+    public fun DoubleTensor.randNormalLike(seed: Long = 0): DoubleTensor =
+        DoubleTensor(this.shape, getRandomNormals(this.shape.reduce(Int::times), seed))
+
 }
 
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index fc0ebe7fa..5fd3cfd28 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -1,7 +1,5 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.stat.samplers.BoxMullerNormalizedGaussianSampler
 import space.kscience.kmath.structures.*
 import kotlin.random.Random
 import kotlin.math.*
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 60f7f4a97..0bd0ff5bd 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -7,21 +7,6 @@ import kotlin.test.assertTrue
 
 class TestDoubleLinearOpsTensorAlgebra {
 
-    private val eps = 1e-5
-
-    private fun Double.epsEqual(other: Double): Boolean {
-        return abs(this - other) < eps
-    }
-
-    fun DoubleArray.epsEqual(other: DoubleArray, eps: Double = 1e-5): Boolean {
-        for ((elem1, elem2) in this.asSequence().zip(other.asSequence())) {
-            if (abs(elem1 - elem2) > eps) {
-                return false
-            }
-        }
-        return true
-    }
-
     @Test
     fun testDetLU() = DoubleLinearOpsTensorAlgebra {
         val tensor = fromArray(
@@ -136,22 +121,46 @@ class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testSVD() = DoubleLinearOpsTensorAlgebra {
-        val epsilon = 1e-10
-        fun test_tensor(tensor: DoubleTensor) {
-            val svd = tensor.svd()
+        testSVDFor(fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0)))
+        testSVDFor(fromArray(intArrayOf(2, 2), doubleArrayOf(-1.0, 0.0, 239.0, 238.0)))
+    }
 
-            val tensorSVD = svd.first
-                .dot(
-                    diagonalEmbedding(svd.second, 0, 0, 1)
-                        .dot(svd.third.transpose(0, 1))
-                )
+    @Test
+    fun testBatchedSVD() = DoubleLinearOpsTensorAlgebra {
+        val tensor = randNormal(intArrayOf(7, 5, 3), 0)
+        val (tensorU, tensorS, tensorV) = tensor.svd()
+        val tensorSVD = tensorU dot (diagonalEmbedding(tensorS,0,1,2) dot tensorV)
+        println(tensor.eq(tensorSVD))
+    }
 
-            for ((x1, x2) in tensor.buffer.array() zip tensorSVD.buffer.array()) {
-                assertTrue { abs(x1 - x2) < epsilon }
-            }
+
+}
+
+private inline fun Double.epsEqual(other: Double, eps: Double = 1e-5): Boolean {
+    return abs(this - other) < eps
+}
+
+private inline fun DoubleArray.epsEqual(other: DoubleArray, eps: Double = 1e-5): Boolean {
+    for ((elem1, elem2) in this.asSequence().zip(other.asSequence())) {
+        if (abs(elem1 - elem2) > eps) {
+            return false
         }
-        test_tensor(fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0)))
-        test_tensor(fromArray(intArrayOf(2, 2), doubleArrayOf(-1.0, 0.0, 239.0, 238.0)))
+    }
+    return true
+}
 
+private inline fun DoubleLinearOpsTensorAlgebra.testSVDFor(tensor: DoubleTensor, epsilon: Double = 1e-10): Unit {
+    val svd = tensor.svd()
+
+    val tensorSVD = svd.first
+        .dot(
+            diagonalEmbedding(svd.second, 0, 0, 1)
+                .dot(svd.third.transpose(0, 1))
+        )
+
+    for ((x1, x2) in tensor.buffer.array() zip tensorSVD.buffer.array()) {
+        assertTrue { abs(x1 - x2) < epsilon }
     }
 }
+
+
-- 
2.34.1


From 2bbe10e41c83e5ce44a920ad0a4c071b7d25f252 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 6 Apr 2021 11:41:41 +0100
Subject: [PATCH 088/713] SymEig test

---
 .../tensors/core/TestDoubleLinearOpsAlgebra.kt     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 0bd0ff5bd..29632e771 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -1,6 +1,7 @@
 package space.kscience.kmath.tensors.core
 
 import kotlin.math.abs
+import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -125,12 +126,21 @@ class TestDoubleLinearOpsTensorAlgebra {
         testSVDFor(fromArray(intArrayOf(2, 2), doubleArrayOf(-1.0, 0.0, 239.0, 238.0)))
     }
 
-    @Test
+    @Test @Ignore
     fun testBatchedSVD() = DoubleLinearOpsTensorAlgebra {
         val tensor = randNormal(intArrayOf(7, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
         val tensorSVD = tensorU dot (diagonalEmbedding(tensorS,0,1,2) dot tensorV)
-        println(tensor.eq(tensorSVD))
+        assertTrue(tensor.eq(tensorSVD))
+    }
+
+    @Test @Ignore
+    fun testBatchedSymEig() = DoubleLinearOpsTensorAlgebra {
+        val tensor = randNormal(shape = intArrayOf(5, 2, 2), 0)
+        val tensorSigma = tensor + tensor.transpose(1, 2)
+        val (tensorS, tensorV) = tensorSigma.symEig()
+        val tensorSigmaCalc = tensorV dot (diagonalEmbedding(tensorS, 0,1,2) dot tensorV.transpose(1, 2))
+        assertTrue(tensorSigma.eq(tensorSigmaCalc))
     }
 
 
-- 
2.34.1


From 174f6566e116b43e70622785c58291532b170369 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 6 Apr 2021 12:07:39 +0100
Subject: [PATCH 089/713] Negative indices

---
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  4 ++--
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 20 +++++++++++--------
 .../tensors/core/TensorLinearStructure.kt     |  3 +++
 .../kscience/kmath/tensors/core/utils.kt      | 12 ++++++++++-
 .../core/TestDoubleLinearOpsAlgebra.kt        |  4 ++--
 .../tensors/core/TestDoubleTensorAlgebra.kt   |  4 ++--
 6 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 966806de1..8fd1cf2ed 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -28,7 +28,7 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     public operator fun TensorType.get(i: Int): TensorType
 
     //https://pytorch.org/docs/stable/generated/torch.transpose.html
-    public fun TensorType.transpose(i: Int, j: Int): TensorType
+    public fun TensorType.transpose(i: Int = -2, j: Int = -1): TensorType
 
     //https://pytorch.org/docs/stable/tensor_view.html
     public fun TensorType.view(shape: IntArray): TensorType
@@ -40,7 +40,7 @@ public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
     //https://pytorch.org/docs/stable/generated/torch.diag_embed.html
     public fun diagonalEmbedding(
         diagonalEntries: TensorType,
-        offset: Int = 0, dim1: Int = 0, dim2: Int = 1
+        offset: Int = 0, dim1: Int = -2, dim2: Int = -1
     ): TensorType
 
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 53063a066..870dbe8a7 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -198,19 +198,21 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun DoubleTensor.transpose(i: Int, j: Int): DoubleTensor {
-        checkTranspose(this.dimension, i, j)
+        val ii = minusIndex(i)
+        val jj = minusIndex(j)
+        checkTranspose(this.dimension, ii, jj)
         val n = this.linearStructure.size
         val resBuffer = DoubleArray(n)
 
         val resShape = this.shape.copyOf()
-        resShape[i] = resShape[j].also { resShape[j] = resShape[i] }
+        resShape[ii] = resShape[jj].also { resShape[jj] = resShape[ii] }
 
         val resTensor = DoubleTensor(resShape, resBuffer)
 
         for (offset in 0 until n) {
             val oldMultiIndex = this.linearStructure.index(offset)
             val newMultiIndex = oldMultiIndex.copyOf()
-            newMultiIndex[i] = newMultiIndex[j].also { newMultiIndex[j] = newMultiIndex[i] }
+            newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
 
             val linearIndex = resTensor.linearStructure.offset(newMultiIndex)
             resTensor.buffer.array()[linearIndex] =
@@ -283,16 +285,18 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     }
 
     override fun diagonalEmbedding(diagonalEntries: DoubleTensor, offset: Int, dim1: Int, dim2: Int): DoubleTensor {
+        val d1 = minusIndexFrom(diagonalEntries.linearStructure.dim + 1, dim1)
+        val d2 = minusIndexFrom(diagonalEntries.linearStructure.dim + 1, dim2)
         val n = diagonalEntries.shape.size
-        if (dim1 == dim2) {
-            throw RuntimeException("Diagonal dimensions cannot be identical $dim1, $dim2")
+        if (d1 == d2) {
+            throw RuntimeException("Diagonal dimensions cannot be identical $d1, $d2")
         }
-        if (dim1 > n || dim2 > n) {
+        if (d1 > n || d2 > n) {
             throw RuntimeException("Dimension out of range")
         }
 
-        var lessDim = dim1
-        var greaterDim = dim2
+        var lessDim = d1
+        var greaterDim = d2
         var realOffset = offset
         if (lessDim > greaterDim) {
             realOffset *= -1
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
index 97ce29657..47745c2be 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
@@ -73,6 +73,9 @@ public class TensorLinearStructure(public val shape: IntArray)
     public val size: Int
         get() = shape.reduce(Int::times)
 
+    public val dim: Int
+        get() = shape.size
+
     public fun indices(): Sequence<IntArray> = (0 until size).asSequence().map {
         index(it)
     }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index 5fd3cfd28..785b59ede 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -39,4 +39,14 @@ internal fun Buffer<Double>.array(): DoubleArray = when (this) {
 internal inline fun getRandomNormals(n: Int, seed: Long): DoubleArray {
     val u = Random(seed)
     return (0 until n).map { sqrt(-2.0 * ln(u.nextDouble())) * cos(2.0 * PI * u.nextDouble()) }.toDoubleArray()
-}
\ No newline at end of file
+}
+
+internal inline fun minusIndexFrom(n: Int, i: Int) : Int = if (i >= 0) i else {
+    val ii = n + i
+    check(ii >= 0) {
+        "Out of bound index $i for tensor of dim $n"
+    }
+    ii
+}
+
+internal inline fun <T> BufferedTensor<T>.minusIndex(i: Int): Int =  minusIndexFrom(this.linearStructure.dim, i)
\ No newline at end of file
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 29632e771..56f9332f6 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -130,7 +130,7 @@ class TestDoubleLinearOpsTensorAlgebra {
     fun testBatchedSVD() = DoubleLinearOpsTensorAlgebra {
         val tensor = randNormal(intArrayOf(7, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
-        val tensorSVD = tensorU dot (diagonalEmbedding(tensorS,0,1,2) dot tensorV)
+        val tensorSVD = tensorU dot (diagonalEmbedding(tensorS) dot tensorV)
         assertTrue(tensor.eq(tensorSVD))
     }
 
@@ -139,7 +139,7 @@ class TestDoubleLinearOpsTensorAlgebra {
         val tensor = randNormal(shape = intArrayOf(5, 2, 2), 0)
         val tensorSigma = tensor + tensor.transpose(1, 2)
         val (tensorS, tensorV) = tensorSigma.symEig()
-        val tensorSigmaCalc = tensorV dot (diagonalEmbedding(tensorS, 0,1,2) dot tensorV.transpose(1, 2))
+        val tensorSigmaCalc = tensorV dot (diagonalEmbedding(tensorS) dot tensorV.transpose(1, 2))
         assertTrue(tensorSigma.eq(tensorSigmaCalc))
     }
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 692db69af..fa7a8fd32 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -35,8 +35,8 @@ class TestDoubleTensorAlgebra {
     fun transpose1x2x3() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res01 = tensor.transpose(0, 1)
-        val res02 = tensor.transpose(0, 2)
-        val res12 = tensor.transpose(1, 2)
+        val res02 = tensor.transpose(-3, 2)
+        val res12 = tensor.transpose()
 
         assertTrue(res01.shape contentEquals intArrayOf(2, 1, 3))
         assertTrue(res02.shape contentEquals intArrayOf(3, 2, 1))
-- 
2.34.1


From 74dfca4e2e265a17bcba9b4d968a56ddd5d07ad9 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 7 Apr 2021 15:11:00 +0100
Subject: [PATCH 090/713] Using kmath-stat for random normals

---
 .../kotlin/space/kscience/kmath/tensors/core/utils.kt    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index 785b59ede..c99f9d156 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -1,8 +1,8 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.samplers.GaussianSampler
+import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.*
-import kotlin.random.Random
-import kotlin.math.*
 
 /**
  * Returns a reference to [IntArray] containing all of the elements of this [Buffer].
@@ -37,8 +37,9 @@ internal fun Buffer<Double>.array(): DoubleArray = when (this) {
 }
 
 internal inline fun getRandomNormals(n: Int, seed: Long): DoubleArray {
-    val u = Random(seed)
-    return (0 until n).map { sqrt(-2.0 * ln(u.nextDouble())) * cos(2.0 * PI * u.nextDouble()) }.toDoubleArray()
+    val distribution = GaussianSampler(0.0, 1.0)
+    val generator = RandomGenerator.default(seed)
+    return distribution.sample(generator).nextBufferBlocking(n).toDoubleArray()
 }
 
 internal inline fun minusIndexFrom(n: Int, i: Int) : Int = if (i >= 0) i else {
-- 
2.34.1


From ea4d6618b4c2c7ecc22f82c4376b2b06904ff7c2 Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Thu, 8 Apr 2021 23:58:44 +0300
Subject: [PATCH 091/713] fix bugs in svd

---
 .../tensors/core/DoubleLinearOpsTensorAlgebra.kt | 14 ++++++++++----
 .../kscience/kmath/tensors/core/linutils.kt      | 16 +++++++++++-----
 .../space/kscience/kmath/tensors/core/utils.kt   |  7 +++++++
 .../tensors/core/TestDoubleLinearOpsAlgebra.kt   |  4 ++--
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 7db812d9d..83a41b80d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -96,14 +96,20 @@ public class DoubleLinearOpsTensorAlgebra :
         val size = this.shape.size
         val commonShape = this.shape.sliceArray(0 until size - 2)
         val (n, m) = this.shape.sliceArray(size - 2 until size)
-        val resU = zeros(commonShape + intArrayOf(n, min(n, m)))
+        val resU = zeros(commonShape + intArrayOf(min(n, m), n))
         val resS = zeros(commonShape + intArrayOf(min(n, m)))
         val resV = zeros(commonShape + intArrayOf(min(n, m), m))
 
         for ((matrix, USV) in this.matrixSequence()
-            .zip(resU.matrixSequence().zip(resS.vectorSequence().zip(resV.matrixSequence()))))
-            svdHelper(matrix.asTensor(), USV, m, n)
-        return Triple(resU, resS, resV.transpose(size - 2, size - 1))
+            .zip(resU.matrixSequence().zip(resS.vectorSequence().zip(resV.matrixSequence())))) {
+            val size = matrix.shape.reduce { acc, i -> acc * i }
+            val curMatrix = DoubleTensor(
+                matrix.shape,
+                matrix.buffer.array().slice(matrix.bufferStart until matrix.bufferStart + size).toDoubleArray()
+            )
+            svdHelper(curMatrix, USV, m, n)
+        }
+        return Triple(resU.transpose(size - 2, size - 1), resS, resV)
     }
 
     override fun DoubleTensor.symEig(eigenvectors: Boolean): Pair<DoubleTensor, DoubleTensor> {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
index e1d5c1819..1bdfee2d5 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
@@ -225,10 +225,10 @@ internal inline fun DoubleLinearOpsTensorAlgebra.svd1d(a: DoubleTensor, epsilon:
     val b: DoubleTensor
     if (n > m) {
         b = a.transpose(0, 1).dot(a)
-        v = DoubleTensor(intArrayOf(m), getRandomNormals(m, 0))
+        v = DoubleTensor(intArrayOf(m), getRandomUnitVector(m, 0))
     } else {
         b = a.dot(a.transpose(0, 1))
-        v = DoubleTensor(intArrayOf(n), getRandomNormals(n, 0))
+        v = DoubleTensor(intArrayOf(n), getRandomUnitVector(n, 0))
     }
 
     var lastV: DoubleTensor
@@ -284,7 +284,13 @@ internal inline fun DoubleLinearOpsTensorAlgebra.svdHelper(
     val s = res.map { it.first }.toDoubleArray()
     val uBuffer = res.map { it.second }.flatMap { it.buffer.array().toList() }.toDoubleArray()
     val vBuffer = res.map { it.third }.flatMap { it.buffer.array().toList() }.toDoubleArray()
-    uBuffer.copyInto(matrixU.buffer.array())
-    s.copyInto(matrixS.buffer.array())
-    vBuffer.copyInto(matrixV.buffer.array())
+    for (i in uBuffer.indices) {
+        matrixU.buffer.array()[matrixU.bufferStart + i] = uBuffer[i]
+    }
+    for (i in s.indices) {
+        matrixS.buffer.array()[matrixS.bufferStart + i] = s[i]
+    }
+    for (i in vBuffer.indices) {
+        matrixV.buffer.array()[matrixV.bufferStart + i] = vBuffer[i]
+    }
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index c99f9d156..392abd1c2 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -3,6 +3,7 @@ package space.kscience.kmath.tensors.core
 import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.*
+import kotlin.math.sqrt
 
 /**
  * Returns a reference to [IntArray] containing all of the elements of this [Buffer].
@@ -42,6 +43,12 @@ internal inline fun getRandomNormals(n: Int, seed: Long): DoubleArray {
     return distribution.sample(generator).nextBufferBlocking(n).toDoubleArray()
 }
 
+internal inline fun getRandomUnitVector(n: Int, seed: Long): DoubleArray {
+    val unnorm = getRandomNormals(n, seed)
+    val norm = sqrt(unnorm.map { it * it }.sum())
+    return unnorm.map { it / norm }.toDoubleArray()
+}
+
 internal inline fun minusIndexFrom(n: Int, i: Int) : Int = if (i >= 0) i else {
     val ii = n + i
     check(ii >= 0) {
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 56f9332f6..35390968e 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -126,9 +126,9 @@ class TestDoubleLinearOpsTensorAlgebra {
         testSVDFor(fromArray(intArrayOf(2, 2), doubleArrayOf(-1.0, 0.0, 239.0, 238.0)))
     }
 
-    @Test @Ignore
+    @Test
     fun testBatchedSVD() = DoubleLinearOpsTensorAlgebra {
-        val tensor = randNormal(intArrayOf(7, 5, 3), 0)
+        val tensor = randNormal(intArrayOf(1, 15, 4, 7, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
         val tensorSVD = tensorU dot (diagonalEmbedding(tensorS) dot tensorV)
         assertTrue(tensor.eq(tensorSVD))
-- 
2.34.1


From a09a1c7adc73615d46b4fa5d1611c3a694b8d5a8 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 9 Apr 2021 07:33:25 +0100
Subject: [PATCH 092/713] Fixed tests

---
 .../core/DoubleLinearOpsTensorAlgebra.kt      |  6 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  7 ---
 .../kscience/kmath/tensors/core/checks.kt     |  3 +-
 .../core/TestDoubleLinearOpsAlgebra.kt        | 63 ++++++++-----------
 4 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 83a41b80d..916361abe 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -93,7 +93,7 @@ public class DoubleLinearOpsTensorAlgebra :
 
 
     override fun DoubleTensor.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        val size = this.shape.size
+        val size = this.linearStructure.dim
         val commonShape = this.shape.sliceArray(0 until size - 2)
         val (n, m) = this.shape.sliceArray(size - 2 until size)
         val resU = zeros(commonShape + intArrayOf(min(n, m), n))
@@ -109,11 +109,11 @@ public class DoubleLinearOpsTensorAlgebra :
             )
             svdHelper(curMatrix, USV, m, n)
         }
-        return Triple(resU.transpose(size - 2, size - 1), resS, resV)
+        return Triple(resU.transpose(), resS, resV.transpose())
     }
 
     override fun DoubleTensor.symEig(eigenvectors: Boolean): Pair<DoubleTensor, DoubleTensor> {
-        TODO("ANDREI")
+        TODO()
     }
 
     public fun DoubleTensor.detLU(): DoubleTensor {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 870dbe8a7..8f355dd3d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -339,19 +339,12 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         )
     }
 
-    public fun DoubleTensor.contentEquals(other: DoubleTensor, delta: Double = 1e-5): Boolean {
-        return this.contentEquals(other) { x, y -> abs(x - y) < delta }
-    }
-
     public fun DoubleTensor.eq(other: DoubleTensor, delta: Double): Boolean {
         return this.eq(other) { x, y -> abs(x - y) < delta }
     }
 
     public fun DoubleTensor.eq(other: DoubleTensor): Boolean = this.eq(other, 1e-5)
 
-    public fun DoubleTensor.contentEquals(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean =
-        this.eq(other, eqFunction)
-
     private fun DoubleTensor.eq(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
         checkShapesCompatible(this, other)
         val n = this.linearStructure.size
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index 247ed3913..f994324ff 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -56,4 +56,5 @@ internal inline fun <T, TensorType : TensorStructure<T>,
     check(shape[n - 1] == shape[n - 2]) {
         "Tensor must be batches of square matrices, but they are ${shape[n - 1]} by ${shape[n - 1]} matrices"
     }
-}
\ No newline at end of file
+}
+
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 35390968e..df896bace 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -20,15 +20,17 @@ class TestDoubleLinearOpsTensorAlgebra {
             )
         )
 
-        val expectedShape = intArrayOf(2, 1)
-        val expectedBuffer = doubleArrayOf(
-            -1.0,
-            -7.0
+        val expectedTensor = fromArray(
+            intArrayOf(2, 1),
+            doubleArrayOf(
+                -1.0,
+                -7.0
+            )
         )
         val detTensor = tensor.detLU()
 
-        assertTrue { detTensor.shape contentEquals expectedShape }
-        assertTrue { detTensor.buffer.array().epsEqual(expectedBuffer) }
+        assertTrue(detTensor.eq(expectedTensor))
+
     }
 
     @Test
@@ -43,17 +45,17 @@ class TestDoubleLinearOpsTensorAlgebra {
             )
         )
 
-        val expectedShape = intArrayOf(2, 2, 2)
-        val expectedBuffer = doubleArrayOf(
-            1.0, 0.0,
-            0.0, 0.5,
-            0.0, 1.0,
-            1.0, -1.0
+        val expectedTensor = fromArray(
+            intArrayOf(2, 2, 2), doubleArrayOf(
+                1.0, 0.0,
+                0.0, 0.5,
+                0.0, 1.0,
+                1.0, -1.0
+            )
         )
 
         val invTensor = tensor.invLU()
-        assertTrue { invTensor.shape contentEquals expectedShape }
-        assertTrue { invTensor.buffer.array().epsEqual(expectedBuffer) }
+        assertTrue(invTensor.eq(expectedTensor))
     }
 
     @Test
@@ -80,7 +82,7 @@ class TestDoubleLinearOpsTensorAlgebra {
         assertTrue { q.shape contentEquals shape }
         assertTrue { r.shape contentEquals shape }
 
-        assertTrue { q.dot(r).buffer.array().epsEqual(buffer) }
+        assertTrue((q dot r).eq(tensor))
 
         //todo check orthogonality/upper triang.
     }
@@ -106,7 +108,7 @@ class TestDoubleLinearOpsTensorAlgebra {
         assertTrue { l.shape contentEquals shape }
         assertTrue { u.shape contentEquals shape }
 
-        assertTrue { p.dot(tensor).buffer.array().epsEqual(l.dot(u).buffer.array()) }
+        assertTrue((p dot tensor).eq(l dot u))
     }
 
     @Test
@@ -116,8 +118,8 @@ class TestDoubleLinearOpsTensorAlgebra {
         val res = svd1d(tensor2)
 
         assertTrue(res.shape contentEquals intArrayOf(2))
-        assertTrue { abs(abs(res.buffer.array()[res.bufferStart]) -  0.386) < 0.01}
-        assertTrue { abs(abs(res.buffer.array()[res.bufferStart + 1]) -  0.922) < 0.01}
+        assertTrue { abs(abs(res.buffer.array()[res.bufferStart]) - 0.386) < 0.01 }
+        assertTrue { abs(abs(res.buffer.array()[res.bufferStart + 1]) - 0.922) < 0.01 }
     }
 
     @Test
@@ -130,11 +132,12 @@ class TestDoubleLinearOpsTensorAlgebra {
     fun testBatchedSVD() = DoubleLinearOpsTensorAlgebra {
         val tensor = randNormal(intArrayOf(1, 15, 4, 7, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
-        val tensorSVD = tensorU dot (diagonalEmbedding(tensorS) dot tensorV)
+        val tensorSVD = tensorU dot (diagonalEmbedding(tensorS) dot tensorV.transpose())
         assertTrue(tensor.eq(tensorSVD))
     }
 
-    @Test @Ignore
+    @Test
+    @Ignore
     fun testBatchedSymEig() = DoubleLinearOpsTensorAlgebra {
         val tensor = randNormal(shape = intArrayOf(5, 2, 2), 0)
         val tensorSigma = tensor + tensor.transpose(1, 2)
@@ -146,31 +149,17 @@ class TestDoubleLinearOpsTensorAlgebra {
 
 }
 
-private inline fun Double.epsEqual(other: Double, eps: Double = 1e-5): Boolean {
-    return abs(this - other) < eps
-}
-
-private inline fun DoubleArray.epsEqual(other: DoubleArray, eps: Double = 1e-5): Boolean {
-    for ((elem1, elem2) in this.asSequence().zip(other.asSequence())) {
-        if (abs(elem1 - elem2) > eps) {
-            return false
-        }
-    }
-    return true
-}
 
 private inline fun DoubleLinearOpsTensorAlgebra.testSVDFor(tensor: DoubleTensor, epsilon: Double = 1e-10): Unit {
     val svd = tensor.svd()
 
     val tensorSVD = svd.first
         .dot(
-            diagonalEmbedding(svd.second, 0, 0, 1)
-                .dot(svd.third.transpose(0, 1))
+            diagonalEmbedding(svd.second)
+                .dot(svd.third.transpose())
         )
 
-    for ((x1, x2) in tensor.buffer.array() zip tensorSVD.buffer.array()) {
-        assertTrue { abs(x1 - x2) < epsilon }
-    }
+    assertTrue(tensor.eq(tensorSVD, epsilon))
 }
 
 
-- 
2.34.1


From 8c1131dd5818f75b1b0eb9e0b3ef23f12f6a7c07 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 9 Apr 2021 08:03:47 +0100
Subject: [PATCH 093/713] Approaching SymEig through SVD

---
 .../kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt      | 6 ++++--
 .../kotlin/space/kscience/kmath/tensors/core/checks.kt      | 4 ++++
 .../kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt        | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 916361abe..43502e79a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -67,7 +67,7 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     override fun DoubleTensor.cholesky(): DoubleTensor {
-        // todo checks
+        checkSymmetric(this)
         checkSquareMatrix(shape)
 
         val n = shape.last()
@@ -113,7 +113,9 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     override fun DoubleTensor.symEig(eigenvectors: Boolean): Pair<DoubleTensor, DoubleTensor> {
-        TODO()
+        checkSymmetric(this)
+        val svd = this.svd()
+        TODO("U might have some columns negative to V")
     }
 
     public fun DoubleTensor.detLU(): DoubleTensor {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index f994324ff..1f70eb300 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -58,3 +58,7 @@ internal inline fun <T, TensorType : TensorStructure<T>,
     }
 }
 
+internal inline fun DoubleTensorAlgebra.checkSymmetric(tensor: DoubleTensor): Unit =
+    check(tensor.eq(tensor.transpose())){
+        "Tensor is not symmetric about the last 2 dimensions"
+    }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index df896bace..cc127b5a7 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -140,9 +140,9 @@ class TestDoubleLinearOpsTensorAlgebra {
     @Ignore
     fun testBatchedSymEig() = DoubleLinearOpsTensorAlgebra {
         val tensor = randNormal(shape = intArrayOf(5, 2, 2), 0)
-        val tensorSigma = tensor + tensor.transpose(1, 2)
+        val tensorSigma = tensor + tensor.transpose()
         val (tensorS, tensorV) = tensorSigma.symEig()
-        val tensorSigmaCalc = tensorV dot (diagonalEmbedding(tensorS) dot tensorV.transpose(1, 2))
+        val tensorSigmaCalc = tensorV dot (diagonalEmbedding(tensorS) dot tensorV.transpose())
         assertTrue(tensorSigma.eq(tensorSigmaCalc))
     }
 
-- 
2.34.1


From 5d8b42da906fec8c5450a4babf461a4873a8aee9 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 9 Apr 2021 08:29:08 +0100
Subject: [PATCH 094/713] minor corrections to linear stuff

---
 .../kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 43502e79a..4e67e1d16 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -67,6 +67,7 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     override fun DoubleTensor.cholesky(): DoubleTensor {
+        //positive definite check
         checkSymmetric(this)
         checkSquareMatrix(shape)
 
@@ -114,8 +115,7 @@ public class DoubleLinearOpsTensorAlgebra :
 
     override fun DoubleTensor.symEig(eigenvectors: Boolean): Pair<DoubleTensor, DoubleTensor> {
         checkSymmetric(this)
-        val svd = this.svd()
-        TODO("U might have some columns negative to V")
+        TODO("maybe use SVD")
     }
 
     public fun DoubleTensor.detLU(): DoubleTensor {
-- 
2.34.1


From e4dbabc30f5a740deae2055c33c982637463d85e Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 9 Apr 2021 08:32:03 +0100
Subject: [PATCH 095/713] more infor

---
 .../kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 4e67e1d16..7d99b7b51 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -115,6 +115,8 @@ public class DoubleLinearOpsTensorAlgebra :
 
     override fun DoubleTensor.symEig(eigenvectors: Boolean): Pair<DoubleTensor, DoubleTensor> {
         checkSymmetric(this)
+        //http://hua-zhou.github.io/teaching/biostatm280-2017spring/slides/16-eigsvd/eigsvd.html
+        //see the last point
         TODO("maybe use SVD")
     }
 
-- 
2.34.1


From 3f0dff3ce9f830f6c04ac72346eb6053c61ae0bf Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 9 Apr 2021 09:18:00 +0100
Subject: [PATCH 096/713] Approximate spectral decomposition for symmetric
 matrices based on SVD

---
 .../tensors/core/DoubleLinearOpsTensorAlgebra.kt      | 11 ++++++++---
 .../kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt  |  6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 7d99b7b51..268f2fe55 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -3,8 +3,10 @@ package space.kscience.kmath.tensors.core
 import space.kscience.kmath.tensors.LinearOpsTensorAlgebra
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.structures.toList
 import kotlin.math.abs
 import kotlin.math.min
+import kotlin.math.sign
 
 public class DoubleLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double, DoubleTensor, IntTensor>,
@@ -113,11 +115,14 @@ public class DoubleLinearOpsTensorAlgebra :
         return Triple(resU.transpose(), resS, resV.transpose())
     }
 
+    //http://hua-zhou.github.io/teaching/biostatm280-2017spring/slides/16-eigsvd/eigsvd.html
     override fun DoubleTensor.symEig(eigenvectors: Boolean): Pair<DoubleTensor, DoubleTensor> {
         checkSymmetric(this)
-        //http://hua-zhou.github.io/teaching/biostatm280-2017spring/slides/16-eigsvd/eigsvd.html
-        //see the last point
-        TODO("maybe use SVD")
+        val (u, s, v) = this.svd()
+        val shp = s.shape + intArrayOf(1)
+        val utv = (u.transpose() dot v).map { if (abs(it) < 0.99) 0.0 else sign(it) }
+        val eig = (utv dot s.view(shp)).view(s.shape)
+        return Pair(eig, v)
     }
 
     public fun DoubleTensor.detLU(): DoubleTensor {
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index cc127b5a7..c96fcb1c0 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -1,5 +1,6 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.structures.toList
 import kotlin.math.abs
 import kotlin.test.Ignore
 import kotlin.test.Test
@@ -137,13 +138,12 @@ class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    @Ignore
     fun testBatchedSymEig() = DoubleLinearOpsTensorAlgebra {
-        val tensor = randNormal(shape = intArrayOf(5, 2, 2), 0)
+        val tensor = randNormal(shape = intArrayOf(5, 3, 3), 0)
         val tensorSigma = tensor + tensor.transpose()
         val (tensorS, tensorV) = tensorSigma.symEig()
         val tensorSigmaCalc = tensorV dot (diagonalEmbedding(tensorS) dot tensorV.transpose())
-        assertTrue(tensorSigma.eq(tensorSigmaCalc))
+        assertTrue(tensorSigma.eq(tensorSigmaCalc, 0.01))
     }
 
 
-- 
2.34.1


From fe8579180d8ebe92b8ba2a41a74d5932d90694a9 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 9 Apr 2021 09:56:37 +0100
Subject: [PATCH 097/713] Open epsilon to client to control numerical precision
 for power methods

---
 .../kmath/tensors/LinearOpsTensorAlgebra.kt     |  4 ++--
 .../core/DoubleLinearOpsTensorAlgebra.kt        | 17 +++++++++++------
 .../space/kscience/kmath/tensors/core/checks.kt |  6 +++---
 .../kscience/kmath/tensors/core/linutils.kt     |  6 +++---
 .../tensors/core/TestDoubleLinearOpsAlgebra.kt  |  2 +-
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
index d980c510f..87c459f35 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
@@ -1,7 +1,7 @@
 package space.kscience.kmath.tensors
 
 
-public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>, IndexTensorType: TensorStructure<Int>> :
+public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>, IndexTensorType : TensorStructure<Int>> :
     TensorPartialDivisionAlgebra<T, TensorType> {
 
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.det
@@ -26,6 +26,6 @@ public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>, Inde
     public fun TensorType.svd(): Triple<TensorType, TensorType, TensorType>
 
     //https://pytorch.org/docs/stable/generated/torch.symeig.html
-    public fun TensorType.symEig(eigenvectors: Boolean = true): Pair<TensorType, TensorType>
+    public fun TensorType.symEig(): Pair<TensorType, TensorType>
 
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 268f2fe55..95b668917 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -94,8 +94,10 @@ public class DoubleLinearOpsTensorAlgebra :
         return qTensor to rTensor
     }
 
+    override fun DoubleTensor.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> =
+        svd(epsilon = 1e-10)
 
-    override fun DoubleTensor.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+    public fun DoubleTensor.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         val size = this.linearStructure.dim
         val commonShape = this.shape.sliceArray(0 until size - 2)
         val (n, m) = this.shape.sliceArray(size - 2 until size)
@@ -110,17 +112,20 @@ public class DoubleLinearOpsTensorAlgebra :
                 matrix.shape,
                 matrix.buffer.array().slice(matrix.bufferStart until matrix.bufferStart + size).toDoubleArray()
             )
-            svdHelper(curMatrix, USV, m, n)
+            svdHelper(curMatrix, USV, m, n, epsilon)
         }
         return Triple(resU.transpose(), resS, resV.transpose())
     }
 
+    override fun DoubleTensor.symEig(): Pair<DoubleTensor, DoubleTensor> =
+        symEig(epsilon = 1e-15)
+
     //http://hua-zhou.github.io/teaching/biostatm280-2017spring/slides/16-eigsvd/eigsvd.html
-    override fun DoubleTensor.symEig(eigenvectors: Boolean): Pair<DoubleTensor, DoubleTensor> {
-        checkSymmetric(this)
-        val (u, s, v) = this.svd()
+    public fun DoubleTensor.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
+        checkSymmetric(this, epsilon)
+        val (u, s, v) = this.svd(epsilon)
         val shp = s.shape + intArrayOf(1)
-        val utv = (u.transpose() dot v).map { if (abs(it) < 0.99) 0.0 else sign(it) }
+        val utv = (u.transpose() dot v).map { if (abs(it) < 0.9) 0.0 else sign(it) }
         val eig = (utv dot s.view(shp)).view(s.shape)
         return Pair(eig, v)
     }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index 1f70eb300..1dde2ea56 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -58,7 +58,7 @@ internal inline fun <T, TensorType : TensorStructure<T>,
     }
 }
 
-internal inline fun DoubleTensorAlgebra.checkSymmetric(tensor: DoubleTensor): Unit =
-    check(tensor.eq(tensor.transpose())){
-        "Tensor is not symmetric about the last 2 dimensions"
+internal inline fun DoubleTensorAlgebra.checkSymmetric(tensor: DoubleTensor, epsilon: Double = 1e-6): Unit =
+    check(tensor.eq(tensor.transpose(), epsilon)) {
+        "Tensor is not symmetric about the last 2 dimensions at precision $epsilon"
     }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
index 1bdfee2d5..685c16a1b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
@@ -246,7 +246,7 @@ internal inline fun DoubleLinearOpsTensorAlgebra.svd1d(a: DoubleTensor, epsilon:
 internal inline fun DoubleLinearOpsTensorAlgebra.svdHelper(
     matrix: DoubleTensor,
     USV: Pair<BufferedTensor<Double>, Pair<BufferedTensor<Double>, BufferedTensor<Double>>>,
-    m: Int, n: Int
+    m: Int, n: Int, epsilon: Double
 ): Unit {
     val res = ArrayList<Triple<Double, DoubleTensor, DoubleTensor>>(0)
     val (matrixU, SV) = USV
@@ -267,12 +267,12 @@ internal inline fun DoubleLinearOpsTensorAlgebra.svdHelper(
         var u: DoubleTensor
         var norm: Double
         if (n > m) {
-            v = svd1d(a)
+            v = svd1d(a, epsilon)
             u = matrix.dot(v)
             norm = DoubleAnalyticTensorAlgebra { (u dot u).sqrt().value() }
             u = u.times(1.0 / norm)
         } else {
-            u = svd1d(a)
+            u = svd1d(a, epsilon)
             v = matrix.transpose(0, 1).dot(u)
             norm = DoubleAnalyticTensorAlgebra { (v dot v).sqrt().value() }
             v = v.times(1.0 / norm)
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index c96fcb1c0..0997a9b86 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -143,7 +143,7 @@ class TestDoubleLinearOpsTensorAlgebra {
         val tensorSigma = tensor + tensor.transpose()
         val (tensorS, tensorV) = tensorSigma.symEig()
         val tensorSigmaCalc = tensorV dot (diagonalEmbedding(tensorS) dot tensorV.transpose())
-        assertTrue(tensorSigma.eq(tensorSigmaCalc, 0.01))
+        assertTrue(tensorSigma.eq(tensorSigmaCalc))
     }
 
 
-- 
2.34.1


From a692412cff00241031258e37e1f7c2ad151518f4 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 9 Apr 2021 10:08:55 +0100
Subject: [PATCH 098/713] Safer cleaner for symeig

---
 .../tensors/core/DoubleLinearOpsTensorAlgebra.kt     | 10 ++++++----
 .../space/kscience/kmath/tensors/core/linutils.kt    | 12 ++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 95b668917..c26046e37 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -3,10 +3,8 @@ package space.kscience.kmath.tensors.core
 import space.kscience.kmath.tensors.LinearOpsTensorAlgebra
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.structures.toList
-import kotlin.math.abs
 import kotlin.math.min
-import kotlin.math.sign
+
 
 public class DoubleLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double, DoubleTensor, IntTensor>,
@@ -125,7 +123,11 @@ public class DoubleLinearOpsTensorAlgebra :
         checkSymmetric(this, epsilon)
         val (u, s, v) = this.svd(epsilon)
         val shp = s.shape + intArrayOf(1)
-        val utv = (u.transpose() dot v).map { if (abs(it) < 0.9) 0.0 else sign(it) }
+        val utv = u.transpose() dot v
+        val n = s.shape.last()
+        for( matrix in utv.matrixSequence())
+            cleanSymHelper(matrix.as2D(),n)
+
         val eig = (utv dot s.view(shp)).view(s.shape)
         return Pair(eig, v)
     }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
index 685c16a1b..b3cfc1092 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
@@ -6,6 +6,7 @@ import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import kotlin.math.abs
 import kotlin.math.min
+import kotlin.math.sign
 import kotlin.math.sqrt
 
 
@@ -294,3 +295,14 @@ internal inline fun DoubleLinearOpsTensorAlgebra.svdHelper(
         matrixV.buffer.array()[matrixV.bufferStart + i] = vBuffer[i]
     }
 }
+
+internal inline fun cleanSymHelper(matrix: MutableStructure2D<Double>, n: Int): Unit {
+    for (i in 0 until n)
+        for (j in 0 until n) {
+            if (i == j) {
+                matrix[i, j] = sign(matrix[i, j])
+            } else {
+                matrix[i, j] = 0.0
+            }
+        }
+}
-- 
2.34.1


From 1e8da7a87bcc00830338d66f8d68fb2dfda7698b Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 9 Apr 2021 10:53:36 +0100
Subject: [PATCH 099/713] Cholesky decomp tests and checks - det to be fixed

---
 .../tensors/core/DoubleLinearOpsTensorAlgebra.kt    |  3 ++-
 .../space/kscience/kmath/tensors/core/checks.kt     |  9 ++++++++-
 .../tensors/core/TestDoubleLinearOpsAlgebra.kt      | 13 +++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index c26046e37..4d6d14764 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -67,9 +67,10 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     override fun DoubleTensor.cholesky(): DoubleTensor {
-        //positive definite check
         checkSymmetric(this)
         checkSquareMatrix(shape)
+        //TODO("Andrei the det routine has bugs")
+        //checkPositiveDefinite(this)
 
         val n = shape.last()
         val lTensor = zeroesLike()
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index 1dde2ea56..8dbf9eb81 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -61,4 +61,11 @@ internal inline fun <T, TensorType : TensorStructure<T>,
 internal inline fun DoubleTensorAlgebra.checkSymmetric(tensor: DoubleTensor, epsilon: Double = 1e-6): Unit =
     check(tensor.eq(tensor.transpose(), epsilon)) {
         "Tensor is not symmetric about the last 2 dimensions at precision $epsilon"
-    }
\ No newline at end of file
+    }
+
+internal inline fun DoubleLinearOpsTensorAlgebra.checkPositiveDefinite(tensor: DoubleTensor): Unit {
+    for( mat in tensor.matrixSequence())
+        check(mat.asTensor().detLU().value() > 0.0){
+            "Tensor contains matrices which are not positive definite ${mat.asTensor().detLU().value()}"
+        }
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 0997a9b86..2914b216b 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -112,6 +112,19 @@ class TestDoubleLinearOpsTensorAlgebra {
         assertTrue((p dot tensor).eq(l dot u))
     }
 
+    @Test
+    fun testCholesky() = DoubleLinearOpsTensorAlgebra {
+        val tensor = randNormal(intArrayOf(2, 5, 5), 0)
+        val sigma = (tensor dot tensor.transpose()) + diagonalEmbedding(
+            fromArray(intArrayOf(2, 5), DoubleArray(10) { 0.1 })
+        )
+        //checkPositiveDefinite(sigma) sigma must be positive definite
+        val low = sigma.cholesky()
+        val sigmChol = low dot low.transpose()
+        assertTrue(sigma.eq(sigmChol))
+
+    }
+
     @Test
     fun testSVD1D() = DoubleLinearOpsTensorAlgebra {
         val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-- 
2.34.1


From b51427d2abb401d1402eebd7bf61e93bca47f3a2 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 9 Apr 2021 12:26:03 +0100
Subject: [PATCH 100/713] test to fix determinant

---
 .../tensors/core/TestDoubleLinearOpsAlgebra.kt      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 2914b216b..37caf88fe 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -34,6 +34,19 @@ class TestDoubleLinearOpsTensorAlgebra {
 
     }
 
+    @Test
+    fun testDet() = DoubleLinearOpsTensorAlgebra {
+        val m = fromArray(
+            intArrayOf(3, 3), doubleArrayOf(
+                2.1843, 1.4391, -0.4845,
+                1.4391, 1.7772, 0.4055,
+                -0.4845, 0.4055, 0.7519
+            )
+        )
+        println(m.det().value())
+        println(0.0197) //expected value
+    }
+
     @Test
     fun testInvLU() = DoubleLinearOpsTensorAlgebra {
         val tensor = fromArray(
-- 
2.34.1


From 75783bcb038d1649f5587a15e906d9450fce5c8c Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 9 Apr 2021 14:06:44 +0100
Subject: [PATCH 101/713] some todos

---
 .../kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 4d6d14764..82f63dd40 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -154,6 +154,7 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     public fun DoubleTensor.invLU(): DoubleTensor {
+        //TODO("Andrei the det is non-zero")
         val (luTensor, pivotsTensor) = lu()
         val invTensor = luTensor.zeroesLike()
 
-- 
2.34.1


From a2d41d5e73e8eef1413a4f1671d0717b8b97aa9b Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 14 Apr 2021 20:30:42 +0100
Subject: [PATCH 102/713] Cholesky with precision in client API

---
 .../kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt     | 7 ++++---
 .../kotlin/space/kscience/kmath/tensors/core/checks.kt     | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 82f63dd40..e0ec49333 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -66,11 +66,10 @@ public class DoubleLinearOpsTensorAlgebra :
 
     }
 
-    override fun DoubleTensor.cholesky(): DoubleTensor {
-        checkSymmetric(this)
+    public fun DoubleTensor.cholesky(epsilon: Double): DoubleTensor {
         checkSquareMatrix(shape)
         //TODO("Andrei the det routine has bugs")
-        //checkPositiveDefinite(this)
+        //checkPositiveDefinite(this, epsilon)
 
         val n = shape.last()
         val lTensor = zeroesLike()
@@ -81,6 +80,8 @@ public class DoubleLinearOpsTensorAlgebra :
         return lTensor
     }
 
+    override fun DoubleTensor.cholesky(): DoubleTensor = cholesky(1e-6)
+
     override fun DoubleTensor.qr(): Pair<DoubleTensor, DoubleTensor> {
         checkSquareMatrix(shape)
         val qTensor = zeroesLike()
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index 8dbf9eb81..730b6ed9a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -63,7 +63,9 @@ internal inline fun DoubleTensorAlgebra.checkSymmetric(tensor: DoubleTensor, eps
         "Tensor is not symmetric about the last 2 dimensions at precision $epsilon"
     }
 
-internal inline fun DoubleLinearOpsTensorAlgebra.checkPositiveDefinite(tensor: DoubleTensor): Unit {
+internal inline fun DoubleLinearOpsTensorAlgebra.checkPositiveDefinite(
+    tensor: DoubleTensor, epsilon: Double = 1e-6): Unit {
+    checkSymmetric(tensor, epsilon)
     for( mat in tensor.matrixSequence())
         check(mat.asTensor().detLU().value() > 0.0){
             "Tensor contains matrices which are not positive definite ${mat.asTensor().detLU().value()}"
-- 
2.34.1


From c7669d4fba20ccd856918504d4836d2619961927 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Wed, 14 Apr 2021 23:05:54 +0300
Subject: [PATCH 103/713] fix det

---
 .../core/DoubleLinearOpsTensorAlgebra.kt      | 22 +++++++++----
 .../kscience/kmath/tensors/core/checks.kt     | 10 ++++++
 .../kscience/kmath/tensors/core/linutils.kt   | 11 +++++--
 .../core/TestDoubleLinearOpsAlgebra.kt        | 17 ++++++++--
 kmath-tensors/src/jvmMain/kotlin/andMain.kt   | 32 +++++++++++++++++++
 5 files changed, 81 insertions(+), 11 deletions(-)
 create mode 100644 kmath-tensors/src/jvmMain/kotlin/andMain.kt

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 82f63dd40..59678947a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -14,8 +14,7 @@ public class DoubleLinearOpsTensorAlgebra :
 
     override fun DoubleTensor.det(): DoubleTensor = detLU()
 
-    override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
-
+    internal fun DoubleTensor.luForDet(forDet: Boolean = false): Pair<DoubleTensor, IntTensor> {
         checkSquareMatrix(shape)
 
         val luTensor = copy()
@@ -31,10 +30,22 @@ public class DoubleLinearOpsTensorAlgebra :
         )
 
         for ((lu, pivots) in luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()))
-            luHelper(lu.as2D(), pivots.as1D(), m)
+            try {
+                luHelper(lu.as2D(), pivots.as1D(), m)
+            } catch (e: RuntimeException) {
+                if (forDet) {
+                    lu.as2D()[intArrayOf(0, 0)] = 0.0
+                } else {
+                    throw IllegalStateException("LUP decomposition can't be performed")
+                }
+            }
+
 
         return Pair(luTensor, pivotsTensor)
+    }
 
+    override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
+        return luForDet(false)
     }
 
     override fun luPivot(
@@ -69,8 +80,7 @@ public class DoubleLinearOpsTensorAlgebra :
     override fun DoubleTensor.cholesky(): DoubleTensor {
         checkSymmetric(this)
         checkSquareMatrix(shape)
-        //TODO("Andrei the det routine has bugs")
-        //checkPositiveDefinite(this)
+        checkPositiveDefinite(this)
 
         val n = shape.last()
         val lTensor = zeroesLike()
@@ -134,7 +144,7 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     public fun DoubleTensor.detLU(): DoubleTensor {
-        val (luTensor, pivotsTensor) = lu()
+        val (luTensor, pivotsTensor) = luForDet(forDet = true)
         val n = shape.size
 
         val detTensorShape = IntArray(n - 1) { i -> shape[i] }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index 8dbf9eb81..c61759da2 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -2,6 +2,7 @@ package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.tensors.TensorAlgebra
 import space.kscience.kmath.tensors.TensorStructure
+import kotlin.math.abs
 
 
 internal inline fun <T, TensorType : TensorStructure<T>,
@@ -68,4 +69,13 @@ internal inline fun DoubleLinearOpsTensorAlgebra.checkPositiveDefinite(tensor: D
         check(mat.asTensor().detLU().value() > 0.0){
             "Tensor contains matrices which are not positive definite ${mat.asTensor().detLU().value()}"
         }
+}
+
+internal inline fun DoubleLinearOpsTensorAlgebra.checkNonSingularMatrix(tensor: DoubleTensor): Unit {
+    for( mat in tensor.matrixSequence()) {
+        val detTensor = mat.asTensor().detLU()
+        check(!(detTensor.eq(detTensor.zeroesLike()))){
+            "Tensor contains matrices which are singular"
+        }
+    }
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
index b3cfc1092..f2c9d8c76 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
@@ -62,10 +62,10 @@ internal inline fun dotHelper(
 }
 
 internal inline fun luHelper(lu: MutableStructure2D<Double>, pivots: MutableStructure1D<Int>, m: Int) {
-    for (row in 0 until m) pivots[row] = row
+    for (row in 0..m) pivots[row] = row
 
     for (i in 0 until m) {
-        var maxVal = -1.0
+        var maxVal = 0.0
         var maxInd = i
 
         for (k in i until m) {
@@ -76,7 +76,9 @@ internal inline fun luHelper(lu: MutableStructure2D<Double>, pivots: MutableStru
             }
         }
 
-        //todo check singularity
+        if (abs(maxVal) < 1e-9) {
+            throw RuntimeException()
+        }
 
         if (maxInd != i) {
 
@@ -158,6 +160,9 @@ internal inline fun choleskyHelper(
 internal inline fun luMatrixDet(luTensor: MutableStructure2D<Double>, pivotsTensor: MutableStructure1D<Int>): Double {
     val lu = luTensor.as2D()
     val pivots = pivotsTensor.as1D()
+    if (lu[0, 0] == 0.0) {
+        return 0.0
+    }
     val m = lu.shape[0]
     val sign = if ((pivots[m] - m) % 2 == 0) 1.0 else -1.0
     return (0 until m).asSequence().map { lu[it, it] }.fold(sign) { left, right -> left * right }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 37caf88fe..75ff12355 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -36,6 +36,7 @@ class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testDet() = DoubleLinearOpsTensorAlgebra {
+        val expectedValue = 0.019827417
         val m = fromArray(
             intArrayOf(3, 3), doubleArrayOf(
                 2.1843, 1.4391, -0.4845,
@@ -43,8 +44,20 @@ class TestDoubleLinearOpsTensorAlgebra {
                 -0.4845, 0.4055, 0.7519
             )
         )
-        println(m.det().value())
-        println(0.0197) //expected value
+
+        assertTrue { abs(m.det().value() - expectedValue) < 1e-5}
+    }
+
+    @Test
+    fun testDetSingle() = DoubleLinearOpsTensorAlgebra {
+        val expectedValue = 48.151623
+        val m = fromArray(
+            intArrayOf(1, 1), doubleArrayOf(
+                expectedValue
+            )
+        )
+
+        assertTrue { abs(m.det().value() - expectedValue) < 1e-5}
     }
 
     @Test
diff --git a/kmath-tensors/src/jvmMain/kotlin/andMain.kt b/kmath-tensors/src/jvmMain/kotlin/andMain.kt
new file mode 100644
index 000000000..68facf467
--- /dev/null
+++ b/kmath-tensors/src/jvmMain/kotlin/andMain.kt
@@ -0,0 +1,32 @@
+import space.kscience.kmath.nd.*
+import space.kscience.kmath.tensors.core.DoubleLinearOpsTensorAlgebra
+import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.array
+import kotlin.math.abs
+import kotlin.math.sqrt
+
+
+fun main() {
+
+    DoubleTensorAlgebra {
+        val tensor = fromArray(
+            intArrayOf(2, 2, 2),
+            doubleArrayOf(
+                1.0, 3.0,
+                1.0, 2.0,
+                1.5, 1.0,
+                10.0, 2.0
+            )
+        )
+        val tensor2 = fromArray(
+            intArrayOf(2, 2),
+            doubleArrayOf(
+                0.0, 0.0,
+                0.0, 0.0
+            )
+        )
+        DoubleLinearOpsTensorAlgebra {
+            println(tensor2.det().value())
+        }
+    }
+}
-- 
2.34.1


From aeb71b5d270f7e40f8c5b8c2416c163e6baec206 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Wed, 14 Apr 2021 23:10:42 +0300
Subject: [PATCH 104/713] fix det

---
 .../core/DoubleLinearOpsTensorAlgebra.kt      | 28 +++++++++++++------
 .../kscience/kmath/tensors/core/checks.kt     | 14 +++++++++-
 .../kscience/kmath/tensors/core/linutils.kt   | 11 ++++++--
 .../core/TestDoubleLinearOpsAlgebra.kt        | 17 +++++++++--
 4 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index 82f63dd40..027fcf5d0 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -14,8 +14,7 @@ public class DoubleLinearOpsTensorAlgebra :
 
     override fun DoubleTensor.det(): DoubleTensor = detLU()
 
-    override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
-
+    internal fun DoubleTensor.luForDet(forDet: Boolean = false): Pair<DoubleTensor, IntTensor> {
         checkSquareMatrix(shape)
 
         val luTensor = copy()
@@ -31,10 +30,22 @@ public class DoubleLinearOpsTensorAlgebra :
         )
 
         for ((lu, pivots) in luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()))
-            luHelper(lu.as2D(), pivots.as1D(), m)
+            try {
+                luHelper(lu.as2D(), pivots.as1D(), m)
+            } catch (e: RuntimeException) {
+                if (forDet) {
+                    lu.as2D()[intArrayOf(0, 0)] = 0.0
+                } else {
+                    throw IllegalStateException("LUP decomposition can't be performed")
+                }
+            }
+
 
         return Pair(luTensor, pivotsTensor)
+    }
 
+    override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
+        return luForDet(false)
     }
 
     override fun luPivot(
@@ -66,11 +77,10 @@ public class DoubleLinearOpsTensorAlgebra :
 
     }
 
-    override fun DoubleTensor.cholesky(): DoubleTensor {
-        checkSymmetric(this)
+    public fun DoubleTensor.cholesky(epsilon: Double): DoubleTensor {
         checkSquareMatrix(shape)
-        //TODO("Andrei the det routine has bugs")
-        //checkPositiveDefinite(this)
+        checkPositiveDefinite(this)
+        //checkPositiveDefinite(this, epsilon)
 
         val n = shape.last()
         val lTensor = zeroesLike()
@@ -81,6 +91,8 @@ public class DoubleLinearOpsTensorAlgebra :
         return lTensor
     }
 
+    override fun DoubleTensor.cholesky(): DoubleTensor = cholesky(1e-6)
+
     override fun DoubleTensor.qr(): Pair<DoubleTensor, DoubleTensor> {
         checkSquareMatrix(shape)
         val qTensor = zeroesLike()
@@ -134,7 +146,7 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     public fun DoubleTensor.detLU(): DoubleTensor {
-        val (luTensor, pivotsTensor) = lu()
+        val (luTensor, pivotsTensor) = luForDet(forDet = true)
         val n = shape.size
 
         val detTensorShape = IntArray(n - 1) { i -> shape[i] }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index 8dbf9eb81..45a71d1bc 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -2,6 +2,7 @@ package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.tensors.TensorAlgebra
 import space.kscience.kmath.tensors.TensorStructure
+import kotlin.math.abs
 
 
 internal inline fun <T, TensorType : TensorStructure<T>,
@@ -63,9 +64,20 @@ internal inline fun DoubleTensorAlgebra.checkSymmetric(tensor: DoubleTensor, eps
         "Tensor is not symmetric about the last 2 dimensions at precision $epsilon"
     }
 
-internal inline fun DoubleLinearOpsTensorAlgebra.checkPositiveDefinite(tensor: DoubleTensor): Unit {
+internal inline fun DoubleLinearOpsTensorAlgebra.checkPositiveDefinite(
+    tensor: DoubleTensor, epsilon: Double = 1e-6): Unit {
+    checkSymmetric(tensor, epsilon)
     for( mat in tensor.matrixSequence())
         check(mat.asTensor().detLU().value() > 0.0){
             "Tensor contains matrices which are not positive definite ${mat.asTensor().detLU().value()}"
         }
+}
+
+internal inline fun DoubleLinearOpsTensorAlgebra.checkNonSingularMatrix(tensor: DoubleTensor): Unit {
+    for( mat in tensor.matrixSequence()) {
+        val detTensor = mat.asTensor().detLU()
+        check(!(detTensor.eq(detTensor.zeroesLike()))){
+            "Tensor contains matrices which are singular"
+        }
+    }
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
index b3cfc1092..f2c9d8c76 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
@@ -62,10 +62,10 @@ internal inline fun dotHelper(
 }
 
 internal inline fun luHelper(lu: MutableStructure2D<Double>, pivots: MutableStructure1D<Int>, m: Int) {
-    for (row in 0 until m) pivots[row] = row
+    for (row in 0..m) pivots[row] = row
 
     for (i in 0 until m) {
-        var maxVal = -1.0
+        var maxVal = 0.0
         var maxInd = i
 
         for (k in i until m) {
@@ -76,7 +76,9 @@ internal inline fun luHelper(lu: MutableStructure2D<Double>, pivots: MutableStru
             }
         }
 
-        //todo check singularity
+        if (abs(maxVal) < 1e-9) {
+            throw RuntimeException()
+        }
 
         if (maxInd != i) {
 
@@ -158,6 +160,9 @@ internal inline fun choleskyHelper(
 internal inline fun luMatrixDet(luTensor: MutableStructure2D<Double>, pivotsTensor: MutableStructure1D<Int>): Double {
     val lu = luTensor.as2D()
     val pivots = pivotsTensor.as1D()
+    if (lu[0, 0] == 0.0) {
+        return 0.0
+    }
     val m = lu.shape[0]
     val sign = if ((pivots[m] - m) % 2 == 0) 1.0 else -1.0
     return (0 until m).asSequence().map { lu[it, it] }.fold(sign) { left, right -> left * right }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 37caf88fe..75ff12355 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -36,6 +36,7 @@ class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testDet() = DoubleLinearOpsTensorAlgebra {
+        val expectedValue = 0.019827417
         val m = fromArray(
             intArrayOf(3, 3), doubleArrayOf(
                 2.1843, 1.4391, -0.4845,
@@ -43,8 +44,20 @@ class TestDoubleLinearOpsTensorAlgebra {
                 -0.4845, 0.4055, 0.7519
             )
         )
-        println(m.det().value())
-        println(0.0197) //expected value
+
+        assertTrue { abs(m.det().value() - expectedValue) < 1e-5}
+    }
+
+    @Test
+    fun testDetSingle() = DoubleLinearOpsTensorAlgebra {
+        val expectedValue = 48.151623
+        val m = fromArray(
+            intArrayOf(1, 1), doubleArrayOf(
+                expectedValue
+            )
+        )
+
+        assertTrue { abs(m.det().value() - expectedValue) < 1e-5}
     }
 
     @Test
-- 
2.34.1


From b46e8c5fe23bb64fa6868363848e2e13e0c1edfb Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 14 Apr 2021 22:13:54 +0100
Subject: [PATCH 105/713] LU and det refactored

---
 .../core/DoubleLinearOpsTensorAlgebra.kt      | 64 ++++++-------------
 .../kscience/kmath/tensors/core/linutils.kt   | 43 +++++++++++--
 .../core/TestDoubleLinearOpsAlgebra.kt        |  8 +--
 3 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index a6bd5d5f7..e72948c84 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -10,43 +10,15 @@ public class DoubleLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double, DoubleTensor, IntTensor>,
     DoubleTensorAlgebra() {
 
-    override fun DoubleTensor.inv(): DoubleTensor = invLU()
+    override fun DoubleTensor.inv(): DoubleTensor = invLU(1e-9)
 
-    override fun DoubleTensor.det(): DoubleTensor = detLU()
+    override fun DoubleTensor.det(): DoubleTensor = detLU(1e-9)
 
-    internal fun DoubleTensor.luForDet(forDet: Boolean = false): Pair<DoubleTensor, IntTensor> {
-        checkSquareMatrix(shape)
+    public fun DoubleTensor.lu(epsilon: Double): Pair<DoubleTensor, IntTensor> =
+        computeLU(this, epsilon) ?:
+        throw RuntimeException("Tensor contains matrices which are singular at precision $epsilon")
 
-        val luTensor = copy()
-
-        val n = shape.size
-        val m = shape.last()
-        val pivotsShape = IntArray(n - 1) { i -> shape[i] }
-        pivotsShape[n - 2] = m + 1
-
-        val pivotsTensor = IntTensor(
-            pivotsShape,
-            IntArray(pivotsShape.reduce(Int::times)) { 0 }
-        )
-
-        for ((lu, pivots) in luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()))
-            try {
-                luHelper(lu.as2D(), pivots.as1D(), m)
-            } catch (e: RuntimeException) {
-                if (forDet) {
-                    lu.as2D()[intArrayOf(0, 0)] = 0.0
-                } else {
-                    throw IllegalStateException("LUP decomposition can't be performed")
-                }
-            }
-
-
-        return Pair(luTensor, pivotsTensor)
-    }
-
-    override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> {
-        return luForDet(false)
-    }
+    override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> = lu(1e-9)
 
     override fun luPivot(
         luTensor: DoubleTensor,
@@ -79,9 +51,7 @@ public class DoubleLinearOpsTensorAlgebra :
 
     public fun DoubleTensor.cholesky(epsilon: Double): DoubleTensor {
         checkSquareMatrix(shape)
-        checkPositiveDefinite(this)
-        //checkPositiveDefinite(this, epsilon)
-
+        checkPositiveDefinite(this, epsilon)
 
         val n = shape.last()
         val lTensor = zeroesLike()
@@ -139,15 +109,19 @@ public class DoubleLinearOpsTensorAlgebra :
         val shp = s.shape + intArrayOf(1)
         val utv = u.transpose() dot v
         val n = s.shape.last()
-        for( matrix in utv.matrixSequence())
-            cleanSymHelper(matrix.as2D(),n)
+        for (matrix in utv.matrixSequence())
+            cleanSymHelper(matrix.as2D(), n)
 
         val eig = (utv dot s.view(shp)).view(s.shape)
         return Pair(eig, v)
     }
 
-    public fun DoubleTensor.detLU(): DoubleTensor {
-        val (luTensor, pivotsTensor) = luForDet(forDet = true)
+    public fun DoubleTensor.detLU(epsilon: Double = 1e-9): DoubleTensor {
+
+        checkSquareMatrix(this.shape)
+        val luTensor = this.copy()
+        val pivotsTensor = this.setUpPivots()
+
         val n = shape.size
 
         val detTensorShape = IntArray(n - 1) { i -> shape[i] }
@@ -160,15 +134,15 @@ public class DoubleLinearOpsTensorAlgebra :
         )
 
         luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).forEachIndexed { index, (lu, pivots) ->
-            resBuffer[index] = luMatrixDet(lu.as2D(), pivots.as1D())
+            resBuffer[index] = if (luHelper(lu.as2D(), pivots.as1D(), epsilon))
+                0.0 else luMatrixDet(lu.as2D(), pivots.as1D())
         }
 
         return detTensor
     }
 
-    public fun DoubleTensor.invLU(): DoubleTensor {
-        //TODO("Andrei the det is non-zero")
-        val (luTensor, pivotsTensor) = lu()
+    public fun DoubleTensor.invLU(epsilon: Double = 1e-9): DoubleTensor {
+        val (luTensor, pivotsTensor) = lu(epsilon)
         val invTensor = luTensor.zeroesLike()
 
         val seq = luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).zip(invTensor.matrixSequence())
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
index f2c9d8c76..ee159b614 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
@@ -61,7 +61,13 @@ internal inline fun dotHelper(
     }
 }
 
-internal inline fun luHelper(lu: MutableStructure2D<Double>, pivots: MutableStructure1D<Int>, m: Int) {
+internal inline fun luHelper(
+    lu: MutableStructure2D<Double>,
+    pivots: MutableStructure1D<Int>,
+    epsilon: Double): Boolean {
+
+    val m = lu.rowNum
+
     for (row in 0..m) pivots[row] = row
 
     for (i in 0 until m) {
@@ -69,16 +75,15 @@ internal inline fun luHelper(lu: MutableStructure2D<Double>, pivots: MutableStru
         var maxInd = i
 
         for (k in i until m) {
-            val absA = kotlin.math.abs(lu[k, i])
+            val absA = abs(lu[k, i])
             if (absA > maxVal) {
                 maxVal = absA
                 maxInd = k
             }
         }
 
-        if (abs(maxVal) < 1e-9) {
-            throw RuntimeException()
-        }
+        if (abs(maxVal) < epsilon)
+            return true // matrix is singular
 
         if (maxInd != i) {
 
@@ -103,6 +108,34 @@ internal inline fun luHelper(lu: MutableStructure2D<Double>, pivots: MutableStru
             }
         }
     }
+    return false
+}
+
+internal inline fun <T> BufferedTensor<T>.setUpPivots(): IntTensor {
+    val n = this.shape.size
+    val m = this.shape.last()
+    val pivotsShape = IntArray(n - 1) { i -> this.shape[i] }
+    pivotsShape[n - 2] = m + 1
+
+    return IntTensor(
+        pivotsShape,
+        IntArray(pivotsShape.reduce(Int::times)) { 0 }
+    )
+}
+
+internal inline fun DoubleLinearOpsTensorAlgebra.computeLU(
+    tensor: DoubleTensor,
+    epsilon: Double): Pair<DoubleTensor, IntTensor>? {
+
+    checkSquareMatrix(tensor.shape)
+    val luTensor = tensor.copy()
+    val pivotsTensor = tensor.setUpPivots()
+
+    for ((lu, pivots) in luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()))
+        if(luHelper(lu.as2D(), pivots.as1D(), epsilon))
+            return null
+
+    return Pair(luTensor, pivotsTensor)
 }
 
 internal inline fun pivInit(
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 75ff12355..d19d0b6f6 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -1,8 +1,6 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.structures.toList
 import kotlin.math.abs
-import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -45,7 +43,7 @@ class TestDoubleLinearOpsTensorAlgebra {
             )
         )
 
-        assertTrue { abs(m.det().value() - expectedValue) < 1e-5}
+        assertTrue { abs(m.det().value() - expectedValue) < 1e-5 }
     }
 
     @Test
@@ -57,7 +55,7 @@ class TestDoubleLinearOpsTensorAlgebra {
             )
         )
 
-        assertTrue { abs(m.det().value() - expectedValue) < 1e-5}
+        assertTrue { abs(m.det().value() - expectedValue) < 1e-5 }
     }
 
     @Test
@@ -144,11 +142,9 @@ class TestDoubleLinearOpsTensorAlgebra {
         val sigma = (tensor dot tensor.transpose()) + diagonalEmbedding(
             fromArray(intArrayOf(2, 5), DoubleArray(10) { 0.1 })
         )
-        //checkPositiveDefinite(sigma) sigma must be positive definite
         val low = sigma.cholesky()
         val sigmChol = low dot low.transpose()
         assertTrue(sigma.eq(sigmChol))
-
     }
 
     @Test
-- 
2.34.1


From 0fa73e1e9e4cca8cf4377d580bbfbcceb394d8c0 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 14 Apr 2021 22:21:18 +0100
Subject: [PATCH 106/713] Drop unused code

---
 .../kotlin/space/kscience/kmath/tensors/core/checks.kt | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index 45a71d1bc..730b6ed9a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -2,7 +2,6 @@ package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.tensors.TensorAlgebra
 import space.kscience.kmath.tensors.TensorStructure
-import kotlin.math.abs
 
 
 internal inline fun <T, TensorType : TensorStructure<T>,
@@ -71,13 +70,4 @@ internal inline fun DoubleLinearOpsTensorAlgebra.checkPositiveDefinite(
         check(mat.asTensor().detLU().value() > 0.0){
             "Tensor contains matrices which are not positive definite ${mat.asTensor().detLU().value()}"
         }
-}
-
-internal inline fun DoubleLinearOpsTensorAlgebra.checkNonSingularMatrix(tensor: DoubleTensor): Unit {
-    for( mat in tensor.matrixSequence()) {
-        val detTensor = mat.asTensor().detLU()
-        check(!(detTensor.eq(detTensor.zeroesLike()))){
-            "Tensor contains matrices which are singular"
-        }
-    }
 }
\ No newline at end of file
-- 
2.34.1


From b7da52edb196769ac5afb42ae5dbdca6bedd58f5 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Thu, 15 Apr 2021 23:10:15 +0300
Subject: [PATCH 107/713] pretty printer

---
 .../kscience/kmath/tensors/core/utils.kt      | 48 +++++++++++++-
 .../src/jvmMain/kotlin/tensorPrettyPrinter.kt | 64 +++++++++++++++++++
 2 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 kmath-tensors/src/jvmMain/kotlin/tensorPrettyPrinter.kt

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index 392abd1c2..e67591c9e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -1,5 +1,7 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.nd.as1D
+import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.*
@@ -57,4 +59,48 @@ internal inline fun minusIndexFrom(n: Int, i: Int) : Int = if (i >= 0) i else {
     ii
 }
 
-internal inline fun <T> BufferedTensor<T>.minusIndex(i: Int): Int =  minusIndexFrom(this.linearStructure.dim, i)
\ No newline at end of file
+internal inline fun <T> BufferedTensor<T>.minusIndex(i: Int): Int =  minusIndexFrom(this.linearStructure.dim, i)
+
+public fun DoubleTensor.toPrettyString(): String = buildString {
+    var offset = 0
+    val shape = this@toPrettyString.shape
+    val linearStructure = this@toPrettyString.linearStructure
+    var vectorSize = shape.last()
+    val initString = "DoubleTensor(\n"
+    append(initString)
+    var charOffset = 3
+    for (vector in vectorSequence()) {
+        append(" ".repeat(charOffset))
+        val index = linearStructure.index(offset)
+        for (ind in index.reversed()) {
+            if (ind != 0) {
+                break
+            }
+            append("[")
+            charOffset += 1
+        }
+        // todo refactor
+        val values = mutableListOf<Double>()
+        for (i in 0 until vectorSize) {
+            values.add(vector[intArrayOf(i)])
+        }
+        // todo apply exp formatting
+        append(values.joinToString(", "))
+        append("]")
+        charOffset -= 1
+        for ((ind, maxInd) in index.reversed().zip(shape.reversed()).drop(1)){
+            if (ind != maxInd - 1) {
+                break
+            }
+            append("]")
+            charOffset -=1
+        }
+        offset += vectorSize
+        // todo refactor
+        if (this@toPrettyString.numel == offset) {
+            break
+        }
+        append(",\n")
+    }
+    append("\n)")
+}
diff --git a/kmath-tensors/src/jvmMain/kotlin/tensorPrettyPrinter.kt b/kmath-tensors/src/jvmMain/kotlin/tensorPrettyPrinter.kt
new file mode 100644
index 000000000..669a5494b
--- /dev/null
+++ b/kmath-tensors/src/jvmMain/kotlin/tensorPrettyPrinter.kt
@@ -0,0 +1,64 @@
+
+import space.kscience.kmath.tensors.core.DoubleTensor
+import space.kscience.kmath.tensors.core.vectorSequence
+import java.lang.StringBuilder
+
+internal fun format(value: Double, digits: Int = 4): String {
+    val res = "%.${digits}e".format(value).replace(',', '.')
+    if (value < 0.0) {
+        return res
+    }
+    return StringBuilder().append(" ").append(res).toString()
+}
+
+public fun DoubleTensor.toPrettyString(): String {
+    val builder = StringBuilder()
+    with(builder) {
+        var offset = 0
+        val shape = this@toPrettyString.shape
+        val linearStructure = this@toPrettyString.linearStructure
+        var vectorSize = shape.last()
+        val initString = "DoubleTensor(\n"
+        append(initString)
+        var charOffset = 3
+        for (vector in vectorSequence()) {
+            append(" ".repeat(charOffset))
+            val index = linearStructure.index(offset)
+            for (ind in index.reversed()) {
+                if (ind != 0) {
+                    break
+                }
+                append("[")
+                charOffset += 1
+            }
+            // todo refactor
+            val values = mutableListOf<Double>()
+            for (i in 0 until vectorSize) {
+                values.add(vector[intArrayOf(i)])
+            }
+            append(values.map { format(it) }.joinToString(", "))
+            append("]")
+            charOffset -= 1
+            for (i in shape.size - 2 downTo 0){
+                val ind = index[i]
+                val maxInd = shape[i]
+                if (ind != maxInd - 1) {
+                    break
+                }
+                append("]")
+                charOffset -=1
+            }
+            offset += vectorSize
+            // todo refactor
+            if (this@toPrettyString.numel == offset) {
+                break
+            }
+            append(",\n")
+        }
+        append("\n)")
+    }
+    return builder.toString()
+}
+
+
+
-- 
2.34.1


From 41ac72b4fbf5527a9a37296da90ff412e66cf542 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 16 Apr 2021 07:45:31 +0100
Subject: [PATCH 108/713] MPP toString for DoubleTensor

---
 .../kmath/tensors/core/BufferedTensor.kt      |  4 ++-
 .../kscience/kmath/tensors/core/linutils.kt   |  4 +--
 .../kscience/kmath/tensors/core/utils.kt      | 33 ++++++++++++++-----
 .../src/jvmMain/kotlin/tensorPrettyPrinter.kt |  4 +--
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 9a4d13d2c..9e393f1a8 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -4,7 +4,6 @@ import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.TensorStructure
 
 
-
 public open class BufferedTensor<T>(
     override val shape: IntArray,
     public val buffer: MutableBuffer<T>,
@@ -70,6 +69,9 @@ public class DoubleTensor internal constructor(
 {
     internal constructor(bufferedTensor: BufferedTensor<Double>):
             this(bufferedTensor.shape, bufferedTensor.buffer.array(), bufferedTensor.bufferStart)
+
+    override fun toString(): String = toPrettyString()
+
 }
 
 internal fun BufferedTensor<Int>.asTensor(): IntTensor = IntTensor(this)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
index ee159b614..ba5e0caaf 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
@@ -190,9 +190,7 @@ internal inline fun choleskyHelper(
     }
 }
 
-internal inline fun luMatrixDet(luTensor: MutableStructure2D<Double>, pivotsTensor: MutableStructure1D<Int>): Double {
-    val lu = luTensor.as2D()
-    val pivots = pivotsTensor.as1D()
+internal inline fun luMatrixDet(lu: MutableStructure2D<Double>, pivots: MutableStructure1D<Int>): Double {
     if (lu[0, 0] == 0.0) {
         return 0.0
     }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index e67591c9e..daab79016 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -1,11 +1,11 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.as1D
-import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.*
-import kotlin.math.sqrt
+import kotlin.math.*
 
 /**
  * Returns a reference to [IntArray] containing all of the elements of this [Buffer].
@@ -61,7 +61,25 @@ internal inline fun minusIndexFrom(n: Int, i: Int) : Int = if (i >= 0) i else {
 
 internal inline fun <T> BufferedTensor<T>.minusIndex(i: Int): Int =  minusIndexFrom(this.linearStructure.dim, i)
 
-public fun DoubleTensor.toPrettyString(): String = buildString {
+internal inline fun format(value: Double, digits: Int = 4): String {
+    val ten = 10.0
+    val approxOrder = ceil(log10(abs(value))).toInt()
+    val order = if(
+        ((value % ten) == 0.0) or
+        (value == 1.0) or
+        ((1/value) % ten == 0.0)) approxOrder else approxOrder - 1
+
+    val lead = value / ten.pow(order)
+    val leadDisplay = round(lead*ten.pow(digits)) / ten.pow(digits)
+    val orderDisplay = if(order >= 0) "+$order" else "$order"
+    val valueDisplay = "${leadDisplay}E$orderDisplay"
+    val res = if(value < 0.0) valueDisplay else " $valueDisplay"
+    val fLength = digits + 6
+    val endSpace = " ".repeat(fLength - res.length)
+    return "$res$endSpace"
+}
+
+internal inline fun DoubleTensor.toPrettyString(): String = buildString {
     var offset = 0
     val shape = this@toPrettyString.shape
     val linearStructure = this@toPrettyString.linearStructure
@@ -79,12 +97,9 @@ public fun DoubleTensor.toPrettyString(): String = buildString {
             append("[")
             charOffset += 1
         }
-        // todo refactor
-        val values = mutableListOf<Double>()
-        for (i in 0 until vectorSize) {
-            values.add(vector[intArrayOf(i)])
-        }
-        // todo apply exp formatting
+
+        val values = vector.as1D().toMutableList().map(::format)
+
         append(values.joinToString(", "))
         append("]")
         charOffset -= 1
diff --git a/kmath-tensors/src/jvmMain/kotlin/tensorPrettyPrinter.kt b/kmath-tensors/src/jvmMain/kotlin/tensorPrettyPrinter.kt
index 669a5494b..d3ce5933e 100644
--- a/kmath-tensors/src/jvmMain/kotlin/tensorPrettyPrinter.kt
+++ b/kmath-tensors/src/jvmMain/kotlin/tensorPrettyPrinter.kt
@@ -2,7 +2,7 @@
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.vectorSequence
 import java.lang.StringBuilder
-
+/*
 internal fun format(value: Double, digits: Int = 4): String {
     val res = "%.${digits}e".format(value).replace(',', '.')
     if (value < 0.0) {
@@ -59,6 +59,6 @@ public fun DoubleTensor.toPrettyString(): String {
     }
     return builder.toString()
 }
-
+*/
 
 
-- 
2.34.1


From baa303171eb9a6a99b3f5e83cae87a1e0a1abb5f Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 16 Apr 2021 07:47:06 +0100
Subject: [PATCH 109/713] No jvm specifics please

---
 .../src/jvmMain/kotlin/tensorPrettyPrinter.kt | 64 -------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 kmath-tensors/src/jvmMain/kotlin/tensorPrettyPrinter.kt

diff --git a/kmath-tensors/src/jvmMain/kotlin/tensorPrettyPrinter.kt b/kmath-tensors/src/jvmMain/kotlin/tensorPrettyPrinter.kt
deleted file mode 100644
index d3ce5933e..000000000
--- a/kmath-tensors/src/jvmMain/kotlin/tensorPrettyPrinter.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-
-import space.kscience.kmath.tensors.core.DoubleTensor
-import space.kscience.kmath.tensors.core.vectorSequence
-import java.lang.StringBuilder
-/*
-internal fun format(value: Double, digits: Int = 4): String {
-    val res = "%.${digits}e".format(value).replace(',', '.')
-    if (value < 0.0) {
-        return res
-    }
-    return StringBuilder().append(" ").append(res).toString()
-}
-
-public fun DoubleTensor.toPrettyString(): String {
-    val builder = StringBuilder()
-    with(builder) {
-        var offset = 0
-        val shape = this@toPrettyString.shape
-        val linearStructure = this@toPrettyString.linearStructure
-        var vectorSize = shape.last()
-        val initString = "DoubleTensor(\n"
-        append(initString)
-        var charOffset = 3
-        for (vector in vectorSequence()) {
-            append(" ".repeat(charOffset))
-            val index = linearStructure.index(offset)
-            for (ind in index.reversed()) {
-                if (ind != 0) {
-                    break
-                }
-                append("[")
-                charOffset += 1
-            }
-            // todo refactor
-            val values = mutableListOf<Double>()
-            for (i in 0 until vectorSize) {
-                values.add(vector[intArrayOf(i)])
-            }
-            append(values.map { format(it) }.joinToString(", "))
-            append("]")
-            charOffset -= 1
-            for (i in shape.size - 2 downTo 0){
-                val ind = index[i]
-                val maxInd = shape[i]
-                if (ind != maxInd - 1) {
-                    break
-                }
-                append("]")
-                charOffset -=1
-            }
-            offset += vectorSize
-            // todo refactor
-            if (this@toPrettyString.numel == offset) {
-                break
-            }
-            append(",\n")
-        }
-        append("\n)")
-    }
-    return builder.toString()
-}
-*/
-
-
-- 
2.34.1


From 1e7cf39150be8393acd0f24572d0a1a93ef87e15 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 16 Apr 2021 11:58:42 +0100
Subject: [PATCH 110/713] Don't print 0 order

---
 .../kotlin/space/kscience/kmath/tensors/core/utils.kt       | 6 +++---
 .../space/kscience/kmath/tensors/core/TestDoubleTensor.kt   | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index daab79016..40d40b593 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -71,8 +71,8 @@ internal inline fun format(value: Double, digits: Int = 4): String {
 
     val lead = value / ten.pow(order)
     val leadDisplay = round(lead*ten.pow(digits)) / ten.pow(digits)
-    val orderDisplay = if(order >= 0) "+$order" else "$order"
-    val valueDisplay = "${leadDisplay}E$orderDisplay"
+    val orderDisplay = if(order == 0) "" else if(order > 0) "E+$order" else "E$order"
+    val valueDisplay = "${leadDisplay}$orderDisplay"
     val res = if(value < 0.0) valueDisplay else " $valueDisplay"
     val fLength = digits + 6
     val endSpace = " ".repeat(fLength - res.length)
@@ -83,7 +83,7 @@ internal inline fun DoubleTensor.toPrettyString(): String = buildString {
     var offset = 0
     val shape = this@toPrettyString.shape
     val linearStructure = this@toPrettyString.linearStructure
-    var vectorSize = shape.last()
+    val vectorSize = shape.last()
     val initString = "DoubleTensor(\n"
     append(initString)
     var charOffset = 3
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 4f4d9bbdf..ddcf0369c 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -46,4 +46,10 @@ class TestDoubleTensor {
             assertEquals(secondRow[1], secondColumn[1])
         }
     }
+
+    @Test
+    fun toStringTest() = DoubleTensorAlgebra {
+        val tensor = randNormal(intArrayOf(2,3))
+        println(tensor)
+    }
 }
\ No newline at end of file
-- 
2.34.1


From 4f8ab4dd78ea1a9a8925fce8898c33313e6be9ec Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 16 Apr 2021 12:03:27 +0100
Subject: [PATCH 111/713] Ignore print test

---
 .../kotlin/space/kscience/kmath/tensors/core/utils.kt         | 3 +--
 .../space/kscience/kmath/tensors/core/TestDoubleTensor.kt     | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index 40d40b593..0b2b5c0df 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -1,6 +1,5 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.stat.RandomGenerator
@@ -72,7 +71,7 @@ internal inline fun format(value: Double, digits: Int = 4): String {
     val lead = value / ten.pow(order)
     val leadDisplay = round(lead*ten.pow(digits)) / ten.pow(digits)
     val orderDisplay = if(order == 0) "" else if(order > 0) "E+$order" else "E$order"
-    val valueDisplay = "${leadDisplay}$orderDisplay"
+    val valueDisplay = "$leadDisplay$orderDisplay"
     val res = if(value < 0.0) valueDisplay else " $valueDisplay"
     val fLength = digits + 6
     val endSpace = " ".repeat(fLength - res.length)
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index ddcf0369c..f950dfce3 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -1,8 +1,10 @@
 package space.kscience.kmath.tensors.core
 
+import kotlinx.coroutines.InternalCoroutinesApi
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.structures.toDoubleArray
+import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -47,7 +49,7 @@ class TestDoubleTensor {
         }
     }
 
-    @Test
+    @Test @Ignore
     fun toStringTest() = DoubleTensorAlgebra {
         val tensor = randNormal(intArrayOf(2,3))
         println(tensor)
-- 
2.34.1


From 82d8394a9fd19461e90a331157e5ac4eee705aab Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 16 Apr 2021 12:05:18 +0100
Subject: [PATCH 112/713] remove kolinx import

---
 .../kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index f950dfce3..fd75f77fe 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -1,6 +1,5 @@
 package space.kscience.kmath.tensors.core
 
-import kotlinx.coroutines.InternalCoroutinesApi
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.structures.toDoubleArray
-- 
2.34.1


From 00a2ce2152a5b339b874f9476879e3e6001177cc Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 16 Apr 2021 20:30:40 +0300
Subject: [PATCH 113/713] Back to gradle 7

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d9132e..f371643ee 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-- 
2.34.1


From a110dc20d5acf61c40596e98bf7ea3b9b9d0ba66 Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Fri, 16 Apr 2021 22:15:12 +0300
Subject: [PATCH 114/713] Tests for large BigIntegers multiplication and power
 are provided. Km implementation is very slow.

---
 .../kmath/benchmarks/BigIntBenchmark.kt       | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index 672efd5c2..31fafaf75 100644
--- a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -5,19 +5,24 @@
 
 package space.kscience.kmath.benchmarks
 
+import edu.mcgill.kaliningraph.power
 import kotlinx.benchmark.Blackhole
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
-import space.kscience.kmath.operations.BigIntField
-import space.kscience.kmath.operations.JBigIntegerField
-import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.operations.*
 
 @State(Scope.Benchmark)
 internal class BigIntBenchmark {
 
     val kmNumber = BigIntField.number(Int.MAX_VALUE)
+    val largeKmNumber = BigIntField {
+        fun BigInt.pow10(): BigInt = power(10, ::multiply)
+        number(11).pow10().pow10().pow10()
+    }
     val jvmNumber = JBigIntegerField.number(Int.MAX_VALUE)
+    val largeJvmNumber = JBigIntegerField { number(11).pow(1000)  }
+    val bigExponent = 50_000
 
     @Benchmark
     fun kmAdd(blackhole: Blackhole) = BigIntField {
@@ -34,8 +39,28 @@ internal class BigIntBenchmark {
         blackhole.consume(kmNumber * kmNumber * kmNumber)
     }
 
+    @Benchmark
+    fun kmMultiplyLarge(blackhole: Blackhole) = BigIntField {
+        blackhole.consume(largeKmNumber.let { it * it })
+    }
+
     @Benchmark
     fun jvmMultiply(blackhole: Blackhole) = JBigIntegerField {
         blackhole.consume(jvmNumber * jvmNumber * jvmNumber)
     }
+
+    @Benchmark
+    fun jvmMultiplyLarge(blackhole: Blackhole) = JBigIntegerField {
+        blackhole.consume(largeJvmNumber.let { it * it })
+    }
+
+    @Benchmark
+    fun kmPower(blackhole: Blackhole) = BigIntField {
+        blackhole.consume(kmNumber.power(bigExponent, ::multiply))
+    }
+
+    @Benchmark
+    fun jvmPower(blackhole: Blackhole) = JBigIntegerField {
+        blackhole.consume(jvmNumber.pow(bigExponent))
+    }
 }
\ No newline at end of file
-- 
2.34.1


From 8689d29e4c0ee463c907a190125790e00c51444e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 16 Apr 2021 22:43:10 +0300
Subject: [PATCH 115/713] Fix benchmarks

---
 .idea/copyright/kmath.xml                     |   6 -
 .idea/copyright/profiles_settings.xml         |   7 -
 CHANGELOG.md                                  |   1 +
 benchmarks/build.gradle.kts                   | 147 ++++++++++++++++++
 .../kmath/benchmarks/ArrayBenchmark.kt        |   0
 .../kmath/benchmarks/BigIntBenchmark.kt       |   0
 .../kmath/benchmarks/BufferBenchmark.kt       |   0
 .../kscience/kmath/benchmarks/DotBenchmark.kt |   0
 .../ExpressionsInterpretersBenchmark.kt       |   0
 .../benchmarks/MatrixInverseBenchmark.kt      |   0
 .../kmath/benchmarks/NDFieldBenchmark.kt      |   0
 .../kmath/benchmarks/ViktorBenchmark.kt       |   0
 .../kmath/benchmarks/ViktorLogBenchmark.kt    |   0
 build.gradle.kts                              |   2 +-
 examples/build.gradle.kts                     |  67 +-------
 .../kmath/commons/fit/fitWithAutoDiff.kt      |   6 +-
 kmath-complex/build.gradle.kts                |   4 -
 kmath-dimensions/build.gradle.kts             |   5 -
 kmath-ejml/build.gradle.kts                   |   9 +-
 kmath-for-real/build.gradle.kts               |   9 +-
 settings.gradle.kts                           |   3 +-
 21 files changed, 158 insertions(+), 108 deletions(-)
 delete mode 100644 .idea/copyright/kmath.xml
 delete mode 100644 .idea/copyright/profiles_settings.xml
 create mode 100644 benchmarks/build.gradle.kts
 rename {examples/src/benchmarks => benchmarks/src/jvmMain}/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt (100%)
 rename {examples/src/benchmarks => benchmarks/src/jvmMain}/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt (100%)
 rename {examples/src/benchmarks => benchmarks/src/jvmMain}/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt (100%)
 rename {examples/src/benchmarks => benchmarks/src/jvmMain}/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt (100%)
 rename {examples/src/benchmarks => benchmarks/src/jvmMain}/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt (100%)
 rename {examples/src/benchmarks => benchmarks/src/jvmMain}/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt (100%)
 rename {examples/src/benchmarks => benchmarks/src/jvmMain}/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt (100%)
 rename {examples/src/benchmarks => benchmarks/src/jvmMain}/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt (100%)
 rename {examples/src/benchmarks => benchmarks/src/jvmMain}/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt (100%)

diff --git a/.idea/copyright/kmath.xml b/.idea/copyright/kmath.xml
deleted file mode 100644
index 6fe438777..000000000
--- a/.idea/copyright/kmath.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright 2018-2021 KMath contributors.&#10;Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file." />
-    <option name="myName" value="kmath" />
-  </copyright>
-</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index 6cc25cb4a..000000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="kmath">
-    <module2copyright>
-      <element module="Project Files" copyright="kmath" />
-    </module2copyright>
-  </settings>
-</component>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3bd2641a..f1d33a75a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - Redesign advanced Chain API
 - Redesign MST. Remove MSTExpression.
 - Move MST to core
+- Separated benchmarks and examples
 
 ### Deprecated
 
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
new file mode 100644
index 000000000..f8e85395b
--- /dev/null
+++ b/benchmarks/build.gradle.kts
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+import ru.mipt.npm.gradle.Maturity
+
+plugins {
+    kotlin("multiplatform")
+    kotlin("plugin.allopen")
+    id("org.jetbrains.kotlinx.benchmark")
+}
+
+allOpen.annotation("org.openjdk.jmh.annotations.State")
+sourceSets.register("benchmarks")
+
+
+
+repositories {
+    mavenCentral()
+    jcenter()
+    maven("https://repo.kotlin.link")
+    maven("https://clojars.org/repo")
+    maven("https://dl.bintray.com/egor-bogomolov/astminer/")
+    maven("https://dl.bintray.com/hotkeytlt/maven")
+    maven("https://jitpack.io")
+    maven {
+        setUrl("http://logicrunch.research.it.uu.se/maven/")
+        isAllowInsecureProtocol = true
+    }
+}
+
+kotlin {
+    jvm()
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(project(":kmath-ast"))
+                implementation(project(":kmath-core"))
+                implementation(project(":kmath-coroutines"))
+                implementation(project(":kmath-complex"))
+                implementation(project(":kmath-stat"))
+                implementation(project(":kmath-dimensions"))
+                implementation(project(":kmath-for-real"))
+                implementation("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:0.3.0")
+            }
+        }
+
+        val jvmMain by getting {
+            dependencies {
+                implementation(project(":kmath-commons"))
+                implementation(project(":kmath-ejml"))
+                implementation(project(":kmath-nd4j"))
+                implementation(project(":kmath-kotlingrad"))
+                implementation(project(":kmath-viktor"))
+                implementation("org.nd4j:nd4j-native:1.0.0-beta7")
+
+                //    uncomment if your system supports AVX2
+                //    val os = System.getProperty("os.name")
+                //
+                //    if (System.getProperty("os.arch") in arrayOf("x86_64", "amd64")) when {
+                //        os.startsWith("Windows") -> implementation("org.nd4j:nd4j-native:1.0.0-beta7:windows-x86_64-avx2")
+                //        os == "Linux" -> implementation("org.nd4j:nd4j-native:1.0.0-beta7:linux-x86_64-avx2")
+                //        os == "Mac OS X" -> implementation("org.nd4j:nd4j-native:1.0.0-beta7:macosx-x86_64-avx2")
+                //    } else
+                //    implementation("org.nd4j:nd4j-native-platform:1.0.0-beta7")
+            }
+        }
+    }
+}
+
+// Configure benchmark
+benchmark {
+    // Setup configurations
+    targets {
+        register("jvm")
+    }
+
+    configurations.register("buffer") {
+        warmups = 1 // number of warmup iterations
+        iterations = 3 // number of iterations
+        iterationTime = 500 // time in seconds per iteration
+        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
+        include("BufferBenchmark")
+    }
+
+    configurations.register("dot") {
+        warmups = 1 // number of warmup iterations
+        iterations = 3 // number of iterations
+        iterationTime = 500 // time in seconds per iteration
+        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
+        include("DotBenchmark")
+    }
+
+    configurations.register("expressions") {
+        warmups = 1 // number of warmup iterations
+        iterations = 3 // number of iterations
+        iterationTime = 500 // time in seconds per iteration
+        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
+        include("ExpressionsInterpretersBenchmark")
+    }
+
+    configurations.register("matrixInverse") {
+        warmups = 1 // number of warmup iterations
+        iterations = 3 // number of iterations
+        iterationTime = 500 // time in seconds per iteration
+        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
+        include("MatrixInverseBenchmark")
+    }
+
+    configurations.register("bigInt") {
+        warmups = 1 // number of warmup iterations
+        iterations = 3 // number of iterations
+        iterationTime = 500 // time in seconds per iteration
+        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
+        include("BigIntBenchmark")
+    }
+}
+
+// Fix kotlinx-benchmarks bug
+afterEvaluate {
+    val jvmBenchmarkJar by tasks.getting(org.gradle.jvm.tasks.Jar::class) {
+        duplicatesStrategy = org.gradle.api.file.DuplicatesStrategy.EXCLUDE
+    }
+}
+
+
+kotlin.sourceSets.all {
+    with(languageSettings) {
+        useExperimentalAnnotation("kotlin.contracts.ExperimentalContracts")
+        useExperimentalAnnotation("kotlin.ExperimentalUnsignedTypes")
+        useExperimentalAnnotation("space.kscience.kmath.misc.UnstableKMathAPI")
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "11"
+        freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
+    }
+}
+
+
+readme {
+    maturity = Maturity.EXPERIMENTAL
+}
diff --git a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt
similarity index 100%
rename from examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt
rename to benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt
diff --git a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
similarity index 100%
rename from examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
rename to benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
diff --git a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
similarity index 100%
rename from examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
rename to benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
diff --git a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
similarity index 100%
rename from examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
rename to benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
diff --git a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
similarity index 100%
rename from examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
rename to benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
diff --git a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
similarity index 100%
rename from examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
rename to benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
diff --git a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
similarity index 100%
rename from examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
rename to benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
diff --git a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
similarity index 100%
rename from examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
rename to benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
diff --git a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
similarity index 100%
rename from examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
rename to benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
diff --git a/build.gradle.kts b/build.gradle.kts
index 9b2200cb4..aeb4a6061 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-6"
+    version = "0.3.0-dev-7"
 }
 
 subprojects {
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 98d7b7073..8bd9423fe 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -8,29 +8,20 @@ import ru.mipt.npm.gradle.Maturity
 
 plugins {
     kotlin("jvm")
-    kotlin("plugin.allopen")
-    id("org.jetbrains.kotlinx.benchmark")
 }
 
-allOpen.annotation("org.openjdk.jmh.annotations.State")
-sourceSets.register("benchmarks")
-
 repositories {
+    mavenCentral()
     jcenter()
     maven("https://repo.kotlin.link")
     maven("https://clojars.org/repo")
     maven("https://dl.bintray.com/egor-bogomolov/astminer/")
     maven("https://dl.bintray.com/hotkeytlt/maven")
-    maven("https://dl.bintray.com/kotlin/kotlin-eap")
-    maven("https://dl.bintray.com/kotlin/kotlinx")
-    maven("https://dl.bintray.com/mipt-npm/dev")
-    maven("https://dl.bintray.com/mipt-npm/kscience")
     maven("https://jitpack.io")
     maven{
         setUrl("http://logicrunch.research.it.uu.se/maven/")
         isAllowInsecureProtocol = true
     }
-    mavenCentral()
 }
 
 dependencies {
@@ -48,7 +39,6 @@ dependencies {
 
     implementation(project(":kmath-for-real"))
 
-    implementation("org.deeplearning4j:deeplearning4j-core:1.0.0-beta7")
     implementation("org.nd4j:nd4j-native:1.0.0-beta7")
 
 //    uncomment if your system supports AVX2
@@ -61,62 +51,9 @@ dependencies {
 //    } else
     implementation("org.nd4j:nd4j-native-platform:1.0.0-beta7")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-io:0.2.0-npm-dev-11")
-    implementation("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:0.3.0")
     implementation("org.slf4j:slf4j-simple:1.7.30")
-
     // plotting
-    implementation("kscience.plotlykt:plotlykt-server:0.3.1-dev")
-
-    "benchmarksImplementation"("org.jetbrains.kotlinx:kotlinx.benchmark.runtime-jvm:0.2.0-dev-20")
-    "benchmarksImplementation"(sourceSets.main.get().output + sourceSets.main.get().runtimeClasspath)
-}
-
-// Configure benchmark
-benchmark {
-    // Setup configurations
-    targets.register("benchmarks")
-    // This one matches sourceSet name above
-
-    configurations.register("buffer") {
-        warmups = 1 // number of warmup iterations
-        iterations = 3 // number of iterations
-        iterationTime = 500 // time in seconds per iteration
-        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
-        include("BufferBenchmark")
-    }
-
-    configurations.register("dot") {
-        warmups = 1 // number of warmup iterations
-        iterations = 3 // number of iterations
-        iterationTime = 500 // time in seconds per iteration
-        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
-        include("DotBenchmark")
-    }
-
-    configurations.register("expressions") {
-        warmups = 1 // number of warmup iterations
-        iterations = 3 // number of iterations
-        iterationTime = 500 // time in seconds per iteration
-        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
-        include("ExpressionsInterpretersBenchmark")
-    }
-
-    configurations.register("matrixInverse") {
-        warmups = 1 // number of warmup iterations
-        iterations = 3 // number of iterations
-        iterationTime = 500 // time in seconds per iteration
-        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
-        include("MatrixInverseBenchmark")
-    }
-
-    configurations.register("bigInt") {
-        warmups = 1 // number of warmup iterations
-        iterations = 3 // number of iterations
-        iterationTime = 500 // time in seconds per iteration
-        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
-        include("BigIntBenchmark")
-    }
+    implementation("space.kscience:plotlykt-server:0.4.0-dev-2")
 }
 
 kotlin.sourceSets.all {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt b/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
index be4dc461b..028985260 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
@@ -7,9 +7,6 @@ package space.kscience.kmath.commons.fit
 
 import kotlinx.html.br
 import kotlinx.html.h3
-import kscience.plotly.*
-import kscience.plotly.models.ScatterMode
-import kscience.plotly.models.TraceValues
 import space.kscience.kmath.commons.optimization.chiSquared
 import space.kscience.kmath.commons.optimization.minimize
 import space.kscience.kmath.distributions.NormalDistribution
@@ -22,6 +19,9 @@ import space.kscience.kmath.real.step
 import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.asIterable
 import space.kscience.kmath.structures.toList
+import space.kscience.plotly.*
+import space.kscience.plotly.models.ScatterMode
+import space.kscience.plotly.models.TraceValues
 import kotlin.math.pow
 import kotlin.math.sqrt
 
diff --git a/kmath-complex/build.gradle.kts b/kmath-complex/build.gradle.kts
index 43911e70d..1c2e8a0a2 100644
--- a/kmath-complex/build.gradle.kts
+++ b/kmath-complex/build.gradle.kts
@@ -12,10 +12,6 @@ plugins {
 }
 
 kotlin.sourceSets {
-    all {
-        languageSettings.useExperimentalAnnotation("kscience.kmath.misc.UnstableKMathAPI")
-    }
-
     commonMain {
         dependencies {
             api(project(":kmath-core"))
diff --git a/kmath-dimensions/build.gradle.kts b/kmath-dimensions/build.gradle.kts
index a9a9177c0..885f3c227 100644
--- a/kmath-dimensions/build.gradle.kts
+++ b/kmath-dimensions/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
diff --git a/kmath-ejml/build.gradle.kts b/kmath-ejml/build.gradle.kts
index 6ae0dcec6..d3a49aeb0 100644
--- a/kmath-ejml/build.gradle.kts
+++ b/kmath-ejml/build.gradle.kts
@@ -1,10 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-import ru.mipt.npm.gradle.Maturity
-
 plugins {
     kotlin("jvm")
     id("ru.mipt.npm.gradle.common")
@@ -16,7 +9,7 @@ dependencies {
 }
 
 readme {
-    maturity = Maturity.PROTOTYPE
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/kmath-for-real/build.gradle.kts b/kmath-for-real/build.gradle.kts
index fc454205b..f6d12decd 100644
--- a/kmath-for-real/build.gradle.kts
+++ b/kmath-for-real/build.gradle.kts
@@ -1,10 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-import ru.mipt.npm.gradle.Maturity
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
@@ -22,7 +15,7 @@ readme {
         All operations are specialized to work with `Double` numbers without declaring algebraic contexts.
         One can still use generic algebras though.
         """.trimIndent()
-    maturity = Maturity.EXPERIMENTAL
+    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/settings.gradle.kts b/settings.gradle.kts
index babad3672..553367a22 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,5 +44,6 @@ include(
     ":kmath-ast",
     ":kmath-ejml",
     ":kmath-kotlingrad",
-    ":examples"
+    ":examples",
+    ":benchmarks"
 )
-- 
2.34.1


From 41d0be8085849304758d832ff419aa8f431aa93e Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Fri, 16 Apr 2021 23:29:31 +0300
Subject: [PATCH 116/713] Increasing number of tests

---
 .../kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index 31fafaf75..e988103dd 100644
--- a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -18,10 +18,10 @@ internal class BigIntBenchmark {
     val kmNumber = BigIntField.number(Int.MAX_VALUE)
     val largeKmNumber = BigIntField {
         fun BigInt.pow10(): BigInt = power(10, ::multiply)
-        number(11).pow10().pow10().pow10()
+        number(11).pow10().pow10().pow10().pow10().pow10()
     }
     val jvmNumber = JBigIntegerField.number(Int.MAX_VALUE)
-    val largeJvmNumber = JBigIntegerField { number(11).pow(1000)  }
+    val largeJvmNumber = JBigIntegerField { number(11).pow(100_000)  }
     val bigExponent = 50_000
 
     @Benchmark
-- 
2.34.1


From 562e641b06b72639b12a6a88e4be4b698e305c13 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 17 Apr 2021 09:43:40 +0300
Subject: [PATCH 117/713] Fix benchmarks

---
 .../kmath/benchmarks/BigIntBenchmark.kt       | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index e988103dd..4b19f8a63 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -5,23 +5,26 @@
 
 package space.kscience.kmath.benchmarks
 
-import edu.mcgill.kaliningraph.power
+
 import kotlinx.benchmark.Blackhole
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.BigInt
+import space.kscience.kmath.operations.BigIntField
+import space.kscience.kmath.operations.JBigIntegerField
+import space.kscience.kmath.operations.invoke
+
+private fun BigInt.pow(power: Int): BigInt = modPow(BigIntField.number(power), BigInt.ONE)
+
 
 @State(Scope.Benchmark)
 internal class BigIntBenchmark {
 
     val kmNumber = BigIntField.number(Int.MAX_VALUE)
-    val largeKmNumber = BigIntField {
-        fun BigInt.pow10(): BigInt = power(10, ::multiply)
-        number(11).pow10().pow10().pow10().pow10().pow10()
-    }
     val jvmNumber = JBigIntegerField.number(Int.MAX_VALUE)
-    val largeJvmNumber = JBigIntegerField { number(11).pow(100_000)  }
+    val largeKmNumber = BigIntField { number(11).pow(100_000) }
+    val largeJvmNumber = JBigIntegerField { number(11).pow(100_000) }
     val bigExponent = 50_000
 
     @Benchmark
@@ -41,7 +44,7 @@ internal class BigIntBenchmark {
 
     @Benchmark
     fun kmMultiplyLarge(blackhole: Blackhole) = BigIntField {
-        blackhole.consume(largeKmNumber.let { it * it })
+        blackhole.consume(largeKmNumber*largeKmNumber)
     }
 
     @Benchmark
@@ -51,12 +54,12 @@ internal class BigIntBenchmark {
 
     @Benchmark
     fun jvmMultiplyLarge(blackhole: Blackhole) = JBigIntegerField {
-        blackhole.consume(largeJvmNumber.let { it * it })
+        blackhole.consume(largeJvmNumber*largeJvmNumber)
     }
 
     @Benchmark
     fun kmPower(blackhole: Blackhole) = BigIntField {
-        blackhole.consume(kmNumber.power(bigExponent, ::multiply))
+        blackhole.consume(kmNumber.pow(bigExponent))
     }
 
     @Benchmark
-- 
2.34.1


From 3dc7038b6edac589da72ece0c135b93f62f2cb54 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Sat, 17 Apr 2021 09:46:10 +0300
Subject: [PATCH 118/713] Update BigIntBenchmark.kt

unify definition (pow function seems to work wrong
---
 .../kmath/benchmarks/BigIntBenchmark.kt       | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index e988103dd..21222ddd3 100644
--- a/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/examples/src/benchmarks/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -12,16 +12,17 @@ import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
 import space.kscience.kmath.operations.*
 
+
+private fun BigInt.pow(power: Int): BigInt = modPow(BigIntField.number(power), BigInt.ONE)
+
+
 @State(Scope.Benchmark)
 internal class BigIntBenchmark {
 
     val kmNumber = BigIntField.number(Int.MAX_VALUE)
-    val largeKmNumber = BigIntField {
-        fun BigInt.pow10(): BigInt = power(10, ::multiply)
-        number(11).pow10().pow10().pow10().pow10().pow10()
-    }
     val jvmNumber = JBigIntegerField.number(Int.MAX_VALUE)
-    val largeJvmNumber = JBigIntegerField { number(11).pow(100_000)  }
+    val largeKmNumber = BigIntField { number(11).pow(100_000) }
+    val largeJvmNumber = JBigIntegerField { number(11).pow(100_000) }
     val bigExponent = 50_000
 
     @Benchmark
@@ -41,7 +42,7 @@ internal class BigIntBenchmark {
 
     @Benchmark
     fun kmMultiplyLarge(blackhole: Blackhole) = BigIntField {
-        blackhole.consume(largeKmNumber.let { it * it })
+        blackhole.consume(largeKmNumber*largeKmNumber)
     }
 
     @Benchmark
@@ -51,16 +52,16 @@ internal class BigIntBenchmark {
 
     @Benchmark
     fun jvmMultiplyLarge(blackhole: Blackhole) = JBigIntegerField {
-        blackhole.consume(largeJvmNumber.let { it * it })
+        blackhole.consume(largeJvmNumber*largeJvmNumber)
     }
 
     @Benchmark
     fun kmPower(blackhole: Blackhole) = BigIntField {
-        blackhole.consume(kmNumber.power(bigExponent, ::multiply))
+        blackhole.consume(kmNumber.pow(bigExponent))
     }
 
     @Benchmark
     fun jvmPower(blackhole: Blackhole) = JBigIntegerField {
         blackhole.consume(jvmNumber.pow(bigExponent))
     }
-}
\ No newline at end of file
+}
-- 
2.34.1


From f67cfcc9e605106e6744d7c50cdee6d02c58065e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 17 Apr 2021 09:47:34 +0300
Subject: [PATCH 119/713] Fix benchmarks

---
 .../kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index 66c034d06..b9a10c774 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -18,10 +18,6 @@ import space.kscience.kmath.operations.invoke
 private fun BigInt.pow(power: Int): BigInt = modPow(BigIntField.number(power), BigInt.ONE)
 
 
-
-private fun BigInt.pow(power: Int): BigInt = modPow(BigIntField.number(power), BigInt.ONE)
-
-
 @State(Scope.Benchmark)
 internal class BigIntBenchmark {
 
-- 
2.34.1


From 6c215abf13c4cdc7839966634b0523d32de60f3f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 17 Apr 2021 10:08:04 +0300
Subject: [PATCH 120/713] Fix BigInt benchmark.

---
 .../kmath/benchmarks/BigIntBenchmark.kt       | 21 +++++++++----------
 .../kmath/integration/GaussIntegralTest.kt    |  4 ++--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index b9a10c774..2076aedc7 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -15,8 +15,7 @@ import space.kscience.kmath.operations.BigIntField
 import space.kscience.kmath.operations.JBigIntegerField
 import space.kscience.kmath.operations.invoke
 
-private fun BigInt.pow(power: Int): BigInt = modPow(BigIntField.number(power), BigInt.ONE)
-
+private fun BigInt.pow(power: Int): BigInt = modPow(BigIntField.number(power), BigInt.ZERO)
 
 @State(Scope.Benchmark)
 internal class BigIntBenchmark {
@@ -57,13 +56,13 @@ internal class BigIntBenchmark {
         blackhole.consume(largeJvmNumber*largeJvmNumber)
     }
 
-    @Benchmark
-    fun kmPower(blackhole: Blackhole) = BigIntField {
-        blackhole.consume(kmNumber.pow(bigExponent))
-    }
-
-    @Benchmark
-    fun jvmPower(blackhole: Blackhole) = JBigIntegerField {
-        blackhole.consume(jvmNumber.pow(bigExponent))
-    }
+//    @Benchmark
+//    fun kmPower(blackhole: Blackhole) = BigIntField {
+//        blackhole.consume(kmNumber.pow(bigExponent))
+//    }
+//
+//    @Benchmark
+//    fun jvmPower(blackhole: Blackhole) = JBigIntegerField {
+//        blackhole.consume(jvmNumber.pow(bigExponent))
+//    }
 }
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
index 5ec90f42a..509821e61 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
@@ -19,7 +19,7 @@ class GaussIntegralTest {
         val res = DoubleField.integrate(0.0..2 * PI) { x ->
             sin(x)
         }
-        assertEquals(0.0, res.value!!, 1e-4)
+        assertEquals(0.0, res.value!!, 1e-2)
     }
 
     @Test
@@ -31,7 +31,7 @@ class GaussIntegralTest {
                 0.0
             }
         }
-        assertEquals(20.0, res.value!!, 0.5)
+        assertEquals(20.0, res.value!!, 1.0)
     }
 
 
-- 
2.34.1


From 07e39a068d5055f34e2c3190beb242e4960b48f8 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 18 Apr 2021 19:43:03 +0300
Subject: [PATCH 121/713] Use split interval for integration.

---
 .../space/kscience/kmath/linear/gradient.kt   |  4 +-
 .../kmath/commons/integration/CMIntegrator.kt |  2 +-
 .../integration/GaussRuleIntegrator.kt        |  2 +-
 .../kmath/integration/GaussIntegrator.kt      | 64 +++++++++++++++----
 .../kmath/integration/UnivariateIntegrand.kt  |  2 +-
 5 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt b/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt
index f7b284e89..a01ea7fe2 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt
@@ -22,8 +22,8 @@ fun main() {
         return DoubleBuffer(x.size) { i ->
             val h = sigma[i] / 5
             val dVector = DoubleBuffer(x.size) { if (it == i) h else 0.0 }
-            val f1 = invoke(x + dVector / 2)
-            val f0 = invoke(x - dVector / 2)
+            val f1 = this(x + dVector / 2)
+            val f0 = this(x - dVector / 2)
             (f1 - f0) / h
         }
     }
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
index 535c6b39e..92bf86128 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
@@ -28,7 +28,7 @@ public class CMIntegrator(
         val integrator = integratorBuilder(integrand)
         val maxCalls = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: defaultMaxCalls
         val remainingCalls = maxCalls - integrand.calls
-        val range = integrand.getFeature<IntegrationRange<Double>>()?.range
+        val range = integrand.getFeature<IntegrationRange>()?.range
             ?: error("Integration range is not provided")
         val res = integrator.integrate(remainingCalls, integrand.function, range.start, range.endInclusive)
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt
index 071bac315..1c9915563 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt
@@ -17,7 +17,7 @@ public class GaussRuleIntegrator(
 ) : UnivariateIntegrator<Double> {
 
     override fun integrate(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
-        val range = integrand.getFeature<IntegrationRange<Double>>()?.range
+        val range = integrand.getFeature<IntegrationRange>()?.range
             ?: error("Integration range is not provided")
         val integrator: GaussIntegrator = getIntegrator(range)
         //TODO check performance
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index bc23e2f1b..749f3cc72 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -8,6 +8,13 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.structures.*
 
+/**
+ * Set of univariate integration ranges. First components correspond to ranges themselves, second components to number of
+ * integration nodes per range
+ */
+public class UnivariateIntegrandRanges(public val ranges: List<Pair<ClosedRange<Double>, Int>>) : IntegrandFeature {
+    public constructor(vararg pairs: Pair<ClosedRange<Double>, Int>) : this(pairs.toList())
+}
 
 /**
  * A simple one-pass integrator based on Gauss rule
@@ -18,9 +25,29 @@ public class GaussIntegrator<T : Any>(
 
     private fun buildRule(integrand: UnivariateIntegrand<T>): Pair<Buffer<Double>, Buffer<Double>> {
         val factory = integrand.getFeature<GaussIntegratorRuleFactory>() ?: GaussLegendreRuleFactory
-        val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
-        val range = integrand.getFeature<IntegrationRange<Double>>()?.range ?: 0.0..1.0
-        return factory.build(numPoints, range)
+        val predefinedRanges = integrand.getFeature<UnivariateIntegrandRanges>()
+        if (predefinedRanges == null || predefinedRanges.ranges.isEmpty()) {
+            val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
+            val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
+            return factory.build(numPoints, range)
+        } else {
+            val ranges = predefinedRanges.ranges
+            var counter = 0
+            val length = ranges.sumOf { it.second }
+            val pointsArray = DoubleArray(length)
+            val weightsArray = DoubleArray(length)
+
+            for (range in ranges) {
+                val rule = factory.build(range.second, range.first)
+                repeat(rule.first.size) { i ->
+                    pointsArray[counter] = rule.first[i]
+                    weightsArray[counter] = rule.second[i]
+                    counter++
+                }
+
+            }
+            return pointsArray.asBuffer() to weightsArray.asBuffer()
+        }
     }
 
     override fun integrate(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> = with(algebra) {
@@ -49,7 +76,8 @@ public class GaussIntegrator<T : Any>(
  * Following features are evaluated:
  * * [GaussIntegratorRuleFactory] - A factory for computing the Gauss integration rule. By default uses [GaussLegendreRuleFactory]
  * * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
- * * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 100 points.
+ * * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
+ * * [UnivariateIntegrandRanges] - Set of ranges and number of points per range. Defaults to given [IntegrationRange] and [IntegrandMaxCalls]
  */
 @UnstableKMathAPI
 public fun <T : Any> Field<T>.integrate(
@@ -64,15 +92,25 @@ public fun <T : Any> Field<T>.integrate(
 @UnstableKMathAPI
 public fun <T : Any> Field<T>.integrate(
     range: ClosedRange<Double>,
-    numPoints: Int = 100,
+    order: Int = 10,
+    intervals: Int = 10,
     vararg features: IntegrandFeature,
     function: (Double) -> T,
-): UnivariateIntegrand<T> = GaussIntegrator(this).integrate(
-    UnivariateIntegrand(
-        function,
-        IntegrationRange(range),
-        GaussLegendreRuleFactory,
-        IntegrandMaxCalls(numPoints),
-        *features
+): UnivariateIntegrand<T> {
+    require(range.endInclusive > range.start) { "The range upper bound should be higher than lower bound" }
+    require(order > 1) { "The order of polynomial must be more than 1" }
+    require(intervals > 0) { "Number of intervals must be positive" }
+    val rangeSize = (range.endInclusive - range.start) / intervals
+    val ranges = UnivariateIntegrandRanges(
+        (0 until intervals).map { i -> (rangeSize * i)..(rangeSize * i + 1) to order }
     )
-)
\ No newline at end of file
+    return GaussIntegrator(this).integrate(
+        UnivariateIntegrand(
+            function,
+            IntegrationRange(range),
+            GaussLegendreRuleFactory,
+            ranges,
+            *features
+        )
+    )
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index 0b41a3f8b..bcd5005c4 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -33,7 +33,7 @@ public fun <T : Any> UnivariateIntegrand(
 public typealias UnivariateIntegrator<T> = Integrator<UnivariateIntegrand<T>>
 
 @JvmInline
-public value class IntegrationRange<T : Comparable<T>>(public val range: ClosedRange<T>) : IntegrandFeature
+public value class IntegrationRange(public val range: ClosedRange<Double>) : IntegrandFeature
 
 public val <T : Any> UnivariateIntegrand<T>.value: T? get() = getFeature<IntegrandValue<T>>()?.value
 
-- 
2.34.1


From 86818f6864ac722ebd5b32f2274c9eb6afb06ca0 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 19 Apr 2021 09:31:56 +0300
Subject: [PATCH 122/713] Replace dl4j with nd4j dependency

---
 kmath-nd4j/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-nd4j/build.gradle.kts b/kmath-nd4j/build.gradle.kts
index 17232b44f..c7d891206 100644
--- a/kmath-nd4j/build.gradle.kts
+++ b/kmath-nd4j/build.gradle.kts
@@ -13,7 +13,7 @@ plugins {
 dependencies {
     api(project(":kmath-core"))
     api("org.nd4j:nd4j-api:1.0.0-beta7")
-    testImplementation("org.deeplearning4j:deeplearning4j-core:1.0.0-beta7")
+    testImplementation("org.nd4j:nd4j-native:1.0.0-beta7")
     testImplementation("org.nd4j:nd4j-native-platform:1.0.0-beta7")
     testImplementation("org.slf4j:slf4j-simple:1.7.30")
 }
-- 
2.34.1


From fd4108b74fbd012796fa12f913675ed55d8eae62 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 19 Apr 2021 11:26:06 +0300
Subject: [PATCH 123/713] fix segmented integral

---
 .../space/kscience/kmath/integration/GaussIntegrator.kt       | 2 +-
 .../space/kscience/kmath/integration/GaussIntegralTest.kt     | 4 ++--
 .../kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt    | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index 749f3cc72..ae82a40be 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -102,7 +102,7 @@ public fun <T : Any> Field<T>.integrate(
     require(intervals > 0) { "Number of intervals must be positive" }
     val rangeSize = (range.endInclusive - range.start) / intervals
     val ranges = UnivariateIntegrandRanges(
-        (0 until intervals).map { i -> (rangeSize * i)..(rangeSize * i + 1) to order }
+        (0 until intervals).map { i -> (rangeSize * i)..(rangeSize * (i + 1)) to order }
     )
     return GaussIntegrator(this).integrate(
         UnivariateIntegrand(
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
index 509821e61..195711452 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
@@ -24,14 +24,14 @@ class GaussIntegralTest {
 
     @Test
     fun gaussUniform() {
-        val res = DoubleField.integrate(0.0..100.0,300) { x ->
+        val res = DoubleField.integrate(0.0..100.0) { x ->
             if(x in 30.0..50.0){
                 1.0
             } else {
                 0.0
             }
         }
-        assertEquals(20.0, res.value!!, 1.0)
+        assertEquals(20.0, res.value!!, 0.5)
     }
 
 
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
index b9aa251d2..79db86fcc 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
@@ -20,8 +20,7 @@ public sealed class Nd4jArrayStructure<T> : MutableStructureND<T> {
      */
     public abstract val ndArray: INDArray
 
-    public override val shape: IntArray
-        get() = ndArray.shape().toIntArray()
+    public override val shape: IntArray get() = ndArray.shape().toIntArray()
 
     internal abstract fun elementsIterator(): Iterator<Pair<IntArray, T>>
     internal fun indicesIterator(): Iterator<IntArray> = ndArray.indicesIterator()
-- 
2.34.1


From 84fa878ee328f1c6f2ad828a77b83b325df222eb Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 20 Apr 2021 19:14:59 +0700
Subject: [PATCH 124/713] Update dependencies

---
 kmath-ast/build.gradle.kts                    | 30 ++++++-------------
 .../kotlin/space/kscience/kmath/ast/parser.kt |  2 --
 2 files changed, 9 insertions(+), 23 deletions(-)
 rename kmath-ast/src/{jvmMain => commonMain}/kotlin/space/kscience/kmath/ast/parser.kt (98%)

diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index 3f309b67c..f2080d0b2 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -27,6 +27,7 @@ kotlin.js {
 kotlin.sourceSets {
     commonMain {
         dependencies {
+            api("com.github.h0tk3y.betterParse:better-parse:0.4.2")
             api(project(":kmath-core"))
         }
     }
@@ -39,13 +40,12 @@ kotlin.sourceSets {
 
     jsMain {
         dependencies {
-            implementation(npm("astring", "1.7.0"))
+            implementation(npm("astring", "1.7.4"))
         }
     }
 
     jvmMain {
         dependencies {
-            api("com.github.h0tk3y.betterParse:better-parse:0.4.1")
             implementation("org.ow2.asm:asm:9.1")
             implementation("org.ow2.asm:asm-commons:9.1")
         }
@@ -64,25 +64,7 @@ readme {
     feature(
         id = "expression-language",
         description = "Expression language and its parser",
-        ref = "src/jvmMain/kotlin/space/kscience/kmath/ast/parser.kt"
-    )
-
-    feature(
-        id = "mst",
-        description = "MST (Mathematical Syntax Tree) as expression language's syntax intermediate representation",
-        ref = "src/commonMain/kotlin/space/kscience/kmath/ast/MST.kt"
-    )
-
-    feature(
-        id = "mst-building",
-        description = "MST building algebraic structure",
-        ref = "src/commonMain/kotlin/space/kscience/kmath/ast/MstAlgebra.kt"
-    )
-
-    feature(
-        id = "mst-interpreter",
-        description = "MST interpreter",
-        ref = "src/commonMain/kotlin/space/kscience/kmath/ast/MST.kt"
+        ref = "src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt"
     )
 
     feature(
@@ -96,4 +78,10 @@ readme {
         description = "Dynamic MST to JS compiler",
         ref = "src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt"
     )
+
+    feature(
+        id = "rendering",
+        description = "Extendable MST rendering",
+        ref = "src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt"
+    )
 }
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/parser.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
similarity index 98%
rename from kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/parser.kt
rename to kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
index 025f4984c..d2e92c37f 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/parser.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
@@ -3,8 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-// TODO move to common when https://github.com/h0tk3y/better-parse/pull/37 is merged
-
 package space.kscience.kmath.ast
 
 import com.github.h0tk3y.betterParse.combinators.*
-- 
2.34.1


From 9c353f4a0d3e0d2c09d8551b9efdc492fc43dbab Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 20 Apr 2021 22:48:09 +0300
Subject: [PATCH 125/713] Make ND4J float algebra extended

---
 CHANGELOG.md                                  |  1 +
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   | 46 +++++++++++++++++--
 .../kmath/nd4j/Nd4jArrayAlgebraTest.kt        | 14 ++++++
 3 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1d33a75a..7464695ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Blocking chains and Statistics
 - Multiplatform integration
 - Integration for any Field element
+- Extendend operations for ND4J fields
 
 ### Changed
 - Exponential operations merged with hyperbolic functions
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index f2c69adee..0205f1c87 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -6,7 +6,10 @@
 package space.kscience.kmath.nd4j
 
 import org.nd4j.linalg.api.ndarray.INDArray
+import org.nd4j.linalg.api.ops.impl.scalar.Pow
+import org.nd4j.linalg.api.ops.impl.transforms.strict.*
 import org.nd4j.linalg.factory.Nd4j
+import org.nd4j.linalg.ops.transforms.Transforms
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.*
@@ -207,7 +210,8 @@ public interface Nd4jArrayField<T, F : Field<T>> : FieldND<T, F>, Nd4jArrayRing<
 /**
  * Represents [FieldND] over [Nd4jArrayDoubleStructure].
  */
-public class DoubleNd4jArrayField(public override val shape: IntArray) : Nd4jArrayField<Double, DoubleField> {
+public class DoubleNd4jArrayField(public override val shape: IntArray) : Nd4jArrayField<Double, DoubleField>,
+    ExtendedField<StructureND<Double>> {
     public override val elementContext: DoubleField get() = DoubleField
 
     public override fun INDArray.wrap(): Nd4jArrayStructure<Double> = checkShape(this).asDoubleStructure()
@@ -239,14 +243,31 @@ public class DoubleNd4jArrayField(public override val shape: IntArray) : Nd4jArr
     public override operator fun Double.minus(arg: StructureND<Double>): Nd4jArrayStructure<Double> {
         return arg.ndArray.rsub(this).wrap()
     }
+
+    override fun sin(arg: StructureND<Double>): StructureND<Double> = Transforms.sin(arg.ndArray).wrap()
+
+    override fun cos(arg: StructureND<Double>): StructureND<Double> = Transforms.cos(arg.ndArray).wrap()
+
+    override fun asin(arg: StructureND<Double>): StructureND<Double> = Transforms.asin(arg.ndArray).wrap()
+
+    override fun acos(arg: StructureND<Double>): StructureND<Double> = Transforms.acos(arg.ndArray).wrap()
+
+    override fun atan(arg: StructureND<Double>): StructureND<Double> = Transforms.atan(arg.ndArray).wrap()
+
+    override fun power(arg: StructureND<Double>, pow: Number): StructureND<Double> =
+        Transforms.pow(arg.ndArray,pow).wrap()
+
+    override fun exp(arg: StructureND<Double>): StructureND<Double> = Transforms.exp(arg.ndArray).wrap()
+
+    override fun ln(arg: StructureND<Double>): StructureND<Double> = Transforms.log(arg.ndArray).wrap()
 }
 
 /**
  * Represents [FieldND] over [Nd4jArrayStructure] of [Float].
  */
-public class FloatNd4jArrayField(public override val shape: IntArray) : Nd4jArrayField<Float, FloatField> {
-    public override val elementContext: FloatField
-        get() = FloatField
+public class FloatNd4jArrayField(public override val shape: IntArray) : Nd4jArrayField<Float, FloatField>,
+    ExtendedField<StructureND<Float>> {
+    public override val elementContext: FloatField get() = FloatField
 
     public override fun INDArray.wrap(): Nd4jArrayStructure<Float> = checkShape(this).asFloatStructure()
 
@@ -270,6 +291,23 @@ public class FloatNd4jArrayField(public override val shape: IntArray) : Nd4jArra
 
     public override operator fun Float.minus(arg: StructureND<Float>): Nd4jArrayStructure<Float> =
         arg.ndArray.rsub(this).wrap()
+
+    override fun sin(arg: StructureND<Float>): StructureND<Float> = Sin(arg.ndArray).z().wrap()
+
+    override fun cos(arg: StructureND<Float>): StructureND<Float> = Cos(arg.ndArray).z().wrap()
+
+    override fun asin(arg: StructureND<Float>): StructureND<Float> = ASin(arg.ndArray).z().wrap()
+
+    override fun acos(arg: StructureND<Float>): StructureND<Float> = ACos(arg.ndArray).z().wrap()
+
+    override fun atan(arg: StructureND<Float>): StructureND<Float> = ATan(arg.ndArray).z().wrap()
+
+    override fun power(arg: StructureND<Float>, pow: Number): StructureND<Float> =
+        Pow(arg.ndArray, pow.toDouble()).z().wrap()
+
+    override fun exp(arg: StructureND<Float>): StructureND<Float> = Exp(arg.ndArray).z().wrap()
+
+    override fun ln(arg: StructureND<Float>): StructureND<Float> = Log(arg.ndArray).z().wrap()
 }
 
 /**
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
index c3874b249..b6c524cc6 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
@@ -6,8 +6,12 @@
 package space.kscience.kmath.nd4j
 
 import org.nd4j.linalg.factory.Nd4j
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.invoke
+import kotlin.math.PI
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 import kotlin.test.fail
 
 internal class Nd4jArrayAlgebraTest {
@@ -43,4 +47,14 @@ internal class Nd4jArrayAlgebraTest {
         expected[intArrayOf(1, 1)] = 26
         assertEquals(expected, res)
     }
+
+    @Test
+    fun testSin() = DoubleNd4jArrayField(intArrayOf(2, 2)).invoke {
+        val initial = produce { (i, j) -> if (i == j) PI/2 else 0.0 }
+        val transformed = sin(initial)
+        val expected = produce { (i, j) -> if (i == j) 1.0 else 0.0 }
+
+        println(transformed)
+        assertTrue { StructureND.contentEquals(transformed, expected) }
+    }
 }
-- 
2.34.1


From 6aa5b547b57092f12a6a2defbfd94b65c5d4f3e9 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 21 Apr 2021 12:48:11 +0300
Subject: [PATCH 126/713] cleanup

---
 CHANGELOG.md                                  |  1 +
 kmath-core/api/kmath-core.api                 | 12 ++---
 .../kmath/expressions/SymbolIndexer.kt        |  4 +-
 .../kmath/expressions/expressionBuilders.kt   | 45 -------------------
 .../space/kscience/kmath/misc/Symbol.kt       | 25 ++++++++++-
 .../kscience/kmath/operations/Algebra.kt      |  4 +-
 .../kmath/operations/NumericAlgebra.kt        |  6 +--
 .../kscience/kmath/operations/numbers.kt      |  6 ---
 8 files changed, 35 insertions(+), 68 deletions(-)
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/expressionBuilders.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7464695ec..c41eda374 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 - Number multiplication and division in main Algebra chain
 - `contentEquals` from Buffer. It moved to the companion.
 - MSTExpression
+- Expression algebra builders
 
 ### Fixed
 - Ring inherits RingOperations, not GroupOperations
diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 6b300123c..efb626c12 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -45,13 +45,6 @@ public abstract interface class space/kscience/kmath/expressions/ExpressionAlgeb
 	public abstract fun const (Ljava/lang/Object;)Ljava/lang/Object;
 }
 
-public final class space/kscience/kmath/expressions/ExpressionBuildersKt {
-	public static final fun extendedFieldExpression (Lspace/kscience/kmath/operations/ExtendedField;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/Expression;
-	public static final fun fieldExpression (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/Expression;
-	public static final fun ringExpression (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/Expression;
-	public static final fun spaceExpression (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/Expression;
-}
-
 public final class space/kscience/kmath/expressions/ExpressionKt {
 	public static final fun binding (Lspace/kscience/kmath/expressions/ExpressionAlgebra;)Lkotlin/properties/ReadOnlyProperty;
 	public static final fun callByString (Lspace/kscience/kmath/expressions/Expression;[Lkotlin/Pair;)Ljava/lang/Object;
@@ -705,7 +698,11 @@ public final class space/kscience/kmath/misc/Symbol$Companion {
 }
 
 public final class space/kscience/kmath/misc/SymbolKt {
+	public static final fun get (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Object;
+	public static final fun get (Ljava/util/Map;Lspace/kscience/kmath/misc/Symbol;)Ljava/lang/Object;
 	public static final fun getSymbol ()Lkotlin/properties/ReadOnlyProperty;
+	public static final fun set (Ljava/util/Map;Ljava/lang/String;Ljava/lang/Object;)V
+	public static final fun set (Ljava/util/Map;Lspace/kscience/kmath/misc/Symbol;Ljava/lang/Object;)V
 }
 
 public abstract interface annotation class space/kscience/kmath/misc/UnstableKMathAPI : java/lang/annotation/Annotation {
@@ -1209,7 +1206,6 @@ public abstract interface class space/kscience/kmath/operations/ExtendedField :
 	public fun acosh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun asinh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun atanh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun bindSymbol (Ljava/lang/String;)Ljava/lang/Object;
 	public fun cosh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun rightSideNumberOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
 	public fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
index 886008983..738156975 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
@@ -33,12 +33,12 @@ public interface SymbolIndexer {
 
     public operator fun DoubleArray.get(symbol: Symbol): Double {
         require(size == symbols.size) { "The input array size for indexer should be ${symbols.size} but $size found" }
-        return get(this@SymbolIndexer.indexOf(symbol))
+        return get(indexOf(symbol))
     }
 
     public operator fun <T> Point<T>.get(symbol: Symbol): T {
         require(size == symbols.size) { "The input buffer size for indexer should be ${symbols.size} but $size found" }
-        return get(this@SymbolIndexer.indexOf(symbol))
+        return get(indexOf(symbol))
     }
 
     public fun DoubleArray.toMap(): Map<Symbol, Double> {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/expressionBuilders.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/expressionBuilders.kt
deleted file mode 100644
index 142194070..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/expressionBuilders.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.expressions
-
-import space.kscience.kmath.operations.ExtendedField
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.Ring
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-
-
-/**
- * Creates a functional expression with this [Ring].
- */
-public inline fun <T> Ring<T>.spaceExpression(block: FunctionalExpressionGroup<T, Ring<T>>.() -> Expression<T>): Expression<T> {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return FunctionalExpressionGroup(this).block()
-}
-
-/**
- * Creates a functional expression with this [Ring].
- */
-public inline fun <T> Ring<T>.ringExpression(block: FunctionalExpressionRing<T, Ring<T>>.() -> Expression<T>): Expression<T> {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return FunctionalExpressionRing(this).block()
-}
-
-/**
- * Creates a functional expression with this [Field].
- */
-public inline fun <T> Field<T>.fieldExpression(block: FunctionalExpressionField<T, Field<T>>.() -> Expression<T>): Expression<T> {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return FunctionalExpressionField(this).block()
-}
-
-/**
- * Creates a functional expression with this [ExtendedField].
- */
-public inline fun <T> ExtendedField<T>.extendedFieldExpression(block: FunctionalExpressionExtendedField<T, ExtendedField<T>>.() -> Expression<T>): Expression<T> {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return FunctionalExpressionExtendedField(this).block()
-}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Symbol.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Symbol.kt
index 737acc025..b9fb6879a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Symbol.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Symbol.kt
@@ -32,10 +32,33 @@ public value class StringSymbol(override val identity: String) : Symbol {
     override fun toString(): String = identity
 }
 
-
 /**
  * A delegate to create a symbol with a string identity in this scope
  */
 public val symbol: ReadOnlyProperty<Any?, Symbol> = ReadOnlyProperty { _, property ->
     StringSymbol(property.name)
 }
+
+/**
+ * Ger a value from a [String]-keyed map by a [Symbol]
+ */
+public operator fun <T> Map<String, T>.get(symbol: Symbol): T? = get(symbol.identity)
+
+/**
+ * Set a value of [String]-keyed map by a [Symbol]
+ */
+public operator fun <T> MutableMap<String, T>.set(symbol: Symbol, value: T){
+    set(symbol.identity, value)
+}
+
+/**
+ * Get a value from a [Symbol]-keyed map by a [String]
+ */
+public operator fun <T> Map<Symbol, T>.get(string: String): T? = get(StringSymbol(string))
+
+/**
+ * Set a value of [String]-keyed map by a [Symbol]
+ */
+public operator fun <T> MutableMap<Symbol, T>.set(string: String, value: T){
+    set(StringSymbol(string), value)
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index 0334e0466..c994580bd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -44,9 +44,9 @@ public interface Algebra<T> {
     /**
      * Dynamically dispatches an unary operation with the certain name.
      *
-     * This function must follow two properties:
+     * This function must has two features:
      *
-     * 1. In case if operation is not defined in the structure, the function throws [kotlin.IllegalStateException].
+     * 1. In case operation is not defined in the structure, the function throws [kotlin.IllegalStateException].
      * 2. This function is symmetric with second `unaryOperation` overload:
      * i.e. `unaryOperationFunction(a)(b) == unaryOperation(a, b)`.
      *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
index 6a35828ee..deeb07e0e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
@@ -97,14 +97,12 @@ public interface NumericAlgebra<T> : Algebra<T> {
 /**
  * The &pi; mathematical constant.
  */
-public val <T> NumericAlgebra<T>.pi: T
-    get() = bindSymbolOrNull("pi") ?: number(PI)
+public val <T> NumericAlgebra<T>.pi: T get() = bindSymbolOrNull("pi") ?: number(PI)
 
 /**
  * The *e* mathematical constant.
  */
-public val <T> NumericAlgebra<T>.e: T
-    get() = number(E)
+public val <T> NumericAlgebra<T>.e: T get() = number(E)
 
 /**
  * Scale by scalar operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index 3b0abf657..0d6d9e98d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -49,12 +49,6 @@ public interface ExtendedField<T> : ExtendedFieldOperations<T>, Field<T>, Numeri
     public override fun acosh(arg: T): T = ln(arg + sqrt((arg - one) * (arg + one)))
     public override fun atanh(arg: T): T = (ln(arg + one) - ln(one - arg)) / 2.0
 
-    public override fun bindSymbol(value: String): T = when (value) {
-        "pi" -> pi
-        "e" -> e
-        else -> super<ExtendedFieldOperations>.bindSymbol(value)
-    }
-
     public override fun rightSideNumberOperationFunction(operation: String): (left: T, right: Number) -> T =
         when (operation) {
             PowerOperations.POW_OPERATION -> ::power
-- 
2.34.1


From b6a57dbfd03e4eae9232891bc6fa00e3647b77ce Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 20 Apr 2021 21:39:45 +0700
Subject: [PATCH 127/713] MST compilation to WebAssembly with Binaryen,
 reorganize internal JS bindings, tests refactor

---
 README.md                                     |   16 +-
 benchmarks/build.gradle.kts                   |   40 +-
 .../ExpressionsInterpretersBenchmark.kt       |   59 +-
 build.gradle.kts                              |   10 +-
 examples/build.gradle.kts                     |    7 +-
 .../kscience/kmath/ast/kotlingradSupport.kt   |    2 +-
 kmath-ast/README.md                           |   54 +-
 kmath-ast/build.gradle.kts                    |    7 +-
 kmath-ast/docs/README-TEMPLATE.md             |   40 +-
 .../space/kscisnce/kmath/ast/InterpretTest.kt |   27 -
 .../kmath/ast/ParserPrecedenceTest.kt         |   15 +-
 .../space/kscisnce}/kmath/ast/ParserTest.kt   |   25 +-
 .../space/kscience/kmath/estree/estree.kt     |    2 +-
 .../kmath/estree/internal/ESTreeBuilder.kt    |    9 +-
 .../kmath/estree/internal/stream/stream.kt    |   12 -
 .../{estree => }/internal/astring/astring.kt  |    4 +-
 .../internal/astring/astring.typealises.kt    |    3 +
 .../kscience/kmath/internal/base64/base64.kt  |   49 +
 .../kmath/internal/binaryen/index.binaryen.kt | 2234 +++++++++++++++++
 .../binaryen/index.binaryen.typealiases.kt    |   11 +
 .../{estree => }/internal/emitter/emitter.kt  |    2 +-
 .../internal/estree/estree.extensions.kt      |    2 +-
 .../{estree => }/internal/estree/estree.kt    |    2 +-
 .../kscience/kmath/internal/stream/stream.kt  |    7 +
 .../internal/tsstdlib/lib.es2015.iterable.kt  |    2 +-
 .../{estree => }/internal/tsstdlib/lib.es5.kt |   11 +-
 .../lib.dom.WebAssembly.module_dukat.kt       |  231 ++
 .../nonDeclarations.WebAssembly.kt            |   22 +
 .../kmath/wasm/internal/WasmBuilder.kt        |  155 ++
 .../wasm/internal/f64StandardFunctions.kt     |    8 +
 .../kotlin/space/kscience/kmath/wasm/wasm.kt  |   77 +
 .../kscience/kmath/ast/TestExecutionTime.kt   |   67 +
 .../TestESTreeConsistencyWithInterpreter.kt   |   35 +-
 .../estree/TestESTreeOperationsSupport.kt     |   27 +-
 .../kmath/estree/TestESTreeSpecialization.kt  |   43 +-
 .../kmath/estree/TestESTreeVariables.kt       |   12 +-
 .../TestWasmConsistencyWithInterpreter.kt     |   60 +
 .../kmath/wasm/TestWasmOperationsSupport.kt   |   42 +
 .../kmath/wasm/TestWasmSpecialization.kt      |   76 +
 .../kscience/kmath/wasm/TestWasmSpecific.kt   |   48 +
 .../kscience/kmath/wasm/TestWasmVariables.kt  |   34 +
 .../asm/TestAsmConsistencyWithInterpreter.kt  |   19 +-
 .../kmath/asm/TestAsmOperationsSupport.kt     |   25 +-
 .../kmath/asm/TestAsmSpecialization.kt        |   43 +-
 .../kscience/kmath/asm/TestAsmVariables.kt    |   12 +-
 .../kmath/ast/rendering/TestFeatures.kt       |  100 -
 .../kscience/kmath/ast/rendering/TestLatex.kt |   73 -
 .../kmath/ast/rendering/TestMathML.kt         |   92 -
 .../kmath/ast/rendering/TestStages.kt         |   33 -
 .../kscience/kmath/ast/rendering/TestUtils.kt |   46 -
 kmath-complex/README.md                       |    6 +-
 kmath-complex/build.gradle.kts                |    4 +-
 kmath-core/README.md                          |    6 +-
 kmath-core/build.gradle.kts                   |    4 +-
 .../kmath/expressions/InterpretTest.kt        |   18 +
 kmath-coroutines/build.gradle.kts             |    4 +-
 kmath-ejml/README.md                          |    6 +-
 kmath-for-real/README.md                      |    6 +-
 kmath-functions/README.md                     |    6 +-
 kmath-geometry/build.gradle.kts               |    4 +-
 kmath-histograms/build.gradle.kts             |    4 +-
 .../kmath/kotlingrad/AdaptingTests.kt         |   25 +-
 kmath-nd4j/README.md                          |    6 +-
 kmath-nd4j/build.gradle.kts                   |    4 +-
 kmath-stat/build.gradle.kts                   |    4 +-
 kmath-viktor/build.gradle.kts                 |    4 +-
 66 files changed, 3451 insertions(+), 692 deletions(-)
 delete mode 100644 kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/InterpretTest.kt
 rename kmath-ast/src/{jvmTest/kotlin/space/kscience => commonTest/kotlin/space/kscisnce}/kmath/ast/ParserPrecedenceTest.kt (75%)
 rename kmath-ast/src/{jvmTest/kotlin/space/kscience => commonTest/kotlin/space/kscisnce}/kmath/ast/ParserTest.kt (67%)
 delete mode 100644 kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/stream/stream.kt
 rename kmath-ast/src/jsMain/kotlin/space/kscience/kmath/{estree => }/internal/astring/astring.kt (90%)
 create mode 100644 kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
 create mode 100644 kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
 create mode 100644 kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
 create mode 100644 kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
 rename kmath-ast/src/jsMain/kotlin/space/kscience/kmath/{estree => }/internal/emitter/emitter.kt (91%)
 rename kmath-ast/src/jsMain/kotlin/space/kscience/kmath/{estree => }/internal/estree/estree.extensions.kt (97%)
 rename kmath-ast/src/jsMain/kotlin/space/kscience/kmath/{estree => }/internal/estree/estree.kt (99%)
 create mode 100644 kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
 rename kmath-ast/src/jsMain/kotlin/space/kscience/kmath/{estree => }/internal/tsstdlib/lib.es2015.iterable.kt (94%)
 rename kmath-ast/src/jsMain/kotlin/space/kscience/kmath/{estree => }/internal/tsstdlib/lib.es5.kt (88%)
 create mode 100644 kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
 create mode 100644 kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
 create mode 100644 kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
 create mode 100644 kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
 create mode 100644 kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
 create mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
 create mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmConsistencyWithInterpreter.kt
 create mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmOperationsSupport.kt
 create mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecialization.kt
 create mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
 create mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmVariables.kt
 delete mode 100644 kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
 delete mode 100644 kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
 delete mode 100644 kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
 delete mode 100644 kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
 delete mode 100644 kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
 create mode 100644 kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt

diff --git a/README.md b/README.md
index 0210b4caf..773eb6398 100644
--- a/README.md
+++ b/README.md
@@ -76,6 +76,12 @@ KMath is a modular library. Different modules provide different features with di
 
 <hr/>
 
+* ### [benchmarks](benchmarks)
+> 
+>
+> **Maturity**: EXPERIMENTAL
+<hr/>
+
 * ### [examples](examples)
 > 
 >
@@ -88,12 +94,10 @@ KMath is a modular library. Different modules provide different features with di
 > **Maturity**: PROTOTYPE
 >
 > **Features:**
-> - [expression-language](kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/parser.kt) : Expression language and its parser
-> - [mst](kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/MST.kt) : MST (Mathematical Syntax Tree) as expression language's syntax intermediate representation
-> - [mst-building](kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/MstAlgebra.kt) : MST building algebraic structure
-> - [mst-interpreter](kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/MST.kt) : MST interpreter
+> - [expression-language](kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt) : Expression language and its parser
 > - [mst-jvm-codegen](kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt) : Dynamic MST to JVM bytecode compiler
 > - [mst-js-codegen](kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt) : Dynamic MST to JS compiler
+> - [rendering](kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt) : Extendable MST rendering
 
 <hr/>
 
@@ -266,8 +270,8 @@ repositories {
 }
 
 dependencies {
-    api("space.kscience:kmath-core:0.3.0-dev-6")
-    // api("space.kscience:kmath-core-jvm:0.3.0-dev-6") for jvm-specific version
+    api("space.kscience:kmath-core:0.3.0-dev-7")
+    // api("space.kscience:kmath-core-jvm:0.3.0-dev-7") for jvm-specific version
 }
 ```
 
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index f8e85395b..d6796ed46 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -3,8 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-import ru.mipt.npm.gradle.Maturity
-
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.allopen")
@@ -14,8 +12,6 @@ plugins {
 allOpen.annotation("org.openjdk.jmh.annotations.State")
 sourceSets.register("benchmarks")
 
-
-
 repositories {
     mavenCentral()
     jcenter()
@@ -77,43 +73,35 @@ benchmark {
         register("jvm")
     }
 
+    fun kotlinx.benchmark.gradle.BenchmarkConfiguration.commonConfiguration() {
+        warmups = 1
+        iterations = 5
+        iterationTime = 1000
+        iterationTimeUnit = "ms"
+    }
+
     configurations.register("buffer") {
-        warmups = 1 // number of warmup iterations
-        iterations = 3 // number of iterations
-        iterationTime = 500 // time in seconds per iteration
-        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
+        commonConfiguration()
         include("BufferBenchmark")
     }
 
     configurations.register("dot") {
-        warmups = 1 // number of warmup iterations
-        iterations = 3 // number of iterations
-        iterationTime = 500 // time in seconds per iteration
-        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
+        commonConfiguration()
         include("DotBenchmark")
     }
 
     configurations.register("expressions") {
-        warmups = 1 // number of warmup iterations
-        iterations = 3 // number of iterations
-        iterationTime = 500 // time in seconds per iteration
-        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
+        commonConfiguration()
         include("ExpressionsInterpretersBenchmark")
     }
 
     configurations.register("matrixInverse") {
-        warmups = 1 // number of warmup iterations
-        iterations = 3 // number of iterations
-        iterationTime = 500 // time in seconds per iteration
-        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
+        commonConfiguration()
         include("MatrixInverseBenchmark")
     }
 
     configurations.register("bigInt") {
-        warmups = 1 // number of warmup iterations
-        iterations = 3 // number of iterations
-        iterationTime = 500 // time in seconds per iteration
-        iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
+        commonConfiguration()
         include("BigIntBenchmark")
     }
 }
@@ -121,7 +109,7 @@ benchmark {
 // Fix kotlinx-benchmarks bug
 afterEvaluate {
     val jvmBenchmarkJar by tasks.getting(org.gradle.jvm.tasks.Jar::class) {
-        duplicatesStrategy = org.gradle.api.file.DuplicatesStrategy.EXCLUDE
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
 }
 
@@ -143,5 +131,5 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
 
 
 readme {
-    maturity = Maturity.EXPERIMENTAL
+    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
 }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
index d6fde8398..942fba308 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
@@ -11,6 +11,7 @@ import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import space.kscience.kmath.asm.compileToExpression
 import space.kscience.kmath.expressions.*
+import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.bindSymbol
@@ -20,50 +21,22 @@ import kotlin.random.Random
 @State(Scope.Benchmark)
 internal class ExpressionsInterpretersBenchmark {
     @Benchmark
-    fun functionalExpression(blackhole: Blackhole) {
-        val expr = algebra.expressionInField {
-            val x = bindSymbol(x)
-            x * const(2.0) + const(2.0) / x - const(16.0)
-        }
-
-        invokeAndSum(expr, blackhole)
-    }
+    fun functionalExpression(blackhole: Blackhole) = invokeAndSum(functional, blackhole)
 
     @Benchmark
-    fun mstExpression(blackhole: Blackhole) {
-        val expr = MstField {
-            val x = bindSymbol(x)
-            x * 2.0 + number(2.0) / x - 16.0
-        }.toExpression(algebra)
-
-        invokeAndSum(expr, blackhole)
-    }
+    fun mstExpression(blackhole: Blackhole) = invokeAndSum(mst, blackhole)
 
     @Benchmark
-    fun asmExpression(blackhole: Blackhole) {
-        val expr = MstField {
-            val x = bindSymbol(x)
-            x * 2.0 + number(2.0) / x - 16.0
-        }.compileToExpression(algebra)
-
-        invokeAndSum(expr, blackhole)
-    }
+    fun asmExpression(blackhole: Blackhole) = invokeAndSum(asm, blackhole)
 
     @Benchmark
-    fun rawExpression(blackhole: Blackhole) {
-        val expr = Expression<Double> { args ->
-            val x = args.getValue(x)
-            x * 2.0 + 2.0 / x - 16.0
-        }
-
-        invokeAndSum(expr, blackhole)
-    }
+    fun rawExpression(blackhole: Blackhole) = invokeAndSum(raw, blackhole)
 
     private fun invokeAndSum(expr: Expression<Double>, blackhole: Blackhole) {
         val random = Random(0)
         var sum = 0.0
 
-        repeat(1000000) {
+        repeat(times) {
             sum += expr(x to random.nextDouble())
         }
 
@@ -71,7 +44,23 @@ internal class ExpressionsInterpretersBenchmark {
     }
 
     private companion object {
-        private val algebra = DoubleField
-        private val x by symbol
+        private val x: Symbol by symbol
+        private val algebra: DoubleField = DoubleField
+        private const val times = 1_000_000
+
+        private val functional: Expression<Double> = DoubleField.expressionInExtendedField {
+            bindSymbol(x) * number(2.0) + number(2.0) / bindSymbol(x) - number(16.0) / sin(bindSymbol(x))
+        }
+
+        private val node = MstExtendedField {
+            bindSymbol(x) * 2.0 + number(2.0) / bindSymbol(x) - number(16.0) / sin(bindSymbol(x))
+        }
+
+        private val mst: Expression<Double> = node.toExpression(DoubleField)
+        private val asm: Expression<Double> = node.compileToExpression(DoubleField)
+
+        private val raw: Expression<Double> = Expression { args ->
+            args.getValue(x) * 2.0 + 2.0 / args.getValue(x) - 16.0 / kotlin.math.sin(args.getValue(x))
+        }
     }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index aeb4a6061..a7c9144a7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,9 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-import org.jetbrains.dokka.gradle.DokkaTask
-import java.net.URL
-
 plugins {
     id("ru.mipt.npm.gradle.project")
 }
@@ -17,8 +14,7 @@ allprojects {
         maven("https://dl.bintray.com/egor-bogomolov/astminer/")
         maven("https://dl.bintray.com/hotkeytlt/maven")
         maven("https://jitpack.io")
-        maven{
-            setUrl("http://logicrunch.research.it.uu.se/maven/")
+        maven("http://logicrunch.research.it.uu.se/maven/") {
             isAllowInsecureProtocol = true
         }
         mavenCentral()
@@ -32,7 +28,7 @@ subprojects {
     if (name.startsWith("kmath")) apply<MavenPublishPlugin>()
 
     afterEvaluate {
-        tasks.withType<DokkaTask> {
+        tasks.withType<org.jetbrains.dokka.gradle.DokkaTask> {
             dokkaSourceSets.all {
                 val readmeFile = File(this@subprojects.projectDir, "./README.md")
                 if (readmeFile.exists())
@@ -42,7 +38,7 @@ subprojects {
                     "http://ejml.org/javadoc/",
                     "https://commons.apache.org/proper/commons-math/javadocs/api-3.6.1/",
                     "https://deeplearning4j.org/api/latest/"
-                ).map { URL("${it}package-list") to URL(it) }.forEach { (a, b) ->
+                ).map { java.net.URL("${it}package-list") to java.net.URL(it) }.forEach { (a, b) ->
                     externalDocumentationLink {
                         packageListUrl.set(a)
                         url.set(b)
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 8bd9423fe..67fe9853a 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -3,9 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import ru.mipt.npm.gradle.Maturity
-
 plugins {
     kotlin("jvm")
 }
@@ -64,7 +61,7 @@ kotlin.sourceSets.all {
     }
 }
 
-tasks.withType<KotlinCompile> {
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions{
         jvmTarget = "11"
         freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
@@ -72,5 +69,5 @@ tasks.withType<KotlinCompile> {
 }
 
 readme {
-    maturity = Maturity.EXPERIMENTAL
+    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
index 4a31f33a3..25f42f5a9 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
@@ -25,5 +25,5 @@ fun main() {
 
 
     val expectedDerivative = "2*x-4".parseMath().compileToExpression(DoubleField)
-    assert(actualDerivative("x" to 123.0) == expectedDerivative("x" to 123.0))
+    assert(actualDerivative(x to 123.0) == expectedDerivative(x to 123.0))
 }
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index b1ef9c7d3..eedba16fa 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -2,17 +2,15 @@
 
 Abstract syntax tree expression representation and related optimizations.
 
- - [expression-language](src/jvmMain/kotlin/space/kscience/kmath/ast/parser.kt) : Expression language and its parser
- - [mst](src/commonMain/kotlin/space/kscience/kmath/ast/MST.kt) : MST (Mathematical Syntax Tree) as expression language's syntax intermediate representation
- - [mst-building](src/commonMain/kotlin/space/kscience/kmath/ast/MstAlgebra.kt) : MST building algebraic structure
- - [mst-interpreter](src/commonMain/kotlin/space/kscience/kmath/ast/MST.kt) : MST interpreter
+ - [expression-language](src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt) : Expression language and its parser
  - [mst-jvm-codegen](src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt) : Dynamic MST to JVM bytecode compiler
  - [mst-js-codegen](src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt) : Dynamic MST to JS compiler
+ - [rendering](src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt) : Extendable MST rendering
 
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-6`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-7`.
 
 **Gradle:**
 ```gradle
@@ -23,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.0-dev-6'
+    implementation 'space.kscience:kmath-ast:0.3.0-dev-7'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -35,7 +33,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.0-dev-6")
+    implementation("space.kscience:kmath-ast:0.3.0-dev-7")
 }
 ```
 
@@ -49,10 +47,10 @@ a special implementation of `Expression<T>` with implemented `invoke` function.
 For example, the following builder:
 
 ```kotlin
-DoubleField.mstInField { symbol("x") + 2 }.compile()
+MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 ``` 
 
-… leads to generation of bytecode, which can be decompiled to the following Java class:
+… leads to generation of bytecode, which can be decompiled to the following Java class:
 
 ```java
 package space.kscience.kmath.asm.generated;
@@ -77,15 +75,6 @@ public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
 
 ```
 
-### Example Usage
-
-This API extends MST and MstExpression, so you may optimize as both of them:
-
-```kotlin
-DoubleField.mstInField { symbol("x") + 2 }.compile()
-DoubleField.expression("x+2".parseMath())
-```
-
 #### Known issues
 
 - The same classes may be generated and loaded twice, so it is recommended to cache compiled expressions to avoid
@@ -97,7 +86,7 @@ DoubleField.expression("x+2".parseMath())
 A similar feature is also available on JS.
 
 ```kotlin
-DoubleField.mstInField { symbol("x") + 2 }.compile()
+MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 ``` 
 
 The code above returns expression implemented with such a JS function:
@@ -108,13 +97,32 @@ var executable = function (constants, arguments) {
 };
 ```
 
+
+```kotlin
+import space.kscience.kmath.wasm.*
+
+MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
+```
+
+An example of emitted WASM IR in the form of WAT:
+
+```lisp
+(func $executable (param $0 f64) (result f64)
+  (f64.add
+    (local.get $0)
+    (f64.const 2)
+  )
+)
+```
+
 #### Known issues
 
-- This feature uses `eval` which can be unavailable in several environments.
+- ESTree expression compilation uses `eval` which can be unavailable in several environments.
+- WebAssembly isn't supported by old versions of browsers (see https://webassembly.org/roadmap/).
 
 ## Rendering expressions
 
-kmath-ast also includes an extensible engine to display expressions in LaTeX or MathML syntax. 
+kmath-ast also includes an extensible engine to display expressions in LaTeX or MathML syntax.
 
 Example usage:
 
@@ -135,7 +143,7 @@ public fun main() {
 }
 ```
 
-Result LaTeX: 
+Result LaTeX:
 
 ![](http://chart.googleapis.com/chart?cht=tx&chl=e%5E%7B%5Csqrt%7Bx%7D%7D-%5Cfrac%7B%5Cfrac%7B%5Coperatorname%7Bsin%7D%5E%7B-1%7D%5C,%5Cleft(2%5C,x%5Cright)%7D%7B2%5Ctimes10%5E%7B10%7D%2Bx%5E%7B3%7D%7D%7D%7B-12%7D)
 
@@ -145,5 +153,5 @@ Result MathML (embedding MathML is not allowed by GitHub Markdown):
 <mrow><msup><mrow><mi>e</mi></mrow><mrow><msqrt><mi>x</mi></msqrt></mrow></msup><mo>-</mo><mfrac><mrow><mfrac><mrow><msup><mrow><mo>sin</mo></mrow><mrow><mo>-</mo><mn>1</mn></mrow></msup><mspace width="0.167em"></mspace><mfenced open="(" close=")" separators=""><mn>2</mn><mspace width="0.167em"></mspace><mi>x</mi></mfenced></mrow><mrow><mn>2</mn><mo>&times;</mo><msup><mrow><mn>10</mn></mrow><mrow><mn>10</mn></mrow></msup><mo>+</mo><msup><mrow><mi>x</mi></mrow><mrow><mn>3</mn></mrow></msup></mrow></mfrac></mrow><mrow><mo>-</mo><mn>12</mn></mrow></mfrac></mrow>
 ```
 
-It is also possible to create custom algorithms of render, and even add support of other markup languages 
+It is also possible to create custom algorithms of render, and even add support of other markup languages
 (see API reference).
diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index f2080d0b2..15357b2d5 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -3,8 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-import ru.mipt.npm.gradle.Maturity
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
@@ -41,6 +39,9 @@ kotlin.sourceSets {
     jsMain {
         dependencies {
             implementation(npm("astring", "1.7.4"))
+            implementation(npm("binaryen", "100.0"))
+            implementation(npm("js-base64", "3.6.0"))
+            implementation(npm("webassembly", "0.11.0"))
         }
     }
 
@@ -58,7 +59,7 @@ tasks.dokkaHtml {
 }
 
 readme {
-    maturity = Maturity.PROTOTYPE
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/kmath-ast/docs/README-TEMPLATE.md b/kmath-ast/docs/README-TEMPLATE.md
index 9ed44d584..b38311ea1 100644
--- a/kmath-ast/docs/README-TEMPLATE.md
+++ b/kmath-ast/docs/README-TEMPLATE.md
@@ -16,7 +16,7 @@ a special implementation of `Expression<T>` with implemented `invoke` function.
 For example, the following builder:
 
 ```kotlin
-DoubleField.mstInField { symbol("x") + 2 }.compile()
+MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 ``` 
 
 … leads to generation of bytecode, which can be decompiled to the following Java class:
@@ -44,15 +44,6 @@ public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
 
 ```
 
-### Example Usage
-
-This API extends MST and MstExpression, so you may optimize as both of them:
-
-```kotlin
-DoubleField.mstInField { symbol("x") + 2 }.compile()
-DoubleField.expression("x+2".parseMath())
-```
-
 #### Known issues
 
 - The same classes may be generated and loaded twice, so it is recommended to cache compiled expressions to avoid
@@ -64,7 +55,7 @@ DoubleField.expression("x+2".parseMath())
 A similar feature is also available on JS.
 
 ```kotlin
-DoubleField.mstInField { symbol("x") + 2 }.compile()
+MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 ``` 
 
 The code above returns expression implemented with such a JS function:
@@ -75,13 +66,32 @@ var executable = function (constants, arguments) {
 };
 ```
 
+
+```kotlin
+import space.kscience.kmath.wasm.*
+
+MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
+```
+
+An example of emitted WASM IR in the form of WAT:
+
+```lisp
+(func \$executable (param \$0 f64) (result f64)
+  (f64.add
+    (local.get \$0)
+    (f64.const 2)
+  )
+)
+```
+
 #### Known issues
 
-- This feature uses `eval` which can be unavailable in several environments.
+- ESTree expression compilation uses `eval` which can be unavailable in several environments.
+- WebAssembly isn't supported by old versions of browsers (see https://webassembly.org/roadmap/).
 
 ## Rendering expressions
 
-kmath-ast also includes an extensible engine to display expressions in LaTeX or MathML syntax. 
+kmath-ast also includes an extensible engine to display expressions in LaTeX or MathML syntax.
 
 Example usage:
 
@@ -102,7 +112,7 @@ public fun main() {
 }
 ```
 
-Result LaTeX: 
+Result LaTeX:
 
 ![](http://chart.googleapis.com/chart?cht=tx&chl=e%5E%7B%5Csqrt%7Bx%7D%7D-%5Cfrac%7B%5Cfrac%7B%5Coperatorname%7Bsin%7D%5E%7B-1%7D%5C,%5Cleft(2%5C,x%5Cright)%7D%7B2%5Ctimes10%5E%7B10%7D%2Bx%5E%7B3%7D%7D%7D%7B-12%7D)
 
@@ -112,5 +122,5 @@ Result MathML (embedding MathML is not allowed by GitHub Markdown):
 <mrow><msup><mrow><mi>e</mi></mrow><mrow><msqrt><mi>x</mi></msqrt></mrow></msup><mo>-</mo><mfrac><mrow><mfrac><mrow><msup><mrow><mo>sin</mo></mrow><mrow><mo>-</mo><mn>1</mn></mrow></msup><mspace width="0.167em"></mspace><mfenced open="(" close=")" separators=""><mn>2</mn><mspace width="0.167em"></mspace><mi>x</mi></mfenced></mrow><mrow><mn>2</mn><mo>&times;</mo><msup><mrow><mn>10</mn></mrow><mrow><mn>10</mn></mrow></msup><mo>+</mo><msup><mrow><mi>x</mi></mrow><mrow><mn>3</mn></mrow></msup></mrow></mfrac></mrow><mrow><mo>-</mo><mn>12</mn></mrow></mfrac></mrow>
 ```
 
-It is also possible to create custom algorithms of render, and even add support of other markup languages 
+It is also possible to create custom algorithms of render, and even add support of other markup languages
 (see API reference).
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/InterpretTest.kt b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/InterpretTest.kt
deleted file mode 100644
index 93fde5aab..000000000
--- a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/InterpretTest.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscisnce.kmath.ast
-
-import space.kscience.kmath.expressions.MstField
-import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.expressions.toExpression
-import space.kscience.kmath.misc.Symbol.Companion.x
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.bindSymbol
-import space.kscience.kmath.operations.invoke
-import kotlin.test.Test
-
-class InterpretTest {
-
-    @Test
-    fun interpretation(){
-        val expr = MstField {
-            val x = bindSymbol(x)
-            x * 2.0 + number(2.0) / x - 16.0
-        }.toExpression(DoubleField)
-        expr(x to 2.2)
-    }
-}
\ No newline at end of file
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/ParserPrecedenceTest.kt b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserPrecedenceTest.kt
similarity index 75%
rename from kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/ParserPrecedenceTest.kt
rename to kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserPrecedenceTest.kt
index 6273eff27..509f87d98 100644
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/ParserPrecedenceTest.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserPrecedenceTest.kt
@@ -1,19 +1,12 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.ast
+package space.kscisnce.kmath.ast
 
+import space.kscience.kmath.ast.parseMath
 import space.kscience.kmath.expressions.evaluate
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.Field
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 internal class ParserPrecedenceTest {
-    private val f: Field<Double> = DoubleField
-
     @Test
     fun test1(): Unit = assertEquals(6.0, f.evaluate("2*2+2".parseMath()))
 
@@ -37,4 +30,8 @@ internal class ParserPrecedenceTest {
 
     @Test
     fun test8(): Unit = assertEquals(18.0, f.evaluate("2*2^3+2".parseMath()))
+
+    private companion object {
+        private val f = DoubleField
+    }
 }
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/ParserTest.kt b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserTest.kt
similarity index 67%
rename from kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/ParserTest.kt
rename to kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserTest.kt
index 53afaa674..13f5b3290 100644
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/ParserTest.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserTest.kt
@@ -1,37 +1,24 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.ast
+package space.kscisnce.kmath.ast
 
+import space.kscience.kmath.ast.parseMath
 import space.kscience.kmath.complex.Complex
 import space.kscience.kmath.complex.ComplexField
-import space.kscience.kmath.expressions.MstField
 import space.kscience.kmath.expressions.evaluate
-import space.kscience.kmath.expressions.interpret
 import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 internal class ParserTest {
     @Test
-    fun `evaluate MST`() {
+    fun evaluateParsedMst() {
         val mst = "2+2*(2+2)".parseMath()
         val res = ComplexField.evaluate(mst)
         assertEquals(Complex(10.0, 0.0), res)
     }
 
     @Test
-    fun `evaluate MSTExpression`() {
-        val res = MstField.invoke { number(2) + number(2) * (number(2) + number(2)) }.interpret(ComplexField)
-        assertEquals(Complex(10.0, 0.0), res)
-    }
-
-    @Test
-    fun `evaluate MST with singular`() {
+    fun evaluateMstSymbol() {
         val mst = "i".parseMath()
         val res = ComplexField.evaluate(mst)
         assertEquals(ComplexField.i, res)
@@ -39,14 +26,14 @@ internal class ParserTest {
 
 
     @Test
-    fun `evaluate MST with unary function`() {
+    fun evaluateMstUnary() {
         val mst = "sin(0)".parseMath()
         val res = DoubleField.evaluate(mst)
         assertEquals(0.0, res)
     }
 
     @Test
-    fun `evaluate MST with binary function`() {
+    fun evaluateMstBinary() {
         val magicalAlgebra = object : Algebra<String> {
             override fun bindSymbolOrNull(value: String): String = value
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
index 83914f3ec..40468f5ab 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
@@ -6,11 +6,11 @@
 package space.kscience.kmath.estree
 
 import space.kscience.kmath.estree.internal.ESTreeBuilder
-import space.kscience.kmath.estree.internal.estree.BaseExpression
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.MST.*
 import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.internal.estree.BaseExpression
 import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.NumericAlgebra
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
index 6f917a24c..ac20484a4 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
@@ -5,9 +5,14 @@
 
 package space.kscience.kmath.estree.internal
 
-import space.kscience.kmath.estree.internal.astring.generate
-import space.kscience.kmath.estree.internal.estree.*
 import space.kscience.kmath.expressions.Expression
+import space.kscience.kmath.internal.astring.generate
+import space.kscience.kmath.internal.estree.*
+import space.kscience.kmath.internal.estree.BaseExpression
+import space.kscience.kmath.internal.estree.BlockStatement
+import space.kscience.kmath.internal.estree.Program
+import space.kscience.kmath.internal.estree.VariableDeclaration
+import space.kscience.kmath.internal.estree.VariableDeclarator
 import space.kscience.kmath.misc.Symbol
 
 internal class ESTreeBuilder<T>(val bodyCallback: ESTreeBuilder<T>.() -> BaseExpression) {
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/stream/stream.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/stream/stream.kt
deleted file mode 100644
index 4bdeeea0b..000000000
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/stream/stream.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.estree.internal.stream
-
-import space.kscience.kmath.estree.internal.emitter.Emitter
-
-internal open external class Stream : Emitter {
-    open fun pipe(dest: Any, options: Any): Any
-}
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt
similarity index 90%
rename from kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.kt
rename to kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt
index 354757b83..cca2d83af 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt
@@ -6,9 +6,9 @@
 @file:JsModule("astring")
 @file:JsNonModule
 
-package space.kscience.kmath.estree.internal.astring
+package space.kscience.kmath.internal.astring
 
-import space.kscience.kmath.estree.internal.estree.BaseNode
+import space.kscience.kmath.internal.estree.BaseNode
 
 internal external interface Options {
     var indent: String?
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
new file mode 100644
index 000000000..1f6a5f04d
--- /dev/null
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
@@ -0,0 +1,3 @@
+package space.kscience.kmath.internal.astring
+
+internal typealias Generator = Any
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
new file mode 100644
index 000000000..a0c7cb6ee
--- /dev/null
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
@@ -0,0 +1,49 @@
+@file:Suppress(
+    "INTERFACE_WITH_SUPERCLASS",
+    "OVERRIDING_FINAL_MEMBER",
+    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
+    "CONFLICTING_OVERLOADS",
+    "NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING",
+    "ObjectPropertyName",
+    "ClassName",
+)
+@file:JsNonModule
+@file:JsModule("js-base64")
+
+package space.kscience.kmath.internal.base64
+
+import org.khronos.webgl.Uint8Array
+
+internal external var version: Any
+
+internal external var VERSION: Any
+
+internal external var btoaPolyfill: (bin: String) -> String
+
+internal external var _btoa: (bin: String) -> String
+
+internal external var fromUint8Array: (u8a: Uint8Array, urlsafe: Boolean) -> String
+
+internal external var utob: (u: String) -> String
+
+internal external var encode: (src: String, urlsafe: Boolean) -> String
+
+internal external var encodeURI: (src: String) -> String
+
+internal external var btou: (b: String) -> String
+
+internal external var atobPolyfill: (asc: String) -> String
+
+internal external var _atob: (asc: String) -> String
+
+internal external var toUint8Array: (a: String) -> Uint8Array
+
+internal external var decode: (src: String) -> String
+
+internal external var isValid: (src: Any) -> Boolean
+
+internal external var extendString: () -> Unit
+
+internal external var extendUint8Array: () -> Unit
+
+internal external var extendBuiltins: () -> Unit
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
new file mode 100644
index 000000000..d3e3539c6
--- /dev/null
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
@@ -0,0 +1,2234 @@
+@file:Suppress(
+    "INTERFACE_WITH_SUPERCLASS",
+    "OVERRIDING_FINAL_MEMBER",
+    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
+    "CONFLICTING_OVERLOADS",
+    "NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING",
+    "PropertyName",
+    "ClassName",
+)
+
+@file:JsModule("binaryen")
+@file:JsNonModule
+
+package space.kscience.kmath.internal.binaryen
+
+import org.khronos.webgl.Uint8Array
+import kotlin.js.Promise
+
+internal external var isReady: Boolean
+
+internal external var ready: Promise<Any>
+
+internal external var none: Type
+
+internal external var i32: Type
+
+internal external var i64: Type
+
+internal external var f32: Type
+
+internal external var f64: Type
+
+internal external var v128: Type
+
+internal external var funcref: Type
+
+internal external var anyref: Type
+
+internal external var nullref: Type
+
+internal external var exnref: Type
+
+internal external var unreachable: Type
+
+internal external var auto: Type
+
+internal external fun createType(types: Array<Type>): Type
+
+internal external fun expandType(type: Type): Array<Type>
+
+internal external enum class ExpressionIds {
+    Invalid,
+    Block,
+    If,
+    Loop,
+    Break,
+    Switch,
+    Call,
+    CallIndirect,
+    LocalGet,
+    LocalSet,
+    GlobalGet,
+    GlobalSet,
+    Load,
+    Store,
+    Const,
+    Unary,
+    Binary,
+    Select,
+    Drop,
+    Return,
+    Host,
+    Nop,
+    Unreachable,
+    AtomicCmpxchg,
+    AtomicRMW,
+    AtomicWait,
+    AtomicNotify,
+    AtomicFence,
+    SIMDExtract,
+    SIMDReplace,
+    SIMDShuffle,
+    SIMDTernary,
+    SIMDShift,
+    SIMDLoad,
+    MemoryInit,
+    DataDrop,
+    MemoryCopy,
+    MemoryFill,
+    RefNull,
+    RefIsNull,
+    RefFunc,
+    Try,
+    Throw,
+    Rethrow,
+    BrOnExn,
+    TupleMake,
+    TupleExtract,
+    Push,
+    Pop
+}
+
+internal external var InvalidId: ExpressionIds
+
+internal external var BlockId: ExpressionIds
+
+internal external var IfId: ExpressionIds
+
+internal external var LoopId: ExpressionIds
+
+internal external var BreakId: ExpressionIds
+
+internal external var SwitchId: ExpressionIds
+
+internal external var CallId: ExpressionIds
+
+internal external var CallIndirectId: ExpressionIds
+
+internal external var LocalGetId: ExpressionIds
+
+internal external var LocalSetId: ExpressionIds
+
+internal external var GlobalGetId: ExpressionIds
+
+internal external var GlobalSetId: ExpressionIds
+
+internal external var LoadId: ExpressionIds
+
+internal external var StoreId: ExpressionIds
+
+internal external var ConstId: ExpressionIds
+
+internal external var UnaryId: ExpressionIds
+
+internal external var BinaryId: ExpressionIds
+
+internal external var SelectId: ExpressionIds
+
+internal external var DropId: ExpressionIds
+
+internal external var ReturnId: ExpressionIds
+
+internal external var HostId: ExpressionIds
+
+internal external var NopId: ExpressionIds
+
+internal external var UnreachableId: ExpressionIds
+
+internal external var AtomicCmpxchgId: ExpressionIds
+
+internal external var AtomicRMWId: ExpressionIds
+
+internal external var AtomicWaitId: ExpressionIds
+
+internal external var AtomicNotifyId: ExpressionIds
+
+internal external var AtomicFenceId: ExpressionIds
+
+internal external var SIMDExtractId: ExpressionIds
+
+internal external var SIMDReplaceId: ExpressionIds
+
+internal external var SIMDShuffleId: ExpressionIds
+
+internal external var SIMDTernaryId: ExpressionIds
+
+internal external var SIMDShiftId: ExpressionIds
+
+internal external var SIMDLoadId: ExpressionIds
+
+internal external var MemoryInitId: ExpressionIds
+
+internal external var DataDropId: ExpressionIds
+
+internal external var MemoryCopyId: ExpressionIds
+
+internal external var MemoryFillId: ExpressionIds
+
+internal external var RefNullId: ExpressionIds
+
+internal external var RefIsNullId: ExpressionIds
+
+internal external var RefFuncId: ExpressionIds
+
+internal external var TryId: ExpressionIds
+
+internal external var ThrowId: ExpressionIds
+
+internal external var RethrowId: ExpressionIds
+
+internal external var BrOnExnId: ExpressionIds
+
+internal external var TupleMakeId: ExpressionIds
+
+internal external var TupleExtractId: ExpressionIds
+
+internal external var PushId: ExpressionIds
+
+internal external var PopId: ExpressionIds
+
+internal external enum class ExternalKinds {
+    Function,
+    Table,
+    Memory,
+    Global,
+    Event
+}
+
+internal external var ExternalFunction: ExternalKinds
+
+internal external var ExternalTable: ExternalKinds
+
+internal external var ExternalMemory: ExternalKinds
+
+internal external var ExternalGlobal: ExternalKinds
+
+internal external var ExternalEvent: ExternalKinds
+
+internal external enum class Features {
+    MVP,
+    Atomics,
+    MutableGlobals,
+    TruncSat,
+    SIMD,
+    BulkMemory,
+    SignExt,
+    ExceptionHandling,
+    TailCall,
+    ReferenceTypes,
+    Multivalue,
+    GC,
+    Memory64,
+    All
+}
+
+internal external enum class Operations {
+    ClzInt32,
+    CtzInt32,
+    PopcntInt32,
+    NegFloat32,
+    AbsFloat32,
+    CeilFloat32,
+    FloorFloat32,
+    TruncFloat32,
+    NearestFloat32,
+    SqrtFloat32,
+    EqZInt32,
+    ClzInt64,
+    CtzInt64,
+    PopcntInt64,
+    NegFloat64,
+    AbsFloat64,
+    CeilFloat64,
+    FloorFloat64,
+    TruncFloat64,
+    NearestFloat64,
+    SqrtFloat64,
+    EqZInt64,
+    ExtendSInt32,
+    ExtendUInt32,
+    WrapInt64,
+    TruncSFloat32ToInt32,
+    TruncSFloat32ToInt64,
+    TruncUFloat32ToInt32,
+    TruncUFloat32ToInt64,
+    TruncSFloat64ToInt32,
+    TruncSFloat64ToInt64,
+    TruncUFloat64ToInt32,
+    TruncUFloat64ToInt64,
+    TruncSatSFloat32ToInt32,
+    TruncSatSFloat32ToInt64,
+    TruncSatUFloat32ToInt32,
+    TruncSatUFloat32ToInt64,
+    TruncSatSFloat64ToInt32,
+    TruncSatSFloat64ToInt64,
+    TruncSatUFloat64ToInt32,
+    TruncSatUFloat64ToInt64,
+    ReinterpretFloat32,
+    ReinterpretFloat64,
+    ConvertSInt32ToFloat32,
+    ConvertSInt32ToFloat64,
+    ConvertUInt32ToFloat32,
+    ConvertUInt32ToFloat64,
+    ConvertSInt64ToFloat32,
+    ConvertSInt64ToFloat64,
+    ConvertUInt64ToFloat32,
+    ConvertUInt64ToFloat64,
+    PromoteFloat32,
+    DemoteFloat64,
+    ReinterpretInt32,
+    ReinterpretInt64,
+    ExtendS8Int32,
+    ExtendS16Int32,
+    ExtendS8Int64,
+    ExtendS16Int64,
+    ExtendS32Int64,
+    AddInt32,
+    SubInt32,
+    MulInt32,
+    DivSInt32,
+    DivUInt32,
+    RemSInt32,
+    RemUInt32,
+    AndInt32,
+    OrInt32,
+    XorInt32,
+    ShlInt32,
+    ShrUInt32,
+    ShrSInt32,
+    RotLInt32,
+    RotRInt32,
+    EqInt32,
+    NeInt32,
+    LtSInt32,
+    LtUInt32,
+    LeSInt32,
+    LeUInt32,
+    GtSInt32,
+    GtUInt32,
+    GeSInt32,
+    GeUInt32,
+    AddInt64,
+    SubInt64,
+    MulInt64,
+    DivSInt64,
+    DivUInt64,
+    RemSInt64,
+    RemUInt64,
+    AndInt64,
+    OrInt64,
+    XorInt64,
+    ShlInt64,
+    ShrUInt64,
+    ShrSInt64,
+    RotLInt64,
+    RotRInt64,
+    EqInt64,
+    NeInt64,
+    LtSInt64,
+    LtUInt64,
+    LeSInt64,
+    LeUInt64,
+    GtSInt64,
+    GtUInt64,
+    GeSInt64,
+    GeUInt64,
+    AddFloat32,
+    SubFloat32,
+    MulFloat32,
+    DivFloat32,
+    CopySignFloat32,
+    MinFloat32,
+    MaxFloat32,
+    EqFloat32,
+    NeFloat32,
+    LtFloat32,
+    LeFloat32,
+    GtFloat32,
+    GeFloat32,
+    AddFloat64,
+    SubFloat64,
+    MulFloat64,
+    DivFloat64,
+    CopySignFloat64,
+    MinFloat64,
+    MaxFloat64,
+    EqFloat64,
+    NeFloat64,
+    LtFloat64,
+    LeFloat64,
+    GtFloat64,
+    GeFloat64,
+    MemorySize,
+    MemoryGrow,
+    AtomicRMWAdd,
+    AtomicRMWSub,
+    AtomicRMWAnd,
+    AtomicRMWOr,
+    AtomicRMWXor,
+    AtomicRMWXchg,
+    SplatVecI8x16,
+    ExtractLaneSVecI8x16,
+    ExtractLaneUVecI8x16,
+    ReplaceLaneVecI8x16,
+    SplatVecI16x8,
+    ExtractLaneSVecI16x8,
+    ExtractLaneUVecI16x8,
+    ReplaceLaneVecI16x8,
+    SplatVecI32x4,
+    ExtractLaneVecI32x4,
+    ReplaceLaneVecI32x4,
+    SplatVecI64x2,
+    ExtractLaneVecI64x2,
+    ReplaceLaneVecI64x2,
+    SplatVecF32x4,
+    ExtractLaneVecF32x4,
+    ReplaceLaneVecF32x4,
+    SplatVecF64x2,
+    ExtractLaneVecF64x2,
+    ReplaceLaneVecF64x2,
+    EqVecI8x16,
+    NeVecI8x16,
+    LtSVecI8x16,
+    LtUVecI8x16,
+    GtSVecI8x16,
+    GtUVecI8x16,
+    LeSVecI8x16,
+    LeUVecI8x16,
+    GeSVecI8x16,
+    GeUVecI8x16,
+    EqVecI16x8,
+    NeVecI16x8,
+    LtSVecI16x8,
+    LtUVecI16x8,
+    GtSVecI16x8,
+    GtUVecI16x8,
+    LeSVecI16x8,
+    LeUVecI16x8,
+    GeSVecI16x8,
+    GeUVecI16x8,
+    EqVecI32x4,
+    NeVecI32x4,
+    LtSVecI32x4,
+    LtUVecI32x4,
+    GtSVecI32x4,
+    GtUVecI32x4,
+    LeSVecI32x4,
+    LeUVecI32x4,
+    GeSVecI32x4,
+    GeUVecI32x4,
+    EqVecF32x4,
+    NeVecF32x4,
+    LtVecF32x4,
+    GtVecF32x4,
+    LeVecF32x4,
+    GeVecF32x4,
+    EqVecF64x2,
+    NeVecF64x2,
+    LtVecF64x2,
+    GtVecF64x2,
+    LeVecF64x2,
+    GeVecF64x2,
+    NotVec128,
+    AndVec128,
+    OrVec128,
+    XorVec128,
+    AndNotVec128,
+    BitselectVec128,
+    NegVecI8x16,
+    AnyTrueVecI8x16,
+    AllTrueVecI8x16,
+    ShlVecI8x16,
+    ShrSVecI8x16,
+    ShrUVecI8x16,
+    AddVecI8x16,
+    AddSatSVecI8x16,
+    AddSatUVecI8x16,
+    SubVecI8x16,
+    SubSatSVecI8x16,
+    SubSatUVecI8x16,
+    MulVecI8x16,
+    MinSVecI8x16,
+    MinUVecI8x16,
+    MaxSVecI8x16,
+    MaxUVecI8x16,
+    NegVecI16x8,
+    AnyTrueVecI16x8,
+    AllTrueVecI16x8,
+    ShlVecI16x8,
+    ShrSVecI16x8,
+    ShrUVecI16x8,
+    AddVecI16x8,
+    AddSatSVecI16x8,
+    AddSatUVecI16x8,
+    SubVecI16x8,
+    SubSatSVecI16x8,
+    SubSatUVecI16x8,
+    MulVecI16x8,
+    MinSVecI16x8,
+    MinUVecI16x8,
+    MaxSVecI16x8,
+    MaxUVecI16x8,
+    DotSVecI16x8ToVecI32x4,
+    NegVecI32x4,
+    AnyTrueVecI32x4,
+    AllTrueVecI32x4,
+    ShlVecI32x4,
+    ShrSVecI32x4,
+    ShrUVecI32x4,
+    AddVecI32x4,
+    SubVecI32x4,
+    MulVecI32x4,
+    MinSVecI32x4,
+    MinUVecI32x4,
+    MaxSVecI32x4,
+    MaxUVecI32x4,
+    NegVecI64x2,
+    AnyTrueVecI64x2,
+    AllTrueVecI64x2,
+    ShlVecI64x2,
+    ShrSVecI64x2,
+    ShrUVecI64x2,
+    AddVecI64x2,
+    SubVecI64x2,
+    AbsVecF32x4,
+    NegVecF32x4,
+    SqrtVecF32x4,
+    QFMAVecF32x4,
+    QFMSVecF32x4,
+    AddVecF32x4,
+    SubVecF32x4,
+    MulVecF32x4,
+    DivVecF32x4,
+    MinVecF32x4,
+    MaxVecF32x4,
+    AbsVecF64x2,
+    NegVecF64x2,
+    SqrtVecF64x2,
+    QFMAVecF64x2,
+    QFMSVecF64x2,
+    AddVecF64x2,
+    SubVecF64x2,
+    MulVecF64x2,
+    DivVecF64x2,
+    MinVecF64x2,
+    MaxVecF64x2,
+    TruncSatSVecF32x4ToVecI32x4,
+    TruncSatUVecF32x4ToVecI32x4,
+    TruncSatSVecF64x2ToVecI64x2,
+    TruncSatUVecF64x2ToVecI64x2,
+    ConvertSVecI32x4ToVecF32x4,
+    ConvertUVecI32x4ToVecF32x4,
+    ConvertSVecI64x2ToVecF64x2,
+    ConvertUVecI64x2ToVecF64x2,
+    LoadSplatVec8x16,
+    LoadSplatVec16x8,
+    LoadSplatVec32x4,
+    LoadSplatVec64x2,
+    LoadExtSVec8x8ToVecI16x8,
+    LoadExtUVec8x8ToVecI16x8,
+    LoadExtSVec16x4ToVecI32x4,
+    LoadExtUVec16x4ToVecI32x4,
+    LoadExtSVec32x2ToVecI64x2,
+    LoadExtUVec32x2ToVecI64x2,
+    NarrowSVecI16x8ToVecI8x16,
+    NarrowUVecI16x8ToVecI8x16,
+    NarrowSVecI32x4ToVecI16x8,
+    NarrowUVecI32x4ToVecI16x8,
+    WidenLowSVecI8x16ToVecI16x8,
+    WidenHighSVecI8x16ToVecI16x8,
+    WidenLowUVecI8x16ToVecI16x8,
+    WidenHighUVecI8x16ToVecI16x8,
+    WidenLowSVecI16x8ToVecI32x4,
+    WidenHighSVecI16x8ToVecI32x4,
+    WidenLowUVecI16x8ToVecI32x4,
+    WidenHighUVecI16x8ToVecI32x4,
+    SwizzleVec8x16
+}
+
+internal external var ClzInt32: Operations
+
+internal external var CtzInt32: Operations
+
+internal external var PopcntInt32: Operations
+
+internal external var NegFloat32: Operations
+
+internal external var AbsFloat32: Operations
+
+internal external var CeilFloat32: Operations
+
+internal external var FloorFloat32: Operations
+
+internal external var TruncFloat32: Operations
+
+internal external var NearestFloat32: Operations
+
+internal external var SqrtFloat32: Operations
+
+internal external var EqZInt32: Operations
+
+internal external var ClzInt64: Operations
+
+internal external var CtzInt64: Operations
+
+internal external var PopcntInt64: Operations
+
+internal external var NegFloat64: Operations
+
+internal external var AbsFloat64: Operations
+
+internal external var CeilFloat64: Operations
+
+internal external var FloorFloat64: Operations
+
+internal external var TruncFloat64: Operations
+
+internal external var NearestFloat64: Operations
+
+internal external var SqrtFloat64: Operations
+
+internal external var EqZInt64: Operations
+
+internal external var ExtendSInt32: Operations
+
+internal external var ExtendUInt32: Operations
+
+internal external var WrapInt64: Operations
+
+internal external var TruncSFloat32ToInt32: Operations
+
+internal external var TruncSFloat32ToInt64: Operations
+
+internal external var TruncUFloat32ToInt32: Operations
+
+internal external var TruncUFloat32ToInt64: Operations
+
+internal external var TruncSFloat64ToInt32: Operations
+
+internal external var TruncSFloat64ToInt64: Operations
+
+internal external var TruncUFloat64ToInt32: Operations
+
+internal external var TruncUFloat64ToInt64: Operations
+
+internal external var TruncSatSFloat32ToInt32: Operations
+
+internal external var TruncSatSFloat32ToInt64: Operations
+
+internal external var TruncSatUFloat32ToInt32: Operations
+
+internal external var TruncSatUFloat32ToInt64: Operations
+
+internal external var TruncSatSFloat64ToInt32: Operations
+
+internal external var TruncSatSFloat64ToInt64: Operations
+
+internal external var TruncSatUFloat64ToInt32: Operations
+
+internal external var TruncSatUFloat64ToInt64: Operations
+
+internal external var ReinterpretFloat32: Operations
+
+internal external var ReinterpretFloat64: Operations
+
+internal external var ConvertSInt32ToFloat32: Operations
+
+internal external var ConvertSInt32ToFloat64: Operations
+
+internal external var ConvertUInt32ToFloat32: Operations
+
+internal external var ConvertUInt32ToFloat64: Operations
+
+internal external var ConvertSInt64ToFloat32: Operations
+
+internal external var ConvertSInt64ToFloat64: Operations
+
+internal external var ConvertUInt64ToFloat32: Operations
+
+internal external var ConvertUInt64ToFloat64: Operations
+
+internal external var PromoteFloat32: Operations
+
+internal external var DemoteFloat64: Operations
+
+internal external var ReinterpretInt32: Operations
+
+internal external var ReinterpretInt64: Operations
+
+internal external var ExtendS8Int32: Operations
+
+internal external var ExtendS16Int32: Operations
+
+internal external var ExtendS8Int64: Operations
+
+internal external var ExtendS16Int64: Operations
+
+internal external var ExtendS32Int64: Operations
+
+internal external var AddInt32: Operations
+
+internal external var SubInt32: Operations
+
+internal external var MulInt32: Operations
+
+internal external var DivSInt32: Operations
+
+internal external var DivUInt32: Operations
+
+internal external var RemSInt32: Operations
+
+internal external var RemUInt32: Operations
+
+internal external var AndInt32: Operations
+
+internal external var OrInt32: Operations
+
+internal external var XorInt32: Operations
+
+internal external var ShlInt32: Operations
+
+internal external var ShrUInt32: Operations
+
+internal external var ShrSInt32: Operations
+
+internal external var RotLInt32: Operations
+
+internal external var RotRInt32: Operations
+
+internal external var EqInt32: Operations
+
+internal external var NeInt32: Operations
+
+internal external var LtSInt32: Operations
+
+internal external var LtUInt32: Operations
+
+internal external var LeSInt32: Operations
+
+internal external var LeUInt32: Operations
+
+internal external var GtSInt32: Operations
+
+internal external var GtUInt32: Operations
+
+internal external var GeSInt32: Operations
+
+internal external var GeUInt32: Operations
+
+internal external var AddInt64: Operations
+
+internal external var SubInt64: Operations
+
+internal external var MulInt64: Operations
+
+internal external var DivSInt64: Operations
+
+internal external var DivUInt64: Operations
+
+internal external var RemSInt64: Operations
+
+internal external var RemUInt64: Operations
+
+internal external var AndInt64: Operations
+
+internal external var OrInt64: Operations
+
+internal external var XorInt64: Operations
+
+internal external var ShlInt64: Operations
+
+internal external var ShrUInt64: Operations
+
+internal external var ShrSInt64: Operations
+
+internal external var RotLInt64: Operations
+
+internal external var RotRInt64: Operations
+
+internal external var EqInt64: Operations
+
+internal external var NeInt64: Operations
+
+internal external var LtSInt64: Operations
+
+internal external var LtUInt64: Operations
+
+internal external var LeSInt64: Operations
+
+internal external var LeUInt64: Operations
+
+internal external var GtSInt64: Operations
+
+internal external var GtUInt64: Operations
+
+internal external var GeSInt64: Operations
+
+internal external var GeUInt64: Operations
+
+internal external var AddFloat32: Operations
+
+internal external var SubFloat32: Operations
+
+internal external var MulFloat32: Operations
+
+internal external var DivFloat32: Operations
+
+internal external var CopySignFloat32: Operations
+
+internal external var MinFloat32: Operations
+
+internal external var MaxFloat32: Operations
+
+internal external var EqFloat32: Operations
+
+internal external var NeFloat32: Operations
+
+internal external var LtFloat32: Operations
+
+internal external var LeFloat32: Operations
+
+internal external var GtFloat32: Operations
+
+internal external var GeFloat32: Operations
+
+internal external var AddFloat64: Operations
+
+internal external var SubFloat64: Operations
+
+internal external var MulFloat64: Operations
+
+internal external var DivFloat64: Operations
+
+internal external var CopySignFloat64: Operations
+
+internal external var MinFloat64: Operations
+
+internal external var MaxFloat64: Operations
+
+internal external var EqFloat64: Operations
+
+internal external var NeFloat64: Operations
+
+internal external var LtFloat64: Operations
+
+internal external var LeFloat64: Operations
+
+internal external var GtFloat64: Operations
+
+internal external var GeFloat64: Operations
+
+internal external var MemorySize: Operations
+
+internal external var MemoryGrow: Operations
+
+internal external var AtomicRMWAdd: Operations
+
+internal external var AtomicRMWSub: Operations
+
+internal external var AtomicRMWAnd: Operations
+
+internal external var AtomicRMWOr: Operations
+
+internal external var AtomicRMWXor: Operations
+
+internal external var AtomicRMWXchg: Operations
+
+internal external var SplatVecI8x16: Operations
+
+internal external var ExtractLaneSVecI8x16: Operations
+
+internal external var ExtractLaneUVecI8x16: Operations
+
+internal external var ReplaceLaneVecI8x16: Operations
+
+internal external var SplatVecI16x8: Operations
+
+internal external var ExtractLaneSVecI16x8: Operations
+
+internal external var ExtractLaneUVecI16x8: Operations
+
+internal external var ReplaceLaneVecI16x8: Operations
+
+internal external var SplatVecI32x4: Operations
+
+internal external var ExtractLaneVecI32x4: Operations
+
+internal external var ReplaceLaneVecI32x4: Operations
+
+internal external var SplatVecI64x2: Operations
+
+internal external var ExtractLaneVecI64x2: Operations
+
+internal external var ReplaceLaneVecI64x2: Operations
+
+internal external var SplatVecF32x4: Operations
+
+internal external var ExtractLaneVecF32x4: Operations
+
+internal external var ReplaceLaneVecF32x4: Operations
+
+internal external var SplatVecF64x2: Operations
+
+internal external var ExtractLaneVecF64x2: Operations
+
+internal external var ReplaceLaneVecF64x2: Operations
+
+internal external var EqVecI8x16: Operations
+
+internal external var NeVecI8x16: Operations
+
+internal external var LtSVecI8x16: Operations
+
+internal external var LtUVecI8x16: Operations
+
+internal external var GtSVecI8x16: Operations
+
+internal external var GtUVecI8x16: Operations
+
+internal external var LeSVecI8x16: Operations
+
+internal external var LeUVecI8x16: Operations
+
+internal external var GeSVecI8x16: Operations
+
+internal external var GeUVecI8x16: Operations
+
+internal external var EqVecI16x8: Operations
+
+internal external var NeVecI16x8: Operations
+
+internal external var LtSVecI16x8: Operations
+
+internal external var LtUVecI16x8: Operations
+
+internal external var GtSVecI16x8: Operations
+
+internal external var GtUVecI16x8: Operations
+
+internal external var LeSVecI16x8: Operations
+
+internal external var LeUVecI16x8: Operations
+
+internal external var GeSVecI16x8: Operations
+
+internal external var GeUVecI16x8: Operations
+
+internal external var EqVecI32x4: Operations
+
+internal external var NeVecI32x4: Operations
+
+internal external var LtSVecI32x4: Operations
+
+internal external var LtUVecI32x4: Operations
+
+internal external var GtSVecI32x4: Operations
+
+internal external var GtUVecI32x4: Operations
+
+internal external var LeSVecI32x4: Operations
+
+internal external var LeUVecI32x4: Operations
+
+internal external var GeSVecI32x4: Operations
+
+internal external var GeUVecI32x4: Operations
+
+internal external var EqVecF32x4: Operations
+
+internal external var NeVecF32x4: Operations
+
+internal external var LtVecF32x4: Operations
+
+internal external var GtVecF32x4: Operations
+
+internal external var LeVecF32x4: Operations
+
+internal external var GeVecF32x4: Operations
+
+internal external var EqVecF64x2: Operations
+
+internal external var NeVecF64x2: Operations
+
+internal external var LtVecF64x2: Operations
+
+internal external var GtVecF64x2: Operations
+
+internal external var LeVecF64x2: Operations
+
+internal external var GeVecF64x2: Operations
+
+internal external var NotVec128: Operations
+
+internal external var AndVec128: Operations
+
+internal external var OrVec128: Operations
+
+internal external var XorVec128: Operations
+
+internal external var AndNotVec128: Operations
+
+internal external var BitselectVec128: Operations
+
+internal external var NegVecI8x16: Operations
+
+internal external var AnyTrueVecI8x16: Operations
+
+internal external var AllTrueVecI8x16: Operations
+
+internal external var ShlVecI8x16: Operations
+
+internal external var ShrSVecI8x16: Operations
+
+internal external var ShrUVecI8x16: Operations
+
+internal external var AddVecI8x16: Operations
+
+internal external var AddSatSVecI8x16: Operations
+
+internal external var AddSatUVecI8x16: Operations
+
+internal external var SubVecI8x16: Operations
+
+internal external var SubSatSVecI8x16: Operations
+
+internal external var SubSatUVecI8x16: Operations
+
+internal external var MulVecI8x16: Operations
+
+internal external var MinSVecI8x16: Operations
+
+internal external var MinUVecI8x16: Operations
+
+internal external var MaxSVecI8x16: Operations
+
+internal external var MaxUVecI8x16: Operations
+
+internal external var NegVecI16x8: Operations
+
+internal external var AnyTrueVecI16x8: Operations
+
+internal external var AllTrueVecI16x8: Operations
+
+internal external var ShlVecI16x8: Operations
+
+internal external var ShrSVecI16x8: Operations
+
+internal external var ShrUVecI16x8: Operations
+
+internal external var AddVecI16x8: Operations
+
+internal external var AddSatSVecI16x8: Operations
+
+internal external var AddSatUVecI16x8: Operations
+
+internal external var SubVecI16x8: Operations
+
+internal external var SubSatSVecI16x8: Operations
+
+internal external var SubSatUVecI16x8: Operations
+
+internal external var MulVecI16x8: Operations
+
+internal external var MinSVecI16x8: Operations
+
+internal external var MinUVecI16x8: Operations
+
+internal external var MaxSVecI16x8: Operations
+
+internal external var MaxUVecI16x8: Operations
+
+internal external var DotSVecI16x8ToVecI32x4: Operations
+
+internal external var NegVecI32x4: Operations
+
+internal external var AnyTrueVecI32x4: Operations
+
+internal external var AllTrueVecI32x4: Operations
+
+internal external var ShlVecI32x4: Operations
+
+internal external var ShrSVecI32x4: Operations
+
+internal external var ShrUVecI32x4: Operations
+
+internal external var AddVecI32x4: Operations
+
+internal external var SubVecI32x4: Operations
+
+internal external var MulVecI32x4: Operations
+
+internal external var MinSVecI32x4: Operations
+
+internal external var MinUVecI32x4: Operations
+
+internal external var MaxSVecI32x4: Operations
+
+internal external var MaxUVecI32x4: Operations
+
+internal external var NegVecI64x2: Operations
+
+internal external var AnyTrueVecI64x2: Operations
+
+internal external var AllTrueVecI64x2: Operations
+
+internal external var ShlVecI64x2: Operations
+
+internal external var ShrSVecI64x2: Operations
+
+internal external var ShrUVecI64x2: Operations
+
+internal external var AddVecI64x2: Operations
+
+internal external var SubVecI64x2: Operations
+
+internal external var AbsVecF32x4: Operations
+
+internal external var NegVecF32x4: Operations
+
+internal external var SqrtVecF32x4: Operations
+
+internal external var QFMAVecF32x4: Operations
+
+internal external var QFMSVecF32x4: Operations
+
+internal external var AddVecF32x4: Operations
+
+internal external var SubVecF32x4: Operations
+
+internal external var MulVecF32x4: Operations
+
+internal external var DivVecF32x4: Operations
+
+internal external var MinVecF32x4: Operations
+
+internal external var MaxVecF32x4: Operations
+
+internal external var AbsVecF64x2: Operations
+
+internal external var NegVecF64x2: Operations
+
+internal external var SqrtVecF64x2: Operations
+
+internal external var QFMAVecF64x2: Operations
+
+internal external var QFMSVecF64x2: Operations
+
+internal external var AddVecF64x2: Operations
+
+internal external var SubVecF64x2: Operations
+
+internal external var MulVecF64x2: Operations
+
+internal external var DivVecF64x2: Operations
+
+internal external var MinVecF64x2: Operations
+
+internal external var MaxVecF64x2: Operations
+
+internal external var TruncSatSVecF32x4ToVecI32x4: Operations
+
+internal external var TruncSatUVecF32x4ToVecI32x4: Operations
+
+internal external var TruncSatSVecF64x2ToVecI64x2: Operations
+
+internal external var TruncSatUVecF64x2ToVecI64x2: Operations
+
+internal external var ConvertSVecI32x4ToVecF32x4: Operations
+
+internal external var ConvertUVecI32x4ToVecF32x4: Operations
+
+internal external var ConvertSVecI64x2ToVecF64x2: Operations
+
+internal external var ConvertUVecI64x2ToVecF64x2: Operations
+
+internal external var LoadSplatVec8x16: Operations
+
+internal external var LoadSplatVec16x8: Operations
+
+internal external var LoadSplatVec32x4: Operations
+
+internal external var LoadSplatVec64x2: Operations
+
+internal external var LoadExtSVec8x8ToVecI16x8: Operations
+
+internal external var LoadExtUVec8x8ToVecI16x8: Operations
+
+internal external var LoadExtSVec16x4ToVecI32x4: Operations
+
+internal external var LoadExtUVec16x4ToVecI32x4: Operations
+
+internal external var LoadExtSVec32x2ToVecI64x2: Operations
+
+internal external var LoadExtUVec32x2ToVecI64x2: Operations
+
+internal external var NarrowSVecI16x8ToVecI8x16: Operations
+
+internal external var NarrowUVecI16x8ToVecI8x16: Operations
+
+internal external var NarrowSVecI32x4ToVecI16x8: Operations
+
+internal external var NarrowUVecI32x4ToVecI16x8: Operations
+
+internal external var WidenLowSVecI8x16ToVecI16x8: Operations
+
+internal external var WidenHighSVecI8x16ToVecI16x8: Operations
+
+internal external var WidenLowUVecI8x16ToVecI16x8: Operations
+
+internal external var WidenHighUVecI8x16ToVecI16x8: Operations
+
+internal external var WidenLowSVecI16x8ToVecI32x4: Operations
+
+internal external var WidenHighSVecI16x8ToVecI32x4: Operations
+
+internal external var WidenLowUVecI16x8ToVecI32x4: Operations
+
+internal external var WidenHighUVecI16x8ToVecI32x4: Operations
+
+internal external var SwizzleVec8x16: Operations
+
+internal external interface `T$2` {
+    fun get(index: Number, type: Type): ExpressionRef
+    fun set(index: Number, value: ExpressionRef): ExpressionRef
+    fun tee(index: Number, value: ExpressionRef, type: Type): ExpressionRef
+}
+
+internal external interface `T$3` {
+    fun get(name: String, type: Type): ExpressionRef
+    fun set(name: String, value: ExpressionRef): ExpressionRef
+}
+
+internal external interface `T$4` {
+    fun size(): ExpressionRef
+    fun grow(value: ExpressionRef): ExpressionRef
+    fun init(segment: Number, dest: ExpressionRef, offset: ExpressionRef, size: ExpressionRef): ExpressionRef
+    fun copy(dest: ExpressionRef, source: ExpressionRef, size: ExpressionRef): ExpressionRef
+    fun fill(dest: ExpressionRef, value: ExpressionRef, size: ExpressionRef): ExpressionRef
+}
+
+internal external interface `T$5` {
+    fun drop(segment: Number): ExpressionRef
+}
+
+internal external interface `T$6` {
+    fun f32(value: ExpressionRef): ExpressionRef
+    fun f64(value: ExpressionRef): ExpressionRef
+}
+
+internal external interface `T$7` {
+    fun add(offset: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun sub(offset: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun and(offset: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun or(offset: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun xor(offset: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun xchg(offset: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun cmpxchg(offset: Number, ptr: ExpressionRef, expected: ExpressionRef, replacement: ExpressionRef): ExpressionRef
+}
+
+internal external interface `T$8` {
+    fun load(offset: Number, ptr: ExpressionRef): ExpressionRef
+    fun load8_u(offset: Number, ptr: ExpressionRef): ExpressionRef
+    fun load16_u(offset: Number, ptr: ExpressionRef): ExpressionRef
+    fun store(offset: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun store8(offset: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun store16(offset: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    var rmw: `T$7`
+    var rmw8_u: `T$7`
+    var rmw16_u: `T$7`
+    fun wait(ptr: ExpressionRef, expected: ExpressionRef, timeout: ExpressionRef): ExpressionRef
+}
+
+internal external interface `T$9` {
+    fun load(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun load8_s(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun load8_u(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun load16_s(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun load16_u(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun store(offset: Number, align: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun store8(offset: Number, align: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun store16(offset: Number, align: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun const(value: Number): ExpressionRef
+    fun clz(value: ExpressionRef): ExpressionRef
+    fun ctz(value: ExpressionRef): ExpressionRef
+    fun popcnt(value: ExpressionRef): ExpressionRef
+    fun eqz(value: ExpressionRef): ExpressionRef
+    var trunc_s: `T$6`
+    var trunc_u: `T$6`
+    var trunc_s_sat: `T$6`
+    var trunc_u_sat: `T$6`
+    fun reinterpret(value: ExpressionRef): ExpressionRef
+    fun extend8_s(value: ExpressionRef): ExpressionRef
+    fun extend16_s(value: ExpressionRef): ExpressionRef
+    fun wrap(value: ExpressionRef): ExpressionRef
+    fun add(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun sub(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun mul(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun div_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun div_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun rem_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun rem_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun and(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun or(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun xor(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun shl(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun shr_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun shr_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun rotl(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun rotr(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun eq(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ne(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun lt_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun lt_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun le_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun le_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun gt_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun gt_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ge_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ge_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    var atomic: `T$8`
+    fun pop(): ExpressionRef
+}
+
+internal external interface `T$10` {
+    fun load(offset: Number, ptr: ExpressionRef): ExpressionRef
+    fun load8_u(offset: Number, ptr: ExpressionRef): ExpressionRef
+    fun load16_u(offset: Number, ptr: ExpressionRef): ExpressionRef
+    fun load32_u(offset: Number, ptr: ExpressionRef): ExpressionRef
+    fun store(offset: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun store8(offset: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun store16(offset: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun store32(offset: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    var rmw: `T$7`
+    var rmw8_u: `T$7`
+    var rmw16_u: `T$7`
+    var rmw32_u: `T$7`
+    fun wait(ptr: ExpressionRef, expected: ExpressionRef, timeout: ExpressionRef): ExpressionRef
+}
+
+internal external interface `T$11` {
+    fun load(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun load8_s(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun load8_u(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun load16_s(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun load16_u(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun load32_s(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun load32_u(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun store(offset: Number, align: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun store8(offset: Number, align: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun store16(offset: Number, align: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun store32(offset: Number, align: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun const(low: Number, high: Number): ExpressionRef
+    fun clz(value: ExpressionRef): ExpressionRef
+    fun ctz(value: ExpressionRef): ExpressionRef
+    fun popcnt(value: ExpressionRef): ExpressionRef
+    fun eqz(value: ExpressionRef): ExpressionRef
+    var trunc_s: `T$6`
+    var trunc_u: `T$6`
+    var trunc_s_sat: `T$6`
+    var trunc_u_sat: `T$6`
+    fun reinterpret(value: ExpressionRef): ExpressionRef
+    fun extend8_s(value: ExpressionRef): ExpressionRef
+    fun extend16_s(value: ExpressionRef): ExpressionRef
+    fun extend32_s(value: ExpressionRef): ExpressionRef
+    fun extend_s(value: ExpressionRef): ExpressionRef
+    fun extend_u(value: ExpressionRef): ExpressionRef
+    fun add(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun sub(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun mul(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun div_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun div_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun rem_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun rem_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun and(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun or(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun xor(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun shl(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun shr_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun shr_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun rotl(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun rotr(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun eq(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ne(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun lt_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun lt_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun le_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun le_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun gt_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun gt_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ge_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ge_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    var atomic: `T$10`
+    fun pop(): ExpressionRef
+}
+
+internal external interface `T$12` {
+    fun load(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun store(offset: Number, align: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun const(value: Number): ExpressionRef
+    fun const_bits(value: Number): ExpressionRef
+    fun neg(value: ExpressionRef): ExpressionRef
+    fun abs(value: ExpressionRef): ExpressionRef
+    fun ceil(value: ExpressionRef): ExpressionRef
+    fun floor(value: ExpressionRef): ExpressionRef
+    fun trunc(value: ExpressionRef): ExpressionRef
+    fun nearest(value: ExpressionRef): ExpressionRef
+    fun sqrt(value: ExpressionRef): ExpressionRef
+    fun reinterpret(value: ExpressionRef): ExpressionRef
+    var convert_s: `T$6`
+    var convert_u: `T$6`
+    fun demote(value: ExpressionRef): ExpressionRef
+    fun add(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun sub(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun mul(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun div(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun copysign(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun min(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun max(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun eq(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ne(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun lt(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun le(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun gt(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ge(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun pop(): ExpressionRef
+}
+
+internal external interface `T$13` {
+    fun load(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun store(offset: Number, align: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun const(value: Number): ExpressionRef
+    fun const_bits(low: Number, high: Number): ExpressionRef
+    fun neg(value: ExpressionRef): ExpressionRef
+    fun abs(value: ExpressionRef): ExpressionRef
+    fun ceil(value: ExpressionRef): ExpressionRef
+    fun floor(value: ExpressionRef): ExpressionRef
+    fun trunc(value: ExpressionRef): ExpressionRef
+    fun nearest(value: ExpressionRef): ExpressionRef
+    fun sqrt(value: ExpressionRef): ExpressionRef
+    fun reinterpret(value: ExpressionRef): ExpressionRef
+    var convert_s: `T$6`
+    var convert_u: `T$6`
+    fun promote(value: ExpressionRef): ExpressionRef
+    fun add(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun sub(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun mul(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun div(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun copysign(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun min(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun max(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun eq(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ne(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun lt(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun le(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun gt(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ge(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun pop(): ExpressionRef
+}
+
+internal external interface `T$14` {
+    fun load(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun store(offset: Number, align: Number, ptr: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun const(value: Number): ExpressionRef
+    fun not(value: ExpressionRef): ExpressionRef
+    fun and(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun or(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun xor(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun andnot(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun bitselect(left: ExpressionRef, right: ExpressionRef, cond: ExpressionRef): ExpressionRef
+    fun pop(): ExpressionRef
+}
+
+internal external interface `T$15` {
+    fun splat(value: ExpressionRef): ExpressionRef
+    fun extract_lane_s(vec: ExpressionRef, index: ExpressionRef): ExpressionRef
+    fun extract_lane_u(vec: ExpressionRef, index: ExpressionRef): ExpressionRef
+    fun replace_lane(vec: ExpressionRef, index: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun eq(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ne(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun lt_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun lt_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun gt_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun gt_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun le_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun le_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ge_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ge_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun neg(value: ExpressionRef): ExpressionRef
+    fun any_true(value: ExpressionRef): ExpressionRef
+    fun all_true(value: ExpressionRef): ExpressionRef
+    fun shl(vec: ExpressionRef, shift: ExpressionRef): ExpressionRef
+    fun shr_s(vec: ExpressionRef, shift: ExpressionRef): ExpressionRef
+    fun shr_u(vec: ExpressionRef, shift: ExpressionRef): ExpressionRef
+    fun add(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun add_saturate_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun add_saturate_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun sub(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun sub_saturate_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun sub_saturate_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun mul(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun min_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun min_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun max_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun max_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun avgr_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun narrow_i16x8_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun narrow_i16x8_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+}
+
+internal external interface `T$16` {
+    fun splat(value: ExpressionRef): ExpressionRef
+    fun extract_lane_s(vec: ExpressionRef, index: ExpressionRef): ExpressionRef
+    fun extract_lane_u(vec: ExpressionRef, index: ExpressionRef): ExpressionRef
+    fun replace_lane(vec: ExpressionRef, index: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun eq(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ne(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun lt_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun lt_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun gt_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun gt_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun le_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun le_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ge_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ge_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun neg(value: ExpressionRef): ExpressionRef
+    fun any_true(value: ExpressionRef): ExpressionRef
+    fun all_true(value: ExpressionRef): ExpressionRef
+    fun shl(vec: ExpressionRef, shift: ExpressionRef): ExpressionRef
+    fun shr_s(vec: ExpressionRef, shift: ExpressionRef): ExpressionRef
+    fun shr_u(vec: ExpressionRef, shift: ExpressionRef): ExpressionRef
+    fun add(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun add_saturate_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun add_saturate_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun sub(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun sub_saturate_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun sub_saturate_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun mul(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun min_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun min_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun max_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun max_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun avgr_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun narrow_i32x4_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun narrow_i32x4_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun widen_low_i8x16_s(value: ExpressionRef): ExpressionRef
+    fun widen_high_i8x16_s(value: ExpressionRef): ExpressionRef
+    fun widen_low_i8x16_u(value: ExpressionRef): ExpressionRef
+    fun widen_high_i8x16_u(value: ExpressionRef): ExpressionRef
+    fun load8x8_s(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun load8x8_u(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+}
+
+internal external interface `T$17` {
+    fun splat(value: ExpressionRef): ExpressionRef
+    fun extract_lane(vec: ExpressionRef, index: ExpressionRef): ExpressionRef
+    fun replace_lane(vec: ExpressionRef, index: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun eq(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ne(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun lt_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun lt_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun gt_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun gt_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun le_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun le_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ge_s(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ge_u(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun neg(value: ExpressionRef): ExpressionRef
+    fun any_true(value: ExpressionRef): ExpressionRef
+    fun all_true(value: ExpressionRef): ExpressionRef
+    fun shl(vec: ExpressionRef, shift: ExpressionRef): ExpressionRef
+    fun shr_s(vec: ExpressionRef, shift: ExpressionRef): ExpressionRef
+    fun shr_u(vec: ExpressionRef, shift: ExpressionRef): ExpressionRef
+    fun add(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun sub(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun mul(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun trunc_sat_f32x4_s(value: ExpressionRef): ExpressionRef
+    fun trunc_sat_f32x4_u(value: ExpressionRef): ExpressionRef
+    fun widen_low_i16x8_s(value: ExpressionRef): ExpressionRef
+    fun widen_high_i16x8_s(value: ExpressionRef): ExpressionRef
+    fun widen_low_i16x8_u(value: ExpressionRef): ExpressionRef
+    fun widen_high_i16x8_u(value: ExpressionRef): ExpressionRef
+    fun load16x4_s(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun load16x4_u(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+}
+
+internal external interface `T$18` {
+    fun splat(value: ExpressionRef): ExpressionRef
+    fun extract_lane(vec: ExpressionRef, index: ExpressionRef): ExpressionRef
+    fun replace_lane(vec: ExpressionRef, index: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun neg(value: ExpressionRef): ExpressionRef
+    fun any_true(value: ExpressionRef): ExpressionRef
+    fun all_true(value: ExpressionRef): ExpressionRef
+    fun shl(vec: ExpressionRef, shift: ExpressionRef): ExpressionRef
+    fun shr_s(vec: ExpressionRef, shift: ExpressionRef): ExpressionRef
+    fun shr_u(vec: ExpressionRef, shift: ExpressionRef): ExpressionRef
+    fun add(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun sub(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun trunc_sat_f64x2_s(value: ExpressionRef): ExpressionRef
+    fun trunc_sat_f64x2_u(value: ExpressionRef): ExpressionRef
+    fun load32x2_s(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+    fun load32x2_u(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+}
+
+internal external interface `T$19` {
+    fun splat(value: ExpressionRef): ExpressionRef
+    fun extract_lane(vec: ExpressionRef, index: ExpressionRef): ExpressionRef
+    fun replace_lane(vec: ExpressionRef, index: ExpressionRef, value: ExpressionRef): ExpressionRef
+    fun eq(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ne(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun lt(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun gt(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun le(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun ge(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun abs(value: ExpressionRef): ExpressionRef
+    fun neg(value: ExpressionRef): ExpressionRef
+    fun sqrt(value: ExpressionRef): ExpressionRef
+    fun qfma(a: ExpressionRef, b: ExpressionRef, c: ExpressionRef): ExpressionRef
+    fun qfms(a: ExpressionRef, b: ExpressionRef, c: ExpressionRef): ExpressionRef
+    fun add(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun sub(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun mul(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun div(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun min(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun max(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun convert_i32x4_s(value: ExpressionRef): ExpressionRef
+    fun convert_i32x4_u(value: ExpressionRef): ExpressionRef
+}
+
+internal external interface `T$20` {
+    fun shuffle(left: ExpressionRef, right: ExpressionRef, mask: Array<Number>): ExpressionRef
+    fun swizzle(left: ExpressionRef, right: ExpressionRef): ExpressionRef
+    fun load_splat(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+}
+
+internal external interface `T$21` {
+    fun load_splat(offset: Number, align: Number, ptr: ExpressionRef): ExpressionRef
+}
+
+internal external interface `T$22` {
+    fun pop(): ExpressionRef
+}
+
+internal external interface `T$23` {
+    fun `null`(): ExpressionRef
+    fun is_null(value: ExpressionRef): ExpressionRef
+    fun func(name: String): ExpressionRef
+}
+
+internal external interface `T$24` {
+    fun notify(ptr: ExpressionRef, notifyCount: ExpressionRef): ExpressionRef
+    fun fence(): ExpressionRef
+}
+
+internal external interface `T$25` {
+    fun make(elements: Array<ExportRef>): ExpressionRef
+    fun extract(tuple: ExpressionRef, index: Number): ExpressionRef
+}
+
+internal external interface `T$26` {
+    var imported: Boolean
+    var segments: Array<TableElement>
+}
+
+internal external interface `T$27` {
+    var binary: Uint8Array
+    var sourceMap: String?
+}
+
+internal open external class Module {
+    open var ptr: Number
+    open fun block(label: String, children: Array<ExpressionRef>, resultType: Type = definedExternally): ExpressionRef
+    open fun `if`(
+        condition: ExpressionRef,
+        ifTrue: ExpressionRef,
+        ifFalse: ExpressionRef = definedExternally
+    ): ExpressionRef
+
+    open fun loop(label: String, body: ExpressionRef): ExpressionRef
+    open fun br(
+        label: String,
+        condition: ExpressionRef = definedExternally,
+        value: ExpressionRef = definedExternally
+    ): ExpressionRef
+
+    open fun br_if(
+        label: String,
+        condition: ExpressionRef = definedExternally,
+        value: ExpressionRef = definedExternally
+    ): ExpressionRef
+
+    open fun switch(
+        labels: Array<String>,
+        defaultLabel: String,
+        condition: ExpressionRef,
+        value: ExpressionRef = definedExternally
+    ): ExpressionRef
+
+    open fun call(name: String, operands: Array<ExpressionRef>, returnType: Type): ExpressionRef
+    open fun return_call(name: String, operands: Array<ExpressionRef>, returnType: Type): ExpressionRef
+    open fun call_indirect(
+        target: ExpressionRef,
+        operands: Array<ExpressionRef>,
+        params: Type,
+        results: Type
+    ): ExpressionRef
+
+    open fun return_call_indirect(
+        target: ExpressionRef,
+        operands: Array<ExpressionRef>,
+        params: Type,
+        results: Type
+    ): ExpressionRef
+
+    open var local: `T$2`
+    open var global: `T$3`
+    open var memory: `T$4`
+    open var data: `T$5`
+    open var i32: `T$9`
+    open var i64: `T$11`
+    open var f32: `T$12`
+    open var f64: `T$13`
+    open var v128: `T$14`
+    open var i8x16: `T$15`
+    open var i16x8: `T$16`
+    open var i32x4: `T$17`
+    open var i64x2: `T$18`
+    open var f32x4: `T$19`
+    open var f64x2: `T$19`
+    open var v8x16: `T$20`
+    open var v16x8: `T$21`
+    open var v32x4: `T$21`
+    open var v64x2: `T$21`
+    open var funcref: `T$22`
+    open var anyref: `T$22`
+    open var nullref: `T$22`
+    open var exnref: `T$22`
+    open var ref: `T$23`
+    open var atomic: `T$24`
+    open var tuple: `T$25`
+    open fun `try`(body: ExpressionRef, catchBody: ExpressionRef): ExpressionRef
+    open fun `throw`(event: String, operands: Array<ExpressionRef>): ExpressionRef
+    open fun rethrow(exnref: ExpressionRef): ExpressionRef
+    open fun br_on_exn(label: String, event: String, exnref: ExpressionRef): ExpressionRef
+    open fun push(value: ExpressionRef): ExpressionRef
+    open fun select(
+        condition: ExpressionRef,
+        ifTrue: ExpressionRef,
+        ifFalse: ExpressionRef,
+        type: Type = definedExternally
+    ): ExpressionRef
+
+    open fun drop(value: ExpressionRef): ExpressionRef
+    open fun `return`(value: ExpressionRef = definedExternally): ExpressionRef
+    open fun host(op: Operations, name: String, operands: Array<ExpressionRef>): ExpressionRef
+    open fun nop(): ExpressionRef
+    open fun unreachable(): ExpressionRef
+    open fun addFunction(name: String, params: Type, results: Type, vars: Array<Type>, body: ExpressionRef): FunctionRef
+    open fun getFunction(name: String): FunctionRef
+    open fun removeFunction(name: String)
+    open fun getNumFunctions(): Number
+    open fun getFunctionByIndex(index: Number): FunctionRef
+    open fun addGlobal(name: String, type: Type, mutable: Boolean, init: ExpressionRef): GlobalRef
+    open fun getGlobal(name: String): GlobalRef
+    open fun removeGlobal(name: String)
+    open fun addEvent(name: String, attribute: Number, params: Type, results: Type): EventRef
+    open fun getEvent(name: String): EventRef
+    open fun removeEvent(name: String)
+    open fun addFunctionImport(
+        internalName: String,
+        externalModuleName: String,
+        externalBaseName: String,
+        params: Type,
+        results: Type
+    )
+
+    open fun addTableImport(internalName: String, externalModuleName: String, externalBaseName: String)
+    open fun addMemoryImport(internalName: String, externalModuleName: String, externalBaseName: String)
+    open fun addGlobalImport(
+        internalName: String,
+        externalModuleName: String,
+        externalBaseName: String,
+        globalType: Type
+    )
+
+    open fun addEventImport(
+        internalName: String,
+        externalModuleName: String,
+        externalBaseName: String,
+        attribute: Number,
+        params: Type,
+        results: Type
+    )
+
+    open fun addFunctionExport(internalName: String, externalName: String): ExportRef
+    open fun addTableExport(internalName: String, externalName: String): ExportRef
+    open fun addMemoryExport(internalName: String, externalName: String): ExportRef
+    open fun addGlobalExport(internalName: String, externalName: String): ExportRef
+    open fun removeExport(externalName: String)
+    open fun getNumExports(): Number
+    open fun getExportByIndex(index: Number): ExportRef
+    open fun setFunctionTable(
+        initial: Number,
+        maximum: Number,
+        funcNames: Array<Number>,
+        offset: ExpressionRef = definedExternally
+    )
+
+    open fun getFunctionTable(): `T$26`
+    open fun setMemory(
+        initial: Number,
+        maximum: Number,
+        exportName: String? = definedExternally,
+        segments: Array<MemorySegment>? = definedExternally,
+        flags: Array<Number>? = definedExternally,
+        shared: Boolean = definedExternally
+    )
+
+    open fun getNumMemorySegments(): Number
+    open fun getMemorySegmentInfoByIndex(index: Number): MemorySegmentInfo
+    open fun setStart(start: FunctionRef)
+    open fun getFeatures(): Features
+    open fun setFeatures(features: Features)
+    open fun addCustomSection(name: String, contents: Uint8Array)
+    open fun emitText(): String
+    open fun emitStackIR(optimize: Boolean = definedExternally): String
+    open fun emitAsmjs(): String
+    open fun validate(): Number
+    open fun optimize()
+    open fun optimizeFunction(func: String)
+    open fun optimizeFunction(func: FunctionRef)
+    open fun runPasses(passes: Array<String>)
+    open fun runPassesOnFunction(func: String, passes: Array<String>)
+    open fun runPassesOnFunction(func: FunctionRef, passes: Array<String>)
+    open fun autoDrop()
+    open fun dispose()
+    open fun emitBinary(): Uint8Array
+    open fun emitBinary(sourceMapUrl: String?): `T$27`
+    open fun interpret()
+    open fun addDebugInfoFileName(filename: String): Number
+    open fun getDebugInfoFileName(index: Number): String?
+    open fun setDebugLocation(
+        func: FunctionRef,
+        expr: ExpressionRef,
+        fileIndex: Number,
+        lineNumber: Number,
+        columnNumber: Number
+    )
+
+    open fun copyExpression(expr: ExpressionRef): ExpressionRef
+}
+
+internal external interface MemorySegment {
+    var offset: ExpressionRef
+    var data: Uint8Array
+    var passive: Boolean?
+        get() = definedExternally
+        set(value) = definedExternally
+}
+
+internal external interface TableElement {
+    var offset: ExpressionRef
+    var names: Array<String>
+}
+
+internal external fun wrapModule(ptr: Number): Module
+
+internal external fun getExpressionId(expression: ExpressionRef): Number
+
+internal external fun getExpressionType(expression: ExpressionRef): Type
+
+internal external fun getExpressionInfo(expression: ExpressionRef): ExpressionInfo
+
+internal external interface MemorySegmentInfo {
+    var offset: ExpressionRef
+    var data: Uint8Array
+    var passive: Boolean
+}
+
+internal external interface ExpressionInfo {
+    var id: ExpressionIds
+    var type: Type
+}
+
+internal external interface BlockInfo : ExpressionInfo {
+    var name: String
+    var children: Array<ExpressionRef>
+}
+
+internal external interface IfInfo : ExpressionInfo {
+    var condition: ExpressionRef
+    var ifTrue: ExpressionRef
+    var ifFalse: ExpressionRef
+}
+
+internal external interface LoopInfo : ExpressionInfo {
+    var name: String
+    var body: ExpressionRef
+}
+
+internal external interface BreakInfo : ExpressionInfo {
+    var name: String
+    var condition: ExpressionRef
+    var value: ExpressionRef
+}
+
+internal external interface SwitchInfo : ExpressionInfo {
+    var names: Array<String>
+    var defaultName: String?
+    var condition: ExpressionRef
+    var value: ExpressionRef
+}
+
+internal external interface CallInfo : ExpressionInfo {
+    var isReturn: Boolean
+    var target: String
+    var operands: Array<ExpressionRef>
+}
+
+internal external interface CallIndirectInfo : ExpressionInfo {
+    var isReturn: Boolean
+    var target: ExpressionRef
+    var operands: Array<ExpressionRef>
+}
+
+internal external interface LocalGetInfo : ExpressionInfo {
+    var index: Number
+}
+
+internal external interface LocalSetInfo : ExpressionInfo {
+    var isTee: Boolean
+    var index: Number
+    var value: ExpressionRef
+}
+
+internal external interface GlobalGetInfo : ExpressionInfo {
+    var name: String
+}
+
+internal external interface GlobalSetInfo : ExpressionInfo {
+    var name: String
+    var value: ExpressionRef
+}
+
+internal external interface LoadInfo : ExpressionInfo {
+    var isAtomic: Boolean
+    var isSigned: Boolean
+    var offset: Number
+    var bytes: Number
+    var align: Number
+    var ptr: ExpressionRef
+}
+
+internal external interface StoreInfo : ExpressionInfo {
+    var isAtomic: Boolean
+    var offset: Number
+    var bytes: Number
+    var align: Number
+    var ptr: ExpressionRef
+    var value: ExpressionRef
+}
+
+internal external interface `T$28` {
+    var low: Number
+    var high: Number
+}
+
+internal external interface ConstInfo : ExpressionInfo {
+    var value: dynamic /* Number | `T$28` */
+        get() = definedExternally
+        set(value) = definedExternally
+}
+
+internal external interface UnaryInfo : ExpressionInfo {
+    var op: Operations
+    var value: ExpressionRef
+}
+
+internal external interface BinaryInfo : ExpressionInfo {
+    var op: Operations
+    var left: ExpressionRef
+    var right: ExpressionRef
+}
+
+internal external interface SelectInfo : ExpressionInfo {
+    var ifTrue: ExpressionRef
+    var ifFalse: ExpressionRef
+    var condition: ExpressionRef
+}
+
+internal external interface DropInfo : ExpressionInfo {
+    var value: ExpressionRef
+}
+
+internal external interface ReturnInfo : ExpressionInfo {
+    var value: ExpressionRef
+}
+
+internal external interface NopInfo : ExpressionInfo
+
+internal external interface UnreachableInfo : ExpressionInfo
+
+internal external interface HostInfo : ExpressionInfo {
+    var op: Operations
+    var nameOperand: String?
+    var operands: Array<ExpressionRef>
+}
+
+internal external interface AtomicRMWInfo : ExpressionInfo {
+    var op: Operations
+    var bytes: Number
+    var offset: Number
+    var ptr: ExpressionRef
+    var value: ExpressionRef
+}
+
+internal external interface AtomicCmpxchgInfo : ExpressionInfo {
+    var bytes: Number
+    var offset: Number
+    var ptr: ExpressionRef
+    var expected: ExpressionRef
+    var replacement: ExpressionRef
+}
+
+internal external interface AtomicWaitInfo : ExpressionInfo {
+    var ptr: ExpressionRef
+    var expected: ExpressionRef
+    var timeout: ExpressionRef
+    var expectedType: Type
+}
+
+internal external interface AtomicNotifyInfo : ExpressionInfo {
+    var ptr: ExpressionRef
+    var notifyCount: ExpressionRef
+}
+
+internal external interface AtomicFenceInfo : ExpressionInfo {
+    var order: Number
+}
+
+internal external interface SIMDExtractInfo : ExpressionInfo {
+    var op: Operations
+    var vec: ExpressionRef
+    var index: ExpressionRef
+}
+
+internal external interface SIMDReplaceInfo : ExpressionInfo {
+    var op: Operations
+    var vec: ExpressionRef
+    var index: ExpressionRef
+    var value: ExpressionRef
+}
+
+internal external interface SIMDShuffleInfo : ExpressionInfo {
+    var left: ExpressionRef
+    var right: ExpressionRef
+    var mask: Array<Number>
+}
+
+internal external interface SIMDTernaryInfo : ExpressionInfo {
+    var op: Operations
+    var a: ExpressionRef
+    var b: ExpressionRef
+    var c: ExpressionRef
+}
+
+internal external interface SIMDShiftInfo : ExpressionInfo {
+    var op: Operations
+    var vec: ExpressionRef
+    var shift: ExpressionRef
+}
+
+internal external interface SIMDLoadInfo : ExpressionInfo {
+    var op: Operations
+    var offset: Number
+    var align: Number
+    var ptr: ExpressionRef
+}
+
+internal external interface MemoryInitInfo : ExpressionInfo {
+    var segment: Number
+    var dest: ExpressionRef
+    var offset: ExpressionRef
+    var size: ExpressionRef
+}
+
+internal external interface MemoryDropInfo : ExpressionInfo {
+    var segment: Number
+}
+
+internal external interface MemoryCopyInfo : ExpressionInfo {
+    var dest: ExpressionRef
+    var source: ExpressionRef
+    var size: ExpressionRef
+}
+
+internal external interface MemoryFillInfo : ExpressionInfo {
+    var dest: ExpressionRef
+    var value: ExpressionRef
+    var size: ExpressionRef
+}
+
+internal external interface RefNullInfo : ExpressionInfo
+
+internal external interface RefIsNullInfo : ExpressionInfo {
+    var value: ExpressionRef
+}
+
+internal external interface RefFuncInfo : ExpressionInfo {
+    var func: String
+}
+
+internal external interface TryInfo : ExpressionInfo {
+    var body: ExpressionRef
+    var catchBody: ExpressionRef
+}
+
+internal external interface ThrowInfo : ExpressionInfo {
+    var event: String
+    var operands: Array<ExpressionRef>
+}
+
+internal external interface RethrowInfo : ExpressionInfo {
+    var exnref: ExpressionRef
+}
+
+internal external interface BrOnExnInfo : ExpressionInfo {
+    var name: String
+    var event: String
+    var exnref: ExpressionRef
+}
+
+internal external interface PopInfo : ExpressionInfo
+
+internal external interface PushInfo : ExpressionInfo {
+    var value: ExpressionRef
+}
+
+internal external fun getFunctionInfo(func: FunctionRef): FunctionInfo
+
+internal external interface FunctionInfo {
+    var name: String
+    var module: String?
+    var base: String?
+    var params: Type
+    var results: Type
+    var vars: Array<Type>
+    var body: ExpressionRef
+}
+
+internal external fun getGlobalInfo(global: GlobalRef): GlobalInfo
+
+internal external interface GlobalInfo {
+    var name: String
+    var module: String?
+    var base: String?
+    var type: Type
+    var mutable: Boolean
+    var init: ExpressionRef
+}
+
+internal external fun getExportInfo(export_: ExportRef): ExportInfo
+
+internal external interface ExportInfo {
+    var kind: ExternalKinds
+    var name: String
+    var value: String
+}
+
+internal external fun getEventInfo(event: EventRef): EventInfo
+
+internal external interface EventInfo {
+    var name: String
+    var module: String?
+    var base: String?
+    var attribute: Number
+    var params: Type
+    var results: Type
+}
+
+internal external fun getSideEffects(expr: ExpressionRef, features: Features): SideEffects
+
+internal external enum class SideEffects {
+    None,
+    Branches,
+    Calls,
+    ReadsLocal,
+    WritesLocal,
+    ReadsGlobal,
+    WritesGlobal,
+    ReadsMemory,
+    WritesMemory,
+    ImplicitTrap,
+    IsAtomic,
+    Throws,
+    Any
+}
+
+internal external fun emitText(expression: ExpressionRef): String
+
+internal external fun emitText(expression: Module): String
+
+internal external fun readBinary(data: Uint8Array): Module
+
+internal external fun parseText(text: String): Module
+
+internal external fun getOptimizeLevel(): Number
+
+internal external fun setOptimizeLevel(level: Number): Number
+
+internal external fun getShrinkLevel(): Number
+
+internal external fun setShrinkLevel(level: Number): Number
+
+internal external fun getDebugInfo(): Boolean
+
+internal external fun setDebugInfo(on: Boolean)
+
+internal external fun getLowMemoryUnused(): Boolean
+
+internal external fun setLowMemoryUnused(on: Boolean)
+
+internal external fun getPassArgument(key: String): String?
+
+internal external fun setPassArgument(key: String, value: String?)
+
+internal external fun clearPassArguments()
+
+internal external fun getAlwaysInlineMaxSize(): Number
+
+internal external fun setAlwaysInlineMaxSize(size: Number)
+
+internal external fun getFlexibleInlineMaxSize(): Number
+
+internal external fun setFlexibleInlineMaxSize(size: Number)
+
+internal external fun getOneCallerInlineMaxSize(): Number
+
+internal external fun setOneCallerInlineMaxSize(size: Number)
+
+internal external fun exit(status: Number)
+
+internal open external class Relooper(module: Module) {
+    open fun addBlock(expression: ExpressionRef): RelooperBlockRef
+    open fun addBranch(from: RelooperBlockRef, to: RelooperBlockRef, condition: ExpressionRef, code: ExpressionRef)
+    open fun addBlockWithSwitch(code: ExpressionRef, condition: ExpressionRef): RelooperBlockRef
+    open fun addBranchForSwitch(
+        from: RelooperBlockRef,
+        to: RelooperBlockRef,
+        indexes: Array<Number>,
+        code: ExpressionRef
+    )
+
+    open fun renderAndDispose(entry: RelooperBlockRef, labelHelper: Number): ExpressionRef
+}
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
new file mode 100644
index 000000000..f89db20e2
--- /dev/null
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
@@ -0,0 +1,11 @@
+@file:Suppress("PackageDirectoryMismatch", "NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING", "KDocMissingDocumentation")
+
+package space.kscience.kmath.internal.binaryen
+
+internal typealias Type = Number
+internal typealias ExpressionRef = Number
+internal typealias FunctionRef = Number
+internal typealias GlobalRef = Number
+internal typealias ExportRef = Number
+internal typealias EventRef = Number
+internal typealias RelooperBlockRef = Number
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/emitter/emitter.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt
similarity index 91%
rename from kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/emitter/emitter.kt
rename to kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt
index 7707f53a2..1f7b09af8 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/emitter/emitter.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.estree.internal.emitter
+package space.kscience.kmath.internal.emitter
 
 internal open external class Emitter {
     constructor(obj: Any)
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/estree/estree.extensions.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
similarity index 97%
rename from kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/estree/estree.extensions.kt
rename to kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
index 9ba11e085..3aa31f921 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/estree/estree.extensions.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.estree.internal.estree
+package space.kscience.kmath.internal.estree
 
 internal fun Program(sourceType: String, vararg body: dynamic) = object : Program {
     override var type = "Program"
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
similarity index 99%
rename from kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/estree/estree.kt
rename to kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
index a0e42db5d..e5254013e 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.estree.internal.estree
+package space.kscience.kmath.internal.estree
 
 import kotlin.js.RegExp
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
new file mode 100644
index 000000000..ae6c7eb35
--- /dev/null
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
@@ -0,0 +1,7 @@
+package space.kscience.kmath.internal.stream
+
+import space.kscience.kmath.internal.emitter.Emitter
+
+internal open external class Stream : Emitter {
+    open fun pipe(dest: Any, options: Any): Any
+}
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/tsstdlib/lib.es2015.iterable.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt
similarity index 94%
rename from kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/tsstdlib/lib.es2015.iterable.kt
rename to kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt
index a3c721ed4..9c012e3a3 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/tsstdlib/lib.es2015.iterable.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.estree.internal.tsstdlib
+package space.kscience.kmath.internal.tsstdlib
 
 internal external interface IteratorYieldResult<TYield> {
     var done: Boolean?
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/tsstdlib/lib.es5.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt
similarity index 88%
rename from kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/tsstdlib/lib.es5.kt
rename to kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt
index d2413b3e3..0cd395f2c 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/tsstdlib/lib.es5.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt
@@ -5,7 +5,7 @@
 
 @file:Suppress("UNUSED_TYPEALIAS_PARAMETER", "DEPRECATION")
 
-package space.kscience.kmath.estree.internal.tsstdlib
+package space.kscience.kmath.internal.tsstdlib
 
 import kotlin.js.RegExp
 
@@ -38,6 +38,8 @@ internal external interface RegExpConstructor {
     var lastMatch: String
 }
 
+internal typealias Record<K, T> = Any
+
 internal external interface ConcatArray<T> {
     var length: Number
 
@@ -85,3 +87,10 @@ internal external interface ArrayLike<T> {
 }
 
 internal typealias Extract<T, U> = Any
+
+internal external interface PromiseLike<T> {
+    fun then(
+        onfulfilled: ((value: T) -> Any?)? = definedExternally,
+        onrejected: ((reason: Any) -> Any?)? = definedExternally
+    ): PromiseLike<dynamic /* TResult1 | TResult2 */>
+}
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
new file mode 100644
index 000000000..322a2fa7b
--- /dev/null
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
@@ -0,0 +1,231 @@
+@file:JsQualifier("WebAssembly")
+
+@file:Suppress(
+    "INTERFACE_WITH_SUPERCLASS",
+    "OVERRIDING_FINAL_MEMBER",
+    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
+    "NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING",
+    "ClassName",
+)
+
+package space.kscience.kmath.internal.webassembly
+
+import space.kscience.kmath.internal.tsstdlib.PromiseLike
+import org.khronos.webgl.ArrayBuffer
+import org.khronos.webgl.ArrayBufferView
+import org.khronos.webgl.Uint8Array
+import org.w3c.fetch.Response
+import kotlin.js.Promise
+
+@Suppress("NESTED_CLASS_IN_EXTERNAL_INTERFACE")
+internal external interface CompileError {
+    companion object {
+        var prototype: CompileError
+    }
+}
+
+@Suppress("NESTED_CLASS_IN_EXTERNAL_INTERFACE")
+internal external interface Global {
+    var value: Any
+    fun valueOf(): Any
+
+    companion object {
+        var prototype: Global
+    }
+}
+
+@Suppress("NESTED_CLASS_IN_EXTERNAL_INTERFACE")
+@JsName("Instance")
+internal external interface Instance1 {
+    var exports: Exports
+
+    companion object {
+        var prototype: Instance
+    }
+}
+
+@Suppress("NESTED_CLASS_IN_EXTERNAL_INTERFACE")
+internal external interface LinkError {
+    companion object {
+        var prototype: LinkError
+    }
+}
+
+@Suppress("NESTED_CLASS_IN_EXTERNAL_INTERFACE")
+internal external interface Memory {
+    var buffer: ArrayBuffer
+    fun grow(delta: Number): Number
+
+    companion object {
+        var prototype: Memory
+    }
+}
+
+@Suppress("NESTED_CLASS_IN_EXTERNAL_INTERFACE")
+@JsName("Module")
+internal external interface Module1 {
+    companion object {
+        var prototype: Module
+        fun customSections(moduleObject: Module, sectionName: String): Array<ArrayBuffer>
+        fun exports(moduleObject: Module): Array<ModuleExportDescriptor>
+        fun imports(moduleObject: Module): Array<ModuleImportDescriptor>
+    }
+}
+
+@Suppress("NESTED_CLASS_IN_EXTERNAL_INTERFACE")
+internal external interface RuntimeError {
+    companion object {
+        var prototype: RuntimeError
+    }
+}
+
+@Suppress("NESTED_CLASS_IN_EXTERNAL_INTERFACE")
+internal external interface Table {
+    var length: Number
+    fun get(index: Number): Function<*>?
+    fun grow(delta: Number): Number
+    fun set(index: Number, value: Function<*>?)
+
+    companion object {
+        var prototype: Table
+    }
+}
+
+internal external interface GlobalDescriptor {
+    var mutable: Boolean?
+        get() = definedExternally
+        set(value) = definedExternally
+    var value: String /* "f32" | "f64" | "i32" | "i64" */
+}
+
+internal external interface MemoryDescriptor {
+    var initial: Number
+    var maximum: Number?
+        get() = definedExternally
+        set(value) = definedExternally
+}
+
+internal external interface ModuleExportDescriptor {
+    var kind: String /* "function" | "global" | "memory" | "table" */
+    var name: String
+}
+
+internal external interface ModuleImportDescriptor {
+    var kind: String /* "function" | "global" | "memory" | "table" */
+    var module: String
+    var name: String
+}
+
+internal external interface TableDescriptor {
+    var element: String /* "anyfunc" */
+    var initial: Number
+    var maximum: Number?
+        get() = definedExternally
+        set(value) = definedExternally
+}
+
+internal external interface WebAssemblyInstantiatedSource {
+    var instance: Instance
+    var module: Module
+}
+
+internal external fun compile(bytes: ArrayBufferView): Promise<Module>
+
+internal external fun compile(bytes: ArrayBuffer): Promise<Module>
+
+internal external fun compileStreaming(source: Response): Promise<Module>
+
+internal external fun compileStreaming(source: Promise<Response>): Promise<Module>
+
+internal external fun instantiate(
+    bytes: ArrayBufferView,
+    importObject: Imports = definedExternally,
+): Promise<WebAssemblyInstantiatedSource>
+
+internal external fun instantiate(bytes: ArrayBufferView): Promise<WebAssemblyInstantiatedSource>
+
+internal external fun instantiate(
+    bytes: ArrayBuffer,
+    importObject: Imports = definedExternally,
+): dynamic /* Promise | Promise */
+
+internal external fun instantiate(bytes: ArrayBuffer): dynamic /* Promise | Promise */
+
+internal external fun instantiate(moduleObject: Module, importObject: Imports = definedExternally): Promise<Instance>
+
+internal external fun instantiate(moduleObject: Module): Promise<Instance>
+
+internal external fun instantiateStreaming(
+    response: Response,
+    importObject: Imports = definedExternally,
+): Promise<WebAssemblyInstantiatedSource>
+
+internal external fun instantiateStreaming(response: Response): Promise<WebAssemblyInstantiatedSource>
+
+internal external fun instantiateStreaming(
+    response: PromiseLike<Response>,
+    importObject: Imports = definedExternally,
+): Promise<WebAssemblyInstantiatedSource>
+
+internal external fun instantiateStreaming(response: PromiseLike<Response>): Promise<WebAssemblyInstantiatedSource>
+
+internal external fun validate(bytes: ArrayBufferView): Boolean
+
+internal external fun validate(bytes: ArrayBuffer): Boolean
+
+internal external interface `T$0` {
+    var name: String
+    var kind: String
+}
+
+internal external interface `T$1` {
+    var module: String
+    var name: String
+    var kind: String
+}
+
+internal open external class Module {
+    constructor(bufferSource: ArrayBuffer)
+    constructor(bufferSource: Uint8Array)
+
+    companion object {
+        fun customSections(module: Module, sectionName: String): Array<ArrayBuffer>
+        fun exports(module: Module): Array<`T$0`>
+        fun imports(module: Module): Array<`T$1`>
+    }
+}
+
+@JsName("Instance")
+internal open external class Instance(module: Module, importObject: Any = definedExternally) {
+    open var exports: Any
+}
+
+@JsName("Memory")
+internal open external class Memory1(memoryDescriptor: MemoryDescriptor) {
+    open var buffer: ArrayBuffer
+    open fun grow(numPages: Number): Number
+}
+
+@JsName("Table")
+internal open external class Table1(tableDescriptor: TableDescriptor) {
+    open var length: Number
+    open fun get(index: Number): Function<*>
+    open fun grow(numElements: Number): Number
+    open fun set(index: Number, value: Function<*>)
+}
+
+internal external fun compile(bufferSource: Uint8Array): Promise<Module>
+
+internal external interface ResultObject {
+    var module: Module
+    var instance: Instance
+}
+
+internal external fun instantiate(
+    bufferSource: Uint8Array,
+    importObject: Any = definedExternally,
+): Promise<ResultObject>
+
+internal external fun instantiate(bufferSource: Uint8Array): Promise<ResultObject>
+
+internal external fun validate(bufferSource: Uint8Array): Boolean
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
new file mode 100644
index 000000000..095e46140
--- /dev/null
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
@@ -0,0 +1,22 @@
+@file:Suppress("INTERFACE_WITH_SUPERCLASS",
+    "OVERRIDING_FINAL_MEMBER",
+    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
+    "CONFLICTING_OVERLOADS",
+    "NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING",
+)
+
+package space.kscience.kmath.internal.webassembly
+
+import space.kscience.kmath.internal.tsstdlib.Record
+
+internal typealias Exports = Record<String, dynamic /* Function<*> | Global | Memory | Table */>
+
+internal typealias ModuleImports = Record<String, dynamic /* Function<*> | Global | Memory | Table | Number */>
+
+internal typealias Imports = Record<String, ModuleImports>
+
+internal typealias CompileError1 = Error
+
+internal typealias LinkError1 = Error
+
+internal typealias RuntimeError1 = Error
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
new file mode 100644
index 000000000..a031a4de4
--- /dev/null
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -0,0 +1,155 @@
+package space.kscience.kmath.wasm.internal
+
+import space.kscience.kmath.expressions.Expression
+import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.expressions.MST.*
+import space.kscience.kmath.internal.binaryen.*
+import space.kscience.kmath.internal.webassembly.Instance
+import space.kscience.kmath.misc.StringSymbol
+import space.kscience.kmath.operations.*
+import space.kscience.kmath.internal.binaryen.Module as BinaryenModule
+import space.kscience.kmath.internal.webassembly.Module as WasmModule
+
+private val spreader = eval("(obj, args) => obj(...args)")
+
+@Suppress("UnsafeCastFromDynamic")
+internal sealed class WasmBuilder<T>(
+    val binaryenType: Type,
+    val algebra: Algebra<T>,
+    val target: MST,
+) where T : Number {
+    val keys: MutableList<String> = mutableListOf()
+    lateinit var ctx: BinaryenModule
+
+    open fun visitSymbolic(mst: MST.Symbolic): ExpressionRef {
+        try {
+            algebra.bindSymbol(mst.value)
+        } catch (ignored: Throwable) {
+            null
+        }?.let { return visitNumeric(Numeric(it)) }
+
+        var idx = keys.indexOf(mst.value)
+
+        if (idx == -1) {
+            keys += mst.value
+            idx = keys.lastIndex
+        }
+
+        return ctx.local.get(idx, binaryenType)
+    }
+
+    abstract fun visitNumeric(mst: Numeric): ExpressionRef
+
+    open fun visitUnary(mst: Unary): ExpressionRef =
+        error("Unary operation ${mst.operation} not defined in $this")
+
+    open fun visitBinary(mst: Binary): ExpressionRef =
+        error("Binary operation ${mst.operation} not defined in $this")
+
+    open fun createModule(): BinaryenModule = js("new \$module\$binaryen.Module()")
+
+    fun visit(mst: MST): ExpressionRef = when (mst) {
+        is Symbolic -> visitSymbolic(mst)
+        is Numeric -> visitNumeric(mst)
+
+        is Unary -> when {
+            algebra is NumericAlgebra && mst.value is Numeric -> visitNumeric(
+                Numeric(algebra.unaryOperationFunction(mst.operation)(algebra.number((mst.value as Numeric).value))))
+
+            else -> visitUnary(mst)
+        }
+
+        is Binary -> when {
+            algebra is NumericAlgebra && mst.left is Numeric && mst.right is Numeric -> visitNumeric(Numeric(
+                algebra.binaryOperationFunction(mst.operation)
+                    .invoke(algebra.number((mst.left as Numeric).value), algebra.number((mst.right as Numeric).value))
+            ))
+
+            else -> visitBinary(mst)
+        }
+    }
+
+    val instance by lazy {
+        val c = WasmModule(with(createModule()) {
+            ctx = this
+            val expr = visit(target)
+
+            addFunction(
+                "executable",
+                createType(Array(keys.size) { binaryenType }),
+                binaryenType,
+                arrayOf(),
+                expr
+            )
+
+            setOptimizeLevel(3)
+            optimizeFunction("executable")
+            addFunctionExport("executable", "executable")
+            val res = emitBinary()
+            dispose()
+            res
+        })
+
+        val i = Instance(c, js("{}") as Any)
+        val symbols = keys.map(::StringSymbol)
+        keys.clear()
+
+        Expression<T> { args ->
+            val params = symbols.map(args::getValue).toTypedArray()
+            spreader(i.exports.asDynamic().executable, params) as T
+        }
+    }
+}
+
+internal class DoubleWasmBuilder(target: MST) : WasmBuilder<Double>(f64, DoubleField, target) {
+    override fun createModule(): BinaryenModule = readBinary(f64StandardFunctions)
+
+    override fun visitNumeric(mst: Numeric): ExpressionRef = ctx.f64.const(mst.value)
+
+    override fun visitUnary(mst: Unary): ExpressionRef = when (mst.operation) {
+        GroupOperations.MINUS_OPERATION -> ctx.f64.neg(visit(mst.value))
+        GroupOperations.PLUS_OPERATION -> visit(mst.value)
+        PowerOperations.SQRT_OPERATION -> ctx.f64.sqrt(visit(mst.value))
+        TrigonometricOperations.SIN_OPERATION -> ctx.call("sin", arrayOf(visit(mst.value)), f64)
+        TrigonometricOperations.COS_OPERATION -> ctx.call("cos", arrayOf(visit(mst.value)), f64)
+        TrigonometricOperations.TAN_OPERATION -> ctx.call("tan", arrayOf(visit(mst.value)), f64)
+        TrigonometricOperations.ASIN_OPERATION -> ctx.call("asin", arrayOf(visit(mst.value)), f64)
+        TrigonometricOperations.ACOS_OPERATION -> ctx.call("acos", arrayOf(visit(mst.value)), f64)
+        TrigonometricOperations.ATAN_OPERATION -> ctx.call("atan", arrayOf(visit(mst.value)), f64)
+        ExponentialOperations.SINH_OPERATION -> ctx.call("sinh", arrayOf(visit(mst.value)), f64)
+        ExponentialOperations.COSH_OPERATION -> ctx.call("cosh", arrayOf(visit(mst.value)), f64)
+        ExponentialOperations.TANH_OPERATION -> ctx.call("tanh", arrayOf(visit(mst.value)), f64)
+        ExponentialOperations.ASINH_OPERATION -> ctx.call("asinh", arrayOf(visit(mst.value)), f64)
+        ExponentialOperations.ACOSH_OPERATION -> ctx.call("acosh", arrayOf(visit(mst.value)), f64)
+        ExponentialOperations.ATANH_OPERATION -> ctx.call("atanh", arrayOf(visit(mst.value)), f64)
+        ExponentialOperations.EXP_OPERATION -> ctx.call("exp", arrayOf(visit(mst.value)), f64)
+        ExponentialOperations.LN_OPERATION -> ctx.call("log", arrayOf(visit(mst.value)), f64)
+        else -> super.visitUnary(mst)
+    }
+
+    override fun visitBinary(mst: Binary): ExpressionRef = when (mst.operation) {
+        GroupOperations.PLUS_OPERATION -> ctx.f64.add(visit(mst.left), visit(mst.right))
+        GroupOperations.MINUS_OPERATION -> ctx.f64.sub(visit(mst.left), visit(mst.right))
+        RingOperations.TIMES_OPERATION -> ctx.f64.mul(visit(mst.left), visit(mst.right))
+        FieldOperations.DIV_OPERATION -> ctx.f64.div(visit(mst.left), visit(mst.right))
+        PowerOperations.POW_OPERATION -> ctx.call("pow", arrayOf(visit(mst.left), visit(mst.right)), f64)
+        else -> super.visitBinary(mst)
+    }
+}
+
+internal class IntWasmBuilder(target: MST) : WasmBuilder<Int>(i32, IntRing, target) {
+    override fun visitNumeric(mst: Numeric): ExpressionRef = ctx.i32.const(mst.value)
+
+    override fun visitUnary(mst: Unary): ExpressionRef = when (mst.operation) {
+        GroupOperations.MINUS_OPERATION -> ctx.i32.sub(ctx.i32.const(0), visit(mst.value))
+        GroupOperations.PLUS_OPERATION -> visit(mst.value)
+        else -> super.visitUnary(mst)
+    }
+
+    override fun visitBinary(mst: Binary): ExpressionRef = when (mst.operation) {
+        GroupOperations.PLUS_OPERATION -> ctx.i32.add(visit(mst.left), visit(mst.right))
+        GroupOperations.MINUS_OPERATION -> ctx.i32.sub(visit(mst.left), visit(mst.right))
+        RingOperations.TIMES_OPERATION -> ctx.i32.mul(visit(mst.left), visit(mst.right))
+        else -> super.visitBinary(mst)
+    }
+}
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
new file mode 100644
index 000000000..cb0d71ad5
--- /dev/null
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
@@ -0,0 +1,8 @@
+package space.kscience.kmath.wasm.internal
+
+import space.kscience.kmath.internal.base64.toUint8Array
+
+internal val f64StandardFunctions by lazy { toUint8Array(B) }
+
+private const val B =
+    "AGFzbQEAAAABMghgAABgAXwBfGACfHwBfGAFf39/f38Bf2ACfH8Bf2ADfHx/AXxgAnx/AXxgA39/fwF/AxsaAAEBAQEBAQIDBAUBAQEBAQEBAgYBAQUBAQcEBQFwAQEBBQMBAAIGFQN/AUGgnwQLfwBBoJ8EC38AQaAfCwclAwZtZW1vcnkCAAtfX2hlYXBfYmFzZQMBCl9fZGF0YV9lbmQDAgrpaxoCAAvPBQMBfgF/AnwCQAJAAkAgAL0iAUIgiKdB/////wdxIgJBgIDA/wNJDQAgAkGAgMCAfGogAadyRQ0BRAAAAAAAAAAAIAAgAKGjDwsCQAJAIAJB/////gNLDQBEGC1EVPsh+T8hAyACQYGAgOMDSQ0BRAdcFDMmppE8IAAgAKIiAyADIAMgAyADIANECff9DeE9Aj+iRIiyAXXg70k/oKJEO49otSiCpL+gokRVRIgOVcHJP6CiRH1v6wMS1tS/oKJEVVVVVVVVxT+goiADIAMgAyADRIKSLrHFuLM/okRZAY0bbAbmv6CiRMiKWZzlKgBAoKJESy2KHCc6A8CgokQAAAAAAADwP6CjIACioSAAoUQYLURU+yH5P6APCyABQn9XDQJEAAAAAAAA8D8gAKFEAAAAAAAA4D+iIgAgAJ8iBL1CgICAgHCDvyIDIAOioSAEIAOgoyAEIAAgACAAIAAgACAARAn3/Q3hPQI/okSIsgF14O9JP6CiRDuPaLUogqS/oKJEVUSIDlXByT+gokR9b+sDEtbUv6CiRFVVVVVVVcU/oKIgACAAIAAgAESCki6xxbizP6JEWQGNG2wG5r+gokTIilmc5SoAQKCiREstihwnOgPAoKJEAAAAAAAA8D+go6KgIAOgIgAgAKAhAwsgAw8LRBgtRFT7IQlARAAAAAAAAAAAIAFCAFMbDwtEGC1EVPsh+T8gAEQAAAAAAADwP6BEAAAAAAAA4D+iIgCfIgMgAyAAIAAgACAAIAAgAEQJ9/0N4T0CP6JEiLIBdeDvST+gokQ7j2i1KIKkv6CiRFVEiA5Vwck/oKJEfW/rAxLW1L+gokRVVVVVVVXFP6CiIAAgACAAIABEgpIuscW4sz+iRFkBjRtsBua/oKJEyIpZnOUqAECgokRLLYocJzoDwKCiRAAAAAAAAPA/oKOiRAdcFDMmppG8oKChIgAgAKALdwEBfwJAIAC9QjSIp0H/D3EiAUH/B0sNACAARAAAAAAAAPC/oCIAIAAgAKIgACAAoKCfoBARDwsCQCABQZgISw0AIAAgAKBEAAAAAAAA8L8gACAAokQAAAAAAADwv6CfIACgo6AQEA8LIAAQEETvOfr+Qi7mP6AL0gQDAX4BfwN8AkACQAJAAkACQCAAvSIBQiCIp0H/////B3EiAkGAgMD/A0kNACACQYCAwIB8aiABp3JFDQFEAAAAAAAAAAAgACAAoaMPCwJAIAJB/////gNLDQAgAkGAgEBqQYCAgPIDTw0CIAAPC0QAAAAAAADwPyAAmaFEAAAAAAAA4D+iIgAgACAAIAAgACAARAn3/Q3hPQI/okSIsgF14O9JP6CiRDuPaLUogqS/oKJEVUSIDlXByT+gokR9b+sDEtbUv6CiRFVVVVVVVcU/oKIgACAAIAAgAESCki6xxbizP6JEWQGNG2wG5r+gokTIilmc5SoAQKCiREstihwnOgPAoKJEAAAAAAAA8D+goyEDIACfIQQgAkGz5rz/A0kNAkQYLURU+yH5PyAEIAQgA6KgIgAgAKBEB1wUMyamkbygoSEADAMLIABEGC1EVPsh+T+iRAAAAAAAAHA4oA8LIAAgAKIiBCAEIAQgBCAEIARECff9DeE9Aj+iRIiyAXXg70k/oKJEO49otSiCpL+gokRVRIgOVcHJP6CiRH1v6wMS1tS/oKJEVVVVVVVVxT+goiAEIAQgBCAERIKSLrHFuLM/okRZAY0bbAbmv6CiRMiKWZzlKgBAoKJESy2KHCc6A8CgokQAAAAAAADwP6CjIACiIACgDwtEGC1EVPsh6T8gBL1CgICAgHCDvyIFIAWgoSAEIASgIAOiRAdcFDMmppE8IAAgBSAFoqEgBCAFoKMiACAAoKGhoUQYLURU+yHpP6AhAAsgAJogACABQgBTGwvbAQQBfwF+AX8BfCMAQRBrIgEkACAAvSICQv///////////wCDvyEAAkACQCACQjSIp0H/D3EiA0GZCEkNACAAEBBE7zn6/kIu5j+gIQAMAQsCQCADQYAISQ0AIAAgAKBEAAAAAAAA8D8gACAAokQAAAAAAADwP6CfIACgo6AQECEADAELAkAgA0HlB0kNACAAIACiIgQgBEQAAAAAAADwP6CfRAAAAAAAAPA/oKMgAKAQESEADAELIAEgAEQAAAAAAABwR6A5AwgLIAFBEGokACAAmiAAIAJCAFMbC6gEBAF/AX4DfwJ8IwBBEGshASAAvSICQj+IpyEDAkACQAJAIAJCIIinQf////8HcSIEQYCAwKAESQ0AIAJC////////////AINCgICAgICAgPj/AFYNAUQYLURU+yH5v0QYLURU+yH5PyADGw8LAkACQCAEQf//7/4DSw0AQX8hBSAEQf////EDSw0BIARB//8/Sw0CIAEgALY4AgwgAA8LIACZIQACQAJAAkAgBEH//8v/A0sNACAEQf//l/8DSw0BIAAgAKBEAAAAAAAA8L+gIABEAAAAAAAAAECgoyEAQQAhBQwDCyAEQf//jYAESw0BIABEAAAAAAAA+L+gIABEAAAAAAAA+D+iRAAAAAAAAPA/oKMhAEECIQUMAgsgAEQAAAAAAADwv6AgAEQAAAAAAADwP6CjIQBBASEFDAELRAAAAAAAAPC/IACjIQBBAyEFCyAAIAAgAKIiBiAGoiIHIAcgByAHIAdEL2xqLES0or+iRJr93lIt3q2/oKJEbZp0r/Kws7+gokRxFiP+xnG8v6CiRMTrmJmZmcm/oKIgBiAHIAcgByAHIAdEEdoi4zqtkD+iROsNdiRLe6k/oKJEUT3QoGYNsT+gokRuIEzFzUW3P6CiRP+DAJIkScI/oKJEDVVVVVVV1T+goqCiIQcgBUF/TA0BIAVBA3QiBEGACGorAwAgByAEQaAIaisDAKEgAKGhIgCaIAAgAxshAAsgAA8LIAAgB6ELtgEEAX8BfgF/AXwjAEEQayIBJAAgAL0iAkL///////////8Ag78hAAJAAkACQCACQjSIp0H/D3EiA0H9B0sNACADQd4HSw0BIAMNAiABIAC2OAIMDAILIABEAAAAAAAA8D8gAKGjIgAgAKAQEUQAAAAAAADgP6IhAAwBCyAAIACgIgQgBCAAokQAAAAAAADwPyAAoaOgEBFEAAAAAAAA4D+iIQALIAFBEGokACAAmiAAIAJCAFMbC5IBAQN8RAAAAAAAAPA/IAAgAKIiAkQAAAAAAADgP6IiA6EiBEQAAAAAAADwPyAEoSADoSACIAIgAiACRJAVyxmgAfo+okR3UcEWbMFWv6CiRExVVVVVVaU/oKIgAiACoiIDIAOiIAIgAkTUOIi+6fqovaJExLG0vZ7uIT6gokStUpyAT36SvqCioKIgACABoqGgoAuEFgYHfwF8Cn8BfAN/AnwjAEGwBGsiBSQAIAIgAkF9akEYbSIGQQAgBkEAShsiB0FobGohCAJAIARBAnRBwAhqKAIAIgkgA0F/aiICakEASA0AIAkgA2ohCiAHIAJrIQIgB0EBaiADa0ECdEHQCGohCyAFQcACaiEGA0ACQAJAIAJBAEgNACALKAIAtyEMDAELRAAAAAAAAAAAIQwLIAYgDDkDACAGQQhqIQYgC0EEaiELIAJBAWohAiAKQX9qIgoNAAsLIAhBaGohDQJAAkAgA0EBSA0AIAVBwAJqIANBA3RqQXhqIQ5BACEKA0BEAAAAAAAAAAAhDCAAIQIgAyELIA4hBgNAIAwgAisDACAGKwMAoqAhDCACQQhqIQIgBkF4aiEGIAtBf2oiCw0ACyAFIApBA3RqIAw5AwAgDkEIaiEOIAogCUghAiAKQQFqIQogAg0ADAILCyAFQQAgCUEAIAlBAEobQQN0QQhqEBkaC0EXIA1rIQ9BGCANayEQIAVB4ANqIAlBAnRqQXxqIREgBUHgA2pBfGohEiAFQXhqIRMgBUEIciEUIAkhBgN/IAUgBkEDdCIVaisDACEMAkAgBkEBSCIWDQAgEyAVaiECIAVB4ANqIQsgBiEKA0ACQAJAIAxEAAAAAAAAcD6iIheZRAAAAAAAAOBBYw0AQYCAgIB4IQ4MAQsgF6ohDgsCQAJAIAwgDrciF0QAAAAAAABwwaKgIgyZRAAAAAAAAOBBYw0AQYCAgIB4IQ4MAQsgDKohDgsgCyAONgIAIAtBBGohCyACKwMAIBegIQwgAkF4aiECIApBf2oiCg0ACwsCQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQCAMIA0QEyIMIAxEAAAAAAAAwD+inEQAAAAAAAAgwKKgIgyZRAAAAAAAAOBBYw0AQYCAgIB4IRggDEGAgICAeLehIQwgDUEBSCIZRQ0BDAILIAwgDKoiGLehIQwgDUEBSCIZDQELIAVB4ANqIAZBAnRqQXxqIgIgAigCACICIAIgEHUiAiAQdGsiCzYCACACIBhqIRggCyAPdSIaQQFIDQIMAQsCQCANRQ0AQQIhGiAMRAAAAAAAAOA/ZkEBc0UNAUEAIRogDEQAAAAAAAAAAGENAwwECyAFQeADaiAGQQJ0akF8aigCAEEXdSIaQQFIDQELAkACQCAWDQBBACEWIAVB4ANqIQIgBiEOA0AgAigCACELQf///wchCgJAAkAgFg0AIAtFDQFBASEWQYCAgAghCgsgAiAKIAtrNgIAIAJBBGohAiAOQX9qIg4NAQwDC0EAIRYgAkEEaiECIA5Bf2oiDg0ADAILC0EAIRYLAkACQAJAIBkNACANQQJGDQEgDUEBRw0AIAVB4ANqIAZBAnRqQXxqIgIgAigCAEH///8DcTYCAAsgGEEBaiEYIBpBAkcNAgwBCyAFQeADaiAGQQJ0akF8aiICIAIoAgBB////AXE2AgAgGEEBaiEYIBpBAkcNAQtEAAAAAAAA8D8gDKEhDEECIRogFkUNACAMRAAAAAAAAPA/IA0QE6EiDEQAAAAAAAAAAGENAQwCCyAMRAAAAAAAAAAAYg0BCwJAIAYgCUwNACASIAZBAnRqIQJBACELIAYhCgNAIAIoAgAgC3IhCyACQXxqIQIgCkF/aiIKIAlKDQALIAsNAgsgESECIAYhDgNAIA5BAWohDiACKAIAIQsgAkF8aiECIAtFDQALIAZBAWohAgJAIANBAUgNACAFQcACaiADIAZqQQN0aiEWA0AgBUHAAmogBiADakEDdGogAiIKIAdqQQJ0QdAIaigCALc5AwBEAAAAAAAAAAAhDCAAIQIgFiEGIAMhCwNAIAwgAisDACAGKwMAoqAhDCACQQhqIQIgBkF4aiEGIAtBf2oiCw0ACyAFIApBA3RqIAw5AwAgFkEIaiEWIApBAWohAiAKIQYgCiAOSA0ADAsLCyAUIBVqQQAgDiACIA4gAkobIAZrQQN0EBkaIAcgBmpBAnRB1AhqIQIgBUHAAmogAyAGakEDdGohCwNAIAsgAigCALc5AwAgAkEEaiECIAtBCGohCyAGQQFqIgYgDkgNAAsgDiEGDAoLAkAgDEEAIA1rEBMiDEQAAAAAAABwQWZBAXNFDQAgDJlEAAAAAAAA4EFjDQJBgICAgHghAgwDCyAGQQJ0IQsgDEQAAAAAAABwPqIiF5lEAAAAAAAA4EFjDQNBgICAgHghAgwECyAFQeADaiAGQQJ0akF8aiECIA0hCANAIAZBf2ohBiAIQWhqIQggAigCACELIAJBfGohAiALRQ0AC0EAIQ4gBkEATg0FDAYLIAyqIQILIA0hCAwCCyAXqiECCyAFQeADaiALaiELAkACQCAMIAK3RAAAAAAAAHDBoqAiDJlEAAAAAAAA4EFjDQBBgICAgHghCgwBCyAMqiEKCyALIAo2AgAgBkEBaiEGCyAFQeADaiAGQQJ0aiACNgIAQQAhDiAGQQBIDQELIAZBAWohCkQAAAAAAADwPyAIEBMhDCAFQeADaiAGQQJ0aiECIAUgBkEDdGohCwNAIAsgDCACKAIAt6I5AwAgAkF8aiECIAtBeGohCyAMRAAAAAAAAHA+oiEMIApBf2oiCiAOSg0ACyAGQQBIDQAgBSAGQQN0aiEOIAYhAgNAIAYgAiIDayEWRAAAAAAAAAAAIQxBACECQQAhCwJAA0AgDCACQaAeaisDACAOIAJqKwMAoqAhDCALIAlODQEgAkEIaiECIAsgFkkhCiALQQFqIQsgCg0ACwsgBUGgAWogFkEDdGogDDkDACAOQXhqIQ4gA0F/aiECIANBAEoNAAsLAkACQAJAAkACQAJAAkACQCAEQX9qQQJJDQAgBEUNASAEQQNHDQdEAAAAAAAAAAAhGwJAIAZBAUgNACAFQaABaiAGQQN0aiILQXhqIQIgCysDACEMIAYhCwNAIAIgAisDACIcIAygIhc5AwAgAkEIaiAMIBwgF6GgOQMAIAJBeGohAiAXIQwgC0F/aiILQQBKDQALIAZBAkgNACAFQaABaiAGQQN0aiILQXhqIQIgCysDACEMIAYhCwNAIAIgAisDACIcIAygIhc5AwAgAkEIaiAMIBwgF6GgOQMAIAJBeGohAiAXIQwgC0F/aiILQQFKDQALIAZBAkgNACAFQaABaiAGQQN0aiECRAAAAAAAAAAAIRsDQCAbIAIrAwCgIRsgAkF4aiECIAZBf2oiBkEBSg0ACwsgBSsDoAEhDCAaRQ0EIAEgDJo5AwAgASAFKwOoAZo5AwggASAbmjkDEAwHCyAGQQBIDQEgBkEBaiELIAVBoAFqIAZBA3RqIQJEAAAAAAAAAAAhDANAIAwgAisDAKAhDCACQXhqIQIgC0F/aiILQQBKDQAMAwsLIAZBAEgNAyAGQQFqIQsgBUGgAWogBkEDdGohAkQAAAAAAAAAACEMA0AgDCACKwMAoCEMIAJBeGohAiALQX9qIgtBAEoNAAwFCwtEAAAAAAAAAAAhDAsgASAMmiAMIBobOQMAIAUrA6ABIAyhIQwCQCAGQQFIDQAgBUGgAWpBCHIhAgNAIAwgAisDAKAhDCACQQhqIQIgBkF/aiIGDQALCyABIAyaIAwgGhs5AwgMAwsgASAMOQMAIAEgBSkDqAE3AwggASAbOQMQDAILRAAAAAAAAAAAIQwLIAEgDJogDCAaGzkDAAsgBUGwBGokACAYQQdxDwsgDiEGDAALC8MKBgF/AX4DfwN8AX8BfCMAQTBrIgIkACAAvSIDQj+IpyEEAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQCADQiCIpyIFQf////8HcSIGQfrUvYAESw0AIAVB//8/cUH7wyRGDQMgBkH8souABEsNASAERQ0GIAEgAEQAAEBU+yH5P6AiAEQxY2IaYbTQPaAiBzkDACABIAAgB6FEMWNiGmG00D2gOQMIIAJBMGokAEF/DwsCQCAGQbuM8YAESw0AIAZBvPvXgARLDQIgBkH8ssuABEYNAyAERQ0KIAEgAEQAADB/fNkSQKAiAETKlJOnkQ7pPaAiBzkDACABIAAgB6FEypSTp5EO6T2gOQMIIAJBMGokAEF9DwsgBkH6w+SJBE0NAiAGQYCAwP8HSQ0DIAEgACAAoSIAOQMAIAEgADkDCCACQTBqJABBAA8LIARFDQUgASAARAAAQFT7IQlAoCIARDFjYhphtOA9oCIHOQMAIAEgACAHoUQxY2IaYbTgPaA5AwggAkEwaiQAQX4PCyAGQfvD5IAERw0CCyABIAAgAESDyMltMF/kP6JEAAAAAAAAOEOgRAAAAAAAADjDoCIHRAAAQFT7Ifm/oqAiCCAHRDFjYhphtNA9oiIJoSIAOQMAIAZBFHYiCiAAvUI0iKdB/w9xa0ERSCEFAkACQAJAIAeZRAAAAAAAAOBBYw0AQYCAgIB4IQYgBUUNAQwCCyAHqiEGIAUNAQsgASAIIAdEAABgGmG00D2iIgChIgsgB0RzcAMuihmjO6IgCCALoSAAoaEiCaEiADkDAAJAIAogAL1CNIinQf8PcWtBMkgNACABIAsgB0QAAAAuihmjO6IiAKEiCCAHRMFJICWag3s5oiALIAihIAChoSIJoSIAOQMADAELIAshCAsgASAIIAChIAmhOQMIIAJBMGokACAGDwsgA0L/////////B4NCgICAgICAgLDBAIS/IgCZRAAAAAAAAOBBYw0DQYCAgIB4IQUMBAsgBEUNBSABIABEAABAVPshGUCgIgBEMWNiGmG08D2gIgc5AwAgASAAIAehRDFjYhphtPA9oDkDCCACQTBqJABBfA8LIAEgAEQAAEBU+yH5v6AiAEQxY2IaYbTQvaAiBzkDACABIAAgB6FEMWNiGmG00L2gOQMIIAJBMGokAEEBDwsgASAARAAAQFT7IQnAoCIARDFjYhphtOC9oCIHOQMAIAEgACAHoUQxY2IaYbTgvaA5AwggAkEwaiQAQQIPCyAAqiEFCyACIAW3Igc5AxACQAJAIAAgB6FEAAAAAAAAcEGiIgCZRAAAAAAAAOBBYw0AQYCAgIB4IQUMAQsgAKohBQsgAiAFtyIHOQMYIAIgACAHoUQAAAAAAABwQaIiADkDICAARAAAAAAAAAAAYg0CIAJBEGpBCHIhBUECIQoDQCAKQX9qIQogBSsDACEAIAVBeGohBSAARAAAAAAAAAAAYQ0ADAQLCyABIABEAAAwf3zZEsCgIgBEypSTp5EO6b2gIgc5AwAgASAAIAehRMqUk6eRDum9oDkDCCACQTBqJABBAw8LIAEgAEQAAEBU+yEZwKAiAEQxY2IaYbTwvaAiBzkDACABIAAgB6FEMWNiGmG08L2gOQMIIAJBMGokAEEEDwtBAiEKCyACQRBqIAIgBkEUdkHqd2ogCkEBakEBEAghBSACKwMAIQACQCAERQ0AIAEgAJo5AwAgASACKwMImjkDCCACQTBqJABBACAFaw8LIAEgADkDACABIAIpAwg3AwggAkEwaiQAIAULmwEBA3wgACAAoiIDIAMgA6KiIANEfNXPWjrZ5T2iROucK4rm5Vq+oKIgAyADRH3+sVfjHcc+okTVYcEZoAEqv6CiRKb4EBEREYE/oKAhBCADIACiIQUCQCACRQ0AIAAgBURJVVVVVVXFP6IgAyABRAAAAAAAAOA/oiAFIASioaIgAaGgoQ8LIAUgAyAEokRJVVVVVVXFv6CiIACgC5ICAgJ/AXwjAEEQayIBJAACQAJAAkAgAL1CIIinQf////8HcSICQfvDpP8DSw0AIAJBncGa8gNLDQEgASAARAAAAAAAAHBHoDkDACABQRBqJABEAAAAAAAA8D8PCyACQYCAwP8HSQ0BIAFBEGokACAAIAChDwsgAEQAAAAAAAAAABAHIQAgAUEQaiQAIAAPCyAAIAEQCSECIAErAwghACABKwMAIQMCQAJAAkAgAkEDcSICQQJGDQAgAkEBRg0BIAINAiADIAAQByEAIAFBEGokACAADwsgAyAAEAchACABQRBqJAAgAJoPCyADIABBARAKIQAgAUEQaiQAIACaDwsgAyAAQQEQCiEAIAFBEGokACAACyQAIABEi90aFWYglsCgEA5EAAAAAAAAwH+iRAAAAAAAAMB/ogvaAQMBfwF+AX8jAEEQayIBJAAgAL1C////////////AIMiAr8hAAJAAkACQCACQiCIpyIDQcHcmP8DSw0AIANB//+/8gNLDQEgASAARAAAAAAAAHBHoDkDCCABQRBqJABEAAAAAAAA8D8PCyADQcHcmIQESw0BIAAQDiEAIAFBEGokACAARAAAAAAAAPA/IACjoEQAAAAAAADgP6IPCyABQRBqJAAgABAPIgAgAKIgAEQAAAAAAADwP6AiACAAoKNEAAAAAAAA8D+gDwsgABAMIQAgAUEQaiQAIAALoAQEAX8BfgJ/A3wjAEEQayIBJAAgAL0iAkI/iKchAwJAAkACQAJAAkACQAJAAkACQAJAIAJCIIinQf////8HcSIEQavGmIQESQ0AIAJC////////////AINCgICAgICAgPj/AFgNASABQRBqJAAgAA8LIARBw9zY/gNJDQEgBEGyxcL/A08NAyADQQFzIANrIQQMBgsgAETvOfr+Qi6GQGRBAXMNASABQRBqJAAgAEQAAAAAAADgf6IPCyAEQYCAwPEDTQ0CQQAhBEQAAAAAAAAAACEFIAAhBgwFCyAARNK8et0rI4bAY0EBcw0AIAFEAAAAAAAAoLYgAKO2OAIMRAAAAAAAAAAAIQcgAERRMC3VEEmHwGMNBQsgAET+gitlRxX3P6IgA0EDdEHgHmorAwCgIgeZRAAAAAAAAOBBYw0BQYCAgIB4IQQMAgsgASAARAAAAAAAAOB/oDkDACABQRBqJAAgAEQAAAAAAADwP6APCyAHqiEECyAAIAS3IgdEAADg/kIu5r+ioCIAIAdEdjx5Ne856j2iIgWhIQYLIAAgBiAGIAYgBqIiByAHIAcgByAHRNCkvnJpN2Y+okTxa9LFQb27vqCiRCzeJa9qVhE/oKJEk72+FmzBZr+gokQ+VVVVVVXFP6CioSIHokQAAAAAAAAAQCAHoaMgBaGgRAAAAAAAAPA/oCEHIARFDQAgByAEEBMhBwsgAUEQaiQAIAcL2QYEAX8BfgJ/BHwjAEEQayEBIAC9IgJCP4inIQMCQAJAAkACQAJAAkACQAJAAkACQAJAAkACQCACQiCIp0H/////B3EiBEH60I2CBEkNACACQv///////////wCDQoCAgICAgID4/wBYDQEgAA8LIARBw9zY/gNJDQEgBEGxxcL/A0sNAiADRQ0GIABEAADg/kIu5j+gIQVBfyEERHY8eTXvOeq9IQYMCgsgA0UNA0QAAAAAAADwvw8LIARB//+/5ANLDQEgBEH//z9LDQMgASAAtjgCDCAADwsgAET+gitlRxX3P6IhBkQAAAAAAADgvyEFIAMNBgwFC0EAIQQMBwsgAETvOfr+Qi6GQGRFDQIgAEQAAAAAAADgf6IPCyAADwsgAEQAAOD+Qi7mv6AhBUEBIQREdjx5Ne856j0hBgwDCyAARP6CK2VHFfc/oiEGC0QAAAAAAADgPyEFCwJAAkAgBiAFoCIFmUQAAAAAAADgQWMNAEGAgICAeCEEDAELIAWqIQQLIAS3IgVEdjx5Ne856j2iIQYgACAFRAAA4P5CLua/oqAhBQsgBSAFIAahIgChIAahIQYLIAAgAEQAAAAAAADgP6IiB6IiBSAFIAUgBSAFIAVELcMJbrf9ir6iRDlS5obKz9A+oKJEt9uqnhnOFL+gokSFVf4ZoAFaP6CiRPQQEREREaG/oKJEAAAAAAAA8D+gIghEAAAAAAAACEAgByAIoqEiB6FEAAAAAAAAGEAgACAHoqGjoiEHAkACQAJAAkACQCAERQ0AIAAgByAGoaIgBqEgBaEhBSAEQQFGDQEgBEF/Rw0CIAAgBaFEAAAAAAAA4D+iRAAAAAAAAOC/oA8LIAAgACAHoiAFoaEPCyAARAAAAAAAANC/Y0EBcw0BIAUgAEQAAAAAAADgP6ChRAAAAAAAAADAog8LIARB/wdqrUI0hr8hBiAEQTlJDQEgACAFoUQAAAAAAADwP6AiACAAoEQAAAAAAADgf6IgACAGoiAEQYAIRhtEAAAAAAAA8L+gDwsgACAFoSIAIACgRAAAAAAAAPA/oA8LRAAAAAAAAPA/Qf8HIARrrUI0hr8iB6EgACAFIAegoSAEQRRIIgQbIAAgBaFEAAAAAAAA8D8gBBugIAaiC6IDAwF+A38CfAJAAkACQAJAAkAgAL0iAUIAUw0AIAFCIIinIgJB//8/TQ0AIAJB//+//wdLDQNBgIDA/wMhA0GBeCEEIAJBgIDA/wNHDQEgAacNAkQAAAAAAAAAAA8LAkAgAUL///////////8Ag0IAUQ0AIAFCf1cNBCAARAAAAAAAAFBDor0iAUIgiKchA0HLdyEEDAILRAAAAAAAAPC/IAAgAKKjDwsgAiEDCyAEIANB4r4laiICQRR2arciBUQAAOD+Qi7mP6IgAkH//z9xQZ7Bmv8Daq1CIIYgAUL/////D4OEv0QAAAAAAADwv6AiACAFRHY8eTXvOeo9oiAAIABEAAAAAAAAAECgoyIFIAAgAEQAAAAAAADgP6KiIgYgBSAFoiIFIAWiIgAgACAARJ/GeNAJmsM/okSveI4dxXHMP6CiRAT6l5mZmdk/oKIgBSAAIAAgAEREUj7fEvHCP6JE3gPLlmRGxz+gokRZkyKUJEnSP6CiRJNVVVVVVeU/oKKgoKKgIAahoKAhAAsgAA8LIAAgAKFEAAAAAAAAAACjC4kEBAF/AX4BfwN8IwBBEGshASAAvSICQiCIpyEDAkACQAJAAkACQCACQgBTDQAgA0H5hOr+A00NACADQf//v/8HTQ0BIAAPCwJAIANBgIDA/3tJDQAgAEQAAAAAAADwv2INA0QAAAAAAADw/w8LAkAgA0EBdEH////JB0sNACADQYCAwP8HcUUNBCAADwtEAAAAAAAAAAAhBCADQcX9yv57Tw0ARAAAAAAAAAAAIQUMAQtEAAAAAAAAAAAhBAJAIABEAAAAAAAA8D+gIgW9IgJCIIinQeK+JWoiAUEUdkGBeGoiA0E1Sg0AIAAgBaFEAAAAAAAA8D+gIAAgBUQAAAAAAADwv6ChIANBAUobIAWjIQQLIAFB//8/cUGewZr/A2qtQiCGIAJC/////w+DhL9EAAAAAAAA8L+gIQAgA7chBQsgBUQAAOD+Qi7mP6IgACAEIAVEdjx5Ne856j2ioCAAIABEAAAAAAAAAECgoyIFIAAgAEQAAAAAAADgP6KiIgYgBSAFoiIEIASiIgUgBSAFRJ/GeNAJmsM/okSveI4dxXHMP6CiRAT6l5mZmdk/oKIgBCAFIAUgBUREUj7fEvHCP6JE3gPLlmRGxz+gokRZkyKUJEnSP6CiRJNVVVVVVeU/oKKgoKKgIAahoKAPCyAAIAChRAAAAAAAAAAAow8LIAEgALY4AgwgAAvHEAYBfAF+A38BfgV/CHxEAAAAAAAA8D8hAgJAIAG9IgNCIIinIgRB/////wdxIgUgA6ciBnJFDQAgAL0iB0IgiKchCAJAIAenIgkNACAIQYCAwP8DRg0BCwJAAkAgCEH/////B3EiCkGAgMD/B0sNACAJQQBHIApBgIDA/wdGcQ0AIAVBgIDA/wdLDQAgBkUNASAFQYCAwP8HRw0BCyAAIAGgDwtBACELAkACQAJAAkAgCEF/Sg0AQQIhCyAFQf///5kESw0AQQAhCyAFQYCAwP8DSQ0AIAVBFHYhDCAFQYCAgIoESQ0BQQIgBkGzCCAMayILdiIMQQFxa0EAIAwgC3QgBkYbIQsLIAZFDQEMAgtBACELIAYNAUECIAVBkwggDGsiBnYiC0EBcWtBACALIAZ0IAVGGyELCwJAAkACQAJAIAVBgIDA/wdHDQAgCkGAgMCAfGogCXJFDQUgCkGAgMD/A0kNASABRAAAAAAAAAAAIARBf0obDwsCQCAFQYCAwP8DRw0AIARBf0wNAyAADwsgBEGAgICABEcNASAAIACiDwtEAAAAAAAAAAAgAZogBEF/ShsPCyAIQQBIDQEgBEGAgID/A0cNASAAnw8LRAAAAAAAAPA/IACjDwsgAJkhAgJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAIAkNACAKRQ0BIApBgICAgARyQYCAwP8HRg0BC0QAAAAAAADwPyENIAhBf0oNAyALQQFGDQEgCw0DIAAgAKEiASABow8LRAAAAAAAAPA/IAKjIAIgBEEASBshAiAIQX9KDQsgCyAKQYCAwIB8anJFDQEgApogAiALQQFGGw8LRAAAAAAAAPC/IQ0gBUGBgICPBE8NAgwDCyACIAKhIgEgAaMPCyAFQYGAgI8ESQ0BCwJAIAVBgYDAnwRJDQAgCkH//7//A0sNAkQAAAAAAADwf0QAAAAAAAAAACAEQQBIGw8LIApB/v+//wNLDQIgDUScdQCIPOQ3fqJEnHUAiDzkN36iIA1EWfP4wh9upQGiRFnz+MIfbqUBoiAEQQBIGw8LQQAhBQJAAkAgCkH//z9LDQAgAkQAAAAAAABAQ6IiAr1CIIinIQpBSyEEDAELQQAhBAsgCkH//z9xIgZBgIDA/wNyIQggCkEUdSAEakGBeGohBCAGQY+xDkkNAyAGQfrsLk8NAkEBIQUMAwtEAAAAAAAA8H9EAAAAAAAAAAAgBEEAShsPCyAKQYGAwP8DSQ0CIA1EnHUAiDzkN36iRJx1AIg85Dd+oiANRFnz+MIfbqUBokRZ8/jCH26lAaIgBEEAShsPCyAIQYCAQGohCCAEQQFqIQQLIAVBA3QiBkGQH2orAwAiDiAIrUIghiACvUL/////D4OEvyIPIAZB8B5qKwMAIhChIhFEAAAAAAAA8D8gECAPoKMiEqIiAr1CgICAgHCDvyIAIAAgAKIiE0QAAAAAAAAIQKAgAiAAoCASIBEgACAIQQF1QYCAgIACciAFQRJ0akGAgCBqrUIghr8iFKKhIAAgDyAUIBChoaKhoiIPoiACIAKiIgAgAKIgACAAIAAgACAARO9ORUoofso/okRl28mTSobNP6CiRAFBHalgdNE/oKJETSaPUVVV1T+gokT/q2/btm3bP6CiRAMzMzMzM+M/oKKgIhCgvUKAgICAcIO/IgCiIhEgDyAAoiACIBAgAEQAAAAAAAAIwKAgE6GhoqAiAqC9QoCAgIBwg78iAEQAAADgCcfuP6IiDyAGQYAfaisDACACIAAgEaGhRP0DOtwJx+4/oiAARPUBWxTgLz6+oqCgIhCgoCAEtyICoL1CgICAgHCDvyIAIAKhIA6hIA+hIQ4MAQsgAkQAAAAAAADwv6AiAEQAAABgRxX3P6IiAiAARETfXfgLrlQ+oiAAIACiRAAAAAAAAOA/IAAgAEQAAAAAAADQv6JEVVVVVVVV1T+goqGiRP6CK2VHFfe/oqAiEKC9QoCAgIBwg78iACACoSEOCyAAIANCgICAgHCDvyIPoiICIBAgDqEgAaIgASAPoSAAoqAiAaAiAL0iA6chBQJAAkACQAJAAkAgA0IgiKciCEGAgMCEBEgNACAIQYCAwPt7aiAFckUNASANRJx1AIg85Dd+okScdQCIPOQ3fqIPCyAIQYD4//8HcUGAmMOEBEkNAiAIQYDovPsDaiAFckUNASANRFnz+MIfbqUBokRZ8/jCH26lAaIPCyABRP6CK2VHFZc8oCAAIAKhZEEBcw0BIA1EnHUAiDzkN36iRJx1AIg85Dd+og8LIAEgACACoWVBAXNFDQELQQAhBQJAIAhB/////wdxIgZBgYCA/wNJDQBBAEGAgMAAIAZBFHZBgnhqdiAIaiIGQf//P3FBgIDAAHJBkwggBkEUdkH/D3EiBGt2IgVrIAUgCEEASBshBSABIAJBgIBAIARBgXhqdSAGca1CIIa/oSICoL0hAwsCQCAFQRR0IANCgICAgHCDvyIARAAAAABDLuY/oiIPIAEgACACoaFE7zn6/kIu5j+iIABEOWyoDGFcIL6ioCICoCIBIAEgASABIAGiIgAgACAAIAAgAETQpL5yaTdmPqJE8WvSxUG9u76gokQs3iWvalYRP6CiRJO9vhZswWa/oKJEPlVVVVVVxT+goqEiAKIgAEQAAAAAAAAAwKCjIAIgASAPoaEiACABIACioKGhRAAAAAAAAPA/oCIBvSIDQiCIp2oiCEH//z9KDQAgDSABIAUQE6IPCyANIAitQiCGIANC/////w+DhL+iDwsgDURZ8/jCH26lAaJEWfP4wh9upQGiDwsgAgu4AQEBfwJAAkACQAJAIAFBgAhIDQAgAEQAAAAAAADgf6IhACABQYF4aiICQYAISA0BIAFBgnBqIgFB/wcgAUH/B0gbIQEgAEQAAAAAAADgf6IhAAwDCyABQYF4Sg0CIABEAAAAAAAAYAOiIQAgAUHJB2oiAkGBeEoNASABQZIPaiIBQYJ4IAFBgnhKGyEBIABEAAAAAAAAYAOiIQAMAgsgAiEBDAELIAIhAQsgACABQf8Haq1CNIa/oguiAgICfwF8IwBBEGsiASQAAkACQAJAIAC9QiCIp0H/////B3EiAkH7w6T/A0sNACACQf//v/IDSw0BIAEgAEQAAAAAAABwOKIgAEQAAAAAAABwR6AgAkGAgMAASRs5AwAgAUEQaiQAIAAPCyACQYCAwP8HSQ0BIAFBEGokACAAIAChDwsgAEQAAAAAAAAAAEEAEAohACABQRBqJAAgAA8LIAAgARAJIQIgASsDCCEAIAErAwAhAwJAAkACQCACQQNxIgJBAkYNACACQQFGDQEgAg0CIAMgAEEBEAohACABQRBqJAAgAA8LIAMgAEEBEAohACABQRBqJAAgAJoPCyADIAAQByEAIAFBEGokACAADwsgAyAAEAchACABQRBqJAAgAJoLrgEDAX4CfAF/RAAAAAAAAOC/RAAAAAAAAOA/IAC9IgFCAFMbIQIgAUL///////////8AgyIBvyEDAkACQAJAIAFCIIinIgRBwdyYhARLDQAgAxAPIQMgBEH//7//A0sNAiAEQYCAwPIDSQ0BIAIgAyADoCADIAOiIANEAAAAAAAA8D+go6GiDwsgAiACoCADEAyiIQALIAAPCyACIAMgAyADRAAAAAAAAPA/oKOgoguwAwMBfgJ/A3wCQAJAIAC9IgNCgICAgID/////AINCgYCAgPCE5fI/VCIEDQBEGC1EVPsh6T8gAJogACADQj+IpyIFG6FEB1wUMyamgTwgAZogASAFG6GgIQBEAAAAAAAAAAAhAQwBCwsgACAAIAAgAKIiBqIiB0RjVVVVVVXVP6IgASAGIAEgByAGIAaiIgggCCAIIAggCERzU2Dby3XzvqJEppI3oIh+FD+gokQBZfLy2ERDP6CiRCgDVskibW0/oKJEN9YGhPRklj+gokR6/hARERHBP6AgBiAIIAggCCAIIAhE1Hq/dHAq+z6iROmn8DIPuBI/oKJEaBCNGvcmMD+gokQVg+D+yNtXP6CiRJOEbunjJoI/oKJE/kGzG7qhqz+goqCioKKgoCIGoCEIAkAgBA0AQQEgAkEBdGu3IgEgACAGIAggCKIgCCABoKOhoCIIIAigoSIImiAIIAUbDwsCQCACRQ0ARAAAAAAAAPC/IAijIgEgCL1CgICAgHCDvyIHIAG9QoCAgIBwg78iCKJEAAAAAAAA8D+gIAYgByAAoaEgCKKgoiAIoCEICyAIC8EBAQJ/IwBBEGsiASQAAkACQAJAIAC9QiCIp0H/////B3EiAkH7w6T/A0sNACACQf////EDSw0BIAEgAEQAAAAAAABwOKIgAEQAAAAAAABwR6AgAkGAgMAASRs5AwAgAUEQaiQAIAAPCyACQYCAwP8HSQ0BIAFBEGokACAAIAChDwsgAEQAAAAAAAAAAEEAEBYhACABQRBqJAAgAA8LIAAgARAJIQIgASsDACABKwMIIAJBAXEQFiEAIAFBEGokACAAC4ACAwF/An4BfyMAQRBrIgEkACAAvSICQv///////////wCDIgO/IQACQAJAAkACQCADQiCIpyIEQeunhv8DSQ0AIARBgYDQgQRJDQFEAAAAAAAAAIAgAKNEAAAAAAAA8D+gIQAMAwsgBEGvscH+A0kNASAAIACgEA8iACAARAAAAAAAAABAoKMhAAwCC0QAAAAAAADwP0QAAAAAAAAAQCAAIACgEA9EAAAAAAAAAECgo6EhAAwBCwJAIARBgIDAAEkNACAARAAAAAAAAADAohAPIgCaIABEAAAAAAAAAECgoyEADAELIAEgALY4AgwLIAFBEGokACAAmiAAIAJCAFMbC/wCAgN/AX4CQCACRQ0AIAAgAToAACAAIAJqIgNBf2ogAToAACACQQNJDQAgACABOgACIAAgAToAASADQX1qIAE6AAAgA0F+aiABOgAAIAJBB0kNACAAIAE6AAMgA0F8aiABOgAAIAJBCUkNACAAQQAgAGtBA3EiBGoiAyABQf8BcUGBgoQIbCIBNgIAIAMgAiAEa0F8cSIEaiICQXxqIAE2AgAgBEEJSQ0AIAMgATYCCCADIAE2AgQgAkF4aiABNgIAIAJBdGogATYCACAEQRlJDQAgAyABNgIQIAMgATYCDCADIAE2AhQgAyABNgIYIAJBaGogATYCACACQWRqIAE2AgAgAkFsaiABNgIAIAJBcGogATYCACAEIANBBHFBGHIiBWsiAkEgSQ0AIAGtIgZCIIYgBoQhBiADIAVqIQEDQCABIAY3AwAgAUEIaiAGNwMAIAFBEGogBjcDACABQRhqIAY3AwAgAUEgaiEBIAJBYGoiAkEfSw0ACwsgAAsLqBcBAEGACAugF0+7YQVnrN0/GC1EVPsh6T+b9oHSC3PvPxgtRFT7Ifk/4mUvIn8rejwHXBQzJqaBPL3L8HqIB3A8B1wUMyamkTwDAAAABAAAAAQAAAAGAAAAg/miAERObgD8KRUA0VcnAN009QBi28AAPJmVAEGQQwBjUf4Au96rALdhxQA6biQA0k1CAEkG4AAJ6i4AHJLRAOsd/gApsRwA6D6nAPU1ggBEuy4AnOmEALQmcABBfl8A1pE5AFODOQCc9DkAi1+EACj5vQD4HzsA3v+XAA+YBQARL+8AClqLAG0fbQDPfjYACcsnAEZPtwCeZj8ALepfALondQDl68cAPXvxAPc5BwCSUooA+2vqAB+xXwAIXY0AMANWAHv8RgDwq2sAILzPADb0mgDjqR0AXmGRAAgb5gCFmWUAoBRfAI1AaACA2P8AJ3NNAAYGMQDKVhUAyahzAHviYABrjMAAGcRHAM1nwwAJ6NwAWYMqAIt2xACmHJYARK/dABlX0QClPgUABQf/ADN+PwDCMugAmE/eALt9MgAmPcMAHmvvAJ/4XgA1HzoAf/LKAPGHHQB8kCEAaiR8ANVu+gAwLXcAFTtDALUUxgDDGZ0ArcTCACxNQQAMAF0Ahn1GAONxLQCbxpoAM2IAALTSfAC0p5cAN1XVANc+9gCjEBgATXb8AGSdKgBw16sAY3z4AHqwVwAXFecAwElWADvW2QCnhDgAJCPLANaKdwBaVCMAAB+5APEKGwAZzt8AnzH/AGYeagCZV2EArPtHAH5/2AAiZbcAMuiJAOa/YADvxM0AbDYJAF0/1AAW3tcAWDveAN6bkgDSIigAKIboAOJYTQDGyjIACOMWAOB9ywAXwFAA8x2nABjgWwAuEzQAgxJiAINIAQD1jlsArbB/AB7p8gBISkMAEGfTAKrd2ACuX0IAamHOAAoopADTmbQABqbyAFx3fwCjwoMAYTyIAIpzeACvjFoAb9e9AC2mYwD0v8sAjYHvACbBZwBVykUAytk2ACio0gDCYY0AEsl3AAQmFAASRpsAxFnEAMjFRABNspEAABfzANRDrQApSeUA/dUQAAC+/AAelMwAcM7uABM+9QDs8YAAs+fDAMf4KACTBZQAwXE+AC4JswALRfMAiBKcAKsgewAutZ8AR5LCAHsyLwAMVW0AcqeQAGvnHwAxy5YAeRZKAEF54gD034kA6JSXAOLmhACZMZcAiO1rAF9fNgC7/Q4ASJq0AGekbABxckIAjV0yAJ8VuAC85QkAjTElAPd0OQAwBRwADQwBAEsIaAAs7lgAR6qQAHTnAgC91iQA932mAG5IcgCfFu8AjpSmALSR9gDRU1EAzwryACCYMwD1S34AsmNoAN0+XwBAXQMAhYl/AFVSKQA3ZMAAbdgQADJIMgBbTHUATnHUAEVUbgALCcEAKvVpABRm1QAnB50AXQRQALQ72wDqdsUAh/kXAElrfQAdJ7oAlmkpAMbMrACtFFQAkOJqAIjZiQAsclAABKS+AHcHlADzMHAAAPwnAOpxqABmwkkAZOA9AJfdgwCjP5cAQ5T9AA2GjAAxQd4AkjmdAN1wjAAXt+cACN87ABU3KwBcgKAAWoCTABARkgAP6NgAbICvANv/SwA4kA8AWRh2AGKlFQBhy7sAx4m5ABBAvQDS8gQASXUnAOu29gDbIrsAChSqAIkmLwBkg3YACTszAA6UGgBROqoAHaPCAK/trgBcJhIAbcJNAC16nADAVpcAAz+DAAnw9gArQIwAbTGZADm0BwAMIBUA2MNbAPWSxADGrUsATsqlAKc3zQDmqTYAq5KUAN1CaAAZY94AdozvAGiLUgD82zcArqGrAN8VMQAArqEADPvaAGRNZgDtBbcAKWUwAFdWvwBH/zoAavm5AHW+8wAok98Aq4AwAGaM9gAEyxUA+iIGANnkHQA9s6QAVxuPADbNCQBOQukAE76kADMjtQDwqhoAT2WoANLBpQALPw8AW3jNACP5dgB7iwQAiRdyAMamUwBvbuIA7+sAAJtKWADE2rcAqma6AHbPzwDRAh0AsfEtAIyZwQDDrXcAhkjaAPddoADGgPQArPAvAN3smgA/XLwA0N5tAJDHHwAq27YAoyU6AACvmgCtU5MAtlcEACkttABLgH4A2genAHaqDgB7WaEAFhIqANy3LQD65f0Aidv+AIm+/QDkdmwABqn8AD6AcACFbhUA/Yf/ACg+BwBhZzMAKhiGAE296gCz568Aj21uAJVnOQAxv1sAhNdIADDfFgDHLUMAJWE1AMlwzgAwy7gAv2z9AKQAogAFbOQAWt2gACFvRwBiEtIAuVyEAHBhSQBrVuAAmVIBAFBVNwAe1bcAM/HEABNuXwBdMOQAhS6pAB2ywwChMjYACLekAOqx1AAW9yEAj2nkACf/dwAMA4AAjUAtAE/NoAAgpZkAs6LTAC9dCgC0+UIAEdrLAH2+0ACb28EAqxe9AMqigQAIalwALlUXACcAVQB/FPAA4QeGABQLZACWQY0Ah77eANr9KgBrJbYAe4k0AAXz/gC5v54AaGpPAEoqqABPxFoALfi8ANdamAD0x5UADU2NACA6pgCkV18AFD+xAIA4lQDMIAEAcd2GAMnetgC/YPUATWURAAEHawCMsKwAssDQAFFVSAAe+w4AlXLDAKMGOwDAQDUABtx7AOBFzABOKfoA1srIAOjzQQB8ZN4Am2TYANm+MQCkl8MAd1jUAGnjxQDw2hMAujo8AEYYRgBVdV8A0r31AG6SxgCsLl0ADkTtABw+QgBhxIcAKf3pAOfW8wAifMoAb5E1AAjgxQD/140AbmriALD9xgCTCMEAfF10AGutsgDNbp0APnJ7AMYRagD3z6kAKXPfALXJugC3AFEA4rINAHS6JADlfWAAdNiKAA0VLACBGAwAfmaUAAEpFgCfenYA/f2+AFZF7wDZfjYA7NkTAIu6uQDEl/wAMagnAPFuwwCUxTYA2KhWALSotQDPzA4AEoktAG9XNAAsVokAmc7jANYguQBrXqoAPiqcABFfzAD9C0oA4fT7AI47bQDihiwA6dSEAPy0qQDv7tEALjXJAC85YQA4IUQAG9nIAIH8CgD7SmoALxzYAFO0hABOmYwAVCLMACpV3ADAxtYACxmWABpwuABplWQAJlpgAD9S7gB/EQ8A9LURAPzL9QA0vC0ANLzuAOhdzADdXmAAZ46bAJIz7wDJF7gAYVibAOFXvABRg8YA2D4QAN1xSAAtHN0ArxihACEsRgBZ89cA2XqYAJ5UwABPhvoAVgb8AOV5rgCJIjYAOK0iAGeT3ABV6KoAgiY4AMrnmwBRDaQAmTOxAKnXDgBpBUgAZbLwAH+IpwCITJcA+dE2ACGSswB7gkoAmM8hAECf3ADcR1UA4XQ6AGfrQgD+nd8AXtRfAHtnpAC6rHoAVfaiACuIIwBBulUAWW4IACEqhgA5R4MAiePmAOWe1ABJ+0AA/1bpABwPygDFWYoAlPorANPBxQAPxc8A21quAEfFhgCFQ2IAIYY7ACx5lAAQYYcAKkx7AIAsGgBDvxIAiCaQAHg8iQCoxOQA5dt7AMQ6wgAm9OoA92eKAA2SvwBloysAPZOxAL18CwCkUdwAJ91jAGnh3QCalBkAqCmVAGjOKAAJ7bQARJ8gAE6YygBwgmMAfnwjAA+5MgCn9Y4AFFbnACHxCAC1nSoAb35NAKUZUQC1+asAgt/WAJbdYQAWNgIAxDqfAIOioQBy7W0AOY16AIK4qQBrMlwARidbAAA07QDSAHcA/PRVAAFZTQDgcYAAAAAAAAAAAAAAAABA+yH5PwAAAAAtRHQ+AAAAgJhG+DwAAABgUcx4OwAAAICDG/A5AAAAQCAlejgAAACAIoLjNgAAAAAd82k1AAAAAAAA4D8AAAAAAADgvwAAAAAAAPA/AAAAAAAA+D8AAAAAAAAAAAbQz0Pr/Uw+AAAAAAAAAAAAAABAA7jiPwDsBwRuYW1lAcUBGgARX193YXNtX2NhbGxfY3RvcnMBBGFjb3MCBWFjb3NoAwRhc2luBAVhc2luaAUEYXRhbgYFYXRhbmgHBV9fY29zCBBfX3JlbV9waW8yX2xhcmdlCQpfX3JlbV9waW8yCgVfX3NpbgsDY29zDAdfX2V4cG8yDQRjb3NoDgNleHAPBWV4cG0xEANsb2cRBWxvZzFwEgNwb3cTBnNjYWxibhQDc2luFQRzaW5oFgVfX3RhbhcDdGFuGAR0YW5oGQZtZW1zZXQCnAYaAAABBQACcDABAmwwAgJsMQMCbDIEAmwzAgIAAnAwAQJsMAMGAAJwMAECbDACAmwxAwJsMgQCbDMFAmw0BAUAAnAwAQJsMAICbDEDAmwyBAJsMwUIAAJwMAECbDACAmwxAwJsMgQCbDMFAmw0BgJsNQcCbDYGBQACcDABAmwwAgJsMQMCbDIEAmwzBwUAAnAwAQJwMQICbDADAmwxBAJsMggdAAJwMAECcDECAnAyAwJwMwQCcDQFAmwwBgJsMQcCbDIIAmwzCQJsNAoCbDULAmw2DAJsNw0CbDgOAmw5DwNsMTAQA2wxMREDbDEyEgNsMTMTA2wxNBQDbDE1FQNsMTYWA2wxNxcDbDE4GANsMTkZA2wyMBoDbDIxGwNsMjIcA2wyMwkMAAJwMAECcDECAmwwAwJsMQQCbDIFAmwzBgJsNAcCbDUIAmw2CQJsNwoCbDgLAmw5CgYAAnAwAQJwMQICcDIDAmwwBAJsMQUCbDILBAACcDABAmwwAgJsMQMCbDIMAQACcDANBAACcDABAmwwAgJsMQMCbDIOCAACcDABAmwwAgJsMQMCbDIEAmwzBQJsNAYCbDUHAmw2DwkAAnAwAQJsMAICbDEDAmwyBAJsMwUCbDQGAmw1BwJsNggCbDcQBwACcDABAmwwAgJsMQMCbDIEAmwzBQJsNAYCbDURBwACcDABAmwwAgJsMQMCbDIEAmwzBQJsNAYCbDUSFQACcDABAnAxAgJsMAMCbDEEAmwyBQJsMwYCbDQHAmw1CAJsNgkCbDcKAmw4CwJsOQwDbDEwDQNsMTEOA2wxMg8DbDEzEANsMTQRA2wxNRIDbDE2EwNsMTcUA2wxOBMDAAJwMAECcDECAmwwFAQAAnAwAQJsMAICbDEDAmwyFQUAAnAwAQJsMAICbDEDAmwyBAJsMxYJAAJwMAECcDECAnAyAwJsMAQCbDEFAmwyBgJsMwcCbDQIAmw1FwMAAnAwAQJsMAICbDEYBQACcDABAmwwAgJsMQMCbDIEAmwzGQcAAnAwAQJwMQICcDIDAmwwBAJsMQUCbDIGAmwz"
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
new file mode 100644
index 000000000..822dedc3a
--- /dev/null
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
@@ -0,0 +1,77 @@
+package space.kscience.kmath.wasm
+
+import space.kscience.kmath.estree.compileWith
+import space.kscience.kmath.expressions.Expression
+import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.IntRing
+import space.kscience.kmath.wasm.internal.DoubleWasmBuilder
+import space.kscience.kmath.wasm.internal.IntWasmBuilder
+
+/**
+ * Compiles an [MST] to WASM in the context of reals.
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun DoubleField.expression(mst: MST): Expression<Double> =
+    DoubleWasmBuilder(mst).instance
+
+/**
+ * Compiles an [MST] to WASM in the context of integers.
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun IntRing.expression(mst: MST): Expression<Int> =
+    IntWasmBuilder(mst).instance
+
+/**
+ * Create a compiled expression with given [MST] and given [algebra].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compileToExpression(algebra: IntRing): Expression<Int> = compileWith(algebra)
+
+
+/**
+ * Compile given MST to expression and evaluate it against [arguments].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int =
+    compileToExpression(algebra).invoke(arguments)
+
+
+/**
+ * Compile given MST to expression and evaluate it against [arguments].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compile(algebra: IntRing, vararg arguments: Pair<Symbol, Int>): Int =
+    compileToExpression(algebra)(*arguments)
+
+/**
+ * Create a compiled expression with given [MST] and given [algebra].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compileToExpression(algebra: DoubleField): Expression<Double> = compileWith(algebra)
+
+
+/**
+ * Compile given MST to expression and evaluate it against [arguments].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Double =
+    compileToExpression(algebra).invoke(arguments)
+
+
+/**
+ * Compile given MST to expression and evaluate it against [arguments].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compile(algebra: DoubleField, vararg arguments: Pair<Symbol, Double>): Double =
+    compileToExpression(algebra).invoke(*arguments)
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
new file mode 100644
index 000000000..634a89b26
--- /dev/null
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
@@ -0,0 +1,67 @@
+package space.kscience.kmath.ast
+
+import space.kscience.kmath.expressions.*
+import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.ExtendedField
+import space.kscience.kmath.operations.bindSymbol
+import space.kscience.kmath.operations.invoke
+import kotlin.math.sin
+import kotlin.random.Random
+import kotlin.test.Test
+import kotlin.time.measureTime
+import space.kscience.kmath.estree.compileToExpression as estreeCompileToExpression
+import space.kscience.kmath.wasm.compileToExpression as wasmCompileToExpression
+
+internal class TestExecutionTime {
+    private companion object {
+        private const val times = 1_000_000
+        private val x by symbol
+        private val algebra: ExtendedField<Double> = DoubleField
+
+        private val functional = DoubleField.expressionInExtendedField {
+            bindSymbol(x) * const(2.0) + const(2.0) / bindSymbol(x) - const(16.0) / sin(bindSymbol(x))
+        }
+
+        private val node = MstExtendedField {
+            bindSymbol(x) * number(2.0) + number(2.0) / bindSymbol(x) - number(16.0) / sin(bindSymbol(x))
+        }
+
+        private val mst = node.toExpression(DoubleField)
+        private val wasm = node.wasmCompileToExpression(DoubleField)
+        private val estree = node.estreeCompileToExpression(DoubleField)
+
+        // In JavaScript, the expression below is implemented like
+        //   _no_name_provided__125.prototype.invoke_178 = function (args) {
+        //    var tmp = getValue(args, raw$_get_x__3(this._$x$delegate_2)) * 2.0 + 2.0 / getValue(args, raw$_get_x__3(this._$x$delegate_2));
+        //    var tmp0_sin_0_5 = getValue(args, raw$_get_x__3(this._$x$delegate_2));
+        //    return tmp - 16.0 / Math.sin(tmp0_sin_0_5);
+        //  };
+
+        private val raw = Expression<Double> { args ->
+            args.getValue(x) * 2.0 + 2.0 / args.getValue(x) - 16.0 / sin(args.getValue(x))
+        }
+    }
+
+    private fun invokeAndSum(name: String, expr: Expression<Double>) {
+        println(name)
+        val rng = Random(0)
+        var sum = 0.0
+        measureTime { repeat(times) { sum += expr(x to rng.nextDouble()) } }.also(::println)
+    }
+
+    @Test
+    fun functionalExpression() = invokeAndSum("functional", functional)
+
+    @Test
+    fun mstExpression() = invokeAndSum("mst", mst)
+
+    @Test
+    fun wasmExpression() = invokeAndSum("wasm", wasm)
+
+    @Test
+    fun estreeExpression() = invokeAndSum("estree", wasm)
+
+    @Test
+    fun rawExpression() = invokeAndSum("raw", raw)
+}
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeConsistencyWithInterpreter.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeConsistencyWithInterpreter.kt
index 5823518ce..d80318db8 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeConsistencyWithInterpreter.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeConsistencyWithInterpreter.kt
@@ -8,18 +8,17 @@ package space.kscience.kmath.estree
 import space.kscience.kmath.complex.ComplexField
 import space.kscience.kmath.complex.toComplex
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.ByteRing
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 internal class TestESTreeConsistencyWithInterpreter {
-
     @Test
     fun mstSpace() {
-
         val mst = MstGroup {
             binaryOperationFunction("+")(
                 unaryOperationFunction("+")(
@@ -30,12 +29,12 @@ internal class TestESTreeConsistencyWithInterpreter {
                 ),
 
                 number(1)
-            ) + bindSymbol("x") + zero
+            ) + bindSymbol(x) + zero
         }
 
         assertEquals(
-            mst.interpret(MstGroup, Symbol.x to MST.Numeric(2)),
-            mst.compile(MstGroup, Symbol.x to MST.Numeric(2))
+            mst.interpret(MstGroup, x to MST.Numeric(2)),
+            mst.compile(MstGroup, x to MST.Numeric(2))
         )
     }
 
@@ -44,7 +43,7 @@ internal class TestESTreeConsistencyWithInterpreter {
         val mst = MstRing {
             binaryOperationFunction("+")(
                 unaryOperationFunction("+")(
-                    (bindSymbol("x") - (2.toByte() + (scale(
+                    (bindSymbol(x) - (2.toByte() + (scale(
                         add(number(1), number(1)),
                         2.0
                     ) + 1.toByte()))) * 3.0 - 1.toByte()
@@ -55,24 +54,24 @@ internal class TestESTreeConsistencyWithInterpreter {
         }
 
         assertEquals(
-            mst.interpret(ByteRing, Symbol.x to 3.toByte()),
-            mst.compile(ByteRing, Symbol.x to 3.toByte())
+            mst.interpret(ByteRing, x to 3.toByte()),
+            mst.compile(ByteRing, x to 3.toByte())
         )
     }
 
     @Test
-    fun realField() {
+    fun doubleField() {
         val mst = MstField {
             +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
-                (3.0 - (bindSymbol("x") + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
+                (3.0 - (bindSymbol(x) + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
                         + number(1),
                 number(1) / 2 + number(2.0) * one
             ) + zero
         }
 
         assertEquals(
-            mst.interpret(DoubleField, Symbol.x to 2.0),
-            mst.compile(DoubleField, Symbol.x to 2.0)
+            mst.interpret(DoubleField, x to 2.0),
+            mst.compile(DoubleField, x to 2.0)
         )
     }
 
@@ -80,15 +79,19 @@ internal class TestESTreeConsistencyWithInterpreter {
     fun complexField() {
         val mst = MstField {
             +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
-                (3.0 - (bindSymbol("x") + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
+                (3.0 - (bindSymbol(x) + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
                         + number(1),
                 number(1) / 2 + number(2.0) * one
             ) + zero
         }
 
         assertEquals(
-            mst.interpret(ComplexField, Symbol.x to 2.0.toComplex()),
-            mst.compile(ComplexField, Symbol.x to 2.0.toComplex())
+            mst.interpret(ComplexField, x to 2.0.toComplex()),
+            mst.compile(ComplexField, x to 2.0.toComplex()),
         )
     }
+
+    private companion object {
+        private val x by symbol
+    }
 }
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeOperationsSupport.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeOperationsSupport.kt
index a1bff92d0..a0b68a811 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeOperationsSupport.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeOperationsSupport.kt
@@ -5,43 +5,38 @@
 
 package space.kscience.kmath.estree
 
-import space.kscience.kmath.expressions.MstExtendedField
+import space.kscience.kmath.expressions.MstField
+import space.kscience.kmath.expressions.MstGroup
 import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
-import kotlin.random.Random
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 internal class TestESTreeOperationsSupport {
     @Test
     fun testUnaryOperationInvocation() {
-        val expression = MstExtendedField { -bindSymbol("x") }.compileToExpression(DoubleField)
-        val res = expression("x" to 2.0)
+        val expression = MstGroup { -bindSymbol(x) }.compileToExpression(DoubleField)
+        val res = expression(x to 2.0)
         assertEquals(-2.0, res)
     }
 
     @Test
     fun testBinaryOperationInvocation() {
-        val expression = MstExtendedField { -bindSymbol("x") + number(1.0) }.compileToExpression(DoubleField)
-        val res = expression("x" to 2.0)
+        val expression = MstGroup { -bindSymbol(x) + number(1.0) }.compileToExpression(DoubleField)
+        val res = expression(x to 2.0)
         assertEquals(-1.0, res)
     }
 
     @Test
     fun testConstProductInvocation() {
-        val res = MstExtendedField { bindSymbol("x") * 2 }.compileToExpression(DoubleField)("x" to 2.0)
+        val res = MstField { bindSymbol(x) * 2 }.compileToExpression(DoubleField)(x to 2.0)
         assertEquals(4.0, res)
     }
 
-    @Test
-    fun testMultipleCalls() {
-        val e =
-            MstExtendedField { sin(bindSymbol("x")).pow(4) - 6 * bindSymbol("x") / tanh(bindSymbol("x")) }
-                .compileToExpression(DoubleField)
-        val r = Random(0)
-        var s = 0.0
-        repeat(1000000) { s += e("x" to r.nextDouble()) }
-        println(s)
+    private companion object {
+        private val x by symbol
     }
 }
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeSpecialization.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeSpecialization.kt
index b5ae1ca3f..6756fd8c7 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeSpecialization.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeSpecialization.kt
@@ -7,7 +7,9 @@ package space.kscience.kmath.estree
 
 import space.kscience.kmath.expressions.MstExtendedField
 import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -15,55 +17,60 @@ import kotlin.test.assertEquals
 internal class TestESTreeSpecialization {
     @Test
     fun testUnaryPlus() {
-        val expr = MstExtendedField { unaryOperationFunction("+")(bindSymbol("x")) }.compileToExpression(DoubleField)
-        assertEquals(2.0, expr("x" to 2.0))
+        val expr = MstExtendedField { unaryOperationFunction("+")(bindSymbol(x)) }.compileToExpression(DoubleField)
+        assertEquals(2.0, expr(x to 2.0))
     }
 
     @Test
     fun testUnaryMinus() {
-        val expr = MstExtendedField { unaryOperationFunction("-")(bindSymbol("x")) }.compileToExpression(DoubleField)
-        assertEquals(-2.0, expr("x" to 2.0))
+        val expr = MstExtendedField { unaryOperationFunction("-")(bindSymbol(x)) }.compileToExpression(DoubleField)
+        assertEquals(-2.0, expr(x to 2.0))
     }
 
     @Test
     fun testAdd() {
         val expr = MstExtendedField {
-            binaryOperationFunction("+")(bindSymbol("x"),
-                bindSymbol("x"))
+            binaryOperationFunction("+")(
+                bindSymbol(x),
+                bindSymbol(x),
+            )
         }.compileToExpression(DoubleField)
-        assertEquals(4.0, expr("x" to 2.0))
+        assertEquals(4.0, expr(x to 2.0))
     }
 
     @Test
     fun testSine() {
-        val expr = MstExtendedField { unaryOperationFunction("sin")(bindSymbol("x")) }.compileToExpression(DoubleField)
-        assertEquals(0.0, expr("x" to 0.0))
+        val expr = MstExtendedField { unaryOperationFunction("sin")(bindSymbol(x)) }.compileToExpression(DoubleField)
+        assertEquals(0.0, expr(x to 0.0))
     }
 
     @Test
-    fun testMinus() {
+    fun testSubtract() {
         val expr = MstExtendedField {
-            binaryOperationFunction("-")(bindSymbol("x"),
-                bindSymbol("x"))
+            binaryOperationFunction("-")(bindSymbol(x),
+                bindSymbol(x))
         }.compileToExpression(DoubleField)
-        assertEquals(0.0, expr("x" to 2.0))
+        assertEquals(0.0, expr(x to 2.0))
     }
 
     @Test
     fun testDivide() {
         val expr = MstExtendedField {
-            binaryOperationFunction("/")(bindSymbol("x"),
-                bindSymbol("x"))
+            binaryOperationFunction("/")(bindSymbol(x), bindSymbol(x))
         }.compileToExpression(DoubleField)
-        assertEquals(1.0, expr("x" to 2.0))
+        assertEquals(1.0, expr(x to 2.0))
     }
 
     @Test
     fun testPower() {
         val expr = MstExtendedField {
-            binaryOperationFunction("pow")(bindSymbol("x"), number(2))
+            binaryOperationFunction("pow")(bindSymbol(x), number(2))
         }.compileToExpression(DoubleField)
 
-        assertEquals(4.0, expr("x" to 2.0))
+        assertEquals(4.0, expr(x to 2.0))
+    }
+
+    private companion object {
+        private val x by symbol
     }
 }
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeVariables.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeVariables.kt
index 1effe14e1..e1830d9df 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeVariables.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeVariables.kt
@@ -7,7 +7,9 @@ package space.kscience.kmath.estree
 
 import space.kscience.kmath.expressions.MstRing
 import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.ByteRing
+import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -16,13 +18,17 @@ import kotlin.test.assertFailsWith
 internal class TestESTreeVariables {
     @Test
     fun testVariable() {
-        val expr = MstRing{ bindSymbol("x") }.compileToExpression(ByteRing)
-        assertEquals(1.toByte(), expr("x" to 1.toByte()))
+        val expr = MstRing { bindSymbol(x) }.compileToExpression(ByteRing)
+        assertEquals(1.toByte(), expr(x to 1.toByte()))
     }
 
     @Test
     fun testUndefinedVariableFails() {
-        val expr = MstRing { bindSymbol("x") }.compileToExpression(ByteRing)
+        val expr = MstRing { bindSymbol(x) }.compileToExpression(ByteRing)
         assertFailsWith<NoSuchElementException> { expr() }
     }
+
+    private companion object {
+        private val x by symbol
+    }
 }
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmConsistencyWithInterpreter.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmConsistencyWithInterpreter.kt
new file mode 100644
index 000000000..f3e0726d6
--- /dev/null
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmConsistencyWithInterpreter.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.wasm
+
+import space.kscience.kmath.expressions.MstField
+import space.kscience.kmath.expressions.MstRing
+import space.kscience.kmath.expressions.interpret
+import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.IntRing
+import space.kscience.kmath.operations.bindSymbol
+import space.kscience.kmath.operations.invoke
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+internal class TestWasmConsistencyWithInterpreter {
+    @Test
+    fun intRing() {
+        val mst = MstRing {
+            binaryOperationFunction("+")(
+                unaryOperationFunction("+")(
+                    (bindSymbol(x) - (2.toByte() + (scale(
+                        add(number(1), number(1)),
+                        2.0
+                    ) + 1.toByte()))) * 3.0 - 1.toByte()
+                ),
+
+                number(1)
+            ) * number(2)
+        }
+
+        assertEquals(
+            mst.interpret(IntRing, x to 3),
+            mst.compile(IntRing, x to 3)
+        )
+    }
+
+    @Test
+    fun doubleField() {
+        val mst = MstField {
+            +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
+                (3.0 - (bindSymbol(x) + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
+                        + number(1),
+                number(1) / 2 + number(2.0) * one
+            ) + zero
+        }
+
+        assertEquals(
+            mst.interpret(DoubleField, x to 2.0),
+            mst.compile(DoubleField, x to 2.0)
+        )
+    }
+
+    private companion object {
+        private val x by symbol
+    }
+}
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmOperationsSupport.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmOperationsSupport.kt
new file mode 100644
index 000000000..2946592f4
--- /dev/null
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmOperationsSupport.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.wasm
+
+import space.kscience.kmath.expressions.MstField
+import space.kscience.kmath.expressions.MstGroup
+import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.bindSymbol
+import space.kscience.kmath.operations.invoke
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+internal class TestWasmOperationsSupport {
+    @Test
+    fun testUnaryOperationInvocation() {
+        val expression = MstGroup { -bindSymbol(x) }.compileToExpression(DoubleField)
+        val res = expression(x to 2.0)
+        assertEquals(-2.0, res)
+    }
+
+    @Test
+    fun testBinaryOperationInvocation() {
+        val expression = MstGroup { -bindSymbol(x) + number(1.0) }.compileToExpression(DoubleField)
+        val res = expression(x to 2.0)
+        assertEquals(-1.0, res)
+    }
+
+    @Test
+    fun testConstProductInvocation() {
+        val res = MstField { bindSymbol(x) * 2 }.compileToExpression(DoubleField)(x to 2.0)
+        assertEquals(4.0, res)
+    }
+
+    private companion object {
+        private val x by symbol
+    }
+}
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecialization.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecialization.kt
new file mode 100644
index 000000000..e1f7b603a
--- /dev/null
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecialization.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.wasm
+
+import space.kscience.kmath.expressions.MstExtendedField
+import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.bindSymbol
+import space.kscience.kmath.operations.invoke
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+internal class TestWasmSpecialization {
+    @Test
+    fun testUnaryPlus() {
+        val expr = MstExtendedField { unaryOperationFunction("+")(bindSymbol(x)) }.compileToExpression(DoubleField)
+        assertEquals(2.0, expr(x to 2.0))
+    }
+
+    @Test
+    fun testUnaryMinus() {
+        val expr = MstExtendedField { unaryOperationFunction("-")(bindSymbol(x)) }.compileToExpression(DoubleField)
+        assertEquals(-2.0, expr(x to 2.0))
+    }
+
+    @Test
+    fun testAdd() {
+        val expr = MstExtendedField {
+            binaryOperationFunction("+")(
+                bindSymbol(x),
+                bindSymbol(x),
+            )
+        }.compileToExpression(DoubleField)
+        assertEquals(4.0, expr(x to 2.0))
+    }
+
+    @Test
+    fun testSine() {
+        val expr = MstExtendedField { unaryOperationFunction("sin")(bindSymbol(x)) }.compileToExpression(DoubleField)
+        assertEquals(0.0, expr(x to 0.0))
+    }
+
+    @Test
+    fun testSubtract() {
+        val expr = MstExtendedField {
+            binaryOperationFunction("-")(bindSymbol(x),
+                bindSymbol(x))
+        }.compileToExpression(DoubleField)
+        assertEquals(0.0, expr(x to 2.0))
+    }
+
+    @Test
+    fun testDivide() {
+        val expr = MstExtendedField {
+            binaryOperationFunction("/")(bindSymbol(x), bindSymbol(x))
+        }.compileToExpression(DoubleField)
+        assertEquals(1.0, expr(x to 2.0))
+    }
+
+    @Test
+    fun testPower() {
+        val expr = MstExtendedField {
+            binaryOperationFunction("pow")(bindSymbol(x), number(2))
+        }.compileToExpression(DoubleField)
+
+        assertEquals(4.0, expr(x to 2.0))
+    }
+
+    private companion object {
+        private val x by symbol
+    }
+}
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
new file mode 100644
index 000000000..e627f551c
--- /dev/null
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
@@ -0,0 +1,48 @@
+package space.kscience.kmath.wasm
+
+import space.kscience.kmath.expressions.MstExtendedField
+import space.kscience.kmath.expressions.MstRing
+import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.IntRing
+import space.kscience.kmath.operations.bindSymbol
+import space.kscience.kmath.operations.invoke
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+internal class TestWasmSpecific {
+    @Test
+    fun int() {
+        val res = MstRing { number(100000000) + number(10000000) }.compile(IntRing)
+        assertEquals(110000000, res)
+    }
+
+    @Test
+    fun real() {
+        val res = MstExtendedField { number(100000000) + number(2).pow(10) }.compile(DoubleField)
+        assertEquals(100001024.0, res)
+    }
+
+    @Test
+    fun argsPassing() {
+        val res = MstExtendedField { bindSymbol(y) + bindSymbol(x).pow(10) }.compile(
+            DoubleField,
+            x to 2.0,
+            y to 100000000.0,
+        )
+
+        assertEquals(100001024.0, res)
+    }
+
+    @Test
+    fun powFunction() {
+        val expr = MstExtendedField { bindSymbol(x).pow(1.0 / 6.0) }.compileToExpression(DoubleField)
+        assertEquals(0.9730585187140817, expr(x to 0.8488554755054833))
+    }
+
+    private companion object {
+        private val x by symbol
+        private val y by symbol
+    }
+}
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmVariables.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmVariables.kt
new file mode 100644
index 000000000..406ba8c8d
--- /dev/null
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmVariables.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.wasm
+
+import space.kscience.kmath.expressions.MstRing
+import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.operations.IntRing
+import space.kscience.kmath.operations.bindSymbol
+import space.kscience.kmath.operations.invoke
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+
+internal class TestWasmVariables {
+    @Test
+    fun testVariable() {
+        val expr = MstRing { bindSymbol(x) }.compileToExpression(IntRing)
+        assertEquals(1, expr(x to 1))
+    }
+
+    @Test
+    fun testUndefinedVariableFails() {
+        val expr = MstRing { bindSymbol(x) }.compileToExpression(IntRing)
+        assertFailsWith<NoSuchElementException> { expr() }
+    }
+
+    private companion object {
+        private val x by symbol
+    }
+}
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmConsistencyWithInterpreter.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmConsistencyWithInterpreter.kt
index 77cfb2241..f94d36602 100644
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmConsistencyWithInterpreter.kt
+++ b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmConsistencyWithInterpreter.kt
@@ -8,18 +8,17 @@ package space.kscience.kmath.asm
 import space.kscience.kmath.complex.ComplexField
 import space.kscience.kmath.complex.toComplex
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.misc.Symbol.Companion.x
+import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.ByteRing
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 internal class TestAsmConsistencyWithInterpreter {
-
     @Test
     fun mstSpace() {
-
         val mst = MstGroup {
             binaryOperationFunction("+")(
                 unaryOperationFunction("+")(
@@ -30,7 +29,7 @@ internal class TestAsmConsistencyWithInterpreter {
                 ),
 
                 number(1)
-            ) + bindSymbol("x") + zero
+            ) + bindSymbol(x) + zero
         }
 
         assertEquals(
@@ -44,7 +43,7 @@ internal class TestAsmConsistencyWithInterpreter {
         val mst = MstRing {
             binaryOperationFunction("+")(
                 unaryOperationFunction("+")(
-                    (bindSymbol("x") - (2.toByte() + (scale(
+                    (bindSymbol(x) - (2.toByte() + (scale(
                         add(number(1), number(1)),
                         2.0
                     ) + 1.toByte()))) * 3.0 - 1.toByte()
@@ -61,10 +60,10 @@ internal class TestAsmConsistencyWithInterpreter {
     }
 
     @Test
-    fun realField() {
+    fun doubleField() {
         val mst = MstField {
             +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
-                (3.0 - (bindSymbol("x") + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
+                (3.0 - (bindSymbol(x) + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
                         + number(1),
                 number(1) / 2 + number(2.0) * one
             ) + zero
@@ -80,7 +79,7 @@ internal class TestAsmConsistencyWithInterpreter {
     fun complexField() {
         val mst = MstField {
             +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
-                (3.0 - (bindSymbol("x") + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
+                (3.0 - (bindSymbol(x) + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
                         + number(1),
                 number(1) / 2 + number(2.0) * one
             ) + zero
@@ -91,4 +90,8 @@ internal class TestAsmConsistencyWithInterpreter {
             mst.compile(ComplexField, x to 2.0.toComplex())
         )
     }
+
+    private companion object {
+        private val x by symbol
+    }
 }
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmOperationsSupport.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmOperationsSupport.kt
index 757235fb7..147639f7c 100644
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmOperationsSupport.kt
+++ b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmOperationsSupport.kt
@@ -5,45 +5,38 @@
 
 package space.kscience.kmath.asm
 
-import space.kscience.kmath.expressions.MstExtendedField
 import space.kscience.kmath.expressions.MstField
 import space.kscience.kmath.expressions.MstGroup
 import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
-import kotlin.random.Random
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 internal class TestAsmOperationsSupport {
     @Test
     fun testUnaryOperationInvocation() {
-        val expression = MstGroup { -bindSymbol("x") }.compileToExpression(DoubleField)
-        val res = expression("x" to 2.0)
+        val expression = MstGroup { -bindSymbol(x) }.compileToExpression(DoubleField)
+        val res = expression(x to 2.0)
         assertEquals(-2.0, res)
     }
 
     @Test
     fun testBinaryOperationInvocation() {
-        val expression = MstGroup { -bindSymbol("x") + number(1.0) }.compileToExpression(DoubleField)
-        val res = expression("x" to 2.0)
+        val expression = MstGroup { -bindSymbol(x) + number(1.0) }.compileToExpression(DoubleField)
+        val res = expression(x to 2.0)
         assertEquals(-1.0, res)
     }
 
     @Test
     fun testConstProductInvocation() {
-        val res = MstField { bindSymbol("x") * 2 }.compileToExpression(DoubleField)("x" to 2.0)
+        val res = MstField { bindSymbol(x) * 2 }.compileToExpression(DoubleField)(x to 2.0)
         assertEquals(4.0, res)
     }
 
-    @Test
-    fun testMultipleCalls() {
-        val e =
-            MstExtendedField { sin(bindSymbol("x")).pow(4) - 6 * bindSymbol("x") / tanh(bindSymbol("x")) }
-                .compileToExpression(DoubleField)
-        val r = Random(0)
-        var s = 0.0
-        repeat(1000000) { s += e("x" to r.nextDouble()) }
-        println(s)
+    private companion object {
+        private val x by symbol
     }
 }
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmSpecialization.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmSpecialization.kt
index b09d79515..3a681e482 100644
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmSpecialization.kt
+++ b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmSpecialization.kt
@@ -7,7 +7,9 @@ package space.kscience.kmath.asm
 
 import space.kscience.kmath.expressions.MstExtendedField
 import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -15,55 +17,60 @@ import kotlin.test.assertEquals
 internal class TestAsmSpecialization {
     @Test
     fun testUnaryPlus() {
-        val expr = MstExtendedField { unaryOperationFunction("+")(bindSymbol("x")) }.compileToExpression(DoubleField)
-        assertEquals(2.0, expr("x" to 2.0))
+        val expr = MstExtendedField { unaryOperationFunction("+")(bindSymbol(x)) }.compileToExpression(DoubleField)
+        assertEquals(2.0, expr(x to 2.0))
     }
 
     @Test
     fun testUnaryMinus() {
-        val expr = MstExtendedField { unaryOperationFunction("-")(bindSymbol("x")) }.compileToExpression(DoubleField)
-        assertEquals(-2.0, expr("x" to 2.0))
+        val expr = MstExtendedField { unaryOperationFunction("-")(bindSymbol(x)) }.compileToExpression(DoubleField)
+        assertEquals(-2.0, expr(x to 2.0))
     }
 
     @Test
     fun testAdd() {
         val expr = MstExtendedField {
-            binaryOperationFunction("+")(bindSymbol("x"),
-                bindSymbol("x"))
+            binaryOperationFunction("+")(
+                bindSymbol(x),
+                bindSymbol(x),
+            )
         }.compileToExpression(DoubleField)
-        assertEquals(4.0, expr("x" to 2.0))
+        assertEquals(4.0, expr(x to 2.0))
     }
 
     @Test
     fun testSine() {
-        val expr = MstExtendedField { unaryOperationFunction("sin")(bindSymbol("x")) }.compileToExpression(DoubleField)
-        assertEquals(0.0, expr("x" to 0.0))
+        val expr = MstExtendedField { unaryOperationFunction("sin")(bindSymbol(x)) }.compileToExpression(DoubleField)
+        assertEquals(0.0, expr(x to 0.0))
     }
 
     @Test
-    fun testMinus() {
+    fun testSubtract() {
         val expr = MstExtendedField {
-            binaryOperationFunction("-")(bindSymbol("x"),
-                bindSymbol("x"))
+            binaryOperationFunction("-")(bindSymbol(x),
+                bindSymbol(x))
         }.compileToExpression(DoubleField)
-        assertEquals(0.0, expr("x" to 2.0))
+        assertEquals(0.0, expr(x to 2.0))
     }
 
     @Test
     fun testDivide() {
         val expr = MstExtendedField {
-            binaryOperationFunction("/")(bindSymbol("x"),
-                bindSymbol("x"))
+            binaryOperationFunction("/")(bindSymbol(x), bindSymbol(x))
         }.compileToExpression(DoubleField)
-        assertEquals(1.0, expr("x" to 2.0))
+        assertEquals(1.0, expr(x to 2.0))
     }
 
     @Test
     fun testPower() {
         val expr = MstExtendedField {
-            binaryOperationFunction("pow")(bindSymbol("x"), number(2))
+            binaryOperationFunction("pow")(bindSymbol(x), number(2))
         }.compileToExpression(DoubleField)
 
-        assertEquals(4.0, expr("x" to 2.0))
+        assertEquals(4.0, expr(x to 2.0))
+    }
+
+    private companion object {
+        private val x by symbol
     }
 }
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmVariables.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmVariables.kt
index 740326a59..89b98d720 100644
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmVariables.kt
+++ b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmVariables.kt
@@ -7,7 +7,9 @@ package space.kscience.kmath.asm
 
 import space.kscience.kmath.expressions.MstRing
 import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.ByteRing
+import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -16,13 +18,17 @@ import kotlin.test.assertFailsWith
 internal class TestAsmVariables {
     @Test
     fun testVariable() {
-        val expr = MstRing { bindSymbol("x") }.compileToExpression(ByteRing)
-        assertEquals(1.toByte(), expr("x" to 1.toByte()))
+        val expr = MstRing { bindSymbol(x) }.compileToExpression(ByteRing)
+        assertEquals(1.toByte(), expr(x to 1.toByte()))
     }
 
     @Test
     fun testUndefinedVariableFails() {
-        val expr = MstRing { bindSymbol("x") }.compileToExpression(ByteRing)
+        val expr = MstRing { bindSymbol(x) }.compileToExpression(ByteRing)
         assertFailsWith<NoSuchElementException> { expr() }
     }
+
+    private companion object {
+        private val x by symbol
+    }
 }
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
deleted file mode 100644
index 1584293ce..000000000
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.ast.rendering
-
-import space.kscience.kmath.ast.rendering.TestUtils.testLatex
-import space.kscience.kmath.expressions.MST.Numeric
-import kotlin.test.Test
-
-internal class TestFeatures {
-    @Test
-    fun printSymbolic() = testLatex("x", "x")
-
-    @Test
-    fun printNumeric() {
-        val num = object : Number() {
-            override fun toByte(): Byte = throw UnsupportedOperationException()
-            override fun toChar(): Char = throw UnsupportedOperationException()
-            override fun toDouble(): Double = throw UnsupportedOperationException()
-            override fun toFloat(): Float = throw UnsupportedOperationException()
-            override fun toInt(): Int = throw UnsupportedOperationException()
-            override fun toLong(): Long = throw UnsupportedOperationException()
-            override fun toShort(): Short = throw UnsupportedOperationException()
-            override fun toString(): String = "foo"
-        }
-
-        testLatex(Numeric(num), "foo")
-    }
-
-    @Test
-    fun prettyPrintFloats() {
-        testLatex(Numeric(Double.NaN), "NaN")
-        testLatex(Numeric(Double.POSITIVE_INFINITY), "\\infty")
-        testLatex(Numeric(Double.NEGATIVE_INFINITY), "-\\infty")
-        testLatex(Numeric(1.0), "1")
-        testLatex(Numeric(-1.0), "-1")
-        testLatex(Numeric(1.42), "1.42")
-        testLatex(Numeric(-1.42), "-1.42")
-        testLatex(Numeric(1.1e10), "1.1\\times10^{10}")
-        testLatex(Numeric(1.1e-10), "1.1\\times10^{-10}")
-        testLatex(Numeric(-1.1e-10), "-1.1\\times10^{-10}")
-        testLatex(Numeric(-1.1e10), "-1.1\\times10^{10}")
-    }
-
-    @Test
-    fun prettyPrintIntegers() {
-        testLatex(Numeric(42), "42")
-        testLatex(Numeric(-42), "-42")
-    }
-
-    @Test
-    fun prettyPrintPi() {
-        testLatex("pi", "\\pi")
-    }
-
-    @Test
-    fun binaryPlus() = testLatex("2+2", "2+2")
-
-    @Test
-    fun binaryMinus() = testLatex("2-2", "2-2")
-
-    @Test
-    fun fraction() = testLatex("2/2", "\\frac{2}{2}")
-
-    @Test
-    fun binaryOperator() = testLatex("f(x, y)", "\\operatorname{f}\\left(x,y\\right)")
-
-    @Test
-    fun unaryOperator() = testLatex("f(x)", "\\operatorname{f}\\,\\left(x\\right)")
-
-    @Test
-    fun power() = testLatex("x^y", "x^{y}")
-
-    @Test
-    fun squareRoot() = testLatex("sqrt(x)", "\\sqrt{x}")
-
-    @Test
-    fun exponential() = testLatex("exp(x)", "e^{x}")
-
-    @Test
-    fun multiplication() = testLatex("x*1", "x\\times1")
-
-    @Test
-    fun inverseTrigonometry() {
-        testLatex("asin(x)", "\\operatorname{sin}^{-1}\\,\\left(x\\right)")
-        testLatex("asinh(x)", "\\operatorname{sinh}^{-1}\\,\\left(x\\right)")
-        testLatex("acos(x)", "\\operatorname{cos}^{-1}\\,\\left(x\\right)")
-        testLatex("acosh(x)", "\\operatorname{cosh}^{-1}\\,\\left(x\\right)")
-        testLatex("atan(x)", "\\operatorname{tan}^{-1}\\,\\left(x\\right)")
-        testLatex("atanh(x)", "\\operatorname{tanh}^{-1}\\,\\left(x\\right)")
-    }
-
-//    @Test
-//    fun unaryPlus() {
-//        testLatex("+1", "+1")
-//        testLatex("+1", "++1")
-//    }
-}
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
deleted file mode 100644
index 6322df25d..000000000
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.ast.rendering
-
-import space.kscience.kmath.ast.rendering.TestUtils.testLatex
-import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.operations.GroupOperations
-import kotlin.test.Test
-
-internal class TestLatex {
-    @Test
-    fun number() = testLatex("42", "42")
-
-    @Test
-    fun symbol() = testLatex("x", "x")
-
-    @Test
-    fun operatorName() = testLatex("sin(1)", "\\operatorname{sin}\\,\\left(1\\right)")
-
-    @Test
-    fun specialSymbol() {
-        testLatex(MST.Numeric(Double.POSITIVE_INFINITY), "\\infty")
-        testLatex("pi", "\\pi")
-    }
-
-    @Test
-    fun operand() {
-        testLatex("sin(1)", "\\operatorname{sin}\\,\\left(1\\right)")
-        testLatex("1+1", "1+1")
-    }
-
-    @Test
-    fun unaryOperator() = testLatex("sin(1)", "\\operatorname{sin}\\,\\left(1\\right)")
-
-    @Test
-    fun unaryPlus() = testLatex(MST.Unary(GroupOperations.PLUS_OPERATION, MST.Numeric(1)), "+1")
-
-    @Test
-    fun unaryMinus() = testLatex("-x", "-x")
-
-    @Test
-    fun radical() = testLatex("sqrt(x)", "\\sqrt{x}")
-
-    @Test
-    fun superscript() = testLatex("x^y", "x^{y}")
-
-    @Test
-    fun subscript() = testLatex(SubscriptSyntax("", SymbolSyntax("x"), NumberSyntax("123")), "x_{123}")
-
-    @Test
-    fun binaryOperator() = testLatex("f(x, y)", "\\operatorname{f}\\left(x,y\\right)")
-
-    @Test
-    fun binaryPlus() = testLatex("x+x", "x+x")
-
-    @Test
-    fun binaryMinus() = testLatex("x-x", "x-x")
-
-    @Test
-    fun fraction() = testLatex("x/x", "\\frac{x}{x}")
-
-    @Test
-    fun radicalWithIndex() = testLatex(RadicalWithIndexSyntax("", SymbolSyntax("x"), SymbolSyntax("y")), "\\sqrt[x]{y}")
-
-    @Test
-    fun multiplication() {
-        testLatex("x*1", "x\\times1")
-        testLatex("1*x", "1\\,x")
-    }
-}
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
deleted file mode 100644
index 2d7bfad19..000000000
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.ast.rendering
-
-import space.kscience.kmath.ast.rendering.TestUtils.testMathML
-import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.operations.GroupOperations
-import kotlin.test.Test
-
-internal class TestMathML {
-    @Test
-    fun number() = testMathML("42", "<mn>42</mn>")
-
-    @Test
-    fun symbol() = testMathML("x", "<mi>x</mi>")
-
-    @Test
-    fun operatorName() = testMathML(
-        "sin(1)",
-        "<mo>sin</mo><mspace width=\"0.167em\"></mspace><mfenced open=\"(\" close=\")\" separators=\"\"><mn>1</mn></mfenced>",
-    )
-
-    @Test
-    fun specialSymbol() {
-        testMathML(MST.Numeric(Double.POSITIVE_INFINITY), "<mo>&infin;</mo>")
-        testMathML("pi", "<mo>&pi;</mo>")
-    }
-
-    @Test
-    fun operand() {
-        testMathML(
-            "sin(1)",
-            "<mo>sin</mo><mspace width=\"0.167em\"></mspace><mfenced open=\"(\" close=\")\" separators=\"\"><mn>1</mn></mfenced>",
-        )
-
-        testMathML("1+1", "<mn>1</mn><mo>+</mo><mn>1</mn>")
-    }
-
-    @Test
-    fun unaryOperator() = testMathML(
-        "sin(1)",
-        "<mo>sin</mo><mspace width=\"0.167em\"></mspace><mfenced open=\"(\" close=\")\" separators=\"\"><mn>1</mn></mfenced>",
-    )
-
-    @Test
-    fun unaryPlus() =
-        testMathML(MST.Unary(GroupOperations.PLUS_OPERATION, MST.Numeric(1)), "<mo>+</mo><mn>1</mn>")
-
-    @Test
-    fun unaryMinus() = testMathML("-x", "<mo>-</mo><mi>x</mi>")
-
-    @Test
-    fun radical() = testMathML("sqrt(x)", "<msqrt><mi>x</mi></msqrt>")
-
-    @Test
-    fun superscript() = testMathML("x^y", "<msup><mrow><mi>x</mi></mrow><mrow><mi>y</mi></mrow></msup>")
-
-    @Test
-    fun subscript() = testMathML(
-        SubscriptSyntax("", SymbolSyntax("x"), NumberSyntax("123")),
-        "<msub><mrow><mi>x</mi></mrow><mrow><mn>123</mn></mrow></msub>",
-    )
-
-    @Test
-    fun binaryOperator() = testMathML(
-        "f(x, y)",
-        "<mo>f</mo><mfenced open=\"(\" close=\")\" separators=\"\"><mi>x</mi><mo>,</mo><mi>y</mi></mfenced>",
-    )
-
-    @Test
-    fun binaryPlus() = testMathML("x+x", "<mi>x</mi><mo>+</mo><mi>x</mi>")
-
-    @Test
-    fun binaryMinus() = testMathML("x-x", "<mi>x</mi><mo>-</mo><mi>x</mi>")
-
-    @Test
-    fun fraction() = testMathML("x/x", "<mfrac><mrow><mi>x</mi></mrow><mrow><mi>x</mi></mrow></mfrac>")
-
-    @Test
-    fun radicalWithIndex() =
-        testMathML(RadicalWithIndexSyntax("", SymbolSyntax("x"), SymbolSyntax("y")),
-            "<mroot><mrow><mi>y</mi></mrow><mrow><mi>x</mi></mrow></mroot>")
-
-    @Test
-    fun multiplication() {
-        testMathML("x*1", "<mi>x</mi><mo>&times;</mo><mn>1</mn>")
-        testMathML("1*x", "<mn>1</mn><mspace width=\"0.167em\"></mspace><mi>x</mi>")
-    }
-}
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
deleted file mode 100644
index a4017fdb4..000000000
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.ast.rendering
-
-import space.kscience.kmath.ast.rendering.TestUtils.testLatex
-import kotlin.test.Test
-
-internal class TestStages {
-    @Test
-    fun betterMultiplication() {
-        testLatex("a*1", "a\\times1")
-        testLatex("1*(2/3)", "1\\times\\left(\\frac{2}{3}\\right)")
-        testLatex("1*1", "1\\times1")
-        testLatex("2e10", "2\\times10^{10}")
-        testLatex("2*x", "2\\,x")
-        testLatex("2*(x+1)", "2\\,\\left(x+1\\right)")
-        testLatex("x*y", "x\\,y")
-    }
-
-    @Test
-    fun parentheses() {
-        testLatex("(x+1)", "x+1")
-        testLatex("x*x*x", "x\\,x\\,x")
-        testLatex("(x+x)*x", "\\left(x+x\\right)\\,x")
-        testLatex("x+x*x", "x+x\\,x")
-        testLatex("x+x^x*x+x", "x+x^{x}\\,x+x")
-        testLatex("(x+x)^x+x*x", "\\left(x+x\\right)^{x}+x\\,x")
-        testLatex("x^(x+x)", "x^{x+x}")
-    }
-}
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
deleted file mode 100644
index 7c9400532..000000000
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.ast.rendering
-
-import space.kscience.kmath.ast.parseMath
-import space.kscience.kmath.expressions.MST
-import kotlin.test.assertEquals
-
-internal object TestUtils {
-    private fun mathSyntax(mst: MST) = FeaturedMathRendererWithPostProcess.Default.render(mst)
-    private fun latex(mst: MST) = LatexSyntaxRenderer.renderWithStringBuilder(mathSyntax(mst))
-    private fun mathML(mst: MST) = MathMLSyntaxRenderer.renderWithStringBuilder(mathSyntax(mst))
-
-    internal fun testLatex(mst: MST, expectedLatex: String) = assertEquals(
-        expected = expectedLatex,
-        actual = latex(mst),
-    )
-
-    internal fun testLatex(expression: String, expectedLatex: String) = assertEquals(
-        expected = expectedLatex,
-        actual = latex(expression.parseMath()),
-    )
-
-    internal fun testLatex(expression: MathSyntax, expectedLatex: String) = assertEquals(
-        expected = expectedLatex,
-        actual = LatexSyntaxRenderer.renderWithStringBuilder(expression),
-    )
-
-    internal fun testMathML(mst: MST, expectedMathML: String) = assertEquals(
-        expected = "<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mrow>$expectedMathML</mrow></math>",
-        actual = mathML(mst),
-    )
-
-    internal fun testMathML(expression: String, expectedMathML: String) = assertEquals(
-        expected = "<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mrow>$expectedMathML</mrow></math>",
-        actual = mathML(expression.parseMath()),
-    )
-
-    internal fun testMathML(expression: MathSyntax, expectedMathML: String) = assertEquals(
-        expected = "<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mrow>$expectedMathML</mrow></math>",
-        actual = MathMLSyntaxRenderer.renderWithStringBuilder(expression),
-    )
-}
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index 3a05c3d6d..70beab95a 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -8,7 +8,7 @@ Complex and hypercomplex number systems in KMath.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-6`.
+The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-7`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-complex:0.3.0-dev-6'
+    implementation 'space.kscience:kmath-complex:0.3.0-dev-7'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,6 +31,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-complex:0.3.0-dev-6")
+    implementation("space.kscience:kmath-complex:0.3.0-dev-7")
 }
 ```
diff --git a/kmath-complex/build.gradle.kts b/kmath-complex/build.gradle.kts
index 1c2e8a0a2..a28226d90 100644
--- a/kmath-complex/build.gradle.kts
+++ b/kmath-complex/build.gradle.kts
@@ -1,5 +1,3 @@
-import ru.mipt.npm.gradle.Maturity
-
 /*
  * Copyright 2018-2021 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
@@ -21,7 +19,7 @@ kotlin.sourceSets {
 
 readme {
     description = "Complex numbers and quaternions."
-    maturity = Maturity.PROTOTYPE
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/kmath-core/README.md b/kmath-core/README.md
index b83fb13d0..e28873045 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -15,7 +15,7 @@ performance calculations to code generation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-6`.
+The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-7`.
 
 **Gradle:**
 ```gradle
@@ -26,7 +26,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-core:0.3.0-dev-6'
+    implementation 'space.kscience:kmath-core:0.3.0-dev-7'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -38,6 +38,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-core:0.3.0-dev-6")
+    implementation("space.kscience:kmath-core:0.3.0-dev-7")
 }
 ```
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index df70aa40b..f1a2ed40f 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -3,8 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-import ru.mipt.npm.gradle.Maturity
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
@@ -21,7 +19,7 @@ kotlin.sourceSets {
 
 readme {
     description = "Core classes, algebra definitions, basic linear algebra"
-    maturity = Maturity.DEVELOPMENT
+    maturity = ru.mipt.npm.gradle.Maturity.DEVELOPMENT
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
new file mode 100644
index 000000000..b5e652784
--- /dev/null
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
@@ -0,0 +1,18 @@
+package space.kscience.kmath.expressions
+
+import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.bindSymbol
+import space.kscience.kmath.operations.invoke
+import kotlin.test.Test
+
+internal class InterpretTest {
+    @Test
+    fun interpretation() {
+        val expr = MstField {
+            val x = bindSymbol(Symbol.x)
+            x * 2.0 + number(2.0) / x - 16.0
+        }.toExpression(DoubleField)
+        expr(Symbol.x to 2.2)
+    }
+}
diff --git a/kmath-coroutines/build.gradle.kts b/kmath-coroutines/build.gradle.kts
index 30f9ce1f9..531bbd935 100644
--- a/kmath-coroutines/build.gradle.kts
+++ b/kmath-coroutines/build.gradle.kts
@@ -3,8 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-import ru.mipt.npm.gradle.Maturity
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
@@ -29,5 +27,5 @@ kotlin.sourceSets {
 }
 
 readme {
-    maturity = Maturity.EXPERIMENTAL
+    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
 }
\ No newline at end of file
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index cae11724d..3bf29f803 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -9,7 +9,7 @@ EJML based linear algebra implementation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-6`.
+The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-7`.
 
 **Gradle:**
 ```gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ejml:0.3.0-dev-6'
+    implementation 'space.kscience:kmath-ejml:0.3.0-dev-7'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ejml:0.3.0-dev-6")
+    implementation("space.kscience:kmath-ejml:0.3.0-dev-7")
 }
 ```
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index 922e6572b..20e52deb2 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -9,7 +9,7 @@ Specialization of KMath APIs for Double numbers.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-6`.
+The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-7`.
 
 **Gradle:**
 ```gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-for-real:0.3.0-dev-6'
+    implementation 'space.kscience:kmath-for-real:0.3.0-dev-7'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-for-real:0.3.0-dev-6")
+    implementation("space.kscience:kmath-for-real:0.3.0-dev-7")
 }
 ```
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index eef677565..d5907f1c5 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -11,7 +11,7 @@ Functions and interpolations.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-6`.
+The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-7`.
 
 **Gradle:**
 ```gradle
@@ -22,7 +22,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-functions:0.3.0-dev-6'
+    implementation 'space.kscience:kmath-functions:0.3.0-dev-7'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -34,6 +34,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-functions:0.3.0-dev-6")
+    implementation("space.kscience:kmath-functions:0.3.0-dev-7")
 }
 ```
diff --git a/kmath-geometry/build.gradle.kts b/kmath-geometry/build.gradle.kts
index 65db43edf..121498ce8 100644
--- a/kmath-geometry/build.gradle.kts
+++ b/kmath-geometry/build.gradle.kts
@@ -3,8 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-import ru.mipt.npm.gradle.Maturity
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
@@ -17,5 +15,5 @@ kotlin.sourceSets.commonMain {
 }
 
 readme {
-    maturity = Maturity.PROTOTYPE
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
 }
diff --git a/kmath-histograms/build.gradle.kts b/kmath-histograms/build.gradle.kts
index 024e34076..af3ebaed9 100644
--- a/kmath-histograms/build.gradle.kts
+++ b/kmath-histograms/build.gradle.kts
@@ -3,8 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-import ru.mipt.npm.gradle.Maturity
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
@@ -28,5 +26,5 @@ kotlin.sourceSets {
 }
 
 readme {
-    maturity = Maturity.PROTOTYPE
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
 }
diff --git a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
index 66018a227..3ed73451d 100644
--- a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
+++ b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
@@ -10,6 +10,7 @@ import space.kscience.kmath.asm.compileToExpression
 import space.kscience.kmath.ast.parseMath
 import space.kscience.kmath.expressions.MstAlgebra
 import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.DoubleField
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -19,8 +20,8 @@ import kotlin.test.fail
 internal class AdaptingTests {
     @Test
     fun symbol() {
-        val c1 = MstAlgebra.bindSymbol("x")
-        assertTrue(c1.toSVar<KMathNumber<Double, DoubleField>>().name == "x")
+        val c1 = MstAlgebra.bindSymbol(x.identity)
+        assertEquals(x.identity, c1.toSVar<KMathNumber<Double, DoubleField>>().name)
         val c2 = "kitten".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
         if (c2 is SVar) assertTrue(c2.name == "kitten") else fail()
     }
@@ -45,23 +46,27 @@ internal class AdaptingTests {
 
     @Test
     fun simpleFunctionDerivative() {
-        val x = MstAlgebra.bindSymbol("x").toSVar<KMathNumber<Double, DoubleField>>()
+        val xSVar = MstAlgebra.bindSymbol(x.identity).toSVar<KMathNumber<Double, DoubleField>>()
         val quadratic = "x^2-4*x-44".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
-        val actualDerivative = quadratic.d(x).toMst().compileToExpression(DoubleField)
+        val actualDerivative = quadratic.d(xSVar).toMst().compileToExpression(DoubleField)
         val expectedDerivative = "2*x-4".parseMath().compileToExpression(DoubleField)
-        assertEquals(actualDerivative("x" to 123.0), expectedDerivative("x" to 123.0))
+        assertEquals(actualDerivative(x to 123.0), expectedDerivative(x to 123.0))
     }
 
     @Test
     fun moreComplexDerivative() {
-        val x = MstAlgebra.bindSymbol("x").toSVar<KMathNumber<Double, DoubleField>>()
+        val xSVar = MstAlgebra.bindSymbol(x.identity).toSVar<KMathNumber<Double, DoubleField>>()
         val composition = "-sqrt(sin(x^2)-cos(x)^2-16*x)".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
-        val actualDerivative = composition.d(x).toMst().compileToExpression(DoubleField)
+        val actualDerivative = composition.d(xSVar).toMst().compileToExpression(DoubleField)
 
-        val expectedDerivative =
-            "-(2*x*cos(x^2)+2*sin(x)*cos(x)-16)/(2*sqrt(sin(x^2)-16*x-cos(x)^2))".parseMath().compileToExpression(DoubleField)
+        val expectedDerivative = "-(2*x*cos(x^2)+2*sin(x)*cos(x)-16)/(2*sqrt(sin(x^2)-16*x-cos(x)^2))"
+            .parseMath()
+            .compileToExpression(DoubleField)
 
+        assertEquals(actualDerivative(x to 0.1), expectedDerivative(x to 0.1))
+    }
 
-        assertEquals(actualDerivative("x" to 0.1), expectedDerivative("x" to 0.1))
+    private companion object {
+        private val x by symbol
     }
 }
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index 829fe4142..66e0483a4 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -9,7 +9,7 @@ ND4J based implementations of KMath abstractions.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-6`.
+The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-7`.
 
 **Gradle:**
 ```gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-6'
+    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-7'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,7 +32,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-nd4j:0.3.0-dev-6")
+    implementation("space.kscience:kmath-nd4j:0.3.0-dev-7")
 }
 ```
 
diff --git a/kmath-nd4j/build.gradle.kts b/kmath-nd4j/build.gradle.kts
index c7d891206..2b549f919 100644
--- a/kmath-nd4j/build.gradle.kts
+++ b/kmath-nd4j/build.gradle.kts
@@ -3,8 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-import ru.mipt.npm.gradle.Maturity
-
 plugins {
     kotlin("jvm")
     id("ru.mipt.npm.gradle.common")
@@ -20,7 +18,7 @@ dependencies {
 
 readme {
     description = "ND4J NDStructure implementation and according NDAlgebra classes"
-    maturity = Maturity.EXPERIMENTAL
+    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/kmath-stat/build.gradle.kts b/kmath-stat/build.gradle.kts
index dff504ef0..8522cf92f 100644
--- a/kmath-stat/build.gradle.kts
+++ b/kmath-stat/build.gradle.kts
@@ -3,8 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-import ru.mipt.npm.gradle.Maturity
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
@@ -30,5 +28,5 @@ kotlin.sourceSets {
 }
 
 readme {
-    maturity = Maturity.EXPERIMENTAL
+    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
 }
\ No newline at end of file
diff --git a/kmath-viktor/build.gradle.kts b/kmath-viktor/build.gradle.kts
index 0d853dea7..747fe0252 100644
--- a/kmath-viktor/build.gradle.kts
+++ b/kmath-viktor/build.gradle.kts
@@ -3,8 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-import ru.mipt.npm.gradle.Maturity
-
 plugins {
     kotlin("jvm")
     id("ru.mipt.npm.gradle.common")
@@ -18,5 +16,5 @@ dependencies {
 }
 
 readme {
-    maturity = Maturity.DEVELOPMENT
+    maturity = ru.mipt.npm.gradle.Maturity.DEVELOPMENT
 }
\ No newline at end of file
-- 
2.34.1


From 0a0d0af94a4e586a0214815a272c17d7d530827b Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 21 Apr 2021 19:46:02 +0700
Subject: [PATCH 128/713] Configure copyright scoping

---
 .gitignore                                    |  1 +
 .idea/copyright/kmath.xml                     |  6 ++++++
 .idea/copyright/profiles_settings.xml         | 21 +++++++++++++++++++
 .idea/scopes/Apply_copyright.xml              |  4 ++++
 benchmarks/build.gradle.kts                   |  5 -----
 build.gradle.kts                              |  5 -----
 examples/build.gradle.kts                     |  5 -----
 .../kscience/kmath/functions/integrate.kt     |  5 +++++
 .../kmath/functions/matrixIntegration.kt      |  5 +++++
 gradlew                                       | 15 +++++++++++--
 kmath-ast/build.gradle.kts                    |  5 -----
 .../kmath/ast/ParserPrecedenceTest.kt         |  5 +++++
 .../space/kscisnce/kmath/ast/ParserTest.kt    |  5 +++++
 .../internal/astring/astring.typealises.kt    |  5 +++++
 .../kscience/kmath/internal/base64/base64.kt  |  5 +++++
 .../kmath/internal/binaryen/index.binaryen.kt |  5 +++++
 .../binaryen/index.binaryen.typealiases.kt    |  5 +++++
 .../kscience/kmath/internal/stream/stream.kt  |  5 +++++
 .../lib.dom.WebAssembly.module_dukat.kt       |  5 +++++
 .../nonDeclarations.WebAssembly.kt            |  5 +++++
 .../kmath/wasm/internal/WasmBuilder.kt        |  5 +++++
 .../wasm/internal/f64StandardFunctions.kt     |  5 +++++
 .../kotlin/space/kscience/kmath/wasm/wasm.kt  |  5 +++++
 .../kscience/kmath/ast/TestExecutionTime.kt   |  5 +++++
 .../kscience/kmath/wasm/TestWasmSpecific.kt   |  5 +++++
 kmath-commons/build.gradle.kts                |  6 +-----
 kmath-complex/build.gradle.kts                |  5 -----
 kmath-core/build.gradle.kts                   |  5 -----
 .../kmath/expressions/InterpretTest.kt        |  5 +++++
 kmath-coroutines/build.gradle.kts             |  5 -----
 kmath-functions/build.gradle.kts              |  5 -----
 kmath-geometry/build.gradle.kts               |  5 -----
 kmath-histograms/build.gradle.kts             |  5 -----
 kmath-kotlingrad/build.gradle.kts             |  7 +------
 kmath-memory/build.gradle.kts                 |  7 +------
 kmath-nd4j/build.gradle.kts                   |  5 -----
 kmath-stat/build.gradle.kts                   |  5 -----
 kmath-viktor/build.gradle.kts                 |  5 -----
 settings.gradle.kts                           |  5 -----
 39 files changed, 133 insertions(+), 89 deletions(-)
 create mode 100644 .idea/copyright/kmath.xml
 create mode 100644 .idea/copyright/profiles_settings.xml
 create mode 100644 .idea/scopes/Apply_copyright.xml

diff --git a/.gitignore b/.gitignore
index 2a13b9e3c..d6c4af4e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ out/
 .idea/
 
 !.idea/copyright/
+!.idea/scopes/
 
 .vscode/
 
diff --git a/.idea/copyright/kmath.xml b/.idea/copyright/kmath.xml
new file mode 100644
index 000000000..17e44e4d0
--- /dev/null
+++ b/.idea/copyright/kmath.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+    <copyright>
+        <option name="notice" value="Copyright 2018-2021 KMath contributors.&#10;Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file." />
+        <option name="myName" value="kmath" />
+    </copyright>
+</component>
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 000000000..b538bdf41
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,21 @@
+<component name="CopyrightManager">
+  <settings default="kmath">
+    <module2copyright>
+      <element module="Apply copyright" copyright="kmath" />
+    </module2copyright>
+    <LanguageOptions name="Groovy">
+      <option name="fileTypeOverride" value="1" />
+    </LanguageOptions>
+    <LanguageOptions name="HTML">
+      <option name="fileTypeOverride" value="1" />
+      <option name="prefixLines" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="Properties">
+      <option name="fileTypeOverride" value="1" />
+    </LanguageOptions>
+    <LanguageOptions name="XML">
+      <option name="fileTypeOverride" value="1" />
+      <option name="prefixLines" value="false" />
+    </LanguageOptions>
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/scopes/Apply_copyright.xml b/.idea/scopes/Apply_copyright.xml
new file mode 100644
index 000000000..0eb589133
--- /dev/null
+++ b/.idea/scopes/Apply_copyright.xml
@@ -0,0 +1,4 @@
+<component name="DependencyValidationManager">
+    <scope name="Apply copyright"
+           pattern="!file[*]:*//testData//*&amp;&amp;!file[*]:testData//*&amp;&amp;!file[*]:*.gradle.kts&amp;&amp;!file[*]:*.gradle&amp;&amp;!file[group:kotlin-ultimate]:*/&amp;&amp;!file[kotlin.libraries]:stdlib/api//*"/>
+</component>
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index d6796ed46..88f034a2a 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.allopen")
diff --git a/build.gradle.kts b/build.gradle.kts
index a7c9144a7..4e0b6f256 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     id("ru.mipt.npm.gradle.project")
 }
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 67fe9853a..56feee9dc 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("jvm")
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
index 90542adf4..6990e8c8f 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.integration.integrate
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index bd431c22c..8020df8f6 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.integration.integrate
diff --git a/gradlew b/gradlew
index 6ad9eb930..4f906e0c8 100755
--- a/gradlew
+++ b/gradlew
@@ -1,8 +1,19 @@
 #!/usr/bin/env sh
 
 #
-# Copyright 2018-2021 KMath contributors.
-# Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 
 ##############################################################################
diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index 15357b2d5..b4a0b28ac 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserPrecedenceTest.kt b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserPrecedenceTest.kt
index 509f87d98..14ceefc30 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserPrecedenceTest.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserPrecedenceTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscisnce.kmath.ast
 
 import space.kscience.kmath.ast.parseMath
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserTest.kt b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserTest.kt
index 13f5b3290..a0dcba9c0 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserTest.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscisnce.kmath.ast
 
 import space.kscience.kmath.ast.parseMath
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
index 1f6a5f04d..93b4f6ce6 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.internal.astring
 
 internal typealias Generator = Any
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
index a0c7cb6ee..86e0cede7 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 @file:Suppress(
     "INTERFACE_WITH_SUPERCLASS",
     "OVERRIDING_FINAL_MEMBER",
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
index d3e3539c6..42b6ac7d8 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 @file:Suppress(
     "INTERFACE_WITH_SUPERCLASS",
     "OVERRIDING_FINAL_MEMBER",
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
index f89db20e2..523b13b40 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 @file:Suppress("PackageDirectoryMismatch", "NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING", "KDocMissingDocumentation")
 
 package space.kscience.kmath.internal.binaryen
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
index ae6c7eb35..52be5530f 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.internal.stream
 
 import space.kscience.kmath.internal.emitter.Emitter
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
index 322a2fa7b..3754c3eff 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 @file:JsQualifier("WebAssembly")
 
 @file:Suppress(
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
index 095e46140..59733299a 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 @file:Suppress("INTERFACE_WITH_SUPERCLASS",
     "OVERRIDING_FINAL_MEMBER",
     "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index a031a4de4..bd2b340a0 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.wasm.internal
 
 import space.kscience.kmath.expressions.Expression
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
index cb0d71ad5..21a88b5d0 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.wasm.internal
 
 import space.kscience.kmath.internal.base64.toUint8Array
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
index 822dedc3a..d44c4e49d 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.wasm
 
 import space.kscience.kmath.estree.compileWith
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
index 634a89b26..01746ddb6 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.ast
 
 import space.kscience.kmath.expressions.*
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
index e627f551c..dd5452d04 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.wasm
 
 import space.kscience.kmath.expressions.MstExtendedField
diff --git a/kmath-commons/build.gradle.kts b/kmath-commons/build.gradle.kts
index 570ac2b74..a208c956c 100644
--- a/kmath-commons/build.gradle.kts
+++ b/kmath-commons/build.gradle.kts
@@ -1,12 +1,8 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("jvm")
     id("ru.mipt.npm.gradle.common")
 }
+
 description = "Commons math binding for kmath"
 
 dependencies {
diff --git a/kmath-complex/build.gradle.kts b/kmath-complex/build.gradle.kts
index a28226d90..ea74df646 100644
--- a/kmath-complex/build.gradle.kts
+++ b/kmath-complex/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index f1a2ed40f..92a5f419d 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
index b5e652784..980819364 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.expressions
 
 import space.kscience.kmath.misc.Symbol
diff --git a/kmath-coroutines/build.gradle.kts b/kmath-coroutines/build.gradle.kts
index 531bbd935..1546e7d96 100644
--- a/kmath-coroutines/build.gradle.kts
+++ b/kmath-coroutines/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
diff --git a/kmath-functions/build.gradle.kts b/kmath-functions/build.gradle.kts
index ca678bc0e..622b8f8da 100644
--- a/kmath-functions/build.gradle.kts
+++ b/kmath-functions/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
diff --git a/kmath-geometry/build.gradle.kts b/kmath-geometry/build.gradle.kts
index 121498ce8..9b6e593b2 100644
--- a/kmath-geometry/build.gradle.kts
+++ b/kmath-geometry/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
diff --git a/kmath-histograms/build.gradle.kts b/kmath-histograms/build.gradle.kts
index af3ebaed9..2167726c0 100644
--- a/kmath-histograms/build.gradle.kts
+++ b/kmath-histograms/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
diff --git a/kmath-kotlingrad/build.gradle.kts b/kmath-kotlingrad/build.gradle.kts
index 576c073c3..f627beec9 100644
--- a/kmath-kotlingrad/build.gradle.kts
+++ b/kmath-kotlingrad/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("jvm")
     id("ru.mipt.npm.gradle.common")
@@ -16,4 +11,4 @@ dependencies {
 
 readme {
     maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
-}
\ No newline at end of file
+}
diff --git a/kmath-memory/build.gradle.kts b/kmath-memory/build.gradle.kts
index 50c317324..288c61a51 100644
--- a/kmath-memory/build.gradle.kts
+++ b/kmath-memory/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
@@ -14,4 +9,4 @@ readme {
     description = """
         An API and basic implementation for arranging objects in a continous memory block.
     """.trimIndent()
-}
\ No newline at end of file
+}
diff --git a/kmath-nd4j/build.gradle.kts b/kmath-nd4j/build.gradle.kts
index 2b549f919..bc61060db 100644
--- a/kmath-nd4j/build.gradle.kts
+++ b/kmath-nd4j/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("jvm")
     id("ru.mipt.npm.gradle.common")
diff --git a/kmath-stat/build.gradle.kts b/kmath-stat/build.gradle.kts
index 8522cf92f..e8f629f7a 100644
--- a/kmath-stat/build.gradle.kts
+++ b/kmath-stat/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
diff --git a/kmath-viktor/build.gradle.kts b/kmath-viktor/build.gradle.kts
index 747fe0252..232bd1388 100644
--- a/kmath-viktor/build.gradle.kts
+++ b/kmath-viktor/build.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 plugins {
     kotlin("jvm")
     id("ru.mipt.npm.gradle.common")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 553367a22..ca36168e1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,8 +1,3 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 pluginManagement {
     repositories {
         mavenLocal()
-- 
2.34.1


From cfa9077e29f16417878eb8ebca54ce973da19741 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 21 Apr 2021 19:50:33 +0700
Subject: [PATCH 129/713] Move AST rendering tests to common

---
 .../kmath/ast/rendering/TestFeatures.kt       | 100 ++++++++++++++++++
 .../kscisnce/kmath/ast/rendering/TestLatex.kt |  73 +++++++++++++
 .../kmath/ast/rendering/TestMathML.kt         |  92 ++++++++++++++++
 .../kmath/ast/rendering/TestStages.kt         |  33 ++++++
 .../kscisnce/kmath/ast/rendering/TestUtils.kt |  46 ++++++++
 5 files changed, 344 insertions(+)
 create mode 100644 kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestFeatures.kt
 create mode 100644 kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestLatex.kt
 create mode 100644 kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestMathML.kt
 create mode 100644 kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestStages.kt
 create mode 100644 kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestUtils.kt

diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestFeatures.kt b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestFeatures.kt
new file mode 100644
index 000000000..1584293ce
--- /dev/null
+++ b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestFeatures.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast.rendering
+
+import space.kscience.kmath.ast.rendering.TestUtils.testLatex
+import space.kscience.kmath.expressions.MST.Numeric
+import kotlin.test.Test
+
+internal class TestFeatures {
+    @Test
+    fun printSymbolic() = testLatex("x", "x")
+
+    @Test
+    fun printNumeric() {
+        val num = object : Number() {
+            override fun toByte(): Byte = throw UnsupportedOperationException()
+            override fun toChar(): Char = throw UnsupportedOperationException()
+            override fun toDouble(): Double = throw UnsupportedOperationException()
+            override fun toFloat(): Float = throw UnsupportedOperationException()
+            override fun toInt(): Int = throw UnsupportedOperationException()
+            override fun toLong(): Long = throw UnsupportedOperationException()
+            override fun toShort(): Short = throw UnsupportedOperationException()
+            override fun toString(): String = "foo"
+        }
+
+        testLatex(Numeric(num), "foo")
+    }
+
+    @Test
+    fun prettyPrintFloats() {
+        testLatex(Numeric(Double.NaN), "NaN")
+        testLatex(Numeric(Double.POSITIVE_INFINITY), "\\infty")
+        testLatex(Numeric(Double.NEGATIVE_INFINITY), "-\\infty")
+        testLatex(Numeric(1.0), "1")
+        testLatex(Numeric(-1.0), "-1")
+        testLatex(Numeric(1.42), "1.42")
+        testLatex(Numeric(-1.42), "-1.42")
+        testLatex(Numeric(1.1e10), "1.1\\times10^{10}")
+        testLatex(Numeric(1.1e-10), "1.1\\times10^{-10}")
+        testLatex(Numeric(-1.1e-10), "-1.1\\times10^{-10}")
+        testLatex(Numeric(-1.1e10), "-1.1\\times10^{10}")
+    }
+
+    @Test
+    fun prettyPrintIntegers() {
+        testLatex(Numeric(42), "42")
+        testLatex(Numeric(-42), "-42")
+    }
+
+    @Test
+    fun prettyPrintPi() {
+        testLatex("pi", "\\pi")
+    }
+
+    @Test
+    fun binaryPlus() = testLatex("2+2", "2+2")
+
+    @Test
+    fun binaryMinus() = testLatex("2-2", "2-2")
+
+    @Test
+    fun fraction() = testLatex("2/2", "\\frac{2}{2}")
+
+    @Test
+    fun binaryOperator() = testLatex("f(x, y)", "\\operatorname{f}\\left(x,y\\right)")
+
+    @Test
+    fun unaryOperator() = testLatex("f(x)", "\\operatorname{f}\\,\\left(x\\right)")
+
+    @Test
+    fun power() = testLatex("x^y", "x^{y}")
+
+    @Test
+    fun squareRoot() = testLatex("sqrt(x)", "\\sqrt{x}")
+
+    @Test
+    fun exponential() = testLatex("exp(x)", "e^{x}")
+
+    @Test
+    fun multiplication() = testLatex("x*1", "x\\times1")
+
+    @Test
+    fun inverseTrigonometry() {
+        testLatex("asin(x)", "\\operatorname{sin}^{-1}\\,\\left(x\\right)")
+        testLatex("asinh(x)", "\\operatorname{sinh}^{-1}\\,\\left(x\\right)")
+        testLatex("acos(x)", "\\operatorname{cos}^{-1}\\,\\left(x\\right)")
+        testLatex("acosh(x)", "\\operatorname{cosh}^{-1}\\,\\left(x\\right)")
+        testLatex("atan(x)", "\\operatorname{tan}^{-1}\\,\\left(x\\right)")
+        testLatex("atanh(x)", "\\operatorname{tanh}^{-1}\\,\\left(x\\right)")
+    }
+
+//    @Test
+//    fun unaryPlus() {
+//        testLatex("+1", "+1")
+//        testLatex("+1", "++1")
+//    }
+}
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestLatex.kt b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestLatex.kt
new file mode 100644
index 000000000..6322df25d
--- /dev/null
+++ b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestLatex.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast.rendering
+
+import space.kscience.kmath.ast.rendering.TestUtils.testLatex
+import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.operations.GroupOperations
+import kotlin.test.Test
+
+internal class TestLatex {
+    @Test
+    fun number() = testLatex("42", "42")
+
+    @Test
+    fun symbol() = testLatex("x", "x")
+
+    @Test
+    fun operatorName() = testLatex("sin(1)", "\\operatorname{sin}\\,\\left(1\\right)")
+
+    @Test
+    fun specialSymbol() {
+        testLatex(MST.Numeric(Double.POSITIVE_INFINITY), "\\infty")
+        testLatex("pi", "\\pi")
+    }
+
+    @Test
+    fun operand() {
+        testLatex("sin(1)", "\\operatorname{sin}\\,\\left(1\\right)")
+        testLatex("1+1", "1+1")
+    }
+
+    @Test
+    fun unaryOperator() = testLatex("sin(1)", "\\operatorname{sin}\\,\\left(1\\right)")
+
+    @Test
+    fun unaryPlus() = testLatex(MST.Unary(GroupOperations.PLUS_OPERATION, MST.Numeric(1)), "+1")
+
+    @Test
+    fun unaryMinus() = testLatex("-x", "-x")
+
+    @Test
+    fun radical() = testLatex("sqrt(x)", "\\sqrt{x}")
+
+    @Test
+    fun superscript() = testLatex("x^y", "x^{y}")
+
+    @Test
+    fun subscript() = testLatex(SubscriptSyntax("", SymbolSyntax("x"), NumberSyntax("123")), "x_{123}")
+
+    @Test
+    fun binaryOperator() = testLatex("f(x, y)", "\\operatorname{f}\\left(x,y\\right)")
+
+    @Test
+    fun binaryPlus() = testLatex("x+x", "x+x")
+
+    @Test
+    fun binaryMinus() = testLatex("x-x", "x-x")
+
+    @Test
+    fun fraction() = testLatex("x/x", "\\frac{x}{x}")
+
+    @Test
+    fun radicalWithIndex() = testLatex(RadicalWithIndexSyntax("", SymbolSyntax("x"), SymbolSyntax("y")), "\\sqrt[x]{y}")
+
+    @Test
+    fun multiplication() {
+        testLatex("x*1", "x\\times1")
+        testLatex("1*x", "1\\,x")
+    }
+}
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestMathML.kt b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestMathML.kt
new file mode 100644
index 000000000..2d7bfad19
--- /dev/null
+++ b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestMathML.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast.rendering
+
+import space.kscience.kmath.ast.rendering.TestUtils.testMathML
+import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.operations.GroupOperations
+import kotlin.test.Test
+
+internal class TestMathML {
+    @Test
+    fun number() = testMathML("42", "<mn>42</mn>")
+
+    @Test
+    fun symbol() = testMathML("x", "<mi>x</mi>")
+
+    @Test
+    fun operatorName() = testMathML(
+        "sin(1)",
+        "<mo>sin</mo><mspace width=\"0.167em\"></mspace><mfenced open=\"(\" close=\")\" separators=\"\"><mn>1</mn></mfenced>",
+    )
+
+    @Test
+    fun specialSymbol() {
+        testMathML(MST.Numeric(Double.POSITIVE_INFINITY), "<mo>&infin;</mo>")
+        testMathML("pi", "<mo>&pi;</mo>")
+    }
+
+    @Test
+    fun operand() {
+        testMathML(
+            "sin(1)",
+            "<mo>sin</mo><mspace width=\"0.167em\"></mspace><mfenced open=\"(\" close=\")\" separators=\"\"><mn>1</mn></mfenced>",
+        )
+
+        testMathML("1+1", "<mn>1</mn><mo>+</mo><mn>1</mn>")
+    }
+
+    @Test
+    fun unaryOperator() = testMathML(
+        "sin(1)",
+        "<mo>sin</mo><mspace width=\"0.167em\"></mspace><mfenced open=\"(\" close=\")\" separators=\"\"><mn>1</mn></mfenced>",
+    )
+
+    @Test
+    fun unaryPlus() =
+        testMathML(MST.Unary(GroupOperations.PLUS_OPERATION, MST.Numeric(1)), "<mo>+</mo><mn>1</mn>")
+
+    @Test
+    fun unaryMinus() = testMathML("-x", "<mo>-</mo><mi>x</mi>")
+
+    @Test
+    fun radical() = testMathML("sqrt(x)", "<msqrt><mi>x</mi></msqrt>")
+
+    @Test
+    fun superscript() = testMathML("x^y", "<msup><mrow><mi>x</mi></mrow><mrow><mi>y</mi></mrow></msup>")
+
+    @Test
+    fun subscript() = testMathML(
+        SubscriptSyntax("", SymbolSyntax("x"), NumberSyntax("123")),
+        "<msub><mrow><mi>x</mi></mrow><mrow><mn>123</mn></mrow></msub>",
+    )
+
+    @Test
+    fun binaryOperator() = testMathML(
+        "f(x, y)",
+        "<mo>f</mo><mfenced open=\"(\" close=\")\" separators=\"\"><mi>x</mi><mo>,</mo><mi>y</mi></mfenced>",
+    )
+
+    @Test
+    fun binaryPlus() = testMathML("x+x", "<mi>x</mi><mo>+</mo><mi>x</mi>")
+
+    @Test
+    fun binaryMinus() = testMathML("x-x", "<mi>x</mi><mo>-</mo><mi>x</mi>")
+
+    @Test
+    fun fraction() = testMathML("x/x", "<mfrac><mrow><mi>x</mi></mrow><mrow><mi>x</mi></mrow></mfrac>")
+
+    @Test
+    fun radicalWithIndex() =
+        testMathML(RadicalWithIndexSyntax("", SymbolSyntax("x"), SymbolSyntax("y")),
+            "<mroot><mrow><mi>y</mi></mrow><mrow><mi>x</mi></mrow></mroot>")
+
+    @Test
+    fun multiplication() {
+        testMathML("x*1", "<mi>x</mi><mo>&times;</mo><mn>1</mn>")
+        testMathML("1*x", "<mn>1</mn><mspace width=\"0.167em\"></mspace><mi>x</mi>")
+    }
+}
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestStages.kt b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestStages.kt
new file mode 100644
index 000000000..a4017fdb4
--- /dev/null
+++ b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestStages.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast.rendering
+
+import space.kscience.kmath.ast.rendering.TestUtils.testLatex
+import kotlin.test.Test
+
+internal class TestStages {
+    @Test
+    fun betterMultiplication() {
+        testLatex("a*1", "a\\times1")
+        testLatex("1*(2/3)", "1\\times\\left(\\frac{2}{3}\\right)")
+        testLatex("1*1", "1\\times1")
+        testLatex("2e10", "2\\times10^{10}")
+        testLatex("2*x", "2\\,x")
+        testLatex("2*(x+1)", "2\\,\\left(x+1\\right)")
+        testLatex("x*y", "x\\,y")
+    }
+
+    @Test
+    fun parentheses() {
+        testLatex("(x+1)", "x+1")
+        testLatex("x*x*x", "x\\,x\\,x")
+        testLatex("(x+x)*x", "\\left(x+x\\right)\\,x")
+        testLatex("x+x*x", "x+x\\,x")
+        testLatex("x+x^x*x+x", "x+x^{x}\\,x+x")
+        testLatex("(x+x)^x+x*x", "\\left(x+x\\right)^{x}+x\\,x")
+        testLatex("x^(x+x)", "x^{x+x}")
+    }
+}
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestUtils.kt b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestUtils.kt
new file mode 100644
index 000000000..7c9400532
--- /dev/null
+++ b/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestUtils.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast.rendering
+
+import space.kscience.kmath.ast.parseMath
+import space.kscience.kmath.expressions.MST
+import kotlin.test.assertEquals
+
+internal object TestUtils {
+    private fun mathSyntax(mst: MST) = FeaturedMathRendererWithPostProcess.Default.render(mst)
+    private fun latex(mst: MST) = LatexSyntaxRenderer.renderWithStringBuilder(mathSyntax(mst))
+    private fun mathML(mst: MST) = MathMLSyntaxRenderer.renderWithStringBuilder(mathSyntax(mst))
+
+    internal fun testLatex(mst: MST, expectedLatex: String) = assertEquals(
+        expected = expectedLatex,
+        actual = latex(mst),
+    )
+
+    internal fun testLatex(expression: String, expectedLatex: String) = assertEquals(
+        expected = expectedLatex,
+        actual = latex(expression.parseMath()),
+    )
+
+    internal fun testLatex(expression: MathSyntax, expectedLatex: String) = assertEquals(
+        expected = expectedLatex,
+        actual = LatexSyntaxRenderer.renderWithStringBuilder(expression),
+    )
+
+    internal fun testMathML(mst: MST, expectedMathML: String) = assertEquals(
+        expected = "<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mrow>$expectedMathML</mrow></math>",
+        actual = mathML(mst),
+    )
+
+    internal fun testMathML(expression: String, expectedMathML: String) = assertEquals(
+        expected = "<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mrow>$expectedMathML</mrow></math>",
+        actual = mathML(expression.parseMath()),
+    )
+
+    internal fun testMathML(expression: MathSyntax, expectedMathML: String) = assertEquals(
+        expected = "<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mrow>$expectedMathML</mrow></math>",
+        actual = MathMLSyntaxRenderer.renderWithStringBuilder(expression),
+    )
+}
-- 
2.34.1


From 488f5f00087ba45ea137a1ee527468cf4dd40dbc Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Thu, 8 Apr 2021 00:52:27 +0700
Subject: [PATCH 130/713] Redesign exponential function rendering

---
 .../ast/rendering/LatexSyntaxRenderer.kt      |   9 +
 .../ast/rendering/MathMLSyntaxRenderer.kt     |  13 +
 .../kmath/ast/rendering/MathRenderer.kt       |   3 +-
 .../kmath/ast/rendering/MathSyntax.kt         |  18 ++
 .../kscience/kmath/ast/rendering/features.kt  |  24 +-
 .../ast/rendering/multiplatformToString.kt    |   9 +
 .../kscience/kmath/ast/rendering/stages.kt    | 293 ++++++++++--------
 .../kmath/ast/ParserPrecedenceTest.kt         |   2 +-
 .../kmath/ast/ParserTest.kt                   |   3 +-
 .../kmath/ast/rendering/TestFeatures.kt       |  16 +
 .../kmath/ast/rendering/TestLatex.kt          |   0
 .../kmath/ast/rendering/TestMathML.kt         |   0
 .../kmath/ast/rendering/TestStages.kt         |   7 +
 .../kmath/ast/rendering/TestUtils.kt          |   0
 .../ast/rendering/multiplatformToString.kt    |  18 ++
 .../ast/rendering/multiplatformToString.kt    |   9 +
 16 files changed, 283 insertions(+), 141 deletions(-)
 create mode 100644 kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
 rename kmath-ast/src/commonTest/kotlin/space/{kscisnce => kscience}/kmath/ast/ParserPrecedenceTest.kt (97%)
 rename kmath-ast/src/commonTest/kotlin/space/{kscisnce => kscience}/kmath/ast/ParserTest.kt (95%)
 rename kmath-ast/src/commonTest/kotlin/space/{kscisnce => kscience}/kmath/ast/rendering/TestFeatures.kt (81%)
 rename kmath-ast/src/commonTest/kotlin/space/{kscisnce => kscience}/kmath/ast/rendering/TestLatex.kt (100%)
 rename kmath-ast/src/commonTest/kotlin/space/{kscisnce => kscience}/kmath/ast/rendering/TestMathML.kt (100%)
 rename kmath-ast/src/commonTest/kotlin/space/{kscisnce => kscience}/kmath/ast/rendering/TestStages.kt (81%)
 rename kmath-ast/src/commonTest/kotlin/space/{kscisnce => kscience}/kmath/ast/rendering/TestUtils.kt (100%)
 create mode 100644 kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
 create mode 100644 kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt

diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
index 34230f3c8..1c82bd6e7 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
@@ -71,6 +71,15 @@ public object LatexSyntaxRenderer : SyntaxRenderer {
                 append('}')
             }
 
+            is ExponentSyntax -> if (node.useOperatorForm) {
+                append("\\operatorname{exp}\\,")
+                render(node.operand)
+            } else {
+                append("e^{")
+                render(node.operand)
+                append('}')
+            }
+
             is SuperscriptSyntax -> {
                 render(node.left)
                 append("^{")
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
index f7487a356..decd4ba46 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
@@ -82,6 +82,19 @@ public object MathMLSyntaxRenderer : SyntaxRenderer {
 
             is RadicalSyntax -> tag("msqrt") { render(node.operand) }
 
+            is ExponentSyntax -> if (node.useOperatorForm) {
+                tag("mo") { append("exp") }
+                tag("mspace", "width" to "0.167em")
+                render(node.operand)
+            } else {
+                tag("msup") {
+                    tag("mrow") {
+                        tag("mi") { append("e") }
+                    }
+                    tag("mrow") { render(node.operand) }
+                }
+            }
+
             is SuperscriptSyntax -> tag("msup") {
                 tag("mrow") { render(node.left) }
                 tag("mrow") { render(node.right) }
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
index 891e8f05b..9df2c54dd 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
@@ -83,7 +83,7 @@ public open class FeaturedMathRendererWithPostProcess(
                 Fraction.Default,
                 Power.Default,
                 SquareRoot.Default,
-                Exponential.Default,
+                Exponent.Default,
                 InverseTrigonometricOperations.Default,
 
                 // Fallback option for unknown operations - printing them as operator
@@ -100,6 +100,7 @@ public open class FeaturedMathRendererWithPostProcess(
                 PrintSymbolic,
             ),
             listOf(
+                BetterExponent,
                 SimplifyParentheses.Default,
                 BetterMultiplication,
             ),
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
index 069e56c71..6a46bf535 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
@@ -189,6 +189,24 @@ public data class RadicalSyntax(
     }
 }
 
+/**
+ * Represents exponential function.
+ *
+ * @property operand The argument of function.
+ * @property useOperatorForm `true` if operator form is used (*exp (x)*), `false` if exponentiation form is used
+ * (*e<sup>x</sup>*).
+ * @author Iaroslav Postovalov
+ */
+public data class ExponentSyntax(
+    public override val operation: String,
+    public override val operand: OperandSyntax,
+    public var useOperatorForm: Boolean,
+) : UnarySyntax() {
+    init {
+        operand.parent = this
+    }
+}
+
 /**
  * Represents a syntax node with superscript (usually, for exponentiation).
  *
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index 5d6c7bb0a..c09282bb6 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -56,10 +56,14 @@ private fun printSignedNumberString(s: String): MathSyntax {
 public class PrettyPrintFloats(public val types: Set<KClass<out Number>>) : RenderFeature {
     public override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? {
         if (node !is MST.Numeric || node.value::class !in types) return null
-        val toString = node.value.toString().removeSuffix(".0")
+        val toString = when (val v = node.value) {
+            is Float -> v.multiplatformToString()
+            is Double -> v.multiplatformToString()
+            else -> v.toString()
+        }.removeSuffix(".0")
 
-        if ('E' in toString) {
-            val (beforeE, afterE) = toString.split('E')
+        if (toString.contains('E', ignoreCase = true)) {
+            val (beforeE, afterE) = toString.split('E', ignoreCase = true)
             val significand = beforeE.toDouble().toString().removeSuffix(".0")
             val exponent = afterE.toDouble().toString().removeSuffix(".0")
 
@@ -108,9 +112,7 @@ public class PrettyPrintFloats(public val types: Set<KClass<out Number>>) : Rend
  */
 public class PrettyPrintIntegers(public val types: Set<KClass<out Number>>) : RenderFeature {
     public override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? {
-        if (node !is MST.Numeric || node.value::class !in types)
-            return null
-
+        if (node !is MST.Numeric || node.value::class !in types) return null
         return printSignedNumberString(node.value.toString())
     }
 
@@ -282,15 +284,15 @@ public class SquareRoot(operations: Collection<String>?) : Unary(operations) {
     }
 }
 
-public class Exponential(operations: Collection<String>?) : Unary(operations) {
-    public override fun render0(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = SuperscriptSyntax(
+public class Exponent(operations: Collection<String>?) : Unary(operations) {
+    public override fun render0(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = ExponentSyntax(
         operation = node.operation,
-        left = SymbolSyntax(string = "e"),
-        right = parent.render(node.value),
+        operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
+        useOperatorForm = true,
     )
 
     public companion object {
-        public val Default: Exponential = Exponential(setOf(ExponentialOperations.EXP_OPERATION))
+        public val Default: Exponent = Exponent(setOf(ExponentialOperations.EXP_OPERATION))
     }
 }
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
new file mode 100644
index 000000000..291399cee
--- /dev/null
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast.rendering
+
+internal expect fun Double.multiplatformToString(): String
+internal expect fun Float.multiplatformToString(): String
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt
index 0ebb41b28..a08f089f1 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt
@@ -16,69 +16,110 @@ import space.kscience.kmath.operations.RingOperations
  * @author Iaroslav Postovalov
  */
 public object BetterMultiplication : FeaturedMathRendererWithPostProcess.PostProcessStage {
-    public override fun perform(node: MathSyntax) {
-        when (node) {
-            is NumberSyntax -> Unit
-            is SymbolSyntax -> Unit
-            is OperatorNameSyntax -> Unit
-            is SpecialSymbolSyntax -> Unit
-            is OperandSyntax -> perform(node.operand)
+    public override fun perform(node: MathSyntax): Unit = when (node) {
+        is NumberSyntax -> Unit
+        is SymbolSyntax -> Unit
+        is OperatorNameSyntax -> Unit
+        is SpecialSymbolSyntax -> Unit
+        is OperandSyntax -> perform(node.operand)
 
-            is UnaryOperatorSyntax -> {
-                perform(node.prefix)
-                perform(node.operand)
-            }
-
-            is UnaryPlusSyntax -> perform(node.operand)
-            is UnaryMinusSyntax -> perform(node.operand)
-            is RadicalSyntax -> perform(node.operand)
-
-            is SuperscriptSyntax -> {
-                perform(node.left)
-                perform(node.right)
-            }
-
-            is SubscriptSyntax -> {
-                perform(node.left)
-                perform(node.right)
-            }
-
-            is BinaryOperatorSyntax -> {
-                perform(node.prefix)
-                perform(node.left)
-                perform(node.right)
-            }
-
-            is BinaryPlusSyntax -> {
-                perform(node.left)
-                perform(node.right)
-            }
-
-            is BinaryMinusSyntax -> {
-                perform(node.left)
-                perform(node.right)
-            }
-
-            is FractionSyntax -> {
-                perform(node.left)
-                perform(node.right)
-            }
-
-            is RadicalWithIndexSyntax -> {
-                perform(node.left)
-                perform(node.right)
-            }
-
-            is MultiplicationSyntax -> {
-                node.times = node.right.operand is NumberSyntax && !node.right.parentheses
-                        || node.left.operand is NumberSyntax && node.right.operand is FractionSyntax
-                        || node.left.operand is NumberSyntax && node.right.operand is NumberSyntax
-                        || node.left.operand is NumberSyntax && node.right.operand is SuperscriptSyntax && node.right.operand.left is NumberSyntax
-
-                perform(node.left)
-                perform(node.right)
-            }
+        is UnaryOperatorSyntax -> {
+            perform(node.prefix)
+            perform(node.operand)
         }
+
+        is UnaryPlusSyntax -> perform(node.operand)
+        is UnaryMinusSyntax -> perform(node.operand)
+        is RadicalSyntax -> perform(node.operand)
+        is ExponentSyntax -> perform(node.operand)
+
+        is SuperscriptSyntax -> {
+            perform(node.left)
+            perform(node.right)
+        }
+
+        is SubscriptSyntax -> {
+            perform(node.left)
+            perform(node.right)
+        }
+
+        is BinaryOperatorSyntax -> {
+            perform(node.prefix)
+            perform(node.left)
+            perform(node.right)
+        }
+
+        is BinaryPlusSyntax -> {
+            perform(node.left)
+            perform(node.right)
+        }
+
+        is BinaryMinusSyntax -> {
+            perform(node.left)
+            perform(node.right)
+        }
+
+        is FractionSyntax -> {
+            perform(node.left)
+            perform(node.right)
+        }
+
+        is RadicalWithIndexSyntax -> {
+            perform(node.left)
+            perform(node.right)
+        }
+
+        is MultiplicationSyntax -> {
+            node.times = node.right.operand is NumberSyntax && !node.right.parentheses
+                    || node.left.operand is NumberSyntax && node.right.operand is FractionSyntax
+                    || node.left.operand is NumberSyntax && node.right.operand is NumberSyntax
+                    || node.left.operand is NumberSyntax && node.right.operand is SuperscriptSyntax && node.right.operand.left is NumberSyntax
+
+            perform(node.left)
+            perform(node.right)
+        }
+    }
+}
+
+
+/**
+ * Applies [ExponentSyntax.useOperatorForm] to [ExponentSyntax] when the operand contains a fraction, a
+ * superscript or a subscript to improve readability.
+ *
+ * @author Iaroslav Postovalov
+ */
+public object BetterExponent : FeaturedMathRendererWithPostProcess.PostProcessStage {
+    private fun perform0(node: MathSyntax): Boolean {
+        return when (node) {
+            is NumberSyntax -> false
+            is SymbolSyntax -> false
+            is OperatorNameSyntax -> false
+            is SpecialSymbolSyntax -> false
+            is OperandSyntax -> perform0(node.operand)
+            is UnaryOperatorSyntax -> perform0(node.prefix) || perform0(node.operand)
+            is UnaryPlusSyntax -> perform0(node.operand)
+            is UnaryMinusSyntax -> perform0(node.operand)
+            is RadicalSyntax -> perform0(node.operand)
+
+            is ExponentSyntax -> {
+                val r = perform0(node.operand)
+                node.useOperatorForm = r
+                r
+            }
+
+            is SuperscriptSyntax -> true
+            is SubscriptSyntax -> true
+            is BinaryOperatorSyntax -> perform0(node.prefix) || perform0(node.left) || perform0(node.right)
+            is BinaryPlusSyntax -> perform0(node.left) || perform0(node.right)
+            is BinaryMinusSyntax -> perform0(node.left) || perform0(node.right)
+            is FractionSyntax -> true
+            is RadicalWithIndexSyntax -> perform0(node.left) || perform0(node.right)
+            is MultiplicationSyntax -> perform0(node.left) || perform0(node.right)
+        }
+    }
+
+    public override fun perform(node: MathSyntax) {
+        perform0(node)
     }
 }
 
@@ -90,89 +131,89 @@ public object BetterMultiplication : FeaturedMathRendererWithPostProcess.PostPro
  */
 public class SimplifyParentheses(public val precedenceFunction: (MathSyntax) -> Int) :
     FeaturedMathRendererWithPostProcess.PostProcessStage {
-    public override fun perform(node: MathSyntax) {
-        when (node) {
-            is NumberSyntax -> Unit
-            is SymbolSyntax -> Unit
-            is OperatorNameSyntax -> Unit
-            is SpecialSymbolSyntax -> Unit
+    public override fun perform(node: MathSyntax): Unit = when (node) {
+        is NumberSyntax -> Unit
+        is SymbolSyntax -> Unit
+        is OperatorNameSyntax -> Unit
+        is SpecialSymbolSyntax -> Unit
 
-            is OperandSyntax -> {
-                val isRightOfSuperscript =
-                    (node.parent is SuperscriptSyntax) && (node.parent as SuperscriptSyntax).right === node
+        is OperandSyntax -> {
+            val isRightOfSuperscript =
+                (node.parent is SuperscriptSyntax) && (node.parent as SuperscriptSyntax).right === node
 
-                val precedence = precedenceFunction(node.operand)
+            val precedence = precedenceFunction(node.operand)
 
-                val needParenthesesByPrecedence = when (val parent = node.parent) {
-                    null -> false
+            val needParenthesesByPrecedence = when (val parent = node.parent) {
+                null -> false
 
-                    is BinarySyntax -> {
-                        val parentPrecedence = precedenceFunction(parent)
+                is BinarySyntax -> {
+                    val parentPrecedence = precedenceFunction(parent)
 
-                        parentPrecedence < precedence ||
-                                parentPrecedence == precedence && parentPrecedence != 0 && node === parent.right
-                    }
-
-                    else -> precedence > precedenceFunction(parent)
+                    parentPrecedence < precedence ||
+                            parentPrecedence == precedence && parentPrecedence != 0 && node === parent.right
                 }
 
-                node.parentheses = !isRightOfSuperscript
-                        && (needParenthesesByPrecedence || node.parent is UnaryOperatorSyntax)
-
-                perform(node.operand)
+                else -> precedence > precedenceFunction(parent)
             }
 
-            is UnaryOperatorSyntax -> {
-                perform(node.prefix)
-                perform(node.operand)
-            }
+            val isInsideExpOperator =
+                node.parent is ExponentSyntax && (node.parent as ExponentSyntax).useOperatorForm
 
-            is UnaryPlusSyntax -> perform(node.operand)
-            is UnaryMinusSyntax -> {
-                perform(node.operand)
-            }
-            is RadicalSyntax -> perform(node.operand)
+            node.parentheses = !isRightOfSuperscript
+                    && (needParenthesesByPrecedence || node.parent is UnaryOperatorSyntax || isInsideExpOperator)
 
-            is SuperscriptSyntax -> {
-                perform(node.left)
-                perform(node.right)
-            }
+            perform(node.operand)
+        }
 
-            is SubscriptSyntax -> {
-                perform(node.left)
-                perform(node.right)
-            }
+        is UnaryOperatorSyntax -> {
+            perform(node.prefix)
+            perform(node.operand)
+        }
 
-            is BinaryOperatorSyntax -> {
-                perform(node.prefix)
-                perform(node.left)
-                perform(node.right)
-            }
+        is UnaryPlusSyntax -> perform(node.operand)
+        is UnaryMinusSyntax -> perform(node.operand)
+        is RadicalSyntax -> perform(node.operand)
+        is ExponentSyntax -> perform(node.operand)
 
-            is BinaryPlusSyntax -> {
-                perform(node.left)
-                perform(node.right)
-            }
+        is SuperscriptSyntax -> {
+            perform(node.left)
+            perform(node.right)
+        }
 
-            is BinaryMinusSyntax -> {
-                perform(node.left)
-                perform(node.right)
-            }
+        is SubscriptSyntax -> {
+            perform(node.left)
+            perform(node.right)
+        }
 
-            is FractionSyntax -> {
-                perform(node.left)
-                perform(node.right)
-            }
+        is BinaryOperatorSyntax -> {
+            perform(node.prefix)
+            perform(node.left)
+            perform(node.right)
+        }
 
-            is MultiplicationSyntax -> {
-                perform(node.left)
-                perform(node.right)
-            }
+        is BinaryPlusSyntax -> {
+            perform(node.left)
+            perform(node.right)
+        }
 
-            is RadicalWithIndexSyntax -> {
-                perform(node.left)
-                perform(node.right)
-            }
+        is BinaryMinusSyntax -> {
+            perform(node.left)
+            perform(node.right)
+        }
+
+        is FractionSyntax -> {
+            perform(node.left)
+            perform(node.right)
+        }
+
+        is MultiplicationSyntax -> {
+            perform(node.left)
+            perform(node.right)
+        }
+
+        is RadicalWithIndexSyntax -> {
+            perform(node.left)
+            perform(node.right)
         }
     }
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserPrecedenceTest.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserPrecedenceTest.kt
similarity index 97%
rename from kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserPrecedenceTest.kt
rename to kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserPrecedenceTest.kt
index 14ceefc30..ca3a95bc8 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserPrecedenceTest.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserPrecedenceTest.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscisnce.kmath.ast
+package space.kscience.kmath.ast
 
 import space.kscience.kmath.ast.parseMath
 import space.kscience.kmath.expressions.evaluate
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserTest.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserTest.kt
similarity index 95%
rename from kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserTest.kt
rename to kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserTest.kt
index a0dcba9c0..185659a1f 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/ParserTest.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserTest.kt
@@ -3,9 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscisnce.kmath.ast
+package space.kscience.kmath.ast
 
-import space.kscience.kmath.ast.parseMath
 import space.kscience.kmath.complex.Complex
 import space.kscience.kmath.complex.ComplexField
 import space.kscience.kmath.expressions.evaluate
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestFeatures.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
similarity index 81%
rename from kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestFeatures.kt
rename to kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
index 1584293ce..1ab20ed85 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestFeatures.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
@@ -42,6 +42,22 @@ internal class TestFeatures {
         testLatex(Numeric(1.1e-10), "1.1\\times10^{-10}")
         testLatex(Numeric(-1.1e-10), "-1.1\\times10^{-10}")
         testLatex(Numeric(-1.1e10), "-1.1\\times10^{10}")
+        testLatex(Numeric(0.001), "0.001")
+        testLatex(Numeric(0.0000001), "1\\times10^{-7}")
+
+        testLatex(Numeric(Float.NaN), "NaN")
+        testLatex(Numeric(Float.POSITIVE_INFINITY), "\\infty")
+        testLatex(Numeric(Float.NEGATIVE_INFINITY), "-\\infty")
+        testLatex(Numeric(1.0f), "1")
+        testLatex(Numeric(-1.0f), "-1")
+        testLatex(Numeric(1.42f), "1.42")
+        testLatex(Numeric(-1.42f), "-1.42")
+        testLatex(Numeric(1e10f), "1\\times10^{10}")
+        testLatex(Numeric(1e-10f), "1\\times10^{-10}")
+        testLatex(Numeric(-1e-10f), "-1\\times10^{-10}")
+        testLatex(Numeric(-1e10f), "-1\\times10^{10}")
+        testLatex(Numeric(0.001f), "0.001")
+        testLatex(Numeric(0.0000001f), "1\\times10^{-7}")
     }
 
     @Test
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestLatex.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
similarity index 100%
rename from kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestLatex.kt
rename to kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestMathML.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
similarity index 100%
rename from kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestMathML.kt
rename to kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestStages.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
similarity index 81%
rename from kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestStages.kt
rename to kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
index a4017fdb4..599e43eb2 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestStages.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
@@ -30,4 +30,11 @@ internal class TestStages {
         testLatex("(x+x)^x+x*x", "\\left(x+x\\right)^{x}+x\\,x")
         testLatex("x^(x+x)", "x^{x+x}")
     }
+
+    @Test
+    fun exponent() {
+        testLatex("exp(x)", "e^{x}")
+        testLatex("exp(x/2)", "\\operatorname{exp}\\,\\left(\\frac{x}{2}\\right)")
+        testLatex("exp(x^2)", "\\operatorname{exp}\\,\\left(x^{2}\\right)")
+    }
 }
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestUtils.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
similarity index 100%
rename from kmath-ast/src/commonTest/kotlin/space/kscisnce/kmath/ast/rendering/TestUtils.kt
rename to kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
new file mode 100644
index 000000000..521907d2c
--- /dev/null
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast.rendering
+
+internal actual fun Double.multiplatformToString(): String {
+    val d = this
+    if (d >= 1e7 || d <= -1e7) return js("d.toExponential()") as String
+    return toString()
+}
+
+internal actual fun Float.multiplatformToString(): String {
+    val d = this
+    if (d >= 1e7f || d <= -1e7f) return js("d.toExponential()") as String
+    return toString()
+}
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
new file mode 100644
index 000000000..556adbe7d
--- /dev/null
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast.rendering
+
+internal actual fun Double.multiplatformToString(): String = toString()
+internal actual fun Float.multiplatformToString(): String = toString()
-- 
2.34.1


From cc11df617489c6d3d8105b72cf5a472af1c90c01 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 21 Apr 2021 19:51:34 +0100
Subject: [PATCH 131/713] Casting receiver

---
 .../kmath/tensors/AnalyticTensorAlgebra.kt    |  38 +--
 .../kmath/tensors/LinearOpsTensorAlgebra.kt   |  21 +-
 .../kscience/kmath/tensors/TensorAlgebra.kt   |  50 ++--
 .../tensors/TensorPartialDivisionAlgebra.kt   |  12 +-
 .../core/BroadcastDoubleTensorAlgebra.kt      |  57 ++--
 .../kmath/tensors/core/BufferedTensor.kt      |  48 ++-
 .../core/DoubleAnalyticTensorAlgebra.kt       |  37 +--
 .../core/DoubleLinearOpsTensorAlgebra.kt      |  65 ++--
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 279 +++++++++---------
 .../kscience/kmath/tensors/core/checks.kt     |  41 +--
 .../kscience/kmath/tensors/core/linutils.kt   |   4 +-
 .../kscience/kmath/tensors/core/utils.kt      |   4 +-
 12 files changed, 326 insertions(+), 330 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
index fa1de81fa..2a8b228f4 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
@@ -1,58 +1,58 @@
 package space.kscience.kmath.tensors
 
 
-public interface AnalyticTensorAlgebra<T, TensorType : TensorStructure<T>> :
-    TensorPartialDivisionAlgebra<T, TensorType> {
+public interface AnalyticTensorAlgebra<T> :
+    TensorPartialDivisionAlgebra<T> {
 
     //https://pytorch.org/docs/stable/generated/torch.exp.html
-    public fun TensorType.exp(): TensorType
+    public fun TensorStructure<T>.exp(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.log.html
-    public fun TensorType.log(): TensorType
+    public fun TensorStructure<T>.log(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.sqrt.html
-    public fun TensorType.sqrt(): TensorType
+    public fun TensorStructure<T>.sqrt(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.acos.html#torch.cos
-    public fun TensorType.cos(): TensorType
+    public fun TensorStructure<T>.cos(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.acos.html#torch.acos
-    public fun TensorType.acos(): TensorType
+    public fun TensorStructure<T>.acos(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.cosh
-    public fun TensorType.cosh(): TensorType
+    public fun TensorStructure<T>.cosh(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.acosh
-    public fun TensorType.acosh(): TensorType
+    public fun TensorStructure<T>.acosh(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sin
-    public fun TensorType.sin(): TensorType
+    public fun TensorStructure<T>.sin(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asin
-    public fun TensorType.asin(): TensorType
+    public fun TensorStructure<T>.asin(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sinh
-    public fun TensorType.sinh(): TensorType
+    public fun TensorStructure<T>.sinh(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asinh
-    public fun TensorType.asinh(): TensorType
+    public fun TensorStructure<T>.asinh(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.atan.html#torch.tan
-    public fun TensorType.tan(): TensorType
+    public fun TensorStructure<T>.tan(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.atan.html#torch.atan
-    public fun TensorType.atan(): TensorType
+    public fun TensorStructure<T>.atan(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.tanh
-    public fun TensorType.tanh(): TensorType
+    public fun TensorStructure<T>.tanh(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.atanh
-    public fun TensorType.atanh(): TensorType
+    public fun TensorStructure<T>.atanh(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.ceil.html#torch.ceil
-    public fun TensorType.ceil(): TensorType
+    public fun TensorStructure<T>.ceil(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.floor.html#torch.floor
-    public fun TensorType.floor(): TensorType
+    public fun TensorStructure<T>.floor(): TensorStructure<T>
 
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
index 87c459f35..8ca8945a5 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
@@ -1,31 +1,32 @@
 package space.kscience.kmath.tensors
 
 
-public interface LinearOpsTensorAlgebra<T, TensorType : TensorStructure<T>, IndexTensorType : TensorStructure<Int>> :
-    TensorPartialDivisionAlgebra<T, TensorType> {
+public interface LinearOpsTensorAlgebra<T> :
+    TensorPartialDivisionAlgebra<T> {
 
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.det
-    public fun TensorType.det(): TensorType
+    public fun TensorStructure<T>.det(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.inv
-    public fun TensorType.inv(): TensorType
+    public fun TensorStructure<T>.inv(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.cholesky
-    public fun TensorType.cholesky(): TensorType
+    public fun TensorStructure<T>.cholesky(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.qr
-    public fun TensorType.qr(): Pair<TensorType, TensorType>
+    public fun TensorStructure<T>.qr(): Pair<TensorStructure<T>, TensorStructure<T>>
 
     //https://pytorch.org/docs/stable/generated/torch.lu.html
-    public fun TensorType.lu(): Pair<TensorType, IndexTensorType>
+    public fun TensorStructure<T>.lu(): Pair<TensorStructure<T>, TensorStructure<Int>>
 
     //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
-    public fun luPivot(luTensor: TensorType, pivotsTensor: IndexTensorType): Triple<TensorType, TensorType, TensorType>
+    public fun luPivot(luTensor: TensorStructure<T>, pivotsTensor: TensorStructure<Int>):
+            Triple<TensorStructure<T>, TensorStructure<T>, TensorStructure<T>>
 
     //https://pytorch.org/docs/stable/linalg.html#torch.linalg.svd
-    public fun TensorType.svd(): Triple<TensorType, TensorType, TensorType>
+    public fun TensorStructure<T>.svd(): Triple<TensorStructure<T>, TensorStructure<T>, TensorStructure<T>>
 
     //https://pytorch.org/docs/stable/generated/torch.symeig.html
-    public fun TensorType.symEig(): Pair<TensorType, TensorType>
+    public fun TensorStructure<T>.symEig(): Pair<TensorStructure<T>, TensorStructure<T>>
 
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
index 8fd1cf2ed..f64d49dd8 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
@@ -1,46 +1,46 @@
 package space.kscience.kmath.tensors
 
 // https://proofwiki.org/wiki/Definition:Algebra_over_Ring
-public interface TensorAlgebra<T, TensorType : TensorStructure<T>> {
+public interface TensorAlgebra<T> {
 
-    public fun TensorType.value(): T
+    public fun TensorStructure<T>.value(): T
 
-    public operator fun T.plus(other: TensorType): TensorType
-    public operator fun TensorType.plus(value: T): TensorType
-    public operator fun TensorType.plus(other: TensorType): TensorType
-    public operator fun TensorType.plusAssign(value: T): Unit
-    public operator fun TensorType.plusAssign(other: TensorType): Unit
+    public operator fun T.plus(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun TensorStructure<T>.plus(value: T): TensorStructure<T>
+    public operator fun TensorStructure<T>.plus(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun TensorStructure<T>.plusAssign(value: T): Unit
+    public operator fun TensorStructure<T>.plusAssign(other: TensorStructure<T>): Unit
 
-    public operator fun T.minus(other: TensorType): TensorType
-    public operator fun TensorType.minus(value: T): TensorType
-    public operator fun TensorType.minus(other: TensorType): TensorType
-    public operator fun TensorType.minusAssign(value: T): Unit
-    public operator fun TensorType.minusAssign(other: TensorType): Unit
+    public operator fun T.minus(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun TensorStructure<T>.minus(value: T): TensorStructure<T>
+    public operator fun TensorStructure<T>.minus(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun TensorStructure<T>.minusAssign(value: T): Unit
+    public operator fun TensorStructure<T>.minusAssign(other: TensorStructure<T>): Unit
 
-    public operator fun T.times(other: TensorType): TensorType
-    public operator fun TensorType.times(value: T): TensorType
-    public operator fun TensorType.times(other: TensorType): TensorType
-    public operator fun TensorType.timesAssign(value: T): Unit
-    public operator fun TensorType.timesAssign(other: TensorType): Unit
-    public operator fun TensorType.unaryMinus(): TensorType
+    public operator fun T.times(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun TensorStructure<T>.times(value: T): TensorStructure<T>
+    public operator fun TensorStructure<T>.times(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun TensorStructure<T>.timesAssign(value: T): Unit
+    public operator fun TensorStructure<T>.timesAssign(other: TensorStructure<T>): Unit
+    public operator fun TensorStructure<T>.unaryMinus(): TensorStructure<T>
 
     //https://pytorch.org/cppdocs/notes/tensor_indexing.html
-    public operator fun TensorType.get(i: Int): TensorType
+    public operator fun TensorStructure<T>.get(i: Int): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.transpose.html
-    public fun TensorType.transpose(i: Int = -2, j: Int = -1): TensorType
+    public fun TensorStructure<T>.transpose(i: Int = -2, j: Int = -1): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/tensor_view.html
-    public fun TensorType.view(shape: IntArray): TensorType
-    public fun TensorType.viewAs(other: TensorType): TensorType
+    public fun TensorStructure<T>.view(shape: IntArray): TensorStructure<T>
+    public fun TensorStructure<T>.viewAs(other: TensorStructure<T>): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.matmul.html
-    public infix fun TensorType.dot(other: TensorType): TensorType
+    public infix fun TensorStructure<T>.dot(other: TensorStructure<T>): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.diag_embed.html
     public fun diagonalEmbedding(
-        diagonalEntries: TensorType,
+        diagonalEntries: TensorStructure<T>,
         offset: Int = 0, dim1: Int = -2, dim2: Int = -1
-    ): TensorType
+    ): TensorStructure<T>
 
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
index 0b9079967..b37ac6b6e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
@@ -1,10 +1,10 @@
 package space.kscience.kmath.tensors
 
 // https://proofwiki.org/wiki/Definition:Division_Algebra
-public interface TensorPartialDivisionAlgebra<T, TensorType : TensorStructure<T>> :
-        TensorAlgebra<T, TensorType> {
-    public operator fun TensorType.div(value: T): TensorType
-    public operator fun TensorType.div(other: TensorType): TensorType
-    public operator fun TensorType.divAssign(value: T)
-    public operator fun TensorType.divAssign(other: TensorType)
+public interface TensorPartialDivisionAlgebra<T> :
+        TensorAlgebra<T> {
+    public operator fun TensorStructure<T>.div(value: T): TensorStructure<T>
+    public operator fun TensorStructure<T>.div(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun TensorStructure<T>.divAssign(value: T)
+    public operator fun TensorStructure<T>.divAssign(other: TensorStructure<T>)
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index f315f6b51..53c385197 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -1,11 +1,12 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.tensors.TensorStructure
 import kotlin.math.max
 
 public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
-    override fun DoubleTensor.plus(other: DoubleTensor): DoubleTensor {
-        val broadcast = broadcastTensors(this, other)
+    override fun TensorStructure<Double>.plus(other: TensorStructure<Double>): DoubleTensor {
+        val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
@@ -14,16 +15,16 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun DoubleTensor.plusAssign(other: DoubleTensor) {
-        val newOther = broadcastTo(other, this.shape)
-        for (i in 0 until this.linearStructure.size) {
-            this.buffer.array()[this.bufferStart + i] +=
-                newOther.buffer.array()[this.bufferStart + i]
+    override fun TensorStructure<Double>.plusAssign(other: TensorStructure<Double>) {
+        val newOther = broadcastTo(other.tensor, tensor.shape)
+        for (i in 0 until tensor.linearStructure.size) {
+            tensor.buffer.array()[tensor.bufferStart + i] +=
+                newOther.buffer.array()[tensor.bufferStart + i]
         }
     }
 
-    override fun DoubleTensor.minus(other: DoubleTensor): DoubleTensor {
-        val broadcast = broadcastTensors(this, other)
+    override fun TensorStructure<Double>.minus(other: TensorStructure<Double>): DoubleTensor {
+        val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
@@ -32,16 +33,16 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun DoubleTensor.minusAssign(other: DoubleTensor) {
-        val newOther = broadcastTo(other, this.shape)
-        for (i in 0 until this.linearStructure.size) {
-            this.buffer.array()[this.bufferStart + i] -=
-                newOther.buffer.array()[this.bufferStart + i]
+    override fun TensorStructure<Double>.minusAssign(other: TensorStructure<Double>) {
+        val newOther = broadcastTo(other.tensor, tensor.shape)
+        for (i in 0 until tensor.linearStructure.size) {
+            tensor.buffer.array()[tensor.bufferStart + i] -=
+                newOther.buffer.array()[tensor.bufferStart + i]
         }
     }
 
-    override fun DoubleTensor.times(other: DoubleTensor): DoubleTensor {
-        val broadcast = broadcastTensors(this, other)
+    override fun TensorStructure<Double>.times(other: TensorStructure<Double>): DoubleTensor {
+        val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
@@ -51,16 +52,16 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun DoubleTensor.timesAssign(other: DoubleTensor) {
-        val newOther = broadcastTo(other, this.shape)
-        for (i in 0 until this.linearStructure.size) {
-            this.buffer.array()[this.bufferStart + i] *=
-                newOther.buffer.array()[this.bufferStart + i]
+    override fun TensorStructure<Double>.timesAssign(other: TensorStructure<Double>) {
+        val newOther = broadcastTo(other.tensor, tensor.shape)
+        for (i in 0 until tensor.linearStructure.size) {
+            tensor.buffer.array()[tensor.bufferStart + i] *=
+                newOther.buffer.array()[tensor.bufferStart + i]
         }
     }
 
-    override fun DoubleTensor.div(other: DoubleTensor): DoubleTensor {
-        val broadcast = broadcastTensors(this, other)
+    override fun TensorStructure<Double>.div(other: TensorStructure<Double>): DoubleTensor {
+        val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
@@ -70,11 +71,11 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun DoubleTensor.divAssign(other: DoubleTensor) {
-        val newOther = broadcastTo(other, this.shape)
-        for (i in 0 until this.linearStructure.size) {
-            this.buffer.array()[this.bufferStart + i] /=
-                newOther.buffer.array()[this.bufferStart + i]
+    override fun TensorStructure<Double>.divAssign(other: TensorStructure<Double>) {
+        val newOther = broadcastTo(other.tensor, tensor.shape)
+        for (i in 0 until tensor.linearStructure.size) {
+            tensor.buffer.array()[tensor.bufferStart + i] /=
+                newOther.buffer.array()[tensor.bufferStart + i]
         }
     }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 9e393f1a8..2b61e10b2 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -6,13 +6,13 @@ import space.kscience.kmath.tensors.TensorStructure
 
 public open class BufferedTensor<T>(
     override val shape: IntArray,
-    public val buffer: MutableBuffer<T>,
+    internal val buffer: MutableBuffer<T>,
     internal val bufferStart: Int
 ) : TensorStructure<T> {
     public val linearStructure: TensorLinearStructure
         get() = TensorLinearStructure(shape)
 
-    public val numel: Int
+    public val numElements: Int
         get() = linearStructure.size
 
     override fun get(index: IntArray): T = buffer[bufferStart + linearStructure.offset(index)]
@@ -41,26 +41,6 @@ public class IntTensor internal constructor(
             this(bufferedTensor.shape, bufferedTensor.buffer.array(), bufferedTensor.bufferStart)
 }
 
-public class LongTensor internal constructor(
-    shape: IntArray,
-    buffer: LongArray,
-    offset: Int = 0
-) : BufferedTensor<Long>(shape, LongBuffer(buffer), offset)
-{
-    internal constructor(bufferedTensor: BufferedTensor<Long>):
-            this(bufferedTensor.shape, bufferedTensor.buffer.array(), bufferedTensor.bufferStart)
-}
-
-public class FloatTensor internal constructor(
-    shape: IntArray,
-    buffer: FloatArray,
-    offset: Int = 0
-) : BufferedTensor<Float>(shape, FloatBuffer(buffer), offset)
-{
-    internal constructor(bufferedTensor: BufferedTensor<Float>):
-            this(bufferedTensor.shape, bufferedTensor.buffer.array(), bufferedTensor.bufferStart)
-}
-
 public class DoubleTensor internal constructor(
     shape: IntArray,
     buffer: DoubleArray,
@@ -74,7 +54,23 @@ public class DoubleTensor internal constructor(
 
 }
 
-internal fun BufferedTensor<Int>.asTensor(): IntTensor = IntTensor(this)
-internal fun BufferedTensor<Long>.asTensor(): LongTensor = LongTensor(this)
-internal fun BufferedTensor<Float>.asTensor(): FloatTensor = FloatTensor(this)
-internal fun BufferedTensor<Double>.asTensor(): DoubleTensor = DoubleTensor(this)
+internal inline fun BufferedTensor<Int>.asTensor(): IntTensor = IntTensor(this)
+internal inline fun BufferedTensor<Double>.asTensor(): DoubleTensor = DoubleTensor(this)
+
+internal inline fun <T> TensorStructure<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
+    is BufferedTensor<T> -> this
+    else -> BufferedTensor(this.shape, this.elements().map{ it.second }.toMutableList().asMutableBuffer(), 0)
+}
+
+internal val TensorStructure<Double>.tensor: DoubleTensor
+    get() = when (this) {
+        is DoubleTensor -> this
+        else -> this.toBufferedTensor().asTensor()
+    }
+
+internal val TensorStructure<Int>.tensor: IntTensor
+    get() = when (this) {
+        is IntTensor -> this
+        else -> this.toBufferedTensor().asTensor()
+    }
+
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
index b46c7fa9c..233217f2f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
@@ -1,45 +1,46 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.tensors.AnalyticTensorAlgebra
+import space.kscience.kmath.tensors.TensorStructure
 import kotlin.math.*
 
 public class DoubleAnalyticTensorAlgebra:
-    AnalyticTensorAlgebra<Double, DoubleTensor>,
+    AnalyticTensorAlgebra<Double>,
         DoubleTensorAlgebra()
 {
-    override fun DoubleTensor.exp(): DoubleTensor = this.map(::exp)
+    override fun TensorStructure<Double>.exp(): DoubleTensor = tensor.map(::exp)
 
-    override fun DoubleTensor.log(): DoubleTensor = this.map(::ln)
+    override fun TensorStructure<Double>.log(): DoubleTensor = tensor.map(::ln)
 
-    override fun DoubleTensor.sqrt(): DoubleTensor = this.map(::sqrt)
+    override fun TensorStructure<Double>.sqrt(): DoubleTensor = tensor.map(::sqrt)
 
-    override fun DoubleTensor.cos(): DoubleTensor = this.map(::cos)
+    override fun TensorStructure<Double>.cos(): DoubleTensor = tensor.map(::cos)
 
-    override fun DoubleTensor.acos(): DoubleTensor = this.map(::acos)
+    override fun TensorStructure<Double>.acos(): DoubleTensor = tensor.map(::acos)
 
-    override fun DoubleTensor.cosh(): DoubleTensor = this.map(::cosh)
+    override fun TensorStructure<Double>.cosh(): DoubleTensor = tensor.map(::cosh)
 
-    override fun DoubleTensor.acosh(): DoubleTensor = this.map(::acosh)
+    override fun TensorStructure<Double>.acosh(): DoubleTensor = tensor.map(::acosh)
 
-    override fun DoubleTensor.sin(): DoubleTensor = this.map(::sin)
+    override fun TensorStructure<Double>.sin(): DoubleTensor = tensor.map(::sin)
 
-    override fun DoubleTensor.asin(): DoubleTensor = this.map(::asin)
+    override fun TensorStructure<Double>.asin(): DoubleTensor = tensor.map(::asin)
 
-    override fun DoubleTensor.sinh(): DoubleTensor = this.map(::sinh)
+    override fun TensorStructure<Double>.sinh(): DoubleTensor = tensor.map(::sinh)
 
-    override fun DoubleTensor.asinh(): DoubleTensor = this.map(::asinh)
+    override fun TensorStructure<Double>.asinh(): DoubleTensor = tensor.map(::asinh)
 
-    override fun DoubleTensor.tan(): DoubleTensor = this.map(::tan)
+    override fun TensorStructure<Double>.tan(): DoubleTensor = tensor.map(::tan)
 
-    override fun DoubleTensor.atan(): DoubleTensor = this.map(::atan)
+    override fun TensorStructure<Double>.atan(): DoubleTensor = tensor.map(::atan)
 
-    override fun DoubleTensor.tanh(): DoubleTensor = this.map(::tanh)
+    override fun TensorStructure<Double>.tanh(): DoubleTensor = tensor.map(::tanh)
 
-    override fun DoubleTensor.atanh(): DoubleTensor = this.map(::atanh)
+    override fun TensorStructure<Double>.atanh(): DoubleTensor = tensor.map(::atanh)
 
-    override fun DoubleTensor.ceil(): DoubleTensor = this.map(::ceil)
+    override fun TensorStructure<Double>.ceil(): DoubleTensor = tensor.map(::ceil)
 
-    override fun DoubleTensor.floor(): DoubleTensor = this.map(::floor)
+    override fun TensorStructure<Double>.floor(): DoubleTensor = tensor.map(::floor)
 
 }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
index e72948c84..386fc2a1b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
@@ -3,44 +3,45 @@ package space.kscience.kmath.tensors.core
 import space.kscience.kmath.tensors.LinearOpsTensorAlgebra
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.tensors.TensorStructure
 import kotlin.math.min
 
 
 public class DoubleLinearOpsTensorAlgebra :
-    LinearOpsTensorAlgebra<Double, DoubleTensor, IntTensor>,
+    LinearOpsTensorAlgebra<Double>,
     DoubleTensorAlgebra() {
 
-    override fun DoubleTensor.inv(): DoubleTensor = invLU(1e-9)
+    override fun TensorStructure<Double>.inv(): DoubleTensor = invLU(1e-9)
 
-    override fun DoubleTensor.det(): DoubleTensor = detLU(1e-9)
+    override fun TensorStructure<Double>.det(): DoubleTensor = detLU(1e-9)
 
-    public fun DoubleTensor.lu(epsilon: Double): Pair<DoubleTensor, IntTensor> =
-        computeLU(this, epsilon) ?:
+    public fun TensorStructure<Double>.lu(epsilon: Double): Pair<DoubleTensor, IntTensor> =
+        computeLU(tensor, epsilon) ?:
         throw RuntimeException("Tensor contains matrices which are singular at precision $epsilon")
 
-    override fun DoubleTensor.lu(): Pair<DoubleTensor, IntTensor> = lu(1e-9)
+    override fun TensorStructure<Double>.lu(): Pair<DoubleTensor, IntTensor> = lu(1e-9)
 
     override fun luPivot(
-        luTensor: DoubleTensor,
-        pivotsTensor: IntTensor
+        luTensor: TensorStructure<Double>,
+        pivotsTensor: TensorStructure<Int>
     ): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         //todo checks
         checkSquareMatrix(luTensor.shape)
         check(
             luTensor.shape.dropLast(2).toIntArray() contentEquals pivotsTensor.shape.dropLast(1).toIntArray() ||
                     luTensor.shape.last() == pivotsTensor.shape.last() - 1
-        ) { "Bed shapes ((" } //todo rewrite
+        ) { "Bad shapes ((" } //todo rewrite
 
         val n = luTensor.shape.last()
         val pTensor = luTensor.zeroesLike()
-        for ((p, pivot) in pTensor.matrixSequence().zip(pivotsTensor.vectorSequence()))
+        for ((p, pivot) in pTensor.matrixSequence().zip(pivotsTensor.tensor.vectorSequence()))
             pivInit(p.as2D(), pivot.as1D(), n)
 
         val lTensor = luTensor.zeroesLike()
         val uTensor = luTensor.zeroesLike()
 
         for ((pairLU, lu) in lTensor.matrixSequence().zip(uTensor.matrixSequence())
-            .zip(luTensor.matrixSequence())) {
+            .zip(luTensor.tensor.matrixSequence())) {
             val (l, u) = pairLU
             luPivotHelper(l.as2D(), u.as2D(), lu.as2D(), n)
         }
@@ -49,26 +50,26 @@ public class DoubleLinearOpsTensorAlgebra :
 
     }
 
-    public fun DoubleTensor.cholesky(epsilon: Double): DoubleTensor {
+    public fun TensorStructure<Double>.cholesky(epsilon: Double): DoubleTensor {
         checkSquareMatrix(shape)
-        checkPositiveDefinite(this, epsilon)
+        checkPositiveDefinite(tensor, epsilon)
 
         val n = shape.last()
         val lTensor = zeroesLike()
 
-        for ((a, l) in this.matrixSequence().zip(lTensor.matrixSequence()))
+        for ((a, l) in tensor.matrixSequence().zip(lTensor.matrixSequence()))
             for (i in 0 until n) choleskyHelper(a.as2D(), l.as2D(), n)
 
         return lTensor
     }
 
-    override fun DoubleTensor.cholesky(): DoubleTensor = cholesky(1e-6)
+    override fun TensorStructure<Double>.cholesky(): DoubleTensor = cholesky(1e-6)
 
-    override fun DoubleTensor.qr(): Pair<DoubleTensor, DoubleTensor> {
+    override fun TensorStructure<Double>.qr(): Pair<DoubleTensor, DoubleTensor> {
         checkSquareMatrix(shape)
         val qTensor = zeroesLike()
         val rTensor = zeroesLike()
-        val seq = matrixSequence().zip((qTensor.matrixSequence().zip(rTensor.matrixSequence())))
+        val seq = tensor.matrixSequence().zip((qTensor.matrixSequence().zip(rTensor.matrixSequence())))
         for ((matrix, qr) in seq) {
             val (q, r) = qr
             qrHelper(matrix.asTensor(), q.asTensor(), r.as2D())
@@ -76,18 +77,18 @@ public class DoubleLinearOpsTensorAlgebra :
         return qTensor to rTensor
     }
 
-    override fun DoubleTensor.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> =
+    override fun TensorStructure<Double>.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> =
         svd(epsilon = 1e-10)
 
-    public fun DoubleTensor.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        val size = this.linearStructure.dim
-        val commonShape = this.shape.sliceArray(0 until size - 2)
-        val (n, m) = this.shape.sliceArray(size - 2 until size)
+    public fun TensorStructure<Double>.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+        val size = tensor.linearStructure.dim
+        val commonShape = tensor.shape.sliceArray(0 until size - 2)
+        val (n, m) = tensor.shape.sliceArray(size - 2 until size)
         val resU = zeros(commonShape + intArrayOf(min(n, m), n))
         val resS = zeros(commonShape + intArrayOf(min(n, m)))
         val resV = zeros(commonShape + intArrayOf(min(n, m), m))
 
-        for ((matrix, USV) in this.matrixSequence()
+        for ((matrix, USV) in tensor.matrixSequence()
             .zip(resU.matrixSequence().zip(resS.vectorSequence().zip(resV.matrixSequence())))) {
             val size = matrix.shape.reduce { acc, i -> acc * i }
             val curMatrix = DoubleTensor(
@@ -99,13 +100,13 @@ public class DoubleLinearOpsTensorAlgebra :
         return Triple(resU.transpose(), resS, resV.transpose())
     }
 
-    override fun DoubleTensor.symEig(): Pair<DoubleTensor, DoubleTensor> =
+    override fun TensorStructure<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> =
         symEig(epsilon = 1e-15)
 
     //http://hua-zhou.github.io/teaching/biostatm280-2017spring/slides/16-eigsvd/eigsvd.html
-    public fun DoubleTensor.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
-        checkSymmetric(this, epsilon)
-        val (u, s, v) = this.svd(epsilon)
+    public fun TensorStructure<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
+        checkSymmetric(tensor, epsilon)
+        val (u, s, v) = tensor.svd(epsilon)
         val shp = s.shape + intArrayOf(1)
         val utv = u.transpose() dot v
         val n = s.shape.last()
@@ -116,11 +117,11 @@ public class DoubleLinearOpsTensorAlgebra :
         return Pair(eig, v)
     }
 
-    public fun DoubleTensor.detLU(epsilon: Double = 1e-9): DoubleTensor {
+    public fun TensorStructure<Double>.detLU(epsilon: Double = 1e-9): DoubleTensor {
 
-        checkSquareMatrix(this.shape)
-        val luTensor = this.copy()
-        val pivotsTensor = this.setUpPivots()
+        checkSquareMatrix(tensor.shape)
+        val luTensor = tensor.copy()
+        val pivotsTensor = tensor.setUpPivots()
 
         val n = shape.size
 
@@ -141,7 +142,7 @@ public class DoubleLinearOpsTensorAlgebra :
         return detTensor
     }
 
-    public fun DoubleTensor.invLU(epsilon: Double = 1e-9): DoubleTensor {
+    public fun TensorStructure<Double>.invLU(epsilon: Double = 1e-9): DoubleTensor {
         val (luTensor, pivotsTensor) = lu(epsilon)
         val invTensor = luTensor.zeroesLike()
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 8f355dd3d..7544bf68e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -1,16 +1,18 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.tensors.TensorPartialDivisionAlgebra
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.tensors.TensorPartialDivisionAlgebra
+import space.kscience.kmath.tensors.TensorStructure
 import kotlin.math.abs
 
-public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, DoubleTensor> {
+public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
 
-    override fun DoubleTensor.value(): Double {
-        check(this.shape contentEquals intArrayOf(1)) {
+
+    override fun TensorStructure<Double>.value(): Double {
+        check(tensor.shape contentEquals intArrayOf(1)) {
             "Inconsistent value for tensor of shape ${shape.toList()}"
         }
-        return this.buffer.array()[this.bufferStart]
+        return tensor.buffer.array()[tensor.bufferStart]
     }
 
     public fun fromArray(shape: IntArray, buffer: DoubleArray): DoubleTensor {
@@ -20,11 +22,11 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return DoubleTensor(shape, buffer, 0)
     }
 
-    override operator fun DoubleTensor.get(i: Int): DoubleTensor {
-        val lastShape = this.shape.drop(1).toIntArray()
+    override operator fun TensorStructure<Double>.get(i: Int): DoubleTensor {
+        val lastShape = tensor.shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
-        val newStart = newShape.reduce(Int::times) * i + this.bufferStart
-        return DoubleTensor(newShape, this.buffer.array(), newStart)
+        val newStart = newShape.reduce(Int::times) * i + tensor.bufferStart
+        return DoubleTensor(newShape, tensor.buffer.array(), newStart)
     }
 
     public fun full(value: Double, shape: IntArray): DoubleTensor {
@@ -33,19 +35,19 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return DoubleTensor(shape, buffer)
     }
 
-    public fun DoubleTensor.fullLike(value: Double): DoubleTensor {
-        val shape = this.shape
-        val buffer = DoubleArray(this.linearStructure.size) { value }
+    public fun TensorStructure<Double>.fullLike(value: Double): DoubleTensor {
+        val shape = tensor.shape
+        val buffer = DoubleArray(tensor.numElements) { value }
         return DoubleTensor(shape, buffer)
     }
 
     public fun zeros(shape: IntArray): DoubleTensor = full(0.0, shape)
 
-    public fun DoubleTensor.zeroesLike(): DoubleTensor = this.fullLike(0.0)
+    public fun TensorStructure<Double>.zeroesLike(): DoubleTensor = tensor.fullLike(0.0)
 
     public fun ones(shape: IntArray): DoubleTensor = full(1.0, shape)
 
-    public fun DoubleTensor.onesLike(): DoubleTensor = this.fullLike(1.0)
+    public fun TensorStructure<Double>.onesLike(): DoubleTensor = tensor.fullLike(1.0)
 
     public fun eye(n: Int): DoubleTensor {
         val shape = intArrayOf(n, n)
@@ -57,200 +59,200 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return res
     }
 
-    public fun DoubleTensor.copy(): DoubleTensor {
-        return DoubleTensor(this.shape, this.buffer.array().copyOf(), this.bufferStart)
+    public fun TensorStructure<Double>.copy(): DoubleTensor {
+        return DoubleTensor(tensor.shape, tensor.buffer.array().copyOf(), tensor.bufferStart)
     }
 
-    override fun Double.plus(other: DoubleTensor): DoubleTensor {
-        val resBuffer = DoubleArray(other.linearStructure.size) { i ->
-            other.buffer.array()[other.bufferStart + i] + this
+    override fun Double.plus(other: TensorStructure<Double>): DoubleTensor {
+        val resBuffer = DoubleArray(other.tensor.numElements) { i ->
+            other.tensor.buffer.array()[other.tensor.bufferStart + i] + this
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
-    override fun DoubleTensor.plus(value: Double): DoubleTensor = value + this
+    override fun TensorStructure<Double>.plus(value: Double): DoubleTensor = value + tensor
 
-    override fun DoubleTensor.plus(other: DoubleTensor): DoubleTensor {
-        checkShapesCompatible(this, other)
-        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
-            this.buffer.array()[i] + other.buffer.array()[i]
+    override fun TensorStructure<Double>.plus(other: TensorStructure<Double>): DoubleTensor {
+        checkShapesCompatible(tensor, other.tensor)
+        val resBuffer = DoubleArray(tensor.numElements) { i ->
+            tensor.buffer.array()[i] + other.tensor.buffer.array()[i]
         }
-        return DoubleTensor(this.shape, resBuffer)
+        return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun DoubleTensor.plusAssign(value: Double) {
-        for (i in 0 until this.linearStructure.size) {
-            this.buffer.array()[this.bufferStart + i] += value
+    override fun TensorStructure<Double>.plusAssign(value: Double) {
+        for (i in 0 until tensor.numElements) {
+            tensor.buffer.array()[tensor.bufferStart + i] += value
         }
     }
 
-    override fun DoubleTensor.plusAssign(other: DoubleTensor) {
-        checkShapesCompatible(this, other)
-        for (i in 0 until this.linearStructure.size) {
-            this.buffer.array()[this.bufferStart + i] +=
-                other.buffer.array()[this.bufferStart + i]
+    override fun TensorStructure<Double>.plusAssign(other: TensorStructure<Double>) {
+        checkShapesCompatible(tensor, other.tensor)
+        for (i in 0 until tensor.numElements) {
+            tensor.buffer.array()[tensor.bufferStart + i] +=
+                other.tensor.buffer.array()[tensor.bufferStart + i]
         }
     }
 
-    override fun Double.minus(other: DoubleTensor): DoubleTensor {
-        val resBuffer = DoubleArray(other.linearStructure.size) { i ->
-            this - other.buffer.array()[other.bufferStart + i]
+    override fun Double.minus(other: TensorStructure<Double>): DoubleTensor {
+        val resBuffer = DoubleArray(other.tensor.numElements) { i ->
+            this - other.tensor.buffer.array()[other.tensor.bufferStart + i]
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
-    override fun DoubleTensor.minus(value: Double): DoubleTensor {
-        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
-            this.buffer.array()[this.bufferStart + i] - value
+    override fun TensorStructure<Double>.minus(value: Double): DoubleTensor {
+        val resBuffer = DoubleArray(tensor.numElements) { i ->
+            tensor.buffer.array()[tensor.bufferStart + i] - value
         }
-        return DoubleTensor(this.shape, resBuffer)
+        return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun DoubleTensor.minus(other: DoubleTensor): DoubleTensor {
-        checkShapesCompatible(this, other)
-        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
-            this.buffer.array()[i] - other.buffer.array()[i]
+    override fun TensorStructure<Double>.minus(other: TensorStructure<Double>): DoubleTensor {
+        checkShapesCompatible(tensor, other)
+        val resBuffer = DoubleArray(tensor.numElements) { i ->
+            tensor.buffer.array()[i] - other.tensor.buffer.array()[i]
         }
-        return DoubleTensor(this.shape, resBuffer)
+        return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun DoubleTensor.minusAssign(value: Double) {
-        for (i in 0 until this.linearStructure.size) {
-            this.buffer.array()[this.bufferStart + i] -= value
+    override fun TensorStructure<Double>.minusAssign(value: Double) {
+        for (i in 0 until tensor.numElements) {
+            tensor.buffer.array()[tensor.bufferStart + i] -= value
         }
     }
 
-    override fun DoubleTensor.minusAssign(other: DoubleTensor) {
-        checkShapesCompatible(this, other)
-        for (i in 0 until this.linearStructure.size) {
-            this.buffer.array()[this.bufferStart + i] -=
-                other.buffer.array()[this.bufferStart + i]
+    override fun TensorStructure<Double>.minusAssign(other: TensorStructure<Double>) {
+        checkShapesCompatible(tensor, other)
+        for (i in 0 until tensor.numElements) {
+            tensor.buffer.array()[tensor.bufferStart + i] -=
+                other.tensor.buffer.array()[tensor.bufferStart + i]
         }
     }
 
-    override fun Double.times(other: DoubleTensor): DoubleTensor {
-        val resBuffer = DoubleArray(other.linearStructure.size) { i ->
-            other.buffer.array()[other.bufferStart + i] * this
+    override fun Double.times(other: TensorStructure<Double>): DoubleTensor {
+        val resBuffer = DoubleArray(other.tensor.numElements) { i ->
+            other.tensor.buffer.array()[other.tensor.bufferStart + i] * this
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
-    override fun DoubleTensor.times(value: Double): DoubleTensor = value * this
+    override fun TensorStructure<Double>.times(value: Double): DoubleTensor = value * tensor
 
-    override fun DoubleTensor.times(other: DoubleTensor): DoubleTensor {
-        checkShapesCompatible(this, other)
-        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
-            this.buffer.array()[this.bufferStart + i] *
-                    other.buffer.array()[other.bufferStart + i]
+    override fun TensorStructure<Double>.times(other: TensorStructure<Double>): DoubleTensor {
+        checkShapesCompatible(tensor, other)
+        val resBuffer = DoubleArray(tensor.numElements) { i ->
+            tensor.buffer.array()[tensor.bufferStart + i] *
+                    other.tensor.buffer.array()[other.tensor.bufferStart + i]
         }
-        return DoubleTensor(this.shape, resBuffer)
+        return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun DoubleTensor.timesAssign(value: Double) {
-        for (i in 0 until this.linearStructure.size) {
-            this.buffer.array()[this.bufferStart + i] *= value
+    override fun TensorStructure<Double>.timesAssign(value: Double) {
+        for (i in 0 until tensor.numElements) {
+            tensor.buffer.array()[tensor.bufferStart + i] *= value
         }
     }
 
-    override fun DoubleTensor.timesAssign(other: DoubleTensor) {
-        checkShapesCompatible(this, other)
-        for (i in 0 until this.linearStructure.size) {
-            this.buffer.array()[this.bufferStart + i] *=
-                other.buffer.array()[this.bufferStart + i]
+    override fun TensorStructure<Double>.timesAssign(other: TensorStructure<Double>) {
+        checkShapesCompatible(tensor, other)
+        for (i in 0 until tensor.numElements) {
+            tensor.buffer.array()[tensor.bufferStart + i] *=
+                other.tensor.buffer.array()[tensor.bufferStart + i]
         }
     }
 
-    override fun DoubleTensor.div(value: Double): DoubleTensor {
-        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
-            this.buffer.array()[this.bufferStart + i] / value
+    override fun TensorStructure<Double>.div(value: Double): DoubleTensor {
+        val resBuffer = DoubleArray(tensor.numElements) { i ->
+            tensor.buffer.array()[tensor.bufferStart + i] / value
         }
-        return DoubleTensor(this.shape, resBuffer)
+        return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun DoubleTensor.div(other: DoubleTensor): DoubleTensor {
-        checkShapesCompatible(this, other)
-        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
-            this.buffer.array()[other.bufferStart + i] /
-                    other.buffer.array()[other.bufferStart + i]
+    override fun TensorStructure<Double>.div(other: TensorStructure<Double>): DoubleTensor {
+        checkShapesCompatible(tensor, other)
+        val resBuffer = DoubleArray(tensor.numElements) { i ->
+            tensor.buffer.array()[other.tensor.bufferStart + i] /
+                    other.tensor.buffer.array()[other.tensor.bufferStart + i]
         }
-        return DoubleTensor(this.shape, resBuffer)
+        return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun DoubleTensor.divAssign(value: Double) {
-        for (i in 0 until this.linearStructure.size) {
-            this.buffer.array()[this.bufferStart + i] /= value
+    override fun TensorStructure<Double>.divAssign(value: Double) {
+        for (i in 0 until tensor.numElements) {
+            tensor.buffer.array()[tensor.bufferStart + i] /= value
         }
     }
 
-    override fun DoubleTensor.divAssign(other: DoubleTensor) {
-        checkShapesCompatible(this, other)
-        for (i in 0 until this.linearStructure.size) {
-            this.buffer.array()[this.bufferStart + i] /=
-                other.buffer.array()[this.bufferStart + i]
+    override fun TensorStructure<Double>.divAssign(other: TensorStructure<Double>) {
+        checkShapesCompatible(tensor, other)
+        for (i in 0 until tensor.numElements) {
+            tensor.buffer.array()[tensor.bufferStart + i] /=
+                other.tensor.buffer.array()[tensor.bufferStart + i]
         }
     }
 
-    override fun DoubleTensor.unaryMinus(): DoubleTensor {
-        val resBuffer = DoubleArray(this.linearStructure.size) { i ->
-            this.buffer.array()[this.bufferStart + i].unaryMinus()
+    override fun TensorStructure<Double>.unaryMinus(): DoubleTensor {
+        val resBuffer = DoubleArray(tensor.numElements) { i ->
+            tensor.buffer.array()[tensor.bufferStart + i].unaryMinus()
         }
-        return DoubleTensor(this.shape, resBuffer)
+        return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun DoubleTensor.transpose(i: Int, j: Int): DoubleTensor {
-        val ii = minusIndex(i)
-        val jj = minusIndex(j)
-        checkTranspose(this.dimension, ii, jj)
-        val n = this.linearStructure.size
+    override fun TensorStructure<Double>.transpose(i: Int, j: Int): DoubleTensor {
+        val ii = tensor.minusIndex(i)
+        val jj = tensor.minusIndex(j)
+        checkTranspose(tensor.dimension, ii, jj)
+        val n = tensor.numElements
         val resBuffer = DoubleArray(n)
 
-        val resShape = this.shape.copyOf()
+        val resShape = tensor.shape.copyOf()
         resShape[ii] = resShape[jj].also { resShape[jj] = resShape[ii] }
 
         val resTensor = DoubleTensor(resShape, resBuffer)
 
         for (offset in 0 until n) {
-            val oldMultiIndex = this.linearStructure.index(offset)
+            val oldMultiIndex = tensor.linearStructure.index(offset)
             val newMultiIndex = oldMultiIndex.copyOf()
             newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
 
             val linearIndex = resTensor.linearStructure.offset(newMultiIndex)
             resTensor.buffer.array()[linearIndex] =
-                this.buffer.array()[this.bufferStart + offset]
+                tensor.buffer.array()[tensor.bufferStart + offset]
         }
         return resTensor
     }
 
 
-    override fun DoubleTensor.view(shape: IntArray): DoubleTensor {
-        checkView(this, shape)
-        return DoubleTensor(shape, this.buffer.array(), this.bufferStart)
+    override fun TensorStructure<Double>.view(shape: IntArray): DoubleTensor {
+        checkView(tensor, shape)
+        return DoubleTensor(shape, tensor.buffer.array(), tensor.bufferStart)
     }
 
-    override fun DoubleTensor.viewAs(other: DoubleTensor): DoubleTensor {
-        return this.view(other.shape)
+    override fun TensorStructure<Double>.viewAs(other: TensorStructure<Double>): DoubleTensor {
+        return tensor.view(other.shape)
     }
 
-    override infix fun DoubleTensor.dot(other: DoubleTensor): DoubleTensor {
-        if (this.shape.size == 1 && other.shape.size == 1) {
-            return DoubleTensor(intArrayOf(1), doubleArrayOf(this.times(other).buffer.array().sum()))
+    override infix fun TensorStructure<Double>.dot(other: TensorStructure<Double>): DoubleTensor {
+        if (tensor.shape.size == 1 && other.shape.size == 1) {
+            return DoubleTensor(intArrayOf(1), doubleArrayOf(tensor.times(other).tensor.buffer.array().sum()))
         }
 
-        var newThis = this.copy()
+        var newThis = tensor.copy()
         var newOther = other.copy()
 
         var penultimateDim = false
         var lastDim = false
-        if (this.shape.size == 1) {
+        if (tensor.shape.size == 1) {
             penultimateDim = true
-            newThis = this.view(intArrayOf(1) + this.shape)
+            newThis = tensor.view(intArrayOf(1) + tensor.shape)
         }
         if (other.shape.size == 1) {
             lastDim = true
-            newOther = other.view(other.shape + intArrayOf(1))
+            newOther = other.tensor.view(other.shape + intArrayOf(1))
         }
 
-        val broadcastTensors = broadcastOuterTensors(newThis, newOther)
+        val broadcastTensors = broadcastOuterTensors(newThis.tensor, newOther.tensor)
         newThis = broadcastTensors[0]
         newOther = broadcastTensors[1]
 
@@ -284,10 +286,12 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         return resTensor
     }
 
-    override fun diagonalEmbedding(diagonalEntries: DoubleTensor, offset: Int, dim1: Int, dim2: Int): DoubleTensor {
-        val d1 = minusIndexFrom(diagonalEntries.linearStructure.dim + 1, dim1)
-        val d2 = minusIndexFrom(diagonalEntries.linearStructure.dim + 1, dim2)
+    override fun diagonalEmbedding(diagonalEntries: TensorStructure<Double>, offset: Int, dim1: Int, dim2: Int):
+            DoubleTensor {
         val n = diagonalEntries.shape.size
+        val d1 = minusIndexFrom(n + 1, dim1)
+        val d2 = minusIndexFrom(n + 1, dim2)
+
         if (d1 == d2) {
             throw RuntimeException("Diagonal dimensions cannot be identical $d1, $d2")
         }
@@ -300,7 +304,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
         var realOffset = offset
         if (lessDim > greaterDim) {
             realOffset *= -1
-            lessDim = greaterDim.also {greaterDim = lessDim}
+            lessDim = greaterDim.also { greaterDim = lessDim }
         }
 
         val resShape = diagonalEntries.shape.slice(0 until lessDim).toIntArray() +
@@ -310,13 +314,13 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
                 diagonalEntries.shape.slice(greaterDim - 1 until n - 1).toIntArray()
         val resTensor = zeros(resShape)
 
-        for (i in 0 until diagonalEntries.linearStructure.size) {
-            val multiIndex = diagonalEntries.linearStructure.index(i)
+        for (i in 0 until diagonalEntries.tensor.numElements) {
+            val multiIndex = diagonalEntries.tensor.linearStructure.index(i)
 
             var offset1 = 0
             var offset2 = abs(realOffset)
             if (realOffset < 0) {
-                offset1 = offset2.also {offset2 = offset1}
+                offset1 = offset2.also { offset2 = offset1 }
             }
             val diagonalMultiIndex = multiIndex.slice(0 until lessDim).toIntArray() +
                     intArrayOf(multiIndex[n - 1] + offset1) +
@@ -327,32 +331,35 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
             resTensor[diagonalMultiIndex] = diagonalEntries[multiIndex]
         }
 
-        return resTensor
+        return resTensor.tensor
     }
 
 
-    public fun DoubleTensor.map(transform: (Double) -> Double): DoubleTensor {
+    public fun TensorStructure<Double>.map(transform: (Double) -> Double): DoubleTensor {
         return DoubleTensor(
-            this.shape,
-            this.buffer.array().map { transform(it) }.toDoubleArray(),
-            this.bufferStart
+            tensor.shape,
+            tensor.buffer.array().map { transform(it) }.toDoubleArray(),
+            tensor.bufferStart
         )
     }
 
-    public fun DoubleTensor.eq(other: DoubleTensor, delta: Double): Boolean {
-        return this.eq(other) { x, y -> abs(x - y) < delta }
+    public fun TensorStructure<Double>.eq(other: TensorStructure<Double>, delta: Double): Boolean {
+        return tensor.eq(other) { x, y -> abs(x - y) < delta }
     }
 
-    public fun DoubleTensor.eq(other: DoubleTensor): Boolean = this.eq(other, 1e-5)
+    public fun TensorStructure<Double>.eq(other: TensorStructure<Double>): Boolean = tensor.eq(other, 1e-5)
 
-    private fun DoubleTensor.eq(other: DoubleTensor, eqFunction: (Double, Double) -> Boolean): Boolean {
-        checkShapesCompatible(this, other)
-        val n = this.linearStructure.size
-        if (n != other.linearStructure.size) {
+    private fun TensorStructure<Double>.eq(
+        other: TensorStructure<Double>,
+        eqFunction: (Double, Double) -> Boolean
+    ): Boolean {
+        checkShapesCompatible(tensor, other)
+        val n = tensor.numElements
+        if (n != other.tensor.numElements) {
             return false
         }
         for (i in 0 until n) {
-            if (!eqFunction(this.buffer[this.bufferStart + i], other.buffer[other.bufferStart + i])) {
+            if (!eqFunction(tensor.buffer[tensor.bufferStart + i], other.tensor.buffer[other.tensor.bufferStart + i])) {
                 return false
             }
         }
@@ -362,8 +369,8 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double, Dou
     public fun randNormal(shape: IntArray, seed: Long = 0): DoubleTensor =
         DoubleTensor(shape, getRandomNormals(shape.reduce(Int::times), seed))
 
-    public fun DoubleTensor.randNormalLike(seed: Long = 0): DoubleTensor =
-        DoubleTensor(this.shape, getRandomNormals(this.shape.reduce(Int::times), seed))
+    public fun TensorStructure<Double>.randNormalLike(seed: Long = 0): DoubleTensor =
+        DoubleTensor(tensor.shape, getRandomNormals(tensor.shape.reduce(Int::times), seed))
 
 }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index 730b6ed9a..28828eb09 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -1,54 +1,40 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.tensors.TensorAlgebra
 import space.kscience.kmath.tensors.TensorStructure
 
 
-internal inline fun <T, TensorType : TensorStructure<T>,
-        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
-        TorchTensorAlgebraType.checkEmptyShape(shape: IntArray): Unit =
+internal inline fun checkEmptyShape(shape: IntArray): Unit =
     check(shape.isNotEmpty()) {
         "Illegal empty shape provided"
     }
 
-internal inline fun <TensorType : TensorStructure<Double>,
-        TorchTensorAlgebraType : TensorAlgebra<Double, TensorType>>
-        TorchTensorAlgebraType.checkEmptyDoubleBuffer(buffer: DoubleArray): Unit =
+internal inline fun checkEmptyDoubleBuffer(buffer: DoubleArray): Unit =
     check(buffer.isNotEmpty()) {
         "Illegal empty buffer provided"
     }
 
-internal inline fun <TensorType : TensorStructure<Double>,
-        TorchTensorAlgebraType : TensorAlgebra<Double, TensorType>>
-        TorchTensorAlgebraType.checkBufferShapeConsistency(shape: IntArray, buffer: DoubleArray): Unit =
+internal inline fun checkBufferShapeConsistency(shape: IntArray, buffer: DoubleArray): Unit =
     check(buffer.size == shape.reduce(Int::times)) {
         "Inconsistent shape ${shape.toList()} for buffer of size ${buffer.size} provided"
     }
 
 
-internal inline fun <T, TensorType : TensorStructure<T>,
-        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
-        TorchTensorAlgebraType.checkShapesCompatible(a: TensorType, b: TensorType): Unit =
+internal inline fun <T> checkShapesCompatible(a: TensorStructure<T>, b: TensorStructure<T>): Unit =
     check(a.shape contentEquals b.shape) {
         "Incompatible shapes ${a.shape.toList()} and ${b.shape.toList()} "
     }
 
 
-internal inline fun <T, TensorType : TensorStructure<T>,
-        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
-        TorchTensorAlgebraType.checkTranspose(dim: Int, i: Int, j: Int): Unit =
+internal inline fun checkTranspose(dim: Int, i: Int, j: Int): Unit =
     check((i < dim) and (j < dim)) {
         "Cannot transpose $i to $j for a tensor of dim $dim"
     }
 
-internal inline fun <T, TensorType : TensorStructure<T>,
-        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
-        TorchTensorAlgebraType.checkView(a: TensorType, shape: IntArray): Unit =
+internal inline fun <T> checkView(a: TensorStructure<T>, shape: IntArray): Unit =
     check(a.shape.reduce(Int::times) == shape.reduce(Int::times))
 
-internal inline fun <T, TensorType : TensorStructure<T>,
-        TorchTensorAlgebraType : TensorAlgebra<T, TensorType>>
-        TorchTensorAlgebraType.checkSquareMatrix(shape: IntArray): Unit {
+
+internal inline fun checkSquareMatrix(shape: IntArray): Unit {
     val n = shape.size
     check(n >= 2) {
         "Expected tensor with 2 or more dimensions, got size $n instead"
@@ -58,16 +44,19 @@ internal inline fun <T, TensorType : TensorStructure<T>,
     }
 }
 
-internal inline fun DoubleTensorAlgebra.checkSymmetric(tensor: DoubleTensor, epsilon: Double = 1e-6): Unit =
+internal inline fun DoubleTensorAlgebra.checkSymmetric(
+    tensor: TensorStructure<Double>, epsilon: Double = 1e-6
+): Unit =
     check(tensor.eq(tensor.transpose(), epsilon)) {
         "Tensor is not symmetric about the last 2 dimensions at precision $epsilon"
     }
 
 internal inline fun DoubleLinearOpsTensorAlgebra.checkPositiveDefinite(
-    tensor: DoubleTensor, epsilon: Double = 1e-6): Unit {
+    tensor: DoubleTensor, epsilon: Double = 1e-6
+): Unit {
     checkSymmetric(tensor, epsilon)
-    for( mat in tensor.matrixSequence())
-        check(mat.asTensor().detLU().value() > 0.0){
+    for (mat in tensor.matrixSequence())
+        check(mat.asTensor().detLU().value() > 0.0) {
             "Tensor contains matrices which are not positive definite ${mat.asTensor().detLU().value()}"
         }
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
index ba5e0caaf..166f1d6c4 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
@@ -14,7 +14,7 @@ internal inline fun <T> BufferedTensor<T>.vectorSequence(): Sequence<BufferedTen
     val n = shape.size
     val vectorOffset = shape[n - 1]
     val vectorShape = intArrayOf(shape.last())
-    for (offset in 0 until numel step vectorOffset) {
+    for (offset in 0 until numElements step vectorOffset) {
         val vector = BufferedTensor(vectorShape, buffer, offset)
         yield(vector)
     }
@@ -25,7 +25,7 @@ internal inline fun <T> BufferedTensor<T>.matrixSequence(): Sequence<BufferedTen
     val n = shape.size
     val matrixOffset = shape[n - 1] * shape[n - 2]
     val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
-    for (offset in 0 until numel step matrixOffset) {
+    for (offset in 0 until numElements step matrixOffset) {
         val matrix = BufferedTensor(matrixShape, buffer, offset)
         yield(matrix)
     }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index 0b2b5c0df..ac823185b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -58,7 +58,7 @@ internal inline fun minusIndexFrom(n: Int, i: Int) : Int = if (i >= 0) i else {
     ii
 }
 
-internal inline fun <T> BufferedTensor<T>.minusIndex(i: Int): Int =  minusIndexFrom(this.linearStructure.dim, i)
+internal inline fun <T> BufferedTensor<T>.minusIndex(i: Int): Int =  minusIndexFrom(this.dimension, i)
 
 internal inline fun format(value: Double, digits: Int = 4): String {
     val ten = 10.0
@@ -111,7 +111,7 @@ internal inline fun DoubleTensor.toPrettyString(): String = buildString {
         }
         offset += vectorSize
         // todo refactor
-        if (this@toPrettyString.numel == offset) {
+        if (this@toPrettyString.numElements == offset) {
             break
         }
         append(",\n")
-- 
2.34.1


From 559e8b24ab6189b523e3707b605b7f2c75c8b92c Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Wed, 21 Apr 2021 23:44:39 +0300
Subject: [PATCH 132/713] rework structure + fixes

---
 .../{ => api}/AnalyticTensorAlgebra.kt        |   7 +-
 .../{ => api}/LinearOpsTensorAlgebra.kt       |   7 +-
 .../kmath/tensors/{ => api}/TensorAlgebra.kt  |  11 +-
 .../{ => api}/TensorPartialDivisionAlgebra.kt |   9 +-
 .../tensors/{ => api}/TensorStructure.kt      |   2 +-
 .../kmath/tensors/core/BufferedTensor.kt      |   3 +-
 .../algebras/BroadcastDoubleTensorAlgebra.kt  |  89 ++++++++++
 .../DoubleAnalyticTensorAlgebra.kt            |  13 +-
 .../DoubleLinearOpsTensorAlgebra.kt           |  27 +++-
 .../{ => algebras}/DoubleTensorAlgebra.kt     |  27 +++-
 .../{ => algebras}/TensorLinearStructure.kt   |   7 +-
 ...ubleTensorAlgebra.kt => broadcastUtils.kt} | 153 ++++--------------
 .../kscience/kmath/tensors/core/checks.kt     |   4 +-
 .../tensors/core/{linutils.kt => linUtils.kt} |  10 +-
 .../kscience/kmath/tensors/core/utils.kt      |   1 -
 .../kmath/tensors/core/TestBroadcasting.kt    |   1 +
 .../core/TestDoubleAnalyticTensorAlgebra.kt   |   1 +
 .../core/TestDoubleLinearOpsAlgebra.kt        |   3 +-
 .../kmath/tensors/core/TestDoubleTensor.kt    |   2 +-
 .../tensors/core/TestDoubleTensorAlgebra.kt   |  20 ++-
 20 files changed, 237 insertions(+), 160 deletions(-)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/{ => api}/AnalyticTensorAlgebra.kt (91%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/{ => api}/LinearOpsTensorAlgebra.kt (86%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/{ => api}/TensorAlgebra.kt (89%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/{ => api}/TensorPartialDivisionAlgebra.kt (64%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/{ => api}/TensorStructure.kt (73%)
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{ => algebras}/DoubleAnalyticTensorAlgebra.kt (77%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{ => algebras}/DoubleLinearOpsTensorAlgebra.kt (84%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{ => algebras}/DoubleTensorAlgebra.kt (92%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{ => algebras}/TensorLinearStructure.kt (90%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{BroadcastDoubleTensorAlgebra.kt => broadcastUtils.kt} (52%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{linutils.kt => linUtils.kt} (97%)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
similarity index 91%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index 2a8b228f4..315f39027 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -1,4 +1,9 @@
-package space.kscience.kmath.tensors
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.api
 
 
 public interface AnalyticTensorAlgebra<T> :
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
similarity index 86%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index 8ca8945a5..5cd48ca78 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -1,4 +1,9 @@
-package space.kscience.kmath.tensors
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.api
 
 
 public interface LinearOpsTensorAlgebra<T> :
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
similarity index 89%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index f64d49dd8..c1657d916 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -1,4 +1,9 @@
-package space.kscience.kmath.tensors
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.api
 
 // https://proofwiki.org/wiki/Definition:Algebra_over_Ring
 public interface TensorAlgebra<T> {
@@ -40,7 +45,9 @@ public interface TensorAlgebra<T> {
     //https://pytorch.org/docs/stable/generated/torch.diag_embed.html
     public fun diagonalEmbedding(
         diagonalEntries: TensorStructure<T>,
-        offset: Int = 0, dim1: Int = -2, dim2: Int = -1
+        offset: Int = 0,
+        dim1: Int = -2,
+        dim2: Int = -1
     ): TensorStructure<T>
 
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
similarity index 64%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
index b37ac6b6e..075e86e61 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
@@ -1,8 +1,13 @@
-package space.kscience.kmath.tensors
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.api
 
 // https://proofwiki.org/wiki/Definition:Division_Algebra
 public interface TensorPartialDivisionAlgebra<T> :
-        TensorAlgebra<T> {
+    TensorAlgebra<T> {
     public operator fun TensorStructure<T>.div(value: T): TensorStructure<T>
     public operator fun TensorStructure<T>.div(other: TensorStructure<T>): TensorStructure<T>
     public operator fun TensorStructure<T>.divAssign(value: T)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorStructure.kt
similarity index 73%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorStructure.kt
index 64c4d98b8..edecd6383 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/TensorStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorStructure.kt
@@ -1,4 +1,4 @@
-package space.kscience.kmath.tensors
+package space.kscience.kmath.tensors.api
 
 import space.kscience.kmath.nd.MutableStructureND
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 2b61e10b2..5c0d9c4ea 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -1,7 +1,8 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.structures.*
-import space.kscience.kmath.tensors.TensorStructure
+import space.kscience.kmath.tensors.api.TensorStructure
+import space.kscience.kmath.tensors.core.algebras.TensorLinearStructure
 
 
 public open class BufferedTensor<T>(
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
new file mode 100644
index 000000000..1b00197ff
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core.algebras
+
+import space.kscience.kmath.tensors.api.TensorStructure
+import space.kscience.kmath.tensors.core.*
+import space.kscience.kmath.tensors.core.broadcastTensors
+import space.kscience.kmath.tensors.core.broadcastTo
+
+public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
+
+    override fun TensorStructure<Double>.plus(other: TensorStructure<Double>): DoubleTensor {
+        val broadcast = broadcastTensors(tensor, other.tensor)
+        val newThis = broadcast[0]
+        val newOther = broadcast[1]
+        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
+            newThis.buffer.array()[i] + newOther.buffer.array()[i]
+        }
+        return DoubleTensor(newThis.shape, resBuffer)
+    }
+
+    override fun TensorStructure<Double>.plusAssign(other: TensorStructure<Double>) {
+        val newOther = broadcastTo(other.tensor, tensor.shape)
+        for (i in 0 until tensor.linearStructure.size) {
+            tensor.buffer.array()[tensor.bufferStart + i] +=
+                newOther.buffer.array()[tensor.bufferStart + i]
+        }
+    }
+
+    override fun TensorStructure<Double>.minus(other: TensorStructure<Double>): DoubleTensor {
+        val broadcast = broadcastTensors(tensor, other.tensor)
+        val newThis = broadcast[0]
+        val newOther = broadcast[1]
+        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
+            newThis.buffer.array()[i] - newOther.buffer.array()[i]
+        }
+        return DoubleTensor(newThis.shape, resBuffer)
+    }
+
+    override fun TensorStructure<Double>.minusAssign(other: TensorStructure<Double>) {
+        val newOther = broadcastTo(other.tensor, tensor.shape)
+        for (i in 0 until tensor.linearStructure.size) {
+            tensor.buffer.array()[tensor.bufferStart + i] -=
+                newOther.buffer.array()[tensor.bufferStart + i]
+        }
+    }
+
+    override fun TensorStructure<Double>.times(other: TensorStructure<Double>): DoubleTensor {
+        val broadcast = broadcastTensors(tensor, other.tensor)
+        val newThis = broadcast[0]
+        val newOther = broadcast[1]
+        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
+            newThis.buffer.array()[newThis.bufferStart + i] *
+                    newOther.buffer.array()[newOther.bufferStart + i]
+        }
+        return DoubleTensor(newThis.shape, resBuffer)
+    }
+
+    override fun TensorStructure<Double>.timesAssign(other: TensorStructure<Double>) {
+        val newOther = broadcastTo(other.tensor, tensor.shape)
+        for (i in 0 until tensor.linearStructure.size) {
+            tensor.buffer.array()[tensor.bufferStart + i] *=
+                newOther.buffer.array()[tensor.bufferStart + i]
+        }
+    }
+
+    override fun TensorStructure<Double>.div(other: TensorStructure<Double>): DoubleTensor {
+        val broadcast = broadcastTensors(tensor, other.tensor)
+        val newThis = broadcast[0]
+        val newOther = broadcast[1]
+        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
+            newThis.buffer.array()[newOther.bufferStart + i] /
+                    newOther.buffer.array()[newOther.bufferStart + i]
+        }
+        return DoubleTensor(newThis.shape, resBuffer)
+    }
+
+    override fun TensorStructure<Double>.divAssign(other: TensorStructure<Double>) {
+        val newOther = broadcastTo(other.tensor, tensor.shape)
+        for (i in 0 until tensor.linearStructure.size) {
+            tensor.buffer.array()[tensor.bufferStart + i] /=
+                newOther.buffer.array()[tensor.bufferStart + i]
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
similarity index 77%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
index 233217f2f..7d1cceb15 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
@@ -1,7 +1,14 @@
-package space.kscience.kmath.tensors.core
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
 
-import space.kscience.kmath.tensors.AnalyticTensorAlgebra
-import space.kscience.kmath.tensors.TensorStructure
+package space.kscience.kmath.tensors.core.algebras
+
+import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
+import space.kscience.kmath.tensors.api.TensorStructure
+import space.kscience.kmath.tensors.core.DoubleTensor
+import space.kscience.kmath.tensors.core.tensor
 import kotlin.math.*
 
 public class DoubleAnalyticTensorAlgebra:
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
similarity index 84%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
index 386fc2a1b..62629f3db 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
@@ -1,9 +1,23 @@
-package space.kscience.kmath.tensors.core
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
 
-import space.kscience.kmath.tensors.LinearOpsTensorAlgebra
+package space.kscience.kmath.tensors.core.algebras
+
+import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.tensors.TensorStructure
+import space.kscience.kmath.tensors.api.TensorStructure
+import space.kscience.kmath.tensors.core.*
+import space.kscience.kmath.tensors.core.checkSquareMatrix
+import space.kscience.kmath.tensors.core.choleskyHelper
+import space.kscience.kmath.tensors.core.cleanSymHelper
+import space.kscience.kmath.tensors.core.luHelper
+import space.kscience.kmath.tensors.core.luMatrixDet
+import space.kscience.kmath.tensors.core.luMatrixInv
+import space.kscience.kmath.tensors.core.luPivotHelper
+import space.kscience.kmath.tensors.core.pivInit
 import kotlin.math.min
 
 
@@ -25,12 +39,11 @@ public class DoubleLinearOpsTensorAlgebra :
         luTensor: TensorStructure<Double>,
         pivotsTensor: TensorStructure<Int>
     ): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        //todo checks
         checkSquareMatrix(luTensor.shape)
         check(
             luTensor.shape.dropLast(2).toIntArray() contentEquals pivotsTensor.shape.dropLast(1).toIntArray() ||
                     luTensor.shape.last() == pivotsTensor.shape.last() - 1
-        ) { "Bad shapes ((" } //todo rewrite
+        ) { "Inappropriate shapes of input tensors" }
 
         val n = luTensor.shape.last()
         val pTensor = luTensor.zeroesLike()
@@ -90,10 +103,10 @@ public class DoubleLinearOpsTensorAlgebra :
 
         for ((matrix, USV) in tensor.matrixSequence()
             .zip(resU.matrixSequence().zip(resS.vectorSequence().zip(resV.matrixSequence())))) {
-            val size = matrix.shape.reduce { acc, i -> acc * i }
+            val matrixSize = matrix.shape.reduce { acc, i -> acc * i }
             val curMatrix = DoubleTensor(
                 matrix.shape,
-                matrix.buffer.array().slice(matrix.bufferStart until matrix.bufferStart + size).toDoubleArray()
+                matrix.buffer.array().slice(matrix.bufferStart until matrix.bufferStart + matrixSize).toDoubleArray()
             )
             svdHelper(curMatrix, USV, m, n, epsilon)
         }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
similarity index 92%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index 7544bf68e..651db2c21 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -1,8 +1,24 @@
-package space.kscience.kmath.tensors.core
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core.algebras
 
 import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.tensors.TensorPartialDivisionAlgebra
-import space.kscience.kmath.tensors.TensorStructure
+import space.kscience.kmath.tensors.api.TensorPartialDivisionAlgebra
+import space.kscience.kmath.tensors.api.TensorStructure
+import space.kscience.kmath.tensors.core.*
+import space.kscience.kmath.tensors.core.broadcastOuterTensors
+import space.kscience.kmath.tensors.core.checkBufferShapeConsistency
+import space.kscience.kmath.tensors.core.checkEmptyDoubleBuffer
+import space.kscience.kmath.tensors.core.checkEmptyShape
+import space.kscience.kmath.tensors.core.checkShapesCompatible
+import space.kscience.kmath.tensors.core.checkTranspose
+import space.kscience.kmath.tensors.core.checkView
+import space.kscience.kmath.tensors.core.dotHelper
+import space.kscience.kmath.tensors.core.getRandomNormals
+import space.kscience.kmath.tensors.core.minusIndexFrom
 import kotlin.math.abs
 
 public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
@@ -263,7 +279,6 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         if (m1 != m2) {
             throw RuntimeException("Tensors dot operation dimension mismatch: ($l, $m1) x ($m2, $n)")
         }
-        val m = m1
 
         val resShape = newThis.shape.sliceArray(0..(newThis.shape.size - 2)) + intArrayOf(newOther.shape.last())
         val resSize = resShape.reduce { acc, i -> acc * i }
@@ -271,7 +286,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
 
         for ((res, ab) in resTensor.matrixSequence().zip(newThis.matrixSequence().zip(newOther.matrixSequence()))) {
             val (a, b) = ab
-            dotHelper(a.as2D(), b.as2D(), res.as2D(), l, m, n)
+            dotHelper(a.as2D(), b.as2D(), res.as2D(), l, m1, n)
         }
 
         if (penultimateDim) {
@@ -347,7 +362,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return tensor.eq(other) { x, y -> abs(x - y) < delta }
     }
 
-    public fun TensorStructure<Double>.eq(other: TensorStructure<Double>): Boolean = tensor.eq(other, 1e-5)
+    public infix fun TensorStructure<Double>.eq(other: TensorStructure<Double>): Boolean = tensor.eq(other, 1e-5)
 
     private fun TensorStructure<Double>.eq(
         other: TensorStructure<Double>,
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
similarity index 90%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
index 47745c2be..b16739892 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
@@ -1,4 +1,9 @@
-package space.kscience.kmath.tensors.core
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core.algebras
 
 import kotlin.math.max
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
similarity index 52%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
index 53c385197..4378e9ac9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
@@ -1,89 +1,31 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.tensors.TensorStructure
+import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
 import kotlin.math.max
 
-public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
-
-    override fun TensorStructure<Double>.plus(other: TensorStructure<Double>): DoubleTensor {
-        val broadcast = broadcastTensors(tensor, other.tensor)
-        val newThis = broadcast[0]
-        val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
-            newThis.buffer.array()[i] + newOther.buffer.array()[i]
-        }
-        return DoubleTensor(newThis.shape, resBuffer)
-    }
-
-    override fun TensorStructure<Double>.plusAssign(other: TensorStructure<Double>) {
-        val newOther = broadcastTo(other.tensor, tensor.shape)
-        for (i in 0 until tensor.linearStructure.size) {
-            tensor.buffer.array()[tensor.bufferStart + i] +=
-                newOther.buffer.array()[tensor.bufferStart + i]
-        }
-    }
-
-    override fun TensorStructure<Double>.minus(other: TensorStructure<Double>): DoubleTensor {
-        val broadcast = broadcastTensors(tensor, other.tensor)
-        val newThis = broadcast[0]
-        val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
-            newThis.buffer.array()[i] - newOther.buffer.array()[i]
-        }
-        return DoubleTensor(newThis.shape, resBuffer)
-    }
-
-    override fun TensorStructure<Double>.minusAssign(other: TensorStructure<Double>) {
-        val newOther = broadcastTo(other.tensor, tensor.shape)
-        for (i in 0 until tensor.linearStructure.size) {
-            tensor.buffer.array()[tensor.bufferStart + i] -=
-                newOther.buffer.array()[tensor.bufferStart + i]
-        }
-    }
-
-    override fun TensorStructure<Double>.times(other: TensorStructure<Double>): DoubleTensor {
-        val broadcast = broadcastTensors(tensor, other.tensor)
-        val newThis = broadcast[0]
-        val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
-            newThis.buffer.array()[newThis.bufferStart + i] *
-                    newOther.buffer.array()[newOther.bufferStart + i]
-        }
-        return DoubleTensor(newThis.shape, resBuffer)
-    }
-
-    override fun TensorStructure<Double>.timesAssign(other: TensorStructure<Double>) {
-        val newOther = broadcastTo(other.tensor, tensor.shape)
-        for (i in 0 until tensor.linearStructure.size) {
-            tensor.buffer.array()[tensor.bufferStart + i] *=
-                newOther.buffer.array()[tensor.bufferStart + i]
-        }
-    }
-
-    override fun TensorStructure<Double>.div(other: TensorStructure<Double>): DoubleTensor {
-        val broadcast = broadcastTensors(tensor, other.tensor)
-        val newThis = broadcast[0]
-        val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
-            newThis.buffer.array()[newOther.bufferStart + i] /
-                    newOther.buffer.array()[newOther.bufferStart + i]
-        }
-        return DoubleTensor(newThis.shape, resBuffer)
-    }
-
-    override fun TensorStructure<Double>.divAssign(other: TensorStructure<Double>) {
-        val newOther = broadcastTo(other.tensor, tensor.shape)
-        for (i in 0 until tensor.linearStructure.size) {
-            tensor.buffer.array()[tensor.bufferStart + i] /=
-                newOther.buffer.array()[tensor.bufferStart + i]
-        }
-    }
-
-}
-
 public inline fun <R> BroadcastDoubleTensorAlgebra(block: BroadcastDoubleTensorAlgebra.() -> R): R =
     BroadcastDoubleTensorAlgebra().block()
 
+internal inline fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: DoubleTensor, linearSize: Int) {
+    for (linearIndex in 0 until linearSize) {
+        val totalMultiIndex = resTensor.linearStructure.index(linearIndex)
+        val curMultiIndex = tensor.shape.copyOf()
+
+        val offset = totalMultiIndex.size - curMultiIndex.size
+
+        for (i in curMultiIndex.indices) {
+            if (curMultiIndex[i] != 1) {
+                curMultiIndex[i] = totalMultiIndex[i + offset]
+            } else {
+                curMultiIndex[i] = 0
+            }
+        }
+
+        val curLinearIndex = tensor.linearStructure.offset(curMultiIndex)
+        resTensor.buffer.array()[linearIndex] =
+            tensor.buffer.array()[tensor.bufferStart + curLinearIndex]
+    }
+}
 
 internal inline fun broadcastShapes(vararg shapes: IntArray): IntArray {
     var totalDim = 0
@@ -129,24 +71,7 @@ internal inline fun broadcastTo(tensor: DoubleTensor, newShape: IntArray): Doubl
         }
     }
 
-    for (linearIndex in 0 until n) {
-        val totalMultiIndex = resTensor.linearStructure.index(linearIndex)
-        val curMultiIndex = tensor.shape.copyOf()
-
-        val offset = totalMultiIndex.size - curMultiIndex.size
-
-        for (i in curMultiIndex.indices) {
-            if (curMultiIndex[i] != 1) {
-                curMultiIndex[i] = totalMultiIndex[i + offset]
-            } else {
-                curMultiIndex[i] = 0
-            }
-        }
-
-        val curLinearIndex = tensor.linearStructure.offset(curMultiIndex)
-        resTensor.buffer.array()[linearIndex] =
-            tensor.buffer.array()[tensor.bufferStart + curLinearIndex]
-    }
+    multiIndexBroadCasting(tensor, resTensor, n)
     return resTensor
 }
 
@@ -157,25 +82,7 @@ internal inline fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleT
     val res = ArrayList<DoubleTensor>(0)
     for (tensor in tensors) {
         val resTensor = DoubleTensor(totalShape, DoubleArray(n))
-
-        for (linearIndex in 0 until n) {
-            val totalMultiIndex = resTensor.linearStructure.index(linearIndex)
-            val curMultiIndex = tensor.shape.copyOf()
-
-            val offset = totalMultiIndex.size - curMultiIndex.size
-
-            for (i in curMultiIndex.indices) {
-                if (curMultiIndex[i] != 1) {
-                    curMultiIndex[i] = totalMultiIndex[i + offset]
-                } else {
-                    curMultiIndex[i] = 0
-                }
-            }
-
-            val curLinearIndex = tensor.linearStructure.offset(curMultiIndex)
-            resTensor.buffer.array()[linearIndex] =
-                tensor.buffer.array()[tensor.bufferStart + curLinearIndex]
-        }
+        multiIndexBroadCasting(tensor, resTensor, n)
         res.add(resTensor)
     }
 
@@ -208,7 +115,7 @@ internal inline fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<Do
         for (linearIndex in 0 until n) {
             val totalMultiIndex = outerTensor.linearStructure.index(linearIndex)
             var curMultiIndex = tensor.shape.sliceArray(0..tensor.shape.size - 3).copyOf()
-            curMultiIndex = IntArray(totalMultiIndex.size - curMultiIndex.size) {1} + curMultiIndex
+            curMultiIndex = IntArray(totalMultiIndex.size - curMultiIndex.size) { 1 } + curMultiIndex
 
             val newTensor = DoubleTensor(curMultiIndex + matrixShape, tensor.buffer.array())
 
@@ -221,10 +128,14 @@ internal inline fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<Do
             }
 
             for (i in 0 until matrixSize) {
-                val curLinearIndex = newTensor.linearStructure.offset(curMultiIndex +
-                        matrix.linearStructure.index(i))
-                val newLinearIndex = resTensor.linearStructure.offset(totalMultiIndex +
-                        matrix.linearStructure.index(i))
+                val curLinearIndex = newTensor.linearStructure.offset(
+                    curMultiIndex +
+                            matrix.linearStructure.index(i)
+                )
+                val newLinearIndex = resTensor.linearStructure.offset(
+                    totalMultiIndex +
+                            matrix.linearStructure.index(i)
+                )
 
                 resTensor.buffer.array()[resTensor.bufferStart + newLinearIndex] =
                     newTensor.buffer.array()[newTensor.bufferStart + curLinearIndex]
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index 28828eb09..fd5c8413d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -1,6 +1,8 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.tensors.TensorStructure
+import space.kscience.kmath.tensors.api.TensorStructure
+import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
+import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 
 
 internal inline fun checkEmptyShape(shape: IntArray): Unit =
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
similarity index 97%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
index 166f1d6c4..3a130c71e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linutils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
@@ -4,6 +4,8 @@ import space.kscience.kmath.nd.MutableStructure1D
 import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
+import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
 import kotlin.math.abs
 import kotlin.math.min
 import kotlin.math.sign
@@ -31,13 +33,13 @@ internal inline fun <T> BufferedTensor<T>.matrixSequence(): Sequence<BufferedTen
     }
 }
 
-internal inline fun <T> BufferedTensor<T>.forEachVector(vectorAction: (BufferedTensor<T>) -> Unit): Unit {
+internal inline fun <T> BufferedTensor<T>.forEachVector(vectorAction: (BufferedTensor<T>) -> Unit) {
     for (vector in vectorSequence()) {
         vectorAction(vector)
     }
 }
 
-internal inline fun <T> BufferedTensor<T>.forEachMatrix(matrixAction: (BufferedTensor<T>) -> Unit): Unit {
+internal inline fun <T> BufferedTensor<T>.forEachMatrix(matrixAction: (BufferedTensor<T>) -> Unit) {
     for (matrix in matrixSequence()) {
         matrixAction(matrix)
     }
@@ -284,7 +286,7 @@ internal inline fun DoubleLinearOpsTensorAlgebra.svdHelper(
     matrix: DoubleTensor,
     USV: Pair<BufferedTensor<Double>, Pair<BufferedTensor<Double>, BufferedTensor<Double>>>,
     m: Int, n: Int, epsilon: Double
-): Unit {
+) {
     val res = ArrayList<Triple<Double, DoubleTensor, DoubleTensor>>(0)
     val (matrixU, SV) = USV
     val (matrixS, matrixV) = SV
@@ -332,7 +334,7 @@ internal inline fun DoubleLinearOpsTensorAlgebra.svdHelper(
     }
 }
 
-internal inline fun cleanSymHelper(matrix: MutableStructure2D<Double>, n: Int): Unit {
+internal inline fun cleanSymHelper(matrix: MutableStructure2D<Double>, n: Int) {
     for (i in 0 until n)
         for (j in 0 until n) {
             if (i == j) {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index ac823185b..d7d006e42 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -110,7 +110,6 @@ internal inline fun DoubleTensor.toPrettyString(): String = buildString {
             charOffset -=1
         }
         offset += vectorSize
-        // todo refactor
         if (this@toPrettyString.numElements == offset) {
             break
         }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 41c9b72f7..d677f6966 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -1,5 +1,6 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index 4dcdb7848..060bc1607 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -1,5 +1,6 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
 import kotlin.math.abs
 import kotlin.math.exp
 import kotlin.test.Test
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index d19d0b6f6..6120f0e4a 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -1,5 +1,6 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
 import kotlin.math.abs
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -125,8 +126,6 @@ class TestDoubleLinearOpsTensorAlgebra {
 
         val (lu, pivots) = tensor.lu()
 
-        // todo check lu
-
         val (p, l, u) = luPivot(lu, pivots)
 
         assertTrue { p.shape contentEquals shape }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 4de69e1ad..5c068ce83 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -3,7 +3,7 @@ package space.kscience.kmath.tensors.core
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.structures.toDoubleArray
-import kotlin.test.Ignore
+import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index fa7a8fd32..10a9176dc 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -1,7 +1,9 @@
 package space.kscience.kmath.tensors.core
 
 
+import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import kotlin.test.Test
+import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 class TestDoubleTensorAlgebra {
@@ -133,9 +135,9 @@ class TestDoubleTensorAlgebra {
         assertTrue(diagonal1.buffer.array() contentEquals
                 doubleArrayOf(10.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 30.0))
 
-        val diagonal1_offset = diagonalEmbedding(tensor1, 1, 1, 0)
-        assertTrue(diagonal1_offset.shape contentEquals intArrayOf(4, 4))
-        assertTrue(diagonal1_offset.buffer.array() contentEquals
+        val diagonal1Offset = diagonalEmbedding(tensor1, 1, 1, 0)
+        assertTrue(diagonal1Offset.shape contentEquals intArrayOf(4, 4))
+        assertTrue(diagonal1Offset.buffer.array() contentEquals
                 doubleArrayOf(0.0, 0.0, 0.0, 0.0, 10.0, 0.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 0.0, 30.0, 0.0))
 
         val diagonal2 = diagonalEmbedding(tensor2, 1, 0, 2)
@@ -149,7 +151,15 @@ class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun testContentEqual() = DoubleTensorAlgebra {
-        //TODO()
+    fun testEq() = DoubleTensorAlgebra {
+        val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor3 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 5.0))
+        val tensor4 = fromArray(intArrayOf(6, 1), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+
+        assertTrue(tensor1 eq tensor1)
+        assertTrue(tensor1 eq tensor2)
+        assertFalse(tensor1.eq(tensor3))
+
     }
 }
\ No newline at end of file
-- 
2.34.1


From 287e2aeba2ba274508f42f1ab0a839ed69861bc1 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 23 Apr 2021 14:22:52 +0100
Subject: [PATCH 133/713] div operator

---
 .../kmath/tensors/api/TensorPartialDivisionAlgebra.kt  |  1 +
 .../kmath/tensors/core/algebras/DoubleTensorAlgebra.kt | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
index 075e86e61..4dab3dd07 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.tensors.api
 // https://proofwiki.org/wiki/Definition:Division_Algebra
 public interface TensorPartialDivisionAlgebra<T> :
     TensorAlgebra<T> {
+    public operator fun T.div(other: TensorStructure<T>): TensorStructure<T>
     public operator fun TensorStructure<T>.div(value: T): TensorStructure<T>
     public operator fun TensorStructure<T>.div(other: TensorStructure<T>): TensorStructure<T>
     public operator fun TensorStructure<T>.divAssign(value: T)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index 651db2c21..b61a484d0 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -178,13 +178,15 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         }
     }
 
-    override fun TensorStructure<Double>.div(value: Double): DoubleTensor {
-        val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.buffer.array()[tensor.bufferStart + i] / value
+    override fun Double.div(other: TensorStructure<Double>): DoubleTensor {
+        val resBuffer = DoubleArray(other.tensor.numElements) { i ->
+            other.tensor.buffer.array()[other.tensor.bufferStart + i] / this
         }
-        return DoubleTensor(tensor.shape, resBuffer)
+        return DoubleTensor(other.shape, resBuffer)
     }
 
+    override fun TensorStructure<Double>.div(value: Double): DoubleTensor = value / tensor
+
     override fun TensorStructure<Double>.div(other: TensorStructure<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
-- 
2.34.1


From 077c2b4e3b7168a297f5518876dca8ca9a390578 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <38042667+CommanderTvis@users.noreply.github.com>
Date: Fri, 23 Apr 2021 08:49:01 +0700
Subject: [PATCH 134/713] Update README.md in kmath-ast

---
 kmath-ast/README.md               | 5 +++--
 kmath-ast/docs/README-TEMPLATE.md | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index eedba16fa..1ee78956e 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -50,7 +50,7 @@ For example, the following builder:
 MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 ``` 
 
-… leads to generation of bytecode, which can be decompiled to the following Java class:
+... leads to generation of bytecode, which can be decompiled to the following Java class:
 
 ```java
 package space.kscience.kmath.asm.generated;
@@ -97,6 +97,7 @@ var executable = function (constants, arguments) {
 };
 ```
 
+JS also supports very experimental expression optimization with [WebAssembly](https://webassembly.org/) IR generation. Currently, only expressions inside `DoubleField` and `IntRing` are supported.
 
 ```kotlin
 import space.kscience.kmath.wasm.*
@@ -104,7 +105,7 @@ import space.kscience.kmath.wasm.*
 MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 ```
 
-An example of emitted WASM IR in the form of WAT:
+An example of emitted Wasm IR in the form of WAT:
 
 ```lisp
 (func $executable (param $0 f64) (result f64)
diff --git a/kmath-ast/docs/README-TEMPLATE.md b/kmath-ast/docs/README-TEMPLATE.md
index b38311ea1..1ecf477ef 100644
--- a/kmath-ast/docs/README-TEMPLATE.md
+++ b/kmath-ast/docs/README-TEMPLATE.md
@@ -19,7 +19,7 @@ For example, the following builder:
 MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 ``` 
 
-… leads to generation of bytecode, which can be decompiled to the following Java class:
+... leads to generation of bytecode, which can be decompiled to the following Java class:
 
 ```java
 package space.kscience.kmath.asm.generated;
@@ -66,6 +66,7 @@ var executable = function (constants, arguments) {
 };
 ```
 
+JS also supports very experimental expression optimization with [WebAssembly](https://webassembly.org/) IR generation. Currently, only expressions inside `DoubleField` and `IntRing` are supported.
 
 ```kotlin
 import space.kscience.kmath.wasm.*
@@ -73,7 +74,7 @@ import space.kscience.kmath.wasm.*
 MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 ```
 
-An example of emitted WASM IR in the form of WAT:
+An example of emitted Wasm IR in the form of WAT:
 
 ```lisp
 (func \$executable (param \$0 f64) (result f64)
-- 
2.34.1


From 4f593aec63cd931ebe2d254baf6cee0ef3ca342c Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Sat, 24 Apr 2021 18:53:21 +0100
Subject: [PATCH 135/713] Buffer mini-protocol

---
 kmath-core/api/kmath-core.api                 |  8 ++++-
 .../space/kscience/kmath/nd/BufferND.kt       | 35 ++++++++++++++++++-
 .../kmath/tensors/core/BufferedTensor.kt      |  2 ++
 .../kscience/kmath/tensors/core/utils.kt      | 23 +++---------
 .../kmath/tensors/core/TestDoubleTensor.kt    | 34 ++++++++++++++++++
 5 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 38cfbd58d..41b85b3bb 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -748,7 +748,7 @@ public final class space/kscience/kmath/nd/BufferAlgebraNDKt {
 	public static final fun ring (Lspace/kscience/kmath/nd/AlgebraND$Companion;Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;[I)Lspace/kscience/kmath/nd/BufferedRingND;
 }
 
-public final class space/kscience/kmath/nd/BufferND : space/kscience/kmath/nd/StructureND {
+public class space/kscience/kmath/nd/BufferND : space/kscience/kmath/nd/StructureND {
 	public fun <init> (Lspace/kscience/kmath/nd/Strides;Lspace/kscience/kmath/structures/Buffer;)V
 	public fun elements ()Lkotlin/sequences/Sequence;
 	public fun get ([I)Ljava/lang/Object;
@@ -876,6 +876,12 @@ public abstract interface class space/kscience/kmath/nd/GroupND : space/kscience
 public final class space/kscience/kmath/nd/GroupND$Companion {
 }
 
+public final class space/kscience/kmath/nd/MutableBufferND : space/kscience/kmath/nd/BufferND, space/kscience/kmath/nd/MutableStructureND {
+	public fun <init> (Lspace/kscience/kmath/nd/Strides;Lspace/kscience/kmath/structures/MutableBuffer;)V
+	public final fun getMutableBuffer ()Lspace/kscience/kmath/structures/MutableBuffer;
+	public fun set ([ILjava/lang/Object;)V
+}
+
 public abstract interface class space/kscience/kmath/nd/MutableStructure1D : space/kscience/kmath/nd/MutableStructureND, space/kscience/kmath/nd/Structure1D, space/kscience/kmath/structures/MutableBuffer {
 	public fun set ([ILjava/lang/Object;)V
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 23d961a7e..1f608f478 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -7,6 +7,8 @@ package space.kscience.kmath.nd
 
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
+import space.kscience.kmath.structures.MutableBuffer
+import space.kscience.kmath.structures.MutableBufferFactory
 
 /**
  * Represents [StructureND] over [Buffer].
@@ -15,7 +17,7 @@ import space.kscience.kmath.structures.BufferFactory
  * @param strides The strides to access elements of [Buffer] by linear indices.
  * @param buffer The underlying buffer.
  */
-public class BufferND<T>(
+public open class BufferND<T>(
     public val strides: Strides,
     public val buffer: Buffer<T>,
 ) : StructureND<T> {
@@ -50,4 +52,35 @@ public inline fun <T, reified R : Any> StructureND<T>.mapToBuffer(
         val strides = DefaultStrides(shape)
         BufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
     }
+}
+
+/**
+ * Represents [MutableStructureND] over [MutableBuffer].
+ *
+ * @param T the type of items.
+ * @param strides The strides to access elements of [MutableBuffer] by linear indices.
+ * @param mutableBuffer The underlying buffer.
+ */
+public class MutableBufferND<T>(
+    strides: Strides,
+    public val mutableBuffer: MutableBuffer<T>,
+) : MutableStructureND<T>, BufferND<T>(strides, mutableBuffer) {
+    override fun set(index: IntArray, value: T) {
+        mutableBuffer[strides.offset(index)] = value
+    }
+}
+
+/**
+ * Transform structure to a new structure using provided [MutableBufferFactory] and optimizing if argument is [MutableBufferND]
+ */
+public inline fun <T, reified R : Any> MutableStructureND<T>.mapToMutableBuffer(
+    factory: MutableBufferFactory<R> = MutableBuffer.Companion::auto,
+    crossinline transform: (T) -> R,
+): MutableBufferND<R> {
+    return if (this is MutableBufferND<T>)
+        MutableBufferND(this.strides, factory.invoke(strides.linearSize) { transform(mutableBuffer[it]) })
+    else {
+        val strides = DefaultStrides(shape)
+        MutableBufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
+    }
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 5c0d9c4ea..1e9b458b1 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -1,5 +1,6 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.nd.MutableBufferND
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.api.TensorStructure
 import space.kscience.kmath.tensors.core.algebras.TensorLinearStructure
@@ -60,6 +61,7 @@ internal inline fun BufferedTensor<Double>.asTensor(): DoubleTensor = DoubleTens
 
 internal inline fun <T> TensorStructure<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
     is BufferedTensor<T> -> this
+    is MutableBufferND<T> -> BufferedTensor(this.shape, this.mutableBuffer, 0)
     else -> BufferedTensor(this.shape, this.elements().map{ it.second }.toMutableList().asMutableBuffer(), 0)
 }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index d7d006e42..89e9d0d96 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -7,35 +7,20 @@ import space.kscience.kmath.structures.*
 import kotlin.math.*
 
 /**
- * Returns a reference to [IntArray] containing all of the elements of this [Buffer].
+ * Returns a reference to [IntArray] containing all of the elements of this [Buffer] or copy the data.
  */
 internal fun Buffer<Int>.array(): IntArray = when (this) {
     is IntBuffer -> array
-    else -> throw RuntimeException("Failed to cast Buffer to IntArray")
+    else -> this.toIntArray()
 }
 
-/**
- * Returns a reference to [LongArray] containing all of the elements of this [Buffer].
- */
-internal fun Buffer<Long>.array(): LongArray = when (this) {
-    is LongBuffer -> array
-    else -> throw RuntimeException("Failed to cast Buffer to LongArray")
-}
 
 /**
- * Returns a reference to [FloatArray] containing all of the elements of this [Buffer].
- */
-internal fun Buffer<Float>.array(): FloatArray = when (this) {
-    is FloatBuffer -> array
-    else -> throw RuntimeException("Failed to cast Buffer to FloatArray")
-}
-
-/**
- * Returns a reference to [DoubleArray] containing all of the elements of this [Buffer].
+ * Returns a reference to [DoubleArray] containing all of the elements of this [Buffer] or copy the data.
  */
 internal fun Buffer<Double>.array(): DoubleArray = when (this) {
     is DoubleBuffer -> array
-    else -> throw RuntimeException("Failed to cast Buffer to DoubleArray")
+    else -> this.toDoubleArray()
 }
 
 internal inline fun getRandomNormals(n: Int, seed: Long): DoubleArray {
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 5c068ce83..f9d15c216 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -1,7 +1,11 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.nd.DefaultStrides
+import space.kscience.kmath.nd.MutableBufferND
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.asMutableBuffer
 import space.kscience.kmath.structures.toDoubleArray
 import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import kotlin.test.Test
@@ -47,4 +51,34 @@ class TestDoubleTensor {
             assertEquals(secondRow[1], secondColumn[1])
         }
     }
+
+    @Test
+    fun bufferProtocol() {
+
+        // create buffers
+        val doubleBuffer = DoubleBuffer(doubleArrayOf(1.0,2.0,3.0))
+        val doubleList = MutableList(3, doubleBuffer::get)
+
+        // create ND buffers
+        val ndBuffer = MutableBufferND(DefaultStrides(intArrayOf(3)), doubleBuffer)
+        val ndList = MutableBufferND(DefaultStrides(intArrayOf(3)), doubleList.asMutableBuffer())
+
+        // map to tensors
+        val bufferedTensorBuffer = ndBuffer.toBufferedTensor() // strides are flipped
+        val tensorBuffer = bufferedTensorBuffer.asTensor() // no data copied
+
+        val bufferedTensorList = ndList.toBufferedTensor() // strides are flipped
+        val tensorList = bufferedTensorList.asTensor() // data copied
+
+        tensorBuffer[intArrayOf(0)] = 55.9
+        assertEquals(ndBuffer[intArrayOf(0)], 55.9)
+        assertEquals(doubleBuffer[0], 55.9)
+
+        tensorList[intArrayOf(0)] = 55.9
+        assertEquals(ndList[intArrayOf(0)], 1.0)
+        assertEquals(doubleList[0], 1.0)
+
+        ndList[intArrayOf(0)] = 55.9
+        assertEquals(doubleList[0], 55.9)
+    }
 }
\ No newline at end of file
-- 
2.34.1


From 257337f4fb2a7681ff769b202dd4f16ebb8e0725 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 25 Apr 2021 22:34:59 +0300
Subject: [PATCH 136/713] [WIP] Refactor optimization

---
 .../kscience/kmath/functions/integrate.kt     |   4 +-
 .../kmath/functions/matrixIntegration.kt      |   4 +-
 .../kmath/commons/integration/CMIntegrator.kt |  13 +-
 .../integration/GaussRuleIntegrator.kt        |   4 +-
 .../commons/optimization/CMOptimization.kt    | 145 ++--
 .../kmath/commons/optimization/cmFit.kt       |  20 +-
 .../commons/optimization/OptimizeTest.kt      |   4 +-
 .../kmath/data/XYErrorColumnarData.kt         |  33 +
 .../kscience/kmath/data/XYZColumnarData.kt    |   2 +-
 .../expressions/DifferentiableExpression.kt   |   2 +-
 .../kmath/expressions/SymbolIndexer.kt        |  10 +
 .../space/kscience/kmath/linear/symmetric.kt  |  34 +
 .../space/kscience/kmath/misc/Featured.kt     |  37 +
 .../kmath/structures/BufferAccessor2D.kt      |   2 +-
 .../kmath/structures/DoubleBufferField.kt     |  10 +-
 .../space/kscience/kmath/real/RealVector.kt   |  11 +-
 .../kmath/integration/GaussIntegrator.kt      |  12 +-
 .../kscience/kmath/integration/Integrand.kt   |   7 +-
 .../kscience/kmath/integration/Integrator.kt  |   2 +-
 .../integration/MultivariateIntegrand.kt      |  18 +-
 .../kmath/integration/UnivariateIntegrand.kt  |  24 +-
 .../kmath/integration/GaussIntegralTest.kt    |   4 +-
 .../optimization/FunctionOptimization.kt      | 163 ++--
 .../NoDerivFunctionOptimization.kt            |  74 --
 .../kmath/optimization/Optimization.kt        |  49 --
 .../kmath/optimization/OptimizationProblem.kt |  46 ++
 .../kscience/kmath/optimization/XYFit.kt      |   2 +-
 .../minuit/AnalyticalGradientCalculator.kt    |  61 ++
 .../optimization/minuit/CombinedMinimizer.kt  |  32 +
 .../minuit/CombinedMinimumBuilder.kt          |  57 ++
 .../optimization/minuit/ContoursError.kt      | 150 ++++
 .../minuit/DavidonErrorUpdator.kt             |  45 ++
 .../optimization/minuit/FunctionGradient.kt   |  72 ++
 .../optimization/minuit/FunctionMinimum.kt    | 259 ++++++
 .../optimization/minuit/GradientCalculator.kt |  41 +
 .../minuit/HessianGradientCalculator.kt       | 137 ++++
 .../minuit/InitialGradientCalculator.kt       | 116 +++
 .../kmath/optimization/minuit/MINOSResult.kt  |  70 ++
 .../kmath/optimization/minuit/MINUITFitter.kt | 205 +++++
 .../kmath/optimization/minuit/MINUITPlugin.kt |  86 ++
 .../kmath/optimization/minuit/MINUITUtils.kt  | 121 +++
 .../optimization/minuit/MinimumBuilder.kt     |  43 +
 .../kmath/optimization/minuit/MinimumError.kt | 155 ++++
 .../minuit/MinimumErrorUpdator.kt             |  33 +
 .../optimization/minuit/MinimumParameters.kt  |  70 ++
 .../kmath/optimization/minuit/MinimumSeed.kt  |  64 ++
 .../minuit/MinimumSeedGenerator.kt            |  37 +
 .../kmath/optimization/minuit/MinimumState.kt | 104 +++
 .../kmath/optimization/minuit/MinosError.kt   | 219 +++++
 .../optimization/minuit/MinuitParameter.kt    | 314 ++++++++
 .../minuit/MnAlgebraicSymMatrix.kt            | 458 +++++++++++
 .../optimization/minuit/MnApplication.kt      | 554 +++++++++++++
 .../kmath/optimization/minuit/MnContours.kt   | 283 +++++++
 .../minuit/MnCovarianceSqueeze.kt             | 113 +++
 .../kmath/optimization/minuit/MnCross.kt      |  99 +++
 .../kmath/optimization/minuit/MnEigen.kt      |  50 ++
 .../kmath/optimization/minuit/MnFcn.kt        |  50 ++
 .../optimization/minuit/MnFunctionCross.kt    | 369 +++++++++
 .../minuit/MnGlobalCorrelationCoeff.kt        |  79 ++
 .../kmath/optimization/minuit/MnHesse.kt      | 371 +++++++++
 .../kmath/optimization/minuit/MnLineSearch.kt | 204 +++++
 .../optimization/minuit/MnMachinePrecision.kt |  71 ++
 .../kmath/optimization/minuit/MnMigrad.kt     | 136 ++++
 .../kmath/optimization/minuit/MnMinimize.kt   | 133 +++
 .../kmath/optimization/minuit/MnMinos.kt      | 379 +++++++++
 .../kmath/optimization/minuit/MnParabola.kt   |  55 ++
 .../optimization/minuit/MnParabolaFactory.kt  |  58 ++
 .../optimization/minuit/MnParabolaPoint.kt    |  30 +
 .../optimization/minuit/MnParameterScan.kt    | 113 +++
 .../kmath/optimization/minuit/MnPlot.kt       | 438 ++++++++++
 .../kmath/optimization/minuit/MnPosDef.kt     |  89 +++
 .../kmath/optimization/minuit/MnPrint.kt      | 387 +++++++++
 .../kmath/optimization/minuit/MnScan.kt       | 181 +++++
 .../optimization/minuit/MnSeedGenerator.kt    | 107 +++
 .../kmath/optimization/minuit/MnSimplex.kt    | 138 ++++
 .../kmath/optimization/minuit/MnStrategy.kt   | 310 +++++++
 .../optimization/minuit/MnUserCovariance.kt   | 147 ++++
 .../kmath/optimization/minuit/MnUserFcn.kt    |  30 +
 .../minuit/MnUserParameterState.kt            | 756 ++++++++++++++++++
 .../optimization/minuit/MnUserParameters.kt   | 402 ++++++++++
 .../minuit/MnUserTransformation.kt            | 390 +++++++++
 .../kmath/optimization/minuit/MnUtils.kt      | 147 ++++
 .../minuit/ModularFunctionMinimizer.kt        |  72 ++
 .../minuit/NegativeG2LineSearch.kt            |  80 ++
 .../minuit/Numerical2PGradientCalculator.kt   | 122 +++
 .../kmath/optimization/minuit/Range.kt        |  32 +
 .../kmath/optimization/minuit/ScanBuilder.kt  |  58 ++
 .../optimization/minuit/ScanMinimizer.kt      |  36 +
 .../optimization/minuit/SimplexBuilder.kt     | 179 +++++
 .../optimization/minuit/SimplexMinimizer.kt   |  43 +
 .../optimization/minuit/SimplexParameters.kt  |  85 ++
 .../minuit/SimplexSeedGenerator.kt            |  52 ++
 .../minuit/SinParameterTransformation.kt      |  48 ++
 .../minuit/SqrtLowParameterTransformation.kt  |  43 +
 .../minuit/SqrtUpParameterTransformation.kt   |  43 +
 .../minuit/VariableMetricBuilder.kt           | 137 ++++
 .../minuit/VariableMetricEDMEstimator.kt      |  31 +
 .../minuit/VariableMetricMinimizer.kt         |  43 +
 .../kmath/optimization/minuit/package-info.kt |  17 +
 .../kscience/kmath/optimization/qow/QowFit.kt | 380 +++++++++
 100 files changed, 11509 insertions(+), 346 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/symmetric.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
 delete mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt
 delete mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/AnalyticalGradientCalculator.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/CombinedMinimizer.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/CombinedMinimumBuilder.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ContoursError.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/DavidonErrorUpdator.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/FunctionGradient.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/FunctionMinimum.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/GradientCalculator.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/HessianGradientCalculator.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/InitialGradientCalculator.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINOSResult.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITFitter.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITPlugin.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITUtils.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumBuilder.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumError.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumErrorUpdator.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumParameters.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeed.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeedGenerator.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumState.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinosError.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinuitParameter.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnAlgebraicSymMatrix.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnApplication.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnContours.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnCovarianceSqueeze.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnCross.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnEigen.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnFcn.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnFunctionCross.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnGlobalCorrelationCoeff.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnHesse.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnLineSearch.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMachinePrecision.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMigrad.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMinimize.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMinos.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabola.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabolaFactory.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabolaPoint.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParameterScan.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPlot.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPosDef.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPrint.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnScan.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnSeedGenerator.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnSimplex.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnStrategy.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserCovariance.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserFcn.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserParameterState.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserParameters.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserTransformation.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUtils.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ModularFunctionMinimizer.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/NegativeG2LineSearch.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Numerical2PGradientCalculator.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Range.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ScanBuilder.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ScanMinimizer.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexBuilder.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexMinimizer.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexParameters.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexSeedGenerator.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SinParameterTransformation.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SqrtLowParameterTransformation.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SqrtUpParameterTransformation.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricBuilder.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricEDMEstimator.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricMinimizer.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/package-info.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
index 6990e8c8f..7cdf7bef6 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.integration.integrate
+import space.kscience.kmath.integration.process
 import space.kscience.kmath.integration.value
 import space.kscience.kmath.operations.DoubleField
 import kotlin.math.pow
@@ -15,7 +15,7 @@ fun main() {
     val function: UnivariateFunction<Double> = { x -> 3 * x.pow(2) + 2 * x + 1 }
 
     //get the result of the integration
-    val result = DoubleField.integrate(0.0..10.0, function = function)
+    val result = DoubleField.process(0.0..10.0, function = function)
 
     //the value is nullable because in some cases the integration could not succeed
     println(result.value)
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index 8020df8f6..206ba3054 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.integration.integrate
+import space.kscience.kmath.integration.process
 import space.kscience.kmath.integration.value
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.nd
@@ -24,7 +24,7 @@ fun main(): Unit = DoubleField {
         val function: (Double) -> StructureND<Double> = { x: Double -> 3 * number(x).pow(2) + 2 * diagonal(x) + 1 }
 
         //get the result of the integration
-        val result = integrate(0.0..10.0, function = function)
+        val result = process(0.0..10.0, function = function)
 
         //the value is nullable because in some cases the integration could not succeed
         println(result.value)
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
index 92bf86128..9da35a7c0 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
@@ -24,7 +24,7 @@ public class CMIntegrator(
     public class MinIterations(public val value: Int) : IntegrandFeature
     public class MaxIterations(public val value: Int) : IntegrandFeature
 
-    override fun integrate(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
+    override fun process(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
         val integrator = integratorBuilder(integrand)
         val maxCalls = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: defaultMaxCalls
         val remainingCalls = maxCalls - integrand.calls
@@ -32,11 +32,12 @@ public class CMIntegrator(
             ?: error("Integration range is not provided")
         val res = integrator.integrate(remainingCalls, integrand.function, range.start, range.endInclusive)
 
-        return integrand +
-                IntegrandValue(res) +
-                IntegrandAbsoluteAccuracy(integrator.absoluteAccuracy) +
-                IntegrandRelativeAccuracy(integrator.relativeAccuracy) +
-                IntegrandCallsPerformed(integrator.evaluations + integrand.calls)
+        return integrand.with(
+            IntegrandValue(res),
+            IntegrandAbsoluteAccuracy(integrator.absoluteAccuracy),
+            IntegrandRelativeAccuracy(integrator.relativeAccuracy),
+            IntegrandCallsPerformed(integrator.evaluations + integrand.calls)
+        )
     }
 
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt
index 1c9915563..1361b1079 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt
@@ -16,7 +16,7 @@ public class GaussRuleIntegrator(
     private var type: GaussRule = GaussRule.LEGANDRE,
 ) : UnivariateIntegrator<Double> {
 
-    override fun integrate(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
+    override fun process(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
         val range = integrand.getFeature<IntegrationRange>()?.range
             ?: error("Integration range is not provided")
         val integrator: GaussIntegrator = getIntegrator(range)
@@ -76,7 +76,7 @@ public class GaussRuleIntegrator(
             numPoints: Int = 100,
             type: GaussRule = GaussRule.LEGANDRE,
             function: (Double) -> Double,
-        ): Double = GaussRuleIntegrator(numPoints, type).integrate(
+        ): Double = GaussRuleIntegrator(numPoints, type).process(
             UnivariateIntegrand(function, IntegrationRange(range))
         ).value!!
     }
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
index cfb8c39be..db9ba6f21 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
@@ -14,10 +14,7 @@ import org.apache.commons.math3.optim.nonlinear.scalar.gradient.NonLinearConjuga
 import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.AbstractSimplex
 import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.NelderMeadSimplex
 import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.SimplexOptimizer
-import space.kscience.kmath.expressions.DifferentiableExpression
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.SymbolIndexer
-import space.kscience.kmath.expressions.derivative
+import space.kscience.kmath.expressions.*
 import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.optimization.*
@@ -26,94 +23,98 @@ import kotlin.reflect.KClass
 public operator fun PointValuePair.component1(): DoubleArray = point
 public operator fun PointValuePair.component2(): Double = value
 
+public class CMOptimizerFactory(public val optimizerBuilder: () -> MultivariateOptimizer) : OptimizationFeature
+//public class CMOptimizerData(public val )
+
 @OptIn(UnstableKMathAPI::class)
-public class CMOptimization(
-    override val symbols: List<Symbol>,
-) : FunctionOptimization<Double>, NoDerivFunctionOptimization<Double>, SymbolIndexer, OptimizationFeature {
+public class CMOptimization : Optimizer<FunctionOptimization<Double>> {
 
-    private val optimizationData: HashMap<KClass<out OptimizationData>, OptimizationData> = HashMap()
-    private var optimizerBuilder: (() -> MultivariateOptimizer)? = null
-    public var convergenceChecker: ConvergenceChecker<PointValuePair> = SimpleValueChecker(
-        DEFAULT_RELATIVE_TOLERANCE,
-        DEFAULT_ABSOLUTE_TOLERANCE,
-        DEFAULT_MAX_ITER
-    )
+    override suspend fun process(
+        problem: FunctionOptimization<Double>
+    ): FunctionOptimization<Double> = withSymbols(problem.parameters){
+        val cmOptimizer: MultivariateOptimizer =
+            problem.getFeature<CMOptimizerFactory>()?.optimizerBuilder?.invoke() ?: SimplexOptimizer()
 
-    override var maximize: Boolean
-        get() = optimizationData[GoalType::class] == GoalType.MAXIMIZE
-        set(value) {
-            optimizationData[GoalType::class] = if (value) GoalType.MAXIMIZE else GoalType.MINIMIZE
+        val convergenceChecker: ConvergenceChecker<PointValuePair> = SimpleValueChecker(
+            DEFAULT_RELATIVE_TOLERANCE,
+            DEFAULT_ABSOLUTE_TOLERANCE,
+            DEFAULT_MAX_ITER
+        )
+
+        val optimizationData: HashMap<KClass<out OptimizationData>, OptimizationData> = HashMap()
+
+        fun addOptimizationData(data: OptimizationData) {
+            optimizationData[data::class] = data
         }
-
-    public fun addOptimizationData(data: OptimizationData) {
-        optimizationData[data::class] = data
-    }
-
-    init {
         addOptimizationData(MaxEval.unlimited())
-    }
+        addOptimizationData(InitialGuess(problem.initialGuess.toDoubleArray()))
 
-    public fun exportOptimizationData(): List<OptimizationData> = optimizationData.values.toList()
+        fun exportOptimizationData(): List<OptimizationData> = optimizationData.values.toList()
 
-    public override fun initialGuess(map: Map<Symbol, Double>): Unit {
-        addOptimizationData(InitialGuess(map.toDoubleArray()))
-    }
 
-    public override fun function(expression: Expression<Double>): Unit {
-        val objectiveFunction = ObjectiveFunction {
-            val args = it.toMap()
-            expression(args)
+        /**
+         * Register no-deriv function instead of  differentiable function
+         */
+        /**
+         * Register no-deriv function instead of  differentiable function
+         */
+        fun noDerivFunction(expression: Expression<Double>): Unit {
+            val objectiveFunction = ObjectiveFunction {
+                val args = problem.initialGuess + it.toMap()
+                expression(args)
+            }
+            addOptimizationData(objectiveFunction)
         }
-        addOptimizationData(objectiveFunction)
-    }
 
-    public override fun diffFunction(expression: DifferentiableExpression<Double, Expression<Double>>) {
-        function(expression)
-        val gradientFunction = ObjectiveFunctionGradient {
-            val args = it.toMap()
-            DoubleArray(symbols.size) { index ->
-                expression.derivative(symbols[index])(args)
+        public override fun function(expression: DifferentiableExpression<Double, Expression<Double>>) {
+            noDerivFunction(expression)
+            val gradientFunction = ObjectiveFunctionGradient {
+                val args = startingPoint + it.toMap()
+                DoubleArray(symbols.size) { index ->
+                    expression.derivative(symbols[index])(args)
+                }
+            }
+            addOptimizationData(gradientFunction)
+            if (optimizerBuilder == null) {
+                optimizerBuilder = {
+                    NonLinearConjugateGradientOptimizer(
+                        NonLinearConjugateGradientOptimizer.Formula.FLETCHER_REEVES,
+                        convergenceChecker
+                    )
+                }
             }
         }
-        addOptimizationData(gradientFunction)
-        if (optimizerBuilder == null) {
-            optimizerBuilder = {
-                NonLinearConjugateGradientOptimizer(
-                    NonLinearConjugateGradientOptimizer.Formula.FLETCHER_REEVES,
-                    convergenceChecker
-                )
+
+        public fun simplex(simplex: AbstractSimplex) {
+            addOptimizationData(simplex)
+            //Set optimization builder to simplex if it is not present
+            if (optimizerBuilder == null) {
+                optimizerBuilder = { SimplexOptimizer(convergenceChecker) }
             }
         }
-    }
 
-    public fun simplex(simplex: AbstractSimplex) {
-        addOptimizationData(simplex)
-        //Set optimization builder to simplex if it is not present
-        if (optimizerBuilder == null) {
-            optimizerBuilder = { SimplexOptimizer(convergenceChecker) }
+        public fun simplexSteps(steps: Map<Symbol, Double>) {
+            simplex(NelderMeadSimplex(steps.toDoubleArray()))
         }
-    }
 
-    public fun simplexSteps(steps: Map<Symbol, Double>) {
-        simplex(NelderMeadSimplex(steps.toDoubleArray()))
-    }
+        public fun goal(goalType: GoalType) {
+            addOptimizationData(goalType)
+        }
 
-    public fun goal(goalType: GoalType) {
-        addOptimizationData(goalType)
-    }
+        public fun optimizer(block: () -> MultivariateOptimizer) {
+            optimizerBuilder = block
+        }
 
-    public fun optimizer(block: () -> MultivariateOptimizer) {
-        optimizerBuilder = block
-    }
+        override fun update(result: OptimizationResult<Double>) {
+            initialGuess(result.point)
+        }
 
-    override fun update(result: OptimizationResult<Double>) {
-        initialGuess(result.point)
-    }
-
-    override fun optimize(): OptimizationResult<Double> {
-        val optimizer = optimizerBuilder?.invoke() ?: error("Optimizer not defined")
-        val (point, value) = optimizer.optimize(*optimizationData.values.toTypedArray())
-        return OptimizationResult(point.toMap(), value, setOf(this))
+        override suspend fun optimize(): OptimizationResult<Double> {
+            val optimizer = optimizerBuilder?.invoke() ?: error("Optimizer not defined")
+            val (point, value) = optimizer.optimize(*optimizationData.values.toTypedArray())
+            return OptimizationResult(point.toMap(), value)
+        }
+        return@withSymbols TODO()
     }
 
     public companion object : OptimizationProblemFactory<Double, CMOptimization> {
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
index 13b5c73f4..12d924063 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
@@ -10,10 +10,7 @@ import space.kscience.kmath.commons.expressions.DerivativeStructureField
 import space.kscience.kmath.expressions.DifferentiableExpression
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.misc.Symbol
-import space.kscience.kmath.optimization.FunctionOptimization
-import space.kscience.kmath.optimization.OptimizationResult
-import space.kscience.kmath.optimization.noDerivOptimizeWith
-import space.kscience.kmath.optimization.optimizeWith
+import space.kscience.kmath.optimization.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asBuffer
 
@@ -46,20 +43,25 @@ public fun FunctionOptimization.Companion.chiSquared(
 /**
  * Optimize expression without derivatives
  */
-public fun Expression<Double>.optimize(
+public suspend fun Expression<Double>.optimize(
     vararg symbols: Symbol,
     configuration: CMOptimization.() -> Unit,
-): OptimizationResult<Double> = noDerivOptimizeWith(CMOptimization, symbols = symbols, configuration)
+): OptimizationResult<Double> {
+    require(symbols.isNotEmpty()) { "Must provide a list of symbols for optimization" }
+    val problem = CMOptimization(symbols.toList(), configuration)
+    problem.noDerivFunction(this)
+    return problem.optimize()
+}
 
 /**
  * Optimize differentiable expression
  */
-public fun DifferentiableExpression<Double, Expression<Double>>.optimize(
+public suspend fun DifferentiableExpression<Double, Expression<Double>>.optimize(
     vararg symbols: Symbol,
     configuration: CMOptimization.() -> Unit,
 ): OptimizationResult<Double> = optimizeWith(CMOptimization, symbols = symbols, configuration)
 
-public fun DifferentiableExpression<Double, Expression<Double>>.minimize(
+public suspend fun DifferentiableExpression<Double, Expression<Double>>.minimize(
     vararg startPoint: Pair<Symbol, Double>,
     configuration: CMOptimization.() -> Unit = {},
 ): OptimizationResult<Double> {
@@ -67,7 +69,7 @@ public fun DifferentiableExpression<Double, Expression<Double>>.minimize(
     return optimize(*symbols){
         maximize = false
         initialGuess(startPoint.toMap())
-        diffFunction(this@minimize)
+        function(this@minimize)
         configuration()
     }
 }
\ No newline at end of file
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index 716cd1b0f..9b92eaac5 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -24,7 +24,7 @@ internal class OptimizeTest {
     }
 
     @Test
-    fun testGradientOptimization() {
+    fun testGradientOptimization() = runBlocking{
         val result = normal.optimize(x, y) {
             initialGuess(x to 1.0, y to 1.0)
             //no need to select optimizer. Gradient optimizer is used by default because gradients are provided by function
@@ -34,7 +34,7 @@ internal class OptimizeTest {
     }
 
     @Test
-    fun testSimplexOptimization() {
+    fun testSimplexOptimization() = runBlocking{
         val result = normal.optimize(x, y) {
             initialGuess(x to 1.0, y to 1.0)
             simplexSteps(x to 2.0, y to 0.5)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
new file mode 100644
index 000000000..ea98e88b1
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.data
+
+import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.misc.Symbol.Companion.z
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.structures.Buffer
+
+
+/**
+ * A [ColumnarData] with additional [Companion.yErr] column for an [Symbol.y] error
+ * Inherits [XYColumnarData].
+ */
+@UnstableKMathAPI
+public interface XYErrorColumnarData<T, out X : T, out Y : T> : XYColumnarData<T, X, Y> {
+    public val yErr: Buffer<Y>
+
+    override fun get(symbol: Symbol): Buffer<T> = when (symbol) {
+        Symbol.x -> x
+        Symbol.y -> y
+        Companion.yErr -> yErr
+        else -> error("A column for symbol $symbol not found")
+    }
+
+    public companion object{
+        public val yErr: Symbol by symbol
+    }
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
index d76a44e9e..2ae7233ec 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
@@ -10,7 +10,7 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 
 /**
- * A [XYColumnarData] with guaranteed [x], [y] and [z] columns designated by corresponding symbols.
+ * A [ColumnarData] with guaranteed [x], [y] and [z] columns designated by corresponding symbols.
  * Inherits [XYColumnarData].
  */
 @UnstableKMathAPI
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
index dbc1431b3..f2346f483 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
@@ -51,6 +51,6 @@ public abstract class FirstDerivativeExpression<T, R : Expression<T>> : Differen
 /**
  * A factory that converts an expression in autodiff variables to a [DifferentiableExpression]
  */
-public fun interface AutoDiffProcessor<T : Any, I : Any, A : ExpressionAlgebra<T, I>, out R : Expression<T>> {
+public fun interface AutoDiffProcessor<T, I, A : ExpressionAlgebra<T, I>, out R : Expression<T>> {
     public fun process(function: A.() -> I): DifferentiableExpression<T, R>
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
index 738156975..ea72c5b9e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
@@ -10,6 +10,7 @@ import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.structures.BufferFactory
+import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.jvm.JvmInline
 
 /**
@@ -46,6 +47,11 @@ public interface SymbolIndexer {
         return symbols.indices.associate { symbols[it] to get(it) }
     }
 
+    public fun <T> Point<T>.toMap(): Map<Symbol, T> {
+        require(size == symbols.size) { "The input array size for indexer should be ${symbols.size} but $size found" }
+        return symbols.indices.associate { symbols[it] to get(it) }
+    }
+
     public operator fun <T> Structure2D<T>.get(rowSymbol: Symbol, columnSymbol: Symbol): T =
         get(indexOf(rowSymbol), indexOf(columnSymbol))
 
@@ -55,6 +61,10 @@ public interface SymbolIndexer {
     public fun <T> Map<Symbol, T>.toPoint(bufferFactory: BufferFactory<T>): Point<T> =
         bufferFactory(symbols.size) { getValue(symbols[it]) }
 
+    public fun Map<Symbol, Double>.toPoint(): DoubleBuffer =
+        DoubleBuffer(symbols.size) { getValue(symbols[it]) }
+
+
     public fun Map<Symbol, Double>.toDoubleArray(): DoubleArray = DoubleArray(symbols.size) { getValue(symbols[it]) }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/symmetric.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/symmetric.kt
new file mode 100644
index 000000000..04d9a9897
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/symmetric.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.linear
+
+import space.kscience.kmath.structures.BufferAccessor2D
+import space.kscience.kmath.structures.MutableBuffer
+
+public object SymmetricMatrixFeature : MatrixFeature
+
+/**
+ * Naive implementation of a symmetric matrix builder, that adds a [SymmetricMatrixFeature] tag. The resulting matrix contains
+ * full `size^2` number of elements, but caches elements during calls to save [builder] calls. [builder] is always called in the
+ * upper triangle region meaning that `i <= j`
+ */
+public fun <T : Any, LS : LinearSpace<T, *>> LS.buildSymmetricMatrix(
+    size: Int,
+    builder: (i: Int, j: Int) -> T,
+): Matrix<T> = BufferAccessor2D<T?>(size, size, MutableBuffer.Companion::boxing).run {
+    val cache = factory(size * size) { null }
+    buildMatrix(size, size) { i, j ->
+        val cached = cache[i, j]
+        if (cached == null) {
+            val value = if (i <= j) builder(i, j) else builder(j, i)
+            cache[i, j] = value
+            cache[j, i] = value
+            value
+        } else {
+            cached
+        }
+    } + SymmetricMatrixFeature
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
new file mode 100644
index 000000000..157ff980b
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.misc
+
+import kotlin.reflect.KClass
+
+/**
+ * A entity that contains a set of features defined by their types
+ */
+public interface Featured<F : Any> {
+    public fun <T : F> getFeature(type: KClass<out T>): T?
+}
+
+/**
+ * A container for a set of features
+ */
+public class FeatureSet<F : Any> private constructor(public val features: Map<KClass<out F>, Any>) : Featured<F> {
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : F> getFeature(type: KClass<out T>): T? = features[type] as? T
+
+    public inline fun <reified T : F> getFeature(): T? = getFeature(T::class)
+
+    public fun <T : F> with(feature: T, type: KClass<out T> = feature::class): FeatureSet<F> =
+        FeatureSet(features + (type to feature))
+
+    public fun with(other: FeatureSet<F>): FeatureSet<F> = FeatureSet(features + other.features)
+
+    public fun with(vararg otherFeatures: F): FeatureSet<F> =
+        FeatureSet(features + otherFeatures.associateBy { it::class })
+
+    public companion object {
+        public fun <F : Any> of(vararg features: F): FeatureSet<F> = FeatureSet(features.associateBy { it::class })
+    }
+}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
index 352c75956..d29c54d46 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
@@ -13,7 +13,7 @@ import space.kscience.kmath.nd.as2D
 /**
  * A context that allows to operate on a [MutableBuffer] as on 2d array
  */
-internal class BufferAccessor2D<T : Any>(
+internal class BufferAccessor2D<T>(
     public val rowNum: Int,
     public val colNum: Int,
     val factory: MutableBufferFactory<T>,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
index 34b5e373b..e438995dd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
@@ -5,8 +5,10 @@
 
 package space.kscience.kmath.structures
 
+import space.kscience.kmath.linear.Point
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.ExtendedFieldOperations
+import space.kscience.kmath.operations.Norm
 import kotlin.math.*
 
 /**
@@ -161,12 +163,16 @@ public object DoubleBufferFieldOperations : ExtendedFieldOperations<Buffer<Doubl
         DoubleBuffer(DoubleArray(arg.size) { ln(arg[it]) })
 }
 
+public object DoubleL2Norm : Norm<Point<Double>, Double> {
+    override fun norm(arg: Point<Double>): Double = sqrt(arg.fold(0.0) { acc: Double, d: Double -> acc + d.pow(2) })
+}
+
 /**
  * [ExtendedField] over [DoubleBuffer].
  *
  * @property size the size of buffers to operate on.
  */
-public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Double>> {
+public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Double>>, Norm<Buffer<Double>, Double> {
     public override val zero: Buffer<Double> by lazy { DoubleBuffer(size) { 0.0 } }
     public override val one: Buffer<Double> by lazy { DoubleBuffer(size) { 1.0 } }
 
@@ -274,4 +280,6 @@ public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Doub
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.ln(arg)
     }
+
+    override fun norm(arg: Buffer<Double>): Double  = DoubleL2Norm.norm(arg)
 }
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
index d3867ea89..dbf81b133 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
@@ -8,11 +8,8 @@ package space.kscience.kmath.real
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Norm
-import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.*
 import space.kscience.kmath.structures.MutableBuffer.Companion.double
-import space.kscience.kmath.structures.asBuffer
-import space.kscience.kmath.structures.fold
-import space.kscience.kmath.structures.indices
 import kotlin.math.pow
 import kotlin.math.sqrt
 
@@ -105,8 +102,4 @@ public fun DoubleVector.sum(): Double {
     return res
 }
 
-public object VectorL2Norm : Norm<DoubleVector, Double> {
-    override fun norm(arg: DoubleVector): Double = sqrt(arg.fold(0.0) { acc: Double, d: Double -> acc + d.pow(2) })
-}
-
-public val DoubleVector.norm: Double get() = VectorL2Norm.norm(this)
\ No newline at end of file
+public val DoubleVector.norm: Double get() = DoubleL2Norm.norm(this)
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index ae82a40be..e3a9e5a4a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -50,7 +50,7 @@ public class GaussIntegrator<T : Any>(
         }
     }
 
-    override fun integrate(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> = with(algebra) {
+    override fun process(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> = with(algebra) {
         val f = integrand.function
         val (points, weights) = buildRule(integrand)
         var res = zero
@@ -63,7 +63,7 @@ public class GaussIntegrator<T : Any>(
             c = t - res - y
             res = t
         }
-        return integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + points.size)
+        return integrand.with(IntegrandValue(res),IntegrandCallsPerformed(integrand.calls + points.size))
     }
 
     public companion object {
@@ -80,17 +80,17 @@ public class GaussIntegrator<T : Any>(
  * * [UnivariateIntegrandRanges] - Set of ranges and number of points per range. Defaults to given [IntegrationRange] and [IntegrandMaxCalls]
  */
 @UnstableKMathAPI
-public fun <T : Any> Field<T>.integrate(
+public fun <T : Any> Field<T>.process(
     vararg features: IntegrandFeature,
     function: (Double) -> T,
-): UnivariateIntegrand<T> = GaussIntegrator(this).integrate(UnivariateIntegrand(function, *features))
+): UnivariateIntegrand<T> = GaussIntegrator(this).process(UnivariateIntegrand(function, *features))
 
 
 /**
  * Use [GaussIntegrator.Companion.integrate] to integrate the function in the current algebra with given [range] and [numPoints]
  */
 @UnstableKMathAPI
-public fun <T : Any> Field<T>.integrate(
+public fun <T : Any> Field<T>.process(
     range: ClosedRange<Double>,
     order: Int = 10,
     intervals: Int = 10,
@@ -104,7 +104,7 @@ public fun <T : Any> Field<T>.integrate(
     val ranges = UnivariateIntegrandRanges(
         (0 until intervals).map { i -> (rangeSize * i)..(rangeSize * (i + 1)) to order }
     )
-    return GaussIntegrator(this).integrate(
+    return GaussIntegrator(this).process(
         UnivariateIntegrand(
             function,
             IntegrationRange(range),
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
index 1ff8e422e..1f45e825b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
@@ -5,12 +5,15 @@
 
 package space.kscience.kmath.integration
 
+import space.kscience.kmath.misc.FeatureSet
+import space.kscience.kmath.misc.Featured
 import kotlin.reflect.KClass
 
 public interface IntegrandFeature
 
-public interface Integrand {
-    public fun <T : IntegrandFeature> getFeature(type: KClass<T>): T?
+public interface Integrand: Featured<IntegrandFeature>{
+    public val features: FeatureSet<IntegrandFeature>
+    override fun <T : IntegrandFeature> getFeature(type: KClass<out T>): T?  = features.getFeature(type)
 }
 
 public inline fun <reified T : IntegrandFeature> Integrand.getFeature(): T? = getFeature(T::class)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt
index abe6ea5ff..1cf15b42f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt
@@ -12,5 +12,5 @@ public interface Integrator<I : Integrand> {
     /**
      * Runs one integration pass and return a new [Integrand] with a new set of features.
      */
-    public fun integrate(integrand: I): I
+    public fun process(integrand: I): I
 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
index 12d0ef0a6..b9c1589c0 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
@@ -6,27 +6,21 @@
 package space.kscience.kmath.integration
 
 import space.kscience.kmath.linear.Point
+import space.kscience.kmath.misc.FeatureSet
 import kotlin.reflect.KClass
 
 public class MultivariateIntegrand<T : Any> internal constructor(
-    private val features: Map<KClass<*>, IntegrandFeature>,
+    override val features: FeatureSet<IntegrandFeature>,
     public val function: (Point<T>) -> T,
-) : Integrand {
+) : Integrand
 
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : IntegrandFeature> getFeature(type: KClass<T>): T? = features[type] as? T
-
-    public operator fun <F : IntegrandFeature> plus(pair: Pair<KClass<out F>, F>): MultivariateIntegrand<T> =
-        MultivariateIntegrand(features + pair, function)
-
-    public operator fun <F : IntegrandFeature> plus(feature: F): MultivariateIntegrand<T> =
-        plus(feature::class to feature)
-}
+public fun <T : Any> MultivariateIntegrand<T>.with(vararg newFeatures: IntegrandFeature): MultivariateIntegrand<T> =
+    MultivariateIntegrand(features.with(*newFeatures), function)
 
 @Suppress("FunctionName")
 public fun <T : Any> MultivariateIntegrand(
     vararg features: IntegrandFeature,
     function: (Point<T>) -> T,
-): MultivariateIntegrand<T> = MultivariateIntegrand(features.associateBy { it::class }, function)
+): MultivariateIntegrand<T> = MultivariateIntegrand(FeatureSet.of(*features), function)
 
 public val <T : Any> MultivariateIntegrand<T>.value: T? get() = getFeature<IntegrandValue<T>>()?.value
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index bcd5005c4..3fc5b4599 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -5,30 +5,24 @@
 
 package space.kscience.kmath.integration
 
+import space.kscience.kmath.misc.FeatureSet
 import space.kscience.kmath.misc.UnstableKMathAPI
 import kotlin.jvm.JvmInline
-import kotlin.reflect.KClass
+
 
 public class UnivariateIntegrand<T : Any> internal constructor(
-    private val features: Map<KClass<*>, IntegrandFeature>,
+    override val features: FeatureSet<IntegrandFeature>,
     public val function: (Double) -> T,
-) : Integrand {
+) : Integrand
 
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : IntegrandFeature> getFeature(type: KClass<T>): T? = features[type] as? T
-
-    public operator fun <F : IntegrandFeature> plus(pair: Pair<KClass<out F>, F>): UnivariateIntegrand<T> =
-        UnivariateIntegrand(features + pair, function)
-
-    public operator fun <F : IntegrandFeature> plus(feature: F): UnivariateIntegrand<T> =
-        plus(feature::class to feature)
-}
+public fun <T : Any> UnivariateIntegrand<T>.with(vararg newFeatures: IntegrandFeature): UnivariateIntegrand<T> =
+    UnivariateIntegrand(features.with(*newFeatures), function)
 
 @Suppress("FunctionName")
 public fun <T : Any> UnivariateIntegrand(
     function: (Double) -> T,
     vararg features: IntegrandFeature,
-): UnivariateIntegrand<T> = UnivariateIntegrand(features.associateBy { it::class }, function)
+): UnivariateIntegrand<T> = UnivariateIntegrand(FeatureSet.of(*features), function)
 
 public typealias UnivariateIntegrator<T> = Integrator<UnivariateIntegrand<T>>
 
@@ -46,7 +40,7 @@ public fun UnivariateIntegrator<Double>.integrate(
     range: ClosedRange<Double>,
     vararg features: IntegrandFeature,
     function: (Double) -> Double,
-): Double = integrate(
+): Double = process(
     UnivariateIntegrand(function, IntegrationRange(range), *features)
 ).value ?: error("Unexpected: no value after integration.")
 
@@ -65,7 +59,7 @@ public fun UnivariateIntegrator<Double>.integrate(
         featureBuilder()
         add(IntegrationRange(range))
     }
-    return integrate(
+    return process(
         UnivariateIntegrand(function, *features.toTypedArray())
     ).value ?: error("Unexpected: no value after integration.")
 }
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
index 195711452..d1e452454 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
@@ -16,7 +16,7 @@ import kotlin.test.assertEquals
 class GaussIntegralTest {
     @Test
     fun gaussSin() {
-        val res = DoubleField.integrate(0.0..2 * PI) { x ->
+        val res = DoubleField.process(0.0..2 * PI) { x ->
             sin(x)
         }
         assertEquals(0.0, res.value!!, 1e-2)
@@ -24,7 +24,7 @@ class GaussIntegralTest {
 
     @Test
     fun gaussUniform() {
-        val res = DoubleField.integrate(0.0..100.0) { x ->
+        val res = DoubleField.process(0.0..100.0) { x ->
             if(x in 30.0..50.0){
                 1.0
             } else {
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
index 38f3038c2..12ccea1d8 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
@@ -9,86 +9,97 @@ import space.kscience.kmath.expressions.AutoDiffProcessor
 import space.kscience.kmath.expressions.DifferentiableExpression
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.ExpressionAlgebra
+import space.kscience.kmath.misc.FeatureSet
 import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.indices
 
-/**
- * A likelihood function optimization problem with provided derivatives
- */
-public interface FunctionOptimization<T : Any> : Optimization<T> {
-    /**
-     * The optimization direction. If true search for function maximum, if false, search for the minimum
-     */
-    public var maximize: Boolean
 
-    /**
-     * Define the initial guess for the optimization problem
-     */
-    public fun initialGuess(map: Map<Symbol, T>)
+public class FunctionOptimization<T : Any>(
+    override val features: FeatureSet<OptimizationFeature>,
+    public val expression: DifferentiableExpression<T, Expression<T>>,
+    public val initialGuess: Map<Symbol, T>,
+    public val parameters: Collection<Symbol>,
+    public val maximize: Boolean,
+) : OptimizationProblem
 
-    /**
-     * Set a differentiable expression as objective function as function and gradient provider
-     */
-    public fun diffFunction(expression: DifferentiableExpression<T, Expression<T>>)
-
-    public companion object {
-        /**
-         * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic differentiation
-         */
-        public fun <T : Any, I : Any, A> chiSquared(
-            autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
-            x: Buffer<T>,
-            y: Buffer<T>,
-            yErr: Buffer<T>,
-            model: A.(I) -> I,
-        ): DifferentiableExpression<T, Expression<T>> where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> {
-            require(x.size == y.size) { "X and y buffers should be of the same size" }
-            require(y.size == yErr.size) { "Y and yErr buffer should of the same size" }
-
-            return autoDiff.process {
-                var sum = zero
-
-                x.indices.forEach {
-                    val xValue = const(x[it])
-                    val yValue = const(y[it])
-                    val yErrValue = const(yErr[it])
-                    val modelValue = model(xValue)
-                    sum += ((yValue - modelValue) / yErrValue).pow(2)
-                }
-
-                sum
-            }
-        }
-    }
-}
-
-/**
- * Define a chi-squared-based objective function
- */
-public fun <T: Any, I : Any, A> FunctionOptimization<T>.chiSquared(
-    autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
-    x: Buffer<T>,
-    y: Buffer<T>,
-    yErr: Buffer<T>,
-    model: A.(I) -> I,
-) where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> {
-    val chiSquared = FunctionOptimization.chiSquared(autoDiff, x, y, yErr, model)
-    diffFunction(chiSquared)
-    maximize = false
-}
-
-/**
- * Optimize differentiable expression using specific [OptimizationProblemFactory]
- */
-public fun <T : Any, F : FunctionOptimization<T>> DifferentiableExpression<T, Expression<T>>.optimizeWith(
-    factory: OptimizationProblemFactory<T, F>,
-    vararg symbols: Symbol,
-    configuration: F.() -> Unit,
-): OptimizationResult<T> {
-    require(symbols.isNotEmpty()) { "Must provide a list of symbols for optimization" }
-    val problem = factory(symbols.toList(), configuration)
-    problem.diffFunction(this)
-    return problem.optimize()
-}
+//
+///**
+// * A likelihood function optimization problem with provided derivatives
+// */
+//public interface FunctionOptimizationBuilder<T : Any> {
+//    /**
+//     * The optimization direction. If true search for function maximum, if false, search for the minimum
+//     */
+//    public var maximize: Boolean
+//
+//    /**
+//     * Define the initial guess for the optimization problem
+//     */
+//    public fun initialGuess(map: Map<Symbol, T>)
+//
+//    /**
+//     * Set a differentiable expression as objective function as function and gradient provider
+//     */
+//    public fun function(expression: DifferentiableExpression<T, Expression<T>>)
+//
+//    public companion object {
+//        /**
+//         * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic differentiation
+//         */
+//        public fun <T : Any, I : Any, A> chiSquared(
+//            autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
+//            x: Buffer<T>,
+//            y: Buffer<T>,
+//            yErr: Buffer<T>,
+//            model: A.(I) -> I,
+//        ): DifferentiableExpression<T, Expression<T>> where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> {
+//            require(x.size == y.size) { "X and y buffers should be of the same size" }
+//            require(y.size == yErr.size) { "Y and yErr buffer should of the same size" }
+//
+//            return autoDiff.process {
+//                var sum = zero
+//
+//                x.indices.forEach {
+//                    val xValue = const(x[it])
+//                    val yValue = const(y[it])
+//                    val yErrValue = const(yErr[it])
+//                    val modelValue = model(xValue)
+//                    sum += ((yValue - modelValue) / yErrValue).pow(2)
+//                }
+//
+//                sum
+//            }
+//        }
+//    }
+//}
+//
+///**
+// * Define a chi-squared-based objective function
+// */
+//public fun <T : Any, I : Any, A> FunctionOptimization<T>.chiSquared(
+//    autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
+//    x: Buffer<T>,
+//    y: Buffer<T>,
+//    yErr: Buffer<T>,
+//    model: A.(I) -> I,
+//) where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> {
+//    val chiSquared = FunctionOptimization.chiSquared(autoDiff, x, y, yErr, model)
+//    function(chiSquared)
+//    maximize = false
+//}
+//
+///**
+// * Optimize differentiable expression using specific [OptimizationProblemFactory]
+// */
+//public suspend fun <T : Any, F : FunctionOptimization<T>> DifferentiableExpression<T, Expression<T>>.optimizeWith(
+//    factory: OptimizationProblemFactory<T, F>,
+//    vararg symbols: Symbol,
+//    configuration: F.() -> Unit,
+//): OptimizationResult<T> {
+//    require(symbols.isNotEmpty()) { "Must provide a list of symbols for optimization" }
+//    val problem = factory(symbols.toList(), configuration)
+//    problem.function(this)
+//    return problem.optimize()
+//}
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt
deleted file mode 100644
index 67a21bf2a..000000000
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.optimization
-
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.misc.Symbol
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.indices
-import kotlin.math.pow
-
-/**
- * A likelihood function optimization problem
- */
-public interface NoDerivFunctionOptimization<T : Any> : Optimization<T> {
-    /**
-     * The optimization direction. If true search for function maximum, if false, search for the minimum
-     */
-    public var maximize: Boolean
-
-    /**
-     * Define the initial guess for the optimization problem
-     */
-    public fun initialGuess(map: Map<Symbol, T>)
-
-    /**
-     * Set an objective function expression
-     */
-    public fun function(expression: Expression<T>)
-
-    public companion object {
-        /**
-         * Generate a chi squared expression from given x-y-sigma model represented by an expression. Does not provide derivatives
-         */
-        public fun chiSquared(
-            x: Buffer<Double>,
-            y: Buffer<Double>,
-            yErr: Buffer<Double>,
-            model: Expression<Double>,
-            xSymbol: Symbol = Symbol.x,
-        ): Expression<Double> {
-            require(x.size == y.size) { "X and y buffers should be of the same size" }
-            require(y.size == yErr.size) { "Y and yErr buffer should of the same size" }
-
-            return Expression { arguments ->
-                x.indices.sumOf {
-                    val xValue = x[it]
-                    val yValue = y[it]
-                    val yErrValue = yErr[it]
-                    val modifiedArgs = arguments + (xSymbol to xValue)
-                    val modelValue = model(modifiedArgs)
-                    ((yValue - modelValue) / yErrValue).pow(2)
-                }
-            }
-        }
-    }
-}
-
-
-/**
- * Optimize expression without derivatives using specific [OptimizationProblemFactory]
- */
-public fun <T : Any, F : NoDerivFunctionOptimization<T>> Expression<T>.noDerivOptimizeWith(
-    factory: OptimizationProblemFactory<T, F>,
-    vararg symbols: Symbol,
-    configuration: F.() -> Unit,
-): OptimizationResult<T> {
-    require(symbols.isNotEmpty()) { "Must provide a list of symbols for optimization" }
-    val problem = factory(symbols.toList(), configuration)
-    problem.function(this)
-    return problem.optimize()
-}
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
deleted file mode 100644
index 3b9868815..000000000
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.optimization
-
-import space.kscience.kmath.misc.Symbol
-
-public interface OptimizationFeature
-
-public class OptimizationResult<T>(
-    public val point: Map<Symbol, T>,
-    public val value: T,
-    public val features: Set<OptimizationFeature> = emptySet(),
-) {
-    override fun toString(): String {
-        return "OptimizationResult(point=$point, value=$value)"
-    }
-}
-
-public operator fun <T> OptimizationResult<T>.plus(
-    feature: OptimizationFeature,
-): OptimizationResult<T> = OptimizationResult(point, value, features + feature)
-
-/**
- * An optimization problem builder over [T] variables
- */
-public interface Optimization<T : Any> {
-
-    /**
-     * Update the problem from previous optimization run
-     */
-    public fun update(result: OptimizationResult<T>)
-
-    /**
-     * Make an optimization run
-     */
-    public fun optimize(): OptimizationResult<T>
-}
-
-public fun interface OptimizationProblemFactory<T : Any, out P : Optimization<T>> {
-    public fun build(symbols: List<Symbol>): P
-}
-
-public operator fun <T : Any, P : Optimization<T>> OptimizationProblemFactory<T, P>.invoke(
-    symbols: List<Symbol>,
-    block: P.() -> Unit,
-): P = build(symbols).apply(block)
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
new file mode 100644
index 000000000..9a5420be6
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.optimization
+
+import space.kscience.kmath.misc.FeatureSet
+import space.kscience.kmath.misc.Featured
+import kotlin.reflect.KClass
+
+public interface OptimizationFeature
+
+public interface OptimizationProblem : Featured<OptimizationFeature> {
+    public val features: FeatureSet<OptimizationFeature>
+    override fun <T : OptimizationFeature> getFeature(type: KClass<out T>): T? = features.getFeature(type)
+}
+
+public inline fun <reified T : OptimizationFeature> OptimizationProblem.getFeature(): T? = getFeature(T::class)
+
+//public class OptimizationResult<T>(
+//    public val point: Map<Symbol, T>,
+//    public val value: T,
+//    public val features: Set<OptimizationFeature> = emptySet(),
+//) {
+//    override fun toString(): String {
+//        return "OptimizationResult(point=$point, value=$value)"
+//    }
+//}
+//
+//public operator fun <T> OptimizationResult<T>.plus(
+//    feature: OptimizationFeature,
+//): OptimizationResult<T> = OptimizationResult(point, value, features + feature)
+//public fun interface OptimizationProblemFactory<T : Any, out P : OptimizationProblem<T>> {
+//    public fun build(symbols: List<Symbol>): P
+//}
+//
+//public operator fun <T : Any, P : OptimizationProblem<T>> OptimizationProblemFactory<T, P>.invoke(
+//    symbols: List<Symbol>,
+//    block: P.() -> Unit,
+//): P = build(symbols).apply(block)
+
+public interface Optimizer<P : OptimizationProblem> {
+    public suspend fun process(problem: P): P
+}
+
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
index f5cfa05e6..e4998c665 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
@@ -16,7 +16,7 @@ import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.Field
 
 @UnstableKMathAPI
-public interface XYFit<T : Any> : Optimization<T> {
+public interface XYFit<T> : OptimizationProblem<T> {
 
     public val algebra: Field<T>
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/AnalyticalGradientCalculator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/AnalyticalGradientCalculator.kt
new file mode 100644
index 000000000..912fa22eb
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/AnalyticalGradientCalculator.kt
@@ -0,0 +1,61 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+
+/**
+ *
+ * @version $Id$
+ */
+internal class AnalyticalGradientCalculator(fcn: MultiFunction?, state: MnUserTransformation, checkGradient: Boolean) :
+    GradientCalculator {
+    private val function: MultiFunction?
+    private val theCheckGradient: Boolean
+    private val theTransformation: MnUserTransformation
+    fun checkGradient(): Boolean {
+        return theCheckGradient
+    }
+
+    /** {@inheritDoc}  */
+    fun gradient(par: MinimumParameters): FunctionGradient {
+//      double[] grad = theGradCalc.gradientValue(theTransformation.andThen(par.vec()).data());
+        val point: DoubleArray = theTransformation.transform(par.vec()).toArray()
+        require(!(function.getDimension() !== theTransformation.parameters().size())) { "Invalid parameter size" }
+        val v: RealVector = ArrayRealVector(par.vec().getDimension())
+        for (i in 0 until par.vec().getDimension()) {
+            val ext: Int = theTransformation.extOfInt(i)
+            if (theTransformation.parameter(ext).hasLimits()) {
+                val dd: Double = theTransformation.dInt2Ext(i, par.vec().getEntry(i))
+                v.setEntry(i, dd * function.derivValue(ext, point))
+            } else {
+                v.setEntry(i, function.derivValue(ext, point))
+            }
+        }
+        return FunctionGradient(v)
+    }
+
+    /** {@inheritDoc}  */
+    fun gradient(par: MinimumParameters, grad: FunctionGradient?): FunctionGradient {
+        return gradient(par)
+    }
+
+    init {
+        function = fcn
+        theTransformation = state
+        theCheckGradient = checkGradient
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/CombinedMinimizer.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/CombinedMinimizer.kt
new file mode 100644
index 000000000..9363492ad
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/CombinedMinimizer.kt
@@ -0,0 +1,32 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+internal class CombinedMinimizer : ModularFunctionMinimizer() {
+    private val theMinBuilder: CombinedMinimumBuilder = CombinedMinimumBuilder()
+    private val theMinSeedGen: MnSeedGenerator = MnSeedGenerator()
+    override fun builder(): MinimumBuilder {
+        return theMinBuilder
+    }
+
+    override fun seedGenerator(): MinimumSeedGenerator {
+        return theMinSeedGen
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/CombinedMinimumBuilder.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/CombinedMinimumBuilder.kt
new file mode 100644
index 000000000..a2f0a644a
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/CombinedMinimumBuilder.kt
@@ -0,0 +1,57 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import space.kscience.kmath.optimization.minuit.MINUITPlugin
+
+/**
+ *
+ * @version $Id$
+ */
+internal class CombinedMinimumBuilder : MinimumBuilder {
+    private val theSimplexMinimizer: SimplexMinimizer = SimplexMinimizer()
+    private val theVMMinimizer: VariableMetricMinimizer = VariableMetricMinimizer()
+
+    /** {@inheritDoc}  */
+    override fun minimum(
+        fcn: MnFcn?,
+        gc: GradientCalculator?,
+        seed: MinimumSeed?,
+        strategy: MnStrategy?,
+        maxfcn: Int,
+        toler: Double
+    ): FunctionMinimum {
+        val min: FunctionMinimum = theVMMinimizer.minimize(fcn!!, gc, seed, strategy, maxfcn, toler)
+        if (!min.isValid()) {
+            MINUITPlugin.logStatic("CombinedMinimumBuilder: migrad method fails, will try with simplex method first.")
+            val str = MnStrategy(2)
+            val min1: FunctionMinimum = theSimplexMinimizer.minimize(fcn, gc, seed, str, maxfcn, toler)
+            if (!min1.isValid()) {
+                MINUITPlugin.logStatic("CombinedMinimumBuilder: both migrad and simplex method fail.")
+                return min1
+            }
+            val seed1: MinimumSeed = theVMMinimizer.seedGenerator().generate(fcn, gc, min1.userState(), str)
+            val min2: FunctionMinimum = theVMMinimizer.minimize(fcn, gc, seed1, str, maxfcn, toler)
+            if (!min2.isValid()) {
+                MINUITPlugin.logStatic("CombinedMinimumBuilder: both migrad and method fails also at 2nd attempt.")
+                MINUITPlugin.logStatic("CombinedMinimumBuilder: return simplex minimum.")
+                return min1
+            }
+            return min2
+        }
+        return min
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ContoursError.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ContoursError.kt
new file mode 100644
index 000000000..214d94c80
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ContoursError.kt
@@ -0,0 +1,150 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * ContoursError class.
+ *
+ * @author Darksnake
+ * @version $Id$
+ */
+class ContoursError internal constructor(
+    private val theParX: Int,
+    private val theParY: Int,
+    points: List<Range>,
+    xmnos: MinosError,
+    ymnos: MinosError,
+    nfcn: Int
+) {
+    private val theNFcn: Int
+    private val thePoints: List<Range> = points
+    private val theXMinos: MinosError
+    private val theYMinos: MinosError
+
+    /**
+     *
+     * nfcn.
+     *
+     * @return a int.
+     */
+    fun nfcn(): Int {
+        return theNFcn
+    }
+
+    /**
+     *
+     * points.
+     *
+     * @return a [List] object.
+     */
+    fun points(): List<Range> {
+        return thePoints
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    override fun toString(): String {
+        return MnPrint.toString(this)
+    }
+
+    /**
+     *
+     * xMinosError.
+     *
+     * @return a [hep.dataforge.MINUIT.MinosError] object.
+     */
+    fun xMinosError(): MinosError {
+        return theXMinos
+    }
+
+    /**
+     *
+     * xRange.
+     *
+     * @return
+     */
+    fun xRange(): Range {
+        return theXMinos.range()
+    }
+
+    /**
+     *
+     * xmin.
+     *
+     * @return a double.
+     */
+    fun xmin(): Double {
+        return theXMinos.min()
+    }
+
+    /**
+     *
+     * xpar.
+     *
+     * @return a int.
+     */
+    fun xpar(): Int {
+        return theParX
+    }
+
+    /**
+     *
+     * yMinosError.
+     *
+     * @return a [hep.dataforge.MINUIT.MinosError] object.
+     */
+    fun yMinosError(): MinosError {
+        return theYMinos
+    }
+
+    /**
+     *
+     * yRange.
+     *
+     * @return
+     */
+    fun yRange(): Range {
+        return theYMinos.range()
+    }
+
+    /**
+     *
+     * ymin.
+     *
+     * @return a double.
+     */
+    fun ymin(): Double {
+        return theYMinos.min()
+    }
+
+    /**
+     *
+     * ypar.
+     *
+     * @return a int.
+     */
+    fun ypar(): Int {
+        return theParY
+    }
+
+    init {
+        theXMinos = xmnos
+        theYMinos = ymnos
+        theNFcn = nfcn
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/DavidonErrorUpdator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/DavidonErrorUpdator.kt
new file mode 100644
index 000000000..9eb2443e4
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/DavidonErrorUpdator.kt
@@ -0,0 +1,45 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.RealVector
+import ru.inr.mass.minuit.*
+
+/**
+ *
+ * @version $Id$
+ */
+internal class DavidonErrorUpdator : MinimumErrorUpdator {
+    /** {@inheritDoc}  */
+    fun update(s0: MinimumState, p1: MinimumParameters, g1: FunctionGradient): MinimumError {
+        val V0: MnAlgebraicSymMatrix = s0.error().invHessian()
+        val dx: RealVector = MnUtils.sub(p1.vec(), s0.vec())
+        val dg: RealVector = MnUtils.sub(g1.getGradient(), s0.gradient().getGradient())
+        val delgam: Double = MnUtils.innerProduct(dx, dg)
+        val gvg: Double = MnUtils.similarity(dg, V0)
+        val vg: RealVector = MnUtils.mul(V0, dg)
+        var Vupd: MnAlgebraicSymMatrix =
+            MnUtils.sub(MnUtils.div(MnUtils.outerProduct(dx), delgam), MnUtils.div(MnUtils.outerProduct(vg), gvg))
+        if (delgam > gvg) {
+            Vupd = MnUtils.add(Vupd,
+                MnUtils.mul(MnUtils.outerProduct(MnUtils.sub(MnUtils.div(dx, delgam), MnUtils.div(vg, gvg))), gvg))
+        }
+        val sum_upd: Double = MnUtils.absoluteSumOfElements(Vupd)
+        Vupd = MnUtils.add(Vupd, V0)
+        val dcov: Double = 0.5 * (s0.error().dcovar() + sum_upd / MnUtils.absoluteSumOfElements(Vupd))
+        return MinimumError(Vupd, dcov)
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/FunctionGradient.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/FunctionGradient.kt
new file mode 100644
index 000000000..a0866d916
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/FunctionGradient.kt
@@ -0,0 +1,72 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.ArrayRealVector
+
+/**
+ *
+ * @version $Id$
+ */
+class FunctionGradient {
+    private var theAnalytical = false
+    private var theG2ndDerivative: RealVector
+    private var theGStepSize: RealVector
+    private var theGradient: RealVector
+    private var theValid = false
+
+    constructor(n: Int) {
+        theGradient = ArrayRealVector(n)
+        theG2ndDerivative = ArrayRealVector(n)
+        theGStepSize = ArrayRealVector(n)
+    }
+
+    constructor(grd: RealVector) {
+        theGradient = grd
+        theG2ndDerivative = ArrayRealVector(grd.getDimension())
+        theGStepSize = ArrayRealVector(grd.getDimension())
+        theValid = true
+        theAnalytical = true
+    }
+
+    constructor(grd: RealVector, g2: RealVector, gstep: RealVector) {
+        theGradient = grd
+        theG2ndDerivative = g2
+        theGStepSize = gstep
+        theValid = true
+        theAnalytical = false
+    }
+
+    fun getGradient(): RealVector {
+        return theGradient
+    }
+
+    fun getGradientDerivative(): RealVector {
+        return theG2ndDerivative
+    }
+
+    fun getStep(): RealVector {
+        return theGStepSize
+    }
+
+    fun isAnalytical(): Boolean {
+        return theAnalytical
+    }
+
+    fun isValid(): Boolean {
+        return theValid
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/FunctionMinimum.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/FunctionMinimum.kt
new file mode 100644
index 000000000..56908f00d
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/FunctionMinimum.kt
@@ -0,0 +1,259 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.minuit.*
+
+/**
+ * Result of the minimization.
+ *
+ *
+ * The FunctionMinimum is the output of the minimizers and contains the
+ * minimization result. The methods
+ *
+ *  * userState(),
+ *  * userParameters() and
+ *  * userCovariance()
+ *
+ * are provided. These can be used as new input to a new minimization after some
+ * manipulation. The parameters and/or the FunctionMinimum can be printed using
+ * the toString() method or the MnPrint class.
+ *
+ * @author Darksnake
+ */
+class FunctionMinimum {
+    private var theAboveMaxEdm = false
+    private var theErrorDef: Double
+    private var theReachedCallLimit = false
+    private var theSeed: MinimumSeed
+    private var theStates: MutableList<MinimumState>
+    private var theUserState: MnUserParameterState
+
+    internal constructor(seed: MinimumSeed, up: Double) {
+        theSeed = seed
+        theStates = ArrayList()
+        theStates.add(MinimumState(seed.parameters(),
+            seed.error(),
+            seed.gradient(),
+            seed.parameters().fval(),
+            seed.nfcn()))
+        theErrorDef = up
+        theUserState = MnUserParameterState()
+    }
+
+    internal constructor(seed: MinimumSeed, states: MutableList<MinimumState>, up: Double) {
+        theSeed = seed
+        theStates = states
+        theErrorDef = up
+        theUserState = MnUserParameterState()
+    }
+
+    internal constructor(seed: MinimumSeed, states: MutableList<MinimumState>, up: Double, x: MnReachedCallLimit?) {
+        theSeed = seed
+        theStates = states
+        theErrorDef = up
+        theReachedCallLimit = true
+        theUserState = MnUserParameterState()
+    }
+
+    internal constructor(seed: MinimumSeed, states: MutableList<MinimumState>, up: Double, x: MnAboveMaxEdm?) {
+        theSeed = seed
+        theStates = states
+        theErrorDef = up
+        theAboveMaxEdm = true
+        theReachedCallLimit = false
+        theUserState = MnUserParameterState()
+    }
+
+    // why not
+    fun add(state: MinimumState) {
+        theStates.add(state)
+    }
+
+    /**
+     * returns the expected vertical distance to the minimum (EDM)
+     *
+     * @return a double.
+     */
+    fun edm(): Double {
+        return lastState().edm()
+    }
+
+    fun error(): MinimumError {
+        return lastState().error()
+    }
+
+    /**
+     *
+     *
+     * errorDef.
+     *
+     * @return a double.
+     */
+    fun errorDef(): Double {
+        return theErrorDef
+    }
+
+    /**
+     * Returns the function value at the minimum.
+     *
+     * @return a double.
+     */
+    fun fval(): Double {
+        return lastState().fval()
+    }
+
+    fun grad(): FunctionGradient {
+        return lastState().gradient()
+    }
+
+    fun hasAccurateCovar(): Boolean {
+        return state().error().isAccurate()
+    }
+
+    fun hasCovariance(): Boolean {
+        return state().error().isAvailable()
+    }
+
+    fun hasMadePosDefCovar(): Boolean {
+        return state().error().isMadePosDef()
+    }
+
+    fun hasPosDefCovar(): Boolean {
+        return state().error().isPosDef()
+    }
+
+    fun hasReachedCallLimit(): Boolean {
+        return theReachedCallLimit
+    }
+
+    fun hasValidCovariance(): Boolean {
+        return state().error().isValid()
+    }
+
+    fun hasValidParameters(): Boolean {
+        return state().parameters().isValid()
+    }
+
+    fun hesseFailed(): Boolean {
+        return state().error().hesseFailed()
+    }
+
+    fun isAboveMaxEdm(): Boolean {
+        return theAboveMaxEdm
+    }
+
+    /**
+     * In general, if this returns <CODE>true</CODE>, the minimizer did find a
+     * minimum without running into troubles. However, in some cases a minimum
+     * cannot be found, then the return value will be <CODE>false</CODE>.
+     * Reasons for the minimization to fail are
+     *
+     *  * the number of allowed function calls has been exhausted
+     *  * the minimizer could not improve the values of the parameters (and
+     * knowing that it has not converged yet)
+     *  * a problem with the calculation of the covariance matrix
+     *
+     * Additional methods for the analysis of the state at the minimum are
+     * provided.
+     *
+     * @return a boolean.
+     */
+    fun isValid(): Boolean {
+        return state().isValid() && !isAboveMaxEdm() && !hasReachedCallLimit()
+    }
+
+    private fun lastState(): MinimumState {
+        return theStates[theStates.size - 1]
+    }
+    // forward interface of last state
+    /**
+     * returns the total number of function calls during the minimization.
+     *
+     * @return a int.
+     */
+    fun nfcn(): Int {
+        return lastState().nfcn()
+    }
+
+    fun parameters(): MinimumParameters {
+        return lastState().parameters()
+    }
+
+    fun seed(): MinimumSeed {
+        return theSeed
+    }
+
+    fun state(): MinimumState {
+        return lastState()
+    }
+
+    fun states(): List<MinimumState> {
+        return theStates
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return
+     */
+    override fun toString(): String {
+        return MnPrint.toString(this)
+    }
+
+    /**
+     *
+     *
+     * userCovariance.
+     *
+     * @return a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     */
+    fun userCovariance(): MnUserCovariance {
+        if (!theUserState.isValid()) {
+            theUserState = MnUserParameterState(state(), errorDef(), seed().trafo())
+        }
+        return theUserState.covariance()
+    }
+
+    /**
+     *
+     *
+     * userParameters.
+     *
+     * @return a [hep.dataforge.MINUIT.MnUserParameters] object.
+     */
+    fun userParameters(): MnUserParameters {
+        if (!theUserState.isValid()) {
+            theUserState = MnUserParameterState(state(), errorDef(), seed().trafo())
+        }
+        return theUserState.parameters()
+    }
+
+    /**
+     * user representation of state at minimum
+     *
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun userState(): MnUserParameterState {
+        if (!theUserState.isValid()) {
+            theUserState = MnUserParameterState(state(), errorDef(), seed().trafo())
+        }
+        return theUserState
+    }
+
+    internal class MnAboveMaxEdm
+    internal class MnReachedCallLimit
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/GradientCalculator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/GradientCalculator.kt
new file mode 100644
index 000000000..379de1b6d
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/GradientCalculator.kt
@@ -0,0 +1,41 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+interface GradientCalculator {
+    /**
+     *
+     * gradient.
+     *
+     * @param par a [hep.dataforge.MINUIT.MinimumParameters] object.
+     * @return a [hep.dataforge.MINUIT.FunctionGradient] object.
+     */
+    fun gradient(par: MinimumParameters?): FunctionGradient
+
+    /**
+     *
+     * gradient.
+     *
+     * @param par a [hep.dataforge.MINUIT.MinimumParameters] object.
+     * @param grad a [hep.dataforge.MINUIT.FunctionGradient] object.
+     * @return a [hep.dataforge.MINUIT.FunctionGradient] object.
+     */
+    fun gradient(par: MinimumParameters?, grad: FunctionGradient?): FunctionGradient
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/HessianGradientCalculator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/HessianGradientCalculator.kt
new file mode 100644
index 000000000..150d192f9
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/HessianGradientCalculator.kt
@@ -0,0 +1,137 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.ArrayRealVector
+import ru.inr.mass.minuit.*
+
+/**
+ *
+ * @version $Id$
+ */
+internal class HessianGradientCalculator(fcn: MnFcn, par: MnUserTransformation, stra: MnStrategy) : GradientCalculator {
+    private val theFcn: MnFcn = fcn
+    private val theStrategy: MnStrategy
+    private val theTransformation: MnUserTransformation
+    fun deltaGradient(par: MinimumParameters, gradient: FunctionGradient): Pair<FunctionGradient, RealVector> {
+        require(par.isValid()) { "parameters are invalid" }
+        val x: RealVector = par.vec().copy()
+        val grd: RealVector = gradient.getGradient().copy()
+        val g2: RealVector = gradient.getGradientDerivative()
+        val gstep: RealVector = gradient.getStep()
+        val fcnmin: Double = par.fval()
+        //   std::cout<<"fval: "<<fcnmin<<std::endl;
+        val dfmin: Double = 4.0 * precision().eps2() * (abs(fcnmin) + theFcn.errorDef())
+        val n: Int = x.getDimension()
+        val dgrd: RealVector = ArrayRealVector(n)
+
+        // initial starting values
+        for (i in 0 until n) {
+            val xtf: Double = x.getEntry(i)
+            val dmin: Double = 4.0 * precision().eps2() * (xtf + precision().eps2())
+            val epspri: Double = precision().eps2() + abs(grd.getEntry(i) * precision().eps2())
+            val optstp: Double = sqrt(dfmin / (abs(g2.getEntry(i)) + epspri))
+            var d: Double = 0.2 * abs(gstep.getEntry(i))
+            if (d > optstp) {
+                d = optstp
+            }
+            if (d < dmin) {
+                d = dmin
+            }
+            var chgold = 10000.0
+            var dgmin = 0.0
+            var grdold = 0.0
+            var grdnew = 0.0
+            for (j in 0 until ncycle()) {
+                x.setEntry(i, xtf + d)
+                val fs1: Double = theFcn.value(x)
+                x.setEntry(i, xtf - d)
+                val fs2: Double = theFcn.value(x)
+                x.setEntry(i, xtf)
+                //       double sag = 0.5*(fs1+fs2-2.*fcnmin);
+                grdold = grd.getEntry(i)
+                grdnew = (fs1 - fs2) / (2.0 * d)
+                dgmin = precision().eps() * (abs(fs1) + abs(fs2)) / d
+                if (abs(grdnew) < precision().eps()) {
+                    break
+                }
+                val change: Double = abs((grdold - grdnew) / grdnew)
+                if (change > chgold && j > 1) {
+                    break
+                }
+                chgold = change
+                grd.setEntry(i, grdnew)
+                if (change < 0.05) {
+                    break
+                }
+                if (abs(grdold - grdnew) < dgmin) {
+                    break
+                }
+                if (d < dmin) {
+                    break
+                }
+                d *= 0.2
+            }
+            dgrd.setEntry(i, max(dgmin, abs(grdold - grdnew)))
+        }
+        return Pair(FunctionGradient(grd, g2, gstep), dgrd)
+    }
+
+    fun fcn(): MnFcn {
+        return theFcn
+    }
+
+    fun gradTolerance(): Double {
+        return strategy().gradientTolerance()
+    }
+
+    /** {@inheritDoc}  */
+    fun gradient(par: MinimumParameters): FunctionGradient {
+        val gc = InitialGradientCalculator(theFcn, theTransformation, theStrategy)
+        val gra: FunctionGradient = gc.gradient(par)
+        return gradient(par, gra)
+    }
+
+    /** {@inheritDoc}  */
+    fun gradient(par: MinimumParameters, gradient: FunctionGradient): FunctionGradient {
+        return deltaGradient(par, gradient).getFirst()
+    }
+
+    fun ncycle(): Int {
+        return strategy().hessianGradientNCycles()
+    }
+
+    fun precision(): MnMachinePrecision {
+        return theTransformation.precision()
+    }
+
+    fun stepTolerance(): Double {
+        return strategy().gradientStepTolerance()
+    }
+
+    fun strategy(): MnStrategy {
+        return theStrategy
+    }
+
+    fun trafo(): MnUserTransformation {
+        return theTransformation
+    }
+
+    init {
+        theTransformation = par
+        theStrategy = stra
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/InitialGradientCalculator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/InitialGradientCalculator.kt
new file mode 100644
index 000000000..794556414
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/InitialGradientCalculator.kt
@@ -0,0 +1,116 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.ArrayRealVector
+import ru.inr.mass.minuit.*
+
+/**
+ * Calculating derivatives via finite differences
+ * @version $Id$
+ */
+internal class InitialGradientCalculator(fcn: MnFcn, par: MnUserTransformation, stra: MnStrategy) {
+    private val theFcn: MnFcn = fcn
+    private val theStrategy: MnStrategy
+    private val theTransformation: MnUserTransformation
+    fun fcn(): MnFcn {
+        return theFcn
+    }
+
+    fun gradTolerance(): Double {
+        return strategy().gradientTolerance()
+    }
+
+    fun gradient(par: MinimumParameters): FunctionGradient {
+        require(par.isValid()) { "Parameters are invalid" }
+        val n: Int = trafo().variableParameters()
+        require(n == par.vec().getDimension()) { "Parameters have invalid size" }
+        val gr: RealVector = ArrayRealVector(n)
+        val gr2: RealVector = ArrayRealVector(n)
+        val gst: RealVector = ArrayRealVector(n)
+
+        // initial starting values
+        for (i in 0 until n) {
+            val exOfIn: Int = trafo().extOfInt(i)
+            val `var`: Double = par.vec().getEntry(i) //parameter value
+            val werr: Double = trafo().parameter(exOfIn).error() //parameter error
+            val sav: Double = trafo().int2ext(i, `var`) //value after transformation
+            var sav2 = sav + werr //value after transfomation + error
+            if (trafo().parameter(exOfIn).hasLimits()) {
+                if (trafo().parameter(exOfIn).hasUpperLimit()
+                    && sav2 > trafo().parameter(exOfIn).upperLimit()
+                ) {
+                    sav2 = trafo().parameter(exOfIn).upperLimit()
+                }
+            }
+            var var2: Double = trafo().ext2int(exOfIn, sav2)
+            val vplu = var2 - `var`
+            sav2 = sav - werr
+            if (trafo().parameter(exOfIn).hasLimits()) {
+                if (trafo().parameter(exOfIn).hasLowerLimit()
+                    && sav2 < trafo().parameter(exOfIn).lowerLimit()
+                ) {
+                    sav2 = trafo().parameter(exOfIn).lowerLimit()
+                }
+            }
+            var2 = trafo().ext2int(exOfIn, sav2)
+            val vmin = var2 - `var`
+            val dirin: Double = 0.5 * (abs(vplu) + abs(vmin))
+            val g2: Double = 2.0 * theFcn.errorDef() / (dirin * dirin)
+            val gsmin: Double = 8.0 * precision().eps2() * (abs(`var`) + precision().eps2())
+            var gstep: Double = max(gsmin, 0.1 * dirin)
+            val grd = g2 * dirin
+            if (trafo().parameter(exOfIn).hasLimits()) {
+                if (gstep > 0.5) {
+                    gstep = 0.5
+                }
+            }
+            gr.setEntry(i, grd)
+            gr2.setEntry(i, g2)
+            gst.setEntry(i, gstep)
+        }
+        return FunctionGradient(gr, gr2, gst)
+    }
+
+    fun gradient(par: MinimumParameters, gra: FunctionGradient?): FunctionGradient {
+        return gradient(par)
+    }
+
+    fun ncycle(): Int {
+        return strategy().gradientNCycles()
+    }
+
+    fun precision(): MnMachinePrecision {
+        return theTransformation.precision()
+    }
+
+    fun stepTolerance(): Double {
+        return strategy().gradientStepTolerance()
+    }
+
+    fun strategy(): MnStrategy {
+        return theStrategy
+    }
+
+    fun trafo(): MnUserTransformation {
+        return theTransformation
+    }
+
+    init {
+        theTransformation = par
+        theStrategy = stra
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINOSResult.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINOSResult.kt
new file mode 100644
index 000000000..c33994648
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINOSResult.kt
@@ -0,0 +1,70 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package space.kscience.kmath.optimization.minuit
+
+
+/**
+ * Контейнер для несимметричных оценок и доверительных интервалов
+ *
+ * @author Darksnake
+ * @version $Id: $Id
+ */
+class MINOSResult
+/**
+ *
+ * Constructor for MINOSResult.
+ *
+ * @param list an array of [String] objects.
+ */(private val names: Array<String>, private val errl: DoubleArray?, private val errp: DoubleArray?) :
+    IntervalEstimate {
+    fun getNames(): NameList {
+        return NameList(names)
+    }
+
+    fun getInterval(parName: String?): Pair<Value, Value> {
+        val index: Int = getNames().getNumberByName(parName)
+        return Pair(ValueFactory.of(errl!![index]), ValueFactory.of(errp!![index]))
+    }
+
+    val cL: Double
+        get() = 0.68
+
+    /** {@inheritDoc}  */
+    fun print(out: PrintWriter) {
+        if (errl != null || errp != null) {
+            out.println()
+            out.println("Assymetrical errors:")
+            out.println()
+            out.println("Name\tLower\tUpper")
+            for (i in 0 until getNames().size()) {
+                out.print(getNames().get(i))
+                out.print("\t")
+                if (errl != null) {
+                    out.print(errl[i])
+                } else {
+                    out.print("---")
+                }
+                out.print("\t")
+                if (errp != null) {
+                    out.print(errp[i])
+                } else {
+                    out.print("---")
+                }
+                out.println()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITFitter.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITFitter.kt
new file mode 100644
index 000000000..a26321249
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITFitter.kt
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+package space.kscience.kmath.optimization.minuit
+
+import ru.inr.mass.minuit.*
+
+/**
+ *
+ *
+ * MINUITFitter class.
+ *
+ * @author Darksnake
+ * @version $Id: $Id
+ */
+class MINUITFitter : Fitter {
+    fun run(state: FitState, parentLog: History?, meta: Meta): FitResult {
+        val log = Chronicle("MINUIT", parentLog)
+        val action: String = meta.getString("action", TASK_RUN)
+        log.report("MINUIT fit engine started action '{}'", action)
+        return when (action) {
+            TASK_COVARIANCE -> runHesse(state, log, meta)
+            TASK_SINGLE, TASK_RUN -> runFit(state, log, meta)
+            else -> throw IllegalArgumentException("Unknown task")
+        }
+    }
+
+    @NotNull
+    fun getName(): String {
+        return MINUIT_ENGINE_NAME
+    }
+
+    /**
+     *
+     *
+     * runHesse.
+     *
+     * @param state a [hep.dataforge.stat.fit.FitState] object.
+     * @param log
+     * @return a [FitResult] object.
+     */
+    fun runHesse(state: FitState, log: History, meta: Meta?): FitResult {
+        val strategy: Int
+        strategy = Global.INSTANCE.getInt("MINUIT_STRATEGY", 2)
+        log.report("Generating errors using MnHesse 2-nd order gradient calculator.")
+        val fcn: MultiFunction
+        val fitPars: Array<String> = Fitter.Companion.getFitPars(state, meta)
+        val pars: ParamSet = state.getParameters()
+        fcn = MINUITUtils.getFcn(state, pars, fitPars)
+        val hesse = MnHesse(strategy)
+        val mnState: MnUserParameterState = hesse.calculate(fcn, MINUITUtils.getFitParameters(pars, fitPars))
+        val allPars: ParamSet = pars.copy()
+        for (fitPar in fitPars) {
+            allPars.setParValue(fitPar, mnState.value(fitPar))
+            allPars.setParError(fitPar, mnState.error(fitPar))
+        }
+        val newState: FitState.Builder = state.edit()
+        newState.setPars(allPars)
+        if (mnState.hasCovariance()) {
+            val mnCov: MnUserCovariance = mnState.covariance()
+            var j: Int
+            val cov = Array(mnState.variableParameters()) { DoubleArray(mnState.variableParameters()) }
+            for (i in 0 until mnState.variableParameters()) {
+                j = 0
+                while (j < mnState.variableParameters()) {
+                    cov[i][j] = mnCov.get(i, j)
+                    j++
+                }
+            }
+            newState.setCovariance(NamedMatrix(fitPars, cov), true)
+        }
+        return FitResult.build(newState.build(), fitPars)
+    }
+
+    fun runFit(state: FitState, log: History, meta: Meta): FitResult {
+        val minuit: MnApplication
+        log.report("Starting fit using Minuit.")
+        val strategy: Int
+        strategy = Global.INSTANCE.getInt("MINUIT_STRATEGY", 2)
+        var force: Boolean
+        force = Global.INSTANCE.getBoolean("FORCE_DERIVS", false)
+        val fitPars: Array<String> = Fitter.Companion.getFitPars(state, meta)
+        for (fitPar in fitPars) {
+            if (!state.modelProvidesDerivs(fitPar)) {
+                force = true
+                log.reportError("Model does not provide derivatives for parameter '{}'", fitPar)
+            }
+        }
+        if (force) {
+            log.report("Using MINUIT gradient calculator.")
+        }
+        val fcn: MultiFunction
+        val pars: ParamSet = state.getParameters().copy()
+        fcn = MINUITUtils.getFcn(state, pars, fitPars)
+        val method: String = meta.getString("method", MINUIT_MIGRAD)
+        when (method) {
+            MINUIT_MINOS, MINUIT_MINIMIZE -> minuit =
+                MnMinimize(fcn, MINUITUtils.getFitParameters(pars, fitPars), strategy)
+            MINUIT_SIMPLEX -> minuit = MnSimplex(fcn, MINUITUtils.getFitParameters(pars, fitPars), strategy)
+            else -> minuit = MnMigrad(fcn, MINUITUtils.getFitParameters(pars, fitPars), strategy)
+        }
+        if (force) {
+            minuit.setUseAnalyticalDerivatives(false)
+            log.report("Forced to use MINUIT internal derivative calculator!")
+        }
+
+//        minuit.setUseAnalyticalDerivatives(true);
+        val minimum: FunctionMinimum
+        val maxSteps: Int = meta.getInt("iterations", -1)
+        val tolerance: Double = meta.getDouble("tolerance", -1)
+        minimum = if (maxSteps > 0) {
+            if (tolerance > 0) {
+                minuit.minimize(maxSteps, tolerance)
+            } else {
+                minuit.minimize(maxSteps)
+            }
+        } else {
+            minuit.minimize()
+        }
+        if (!minimum.isValid()) {
+            log.report("Minimization failed!")
+        }
+        log.report("MINUIT run completed in {} function calls.", minimum.nfcn())
+
+        /*
+         * Генерация результата
+         */
+        val allPars: ParamSet = pars.copy()
+        for (fitPar in fitPars) {
+            allPars.setParValue(fitPar, minimum.userParameters().value(fitPar))
+            allPars.setParError(fitPar, minimum.userParameters().error(fitPar))
+        }
+        val newState: FitState.Builder = state.edit()
+        newState.setPars(allPars)
+        var valid: Boolean = minimum.isValid()
+        if (minimum.userCovariance().nrow() > 0) {
+            var j: Int
+            val cov = Array(minuit.variableParameters()) { DoubleArray(minuit.variableParameters()) }
+            if (cov[0].length == 1) {
+                cov[0][0] = minimum.userParameters().error(0) * minimum.userParameters().error(0)
+            } else {
+                for (i in 0 until minuit.variableParameters()) {
+                    j = 0
+                    while (j < minuit.variableParameters()) {
+                        cov[i][j] = minimum.userCovariance().get(i, j)
+                        j++
+                    }
+                }
+            }
+            newState.setCovariance(NamedMatrix(fitPars, cov), true)
+        }
+        if (method == MINUIT_MINOS) {
+            log.report("Starting MINOS procedure for precise error estimation.")
+            val minos = MnMinos(fcn, minimum, strategy)
+            var mnError: MinosError
+            val errl = DoubleArray(fitPars.size)
+            val errp = DoubleArray(fitPars.size)
+            for (i in fitPars.indices) {
+                mnError = minos.minos(i)
+                if (mnError.isValid()) {
+                    errl[i] = mnError.lower()
+                    errp[i] = mnError.upper()
+                } else {
+                    valid = false
+                }
+            }
+            val minosErrors = MINOSResult(fitPars, errl, errp)
+            newState.setInterval(minosErrors)
+        }
+        return FitResult.build(newState.build(), valid, fitPars)
+    }
+
+    companion object {
+        /**
+         * Constant `MINUIT_MIGRAD="MIGRAD"`
+         */
+        const val MINUIT_MIGRAD = "MIGRAD"
+
+        /**
+         * Constant `MINUIT_MINIMIZE="MINIMIZE"`
+         */
+        const val MINUIT_MINIMIZE = "MINIMIZE"
+
+        /**
+         * Constant `MINUIT_SIMPLEX="SIMPLEX"`
+         */
+        const val MINUIT_SIMPLEX = "SIMPLEX"
+
+        /**
+         * Constant `MINUIT_MINOS="MINOS"`
+         */
+        const val MINUIT_MINOS = "MINOS" //MINOS errors
+
+        /**
+         * Constant `MINUIT_HESSE="HESSE"`
+         */
+        const val MINUIT_HESSE = "HESSE" //HESSE errors
+
+        /**
+         * Constant `MINUIT_ENGINE_NAME="MINUIT"`
+         */
+        const val MINUIT_ENGINE_NAME = "MINUIT"
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITPlugin.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITPlugin.kt
new file mode 100644
index 000000000..7eaefd9d2
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITPlugin.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+package space.kscience.kmath.optimization.minuit
+
+import hep.dataforge.context.*
+
+/**
+ * Мэнеджер для MINUITа. Пока не играет никакой активной роли кроме ведения
+ * внутреннего лога.
+ *
+ * @author Darksnake
+ * @version $Id: $Id
+ */
+@PluginDef(group = "hep.dataforge",
+    name = "MINUIT",
+    dependsOn = ["hep.dataforge:fitting"],
+    info = "The MINUIT fitter engine for DataForge fitting")
+class MINUITPlugin : BasicPlugin() {
+    fun attach(@NotNull context: Context?) {
+        super.attach(context)
+        clearStaticLog()
+    }
+
+    @Provides(Fitter.FITTER_TARGET)
+    fun getFitter(fitterName: String): Fitter? {
+        return if (fitterName == "MINUIT") {
+            MINUITFitter()
+        } else {
+            null
+        }
+    }
+
+    @ProvidesNames(Fitter.FITTER_TARGET)
+    fun listFitters(): List<String> {
+        return listOf("MINUIT")
+    }
+
+    fun detach() {
+        clearStaticLog()
+        super.detach()
+    }
+
+    class Factory : PluginFactory() {
+        fun build(meta: Meta?): Plugin {
+            return MINUITPlugin()
+        }
+
+        fun getType(): java.lang.Class<out Plugin?> {
+            return MINUITPlugin::class.java
+        }
+    }
+
+    companion object {
+        /**
+         * Constant `staticLog`
+         */
+        private val staticLog: Chronicle? = Chronicle("MINUIT-STATIC", Global.INSTANCE.getHistory())
+
+        /**
+         *
+         *
+         * clearStaticLog.
+         */
+        fun clearStaticLog() {
+            staticLog.clear()
+        }
+
+        /**
+         *
+         *
+         * logStatic.
+         *
+         * @param str  a [String] object.
+         * @param pars a [Object] object.
+         */
+        fun logStatic(str: String?, vararg pars: Any?) {
+            checkNotNull(staticLog) { "MINUIT log is not initialized." }
+            staticLog.report(str, pars)
+            LoggerFactory.getLogger("MINUIT").info(String.format(str, *pars))
+            //        Out.out.printf(str,pars);
+//        Out.out.println();
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITUtils.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITUtils.kt
new file mode 100644
index 000000000..44c70cb42
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITUtils.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+package space.kscience.kmath.optimization.minuit
+
+import hep.dataforge.MINUIT.FunctionMinimum
+
+internal object MINUITUtils {
+    fun getFcn(source: FitState, allPar: ParamSet, fitPars: Array<String>): MultiFunction {
+        return MnFunc(source, allPar, fitPars)
+    }
+
+    fun getFitParameters(set: ParamSet, fitPars: Array<String>): MnUserParameters {
+        val pars = MnUserParameters()
+        var i: Int
+        var par: Param
+        i = 0
+        while (i < fitPars.size) {
+            par = set.getByName(fitPars[i])
+            pars.add(fitPars[i], par.getValue(), par.getErr())
+            if (par.getLowerBound() > Double.NEGATIVE_INFINITY && par.getUpperBound() < Double.POSITIVE_INFINITY) {
+                pars.setLimits(i, par.getLowerBound(), par.getUpperBound())
+            } else if (par.getLowerBound() > Double.NEGATIVE_INFINITY) {
+                pars.setLowerLimit(i, par.getLowerBound())
+            } else if (par.getUpperBound() < Double.POSITIVE_INFINITY) {
+                pars.setUpperLimit(i, par.getUpperBound())
+            }
+            i++
+        }
+        return pars
+    }
+
+    fun getValueSet(allPar: ParamSet, names: Array<String>, values: DoubleArray): ParamSet {
+        assert(values.size == names.size)
+        assert(allPar.getNames().contains(names))
+        val vector: ParamSet = allPar.copy()
+        for (i in values.indices) {
+            vector.setParValue(names[i], values[i])
+        }
+        return vector
+    }
+
+    fun isValidArray(ar: DoubleArray): Boolean {
+        for (i in ar.indices) {
+            if (java.lang.Double.isNaN(ar[i])) {
+                return false
+            }
+        }
+        return true
+    }
+
+    /**
+     *
+     *
+     * printMINUITResult.
+     *
+     * @param out a [PrintWriter] object.
+     * @param minimum a [hep.dataforge.MINUIT.FunctionMinimum] object.
+     */
+    fun printMINUITResult(out: PrintWriter, minimum: FunctionMinimum?) {
+        out.println()
+        out.println("***MINUIT INTERNAL FIT INFORMATION***")
+        out.println()
+        MnPrint.print(out, minimum)
+        out.println()
+        out.println("***END OF MINUIT INTERNAL FIT INFORMATION***")
+        out.println()
+    }
+
+    internal class MnFunc(source: FitState, allPar: ParamSet, fitPars: Array<String>) : MultiFunction {
+        var source: FitState
+        var allPar: ParamSet
+        var fitPars: Array<String>
+        fun value(doubles: DoubleArray): Double {
+            assert(isValidArray(doubles))
+            assert(doubles.size == fitPars.size)
+            return -2 * source.getLogProb(getValueSet(allPar, fitPars, doubles))
+            //                    source.getChi2(getValueSet(allPar, fitPars, doubles));
+        }
+
+        @Throws(NotDefinedException::class)
+        fun derivValue(n: Int, doubles: DoubleArray): Double {
+            assert(isValidArray(doubles))
+            assert(doubles.size == getDimension())
+            val set: ParamSet = getValueSet(allPar, fitPars, doubles)
+
+//            double res;
+//            double d, s, deriv;
+//
+//            res = 0;
+//            for (int i = 0; i < source.getDataNum(); i++) {
+//                d = source.getDis(i, set);
+//                s = source.getDispersion(i, set);
+//                if (source.modelProvidesDerivs(fitPars[n])) {
+//                    deriv = source.getDisDeriv(fitPars[n], i, set);
+//                } else {
+//                    throw new NotDefinedException();
+//                    // Такого не должно быть, поскольку мы где-то наверху должы были проверить, что производные все есть.
+//                }
+//                res += 2 * d * deriv / s;
+//            }
+            return -2 * source.getLogProbDeriv(fitPars[n], set)
+        }
+
+        fun getDimension(): Int {
+            return fitPars.size
+        }
+
+        fun providesDeriv(n: Int): Boolean {
+            return source.modelProvidesDerivs(fitPars[n])
+        }
+
+        init {
+            this.source = source
+            this.allPar = allPar
+            this.fitPars = fitPars
+            assert(source.getModel().getNames().contains(fitPars))
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumBuilder.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumBuilder.kt
new file mode 100644
index 000000000..eadeeb91d
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumBuilder.kt
@@ -0,0 +1,43 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+interface MinimumBuilder {
+    /**
+     *
+     * minimum.
+     *
+     * @param fcn a [hep.dataforge.MINUIT.MnFcn] object.
+     * @param gc a [hep.dataforge.MINUIT.GradientCalculator] object.
+     * @param seed a [hep.dataforge.MINUIT.MinimumSeed] object.
+     * @param strategy a [hep.dataforge.MINUIT.MnStrategy] object.
+     * @param maxfcn a int.
+     * @param toler a double.
+     * @return a [hep.dataforge.MINUIT.FunctionMinimum] object.
+     */
+    fun minimum(
+        fcn: MnFcn?,
+        gc: GradientCalculator?,
+        seed: MinimumSeed?,
+        strategy: MnStrategy?,
+        maxfcn: Int,
+        toler: Double
+    ): FunctionMinimum
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumError.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumError.kt
new file mode 100644
index 000000000..6993b9e6d
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumError.kt
@@ -0,0 +1,155 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import space.kscience.kmath.optimization.minuit.MINUITPlugin
+
+/**
+ * MinimumError keeps the inverse 2nd derivative (inverse Hessian) used for
+ * calculating the parameter step size (-V*g) and for the covariance update
+ * (ErrorUpdator). The covariance matrix is equal to twice the inverse Hessian.
+ *
+ * @version $Id$
+ */
+class MinimumError {
+    private var theAvailable = false
+    private var theDCovar: Double
+    private var theHesseFailed = false
+    private var theInvertFailed = false
+    private var theMadePosDef = false
+    private var theMatrix: MnAlgebraicSymMatrix
+    private var thePosDef = false
+    private var theValid = false
+
+    constructor(n: Int) {
+        theMatrix = MnAlgebraicSymMatrix(n)
+        theDCovar = 1.0
+    }
+
+    constructor(mat: MnAlgebraicSymMatrix, dcov: Double) {
+        theMatrix = mat
+        theDCovar = dcov
+        theValid = true
+        thePosDef = true
+        theAvailable = true
+    }
+
+    constructor(mat: MnAlgebraicSymMatrix, x: MnHesseFailed?) {
+        theMatrix = mat
+        theDCovar = 1.0
+        theValid = false
+        thePosDef = false
+        theMadePosDef = false
+        theHesseFailed = true
+        theInvertFailed = false
+        theAvailable = true
+    }
+
+    constructor(mat: MnAlgebraicSymMatrix, x: MnMadePosDef?) {
+        theMatrix = mat
+        theDCovar = 1.0
+        theValid = false
+        thePosDef = false
+        theMadePosDef = true
+        theHesseFailed = false
+        theInvertFailed = false
+        theAvailable = true
+    }
+
+    constructor(mat: MnAlgebraicSymMatrix, x: MnInvertFailed?) {
+        theMatrix = mat
+        theDCovar = 1.0
+        theValid = false
+        thePosDef = true
+        theMadePosDef = false
+        theHesseFailed = false
+        theInvertFailed = true
+        theAvailable = true
+    }
+
+    constructor(mat: MnAlgebraicSymMatrix, x: MnNotPosDef?) {
+        theMatrix = mat
+        theDCovar = 1.0
+        theValid = false
+        thePosDef = false
+        theMadePosDef = false
+        theHesseFailed = false
+        theInvertFailed = false
+        theAvailable = true
+    }
+
+    fun dcovar(): Double {
+        return theDCovar
+    }
+
+    fun hesseFailed(): Boolean {
+        return theHesseFailed
+    }
+
+    fun hessian(): MnAlgebraicSymMatrix {
+        return try {
+            val tmp: MnAlgebraicSymMatrix = theMatrix.copy()
+            tmp.invert()
+            tmp
+        } catch (x: SingularMatrixException) {
+            MINUITPlugin.logStatic("BasicMinimumError inversion fails; return diagonal matrix.")
+            val tmp = MnAlgebraicSymMatrix(theMatrix.nrow())
+            var i = 0
+            while (i < theMatrix.nrow()) {
+                tmp[i, i] = 1.0 / theMatrix[i, i]
+                i++
+            }
+            tmp
+        }
+    }
+
+    fun invHessian(): MnAlgebraicSymMatrix {
+        return theMatrix
+    }
+
+    fun invertFailed(): Boolean {
+        return theInvertFailed
+    }
+
+    fun isAccurate(): Boolean {
+        return theDCovar < 0.1
+    }
+
+    fun isAvailable(): Boolean {
+        return theAvailable
+    }
+
+    fun isMadePosDef(): Boolean {
+        return theMadePosDef
+    }
+
+    fun isPosDef(): Boolean {
+        return thePosDef
+    }
+
+    fun isValid(): Boolean {
+        return theValid
+    }
+
+    fun matrix(): MnAlgebraicSymMatrix {
+        return MnUtils.mul(theMatrix, 2)
+    }
+
+    internal class MnHesseFailed
+    internal class MnInvertFailed
+    internal class MnMadePosDef
+    internal class MnNotPosDef
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumErrorUpdator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumErrorUpdator.kt
new file mode 100644
index 000000000..6022aa5b7
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumErrorUpdator.kt
@@ -0,0 +1,33 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+internal interface MinimumErrorUpdator {
+    /**
+     *
+     * update.
+     *
+     * @param state a [hep.dataforge.MINUIT.MinimumState] object.
+     * @param par a [hep.dataforge.MINUIT.MinimumParameters] object.
+     * @param grad a [hep.dataforge.MINUIT.FunctionGradient] object.
+     * @return a [hep.dataforge.MINUIT.MinimumError] object.
+     */
+    fun update(state: MinimumState?, par: MinimumParameters?, grad: FunctionGradient?): MinimumError?
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumParameters.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumParameters.kt
new file mode 100644
index 000000000..bed13ea0b
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumParameters.kt
@@ -0,0 +1,70 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.ArrayRealVector
+
+/**
+ *
+ * @version $Id$
+ */
+class MinimumParameters {
+    private var theFVal = 0.0
+    private var theHasStep = false
+    private var theParameters: RealVector
+    private var theStepSize: RealVector
+    private var theValid = false
+
+    constructor(n: Int) {
+        theParameters = ArrayRealVector(n)
+        theStepSize = ArrayRealVector(n)
+    }
+
+    constructor(avec: RealVector, fval: Double) {
+        theParameters = avec
+        theStepSize = ArrayRealVector(avec.getDimension())
+        theFVal = fval
+        theValid = true
+    }
+
+    constructor(avec: RealVector, dirin: RealVector, fval: Double) {
+        theParameters = avec
+        theStepSize = dirin
+        theFVal = fval
+        theValid = true
+        theHasStep = true
+    }
+
+    fun dirin(): RealVector {
+        return theStepSize
+    }
+
+    fun fval(): Double {
+        return theFVal
+    }
+
+    fun hasStepSize(): Boolean {
+        return theHasStep
+    }
+
+    fun isValid(): Boolean {
+        return theValid
+    }
+
+    fun vec(): RealVector {
+        return theParameters
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeed.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeed.kt
new file mode 100644
index 000000000..aef672bb7
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeed.kt
@@ -0,0 +1,64 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+class MinimumSeed(state: MinimumState, trafo: MnUserTransformation) {
+    private val theState: MinimumState = state
+    private val theTrafo: MnUserTransformation = trafo
+    private val theValid: Boolean = true
+    val edm: Double get() = state().edm()
+
+    fun error(): MinimumError {
+        return state().error()
+    }
+
+    fun fval(): Double {
+        return state().fval()
+    }
+
+    fun gradient(): FunctionGradient {
+        return state().gradient()
+    }
+
+    fun isValid(): Boolean {
+        return theValid
+    }
+
+    fun nfcn(): Int {
+        return state().nfcn()
+    }
+
+    fun parameters(): MinimumParameters {
+        return state().parameters()
+    }
+
+    fun precision(): MnMachinePrecision {
+        return theTrafo.precision()
+    }
+
+    fun state(): MinimumState {
+        return theState
+    }
+
+    fun trafo(): MnUserTransformation {
+        return theTrafo
+    }
+
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeedGenerator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeedGenerator.kt
new file mode 100644
index 000000000..bd04c1a45
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeedGenerator.kt
@@ -0,0 +1,37 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ * base class for seed generators (starting values); the seed generator prepares
+ * initial starting values from the input (MnUserParameterState) for the
+ * minimization;
+ *
+ * @version $Id$
+ */
+interface MinimumSeedGenerator {
+    /**
+     *
+     * generate.
+     *
+     * @param fcn a [hep.dataforge.MINUIT.MnFcn] object.
+     * @param calc a [hep.dataforge.MINUIT.GradientCalculator] object.
+     * @param user a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     * @param stra a [hep.dataforge.MINUIT.MnStrategy] object.
+     * @return a [hep.dataforge.MINUIT.MinimumSeed] object.
+     */
+    fun generate(fcn: MnFcn?, calc: GradientCalculator?, user: MnUserParameterState?, stra: MnStrategy?): MinimumSeed
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumState.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumState.kt
new file mode 100644
index 000000000..9f63e0e1f
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumState.kt
@@ -0,0 +1,104 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.RealVector
+
+/**
+ * MinimumState keeps the information (position, gradient, 2nd deriv, etc) after
+ * one minimization step (usually in MinimumBuilder).
+ *
+ * @version $Id$
+ */
+class MinimumState {
+    private var theEDM = 0.0
+    private var theError: MinimumError
+    private var theGradient: FunctionGradient
+    private var theNFcn = 0
+    private var theParameters: MinimumParameters
+
+    constructor(n: Int) {
+        theParameters = MinimumParameters(n)
+        theError = MinimumError(n)
+        theGradient = FunctionGradient(n)
+    }
+
+    constructor(states: MinimumParameters, err: MinimumError, grad: FunctionGradient, edm: Double, nfcn: Int) {
+        theParameters = states
+        theError = err
+        theGradient = grad
+        theEDM = edm
+        theNFcn = nfcn
+    }
+
+    constructor(states: MinimumParameters, edm: Double, nfcn: Int) {
+        theParameters = states
+        theError = MinimumError(states.vec().getDimension())
+        theGradient = FunctionGradient(states.vec().getDimension())
+        theEDM = edm
+        theNFcn = nfcn
+    }
+
+    fun edm(): Double {
+        return theEDM
+    }
+
+    fun error(): MinimumError {
+        return theError
+    }
+
+    fun fval(): Double {
+        return theParameters.fval()
+    }
+
+    fun gradient(): FunctionGradient {
+        return theGradient
+    }
+
+    fun hasCovariance(): Boolean {
+        return theError.isAvailable()
+    }
+
+    fun hasParameters(): Boolean {
+        return theParameters.isValid()
+    }
+
+    fun isValid(): Boolean {
+        return if (hasParameters() && hasCovariance()) {
+            parameters().isValid() && error().isValid()
+        } else if (hasParameters()) {
+            parameters().isValid()
+        } else {
+            false
+        }
+    }
+
+    fun nfcn(): Int {
+        return theNFcn
+    }
+
+    fun parameters(): MinimumParameters {
+        return theParameters
+    }
+
+    fun size(): Int {
+        return theParameters.vec().getDimension()
+    }
+
+    fun vec(): RealVector {
+        return theParameters.vec()
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinosError.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinosError.kt
new file mode 100644
index 000000000..c7cf10523
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinosError.kt
@@ -0,0 +1,219 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * MinosError class.
+ *
+ * @author Darksnake
+ * @version $Id$
+ */
+class MinosError {
+    private var theLower: MnCross
+    private var theMinValue = 0.0
+    private var theParameter = 0
+    private var theUpper: MnCross
+
+    internal constructor() {
+        theUpper = MnCross()
+        theLower = MnCross()
+    }
+
+    internal constructor(par: Int, min: Double, low: MnCross, up: MnCross) {
+        theParameter = par
+        theMinValue = min
+        theUpper = up
+        theLower = low
+    }
+
+    /**
+     *
+     * atLowerLimit.
+     *
+     * @return a boolean.
+     */
+    fun atLowerLimit(): Boolean {
+        return theLower.atLimit()
+    }
+
+    /**
+     *
+     * atLowerMaxFcn.
+     *
+     * @return a boolean.
+     */
+    fun atLowerMaxFcn(): Boolean {
+        return theLower.atMaxFcn()
+    }
+
+    /**
+     *
+     * atUpperLimit.
+     *
+     * @return a boolean.
+     */
+    fun atUpperLimit(): Boolean {
+        return theUpper.atLimit()
+    }
+
+    /**
+     *
+     * atUpperMaxFcn.
+     *
+     * @return a boolean.
+     */
+    fun atUpperMaxFcn(): Boolean {
+        return theUpper.atMaxFcn()
+    }
+
+    /**
+     *
+     * isValid.
+     *
+     * @return a boolean.
+     */
+    fun isValid(): Boolean {
+        return theLower.isValid() && theUpper.isValid()
+    }
+
+    /**
+     *
+     * lower.
+     *
+     * @return a double.
+     */
+    fun lower(): Double {
+        return -1.0 * lowerState().error(parameter()) * (1.0 + theLower.value())
+    }
+
+    /**
+     *
+     * lowerNewMin.
+     *
+     * @return a boolean.
+     */
+    fun lowerNewMin(): Boolean {
+        return theLower.newMinimum()
+    }
+
+    /**
+     *
+     * lowerState.
+     *
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun lowerState(): MnUserParameterState {
+        return theLower.state()
+    }
+
+    /**
+     *
+     * lowerValid.
+     *
+     * @return a boolean.
+     */
+    fun lowerValid(): Boolean {
+        return theLower.isValid()
+    }
+
+    /**
+     *
+     * min.
+     *
+     * @return a double.
+     */
+    fun min(): Double {
+        return theMinValue
+    }
+
+    /**
+     *
+     * nfcn.
+     *
+     * @return a int.
+     */
+    fun nfcn(): Int {
+        return theUpper.nfcn() + theLower.nfcn()
+    }
+
+    /**
+     *
+     * parameter.
+     *
+     * @return a int.
+     */
+    fun parameter(): Int {
+        return theParameter
+    }
+
+    /**
+     *
+     * range.
+     *
+     * @return
+     */
+    fun range(): Range {
+        return Range(lower(), upper())
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    override fun toString(): String {
+        return MnPrint.toString(this)
+    }
+
+    /**
+     *
+     * upper.
+     *
+     * @return a double.
+     */
+    fun upper(): Double {
+        return upperState().error(parameter()) * (1.0 + theUpper.value())
+    }
+
+    /**
+     *
+     * upperNewMin.
+     *
+     * @return a boolean.
+     */
+    fun upperNewMin(): Boolean {
+        return theUpper.newMinimum()
+    }
+
+    /**
+     *
+     * upperState.
+     *
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun upperState(): MnUserParameterState {
+        return theUpper.state()
+    }
+
+    /**
+     *
+     * upperValid.
+     *
+     * @return a boolean.
+     */
+    fun upperValid(): Boolean {
+        return theUpper.isValid()
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinuitParameter.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinuitParameter.kt
new file mode 100644
index 000000000..ff6834df4
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinuitParameter.kt
@@ -0,0 +1,314 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+class MinuitParameter {
+    private var theConst = false
+    private var theError = 0.0
+    private var theFix = false
+    private var theLoLimValid = false
+    private var theLoLimit = 0.0
+    private var theName: String
+    private var theNum: Int
+    private var theUpLimValid = false
+    private var theUpLimit = 0.0
+    private var theValue: Double
+
+    /**
+     * constructor for constant parameter
+     *
+     * @param num a int.
+     * @param name a [String] object.
+     * @param val a double.
+     */
+    constructor(num: Int, name: String, `val`: Double) {
+        theNum = num
+        theValue = `val`
+        theConst = true
+        theName = name
+    }
+
+    /**
+     * constructor for standard parameter
+     *
+     * @param num a int.
+     * @param name a [String] object.
+     * @param val a double.
+     * @param err a double.
+     */
+    constructor(num: Int, name: String, `val`: Double, err: Double) {
+        theNum = num
+        theValue = `val`
+        theError = err
+        theName = name
+    }
+
+    /**
+     * constructor for limited parameter
+     *
+     * @param num a int.
+     * @param name a [String] object.
+     * @param val a double.
+     * @param err a double.
+     * @param min a double.
+     * @param max a double.
+     */
+    constructor(num: Int, name: String, `val`: Double, err: Double, min: Double, max: Double) {
+        theNum = num
+        theValue = `val`
+        theError = err
+        theLoLimit = min
+        theUpLimit = max
+        theLoLimValid = true
+        theUpLimValid = true
+        require(min != max) { "min == max" }
+        if (min > max) {
+            theLoLimit = max
+            theUpLimit = min
+        }
+        theName = name
+    }
+
+    private constructor(other: MinuitParameter) {
+        theNum = other.theNum
+        theName = other.theName
+        theValue = other.theValue
+        theError = other.theError
+        theConst = other.theConst
+        theFix = other.theFix
+        theLoLimit = other.theLoLimit
+        theUpLimit = other.theUpLimit
+        theLoLimValid = other.theLoLimValid
+        theUpLimValid = other.theUpLimValid
+    }
+
+    /**
+     *
+     * copy.
+     *
+     * @return a [hep.dataforge.MINUIT.MinuitParameter] object.
+     */
+    fun copy(): MinuitParameter {
+        return MinuitParameter(this)
+    }
+
+    /**
+     *
+     * error.
+     *
+     * @return a double.
+     */
+    fun error(): Double {
+        return theError
+    }
+
+    /**
+     *
+     * fix.
+     */
+    fun fix() {
+        theFix = true
+    }
+
+    /**
+     *
+     * hasLimits.
+     *
+     * @return a boolean.
+     */
+    fun hasLimits(): Boolean {
+        return theLoLimValid || theUpLimValid
+    }
+
+    /**
+     *
+     * hasLowerLimit.
+     *
+     * @return a boolean.
+     */
+    fun hasLowerLimit(): Boolean {
+        return theLoLimValid
+    }
+
+    /**
+     *
+     * hasUpperLimit.
+     *
+     * @return a boolean.
+     */
+    fun hasUpperLimit(): Boolean {
+        return theUpLimValid
+    }
+    //state of parameter (fixed/const/limited)
+    /**
+     *
+     * isConst.
+     *
+     * @return a boolean.
+     */
+    fun isConst(): Boolean {
+        return theConst
+    }
+
+    /**
+     *
+     * isFixed.
+     *
+     * @return a boolean.
+     */
+    fun isFixed(): Boolean {
+        return theFix
+    }
+
+    /**
+     *
+     * lowerLimit.
+     *
+     * @return a double.
+     */
+    fun lowerLimit(): Double {
+        return theLoLimit
+    }
+
+    /**
+     *
+     * name.
+     *
+     * @return a [String] object.
+     */
+    fun name(): String {
+        return theName
+    }
+    //access methods
+    /**
+     *
+     * number.
+     *
+     * @return a int.
+     */
+    fun number(): Int {
+        return theNum
+    }
+
+    /**
+     *
+     * release.
+     */
+    fun release() {
+        theFix = false
+    }
+
+    /**
+     *
+     * removeLimits.
+     */
+    fun removeLimits() {
+        theLoLimit = 0.0
+        theUpLimit = 0.0
+        theLoLimValid = false
+        theUpLimValid = false
+    }
+
+    /**
+     *
+     * setError.
+     *
+     * @param err a double.
+     */
+    fun setError(err: Double) {
+        theError = err
+        theConst = false
+    }
+
+    /**
+     *
+     * setLimits.
+     *
+     * @param low a double.
+     * @param up a double.
+     */
+    fun setLimits(low: Double, up: Double) {
+        require(low != up) { "min == max" }
+        theLoLimit = low
+        theUpLimit = up
+        theLoLimValid = true
+        theUpLimValid = true
+        if (low > up) {
+            theLoLimit = up
+            theUpLimit = low
+        }
+    }
+
+    /**
+     *
+     * setLowerLimit.
+     *
+     * @param low a double.
+     */
+    fun setLowerLimit(low: Double) {
+        theLoLimit = low
+        theUpLimit = 0.0
+        theLoLimValid = true
+        theUpLimValid = false
+    }
+
+    /**
+     *
+     * setUpperLimit.
+     *
+     * @param up a double.
+     */
+    fun setUpperLimit(up: Double) {
+        theLoLimit = 0.0
+        theUpLimit = up
+        theLoLimValid = false
+        theUpLimValid = true
+    }
+    //interaction
+    /**
+     *
+     * setValue.
+     *
+     * @param val a double.
+     */
+    fun setValue(`val`: Double) {
+        theValue = `val`
+    }
+
+    /**
+     *
+     * upperLimit.
+     *
+     * @return a double.
+     */
+    fun upperLimit(): Double {
+        return theUpLimit
+    }
+
+    /**
+     *
+     * value.
+     *
+     * @return a double.
+     */
+    fun value(): Double {
+        return theValue
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnAlgebraicSymMatrix.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnAlgebraicSymMatrix.kt
new file mode 100644
index 000000000..4b75858e1
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnAlgebraicSymMatrix.kt
@@ -0,0 +1,458 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.ArrayRealVector
+
+/**
+ *
+ * @version $Id$
+ */
+class MnAlgebraicSymMatrix(n: Int) {
+    private val theData: DoubleArray
+    private val theNRow: Int
+    private val theSize: Int
+
+    /**
+     *
+     * copy.
+     *
+     * @return a [hep.dataforge.MINUIT.MnAlgebraicSymMatrix] object.
+     */
+    fun copy(): MnAlgebraicSymMatrix {
+        val copy = MnAlgebraicSymMatrix(theNRow)
+        java.lang.System.arraycopy(theData, 0, copy.theData, 0, theSize)
+        return copy
+    }
+
+    fun data(): DoubleArray {
+        return theData
+    }
+
+    fun eigenvalues(): ArrayRealVector {
+        val nrow = theNRow
+        val tmp = DoubleArray((nrow + 1) * (nrow + 1))
+        val work = DoubleArray(1 + 2 * nrow)
+        for (i in 0 until nrow) {
+            for (j in 0..i) {
+                tmp[1 + i + (1 + j) * nrow] = get(i, j)
+                tmp[(1 + i) * nrow + (1 + j)] = get(i, j)
+            }
+        }
+        val info = mneigen(tmp, nrow, nrow, work.size, work, 1e-6)
+        if (info != 0) {
+            throw EigenvaluesException()
+        }
+        val result = ArrayRealVector(nrow)
+        for (i in 0 until nrow) {
+            result.setEntry(i, work[1 + i])
+        }
+        return result
+    }
+
+    operator fun get(row: Int, col: Int): Double {
+        if (row >= theNRow || col >= theNRow) {
+            throw ArrayIndexOutOfBoundsException()
+        }
+        return theData[theIndex(row, col)]
+    }
+
+    @Throws(SingularMatrixException::class)
+    fun invert() {
+        if (theSize == 1) {
+            val tmp = theData[0]
+            if (tmp <= 0.0) {
+                throw SingularMatrixException()
+            }
+            theData[0] = 1.0 / tmp
+        } else {
+            val nrow = theNRow
+            val s = DoubleArray(nrow)
+            val q = DoubleArray(nrow)
+            val pp = DoubleArray(nrow)
+            for (i in 0 until nrow) {
+                val si = theData[theIndex(i, i)]
+                if (si < 0.0) {
+                    throw SingularMatrixException()
+                }
+                s[i] = 1.0 / sqrt(si)
+            }
+            for (i in 0 until nrow) {
+                for (j in i until nrow) {
+                    theData[theIndex(i, j)] *= s[i] * s[j]
+                }
+            }
+            for (i in 0 until nrow) {
+                var k = i
+                if (theData[theIndex(k, k)] == 0.0) {
+                    throw SingularMatrixException()
+                }
+                q[k] = 1.0 / theData[theIndex(k, k)]
+                pp[k] = 1.0
+                theData[theIndex(k, k)] = 0.0
+                val kp1 = k + 1
+                if (k != 0) {
+                    for (j in 0 until k) {
+                        val index = theIndex(j, k)
+                        pp[j] = theData[index]
+                        q[j] = theData[index] * q[k]
+                        theData[index] = 0.0
+                    }
+                }
+                if (k != nrow - 1) {
+                    for (j in kp1 until nrow) {
+                        val index = theIndex(k, j)
+                        pp[j] = theData[index]
+                        q[j] = -theData[index] * q[k]
+                        theData[index] = 0.0
+                    }
+                }
+                for (j in 0 until nrow) {
+                    k = j
+                    while (k < nrow) {
+                        theData[theIndex(j, k)] += pp[j] * q[k]
+                        k++
+                    }
+                }
+            }
+            for (j in 0 until nrow) {
+                for (k in j until nrow) {
+                    theData[theIndex(j, k)] *= s[j] * s[k]
+                }
+            }
+        }
+    }
+
+    fun ncol(): Int {
+        return nrow()
+    }
+
+    fun nrow(): Int {
+        return theNRow
+    }
+
+    operator fun set(row: Int, col: Int, value: Double) {
+        if (row >= theNRow || col >= theNRow) {
+            throw ArrayIndexOutOfBoundsException()
+        }
+        theData[theIndex(row, col)] = value
+    }
+
+    fun size(): Int {
+        return theSize
+    }
+
+    private fun theIndex(row: Int, col: Int): Int {
+        return if (row > col) {
+            col + row * (row + 1) / 2
+        } else {
+            row + col * (col + 1) / 2
+        }
+    }
+
+    /** {@inheritDoc}  */
+    override fun toString(): String {
+        return MnPrint.toString(this)
+    } /* mneig_ */
+
+    private inner class EigenvaluesException : RuntimeException()
+    companion object {
+        private fun mneigen(a: DoubleArray, ndima: Int, n: Int, mits: Int, work: DoubleArray, precis: Double): Int {
+
+            /* System generated locals */
+            var i__2: Int
+            var i__3: Int
+
+            /* Local variables */
+            var b: Double
+            var c__: Double
+            var f: Double
+            var h__: Double
+            var i__: Int
+            var j: Int
+            var k: Int
+            var l: Int
+            var m = 0
+            var r__: Double
+            var s: Double
+            var i0: Int
+            var i1: Int
+            var j1: Int
+            var m1: Int
+            var hh: Double
+            var gl: Double
+            var pr: Double
+            var pt: Double
+
+            /* PRECIS is the machine precision EPSMAC */
+            /* Parameter adjustments */
+            val a_dim1: Int = ndima
+            val a_offset: Int = 1 + a_dim1 * 1
+
+            /* Function Body */
+            var ifault = 1
+            i__ = n
+            var i__1: Int = n
+            i1 = 2
+            while (i1 <= i__1) {
+                l = i__ - 2
+                f = a[i__ + (i__ - 1) * a_dim1]
+                gl = 0.0
+                if (l >= 1) {
+                    i__2 = l
+                    k = 1
+                    while (k <= i__2) {
+
+                        /* Computing 2nd power */
+                        val r__1 = a[i__ + k * a_dim1]
+                        gl += r__1 * r__1
+                        ++k
+                    }
+                }
+                /* Computing 2nd power */h__ = gl + f * f
+                if (gl <= 1e-35) {
+                    work[i__] = 0.0
+                    work[n + i__] = f
+                } else {
+                    ++l
+                    gl = sqrt(h__)
+                    if (f >= 0.0) {
+                        gl = -gl
+                    }
+                    work[n + i__] = gl
+                    h__ -= f * gl
+                    a[i__ + (i__ - 1) * a_dim1] = f - gl
+                    f = 0.0
+                    i__2 = l
+                    j = 1
+                    while (j <= i__2) {
+                        a[j + i__ * a_dim1] = a[i__ + j * a_dim1] / h__
+                        gl = 0.0
+                        i__3 = j
+                        k = 1
+                        while (k <= i__3) {
+                            gl += a[j + k * a_dim1] * a[i__ + k * a_dim1]
+                            ++k
+                        }
+                        if (j < l) {
+                            j1 = j + 1
+                            i__3 = l
+                            k = j1
+                            while (k <= i__3) {
+                                gl += a[k + j * a_dim1] * a[i__ + k * a_dim1]
+                                ++k
+                            }
+                        }
+                        work[n + j] = gl / h__
+                        f += gl * a[j + i__ * a_dim1]
+                        ++j
+                    }
+                    hh = f / (h__ + h__)
+                    i__2 = l
+                    j = 1
+                    while (j <= i__2) {
+                        f = a[i__ + j * a_dim1]
+                        gl = work[n + j] - hh * f
+                        work[n + j] = gl
+                        i__3 = j
+                        k = 1
+                        while (k <= i__3) {
+                            a[j + k * a_dim1] = a[j + k * a_dim1] - f * work[n + k] - (gl
+                                    * a[i__ + k * a_dim1])
+                            ++k
+                        }
+                        ++j
+                    }
+                    work[i__] = h__
+                }
+                --i__
+                ++i1
+            }
+            work[1] = 0.0
+            work[n + 1] = 0.0
+            i__1 = n
+            i__ = 1
+            while (i__ <= i__1) {
+                l = i__ - 1
+                if (work[i__] != 0.0 && l != 0) {
+                    i__3 = l
+                    j = 1
+                    while (j <= i__3) {
+                        gl = 0.0
+                        i__2 = l
+                        k = 1
+                        while (k <= i__2) {
+                            gl += a[i__ + k * a_dim1] * a[k + j * a_dim1]
+                            ++k
+                        }
+                        i__2 = l
+                        k = 1
+                        while (k <= i__2) {
+                            a[k + j * a_dim1] -= gl * a[k + i__ * a_dim1]
+                            ++k
+                        }
+                        ++j
+                    }
+                }
+                work[i__] = a[i__ + i__ * a_dim1]
+                a[i__ + i__ * a_dim1] = 1.0
+                if (l != 0) {
+                    i__2 = l
+                    j = 1
+                    while (j <= i__2) {
+                        a[i__ + j * a_dim1] = 0.0
+                        a[j + i__ * a_dim1] = 0.0
+                        ++j
+                    }
+                }
+                ++i__
+            }
+            val n1: Int = n - 1
+            i__1 = n
+            i__ = 2
+            while (i__ <= i__1) {
+                i0 = n + i__ - 1
+                work[i0] = work[i0 + 1]
+                ++i__
+            }
+            work[n + n] = 0.0
+            b = 0.0
+            f = 0.0
+            i__1 = n
+            l = 1
+            while (l <= i__1) {
+                j = 0
+                h__ = precis * (abs(work[l]) + abs(work[n + l]))
+                if (b < h__) {
+                    b = h__
+                }
+                i__2 = n
+                m1 = l
+                while (m1 <= i__2) {
+                    m = m1
+                    if (abs(work[n + m]) <= b) {
+                        break
+                    }
+                    ++m1
+                }
+                if (m != l) {
+                    while (true) {
+                        if (j == mits) {
+                            return ifault
+                        }
+                        ++j
+                        pt = (work[l + 1] - work[l]) / (work[n + l] * 2.0)
+                        r__ = sqrt(pt * pt + 1.0)
+                        pr = pt + r__
+                        if (pt < 0.0) {
+                            pr = pt - r__
+                        }
+                        h__ = work[l] - work[n + l] / pr
+                        i__2 = n
+                        i__ = l
+                        while (i__ <= i__2) {
+                            work[i__] -= h__
+                            ++i__
+                        }
+                        f += h__
+                        pt = work[m]
+                        c__ = 1.0
+                        s = 0.0
+                        m1 = m - 1
+                        i__ = m
+                        i__2 = m1
+                        i1 = l
+                        while (i1 <= i__2) {
+                            j = i__
+                            --i__
+                            gl = c__ * work[n + i__]
+                            h__ = c__ * pt
+                            if (abs(pt) < abs(work[n + i__])) {
+                                c__ = pt / work[n + i__]
+                                r__ = sqrt(c__ * c__ + 1.0)
+                                work[n + j] = s * work[n + i__] * r__
+                                s = 1.0 / r__
+                                c__ /= r__
+                            } else {
+                                c__ = work[n + i__] / pt
+                                r__ = sqrt(c__ * c__ + 1.0)
+                                work[n + j] = s * pt * r__
+                                s = c__ / r__
+                                c__ = 1.0 / r__
+                            }
+                            pt = c__ * work[i__] - s * gl
+                            work[j] = h__ + s * (c__ * gl + s * work[i__])
+                            i__3 = n
+                            k = 1
+                            while (k <= i__3) {
+                                h__ = a[k + j * a_dim1]
+                                a[k + j * a_dim1] = s * a[k + i__ * a_dim1] + c__ * h__
+                                a[k + i__ * a_dim1] = c__ * a[k + i__ * a_dim1] - s * h__
+                                ++k
+                            }
+                            ++i1
+                        }
+                        work[n + l] = s * pt
+                        work[l] = c__ * pt
+                        if (abs(work[n + l]) <= b) {
+                            break
+                        }
+                    }
+                }
+                work[l] += f
+                ++l
+            }
+            i__1 = n1
+            i__ = 1
+            while (i__ <= i__1) {
+                k = i__
+                pt = work[i__]
+                i1 = i__ + 1
+                i__3 = n
+                j = i1
+                while (j <= i__3) {
+                    if (work[j] < pt) {
+                        k = j
+                        pt = work[j]
+                    }
+                    ++j
+                }
+                if (k != i__) {
+                    work[k] = work[i__]
+                    work[i__] = pt
+                    i__3 = n
+                    j = 1
+                    while (j <= i__3) {
+                        pt = a[j + i__ * a_dim1]
+                        a[j + i__ * a_dim1] = a[j + k * a_dim1]
+                        a[j + k * a_dim1] = pt
+                        ++j
+                    }
+                }
+                ++i__
+            }
+            ifault = 0
+            return ifault
+        } /* mneig_ */
+    }
+
+    init {
+        require(n >= 0) { "Invalid matrix size: $n" }
+        theSize = n * (n + 1) / 2
+        theNRow = n
+        theData = DoubleArray(theSize)
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnApplication.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnApplication.kt
new file mode 100644
index 000000000..025eea4ae
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnApplication.kt
@@ -0,0 +1,554 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+import ru.inr.mass.minuit.*
+
+/**
+ * Base class for minimizers.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+abstract class MnApplication {
+    /* package protected */
+    var checkAnalyticalDerivatives: Boolean
+
+    /* package protected */ /* package protected */
+    var theErrorDef = 1.0 /* package protected */
+    var theFCN: MultiFunction?
+
+    /* package protected */ /* package protected */
+    var theNumCall /* package protected */ = 0
+    var theState: MnUserParameterState
+
+    /* package protected */
+    var theStrategy: MnStrategy
+
+    /* package protected */
+    var useAnalyticalDerivatives: Boolean
+
+    /* package protected */
+    internal constructor(fcn: MultiFunction?, state: MnUserParameterState, stra: MnStrategy) {
+        theFCN = fcn
+        theState = state
+        theStrategy = stra
+        checkAnalyticalDerivatives = true
+        useAnalyticalDerivatives = true
+    }
+
+    internal constructor(fcn: MultiFunction?, state: MnUserParameterState, stra: MnStrategy, nfcn: Int) {
+        theFCN = fcn
+        theState = state
+        theStrategy = stra
+        theNumCall = nfcn
+        checkAnalyticalDerivatives = true
+        useAnalyticalDerivatives = true
+    }
+
+    /**
+     *
+     * MultiFunction.
+     *
+     * @return a [MultiFunction] object.
+     */
+    fun MultiFunction(): MultiFunction? {
+        return theFCN
+    }
+
+    /**
+     * add free parameter
+     *
+     * @param err a double.
+     * @param val a double.
+     * @param name a [String] object.
+     */
+    fun add(name: String, `val`: Double, err: Double) {
+        theState.add(name, `val`, err)
+    }
+
+    /**
+     * add limited parameter
+     *
+     * @param up a double.
+     * @param low a double.
+     * @param name a [String] object.
+     * @param val a double.
+     * @param err a double.
+     */
+    fun add(name: String, `val`: Double, err: Double, low: Double, up: Double) {
+        theState.add(name, `val`, err, low, up)
+    }
+
+    /**
+     * add const parameter
+     *
+     * @param name a [String] object.
+     * @param val a double.
+     */
+    fun add(name: String, `val`: Double) {
+        theState.add(name, `val`)
+    }
+
+    /**
+     *
+     * checkAnalyticalDerivatives.
+     *
+     * @return a boolean.
+     */
+    fun checkAnalyticalDerivatives(): Boolean {
+        return checkAnalyticalDerivatives
+    }
+
+    /**
+     *
+     * covariance.
+     *
+     * @return a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     */
+    fun covariance(): MnUserCovariance {
+        return theState.covariance()
+    }
+
+    /**
+     *
+     * error.
+     *
+     * @param index a int.
+     * @return a double.
+     */
+    fun error(index: Int): Double {
+        return theState.error(index)
+    }
+
+    /**
+     *
+     * error.
+     *
+     * @param name a [String] object.
+     * @return a double.
+     */
+    fun error(name: String?): Double {
+        return theState.error(name)
+    }
+
+    /**
+     *
+     * errorDef.
+     *
+     * @return a double.
+     */
+    fun errorDef(): Double {
+        return theErrorDef
+    }
+
+    /**
+     *
+     * errors.
+     *
+     * @return an array of double.
+     */
+    fun errors(): DoubleArray {
+        return theState.errors()
+    }
+
+    fun ext2int(i: Int, value: Double): Double {
+        return theState.ext2int(i, value)
+    }
+
+    fun extOfInt(i: Int): Int {
+        return theState.extOfInt(i)
+    }
+    //interaction via external number of parameter
+    /**
+     *
+     * fix.
+     *
+     * @param index a int.
+     */
+    fun fix(index: Int) {
+        theState.fix(index)
+    }
+    //interaction via name of parameter
+    /**
+     *
+     * fix.
+     *
+     * @param name a [String] object.
+     */
+    fun fix(name: String?) {
+        theState.fix(name)
+    }
+
+    /**
+     * convert name into external number of parameter
+     *
+     * @param name a [String] object.
+     * @return a int.
+     */
+    fun index(name: String?): Int {
+        return theState.index(name)
+    }
+
+    // transformation internal <-> external
+    fun int2ext(i: Int, value: Double): Double {
+        return theState.int2ext(i, value)
+    }
+
+    fun intOfExt(i: Int): Int {
+        return theState.intOfExt(i)
+    }
+
+    /**
+     *
+     * minimize.
+     *
+     * @return a [hep.dataforge.MINUIT.FunctionMinimum] object.
+     */
+    fun minimize(): FunctionMinimum {
+        return minimize(DEFAULT_MAXFCN)
+    }
+
+    /**
+     *
+     * minimize.
+     *
+     * @param maxfcn a int.
+     * @return a [hep.dataforge.MINUIT.FunctionMinimum] object.
+     */
+    fun minimize(maxfcn: Int): FunctionMinimum {
+        return minimize(maxfcn, DEFAULT_TOLER)
+    }
+
+    /**
+     * Causes minimization of the FCN and returns the result in form of a
+     * FunctionMinimum.
+     *
+     * @param maxfcn specifies the (approximate) maximum number of function
+     * calls after which the calculation will be stopped even if it has not yet
+     * converged.
+     * @param toler specifies the required tolerance on the function value at
+     * the minimum. The default tolerance value is 0.1, and the minimization
+     * will stop when the estimated vertical distance to the minimum (EDM) is
+     * less than 0:001*tolerance*errorDef
+     * @return a [hep.dataforge.MINUIT.FunctionMinimum] object.
+     */
+    fun minimize(maxfcn: Int, toler: Double): FunctionMinimum {
+        var maxfcn = maxfcn
+        check(theState.isValid()) { "Invalid state" }
+        val npar = variableParameters()
+        if (maxfcn == 0) {
+            maxfcn = 200 + 100 * npar + 5 * npar * npar
+        }
+        val min: FunctionMinimum = minimizer().minimize(theFCN,
+            theState,
+            theStrategy,
+            maxfcn,
+            toler,
+            theErrorDef,
+            useAnalyticalDerivatives,
+            checkAnalyticalDerivatives)
+        theNumCall += min.nfcn()
+        theState = min.userState()
+        return min
+    }
+
+    abstract fun minimizer(): ModularFunctionMinimizer
+
+    // facade: forward interface of MnUserParameters and MnUserTransformation
+    fun minuitParameters(): List<MinuitParameter> {
+        return theState.minuitParameters()
+    }
+
+    /**
+     * convert external number into name of parameter
+     *
+     * @param index a int.
+     * @return a [String] object.
+     */
+    fun name(index: Int): String {
+        return theState.name(index)
+    }
+
+    /**
+     *
+     * numOfCalls.
+     *
+     * @return a int.
+     */
+    fun numOfCalls(): Int {
+        return theNumCall
+    }
+
+    /**
+     * access to single parameter
+     * @param i
+     * @return
+     */
+    fun parameter(i: Int): MinuitParameter {
+        return theState.parameter(i)
+    }
+
+    /**
+     *
+     * parameters.
+     *
+     * @return a [hep.dataforge.MINUIT.MnUserParameters] object.
+     */
+    fun parameters(): MnUserParameters {
+        return theState.parameters()
+    }
+
+    /**
+     * access to parameters and errors in column-wise representation
+     *
+     * @return an array of double.
+     */
+    fun params(): DoubleArray {
+        return theState.params()
+    }
+
+    /**
+     *
+     * precision.
+     *
+     * @return a [hep.dataforge.MINUIT.MnMachinePrecision] object.
+     */
+    fun precision(): MnMachinePrecision {
+        return theState.precision()
+    }
+
+    /**
+     *
+     * release.
+     *
+     * @param index a int.
+     */
+    fun release(index: Int) {
+        theState.release(index)
+    }
+
+    /**
+     *
+     * release.
+     *
+     * @param name a [String] object.
+     */
+    fun release(name: String?) {
+        theState.release(name)
+    }
+
+    /**
+     *
+     * removeLimits.
+     *
+     * @param index a int.
+     */
+    fun removeLimits(index: Int) {
+        theState.removeLimits(index)
+    }
+
+    /**
+     *
+     * removeLimits.
+     *
+     * @param name a [String] object.
+     */
+    fun removeLimits(name: String?) {
+        theState.removeLimits(name)
+    }
+
+    /**
+     * Minuit does a check of the user gradient at the beginning, if this is not
+     * wanted the set this to "false".
+     *
+     * @param check a boolean.
+     */
+    fun setCheckAnalyticalDerivatives(check: Boolean) {
+        checkAnalyticalDerivatives = check
+    }
+
+    /**
+     *
+     * setError.
+     *
+     * @param index a int.
+     * @param err a double.
+     */
+    fun setError(index: Int, err: Double) {
+        theState.setError(index, err)
+    }
+
+    /**
+     *
+     * setError.
+     *
+     * @param name a [String] object.
+     * @param err a double.
+     */
+    fun setError(name: String?, err: Double) {
+        theState.setError(name, err)
+    }
+
+    /**
+     * errorDef() is the error definition of the function. E.g. is 1 if function
+     * is Chi2 and 0.5 if function is -logLikelihood. If the user wants instead
+     * the 2-sigma errors, errorDef() = 4, as Chi2(x+n*sigma) = Chi2(x) + n*n.
+     *
+     * @param errorDef a double.
+     */
+    fun setErrorDef(errorDef: Double) {
+        theErrorDef = errorDef
+    }
+
+    /**
+     *
+     * setLimits.
+     *
+     * @param index a int.
+     * @param low a double.
+     * @param up a double.
+     */
+    fun setLimits(index: Int, low: Double, up: Double) {
+        theState.setLimits(index, low, up)
+    }
+
+    /**
+     *
+     * setLimits.
+     *
+     * @param name a [String] object.
+     * @param low a double.
+     * @param up a double.
+     */
+    fun setLimits(name: String?, low: Double, up: Double) {
+        theState.setLimits(name, low, up)
+    }
+
+    /**
+     *
+     * setPrecision.
+     *
+     * @param prec a double.
+     */
+    fun setPrecision(prec: Double) {
+        theState.setPrecision(prec)
+    }
+
+    /**
+     * By default if the function to be minimized implements MultiFunction then
+     * the analytical gradient provided by the function will be used. Set this
+     * to
+     * <CODE>false</CODE> to disable this behaviour and force numerical
+     * calculation of the gradient.
+     *
+     * @param use a boolean.
+     */
+    fun setUseAnalyticalDerivatives(use: Boolean) {
+        useAnalyticalDerivatives = use
+    }
+
+    /**
+     *
+     * setValue.
+     *
+     * @param index a int.
+     * @param val a double.
+     */
+    fun setValue(index: Int, `val`: Double) {
+        theState.setValue(index, `val`)
+    }
+
+    /**
+     *
+     * setValue.
+     *
+     * @param name a [String] object.
+     * @param val a double.
+     */
+    fun setValue(name: String?, `val`: Double) {
+        theState.setValue(name, `val`)
+    }
+
+    /**
+     *
+     * state.
+     *
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun state(): MnUserParameterState {
+        return theState
+    }
+
+    /**
+     *
+     * strategy.
+     *
+     * @return a [hep.dataforge.MINUIT.MnStrategy] object.
+     */
+    fun strategy(): MnStrategy {
+        return theStrategy
+    }
+
+    /**
+     *
+     * useAnalyticalDerivaties.
+     *
+     * @return a boolean.
+     */
+    fun useAnalyticalDerivaties(): Boolean {
+        return useAnalyticalDerivatives
+    }
+
+    /**
+     *
+     * value.
+     *
+     * @param index a int.
+     * @return a double.
+     */
+    fun value(index: Int): Double {
+        return theState.value(index)
+    }
+
+    /**
+     *
+     * value.
+     *
+     * @param name a [String] object.
+     * @return a double.
+     */
+    fun value(name: String?): Double {
+        return theState.value(name)
+    }
+
+    /**
+     *
+     * variableParameters.
+     *
+     * @return a int.
+     */
+    fun variableParameters(): Int {
+        return theState.variableParameters()
+    }
+
+    companion object {
+        var DEFAULT_MAXFCN = 0
+        var DEFAULT_STRATEGY = 1
+        var DEFAULT_TOLER = 0.1
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnContours.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnContours.kt
new file mode 100644
index 000000000..1b700f4e2
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnContours.kt
@@ -0,0 +1,283 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+import ru.inr.mass.minuit.*
+
+/**
+ * API class for Contours error analysis (2-dim errors). Minimization has to be
+ * done before and minimum must be valid. Possibility to ask only for the points
+ * or the points and associated Minos errors.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnContours(fcn: MultiFunction?, min: FunctionMinimum?, stra: MnStrategy?) {
+    private var theFCN: MultiFunction? = null
+    private var theMinimum: FunctionMinimum? = null
+    private var theStrategy: MnStrategy? = null
+
+    /**
+     * construct from FCN + minimum
+     *
+     * @param fcn a [MultiFunction] object.
+     * @param min a [hep.dataforge.MINUIT.FunctionMinimum] object.
+     */
+    constructor(fcn: MultiFunction?, min: FunctionMinimum?) : this(fcn, min, MnApplication.DEFAULT_STRATEGY)
+
+    /**
+     * construct from FCN + minimum + strategy
+     *
+     * @param stra a int.
+     * @param min a [hep.dataforge.MINUIT.FunctionMinimum] object.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, min: FunctionMinimum?, stra: Int) : this(fcn, min, MnStrategy(stra))
+
+    /**
+     *
+     * contour.
+     *
+     * @param px a int.
+     * @param py a int.
+     * @return a [hep.dataforge.MINUIT.ContoursError] object.
+     */
+    fun contour(px: Int, py: Int): ContoursError {
+        return contour(px, py, 1.0)
+    }
+
+    /**
+     *
+     * contour.
+     *
+     * @param px a int.
+     * @param py a int.
+     * @param errDef a double.
+     * @return a [hep.dataforge.MINUIT.ContoursError] object.
+     */
+    fun contour(px: Int, py: Int, errDef: Double): ContoursError {
+        return contour(px, py, errDef, 20)
+    }
+
+    /**
+     * Causes a CONTOURS error analysis and returns the result in form of
+     * ContoursError. As a by-product ContoursError keeps the MinosError
+     * information of parameters parx and pary. The result ContoursError can be
+     * easily printed using MnPrint or toString().
+     *
+     * @param npoints a int.
+     * @param px a int.
+     * @param py a int.
+     * @param errDef a double.
+     * @return a [hep.dataforge.MINUIT.ContoursError] object.
+     */
+    fun contour(px: Int, py: Int, errDef: Double, npoints: Int): ContoursError {
+        var errDef = errDef
+        errDef *= theMinimum!!.errorDef()
+        assert(npoints > 3)
+        val maxcalls: Int = 100 * (npoints + 5) * (theMinimum!!.userState().variableParameters() + 1)
+        var nfcn = 0
+        val result: MutableList<Range> = java.util.ArrayList<Range>(npoints)
+        val states: List<MnUserParameterState> = java.util.ArrayList<MnUserParameterState>()
+        val toler = 0.05
+
+        //get first four points
+        val minos = MnMinos(theFCN, theMinimum, theStrategy)
+        val valx: Double = theMinimum!!.userState().value(px)
+        val valy: Double = theMinimum!!.userState().value(py)
+        val mex: MinosError = minos.minos(px, errDef)
+        nfcn += mex.nfcn()
+        if (!mex.isValid()) {
+            MINUITPlugin.logStatic("MnContours is unable to find first two points.")
+            return ContoursError(px, py, result, mex, mex, nfcn)
+        }
+        val ex: Range = mex.range()
+        val mey: MinosError = minos.minos(py, errDef)
+        nfcn += mey.nfcn()
+        if (!mey.isValid()) {
+            MINUITPlugin.logStatic("MnContours is unable to find second two points.")
+            return ContoursError(px, py, result, mex, mey, nfcn)
+        }
+        val ey: Range = mey.range()
+        val migrad = MnMigrad(theFCN,
+            theMinimum!!.userState().copy(),
+            MnStrategy(max(0, theStrategy!!.strategy() - 1)))
+        migrad.fix(px)
+        migrad.setValue(px, valx + ex.getSecond())
+        val exy_up: FunctionMinimum = migrad.minimize()
+        nfcn += exy_up.nfcn()
+        if (!exy_up.isValid()) {
+            MINUITPlugin.logStatic("MnContours is unable to find upper y value for x parameter $px.")
+            return ContoursError(px, py, result, mex, mey, nfcn)
+        }
+        migrad.setValue(px, valx + ex.getFirst())
+        val exy_lo: FunctionMinimum = migrad.minimize()
+        nfcn += exy_lo.nfcn()
+        if (!exy_lo.isValid()) {
+            MINUITPlugin.logStatic("MnContours is unable to find lower y value for x parameter $px.")
+            return ContoursError(px, py, result, mex, mey, nfcn)
+        }
+        val migrad1 = MnMigrad(theFCN,
+            theMinimum!!.userState().copy(),
+            MnStrategy(max(0, theStrategy!!.strategy() - 1)))
+        migrad1.fix(py)
+        migrad1.setValue(py, valy + ey.getSecond())
+        val eyx_up: FunctionMinimum = migrad1.minimize()
+        nfcn += eyx_up.nfcn()
+        if (!eyx_up.isValid()) {
+            MINUITPlugin.logStatic("MnContours is unable to find upper x value for y parameter $py.")
+            return ContoursError(px, py, result, mex, mey, nfcn)
+        }
+        migrad1.setValue(py, valy + ey.getFirst())
+        val eyx_lo: FunctionMinimum = migrad1.minimize()
+        nfcn += eyx_lo.nfcn()
+        if (!eyx_lo.isValid()) {
+            MINUITPlugin.logStatic("MnContours is unable to find lower x value for y parameter $py.")
+            return ContoursError(px, py, result, mex, mey, nfcn)
+        }
+        val scalx: Double = 1.0 / (ex.getSecond() - ex.getFirst())
+        val scaly: Double = 1.0 / (ey.getSecond() - ey.getFirst())
+        result.add(Range(valx + ex.getFirst(), exy_lo.userState().value(py)))
+        result.add(Range(eyx_lo.userState().value(px), valy + ey.getFirst()))
+        result.add(Range(valx + ex.getSecond(), exy_up.userState().value(py)))
+        result.add(Range(eyx_up.userState().value(px), valy + ey.getSecond()))
+        val upar: MnUserParameterState = theMinimum!!.userState().copy()
+        upar.fix(px)
+        upar.fix(py)
+        val par = intArrayOf(px, py)
+        val cross = MnFunctionCross(theFCN, upar, theMinimum!!.fval(), theStrategy, errDef)
+        for (i in 4 until npoints) {
+            var idist1: Range = result[result.size - 1]
+            var idist2: Range = result[0]
+            var pos2 = 0
+            val distx: Double = idist1.getFirst() - idist2.getFirst()
+            val disty: Double = idist1.getSecond() - idist2.getSecond()
+            var bigdis = scalx * scalx * distx * distx + scaly * scaly * disty * disty
+            for (j in 0 until result.size - 1) {
+                val ipair: Range = result[j]
+                val distx2: Double = ipair.getFirst() - result[j + 1].getFirst()
+                val disty2: Double = ipair.getSecond() - result[j + 1].getSecond()
+                val dist = scalx * scalx * distx2 * distx2 + scaly * scaly * disty2 * disty2
+                if (dist > bigdis) {
+                    bigdis = dist
+                    idist1 = ipair
+                    idist2 = result[j + 1]
+                    pos2 = j + 1
+                }
+            }
+            val a1 = 0.5
+            val a2 = 0.5
+            var sca = 1.0
+            while (true) {
+                if (nfcn > maxcalls) {
+                    MINUITPlugin.logStatic("MnContours: maximum number of function calls exhausted.")
+                    return ContoursError(px, py, result, mex, mey, nfcn)
+                }
+                val xmidcr: Double = a1 * idist1.getFirst() + a2 * idist2.getFirst()
+                val ymidcr: Double = a1 * idist1.getSecond() + a2 * idist2.getSecond()
+                val xdir: Double = idist2.getSecond() - idist1.getSecond()
+                val ydir: Double = idist1.getFirst() - idist2.getFirst()
+                val scalfac: Double =
+                    sca * max(abs(xdir * scalx), abs(ydir * scaly))
+                val xdircr = xdir / scalfac
+                val ydircr = ydir / scalfac
+                val pmid = doubleArrayOf(xmidcr, ymidcr)
+                val pdir = doubleArrayOf(xdircr, ydircr)
+                val opt: MnCross = cross.cross(par, pmid, pdir, toler, maxcalls)
+                nfcn += opt.nfcn()
+                if (opt.isValid()) {
+                    val aopt: Double = opt.value()
+                    if (pos2 == 0) {
+                        result.add(Range(xmidcr + aopt * xdircr, ymidcr + aopt * ydircr))
+                    } else {
+                        result.add(pos2, Range(xmidcr + aopt * xdircr, ymidcr + aopt * ydircr))
+                    }
+                    break
+                }
+                if (sca < 0.0) {
+                    MINUITPlugin.logStatic("MnContours is unable to find point " + (i + 1) + " on contour.")
+                    MINUITPlugin.logStatic("MnContours finds only $i points.")
+                    return ContoursError(px, py, result, mex, mey, nfcn)
+                }
+                sca = -1.0
+            }
+        }
+        return ContoursError(px, py, result, mex, mey, nfcn)
+    }
+
+    /**
+     *
+     * points.
+     *
+     * @param px a int.
+     * @param py a int.
+     * @return a [List] object.
+     */
+    fun points(px: Int, py: Int): List<Range> {
+        return points(px, py, 1.0)
+    }
+
+    /**
+     *
+     * points.
+     *
+     * @param px a int.
+     * @param py a int.
+     * @param errDef a double.
+     * @return a [List] object.
+     */
+    fun points(px: Int, py: Int, errDef: Double): List<Range> {
+        return points(px, py, errDef, 20)
+    }
+
+    /**
+     * Calculates one function contour of FCN with respect to parameters parx
+     * and pary. The return value is a list of (x,y) points. FCN minimized
+     * always with respect to all other n - 2 variable parameters (if any).
+     * MINUITPlugin will try to find n points on the contour (default 20). To
+     * calculate more than one contour, the user needs to set the error
+     * definition in its FCN to the appropriate value for the desired confidence
+     * level and call this method for each contour.
+     *
+     * @param npoints a int.
+     * @param px a int.
+     * @param py a int.
+     * @param errDef a double.
+     * @return a [List] object.
+     */
+    fun points(px: Int, py: Int, errDef: Double, npoints: Int): List<Range> {
+        val cont: ContoursError = contour(px, py, errDef, npoints)
+        return cont.points()
+    }
+
+    fun strategy(): MnStrategy? {
+        return theStrategy
+    }
+
+    /**
+     * construct from FCN + minimum + strategy
+     *
+     * @param stra a [hep.dataforge.MINUIT.MnStrategy] object.
+     * @param min a [hep.dataforge.MINUIT.FunctionMinimum] object.
+     * @param fcn a [MultiFunction] object.
+     */
+    init {
+        theFCN = fcn
+        theMinimum = min
+        theStrategy = stra
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnCovarianceSqueeze.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnCovarianceSqueeze.kt
new file mode 100644
index 000000000..7614a93b0
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnCovarianceSqueeze.kt
@@ -0,0 +1,113 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import space.kscience.kmath.optimization.minuit.MINUITPlugin
+
+/**
+ *
+ * @version $Id$
+ */
+internal object MnCovarianceSqueeze {
+    fun squeeze(cov: MnUserCovariance, n: Int): MnUserCovariance {
+        assert(cov.nrow() > 0)
+        assert(n < cov.nrow())
+        val hess = MnAlgebraicSymMatrix(cov.nrow())
+        for (i in 0 until cov.nrow()) {
+            for (j in i until cov.nrow()) {
+                hess[i, j] = cov[i, j]
+            }
+        }
+        try {
+            hess.invert()
+        } catch (x: SingularMatrixException) {
+            MINUITPlugin.logStatic("MnUserCovariance inversion failed; return diagonal matrix;")
+            val result = MnUserCovariance(cov.nrow() - 1)
+            var i = 0
+            var j = 0
+            while (i < cov.nrow()) {
+                if (i == n) {
+                    i++
+                    continue
+                }
+                result[j, j] = cov[i, i]
+                j++
+                i++
+            }
+            return result
+        }
+        val squeezed: MnAlgebraicSymMatrix = squeeze(hess, n)
+        try {
+            squeezed.invert()
+        } catch (x: SingularMatrixException) {
+            MINUITPlugin.logStatic("MnUserCovariance back-inversion failed; return diagonal matrix;")
+            val result = MnUserCovariance(squeezed.nrow())
+            var i = 0
+            while (i < squeezed.nrow()) {
+                result[i, i] = 1.0 / squeezed[i, i]
+                i++
+            }
+            return result
+        }
+        return MnUserCovariance(squeezed.data(), squeezed.nrow())
+    }
+
+    fun squeeze(err: MinimumError, n: Int): MinimumError {
+        val hess: MnAlgebraicSymMatrix = err.hessian()
+        val squeezed: MnAlgebraicSymMatrix = squeeze(hess, n)
+        try {
+            squeezed.invert()
+        } catch (x: SingularMatrixException) {
+            MINUITPlugin.logStatic("MnCovarianceSqueeze: MinimumError inversion fails; return diagonal matrix.")
+            val tmp = MnAlgebraicSymMatrix(squeezed.nrow())
+            var i = 0
+            while (i < squeezed.nrow()) {
+                tmp[i, i] = 1.0 / squeezed[i, i]
+                i++
+            }
+            return MinimumError(tmp, MnInvertFailed())
+        }
+        return MinimumError(squeezed, err.dcovar())
+    }
+
+    fun squeeze(hess: MnAlgebraicSymMatrix, n: Int): MnAlgebraicSymMatrix {
+        assert(hess.nrow() > 0)
+        assert(n < hess.nrow())
+        val hs = MnAlgebraicSymMatrix(hess.nrow() - 1)
+        var i = 0
+        var j = 0
+        while (i < hess.nrow()) {
+            if (i == n) {
+                i++
+                continue
+            }
+            var k = i
+            var l = j
+            while (k < hess.nrow()) {
+                if (k == n) {
+                    k++
+                    continue
+                }
+                hs[j, l] = hess[i, k]
+                l++
+                k++
+            }
+            j++
+            i++
+        }
+        return hs
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnCross.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnCross.kt
new file mode 100644
index 000000000..f1487b106
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnCross.kt
@@ -0,0 +1,99 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * MnCross class.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnCross {
+    private var theLimset = false
+    private var theMaxFcn = false
+    private var theNFcn = 0
+    private var theNewMin = false
+    private var theState: MnUserParameterState
+    private var theValid = false
+    private var theValue = 0.0
+
+    internal constructor() {
+        theState = MnUserParameterState()
+    }
+
+    internal constructor(nfcn: Int) {
+        theState = MnUserParameterState()
+        theNFcn = nfcn
+    }
+
+    internal constructor(value: Double, state: MnUserParameterState, nfcn: Int) {
+        theValue = value
+        theState = state
+        theNFcn = nfcn
+        theValid = true
+    }
+
+    internal constructor(state: MnUserParameterState, nfcn: Int, x: CrossParLimit?) {
+        theState = state
+        theNFcn = nfcn
+        theLimset = true
+    }
+
+    internal constructor(state: MnUserParameterState, nfcn: Int, x: CrossFcnLimit?) {
+        theState = state
+        theNFcn = nfcn
+        theMaxFcn = true
+    }
+
+    internal constructor(state: MnUserParameterState, nfcn: Int, x: CrossNewMin?) {
+        theState = state
+        theNFcn = nfcn
+        theNewMin = true
+    }
+
+    fun atLimit(): Boolean {
+        return theLimset
+    }
+
+    fun atMaxFcn(): Boolean {
+        return theMaxFcn
+    }
+
+    fun isValid(): Boolean {
+        return theValid
+    }
+
+    fun newMinimum(): Boolean {
+        return theNewMin
+    }
+
+    fun nfcn(): Int {
+        return theNFcn
+    }
+
+    fun state(): MnUserParameterState {
+        return theState
+    }
+
+    fun value(): Double {
+        return theValue
+    }
+
+    internal class CrossFcnLimit
+    internal class CrossNewMin
+    internal class CrossParLimit
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnEigen.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnEigen.kt
new file mode 100644
index 000000000..d7aade0c9
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnEigen.kt
@@ -0,0 +1,50 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.RealVector
+
+/**
+ * Calculates and the eigenvalues of the user covariance matrix
+ * MnUserCovariance.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+object MnEigen {
+    /* Calculate eigenvalues of the covariance matrix.
+     * Will perform the calculation of the eigenvalues of the covariance matrix
+     * and return the result in the form of a double array.
+     * The eigenvalues are ordered from the smallest to the largest eigenvalue.
+     */
+    /**
+     *
+     * eigenvalues.
+     *
+     * @param covar a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @return an array of double.
+     */
+    fun eigenvalues(covar: MnUserCovariance): DoubleArray {
+        val cov = MnAlgebraicSymMatrix(covar.nrow())
+        for (i in 0 until covar.nrow()) {
+            for (j in i until covar.nrow()) {
+                cov[i, j] = covar[i, j]
+            }
+        }
+        val eigen: RealVector = cov.eigenvalues()
+        return eigen.toArray()
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnFcn.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnFcn.kt
new file mode 100644
index 000000000..b11f71035
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnFcn.kt
@@ -0,0 +1,50 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+
+/**
+ * Функция, которая помнит количество вызовов себя и ErrorDef
+ * @version $Id$
+ */
+class MnFcn(fcn: MultiFunction?, errorDef: Double) {
+    private val theErrorDef: Double
+    private val theFCN: MultiFunction?
+    protected var theNumCall: Int
+    fun errorDef(): Double {
+        return theErrorDef
+    }
+
+    fun fcn(): MultiFunction? {
+        return theFCN
+    }
+
+    fun numOfCalls(): Int {
+        return theNumCall
+    }
+
+    fun value(v: RealVector): Double {
+        theNumCall++
+        return theFCN.value(v.toArray())
+    }
+
+    init {
+        theFCN = fcn
+        theNumCall = 0
+        theErrorDef = errorDef
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnFunctionCross.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnFunctionCross.kt
new file mode 100644
index 000000000..a05590e53
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnFunctionCross.kt
@@ -0,0 +1,369 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+import ru.inr.mass.minuit.*
+import kotlin.math.*
+
+/**
+ *
+ * @version $Id$
+ */
+internal class MnFunctionCross(
+    fcn: MultiFunction?,
+    state: MnUserParameterState,
+    fval: Double,
+    stra: MnStrategy?,
+    errorDef: Double
+) {
+    private val theErrorDef: Double
+    private val theFCN: MultiFunction?
+    private val theFval: Double
+    private val theState: MnUserParameterState
+    private val theStrategy: MnStrategy?
+    fun cross(par: IntArray, pmid: DoubleArray, pdir: DoubleArray, tlr: Double, maxcalls: Int): MnCross {
+        val npar = par.size
+        var nfcn = 0
+        val prec: MnMachinePrecision = theState.precision()
+        val tlf = tlr * theErrorDef
+        var tla = tlr
+        val maxitr = 15
+        var ipt = 0
+        val aminsv = theFval
+        val aim = aminsv + theErrorDef
+        var aopt = 0.0
+        var limset = false
+        val alsb = DoubleArray(3)
+        val flsb = DoubleArray(3)
+        val up = theErrorDef
+        var aulim = 100.0
+        for (i in par.indices) {
+            val kex = par[i]
+            if (theState.parameter(kex).hasLimits()) {
+                val zmid = pmid[i]
+                val zdir = pdir[i]
+                if (abs(zdir) < theState.precision().eps()) {
+                    continue
+                }
+                if (zdir > 0.0 && theState.parameter(kex).hasUpperLimit()) {
+                    val zlim: Double = theState.parameter(kex).upperLimit()
+                    aulim = min(aulim, (zlim - zmid) / zdir)
+                } else if (zdir < 0.0 && theState.parameter(kex).hasLowerLimit()) {
+                    val zlim: Double = theState.parameter(kex).lowerLimit()
+                    aulim = min(aulim, (zlim - zmid) / zdir)
+                }
+            }
+        }
+        if (aulim < aopt + tla) {
+            limset = true
+        }
+        val migrad = MnMigrad(theFCN, theState, MnStrategy(max(0, theStrategy!!.strategy() - 1)))
+        for (i in 0 until npar) {
+            migrad.setValue(par[i], pmid[i])
+        }
+        val min0: FunctionMinimum = migrad.minimize(maxcalls, tlr)
+        nfcn += min0.nfcn()
+        if (min0.hasReachedCallLimit()) {
+            return MnCross(min0.userState(), nfcn, MnCross.CrossFcnLimit())
+        }
+        if (!min0.isValid()) {
+            return MnCross(nfcn)
+        }
+        if (limset && min0.fval() < aim) {
+            return MnCross(min0.userState(), nfcn, MnCross.CrossParLimit())
+        }
+        ipt++
+        alsb[0] = 0.0
+        flsb[0] = min0.fval()
+        flsb[0] = max(flsb[0], aminsv + 0.1 * up)
+        aopt = sqrt(up / (flsb[0] - aminsv)) - 1.0
+        if (abs(flsb[0] - aim) < tlf) {
+            return MnCross(aopt, min0.userState(), nfcn)
+        }
+        if (aopt > 1.0) {
+            aopt = 1.0
+        }
+        if (aopt < -0.5) {
+            aopt = -0.5
+        }
+        limset = false
+        if (aopt > aulim) {
+            aopt = aulim
+            limset = true
+        }
+        for (i in 0 until npar) {
+            migrad.setValue(par[i], pmid[i] + aopt * pdir[i])
+        }
+        var min1: FunctionMinimum = migrad.minimize(maxcalls, tlr)
+        nfcn += min1.nfcn()
+        if (min1.hasReachedCallLimit()) {
+            return MnCross(min1.userState(), nfcn, MnCross.CrossFcnLimit())
+        }
+        if (!min1.isValid()) {
+            return MnCross(nfcn)
+        }
+        if (limset && min1.fval() < aim) {
+            return MnCross(min1.userState(), nfcn, MnCross.CrossParLimit())
+        }
+        ipt++
+        alsb[1] = aopt
+        flsb[1] = min1.fval()
+        var dfda = (flsb[1] - flsb[0]) / (alsb[1] - alsb[0])
+        var ecarmn = 0.0
+        var ecarmx = 0.0
+        var ibest = 0
+        var iworst = 0
+        var noless = 0
+        var min2: FunctionMinimum? = null
+        L300@ while (true) {
+            if (dfda < 0.0) {
+                val maxlk = maxitr - ipt
+                for (it in 0 until maxlk) {
+                    alsb[0] = alsb[1]
+                    flsb[0] = flsb[1]
+                    aopt = alsb[0] + 0.2 * it
+                    limset = false
+                    if (aopt > aulim) {
+                        aopt = aulim
+                        limset = true
+                    }
+                    for (i in 0 until npar) {
+                        migrad.setValue(par[i], pmid[i] + aopt * pdir[i])
+                    }
+                    min1 = migrad.minimize(maxcalls, tlr)
+                    nfcn += min1.nfcn()
+                    if (min1.hasReachedCallLimit()) {
+                        return MnCross(min1.userState(), nfcn, MnCross.CrossFcnLimit())
+                    }
+                    if (!min1.isValid()) {
+                        return MnCross(nfcn)
+                    }
+                    if (limset && min1.fval() < aim) {
+                        return MnCross(min1.userState(), nfcn, MnCross.CrossParLimit())
+                    }
+                    ipt++
+                    alsb[1] = aopt
+                    flsb[1] = min1.fval()
+                    dfda = (flsb[1] - flsb[0]) / (alsb[1] - alsb[0])
+                    if (dfda > 0.0) {
+                        break
+                    }
+                }
+                if (ipt > maxitr) {
+                    return MnCross(nfcn)
+                }
+            }
+            L460@ while (true) {
+                aopt = alsb[1] + (aim - flsb[1]) / dfda
+                val fdist: Double =
+                    min(abs(aim - flsb[0]), abs(aim - flsb[1]))
+                val adist: Double =
+                    min(abs(aopt - alsb[0]), abs(aopt - alsb[1]))
+                tla = tlr
+                if (abs(aopt) > 1.0) {
+                    tla = tlr * abs(aopt)
+                }
+                if (adist < tla && fdist < tlf) {
+                    return MnCross(aopt, min1.userState(), nfcn)
+                }
+                if (ipt > maxitr) {
+                    return MnCross(nfcn)
+                }
+                val bmin: Double = min(alsb[0], alsb[1]) - 1.0
+                if (aopt < bmin) {
+                    aopt = bmin
+                }
+                val bmax: Double = max(alsb[0], alsb[1]) + 1.0
+                if (aopt > bmax) {
+                    aopt = bmax
+                }
+                limset = false
+                if (aopt > aulim) {
+                    aopt = aulim
+                    limset = true
+                }
+                for (i in 0 until npar) {
+                    migrad.setValue(par[i], pmid[i] + aopt * pdir[i])
+                }
+                min2 = migrad.minimize(maxcalls, tlr)
+                nfcn += min2.nfcn()
+                if (min2.hasReachedCallLimit()) {
+                    return MnCross(min2.userState(), nfcn, CrossFcnLimit())
+                }
+                if (!min2.isValid()) {
+                    return MnCross(nfcn)
+                }
+                if (limset && min2.fval() < aim) {
+                    return MnCross(min2.userState(), nfcn, MnCross.CrossParLimit())
+                }
+                ipt++
+                alsb[2] = aopt
+                flsb[2] = min2.fval()
+                ecarmn = abs(flsb[2] - aim)
+                ecarmx = 0.0
+                ibest = 2
+                iworst = 0
+                noless = 0
+                for (i in 0..2) {
+                    val ecart: Double = abs(flsb[i] - aim)
+                    if (ecart > ecarmx) {
+                        ecarmx = ecart
+                        iworst = i
+                    }
+                    if (ecart < ecarmn) {
+                        ecarmn = ecart
+                        ibest = i
+                    }
+                    if (flsb[i] < aim) {
+                        noless++
+                    }
+                }
+                if (noless == 1 || noless == 2) {
+                    break@L300
+                }
+                if (noless == 0 && ibest != 2) {
+                    return MnCross(nfcn)
+                }
+                if (noless == 3 && ibest != 2) {
+                    alsb[1] = alsb[2]
+                    flsb[1] = flsb[2]
+                    continue@L300
+                }
+                flsb[iworst] = flsb[2]
+                alsb[iworst] = alsb[2]
+                dfda = (flsb[1] - flsb[0]) / (alsb[1] - alsb[0])
+            }
+        }
+        do {
+            val parbol: MnParabola = MnParabolaFactory.create(MnParabolaPoint(alsb[0], flsb[0]),
+                MnParabolaPoint(alsb[1], flsb[1]),
+                MnParabolaPoint(
+                    alsb[2], flsb[2]))
+            val coeff1: Double = parbol.c()
+            val coeff2: Double = parbol.b()
+            val coeff3: Double = parbol.a()
+            val determ = coeff2 * coeff2 - 4.0 * coeff3 * (coeff1 - aim)
+            if (determ < prec.eps()) {
+                return MnCross(nfcn)
+            }
+            val rt: Double = sqrt(determ)
+            val x1 = (-coeff2 + rt) / (2.0 * coeff3)
+            val x2 = (-coeff2 - rt) / (2.0 * coeff3)
+            val s1 = coeff2 + 2.0 * x1 * coeff3
+            val s2 = coeff2 + 2.0 * x2 * coeff3
+            if (s1 * s2 > 0.0) {
+                MINUITPlugin.logStatic("MnFunctionCross problem 1")
+            }
+            aopt = x1
+            var slope = s1
+            if (s2 > 0.0) {
+                aopt = x2
+                slope = s2
+            }
+            tla = tlr
+            if (abs(aopt) > 1.0) {
+                tla = tlr * abs(aopt)
+            }
+            if (abs(aopt - alsb[ibest]) < tla && abs(flsb[ibest] - aim) < tlf) {
+                return MnCross(aopt, min2!!.userState(), nfcn)
+            }
+            var ileft = 3
+            var iright = 3
+            var iout = 3
+            ibest = 0
+            ecarmx = 0.0
+            ecarmn = abs(aim - flsb[0])
+            for (i in 0..2) {
+                val ecart: Double = abs(flsb[i] - aim)
+                if (ecart < ecarmn) {
+                    ecarmn = ecart
+                    ibest = i
+                }
+                if (ecart > ecarmx) {
+                    ecarmx = ecart
+                }
+                if (flsb[i] > aim) {
+                    if (iright == 3) {
+                        iright = i
+                    } else if (flsb[i] > flsb[iright]) {
+                        iout = i
+                    } else {
+                        iout = iright
+                        iright = i
+                    }
+                } else if (ileft == 3) {
+                    ileft = i
+                } else if (flsb[i] < flsb[ileft]) {
+                    iout = i
+                } else {
+                    iout = ileft
+                    ileft = i
+                }
+            }
+            if (ecarmx > 10.0 * abs(flsb[iout] - aim)) {
+                aopt = 0.5 * (aopt + 0.5 * (alsb[iright] + alsb[ileft]))
+            }
+            var smalla = 0.1 * tla
+            if (slope * smalla > tlf) {
+                smalla = tlf / slope
+            }
+            val aleft = alsb[ileft] + smalla
+            val aright = alsb[iright] - smalla
+            if (aopt < aleft) {
+                aopt = aleft
+            }
+            if (aopt > aright) {
+                aopt = aright
+            }
+            if (aleft > aright) {
+                aopt = 0.5 * (aleft + aright)
+            }
+            limset = false
+            if (aopt > aulim) {
+                aopt = aulim
+                limset = true
+            }
+            for (i in 0 until npar) {
+                migrad.setValue(par[i], pmid[i] + aopt * pdir[i])
+            }
+            min2 = migrad.minimize(maxcalls, tlr)
+            nfcn += min2.nfcn()
+            if (min2.hasReachedCallLimit()) {
+                return MnCross(min2.userState(), nfcn, CrossFcnLimit())
+            }
+            if (!min2.isValid()) {
+                return MnCross(nfcn)
+            }
+            if (limset && min2.fval() < aim) {
+                return MnCross(min2.userState(), nfcn, CrossParLimit())
+            }
+            ipt++
+            alsb[iout] = aopt
+            flsb[iout] = min2.fval()
+            ibest = iout
+        } while (ipt < maxitr)
+        return MnCross(nfcn)
+    }
+
+    init {
+        theFCN = fcn
+        theState = state
+        theFval = fval
+        theStrategy = stra
+        theErrorDef = errorDef
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnGlobalCorrelationCoeff.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnGlobalCorrelationCoeff.kt
new file mode 100644
index 000000000..939dd7fa0
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnGlobalCorrelationCoeff.kt
@@ -0,0 +1,79 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.SingularMatrixException
+
+/**
+ *
+ * MnGlobalCorrelationCoeff class.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnGlobalCorrelationCoeff {
+    private var theGlobalCC: DoubleArray
+    private var theValid = false
+
+    internal constructor() {
+        theGlobalCC = DoubleArray(0)
+    }
+
+    internal constructor(cov: MnAlgebraicSymMatrix) {
+        try {
+            val inv: MnAlgebraicSymMatrix = cov.copy()
+            inv.invert()
+            theGlobalCC = DoubleArray(cov.nrow())
+            for (i in 0 until cov.nrow()) {
+                val denom: Double = inv[i, i] * cov[i, i]
+                if (denom < 1.0 && denom > 0.0) {
+                    theGlobalCC[i] = 0
+                } else {
+                    theGlobalCC[i] = sqrt(1.0 - 1.0 / denom)
+                }
+            }
+            theValid = true
+        } catch (x: SingularMatrixException) {
+            theValid = false
+            theGlobalCC = DoubleArray(0)
+        }
+    }
+
+    /**
+     *
+     * globalCC.
+     *
+     * @return an array of double.
+     */
+    fun globalCC(): DoubleArray {
+        return theGlobalCC
+    }
+
+    /**
+     *
+     * isValid.
+     *
+     * @return a boolean.
+     */
+    fun isValid(): Boolean {
+        return theValid
+    }
+
+    /** {@inheritDoc}  */
+    override fun toString(): String {
+        return MnPrint.toString(this)
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnHesse.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnHesse.kt
new file mode 100644
index 000000000..3bb6c4551
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnHesse.kt
@@ -0,0 +1,371 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+import ru.inr.mass.minuit.*
+
+/**
+ * With MnHesse the user can instructs MINUITPlugin to calculate, by finite
+ * differences, the Hessian or error matrix. That is, it calculates the full
+ * matrix of second derivatives of the function with respect to the currently
+ * variable parameters, and inverts it.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnHesse {
+    private var theStrategy: MnStrategy
+
+    /**
+     * default constructor with default strategy
+     */
+    constructor() {
+        theStrategy = MnStrategy(1)
+    }
+
+    /**
+     * constructor with user-defined strategy level
+     *
+     * @param stra a int.
+     */
+    constructor(stra: Int) {
+        theStrategy = MnStrategy(stra)
+    }
+
+    /**
+     * conctructor with specific strategy
+     *
+     * @param stra a [hep.dataforge.MINUIT.MnStrategy] object.
+     */
+    constructor(stra: MnStrategy) {
+        theStrategy = stra
+    }
+    ///
+    /// low-level API
+    ///
+    /**
+     *
+     * calculate.
+     *
+     * @param fcn a [MultiFunction] object.
+     * @param par an array of double.
+     * @param err an array of double.
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun calculate(fcn: MultiFunction?, par: DoubleArray, err: DoubleArray): MnUserParameterState {
+        return calculate(fcn, par, err, 0)
+    }
+
+    /**
+     * FCN + parameters + errors
+     *
+     * @param maxcalls a int.
+     * @param fcn a [MultiFunction] object.
+     * @param par an array of double.
+     * @param err an array of double.
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun calculate(fcn: MultiFunction?, par: DoubleArray, err: DoubleArray, maxcalls: Int): MnUserParameterState {
+        return calculate(fcn, MnUserParameterState(par, err), maxcalls)
+    }
+
+    /**
+     *
+     * calculate.
+     *
+     * @param fcn a [MultiFunction] object.
+     * @param par an array of double.
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun calculate(fcn: MultiFunction?, par: DoubleArray, cov: MnUserCovariance): MnUserParameterState {
+        return calculate(fcn, par, cov, 0)
+    }
+
+    /**
+     * FCN + parameters + MnUserCovariance
+     *
+     * @param maxcalls a int.
+     * @param fcn a [MultiFunction] object.
+     * @param par an array of double.
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun calculate(fcn: MultiFunction?, par: DoubleArray, cov: MnUserCovariance, maxcalls: Int): MnUserParameterState {
+        return calculate(fcn, MnUserParameterState(par, cov), maxcalls)
+    }
+    ///
+    /// high-level API
+    ///
+    /**
+     *
+     * calculate.
+     *
+     * @param fcn a [MultiFunction] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun calculate(fcn: MultiFunction?, par: MnUserParameters): MnUserParameterState {
+        return calculate(fcn, par, 0)
+    }
+
+    /**
+     * FCN + MnUserParameters
+     *
+     * @param maxcalls a int.
+     * @param fcn a [MultiFunction] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun calculate(fcn: MultiFunction?, par: MnUserParameters, maxcalls: Int): MnUserParameterState {
+        return calculate(fcn, MnUserParameterState(par), maxcalls)
+    }
+
+    /**
+     *
+     * calculate.
+     *
+     * @param fcn a [MultiFunction] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun calculate(fcn: MultiFunction?, par: MnUserParameters, cov: MnUserCovariance?): MnUserParameterState {
+        return calculate(fcn, par, 0)
+    }
+
+    /**
+     * FCN + MnUserParameters + MnUserCovariance
+     *
+     * @param maxcalls a int.
+     * @param fcn a [MultiFunction] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun calculate(
+        fcn: MultiFunction?,
+        par: MnUserParameters,
+        cov: MnUserCovariance,
+        maxcalls: Int
+    ): MnUserParameterState {
+        return calculate(fcn, MnUserParameterState(par, cov), maxcalls)
+    }
+
+    /**
+     * FCN + MnUserParameterState
+     *
+     * @param maxcalls a int.
+     * @param fcn a [MultiFunction] object.
+     * @param state a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun calculate(fcn: MultiFunction?, state: MnUserParameterState, maxcalls: Int): MnUserParameterState {
+        val errDef = 1.0 // FixMe!
+        val n: Int = state.variableParameters()
+        val mfcn = MnUserFcn(fcn, errDef, state.getTransformation())
+        val x: RealVector = ArrayRealVector(n)
+        for (i in 0 until n) {
+            x.setEntry(i, state.intParameters()[i])
+        }
+        val amin: Double = mfcn.value(x)
+        val gc = Numerical2PGradientCalculator(mfcn, state.getTransformation(), theStrategy)
+        val par = MinimumParameters(x, amin)
+        val gra: FunctionGradient = gc.gradient(par)
+        val tmp: MinimumState = calculate(mfcn,
+            MinimumState(par, MinimumError(MnAlgebraicSymMatrix(n), 1.0), gra, state.edm(), state.nfcn()),
+            state.getTransformation(),
+            maxcalls)
+        return MnUserParameterState(tmp, errDef, state.getTransformation())
+    }
+
+    ///
+    /// internal interface
+    ///
+    fun calculate(mfcn: MnFcn, st: MinimumState, trafo: MnUserTransformation, maxcalls: Int): MinimumState {
+        var maxcalls = maxcalls
+        val prec: MnMachinePrecision = trafo.precision()
+        // make sure starting at the right place
+        val amin: Double = mfcn.value(st.vec())
+        val aimsag: Double = sqrt(prec.eps2()) * (abs(amin) + mfcn.errorDef())
+
+        // diagonal elements first
+        val n: Int = st.parameters().vec().getDimension()
+        if (maxcalls == 0) {
+            maxcalls = 200 + 100 * n + 5 * n * n
+        }
+        var vhmat = MnAlgebraicSymMatrix(n)
+        var g2: RealVector = st.gradient().getGradientDerivative().copy()
+        var gst: RealVector = st.gradient().getStep().copy()
+        var grd: RealVector = st.gradient().getGradient().copy()
+        var dirin: RealVector = st.gradient().getStep().copy()
+        val yy: RealVector = ArrayRealVector(n)
+        if (st.gradient().isAnalytical()) {
+            val igc = InitialGradientCalculator(mfcn, trafo, theStrategy)
+            val tmp: FunctionGradient = igc.gradient(st.parameters())
+            gst = tmp.getStep().copy()
+            dirin = tmp.getStep().copy()
+            g2 = tmp.getGradientDerivative().copy()
+        }
+        return try {
+            val x: RealVector = st.parameters().vec().copy()
+            for (i in 0 until n) {
+                val xtf: Double = x.getEntry(i)
+                val dmin: Double = 8.0 * prec.eps2() * (abs(xtf) + prec.eps2())
+                var d: Double = abs(gst.getEntry(i))
+                if (d < dmin) {
+                    d = dmin
+                }
+                for (icyc in 0 until ncycles()) {
+                    var sag = 0.0
+                    var fs1 = 0.0
+                    var fs2 = 0.0
+                    var multpy = 0
+                    while (multpy < 5) {
+                        x.setEntry(i, xtf + d)
+                        fs1 = mfcn.value(x)
+                        x.setEntry(i, xtf - d)
+                        fs2 = mfcn.value(x)
+                        x.setEntry(i, xtf)
+                        sag = 0.5 * (fs1 + fs2 - 2.0 * amin)
+                        if (sag > prec.eps2()) {
+                            break
+                        }
+                        if (trafo.parameter(i).hasLimits()) {
+                            if (d > 0.5) {
+                                throw MnHesseFailedException("MnHesse: 2nd derivative zero for parameter")
+                            }
+                            d *= 10.0
+                            if (d > 0.5) {
+                                d = 0.51
+                            }
+                            multpy++
+                            continue
+                        }
+                        d *= 10.0
+                        multpy++
+                    }
+                    if (multpy >= 5) {
+                        throw MnHesseFailedException("MnHesse: 2nd derivative zero for parameter")
+                    }
+                    val g2bfor: Double = g2.getEntry(i)
+                    g2.setEntry(i, 2.0 * sag / (d * d))
+                    grd.setEntry(i, (fs1 - fs2) / (2.0 * d))
+                    gst.setEntry(i, d)
+                    dirin.setEntry(i, d)
+                    yy.setEntry(i, fs1)
+                    val dlast = d
+                    d = sqrt(2.0 * aimsag / abs(g2.getEntry(i)))
+                    if (trafo.parameter(i).hasLimits()) {
+                        d = min(0.5, d)
+                    }
+                    if (d < dmin) {
+                        d = dmin
+                    }
+
+                    // see if converged
+                    if (abs((d - dlast) / d) < tolerstp()) {
+                        break
+                    }
+                    if (abs((g2.getEntry(i) - g2bfor) / g2.getEntry(i)) < tolerg2()) {
+                        break
+                    }
+                    d = min(d, 10.0 * dlast)
+                    d = max(d, 0.1 * dlast)
+                }
+                vhmat[i, i] = g2.getEntry(i)
+                if (mfcn.numOfCalls() - st.nfcn() > maxcalls) {
+                    throw MnHesseFailedException("MnHesse: maximum number of allowed function calls exhausted.")
+                }
+            }
+            if (theStrategy.strategy() > 0) {
+                // refine first derivative
+                val hgc = HessianGradientCalculator(mfcn, trafo, theStrategy)
+                val gr: FunctionGradient = hgc.gradient(st.parameters(), FunctionGradient(grd, g2, gst))
+                grd = gr.getGradient()
+            }
+
+            //off-diagonal elements
+            for (i in 0 until n) {
+                x.setEntry(i, x.getEntry(i) + dirin.getEntry(i))
+                for (j in i + 1 until n) {
+                    x.setEntry(j, x.getEntry(j) + dirin.getEntry(j))
+                    val fs1: Double = mfcn.value(x)
+                    val elem: Double =
+                        (fs1 + amin - yy.getEntry(i) - yy.getEntry(j)) / (dirin.getEntry(i) * dirin.getEntry(j))
+                    vhmat[i, j] = elem
+                    x.setEntry(j, x.getEntry(j) - dirin.getEntry(j))
+                }
+                x.setEntry(i, x.getEntry(i) - dirin.getEntry(i))
+            }
+
+            //verify if matrix pos-def (still 2nd derivative)
+            val tmp: MinimumError = MnPosDef.test(MinimumError(vhmat, 1.0), prec)
+            vhmat = tmp.invHessian()
+            try {
+                vhmat.invert()
+            } catch (xx: SingularMatrixException) {
+                throw MnHesseFailedException("MnHesse: matrix inversion fails!")
+            }
+            val gr = FunctionGradient(grd, g2, gst)
+            if (tmp.isMadePosDef()) {
+                MINUITPlugin.logStatic("MnHesse: matrix is invalid!")
+                MINUITPlugin.logStatic("MnHesse: matrix is not pos. def.!")
+                MINUITPlugin.logStatic("MnHesse: matrix was forced pos. def.")
+                return MinimumState(st.parameters(),
+                    MinimumError(vhmat, MnMadePosDef()),
+                    gr,
+                    st.edm(),
+                    mfcn.numOfCalls())
+            }
+
+            //calculate edm
+            val err = MinimumError(vhmat, 0.0)
+            val edm: Double = VariableMetricEDMEstimator().estimate(gr, err)
+            MinimumState(st.parameters(), err, gr, edm, mfcn.numOfCalls())
+        } catch (x: MnHesseFailedException) {
+            MINUITPlugin.logStatic(x.message)
+            MINUITPlugin.logStatic("MnHesse fails and will return diagonal matrix ")
+            var j = 0
+            while (j < n) {
+                val tmp = if (g2.getEntry(j) < prec.eps2()) 1.0 else 1.0 / g2.getEntry(j)
+                vhmat[j, j] = if (tmp < prec.eps2()) 1.0 else tmp
+                j++
+            }
+            MinimumState(st.parameters(),
+                MinimumError(vhmat, MnHesseFailed()),
+                st.gradient(),
+                st.edm(),
+                st.nfcn() + mfcn.numOfCalls())
+        }
+    }
+
+    /// forward interface of MnStrategy
+    fun ncycles(): Int {
+        return theStrategy.hessianNCycles()
+    }
+
+    fun tolerg2(): Double {
+        return theStrategy.hessianG2Tolerance()
+    }
+
+    fun tolerstp(): Double {
+        return theStrategy.hessianStepTolerance()
+    }
+
+    private inner class MnHesseFailedException(message: String?) : java.lang.Exception(message)
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnLineSearch.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnLineSearch.kt
new file mode 100644
index 000000000..7b1171d3c
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnLineSearch.kt
@@ -0,0 +1,204 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.RealVector
+import ru.inr.mass.minuit.*
+
+/**
+ *
+ * @version $Id$
+ */
+internal object MnLineSearch {
+    fun search(
+        fcn: MnFcn,
+        st: MinimumParameters,
+        step: RealVector,
+        gdel: Double,
+        prec: MnMachinePrecision
+    ): MnParabolaPoint {
+        var overal = 1000.0
+        var undral = -100.0
+        val toler = 0.05
+        var slamin = 0.0
+        val slambg = 5.0
+        val alpha = 2.0
+        val maxiter = 12
+        var niter = 0
+        for (i in 0 until step.getDimension()) {
+            if (abs(step.getEntry(i)) < prec.eps()) {
+                continue
+            }
+            val ratio: Double = abs(st.vec().getEntry(i) / step.getEntry(i))
+            if (abs(slamin) < prec.eps()) {
+                slamin = ratio
+            }
+            if (ratio < slamin) {
+                slamin = ratio
+            }
+        }
+        if (abs(slamin) < prec.eps()) {
+            slamin = prec.eps()
+        }
+        slamin *= prec.eps2()
+        val F0: Double = st.fval()
+        val F1: Double = fcn.value(MnUtils.add(st.vec(), step))
+        var fvmin: Double = st.fval()
+        var xvmin = 0.0
+        if (F1 < F0) {
+            fvmin = F1
+            xvmin = 1.0
+        }
+        var toler8 = toler
+        var slamax = slambg
+        var flast = F1
+        var slam = 1.0
+        var iterate = false
+        var p0 = MnParabolaPoint(0.0, F0)
+        var p1 = MnParabolaPoint(slam, flast)
+        var F2 = 0.0
+        do {
+            // cut toler8 as function goes up
+            iterate = false
+            val pb: MnParabola = MnParabolaFactory.create(p0, gdel, p1)
+            var denom = 2.0 * (flast - F0 - gdel * slam) / (slam * slam)
+            if (abs(denom) < prec.eps()) {
+                denom = -0.1 * gdel
+                slam = 1.0
+            }
+            if (abs(denom) > prec.eps()) {
+                slam = -gdel / denom
+            }
+            if (slam < 0.0) {
+                slam = slamax
+            }
+            if (slam > slamax) {
+                slam = slamax
+            }
+            if (slam < toler8) {
+                slam = toler8
+            }
+            if (slam < slamin) {
+                return MnParabolaPoint(xvmin, fvmin)
+            }
+            if (abs(slam - 1.0) < toler8 && p1.y() < p0.y()) {
+                return MnParabolaPoint(xvmin, fvmin)
+            }
+            if (abs(slam - 1.0) < toler8) {
+                slam = 1.0 + toler8
+            }
+            F2 = fcn.value(MnUtils.add(st.vec(), MnUtils.mul(step, slam)))
+            if (F2 < fvmin) {
+                fvmin = F2
+                xvmin = slam
+            }
+            if (p0.y() - prec.eps() < fvmin && fvmin < p0.y() + prec.eps()) {
+                iterate = true
+                flast = F2
+                toler8 = toler * slam
+                overal = slam - toler8
+                slamax = overal
+                p1 = MnParabolaPoint(slam, flast)
+                niter++
+            }
+        } while (iterate && niter < maxiter)
+        if (niter >= maxiter) {
+            // exhausted max number of iterations
+            return MnParabolaPoint(xvmin, fvmin)
+        }
+        var p2 = MnParabolaPoint(slam, F2)
+        do {
+            slamax = max(slamax, alpha * abs(xvmin))
+            val pb: MnParabola = MnParabolaFactory.create(p0, p1, p2)
+            if (pb.a() < prec.eps2()) {
+                val slopem: Double = 2.0 * pb.a() * xvmin + pb.b()
+                slam = if (slopem < 0.0) {
+                    xvmin + slamax
+                } else {
+                    xvmin - slamax
+                }
+            } else {
+                slam = pb.min()
+                if (slam > xvmin + slamax) {
+                    slam = xvmin + slamax
+                }
+                if (slam < xvmin - slamax) {
+                    slam = xvmin - slamax
+                }
+            }
+            if (slam > 0.0) {
+                if (slam > overal) {
+                    slam = overal
+                }
+            } else {
+                if (slam < undral) {
+                    slam = undral
+                }
+            }
+            var F3 = 0.0
+            do {
+                iterate = false
+                val toler9: Double = max(toler8, abs(toler8 * slam))
+                // min. of parabola at one point
+                if (abs(p0.x() - slam) < toler9 || abs(p1.x() - slam) < toler9 || abs(
+                        p2.x() - slam) < toler9
+                ) {
+                    return MnParabolaPoint(xvmin, fvmin)
+                }
+                F3 = fcn.value(MnUtils.add(st.vec(), MnUtils.mul(step, slam)))
+                // if latest point worse than all three previous, cut step
+                if (F3 > p0.y() && F3 > p1.y() && F3 > p2.y()) {
+                    if (slam > xvmin) {
+                        overal = min(overal, slam - toler8)
+                    }
+                    if (slam < xvmin) {
+                        undral = max(undral, slam + toler8)
+                    }
+                    slam = 0.5 * (slam + xvmin)
+                    iterate = true
+                    niter++
+                }
+            } while (iterate && niter < maxiter)
+            if (niter >= maxiter) {
+                // exhausted max number of iterations
+                return MnParabolaPoint(xvmin, fvmin)
+            }
+
+            // find worst previous point out of three and replace
+            val p3 = MnParabolaPoint(slam, F3)
+            if (p0.y() > p1.y() && p0.y() > p2.y()) {
+                p0 = p3
+            } else if (p1.y() > p0.y() && p1.y() > p2.y()) {
+                p1 = p3
+            } else {
+                p2 = p3
+            }
+            if (F3 < fvmin) {
+                fvmin = F3
+                xvmin = slam
+            } else {
+                if (slam > xvmin) {
+                    overal = min(overal, slam - toler8)
+                }
+                if (slam < xvmin) {
+                    undral = max(undral, slam + toler8)
+                }
+            }
+            niter++
+        } while (niter < maxiter)
+        return MnParabolaPoint(xvmin, fvmin)
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMachinePrecision.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMachinePrecision.kt
new file mode 100644
index 000000000..161ee0c0a
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMachinePrecision.kt
@@ -0,0 +1,71 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ * Determines the relative floating point arithmetic precision. The
+ * setPrecision() method can be used to override Minuit's own determination,
+ * when the user knows that the {FCN} function value is not calculated to the
+ * nominal machine accuracy.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnMachinePrecision internal constructor() {
+    private var theEpsMa2 = 0.0
+    private var theEpsMac = 0.0
+
+    /**
+     * eps returns the smallest possible number so that 1.+eps > 1.
+     * @return
+     */
+    fun eps(): Double {
+        return theEpsMac
+    }
+
+    /**
+     * eps2 returns 2*sqrt(eps)
+     * @return
+     */
+    fun eps2(): Double {
+        return theEpsMa2
+    }
+
+    /**
+     * override Minuit's own determination
+     *
+     * @param prec a double.
+     */
+    fun setPrecision(prec: Double) {
+        theEpsMac = prec
+        theEpsMa2 = 2.0 * sqrt(theEpsMac)
+    }
+
+    init {
+        setPrecision(4.0E-7)
+        var epstry = 0.5
+        val one = 1.0
+        for (i in 0..99) {
+            epstry *= 0.5
+            val epsp1 = one + epstry
+            val epsbak = epsp1 - one
+            if (epsbak < epstry) {
+                setPrecision(8.0 * epstry)
+                break
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMigrad.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMigrad.kt
new file mode 100644
index 000000000..22616a1a6
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMigrad.kt
@@ -0,0 +1,136 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+
+/**
+ * MnMigrad provides minimization of the function by the method of MIGRAD, the
+ * most efficient and complete single method, recommended for general functions,
+ * and the functionality for parameters interaction. It also retains the result
+ * from the last minimization in case the user may want to do subsequent
+ * minimization steps with parameter interactions in between the minimization
+ * requests. The minimization produces as a by-product the error matrix of the
+ * parameters, which is usually reliable unless warning messages are produced.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnMigrad
+/**
+ * construct from MultiFunction + MnUserParameterState + MnStrategy
+ *
+ * @param str a [hep.dataforge.MINUIT.MnStrategy] object.
+ * @param par a [hep.dataforge.MINUIT.MnUserParameterState] object.
+ * @param fcn a [MultiFunction] object.
+ */
+    (fcn: MultiFunction?, par: MnUserParameterState, str: MnStrategy) : MnApplication(fcn, par, str) {
+    private val theMinimizer: VariableMetricMinimizer = VariableMetricMinimizer()
+
+    /**
+     * construct from MultiFunction + double[] for parameters and errors
+     * with default strategy
+     *
+     * @param err an array of double.
+     * @param par an array of double.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, err: DoubleArray) : this(fcn, par, err, DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + double[] for parameters and errors
+     *
+     * @param stra a int.
+     * @param err an array of double.
+     * @param fcn a [MultiFunction] object.
+     * @param par an array of double.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, err: DoubleArray, stra: Int) : this(fcn,
+        MnUserParameterState(par, err),
+        MnStrategy(stra))
+
+    /**
+     * construct from MultiFunction + double[] for parameters and
+     * MnUserCovariance with default strategy
+     *
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param par an array of double.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, cov: MnUserCovariance) : this(fcn, par, cov, DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + double[] for parameters and
+     * MnUserCovariance
+     *
+     * @param stra a int.
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param fcn a [MultiFunction] object.
+     * @param par an array of double.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, cov: MnUserCovariance, stra: Int) : this(fcn,
+        MnUserParameterState(par, cov),
+        MnStrategy(stra))
+
+    /**
+     * construct from MultiFunction + MnUserParameters with default
+     * strategy
+     *
+     * @param fcn a [MultiFunction] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters) : this(fcn, par, DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + MnUserParameters
+     *
+     * @param stra a int.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters, stra: Int) : this(fcn,
+        MnUserParameterState(par),
+        MnStrategy(stra))
+
+    /**
+     * construct from MultiFunction + MnUserParameters + MnUserCovariance
+     * with default strategy
+     *
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters, cov: MnUserCovariance) : this(fcn,
+        par,
+        cov,
+        DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + MnUserParameters + MnUserCovariance
+     *
+     * @param stra a int.
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param fcn a [MultiFunction] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters, cov: MnUserCovariance, stra: Int) : this(fcn,
+        MnUserParameterState(par, cov),
+        MnStrategy(stra))
+
+    override fun minimizer(): ModularFunctionMinimizer {
+        return theMinimizer
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMinimize.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMinimize.kt
new file mode 100644
index 000000000..ea14a5453
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMinimize.kt
@@ -0,0 +1,133 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+
+/**
+ * Causes minimization of the function by the method of MIGRAD, as does the
+ * MnMigrad class, but switches to the SIMPLEX method if MIGRAD fails to
+ * converge. Constructor arguments, methods arguments and names of methods are
+ * the same as for MnMigrad or MnSimplex.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnMinimize
+/**
+ * construct from MultiFunction + MnUserParameterState + MnStrategy
+ *
+ * @param str a [hep.dataforge.MINUIT.MnStrategy] object.
+ * @param par a [hep.dataforge.MINUIT.MnUserParameterState] object.
+ * @param fcn a [MultiFunction] object.
+ */
+    (fcn: MultiFunction?, par: MnUserParameterState, str: MnStrategy) : MnApplication(fcn, par, str) {
+    private val theMinimizer: CombinedMinimizer = CombinedMinimizer()
+
+    /**
+     * construct from MultiFunction + double[] for parameters and errors
+     * with default strategy
+     *
+     * @param err an array of double.
+     * @param par an array of double.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, err: DoubleArray) : this(fcn, par, err, DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + double[] for parameters and errors
+     *
+     * @param stra a int.
+     * @param err an array of double.
+     * @param fcn a [MultiFunction] object.
+     * @param par an array of double.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, err: DoubleArray, stra: Int) : this(fcn,
+        MnUserParameterState(par, err),
+        MnStrategy(stra))
+
+    /**
+     * construct from MultiFunction + double[] for parameters and
+     * MnUserCovariance with default strategy
+     *
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param par an array of double.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, cov: MnUserCovariance) : this(fcn, par, cov, DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + double[] for parameters and
+     * MnUserCovariance
+     *
+     * @param stra a int.
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param fcn a [MultiFunction] object.
+     * @param par an array of double.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, cov: MnUserCovariance, stra: Int) : this(fcn,
+        MnUserParameterState(par, cov),
+        MnStrategy(stra))
+
+    /**
+     * construct from MultiFunction + MnUserParameters with default
+     * strategy
+     *
+     * @param fcn a [MultiFunction] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters) : this(fcn, par, DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + MnUserParameters
+     *
+     * @param stra a int.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters, stra: Int) : this(fcn,
+        MnUserParameterState(par),
+        MnStrategy(stra))
+
+    /**
+     * construct from MultiFunction + MnUserParameters + MnUserCovariance
+     * with default strategy
+     *
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters, cov: MnUserCovariance) : this(fcn,
+        par,
+        cov,
+        DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + MnUserParameters + MnUserCovariance
+     *
+     * @param stra a int.
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param fcn a [MultiFunction] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters, cov: MnUserCovariance, stra: Int) : this(fcn,
+        MnUserParameterState(par, cov),
+        MnStrategy(stra))
+
+    override fun minimizer(): ModularFunctionMinimizer {
+        return theMinimizer
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMinos.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMinos.kt
new file mode 100644
index 000000000..d49379b3b
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMinos.kt
@@ -0,0 +1,379 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+import ru.inr.mass.minuit.*
+import kotlin.jvm.JvmOverloads
+
+/**
+ * API class for Minos error analysis (asymmetric errors). Minimization has to
+ * be done before and minimum must be valid; possibility to ask only for one
+ * side of the Minos error;
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnMinos(fcn: MultiFunction?, min: FunctionMinimum?, stra: MnStrategy?) {
+    private var theFCN: MultiFunction? = null
+    private var theMinimum: FunctionMinimum? = null
+    private var theStrategy: MnStrategy? = null
+
+    /**
+     * construct from FCN + minimum
+     *
+     * @param fcn a [MultiFunction] object.
+     * @param min a [hep.dataforge.MINUIT.FunctionMinimum] object.
+     */
+    constructor(fcn: MultiFunction?, min: FunctionMinimum?) : this(fcn, min, MnApplication.DEFAULT_STRATEGY)
+
+    /**
+     * construct from FCN + minimum + strategy
+     *
+     * @param stra a int.
+     * @param min a [hep.dataforge.MINUIT.FunctionMinimum] object.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, min: FunctionMinimum?, stra: Int) : this(fcn, min, MnStrategy(stra))
+    //    public MnMinos(MultiFunction fcn, MnUserParameterState state, double errDef, MnStrategy stra) {
+    //        theFCN = fcn;
+    //        theStrategy = stra;
+    //        
+    //        MinimumState minState = null;
+    //                
+    //        MnUserTransformation transformation = state.getTransformation();
+    //        
+    //        MinimumSeed seed = new MinimumSeed(minState, transformation);
+    //        
+    //        theMinimum = new FunctionMinimum(seed,errDef);
+    //    }
+    /**
+     *
+     * loval.
+     *
+     * @param par a int.
+     * @return a [hep.dataforge.MINUIT.MnCross] object.
+     */
+    fun loval(par: Int): MnCross {
+        return loval(par, 1.0)
+    }
+
+    /**
+     *
+     * loval.
+     *
+     * @param par a int.
+     * @param errDef a double.
+     * @return a [hep.dataforge.MINUIT.MnCross] object.
+     */
+    fun loval(par: Int, errDef: Double): MnCross {
+        return loval(par, errDef, MnApplication.DEFAULT_MAXFCN)
+    }
+
+    /**
+     *
+     * loval.
+     *
+     * @param par a int.
+     * @param errDef a double.
+     * @param maxcalls a int.
+     * @return a [hep.dataforge.MINUIT.MnCross] object.
+     */
+    fun loval(par: Int, errDef: Double, maxcalls: Int): MnCross {
+        var errDef = errDef
+        var maxcalls = maxcalls
+        errDef *= theMinimum!!.errorDef()
+        assert(theMinimum!!.isValid())
+        assert(!theMinimum!!.userState().parameter(par).isFixed())
+        assert(!theMinimum!!.userState().parameter(par).isConst())
+        if (maxcalls == 0) {
+            val nvar: Int = theMinimum!!.userState().variableParameters()
+            maxcalls = 2 * (nvar + 1) * (200 + 100 * nvar + 5 * nvar * nvar)
+        }
+        val para = intArrayOf(par)
+        val upar: MnUserParameterState = theMinimum!!.userState().copy()
+        val err: Double = upar.error(par)
+        val `val`: Double = upar.value(par) - err
+        val xmid = doubleArrayOf(`val`)
+        val xdir = doubleArrayOf(-err)
+        val ind: Int = upar.intOfExt(par)
+        val m: MnAlgebraicSymMatrix = theMinimum!!.error().matrix()
+        val xunit: Double = sqrt(errDef / err)
+        for (i in 0 until m.nrow()) {
+            if (i == ind) {
+                continue
+            }
+            val xdev: Double = xunit * m[ind, i]
+            val ext: Int = upar.extOfInt(i)
+            upar.setValue(ext, upar.value(ext) - xdev)
+        }
+        upar.fix(par)
+        upar.setValue(par, `val`)
+        val toler = 0.1
+        val cross = MnFunctionCross(theFCN, upar, theMinimum!!.fval(), theStrategy, errDef)
+        val aopt: MnCross = cross.cross(para, xmid, xdir, toler, maxcalls)
+        if (aopt.atLimit()) {
+            MINUITPlugin.logStatic("MnMinos parameter $par is at lower limit.")
+        }
+        if (aopt.atMaxFcn()) {
+            MINUITPlugin.logStatic("MnMinos maximum number of function calls exceeded for parameter $par")
+        }
+        if (aopt.newMinimum()) {
+            MINUITPlugin.logStatic("MnMinos new minimum found while looking for parameter $par")
+        }
+        if (!aopt.isValid()) {
+            MINUITPlugin.logStatic("MnMinos could not find lower value for parameter $par.")
+        }
+        return aopt
+    }
+    /**
+     * calculate one side (negative or positive error) of the parameter
+     *
+     * @param maxcalls a int.
+     * @param par a int.
+     * @param errDef a double.
+     * @return a double.
+     */
+    /**
+     *
+     * lower.
+     *
+     * @param par a int.
+     * @param errDef a double.
+     * @return a double.
+     */
+    /**
+     *
+     * lower.
+     *
+     * @param par a int.
+     * @return a double.
+     */
+    @JvmOverloads
+    fun lower(par: Int, errDef: Double = 1.0, maxcalls: Int = MnApplication.DEFAULT_MAXFCN): Double {
+        val upar: MnUserParameterState = theMinimum!!.userState()
+        val err: Double = theMinimum!!.userState().error(par)
+        val aopt: MnCross = loval(par, errDef, maxcalls)
+        return if (aopt.isValid()) -1.0 * err * (1.0 + aopt.value()) else if (aopt.atLimit()) upar.parameter(par)
+            .lowerLimit() else upar.value(par)
+    }
+
+    /**
+     *
+     * minos.
+     *
+     * @param par a int.
+     * @return a [hep.dataforge.MINUIT.MinosError] object.
+     */
+    fun minos(par: Int): MinosError {
+        return minos(par, 1.0)
+    }
+
+    /**
+     *
+     * minos.
+     *
+     * @param par a int.
+     * @param errDef a double.
+     * @return a [hep.dataforge.MINUIT.MinosError] object.
+     */
+    fun minos(par: Int, errDef: Double): MinosError {
+        return minos(par, errDef, MnApplication.DEFAULT_MAXFCN)
+    }
+
+    /**
+     * Causes a MINOS error analysis to be performed on the parameter whose
+     * number is specified. MINOS errors may be expensive to calculate, but are
+     * very reliable since they take account of non-linearities in the problem
+     * as well as parameter correlations, and are in general asymmetric.
+     *
+     * @param maxcalls Specifies the (approximate) maximum number of function
+     * calls per parameter requested, after which the calculation will be
+     * stopped for that parameter.
+     * @param errDef a double.
+     * @param par a int.
+     * @return a [hep.dataforge.MINUIT.MinosError] object.
+     */
+    fun minos(par: Int, errDef: Double, maxcalls: Int): MinosError {
+        assert(theMinimum!!.isValid())
+        assert(!theMinimum!!.userState().parameter(par).isFixed())
+        assert(!theMinimum!!.userState().parameter(par).isConst())
+        val up: MnCross = upval(par, errDef, maxcalls)
+        val lo: MnCross = loval(par, errDef, maxcalls)
+        return MinosError(par, theMinimum!!.userState().value(par), lo, up)
+    }
+
+    /**
+     *
+     * range.
+     *
+     * @param par a int.
+     * @return
+     */
+    fun range(par: Int): Range {
+        return range(par, 1.0)
+    }
+
+    /**
+     *
+     * range.
+     *
+     * @param par a int.
+     * @param errDef a double.
+     * @return
+     */
+    fun range(par: Int, errDef: Double): Range {
+        return range(par, errDef, MnApplication.DEFAULT_MAXFCN)
+    }
+
+    /**
+     * Causes a MINOS error analysis for external parameter n.
+     *
+     * @param maxcalls a int.
+     * @param errDef a double.
+     * @return The lower and upper bounds of parameter
+     * @param par a int.
+     */
+    fun range(par: Int, errDef: Double, maxcalls: Int): Range {
+        val mnerr: MinosError = minos(par, errDef, maxcalls)
+        return mnerr.range()
+    }
+    /**
+     *
+     * upper.
+     *
+     * @param par a int.
+     * @param errDef a double.
+     * @param maxcalls a int.
+     * @return a double.
+     */
+    /**
+     *
+     * upper.
+     *
+     * @param par a int.
+     * @param errDef a double.
+     * @return a double.
+     */
+    /**
+     *
+     * upper.
+     *
+     * @param par a int.
+     * @return a double.
+     */
+    @JvmOverloads
+    fun upper(par: Int, errDef: Double = 1.0, maxcalls: Int = MnApplication.DEFAULT_MAXFCN): Double {
+        val upar: MnUserParameterState = theMinimum!!.userState()
+        val err: Double = theMinimum!!.userState().error(par)
+        val aopt: MnCross = upval(par, errDef, maxcalls)
+        return if (aopt.isValid()) err * (1.0 + aopt.value()) else if (aopt.atLimit()) upar.parameter(par)
+            .upperLimit() else upar.value(par)
+    }
+
+    /**
+     *
+     * upval.
+     *
+     * @param par a int.
+     * @return a [hep.dataforge.MINUIT.MnCross] object.
+     */
+    fun upval(par: Int): MnCross {
+        return upval(par, 1.0)
+    }
+
+    /**
+     *
+     * upval.
+     *
+     * @param par a int.
+     * @param errDef a double.
+     * @return a [hep.dataforge.MINUIT.MnCross] object.
+     */
+    fun upval(par: Int, errDef: Double): MnCross {
+        return upval(par, errDef, MnApplication.DEFAULT_MAXFCN)
+    }
+
+    /**
+     *
+     * upval.
+     *
+     * @param par a int.
+     * @param errDef a double.
+     * @param maxcalls a int.
+     * @return a [hep.dataforge.MINUIT.MnCross] object.
+     */
+    fun upval(par: Int, errDef: Double, maxcalls: Int): MnCross {
+        var errDef = errDef
+        var maxcalls = maxcalls
+        errDef *= theMinimum!!.errorDef()
+        assert(theMinimum!!.isValid())
+        assert(!theMinimum!!.userState().parameter(par).isFixed())
+        assert(!theMinimum!!.userState().parameter(par).isConst())
+        if (maxcalls == 0) {
+            val nvar: Int = theMinimum!!.userState().variableParameters()
+            maxcalls = 2 * (nvar + 1) * (200 + 100 * nvar + 5 * nvar * nvar)
+        }
+        val para = intArrayOf(par)
+        val upar: MnUserParameterState = theMinimum!!.userState().copy()
+        val err: Double = upar.error(par)
+        val `val`: Double = upar.value(par) + err
+        val xmid = doubleArrayOf(`val`)
+        val xdir = doubleArrayOf(err)
+        val ind: Int = upar.intOfExt(par)
+        val m: MnAlgebraicSymMatrix = theMinimum!!.error().matrix()
+        val xunit: Double = sqrt(errDef / err)
+        for (i in 0 until m.nrow()) {
+            if (i == ind) {
+                continue
+            }
+            val xdev: Double = xunit * m[ind, i]
+            val ext: Int = upar.extOfInt(i)
+            upar.setValue(ext, upar.value(ext) + xdev)
+        }
+        upar.fix(par)
+        upar.setValue(par, `val`)
+        val toler = 0.1
+        val cross = MnFunctionCross(theFCN, upar, theMinimum!!.fval(), theStrategy, errDef)
+        val aopt: MnCross = cross.cross(para, xmid, xdir, toler, maxcalls)
+        if (aopt.atLimit()) {
+            MINUITPlugin.logStatic("MnMinos parameter $par is at upper limit.")
+        }
+        if (aopt.atMaxFcn()) {
+            MINUITPlugin.logStatic("MnMinos maximum number of function calls exceeded for parameter $par")
+        }
+        if (aopt.newMinimum()) {
+            MINUITPlugin.logStatic("MnMinos new minimum found while looking for parameter $par")
+        }
+        if (!aopt.isValid()) {
+            MINUITPlugin.logStatic("MnMinos could not find upper value for parameter $par.")
+        }
+        return aopt
+    }
+
+    /**
+     * construct from FCN + minimum + strategy
+     *
+     * @param stra a [hep.dataforge.MINUIT.MnStrategy] object.
+     * @param min a [hep.dataforge.MINUIT.FunctionMinimum] object.
+     * @param fcn a [MultiFunction] object.
+     */
+    init {
+        theFCN = fcn
+        theMinimum = min
+        theStrategy = stra
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabola.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabola.kt
new file mode 100644
index 000000000..a0a56dedd
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabola.kt
@@ -0,0 +1,55 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ * parabola = a*xx + b*x + c
+ *
+ * @version $Id$
+ */
+internal class MnParabola(private val theA: Double, private val theB: Double, private val theC: Double) {
+    fun a(): Double {
+        return theA
+    }
+
+    fun b(): Double {
+        return theB
+    }
+
+    fun c(): Double {
+        return theC
+    }
+
+    fun min(): Double {
+        return -theB / (2.0 * theA)
+    }
+
+    fun x_neg(y: Double): Double {
+        return -sqrt(y / theA + min() * min() - theC / theA) + min()
+    }
+
+    fun x_pos(y: Double): Double {
+        return sqrt(y / theA + min() * min() - theC / theA) + min()
+    }
+
+    fun y(x: Double): Double {
+        return theA * x * x + theB * x + theC
+    }
+
+    fun ymin(): Double {
+        return -theB * theB / (4.0 * theA) + theC
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabolaFactory.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabolaFactory.kt
new file mode 100644
index 000000000..f45d2b9c9
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabolaFactory.kt
@@ -0,0 +1,58 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+internal object MnParabolaFactory {
+    fun create(p1: MnParabolaPoint, p2: MnParabolaPoint, p3: MnParabolaPoint): MnParabola {
+        var x1: Double = p1.x()
+        var x2: Double = p2.x()
+        var x3: Double = p3.x()
+        val dx12 = x1 - x2
+        val dx13 = x1 - x3
+        val dx23 = x2 - x3
+        val xm = (x1 + x2 + x3) / 3.0
+        x1 -= xm
+        x2 -= xm
+        x3 -= xm
+        val y1: Double = p1.y()
+        val y2: Double = p2.y()
+        val y3: Double = p3.y()
+        val a = y1 / (dx12 * dx13) - y2 / (dx12 * dx23) + y3 / (dx13 * dx23)
+        var b = -y1 * (x2 + x3) / (dx12 * dx13) + y2 * (x1 + x3) / (dx12 * dx23) - y3 * (x1 + x2) / (dx13 * dx23)
+        var c = y1 - a * x1 * x1 - b * x1
+        c += xm * (xm * a - b)
+        b -= 2.0 * xm * a
+        return MnParabola(a, b, c)
+    }
+
+    fun create(p1: MnParabolaPoint, dxdy1: Double, p2: MnParabolaPoint): MnParabola {
+        val x1: Double = p1.x()
+        val xx1 = x1 * x1
+        val x2: Double = p2.x()
+        val xx2 = x2 * x2
+        val y1: Double = p1.y()
+        val y12: Double = p1.y() - p2.y()
+        val det = xx1 - xx2 - 2.0 * x1 * (x1 - x2)
+        val a = -(y12 + (x2 - x1) * dxdy1) / det
+        val b = -(-2.0 * x1 * y12 + (xx1 - xx2) * dxdy1) / det
+        val c = y1 - a * xx1 - b * x1
+        return MnParabola(a, b, c)
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabolaPoint.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabolaPoint.kt
new file mode 100644
index 000000000..858e010e6
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabolaPoint.kt
@@ -0,0 +1,30 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+internal class MnParabolaPoint(private val theX: Double, private val theY: Double) {
+    fun x(): Double {
+        return theX
+    }
+
+    fun y(): Double {
+        return theY
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParameterScan.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParameterScan.kt
new file mode 100644
index 000000000..7791c20e8
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParameterScan.kt
@@ -0,0 +1,113 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+
+/**
+ * Scans the values of FCN as a function of one parameter and retains the best
+ * function and parameter values found
+ *
+ * @version $Id$
+ */
+internal class MnParameterScan {
+    private var theAmin: Double
+    private var theFCN: MultiFunction?
+    private var theParameters: MnUserParameters
+
+    constructor(fcn: MultiFunction, par: MnUserParameters) {
+        theFCN = fcn
+        theParameters = par
+        theAmin = fcn.value(par.params())
+    }
+
+    constructor(fcn: MultiFunction?, par: MnUserParameters, fval: Double) {
+        theFCN = fcn
+        theParameters = par
+        theAmin = fval
+    }
+
+    fun fval(): Double {
+        return theAmin
+    }
+
+    fun parameters(): MnUserParameters {
+        return theParameters
+    }
+
+    fun scan(par: Int): List<Range> {
+        return scan(par, 41)
+    }
+
+    fun scan(par: Int, maxsteps: Int): List<Range> {
+        return scan(par, maxsteps, 0.0, 0.0)
+    }
+
+    /**
+     * returns pairs of (x,y) points, x=parameter value, y=function value of FCN
+     * @param high
+     * @return
+     */
+    fun scan(par: Int, maxsteps: Int, low: Double, high: Double): List<Range> {
+        var maxsteps = maxsteps
+        var low = low
+        var high = high
+        if (maxsteps > 101) {
+            maxsteps = 101
+        }
+        val result: MutableList<Range> = java.util.ArrayList<Range>(maxsteps + 1)
+        val params: DoubleArray = theParameters.params()
+        result.add(Range(params[par], theAmin))
+        if (low > high) {
+            return result
+        }
+        if (maxsteps < 2) {
+            return result
+        }
+        if (low == 0.0 && high == 0.0) {
+            low = params[par] - 2.0 * theParameters.error(par)
+            high = params[par] + 2.0 * theParameters.error(par)
+        }
+        if (low == 0.0 && high == 0.0 && theParameters.parameter(par).hasLimits()) {
+            if (theParameters.parameter(par).hasLowerLimit()) {
+                low = theParameters.parameter(par).lowerLimit()
+            }
+            if (theParameters.parameter(par).hasUpperLimit()) {
+                high = theParameters.parameter(par).upperLimit()
+            }
+        }
+        if (theParameters.parameter(par).hasLimits()) {
+            if (theParameters.parameter(par).hasLowerLimit()) {
+                low = max(low, theParameters.parameter(par).lowerLimit())
+            }
+            if (theParameters.parameter(par).hasUpperLimit()) {
+                high = min(high, theParameters.parameter(par).upperLimit())
+            }
+        }
+        val x0 = low
+        val stp = (high - low) / (maxsteps - 1.0)
+        for (i in 0 until maxsteps) {
+            params[par] = x0 + i.toDouble() * stp
+            val fval: Double = theFCN.value(params)
+            if (fval < theAmin) {
+                theParameters.setValue(par, params[par])
+                theAmin = fval
+            }
+            result.add(Range(params[par], fval))
+        }
+        return result
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPlot.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPlot.kt
new file mode 100644
index 000000000..656dd8d35
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPlot.kt
@@ -0,0 +1,438 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import java.lang.StringBuffer
+import kotlin.jvm.JvmOverloads
+
+/**
+ * MnPlot produces a text-screen graphical output of (x,y) points. E.g. from
+ * Scan or Contours.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnPlot @JvmOverloads constructor(private val thePageWidth: Int = 80, private val thePageLength: Int = 30) {
+    private var bh = 0.0
+    private var bl = 0.0
+    private var bwid = 0.0
+    private var nb = 0
+    fun length(): Int {
+        return thePageLength
+    }
+
+    private fun mnbins(a1: Double, a2: Double, naa: Int) {
+
+        //*-*-*-*-*-*-*-*-*-*-*Compute reasonable histogram intervals*-*-*-*-*-*-*-*-*
+        //*-*                  ======================================
+        //*-*        Function TO DETERMINE REASONABLE HISTOGRAM INTERVALS
+        //*-*        GIVEN ABSOLUTE UPPER AND LOWER BOUNDS  A1 AND A2
+        //*-*        AND DESIRED MAXIMUM NUMBER OF BINS NAA
+        //*-*        PROGRAM MAKES REASONABLE BINNING FROM BL TO BH OF WIDTH BWID
+        //*-*        F. JAMES,   AUGUST, 1974 , stolen for Minuit, 1988
+        //*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+
+        /* Local variables */
+        var awid: Double
+        var ah: Double
+        var sigfig: Double
+        var sigrnd: Double
+        var alb: Double
+        var kwid: Int
+        var lwid: Int
+        var na = 0
+        var log_: Int
+        val al: Double = if (a1 < a2) a1 else a2
+        ah = if (a1 > a2) a1 else a2
+        if (al == ah) {
+            ah = al + 1
+        }
+
+        //*-*-       IF NAA .EQ. -1 , PROGRAM USES BWID INPUT FROM CALLING ROUTINE
+        var skip = naa == -1 && bwid > 0
+        if (!skip) {
+            na = naa - 1
+            if (na < 1) {
+                na = 1
+            }
+        }
+        while (true) {
+            if (!skip) {
+                //*-*-        GET NOMINAL BIN WIDTH IN EXPON FORM
+                awid = (ah - al) / na.toDouble()
+                log_ = log10(awid)
+                if (awid <= 1) {
+                    --log_
+                }
+                sigfig = awid * pow(10.0, -log_.toDouble())
+                //*-*-       ROUND MANTISSA UP TO 2, 2.5, 5, OR 10
+                if (sigfig <= 2) {
+                    sigrnd = 2.0
+                } else if (sigfig <= 2.5) {
+                    sigrnd = 2.5
+                } else if (sigfig <= 5) {
+                    sigrnd = 5.0
+                } else {
+                    sigrnd = 1.0
+                    ++log_
+                }
+                bwid = sigrnd * pow(10.0, log_.toDouble())
+            }
+            alb = al / bwid
+            lwid = alb.toInt()
+            if (alb < 0) {
+                --lwid
+            }
+            bl = bwid * lwid.toDouble()
+            alb = ah / bwid + 1
+            kwid = alb.toInt()
+            if (alb < 0) {
+                --kwid
+            }
+            bh = bwid * kwid.toDouble()
+            nb = kwid - lwid
+            if (naa <= 5) {
+                if (naa == -1) {
+                    return
+                }
+                //*-*-        REQUEST FOR ONE BIN IS DIFFICULT CASE
+                if (naa > 1 || nb == 1) {
+                    return
+                }
+                bwid *= 2.0
+                nb = 1
+                return
+            }
+            if (nb shl 1 != naa) {
+                return
+            }
+            ++na
+            skip = false
+            continue
+        }
+    }
+
+    private fun mnplot(xpt: DoubleArray, ypt: DoubleArray, chpt: StringBuffer, nxypt: Int, npagwd: Int, npagln: Int) {
+        //*-*-*-*Plots points in array xypt onto one page with labelled axes*-*-*-*-*
+        //*-*    ===========================================================
+        //*-*        NXYPT is the number of points to be plotted
+        //*-*        XPT(I) = x-coord. of ith point
+        //*-*        YPT(I) = y-coord. of ith point
+        //*-*        CHPT(I) = character to be plotted at this position
+        //*-*        the input point arrays XPT, YPT, CHPT are destroyed.
+        //*-*
+        //*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+
+        /* Local variables */
+        var xmin: Double
+        var xmax: Double
+        var ymax: Double
+        var savx: Double
+        var savy: Double
+        var yprt: Double
+        var xbest: Double
+        var ybest: Double
+        val xvalus = DoubleArray(12)
+        val any: Double
+        val iten: Int
+        var j: Int
+        var k: Int
+        var maxnx: Int
+        var maxny: Int
+        var iquit: Int
+        var ni: Int
+        var linodd: Int
+        var ibk: Int
+        var isp1: Int
+        var ks: Int
+        var ix: Int
+        var overpr: Boolean
+        val cline = StringBuffer(npagwd)
+        for (ii in 0 until npagwd) {
+            cline.append(' ')
+        }
+        var chsav: Char
+        val chbest: Char
+
+        /* Function Body */
+        //*-*  Computing MIN
+        maxnx = if (npagwd - 20 < 100) npagwd - 20 else 100
+        if (maxnx < 10) {
+            maxnx = 10
+        }
+        maxny = npagln
+        if (maxny < 10) {
+            maxny = 10
+        }
+        if (nxypt <= 1) {
+            return
+        }
+        xbest = xpt[0]
+        ybest = ypt[0]
+        chbest = chpt.get(0)
+        //*-*-        order the points by decreasing y
+        val km1: Int = nxypt - 1
+        var i: Int = 1
+        while (i <= km1) {
+            iquit = 0
+            ni = nxypt - i
+            j = 1
+            while (j <= ni) {
+                if (ypt[j - 1] > ypt[j]) {
+                    ++j
+                    continue
+                }
+                savx = xpt[j - 1]
+                xpt[j - 1] = xpt[j]
+                xpt[j] = savx
+                savy = ypt[j - 1]
+                ypt[j - 1] = ypt[j]
+                ypt[j] = savy
+                chsav = chpt.get(j - 1)
+                chpt.setCharAt(j - 1, chpt.get(j))
+                chpt.setCharAt(j, chsav)
+                iquit = 1
+                ++j
+            }
+            if (iquit == 0) {
+                break
+            }
+            ++i
+        }
+        //*-*-        find extreme values
+        xmax = xpt[0]
+        xmin = xmax
+        i = 1
+        while (i <= nxypt) {
+            if (xpt[i - 1] > xmax) {
+                xmax = xpt[i - 1]
+            }
+            if (xpt[i - 1] < xmin) {
+                xmin = xpt[i - 1]
+            }
+            ++i
+        }
+        val dxx: Double = (xmax - xmin) * .001
+        xmax += dxx
+        xmin -= dxx
+        mnbins(xmin, xmax, maxnx)
+        xmin = bl
+        xmax = bh
+        var nx: Int = nb
+        val bwidx: Double = bwid
+        ymax = ypt[0]
+        var ymin: Double = ypt[nxypt - 1]
+        if (ymax == ymin) {
+            ymax = ymin + 1
+        }
+        val dyy: Double = (ymax - ymin) * .001
+        ymax += dyy
+        ymin -= dyy
+        mnbins(ymin, ymax, maxny)
+        ymin = bl
+        ymax = bh
+        var ny: Int = nb
+        val bwidy: Double = bwid
+        any = ny.toDouble()
+        //*-*-        if first point is blank, it is an 'origin'
+        if (chbest != ' ') {
+            xbest = (xmax + xmin) * .5
+            ybest = (ymax + ymin) * .5
+        }
+        //*-*-        find scale constants
+        val ax: Double = 1 / bwidx
+        val ay: Double = 1 / bwidy
+        val bx: Double = -ax * xmin + 2
+        val by: Double = -ay * ymin - 2
+        //*-*-        convert points to grid positions
+        i = 1
+        while (i <= nxypt) {
+            xpt[i - 1] = ax * xpt[i - 1] + bx
+            ypt[i - 1] = any - ay * ypt[i - 1] - by
+            ++i
+        }
+        val nxbest: Int = (ax * xbest + bx).toInt()
+        val nybest: Int = (any - ay * ybest - by).toInt()
+        //*-*-        print the points
+        ny += 2
+        nx += 2
+        isp1 = 1
+        linodd = 1
+        overpr = false
+        i = 1
+        while (i <= ny) {
+            ibk = 1
+            while (ibk <= nx) {
+                cline.setCharAt(ibk - 1, ' ')
+                ++ibk
+            }
+            //         cline.setCharAt(nx,'\0');
+            //         cline.setCharAt(nx+1,'\0');
+            cline.setCharAt(0, '.')
+            cline.setCharAt(nx - 1, '.')
+            cline.setCharAt(nxbest - 1, '.')
+            if (i == 1 || i == nybest || i == ny) {
+                j = 1
+                while (j <= nx) {
+                    cline.setCharAt(j - 1, '.')
+                    ++j
+                }
+            }
+            yprt = ymax - (i - 1.0) * bwidy
+            var isplset = false
+            if (isp1 <= nxypt) {
+                //*-*-        find the points to be plotted on this line
+                k = isp1
+                while (k <= nxypt) {
+                    ks = ypt[k - 1].toInt()
+                    if (ks > i) {
+                        isp1 = k
+                        isplset = true
+                        break
+                    }
+                    ix = xpt[k - 1].toInt()
+                    if (cline.get(ix - 1) != '.' && cline.get(ix - 1) != ' ') {
+                        if (cline.get(ix - 1) == chpt.get(k - 1)) {
+                            ++k
+                            continue
+                        }
+                        overpr = true
+                        //*-*-        OVERPR is true if one or more positions contains more than
+                        //*-*-           one point
+                        cline.setCharAt(ix - 1, '&')
+                        ++k
+                        continue
+                    }
+                    cline.setCharAt(ix - 1, chpt.get(k - 1))
+                    ++k
+                }
+                if (!isplset) {
+                    isp1 = nxypt + 1
+                }
+            }
+            if (linodd != 1 && i != ny) {
+                linodd = 1
+                java.lang.System.out.printf("                  %s", cline.substring(0, 60))
+            } else {
+                java.lang.System.out.printf(" %14.7g ..%s", yprt, cline.substring(0, 60))
+                linodd = 0
+            }
+            println()
+            ++i
+        }
+        //*-*-        print labels on x-axis every ten columns
+        ibk = 1
+        while (ibk <= nx) {
+            cline.setCharAt(ibk - 1, ' ')
+            if (ibk % 10 == 1) {
+                cline.setCharAt(ibk - 1, '/')
+            }
+            ++ibk
+        }
+        java.lang.System.out.printf("                  %s", cline)
+        java.lang.System.out.printf("\n")
+        ibk = 1
+        while (ibk <= 12) {
+            xvalus[ibk - 1] = xmin + (ibk - 1.0) * 10 * bwidx
+            ++ibk
+        }
+        java.lang.System.out.printf("           ")
+        iten = (nx + 9) / 10
+        ibk = 1
+        while (ibk <= iten) {
+            java.lang.System.out.printf(" %9.4g", xvalus[ibk - 1])
+            ++ibk
+        }
+        java.lang.System.out.printf("\n")
+        if (overpr) {
+            val chmess = "   Overprint character is &"
+            java.lang.System.out.printf("                         ONE COLUMN=%13.7g%s", bwidx, chmess)
+        } else {
+            val chmess = " "
+            java.lang.System.out.printf("                         ONE COLUMN=%13.7g%s", bwidx, chmess)
+        }
+        println()
+    }
+
+    /**
+     *
+     * plot.
+     *
+     * @param points a [List] object.
+     */
+    fun plot(points: List<Range>) {
+        val x = DoubleArray(points.size)
+        val y = DoubleArray(points.size)
+        val chpt = StringBuffer(points.size)
+        for ((i, ipoint) in points.withIndex()) {
+            x[i] = ipoint.getFirst()
+            y[i] = ipoint.getSecond()
+            chpt.append('*')
+        }
+        mnplot(x, y, chpt, points.size, width(), length())
+    }
+
+    /**
+     *
+     * plot.
+     *
+     * @param xmin a double.
+     * @param ymin a double.
+     * @param points a [List] object.
+     */
+    fun plot(xmin: Double, ymin: Double, points: List<Range>) {
+        val x = DoubleArray(points.size + 2)
+        x[0] = xmin
+        x[1] = xmin
+        val y = DoubleArray(points.size + 2)
+        y[0] = ymin
+        y[1] = ymin
+        val chpt = StringBuffer(points.size + 2)
+        chpt.append(' ')
+        chpt.append('X')
+        var i = 2
+        for (ipoint in points) {
+            x[i] = ipoint.getFirst()
+            y[i] = ipoint.getSecond()
+            chpt.append('*')
+            i++
+        }
+        mnplot(x, y, chpt, points.size + 2, width(), length())
+    }
+
+    fun width(): Int {
+        return thePageWidth
+    }
+    /**
+     *
+     * Constructor for MnPlot.
+     *
+     * @param thePageWidth a int.
+     * @param thePageLength a int.
+     */
+    /**
+     *
+     * Constructor for MnPlot.
+     */
+    init {
+        if (thePageWidth > 120) {
+            thePageWidth = 120
+        }
+        if (thePageLength > 56) {
+            thePageLength = 56
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPosDef.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPosDef.kt
new file mode 100644
index 000000000..f94e387d9
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPosDef.kt
@@ -0,0 +1,89 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import space.kscience.kmath.optimization.minuit.MINUITPlugin
+
+/**
+ *
+ * @version $Id$
+ */
+internal object MnPosDef {
+    fun test(st: MinimumState, prec: MnMachinePrecision): MinimumState {
+        val err: MinimumError = test(st.error(), prec)
+        return MinimumState(st.parameters(), err, st.gradient(), st.edm(), st.nfcn())
+    }
+
+    fun test(e: MinimumError, prec: MnMachinePrecision): MinimumError {
+        val err: MnAlgebraicSymMatrix = e.invHessian().copy()
+        if (err.size() === 1 && err[0, 0] < prec.eps()) {
+            err[0, 0] = 1.0
+            return MinimumError(err, MnMadePosDef())
+        }
+        if (err.size() === 1 && err[0, 0] > prec.eps()) {
+            return e
+        }
+        //   std::cout<<"MnPosDef init matrix= "<<err<<std::endl;
+        val epspdf: Double = max(1e-6, prec.eps2())
+        var dgmin: Double = err[0, 0]
+        for (i in 0 until err.nrow()) {
+            if (err[i, i] < prec.eps2()) {
+                MINUITPlugin.logStatic("negative or zero diagonal element $i in covariance matrix")
+            }
+            if (err[i, i] < dgmin) {
+                dgmin = err[i, i]
+            }
+        }
+        var dg = 0.0
+        if (dgmin < prec.eps2()) {
+            dg = 1.0 + epspdf - dgmin
+            //     dg = 0.5*(1. + epspdf - dgmin);
+            MINUITPlugin.logStatic("added $dg to diagonal of error matrix")
+        }
+        val s: RealVector = ArrayRealVector(err.nrow())
+        val p = MnAlgebraicSymMatrix(err.nrow())
+        for (i in 0 until err.nrow()) {
+            err[i, i] = err[i, i] + dg
+            if (err[i, i] < 0.0) {
+                err[i, i] = 1.0
+            }
+            s.setEntry(i, 1.0 / sqrt(err[i, i]))
+            for (j in 0..i) {
+                p[i, j] = err[i, j] * s.getEntry(i) * s.getEntry(j)
+            }
+        }
+
+        //   std::cout<<"MnPosDef p: "<<p<<std::endl;
+        val eval: RealVector = p.eigenvalues()
+        val pmin: Double = eval.getEntry(0)
+        var pmax: Double = eval.getEntry(eval.getDimension() - 1)
+        //   std::cout<<"pmin= "<<pmin<<" pmax= "<<pmax<<std::endl;
+        pmax = max(abs(pmax), 1.0)
+        if (pmin > epspdf * pmax) {
+            return e
+        }
+        val padd = 0.001 * pmax - pmin
+        MINUITPlugin.logStatic("eigenvalues: ")
+        for (i in 0 until err.nrow()) {
+            err[i, i] = err[i, i] * (1.0 + padd)
+            MINUITPlugin.logStatic(java.lang.Double.toString(eval.getEntry(i)))
+        }
+        //   std::cout<<"MnPosDef final matrix: "<<err<<std::endl;
+        MINUITPlugin.logStatic("matrix forced pos-def by adding $padd to diagonal")
+        //   std::cout<<"eigenvalues: "<<eval<<std::endl;
+        return MinimumError(err, MnMadePosDef())
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPrint.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPrint.kt
new file mode 100644
index 000000000..ce018c2a4
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPrint.kt
@@ -0,0 +1,387 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.RealVector
+import ru.inr.mass.minuit.*
+
+/**
+ * Utilities for printing various minuit results.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+object MnPrint {
+    /**
+     *
+     * print.
+     *
+     * @param os a [PrintWriter] object.
+     * @param vec a [org.apache.commons.math3.linear.RealVector] object.
+     */
+    fun print(os: PrintWriter, vec: RealVector) {
+        os.println("LAVector parameters:")
+        run {
+            os.println()
+            val nrow: Int = vec.getDimension()
+            for (i in 0 until nrow) {
+                os.printf("%g ", vec.getEntry(i))
+            }
+            os.println()
+        }
+    }
+
+    /**
+     *
+     * print.
+     *
+     * @param os a [PrintWriter] object.
+     * @param matrix a [hep.dataforge.MINUIT.MnAlgebraicSymMatrix] object.
+     */
+    fun print(os: PrintWriter, matrix: MnAlgebraicSymMatrix) {
+        os.println("LASymMatrix parameters:")
+        run {
+            os.println()
+            val n: Int = matrix.nrow()
+            for (i in 0 until n) {
+                for (j in 0 until n) {
+                    os.printf("%10g ", matrix[i, j])
+                }
+                os.println()
+            }
+        }
+    }
+
+    /**
+     *
+     * print.
+     *
+     * @param os a [PrintWriter] object.
+     * @param min a [hep.dataforge.MINUIT.FunctionMinimum] object.
+     */
+    fun print(os: PrintWriter, min: FunctionMinimum) {
+        os.println()
+        if (!min.isValid()) {
+            os.println()
+            os.println("WARNING: Minuit did not converge.")
+            os.println()
+        } else {
+            os.println()
+            os.println("Minuit did successfully converge.")
+            os.println()
+        }
+        os.printf("# of function calls: %d\n", min.nfcn())
+        os.printf("minimum function value: %g\n", min.fval())
+        os.printf("minimum edm: %g\n", min.edm())
+        os.println("minimum internal state vector: " + min.parameters().vec())
+        if (min.hasValidCovariance()) {
+            os.println("minimum internal covariance matrix: " + min.error().matrix())
+        }
+        os.println(min.userParameters())
+        os.println(min.userCovariance())
+        os.println(min.userState().globalCC())
+        if (!min.isValid()) {
+            os.println("WARNING: FunctionMinimum is invalid.")
+        }
+        os.println()
+    }
+
+    /**
+     *
+     * print.
+     *
+     * @param os a [PrintWriter] object.
+     * @param min a [hep.dataforge.MINUIT.MinimumState] object.
+     */
+    fun print(os: PrintWriter, min: MinimumState) {
+        os.println()
+        os.printf("minimum function value: %g\n", min.fval())
+        os.printf("minimum edm: %g\n", min.edm())
+        os.println("minimum internal state vector: " + min.vec())
+        os.println("minimum internal gradient vector: " + min.gradient().getGradient())
+        if (min.hasCovariance()) {
+            os.println("minimum internal covariance matrix: " + min.error().matrix())
+        }
+        os.println()
+    }
+
+    /**
+     *
+     * print.
+     *
+     * @param os a [PrintWriter] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     */
+    fun print(os: PrintWriter, par: MnUserParameters) {
+        os.println()
+        os.println("# ext. |" + "|   name    |" + "|   type  |" + "|   value   |" + "|  error +/- ")
+        os.println()
+        var atLoLim = false
+        var atHiLim = false
+        for (ipar in par.parameters()) {
+            os.printf(" %5d || %9s || ", ipar.number(), ipar.name())
+            if (ipar.isConst()) {
+                os.printf("         || %10g   ||", ipar.value())
+            } else if (ipar.isFixed()) {
+                os.printf("  fixed  || %10g   ||\n", ipar.value())
+            } else if (ipar.hasLimits()) {
+                if (ipar.error() > 0.0) {
+                    os.printf(" limited || %10g", ipar.value())
+                    if (abs(ipar.value() - ipar.lowerLimit()) < par.precision().eps2()) {
+                        os.print("* ")
+                        atLoLim = true
+                    }
+                    if (abs(ipar.value() - ipar.upperLimit()) < par.precision().eps2()) {
+                        os.print("**")
+                        atHiLim = true
+                    }
+                    os.printf(" || %10g\n", ipar.error())
+                } else {
+                    os.printf("  free   || %10g || no\n", ipar.value())
+                }
+            } else {
+                if (ipar.error() > 0.0) {
+                    os.printf("  free   || %10g || %10g\n", ipar.value(), ipar.error())
+                } else {
+                    os.printf("  free   || %10g || no\n", ipar.value())
+                }
+            }
+        }
+        os.println()
+        if (atLoLim) {
+            os.print("* parameter is at lower limit")
+        }
+        if (atHiLim) {
+            os.print("** parameter is at upper limit")
+        }
+        os.println()
+    }
+
+    /**
+     *
+     * print.
+     *
+     * @param os a [PrintWriter] object.
+     * @param matrix a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     */
+    fun print(os: PrintWriter, matrix: MnUserCovariance) {
+        os.println()
+        os.println("MnUserCovariance: ")
+        run {
+            os.println()
+            val n: Int = matrix.nrow()
+            for (i in 0 until n) {
+                for (j in 0 until n) {
+                    os.printf("%10g ", matrix[i, j])
+                }
+                os.println()
+            }
+        }
+        os.println()
+        os.println("MnUserCovariance parameter correlations: ")
+        run {
+            os.println()
+            val n: Int = matrix.nrow()
+            for (i in 0 until n) {
+                val di: Double = matrix[i, i]
+                for (j in 0 until n) {
+                    val dj: Double = matrix[j, j]
+                    os.printf("%g ", matrix[i, j] / sqrt(abs(di * dj)))
+                }
+                os.println()
+            }
+        }
+    }
+
+    /**
+     *
+     * print.
+     *
+     * @param os a [PrintWriter] object.
+     * @param coeff a [hep.dataforge.MINUIT.MnGlobalCorrelationCoeff] object.
+     */
+    fun print(os: PrintWriter, coeff: MnGlobalCorrelationCoeff) {
+        os.println()
+        os.println("MnGlobalCorrelationCoeff: ")
+        run {
+            os.println()
+            for (i in 0 until coeff.globalCC().length) {
+                os.printf("%g\n", coeff.globalCC()[i])
+            }
+        }
+    }
+
+    /**
+     *
+     * print.
+     *
+     * @param os a [PrintWriter] object.
+     * @param state a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun print(os: PrintWriter, state: MnUserParameterState) {
+        os.println()
+        if (!state.isValid()) {
+            os.println()
+            os.println("WARNING: MnUserParameterState is not valid.")
+            os.println()
+        }
+        os.println("# of function calls: " + state.nfcn())
+        os.println("function value: " + state.fval())
+        os.println("expected distance to the minimum (edm): " + state.edm())
+        os.println("external parameters: " + state.parameters())
+        if (state.hasCovariance()) {
+            os.println("covariance matrix: " + state.covariance())
+        }
+        if (state.hasGlobalCC()) {
+            os.println("global correlation coefficients : " + state.globalCC())
+        }
+        if (!state.isValid()) {
+            os.println("WARNING: MnUserParameterState is not valid.")
+        }
+        os.println()
+    }
+
+    /**
+     *
+     * print.
+     *
+     * @param os a [PrintWriter] object.
+     * @param me a [hep.dataforge.MINUIT.MinosError] object.
+     */
+    fun print(os: PrintWriter, me: MinosError) {
+        os.println()
+        os.printf("Minos # of function calls: %d\n", me.nfcn())
+        if (!me.isValid()) {
+            os.println("Minos error is not valid.")
+        }
+        if (!me.lowerValid()) {
+            os.println("lower Minos error is not valid.")
+        }
+        if (!me.upperValid()) {
+            os.println("upper Minos error is not valid.")
+        }
+        if (me.atLowerLimit()) {
+            os.println("Minos error is lower limit of parameter " + me.parameter())
+        }
+        if (me.atUpperLimit()) {
+            os.println("Minos error is upper limit of parameter " + me.parameter())
+        }
+        if (me.atLowerMaxFcn()) {
+            os.println("Minos number of function calls for lower error exhausted.")
+        }
+        if (me.atUpperMaxFcn()) {
+            os.println("Minos number of function calls for upper error exhausted.")
+        }
+        if (me.lowerNewMin()) {
+            os.println("Minos found a new minimum in negative direction.")
+            os.println(me.lowerState())
+        }
+        if (me.upperNewMin()) {
+            os.println("Minos found a new minimum in positive direction.")
+            os.println(me.upperState())
+        }
+        os.println("# ext. ||   name    || value@min ||  negative || positive  ")
+        os.printf("%4d||%10s||%10g||%10g||%10g\n",
+            me.parameter(),
+            me.lowerState().name(me.parameter()),
+            me.min(),
+            me.lower(),
+            me.upper())
+        os.println()
+    }
+
+    /**
+     *
+     * print.
+     *
+     * @param os a [PrintWriter] object.
+     * @param ce a [hep.dataforge.MINUIT.ContoursError] object.
+     */
+    fun print(os: PrintWriter, ce: ContoursError) {
+        os.println()
+        os.println("Contours # of function calls: " + ce.nfcn())
+        os.println("MinosError in x: ")
+        os.println(ce.xMinosError())
+        os.println("MinosError in y: ")
+        os.println(ce.yMinosError())
+        val plot = MnPlot()
+        plot.plot(ce.xmin(), ce.ymin(), ce.points())
+        for ((i, ipoint) in ce.points().withIndex()) {
+            os.printf("%d %10g %10g\n", i, ipoint.getFirst(), ipoint.getSecond())
+        }
+        os.println()
+    }
+
+    fun toString(x: RealVector): String {
+        val writer: java.io.StringWriter = java.io.StringWriter()
+        PrintWriter(writer).use { pw -> print(pw, x) }
+        return writer.toString()
+    }
+
+    fun toString(x: MnAlgebraicSymMatrix?): String {
+        val writer: java.io.StringWriter = java.io.StringWriter()
+        PrintWriter(writer).use { pw -> print(pw, x) }
+        return writer.toString()
+    }
+
+    fun toString(min: FunctionMinimum?): String {
+        val writer: java.io.StringWriter = java.io.StringWriter()
+        PrintWriter(writer).use { pw -> print(pw, min) }
+        return writer.toString()
+    }
+
+    fun toString(x: MinimumState?): String {
+        val writer: java.io.StringWriter = java.io.StringWriter()
+        PrintWriter(writer).use { pw -> print(pw, x) }
+        return writer.toString()
+    }
+
+    fun toString(x: MnUserParameters?): String {
+        val writer: java.io.StringWriter = java.io.StringWriter()
+        PrintWriter(writer).use { pw -> print(pw, x) }
+        return writer.toString()
+    }
+
+    fun toString(x: MnUserCovariance?): String {
+        val writer: java.io.StringWriter = java.io.StringWriter()
+        PrintWriter(writer).use { pw -> print(pw, x) }
+        return writer.toString()
+    }
+
+    fun toString(x: MnGlobalCorrelationCoeff?): String {
+        val writer: java.io.StringWriter = java.io.StringWriter()
+        PrintWriter(writer).use { pw -> print(pw, x) }
+        return writer.toString()
+    }
+
+    fun toString(x: MnUserParameterState?): String {
+        val writer: java.io.StringWriter = java.io.StringWriter()
+        PrintWriter(writer).use { pw -> print(pw, x) }
+        return writer.toString()
+    }
+
+    fun toString(x: MinosError?): String {
+        val writer: java.io.StringWriter = java.io.StringWriter()
+        PrintWriter(writer).use { pw -> print(pw, x) }
+        return writer.toString()
+    }
+
+    fun toString(x: ContoursError?): String {
+        val writer: java.io.StringWriter = java.io.StringWriter()
+        PrintWriter(writer).use { pw -> print(pw, x) }
+        return writer.toString()
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnScan.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnScan.kt
new file mode 100644
index 000000000..63e565b4f
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnScan.kt
@@ -0,0 +1,181 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+import ru.inr.mass.minuit.*
+
+/**
+ * MnScan scans the value of the user function by varying one parameter. It is
+ * sometimes useful for debugging the user function or finding a reasonable
+ * starting point.
+ * construct from MultiFunction + MnUserParameterState + MnStrategy
+ *
+ * @param str a [hep.dataforge.MINUIT.MnStrategy] object.
+ * @param par a [hep.dataforge.MINUIT.MnUserParameterState] object.
+ * @param fcn a [MultiFunction] object.
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnScan(fcn: MultiFunction?, par: MnUserParameterState, str: MnStrategy) : MnApplication(fcn, par, str) {
+    private val theMinimizer: ScanMinimizer = ScanMinimizer()
+
+    /**
+     * construct from MultiFunction + double[] for parameters and errors
+     * with default strategy
+     *
+     * @param err an array of double.
+     * @param par an array of double.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, err: DoubleArray) : this(fcn, par, err, DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + double[] for parameters and errors
+     *
+     * @param stra a int.
+     * @param err an array of double.
+     * @param fcn a [MultiFunction] object.
+     * @param par an array of double.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, err: DoubleArray, stra: Int) : this(fcn,
+        MnUserParameterState(par, err),
+        MnStrategy(stra))
+
+    /**
+     * construct from MultiFunction + double[] for parameters and
+     * MnUserCovariance with default strategy
+     *
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param par an array of double.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, cov: MnUserCovariance) : this(fcn, par, cov, DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + double[] for parameters and
+     * MnUserCovariance
+     *
+     * @param stra a int.
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param fcn a [MultiFunction] object.
+     * @param par an array of double.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, cov: MnUserCovariance, stra: Int) : this(fcn,
+        MnUserParameterState(par, cov),
+        MnStrategy(stra))
+
+    /**
+     * construct from MultiFunction + MnUserParameters with default
+     * strategy
+     *
+     * @param fcn a [MultiFunction] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters) : this(fcn, par, DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + MnUserParameters
+     *
+     * @param stra a int.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters, stra: Int) : this(fcn,
+        MnUserParameterState(par),
+        MnStrategy(stra))
+
+    /**
+     * construct from MultiFunction + MnUserParameters + MnUserCovariance
+     * with default strategy
+     *
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters, cov: MnUserCovariance) : this(fcn,
+        par,
+        cov,
+        DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + MnUserParameters + MnUserCovariance
+     *
+     * @param stra a int.
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param fcn a [MultiFunction] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters, cov: MnUserCovariance, stra: Int) : this(fcn,
+        MnUserParameterState(par, cov),
+        MnStrategy(stra))
+
+    override fun minimizer(): ModularFunctionMinimizer {
+        return theMinimizer
+    }
+
+    /**
+     *
+     * scan.
+     *
+     * @param par a int.
+     * @return a [List] object.
+     */
+    fun scan(par: Int): List<Range> {
+        return scan(par, 41)
+    }
+
+    /**
+     *
+     * scan.
+     *
+     * @param par a int.
+     * @param maxsteps a int.
+     * @return a [List] object.
+     */
+    fun scan(par: Int, maxsteps: Int): List<Range> {
+        return scan(par, maxsteps, 0.0, 0.0)
+    }
+
+    /**
+     * Scans the value of the user function by varying parameter number par,
+     * leaving all other parameters fixed at the current value. If par is not
+     * specified, all variable parameters are scanned in sequence. The number of
+     * points npoints in the scan is 40 by default, and cannot exceed 100. The
+     * range of the scan is by default 2 standard deviations on each side of the
+     * current best value, but can be specified as from low to high. After each
+     * scan, if a new minimum is found, the best parameter values are retained
+     * as start values for future scans or minimizations. The curve resulting
+     * from each scan can be plotted on the output terminal using MnPlot in
+     * order to show the approximate behaviour of the function.
+     *
+     * @param high a double.
+     * @param par a int.
+     * @param maxsteps a int.
+     * @param low a double.
+     * @return a [List] object.
+     */
+    fun scan(par: Int, maxsteps: Int, low: Double, high: Double): List<Range> {
+        val scan = MnParameterScan(theFCN, theState.parameters())
+        var amin: Double = scan.fval()
+        val result: List<Range> = scan.scan(par, maxsteps, low, high)
+        if (scan.fval() < amin) {
+            theState.setValue(par, scan.parameters().value(par))
+            amin = scan.fval()
+        }
+        return result
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnSeedGenerator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnSeedGenerator.kt
new file mode 100644
index 000000000..cc3f9547e
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnSeedGenerator.kt
@@ -0,0 +1,107 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import space.kscience.kmath.optimization.minuit.MINUITPlugin
+import ru.inr.mass.minuit.*
+
+/**
+ *
+ * @version $Id$
+ */
+internal class MnSeedGenerator : MinimumSeedGenerator {
+    /** {@inheritDoc}  */
+    fun generate(fcn: MnFcn, gc: GradientCalculator, st: MnUserParameterState, stra: MnStrategy): MinimumSeed {
+        val n: Int = st.variableParameters()
+        val prec: MnMachinePrecision = st.precision()
+
+        // initial starting values
+        val x: RealVector = ArrayRealVector(n)
+        for (i in 0 until n) {
+            x.setEntry(i, st.intParameters()[i])
+        }
+        val fcnmin: Double = fcn.value(x)
+        val pa = MinimumParameters(x, fcnmin)
+        val dgrad: FunctionGradient
+        if (gc is AnalyticalGradientCalculator) {
+            val igc = InitialGradientCalculator(fcn, st.getTransformation(), stra)
+            val tmp: FunctionGradient = igc.gradient(pa)
+            val grd: FunctionGradient = gc.gradient(pa)
+            dgrad = FunctionGradient(grd.getGradient(), tmp.getGradientDerivative(), tmp.getStep())
+            if (gc.checkGradient()) {
+                val good = true
+                val hgc = HessianGradientCalculator(fcn, st.getTransformation(), MnStrategy(2))
+                val hgrd: Pair<FunctionGradient, RealVector> = hgc.deltaGradient(pa, dgrad)
+                for (i in 0 until n) {
+                    val provided: Double = grd.getGradient().getEntry(i)
+                    val calculated: Double = hgrd.getFirst().getGradient().getEntry(i)
+                    val delta: Double = hgrd.getSecond().getEntry(i)
+                    if (abs(calculated - provided) > delta) {
+                        MINUITPlugin.logStatic(""
+                                + "gradient discrepancy of external parameter \"%d\" "
+                                + "(internal parameter \"%d\") too large. Expected: \"%f\", provided: \"%f\"",
+                            st.getTransformation().extOfInt(i), i, provided, calculated)
+
+//                        
+//                        MINUITPlugin.logStatic("gradient discrepancy of external parameter "
+//                                + st.getTransformation().extOfInt(i) 
+//                                + " (internal parameter " + i + ") too large.");
+//                        good = false;
+                    }
+                }
+                if (!good) {
+                    MINUITPlugin.logStatic("Minuit does not accept user specified gradient.")
+                    //               assert(good);
+                }
+            }
+        } else {
+            dgrad = gc.gradient(pa)
+        }
+        val mat = MnAlgebraicSymMatrix(n)
+        var dcovar = 1.0
+        if (st.hasCovariance()) {
+            for (i in 0 until n) {
+                for (j in i until n) {
+                    mat[i, j] = st.intCovariance()[i, j]
+                }
+            }
+            dcovar = 0.0
+        } else {
+            for (i in 0 until n) {
+                mat[i, i] = if (abs(dgrad.getGradientDerivative()
+                        .getEntry(i)) > prec.eps2()
+                ) 1.0 / dgrad.getGradientDerivative().getEntry(i) else 1.0
+            }
+        }
+        val err = MinimumError(mat, dcovar)
+        val edm: Double = VariableMetricEDMEstimator().estimate(dgrad, err)
+        var state = MinimumState(pa, err, dgrad, edm, fcn.numOfCalls())
+        if (NegativeG2LineSearch.hasNegativeG2(dgrad, prec)) {
+            state = if (gc is AnalyticalGradientCalculator) {
+                val ngc = Numerical2PGradientCalculator(fcn, st.getTransformation(), stra)
+                NegativeG2LineSearch.search(fcn, state, ngc, prec)
+            } else {
+                NegativeG2LineSearch.search(fcn, state, gc, prec)
+            }
+        }
+        if (stra.strategy() === 2 && !st.hasCovariance()) {
+            //calculate full 2nd derivative
+            val tmp: MinimumState = MnHesse(stra).calculate(fcn, state, st.getTransformation(), 0)
+            return MinimumSeed(tmp, st.getTransformation())
+        }
+        return MinimumSeed(state, st.getTransformation())
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnSimplex.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnSimplex.kt
new file mode 100644
index 000000000..b00745f26
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnSimplex.kt
@@ -0,0 +1,138 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+import ru.inr.mass.minuit.*
+
+/**
+ * SIMPLEX is a function minimization method using the simplex method of Nelder
+ * and Mead. MnSimplex provides minimization of the function by the method of
+ * SIMPLEX and the functionality for parameters interaction. It also retains the
+ * result from the last minimization in case the user may want to do subsequent
+ * minimization steps with parameter interactions in between the minimization
+ * requests. As SIMPLEX is a stepping method it does not produce a covariance
+ * matrix.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnSimplex
+/**
+ * construct from MultiFunction + MnUserParameterState + MnStrategy
+ *
+ * @param str a [hep.dataforge.MINUIT.MnStrategy] object.
+ * @param par a [hep.dataforge.MINUIT.MnUserParameterState] object.
+ * @param fcn a [MultiFunction] object.
+ */
+    (fcn: MultiFunction?, par: MnUserParameterState, str: MnStrategy) : MnApplication(fcn, par, str) {
+    private val theMinimizer: SimplexMinimizer = SimplexMinimizer()
+
+    /**
+     * construct from MultiFunction + double[] for parameters and errors
+     * with default strategy
+     *
+     * @param err an array of double.
+     * @param par an array of double.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, err: DoubleArray) : this(fcn, par, err, DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + double[] for parameters and errors
+     *
+     * @param stra a int.
+     * @param err an array of double.
+     * @param fcn a [MultiFunction] object.
+     * @param par an array of double.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, err: DoubleArray, stra: Int) : this(fcn,
+        MnUserParameterState(par, err),
+        MnStrategy(stra))
+
+    /**
+     * construct from MultiFunction + double[] for parameters and
+     * MnUserCovariance with default strategy
+     *
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param par an array of double.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, cov: MnUserCovariance) : this(fcn, par, cov, DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + double[] for parameters and
+     * MnUserCovariance
+     *
+     * @param stra a int.
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param fcn a [MultiFunction] object.
+     * @param par an array of double.
+     */
+    constructor(fcn: MultiFunction?, par: DoubleArray, cov: MnUserCovariance, stra: Int) : this(fcn,
+        MnUserParameterState(par, cov),
+        MnStrategy(stra))
+
+    /**
+     * construct from MultiFunction + MnUserParameters with default
+     * strategy
+     *
+     * @param fcn a [MultiFunction] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters) : this(fcn, par, DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + MnUserParameters
+     *
+     * @param stra a int.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters, stra: Int) : this(fcn,
+        MnUserParameterState(par),
+        MnStrategy(stra))
+
+    /**
+     * construct from MultiFunction + MnUserParameters + MnUserCovariance
+     * with default strategy
+     *
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     * @param fcn a [MultiFunction] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters, cov: MnUserCovariance) : this(fcn,
+        par,
+        cov,
+        DEFAULT_STRATEGY)
+
+    /**
+     * construct from MultiFunction + MnUserParameters + MnUserCovariance
+     *
+     * @param stra a int.
+     * @param cov a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     * @param fcn a [MultiFunction] object.
+     * @param par a [hep.dataforge.MINUIT.MnUserParameters] object.
+     */
+    constructor(fcn: MultiFunction?, par: MnUserParameters, cov: MnUserCovariance, stra: Int) : this(fcn,
+        MnUserParameterState(par, cov),
+        MnStrategy(stra))
+
+    /** {@inheritDoc}  */
+    override fun minimizer(): ModularFunctionMinimizer {
+        return theMinimizer
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnStrategy.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnStrategy.kt
new file mode 100644
index 000000000..31b894665
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnStrategy.kt
@@ -0,0 +1,310 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ * API class for defining three levels of strategies: low (0), medium (1), high
+ * (2).
+ *
+ *
+ * At many places in the analysis of the FCN (the user provided function),
+ * MINUIT must decide whether to be <I>safe</I> and waste a few function calls
+ * in order to know where it is, or to be <I>fast</I> and attempt to get the
+ * requested results with the fewest possible calls at a certain risk of not
+ * obtaining the precision desired by the user. In order to allow the user to
+ * infuence these decisions, the MnStrategy class allows the user to control
+ * different settings. MnStrategy can be instantiated with three different
+ * minimization quality levels for low (0), medium (1) and high (2) quality.
+ * Default settings for iteration cycles and tolerances are initialized then.
+ *
+ *
+ * The default setting is set for medium quality. Value 0 (low) indicates to
+ * MINUIT that it should economize function calls; it is intended for cases
+ * where there are many variable parameters and/or the function takes a long
+ * time to calculate and/or the user is not interested in very precise values
+ * for parameter errors. On the other hand, value 2 (high) indicates that MINUIT
+ * is allowed to waste function calls in order to be sure that all values are
+ * precise; it is it is intended for cases where the function is evaluated in a
+ * relatively short time and/or where the parameter errors must be calculated
+ * reliably.
+ *
+ * In addition all constants set in MnStrategy can be changed individually by
+ * the user, e.g. the number of iteration cycles in the numerical gradient.
+ *
+ *
+ *
+ *
+ * Acts on: Migrad (behavioural), Minos (lowers strategy by 1 for Minos-own
+ * minimization), Hesse (iterations), Numerical2PDerivative (iterations)
+ *
+ * @author Darksnake
+ * @version $Id$
+ */
+class MnStrategy {
+    private var theGradNCyc = 0
+    private var theGradTlr = 0.0
+    private var theGradTlrStp = 0.0
+    private var theHessGradNCyc = 0
+
+    //default strategy
+    private var theHessNCyc = 0
+    private var theHessTlrG2 = 0.0
+    private var theHessTlrStp = 0.0
+    private var theStrategy = 0
+
+    /**
+     * Creates a MnStrategy object with the default strategy (medium)
+     */
+    constructor() {
+        setMediumStrategy()
+    }
+    //user defined strategy (0, 1, >=2)
+    /**
+     * Creates a MnStrategy object with the user specified strategy.
+     *
+     * @param stra The use defined strategy, 0=low, 1 medium, 2=high.
+     */
+    constructor(stra: Int) {
+        if (stra == 0) {
+            setLowStrategy()
+        } else if (stra == 1) {
+            setMediumStrategy()
+        } else {
+            setHighStrategy()
+        }
+    }
+
+    /**
+     *
+     * gradientNCycles.
+     *
+     * @return a int.
+     */
+    fun gradientNCycles(): Int {
+        return theGradNCyc
+    }
+
+    /**
+     *
+     * gradientStepTolerance.
+     *
+     * @return a double.
+     */
+    fun gradientStepTolerance(): Double {
+        return theGradTlrStp
+    }
+
+    /**
+     *
+     * gradientTolerance.
+     *
+     * @return a double.
+     */
+    fun gradientTolerance(): Double {
+        return theGradTlr
+    }
+
+    /**
+     *
+     * hessianG2Tolerance.
+     *
+     * @return a double.
+     */
+    fun hessianG2Tolerance(): Double {
+        return theHessTlrG2
+    }
+
+    /**
+     *
+     * hessianGradientNCycles.
+     *
+     * @return a int.
+     */
+    fun hessianGradientNCycles(): Int {
+        return theHessGradNCyc
+    }
+
+    /**
+     *
+     * hessianNCycles.
+     *
+     * @return a int.
+     */
+    fun hessianNCycles(): Int {
+        return theHessNCyc
+    }
+
+    /**
+     *
+     * hessianStepTolerance.
+     *
+     * @return a double.
+     */
+    fun hessianStepTolerance(): Double {
+        return theHessTlrStp
+    }
+
+    /**
+     *
+     * isHigh.
+     *
+     * @return a boolean.
+     */
+    fun isHigh(): Boolean {
+        return theStrategy >= 2
+    }
+
+    /**
+     *
+     * isLow.
+     *
+     * @return a boolean.
+     */
+    fun isLow(): Boolean {
+        return theStrategy <= 0
+    }
+
+    /**
+     *
+     * isMedium.
+     *
+     * @return a boolean.
+     */
+    fun isMedium(): Boolean {
+        return theStrategy == 1
+    }
+
+    /**
+     *
+     * setGradientNCycles.
+     *
+     * @param n a int.
+     */
+    fun setGradientNCycles(n: Int) {
+        theGradNCyc = n
+    }
+
+    /**
+     *
+     * setGradientStepTolerance.
+     *
+     * @param stp a double.
+     */
+    fun setGradientStepTolerance(stp: Double) {
+        theGradTlrStp = stp
+    }
+
+    /**
+     *
+     * setGradientTolerance.
+     *
+     * @param toler a double.
+     */
+    fun setGradientTolerance(toler: Double) {
+        theGradTlr = toler
+    }
+
+    /**
+     *
+     * setHessianG2Tolerance.
+     *
+     * @param toler a double.
+     */
+    fun setHessianG2Tolerance(toler: Double) {
+        theHessTlrG2 = toler
+    }
+
+    /**
+     *
+     * setHessianGradientNCycles.
+     *
+     * @param n a int.
+     */
+    fun setHessianGradientNCycles(n: Int) {
+        theHessGradNCyc = n
+    }
+
+    /**
+     *
+     * setHessianNCycles.
+     *
+     * @param n a int.
+     */
+    fun setHessianNCycles(n: Int) {
+        theHessNCyc = n
+    }
+
+    /**
+     *
+     * setHessianStepTolerance.
+     *
+     * @param stp a double.
+     */
+    fun setHessianStepTolerance(stp: Double) {
+        theHessTlrStp = stp
+    }
+
+    fun setHighStrategy() {
+        theStrategy = 2
+        setGradientNCycles(5)
+        setGradientStepTolerance(0.1)
+        setGradientTolerance(0.02)
+        setHessianNCycles(7)
+        setHessianStepTolerance(0.1)
+        setHessianG2Tolerance(0.02)
+        setHessianGradientNCycles(6)
+    }
+
+    /**
+     *
+     * setLowStrategy.
+     */
+    fun setLowStrategy() {
+        theStrategy = 0
+        setGradientNCycles(2)
+        setGradientStepTolerance(0.5)
+        setGradientTolerance(0.1)
+        setHessianNCycles(3)
+        setHessianStepTolerance(0.5)
+        setHessianG2Tolerance(0.1)
+        setHessianGradientNCycles(1)
+    }
+
+    /**
+     *
+     * setMediumStrategy.
+     */
+    fun setMediumStrategy() {
+        theStrategy = 1
+        setGradientNCycles(3)
+        setGradientStepTolerance(0.3)
+        setGradientTolerance(0.05)
+        setHessianNCycles(5)
+        setHessianStepTolerance(0.3)
+        setHessianG2Tolerance(0.05)
+        setHessianGradientNCycles(2)
+    }
+
+    /**
+     *
+     * strategy.
+     *
+     * @return a int.
+     */
+    fun strategy(): Int {
+        return theStrategy
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserCovariance.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserCovariance.kt
new file mode 100644
index 000000000..297588f8e
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserCovariance.kt
@@ -0,0 +1,147 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ * MnUserCovariance is the external covariance matrix designed for the
+ * interaction of the user. The result of the minimization (internal covariance
+ * matrix) is converted into the user representable format. It can also be used
+ * as input prior to the minimization. The size of the covariance matrix is
+ * according to the number of variable parameters (free and limited).
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnUserCovariance {
+    private var theData: DoubleArray
+    private var theNRow: Int
+
+    private constructor(other: MnUserCovariance) {
+        theData = other.theData.clone()
+        theNRow = other.theNRow
+    }
+
+    internal constructor() {
+        theData = DoubleArray(0)
+        theNRow = 0
+    }
+
+    /*
+     * covariance matrix is stored in upper triangular packed storage format,
+     * e.g. the elements in the array are arranged like
+     * {a(0,0), a(0,1), a(1,1), a(0,2), a(1,2), a(2,2), ...},
+     * the size is nrow*(nrow+1)/2.
+     */
+    internal constructor(data: DoubleArray, nrow: Int) {
+        require(data.size == nrow * (nrow + 1) / 2) { "Inconsistent arguments" }
+        theData = data
+        theNRow = nrow
+    }
+
+    /**
+     *
+     * Constructor for MnUserCovariance.
+     *
+     * @param nrow a int.
+     */
+    constructor(nrow: Int) {
+        theData = DoubleArray(nrow * (nrow + 1) / 2)
+        theNRow = nrow
+    }
+
+    /**
+     *
+     * copy.
+     *
+     * @return a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     */
+    fun copy(): MnUserCovariance {
+        return MnUserCovariance(this)
+    }
+
+    fun data(): DoubleArray {
+        return theData
+    }
+
+    /**
+     *
+     * get.
+     *
+     * @param row a int.
+     * @param col a int.
+     * @return a double.
+     */
+    operator fun get(row: Int, col: Int): Double {
+        require(!(row >= theNRow || col >= theNRow))
+        return if (row > col) {
+            theData[col + row * (row + 1) / 2]
+        } else {
+            theData[row + col * (col + 1) / 2]
+        }
+    }
+
+    /**
+     *
+     * ncol.
+     *
+     * @return a int.
+     */
+    fun ncol(): Int {
+        return theNRow
+    }
+
+    /**
+     *
+     * nrow.
+     *
+     * @return a int.
+     */
+    fun nrow(): Int {
+        return theNRow
+    }
+
+    fun scale(f: Double) {
+        for (i in theData.indices) {
+            theData[i] *= f
+        }
+    }
+
+    /**
+     *
+     * set.
+     *
+     * @param row a int.
+     * @param col a int.
+     * @param value a double.
+     */
+    operator fun set(row: Int, col: Int, value: Double) {
+        require(!(row >= theNRow || col >= theNRow))
+        if (row > col) {
+            theData[col + row * (row + 1) / 2] = value
+        } else {
+            theData[row + col * (col + 1) / 2] = value
+        }
+    }
+
+    fun size(): Int {
+        return theData.size
+    }
+
+    /** {@inheritDoc}  */
+    override fun toString(): String {
+        return MnPrint.toString(this)
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserFcn.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserFcn.kt
new file mode 100644
index 000000000..8198a41ab
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserFcn.kt
@@ -0,0 +1,30 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+
+/**
+ *
+ * @version $Id$
+ */
+internal class MnUserFcn(fcn: MultiFunction?, errDef: Double, trafo: MnUserTransformation) : MnFcn(fcn, errDef) {
+    private val theTransform: MnUserTransformation = trafo
+    override fun value(v: RealVector): Double {
+        return super.value(theTransform.transform(v))
+    }
+
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserParameterState.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserParameterState.kt
new file mode 100644
index 000000000..e80dd60a1
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserParameterState.kt
@@ -0,0 +1,756 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.minuit.*
+
+/**
+ * The class MnUserParameterState contains the MnUserParameters and the
+ * MnUserCovariance. It can be created on input by the user, or by MINUIT itself
+ * as user representable format of the result of the minimization.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnUserParameterState {
+    private var theCovariance: MnUserCovariance
+    private var theCovarianceValid = false
+    private var theEDM = 0.0
+    private var theFVal = 0.0
+    private var theGCCValid = false
+    private var theGlobalCC: MnGlobalCorrelationCoeff? = null
+    private var theIntCovariance: MnUserCovariance
+    private var theIntParameters: MutableList<Double>
+    private var theNFcn = 0
+    private var theParameters: MnUserParameters
+    private var theValid: Boolean
+
+    internal constructor() {
+        theValid = false
+        theCovarianceValid = false
+        theParameters = MnUserParameters()
+        theCovariance = MnUserCovariance()
+        theIntParameters = java.util.ArrayList<Double>()
+        theIntCovariance = MnUserCovariance()
+    }
+
+    private constructor(other: MnUserParameterState) {
+        theValid = other.theValid
+        theCovarianceValid = other.theCovarianceValid
+        theGCCValid = other.theGCCValid
+        theFVal = other.theFVal
+        theEDM = other.theEDM
+        theNFcn = other.theNFcn
+        theParameters = other.theParameters.copy()
+        theCovariance = other.theCovariance
+        theGlobalCC = other.theGlobalCC
+        theIntParameters = java.util.ArrayList<Double>(other.theIntParameters)
+        theIntCovariance = other.theIntCovariance.copy()
+    }
+
+    /**
+     * construct from user parameters (before minimization)
+     * @param par
+     * @param err
+     */
+    internal constructor(par: DoubleArray, err: DoubleArray) {
+        theValid = true
+        theParameters = MnUserParameters(par, err)
+        theCovariance = MnUserCovariance()
+        theGlobalCC = MnGlobalCorrelationCoeff()
+        theIntParameters = java.util.ArrayList<Double>(par.size)
+        for (i in par.indices) {
+            theIntParameters.add(par[i])
+        }
+        theIntCovariance = MnUserCovariance()
+    }
+
+    internal constructor(par: MnUserParameters) {
+        theValid = true
+        theParameters = par
+        theCovariance = MnUserCovariance()
+        theGlobalCC = MnGlobalCorrelationCoeff()
+        theIntParameters = java.util.ArrayList(par.variableParameters())
+        theIntCovariance = MnUserCovariance()
+        val i = 0
+        for (ipar in par.parameters()) {
+            if (ipar.isConst() || ipar.isFixed()) {
+                continue
+            }
+            if (ipar.hasLimits()) {
+                theIntParameters.add(ext2int(ipar.number(), ipar.value()))
+            } else {
+                theIntParameters.add(ipar.value())
+            }
+        }
+    }
+
+    /**
+     * construct from user parameters + covariance (before minimization)
+     * @param nrow
+     * @param cov
+     */
+    internal constructor(par: DoubleArray, cov: DoubleArray, nrow: Int) {
+        theValid = true
+        theCovarianceValid = true
+        theCovariance = MnUserCovariance(cov, nrow)
+        theGlobalCC = MnGlobalCorrelationCoeff()
+        theIntParameters = java.util.ArrayList<Double>(par.size)
+        theIntCovariance = MnUserCovariance(cov, nrow)
+        val err = DoubleArray(par.size)
+        for (i in par.indices) {
+            assert(theCovariance[i, i] > 0.0)
+            err[i] = sqrt(theCovariance[i, i])
+            theIntParameters.add(par[i])
+        }
+        theParameters = MnUserParameters(par, err)
+        assert(theCovariance.nrow() === variableParameters())
+    }
+
+    internal constructor(par: DoubleArray, cov: MnUserCovariance) {
+        theValid = true
+        theCovarianceValid = true
+        theCovariance = cov
+        theGlobalCC = MnGlobalCorrelationCoeff()
+        theIntParameters = java.util.ArrayList<Double>(par.size)
+        theIntCovariance = cov.copy()
+        require(!(theCovariance.nrow() !== variableParameters())) { "Bad covariance size" }
+        val err = DoubleArray(par.size)
+        for (i in par.indices) {
+            require(theCovariance[i, i] > 0.0) { "Bad covariance" }
+            err[i] = sqrt(theCovariance[i, i])
+            theIntParameters.add(par[i])
+        }
+        theParameters = MnUserParameters(par, err)
+    }
+
+    internal constructor(par: MnUserParameters, cov: MnUserCovariance) {
+        theValid = true
+        theCovarianceValid = true
+        theParameters = par
+        theCovariance = cov
+        theGlobalCC = MnGlobalCorrelationCoeff()
+        theIntParameters = java.util.ArrayList<Double>()
+        theIntCovariance = cov.copy()
+        theIntCovariance.scale(0.5)
+        val i = 0
+        for (ipar in par.parameters()) {
+            if (ipar.isConst() || ipar.isFixed()) {
+                continue
+            }
+            if (ipar.hasLimits()) {
+                theIntParameters.add(ext2int(ipar.number(), ipar.value()))
+            } else {
+                theIntParameters.add(ipar.value())
+            }
+        }
+        assert(theCovariance.nrow() === variableParameters())
+    }
+
+    /**
+     * construct from internal parameters (after minimization)
+     * @param trafo
+     * @param up
+     */
+    internal constructor(st: MinimumState, up: Double, trafo: MnUserTransformation) {
+        theValid = st.isValid()
+        theCovarianceValid = false
+        theGCCValid = false
+        theFVal = st.fval()
+        theEDM = st.edm()
+        theNFcn = st.nfcn()
+        theParameters = MnUserParameters()
+        theCovariance = MnUserCovariance()
+        theGlobalCC = MnGlobalCorrelationCoeff()
+        theIntParameters = java.util.ArrayList<Double>()
+        theIntCovariance = MnUserCovariance()
+        for (ipar in trafo.parameters()) {
+            if (ipar.isConst()) {
+                add(ipar.name(), ipar.value())
+            } else if (ipar.isFixed()) {
+                add(ipar.name(), ipar.value(), ipar.error())
+                if (ipar.hasLimits()) {
+                    if (ipar.hasLowerLimit() && ipar.hasUpperLimit()) {
+                        setLimits(ipar.name(), ipar.lowerLimit(), ipar.upperLimit())
+                    } else if (ipar.hasLowerLimit() && !ipar.hasUpperLimit()) {
+                        setLowerLimit(ipar.name(), ipar.lowerLimit())
+                    } else {
+                        setUpperLimit(ipar.name(), ipar.upperLimit())
+                    }
+                }
+                fix(ipar.name())
+            } else if (ipar.hasLimits()) {
+                val i: Int = trafo.intOfExt(ipar.number())
+                val err: Double = if (st.hasCovariance()) sqrt(2.0 * up * st.error().invHessian()[i, i]) else st.parameters().dirin().getEntry(i)
+                add(ipar.name(),
+                    trafo.int2ext(i, st.vec().getEntry(i)),
+                    trafo.int2extError(i, st.vec().getEntry(i), err))
+                if (ipar.hasLowerLimit() && ipar.hasUpperLimit()) {
+                    setLimits(ipar.name(), ipar.lowerLimit(), ipar.upperLimit())
+                } else if (ipar.hasLowerLimit() && !ipar.hasUpperLimit()) {
+                    setLowerLimit(ipar.name(), ipar.lowerLimit())
+                } else {
+                    setUpperLimit(ipar.name(), ipar.upperLimit())
+                }
+            } else {
+                val i: Int = trafo.intOfExt(ipar.number())
+                val err: Double = if (st.hasCovariance()) sqrt(2.0 * up * st.error().invHessian()[i, i]) else st.parameters().dirin().getEntry(i)
+                add(ipar.name(), st.vec().getEntry(i), err)
+            }
+        }
+        theCovarianceValid = st.error().isValid()
+        if (theCovarianceValid) {
+            theCovariance = trafo.int2extCovariance(st.vec(), st.error().invHessian())
+            theIntCovariance = MnUserCovariance(st.error().invHessian().data().clone(), st.error().invHessian().nrow())
+            theCovariance.scale(2.0 * up)
+            theGlobalCC = MnGlobalCorrelationCoeff(st.error().invHessian())
+            theGCCValid = true
+            assert(theCovariance.nrow() === variableParameters())
+        }
+    }
+
+    /**
+     * add free parameter name, value, error
+     *
+     * @param err a double.
+     * @param val a double.
+     * @param name a [String] object.
+     */
+    fun add(name: String, `val`: Double, err: Double) {
+        theParameters.add(name, `val`, err)
+        theIntParameters.add(`val`)
+        theCovarianceValid = false
+        theGCCValid = false
+        theValid = true
+    }
+
+    /**
+     * add limited parameter name, value, lower bound, upper bound
+     *
+     * @param name a [String] object.
+     * @param val a double.
+     * @param low a double.
+     * @param err a double.
+     * @param up a double.
+     */
+    fun add(name: String, `val`: Double, err: Double, low: Double, up: Double) {
+        theParameters.add(name, `val`, err, low, up)
+        theCovarianceValid = false
+        theIntParameters.add(ext2int(index(name), `val`))
+        theGCCValid = false
+        theValid = true
+    }
+
+    /**
+     * add const parameter name, value
+     *
+     * @param name a [String] object.
+     * @param val a double.
+     */
+    fun add(name: String, `val`: Double) {
+        theParameters.add(name, `val`)
+        theValid = true
+    }
+
+    /**
+     *
+     * copy.
+     *
+     * @return a [hep.dataforge.MINUIT.MnUserParameterState] object.
+     */
+    fun copy(): MnUserParameterState {
+        return MnUserParameterState(this)
+    }
+
+    /**
+     * Covariance matrix in the external representation
+     *
+     * @return a [hep.dataforge.MINUIT.MnUserCovariance] object.
+     */
+    fun covariance(): MnUserCovariance {
+        return theCovariance
+    }
+
+    /**
+     * Returns the expected vertival distance to the minimum (EDM)
+     *
+     * @return a double.
+     */
+    fun edm(): Double {
+        return theEDM
+    }
+
+    /**
+     *
+     * error.
+     *
+     * @param index a int.
+     * @return a double.
+     */
+    fun error(index: Int): Double {
+        return theParameters.error(index)
+    }
+
+    /**
+     *
+     * error.
+     *
+     * @param name a [String] object.
+     * @return a double.
+     */
+    fun error(name: String?): Double {
+        return error(index(name))
+    }
+
+    /**
+     *
+     * errors.
+     *
+     * @return an array of double.
+     */
+    fun errors(): DoubleArray {
+        return theParameters.errors()
+    }
+
+    fun ext2int(i: Int, `val`: Double): Double {
+        return theParameters.trafo().ext2int(i, `val`)
+    }
+
+    /**
+     *
+     * extOfInt.
+     *
+     * @param internal a int.
+     * @return a int.
+     */
+    fun extOfInt(internal: Int): Int {
+        return theParameters.trafo().extOfInt(internal)
+    }
+    /// interaction via external number of parameter
+    /**
+     *
+     * fix.
+     *
+     * @param e a int.
+     */
+    fun fix(e: Int) {
+        val i = intOfExt(e)
+        if (theCovarianceValid) {
+            theCovariance = MnCovarianceSqueeze.squeeze(theCovariance, i)
+            theIntCovariance = MnCovarianceSqueeze.squeeze(theIntCovariance, i)
+        }
+        theIntParameters.removeAt(i)
+        theParameters.fix(e)
+        theGCCValid = false
+    }
+    /// interaction via name of parameter
+    /**
+     *
+     * fix.
+     *
+     * @param name a [String] object.
+     */
+    fun fix(name: String?) {
+        fix(index(name))
+    }
+
+    /**
+     * returns the function value at the minimum
+     *
+     * @return a double.
+     */
+    fun fval(): Double {
+        return theFVal
+    }
+
+    /**
+     * transformation internal <-> external
+     * @return
+     */
+    fun getTransformation(): MnUserTransformation {
+        return theParameters.trafo()
+    }
+
+    fun globalCC(): MnGlobalCorrelationCoeff? {
+        return theGlobalCC
+    }
+
+    /**
+     * Returns
+     * <CODE>true</CODE> if the the state has a valid covariance,
+     * <CODE>false</CODE> otherwise.
+     *
+     * @return a boolean.
+     */
+    fun hasCovariance(): Boolean {
+        return theCovarianceValid
+    }
+
+    /**
+     *
+     * hasGlobalCC.
+     *
+     * @return a boolean.
+     */
+    fun hasGlobalCC(): Boolean {
+        return theGCCValid
+    }
+
+    /**
+     * convert name into external number of parameter
+     *
+     * @param name a [String] object.
+     * @return a int.
+     */
+    fun index(name: String?): Int {
+        return theParameters.index(name)
+    }
+
+    // transformation internal <-> external
+    fun int2ext(i: Int, `val`: Double): Double {
+        return theParameters.trafo().int2ext(i, `val`)
+    }
+
+    fun intCovariance(): MnUserCovariance {
+        return theIntCovariance
+    }
+
+    fun intOfExt(ext: Int): Int {
+        return theParameters.trafo().intOfExt(ext)
+    }
+
+    /**
+     * Minuit internal representation
+     * @return
+     */
+    fun intParameters(): List<Double> {
+        return theIntParameters
+    }
+
+    /**
+     * Returns
+     * <CODE>true</CODE> if the the state is valid,
+     * <CODE>false</CODE> if not
+     *
+     * @return a boolean.
+     */
+    fun isValid(): Boolean {
+        return theValid
+    }
+
+    // facade: forward interface of MnUserParameters and MnUserTransformation
+    fun minuitParameters(): List<MinuitParameter> {
+        return theParameters.parameters()
+    }
+
+    /**
+     * convert external number into name of parameter
+     *
+     * @param index a int.
+     * @return a [String] object.
+     */
+    fun name(index: Int): String {
+        return theParameters.name(index)
+    }
+
+    /**
+     * Returns the number of function calls during the minimization.
+     *
+     * @return a int.
+     */
+    fun nfcn(): Int {
+        return theNFcn
+    }
+
+    fun parameter(i: Int): MinuitParameter {
+        return theParameters.parameter(i)
+    }
+
+    //user external representation
+    fun parameters(): MnUserParameters {
+        return theParameters
+    }
+
+    /**
+     * access to parameters and errors in column-wise representation
+     *
+     * @return an array of double.
+     */
+    fun params(): DoubleArray {
+        return theParameters.params()
+    }
+
+    /**
+     *
+     * precision.
+     *
+     * @return a [hep.dataforge.MINUIT.MnMachinePrecision] object.
+     */
+    fun precision(): MnMachinePrecision {
+        return theParameters.precision()
+    }
+
+    /**
+     *
+     * release.
+     *
+     * @param e a int.
+     */
+    fun release(e: Int) {
+        theParameters.release(e)
+        theCovarianceValid = false
+        theGCCValid = false
+        val i = intOfExt(e)
+        if (parameter(e).hasLimits()) {
+            theIntParameters.add(i, ext2int(e, parameter(e).value()))
+        } else {
+            theIntParameters.add(i, parameter(e).value())
+        }
+    }
+
+    /**
+     *
+     * release.
+     *
+     * @param name a [String] object.
+     */
+    fun release(name: String?) {
+        release(index(name))
+    }
+
+    /**
+     *
+     * removeLimits.
+     *
+     * @param e a int.
+     */
+    fun removeLimits(e: Int) {
+        theParameters.removeLimits(e)
+        theCovarianceValid = false
+        theGCCValid = false
+        if (!parameter(e).isFixed() && !parameter(e).isConst()) {
+            theIntParameters[intOfExt(e)] = value(e)
+        }
+    }
+
+    /**
+     *
+     * removeLimits.
+     *
+     * @param name a [String] object.
+     */
+    fun removeLimits(name: String?) {
+        removeLimits(index(name))
+    }
+
+    /**
+     *
+     * setError.
+     *
+     * @param e a int.
+     * @param err a double.
+     * @param err a double.
+     */
+    fun setError(e: Int, err: Double) {
+        theParameters.setError(e, err)
+    }
+
+    /**
+     *
+     * setError.
+     *
+     * @param name a [String] object.
+     * @param err a double.
+     */
+    fun setError(name: String?, err: Double) {
+        setError(index(name), err)
+    }
+
+    /**
+     *
+     * setLimits.
+     *
+     * @param e a int.
+     * @param low a double.
+     * @param up a double.
+     */
+    fun setLimits(e: Int, low: Double, up: Double) {
+        theParameters.setLimits(e, low, up)
+        theCovarianceValid = false
+        theGCCValid = false
+        if (!parameter(e).isFixed() && !parameter(e).isConst()) {
+            val i = intOfExt(e)
+            if (low < theIntParameters[i] && theIntParameters[i] < up) {
+                theIntParameters[i] = ext2int(e, theIntParameters[i])
+            } else {
+                theIntParameters[i] = ext2int(e, 0.5 * (low + up))
+            }
+        }
+    }
+
+    /**
+     *
+     * setLimits.
+     *
+     * @param name a [String] object.
+     * @param low a double.
+     * @param up a double.
+     */
+    fun setLimits(name: String?, low: Double, up: Double) {
+        setLimits(index(name), low, up)
+    }
+
+    /**
+     *
+     * setLowerLimit.
+     *
+     * @param e a int.
+     * @param low a double.
+     */
+    fun setLowerLimit(e: Int, low: Double) {
+        theParameters.setLowerLimit(e, low)
+        theCovarianceValid = false
+        theGCCValid = false
+        if (!parameter(e).isFixed() && !parameter(e).isConst()) {
+            val i = intOfExt(e)
+            if (low < theIntParameters[i]) {
+                theIntParameters[i] = ext2int(e, theIntParameters[i])
+            } else {
+                theIntParameters[i] = ext2int(e, low + 0.5 * abs(low + 1.0))
+            }
+        }
+    }
+
+    /**
+     *
+     * setLowerLimit.
+     *
+     * @param name a [String] object.
+     * @param low a double.
+     */
+    fun setLowerLimit(name: String?, low: Double) {
+        setLowerLimit(index(name), low)
+    }
+
+    /**
+     *
+     * setPrecision.
+     *
+     * @param eps a double.
+     */
+    fun setPrecision(eps: Double) {
+        theParameters.setPrecision(eps)
+    }
+
+    /**
+     *
+     * setUpperLimit.
+     *
+     * @param e a int.
+     * @param up a double.
+     */
+    fun setUpperLimit(e: Int, up: Double) {
+        theParameters.setUpperLimit(e, up)
+        theCovarianceValid = false
+        theGCCValid = false
+        if (!parameter(e).isFixed() && !parameter(e).isConst()) {
+            val i = intOfExt(e)
+            if (theIntParameters[i] < up) {
+                theIntParameters[i] = ext2int(e, theIntParameters[i])
+            } else {
+                theIntParameters[i] = ext2int(e, up - 0.5 * abs(up + 1.0))
+            }
+        }
+    }
+
+    /**
+     *
+     * setUpperLimit.
+     *
+     * @param name a [String] object.
+     * @param up a double.
+     */
+    fun setUpperLimit(name: String?, up: Double) {
+        setUpperLimit(index(name), up)
+    }
+
+    /**
+     *
+     * setValue.
+     *
+     * @param e a int.
+     * @param val a double.
+     */
+    fun setValue(e: Int, `val`: Double) {
+        theParameters.setValue(e, `val`)
+        if (!parameter(e).isFixed() && !parameter(e).isConst()) {
+            val i = intOfExt(e)
+            if (parameter(e).hasLimits()) {
+                theIntParameters[i] = ext2int(e, `val`)
+            } else {
+                theIntParameters[i] = `val`
+            }
+        }
+    }
+
+    /**
+     *
+     * setValue.
+     *
+     * @param name a [String] object.
+     * @param val a double.
+     */
+    fun setValue(name: String?, `val`: Double) {
+        setValue(index(name), `val`)
+    }
+
+    /** {@inheritDoc}  */
+    override fun toString(): String {
+        return MnPrint.toString(this)
+    }
+
+    /**
+     *
+     * value.
+     *
+     * @param index a int.
+     * @return a double.
+     */
+    fun value(index: Int): Double {
+        return theParameters.value(index)
+    }
+
+    /**
+     *
+     * value.
+     *
+     * @param name a [String] object.
+     * @return a double.
+     */
+    fun value(name: String?): Double {
+        return value(index(name))
+    }
+
+    /**
+     *
+     * variableParameters.
+     *
+     * @return a int.
+     */
+    fun variableParameters(): Int {
+        return theParameters.variableParameters()
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserParameters.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserParameters.kt
new file mode 100644
index 000000000..9bac54b25
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserParameters.kt
@@ -0,0 +1,402 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ * API class for the user interaction with the parameters. Serves as input to
+ * the minimizer as well as output from it; users can interact: fix/release
+ * parameters, set values and errors, etc.; parameters can be accessed via their
+ * parameter number or via their user-specified name.
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class MnUserParameters {
+    private var theTransformation: MnUserTransformation
+
+    /**
+     * Creates a new instance of MnUserParameters
+     */
+    constructor() {
+        theTransformation = MnUserTransformation()
+    }
+
+    /**
+     *
+     * Constructor for MnUserParameters.
+     *
+     * @param par an array of double.
+     * @param err an array of double.
+     */
+    constructor(par: DoubleArray, err: DoubleArray) {
+        theTransformation = MnUserTransformation(par, err)
+    }
+
+    private constructor(other: MnUserParameters) {
+        theTransformation = other.theTransformation.copy()
+    }
+
+    /**
+     * Add free parameter name, value, error
+     *
+     *
+     * When adding parameters, MINUIT assigns indices to each parameter which
+     * will be the same as in the double[] in the
+     * MultiFunction.valueOf(). That means the first parameter the user
+     * adds gets index 0, the second index 1, and so on. When calculating the
+     * function value inside FCN, MINUIT will call
+     * MultiFunction.valueOf() with the elements at their respective
+     * positions.
+     *
+     * @param err a double.
+     * @param val a double.
+     * @param name a [String] object.
+     */
+    fun add(name: String, `val`: Double, err: Double) {
+        theTransformation.add(name, `val`, err)
+    }
+
+    /**
+     * Add limited parameter name, value, lower bound, upper bound
+     *
+     * @param up a double.
+     * @param low a double.
+     * @param name a [String] object.
+     * @param val a double.
+     * @param err a double.
+     */
+    fun add(name: String, `val`: Double, err: Double, low: Double, up: Double) {
+        theTransformation.add(name, `val`, err, low, up)
+    }
+
+    /**
+     * Add const parameter name, value
+     *
+     * @param name a [String] object.
+     * @param val a double.
+     */
+    fun add(name: String, `val`: Double) {
+        theTransformation.add(name, `val`)
+    }
+
+    /**
+     *
+     * copy.
+     *
+     * @return a [hep.dataforge.MINUIT.MnUserParameters] object.
+     */
+    fun copy(): MnUserParameters {
+        return MnUserParameters(this)
+    }
+
+    /**
+     *
+     * error.
+     *
+     * @param index a int.
+     * @return a double.
+     */
+    fun error(index: Int): Double {
+        return theTransformation.error(index)
+    }
+
+    /**
+     *
+     * error.
+     *
+     * @param name a [String] object.
+     * @return a double.
+     */
+    fun error(name: String?): Double {
+        return theTransformation.error(name)
+    }
+
+    fun errors(): DoubleArray {
+        return theTransformation.errors()
+    }
+    /// interaction via external number of parameter
+    /**
+     * Fixes the specified parameter (so that the minimizer will no longer vary
+     * it)
+     *
+     * @param index a int.
+     */
+    fun fix(index: Int) {
+        theTransformation.fix(index)
+    }
+    /// interaction via name of parameter
+    /**
+     * Fixes the specified parameter (so that the minimizer will no longer vary
+     * it)
+     *
+     * @param name a [String] object.
+     */
+    fun fix(name: String?) {
+        theTransformation.fix(name)
+    }
+
+    /**
+     * convert name into external number of parameter
+     * @param name
+     * @return
+     */
+    fun index(name: String?): Int {
+        return theTransformation.index(name)
+    }
+
+    /**
+     * convert external number into name of parameter
+     * @param index
+     * @return
+     */
+    fun name(index: Int): String {
+        return theTransformation.name(index)
+    }
+
+    /**
+     * access to single parameter
+     * @param index
+     * @return
+     */
+    fun parameter(index: Int): MinuitParameter {
+        return theTransformation.parameter(index)
+    }
+
+    /**
+     * access to parameters (row-wise)
+     * @return
+     */
+    fun parameters(): List<MinuitParameter> {
+        return theTransformation.parameters()
+    }
+
+    /**
+     * access to parameters and errors in column-wise representation
+     * @return
+     */
+    fun params(): DoubleArray {
+        return theTransformation.params()
+    }
+
+    /**
+     *
+     * precision.
+     *
+     * @return a [hep.dataforge.MINUIT.MnMachinePrecision] object.
+     */
+    fun precision(): MnMachinePrecision {
+        return theTransformation.precision()
+    }
+
+    /**
+     * Releases the specified parameter (so that the minimizer can vary it)
+     *
+     * @param index a int.
+     */
+    fun release(index: Int) {
+        theTransformation.release(index)
+    }
+
+    /**
+     * Releases the specified parameter (so that the minimizer can vary it)
+     *
+     * @param name a [String] object.
+     */
+    fun release(name: String?) {
+        theTransformation.release(name)
+    }
+
+    /**
+     *
+     * removeLimits.
+     *
+     * @param index a int.
+     */
+    fun removeLimits(index: Int) {
+        theTransformation.removeLimits(index)
+    }
+
+    /**
+     *
+     * removeLimits.
+     *
+     * @param name a [String] object.
+     */
+    fun removeLimits(name: String?) {
+        theTransformation.removeLimits(name)
+    }
+
+    /**
+     *
+     * setError.
+     *
+     * @param index a int.
+     * @param err a double.
+     */
+    fun setError(index: Int, err: Double) {
+        theTransformation.setError(index, err)
+    }
+
+    /**
+     *
+     * setError.
+     *
+     * @param name a [String] object.
+     * @param err a double.
+     */
+    fun setError(name: String?, err: Double) {
+        theTransformation.setError(name, err)
+    }
+
+    /**
+     * Set the lower and upper bound on the specified variable.
+     *
+     * @param up a double.
+     * @param low a double.
+     * @param index a int.
+     */
+    fun setLimits(index: Int, low: Double, up: Double) {
+        theTransformation.setLimits(index, low, up)
+    }
+
+    /**
+     * Set the lower and upper bound on the specified variable.
+     *
+     * @param up a double.
+     * @param low a double.
+     * @param name a [String] object.
+     */
+    fun setLimits(name: String?, low: Double, up: Double) {
+        theTransformation.setLimits(name, low, up)
+    }
+
+    /**
+     *
+     * setLowerLimit.
+     *
+     * @param index a int.
+     * @param low a double.
+     */
+    fun setLowerLimit(index: Int, low: Double) {
+        theTransformation.setLowerLimit(index, low)
+    }
+
+    /**
+     *
+     * setLowerLimit.
+     *
+     * @param name a [String] object.
+     * @param low a double.
+     */
+    fun setLowerLimit(name: String?, low: Double) {
+        theTransformation.setLowerLimit(name, low)
+    }
+
+    /**
+     *
+     * setPrecision.
+     *
+     * @param eps a double.
+     */
+    fun setPrecision(eps: Double) {
+        theTransformation.setPrecision(eps)
+    }
+
+    /**
+     *
+     * setUpperLimit.
+     *
+     * @param index a int.
+     * @param up a double.
+     */
+    fun setUpperLimit(index: Int, up: Double) {
+        theTransformation.setUpperLimit(index, up)
+    }
+
+    /**
+     *
+     * setUpperLimit.
+     *
+     * @param name a [String] object.
+     * @param up a double.
+     */
+    fun setUpperLimit(name: String?, up: Double) {
+        theTransformation.setUpperLimit(name, up)
+    }
+
+    /**
+     * Set the value of parameter. The parameter in question may be variable,
+     * fixed, or constant, but must be defined.
+     *
+     * @param index a int.
+     * @param val a double.
+     */
+    fun setValue(index: Int, `val`: Double) {
+        theTransformation.setValue(index, `val`)
+    }
+
+    /**
+     * Set the value of parameter. The parameter in question may be variable,
+     * fixed, or constant, but must be defined.
+     *
+     * @param name a [String] object.
+     * @param val a double.
+     */
+    fun setValue(name: String?, `val`: Double) {
+        theTransformation.setValue(name, `val`)
+    }
+
+    /** {@inheritDoc}  */
+    override fun toString(): String {
+        return MnPrint.toString(this)
+    }
+
+    fun trafo(): MnUserTransformation {
+        return theTransformation
+    }
+
+    /**
+     *
+     * value.
+     *
+     * @param index a int.
+     * @return a double.
+     */
+    fun value(index: Int): Double {
+        return theTransformation.value(index)
+    }
+
+    /**
+     *
+     * value.
+     *
+     * @param name a [String] object.
+     * @return a double.
+     */
+    fun value(name: String?): Double {
+        return theTransformation.value(name)
+    }
+
+    /**
+     *
+     * variableParameters.
+     *
+     * @return a int.
+     */
+    fun variableParameters(): Int {
+        return theTransformation.variableParameters()
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserTransformation.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserTransformation.kt
new file mode 100644
index 000000000..1066ac2da
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserTransformation.kt
@@ -0,0 +1,390 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.ArrayRealVector
+
+/**
+ * knows how to andThen between user specified parameters (external) and
+ * internal parameters used for minimization
+ *
+ * Жуткий октопус, который занимается преобразованием внешних параметров во внутренние
+ * TODO по возможности отказаться от использования этого монстра
+ * @version $Id$
+ */
+class MnUserTransformation {
+    private val nameMap: MutableMap<String?, Int> = HashMap()
+    private var theCache: MutableList<Double>
+    private var theExtOfInt: MutableList<Int>
+    private var theParameters: MutableList<MinuitParameter>
+    private var thePrecision: MnMachinePrecision
+
+    constructor() {
+        thePrecision = MnMachinePrecision()
+        theParameters = java.util.ArrayList<MinuitParameter>()
+        theExtOfInt = java.util.ArrayList<Int>()
+        theCache = java.util.ArrayList<Double>(0)
+    }
+
+    private constructor(other: MnUserTransformation) {
+        thePrecision = other.thePrecision
+        theParameters = java.util.ArrayList<MinuitParameter>(other.theParameters.size)
+        for (par in other.theParameters) {
+            theParameters.add(par.copy())
+        }
+        theExtOfInt = java.util.ArrayList<Int>(other.theExtOfInt)
+        theCache = java.util.ArrayList<Double>(other.theCache)
+    }
+
+    constructor(par: DoubleArray, err: DoubleArray) {
+        thePrecision = MnMachinePrecision()
+        theParameters = java.util.ArrayList<MinuitParameter>(par.size)
+        theExtOfInt = java.util.ArrayList<Int>(par.size)
+        theCache = java.util.ArrayList<Double>(par.size)
+        for (i in par.indices) {
+            add("p$i", par[i], err[i])
+        }
+    }
+
+    /**
+     * add free parameter
+     * @param err
+     * @param val
+     */
+    fun add(name: String, `val`: Double, err: Double) {
+        require(!nameMap.containsKey(name)) { "duplicate name: $name" }
+        nameMap[name] = theParameters.size
+        theExtOfInt.add(theParameters.size)
+        theCache.add(`val`)
+        theParameters.add(MinuitParameter(theParameters.size, name, `val`, err))
+    }
+
+    /**
+     * add limited parameter
+     * @param up
+     * @param low
+     */
+    fun add(name: String, `val`: Double, err: Double, low: Double, up: Double) {
+        require(!nameMap.containsKey(name)) { "duplicate name: $name" }
+        nameMap[name] = theParameters.size
+        theExtOfInt.add(theParameters.size)
+        theCache.add(`val`)
+        theParameters.add(MinuitParameter(theParameters.size, name, `val`, err, low, up))
+    }
+
+    /**
+     * add parameter
+     * @param name
+     * @param val
+     */
+    fun add(name: String, `val`: Double) {
+        require(!nameMap.containsKey(name)) { "duplicate name: $name" }
+        nameMap[name] = theParameters.size
+        theCache.add(`val`)
+        theParameters.add(MinuitParameter(theParameters.size, name, `val`))
+    }
+
+    /**
+     *
+     * copy.
+     *
+     * @return a [hep.dataforge.MINUIT.MnUserTransformation] object.
+     */
+    fun copy(): MnUserTransformation {
+        return MnUserTransformation(this)
+    }
+
+    fun dInt2Ext(i: Int, `val`: Double): Double {
+        var dd = 1.0
+        val parm: MinuitParameter = theParameters[theExtOfInt[i]]
+        if (parm.hasLimits()) {
+            dd = if (parm.hasUpperLimit() && parm.hasLowerLimit()) {
+                theDoubleLimTrafo.dInt2Ext(`val`,
+                    parm.upperLimit(),
+                    parm.lowerLimit())
+            } else if (parm.hasUpperLimit() && !parm.hasLowerLimit()) {
+                theUpperLimTrafo.dInt2Ext(`val`, parm.upperLimit())
+            } else {
+                theLowerLimTrafo.dInt2Ext(`val`, parm.lowerLimit())
+            }
+        }
+        return dd
+    }
+
+    fun error(index: Int): Double {
+        return theParameters[index].error()
+    }
+
+    fun error(name: String?): Double {
+        return error(index(name))
+    }
+
+    fun errors(): DoubleArray {
+        val result = DoubleArray(theParameters.size)
+        var i = 0
+        for (parameter in theParameters) {
+            result[i++] = parameter.error()
+        }
+        return result
+    }
+
+    fun ext2int(i: Int, `val`: Double): Double {
+        val parm: MinuitParameter = theParameters[i]
+        return if (parm.hasLimits()) {
+            if (parm.hasUpperLimit() && parm.hasLowerLimit()) {
+                theDoubleLimTrafo.ext2int(`val`,
+                    parm.upperLimit(),
+                    parm.lowerLimit(),
+                    precision())
+            } else if (parm.hasUpperLimit() && !parm.hasLowerLimit()) {
+                theUpperLimTrafo.ext2int(`val`,
+                    parm.upperLimit(),
+                    precision())
+            } else {
+                theLowerLimTrafo.ext2int(`val`,
+                    parm.lowerLimit(),
+                    precision())
+            }
+        } else `val`
+    }
+
+    fun extOfInt(internal: Int): Int {
+        return theExtOfInt[internal]
+    }
+
+    /**
+     * interaction via external number of parameter
+     * @param index
+     */
+    fun fix(index: Int) {
+        val iind = intOfExt(index)
+        theExtOfInt.removeAt(iind)
+        theParameters[index].fix()
+    }
+
+    /**
+     * interaction via name of parameter
+     * @param name
+     */
+    fun fix(name: String?) {
+        fix(index(name))
+    }
+
+    /**
+     * convert name into external number of parameter
+     * @param name
+     * @return
+     */
+    fun index(name: String?): Int {
+        return nameMap[name]!!
+    }
+
+    fun int2ext(i: Int, `val`: Double): Double {
+        val parm: MinuitParameter = theParameters[theExtOfInt[i]]
+        return if (parm.hasLimits()) {
+            if (parm.hasUpperLimit() && parm.hasLowerLimit()) {
+                theDoubleLimTrafo.int2ext(`val`,
+                    parm.upperLimit(),
+                    parm.lowerLimit())
+            } else if (parm.hasUpperLimit() && !parm.hasLowerLimit()) {
+                theUpperLimTrafo.int2ext(`val`, parm.upperLimit())
+            } else {
+                theLowerLimTrafo.int2ext(`val`, parm.lowerLimit())
+            }
+        } else `val`
+    }
+
+    fun int2extCovariance(vec: RealVector, cov: MnAlgebraicSymMatrix): MnUserCovariance {
+        val result = MnUserCovariance(cov.nrow())
+        for (i in 0 until vec.getDimension()) {
+            var dxdi = 1.0
+            if (theParameters[theExtOfInt[i]].hasLimits()) {
+                dxdi = dInt2Ext(i, vec.getEntry(i))
+            }
+            for (j in i until vec.getDimension()) {
+                var dxdj = 1.0
+                if (theParameters[theExtOfInt[j]].hasLimits()) {
+                    dxdj = dInt2Ext(j, vec.getEntry(j))
+                }
+                result[i, j] = dxdi * cov[i, j] * dxdj
+            }
+        }
+        return result
+    }
+
+    fun int2extError(i: Int, `val`: Double, err: Double): Double {
+        var dx = err
+        val parm: MinuitParameter = theParameters[theExtOfInt[i]]
+        if (parm.hasLimits()) {
+            val ui = int2ext(i, `val`)
+            var du1 = int2ext(i, `val` + dx) - ui
+            val du2 = int2ext(i, `val` - dx) - ui
+            if (parm.hasUpperLimit() && parm.hasLowerLimit()) {
+                if (dx > 1.0) {
+                    du1 = parm.upperLimit() - parm.lowerLimit()
+                }
+                dx = 0.5 * (abs(du1) + abs(du2))
+            } else {
+                dx = 0.5 * (abs(du1) + abs(du2))
+            }
+        }
+        return dx
+    }
+
+    fun intOfExt(ext: Int): Int {
+        for (iind in theExtOfInt.indices) {
+            if (ext == theExtOfInt[iind]) {
+                return iind
+            }
+        }
+        throw IllegalArgumentException("ext=$ext")
+    }
+
+    /**
+     * convert external number into name of parameter
+     * @param index
+     * @return
+     */
+    fun name(index: Int): String {
+        return theParameters[index].name()
+    }
+
+    /**
+     * access to single parameter
+     * @param index
+     * @return
+     */
+    fun parameter(index: Int): MinuitParameter {
+        return theParameters[index]
+    }
+
+    fun parameters(): List<MinuitParameter> {
+        return theParameters
+    }
+
+    //access to parameters and errors in column-wise representation
+    fun params(): DoubleArray {
+        val result = DoubleArray(theParameters.size)
+        var i = 0
+        for (parameter in theParameters) {
+            result[i++] = parameter.value()
+        }
+        return result
+    }
+
+    fun precision(): MnMachinePrecision {
+        return thePrecision
+    }
+
+    fun release(index: Int) {
+        require(!theExtOfInt.contains(index)) { "index=$index" }
+        theExtOfInt.add(index)
+        Collections.sort<Int>(theExtOfInt)
+        theParameters[index].release()
+    }
+
+    fun release(name: String?) {
+        release(index(name))
+    }
+
+    fun removeLimits(index: Int) {
+        theParameters[index].removeLimits()
+    }
+
+    fun removeLimits(name: String?) {
+        removeLimits(index(name))
+    }
+
+    fun setError(index: Int, err: Double) {
+        theParameters[index].setError(err)
+    }
+
+    fun setError(name: String?, err: Double) {
+        setError(index(name), err)
+    }
+
+    fun setLimits(index: Int, low: Double, up: Double) {
+        theParameters[index].setLimits(low, up)
+    }
+
+    fun setLimits(name: String?, low: Double, up: Double) {
+        setLimits(index(name), low, up)
+    }
+
+    fun setLowerLimit(index: Int, low: Double) {
+        theParameters[index].setLowerLimit(low)
+    }
+
+    fun setLowerLimit(name: String?, low: Double) {
+        setLowerLimit(index(name), low)
+    }
+
+    fun setPrecision(eps: Double) {
+        thePrecision.setPrecision(eps)
+    }
+
+    fun setUpperLimit(index: Int, up: Double) {
+        theParameters[index].setUpperLimit(up)
+    }
+
+    fun setUpperLimit(name: String?, up: Double) {
+        setUpperLimit(index(name), up)
+    }
+
+    fun setValue(index: Int, `val`: Double) {
+        theParameters[index].setValue(`val`)
+        theCache[index] = `val`
+    }
+
+    fun setValue(name: String?, `val`: Double) {
+        setValue(index(name), `val`)
+    }
+
+    fun transform(pstates: RealVector): ArrayRealVector {
+        // FixMe: Worry about efficiency here
+        val result = ArrayRealVector(theCache.size)
+        for (i in 0 until result.getDimension()) {
+            result.setEntry(i, theCache[i])
+        }
+        for (i in 0 until pstates.getDimension()) {
+            if (theParameters[theExtOfInt[i]].hasLimits()) {
+                result.setEntry(theExtOfInt[i], int2ext(i, pstates.getEntry(i)))
+            } else {
+                result.setEntry(theExtOfInt[i], pstates.getEntry(i))
+            }
+        }
+        return result
+    }
+
+    //forwarded interface
+    fun value(index: Int): Double {
+        return theParameters[index].value()
+    }
+
+    fun value(name: String?): Double {
+        return value(index(name))
+    }
+
+    fun variableParameters(): Int {
+        return theExtOfInt.size
+    }
+
+    companion object {
+        private val theDoubleLimTrafo: SinParameterTransformation = SinParameterTransformation()
+        private val theLowerLimTrafo: SqrtLowParameterTransformation = SqrtLowParameterTransformation()
+        private val theUpperLimTrafo: SqrtUpParameterTransformation = SqrtUpParameterTransformation()
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUtils.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUtils.kt
new file mode 100644
index 000000000..d9f3e1bd5
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUtils.kt
@@ -0,0 +1,147 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.ArrayRealVector
+
+/**
+ * Utilities for operating on vectors and matrices
+ *
+ * @version $Id$
+ */
+internal object MnUtils {
+    fun absoluteSumOfElements(m: MnAlgebraicSymMatrix): Double {
+        val data: DoubleArray = m.data()
+        var result = 0.0
+        for (i in data.indices) {
+            result += abs(data[i])
+        }
+        return result
+    }
+
+    fun add(v1: RealVector, v2: RealVector?): RealVector {
+        return v1.add(v2)
+    }
+
+    fun add(m1: MnAlgebraicSymMatrix, m2: MnAlgebraicSymMatrix): MnAlgebraicSymMatrix {
+        require(!(m1.size() !== m2.size())) { "Incompatible matrices" }
+        val result: MnAlgebraicSymMatrix = m1.copy()
+        val a: DoubleArray = result.data()
+        val b: DoubleArray = m2.data()
+        for (i in a.indices) {
+            a[i] += b[i]
+        }
+        return result
+    }
+
+    fun div(m: MnAlgebraicSymMatrix?, scale: Double): MnAlgebraicSymMatrix {
+        return mul(m, 1 / scale)
+    }
+
+    fun div(m: RealVector?, scale: Double): RealVector {
+        return mul(m, 1 / scale)
+    }
+
+    fun innerProduct(v1: RealVector, v2: RealVector): Double {
+        require(!(v1.getDimension() !== v2.getDimension())) { "Incompatible vectors" }
+        var total = 0.0
+        for (i in 0 until v1.getDimension()) {
+            total += v1.getEntry(i) * v2.getEntry(i)
+        }
+        return total
+    }
+
+    fun mul(v1: RealVector, scale: Double): RealVector {
+        return v1.mapMultiply(scale)
+    }
+
+    fun mul(m1: MnAlgebraicSymMatrix, scale: Double): MnAlgebraicSymMatrix {
+        val result: MnAlgebraicSymMatrix = m1.copy()
+        val a: DoubleArray = result.data()
+        for (i in a.indices) {
+            a[i] *= scale
+        }
+        return result
+    }
+
+    fun mul(m1: MnAlgebraicSymMatrix, v1: RealVector): ArrayRealVector {
+        require(!(m1.nrow() !== v1.getDimension())) { "Incompatible arguments" }
+        val result = ArrayRealVector(m1.nrow())
+        for (i in 0 until result.getDimension()) {
+            var total = 0.0
+            for (k in 0 until result.getDimension()) {
+                total += m1[i, k] * v1.getEntry(k)
+            }
+            result.setEntry(i, total)
+        }
+        return result
+    }
+
+    fun mul(m1: MnAlgebraicSymMatrix, m2: MnAlgebraicSymMatrix): MnAlgebraicSymMatrix {
+        require(!(m1.size() !== m2.size())) { "Incompatible matrices" }
+        val n: Int = m1.nrow()
+        val result = MnAlgebraicSymMatrix(n)
+        for (i in 0 until n) {
+            for (j in 0..i) {
+                var total = 0.0
+                for (k in 0 until n) {
+                    total += m1[i, k] * m2[k, j]
+                }
+                result[i, j] = total
+            }
+        }
+        return result
+    }
+
+    fun outerProduct(v2: RealVector): MnAlgebraicSymMatrix {
+        // Fixme: check this. I am assuming this is just an outer-product of vector
+        //        with itself.
+        val n: Int = v2.getDimension()
+        val result = MnAlgebraicSymMatrix(n)
+        val data: DoubleArray = v2.toArray()
+        for (i in 0 until n) {
+            for (j in 0..i) {
+                result[i, j] = data[i] * data[j]
+            }
+        }
+        return result
+    }
+
+    fun similarity(avec: RealVector, mat: MnAlgebraicSymMatrix): Double {
+        val n: Int = avec.getDimension()
+        val tmp: RealVector = mul(mat, avec)
+        var result = 0.0
+        for (i in 0 until n) {
+            result += tmp.getEntry(i) * avec.getEntry(i)
+        }
+        return result
+    }
+
+    fun sub(v1: RealVector, v2: RealVector?): RealVector {
+        return v1.subtract(v2)
+    }
+
+    fun sub(m1: MnAlgebraicSymMatrix, m2: MnAlgebraicSymMatrix): MnAlgebraicSymMatrix {
+        require(!(m1.size() !== m2.size())) { "Incompatible matrices" }
+        val result: MnAlgebraicSymMatrix = m1.copy()
+        val a: DoubleArray = result.data()
+        val b: DoubleArray = m2.data()
+        for (i in a.indices) {
+            a[i] -= b[i]
+        }
+        return result
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ModularFunctionMinimizer.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ModularFunctionMinimizer.kt
new file mode 100644
index 000000000..f234bcd48
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ModularFunctionMinimizer.kt
@@ -0,0 +1,72 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import ru.inr.mass.maths.MultiFunction
+import ru.inr.mass.minuit.*
+
+/**
+ *
+ * @version $Id$
+ */
+abstract class ModularFunctionMinimizer {
+    abstract fun builder(): MinimumBuilder
+    fun minimize(
+        fcn: MultiFunction?,
+        st: MnUserParameterState,
+        strategy: MnStrategy,
+        maxfcn: Int,
+        toler: Double,
+        errorDef: Double,
+        useAnalyticalGradient: Boolean,
+        checkGradient: Boolean
+    ): FunctionMinimum {
+        var maxfcn = maxfcn
+        val mfcn = MnUserFcn(fcn, errorDef, st.getTransformation())
+        val gc: GradientCalculator
+        var providesAllDerivs = true
+        /*
+        * Проверяем в явном виде, что все аналитические производные присутствуют
+        * TODO сделать возможность того, что часть производных задается аналитически, а часть численно
+        */for (i in 0 until fcn.getDimension()) {
+            if (!fcn.providesDeriv(i)) providesAllDerivs = false
+        }
+        gc = if (providesAllDerivs && useAnalyticalGradient) {
+            AnalyticalGradientCalculator(fcn, st.getTransformation(), checkGradient)
+        } else {
+            Numerical2PGradientCalculator(mfcn, st.getTransformation(), strategy)
+        }
+        val npar: Int = st.variableParameters()
+        if (maxfcn == 0) {
+            maxfcn = 200 + 100 * npar + 5 * npar * npar
+        }
+        val mnseeds: MinimumSeed = seedGenerator().generate(mfcn, gc, st, strategy)
+        return minimize(mfcn, gc, mnseeds, strategy, maxfcn, toler)
+    }
+
+    fun minimize(
+        mfcn: MnFcn,
+        gc: GradientCalculator?,
+        seed: MinimumSeed?,
+        strategy: MnStrategy?,
+        maxfcn: Int,
+        toler: Double
+    ): FunctionMinimum {
+        return builder().minimum(mfcn, gc, seed, strategy, maxfcn, toler * mfcn.errorDef())
+    }
+
+    abstract fun seedGenerator(): MinimumSeedGenerator
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/NegativeG2LineSearch.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/NegativeG2LineSearch.kt
new file mode 100644
index 000000000..2e9ce5813
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/NegativeG2LineSearch.kt
@@ -0,0 +1,80 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.ArrayRealVector
+import ru.inr.mass.minuit.*
+
+/**
+ * In case that one of the components of the second derivative g2 calculated by
+ * the numerical gradient calculator is negative, a 1dim line search in the
+ * direction of that component is done in order to find a better position where
+ * g2 is again positive.
+ *
+ * @version $Id$
+ */
+internal object NegativeG2LineSearch {
+    fun hasNegativeG2(grad: FunctionGradient, prec: MnMachinePrecision): Boolean {
+        for (i in 0 until grad.getGradient().getDimension()) {
+            if (grad.getGradientDerivative().getEntry(i) < prec.eps2()) {
+                return true
+            }
+        }
+        return false
+    }
+
+    fun search(fcn: MnFcn, st: MinimumState, gc: GradientCalculator, prec: MnMachinePrecision): MinimumState {
+        val negG2 = hasNegativeG2(st.gradient(), prec)
+        if (!negG2) {
+            return st
+        }
+        val n: Int = st.parameters().vec().getDimension()
+        var dgrad: FunctionGradient = st.gradient()
+        var pa: MinimumParameters = st.parameters()
+        var iterate = false
+        var iter = 0
+        do {
+            iterate = false
+            for (i in 0 until n) {
+                if (dgrad.getGradientDerivative().getEntry(i) < prec.eps2()) {
+                    // do line search if second derivative negative
+                    var step: RealVector = ArrayRealVector(n)
+                    step.setEntry(i, dgrad.getStep().getEntry(i) * dgrad.getGradient().getEntry(i))
+                    if (abs(dgrad.getGradient().getEntry(i)) > prec.eps2()) {
+                        step.setEntry(i,
+                            step.getEntry(i) * (-1.0 / abs(dgrad.getGradient().getEntry(i))))
+                    }
+                    val gdel: Double = step.getEntry(i) * dgrad.getGradient().getEntry(i)
+                    val pp: MnParabolaPoint = MnLineSearch.search(fcn, pa, step, gdel, prec)
+                    step = MnUtils.mul(step, pp.x())
+                    pa = MinimumParameters(MnUtils.add(pa.vec(), step), pp.y())
+                    dgrad = gc.gradient(pa, dgrad)
+                    iterate = true
+                    break
+                }
+            }
+        } while (iter++ < 2 * n && iterate)
+        val mat = MnAlgebraicSymMatrix(n)
+        for (i in 0 until n) {
+            mat[i, i] = if (abs(dgrad.getGradientDerivative()
+                    .getEntry(i)) > prec.eps2()
+            ) 1.0 / dgrad.getGradientDerivative().getEntry(i) else 1.0
+        }
+        val err = MinimumError(mat, 1.0)
+        val edm: Double = VariableMetricEDMEstimator().estimate(dgrad, err)
+        return MinimumState(pa, err, dgrad, edm, fcn.numOfCalls())
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Numerical2PGradientCalculator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Numerical2PGradientCalculator.kt
new file mode 100644
index 000000000..efa1d57af
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Numerical2PGradientCalculator.kt
@@ -0,0 +1,122 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.RealVector
+import ru.inr.mass.minuit.*
+
+/**
+ *
+ * @version $Id$
+ */
+internal class Numerical2PGradientCalculator(fcn: MnFcn, par: MnUserTransformation, stra: MnStrategy) :
+    GradientCalculator {
+    private val theFcn: MnFcn = fcn
+    private val theStrategy: MnStrategy
+    private val theTransformation: MnUserTransformation
+    fun fcn(): MnFcn {
+        return theFcn
+    }
+
+    fun gradTolerance(): Double {
+        return strategy().gradientTolerance()
+    }
+
+    /** {@inheritDoc}  */
+    fun gradient(par: MinimumParameters): FunctionGradient {
+        val gc = InitialGradientCalculator(theFcn, theTransformation, theStrategy)
+        val gra: FunctionGradient = gc.gradient(par)
+        return gradient(par, gra)
+    }
+
+    /** {@inheritDoc}  */
+    fun gradient(par: MinimumParameters, gradient: FunctionGradient): FunctionGradient {
+        require(par.isValid()) { "Parameters are invalid" }
+        val x: RealVector = par.vec().copy()
+        val fcnmin: Double = par.fval()
+        val dfmin: Double = 8.0 * precision().eps2() * (abs(fcnmin) + theFcn.errorDef())
+        val vrysml: Double = 8.0 * precision().eps() * precision().eps()
+        val n: Int = x.getDimension()
+        val grd: RealVector = gradient.getGradient().copy()
+        val g2: RealVector = gradient.getGradientDerivative().copy()
+        val gstep: RealVector = gradient.getStep().copy()
+        for (i in 0 until n) {
+            val xtf: Double = x.getEntry(i)
+            val epspri: Double = precision().eps2() + abs(grd.getEntry(i) * precision().eps2())
+            var stepb4 = 0.0
+            for (j in 0 until ncycle()) {
+                val optstp: Double = sqrt(dfmin / (abs(g2.getEntry(i)) + epspri))
+                var step: Double = max(optstp, abs(0.1 * gstep.getEntry(i)))
+                if (trafo().parameter(trafo().extOfInt(i)).hasLimits()) {
+                    if (step > 0.5) {
+                        step = 0.5
+                    }
+                }
+                val stpmax: Double = 10.0 * abs(gstep.getEntry(i))
+                if (step > stpmax) {
+                    step = stpmax
+                }
+                val stpmin: Double =
+                    max(vrysml, 8.0 * abs(precision().eps2() * x.getEntry(i)))
+                if (step < stpmin) {
+                    step = stpmin
+                }
+                if (abs((step - stepb4) / step) < stepTolerance()) {
+                    break
+                }
+                gstep.setEntry(i, step)
+                stepb4 = step
+                x.setEntry(i, xtf + step)
+                val fs1: Double = theFcn.value(x)
+                x.setEntry(i, xtf - step)
+                val fs2: Double = theFcn.value(x)
+                x.setEntry(i, xtf)
+                val grdb4: Double = grd.getEntry(i)
+                grd.setEntry(i, 0.5 * (fs1 - fs2) / step)
+                g2.setEntry(i, (fs1 + fs2 - 2.0 * fcnmin) / step / step)
+                if (abs(grdb4 - grd.getEntry(i)) / (abs(grd.getEntry(i)) + dfmin / step) < gradTolerance()) {
+                    break
+                }
+            }
+        }
+        return FunctionGradient(grd, g2, gstep)
+    }
+
+    fun ncycle(): Int {
+        return strategy().gradientNCycles()
+    }
+
+    fun precision(): MnMachinePrecision {
+        return theTransformation.precision()
+    }
+
+    fun stepTolerance(): Double {
+        return strategy().gradientStepTolerance()
+    }
+
+    fun strategy(): MnStrategy {
+        return theStrategy
+    }
+
+    fun trafo(): MnUserTransformation {
+        return theTransformation
+    }
+
+    init {
+        theTransformation = par
+        theStrategy = stra
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Range.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Range.kt
new file mode 100644
index 000000000..ebeedf7e8
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Range.kt
@@ -0,0 +1,32 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ * A class representing a pair of double (x,y) or (lower,upper)
+ *
+ * @version $Id$
+ * @author Darksnake
+ */
+class Range
+/**
+ *
+ * Constructor for Range.
+ *
+ * @param k a double.
+ * @param v a double.
+ */
+    (k: Double, v: Double) : Pair<Double?, Double?>(k, v)
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ScanBuilder.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ScanBuilder.kt
new file mode 100644
index 000000000..b7e773924
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ScanBuilder.kt
@@ -0,0 +1,58 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.ArrayRealVector
+import ru.inr.mass.minuit.*
+
+/**
+ * Performs a minimization using the simplex method of Nelder and Mead (ref.
+ * Comp. J. 7, 308 (1965)).
+ *
+ * @version $Id$
+ */
+internal class ScanBuilder : MinimumBuilder {
+    /** {@inheritDoc}  */
+    fun minimum(
+        mfcn: MnFcn,
+        gc: GradientCalculator?,
+        seed: MinimumSeed,
+        stra: MnStrategy?,
+        maxfcn: Int,
+        toler: Double
+    ): FunctionMinimum {
+        val x: RealVector = seed.parameters().vec().copy()
+        val upst = MnUserParameterState(seed.state(), mfcn.errorDef(), seed.trafo())
+        val scan = MnParameterScan(mfcn.fcn(), upst.parameters(), seed.fval())
+        var amin: Double = scan.fval()
+        val n: Int = seed.trafo().variableParameters()
+        val dirin: RealVector = ArrayRealVector(n)
+        for (i in 0 until n) {
+            val ext: Int = seed.trafo().extOfInt(i)
+            scan.scan(ext)
+            if (scan.fval() < amin) {
+                amin = scan.fval()
+                x.setEntry(i, seed.trafo().ext2int(ext, scan.parameters().value(ext)))
+            }
+            dirin.setEntry(i, sqrt(2.0 * mfcn.errorDef() * seed.error().invHessian()[i, i]))
+        }
+        val mp = MinimumParameters(x, dirin, amin)
+        val st = MinimumState(mp, 0.0, mfcn.numOfCalls())
+        val states: MutableList<MinimumState> = java.util.ArrayList<MinimumState>(1)
+        states.add(st)
+        return FunctionMinimum(seed, states, mfcn.errorDef())
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ScanMinimizer.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ScanMinimizer.kt
new file mode 100644
index 000000000..e39a49c0d
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ScanMinimizer.kt
@@ -0,0 +1,36 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+internal class ScanMinimizer : ModularFunctionMinimizer() {
+    private val theBuilder: ScanBuilder
+    private val theSeedGenerator: SimplexSeedGenerator = SimplexSeedGenerator()
+    override fun builder(): MinimumBuilder {
+        return theBuilder
+    }
+
+    override fun seedGenerator(): MinimumSeedGenerator {
+        return theSeedGenerator
+    }
+
+    init {
+        theBuilder = ScanBuilder()
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexBuilder.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexBuilder.kt
new file mode 100644
index 000000000..8441a4177
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexBuilder.kt
@@ -0,0 +1,179 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import space.kscience.kmath.optimization.minuit.MINUITPlugin
+import ru.inr.mass.minuit.*
+
+/**
+ *
+ * @version $Id$
+ */
+internal class SimplexBuilder : MinimumBuilder {
+    /** {@inheritDoc}  */
+    fun minimum(
+        mfcn: MnFcn,
+        gc: GradientCalculator?,
+        seed: MinimumSeed,
+        strategy: MnStrategy?,
+        maxfcn: Int,
+        minedm: Double
+    ): FunctionMinimum {
+        val prec: MnMachinePrecision = seed.precision()
+        val x: RealVector = seed.parameters().vec().copy()
+        val step: RealVector = MnUtils.mul(seed.gradient().getStep(), 10.0)
+        val n: Int = x.getDimension()
+        val wg = 1.0 / n
+        val alpha = 1.0
+        val beta = 0.5
+        val gamma = 2.0
+        val rhomin = 4.0
+        val rhomax = 8.0
+        val rho1 = 1.0 + alpha
+        val rho2 = 1.0 + alpha * gamma
+        val simpl: MutableList<Pair<Double?, RealVector?>> = java.util.ArrayList<Pair<Double, RealVector>>(n + 1)
+        simpl.add(Pair(seed.fval(), x.copy()))
+        var jl = 0
+        var jh = 0
+        var amin: Double = seed.fval()
+        var aming: Double = seed.fval()
+        for (i in 0 until n) {
+            val dmin: Double = 8.0 * prec.eps2() * (abs(x.getEntry(i)) + prec.eps2())
+            if (step.getEntry(i) < dmin) {
+                step.setEntry(i, dmin)
+            }
+            x.setEntry(i, x.getEntry(i) + step.getEntry(i))
+            val tmp: Double = mfcn.value(x)
+            if (tmp < amin) {
+                amin = tmp
+                jl = i + 1
+            }
+            if (tmp > aming) {
+                aming = tmp
+                jh = i + 1
+            }
+            simpl.add(Pair(tmp, x.copy()))
+            x.setEntry(i, x.getEntry(i) - step.getEntry(i))
+        }
+        val simplex = SimplexParameters(simpl, jh, jl)
+        do {
+            amin = simplex[jl].getFirst()
+            jl = simplex.jl()
+            jh = simplex.jh()
+            var pbar: RealVector = ArrayRealVector(n)
+            for (i in 0 until n + 1) {
+                if (i == jh) {
+                    continue
+                }
+                pbar = MnUtils.add(pbar, MnUtils.mul(simplex[i].getSecond(), wg))
+            }
+            val pstar: RealVector =
+                MnUtils.sub(MnUtils.mul(pbar, 1.0 + alpha), MnUtils.mul(simplex[jh].getSecond(), alpha))
+            val ystar: Double = mfcn.value(pstar)
+            if (ystar > amin) {
+                if (ystar < simplex[jh].getFirst()) {
+                    simplex.update(ystar, pstar)
+                    if (jh != simplex.jh()) {
+                        continue
+                    }
+                }
+                val pstst: RealVector =
+                    MnUtils.add(MnUtils.mul(simplex[jh].getSecond(), beta), MnUtils.mul(pbar, 1.0 - beta))
+                val ystst: Double = mfcn.value(pstst)
+                if (ystst > simplex[jh].getFirst()) {
+                    break
+                }
+                simplex.update(ystst, pstst)
+                continue
+            }
+            var pstst: RealVector = MnUtils.add(MnUtils.mul(pstar, gamma), MnUtils.mul(pbar, 1.0 - gamma))
+            var ystst: Double = mfcn.value(pstst)
+            val y1: Double = (ystar - simplex[jh].getFirst()) * rho2
+            val y2: Double = (ystst - simplex[jh].getFirst()) * rho1
+            var rho = 0.5 * (rho2 * y1 - rho1 * y2) / (y1 - y2)
+            if (rho < rhomin) {
+                if (ystst < simplex[jl].getFirst()) {
+                    simplex.update(ystst, pstst)
+                } else {
+                    simplex.update(ystar, pstar)
+                }
+                continue
+            }
+            if (rho > rhomax) {
+                rho = rhomax
+            }
+            val prho: RealVector =
+                MnUtils.add(MnUtils.mul(pbar, rho), MnUtils.mul(simplex[jh].getSecond(), 1.0 - rho))
+            val yrho: Double = mfcn.value(prho)
+            if (yrho < simplex[jl].getFirst() && yrho < ystst) {
+                simplex.update(yrho, prho)
+                continue
+            }
+            if (ystst < simplex[jl].getFirst()) {
+                simplex.update(ystst, pstst)
+                continue
+            }
+            if (yrho > simplex[jl].getFirst()) {
+                if (ystst < simplex[jl].getFirst()) {
+                    simplex.update(ystst, pstst)
+                } else {
+                    simplex.update(ystar, pstar)
+                }
+                continue
+            }
+            if (ystar > simplex[jh].getFirst()) {
+                pstst = MnUtils.add(MnUtils.mul(simplex[jh].getSecond(), beta), MnUtils.mul(pbar, 1 - beta))
+                ystst = mfcn.value(pstst)
+                if (ystst > simplex[jh].getFirst()) {
+                    break
+                }
+                simplex.update(ystst, pstst)
+            }
+        } while (simplex.edm() > minedm && mfcn.numOfCalls() < maxfcn)
+        amin = simplex[jl].getFirst()
+        jl = simplex.jl()
+        jh = simplex.jh()
+        var pbar: RealVector = ArrayRealVector(n)
+        for (i in 0 until n + 1) {
+            if (i == jh) {
+                continue
+            }
+            pbar = MnUtils.add(pbar, MnUtils.mul(simplex[i].getSecond(), wg))
+        }
+        var ybar: Double = mfcn.value(pbar)
+        if (ybar < amin) {
+            simplex.update(ybar, pbar)
+        } else {
+            pbar = simplex[jl].getSecond()
+            ybar = simplex[jl].getFirst()
+        }
+        var dirin: RealVector = simplex.dirin()
+        //   scale to sigmas on parameters werr^2 = dirin^2 * (up/edm)
+        dirin = MnUtils.mul(dirin, sqrt(mfcn.errorDef() / simplex.edm()))
+        val st = MinimumState(MinimumParameters(pbar, dirin, ybar), simplex.edm(), mfcn.numOfCalls())
+        val states: MutableList<MinimumState> = java.util.ArrayList<MinimumState>(1)
+        states.add(st)
+        if (mfcn.numOfCalls() > maxfcn) {
+            MINUITPlugin.logStatic("Simplex did not converge, #fcn calls exhausted.")
+            return FunctionMinimum(seed, states, mfcn.errorDef(), MnReachedCallLimit())
+        }
+        if (simplex.edm() > minedm) {
+            MINUITPlugin.logStatic("Simplex did not converge, edm > minedm.")
+            return FunctionMinimum(seed, states, mfcn.errorDef(), MnAboveMaxEdm())
+        }
+        return FunctionMinimum(seed, states, mfcn.errorDef())
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexMinimizer.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexMinimizer.kt
new file mode 100644
index 000000000..f4bbcc320
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexMinimizer.kt
@@ -0,0 +1,43 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+internal class SimplexMinimizer : ModularFunctionMinimizer() {
+    private val theBuilder: SimplexBuilder
+    private val theSeedGenerator: SimplexSeedGenerator = SimplexSeedGenerator()
+
+    /** {@inheritDoc}  */
+    override fun builder(): MinimumBuilder {
+        return theBuilder
+    }
+
+    /** {@inheritDoc}  */
+    override fun seedGenerator(): MinimumSeedGenerator {
+        return theSeedGenerator
+    }
+
+    /**
+     *
+     * Constructor for SimplexMinimizer.
+     */
+    init {
+        theBuilder = SimplexBuilder()
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexParameters.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexParameters.kt
new file mode 100644
index 000000000..fef6e2010
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexParameters.kt
@@ -0,0 +1,85 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.ArrayRealVector
+
+/**
+ *
+ * @version $Id$
+ */
+internal class SimplexParameters(simpl: MutableList<Pair<Double?, RealVector?>>, jh: Int, jl: Int) {
+    private var theJHigh: Int
+    private var theJLow: Int
+    private val theSimplexParameters: MutableList<Pair<Double?, RealVector?>>
+    fun dirin(): ArrayRealVector {
+        val dirin = ArrayRealVector(theSimplexParameters.size - 1)
+        for (i in 0 until theSimplexParameters.size - 1) {
+            var pbig: Double = theSimplexParameters[0].getSecond().getEntry(i)
+            var plit = pbig
+            for (theSimplexParameter in theSimplexParameters) {
+                if (theSimplexParameter.getSecond().getEntry(i) < plit) {
+                    plit = theSimplexParameter.getSecond().getEntry(i)
+                }
+                if (theSimplexParameter.getSecond().getEntry(i) > pbig) {
+                    pbig = theSimplexParameter.getSecond().getEntry(i)
+                }
+            }
+            dirin.setEntry(i, pbig - plit)
+        }
+        return dirin
+    }
+
+    fun edm(): Double {
+        return theSimplexParameters[jh()].getFirst() - theSimplexParameters[jl()].getFirst()
+    }
+
+    operator fun get(i: Int): Pair<Double?, RealVector?> {
+        return theSimplexParameters[i]
+    }
+
+    fun jh(): Int {
+        return theJHigh
+    }
+
+    fun jl(): Int {
+        return theJLow
+    }
+
+    fun simplex(): List<Pair<Double?, RealVector?>> {
+        return theSimplexParameters
+    }
+
+    fun update(y: Double, p: RealVector?) {
+        theSimplexParameters.set(jh(), Pair(y, p))
+        if (y < theSimplexParameters[jl()].getFirst()) {
+            theJLow = jh()
+        }
+        var jh = 0
+        for (i in 1 until theSimplexParameters.size) {
+            if (theSimplexParameters[i].getFirst() > theSimplexParameters[jh].getFirst()) {
+                jh = i
+            }
+        }
+        theJHigh = jh
+    }
+
+    init {
+        theSimplexParameters = simpl
+        theJHigh = jh
+        theJLow = jl
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexSeedGenerator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexSeedGenerator.kt
new file mode 100644
index 000000000..e5025ff3d
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexSeedGenerator.kt
@@ -0,0 +1,52 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import org.apache.commons.math3.linear.ArrayRealVector
+import ru.inr.mass.minuit.*
+
+/**
+ *
+ * @version $Id$
+ */
+internal class SimplexSeedGenerator : MinimumSeedGenerator {
+    /** {@inheritDoc}  */
+    fun generate(fcn: MnFcn, gc: GradientCalculator?, st: MnUserParameterState, stra: MnStrategy): MinimumSeed {
+        val n: Int = st.variableParameters()
+        val prec: MnMachinePrecision = st.precision()
+
+        // initial starting values
+        val x: RealVector = ArrayRealVector(n)
+        for (i in 0 until n) {
+            x.setEntry(i, st.intParameters()[i])
+        }
+        val fcnmin: Double = fcn.value(x)
+        val pa = MinimumParameters(x, fcnmin)
+        val igc = InitialGradientCalculator(fcn, st.getTransformation(), stra)
+        val dgrad: FunctionGradient = igc.gradient(pa)
+        val mat = MnAlgebraicSymMatrix(n)
+        val dcovar = 1.0
+        for (i in 0 until n) {
+            mat[i, i] = if (abs(dgrad.getGradientDerivative()
+                    .getEntry(i)) > prec.eps2()
+            ) 1.0 / dgrad.getGradientDerivative().getEntry(i) else 1.0
+        }
+        val err = MinimumError(mat, dcovar)
+        val edm: Double = VariableMetricEDMEstimator().estimate(dgrad, err)
+        val state = MinimumState(pa, err, dgrad, edm, fcn.numOfCalls())
+        return MinimumSeed(state, st.getTransformation())
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SinParameterTransformation.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SinParameterTransformation.kt
new file mode 100644
index 000000000..821addef7
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SinParameterTransformation.kt
@@ -0,0 +1,48 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+internal class SinParameterTransformation {
+    fun dInt2Ext(value: Double, upper: Double, lower: Double): Double {
+        return 0.5 * abs((upper - lower) * cos(value))
+    }
+
+    fun ext2int(value: Double, upper: Double, lower: Double, prec: MnMachinePrecision): Double {
+        val piby2: Double = 2.0 * atan(1.0)
+        val distnn: Double = 8.0 * sqrt(prec.eps2())
+        val vlimhi = piby2 - distnn
+        val vlimlo = -piby2 + distnn
+        val yy = 2.0 * (value - lower) / (upper - lower) - 1.0
+        val yy2 = yy * yy
+        return if (yy2 > 1.0 - prec.eps2()) {
+            if (yy < 0.0) {
+                vlimlo
+            } else {
+                vlimhi
+            }
+        } else {
+            asin(yy)
+        }
+    }
+
+    fun int2ext(value: Double, upper: Double, lower: Double): Double {
+        return lower + 0.5 * (upper - lower) * (sin(value) + 1.0)
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SqrtLowParameterTransformation.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SqrtLowParameterTransformation.kt
new file mode 100644
index 000000000..444b63847
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SqrtLowParameterTransformation.kt
@@ -0,0 +1,43 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+internal class SqrtLowParameterTransformation {
+    // derivative of transformation from internal to external
+    fun dInt2Ext(value: Double, lower: Double): Double {
+        return value / sqrt(value * value + 1.0)
+    }
+
+    // transformation from external to internal
+    fun ext2int(value: Double, lower: Double, prec: MnMachinePrecision): Double {
+        val yy = value - lower + 1.0
+        val yy2 = yy * yy
+        return if (yy2 < 1.0 + prec.eps2()) {
+            8 * sqrt(prec.eps2())
+        } else {
+            sqrt(yy2 - 1)
+        }
+    }
+
+    // transformation from internal to external
+    fun int2ext(value: Double, lower: Double): Double {
+        return lower - 1.0 + sqrt(value * value + 1.0)
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SqrtUpParameterTransformation.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SqrtUpParameterTransformation.kt
new file mode 100644
index 000000000..5774848bd
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SqrtUpParameterTransformation.kt
@@ -0,0 +1,43 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+internal class SqrtUpParameterTransformation {
+    // derivative of transformation from internal to external
+    fun dInt2Ext(value: Double, upper: Double): Double {
+        return -value / sqrt(value * value + 1.0)
+    }
+
+    // transformation from external to internal
+    fun ext2int(value: Double, upper: Double, prec: MnMachinePrecision): Double {
+        val yy = upper - value + 1.0
+        val yy2 = yy * yy
+        return if (yy2 < 1.0 + prec.eps2()) {
+            8 * sqrt(prec.eps2())
+        } else {
+            sqrt(yy2 - 1)
+        }
+    }
+
+    // transformation from internal to external
+    fun int2ext(value: Double, upper: Double): Double {
+        return upper + 1.0 - sqrt(value * value + 1.0)
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricBuilder.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricBuilder.kt
new file mode 100644
index 000000000..8362c5e7e
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricBuilder.kt
@@ -0,0 +1,137 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+import space.kscience.kmath.optimization.minuit.MINUITPlugin
+import ru.inr.mass.minuit.*
+
+/**
+ *
+ * @version $Id$
+ */
+internal class VariableMetricBuilder : MinimumBuilder {
+    private val theErrorUpdator: DavidonErrorUpdator
+    private val theEstimator: VariableMetricEDMEstimator = VariableMetricEDMEstimator()
+    fun errorUpdator(): DavidonErrorUpdator {
+        return theErrorUpdator
+    }
+
+    fun estimator(): VariableMetricEDMEstimator {
+        return theEstimator
+    }
+
+    /** {@inheritDoc}  */
+    fun minimum(
+        fcn: MnFcn,
+        gc: GradientCalculator,
+        seed: MinimumSeed,
+        strategy: MnStrategy,
+        maxfcn: Int,
+        edmval: Double
+    ): FunctionMinimum {
+        val min: FunctionMinimum = minimum(fcn, gc, seed, maxfcn, edmval)
+        if (strategy.strategy() === 2 || strategy.strategy() === 1 && min.error().dcovar() > 0.05) {
+            val st: MinimumState = MnHesse(strategy).calculate(fcn, min.state(), min.seed().trafo(), 0)
+            min.add(st)
+        }
+        if (!min.isValid()) {
+            MINUITPlugin.logStatic("FunctionMinimum is invalid.")
+        }
+        return min
+    }
+
+    fun minimum(fcn: MnFcn, gc: GradientCalculator, seed: MinimumSeed, maxfcn: Int, edmval: Double): FunctionMinimum {
+        var edmval = edmval
+        edmval *= 0.0001
+        if (seed.parameters().vec().getDimension() === 0) {
+            return FunctionMinimum(seed, fcn.errorDef())
+        }
+        val prec: MnMachinePrecision = seed.precision()
+        val result: MutableList<MinimumState> = java.util.ArrayList<MinimumState>(8)
+        var edm: Double = seed.state().edm()
+        if (edm < 0.0) {
+            MINUITPlugin.logStatic("VariableMetricBuilder: initial matrix not pos.def.")
+            if (seed.error().isPosDef()) {
+                throw RuntimeException("Something is wrong!")
+            }
+            return FunctionMinimum(seed, fcn.errorDef())
+        }
+        result.add(seed.state())
+
+        // iterate until edm is small enough or max # of iterations reached
+        edm *= 1.0 + 3.0 * seed.error().dcovar()
+        var step: RealVector // = new ArrayRealVector(seed.gradient().getGradient().getDimension());
+        do {
+            var s0: MinimumState = result[result.size - 1]
+            step = MnUtils.mul(MnUtils.mul(s0.error().invHessian(), s0.gradient().getGradient()), -1)
+            var gdel: Double = MnUtils.innerProduct(step, s0.gradient().getGradient())
+            if (gdel > 0.0) {
+                MINUITPlugin.logStatic("VariableMetricBuilder: matrix not pos.def.")
+                MINUITPlugin.logStatic("gdel > 0: $gdel")
+                s0 = MnPosDef.test(s0, prec)
+                step = MnUtils.mul(MnUtils.mul(s0.error().invHessian(), s0.gradient().getGradient()), -1)
+                gdel = MnUtils.innerProduct(step, s0.gradient().getGradient())
+                MINUITPlugin.logStatic("gdel: $gdel")
+                if (gdel > 0.0) {
+                    result.add(s0)
+                    return FunctionMinimum(seed, result, fcn.errorDef())
+                }
+            }
+            val pp: MnParabolaPoint = MnLineSearch.search(fcn, s0.parameters(), step, gdel, prec)
+            if (abs(pp.y() - s0.fval()) < prec.eps()) {
+                MINUITPlugin.logStatic("VariableMetricBuilder: no improvement")
+                break //no improvement
+            }
+            val p = MinimumParameters(MnUtils.add(s0.vec(), MnUtils.mul(step, pp.x())), pp.y())
+            val g: FunctionGradient = gc.gradient(p, s0.gradient())
+            edm = estimator().estimate(g, s0.error())
+            if (edm < 0.0) {
+                MINUITPlugin.logStatic("VariableMetricBuilder: matrix not pos.def.")
+                MINUITPlugin.logStatic("edm < 0")
+                s0 = MnPosDef.test(s0, prec)
+                edm = estimator().estimate(g, s0.error())
+                if (edm < 0.0) {
+                    result.add(s0)
+                    return FunctionMinimum(seed, result, fcn.errorDef())
+                }
+            }
+            val e: MinimumError = errorUpdator().update(s0, p, g)
+            result.add(MinimumState(p, e, g, edm, fcn.numOfCalls()))
+            //     result[0] = MinimumState(p, e, g, edm, fcn.numOfCalls());
+            edm *= 1.0 + 3.0 * e.dcovar()
+        } while (edm > edmval && fcn.numOfCalls() < maxfcn)
+        if (fcn.numOfCalls() >= maxfcn) {
+            MINUITPlugin.logStatic("VariableMetricBuilder: call limit exceeded.")
+            return FunctionMinimum(seed, result, fcn.errorDef(), MnReachedCallLimit())
+        }
+        return if (edm > edmval) {
+            if (edm < abs(prec.eps2() * result[result.size - 1].fval())) {
+                MINUITPlugin.logStatic("VariableMetricBuilder: machine accuracy limits further improvement.")
+                FunctionMinimum(seed, result, fcn.errorDef())
+            } else if (edm < 10.0 * edmval) {
+                FunctionMinimum(seed, result, fcn.errorDef())
+            } else {
+                MINUITPlugin.logStatic("VariableMetricBuilder: finishes without convergence.")
+                MINUITPlugin.logStatic("VariableMetricBuilder: edm= $edm requested: $edmval")
+                FunctionMinimum(seed, result, fcn.errorDef(), MnAboveMaxEdm())
+            }
+        } else FunctionMinimum(seed, result, fcn.errorDef())
+    }
+
+    init {
+        theErrorUpdator = DavidonErrorUpdator()
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricEDMEstimator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricEDMEstimator.kt
new file mode 100644
index 000000000..8fca4e6ee
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricEDMEstimator.kt
@@ -0,0 +1,31 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @author tonyj
+ * @version $Id$
+ */
+internal class VariableMetricEDMEstimator {
+    fun estimate(g: FunctionGradient, e: MinimumError): Double {
+        if (e.invHessian().size() === 1) {
+            return 0.5 * g.getGradient().getEntry(0) * g.getGradient().getEntry(0) * e.invHessian()[0, 0]
+        }
+        val rho: Double = MnUtils.similarity(g.getGradient(), e.invHessian())
+        return 0.5 * rho
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricMinimizer.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricMinimizer.kt
new file mode 100644
index 000000000..2a13a5fff
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricMinimizer.kt
@@ -0,0 +1,43 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
+/**
+ *
+ * @version $Id$
+ */
+internal class VariableMetricMinimizer : ModularFunctionMinimizer() {
+    private val theMinBuilder: VariableMetricBuilder
+    private val theMinSeedGen: MnSeedGenerator = MnSeedGenerator()
+
+    /** {@inheritDoc}  */
+    override fun builder(): MinimumBuilder {
+        return theMinBuilder
+    }
+
+    /** {@inheritDoc}  */
+    override fun seedGenerator(): MinimumSeedGenerator {
+        return theMinSeedGen
+    }
+
+    /**
+     *
+     * Constructor for VariableMetricMinimizer.
+     */
+    init {
+        theMinBuilder = VariableMetricBuilder()
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/package-info.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/package-info.kt
new file mode 100644
index 000000000..22779da86
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/package-info.kt
@@ -0,0 +1,17 @@
+/* 
+ * Copyright 2015 Alexander Nozik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ru.inr.mass.minuit
+
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt
new file mode 100644
index 000000000..02fd12dbc
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt
@@ -0,0 +1,380 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.optimization.qow
+
+import space.kscience.kmath.data.ColumnarData
+import space.kscience.kmath.data.XYErrorColumnarData
+import space.kscience.kmath.expressions.DifferentiableExpression
+import space.kscience.kmath.expressions.Expression
+import space.kscience.kmath.expressions.SymbolIndexer
+import space.kscience.kmath.expressions.derivative
+import space.kscience.kmath.linear.*
+import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.optimization.OptimizationFeature
+import space.kscience.kmath.optimization.OptimizationProblemFactory
+import space.kscience.kmath.optimization.OptimizationResult
+import space.kscience.kmath.optimization.XYFit
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.DoubleL2Norm
+import kotlin.math.pow
+
+
+private typealias ParamSet = Map<Symbol, Double>
+
+public fun interface FitLogger {
+    public fun log(block: () -> String)
+}
+
+@OptIn(UnstableKMathAPI::class)
+public class QowFit(
+    override val symbols: List<Symbol>,
+    private val space: LinearSpace<Double, DoubleField>,
+    private val solver: LinearSolver<Double>,
+) : XYFit<Double>, SymbolIndexer {
+
+    private var logger: FitLogger? = null
+
+    private var startingPoint: Map<Symbol, Double> = TODO()
+    private var covariance: Matrix<Double>? = TODO()
+    private val prior: DifferentiableExpression<Double, Expression<Double>>? = TODO()
+    private var data: XYErrorColumnarData<Double, Double, Double> = TODO()
+    private var model: DifferentiableExpression<Double, Expression<Double>> = TODO()
+
+    private val features = HashSet<OptimizationFeature>()
+
+    override fun update(result: OptimizationResult<Double>) {
+        TODO("Not yet implemented")
+    }
+
+    override val algebra: Field<Double>
+        get() = TODO("Not yet implemented")
+
+    override fun data(
+        dataSet: ColumnarData<Double>,
+        xSymbol: Symbol,
+        ySymbol: Symbol,
+        xErrSymbol: Symbol?,
+        yErrSymbol: Symbol?,
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun model(model: (Double) -> DifferentiableExpression<Double, *>) {
+        TODO("Not yet implemented")
+    }
+
+    private var x: Symbol = Symbol.x
+
+    /**
+     * The signed distance from the model to the [i]-th point of data.
+     */
+    private fun distance(i: Int, parameters: Map<Symbol, Double>): Double =
+        model(parameters + (x to data.x[i])) - data.y[i]
+
+
+    /**
+     * The derivative of [distance]
+     * TODO use expressions instead
+     */
+    private fun distanceDerivative(symbol: Symbol, i: Int, parameters: Map<Symbol, Double>): Double =
+        model.derivative(symbol)(parameters + (x to data.x[i]))
+
+    /**
+     * The dispersion of [i]-th data point
+     */
+    private fun getDispersion(i: Int, parameters: Map<Symbol, Double>): Double = data.yErr[i].pow(2)
+
+    private fun getCovariance(weight: QoWeight): Matrix<Double> = solver.inverse(getEqDerivValues(weight))
+
+    /**
+     * Теоретическая ковариация весовых функций.
+     *
+     * D(\phi)=E(\phi_k(\theta_0) \phi_l(\theta_0))= disDeriv_k * disDeriv_l /sigma^2
+     */
+    private fun covarF(weight: QoWeight): Matrix<Double> = space.buildSymmetricMatrix(symbols.size) { k, l ->
+        (0 until data.size).sumOf { i -> weight.derivs[k, i] * weight.derivs[l, i] / weight.dispersion[i] }
+    }
+
+    /**
+     * Экспериментальная ковариация весов. Формула (22) из
+     * http://arxiv.org/abs/physics/0604127
+     *
+     * @param source
+     * @param set
+     * @param fitPars
+     * @param weight
+     * @return
+     */
+    private fun covarFExp(weight: QoWeight, theta: Map<Symbol, Double>): Matrix<Double> = space.run {
+        /*
+         * Важно! Если не делать предварителього вычисления этих производных, то
+         * количество вызывов функции будет dim^2 вместо dim Первый индекс -
+         * номер точки, второй - номер переменной, по которой берется производная
+         */
+        val eqvalues = buildMatrix(data.size, symbols.size) { i, l ->
+            distance(i, theta) * weight.derivs[l, i] / weight.dispersion[i]
+        }
+
+        buildMatrix(symbols.size, symbols.size) { k, l ->
+            (0 until data.size).sumOf { i -> eqvalues[i, l] * eqvalues[i, k] }
+        }
+    }
+
+    /**
+     * производные уравнений для метода Ньютона
+     *
+     * @param source
+     * @param set
+     * @param fitPars
+     * @param weight
+     * @return
+     */
+    private fun getEqDerivValues(
+        weight: QoWeight, theta: Map<Symbol, Double> = weight.theta,
+    ): Matrix<Double> = space.run {
+        val fitDim = symbols.size
+        //Возвращает производную k-того Eq по l-тому параметру
+        val res = Array(fitDim) { DoubleArray(fitDim) }
+        val sderiv = buildMatrix(data.size, symbols.size) { i, l ->
+            distanceDerivative(symbols[l], i, theta)
+        }
+
+        buildMatrix(symbols.size, symbols.size) { k, l ->
+            val base = (0 until data.size).sumOf { i ->
+                require(weight.dispersion[i] > 0)
+                sderiv[i, l] * weight.derivs[k, i] / weight.dispersion[i]
+            }
+            prior?.let { prior ->
+                //Check if this one is correct
+                val pi = prior(theta)
+                val deriv1 = prior.derivative(symbols[k])(theta)
+                val deriv2 = prior.derivative(symbols[l])(theta)
+                base + deriv1 * deriv2 / pi / pi
+            } ?: base
+        }
+    }
+
+
+    /**
+     * Значения уравнений метода квазиоптимальных весов
+     *
+     * @param source
+     * @param set
+     * @param fitPars
+     * @param weight
+     * @return
+     */
+    private fun getEqValues(weight: QoWeight, theta: Map<Symbol, Double> = weight.theta): Point<Double> {
+        val distances = DoubleBuffer(data.size) { i -> distance(i, theta) }
+
+        return DoubleBuffer(symbols.size) { k ->
+            val base = (0 until data.size).sumOf { i -> distances[i] * weight.derivs[k, i] / weight.dispersion[i] }
+            //Поправка на априорную вероятность
+            prior?.let { prior ->
+                base - prior.derivative(symbols[k])(theta) / prior(theta)
+            } ?: base
+        }
+    }
+
+
+    /**
+     * The state of QOW fitter
+     * Created by Alexander Nozik on 17-Oct-16.
+     */
+    private inner class QoWeight(
+        val theta: Map<Symbol, Double>,
+    ) {
+
+        init {
+            require(data.size > 0) { "The state does not contain data" }
+        }
+
+        /**
+         * Derivatives of the spectrum over parameters. First index in the point number, second one - index of parameter
+         */
+        val derivs: Matrix<Double> by lazy {
+            space.buildMatrix(data.size, symbols.size) { i, k ->
+                distanceDerivative(symbols[k], i, theta)
+            }
+        }
+
+        /**
+         * Array of dispersions in each point
+         */
+        val dispersion: Point<Double> by lazy {
+            DoubleBuffer(data.size) { i -> getDispersion(i, theta) }
+        }
+
+    }
+
+    private fun newtonianStep(
+        weight: QoWeight,
+        par: Map<Symbol, Double>,
+        eqvalues: Point<Double>,
+    ): Map<Symbol, Double> = space.run {
+        val start = par.toPoint()
+        val invJacob = solver.inverse(getEqDerivValues(weight, par))
+
+        val step = invJacob.dot(eqvalues)
+        return par + (start - step).toMap()
+    }
+
+    private fun newtonianRun(
+        weight: QoWeight,
+        maxSteps: Int = 100,
+        tolerance: Double = 0.0,
+        fast: Boolean = false,
+    ): ParamSet {
+
+        var dis: Double//норма невязки
+        // Для удобства работаем всегда с полным набором параметров
+        var par = startingPoint
+
+        logger?.log { "Starting newtonian iteration from: \n\t$par" }
+
+        var eqvalues = getEqValues(weight, par)//значения функций
+
+        dis = DoubleL2Norm.norm(eqvalues)// невязка
+        logger?.log { "Starting discrepancy is $dis" }
+        var i = 0
+        var flag = false
+        while (!flag) {
+            i++
+            logger?.log { "Starting step number $i" }
+
+            val currentSolution = if (fast) {
+                //Берет значения матрицы в той точке, где считается вес
+                newtonianStep(weight, weight.theta, eqvalues)
+            } else {
+                //Берет значения матрицы в точке par
+                newtonianStep(weight, par, eqvalues)
+            }
+            // здесь должен стоять учет границ параметров
+            logger?.log { "Parameter values after step are: \n\t$currentSolution" }
+
+            eqvalues = getEqValues(weight, currentSolution)
+            val currentDis = DoubleL2Norm.norm(eqvalues)// невязка после шага
+
+            logger?.log { "The discrepancy after step is: $currentDis." }
+
+            if (currentDis >= dis && i > 1) {
+                //дополнительно проверяем, чтобы был сделан хотя бы один шаг
+                flag = true
+                logger?.log { "The discrepancy does not decrease. Stopping iteration." }
+            } else {
+                par = currentSolution
+                dis = currentDis
+            }
+            if (i >= maxSteps) {
+                flag = true
+                logger?.log { "Maximum number of iterations reached. Stopping iteration." }
+            }
+            if (dis <= tolerance) {
+                flag = true
+                logger?.log { "Tolerance threshold is reached. Stopping iteration." }
+            }
+        }
+
+        return par
+    }
+
+
+//
+//    override fun run(state: FitState, parentLog: History?, meta: Meta): FitResult {
+//        val log = Chronicle("QOW", parentLog)
+//        val action = meta.getString(FIT_STAGE_TYPE, TASK_RUN)
+//        log.report("QOW fit engine started task '{}'", action)
+//        return when (action) {
+//            TASK_SINGLE -> makeRun(state, log, meta)
+//            TASK_COVARIANCE -> generateErrors(state, log, meta)
+//            TASK_RUN -> {
+//                var res = makeRun(state, log, meta)
+//                res = makeRun(res.optState().get(), log, meta)
+//                generateErrors(res.optState().get(), log, meta)
+//            }
+//            else -> throw IllegalArgumentException("Unknown task")
+//        }
+//    }
+
+//    private fun makeRun(state: FitState, log: History, meta: Meta): FitResult {
+//        /*Инициализация объектов, задание исходных значений*/
+//        log.report("Starting fit using quasioptimal weights method.")
+//
+//        val fitPars = getFitPars(state, meta)
+//
+//        val curWeight = QoWeight(state, fitPars, state.parameters)
+//
+//        // вычисляем вес в allPar. Потом можно будет попробовать ручное задание веса
+//        log.report("The starting weight is: \n\t{}",
+//            MathUtils.toString(curWeight.theta))
+//
+//        //Стартовая точка такая же как и параметр веса
+//        /*Фитирование*/
+//        val res = newtonianRun(state, curWeight, log, meta)
+//
+//        /*Генерация результата*/
+//
+//        return FitResult.build(state.edit().setPars(res).build(), *fitPars)
+//    }
+
+    /**
+     * generateErrors.
+     */
+    private fun generateErrors(): Matrix<Double> {
+        logger?.log { """
+            Starting errors estimation using quasioptimal weights method. The starting weight is:
+                ${curWeight.theta}
+             """.trimIndent()}
+        val curWeight = QoWeight(startingPoint)
+
+        val covar = getCovariance(curWeight)
+
+        val decomposition = EigenDecomposition(covar.matrix)
+        var valid = true
+        for (lambda in decomposition.realEigenvalues) {
+            if (lambda <= 0) {
+                log.report("The covariance matrix is not positive defined. Error estimation is not valid")
+                valid = false
+            }
+        }
+    }
+
+
+    override suspend fun optimize(): OptimizationResult<Double> {
+        val curWeight = QoWeight(startingPoint)
+        logger?.log {
+            """
+            Starting fit using quasioptimal weights method. The starting weight is: 
+	            ${curWeight.theta}
+            """.trimIndent()
+        }
+        val res = newtonianRun(curWeight)
+    }
+
+
+    companion object : OptimizationProblemFactory<Double, QowFit> {
+        override fun build(symbols: List<Symbol>): QowFit {
+            TODO("Not yet implemented")
+        }
+
+
+        /**
+         * Constant `QOW_ENGINE_NAME="QOW"`
+         */
+        const val QOW_ENGINE_NAME = "QOW"
+
+        /**
+         * Constant `QOW_METHOD_FAST="fast"`
+         */
+        const val QOW_METHOD_FAST = "fast"
+
+
+    }
+}
+
-- 
2.34.1


From 7b6361e59d48d2ee12edbda6f99af91b1e38f0a5 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 26 Apr 2021 15:02:19 +0300
Subject: [PATCH 137/713] [WIP] optimization refactor in process

---
 .../commons/optimization/CMOptimization.kt    | 112 +++++----------
 .../kmath/commons/optimization/cmFit.kt       |   8 +-
 .../space/kscience/kmath/misc/Featured.kt     |   4 +-
 .../space/kscience/kmath/misc/logging.kt      |  14 ++
 .../optimization/FunctionOptimization.kt      | 130 +++++++-----------
 .../kmath/optimization/OptimizationProblem.kt |   6 +
 .../kscience/kmath/optimization/XYFit.kt      |  34 ++++-
 .../kscience/kmath/optimization/qow/QowFit.kt |   4 -
 8 files changed, 146 insertions(+), 166 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/logging.kt

diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
index db9ba6f21..6bde14627 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
@@ -11,10 +11,8 @@ import org.apache.commons.math3.optim.nonlinear.scalar.MultivariateOptimizer
 import org.apache.commons.math3.optim.nonlinear.scalar.ObjectiveFunction
 import org.apache.commons.math3.optim.nonlinear.scalar.ObjectiveFunctionGradient
 import org.apache.commons.math3.optim.nonlinear.scalar.gradient.NonLinearConjugateGradientOptimizer
-import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.AbstractSimplex
-import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.NelderMeadSimplex
-import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.SimplexOptimizer
-import space.kscience.kmath.expressions.*
+import space.kscience.kmath.expressions.derivative
+import space.kscience.kmath.expressions.withSymbols
 import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.optimization.*
@@ -24,107 +22,73 @@ public operator fun PointValuePair.component1(): DoubleArray = point
 public operator fun PointValuePair.component2(): Double = value
 
 public class CMOptimizerFactory(public val optimizerBuilder: () -> MultivariateOptimizer) : OptimizationFeature
-//public class CMOptimizerData(public val )
+public class CMOptimizerData(public val data: List<OptimizationData>) : OptimizationFeature {
+    public constructor(vararg data: OptimizationData) : this(data.toList())
+}
 
 @OptIn(UnstableKMathAPI::class)
 public class CMOptimization : Optimizer<FunctionOptimization<Double>> {
 
     override suspend fun process(
-        problem: FunctionOptimization<Double>
-    ): FunctionOptimization<Double> = withSymbols(problem.parameters){
-        val cmOptimizer: MultivariateOptimizer =
-            problem.getFeature<CMOptimizerFactory>()?.optimizerBuilder?.invoke() ?: SimplexOptimizer()
-
+        problem: FunctionOptimization<Double>,
+    ): FunctionOptimization<Double> = withSymbols(problem.parameters) {
         val convergenceChecker: ConvergenceChecker<PointValuePair> = SimpleValueChecker(
             DEFAULT_RELATIVE_TOLERANCE,
             DEFAULT_ABSOLUTE_TOLERANCE,
             DEFAULT_MAX_ITER
         )
 
+        val cmOptimizer: MultivariateOptimizer = problem.getFeature<CMOptimizerFactory>()?.optimizerBuilder?.invoke()
+            ?: NonLinearConjugateGradientOptimizer(
+                NonLinearConjugateGradientOptimizer.Formula.FLETCHER_REEVES,
+                convergenceChecker
+            )
+
         val optimizationData: HashMap<KClass<out OptimizationData>, OptimizationData> = HashMap()
 
         fun addOptimizationData(data: OptimizationData) {
             optimizationData[data::class] = data
         }
+
         addOptimizationData(MaxEval.unlimited())
         addOptimizationData(InitialGuess(problem.initialGuess.toDoubleArray()))
 
         fun exportOptimizationData(): List<OptimizationData> = optimizationData.values.toList()
 
-
-        /**
-         * Register no-deriv function instead of  differentiable function
-         */
-        /**
-         * Register no-deriv function instead of  differentiable function
-         */
-        fun noDerivFunction(expression: Expression<Double>): Unit {
-            val objectiveFunction = ObjectiveFunction {
-                val args = problem.initialGuess + it.toMap()
-                expression(args)
-            }
-            addOptimizationData(objectiveFunction)
+        val objectiveFunction = ObjectiveFunction {
+            val args = problem.initialGuess + it.toMap()
+            problem.expression(args)
         }
+        addOptimizationData(objectiveFunction)
 
-        public override fun function(expression: DifferentiableExpression<Double, Expression<Double>>) {
-            noDerivFunction(expression)
-            val gradientFunction = ObjectiveFunctionGradient {
-                val args = startingPoint + it.toMap()
-                DoubleArray(symbols.size) { index ->
-                    expression.derivative(symbols[index])(args)
-                }
-            }
-            addOptimizationData(gradientFunction)
-            if (optimizerBuilder == null) {
-                optimizerBuilder = {
-                    NonLinearConjugateGradientOptimizer(
-                        NonLinearConjugateGradientOptimizer.Formula.FLETCHER_REEVES,
-                        convergenceChecker
-                    )
+        val gradientFunction = ObjectiveFunctionGradient {
+            val args = problem.initialGuess + it.toMap()
+            DoubleArray(symbols.size) { index ->
+                problem.expression.derivative(symbols[index])(args)
+            }
+        }
+        addOptimizationData(gradientFunction)
+
+        val logger = problem.getFeature<OptimizationLog>()
+
+        for (feature in problem.features) {
+            when (feature) {
+                is CMOptimizerData -> feature.data.forEach { addOptimizationData(it) }
+                is FunctionOptimizationTarget -> when(feature){
+                    FunctionOptimizationTarget.MAXIMIZE -> addOptimizationData(GoalType.MAXIMIZE)
+                    FunctionOptimizationTarget.MINIMIZE -> addOptimizationData(GoalType.MINIMIZE)
                 }
+                else -> logger?.log { "The feature $feature is unused in optimization" }
             }
         }
 
-        public fun simplex(simplex: AbstractSimplex) {
-            addOptimizationData(simplex)
-            //Set optimization builder to simplex if it is not present
-            if (optimizerBuilder == null) {
-                optimizerBuilder = { SimplexOptimizer(convergenceChecker) }
-            }
-        }
-
-        public fun simplexSteps(steps: Map<Symbol, Double>) {
-            simplex(NelderMeadSimplex(steps.toDoubleArray()))
-        }
-
-        public fun goal(goalType: GoalType) {
-            addOptimizationData(goalType)
-        }
-
-        public fun optimizer(block: () -> MultivariateOptimizer) {
-            optimizerBuilder = block
-        }
-
-        override fun update(result: OptimizationResult<Double>) {
-            initialGuess(result.point)
-        }
-
-        override suspend fun optimize(): OptimizationResult<Double> {
-            val optimizer = optimizerBuilder?.invoke() ?: error("Optimizer not defined")
-            val (point, value) = optimizer.optimize(*optimizationData.values.toTypedArray())
-            return OptimizationResult(point.toMap(), value)
-        }
-        return@withSymbols TODO()
+        val (point, value) = cmOptimizer.optimize(*optimizationData.values.toTypedArray())
+        return problem.withFeatures(FunctionOptimizationResult(point.toMap(), value))
     }
 
-    public companion object : OptimizationProblemFactory<Double, CMOptimization> {
+    public companion object {
         public const val DEFAULT_RELATIVE_TOLERANCE: Double = 1e-4
         public const val DEFAULT_ABSOLUTE_TOLERANCE: Double = 1e-4
         public const val DEFAULT_MAX_ITER: Int = 1000
-
-        override fun build(symbols: List<Symbol>): CMOptimization = CMOptimization(symbols)
     }
 }
-
-public fun CMOptimization.initialGuess(vararg pairs: Pair<Symbol, Double>): Unit = initialGuess(pairs.toMap())
-public fun CMOptimization.simplexSteps(vararg pairs: Pair<Symbol, Double>): Unit = simplexSteps(pairs.toMap())
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
index 12d924063..9c0089b3d 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
@@ -17,22 +17,22 @@ import space.kscience.kmath.structures.asBuffer
 /**
  * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic differentiation
  */
-public fun FunctionOptimization.Companion.chiSquared(
+public fun FunctionOptimization.Companion.chiSquaredExpression(
     x: Buffer<Double>,
     y: Buffer<Double>,
     yErr: Buffer<Double>,
     model: DerivativeStructureField.(x: DerivativeStructure) -> DerivativeStructure,
-): DifferentiableExpression<Double, Expression<Double>> = chiSquared(DerivativeStructureField, x, y, yErr, model)
+): DifferentiableExpression<Double, Expression<Double>> = chiSquaredExpression(DerivativeStructureField, x, y, yErr, model)
 
 /**
  * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic differentiation
  */
-public fun FunctionOptimization.Companion.chiSquared(
+public fun FunctionOptimization.Companion.chiSquaredExpression(
     x: Iterable<Double>,
     y: Iterable<Double>,
     yErr: Iterable<Double>,
     model: DerivativeStructureField.(x: DerivativeStructure) -> DerivativeStructure,
-): DifferentiableExpression<Double, Expression<Double>> = chiSquared(
+): DifferentiableExpression<Double, Expression<Double>> = chiSquaredExpression(
     DerivativeStructureField,
     x.toList().asBuffer(),
     y.toList().asBuffer(),
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
index 157ff980b..a94efc788 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
@@ -17,7 +17,7 @@ public interface Featured<F : Any> {
 /**
  * A container for a set of features
  */
-public class FeatureSet<F : Any> private constructor(public val features: Map<KClass<out F>, Any>) : Featured<F> {
+public class FeatureSet<F : Any> private constructor(public val features: Map<KClass<out F>, F>) : Featured<F> {
     @Suppress("UNCHECKED_CAST")
     override fun <T : F> getFeature(type: KClass<out T>): T? = features[type] as? T
 
@@ -31,6 +31,8 @@ public class FeatureSet<F : Any> private constructor(public val features: Map<KC
     public fun with(vararg otherFeatures: F): FeatureSet<F> =
         FeatureSet(features + otherFeatures.associateBy { it::class })
 
+    public operator fun iterator(): Iterator<F> = features.values.iterator()
+
     public companion object {
         public fun <F : Any> of(vararg features: F): FeatureSet<F> = FeatureSet(features.associateBy { it::class })
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/logging.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/logging.kt
new file mode 100644
index 000000000..d13840841
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/logging.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.misc
+
+public interface Loggable {
+    public fun log(tag: String = INFO, block: () -> String)
+
+    public companion object {
+        public const val INFO: String = "INFO"
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
index 12ccea1d8..db613e236 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
@@ -15,91 +15,57 @@ import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.indices
 
+public class FunctionOptimizationResult<T>(point: Map<Symbol, T>, public val value: T) : OptimizationResult<T>(point)
 
-public class FunctionOptimization<T : Any>(
+public enum class FunctionOptimizationTarget : OptimizationFeature {
+    MAXIMIZE,
+    MINIMIZE
+}
+
+public class FunctionOptimization<T>(
     override val features: FeatureSet<OptimizationFeature>,
     public val expression: DifferentiableExpression<T, Expression<T>>,
     public val initialGuess: Map<Symbol, T>,
     public val parameters: Collection<Symbol>,
-    public val maximize: Boolean,
-) : OptimizationProblem
+) : OptimizationProblem{
+    public companion object{
+        /**
+         * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic differentiation
+         */
+        public fun <T : Any, I : Any, A> chiSquaredExpression(
+            autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
+            x: Buffer<T>,
+            y: Buffer<T>,
+            yErr: Buffer<T>,
+            model: A.(I) -> I,
+        ): DifferentiableExpression<T, Expression<T>> where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> {
+            require(x.size == y.size) { "X and y buffers should be of the same size" }
+            require(y.size == yErr.size) { "Y and yErr buffer should of the same size" }
+
+            return autoDiff.process {
+                var sum = zero
+
+                x.indices.forEach {
+                    val xValue = const(x[it])
+                    val yValue = const(y[it])
+                    val yErrValue = const(yErr[it])
+                    val modelValue = model(xValue)
+                    sum += ((yValue - modelValue) / yErrValue).pow(2)
+                }
+
+                sum
+            }
+        }
+    }
+}
+
+
+public fun <T> FunctionOptimization<T>.withFeatures(
+    vararg newFeature: OptimizationFeature,
+): FunctionOptimization<T> = FunctionOptimization(
+    features.with(*newFeature),
+    expression,
+    initialGuess,
+    parameters
+)
 
-//
-///**
-// * A likelihood function optimization problem with provided derivatives
-// */
-//public interface FunctionOptimizationBuilder<T : Any> {
-//    /**
-//     * The optimization direction. If true search for function maximum, if false, search for the minimum
-//     */
-//    public var maximize: Boolean
-//
-//    /**
-//     * Define the initial guess for the optimization problem
-//     */
-//    public fun initialGuess(map: Map<Symbol, T>)
-//
-//    /**
-//     * Set a differentiable expression as objective function as function and gradient provider
-//     */
-//    public fun function(expression: DifferentiableExpression<T, Expression<T>>)
-//
-//    public companion object {
-//        /**
-//         * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic differentiation
-//         */
-//        public fun <T : Any, I : Any, A> chiSquared(
-//            autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
-//            x: Buffer<T>,
-//            y: Buffer<T>,
-//            yErr: Buffer<T>,
-//            model: A.(I) -> I,
-//        ): DifferentiableExpression<T, Expression<T>> where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> {
-//            require(x.size == y.size) { "X and y buffers should be of the same size" }
-//            require(y.size == yErr.size) { "Y and yErr buffer should of the same size" }
-//
-//            return autoDiff.process {
-//                var sum = zero
-//
-//                x.indices.forEach {
-//                    val xValue = const(x[it])
-//                    val yValue = const(y[it])
-//                    val yErrValue = const(yErr[it])
-//                    val modelValue = model(xValue)
-//                    sum += ((yValue - modelValue) / yErrValue).pow(2)
-//                }
-//
-//                sum
-//            }
-//        }
-//    }
-//}
-//
-///**
-// * Define a chi-squared-based objective function
-// */
-//public fun <T : Any, I : Any, A> FunctionOptimization<T>.chiSquared(
-//    autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
-//    x: Buffer<T>,
-//    y: Buffer<T>,
-//    yErr: Buffer<T>,
-//    model: A.(I) -> I,
-//) where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> {
-//    val chiSquared = FunctionOptimization.chiSquared(autoDiff, x, y, yErr, model)
-//    function(chiSquared)
-//    maximize = false
-//}
-//
-///**
-// * Optimize differentiable expression using specific [OptimizationProblemFactory]
-// */
-//public suspend fun <T : Any, F : FunctionOptimization<T>> DifferentiableExpression<T, Expression<T>>.optimizeWith(
-//    factory: OptimizationProblemFactory<T, F>,
-//    vararg symbols: Symbol,
-//    configuration: F.() -> Unit,
-//): OptimizationResult<T> {
-//    require(symbols.isNotEmpty()) { "Must provide a list of symbols for optimization" }
-//    val problem = factory(symbols.toList(), configuration)
-//    problem.function(this)
-//    return problem.optimize()
-//}
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
index 9a5420be6..0d2e3cb83 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
@@ -7,6 +7,8 @@ package space.kscience.kmath.optimization
 
 import space.kscience.kmath.misc.FeatureSet
 import space.kscience.kmath.misc.Featured
+import space.kscience.kmath.misc.Loggable
+import space.kscience.kmath.misc.Symbol
 import kotlin.reflect.KClass
 
 public interface OptimizationFeature
@@ -18,6 +20,10 @@ public interface OptimizationProblem : Featured<OptimizationFeature> {
 
 public inline fun <reified T : OptimizationFeature> OptimizationProblem.getFeature(): T? = getFeature(T::class)
 
+public open class OptimizationResult<T>(public val point: Map<Symbol, T>) : OptimizationFeature
+
+public class OptimizationLog(private val loggable: Loggable) : Loggable by loggable, OptimizationFeature
+
 //public class OptimizationResult<T>(
 //    public val point: Map<Symbol, T>,
 //    public val value: T,
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
index e4998c665..f1b6ef38d 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
@@ -14,9 +14,11 @@ import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.Field
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.indices
 
 @UnstableKMathAPI
-public interface XYFit<T> : OptimizationProblem<T> {
+public interface XYFit<T> : OptimizationProblem {
 
     public val algebra: Field<T>
 
@@ -42,4 +44,34 @@ public interface XYFit<T> : OptimizationProblem<T> {
     ): Unit where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> = model { arg ->
         autoDiff.process { modelFunction(const(arg)) }
     }
+}
+
+//
+///**
+// * Define a chi-squared-based objective function
+// */
+//public fun <T : Any, I : Any, A> FunctionOptimization<T>.chiSquared(
+//    autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
+//    x: Buffer<T>,
+//    y: Buffer<T>,
+//    yErr: Buffer<T>,
+//    model: A.(I) -> I,
+//) where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> {
+//    val chiSquared = FunctionOptimization.chiSquared(autoDiff, x, y, yErr, model)
+//    function(chiSquared)
+//    maximize = false
+//}
+
+/**
+ * Optimize differentiable expression using specific [OptimizationProblemFactory]
+ */
+public suspend fun <T : Any, F : FunctionOptimization<T>> DifferentiableExpression<T, Expression<T>>.optimizeWith(
+    factory: OptimizationProblemFactory<T, F>,
+    vararg symbols: Symbol,
+    configuration: F.() -> Unit,
+): OptimizationResult<T> {
+    require(symbols.isNotEmpty()) { "Must provide a list of symbols for optimization" }
+    val problem = factory(symbols.toList(), configuration)
+    problem.function(this)
+    return problem.optimize()
 }
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt
index 02fd12dbc..d611adf50 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt
@@ -27,10 +27,6 @@ import kotlin.math.pow
 
 private typealias ParamSet = Map<Symbol, Double>
 
-public fun interface FitLogger {
-    public fun log(block: () -> String)
-}
-
 @OptIn(UnstableKMathAPI::class)
 public class QowFit(
     override val symbols: List<Symbol>,
-- 
2.34.1


From 2c001cb1b32f25dc4c245bc32b4046bf78e85cca Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Mon, 26 Apr 2021 17:07:49 +0300
Subject: [PATCH 138/713] fix div + simple tests

---
 .../tensors/core/algebras/DoubleTensorAlgebra.kt   |  9 +++++++--
 .../kmath/tensors/core/TestDoubleTensorAlgebra.kt  | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index b61a484d0..7414a4469 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -180,12 +180,17 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
 
     override fun Double.div(other: TensorStructure<Double>): DoubleTensor {
         val resBuffer = DoubleArray(other.tensor.numElements) { i ->
-            other.tensor.buffer.array()[other.tensor.bufferStart + i] / this
+            this / other.tensor.buffer.array()[other.tensor.bufferStart + i]
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.div(value: Double): DoubleTensor = value / tensor
+    override fun TensorStructure<Double>.div(value: Double): DoubleTensor {
+        val resBuffer = DoubleArray(tensor.numElements) { i ->
+            tensor.buffer.array()[tensor.bufferStart + i] / value
+        }
+        return DoubleTensor(shape, resBuffer)
+    }
 
     override fun TensorStructure<Double>.div(other: TensorStructure<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other)
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 10a9176dc..1333a7a1f 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -15,6 +15,20 @@ class TestDoubleTensorAlgebra {
         assertTrue(res.buffer.array() contentEquals doubleArrayOf(11.0, 12.0))
     }
 
+    @Test
+    fun doubleDiv() = DoubleTensorAlgebra {
+        val tensor = fromArray(intArrayOf(2), doubleArrayOf(2.0, 4.0))
+        val res = 2.0/tensor
+        assertTrue(res.buffer.array() contentEquals doubleArrayOf(1.0, 0.5))
+    }
+
+    @Test
+    fun divDouble() = DoubleTensorAlgebra {
+        val tensor = fromArray(intArrayOf(2), doubleArrayOf(10.0, 5.0))
+        val res = tensor / 2.5
+        assertTrue(res.buffer.array() contentEquals doubleArrayOf(4.0, 2.0))
+    }
+
     @Test
     fun transpose1x1() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(1), doubleArrayOf(0.0))
-- 
2.34.1


From 30ca333c040b09ca65d528b052fa27492161654a Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Mon, 26 Apr 2021 17:27:50 +0300
Subject: [PATCH 139/713] OLS/SVD example

---
 examples/build.gradle.kts                     |  1 +
 .../kscience/kmath/tensors/OLSWithSVD.kt      | 68 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 56feee9dc..a4eabc2b8 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -28,6 +28,7 @@ dependencies {
     implementation(project(":kmath-dimensions"))
     implementation(project(":kmath-ejml"))
     implementation(project(":kmath-nd4j"))
+    implementation(project(":kmath-tensors"))
 
     implementation(project(":kmath-for-real"))
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
new file mode 100644
index 000000000..063a1d1c4
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors
+
+import space.kscience.kmath.tensors.core.DoubleTensor
+import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
+import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
+
+// OLS estimator using SVD
+
+fun main() {
+    //seed for random
+    val randSeed = 100500L
+
+    // work in context with linear operations
+    DoubleLinearOpsTensorAlgebra {
+        // take coefficient vector from normal distribution
+        val alpha = randNormal(
+            intArrayOf(5),
+            randSeed
+        ) + fromArray(
+            intArrayOf(5),
+            doubleArrayOf(1.0, 2.5, 3.4, 5.0, 10.1)
+        )
+
+        println("Real alpha:\n" +
+                "$alpha")
+
+        // also take sample of size 20 from normal distribution for x TODO rename
+        val x = randNormal(
+            intArrayOf(20, 5),
+            randSeed
+        )
+
+        // calculate y and add gaussian noise (N(0, 0.05)) TODO rename
+        val y = x dot alpha
+        y += y.randNormalLike(randSeed) * 0.05
+
+        // now restore the coefficient vector with OSL estimator with SVD
+        val (u, singValues, v) = x.svd()
+
+        // we have to make sure the singular values of the matrix are not close to zero
+        println("Singular values:\n" +
+                "$singValues")
+        // TODO something with Boolean tensors
+
+        // inverse Sigma matrix can be restored from singular values with diagonalEmbedding function
+        val sigma = diagonalEmbedding(1.0/singValues)
+
+        val alphaOLS = v dot sigma dot u.transpose() dot y
+        println("Estimated alpha:\n" +
+                "$alphaOLS")
+
+        // figure out MSE of approximation
+        fun mse(yTrue: DoubleTensor, yPred: DoubleTensor): Double = DoubleAnalyticTensorAlgebra{
+            require(yTrue.shape.size == 1)
+            require(yTrue.shape contentEquals yPred.shape)
+
+            val diff = yTrue - yPred
+            diff.dot(diff).sqrt().value()
+        }
+
+        println("MSE: ${mse(alpha, alphaOLS)}")
+    }
+}
\ No newline at end of file
-- 
2.34.1


From c2db3a23e1e6a14463d3dadac6d279ccabb49272 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 26 Apr 2021 16:24:26 +0100
Subject: [PATCH 140/713] Feedback for SVD

---
 .../space/kscience/kmath/tensors/OLSWithSVD.kt  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index 063a1d1c4..a9b154017 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -9,6 +9,8 @@ import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
 import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
 
+import kotlin.math.abs
+
 // OLS estimator using SVD
 
 fun main() {
@@ -26,8 +28,7 @@ fun main() {
             doubleArrayOf(1.0, 2.5, 3.4, 5.0, 10.1)
         )
 
-        println("Real alpha:\n" +
-                "$alpha")
+        println("Real alpha:\n$alpha")
 
         // also take sample of size 20 from normal distribution for x TODO rename
         val x = randNormal(
@@ -35,20 +36,22 @@ fun main() {
             randSeed
         )
 
-        // calculate y and add gaussian noise (N(0, 0.05)) TODO rename
+        // calculate y and add gaussian noise (N(0, 0.05))
+        // TODO: please add an intercept: Y = beta * X + alpha + N(0,0.5)
         val y = x dot alpha
         y += y.randNormalLike(randSeed) * 0.05
 
         // now restore the coefficient vector with OSL estimator with SVD
+        // TODO: you need to change accordingly [X 1] [alpha beta] = Y
+        // TODO: inverting [X 1] via SVD
         val (u, singValues, v) = x.svd()
 
         // we have to make sure the singular values of the matrix are not close to zero
-        println("Singular values:\n" +
-                "$singValues")
-        // TODO something with Boolean tensors
+        println("Singular values:\n$singValues")
+
 
         // inverse Sigma matrix can be restored from singular values with diagonalEmbedding function
-        val sigma = diagonalEmbedding(1.0/singValues)
+        val sigma = diagonalEmbedding(singValues.map{ x -> if (abs(x) < 1e-3) 0.0 else 1.0/x })
 
         val alphaOLS = v dot sigma dot u.transpose() dot y
         println("Estimated alpha:\n" +
-- 
2.34.1


From 23ea4a95a151e8ce1a70566a4ede3c7d343e5caa Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Tue, 27 Apr 2021 19:01:54 +0100
Subject: [PATCH 141/713] Fixed strides flipping

---
 .../kmath/tensors/core/BufferedTensor.kt      | 23 +++++---
 .../kmath/tensors/core/TestDoubleTensor.kt    | 58 ++++++++++---------
 2 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 1e9b458b1..6e1cab11a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -37,9 +37,8 @@ public class IntTensor internal constructor(
     shape: IntArray,
     buffer: IntArray,
     offset: Int = 0
-) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset)
-{
-    internal constructor(bufferedTensor: BufferedTensor<Int>):
+) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset) {
+    internal constructor(bufferedTensor: BufferedTensor<Int>) :
             this(bufferedTensor.shape, bufferedTensor.buffer.array(), bufferedTensor.bufferStart)
 }
 
@@ -47,9 +46,8 @@ public class DoubleTensor internal constructor(
     shape: IntArray,
     buffer: DoubleArray,
     offset: Int = 0
-) : BufferedTensor<Double>(shape, DoubleBuffer(buffer), offset)
-{
-    internal constructor(bufferedTensor: BufferedTensor<Double>):
+) : BufferedTensor<Double>(shape, DoubleBuffer(buffer), offset) {
+    internal constructor(bufferedTensor: BufferedTensor<Double>) :
             this(bufferedTensor.shape, bufferedTensor.buffer.array(), bufferedTensor.bufferStart)
 
     override fun toString(): String = toPrettyString()
@@ -59,10 +57,17 @@ public class DoubleTensor internal constructor(
 internal inline fun BufferedTensor<Int>.asTensor(): IntTensor = IntTensor(this)
 internal inline fun BufferedTensor<Double>.asTensor(): DoubleTensor = DoubleTensor(this)
 
+internal inline fun <T> TensorStructure<T>.copyToBufferedTensor(): BufferedTensor<T> =
+    BufferedTensor(
+        this.shape,
+        TensorLinearStructure(this.shape).indices().map(this::get).toMutableList().asMutableBuffer(), 0
+    )
+
 internal inline fun <T> TensorStructure<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
     is BufferedTensor<T> -> this
-    is MutableBufferND<T> -> BufferedTensor(this.shape, this.mutableBuffer, 0)
-    else -> BufferedTensor(this.shape, this.elements().map{ it.second }.toMutableList().asMutableBuffer(), 0)
+    is MutableBufferND<T> -> if (this.strides.strides.toIntArray() contentEquals TensorLinearStructure(this.shape).strides)
+        BufferedTensor(this.shape, this.mutableBuffer, 0) else this.copyToBufferedTensor()
+    else -> this.copyToBufferedTensor()
 }
 
 internal val TensorStructure<Double>.tensor: DoubleTensor
@@ -77,3 +82,5 @@ internal val TensorStructure<Int>.tensor: IntTensor
         else -> this.toBufferedTensor().asTensor()
     }
 
+public fun TensorStructure<Double>.toTypedTensor(): DoubleTensor = this.tensor
+public fun TensorStructure<Int>.toTypedTensor(): IntTensor = this.tensor
\ No newline at end of file
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index f9d15c216..7103eafaa 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -23,62 +23,64 @@ class TestDoubleTensor {
 
     @Test
     fun stridesTest() = DoubleTensorAlgebra {
-        val tensor = fromArray(intArrayOf(2,2), doubleArrayOf(3.5,5.8,58.4,2.4))
-        assertEquals(tensor[intArrayOf(0,1)], 5.8)
-        assertTrue(tensor.elements().map{ it.second }.toList().toDoubleArray() contentEquals tensor.buffer.toDoubleArray())
+        val tensor = fromArray(intArrayOf(2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
+        assertEquals(tensor[intArrayOf(0, 1)], 5.8)
+        assertTrue(
+            tensor.elements().map { it.second }.toList().toDoubleArray() contentEquals tensor.buffer.toDoubleArray()
+        )
     }
 
     @Test
     fun getTest() = DoubleTensorAlgebra {
-        val tensor = fromArray(intArrayOf(1,2,2), doubleArrayOf(3.5,5.8,58.4,2.4))
+        val tensor = fromArray(intArrayOf(1, 2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
         val matrix = tensor[0].as2D()
-        assertEquals(matrix[0,1], 5.8)
+        assertEquals(matrix[0, 1], 5.8)
 
         val vector = tensor[0][1].as1D()
         assertEquals(vector[0], 58.4)
 
-        matrix[0,1] = 77.89
-        assertEquals(tensor[intArrayOf(0,0,1)], 77.89)
+        matrix[0, 1] = 77.89
+        assertEquals(tensor[intArrayOf(0, 0, 1)], 77.89)
 
         vector[0] = 109.56
-        assertEquals(tensor[intArrayOf(0,1,0)], 109.56)
+        assertEquals(tensor[intArrayOf(0, 1, 0)], 109.56)
 
         tensor.matrixSequence().forEach {
             val a = it.asTensor()
             val secondRow = a[1].as1D()
-            val secondColumn = a.transpose(0,1)[1].as1D()
+            val secondColumn = a.transpose(0, 1)[1].as1D()
             assertEquals(secondColumn[0], 77.89)
             assertEquals(secondRow[1], secondColumn[1])
         }
     }
 
     @Test
-    fun bufferProtocol() {
+    fun noBufferProtocol() {
 
-        // create buffers
-        val doubleBuffer = DoubleBuffer(doubleArrayOf(1.0,2.0,3.0))
-        val doubleList = MutableList(3, doubleBuffer::get)
+        // create buffer
+        val doubleArray = DoubleBuffer(doubleArrayOf(1.0, 2.0, 3.0))
 
-        // create ND buffers
-        val ndBuffer = MutableBufferND(DefaultStrides(intArrayOf(3)), doubleBuffer)
-        val ndList = MutableBufferND(DefaultStrides(intArrayOf(3)), doubleList.asMutableBuffer())
+        // create ND buffers, no data is copied
+        val ndArray = MutableBufferND(DefaultStrides(intArrayOf(3)), doubleArray)
 
         // map to tensors
-        val bufferedTensorBuffer = ndBuffer.toBufferedTensor() // strides are flipped
-        val tensorBuffer = bufferedTensorBuffer.asTensor() // no data copied
+        val bufferedTensorArray = ndArray.toBufferedTensor() // strides are flipped so data copied
+        val tensorArray = bufferedTensorArray.asTensor() // data not contiguous so copied again
 
-        val bufferedTensorList = ndList.toBufferedTensor() // strides are flipped
-        val tensorList = bufferedTensorList.asTensor() // data copied
+        val tensorArrayPublic = ndArray.toTypedTensor() // public API, data copied twice
+        val sharedTensorArray = tensorArrayPublic.toTypedTensor() // no data copied by matching type
 
-        tensorBuffer[intArrayOf(0)] = 55.9
-        assertEquals(ndBuffer[intArrayOf(0)], 55.9)
-        assertEquals(doubleBuffer[0], 55.9)
+        assertTrue(tensorArray.buffer.array() contentEquals sharedTensorArray.buffer.array())
 
-        tensorList[intArrayOf(0)] = 55.9
-        assertEquals(ndList[intArrayOf(0)], 1.0)
-        assertEquals(doubleList[0], 1.0)
+        tensorArray[intArrayOf(0)] = 55.9
+        assertEquals(tensorArrayPublic[intArrayOf(0)], 1.0)
+
+        tensorArrayPublic[intArrayOf(0)] = 55.9
+        assertEquals(sharedTensorArray[intArrayOf(0)], 55.9)
+        assertEquals(bufferedTensorArray[intArrayOf(0)], 1.0)
+
+        bufferedTensorArray[intArrayOf(0)] = 55.9
+        assertEquals(ndArray[intArrayOf(0)], 1.0)
 
-        ndList[intArrayOf(0)] = 55.9
-        assertEquals(doubleList[0], 55.9)
     }
 }
\ No newline at end of file
-- 
2.34.1


From e3f7b7a5fa560d4084a16a611b0266576d1e5728 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 28 Apr 2021 10:25:03 +0700
Subject: [PATCH 142/713] Promote kmath-ast as experimental, mark AST Rendering
 and WASM with @UnstableKMathAPI

---
 kmath-ast/build.gradle.kts                    |   6 +-
 .../kotlin/space/kscience/kmath/ast/parser.kt |   1 -
 .../ast/rendering/LatexSyntaxRenderer.kt      |   3 +
 .../ast/rendering/MathMLSyntaxRenderer.kt     |   5 +-
 .../kmath/ast/rendering/MathRenderer.kt       |   4 +
 .../kmath/ast/rendering/MathSyntax.kt         |  25 ++
 .../kmath/ast/rendering/SyntaxRenderer.kt     |   4 +
 .../kscience/kmath/ast/rendering/features.kt  | 280 ++++++++++++------
 .../kscience/kmath/ast/rendering/stages.kt    |   4 +
 .../kmath/ast/ParserPrecedenceTest.kt         |   1 -
 .../kscience/kmath/ast/rendering/TestUtils.kt |   6 +-
 .../nonDeclarations.WebAssembly.kt            |   3 +-
 .../kmath/wasm/internal/WasmBuilder.kt        |   2 +-
 .../kotlin/space/kscience/kmath/wasm/wasm.kt  |   9 +
 .../kscience/kmath/asm/internal/AsmBuilder.kt |   4 +-
 .../kmath/asm/internal/codegenUtils.kt        |   2 +-
 16 files changed, 259 insertions(+), 100 deletions(-)

diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index b4a0b28ac..508374d82 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -18,6 +18,10 @@ kotlin.js {
 }
 
 kotlin.sourceSets {
+    filter { it.name.contains("test", true) }
+        .map(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::languageSettings)
+        .forEach { it.useExperimentalAnnotation("space.kscience.kmath.misc.UnstableKMathAPI") }
+
     commonMain {
         dependencies {
             api("com.github.h0tk3y.betterParse:better-parse:0.4.2")
@@ -54,7 +58,7 @@ tasks.dokkaHtml {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
index d2e92c37f..246625d29 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
@@ -29,7 +29,6 @@ import space.kscience.kmath.operations.RingOperations
  * @author Iaroslav Postovalov
  */
 public object ArithmeticsEvaluator : Grammar<MST>() {
-    // TODO replace with "...".toRegex() when better-parse 0.4.1 is released
     private val num: Token by regexToken("[\\d.]+(?:[eE][-+]?\\d+)?".toRegex())
     private val id: Token by regexToken("[a-z_A-Z][\\da-z_A-Z]*".toRegex())
     private val lpar: Token by literalToken("(")
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
index 1c82bd6e7..5909f1f9d 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.ast.rendering
 
+import space.kscience.kmath.misc.UnstableKMathAPI
+
 /**
  * [SyntaxRenderer] implementation for LaTeX.
  *
@@ -23,6 +25,7 @@ package space.kscience.kmath.ast.rendering
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public object LatexSyntaxRenderer : SyntaxRenderer {
     public override fun render(node: MathSyntax, output: Appendable): Unit = output.run {
         fun render(syntax: MathSyntax) = render(syntax, output)
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
index decd4ba46..517ec0dc9 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.ast.rendering
 
+import space.kscience.kmath.misc.UnstableKMathAPI
+
 /**
  * [SyntaxRenderer] implementation for MathML.
  *
@@ -12,9 +14,10 @@ package space.kscience.kmath.ast.rendering
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public object MathMLSyntaxRenderer : SyntaxRenderer {
     public override fun render(node: MathSyntax, output: Appendable) {
-        output.append("<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mrow>")
+        output.append("<math xmlns=\"https://www.w3.org/1998/Math/MathML\"><mrow>")
         render0(node, output)
         output.append("</mrow></math>")
     }
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
index 9df2c54dd..6b22ac519 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
@@ -6,12 +6,14 @@
 package space.kscience.kmath.ast.rendering
 
 import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.misc.UnstableKMathAPI
 
 /**
  * Renders [MST] to [MathSyntax].
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun interface MathRenderer {
     /**
      * Renders [MST] to [MathSyntax].
@@ -25,6 +27,7 @@ public fun interface MathRenderer {
  * @property features The applied features.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public open class FeaturedMathRenderer(public val features: List<RenderFeature>) : MathRenderer {
     public override fun render(mst: MST): MathSyntax {
         for (feature in features) feature.render(this, mst)?.let { return it }
@@ -48,6 +51,7 @@ public open class FeaturedMathRenderer(public val features: List<RenderFeature>)
  * @property stages The applied stages.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public open class FeaturedMathRendererWithPostProcess(
     features: List<RenderFeature>,
     public val stages: List<PostProcessStage>,
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
index 6a46bf535..3c023e342 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
@@ -5,11 +5,14 @@
 
 package space.kscience.kmath.ast.rendering
 
+import space.kscience.kmath.misc.UnstableKMathAPI
+
 /**
  * Mathematical typography syntax node.
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public sealed class MathSyntax {
     /**
      * The parent node of this syntax node.
@@ -22,6 +25,7 @@ public sealed class MathSyntax {
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public sealed class TerminalSyntax : MathSyntax()
 
 /**
@@ -29,6 +33,7 @@ public sealed class TerminalSyntax : MathSyntax()
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public sealed class OperationSyntax : MathSyntax() {
     /**
      * The operation token.
@@ -41,6 +46,7 @@ public sealed class OperationSyntax : MathSyntax() {
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public sealed class UnarySyntax : OperationSyntax() {
     /**
      * The operand of this node.
@@ -53,6 +59,7 @@ public sealed class UnarySyntax : OperationSyntax() {
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public sealed class BinarySyntax : OperationSyntax() {
     /**
      * The left-hand side operand.
@@ -71,6 +78,7 @@ public sealed class BinarySyntax : OperationSyntax() {
  * @property string The digits of number.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class NumberSyntax(public var string: String) : TerminalSyntax()
 
 /**
@@ -79,6 +87,7 @@ public data class NumberSyntax(public var string: String) : TerminalSyntax()
  * @property string The symbol.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class SymbolSyntax(public var string: String) : TerminalSyntax()
 
 /**
@@ -89,6 +98,7 @@ public data class SymbolSyntax(public var string: String) : TerminalSyntax()
  * @see UnaryOperatorSyntax
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class OperatorNameSyntax(public var name: String) : TerminalSyntax()
 
 /**
@@ -97,6 +107,7 @@ public data class OperatorNameSyntax(public var name: String) : TerminalSyntax()
  * @property kind The kind of symbol.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class SpecialSymbolSyntax(public var kind: Kind) : TerminalSyntax() {
     /**
      * The kind of symbol.
@@ -121,6 +132,7 @@ public data class SpecialSymbolSyntax(public var kind: Kind) : TerminalSyntax()
  * @property parentheses Whether the operand should be wrapped with parentheses.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class OperandSyntax(
     public val operand: MathSyntax,
     public var parentheses: Boolean,
@@ -136,6 +148,7 @@ public data class OperandSyntax(
  * @property prefix The prefix.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class UnaryOperatorSyntax(
     public override val operation: String,
     public var prefix: MathSyntax,
@@ -151,6 +164,7 @@ public data class UnaryOperatorSyntax(
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class UnaryPlusSyntax(
     public override val operation: String,
     public override val operand: OperandSyntax,
@@ -165,6 +179,7 @@ public data class UnaryPlusSyntax(
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class UnaryMinusSyntax(
     public override val operation: String,
     public override val operand: OperandSyntax,
@@ -180,6 +195,7 @@ public data class UnaryMinusSyntax(
  * @property operand The radicand.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class RadicalSyntax(
     public override val operation: String,
     public override val operand: MathSyntax,
@@ -197,6 +213,7 @@ public data class RadicalSyntax(
  * (*e<sup>x</sup>*).
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class ExponentSyntax(
     public override val operation: String,
     public override val operand: OperandSyntax,
@@ -214,6 +231,7 @@ public data class ExponentSyntax(
  * @property right The superscript.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class SuperscriptSyntax(
     public override val operation: String,
     public override val left: MathSyntax,
@@ -232,6 +250,7 @@ public data class SuperscriptSyntax(
  * @property right The subscript.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class SubscriptSyntax(
     public override val operation: String,
     public override val left: MathSyntax,
@@ -249,6 +268,7 @@ public data class SubscriptSyntax(
  * @property prefix The prefix.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class BinaryOperatorSyntax(
     public override val operation: String,
     public var prefix: MathSyntax,
@@ -268,6 +288,7 @@ public data class BinaryOperatorSyntax(
  * @param right The addend.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class BinaryPlusSyntax(
     public override val operation: String,
     public override val left: OperandSyntax,
@@ -286,6 +307,7 @@ public data class BinaryPlusSyntax(
  * @param right The subtrahend.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class BinaryMinusSyntax(
     public override val operation: String,
     public override val left: OperandSyntax,
@@ -304,6 +326,7 @@ public data class BinaryMinusSyntax(
  * @property right The denominator.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class FractionSyntax(
     public override val operation: String,
     public override val left: MathSyntax,
@@ -322,6 +345,7 @@ public data class FractionSyntax(
  * @property right The radicand.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class RadicalWithIndexSyntax(
     public override val operation: String,
     public override val left: MathSyntax,
@@ -341,6 +365,7 @@ public data class RadicalWithIndexSyntax(
  * @property times whether the times (&times;) symbol should be used.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public data class MultiplicationSyntax(
     public override val operation: String,
     public override val left: OperandSyntax,
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
index 7fa91e158..fb2b3b66f 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
@@ -5,12 +5,15 @@
 
 package space.kscience.kmath.ast.rendering
 
+import space.kscience.kmath.misc.UnstableKMathAPI
+
 /**
  * Abstraction of writing [MathSyntax] as a string of an actual markup language. Typical implementation should
  * involve traversal of MathSyntax with handling each its subtype.
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun interface SyntaxRenderer {
     /**
      * Renders the [MathSyntax] to [output].
@@ -23,6 +26,7 @@ public fun interface SyntaxRenderer {
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun SyntaxRenderer.renderWithStringBuilder(node: MathSyntax): String {
     val sb = StringBuilder()
     render(node, sb)
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index c09282bb6..c1b513345 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.ast.rendering
 
 import space.kscience.kmath.ast.rendering.FeaturedMathRenderer.RenderFeature
 import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import kotlin.reflect.KClass
 
@@ -15,11 +16,12 @@ import kotlin.reflect.KClass
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public object PrintSymbolic : RenderFeature {
-    public override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? {
-        if (node !is MST.Symbolic) return null
-        return SymbolSyntax(string = node.value)
-    }
+    public override fun render(renderer: FeaturedMathRenderer, node: MST): SymbolSyntax? =
+        if (node !is MST.Symbolic) null
+        else
+            SymbolSyntax(string = node.value)
 }
 
 /**
@@ -27,25 +29,25 @@ public object PrintSymbolic : RenderFeature {
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public object PrintNumeric : RenderFeature {
-    public override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? {
-        if (node !is MST.Numeric) return null
-        return NumberSyntax(string = node.value.toString())
-    }
+    public override fun render(renderer: FeaturedMathRenderer, node: MST): NumberSyntax? = if (node !is MST.Numeric)
+        null
+    else
+        NumberSyntax(string = node.value.toString())
 }
 
-private fun printSignedNumberString(s: String): MathSyntax {
-    if (s.startsWith('-'))
-        return UnaryMinusSyntax(
-            operation = GroupOperations.MINUS_OPERATION,
-            operand = OperandSyntax(
-                operand = NumberSyntax(string = s.removePrefix("-")),
-                parentheses = true,
-            ),
-        )
-
-    return NumberSyntax(string = s)
-}
+@UnstableKMathAPI
+private fun printSignedNumberString(s: String): MathSyntax = if (s.startsWith('-'))
+    UnaryMinusSyntax(
+        operation = GroupOperations.MINUS_OPERATION,
+        operand = OperandSyntax(
+            operand = NumberSyntax(string = s.removePrefix("-")),
+            parentheses = true,
+        ),
+    )
+else
+    NumberSyntax(string = s)
 
 /**
  * Special printing for numeric types which are printed in form of
@@ -53,9 +55,11 @@ private fun printSignedNumberString(s: String): MathSyntax {
  *
  * @property types The suitable types.
  */
+@UnstableKMathAPI
 public class PrettyPrintFloats(public val types: Set<KClass<out Number>>) : RenderFeature {
     public override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? {
         if (node !is MST.Numeric || node.value::class !in types) return null
+
         val toString = when (val v = node.value) {
             is Float -> v.multiplatformToString()
             is Double -> v.multiplatformToString()
@@ -110,11 +114,13 @@ public class PrettyPrintFloats(public val types: Set<KClass<out Number>>) : Rend
  *
  * @property types The suitable types.
  */
+@UnstableKMathAPI
 public class PrettyPrintIntegers(public val types: Set<KClass<out Number>>) : RenderFeature {
-    public override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? {
-        if (node !is MST.Numeric || node.value::class !in types) return null
-        return printSignedNumberString(node.value.toString())
-    }
+    public override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? =
+        if (node !is MST.Numeric || node.value::class !in types)
+            null
+        else
+            printSignedNumberString(node.value.toString())
 
     public companion object {
         /**
@@ -130,11 +136,13 @@ public class PrettyPrintIntegers(public val types: Set<KClass<out Number>>) : Re
  *
  * @property symbols The allowed symbols.
  */
+@UnstableKMathAPI
 public class PrettyPrintPi(public val symbols: Set<String>) : RenderFeature {
-    public override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? {
-        if (node !is MST.Symbolic || node.value !in symbols) return null
-        return SpecialSymbolSyntax(kind = SpecialSymbolSyntax.Kind.SMALL_PI)
-    }
+    public override fun render(renderer: FeaturedMathRenderer, node: MST): SpecialSymbolSyntax? =
+        if (node !is MST.Symbolic || node.value !in symbols)
+            null
+        else
+            SpecialSymbolSyntax(kind = SpecialSymbolSyntax.Kind.SMALL_PI)
 
     public companion object {
         /**
@@ -150,16 +158,18 @@ public class PrettyPrintPi(public val symbols: Set<String>) : RenderFeature {
  *
  * @param operations the allowed operations. If `null`, any operation is accepted.
  */
+@UnstableKMathAPI
 public abstract class Unary(public val operations: Collection<String>?) : RenderFeature {
     /**
-     * The actual render function.
+     * The actual render function specialized for [MST.Unary].
      */
-    protected abstract fun render0(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax?
+    protected abstract fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax?
 
-    public final override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? {
-        if (node !is MST.Unary || operations != null && node.operation !in operations) return null
-        return render0(renderer, node)
-    }
+    public final override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? =
+        if (node !is MST.Unary || operations != null && node.operation !in operations)
+            null
+        else
+            renderUnary(renderer, node)
 }
 
 /**
@@ -168,164 +178,258 @@ public abstract class Unary(public val operations: Collection<String>?) : Render
  *
  * @property operations the allowed operations. If `null`, any operation is accepted.
  */
+@UnstableKMathAPI
 public abstract class Binary(public val operations: Collection<String>?) : RenderFeature {
     /**
-     * The actual render function.
+     * The actual render function specialized for [MST.Binary].
      */
-    protected abstract fun render0(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax?
+    protected abstract fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax?
 
     public final override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? {
         if (node !is MST.Binary || operations != null && node.operation !in operations) return null
-        return render0(renderer, node)
+        return renderBinary(renderer, node)
     }
 }
 
+/**
+ * Handles binary nodes by producing [BinaryPlusSyntax].
+ */
+@UnstableKMathAPI
 public class BinaryPlus(operations: Collection<String>?) : Binary(operations) {
-    public override fun render0(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax = BinaryPlusSyntax(
-        operation = node.operation,
-        left = OperandSyntax(parent.render(node.left), true),
-        right = OperandSyntax(parent.render(node.right), true),
-    )
+    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): BinaryPlusSyntax =
+        BinaryPlusSyntax(
+            operation = node.operation,
+            left = OperandSyntax(parent.render(node.left), true),
+            right = OperandSyntax(parent.render(node.right), true),
+        )
 
     public companion object {
+        /**
+         * The default instance configured with [GroupOperations.PLUS_OPERATION].
+         */
         public val Default: BinaryPlus = BinaryPlus(setOf(GroupOperations.PLUS_OPERATION))
     }
 }
 
+/**
+ * Handles binary nodes by producing [BinaryMinusSyntax].
+ */
+@UnstableKMathAPI
 public class BinaryMinus(operations: Collection<String>?) : Binary(operations) {
-    public override fun render0(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax = BinaryMinusSyntax(
-        operation = node.operation,
-        left = OperandSyntax(operand = parent.render(node.left), parentheses = true),
-        right = OperandSyntax(operand = parent.render(node.right), parentheses = true),
-    )
+    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): BinaryMinusSyntax =
+        BinaryMinusSyntax(
+            operation = node.operation,
+            left = OperandSyntax(operand = parent.render(node.left), parentheses = true),
+            right = OperandSyntax(operand = parent.render(node.right), parentheses = true),
+        )
 
     public companion object {
+        /**
+         * The default instance configured with [GroupOperations.MINUS_OPERATION].
+         */
         public val Default: BinaryMinus = BinaryMinus(setOf(GroupOperations.MINUS_OPERATION))
     }
 }
 
+/**
+ * Handles unary nodes by producing [UnaryPlusSyntax].
+ */
+@UnstableKMathAPI
 public class UnaryPlus(operations: Collection<String>?) : Unary(operations) {
-    public override fun render0(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = UnaryPlusSyntax(
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): UnaryPlusSyntax = UnaryPlusSyntax(
         operation = node.operation,
         operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
     )
 
     public companion object {
+        /**
+         * The default instance configured with [GroupOperations.PLUS_OPERATION].
+         */
         public val Default: UnaryPlus = UnaryPlus(setOf(GroupOperations.PLUS_OPERATION))
     }
 }
 
+/**
+ * Handles binary nodes by producing [UnaryMinusSyntax].
+ */
+@UnstableKMathAPI
 public class UnaryMinus(operations: Collection<String>?) : Unary(operations) {
-    public override fun render0(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = UnaryMinusSyntax(
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): UnaryMinusSyntax = UnaryMinusSyntax(
         operation = node.operation,
         operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
     )
 
     public companion object {
+        /**
+         * The default instance configured with [GroupOperations.MINUS_OPERATION].
+         */
         public val Default: UnaryMinus = UnaryMinus(setOf(GroupOperations.MINUS_OPERATION))
     }
 }
 
+/**
+ * Handles binary nodes by producing [FractionSyntax].
+ */
+@UnstableKMathAPI
 public class Fraction(operations: Collection<String>?) : Binary(operations) {
-    public override fun render0(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax = FractionSyntax(
+    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): FractionSyntax = FractionSyntax(
         operation = node.operation,
         left = parent.render(node.left),
         right = parent.render(node.right),
     )
 
     public companion object {
+        /**
+         * The default instance configured with [FieldOperations.DIV_OPERATION].
+         */
         public val Default: Fraction = Fraction(setOf(FieldOperations.DIV_OPERATION))
     }
 }
 
+/**
+ * Handles binary nodes by producing [BinaryOperatorSyntax].
+ */
+@UnstableKMathAPI
 public class BinaryOperator(operations: Collection<String>?) : Binary(operations) {
-    public override fun render0(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax = BinaryOperatorSyntax(
-        operation = node.operation,
-        prefix = OperatorNameSyntax(name = node.operation),
-        left = parent.render(node.left),
-        right = parent.render(node.right),
-    )
+    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): BinaryOperatorSyntax =
+        BinaryOperatorSyntax(
+            operation = node.operation,
+            prefix = OperatorNameSyntax(name = node.operation),
+            left = parent.render(node.left),
+            right = parent.render(node.right),
+        )
 
     public companion object {
+        /**
+         * The default instance configured with `null`.
+         */
         public val Default: BinaryOperator = BinaryOperator(null)
     }
 }
 
+/**
+ * Handles unary nodes by producing [UnaryOperatorSyntax].
+ */
+@UnstableKMathAPI
 public class UnaryOperator(operations: Collection<String>?) : Unary(operations) {
-    public override fun render0(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = UnaryOperatorSyntax(
-        operation = node.operation,
-        prefix = OperatorNameSyntax(node.operation),
-        operand = OperandSyntax(parent.render(node.value), true),
-    )
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): UnaryOperatorSyntax =
+        UnaryOperatorSyntax(
+            operation = node.operation,
+            prefix = OperatorNameSyntax(node.operation),
+            operand = OperandSyntax(parent.render(node.value), true),
+        )
 
     public companion object {
+        /**
+         * The default instance configured with `null`.
+         */
         public val Default: UnaryOperator = UnaryOperator(null)
     }
 }
 
+/**
+ * Handles binary nodes by producing [SuperscriptSyntax].
+ */
+@UnstableKMathAPI
 public class Power(operations: Collection<String>?) : Binary(operations) {
-    public override fun render0(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax = SuperscriptSyntax(
-        operation = node.operation,
-        left = OperandSyntax(parent.render(node.left), true),
-        right = OperandSyntax(parent.render(node.right), true),
-    )
+    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): SuperscriptSyntax =
+        SuperscriptSyntax(
+            operation = node.operation,
+            left = OperandSyntax(parent.render(node.left), true),
+            right = OperandSyntax(parent.render(node.right), true),
+        )
 
     public companion object {
+        /**
+         * The default instance configured with [PowerOperations.POW_OPERATION].
+         */
         public val Default: Power = Power(setOf(PowerOperations.POW_OPERATION))
     }
 }
 
+/**
+ * Handles binary nodes by producing [RadicalSyntax] with no index.
+ */
+@UnstableKMathAPI
 public class SquareRoot(operations: Collection<String>?) : Unary(operations) {
-    public override fun render0(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): RadicalSyntax =
         RadicalSyntax(operation = node.operation, operand = parent.render(node.value))
 
     public companion object {
+        /**
+         * The default instance configured with [PowerOperations.SQRT_OPERATION].
+         */
         public val Default: SquareRoot = SquareRoot(setOf(PowerOperations.SQRT_OPERATION))
     }
 }
 
+/**
+ * Handles unary nodes by producing [ExponentSyntax].
+ */
+@UnstableKMathAPI
 public class Exponent(operations: Collection<String>?) : Unary(operations) {
-    public override fun render0(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = ExponentSyntax(
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): ExponentSyntax = ExponentSyntax(
         operation = node.operation,
         operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
         useOperatorForm = true,
     )
 
     public companion object {
+        /**
+         * The default instance configured with [ExponentialOperations.EXP_OPERATION].
+         */
         public val Default: Exponent = Exponent(setOf(ExponentialOperations.EXP_OPERATION))
     }
 }
 
+/**
+ * Handles binary nodes by producing [MultiplicationSyntax].
+ */
+@UnstableKMathAPI
 public class Multiplication(operations: Collection<String>?) : Binary(operations) {
-    public override fun render0(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax = MultiplicationSyntax(
-        operation = node.operation,
-        left = OperandSyntax(operand = parent.render(node.left), parentheses = true),
-        right = OperandSyntax(operand = parent.render(node.right), parentheses = true),
-        times = true,
-    )
+    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MultiplicationSyntax =
+        MultiplicationSyntax(
+            operation = node.operation,
+            left = OperandSyntax(operand = parent.render(node.left), parentheses = true),
+            right = OperandSyntax(operand = parent.render(node.right), parentheses = true),
+            times = true,
+        )
 
     public companion object {
-        public val Default: Multiplication = Multiplication(setOf(
-            RingOperations.TIMES_OPERATION,
-        ))
+        /**
+         * The default instance configured with [RingOperations.TIMES_OPERATION].
+         */
+        public val Default: Multiplication = Multiplication(setOf(RingOperations.TIMES_OPERATION))
     }
 }
 
+/**
+ * Handles binary nodes by producing inverse [UnaryOperatorSyntax] (like *sin<sup>-1</sup>*) with removing the `a`
+ * prefix of operation ID.
+ */
+@UnstableKMathAPI
 public class InverseTrigonometricOperations(operations: Collection<String>?) : Unary(operations) {
-    public override fun render0(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = UnaryOperatorSyntax(
-        operation = node.operation,
-        prefix = SuperscriptSyntax(
-            operation = PowerOperations.POW_OPERATION,
-            left = OperatorNameSyntax(name = node.operation.removePrefix("a")),
-            right = UnaryMinusSyntax(
-                operation = GroupOperations.MINUS_OPERATION,
-                operand = OperandSyntax(operand = NumberSyntax(string = "1"), parentheses = true),
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): UnaryOperatorSyntax =
+        UnaryOperatorSyntax(
+            operation = node.operation,
+            prefix = SuperscriptSyntax(
+                operation = PowerOperations.POW_OPERATION,
+                left = OperatorNameSyntax(name = node.operation.removePrefix("a")),
+                right = UnaryMinusSyntax(
+                    operation = GroupOperations.MINUS_OPERATION,
+                    operand = OperandSyntax(operand = NumberSyntax(string = "1"), parentheses = true),
+                ),
             ),
-        ),
-        operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
-    )
+            operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
+        )
 
     public companion object {
+        /**
+         * The default instance configured with [TrigonometricOperations.ACOS_OPERATION],
+         * [TrigonometricOperations.ASIN_OPERATION], [TrigonometricOperations.ATAN_OPERATION],
+         * [ExponentialOperations.ACOSH_OPERATION], [ExponentialOperations.ASINH_OPERATION], and
+         * [ExponentialOperations.ATANH_OPERATION].
+         */
         public val Default: InverseTrigonometricOperations = InverseTrigonometricOperations(setOf(
             TrigonometricOperations.ACOS_OPERATION,
             TrigonometricOperations.ASIN_OPERATION,
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt
index a08f089f1..7eb75b9ff 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.ast.rendering
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.FieldOperations
 import space.kscience.kmath.operations.GroupOperations
 import space.kscience.kmath.operations.PowerOperations
@@ -15,6 +16,7 @@ import space.kscience.kmath.operations.RingOperations
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public object BetterMultiplication : FeaturedMathRendererWithPostProcess.PostProcessStage {
     public override fun perform(node: MathSyntax): Unit = when (node) {
         is NumberSyntax -> Unit
@@ -88,6 +90,7 @@ public object BetterMultiplication : FeaturedMathRendererWithPostProcess.PostPro
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public object BetterExponent : FeaturedMathRendererWithPostProcess.PostProcessStage {
     private fun perform0(node: MathSyntax): Boolean {
         return when (node) {
@@ -129,6 +132,7 @@ public object BetterExponent : FeaturedMathRendererWithPostProcess.PostProcessSt
  * @property precedenceFunction Returns the precedence number for syntax node. Higher number is lower priority.
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public class SimplifyParentheses(public val precedenceFunction: (MathSyntax) -> Int) :
     FeaturedMathRendererWithPostProcess.PostProcessStage {
     public override fun perform(node: MathSyntax): Unit = when (node) {
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserPrecedenceTest.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserPrecedenceTest.kt
index ca3a95bc8..67d77839a 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserPrecedenceTest.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserPrecedenceTest.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.ast
 
-import space.kscience.kmath.ast.parseMath
 import space.kscience.kmath.expressions.evaluate
 import space.kscience.kmath.operations.DoubleField
 import kotlin.test.Test
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
index 7c9400532..bf87b6fd0 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
@@ -30,17 +30,17 @@ internal object TestUtils {
     )
 
     internal fun testMathML(mst: MST, expectedMathML: String) = assertEquals(
-        expected = "<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mrow>$expectedMathML</mrow></math>",
+        expected = "<math xmlns=\"https://www.w3.org/1998/Math/MathML\"><mrow>$expectedMathML</mrow></math>",
         actual = mathML(mst),
     )
 
     internal fun testMathML(expression: String, expectedMathML: String) = assertEquals(
-        expected = "<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mrow>$expectedMathML</mrow></math>",
+        expected = "<math xmlns=\"https://www.w3.org/1998/Math/MathML\"><mrow>$expectedMathML</mrow></math>",
         actual = mathML(expression.parseMath()),
     )
 
     internal fun testMathML(expression: MathSyntax, expectedMathML: String) = assertEquals(
-        expected = "<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mrow>$expectedMathML</mrow></math>",
+        expected = "<math xmlns=\"https://www.w3.org/1998/Math/MathML\"><mrow>$expectedMathML</mrow></math>",
         actual = MathMLSyntaxRenderer.renderWithStringBuilder(expression),
     )
 }
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
index 59733299a..c5023c384 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
@@ -3,7 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:Suppress("INTERFACE_WITH_SUPERCLASS",
+@file:Suppress(
+    "INTERFACE_WITH_SUPERCLASS",
     "OVERRIDING_FINAL_MEMBER",
     "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
     "CONFLICTING_OVERLOADS",
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index bd2b340a0..8fd3c9fb9 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -26,7 +26,7 @@ internal sealed class WasmBuilder<T>(
     val keys: MutableList<String> = mutableListOf()
     lateinit var ctx: BinaryenModule
 
-    open fun visitSymbolic(mst: MST.Symbolic): ExpressionRef {
+    open fun visitSymbolic(mst: Symbolic): ExpressionRef {
         try {
             algebra.bindSymbol(mst.value)
         } catch (ignored: Throwable) {
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
index d44c4e49d..394a0567e 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
@@ -10,6 +10,7 @@ import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.invoke
 import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.wasm.internal.DoubleWasmBuilder
@@ -20,6 +21,7 @@ import space.kscience.kmath.wasm.internal.IntWasmBuilder
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun DoubleField.expression(mst: MST): Expression<Double> =
     DoubleWasmBuilder(mst).instance
 
@@ -28,6 +30,7 @@ public fun DoubleField.expression(mst: MST): Expression<Double> =
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun IntRing.expression(mst: MST): Expression<Int> =
     IntWasmBuilder(mst).instance
 
@@ -36,6 +39,7 @@ public fun IntRing.expression(mst: MST): Expression<Int> =
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun MST.compileToExpression(algebra: IntRing): Expression<Int> = compileWith(algebra)
 
 
@@ -44,6 +48,7 @@ public fun MST.compileToExpression(algebra: IntRing): Expression<Int> = compileW
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int =
     compileToExpression(algebra).invoke(arguments)
 
@@ -53,6 +58,7 @@ public fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int =
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun MST.compile(algebra: IntRing, vararg arguments: Pair<Symbol, Int>): Int =
     compileToExpression(algebra)(*arguments)
 
@@ -61,6 +67,7 @@ public fun MST.compile(algebra: IntRing, vararg arguments: Pair<Symbol, Int>): I
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun MST.compileToExpression(algebra: DoubleField): Expression<Double> = compileWith(algebra)
 
 
@@ -69,6 +76,7 @@ public fun MST.compileToExpression(algebra: DoubleField): Expression<Double> = c
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Double =
     compileToExpression(algebra).invoke(arguments)
 
@@ -78,5 +86,6 @@ public fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Do
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun MST.compile(algebra: DoubleField, vararg arguments: Pair<Symbol, Double>): Double =
     compileToExpression(algebra).invoke(*arguments)
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
index bdd8f52b6..39ebf049d 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
@@ -342,8 +342,8 @@ internal class AsmBuilder<T>(
         val MAP_INTRINSICS_TYPE: Type by lazy { getObjectType("space/kscience/kmath/asm/internal/MapIntrinsics") }
 
         /**
-         * ASM Type for [kscience.kmath.expressions.Symbol].
+         * ASM Type for [space.kscience.kmath.misc.Symbol].
          */
-        val SYMBOL_TYPE: Type by lazy { getObjectType("space/kscience/kmath/expressions/Symbol") }
+        val SYMBOL_TYPE: Type by lazy { getObjectType("space/kscience/kmath/misc/Symbol") }
     }
 }
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
index 560780f99..cfac59847 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
@@ -52,7 +52,7 @@ internal inline fun MethodVisitor.instructionAdapter(block: InstructionAdapter.(
  *
  * @author Iaroslav Postovalov
  */
-internal fun MethodVisitor.label(): Label = Label().also { visitLabel(it) }
+internal fun MethodVisitor.label(): Label = Label().also(::visitLabel)
 
 /**
  * Creates a class name for [Expression] subclassed to implement [mst] provided.
-- 
2.34.1


From b65a673173e6b1cd209fa355349bf9b90f718887 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 28 Apr 2021 14:16:57 +0100
Subject: [PATCH 143/713] Fix format for 0.0

---
 .../kotlin/space/kscience/kmath/tensors/core/utils.kt         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index 89e9d0d96..cb23dbdd6 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -47,17 +47,17 @@ internal inline fun <T> BufferedTensor<T>.minusIndex(i: Int): Int =  minusIndexF
 
 internal inline fun format(value: Double, digits: Int = 4): String {
     val ten = 10.0
-    val approxOrder = ceil(log10(abs(value))).toInt()
+    val approxOrder = if(value == 0.0) 0 else ceil(log10(abs(value))).toInt()
     val order = if(
         ((value % ten) == 0.0) or
         (value == 1.0) or
         ((1/value) % ten == 0.0)) approxOrder else approxOrder - 1
-
     val lead = value / ten.pow(order)
     val leadDisplay = round(lead*ten.pow(digits)) / ten.pow(digits)
     val orderDisplay = if(order == 0) "" else if(order > 0) "E+$order" else "E$order"
     val valueDisplay = "$leadDisplay$orderDisplay"
     val res = if(value < 0.0) valueDisplay else " $valueDisplay"
+
     val fLength = digits + 6
     val endSpace = " ".repeat(fLength - res.length)
     return "$res$endSpace"
-- 
2.34.1


From a0e9180db6da06c2cdac36a25c4b44d951945850 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Wed, 28 Apr 2021 18:18:57 +0300
Subject: [PATCH 144/713] example with LUP

---
 .../tensors/LinearSystemSolvingWithLUP.kt     | 97 +++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
new file mode 100644
index 000000000..526b6781f
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors
+
+import space.kscience.kmath.tensors.core.DoubleTensor
+import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
+
+// solving linear system with LUP decomposition
+
+fun main () {
+
+    // work in context with linear operations
+    DoubleLinearOpsTensorAlgebra {
+
+        // set true value of x
+        val trueX = fromArray(
+            intArrayOf(4),
+            doubleArrayOf(-2.0, 1.5, 6.8, -2.4)
+        )
+
+        // and A matrix
+        val a = fromArray(
+            intArrayOf(4, 4),
+            doubleArrayOf(
+                0.5, 10.5, 4.5, 1.0,
+                8.5, 0.9, 12.8, 0.1,
+                5.56, 9.19, 7.62, 5.45,
+                1.0, 2.0, -3.0, -2.5
+            )
+        )
+
+        // calculate y value
+        val b = a dot trueX
+
+        // check out A and b
+        println("A:\n$a")
+        println("b:\n$b")
+
+        // solve `Ax = b` system using LUP decomposition
+
+        // get P, L, U such that PA = LU
+        val (lu, pivots) = a.lu()
+        val (p, l, u) = luPivot(lu, pivots)
+
+        // check that P is permutation matrix
+        println("P:\n$p")
+        // L is lower triangular matrix and U is upper triangular matrix
+        println("L:\n$l")
+        println("U:\n$u")
+        // and PA = LU
+        println("PA:\n${p dot a}")
+        println("LU:\n${l dot u}")
+
+     /* Ax = b;
+        PAx = Pb;
+        LUx = Pb;
+        let y = Ux, then
+        Ly = Pb -- this system can be easily solved, since the matrix L is lower triangular;
+        Ux = y can be solved the same way, since the matrix L is upper triangular
+         */
+
+
+
+        // this function returns solution x of a system lx = b, l should be lower triangular
+        fun solveLT(l: DoubleTensor, b: DoubleTensor): DoubleTensor {
+            val n = l.shape[0]
+            val x = zeros(intArrayOf(n))
+            for (i in 0 until n){
+                x[intArrayOf(i)] = (b[intArrayOf(i)] -  l[i].dot(x).value()) / l[intArrayOf(i, i)]
+            }
+            return x
+        }
+
+        val y = solveLT(l, p dot b)
+
+        // solveLT(l, b) function can be easily adapted for upper triangular matrix by the permutation matrix revMat
+        // create it by placing ones on side diagonal
+        val revMat = u.zeroesLike()
+        val n = revMat.shape[0]
+        for (i in 0 until n) {
+            revMat[intArrayOf(i, n - 1 - i)] = 1.0
+        }
+
+        // solution of system ux = b, u should be upper triangular
+        fun solveUT(u: DoubleTensor, b: DoubleTensor): DoubleTensor = revMat dot solveLT(
+            revMat dot u dot revMat, revMat dot b
+        )
+
+        val x = solveUT(u, y)
+
+        println("True x:\n$trueX")
+        println("x founded with LU method:\n$x")
+    }
+}
\ No newline at end of file
-- 
2.34.1


From 51f084d28be21118c403ce5ae29775ab894971ae Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 28 Apr 2021 17:07:10 +0100
Subject: [PATCH 145/713] merge PR

---
 .../main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index a9b154017..9318fe928 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -30,20 +30,17 @@ fun main() {
 
         println("Real alpha:\n$alpha")
 
-        // also take sample of size 20 from normal distribution for x TODO rename
+        // also take sample of size 20 from normal distribution for x
         val x = randNormal(
             intArrayOf(20, 5),
             randSeed
         )
 
         // calculate y and add gaussian noise (N(0, 0.05))
-        // TODO: please add an intercept: Y = beta * X + alpha + N(0,0.5)
         val y = x dot alpha
         y += y.randNormalLike(randSeed) * 0.05
 
         // now restore the coefficient vector with OSL estimator with SVD
-        // TODO: you need to change accordingly [X 1] [alpha beta] = Y
-        // TODO: inverting [X 1] via SVD
         val (u, singValues, v) = x.svd()
 
         // we have to make sure the singular values of the matrix are not close to zero
-- 
2.34.1


From 6f5b0f0a03e941b33d4adc22e341bce2f7d8bd00 Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Thu, 29 Apr 2021 17:09:50 +0300
Subject: [PATCH 146/713] add README and documentation for the main functions
 of tensor algebra

---
 README.md                                     |  12 +
 kmath-tensors/README.md                       |  37 +++
 kmath-tensors/build.gradle.kts                |  26 ++-
 kmath-tensors/docs/README-TEMPLATE.md         |   7 +
 .../tensors/api/LinearOpsTensorAlgebra.kt     |  84 ++++++-
 .../kmath/tensors/api/TensorAlgebra.kt        | 211 +++++++++++++++++-
 .../algebras/BroadcastDoubleTensorAlgebra.kt  |   4 +
 7 files changed, 365 insertions(+), 16 deletions(-)
 create mode 100644 kmath-tensors/README.md
 create mode 100644 kmath-tensors/docs/README-TEMPLATE.md

diff --git a/README.md b/README.md
index 773eb6398..19c59e79e 100644
--- a/README.md
+++ b/README.md
@@ -230,6 +230,18 @@ One can still use generic algebras though.
 > **Maturity**: EXPERIMENTAL
 <hr/>
 
+* ### [kmath-tensors](kmath-tensors)
+> 
+>
+> **Maturity**: PROTOTYPE
+>
+> **Features:**
+> - [tensor algebra](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Basic linear algebra operations on tensors (plus, dot, etc.)
+> - [tensor algebra with broadcasting](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting.
+> - [linear algebra operations](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Advanced linear algebra operations like LU decomposition, SVD, etc.
+
+<hr/>
+
 * ### [kmath-viktor](kmath-viktor)
 > 
 >
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
new file mode 100644
index 000000000..3b82829f0
--- /dev/null
+++ b/kmath-tensors/README.md
@@ -0,0 +1,37 @@
+# Module kmath-tensors
+
+Common linear algebra operations on tensors.
+
+ - [tensor algebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Basic linear algebra operations on tensors (plus, dot, etc.)
+ - [tensor algebra with broadcasting](src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting.
+ - [linear algebra operations](src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Advanced linear algebra operations like LU decomposition, SVD, etc.
+
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-7`.
+
+**Gradle:**
+```gradle
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    maven { url 'https://dl.bintray.com/hotkeytlt/maven' }
+    maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } // include for builds based on kotlin-eap
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-tensors:0.3.0-dev-7'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    maven("https://dl.bintray.com/kotlin/kotlin-eap") // include for builds based on kotlin-eap
+    maven("https://dl.bintray.com/hotkeytlt/maven") // required for a
+}
+
+dependencies {
+    implementation("space.kscience:kmath-tensors:0.3.0-dev-7")
+}
+```
diff --git a/kmath-tensors/build.gradle.kts b/kmath-tensors/build.gradle.kts
index 8e823416b..af5116022 100644
--- a/kmath-tensors/build.gradle.kts
+++ b/kmath-tensors/build.gradle.kts
@@ -11,6 +11,30 @@ kotlin.sourceSets {
     }
 }
 
+tasks.dokkaHtml {
+    dependsOn(tasks.build)
+}
+
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
+
+    feature(
+        id = "tensor algebra",
+        description = "Basic linear algebra operations on tensors (plus, dot, etc.)",
+        ref = "src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt"
+    )
+
+    feature(
+        id = "tensor algebra with broadcasting",
+        description = "Basic linear algebra operations implemented with broadcasting.",
+        ref = "src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt"
+    )
+
+    feature(
+        id = "linear algebra operations",
+        description = "Advanced linear algebra operations like LU decomposition, SVD, etc.",
+        ref = "src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt"
+    )
+
 }
\ No newline at end of file
diff --git a/kmath-tensors/docs/README-TEMPLATE.md b/kmath-tensors/docs/README-TEMPLATE.md
new file mode 100644
index 000000000..5fd968afd
--- /dev/null
+++ b/kmath-tensors/docs/README-TEMPLATE.md
@@ -0,0 +1,7 @@
+# Module kmath-tensors
+
+Common linear algebra operations on tensors.
+
+${features}
+
+${artifact}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index 5cd48ca78..6735efacb 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -5,33 +5,99 @@
 
 package space.kscience.kmath.tensors.api
 
-
+/**
+ * Common linear algebra operations. Operates on [TensorStructure].
+ *
+ * @param T the type of items in the tensors.
+ */
 public interface LinearOpsTensorAlgebra<T> :
     TensorPartialDivisionAlgebra<T> {
 
-    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.det
+    /**
+     * Computes the determinant of a square matrix input, or of each square matrix in a batched input.
+     * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.det
+     *
+     * @return the determinant.
+     */
     public fun TensorStructure<T>.det(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.inv
+    /**
+     * Computes the multiplicative inverse matrix of a square matrix input, or of each square matrix in a batched input.
+     * Given a square matrix `a`, return the matrix `aInv` satisfying
+     * ``a.dot(aInv) = aInv.dot(a) = eye(a.shape[0])``.
+     * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.inv
+     *
+     * @return the multiplicative inverse of a matrix.
+     */
     public fun TensorStructure<T>.inv(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.cholesky
+    /**
+     * Cholesky decomposition.
+     *
+     * Computes the Cholesky decomposition of a Hermitian (or symmetric for real-valued matrices)
+     * positive-definite matrix or the Cholesky decompositions for a batch of such matrices.
+     * Each decomposition has the form:
+     * Given a tensor `input`, return the tensor `L` satisfying ``input = L * L.H``,
+     * where L is a lower-triangular matrix and L.H is the conjugate transpose of L,
+     * which is just a transpose for the case of real-valued input matrices.
+     * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.cholesky
+     *
+     * @return the batch of L matrices.
+     */
     public fun TensorStructure<T>.cholesky(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.qr
+    /**
+     * QR decomposition.
+     *
+     * Computes the QR decomposition of a matrix or a batch of matrices, and returns a namedtuple `(Q, R)` of tensors.
+     * Given a tensor `input`, return tensors (Q, R) satisfying ``input = Q * R``,
+     * with `Q` being an orthogonal matrix or batch of orthogonal matrices
+     * and `R` being an upper triangular matrix or batch of upper triangular matrices.
+     * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.qr
+     *
+     * @return tuple of Q and R tensors.
+     */
     public fun TensorStructure<T>.qr(): Pair<TensorStructure<T>, TensorStructure<T>>
 
-    //https://pytorch.org/docs/stable/generated/torch.lu.html
+    /**
+     * TODO('Andrew')
+     * For more information: https://pytorch.org/docs/stable/generated/torch.lu.html
+     *
+     * @return ...
+     */
     public fun TensorStructure<T>.lu(): Pair<TensorStructure<T>, TensorStructure<Int>>
 
-    //https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
+    /**
+     * TODO('Andrew')
+     * For more information: https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
+     *
+     * @param luTensor ...
+     * @param pivotsTensor ...
+     * @return ...
+     */
     public fun luPivot(luTensor: TensorStructure<T>, pivotsTensor: TensorStructure<Int>):
             Triple<TensorStructure<T>, TensorStructure<T>, TensorStructure<T>>
 
-    //https://pytorch.org/docs/stable/linalg.html#torch.linalg.svd
+    /**
+     * Singular Value Decomposition.
+     *
+     * Computes the singular value decomposition of either a matrix or batch of matrices `input`.
+     * The singular value decomposition is represented as a namedtuple `(U, S, V)`,
+     * such that ``input = U.dot(diagonalEmbedding(S).dot(V.T))``.
+     * If input is a batch of tensors, then U, S, and Vh are also batched with the same batch dimensions as input.
+     * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.svd
+     *
+     * @return the determinant.
+     */
     public fun TensorStructure<T>.svd(): Triple<TensorStructure<T>, TensorStructure<T>, TensorStructure<T>>
 
-    //https://pytorch.org/docs/stable/generated/torch.symeig.html
+    /**
+     * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
+     * represented by a namedtuple (eigenvalues, eigenvectors).
+     * For more information: https://pytorch.org/docs/stable/generated/torch.symeig.html
+     *
+     * @return a namedtuple (eigenvalues, eigenvectors)
+     */
     public fun TensorStructure<T>.symEig(): Pair<TensorStructure<T>, TensorStructure<T>>
 
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index c1657d916..92aafb8ea 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -5,44 +5,243 @@
 
 package space.kscience.kmath.tensors.api
 
-// https://proofwiki.org/wiki/Definition:Algebra_over_Ring
+/**
+ * Basic linear algebra operations on [TensorStructure].
+ * For more information: https://proofwiki.org/wiki/Definition:Algebra_over_Ring
+ *
+ * @param T the type of items in the tensors.
+ */
 public interface TensorAlgebra<T> {
 
+    /**
+     * Returns a single tensor value of unit dimension. The tensor shape must be equal to [1].
+     *
+     * @return the value of a scalar tensor.
+     */
     public fun TensorStructure<T>.value(): T
 
+    /**
+     * Each element of the tensor [other] is added to this value.
+     * The resulting tensor is returned.
+     *
+     * @param other tensor to be added.
+     * @return the sum of this value and tensor [other].
+     */
     public operator fun T.plus(other: TensorStructure<T>): TensorStructure<T>
+
+    /**
+     * Adds the scalar [value] to each element of this tensor and returns a new resulting tensor.
+     *
+     * @param value the number to be added to each element of this tensor.
+     * @return the sum of this tensor and [value].
+     */
     public operator fun TensorStructure<T>.plus(value: T): TensorStructure<T>
+
+    /**
+     * Each element of the tensor [other] is added to each element of this tensor.
+     * The resulting tensor is returned.
+     *
+     * @param other tensor to be added.
+     * @return the sum of this tensor and [other].
+     */
     public operator fun TensorStructure<T>.plus(other: TensorStructure<T>): TensorStructure<T>
+
+    /**
+     * Adds the scalar [value] to each element of this tensor.
+     *
+     * @param value the number to be added to each element of this tensor.
+     */
     public operator fun TensorStructure<T>.plusAssign(value: T): Unit
+
+    /**
+     * Each element of the tensor [other] is added to each element of this tensor.
+     *
+     * @param other tensor to be added.
+     */
     public operator fun TensorStructure<T>.plusAssign(other: TensorStructure<T>): Unit
 
+
+    /**
+     * Each element of the tensor [other] is subtracted from this value.
+     * The resulting tensor is returned.
+     *
+     * @param other tensor to be subtracted.
+     * @return the difference between this value and tensor [other].
+     */
     public operator fun T.minus(other: TensorStructure<T>): TensorStructure<T>
+
+    /**
+     * Subtracts the scalar [value] from each element of this tensor and returns a new resulting tensor.
+     *
+     * @param value the number to be subtracted from each element of this tensor.
+     * @return the difference between this tensor and [value].
+     */
     public operator fun TensorStructure<T>.minus(value: T): TensorStructure<T>
+
+    /**
+     * Each element of the tensor [other] is subtracted from each element of this tensor.
+     * The resulting tensor is returned.
+     *
+     * @param other tensor to be subtracted.
+     * @return the difference between this tensor and [other].
+     */
     public operator fun TensorStructure<T>.minus(other: TensorStructure<T>): TensorStructure<T>
+
+    /**
+     * Subtracts the scalar [value] from each element of this tensor.
+     *
+     * @param value the number to be subtracted from each element of this tensor.
+     */
     public operator fun TensorStructure<T>.minusAssign(value: T): Unit
+
+    /**
+     * Each element of the tensor [other] is subtracted from each element of this tensor.
+     *
+     * @param other tensor to be subtracted.
+     */
     public operator fun TensorStructure<T>.minusAssign(other: TensorStructure<T>): Unit
 
+
+    /**
+     * Each element of the tensor [other] is multiplied by this value.
+     * The resulting tensor is returned.
+     *
+     * @param other tensor to be multiplied.
+     * @return the product of this value and tensor [other].
+     */
     public operator fun T.times(other: TensorStructure<T>): TensorStructure<T>
+
+    /**
+     * Multiplies the scalar [value] by each element of this tensor and returns a new resulting tensor.
+     *
+     * @param value the number to be multiplied by each element of this tensor.
+     * @return the product of this tensor and [value].
+     */
     public operator fun TensorStructure<T>.times(value: T): TensorStructure<T>
+
+    /**
+     * Each element of the tensor [other] is multiplied by each element of this tensor.
+     * The resulting tensor is returned.
+     *
+     * @param other tensor to be multiplied.
+     * @return the product of this tensor and [other].
+     */
     public operator fun TensorStructure<T>.times(other: TensorStructure<T>): TensorStructure<T>
+
+    /**
+     * Multiplies the scalar [value] by each element of this tensor.
+     *
+     * @param value the number to be multiplied by each element of this tensor.
+     */
     public operator fun TensorStructure<T>.timesAssign(value: T): Unit
+
+    /**
+     * Each element of the tensor [other] is multiplied by each element of this tensor.
+     *
+     * @param other tensor to be multiplied.
+     */
     public operator fun TensorStructure<T>.timesAssign(other: TensorStructure<T>): Unit
+
+    /**
+     * Numerical negative, element-wise.
+     *
+     * @return tensor - negation of the original tensor.
+     */
     public operator fun TensorStructure<T>.unaryMinus(): TensorStructure<T>
 
-    //https://pytorch.org/cppdocs/notes/tensor_indexing.html
+    /**
+     * Returns the tensor at index i
+     * For more information: https://pytorch.org/cppdocs/notes/tensor_indexing.html
+     *
+     * @param i index of the extractable tensor
+     * @return subtensor of the original tensor with index [i]
+     */
     public operator fun TensorStructure<T>.get(i: Int): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.transpose.html
+    /**
+     * Returns a tensor that is a transposed version of this tensor. The given dimensions [i] and [j] are swapped.
+     * For more information: https://pytorch.org/docs/stable/generated/torch.transpose.html
+     *
+     * @param i the first dimension to be transposed
+     * @param j the second dimension to be transposed
+     * @return transposed tensor
+     */
     public fun TensorStructure<T>.transpose(i: Int = -2, j: Int = -1): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/tensor_view.html
+    /**
+     * Returns a new tensor with the same data as the self tensor but of a different shape.
+     * The returned tensor shares the same data and must have the same number of elements, but may have a different size
+     * For more information: https://pytorch.org/docs/stable/tensor_view.html
+     *
+     * @param shape the desired size
+     * @return tensor with new shape
+     */
     public fun TensorStructure<T>.view(shape: IntArray): TensorStructure<T>
+
+    /**
+     * View this tensor as the same size as [other].
+     * ``this.viewAs(other) is equivalent to this.view(other.shape)``.
+     * For more information: https://pytorch.org/cppdocs/notes/tensor_indexing.html
+     *
+     * @param other the result tensor has the same size as other.
+     * @return the result tensor with the same size as other.
+     */
     public fun TensorStructure<T>.viewAs(other: TensorStructure<T>): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.matmul.html
+    /**
+     * Matrix product of two tensors.
+     *
+     * The behavior depends on the dimensionality of the tensors as follows:
+     * 1. If both tensors are 1-dimensional, the dot product (scalar) is returned.
+     *
+     * 2. If both arguments are 2-dimensional, the matrix-matrix product is returned.
+     *
+     * 3. If the first argument is 1-dimensional and the second argument is 2-dimensional,
+     * a 1 is prepended to its dimension for the purpose of the matrix multiply.
+     * After the matrix multiply, the prepended dimension is removed.
+     *
+     * 4. If the first argument is 2-dimensional and the second argument is 1-dimensional,
+     * the matrix-vector product is returned.
+     *
+     * 5. If both arguments are at least 1-dimensional and at least one argument is N-dimensional (where N > 2),
+     * then a batched matrix multiply is returned. If the first argument is 1-dimensional,
+     * a 1 is prepended to its dimension for the purpose of the batched matrix multiply and removed after.
+     * If the second argument is 1-dimensional, a 1 is appended to its dimension for the purpose of the batched matrix
+     * multiple and removed after.
+     * The non-matrix (i.e. batch) dimensions are broadcasted (and thus must be broadcastable).
+     * For example, if `input` is a (j \times 1 \times n \times n) tensor and `other` is a
+     * (k \times n \times n) tensor, out will be a (j \times k \times n \times n) tensor.
+     *
+     * For more information: https://pytorch.org/docs/stable/generated/torch.matmul.html
+     *
+     * @param other tensor to be multiplied
+     * @return mathematical product of two tensors
+     */
     public infix fun TensorStructure<T>.dot(other: TensorStructure<T>): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.diag_embed.html
+    /**
+     * Creates a tensor whose diagonals of certain 2D planes (specified by [dim1] and [dim2])
+     * are filled by [diagonalEntries].
+     * To facilitate creating batched diagonal matrices,
+     * the 2D planes formed by the last two dimensions of the returned tensor are chosen by default.
+     *
+     * The argument [offset]  controls which diagonal to consider:
+     * 1. If [offset] = 0, it is the main diagonal.
+     * 2. If [offset] > 0, it is above the main diagonal.
+     * 3. If [offset] < 0, it is below the main diagonal.
+     *
+     * The size of the new matrix will be calculated
+     * to make the specified diagonal of the size of the last input dimension.
+     * For more information: https://pytorch.org/docs/stable/generated/torch.diag_embed.html
+     *
+     * @param diagonalEntries - the input tensor. Must be at least 1-dimensional.
+     * @param offset - which diagonal to consider. Default: 0 (main diagonal).
+     * @param dim1 - first dimension with respect to which to take diagonal. Default: -2.
+     * @param dim2 - second dimension with respect to which to take diagonal. Default: -1.
+     *
+     * @return tensor whose diagonals of certain 2D planes (specified by [dim1] and [dim2])
+     * are filled by [diagonalEntries]
+     */
     public fun diagonalEmbedding(
         diagonalEntries: TensorStructure<T>,
         offset: Int = 0,
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
index 1b00197ff..a49d9ab29 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
@@ -10,6 +10,10 @@ import space.kscience.kmath.tensors.core.*
 import space.kscience.kmath.tensors.core.broadcastTensors
 import space.kscience.kmath.tensors.core.broadcastTo
 
+/**
+ * Basic linear algebra operations implemented with broadcasting.
+ * For more information: https://pytorch.org/docs/stable/notes/broadcasting.html
+ */
 public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun TensorStructure<Double>.plus(other: TensorStructure<Double>): DoubleTensor {
-- 
2.34.1


From 64c6cbf8603a267f7a85af65f16d567c448eeb0a Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Thu, 29 Apr 2021 17:21:29 +0300
Subject: [PATCH 147/713] change tuple to pair/triple

---
 .../kmath/tensors/api/LinearOpsTensorAlgebra.kt        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index 6735efacb..aa10ae49b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -49,13 +49,13 @@ public interface LinearOpsTensorAlgebra<T> :
     /**
      * QR decomposition.
      *
-     * Computes the QR decomposition of a matrix or a batch of matrices, and returns a namedtuple `(Q, R)` of tensors.
+     * Computes the QR decomposition of a matrix or a batch of matrices, and returns a pair `(Q, R)` of tensors.
      * Given a tensor `input`, return tensors (Q, R) satisfying ``input = Q * R``,
      * with `Q` being an orthogonal matrix or batch of orthogonal matrices
      * and `R` being an upper triangular matrix or batch of upper triangular matrices.
      * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.qr
      *
-     * @return tuple of Q and R tensors.
+     * @return pair of Q and R tensors.
      */
     public fun TensorStructure<T>.qr(): Pair<TensorStructure<T>, TensorStructure<T>>
 
@@ -82,7 +82,7 @@ public interface LinearOpsTensorAlgebra<T> :
      * Singular Value Decomposition.
      *
      * Computes the singular value decomposition of either a matrix or batch of matrices `input`.
-     * The singular value decomposition is represented as a namedtuple `(U, S, V)`,
+     * The singular value decomposition is represented as a triple `(U, S, V)`,
      * such that ``input = U.dot(diagonalEmbedding(S).dot(V.T))``.
      * If input is a batch of tensors, then U, S, and Vh are also batched with the same batch dimensions as input.
      * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.svd
@@ -93,10 +93,10 @@ public interface LinearOpsTensorAlgebra<T> :
 
     /**
      * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
-     * represented by a namedtuple (eigenvalues, eigenvectors).
+     * represented by a pair (eigenvalues, eigenvectors).
      * For more information: https://pytorch.org/docs/stable/generated/torch.symeig.html
      *
-     * @return a namedtuple (eigenvalues, eigenvectors)
+     * @return a pair (eigenvalues, eigenvectors)
      */
     public fun TensorStructure<T>.symEig(): Pair<TensorStructure<T>, TensorStructure<T>>
 
-- 
2.34.1


From b9f1f0e5259b771727a4cdbdfbefc5d5047cf08e Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Thu, 29 Apr 2021 20:00:05 +0300
Subject: [PATCH 148/713] fixes

---
 .../kmath/tensors/api/TensorAlgebra.kt         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 92aafb8ea..62d4a1b89 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -145,7 +145,7 @@ public interface TensorAlgebra<T> {
     /**
      * Numerical negative, element-wise.
      *
-     * @return tensor - negation of the original tensor.
+     * @return tensor negation of the original tensor.
      */
     public operator fun TensorStructure<T>.unaryMinus(): TensorStructure<T>
 
@@ -209,8 +209,8 @@ public interface TensorAlgebra<T> {
      * If the second argument is 1-dimensional, a 1 is appended to its dimension for the purpose of the batched matrix
      * multiple and removed after.
      * The non-matrix (i.e. batch) dimensions are broadcasted (and thus must be broadcastable).
-     * For example, if `input` is a (j \times 1 \times n \times n) tensor and `other` is a
-     * (k \times n \times n) tensor, out will be a (j \times k \times n \times n) tensor.
+     * For example, if `input` is a (j &times; 1 &times; n &times; n) tensor and `other` is a
+     * (k &times; n &times; n) tensor, out will be a (j &times; k &times; n &times; n) tensor.
      *
      * For more information: https://pytorch.org/docs/stable/generated/torch.matmul.html
      *
@@ -227,17 +227,17 @@ public interface TensorAlgebra<T> {
      *
      * The argument [offset]  controls which diagonal to consider:
      * 1. If [offset] = 0, it is the main diagonal.
-     * 2. If [offset] > 0, it is above the main diagonal.
-     * 3. If [offset] < 0, it is below the main diagonal.
+     * 1. If [offset] > 0, it is above the main diagonal.
+     * 1. If [offset] < 0, it is below the main diagonal.
      *
      * The size of the new matrix will be calculated
      * to make the specified diagonal of the size of the last input dimension.
      * For more information: https://pytorch.org/docs/stable/generated/torch.diag_embed.html
      *
-     * @param diagonalEntries - the input tensor. Must be at least 1-dimensional.
-     * @param offset - which diagonal to consider. Default: 0 (main diagonal).
-     * @param dim1 - first dimension with respect to which to take diagonal. Default: -2.
-     * @param dim2 - second dimension with respect to which to take diagonal. Default: -1.
+     * @param diagonalEntries the input tensor. Must be at least 1-dimensional.
+     * @param offset which diagonal to consider. Default: 0 (main diagonal).
+     * @param dim1 first dimension with respect to which to take diagonal. Default: -2.
+     * @param dim2 second dimension with respect to which to take diagonal. Default: -1.
      *
      * @return tensor whose diagonals of certain 2D planes (specified by [dim1] and [dim2])
      * are filled by [diagonalEntries]
-- 
2.34.1


From 432f404d7c00c4d090f5496ae8ffb5e69d9330d8 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Thu, 29 Apr 2021 18:45:46 +0100
Subject: [PATCH 149/713] More descriptions

---
 kmath-tensors/README.md                       | 13 +++---
 .../tensors/api/AnalyticTensorAlgebra.kt      | 38 +++++++++--------
 .../tensors/api/LinearOpsTensorAlgebra.kt     |  2 +-
 .../kmath/tensors/api/TensorAlgebra.kt        |  2 +-
 .../api/TensorPartialDivisionAlgebra.kt       | 42 ++++++++++++++++++-
 5 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index 3b82829f0..24d46cd16 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -1,12 +1,15 @@
 # Module kmath-tensors
 
-Common linear algebra operations on tensors.
-
- - [tensor algebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Basic linear algebra operations on tensors (plus, dot, etc.)
- - [tensor algebra with broadcasting](src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting.
- - [linear algebra operations](src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Advanced linear algebra operations like LU decomposition, SVD, etc.
+Common operations on tensors, the API consists of:
 
+ - [TensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Basic algebra operations on tensors (plus, dot, etc.)
+ - [TensorPartialDivisionAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt) : Emulates an algebra over a field
+ - [LinearOpsTensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Linear algebra operations including LU, QR, Cholesky LL and SVD decompositions
+ - [AnalyticTensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt) : Element-wise analytic operations
 
+The library offers a multiplatform implementation for this interface over the `Double`'s. As the highlight, the user can find:
+ - [BroadcastDoubleTensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt) : Basic algebra operations implemented with broadcasting.
+ - [DoubleLinearOpsTensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt) : Includes the power method for SVD and the spectrum of symmetric matrices.
 ## Artifact:
 
 The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-7`.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index 315f39027..5c92c56c4 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -5,59 +5,63 @@
 
 package space.kscience.kmath.tensors.api
 
-
+/**
+ * Element-wise analytic operations on [TensorStructure].
+ *
+ * @param T the type of items closed under analytic functions in the tensors.
+ */
 public interface AnalyticTensorAlgebra<T> :
     TensorPartialDivisionAlgebra<T> {
 
-    //https://pytorch.org/docs/stable/generated/torch.exp.html
+    //For information: https://pytorch.org/docs/stable/generated/torch.exp.html
     public fun TensorStructure<T>.exp(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.log.html
+    //For information: https://pytorch.org/docs/stable/generated/torch.log.html
     public fun TensorStructure<T>.log(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.sqrt.html
+    //For information: https://pytorch.org/docs/stable/generated/torch.sqrt.html
     public fun TensorStructure<T>.sqrt(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.acos.html#torch.cos
+    //For information: https://pytorch.org/docs/stable/generated/torch.acos.html#torch.cos
     public fun TensorStructure<T>.cos(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.acos.html#torch.acos
+    //For information: https://pytorch.org/docs/stable/generated/torch.acos.html#torch.acos
     public fun TensorStructure<T>.acos(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.cosh
+    //For information: https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.cosh
     public fun TensorStructure<T>.cosh(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.acosh
+    //For information: https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.acosh
     public fun TensorStructure<T>.acosh(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sin
+    //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sin
     public fun TensorStructure<T>.sin(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asin
+    //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asin
     public fun TensorStructure<T>.asin(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sinh
+    //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sinh
     public fun TensorStructure<T>.sinh(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asinh
+    //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asinh
     public fun TensorStructure<T>.asinh(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.atan.html#torch.tan
+    //For information: https://pytorch.org/docs/stable/generated/torch.atan.html#torch.tan
     public fun TensorStructure<T>.tan(): TensorStructure<T>
 
     //https://pytorch.org/docs/stable/generated/torch.atan.html#torch.atan
     public fun TensorStructure<T>.atan(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.tanh
+    //For information: https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.tanh
     public fun TensorStructure<T>.tanh(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.atanh
+    //For information: https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.atanh
     public fun TensorStructure<T>.atanh(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.ceil.html#torch.ceil
+    //For information: https://pytorch.org/docs/stable/generated/torch.ceil.html#torch.ceil
     public fun TensorStructure<T>.ceil(): TensorStructure<T>
 
-    //https://pytorch.org/docs/stable/generated/torch.floor.html#torch.floor
+    //For information: https://pytorch.org/docs/stable/generated/torch.floor.html#torch.floor
     public fun TensorStructure<T>.floor(): TensorStructure<T>
 
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index aa10ae49b..7a19c5d5a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.tensors.api
 /**
  * Common linear algebra operations. Operates on [TensorStructure].
  *
- * @param T the type of items in the tensors.
+ * @param T the type of items closed under division in the tensors.
  */
 public interface LinearOpsTensorAlgebra<T> :
     TensorPartialDivisionAlgebra<T> {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 62d4a1b89..338064231 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.tensors.api
 
 /**
- * Basic linear algebra operations on [TensorStructure].
+ * Algebra over a ring on [TensorStructure].
  * For more information: https://proofwiki.org/wiki/Definition:Algebra_over_Ring
  *
  * @param T the type of items in the tensors.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
index 4dab3dd07..eccc6fa0d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
@@ -5,12 +5,52 @@
 
 package space.kscience.kmath.tensors.api
 
-// https://proofwiki.org/wiki/Definition:Division_Algebra
+/**
+ * Algebra over a field with partial division on [TensorStructure].
+ * For more information: https://proofwiki.org/wiki/Definition:Division_Algebra
+ *
+ * @param T the type of items closed under division in the tensors.
+ */
 public interface TensorPartialDivisionAlgebra<T> :
     TensorAlgebra<T> {
+
+    /**
+     * Each element of the tensor [other] is divided by this value.
+     * The resulting tensor is returned.
+     *
+     * @param other tensor to divide by.
+     * @return the division of this value by the tensor [other].
+     */
     public operator fun T.div(other: TensorStructure<T>): TensorStructure<T>
+
+    /**
+     * Divide by the scalar [value] each element of this tensor returns a new resulting tensor.
+     *
+     * @param value the number to divide by each element of this tensor.
+     * @return the division of this tensor by the [value].
+     */
     public operator fun TensorStructure<T>.div(value: T): TensorStructure<T>
+
+    /**
+     * Each element of the tensor [other] is divided by each element of this tensor.
+     * The resulting tensor is returned.
+     *
+     * @param other tensor to be divided by.
+     * @return the division of this tensor by [other].
+     */
     public operator fun TensorStructure<T>.div(other: TensorStructure<T>): TensorStructure<T>
+
+    /**
+     * Divides by the scalar [value] each element of this tensor.
+     *
+     * @param value the number to divide by each element of this tensor.
+     */
     public operator fun TensorStructure<T>.divAssign(value: T)
+
+    /**
+     * Each element of this tensor is divided by each element of the [other] tensor.
+     *
+     * @param other tensor to be divide by.
+     */
     public operator fun TensorStructure<T>.divAssign(other: TensorStructure<T>)
 }
-- 
2.34.1


From cba62a9468c84bb476dbf905bd44c4df90d9b735 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Thu, 29 Apr 2021 18:48:41 +0100
Subject: [PATCH 150/713] English typo

---
 kmath-tensors/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index 24d46cd16..a81b7277c 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -7,9 +7,9 @@ Common operations on tensors, the API consists of:
  - [LinearOpsTensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Linear algebra operations including LU, QR, Cholesky LL and SVD decompositions
  - [AnalyticTensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt) : Element-wise analytic operations
 
-The library offers a multiplatform implementation for this interface over the `Double`'s. As the highlight, the user can find:
+The library offers a multiplatform implementation for this interface over the `Double`'s. As a highlight, the user can find:
  - [BroadcastDoubleTensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt) : Basic algebra operations implemented with broadcasting.
- - [DoubleLinearOpsTensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt) : Includes the power method for SVD and the spectrum of symmetric matrices.
+ - [DoubleLinearOpsTensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt) : Contains the power method for SVD and the spectrum of symmetric matrices.
 ## Artifact:
 
 The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-7`.
-- 
2.34.1


From 09f0a2879e50c364ee969930576af8e453e32748 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Fri, 30 Apr 2021 11:08:22 +0300
Subject: [PATCH 151/713] refactor lu + docs

---
 .../tensors/LinearSystemSolvingWithLUP.kt     |  3 +--
 .../tensors/api/LinearOpsTensorAlgebra.kt     | 22 +++++++------------
 .../algebras/DoubleLinearOpsTensorAlgebra.kt  | 17 ++++++++++----
 .../core/TestDoubleLinearOpsAlgebra.kt        |  4 +---
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
index 526b6781f..38d8c1437 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
@@ -42,8 +42,7 @@ fun main () {
         // solve `Ax = b` system using LUP decomposition
 
         // get P, L, U such that PA = LU
-        val (lu, pivots) = a.lu()
-        val (p, l, u) = luPivot(lu, pivots)
+        val (p, l, u) = a.lu()
 
         // check that P is permutation matrix
         println("P:\n$p")
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index 7a19c5d5a..bcbb52a1b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -60,23 +60,17 @@ public interface LinearOpsTensorAlgebra<T> :
     public fun TensorStructure<T>.qr(): Pair<TensorStructure<T>, TensorStructure<T>>
 
     /**
-     * TODO('Andrew')
-     * For more information: https://pytorch.org/docs/stable/generated/torch.lu.html
+     * LUP decomposition
      *
-     * @return ...
-     */
-    public fun TensorStructure<T>.lu(): Pair<TensorStructure<T>, TensorStructure<Int>>
-
-    /**
-     * TODO('Andrew')
-     * For more information: https://pytorch.org/docs/stable/generated/torch.lu_unpack.html
+     * Computes the LUP decomposition of a matrix or a batch of matrices.
+     * Given a tensor `input`, return tensors (P, L, U) satisfying ``P * input = L * U``,
+     * with `P` being a permutation matrix or batch of matrices,
+     * `L` being a lower triangular matrix or batch of matrices,
+     * `U` being an upper triangular matrix or batch of matrices.
      *
-     * @param luTensor ...
-     * @param pivotsTensor ...
-     * @return ...
+     * * @return triple of P, L and U tensors
      */
-    public fun luPivot(luTensor: TensorStructure<T>, pivotsTensor: TensorStructure<Int>):
-            Triple<TensorStructure<T>, TensorStructure<T>, TensorStructure<T>>
+    public fun TensorStructure<T>.lu(): Triple<TensorStructure<T>, TensorStructure<T>, TensorStructure<T>>
 
     /**
      * Singular Value Decomposition.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
index 62629f3db..97eed289a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
@@ -29,13 +29,13 @@ public class DoubleLinearOpsTensorAlgebra :
 
     override fun TensorStructure<Double>.det(): DoubleTensor = detLU(1e-9)
 
-    public fun TensorStructure<Double>.lu(epsilon: Double): Pair<DoubleTensor, IntTensor> =
+    public fun TensorStructure<Double>.luFactor(epsilon: Double): Pair<DoubleTensor, IntTensor> =
         computeLU(tensor, epsilon) ?:
         throw RuntimeException("Tensor contains matrices which are singular at precision $epsilon")
 
-    override fun TensorStructure<Double>.lu(): Pair<DoubleTensor, IntTensor> = lu(1e-9)
+    public fun TensorStructure<Double>.luFactor(): Pair<DoubleTensor, IntTensor> = luFactor(1e-9)
 
-    override fun luPivot(
+    public fun luPivot(
         luTensor: TensorStructure<Double>,
         pivotsTensor: TensorStructure<Int>
     ): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
@@ -156,7 +156,7 @@ public class DoubleLinearOpsTensorAlgebra :
     }
 
     public fun TensorStructure<Double>.invLU(epsilon: Double = 1e-9): DoubleTensor {
-        val (luTensor, pivotsTensor) = lu(epsilon)
+        val (luTensor, pivotsTensor) = luFactor(epsilon)
         val invTensor = luTensor.zeroesLike()
 
         val seq = luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).zip(invTensor.matrixSequence())
@@ -167,6 +167,15 @@ public class DoubleLinearOpsTensorAlgebra :
 
         return invTensor
     }
+
+    public fun TensorStructure<Double>.lu(epsilon: Double = 1e-9): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+        val (lu, pivots) = this.luFactor(epsilon)
+        return luPivot(lu, pivots)
+    }
+
+    override fun TensorStructure<Double>.lu(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> = lu(1e-9)
+
+
 }
 
 public inline fun <R> DoubleLinearOpsTensorAlgebra(block: DoubleLinearOpsTensorAlgebra.() -> R): R =
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 6120f0e4a..1f7e955d4 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -124,9 +124,7 @@ class TestDoubleLinearOpsTensorAlgebra {
         )
         val tensor = fromArray(shape, buffer)
 
-        val (lu, pivots) = tensor.lu()
-
-        val (p, l, u) = luPivot(lu, pivots)
+        val (p, l, u) = tensor.lu()
 
         assertTrue { p.shape contentEquals shape }
         assertTrue { l.shape contentEquals shape }
-- 
2.34.1


From b546f3f78bf019c65b6bf4e1dda7cf521da46884 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 30 Apr 2021 09:19:30 +0100
Subject: [PATCH 152/713] Merge PR

---
 .../kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
index 97eed289a..03f383728 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
@@ -116,7 +116,7 @@ public class DoubleLinearOpsTensorAlgebra :
     override fun TensorStructure<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> =
         symEig(epsilon = 1e-15)
 
-    //http://hua-zhou.github.io/teaching/biostatm280-2017spring/slides/16-eigsvd/eigsvd.html
+    //For information: http://hua-zhou.github.io/teaching/biostatm280-2017spring/slides/16-eigsvd/eigsvd.html
     public fun TensorStructure<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
         checkSymmetric(tensor, epsilon)
         val (u, s, v) = tensor.svd(epsilon)
-- 
2.34.1


From bd068b2c1438e912a1a0b96bab72ffe55478374e Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 30 Apr 2021 09:54:25 +0100
Subject: [PATCH 153/713] Smaller SVD test

---
 .../kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 1f7e955d4..b2ef6b4c4 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -163,7 +163,7 @@ class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testBatchedSVD() = DoubleLinearOpsTensorAlgebra {
-        val tensor = randNormal(intArrayOf(1, 15, 4, 7, 5, 3), 0)
+        val tensor = randNormal(intArrayOf(2, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
         val tensorSVD = tensorU dot (diagonalEmbedding(tensorS) dot tensorV.transpose())
         assertTrue(tensor.eq(tensorSVD))
@@ -171,7 +171,7 @@ class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testBatchedSymEig() = DoubleLinearOpsTensorAlgebra {
-        val tensor = randNormal(shape = intArrayOf(5, 3, 3), 0)
+        val tensor = randNormal(shape = intArrayOf(2, 3, 3), 0)
         val tensorSigma = tensor + tensor.transpose()
         val (tensorS, tensorV) = tensorSigma.symEig()
         val tensorSigmaCalc = tensorV dot (diagonalEmbedding(tensorS) dot tensorV.transpose())
-- 
2.34.1


From 598b2e158724e4d9dd73d8d80a361684893071cd Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 28 Apr 2021 18:03:28 +0700
Subject: [PATCH 154/713] Rewrite EJML module by dropping ejml-simple
 abstraction level; multiple build script changes

---
 .github/workflows/pages.yml                   |   4 +-
 CHANGELOG.md                                  |   3 +-
 benchmarks/build.gradle.kts                   |   6 +-
 .../kscience/kmath/benchmarks/DotBenchmark.kt |  10 +-
 .../benchmarks/MatrixInverseBenchmark.kt      |  21 +-
 build.gradle.kts                              |  30 +--
 docs/templates/ARTIFACT-TEMPLATE.md           |   6 +-
 examples/build.gradle.kts                     |   7 +-
 kmath-ast/README.md                           |   6 +-
 kmath-complex/README.md                       |   6 +-
 kmath-core/README.md                          |   6 +-
 kmath-ejml/README.md                          |  12 +-
 kmath-ejml/build.gradle.kts                   |   8 +-
 .../kscience/kmath/ejml/EjmlLinearSpace.kt    | 251 +++++++++++-------
 .../space/kscience/kmath/ejml/EjmlMatrix.kt   |  24 +-
 .../space/kscience/kmath/ejml/EjmlVector.kt   |  36 +--
 .../kscience/kmath/ejml/EjmlMatrixTest.kt     |  53 ++--
 .../kscience/kmath/ejml/EjmlVectorTest.kt     |  23 +-
 kmath-for-real/README.md                      |   2 -
 kmath-functions/README.md                     |   2 -
 kmath-kotlingrad/build.gradle.kts             |   4 +-
 kmath-nd4j/README.md                          |   6 +-
 kmath-viktor/build.gradle.kts                 |   4 +-
 23 files changed, 281 insertions(+), 249 deletions(-)

diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 82b0fb303..c70227fce 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -30,9 +30,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Build
-        run: |
-          ./gradlew dokkaHtmlMultiModule --no-daemon --no-parallel --stacktrace
-          mv build/dokka/htmlMultiModule/-modules.html build/dokka/htmlMultiModule/index.html
+        run: ./gradlew dokkaHtmlMultiModule --no-daemon --no-parallel --stacktrace
       - name: Deploy to GitHub Pages
         uses: JamesIves/github-pages-deploy-action@4.1.0
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7464695ec..4266c5b70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
 - Blocking chains and Statistics
 - Multiplatform integration
 - Integration for any Field element
-- Extendend operations for ND4J fields
+- Extended operations for ND4J fields
 
 ### Changed
 - Exponential operations merged with hyperbolic functions
@@ -24,6 +24,7 @@
 - Redesign MST. Remove MSTExpression.
 - Move MST to core
 - Separated benchmarks and examples
+- Rewritten EJML module without ejml-simple
 
 ### Deprecated
 
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 88f034a2a..98ffc5a96 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -9,14 +9,10 @@ sourceSets.register("benchmarks")
 
 repositories {
     mavenCentral()
-    jcenter()
     maven("https://repo.kotlin.link")
     maven("https://clojars.org/repo")
-    maven("https://dl.bintray.com/egor-bogomolov/astminer/")
-    maven("https://dl.bintray.com/hotkeytlt/maven")
     maven("https://jitpack.io")
-    maven {
-        setUrl("http://logicrunch.research.it.uu.se/maven/")
+    maven("http://logicrunch.research.it.uu.se/maven") {
         isAllowInsecureProtocol = true
     }
 }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 23e73cb5f..2c5a03a97 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -10,7 +10,7 @@ import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import space.kscience.kmath.commons.linear.CMLinearSpace
-import space.kscience.kmath.ejml.EjmlLinearSpace
+import space.kscience.kmath.ejml.EjmlLinearSpaceDDRM
 import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.invoke
 import space.kscience.kmath.operations.DoubleField
@@ -29,8 +29,8 @@ internal class DotBenchmark {
         val cmMatrix1 = CMLinearSpace { matrix1.toCM() }
         val cmMatrix2 = CMLinearSpace { matrix2.toCM() }
 
-        val ejmlMatrix1 = EjmlLinearSpace { matrix1.toEjml() }
-        val ejmlMatrix2 = EjmlLinearSpace { matrix2.toEjml() }
+        val ejmlMatrix1 = EjmlLinearSpaceDDRM { matrix1.toEjml() }
+        val ejmlMatrix2 = EjmlLinearSpaceDDRM { matrix2.toEjml() }
     }
 
     @Benchmark
@@ -42,14 +42,14 @@ internal class DotBenchmark {
 
     @Benchmark
     fun ejmlDot(blackhole: Blackhole) {
-        EjmlLinearSpace {
+        EjmlLinearSpaceDDRM {
             blackhole.consume(ejmlMatrix1 dot ejmlMatrix2)
         }
     }
 
     @Benchmark
     fun ejmlDotWithConversion(blackhole: Blackhole) {
-        EjmlLinearSpace {
+        EjmlLinearSpaceDDRM {
             blackhole.consume(matrix1 dot matrix2)
         }
     }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
index d1803e389..7bb32af28 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
@@ -11,25 +11,26 @@ import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import space.kscience.kmath.commons.linear.CMLinearSpace
 import space.kscience.kmath.commons.linear.inverse
-import space.kscience.kmath.ejml.EjmlLinearSpace
-import space.kscience.kmath.ejml.inverse
+import space.kscience.kmath.ejml.EjmlLinearSpaceDDRM
+import space.kscience.kmath.linear.InverseMatrixFeature
 import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.inverseWithLup
 import space.kscience.kmath.linear.invoke
+import space.kscience.kmath.nd.getFeature
 import kotlin.random.Random
 
 @State(Scope.Benchmark)
 internal class MatrixInverseBenchmark {
-    companion object {
-        val random = Random(1224)
-        const val dim = 100
+    private companion object {
+        private val random = Random(1224)
+        private const val dim = 100
 
         private val space = LinearSpace.real
 
         //creating invertible matrix
-        val u = space.buildMatrix(dim, dim) { i, j -> if (i <= j) random.nextDouble() else 0.0 }
-        val l = space.buildMatrix(dim, dim) { i, j -> if (i >= j) random.nextDouble() else 0.0 }
-        val matrix = space { l dot u }
+        private val u = space.buildMatrix(dim, dim) { i, j -> if (i <= j) random.nextDouble() else 0.0 }
+        private val l = space.buildMatrix(dim, dim) { i, j -> if (i >= j) random.nextDouble() else 0.0 }
+        private val matrix = space { l dot u }
     }
 
     @Benchmark
@@ -46,8 +47,8 @@ internal class MatrixInverseBenchmark {
 
     @Benchmark
     fun ejmlInverse(blackhole: Blackhole) {
-        with(EjmlLinearSpace) {
-            blackhole.consume(inverse(matrix))
+        with(EjmlLinearSpaceDDRM) {
+            blackhole.consume(matrix.getFeature<InverseMatrixFeature<Double>>()?.inverse)
         }
     }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index 4e0b6f256..506f51a0e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,14 +4,12 @@ plugins {
 
 allprojects {
     repositories {
-        jcenter()
         maven("https://clojars.org/repo")
-        maven("https://dl.bintray.com/egor-bogomolov/astminer/")
-        maven("https://dl.bintray.com/hotkeytlt/maven")
         maven("https://jitpack.io")
-        maven("http://logicrunch.research.it.uu.se/maven/") {
+        maven("http://logicrunch.research.it.uu.se/maven") {
             isAllowInsecureProtocol = true
         }
+        maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
         mavenCentral()
     }
 
@@ -23,22 +21,16 @@ subprojects {
     if (name.startsWith("kmath")) apply<MavenPublishPlugin>()
 
     afterEvaluate {
-        tasks.withType<org.jetbrains.dokka.gradle.DokkaTask> {
-            dokkaSourceSets.all {
-                val readmeFile = File(this@subprojects.projectDir, "./README.md")
-                if (readmeFile.exists())
-                    includes.setFrom(includes + readmeFile.absolutePath)
+        tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial> {
+            dependsOn(tasks.getByName("assemble"))
 
-                arrayOf(
-                    "http://ejml.org/javadoc/",
-                    "https://commons.apache.org/proper/commons-math/javadocs/api-3.6.1/",
-                    "https://deeplearning4j.org/api/latest/"
-                ).map { java.net.URL("${it}package-list") to java.net.URL(it) }.forEach { (a, b) ->
-                    externalDocumentationLink {
-                        packageListUrl.set(a)
-                        url.set(b)
-                    }
-                }
+            dokkaSourceSets.all {
+                val readmeFile = File(this@subprojects.projectDir, "README.md")
+                if (readmeFile.exists()) includes.setFrom(includes + readmeFile.absolutePath)
+                externalDocumentationLink("http://ejml.org/javadoc/")
+                externalDocumentationLink("https://commons.apache.org/proper/commons-math/javadocs/api-3.6.1/")
+                externalDocumentationLink("https://deeplearning4j.org/api/latest/")
+                externalDocumentationLink("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
             }
         }
     }
diff --git a/docs/templates/ARTIFACT-TEMPLATE.md b/docs/templates/ARTIFACT-TEMPLATE.md
index 01d9c51da..1bac2a8ff 100644
--- a/docs/templates/ARTIFACT-TEMPLATE.md
+++ b/docs/templates/ARTIFACT-TEMPLATE.md
@@ -6,8 +6,7 @@ The Maven coordinates of this project are `${group}:${name}:${version}`.
 ```gradle
 repositories {
     maven { url 'https://repo.kotlin.link' }
-    maven { url 'https://dl.bintray.com/hotkeytlt/maven' }
-    maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } // include for builds based on kotlin-eap
+    mavenCentral()
 }
 
 dependencies {
@@ -18,8 +17,7 @@ dependencies {
 ```kotlin
 repositories {
     maven("https://repo.kotlin.link")
-    maven("https://dl.bintray.com/kotlin/kotlin-eap") // include for builds based on kotlin-eap
-    maven("https://dl.bintray.com/hotkeytlt/maven") // required for a
+    mavenCentral()
 }
 
 dependencies {
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 56feee9dc..571949b7b 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -4,14 +4,11 @@ plugins {
 
 repositories {
     mavenCentral()
-    jcenter()
     maven("https://repo.kotlin.link")
     maven("https://clojars.org/repo")
-    maven("https://dl.bintray.com/egor-bogomolov/astminer/")
-    maven("https://dl.bintray.com/hotkeytlt/maven")
     maven("https://jitpack.io")
-    maven{
-        setUrl("http://logicrunch.research.it.uu.se/maven/")
+    maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
+    maven("http://logicrunch.research.it.uu.se/maven") {
         isAllowInsecureProtocol = true
     }
 }
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index 1ee78956e..4de165e72 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -16,8 +16,7 @@ The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-7`
 ```gradle
 repositories {
     maven { url 'https://repo.kotlin.link' }
-    maven { url 'https://dl.bintray.com/hotkeytlt/maven' }
-    maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } // include for builds based on kotlin-eap
+    mavenCentral()
 }
 
 dependencies {
@@ -28,8 +27,7 @@ dependencies {
 ```kotlin
 repositories {
     maven("https://repo.kotlin.link")
-    maven("https://dl.bintray.com/kotlin/kotlin-eap") // include for builds based on kotlin-eap
-    maven("https://dl.bintray.com/hotkeytlt/maven") // required for a
+    mavenCentral()
 }
 
 dependencies {
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index 70beab95a..06e10fa7a 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -14,8 +14,7 @@ The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-de
 ```gradle
 repositories {
     maven { url 'https://repo.kotlin.link' }
-    maven { url 'https://dl.bintray.com/hotkeytlt/maven' }
-    maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } // include for builds based on kotlin-eap
+    mavenCentral()
 }
 
 dependencies {
@@ -26,8 +25,7 @@ dependencies {
 ```kotlin
 repositories {
     maven("https://repo.kotlin.link")
-    maven("https://dl.bintray.com/kotlin/kotlin-eap") // include for builds based on kotlin-eap
-    maven("https://dl.bintray.com/hotkeytlt/maven") // required for a
+    mavenCentral()
 }
 
 dependencies {
diff --git a/kmath-core/README.md b/kmath-core/README.md
index e28873045..36b30efcc 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -21,8 +21,7 @@ The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-7
 ```gradle
 repositories {
     maven { url 'https://repo.kotlin.link' }
-    maven { url 'https://dl.bintray.com/hotkeytlt/maven' }
-    maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } // include for builds based on kotlin-eap
+    mavenCentral()
 }
 
 dependencies {
@@ -33,8 +32,7 @@ dependencies {
 ```kotlin
 repositories {
     maven("https://repo.kotlin.link")
-    maven("https://dl.bintray.com/kotlin/kotlin-eap") // include for builds based on kotlin-eap
-    maven("https://dl.bintray.com/hotkeytlt/maven") // required for a
+    mavenCentral()
 }
 
 dependencies {
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index 3bf29f803..97c5ae115 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -2,9 +2,9 @@
 
 EJML based linear algebra implementation.
 
- - [ejml-vector](src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt) : The Point implementation using SimpleMatrix.
- - [ejml-matrix](src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt) : The Matrix implementation using SimpleMatrix.
- - [ejml-linear-space](src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt) : The LinearSpace implementation using SimpleMatrix.
+ - [ejml-vector](src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt) : Point implementations.
+ - [ejml-matrix](src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt) : Matrix implementation.
+ - [ejml-linear-space](src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt) : LinearSpace implementations.
 
 
 ## Artifact:
@@ -15,8 +15,7 @@ The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-7
 ```gradle
 repositories {
     maven { url 'https://repo.kotlin.link' }
-    maven { url 'https://dl.bintray.com/hotkeytlt/maven' }
-    maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } // include for builds based on kotlin-eap
+    mavenCentral()
 }
 
 dependencies {
@@ -27,8 +26,7 @@ dependencies {
 ```kotlin
 repositories {
     maven("https://repo.kotlin.link")
-    maven("https://dl.bintray.com/kotlin/kotlin-eap") // include for builds based on kotlin-eap
-    maven("https://dl.bintray.com/hotkeytlt/maven") // required for a
+    mavenCentral()
 }
 
 dependencies {
diff --git a/kmath-ejml/build.gradle.kts b/kmath-ejml/build.gradle.kts
index d3a49aeb0..c8e2ecd8b 100644
--- a/kmath-ejml/build.gradle.kts
+++ b/kmath-ejml/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api("org.ejml:ejml-simple:0.40")
+    api("org.ejml:ejml-ddense:0.40")
     api(project(":kmath-core"))
 }
 
@@ -14,19 +14,19 @@ readme {
 
     feature(
         id = "ejml-vector",
-        description = "The Point implementation using SimpleMatrix.",
+        description = "Point implementations.",
         ref = "src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt"
     )
 
     feature(
         id = "ejml-matrix",
-        description = "The Matrix implementation using SimpleMatrix.",
+        description = "Matrix implementation.",
         ref = "src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt"
     )
 
     feature(
         id = "ejml-linear-space",
-        description = "The LinearSpace implementation using SimpleMatrix.",
+        description = "LinearSpace implementations.",
         ref = "src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt"
     )
 }
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
index 4b6421c9b..71cae4829 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
@@ -5,45 +5,71 @@
 
 package space.kscience.kmath.ejml
 
+import org.ejml.data.DMatrix
+import org.ejml.data.DMatrixD1
+import org.ejml.data.DMatrixRMaj
+import org.ejml.dense.row.CommonOps_DDRM
 import org.ejml.dense.row.factory.DecompositionFactory_DDRM
-import org.ejml.simple.SimpleMatrix
 import space.kscience.kmath.linear.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureFeature
-import space.kscience.kmath.nd.getFeature
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.reflect.KClass
 import kotlin.reflect.cast
 
 /**
- * Represents context of basic operations operating with [EjmlMatrix].
+ * [LinearSpace] implementation specialized for a certain EJML type.
+ *
+ * @param T the type of items in the matrices.
+ * @param A the element context type.
+ * @param M the EJML matrix type.
+ * @author Iaroslav Postovalov
+ */
+public abstract class EjmlLinearSpace<T : Any, out A : Ring<T>, M : org.ejml.data.Matrix> : LinearSpace<T, A> {
+    /**
+     * Converts this matrix to EJML one.
+     */
+    public abstract fun Matrix<T>.toEjml(): EjmlMatrix<T, M>
+
+    /**
+     * Converts this vector to EJML one.
+     */
+    public abstract fun Point<T>.toEjml(): EjmlVector<T, M>
+
+    public abstract override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: A.(i: Int, j: Int) -> T,
+    ): EjmlMatrix<T, M>
+
+    public abstract override fun buildVector(size: Int, initializer: A.(Int) -> T): EjmlVector<T, M>
+}
+
+/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_DDRM], [DecompositionFactory_DDRM] operations and
+ * [DMatrixRMaj] matrices.
  *
  * @author Iaroslav Postovalov
- * @author Alexander Nozik
  */
-public object EjmlLinearSpace : LinearSpace<Double, DoubleField> {
+public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrixRMaj>() {
     /**
      * The [DoubleField] reference.
      */
     public override val elementAlgebra: DoubleField get() = DoubleField
 
-    /**
-     * Converts this matrix to EJML one.
-     */
-    @OptIn(UnstableKMathAPI::class)
-    public fun Matrix<Double>.toEjml(): EjmlMatrix = when (val matrix = origin) {
-        is EjmlMatrix -> matrix
+    @Suppress("UNCHECKED_CAST")
+    public override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixRMaj> = when {
+        this is EjmlDoubleMatrix<*> && origin is DMatrixRMaj -> this as EjmlDoubleMatrix<DMatrixRMaj>
         else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
     }
 
-    /**
-     * Converts this vector to EJML one.
-     */
-    public fun Point<Double>.toEjml(): EjmlVector = when (this) {
-        is EjmlVector -> this
-        else -> EjmlVector(SimpleMatrix(size, 1).also {
-            (0 until it.numRows()).forEach { row -> it[row, 0] = get(row) }
+    @Suppress("UNCHECKED_CAST")
+    public override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixRMaj> = when {
+        this is EjmlDoubleVector<*> && origin is DMatrixRMaj -> this as EjmlDoubleVector<DMatrixRMaj>
+        else -> EjmlDoubleVector(DMatrixRMaj(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
         })
     }
 
@@ -51,159 +77,178 @@ public object EjmlLinearSpace : LinearSpace<Double, DoubleField> {
         rows: Int,
         columns: Int,
         initializer: DoubleField.(i: Int, j: Int) -> Double,
-    ): EjmlMatrix = EjmlMatrix(SimpleMatrix(rows, columns).also {
+    ): EjmlDoubleMatrix<DMatrixRMaj> = EjmlDoubleMatrix(DMatrixRMaj(rows, columns).also {
         (0 until rows).forEach { row ->
-            (0 until columns).forEach { col -> it[row, col] = DoubleField.initializer(row, col) }
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
         }
     })
 
-    public override fun buildVector(size: Int, initializer: DoubleField.(Int) -> Double): Point<Double> =
-        EjmlVector(SimpleMatrix(size, 1).also {
-            (0 until it.numRows()).forEach { row -> it[row, 0] = DoubleField.initializer(row) }
-        })
+    public override fun buildVector(
+        size: Int,
+        initializer: DoubleField.(Int) -> Double,
+    ): EjmlDoubleVector<DMatrixRMaj> = EjmlDoubleVector(DMatrixRMaj(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
 
-    private fun SimpleMatrix.wrapMatrix() = EjmlMatrix(this)
-    private fun SimpleMatrix.wrapVector() = EjmlVector(this)
+    private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
+    private fun <T : DMatrixD1> T.wrapVector() = EjmlDoubleVector(this)
 
     public override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * (-1.0)
 
-    public override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlMatrix =
-        EjmlMatrix(toEjml().origin.mult(other.toEjml().origin))
+    public override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
 
-    public override fun Matrix<Double>.dot(vector: Point<Double>): EjmlVector =
-        EjmlVector(toEjml().origin.mult(vector.toEjml().origin))
+    public override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
 
-    public override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlMatrix =
-        (toEjml().origin - other.toEjml().origin).wrapMatrix()
+    public override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.subtract(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
 
-    public override operator fun Matrix<Double>.times(value: Double): EjmlMatrix =
-        toEjml().origin.scale(value).wrapMatrix()
+    public override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixRMaj> {
+        val res = this.toEjml().origin.copy()
+        CommonOps_DDRM.scale(value, res)
+        return res.wrapMatrix()
+    }
 
-    public override fun Point<Double>.unaryMinus(): EjmlVector =
-        toEjml().origin.negative().wrapVector()
+    public override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixRMaj> {
+        val out = toEjml().origin.copy()
+        CommonOps_DDRM.changeSign(out)
+        return out.wrapVector()
+    }
 
-    public override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlMatrix =
-        (toEjml().origin + other.toEjml().origin).wrapMatrix()
+    public override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.add(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
 
-    public override fun Point<Double>.plus(other: Point<Double>): EjmlVector =
-        (toEjml().origin + other.toEjml().origin).wrapVector()
+    public override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.add(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapVector()
+    }
 
-    public override fun Point<Double>.minus(other: Point<Double>): EjmlVector =
-        (toEjml().origin - other.toEjml().origin).wrapVector()
+    public override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.subtract(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapVector()
+    }
 
-    public override fun Double.times(m: Matrix<Double>): EjmlMatrix =
-        m.toEjml().origin.scale(this).wrapMatrix()
+    public override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> = m * this
 
-    public override fun Point<Double>.times(value: Double): EjmlVector =
-        toEjml().origin.scale(value).wrapVector()
+    public override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixRMaj> {
+        val res = this.toEjml().origin.copy()
+        CommonOps_DDRM.scale(value, res)
+        return res.wrapVector()
+    }
 
-    public override fun Double.times(v: Point<Double>): EjmlVector =
-        v.toEjml().origin.scale(this).wrapVector()
+    public override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixRMaj> = v * this
 
     @UnstableKMathAPI
     public override fun <F : StructureFeature> getFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
-        //Return the feature if it is intrinsic to the structure
+        // Return the feature if it is intrinsic to the structure
         structure.getFeature(type)?.let { return it }
 
         val origin = structure.toEjml().origin
 
         return when (type) {
             InverseMatrixFeature::class -> object : InverseMatrixFeature<Double> {
-                override val inverse: Matrix<Double> by lazy { EjmlMatrix(origin.invert()) }
+                override val inverse: Matrix<Double> by lazy {
+                    val res = origin.copy()
+                    CommonOps_DDRM.invert(res)
+                    EjmlDoubleMatrix(res)
+                }
             }
 
             DeterminantFeature::class -> object : DeterminantFeature<Double> {
-                override val determinant: Double by lazy(origin::determinant)
+                override val determinant: Double by lazy { CommonOps_DDRM.det(DMatrixRMaj(origin)) }
             }
 
             SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<Double> {
                 private val svd by lazy {
-                    DecompositionFactory_DDRM.svd(origin.numRows(), origin.numCols(), true, true, false)
-                        .apply { decompose(origin.ddrm.copy()) }
+                    DecompositionFactory_DDRM.svd(origin.numRows, origin.numCols, true, true, false)
+                        .apply { decompose(origin.copy()) }
                 }
 
-                override val u: Matrix<Double> by lazy { EjmlMatrix(SimpleMatrix(svd.getU(null, false))) }
-                override val s: Matrix<Double> by lazy { EjmlMatrix(SimpleMatrix(svd.getW(null))) }
-                override val v: Matrix<Double> by lazy { EjmlMatrix(SimpleMatrix(svd.getV(null, false))) }
+                override val u: Matrix<Double> by lazy { EjmlDoubleMatrix(svd.getU(null, false)) }
+                override val s: Matrix<Double> by lazy { EjmlDoubleMatrix(svd.getW(null)) }
+                override val v: Matrix<Double> by lazy { EjmlDoubleMatrix(svd.getV(null, false)) }
                 override val singularValues: Point<Double> by lazy { DoubleBuffer(svd.singularValues) }
             }
 
             QRDecompositionFeature::class -> object : QRDecompositionFeature<Double> {
                 private val qr by lazy {
-                    DecompositionFactory_DDRM.qr().apply { decompose(origin.ddrm.copy()) }
+                    DecompositionFactory_DDRM.qr().apply { decompose(origin.copy()) }
                 }
 
                 override val q: Matrix<Double> by lazy {
-                    EjmlMatrix(SimpleMatrix(qr.getQ(null, false))) + OrthogonalFeature
+                    EjmlDoubleMatrix(qr.getQ(null, false)) + OrthogonalFeature
                 }
 
-                override val r: Matrix<Double> by lazy { EjmlMatrix(SimpleMatrix(qr.getR(null, false))) + UFeature }
+                override val r: Matrix<Double> by lazy { EjmlDoubleMatrix(qr.getR(null, false)) + UFeature }
             }
 
             CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Double> {
                 override val l: Matrix<Double> by lazy {
                     val cholesky =
-                        DecompositionFactory_DDRM.chol(structure.rowNum, true).apply { decompose(origin.ddrm.copy()) }
+                        DecompositionFactory_DDRM.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
 
-                    EjmlMatrix(SimpleMatrix(cholesky.getT(null))) + LFeature
+                    EjmlDoubleMatrix(cholesky.getT(null)) + LFeature
                 }
             }
 
             LupDecompositionFeature::class -> object : LupDecompositionFeature<Double> {
                 private val lup by lazy {
-                    DecompositionFactory_DDRM.lu(origin.numRows(), origin.numCols())
-                        .apply { decompose(origin.ddrm.copy()) }
+                    DecompositionFactory_DDRM.lu(origin.numRows, origin.numCols).apply { decompose(origin.copy()) }
                 }
 
                 override val l: Matrix<Double> by lazy {
-                    EjmlMatrix(SimpleMatrix(lup.getLower(null))) + LFeature
+                    EjmlDoubleMatrix(lup.getLower(null)) + LFeature
                 }
 
                 override val u: Matrix<Double> by lazy {
-                    EjmlMatrix(SimpleMatrix(lup.getUpper(null))) + UFeature
+                    EjmlDoubleMatrix(lup.getUpper(null)) + UFeature
                 }
 
-                override val p: Matrix<Double> by lazy { EjmlMatrix(SimpleMatrix(lup.getRowPivot(null))) }
+                override val p: Matrix<Double> by lazy { EjmlDoubleMatrix(lup.getRowPivot(null)) }
             }
 
             else -> null
         }?.let(type::cast)
     }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for 'x' that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
+        return EjmlDoubleMatrix(res)
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for 'x' that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
+        return EjmlDoubleVector(res)
+    }
 }
-
-/**
- * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
- *
- * @param a the base matrix.
- * @param b n by p matrix.
- * @return the solution for 'x' that is n by p.
- * @author Iaroslav Postovalov
- */
-public fun EjmlLinearSpace.solve(a: Matrix<Double>, b: Matrix<Double>): EjmlMatrix =
-    EjmlMatrix(a.toEjml().origin.solve(b.toEjml().origin))
-
-/**
- * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
- *
- * @param a the base matrix.
- * @param b n by p vector.
- * @return the solution for 'x' that is n by p.
- * @author Iaroslav Postovalov
- */
-public fun EjmlLinearSpace.solve(a: Matrix<Double>, b: Point<Double>): EjmlVector =
-    EjmlVector(a.toEjml().origin.solve(b.toEjml().origin))
-
-/**
- * Inverts this matrix.
- *
- * @author Alexander Nozik
- */
-@OptIn(UnstableKMathAPI::class)
-public fun EjmlMatrix.inverted(): EjmlMatrix = getFeature<InverseMatrixFeature<Double>>()!!.inverse as EjmlMatrix
-
-/**
- * Inverts the given matrix.
- *
- * @author Alexander Nozik
- */
-public fun EjmlLinearSpace.inverse(matrix: Matrix<Double>): Matrix<Double> = matrix.toEjml().inverted()
\ No newline at end of file
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
index 32907d199..92c4d1cf0 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
@@ -5,18 +5,28 @@
 
 package space.kscience.kmath.ejml
 
-import org.ejml.simple.SimpleMatrix
-import space.kscience.kmath.linear.Matrix
+import org.ejml.data.DMatrix
+import org.ejml.data.Matrix
+import space.kscience.kmath.nd.Structure2D
 
 /**
- * The matrix implementation over EJML [SimpleMatrix].
+ * [space.kscience.kmath.linear.Matrix] implementation based on EJML [Matrix].
  *
- * @property origin the underlying [SimpleMatrix].
+ * @param T the type of elements contained in the buffer.
+ * @param M the type of EJML matrix.
+ * @property origin The underlying EJML matrix.
  * @author Iaroslav Postovalov
  */
-public class EjmlMatrix(public val origin: SimpleMatrix) : Matrix<Double> {
-    public override val rowNum: Int get() = origin.numRows()
-    public override val colNum: Int get() = origin.numCols()
+public abstract class EjmlMatrix<T, out M : Matrix>(public open val origin: M) : Structure2D<T> {
+    public override val rowNum: Int get() = origin.numRows
+    public override val colNum: Int get() = origin.numCols
+}
 
+/**
+ * [EjmlMatrix] specialization for [Double].
+ *
+ * @author Iaroslav Postovalov
+ */
+public class EjmlDoubleMatrix<out M : DMatrix>(public override val origin: M) : EjmlMatrix<Double, M>(origin) {
     public override operator fun get(i: Int, j: Int): Double = origin[i, j]
 }
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
index 2f4b4a8e2..81502d6d0 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
@@ -5,35 +5,41 @@
 
 package space.kscience.kmath.ejml
 
-import org.ejml.simple.SimpleMatrix
+import org.ejml.data.DMatrixD1
+import org.ejml.data.Matrix
 import space.kscience.kmath.linear.Point
 
 /**
- * Represents point over EJML [SimpleMatrix].
+ * [Point] implementation based on EJML [Matrix].
  *
- * @property origin the underlying [SimpleMatrix].
+ * @param T the type of elements contained in the buffer.
+ * @param M the type of EJML matrix.
+ * @property origin The underlying matrix.
  * @author Iaroslav Postovalov
  */
-public class EjmlVector internal constructor(public val origin: SimpleMatrix) : Point<Double> {
+public abstract class EjmlVector<out T, out M : Matrix>(public open val origin: M) : Point<T> {
     public override val size: Int
-        get() = origin.numRows()
+        get() = origin.numRows
 
-    init {
-        require(origin.numCols() == 1) { "Only single column matrices are allowed" }
-    }
-
-    public override operator fun get(index: Int): Double = origin[index]
-
-    public override operator fun iterator(): Iterator<Double> = object : Iterator<Double> {
+    public override operator fun iterator(): Iterator<T> = object : Iterator<T> {
         private var cursor: Int = 0
 
-        override fun next(): Double {
+        override fun next(): T {
             cursor += 1
-            return origin[cursor - 1]
+            return this@EjmlVector[cursor - 1]
         }
 
-        override fun hasNext(): Boolean = cursor < origin.numCols() * origin.numRows()
+        override fun hasNext(): Boolean = cursor < origin.numCols * origin.numRows
     }
 
     public override fun toString(): String = "EjmlVector(origin=$origin)"
 }
+
+/**
+ * [EjmlVector] specialization for [Double].
+ *
+ * @author Iaroslav Postovalov
+ */
+public class EjmlDoubleVector<out M : DMatrixD1>(public override val origin: M) : EjmlVector<Double, M>(origin) {
+    public override operator fun get(index: Int): Double = origin[index]
+}
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
index 59f9602d6..485c53c38 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
@@ -5,12 +5,15 @@
 
 package space.kscience.kmath.ejml
 
+import org.ejml.data.DMatrixRMaj
+import org.ejml.dense.row.CommonOps_DDRM
+import org.ejml.dense.row.RandomMatrices_DDRM
 import org.ejml.dense.row.factory.DecompositionFactory_DDRM
-import org.ejml.simple.SimpleMatrix
-import space.kscience.kmath.linear.*
+import space.kscience.kmath.linear.DeterminantFeature
+import space.kscience.kmath.linear.LupDecompositionFeature
+import space.kscience.kmath.linear.getFeature
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.getFeature
 import kotlin.random.Random
 import kotlin.random.asJavaRandom
 import kotlin.test.*
@@ -22,65 +25,59 @@ fun <T : Any> assertMatrixEquals(expected: StructureND<T>, actual: StructureND<T
 internal class EjmlMatrixTest {
     private val random = Random(0)
 
-    private val randomMatrix: SimpleMatrix
+    private val randomMatrix: DMatrixRMaj
         get() {
             val s = random.nextInt(2, 100)
-            return SimpleMatrix.random_DDRM(s, s, 0.0, 10.0, random.asJavaRandom())
+            val d = DMatrixRMaj(s, s)
+            RandomMatrices_DDRM.fillUniform(d, random.asJavaRandom())
+            return d
         }
 
     @Test
     fun rowNum() {
         val m = randomMatrix
-        assertEquals(m.numRows(), EjmlMatrix(m).rowNum)
+        assertEquals(m.numRows, EjmlDoubleMatrix(m).rowNum)
     }
 
     @Test
     fun colNum() {
         val m = randomMatrix
-        assertEquals(m.numCols(), EjmlMatrix(m).rowNum)
+        assertEquals(m.numCols, EjmlDoubleMatrix(m).rowNum)
     }
 
     @Test
     fun shape() {
         val m = randomMatrix
-        val w = EjmlMatrix(m)
-        assertEquals(listOf(m.numRows(), m.numCols()), w.shape.toList())
+        val w = EjmlDoubleMatrix(m)
+        assertContentEquals(intArrayOf(m.numRows, m.numCols), w.shape)
     }
 
     @OptIn(UnstableKMathAPI::class)
     @Test
     fun features() {
         val m = randomMatrix
-        val w = EjmlMatrix(m)
-        val det: DeterminantFeature<Double> = EjmlLinearSpace.getFeature(w) ?: fail()
-        assertEquals(m.determinant(), det.determinant)
-        val lup: LupDecompositionFeature<Double> = EjmlLinearSpace.getFeature(w) ?: fail()
+        val w = EjmlDoubleMatrix(m)
+        val det: DeterminantFeature<Double> = EjmlLinearSpaceDDRM.getFeature(w) ?: fail()
+        assertEquals(CommonOps_DDRM.det(m), det.determinant)
+        val lup: LupDecompositionFeature<Double> = EjmlLinearSpaceDDRM.getFeature(w) ?: fail()
 
-        val ludecompositionF64 = DecompositionFactory_DDRM.lu(m.numRows(), m.numCols())
-            .also { it.decompose(m.ddrm.copy()) }
+        val ludecompositionF64 = DecompositionFactory_DDRM.lu(m.numRows, m.numCols)
+            .also { it.decompose(m.copy()) }
 
-        assertMatrixEquals(EjmlMatrix(SimpleMatrix(ludecompositionF64.getLower(null))), lup.l)
-        assertMatrixEquals(EjmlMatrix(SimpleMatrix(ludecompositionF64.getUpper(null))), lup.u)
-        assertMatrixEquals(EjmlMatrix(SimpleMatrix(ludecompositionF64.getRowPivot(null))), lup.p)
-    }
-
-    private object SomeFeature : MatrixFeature {}
-
-    @OptIn(UnstableKMathAPI::class)
-    @Test
-    fun suggestFeature() {
-        assertNotNull((EjmlMatrix(randomMatrix) + SomeFeature).getFeature<SomeFeature>())
+        assertMatrixEquals(EjmlDoubleMatrix(ludecompositionF64.getLower(null)), lup.l)
+        assertMatrixEquals(EjmlDoubleMatrix(ludecompositionF64.getUpper(null)), lup.u)
+        assertMatrixEquals(EjmlDoubleMatrix(ludecompositionF64.getRowPivot(null)), lup.p)
     }
 
     @Test
     fun get() {
         val m = randomMatrix
-        assertEquals(m[0, 0], EjmlMatrix(m)[0, 0])
+        assertEquals(m[0, 0], EjmlDoubleMatrix(m)[0, 0])
     }
 
     @Test
     fun origin() {
         val m = randomMatrix
-        assertSame(m, EjmlMatrix(m).origin)
+        assertSame(m, EjmlDoubleMatrix(m).origin)
     }
 }
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
index e1bcd269e..9bf76033d 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
@@ -5,7 +5,8 @@
 
 package space.kscience.kmath.ejml
 
-import org.ejml.simple.SimpleMatrix
+import org.ejml.data.DMatrixRMaj
+import org.ejml.dense.row.RandomMatrices_DDRM
 import kotlin.random.Random
 import kotlin.random.asJavaRandom
 import kotlin.test.Test
@@ -15,30 +16,34 @@ import kotlin.test.assertSame
 internal class EjmlVectorTest {
     private val random = Random(0)
 
-    private val randomMatrix: SimpleMatrix
-        get() = SimpleMatrix.random_DDRM(random.nextInt(2, 100), 1, 0.0, 10.0, random.asJavaRandom())
+    private val randomMatrix: DMatrixRMaj
+        get() {
+            val d = DMatrixRMaj(random.nextInt(2, 100), 1)
+            RandomMatrices_DDRM.fillUniform(d, random.asJavaRandom())
+            return d
+        }
 
     @Test
     fun size() {
         val m = randomMatrix
-        val w = EjmlVector(m)
-        assertEquals(m.numRows(), w.size)
+        val w = EjmlDoubleVector(m)
+        assertEquals(m.numRows, w.size)
     }
 
     @Test
     fun get() {
         val m = randomMatrix
-        val w = EjmlVector(m)
+        val w = EjmlDoubleVector(m)
         assertEquals(m[0, 0], w[0])
     }
 
     @Test
     fun iterator() {
         val m = randomMatrix
-        val w = EjmlVector(m)
+        val w = EjmlDoubleVector(m)
 
         assertEquals(
-            m.iterator(true, 0, 0, m.numRows() - 1, 0).asSequence().toList(),
+            m.iterator(true, 0, 0, m.numRows - 1, 0).asSequence().toList(),
             w.iterator().asSequence().toList()
         )
     }
@@ -46,7 +51,7 @@ internal class EjmlVectorTest {
     @Test
     fun origin() {
         val m = randomMatrix
-        val w = EjmlVector(m)
+        val w = EjmlDoubleVector(m)
         assertSame(m, w.origin)
     }
 }
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index 20e52deb2..46bf657c3 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -15,7 +15,6 @@ The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-d
 ```gradle
 repositories {
     maven { url 'https://repo.kotlin.link' }
-    maven { url 'https://dl.bintray.com/hotkeytlt/maven' }
     maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } // include for builds based on kotlin-eap
 }
 
@@ -28,7 +27,6 @@ dependencies {
 repositories {
     maven("https://repo.kotlin.link")
     maven("https://dl.bintray.com/kotlin/kotlin-eap") // include for builds based on kotlin-eap
-    maven("https://dl.bintray.com/hotkeytlt/maven") // required for a
 }
 
 dependencies {
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index d5907f1c5..c7c30f1a1 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -17,7 +17,6 @@ The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-
 ```gradle
 repositories {
     maven { url 'https://repo.kotlin.link' }
-    maven { url 'https://dl.bintray.com/hotkeytlt/maven' }
     maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } // include for builds based on kotlin-eap
 }
 
@@ -30,7 +29,6 @@ dependencies {
 repositories {
     maven("https://repo.kotlin.link")
     maven("https://dl.bintray.com/kotlin/kotlin-eap") // include for builds based on kotlin-eap
-    maven("https://dl.bintray.com/hotkeytlt/maven") // required for a
 }
 
 dependencies {
diff --git a/kmath-kotlingrad/build.gradle.kts b/kmath-kotlingrad/build.gradle.kts
index f627beec9..ed5b5bcb4 100644
--- a/kmath-kotlingrad/build.gradle.kts
+++ b/kmath-kotlingrad/build.gradle.kts
@@ -4,8 +4,8 @@ plugins {
 }
 
 dependencies {
-    implementation("com.github.breandan:kaliningraph:0.1.4")
-    implementation("com.github.breandan:kotlingrad:0.4.0")
+    api("com.github.breandan:kaliningraph:0.1.4")
+    api("com.github.breandan:kotlingrad:0.4.5")
     api(project(":kmath-ast"))
 }
 
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index 66e0483a4..b4b586ea9 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -15,8 +15,7 @@ The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-7
 ```gradle
 repositories {
     maven { url 'https://repo.kotlin.link' }
-    maven { url 'https://dl.bintray.com/hotkeytlt/maven' }
-    maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } // include for builds based on kotlin-eap
+    mavenCentral()
 }
 
 dependencies {
@@ -27,8 +26,7 @@ dependencies {
 ```kotlin
 repositories {
     maven("https://repo.kotlin.link")
-    maven("https://dl.bintray.com/kotlin/kotlin-eap") // include for builds based on kotlin-eap
-    maven("https://dl.bintray.com/hotkeytlt/maven") // required for a
+    mavenCentral()
 }
 
 dependencies {
diff --git a/kmath-viktor/build.gradle.kts b/kmath-viktor/build.gradle.kts
index 232bd1388..2e932b441 100644
--- a/kmath-viktor/build.gradle.kts
+++ b/kmath-viktor/build.gradle.kts
@@ -7,9 +7,9 @@ description = "Binding for https://github.com/JetBrains-Research/viktor"
 
 dependencies {
     api(project(":kmath-core"))
-    api("org.jetbrains.bio:viktor:1.0.1")
+    api("org.jetbrains.bio:viktor:1.1.0")
 }
 
 readme {
     maturity = ru.mipt.npm.gradle.Maturity.DEVELOPMENT
-}
\ No newline at end of file
+}
-- 
2.34.1


From 2aed0316f4a38f32ed53e2895d6d7f5a74c779f5 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Fri, 30 Apr 2021 20:28:55 +0700
Subject: [PATCH 155/713] Use GraalVM as CI JDK

---
 .github/workflows/build.yml   | 6 ++++--
 .github/workflows/pages.yml   | 6 ++++--
 .github/workflows/publish.yml | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f39e12a12..9a9f04621 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,9 +13,11 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v2
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: DeLaGuardo/setup-graalvm@4.0
         with:
-          java-version: 11
+          graalvm: 21.1.0
+          java: java11
+          arch: amd64
       - name: Add msys to path
         if: matrix.os == 'windows-latest'
         run: SETX PATH "%PATH%;C:\msys64\mingw64\bin"
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index c70227fce..5892b3c4c 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -12,9 +12,11 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v2
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: DeLaGuardo/setup-graalvm@4.0
         with:
-          java-version: 11
+          graalvm: 21.1.0
+          java: java11
+          arch: amd64
       - name: Cache gradle
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ca374574e..c5c110e89 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -18,9 +18,11 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v2
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: DeLaGuardo/setup-graalvm@4.0
         with:
-          java-version: 11
+          graalvm: 21.1.0
+          java: java11
+          arch: amd64
       - name: Add msys to path
         if: matrix.os == 'windows-latest'
         run: SETX PATH "%PATH%;C:\msys64\mingw64\bin"
-- 
2.34.1


From e5e62bc544143ef4f341257c7d143a5b8a813656 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 30 Apr 2021 14:38:03 +0100
Subject: [PATCH 156/713] Extending from Algebra

---
 .../kmath/tensors/api/TensorAlgebra.kt        |  4 ++-
 .../algebras/BroadcastDoubleTensorAlgebra.kt  |  3 +-
 .../algebras/DoubleAnalyticTensorAlgebra.kt   | 10 ++-----
 .../algebras/DoubleLinearOpsTensorAlgebra.kt  | 12 +++-----
 .../core/algebras/DoubleTensorAlgebra.kt      |  5 +---
 .../kmath/tensors/core/broadcastUtils.kt      |  4 ---
 .../kscience/kmath/tensors/core/linUtils.kt   |  3 +-
 .../kmath/tensors/core/TestBroadcasting.kt    | 16 ++++++-----
 .../core/TestDoubleAnalyticTensorAlgebra.kt   |  5 ++--
 .../core/TestDoubleLinearOpsAlgebra.kt        | 28 +++++++++----------
 .../kmath/tensors/core/TestDoubleTensor.kt    |  9 +++---
 .../tensors/core/TestDoubleTensorAlgebra.kt   | 21 +++++++-------
 12 files changed, 56 insertions(+), 64 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 338064231..96d6985d8 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -5,13 +5,15 @@
 
 package space.kscience.kmath.tensors.api
 
+import space.kscience.kmath.operations.Algebra
+
 /**
  * Algebra over a ring on [TensorStructure].
  * For more information: https://proofwiki.org/wiki/Definition:Algebra_over_Ring
  *
  * @param T the type of items in the tensors.
  */
-public interface TensorAlgebra<T> {
+public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
 
     /**
      * Returns a single tensor value of unit dimension. The tensor shape must be equal to [1].
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
index a49d9ab29..fa64092d6 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
@@ -14,7 +14,7 @@ import space.kscience.kmath.tensors.core.broadcastTo
  * Basic linear algebra operations implemented with broadcasting.
  * For more information: https://pytorch.org/docs/stable/notes/broadcasting.html
  */
-public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
+public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun TensorStructure<Double>.plus(other: TensorStructure<Double>): DoubleTensor {
         val broadcast = broadcastTensors(tensor, other.tensor)
@@ -89,5 +89,4 @@ public class BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
                 newOther.buffer.array()[tensor.bufferStart + i]
         }
     }
-
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
index 7d1cceb15..4a942df84 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
@@ -11,10 +11,9 @@ import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.tensor
 import kotlin.math.*
 
-public class DoubleAnalyticTensorAlgebra:
+public object DoubleAnalyticTensorAlgebra :
     AnalyticTensorAlgebra<Double>,
-        DoubleTensorAlgebra()
-{
+    DoubleTensorAlgebra() {
     override fun TensorStructure<Double>.exp(): DoubleTensor = tensor.map(::exp)
 
     override fun TensorStructure<Double>.log(): DoubleTensor = tensor.map(::ln)
@@ -49,7 +48,4 @@ public class DoubleAnalyticTensorAlgebra:
 
     override fun TensorStructure<Double>.floor(): DoubleTensor = tensor.map(::floor)
 
-}
-
-public inline fun <R> DoubleAnalyticTensorAlgebra(block: DoubleAnalyticTensorAlgebra.() -> R): R =
-    DoubleAnalyticTensorAlgebra().block()
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
index 03f383728..975755656 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
@@ -21,7 +21,7 @@ import space.kscience.kmath.tensors.core.pivInit
 import kotlin.math.min
 
 
-public class DoubleLinearOpsTensorAlgebra :
+public object DoubleLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double>,
     DoubleTensorAlgebra() {
 
@@ -30,8 +30,8 @@ public class DoubleLinearOpsTensorAlgebra :
     override fun TensorStructure<Double>.det(): DoubleTensor = detLU(1e-9)
 
     public fun TensorStructure<Double>.luFactor(epsilon: Double): Pair<DoubleTensor, IntTensor> =
-        computeLU(tensor, epsilon) ?:
-        throw RuntimeException("Tensor contains matrices which are singular at precision $epsilon")
+        computeLU(tensor, epsilon)
+            ?: throw RuntimeException("Tensor contains matrices which are singular at precision $epsilon")
 
     public fun TensorStructure<Double>.luFactor(): Pair<DoubleTensor, IntTensor> = luFactor(1e-9)
 
@@ -175,8 +175,4 @@ public class DoubleLinearOpsTensorAlgebra :
 
     override fun TensorStructure<Double>.lu(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> = lu(1e-9)
 
-
-}
-
-public inline fun <R> DoubleLinearOpsTensorAlgebra(block: DoubleLinearOpsTensorAlgebra.() -> R): R =
-    DoubleLinearOpsTensorAlgebra().block()
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index 7414a4469..8729358cc 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -23,6 +23,7 @@ import kotlin.math.abs
 
 public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
 
+    public companion object : DoubleTensorAlgebra()
 
     override fun TensorStructure<Double>.value(): Double {
         check(tensor.shape contentEquals intArrayOf(1)) {
@@ -395,7 +396,3 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         DoubleTensor(tensor.shape, getRandomNormals(tensor.shape.reduce(Int::times), seed))
 
 }
-
-
-public inline fun <R> DoubleTensorAlgebra(block: DoubleTensorAlgebra.() -> R): R =
-    DoubleTensorAlgebra().block()
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
index 4378e9ac9..71ccbf97b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
@@ -1,11 +1,7 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
 import kotlin.math.max
 
-public inline fun <R> BroadcastDoubleTensorAlgebra(block: BroadcastDoubleTensorAlgebra.() -> R): R =
-    BroadcastDoubleTensorAlgebra().block()
-
 internal inline fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: DoubleTensor, linearSize: Int) {
     for (linearIndex in 0 until linearSize) {
         val totalMultiIndex = resTensor.linearStructure.index(linearIndex)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
index 3a130c71e..c7a730018 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
@@ -4,6 +4,7 @@ import space.kscience.kmath.nd.MutableStructure1D
 import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
 import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
 import kotlin.math.abs
@@ -251,7 +252,7 @@ internal inline fun DoubleLinearOpsTensorAlgebra.qrHelper(
                 }
             }
         }
-        r[j, j] = DoubleAnalyticTensorAlgebra { (v dot v).sqrt().value() }
+        r[j, j] = DoubleAnalyticTensorAlgebra.invoke { (v dot v).sqrt().value() }
         for (i in 0 until n) {
             qM[i, j] = vv[i] / r[j, j]
         }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index d677f6966..207dd1c98 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -1,13 +1,15 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
-class TestBroadcasting {
+internal class TestBroadcasting {
 
     @Test
-    fun broadcastShapes() = DoubleTensorAlgebra {
+    fun broadcastShapes() = DoubleTensorAlgebra.invoke {
         assertTrue(
             broadcastShapes(
                 intArrayOf(2, 3), intArrayOf(1, 3), intArrayOf(1, 1, 1)
@@ -22,7 +24,7 @@ class TestBroadcasting {
     }
 
     @Test
-    fun broadcastTo() = DoubleTensorAlgebra {
+    fun broadcastTo() = DoubleTensorAlgebra.invoke {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
 
@@ -32,7 +34,7 @@ class TestBroadcasting {
     }
 
     @Test
-    fun broadcastTensors() = DoubleTensorAlgebra {
+    fun broadcastTensors() = DoubleTensorAlgebra.invoke {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
@@ -49,7 +51,7 @@ class TestBroadcasting {
     }
 
     @Test
-    fun broadcastOuterTensors() = DoubleTensorAlgebra {
+    fun broadcastOuterTensors() = DoubleTensorAlgebra.invoke {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
@@ -66,7 +68,7 @@ class TestBroadcasting {
     }
 
     @Test
-    fun broadcastOuterTensorsShapes() = DoubleTensorAlgebra {
+    fun broadcastOuterTensorsShapes() = DoubleTensorAlgebra.invoke {
         val tensor1 = fromArray(intArrayOf(2, 1, 3, 2, 3), DoubleArray(2 * 1 * 3 * 2 * 3) {0.0})
         val tensor2 = fromArray(intArrayOf(4, 2, 5, 1, 3, 3), DoubleArray(4 * 2 * 5 * 1 * 3 * 3) {0.0})
         val tensor3 = fromArray(intArrayOf(1, 1), doubleArrayOf(500.0))
@@ -79,7 +81,7 @@ class TestBroadcasting {
     }
 
     @Test
-    fun minusTensor() = BroadcastDoubleTensorAlgebra {
+    fun minusTensor() = BroadcastDoubleTensorAlgebra.invoke {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index 060bc1607..3b3e22acc 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -1,12 +1,13 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
 import kotlin.math.abs
 import kotlin.math.exp
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
-class TestDoubleAnalyticTensorAlgebra {
+internal class TestDoubleAnalyticTensorAlgebra {
 
     val shape = intArrayOf(2, 1, 3, 2)
     val buffer = doubleArrayOf(27.1, 20.0, 19.84, 23.123, 0.0, 1.0, 3.23, 133.7, 25.3, 100.3, 11.0, 12.012)
@@ -26,7 +27,7 @@ class TestDoubleAnalyticTensorAlgebra {
     }
 
     @Test
-    fun testExp() = DoubleAnalyticTensorAlgebra {
+    fun testExp() = DoubleAnalyticTensorAlgebra.invoke {
         tensor.exp().let {
             assertTrue { shape contentEquals it.shape }
             assertTrue { buffer.fmap(::exp).epsEqual(it.buffer.array())}
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index b2ef6b4c4..aa68340d4 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -1,15 +1,16 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
 import kotlin.math.abs
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
-class TestDoubleLinearOpsTensorAlgebra {
+internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
-    fun testDetLU() = DoubleLinearOpsTensorAlgebra {
+    fun testDetLU() = DoubleLinearOpsTensorAlgebra.invoke {
         val tensor = fromArray(
             intArrayOf(2, 2, 2),
             doubleArrayOf(
@@ -34,7 +35,7 @@ class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testDet() = DoubleLinearOpsTensorAlgebra {
+    fun testDet() = DoubleLinearOpsTensorAlgebra.invoke {
         val expectedValue = 0.019827417
         val m = fromArray(
             intArrayOf(3, 3), doubleArrayOf(
@@ -48,7 +49,7 @@ class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testDetSingle() = DoubleLinearOpsTensorAlgebra {
+    fun testDetSingle() = DoubleLinearOpsTensorAlgebra.invoke {
         val expectedValue = 48.151623
         val m = fromArray(
             intArrayOf(1, 1), doubleArrayOf(
@@ -60,7 +61,7 @@ class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testInvLU() = DoubleLinearOpsTensorAlgebra {
+    fun testInvLU() = DoubleLinearOpsTensorAlgebra.invoke {
         val tensor = fromArray(
             intArrayOf(2, 2, 2),
             doubleArrayOf(
@@ -85,14 +86,14 @@ class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testScalarProduct() = DoubleLinearOpsTensorAlgebra {
+    fun testScalarProduct() = DoubleLinearOpsTensorAlgebra.invoke {
         val a = fromArray(intArrayOf(3), doubleArrayOf(1.8, 2.5, 6.8))
         val b = fromArray(intArrayOf(3), doubleArrayOf(5.5, 2.6, 6.4))
         assertEquals(a.dot(b).value(), 59.92)
     }
 
     @Test
-    fun testQR() = DoubleLinearOpsTensorAlgebra {
+    fun testQR() = DoubleLinearOpsTensorAlgebra.invoke {
         val shape = intArrayOf(2, 2, 2)
         val buffer = doubleArrayOf(
             1.0, 3.0,
@@ -110,11 +111,10 @@ class TestDoubleLinearOpsTensorAlgebra {
 
         assertTrue((q dot r).eq(tensor))
 
-        //todo check orthogonality/upper triang.
     }
 
     @Test
-    fun testLU() = DoubleLinearOpsTensorAlgebra {
+    fun testLU() = DoubleLinearOpsTensorAlgebra.invoke {
         val shape = intArrayOf(2, 2, 2)
         val buffer = doubleArrayOf(
             1.0, 3.0,
@@ -134,7 +134,7 @@ class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testCholesky() = DoubleLinearOpsTensorAlgebra {
+    fun testCholesky() = DoubleLinearOpsTensorAlgebra.invoke {
         val tensor = randNormal(intArrayOf(2, 5, 5), 0)
         val sigma = (tensor dot tensor.transpose()) + diagonalEmbedding(
             fromArray(intArrayOf(2, 5), DoubleArray(10) { 0.1 })
@@ -145,7 +145,7 @@ class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testSVD1D() = DoubleLinearOpsTensorAlgebra {
+    fun testSVD1D() = DoubleLinearOpsTensorAlgebra.invoke {
         val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
 
         val res = svd1d(tensor2)
@@ -156,13 +156,13 @@ class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testSVD() = DoubleLinearOpsTensorAlgebra {
+    fun testSVD() = DoubleLinearOpsTensorAlgebra.invoke{
         testSVDFor(fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0)))
         testSVDFor(fromArray(intArrayOf(2, 2), doubleArrayOf(-1.0, 0.0, 239.0, 238.0)))
     }
 
     @Test
-    fun testBatchedSVD() = DoubleLinearOpsTensorAlgebra {
+    fun testBatchedSVD() = DoubleLinearOpsTensorAlgebra.invoke {
         val tensor = randNormal(intArrayOf(2, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
         val tensorSVD = tensorU dot (diagonalEmbedding(tensorS) dot tensorV.transpose())
@@ -170,7 +170,7 @@ class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testBatchedSymEig() = DoubleLinearOpsTensorAlgebra {
+    fun testBatchedSymEig() = DoubleLinearOpsTensorAlgebra.invoke {
         val tensor = randNormal(shape = intArrayOf(2, 3, 3), 0)
         val tensorSigma = tensor + tensor.transpose()
         val (tensorS, tensorV) = tensorSigma.symEig()
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 7103eafaa..20acc0901 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -4,6 +4,7 @@ import space.kscience.kmath.nd.DefaultStrides
 import space.kscience.kmath.nd.MutableBufferND
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asMutableBuffer
 import space.kscience.kmath.structures.toDoubleArray
@@ -12,17 +13,17 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
-class TestDoubleTensor {
+internal class TestDoubleTensor {
 
     @Test
-    fun valueTest() = DoubleTensorAlgebra {
+    fun valueTest() = DoubleTensorAlgebra.invoke {
         val value = 12.5
         val tensor = fromArray(intArrayOf(1), doubleArrayOf(value))
         assertEquals(tensor.value(), value)
     }
 
     @Test
-    fun stridesTest() = DoubleTensorAlgebra {
+    fun stridesTest() = DoubleTensorAlgebra.invoke {
         val tensor = fromArray(intArrayOf(2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
         assertEquals(tensor[intArrayOf(0, 1)], 5.8)
         assertTrue(
@@ -31,7 +32,7 @@ class TestDoubleTensor {
     }
 
     @Test
-    fun getTest() = DoubleTensorAlgebra {
+    fun getTest() = DoubleTensorAlgebra.invoke {
         val tensor = fromArray(intArrayOf(1, 2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
         val matrix = tensor[0].as2D()
         assertEquals(matrix[0, 1], 5.8)
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 1333a7a1f..115016974 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -1,29 +1,30 @@
 package space.kscience.kmath.tensors.core
 
 
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import kotlin.test.Test
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
-class TestDoubleTensorAlgebra {
+internal class TestDoubleTensorAlgebra {
 
     @Test
-    fun doublePlus() = DoubleTensorAlgebra {
+    fun doublePlus() = DoubleTensorAlgebra.invoke {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(1.0, 2.0))
         val res = 10.0 + tensor
         assertTrue(res.buffer.array() contentEquals doubleArrayOf(11.0, 12.0))
     }
 
     @Test
-    fun doubleDiv() = DoubleTensorAlgebra {
+    fun doubleDiv() = DoubleTensorAlgebra.invoke {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(2.0, 4.0))
         val res = 2.0/tensor
         assertTrue(res.buffer.array() contentEquals doubleArrayOf(1.0, 0.5))
     }
 
     @Test
-    fun divDouble() = DoubleTensorAlgebra {
+    fun divDouble() = DoubleTensorAlgebra.invoke {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(10.0, 5.0))
         val res = tensor / 2.5
         assertTrue(res.buffer.array() contentEquals doubleArrayOf(4.0, 2.0))
@@ -39,7 +40,7 @@ class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun transpose3x2() = DoubleTensorAlgebra {
+    fun transpose3x2() = DoubleTensorAlgebra.invoke {
         val tensor = fromArray(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res = tensor.transpose(1, 0)
 
@@ -48,7 +49,7 @@ class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun transpose1x2x3() = DoubleTensorAlgebra {
+    fun transpose1x2x3() = DoubleTensorAlgebra.invoke {
         val tensor = fromArray(intArrayOf(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res01 = tensor.transpose(0, 1)
         val res02 = tensor.transpose(-3, 2)
@@ -64,7 +65,7 @@ class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun linearStructure() = DoubleTensorAlgebra {
+    fun linearStructure() = DoubleTensorAlgebra.invoke {
         val shape = intArrayOf(3)
         val tensorA = full(value = -4.5, shape = shape)
         val tensorB = full(value = 10.9, shape = shape)
@@ -96,7 +97,7 @@ class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun dot() = DoubleTensorAlgebra {
+    fun dot() = DoubleTensorAlgebra.invoke {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor11 = fromArray(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(3), doubleArrayOf(10.0, 20.0, 30.0))
@@ -132,7 +133,7 @@ class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun diagonalEmbedding() = DoubleTensorAlgebra {
+    fun diagonalEmbedding() = DoubleTensorAlgebra.invoke {
         val tensor1 = fromArray(intArrayOf(3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor3 = zeros(intArrayOf(2, 3, 4, 5))
@@ -165,7 +166,7 @@ class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun testEq() = DoubleTensorAlgebra {
+    fun testEq() = DoubleTensorAlgebra.invoke {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor3 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 5.0))
-- 
2.34.1


From 6be5caa93f4086e222677a55d15edaca707b16f0 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 30 Apr 2021 14:44:42 +0100
Subject: [PATCH 157/713] No secondary constructors

---
 .../kmath/tensors/core/BufferedTensor.kt      | 25 +++----
 .../algebras/BroadcastDoubleTensorAlgebra.kt  | 28 ++++----
 .../algebras/DoubleLinearOpsTensorAlgebra.kt  |  2 +-
 .../core/algebras/DoubleTensorAlgebra.kt      | 68 +++++++++----------
 .../kmath/tensors/core/broadcastUtils.kt      | 10 +--
 .../kscience/kmath/tensors/core/linUtils.kt   | 14 ++--
 .../kmath/tensors/core/TestBroadcasting.kt    | 20 +++---
 .../core/TestDoubleAnalyticTensorAlgebra.kt   |  2 +-
 .../core/TestDoubleLinearOpsAlgebra.kt        |  4 +-
 .../kmath/tensors/core/TestDoubleTensor.kt    |  5 +-
 .../tensors/core/TestDoubleTensorAlgebra.kt   | 34 +++++-----
 11 files changed, 103 insertions(+), 109 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 6e1cab11a..fae59804d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -8,7 +8,7 @@ import space.kscience.kmath.tensors.core.algebras.TensorLinearStructure
 
 public open class BufferedTensor<T>(
     override val shape: IntArray,
-    internal val buffer: MutableBuffer<T>,
+    internal val mutableBuffer: MutableBuffer<T>,
     internal val bufferStart: Int
 ) : TensorStructure<T> {
     public val linearStructure: TensorLinearStructure
@@ -17,10 +17,10 @@ public open class BufferedTensor<T>(
     public val numElements: Int
         get() = linearStructure.size
 
-    override fun get(index: IntArray): T = buffer[bufferStart + linearStructure.offset(index)]
+    override fun get(index: IntArray): T = mutableBuffer[bufferStart + linearStructure.offset(index)]
 
     override fun set(index: IntArray, value: T) {
-        buffer[bufferStart + linearStructure.offset(index)] = value
+        mutableBuffer[bufferStart + linearStructure.offset(index)] = value
     }
 
     override fun elements(): Sequence<Pair<IntArray, T>> = linearStructure.indices().map {
@@ -37,33 +37,28 @@ public class IntTensor internal constructor(
     shape: IntArray,
     buffer: IntArray,
     offset: Int = 0
-) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset) {
-    internal constructor(bufferedTensor: BufferedTensor<Int>) :
-            this(bufferedTensor.shape, bufferedTensor.buffer.array(), bufferedTensor.bufferStart)
-}
+) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset)
 
 public class DoubleTensor internal constructor(
     shape: IntArray,
     buffer: DoubleArray,
     offset: Int = 0
 ) : BufferedTensor<Double>(shape, DoubleBuffer(buffer), offset) {
-    internal constructor(bufferedTensor: BufferedTensor<Double>) :
-            this(bufferedTensor.shape, bufferedTensor.buffer.array(), bufferedTensor.bufferStart)
-
     override fun toString(): String = toPrettyString()
-
 }
 
-internal inline fun BufferedTensor<Int>.asTensor(): IntTensor = IntTensor(this)
-internal inline fun BufferedTensor<Double>.asTensor(): DoubleTensor = DoubleTensor(this)
+internal fun BufferedTensor<Int>.asTensor(): IntTensor =
+    IntTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
+internal fun BufferedTensor<Double>.asTensor(): DoubleTensor =
+    DoubleTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
 
-internal inline fun <T> TensorStructure<T>.copyToBufferedTensor(): BufferedTensor<T> =
+internal fun <T> TensorStructure<T>.copyToBufferedTensor(): BufferedTensor<T> =
     BufferedTensor(
         this.shape,
         TensorLinearStructure(this.shape).indices().map(this::get).toMutableList().asMutableBuffer(), 0
     )
 
-internal inline fun <T> TensorStructure<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
+internal fun <T> TensorStructure<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
     is BufferedTensor<T> -> this
     is MutableBufferND<T> -> if (this.strides.strides.toIntArray() contentEquals TensorLinearStructure(this.shape).strides)
         BufferedTensor(this.shape, this.mutableBuffer, 0) else this.copyToBufferedTensor()
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
index fa64092d6..350d939af 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
@@ -21,7 +21,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
-            newThis.buffer.array()[i] + newOther.buffer.array()[i]
+            newThis.mutableBuffer.array()[i] + newOther.mutableBuffer.array()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
@@ -29,8 +29,8 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
     override fun TensorStructure<Double>.plusAssign(other: TensorStructure<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
         for (i in 0 until tensor.linearStructure.size) {
-            tensor.buffer.array()[tensor.bufferStart + i] +=
-                newOther.buffer.array()[tensor.bufferStart + i]
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
+                newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
@@ -39,7 +39,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
-            newThis.buffer.array()[i] - newOther.buffer.array()[i]
+            newThis.mutableBuffer.array()[i] - newOther.mutableBuffer.array()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
@@ -47,8 +47,8 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
     override fun TensorStructure<Double>.minusAssign(other: TensorStructure<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
         for (i in 0 until tensor.linearStructure.size) {
-            tensor.buffer.array()[tensor.bufferStart + i] -=
-                newOther.buffer.array()[tensor.bufferStart + i]
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
+                newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
@@ -57,8 +57,8 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
-            newThis.buffer.array()[newThis.bufferStart + i] *
-                    newOther.buffer.array()[newOther.bufferStart + i]
+            newThis.mutableBuffer.array()[newThis.bufferStart + i] *
+                    newOther.mutableBuffer.array()[newOther.bufferStart + i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
@@ -66,8 +66,8 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
     override fun TensorStructure<Double>.timesAssign(other: TensorStructure<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
         for (i in 0 until tensor.linearStructure.size) {
-            tensor.buffer.array()[tensor.bufferStart + i] *=
-                newOther.buffer.array()[tensor.bufferStart + i]
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
+                newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
@@ -76,8 +76,8 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
-            newThis.buffer.array()[newOther.bufferStart + i] /
-                    newOther.buffer.array()[newOther.bufferStart + i]
+            newThis.mutableBuffer.array()[newOther.bufferStart + i] /
+                    newOther.mutableBuffer.array()[newOther.bufferStart + i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
@@ -85,8 +85,8 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
     override fun TensorStructure<Double>.divAssign(other: TensorStructure<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
         for (i in 0 until tensor.linearStructure.size) {
-            tensor.buffer.array()[tensor.bufferStart + i] /=
-                newOther.buffer.array()[tensor.bufferStart + i]
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] /=
+                newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
index 975755656..ab73b25b1 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
@@ -106,7 +106,7 @@ public object DoubleLinearOpsTensorAlgebra :
             val matrixSize = matrix.shape.reduce { acc, i -> acc * i }
             val curMatrix = DoubleTensor(
                 matrix.shape,
-                matrix.buffer.array().slice(matrix.bufferStart until matrix.bufferStart + matrixSize).toDoubleArray()
+                matrix.mutableBuffer.array().slice(matrix.bufferStart until matrix.bufferStart + matrixSize).toDoubleArray()
             )
             svdHelper(curMatrix, USV, m, n, epsilon)
         }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index 8729358cc..f428b9d2e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -29,7 +29,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         check(tensor.shape contentEquals intArrayOf(1)) {
             "Inconsistent value for tensor of shape ${shape.toList()}"
         }
-        return tensor.buffer.array()[tensor.bufferStart]
+        return tensor.mutableBuffer.array()[tensor.bufferStart]
     }
 
     public fun fromArray(shape: IntArray, buffer: DoubleArray): DoubleTensor {
@@ -43,7 +43,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         val lastShape = tensor.shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
         val newStart = newShape.reduce(Int::times) * i + tensor.bufferStart
-        return DoubleTensor(newShape, tensor.buffer.array(), newStart)
+        return DoubleTensor(newShape, tensor.mutableBuffer.array(), newStart)
     }
 
     public fun full(value: Double, shape: IntArray): DoubleTensor {
@@ -77,12 +77,12 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     }
 
     public fun TensorStructure<Double>.copy(): DoubleTensor {
-        return DoubleTensor(tensor.shape, tensor.buffer.array().copyOf(), tensor.bufferStart)
+        return DoubleTensor(tensor.shape, tensor.mutableBuffer.array().copyOf(), tensor.bufferStart)
     }
 
     override fun Double.plus(other: TensorStructure<Double>): DoubleTensor {
         val resBuffer = DoubleArray(other.tensor.numElements) { i ->
-            other.tensor.buffer.array()[other.tensor.bufferStart + i] + this
+            other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i] + this
         }
         return DoubleTensor(other.shape, resBuffer)
     }
@@ -92,35 +92,35 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     override fun TensorStructure<Double>.plus(other: TensorStructure<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other.tensor)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.buffer.array()[i] + other.tensor.buffer.array()[i]
+            tensor.mutableBuffer.array()[i] + other.tensor.mutableBuffer.array()[i]
         }
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
     override fun TensorStructure<Double>.plusAssign(value: Double) {
         for (i in 0 until tensor.numElements) {
-            tensor.buffer.array()[tensor.bufferStart + i] += value
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] += value
         }
     }
 
     override fun TensorStructure<Double>.plusAssign(other: TensorStructure<Double>) {
         checkShapesCompatible(tensor, other.tensor)
         for (i in 0 until tensor.numElements) {
-            tensor.buffer.array()[tensor.bufferStart + i] +=
-                other.tensor.buffer.array()[tensor.bufferStart + i]
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
+                other.tensor.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
     override fun Double.minus(other: TensorStructure<Double>): DoubleTensor {
         val resBuffer = DoubleArray(other.tensor.numElements) { i ->
-            this - other.tensor.buffer.array()[other.tensor.bufferStart + i]
+            this - other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i]
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
     override fun TensorStructure<Double>.minus(value: Double): DoubleTensor {
         val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.buffer.array()[tensor.bufferStart + i] - value
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] - value
         }
         return DoubleTensor(tensor.shape, resBuffer)
     }
@@ -128,28 +128,28 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     override fun TensorStructure<Double>.minus(other: TensorStructure<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.buffer.array()[i] - other.tensor.buffer.array()[i]
+            tensor.mutableBuffer.array()[i] - other.tensor.mutableBuffer.array()[i]
         }
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
     override fun TensorStructure<Double>.minusAssign(value: Double) {
         for (i in 0 until tensor.numElements) {
-            tensor.buffer.array()[tensor.bufferStart + i] -= value
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] -= value
         }
     }
 
     override fun TensorStructure<Double>.minusAssign(other: TensorStructure<Double>) {
         checkShapesCompatible(tensor, other)
         for (i in 0 until tensor.numElements) {
-            tensor.buffer.array()[tensor.bufferStart + i] -=
-                other.tensor.buffer.array()[tensor.bufferStart + i]
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
+                other.tensor.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
     override fun Double.times(other: TensorStructure<Double>): DoubleTensor {
         val resBuffer = DoubleArray(other.tensor.numElements) { i ->
-            other.tensor.buffer.array()[other.tensor.bufferStart + i] * this
+            other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i] * this
         }
         return DoubleTensor(other.shape, resBuffer)
     }
@@ -159,36 +159,36 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     override fun TensorStructure<Double>.times(other: TensorStructure<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.buffer.array()[tensor.bufferStart + i] *
-                    other.tensor.buffer.array()[other.tensor.bufferStart + i]
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] *
+                    other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i]
         }
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
     override fun TensorStructure<Double>.timesAssign(value: Double) {
         for (i in 0 until tensor.numElements) {
-            tensor.buffer.array()[tensor.bufferStart + i] *= value
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] *= value
         }
     }
 
     override fun TensorStructure<Double>.timesAssign(other: TensorStructure<Double>) {
         checkShapesCompatible(tensor, other)
         for (i in 0 until tensor.numElements) {
-            tensor.buffer.array()[tensor.bufferStart + i] *=
-                other.tensor.buffer.array()[tensor.bufferStart + i]
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
+                other.tensor.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
     override fun Double.div(other: TensorStructure<Double>): DoubleTensor {
         val resBuffer = DoubleArray(other.tensor.numElements) { i ->
-            this / other.tensor.buffer.array()[other.tensor.bufferStart + i]
+            this / other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i]
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
     override fun TensorStructure<Double>.div(value: Double): DoubleTensor {
         val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.buffer.array()[tensor.bufferStart + i] / value
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] / value
         }
         return DoubleTensor(shape, resBuffer)
     }
@@ -196,29 +196,29 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     override fun TensorStructure<Double>.div(other: TensorStructure<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.buffer.array()[other.tensor.bufferStart + i] /
-                    other.tensor.buffer.array()[other.tensor.bufferStart + i]
+            tensor.mutableBuffer.array()[other.tensor.bufferStart + i] /
+                    other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i]
         }
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
     override fun TensorStructure<Double>.divAssign(value: Double) {
         for (i in 0 until tensor.numElements) {
-            tensor.buffer.array()[tensor.bufferStart + i] /= value
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] /= value
         }
     }
 
     override fun TensorStructure<Double>.divAssign(other: TensorStructure<Double>) {
         checkShapesCompatible(tensor, other)
         for (i in 0 until tensor.numElements) {
-            tensor.buffer.array()[tensor.bufferStart + i] /=
-                other.tensor.buffer.array()[tensor.bufferStart + i]
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] /=
+                other.tensor.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
     override fun TensorStructure<Double>.unaryMinus(): DoubleTensor {
         val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.buffer.array()[tensor.bufferStart + i].unaryMinus()
+            tensor.mutableBuffer.array()[tensor.bufferStart + i].unaryMinus()
         }
         return DoubleTensor(tensor.shape, resBuffer)
     }
@@ -241,8 +241,8 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
             newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
 
             val linearIndex = resTensor.linearStructure.offset(newMultiIndex)
-            resTensor.buffer.array()[linearIndex] =
-                tensor.buffer.array()[tensor.bufferStart + offset]
+            resTensor.mutableBuffer.array()[linearIndex] =
+                tensor.mutableBuffer.array()[tensor.bufferStart + offset]
         }
         return resTensor
     }
@@ -250,7 +250,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
 
     override fun TensorStructure<Double>.view(shape: IntArray): DoubleTensor {
         checkView(tensor, shape)
-        return DoubleTensor(shape, tensor.buffer.array(), tensor.bufferStart)
+        return DoubleTensor(shape, tensor.mutableBuffer.array(), tensor.bufferStart)
     }
 
     override fun TensorStructure<Double>.viewAs(other: TensorStructure<Double>): DoubleTensor {
@@ -259,7 +259,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
 
     override infix fun TensorStructure<Double>.dot(other: TensorStructure<Double>): DoubleTensor {
         if (tensor.shape.size == 1 && other.shape.size == 1) {
-            return DoubleTensor(intArrayOf(1), doubleArrayOf(tensor.times(other).tensor.buffer.array().sum()))
+            return DoubleTensor(intArrayOf(1), doubleArrayOf(tensor.times(other).tensor.mutableBuffer.array().sum()))
         }
 
         var newThis = tensor.copy()
@@ -361,7 +361,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     public fun TensorStructure<Double>.map(transform: (Double) -> Double): DoubleTensor {
         return DoubleTensor(
             tensor.shape,
-            tensor.buffer.array().map { transform(it) }.toDoubleArray(),
+            tensor.mutableBuffer.array().map { transform(it) }.toDoubleArray(),
             tensor.bufferStart
         )
     }
@@ -382,7 +382,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
             return false
         }
         for (i in 0 until n) {
-            if (!eqFunction(tensor.buffer[tensor.bufferStart + i], other.tensor.buffer[other.tensor.bufferStart + i])) {
+            if (!eqFunction(tensor.mutableBuffer[tensor.bufferStart + i], other.tensor.mutableBuffer[other.tensor.bufferStart + i])) {
                 return false
             }
         }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
index 71ccbf97b..2d4d6f0f7 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
@@ -18,8 +18,8 @@ internal inline fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: Doub
         }
 
         val curLinearIndex = tensor.linearStructure.offset(curMultiIndex)
-        resTensor.buffer.array()[linearIndex] =
-            tensor.buffer.array()[tensor.bufferStart + curLinearIndex]
+        resTensor.mutableBuffer.array()[linearIndex] =
+            tensor.mutableBuffer.array()[tensor.bufferStart + curLinearIndex]
     }
 }
 
@@ -113,7 +113,7 @@ internal inline fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<Do
             var curMultiIndex = tensor.shape.sliceArray(0..tensor.shape.size - 3).copyOf()
             curMultiIndex = IntArray(totalMultiIndex.size - curMultiIndex.size) { 1 } + curMultiIndex
 
-            val newTensor = DoubleTensor(curMultiIndex + matrixShape, tensor.buffer.array())
+            val newTensor = DoubleTensor(curMultiIndex + matrixShape, tensor.mutableBuffer.array())
 
             for (i in curMultiIndex.indices) {
                 if (curMultiIndex[i] != 1) {
@@ -133,8 +133,8 @@ internal inline fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<Do
                             matrix.linearStructure.index(i)
                 )
 
-                resTensor.buffer.array()[resTensor.bufferStart + newLinearIndex] =
-                    newTensor.buffer.array()[newTensor.bufferStart + curLinearIndex]
+                resTensor.mutableBuffer.array()[resTensor.bufferStart + newLinearIndex] =
+                    newTensor.mutableBuffer.array()[newTensor.bufferStart + curLinearIndex]
             }
         }
         res += resTensor
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
index c7a730018..776a5e4d5 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
@@ -18,7 +18,7 @@ internal inline fun <T> BufferedTensor<T>.vectorSequence(): Sequence<BufferedTen
     val vectorOffset = shape[n - 1]
     val vectorShape = intArrayOf(shape.last())
     for (offset in 0 until numElements step vectorOffset) {
-        val vector = BufferedTensor(vectorShape, buffer, offset)
+        val vector = BufferedTensor(vectorShape, mutableBuffer, offset)
         yield(vector)
     }
 }
@@ -29,7 +29,7 @@ internal inline fun <T> BufferedTensor<T>.matrixSequence(): Sequence<BufferedTen
     val matrixOffset = shape[n - 1] * shape[n - 2]
     val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
     for (offset in 0 until numElements step matrixOffset) {
-        val matrix = BufferedTensor(matrixShape, buffer, offset)
+        val matrix = BufferedTensor(matrixShape, mutableBuffer, offset)
         yield(matrix)
     }
 }
@@ -322,16 +322,16 @@ internal inline fun DoubleLinearOpsTensorAlgebra.svdHelper(
     }
 
     val s = res.map { it.first }.toDoubleArray()
-    val uBuffer = res.map { it.second }.flatMap { it.buffer.array().toList() }.toDoubleArray()
-    val vBuffer = res.map { it.third }.flatMap { it.buffer.array().toList() }.toDoubleArray()
+    val uBuffer = res.map { it.second }.flatMap { it.mutableBuffer.array().toList() }.toDoubleArray()
+    val vBuffer = res.map { it.third }.flatMap { it.mutableBuffer.array().toList() }.toDoubleArray()
     for (i in uBuffer.indices) {
-        matrixU.buffer.array()[matrixU.bufferStart + i] = uBuffer[i]
+        matrixU.mutableBuffer.array()[matrixU.bufferStart + i] = uBuffer[i]
     }
     for (i in s.indices) {
-        matrixS.buffer.array()[matrixS.bufferStart + i] = s[i]
+        matrixS.mutableBuffer.array()[matrixS.bufferStart + i] = s[i]
     }
     for (i in vBuffer.indices) {
-        matrixV.buffer.array()[matrixV.bufferStart + i] = vBuffer[i]
+        matrixV.mutableBuffer.array()[matrixV.bufferStart + i] = vBuffer[i]
     }
 }
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 207dd1c98..1070a1115 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -30,7 +30,7 @@ internal class TestBroadcasting {
 
         val res = broadcastTo(tensor2, tensor1.shape)
         assertTrue(res.shape contentEquals intArrayOf(2, 3))
-        assertTrue(res.buffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
+        assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
     }
 
     @Test
@@ -45,9 +45,9 @@ internal class TestBroadcasting {
         assertTrue(res[1].shape contentEquals intArrayOf(1, 2, 3))
         assertTrue(res[2].shape contentEquals intArrayOf(1, 2, 3))
 
-        assertTrue(res[0].buffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res[1].buffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
-        assertTrue(res[2].buffer.array() contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
+        assertTrue(res[0].mutableBuffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res[1].mutableBuffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
+        assertTrue(res[2].mutableBuffer.array() contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
     }
 
     @Test
@@ -62,9 +62,9 @@ internal class TestBroadcasting {
         assertTrue(res[1].shape contentEquals intArrayOf(1, 1, 3))
         assertTrue(res[2].shape contentEquals intArrayOf(1, 1, 1))
 
-        assertTrue(res[0].buffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res[1].buffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0))
-        assertTrue(res[2].buffer.array() contentEquals doubleArrayOf(500.0))
+        assertTrue(res[0].mutableBuffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res[1].mutableBuffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0))
+        assertTrue(res[2].mutableBuffer.array() contentEquals doubleArrayOf(500.0))
     }
 
     @Test
@@ -91,16 +91,16 @@ internal class TestBroadcasting {
         val tensor32 = tensor3 - tensor2
 
         assertTrue(tensor21.shape contentEquals intArrayOf(2, 3))
-        assertTrue(tensor21.buffer.array() contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
+        assertTrue(tensor21.mutableBuffer.array() contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
 
         assertTrue(tensor31.shape contentEquals intArrayOf(1, 2, 3))
         assertTrue(
-            tensor31.buffer.array()
+            tensor31.mutableBuffer.array()
                     contentEquals doubleArrayOf(499.0, 498.0, 497.0, 496.0, 495.0, 494.0)
         )
 
         assertTrue(tensor32.shape contentEquals intArrayOf(1, 1, 3))
-        assertTrue(tensor32.buffer.array() contentEquals doubleArrayOf(490.0, 480.0, 470.0))
+        assertTrue(tensor32.mutableBuffer.array() contentEquals doubleArrayOf(490.0, 480.0, 470.0))
     }
 
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index 3b3e22acc..66959a0de 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -30,7 +30,7 @@ internal class TestDoubleAnalyticTensorAlgebra {
     fun testExp() = DoubleAnalyticTensorAlgebra.invoke {
         tensor.exp().let {
             assertTrue { shape contentEquals it.shape }
-            assertTrue { buffer.fmap(::exp).epsEqual(it.buffer.array())}
+            assertTrue { buffer.fmap(::exp).epsEqual(it.mutableBuffer.array())}
         }
     }
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index aa68340d4..1148c0aad 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -151,8 +151,8 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         val res = svd1d(tensor2)
 
         assertTrue(res.shape contentEquals intArrayOf(2))
-        assertTrue { abs(abs(res.buffer.array()[res.bufferStart]) - 0.386) < 0.01 }
-        assertTrue { abs(abs(res.buffer.array()[res.bufferStart + 1]) - 0.922) < 0.01 }
+        assertTrue { abs(abs(res.mutableBuffer.array()[res.bufferStart]) - 0.386) < 0.01 }
+        assertTrue { abs(abs(res.mutableBuffer.array()[res.bufferStart + 1]) - 0.922) < 0.01 }
     }
 
     @Test
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 20acc0901..eca54f68b 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -6,7 +6,6 @@ import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.asMutableBuffer
 import space.kscience.kmath.structures.toDoubleArray
 import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import kotlin.test.Test
@@ -27,7 +26,7 @@ internal class TestDoubleTensor {
         val tensor = fromArray(intArrayOf(2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
         assertEquals(tensor[intArrayOf(0, 1)], 5.8)
         assertTrue(
-            tensor.elements().map { it.second }.toList().toDoubleArray() contentEquals tensor.buffer.toDoubleArray()
+            tensor.elements().map { it.second }.toList().toDoubleArray() contentEquals tensor.mutableBuffer.toDoubleArray()
         )
     }
 
@@ -71,7 +70,7 @@ internal class TestDoubleTensor {
         val tensorArrayPublic = ndArray.toTypedTensor() // public API, data copied twice
         val sharedTensorArray = tensorArrayPublic.toTypedTensor() // no data copied by matching type
 
-        assertTrue(tensorArray.buffer.array() contentEquals sharedTensorArray.buffer.array())
+        assertTrue(tensorArray.mutableBuffer.array() contentEquals sharedTensorArray.mutableBuffer.array())
 
         tensorArray[intArrayOf(0)] = 55.9
         assertEquals(tensorArrayPublic[intArrayOf(0)], 1.0)
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 115016974..34fe5d5f1 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -13,21 +13,21 @@ internal class TestDoubleTensorAlgebra {
     fun doublePlus() = DoubleTensorAlgebra.invoke {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(1.0, 2.0))
         val res = 10.0 + tensor
-        assertTrue(res.buffer.array() contentEquals doubleArrayOf(11.0, 12.0))
+        assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(11.0, 12.0))
     }
 
     @Test
     fun doubleDiv() = DoubleTensorAlgebra.invoke {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(2.0, 4.0))
         val res = 2.0/tensor
-        assertTrue(res.buffer.array() contentEquals doubleArrayOf(1.0, 0.5))
+        assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(1.0, 0.5))
     }
 
     @Test
     fun divDouble() = DoubleTensorAlgebra.invoke {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(10.0, 5.0))
         val res = tensor / 2.5
-        assertTrue(res.buffer.array() contentEquals doubleArrayOf(4.0, 2.0))
+        assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(4.0, 2.0))
     }
 
     @Test
@@ -35,7 +35,7 @@ internal class TestDoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(1), doubleArrayOf(0.0))
         val res = tensor.transpose(0, 0)
 
-        assertTrue(res.buffer.array() contentEquals doubleArrayOf(0.0))
+        assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(0.0))
         assertTrue(res.shape contentEquals intArrayOf(1))
     }
 
@@ -44,7 +44,7 @@ internal class TestDoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res = tensor.transpose(1, 0)
 
-        assertTrue(res.buffer.array() contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
+        assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
         assertTrue(res.shape contentEquals intArrayOf(2, 3))
     }
 
@@ -59,9 +59,9 @@ internal class TestDoubleTensorAlgebra {
         assertTrue(res02.shape contentEquals intArrayOf(3, 2, 1))
         assertTrue(res12.shape contentEquals intArrayOf(1, 3, 2))
 
-        assertTrue(res01.buffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res02.buffer.array() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
-        assertTrue(res12.buffer.array() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res01.mutableBuffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res02.mutableBuffer.array() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res12.mutableBuffer.array() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
     }
 
     @Test
@@ -92,8 +92,8 @@ internal class TestDoubleTensorAlgebra {
         assignResult += tensorC
         assignResult += -39.4
 
-        assertTrue(expected.buffer.array() contentEquals result.buffer.array())
-        assertTrue(expected.buffer.array() contentEquals assignResult.buffer.array())
+        assertTrue(expected.mutableBuffer.array() contentEquals result.mutableBuffer.array())
+        assertTrue(expected.mutableBuffer.array() contentEquals assignResult.mutableBuffer.array())
     }
 
     @Test
@@ -104,19 +104,19 @@ internal class TestDoubleTensorAlgebra {
         val tensor3 = fromArray(intArrayOf(1, 1, 3), doubleArrayOf(-1.0, -2.0, -3.0))
 
         val res12 = tensor1.dot(tensor2)
-        assertTrue(res12.buffer.array() contentEquals doubleArrayOf(140.0, 320.0))
+        assertTrue(res12.mutableBuffer.array() contentEquals doubleArrayOf(140.0, 320.0))
         assertTrue(res12.shape contentEquals intArrayOf(2))
 
         val res32 = tensor3.dot(tensor2)
-        assertTrue(res32.buffer.array() contentEquals doubleArrayOf(-140.0))
+        assertTrue(res32.mutableBuffer.array() contentEquals doubleArrayOf(-140.0))
         assertTrue(res32.shape contentEquals intArrayOf(1, 1))
 
         val res22 = tensor2.dot(tensor2)
-        assertTrue(res22.buffer.array() contentEquals doubleArrayOf(1400.0))
+        assertTrue(res22.mutableBuffer.array() contentEquals doubleArrayOf(1400.0))
         assertTrue(res22.shape contentEquals intArrayOf(1))
 
         val res11 = tensor1.dot(tensor11)
-        assertTrue(res11.buffer.array() contentEquals doubleArrayOf(22.0, 28.0, 49.0, 64.0))
+        assertTrue(res11.mutableBuffer.array() contentEquals doubleArrayOf(22.0, 28.0, 49.0, 64.0))
         assertTrue(res11.shape contentEquals intArrayOf(2, 2))
 
         var tensor4 = fromArray(intArrayOf(10, 3, 4), DoubleArray(10 * 3 * 4) {0.0})
@@ -147,17 +147,17 @@ internal class TestDoubleTensorAlgebra {
 
         val diagonal1 = diagonalEmbedding(tensor1, 0, 1, 0)
         assertTrue(diagonal1.shape contentEquals intArrayOf(3, 3))
-        assertTrue(diagonal1.buffer.array() contentEquals
+        assertTrue(diagonal1.mutableBuffer.array() contentEquals
                 doubleArrayOf(10.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 30.0))
 
         val diagonal1Offset = diagonalEmbedding(tensor1, 1, 1, 0)
         assertTrue(diagonal1Offset.shape contentEquals intArrayOf(4, 4))
-        assertTrue(diagonal1Offset.buffer.array() contentEquals
+        assertTrue(diagonal1Offset.mutableBuffer.array() contentEquals
                 doubleArrayOf(0.0, 0.0, 0.0, 0.0, 10.0, 0.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 0.0, 30.0, 0.0))
 
         val diagonal2 = diagonalEmbedding(tensor2, 1, 0, 2)
         assertTrue(diagonal2.shape contentEquals intArrayOf(4, 2, 4))
-        assertTrue(diagonal2.buffer.array() contentEquals
+        assertTrue(diagonal2.mutableBuffer.array() contentEquals
                 doubleArrayOf(
                     0.0, 1.0, 0.0, 0.0, 0.0, 4.0, 0.0, 0.0,
                     0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 5.0, 0.0,
-- 
2.34.1


From 77d72c7bf6bc6b7a2a111e13739c592fd7e5fcf5 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 31 Mar 2021 19:39:34 +0700
Subject: [PATCH 158/713] Add Jupyter integration

---
 CHANGELOG.md                                  |   1 +
 build.gradle.kts                              |   1 +
 .../ast/rendering/MathMLSyntaxRenderer.kt     |   9 +-
 kmath-core/api/kmath-core.api                 |   2 +
 .../kscience/kmath/expressions/MstAlgebra.kt  |   1 +
 kmath-jupyter/build.gradle.kts                |  19 +++
 .../kscience/kmath/jupyter/KMathJupyter.kt    | 120 ++++++++++++++++++
 settings.gradle.kts                           |   4 +
 8 files changed, 154 insertions(+), 3 deletions(-)
 create mode 100644 kmath-jupyter/build.gradle.kts
 create mode 100644 kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4266c5b70..cdc82753c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Multiplatform integration
 - Integration for any Field element
 - Extended operations for ND4J fields
+- Jupyter Notebook integration module (kmath-jupyter)
 
 ### Changed
 - Exponential operations merged with hyperbolic functions
diff --git a/build.gradle.kts b/build.gradle.kts
index 506f51a0e..760bf1aee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     id("ru.mipt.npm.gradle.project")
+    kotlin("jupyter.api") apply false
 }
 
 allprojects {
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
index 517ec0dc9..5b44e660d 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
@@ -18,11 +18,14 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 public object MathMLSyntaxRenderer : SyntaxRenderer {
     public override fun render(node: MathSyntax, output: Appendable) {
         output.append("<math xmlns=\"https://www.w3.org/1998/Math/MathML\"><mrow>")
-        render0(node, output)
+        renderPart(node, output)
         output.append("</mrow></math>")
     }
 
-    private fun render0(node: MathSyntax, output: Appendable): Unit = output.run {
+    /**
+     * Renders a part of syntax returning a correct MathML tag not the whole MathML instance.
+     */
+    public fun renderPart(node: MathSyntax, output: Appendable): Unit = output.run {
         fun tag(tagName: String, vararg attr: Pair<String, String>, block: () -> Unit = {}) {
             append('<')
             append(tagName)
@@ -47,7 +50,7 @@ public object MathMLSyntaxRenderer : SyntaxRenderer {
             append('>')
         }
 
-        fun render(syntax: MathSyntax) = render0(syntax, output)
+        fun render(syntax: MathSyntax) = renderPart(syntax, output)
 
         when (node) {
             is NumberSyntax -> tag("mn") { append(node.string) }
diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 6b300123c..82b44d275 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -272,6 +272,8 @@ public final class space/kscience/kmath/expressions/MstExtendedField : space/ksc
 	public fun sin (Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Unary;
 	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun sinh (Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Unary;
+	public synthetic fun sqrt (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun sqrt (Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST;
 	public synthetic fun tan (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun tan (Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Unary;
 	public synthetic fun tanh (Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
index 32a7efc1e..53124b777 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
@@ -135,6 +135,7 @@ public object MstExtendedField : ExtendedField<MST>, NumericAlgebra<MST> {
     public override fun acosh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.ACOSH_OPERATION)(arg)
     public override fun atanh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.ATANH_OPERATION)(arg)
     public override fun add(a: MST, b: MST): MST.Binary = MstField.add(a, b)
+    public override fun sqrt(arg: MST): MST = unaryOperationFunction(PowerOperations.SQRT_OPERATION)(arg)
 
     public override fun scale(a: MST, value: Double): MST =
         binaryOperation(GroupOperations.PLUS_OPERATION, a, number(value))
diff --git a/kmath-jupyter/build.gradle.kts b/kmath-jupyter/build.gradle.kts
new file mode 100644
index 000000000..815cb9b8c
--- /dev/null
+++ b/kmath-jupyter/build.gradle.kts
@@ -0,0 +1,19 @@
+plugins {
+    id("ru.mipt.npm.gradle.jvm")
+    kotlin("jupyter.api")
+}
+
+dependencies {
+    api(project(":kmath-ast"))
+    api(project(":kmath-complex"))
+    api(project(":kmath-for-real"))
+    implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3")
+}
+
+readme {
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+}
+
+kotlin.sourceSets.all {
+    languageSettings.useExperimentalAnnotation("space.kscience.kmath.misc.UnstableKMathAPI")
+}
diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
new file mode 100644
index 000000000..e13c92f75
--- /dev/null
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -0,0 +1,120 @@
+package space.kscience.kmath.jupyter
+
+import kotlinx.html.Unsafe
+import kotlinx.html.div
+import kotlinx.html.stream.createHTML
+import kotlinx.html.unsafe
+import org.jetbrains.kotlinx.jupyter.api.DisplayResult
+import org.jetbrains.kotlinx.jupyter.api.HTML
+import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
+import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
+import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.ast.rendering.FeaturedMathRendererWithPostProcess
+import space.kscience.kmath.ast.rendering.MathMLSyntaxRenderer
+import space.kscience.kmath.ast.rendering.renderWithStringBuilder
+import space.kscience.kmath.complex.Complex
+import space.kscience.kmath.nd.Structure2D
+import space.kscience.kmath.operations.GroupOperations
+import space.kscience.kmath.operations.RingOperations
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.asSequence
+
+@JupyterLibrary
+internal class KMathJupyter : JupyterIntegration() {
+    private val mathRender = FeaturedMathRendererWithPostProcess.Default
+    private val syntaxRender = MathMLSyntaxRenderer
+
+    override fun Builder.onLoaded() {
+        import(
+            "space.kscience.kmath.ast.*",
+            "space.kscience.kmath.ast.rendering.*",
+            "space.kscience.kmath.operations.*",
+            "space.kscience.kmath.expressions.*",
+            "space.kscience.kmath.misc.*",
+            "space.kscience.kmath.real.*",
+        )
+
+        fun MST.toDisplayResult(): DisplayResult = HTML(createHTML().div {
+            unsafe {
+                +syntaxRender.renderWithStringBuilder(mathRender.render(this@toDisplayResult))
+            }
+        })
+
+        render<MST> { it.toDisplayResult() }
+        render<Number> { MST.Numeric(it).toDisplayResult() }
+
+        fun Unsafe.appendCellValue(it: Any?) {
+            when (it) {
+                is Number -> {
+                    val s = StringBuilder()
+                    syntaxRender.renderPart(mathRender.render(MST.Numeric(it)), s)
+                    +s.toString()
+                }
+                is MST -> {
+                    val s = StringBuilder()
+                    syntaxRender.renderPart(mathRender.render(it), s)
+                    +s.toString()
+                }
+                else -> {
+                    +"<ms>"
+                    +it.toString()
+                    +"</ms>"
+                }
+            }
+        }
+
+        render<Structure2D<*>> { structure ->
+            HTML(createHTML().div {
+                unsafe {
+                    +"<math xmlns=\"https://www.w3.org/1998/Math/MathML\">"
+                    +"<mrow>"
+                    +"<mfenced open=\"[\" close=\"]\" separators=\"\">"
+                    +"<mtable>"
+                    structure.rows.forEach { row ->
+                        +"<mtr>"
+                        row.asSequence().forEach {
+                            +"<mtd>"
+                            appendCellValue(it)
+                            +"</mtd>"
+                        }
+                        +"</mtr>"
+                    }
+                    +"</mtable>"
+                    +"</mfenced>"
+                    +"</mrow>"
+                    +"</math>"
+                }
+            })
+        }
+
+        render<Buffer<*>> { buffer ->
+            HTML(createHTML().div {
+                unsafe {
+                    +"<math xmlns=\"https://www.w3.org/1998/Math/MathML\">"
+                    +"<mrow>"
+                    +"<mfenced open=\"[\" close=\"]\" separators=\"\">"
+                    +"<mtable>"
+                    buffer.asSequence().forEach {
+                        +"<mtr>"
+                        +"<mtd>"
+                        appendCellValue(it)
+                        +"</mtd>"
+                        +"</mtr>"
+                    }
+                    +"</mtable>"
+                    +"</mfenced>"
+                    +"</mrow>"
+                    +"</math>"
+                }
+            })
+        }
+
+        render<Complex> {
+            MST.Binary(
+                operation = GroupOperations.PLUS_OPERATION,
+                left = MST.Numeric(it.re),
+                right = MST.Binary(RingOperations.TIMES_OPERATION, MST.Numeric(it.im), MST.Symbolic("i")),
+            ).toDisplayResult()
+        }
+    }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ca36168e1..b7613d589 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,6 +17,9 @@ pluginManagement {
         id("ru.mipt.npm.gradle.project") version toolsVersion
         id("ru.mipt.npm.gradle.mpp") version toolsVersion
         id("ru.mipt.npm.gradle.jvm") version toolsVersion
+        kotlin("jupyter.api") version "0.9.0.12"
+        kotlin("jvm") version kotlinVersion
+        kotlin("plugin.allopen") version kotlinVersion
     }
 }
 
@@ -39,6 +42,7 @@ include(
     ":kmath-ast",
     ":kmath-ejml",
     ":kmath-kotlingrad",
+    ":kmath-jupyter",
     ":examples",
     ":benchmarks"
 )
-- 
2.34.1


From 86c2816cfde632cdb734d18d75e7245e3ae54f0c Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 30 Apr 2021 14:53:02 +0100
Subject: [PATCH 159/713] Fixed strides code duplication

---
 kmath-core/api/kmath-core.api                 |  4 ++--
 .../space/kscience/kmath/nd/StructureND.kt    |  6 +++---
 .../kmath/tensors/core/BufferedTensor.kt      |  4 ++--
 .../algebras/BroadcastDoubleTensorAlgebra.kt  | 16 +++++++-------
 .../core/algebras/TensorLinearStructure.kt    | 21 ++++++++++---------
 5 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 41b85b3bb..1b98f547c 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -789,7 +789,7 @@ public final class space/kscience/kmath/nd/DefaultStrides : space/kscience/kmath
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getLinearSize ()I
 	public fun getShape ()[I
-	public fun getStrides ()Ljava/util/List;
+	public fun getStrides ()[I
 	public fun hashCode ()I
 	public fun index (I)[I
 	public fun offset ([I)I
@@ -931,7 +931,7 @@ public final class space/kscience/kmath/nd/ShortRingNDKt {
 public abstract interface class space/kscience/kmath/nd/Strides {
 	public abstract fun getLinearSize ()I
 	public abstract fun getShape ()[I
-	public abstract fun getStrides ()Ljava/util/List;
+	public abstract fun getStrides ()[I
 	public abstract fun index (I)[I
 	public fun indices ()Lkotlin/sequences/Sequence;
 	public abstract fun offset ([I)I
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 0656b1f7f..65c233012 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -184,7 +184,7 @@ public interface Strides {
     /**
      * Array strides
      */
-    public val strides: List<Int>
+    public val strides: IntArray
 
     /**
      * Get linear index from multidimensional index
@@ -221,7 +221,7 @@ public class DefaultStrides private constructor(override val shape: IntArray) :
     /**
      * Strides for memory access
      */
-    override val strides: List<Int> by lazy {
+    override val strides: IntArray by lazy {
         sequence {
             var current = 1
             yield(1)
@@ -230,7 +230,7 @@ public class DefaultStrides private constructor(override val shape: IntArray) :
                 current *= it
                 yield(current)
             }
-        }.toList()
+        }.toList().toIntArray()
     }
 
     override fun offset(index: IntArray): Int = index.mapIndexed { i, value ->
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index fae59804d..21030bbc7 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -15,7 +15,7 @@ public open class BufferedTensor<T>(
         get() = TensorLinearStructure(shape)
 
     public val numElements: Int
-        get() = linearStructure.size
+        get() = linearStructure.linearSize
 
     override fun get(index: IntArray): T = mutableBuffer[bufferStart + linearStructure.offset(index)]
 
@@ -60,7 +60,7 @@ internal fun <T> TensorStructure<T>.copyToBufferedTensor(): BufferedTensor<T> =
 
 internal fun <T> TensorStructure<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
     is BufferedTensor<T> -> this
-    is MutableBufferND<T> -> if (this.strides.strides.toIntArray() contentEquals TensorLinearStructure(this.shape).strides)
+    is MutableBufferND<T> -> if (this.strides.strides contentEquals TensorLinearStructure(this.shape).strides)
         BufferedTensor(this.shape, this.mutableBuffer, 0) else this.copyToBufferedTensor()
     else -> this.copyToBufferedTensor()
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
index 350d939af..9b97d5ef2 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
@@ -20,7 +20,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
+        val resBuffer = DoubleArray(newThis.linearStructure.linearSize) { i ->
             newThis.mutableBuffer.array()[i] + newOther.mutableBuffer.array()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
@@ -28,7 +28,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun TensorStructure<Double>.plusAssign(other: TensorStructure<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
-        for (i in 0 until tensor.linearStructure.size) {
+        for (i in 0 until tensor.linearStructure.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
@@ -38,7 +38,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
+        val resBuffer = DoubleArray(newThis.linearStructure.linearSize) { i ->
             newThis.mutableBuffer.array()[i] - newOther.mutableBuffer.array()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
@@ -46,7 +46,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun TensorStructure<Double>.minusAssign(other: TensorStructure<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
-        for (i in 0 until tensor.linearStructure.size) {
+        for (i in 0 until tensor.linearStructure.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
@@ -56,7 +56,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
+        val resBuffer = DoubleArray(newThis.linearStructure.linearSize) { i ->
             newThis.mutableBuffer.array()[newThis.bufferStart + i] *
                     newOther.mutableBuffer.array()[newOther.bufferStart + i]
         }
@@ -65,7 +65,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun TensorStructure<Double>.timesAssign(other: TensorStructure<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
-        for (i in 0 until tensor.linearStructure.size) {
+        for (i in 0 until tensor.linearStructure.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
@@ -75,7 +75,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.linearStructure.size) { i ->
+        val resBuffer = DoubleArray(newThis.linearStructure.linearSize) { i ->
             newThis.mutableBuffer.array()[newOther.bufferStart + i] /
                     newOther.mutableBuffer.array()[newOther.bufferStart + i]
         }
@@ -84,7 +84,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun TensorStructure<Double>.divAssign(other: TensorStructure<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
-        for (i in 0 until tensor.linearStructure.size) {
+        for (i in 0 until tensor.linearStructure.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] /=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
index b16739892..8e83dafd6 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
@@ -5,16 +5,17 @@
 
 package space.kscience.kmath.tensors.core.algebras
 
+import space.kscience.kmath.nd.Strides
 import kotlin.math.max
 
 
-internal inline fun offsetFromIndex(index: IntArray, shape: IntArray, strides: IntArray): Int =
+internal fun offsetFromIndex(index: IntArray, shape: IntArray, strides: IntArray): Int =
     index.mapIndexed { i, value ->
         if (value < 0 || value >= shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0,${shape[i]})")
         value * strides[i]
     }.sum()
 
-internal inline fun stridesFromShape(shape: IntArray): IntArray {
+internal fun stridesFromShape(shape: IntArray): IntArray {
     val nDim = shape.size
     val res = IntArray(nDim)
     if (nDim == 0)
@@ -31,7 +32,7 @@ internal inline fun stridesFromShape(shape: IntArray): IntArray {
 
 }
 
-internal inline fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): IntArray {
+internal fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): IntArray {
     val res = IntArray(nDim)
     var current = offset
     var strideIndex = 0
@@ -44,7 +45,7 @@ internal inline fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int):
     return res
 }
 
-internal inline fun stepIndex(index: IntArray, shape: IntArray, nDim: Int): IntArray {
+internal fun stepIndex(index: IntArray, shape: IntArray, nDim: Int): IntArray {
     val res = index.copyOf()
     var current = nDim - 1
     var carry = 0
@@ -62,26 +63,26 @@ internal inline fun stepIndex(index: IntArray, shape: IntArray, nDim: Int): IntA
 }
 
 
-public class TensorLinearStructure(public val shape: IntArray)
+public class TensorLinearStructure(override val shape: IntArray) : Strides
 {
-    public val strides: IntArray
+    override val strides: IntArray
         get() = stridesFromShape(shape)
 
-    public fun offset(index: IntArray): Int = offsetFromIndex(index, shape, strides)
+    override fun offset(index: IntArray): Int = offsetFromIndex(index, shape, strides)
 
-    public fun index(offset: Int): IntArray =
+    override fun index(offset: Int): IntArray =
         indexFromOffset(offset, strides, shape.size)
 
     public fun stepIndex(index: IntArray): IntArray =
         stepIndex(index, shape, shape.size)
 
-    public val size: Int
+    override val linearSize: Int
         get() = shape.reduce(Int::times)
 
     public val dim: Int
         get() = shape.size
 
-    public fun indices(): Sequence<IntArray> = (0 until size).asSequence().map {
+    override fun indices(): Sequence<IntArray> = (0 until linearSize).asSequence().map {
         index(it)
     }
 }
\ No newline at end of file
-- 
2.34.1


From 42ddd2e5692156ac4263f28fa9848e62180f2b38 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 30 Apr 2021 15:08:32 +0100
Subject: [PATCH 160/713] MutableBufferFromGenerator

---
 kmath-core/api/kmath-core.api                  | 18 +++++++++---------
 .../space/kscience/kmath/nd/Structure1D.kt     |  4 ++--
 .../space/kscience/kmath/nd/Structure2D.kt     |  6 +++---
 .../space/kscience/kmath/structures/Buffer.kt  |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 1b98f547c..687de9cc8 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -1882,6 +1882,15 @@ public final class space/kscience/kmath/structures/MutableBuffer$Companion {
 	public final fun short-1yRgbGw (ILkotlin/jvm/functions/Function1;)[S
 }
 
+public final class space/kscience/kmath/structures/MutableBufferFromGenerator : space/kscience/kmath/structures/MutableBuffer {
+	public fun <init> (ILkotlin/jvm/functions/Function1;)V
+	public fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
+	public fun get (I)Ljava/lang/Object;
+	public fun getSize ()I
+	public fun iterator ()Ljava/util/Iterator;
+	public fun set (ILjava/lang/Object;)V
+}
+
 public final class space/kscience/kmath/structures/MutableListBuffer : space/kscience/kmath/structures/MutableBuffer {
 	public static final synthetic fun box-impl (Ljava/util/List;)Lspace/kscience/kmath/structures/MutableListBuffer;
 	public static fun constructor-impl (ILkotlin/jvm/functions/Function1;)Ljava/util/List;
@@ -1990,12 +1999,3 @@ public final class space/kscience/kmath/structures/VirtualBuffer : space/kscienc
 	public fun iterator ()Ljava/util/Iterator;
 }
 
-public final class space/kscience/kmath/structures/VirtualMutableBuffer : space/kscience/kmath/structures/MutableBuffer {
-	public fun <init> (ILkotlin/jvm/functions/Function1;)V
-	public fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
-	public fun get (I)Ljava/lang/Object;
-	public fun getSize ()I
-	public fun iterator ()Ljava/util/Iterator;
-	public fun set (ILjava/lang/Object;)V
-}
-
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index 93fc48713..8ea6d0f02 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -52,7 +52,7 @@ private value class Structure1DWrapper<T>(val structure: StructureND<T>) : Struc
 /**
  * A 1D wrapper for a mutable nd-structure
  */
-private inline class MutableStructure1DWrapper<T>(val structure: MutableStructureND<T>) : MutableStructure1D<T> {
+private class MutableStructure1DWrapper<T>(val structure: MutableStructureND<T>) : MutableStructure1D<T> {
     override val shape: IntArray get() = structure.shape
     override val size: Int get() = structure.shape[0]
     override fun elements(): Sequence<Pair<IntArray, T>> = structure.elements()
@@ -81,7 +81,7 @@ private value class Buffer1DWrapper<T>(val buffer: Buffer<T>) : Structure1D<T> {
     override operator fun get(index: Int): T = buffer[index]
 }
 
-internal inline class MutableBuffer1DWrapper<T>(val buffer: MutableBuffer<T>) : MutableStructure1D<T> {
+internal class MutableBuffer1DWrapper<T>(val buffer: MutableBuffer<T>) : MutableStructure1D<T> {
     override val shape: IntArray get() = intArrayOf(buffer.size)
     override val size: Int get() = buffer.size
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index 4c17d25d0..d987d8cf4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.nd
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.VirtualBuffer
-import space.kscience.kmath.structures.VirtualMutableBuffer
+import space.kscience.kmath.structures.MutableBufferFromGenerator
 import kotlin.jvm.JvmInline
 import kotlin.reflect.KClass
 
@@ -81,13 +81,13 @@ public interface MutableStructure2D<T> : Structure2D<T>, MutableStructureND<T> {
      * The buffer of rows of this structure. It gets elements from the structure dynamically.
      */
     override val rows: List<MutableStructure1D<T>>
-        get() = List(rowNum) { i -> MutableBuffer1DWrapper(VirtualMutableBuffer(colNum) { j -> get(i, j) })}
+        get() = List(rowNum) { i -> MutableBuffer1DWrapper(MutableBufferFromGenerator(colNum) { j -> get(i, j) })}
 
     /**
      * The buffer of columns of this structure. It gets elements from the structure dynamically.
      */
     override val columns: List<MutableStructure1D<T>>
-        get() = List(colNum) { j -> MutableBuffer1DWrapper(VirtualMutableBuffer(rowNum) { i -> get(i, j) }) }
+        get() = List(colNum) { j -> MutableBuffer1DWrapper(MutableBufferFromGenerator(rowNum) { i -> get(i, j) }) }
 }
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index 980fe698e..19018ffb5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -292,7 +292,7 @@ public class VirtualBuffer<T>(override val size: Int, private val generator: (In
     override operator fun iterator(): Iterator<T> = (0 until size).asSequence().map(generator).iterator()
 }
 
-public class VirtualMutableBuffer<T>(override val size: Int, private val generator: (Int) -> T) : MutableBuffer<T> {
+public class MutableBufferFromGenerator<T>(override val size: Int, private val generator: (Int) -> T) : MutableBuffer<T> {
 
     private val bufferHolder: MutableListBuffer<T> = (0 until size).map(generator).toMutableList().asMutableBuffer()
 
-- 
2.34.1


From 1695fc5075712c1c89121c0860c7c1e985737dbf Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 30 Apr 2021 15:25:45 +0100
Subject: [PATCH 161/713] Fix examples

---
 .../space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt | 3 ++-
 .../src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
index 38d8c1437..a84224bcf 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors
 
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
 
@@ -13,7 +14,7 @@ import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
 fun main () {
 
     // work in context with linear operations
-    DoubleLinearOpsTensorAlgebra {
+    DoubleLinearOpsTensorAlgebra.invoke {
 
         // set true value of x
         val trueX = fromArray(
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index 9318fe928..0408bba63 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors
 
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
 import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
@@ -18,7 +19,7 @@ fun main() {
     val randSeed = 100500L
 
     // work in context with linear operations
-    DoubleLinearOpsTensorAlgebra {
+    DoubleLinearOpsTensorAlgebra.invoke {
         // take coefficient vector from normal distribution
         val alpha = randNormal(
             intArrayOf(5),
-- 
2.34.1


From e2c7751c7eb146641cec0bba6e10e51e849e8371 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Fri, 30 Apr 2021 19:45:31 +0300
Subject: [PATCH 162/713] refactor linops

---
 .../algebras/DoubleLinearOpsTensorAlgebra.kt  | 51 +++++++++++--------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
index ab73b25b1..700fafbeb 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
@@ -53,14 +53,15 @@ public object DoubleLinearOpsTensorAlgebra :
         val lTensor = luTensor.zeroesLike()
         val uTensor = luTensor.zeroesLike()
 
-        for ((pairLU, lu) in lTensor.matrixSequence().zip(uTensor.matrixSequence())
-            .zip(luTensor.tensor.matrixSequence())) {
-            val (l, u) = pairLU
-            luPivotHelper(l.as2D(), u.as2D(), lu.as2D(), n)
-        }
+        lTensor.matrixSequence()
+            .zip(uTensor.matrixSequence())
+            .zip(luTensor.tensor.matrixSequence())
+            .forEach { (pairLU, lu) ->
+                val (l, u) = pairLU
+                luPivotHelper(l.as2D(), u.as2D(), lu.as2D(), n)
+            }
 
         return Triple(pTensor, lTensor, uTensor)
-
     }
 
     public fun TensorStructure<Double>.cholesky(epsilon: Double): DoubleTensor {
@@ -82,11 +83,13 @@ public object DoubleLinearOpsTensorAlgebra :
         checkSquareMatrix(shape)
         val qTensor = zeroesLike()
         val rTensor = zeroesLike()
-        val seq = tensor.matrixSequence().zip((qTensor.matrixSequence().zip(rTensor.matrixSequence())))
-        for ((matrix, qr) in seq) {
+        tensor.matrixSequence()
+            .zip((qTensor.matrixSequence()
+                .zip(rTensor.matrixSequence()))).forEach { (matrix, qr) ->
             val (q, r) = qr
             qrHelper(matrix.asTensor(), q.asTensor(), r.as2D())
         }
+
         return qTensor to rTensor
     }
 
@@ -97,20 +100,24 @@ public object DoubleLinearOpsTensorAlgebra :
         val size = tensor.linearStructure.dim
         val commonShape = tensor.shape.sliceArray(0 until size - 2)
         val (n, m) = tensor.shape.sliceArray(size - 2 until size)
-        val resU = zeros(commonShape + intArrayOf(min(n, m), n))
-        val resS = zeros(commonShape + intArrayOf(min(n, m)))
-        val resV = zeros(commonShape + intArrayOf(min(n, m), m))
+        val uTensor = zeros(commonShape + intArrayOf(min(n, m), n))
+        val sTensor = zeros(commonShape + intArrayOf(min(n, m)))
+        val vTensor = zeros(commonShape + intArrayOf(min(n, m), m))
 
-        for ((matrix, USV) in tensor.matrixSequence()
-            .zip(resU.matrixSequence().zip(resS.vectorSequence().zip(resV.matrixSequence())))) {
-            val matrixSize = matrix.shape.reduce { acc, i -> acc * i }
-            val curMatrix = DoubleTensor(
-                matrix.shape,
-                matrix.mutableBuffer.array().slice(matrix.bufferStart until matrix.bufferStart + matrixSize).toDoubleArray()
-            )
-            svdHelper(curMatrix, USV, m, n, epsilon)
-        }
-        return Triple(resU.transpose(), resS, resV.transpose())
+        tensor.matrixSequence()
+            .zip(uTensor.matrixSequence()
+                .zip(sTensor.vectorSequence()
+                    .zip(vTensor.matrixSequence()))).forEach { (matrix, USV) ->
+                val matrixSize = matrix.shape.reduce { acc, i -> acc * i }
+                val curMatrix = DoubleTensor(
+                    matrix.shape,
+                    matrix.mutableBuffer.array().slice(matrix.bufferStart until matrix.bufferStart + matrixSize)
+                        .toDoubleArray()
+                )
+                svdHelper(curMatrix, USV, m, n, epsilon)
+            }
+
+        return Triple(uTensor.transpose(), sTensor, vTensor.transpose())
     }
 
     override fun TensorStructure<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> =
@@ -127,7 +134,7 @@ public object DoubleLinearOpsTensorAlgebra :
             cleanSymHelper(matrix.as2D(), n)
 
         val eig = (utv dot s.view(shp)).view(s.shape)
-        return Pair(eig, v)
+        return eig to v
     }
 
     public fun TensorStructure<Double>.detLU(epsilon: Double = 1e-9): DoubleTensor {
-- 
2.34.1


From f0cdb9b6571774bd861288f059abaf0571c232bf Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Fri, 30 Apr 2021 20:07:59 +0300
Subject: [PATCH 163/713] refactor utils and remove inline

---
 .../kmath/tensors/core/broadcastUtils.kt      | 77 +++++++++----------
 .../kscience/kmath/tensors/core/checks.kt     | 18 ++---
 .../kscience/kmath/tensors/core/linUtils.kt   | 41 +++++-----
 .../kscience/kmath/tensors/core/utils.kt      | 45 ++++++-----
 .../core/TestDoubleLinearOpsAlgebra.kt        |  2 +-
 5 files changed, 94 insertions(+), 89 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
index 2d4d6f0f7..58d8654af 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
@@ -2,7 +2,7 @@ package space.kscience.kmath.tensors.core
 
 import kotlin.math.max
 
-internal inline fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: DoubleTensor, linearSize: Int) {
+internal fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: DoubleTensor, linearSize: Int) {
     for (linearIndex in 0 until linearSize) {
         val totalMultiIndex = resTensor.linearStructure.index(linearIndex)
         val curMultiIndex = tensor.shape.copyOf()
@@ -23,7 +23,7 @@ internal inline fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: Doub
     }
 }
 
-internal inline fun broadcastShapes(vararg shapes: IntArray): IntArray {
+internal fun broadcastShapes(vararg shapes: IntArray): IntArray {
     var totalDim = 0
     for (shape in shapes) {
         totalDim = max(totalDim, shape.size)
@@ -51,7 +51,7 @@ internal inline fun broadcastShapes(vararg shapes: IntArray): IntArray {
     return totalShape
 }
 
-internal inline fun broadcastTo(tensor: DoubleTensor, newShape: IntArray): DoubleTensor {
+internal fun broadcastTo(tensor: DoubleTensor, newShape: IntArray): DoubleTensor {
     if (tensor.shape.size > newShape.size) {
         throw RuntimeException("Tensor is not compatible with the new shape")
     }
@@ -71,7 +71,7 @@ internal inline fun broadcastTo(tensor: DoubleTensor, newShape: IntArray): Doubl
     return resTensor
 }
 
-internal inline fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleTensor> {
+internal fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleTensor> {
     val totalShape = broadcastShapes(*(tensors.map { it.shape }).toTypedArray())
     val n = totalShape.reduce { acc, i -> acc * i }
 
@@ -85,7 +85,7 @@ internal inline fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleT
     return res
 }
 
-internal inline fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTensor> {
+internal fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTensor> {
     val onlyTwoDims = tensors.asSequence().onEach {
         require(it.shape.size >= 2) {
             throw RuntimeException("Tensors must have at least 2 dimensions")
@@ -99,46 +99,45 @@ internal inline fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<Do
     val totalShape = broadcastShapes(*(tensors.map { it.shape.sliceArray(0..it.shape.size - 3) }).toTypedArray())
     val n = totalShape.reduce { acc, i -> acc * i }
 
-    val res = ArrayList<DoubleTensor>(0)
-    for (tensor in tensors) {
-        val matrixShape = tensor.shape.sliceArray(tensor.shape.size - 2 until tensor.shape.size).copyOf()
-        val matrixSize = matrixShape[0] * matrixShape[1]
-        val matrix = DoubleTensor(matrixShape, DoubleArray(matrixSize))
+    return buildList {
+        for (tensor in tensors) {
+            val matrixShape = tensor.shape.sliceArray(tensor.shape.size - 2 until tensor.shape.size).copyOf()
+            val matrixSize = matrixShape[0] * matrixShape[1]
+            val matrix = DoubleTensor(matrixShape, DoubleArray(matrixSize))
 
-        val outerTensor = DoubleTensor(totalShape, DoubleArray(n))
-        val resTensor = DoubleTensor(totalShape + matrixShape, DoubleArray(n * matrixSize))
+            val outerTensor = DoubleTensor(totalShape, DoubleArray(n))
+            val resTensor = DoubleTensor(totalShape + matrixShape, DoubleArray(n * matrixSize))
 
-        for (linearIndex in 0 until n) {
-            val totalMultiIndex = outerTensor.linearStructure.index(linearIndex)
-            var curMultiIndex = tensor.shape.sliceArray(0..tensor.shape.size - 3).copyOf()
-            curMultiIndex = IntArray(totalMultiIndex.size - curMultiIndex.size) { 1 } + curMultiIndex
+            for (linearIndex in 0 until n) {
+                val totalMultiIndex = outerTensor.linearStructure.index(linearIndex)
+                var curMultiIndex = tensor.shape.sliceArray(0..tensor.shape.size - 3).copyOf()
+                curMultiIndex = IntArray(totalMultiIndex.size - curMultiIndex.size) { 1 } + curMultiIndex
 
-            val newTensor = DoubleTensor(curMultiIndex + matrixShape, tensor.mutableBuffer.array())
+                val newTensor = DoubleTensor(curMultiIndex + matrixShape, tensor.mutableBuffer.array())
 
-            for (i in curMultiIndex.indices) {
-                if (curMultiIndex[i] != 1) {
-                    curMultiIndex[i] = totalMultiIndex[i]
-                } else {
-                    curMultiIndex[i] = 0
+                for (i in curMultiIndex.indices) {
+                    if (curMultiIndex[i] != 1) {
+                        curMultiIndex[i] = totalMultiIndex[i]
+                    } else {
+                        curMultiIndex[i] = 0
+                    }
+                }
+
+                for (i in 0 until matrixSize) {
+                    val curLinearIndex = newTensor.linearStructure.offset(
+                        curMultiIndex +
+                                matrix.linearStructure.index(i)
+                    )
+                    val newLinearIndex = resTensor.linearStructure.offset(
+                        totalMultiIndex +
+                                matrix.linearStructure.index(i)
+                    )
+
+                    resTensor.mutableBuffer.array()[resTensor.bufferStart + newLinearIndex] =
+                        newTensor.mutableBuffer.array()[newTensor.bufferStart + curLinearIndex]
                 }
             }
-
-            for (i in 0 until matrixSize) {
-                val curLinearIndex = newTensor.linearStructure.offset(
-                    curMultiIndex +
-                            matrix.linearStructure.index(i)
-                )
-                val newLinearIndex = resTensor.linearStructure.offset(
-                    totalMultiIndex +
-                            matrix.linearStructure.index(i)
-                )
-
-                resTensor.mutableBuffer.array()[resTensor.bufferStart + newLinearIndex] =
-                    newTensor.mutableBuffer.array()[newTensor.bufferStart + curLinearIndex]
-            }
+            add(resTensor)
         }
-        res += resTensor
     }
-
-    return res
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index fd5c8413d..fd98be8b2 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -5,38 +5,38 @@ import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
 import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 
 
-internal inline fun checkEmptyShape(shape: IntArray): Unit =
+internal fun checkEmptyShape(shape: IntArray): Unit =
     check(shape.isNotEmpty()) {
         "Illegal empty shape provided"
     }
 
-internal inline fun checkEmptyDoubleBuffer(buffer: DoubleArray): Unit =
+internal fun checkEmptyDoubleBuffer(buffer: DoubleArray): Unit =
     check(buffer.isNotEmpty()) {
         "Illegal empty buffer provided"
     }
 
-internal inline fun checkBufferShapeConsistency(shape: IntArray, buffer: DoubleArray): Unit =
+internal fun checkBufferShapeConsistency(shape: IntArray, buffer: DoubleArray): Unit =
     check(buffer.size == shape.reduce(Int::times)) {
         "Inconsistent shape ${shape.toList()} for buffer of size ${buffer.size} provided"
     }
 
 
-internal inline fun <T> checkShapesCompatible(a: TensorStructure<T>, b: TensorStructure<T>): Unit =
+internal fun <T> checkShapesCompatible(a: TensorStructure<T>, b: TensorStructure<T>): Unit =
     check(a.shape contentEquals b.shape) {
         "Incompatible shapes ${a.shape.toList()} and ${b.shape.toList()} "
     }
 
 
-internal inline fun checkTranspose(dim: Int, i: Int, j: Int): Unit =
+internal fun checkTranspose(dim: Int, i: Int, j: Int): Unit =
     check((i < dim) and (j < dim)) {
         "Cannot transpose $i to $j for a tensor of dim $dim"
     }
 
-internal inline fun <T> checkView(a: TensorStructure<T>, shape: IntArray): Unit =
+internal fun <T> checkView(a: TensorStructure<T>, shape: IntArray): Unit =
     check(a.shape.reduce(Int::times) == shape.reduce(Int::times))
 
 
-internal inline fun checkSquareMatrix(shape: IntArray): Unit {
+internal fun checkSquareMatrix(shape: IntArray): Unit {
     val n = shape.size
     check(n >= 2) {
         "Expected tensor with 2 or more dimensions, got size $n instead"
@@ -46,14 +46,14 @@ internal inline fun checkSquareMatrix(shape: IntArray): Unit {
     }
 }
 
-internal inline fun DoubleTensorAlgebra.checkSymmetric(
+internal fun DoubleTensorAlgebra.checkSymmetric(
     tensor: TensorStructure<Double>, epsilon: Double = 1e-6
 ): Unit =
     check(tensor.eq(tensor.transpose(), epsilon)) {
         "Tensor is not symmetric about the last 2 dimensions at precision $epsilon"
     }
 
-internal inline fun DoubleLinearOpsTensorAlgebra.checkPositiveDefinite(
+internal fun DoubleLinearOpsTensorAlgebra.checkPositiveDefinite(
     tensor: DoubleTensor, epsilon: Double = 1e-6
 ): Unit {
     checkSymmetric(tensor, epsilon)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
index 776a5e4d5..a152b3a17 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
@@ -13,7 +13,7 @@ import kotlin.math.sign
 import kotlin.math.sqrt
 
 
-internal inline fun <T> BufferedTensor<T>.vectorSequence(): Sequence<BufferedTensor<T>> = sequence {
+internal fun <T> BufferedTensor<T>.vectorSequence(): Sequence<BufferedTensor<T>> = sequence {
     val n = shape.size
     val vectorOffset = shape[n - 1]
     val vectorShape = intArrayOf(shape.last())
@@ -23,9 +23,9 @@ internal inline fun <T> BufferedTensor<T>.vectorSequence(): Sequence<BufferedTen
     }
 }
 
-internal inline fun <T> BufferedTensor<T>.matrixSequence(): Sequence<BufferedTensor<T>> = sequence {
-    check(shape.size >= 2) { "todo" }
+internal fun <T> BufferedTensor<T>.matrixSequence(): Sequence<BufferedTensor<T>> = sequence {
     val n = shape.size
+    check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
     val matrixOffset = shape[n - 1] * shape[n - 2]
     val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
     for (offset in 0 until numElements step matrixOffset) {
@@ -46,8 +46,7 @@ internal inline fun <T> BufferedTensor<T>.forEachMatrix(matrixAction: (BufferedT
     }
 }
 
-
-internal inline fun dotHelper(
+internal fun dotHelper(
     a: MutableStructure2D<Double>,
     b: MutableStructure2D<Double>,
     res: MutableStructure2D<Double>,
@@ -64,10 +63,11 @@ internal inline fun dotHelper(
     }
 }
 
-internal inline fun luHelper(
+internal fun luHelper(
     lu: MutableStructure2D<Double>,
     pivots: MutableStructure1D<Int>,
-    epsilon: Double): Boolean {
+    epsilon: Double
+): Boolean {
 
     val m = lu.rowNum
 
@@ -114,7 +114,7 @@ internal inline fun luHelper(
     return false
 }
 
-internal inline fun <T> BufferedTensor<T>.setUpPivots(): IntTensor {
+internal fun <T> BufferedTensor<T>.setUpPivots(): IntTensor {
     val n = this.shape.size
     val m = this.shape.last()
     val pivotsShape = IntArray(n - 1) { i -> this.shape[i] }
@@ -126,22 +126,23 @@ internal inline fun <T> BufferedTensor<T>.setUpPivots(): IntTensor {
     )
 }
 
-internal inline fun DoubleLinearOpsTensorAlgebra.computeLU(
+internal fun DoubleLinearOpsTensorAlgebra.computeLU(
     tensor: DoubleTensor,
-    epsilon: Double): Pair<DoubleTensor, IntTensor>? {
+    epsilon: Double
+): Pair<DoubleTensor, IntTensor>? {
 
     checkSquareMatrix(tensor.shape)
     val luTensor = tensor.copy()
     val pivotsTensor = tensor.setUpPivots()
 
     for ((lu, pivots) in luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()))
-        if(luHelper(lu.as2D(), pivots.as1D(), epsilon))
+        if (luHelper(lu.as2D(), pivots.as1D(), epsilon))
             return null
 
     return Pair(luTensor, pivotsTensor)
 }
 
-internal inline fun pivInit(
+internal fun pivInit(
     p: MutableStructure2D<Double>,
     pivot: MutableStructure1D<Int>,
     n: Int
@@ -151,7 +152,7 @@ internal inline fun pivInit(
     }
 }
 
-internal inline fun luPivotHelper(
+internal fun luPivotHelper(
     l: MutableStructure2D<Double>,
     u: MutableStructure2D<Double>,
     lu: MutableStructure2D<Double>,
@@ -172,7 +173,7 @@ internal inline fun luPivotHelper(
     }
 }
 
-internal inline fun choleskyHelper(
+internal fun choleskyHelper(
     a: MutableStructure2D<Double>,
     l: MutableStructure2D<Double>,
     n: Int
@@ -193,7 +194,7 @@ internal inline fun choleskyHelper(
     }
 }
 
-internal inline fun luMatrixDet(lu: MutableStructure2D<Double>, pivots: MutableStructure1D<Int>): Double {
+internal fun luMatrixDet(lu: MutableStructure2D<Double>, pivots: MutableStructure1D<Int>): Double {
     if (lu[0, 0] == 0.0) {
         return 0.0
     }
@@ -202,7 +203,7 @@ internal inline fun luMatrixDet(lu: MutableStructure2D<Double>, pivots: MutableS
     return (0 until m).asSequence().map { lu[it, it] }.fold(sign) { left, right -> left * right }
 }
 
-internal inline fun luMatrixInv(
+internal fun luMatrixInv(
     lu: MutableStructure2D<Double>,
     pivots: MutableStructure1D<Int>,
     invMatrix: MutableStructure2D<Double>
@@ -229,7 +230,7 @@ internal inline fun luMatrixInv(
     }
 }
 
-internal inline fun DoubleLinearOpsTensorAlgebra.qrHelper(
+internal fun DoubleLinearOpsTensorAlgebra.qrHelper(
     matrix: DoubleTensor,
     q: DoubleTensor,
     r: MutableStructure2D<Double>
@@ -259,7 +260,7 @@ internal inline fun DoubleLinearOpsTensorAlgebra.qrHelper(
     }
 }
 
-internal inline fun DoubleLinearOpsTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double = 1e-10): DoubleTensor {
+internal fun DoubleLinearOpsTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double = 1e-10): DoubleTensor {
     val (n, m) = a.shape
     var v: DoubleTensor
     val b: DoubleTensor
@@ -283,7 +284,7 @@ internal inline fun DoubleLinearOpsTensorAlgebra.svd1d(a: DoubleTensor, epsilon:
     }
 }
 
-internal inline fun DoubleLinearOpsTensorAlgebra.svdHelper(
+internal fun DoubleLinearOpsTensorAlgebra.svdHelper(
     matrix: DoubleTensor,
     USV: Pair<BufferedTensor<Double>, Pair<BufferedTensor<Double>, BufferedTensor<Double>>>,
     m: Int, n: Int, epsilon: Double
@@ -335,7 +336,7 @@ internal inline fun DoubleLinearOpsTensorAlgebra.svdHelper(
     }
 }
 
-internal inline fun cleanSymHelper(matrix: MutableStructure2D<Double>, n: Int) {
+internal fun cleanSymHelper(matrix: MutableStructure2D<Double>, n: Int) {
     for (i in 0 until n)
         for (j in 0 until n) {
             if (i == j) {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index cb23dbdd6..58d280307 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -23,19 +23,19 @@ internal fun Buffer<Double>.array(): DoubleArray = when (this) {
     else -> this.toDoubleArray()
 }
 
-internal inline fun getRandomNormals(n: Int, seed: Long): DoubleArray {
+internal fun getRandomNormals(n: Int, seed: Long): DoubleArray {
     val distribution = GaussianSampler(0.0, 1.0)
     val generator = RandomGenerator.default(seed)
     return distribution.sample(generator).nextBufferBlocking(n).toDoubleArray()
 }
 
-internal inline fun getRandomUnitVector(n: Int, seed: Long): DoubleArray {
+internal fun getRandomUnitVector(n: Int, seed: Long): DoubleArray {
     val unnorm = getRandomNormals(n, seed)
     val norm = sqrt(unnorm.map { it * it }.sum())
     return unnorm.map { it / norm }.toDoubleArray()
 }
 
-internal inline fun minusIndexFrom(n: Int, i: Int) : Int = if (i >= 0) i else {
+internal fun minusIndexFrom(n: Int, i: Int): Int = if (i >= 0) i else {
     val ii = n + i
     check(ii >= 0) {
         "Out of bound index $i for tensor of dim $n"
@@ -43,27 +43,28 @@ internal inline fun minusIndexFrom(n: Int, i: Int) : Int = if (i >= 0) i else {
     ii
 }
 
-internal inline fun <T> BufferedTensor<T>.minusIndex(i: Int): Int =  minusIndexFrom(this.dimension, i)
+internal fun <T> BufferedTensor<T>.minusIndex(i: Int): Int = minusIndexFrom(this.dimension, i)
 
-internal inline fun format(value: Double, digits: Int = 4): String {
+internal fun format(value: Double, digits: Int = 4): String {
     val ten = 10.0
-    val approxOrder = if(value == 0.0) 0 else ceil(log10(abs(value))).toInt()
-    val order = if(
+    val approxOrder = if (value == 0.0) 0 else ceil(log10(abs(value))).toInt()
+    val order = if (
         ((value % ten) == 0.0) or
         (value == 1.0) or
-        ((1/value) % ten == 0.0)) approxOrder else approxOrder - 1
+        ((1 / value) % ten == 0.0)
+    ) approxOrder else approxOrder - 1
     val lead = value / ten.pow(order)
-    val leadDisplay = round(lead*ten.pow(digits)) / ten.pow(digits)
-    val orderDisplay = if(order == 0) "" else if(order > 0) "E+$order" else "E$order"
+    val leadDisplay = round(lead * ten.pow(digits)) / ten.pow(digits)
+    val orderDisplay = if (order == 0) "" else if (order > 0) "E+$order" else "E$order"
     val valueDisplay = "$leadDisplay$orderDisplay"
-    val res = if(value < 0.0) valueDisplay else " $valueDisplay"
+    val res = if (value < 0.0) valueDisplay else " $valueDisplay"
 
     val fLength = digits + 6
     val endSpace = " ".repeat(fLength - res.length)
     return "$res$endSpace"
 }
 
-internal inline fun DoubleTensor.toPrettyString(): String = buildString {
+internal fun DoubleTensor.toPrettyString(): String = buildString {
     var offset = 0
     val shape = this@toPrettyString.shape
     val linearStructure = this@toPrettyString.linearStructure
@@ -72,32 +73,36 @@ internal inline fun DoubleTensor.toPrettyString(): String = buildString {
     append(initString)
     var charOffset = 3
     for (vector in vectorSequence()) {
-        append(" ".repeat(charOffset))
+        repeat(charOffset) { append(' ') }
         val index = linearStructure.index(offset)
         for (ind in index.reversed()) {
             if (ind != 0) {
                 break
             }
-            append("[")
+            append('[')
             charOffset += 1
         }
 
         val values = vector.as1D().toMutableList().map(::format)
 
-        append(values.joinToString(", "))
-        append("]")
+        values.joinTo(this, separator = ", ")
+
+        append(']')
         charOffset -= 1
-        for ((ind, maxInd) in index.reversed().zip(shape.reversed()).drop(1)){
+
+        index.reversed().zip(shape.reversed()).drop(1).forEach { (ind, maxInd) ->
             if (ind != maxInd - 1) {
-                break
+                return@forEach
             }
-            append("]")
-            charOffset -=1
+            append(']')
+            charOffset -= 1
         }
+
         offset += vectorSize
         if (this@toPrettyString.numElements == offset) {
             break
         }
+
         append(",\n")
     }
     append("\n)")
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 1148c0aad..2282d7fcb 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -182,7 +182,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 }
 
 
-private inline fun DoubleLinearOpsTensorAlgebra.testSVDFor(tensor: DoubleTensor, epsilon: Double = 1e-10): Unit {
+private fun DoubleLinearOpsTensorAlgebra.testSVDFor(tensor: DoubleTensor, epsilon: Double = 1e-10): Unit {
     val svd = tensor.svd()
 
     val tensorSVD = svd.first
-- 
2.34.1


From 8a039326d40fe4e840bed09170607c457a89e5a3 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 30 Apr 2021 19:47:05 +0100
Subject: [PATCH 164/713] Minor corrections

---
 kmath-core/api/kmath-core.api                       |  3 +--
 .../kotlin/space/kscience/kmath/nd/StructureND.kt   | 10 ++++------
 .../tensors/core/algebras/TensorLinearStructure.kt  |  5 -----
 .../kscience/kmath/tensors/core/broadcastUtils.kt   | 13 ++++++-------
 .../kmath/tensors/core/TestDoubleTensorAlgebra.kt   |  1 -
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 687de9cc8..261aa1e24 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -792,7 +792,6 @@ public final class space/kscience/kmath/nd/DefaultStrides : space/kscience/kmath
 	public fun getStrides ()[I
 	public fun hashCode ()I
 	public fun index (I)[I
-	public fun offset ([I)I
 }
 
 public final class space/kscience/kmath/nd/DefaultStrides$Companion {
@@ -934,7 +933,7 @@ public abstract interface class space/kscience/kmath/nd/Strides {
 	public abstract fun getStrides ()[I
 	public abstract fun index (I)[I
 	public fun indices ()Lkotlin/sequences/Sequence;
-	public abstract fun offset ([I)I
+	public fun offset ([I)I
 }
 
 public abstract interface class space/kscience/kmath/nd/Structure1D : space/kscience/kmath/nd/StructureND, space/kscience/kmath/structures/Buffer {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 65c233012..a3331d71a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -189,7 +189,10 @@ public interface Strides {
     /**
      * Get linear index from multidimensional index
      */
-    public fun offset(index: IntArray): Int
+    public fun offset(index: IntArray): Int = index.mapIndexed { i, value ->
+        if (value < 0 || value >= shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0,${this.shape[i]})")
+        value * strides[i]
+    }.sum()
 
     /**
      * Get multidimensional from linear
@@ -233,11 +236,6 @@ public class DefaultStrides private constructor(override val shape: IntArray) :
         }.toList().toIntArray()
     }
 
-    override fun offset(index: IntArray): Int = index.mapIndexed { i, value ->
-        if (value < 0 || value >= shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0,${this.shape[i]})")
-        value * strides[i]
-    }.sum()
-
     override fun index(offset: Int): IntArray {
         val res = IntArray(shape.size)
         var current = offset
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
index 8e83dafd6..08aab5175 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
@@ -68,8 +68,6 @@ public class TensorLinearStructure(override val shape: IntArray) : Strides
     override val strides: IntArray
         get() = stridesFromShape(shape)
 
-    override fun offset(index: IntArray): Int = offsetFromIndex(index, shape, strides)
-
     override fun index(offset: Int): IntArray =
         indexFromOffset(offset, strides, shape.size)
 
@@ -82,7 +80,4 @@ public class TensorLinearStructure(override val shape: IntArray) : Strides
     public val dim: Int
         get() = shape.size
 
-    override fun indices(): Sequence<IntArray> = (0 until linearSize).asSequence().map {
-        index(it)
-    }
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
index 58d8654af..e883b7861 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
@@ -75,14 +75,13 @@ internal fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleTensor>
     val totalShape = broadcastShapes(*(tensors.map { it.shape }).toTypedArray())
     val n = totalShape.reduce { acc, i -> acc * i }
 
-    val res = ArrayList<DoubleTensor>(0)
-    for (tensor in tensors) {
-        val resTensor = DoubleTensor(totalShape, DoubleArray(n))
-        multiIndexBroadCasting(tensor, resTensor, n)
-        res.add(resTensor)
+    return  buildList {
+        for (tensor in tensors) {
+            val resTensor = DoubleTensor(totalShape, DoubleArray(n))
+            multiIndexBroadCasting(tensor, resTensor, n)
+            add(resTensor)
+        }
     }
-
-    return res
 }
 
 internal fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTensor> {
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 34fe5d5f1..a0efa4573 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -170,7 +170,6 @@ internal class TestDoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor3 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 5.0))
-        val tensor4 = fromArray(intArrayOf(6, 1), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
 
         assertTrue(tensor1 eq tensor1)
         assertTrue(tensor1 eq tensor2)
-- 
2.34.1


From 74773686b432eac9e7d7804ffabf38eb1dbf1dca Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 30 Apr 2021 19:49:43 +0100
Subject: [PATCH 165/713] toDoubleTensor and toIntTensor renaming

---
 .../space/kscience/kmath/tensors/core/BufferedTensor.kt       | 4 ++--
 .../space/kscience/kmath/tensors/core/TestDoubleTensor.kt     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 21030bbc7..4e286b489 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -77,5 +77,5 @@ internal val TensorStructure<Int>.tensor: IntTensor
         else -> this.toBufferedTensor().asTensor()
     }
 
-public fun TensorStructure<Double>.toTypedTensor(): DoubleTensor = this.tensor
-public fun TensorStructure<Int>.toTypedTensor(): IntTensor = this.tensor
\ No newline at end of file
+public fun TensorStructure<Double>.toDoubleTensor(): DoubleTensor = this.tensor
+public fun TensorStructure<Int>.toIntTensor(): IntTensor = this.tensor
\ No newline at end of file
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index eca54f68b..333a7bdec 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -67,8 +67,8 @@ internal class TestDoubleTensor {
         val bufferedTensorArray = ndArray.toBufferedTensor() // strides are flipped so data copied
         val tensorArray = bufferedTensorArray.asTensor() // data not contiguous so copied again
 
-        val tensorArrayPublic = ndArray.toTypedTensor() // public API, data copied twice
-        val sharedTensorArray = tensorArrayPublic.toTypedTensor() // no data copied by matching type
+        val tensorArrayPublic = ndArray.toDoubleTensor() // public API, data copied twice
+        val sharedTensorArray = tensorArrayPublic.toDoubleTensor() // no data copied by matching type
 
         assertTrue(tensorArray.mutableBuffer.array() contentEquals sharedTensorArray.mutableBuffer.array())
 
-- 
2.34.1


From 1b6bd67b903f761bf009a0677e422f637dd775d4 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 30 Apr 2021 21:11:01 +0100
Subject: [PATCH 166/713] No virtual mutable buffers

---
 kmath-core/api/kmath-core.api                  |  9 ---------
 .../space/kscience/kmath/nd/Structure2D.kt     |  6 +++---
 .../space/kscience/kmath/structures/Buffer.kt  | 18 ------------------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 261aa1e24..865ad2f6d 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -1881,15 +1881,6 @@ public final class space/kscience/kmath/structures/MutableBuffer$Companion {
 	public final fun short-1yRgbGw (ILkotlin/jvm/functions/Function1;)[S
 }
 
-public final class space/kscience/kmath/structures/MutableBufferFromGenerator : space/kscience/kmath/structures/MutableBuffer {
-	public fun <init> (ILkotlin/jvm/functions/Function1;)V
-	public fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
-	public fun get (I)Ljava/lang/Object;
-	public fun getSize ()I
-	public fun iterator ()Ljava/util/Iterator;
-	public fun set (ILjava/lang/Object;)V
-}
-
 public final class space/kscience/kmath/structures/MutableListBuffer : space/kscience/kmath/structures/MutableBuffer {
 	public static final synthetic fun box-impl (Ljava/util/List;)Lspace/kscience/kmath/structures/MutableListBuffer;
 	public static fun constructor-impl (ILkotlin/jvm/functions/Function1;)Ljava/util/List;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index d987d8cf4..28ae07a3c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.nd
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.VirtualBuffer
-import space.kscience.kmath.structures.MutableBufferFromGenerator
+import space.kscience.kmath.structures.MutableListBuffer
 import kotlin.jvm.JvmInline
 import kotlin.reflect.KClass
 
@@ -81,13 +81,13 @@ public interface MutableStructure2D<T> : Structure2D<T>, MutableStructureND<T> {
      * The buffer of rows of this structure. It gets elements from the structure dynamically.
      */
     override val rows: List<MutableStructure1D<T>>
-        get() = List(rowNum) { i -> MutableBuffer1DWrapper(MutableBufferFromGenerator(colNum) { j -> get(i, j) })}
+        get() = List(rowNum) { i -> MutableBuffer1DWrapper(MutableListBuffer(colNum) { j -> get(i, j) })}
 
     /**
      * The buffer of columns of this structure. It gets elements from the structure dynamically.
      */
     override val columns: List<MutableStructure1D<T>>
-        get() = List(colNum) { j -> MutableBuffer1DWrapper(MutableBufferFromGenerator(rowNum) { i -> get(i, j) }) }
+        get() = List(colNum) { j -> MutableBuffer1DWrapper(MutableListBuffer(rowNum) { i -> get(i, j) }) }
 }
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index 19018ffb5..be5dfb359 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -292,24 +292,6 @@ public class VirtualBuffer<T>(override val size: Int, private val generator: (In
     override operator fun iterator(): Iterator<T> = (0 until size).asSequence().map(generator).iterator()
 }
 
-public class MutableBufferFromGenerator<T>(override val size: Int, private val generator: (Int) -> T) : MutableBuffer<T> {
-
-    private val bufferHolder: MutableListBuffer<T> = (0 until size).map(generator).toMutableList().asMutableBuffer()
-
-    override operator fun get(index: Int): T {
-        if (index < 0 || index >= size) throw IndexOutOfBoundsException("Expected index from 0 to ${size - 1}, but found $index")
-        return bufferHolder[index]
-    }
-
-    override operator fun iterator(): Iterator<T> = bufferHolder.iterator()
-
-    override fun set(index: Int, value: T) {
-        bufferHolder[index] = value
-    }
-
-    override fun copy(): MutableBuffer<T> = bufferHolder.copy()
-}
-
 /**
  * Convert this buffer to read-only buffer.
  */
-- 
2.34.1


From b7cac3a015d235d81d02d3bb4b8834dda2b48b95 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Sat, 1 May 2021 13:32:50 +0300
Subject: [PATCH 167/713] fix sequences + array casting

---
 .../kmath/tensors/core/BufferedTensor.kt      | 38 ++++++++++++++++++-
 .../kscience/kmath/tensors/core/linUtils.kt   |  4 +-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 4e286b489..867b4fb7a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -49,6 +49,7 @@ public class DoubleTensor internal constructor(
 
 internal fun BufferedTensor<Int>.asTensor(): IntTensor =
     IntTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
+
 internal fun BufferedTensor<Double>.asTensor(): DoubleTensor =
     DoubleTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
 
@@ -78,4 +79,39 @@ internal val TensorStructure<Int>.tensor: IntTensor
     }
 
 public fun TensorStructure<Double>.toDoubleTensor(): DoubleTensor = this.tensor
-public fun TensorStructure<Int>.toIntTensor(): IntTensor = this.tensor
\ No newline at end of file
+public fun TensorStructure<Int>.toIntTensor(): IntTensor = this.tensor
+
+public fun Array<DoubleArray>.toDoubleTensor(): DoubleTensor {
+    val n = size
+    check(n > 0) { "An empty array cannot be casted to tensor" }
+    val m = first().size
+    check(m > 0) { "Inner arrays must have at least 1 argument" }
+    check(all { size == m }) { "Inner arrays must be the same size" }
+
+    val shape = intArrayOf(n, m)
+    val buffer = this.flatMap { arr -> arr.map { it } }.toDoubleArray()
+
+    return DoubleTensor(shape, buffer, 0)
+}
+
+
+public fun Array<IntArray>.toIntTensor(): IntTensor {
+    val n = size
+    check(n > 0) { "An empty array cannot be casted to tensor" }
+    val m = first().size
+    check(m > 0) { "Inner arrays must have at least 1 argument" }
+    check(all { size == m }) { "Inner arrays must be the same size" }
+
+    val shape = intArrayOf(n, m)
+    val buffer = this.flatMap { arr -> arr.map { it } }.toIntArray()
+
+    return IntTensor(shape, buffer, 0)
+}
+
+public fun DoubleTensor.toDoubleArray(): DoubleArray {
+    return tensor.mutableBuffer.array().drop(bufferStart).take(numElements).toDoubleArray()
+}
+
+public fun IntTensor.toIntArray(): IntArray {
+    return tensor.mutableBuffer.array().drop(bufferStart).take(numElements).toIntArray()
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
index a152b3a17..e54cc4d26 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
@@ -18,7 +18,7 @@ internal fun <T> BufferedTensor<T>.vectorSequence(): Sequence<BufferedTensor<T>>
     val vectorOffset = shape[n - 1]
     val vectorShape = intArrayOf(shape.last())
     for (offset in 0 until numElements step vectorOffset) {
-        val vector = BufferedTensor(vectorShape, mutableBuffer, offset)
+        val vector = BufferedTensor(vectorShape, mutableBuffer, bufferStart + offset)
         yield(vector)
     }
 }
@@ -29,7 +29,7 @@ internal fun <T> BufferedTensor<T>.matrixSequence(): Sequence<BufferedTensor<T>>
     val matrixOffset = shape[n - 1] * shape[n - 2]
     val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
     for (offset in 0 until numElements step matrixOffset) {
-        val matrix = BufferedTensor(matrixShape, mutableBuffer, offset)
+        val matrix = BufferedTensor(matrixShape, mutableBuffer, bufferStart + offset)
         yield(matrix)
     }
 }
-- 
2.34.1


From fe81dea243860ad063d5490d13225182ddbfaedc Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Sat, 1 May 2021 14:22:05 +0300
Subject: [PATCH 168/713] stack

---
 .../core/algebras/DoubleTensorAlgebra.kt      | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index f428b9d2e..c6fb301b5 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -382,7 +382,11 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
             return false
         }
         for (i in 0 until n) {
-            if (!eqFunction(tensor.mutableBuffer[tensor.bufferStart + i], other.tensor.mutableBuffer[other.tensor.bufferStart + i])) {
+            if (!eqFunction(
+                    tensor.mutableBuffer[tensor.bufferStart + i],
+                    other.tensor.mutableBuffer[other.tensor.bufferStart + i]
+                )
+            ) {
                 return false
             }
         }
@@ -395,4 +399,20 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     public fun TensorStructure<Double>.randNormalLike(seed: Long = 0): DoubleTensor =
         DoubleTensor(tensor.shape, getRandomNormals(tensor.shape.reduce(Int::times), seed))
 
+    // stack tensors by axis 0
+    public fun stack(tensors: List<DoubleTensor>): DoubleTensor {
+        val shape = tensors.firstOrNull()?.shape
+        check(shape != null) { "Collection must have at least 1 element" }
+        check(tensors.all { it.shape contentEquals shape }) {"Stacking tensors must have same shapes"}
+        val resShape = intArrayOf(tensors.size) + shape
+        val resBuffer = tensors.flatMap {
+            it.tensor.mutableBuffer.array().drop(it.bufferStart).take(it.numElements)
+        }.toDoubleArray()
+        return DoubleTensor(resShape, resBuffer, 0)
+    }
+
+    // build tensor from this rows by given indices
+    public fun TensorStructure<Double>.rowsByIndices(indices: IntArray): DoubleTensor {
+        return stack(indices.map { this[it] })
+    }
 }
-- 
2.34.1


From 83c7ec8c6b7cf52cd7a890a4e1551140327ec6dd Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sat, 1 May 2021 00:13:32 +0700
Subject: [PATCH 169/713] Deprecate AlgebraElements.kt

---
 kmath-core/api/kmath-core.api                    |  7 -------
 .../kscience/kmath/operations/AlgebraElements.kt | 14 +++++++++++++-
 .../kmath/operations/OptionalOperations.kt       | 16 ++++++++++++++++
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 6b300123c..a73e4ed54 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -991,14 +991,7 @@ public abstract interface class space/kscience/kmath/operations/Algebra {
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
 }
 
-public abstract interface class space/kscience/kmath/operations/AlgebraElement {
-	public abstract fun getContext ()Lspace/kscience/kmath/operations/Algebra;
-}
-
 public final class space/kscience/kmath/operations/AlgebraElementsKt {
-	public static final fun div (Lspace/kscience/kmath/operations/AlgebraElement;Lspace/kscience/kmath/operations/AlgebraElement;)Lspace/kscience/kmath/operations/AlgebraElement;
-	public static final fun plus (Lspace/kscience/kmath/operations/AlgebraElement;Lspace/kscience/kmath/operations/AlgebraElement;)Lspace/kscience/kmath/operations/AlgebraElement;
-	public static final fun times (Lspace/kscience/kmath/operations/AlgebraElement;Lspace/kscience/kmath/operations/AlgebraElement;)Lspace/kscience/kmath/operations/AlgebraElement;
 }
 
 public final class space/kscience/kmath/operations/AlgebraExtensionsKt {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
index d7c87f213..cc058d3fc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
@@ -13,6 +13,8 @@ import space.kscience.kmath.misc.UnstableKMathAPI
  * @param C the type of mathematical context for this element.
  * @param T the type wrapped by this wrapper.
  */
+@UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public interface AlgebraElement<T, C : Algebra<T>> {
     /**
      * The context this element belongs to.
@@ -45,6 +47,7 @@ public interface AlgebraElement<T, C : Algebra<T>> {
  * @return the difference.
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public operator fun <T : AlgebraElement<T, S>, S : NumbersAddOperations<T>> T.minus(b: T): T =
     context.add(this, context.run { -b })
 
@@ -55,6 +58,8 @@ public operator fun <T : AlgebraElement<T, S>, S : NumbersAddOperations<T>> T.mi
  * @param b the addend.
  * @return the sum.
  */
+@UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public operator fun <T : AlgebraElement<T, S>, S : Ring<T>> T.plus(b: T): T =
     context.add(this, b)
 
@@ -71,6 +76,8 @@ public operator fun <T : AlgebraElement<T, S>, S : Ring<T>> T.plus(b: T): T =
  * @param b the multiplier.
  * @return the product.
  */
+@UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public operator fun <T : AlgebraElement<T, R>, R : Ring<T>> T.times(b: T): T =
     context.multiply(this, b)
 
@@ -81,6 +88,8 @@ public operator fun <T : AlgebraElement<T, R>, R : Ring<T>> T.times(b: T): T =
  * @param b the divisor.
  * @return the quotient.
  */
+@UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public operator fun <T : AlgebraElement<T, F>, F : Field<T>> T.div(b: T): T =
     context.divide(this, b)
 
@@ -93,6 +102,7 @@ public operator fun <T : AlgebraElement<T, F>, F : Field<T>> T.div(b: T): T =
  * @param S the type of space.
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public interface GroupElement<T : GroupElement<T, S>, S : Group<T>> : AlgebraElement<T, S>
 
 /**
@@ -103,6 +113,7 @@ public interface GroupElement<T : GroupElement<T, S>, S : Group<T>> : AlgebraEle
  * @param R the type of ring.
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public interface RingElement<T : RingElement<T, R>, R : Ring<T>> : GroupElement<T, R>
 
 /**
@@ -113,4 +124,5 @@ public interface RingElement<T : RingElement<T, R>, R : Ring<T>> : GroupElement<
  * @param F the type of field.
  */
 @UnstableKMathAPI
-public interface FieldElement<T : FieldElement<T, F>, F : Field<T>> : RingElement<T, F>
\ No newline at end of file
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
+public interface FieldElement<T : FieldElement<T, F>, F : Field<T>> : RingElement<T, F>
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
index 8e3e6c777..979e65396 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
@@ -80,36 +80,42 @@ public interface TrigonometricOperations<T> : Algebra<T> {
  * Computes the sine of [arg].
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out TrigonometricOperations<T>>> sin(arg: T): T = arg.context.sin(arg)
 
 /**
  * Computes the cosine of [arg].
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out TrigonometricOperations<T>>> cos(arg: T): T = arg.context.cos(arg)
 
 /**
  * Computes the tangent of [arg].
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out TrigonometricOperations<T>>> tan(arg: T): T = arg.context.tan(arg)
 
 /**
  * Computes the inverse sine of [arg].
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out TrigonometricOperations<T>>> asin(arg: T): T = arg.context.asin(arg)
 
 /**
  * Computes the inverse cosine of [arg].
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out TrigonometricOperations<T>>> acos(arg: T): T = arg.context.acos(arg)
 
 /**
  * Computes the inverse tangent of [arg].
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out TrigonometricOperations<T>>> atan(arg: T): T = arg.context.atan(arg)
 
 /**
@@ -154,18 +160,21 @@ public interface PowerOperations<T> : Algebra<T> {
  * @return the base raised to the power.
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public infix fun <T : AlgebraElement<T, out PowerOperations<T>>> T.pow(power: Double): T = context.power(this, power)
 
 /**
  * Computes the square root of the value [arg].
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out PowerOperations<T>>> sqrt(arg: T): T = arg pow 0.5
 
 /**
  * Computes the square of the value [arg].
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out PowerOperations<T>>> sqr(arg: T): T = arg pow 2.0
 
 /**
@@ -261,12 +270,14 @@ public interface ExponentialOperations<T> : Algebra<T> {
  * The identifier of exponential function.
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> exp(arg: T): T = arg.context.exp(arg)
 
 /**
  * The identifier of natural logarithm.
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> ln(arg: T): T = arg.context.ln(arg)
 
 
@@ -280,30 +291,35 @@ public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> sinh(arg: T): T
  * Computes the hyperbolic cosine of [arg].
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> cosh(arg: T): T = arg.context.cosh(arg)
 
 /**
  * Computes the hyperbolic tangent of [arg].
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> tanh(arg: T): T = arg.context.tanh(arg)
 
 /**
  * Computes the inverse hyperbolic sine of [arg].
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> asinh(arg: T): T = arg.context.asinh(arg)
 
 /**
  * Computes the inverse hyperbolic cosine of [arg].
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> acosh(arg: T): T = arg.context.acosh(arg)
 
 /**
  * Computes the inverse hyperbolic tangent of [arg].
  */
 @UnstableKMathAPI
+@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
 public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> atanh(arg: T): T = arg.context.atanh(arg)
 
 /**
-- 
2.34.1


From bfba653904793b74be89ea9f46461ad8c20a2b8e Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Sat, 1 May 2021 17:47:12 +0300
Subject: [PATCH 170/713] refactor

---
 .../kscience/kmath/tensors/OLSWithSVD.kt      |  6 ++---
 .../algebras/DoubleLinearOpsTensorAlgebra.kt  |  8 ++++---
 .../core/algebras/DoubleTensorAlgebra.kt      | 18 +++++++-------
 .../kmath/tensors/core/broadcastUtils.kt      | 24 +++++++++----------
 .../kscience/kmath/tensors/core/utils.kt      |  3 +--
 .../core/TestDoubleLinearOpsAlgebra.kt        |  6 ++---
 6 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index 0408bba63..095905f05 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -21,7 +21,7 @@ fun main() {
     // work in context with linear operations
     DoubleLinearOpsTensorAlgebra.invoke {
         // take coefficient vector from normal distribution
-        val alpha = randNormal(
+        val alpha = randomNormal(
             intArrayOf(5),
             randSeed
         ) + fromArray(
@@ -32,14 +32,14 @@ fun main() {
         println("Real alpha:\n$alpha")
 
         // also take sample of size 20 from normal distribution for x
-        val x = randNormal(
+        val x = randomNormal(
             intArrayOf(20, 5),
             randSeed
         )
 
         // calculate y and add gaussian noise (N(0, 0.05))
         val y = x dot alpha
-        y += y.randNormalLike(randSeed) * 0.05
+        y += y.randomNormalLike(randSeed) * 0.05
 
         // now restore the coefficient vector with OSL estimator with SVD
         val (u, singValues, v) = x.svd()
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
index 700fafbeb..dd5ad5a61 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
@@ -31,7 +31,7 @@ public object DoubleLinearOpsTensorAlgebra :
 
     public fun TensorStructure<Double>.luFactor(epsilon: Double): Pair<DoubleTensor, IntTensor> =
         computeLU(tensor, epsilon)
-            ?: throw RuntimeException("Tensor contains matrices which are singular at precision $epsilon")
+            ?: throw IllegalArgumentException("Tensor contains matrices which are singular at precision $epsilon")
 
     public fun TensorStructure<Double>.luFactor(): Pair<DoubleTensor, IntTensor> = luFactor(1e-9)
 
@@ -47,8 +47,10 @@ public object DoubleLinearOpsTensorAlgebra :
 
         val n = luTensor.shape.last()
         val pTensor = luTensor.zeroesLike()
-        for ((p, pivot) in pTensor.matrixSequence().zip(pivotsTensor.tensor.vectorSequence()))
-            pivInit(p.as2D(), pivot.as1D(), n)
+        pTensor
+            .matrixSequence()
+            .zip(pivotsTensor.tensor.vectorSequence())
+            .forEach { (p, pivot) -> pivInit(p.as2D(), pivot.as1D(), n) }
 
         val lTensor = luTensor.zeroesLike()
         val uTensor = luTensor.zeroesLike()
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index c6fb301b5..d3e8bf175 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -284,7 +284,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         val m1 = newThis.shape[newThis.shape.size - 1]
         val m2 = newOther.shape[newOther.shape.size - 2]
         val n = newOther.shape[newOther.shape.size - 1]
-        if (m1 != m2) {
+        check (m1 == m2) {
             throw RuntimeException("Tensors dot operation dimension mismatch: ($l, $m1) x ($m2, $n)")
         }
 
@@ -315,11 +315,11 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         val d1 = minusIndexFrom(n + 1, dim1)
         val d2 = minusIndexFrom(n + 1, dim2)
 
-        if (d1 == d2) {
-            throw RuntimeException("Diagonal dimensions cannot be identical $d1, $d2")
+        check(d1 != d2) {
+            "Diagonal dimensions cannot be identical $d1, $d2"
         }
-        if (d1 > n || d2 > n) {
-            throw RuntimeException("Dimension out of range")
+        check(d1 <= n && d2 <= n) {
+            "Dimension out of range"
         }
 
         var lessDim = d1
@@ -366,8 +366,8 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         )
     }
 
-    public fun TensorStructure<Double>.eq(other: TensorStructure<Double>, delta: Double): Boolean {
-        return tensor.eq(other) { x, y -> abs(x - y) < delta }
+    public fun TensorStructure<Double>.eq(other: TensorStructure<Double>, epsilon: Double): Boolean {
+        return tensor.eq(other) { x, y -> abs(x - y) < epsilon }
     }
 
     public infix fun TensorStructure<Double>.eq(other: TensorStructure<Double>): Boolean = tensor.eq(other, 1e-5)
@@ -393,10 +393,10 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return true
     }
 
-    public fun randNormal(shape: IntArray, seed: Long = 0): DoubleTensor =
+    public fun randomNormal(shape: IntArray, seed: Long = 0): DoubleTensor =
         DoubleTensor(shape, getRandomNormals(shape.reduce(Int::times), seed))
 
-    public fun TensorStructure<Double>.randNormalLike(seed: Long = 0): DoubleTensor =
+    public fun TensorStructure<Double>.randomNormalLike(seed: Long = 0): DoubleTensor =
         DoubleTensor(tensor.shape, getRandomNormals(tensor.shape.reduce(Int::times), seed))
 
     // stack tensors by axis 0
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
index e883b7861..dfac054b5 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
@@ -42,8 +42,8 @@ internal fun broadcastShapes(vararg shapes: IntArray): IntArray {
         for (i in shape.indices) {
             val curDim = shape[i]
             val offset = totalDim - shape.size
-            if (curDim != 1 && totalShape[i + offset] != curDim) {
-                throw RuntimeException("Shapes are not compatible and cannot be broadcast")
+            check(curDim == 1 || totalShape[i + offset] == curDim) {
+                "Shapes are not compatible and cannot be broadcast"
             }
         }
     }
@@ -52,8 +52,8 @@ internal fun broadcastShapes(vararg shapes: IntArray): IntArray {
 }
 
 internal fun broadcastTo(tensor: DoubleTensor, newShape: IntArray): DoubleTensor {
-    if (tensor.shape.size > newShape.size) {
-        throw RuntimeException("Tensor is not compatible with the new shape")
+    require(tensor.shape.size <= newShape.size) {
+        "Tensor is not compatible with the new shape"
     }
 
     val n = newShape.reduce { acc, i -> acc * i }
@@ -62,8 +62,8 @@ internal fun broadcastTo(tensor: DoubleTensor, newShape: IntArray): DoubleTensor
     for (i in tensor.shape.indices) {
         val curDim = tensor.shape[i]
         val offset = newShape.size - tensor.shape.size
-        if (curDim != 1 && newShape[i + offset] != curDim) {
-            throw RuntimeException("Tensor is not compatible with the new shape and cannot be broadcast")
+        check(curDim == 1 || newShape[i + offset] == curDim) {
+            "Tensor is not compatible with the new shape and cannot be broadcast"
         }
     }
 
@@ -75,19 +75,17 @@ internal fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleTensor>
     val totalShape = broadcastShapes(*(tensors.map { it.shape }).toTypedArray())
     val n = totalShape.reduce { acc, i -> acc * i }
 
-    return  buildList {
-        for (tensor in tensors) {
-            val resTensor = DoubleTensor(totalShape, DoubleArray(n))
-            multiIndexBroadCasting(tensor, resTensor, n)
-            add(resTensor)
-        }
+    return tensors.map { tensor ->
+        val resTensor = DoubleTensor(totalShape, DoubleArray(n))
+        multiIndexBroadCasting(tensor, resTensor, n)
+        resTensor
     }
 }
 
 internal fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTensor> {
     val onlyTwoDims = tensors.asSequence().onEach {
         require(it.shape.size >= 2) {
-            throw RuntimeException("Tensors must have at least 2 dimensions")
+            "Tensors must have at least 2 dimensions"
         }
     }.any { it.shape.size != 2 }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index 58d280307..88b9c6c5c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -69,8 +69,7 @@ internal fun DoubleTensor.toPrettyString(): String = buildString {
     val shape = this@toPrettyString.shape
     val linearStructure = this@toPrettyString.linearStructure
     val vectorSize = shape.last()
-    val initString = "DoubleTensor(\n"
-    append(initString)
+    append("DoubleTensor(\n")
     var charOffset = 3
     for (vector in vectorSequence()) {
         repeat(charOffset) { append(' ') }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 2282d7fcb..6689e893a 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -135,7 +135,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testCholesky() = DoubleLinearOpsTensorAlgebra.invoke {
-        val tensor = randNormal(intArrayOf(2, 5, 5), 0)
+        val tensor = randomNormal(intArrayOf(2, 5, 5), 0)
         val sigma = (tensor dot tensor.transpose()) + diagonalEmbedding(
             fromArray(intArrayOf(2, 5), DoubleArray(10) { 0.1 })
         )
@@ -163,7 +163,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testBatchedSVD() = DoubleLinearOpsTensorAlgebra.invoke {
-        val tensor = randNormal(intArrayOf(2, 5, 3), 0)
+        val tensor = randomNormal(intArrayOf(2, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
         val tensorSVD = tensorU dot (diagonalEmbedding(tensorS) dot tensorV.transpose())
         assertTrue(tensor.eq(tensorSVD))
@@ -171,7 +171,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testBatchedSymEig() = DoubleLinearOpsTensorAlgebra.invoke {
-        val tensor = randNormal(shape = intArrayOf(2, 3, 3), 0)
+        val tensor = randomNormal(shape = intArrayOf(2, 3, 3), 0)
         val tensorSigma = tensor + tensor.transpose()
         val (tensorS, tensorV) = tensorSigma.symEig()
         val tensorSigmaCalc = tensorV dot (diagonalEmbedding(tensorS) dot tensorV.transpose())
-- 
2.34.1


From ac6608b5b45ed7b59667216ec62b73380f60ef97 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Sat, 1 May 2021 20:45:23 +0300
Subject: [PATCH 171/713] refactor

---
 .../tensors/LinearSystemSolvingWithLUP.kt     |  2 +-
 .../kscience/kmath/tensors/OLSWithSVD.kt      |  2 +-
 kmath-tensors/build.gradle.kts                |  3 ++
 .../kmath/tensors/core/BufferedTensor.kt      |  8 +++-
 .../kscience/kmath/tensors/core/checks.kt     | 23 ++++------
 .../kscience/kmath/tensors/core/linUtils.kt   | 12 -----
 .../kscience/kmath/tensors/core/utils.kt      | 45 +++++++++++--------
 7 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
index a84224bcf..bd8233ccc 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
@@ -14,7 +14,7 @@ import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
 fun main () {
 
     // work in context with linear operations
-    DoubleLinearOpsTensorAlgebra.invoke {
+    DoubleLinearOpsTensorAlgebra {
 
         // set true value of x
         val trueX = fromArray(
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index 095905f05..435af35f6 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -19,7 +19,7 @@ fun main() {
     val randSeed = 100500L
 
     // work in context with linear operations
-    DoubleLinearOpsTensorAlgebra.invoke {
+    DoubleLinearOpsTensorAlgebra {
         // take coefficient vector from normal distribution
         val alpha = randomNormal(
             intArrayOf(5),
diff --git a/kmath-tensors/build.gradle.kts b/kmath-tensors/build.gradle.kts
index af5116022..b7f24dc6a 100644
--- a/kmath-tensors/build.gradle.kts
+++ b/kmath-tensors/build.gradle.kts
@@ -3,6 +3,9 @@ plugins {
 }
 
 kotlin.sourceSets {
+    all {
+        languageSettings.useExperimentalAnnotation("space.kscience.kmath.misc.UnstableKMathAPI")
+    }
     commonMain {
         dependencies {
             api(project(":kmath-core"))
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 867b4fb7a..9541a97f9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -109,9 +109,13 @@ public fun Array<IntArray>.toIntTensor(): IntTensor {
 }
 
 public fun DoubleTensor.toDoubleArray(): DoubleArray {
-    return tensor.mutableBuffer.array().drop(bufferStart).take(numElements).toDoubleArray()
+    return DoubleArray(numElements) { i ->
+        mutableBuffer[bufferStart + i]
+    }
 }
 
 public fun IntTensor.toIntArray(): IntArray {
-    return tensor.mutableBuffer.array().drop(bufferStart).take(numElements).toIntArray()
+    return IntArray(numElements) { i ->
+        mutableBuffer[bufferStart + i]
+    }
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index fd98be8b2..b1c12ccde 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -5,38 +5,35 @@ import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
 import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 
 
-internal fun checkEmptyShape(shape: IntArray): Unit =
+internal fun checkEmptyShape(shape: IntArray) =
     check(shape.isNotEmpty()) {
         "Illegal empty shape provided"
     }
 
-internal fun checkEmptyDoubleBuffer(buffer: DoubleArray): Unit =
+internal fun checkEmptyDoubleBuffer(buffer: DoubleArray) =
     check(buffer.isNotEmpty()) {
         "Illegal empty buffer provided"
     }
 
-internal fun checkBufferShapeConsistency(shape: IntArray, buffer: DoubleArray): Unit =
+internal fun checkBufferShapeConsistency(shape: IntArray, buffer: DoubleArray) =
     check(buffer.size == shape.reduce(Int::times)) {
         "Inconsistent shape ${shape.toList()} for buffer of size ${buffer.size} provided"
     }
 
-
-internal fun <T> checkShapesCompatible(a: TensorStructure<T>, b: TensorStructure<T>): Unit =
+internal fun <T> checkShapesCompatible(a: TensorStructure<T>, b: TensorStructure<T>) =
     check(a.shape contentEquals b.shape) {
         "Incompatible shapes ${a.shape.toList()} and ${b.shape.toList()} "
     }
 
-
-internal fun checkTranspose(dim: Int, i: Int, j: Int): Unit =
+internal fun checkTranspose(dim: Int, i: Int, j: Int) =
     check((i < dim) and (j < dim)) {
         "Cannot transpose $i to $j for a tensor of dim $dim"
     }
 
-internal fun <T> checkView(a: TensorStructure<T>, shape: IntArray): Unit =
+internal fun <T> checkView(a: TensorStructure<T>, shape: IntArray) =
     check(a.shape.reduce(Int::times) == shape.reduce(Int::times))
 
-
-internal fun checkSquareMatrix(shape: IntArray): Unit {
+internal fun checkSquareMatrix(shape: IntArray) {
     val n = shape.size
     check(n >= 2) {
         "Expected tensor with 2 or more dimensions, got size $n instead"
@@ -48,14 +45,12 @@ internal fun checkSquareMatrix(shape: IntArray): Unit {
 
 internal fun DoubleTensorAlgebra.checkSymmetric(
     tensor: TensorStructure<Double>, epsilon: Double = 1e-6
-): Unit =
+) =
     check(tensor.eq(tensor.transpose(), epsilon)) {
         "Tensor is not symmetric about the last 2 dimensions at precision $epsilon"
     }
 
-internal fun DoubleLinearOpsTensorAlgebra.checkPositiveDefinite(
-    tensor: DoubleTensor, epsilon: Double = 1e-6
-): Unit {
+internal fun DoubleLinearOpsTensorAlgebra.checkPositiveDefinite(tensor: DoubleTensor, epsilon: Double = 1e-6) {
     checkSymmetric(tensor, epsilon)
     for (mat in tensor.matrixSequence())
         check(mat.asTensor().detLU().value() > 0.0) {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
index e54cc4d26..ba8b823c9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
@@ -34,18 +34,6 @@ internal fun <T> BufferedTensor<T>.matrixSequence(): Sequence<BufferedTensor<T>>
     }
 }
 
-internal inline fun <T> BufferedTensor<T>.forEachVector(vectorAction: (BufferedTensor<T>) -> Unit) {
-    for (vector in vectorSequence()) {
-        vectorAction(vector)
-    }
-}
-
-internal inline fun <T> BufferedTensor<T>.forEachMatrix(matrixAction: (BufferedTensor<T>) -> Unit) {
-    for (matrix in matrixSequence()) {
-        matrixAction(matrix)
-    }
-}
-
 internal fun dotHelper(
     a: MutableStructure2D<Double>,
     b: MutableStructure2D<Double>,
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
index 88b9c6c5c..0211342bb 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
@@ -14,7 +14,6 @@ internal fun Buffer<Int>.array(): IntArray = when (this) {
     else -> this.toIntArray()
 }
 
-
 /**
  * Returns a reference to [DoubleArray] containing all of the elements of this [Buffer] or copy the data.
  */
@@ -31,7 +30,7 @@ internal fun getRandomNormals(n: Int, seed: Long): DoubleArray {
 
 internal fun getRandomUnitVector(n: Int, seed: Long): DoubleArray {
     val unnorm = getRandomNormals(n, seed)
-    val norm = sqrt(unnorm.map { it * it }.sum())
+    val norm = sqrt(unnorm.sumOf { it * it })
     return unnorm.map { it / norm }.toDoubleArray()
 }
 
@@ -45,23 +44,33 @@ internal fun minusIndexFrom(n: Int, i: Int): Int = if (i >= 0) i else {
 
 internal fun <T> BufferedTensor<T>.minusIndex(i: Int): Int = minusIndexFrom(this.dimension, i)
 
-internal fun format(value: Double, digits: Int = 4): String {
-    val ten = 10.0
-    val approxOrder = if (value == 0.0) 0 else ceil(log10(abs(value))).toInt()
-    val order = if (
-        ((value % ten) == 0.0) or
-        (value == 1.0) or
-        ((1 / value) % ten == 0.0)
-    ) approxOrder else approxOrder - 1
-    val lead = value / ten.pow(order)
-    val leadDisplay = round(lead * ten.pow(digits)) / ten.pow(digits)
-    val orderDisplay = if (order == 0) "" else if (order > 0) "E+$order" else "E$order"
-    val valueDisplay = "$leadDisplay$orderDisplay"
-    val res = if (value < 0.0) valueDisplay else " $valueDisplay"
-
+internal fun format(value: Double, digits: Int = 4): String = buildString {
+    val res = buildString {
+        val ten = 10.0
+        val approxOrder = if (value == 0.0) 0 else ceil(log10(abs(value))).toInt()
+        val order = if (
+            ((value % ten) == 0.0) ||
+            (value == 1.0) ||
+            ((1 / value) % ten == 0.0)
+        ) approxOrder else approxOrder - 1
+        val lead = value / ten.pow(order)
+        if (value >= 0.0) append(' ')
+        append(round(lead * ten.pow(digits)) / ten.pow(digits))
+        when {
+            order == 0 -> Unit
+            order > 0 -> {
+                append("e+")
+                append(order)
+            }
+            else -> {
+                append('e')
+                append(order)
+            }
+        }
+    }
     val fLength = digits + 6
-    val endSpace = " ".repeat(fLength - res.length)
-    return "$res$endSpace"
+    append(res)
+    repeat(fLength - res.length) { append(' ') }
 }
 
 internal fun DoubleTensor.toPrettyString(): String = buildString {
-- 
2.34.1


From 48d86fac5620b5e663a5dc62618f4f2869e86521 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Sat, 1 May 2021 19:55:48 +0100
Subject: [PATCH 172/713] invoke refactor

---
 .../core/algebras/TensorLinearStructure.kt    |  6 -----
 .../kscience/kmath/tensors/core/linUtils.kt   |  2 +-
 .../kmath/tensors/core/TestBroadcasting.kt    | 10 ++++----
 .../core/TestDoubleAnalyticTensorAlgebra.kt   |  2 +-
 .../core/TestDoubleLinearOpsAlgebra.kt        | 24 +++++++++----------
 .../kmath/tensors/core/TestDoubleTensor.kt    |  6 ++---
 .../tensors/core/TestDoubleTensorAlgebra.kt   | 18 +++++++-------
 7 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
index 08aab5175..5fbc7390f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
@@ -9,12 +9,6 @@ import space.kscience.kmath.nd.Strides
 import kotlin.math.max
 
 
-internal fun offsetFromIndex(index: IntArray, shape: IntArray, strides: IntArray): Int =
-    index.mapIndexed { i, value ->
-        if (value < 0 || value >= shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0,${shape[i]})")
-        value * strides[i]
-    }.sum()
-
 internal fun stridesFromShape(shape: IntArray): IntArray {
     val nDim = shape.size
     val res = IntArray(nDim)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
index ba8b823c9..8adbfad39 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
@@ -241,7 +241,7 @@ internal fun DoubleLinearOpsTensorAlgebra.qrHelper(
                 }
             }
         }
-        r[j, j] = DoubleAnalyticTensorAlgebra.invoke { (v dot v).sqrt().value() }
+        r[j, j] = DoubleAnalyticTensorAlgebra { (v dot v).sqrt().value() }
         for (i in 0 until n) {
             qM[i, j] = vv[i] / r[j, j]
         }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 1070a1115..1564b85c9 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -9,7 +9,7 @@ import kotlin.test.assertTrue
 internal class TestBroadcasting {
 
     @Test
-    fun broadcastShapes() = DoubleTensorAlgebra.invoke {
+    fun broadcastShapes() = DoubleTensorAlgebra {
         assertTrue(
             broadcastShapes(
                 intArrayOf(2, 3), intArrayOf(1, 3), intArrayOf(1, 1, 1)
@@ -24,7 +24,7 @@ internal class TestBroadcasting {
     }
 
     @Test
-    fun broadcastTo() = DoubleTensorAlgebra.invoke {
+    fun broadcastTo() = DoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
 
@@ -34,7 +34,7 @@ internal class TestBroadcasting {
     }
 
     @Test
-    fun broadcastTensors() = DoubleTensorAlgebra.invoke {
+    fun broadcastTensors() = DoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
@@ -51,7 +51,7 @@ internal class TestBroadcasting {
     }
 
     @Test
-    fun broadcastOuterTensors() = DoubleTensorAlgebra.invoke {
+    fun broadcastOuterTensors() = DoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
@@ -68,7 +68,7 @@ internal class TestBroadcasting {
     }
 
     @Test
-    fun broadcastOuterTensorsShapes() = DoubleTensorAlgebra.invoke {
+    fun broadcastOuterTensorsShapes() = DoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 1, 3, 2, 3), DoubleArray(2 * 1 * 3 * 2 * 3) {0.0})
         val tensor2 = fromArray(intArrayOf(4, 2, 5, 1, 3, 3), DoubleArray(4 * 2 * 5 * 1 * 3 * 3) {0.0})
         val tensor3 = fromArray(intArrayOf(1, 1), doubleArrayOf(500.0))
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index 66959a0de..835b8a08a 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -27,7 +27,7 @@ internal class TestDoubleAnalyticTensorAlgebra {
     }
 
     @Test
-    fun testExp() = DoubleAnalyticTensorAlgebra.invoke {
+    fun testExp() = DoubleAnalyticTensorAlgebra {
         tensor.exp().let {
             assertTrue { shape contentEquals it.shape }
             assertTrue { buffer.fmap(::exp).epsEqual(it.mutableBuffer.array())}
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 6689e893a..65070af7f 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -10,7 +10,7 @@ import kotlin.test.assertTrue
 internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
-    fun testDetLU() = DoubleLinearOpsTensorAlgebra.invoke {
+    fun testDetLU() = DoubleLinearOpsTensorAlgebra {
         val tensor = fromArray(
             intArrayOf(2, 2, 2),
             doubleArrayOf(
@@ -35,7 +35,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testDet() = DoubleLinearOpsTensorAlgebra.invoke {
+    fun testDet() = DoubleLinearOpsTensorAlgebra {
         val expectedValue = 0.019827417
         val m = fromArray(
             intArrayOf(3, 3), doubleArrayOf(
@@ -49,7 +49,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testDetSingle() = DoubleLinearOpsTensorAlgebra.invoke {
+    fun testDetSingle() = DoubleLinearOpsTensorAlgebra {
         val expectedValue = 48.151623
         val m = fromArray(
             intArrayOf(1, 1), doubleArrayOf(
@@ -61,7 +61,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testInvLU() = DoubleLinearOpsTensorAlgebra.invoke {
+    fun testInvLU() = DoubleLinearOpsTensorAlgebra {
         val tensor = fromArray(
             intArrayOf(2, 2, 2),
             doubleArrayOf(
@@ -86,14 +86,14 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testScalarProduct() = DoubleLinearOpsTensorAlgebra.invoke {
+    fun testScalarProduct() = DoubleLinearOpsTensorAlgebra {
         val a = fromArray(intArrayOf(3), doubleArrayOf(1.8, 2.5, 6.8))
         val b = fromArray(intArrayOf(3), doubleArrayOf(5.5, 2.6, 6.4))
         assertEquals(a.dot(b).value(), 59.92)
     }
 
     @Test
-    fun testQR() = DoubleLinearOpsTensorAlgebra.invoke {
+    fun testQR() = DoubleLinearOpsTensorAlgebra {
         val shape = intArrayOf(2, 2, 2)
         val buffer = doubleArrayOf(
             1.0, 3.0,
@@ -114,7 +114,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testLU() = DoubleLinearOpsTensorAlgebra.invoke {
+    fun testLU() = DoubleLinearOpsTensorAlgebra {
         val shape = intArrayOf(2, 2, 2)
         val buffer = doubleArrayOf(
             1.0, 3.0,
@@ -134,7 +134,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testCholesky() = DoubleLinearOpsTensorAlgebra.invoke {
+    fun testCholesky() = DoubleLinearOpsTensorAlgebra {
         val tensor = randomNormal(intArrayOf(2, 5, 5), 0)
         val sigma = (tensor dot tensor.transpose()) + diagonalEmbedding(
             fromArray(intArrayOf(2, 5), DoubleArray(10) { 0.1 })
@@ -145,7 +145,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testSVD1D() = DoubleLinearOpsTensorAlgebra.invoke {
+    fun testSVD1D() = DoubleLinearOpsTensorAlgebra {
         val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
 
         val res = svd1d(tensor2)
@@ -156,13 +156,13 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testSVD() = DoubleLinearOpsTensorAlgebra.invoke{
+    fun testSVD() = DoubleLinearOpsTensorAlgebra{
         testSVDFor(fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0)))
         testSVDFor(fromArray(intArrayOf(2, 2), doubleArrayOf(-1.0, 0.0, 239.0, 238.0)))
     }
 
     @Test
-    fun testBatchedSVD() = DoubleLinearOpsTensorAlgebra.invoke {
+    fun testBatchedSVD() = DoubleLinearOpsTensorAlgebra {
         val tensor = randomNormal(intArrayOf(2, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
         val tensorSVD = tensorU dot (diagonalEmbedding(tensorS) dot tensorV.transpose())
@@ -170,7 +170,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testBatchedSymEig() = DoubleLinearOpsTensorAlgebra.invoke {
+    fun testBatchedSymEig() = DoubleLinearOpsTensorAlgebra {
         val tensor = randomNormal(shape = intArrayOf(2, 3, 3), 0)
         val tensorSigma = tensor + tensor.transpose()
         val (tensorS, tensorV) = tensorSigma.symEig()
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 333a7bdec..ed5f8e780 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -15,14 +15,14 @@ import kotlin.test.assertTrue
 internal class TestDoubleTensor {
 
     @Test
-    fun valueTest() = DoubleTensorAlgebra.invoke {
+    fun valueTest() = DoubleTensorAlgebra {
         val value = 12.5
         val tensor = fromArray(intArrayOf(1), doubleArrayOf(value))
         assertEquals(tensor.value(), value)
     }
 
     @Test
-    fun stridesTest() = DoubleTensorAlgebra.invoke {
+    fun stridesTest() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
         assertEquals(tensor[intArrayOf(0, 1)], 5.8)
         assertTrue(
@@ -31,7 +31,7 @@ internal class TestDoubleTensor {
     }
 
     @Test
-    fun getTest() = DoubleTensorAlgebra.invoke {
+    fun getTest() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(1, 2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
         val matrix = tensor[0].as2D()
         assertEquals(matrix[0, 1], 5.8)
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index a0efa4573..df2d21b96 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -10,21 +10,21 @@ import kotlin.test.assertTrue
 internal class TestDoubleTensorAlgebra {
 
     @Test
-    fun doublePlus() = DoubleTensorAlgebra.invoke {
+    fun doublePlus() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(1.0, 2.0))
         val res = 10.0 + tensor
         assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(11.0, 12.0))
     }
 
     @Test
-    fun doubleDiv() = DoubleTensorAlgebra.invoke {
+    fun doubleDiv() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(2.0, 4.0))
         val res = 2.0/tensor
         assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(1.0, 0.5))
     }
 
     @Test
-    fun divDouble() = DoubleTensorAlgebra.invoke {
+    fun divDouble() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(10.0, 5.0))
         val res = tensor / 2.5
         assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(4.0, 2.0))
@@ -40,7 +40,7 @@ internal class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun transpose3x2() = DoubleTensorAlgebra.invoke {
+    fun transpose3x2() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res = tensor.transpose(1, 0)
 
@@ -49,7 +49,7 @@ internal class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun transpose1x2x3() = DoubleTensorAlgebra.invoke {
+    fun transpose1x2x3() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res01 = tensor.transpose(0, 1)
         val res02 = tensor.transpose(-3, 2)
@@ -65,7 +65,7 @@ internal class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun linearStructure() = DoubleTensorAlgebra.invoke {
+    fun linearStructure() = DoubleTensorAlgebra {
         val shape = intArrayOf(3)
         val tensorA = full(value = -4.5, shape = shape)
         val tensorB = full(value = 10.9, shape = shape)
@@ -97,7 +97,7 @@ internal class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun dot() = DoubleTensorAlgebra.invoke {
+    fun dot() = DoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor11 = fromArray(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(3), doubleArrayOf(10.0, 20.0, 30.0))
@@ -133,7 +133,7 @@ internal class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun diagonalEmbedding() = DoubleTensorAlgebra.invoke {
+    fun diagonalEmbedding() = DoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor3 = zeros(intArrayOf(2, 3, 4, 5))
@@ -166,7 +166,7 @@ internal class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun testEq() = DoubleTensorAlgebra.invoke {
+    fun testEq() = DoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor3 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 5.0))
-- 
2.34.1


From 1fe1a74b48c6670aeaf0adfe217a5407795b71b8 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Sat, 1 May 2021 22:40:53 +0300
Subject: [PATCH 173/713] Create LICENSE.txt

---
 LICENSE.txt | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 201 insertions(+)
 create mode 100644 LICENSE.txt

diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 000000000..261eeb9e9
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
-- 
2.34.1


From c8fb770ffddb6428790a762e32513414503a2b32 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Sat, 1 May 2021 22:44:43 +0300
Subject: [PATCH 174/713] Rename LICENSE.txt to LICENSE

---
 LICENSE.txt => LICENSE | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename LICENSE.txt => LICENSE (100%)

diff --git a/LICENSE.txt b/LICENSE
similarity index 100%
rename from LICENSE.txt
rename to LICENSE
-- 
2.34.1


From 5aaba0dae443605b3dedb4bc4ee7733922b8e41f Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Sun, 2 May 2021 16:19:05 +0100
Subject: [PATCH 175/713] TensorStructure to Tensor

---
 .../tensors/api/AnalyticTensorAlgebra.kt      | 36 ++++-----
 .../tensors/api/LinearOpsTensorAlgebra.kt     | 16 ++--
 .../api/{TensorStructure.kt => Tensor.kt}     |  2 +-
 .../kmath/tensors/api/TensorAlgebra.kt        | 52 ++++++------
 .../api/TensorPartialDivisionAlgebra.kt       | 12 +--
 .../kmath/tensors/core/BufferedTensor.kt      | 16 ++--
 .../algebras/BroadcastDoubleTensorAlgebra.kt  | 18 ++---
 .../algebras/DoubleAnalyticTensorAlgebra.kt   | 36 ++++-----
 .../algebras/DoubleLinearOpsTensorAlgebra.kt  | 36 ++++-----
 .../core/algebras/DoubleTensorAlgebra.kt      | 80 +++++++++----------
 .../kscience/kmath/tensors/core/checks.kt     |  8 +-
 11 files changed, 156 insertions(+), 156 deletions(-)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/{TensorStructure.kt => Tensor.kt} (60%)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index 5c92c56c4..cd13e0752 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.tensors.api
 
 /**
- * Element-wise analytic operations on [TensorStructure].
+ * Element-wise analytic operations on [Tensor].
  *
  * @param T the type of items closed under analytic functions in the tensors.
  */
@@ -14,54 +14,54 @@ public interface AnalyticTensorAlgebra<T> :
     TensorPartialDivisionAlgebra<T> {
 
     //For information: https://pytorch.org/docs/stable/generated/torch.exp.html
-    public fun TensorStructure<T>.exp(): TensorStructure<T>
+    public fun Tensor<T>.exp(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.log.html
-    public fun TensorStructure<T>.log(): TensorStructure<T>
+    public fun Tensor<T>.log(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.sqrt.html
-    public fun TensorStructure<T>.sqrt(): TensorStructure<T>
+    public fun Tensor<T>.sqrt(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.acos.html#torch.cos
-    public fun TensorStructure<T>.cos(): TensorStructure<T>
+    public fun Tensor<T>.cos(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.acos.html#torch.acos
-    public fun TensorStructure<T>.acos(): TensorStructure<T>
+    public fun Tensor<T>.acos(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.cosh
-    public fun TensorStructure<T>.cosh(): TensorStructure<T>
+    public fun Tensor<T>.cosh(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.acosh
-    public fun TensorStructure<T>.acosh(): TensorStructure<T>
+    public fun Tensor<T>.acosh(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sin
-    public fun TensorStructure<T>.sin(): TensorStructure<T>
+    public fun Tensor<T>.sin(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asin
-    public fun TensorStructure<T>.asin(): TensorStructure<T>
+    public fun Tensor<T>.asin(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sinh
-    public fun TensorStructure<T>.sinh(): TensorStructure<T>
+    public fun Tensor<T>.sinh(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asinh
-    public fun TensorStructure<T>.asinh(): TensorStructure<T>
+    public fun Tensor<T>.asinh(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.atan.html#torch.tan
-    public fun TensorStructure<T>.tan(): TensorStructure<T>
+    public fun Tensor<T>.tan(): Tensor<T>
 
     //https://pytorch.org/docs/stable/generated/torch.atan.html#torch.atan
-    public fun TensorStructure<T>.atan(): TensorStructure<T>
+    public fun Tensor<T>.atan(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.tanh
-    public fun TensorStructure<T>.tanh(): TensorStructure<T>
+    public fun Tensor<T>.tanh(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.atanh
-    public fun TensorStructure<T>.atanh(): TensorStructure<T>
+    public fun Tensor<T>.atanh(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.ceil.html#torch.ceil
-    public fun TensorStructure<T>.ceil(): TensorStructure<T>
+    public fun Tensor<T>.ceil(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.floor.html#torch.floor
-    public fun TensorStructure<T>.floor(): TensorStructure<T>
+    public fun Tensor<T>.floor(): Tensor<T>
 
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index bcbb52a1b..527e5d386 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.tensors.api
 
 /**
- * Common linear algebra operations. Operates on [TensorStructure].
+ * Common linear algebra operations. Operates on [Tensor].
  *
  * @param T the type of items closed under division in the tensors.
  */
@@ -19,7 +19,7 @@ public interface LinearOpsTensorAlgebra<T> :
      *
      * @return the determinant.
      */
-    public fun TensorStructure<T>.det(): TensorStructure<T>
+    public fun Tensor<T>.det(): Tensor<T>
 
     /**
      * Computes the multiplicative inverse matrix of a square matrix input, or of each square matrix in a batched input.
@@ -29,7 +29,7 @@ public interface LinearOpsTensorAlgebra<T> :
      *
      * @return the multiplicative inverse of a matrix.
      */
-    public fun TensorStructure<T>.inv(): TensorStructure<T>
+    public fun Tensor<T>.inv(): Tensor<T>
 
     /**
      * Cholesky decomposition.
@@ -44,7 +44,7 @@ public interface LinearOpsTensorAlgebra<T> :
      *
      * @return the batch of L matrices.
      */
-    public fun TensorStructure<T>.cholesky(): TensorStructure<T>
+    public fun Tensor<T>.cholesky(): Tensor<T>
 
     /**
      * QR decomposition.
@@ -57,7 +57,7 @@ public interface LinearOpsTensorAlgebra<T> :
      *
      * @return pair of Q and R tensors.
      */
-    public fun TensorStructure<T>.qr(): Pair<TensorStructure<T>, TensorStructure<T>>
+    public fun Tensor<T>.qr(): Pair<Tensor<T>, Tensor<T>>
 
     /**
      * LUP decomposition
@@ -70,7 +70,7 @@ public interface LinearOpsTensorAlgebra<T> :
      *
      * * @return triple of P, L and U tensors
      */
-    public fun TensorStructure<T>.lu(): Triple<TensorStructure<T>, TensorStructure<T>, TensorStructure<T>>
+    public fun Tensor<T>.lu(): Triple<Tensor<T>, Tensor<T>, Tensor<T>>
 
     /**
      * Singular Value Decomposition.
@@ -83,7 +83,7 @@ public interface LinearOpsTensorAlgebra<T> :
      *
      * @return the determinant.
      */
-    public fun TensorStructure<T>.svd(): Triple<TensorStructure<T>, TensorStructure<T>, TensorStructure<T>>
+    public fun Tensor<T>.svd(): Triple<Tensor<T>, Tensor<T>, Tensor<T>>
 
     /**
      * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
@@ -92,6 +92,6 @@ public interface LinearOpsTensorAlgebra<T> :
      *
      * @return a pair (eigenvalues, eigenvectors)
      */
-    public fun TensorStructure<T>.symEig(): Pair<TensorStructure<T>, TensorStructure<T>>
+    public fun Tensor<T>.symEig(): Pair<Tensor<T>, Tensor<T>>
 
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt
similarity index 60%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorStructure.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt
index edecd6383..179787684 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt
@@ -2,4 +2,4 @@ package space.kscience.kmath.tensors.api
 
 import space.kscience.kmath.nd.MutableStructureND
 
-public typealias TensorStructure<T> = MutableStructureND<T>
+public typealias Tensor<T> = MutableStructureND<T>
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 96d6985d8..b9c707c0b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -8,19 +8,19 @@ package space.kscience.kmath.tensors.api
 import space.kscience.kmath.operations.Algebra
 
 /**
- * Algebra over a ring on [TensorStructure].
+ * Algebra over a ring on [Tensor].
  * For more information: https://proofwiki.org/wiki/Definition:Algebra_over_Ring
  *
  * @param T the type of items in the tensors.
  */
-public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
+public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
 
     /**
      * Returns a single tensor value of unit dimension. The tensor shape must be equal to [1].
      *
      * @return the value of a scalar tensor.
      */
-    public fun TensorStructure<T>.value(): T
+    public fun Tensor<T>.value(): T
 
     /**
      * Each element of the tensor [other] is added to this value.
@@ -29,7 +29,7 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param other tensor to be added.
      * @return the sum of this value and tensor [other].
      */
-    public operator fun T.plus(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun T.plus(other: Tensor<T>): Tensor<T>
 
     /**
      * Adds the scalar [value] to each element of this tensor and returns a new resulting tensor.
@@ -37,7 +37,7 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param value the number to be added to each element of this tensor.
      * @return the sum of this tensor and [value].
      */
-    public operator fun TensorStructure<T>.plus(value: T): TensorStructure<T>
+    public operator fun Tensor<T>.plus(value: T): Tensor<T>
 
     /**
      * Each element of the tensor [other] is added to each element of this tensor.
@@ -46,21 +46,21 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param other tensor to be added.
      * @return the sum of this tensor and [other].
      */
-    public operator fun TensorStructure<T>.plus(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun Tensor<T>.plus(other: Tensor<T>): Tensor<T>
 
     /**
      * Adds the scalar [value] to each element of this tensor.
      *
      * @param value the number to be added to each element of this tensor.
      */
-    public operator fun TensorStructure<T>.plusAssign(value: T): Unit
+    public operator fun Tensor<T>.plusAssign(value: T): Unit
 
     /**
      * Each element of the tensor [other] is added to each element of this tensor.
      *
      * @param other tensor to be added.
      */
-    public operator fun TensorStructure<T>.plusAssign(other: TensorStructure<T>): Unit
+    public operator fun Tensor<T>.plusAssign(other: Tensor<T>): Unit
 
 
     /**
@@ -70,7 +70,7 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param other tensor to be subtracted.
      * @return the difference between this value and tensor [other].
      */
-    public operator fun T.minus(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun T.minus(other: Tensor<T>): Tensor<T>
 
     /**
      * Subtracts the scalar [value] from each element of this tensor and returns a new resulting tensor.
@@ -78,7 +78,7 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param value the number to be subtracted from each element of this tensor.
      * @return the difference between this tensor and [value].
      */
-    public operator fun TensorStructure<T>.minus(value: T): TensorStructure<T>
+    public operator fun Tensor<T>.minus(value: T): Tensor<T>
 
     /**
      * Each element of the tensor [other] is subtracted from each element of this tensor.
@@ -87,21 +87,21 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param other tensor to be subtracted.
      * @return the difference between this tensor and [other].
      */
-    public operator fun TensorStructure<T>.minus(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun Tensor<T>.minus(other: Tensor<T>): Tensor<T>
 
     /**
      * Subtracts the scalar [value] from each element of this tensor.
      *
      * @param value the number to be subtracted from each element of this tensor.
      */
-    public operator fun TensorStructure<T>.minusAssign(value: T): Unit
+    public operator fun Tensor<T>.minusAssign(value: T): Unit
 
     /**
      * Each element of the tensor [other] is subtracted from each element of this tensor.
      *
      * @param other tensor to be subtracted.
      */
-    public operator fun TensorStructure<T>.minusAssign(other: TensorStructure<T>): Unit
+    public operator fun Tensor<T>.minusAssign(other: Tensor<T>): Unit
 
 
     /**
@@ -111,7 +111,7 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param other tensor to be multiplied.
      * @return the product of this value and tensor [other].
      */
-    public operator fun T.times(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun T.times(other: Tensor<T>): Tensor<T>
 
     /**
      * Multiplies the scalar [value] by each element of this tensor and returns a new resulting tensor.
@@ -119,7 +119,7 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param value the number to be multiplied by each element of this tensor.
      * @return the product of this tensor and [value].
      */
-    public operator fun TensorStructure<T>.times(value: T): TensorStructure<T>
+    public operator fun Tensor<T>.times(value: T): Tensor<T>
 
     /**
      * Each element of the tensor [other] is multiplied by each element of this tensor.
@@ -128,28 +128,28 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param other tensor to be multiplied.
      * @return the product of this tensor and [other].
      */
-    public operator fun TensorStructure<T>.times(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun Tensor<T>.times(other: Tensor<T>): Tensor<T>
 
     /**
      * Multiplies the scalar [value] by each element of this tensor.
      *
      * @param value the number to be multiplied by each element of this tensor.
      */
-    public operator fun TensorStructure<T>.timesAssign(value: T): Unit
+    public operator fun Tensor<T>.timesAssign(value: T): Unit
 
     /**
      * Each element of the tensor [other] is multiplied by each element of this tensor.
      *
      * @param other tensor to be multiplied.
      */
-    public operator fun TensorStructure<T>.timesAssign(other: TensorStructure<T>): Unit
+    public operator fun Tensor<T>.timesAssign(other: Tensor<T>): Unit
 
     /**
      * Numerical negative, element-wise.
      *
      * @return tensor negation of the original tensor.
      */
-    public operator fun TensorStructure<T>.unaryMinus(): TensorStructure<T>
+    public operator fun Tensor<T>.unaryMinus(): Tensor<T>
 
     /**
      * Returns the tensor at index i
@@ -158,7 +158,7 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param i index of the extractable tensor
      * @return subtensor of the original tensor with index [i]
      */
-    public operator fun TensorStructure<T>.get(i: Int): TensorStructure<T>
+    public operator fun Tensor<T>.get(i: Int): Tensor<T>
 
     /**
      * Returns a tensor that is a transposed version of this tensor. The given dimensions [i] and [j] are swapped.
@@ -168,7 +168,7 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param j the second dimension to be transposed
      * @return transposed tensor
      */
-    public fun TensorStructure<T>.transpose(i: Int = -2, j: Int = -1): TensorStructure<T>
+    public fun Tensor<T>.transpose(i: Int = -2, j: Int = -1): Tensor<T>
 
     /**
      * Returns a new tensor with the same data as the self tensor but of a different shape.
@@ -178,7 +178,7 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param shape the desired size
      * @return tensor with new shape
      */
-    public fun TensorStructure<T>.view(shape: IntArray): TensorStructure<T>
+    public fun Tensor<T>.view(shape: IntArray): Tensor<T>
 
     /**
      * View this tensor as the same size as [other].
@@ -188,7 +188,7 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param other the result tensor has the same size as other.
      * @return the result tensor with the same size as other.
      */
-    public fun TensorStructure<T>.viewAs(other: TensorStructure<T>): TensorStructure<T>
+    public fun Tensor<T>.viewAs(other: Tensor<T>): Tensor<T>
 
     /**
      * Matrix product of two tensors.
@@ -219,7 +219,7 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * @param other tensor to be multiplied
      * @return mathematical product of two tensors
      */
-    public infix fun TensorStructure<T>.dot(other: TensorStructure<T>): TensorStructure<T>
+    public infix fun Tensor<T>.dot(other: Tensor<T>): Tensor<T>
 
     /**
      * Creates a tensor whose diagonals of certain 2D planes (specified by [dim1] and [dim2])
@@ -245,10 +245,10 @@ public interface TensorAlgebra<T>: Algebra<TensorStructure<T>> {
      * are filled by [diagonalEntries]
      */
     public fun diagonalEmbedding(
-        diagonalEntries: TensorStructure<T>,
+        diagonalEntries: Tensor<T>,
         offset: Int = 0,
         dim1: Int = -2,
         dim2: Int = -1
-    ): TensorStructure<T>
+    ): Tensor<T>
 
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
index eccc6fa0d..921157963 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.tensors.api
 
 /**
- * Algebra over a field with partial division on [TensorStructure].
+ * Algebra over a field with partial division on [Tensor].
  * For more information: https://proofwiki.org/wiki/Definition:Division_Algebra
  *
  * @param T the type of items closed under division in the tensors.
@@ -21,7 +21,7 @@ public interface TensorPartialDivisionAlgebra<T> :
      * @param other tensor to divide by.
      * @return the division of this value by the tensor [other].
      */
-    public operator fun T.div(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun T.div(other: Tensor<T>): Tensor<T>
 
     /**
      * Divide by the scalar [value] each element of this tensor returns a new resulting tensor.
@@ -29,7 +29,7 @@ public interface TensorPartialDivisionAlgebra<T> :
      * @param value the number to divide by each element of this tensor.
      * @return the division of this tensor by the [value].
      */
-    public operator fun TensorStructure<T>.div(value: T): TensorStructure<T>
+    public operator fun Tensor<T>.div(value: T): Tensor<T>
 
     /**
      * Each element of the tensor [other] is divided by each element of this tensor.
@@ -38,19 +38,19 @@ public interface TensorPartialDivisionAlgebra<T> :
      * @param other tensor to be divided by.
      * @return the division of this tensor by [other].
      */
-    public operator fun TensorStructure<T>.div(other: TensorStructure<T>): TensorStructure<T>
+    public operator fun Tensor<T>.div(other: Tensor<T>): Tensor<T>
 
     /**
      * Divides by the scalar [value] each element of this tensor.
      *
      * @param value the number to divide by each element of this tensor.
      */
-    public operator fun TensorStructure<T>.divAssign(value: T)
+    public operator fun Tensor<T>.divAssign(value: T)
 
     /**
      * Each element of this tensor is divided by each element of the [other] tensor.
      *
      * @param other tensor to be divide by.
      */
-    public operator fun TensorStructure<T>.divAssign(other: TensorStructure<T>)
+    public operator fun Tensor<T>.divAssign(other: Tensor<T>)
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 9541a97f9..d0882efb8 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -2,7 +2,7 @@ package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.nd.MutableBufferND
 import space.kscience.kmath.structures.*
-import space.kscience.kmath.tensors.api.TensorStructure
+import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.algebras.TensorLinearStructure
 
 
@@ -10,7 +10,7 @@ public open class BufferedTensor<T>(
     override val shape: IntArray,
     internal val mutableBuffer: MutableBuffer<T>,
     internal val bufferStart: Int
-) : TensorStructure<T> {
+) : Tensor<T> {
     public val linearStructure: TensorLinearStructure
         get() = TensorLinearStructure(shape)
 
@@ -53,33 +53,33 @@ internal fun BufferedTensor<Int>.asTensor(): IntTensor =
 internal fun BufferedTensor<Double>.asTensor(): DoubleTensor =
     DoubleTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
 
-internal fun <T> TensorStructure<T>.copyToBufferedTensor(): BufferedTensor<T> =
+internal fun <T> Tensor<T>.copyToBufferedTensor(): BufferedTensor<T> =
     BufferedTensor(
         this.shape,
         TensorLinearStructure(this.shape).indices().map(this::get).toMutableList().asMutableBuffer(), 0
     )
 
-internal fun <T> TensorStructure<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
+internal fun <T> Tensor<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
     is BufferedTensor<T> -> this
     is MutableBufferND<T> -> if (this.strides.strides contentEquals TensorLinearStructure(this.shape).strides)
         BufferedTensor(this.shape, this.mutableBuffer, 0) else this.copyToBufferedTensor()
     else -> this.copyToBufferedTensor()
 }
 
-internal val TensorStructure<Double>.tensor: DoubleTensor
+internal val Tensor<Double>.tensor: DoubleTensor
     get() = when (this) {
         is DoubleTensor -> this
         else -> this.toBufferedTensor().asTensor()
     }
 
-internal val TensorStructure<Int>.tensor: IntTensor
+internal val Tensor<Int>.tensor: IntTensor
     get() = when (this) {
         is IntTensor -> this
         else -> this.toBufferedTensor().asTensor()
     }
 
-public fun TensorStructure<Double>.toDoubleTensor(): DoubleTensor = this.tensor
-public fun TensorStructure<Int>.toIntTensor(): IntTensor = this.tensor
+public fun Tensor<Double>.toDoubleTensor(): DoubleTensor = this.tensor
+public fun Tensor<Int>.toIntTensor(): IntTensor = this.tensor
 
 public fun Array<DoubleArray>.toDoubleTensor(): DoubleTensor {
     val n = size
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
index 9b97d5ef2..873ec9027 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core.algebras
 
-import space.kscience.kmath.tensors.api.TensorStructure
+import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.*
 import space.kscience.kmath.tensors.core.broadcastTensors
 import space.kscience.kmath.tensors.core.broadcastTo
@@ -16,7 +16,7 @@ import space.kscience.kmath.tensors.core.broadcastTo
  */
 public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
-    override fun TensorStructure<Double>.plus(other: TensorStructure<Double>): DoubleTensor {
+    override fun Tensor<Double>.plus(other: Tensor<Double>): DoubleTensor {
         val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
@@ -26,7 +26,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.plusAssign(other: TensorStructure<Double>) {
+    override fun Tensor<Double>.plusAssign(other: Tensor<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
         for (i in 0 until tensor.linearStructure.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
@@ -34,7 +34,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         }
     }
 
-    override fun TensorStructure<Double>.minus(other: TensorStructure<Double>): DoubleTensor {
+    override fun Tensor<Double>.minus(other: Tensor<Double>): DoubleTensor {
         val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
@@ -44,7 +44,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.minusAssign(other: TensorStructure<Double>) {
+    override fun Tensor<Double>.minusAssign(other: Tensor<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
         for (i in 0 until tensor.linearStructure.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
@@ -52,7 +52,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         }
     }
 
-    override fun TensorStructure<Double>.times(other: TensorStructure<Double>): DoubleTensor {
+    override fun Tensor<Double>.times(other: Tensor<Double>): DoubleTensor {
         val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
@@ -63,7 +63,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.timesAssign(other: TensorStructure<Double>) {
+    override fun Tensor<Double>.timesAssign(other: Tensor<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
         for (i in 0 until tensor.linearStructure.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
@@ -71,7 +71,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         }
     }
 
-    override fun TensorStructure<Double>.div(other: TensorStructure<Double>): DoubleTensor {
+    override fun Tensor<Double>.div(other: Tensor<Double>): DoubleTensor {
         val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
@@ -82,7 +82,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.divAssign(other: TensorStructure<Double>) {
+    override fun Tensor<Double>.divAssign(other: Tensor<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
         for (i in 0 until tensor.linearStructure.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] /=
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
index 4a942df84..9aa6f093e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.tensors.core.algebras
 
 import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
-import space.kscience.kmath.tensors.api.TensorStructure
+import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.tensor
 import kotlin.math.*
@@ -14,38 +14,38 @@ import kotlin.math.*
 public object DoubleAnalyticTensorAlgebra :
     AnalyticTensorAlgebra<Double>,
     DoubleTensorAlgebra() {
-    override fun TensorStructure<Double>.exp(): DoubleTensor = tensor.map(::exp)
+    override fun Tensor<Double>.exp(): DoubleTensor = tensor.map(::exp)
 
-    override fun TensorStructure<Double>.log(): DoubleTensor = tensor.map(::ln)
+    override fun Tensor<Double>.log(): DoubleTensor = tensor.map(::ln)
 
-    override fun TensorStructure<Double>.sqrt(): DoubleTensor = tensor.map(::sqrt)
+    override fun Tensor<Double>.sqrt(): DoubleTensor = tensor.map(::sqrt)
 
-    override fun TensorStructure<Double>.cos(): DoubleTensor = tensor.map(::cos)
+    override fun Tensor<Double>.cos(): DoubleTensor = tensor.map(::cos)
 
-    override fun TensorStructure<Double>.acos(): DoubleTensor = tensor.map(::acos)
+    override fun Tensor<Double>.acos(): DoubleTensor = tensor.map(::acos)
 
-    override fun TensorStructure<Double>.cosh(): DoubleTensor = tensor.map(::cosh)
+    override fun Tensor<Double>.cosh(): DoubleTensor = tensor.map(::cosh)
 
-    override fun TensorStructure<Double>.acosh(): DoubleTensor = tensor.map(::acosh)
+    override fun Tensor<Double>.acosh(): DoubleTensor = tensor.map(::acosh)
 
-    override fun TensorStructure<Double>.sin(): DoubleTensor = tensor.map(::sin)
+    override fun Tensor<Double>.sin(): DoubleTensor = tensor.map(::sin)
 
-    override fun TensorStructure<Double>.asin(): DoubleTensor = tensor.map(::asin)
+    override fun Tensor<Double>.asin(): DoubleTensor = tensor.map(::asin)
 
-    override fun TensorStructure<Double>.sinh(): DoubleTensor = tensor.map(::sinh)
+    override fun Tensor<Double>.sinh(): DoubleTensor = tensor.map(::sinh)
 
-    override fun TensorStructure<Double>.asinh(): DoubleTensor = tensor.map(::asinh)
+    override fun Tensor<Double>.asinh(): DoubleTensor = tensor.map(::asinh)
 
-    override fun TensorStructure<Double>.tan(): DoubleTensor = tensor.map(::tan)
+    override fun Tensor<Double>.tan(): DoubleTensor = tensor.map(::tan)
 
-    override fun TensorStructure<Double>.atan(): DoubleTensor = tensor.map(::atan)
+    override fun Tensor<Double>.atan(): DoubleTensor = tensor.map(::atan)
 
-    override fun TensorStructure<Double>.tanh(): DoubleTensor = tensor.map(::tanh)
+    override fun Tensor<Double>.tanh(): DoubleTensor = tensor.map(::tanh)
 
-    override fun TensorStructure<Double>.atanh(): DoubleTensor = tensor.map(::atanh)
+    override fun Tensor<Double>.atanh(): DoubleTensor = tensor.map(::atanh)
 
-    override fun TensorStructure<Double>.ceil(): DoubleTensor = tensor.map(::ceil)
+    override fun Tensor<Double>.ceil(): DoubleTensor = tensor.map(::ceil)
 
-    override fun TensorStructure<Double>.floor(): DoubleTensor = tensor.map(::floor)
+    override fun Tensor<Double>.floor(): DoubleTensor = tensor.map(::floor)
 
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
index dd5ad5a61..89345e315 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.tensors.core.algebras
 import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.tensors.api.TensorStructure
+import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.*
 import space.kscience.kmath.tensors.core.checkSquareMatrix
 import space.kscience.kmath.tensors.core.choleskyHelper
@@ -25,19 +25,19 @@ public object DoubleLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double>,
     DoubleTensorAlgebra() {
 
-    override fun TensorStructure<Double>.inv(): DoubleTensor = invLU(1e-9)
+    override fun Tensor<Double>.inv(): DoubleTensor = invLU(1e-9)
 
-    override fun TensorStructure<Double>.det(): DoubleTensor = detLU(1e-9)
+    override fun Tensor<Double>.det(): DoubleTensor = detLU(1e-9)
 
-    public fun TensorStructure<Double>.luFactor(epsilon: Double): Pair<DoubleTensor, IntTensor> =
+    public fun Tensor<Double>.luFactor(epsilon: Double): Pair<DoubleTensor, IntTensor> =
         computeLU(tensor, epsilon)
             ?: throw IllegalArgumentException("Tensor contains matrices which are singular at precision $epsilon")
 
-    public fun TensorStructure<Double>.luFactor(): Pair<DoubleTensor, IntTensor> = luFactor(1e-9)
+    public fun Tensor<Double>.luFactor(): Pair<DoubleTensor, IntTensor> = luFactor(1e-9)
 
     public fun luPivot(
-        luTensor: TensorStructure<Double>,
-        pivotsTensor: TensorStructure<Int>
+        luTensor: Tensor<Double>,
+        pivotsTensor: Tensor<Int>
     ): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         checkSquareMatrix(luTensor.shape)
         check(
@@ -66,7 +66,7 @@ public object DoubleLinearOpsTensorAlgebra :
         return Triple(pTensor, lTensor, uTensor)
     }
 
-    public fun TensorStructure<Double>.cholesky(epsilon: Double): DoubleTensor {
+    public fun Tensor<Double>.cholesky(epsilon: Double): DoubleTensor {
         checkSquareMatrix(shape)
         checkPositiveDefinite(tensor, epsilon)
 
@@ -79,9 +79,9 @@ public object DoubleLinearOpsTensorAlgebra :
         return lTensor
     }
 
-    override fun TensorStructure<Double>.cholesky(): DoubleTensor = cholesky(1e-6)
+    override fun Tensor<Double>.cholesky(): DoubleTensor = cholesky(1e-6)
 
-    override fun TensorStructure<Double>.qr(): Pair<DoubleTensor, DoubleTensor> {
+    override fun Tensor<Double>.qr(): Pair<DoubleTensor, DoubleTensor> {
         checkSquareMatrix(shape)
         val qTensor = zeroesLike()
         val rTensor = zeroesLike()
@@ -95,10 +95,10 @@ public object DoubleLinearOpsTensorAlgebra :
         return qTensor to rTensor
     }
 
-    override fun TensorStructure<Double>.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> =
+    override fun Tensor<Double>.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> =
         svd(epsilon = 1e-10)
 
-    public fun TensorStructure<Double>.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+    public fun Tensor<Double>.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         val size = tensor.linearStructure.dim
         val commonShape = tensor.shape.sliceArray(0 until size - 2)
         val (n, m) = tensor.shape.sliceArray(size - 2 until size)
@@ -122,11 +122,11 @@ public object DoubleLinearOpsTensorAlgebra :
         return Triple(uTensor.transpose(), sTensor, vTensor.transpose())
     }
 
-    override fun TensorStructure<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> =
+    override fun Tensor<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> =
         symEig(epsilon = 1e-15)
 
     //For information: http://hua-zhou.github.io/teaching/biostatm280-2017spring/slides/16-eigsvd/eigsvd.html
-    public fun TensorStructure<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
+    public fun Tensor<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
         checkSymmetric(tensor, epsilon)
         val (u, s, v) = tensor.svd(epsilon)
         val shp = s.shape + intArrayOf(1)
@@ -139,7 +139,7 @@ public object DoubleLinearOpsTensorAlgebra :
         return eig to v
     }
 
-    public fun TensorStructure<Double>.detLU(epsilon: Double = 1e-9): DoubleTensor {
+    public fun Tensor<Double>.detLU(epsilon: Double = 1e-9): DoubleTensor {
 
         checkSquareMatrix(tensor.shape)
         val luTensor = tensor.copy()
@@ -164,7 +164,7 @@ public object DoubleLinearOpsTensorAlgebra :
         return detTensor
     }
 
-    public fun TensorStructure<Double>.invLU(epsilon: Double = 1e-9): DoubleTensor {
+    public fun Tensor<Double>.invLU(epsilon: Double = 1e-9): DoubleTensor {
         val (luTensor, pivotsTensor) = luFactor(epsilon)
         val invTensor = luTensor.zeroesLike()
 
@@ -177,11 +177,11 @@ public object DoubleLinearOpsTensorAlgebra :
         return invTensor
     }
 
-    public fun TensorStructure<Double>.lu(epsilon: Double = 1e-9): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+    public fun Tensor<Double>.lu(epsilon: Double = 1e-9): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         val (lu, pivots) = this.luFactor(epsilon)
         return luPivot(lu, pivots)
     }
 
-    override fun TensorStructure<Double>.lu(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> = lu(1e-9)
+    override fun Tensor<Double>.lu(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> = lu(1e-9)
 
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index d3e8bf175..4009f7b45 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.tensors.core.algebras
 
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.tensors.api.TensorPartialDivisionAlgebra
-import space.kscience.kmath.tensors.api.TensorStructure
+import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.*
 import space.kscience.kmath.tensors.core.broadcastOuterTensors
 import space.kscience.kmath.tensors.core.checkBufferShapeConsistency
@@ -25,7 +25,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
 
     public companion object : DoubleTensorAlgebra()
 
-    override fun TensorStructure<Double>.value(): Double {
+    override fun Tensor<Double>.value(): Double {
         check(tensor.shape contentEquals intArrayOf(1)) {
             "Inconsistent value for tensor of shape ${shape.toList()}"
         }
@@ -39,7 +39,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return DoubleTensor(shape, buffer, 0)
     }
 
-    override operator fun TensorStructure<Double>.get(i: Int): DoubleTensor {
+    override operator fun Tensor<Double>.get(i: Int): DoubleTensor {
         val lastShape = tensor.shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
         val newStart = newShape.reduce(Int::times) * i + tensor.bufferStart
@@ -52,7 +52,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return DoubleTensor(shape, buffer)
     }
 
-    public fun TensorStructure<Double>.fullLike(value: Double): DoubleTensor {
+    public fun Tensor<Double>.fullLike(value: Double): DoubleTensor {
         val shape = tensor.shape
         val buffer = DoubleArray(tensor.numElements) { value }
         return DoubleTensor(shape, buffer)
@@ -60,11 +60,11 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
 
     public fun zeros(shape: IntArray): DoubleTensor = full(0.0, shape)
 
-    public fun TensorStructure<Double>.zeroesLike(): DoubleTensor = tensor.fullLike(0.0)
+    public fun Tensor<Double>.zeroesLike(): DoubleTensor = tensor.fullLike(0.0)
 
     public fun ones(shape: IntArray): DoubleTensor = full(1.0, shape)
 
-    public fun TensorStructure<Double>.onesLike(): DoubleTensor = tensor.fullLike(1.0)
+    public fun Tensor<Double>.onesLike(): DoubleTensor = tensor.fullLike(1.0)
 
     public fun eye(n: Int): DoubleTensor {
         val shape = intArrayOf(n, n)
@@ -76,20 +76,20 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return res
     }
 
-    public fun TensorStructure<Double>.copy(): DoubleTensor {
+    public fun Tensor<Double>.copy(): DoubleTensor {
         return DoubleTensor(tensor.shape, tensor.mutableBuffer.array().copyOf(), tensor.bufferStart)
     }
 
-    override fun Double.plus(other: TensorStructure<Double>): DoubleTensor {
+    override fun Double.plus(other: Tensor<Double>): DoubleTensor {
         val resBuffer = DoubleArray(other.tensor.numElements) { i ->
             other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i] + this
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.plus(value: Double): DoubleTensor = value + tensor
+    override fun Tensor<Double>.plus(value: Double): DoubleTensor = value + tensor
 
-    override fun TensorStructure<Double>.plus(other: TensorStructure<Double>): DoubleTensor {
+    override fun Tensor<Double>.plus(other: Tensor<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other.tensor)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
             tensor.mutableBuffer.array()[i] + other.tensor.mutableBuffer.array()[i]
@@ -97,13 +97,13 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.plusAssign(value: Double) {
+    override fun Tensor<Double>.plusAssign(value: Double) {
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] += value
         }
     }
 
-    override fun TensorStructure<Double>.plusAssign(other: TensorStructure<Double>) {
+    override fun Tensor<Double>.plusAssign(other: Tensor<Double>) {
         checkShapesCompatible(tensor, other.tensor)
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
@@ -111,21 +111,21 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         }
     }
 
-    override fun Double.minus(other: TensorStructure<Double>): DoubleTensor {
+    override fun Double.minus(other: Tensor<Double>): DoubleTensor {
         val resBuffer = DoubleArray(other.tensor.numElements) { i ->
             this - other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i]
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.minus(value: Double): DoubleTensor {
+    override fun Tensor<Double>.minus(value: Double): DoubleTensor {
         val resBuffer = DoubleArray(tensor.numElements) { i ->
             tensor.mutableBuffer.array()[tensor.bufferStart + i] - value
         }
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.minus(other: TensorStructure<Double>): DoubleTensor {
+    override fun Tensor<Double>.minus(other: Tensor<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
             tensor.mutableBuffer.array()[i] - other.tensor.mutableBuffer.array()[i]
@@ -133,13 +133,13 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.minusAssign(value: Double) {
+    override fun Tensor<Double>.minusAssign(value: Double) {
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] -= value
         }
     }
 
-    override fun TensorStructure<Double>.minusAssign(other: TensorStructure<Double>) {
+    override fun Tensor<Double>.minusAssign(other: Tensor<Double>) {
         checkShapesCompatible(tensor, other)
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
@@ -147,16 +147,16 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         }
     }
 
-    override fun Double.times(other: TensorStructure<Double>): DoubleTensor {
+    override fun Double.times(other: Tensor<Double>): DoubleTensor {
         val resBuffer = DoubleArray(other.tensor.numElements) { i ->
             other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i] * this
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.times(value: Double): DoubleTensor = value * tensor
+    override fun Tensor<Double>.times(value: Double): DoubleTensor = value * tensor
 
-    override fun TensorStructure<Double>.times(other: TensorStructure<Double>): DoubleTensor {
+    override fun Tensor<Double>.times(other: Tensor<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
             tensor.mutableBuffer.array()[tensor.bufferStart + i] *
@@ -165,13 +165,13 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.timesAssign(value: Double) {
+    override fun Tensor<Double>.timesAssign(value: Double) {
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] *= value
         }
     }
 
-    override fun TensorStructure<Double>.timesAssign(other: TensorStructure<Double>) {
+    override fun Tensor<Double>.timesAssign(other: Tensor<Double>) {
         checkShapesCompatible(tensor, other)
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
@@ -179,21 +179,21 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         }
     }
 
-    override fun Double.div(other: TensorStructure<Double>): DoubleTensor {
+    override fun Double.div(other: Tensor<Double>): DoubleTensor {
         val resBuffer = DoubleArray(other.tensor.numElements) { i ->
             this / other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i]
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.div(value: Double): DoubleTensor {
+    override fun Tensor<Double>.div(value: Double): DoubleTensor {
         val resBuffer = DoubleArray(tensor.numElements) { i ->
             tensor.mutableBuffer.array()[tensor.bufferStart + i] / value
         }
         return DoubleTensor(shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.div(other: TensorStructure<Double>): DoubleTensor {
+    override fun Tensor<Double>.div(other: Tensor<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
             tensor.mutableBuffer.array()[other.tensor.bufferStart + i] /
@@ -202,13 +202,13 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.divAssign(value: Double) {
+    override fun Tensor<Double>.divAssign(value: Double) {
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] /= value
         }
     }
 
-    override fun TensorStructure<Double>.divAssign(other: TensorStructure<Double>) {
+    override fun Tensor<Double>.divAssign(other: Tensor<Double>) {
         checkShapesCompatible(tensor, other)
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] /=
@@ -216,14 +216,14 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         }
     }
 
-    override fun TensorStructure<Double>.unaryMinus(): DoubleTensor {
+    override fun Tensor<Double>.unaryMinus(): DoubleTensor {
         val resBuffer = DoubleArray(tensor.numElements) { i ->
             tensor.mutableBuffer.array()[tensor.bufferStart + i].unaryMinus()
         }
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun TensorStructure<Double>.transpose(i: Int, j: Int): DoubleTensor {
+    override fun Tensor<Double>.transpose(i: Int, j: Int): DoubleTensor {
         val ii = tensor.minusIndex(i)
         val jj = tensor.minusIndex(j)
         checkTranspose(tensor.dimension, ii, jj)
@@ -248,16 +248,16 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     }
 
 
-    override fun TensorStructure<Double>.view(shape: IntArray): DoubleTensor {
+    override fun Tensor<Double>.view(shape: IntArray): DoubleTensor {
         checkView(tensor, shape)
         return DoubleTensor(shape, tensor.mutableBuffer.array(), tensor.bufferStart)
     }
 
-    override fun TensorStructure<Double>.viewAs(other: TensorStructure<Double>): DoubleTensor {
+    override fun Tensor<Double>.viewAs(other: Tensor<Double>): DoubleTensor {
         return tensor.view(other.shape)
     }
 
-    override infix fun TensorStructure<Double>.dot(other: TensorStructure<Double>): DoubleTensor {
+    override infix fun Tensor<Double>.dot(other: Tensor<Double>): DoubleTensor {
         if (tensor.shape.size == 1 && other.shape.size == 1) {
             return DoubleTensor(intArrayOf(1), doubleArrayOf(tensor.times(other).tensor.mutableBuffer.array().sum()))
         }
@@ -309,7 +309,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return resTensor
     }
 
-    override fun diagonalEmbedding(diagonalEntries: TensorStructure<Double>, offset: Int, dim1: Int, dim2: Int):
+    override fun diagonalEmbedding(diagonalEntries: Tensor<Double>, offset: Int, dim1: Int, dim2: Int):
             DoubleTensor {
         val n = diagonalEntries.shape.size
         val d1 = minusIndexFrom(n + 1, dim1)
@@ -358,7 +358,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     }
 
 
-    public fun TensorStructure<Double>.map(transform: (Double) -> Double): DoubleTensor {
+    public fun Tensor<Double>.map(transform: (Double) -> Double): DoubleTensor {
         return DoubleTensor(
             tensor.shape,
             tensor.mutableBuffer.array().map { transform(it) }.toDoubleArray(),
@@ -366,14 +366,14 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         )
     }
 
-    public fun TensorStructure<Double>.eq(other: TensorStructure<Double>, epsilon: Double): Boolean {
+    public fun Tensor<Double>.eq(other: Tensor<Double>, epsilon: Double): Boolean {
         return tensor.eq(other) { x, y -> abs(x - y) < epsilon }
     }
 
-    public infix fun TensorStructure<Double>.eq(other: TensorStructure<Double>): Boolean = tensor.eq(other, 1e-5)
+    public infix fun Tensor<Double>.eq(other: Tensor<Double>): Boolean = tensor.eq(other, 1e-5)
 
-    private fun TensorStructure<Double>.eq(
-        other: TensorStructure<Double>,
+    private fun Tensor<Double>.eq(
+        other: Tensor<Double>,
         eqFunction: (Double, Double) -> Boolean
     ): Boolean {
         checkShapesCompatible(tensor, other)
@@ -396,7 +396,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     public fun randomNormal(shape: IntArray, seed: Long = 0): DoubleTensor =
         DoubleTensor(shape, getRandomNormals(shape.reduce(Int::times), seed))
 
-    public fun TensorStructure<Double>.randomNormalLike(seed: Long = 0): DoubleTensor =
+    public fun Tensor<Double>.randomNormalLike(seed: Long = 0): DoubleTensor =
         DoubleTensor(tensor.shape, getRandomNormals(tensor.shape.reduce(Int::times), seed))
 
     // stack tensors by axis 0
@@ -412,7 +412,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     }
 
     // build tensor from this rows by given indices
-    public fun TensorStructure<Double>.rowsByIndices(indices: IntArray): DoubleTensor {
+    public fun Tensor<Double>.rowsByIndices(indices: IntArray): DoubleTensor {
         return stack(indices.map { this[it] })
     }
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
index b1c12ccde..f8bd5027a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.tensors.api.TensorStructure
+import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
 import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 
@@ -20,7 +20,7 @@ internal fun checkBufferShapeConsistency(shape: IntArray, buffer: DoubleArray) =
         "Inconsistent shape ${shape.toList()} for buffer of size ${buffer.size} provided"
     }
 
-internal fun <T> checkShapesCompatible(a: TensorStructure<T>, b: TensorStructure<T>) =
+internal fun <T> checkShapesCompatible(a: Tensor<T>, b: Tensor<T>) =
     check(a.shape contentEquals b.shape) {
         "Incompatible shapes ${a.shape.toList()} and ${b.shape.toList()} "
     }
@@ -30,7 +30,7 @@ internal fun checkTranspose(dim: Int, i: Int, j: Int) =
         "Cannot transpose $i to $j for a tensor of dim $dim"
     }
 
-internal fun <T> checkView(a: TensorStructure<T>, shape: IntArray) =
+internal fun <T> checkView(a: Tensor<T>, shape: IntArray) =
     check(a.shape.reduce(Int::times) == shape.reduce(Int::times))
 
 internal fun checkSquareMatrix(shape: IntArray) {
@@ -44,7 +44,7 @@ internal fun checkSquareMatrix(shape: IntArray) {
 }
 
 internal fun DoubleTensorAlgebra.checkSymmetric(
-    tensor: TensorStructure<Double>, epsilon: Double = 1e-6
+    tensor: Tensor<Double>, epsilon: Double = 1e-6
 ) =
     check(tensor.eq(tensor.transpose(), epsilon)) {
         "Tensor is not symmetric about the last 2 dimensions at precision $epsilon"
-- 
2.34.1


From f0627b2ced8cba0c641cb40a0bd10184b336b657 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Mon, 3 May 2021 00:24:32 +0700
Subject: [PATCH 176/713] Simplify and revise test cases for MST compilation
 engines #285

---
 ...TestCompilerConsistencyWithInterpreter.kt} | 24 ++---
 .../kmath/ast/TestCompilerOperations.kt       | 65 +++++++++++++
 .../kmath/ast/TestCompilerVariables.kt}       | 14 +--
 .../ast/{ParserTest.kt => TestParser.kt}      |  2 +-
 ...cedenceTest.kt => TestParserPrecedence.kt} |  2 +-
 .../kotlin/space/kscience/kmath/ast/utils.kt  | 25 +++++
 .../kotlin/space/kscience/kmath/ast/utils.kt  | 39 ++++++++
 .../TestESTreeConsistencyWithInterpreter.kt   | 97 -------------------
 .../estree/TestESTreeOperationsSupport.kt     | 42 --------
 .../kmath/estree/TestESTreeSpecialization.kt  | 76 ---------------
 .../kmath/estree/TestESTreeVariables.kt       | 34 -------
 .../kmath/wasm/TestWasmOperationsSupport.kt   | 42 --------
 .../kmath/wasm/TestWasmSpecialization.kt      | 76 ---------------
 .../asm/TestAsmConsistencyWithInterpreter.kt  | 97 -------------------
 .../kmath/asm/TestAsmOperationsSupport.kt     | 42 --------
 .../kmath/asm/TestAsmSpecialization.kt        | 76 ---------------
 .../kscience/kmath/asm/TestAsmVariables.kt    | 34 -------
 .../kotlin/space/kscience/kmath/ast/utils.kt  | 25 +++++
 18 files changed, 171 insertions(+), 641 deletions(-)
 rename kmath-ast/src/{jsTest/kotlin/space/kscience/kmath/wasm/TestWasmConsistencyWithInterpreter.kt => commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt} (76%)
 create mode 100644 kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
 rename kmath-ast/src/{jsTest/kotlin/space/kscience/kmath/wasm/TestWasmVariables.kt => commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt} (76%)
 rename kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/{ParserTest.kt => TestParser.kt} (98%)
 rename kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/{ParserPrecedenceTest.kt => TestParserPrecedence.kt} (96%)
 create mode 100644 kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
 create mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
 delete mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeConsistencyWithInterpreter.kt
 delete mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeOperationsSupport.kt
 delete mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeSpecialization.kt
 delete mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeVariables.kt
 delete mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmOperationsSupport.kt
 delete mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecialization.kt
 delete mode 100644 kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmConsistencyWithInterpreter.kt
 delete mode 100644 kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmOperationsSupport.kt
 delete mode 100644 kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmSpecialization.kt
 delete mode 100644 kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmVariables.kt
 create mode 100644 kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt

diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmConsistencyWithInterpreter.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
similarity index 76%
rename from kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmConsistencyWithInterpreter.kt
rename to kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
index f3e0726d6..0d018070c 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmConsistencyWithInterpreter.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
@@ -3,12 +3,12 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.wasm
+package space.kscience.kmath.ast
 
 import space.kscience.kmath.expressions.MstField
 import space.kscience.kmath.expressions.MstRing
 import space.kscience.kmath.expressions.interpret
-import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.misc.Symbol.Companion.x
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.operations.bindSymbol
@@ -16,45 +16,41 @@ import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-internal class TestWasmConsistencyWithInterpreter {
+internal class TestCompilerConsistencyWithInterpreter {
     @Test
-    fun intRing() {
+    fun intRing() = runCompilerTest {
         val mst = MstRing {
             binaryOperationFunction("+")(
                 unaryOperationFunction("+")(
                     (bindSymbol(x) - (2.toByte() + (scale(
                         add(number(1), number(1)),
-                        2.0
+                        2.0,
                     ) + 1.toByte()))) * 3.0 - 1.toByte()
                 ),
 
-                number(1)
+                number(1),
             ) * number(2)
         }
 
         assertEquals(
             mst.interpret(IntRing, x to 3),
-            mst.compile(IntRing, x to 3)
+            mst.compile(IntRing, x to 3),
         )
     }
 
     @Test
-    fun doubleField() {
+    fun doubleField() = runCompilerTest {
         val mst = MstField {
             +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
                 (3.0 - (bindSymbol(x) + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
                         + number(1),
-                number(1) / 2 + number(2.0) * one
+                number(1) / 2 + number(2.0) * one,
             ) + zero
         }
 
         assertEquals(
             mst.interpret(DoubleField, x to 2.0),
-            mst.compile(DoubleField, x to 2.0)
+            mst.compile(DoubleField, x to 2.0),
         )
     }
-
-    private companion object {
-        private val x by symbol
-    }
 }
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
new file mode 100644
index 000000000..7d2af31c2
--- /dev/null
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast
+
+import space.kscience.kmath.expressions.MstExtendedField
+import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.misc.Symbol.Companion.x
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.bindSymbol
+import space.kscience.kmath.operations.invoke
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+internal class TestCompilerOperations {
+    @Test
+    fun testUnaryPlus() = runCompilerTest {
+        val expr = MstExtendedField { +bindSymbol(x) }.compileToExpression(DoubleField)
+        assertEquals(2.0, expr(x to 2.0))
+    }
+
+    @Test
+    fun testUnaryMinus() = runCompilerTest {
+        val expr = MstExtendedField { -bindSymbol(x) }.compileToExpression(DoubleField)
+        assertEquals(-2.0, expr(x to 2.0))
+    }
+
+    @Test
+    fun testAdd() = runCompilerTest {
+        val expr = MstExtendedField { bindSymbol(x) + bindSymbol(x) }.compileToExpression(DoubleField)
+        assertEquals(4.0, expr(x to 2.0))
+    }
+
+    @Test
+    fun testSine() = runCompilerTest {
+        val expr = MstExtendedField { sin(bindSymbol(x)) }.compileToExpression(DoubleField)
+        assertEquals(0.0, expr(x to 0.0))
+    }
+
+    @Test
+    fun testCosine() = runCompilerTest {
+        val expr = MstExtendedField { cos(bindSymbol(x)) }.compileToExpression(DoubleField)
+        assertEquals(1.0, expr(x to 0.0))
+    }
+
+    @Test
+    fun testSubtract() = runCompilerTest {
+        val expr = MstExtendedField { bindSymbol(x) - bindSymbol(x) }.compileToExpression(DoubleField)
+        assertEquals(0.0, expr(x to 2.0))
+    }
+
+    @Test
+    fun testDivide() = runCompilerTest {
+        val expr = MstExtendedField { bindSymbol(x) / bindSymbol(x) }.compileToExpression(DoubleField)
+        assertEquals(1.0, expr(x to 2.0))
+    }
+
+    @Test
+    fun testPower() = runCompilerTest {
+        val expr = MstExtendedField { bindSymbol(x) pow 2 }.compileToExpression(DoubleField)
+        assertEquals(4.0, expr(x to 2.0))
+    }
+}
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmVariables.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
similarity index 76%
rename from kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmVariables.kt
rename to kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
index 406ba8c8d..ecf8ed367 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmVariables.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
@@ -3,11 +3,11 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.wasm
+package space.kscience.kmath.ast
 
 import space.kscience.kmath.expressions.MstRing
 import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.misc.Symbol.Companion.x
 import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
@@ -15,20 +15,16 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
-internal class TestWasmVariables {
+internal class TestCompilerVariables {
     @Test
-    fun testVariable() {
+    fun testVariable() = runCompilerTest {
         val expr = MstRing { bindSymbol(x) }.compileToExpression(IntRing)
         assertEquals(1, expr(x to 1))
     }
 
     @Test
-    fun testUndefinedVariableFails() {
+    fun testUndefinedVariableFails() = runCompilerTest {
         val expr = MstRing { bindSymbol(x) }.compileToExpression(IntRing)
         assertFailsWith<NoSuchElementException> { expr() }
     }
-
-    private companion object {
-        private val x by symbol
-    }
 }
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserTest.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
similarity index 98%
rename from kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserTest.kt
rename to kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
index 185659a1f..b838245e1 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserTest.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
@@ -13,7 +13,7 @@ import space.kscience.kmath.operations.DoubleField
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-internal class ParserTest {
+internal class TestParser {
     @Test
     fun evaluateParsedMst() {
         val mst = "2+2*(2+2)".parseMath()
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserPrecedenceTest.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
similarity index 96%
rename from kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserPrecedenceTest.kt
rename to kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
index 67d77839a..bb6bb3ce1 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/ParserPrecedenceTest.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
@@ -10,7 +10,7 @@ import space.kscience.kmath.operations.DoubleField
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-internal class ParserPrecedenceTest {
+internal class TestParserPrecedence {
     @Test
     fun test1(): Unit = assertEquals(6.0, f.evaluate("2*2+2".parseMath()))
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
new file mode 100644
index 000000000..abeaed0f8
--- /dev/null
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast
+
+import space.kscience.kmath.expressions.Expression
+import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.IntRing
+
+internal interface CompilerTestContext {
+    fun MST.compileToExpression(algebra: IntRing): Expression<Int>
+    fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int
+    fun MST.compile(algebra: IntRing, vararg arguments: Pair<Symbol, Int>): Int = compile(algebra, mapOf(*arguments))
+    fun MST.compileToExpression(algebra: DoubleField): Expression<Double>
+    fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Double
+
+    fun MST.compile(algebra: DoubleField, vararg arguments: Pair<Symbol, Double>): Double =
+        compile(algebra, mapOf(*arguments))
+}
+
+internal expect inline fun runCompilerTest(action: CompilerTestContext.() -> Unit)
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
new file mode 100644
index 000000000..6b5b1b83d
--- /dev/null
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast
+
+import space.kscience.kmath.expressions.Expression
+import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.IntRing
+import space.kscience.kmath.estree.compile as estreeCompile
+import space.kscience.kmath.estree.compileToExpression as estreeCompileToExpression
+import space.kscience.kmath.wasm.compile as wasmCompile
+import space.kscience.kmath.wasm.compileToExpression as wasmCompileToExpression
+
+private object WasmCompilerTestContext : CompilerTestContext {
+    override fun MST.compileToExpression(algebra: IntRing): Expression<Int> = wasmCompileToExpression(algebra)
+    override fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int = wasmCompile(algebra, arguments)
+    override fun MST.compileToExpression(algebra: DoubleField): Expression<Double> = wasmCompileToExpression(algebra)
+
+    override fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Double =
+        wasmCompile(algebra, arguments)
+}
+
+private object ESTreeCompilerTestContext : CompilerTestContext {
+    override fun MST.compileToExpression(algebra: IntRing): Expression<Int> = estreeCompileToExpression(algebra)
+    override fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int = estreeCompile(algebra, arguments)
+    override fun MST.compileToExpression(algebra: DoubleField): Expression<Double> = estreeCompileToExpression(algebra)
+
+    override fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Double =
+        estreeCompile(algebra, arguments)
+}
+
+internal actual inline fun runCompilerTest(action: CompilerTestContext.() -> Unit) {
+    action(WasmCompilerTestContext)
+    action(ESTreeCompilerTestContext)
+}
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeConsistencyWithInterpreter.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeConsistencyWithInterpreter.kt
deleted file mode 100644
index d80318db8..000000000
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeConsistencyWithInterpreter.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.estree
-
-import space.kscience.kmath.complex.ComplexField
-import space.kscience.kmath.complex.toComplex
-import space.kscience.kmath.expressions.*
-import space.kscience.kmath.misc.symbol
-import space.kscience.kmath.operations.ByteRing
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.bindSymbol
-import space.kscience.kmath.operations.invoke
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-internal class TestESTreeConsistencyWithInterpreter {
-    @Test
-    fun mstSpace() {
-        val mst = MstGroup {
-            binaryOperationFunction("+")(
-                unaryOperationFunction("+")(
-                    number(3.toByte()) - (number(2.toByte()) + (scale(
-                        add(number(1), number(1)),
-                        2.0
-                    ) + number(1.toByte()) * 3.toByte() - number(1.toByte())))
-                ),
-
-                number(1)
-            ) + bindSymbol(x) + zero
-        }
-
-        assertEquals(
-            mst.interpret(MstGroup, x to MST.Numeric(2)),
-            mst.compile(MstGroup, x to MST.Numeric(2))
-        )
-    }
-
-    @Test
-    fun byteRing() {
-        val mst = MstRing {
-            binaryOperationFunction("+")(
-                unaryOperationFunction("+")(
-                    (bindSymbol(x) - (2.toByte() + (scale(
-                        add(number(1), number(1)),
-                        2.0
-                    ) + 1.toByte()))) * 3.0 - 1.toByte()
-                ),
-
-                number(1)
-            ) * number(2)
-        }
-
-        assertEquals(
-            mst.interpret(ByteRing, x to 3.toByte()),
-            mst.compile(ByteRing, x to 3.toByte())
-        )
-    }
-
-    @Test
-    fun doubleField() {
-        val mst = MstField {
-            +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
-                (3.0 - (bindSymbol(x) + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
-                        + number(1),
-                number(1) / 2 + number(2.0) * one
-            ) + zero
-        }
-
-        assertEquals(
-            mst.interpret(DoubleField, x to 2.0),
-            mst.compile(DoubleField, x to 2.0)
-        )
-    }
-
-    @Test
-    fun complexField() {
-        val mst = MstField {
-            +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
-                (3.0 - (bindSymbol(x) + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
-                        + number(1),
-                number(1) / 2 + number(2.0) * one
-            ) + zero
-        }
-
-        assertEquals(
-            mst.interpret(ComplexField, x to 2.0.toComplex()),
-            mst.compile(ComplexField, x to 2.0.toComplex()),
-        )
-    }
-
-    private companion object {
-        private val x by symbol
-    }
-}
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeOperationsSupport.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeOperationsSupport.kt
deleted file mode 100644
index a0b68a811..000000000
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeOperationsSupport.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.estree
-
-import space.kscience.kmath.expressions.MstField
-import space.kscience.kmath.expressions.MstGroup
-import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.symbol
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.bindSymbol
-import space.kscience.kmath.operations.invoke
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-internal class TestESTreeOperationsSupport {
-    @Test
-    fun testUnaryOperationInvocation() {
-        val expression = MstGroup { -bindSymbol(x) }.compileToExpression(DoubleField)
-        val res = expression(x to 2.0)
-        assertEquals(-2.0, res)
-    }
-
-    @Test
-    fun testBinaryOperationInvocation() {
-        val expression = MstGroup { -bindSymbol(x) + number(1.0) }.compileToExpression(DoubleField)
-        val res = expression(x to 2.0)
-        assertEquals(-1.0, res)
-    }
-
-    @Test
-    fun testConstProductInvocation() {
-        val res = MstField { bindSymbol(x) * 2 }.compileToExpression(DoubleField)(x to 2.0)
-        assertEquals(4.0, res)
-    }
-
-    private companion object {
-        private val x by symbol
-    }
-}
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeSpecialization.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeSpecialization.kt
deleted file mode 100644
index 6756fd8c7..000000000
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeSpecialization.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.estree
-
-import space.kscience.kmath.expressions.MstExtendedField
-import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.symbol
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.bindSymbol
-import space.kscience.kmath.operations.invoke
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-internal class TestESTreeSpecialization {
-    @Test
-    fun testUnaryPlus() {
-        val expr = MstExtendedField { unaryOperationFunction("+")(bindSymbol(x)) }.compileToExpression(DoubleField)
-        assertEquals(2.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testUnaryMinus() {
-        val expr = MstExtendedField { unaryOperationFunction("-")(bindSymbol(x)) }.compileToExpression(DoubleField)
-        assertEquals(-2.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testAdd() {
-        val expr = MstExtendedField {
-            binaryOperationFunction("+")(
-                bindSymbol(x),
-                bindSymbol(x),
-            )
-        }.compileToExpression(DoubleField)
-        assertEquals(4.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testSine() {
-        val expr = MstExtendedField { unaryOperationFunction("sin")(bindSymbol(x)) }.compileToExpression(DoubleField)
-        assertEquals(0.0, expr(x to 0.0))
-    }
-
-    @Test
-    fun testSubtract() {
-        val expr = MstExtendedField {
-            binaryOperationFunction("-")(bindSymbol(x),
-                bindSymbol(x))
-        }.compileToExpression(DoubleField)
-        assertEquals(0.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testDivide() {
-        val expr = MstExtendedField {
-            binaryOperationFunction("/")(bindSymbol(x), bindSymbol(x))
-        }.compileToExpression(DoubleField)
-        assertEquals(1.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testPower() {
-        val expr = MstExtendedField {
-            binaryOperationFunction("pow")(bindSymbol(x), number(2))
-        }.compileToExpression(DoubleField)
-
-        assertEquals(4.0, expr(x to 2.0))
-    }
-
-    private companion object {
-        private val x by symbol
-    }
-}
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeVariables.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeVariables.kt
deleted file mode 100644
index e1830d9df..000000000
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeVariables.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.estree
-
-import space.kscience.kmath.expressions.MstRing
-import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.symbol
-import space.kscience.kmath.operations.ByteRing
-import space.kscience.kmath.operations.bindSymbol
-import space.kscience.kmath.operations.invoke
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
-
-internal class TestESTreeVariables {
-    @Test
-    fun testVariable() {
-        val expr = MstRing { bindSymbol(x) }.compileToExpression(ByteRing)
-        assertEquals(1.toByte(), expr(x to 1.toByte()))
-    }
-
-    @Test
-    fun testUndefinedVariableFails() {
-        val expr = MstRing { bindSymbol(x) }.compileToExpression(ByteRing)
-        assertFailsWith<NoSuchElementException> { expr() }
-    }
-
-    private companion object {
-        private val x by symbol
-    }
-}
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmOperationsSupport.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmOperationsSupport.kt
deleted file mode 100644
index 2946592f4..000000000
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmOperationsSupport.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.wasm
-
-import space.kscience.kmath.expressions.MstField
-import space.kscience.kmath.expressions.MstGroup
-import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.symbol
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.bindSymbol
-import space.kscience.kmath.operations.invoke
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-internal class TestWasmOperationsSupport {
-    @Test
-    fun testUnaryOperationInvocation() {
-        val expression = MstGroup { -bindSymbol(x) }.compileToExpression(DoubleField)
-        val res = expression(x to 2.0)
-        assertEquals(-2.0, res)
-    }
-
-    @Test
-    fun testBinaryOperationInvocation() {
-        val expression = MstGroup { -bindSymbol(x) + number(1.0) }.compileToExpression(DoubleField)
-        val res = expression(x to 2.0)
-        assertEquals(-1.0, res)
-    }
-
-    @Test
-    fun testConstProductInvocation() {
-        val res = MstField { bindSymbol(x) * 2 }.compileToExpression(DoubleField)(x to 2.0)
-        assertEquals(4.0, res)
-    }
-
-    private companion object {
-        private val x by symbol
-    }
-}
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecialization.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecialization.kt
deleted file mode 100644
index e1f7b603a..000000000
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecialization.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.wasm
-
-import space.kscience.kmath.expressions.MstExtendedField
-import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.symbol
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.bindSymbol
-import space.kscience.kmath.operations.invoke
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-internal class TestWasmSpecialization {
-    @Test
-    fun testUnaryPlus() {
-        val expr = MstExtendedField { unaryOperationFunction("+")(bindSymbol(x)) }.compileToExpression(DoubleField)
-        assertEquals(2.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testUnaryMinus() {
-        val expr = MstExtendedField { unaryOperationFunction("-")(bindSymbol(x)) }.compileToExpression(DoubleField)
-        assertEquals(-2.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testAdd() {
-        val expr = MstExtendedField {
-            binaryOperationFunction("+")(
-                bindSymbol(x),
-                bindSymbol(x),
-            )
-        }.compileToExpression(DoubleField)
-        assertEquals(4.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testSine() {
-        val expr = MstExtendedField { unaryOperationFunction("sin")(bindSymbol(x)) }.compileToExpression(DoubleField)
-        assertEquals(0.0, expr(x to 0.0))
-    }
-
-    @Test
-    fun testSubtract() {
-        val expr = MstExtendedField {
-            binaryOperationFunction("-")(bindSymbol(x),
-                bindSymbol(x))
-        }.compileToExpression(DoubleField)
-        assertEquals(0.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testDivide() {
-        val expr = MstExtendedField {
-            binaryOperationFunction("/")(bindSymbol(x), bindSymbol(x))
-        }.compileToExpression(DoubleField)
-        assertEquals(1.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testPower() {
-        val expr = MstExtendedField {
-            binaryOperationFunction("pow")(bindSymbol(x), number(2))
-        }.compileToExpression(DoubleField)
-
-        assertEquals(4.0, expr(x to 2.0))
-    }
-
-    private companion object {
-        private val x by symbol
-    }
-}
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmConsistencyWithInterpreter.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmConsistencyWithInterpreter.kt
deleted file mode 100644
index f94d36602..000000000
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmConsistencyWithInterpreter.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.asm
-
-import space.kscience.kmath.complex.ComplexField
-import space.kscience.kmath.complex.toComplex
-import space.kscience.kmath.expressions.*
-import space.kscience.kmath.misc.symbol
-import space.kscience.kmath.operations.ByteRing
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.bindSymbol
-import space.kscience.kmath.operations.invoke
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-internal class TestAsmConsistencyWithInterpreter {
-    @Test
-    fun mstSpace() {
-        val mst = MstGroup {
-            binaryOperationFunction("+")(
-                unaryOperationFunction("+")(
-                    number(3.toByte()) - (number(2.toByte()) + (scale(
-                        add(number(1), number(1)),
-                        2.0
-                    ) + number(1.toByte()) * 3.toByte() - number(1.toByte())))
-                ),
-
-                number(1)
-            ) + bindSymbol(x) + zero
-        }
-
-        assertEquals(
-            mst.interpret(MstGroup, x to MST.Numeric(2)),
-            mst.compile(MstGroup, x to MST.Numeric(2))
-        )
-    }
-
-    @Test
-    fun byteRing() {
-        val mst = MstRing {
-            binaryOperationFunction("+")(
-                unaryOperationFunction("+")(
-                    (bindSymbol(x) - (2.toByte() + (scale(
-                        add(number(1), number(1)),
-                        2.0
-                    ) + 1.toByte()))) * 3.0 - 1.toByte()
-                ),
-
-                number(1)
-            ) * number(2)
-        }
-
-        assertEquals(
-            mst.interpret(ByteRing, x to 3.toByte()),
-            mst.compile(ByteRing, x to 3.toByte())
-        )
-    }
-
-    @Test
-    fun doubleField() {
-        val mst = MstField {
-            +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
-                (3.0 - (bindSymbol(x) + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
-                        + number(1),
-                number(1) / 2 + number(2.0) * one
-            ) + zero
-        }
-
-        assertEquals(
-            mst.interpret(DoubleField, x to 2.0),
-            mst.compile(DoubleField, x to 2.0)
-        )
-    }
-
-    @Test
-    fun complexField() {
-        val mst = MstField {
-            +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
-                (3.0 - (bindSymbol(x) + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
-                        + number(1),
-                number(1) / 2 + number(2.0) * one
-            ) + zero
-        }
-
-        assertEquals(
-            mst.interpret(ComplexField, x to 2.0.toComplex()),
-            mst.compile(ComplexField, x to 2.0.toComplex())
-        )
-    }
-
-    private companion object {
-        private val x by symbol
-    }
-}
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmOperationsSupport.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmOperationsSupport.kt
deleted file mode 100644
index 147639f7c..000000000
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmOperationsSupport.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.asm
-
-import space.kscience.kmath.expressions.MstField
-import space.kscience.kmath.expressions.MstGroup
-import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.symbol
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.bindSymbol
-import space.kscience.kmath.operations.invoke
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-internal class TestAsmOperationsSupport {
-    @Test
-    fun testUnaryOperationInvocation() {
-        val expression = MstGroup { -bindSymbol(x) }.compileToExpression(DoubleField)
-        val res = expression(x to 2.0)
-        assertEquals(-2.0, res)
-    }
-
-    @Test
-    fun testBinaryOperationInvocation() {
-        val expression = MstGroup { -bindSymbol(x) + number(1.0) }.compileToExpression(DoubleField)
-        val res = expression(x to 2.0)
-        assertEquals(-1.0, res)
-    }
-
-    @Test
-    fun testConstProductInvocation() {
-        val res = MstField { bindSymbol(x) * 2 }.compileToExpression(DoubleField)(x to 2.0)
-        assertEquals(4.0, res)
-    }
-
-    private companion object {
-        private val x by symbol
-    }
-}
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmSpecialization.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmSpecialization.kt
deleted file mode 100644
index 3a681e482..000000000
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmSpecialization.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.asm
-
-import space.kscience.kmath.expressions.MstExtendedField
-import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.symbol
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.bindSymbol
-import space.kscience.kmath.operations.invoke
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-internal class TestAsmSpecialization {
-    @Test
-    fun testUnaryPlus() {
-        val expr = MstExtendedField { unaryOperationFunction("+")(bindSymbol(x)) }.compileToExpression(DoubleField)
-        assertEquals(2.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testUnaryMinus() {
-        val expr = MstExtendedField { unaryOperationFunction("-")(bindSymbol(x)) }.compileToExpression(DoubleField)
-        assertEquals(-2.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testAdd() {
-        val expr = MstExtendedField {
-            binaryOperationFunction("+")(
-                bindSymbol(x),
-                bindSymbol(x),
-            )
-        }.compileToExpression(DoubleField)
-        assertEquals(4.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testSine() {
-        val expr = MstExtendedField { unaryOperationFunction("sin")(bindSymbol(x)) }.compileToExpression(DoubleField)
-        assertEquals(0.0, expr(x to 0.0))
-    }
-
-    @Test
-    fun testSubtract() {
-        val expr = MstExtendedField {
-            binaryOperationFunction("-")(bindSymbol(x),
-                bindSymbol(x))
-        }.compileToExpression(DoubleField)
-        assertEquals(0.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testDivide() {
-        val expr = MstExtendedField {
-            binaryOperationFunction("/")(bindSymbol(x), bindSymbol(x))
-        }.compileToExpression(DoubleField)
-        assertEquals(1.0, expr(x to 2.0))
-    }
-
-    @Test
-    fun testPower() {
-        val expr = MstExtendedField {
-            binaryOperationFunction("pow")(bindSymbol(x), number(2))
-        }.compileToExpression(DoubleField)
-
-        assertEquals(4.0, expr(x to 2.0))
-    }
-
-    private companion object {
-        private val x by symbol
-    }
-}
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmVariables.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmVariables.kt
deleted file mode 100644
index 89b98d720..000000000
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/asm/TestAsmVariables.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.asm
-
-import space.kscience.kmath.expressions.MstRing
-import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.symbol
-import space.kscience.kmath.operations.ByteRing
-import space.kscience.kmath.operations.bindSymbol
-import space.kscience.kmath.operations.invoke
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
-
-internal class TestAsmVariables {
-    @Test
-    fun testVariable() {
-        val expr = MstRing { bindSymbol(x) }.compileToExpression(ByteRing)
-        assertEquals(1.toByte(), expr(x to 1.toByte()))
-    }
-
-    @Test
-    fun testUndefinedVariableFails() {
-        val expr = MstRing { bindSymbol(x) }.compileToExpression(ByteRing)
-        assertFailsWith<NoSuchElementException> { expr() }
-    }
-
-    private companion object {
-        private val x by symbol
-    }
-}
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
new file mode 100644
index 000000000..607c5fdd6
--- /dev/null
+++ b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast
+
+import space.kscience.kmath.expressions.Expression
+import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.IntRing
+import space.kscience.kmath.asm.compile as asmCompile
+import space.kscience.kmath.asm.compileToExpression as asmCompileToExpression
+
+private object AsmCompilerTestContext : CompilerTestContext {
+    override fun MST.compileToExpression(algebra: IntRing): Expression<Int> = asmCompileToExpression(algebra)
+    override fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int = asmCompile(algebra, arguments)
+    override fun MST.compileToExpression(algebra: DoubleField): Expression<Double> = asmCompileToExpression(algebra)
+
+    override fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Double =
+        asmCompile(algebra, arguments)
+}
+
+internal actual inline fun runCompilerTest(action: CompilerTestContext.() -> Unit) = action(AsmCompilerTestContext)
-- 
2.34.1


From 8898f908ef6cd6a3ce9458af13cc9abe160e8649 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Mon, 3 May 2021 18:45:18 +0300
Subject: [PATCH 177/713] statistic algebra

---
 .../tensors/api/StatisticTensorAlgebra.kt     | 137 ++++++++++++++++++
 .../algebras/DoubleStatisticTensorAlgebra.kt  | 105 ++++++++++++++
 2 files changed, 242 insertions(+)
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/StatisticTensorAlgebra.kt
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleStatisticTensorAlgebra.kt

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/StatisticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/StatisticTensorAlgebra.kt
new file mode 100644
index 000000000..e3a2a1124
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/StatisticTensorAlgebra.kt
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.api
+
+import space.kscience.kmath.tensors.core.DoubleTensor
+
+/**
+ * Common algebra with statistics methods. Operates on [Tensor].
+ *
+ * @param T the type of items closed under division in the tensors.
+ */
+
+public interface StatisticTensorAlgebra<T>: TensorAlgebra<T> {
+
+    /**
+     * Returns the minimum value of all elements in the input tensor.
+     *
+     * @return the minimum value of all elements in the input tensor.
+     */
+    public fun Tensor<T>.min(): Double
+
+    /**
+     * Returns the minimum value of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the minimum value of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.min(dim: Int, keepDim: Boolean): DoubleTensor
+
+    /**
+     * Returns the maximum value of all elements in the input tensor.
+     *
+     * @return the maximum value of all elements in the input tensor.
+     */
+    public fun Tensor<T>.max(): Double
+
+    /**
+     * Returns the maximum value of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the maximum value of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.max(dim: Int, keepDim: Boolean): DoubleTensor
+
+    /**
+     * Returns the sum of all elements in the input tensor.
+     *
+     * @return the sum of all elements in the input tensor.
+     */
+    public fun Tensor<T>.sum(): Double
+
+    /**
+     * Returns the sum of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the sum of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.sum(dim: Int, keepDim: Boolean): DoubleTensor
+
+    /**
+     * Returns the mean of all elements in the input tensor.
+     *
+     * @return the mean of all elements in the input tensor.
+     */
+    public fun Tensor<T>.mean(): Double
+
+    /**
+     * Returns the mean of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the mean of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.mean(dim: Int, keepDim: Boolean): DoubleTensor
+
+    /**
+     * Returns the standard deviation of all elements in the input tensor.
+     *
+     * @return the standard deviation of all elements in the input tensor.
+     */
+    public fun Tensor<T>.std(): Double
+
+    /**
+     * Returns the standard deviation of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the standard deviation of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.std(dim: Int, keepDim: Boolean): DoubleTensor
+
+    /**
+     * Returns the variance of all elements in the input tensor.
+     *
+     * @return the variance of all elements in the input tensor.
+     */
+    public fun Tensor<T>.variance(): Double
+
+    /**
+     * Returns the variance of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the variance of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.variance(dim: Int, keepDim: Boolean): DoubleTensor
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleStatisticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleStatisticTensorAlgebra.kt
new file mode 100644
index 000000000..3914a0dfb
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleStatisticTensorAlgebra.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core.algebras
+
+import kotlin.math.sqrt
+
+import space.kscience.kmath.tensors.api.*
+import space.kscience.kmath.tensors.core.*
+import space.kscience.kmath.tensors.core.algebras.DoubleStatisticTensorAlgebra.max
+import space.kscience.kmath.tensors.core.algebras.DoubleStatisticTensorAlgebra.mean
+import space.kscience.kmath.tensors.core.algebras.DoubleStatisticTensorAlgebra.min
+import space.kscience.kmath.tensors.core.algebras.DoubleStatisticTensorAlgebra.sum
+import space.kscience.kmath.tensors.core.algebras.DoubleStatisticTensorAlgebra.variance
+
+public object DoubleStatisticTensorAlgebra : StatisticTensorAlgebra<Double>, DoubleTensorAlgebra() {
+
+    private fun Tensor<Double>.fold(foldFunction: (DoubleArray) -> Double): Double {
+        return foldFunction(this.tensor.toDoubleArray())
+    }
+
+    private fun Tensor<Double>.foldDim(
+        foldFunction: (DoubleArray) -> Double,
+        dim: Int,
+        keepDim: Boolean
+    ): DoubleTensor {
+        check(dim < dimension) { "Dimension $dim out of range $dimension" }
+        val resShape = if (keepDim) {
+            shape.take(dim).toIntArray() + intArrayOf(1) + shape.takeLast(dimension - dim - 1).toIntArray()
+        } else {
+            shape.take(dim).toIntArray() + shape.takeLast(dimension - dim - 1).toIntArray()
+        }
+        val resNumElements = resShape.reduce(Int::times)
+        val resTensor = DoubleTensor(resShape, DoubleArray(resNumElements) { 0.0 }, 0)
+        for (index in resTensor.linearStructure.indices()) {
+            val prefix = index.take(dim).toIntArray()
+            val suffix = index.takeLast(dimension - dim - 1).toIntArray()
+            resTensor[index] = foldFunction(DoubleArray(shape[dim]) { i ->
+                this[prefix + intArrayOf(i) + suffix]
+            })
+        }
+
+        return resTensor
+    }
+
+    override fun Tensor<Double>.min(): Double = this.fold { it.minOrNull()!! }
+
+    override fun Tensor<Double>.min(dim: Int, keepDim: Boolean): DoubleTensor =
+        foldDim({ x -> x.minOrNull()!! }, dim, keepDim)
+
+    override fun Tensor<Double>.max(): Double = this.fold { it.maxOrNull()!! }
+
+    override fun Tensor<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
+        foldDim({ x -> x.maxOrNull()!! }, dim, keepDim)
+
+    override fun Tensor<Double>.sum(): Double = this.fold { it.sum() }
+
+    override fun Tensor<Double>.sum(dim: Int, keepDim: Boolean): DoubleTensor =
+        foldDim({ x -> x.sum() }, dim, keepDim)
+
+    override fun Tensor<Double>.mean(): Double = this.fold { it.sum() / tensor.numElements }
+
+    override fun Tensor<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor =
+        foldDim(
+            { arr ->
+                check(dim < dimension) { "Dimension $dim out of range $dimension" }
+                arr.sum() / shape[dim]
+            },
+            dim,
+            keepDim
+        )
+
+    override fun Tensor<Double>.std(): Double = this.fold { arr ->
+        val mean = arr.sum() / tensor.numElements
+        sqrt(arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1))
+    }
+
+    override fun Tensor<Double>.std(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
+        { arr ->
+            check(dim < dimension) { "Dimension $dim out of range $dimension" }
+            val mean = arr.sum() / shape[dim]
+            sqrt(arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1))
+        },
+        dim,
+        keepDim
+    )
+
+    override fun Tensor<Double>.variance(): Double = this.fold { arr ->
+        val mean = arr.sum() / tensor.numElements
+        arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1)
+    }
+
+    override fun Tensor<Double>.variance(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
+        { arr ->
+            check(dim < dimension) { "Dimension $dim out of range $dimension" }
+            val mean = arr.sum() / shape[dim]
+            arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1)
+        },
+        dim,
+        keepDim
+    )
+
+}
\ No newline at end of file
-- 
2.34.1


From 7f8914d8eacb6fb09469fa18b7328fa16bfc2208 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Mon, 3 May 2021 20:42:18 +0300
Subject: [PATCH 178/713] fixes

---
 .../kmath/tensors/api/StatisticTensorAlgebra.kt | 17 ++---------------
 .../algebras/DoubleStatisticTensorAlgebra.kt    |  7 +++----
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/StatisticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/StatisticTensorAlgebra.kt
index e3a2a1124..d0b17af97 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/StatisticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/StatisticTensorAlgebra.kt
@@ -9,16 +9,12 @@ import space.kscience.kmath.tensors.core.DoubleTensor
 
 /**
  * Common algebra with statistics methods. Operates on [Tensor].
- *
- * @param T the type of items closed under division in the tensors.
  */
 
 public interface StatisticTensorAlgebra<T>: TensorAlgebra<T> {
 
     /**
      * Returns the minimum value of all elements in the input tensor.
-     *
-     * @return the minimum value of all elements in the input tensor.
      */
     public fun Tensor<T>.min(): Double
 
@@ -37,8 +33,6 @@ public interface StatisticTensorAlgebra<T>: TensorAlgebra<T> {
 
     /**
      * Returns the maximum value of all elements in the input tensor.
-     *
-     * @return the maximum value of all elements in the input tensor.
      */
     public fun Tensor<T>.max(): Double
 
@@ -57,8 +51,6 @@ public interface StatisticTensorAlgebra<T>: TensorAlgebra<T> {
 
     /**
      * Returns the sum of all elements in the input tensor.
-     *
-     * @return the sum of all elements in the input tensor.
      */
     public fun Tensor<T>.sum(): Double
 
@@ -77,8 +69,6 @@ public interface StatisticTensorAlgebra<T>: TensorAlgebra<T> {
 
     /**
      * Returns the mean of all elements in the input tensor.
-     *
-     * @return the mean of all elements in the input tensor.
      */
     public fun Tensor<T>.mean(): Double
 
@@ -97,8 +87,6 @@ public interface StatisticTensorAlgebra<T>: TensorAlgebra<T> {
 
     /**
      * Returns the standard deviation of all elements in the input tensor.
-     *
-     * @return the standard deviation of all elements in the input tensor.
      */
     public fun Tensor<T>.std(): Double
 
@@ -117,8 +105,6 @@ public interface StatisticTensorAlgebra<T>: TensorAlgebra<T> {
 
     /**
      * Returns the variance of all elements in the input tensor.
-     *
-     * @return the variance of all elements in the input tensor.
      */
     public fun Tensor<T>.variance(): Double
 
@@ -134,4 +120,5 @@ public interface StatisticTensorAlgebra<T>: TensorAlgebra<T> {
      * @return the variance of each row of the input tensor in the given dimension [dim].
      */
     public fun Tensor<T>.variance(dim: Int, keepDim: Boolean): DoubleTensor
-}
\ No newline at end of file
+
+}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleStatisticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleStatisticTensorAlgebra.kt
index 3914a0dfb..b455aff48 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleStatisticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleStatisticTensorAlgebra.kt
@@ -17,9 +17,8 @@ import space.kscience.kmath.tensors.core.algebras.DoubleStatisticTensorAlgebra.v
 
 public object DoubleStatisticTensorAlgebra : StatisticTensorAlgebra<Double>, DoubleTensorAlgebra() {
 
-    private fun Tensor<Double>.fold(foldFunction: (DoubleArray) -> Double): Double {
-        return foldFunction(this.tensor.toDoubleArray())
-    }
+    private fun Tensor<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
+        foldFunction(this.tensor.toDoubleArray())
 
     private fun Tensor<Double>.foldDim(
         foldFunction: (DoubleArray) -> Double,
@@ -102,4 +101,4 @@ public object DoubleStatisticTensorAlgebra : StatisticTensorAlgebra<Double>, Dou
         keepDim
     )
 
-}
\ No newline at end of file
+}
-- 
2.34.1


From b59e48410f07ad203820b9c581b5e9997bff9784 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 3 May 2021 19:49:23 +0100
Subject: [PATCH 179/713] More basic functionality, tests to come

---
 .../tensors/api/AnalyticTensorAlgebra.kt      |  95 +++++++++++++-
 .../tensors/api/StatisticTensorAlgebra.kt     | 124 ------------------
 .../kmath/tensors/api/TensorAlgebra.kt        |  20 +++
 .../algebras/DoubleAnalyticTensorAlgebra.kt   |  54 ++++++++
 .../algebras/DoubleStatisticTensorAlgebra.kt  | 104 ---------------
 .../core/algebras/DoubleTensorAlgebra.kt      |  36 ++++-
 6 files changed, 202 insertions(+), 231 deletions(-)
 delete mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/StatisticTensorAlgebra.kt
 delete mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleStatisticTensorAlgebra.kt

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index cd13e0752..f9b2df45c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -5,14 +5,107 @@
 
 package space.kscience.kmath.tensors.api
 
+
 /**
- * Element-wise analytic operations on [Tensor].
+ * Analytic operations on [Tensor].
  *
  * @param T the type of items closed under analytic functions in the tensors.
  */
 public interface AnalyticTensorAlgebra<T> :
     TensorPartialDivisionAlgebra<T> {
 
+
+    /**
+     * @return the minimum value of all elements in the input tensor.
+     */
+    public fun Tensor<T>.min(): T
+
+    /**
+     * Returns the minimum value of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the minimum value of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.min(dim: Int, keepDim: Boolean): Tensor<T>
+
+    /**
+     * @return the maximum value of all elements in the input tensor.
+     */
+    public fun Tensor<T>.max(): T
+
+    /**
+     * Returns the maximum value of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the maximum value of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.max(dim: Int, keepDim: Boolean): Tensor<T>
+
+
+    /**
+     * @return the mean of all elements in the input tensor.
+     */
+    public fun Tensor<T>.mean(): T
+
+    /**
+     * Returns the mean of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the mean of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.mean(dim: Int, keepDim: Boolean): Tensor<T>
+
+    /**
+     * @return the standard deviation of all elements in the input tensor.
+     */
+    public fun Tensor<T>.std(): T
+
+    /**
+     * Returns the standard deviation of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the standard deviation of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.std(dim: Int, keepDim: Boolean): Tensor<T>
+
+    /**
+     * @return the variance of all elements in the input tensor.
+     */
+    public fun Tensor<T>.variance(): T
+
+    /**
+     * Returns the variance of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the variance of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.variance(dim: Int, keepDim: Boolean): Tensor<T>
+
     //For information: https://pytorch.org/docs/stable/generated/torch.exp.html
     public fun Tensor<T>.exp(): Tensor<T>
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/StatisticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/StatisticTensorAlgebra.kt
deleted file mode 100644
index d0b17af97..000000000
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/StatisticTensorAlgebra.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.tensors.api
-
-import space.kscience.kmath.tensors.core.DoubleTensor
-
-/**
- * Common algebra with statistics methods. Operates on [Tensor].
- */
-
-public interface StatisticTensorAlgebra<T>: TensorAlgebra<T> {
-
-    /**
-     * Returns the minimum value of all elements in the input tensor.
-     */
-    public fun Tensor<T>.min(): Double
-
-    /**
-     * Returns the minimum value of each row of the input tensor in the given dimension [dim].
-     *
-     * If [keepDim] is true, the output tensor is of the same size as
-     * input except in the dimension [dim] where it is of size 1.
-     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
-     *
-     * @param dim the dimension to reduce.
-     * @param keepDim whether the output tensor has [dim] retained or not.
-     * @return the minimum value of each row of the input tensor in the given dimension [dim].
-     */
-    public fun Tensor<T>.min(dim: Int, keepDim: Boolean): DoubleTensor
-
-    /**
-     * Returns the maximum value of all elements in the input tensor.
-     */
-    public fun Tensor<T>.max(): Double
-
-    /**
-     * Returns the maximum value of each row of the input tensor in the given dimension [dim].
-     *
-     * If [keepDim] is true, the output tensor is of the same size as
-     * input except in the dimension [dim] where it is of size 1.
-     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
-     *
-     * @param dim the dimension to reduce.
-     * @param keepDim whether the output tensor has [dim] retained or not.
-     * @return the maximum value of each row of the input tensor in the given dimension [dim].
-     */
-    public fun Tensor<T>.max(dim: Int, keepDim: Boolean): DoubleTensor
-
-    /**
-     * Returns the sum of all elements in the input tensor.
-     */
-    public fun Tensor<T>.sum(): Double
-
-    /**
-     * Returns the sum of each row of the input tensor in the given dimension [dim].
-     *
-     * If [keepDim] is true, the output tensor is of the same size as
-     * input except in the dimension [dim] where it is of size 1.
-     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
-     *
-     * @param dim the dimension to reduce.
-     * @param keepDim whether the output tensor has [dim] retained or not.
-     * @return the sum of each row of the input tensor in the given dimension [dim].
-     */
-    public fun Tensor<T>.sum(dim: Int, keepDim: Boolean): DoubleTensor
-
-    /**
-     * Returns the mean of all elements in the input tensor.
-     */
-    public fun Tensor<T>.mean(): Double
-
-    /**
-     * Returns the mean of each row of the input tensor in the given dimension [dim].
-     *
-     * If [keepDim] is true, the output tensor is of the same size as
-     * input except in the dimension [dim] where it is of size 1.
-     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
-     *
-     * @param dim the dimension to reduce.
-     * @param keepDim whether the output tensor has [dim] retained or not.
-     * @return the mean of each row of the input tensor in the given dimension [dim].
-     */
-    public fun Tensor<T>.mean(dim: Int, keepDim: Boolean): DoubleTensor
-
-    /**
-     * Returns the standard deviation of all elements in the input tensor.
-     */
-    public fun Tensor<T>.std(): Double
-
-    /**
-     * Returns the standard deviation of each row of the input tensor in the given dimension [dim].
-     *
-     * If [keepDim] is true, the output tensor is of the same size as
-     * input except in the dimension [dim] where it is of size 1.
-     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
-     *
-     * @param dim the dimension to reduce.
-     * @param keepDim whether the output tensor has [dim] retained or not.
-     * @return the standard deviation of each row of the input tensor in the given dimension [dim].
-     */
-    public fun Tensor<T>.std(dim: Int, keepDim: Boolean): DoubleTensor
-
-    /**
-     * Returns the variance of all elements in the input tensor.
-     */
-    public fun Tensor<T>.variance(): Double
-
-    /**
-     * Returns the variance of each row of the input tensor in the given dimension [dim].
-     *
-     * If [keepDim] is true, the output tensor is of the same size as
-     * input except in the dimension [dim] where it is of size 1.
-     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
-     *
-     * @param dim the dimension to reduce.
-     * @param keepDim whether the output tensor has [dim] retained or not.
-     * @return the variance of each row of the input tensor in the given dimension [dim].
-     */
-    public fun Tensor<T>.variance(dim: Int, keepDim: Boolean): DoubleTensor
-
-}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index b9c707c0b..b99f79e9a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -251,4 +251,24 @@ public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
         dim2: Int = -1
     ): Tensor<T>
 
+    /**
+     * @return the sum of all elements in the input tensor.
+     */
+    public fun Tensor<T>.sum(): T
+
+    /**
+     * Returns the sum of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the sum of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.sum(dim: Int, keepDim: Boolean): Tensor<T>
+
+
+
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
index 9aa6f093e..547018498 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
@@ -14,6 +14,60 @@ import kotlin.math.*
 public object DoubleAnalyticTensorAlgebra :
     AnalyticTensorAlgebra<Double>,
     DoubleTensorAlgebra() {
+
+    override fun Tensor<Double>.min(): Double = this.fold { it.minOrNull()!! }
+
+    override fun Tensor<Double>.min(dim: Int, keepDim: Boolean): DoubleTensor =
+        foldDim({ x -> x.minOrNull()!! }, dim, keepDim)
+
+    override fun Tensor<Double>.max(): Double = this.fold { it.maxOrNull()!! }
+
+    override fun Tensor<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
+        foldDim({ x -> x.maxOrNull()!! }, dim, keepDim)
+
+
+    override fun Tensor<Double>.mean(): Double = this.fold { it.sum() / tensor.numElements }
+
+    override fun Tensor<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor =
+        foldDim(
+            { arr ->
+                check(dim < dimension) { "Dimension $dim out of range $dimension" }
+                arr.sum() / shape[dim]
+            },
+            dim,
+            keepDim
+        )
+
+    override fun Tensor<Double>.std(): Double = this.fold { arr ->
+        val mean = arr.sum() / tensor.numElements
+        sqrt(arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1))
+    }
+
+    override fun Tensor<Double>.std(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
+        { arr ->
+            check(dim < dimension) { "Dimension $dim out of range $dimension" }
+            val mean = arr.sum() / shape[dim]
+            sqrt(arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1))
+        },
+        dim,
+        keepDim
+    )
+
+    override fun Tensor<Double>.variance(): Double = this.fold { arr ->
+        val mean = arr.sum() / tensor.numElements
+        arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1)
+    }
+
+    override fun Tensor<Double>.variance(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
+        { arr ->
+            check(dim < dimension) { "Dimension $dim out of range $dimension" }
+            val mean = arr.sum() / shape[dim]
+            arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1)
+        },
+        dim,
+        keepDim
+    )
+
     override fun Tensor<Double>.exp(): DoubleTensor = tensor.map(::exp)
 
     override fun Tensor<Double>.log(): DoubleTensor = tensor.map(::ln)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleStatisticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleStatisticTensorAlgebra.kt
deleted file mode 100644
index b455aff48..000000000
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleStatisticTensorAlgebra.kt
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.tensors.core.algebras
-
-import kotlin.math.sqrt
-
-import space.kscience.kmath.tensors.api.*
-import space.kscience.kmath.tensors.core.*
-import space.kscience.kmath.tensors.core.algebras.DoubleStatisticTensorAlgebra.max
-import space.kscience.kmath.tensors.core.algebras.DoubleStatisticTensorAlgebra.mean
-import space.kscience.kmath.tensors.core.algebras.DoubleStatisticTensorAlgebra.min
-import space.kscience.kmath.tensors.core.algebras.DoubleStatisticTensorAlgebra.sum
-import space.kscience.kmath.tensors.core.algebras.DoubleStatisticTensorAlgebra.variance
-
-public object DoubleStatisticTensorAlgebra : StatisticTensorAlgebra<Double>, DoubleTensorAlgebra() {
-
-    private fun Tensor<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
-        foldFunction(this.tensor.toDoubleArray())
-
-    private fun Tensor<Double>.foldDim(
-        foldFunction: (DoubleArray) -> Double,
-        dim: Int,
-        keepDim: Boolean
-    ): DoubleTensor {
-        check(dim < dimension) { "Dimension $dim out of range $dimension" }
-        val resShape = if (keepDim) {
-            shape.take(dim).toIntArray() + intArrayOf(1) + shape.takeLast(dimension - dim - 1).toIntArray()
-        } else {
-            shape.take(dim).toIntArray() + shape.takeLast(dimension - dim - 1).toIntArray()
-        }
-        val resNumElements = resShape.reduce(Int::times)
-        val resTensor = DoubleTensor(resShape, DoubleArray(resNumElements) { 0.0 }, 0)
-        for (index in resTensor.linearStructure.indices()) {
-            val prefix = index.take(dim).toIntArray()
-            val suffix = index.takeLast(dimension - dim - 1).toIntArray()
-            resTensor[index] = foldFunction(DoubleArray(shape[dim]) { i ->
-                this[prefix + intArrayOf(i) + suffix]
-            })
-        }
-
-        return resTensor
-    }
-
-    override fun Tensor<Double>.min(): Double = this.fold { it.minOrNull()!! }
-
-    override fun Tensor<Double>.min(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim({ x -> x.minOrNull()!! }, dim, keepDim)
-
-    override fun Tensor<Double>.max(): Double = this.fold { it.maxOrNull()!! }
-
-    override fun Tensor<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim({ x -> x.maxOrNull()!! }, dim, keepDim)
-
-    override fun Tensor<Double>.sum(): Double = this.fold { it.sum() }
-
-    override fun Tensor<Double>.sum(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim({ x -> x.sum() }, dim, keepDim)
-
-    override fun Tensor<Double>.mean(): Double = this.fold { it.sum() / tensor.numElements }
-
-    override fun Tensor<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim(
-            { arr ->
-                check(dim < dimension) { "Dimension $dim out of range $dimension" }
-                arr.sum() / shape[dim]
-            },
-            dim,
-            keepDim
-        )
-
-    override fun Tensor<Double>.std(): Double = this.fold { arr ->
-        val mean = arr.sum() / tensor.numElements
-        sqrt(arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1))
-    }
-
-    override fun Tensor<Double>.std(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
-        { arr ->
-            check(dim < dimension) { "Dimension $dim out of range $dimension" }
-            val mean = arr.sum() / shape[dim]
-            sqrt(arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1))
-        },
-        dim,
-        keepDim
-    )
-
-    override fun Tensor<Double>.variance(): Double = this.fold { arr ->
-        val mean = arr.sum() / tensor.numElements
-        arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1)
-    }
-
-    override fun Tensor<Double>.variance(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
-        { arr ->
-            check(dim < dimension) { "Dimension $dim out of range $dimension" }
-            val mean = arr.sum() / shape[dim]
-            arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1)
-        },
-        dim,
-        keepDim
-    )
-
-}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index 4009f7b45..c0a6312a9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -284,7 +284,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         val m1 = newThis.shape[newThis.shape.size - 1]
         val m2 = newOther.shape[newOther.shape.size - 2]
         val n = newOther.shape[newOther.shape.size - 1]
-        check (m1 == m2) {
+        check(m1 == m2) {
             throw RuntimeException("Tensors dot operation dimension mismatch: ($l, $m1) x ($m2, $n)")
         }
 
@@ -403,7 +403,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     public fun stack(tensors: List<DoubleTensor>): DoubleTensor {
         val shape = tensors.firstOrNull()?.shape
         check(shape != null) { "Collection must have at least 1 element" }
-        check(tensors.all { it.shape contentEquals shape }) {"Stacking tensors must have same shapes"}
+        check(tensors.all { it.shape contentEquals shape }) { "Stacking tensors must have same shapes" }
         val resShape = intArrayOf(tensors.size) + shape
         val resBuffer = tensors.flatMap {
             it.tensor.mutableBuffer.array().drop(it.bufferStart).take(it.numElements)
@@ -415,4 +415,36 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     public fun Tensor<Double>.rowsByIndices(indices: IntArray): DoubleTensor {
         return stack(indices.map { this[it] })
     }
+
+    internal fun Tensor<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
+        foldFunction(tensor.toDoubleArray())
+
+    internal fun Tensor<Double>.foldDim(
+        foldFunction: (DoubleArray) -> Double,
+        dim: Int,
+        keepDim: Boolean
+    ): DoubleTensor {
+        check(dim < dimension) { "Dimension $dim out of range $dimension" }
+        val resShape = if (keepDim) {
+            shape.take(dim).toIntArray() + intArrayOf(1) + shape.takeLast(dimension - dim - 1).toIntArray()
+        } else {
+            shape.take(dim).toIntArray() + shape.takeLast(dimension - dim - 1).toIntArray()
+        }
+        val resNumElements = resShape.reduce(Int::times)
+        val resTensor = DoubleTensor(resShape, DoubleArray(resNumElements) { 0.0 }, 0)
+        for (index in resTensor.linearStructure.indices()) {
+            val prefix = index.take(dim).toIntArray()
+            val suffix = index.takeLast(dimension - dim - 1).toIntArray()
+            resTensor[index] = foldFunction(DoubleArray(shape[dim]) { i ->
+                tensor[prefix + intArrayOf(i) + suffix]
+            })
+        }
+
+        return resTensor
+    }
+
+    override fun Tensor<Double>.sum(): Double = tensor.fold { it.sum() }
+
+    override fun Tensor<Double>.sum(dim: Int, keepDim: Boolean): DoubleTensor =
+        foldDim({ x -> x.sum() }, dim, keepDim)
 }
-- 
2.34.1


From 591b40872954e1c91d50f3d9998b7cd8e0ea550b Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Mon, 3 May 2021 04:14:19 +0700
Subject: [PATCH 180/713] MST rendering: support infix division, use arcsin
 instead sin^-1 form for inverse trigonometric functions

---
 README.md                                     |  14 ++-
 kmath-ast/README.md                           |  89 +++++++++++++--
 kmath-ast/docs/README-TEMPLATE.md             | 103 ++++++++++++++++--
 .../ast/rendering/LatexSyntaxRenderer.kt      |   6 +-
 .../ast/rendering/MathMLSyntaxRenderer.kt     |  15 ++-
 .../kmath/ast/rendering/MathRenderer.kt       |   2 +
 .../kmath/ast/rendering/MathSyntax.kt         |  32 +++---
 .../kscience/kmath/ast/rendering/features.kt  |  72 +++++++++---
 .../kscience/kmath/ast/rendering/stages.kt    |  76 ++++++++++++-
 .../kmath/ast/rendering/TestFeatures.kt       |  18 +--
 .../kmath/ast/rendering/TestStages.kt         |   6 +
 kmath-for-real/README.md                      |   4 +-
 kmath-functions/README.md                     |   4 +-
 13 files changed, 363 insertions(+), 78 deletions(-)

diff --git a/README.md b/README.md
index 773eb6398..97ce164e1 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ KMath is a modular library. Different modules provide different features with di
 * ### [kmath-ast](kmath-ast)
 > 
 >
-> **Maturity**: PROTOTYPE
+> **Maturity**: EXPERIMENTAL
 >
 > **Features:**
 > - [expression-language](kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt) : Expression language and its parser
@@ -154,9 +154,9 @@ performance calculations to code generation.
 > **Maturity**: PROTOTYPE
 >
 > **Features:**
-> - [ejml-vector](kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt) : The Point implementation using SimpleMatrix.
-> - [ejml-matrix](kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt) : The Matrix implementation using SimpleMatrix.
-> - [ejml-linear-space](kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt) : The LinearSpace implementation using SimpleMatrix.
+> - [ejml-vector](kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt) : Point implementations.
+> - [ejml-matrix](kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt) : Matrix implementation.
+> - [ejml-linear-space](kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt) : LinearSpace implementations.
 
 <hr/>
 
@@ -200,6 +200,12 @@ One can still use generic algebras though.
 > **Maturity**: PROTOTYPE
 <hr/>
 
+* ### [kmath-jupyter](kmath-jupyter)
+> 
+>
+> **Maturity**: PROTOTYPE
+<hr/>
+
 * ### [kmath-kotlingrad](kmath-kotlingrad)
 > 
 >
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index 4de165e72..26ee98ba5 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -1,6 +1,6 @@
 # Module kmath-ast
 
-Abstract syntax tree expression representation and related optimizations.
+Performance and visualization extensions to MST API.
 
  - [expression-language](src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt) : Expression language and its parser
  - [mst-jvm-codegen](src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt) : Dynamic MST to JVM bytecode compiler
@@ -39,12 +39,16 @@ dependencies {
 
 ### On JVM
 
-`kmath-ast` JVM module supports runtime code generation to eliminate overhead of tree traversal. Code generator builds
-a special implementation of `Expression<T>` with implemented `invoke` function.
+`kmath-ast` JVM module supports runtime code generation to eliminate overhead of tree traversal. Code generator builds a
+special implementation of `Expression<T>` with implemented `invoke` function.
 
 For example, the following builder:
 
 ```kotlin
+import space.kscience.kmath.expressions.*
+import space.kscience.kmath.operations.*
+import space.kscience.kmath.asm.*
+
 MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 ``` 
 
@@ -54,6 +58,7 @@ MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 package space.kscience.kmath.asm.generated;
 
 import java.util.Map;
+
 import kotlin.jvm.functions.Function2;
 import space.kscience.kmath.asm.internal.MapIntrinsics;
 import space.kscience.kmath.expressions.Expression;
@@ -63,7 +68,7 @@ public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
     private final Object[] constants;
 
     public final Double invoke(Map<Symbol, ? extends Double> arguments) {
-        return (Double)((Function2)this.constants[0]).invoke((Double)MapIntrinsics.getOrFail(arguments, "x"), 2);
+        return (Double) ((Function2) this.constants[0]).invoke((Double) MapIntrinsics.getOrFail(arguments, "x"), 2);
     }
 
     public AsmCompiledExpression_45045_0(Object[] constants) {
@@ -75,8 +80,8 @@ public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
 
 #### Known issues
 
-- The same classes may be generated and loaded twice, so it is recommended to cache compiled expressions to avoid
-  class loading overhead.
+- The same classes may be generated and loaded twice, so it is recommended to cache compiled expressions to avoid class
+  loading overhead.
 - This API is not supported by non-dynamic JVM implementations (like TeaVM and GraalVM) because of using class loaders.
 
 ### On JS
@@ -84,6 +89,10 @@ public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
 A similar feature is also available on JS.
 
 ```kotlin
+import space.kscience.kmath.expressions.*
+import space.kscience.kmath.operations.*
+import space.kscience.kmath.estree.*
+
 MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 ``` 
 
@@ -91,13 +100,16 @@ The code above returns expression implemented with such a JS function:
 
 ```js
 var executable = function (constants, arguments) {
-  return constants[1](constants[0](arguments, "x"), 2);
+    return constants[1](constants[0](arguments, "x"), 2);
 };
 ```
 
-JS also supports very experimental expression optimization with [WebAssembly](https://webassembly.org/) IR generation. Currently, only expressions inside `DoubleField` and `IntRing` are supported.
+JS also supports very experimental expression optimization with [WebAssembly](https://webassembly.org/) IR generation.
+Currently, only expressions inside `DoubleField` and `IntRing` are supported.
 
 ```kotlin
+import space.kscience.kmath.expressions.*
+import space.kscience.kmath.operations.*
 import space.kscience.kmath.wasm.*
 
 MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
@@ -128,7 +140,9 @@ Example usage:
 ```kotlin
 import space.kscience.kmath.ast.*
 import space.kscience.kmath.ast.rendering.*
+import space.kscience.kmath.misc.*
 
+@OptIn(UnstableKMathAPI::class)
 public fun main() {
     val mst = "exp(sqrt(x))-asin(2*x)/(2e10+x^3)/(-12)".parseMath()
     val syntax = FeaturedMathRendererWithPostProcess.Default.render(mst)
@@ -144,13 +158,68 @@ public fun main() {
 
 Result LaTeX:
 
-![](http://chart.googleapis.com/chart?cht=tx&chl=e%5E%7B%5Csqrt%7Bx%7D%7D-%5Cfrac%7B%5Cfrac%7B%5Coperatorname%7Bsin%7D%5E%7B-1%7D%5C,%5Cleft(2%5C,x%5Cright)%7D%7B2%5Ctimes10%5E%7B10%7D%2Bx%5E%7B3%7D%7D%7D%7B-12%7D)
+![](https://latex.codecogs.com/gif.latex?%5Coperatorname{exp}%5C,%5Cleft(%5Csqrt{x}%5Cright)-%5Cfrac{%5Cfrac{%5Coperatorname{arcsin}%5C,%5Cleft(2%5C,x%5Cright)}{2%5Ctimes10^{10}%2Bx^{3}}}{-12})
 
 Result MathML (embedding MathML is not allowed by GitHub Markdown):
 
+<details>
+
 ```html
-<mrow><msup><mrow><mi>e</mi></mrow><mrow><msqrt><mi>x</mi></msqrt></mrow></msup><mo>-</mo><mfrac><mrow><mfrac><mrow><msup><mrow><mo>sin</mo></mrow><mrow><mo>-</mo><mn>1</mn></mrow></msup><mspace width="0.167em"></mspace><mfenced open="(" close=")" separators=""><mn>2</mn><mspace width="0.167em"></mspace><mi>x</mi></mfenced></mrow><mrow><mn>2</mn><mo>&times;</mo><msup><mrow><mn>10</mn></mrow><mrow><mn>10</mn></mrow></msup><mo>+</mo><msup><mrow><mi>x</mi></mrow><mrow><mn>3</mn></mrow></msup></mrow></mfrac></mrow><mrow><mo>-</mo><mn>12</mn></mrow></mfrac></mrow>
+<math xmlns="https://www.w3.org/1998/Math/MathML">
+    <mrow>
+        <mo>exp</mo>
+        <mspace width="0.167em"></mspace>
+        <mfenced open="(" close=")" separators="">
+            <msqrt>
+                <mi>x</mi>
+            </msqrt>
+        </mfenced>
+        <mo>-</mo>
+        <mfrac>
+            <mrow>
+                <mfrac>
+                    <mrow>
+                        <mo>arcsin</mo>
+                        <mspace width="0.167em"></mspace>
+                        <mfenced open="(" close=")" separators="">
+                            <mn>2</mn>
+                            <mspace width="0.167em"></mspace>
+                            <mi>x</mi>
+                        </mfenced>
+                    </mrow>
+                    <mrow>
+                        <mn>2</mn>
+                        <mo>&times;</mo>
+                        <msup>
+                            <mrow>
+                                <mn>10</mn>
+                            </mrow>
+                            <mrow>
+                                <mn>10</mn>
+                            </mrow>
+                        </msup>
+                        <mo>+</mo>
+                        <msup>
+                            <mrow>
+                                <mi>x</mi>
+                            </mrow>
+                            <mrow>
+                                <mn>3</mn>
+                            </mrow>
+                        </msup>
+                    </mrow>
+                </mfrac>
+            </mrow>
+            <mrow>
+                <mo>-</mo>
+                <mn>12</mn>
+            </mrow>
+        </mfrac>
+    </mrow>
+</math>
 ```
 
+</details>
+
 It is also possible to create custom algorithms of render, and even add support of other markup languages
 (see API reference).
diff --git a/kmath-ast/docs/README-TEMPLATE.md b/kmath-ast/docs/README-TEMPLATE.md
index 1ecf477ef..80ea31642 100644
--- a/kmath-ast/docs/README-TEMPLATE.md
+++ b/kmath-ast/docs/README-TEMPLATE.md
@@ -1,6 +1,6 @@
 # Module kmath-ast
 
-Abstract syntax tree expression representation and related optimizations.
+Performance and visualization extensions to MST API.
 
 ${features}
 
@@ -10,12 +10,16 @@ ${artifact}
 
 ### On JVM
 
-`kmath-ast` JVM module supports runtime code generation to eliminate overhead of tree traversal. Code generator builds
-a special implementation of `Expression<T>` with implemented `invoke` function.
+`kmath-ast` JVM module supports runtime code generation to eliminate overhead of tree traversal. Code generator builds a
+special implementation of `Expression<T>` with implemented `invoke` function.
 
 For example, the following builder:
 
 ```kotlin
+import space.kscience.kmath.expressions.*
+import space.kscience.kmath.operations.*
+import space.kscience.kmath.asm.*
+
 MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 ``` 
 
@@ -25,6 +29,7 @@ MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 package space.kscience.kmath.asm.generated;
 
 import java.util.Map;
+
 import kotlin.jvm.functions.Function2;
 import space.kscience.kmath.asm.internal.MapIntrinsics;
 import space.kscience.kmath.expressions.Expression;
@@ -34,7 +39,7 @@ public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
     private final Object[] constants;
 
     public final Double invoke(Map<Symbol, ? extends Double> arguments) {
-        return (Double)((Function2)this.constants[0]).invoke((Double)MapIntrinsics.getOrFail(arguments, "x"), 2);
+        return (Double) ((Function2) this.constants[0]).invoke((Double) MapIntrinsics.getOrFail(arguments, "x"), 2);
     }
 
     public AsmCompiledExpression_45045_0(Object[] constants) {
@@ -46,8 +51,8 @@ public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
 
 #### Known issues
 
-- The same classes may be generated and loaded twice, so it is recommended to cache compiled expressions to avoid
-  class loading overhead.
+- The same classes may be generated and loaded twice, so it is recommended to cache compiled expressions to avoid class
+  loading overhead.
 - This API is not supported by non-dynamic JVM implementations (like TeaVM and GraalVM) because of using class loaders.
 
 ### On JS
@@ -55,6 +60,10 @@ public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
 A similar feature is also available on JS.
 
 ```kotlin
+import space.kscience.kmath.expressions.*
+import space.kscience.kmath.operations.*
+import space.kscience.kmath.estree.*
+
 MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
 ``` 
 
@@ -62,13 +71,16 @@ The code above returns expression implemented with such a JS function:
 
 ```js
 var executable = function (constants, arguments) {
-  return constants[1](constants[0](arguments, "x"), 2);
+    return constants[1](constants[0](arguments, "x"), 2);
 };
 ```
 
-JS also supports very experimental expression optimization with [WebAssembly](https://webassembly.org/) IR generation. Currently, only expressions inside `DoubleField` and `IntRing` are supported.
+JS also supports very experimental expression optimization with [WebAssembly](https://webassembly.org/) IR generation.
+Currently, only expressions inside `DoubleField` and `IntRing` are supported.
 
 ```kotlin
+import space.kscience.kmath.expressions.*
+import space.kscience.kmath.operations.*
 import space.kscience.kmath.wasm.*
 
 MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
@@ -99,9 +111,11 @@ Example usage:
 ```kotlin
 import space.kscience.kmath.ast.*
 import space.kscience.kmath.ast.rendering.*
+import space.kscience.kmath.misc.*
 
+@OptIn(UnstableKMathAPI::class)
 public fun main() {
-    val mst = "exp(sqrt(x))-asin(2*x)/(2e10+x^3)/(-12)".parseMath()
+    val mst = "exp(sqrt(x))-asin(2*x)/(2e10+x^3)/(12)+x^(2/3)".parseMath()
     val syntax = FeaturedMathRendererWithPostProcess.Default.render(mst)
     val latex = LatexSyntaxRenderer.renderWithStringBuilder(syntax)
     println("LaTeX:")
@@ -115,13 +129,78 @@ public fun main() {
 
 Result LaTeX:
 
-![](http://chart.googleapis.com/chart?cht=tx&chl=e%5E%7B%5Csqrt%7Bx%7D%7D-%5Cfrac%7B%5Cfrac%7B%5Coperatorname%7Bsin%7D%5E%7B-1%7D%5C,%5Cleft(2%5C,x%5Cright)%7D%7B2%5Ctimes10%5E%7B10%7D%2Bx%5E%7B3%7D%7D%7D%7B-12%7D)
+![](https://latex.codecogs.com/gif.latex?%5Coperatorname{exp}%5C,%5Cleft(%5Csqrt{x}%5Cright)-%5Cfrac{%5Cfrac{%5Coperatorname{arcsin}%5C,%5Cleft(2%5C,x%5Cright)}{2%5Ctimes10^{10}%2Bx^{3}}}{12}+x^{2/3})
 
-Result MathML (embedding MathML is not allowed by GitHub Markdown):
+Result MathML (can be used with MathJax or other renderers):
+
+<details>
 
 ```html
-<mrow><msup><mrow><mi>e</mi></mrow><mrow><msqrt><mi>x</mi></msqrt></mrow></msup><mo>-</mo><mfrac><mrow><mfrac><mrow><msup><mrow><mo>sin</mo></mrow><mrow><mo>-</mo><mn>1</mn></mrow></msup><mspace width="0.167em"></mspace><mfenced open="(" close=")" separators=""><mn>2</mn><mspace width="0.167em"></mspace><mi>x</mi></mfenced></mrow><mrow><mn>2</mn><mo>&times;</mo><msup><mrow><mn>10</mn></mrow><mrow><mn>10</mn></mrow></msup><mo>+</mo><msup><mrow><mi>x</mi></mrow><mrow><mn>3</mn></mrow></msup></mrow></mfrac></mrow><mrow><mo>-</mo><mn>12</mn></mrow></mfrac></mrow>
+<math xmlns="https://www.w3.org/1998/Math/MathML">
+    <mrow>
+        <mo>exp</mo>
+        <mspace width="0.167em"></mspace>
+        <mfenced open="(" close=")" separators="">
+            <msqrt>
+                <mi>x</mi>
+            </msqrt>
+        </mfenced>
+        <mo>-</mo>
+        <mfrac>
+            <mrow>
+                <mfrac>
+                    <mrow>
+                        <mo>arcsin</mo>
+                        <mspace width="0.167em"></mspace>
+                        <mfenced open="(" close=")" separators="">
+                            <mn>2</mn>
+                            <mspace width="0.167em"></mspace>
+                            <mi>x</mi>
+                        </mfenced>
+                    </mrow>
+                    <mrow>
+                        <mn>2</mn>
+                        <mo>&times;</mo>
+                        <msup>
+                            <mrow>
+                                <mn>10</mn>
+                            </mrow>
+                            <mrow>
+                                <mn>10</mn>
+                            </mrow>
+                        </msup>
+                        <mo>+</mo>
+                        <msup>
+                            <mrow>
+                                <mi>x</mi>
+                            </mrow>
+                            <mrow>
+                                <mn>3</mn>
+                            </mrow>
+                        </msup>
+                    </mrow>
+                </mfrac>
+            </mrow>
+            <mrow>
+                <mn>12</mn>
+            </mrow>
+        </mfrac>
+        <mo>+</mo>
+        <msup>
+            <mrow>
+                <mi>x</mi>
+            </mrow>
+            <mrow>
+                <mn>2</mn>
+                <mo>/</mo>
+                <mn>3</mn>
+            </mrow>
+        </msup>
+    </mrow>
+</math>
 ```
 
+</details>
+
 It is also possible to create custom algorithms of render, and even add support of other markup languages
 (see API reference).
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
index 5909f1f9d..01717b0f9 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
@@ -118,7 +118,11 @@ public object LatexSyntaxRenderer : SyntaxRenderer {
                 render(node.right)
             }
 
-            is FractionSyntax -> {
+            is FractionSyntax -> if (node.infix) {
+                render(node.left)
+                append('/')
+                render(node.right)
+            } else {
                 append("\\frac{")
                 render(node.left)
                 append("}{")
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
index 5b44e660d..cda8e2322 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
@@ -133,14 +133,13 @@ public object MathMLSyntaxRenderer : SyntaxRenderer {
                 render(node.right)
             }
 
-            is FractionSyntax -> tag("mfrac") {
-                tag("mrow") {
-                    render(node.left)
-                }
-
-                tag("mrow") {
-                    render(node.right)
-                }
+            is FractionSyntax -> if (node.infix) {
+                render(node.left)
+                tag("mo") { append('/') }
+                render(node.right)
+            } else tag("mfrac") {
+                tag("mrow") { render(node.left) }
+                tag("mrow") { render(node.right) }
             }
 
             is RadicalWithIndexSyntax -> tag("mroot") {
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
index 6b22ac519..c33f95483 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
@@ -89,6 +89,7 @@ public open class FeaturedMathRendererWithPostProcess(
                 SquareRoot.Default,
                 Exponent.Default,
                 InverseTrigonometricOperations.Default,
+                InverseHyperbolicOperations.Default,
 
                 // Fallback option for unknown operations - printing them as operator
                 BinaryOperator.Default,
@@ -105,6 +106,7 @@ public open class FeaturedMathRendererWithPostProcess(
             ),
             listOf(
                 BetterExponent,
+                BetterFraction,
                 SimplifyParentheses.Default,
                 BetterMultiplication,
             ),
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
index 3c023e342..a71985fbc 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
@@ -102,7 +102,7 @@ public data class SymbolSyntax(public var string: String) : TerminalSyntax()
 public data class OperatorNameSyntax(public var name: String) : TerminalSyntax()
 
 /**
- * Represents a usage of special symbols.
+ * Represents a usage of special symbols (e.g., *&infin;*).
  *
  * @property kind The kind of symbol.
  * @author Iaroslav Postovalov
@@ -143,7 +143,7 @@ public data class OperandSyntax(
 }
 
 /**
- * Represents unary, prefix operator syntax (like f x).
+ * Represents unary, prefix operator syntax (like *f(x)*).
  *
  * @property prefix The prefix.
  * @author Iaroslav Postovalov
@@ -160,7 +160,7 @@ public data class UnaryOperatorSyntax(
 }
 
 /**
- * Represents prefix, unary plus operator.
+ * Represents prefix, unary plus operator (*+x*).
  *
  * @author Iaroslav Postovalov
  */
@@ -175,7 +175,7 @@ public data class UnaryPlusSyntax(
 }
 
 /**
- * Represents prefix, unary minus operator.
+ * Represents prefix, unary minus operator (*-x*).
  *
  * @author Iaroslav Postovalov
  */
@@ -190,7 +190,7 @@ public data class UnaryMinusSyntax(
 }
 
 /**
- * Represents radical with a node inside it.
+ * Represents radical with a node inside it (*&radic;x*).
  *
  * @property operand The radicand.
  * @author Iaroslav Postovalov
@@ -225,7 +225,7 @@ public data class ExponentSyntax(
 }
 
 /**
- * Represents a syntax node with superscript (usually, for exponentiation).
+ * Represents a syntax node with superscript (*x<sup>2</sup>*).
  *
  * @property left The node.
  * @property right The superscript.
@@ -244,7 +244,7 @@ public data class SuperscriptSyntax(
 }
 
 /**
- * Represents a syntax node with subscript.
+ * Represents a syntax node with subscript (*x<sub>i</sup>*).
  *
  * @property left The node.
  * @property right The subscript.
@@ -263,7 +263,7 @@ public data class SubscriptSyntax(
 }
 
 /**
- * Represents binary, prefix operator syntax (like f(a, b)).
+ * Represents binary, prefix operator syntax (like *f(a, b)*).
  *
  * @property prefix The prefix.
  * @author Iaroslav Postovalov
@@ -282,7 +282,7 @@ public data class BinaryOperatorSyntax(
 }
 
 /**
- * Represents binary, infix addition.
+ * Represents binary, infix addition (*42 + 42*).
  *
  * @param left The augend.
  * @param right The addend.
@@ -301,7 +301,7 @@ public data class BinaryPlusSyntax(
 }
 
 /**
- * Represents binary, infix subtraction.
+ * Represents binary, infix subtraction (*42 - 42*).
  *
  * @param left The minuend.
  * @param right The subtrahend.
@@ -324,13 +324,15 @@ public data class BinaryMinusSyntax(
  *
  * @property left The numerator.
  * @property right The denominator.
+ * @property infix Whether infix (*1 / 2*) or normal (*&frac12;*) fraction should be made.
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public data class FractionSyntax(
     public override val operation: String,
-    public override val left: MathSyntax,
-    public override val right: MathSyntax,
+    public override val left: OperandSyntax,
+    public override val right: OperandSyntax,
+    public var infix: Boolean,
 ) : BinarySyntax() {
     init {
         left.parent = this
@@ -339,7 +341,7 @@ public data class FractionSyntax(
 }
 
 /**
- * Represents radical syntax with index.
+ * Represents radical syntax with index (*<sup>3</sup>&radic;x*).
  *
  * @property left The index.
  * @property right The radicand.
@@ -358,11 +360,11 @@ public data class RadicalWithIndexSyntax(
 }
 
 /**
- * Represents binary, infix multiplication in the form of coefficient (2 x) or with operator (x&times;2).
+ * Represents binary, infix multiplication in the form of coefficient (*2 x*) or with operator (*x &times; 2*).
  *
  * @property left The multiplicand.
  * @property right The multiplier.
- * @property times whether the times (&times;) symbol should be used.
+ * @property times Whether the times (&times;) symbol should be used.
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index c1b513345..ac716f9ff 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -54,6 +54,7 @@ else
  * *('-'? (DIGIT+ ('.' DIGIT+)? ('E' '-'? DIGIT+)? | 'Infinity')) | 'NaN'*.
  *
  * @property types The suitable types.
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class PrettyPrintFloats(public val types: Set<KClass<out Number>>) : RenderFeature {
@@ -113,6 +114,7 @@ public class PrettyPrintFloats(public val types: Set<KClass<out Number>>) : Rend
  * Special printing for numeric types which are printed in form of *'-'? DIGIT+*.
  *
  * @property types The suitable types.
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class PrettyPrintIntegers(public val types: Set<KClass<out Number>>) : RenderFeature {
@@ -135,6 +137,7 @@ public class PrettyPrintIntegers(public val types: Set<KClass<out Number>>) : Re
  * Special printing for symbols meaning Pi.
  *
  * @property symbols The allowed symbols.
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class PrettyPrintPi(public val symbols: Set<String>) : RenderFeature {
@@ -157,6 +160,7 @@ public class PrettyPrintPi(public val symbols: Set<String>) : RenderFeature {
  * not [MST.Unary].
  *
  * @param operations the allowed operations. If `null`, any operation is accepted.
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public abstract class Unary(public val operations: Collection<String>?) : RenderFeature {
@@ -177,6 +181,7 @@ public abstract class Unary(public val operations: Collection<String>?) : Render
  * not [MST.Binary].
  *
  * @property operations the allowed operations. If `null`, any operation is accepted.
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public abstract class Binary(public val operations: Collection<String>?) : RenderFeature {
@@ -193,6 +198,8 @@ public abstract class Binary(public val operations: Collection<String>?) : Rende
 
 /**
  * Handles binary nodes by producing [BinaryPlusSyntax].
+ *
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class BinaryPlus(operations: Collection<String>?) : Binary(operations) {
@@ -213,6 +220,8 @@ public class BinaryPlus(operations: Collection<String>?) : Binary(operations) {
 
 /**
  * Handles binary nodes by producing [BinaryMinusSyntax].
+ *
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class BinaryMinus(operations: Collection<String>?) : Binary(operations) {
@@ -233,6 +242,8 @@ public class BinaryMinus(operations: Collection<String>?) : Binary(operations) {
 
 /**
  * Handles unary nodes by producing [UnaryPlusSyntax].
+ *
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class UnaryPlus(operations: Collection<String>?) : Unary(operations) {
@@ -251,6 +262,8 @@ public class UnaryPlus(operations: Collection<String>?) : Unary(operations) {
 
 /**
  * Handles binary nodes by producing [UnaryMinusSyntax].
+ *
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class UnaryMinus(operations: Collection<String>?) : Unary(operations) {
@@ -269,13 +282,16 @@ public class UnaryMinus(operations: Collection<String>?) : Unary(operations) {
 
 /**
  * Handles binary nodes by producing [FractionSyntax].
+ *
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class Fraction(operations: Collection<String>?) : Binary(operations) {
     public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): FractionSyntax = FractionSyntax(
         operation = node.operation,
-        left = parent.render(node.left),
-        right = parent.render(node.right),
+        left = OperandSyntax(operand = parent.render(node.left), parentheses = true),
+        right = OperandSyntax(operand = parent.render(node.right), parentheses = true),
+        infix = true,
     )
 
     public companion object {
@@ -288,6 +304,8 @@ public class Fraction(operations: Collection<String>?) : Binary(operations) {
 
 /**
  * Handles binary nodes by producing [BinaryOperatorSyntax].
+ *
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class BinaryOperator(operations: Collection<String>?) : Binary(operations) {
@@ -309,6 +327,8 @@ public class BinaryOperator(operations: Collection<String>?) : Binary(operations
 
 /**
  * Handles unary nodes by producing [UnaryOperatorSyntax].
+ *
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class UnaryOperator(operations: Collection<String>?) : Unary(operations) {
@@ -329,6 +349,8 @@ public class UnaryOperator(operations: Collection<String>?) : Unary(operations)
 
 /**
  * Handles binary nodes by producing [SuperscriptSyntax].
+ *
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class Power(operations: Collection<String>?) : Binary(operations) {
@@ -365,6 +387,8 @@ public class SquareRoot(operations: Collection<String>?) : Unary(operations) {
 
 /**
  * Handles unary nodes by producing [ExponentSyntax].
+ *
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class Exponent(operations: Collection<String>?) : Unary(operations) {
@@ -384,6 +408,8 @@ public class Exponent(operations: Collection<String>?) : Unary(operations) {
 
 /**
  * Handles binary nodes by producing [MultiplicationSyntax].
+ *
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class Multiplication(operations: Collection<String>?) : Binary(operations) {
@@ -404,36 +430,52 @@ public class Multiplication(operations: Collection<String>?) : Binary(operations
 }
 
 /**
- * Handles binary nodes by producing inverse [UnaryOperatorSyntax] (like *sin<sup>-1</sup>*) with removing the `a`
- * prefix of operation ID.
+ * Handles binary nodes by producing inverse [UnaryOperatorSyntax] with *arc* prefix instead of *a*.
+ *
+ * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
 public class InverseTrigonometricOperations(operations: Collection<String>?) : Unary(operations) {
     public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): UnaryOperatorSyntax =
         UnaryOperatorSyntax(
             operation = node.operation,
-            prefix = SuperscriptSyntax(
-                operation = PowerOperations.POW_OPERATION,
-                left = OperatorNameSyntax(name = node.operation.removePrefix("a")),
-                right = UnaryMinusSyntax(
-                    operation = GroupOperations.MINUS_OPERATION,
-                    operand = OperandSyntax(operand = NumberSyntax(string = "1"), parentheses = true),
-                ),
-            ),
+            prefix = OperatorNameSyntax(name = node.operation.replaceFirst("a", "arc")),
             operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
         )
 
     public companion object {
         /**
          * The default instance configured with [TrigonometricOperations.ACOS_OPERATION],
-         * [TrigonometricOperations.ASIN_OPERATION], [TrigonometricOperations.ATAN_OPERATION],
-         * [ExponentialOperations.ACOSH_OPERATION], [ExponentialOperations.ASINH_OPERATION], and
-         * [ExponentialOperations.ATANH_OPERATION].
+         * [TrigonometricOperations.ASIN_OPERATION], [TrigonometricOperations.ATAN_OPERATION].
          */
         public val Default: InverseTrigonometricOperations = InverseTrigonometricOperations(setOf(
             TrigonometricOperations.ACOS_OPERATION,
             TrigonometricOperations.ASIN_OPERATION,
             TrigonometricOperations.ATAN_OPERATION,
+        ))
+    }
+}
+
+/**
+ * Handles binary nodes by producing inverse [UnaryOperatorSyntax] with *ar* prefix instead of *a*.
+ *
+ * @author Iaroslav Postovalov
+ */
+@UnstableKMathAPI
+public class InverseHyperbolicOperations(operations: Collection<String>?) : Unary(operations) {
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): UnaryOperatorSyntax =
+        UnaryOperatorSyntax(
+            operation = node.operation,
+            prefix = OperatorNameSyntax(name = node.operation.replaceFirst("a", "ar")),
+            operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
+        )
+
+    public companion object {
+        /**
+         * The default instance configured with [ExponentialOperations.ACOSH_OPERATION],
+         * [ExponentialOperations.ASINH_OPERATION], and [ExponentialOperations.ATANH_OPERATION].
+         */
+        public val Default: InverseHyperbolicOperations = InverseHyperbolicOperations(setOf(
             ExponentialOperations.ACOSH_OPERATION,
             ExponentialOperations.ASINH_OPERATION,
             ExponentialOperations.ATANH_OPERATION,
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt
index 7eb75b9ff..1f31af853 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt
@@ -83,6 +83,75 @@ public object BetterMultiplication : FeaturedMathRendererWithPostProcess.PostPro
     }
 }
 
+/**
+ * Chooses [FractionSyntax.infix] depending on the context.
+ *
+ * @author Iaroslav Postovalov
+ */
+@UnstableKMathAPI
+public object BetterFraction : FeaturedMathRendererWithPostProcess.PostProcessStage {
+    private fun perform0(node: MathSyntax, infix: Boolean = false): Unit = when (node) {
+        is NumberSyntax -> Unit
+        is SymbolSyntax -> Unit
+        is OperatorNameSyntax -> Unit
+        is SpecialSymbolSyntax -> Unit
+        is OperandSyntax -> perform0(node.operand, infix)
+
+        is UnaryOperatorSyntax -> {
+            perform0(node.prefix, infix)
+            perform0(node.operand, infix)
+        }
+
+        is UnaryPlusSyntax -> perform0(node.operand, infix)
+        is UnaryMinusSyntax -> perform0(node.operand, infix)
+        is RadicalSyntax -> perform0(node.operand, infix)
+        is ExponentSyntax -> perform0(node.operand, infix)
+
+        is SuperscriptSyntax -> {
+            perform0(node.left, true)
+            perform0(node.right, true)
+        }
+
+        is SubscriptSyntax -> {
+            perform0(node.left, true)
+            perform0(node.right, true)
+        }
+
+        is BinaryOperatorSyntax -> {
+            perform0(node.prefix, infix)
+            perform0(node.left, infix)
+            perform0(node.right, infix)
+        }
+
+        is BinaryPlusSyntax -> {
+            perform0(node.left, infix)
+            perform0(node.right, infix)
+        }
+
+        is BinaryMinusSyntax -> {
+            perform0(node.left, infix)
+            perform0(node.right, infix)
+        }
+
+        is FractionSyntax -> {
+            node.infix = infix
+            perform0(node.left, infix)
+            perform0(node.right, infix)
+        }
+
+        is RadicalWithIndexSyntax -> {
+            perform0(node.left, true)
+            perform0(node.right, true)
+        }
+
+        is MultiplicationSyntax -> {
+            perform0(node.left, infix)
+            perform0(node.right, infix)
+        }
+    }
+
+    public override fun perform(node: MathSyntax): Unit = perform0(node)
+}
 
 /**
  * Applies [ExponentSyntax.useOperatorForm] to [ExponentSyntax] when the operand contains a fraction, a
@@ -102,7 +171,7 @@ public object BetterExponent : FeaturedMathRendererWithPostProcess.PostProcessSt
             is UnaryOperatorSyntax -> perform0(node.prefix) || perform0(node.operand)
             is UnaryPlusSyntax -> perform0(node.operand)
             is UnaryMinusSyntax -> perform0(node.operand)
-            is RadicalSyntax -> perform0(node.operand)
+            is RadicalSyntax -> true
 
             is ExponentSyntax -> {
                 val r = perform0(node.operand)
@@ -116,7 +185,7 @@ public object BetterExponent : FeaturedMathRendererWithPostProcess.PostProcessSt
             is BinaryPlusSyntax -> perform0(node.left) || perform0(node.right)
             is BinaryMinusSyntax -> perform0(node.left) || perform0(node.right)
             is FractionSyntax -> true
-            is RadicalWithIndexSyntax -> perform0(node.left) || perform0(node.right)
+            is RadicalWithIndexSyntax -> true
             is MultiplicationSyntax -> perform0(node.left) || perform0(node.right)
         }
     }
@@ -163,8 +232,11 @@ public class SimplifyParentheses(public val precedenceFunction: (MathSyntax) ->
             val isInsideExpOperator =
                 node.parent is ExponentSyntax && (node.parent as ExponentSyntax).useOperatorForm
 
+            val isOnOrUnderNormalFraction = node.parent is FractionSyntax && !((node.parent as FractionSyntax).infix)
+
             node.parentheses = !isRightOfSuperscript
                     && (needParenthesesByPrecedence || node.parent is UnaryOperatorSyntax || isInsideExpOperator)
+                    && !isOnOrUnderNormalFraction
 
             perform(node.operand)
         }
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
index 1ab20ed85..a40c785b9 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
@@ -99,13 +99,17 @@ internal class TestFeatures {
     fun multiplication() = testLatex("x*1", "x\\times1")
 
     @Test
-    fun inverseTrigonometry() {
-        testLatex("asin(x)", "\\operatorname{sin}^{-1}\\,\\left(x\\right)")
-        testLatex("asinh(x)", "\\operatorname{sinh}^{-1}\\,\\left(x\\right)")
-        testLatex("acos(x)", "\\operatorname{cos}^{-1}\\,\\left(x\\right)")
-        testLatex("acosh(x)", "\\operatorname{cosh}^{-1}\\,\\left(x\\right)")
-        testLatex("atan(x)", "\\operatorname{tan}^{-1}\\,\\left(x\\right)")
-        testLatex("atanh(x)", "\\operatorname{tanh}^{-1}\\,\\left(x\\right)")
+    fun inverseTrigonometric() {
+        testLatex("asin(x)", "\\operatorname{arcsin}\\,\\left(x\\right)")
+        testLatex("acos(x)", "\\operatorname{arccos}\\,\\left(x\\right)")
+        testLatex("atan(x)", "\\operatorname{arctan}\\,\\left(x\\right)")
+    }
+
+    @Test
+    fun inverseHyperbolic() {
+        testLatex("asinh(x)", "\\operatorname{arsinh}\\,\\left(x\\right)")
+        testLatex("acosh(x)", "\\operatorname{arcosh}\\,\\left(x\\right)")
+        testLatex("atanh(x)", "\\operatorname{artanh}\\,\\left(x\\right)")
     }
 
 //    @Test
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
index 599e43eb2..09ec127c7 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
@@ -37,4 +37,10 @@ internal class TestStages {
         testLatex("exp(x/2)", "\\operatorname{exp}\\,\\left(\\frac{x}{2}\\right)")
         testLatex("exp(x^2)", "\\operatorname{exp}\\,\\left(x^{2}\\right)")
     }
+
+    @Test
+    fun fraction() {
+        testLatex("x/y", "\\frac{x}{y}")
+        testLatex("x^(x/y)", "x^{x/y}")
+    }
 }
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index 46bf657c3..a77f9d98b 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -15,7 +15,7 @@ The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-d
 ```gradle
 repositories {
     maven { url 'https://repo.kotlin.link' }
-    maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } // include for builds based on kotlin-eap
+    mavenCentral()
 }
 
 dependencies {
@@ -26,7 +26,7 @@ dependencies {
 ```kotlin
 repositories {
     maven("https://repo.kotlin.link")
-    maven("https://dl.bintray.com/kotlin/kotlin-eap") // include for builds based on kotlin-eap
+    mavenCentral()
 }
 
 dependencies {
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index c7c30f1a1..2090ede3e 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -17,7 +17,7 @@ The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-
 ```gradle
 repositories {
     maven { url 'https://repo.kotlin.link' }
-    maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } // include for builds based on kotlin-eap
+    mavenCentral()
 }
 
 dependencies {
@@ -28,7 +28,7 @@ dependencies {
 ```kotlin
 repositories {
     maven("https://repo.kotlin.link")
-    maven("https://dl.bintray.com/kotlin/kotlin-eap") // include for builds based on kotlin-eap
+    mavenCentral()
 }
 
 dependencies {
-- 
2.34.1


From d0281871fac1f59f4218ea1e4440f1991e742bb1 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Wed, 5 May 2021 14:27:01 +0300
Subject: [PATCH 181/713] analytic tests and examples

---
 .../kmath/tensors/DataSetNormalization.kt     |  46 ++++++
 .../tensors/api/AnalyticTensorAlgebra.kt      |   3 +-
 .../algebras/DoubleAnalyticTensorAlgebra.kt   |   3 +-
 .../core/TestDoubleAnalyticTensorAlgebra.kt   | 152 ++++++++++++++++--
 4 files changed, 186 insertions(+), 18 deletions(-)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
new file mode 100644
index 000000000..4d53d940b
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors
+
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
+
+// Dataset normalization
+
+fun main() {
+
+    // work in context with analytic methods
+    DoubleAnalyticTensorAlgebra {
+        // take dataset of 5-element vectors from normal distribution
+        val dataset = randomNormal(intArrayOf(100, 5)) * 1.5 // all elements from N(0, 1.5)
+        BroadcastDoubleTensorAlgebra {
+            dataset += fromArray(
+                intArrayOf(5),
+                doubleArrayOf(0.0, 1.0, 1.5, 3.0, 5.0) // rows means
+            )
+        }
+
+        // find out mean and standard deviation of each column
+        val mean = dataset.mean(0, false)
+        val std = dataset.std(0, false)
+
+        println("Mean:\n$mean")
+        println("Standard deviation:\n$std")
+
+        // also we can calculate other statistic as minimum and maximum of rows
+        println("Minimum:\n${dataset.min(0, false)}")
+        println("Maximum:\n${dataset.max(0, false)}")
+
+        // now we can scale dataset with mean normalization
+        val datasetScaled = BroadcastDoubleTensorAlgebra { (dataset - mean) / std }
+
+        // find out mean and std of scaled dataset
+
+        println("Mean of scaled:\n${datasetScaled.mean(0, false)}")
+        println("Mean of scaled:\n${datasetScaled.std(0, false)}")
+    }
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index f9b2df45c..7784bfa45 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -51,7 +51,6 @@ public interface AnalyticTensorAlgebra<T> :
      */
     public fun Tensor<T>.max(dim: Int, keepDim: Boolean): Tensor<T>
 
-
     /**
      * @return the mean of all elements in the input tensor.
      */
@@ -110,7 +109,7 @@ public interface AnalyticTensorAlgebra<T> :
     public fun Tensor<T>.exp(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.log.html
-    public fun Tensor<T>.log(): Tensor<T>
+    public fun Tensor<T>.ln(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.sqrt.html
     public fun Tensor<T>.sqrt(): Tensor<T>
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
index 547018498..5580f845f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
@@ -25,7 +25,6 @@ public object DoubleAnalyticTensorAlgebra :
     override fun Tensor<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
         foldDim({ x -> x.maxOrNull()!! }, dim, keepDim)
 
-
     override fun Tensor<Double>.mean(): Double = this.fold { it.sum() / tensor.numElements }
 
     override fun Tensor<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor =
@@ -70,7 +69,7 @@ public object DoubleAnalyticTensorAlgebra :
 
     override fun Tensor<Double>.exp(): DoubleTensor = tensor.map(::exp)
 
-    override fun Tensor<Double>.log(): DoubleTensor = tensor.map(::ln)
+    override fun Tensor<Double>.ln(): DoubleTensor = tensor.map(::ln)
 
     override fun Tensor<Double>.sqrt(): DoubleTensor = tensor.map(::sqrt)
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index 835b8a08a..bebd65dc5 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -2,35 +2,159 @@ package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
-import kotlin.math.abs
-import kotlin.math.exp
+import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra.tan
+import kotlin.math.*
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
 internal class TestDoubleAnalyticTensorAlgebra {
 
     val shape = intArrayOf(2, 1, 3, 2)
-    val buffer = doubleArrayOf(27.1, 20.0, 19.84, 23.123, 0.0, 1.0, 3.23, 133.7, 25.3, 100.3, 11.0, 12.012)
+    val buffer = doubleArrayOf(
+        27.1, 20.0, 19.84,
+        23.123, 3.0, 2.0,
+
+        3.23, 133.7, 25.3,
+        100.3, 11.0, 12.012
+    )
     val tensor = DoubleTensor(shape, buffer)
 
     fun DoubleArray.fmap(transform: (Double) -> Double): DoubleArray {
         return this.map(transform).toDoubleArray()
     }
 
-    fun DoubleArray.epsEqual(other: DoubleArray, eps: Double = 1e-5): Boolean {
-        for ((elem1, elem2) in this.asSequence().zip(other.asSequence())) {
-            if (abs(elem1 - elem2) > eps) {
-                return false
-            }
-        }
-        return true
+    fun expectedTensor(transform: (Double) -> Double): DoubleTensor {
+        return DoubleTensor(shape, buffer.fmap(transform))
     }
 
     @Test
     fun testExp() = DoubleAnalyticTensorAlgebra {
-        tensor.exp().let {
-            assertTrue { shape contentEquals it.shape }
-            assertTrue { buffer.fmap(::exp).epsEqual(it.mutableBuffer.array())}
-        }
+        assertTrue { tensor.exp() eq expectedTensor(::exp) }
     }
+
+    @Test
+    fun testLog() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor.ln() eq expectedTensor(::ln) }
+    }
+
+    @Test
+    fun testSqrt() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor.sqrt() eq expectedTensor(::sqrt) }
+    }
+
+    @Test
+    fun testCos() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor.cos() eq expectedTensor(::cos) }
+    }
+
+
+    @Test
+    fun testCosh() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor.cosh() eq expectedTensor(::cosh) }
+    }
+
+    @Test
+    fun testAcosh() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor.acosh() eq expectedTensor(::acosh) }
+    }
+
+    @Test
+    fun testSin() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor.sin() eq expectedTensor(::sin) }
+    }
+
+    @Test
+    fun testSinh() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor.sinh() eq expectedTensor(::sinh) }
+    }
+
+    @Test
+    fun testAsinh() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor.asinh() eq expectedTensor(::asinh) }
+    }
+
+    @Test
+    fun testTan() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor.tan() eq expectedTensor(::tan) }
+    }
+
+    @Test
+    fun testAtan() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor.atan() eq expectedTensor(::atan) }
+    }
+
+    @Test
+    fun testTanh() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor.tanh() eq expectedTensor(::tanh) }
+    }
+
+    @Test
+    fun testCeil() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor.ceil() eq expectedTensor(::ceil) }
+    }
+
+    @Test
+    fun testFloor() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor.floor() eq expectedTensor(::floor) }
+    }
+
+    val shape2 = intArrayOf(2, 2)
+    val buffer2 = doubleArrayOf(
+        1.0, 2.0,
+        -3.0, 4.0
+    )
+    val tensor2 = DoubleTensor(shape2, buffer2)
+
+    @Test
+    fun testMin() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor2.min() == -3.0 }
+        assertTrue { tensor2.min(0, true) eq fromArray(
+            intArrayOf(1, 2),
+            doubleArrayOf(-3.0, 2.0)
+        )}
+        assertTrue { tensor2.min(1, false) eq fromArray(
+            intArrayOf(2),
+            doubleArrayOf(1.0, -3.0)
+        )}
+    }
+
+    @Test
+    fun testMax() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor2.max() == 4.0 }
+        assertTrue { tensor2.max(0, true) eq fromArray(
+            intArrayOf(1, 2),
+            doubleArrayOf(1.0, 4.0)
+        )}
+        assertTrue { tensor2.max(1, false) eq fromArray(
+            intArrayOf(2),
+            doubleArrayOf(2.0, 4.0)
+        )}
+    }
+
+    @Test
+    fun testSum() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor2.sum() == 4.0 }
+        assertTrue { tensor2.sum(0, true) eq fromArray(
+            intArrayOf(1, 2),
+            doubleArrayOf(-2.0, 6.0)
+        )}
+        assertTrue { tensor2.sum(1, false) eq fromArray(
+            intArrayOf(2),
+            doubleArrayOf(3.0, 1.0)
+        )}
+    }
+
+    @Test
+    fun testMean() = DoubleAnalyticTensorAlgebra {
+        assertTrue { tensor2.mean() == 1.0 }
+        assertTrue { tensor2.mean(0, true) eq fromArray(
+            intArrayOf(1, 2),
+            doubleArrayOf(-1.0, 3.0)
+        )}
+        assertTrue { tensor2.mean(1, false) eq fromArray(
+            intArrayOf(2),
+            doubleArrayOf(1.5, 0.5)
+        )}
+    }
+
 }
\ No newline at end of file
-- 
2.34.1


From 218b81a242b79baba4cb8db82887e4fa90556b05 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 5 May 2021 16:11:46 +0100
Subject: [PATCH 182/713] Min max refactor

---
 .../tensors/api/AnalyticTensorAlgebra.kt      | 37 -------------------
 .../kmath/tensors/api/TensorAlgebra.kt        | 35 ++++++++++++++++++
 .../algebras/DoubleAnalyticTensorAlgebra.kt   | 10 -----
 .../core/algebras/DoubleTensorAlgebra.kt      | 14 +++++++
 .../core/TestDoubleAnalyticTensorAlgebra.kt   |  8 ++--
 5 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index 7784bfa45..aa5678b31 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -14,43 +14,6 @@ package space.kscience.kmath.tensors.api
 public interface AnalyticTensorAlgebra<T> :
     TensorPartialDivisionAlgebra<T> {
 
-
-    /**
-     * @return the minimum value of all elements in the input tensor.
-     */
-    public fun Tensor<T>.min(): T
-
-    /**
-     * Returns the minimum value of each row of the input tensor in the given dimension [dim].
-     *
-     * If [keepDim] is true, the output tensor is of the same size as
-     * input except in the dimension [dim] where it is of size 1.
-     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
-     *
-     * @param dim the dimension to reduce.
-     * @param keepDim whether the output tensor has [dim] retained or not.
-     * @return the minimum value of each row of the input tensor in the given dimension [dim].
-     */
-    public fun Tensor<T>.min(dim: Int, keepDim: Boolean): Tensor<T>
-
-    /**
-     * @return the maximum value of all elements in the input tensor.
-     */
-    public fun Tensor<T>.max(): T
-
-    /**
-     * Returns the maximum value of each row of the input tensor in the given dimension [dim].
-     *
-     * If [keepDim] is true, the output tensor is of the same size as
-     * input except in the dimension [dim] where it is of size 1.
-     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
-     *
-     * @param dim the dimension to reduce.
-     * @param keepDim whether the output tensor has [dim] retained or not.
-     * @return the maximum value of each row of the input tensor in the given dimension [dim].
-     */
-    public fun Tensor<T>.max(dim: Int, keepDim: Boolean): Tensor<T>
-
     /**
      * @return the mean of all elements in the input tensor.
      */
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index b99f79e9a..b0a0f9618 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -269,6 +269,41 @@ public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
      */
     public fun Tensor<T>.sum(dim: Int, keepDim: Boolean): Tensor<T>
 
+    /**
+     * @return the minimum value of all elements in the input tensor.
+     */
+    public fun Tensor<T>.min(): T
+
+    /**
+     * Returns the minimum value of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the minimum value of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.min(dim: Int, keepDim: Boolean): Tensor<T>
+
+    /**
+     * @return the maximum value of all elements in the input tensor.
+     */
+    public fun Tensor<T>.max(): T
+
+    /**
+     * Returns the maximum value of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the maximum value of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.max(dim: Int, keepDim: Boolean): Tensor<T>
 
 
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
index 5580f845f..4a1f360e3 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
@@ -15,16 +15,6 @@ public object DoubleAnalyticTensorAlgebra :
     AnalyticTensorAlgebra<Double>,
     DoubleTensorAlgebra() {
 
-    override fun Tensor<Double>.min(): Double = this.fold { it.minOrNull()!! }
-
-    override fun Tensor<Double>.min(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim({ x -> x.minOrNull()!! }, dim, keepDim)
-
-    override fun Tensor<Double>.max(): Double = this.fold { it.maxOrNull()!! }
-
-    override fun Tensor<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim({ x -> x.maxOrNull()!! }, dim, keepDim)
-
     override fun Tensor<Double>.mean(): Double = this.fold { it.sum() / tensor.numElements }
 
     override fun Tensor<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor =
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index c0a6312a9..d220bdd9a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -9,6 +9,8 @@ import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.tensors.api.TensorPartialDivisionAlgebra
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.*
+import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra.fold
+import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra.foldDim
 import space.kscience.kmath.tensors.core.broadcastOuterTensors
 import space.kscience.kmath.tensors.core.checkBufferShapeConsistency
 import space.kscience.kmath.tensors.core.checkEmptyDoubleBuffer
@@ -447,4 +449,16 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
 
     override fun Tensor<Double>.sum(dim: Int, keepDim: Boolean): DoubleTensor =
         foldDim({ x -> x.sum() }, dim, keepDim)
+
+
+    override fun Tensor<Double>.min(): Double = this.fold { it.minOrNull()!! }
+
+    override fun Tensor<Double>.min(dim: Int, keepDim: Boolean): DoubleTensor =
+        foldDim({ x -> x.minOrNull()!! }, dim, keepDim)
+
+    override fun Tensor<Double>.max(): Double = this.fold { it.maxOrNull()!! }
+
+    override fun Tensor<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
+        foldDim({ x -> x.maxOrNull()!! }, dim, keepDim)
+
 }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index bebd65dc5..3ea19da26 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -2,7 +2,7 @@ package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
-import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra.tan
+import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import kotlin.math.*
 import kotlin.test.Test
 import kotlin.test.assertTrue
@@ -106,7 +106,7 @@ internal class TestDoubleAnalyticTensorAlgebra {
     val tensor2 = DoubleTensor(shape2, buffer2)
 
     @Test
-    fun testMin() = DoubleAnalyticTensorAlgebra {
+    fun testMin() = DoubleTensorAlgebra {
         assertTrue { tensor2.min() == -3.0 }
         assertTrue { tensor2.min(0, true) eq fromArray(
             intArrayOf(1, 2),
@@ -119,7 +119,7 @@ internal class TestDoubleAnalyticTensorAlgebra {
     }
 
     @Test
-    fun testMax() = DoubleAnalyticTensorAlgebra {
+    fun testMax() = DoubleTensorAlgebra {
         assertTrue { tensor2.max() == 4.0 }
         assertTrue { tensor2.max(0, true) eq fromArray(
             intArrayOf(1, 2),
@@ -132,7 +132,7 @@ internal class TestDoubleAnalyticTensorAlgebra {
     }
 
     @Test
-    fun testSum() = DoubleAnalyticTensorAlgebra {
+    fun testSum() = DoubleTensorAlgebra {
         assertTrue { tensor2.sum() == 4.0 }
         assertTrue { tensor2.sum(0, true) eq fromArray(
             intArrayOf(1, 2),
-- 
2.34.1


From 431db00f1ac9da54b65d00a09fa6f7b33c150942 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 5 May 2021 16:35:26 +0100
Subject: [PATCH 183/713] refactor tests

---
 .../kmath/tensors/core/TestBroadcasting.kt    | 12 ++++----
 .../kmath/tensors/core/TestDoubleTensor.kt    |  8 ++---
 .../tensors/core/TestDoubleTensorAlgebra.kt   | 30 ++++++-------------
 3 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 1564b85c9..6e3b4df60 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -9,7 +9,7 @@ import kotlin.test.assertTrue
 internal class TestBroadcasting {
 
     @Test
-    fun broadcastShapes() = DoubleTensorAlgebra {
+    fun testBroadcastShapes() = DoubleTensorAlgebra {
         assertTrue(
             broadcastShapes(
                 intArrayOf(2, 3), intArrayOf(1, 3), intArrayOf(1, 1, 1)
@@ -24,7 +24,7 @@ internal class TestBroadcasting {
     }
 
     @Test
-    fun broadcastTo() = DoubleTensorAlgebra {
+    fun testBroadcastTo() = DoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
 
@@ -34,7 +34,7 @@ internal class TestBroadcasting {
     }
 
     @Test
-    fun broadcastTensors() = DoubleTensorAlgebra {
+    fun testBroadcastTensors() = DoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
@@ -51,7 +51,7 @@ internal class TestBroadcasting {
     }
 
     @Test
-    fun broadcastOuterTensors() = DoubleTensorAlgebra {
+    fun testBroadcastOuterTensors() = DoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
@@ -68,7 +68,7 @@ internal class TestBroadcasting {
     }
 
     @Test
-    fun broadcastOuterTensorsShapes() = DoubleTensorAlgebra {
+    fun testBroadcastOuterTensorsShapes() = DoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 1, 3, 2, 3), DoubleArray(2 * 1 * 3 * 2 * 3) {0.0})
         val tensor2 = fromArray(intArrayOf(4, 2, 5, 1, 3, 3), DoubleArray(4 * 2 * 5 * 1 * 3 * 3) {0.0})
         val tensor3 = fromArray(intArrayOf(1, 1), doubleArrayOf(500.0))
@@ -81,7 +81,7 @@ internal class TestBroadcasting {
     }
 
     @Test
-    fun minusTensor() = BroadcastDoubleTensorAlgebra.invoke {
+    fun testMinusTensor() = BroadcastDoubleTensorAlgebra.invoke {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index ed5f8e780..132735cc7 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -15,14 +15,14 @@ import kotlin.test.assertTrue
 internal class TestDoubleTensor {
 
     @Test
-    fun valueTest() = DoubleTensorAlgebra {
+    fun testValue() = DoubleTensorAlgebra {
         val value = 12.5
         val tensor = fromArray(intArrayOf(1), doubleArrayOf(value))
         assertEquals(tensor.value(), value)
     }
 
     @Test
-    fun stridesTest() = DoubleTensorAlgebra {
+    fun testStrides() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
         assertEquals(tensor[intArrayOf(0, 1)], 5.8)
         assertTrue(
@@ -31,7 +31,7 @@ internal class TestDoubleTensor {
     }
 
     @Test
-    fun getTest() = DoubleTensorAlgebra {
+    fun testGet() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(1, 2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
         val matrix = tensor[0].as2D()
         assertEquals(matrix[0, 1], 5.8)
@@ -55,7 +55,7 @@ internal class TestDoubleTensor {
     }
 
     @Test
-    fun noBufferProtocol() {
+    fun testNoBufferProtocol() {
 
         // create buffer
         val doubleArray = DoubleBuffer(doubleArrayOf(1.0, 2.0, 3.0))
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index df2d21b96..d782d78d9 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -10,28 +10,28 @@ import kotlin.test.assertTrue
 internal class TestDoubleTensorAlgebra {
 
     @Test
-    fun doublePlus() = DoubleTensorAlgebra {
+    fun testDoublePlus() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(1.0, 2.0))
         val res = 10.0 + tensor
         assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(11.0, 12.0))
     }
 
     @Test
-    fun doubleDiv() = DoubleTensorAlgebra {
+    fun TestDoubleDiv() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(2.0, 4.0))
         val res = 2.0/tensor
         assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(1.0, 0.5))
     }
 
     @Test
-    fun divDouble() = DoubleTensorAlgebra {
+    fun testDivDouble() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(10.0, 5.0))
         val res = tensor / 2.5
         assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(4.0, 2.0))
     }
 
     @Test
-    fun transpose1x1() = DoubleTensorAlgebra {
+    fun testTranspose1x1() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(1), doubleArrayOf(0.0))
         val res = tensor.transpose(0, 0)
 
@@ -40,7 +40,7 @@ internal class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun transpose3x2() = DoubleTensorAlgebra {
+    fun testTranspose3x2() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res = tensor.transpose(1, 0)
 
@@ -49,7 +49,7 @@ internal class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun transpose1x2x3() = DoubleTensorAlgebra {
+    fun testTranspose1x2x3() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res01 = tensor.transpose(0, 1)
         val res02 = tensor.transpose(-3, 2)
@@ -65,7 +65,7 @@ internal class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun linearStructure() = DoubleTensorAlgebra {
+    fun testLinearStructure() = DoubleTensorAlgebra {
         val shape = intArrayOf(3)
         val tensorA = full(value = -4.5, shape = shape)
         val tensorB = full(value = 10.9, shape = shape)
@@ -97,7 +97,7 @@ internal class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun dot() = DoubleTensorAlgebra {
+    fun testDot() = DoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor11 = fromArray(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(3), doubleArrayOf(10.0, 20.0, 30.0))
@@ -118,22 +118,10 @@ internal class TestDoubleTensorAlgebra {
         val res11 = tensor1.dot(tensor11)
         assertTrue(res11.mutableBuffer.array() contentEquals doubleArrayOf(22.0, 28.0, 49.0, 64.0))
         assertTrue(res11.shape contentEquals intArrayOf(2, 2))
-
-        var tensor4 = fromArray(intArrayOf(10, 3, 4), DoubleArray(10 * 3 * 4) {0.0})
-        var tensor5 = fromArray(intArrayOf(10, 4, 5), DoubleArray(10 * 4 * 5) {0.0})
-        assertTrue(tensor4.dot(tensor5).shape contentEquals intArrayOf(10, 3, 5))
-
-        tensor4 = fromArray(intArrayOf(10, 3, 4), DoubleArray(10 * 3 * 4) {0.0})
-        tensor5 = fromArray(intArrayOf(4, 5), DoubleArray(4 * 5) {0.0})
-        assertTrue(tensor4.dot(tensor5).shape contentEquals intArrayOf(10, 3, 5))
-
-        tensor4 = fromArray(intArrayOf(4, 2, 1, 3, 8, 1), DoubleArray(4 * 2 * 1 * 3 * 8 * 1) {0.0})
-        tensor5 = fromArray(intArrayOf(5, 1, 2, 8, 3, 1, 5), DoubleArray(5 * 1 * 2 * 8 * 3 * 1 * 5) {0.0})
-        assertTrue(tensor4.dot(tensor5).shape contentEquals intArrayOf(5, 4, 2, 8, 3, 8, 5))
     }
 
     @Test
-    fun diagonalEmbedding() = DoubleTensorAlgebra {
+    fun testDiagonalEmbedding() = DoubleTensorAlgebra {
         val tensor1 = fromArray(intArrayOf(3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor3 = zeros(intArrayOf(2, 3, 4, 5))
-- 
2.34.1


From 229c1b57daa3727a6e59d16c6ed04786a83ae220 Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Thu, 6 May 2021 10:27:47 +0300
Subject: [PATCH 184/713] add documentation to DoubleLinearOpsTensorAlgebra

---
 .../tensors/api/LinearOpsTensorAlgebra.kt     |  2 +-
 .../algebras/DoubleLinearOpsTensorAlgebra.kt  | 95 ++++++++++++++++++-
 2 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index 527e5d386..ec070b6bd 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -81,7 +81,7 @@ public interface LinearOpsTensorAlgebra<T> :
      * If input is a batch of tensors, then U, S, and Vh are also batched with the same batch dimensions as input.
      * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.svd
      *
-     * @return the determinant.
+     * @return triple `(U, S, V)`.
      */
     public fun Tensor<T>.svd(): Triple<Tensor<T>, Tensor<T>, Tensor<T>>
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
index 89345e315..d17dc70fe 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
@@ -20,7 +20,10 @@ import space.kscience.kmath.tensors.core.luPivotHelper
 import space.kscience.kmath.tensors.core.pivInit
 import kotlin.math.min
 
-
+/**
+ * Implementation of common linear algebra operations on double numbers.
+ * Implements the LinearOpsTensorAlgebra<Double> interface.
+ */
 public object DoubleLinearOpsTensorAlgebra :
     LinearOpsTensorAlgebra<Double>,
     DoubleTensorAlgebra() {
@@ -29,12 +32,41 @@ public object DoubleLinearOpsTensorAlgebra :
 
     override fun Tensor<Double>.det(): DoubleTensor = detLU(1e-9)
 
+    /**
+     * Computes the LU factorization of a matrix or batches of matrices `input`.
+     * Returns a tuple containing the LU factorization and pivots of `input`.
+     *
+     * @param epsilon permissible error when comparing the determinant of a matrix with zero
+     * @return pair of `factorization` and `pivots`.
+     * The `factorization` has the shape ``(*, m, n)``, where``(*, m, n)`` is the shape of the `input` tensor.
+     * The `pivots`  has the shape ``(∗, min(m, n))``. `pivots` stores all the intermediate transpositions of rows.
+     */
     public fun Tensor<Double>.luFactor(epsilon: Double): Pair<DoubleTensor, IntTensor> =
         computeLU(tensor, epsilon)
             ?: throw IllegalArgumentException("Tensor contains matrices which are singular at precision $epsilon")
 
+    /**
+     * Computes the LU factorization of a matrix or batches of matrices `input`.
+     * Returns a tuple containing the LU factorization and pivots of `input`.
+     * Uses an error of ``1e-9`` when calculating whether a matrix is degenerate.
+     *
+     * @return pair of `factorization` and `pivots`.
+     * The `factorization` has the shape ``(*, m, n)``, where``(*, m, n)`` is the shape of the `input` tensor.
+     * The `pivots`  has the shape ``(∗, min(m, n))``. `pivots` stores all the intermediate transpositions of rows.
+     */
     public fun Tensor<Double>.luFactor(): Pair<DoubleTensor, IntTensor> = luFactor(1e-9)
 
+    /**
+     * Unpacks the data and pivots from a LU factorization of a tensor.
+     * Given a tensor [luTensor], return tensors (P, L, U) satisfying ``P * luTensor = L * U``,
+     * with `P` being a permutation matrix or batch of matrices,
+     * `L` being a lower triangular matrix or batch of matrices,
+     * `U` being an upper triangular matrix or batch of matrices.
+     *
+     * @param luTensor the packed LU factorization data
+     * @param pivotsTensor the packed LU factorization pivots
+     * @return triple of P, L and U tensors
+     */
     public fun luPivot(
         luTensor: Tensor<Double>,
         pivotsTensor: Tensor<Int>
@@ -66,6 +98,18 @@ public object DoubleLinearOpsTensorAlgebra :
         return Triple(pTensor, lTensor, uTensor)
     }
 
+    /**
+     * QR decomposition.
+     *
+     * Computes the QR decomposition of a matrix or a batch of matrices, and returns a pair `(Q, R)` of tensors.
+     * Given a tensor `input`, return tensors (Q, R) satisfying ``input = Q * R``,
+     * with `Q` being an orthogonal matrix or batch of orthogonal matrices
+     * and `R` being an upper triangular matrix or batch of upper triangular matrices.
+     *
+     * @param epsilon permissible error when comparing tensors for equality.
+     * Used when checking the positive definiteness of the input matrix or matrices.
+     * @return pair of Q and R tensors.
+     */
     public fun Tensor<Double>.cholesky(epsilon: Double): DoubleTensor {
         checkSquareMatrix(shape)
         checkPositiveDefinite(tensor, epsilon)
@@ -98,6 +142,18 @@ public object DoubleLinearOpsTensorAlgebra :
     override fun Tensor<Double>.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> =
         svd(epsilon = 1e-10)
 
+    /**
+     * Singular Value Decomposition.
+     *
+     * Computes the singular value decomposition of either a matrix or batch of matrices `input`.
+     * The singular value decomposition is represented as a triple `(U, S, V)`,
+     * such that ``input = U.dot(diagonalEmbedding(S).dot(V.T))``.
+     * If input is a batch of tensors, then U, S, and Vh are also batched with the same batch dimensions as input.
+     *
+     * @param epsilon permissible error when calculating the dot product of vectors,
+     * i.e. the precision with which the cosine approaches 1 in an iterative algorithm.
+     * @return triple `(U, S, V)`.
+     */
     public fun Tensor<Double>.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         val size = tensor.linearStructure.dim
         val commonShape = tensor.shape.sliceArray(0 until size - 2)
@@ -125,7 +181,14 @@ public object DoubleLinearOpsTensorAlgebra :
     override fun Tensor<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> =
         symEig(epsilon = 1e-15)
 
-    //For information: http://hua-zhou.github.io/teaching/biostatm280-2017spring/slides/16-eigsvd/eigsvd.html
+    /**
+     * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
+     * represented by a pair (eigenvalues, eigenvectors).
+     *
+     * @param epsilon permissible error when comparing tensors for equality
+     * and when the cosine approaches 1 in the SVD algorithm.
+     * @return a pair (eigenvalues, eigenvectors)
+     */
     public fun Tensor<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
         checkSymmetric(tensor, epsilon)
         val (u, s, v) = tensor.svd(epsilon)
@@ -139,6 +202,13 @@ public object DoubleLinearOpsTensorAlgebra :
         return eig to v
     }
 
+    /**
+     * Computes the determinant of a square matrix input, or of each square matrix in a batched input
+     * using LU factorization algorithm.
+     *
+     * @param epsilon error in the LU algorithm - permissible error when comparing the determinant of a matrix with zero
+     * @return the determinant.
+     */
     public fun Tensor<Double>.detLU(epsilon: Double = 1e-9): DoubleTensor {
 
         checkSquareMatrix(tensor.shape)
@@ -164,6 +234,15 @@ public object DoubleLinearOpsTensorAlgebra :
         return detTensor
     }
 
+    /**
+     * Computes the multiplicative inverse matrix of a square matrix input, or of each square matrix in a batched input
+     * using LU factorization algorithm.
+     * Given a square matrix `a`, return the matrix `aInv` satisfying
+     * ``a.dot(aInv) = aInv.dot(a) = eye(a.shape[0])``.
+     *
+     * @param epsilon error in the LU algorithm - permissible error when comparing the determinant of a matrix with zero
+     * @return the multiplicative inverse of a matrix.
+     */
     public fun Tensor<Double>.invLU(epsilon: Double = 1e-9): DoubleTensor {
         val (luTensor, pivotsTensor) = luFactor(epsilon)
         val invTensor = luTensor.zeroesLike()
@@ -177,6 +256,18 @@ public object DoubleLinearOpsTensorAlgebra :
         return invTensor
     }
 
+    /**
+     * LUP decomposition
+     *
+     * Computes the LUP decomposition of a matrix or a batch of matrices.
+     * Given a tensor `input`, return tensors (P, L, U) satisfying ``P * input = L * U``,
+     * with `P` being a permutation matrix or batch of matrices,
+     * `L` being a lower triangular matrix or batch of matrices,
+     * `U` being an upper triangular matrix or batch of matrices.
+     *
+     * @param epsilon permissible error when comparing the determinant of a matrix with zero
+     * @return triple of P, L and U tensors
+     */
     public fun Tensor<Double>.lu(epsilon: Double = 1e-9): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         val (lu, pivots) = this.luFactor(epsilon)
         return luPivot(lu, pivots)
-- 
2.34.1


From a1cbd7a457a93619ad3033c66248b522137e4c46 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Thu, 6 May 2021 09:48:43 +0100
Subject: [PATCH 185/713] TensorLinearStructure doc

---
 .../kmath/tensors/core/algebras/TensorLinearStructure.kt  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
index 5fbc7390f..d69d342ad 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
@@ -56,7 +56,12 @@ internal fun stepIndex(index: IntArray, shape: IntArray, nDim: Int): IntArray {
     return res
 }
 
-
+/**
+ * This [Strides] implemetation follow the last dimension first convention
+ * For more information: https://numpy.org/doc/stable/reference/generated/numpy.ndarray.strides.html
+ *
+ * @param shape the shape of the tensor.
+ */
 public class TensorLinearStructure(override val shape: IntArray) : Strides
 {
     override val strides: IntArray
@@ -65,6 +70,7 @@ public class TensorLinearStructure(override val shape: IntArray) : Strides
     override fun index(offset: Int): IntArray =
         indexFromOffset(offset, strides, shape.size)
 
+    // TODO: documentation (Alya)
     public fun stepIndex(index: IntArray): IntArray =
         stepIndex(index, shape, shape.size)
 
-- 
2.34.1


From 477e64e4d396ebff3a66f487b2b0cab7f507e6bd Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Thu, 6 May 2021 09:51:59 +0100
Subject: [PATCH 186/713] Typos corrected

---
 .../kmath/tensors/core/algebras/TensorLinearStructure.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
index d69d342ad..a5c01af55 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
@@ -57,7 +57,7 @@ internal fun stepIndex(index: IntArray, shape: IntArray, nDim: Int): IntArray {
 }
 
 /**
- * This [Strides] implemetation follow the last dimension first convention
+ * This [Strides] implementation follows the last dimension first convention
  * For more information: https://numpy.org/doc/stable/reference/generated/numpy.ndarray.strides.html
  *
  * @param shape the shape of the tensor.
-- 
2.34.1


From 16bed539977c516645d0a980f4f22578a6fbec11 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Thu, 6 May 2021 09:59:58 +0100
Subject: [PATCH 187/713] Drop unused functionality in TensorLinearStructure

---
 .../algebras/DoubleLinearOpsTensorAlgebra.kt  |  2 +-
 .../core/algebras/TensorLinearStructure.kt    | 27 +------------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
index d17dc70fe..430482613 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
@@ -155,7 +155,7 @@ public object DoubleLinearOpsTensorAlgebra :
      * @return triple `(U, S, V)`.
      */
     public fun Tensor<Double>.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        val size = tensor.linearStructure.dim
+        val size = tensor.dimension
         val commonShape = tensor.shape.sliceArray(0 until size - 2)
         val (n, m) = tensor.shape.sliceArray(size - 2 until size)
         val uTensor = zeros(commonShape + intArrayOf(min(n, m), n))
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
index a5c01af55..68aa03311 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
@@ -39,45 +39,20 @@ internal fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): IntArra
     return res
 }
 
-internal fun stepIndex(index: IntArray, shape: IntArray, nDim: Int): IntArray {
-    val res = index.copyOf()
-    var current = nDim - 1
-    var carry = 0
-
-    do {
-        res[current]++
-        if (res[current] >= shape[current]) {
-            carry = 1
-            res[current] = 0
-        }
-        current--
-    } while (carry != 0 && current >= 0)
-
-    return res
-}
-
 /**
  * This [Strides] implementation follows the last dimension first convention
  * For more information: https://numpy.org/doc/stable/reference/generated/numpy.ndarray.strides.html
  *
  * @param shape the shape of the tensor.
  */
-public class TensorLinearStructure(override val shape: IntArray) : Strides
-{
+public class TensorLinearStructure(override val shape: IntArray) : Strides {
     override val strides: IntArray
         get() = stridesFromShape(shape)
 
     override fun index(offset: Int): IntArray =
         indexFromOffset(offset, strides, shape.size)
 
-    // TODO: documentation (Alya)
-    public fun stepIndex(index: IntArray): IntArray =
-        stepIndex(index, shape, shape.size)
-
     override val linearSize: Int
         get() = shape.reduce(Int::times)
 
-    public val dim: Int
-        get() = shape.size
-
 }
\ No newline at end of file
-- 
2.34.1


From 499cf85ff08ac65e7343e33af2f4f65cd9967b3f Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Thu, 6 May 2021 12:30:13 +0300
Subject: [PATCH 188/713] refactor BT + docs

---
 .../kmath/tensors/core/BufferedTensor.kt      | 112 ++++--------------
 .../kmath/tensors/core/DoubleTensor.kt        |  19 +++
 .../kscience/kmath/tensors/core/IntTensor.kt  |  17 +++
 .../kmath/tensors/core/tensorCasts.kt         |  36 ++++++
 .../kmath/tensors/core/tensorCastsUtils.kt    |  42 +++++++
 5 files changed, 136 insertions(+), 90 deletions(-)
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCastsUtils.kt

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 22a1ef1bf..e4ffccd96 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -1,116 +1,48 @@
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.nd.MutableBufferND
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.algebras.TensorLinearStructure
 
-
-public open class BufferedTensor<T>(
+/**
+ * [Tensor] implementation provided with [MutableBuffer]
+ */
+public open class BufferedTensor<T> internal constructor(
     override val shape: IntArray,
     internal val mutableBuffer: MutableBuffer<T>,
     internal val bufferStart: Int
 ) : Tensor<T> {
+
+    /**
+     * [TensorLinearStructure] with the same shape
+     */
     public val linearStructure: TensorLinearStructure
         get() = TensorLinearStructure(shape)
 
+    /**
+     * Number of elements in tensor
+     */
     public val numElements: Int
         get() = linearStructure.linearSize
 
+    /**
+     * @param index [IntArray] with size equal to tensor dimension
+     * @return the element by multidimensional index
+     */
     override fun get(index: IntArray): T = mutableBuffer[bufferStart + linearStructure.offset(index)]
 
+    /**
+     * @param index the [IntArray] with size equal to tensor dimension
+     * @param value the value to set
+     */
     override fun set(index: IntArray, value: T) {
         mutableBuffer[bufferStart + linearStructure.offset(index)] = value
     }
 
+    /**
+     * @return the sequence of pairs multidimensional indices and values
+     */
     override fun elements(): Sequence<Pair<IntArray, T>> = linearStructure.indices().map {
         it to this[it]
     }
 }
-
-public class IntTensor internal constructor(
-    shape: IntArray,
-    buffer: IntArray,
-    offset: Int = 0
-) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset)
-
-public class DoubleTensor internal constructor(
-    shape: IntArray,
-    buffer: DoubleArray,
-    offset: Int = 0
-) : BufferedTensor<Double>(shape, DoubleBuffer(buffer), offset) {
-    override fun toString(): String = toPrettyString()
-}
-
-internal fun BufferedTensor<Int>.asTensor(): IntTensor =
-    IntTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
-
-internal fun BufferedTensor<Double>.asTensor(): DoubleTensor =
-    DoubleTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
-
-internal fun <T> Tensor<T>.copyToBufferedTensor(): BufferedTensor<T> =
-    BufferedTensor(
-        this.shape,
-        TensorLinearStructure(this.shape).indices().map(this::get).toMutableList().asMutableBuffer(), 0
-    )
-
-internal fun <T> Tensor<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
-    is BufferedTensor<T> -> this
-    is MutableBufferND<T> -> if (this.strides.strides contentEquals TensorLinearStructure(this.shape).strides)
-        BufferedTensor(this.shape, this.mutableBuffer, 0) else this.copyToBufferedTensor()
-    else -> this.copyToBufferedTensor()
-}
-
-internal val Tensor<Double>.tensor: DoubleTensor
-    get() = when (this) {
-        is DoubleTensor -> this
-        else -> this.toBufferedTensor().asTensor()
-    }
-
-internal val Tensor<Int>.tensor: IntTensor
-    get() = when (this) {
-        is IntTensor -> this
-        else -> this.toBufferedTensor().asTensor()
-    }
-
-public fun Tensor<Double>.toDoubleTensor(): DoubleTensor = this.tensor
-public fun Tensor<Int>.toIntTensor(): IntTensor = this.tensor
-
-public fun Array<DoubleArray>.toDoubleTensor(): DoubleTensor {
-    val n = size
-    check(n > 0) { "An empty array cannot be casted to tensor" }
-    val m = first().size
-    check(m > 0) { "Inner arrays must have at least 1 argument" }
-    check(all { size == m }) { "Inner arrays must be the same size" }
-
-    val shape = intArrayOf(n, m)
-    val buffer = this.flatMap { arr -> arr.map { it } }.toDoubleArray()
-
-    return DoubleTensor(shape, buffer, 0)
-}
-
-
-public fun Array<IntArray>.toIntTensor(): IntTensor {
-    val n = size
-    check(n > 0) { "An empty array cannot be casted to tensor" }
-    val m = first().size
-    check(m > 0) { "Inner arrays must have at least 1 argument" }
-    check(all { size == m }) { "Inner arrays must be the same size" }
-
-    val shape = intArrayOf(n, m)
-    val buffer = this.flatMap { arr -> arr.map { it } }.toIntArray()
-
-    return IntTensor(shape, buffer, 0)
-}
-
-public fun DoubleTensor.toDoubleArray(): DoubleArray {
-    return DoubleArray(numElements) { i ->
-        mutableBuffer[bufferStart + i]
-    }
-}
-
-public fun IntTensor.toIntArray(): IntArray {
-    return IntArray(numElements) { i ->
-        mutableBuffer[bufferStart + i]
-    }
-}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
new file mode 100644
index 000000000..e3143f5a7
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.structures.DoubleBuffer
+
+/**
+ * Default [BufferedTensor] implementation for [Double] values
+ */
+public class DoubleTensor internal constructor(
+    shape: IntArray,
+    buffer: DoubleArray,
+    offset: Int = 0
+) : BufferedTensor<Double>(shape, DoubleBuffer(buffer), offset) {
+    override fun toString(): String = toPrettyString()
+}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
new file mode 100644
index 000000000..ae1e6c8c8
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.structures.IntBuffer
+
+/**
+ * Default [BufferedTensor] implementation for [Int] values
+ */
+public class IntTensor internal constructor(
+    shape: IntArray,
+    buffer: IntArray,
+    offset: Int = 0
+) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
new file mode 100644
index 000000000..6254ce751
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.tensors.api.Tensor
+
+/**
+ * Casts [Tensor<Double>] to [DoubleTensor]
+ */
+public fun Tensor<Double>.toDoubleTensor(): DoubleTensor = this.tensor
+
+/**
+ * Casts [Tensor<Int>] to [IntTensor]
+ */
+public fun Tensor<Int>.toIntTensor(): IntTensor = this.tensor
+
+/**
+ * @return [DoubleArray] of tensor elements
+ */
+public fun DoubleTensor.toDoubleArray(): DoubleArray {
+    return DoubleArray(numElements) { i ->
+        mutableBuffer[bufferStart + i]
+    }
+}
+
+/**
+ * @return [IntArray] of tensor elements
+ */
+public fun IntTensor.toIntArray(): IntArray {
+    return IntArray(numElements) { i ->
+        mutableBuffer[bufferStart + i]
+    }
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCastsUtils.kt
new file mode 100644
index 000000000..31de6919f
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCastsUtils.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.nd.MutableBufferND
+import space.kscience.kmath.structures.asMutableBuffer
+import space.kscience.kmath.tensors.api.Tensor
+import space.kscience.kmath.tensors.core.algebras.TensorLinearStructure
+
+internal fun BufferedTensor<Int>.asTensor(): IntTensor =
+    IntTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
+
+internal fun BufferedTensor<Double>.asTensor(): DoubleTensor =
+    DoubleTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
+
+internal fun <T> Tensor<T>.copyToBufferedTensor(): BufferedTensor<T> =
+    BufferedTensor(
+        this.shape,
+        TensorLinearStructure(this.shape).indices().map(this::get).toMutableList().asMutableBuffer(), 0
+    )
+
+internal fun <T> Tensor<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
+    is BufferedTensor<T> -> this
+    is MutableBufferND<T> -> if (this.strides.strides contentEquals TensorLinearStructure(this.shape).strides)
+        BufferedTensor(this.shape, this.mutableBuffer, 0) else this.copyToBufferedTensor()
+    else -> this.copyToBufferedTensor()
+}
+
+internal val Tensor<Double>.tensor: DoubleTensor
+    get() = when (this) {
+        is DoubleTensor -> this
+        else -> this.toBufferedTensor().asTensor()
+    }
+
+internal val Tensor<Int>.tensor: IntTensor
+    get() = when (this) {
+        is IntTensor -> this
+        else -> this.toBufferedTensor().asTensor()
+    }
\ No newline at end of file
-- 
2.34.1


From 35928e7960bd5676820b751490be057fa62409ff Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Thu, 6 May 2021 10:52:37 +0100
Subject: [PATCH 189/713] minor corrections

---
 .../kscience/kmath/tensors/core/BufferedTensor.kt | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index e4ffccd96..e8c0556c2 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -5,7 +5,7 @@ import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.algebras.TensorLinearStructure
 
 /**
- * [Tensor] implementation provided with [MutableBuffer]
+ * Represents [Tensor] over a [MutableBuffer] intended to be used through [DoubleTensor] and [IntTensor]
  */
 public open class BufferedTensor<T> internal constructor(
     override val shape: IntArray,
@@ -14,7 +14,7 @@ public open class BufferedTensor<T> internal constructor(
 ) : Tensor<T> {
 
     /**
-     * [TensorLinearStructure] with the same shape
+     * Buffer strides based on [TensorLinearStructure] implementation
      */
     public val linearStructure: TensorLinearStructure
         get() = TensorLinearStructure(shape)
@@ -25,23 +25,12 @@ public open class BufferedTensor<T> internal constructor(
     public val numElements: Int
         get() = linearStructure.linearSize
 
-    /**
-     * @param index [IntArray] with size equal to tensor dimension
-     * @return the element by multidimensional index
-     */
     override fun get(index: IntArray): T = mutableBuffer[bufferStart + linearStructure.offset(index)]
 
-    /**
-     * @param index the [IntArray] with size equal to tensor dimension
-     * @param value the value to set
-     */
     override fun set(index: IntArray, value: T) {
         mutableBuffer[bufferStart + linearStructure.offset(index)] = value
     }
 
-    /**
-     * @return the sequence of pairs multidimensional indices and values
-     */
     override fun elements(): Sequence<Pair<IntArray, T>> = linearStructure.indices().map {
         it to this[it]
     }
-- 
2.34.1


From 8ac253b9fe112bfe64d467c07db9dc9b9ed74e52 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Thu, 6 May 2021 14:09:47 +0300
Subject: [PATCH 190/713] cov + docs

---
 .../tensors/api/AnalyticTensorAlgebra.kt      | 10 +++++++
 .../algebras/DoubleAnalyticTensorAlgebra.kt   | 24 ++++++++++++++++-
 .../core/algebras/DoubleTensorAlgebra.kt      | 27 +++++++++++++------
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index aa5678b31..69e88c28f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -68,6 +68,16 @@ public interface AnalyticTensorAlgebra<T> :
      */
     public fun Tensor<T>.variance(dim: Int, keepDim: Boolean): Tensor<T>
 
+    /**
+     * Returns the covariance matrix M of given vectors.
+     *
+     * M[i, j] contains covariance of i-th and j-th given vectors
+     *
+     * @param tensors the [List] of 1-dimensional tensors with same shape
+     * @return the covariance matrix
+     */
+    public fun cov(tensors: List<Tensor<T>>): Tensor<T>
+
     //For information: https://pytorch.org/docs/stable/generated/torch.exp.html
     public fun Tensor<T>.exp(): Tensor<T>
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
index 4a1f360e3..23a2fa282 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
@@ -57,6 +57,28 @@ public object DoubleAnalyticTensorAlgebra :
         keepDim
     )
 
+    private fun cov(x: DoubleTensor, y:DoubleTensor): Double{
+        val n = x.shape[0]
+        return ((x - x.mean()) * (y - y.mean())).mean() * n / (n - 1)
+    }
+
+    override fun cov(tensors: List<Tensor<Double>>): DoubleTensor {
+        check(tensors.isNotEmpty()) { "List must have at least 1 element" }
+        val n = tensors.size
+        val m = tensors[0].shape[0]
+        check(tensors.all { it.shape contentEquals intArrayOf(m) }) { "Tensors must have same shapes" }
+        val resTensor = DoubleTensor(
+            intArrayOf(n, n),
+            DoubleArray(n * n) {0.0}
+        )
+        for (i in 0 until n){
+            for (j in 0 until n){
+                resTensor[intArrayOf(i, j)] = cov(tensors[i].tensor, tensors[j].tensor)
+            }
+        }
+        return resTensor
+    }
+
     override fun Tensor<Double>.exp(): DoubleTensor = tensor.map(::exp)
 
     override fun Tensor<Double>.ln(): DoubleTensor = tensor.map(::ln)
@@ -91,4 +113,4 @@ public object DoubleAnalyticTensorAlgebra :
 
     override fun Tensor<Double>.floor(): DoubleTensor = tensor.map(::floor)
 
-}
\ No newline at end of file
+}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index d220bdd9a..74ef63ab7 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -401,19 +401,31 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     public fun Tensor<Double>.randomNormalLike(seed: Long = 0): DoubleTensor =
         DoubleTensor(tensor.shape, getRandomNormals(tensor.shape.reduce(Int::times), seed))
 
-    // stack tensors by axis 0
-    public fun stack(tensors: List<DoubleTensor>): DoubleTensor {
-        val shape = tensors.firstOrNull()?.shape
-        check(shape != null) { "Collection must have at least 1 element" }
-        check(tensors.all { it.shape contentEquals shape }) { "Stacking tensors must have same shapes" }
+    /**
+     * Concatenates a sequence of tensors along a new dimension.
+     *
+     * @param tensors the [List] of tensors with same shapes to concatenate
+     * @param dim the dimension to insert
+     * @return tensor with concatenation result
+     */
+    public fun stack(tensors: List<Tensor<Double>>, dim: Int = 0): DoubleTensor {
+        check(dim == 0) { "Stack by non-zero dimension not implemented yet" }
+        check(tensors.isNotEmpty()) { "List must have at least 1 element" }
+        val shape = tensors[0].shape
+        check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
         val resShape = intArrayOf(tensors.size) + shape
         val resBuffer = tensors.flatMap {
-            it.tensor.mutableBuffer.array().drop(it.bufferStart).take(it.numElements)
+            it.tensor.mutableBuffer.array().drop(it.tensor.bufferStart).take(it.tensor.numElements)
         }.toDoubleArray()
         return DoubleTensor(resShape, resBuffer, 0)
     }
 
-    // build tensor from this rows by given indices
+    /**
+     * Build tensor from rows of input tensor
+     *
+     * @param indices the [IntArray] of 1-dimensional indices
+     * @return tensor with rows corresponding to rows by [indices]
+     */
     public fun Tensor<Double>.rowsByIndices(indices: IntArray): DoubleTensor {
         return stack(indices.map { this[it] })
     }
@@ -450,7 +462,6 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     override fun Tensor<Double>.sum(dim: Int, keepDim: Boolean): DoubleTensor =
         foldDim({ x -> x.sum() }, dim, keepDim)
 
-
     override fun Tensor<Double>.min(): Double = this.fold { it.minOrNull()!! }
 
     override fun Tensor<Double>.min(dim: Int, keepDim: Boolean): DoubleTensor =
-- 
2.34.1


From dc22bd84986d14f6d82209a106d6413e3bd609e2 Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Thu, 6 May 2021 14:23:57 +0300
Subject: [PATCH 191/713] add documentation to DoubleTensorAlgebra

---
 .../core/algebras/DoubleTensorAlgebra.kt      | 57 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index d220bdd9a..2cad85a09 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -23,6 +23,9 @@ import space.kscience.kmath.tensors.core.getRandomNormals
 import space.kscience.kmath.tensors.core.minusIndexFrom
 import kotlin.math.abs
 
+/**
+ * Implementation of basic operations over double tensors and basic algebra operations on them.
+ */
 public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
 
     public companion object : DoubleTensorAlgebra()
@@ -34,6 +37,13 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return tensor.mutableBuffer.array()[tensor.bufferStart]
     }
 
+    /**
+     * Constructs a tensor with the specified shape and data.
+     *
+     * @param shape the desired shape for the tensor.
+     * @param buffer one-dimensional data array.
+     * @return tensor with the [shape] shape and [buffer] data.
+     */
     public fun fromArray(shape: IntArray, buffer: DoubleArray): DoubleTensor {
         checkEmptyShape(shape)
         checkEmptyDoubleBuffer(buffer)
@@ -48,26 +58,67 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return DoubleTensor(newShape, tensor.mutableBuffer.array(), newStart)
     }
 
+    /**
+     * Creates a tensor of a given shape and fills all elements with a given value.
+     *
+     * @param value the value to fill the output tensor with.
+     * @param shape array of integers defining the shape of the output tensor.
+     * @return tensor with the [shape] shape and filled with [value].
+     */
     public fun full(value: Double, shape: IntArray): DoubleTensor {
         checkEmptyShape(shape)
         val buffer = DoubleArray(shape.reduce(Int::times)) { value }
         return DoubleTensor(shape, buffer)
     }
 
+    /**
+     * Returns a tensor with the same shape as `input` filled with [value].
+     *
+     * @param value the value to fill the output tensor with.
+     * @return tensor with the `input` tensor shape and filled with [value].
+     */
     public fun Tensor<Double>.fullLike(value: Double): DoubleTensor {
         val shape = tensor.shape
         val buffer = DoubleArray(tensor.numElements) { value }
         return DoubleTensor(shape, buffer)
     }
 
+    /**
+     * Returns a tensor filled with the scalar value 0.0, with the shape defined by the variable argument [shape].
+     *
+     * @param shape array of integers defining the shape of the output tensor.
+     * @return tensor filled with the scalar value 0.0, with the [shape] shape.
+     */
     public fun zeros(shape: IntArray): DoubleTensor = full(0.0, shape)
 
+    /**
+     * Returns a tensor filled with the scalar value 0.0, with the same shape as a given array.
+     *
+     * @return tensor filled with the scalar value 0.0, with the same shape as `input` tensor.
+     */
     public fun Tensor<Double>.zeroesLike(): DoubleTensor = tensor.fullLike(0.0)
 
+    /**
+     * Returns a tensor filled with the scalar value 1.0, with the shape defined by the variable argument [shape].
+     *
+     * @param shape array of integers defining the shape of the output tensor.
+     * @return tensor filled with the scalar value 1.0, with the [shape] shape.
+     */
     public fun ones(shape: IntArray): DoubleTensor = full(1.0, shape)
 
+    /**
+     * Returns a tensor filled with the scalar value 1.0, with the same shape as a given array.
+     *
+     * @return tensor filled with the scalar value 1.0, with the same shape as `input` tensor.
+     */
     public fun Tensor<Double>.onesLike(): DoubleTensor = tensor.fullLike(1.0)
 
+    /**
+     * Returns a 2-D tensor with shape ([n], [n]), with ones on the diagonal and zeros elsewhere.
+     *
+     * @param n the number of rows and columns
+     * @return a 2-D tensor with ones on the diagonal and zeros elsewhere.
+     */
     public fun eye(n: Int): DoubleTensor {
         val shape = intArrayOf(n, n)
         val buffer = DoubleArray(n * n) { 0.0 }
@@ -78,6 +129,11 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return res
     }
 
+    /**
+     * Return a copy of the tensor.
+     *
+     * @return a copy of the `input` tensor with a copied buffer.
+     */
     public fun Tensor<Double>.copy(): DoubleTensor {
         return DoubleTensor(tensor.shape, tensor.mutableBuffer.array().copyOf(), tensor.bufferStart)
     }
@@ -359,7 +415,6 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return resTensor.tensor
     }
 
-
     public fun Tensor<Double>.map(transform: (Double) -> Double): DoubleTensor {
         return DoubleTensor(
             tensor.shape,
-- 
2.34.1


From 90149e396561004e781b390f87c51361e6a9e82f Mon Sep 17 00:00:00 2001
From: AlyaNovikova <aleksnovikova@gmail.com>
Date: Thu, 6 May 2021 14:42:15 +0300
Subject: [PATCH 192/713] add documentation to map and randomNormal function

---
 .../core/algebras/DoubleTensorAlgebra.kt      | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index d8b59daa7..8c76de0de 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -415,6 +415,12 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return resTensor.tensor
     }
 
+    /**
+     * Applies the [transform] function to each element of the tensor and returns the resulting modified tensor.
+     *
+     * @param transform the function to be applied to each element of the tensor.
+     * @return the resulting tensor after applying the function.
+     */
     public fun Tensor<Double>.map(transform: (Double) -> Double): DoubleTensor {
         return DoubleTensor(
             tensor.shape,
@@ -423,10 +429,24 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         )
     }
 
+    /**
+     * Compares element-wise two tensors with a specified precision.
+     *
+     * @param other the tensor to compare with `input` tensor.
+     * @param epsilon permissible error when comparing two Double values.
+     * @return true if two tensors have the same shape and elements, false otherwise.
+     */
     public fun Tensor<Double>.eq(other: Tensor<Double>, epsilon: Double): Boolean {
         return tensor.eq(other) { x, y -> abs(x - y) < epsilon }
     }
 
+    /**
+     * Compares element-wise two tensors.
+     * Comparison of two Double values occurs with 1e-5 precision.
+     *
+     * @param other the tensor to compare with `input` tensor.
+     * @return true if two tensors have the same shape and elements, false otherwise.
+     */
     public infix fun Tensor<Double>.eq(other: Tensor<Double>): Boolean = tensor.eq(other, 1e-5)
 
     private fun Tensor<Double>.eq(
@@ -450,9 +470,25 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return true
     }
 
+    /**
+     * Returns a tensor of random numbers drawn from normal distributions with 0.0 mean and 1.0 standard deviation.
+     *
+     * @param shape the desired shape for the output tensor.
+     * @param seed the random seed of the pseudo-random number generator.
+     * @return tensor of a given shape filled with numbers from the normal distribution
+     * with 0.0 mean and 1.0 standard deviation.
+     */
     public fun randomNormal(shape: IntArray, seed: Long = 0): DoubleTensor =
         DoubleTensor(shape, getRandomNormals(shape.reduce(Int::times), seed))
 
+    /**
+     * Returns a tensor with the same shape as `input` of random numbers drawn from normal distributions
+     * with 0.0 mean and 1.0 standard deviation.
+     *
+     * @param seed the random seed of the pseudo-random number generator.
+     * @return tensor with the same shape as `input` filled with numbers from the normal distribution
+     * with 0.0 mean and 1.0 standard deviation.
+     */
     public fun Tensor<Double>.randomNormalLike(seed: Long = 0): DoubleTensor =
         DoubleTensor(tensor.shape, getRandomNormals(tensor.shape.reduce(Int::times), seed))
 
-- 
2.34.1


From 5fe1320855941167afba93fb0f3d0beb855c834e Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Thu, 6 May 2021 12:59:21 +0100
Subject: [PATCH 193/713] minor corrections

---
 .../kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index 8c76de0de..1c8eacf66 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -493,7 +493,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         DoubleTensor(tensor.shape, getRandomNormals(tensor.shape.reduce(Int::times), seed))
 
     /**
-     * Concatenates a sequence of tensors along a new dimension.
+     * Concatenates a sequence of tensors along the first dimension.
      *
      * @param tensors the [List] of tensors with same shapes to concatenate
      * @param dim the dimension to insert
-- 
2.34.1


From db5378c9f4ab3ff4e84d815d9db4686015330bf9 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Thu, 6 May 2021 16:29:21 +0300
Subject: [PATCH 194/713] PCA example

---
 .../space/kscience/kmath/tensors/PCA.kt       | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
new file mode 100644
index 000000000..1d72b2326
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors
+
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
+import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
+
+const val seed = 100500L
+
+// simple PCA
+
+fun main(){
+    DoubleAnalyticTensorAlgebra {
+
+        // assume x is range from 0 until 10
+        val x = fromArray(
+            intArrayOf(10),
+            (0 until 10).toList().map { it.toDouble() }.toDoubleArray()
+        )
+
+        // take y dependent on x with noise
+        val y = 2.0 * x + (3.0 + x.randomNormalLike(seed) * 1.5)
+
+        println("x:\n$x")
+        println("y:\n$y")
+
+        // stack them into single dataset
+        val dataset = stack(listOf(x, y)).transpose()
+
+        // normalize both x and y
+        val xMean = x.mean()
+        val yMean = y.mean()
+
+        val xStd = x.std()
+        val yStd = y.std()
+
+        val xScaled = (x - xMean) / xStd
+        val yScaled = (y - yMean) / yStd
+
+        // save means ans standard deviations for further recovery
+        val mean = fromArray(
+            intArrayOf(2),
+            doubleArrayOf(xMean, yMean)
+        )
+        println("Means:\n$mean")
+
+        val std = fromArray(
+            intArrayOf(2),
+            doubleArrayOf(xStd, yStd)
+        )
+        println("Standard deviations:\n$std")
+
+        // calculate the covariance matrix of scaled x and y
+        val covMatrix = cov(listOf(xScaled, yScaled))
+        println("Covariance matrix:\n$covMatrix")
+
+        // and find out eigenvector of it
+        val (_, evecs) = DoubleLinearOpsTensorAlgebra {covMatrix.symEig()}
+        val v = evecs[0]
+        println("Eigenvector:\n$v")
+
+        // reduce dimension of dataset
+        val datasetReduced  = v dot stack(listOf(xScaled, yScaled))
+        println("Reduced data:\n$datasetReduced")
+
+        // we can restore original data from reduced data.
+        // for example, find 7th element of dataset
+        val n = 7
+        val restored = BroadcastDoubleTensorAlgebra{(datasetReduced[n] dot v.view(intArrayOf(1, 2))) * std + mean}
+        println("Original value:\n${dataset[n]}")
+        println("Restored value:\n$restored")
+    }
+}
-- 
2.34.1


From febe526325150c2b716f233956a12e69fcb44804 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Thu, 6 May 2021 14:50:05 +0100
Subject: [PATCH 195/713] Update stack docs

---
 .../kmath/tensors/core/algebras/DoubleTensorAlgebra.kt      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index 1c8eacf66..9500fbdec 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -493,14 +493,12 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         DoubleTensor(tensor.shape, getRandomNormals(tensor.shape.reduce(Int::times), seed))
 
     /**
-     * Concatenates a sequence of tensors along the first dimension.
+     * Concatenates a sequence of tensors with equal shapes along the first dimension.
      *
      * @param tensors the [List] of tensors with same shapes to concatenate
-     * @param dim the dimension to insert
      * @return tensor with concatenation result
      */
-    public fun stack(tensors: List<Tensor<Double>>, dim: Int = 0): DoubleTensor {
-        check(dim == 0) { "Stack by non-zero dimension not implemented yet" }
+    public fun stack(tensors: List<Tensor<Double>>): DoubleTensor {
         check(tensors.isNotEmpty()) { "List must have at least 1 element" }
         val shape = tensors[0].shape
         check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
-- 
2.34.1


From 1b1a078deaee681c99603737d11eecefe0411db4 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Fri, 7 May 2021 03:22:34 +0300
Subject: [PATCH 196/713] neural network!

---
 .../kscience/kmath/tensors/NeuralNetwork.kt   | 245 ++++++++++++++++++
 .../space/kscience/kmath/tensors/PCA.kt       |   5 +-
 .../kmath/tensors/api/TensorAlgebra.kt        |  13 +-
 .../core/algebras/DoubleTensorAlgebra.kt      |   5 +
 4 files changed, 266 insertions(+), 2 deletions(-)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
new file mode 100644
index 000000000..ea863988c
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors
+
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.tensors.core.DoubleTensor
+import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
+import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.toDoubleArray
+import kotlin.math.sqrt
+
+const val seed = 100500L
+
+// Simple feedforward neural network with backpropagation training
+
+// interface of network layer
+interface Layer {
+    fun forward(input: DoubleTensor): DoubleTensor
+    fun backward(input: DoubleTensor, outputError: DoubleTensor): DoubleTensor
+}
+
+// activation layer
+open class Activation(
+    val activation: (DoubleTensor) -> DoubleTensor,
+    val activationDer: (DoubleTensor) -> DoubleTensor
+) : Layer {
+    override fun forward(input: DoubleTensor): DoubleTensor {
+        return activation(input)
+    }
+
+    override fun backward(input: DoubleTensor, outputError: DoubleTensor): DoubleTensor {
+        return DoubleTensorAlgebra { outputError * activationDer(input) }
+    }
+}
+
+fun relu(x: DoubleTensor): DoubleTensor = DoubleTensorAlgebra {
+    x.map { if (it > 0) it else 0.0 }
+}
+
+fun reluDer(x: DoubleTensor): DoubleTensor = DoubleTensorAlgebra {
+    x.map { if (it > 0) 1.0 else 0.0 }
+}
+
+// activation layer with relu activator
+class ReLU : Activation(::relu, ::reluDer)
+
+fun sigmoid(x: DoubleTensor): DoubleTensor = DoubleAnalyticTensorAlgebra {
+    1.0 / (1.0 + (-x).exp())
+}
+
+fun sigmoidDer(x: DoubleTensor): DoubleTensor = DoubleTensorAlgebra {
+    sigmoid(x) * (1.0 - sigmoid(x))
+}
+
+// activation layer with sigmoid activator
+class Sigmoid : Activation(::sigmoid, ::sigmoidDer)
+
+// dense layer
+class Dense(
+    private val inputUnits: Int,
+    private val outputUnits: Int,
+    private val learningRate: Double = 0.1
+) : Layer {
+
+    private val weights: DoubleTensor = DoubleTensorAlgebra {
+        randomNormal(
+            intArrayOf(inputUnits, outputUnits),
+            seed
+        ) * sqrt(2.0 / (inputUnits + outputUnits))
+    }
+
+    private val bias: DoubleTensor = DoubleTensorAlgebra { zeros(intArrayOf(outputUnits)) }
+
+    override fun forward(input: DoubleTensor): DoubleTensor {
+        return BroadcastDoubleTensorAlgebra { (input dot weights) + bias }
+    }
+
+    override fun backward(input: DoubleTensor, outputError: DoubleTensor): DoubleTensor = DoubleTensorAlgebra {
+        val gradInput = outputError dot weights.transpose()
+
+        val gradW = input.transpose() dot outputError
+        val gradBias = DoubleAnalyticTensorAlgebra {
+            outputError.mean(dim = 0, keepDim = false) * input.shape[0].toDouble()
+        }
+
+        weights -= learningRate * gradW
+        bias -= learningRate * gradBias
+
+        gradInput
+    }
+
+}
+
+// simple accuracy equal to the proportion of correct answers
+fun accuracy(yPred: DoubleTensor, yTrue: DoubleTensor): Double {
+    check(yPred.shape contentEquals yTrue.shape)
+    val n = yPred.shape[0]
+    var correctCnt = 0
+    for (i in 0 until n) {
+        if (yPred[intArrayOf(i, 0)] == yTrue[intArrayOf(i, 0)]) {
+            correctCnt += 1
+        }
+    }
+    return correctCnt.toDouble() / n.toDouble()
+}
+
+// neural network class
+class NeuralNetwork(private val layers: List<Layer>) {
+    private fun softMaxLoss(yPred: DoubleTensor, yTrue: DoubleTensor): DoubleTensor = DoubleAnalyticTensorAlgebra {
+
+        val onesForAnswers = yPred.zeroesLike()
+        yTrue.toDoubleArray().forEachIndexed { index, labelDouble ->
+            val label = labelDouble.toInt()
+            onesForAnswers[intArrayOf(index, label)] = 1.0
+        }
+
+        val softmaxValue = BroadcastDoubleTensorAlgebra { yPred.exp() / yPred.exp().sum(dim = 1, keepDim = true) }
+
+        (-onesForAnswers + softmaxValue) / (yPred.shape[0].toDouble())
+    }
+
+    @OptIn(ExperimentalStdlibApi::class)
+    private fun forward(x: DoubleTensor): List<DoubleTensor> {
+        var input = x
+
+        return buildList {
+            layers.forEach { layer ->
+                val output = layer.forward(input)
+                add(output)
+                input = output
+            }
+        }
+    }
+
+    @OptIn(ExperimentalStdlibApi::class)
+    private fun train(xTrain: DoubleTensor, yTrain: DoubleTensor) {
+        val layerInputs = buildList {
+            add(xTrain)
+            addAll(forward(xTrain))
+        }
+
+        var lossGrad = softMaxLoss(layerInputs.last(), yTrain)
+
+        layers.zip(layerInputs).reversed().forEach { (layer, input) ->
+            lossGrad = layer.backward(input, lossGrad)
+        }
+    }
+
+    fun fit(xTrain: DoubleTensor, yTrain: DoubleTensor, batchSize: Int, epochs: Int) = DoubleTensorAlgebra {
+        fun iterBatch(x: DoubleTensor, y: DoubleTensor): Sequence<Pair<DoubleTensor, DoubleTensor>> = sequence {
+            val n = x.shape[0]
+            val shuffledIndices = (0 until n).shuffled()
+            for (i in 0 until n step batchSize) {
+                val excerptIndices = shuffledIndices.drop(i).take(batchSize).toIntArray()
+                val batch = x.rowsByIndices(excerptIndices) to y.rowsByIndices(excerptIndices)
+                yield(batch)
+            }
+        }
+
+        for (epoch in 0 until epochs) {
+            println("Epoch ${epoch + 1}/$epochs")
+            for ((xBatch, yBatch) in iterBatch(xTrain, yTrain)) {
+                train(xBatch, yBatch)
+            }
+            println("Accuracy:${accuracy(yTrain, predict(xTrain).argMax(1, true))}")
+        }
+    }
+
+    fun predict(x: DoubleTensor): DoubleTensor {
+        return forward(x).last()
+    }
+
+}
+
+
+
+@OptIn(ExperimentalStdlibApi::class)
+fun main() {
+    DoubleTensorAlgebra {
+        val features = 5
+        val sampleSize = 250
+        val trainSize = 180
+        val testSize = sampleSize - trainSize
+
+        // take sample of features from normal distribution
+        val x = randomNormal(intArrayOf(sampleSize, features), seed) * 2.5
+        BroadcastDoubleTensorAlgebra {
+            x += fromArray(
+                intArrayOf(5),
+                doubleArrayOf(0.0, -1.0, -2.5, -3.0, 5.5) // rows means
+            )
+        }
+
+        // define class like '1' if the sum of features > 0 and '0' otherwise
+        val y = fromArray(
+            intArrayOf(sampleSize, 1),
+            DoubleArray(sampleSize) { i ->
+                if (x[i].sum() > 0.0) {
+                    1.0
+                } else {
+                    0.0
+                }
+            }
+        )
+
+        // split train ans test
+        val trainIndices = (0 until trainSize).toList().toIntArray()
+        val testIndices = (trainSize until sampleSize).toList().toIntArray()
+
+        val xTrain = x.rowsByIndices(trainIndices)
+        val yTrain = y.rowsByIndices(trainIndices)
+
+        val xTest = x.rowsByIndices(testIndices)
+        val yTest = y.rowsByIndices(testIndices)
+
+        // build model
+        val layers = buildList {
+            add(Dense(features, 64))
+            add(ReLU())
+            add(Dense(64, 16))
+            add(ReLU())
+            add(Dense(16, 2))
+            add(Sigmoid())
+        }
+        val model = NeuralNetwork(layers)
+
+        // fit it with train data
+        model.fit(xTrain, yTrain, batchSize = 20, epochs = 10)
+
+        // make prediction
+        val prediction = model.predict(xTest)
+
+        // process raw prediction via argMax
+        val predictionLabels = prediction.argMax(1, true)
+
+        // find out accuracy
+        val acc = accuracy(yTest, predictionLabels)
+        println("Test accuracy:$acc")
+
+    }
+}
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index 1d72b2326..ee25b63a3 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -10,11 +10,14 @@ import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
 import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
 
-const val seed = 100500L
+
 
 // simple PCA
 
 fun main(){
+    val seed = 100500L
+
+    // work in context with analytic methods
     DoubleAnalyticTensorAlgebra {
 
         // assume x is range from 0 until 10
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index b0a0f9618..417cff87f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -305,5 +305,16 @@ public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
      */
     public fun Tensor<T>.max(dim: Int, keepDim: Boolean): Tensor<T>
 
-
+    /**
+     * Returns the index of maximum value of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the the index of maximum value of each row of the input tensor in the given dimension [dim].
+     */
+    public fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T>
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index 9500fbdec..6fac0a0ec 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -561,4 +561,9 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     override fun Tensor<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
         foldDim({ x -> x.maxOrNull()!! }, dim, keepDim)
 
+    override fun Tensor<Double>.argMax(dim: Int, keepDim: Boolean): DoubleTensor =
+        foldDim({ x ->
+            x.withIndex().maxByOrNull { it.value }?.index!!.toDouble()
+        }, dim, keepDim)
+
 }
-- 
2.34.1


From 14ca7cdd31e14855c95a51b8143bf80aae02feb9 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Fri, 7 May 2021 13:00:20 +0300
Subject: [PATCH 197/713] fixes

---
 .../kmath/tensors/api/LinearOpsTensorAlgebra.kt   | 15 ++++++++-------
 .../kscience/kmath/tensors/api/TensorAlgebra.kt   |  2 +-
 .../tensors/core/algebras/DoubleTensorAlgebra.kt  |  9 ++++-----
 .../core/algebras/TensorLinearStructure.kt        |  3 +--
 .../kscience/kmath/tensors/core/tensorCasts.kt    |  2 +-
 .../kmath/tensors/core/tensorCastsUtils.kt        |  2 +-
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index ec070b6bd..4a325ab4e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -23,8 +23,8 @@ public interface LinearOpsTensorAlgebra<T> :
 
     /**
      * Computes the multiplicative inverse matrix of a square matrix input, or of each square matrix in a batched input.
-     * Given a square matrix `a`, return the matrix `aInv` satisfying
-     * ``a.dot(aInv) = aInv.dot(a) = eye(a.shape[0])``.
+     * Given a square matrix `A`, return the matrix `AInv` satisfying
+     * `A dot AInv  = AInv dot A = eye(a.shape[0])`.
      * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.inv
      *
      * @return the multiplicative inverse of a matrix.
@@ -37,7 +37,7 @@ public interface LinearOpsTensorAlgebra<T> :
      * Computes the Cholesky decomposition of a Hermitian (or symmetric for real-valued matrices)
      * positive-definite matrix or the Cholesky decompositions for a batch of such matrices.
      * Each decomposition has the form:
-     * Given a tensor `input`, return the tensor `L` satisfying ``input = L * L.H``,
+     * Given a tensor `input`, return the tensor `L` satisfying `input = L dot L.H`,
      * where L is a lower-triangular matrix and L.H is the conjugate transpose of L,
      * which is just a transpose for the case of real-valued input matrices.
      * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.cholesky
@@ -50,7 +50,7 @@ public interface LinearOpsTensorAlgebra<T> :
      * QR decomposition.
      *
      * Computes the QR decomposition of a matrix or a batch of matrices, and returns a pair `(Q, R)` of tensors.
-     * Given a tensor `input`, return tensors (Q, R) satisfying ``input = Q * R``,
+     * Given a tensor `input`, return tensors (Q, R) satisfying ``input = Q dot R``,
      * with `Q` being an orthogonal matrix or batch of orthogonal matrices
      * and `R` being an upper triangular matrix or batch of upper triangular matrices.
      * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.qr
@@ -63,7 +63,7 @@ public interface LinearOpsTensorAlgebra<T> :
      * LUP decomposition
      *
      * Computes the LUP decomposition of a matrix or a batch of matrices.
-     * Given a tensor `input`, return tensors (P, L, U) satisfying ``P * input = L * U``,
+     * Given a tensor `input`, return tensors (P, L, U) satisfying `P dot input = L dot  U`,
      * with `P` being a permutation matrix or batch of matrices,
      * `L` being a lower triangular matrix or batch of matrices,
      * `U` being an upper triangular matrix or batch of matrices.
@@ -77,7 +77,8 @@ public interface LinearOpsTensorAlgebra<T> :
      *
      * Computes the singular value decomposition of either a matrix or batch of matrices `input`.
      * The singular value decomposition is represented as a triple `(U, S, V)`,
-     * such that ``input = U.dot(diagonalEmbedding(S).dot(V.T))``.
+     * such that `input = U dot diagonalEmbedding(S) dot  V.H`,
+     * where V.H is the conjugate transpose of V.
      * If input is a batch of tensors, then U, S, and Vh are also batched with the same batch dimensions as input.
      * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.svd
      *
@@ -94,4 +95,4 @@ public interface LinearOpsTensorAlgebra<T> :
      */
     public fun Tensor<T>.symEig(): Pair<Tensor<T>, Tensor<T>>
 
-}
\ No newline at end of file
+}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 417cff87f..e7f8dc7ae 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -288,7 +288,7 @@ public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
     public fun Tensor<T>.min(dim: Int, keepDim: Boolean): Tensor<T>
 
     /**
-     * @return the maximum value of all elements in the input tensor.
+     * Returns the maximum value of all elements in the input tensor.
      */
     public fun Tensor<T>.max(): T
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index 6fac0a0ec..e5d41f856 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -343,7 +343,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         val m2 = newOther.shape[newOther.shape.size - 2]
         val n = newOther.shape[newOther.shape.size - 1]
         check(m1 == m2) {
-            throw RuntimeException("Tensors dot operation dimension mismatch: ($l, $m1) x ($m2, $n)")
+            "Tensors dot operation dimension mismatch: ($l, $m1) x ($m2, $n)"
         }
 
         val resShape = newThis.shape.sliceArray(0..(newThis.shape.size - 2)) + intArrayOf(newOther.shape.last())
@@ -436,9 +436,8 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
      * @param epsilon permissible error when comparing two Double values.
      * @return true if two tensors have the same shape and elements, false otherwise.
      */
-    public fun Tensor<Double>.eq(other: Tensor<Double>, epsilon: Double): Boolean {
-        return tensor.eq(other) { x, y -> abs(x - y) < epsilon }
-    }
+    public fun Tensor<Double>.eq(other: Tensor<Double>, epsilon: Double): Boolean =
+        tensor.eq(other) { x, y -> abs(x - y) < epsilon }
 
     /**
      * Compares element-wise two tensors.
@@ -510,7 +509,7 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
     }
 
     /**
-     * Build tensor from rows of input tensor
+     * Builds tensor from rows of input tensor
      *
      * @param indices the [IntArray] of 1-dimensional indices
      * @return tensor with rows corresponding to rows by [indices]
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
index 68aa03311..f65e2b955 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
@@ -23,7 +23,6 @@ internal fun stridesFromShape(shape: IntArray): IntArray {
         current--
     }
     return res
-
 }
 
 internal fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): IntArray {
@@ -55,4 +54,4 @@ public class TensorLinearStructure(override val shape: IntArray) : Strides {
     override val linearSize: Int
         get() = shape.reduce(Int::times)
 
-}
\ No newline at end of file
+}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
index 6254ce751..2743a5218 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
@@ -33,4 +33,4 @@ public fun IntTensor.toIntArray(): IntArray {
     return IntArray(numElements) { i ->
         mutableBuffer[bufferStart + i]
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCastsUtils.kt
index 31de6919f..70e3b9c61 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCastsUtils.kt
@@ -39,4 +39,4 @@ internal val Tensor<Int>.tensor: IntTensor
     get() = when (this) {
         is IntTensor -> this
         else -> this.toBufferedTensor().asTensor()
-    }
\ No newline at end of file
+    }
-- 
2.34.1


From 0920e21d622e85e95e25b6d28d906309dab8d875 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 7 May 2021 12:52:17 +0100
Subject: [PATCH 198/713] Merging implementations together

---
 .../kmath/tensors/DataSetNormalization.kt     |  20 +-
 .../tensors/LinearSystemSolvingWithLUP.kt     |   4 +-
 .../kscience/kmath/tensors/NeuralNetwork.kt   |  26 +-
 .../kscience/kmath/tensors/OLSWithSVD.kt      |   9 +-
 .../space/kscience/kmath/tensors/PCA.kt       |  11 +-
 .../tensors/api/AnalyticTensorAlgebra.kt      |   3 +-
 .../tensors/api/LinearOpsTensorAlgebra.kt     |   3 +-
 .../api/TensorPartialDivisionAlgebra.kt       |   3 +-
 .../kmath/tensors/core/DoubleTensor.kt        |   1 +
 .../algebras/BroadcastDoubleTensorAlgebra.kt  |   6 +-
 .../algebras/DoubleAnalyticTensorAlgebra.kt   | 116 ------
 .../algebras/DoubleLinearOpsTensorAlgebra.kt  | 278 -------------
 .../core/algebras/DoubleTensorAlgebra.kt      | 385 +++++++++++++++++-
 .../core/{ => internal}/broadcastUtils.kt     |   8 +-
 .../tensors/core/{ => internal}/checks.kt     |  11 +-
 .../tensors/core/{ => internal}/linUtils.kt   |  27 +-
 .../core/{ => internal}/tensorCastsUtils.kt   |   5 +-
 .../tensors/core/{ => internal}/utils.kt      |   9 +-
 .../kmath/tensors/core/tensorCasts.kt         |   1 +
 .../kmath/tensors/core/TestBroadcasting.kt    |   1 +
 .../core/TestDoubleAnalyticTensorAlgebra.kt   |  31 +-
 .../core/TestDoubleLinearOpsAlgebra.kt        |  30 +-
 .../kmath/tensors/core/TestDoubleTensor.kt    |   4 +
 .../tensors/core/TestDoubleTensorAlgebra.kt   |   1 +
 24 files changed, 488 insertions(+), 505 deletions(-)
 delete mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
 delete mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{ => internal}/broadcastUtils.kt (94%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{ => internal}/checks.kt (83%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{ => internal}/linUtils.kt (91%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{ => internal}/tensorCastsUtils.kt (88%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{ => internal}/utils.kt (91%)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
index 4d53d940b..d029348f2 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
@@ -7,22 +7,22 @@ package space.kscience.kmath.tensors
 
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
-import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
+
 
 // Dataset normalization
 
 fun main() {
 
-    // work in context with analytic methods
-    DoubleAnalyticTensorAlgebra {
+    // work in context with broadcast methods
+    BroadcastDoubleTensorAlgebra {
         // take dataset of 5-element vectors from normal distribution
         val dataset = randomNormal(intArrayOf(100, 5)) * 1.5 // all elements from N(0, 1.5)
-        BroadcastDoubleTensorAlgebra {
-            dataset += fromArray(
-                intArrayOf(5),
-                doubleArrayOf(0.0, 1.0, 1.5, 3.0, 5.0) // rows means
-            )
-        }
+
+        dataset += fromArray(
+            intArrayOf(5),
+            doubleArrayOf(0.0, 1.0, 1.5, 3.0, 5.0) // rows means
+        )
+
 
         // find out mean and standard deviation of each column
         val mean = dataset.mean(0, false)
@@ -36,7 +36,7 @@ fun main() {
         println("Maximum:\n${dataset.max(0, false)}")
 
         // now we can scale dataset with mean normalization
-        val datasetScaled = BroadcastDoubleTensorAlgebra { (dataset - mean) / std }
+        val datasetScaled = (dataset - mean) / std
 
         // find out mean and std of scaled dataset
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
index bd8233ccc..c0ece04ca 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
@@ -7,14 +7,14 @@ package space.kscience.kmath.tensors
 
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.DoubleTensor
-import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
+import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
 
 // solving linear system with LUP decomposition
 
 fun main () {
 
     // work in context with linear operations
-    DoubleLinearOpsTensorAlgebra {
+    BroadcastDoubleTensorAlgebra {
 
         // set true value of x
         val trueX = fromArray(
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
index ea863988c..1998b8d16 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
@@ -8,7 +8,6 @@ package space.kscience.kmath.tensors
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
-import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
 import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.toDoubleArray
 import kotlin.math.sqrt
@@ -48,7 +47,7 @@ fun reluDer(x: DoubleTensor): DoubleTensor = DoubleTensorAlgebra {
 // activation layer with relu activator
 class ReLU : Activation(::relu, ::reluDer)
 
-fun sigmoid(x: DoubleTensor): DoubleTensor = DoubleAnalyticTensorAlgebra {
+fun sigmoid(x: DoubleTensor): DoubleTensor = DoubleTensorAlgebra {
     1.0 / (1.0 + (-x).exp())
 }
 
@@ -83,9 +82,7 @@ class Dense(
         val gradInput = outputError dot weights.transpose()
 
         val gradW = input.transpose() dot outputError
-        val gradBias = DoubleAnalyticTensorAlgebra {
-            outputError.mean(dim = 0, keepDim = false) * input.shape[0].toDouble()
-        }
+        val gradBias = outputError.mean(dim = 0, keepDim = false) * input.shape[0].toDouble()
 
         weights -= learningRate * gradW
         bias -= learningRate * gradBias
@@ -110,7 +107,7 @@ fun accuracy(yPred: DoubleTensor, yTrue: DoubleTensor): Double {
 
 // neural network class
 class NeuralNetwork(private val layers: List<Layer>) {
-    private fun softMaxLoss(yPred: DoubleTensor, yTrue: DoubleTensor): DoubleTensor = DoubleAnalyticTensorAlgebra {
+    private fun softMaxLoss(yPred: DoubleTensor, yTrue: DoubleTensor): DoubleTensor = BroadcastDoubleTensorAlgebra {
 
         val onesForAnswers = yPred.zeroesLike()
         yTrue.toDoubleArray().forEachIndexed { index, labelDouble ->
@@ -118,7 +115,7 @@ class NeuralNetwork(private val layers: List<Layer>) {
             onesForAnswers[intArrayOf(index, label)] = 1.0
         }
 
-        val softmaxValue = BroadcastDoubleTensorAlgebra { yPred.exp() / yPred.exp().sum(dim = 1, keepDim = true) }
+        val softmaxValue =  yPred.exp() / yPred.exp().sum(dim = 1, keepDim = true)
 
         (-onesForAnswers + softmaxValue) / (yPred.shape[0].toDouble())
     }
@@ -177,10 +174,9 @@ class NeuralNetwork(private val layers: List<Layer>) {
 }
 
 
-
 @OptIn(ExperimentalStdlibApi::class)
 fun main() {
-    DoubleTensorAlgebra {
+    BroadcastDoubleTensorAlgebra {
         val features = 5
         val sampleSize = 250
         val trainSize = 180
@@ -188,12 +184,12 @@ fun main() {
 
         // take sample of features from normal distribution
         val x = randomNormal(intArrayOf(sampleSize, features), seed) * 2.5
-        BroadcastDoubleTensorAlgebra {
-            x += fromArray(
-                intArrayOf(5),
-                doubleArrayOf(0.0, -1.0, -2.5, -3.0, 5.5) // rows means
-            )
-        }
+
+        x += fromArray(
+            intArrayOf(5),
+            doubleArrayOf(0.0, -1.0, -2.5, -3.0, 5.5) // rows means
+        )
+
 
         // define class like '1' if the sum of features > 0 and '0' otherwise
         val y = fromArray(
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index 435af35f6..497f63b41 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -7,8 +7,7 @@ package space.kscience.kmath.tensors
 
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.DoubleTensor
-import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
-import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
+import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 
 import kotlin.math.abs
 
@@ -19,7 +18,7 @@ fun main() {
     val randSeed = 100500L
 
     // work in context with linear operations
-    DoubleLinearOpsTensorAlgebra {
+    DoubleTensorAlgebra {
         // take coefficient vector from normal distribution
         val alpha = randomNormal(
             intArrayOf(5),
@@ -56,12 +55,12 @@ fun main() {
                 "$alphaOLS")
 
         // figure out MSE of approximation
-        fun mse(yTrue: DoubleTensor, yPred: DoubleTensor): Double = DoubleAnalyticTensorAlgebra{
+        fun mse(yTrue: DoubleTensor, yPred: DoubleTensor): Double {
             require(yTrue.shape.size == 1)
             require(yTrue.shape contentEquals yPred.shape)
 
             val diff = yTrue - yPred
-            diff.dot(diff).sqrt().value()
+            return diff.dot(diff).sqrt().value()
         }
 
         println("MSE: ${mse(alpha, alphaOLS)}")
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index ee25b63a3..d29dbb094 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -7,9 +7,6 @@ package space.kscience.kmath.tensors
 
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
-import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
-import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
-
 
 
 // simple PCA
@@ -17,8 +14,8 @@ import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
 fun main(){
     val seed = 100500L
 
-    // work in context with analytic methods
-    DoubleAnalyticTensorAlgebra {
+    // work in context with broadcast methods
+    BroadcastDoubleTensorAlgebra {
 
         // assume x is range from 0 until 10
         val x = fromArray(
@@ -63,7 +60,7 @@ fun main(){
         println("Covariance matrix:\n$covMatrix")
 
         // and find out eigenvector of it
-        val (_, evecs) = DoubleLinearOpsTensorAlgebra {covMatrix.symEig()}
+        val (_, evecs) = covMatrix.symEig()
         val v = evecs[0]
         println("Eigenvector:\n$v")
 
@@ -74,7 +71,7 @@ fun main(){
         // we can restore original data from reduced data.
         // for example, find 7th element of dataset
         val n = 7
-        val restored = BroadcastDoubleTensorAlgebra{(datasetReduced[n] dot v.view(intArrayOf(1, 2))) * std + mean}
+        val restored = (datasetReduced[n] dot v.view(intArrayOf(1, 2))) * std + mean
         println("Original value:\n${dataset[n]}")
         println("Restored value:\n$restored")
     }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index 69e88c28f..1db986e77 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -11,8 +11,7 @@ package space.kscience.kmath.tensors.api
  *
  * @param T the type of items closed under analytic functions in the tensors.
  */
-public interface AnalyticTensorAlgebra<T> :
-    TensorPartialDivisionAlgebra<T> {
+public interface AnalyticTensorAlgebra<T> : TensorPartialDivisionAlgebra<T> {
 
     /**
      * @return the mean of all elements in the input tensor.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index 4a325ab4e..6bdecfa85 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -10,8 +10,7 @@ package space.kscience.kmath.tensors.api
  *
  * @param T the type of items closed under division in the tensors.
  */
-public interface LinearOpsTensorAlgebra<T> :
-    TensorPartialDivisionAlgebra<T> {
+public interface LinearOpsTensorAlgebra<T> : TensorPartialDivisionAlgebra<T> {
 
     /**
      * Computes the determinant of a square matrix input, or of each square matrix in a batched input.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
index 921157963..02bf5415d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
@@ -11,8 +11,7 @@ package space.kscience.kmath.tensors.api
  *
  * @param T the type of items closed under division in the tensors.
  */
-public interface TensorPartialDivisionAlgebra<T> :
-    TensorAlgebra<T> {
+public interface TensorPartialDivisionAlgebra<T> : TensorAlgebra<T> {
 
     /**
      * Each element of the tensor [other] is divided by this value.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
index e3143f5a7..41df50cba 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.tensors.core.internal.toPrettyString
 
 /**
  * Default [BufferedTensor] implementation for [Double] values
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
index 873ec9027..bc7d90c28 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
@@ -7,8 +7,10 @@ package space.kscience.kmath.tensors.core.algebras
 
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.*
-import space.kscience.kmath.tensors.core.broadcastTensors
-import space.kscience.kmath.tensors.core.broadcastTo
+import space.kscience.kmath.tensors.core.internal.array
+import space.kscience.kmath.tensors.core.internal.broadcastTensors
+import space.kscience.kmath.tensors.core.internal.broadcastTo
+import space.kscience.kmath.tensors.core.internal.tensor
 
 /**
  * Basic linear algebra operations implemented with broadcasting.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
deleted file mode 100644
index 23a2fa282..000000000
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleAnalyticTensorAlgebra.kt
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.tensors.core.algebras
-
-import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
-import space.kscience.kmath.tensors.api.Tensor
-import space.kscience.kmath.tensors.core.DoubleTensor
-import space.kscience.kmath.tensors.core.tensor
-import kotlin.math.*
-
-public object DoubleAnalyticTensorAlgebra :
-    AnalyticTensorAlgebra<Double>,
-    DoubleTensorAlgebra() {
-
-    override fun Tensor<Double>.mean(): Double = this.fold { it.sum() / tensor.numElements }
-
-    override fun Tensor<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim(
-            { arr ->
-                check(dim < dimension) { "Dimension $dim out of range $dimension" }
-                arr.sum() / shape[dim]
-            },
-            dim,
-            keepDim
-        )
-
-    override fun Tensor<Double>.std(): Double = this.fold { arr ->
-        val mean = arr.sum() / tensor.numElements
-        sqrt(arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1))
-    }
-
-    override fun Tensor<Double>.std(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
-        { arr ->
-            check(dim < dimension) { "Dimension $dim out of range $dimension" }
-            val mean = arr.sum() / shape[dim]
-            sqrt(arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1))
-        },
-        dim,
-        keepDim
-    )
-
-    override fun Tensor<Double>.variance(): Double = this.fold { arr ->
-        val mean = arr.sum() / tensor.numElements
-        arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1)
-    }
-
-    override fun Tensor<Double>.variance(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
-        { arr ->
-            check(dim < dimension) { "Dimension $dim out of range $dimension" }
-            val mean = arr.sum() / shape[dim]
-            arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1)
-        },
-        dim,
-        keepDim
-    )
-
-    private fun cov(x: DoubleTensor, y:DoubleTensor): Double{
-        val n = x.shape[0]
-        return ((x - x.mean()) * (y - y.mean())).mean() * n / (n - 1)
-    }
-
-    override fun cov(tensors: List<Tensor<Double>>): DoubleTensor {
-        check(tensors.isNotEmpty()) { "List must have at least 1 element" }
-        val n = tensors.size
-        val m = tensors[0].shape[0]
-        check(tensors.all { it.shape contentEquals intArrayOf(m) }) { "Tensors must have same shapes" }
-        val resTensor = DoubleTensor(
-            intArrayOf(n, n),
-            DoubleArray(n * n) {0.0}
-        )
-        for (i in 0 until n){
-            for (j in 0 until n){
-                resTensor[intArrayOf(i, j)] = cov(tensors[i].tensor, tensors[j].tensor)
-            }
-        }
-        return resTensor
-    }
-
-    override fun Tensor<Double>.exp(): DoubleTensor = tensor.map(::exp)
-
-    override fun Tensor<Double>.ln(): DoubleTensor = tensor.map(::ln)
-
-    override fun Tensor<Double>.sqrt(): DoubleTensor = tensor.map(::sqrt)
-
-    override fun Tensor<Double>.cos(): DoubleTensor = tensor.map(::cos)
-
-    override fun Tensor<Double>.acos(): DoubleTensor = tensor.map(::acos)
-
-    override fun Tensor<Double>.cosh(): DoubleTensor = tensor.map(::cosh)
-
-    override fun Tensor<Double>.acosh(): DoubleTensor = tensor.map(::acosh)
-
-    override fun Tensor<Double>.sin(): DoubleTensor = tensor.map(::sin)
-
-    override fun Tensor<Double>.asin(): DoubleTensor = tensor.map(::asin)
-
-    override fun Tensor<Double>.sinh(): DoubleTensor = tensor.map(::sinh)
-
-    override fun Tensor<Double>.asinh(): DoubleTensor = tensor.map(::asinh)
-
-    override fun Tensor<Double>.tan(): DoubleTensor = tensor.map(::tan)
-
-    override fun Tensor<Double>.atan(): DoubleTensor = tensor.map(::atan)
-
-    override fun Tensor<Double>.tanh(): DoubleTensor = tensor.map(::tanh)
-
-    override fun Tensor<Double>.atanh(): DoubleTensor = tensor.map(::atanh)
-
-    override fun Tensor<Double>.ceil(): DoubleTensor = tensor.map(::ceil)
-
-    override fun Tensor<Double>.floor(): DoubleTensor = tensor.map(::floor)
-
-}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
deleted file mode 100644
index 430482613..000000000
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.tensors.core.algebras
-
-import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
-import space.kscience.kmath.nd.as1D
-import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.tensors.api.Tensor
-import space.kscience.kmath.tensors.core.*
-import space.kscience.kmath.tensors.core.checkSquareMatrix
-import space.kscience.kmath.tensors.core.choleskyHelper
-import space.kscience.kmath.tensors.core.cleanSymHelper
-import space.kscience.kmath.tensors.core.luHelper
-import space.kscience.kmath.tensors.core.luMatrixDet
-import space.kscience.kmath.tensors.core.luMatrixInv
-import space.kscience.kmath.tensors.core.luPivotHelper
-import space.kscience.kmath.tensors.core.pivInit
-import kotlin.math.min
-
-/**
- * Implementation of common linear algebra operations on double numbers.
- * Implements the LinearOpsTensorAlgebra<Double> interface.
- */
-public object DoubleLinearOpsTensorAlgebra :
-    LinearOpsTensorAlgebra<Double>,
-    DoubleTensorAlgebra() {
-
-    override fun Tensor<Double>.inv(): DoubleTensor = invLU(1e-9)
-
-    override fun Tensor<Double>.det(): DoubleTensor = detLU(1e-9)
-
-    /**
-     * Computes the LU factorization of a matrix or batches of matrices `input`.
-     * Returns a tuple containing the LU factorization and pivots of `input`.
-     *
-     * @param epsilon permissible error when comparing the determinant of a matrix with zero
-     * @return pair of `factorization` and `pivots`.
-     * The `factorization` has the shape ``(*, m, n)``, where``(*, m, n)`` is the shape of the `input` tensor.
-     * The `pivots`  has the shape ``(∗, min(m, n))``. `pivots` stores all the intermediate transpositions of rows.
-     */
-    public fun Tensor<Double>.luFactor(epsilon: Double): Pair<DoubleTensor, IntTensor> =
-        computeLU(tensor, epsilon)
-            ?: throw IllegalArgumentException("Tensor contains matrices which are singular at precision $epsilon")
-
-    /**
-     * Computes the LU factorization of a matrix or batches of matrices `input`.
-     * Returns a tuple containing the LU factorization and pivots of `input`.
-     * Uses an error of ``1e-9`` when calculating whether a matrix is degenerate.
-     *
-     * @return pair of `factorization` and `pivots`.
-     * The `factorization` has the shape ``(*, m, n)``, where``(*, m, n)`` is the shape of the `input` tensor.
-     * The `pivots`  has the shape ``(∗, min(m, n))``. `pivots` stores all the intermediate transpositions of rows.
-     */
-    public fun Tensor<Double>.luFactor(): Pair<DoubleTensor, IntTensor> = luFactor(1e-9)
-
-    /**
-     * Unpacks the data and pivots from a LU factorization of a tensor.
-     * Given a tensor [luTensor], return tensors (P, L, U) satisfying ``P * luTensor = L * U``,
-     * with `P` being a permutation matrix or batch of matrices,
-     * `L` being a lower triangular matrix or batch of matrices,
-     * `U` being an upper triangular matrix or batch of matrices.
-     *
-     * @param luTensor the packed LU factorization data
-     * @param pivotsTensor the packed LU factorization pivots
-     * @return triple of P, L and U tensors
-     */
-    public fun luPivot(
-        luTensor: Tensor<Double>,
-        pivotsTensor: Tensor<Int>
-    ): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        checkSquareMatrix(luTensor.shape)
-        check(
-            luTensor.shape.dropLast(2).toIntArray() contentEquals pivotsTensor.shape.dropLast(1).toIntArray() ||
-                    luTensor.shape.last() == pivotsTensor.shape.last() - 1
-        ) { "Inappropriate shapes of input tensors" }
-
-        val n = luTensor.shape.last()
-        val pTensor = luTensor.zeroesLike()
-        pTensor
-            .matrixSequence()
-            .zip(pivotsTensor.tensor.vectorSequence())
-            .forEach { (p, pivot) -> pivInit(p.as2D(), pivot.as1D(), n) }
-
-        val lTensor = luTensor.zeroesLike()
-        val uTensor = luTensor.zeroesLike()
-
-        lTensor.matrixSequence()
-            .zip(uTensor.matrixSequence())
-            .zip(luTensor.tensor.matrixSequence())
-            .forEach { (pairLU, lu) ->
-                val (l, u) = pairLU
-                luPivotHelper(l.as2D(), u.as2D(), lu.as2D(), n)
-            }
-
-        return Triple(pTensor, lTensor, uTensor)
-    }
-
-    /**
-     * QR decomposition.
-     *
-     * Computes the QR decomposition of a matrix or a batch of matrices, and returns a pair `(Q, R)` of tensors.
-     * Given a tensor `input`, return tensors (Q, R) satisfying ``input = Q * R``,
-     * with `Q` being an orthogonal matrix or batch of orthogonal matrices
-     * and `R` being an upper triangular matrix or batch of upper triangular matrices.
-     *
-     * @param epsilon permissible error when comparing tensors for equality.
-     * Used when checking the positive definiteness of the input matrix or matrices.
-     * @return pair of Q and R tensors.
-     */
-    public fun Tensor<Double>.cholesky(epsilon: Double): DoubleTensor {
-        checkSquareMatrix(shape)
-        checkPositiveDefinite(tensor, epsilon)
-
-        val n = shape.last()
-        val lTensor = zeroesLike()
-
-        for ((a, l) in tensor.matrixSequence().zip(lTensor.matrixSequence()))
-            for (i in 0 until n) choleskyHelper(a.as2D(), l.as2D(), n)
-
-        return lTensor
-    }
-
-    override fun Tensor<Double>.cholesky(): DoubleTensor = cholesky(1e-6)
-
-    override fun Tensor<Double>.qr(): Pair<DoubleTensor, DoubleTensor> {
-        checkSquareMatrix(shape)
-        val qTensor = zeroesLike()
-        val rTensor = zeroesLike()
-        tensor.matrixSequence()
-            .zip((qTensor.matrixSequence()
-                .zip(rTensor.matrixSequence()))).forEach { (matrix, qr) ->
-            val (q, r) = qr
-            qrHelper(matrix.asTensor(), q.asTensor(), r.as2D())
-        }
-
-        return qTensor to rTensor
-    }
-
-    override fun Tensor<Double>.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> =
-        svd(epsilon = 1e-10)
-
-    /**
-     * Singular Value Decomposition.
-     *
-     * Computes the singular value decomposition of either a matrix or batch of matrices `input`.
-     * The singular value decomposition is represented as a triple `(U, S, V)`,
-     * such that ``input = U.dot(diagonalEmbedding(S).dot(V.T))``.
-     * If input is a batch of tensors, then U, S, and Vh are also batched with the same batch dimensions as input.
-     *
-     * @param epsilon permissible error when calculating the dot product of vectors,
-     * i.e. the precision with which the cosine approaches 1 in an iterative algorithm.
-     * @return triple `(U, S, V)`.
-     */
-    public fun Tensor<Double>.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        val size = tensor.dimension
-        val commonShape = tensor.shape.sliceArray(0 until size - 2)
-        val (n, m) = tensor.shape.sliceArray(size - 2 until size)
-        val uTensor = zeros(commonShape + intArrayOf(min(n, m), n))
-        val sTensor = zeros(commonShape + intArrayOf(min(n, m)))
-        val vTensor = zeros(commonShape + intArrayOf(min(n, m), m))
-
-        tensor.matrixSequence()
-            .zip(uTensor.matrixSequence()
-                .zip(sTensor.vectorSequence()
-                    .zip(vTensor.matrixSequence()))).forEach { (matrix, USV) ->
-                val matrixSize = matrix.shape.reduce { acc, i -> acc * i }
-                val curMatrix = DoubleTensor(
-                    matrix.shape,
-                    matrix.mutableBuffer.array().slice(matrix.bufferStart until matrix.bufferStart + matrixSize)
-                        .toDoubleArray()
-                )
-                svdHelper(curMatrix, USV, m, n, epsilon)
-            }
-
-        return Triple(uTensor.transpose(), sTensor, vTensor.transpose())
-    }
-
-    override fun Tensor<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> =
-        symEig(epsilon = 1e-15)
-
-    /**
-     * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
-     * represented by a pair (eigenvalues, eigenvectors).
-     *
-     * @param epsilon permissible error when comparing tensors for equality
-     * and when the cosine approaches 1 in the SVD algorithm.
-     * @return a pair (eigenvalues, eigenvectors)
-     */
-    public fun Tensor<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
-        checkSymmetric(tensor, epsilon)
-        val (u, s, v) = tensor.svd(epsilon)
-        val shp = s.shape + intArrayOf(1)
-        val utv = u.transpose() dot v
-        val n = s.shape.last()
-        for (matrix in utv.matrixSequence())
-            cleanSymHelper(matrix.as2D(), n)
-
-        val eig = (utv dot s.view(shp)).view(s.shape)
-        return eig to v
-    }
-
-    /**
-     * Computes the determinant of a square matrix input, or of each square matrix in a batched input
-     * using LU factorization algorithm.
-     *
-     * @param epsilon error in the LU algorithm - permissible error when comparing the determinant of a matrix with zero
-     * @return the determinant.
-     */
-    public fun Tensor<Double>.detLU(epsilon: Double = 1e-9): DoubleTensor {
-
-        checkSquareMatrix(tensor.shape)
-        val luTensor = tensor.copy()
-        val pivotsTensor = tensor.setUpPivots()
-
-        val n = shape.size
-
-        val detTensorShape = IntArray(n - 1) { i -> shape[i] }
-        detTensorShape[n - 2] = 1
-        val resBuffer = DoubleArray(detTensorShape.reduce(Int::times)) { 0.0 }
-
-        val detTensor = DoubleTensor(
-            detTensorShape,
-            resBuffer
-        )
-
-        luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).forEachIndexed { index, (lu, pivots) ->
-            resBuffer[index] = if (luHelper(lu.as2D(), pivots.as1D(), epsilon))
-                0.0 else luMatrixDet(lu.as2D(), pivots.as1D())
-        }
-
-        return detTensor
-    }
-
-    /**
-     * Computes the multiplicative inverse matrix of a square matrix input, or of each square matrix in a batched input
-     * using LU factorization algorithm.
-     * Given a square matrix `a`, return the matrix `aInv` satisfying
-     * ``a.dot(aInv) = aInv.dot(a) = eye(a.shape[0])``.
-     *
-     * @param epsilon error in the LU algorithm - permissible error when comparing the determinant of a matrix with zero
-     * @return the multiplicative inverse of a matrix.
-     */
-    public fun Tensor<Double>.invLU(epsilon: Double = 1e-9): DoubleTensor {
-        val (luTensor, pivotsTensor) = luFactor(epsilon)
-        val invTensor = luTensor.zeroesLike()
-
-        val seq = luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).zip(invTensor.matrixSequence())
-        for ((luP, invMatrix) in seq) {
-            val (lu, pivots) = luP
-            luMatrixInv(lu.as2D(), pivots.as1D(), invMatrix.as2D())
-        }
-
-        return invTensor
-    }
-
-    /**
-     * LUP decomposition
-     *
-     * Computes the LUP decomposition of a matrix or a batch of matrices.
-     * Given a tensor `input`, return tensors (P, L, U) satisfying ``P * input = L * U``,
-     * with `P` being a permutation matrix or batch of matrices,
-     * `L` being a lower triangular matrix or batch of matrices,
-     * `U` being an upper triangular matrix or batch of matrices.
-     *
-     * @param epsilon permissible error when comparing the determinant of a matrix with zero
-     * @return triple of P, L and U tensors
-     */
-    public fun Tensor<Double>.lu(epsilon: Double = 1e-9): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        val (lu, pivots) = this.luFactor(epsilon)
-        return luPivot(lu, pivots)
-    }
-
-    override fun Tensor<Double>.lu(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> = lu(1e-9)
-
-}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
index e5d41f856..cb06432d0 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
@@ -5,28 +5,34 @@
 
 package space.kscience.kmath.tensors.core.algebras
 
+import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
+import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
 import space.kscience.kmath.tensors.api.TensorPartialDivisionAlgebra
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.*
-import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra.fold
-import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra.foldDim
-import space.kscience.kmath.tensors.core.broadcastOuterTensors
-import space.kscience.kmath.tensors.core.checkBufferShapeConsistency
-import space.kscience.kmath.tensors.core.checkEmptyDoubleBuffer
-import space.kscience.kmath.tensors.core.checkEmptyShape
-import space.kscience.kmath.tensors.core.checkShapesCompatible
-import space.kscience.kmath.tensors.core.checkTranspose
-import space.kscience.kmath.tensors.core.checkView
-import space.kscience.kmath.tensors.core.dotHelper
-import space.kscience.kmath.tensors.core.getRandomNormals
-import space.kscience.kmath.tensors.core.minusIndexFrom
-import kotlin.math.abs
+import space.kscience.kmath.tensors.core.internal.dotHelper
+import space.kscience.kmath.tensors.core.internal.getRandomNormals
+import space.kscience.kmath.tensors.core.internal.*
+import space.kscience.kmath.tensors.core.internal.broadcastOuterTensors
+import space.kscience.kmath.tensors.core.internal.checkBufferShapeConsistency
+import space.kscience.kmath.tensors.core.internal.checkEmptyDoubleBuffer
+import space.kscience.kmath.tensors.core.internal.checkEmptyShape
+import space.kscience.kmath.tensors.core.internal.checkShapesCompatible
+import space.kscience.kmath.tensors.core.internal.checkSquareMatrix
+import space.kscience.kmath.tensors.core.internal.checkTranspose
+import space.kscience.kmath.tensors.core.internal.checkView
+import space.kscience.kmath.tensors.core.internal.minusIndexFrom
+import kotlin.math.*
 
 /**
  * Implementation of basic operations over double tensors and basic algebra operations on them.
  */
-public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
+public open class DoubleTensorAlgebra :
+    TensorPartialDivisionAlgebra<Double>,
+    AnalyticTensorAlgebra<Double>,
+    LinearOpsTensorAlgebra<Double> {
 
     public companion object : DoubleTensorAlgebra()
 
@@ -311,9 +317,8 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
         return DoubleTensor(shape, tensor.mutableBuffer.array(), tensor.bufferStart)
     }
 
-    override fun Tensor<Double>.viewAs(other: Tensor<Double>): DoubleTensor {
-        return tensor.view(other.shape)
-    }
+    override fun Tensor<Double>.viewAs(other: Tensor<Double>): DoubleTensor =
+        tensor.view(other.shape)
 
     override infix fun Tensor<Double>.dot(other: Tensor<Double>): DoubleTensor {
         if (tensor.shape.size == 1 && other.shape.size == 1) {
@@ -565,4 +570,350 @@ public open class DoubleTensorAlgebra : TensorPartialDivisionAlgebra<Double> {
             x.withIndex().maxByOrNull { it.value }?.index!!.toDouble()
         }, dim, keepDim)
 
+
+    override fun Tensor<Double>.mean(): Double = this.fold { it.sum() / tensor.numElements }
+
+    override fun Tensor<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor =
+        foldDim(
+            { arr ->
+                check(dim < dimension) { "Dimension $dim out of range $dimension" }
+                arr.sum() / shape[dim]
+            },
+            dim,
+            keepDim
+        )
+
+    override fun Tensor<Double>.std(): Double = this.fold { arr ->
+        val mean = arr.sum() / tensor.numElements
+        sqrt(arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1))
+    }
+
+    override fun Tensor<Double>.std(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
+        { arr ->
+            check(dim < dimension) { "Dimension $dim out of range $dimension" }
+            val mean = arr.sum() / shape[dim]
+            sqrt(arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1))
+        },
+        dim,
+        keepDim
+    )
+
+    override fun Tensor<Double>.variance(): Double = this.fold { arr ->
+        val mean = arr.sum() / tensor.numElements
+        arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1)
+    }
+
+    override fun Tensor<Double>.variance(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
+        { arr ->
+            check(dim < dimension) { "Dimension $dim out of range $dimension" }
+            val mean = arr.sum() / shape[dim]
+            arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1)
+        },
+        dim,
+        keepDim
+    )
+
+    private fun cov(x: DoubleTensor, y:DoubleTensor): Double{
+        val n = x.shape[0]
+        return ((x - x.mean()) * (y - y.mean())).mean() * n / (n - 1)
+    }
+
+    override fun cov(tensors: List<Tensor<Double>>): DoubleTensor {
+        check(tensors.isNotEmpty()) { "List must have at least 1 element" }
+        val n = tensors.size
+        val m = tensors[0].shape[0]
+        check(tensors.all { it.shape contentEquals intArrayOf(m) }) { "Tensors must have same shapes" }
+        val resTensor = DoubleTensor(
+            intArrayOf(n, n),
+            DoubleArray(n * n) {0.0}
+        )
+        for (i in 0 until n){
+            for (j in 0 until n){
+                resTensor[intArrayOf(i, j)] = cov(tensors[i].tensor, tensors[j].tensor)
+            }
+        }
+        return resTensor
+    }
+
+    override fun Tensor<Double>.exp(): DoubleTensor = tensor.map(::exp)
+
+    override fun Tensor<Double>.ln(): DoubleTensor = tensor.map(::ln)
+
+    override fun Tensor<Double>.sqrt(): DoubleTensor = tensor.map(::sqrt)
+
+    override fun Tensor<Double>.cos(): DoubleTensor = tensor.map(::cos)
+
+    override fun Tensor<Double>.acos(): DoubleTensor = tensor.map(::acos)
+
+    override fun Tensor<Double>.cosh(): DoubleTensor = tensor.map(::cosh)
+
+    override fun Tensor<Double>.acosh(): DoubleTensor = tensor.map(::acosh)
+
+    override fun Tensor<Double>.sin(): DoubleTensor = tensor.map(::sin)
+
+    override fun Tensor<Double>.asin(): DoubleTensor = tensor.map(::asin)
+
+    override fun Tensor<Double>.sinh(): DoubleTensor = tensor.map(::sinh)
+
+    override fun Tensor<Double>.asinh(): DoubleTensor = tensor.map(::asinh)
+
+    override fun Tensor<Double>.tan(): DoubleTensor = tensor.map(::tan)
+
+    override fun Tensor<Double>.atan(): DoubleTensor = tensor.map(::atan)
+
+    override fun Tensor<Double>.tanh(): DoubleTensor = tensor.map(::tanh)
+
+    override fun Tensor<Double>.atanh(): DoubleTensor = tensor.map(::atanh)
+
+    override fun Tensor<Double>.ceil(): DoubleTensor = tensor.map(::ceil)
+
+    override fun Tensor<Double>.floor(): DoubleTensor = tensor.map(::floor)
+
+    override fun Tensor<Double>.inv(): DoubleTensor = invLU(1e-9)
+
+    override fun Tensor<Double>.det(): DoubleTensor = detLU(1e-9)
+
+    /**
+     * Computes the LU factorization of a matrix or batches of matrices `input`.
+     * Returns a tuple containing the LU factorization and pivots of `input`.
+     *
+     * @param epsilon permissible error when comparing the determinant of a matrix with zero
+     * @return pair of `factorization` and `pivots`.
+     * The `factorization` has the shape ``(*, m, n)``, where``(*, m, n)`` is the shape of the `input` tensor.
+     * The `pivots`  has the shape ``(∗, min(m, n))``. `pivots` stores all the intermediate transpositions of rows.
+     */
+    public fun Tensor<Double>.luFactor(epsilon: Double): Pair<DoubleTensor, IntTensor> =
+        computeLU(tensor, epsilon)
+            ?: throw IllegalArgumentException("Tensor contains matrices which are singular at precision $epsilon")
+
+    /**
+     * Computes the LU factorization of a matrix or batches of matrices `input`.
+     * Returns a tuple containing the LU factorization and pivots of `input`.
+     * Uses an error of ``1e-9`` when calculating whether a matrix is degenerate.
+     *
+     * @return pair of `factorization` and `pivots`.
+     * The `factorization` has the shape ``(*, m, n)``, where``(*, m, n)`` is the shape of the `input` tensor.
+     * The `pivots`  has the shape ``(∗, min(m, n))``. `pivots` stores all the intermediate transpositions of rows.
+     */
+    public fun Tensor<Double>.luFactor(): Pair<DoubleTensor, IntTensor> = luFactor(1e-9)
+
+    /**
+     * Unpacks the data and pivots from a LU factorization of a tensor.
+     * Given a tensor [luTensor], return tensors (P, L, U) satisfying ``P * luTensor = L * U``,
+     * with `P` being a permutation matrix or batch of matrices,
+     * `L` being a lower triangular matrix or batch of matrices,
+     * `U` being an upper triangular matrix or batch of matrices.
+     *
+     * @param luTensor the packed LU factorization data
+     * @param pivotsTensor the packed LU factorization pivots
+     * @return triple of P, L and U tensors
+     */
+    public fun luPivot(
+        luTensor: Tensor<Double>,
+        pivotsTensor: Tensor<Int>
+    ): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+        checkSquareMatrix(luTensor.shape)
+        check(
+            luTensor.shape.dropLast(2).toIntArray() contentEquals pivotsTensor.shape.dropLast(1).toIntArray() ||
+                    luTensor.shape.last() == pivotsTensor.shape.last() - 1
+        ) { "Inappropriate shapes of input tensors" }
+
+        val n = luTensor.shape.last()
+        val pTensor = luTensor.zeroesLike()
+        pTensor
+            .matrixSequence()
+            .zip(pivotsTensor.tensor.vectorSequence())
+            .forEach { (p, pivot) -> pivInit(p.as2D(), pivot.as1D(), n) }
+
+        val lTensor = luTensor.zeroesLike()
+        val uTensor = luTensor.zeroesLike()
+
+        lTensor.matrixSequence()
+            .zip(uTensor.matrixSequence())
+            .zip(luTensor.tensor.matrixSequence())
+            .forEach { (pairLU, lu) ->
+                val (l, u) = pairLU
+                luPivotHelper(l.as2D(), u.as2D(), lu.as2D(), n)
+            }
+
+        return Triple(pTensor, lTensor, uTensor)
+    }
+
+    /**
+     * QR decomposition.
+     *
+     * Computes the QR decomposition of a matrix or a batch of matrices, and returns a pair `(Q, R)` of tensors.
+     * Given a tensor `input`, return tensors (Q, R) satisfying ``input = Q * R``,
+     * with `Q` being an orthogonal matrix or batch of orthogonal matrices
+     * and `R` being an upper triangular matrix or batch of upper triangular matrices.
+     *
+     * @param epsilon permissible error when comparing tensors for equality.
+     * Used when checking the positive definiteness of the input matrix or matrices.
+     * @return pair of Q and R tensors.
+     */
+    public fun Tensor<Double>.cholesky(epsilon: Double): DoubleTensor {
+        checkSquareMatrix(shape)
+        checkPositiveDefinite(tensor, epsilon)
+
+        val n = shape.last()
+        val lTensor = zeroesLike()
+
+        for ((a, l) in tensor.matrixSequence().zip(lTensor.matrixSequence()))
+            for (i in 0 until n) choleskyHelper(a.as2D(), l.as2D(), n)
+
+        return lTensor
+    }
+
+    override fun Tensor<Double>.cholesky(): DoubleTensor = cholesky(1e-6)
+
+    override fun Tensor<Double>.qr(): Pair<DoubleTensor, DoubleTensor> {
+        checkSquareMatrix(shape)
+        val qTensor = zeroesLike()
+        val rTensor = zeroesLike()
+        tensor.matrixSequence()
+            .zip((qTensor.matrixSequence()
+                .zip(rTensor.matrixSequence()))).forEach { (matrix, qr) ->
+                val (q, r) = qr
+                qrHelper(matrix.asTensor(), q.asTensor(), r.as2D())
+            }
+
+        return qTensor to rTensor
+    }
+
+    override fun Tensor<Double>.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> =
+        svd(epsilon = 1e-10)
+
+    /**
+     * Singular Value Decomposition.
+     *
+     * Computes the singular value decomposition of either a matrix or batch of matrices `input`.
+     * The singular value decomposition is represented as a triple `(U, S, V)`,
+     * such that ``input = U.dot(diagonalEmbedding(S).dot(V.T))``.
+     * If input is a batch of tensors, then U, S, and Vh are also batched with the same batch dimensions as input.
+     *
+     * @param epsilon permissible error when calculating the dot product of vectors,
+     * i.e. the precision with which the cosine approaches 1 in an iterative algorithm.
+     * @return triple `(U, S, V)`.
+     */
+    public fun Tensor<Double>.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+        val size = tensor.dimension
+        val commonShape = tensor.shape.sliceArray(0 until size - 2)
+        val (n, m) = tensor.shape.sliceArray(size - 2 until size)
+        val uTensor = zeros(commonShape + intArrayOf(min(n, m), n))
+        val sTensor = zeros(commonShape + intArrayOf(min(n, m)))
+        val vTensor = zeros(commonShape + intArrayOf(min(n, m), m))
+
+        tensor.matrixSequence()
+            .zip(uTensor.matrixSequence()
+                .zip(sTensor.vectorSequence()
+                    .zip(vTensor.matrixSequence()))).forEach { (matrix, USV) ->
+                val matrixSize = matrix.shape.reduce { acc, i -> acc * i }
+                val curMatrix = DoubleTensor(
+                    matrix.shape,
+                    matrix.mutableBuffer.array().slice(matrix.bufferStart until matrix.bufferStart + matrixSize)
+                        .toDoubleArray()
+                )
+                svdHelper(curMatrix, USV, m, n, epsilon)
+            }
+
+        return Triple(uTensor.transpose(), sTensor, vTensor.transpose())
+    }
+
+    override fun Tensor<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> =
+        symEig(epsilon = 1e-15)
+
+    /**
+     * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
+     * represented by a pair (eigenvalues, eigenvectors).
+     *
+     * @param epsilon permissible error when comparing tensors for equality
+     * and when the cosine approaches 1 in the SVD algorithm.
+     * @return a pair (eigenvalues, eigenvectors)
+     */
+    public fun Tensor<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
+        checkSymmetric(tensor, epsilon)
+        val (u, s, v) = tensor.svd(epsilon)
+        val shp = s.shape + intArrayOf(1)
+        val utv = u.transpose() dot v
+        val n = s.shape.last()
+        for (matrix in utv.matrixSequence())
+            cleanSymHelper(matrix.as2D(), n)
+
+        val eig = (utv dot s.view(shp)).view(s.shape)
+        return eig to v
+    }
+
+    /**
+     * Computes the determinant of a square matrix input, or of each square matrix in a batched input
+     * using LU factorization algorithm.
+     *
+     * @param epsilon error in the LU algorithm - permissible error when comparing the determinant of a matrix with zero
+     * @return the determinant.
+     */
+    public fun Tensor<Double>.detLU(epsilon: Double = 1e-9): DoubleTensor {
+
+        checkSquareMatrix(tensor.shape)
+        val luTensor = tensor.copy()
+        val pivotsTensor = tensor.setUpPivots()
+
+        val n = shape.size
+
+        val detTensorShape = IntArray(n - 1) { i -> shape[i] }
+        detTensorShape[n - 2] = 1
+        val resBuffer = DoubleArray(detTensorShape.reduce(Int::times)) { 0.0 }
+
+        val detTensor = DoubleTensor(
+            detTensorShape,
+            resBuffer
+        )
+
+        luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).forEachIndexed { index, (lu, pivots) ->
+            resBuffer[index] = if (luHelper(lu.as2D(), pivots.as1D(), epsilon))
+                0.0 else luMatrixDet(lu.as2D(), pivots.as1D())
+        }
+
+        return detTensor
+    }
+
+    /**
+     * Computes the multiplicative inverse matrix of a square matrix input, or of each square matrix in a batched input
+     * using LU factorization algorithm.
+     * Given a square matrix `a`, return the matrix `aInv` satisfying
+     * ``a.dot(aInv) = aInv.dot(a) = eye(a.shape[0])``.
+     *
+     * @param epsilon error in the LU algorithm - permissible error when comparing the determinant of a matrix with zero
+     * @return the multiplicative inverse of a matrix.
+     */
+    public fun Tensor<Double>.invLU(epsilon: Double = 1e-9): DoubleTensor {
+        val (luTensor, pivotsTensor) = luFactor(epsilon)
+        val invTensor = luTensor.zeroesLike()
+
+        val seq = luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).zip(invTensor.matrixSequence())
+        for ((luP, invMatrix) in seq) {
+            val (lu, pivots) = luP
+            luMatrixInv(lu.as2D(), pivots.as1D(), invMatrix.as2D())
+        }
+
+        return invTensor
+    }
+
+    /**
+     * LUP decomposition
+     *
+     * Computes the LUP decomposition of a matrix or a batch of matrices.
+     * Given a tensor `input`, return tensors (P, L, U) satisfying ``P * input = L * U``,
+     * with `P` being a permutation matrix or batch of matrices,
+     * `L` being a lower triangular matrix or batch of matrices,
+     * `U` being an upper triangular matrix or batch of matrices.
+     *
+     * @param epsilon permissible error when comparing the determinant of a matrix with zero
+     * @return triple of P, L and U tensors
+     */
+    public fun Tensor<Double>.lu(epsilon: Double = 1e-9): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+        val (lu, pivots) = this.luFactor(epsilon)
+        return luPivot(lu, pivots)
+    }
+
+    override fun Tensor<Double>.lu(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> = lu(1e-9)
+
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
similarity index 94%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
index dfac054b5..6324dc242 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
@@ -1,5 +1,11 @@
-package space.kscience.kmath.tensors.core
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
 
+package space.kscience.kmath.tensors.core.internal
+
+import space.kscience.kmath.tensors.core.DoubleTensor
 import kotlin.math.max
 
 internal fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: DoubleTensor, linearSize: Int) {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
similarity index 83%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index f8bd5027a..0221c961e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -1,7 +1,12 @@
-package space.kscience.kmath.tensors.core
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.tensors.api.Tensor
-import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
+import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 
 
@@ -50,7 +55,7 @@ internal fun DoubleTensorAlgebra.checkSymmetric(
         "Tensor is not symmetric about the last 2 dimensions at precision $epsilon"
     }
 
-internal fun DoubleLinearOpsTensorAlgebra.checkPositiveDefinite(tensor: DoubleTensor, epsilon: Double = 1e-6) {
+internal fun DoubleTensorAlgebra.checkPositiveDefinite(tensor: DoubleTensor, epsilon: Double = 1e-6) {
     checkSymmetric(tensor, epsilon)
     for (mat in tensor.matrixSequence())
         check(mat.asTensor().detLU().value() > 0.0) {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
similarity index 91%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index 8adbfad39..23909f81e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -1,12 +1,17 @@
-package space.kscience.kmath.tensors.core
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.nd.MutableStructure1D
 import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
-import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
+import space.kscience.kmath.tensors.core.*
+import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import kotlin.math.abs
 import kotlin.math.min
 import kotlin.math.sign
@@ -114,7 +119,7 @@ internal fun <T> BufferedTensor<T>.setUpPivots(): IntTensor {
     )
 }
 
-internal fun DoubleLinearOpsTensorAlgebra.computeLU(
+internal fun DoubleTensorAlgebra.computeLU(
     tensor: DoubleTensor,
     epsilon: Double
 ): Pair<DoubleTensor, IntTensor>? {
@@ -218,7 +223,7 @@ internal fun luMatrixInv(
     }
 }
 
-internal fun DoubleLinearOpsTensorAlgebra.qrHelper(
+internal fun DoubleTensorAlgebra.qrHelper(
     matrix: DoubleTensor,
     q: DoubleTensor,
     r: MutableStructure2D<Double>
@@ -241,14 +246,14 @@ internal fun DoubleLinearOpsTensorAlgebra.qrHelper(
                 }
             }
         }
-        r[j, j] = DoubleAnalyticTensorAlgebra { (v dot v).sqrt().value() }
+        r[j, j] = DoubleTensorAlgebra { (v dot v).sqrt().value() }
         for (i in 0 until n) {
             qM[i, j] = vv[i] / r[j, j]
         }
     }
 }
 
-internal fun DoubleLinearOpsTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double = 1e-10): DoubleTensor {
+internal fun DoubleTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double = 1e-10): DoubleTensor {
     val (n, m) = a.shape
     var v: DoubleTensor
     val b: DoubleTensor
@@ -264,7 +269,7 @@ internal fun DoubleLinearOpsTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double
     while (true) {
         lastV = v
         v = b.dot(lastV)
-        val norm = DoubleAnalyticTensorAlgebra { (v dot v).sqrt().value() }
+        val norm = DoubleTensorAlgebra { (v dot v).sqrt().value() }
         v = v.times(1.0 / norm)
         if (abs(v.dot(lastV).value()) > 1 - epsilon) {
             return v
@@ -272,7 +277,7 @@ internal fun DoubleLinearOpsTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double
     }
 }
 
-internal fun DoubleLinearOpsTensorAlgebra.svdHelper(
+internal fun DoubleTensorAlgebra.svdHelper(
     matrix: DoubleTensor,
     USV: Pair<BufferedTensor<Double>, Pair<BufferedTensor<Double>, BufferedTensor<Double>>>,
     m: Int, n: Int, epsilon: Double
@@ -298,12 +303,12 @@ internal fun DoubleLinearOpsTensorAlgebra.svdHelper(
         if (n > m) {
             v = svd1d(a, epsilon)
             u = matrix.dot(v)
-            norm = DoubleAnalyticTensorAlgebra { (u dot u).sqrt().value() }
+            norm = DoubleTensorAlgebra { (u dot u).sqrt().value() }
             u = u.times(1.0 / norm)
         } else {
             u = svd1d(a, epsilon)
             v = matrix.transpose(0, 1).dot(u)
-            norm = DoubleAnalyticTensorAlgebra { (v dot v).sqrt().value() }
+            norm = DoubleTensorAlgebra { (v dot v).sqrt().value() }
             v = v.times(1.0 / norm)
         }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
similarity index 88%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCastsUtils.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index 70e3b9c61..67cb0b842 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -3,11 +3,14 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.tensors.core
+package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.nd.MutableBufferND
 import space.kscience.kmath.structures.asMutableBuffer
 import space.kscience.kmath.tensors.api.Tensor
+import space.kscience.kmath.tensors.core.BufferedTensor
+import space.kscience.kmath.tensors.core.DoubleTensor
+import space.kscience.kmath.tensors.core.IntTensor
 import space.kscience.kmath.tensors.core.algebras.TensorLinearStructure
 
 internal fun BufferedTensor<Int>.asTensor(): IntTensor =
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
similarity index 91%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index 0211342bb..0ffaf39e7 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -1,9 +1,16 @@
-package space.kscience.kmath.tensors.core
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.*
+import space.kscience.kmath.tensors.core.BufferedTensor
+import space.kscience.kmath.tensors.core.DoubleTensor
 import kotlin.math.*
 
 /**
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
index 2743a5218..814a1bb9b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.tensors.api.Tensor
+import space.kscience.kmath.tensors.core.internal.tensor
 
 /**
  * Casts [Tensor<Double>] to [DoubleTensor]
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 6e3b4df60..80c7ab13a 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -3,6 +3,7 @@ package space.kscience.kmath.tensors.core
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.internal.*
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index 3ea19da26..4dcc367ca 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -1,7 +1,6 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.algebras.DoubleAnalyticTensorAlgebra
 import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import kotlin.math.*
 import kotlin.test.Test
@@ -28,73 +27,73 @@ internal class TestDoubleAnalyticTensorAlgebra {
     }
 
     @Test
-    fun testExp() = DoubleAnalyticTensorAlgebra {
+    fun testExp() = DoubleTensorAlgebra {
         assertTrue { tensor.exp() eq expectedTensor(::exp) }
     }
 
     @Test
-    fun testLog() = DoubleAnalyticTensorAlgebra {
+    fun testLog() = DoubleTensorAlgebra {
         assertTrue { tensor.ln() eq expectedTensor(::ln) }
     }
 
     @Test
-    fun testSqrt() = DoubleAnalyticTensorAlgebra {
+    fun testSqrt() = DoubleTensorAlgebra {
         assertTrue { tensor.sqrt() eq expectedTensor(::sqrt) }
     }
 
     @Test
-    fun testCos() = DoubleAnalyticTensorAlgebra {
+    fun testCos() = DoubleTensorAlgebra {
         assertTrue { tensor.cos() eq expectedTensor(::cos) }
     }
 
 
     @Test
-    fun testCosh() = DoubleAnalyticTensorAlgebra {
+    fun testCosh() = DoubleTensorAlgebra {
         assertTrue { tensor.cosh() eq expectedTensor(::cosh) }
     }
 
     @Test
-    fun testAcosh() = DoubleAnalyticTensorAlgebra {
+    fun testAcosh() = DoubleTensorAlgebra {
         assertTrue { tensor.acosh() eq expectedTensor(::acosh) }
     }
 
     @Test
-    fun testSin() = DoubleAnalyticTensorAlgebra {
+    fun testSin() = DoubleTensorAlgebra {
         assertTrue { tensor.sin() eq expectedTensor(::sin) }
     }
 
     @Test
-    fun testSinh() = DoubleAnalyticTensorAlgebra {
+    fun testSinh() = DoubleTensorAlgebra {
         assertTrue { tensor.sinh() eq expectedTensor(::sinh) }
     }
 
     @Test
-    fun testAsinh() = DoubleAnalyticTensorAlgebra {
+    fun testAsinh() = DoubleTensorAlgebra {
         assertTrue { tensor.asinh() eq expectedTensor(::asinh) }
     }
 
     @Test
-    fun testTan() = DoubleAnalyticTensorAlgebra {
+    fun testTan() = DoubleTensorAlgebra {
         assertTrue { tensor.tan() eq expectedTensor(::tan) }
     }
 
     @Test
-    fun testAtan() = DoubleAnalyticTensorAlgebra {
+    fun testAtan() = DoubleTensorAlgebra {
         assertTrue { tensor.atan() eq expectedTensor(::atan) }
     }
 
     @Test
-    fun testTanh() = DoubleAnalyticTensorAlgebra {
+    fun testTanh() = DoubleTensorAlgebra {
         assertTrue { tensor.tanh() eq expectedTensor(::tanh) }
     }
 
     @Test
-    fun testCeil() = DoubleAnalyticTensorAlgebra {
+    fun testCeil() = DoubleTensorAlgebra {
         assertTrue { tensor.ceil() eq expectedTensor(::ceil) }
     }
 
     @Test
-    fun testFloor() = DoubleAnalyticTensorAlgebra {
+    fun testFloor() = DoubleTensorAlgebra {
         assertTrue { tensor.floor() eq expectedTensor(::floor) }
     }
 
@@ -145,7 +144,7 @@ internal class TestDoubleAnalyticTensorAlgebra {
     }
 
     @Test
-    fun testMean() = DoubleAnalyticTensorAlgebra {
+    fun testMean() = DoubleTensorAlgebra {
         assertTrue { tensor2.mean() == 1.0 }
         assertTrue { tensor2.mean(0, true) eq fromArray(
             intArrayOf(1, 2),
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 65070af7f..77748b15e 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -1,7 +1,9 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.algebras.DoubleLinearOpsTensorAlgebra
+import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.internal.array
+import space.kscience.kmath.tensors.core.internal.svd1d
 import kotlin.math.abs
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -10,7 +12,7 @@ import kotlin.test.assertTrue
 internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
-    fun testDetLU() = DoubleLinearOpsTensorAlgebra {
+    fun testDetLU() = DoubleTensorAlgebra {
         val tensor = fromArray(
             intArrayOf(2, 2, 2),
             doubleArrayOf(
@@ -35,7 +37,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testDet() = DoubleLinearOpsTensorAlgebra {
+    fun testDet() = DoubleTensorAlgebra {
         val expectedValue = 0.019827417
         val m = fromArray(
             intArrayOf(3, 3), doubleArrayOf(
@@ -49,7 +51,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testDetSingle() = DoubleLinearOpsTensorAlgebra {
+    fun testDetSingle() = DoubleTensorAlgebra {
         val expectedValue = 48.151623
         val m = fromArray(
             intArrayOf(1, 1), doubleArrayOf(
@@ -61,7 +63,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testInvLU() = DoubleLinearOpsTensorAlgebra {
+    fun testInvLU() = DoubleTensorAlgebra {
         val tensor = fromArray(
             intArrayOf(2, 2, 2),
             doubleArrayOf(
@@ -86,14 +88,14 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testScalarProduct() = DoubleLinearOpsTensorAlgebra {
+    fun testScalarProduct() = DoubleTensorAlgebra {
         val a = fromArray(intArrayOf(3), doubleArrayOf(1.8, 2.5, 6.8))
         val b = fromArray(intArrayOf(3), doubleArrayOf(5.5, 2.6, 6.4))
         assertEquals(a.dot(b).value(), 59.92)
     }
 
     @Test
-    fun testQR() = DoubleLinearOpsTensorAlgebra {
+    fun testQR() = DoubleTensorAlgebra {
         val shape = intArrayOf(2, 2, 2)
         val buffer = doubleArrayOf(
             1.0, 3.0,
@@ -114,7 +116,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testLU() = DoubleLinearOpsTensorAlgebra {
+    fun testLU() = DoubleTensorAlgebra {
         val shape = intArrayOf(2, 2, 2)
         val buffer = doubleArrayOf(
             1.0, 3.0,
@@ -134,7 +136,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testCholesky() = DoubleLinearOpsTensorAlgebra {
+    fun testCholesky() = DoubleTensorAlgebra {
         val tensor = randomNormal(intArrayOf(2, 5, 5), 0)
         val sigma = (tensor dot tensor.transpose()) + diagonalEmbedding(
             fromArray(intArrayOf(2, 5), DoubleArray(10) { 0.1 })
@@ -145,7 +147,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testSVD1D() = DoubleLinearOpsTensorAlgebra {
+    fun testSVD1D() = DoubleTensorAlgebra {
         val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
 
         val res = svd1d(tensor2)
@@ -156,13 +158,13 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testSVD() = DoubleLinearOpsTensorAlgebra{
+    fun testSVD() = DoubleTensorAlgebra{
         testSVDFor(fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0)))
         testSVDFor(fromArray(intArrayOf(2, 2), doubleArrayOf(-1.0, 0.0, 239.0, 238.0)))
     }
 
     @Test
-    fun testBatchedSVD() = DoubleLinearOpsTensorAlgebra {
+    fun testBatchedSVD() = DoubleTensorAlgebra {
         val tensor = randomNormal(intArrayOf(2, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
         val tensorSVD = tensorU dot (diagonalEmbedding(tensorS) dot tensorV.transpose())
@@ -170,7 +172,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     }
 
     @Test
-    fun testBatchedSymEig() = DoubleLinearOpsTensorAlgebra {
+    fun testBatchedSymEig() = DoubleTensorAlgebra {
         val tensor = randomNormal(shape = intArrayOf(2, 3, 3), 0)
         val tensorSigma = tensor + tensor.transpose()
         val (tensorS, tensorV) = tensorSigma.symEig()
@@ -182,7 +184,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 }
 
 
-private fun DoubleLinearOpsTensorAlgebra.testSVDFor(tensor: DoubleTensor, epsilon: Double = 1e-10): Unit {
+private fun DoubleTensorAlgebra.testSVDFor(tensor: DoubleTensor, epsilon: Double = 1e-10): Unit {
     val svd = tensor.svd()
 
     val tensorSVD = svd.first
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 132735cc7..c4f9f94b0 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -8,6 +8,10 @@ import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.toDoubleArray
 import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.internal.array
+import space.kscience.kmath.tensors.core.internal.asTensor
+import space.kscience.kmath.tensors.core.internal.matrixSequence
+import space.kscience.kmath.tensors.core.internal.toBufferedTensor
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index d782d78d9..ed858259e 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -3,6 +3,7 @@ package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.internal.array
 import kotlin.test.Test
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
-- 
2.34.1


From 0ef64130aeae0deb5543b9c6f73af3a46f465394 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 7 May 2021 13:00:30 +0100
Subject: [PATCH 199/713] TensorLinearStructure made internal

---
 .../space/kscience/kmath/tensors/DataSetNormalization.kt     | 2 +-
 .../kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt     | 2 +-
 .../kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt     | 4 ++--
 .../main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt   | 2 +-
 examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt | 2 +-
 .../core/{algebras => }/BroadcastDoubleTensorAlgebra.kt      | 3 +--
 .../space/kscience/kmath/tensors/core/BufferedTensor.kt      | 5 +++--
 .../kmath/tensors/core/{algebras => }/DoubleTensorAlgebra.kt | 3 +--
 .../core/{algebras => internal}/TensorLinearStructure.kt     | 4 ++--
 .../space/kscience/kmath/tensors/core/internal/checks.kt     | 2 +-
 .../space/kscience/kmath/tensors/core/internal/linUtils.kt   | 2 +-
 .../kscience/kmath/tensors/core/internal/tensorCastsUtils.kt | 1 -
 .../space/kscience/kmath/tensors/core/TestBroadcasting.kt    | 2 --
 .../kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt    | 1 -
 .../kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt         | 1 -
 .../space/kscience/kmath/tensors/core/TestDoubleTensor.kt    | 1 -
 .../kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt   | 1 -
 17 files changed, 15 insertions(+), 23 deletions(-)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{algebras => }/BroadcastDoubleTensorAlgebra.kt (97%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{algebras => }/DoubleTensorAlgebra.kt (99%)
 rename kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/{algebras => internal}/TensorLinearStructure.kt (91%)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
index d029348f2..6fbf16a91 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.tensors
 
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
 
 
 // Dataset normalization
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
index c0ece04ca..78370b517 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.tensors
 
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.DoubleTensor
-import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
 
 // solving linear system with LUP decomposition
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
index 1998b8d16..874ac8034 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
@@ -7,8 +7,8 @@ package space.kscience.kmath.tensors
 
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.DoubleTensor
-import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
-import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.toDoubleArray
 import kotlin.math.sqrt
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index 497f63b41..42a0a4ba1 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.tensors
 
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.DoubleTensor
-import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 
 import kotlin.math.abs
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index d29dbb094..f8ac13d3f 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.tensors
 
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
 
 
 // simple PCA
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
similarity index 97%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index bc7d90c28..b8530f637 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -3,10 +3,9 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.tensors.core.algebras
+package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.tensors.api.Tensor
-import space.kscience.kmath.tensors.core.*
 import space.kscience.kmath.tensors.core.internal.array
 import space.kscience.kmath.tensors.core.internal.broadcastTensors
 import space.kscience.kmath.tensors.core.internal.broadcastTo
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index e8c0556c2..858532abc 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -1,8 +1,9 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.nd.Strides
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.api.Tensor
-import space.kscience.kmath.tensors.core.algebras.TensorLinearStructure
+import space.kscience.kmath.tensors.core.internal.TensorLinearStructure
 
 /**
  * Represents [Tensor] over a [MutableBuffer] intended to be used through [DoubleTensor] and [IntTensor]
@@ -16,7 +17,7 @@ public open class BufferedTensor<T> internal constructor(
     /**
      * Buffer strides based on [TensorLinearStructure] implementation
      */
-    public val linearStructure: TensorLinearStructure
+    public val linearStructure: Strides
         get() = TensorLinearStructure(shape)
 
     /**
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
similarity index 99%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index cb06432d0..d4a0f1433 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.tensors.core.algebras
+package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
@@ -11,7 +11,6 @@ import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
 import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
 import space.kscience.kmath.tensors.api.TensorPartialDivisionAlgebra
 import space.kscience.kmath.tensors.api.Tensor
-import space.kscience.kmath.tensors.core.*
 import space.kscience.kmath.tensors.core.internal.dotHelper
 import space.kscience.kmath.tensors.core.internal.getRandomNormals
 import space.kscience.kmath.tensors.core.internal.*
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt
similarity index 91%
rename from kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
rename to kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt
index f65e2b955..4bdd987db 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.tensors.core.algebras
+package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.nd.Strides
 import kotlin.math.max
@@ -44,7 +44,7 @@ internal fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): IntArra
  *
  * @param shape the shape of the tensor.
  */
-public class TensorLinearStructure(override val shape: IntArray) : Strides {
+internal class TensorLinearStructure(override val shape: IntArray) : Strides {
     override val strides: IntArray
         get() = stridesFromShape(shape)
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index 0221c961e..f1c158770 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.DoubleTensor
-import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 
 
 internal fun checkEmptyShape(shape: IntArray) =
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index 23909f81e..ff78ca64c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.*
-import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import kotlin.math.abs
 import kotlin.math.min
 import kotlin.math.sign
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index 67cb0b842..d965b6bcd 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -11,7 +11,6 @@ import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.BufferedTensor
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.IntTensor
-import space.kscience.kmath.tensors.core.algebras.TensorLinearStructure
 
 internal fun BufferedTensor<Int>.asTensor(): IntTensor =
     IntTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 80c7ab13a..672089a3c 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -1,8 +1,6 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.algebras.BroadcastDoubleTensorAlgebra
-import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.internal.*
 import kotlin.test.Test
 import kotlin.test.assertTrue
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index 4dcc367ca..05fedaa09 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -1,7 +1,6 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import kotlin.math.*
 import kotlin.test.Test
 import kotlin.test.assertTrue
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 77748b15e..fddb37251 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -1,7 +1,6 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.internal.array
 import space.kscience.kmath.tensors.core.internal.svd1d
 import kotlin.math.abs
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index c4f9f94b0..d39b5c365 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -7,7 +7,6 @@ import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.toDoubleArray
-import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.internal.array
 import space.kscience.kmath.tensors.core.internal.asTensor
 import space.kscience.kmath.tensors.core.internal.matrixSequence
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index ed858259e..354840719 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -2,7 +2,6 @@ package space.kscience.kmath.tensors.core
 
 
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.algebras.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.internal.array
 import kotlin.test.Test
 import kotlin.test.assertFalse
-- 
2.34.1


From d31726a0d90de41ced32d211d3d929dd46f5091c Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 7 May 2021 13:12:18 +0100
Subject: [PATCH 200/713] produce routine

---
 .../kmath/tensors/core/DoubleTensorAlgebra.kt         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index d4a0f1433..052d8d97e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -56,6 +56,17 @@ public open class DoubleTensorAlgebra :
         return DoubleTensor(shape, buffer, 0)
     }
 
+    /**
+     * Constructs a tensor with the specified shape and initializer.
+     *
+     * @param shape the desired shape for the tensor.
+     * @param initializer mapping tensor indices to values.
+     * @return tensor with the [shape] shape and data generated by initializer.
+     */
+    public fun produce(shape: IntArray, initializer: (IntArray) -> Double): DoubleTensor =
+        fromArray(shape,
+            TensorLinearStructure(shape).indices().map(initializer).toMutableList().toDoubleArray())
+
     override operator fun Tensor<Double>.get(i: Int): DoubleTensor {
         val lastShape = tensor.shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
-- 
2.34.1


From e80eefa90f5832de6b3c81487b27e7a355d38358 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 7 May 2021 13:12:55 +0100
Subject: [PATCH 201/713] typo corrected

---
 .../space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 052d8d97e..5baf6c7ad 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -61,7 +61,7 @@ public open class DoubleTensorAlgebra :
      *
      * @param shape the desired shape for the tensor.
      * @param initializer mapping tensor indices to values.
-     * @return tensor with the [shape] shape and data generated by initializer.
+     * @return tensor with the [shape] shape and data generated by the [initializer].
      */
     public fun produce(shape: IntArray, initializer: (IntArray) -> Double): DoubleTensor =
         fromArray(shape,
-- 
2.34.1


From d73d03c0558348af0d8de282664206b99fccf681 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 7 May 2021 13:36:15 +0100
Subject: [PATCH 202/713] valueOrNull added

---
 .../kmath/tensors/LinearSystemSolvingWithLUP.kt   |  2 +-
 .../space/kscience/kmath/tensors/OLSWithSVD.kt    |  2 +-
 .../kscience/kmath/tensors/api/TensorAlgebra.kt   |  3 ++-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt     | 10 ++++------
 .../kmath/tensors/core/internal/checks.kt         |  4 ++--
 .../kmath/tensors/core/internal/linUtils.kt       | 15 ++++++++-------
 .../tensors/core/TestDoubleLinearOpsAlgebra.kt    |  6 +++---
 .../kmath/tensors/core/TestDoubleTensor.kt        |  2 +-
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
index 78370b517..4494d6799 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
@@ -69,7 +69,7 @@ fun main () {
             val n = l.shape[0]
             val x = zeros(intArrayOf(n))
             for (i in 0 until n){
-                x[intArrayOf(i)] = (b[intArrayOf(i)] -  l[i].dot(x).value()) / l[intArrayOf(i, i)]
+                x[intArrayOf(i)] = (b[intArrayOf(i)] -  l[i].dot(x).valueOrNull()!!) / l[intArrayOf(i, i)]
             }
             return x
         }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index 42a0a4ba1..5d1883e7c 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -60,7 +60,7 @@ fun main() {
             require(yTrue.shape contentEquals yPred.shape)
 
             val diff = yTrue - yPred
-            return diff.dot(diff).sqrt().value()
+            return diff.dot(diff).sqrt().valueOrNull()!!
         }
 
         println("MSE: ${mse(alpha, alphaOLS)}")
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index e7f8dc7ae..78a36e229 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -16,11 +16,12 @@ import space.kscience.kmath.operations.Algebra
 public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
 
     /**
+     *
      * Returns a single tensor value of unit dimension. The tensor shape must be equal to [1].
      *
      * @return the value of a scalar tensor.
      */
-    public fun Tensor<T>.value(): T
+    public fun Tensor<T>.valueOrNull(): T?
 
     /**
      * Each element of the tensor [other] is added to this value.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 5baf6c7ad..bf27a2690 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -35,12 +35,10 @@ public open class DoubleTensorAlgebra :
 
     public companion object : DoubleTensorAlgebra()
 
-    override fun Tensor<Double>.value(): Double {
-        check(tensor.shape contentEquals intArrayOf(1)) {
-            "Inconsistent value for tensor of shape ${shape.toList()}"
-        }
-        return tensor.mutableBuffer.array()[tensor.bufferStart]
-    }
+    override fun Tensor<Double>.valueOrNull(): Double? = if(tensor.shape contentEquals intArrayOf(1)) {
+            // Inconsistent value for tensor of with this shape
+            tensor.mutableBuffer.array()[tensor.bufferStart]
+        } else null
 
     /**
      * Constructs a tensor with the specified shape and data.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index f1c158770..bfbc6334d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -58,7 +58,7 @@ internal fun DoubleTensorAlgebra.checkSymmetric(
 internal fun DoubleTensorAlgebra.checkPositiveDefinite(tensor: DoubleTensor, epsilon: Double = 1e-6) {
     checkSymmetric(tensor, epsilon)
     for (mat in tensor.matrixSequence())
-        check(mat.asTensor().detLU().value() > 0.0) {
-            "Tensor contains matrices which are not positive definite ${mat.asTensor().detLU().value()}"
+        check(mat.asTensor().detLU().valueOrNull()!! > 0.0) {
+            "Tensor contains matrices which are not positive definite ${mat.asTensor().detLU().valueOrNull()!!}"
         }
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index ff78ca64c..5c120c05f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -12,6 +12,7 @@ import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.*
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.DoubleTensorAlgebra.Companion.valueOrNull
 import kotlin.math.abs
 import kotlin.math.min
 import kotlin.math.sign
@@ -239,14 +240,14 @@ internal fun DoubleTensorAlgebra.qrHelper(
         val vv = v.as1D()
         if (j > 0) {
             for (i in 0 until j) {
-                r[i, j] = (qT[i] dot matrixT[j]).value()
+                r[i, j] = (qT[i] dot matrixT[j]).valueOrNull()!!
                 for (k in 0 until n) {
                     val qTi = qT[i].as1D()
                     vv[k] = vv[k] - r[i, j] * qTi[k]
                 }
             }
         }
-        r[j, j] = DoubleTensorAlgebra { (v dot v).sqrt().value() }
+        r[j, j] = DoubleTensorAlgebra { (v dot v).sqrt().valueOrNull()!! }
         for (i in 0 until n) {
             qM[i, j] = vv[i] / r[j, j]
         }
@@ -269,9 +270,9 @@ internal fun DoubleTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double = 1e-10)
     while (true) {
         lastV = v
         v = b.dot(lastV)
-        val norm = DoubleTensorAlgebra { (v dot v).sqrt().value() }
+        val norm = DoubleTensorAlgebra { (v dot v).sqrt().valueOrNull()!! }
         v = v.times(1.0 / norm)
-        if (abs(v.dot(lastV).value()) > 1 - epsilon) {
+        if (abs(v.dot(lastV).valueOrNull()!!) > 1 - epsilon) {
             return v
         }
     }
@@ -292,7 +293,7 @@ internal fun DoubleTensorAlgebra.svdHelper(
             val outerProduct = DoubleArray(u.shape[0] * v.shape[0])
             for (i in 0 until u.shape[0]) {
                 for (j in 0 until v.shape[0]) {
-                    outerProduct[i * v.shape[0] + j] = u[i].value() * v[j].value()
+                    outerProduct[i * v.shape[0] + j] = u[i].valueOrNull()!! * v[j].valueOrNull()!!
                 }
             }
             a = a - singularValue.times(DoubleTensor(intArrayOf(u.shape[0], v.shape[0]), outerProduct))
@@ -303,12 +304,12 @@ internal fun DoubleTensorAlgebra.svdHelper(
         if (n > m) {
             v = svd1d(a, epsilon)
             u = matrix.dot(v)
-            norm = DoubleTensorAlgebra { (u dot u).sqrt().value() }
+            norm = DoubleTensorAlgebra { (u dot u).sqrt().valueOrNull()!! }
             u = u.times(1.0 / norm)
         } else {
             u = svd1d(a, epsilon)
             v = matrix.transpose(0, 1).dot(u)
-            norm = DoubleTensorAlgebra { (v dot v).sqrt().value() }
+            norm = DoubleTensorAlgebra { (v dot v).sqrt().valueOrNull()!! }
             v = v.times(1.0 / norm)
         }
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index fddb37251..99f00edbf 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -46,7 +46,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
             )
         )
 
-        assertTrue { abs(m.det().value() - expectedValue) < 1e-5 }
+        assertTrue { abs(m.det().valueOrNull()!! - expectedValue) < 1e-5 }
     }
 
     @Test
@@ -58,7 +58,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
             )
         )
 
-        assertTrue { abs(m.det().value() - expectedValue) < 1e-5 }
+        assertTrue { abs(m.det().valueOrNull()!! - expectedValue) < 1e-5 }
     }
 
     @Test
@@ -90,7 +90,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     fun testScalarProduct() = DoubleTensorAlgebra {
         val a = fromArray(intArrayOf(3), doubleArrayOf(1.8, 2.5, 6.8))
         val b = fromArray(intArrayOf(3), doubleArrayOf(5.5, 2.6, 6.4))
-        assertEquals(a.dot(b).value(), 59.92)
+        assertEquals(a.dot(b).valueOrNull()!!, 59.92)
     }
 
     @Test
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index d39b5c365..1afdb2263 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -21,7 +21,7 @@ internal class TestDoubleTensor {
     fun testValue() = DoubleTensorAlgebra {
         val value = 12.5
         val tensor = fromArray(intArrayOf(1), doubleArrayOf(value))
-        assertEquals(tensor.value(), value)
+        assertEquals(tensor.valueOrNull()!!, value)
     }
 
     @Test
-- 
2.34.1


From 5b725a087b81b8c4f9206a4f9098b2cc01c4cd54 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Fri, 7 May 2021 15:53:09 +0300
Subject: [PATCH 203/713] new cast

---
 .../kmath/tensors/core/tensorCasts.kt         | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
index 814a1bb9b..921bcf97e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
@@ -35,3 +35,35 @@ public fun IntTensor.toIntArray(): IntArray {
         mutableBuffer[bufferStart + i]
     }
 }
+
+/**
+ * Casts [Array<DoubleArray>] to [DoubleTensor]
+ */
+public fun Array<DoubleArray>.toDoubleTensor(): DoubleTensor {
+    val n = size
+    check(n > 0) { "An empty array cannot be casted to tensor" }
+    val m = first().size
+    check(m > 0) { "Inner arrays must have at least 1 argument" }
+    check(all { size == m }) { "Inner arrays must be the same size" }
+
+    val shape = intArrayOf(n, m)
+    val buffer = this.flatMap { arr -> arr.map { it } }.toDoubleArray()
+
+    return DoubleTensor(shape, buffer, 0)
+}
+
+/**
+ * Casts [Array<IntArray>] to [IntTensor]
+ */
+public fun Array<IntArray>.toIntTensor(): IntTensor {
+    val n = size
+    check(n > 0) { "An empty array cannot be casted to tensor" }
+    val m = first().size
+    check(m > 0) { "Inner arrays must have at least 1 argument" }
+    check(all { size == m }) { "Inner arrays must be the same size" }
+
+    val shape = intArrayOf(n, m)
+    val buffer = this.flatMap { arr -> arr.map { it } }.toIntArray()
+
+    return IntTensor(shape, buffer, 0)
+}
-- 
2.34.1


From 21b5d45b96878e89c464020994b3c7d931464c7f Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 7 May 2021 14:13:07 +0100
Subject: [PATCH 204/713] Throwable value method

---
 .../tensors/LinearSystemSolvingWithLUP.kt     |  2 +-
 .../kscience/kmath/tensors/OLSWithSVD.kt      |  2 +-
 .../kmath/tensors/api/TensorAlgebra.kt        | 10 ++++-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 44 ++++++++++++-------
 .../kmath/tensors/core/internal/checks.kt     |  4 +-
 .../kmath/tensors/core/internal/linUtils.kt   | 14 +++---
 .../core/TestDoubleLinearOpsAlgebra.kt        |  6 +--
 .../kmath/tensors/core/TestDoubleTensor.kt    |  2 +-
 8 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
index 4494d6799..78370b517 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
@@ -69,7 +69,7 @@ fun main () {
             val n = l.shape[0]
             val x = zeros(intArrayOf(n))
             for (i in 0 until n){
-                x[intArrayOf(i)] = (b[intArrayOf(i)] -  l[i].dot(x).valueOrNull()!!) / l[intArrayOf(i, i)]
+                x[intArrayOf(i)] = (b[intArrayOf(i)] -  l[i].dot(x).value()) / l[intArrayOf(i, i)]
             }
             return x
         }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index 5d1883e7c..42a0a4ba1 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -60,7 +60,7 @@ fun main() {
             require(yTrue.shape contentEquals yPred.shape)
 
             val diff = yTrue - yPred
-            return diff.dot(diff).sqrt().valueOrNull()!!
+            return diff.dot(diff).sqrt().value()
         }
 
         println("MSE: ${mse(alpha, alphaOLS)}")
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 78a36e229..4718b6a58 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -15,13 +15,21 @@ import space.kscience.kmath.operations.Algebra
  */
 public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
 
+    /**
+     *
+     * Returns a single tensor value of unit dimension if tensor shape equals to [1].
+     *
+     * @return a nullable value of a potentially scalar tensor.
+     */
+    public fun Tensor<T>.valueOrNull(): T?
+
     /**
      *
      * Returns a single tensor value of unit dimension. The tensor shape must be equal to [1].
      *
      * @return the value of a scalar tensor.
      */
-    public fun Tensor<T>.valueOrNull(): T?
+    public fun Tensor<T>.value(): T
 
     /**
      * Each element of the tensor [other] is added to this value.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index bf27a2690..c1694644f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -35,10 +35,11 @@ public open class DoubleTensorAlgebra :
 
     public companion object : DoubleTensorAlgebra()
 
-    override fun Tensor<Double>.valueOrNull(): Double? = if(tensor.shape contentEquals intArrayOf(1)) {
-            // Inconsistent value for tensor of with this shape
-            tensor.mutableBuffer.array()[tensor.bufferStart]
-        } else null
+    override fun Tensor<Double>.valueOrNull(): Double? = if (tensor.shape contentEquals intArrayOf(1))
+        tensor.mutableBuffer.array()[tensor.bufferStart] else null
+
+    override fun Tensor<Double>.value(): Double =
+        valueOrNull() ?: throw IllegalArgumentException("Inconsistent value for tensor of with $shape shape")
 
     /**
      * Constructs a tensor with the specified shape and data.
@@ -62,8 +63,10 @@ public open class DoubleTensorAlgebra :
      * @return tensor with the [shape] shape and data generated by the [initializer].
      */
     public fun produce(shape: IntArray, initializer: (IntArray) -> Double): DoubleTensor =
-        fromArray(shape,
-            TensorLinearStructure(shape).indices().map(initializer).toMutableList().toDoubleArray())
+        fromArray(
+            shape,
+            TensorLinearStructure(shape).indices().map(initializer).toMutableList().toDoubleArray()
+        )
 
     override operator fun Tensor<Double>.get(i: Int): DoubleTensor {
         val lastShape = tensor.shape.drop(1).toIntArray()
@@ -621,7 +624,7 @@ public open class DoubleTensorAlgebra :
         keepDim
     )
 
-    private fun cov(x: DoubleTensor, y:DoubleTensor): Double{
+    private fun cov(x: DoubleTensor, y: DoubleTensor): Double {
         val n = x.shape[0]
         return ((x - x.mean()) * (y - y.mean())).mean() * n / (n - 1)
     }
@@ -633,10 +636,10 @@ public open class DoubleTensorAlgebra :
         check(tensors.all { it.shape contentEquals intArrayOf(m) }) { "Tensors must have same shapes" }
         val resTensor = DoubleTensor(
             intArrayOf(n, n),
-            DoubleArray(n * n) {0.0}
+            DoubleArray(n * n) { 0.0 }
         )
-        for (i in 0 until n){
-            for (j in 0 until n){
+        for (i in 0 until n) {
+            for (j in 0 until n) {
                 resTensor[intArrayOf(i, j)] = cov(tensors[i].tensor, tensors[j].tensor)
             }
         }
@@ -779,8 +782,10 @@ public open class DoubleTensorAlgebra :
         val qTensor = zeroesLike()
         val rTensor = zeroesLike()
         tensor.matrixSequence()
-            .zip((qTensor.matrixSequence()
-                .zip(rTensor.matrixSequence()))).forEach { (matrix, qr) ->
+            .zip(
+                (qTensor.matrixSequence()
+                    .zip(rTensor.matrixSequence()))
+            ).forEach { (matrix, qr) ->
                 val (q, r) = qr
                 qrHelper(matrix.asTensor(), q.asTensor(), r.as2D())
             }
@@ -812,9 +817,13 @@ public open class DoubleTensorAlgebra :
         val vTensor = zeros(commonShape + intArrayOf(min(n, m), m))
 
         tensor.matrixSequence()
-            .zip(uTensor.matrixSequence()
-                .zip(sTensor.vectorSequence()
-                    .zip(vTensor.matrixSequence()))).forEach { (matrix, USV) ->
+            .zip(
+                uTensor.matrixSequence()
+                    .zip(
+                        sTensor.vectorSequence()
+                            .zip(vTensor.matrixSequence())
+                    )
+            ).forEach { (matrix, USV) ->
                 val matrixSize = matrix.shape.reduce { acc, i -> acc * i }
                 val curMatrix = DoubleTensor(
                     matrix.shape,
@@ -918,10 +927,11 @@ public open class DoubleTensorAlgebra :
      * @return triple of P, L and U tensors
      */
     public fun Tensor<Double>.lu(epsilon: Double = 1e-9): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        val (lu, pivots) = this.luFactor(epsilon)
+        val (lu, pivots) = tensor.luFactor(epsilon)
         return luPivot(lu, pivots)
     }
 
     override fun Tensor<Double>.lu(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> = lu(1e-9)
-
 }
+
+
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index bfbc6334d..f1c158770 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -58,7 +58,7 @@ internal fun DoubleTensorAlgebra.checkSymmetric(
 internal fun DoubleTensorAlgebra.checkPositiveDefinite(tensor: DoubleTensor, epsilon: Double = 1e-6) {
     checkSymmetric(tensor, epsilon)
     for (mat in tensor.matrixSequence())
-        check(mat.asTensor().detLU().valueOrNull()!! > 0.0) {
-            "Tensor contains matrices which are not positive definite ${mat.asTensor().detLU().valueOrNull()!!}"
+        check(mat.asTensor().detLU().value() > 0.0) {
+            "Tensor contains matrices which are not positive definite ${mat.asTensor().detLU().value()}"
         }
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index 5c120c05f..7d3617547 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -240,14 +240,14 @@ internal fun DoubleTensorAlgebra.qrHelper(
         val vv = v.as1D()
         if (j > 0) {
             for (i in 0 until j) {
-                r[i, j] = (qT[i] dot matrixT[j]).valueOrNull()!!
+                r[i, j] = (qT[i] dot matrixT[j]).value()
                 for (k in 0 until n) {
                     val qTi = qT[i].as1D()
                     vv[k] = vv[k] - r[i, j] * qTi[k]
                 }
             }
         }
-        r[j, j] = DoubleTensorAlgebra { (v dot v).sqrt().valueOrNull()!! }
+        r[j, j] = DoubleTensorAlgebra { (v dot v).sqrt().value() }
         for (i in 0 until n) {
             qM[i, j] = vv[i] / r[j, j]
         }
@@ -270,9 +270,9 @@ internal fun DoubleTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double = 1e-10)
     while (true) {
         lastV = v
         v = b.dot(lastV)
-        val norm = DoubleTensorAlgebra { (v dot v).sqrt().valueOrNull()!! }
+        val norm = DoubleTensorAlgebra { (v dot v).sqrt().value() }
         v = v.times(1.0 / norm)
-        if (abs(v.dot(lastV).valueOrNull()!!) > 1 - epsilon) {
+        if (abs(v.dot(lastV).value()) > 1 - epsilon) {
             return v
         }
     }
@@ -293,7 +293,7 @@ internal fun DoubleTensorAlgebra.svdHelper(
             val outerProduct = DoubleArray(u.shape[0] * v.shape[0])
             for (i in 0 until u.shape[0]) {
                 for (j in 0 until v.shape[0]) {
-                    outerProduct[i * v.shape[0] + j] = u[i].valueOrNull()!! * v[j].valueOrNull()!!
+                    outerProduct[i * v.shape[0] + j] = u[i].value() * v[j].value()
                 }
             }
             a = a - singularValue.times(DoubleTensor(intArrayOf(u.shape[0], v.shape[0]), outerProduct))
@@ -304,12 +304,12 @@ internal fun DoubleTensorAlgebra.svdHelper(
         if (n > m) {
             v = svd1d(a, epsilon)
             u = matrix.dot(v)
-            norm = DoubleTensorAlgebra { (u dot u).sqrt().valueOrNull()!! }
+            norm = DoubleTensorAlgebra { (u dot u).sqrt().value() }
             u = u.times(1.0 / norm)
         } else {
             u = svd1d(a, epsilon)
             v = matrix.transpose(0, 1).dot(u)
-            norm = DoubleTensorAlgebra { (v dot v).sqrt().valueOrNull()!! }
+            norm = DoubleTensorAlgebra { (v dot v).sqrt().value() }
             v = v.times(1.0 / norm)
         }
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 99f00edbf..fddb37251 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -46,7 +46,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
             )
         )
 
-        assertTrue { abs(m.det().valueOrNull()!! - expectedValue) < 1e-5 }
+        assertTrue { abs(m.det().value() - expectedValue) < 1e-5 }
     }
 
     @Test
@@ -58,7 +58,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
             )
         )
 
-        assertTrue { abs(m.det().valueOrNull()!! - expectedValue) < 1e-5 }
+        assertTrue { abs(m.det().value() - expectedValue) < 1e-5 }
     }
 
     @Test
@@ -90,7 +90,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     fun testScalarProduct() = DoubleTensorAlgebra {
         val a = fromArray(intArrayOf(3), doubleArrayOf(1.8, 2.5, 6.8))
         val b = fromArray(intArrayOf(3), doubleArrayOf(5.5, 2.6, 6.4))
-        assertEquals(a.dot(b).valueOrNull()!!, 59.92)
+        assertEquals(a.dot(b).value(), 59.92)
     }
 
     @Test
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 1afdb2263..d39b5c365 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -21,7 +21,7 @@ internal class TestDoubleTensor {
     fun testValue() = DoubleTensorAlgebra {
         val value = 12.5
         val tensor = fromArray(intArrayOf(1), doubleArrayOf(value))
-        assertEquals(tensor.valueOrNull()!!, value)
+        assertEquals(tensor.value(), value)
     }
 
     @Test
-- 
2.34.1


From a5b72f201617752033941b50c1789cd5598902ec Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Fri, 7 May 2021 14:15:48 +0100
Subject: [PATCH 205/713] Doc typo

---
 .../kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 4718b6a58..2eb18ada6 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -16,7 +16,6 @@ import space.kscience.kmath.operations.Algebra
 public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
 
     /**
-     *
      * Returns a single tensor value of unit dimension if tensor shape equals to [1].
      *
      * @return a nullable value of a potentially scalar tensor.
@@ -24,7 +23,6 @@ public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
     public fun Tensor<T>.valueOrNull(): T?
 
     /**
-     *
      * Returns a single tensor value of unit dimension. The tensor shape must be equal to [1].
      *
      * @return the value of a scalar tensor.
-- 
2.34.1


From dde1db7b0afa27162988fcb1b3543afe6187a4d6 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Fri, 7 May 2021 23:05:37 +0300
Subject: [PATCH 206/713] fixes

---
 .../kmath/tensors/core/tensorCasts.kt         | 40 ++-----------------
 1 file changed, 4 insertions(+), 36 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
index 921bcf97e..4e43ed1e1 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
@@ -9,17 +9,17 @@ import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.internal.tensor
 
 /**
- * Casts [Tensor<Double>] to [DoubleTensor]
+ * Casts [Tensor] iof [Double] to [DoubleTensor]
  */
 public fun Tensor<Double>.toDoubleTensor(): DoubleTensor = this.tensor
 
 /**
- * Casts [Tensor<Int>] to [IntTensor]
+ * Casts [Tensor] iof [Int] to [IntTensor]
  */
 public fun Tensor<Int>.toIntTensor(): IntTensor = this.tensor
 
 /**
- * @return [DoubleArray] of tensor elements
+ * Returns [DoubleArray] of tensor elements
  */
 public fun DoubleTensor.toDoubleArray(): DoubleArray {
     return DoubleArray(numElements) { i ->
@@ -28,42 +28,10 @@ public fun DoubleTensor.toDoubleArray(): DoubleArray {
 }
 
 /**
- * @return [IntArray] of tensor elements
+ * Returns [IntArray] of tensor elements
  */
 public fun IntTensor.toIntArray(): IntArray {
     return IntArray(numElements) { i ->
         mutableBuffer[bufferStart + i]
     }
 }
-
-/**
- * Casts [Array<DoubleArray>] to [DoubleTensor]
- */
-public fun Array<DoubleArray>.toDoubleTensor(): DoubleTensor {
-    val n = size
-    check(n > 0) { "An empty array cannot be casted to tensor" }
-    val m = first().size
-    check(m > 0) { "Inner arrays must have at least 1 argument" }
-    check(all { size == m }) { "Inner arrays must be the same size" }
-
-    val shape = intArrayOf(n, m)
-    val buffer = this.flatMap { arr -> arr.map { it } }.toDoubleArray()
-
-    return DoubleTensor(shape, buffer, 0)
-}
-
-/**
- * Casts [Array<IntArray>] to [IntTensor]
- */
-public fun Array<IntArray>.toIntTensor(): IntTensor {
-    val n = size
-    check(n > 0) { "An empty array cannot be casted to tensor" }
-    val m = first().size
-    check(m > 0) { "Inner arrays must have at least 1 argument" }
-    check(all { size == m }) { "Inner arrays must be the same size" }
-
-    val shape = intArrayOf(n, m)
-    val buffer = this.flatMap { arr -> arr.map { it } }.toIntArray()
-
-    return IntTensor(shape, buffer, 0)
-}
-- 
2.34.1


From 11a1624e64d2b779e84d25bf120698b49b400cc1 Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Fri, 7 May 2021 23:06:41 +0300
Subject: [PATCH 207/713] fixes

---
 .../kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
index 4e43ed1e1..142cb2156 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
@@ -9,12 +9,12 @@ import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.internal.tensor
 
 /**
- * Casts [Tensor] iof [Double] to [DoubleTensor]
+ * Casts [Tensor] of [Double] to [DoubleTensor]
  */
 public fun Tensor<Double>.toDoubleTensor(): DoubleTensor = this.tensor
 
 /**
- * Casts [Tensor] iof [Int] to [IntTensor]
+ * Casts [Tensor] of [Int] to [IntTensor]
  */
 public fun Tensor<Int>.toIntTensor(): IntTensor = this.tensor
 
-- 
2.34.1


From 33e27cd99262d64533ccde72bbdb10b47c75d9fe Mon Sep 17 00:00:00 2001
From: Andrei Kislitsyn <kisandy@yandex.ru>
Date: Fri, 7 May 2021 23:07:02 +0300
Subject: [PATCH 208/713] fixed

---
 .../space/kscience/kmath/tensors/core/TestBroadcasting.kt       | 2 +-
 .../kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt       | 2 +-
 .../kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt   | 2 --
 .../space/kscience/kmath/tensors/core/TestDoubleTensor.kt       | 2 +-
 .../kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt      | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 672089a3c..35e605fd9 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -102,4 +102,4 @@ internal class TestBroadcasting {
         assertTrue(tensor32.mutableBuffer.array() contentEquals doubleArrayOf(490.0, 480.0, 470.0))
     }
 
-}
\ No newline at end of file
+}
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index 05fedaa09..3b4c615b4 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -155,4 +155,4 @@ internal class TestDoubleAnalyticTensorAlgebra {
         )}
     }
 
-}
\ No newline at end of file
+}
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index fddb37251..347bb683f 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -194,5 +194,3 @@ private fun DoubleTensorAlgebra.testSVDFor(tensor: DoubleTensor, epsilon: Double
 
     assertTrue(tensor.eq(tensorSVD, epsilon))
 }
-
-
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index d39b5c365..a6c6a7618 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -86,4 +86,4 @@ internal class TestDoubleTensor {
         assertEquals(ndArray[intArrayOf(0)], 1.0)
 
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 354840719..e7e898008 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -164,4 +164,4 @@ internal class TestDoubleTensorAlgebra {
         assertFalse(tensor1.eq(tensor3))
 
     }
-}
\ No newline at end of file
+}
-- 
2.34.1


From e4e661a3bf4946eabd364ac93f62c9a8998e24c3 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 8 May 2021 14:10:57 +0300
Subject: [PATCH 209/713] Update jupyter integration

---
 .../kscience/kmath/structures/NDField.kt      |  2 +
 kmath-jupyter/build.gradle.kts                |  5 +-
 .../kscience/kmath/jupyter/KMathJupyter.kt    | 61 +++++++++++--------
 settings.gradle.kts                           | 16 +++--
 4 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
index cc1f5f680..501bf98db 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.structures
 
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import org.nd4j.linalg.factory.Nd4j
 import space.kscience.kmath.nd.*
@@ -22,6 +23,7 @@ internal inline fun measureAndPrint(title: String, block: () -> Unit) {
     println("$title completed in $time millis")
 }
 
+@OptIn(DelicateCoroutinesApi::class)
 fun main() {
     // initializing Nd4j
     Nd4j.zeros(0)
diff --git a/kmath-jupyter/build.gradle.kts b/kmath-jupyter/build.gradle.kts
index 815cb9b8c..83a6a771a 100644
--- a/kmath-jupyter/build.gradle.kts
+++ b/kmath-jupyter/build.gradle.kts
@@ -7,7 +7,10 @@ dependencies {
     api(project(":kmath-ast"))
     api(project(":kmath-complex"))
     api(project(":kmath-for-real"))
-    implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3")
+}
+
+kscience{
+    useHtml()
 }
 
 readme {
diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
index e13c92f75..78b25af47 100644
--- a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -19,49 +19,58 @@ import space.kscience.kmath.operations.RingOperations
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asSequence
 
+/**
+ * A function for conversion of number to MST for pretty print
+ */
+public fun Number.toMst(): MST.Numeric =  MST.Numeric(this)
+
 @JupyterLibrary
 internal class KMathJupyter : JupyterIntegration() {
     private val mathRender = FeaturedMathRendererWithPostProcess.Default
     private val syntaxRender = MathMLSyntaxRenderer
 
+    private fun MST.toDisplayResult(): DisplayResult = HTML(createHTML().div {
+        unsafe {
+            +syntaxRender.renderWithStringBuilder(mathRender.render(this@toDisplayResult))
+        }
+    })
+
+    private fun Unsafe.appendCellValue(it: Any?) {
+        when (it) {
+            is Number -> {
+                val s = StringBuilder()
+                syntaxRender.renderPart(mathRender.render(MST.Numeric(it)), s)
+                +s.toString()
+            }
+            is MST -> {
+                val s = StringBuilder()
+                syntaxRender.renderPart(mathRender.render(it), s)
+                +s.toString()
+            }
+            else -> {
+                +"<ms>"
+                +it.toString()
+                +"</ms>"
+            }
+        }
+    }
+
     override fun Builder.onLoaded() {
         import(
             "space.kscience.kmath.ast.*",
             "space.kscience.kmath.ast.rendering.*",
+            "space.kscience.kmath.structures.*",
             "space.kscience.kmath.operations.*",
             "space.kscience.kmath.expressions.*",
+            "space.kscience.kmath.nd.*",
             "space.kscience.kmath.misc.*",
             "space.kscience.kmath.real.*",
         )
 
-        fun MST.toDisplayResult(): DisplayResult = HTML(createHTML().div {
-            unsafe {
-                +syntaxRender.renderWithStringBuilder(mathRender.render(this@toDisplayResult))
-            }
-        })
+        import("space.kscience.kmath.jupyter.toMst")
 
         render<MST> { it.toDisplayResult() }
-        render<Number> { MST.Numeric(it).toDisplayResult() }
-
-        fun Unsafe.appendCellValue(it: Any?) {
-            when (it) {
-                is Number -> {
-                    val s = StringBuilder()
-                    syntaxRender.renderPart(mathRender.render(MST.Numeric(it)), s)
-                    +s.toString()
-                }
-                is MST -> {
-                    val s = StringBuilder()
-                    syntaxRender.renderPart(mathRender.render(it), s)
-                    +s.toString()
-                }
-                else -> {
-                    +"<ms>"
-                    +it.toString()
-                    +"</ms>"
-                }
-            }
-        }
+        //render<Number> { MST.Numeric(it).toDisplayResult() }
 
         render<Structure2D<*>> { structure ->
             HTML(createHTML().div {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 90cc4aef1..27e74c902 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,25 +1,23 @@
 pluginManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         gradlePluginPortal()
         maven("https://repo.kotlin.link")
     }
 
-    val toolsVersion = "0.9.5-dev-2"
-    val kotlinVersion = "1.5.0-RC"
+    val toolsVersion = "0.9.6"
+    val kotlinVersion = "1.5.0"
 
     plugins {
+        id("ru.mipt.npm.gradle.project") version toolsVersion
+        id("ru.mipt.npm.gradle.mpp") version toolsVersion
+        id("ru.mipt.npm.gradle.jvm") version toolsVersion
         kotlin("multiplatform") version kotlinVersion
         kotlin("jvm") version kotlinVersion
         kotlin("plugin.allopen") version kotlinVersion
         id("org.jetbrains.kotlinx.benchmark") version "0.3.0"
-        id("ru.mipt.npm.gradle.project") version toolsVersion
-        id("ru.mipt.npm.gradle.mpp") version toolsVersion
-        id("ru.mipt.npm.gradle.jvm") version toolsVersion
-        kotlin("jupyter.api") version "0.9.0.12"
-        kotlin("jvm") version kotlinVersion
-        kotlin("plugin.allopen") version kotlinVersion
+        kotlin("jupyter.api") version "0.9.1-61"
+
     }
 }
 
-- 
2.34.1


From 7ce0829597af279f54d368c4ef4ce643e7fa6f5a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 8 May 2021 14:20:16 +0300
Subject: [PATCH 210/713] 0.3.0-dev-8. Cleanup

---
 CHANGELOG.md                                           |  1 +
 build.gradle.kts                                       |  2 +-
 .../space/kscience/kmath/tensors/NeuralNetwork.kt      |  8 ++++----
 .../kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt  |  2 +-
 .../kotlin/space/kscience/kmath/complex/Complex.kt     |  9 +++++----
 .../kotlin/space/kscience/kmath/complex/Quaternion.kt  | 10 +++++-----
 .../kscience/kmath/stat/CommonsDistributionsTest.kt    |  5 ++---
 7 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5542b6563..286511327 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
 - `contentEquals` from Buffer. It moved to the companion.
 - MSTExpression
 - Expression algebra builders
+- Comples and Quaternion no longer are elements.
 
 ### Fixed
 - Ring inherits RingOperations, not GroupOperations
diff --git a/build.gradle.kts b/build.gradle.kts
index 760bf1aee..406a46810 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-7"
+    version = "0.3.0-dev-8"
 }
 
 subprojects {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
index 874ac8034..5b3c2e1cd 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.tensors
 
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.toDoubleArray
 import kotlin.math.sqrt
@@ -106,6 +106,7 @@ fun accuracy(yPred: DoubleTensor, yTrue: DoubleTensor): Double {
 }
 
 // neural network class
+@OptIn(ExperimentalStdlibApi::class)
 class NeuralNetwork(private val layers: List<Layer>) {
     private fun softMaxLoss(yPred: DoubleTensor, yTrue: DoubleTensor): DoubleTensor = BroadcastDoubleTensorAlgebra {
 
@@ -120,7 +121,7 @@ class NeuralNetwork(private val layers: List<Layer>) {
         (-onesForAnswers + softmaxValue) / (yPred.shape[0].toDouble())
     }
 
-    @OptIn(ExperimentalStdlibApi::class)
+
     private fun forward(x: DoubleTensor): List<DoubleTensor> {
         var input = x
 
@@ -133,7 +134,6 @@ class NeuralNetwork(private val layers: List<Layer>) {
         }
     }
 
-    @OptIn(ExperimentalStdlibApi::class)
     private fun train(xTrain: DoubleTensor, yTrain: DoubleTensor) {
         val layerInputs = buildList {
             add(xTrain)
@@ -180,7 +180,7 @@ fun main() {
         val features = 5
         val sampleSize = 250
         val trainSize = 180
-        val testSize = sampleSize - trainSize
+        //val testSize = sampleSize - trainSize
 
         // take sample of features from normal distribution
         val x = randomNormal(intArrayOf(sampleSize, features), seed) * 2.5
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index 42a0a4ba1..b42602988 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -48,7 +48,7 @@ fun main() {
 
 
         // inverse Sigma matrix can be restored from singular values with diagonalEmbedding function
-        val sigma = diagonalEmbedding(singValues.map{ x -> if (abs(x) < 1e-3) 0.0 else 1.0/x })
+        val sigma = diagonalEmbedding(singValues.map{ if (abs(it) < 1e-3) 0.0 else 1.0/it })
 
         val alphaOLS = v dot sigma dot u.transpose() dot y
         println("Estimated alpha:\n" +
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index 8d626c17d..8e28337f6 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -9,7 +9,10 @@ import space.kscience.kmath.memory.MemoryReader
 import space.kscience.kmath.memory.MemorySpec
 import space.kscience.kmath.memory.MemoryWriter
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.ExtendedField
+import space.kscience.kmath.operations.Norm
+import space.kscience.kmath.operations.NumbersAddOperations
+import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MemoryBuffer
 import space.kscience.kmath.structures.MutableBuffer
@@ -180,12 +183,10 @@ public object ComplexField : ExtendedField<Complex>, Norm<Complex, Complex>, Num
  * @property im The imaginary part.
  */
 @OptIn(UnstableKMathAPI::class)
-public data class Complex(val re: Double, val im: Double) : FieldElement<Complex, ComplexField> {
+public data class Complex(val re: Double, val im: Double) {
     public constructor(re: Number, im: Number) : this(re.toDouble(), im.toDouble())
     public constructor(re: Number) : this(re.toDouble(), 0.0)
 
-    public override val context: ComplexField get() = ComplexField
-
     public override fun toString(): String = "($re + i*$im)"
 
     public companion object : MemorySpec<Complex> {
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index 382b5cc05..c59aabdcb 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -27,8 +27,10 @@ public val Quaternion.conjugate: Quaternion
  */
 public val Quaternion.reciprocal: Quaternion
     get() {
-        val n = QuaternionField { norm(this@reciprocal) }
-        return conjugate / (n * n)
+        QuaternionField {
+            val n = norm(this@reciprocal)
+            return conjugate / (n * n)
+        }
     }
 
 /**
@@ -198,7 +200,7 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
 @OptIn(UnstableKMathAPI::class)
 public data class Quaternion(
     val w: Double, val x: Double, val y: Double, val z: Double,
-) : FieldElement<Quaternion, QuaternionField> {
+) {
     public constructor(w: Number, x: Number, y: Number, z: Number) : this(
         w.toDouble(),
         x.toDouble(),
@@ -219,8 +221,6 @@ public data class Quaternion(
         require(!z.isNaN()) { "x-component of quaternion is not-a-number" }
     }
 
-    public override val context: QuaternionField get() = QuaternionField
-
     /**
      * Returns a string representation of this quaternion.
      */
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
index 066fd69e6..19c01e099 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
@@ -5,15 +5,14 @@
 
 package space.kscience.kmath.stat
 
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import space.kscience.kmath.samplers.GaussianSampler
 
 internal class CommonsDistributionsTest {
     @Test
-    fun testNormalDistributionSuspend() = GlobalScope.launch {
+    fun testNormalDistributionSuspend() = runBlocking {
         val distribution = GaussianSampler(7.0, 2.0)
         val generator = RandomGenerator.default(1)
         val sample = distribution.sample(generator).nextBuffer(1000)
-- 
2.34.1


From 6d78bb8d91a0236bb4f962c66a40ea74becdbcea Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 8 May 2021 14:36:37 +0300
Subject: [PATCH 211/713] 0.3.0-dev-8. Readme update

---
 README.md                             |   4 +-
 kmath-ast/README.md                   |  24 +-
 kmath-complex/README.md               |   6 +-
 kmath-core/README.md                  |   6 +-
 kmath-ejml/README.md                  |   6 +-
 kmath-for-real/README.md              |   6 +-
 kmath-functions/README.md             |   6 +-
 kmath-nd4j/README.md                  |   6 +-
 kmath-tensors/README.md               |  25 +-
 license/COPYRIGHT.txt                 |  15 -
 license/COPYRIGHT_HEADER.txt          |   4 -
 license/LICENSE.txt                   | 201 -----------
 license/README.md                     |  63 ----
 license/third_party/cm_license.txt    | 457 --------------------------
 license/third_party/crng_license.txt  | 275 ----------------
 license/third_party/numky_license.txt | 201 -----------
 16 files changed, 47 insertions(+), 1258 deletions(-)
 delete mode 100644 license/COPYRIGHT.txt
 delete mode 100644 license/COPYRIGHT_HEADER.txt
 delete mode 100644 license/LICENSE.txt
 delete mode 100644 license/README.md
 delete mode 100644 license/third_party/cm_license.txt
 delete mode 100644 license/third_party/crng_license.txt
 delete mode 100644 license/third_party/numky_license.txt

diff --git a/README.md b/README.md
index 8796d7aac..c8da21b64 100644
--- a/README.md
+++ b/README.md
@@ -288,8 +288,8 @@ repositories {
 }
 
 dependencies {
-    api("space.kscience:kmath-core:0.3.0-dev-7")
-    // api("space.kscience:kmath-core-jvm:0.3.0-dev-7") for jvm-specific version
+    api("space.kscience:kmath-core:0.3.0-dev-8")
+    // api("space.kscience:kmath-core-jvm:0.3.0-dev-8") for jvm-specific version
 }
 ```
 
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index 26ee98ba5..646ab4306 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -10,7 +10,7 @@ Performance and visualization extensions to MST API.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-7`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-8`.
 
 **Gradle:**
 ```gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.0-dev-7'
+    implementation 'space.kscience:kmath-ast:0.3.0-dev-8'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.0-dev-7")
+    implementation("space.kscience:kmath-ast:0.3.0-dev-8")
 }
 ```
 
@@ -144,7 +144,7 @@ import space.kscience.kmath.misc.*
 
 @OptIn(UnstableKMathAPI::class)
 public fun main() {
-    val mst = "exp(sqrt(x))-asin(2*x)/(2e10+x^3)/(-12)".parseMath()
+    val mst = "exp(sqrt(x))-asin(2*x)/(2e10+x^3)/(12)+x^(2/3)".parseMath()
     val syntax = FeaturedMathRendererWithPostProcess.Default.render(mst)
     val latex = LatexSyntaxRenderer.renderWithStringBuilder(syntax)
     println("LaTeX:")
@@ -158,9 +158,9 @@ public fun main() {
 
 Result LaTeX:
 
-![](https://latex.codecogs.com/gif.latex?%5Coperatorname{exp}%5C,%5Cleft(%5Csqrt{x}%5Cright)-%5Cfrac{%5Cfrac{%5Coperatorname{arcsin}%5C,%5Cleft(2%5C,x%5Cright)}{2%5Ctimes10^{10}%2Bx^{3}}}{-12})
+![](https://latex.codecogs.com/gif.latex?%5Coperatorname{exp}%5C,%5Cleft(%5Csqrt{x}%5Cright)-%5Cfrac{%5Cfrac{%5Coperatorname{arcsin}%5C,%5Cleft(2%5C,x%5Cright)}{2%5Ctimes10^{10}%2Bx^{3}}}{12}+x^{2/3})
 
-Result MathML (embedding MathML is not allowed by GitHub Markdown):
+Result MathML (can be used with MathJax or other renderers):
 
 <details>
 
@@ -211,10 +211,20 @@ Result MathML (embedding MathML is not allowed by GitHub Markdown):
                 </mfrac>
             </mrow>
             <mrow>
-                <mo>-</mo>
                 <mn>12</mn>
             </mrow>
         </mfrac>
+        <mo>+</mo>
+        <msup>
+            <mrow>
+                <mi>x</mi>
+            </mrow>
+            <mrow>
+                <mn>2</mn>
+                <mo>/</mo>
+                <mn>3</mn>
+            </mrow>
+        </msup>
     </mrow>
 </math>
 ```
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index 06e10fa7a..ee5ad416f 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -8,7 +8,7 @@ Complex and hypercomplex number systems in KMath.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-7`.
+The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-8`.
 
 **Gradle:**
 ```gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-complex:0.3.0-dev-7'
+    implementation 'space.kscience:kmath-complex:0.3.0-dev-8'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-complex:0.3.0-dev-7")
+    implementation("space.kscience:kmath-complex:0.3.0-dev-8")
 }
 ```
diff --git a/kmath-core/README.md b/kmath-core/README.md
index 36b30efcc..7283a18ce 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -15,7 +15,7 @@ performance calculations to code generation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-7`.
+The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-8`.
 
 **Gradle:**
 ```gradle
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-core:0.3.0-dev-7'
+    implementation 'space.kscience:kmath-core:0.3.0-dev-8'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -36,6 +36,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-core:0.3.0-dev-7")
+    implementation("space.kscience:kmath-core:0.3.0-dev-8")
 }
 ```
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index 97c5ae115..cb12ef98d 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -9,7 +9,7 @@ EJML based linear algebra implementation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-7`.
+The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-8`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ejml:0.3.0-dev-7'
+    implementation 'space.kscience:kmath-ejml:0.3.0-dev-8'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ejml:0.3.0-dev-7")
+    implementation("space.kscience:kmath-ejml:0.3.0-dev-8")
 }
 ```
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index a77f9d98b..8b3b8e9e0 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -9,7 +9,7 @@ Specialization of KMath APIs for Double numbers.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-7`.
+The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-8`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-for-real:0.3.0-dev-7'
+    implementation 'space.kscience:kmath-for-real:0.3.0-dev-8'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-for-real:0.3.0-dev-7")
+    implementation("space.kscience:kmath-for-real:0.3.0-dev-8")
 }
 ```
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index 2090ede3e..4f592c845 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -11,7 +11,7 @@ Functions and interpolations.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-7`.
+The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-8`.
 
 **Gradle:**
 ```gradle
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-functions:0.3.0-dev-7'
+    implementation 'space.kscience:kmath-functions:0.3.0-dev-8'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-functions:0.3.0-dev-7")
+    implementation("space.kscience:kmath-functions:0.3.0-dev-8")
 }
 ```
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index b4b586ea9..5f33c1db1 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -9,7 +9,7 @@ ND4J based implementations of KMath abstractions.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-7`.
+The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-8`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-7'
+    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-8'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-nd4j:0.3.0-dev-7")
+    implementation("space.kscience:kmath-nd4j:0.3.0-dev-8")
 }
 ```
 
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index a81b7277c..7ece44217 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -1,40 +1,35 @@
 # Module kmath-tensors
 
-Common operations on tensors, the API consists of:
+Common linear algebra operations on tensors.
+
+ - [tensor algebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Basic linear algebra operations on tensors (plus, dot, etc.)
+ - [tensor algebra with broadcasting](src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting.
+ - [linear algebra operations](src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Advanced linear algebra operations like LU decomposition, SVD, etc.
 
- - [TensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Basic algebra operations on tensors (plus, dot, etc.)
- - [TensorPartialDivisionAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt) : Emulates an algebra over a field
- - [LinearOpsTensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Linear algebra operations including LU, QR, Cholesky LL and SVD decompositions
- - [AnalyticTensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt) : Element-wise analytic operations
 
-The library offers a multiplatform implementation for this interface over the `Double`'s. As a highlight, the user can find:
- - [BroadcastDoubleTensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt) : Basic algebra operations implemented with broadcasting.
- - [DoubleLinearOpsTensorAlgebra](src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/DoubleLinearOpsTensorAlgebra.kt) : Contains the power method for SVD and the spectrum of symmetric matrices.
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-7`.
+The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-8`.
 
 **Gradle:**
 ```gradle
 repositories {
     maven { url 'https://repo.kotlin.link' }
-    maven { url 'https://dl.bintray.com/hotkeytlt/maven' }
-    maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } // include for builds based on kotlin-eap
+    mavenCentral()
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensors:0.3.0-dev-7'
+    implementation 'space.kscience:kmath-tensors:0.3.0-dev-8'
 }
 ```
 **Gradle Kotlin DSL:**
 ```kotlin
 repositories {
     maven("https://repo.kotlin.link")
-    maven("https://dl.bintray.com/kotlin/kotlin-eap") // include for builds based on kotlin-eap
-    maven("https://dl.bintray.com/hotkeytlt/maven") // required for a
+    mavenCentral()
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensors:0.3.0-dev-7")
+    implementation("space.kscience:kmath-tensors:0.3.0-dev-8")
 }
 ```
diff --git a/license/COPYRIGHT.txt b/license/COPYRIGHT.txt
deleted file mode 100644
index 7bf2faffd..000000000
--- a/license/COPYRIGHT.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
\ No newline at end of file
diff --git a/license/COPYRIGHT_HEADER.txt b/license/COPYRIGHT_HEADER.txt
deleted file mode 100644
index 3e7d28489..000000000
--- a/license/COPYRIGHT_HEADER.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
\ No newline at end of file
diff --git a/license/LICENSE.txt b/license/LICENSE.txt
deleted file mode 100644
index 84b106a07..000000000
--- a/license/LICENSE.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2018-2021 KMath contributors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/license/README.md b/license/README.md
deleted file mode 100644
index cfef3de79..000000000
--- a/license/README.md
+++ /dev/null
@@ -1,63 +0,0 @@
-The Apache 2 license (given in full in LICENSE.txt) applies to all code in this repository, which is copyright by the
-contributors of KMath. The following sections of the repository contain third-party code, to which different licenses
-may apply:
-
-## KMath Libraries
-
-The following modules contain third-party code and are incorporated into the KMath Libraries:
-
-- Path: kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
-    - License: Apache 2 ([cm](third_party/cm_license.txt))
-    - Origin: Derived from Apache Commons Math, (c) 2001-2020 The Apache Software Foundation
-- Path: kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
-    - License: Apache 2 ([cm](third_party/cm_license.txt))
-    - Origin: Derived from Apache Commons Math, (c) 2001-2020 The Apache Software Foundation
-- Path: kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LoessInterpolator.kt
-    - License: Apache 2 ([cm](third_party/cm_license.txt))
-    - Origin: Derived from Apache Commons Math, (c) 2001-2020 The Apache Software Foundation
-- Path: kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
-    - License: Apache 2 ([cm](third_party/cm_license.txt))
-    - Origin: Derived from Apache Commons Math, (c) 2001-2020 The Apache Software Foundation
-- Path: kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
-    - License: Apache 2 ([numky](third_party/numky_license.txt))
-    - Origin: Initial implementation was taken from Numky
-- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
-    - License: Apache 2 ([cm](third_party/crng_license.txt))
-    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
-- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
-    - License: Apache 2 ([cm](third_party/crng_license.txt))
-    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
-- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
-    - License: Apache 2 ([cm](third_party/crng_license.txt))
-    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
-- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
-    - License: Apache 2 ([cm](third_party/crng_license.txt))
-    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
-- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
-    - License: Apache 2 ([cm](third_party/crng_license.txt))
-    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
-- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
-    - License: Apache 2 ([cm](third_party/crng_license.txt))
-    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
-- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
-    - License: Apache 2 ([cm](third_party/crng_license.txt))
-    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
-- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
-    - License: Apache 2 ([cm](third_party/crng_license.txt))
-    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
-- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
-    - License: Apache 2 ([cm](third_party/crng_license.txt))
-    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
-- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
-    - License: Apache 2 ([cm](third_party/crng_license.txt))
-    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
-- Path:
-    - License: Apache 2 ([cm](third_party/crng_license.txt))
-    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
-- Path:
-    - License: Apache 2 ([cm](third_party/crng_license.txt))
-    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
-- Path:
-    - License: Apache 2 ([cm](third_party/crng_license.txt))
-    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
-      
\ No newline at end of file
diff --git a/license/third_party/cm_license.txt b/license/third_party/cm_license.txt
deleted file mode 100644
index 6172c3fb2..000000000
--- a/license/third_party/cm_license.txt
+++ /dev/null
@@ -1,457 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-Apache Commons Math includes the following code provided to the ASF under the
-Apache License 2.0:
-
- - The inverse error function implementation in the Erf class is based on CUDA
-   code developed by Mike Giles, Oxford-Man Institute of Quantitative Finance,
-   and published in GPU Computing Gems, volume 2, 2010 (grant received on
-   March 23th 2013)
- - The LinearConstraint, LinearObjectiveFunction, LinearOptimizer,
-   RelationShip, SimplexSolver and SimplexTableau classes in package
-   org.apache.commons.math3.optimization.linear include software developed by
-   Benjamin McCann (http://www.benmccann.com) and distributed with
-   the following copyright: Copyright 2009 Google Inc. (grant received on
-   March 16th 2009)
- - The class "org.apache.commons.math3.exception.util.LocalizedFormatsTest" which
-   is an adapted version of "OrekitMessagesTest" test class for the Orekit library
- - The "org.apache.commons.math3.analysis.interpolation.HermiteInterpolator"
-   has been imported from the Orekit space flight dynamics library.
-
-===============================================================================
-
-
-
-APACHE COMMONS MATH DERIVATIVE WORKS:
-
-The Apache commons-math library includes a number of subcomponents
-whose implementation is derived from original sources written
-in C or Fortran.  License terms of the original sources
-are reproduced below.
-
-===============================================================================
-For the lmder, lmpar and qrsolv Fortran routine from minpack and translated in
-the LevenbergMarquardtOptimizer class in package
-org.apache.commons.math3.optimization.general
-Original source copyright and license statement:
-
-Minpack Copyright Notice (1999) University of Chicago.  All rights reserved
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions of source code must retain the above
-copyright notice, this list of conditions and the following
-disclaimer.
-
-2. Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials
-provided with the distribution.
-
-3. The end-user documentation included with the
-redistribution, if any, must include the following
-acknowledgment:
-
-   "This product includes software developed by the
-   University of Chicago, as Operator of Argonne National
-   Laboratory.
-
-Alternately, this acknowledgment may appear in the software
-itself, if and wherever such third-party acknowledgments
-normally appear.
-
-4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS"
-WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE
-UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND
-THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
-OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
-OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
-USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
-THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
-DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION
-UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL
-BE CORRECTED.
-
-5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT
-HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF
-ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT,
-INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
-ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
-PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
-SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
-(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
-EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE
-POSSIBILITY OF SUCH LOSS OR DAMAGES.
-===============================================================================
-
-Copyright and license statement for the odex Fortran routine developed by
-E. Hairer and G. Wanner and translated in GraggBulirschStoerIntegrator class
-in package org.apache.commons.math3.ode.nonstiff:
-
-
-Copyright (c) 2004, Ernst Hairer
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-===============================================================================
-
-Copyright and license statement for the original Mersenne twister C
-routines translated in MersenneTwister class in package
-org.apache.commons.math3.random:
-
-   Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-     1. Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-     3. The names of its contributors may not be used to endorse or promote
-        products derived from this software without specific prior written
-        permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-The initial code for shuffling an array (originally in class
-"org.apache.commons.math3.random.RandomDataGenerator", now replaced by
-a method in class "org.apache.commons.math3.util.MathArrays") was
-inspired from the algorithm description provided in
-"Algorithms", by Ian Craw and John Pulham (University of Aberdeen 1999).
-The textbook (containing a proof that the shuffle is uniformly random) is
-available here:
-  http://citeseerx.ist.psu.edu/viewdoc/download;?doi=10.1.1.173.1898&rep=rep1&type=pdf
-
-===============================================================================
-License statement for the direction numbers in the resource files for Sobol sequences.
-
------------------------------------------------------------------------------
-Licence pertaining to sobol.cc and the accompanying sets of direction numbers
-
------------------------------------------------------------------------------
-Copyright (c) 2008, Frances Y. Kuo and Stephen Joe
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the names of the copyright holders nor the names of the
-      University of New South Wales and the University of Waikato
-      and its contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-===============================================================================
-
-The initial commit of package "org.apache.commons.math3.ml.neuralnet" is
-an adapted version of code developed in the context of the Data Processing
-and Analysis Consortium (DPAC) of the "Gaia" project of the European Space
-Agency (ESA).
-===============================================================================
-
-The initial commit of the class "org.apache.commons.math3.special.BesselJ" is
-an adapted version of code translated from the netlib Fortran program, rjbesl
-http://www.netlib.org/specfun/rjbesl by R.J. Cody at Argonne National
-Laboratory (USA).  There is no license or copyright statement included with the
-original Fortran sources.
-===============================================================================
-
-
-The BracketFinder (package org.apache.commons.math3.optimization.univariate)
-and PowellOptimizer (package org.apache.commons.math3.optimization.general)
-classes are based on the Python code in module "optimize.py" (version 0.5)
-developed by Travis E. Oliphant for the SciPy library (http://www.scipy.org/)
-Copyright © 2003-2009 SciPy Developers.
-
-SciPy license
-Copyright © 2001, 2002 Enthought, Inc.
-All rights reserved.
-
-Copyright © 2003-2013 SciPy Developers.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of Enthought nor the names of the SciPy Developers may
-      be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-===============================================================================
diff --git a/license/third_party/crng_license.txt b/license/third_party/crng_license.txt
deleted file mode 100644
index dec0e2a5c..000000000
--- a/license/third_party/crng_license.txt
+++ /dev/null
@@ -1,275 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-================================================================================
-
-Class "org.apache.commons.rng.core.source64.MersenneTwister64" contains
-Java code partly ported from the reference implementation in C.
-That source file contained the following notice:
-
-   Copyright (C) 2004, Makoto Matsumoto and Takuji Nishimura,
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-     1. Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-     3. The names of its contributors may not be used to endorse or promote
-        products derived from this software without specific prior written
-        permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-Class "org.apache.commons.rng.core.source32.MersenneTwister" contains
-Java code partly ported from the reference implementation in C.
-That source file contained the following notice:
-
-   Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-     1. Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-     3. The names of its contributors may not be used to endorse or promote
-        products derived from this software without specific prior written
-        permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
\ No newline at end of file
diff --git a/license/third_party/numky_license.txt b/license/third_party/numky_license.txt
deleted file mode 100644
index f49a4e16e..000000000
--- a/license/third_party/numky_license.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
-- 
2.34.1


From ca02f5406d06d18d07909f3d48508e1a99701fa5 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Sat, 8 May 2021 18:07:53 +0300
Subject: [PATCH 212/713] Update gradle.properties

Increase metaspace for dokka
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7e9516660..3aaade368 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,5 +9,5 @@ kotlin.mpp.stability.nowarn=true
 kotlin.native.enableDependencyPropagation=false
 kotlin.parallel.tasks.in.project=true
 org.gradle.configureondemand=true
-org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=2G
 org.gradle.parallel=true
-- 
2.34.1


From bbef697b7dc553281af826ece76373af469fab0e Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sun, 9 May 2021 18:10:06 +0700
Subject: [PATCH 213/713] Document and change retention for UnstableKMathAPI

---
 .../kotlin/space/kscience/kmath/misc/annotations.kt       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
index 206e4e000..7f53d96ce 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
@@ -5,5 +5,13 @@
 
 package space.kscience.kmath.misc
 
+/**
+ * Marks declarations that are still experimental in the KMath APIs, which means that the design of the corresponding
+ * declarations has open issues which may (or may not) lead to their changes in the future. Roughly speaking, there is
+ * a chance that those declarations will be deprecated in the near future or the semantics of their behavior may change
+ * in some way that may break some code.
+ */
+@MustBeDocumented
+@Retention(value = AnnotationRetention.BINARY)
 @RequiresOptIn("This API is unstable and could change in future", RequiresOptIn.Level.WARNING)
 public annotation class UnstableKMathAPI
-- 
2.34.1


From e2920ed68390bf29ee0854da85d69efd53c6a5a3 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sun, 9 May 2021 16:40:10 +0700
Subject: [PATCH 214/713] Promote kmath-kotlingrad to experimental alongside
 minor documentation and API changes

---
 CHANGELOG.md                                  |  3 +-
 README.md                                     |  9 +++--
 kmath-kotlingrad/README.md                    | 34 +++++++++++++++++++
 kmath-kotlingrad/build.gradle.kts             | 20 +++++++++--
 kmath-kotlingrad/docs/README-TEMPLATE.md      |  7 ++++
 .../kotlingrad/DifferentiableMstExpression.kt | 17 +++++-----
 .../kscience/kmath/kotlingrad/KMathNumber.kt  | 25 +++++++++-----
 .../kmath/kotlingrad/ScalarsAdapters.kt       | 26 +++++++-------
 .../kmath/kotlingrad/AdaptingTests.kt         |  6 +---
 9 files changed, 106 insertions(+), 41 deletions(-)
 create mode 100644 kmath-kotlingrad/README.md
 create mode 100644 kmath-kotlingrad/docs/README-TEMPLATE.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 286511327..4fba361d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 - Move MST to core
 - Separated benchmarks and examples
 - Rewritten EJML module without ejml-simple
+- Stability of kmath-ast and kmath-kotilngrad promoted to EXPERIMENTAL.
 
 ### Deprecated
 
@@ -35,7 +36,7 @@
 - `contentEquals` from Buffer. It moved to the companion.
 - MSTExpression
 - Expression algebra builders
-- Comples and Quaternion no longer are elements.
+- Complex and Quaternion no longer are elements.
 
 ### Fixed
 - Ring inherits RingOperations, not GroupOperations
diff --git a/README.md b/README.md
index c8da21b64..3b4387c1b 100644
--- a/README.md
+++ b/README.md
@@ -207,9 +207,14 @@ One can still use generic algebras though.
 <hr/>
 
 * ### [kmath-kotlingrad](kmath-kotlingrad)
-> 
+> Functions, integration and interpolation
 >
-> **Maturity**: PROTOTYPE
+> **Maturity**: EXPERIMENTAL
+>
+> **Features:**
+> - [differentiable-mst-expression](kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt) : MST based DifferentiableExpression.
+> - [differentiable-mst-expression](kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt) : Conversions between Kotlin&nabla;'s SFun and MST
+
 <hr/>
 
 * ### [kmath-memory](kmath-memory)
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
new file mode 100644
index 000000000..686df3271
--- /dev/null
+++ b/kmath-kotlingrad/README.md
@@ -0,0 +1,34 @@
+# Module kmath-kotlingrad
+
+[Kotlin∇](https://github.com/breandan/kotlingrad) integration module.
+
+ - [differentiable-mst-expression](src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt) : MST based DifferentiableExpression.
+ - [differentiable-mst-expression](src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt) : Conversions between Kotlin∇'s SFun and MST
+
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-8`.
+
+**Gradle:**
+```gradle
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-8'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-8")
+}
+```
diff --git a/kmath-kotlingrad/build.gradle.kts b/kmath-kotlingrad/build.gradle.kts
index ed5b5bcb4..0e8e49971 100644
--- a/kmath-kotlingrad/build.gradle.kts
+++ b/kmath-kotlingrad/build.gradle.kts
@@ -4,11 +4,27 @@ plugins {
 }
 
 dependencies {
-    api("com.github.breandan:kaliningraph:0.1.4")
+    api("com.github.breandan:kaliningraph:0.1.6")
     api("com.github.breandan:kotlingrad:0.4.5")
     api(project(":kmath-ast"))
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    description = "Functions, integration and interpolation"
+    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+    propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
+
+    feature(
+        "differentiable-mst-expression",
+        "src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt",
+    ) {
+        "MST based DifferentiableExpression."
+    }
+
+    feature(
+        "differentiable-mst-expression",
+        "src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt",
+    ) {
+        "Conversions between Kotlin∇'s SFun and MST"
+    }
 }
diff --git a/kmath-kotlingrad/docs/README-TEMPLATE.md b/kmath-kotlingrad/docs/README-TEMPLATE.md
new file mode 100644
index 000000000..ac38c849b
--- /dev/null
+++ b/kmath-kotlingrad/docs/README-TEMPLATE.md
@@ -0,0 +1,7 @@
+# Module kmath-kotlingrad
+
+[Kotlin∇](https://www.htmlsymbols.xyz/unicode/U+2207) integration module.
+
+${features}
+
+${artifact}
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt
index 222145d2d..8c6745c79 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.kotlingrad
 
 import edu.umontreal.kotlingrad.api.SFun
+import edu.umontreal.kotlingrad.api.SVar
 import space.kscience.kmath.expressions.DifferentiableExpression
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.MstAlgebra
@@ -14,20 +15,20 @@ import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.operations.NumericAlgebra
 
 /**
- * Represents wrapper of [MstExpression] implementing [DifferentiableExpression].
+ * Represents [MST] based [DifferentiableExpression].
  *
- * The principle of this API is converting the [mst] to an [SFun], differentiating it with Kotlin∇, then converting
- * [SFun] back to [MST].
+ * The principle of this API is converting the [mst] to an [SFun], differentiating it with
+ * [Kotlin∇](https://github.com/breandan/kotlingrad), then converting [SFun] back to [MST].
  *
- * @param T the type of number.
- * @param A the [NumericAlgebra] of [T].
- * @property expr the underlying [MstExpression].
+ * @param T The type of number.
+ * @param A The [NumericAlgebra] of [T].
+ * @property algebra The [A] instance.
+ * @property mst The [MST] node.
  */
 public class DifferentiableMstExpression<T : Number, A : NumericAlgebra<T>>(
     public val algebra: A,
     public val mst: MST,
 ) : DifferentiableExpression<T, DifferentiableMstExpression<T, A>> {
-
     public override fun invoke(arguments: Map<Symbol, T>): T = mst.interpret(algebra, arguments)
 
     public override fun derivativeOrNull(symbols: List<Symbol>): DifferentiableMstExpression<T, A> =
@@ -35,7 +36,7 @@ public class DifferentiableMstExpression<T : Number, A : NumericAlgebra<T>>(
             algebra,
             symbols.map(Symbol::identity)
                 .map(MstAlgebra::bindSymbol)
-                .map { it.toSVar<KMathNumber<T, A>>() }
+                .map<MST.Symbolic, SVar<KMathNumber<T, A>>>(MST.Symbolic::toSVar)
                 .fold(mst.toSFun(), SFun<KMathNumber<T, A>>::d)
                 .toMst(),
         )
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
index 0c3768dcc..9c9d07b81 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
@@ -5,19 +5,26 @@
 
 package space.kscience.kmath.kotlingrad
 
-import edu.umontreal.kotlingrad.api.RealNumber
 import edu.umontreal.kotlingrad.api.SConst
 import space.kscience.kmath.operations.NumericAlgebra
 
 /**
- * Implements [RealNumber] by delegating its functionality to [NumericAlgebra].
+ * Implements [SConst] by delegating its functionality to [NumericAlgebra].
  *
- * @param T the type of number.
- * @param A the [NumericAlgebra] of [T].
- * @property algebra the algebra.
- * @param value the value of this number.
+ * @param T The type of number.
+ * @param A The [NumericAlgebra] over [T].
+ * @property algebra The algebra.
+ * @property value The value of this number.
  */
-public class KMathNumber<T, A>(public val algebra: A, value: T) :
-    RealNumber<KMathNumber<T, A>, T>(value) where T : Number, A : NumericAlgebra<T> {
-    public override fun wrap(number: Number): SConst<KMathNumber<T, A>> = SConst(algebra.number(number))
+public class KMathNumber<T, A>(public val algebra: A, public override val value: T) :
+    SConst<KMathNumber<T, A>>(value) where T : Number, A : NumericAlgebra<T> {
+    /**
+     * Returns a string representation of the [value].
+     */
+    public override fun toString(): String = value.toString()
+
+    /**
+     * Wraps [Number] to [KMathNumber].
+     */
+    public override fun wrap(number: Number): KMathNumber<T, A> = KMathNumber(algebra, algebra.number(number))
 }
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/ScalarsAdapters.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/ScalarsAdapters.kt
index f65d2948d..bee2c9e3e 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/ScalarsAdapters.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/ScalarsAdapters.kt
@@ -15,16 +15,16 @@ import space.kscience.kmath.operations.*
 /**
  * Maps [SVar] to [MST.Symbolic] directly.
  *
- * @receiver the variable.
- * @return a node.
+ * @receiver The variable.
+ * @returnAa node.
  */
 public fun <X : SFun<X>> SVar<X>.toMst(): MST.Symbolic = MstAlgebra.bindSymbol(name)
 
 /**
  * Maps [SVar] to [MST.Numeric] directly.
  *
- * @receiver the constant.
- * @return a node.
+ * @receiver The constant.
+ * @return A node.
  */
 public fun <X : SFun<X>> SConst<X>.toMst(): MST.Numeric = MstAlgebra.number(doubleValue)
 
@@ -49,8 +49,8 @@ public fun <X : SFun<X>> SConst<X>.toMst(): MST.Numeric = MstAlgebra.number(doub
  * - [VSumAll] is requested to be evaluated;
  * - [Derivative] is requested to be evaluated.
  *
- * @receiver the scalar function.
- * @return a node.
+ * @receiver The scalar function.
+ * @return A node.
  */
 public fun <X : SFun<X>> SFun<X>.toMst(): MST = MstExtendedField {
     when (this@toMst) {
@@ -74,17 +74,16 @@ public fun <X : SFun<X>> SFun<X>.toMst(): MST = MstExtendedField {
 /**
  * Maps [MST.Numeric] to [SConst] directly.
  *
- * @receiver the node.
- * @return a new constant.
+ * @receiver The node.
+ * @return A new constant.
  */
 public fun <X : SFun<X>> MST.Numeric.toSConst(): SConst<X> = SConst(value)
 
 /**
  * Maps [MST.Symbolic] to [SVar] directly.
  *
- * @receiver the node.
- * @param proto the prototype instance.
- * @return a new variable.
+ * @receiver The node.
+ * @return A new variable.
  */
 internal fun <X : SFun<X>> MST.Symbolic.toSVar(): SVar<X> = SVar(value)
 
@@ -98,9 +97,8 @@ internal fun <X : SFun<X>> MST.Symbolic.toSVar(): SVar<X> = SVar(value)
  * - [MST.Unary] -> [Negative], [Sine], [Cosine], [Tangent], [Power], [Log];
  * - [MST.Binary] -> [Sum], [Prod], [Power].
  *
- * @receiver the node.
- * @param proto the prototype instance.
- * @return a scalar function.
+ * @receiver The node.
+ * @return A scalar function.
  */
 public fun <X : SFun<X>> MST.toSFun(): SFun<X> = when (this) {
     is MST.Numeric -> toSConst()
diff --git a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
index 3ed73451d..85c964c58 100644
--- a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
+++ b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
@@ -10,7 +10,7 @@ import space.kscience.kmath.asm.compileToExpression
 import space.kscience.kmath.ast.parseMath
 import space.kscience.kmath.expressions.MstAlgebra
 import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.misc.Symbol.Companion.x
 import space.kscience.kmath.operations.DoubleField
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -65,8 +65,4 @@ internal class AdaptingTests {
 
         assertEquals(actualDerivative(x to 0.1), expectedDerivative(x to 0.1))
     }
-
-    private companion object {
-        private val x by symbol
-    }
 }
-- 
2.34.1


From 1716b7f5d1d871610961419fd425c49730ea1a2f Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Mon, 10 May 2021 17:57:49 +0300
Subject: [PATCH 215/713] Fast power is added

---
 .../kscience/kmath/benchmarks/BigIntBenchmark.kt  |  6 ++----
 .../space/kscience/kmath/operations/Algebra.kt    | 15 +++++++++++++++
 .../kmath/operations/BigIntAlgebraTest.kt         | 14 ++++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index b9a10c774..33c659fca 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -15,15 +15,13 @@ import space.kscience.kmath.operations.BigIntField
 import space.kscience.kmath.operations.JBigIntegerField
 import space.kscience.kmath.operations.invoke
 
-private fun BigInt.pow(power: Int): BigInt = modPow(BigIntField.number(power), BigInt.ONE)
-
 
 @State(Scope.Benchmark)
 internal class BigIntBenchmark {
 
     val kmNumber = BigIntField.number(Int.MAX_VALUE)
     val jvmNumber = JBigIntegerField.number(Int.MAX_VALUE)
-    val largeKmNumber = BigIntField { number(11).pow(100_000) }
+    val largeKmNumber = BigIntField { number(11).pow(100_000UL) }
     val largeJvmNumber = JBigIntegerField { number(11).pow(100_000) }
     val bigExponent = 50_000
 
@@ -59,7 +57,7 @@ internal class BigIntBenchmark {
 
     @Benchmark
     fun kmPower(blackhole: Blackhole) = BigIntField {
-        blackhole.consume(kmNumber.pow(bigExponent))
+        blackhole.consume(kmNumber.pow(bigExponent.toULong()))
     }
 
     @Benchmark
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index 0334e0466..49861b543 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -250,6 +250,21 @@ public interface Ring<T> : Group<T>, RingOperations<T> {
      * neutral operation for multiplication
      */
     public val one: T
+
+    public fun T.pow(exponent: ULong): T = when {
+        this == zero && exponent > 0UL -> zero
+        this == one -> this
+        else -> powWithoutOptimization(exponent)
+    }
+
+    private fun T.powWithoutOptimization(exponent: ULong): T = when (exponent) {
+        0UL -> one
+        1UL -> this
+        else -> {
+            val pre = powWithoutOptimization(exponent shr 1).let { it * it }
+            if (exponent and 1UL == 0UL) pre else pre * this
+        }
+    }
 }
 
 /**
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
index 5df89a385..05b73b49d 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.operations
 
 import space.kscience.kmath.testutils.RingVerifier
+import kotlin.math.pow
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -21,6 +22,19 @@ internal class BigIntAlgebraTest {
         assertEquals(res, 1_000_000.toBigInt())
     }
 
+    @Test
+    fun testKBigIntegerRingPow() {
+        BigIntField {
+            for (num in 0..5)
+                for (exponent in 0UL..10UL)
+                    assertEquals(
+                        num.toDouble().pow(exponent.toInt()).toLong().toBigInt(),
+                        num.toBigInt().pow(exponent),
+                        "$num ^ $exponent"
+                    )
+        }
+    }
+
     @Test
     fun testKBigIntegerRingSum_100_000_000__100_000_000() {
         BigIntField {
-- 
2.34.1


From d17a3ac6eff3d6c62e99af7e030010846afd413b Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Mon, 10 May 2021 18:24:13 +0300
Subject: [PATCH 216/713] Further optimization of power is added

---
 .../kotlin/space/kscience/kmath/operations/Algebra.kt           | 1 +
 .../kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index 49861b543..f7c021998 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -254,6 +254,7 @@ public interface Ring<T> : Group<T>, RingOperations<T> {
     public fun T.pow(exponent: ULong): T = when {
         this == zero && exponent > 0UL -> zero
         this == one -> this
+        this == -one -> powWithoutOptimization(exponent % 2UL)
         else -> powWithoutOptimization(exponent)
     }
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
index 05b73b49d..90cd29758 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
@@ -25,7 +25,7 @@ internal class BigIntAlgebraTest {
     @Test
     fun testKBigIntegerRingPow() {
         BigIntField {
-            for (num in 0..5)
+            for (num in -5..5)
                 for (exponent in 0UL..10UL)
                     assertEquals(
                         num.toDouble().pow(exponent.toInt()).toLong().toBigInt(),
-- 
2.34.1


From 3ad7f32ada115b279e00edc49f5e9ba7e63a834d Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Mon, 10 May 2021 18:41:40 +0300
Subject: [PATCH 217/713] Incorrect BigInt equality fixed

---
 .../kotlin/space/kscience/kmath/operations/BigInt.kt           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index e74efa9ca..e81f1686d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -56,8 +56,7 @@ public class BigInt internal constructor(
         else -> sign * compareMagnitudes(magnitude, other.magnitude)
     }
 
-    public override fun equals(other: Any?): Boolean =
-        if (other is BigInt) compareTo(other) == 0 else error("Can't compare KBigInteger to a different type")
+    public override fun equals(other: Any?): Boolean = other is BigInt && compareTo(other) == 0
 
     public override fun hashCode(): Int = magnitude.hashCode() + sign
 
-- 
2.34.1


From 2da0648d73829396777066f970bf861e75410f01 Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Tue, 11 May 2021 01:40:45 +0300
Subject: [PATCH 218/713] Karatsuba added Incorrect equals fix test Incorrect
 overflow handling support

---
 .../space/kscience/kmath/operations/BigInt.kt | 46 +++++++++++++++----
 .../kmath/operations/BigIntOperationsTest.kt  | 25 +++++++++-
 2 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index e81f1686d..c7079902b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -86,20 +86,23 @@ public class BigInt internal constructor(
     public operator fun times(b: BigInt): BigInt = when {
         this.sign == 0.toByte() -> ZERO
         b.sign == 0.toByte() -> ZERO
-//          TODO: Karatsuba
+        b.magnitude.size == 1 -> this * b.magnitude[0] * b.sign.toInt()
+        this.magnitude.size == 1 -> b * this.magnitude[0] * this.sign.toInt()
         else -> BigInt((this.sign * b.sign).toByte(), multiplyMagnitudes(this.magnitude, b.magnitude))
     }
 
     public operator fun times(other: UInt): BigInt = when {
         sign == 0.toByte() -> ZERO
         other == 0U -> ZERO
+        other == 1U -> this
         else -> BigInt(sign, multiplyMagnitudeByUInt(magnitude, other))
     }
 
-    public operator fun times(other: Int): BigInt = if (other > 0)
-        this * kotlin.math.abs(other).toUInt()
-    else
-        -this * kotlin.math.abs(other).toUInt()
+    public operator fun times(other: Int): BigInt = when {
+        other > 0 -> this * kotlin.math.abs(other).toUInt()
+        other != Int.MIN_VALUE -> -this * kotlin.math.abs(other).toUInt()
+        else -> times(other.toBigInt())
+    }
 
     public operator fun div(other: UInt): BigInt = BigInt(this.sign, divideMagnitudeByUInt(this.magnitude, other))
 
@@ -237,6 +240,7 @@ public class BigInt internal constructor(
         public const val BASE_SIZE: Int = 32
         public val ZERO: BigInt = BigInt(0, uintArrayOf())
         public val ONE: BigInt = BigInt(1, uintArrayOf(1u))
+        private const val KARATSUBA_THRESHOLD = 80
 
         private val hexMapping: HashMap<UInt, String> = hashMapOf(
             0U to "0", 1U to "1", 2U to "2", 3U to "3",
@@ -317,7 +321,16 @@ public class BigInt internal constructor(
             return stripLeadingZeros(result)
         }
 
-        private fun multiplyMagnitudes(mag1: Magnitude, mag2: Magnitude): Magnitude {
+        internal fun multiplyMagnitudes(mag1: Magnitude, mag2: Magnitude): Magnitude = when {
+            mag1.size + mag2.size < KARATSUBA_THRESHOLD || mag1.isEmpty() || mag2.isEmpty() -> naiveMultiplyMagnitudes(
+                mag1,
+                mag2
+            )
+            // TODO implement Fourier
+            else -> karatsubaMultiplyMagnitudes(mag1, mag2)
+        }
+
+        internal fun naiveMultiplyMagnitudes(mag1: Magnitude, mag2: Magnitude): Magnitude {
             val resultLength = mag1.size + mag2.size
             val result = Magnitude(resultLength)
 
@@ -336,6 +349,21 @@ public class BigInt internal constructor(
             return stripLeadingZeros(result)
         }
 
+        internal fun karatsubaMultiplyMagnitudes(mag1: Magnitude, mag2: Magnitude): Magnitude {
+            //https://en.wikipedia.org/wiki/Karatsuba_algorithm
+            val halfSize = min(mag1.size, mag2.size) / 2
+            val x0 = mag1.sliceArray(0 until halfSize).toBigInt(1)
+            val x1 = mag1.sliceArray(halfSize until mag1.size).toBigInt(1)
+            val y0 = mag2.sliceArray(0 until halfSize).toBigInt(1)
+            val y1 = mag2.sliceArray(halfSize until mag2.size).toBigInt(1)
+
+            val z0 = x0 * y0
+            val z2 = x1 * y1
+            val z1 = (x0 + x1) * (y1 + y0) - z0 - z2
+
+            return (z2.shl(2 * halfSize * BASE_SIZE) + z1.shl(halfSize * BASE_SIZE) + z0).magnitude
+        }
+
         private fun divideMagnitudeByUInt(mag: Magnitude, x: UInt): Magnitude {
             val resultLength = mag.size
             val result = Magnitude(resultLength)
@@ -426,7 +454,7 @@ private val hexChToInt: MutableMap<Char, Int> = hashMapOf(
 public fun String.parseBigInteger(): BigInt? {
     val sign: Int
     val sPositive: String
-
+    //TODO substring = O(n). Can be replaced by some drop that is O(1)
     when {
         this[0] == '+' -> {
             sign = +1
@@ -446,8 +474,10 @@ public fun String.parseBigInteger(): BigInt? {
     var digitValue = BigInt.ONE
     val sPositiveUpper = sPositive.uppercase()
 
-    if (sPositiveUpper.startsWith("0X")) {  // hex representation
+    if (sPositiveUpper.startsWith("0X")) {
+        // hex representation
         val sHex = sPositiveUpper.substring(2)
+        // TODO optimize O(n2) -> O(n)
 
         for (ch in sHex.reversed()) {
             if (ch == '_') continue
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
index ae34dbc04..9f35f7a69 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
@@ -5,8 +5,9 @@
 
 package space.kscience.kmath.operations
 
-import kotlin.test.Test
-import kotlin.test.assertEquals
+import kotlin.random.Random
+import kotlin.random.nextUInt
+import kotlin.test.*
 
 @kotlin.ExperimentalUnsignedTypes
 class BigIntOperationsTest {
@@ -150,6 +151,18 @@ class BigIntOperationsTest {
         assertEquals(prod, res)
     }
 
+    @Test
+    fun testKaratsuba() {
+        val x = uintArrayOf(12U, 345U)
+        val y = uintArrayOf(6U, 789U)
+        assertContentEquals(BigInt.naiveMultiplyMagnitudes(x, y), BigInt.karatsubaMultiplyMagnitudes(x, y))
+        repeat(1000) {
+            val x1 = UIntArray(Random.nextInt(100, 1000)) { Random.nextUInt() }
+            val y1 = UIntArray(Random.nextInt(100, 1000)) { Random.nextUInt() }
+            assertContentEquals(BigInt.naiveMultiplyMagnitudes(x1, y1), BigInt.karatsubaMultiplyMagnitudes(x1, y1))
+        }
+    }
+
     @Test
     fun test_shr_20() {
         val x = 20.toBigInt()
@@ -383,4 +396,12 @@ class BigIntOperationsTest {
 
         return assertEquals(res, x % mod)
     }
+
+    @Test
+    fun testNotEqualsOtherTypeInstanceButButNotFails() = assertFalse(0.toBigInt().equals(""))
+
+    @Test
+    fun testIntAbsOverflow() {
+        assertEquals((-Int.MAX_VALUE.toLong().toBigInt() - 1.toBigInt()) * 2, 2.toBigInt() * Int.MIN_VALUE)
+    }
 }
-- 
2.34.1


From 74d14970b9e50e808c8901b8d2850ecd29f79ba1 Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Wed, 12 May 2021 00:58:27 +0300
Subject: [PATCH 219/713] empty string parsing fixed

---
 .../space/kscience/kmath/operations/BigInt.kt |  7 +++++-
 .../kmath/operations/BigIntConversionsTest.kt | 22 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index c7079902b..00b9f9fc2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -452,6 +452,7 @@ private val hexChToInt: MutableMap<Char, Int> = hashMapOf(
  * Returns null if a valid number can not be read from a string
  */
 public fun String.parseBigInteger(): BigInt? {
+    if (this.isEmpty()) return null
     val sign: Int
     val sPositive: String
     //TODO substring = O(n). Can be replaced by some drop that is O(1)
@@ -473,15 +474,18 @@ public fun String.parseBigInteger(): BigInt? {
     var res = BigInt.ZERO
     var digitValue = BigInt.ONE
     val sPositiveUpper = sPositive.uppercase()
+    var isEmpty = true
 
     if (sPositiveUpper.startsWith("0X")) {
         // hex representation
         val sHex = sPositiveUpper.substring(2)
+        if (this.isEmpty()) return null
         // TODO optimize O(n2) -> O(n)
 
         for (ch in sHex.reversed()) {
             if (ch == '_') continue
             res += digitValue * (hexChToInt[ch] ?: return null)
+            isEmpty = false
             digitValue *= 16.toBigInt()
         }
     } else for (ch in sPositiveUpper.reversed()) {
@@ -491,10 +495,11 @@ public fun String.parseBigInteger(): BigInt? {
             return null
         }
         res += digitValue * (ch.code - '0'.code)
+        isEmpty = false
         digitValue *= 10.toBigInt()
     }
 
-    return res * sign
+    return if (isEmpty) null else res * sign
 }
 
 public inline fun Buffer.Companion.bigInt(size: Int, initializer: (Int) -> BigInt): Buffer<BigInt> =
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
index a2832e531..1feaae808 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
@@ -7,9 +7,31 @@ package space.kscience.kmath.operations
 
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertNull
 
 @kotlin.ExperimentalUnsignedTypes
 class BigIntConversionsTest {
+
+    @Test
+    fun emptyString() {
+        assertNull("".parseBigInteger())
+        assertNull("+".parseBigInteger())
+        assertNull("-".parseBigInteger())
+
+        assertNull("0x".parseBigInteger())
+        assertNull("+0x".parseBigInteger())
+        assertNull("-0x".parseBigInteger())
+
+
+        assertNull("_".parseBigInteger())
+        assertNull("+_".parseBigInteger())
+        assertNull("-_".parseBigInteger())
+
+        assertNull("0x_".parseBigInteger())
+        assertNull("+0x_".parseBigInteger())
+        assertNull("-0x_".parseBigInteger())
+    }
+
     @Test
     fun testToString0x10() {
         val x = 0x10.toBigInt()
-- 
2.34.1


From 9184bd55de46bcb16a5c33b8a02f604b592aff4a Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Wed, 12 May 2021 02:01:49 +0300
Subject: [PATCH 220/713] Parser optimization

---
 .../space/kscience/kmath/operations/BigInt.kt | 90 +++++++++++--------
 1 file changed, 55 insertions(+), 35 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 00b9f9fc2..ab05d079f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -441,11 +441,11 @@ public fun UIntArray.toBigInt(sign: Byte): BigInt {
     return BigInt(sign, copyOf())
 }
 
-private val hexChToInt: MutableMap<Char, Int> = hashMapOf(
-    '0' to 0, '1' to 1, '2' to 2, '3' to 3,
-    '4' to 4, '5' to 5, '6' to 6, '7' to 7,
-    '8' to 8, '9' to 9, 'A' to 10, 'B' to 11,
-    'C' to 12, 'D' to 13, 'E' to 14, 'F' to 15
+private val hexChToInt: MutableMap<Char, UInt> = hashMapOf(
+    '0' to 0U, '1' to 1U, '2' to 2U, '3' to 3U,
+    '4' to 4U, '5' to 5U, '6' to 6U, '7' to 7U,
+    '8' to 8U, '9' to 9U, 'A' to 10U, 'B' to 11U,
+    'C' to 12U, 'D' to 13U, 'E' to 14U, 'F' to 15U
 )
 
 /**
@@ -454,52 +454,72 @@ private val hexChToInt: MutableMap<Char, Int> = hashMapOf(
 public fun String.parseBigInteger(): BigInt? {
     if (this.isEmpty()) return null
     val sign: Int
-    val sPositive: String
-    //TODO substring = O(n). Can be replaced by some drop that is O(1)
-    when {
-        this[0] == '+' -> {
+
+    val positivePartIndex = when (this[0]) {
+        '+' -> {
             sign = +1
-            sPositive = this.substring(1)
+            1
         }
-        this[0] == '-' -> {
+        '-' -> {
             sign = -1
-            sPositive = this.substring(1)
+            1
         }
         else -> {
-            sPositive = this
             sign = +1
+            0
         }
     }
 
-    var res = BigInt.ZERO
-    var digitValue = BigInt.ONE
-    val sPositiveUpper = sPositive.uppercase()
     var isEmpty = true
 
-    if (sPositiveUpper.startsWith("0X")) {
+    return if (this.startsWith("0X", startIndex = positivePartIndex, ignoreCase = true)) {
         // hex representation
-        val sHex = sPositiveUpper.substring(2)
-        if (this.isEmpty()) return null
-        // TODO optimize O(n2) -> O(n)
 
-        for (ch in sHex.reversed()) {
-            if (ch == '_') continue
-            res += digitValue * (hexChToInt[ch] ?: return null)
+        val uInts = mutableListOf(0U)
+        var offset = 0
+        fun addDigit(value: UInt) {
+            uInts[uInts.lastIndex] += value shl offset
+            offset += 4
+            if (offset == 32) {
+                uInts.add(0U)
+                offset = 0
+            }
+        }
+
+        for (index in lastIndex downTo positivePartIndex + 2) {
+            when (val ch = this[index]) {
+                '_' -> continue
+                in '0'..'9' -> addDigit((ch - '0').toUInt())
+                in 'A'..'F' -> addDigit((ch - 'A').toUInt() + 10U)
+                in 'a'..'f' -> addDigit((ch - 'a').toUInt() + 10U)
+                else -> return null
+            }
             isEmpty = false
-            digitValue *= 16.toBigInt()
         }
-    } else for (ch in sPositiveUpper.reversed()) {
-        // decimal representation
-        if (ch == '_') continue
-        if (ch !in '0'..'9') {
-            return null
-        }
-        res += digitValue * (ch.code - '0'.code)
-        isEmpty = false
-        digitValue *= 10.toBigInt()
-    }
 
-    return if (isEmpty) null else res * sign
+        while (uInts.isNotEmpty() && uInts.last() == 0U)
+            uInts.removeLast()
+
+        if (isEmpty) null else BigInt(sign.toByte(), uInts.toUIntArray())
+    } else {
+        // hex representation
+        var res = BigInt.ZERO
+        var digitValue = BigInt.ONE
+        for (index in lastIndex downTo positivePartIndex) {
+            val ch = this[index]
+            // decimal representation
+            if (ch == '_') continue
+            if (ch !in '0'..'9') {
+                return null
+            }
+            res += digitValue * (ch.code - '0'.code)
+            isEmpty = false
+            digitValue *= 10.toBigInt()
+
+        }
+
+        if (isEmpty) null else res * sign
+    }
 }
 
 public inline fun Buffer.Companion.bigInt(size: Int, initializer: (Int) -> BigInt): Buffer<BigInt> =
-- 
2.34.1


From b4e47494fcf6683d14d523aaaba34e33da592c3c Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Wed, 12 May 2021 04:42:17 +0300
Subject: [PATCH 221/713] Parsing of decimal values takes 9 immediately digits
 but not 1.

---
 .../kmath/benchmarks/BigIntBenchmark.kt       | 25 ++++++++--
 .../space/kscience/kmath/operations/BigInt.kt | 47 ++++++++++---------
 .../kmath/operations/BigIntConversionsTest.kt |  8 +++-
 3 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index 33c659fca..639eaacf3 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -10,10 +10,7 @@ import kotlinx.benchmark.Blackhole
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
-import space.kscience.kmath.operations.BigInt
-import space.kscience.kmath.operations.BigIntField
-import space.kscience.kmath.operations.JBigIntegerField
-import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.operations.*
 
 
 @State(Scope.Benchmark)
@@ -64,4 +61,24 @@ internal class BigIntBenchmark {
     fun jvmPower(blackhole: Blackhole) = JBigIntegerField {
         blackhole.consume(jvmNumber.pow(bigExponent))
     }
+
+    @Benchmark
+    fun kmParsing16(blackhole: Blackhole) = JBigIntegerField {
+        blackhole.consume("0x7f57ed8b89c29a3b9a85c7a5b84ca3929c7b7488593".parseBigInteger())
+    }
+
+    @Benchmark
+    fun kmParsing10(blackhole: Blackhole) = JBigIntegerField {
+        blackhole.consume("236656783929183747565738292847574838922010".parseBigInteger())
+    }
+
+    @Benchmark
+    fun jvmParsing10(blackhole: Blackhole) = JBigIntegerField {
+        blackhole.consume("236656783929183747565738292847574838922010".toBigInteger(10))
+    }
+
+    @Benchmark
+    fun jvmParsing16(blackhole: Blackhole) = JBigIntegerField {
+        blackhole.consume("7f57ed8b89c29a3b9a85c7a5b84ca3929c7b7488593".toBigInteger(16))
+    }
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index ab05d079f..780a4591d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -441,13 +441,6 @@ public fun UIntArray.toBigInt(sign: Byte): BigInt {
     return BigInt(sign, copyOf())
 }
 
-private val hexChToInt: MutableMap<Char, UInt> = hashMapOf(
-    '0' to 0U, '1' to 1U, '2' to 2U, '3' to 3U,
-    '4' to 4U, '5' to 5U, '6' to 6U, '7' to 7U,
-    '8' to 8U, '9' to 9U, 'A' to 10U, 'B' to 11U,
-    'C' to 12U, 'D' to 13U, 'E' to 14U, 'F' to 15U
-)
-
 /**
  * Returns null if a valid number can not be read from a string
  */
@@ -475,7 +468,7 @@ public fun String.parseBigInteger(): BigInt? {
     return if (this.startsWith("0X", startIndex = positivePartIndex, ignoreCase = true)) {
         // hex representation
 
-        val uInts = mutableListOf(0U)
+        val uInts = ArrayList<UInt>(length).apply { add(0U) }
         var offset = 0
         fun addDigit(value: UInt) {
             uInts[uInts.lastIndex] += value shl offset
@@ -502,22 +495,34 @@ public fun String.parseBigInteger(): BigInt? {
 
         if (isEmpty) null else BigInt(sign.toByte(), uInts.toUIntArray())
     } else {
-        // hex representation
-        var res = BigInt.ZERO
-        var digitValue = BigInt.ONE
-        for (index in lastIndex downTo positivePartIndex) {
-            val ch = this[index]
-            // decimal representation
-            if (ch == '_') continue
-            if (ch !in '0'..'9') {
-                return null
-            }
-            res += digitValue * (ch.code - '0'.code)
-            isEmpty = false
-            digitValue *= 10.toBigInt()
+        // decimal representation
 
+        val positivePart = buildList(length) {
+            for (index in positivePartIndex until length)
+                when (val a = this@parseBigInteger[index]) {
+                    '_' -> continue
+                    in '0'..'9' -> add(a)
+                    else -> return null
+                }
         }
 
+        val offset = positivePart.size % 9
+        isEmpty = offset == 0
+
+        fun parseUInt(fromIndex: Int, toIndex: Int): UInt? {
+            var res = 0U
+            for (i in fromIndex until toIndex) {
+                res = res * 10U + (positivePart[i].digitToIntOrNull()?.toUInt() ?: return null)
+            }
+            return res
+        }
+
+        var res = parseUInt(0, offset)?.toBigInt() ?: return null
+
+        for (index in offset..positivePart.lastIndex step 9) {
+            isEmpty = false
+            res = res * 1_000_000_000U + (parseUInt(index, index + 9) ?: return null).toBigInt()
+        }
         if (isEmpty) null else res * sign
     }
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
index 1feaae808..85f368f3e 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
@@ -13,7 +13,7 @@ import kotlin.test.assertNull
 class BigIntConversionsTest {
 
     @Test
-    fun emptyString() {
+    fun testEmptyString() {
         assertNull("".parseBigInteger())
         assertNull("+".parseBigInteger())
         assertNull("-".parseBigInteger())
@@ -38,6 +38,12 @@ class BigIntConversionsTest {
         assertEquals("0x10", x.toString())
     }
 
+    @Test
+    fun testUnderscores() {
+        assertEquals("0x10", "0x_1_0_".parseBigInteger().toString())
+        assertEquals("0xa", "_1_0_".parseBigInteger().toString())
+    }
+
     @Test
     fun testToString0x17ffffffd() {
         val x = 0x17ffffffdL.toBigInt()
-- 
2.34.1


From ed86a31c50d7d6b3890342fb2652ffdba4630fb0 Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Wed, 12 May 2021 04:58:48 +0300
Subject: [PATCH 222/713] Placing pow outside the Ring interface.

---
 .../kscience/kmath/operations/Algebra.kt      | 26 +++++++++----------
 .../space/kscience/kmath/operations/BigInt.kt |  2 ++
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index f7c021998..645e60c29 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -250,21 +250,21 @@ public interface Ring<T> : Group<T>, RingOperations<T> {
      * neutral operation for multiplication
      */
     public val one: T
+}
 
-    public fun T.pow(exponent: ULong): T = when {
-        this == zero && exponent > 0UL -> zero
-        this == one -> this
-        this == -one -> powWithoutOptimization(exponent % 2UL)
-        else -> powWithoutOptimization(exponent)
-    }
+public fun <T> Ring<T>.pow(base: T, exponent: ULong): T = when {
+    this == zero && exponent > 0UL -> zero
+    this == one -> base
+    this == -one -> powWithoutOptimization(base, exponent % 2UL)
+    else -> powWithoutOptimization(base, exponent)
+}
 
-    private fun T.powWithoutOptimization(exponent: ULong): T = when (exponent) {
-        0UL -> one
-        1UL -> this
-        else -> {
-            val pre = powWithoutOptimization(exponent shr 1).let { it * it }
-            if (exponent and 1UL == 0UL) pre else pre * this
-        }
+private fun <T> Ring<T>.powWithoutOptimization(base: T, exponent: ULong): T = when (exponent) {
+    0UL -> one
+    1UL -> base
+    else -> {
+        val pre = powWithoutOptimization(base, exponent shr 1).let { it * it }
+        if (exponent and 1UL == 0UL) pre else pre * base
     }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 780a4591d..88c952928 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -98,6 +98,8 @@ public class BigInt internal constructor(
         else -> BigInt(sign, multiplyMagnitudeByUInt(magnitude, other))
     }
 
+    public fun pow(other: ULong): BigInt = BigIntField { pow(this@BigInt, other) }
+
     public operator fun times(other: Int): BigInt = when {
         other > 0 -> this * kotlin.math.abs(other).toUInt()
         other != Int.MIN_VALUE -> -this * kotlin.math.abs(other).toUInt()
-- 
2.34.1


From ded01251d1e94af4edf315c3d5ad70dce6b06ee0 Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Wed, 12 May 2021 11:05:42 +0300
Subject: [PATCH 223/713] Karatsuba enhancement

---
 .../kotlin/space/kscience/kmath/operations/BigInt.kt      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 88c952928..be73e274a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -324,10 +324,8 @@ public class BigInt internal constructor(
         }
 
         internal fun multiplyMagnitudes(mag1: Magnitude, mag2: Magnitude): Magnitude = when {
-            mag1.size + mag2.size < KARATSUBA_THRESHOLD || mag1.isEmpty() || mag2.isEmpty() -> naiveMultiplyMagnitudes(
-                mag1,
-                mag2
-            )
+            mag1.size + mag2.size < KARATSUBA_THRESHOLD || mag1.isEmpty() || mag2.isEmpty() ->
+                naiveMultiplyMagnitudes(mag1, mag2)
             // TODO implement Fourier
             else -> karatsubaMultiplyMagnitudes(mag1, mag2)
         }
@@ -361,7 +359,7 @@ public class BigInt internal constructor(
 
             val z0 = x0 * y0
             val z2 = x1 * y1
-            val z1 = (x0 + x1) * (y1 + y0) - z0 - z2
+            val z1 = (x0 - x1) * (y1 - y0) + z0 + z2
 
             return (z2.shl(2 * halfSize * BASE_SIZE) + z1.shl(halfSize * BASE_SIZE) + z0).magnitude
         }
-- 
2.34.1


From 1e71f29d5e64a5c933630f892fab29cdfbd36e63 Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Wed, 12 May 2021 13:59:41 +0300
Subject: [PATCH 224/713] Large addition tests added

---
 .../space/kscience/kmath/benchmarks/BigIntBenchmark.kt | 10 ++++++++++
 .../kotlin/space/kscience/kmath/operations/BigInt.kt   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index 639eaacf3..d3262379f 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -32,6 +32,16 @@ internal class BigIntBenchmark {
         blackhole.consume(jvmNumber + jvmNumber + jvmNumber)
     }
 
+    @Benchmark
+    fun kmAddLarge(blackhole: Blackhole) = BigIntField {
+        blackhole.consume(largeKmNumber + largeKmNumber + largeKmNumber)
+    }
+
+    @Benchmark
+    fun jvmAddLarge(blackhole: Blackhole) = JBigIntegerField {
+        blackhole.consume(largeJvmNumber + largeJvmNumber + largeJvmNumber)
+    }
+
     @Benchmark
     fun kmMultiply(blackhole: Blackhole) = BigIntField {
         blackhole.consume(kmNumber * kmNumber * kmNumber)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index be73e274a..605dfd265 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -281,7 +281,7 @@ public class BigInt internal constructor(
                 }
 
                 result[i] = (res and BASE).toUInt()
-                carry = (res shr BASE_SIZE)
+                carry = res shr BASE_SIZE
             }
 
             result[resultLength - 1] = carry.toUInt()
-- 
2.34.1


From 8443fac4ae4df746f26a1dd444be1ef194d7baa5 Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Wed, 12 May 2021 14:10:32 +0300
Subject: [PATCH 225/713] UInt can be used in exponent (in pow) now.

---
 .../kotlin/space/kscience/kmath/operations/Algebra.kt     | 2 ++
 .../kotlin/space/kscience/kmath/operations/BigInt.kt      | 1 +
 .../space/kscience/kmath/operations/BigIntAlgebraTest.kt  | 8 +++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index 645e60c29..a23dc427c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -259,6 +259,8 @@ public fun <T> Ring<T>.pow(base: T, exponent: ULong): T = when {
     else -> powWithoutOptimization(base, exponent)
 }
 
+public fun <T> Ring<T>.pow(base: T, exponent: UInt): T = pow(base, exponent.toULong())
+
 private fun <T> Ring<T>.powWithoutOptimization(base: T, exponent: ULong): T = when (exponent) {
     0UL -> one
     1UL -> base
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 605dfd265..45161149c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -99,6 +99,7 @@ public class BigInt internal constructor(
     }
 
     public fun pow(other: ULong): BigInt = BigIntField { pow(this@BigInt, other) }
+    public fun pow(other: UInt): BigInt = BigIntField { pow(this@BigInt, other) }
 
     public operator fun times(other: Int): BigInt = when {
         other > 0 -> this * kotlin.math.abs(other).toUInt()
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
index 90cd29758..abc88934c 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
@@ -26,12 +26,18 @@ internal class BigIntAlgebraTest {
     fun testKBigIntegerRingPow() {
         BigIntField {
             for (num in -5..5)
-                for (exponent in 0UL..10UL)
+                for (exponent in 0U..10U) {
+                    assertEquals(
+                        num.toDouble().pow(exponent.toInt()).toLong().toBigInt(),
+                        num.toBigInt().pow(exponent.toULong()),
+                        "$num ^ $exponent"
+                    )
                     assertEquals(
                         num.toDouble().pow(exponent.toInt()).toLong().toBigInt(),
                         num.toBigInt().pow(exponent),
                         "$num ^ $exponent"
                     )
+                }
         }
     }
 
-- 
2.34.1


From e5f3ee75be375f457c342ab5fc02ff0f324c6490 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 12 May 2021 19:40:10 +0100
Subject: [PATCH 226/713] tensors readme fix

---
 README.md               | 7 ++++---
 kmath-tensors/README.md | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 3b4387c1b..c3def902b 100644
--- a/README.md
+++ b/README.md
@@ -247,9 +247,10 @@ One can still use generic algebras though.
 > **Maturity**: PROTOTYPE
 >
 > **Features:**
-> - [tensor algebra](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Basic linear algebra operations on tensors (plus, dot, etc.)
-> - [tensor algebra with broadcasting](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting.
-> - [linear algebra operations](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Advanced linear algebra operations like LU decomposition, SVD, etc.
+> - [tensor algebra](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Interface for basic linear algebra operations on tensors (plus, dot, etc.)
+> - [linear algebra operations](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Interface for advanced linear algebra operations like LU decomposition, SVD, etc.
+> - [tensor algebra over Double](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt): Full implementation of operations for tensors over `Double`'s
+> - [tensor algebra with broadcasting](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting for tensors over `Double`'s.
 
 <hr/>
 
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index 7ece44217..586bb8ac6 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -2,10 +2,10 @@
 
 Common linear algebra operations on tensors.
 
- - [tensor algebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Basic linear algebra operations on tensors (plus, dot, etc.)
- - [tensor algebra with broadcasting](src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting.
- - [linear algebra operations](src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Advanced linear algebra operations like LU decomposition, SVD, etc.
-
+ - [tensor algebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Interface for basic linear algebra operations on tensors (plus, dot, etc.)
+ - [linear algebra operations](src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Interface for advanced linear algebra operations like LU decomposition, SVD, etc.
+ - [tensor algebra over Double](src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt): Full implementation of operations for tensors over `Double`'s
+ - [tensor algebra with broadcasting](src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting for tensors over `Double`'s.
 
 ## Artifact:
 
-- 
2.34.1


From d721c4b5976072dae740243b2f1cefee5fcbe2b2 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Wed, 12 May 2021 19:43:08 +0100
Subject: [PATCH 227/713] typo found

---
 README.md               | 2 +-
 kmath-tensors/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c3def902b..519472a69 100644
--- a/README.md
+++ b/README.md
@@ -249,7 +249,7 @@ One can still use generic algebras though.
 > **Features:**
 > - [tensor algebra](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Interface for basic linear algebra operations on tensors (plus, dot, etc.)
 > - [linear algebra operations](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Interface for advanced linear algebra operations like LU decomposition, SVD, etc.
-> - [tensor algebra over Double](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt): Full implementation of operations for tensors over `Double`'s
+> - [tensor algebra over Double](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt): Full implementation of operations for tensors over `Double`'s.
 > - [tensor algebra with broadcasting](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting for tensors over `Double`'s.
 
 <hr/>
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index 586bb8ac6..affdad665 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -4,7 +4,7 @@ Common linear algebra operations on tensors.
 
  - [tensor algebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Interface for basic linear algebra operations on tensors (plus, dot, etc.)
  - [linear algebra operations](src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Interface for advanced linear algebra operations like LU decomposition, SVD, etc.
- - [tensor algebra over Double](src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt): Full implementation of operations for tensors over `Double`'s
+ - [tensor algebra over Double](src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt): Full implementation of operations for tensors over `Double`'s.
  - [tensor algebra with broadcasting](src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting for tensors over `Double`'s.
 
 ## Artifact:
-- 
2.34.1


From 97c4b817173637818f1b496580afc688af8825d2 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 13 May 2021 11:02:20 +0300
Subject: [PATCH 228/713] Introduce PerformancePitfall annotation

---
 CHANGELOG.md                                  |   1 +
 LICENSE                                       | 201 ------------------
 .../space/kscience/kmath/data/ColumnarData.kt |   2 +
 .../kscience/kmath/data/XYColumnarData.kt     |   2 +
 .../kmath/linear/BufferedLinearSpace.kt       |   3 +
 .../space/kscience/kmath/misc/annotations.kt  |  12 ++
 .../space/kscience/kmath/nd/BufferND.kt       |   2 +
 .../space/kscience/kmath/nd/Structure1D.kt    |  21 +-
 .../space/kscience/kmath/nd/Structure2D.kt    |   8 +-
 .../space/kscience/kmath/nd/StructureND.kt    |   4 +
 .../kmath/linear/DoubleLUSolverTest.kt        |   2 +
 .../space/kscience/kmath/linear/MatrixTest.kt |   2 +
 .../kmath/structures/NumberNDFieldTest.kt     |   2 +
 .../kmath/structures/LazyStructureND.kt       |   2 +
 .../kscience/kmath/ejml/EjmlMatrixTest.kt     |   2 +
 .../space/kscience/kmath/real/RealMatrix.kt   |   4 +
 .../kaceince/kmath/real/DoubleMatrixTest.kt   |   2 +
 .../kscience/kmath/jupyter/KMathJupyter.kt    |   4 +-
 .../kscience/kmath/nd4j/Nd4jArrayStructure.kt |   2 +
 .../kmath/tensors/core/BufferedTensor.kt      |   6 +-
 .../kmath/viktor/ViktorStructureND.kt         |   2 +
 21 files changed, 75 insertions(+), 211 deletions(-)
 delete mode 100644 LICENSE

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fba361d5..286be25e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Integration for any Field element
 - Extended operations for ND4J fields
 - Jupyter Notebook integration module (kmath-jupyter)
+- `@PerformancePitfall` annotation to mark possibly slow API
 
 ### Changed
 - Exponential operations merged with hyperbolic functions
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 261eeb9e9..000000000
--- a/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
index abbb46583..febf615a8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.data
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.Structure2D
@@ -25,6 +26,7 @@ public interface ColumnarData<out T> {
  * A zero-copy method to represent a [Structure2D] as a two-column x-y data.
  * There could more than two columns in the structure.
  */
+@OptIn(PerformancePitfall::class)
 @UnstableKMathAPI
 public fun <T> Structure2D<T>.asColumnarData(mapping: Map<Symbol, Int>): ColumnarData<T> {
     require(shape[1] >= mapping.maxOf { it.value }) { "Column index out of bounds" }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
index 663908e90..56bb59826 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.data
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.Structure2D
@@ -49,6 +50,7 @@ public fun <T, X : T, Y : T> XYColumnarData(x: Buffer<X>, y: Buffer<Y>): XYColum
  * A zero-copy method to represent a [Structure2D] as a two-column x-y data.
  * There could more than two columns in the structure.
  */
+@OptIn(PerformancePitfall::class)
 @UnstableKMathAPI
 public fun <T> Structure2D<T>.asXYData(xIndex: Int = 0, yIndex: Int = 1): XYColumnarData<T, T, T> {
     require(shape[1] >= max(xIndex, yIndex)) { "Column index out of bounds" }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 62d2408e3..9b4451a62 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.linear
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.invoke
@@ -50,6 +51,7 @@ public class BufferedLinearSpace<T : Any, A : Ring<T>>(
         this
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun Matrix<T>.dot(other: Matrix<T>): Matrix<T> {
         require(colNum == other.rowNum) { "Matrix dot operation dimension mismatch: ($rowNum, $colNum) x (${other.rowNum}, ${other.colNum})" }
         return elementAlgebra {
@@ -67,6 +69,7 @@ public class BufferedLinearSpace<T : Any, A : Ring<T>>(
         }
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun Matrix<T>.dot(vector: Point<T>): Point<T> {
         require(colNum == vector.size) { "Matrix dot vector operation dimension mismatch: ($rowNum, $colNum) x (${vector.size})" }
         return elementAlgebra {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
index 7f53d96ce..18718de97 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
@@ -15,3 +15,15 @@ package space.kscience.kmath.misc
 @Retention(value = AnnotationRetention.BINARY)
 @RequiresOptIn("This API is unstable and could change in future", RequiresOptIn.Level.WARNING)
 public annotation class UnstableKMathAPI
+
+/**
+ * Marks API which could cause performance problems. The code, marked by this API is not necessary slow, but could cause
+ * slow-down in some cases. Refer to the documentation and benchmark it to be sure.
+ */
+@MustBeDocumented
+@Retention(value = AnnotationRetention.BINARY)
+@RequiresOptIn(
+    "Refer to the documentation to use this API in performance-critical code",
+    RequiresOptIn.Level.WARNING
+)
+public annotation class PerformancePitfall
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 1f608f478..425808aeb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.MutableBuffer
@@ -32,6 +33,7 @@ public open class BufferND<T>(
 
     override val shape: IntArray get() = strides.shape
 
+    @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, T>> = strides.indices().map {
         it to this[it]
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index 8ea6d0f02..cc0528793 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.structures.asMutableBuffer
@@ -46,6 +47,8 @@ private value class Structure1DWrapper<T>(val structure: StructureND<T>) : Struc
     override val size: Int get() = structure.shape[0]
 
     override operator fun get(index: Int): T = structure[index]
+
+    @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, T>> = structure.elements()
 }
 
@@ -55,6 +58,8 @@ private value class Structure1DWrapper<T>(val structure: StructureND<T>) : Struc
 private class MutableStructure1DWrapper<T>(val structure: MutableStructureND<T>) : MutableStructure1D<T> {
     override val shape: IntArray get() = structure.shape
     override val size: Int get() = structure.shape[0]
+
+    @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, T>> = structure.elements()
 
     override fun get(index: Int): T = structure[index]
@@ -62,8 +67,8 @@ private class MutableStructure1DWrapper<T>(val structure: MutableStructureND<T>)
         structure[intArrayOf(index)] = value
     }
 
-    override fun copy(): MutableBuffer<T> =
-        structure.elements().map { it.second }.toMutableList().asMutableBuffer()
+    @PerformancePitfall
+    override fun copy(): MutableBuffer<T> = structure.elements().map { it.second }.toMutableList().asMutableBuffer()
 }
 
 
@@ -75,8 +80,10 @@ private value class Buffer1DWrapper<T>(val buffer: Buffer<T>) : Structure1D<T> {
     override val shape: IntArray get() = intArrayOf(buffer.size)
     override val size: Int get() = buffer.size
 
-    override fun elements(): Sequence<Pair<IntArray, T>> =
-        buffer.asSequence().mapIndexed { index, value -> intArrayOf(index) to value }
+    @PerformancePitfall
+    override fun elements(): Sequence<Pair<IntArray, T>> = buffer.asSequence().mapIndexed { index, value ->
+        intArrayOf(index) to value
+    }
 
     override operator fun get(index: Int): T = buffer[index]
 }
@@ -85,8 +92,10 @@ internal class MutableBuffer1DWrapper<T>(val buffer: MutableBuffer<T>) : Mutable
     override val shape: IntArray get() = intArrayOf(buffer.size)
     override val size: Int get() = buffer.size
 
-    override fun elements(): Sequence<Pair<IntArray, T>> =
-        buffer.asSequence().mapIndexed { index, value -> intArrayOf(index) to value }
+    @PerformancePitfall
+    override fun elements(): Sequence<Pair<IntArray, T>> = buffer.asSequence().mapIndexed { index, value ->
+        intArrayOf(index) to value
+    }
 
     override operator fun get(index: Int): T = buffer[index]
     override fun set(index: Int, value: T) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index 28ae07a3c..8dce4ad6b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -5,10 +5,11 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.VirtualBuffer
 import space.kscience.kmath.structures.MutableListBuffer
+import space.kscience.kmath.structures.VirtualBuffer
 import kotlin.jvm.JvmInline
 import kotlin.reflect.KClass
 
@@ -33,12 +34,14 @@ public interface Structure2D<T> : StructureND<T> {
     /**
      * The buffer of rows of this structure. It gets elements from the structure dynamically.
      */
+    @PerformancePitfall
     public val rows: List<Buffer<T>>
         get() = List(rowNum) { i -> VirtualBuffer(colNum) { j -> get(i, j) } }
 
     /**
      * The buffer of columns of this structure. It gets elements from the structure dynamically.
      */
+    @PerformancePitfall
     public val columns: List<Buffer<T>>
         get() = List(colNum) { j -> VirtualBuffer(rowNum) { i -> get(i, j) } }
 
@@ -80,12 +83,14 @@ public interface MutableStructure2D<T> : Structure2D<T>, MutableStructureND<T> {
     /**
      * The buffer of rows of this structure. It gets elements from the structure dynamically.
      */
+    @PerformancePitfall
     override val rows: List<MutableStructure1D<T>>
         get() = List(rowNum) { i -> MutableBuffer1DWrapper(MutableListBuffer(colNum) { j -> get(i, j) })}
 
     /**
      * The buffer of columns of this structure. It gets elements from the structure dynamically.
      */
+    @PerformancePitfall
     override val columns: List<MutableStructure1D<T>>
         get() = List(colNum) { j -> MutableBuffer1DWrapper(MutableListBuffer(rowNum) { i -> get(i, j) }) }
 }
@@ -105,6 +110,7 @@ private value class Structure2DWrapper<T>(val structure: StructureND<T>) : Struc
     @UnstableKMathAPI
     override fun <F : StructureFeature> getFeature(type: KClass<out F>): F? = structure.getFeature(type)
 
+    @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, T>> = structure.elements()
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index a3331d71a..b9f1a063a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
@@ -48,6 +49,7 @@ public interface StructureND<T> {
      *
      * @return the lazy sequence of pairs of indices to values.
      */
+    @PerformancePitfall
     public fun elements(): Sequence<Pair<IntArray, T>>
 
     /**
@@ -61,6 +63,7 @@ public interface StructureND<T> {
         /**
          * Indicates whether some [StructureND] is equal to another one.
          */
+        @PerformancePitfall
         public fun <T : Any> contentEquals(st1: StructureND<T>, st2: StructureND<T>): Boolean {
             if (st1 === st2) return true
 
@@ -169,6 +172,7 @@ public interface MutableStructureND<T> : StructureND<T> {
 /**
  * Transform a structure element-by element in place.
  */
+@OptIn(PerformancePitfall::class)
 public inline fun <T> MutableStructureND<T>.mapInPlace(action: (IntArray, T) -> T): Unit =
     elements().forEach { (index, oldValue) -> this[index] = action(index, oldValue) }
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
index ebbbbe392..2d2a0952b 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
@@ -5,12 +5,14 @@
 
 package space.kscience.kmath.linear
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
+@OptIn(PerformancePitfall::class)
 fun <T : Any> assertMatrixEquals(expected: StructureND<T>, actual: StructureND<T>) {
     assertTrue { StructureND.contentEquals(expected, actual) }
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
index 250fa3433..170f9caf4 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.linear
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.as2D
@@ -13,6 +14,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
 @UnstableKMathAPI
+@OptIn(PerformancePitfall::class)
 @Suppress("UNUSED_VARIABLE")
 class MatrixTest {
     @Test
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index 99743d879..57393fadd 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.structures
 
 import space.kscience.kmath.linear.LinearSpace
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.Norm
 import space.kscience.kmath.operations.invoke
@@ -74,6 +75,7 @@ class NumberNDFieldTest {
     }
 
     object L2Norm : Norm<StructureND<out Number>, Double> {
+        @OptIn(PerformancePitfall::class)
         override fun norm(arg: StructureND<out Number>): Double =
             kotlin.math.sqrt(arg.elements().sumOf { it.second.toDouble() })
     }
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
index e2ecb4b2f..1cd16054a 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.structures
 
 import kotlinx.coroutines.*
 import space.kscience.kmath.coroutines.Math
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.DefaultStrides
 import space.kscience.kmath.nd.StructureND
 
@@ -24,6 +25,7 @@ public class LazyStructureND<T>(
     public suspend fun await(index: IntArray): T = deferred(index).await()
     public override operator fun get(index: IntArray): T = runBlocking { deferred(index).await() }
 
+    @OptIn(PerformancePitfall::class)
     public override fun elements(): Sequence<Pair<IntArray, T>> {
         val strides = DefaultStrides(shape)
         val res = runBlocking { strides.indices().toList().map { index -> index to await(index) } }
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
index 485c53c38..50675bdac 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
@@ -12,12 +12,14 @@ import org.ejml.dense.row.factory.DecompositionFactory_DDRM
 import space.kscience.kmath.linear.DeterminantFeature
 import space.kscience.kmath.linear.LupDecompositionFeature
 import space.kscience.kmath.linear.getFeature
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import kotlin.random.Random
 import kotlin.random.asJavaRandom
 import kotlin.test.*
 
+@OptIn(PerformancePitfall::class)
 fun <T : Any> assertMatrixEquals(expected: StructureND<T>, actual: StructureND<T>) {
     assertTrue { StructureND.contentEquals(expected, actual) }
 }
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
index c4656dd8a..8023236ea 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
@@ -3,9 +3,13 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:OptIn(PerformancePitfall::class)
+@file:Suppress("unused")
+
 package space.kscience.kmath.real
 
 import space.kscience.kmath.linear.*
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.Buffer
diff --git a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt b/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt
index 84e604b18..b3e129c2e 100644
--- a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt
@@ -7,6 +7,7 @@ package kaceince.kmath.real
 
 import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.matrix
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.real.*
@@ -15,6 +16,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
+@OptIn(PerformancePitfall::class)
 fun <T : Any> assertMatrixEquals(expected: StructureND<T>, actual: StructureND<T>) {
     assertTrue { StructureND.contentEquals(expected, actual) }
 }
diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
index 78b25af47..f3d553f2e 100644
--- a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -8,11 +8,12 @@ import org.jetbrains.kotlinx.jupyter.api.DisplayResult
 import org.jetbrains.kotlinx.jupyter.api.HTML
 import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
-import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.ast.rendering.FeaturedMathRendererWithPostProcess
 import space.kscience.kmath.ast.rendering.MathMLSyntaxRenderer
 import space.kscience.kmath.ast.rendering.renderWithStringBuilder
 import space.kscience.kmath.complex.Complex
+import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.operations.GroupOperations
 import space.kscience.kmath.operations.RingOperations
@@ -55,6 +56,7 @@ internal class KMathJupyter : JupyterIntegration() {
         }
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun Builder.onLoaded() {
         import(
             "space.kscience.kmath.ast.*",
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
index 79db86fcc..d37c91cb6 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.nd4j
 
 import org.nd4j.linalg.api.ndarray.INDArray
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.MutableStructureND
 import space.kscience.kmath.nd.StructureND
 
@@ -24,6 +25,7 @@ public sealed class Nd4jArrayStructure<T> : MutableStructureND<T> {
 
     internal abstract fun elementsIterator(): Iterator<Pair<IntArray, T>>
     internal fun indicesIterator(): Iterator<IntArray> = ndArray.indicesIterator()
+    @PerformancePitfall
     public override fun elements(): Sequence<Pair<IntArray, T>> = Sequence(::elementsIterator)
 }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 858532abc..315dc4505 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -1,7 +1,8 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.Strides
-import space.kscience.kmath.structures.*
+import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.internal.TensorLinearStructure
 
@@ -32,7 +33,8 @@ public open class BufferedTensor<T> internal constructor(
         mutableBuffer[bufferStart + linearStructure.offset(index)] = value
     }
 
+    @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, T>> = linearStructure.indices().map {
-        it to this[it]
+        it to get(it)
     }
 }
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index dc1b45f5d..b7abf4304 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.viktor
 
 import org.jetbrains.bio.viktor.F64Array
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
@@ -23,6 +24,7 @@ public class ViktorStructureND(public val f64Buffer: F64Array) : MutableStructur
         f64Buffer.set(*index, value = value)
     }
 
+    @PerformancePitfall
     public override fun elements(): Sequence<Pair<IntArray, Double>> =
         DefaultStrides(shape).indices().map { it to get(it) }
 }
-- 
2.34.1


From f5289abdc3e6c636ff2411f04141eddd4847a5f8 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 13 May 2021 11:09:49 +0300
Subject: [PATCH 229/713] Introduce PerformancePitfall annotation

---
 kmath-core/api/kmath-core.api                                | 3 +++
 .../commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt | 2 ++
 .../kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt | 4 +---
 .../kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt | 4 +---
 .../space/kscience/kmath/histogram/IndexedHistogramSpace.kt  | 5 ++---
 .../kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt     | 2 ++
 .../kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt | 4 +++-
 .../space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt      | 2 ++
 .../space/kscience/kmath/tensors/core/TestDoubleTensor.kt    | 2 ++
 9 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 7dd459104..14bc70a2a 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -674,6 +674,9 @@ public final class space/kscience/kmath/misc/CumulativeKt {
 	public static final fun cumulativeSumOfLong (Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
 }
 
+public abstract interface annotation class space/kscience/kmath/misc/PerformancePitfall : java/lang/annotation/Annotation {
+}
+
 public final class space/kscience/kmath/misc/StringSymbol : space/kscience/kmath/misc/Symbol {
 	public static final synthetic fun box-impl (Ljava/lang/String;)Lspace/kscience/kmath/misc/StringSymbol;
 	public static fun constructor-impl (Ljava/lang/String;)Ljava/lang/String;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index 8dce4ad6b..5b8183699 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -59,6 +59,7 @@ public interface Structure2D<T> : StructureND<T> {
         return get(index[0], index[1])
     }
 
+    @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, T>> = sequence {
         for (i in 0 until rowNum)
             for (j in 0 until colNum) yield(intArrayOf(i, j) to get(i, j))
@@ -134,6 +135,7 @@ private class MutableStructure2DWrapper<T>(val structure: MutableStructureND<T>)
         structure[intArrayOf(i, j)] = value
     }
 
+    @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, T>> = structure.elements()
 
     override fun equals(other: Any?): Boolean = false
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
index 3604fda31..2a4837ee0 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
@@ -7,16 +7,14 @@ package space.kscience.kmath.geometry
 
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.GroupElement
 import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
 import kotlin.math.sqrt
 
 @OptIn(UnstableKMathAPI::class)
-public interface Vector2D : Point<Double>, Vector, GroupElement<Vector2D, Euclidean2DSpace> {
+public interface Vector2D : Point<Double>, Vector{
     public val x: Double
     public val y: Double
-    public override val context: Euclidean2DSpace get() = Euclidean2DSpace
     public override val size: Int get() = 2
 
     public override operator fun get(index: Int): Double = when (index) {
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index 8643b2dbb..37e7d2cb2 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -7,17 +7,15 @@ package space.kscience.kmath.geometry
 
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.GroupElement
 import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
 import kotlin.math.sqrt
 
 @OptIn(UnstableKMathAPI::class)
-public interface Vector3D : Point<Double>, Vector, GroupElement<Vector3D, Euclidean3DSpace> {
+public interface Vector3D : Point<Double>, Vector {
     public val x: Double
     public val y: Double
     public val z: Double
-    public override val context: Euclidean3DSpace get() = Euclidean3DSpace
     public override val size: Int get() = 3
 
     public override operator fun get(index: Int): Double = when (index) {
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
index 818d81ab0..e5f6830c5 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
@@ -12,7 +12,6 @@ import space.kscience.kmath.nd.FieldND
 import space.kscience.kmath.nd.Strides
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.Group
-import space.kscience.kmath.operations.GroupElement
 import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
 
@@ -26,9 +25,9 @@ public data class DomainBin<T : Comparable<T>>(
 
 @OptIn(UnstableKMathAPI::class)
 public class IndexedHistogram<T : Comparable<T>, V : Any>(
-    override val context: IndexedHistogramSpace<T, V>,
+    public val context: IndexedHistogramSpace<T, V>,
     public val values: StructureND<V>,
-) : Histogram<T, Bin<T>>, GroupElement<IndexedHistogram<T, V>, IndexedHistogramSpace<T, V>> {
+) : Histogram<T, Bin<T>> {
 
     override fun get(point: Point<T>): Bin<T>? {
         val index = context.getIndex(point) ?: return null
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index 0205f1c87..3cac44c47 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -10,6 +10,7 @@ import org.nd4j.linalg.api.ops.impl.scalar.Pow
 import org.nd4j.linalg.api.ops.impl.transforms.strict.*
 import org.nd4j.linalg.factory.Nd4j
 import org.nd4j.linalg.ops.transforms.Transforms
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.*
@@ -52,6 +53,7 @@ public interface Nd4jArrayAlgebra<T, C : Algebra<T>> : AlgebraND<T, C> {
         return struct
     }
 
+    @PerformancePitfall
     public override fun StructureND<T>.map(transform: C.(T) -> T): Nd4jArrayStructure<T> {
         val newStruct = ndArray.dup().wrap()
         newStruct.elements().forEach { (idx, value) -> newStruct[idx] = elementContext.transform(value) }
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
index b6c524cc6..c80a1d771 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.nd4j
 
 import org.nd4j.linalg.factory.Nd4j
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.invoke
 import kotlin.math.PI
@@ -14,6 +15,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import kotlin.test.fail
 
+@OptIn(PerformancePitfall::class)
 internal class Nd4jArrayAlgebraTest {
     @Test
     fun testProduce() {
@@ -28,7 +30,7 @@ internal class Nd4jArrayAlgebraTest {
 
     @Test
     fun testMap() {
-        val res = with(IntNd4jArrayRing(intArrayOf(2, 2))) { one.map() { it + it * 2 } }
+        val res = with(IntNd4jArrayRing(intArrayOf(2, 2))) { one.map { it + it * 2 } }
         val expected = (Nd4j.create(2, 2) ?: fail()).asIntStructure()
         expected[intArrayOf(0, 0)] = 3
         expected[intArrayOf(0, 1)] = 3
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
index d59e04194..bdfec2ba6 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.nd4j
 
 import org.nd4j.linalg.factory.Nd4j
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.get
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -13,6 +14,7 @@ import kotlin.test.assertNotEquals
 import kotlin.test.fail
 
 internal class Nd4jArrayStructureTest {
+    @OptIn(PerformancePitfall::class)
     @Test
     fun testElements() {
         val nd = Nd4j.create(doubleArrayOf(1.0, 2.0, 3.0))!!
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index a6c6a7618..a176abdd4 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -1,5 +1,6 @@
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.DefaultStrides
 import space.kscience.kmath.nd.MutableBufferND
 import space.kscience.kmath.nd.as1D
@@ -24,6 +25,7 @@ internal class TestDoubleTensor {
         assertEquals(tensor.value(), value)
     }
 
+    @OptIn(PerformancePitfall::class)
     @Test
     fun testStrides() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
-- 
2.34.1


From feb5743f58616af3c46917ce098c63778191e5db Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 13 May 2021 11:10:59 +0300
Subject: [PATCH 230/713] Change signature of one of integrate helpers

---
 .../kscience/kmath/commons/integration/IntegrationTest.kt   | 6 +++---
 .../space/kscience/kmath/integration/UnivariateIntegrand.kt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
index 9d475d04d..97dc94d1d 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
@@ -19,16 +19,16 @@ internal class IntegrationTest {
 
     @Test
     fun simpson() {
-        val res = CMIntegrator.simpson().integrate(0.0..2 * PI, function)
+        val res = CMIntegrator.simpson().integrate(0.0..2 * PI, function = function)
         assertTrue { abs(res) < 1e-3 }
     }
 
     @Test
     fun customSimpson() {
-        val res = CMIntegrator.simpson().integrate(0.0..PI, function) {
+        val res = CMIntegrator.simpson().integrate(0.0..PI, {
             targetRelativeAccuracy = 1e-4
             targetAbsoluteAccuracy = 1e-4
-        }
+        }, function)
         assertTrue { abs(res - 2) < 1e-3 }
         assertTrue { abs(res - 2) > 1e-12 }
     }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index bcd5005c4..51ea57a33 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -57,8 +57,8 @@ public fun UnivariateIntegrator<Double>.integrate(
 @UnstableKMathAPI
 public fun UnivariateIntegrator<Double>.integrate(
     range: ClosedRange<Double>,
+    featureBuilder: MutableList<IntegrandFeature>.() -> Unit = {},
     function: (Double) -> Double,
-    featureBuilder: (MutableList<IntegrandFeature>.() -> Unit) = {},
 ): Double {
     //TODO use dedicated feature builder class instead or add extensions to MutableList<IntegrandFeature>
     val features = buildList {
-- 
2.34.1


From 1e945389314cf8d3072f919f5c18afd9a4dcca4d Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Thu, 13 May 2021 13:11:20 +0300
Subject: [PATCH 231/713] Unstable API annotation added + inconsistent docs fix
 + unnecessary BigIntField usage removed

---
 .../kmath/benchmarks/BigIntBenchmark.kt       |  5 +++-
 .../kscience/kmath/operations/Algebra.kt      |  5 +++-
 .../space/kscience/kmath/operations/BigInt.kt |  3 ++
 .../kmath/operations/OptionalOperations.kt    |  2 +-
 .../kmath/operations/BigIntAlgebraTest.kt     | 30 +++++++++----------
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index d3262379f..21b097609 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -10,16 +10,19 @@ import kotlinx.benchmark.Blackhole
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
+import java.math.BigInteger
 
 
+@UnstableKMathAPI
 @State(Scope.Benchmark)
 internal class BigIntBenchmark {
 
     val kmNumber = BigIntField.number(Int.MAX_VALUE)
     val jvmNumber = JBigIntegerField.number(Int.MAX_VALUE)
     val largeKmNumber = BigIntField { number(11).pow(100_000UL) }
-    val largeJvmNumber = JBigIntegerField { number(11).pow(100_000) }
+    val largeJvmNumber: BigInteger = JBigIntegerField { number(11).pow(100_000) }
     val bigExponent = 50_000
 
     @Benchmark
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index a23dc427c..8881ae93c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.operations
 
 import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.misc.UnstableKMathAPI
 
 /**
  * Stub for DSL the [Algebra] is.
@@ -247,11 +248,12 @@ public interface RingOperations<T> : GroupOperations<T> {
  */
 public interface Ring<T> : Group<T>, RingOperations<T> {
     /**
-     * neutral operation for multiplication
+     * The neutral element of multiplication
      */
     public val one: T
 }
 
+@UnstableKMathAPI
 public fun <T> Ring<T>.pow(base: T, exponent: ULong): T = when {
     this == zero && exponent > 0UL -> zero
     this == one -> base
@@ -259,6 +261,7 @@ public fun <T> Ring<T>.pow(base: T, exponent: ULong): T = when {
     else -> powWithoutOptimization(base, exponent)
 }
 
+@UnstableKMathAPI
 public fun <T> Ring<T>.pow(base: T, exponent: UInt): T = pow(base, exponent.toULong())
 
 private fun <T> Ring<T>.powWithoutOptimization(base: T, exponent: ULong): T = when (exponent) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 45161149c..0dcbbe567 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -98,7 +98,10 @@ public class BigInt internal constructor(
         else -> BigInt(sign, multiplyMagnitudeByUInt(magnitude, other))
     }
 
+    @UnstableKMathAPI
     public fun pow(other: ULong): BigInt = BigIntField { pow(this@BigInt, other) }
+
+    @UnstableKMathAPI
     public fun pow(other: UInt): BigInt = BigIntField { pow(this@BigInt, other) }
 
     public operator fun times(other: Int): BigInt = when {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
index 8e3e6c777..7045c874e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
@@ -147,7 +147,7 @@ public interface PowerOperations<T> : Algebra<T> {
 }
 
 /**
- * Raises this element to the power [pow].
+ * Raises this element to the power [power].
  *
  * @receiver the base.
  * @param power the exponent.
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
index abc88934c..d3fca4351 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.operations
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.testutils.RingVerifier
 import kotlin.math.pow
 import kotlin.test.Test
@@ -22,23 +23,22 @@ internal class BigIntAlgebraTest {
         assertEquals(res, 1_000_000.toBigInt())
     }
 
+    @UnstableKMathAPI
     @Test
     fun testKBigIntegerRingPow() {
-        BigIntField {
-            for (num in -5..5)
-                for (exponent in 0U..10U) {
-                    assertEquals(
-                        num.toDouble().pow(exponent.toInt()).toLong().toBigInt(),
-                        num.toBigInt().pow(exponent.toULong()),
-                        "$num ^ $exponent"
-                    )
-                    assertEquals(
-                        num.toDouble().pow(exponent.toInt()).toLong().toBigInt(),
-                        num.toBigInt().pow(exponent),
-                        "$num ^ $exponent"
-                    )
-                }
-        }
+        for (num in -5..5)
+            for (exponent in 0U..10U) {
+                assertEquals(
+                    num.toDouble().pow(exponent.toInt()).toLong().toBigInt(),
+                    num.toBigInt().pow(exponent.toULong()),
+                    "$num ^ $exponent"
+                )
+                assertEquals(
+                    num.toDouble().pow(exponent.toInt()).toLong().toBigInt(),
+                    num.toBigInt().pow(exponent),
+                    "$num ^ $exponent"
+                )
+            }
     }
 
     @Test
-- 
2.34.1


From fcb960533823090eff6fae936ffa0058db65ff88 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Thu, 13 May 2021 22:59:35 +0700
Subject: [PATCH 232/713] Special rendering of Quaternion #330

---
 .../space/kscience/kmath/complex/Complex.kt   |  2 +-
 .../kscience/kmath/jupyter/KMathJupyter.kt    | 24 ++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index 8e28337f6..a96d046c9 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -187,7 +187,7 @@ public data class Complex(val re: Double, val im: Double) {
     public constructor(re: Number, im: Number) : this(re.toDouble(), im.toDouble())
     public constructor(re: Number) : this(re.toDouble(), 0.0)
 
-    public override fun toString(): String = "($re + i*$im)"
+    public override fun toString(): String = "($re + i * $im)"
 
     public companion object : MemorySpec<Complex> {
         public override val objectSize: Int
diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
index f3d553f2e..e3767e13c 100644
--- a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -12,18 +12,19 @@ import space.kscience.kmath.ast.rendering.FeaturedMathRendererWithPostProcess
 import space.kscience.kmath.ast.rendering.MathMLSyntaxRenderer
 import space.kscience.kmath.ast.rendering.renderWithStringBuilder
 import space.kscience.kmath.complex.Complex
+import space.kscience.kmath.complex.Quaternion
 import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.expressions.MstRing
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.Structure2D
-import space.kscience.kmath.operations.GroupOperations
-import space.kscience.kmath.operations.RingOperations
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asSequence
 
 /**
  * A function for conversion of number to MST for pretty print
  */
-public fun Number.toMst(): MST.Numeric =  MST.Numeric(this)
+public fun Number.toMst(): MST.Numeric = MST.Numeric(this)
 
 @JupyterLibrary
 internal class KMathJupyter : JupyterIntegration() {
@@ -121,11 +122,18 @@ internal class KMathJupyter : JupyterIntegration() {
         }
 
         render<Complex> {
-            MST.Binary(
-                operation = GroupOperations.PLUS_OPERATION,
-                left = MST.Numeric(it.re),
-                right = MST.Binary(RingOperations.TIMES_OPERATION, MST.Numeric(it.im), MST.Symbolic("i")),
-            ).toDisplayResult()
+            MstRing {
+                number(it.re) + number(it.im) * bindSymbol("i")
+            }.toDisplayResult()
+        }
+
+        render<Quaternion> {
+            MstRing {
+                number(it.w) +
+                        number(it.x) * bindSymbol("i") +
+                        number(it.x) * bindSymbol("j") +
+                        number(it.x) * bindSymbol("k")
+            }.toDisplayResult()
         }
     }
 }
-- 
2.34.1


From e110253d8f38171b91d4417c115713585e9faa29 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Thu, 13 May 2021 19:26:18 +0100
Subject: [PATCH 233/713] remove cov from tensors API

---
 .../kmath/tensors/api/AnalyticTensorAlgebra.kt         | 10 ----------
 .../kscience/kmath/tensors/core/DoubleTensorAlgebra.kt | 10 +++++++++-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index 1db986e77..e58af14db 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -67,16 +67,6 @@ public interface AnalyticTensorAlgebra<T> : TensorPartialDivisionAlgebra<T> {
      */
     public fun Tensor<T>.variance(dim: Int, keepDim: Boolean): Tensor<T>
 
-    /**
-     * Returns the covariance matrix M of given vectors.
-     *
-     * M[i, j] contains covariance of i-th and j-th given vectors
-     *
-     * @param tensors the [List] of 1-dimensional tensors with same shape
-     * @return the covariance matrix
-     */
-    public fun cov(tensors: List<Tensor<T>>): Tensor<T>
-
     //For information: https://pytorch.org/docs/stable/generated/torch.exp.html
     public fun Tensor<T>.exp(): Tensor<T>
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index c1694644f..78989f1f3 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -629,7 +629,15 @@ public open class DoubleTensorAlgebra :
         return ((x - x.mean()) * (y - y.mean())).mean() * n / (n - 1)
     }
 
-    override fun cov(tensors: List<Tensor<Double>>): DoubleTensor {
+    /**
+     * Returns the covariance matrix M of given vectors.
+     *
+     * M[i, j] contains covariance of i-th and j-th given vectors
+     *
+     * @param tensors the [List] of 1-dimensional tensors with same shape
+     * @return the covariance matrix
+     */
+    public fun cov(tensors: List<Tensor<Double>>): DoubleTensor {
         check(tensors.isNotEmpty()) { "List must have at least 1 element" }
         val n = tensors.size
         val m = tensors[0].shape[0]
-- 
2.34.1


From c2047474016f8c7de92b83f741c7bb00630cc1a9 Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Thu, 13 May 2021 22:44:33 +0300
Subject: [PATCH 234/713] Reusing of existing power function

---
 .../kmath/benchmarks/BigIntBenchmark.kt       |  4 +-
 .../kscience/kmath/operations/Algebra.kt      | 20 ----------
 .../space/kscience/kmath/operations/BigInt.kt |  6 +--
 .../kmath/operations/algebraExtensions.kt     | 39 ++++++++++++-------
 .../kmath/operations/BigIntAlgebraTest.kt     |  8 +---
 .../kmath/operations/DoubleFieldTest.kt       | 12 ++++++
 6 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index 21b097609..749cd5e75 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -21,7 +21,7 @@ internal class BigIntBenchmark {
 
     val kmNumber = BigIntField.number(Int.MAX_VALUE)
     val jvmNumber = JBigIntegerField.number(Int.MAX_VALUE)
-    val largeKmNumber = BigIntField { number(11).pow(100_000UL) }
+    val largeKmNumber = BigIntField { number(11).pow(100_000U) }
     val largeJvmNumber: BigInteger = JBigIntegerField { number(11).pow(100_000) }
     val bigExponent = 50_000
 
@@ -67,7 +67,7 @@ internal class BigIntBenchmark {
 
     @Benchmark
     fun kmPower(blackhole: Blackhole) = BigIntField {
-        blackhole.consume(kmNumber.pow(bigExponent.toULong()))
+        blackhole.consume(kmNumber.pow(bigExponent.toUInt()))
     }
 
     @Benchmark
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index 8881ae93c..b444ed964 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -253,26 +253,6 @@ public interface Ring<T> : Group<T>, RingOperations<T> {
     public val one: T
 }
 
-@UnstableKMathAPI
-public fun <T> Ring<T>.pow(base: T, exponent: ULong): T = when {
-    this == zero && exponent > 0UL -> zero
-    this == one -> base
-    this == -one -> powWithoutOptimization(base, exponent % 2UL)
-    else -> powWithoutOptimization(base, exponent)
-}
-
-@UnstableKMathAPI
-public fun <T> Ring<T>.pow(base: T, exponent: UInt): T = pow(base, exponent.toULong())
-
-private fun <T> Ring<T>.powWithoutOptimization(base: T, exponent: ULong): T = when (exponent) {
-    0UL -> one
-    1UL -> base
-    else -> {
-        val pre = powWithoutOptimization(base, exponent shr 1).let { it * it }
-        if (exponent and 1UL == 0UL) pre else pre * base
-    }
-}
-
 /**
  * Represents field without without multiplicative and additive identities, i.e. algebraic structure with associative, binary, commutative operations
  * [add] and [multiply]; binary operation [divide] as multiplication of left operand by reciprocal of right one.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 0dcbbe567..924ef07f4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -98,11 +98,7 @@ public class BigInt internal constructor(
         else -> BigInt(sign, multiplyMagnitudeByUInt(magnitude, other))
     }
 
-    @UnstableKMathAPI
-    public fun pow(other: ULong): BigInt = BigIntField { pow(this@BigInt, other) }
-
-    @UnstableKMathAPI
-    public fun pow(other: UInt): BigInt = BigIntField { pow(this@BigInt, other) }
+    public fun pow(exponent: UInt): BigInt = BigIntField.power(this@BigInt, exponent)
 
     public operator fun times(other: Int): BigInt = when {
         other > 0 -> this * kotlin.math.abs(other).toUInt()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index b8670553d..9691c9d17 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -97,34 +97,45 @@ public fun <T, S> Sequence<T>.averageWith(space: S): T where S : Ring<T>, S : Sc
 //TODO optimized power operation
 
 /**
- * Raises [arg] to the natural power [power].
+ * Raises [arg] to the non-negative integer power [power].
+ *
+ * Special case: 0 ^ 0 is 1.
  *
  * @receiver the algebra to provide multiplication.
  * @param arg the base.
  * @param power the exponent.
  * @return the base raised to the power.
+ * @author Evgeniy Zhelenskiy
  */
-public fun <T> Ring<T>.power(arg: T, power: Int): T {
-    require(power >= 0) { "The power can't be negative." }
-    require(power != 0 || arg != zero) { "The $zero raised to $power is not defined." }
-    if (power == 0) return one
-    var res = arg
-    repeat(power - 1) { res *= arg }
-    return res
+public fun <T> Ring<T>.power(arg: T, power: UInt): T = when {
+    this == zero && power > 0U -> zero
+    this == one -> arg
+    this == -one -> powWithoutOptimization(arg, power % 2U)
+    else -> powWithoutOptimization(arg, power)
 }
 
+private fun <T> Ring<T>.powWithoutOptimization(base: T, exponent: UInt): T = when (exponent) {
+    0U -> one
+    1U -> base
+    else -> {
+        val pre = powWithoutOptimization(base, exponent shr 1).let { it * it }
+        if (exponent and 1U == 0U) pre else pre * base
+    }
+}
+
+
 /**
  * Raises [arg] to the integer power [power].
  *
+ * Special case: 0 ^ 0 is 1.
+ *
  * @receiver the algebra to provide multiplication and division.
  * @param arg the base.
  * @param power the exponent.
  * @return the base raised to the power.
- * @author Iaroslav Postovalov
+ * @author Iaroslav Postovalov, Evgeniy Zhelenskiy
  */
-public fun <T> Field<T>.power(arg: T, power: Int): T {
-    require(power != 0 || arg != zero) { "The $zero raised to $power is not defined." }
-    if (power == 0) return one
-    if (power < 0) return one / (this as Ring<T>).power(arg, -power)
-    return (this as Ring<T>).power(arg, power)
+public fun <T> Field<T>.power(arg: T, power: Int): T = when {
+    power < 0 -> one / (this as Ring<T>).power(arg, if (power == Int.MIN_VALUE) Int.MAX_VALUE.toUInt().inc() else (-power).toUInt())
+    else -> (this as Ring<T>).power(arg, power.toUInt())
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
index d3fca4351..0527f5252 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
@@ -27,18 +27,12 @@ internal class BigIntAlgebraTest {
     @Test
     fun testKBigIntegerRingPow() {
         for (num in -5..5)
-            for (exponent in 0U..10U) {
-                assertEquals(
-                    num.toDouble().pow(exponent.toInt()).toLong().toBigInt(),
-                    num.toBigInt().pow(exponent.toULong()),
-                    "$num ^ $exponent"
-                )
+            for (exponent in 0U..10U)
                 assertEquals(
                     num.toDouble().pow(exponent.toInt()).toLong().toBigInt(),
                     num.toBigInt().pow(exponent),
                     "$num ^ $exponent"
                 )
-            }
     }
 
     @Test
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
index c482dc978..7e689d079 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
@@ -18,4 +18,16 @@ internal class DoubleFieldTest {
         val sqrt = DoubleField { sqrt(25 * one) }
         assertEquals(5.0, sqrt)
     }
+
+    @Test
+    fun testPow() = DoubleField {
+        val num = 5 * one
+        assertEquals(5.0, power(num, 1))
+        assertEquals(25.0, power(num, 2))
+        assertEquals(1.0, power(num, 0))
+        assertEquals(0.2, power(num, -1))
+        assertEquals(0.04, power(num, -2))
+        assertEquals(0.0, power(num, Int.MIN_VALUE))
+        assertEquals(1.0, power(zero, 0))
+    }
 }
-- 
2.34.1


From bdb9ce6a59bf34b4ff21945f42a05c070752fcf7 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Fri, 14 May 2021 09:10:05 +0300
Subject: [PATCH 235/713] fixes to power

---
 .../kscience/kmath/operations/algebraExtensions.kt   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index 9691c9d17..338dc6a5c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -108,9 +108,9 @@ public fun <T, S> Sequence<T>.averageWith(space: S): T where S : Ring<T>, S : Sc
  * @author Evgeniy Zhelenskiy
  */
 public fun <T> Ring<T>.power(arg: T, power: UInt): T = when {
-    this == zero && power > 0U -> zero
-    this == one -> arg
-    this == -one -> powWithoutOptimization(arg, power % 2U)
+    arg == zero && power > 0U -> zero
+    arg == one -> arg
+    arg == -one -> powWithoutOptimization(arg, power % 2U)
     else -> powWithoutOptimization(arg, power)
 }
 
@@ -135,7 +135,7 @@ private fun <T> Ring<T>.powWithoutOptimization(base: T, exponent: UInt): T = whe
  * @return the base raised to the power.
  * @author Iaroslav Postovalov, Evgeniy Zhelenskiy
  */
-public fun <T> Field<T>.power(arg: T, power: Int): T = when {
-    power < 0 -> one / (this as Ring<T>).power(arg, if (power == Int.MIN_VALUE) Int.MAX_VALUE.toUInt().inc() else (-power).toUInt())
-    else -> (this as Ring<T>).power(arg, power.toUInt())
+public fun <T> Field<T>.power(arg: T, power: UInt): T = when {
+    power < 0 -> one / (this as Ring<T>).power(arg, power)
+    else -> (this as Ring<T>).power(arg, power)
 }
-- 
2.34.1


From 1b60f71ed0efbba385c3e8b65ab4147deff013db Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 14 May 2021 09:14:48 +0300
Subject: [PATCH 236/713] Revert "fixes to power"

This reverts commit bdb9ce6a
---
 .../kscience/kmath/operations/algebraExtensions.kt   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index 338dc6a5c..9691c9d17 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -108,9 +108,9 @@ public fun <T, S> Sequence<T>.averageWith(space: S): T where S : Ring<T>, S : Sc
  * @author Evgeniy Zhelenskiy
  */
 public fun <T> Ring<T>.power(arg: T, power: UInt): T = when {
-    arg == zero && power > 0U -> zero
-    arg == one -> arg
-    arg == -one -> powWithoutOptimization(arg, power % 2U)
+    this == zero && power > 0U -> zero
+    this == one -> arg
+    this == -one -> powWithoutOptimization(arg, power % 2U)
     else -> powWithoutOptimization(arg, power)
 }
 
@@ -135,7 +135,7 @@ private fun <T> Ring<T>.powWithoutOptimization(base: T, exponent: UInt): T = whe
  * @return the base raised to the power.
  * @author Iaroslav Postovalov, Evgeniy Zhelenskiy
  */
-public fun <T> Field<T>.power(arg: T, power: UInt): T = when {
-    power < 0 -> one / (this as Ring<T>).power(arg, power)
-    else -> (this as Ring<T>).power(arg, power)
+public fun <T> Field<T>.power(arg: T, power: Int): T = when {
+    power < 0 -> one / (this as Ring<T>).power(arg, if (power == Int.MIN_VALUE) Int.MAX_VALUE.toUInt().inc() else (-power).toUInt())
+    else -> (this as Ring<T>).power(arg, power.toUInt())
 }
-- 
2.34.1


From 1a615c503d4fd337474d761485ecdc285d681c83 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 14 May 2021 09:20:49 +0300
Subject: [PATCH 237/713] re-apply bigint fix

---
 .../space/kscience/kmath/operations/algebraExtensions.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index 9691c9d17..830c504f3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -108,9 +108,9 @@ public fun <T, S> Sequence<T>.averageWith(space: S): T where S : Ring<T>, S : Sc
  * @author Evgeniy Zhelenskiy
  */
 public fun <T> Ring<T>.power(arg: T, power: UInt): T = when {
-    this == zero && power > 0U -> zero
-    this == one -> arg
-    this == -one -> powWithoutOptimization(arg, power % 2U)
+    arg == zero && power > 0U -> zero
+    arg == one -> arg
+    arg == -one -> powWithoutOptimization(arg, power % 2U)
     else -> powWithoutOptimization(arg, power)
 }
 
-- 
2.34.1


From dc9ec54644c4d7b9675bfd9959ee2e1f84829152 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 14 May 2021 09:32:24 +0300
Subject: [PATCH 238/713] naming fix and doc update

---
 CHANGELOG.md                                  |  1 +
 kmath-core/api/kmath-core.api                 |  3 ++-
 .../space/kscience/kmath/operations/BigInt.kt |  2 +-
 .../kmath/operations/algebraExtensions.kt     | 22 +++++++++----------
 .../kmath/operations/BigIntOperationsTest.kt  | 14 +++++++-----
 .../kmath/operations/DoubleFieldTest.kt       | 14 ++++++------
 6 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 286be25e5..732cc87a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Extended operations for ND4J fields
 - Jupyter Notebook integration module (kmath-jupyter)
 - `@PerformancePitfall` annotation to mark possibly slow API
+- BigInt operation performance improvement and fixes by @zhelenskiy (#328)
 
 ### Changed
 - Exponential operations merged with hyperbolic functions
diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 14bc70a2a..7b09b668b 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -1020,7 +1020,7 @@ public final class space/kscience/kmath/operations/AlgebraExtensionsKt {
 	public static final fun averageWith (Ljava/lang/Iterable;Lspace/kscience/kmath/operations/Ring;)Ljava/lang/Object;
 	public static final fun averageWith (Lkotlin/sequences/Sequence;Lspace/kscience/kmath/operations/Ring;)Ljava/lang/Object;
 	public static final fun power (Lspace/kscience/kmath/operations/Field;Ljava/lang/Object;I)Ljava/lang/Object;
-	public static final fun power (Lspace/kscience/kmath/operations/Ring;Ljava/lang/Object;I)Ljava/lang/Object;
+	public static final fun power-jXDDuk8 (Lspace/kscience/kmath/operations/Ring;Ljava/lang/Object;I)Ljava/lang/Object;
 	public static final fun sum (Lspace/kscience/kmath/operations/Ring;Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun sum (Lspace/kscience/kmath/operations/Ring;Lkotlin/sequences/Sequence;)Ljava/lang/Object;
 	public static final fun sumWith (Ljava/lang/Iterable;Lspace/kscience/kmath/operations/Ring;)Ljava/lang/Object;
@@ -1050,6 +1050,7 @@ public final class space/kscience/kmath/operations/BigInt : java/lang/Comparable
 	public final fun modPow (Lspace/kscience/kmath/operations/BigInt;Lspace/kscience/kmath/operations/BigInt;)Lspace/kscience/kmath/operations/BigInt;
 	public final fun or (Lspace/kscience/kmath/operations/BigInt;)Lspace/kscience/kmath/operations/BigInt;
 	public final fun plus (Lspace/kscience/kmath/operations/BigInt;)Lspace/kscience/kmath/operations/BigInt;
+	public final fun pow-WZ4Q5Ns (I)Lspace/kscience/kmath/operations/BigInt;
 	public final fun rem (I)I
 	public final fun rem (Lspace/kscience/kmath/operations/BigInt;)Lspace/kscience/kmath/operations/BigInt;
 	public final fun shl (I)Lspace/kscience/kmath/operations/BigInt;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 924ef07f4..ac53c4d5e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -98,7 +98,7 @@ public class BigInt internal constructor(
         else -> BigInt(sign, multiplyMagnitudeByUInt(magnitude, other))
     }
 
-    public fun pow(exponent: UInt): BigInt = BigIntField.power(this@BigInt, exponent)
+    public fun pow(exponent: UInt): BigInt = BigIntField.power(this, exponent)
 
     public operator fun times(other: Int): BigInt = when {
         other > 0 -> this * kotlin.math.abs(other).toUInt()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index 830c504f3..422b1ae1a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -97,21 +97,21 @@ public fun <T, S> Sequence<T>.averageWith(space: S): T where S : Ring<T>, S : Sc
 //TODO optimized power operation
 
 /**
- * Raises [arg] to the non-negative integer power [power].
+ * Raises [arg] to the non-negative integer power [exponent].
  *
  * Special case: 0 ^ 0 is 1.
  *
  * @receiver the algebra to provide multiplication.
  * @param arg the base.
- * @param power the exponent.
+ * @param exponent the exponent.
  * @return the base raised to the power.
  * @author Evgeniy Zhelenskiy
  */
-public fun <T> Ring<T>.power(arg: T, power: UInt): T = when {
-    arg == zero && power > 0U -> zero
+public fun <T> Ring<T>.power(arg: T, exponent: UInt): T = when {
+    arg == zero && exponent > 0U -> zero
     arg == one -> arg
-    arg == -one -> powWithoutOptimization(arg, power % 2U)
-    else -> powWithoutOptimization(arg, power)
+    arg == -one -> powWithoutOptimization(arg, exponent % 2U)
+    else -> powWithoutOptimization(arg, exponent)
 }
 
 private fun <T> Ring<T>.powWithoutOptimization(base: T, exponent: UInt): T = when (exponent) {
@@ -125,17 +125,17 @@ private fun <T> Ring<T>.powWithoutOptimization(base: T, exponent: UInt): T = whe
 
 
 /**
- * Raises [arg] to the integer power [power].
+ * Raises [arg] to the integer power [exponent].
  *
  * Special case: 0 ^ 0 is 1.
  *
  * @receiver the algebra to provide multiplication and division.
  * @param arg the base.
- * @param power the exponent.
+ * @param exponent the exponent.
  * @return the base raised to the power.
  * @author Iaroslav Postovalov, Evgeniy Zhelenskiy
  */
-public fun <T> Field<T>.power(arg: T, power: Int): T = when {
-    power < 0 -> one / (this as Ring<T>).power(arg, if (power == Int.MIN_VALUE) Int.MAX_VALUE.toUInt().inc() else (-power).toUInt())
-    else -> (this as Ring<T>).power(arg, power.toUInt())
+public fun <T> Field<T>.power(arg: T, exponent: Int): T = when {
+    exponent < 0 -> one / (this as Ring<T>).power(arg, if (exponent == Int.MIN_VALUE) Int.MAX_VALUE.toUInt().inc() else (-exponent).toUInt())
+    else -> (this as Ring<T>).power(arg, exponent.toUInt())
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
index 9f35f7a69..26d6af224 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
@@ -7,7 +7,10 @@ package space.kscience.kmath.operations
 
 import kotlin.random.Random
 import kotlin.random.nextUInt
-import kotlin.test.*
+import kotlin.test.Test
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
 
 @kotlin.ExperimentalUnsignedTypes
 class BigIntOperationsTest {
@@ -153,14 +156,13 @@ class BigIntOperationsTest {
 
     @Test
     fun testKaratsuba() {
+        val random = Random(2222)
         val x = uintArrayOf(12U, 345U)
         val y = uintArrayOf(6U, 789U)
         assertContentEquals(BigInt.naiveMultiplyMagnitudes(x, y), BigInt.karatsubaMultiplyMagnitudes(x, y))
-        repeat(1000) {
-            val x1 = UIntArray(Random.nextInt(100, 1000)) { Random.nextUInt() }
-            val y1 = UIntArray(Random.nextInt(100, 1000)) { Random.nextUInt() }
-            assertContentEquals(BigInt.naiveMultiplyMagnitudes(x1, y1), BigInt.karatsubaMultiplyMagnitudes(x1, y1))
-        }
+        val x1 = UIntArray(Random.nextInt(100, 1000)) { random.nextUInt() }
+        val y1 = UIntArray(Random.nextInt(100, 1000)) { random.nextUInt() }
+        assertContentEquals(BigInt.naiveMultiplyMagnitudes(x1, y1), BigInt.karatsubaMultiplyMagnitudes(x1, y1))
     }
 
     @Test
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
index 7e689d079..76171fedd 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
@@ -22,12 +22,12 @@ internal class DoubleFieldTest {
     @Test
     fun testPow() = DoubleField {
         val num = 5 * one
-        assertEquals(5.0, power(num, 1))
-        assertEquals(25.0, power(num, 2))
-        assertEquals(1.0, power(num, 0))
-        assertEquals(0.2, power(num, -1))
-        assertEquals(0.04, power(num, -2))
-        assertEquals(0.0, power(num, Int.MIN_VALUE))
-        assertEquals(1.0, power(zero, 0))
+        assertEquals(5.0, power(num, 1), 0.01)
+        assertEquals(25.0, power(num, 2), 0.01)
+        assertEquals(1.0, power(num, 0), 0.01)
+        assertEquals(0.2, power(num, -1), 0.01)
+        assertEquals(0.04, power(num, -2), 0.01)
+        assertEquals(0.0, power(num, Int.MIN_VALUE), 0.01)
+        assertEquals(1.0, power(zero, 0), 0.01)
     }
 }
-- 
2.34.1


From cf555bc8ae6a233b33567fb4f95acfcdcb0379bb Mon Sep 17 00:00:00 2001
From: zhelenskiy <zhelenskiy2000@yandex.ru>
Date: Fri, 14 May 2021 10:48:57 +0300
Subject: [PATCH 239/713] TODO removed as I already added what neeed

---
 .../kotlin/space/kscience/kmath/operations/algebraExtensions.kt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index 422b1ae1a..7967aeadb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -94,8 +94,6 @@ public fun <T, S> Iterable<T>.averageWith(space: S): T where S : Ring<T>, S : Sc
 public fun <T, S> Sequence<T>.averageWith(space: S): T where S : Ring<T>, S : ScaleOperations<T> =
     space.average(this)
 
-//TODO optimized power operation
-
 /**
  * Raises [arg] to the non-negative integer power [exponent].
  *
-- 
2.34.1


From 6eb95f26eb68082fcc47462089fdee33a25eeb55 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 14 May 2021 12:11:37 +0300
Subject: [PATCH 240/713] Additional piecewise extension

---
 .../kotlin/space/kscience/kmath/functions/Piecewise.kt   | 9 +++++++++
 .../kscience/kmath/interpolation/SplineInterpolator.kt   | 8 +++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index 6d481e334..dae55502d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -79,4 +79,13 @@ public class OrderedPiecewisePolynomial<T : Comparable<T>>(delimiter: T) :
 public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.value(ring: C, arg: T): T? =
     findPiece(arg)?.value(ring, arg)
 
+/**
+ * Convert this polynomial to a function returning nullable value (null if argument is outside piecewise range).
+ */
 public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C): (T) -> T? = { value(ring, it) }
+
+/**
+ * Convert this polynomial to a function using [defaultValue] for arguments outside the piecewise range.
+ */
+public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C, defaultValue: T): (T) -> T =
+    { value(ring, it) ?: defaultValue }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
index f00b66a4c..2d2ff6f26 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -42,9 +42,11 @@ public class SplineInterpolator<T : Comparable<T>>(
             val g = 2.0 * (points.x[i + 1] - points.x[i - 1]) - h[i - 1] * mu[i - 1]
             mu[i] = h[i] / g
 
-            z[i] =
-                (3.0 * (points.y[i + 1] * h[i - 1] - points.x[i] * (points.x[i + 1] - points.x[i - 1]) + points.y[i - 1] * h[i]) / (h[i - 1] * h[i])
-                        - h[i - 1] * z[i - 1]) / g
+            z[i] = (3.0 * (points.y[i + 1] * h[i - 1]
+                    - points.x[i] * (points.x[i + 1] - points.x[i - 1])
+                    + points.y[i - 1] * h[i]) / (h[i - 1] * h[i])
+                    - h[i - 1] * z[i - 1]
+                    ) / g
         }
 
         // cubic spline coefficients --  b is linear, c quadratic, d is cubic (original y's are constants)
-- 
2.34.1


From fff737768764a4f1fecfe6ad165304be1e036e34 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 14 May 2021 12:42:27 +0300
Subject: [PATCH 241/713] ColumnarData returns nullable column

---
 CHANGELOG.md                                                  | 1 +
 .../kotlin/space/kscience/kmath/data/ColumnarData.kt          | 2 +-
 .../kotlin/space/kscience/kmath/data/XYColumnarData.kt        | 4 ++--
 .../kotlin/space/kscience/kmath/data/XYZColumnarData.kt       | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 732cc87a2..3a5bde44a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - Separated benchmarks and examples
 - Rewritten EJML module without ejml-simple
 - Stability of kmath-ast and kmath-kotilngrad promoted to EXPERIMENTAL.
+- ColumnarData returns nullable column
 
 ### Deprecated
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
index febf615a8..b1c7cacd3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
@@ -19,7 +19,7 @@ import space.kscience.kmath.structures.Buffer
 public interface ColumnarData<out T> {
     public val size: Int
 
-    public operator fun get(symbol: Symbol): Buffer<T>
+    public operator fun get(symbol: Symbol): Buffer<T>?
 }
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
index 56bb59826..bbd679ce9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
@@ -27,10 +27,10 @@ public interface XYColumnarData<T, out X : T, out Y : T> : ColumnarData<T> {
      */
     public val y: Buffer<Y>
 
-    override fun get(symbol: Symbol): Buffer<T> = when (symbol) {
+    override fun get(symbol: Symbol): Buffer<T>? = when (symbol) {
         Symbol.x -> x
         Symbol.y -> y
-        else -> error("A column for symbol $symbol not found")
+        else -> null
     }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
index d76a44e9e..3972429a5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
@@ -17,10 +17,10 @@ import space.kscience.kmath.structures.Buffer
 public interface XYZColumnarData<T, out X : T, out Y : T, out Z : T> : XYColumnarData<T, X, Y> {
     public val z: Buffer<Z>
 
-    override fun get(symbol: Symbol): Buffer<T> = when (symbol) {
+    override fun get(symbol: Symbol): Buffer<T>? = when (symbol) {
         Symbol.x -> x
         Symbol.y -> y
         Symbol.z -> z
-        else -> error("A column for symbol $symbol not found")
+        else -> null
     }
 }
\ No newline at end of file
-- 
2.34.1


From 42d130f69c866f0d2456cf0698c83dab2e1f6bc7 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 14 May 2021 15:59:17 +0300
Subject: [PATCH 242/713] Build tools update. Cleanup

---
 build.gradle.kts                              |   2 +-
 .../kmath/tensors/DataSetNormalization.kt     |  44 +++---
 .../tensors/LinearSystemSolvingWithLUP.kt     | 134 +++++++++---------
 .../kscience/kmath/tensors/NeuralNetwork.kt   | 112 +++++++--------
 .../space/kscience/kmath/tensors/PCA.kt       |  96 ++++++-------
 .../space/kscience/kmath/data/ColumnarData.kt |   3 +
 settings.gradle.kts                           |   2 +-
 7 files changed, 191 insertions(+), 202 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 406a46810..e14d303fc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-8"
+    version = "0.3.0-dev-9"
 }
 
 subprojects {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
index 6fbf16a91..74795cc68 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
@@ -11,36 +11,32 @@ import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
 
 // Dataset normalization
 
-fun main() {
+fun main() = BroadcastDoubleTensorAlgebra {  // work in context with broadcast methods
+    // take dataset of 5-element vectors from normal distribution
+    val dataset = randomNormal(intArrayOf(100, 5)) * 1.5 // all elements from N(0, 1.5)
 
-    // work in context with broadcast methods
-    BroadcastDoubleTensorAlgebra {
-        // take dataset of 5-element vectors from normal distribution
-        val dataset = randomNormal(intArrayOf(100, 5)) * 1.5 // all elements from N(0, 1.5)
-
-        dataset += fromArray(
-            intArrayOf(5),
-            doubleArrayOf(0.0, 1.0, 1.5, 3.0, 5.0) // rows means
-        )
+    dataset += fromArray(
+        intArrayOf(5),
+        doubleArrayOf(0.0, 1.0, 1.5, 3.0, 5.0) // rows means
+    )
 
 
-        // find out mean and standard deviation of each column
-        val mean = dataset.mean(0, false)
-        val std = dataset.std(0, false)
+    // find out mean and standard deviation of each column
+    val mean = dataset.mean(0, false)
+    val std = dataset.std(0, false)
 
-        println("Mean:\n$mean")
-        println("Standard deviation:\n$std")
+    println("Mean:\n$mean")
+    println("Standard deviation:\n$std")
 
-        // also we can calculate other statistic as minimum and maximum of rows
-        println("Minimum:\n${dataset.min(0, false)}")
-        println("Maximum:\n${dataset.max(0, false)}")
+    // also we can calculate other statistic as minimum and maximum of rows
+    println("Minimum:\n${dataset.min(0, false)}")
+    println("Maximum:\n${dataset.max(0, false)}")
 
-        // now we can scale dataset with mean normalization
-        val datasetScaled = (dataset - mean) / std
+    // now we can scale dataset with mean normalization
+    val datasetScaled = (dataset - mean) / std
 
-        // find out mean and std of scaled dataset
+    // find out mean and std of scaled dataset
 
-        println("Mean of scaled:\n${datasetScaled.mean(0, false)}")
-        println("Mean of scaled:\n${datasetScaled.std(0, false)}")
-    }
+    println("Mean of scaled:\n${datasetScaled.mean(0, false)}")
+    println("Mean of scaled:\n${datasetScaled.std(0, false)}")
 }
\ No newline at end of file
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
index 78370b517..6453ca44e 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
@@ -6,92 +6,88 @@
 package space.kscience.kmath.tensors
 
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.DoubleTensor
 
 // solving linear system with LUP decomposition
 
-fun main () {
+fun main() = BroadcastDoubleTensorAlgebra {// work in context with linear operations
 
-    // work in context with linear operations
-    BroadcastDoubleTensorAlgebra {
+    // set true value of x
+    val trueX = fromArray(
+        intArrayOf(4),
+        doubleArrayOf(-2.0, 1.5, 6.8, -2.4)
+    )
 
-        // set true value of x
-        val trueX = fromArray(
-            intArrayOf(4),
-            doubleArrayOf(-2.0, 1.5, 6.8, -2.4)
+    // and A matrix
+    val a = fromArray(
+        intArrayOf(4, 4),
+        doubleArrayOf(
+            0.5, 10.5, 4.5, 1.0,
+            8.5, 0.9, 12.8, 0.1,
+            5.56, 9.19, 7.62, 5.45,
+            1.0, 2.0, -3.0, -2.5
         )
+    )
 
-        // and A matrix
-        val a = fromArray(
-            intArrayOf(4, 4),
-            doubleArrayOf(
-                0.5, 10.5, 4.5, 1.0,
-                8.5, 0.9, 12.8, 0.1,
-                5.56, 9.19, 7.62, 5.45,
-                1.0, 2.0, -3.0, -2.5
-            )
-        )
+    // calculate y value
+    val b = a dot trueX
 
-        // calculate y value
-        val b = a dot trueX
+    // check out A and b
+    println("A:\n$a")
+    println("b:\n$b")
 
-        // check out A and b
-        println("A:\n$a")
-        println("b:\n$b")
+    // solve `Ax = b` system using LUP decomposition
 
-        // solve `Ax = b` system using LUP decomposition
+    // get P, L, U such that PA = LU
+    val (p, l, u) = a.lu()
 
-        // get P, L, U such that PA = LU
-        val (p, l, u) = a.lu()
+    // check that P is permutation matrix
+    println("P:\n$p")
+    // L is lower triangular matrix and U is upper triangular matrix
+    println("L:\n$l")
+    println("U:\n$u")
+    // and PA = LU
+    println("PA:\n${p dot a}")
+    println("LU:\n${l dot u}")
 
-        // check that P is permutation matrix
-        println("P:\n$p")
-        // L is lower triangular matrix and U is upper triangular matrix
-        println("L:\n$l")
-        println("U:\n$u")
-        // and PA = LU
-        println("PA:\n${p dot a}")
-        println("LU:\n${l dot u}")
-
-     /* Ax = b;
-        PAx = Pb;
-        LUx = Pb;
-        let y = Ux, then
-        Ly = Pb -- this system can be easily solved, since the matrix L is lower triangular;
-        Ux = y can be solved the same way, since the matrix L is upper triangular
-         */
+    /* Ax = b;
+       PAx = Pb;
+       LUx = Pb;
+       let y = Ux, then
+       Ly = Pb -- this system can be easily solved, since the matrix L is lower triangular;
+       Ux = y can be solved the same way, since the matrix L is upper triangular
+        */
 
 
 
-        // this function returns solution x of a system lx = b, l should be lower triangular
-        fun solveLT(l: DoubleTensor, b: DoubleTensor): DoubleTensor {
-            val n = l.shape[0]
-            val x = zeros(intArrayOf(n))
-            for (i in 0 until n){
-                x[intArrayOf(i)] = (b[intArrayOf(i)] -  l[i].dot(x).value()) / l[intArrayOf(i, i)]
-            }
-            return x
-        }
-
-        val y = solveLT(l, p dot b)
-
-        // solveLT(l, b) function can be easily adapted for upper triangular matrix by the permutation matrix revMat
-        // create it by placing ones on side diagonal
-        val revMat = u.zeroesLike()
-        val n = revMat.shape[0]
+    // this function returns solution x of a system lx = b, l should be lower triangular
+    fun solveLT(l: DoubleTensor, b: DoubleTensor): DoubleTensor {
+        val n = l.shape[0]
+        val x = zeros(intArrayOf(n))
         for (i in 0 until n) {
-            revMat[intArrayOf(i, n - 1 - i)] = 1.0
+            x[intArrayOf(i)] = (b[intArrayOf(i)] - l[i].dot(x).value()) / l[intArrayOf(i, i)]
         }
-
-        // solution of system ux = b, u should be upper triangular
-        fun solveUT(u: DoubleTensor, b: DoubleTensor): DoubleTensor = revMat dot solveLT(
-            revMat dot u dot revMat, revMat dot b
-        )
-
-        val x = solveUT(u, y)
-
-        println("True x:\n$trueX")
-        println("x founded with LU method:\n$x")
+        return x
     }
+
+    val y = solveLT(l, p dot b)
+
+    // solveLT(l, b) function can be easily adapted for upper triangular matrix by the permutation matrix revMat
+    // create it by placing ones on side diagonal
+    val revMat = u.zeroesLike()
+    val n = revMat.shape[0]
+    for (i in 0 until n) {
+        revMat[intArrayOf(i, n - 1 - i)] = 1.0
+    }
+
+    // solution of system ux = b, u should be upper triangular
+    fun solveUT(u: DoubleTensor, b: DoubleTensor): DoubleTensor = revMat dot solveLT(
+        revMat dot u dot revMat, revMat dot b
+    )
+
+    val x = solveUT(u, y)
+
+    println("True x:\n$trueX")
+    println("x founded with LU method:\n$x")
 }
\ No newline at end of file
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
index 5b3c2e1cd..b262bee02 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
@@ -25,7 +25,7 @@ interface Layer {
 // activation layer
 open class Activation(
     val activation: (DoubleTensor) -> DoubleTensor,
-    val activationDer: (DoubleTensor) -> DoubleTensor
+    val activationDer: (DoubleTensor) -> DoubleTensor,
 ) : Layer {
     override fun forward(input: DoubleTensor): DoubleTensor {
         return activation(input)
@@ -62,7 +62,7 @@ class Sigmoid : Activation(::sigmoid, ::sigmoidDer)
 class Dense(
     private val inputUnits: Int,
     private val outputUnits: Int,
-    private val learningRate: Double = 0.1
+    private val learningRate: Double = 0.1,
 ) : Layer {
 
     private val weights: DoubleTensor = DoubleTensorAlgebra {
@@ -74,8 +74,8 @@ class Dense(
 
     private val bias: DoubleTensor = DoubleTensorAlgebra { zeros(intArrayOf(outputUnits)) }
 
-    override fun forward(input: DoubleTensor): DoubleTensor {
-        return BroadcastDoubleTensorAlgebra { (input dot weights) + bias }
+    override fun forward(input: DoubleTensor): DoubleTensor = BroadcastDoubleTensorAlgebra {
+        (input dot weights) + bias
     }
 
     override fun backward(input: DoubleTensor, outputError: DoubleTensor): DoubleTensor = DoubleTensorAlgebra {
@@ -116,7 +116,7 @@ class NeuralNetwork(private val layers: List<Layer>) {
             onesForAnswers[intArrayOf(index, label)] = 1.0
         }
 
-        val softmaxValue =  yPred.exp() / yPred.exp().sum(dim = 1, keepDim = true)
+        val softmaxValue = yPred.exp() / yPred.exp().sum(dim = 1, keepDim = true)
 
         (-onesForAnswers + softmaxValue) / (yPred.shape[0].toDouble())
     }
@@ -175,67 +175,65 @@ class NeuralNetwork(private val layers: List<Layer>) {
 
 
 @OptIn(ExperimentalStdlibApi::class)
-fun main() {
-    BroadcastDoubleTensorAlgebra {
-        val features = 5
-        val sampleSize = 250
-        val trainSize = 180
-        //val testSize = sampleSize - trainSize
+fun main() = BroadcastDoubleTensorAlgebra {
+    val features = 5
+    val sampleSize = 250
+    val trainSize = 180
+    //val testSize = sampleSize - trainSize
 
-        // take sample of features from normal distribution
-        val x = randomNormal(intArrayOf(sampleSize, features), seed) * 2.5
+    // take sample of features from normal distribution
+    val x = randomNormal(intArrayOf(sampleSize, features), seed) * 2.5
 
-        x += fromArray(
-            intArrayOf(5),
-            doubleArrayOf(0.0, -1.0, -2.5, -3.0, 5.5) // rows means
-        )
+    x += fromArray(
+        intArrayOf(5),
+        doubleArrayOf(0.0, -1.0, -2.5, -3.0, 5.5) // rows means
+    )
 
 
-        // define class like '1' if the sum of features > 0 and '0' otherwise
-        val y = fromArray(
-            intArrayOf(sampleSize, 1),
-            DoubleArray(sampleSize) { i ->
-                if (x[i].sum() > 0.0) {
-                    1.0
-                } else {
-                    0.0
-                }
+    // define class like '1' if the sum of features > 0 and '0' otherwise
+    val y = fromArray(
+        intArrayOf(sampleSize, 1),
+        DoubleArray(sampleSize) { i ->
+            if (x[i].sum() > 0.0) {
+                1.0
+            } else {
+                0.0
             }
-        )
-
-        // split train ans test
-        val trainIndices = (0 until trainSize).toList().toIntArray()
-        val testIndices = (trainSize until sampleSize).toList().toIntArray()
-
-        val xTrain = x.rowsByIndices(trainIndices)
-        val yTrain = y.rowsByIndices(trainIndices)
-
-        val xTest = x.rowsByIndices(testIndices)
-        val yTest = y.rowsByIndices(testIndices)
-
-        // build model
-        val layers = buildList {
-            add(Dense(features, 64))
-            add(ReLU())
-            add(Dense(64, 16))
-            add(ReLU())
-            add(Dense(16, 2))
-            add(Sigmoid())
         }
-        val model = NeuralNetwork(layers)
+    )
 
-        // fit it with train data
-        model.fit(xTrain, yTrain, batchSize = 20, epochs = 10)
+    // split train ans test
+    val trainIndices = (0 until trainSize).toList().toIntArray()
+    val testIndices = (trainSize until sampleSize).toList().toIntArray()
 
-        // make prediction
-        val prediction = model.predict(xTest)
+    val xTrain = x.rowsByIndices(trainIndices)
+    val yTrain = y.rowsByIndices(trainIndices)
 
-        // process raw prediction via argMax
-        val predictionLabels = prediction.argMax(1, true)
-
-        // find out accuracy
-        val acc = accuracy(yTest, predictionLabels)
-        println("Test accuracy:$acc")
+    val xTest = x.rowsByIndices(testIndices)
+    val yTest = y.rowsByIndices(testIndices)
 
+    // build model
+    val layers = buildList {
+        add(Dense(features, 64))
+        add(ReLU())
+        add(Dense(64, 16))
+        add(ReLU())
+        add(Dense(16, 2))
+        add(Sigmoid())
     }
+    val model = NeuralNetwork(layers)
+
+    // fit it with train data
+    model.fit(xTrain, yTrain, batchSize = 20, epochs = 10)
+
+    // make prediction
+    val prediction = model.predict(xTest)
+
+    // process raw prediction via argMax
+    val predictionLabels = prediction.argMax(1, true)
+
+    // find out accuracy
+    val acc = accuracy(yTest, predictionLabels)
+    println("Test accuracy:$acc")
+
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index f8ac13d3f..e47b87177 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -11,68 +11,64 @@ import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
 
 // simple PCA
 
-fun main(){
+fun main() = BroadcastDoubleTensorAlgebra {  // work in context with broadcast methods
     val seed = 100500L
 
-    // work in context with broadcast methods
-    BroadcastDoubleTensorAlgebra {
+    // assume x is range from 0 until 10
+    val x = fromArray(
+        intArrayOf(10),
+        (0 until 10).toList().map { it.toDouble() }.toDoubleArray()
+    )
 
-        // assume x is range from 0 until 10
-        val x = fromArray(
-            intArrayOf(10),
-            (0 until 10).toList().map { it.toDouble() }.toDoubleArray()
-        )
+    // take y dependent on x with noise
+    val y = 2.0 * x + (3.0 + x.randomNormalLike(seed) * 1.5)
 
-        // take y dependent on x with noise
-        val y = 2.0 * x + (3.0 + x.randomNormalLike(seed) * 1.5)
+    println("x:\n$x")
+    println("y:\n$y")
 
-        println("x:\n$x")
-        println("y:\n$y")
+    // stack them into single dataset
+    val dataset = stack(listOf(x, y)).transpose()
 
-        // stack them into single dataset
-        val dataset = stack(listOf(x, y)).transpose()
+    // normalize both x and y
+    val xMean = x.mean()
+    val yMean = y.mean()
 
-        // normalize both x and y
-        val xMean = x.mean()
-        val yMean = y.mean()
+    val xStd = x.std()
+    val yStd = y.std()
 
-        val xStd = x.std()
-        val yStd = y.std()
+    val xScaled = (x - xMean) / xStd
+    val yScaled = (y - yMean) / yStd
 
-        val xScaled = (x - xMean) / xStd
-        val yScaled = (y - yMean) / yStd
+    // save means ans standard deviations for further recovery
+    val mean = fromArray(
+        intArrayOf(2),
+        doubleArrayOf(xMean, yMean)
+    )
+    println("Means:\n$mean")
 
-        // save means ans standard deviations for further recovery
-        val mean = fromArray(
-            intArrayOf(2),
-            doubleArrayOf(xMean, yMean)
-        )
-        println("Means:\n$mean")
+    val std = fromArray(
+        intArrayOf(2),
+        doubleArrayOf(xStd, yStd)
+    )
+    println("Standard deviations:\n$std")
 
-        val std = fromArray(
-            intArrayOf(2),
-            doubleArrayOf(xStd, yStd)
-        )
-        println("Standard deviations:\n$std")
+    // calculate the covariance matrix of scaled x and y
+    val covMatrix = cov(listOf(xScaled, yScaled))
+    println("Covariance matrix:\n$covMatrix")
 
-        // calculate the covariance matrix of scaled x and y
-        val covMatrix = cov(listOf(xScaled, yScaled))
-        println("Covariance matrix:\n$covMatrix")
+    // and find out eigenvector of it
+    val (_, evecs) = covMatrix.symEig()
+    val v = evecs[0]
+    println("Eigenvector:\n$v")
 
-        // and find out eigenvector of it
-        val (_, evecs) = covMatrix.symEig()
-        val v = evecs[0]
-        println("Eigenvector:\n$v")
+    // reduce dimension of dataset
+    val datasetReduced  = v dot stack(listOf(xScaled, yScaled))
+    println("Reduced data:\n$datasetReduced")
 
-        // reduce dimension of dataset
-        val datasetReduced  = v dot stack(listOf(xScaled, yScaled))
-        println("Reduced data:\n$datasetReduced")
-
-        // we can restore original data from reduced data.
-        // for example, find 7th element of dataset
-        val n = 7
-        val restored = (datasetReduced[n] dot v.view(intArrayOf(1, 2))) * std + mean
-        println("Original value:\n${dataset[n]}")
-        println("Restored value:\n$restored")
-    }
+    // we can restore original data from reduced data.
+    // for example, find 7th element of dataset
+    val n = 7
+    val restored = (datasetReduced[n] dot v.view(intArrayOf(1, 2))) * std + mean
+    println("Original value:\n${dataset[n]}")
+    println("Restored value:\n$restored")
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
index b1c7cacd3..f5193ecd2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
@@ -19,6 +19,9 @@ import space.kscience.kmath.structures.Buffer
 public interface ColumnarData<out T> {
     public val size: Int
 
+    /**
+     * Provide a column by symbol or null if column with given symbol is not defined
+     */
     public operator fun get(symbol: Symbol): Buffer<T>?
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 27e74c902..7ebfe1f59 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
         maven("https://repo.kotlin.link")
     }
 
-    val toolsVersion = "0.9.6"
+    val toolsVersion = "0.9.7"
     val kotlinVersion = "1.5.0"
 
     plugins {
-- 
2.34.1


From b94172fd2208c6b27447dc8265116a3f1b31ee82 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Fri, 14 May 2021 21:15:24 +0700
Subject: [PATCH 243/713] Link to Kotlingrad documentation

---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 406a46810..1b9eb2801 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -32,6 +32,7 @@ subprojects {
                 externalDocumentationLink("https://commons.apache.org/proper/commons-math/javadocs/api-3.6.1/")
                 externalDocumentationLink("https://deeplearning4j.org/api/latest/")
                 externalDocumentationLink("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
+                externalDocumentationLink("https://breandan.net/kotlingrad/kotlingrad/kotlingrad/")
             }
         }
     }
-- 
2.34.1


From b33c68e315c086d91446bec4f7554cd32d6b82ca Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Fri, 14 May 2021 21:47:21 +0700
Subject: [PATCH 244/713] Link to Kotlingrad documentation

---
 build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1b9eb2801..63fddae3d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -27,12 +27,12 @@ subprojects {
 
             dokkaSourceSets.all {
                 val readmeFile = File(this@subprojects.projectDir, "README.md")
-                if (readmeFile.exists()) includes.setFrom(includes + readmeFile.absolutePath)
+                if (readmeFile.exists()) includes.from(readmeFile.absolutePath)
                 externalDocumentationLink("http://ejml.org/javadoc/")
                 externalDocumentationLink("https://commons.apache.org/proper/commons-math/javadocs/api-3.6.1/")
                 externalDocumentationLink("https://deeplearning4j.org/api/latest/")
                 externalDocumentationLink("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
-                externalDocumentationLink("https://breandan.net/kotlingrad/kotlingrad/kotlingrad/")
+                externalDocumentationLink("https://breandan.net/kotlingrad/kotlingrad/", "https://breandan.net/kotlingrad/kotlingrad/kotlingrad/package-list")
             }
         }
     }
-- 
2.34.1


From 6f39b38a7203d7b40d794d1682c1cf18d546defc Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 16 May 2021 13:59:37 +0300
Subject: [PATCH 245/713] Refactor integrator API.

---
 .../kscience/kmath/functions/integrate.kt     |  4 +--
 .../kmath/functions/matrixIntegration.kt      |  4 +--
 .../integration/GaussRuleIntegrator.kt        |  2 +-
 .../kmath/integration/GaussIntegrator.kt      | 20 +++++--------
 .../kmath/integration/UnivariateIntegrand.kt  | 28 +++++++++++--------
 .../kmath/integration/GaussIntegralTest.kt    |  4 +--
 6 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
index 6990e8c8f..73770726b 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
@@ -5,8 +5,6 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.integration.integrate
-import space.kscience.kmath.integration.value
 import space.kscience.kmath.operations.DoubleField
 import kotlin.math.pow
 
@@ -18,5 +16,5 @@ fun main() {
     val result = DoubleField.integrate(0.0..10.0, function = function)
 
     //the value is nullable because in some cases the integration could not succeed
-    println(result.value)
+    println(result.valueOrNull)
 }
\ No newline at end of file
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index 8020df8f6..184672044 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -5,8 +5,6 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.integration.integrate
-import space.kscience.kmath.integration.value
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.nd
 import space.kscience.kmath.operations.DoubleField
@@ -27,6 +25,6 @@ fun main(): Unit = DoubleField {
         val result = integrate(0.0..10.0, function = function)
 
         //the value is nullable because in some cases the integration could not succeed
-        println(result.value)
+        println(result.valueOrNull)
     }
 }
\ No newline at end of file
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt
index 1c9915563..304fdec8f 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt
@@ -78,6 +78,6 @@ public class GaussRuleIntegrator(
             function: (Double) -> Double,
         ): Double = GaussRuleIntegrator(numPoints, type).integrate(
             UnivariateIntegrand(function, IntegrationRange(range))
-        ).value!!
+        ).valueOrNull!!
     }
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index ae82a40be..d6e716371 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -66,31 +66,25 @@ public class GaussIntegrator<T : Any>(
         return integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + points.size)
     }
 
-    public companion object {
-
-    }
+    public companion object
 }
 
 /**
- * Integrate [T]-valued univariate function using provided set of [IntegrandFeature]
- * Following features are evaluated:
+ * Create a Gauss-Legendre integrator for this field
+ * Following integrand features are accepted:
  * * [GaussIntegratorRuleFactory] - A factory for computing the Gauss integration rule. By default uses [GaussLegendreRuleFactory]
  * * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
  * * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
  * * [UnivariateIntegrandRanges] - Set of ranges and number of points per range. Defaults to given [IntegrationRange] and [IntegrandMaxCalls]
  */
-@UnstableKMathAPI
-public fun <T : Any> Field<T>.integrate(
-    vararg features: IntegrandFeature,
-    function: (Double) -> T,
-): UnivariateIntegrand<T> = GaussIntegrator(this).integrate(UnivariateIntegrand(function, *features))
+public val <T:Any> Field<T>.integrator: GaussIntegrator<T> get() = GaussIntegrator(this)
 
 
 /**
- * Use [GaussIntegrator.Companion.integrate] to integrate the function in the current algebra with given [range] and [numPoints]
+ * Use [integrate] to integrate the function in the current algebra with given [range] and [numPoints]
  */
 @UnstableKMathAPI
-public fun <T : Any> Field<T>.integrate(
+public fun <T : Any> GaussIntegrator<T>.integrate(
     range: ClosedRange<Double>,
     order: Int = 10,
     intervals: Int = 10,
@@ -104,7 +98,7 @@ public fun <T : Any> Field<T>.integrate(
     val ranges = UnivariateIntegrandRanges(
         (0 until intervals).map { i -> (rangeSize * i)..(rangeSize * (i + 1)) to order }
     )
-    return GaussIntegrator(this).integrate(
+    return integrate(
         UnivariateIntegrand(
             function,
             IntegrationRange(range),
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index 51ea57a33..3cafc9782 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -35,37 +35,41 @@ public typealias UnivariateIntegrator<T> = Integrator<UnivariateIntegrand<T>>
 @JvmInline
 public value class IntegrationRange(public val range: ClosedRange<Double>) : IntegrandFeature
 
-public val <T : Any> UnivariateIntegrand<T>.value: T? get() = getFeature<IntegrandValue<T>>()?.value
+/**
+ * Value of the integrand if it is present or null
+ */
+public val <T : Any> UnivariateIntegrand<T>.valueOrNull: T? get() = getFeature<IntegrandValue<T>>()?.value
+
+/**
+ * Value of the integrand or error
+ */
+public val <T : Any> UnivariateIntegrand<T>.value: T get() = valueOrNull ?: error("No value in the integrand")
 
 /**
  * A shortcut method to integrate a [function] in [range] with additional [features].
  * The [function] is placed in the end position to allow passing a lambda.
  */
 @UnstableKMathAPI
-public fun UnivariateIntegrator<Double>.integrate(
+public fun <T: Any> UnivariateIntegrator<T>.integrate(
     range: ClosedRange<Double>,
     vararg features: IntegrandFeature,
-    function: (Double) -> Double,
-): Double = integrate(
-    UnivariateIntegrand(function, IntegrationRange(range), *features)
-).value ?: error("Unexpected: no value after integration.")
+    function: (Double) -> T,
+): UnivariateIntegrand<T> = integrate(UnivariateIntegrand(function, IntegrationRange(range), *features))
 
 /**
  * A shortcut method to integrate a [function] in [range] with additional [features].
  * The [function] is placed in the end position to allow passing a lambda.
  */
 @UnstableKMathAPI
-public fun UnivariateIntegrator<Double>.integrate(
+public fun <T: Any> UnivariateIntegrator<T>.integrate(
     range: ClosedRange<Double>,
     featureBuilder: MutableList<IntegrandFeature>.() -> Unit = {},
-    function: (Double) -> Double,
-): Double {
+    function: (Double) -> T,
+): UnivariateIntegrand<T> {
     //TODO use dedicated feature builder class instead or add extensions to MutableList<IntegrandFeature>
     val features = buildList {
         featureBuilder()
         add(IntegrationRange(range))
     }
-    return integrate(
-        UnivariateIntegrand(function, *features.toTypedArray())
-    ).value ?: error("Unexpected: no value after integration.")
+    return integrate(UnivariateIntegrand(function, *features.toTypedArray()))
 }
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
index 195711452..b611b3f65 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
@@ -19,7 +19,7 @@ class GaussIntegralTest {
         val res = DoubleField.integrate(0.0..2 * PI) { x ->
             sin(x)
         }
-        assertEquals(0.0, res.value!!, 1e-2)
+        assertEquals(0.0, res.valueOrNull!!, 1e-2)
     }
 
     @Test
@@ -31,7 +31,7 @@ class GaussIntegralTest {
                 0.0
             }
         }
-        assertEquals(20.0, res.value!!, 0.5)
+        assertEquals(20.0, res.valueOrNull!!, 0.5)
     }
 
 
-- 
2.34.1


From d1e76175b79bec4e41822cccc596019975e84a89 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 16 May 2021 14:09:21 +0300
Subject: [PATCH 246/713] Refactor integrator API.

---
 .../kotlin/space/kscience/kmath/functions/integrate.kt     | 7 +++++--
 .../space/kscience/kmath/functions/matrixIntegration.kt    | 7 +++++--
 .../kscience/kmath/commons/integration/IntegrationTest.kt  | 5 +++--
 .../space/kscience/kmath/integration/GaussIntegrator.kt    | 6 ++++--
 .../space/kscience/kmath/integration/GaussIntegralTest.kt  | 4 ++--
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
index 73770726b..8d5349bce 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
@@ -5,6 +5,9 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.integration.integrate
+import space.kscience.kmath.integration.integrator
+import space.kscience.kmath.integration.value
 import space.kscience.kmath.operations.DoubleField
 import kotlin.math.pow
 
@@ -13,8 +16,8 @@ fun main() {
     val function: UnivariateFunction<Double> = { x -> 3 * x.pow(2) + 2 * x + 1 }
 
     //get the result of the integration
-    val result = DoubleField.integrate(0.0..10.0, function = function)
+    val result = DoubleField.integrator.integrate(0.0..10.0, function = function)
 
     //the value is nullable because in some cases the integration could not succeed
-    println(result.valueOrNull)
+    println(result.value)
 }
\ No newline at end of file
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index 184672044..601a0e3c4 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -5,6 +5,9 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.integration.integrate
+import space.kscience.kmath.integration.integrator
+import space.kscience.kmath.integration.value
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.nd
 import space.kscience.kmath.operations.DoubleField
@@ -22,9 +25,9 @@ fun main(): Unit = DoubleField {
         val function: (Double) -> StructureND<Double> = { x: Double -> 3 * number(x).pow(2) + 2 * diagonal(x) + 1 }
 
         //get the result of the integration
-        val result = integrate(0.0..10.0, function = function)
+        val result = integrator.integrate(0.0..10.0, function = function)
 
         //the value is nullable because in some cases the integration could not succeed
-        println(result.valueOrNull)
+        println(result.value)
     }
 }
\ No newline at end of file
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
index 97dc94d1d..c5573fef1 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.commons.integration
 
 import org.junit.jupiter.api.Test
 import space.kscience.kmath.integration.integrate
+import space.kscience.kmath.integration.value
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField.sin
 import kotlin.math.PI
@@ -19,7 +20,7 @@ internal class IntegrationTest {
 
     @Test
     fun simpson() {
-        val res = CMIntegrator.simpson().integrate(0.0..2 * PI, function = function)
+        val res = CMIntegrator.simpson().integrate(0.0..2 * PI, function = function).value
         assertTrue { abs(res) < 1e-3 }
     }
 
@@ -28,7 +29,7 @@ internal class IntegrationTest {
         val res = CMIntegrator.simpson().integrate(0.0..PI, {
             targetRelativeAccuracy = 1e-4
             targetAbsoluteAccuracy = 1e-4
-        }, function)
+        }, function).value
         assertTrue { abs(res - 2) < 1e-3 }
         assertTrue { abs(res - 2) > 1e-12 }
     }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index d6e716371..0038ca0f2 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -6,7 +6,9 @@ package space.kscience.kmath.integration
 
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
-import space.kscience.kmath.structures.*
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.asBuffer
+import space.kscience.kmath.structures.indices
 
 /**
  * Set of univariate integration ranges. First components correspond to ranges themselves, second components to number of
@@ -81,7 +83,7 @@ public val <T:Any> Field<T>.integrator: GaussIntegrator<T> get() = GaussIntegrat
 
 
 /**
- * Use [integrate] to integrate the function in the current algebra with given [range] and [numPoints]
+ * Integrate using [intervals] segments with Gauss-Legendre rule of [order] order
  */
 @UnstableKMathAPI
 public fun <T : Any> GaussIntegrator<T>.integrate(
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
index b611b3f65..1f9f7aedf 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
@@ -16,7 +16,7 @@ import kotlin.test.assertEquals
 class GaussIntegralTest {
     @Test
     fun gaussSin() {
-        val res = DoubleField.integrate(0.0..2 * PI) { x ->
+        val res = DoubleField.integrator.integrate(0.0..2 * PI) { x ->
             sin(x)
         }
         assertEquals(0.0, res.valueOrNull!!, 1e-2)
@@ -24,7 +24,7 @@ class GaussIntegralTest {
 
     @Test
     fun gaussUniform() {
-        val res = DoubleField.integrate(0.0..100.0) { x ->
+        val res = DoubleField.integrator.integrate(0.0..100.0) { x ->
             if(x in 30.0..50.0){
                 1.0
             } else {
-- 
2.34.1


From f86a6130e037cb921713db925b310515338da184 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 16 May 2021 14:20:28 +0300
Subject: [PATCH 247/713] Add opt-in for examples

---
 examples/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 1c7caf1b9..90bb935b9 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -57,7 +57,7 @@ kotlin.sourceSets.all {
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions{
         jvmTarget = "11"
-        freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
+        freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" + "-Xopt-in=kotlin.RequiresOptIn"
     }
 }
 
-- 
2.34.1


From eb3a8655fbf229db782be8345cd54413fe305d35 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sat, 15 May 2021 02:23:28 +0700
Subject: [PATCH 248/713] Code generation of EJML linear spaces

---
 buildSrc/build.gradle.kts                     |   5 +
 .../kmath/ejml/codegen/ejmlCodegen.kt         | 415 ++++++++
 .../kscience/kmath/linear/MatrixFeatures.kt   |  17 +
 kmath-ejml/build.gradle.kts                   |  22 +-
 .../kscience/kmath/ejml/EjmlLinearSpace.kt    | 223 +---
 .../space/kscience/kmath/ejml/EjmlMatrix.kt   |  10 -
 .../space/kscience/kmath/ejml/EjmlVector.kt   |  14 +-
 .../space/kscience/kmath/ejml/_generated.kt   | 995 ++++++++++++++++++
 .../kscience/kmath/ejml/EjmlVectorTest.kt     |   6 +-
 9 files changed, 1457 insertions(+), 250 deletions(-)
 create mode 100644 buildSrc/build.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
 create mode 100644 kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 000000000..7ca4df19d
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories.mavenCentral()
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
new file mode 100644
index 000000000..e4b157973
--- /dev/null
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
@@ -0,0 +1,415 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("KDocUnresolvedReference")
+
+package space.kscience.kmath.ejml.codegen
+
+import org.intellij.lang.annotations.Language
+import java.io.File
+
+private fun Appendable.appendEjmlVector(type: String, ejmlMatrixType: String) {
+    @Language("kotlin") val text = """/**
+ * [EjmlVector] specialization for [$type].
+ */
+public class Ejml${type}Vector<out M : $ejmlMatrixType>(public override val origin: M) : EjmlVector<$type, M>(origin) {
+    init {
+        require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
+    }
+
+    public override operator fun get(index: Int): $type = origin[0, index]
+}"""
+    appendLine(text)
+    appendLine()
+}
+
+private fun Appendable.appendEjmlMatrix(type: String, ejmlMatrixType: String) {
+    val text = """/**
+ * [EjmlMatrix] specialization for [$type].
+ */
+public class Ejml${type}Matrix<out M : $ejmlMatrixType>(public override val origin: M) : EjmlMatrix<$type, M>(origin) {
+    public override operator fun get(i: Int, j: Int): $type = origin[i, j]
+}"""
+    appendLine(text)
+    appendLine()
+}
+
+private fun Appendable.appendEjmlLinearSpace(
+    type: String,
+    kmathAlgebra: String,
+    ejmlMatrixParentTypeMatrix: String,
+    ejmlMatrixType: String,
+    ejmlMatrixDenseType: String,
+    ops: String,
+    denseOps: String,
+    isDense: Boolean,
+) {
+    @Language("kotlin") val text = """/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_$ops], [DecompositionFactory_${ops}] operations and
+ * [${ejmlMatrixType}] matrices.
+ */
+public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra}, $ejmlMatrixType>() {
+    /**
+     * The [${kmathAlgebra}] reference.
+     */
+    public override val elementAlgebra: $kmathAlgebra get() = $kmathAlgebra
+
+    @Suppress("UNCHECKED_CAST")
+    public override fun Matrix<${type}>.toEjml(): Ejml${type}Matrix<${ejmlMatrixType}> = when {
+        this is Ejml${type}Matrix<*> && origin is $ejmlMatrixType -> this as Ejml${type}Matrix<${ejmlMatrixType}>
+        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    public override fun Point<${type}>.toEjml(): Ejml${type}Vector<${ejmlMatrixType}> = when {
+        this is Ejml${type}Vector<*> && origin is $ejmlMatrixType -> this as Ejml${type}Vector<${ejmlMatrixType}>
+        else -> Ejml${type}Vector(${ejmlMatrixType}(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
+        })
+    }
+
+    public override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: ${kmathAlgebra}.(i: Int, j: Int) -> ${type},
+    ): Ejml${type}Matrix<${ejmlMatrixType}> = ${ejmlMatrixType}(rows, columns).also {
+        (0 until rows).forEach { row ->
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
+        }
+    }.wrapMatrix()
+
+    public override fun buildVector(
+        size: Int,
+        initializer: ${kmathAlgebra}.(Int) -> ${type},
+    ): Ejml${type}Vector<${ejmlMatrixType}> = Ejml${type}Vector(${ejmlMatrixType}(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
+
+    private fun <T : ${ejmlMatrixParentTypeMatrix}> T.wrapMatrix() = Ejml${type}Matrix(this)
+    private fun <T : ${ejmlMatrixParentTypeMatrix}> T.wrapVector() = Ejml${type}Vector(this)
+
+    public override fun Matrix<${type}>.unaryMinus(): Matrix<${type}> = this * elementAlgebra { -one }
+
+    public override fun Matrix<${type}>.dot(other: Matrix<${type}>): Ejml${type}Matrix<${ejmlMatrixType}> {
+        val out = ${ejmlMatrixType}(1, 1)
+        CommonOps_${ops}.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
+
+    public override fun Matrix<${type}>.dot(vector: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> {
+        val out = ${ejmlMatrixType}(1, 1)
+        CommonOps_${ops}.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
+
+    public override operator fun Matrix<${type}>.minus(other: Matrix<${type}>): Ejml${type}Matrix<${ejmlMatrixType}> {
+        val out = ${ejmlMatrixType}(1, 1)
+
+        CommonOps_${ops}.add(
+            elementAlgebra.one, 
+            toEjml().origin, 
+            elementAlgebra { -one },
+            other.toEjml().origin, 
+            out,${
+        if (isDense) "" else
+            """
+            null, 
+            null,"""
+    }
+        )
+
+        return out.wrapMatrix()
+    }
+
+    public override operator fun Matrix<${type}>.times(value: ${type}): Ejml${type}Matrix<${ejmlMatrixType}> {
+        val res = ${ejmlMatrixType}(1, 1)
+        CommonOps_${ops}.scale(value, toEjml().origin, res)
+        return res.wrapMatrix()
+    }
+
+    public override fun Point<${type}>.unaryMinus(): Ejml${type}Vector<${ejmlMatrixType}> {
+        val res = ${ejmlMatrixType}(1, 1)
+        CommonOps_${ops}.changeSign(toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    public override fun Matrix<${type}>.plus(other: Matrix<${type}>): Ejml${type}Matrix<${ejmlMatrixType}> {
+        val out = ${ejmlMatrixType}(1, 1)
+        
+        CommonOps_${ops}.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin, 
+            out,${
+        if (isDense) "" else
+            """
+            null, 
+            null,"""
+    }
+        )
+
+        return out.wrapMatrix()
+    }
+
+    public override fun Point<${type}>.plus(other: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> {
+        val out = ${ejmlMatrixType}(1, 1)
+
+        CommonOps_${ops}.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin,
+            out,${
+        if (isDense) "" else
+            """
+            null, 
+            null,"""
+    }
+        )
+
+        return out.wrapVector()
+    }
+
+    public override fun Point<${type}>.minus(other: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> {
+        val out = ${ejmlMatrixType}(1, 1)
+
+        CommonOps_${ops}.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra { -one },
+            other.toEjml().origin,
+            out,${
+        if (isDense) "" else
+            """
+            null, 
+            null,"""
+    }
+        )
+
+        return out.wrapVector()
+    }
+
+    public override fun ${type}.times(m: Matrix<${type}>): Ejml${type}Matrix<${ejmlMatrixType}> = m * this
+
+    public override fun Point<${type}>.times(value: ${type}): Ejml${type}Vector<${ejmlMatrixType}> {
+        val res = ${ejmlMatrixType}(1, 1)
+        CommonOps_${ops}.scale(value, toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    public override fun ${type}.times(v: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> = v * this
+
+    @UnstableKMathAPI
+    public override fun <F : StructureFeature> getFeature(structure: Matrix<${type}>, type: KClass<out F>): F? {
+        structure.getFeature(type)?.let { return it }
+        val origin = structure.toEjml().origin
+
+        return when (type) {
+        ${
+        if (isDense)
+            """    InverseMatrixFeature::class -> object : InverseMatrixFeature<${type}> {
+                override val inverse: Matrix<${type}> by lazy {
+                    val res = origin.copy()
+                    CommonOps_${ops}.invert(res)
+                    res.wrapMatrix()
+                }
+            }
+
+            DeterminantFeature::class -> object : DeterminantFeature<${type}> {
+                override val determinant: $type by lazy { CommonOps_${ops}.det(origin) }
+            }
+
+            SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<${type}> {
+                private val svd by lazy {
+                    DecompositionFactory_${ops}.svd(origin.numRows, origin.numCols, true, true, false)
+                        .apply { decompose(origin.copy()) }
+                }
+
+                override val u: Matrix<${type}> by lazy { svd.getU(null, false).wrapMatrix() }
+                override val s: Matrix<${type}> by lazy { svd.getW(null).wrapMatrix() }
+                override val v: Matrix<${type}> by lazy { svd.getV(null, false).wrapMatrix() }
+                override val singularValues: Point<${type}> by lazy { ${type}Buffer(svd.singularValues) }
+            }
+
+            QRDecompositionFeature::class -> object : QRDecompositionFeature<${type}> {
+                private val qr by lazy {
+                    DecompositionFactory_${ops}.qr().apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<${type}> by lazy {
+                    qr.getQ(null, false).wrapMatrix() + OrthogonalFeature
+                }
+
+                override val r: Matrix<${type}> by lazy { qr.getR(null, false).wrapMatrix() + UFeature }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<${type}> {
+                override val l: Matrix<${type}> by lazy {
+                    val cholesky =
+                        DecompositionFactory_${ops}.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
+
+                    cholesky.getT(null).wrapMatrix() + LFeature
+                }
+            }
+
+            LupDecompositionFeature::class -> object : LupDecompositionFeature<${type}> {
+                private val lup by lazy {
+                    DecompositionFactory_${ops}.lu(origin.numRows, origin.numCols).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<${type}> by lazy {
+                    lup.getLower(null).wrapMatrix() + LFeature
+                }
+
+                override val u: Matrix<${type}> by lazy {
+                    lup.getUpper(null).wrapMatrix() + UFeature
+                }
+
+                override val p: Matrix<${type}> by lazy { lup.getRowPivot(null).wrapMatrix() }
+            }""" else """    QRDecompositionFeature::class -> object : QRDecompositionFeature<$type> {
+                private val qr by lazy {
+                    DecompositionFactory_${ops}.qr(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<${type}> by lazy {
+                    qr.getQ(null, false).wrapMatrix() + OrthogonalFeature
+                }
+
+                override val r: Matrix<${type}> by lazy { qr.getR(null, false).wrapMatrix() + UFeature }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<${type}> {
+                override val l: Matrix<${type}> by lazy {
+                    val cholesky =
+                        DecompositionFactory_${ops}.cholesky().apply { decompose(origin.copy()) }
+
+                    (cholesky.getT(null) as ${ejmlMatrixParentTypeMatrix}).wrapMatrix() + LFeature
+                }
+            }
+
+            LUDecompositionFeature::class, DeterminantFeature::class, InverseMatrixFeature::class -> object :
+                LUDecompositionFeature<${type}>, DeterminantFeature<${type}>, InverseMatrixFeature<${type}> {
+                private val lu by lazy {
+                    DecompositionFactory_${ops}.lu(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<${type}> by lazy {
+                    lu.getLower(null).wrapMatrix() + LFeature
+                }
+
+                override val u: Matrix<${type}> by lazy {
+                    lu.getUpper(null).wrapMatrix() + UFeature
+                }
+
+                override val inverse: Matrix<${type}> by lazy {
+                    var a = origin
+                    val inverse = ${ejmlMatrixDenseType}(1, 1)
+                    val solver = LinearSolverFactory_${ops}.lu(FillReducing.NONE)
+                    if (solver.modifiesA()) a = a.copy()
+                    val i = CommonOps_${denseOps}.identity(a.numRows)
+                    solver.solve(i, inverse)
+                    inverse.wrapMatrix()
+                }
+
+                override val determinant: $type by lazy { elementAlgebra.number(lu.computeDeterminant().real) }
+            }"""
+    }
+
+            else -> null
+        }?.let(type::cast)
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<${type}>, b: Matrix<${type}>): Ejml${type}Matrix<${ejmlMatrixType}> {
+        val res = ${ejmlMatrixType}(1, 1)
+        CommonOps_${ops}.solve(${ejmlMatrixType}(a.toEjml().origin), ${ejmlMatrixType}(b.toEjml().origin), res)
+        return res.wrapMatrix()
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<${type}>, b: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> {
+        val res = ${ejmlMatrixType}(1, 1)
+        CommonOps_${ops}.solve(${ejmlMatrixType}(a.toEjml().origin), ${ejmlMatrixType}(b.toEjml().origin), res)
+        return Ejml${type}Vector(res)
+    }
+}"""
+    appendLine(text)
+    appendLine()
+}
+
+
+/**
+ * Generates routine EJML classes.
+ */
+fun ejmlCodegen(outputFile: String): Unit = File(outputFile).run {
+    parentFile.mkdirs()
+
+    writer().use {
+        it.appendLine("/*")
+        it.appendLine(" * Copyright 2018-2021 KMath contributors.")
+        it.appendLine(" * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.")
+        it.appendLine(" */")
+        it.appendLine()
+        it.appendLine("/* This file is generated with buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt */")
+        it.appendLine()
+        it.appendLine("package space.kscience.kmath.ejml")
+        it.appendLine()
+        it.appendLine("import org.ejml.data.*")
+        it.appendLine("import space.kscience.kmath.linear.*")
+        it.appendLine("import space.kscience.kmath.operations.*")
+        it.appendLine("import space.kscience.kmath.structures.*")
+        it.appendLine("import space.kscience.kmath.misc.*")
+        it.appendLine("import kotlin.reflect.*")
+        it.appendLine("import org.ejml.dense.row.*")
+        it.appendLine("import org.ejml.dense.row.factory.*")
+        it.appendLine("import org.ejml.sparse.*")
+        it.appendLine("import org.ejml.sparse.csc.*")
+        it.appendLine("import org.ejml.sparse.csc.factory.*")
+        it.appendLine("import space.kscience.kmath.nd.*")
+        it.appendLine("import space.kscience.kmath.linear.Matrix")
+        it.appendLine()
+        it.appendEjmlVector("Double", "DMatrix")
+        it.appendEjmlVector("Float", "FMatrix")
+        it.appendEjmlMatrix("Double", "DMatrix")
+        it.appendEjmlMatrix("Float", "FMatrix")
+        it.appendEjmlLinearSpace("Double", "DoubleField", "DMatrix", "DMatrixRMaj", "DMatrixRMaj", "DDRM", "DDRM", true)
+        it.appendEjmlLinearSpace("Float", "FloatField", "FMatrix", "FMatrixRMaj", "FMatrixRMaj", "FDRM", "FDRM", true)
+
+        it.appendEjmlLinearSpace(
+            type = "Double",
+            kmathAlgebra = "DoubleField",
+            ejmlMatrixParentTypeMatrix = "DMatrix",
+            ejmlMatrixType = "DMatrixSparseCSC",
+            ejmlMatrixDenseType = "DMatrixRMaj",
+            ops = "DSCC",
+            denseOps = "DDRM",
+            isDense = false,
+        )
+
+        it.appendEjmlLinearSpace(
+            type = "Float",
+            kmathAlgebra = "FloatField",
+            ejmlMatrixParentTypeMatrix = "FMatrix",
+            ejmlMatrixType = "FMatrixSparseCSC",
+            ejmlMatrixDenseType = "FMatrixRMaj",
+            ops = "FSCC",
+            denseOps = "FDRM",
+            isDense = false,
+        )
+    }
+}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
index 4a0ca7dfe..37c93d249 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
@@ -75,6 +75,23 @@ public object LFeature : MatrixFeature
  */
 public object UFeature : MatrixFeature
 
+/**
+ * Matrices with this feature support LU factorization: *a = [l] &middot; [u]* where *a* is the owning matrix.
+ *
+ * @param T the type of matrices' items.
+ */
+public interface LUDecompositionFeature<T : Any> : MatrixFeature {
+    /**
+     * The lower triangular matrix in this decomposition. It may have [LFeature].
+     */
+    public val l: Matrix<T>
+
+    /**
+     * The upper triangular matrix in this decomposition. It may have [UFeature].
+     */
+    public val u: Matrix<T>
+}
+
 /**
  * Matrices with this feature support LU factorization with partial pivoting: *[p] &middot; a = [l] &middot; [u]* where
  * *a* is the owning matrix.
diff --git a/kmath-ejml/build.gradle.kts b/kmath-ejml/build.gradle.kts
index c8e2ecd8b..5107cfb68 100644
--- a/kmath-ejml/build.gradle.kts
+++ b/kmath-ejml/build.gradle.kts
@@ -1,3 +1,5 @@
+import space.kscience.kmath.ejml.codegen.ejmlCodegen
+
 plugins {
     kotlin("jvm")
     id("ru.mipt.npm.gradle.common")
@@ -5,6 +7,9 @@ plugins {
 
 dependencies {
     api("org.ejml:ejml-ddense:0.40")
+    api("org.ejml:ejml-fdense:0.40")
+    api("org.ejml:ejml-dsparse:0.40")
+    api("org.ejml:ejml-fsparse:0.40")
     api(project(":kmath-core"))
 }
 
@@ -14,19 +19,24 @@ readme {
 
     feature(
         id = "ejml-vector",
-        description = "Point implementations.",
         ref = "src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt"
-    )
+    ) { "Point implementations." }
 
     feature(
         id = "ejml-matrix",
-        description = "Matrix implementation.",
         ref = "src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt"
-    )
+    ) { "Matrix implementation." }
 
     feature(
         id = "ejml-linear-space",
-        description = "LinearSpace implementations.",
         ref = "src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt"
-    )
+    ) { "LinearSpace implementations." }
+}
+
+kotlin.sourceSets.main {
+    val codegen by tasks.creating {
+        ejmlCodegen(kotlin.srcDirs.first().absolutePath + "/space/kscience/kmath/ejml/_generated.kt")
+    }
+
+    kotlin.srcDirs(files().builtBy(codegen))
 }
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
index 71cae4829..f88e83369 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
@@ -5,19 +5,10 @@
 
 package space.kscience.kmath.ejml
 
-import org.ejml.data.DMatrix
-import org.ejml.data.DMatrixD1
-import org.ejml.data.DMatrixRMaj
-import org.ejml.dense.row.CommonOps_DDRM
-import org.ejml.dense.row.factory.DecompositionFactory_DDRM
-import space.kscience.kmath.linear.*
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.StructureFeature
-import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.linear.LinearSpace
+import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.linear.Point
 import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.structures.DoubleBuffer
-import kotlin.reflect.KClass
-import kotlin.reflect.cast
 
 /**
  * [LinearSpace] implementation specialized for a certain EJML type.
@@ -27,7 +18,7 @@ import kotlin.reflect.cast
  * @param M the EJML matrix type.
  * @author Iaroslav Postovalov
  */
-public abstract class EjmlLinearSpace<T : Any, out A : Ring<T>, M : org.ejml.data.Matrix> : LinearSpace<T, A> {
+public abstract class EjmlLinearSpace<T : Any, out A : Ring<T>, out M : org.ejml.data.Matrix> : LinearSpace<T, A> {
     /**
      * Converts this matrix to EJML one.
      */
@@ -46,209 +37,3 @@ public abstract class EjmlLinearSpace<T : Any, out A : Ring<T>, M : org.ejml.dat
 
     public abstract override fun buildVector(size: Int, initializer: A.(Int) -> T): EjmlVector<T, M>
 }
-
-/**
- * [EjmlLinearSpace] implementation based on [CommonOps_DDRM], [DecompositionFactory_DDRM] operations and
- * [DMatrixRMaj] matrices.
- *
- * @author Iaroslav Postovalov
- */
-public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrixRMaj>() {
-    /**
-     * The [DoubleField] reference.
-     */
-    public override val elementAlgebra: DoubleField get() = DoubleField
-
-    @Suppress("UNCHECKED_CAST")
-    public override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixRMaj> = when {
-        this is EjmlDoubleMatrix<*> && origin is DMatrixRMaj -> this as EjmlDoubleMatrix<DMatrixRMaj>
-        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    public override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixRMaj> = when {
-        this is EjmlDoubleVector<*> && origin is DMatrixRMaj -> this as EjmlDoubleVector<DMatrixRMaj>
-        else -> EjmlDoubleVector(DMatrixRMaj(size, 1).also {
-            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
-        })
-    }
-
-    public override fun buildMatrix(
-        rows: Int,
-        columns: Int,
-        initializer: DoubleField.(i: Int, j: Int) -> Double,
-    ): EjmlDoubleMatrix<DMatrixRMaj> = EjmlDoubleMatrix(DMatrixRMaj(rows, columns).also {
-        (0 until rows).forEach { row ->
-            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
-        }
-    })
-
-    public override fun buildVector(
-        size: Int,
-        initializer: DoubleField.(Int) -> Double,
-    ): EjmlDoubleVector<DMatrixRMaj> = EjmlDoubleVector(DMatrixRMaj(size, 1).also {
-        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
-    })
-
-    private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
-    private fun <T : DMatrixD1> T.wrapVector() = EjmlDoubleVector(this)
-
-    public override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * (-1.0)
-
-    public override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.mult(toEjml().origin, other.toEjml().origin, out)
-        return out.wrapMatrix()
-    }
-
-    public override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.mult(toEjml().origin, vector.toEjml().origin, out)
-        return out.wrapVector()
-    }
-
-    public override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.subtract(toEjml().origin, other.toEjml().origin, out)
-        return out.wrapMatrix()
-    }
-
-    public override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixRMaj> {
-        val res = this.toEjml().origin.copy()
-        CommonOps_DDRM.scale(value, res)
-        return res.wrapMatrix()
-    }
-
-    public override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixRMaj> {
-        val out = toEjml().origin.copy()
-        CommonOps_DDRM.changeSign(out)
-        return out.wrapVector()
-    }
-
-    public override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.add(toEjml().origin, other.toEjml().origin, out)
-        return out.wrapMatrix()
-    }
-
-    public override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.add(toEjml().origin, other.toEjml().origin, out)
-        return out.wrapVector()
-    }
-
-    public override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.subtract(toEjml().origin, other.toEjml().origin, out)
-        return out.wrapVector()
-    }
-
-    public override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> = m * this
-
-    public override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixRMaj> {
-        val res = this.toEjml().origin.copy()
-        CommonOps_DDRM.scale(value, res)
-        return res.wrapVector()
-    }
-
-    public override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixRMaj> = v * this
-
-    @UnstableKMathAPI
-    public override fun <F : StructureFeature> getFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
-        // Return the feature if it is intrinsic to the structure
-        structure.getFeature(type)?.let { return it }
-
-        val origin = structure.toEjml().origin
-
-        return when (type) {
-            InverseMatrixFeature::class -> object : InverseMatrixFeature<Double> {
-                override val inverse: Matrix<Double> by lazy {
-                    val res = origin.copy()
-                    CommonOps_DDRM.invert(res)
-                    EjmlDoubleMatrix(res)
-                }
-            }
-
-            DeterminantFeature::class -> object : DeterminantFeature<Double> {
-                override val determinant: Double by lazy { CommonOps_DDRM.det(DMatrixRMaj(origin)) }
-            }
-
-            SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<Double> {
-                private val svd by lazy {
-                    DecompositionFactory_DDRM.svd(origin.numRows, origin.numCols, true, true, false)
-                        .apply { decompose(origin.copy()) }
-                }
-
-                override val u: Matrix<Double> by lazy { EjmlDoubleMatrix(svd.getU(null, false)) }
-                override val s: Matrix<Double> by lazy { EjmlDoubleMatrix(svd.getW(null)) }
-                override val v: Matrix<Double> by lazy { EjmlDoubleMatrix(svd.getV(null, false)) }
-                override val singularValues: Point<Double> by lazy { DoubleBuffer(svd.singularValues) }
-            }
-
-            QRDecompositionFeature::class -> object : QRDecompositionFeature<Double> {
-                private val qr by lazy {
-                    DecompositionFactory_DDRM.qr().apply { decompose(origin.copy()) }
-                }
-
-                override val q: Matrix<Double> by lazy {
-                    EjmlDoubleMatrix(qr.getQ(null, false)) + OrthogonalFeature
-                }
-
-                override val r: Matrix<Double> by lazy { EjmlDoubleMatrix(qr.getR(null, false)) + UFeature }
-            }
-
-            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Double> {
-                override val l: Matrix<Double> by lazy {
-                    val cholesky =
-                        DecompositionFactory_DDRM.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
-
-                    EjmlDoubleMatrix(cholesky.getT(null)) + LFeature
-                }
-            }
-
-            LupDecompositionFeature::class -> object : LupDecompositionFeature<Double> {
-                private val lup by lazy {
-                    DecompositionFactory_DDRM.lu(origin.numRows, origin.numCols).apply { decompose(origin.copy()) }
-                }
-
-                override val l: Matrix<Double> by lazy {
-                    EjmlDoubleMatrix(lup.getLower(null)) + LFeature
-                }
-
-                override val u: Matrix<Double> by lazy {
-                    EjmlDoubleMatrix(lup.getUpper(null)) + UFeature
-                }
-
-                override val p: Matrix<Double> by lazy { EjmlDoubleMatrix(lup.getRowPivot(null)) }
-            }
-
-            else -> null
-        }?.let(type::cast)
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p matrix.
-     * @return the solution for 'x' that is n by p.
-     */
-    public fun solve(a: Matrix<Double>, b: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
-        val res = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
-        return EjmlDoubleMatrix(res)
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p vector.
-     * @return the solution for 'x' that is n by p.
-     */
-    public fun solve(a: Matrix<Double>, b: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
-        val res = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
-        return EjmlDoubleVector(res)
-    }
-}
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
index 92c4d1cf0..fd43f295c 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.ejml
 
-import org.ejml.data.DMatrix
 import org.ejml.data.Matrix
 import space.kscience.kmath.nd.Structure2D
 
@@ -21,12 +20,3 @@ public abstract class EjmlMatrix<T, out M : Matrix>(public open val origin: M) :
     public override val rowNum: Int get() = origin.numRows
     public override val colNum: Int get() = origin.numCols
 }
-
-/**
- * [EjmlMatrix] specialization for [Double].
- *
- * @author Iaroslav Postovalov
- */
-public class EjmlDoubleMatrix<out M : DMatrix>(public override val origin: M) : EjmlMatrix<Double, M>(origin) {
-    public override operator fun get(i: Int, j: Int): Double = origin[i, j]
-}
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
index 81502d6d0..5d10d1fbb 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.ejml
 
-import org.ejml.data.DMatrixD1
 import org.ejml.data.Matrix
 import space.kscience.kmath.linear.Point
 
@@ -14,12 +13,12 @@ import space.kscience.kmath.linear.Point
  *
  * @param T the type of elements contained in the buffer.
  * @param M the type of EJML matrix.
- * @property origin The underlying matrix.
+ * @property origin The underlying matrix, must have only one row.
  * @author Iaroslav Postovalov
  */
 public abstract class EjmlVector<out T, out M : Matrix>(public open val origin: M) : Point<T> {
     public override val size: Int
-        get() = origin.numRows
+        get() = origin.numCols
 
     public override operator fun iterator(): Iterator<T> = object : Iterator<T> {
         private var cursor: Int = 0
@@ -34,12 +33,3 @@ public abstract class EjmlVector<out T, out M : Matrix>(public open val origin:
 
     public override fun toString(): String = "EjmlVector(origin=$origin)"
 }
-
-/**
- * [EjmlVector] specialization for [Double].
- *
- * @author Iaroslav Postovalov
- */
-public class EjmlDoubleVector<out M : DMatrixD1>(public override val origin: M) : EjmlVector<Double, M>(origin) {
-    public override operator fun get(index: Int): Double = origin[index]
-}
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
new file mode 100644
index 000000000..139c55697
--- /dev/null
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
@@ -0,0 +1,995 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+/* This file is generated with buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt */
+
+package space.kscience.kmath.ejml
+
+import org.ejml.data.*
+import org.ejml.dense.row.CommonOps_DDRM
+import org.ejml.dense.row.CommonOps_FDRM
+import org.ejml.dense.row.factory.DecompositionFactory_DDRM
+import org.ejml.dense.row.factory.DecompositionFactory_FDRM
+import org.ejml.sparse.FillReducing
+import org.ejml.sparse.csc.CommonOps_DSCC
+import org.ejml.sparse.csc.CommonOps_FSCC
+import org.ejml.sparse.csc.factory.DecompositionFactory_DSCC
+import org.ejml.sparse.csc.factory.DecompositionFactory_FSCC
+import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
+import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
+import space.kscience.kmath.linear.*
+import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.nd.StructureFeature
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.FloatField
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.FloatBuffer
+import kotlin.reflect.KClass
+import kotlin.reflect.cast
+
+/**
+ * [EjmlVector] specialization for [Double].
+ */
+public class EjmlDoubleVector<out M : DMatrix>(public override val origin: M) : EjmlVector<Double, M>(origin) {
+    init {
+        require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
+    }
+
+    public override operator fun get(index: Int): Double = origin[0, index]
+}
+
+/**
+ * [EjmlVector] specialization for [Float].
+ */
+public class EjmlFloatVector<out M : FMatrix>(public override val origin: M) : EjmlVector<Float, M>(origin) {
+    init {
+        require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
+    }
+
+    public override operator fun get(index: Int): Float = origin[0, index]
+}
+
+/**
+ * [EjmlMatrix] specialization for [Double].
+ */
+public class EjmlDoubleMatrix<out M : DMatrix>(public override val origin: M) : EjmlMatrix<Double, M>(origin) {
+    public override operator fun get(i: Int, j: Int): Double = origin[i, j]
+}
+
+/**
+ * [EjmlMatrix] specialization for [Float].
+ */
+public class EjmlFloatMatrix<out M : FMatrix>(public override val origin: M) : EjmlMatrix<Float, M>(origin) {
+    public override operator fun get(i: Int, j: Int): Float = origin[i, j]
+}
+
+/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_DDRM], [DecompositionFactory_DDRM] operations and
+ * [DMatrixRMaj] matrices.
+ */
+public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrixRMaj>() {
+    /**
+     * The [DoubleField] reference.
+     */
+    public override val elementAlgebra: DoubleField get() = DoubleField
+
+    @Suppress("UNCHECKED_CAST")
+    public override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixRMaj> = when {
+        this is EjmlDoubleMatrix<*> && origin is DMatrixRMaj -> this as EjmlDoubleMatrix<DMatrixRMaj>
+        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    public override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixRMaj> = when {
+        this is EjmlDoubleVector<*> && origin is DMatrixRMaj -> this as EjmlDoubleVector<DMatrixRMaj>
+        else -> EjmlDoubleVector(DMatrixRMaj(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
+        })
+    }
+
+    public override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: DoubleField.(i: Int, j: Int) -> Double,
+    ): EjmlDoubleMatrix<DMatrixRMaj> = DMatrixRMaj(rows, columns).also {
+        (0 until rows).forEach { row ->
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
+        }
+    }.wrapMatrix()
+
+    public override fun buildVector(
+        size: Int,
+        initializer: DoubleField.(Int) -> Double,
+    ): EjmlDoubleVector<DMatrixRMaj> = EjmlDoubleVector(DMatrixRMaj(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
+
+    private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
+    private fun <T : DMatrix> T.wrapVector() = EjmlDoubleVector(this)
+
+    public override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
+
+    public override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
+
+    public override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
+
+    public override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+
+        CommonOps_DDRM.add(
+            elementAlgebra.one, 
+            toEjml().origin, 
+            elementAlgebra { -one },
+            other.toEjml().origin, 
+            out,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    public override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.scale(value, toEjml().origin, res)
+        return res.wrapMatrix()
+    }
+
+    public override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.changeSign(toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    public override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        
+        CommonOps_DDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin, 
+            out,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    public override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+
+        CommonOps_DDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin,
+            out,
+        )
+
+        return out.wrapVector()
+    }
+
+    public override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+
+        CommonOps_DDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra { -one },
+            other.toEjml().origin,
+            out,
+        )
+
+        return out.wrapVector()
+    }
+
+    public override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> = m * this
+
+    public override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.scale(value, toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    public override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixRMaj> = v * this
+
+    @UnstableKMathAPI
+    public override fun <F : StructureFeature> getFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
+        structure.getFeature(type)?.let { return it }
+        val origin = structure.toEjml().origin
+
+        return when (type) {
+            InverseMatrixFeature::class -> object : InverseMatrixFeature<Double> {
+                override val inverse: Matrix<Double> by lazy {
+                    val res = origin.copy()
+                    CommonOps_DDRM.invert(res)
+                    res.wrapMatrix()
+                }
+            }
+
+            DeterminantFeature::class -> object : DeterminantFeature<Double> {
+                override val determinant: Double by lazy { CommonOps_DDRM.det(origin) }
+            }
+
+            SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<Double> {
+                private val svd by lazy {
+                    DecompositionFactory_DDRM.svd(origin.numRows, origin.numCols, true, true, false)
+                        .apply { decompose(origin.copy()) }
+                }
+
+                override val u: Matrix<Double> by lazy { svd.getU(null, false).wrapMatrix() }
+                override val s: Matrix<Double> by lazy { svd.getW(null).wrapMatrix() }
+                override val v: Matrix<Double> by lazy { svd.getV(null, false).wrapMatrix() }
+                override val singularValues: Point<Double> by lazy { DoubleBuffer(svd.singularValues) }
+            }
+
+            QRDecompositionFeature::class -> object : QRDecompositionFeature<Double> {
+                private val qr by lazy {
+                    DecompositionFactory_DDRM.qr().apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<Double> by lazy {
+                    qr.getQ(null, false).wrapMatrix() + OrthogonalFeature
+                }
+
+                override val r: Matrix<Double> by lazy { qr.getR(null, false).wrapMatrix() + UFeature }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Double> {
+                override val l: Matrix<Double> by lazy {
+                    val cholesky =
+                        DecompositionFactory_DDRM.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
+
+                    cholesky.getT(null).wrapMatrix() + LFeature
+                }
+            }
+
+            LupDecompositionFeature::class -> object : LupDecompositionFeature<Double> {
+                private val lup by lazy {
+                    DecompositionFactory_DDRM.lu(origin.numRows, origin.numCols).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<Double> by lazy {
+                    lup.getLower(null).wrapMatrix() + LFeature
+                }
+
+                override val u: Matrix<Double> by lazy {
+                    lup.getUpper(null).wrapMatrix() + UFeature
+                }
+
+                override val p: Matrix<Double> by lazy { lup.getRowPivot(null).wrapMatrix() }
+            }
+
+            else -> null
+        }?.let(type::cast)
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
+        return res.wrapMatrix()
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
+        return EjmlDoubleVector(res)
+    }
+}
+
+/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_FDRM], [DecompositionFactory_FDRM] operations and
+ * [FMatrixRMaj] matrices.
+ */
+public object EjmlLinearSpaceFDRM : EjmlLinearSpace<Float, FloatField, FMatrixRMaj>() {
+    /**
+     * The [FloatField] reference.
+     */
+    public override val elementAlgebra: FloatField get() = FloatField
+
+    @Suppress("UNCHECKED_CAST")
+    public override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixRMaj> = when {
+        this is EjmlFloatMatrix<*> && origin is FMatrixRMaj -> this as EjmlFloatMatrix<FMatrixRMaj>
+        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    public override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixRMaj> = when {
+        this is EjmlFloatVector<*> && origin is FMatrixRMaj -> this as EjmlFloatVector<FMatrixRMaj>
+        else -> EjmlFloatVector(FMatrixRMaj(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
+        })
+    }
+
+    public override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: FloatField.(i: Int, j: Int) -> Float,
+    ): EjmlFloatMatrix<FMatrixRMaj> = FMatrixRMaj(rows, columns).also {
+        (0 until rows).forEach { row ->
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
+        }
+    }.wrapMatrix()
+
+    public override fun buildVector(
+        size: Int,
+        initializer: FloatField.(Int) -> Float,
+    ): EjmlFloatVector<FMatrixRMaj> = EjmlFloatVector(FMatrixRMaj(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
+
+    private fun <T : FMatrix> T.wrapMatrix() = EjmlFloatMatrix(this)
+    private fun <T : FMatrix> T.wrapVector() = EjmlFloatVector(this)
+
+    public override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
+
+    public override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
+
+    public override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
+
+    public override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+
+        CommonOps_FDRM.add(
+            elementAlgebra.one, 
+            toEjml().origin, 
+            elementAlgebra { -one },
+            other.toEjml().origin, 
+            out,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    public override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.scale(value, toEjml().origin, res)
+        return res.wrapMatrix()
+    }
+
+    public override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.changeSign(toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    public override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+        
+        CommonOps_FDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin, 
+            out,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    public override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+
+        CommonOps_FDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin,
+            out,
+        )
+
+        return out.wrapVector()
+    }
+
+    public override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+
+        CommonOps_FDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra { -one },
+            other.toEjml().origin,
+            out,
+        )
+
+        return out.wrapVector()
+    }
+
+    public override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> = m * this
+
+    public override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.scale(value, toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    public override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixRMaj> = v * this
+
+    @UnstableKMathAPI
+    public override fun <F : StructureFeature> getFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
+        structure.getFeature(type)?.let { return it }
+        val origin = structure.toEjml().origin
+
+        return when (type) {
+            InverseMatrixFeature::class -> object : InverseMatrixFeature<Float> {
+                override val inverse: Matrix<Float> by lazy {
+                    val res = origin.copy()
+                    CommonOps_FDRM.invert(res)
+                    res.wrapMatrix()
+                }
+            }
+
+            DeterminantFeature::class -> object : DeterminantFeature<Float> {
+                override val determinant: Float by lazy { CommonOps_FDRM.det(origin) }
+            }
+
+            SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<Float> {
+                private val svd by lazy {
+                    DecompositionFactory_FDRM.svd(origin.numRows, origin.numCols, true, true, false)
+                        .apply { decompose(origin.copy()) }
+                }
+
+                override val u: Matrix<Float> by lazy { svd.getU(null, false).wrapMatrix() }
+                override val s: Matrix<Float> by lazy { svd.getW(null).wrapMatrix() }
+                override val v: Matrix<Float> by lazy { svd.getV(null, false).wrapMatrix() }
+                override val singularValues: Point<Float> by lazy { FloatBuffer(svd.singularValues) }
+            }
+
+            QRDecompositionFeature::class -> object : QRDecompositionFeature<Float> {
+                private val qr by lazy {
+                    DecompositionFactory_FDRM.qr().apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<Float> by lazy {
+                    qr.getQ(null, false).wrapMatrix() + OrthogonalFeature
+                }
+
+                override val r: Matrix<Float> by lazy { qr.getR(null, false).wrapMatrix() + UFeature }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Float> {
+                override val l: Matrix<Float> by lazy {
+                    val cholesky =
+                        DecompositionFactory_FDRM.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
+
+                    cholesky.getT(null).wrapMatrix() + LFeature
+                }
+            }
+
+            LupDecompositionFeature::class -> object : LupDecompositionFeature<Float> {
+                private val lup by lazy {
+                    DecompositionFactory_FDRM.lu(origin.numRows, origin.numCols).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<Float> by lazy {
+                    lup.getLower(null).wrapMatrix() + LFeature
+                }
+
+                override val u: Matrix<Float> by lazy {
+                    lup.getUpper(null).wrapMatrix() + UFeature
+                }
+
+                override val p: Matrix<Float> by lazy { lup.getRowPivot(null).wrapMatrix() }
+            }
+
+            else -> null
+        }?.let(type::cast)
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Float>, b: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.solve(FMatrixRMaj(a.toEjml().origin), FMatrixRMaj(b.toEjml().origin), res)
+        return res.wrapMatrix()
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Float>, b: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.solve(FMatrixRMaj(a.toEjml().origin), FMatrixRMaj(b.toEjml().origin), res)
+        return EjmlFloatVector(res)
+    }
+}
+
+/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_DSCC], [DecompositionFactory_DSCC] operations and
+ * [DMatrixSparseCSC] matrices.
+ */
+public object EjmlLinearSpaceDSCC : EjmlLinearSpace<Double, DoubleField, DMatrixSparseCSC>() {
+    /**
+     * The [DoubleField] reference.
+     */
+    public override val elementAlgebra: DoubleField get() = DoubleField
+
+    @Suppress("UNCHECKED_CAST")
+    public override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixSparseCSC> = when {
+        this is EjmlDoubleMatrix<*> && origin is DMatrixSparseCSC -> this as EjmlDoubleMatrix<DMatrixSparseCSC>
+        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    public override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixSparseCSC> = when {
+        this is EjmlDoubleVector<*> && origin is DMatrixSparseCSC -> this as EjmlDoubleVector<DMatrixSparseCSC>
+        else -> EjmlDoubleVector(DMatrixSparseCSC(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
+        })
+    }
+
+    public override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: DoubleField.(i: Int, j: Int) -> Double,
+    ): EjmlDoubleMatrix<DMatrixSparseCSC> = DMatrixSparseCSC(rows, columns).also {
+        (0 until rows).forEach { row ->
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
+        }
+    }.wrapMatrix()
+
+    public override fun buildVector(
+        size: Int,
+        initializer: DoubleField.(Int) -> Double,
+    ): EjmlDoubleVector<DMatrixSparseCSC> = EjmlDoubleVector(DMatrixSparseCSC(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
+
+    private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
+    private fun <T : DMatrix> T.wrapVector() = EjmlDoubleVector(this)
+
+    public override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
+
+    public override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
+
+    public override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
+
+    public override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+
+        CommonOps_DSCC.add(
+            elementAlgebra.one, 
+            toEjml().origin, 
+            elementAlgebra { -one },
+            other.toEjml().origin, 
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    public override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.scale(value, toEjml().origin, res)
+        return res.wrapMatrix()
+    }
+
+    public override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.changeSign(toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    public override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+        
+        CommonOps_DSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin, 
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    public override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+
+        CommonOps_DSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin,
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapVector()
+    }
+
+    public override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+
+        CommonOps_DSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra { -one },
+            other.toEjml().origin,
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapVector()
+    }
+
+    public override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> = m * this
+
+    public override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.scale(value, toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    public override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> = v * this
+
+    @UnstableKMathAPI
+    public override fun <F : StructureFeature> getFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
+        structure.getFeature(type)?.let { return it }
+        val origin = structure.toEjml().origin
+
+        return when (type) {
+            QRDecompositionFeature::class -> object : QRDecompositionFeature<Double> {
+                private val qr by lazy {
+                    DecompositionFactory_DSCC.qr(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<Double> by lazy {
+                    qr.getQ(null, false).wrapMatrix() + OrthogonalFeature
+                }
+
+                override val r: Matrix<Double> by lazy { qr.getR(null, false).wrapMatrix() + UFeature }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Double> {
+                override val l: Matrix<Double> by lazy {
+                    val cholesky =
+                        DecompositionFactory_DSCC.cholesky().apply { decompose(origin.copy()) }
+
+                    (cholesky.getT(null) as DMatrix).wrapMatrix() + LFeature
+                }
+            }
+
+            LUDecompositionFeature::class, DeterminantFeature::class, InverseMatrixFeature::class -> object :
+                LUDecompositionFeature<Double>, DeterminantFeature<Double>, InverseMatrixFeature<Double> {
+                private val lu by lazy {
+                    DecompositionFactory_DSCC.lu(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<Double> by lazy {
+                    lu.getLower(null).wrapMatrix() + LFeature
+                }
+
+                override val u: Matrix<Double> by lazy {
+                    lu.getUpper(null).wrapMatrix() + UFeature
+                }
+
+                override val inverse: Matrix<Double> by lazy {
+                    var a = origin
+                    val inverse = DMatrixRMaj(1, 1)
+                    val solver = LinearSolverFactory_DSCC.lu(FillReducing.NONE)
+                    if (solver.modifiesA()) a = a.copy()
+                    val i = CommonOps_DDRM.identity(a.numRows)
+                    solver.solve(i, inverse)
+                    inverse.wrapMatrix()
+                }
+
+                override val determinant: Double by lazy { elementAlgebra.number(lu.computeDeterminant().real) }
+            }
+
+            else -> null
+        }?.let(type::cast)
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.solve(DMatrixSparseCSC(a.toEjml().origin), DMatrixSparseCSC(b.toEjml().origin), res)
+        return res.wrapMatrix()
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.solve(DMatrixSparseCSC(a.toEjml().origin), DMatrixSparseCSC(b.toEjml().origin), res)
+        return EjmlDoubleVector(res)
+    }
+}
+
+/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_FSCC], [DecompositionFactory_FSCC] operations and
+ * [FMatrixSparseCSC] matrices.
+ */
+public object EjmlLinearSpaceFSCC : EjmlLinearSpace<Float, FloatField, FMatrixSparseCSC>() {
+    /**
+     * The [FloatField] reference.
+     */
+    public override val elementAlgebra: FloatField get() = FloatField
+
+    @Suppress("UNCHECKED_CAST")
+    public override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixSparseCSC> = when {
+        this is EjmlFloatMatrix<*> && origin is FMatrixSparseCSC -> this as EjmlFloatMatrix<FMatrixSparseCSC>
+        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    public override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixSparseCSC> = when {
+        this is EjmlFloatVector<*> && origin is FMatrixSparseCSC -> this as EjmlFloatVector<FMatrixSparseCSC>
+        else -> EjmlFloatVector(FMatrixSparseCSC(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
+        })
+    }
+
+    public override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: FloatField.(i: Int, j: Int) -> Float,
+    ): EjmlFloatMatrix<FMatrixSparseCSC> = FMatrixSparseCSC(rows, columns).also {
+        (0 until rows).forEach { row ->
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
+        }
+    }.wrapMatrix()
+
+    public override fun buildVector(
+        size: Int,
+        initializer: FloatField.(Int) -> Float,
+    ): EjmlFloatVector<FMatrixSparseCSC> = EjmlFloatVector(FMatrixSparseCSC(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
+
+    private fun <T : FMatrix> T.wrapMatrix() = EjmlFloatMatrix(this)
+    private fun <T : FMatrix> T.wrapVector() = EjmlFloatVector(this)
+
+    public override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
+
+    public override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
+
+    public override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
+
+    public override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+
+        CommonOps_FSCC.add(
+            elementAlgebra.one, 
+            toEjml().origin, 
+            elementAlgebra { -one },
+            other.toEjml().origin, 
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    public override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.scale(value, toEjml().origin, res)
+        return res.wrapMatrix()
+    }
+
+    public override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.changeSign(toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    public override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+        
+        CommonOps_FSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin, 
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    public override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+
+        CommonOps_FSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin,
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapVector()
+    }
+
+    public override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+
+        CommonOps_FSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra { -one },
+            other.toEjml().origin,
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapVector()
+    }
+
+    public override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> = m * this
+
+    public override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.scale(value, toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    public override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> = v * this
+
+    @UnstableKMathAPI
+    public override fun <F : StructureFeature> getFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
+        structure.getFeature(type)?.let { return it }
+        val origin = structure.toEjml().origin
+
+        return when (type) {
+            QRDecompositionFeature::class -> object : QRDecompositionFeature<Float> {
+                private val qr by lazy {
+                    DecompositionFactory_FSCC.qr(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<Float> by lazy {
+                    qr.getQ(null, false).wrapMatrix() + OrthogonalFeature
+                }
+
+                override val r: Matrix<Float> by lazy { qr.getR(null, false).wrapMatrix() + UFeature }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Float> {
+                override val l: Matrix<Float> by lazy {
+                    val cholesky =
+                        DecompositionFactory_FSCC.cholesky().apply { decompose(origin.copy()) }
+
+                    (cholesky.getT(null) as FMatrix).wrapMatrix() + LFeature
+                }
+            }
+
+            LUDecompositionFeature::class, DeterminantFeature::class, InverseMatrixFeature::class -> object :
+                LUDecompositionFeature<Float>, DeterminantFeature<Float>, InverseMatrixFeature<Float> {
+                private val lu by lazy {
+                    DecompositionFactory_FSCC.lu(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<Float> by lazy {
+                    lu.getLower(null).wrapMatrix() + LFeature
+                }
+
+                override val u: Matrix<Float> by lazy {
+                    lu.getUpper(null).wrapMatrix() + UFeature
+                }
+
+                override val inverse: Matrix<Float> by lazy {
+                    var a = origin
+                    val inverse = FMatrixRMaj(1, 1)
+                    val solver = LinearSolverFactory_FSCC.lu(FillReducing.NONE)
+                    if (solver.modifiesA()) a = a.copy()
+                    val i = CommonOps_FDRM.identity(a.numRows)
+                    solver.solve(i, inverse)
+                    inverse.wrapMatrix()
+                }
+
+                override val determinant: Float by lazy { elementAlgebra.number(lu.computeDeterminant().real) }
+            }
+
+            else -> null
+        }?.let(type::cast)
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Float>, b: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.solve(FMatrixSparseCSC(a.toEjml().origin), FMatrixSparseCSC(b.toEjml().origin), res)
+        return res.wrapMatrix()
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Float>, b: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.solve(FMatrixSparseCSC(a.toEjml().origin), FMatrixSparseCSC(b.toEjml().origin), res)
+        return EjmlFloatVector(res)
+    }
+}
+
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
index 9bf76033d..9592bfa6c 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
@@ -18,7 +18,7 @@ internal class EjmlVectorTest {
 
     private val randomMatrix: DMatrixRMaj
         get() {
-            val d = DMatrixRMaj(random.nextInt(2, 100), 1)
+            val d = DMatrixRMaj(1, random.nextInt(2, 100))
             RandomMatrices_DDRM.fillUniform(d, random.asJavaRandom())
             return d
         }
@@ -27,7 +27,7 @@ internal class EjmlVectorTest {
     fun size() {
         val m = randomMatrix
         val w = EjmlDoubleVector(m)
-        assertEquals(m.numRows, w.size)
+        assertEquals(m.numCols, w.size)
     }
 
     @Test
@@ -43,7 +43,7 @@ internal class EjmlVectorTest {
         val w = EjmlDoubleVector(m)
 
         assertEquals(
-            m.iterator(true, 0, 0, m.numRows - 1, 0).asSequence().toList(),
+            m.iterator(true, 0, 0, 0, m.numCols - 1).asSequence().toList(),
             w.iterator().asSequence().toList()
         )
     }
-- 
2.34.1


From 15d874fb06c355cfcd3e611b534ae32ba8682a2b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 16 May 2021 19:53:21 +0300
Subject: [PATCH 249/713] Remove MST.Symbolic Replace it by Symbol LogicAlgebra

---
 CHANGELOG.md                                  |   1 +
 .../ExpressionsInterpretersBenchmark.kt       |   2 -
 .../space/kscience/kmath/ast/expressions.kt   |   2 +-
 .../kscience/kmath/ast/kotlingradSupport.kt   |   2 +-
 .../kmath/commons/fit/fitWithAutoDiff.kt      |   2 +-
 .../kotlin/space/kscience/kmath/ast/parser.kt |   3 +-
 .../kscience/kmath/ast/rendering/features.kt  |   8 +-
 .../TestCompilerConsistencyWithInterpreter.kt |   2 +-
 .../kmath/ast/TestCompilerOperations.kt       |  12 +-
 .../kmath/ast/TestCompilerVariables.kt        |   2 +-
 .../kotlin/space/kscience/kmath/ast/utils.kt  |   2 +-
 .../space/kscience/kmath/estree/estree.kt     |   9 +-
 .../kmath/estree/internal/ESTreeBuilder.kt    |   7 +-
 .../kmath/wasm/internal/WasmBuilder.kt        |  16 +--
 .../kotlin/space/kscience/kmath/wasm/wasm.kt  |   2 +-
 .../kscience/kmath/ast/TestExecutionTime.kt   |   1 -
 .../kotlin/space/kscience/kmath/ast/utils.kt  |   2 +-
 .../kscience/kmath/wasm/TestWasmSpecific.kt   |   2 +-
 .../kotlin/space/kscience/kmath/asm/asm.kt    |   9 +-
 .../kmath/asm/internal/mapIntrinsics.kt       |   4 +-
 .../kotlin/space/kscience/kmath/ast/utils.kt  |   2 +-
 .../DerivativeStructureExpression.kt          |   1 -
 .../commons/optimization/CMOptimization.kt    |  14 +-
 .../kmath/commons/optimization/cmFit.kt       |   2 +-
 .../DerivativeStructureExpressionTest.kt      |   6 +-
 .../commons/optimization/OptimizeTest.kt      |   2 +-
 .../complex/ExpressionFieldForComplexTest.kt  |   2 +-
 kmath-core/api/kmath-core.api                 | 130 +++++++++---------
 .../space/kscience/kmath/data/ColumnarData.kt |   2 +-
 .../kscience/kmath/data/XYColumnarData.kt     |   2 +-
 .../kscience/kmath/data/XYZColumnarData.kt    |   2 +-
 .../expressions/DifferentiableExpression.kt   |   3 -
 .../kscience/kmath/expressions/Expression.kt  |   2 -
 .../FunctionalExpressionAlgebra.kt            |   1 -
 .../space/kscience/kmath/expressions/MST.kt   |  19 +--
 .../kscience/kmath/expressions/MstAlgebra.kt  |  42 ++++--
 .../kmath/expressions/SimpleAutoDiff.kt       |   1 -
 .../kmath/{misc => expressions}/Symbol.kt     |   7 +-
 .../kmath/expressions/SymbolIndexer.kt        |   1 -
 .../kscience/kmath/operations/Algebra.kt      |   3 +-
 .../kscience/kmath/operations/LogicAlgebra.kt |  71 ++++++++++
 .../kmath/expressions/ExpressionFieldTest.kt  |   1 -
 .../kmath/expressions/InterpretTest.kt        |   1 -
 .../kmath/expressions/SimpleAutoDiffTest.kt   |   2 -
 .../kotlingrad/DifferentiableMstExpression.kt |  10 +-
 .../kmath/kotlingrad/ScalarsAdapters.kt       |  11 +-
 .../kmath/kotlingrad/AdaptingTests.kt         |  12 +-
 .../optimization/FunctionOptimization.kt      |   6 +-
 .../NoDerivFunctionOptimization.kt            |   2 +-
 .../kmath/optimization/Optimization.kt        |   2 +-
 .../kscience/kmath/optimization/XYFit.kt      |   6 +-
 51 files changed, 254 insertions(+), 204 deletions(-)
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/{misc => expressions}/Symbol.kt (91%)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a5bde44a..e9a67a0ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - Rewritten EJML module without ejml-simple
 - Stability of kmath-ast and kmath-kotilngrad promoted to EXPERIMENTAL.
 - ColumnarData returns nullable column
+- Replaced MST.Symbolic by Symbol. Symbol now inherits MST
 
 ### Deprecated
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
index 942fba308..15cd14399 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
@@ -11,8 +11,6 @@ import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import space.kscience.kmath.asm.compileToExpression
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.misc.Symbol
-import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
index 918134e04..d5a82590f 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.ast
 
 import space.kscience.kmath.expressions.MstField
+import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.interpret
-import space.kscience.kmath.misc.Symbol.Companion.x
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
index 25f42f5a9..420b23f9f 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
@@ -8,8 +8,8 @@ package space.kscience.kmath.ast
 import space.kscience.kmath.asm.compileToExpression
 import space.kscience.kmath.expressions.derivative
 import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.kotlingrad.toDiffExpression
-import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.DoubleField
 
 /**
diff --git a/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt b/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
index 028985260..5e64235e3 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
@@ -10,7 +10,7 @@ import kotlinx.html.h3
 import space.kscience.kmath.commons.optimization.chiSquared
 import space.kscience.kmath.commons.optimization.minimize
 import space.kscience.kmath.distributions.NormalDistribution
-import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.optimization.FunctionOptimization
 import space.kscience.kmath.optimization.OptimizationResult
 import space.kscience.kmath.real.DoubleVector
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
index 246625d29..5201fec38 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
@@ -17,6 +17,7 @@ import com.github.h0tk3y.betterParse.lexer.regexToken
 import com.github.h0tk3y.betterParse.parser.ParseResult
 import com.github.h0tk3y.betterParse.parser.Parser
 import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.expressions.StringSymbol
 import space.kscience.kmath.operations.FieldOperations
 import space.kscience.kmath.operations.GroupOperations
 import space.kscience.kmath.operations.PowerOperations
@@ -42,7 +43,7 @@ public object ArithmeticsEvaluator : Grammar<MST>() {
     private val ws: Token by regexToken("\\s+".toRegex(), ignore = true)
 
     private val number: Parser<MST> by num use { MST.Numeric(text.toDouble()) }
-    private val singular: Parser<MST> by id use { MST.Symbolic(text) }
+    private val singular: Parser<MST> by id use { StringSymbol(text) }
 
     private val unaryFunction: Parser<MST> by (id and -lpar and parser(ArithmeticsEvaluator::subSumChain) and -rpar)
         .map { (id, term) -> MST.Unary(id.text, term) }
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index ac716f9ff..863825799 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.ast.rendering
 
 import space.kscience.kmath.ast.rendering.FeaturedMathRenderer.RenderFeature
 import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import kotlin.reflect.KClass
@@ -19,9 +20,8 @@ import kotlin.reflect.KClass
 @UnstableKMathAPI
 public object PrintSymbolic : RenderFeature {
     public override fun render(renderer: FeaturedMathRenderer, node: MST): SymbolSyntax? =
-        if (node !is MST.Symbolic) null
-        else
-            SymbolSyntax(string = node.value)
+        if (node !is Symbol) null
+        else SymbolSyntax(string = node.identity)
 }
 
 /**
@@ -142,7 +142,7 @@ public class PrettyPrintIntegers(public val types: Set<KClass<out Number>>) : Re
 @UnstableKMathAPI
 public class PrettyPrintPi(public val symbols: Set<String>) : RenderFeature {
     public override fun render(renderer: FeaturedMathRenderer, node: MST): SpecialSymbolSyntax? =
-        if (node !is MST.Symbolic || node.value !in symbols)
+        if (node !is Symbol || node.identity !in symbols)
             null
         else
             SpecialSymbolSyntax(kind = SpecialSymbolSyntax.Kind.SMALL_PI)
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
index 0d018070c..6209661b3 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
@@ -7,8 +7,8 @@ package space.kscience.kmath.ast
 
 import space.kscience.kmath.expressions.MstField
 import space.kscience.kmath.expressions.MstRing
+import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.interpret
-import space.kscience.kmath.misc.Symbol.Companion.x
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.operations.bindSymbol
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
index 7d2af31c2..073a03f14 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.ast
 
 import space.kscience.kmath.expressions.MstExtendedField
+import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.Symbol.Companion.x
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
@@ -17,31 +17,31 @@ import kotlin.test.assertEquals
 internal class TestCompilerOperations {
     @Test
     fun testUnaryPlus() = runCompilerTest {
-        val expr = MstExtendedField { +bindSymbol(x) }.compileToExpression(DoubleField)
+        val expr = MstExtendedField { +x }.compileToExpression(DoubleField)
         assertEquals(2.0, expr(x to 2.0))
     }
 
     @Test
     fun testUnaryMinus() = runCompilerTest {
-        val expr = MstExtendedField { -bindSymbol(x) }.compileToExpression(DoubleField)
+        val expr = MstExtendedField { -x }.compileToExpression(DoubleField)
         assertEquals(-2.0, expr(x to 2.0))
     }
 
     @Test
     fun testAdd() = runCompilerTest {
-        val expr = MstExtendedField { bindSymbol(x) + bindSymbol(x) }.compileToExpression(DoubleField)
+        val expr = MstExtendedField { x + x }.compileToExpression(DoubleField)
         assertEquals(4.0, expr(x to 2.0))
     }
 
     @Test
     fun testSine() = runCompilerTest {
-        val expr = MstExtendedField { sin(bindSymbol(x)) }.compileToExpression(DoubleField)
+        val expr = MstExtendedField { sin(x) }.compileToExpression(DoubleField)
         assertEquals(0.0, expr(x to 0.0))
     }
 
     @Test
     fun testCosine() = runCompilerTest {
-        val expr = MstExtendedField { cos(bindSymbol(x)) }.compileToExpression(DoubleField)
+        val expr = MstExtendedField { cos(x) }.compileToExpression(DoubleField)
         assertEquals(1.0, expr(x to 0.0))
     }
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
index ecf8ed367..dcc15b311 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.ast
 
 import space.kscience.kmath.expressions.MstRing
+import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.Symbol.Companion.x
 import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
index abeaed0f8..ec7436188 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.ast
 
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
index 40468f5ab..0c15e994c 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
@@ -9,22 +9,23 @@ import space.kscience.kmath.estree.internal.ESTreeBuilder
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.MST.*
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.invoke
 import space.kscience.kmath.internal.estree.BaseExpression
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.NumericAlgebra
+import space.kscience.kmath.operations.bindSymbolOrNull
 
 @PublishedApi
 internal fun <T> MST.compileWith(algebra: Algebra<T>): Expression<T> {
     fun ESTreeBuilder<T>.visit(node: MST): BaseExpression = when (node) {
-        is Symbolic -> {
-            val symbol = algebra.bindSymbolOrNull(node.value)
+        is Symbol -> {
+            val symbol = algebra.bindSymbolOrNull(node)
 
             if (symbol != null)
                 constant(symbol)
             else
-                variable(node.value)
+                variable(node.identity)
         }
 
         is Numeric -> constant(node.value)
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
index ac20484a4..4907d8225 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
@@ -6,14 +6,9 @@
 package space.kscience.kmath.estree.internal
 
 import space.kscience.kmath.expressions.Expression
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.internal.astring.generate
 import space.kscience.kmath.internal.estree.*
-import space.kscience.kmath.internal.estree.BaseExpression
-import space.kscience.kmath.internal.estree.BlockStatement
-import space.kscience.kmath.internal.estree.Program
-import space.kscience.kmath.internal.estree.VariableDeclaration
-import space.kscience.kmath.internal.estree.VariableDeclarator
-import space.kscience.kmath.misc.Symbol
 
 internal class ESTreeBuilder<T>(val bodyCallback: ESTreeBuilder<T>.() -> BaseExpression) {
     private class GeneratedExpression<T>(val executable: dynamic, val constants: Array<dynamic>) : Expression<T> {
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index 8fd3c9fb9..95ace1bad 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -8,9 +8,9 @@ package space.kscience.kmath.wasm.internal
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.MST.*
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.internal.binaryen.*
 import space.kscience.kmath.internal.webassembly.Instance
-import space.kscience.kmath.misc.StringSymbol
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.internal.binaryen.Module as BinaryenModule
 import space.kscience.kmath.internal.webassembly.Module as WasmModule
@@ -23,20 +23,20 @@ internal sealed class WasmBuilder<T>(
     val algebra: Algebra<T>,
     val target: MST,
 ) where T : Number {
-    val keys: MutableList<String> = mutableListOf()
+    val keys: MutableList<Symbol> = mutableListOf()
     lateinit var ctx: BinaryenModule
 
-    open fun visitSymbolic(mst: Symbolic): ExpressionRef {
+    open fun visitSymbolic(mst: Symbol): ExpressionRef {
         try {
-            algebra.bindSymbol(mst.value)
+            algebra.bindSymbol(mst)
         } catch (ignored: Throwable) {
             null
         }?.let { return visitNumeric(Numeric(it)) }
 
-        var idx = keys.indexOf(mst.value)
+        var idx = keys.indexOf(mst)
 
         if (idx == -1) {
-            keys += mst.value
+            keys += mst
             idx = keys.lastIndex
         }
 
@@ -54,7 +54,7 @@ internal sealed class WasmBuilder<T>(
     open fun createModule(): BinaryenModule = js("new \$module\$binaryen.Module()")
 
     fun visit(mst: MST): ExpressionRef = when (mst) {
-        is Symbolic -> visitSymbolic(mst)
+        is Symbol -> visitSymbolic(mst)
         is Numeric -> visitNumeric(mst)
 
         is Unary -> when {
@@ -96,7 +96,7 @@ internal sealed class WasmBuilder<T>(
         })
 
         val i = Instance(c, js("{}") as Any)
-        val symbols = keys.map(::StringSymbol)
+        val symbols = keys
         keys.clear()
 
         Expression<T> { args ->
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
index 394a0567e..6ea8f26c1 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
@@ -8,8 +8,8 @@ package space.kscience.kmath.wasm
 import space.kscience.kmath.estree.compileWith
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
index 01746ddb6..6cb378182 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
@@ -6,7 +6,6 @@
 package space.kscience.kmath.ast
 
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.bindSymbol
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
index 6b5b1b83d..93b7e9449 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.ast
 
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.estree.compile as estreeCompile
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
index dd5452d04..abdf865c7 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.wasm
 import space.kscience.kmath.expressions.MstExtendedField
 import space.kscience.kmath.expressions.MstRing
 import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.operations.bindSymbol
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
index dbce893d1..4147324ee 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
@@ -10,10 +10,11 @@ import space.kscience.kmath.asm.internal.buildName
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.MST.*
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.NumericAlgebra
+import space.kscience.kmath.operations.bindSymbolOrNull
 
 /**
  * Compiles given MST to an Expression using AST compiler.
@@ -26,13 +27,13 @@ import space.kscience.kmath.operations.NumericAlgebra
 @PublishedApi
 internal fun <T : Any> MST.compileWith(type: Class<T>, algebra: Algebra<T>): Expression<T> {
     fun AsmBuilder<T>.visit(node: MST): Unit = when (node) {
-        is Symbolic -> {
-            val symbol = algebra.bindSymbolOrNull(node.value)
+        is Symbol -> {
+            val symbol = algebra.bindSymbolOrNull(node)
 
             if (symbol != null)
                 loadObjectConstant(symbol as Any)
             else
-                loadVariable(node.value)
+                loadVariable(node.identity)
         }
 
         is Numeric -> loadNumberConstant(node.value)
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
index dc8f19fb6..8f4daecf9 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
@@ -7,8 +7,8 @@
 
 package space.kscience.kmath.asm.internal
 
-import space.kscience.kmath.misc.StringSymbol
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.expressions.StringSymbol
+import space.kscience.kmath.expressions.Symbol
 
 /**
  * Gets value with given [key] or throws [NoSuchElementException] whenever it is not present.
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
index 607c5fdd6..d3b554efd 100644
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.ast
 
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.asm.compile as asmCompile
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
index 736685789..89e216601 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
@@ -7,7 +7,6 @@ package space.kscience.kmath.commons.expressions
 
 import org.apache.commons.math3.analysis.differentiation.DerivativeStructure
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.NumbersAddOperations
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
index cfb8c39be..bca00de46 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
@@ -14,13 +14,17 @@ import org.apache.commons.math3.optim.nonlinear.scalar.gradient.NonLinearConjuga
 import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.AbstractSimplex
 import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.NelderMeadSimplex
 import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.SimplexOptimizer
-import space.kscience.kmath.expressions.DifferentiableExpression
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.SymbolIndexer
-import space.kscience.kmath.expressions.derivative
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.expressions.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.optimization.*
+import kotlin.collections.HashMap
+import kotlin.collections.List
+import kotlin.collections.Map
+import kotlin.collections.set
+import kotlin.collections.setOf
+import kotlin.collections.toList
+import kotlin.collections.toMap
+import kotlin.collections.toTypedArray
 import kotlin.reflect.KClass
 
 public operator fun PointValuePair.component1(): DoubleArray = point
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
index 13b5c73f4..a5a913623 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
@@ -9,7 +9,7 @@ import org.apache.commons.math3.analysis.differentiation.DerivativeStructure
 import space.kscience.kmath.commons.expressions.DerivativeStructureField
 import space.kscience.kmath.expressions.DifferentiableExpression
 import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.optimization.FunctionOptimization
 import space.kscience.kmath.optimization.OptimizationResult
 import space.kscience.kmath.optimization.noDerivOptimizeWith
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
index 879cd75b1..966675062 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
@@ -5,11 +5,7 @@
 
 package space.kscience.kmath.commons.expressions
 
-import space.kscience.kmath.expressions.binding
-import space.kscience.kmath.expressions.derivative
-import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.Symbol
-import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.expressions.*
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.test.Test
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index 716cd1b0f..15c9120ec 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.commons.optimization
 import kotlinx.coroutines.runBlocking
 import space.kscience.kmath.commons.expressions.DerivativeStructureExpression
 import space.kscience.kmath.distributions.NormalDistribution
-import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.optimization.FunctionOptimization
 import space.kscience.kmath.stat.RandomGenerator
 import kotlin.math.pow
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt
index e023fcb81..4279471d4 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.complex
 
 import space.kscience.kmath.expressions.FunctionalExpressionField
 import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.symbol
+import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.operations.bindSymbol
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 7b09b668b..ead4b96b5 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -21,7 +21,7 @@ public class space/kscience/kmath/expressions/AutoDiffValue {
 
 public final class space/kscience/kmath/expressions/DerivationResult {
 	public fun <init> (Ljava/lang/Object;Ljava/util/Map;Lspace/kscience/kmath/operations/Field;)V
-	public final fun derivative (Lspace/kscience/kmath/misc/Symbol;)Ljava/lang/Object;
+	public final fun derivative (Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
 	public final fun div ()Ljava/lang/Object;
 	public final fun getContext ()Lspace/kscience/kmath/operations/Field;
 	public final fun getValue ()Ljava/lang/Object;
@@ -34,7 +34,7 @@ public abstract interface class space/kscience/kmath/expressions/DifferentiableE
 public final class space/kscience/kmath/expressions/DifferentiableExpressionKt {
 	public static final fun derivative (Lspace/kscience/kmath/expressions/DifferentiableExpression;Ljava/lang/String;)Lspace/kscience/kmath/expressions/Expression;
 	public static final fun derivative (Lspace/kscience/kmath/expressions/DifferentiableExpression;Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
-	public static final fun derivative (Lspace/kscience/kmath/expressions/DifferentiableExpression;[Lspace/kscience/kmath/misc/Symbol;)Lspace/kscience/kmath/expressions/Expression;
+	public static final fun derivative (Lspace/kscience/kmath/expressions/DifferentiableExpression;[Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/expressions/Expression;
 }
 
 public abstract interface class space/kscience/kmath/expressions/Expression {
@@ -55,7 +55,7 @@ public final class space/kscience/kmath/expressions/ExpressionKt {
 public abstract class space/kscience/kmath/expressions/FirstDerivativeExpression : space/kscience/kmath/expressions/DifferentiableExpression {
 	public fun <init> ()V
 	public final fun derivativeOrNull (Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
-	public abstract fun derivativeOrNull (Lspace/kscience/kmath/misc/Symbol;)Lspace/kscience/kmath/expressions/Expression;
+	public abstract fun derivativeOrNull (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/expressions/Expression;
 }
 
 public abstract class space/kscience/kmath/expressions/FunctionalExpressionAlgebra : space/kscience/kmath/expressions/ExpressionAlgebra {
@@ -146,7 +146,7 @@ public class space/kscience/kmath/expressions/FunctionalExpressionRing : space/k
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
 }
 
-public abstract class space/kscience/kmath/expressions/MST {
+public abstract interface class space/kscience/kmath/expressions/MST {
 }
 
 public final class space/kscience/kmath/expressions/MST$Binary : space/kscience/kmath/expressions/MST {
@@ -175,17 +175,6 @@ public final class space/kscience/kmath/expressions/MST$Numeric : space/kscience
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class space/kscience/kmath/expressions/MST$Symbolic : space/kscience/kmath/expressions/MST {
-	public fun <init> (Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;)Lspace/kscience/kmath/expressions/MST$Symbolic;
-	public static synthetic fun copy$default (Lspace/kscience/kmath/expressions/MST$Symbolic;Ljava/lang/String;ILjava/lang/Object;)Lspace/kscience/kmath/expressions/MST$Symbolic;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getValue ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class space/kscience/kmath/expressions/MST$Unary : space/kscience/kmath/expressions/MST {
 	public fun <init> (Ljava/lang/String;Lspace/kscience/kmath/expressions/MST;)V
 	public final fun component1 ()Ljava/lang/String;
@@ -206,18 +195,6 @@ public final class space/kscience/kmath/expressions/MSTKt {
 	public static final fun toExpression (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/operations/Algebra;)Lspace/kscience/kmath/expressions/Expression;
 }
 
-public final class space/kscience/kmath/expressions/MstAlgebra : space/kscience/kmath/operations/NumericAlgebra {
-	public static final field INSTANCE Lspace/kscience/kmath/expressions/MstAlgebra;
-	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
-	public synthetic fun bindSymbol (Ljava/lang/String;)Ljava/lang/Object;
-	public fun bindSymbol (Ljava/lang/String;)Lspace/kscience/kmath/expressions/MST$Symbolic;
-	public synthetic fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
-	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/MST$Symbolic;
-	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
-	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/expressions/MST$Numeric;
-	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
-}
-
 public final class space/kscience/kmath/expressions/MstExtendedField : space/kscience/kmath/operations/ExtendedField, space/kscience/kmath/operations/NumericAlgebra {
 	public static final field INSTANCE Lspace/kscience/kmath/expressions/MstExtendedField;
 	public synthetic fun acos (Ljava/lang/Object;)Ljava/lang/Object;
@@ -236,7 +213,7 @@ public final class space/kscience/kmath/expressions/MstExtendedField : space/ksc
 	public fun atanh (Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Unary;
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
 	public synthetic fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
-	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/MST$Symbolic;
+	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/Symbol;
 	public synthetic fun cos (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun cos (Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Unary;
 	public synthetic fun cosh (Ljava/lang/Object;)Ljava/lang/Object;
@@ -284,7 +261,7 @@ public final class space/kscience/kmath/expressions/MstField : space/kscience/km
 	public fun add (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Binary;
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
 	public synthetic fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
-	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/MST$Symbolic;
+	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/Symbol;
 	public synthetic fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun divide (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Binary;
 	public synthetic fun getOne ()Ljava/lang/Object;
@@ -312,7 +289,7 @@ public final class space/kscience/kmath/expressions/MstGroup : space/kscience/km
 	public fun add (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Binary;
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
 	public synthetic fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
-	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/MST$Symbolic;
+	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/Symbol;
 	public synthetic fun getZero ()Ljava/lang/Object;
 	public fun getZero ()Lspace/kscience/kmath/expressions/MST$Numeric;
 	public synthetic fun minus (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -328,13 +305,25 @@ public final class space/kscience/kmath/expressions/MstGroup : space/kscience/km
 	public fun unaryPlus (Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Unary;
 }
 
+public final class space/kscience/kmath/expressions/MstNumericAlgebra : space/kscience/kmath/operations/NumericAlgebra {
+	public static final field INSTANCE Lspace/kscience/kmath/expressions/MstNumericAlgebra;
+	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
+	public synthetic fun bindSymbol (Ljava/lang/String;)Ljava/lang/Object;
+	public fun bindSymbol (Ljava/lang/String;)Lspace/kscience/kmath/expressions/Symbol;
+	public synthetic fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
+	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/Symbol;
+	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
+	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/expressions/MST$Numeric;
+	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+}
+
 public final class space/kscience/kmath/expressions/MstRing : space/kscience/kmath/operations/NumbersAddOperations, space/kscience/kmath/operations/Ring, space/kscience/kmath/operations/ScaleOperations {
 	public static final field INSTANCE Lspace/kscience/kmath/expressions/MstRing;
 	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun add (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Binary;
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
 	public synthetic fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
-	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/MST$Symbolic;
+	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/Symbol;
 	public synthetic fun getOne ()Ljava/lang/Object;
 	public fun getOne ()Lspace/kscience/kmath/expressions/MST$Numeric;
 	public synthetic fun getZero ()Ljava/lang/Object;
@@ -356,7 +345,7 @@ public final class space/kscience/kmath/expressions/MstRing : space/kscience/kma
 
 public final class space/kscience/kmath/expressions/SimpleAutoDiffExpression : space/kscience/kmath/expressions/FirstDerivativeExpression {
 	public fun <init> (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function1;)V
-	public fun derivativeOrNull (Lspace/kscience/kmath/misc/Symbol;)Lspace/kscience/kmath/expressions/Expression;
+	public fun derivativeOrNull (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/expressions/Expression;
 	public final fun getField ()Lspace/kscience/kmath/operations/Field;
 	public final fun getFunction ()Lkotlin/jvm/functions/Function1;
 	public fun invoke (Ljava/util/Map;)Ljava/lang/Object;
@@ -445,7 +434,7 @@ public final class space/kscience/kmath/expressions/SimpleAutoDiffKt {
 	public static final fun cos (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public static final fun cosh (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public static final fun exp (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
-	public static final fun grad (Lspace/kscience/kmath/expressions/DerivationResult;[Lspace/kscience/kmath/misc/Symbol;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun grad (Lspace/kscience/kmath/expressions/DerivationResult;[Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun ln (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public static final fun pow (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;D)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public static final fun pow (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;I)Lspace/kscience/kmath/expressions/AutoDiffValue;
@@ -461,9 +450,42 @@ public final class space/kscience/kmath/expressions/SimpleAutoDiffKt {
 	public static final fun tanh (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 }
 
+public final class space/kscience/kmath/expressions/StringSymbol : space/kscience/kmath/expressions/Symbol {
+	public static final synthetic fun box-impl (Ljava/lang/String;)Lspace/kscience/kmath/expressions/StringSymbol;
+	public static fun constructor-impl (Ljava/lang/String;)Ljava/lang/String;
+	public fun equals (Ljava/lang/Object;)Z
+	public static fun equals-impl (Ljava/lang/String;Ljava/lang/Object;)Z
+	public static final fun equals-impl0 (Ljava/lang/String;Ljava/lang/String;)Z
+	public fun getIdentity ()Ljava/lang/String;
+	public fun hashCode ()I
+	public static fun hashCode-impl (Ljava/lang/String;)I
+	public fun toString ()Ljava/lang/String;
+	public static fun toString-impl (Ljava/lang/String;)Ljava/lang/String;
+	public final synthetic fun unbox-impl ()Ljava/lang/String;
+}
+
+public abstract interface class space/kscience/kmath/expressions/Symbol : space/kscience/kmath/expressions/MST {
+	public static final field Companion Lspace/kscience/kmath/expressions/Symbol$Companion;
+	public abstract fun getIdentity ()Ljava/lang/String;
+}
+
+public final class space/kscience/kmath/expressions/Symbol$Companion {
+	public final fun getX-uKgCeAI ()Ljava/lang/String;
+	public final fun getY-uKgCeAI ()Ljava/lang/String;
+	public final fun getZ-uKgCeAI ()Ljava/lang/String;
+}
+
 public final class space/kscience/kmath/expressions/SymbolIndexerKt {
 }
 
+public final class space/kscience/kmath/expressions/SymbolKt {
+	public static final fun get (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Object;
+	public static final fun get (Ljava/util/Map;Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
+	public static final fun getSymbol ()Lkotlin/properties/ReadOnlyProperty;
+	public static final fun set (Ljava/util/Map;Ljava/lang/String;Ljava/lang/Object;)V
+	public static final fun set (Ljava/util/Map;Lspace/kscience/kmath/expressions/Symbol;Ljava/lang/Object;)V
+}
+
 public final class space/kscience/kmath/linear/BufferedLinearSpace : space/kscience/kmath/linear/LinearSpace {
 	public fun <init> (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;)V
 	public fun buildMatrix (IILkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/Structure2D;
@@ -677,39 +699,6 @@ public final class space/kscience/kmath/misc/CumulativeKt {
 public abstract interface annotation class space/kscience/kmath/misc/PerformancePitfall : java/lang/annotation/Annotation {
 }
 
-public final class space/kscience/kmath/misc/StringSymbol : space/kscience/kmath/misc/Symbol {
-	public static final synthetic fun box-impl (Ljava/lang/String;)Lspace/kscience/kmath/misc/StringSymbol;
-	public static fun constructor-impl (Ljava/lang/String;)Ljava/lang/String;
-	public fun equals (Ljava/lang/Object;)Z
-	public static fun equals-impl (Ljava/lang/String;Ljava/lang/Object;)Z
-	public static final fun equals-impl0 (Ljava/lang/String;Ljava/lang/String;)Z
-	public fun getIdentity ()Ljava/lang/String;
-	public fun hashCode ()I
-	public static fun hashCode-impl (Ljava/lang/String;)I
-	public fun toString ()Ljava/lang/String;
-	public static fun toString-impl (Ljava/lang/String;)Ljava/lang/String;
-	public final synthetic fun unbox-impl ()Ljava/lang/String;
-}
-
-public abstract interface class space/kscience/kmath/misc/Symbol {
-	public static final field Companion Lspace/kscience/kmath/misc/Symbol$Companion;
-	public abstract fun getIdentity ()Ljava/lang/String;
-}
-
-public final class space/kscience/kmath/misc/Symbol$Companion {
-	public final fun getX-tWtZOCg ()Ljava/lang/String;
-	public final fun getY-tWtZOCg ()Ljava/lang/String;
-	public final fun getZ-tWtZOCg ()Ljava/lang/String;
-}
-
-public final class space/kscience/kmath/misc/SymbolKt {
-	public static final fun get (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Object;
-	public static final fun get (Ljava/util/Map;Lspace/kscience/kmath/misc/Symbol;)Ljava/lang/Object;
-	public static final fun getSymbol ()Lkotlin/properties/ReadOnlyProperty;
-	public static final fun set (Ljava/util/Map;Ljava/lang/String;Ljava/lang/Object;)V
-	public static final fun set (Ljava/util/Map;Lspace/kscience/kmath/misc/Symbol;Ljava/lang/Object;)V
-}
-
 public abstract interface annotation class space/kscience/kmath/misc/UnstableKMathAPI : java/lang/annotation/Annotation {
 }
 
@@ -1028,8 +1017,8 @@ public final class space/kscience/kmath/operations/AlgebraExtensionsKt {
 }
 
 public final class space/kscience/kmath/operations/AlgebraKt {
-	public static final fun bindSymbol (Lspace/kscience/kmath/operations/Algebra;Lspace/kscience/kmath/misc/Symbol;)Ljava/lang/Object;
-	public static final fun bindSymbolOrNull (Lspace/kscience/kmath/operations/Algebra;Lspace/kscience/kmath/misc/Symbol;)Ljava/lang/Object;
+	public static final fun bindSymbol (Lspace/kscience/kmath/operations/Algebra;Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
+	public static final fun bindSymbolOrNull (Lspace/kscience/kmath/operations/Algebra;Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
 	public static final fun invoke (Lspace/kscience/kmath/operations/Algebra;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
@@ -1414,6 +1403,11 @@ public final class space/kscience/kmath/operations/JBigIntegerField : space/ksci
 public abstract interface annotation class space/kscience/kmath/operations/KMathContext : java/lang/annotation/Annotation {
 }
 
+public final class space/kscience/kmath/operations/LogicAlgebra$Companion {
+	public final fun getFALSE ()Lspace/kscience/kmath/expressions/Symbol;
+	public final fun getTRUE ()Lspace/kscience/kmath/expressions/Symbol;
+}
+
 public final class space/kscience/kmath/operations/LongRing : space/kscience/kmath/operations/Norm, space/kscience/kmath/operations/NumericAlgebra, space/kscience/kmath/operations/Ring {
 	public static final field INSTANCE Lspace/kscience/kmath/operations/LongRing;
 	public fun add (JJ)Ljava/lang/Long;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
index f5193ecd2..88c14d311 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.data
 
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.structures.Buffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
index bbd679ce9..08bfd3ca3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.data
 
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.structures.Buffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
index 3972429a5..39a6b858c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.data
 
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
index dbc1431b3..33d72afad 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
@@ -5,9 +5,6 @@
 
 package space.kscience.kmath.expressions
 
-import space.kscience.kmath.misc.StringSymbol
-import space.kscience.kmath.misc.Symbol
-
 /**
  * Represents expression which structure can be differentiated.
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
index a9ab8648f..84e66918f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
@@ -5,8 +5,6 @@
 
 package space.kscience.kmath.expressions
 
-import space.kscience.kmath.misc.StringSymbol
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.operations.Algebra
 import kotlin.jvm.JvmName
 import kotlin.properties.ReadOnlyProperty
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
index 994d52a73..951ec9474 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.expressions
 
-import space.kscience.kmath.misc.StringSymbol
 import space.kscience.kmath.operations.*
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
index 67881d9af..0e046ae5c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
@@ -5,30 +5,23 @@
 
 package space.kscience.kmath.expressions
 
-import space.kscience.kmath.misc.StringSymbol
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.NumericAlgebra
+import space.kscience.kmath.operations.bindSymbol
 
 /**
  * A Mathematical Syntax Tree (MST) node for mathematical expressions.
  *
  * @author Alexander Nozik
  */
-public sealed class MST {
-    /**
-     * A node containing raw string.
-     *
-     * @property value the value of this node.
-     */
-    public data class Symbolic(val value: String) : MST()
+public sealed interface MST {
 
     /**
      * A node containing a numeric value or scalar.
      *
      * @property value the value of this number.
      */
-    public data class Numeric(val value: Number) : MST()
+    public data class Numeric(val value: Number) : MST
 
     /**
      * A node containing an unary operation.
@@ -36,7 +29,7 @@ public sealed class MST {
      * @property operation the identifier of operation.
      * @property value the argument of this operation.
      */
-    public data class Unary(val operation: String, val value: MST) : MST()
+    public data class Unary(val operation: String, val value: MST) : MST
 
     /**
      * A node containing binary operation.
@@ -45,7 +38,7 @@ public sealed class MST {
      * @property left the left operand.
      * @property right the right operand.
      */
-    public data class Binary(val operation: String, val left: MST, val right: MST) : MST()
+    public data class Binary(val operation: String, val left: MST, val right: MST) : MST
 }
 
 // TODO add a function with named arguments
@@ -62,7 +55,7 @@ public fun <T> Algebra<T>.evaluate(node: MST): T = when (node) {
     is MST.Numeric -> (this as? NumericAlgebra<T>)?.number(node.value)
         ?: error("Numeric nodes are not supported by $this")
 
-    is MST.Symbolic -> bindSymbol(node.value)
+    is Symbol -> bindSymbol(node)
 
     is MST.Unary -> when {
         this is NumericAlgebra && node.value is MST.Numeric -> unaryOperationFunction(node.operation)(number(node.value.value))
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
index 53124b777..fb2e38449 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
@@ -11,10 +11,10 @@ import space.kscience.kmath.operations.*
 /**
  * [Algebra] over [MST] nodes.
  */
-public object MstAlgebra : NumericAlgebra<MST> {
+public object MstNumericAlgebra : NumericAlgebra<MST> {
     public override fun number(value: Number): MST.Numeric = MST.Numeric(value)
-    public override fun bindSymbolOrNull(value: String): MST.Symbolic = MST.Symbolic(value)
-    override fun bindSymbol(value: String): MST.Symbolic = bindSymbolOrNull(value)
+    public override fun bindSymbolOrNull(value: String): Symbol = StringSymbol(value)
+    override fun bindSymbol(value: String): Symbol = bindSymbolOrNull(value)
 
     public override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
         { arg -> MST.Unary(operation, arg) }
@@ -29,8 +29,8 @@ public object MstAlgebra : NumericAlgebra<MST> {
 public object MstGroup : Group<MST>, NumericAlgebra<MST>, ScaleOperations<MST> {
     public override val zero: MST.Numeric = number(0.0)
 
-    public override fun number(value: Number): MST.Numeric = MstAlgebra.number(value)
-    public override fun bindSymbolOrNull(value: String): MST.Symbolic = MstAlgebra.bindSymbolOrNull(value)
+    public override fun number(value: Number): MST.Numeric = MstNumericAlgebra.number(value)
+    public override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
     public override fun add(a: MST, b: MST): MST.Binary = binaryOperationFunction(GroupOperations.PLUS_OPERATION)(a, b)
     public override operator fun MST.unaryPlus(): MST.Unary =
         unaryOperationFunction(GroupOperations.PLUS_OPERATION)(this)
@@ -45,10 +45,10 @@ public object MstGroup : Group<MST>, NumericAlgebra<MST>, ScaleOperations<MST> {
         binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, number(value))
 
     public override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
-        MstAlgebra.binaryOperationFunction(operation)
+        MstNumericAlgebra.binaryOperationFunction(operation)
 
     public override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
-        MstAlgebra.unaryOperationFunction(operation)
+        MstNumericAlgebra.unaryOperationFunction(operation)
 }
 
 /**
@@ -61,7 +61,7 @@ public object MstRing : Ring<MST>, NumbersAddOperations<MST>, ScaleOperations<MS
     public override val one: MST.Numeric = number(1.0)
 
     public override fun number(value: Number): MST.Numeric = MstGroup.number(value)
-    public override fun bindSymbolOrNull(value: String): MST.Symbolic = MstAlgebra.bindSymbolOrNull(value)
+    public override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
     public override fun add(a: MST, b: MST): MST.Binary = MstGroup.add(a, b)
 
     public override fun scale(a: MST, value: Double): MST.Binary =
@@ -78,7 +78,7 @@ public object MstRing : Ring<MST>, NumbersAddOperations<MST>, ScaleOperations<MS
         MstGroup.binaryOperationFunction(operation)
 
     public override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
-        MstAlgebra.unaryOperationFunction(operation)
+        MstNumericAlgebra.unaryOperationFunction(operation)
 }
 
 /**
@@ -90,7 +90,7 @@ public object MstField : Field<MST>, NumbersAddOperations<MST>, ScaleOperations<
     public override inline val zero: MST.Numeric get() = MstRing.zero
     public override inline val one: MST.Numeric get() = MstRing.one
 
-    public override fun bindSymbolOrNull(value: String): MST.Symbolic = MstAlgebra.bindSymbolOrNull(value)
+    public override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
     public override fun number(value: Number): MST.Numeric = MstRing.number(value)
     public override fun add(a: MST, b: MST): MST.Binary = MstRing.add(a, b)
 
@@ -120,7 +120,7 @@ public object MstExtendedField : ExtendedField<MST>, NumericAlgebra<MST> {
     public override inline val zero: MST.Numeric get() = MstField.zero
     public override inline val one: MST.Numeric get() = MstField.one
 
-    public override fun bindSymbolOrNull(value: String): MST.Symbolic = MstAlgebra.bindSymbolOrNull(value)
+    public override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
     public override fun number(value: Number): MST.Numeric = MstRing.number(value)
     public override fun sin(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.SIN_OPERATION)(arg)
     public override fun cos(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.COS_OPERATION)(arg)
@@ -158,3 +158,23 @@ public object MstExtendedField : ExtendedField<MST>, NumericAlgebra<MST> {
     public override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
         MstField.unaryOperationFunction(operation)
 }
+
+/**
+ * Logic algebra for [MST]
+ */
+@UnstableKMathAPI
+public object MstLogicAlgebra : LogicAlgebra<MST> {
+    public override fun bindSymbolOrNull(value: String): MST = super.bindSymbolOrNull(value) ?: StringSymbol(value)
+
+    override fun const(boolean: Boolean): Symbol = if (boolean) {
+        LogicAlgebra.TRUE
+    } else {
+        LogicAlgebra.FALSE
+    }
+
+    override fun MST.not(): MST = MST.Unary(Boolean::not.name, this)
+
+    override fun MST.and(other: MST): MST = MST.Binary(Boolean::and.name, this, other)
+
+    override fun MST.or(other: MST): MST  = MST.Binary(Boolean::or.name, this, other)
+}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
index 09a5faa12..254d60b3d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
@@ -6,7 +6,6 @@
 package space.kscience.kmath.expressions
 
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.asBuffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Symbol.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
similarity index 91%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Symbol.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
index b9fb6879a..10a9ca5a1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Symbol.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
@@ -3,15 +3,16 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.misc
+package space.kscience.kmath.expressions
 
 import kotlin.jvm.JvmInline
 import kotlin.properties.ReadOnlyProperty
 
 /**
- * A marker interface for a symbol. A symbol mus have an identity
+ * A marker interface for a symbol. A symbol must have an identity.
+ * Ic
  */
-public interface Symbol {
+public interface Symbol: MST {
     /**
      * Identity object for the symbol. Two symbols with the same identity are considered to be the same symbol.
      */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
index 738156975..06634704c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
@@ -6,7 +6,6 @@
 package space.kscience.kmath.expressions
 
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.structures.BufferFactory
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index 9a52d17f4..09bda6508 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -5,8 +5,7 @@
 
 package space.kscience.kmath.operations
 
-import space.kscience.kmath.misc.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.expressions.Symbol
 
 /**
  * Stub for DSL the [Algebra] is.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
new file mode 100644
index 000000000..2bef3f407
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.operations
+
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.symbol
+import space.kscience.kmath.misc.UnstableKMathAPI
+
+/**
+ * An algebra for generic boolean logic
+ */
+@UnstableKMathAPI
+public interface LogicAlgebra<T : Any> : Algebra<T> {
+
+    /**
+     * Represent constant [Boolean] as [T]
+     */
+    public fun const(boolean: Boolean): T
+
+    override fun bindSymbolOrNull(value: String): T? = value.lowercase().toBooleanStrictOrNull()?.let(::const)
+
+    override fun unaryOperation(operation: String, arg: T): T = when (operation) {
+        Boolean::not.name -> arg.not()
+        else -> super.unaryOperation(operation, arg)
+    }
+
+    override fun binaryOperation(operation: String, left: T, right: T): T = when (operation) {
+        Boolean::and.name -> left.and(right)
+        Boolean::or.name -> left.or(right)
+        else -> super.binaryOperation(operation, left, right)
+    }
+
+    /**
+     * Logic 'not'
+     */
+    public operator fun T.not(): T
+
+    /**
+     * Logic 'and'
+     */
+    public infix fun T.and(other: T): T
+
+    /**
+     * Logic 'or'
+     */
+    public infix fun T.or(other: T): T
+
+    public companion object {
+        public val TRUE: Symbol by symbol
+        public val FALSE: Symbol by symbol
+    }
+}
+
+/**
+ * An implementation of [LogicAlgebra] for primitive booleans
+ */
+@UnstableKMathAPI
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+public object BooleanAlgebra : LogicAlgebra<Boolean> {
+
+    override fun const(boolean: Boolean): Boolean = boolean
+
+    override fun Boolean.not(): Boolean = !this
+
+    override fun Boolean.and(other: Boolean): Boolean = this && other
+
+    override fun Boolean.or(other: Boolean): Boolean = this || other
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
index cf3a565bc..ace67db06 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.expressions
 
-import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
index 980819364..0df9fe5cf 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.expressions
 
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
index ab509650a..c6852cbbf 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
@@ -5,8 +5,6 @@
 
 package space.kscience.kmath.expressions
 
-import space.kscience.kmath.misc.Symbol
-import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.structures.Buffer
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt
index 8c6745c79..59d481d02 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt
@@ -7,11 +7,7 @@ package space.kscience.kmath.kotlingrad
 
 import edu.umontreal.kotlingrad.api.SFun
 import edu.umontreal.kotlingrad.api.SVar
-import space.kscience.kmath.expressions.DifferentiableExpression
-import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.expressions.MstAlgebra
-import space.kscience.kmath.expressions.interpret
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.expressions.*
 import space.kscience.kmath.operations.NumericAlgebra
 
 /**
@@ -35,8 +31,8 @@ public class DifferentiableMstExpression<T : Number, A : NumericAlgebra<T>>(
         DifferentiableMstExpression(
             algebra,
             symbols.map(Symbol::identity)
-                .map(MstAlgebra::bindSymbol)
-                .map<MST.Symbolic, SVar<KMathNumber<T, A>>>(MST.Symbolic::toSVar)
+                .map(MstNumericAlgebra::bindSymbol)
+                .map<Symbol, SVar<KMathNumber<T, A>>>(Symbol::toSVar)
                 .fold(mst.toSFun(), SFun<KMathNumber<T, A>>::d)
                 .toMst(),
         )
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/ScalarsAdapters.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/ScalarsAdapters.kt
index bee2c9e3e..8e3c54035 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/ScalarsAdapters.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/ScalarsAdapters.kt
@@ -7,9 +7,10 @@ package space.kscience.kmath.kotlingrad
 
 import edu.umontreal.kotlingrad.api.*
 import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.expressions.MstAlgebra
 import space.kscience.kmath.expressions.MstExtendedField
 import space.kscience.kmath.expressions.MstExtendedField.unaryMinus
+import space.kscience.kmath.expressions.MstNumericAlgebra
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.*
 
 /**
@@ -18,7 +19,7 @@ import space.kscience.kmath.operations.*
  * @receiver The variable.
  * @returnAa node.
  */
-public fun <X : SFun<X>> SVar<X>.toMst(): MST.Symbolic = MstAlgebra.bindSymbol(name)
+public fun <X : SFun<X>> SVar<X>.toMst(): Symbol = MstNumericAlgebra.bindSymbol(name)
 
 /**
  * Maps [SVar] to [MST.Numeric] directly.
@@ -26,7 +27,7 @@ public fun <X : SFun<X>> SVar<X>.toMst(): MST.Symbolic = MstAlgebra.bindSymbol(n
  * @receiver The constant.
  * @return A node.
  */
-public fun <X : SFun<X>> SConst<X>.toMst(): MST.Numeric = MstAlgebra.number(doubleValue)
+public fun <X : SFun<X>> SConst<X>.toMst(): MST.Numeric = MstNumericAlgebra.number(doubleValue)
 
 /**
  * Maps [SFun] objects to [MST]. Some unsupported operations like [Derivative] are bound and converted then.
@@ -85,7 +86,7 @@ public fun <X : SFun<X>> MST.Numeric.toSConst(): SConst<X> = SConst(value)
  * @receiver The node.
  * @return A new variable.
  */
-internal fun <X : SFun<X>> MST.Symbolic.toSVar(): SVar<X> = SVar(value)
+internal fun <X : SFun<X>> Symbol.toSVar(): SVar<X> = SVar(identity)
 
 /**
  * Maps [MST] objects to [SFun]. Unsupported operations throw [IllegalStateException].
@@ -102,7 +103,7 @@ internal fun <X : SFun<X>> MST.Symbolic.toSVar(): SVar<X> = SVar(value)
  */
 public fun <X : SFun<X>> MST.toSFun(): SFun<X> = when (this) {
     is MST.Numeric -> toSConst()
-    is MST.Symbolic -> toSVar()
+    is Symbol -> toSVar()
 
     is MST.Unary -> when (operation) {
         GroupOperations.PLUS_OPERATION -> +value.toSFun<X>()
diff --git a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
index 85c964c58..57fe2411c 100644
--- a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
+++ b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
@@ -8,9 +8,9 @@ package space.kscience.kmath.kotlingrad
 import edu.umontreal.kotlingrad.api.*
 import space.kscience.kmath.asm.compileToExpression
 import space.kscience.kmath.ast.parseMath
-import space.kscience.kmath.expressions.MstAlgebra
+import space.kscience.kmath.expressions.MstNumericAlgebra
+import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.misc.Symbol.Companion.x
 import space.kscience.kmath.operations.DoubleField
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -20,7 +20,7 @@ import kotlin.test.fail
 internal class AdaptingTests {
     @Test
     fun symbol() {
-        val c1 = MstAlgebra.bindSymbol(x.identity)
+        val c1 = MstNumericAlgebra.bindSymbol(x.identity)
         assertEquals(x.identity, c1.toSVar<KMathNumber<Double, DoubleField>>().name)
         val c2 = "kitten".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
         if (c2 is SVar) assertTrue(c2.name == "kitten") else fail()
@@ -28,7 +28,7 @@ internal class AdaptingTests {
 
     @Test
     fun number() {
-        val c1 = MstAlgebra.number(12354324)
+        val c1 = MstNumericAlgebra.number(12354324)
         assertTrue(c1.toSConst<DReal>().doubleValue == 12354324.0)
         val c2 = "0.234".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
         if (c2 is SConst) assertTrue(c2.doubleValue == 0.234) else fail()
@@ -46,7 +46,7 @@ internal class AdaptingTests {
 
     @Test
     fun simpleFunctionDerivative() {
-        val xSVar = MstAlgebra.bindSymbol(x.identity).toSVar<KMathNumber<Double, DoubleField>>()
+        val xSVar = MstNumericAlgebra.bindSymbol(x.identity).toSVar<KMathNumber<Double, DoubleField>>()
         val quadratic = "x^2-4*x-44".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
         val actualDerivative = quadratic.d(xSVar).toMst().compileToExpression(DoubleField)
         val expectedDerivative = "2*x-4".parseMath().compileToExpression(DoubleField)
@@ -55,7 +55,7 @@ internal class AdaptingTests {
 
     @Test
     fun moreComplexDerivative() {
-        val xSVar = MstAlgebra.bindSymbol(x.identity).toSVar<KMathNumber<Double, DoubleField>>()
+        val xSVar = MstNumericAlgebra.bindSymbol(x.identity).toSVar<KMathNumber<Double, DoubleField>>()
         val composition = "-sqrt(sin(x^2)-cos(x)^2-16*x)".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
         val actualDerivative = composition.d(xSVar).toMst().compileToExpression(DoubleField)
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
index 38f3038c2..4cf5aea84 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
@@ -5,11 +5,7 @@
 
 package space.kscience.kmath.optimization
 
-import space.kscience.kmath.expressions.AutoDiffProcessor
-import space.kscience.kmath.expressions.DifferentiableExpression
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.ExpressionAlgebra
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.expressions.*
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.indices
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt
index 67a21bf2a..0f2167549 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.optimization
 
 import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.indices
 import kotlin.math.pow
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
index 3b9868815..4a1676412 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.optimization
 
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.expressions.Symbol
 
 public interface OptimizationFeature
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
index f5cfa05e6..633e9ae0e 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
@@ -6,11 +6,7 @@
 package space.kscience.kmath.optimization
 
 import space.kscience.kmath.data.ColumnarData
-import space.kscience.kmath.expressions.AutoDiffProcessor
-import space.kscience.kmath.expressions.DifferentiableExpression
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.ExpressionAlgebra
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.expressions.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.Field
-- 
2.34.1


From 516444d1bc25cd810e685a00a7098f1ff38d97d6 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 16 May 2021 20:51:46 +0300
Subject: [PATCH 250/713] Fix and test

---
 .../space/kscience/kmath/expressions/MST.kt   |  6 +++---
 .../kscience/kmath/operations/Algebra.kt      |  2 +-
 .../kscience/kmath/operations/LogicAlgebra.kt |  6 ++++++
 .../kmath/expressions/ExpressionFieldTest.kt  |  3 +--
 .../kmath/expressions/InterpretTest.kt        | 20 ++++++++++++++++---
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
index 0e046ae5c..7533024a1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
@@ -76,7 +76,7 @@ public fun <T> Algebra<T>.evaluate(node: MST): T = when (node) {
     }
 }
 
-internal class InnerAlgebra<T : Any>(val algebra: Algebra<T>, val arguments: Map<Symbol, T>) : NumericAlgebra<T> {
+internal class InnerAlgebra<T>(val algebra: Algebra<T>, val arguments: Map<Symbol, T>) : NumericAlgebra<T> {
     override fun bindSymbolOrNull(value: String): T? = algebra.bindSymbolOrNull(value) ?: arguments[StringSymbol(value)]
 
     override fun unaryOperation(operation: String, arg: T): T =
@@ -101,7 +101,7 @@ internal class InnerAlgebra<T : Any>(val algebra: Algebra<T>, val arguments: Map
 /**
  * Interprets the [MST] node with this [Algebra] and optional [arguments]
  */
-public fun <T : Any> MST.interpret(algebra: Algebra<T>, arguments: Map<Symbol, T>): T =
+public fun <T> MST.interpret(algebra: Algebra<T>, arguments: Map<Symbol, T>): T =
     InnerAlgebra(algebra, arguments).evaluate(this)
 
 /**
@@ -111,7 +111,7 @@ public fun <T : Any> MST.interpret(algebra: Algebra<T>, arguments: Map<Symbol, T
  * @param algebra the algebra that provides operations.
  * @return the value of expression.
  */
-public fun <T : Any> MST.interpret(algebra: Algebra<T>, vararg arguments: Pair<Symbol, T>): T =
+public fun <T> MST.interpret(algebra: Algebra<T>, vararg arguments: Pair<Symbol, T>): T =
     interpret(algebra, mapOf(*arguments))
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index 09bda6508..aa22b8c19 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -84,7 +84,7 @@ public interface Algebra<T> {
      * @return an operation.
      */
     public fun binaryOperationFunction(operation: String): (left: T, right: T) -> T =
-        error("Binary operation $operation not defined in $this")
+        error("Binary operation '$operation; not defined in $this")
 
     /**
      * Dynamically invokes a binary operation with the certain name.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
index 2bef3f407..406967897 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
@@ -27,12 +27,18 @@ public interface LogicAlgebra<T : Any> : Algebra<T> {
         else -> super.unaryOperation(operation, arg)
     }
 
+    override fun unaryOperationFunction(operation: String): (arg: T) -> T = { unaryOperation(operation, it) }
+
     override fun binaryOperation(operation: String, left: T, right: T): T = when (operation) {
         Boolean::and.name -> left.and(right)
         Boolean::or.name -> left.or(right)
         else -> super.binaryOperation(operation, left, right)
     }
 
+    override fun binaryOperationFunction(operation: String): (left: T, right: T) -> T = { l, r ->
+        binaryOperation(operation, l, r)
+    }
+
     /**
      * Logic 'not'
      */
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
index ace67db06..4d1b00b3d 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
@@ -6,7 +6,6 @@
 package space.kscience.kmath.expressions
 
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFails
@@ -16,7 +15,7 @@ class ExpressionFieldTest {
 
     @Test
     fun testExpression() {
-        val expression = FunctionalExpressionField(DoubleField).invoke {
+        val expression = with(FunctionalExpressionField(DoubleField)) {
             val x by binding()
             x * x + 2 * x + one
         }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
index 0df9fe5cf..156334b2e 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
@@ -5,18 +5,32 @@
 
 package space.kscience.kmath.expressions
 
+import space.kscience.kmath.expressions.Symbol.Companion.x
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.BooleanAlgebra
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
+import kotlin.test.assertEquals
+
 
 internal class InterpretTest {
     @Test
     fun interpretation() {
         val expr = MstField {
-            val x = bindSymbol(Symbol.x)
             x * 2.0 + number(2.0) / x - 16.0
         }.toExpression(DoubleField)
-        expr(Symbol.x to 2.2)
+        assertEquals(-10.69, expr(x to 2.2), 0.02)
+    }
+
+    @Test
+    @UnstableKMathAPI
+    fun booleanAlgebra() {
+        val expr = MstLogicAlgebra {
+            x and const(true)
+        }.toExpression(BooleanAlgebra)
+
+        assertEquals(true, expr(x to true))
+        assertEquals(false, expr(x to false))
     }
 }
-- 
2.34.1


From e6c6925209e73a766a913450fdd9c6af11ca8f06 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 16 May 2021 22:33:53 +0300
Subject: [PATCH 251/713] Fix integration borders

---
 .../space/kscience/kmath/integration/GaussIntegrator.kt       | 2 +-
 .../space/kscience/kmath/integration/GaussIntegralTest.kt     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index 0038ca0f2..fcf47040e 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -98,7 +98,7 @@ public fun <T : Any> GaussIntegrator<T>.integrate(
     require(intervals > 0) { "Number of intervals must be positive" }
     val rangeSize = (range.endInclusive - range.start) / intervals
     val ranges = UnivariateIntegrandRanges(
-        (0 until intervals).map { i -> (rangeSize * i)..(rangeSize * (i + 1)) to order }
+        (0 until intervals).map { i -> (range.start + rangeSize * i)..(range.start + rangeSize * (i + 1)) to order }
     )
     return integrate(
         UnivariateIntegrand(
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
index 1f9f7aedf..6195d0ac6 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
@@ -24,14 +24,14 @@ class GaussIntegralTest {
 
     @Test
     fun gaussUniform() {
-        val res = DoubleField.integrator.integrate(0.0..100.0) { x ->
+        val res = DoubleField.integrator.integrate(35.0..100.0) { x ->
             if(x in 30.0..50.0){
                 1.0
             } else {
                 0.0
             }
         }
-        assertEquals(20.0, res.valueOrNull!!, 0.5)
+        assertEquals(15.0, res.valueOrNull!!, 0.5)
     }
 
 
-- 
2.34.1


From 83b6d8fee0b4c899fe9246c3173325fc54aff48f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 16 May 2021 22:39:44 +0300
Subject: [PATCH 252/713] dump api

---
 build.gradle.kts              | 2 +-
 kmath-core/api/kmath-core.api | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e14d303fc..6e1aa76f4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-9"
+    version = "0.3.0-dev-10"
 }
 
 subprojects {
diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 7b09b668b..456b5cfba 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -500,6 +500,11 @@ public final class space/kscience/kmath/linear/LFeature : space/kscience/kmath/l
 	public static final field INSTANCE Lspace/kscience/kmath/linear/LFeature;
 }
 
+public abstract interface class space/kscience/kmath/linear/LUDecompositionFeature : space/kscience/kmath/linear/MatrixFeature {
+	public abstract fun getL ()Lspace/kscience/kmath/nd/Structure2D;
+	public abstract fun getU ()Lspace/kscience/kmath/nd/Structure2D;
+}
+
 public abstract interface class space/kscience/kmath/linear/LinearSolver {
 	public abstract fun inverse (Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
 	public abstract fun solve (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
-- 
2.34.1


From dfac6aeb5ca83fdf85c8c8f355a61539df908e1a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Mon, 17 May 2021 10:10:49 +0300
Subject: [PATCH 253/713] Update CHANGELOG.md

Co-authored-by: Iaroslav Postovalov <38042667+CommanderTvis@users.noreply.github.com>
---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9a67a0ab..acdf9899b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,8 @@
 - Rewritten EJML module without ejml-simple
 - Stability of kmath-ast and kmath-kotilngrad promoted to EXPERIMENTAL.
 - ColumnarData returns nullable column
-- Replaced MST.Symbolic by Symbol. Symbol now inherits MST
+- MST is made sealed interface
+- Replaced MST.Symbolic by Symbol, Symbol now implements MST
 
 ### Deprecated
 
-- 
2.34.1


From 72f4d7c7e602766dcf71e3abbc0a7545e2ccb70f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Mon, 17 May 2021 10:10:54 +0300
Subject: [PATCH 254/713] Update
 kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt

Co-authored-by: Iaroslav Postovalov <38042667+CommanderTvis@users.noreply.github.com>
---
 .../kotlin/space/kscience/kmath/operations/Algebra.kt           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index aa22b8c19..3a1ec430e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -84,7 +84,7 @@ public interface Algebra<T> {
      * @return an operation.
      */
     public fun binaryOperationFunction(operation: String): (left: T, right: T) -> T =
-        error("Binary operation '$operation; not defined in $this")
+        error("Binary operation '$operation' not defined in $this")
 
     /**
      * Dynamically invokes a binary operation with the certain name.
-- 
2.34.1


From 53a6d3543fcbc11baac514f171dcd1d7e16cd8bf Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 17 May 2021 16:53:12 +0300
Subject: [PATCH 255/713] [WIP] Interpolation fix

---
 examples/build.gradle.kts                     |  2 +-
 .../kscience/kmath/functions/interpolate.kt   | 56 +++++++++++++++++++
 .../space/kscience/kmath/ejml/_generated.kt   | 30 ++++------
 .../kscience/kmath/functions/Piecewise.kt     | 10 ++--
 .../kscience/kmath/functions/Polynomial.kt    | 18 +++---
 .../kmath/interpolation/SplineInterpolator.kt | 15 ++---
 .../interpolation/SplineInterpolatorTest.kt   | 35 ++++++++++++
 7 files changed, 120 insertions(+), 46 deletions(-)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 90bb935b9..d095db1ba 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -43,7 +43,7 @@ dependencies {
 
     implementation("org.slf4j:slf4j-simple:1.7.30")
     // plotting
-    implementation("space.kscience:plotlykt-server:0.4.0-dev-2")
+    implementation("space.kscience:plotlykt-server:0.4.0")
 }
 
 kotlin.sourceSets.all {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
new file mode 100644
index 000000000..54120ac50
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.interpolation.SplineInterpolator
+import space.kscience.kmath.interpolation.interpolatePolynomials
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.plotly.Plotly
+import space.kscience.plotly.makeFile
+import space.kscience.plotly.models.functionXY
+import space.kscience.plotly.scatter
+import kotlin.math.PI
+import kotlin.math.sin
+
+fun main() {
+    val data = (0..10).map {
+        val x = it.toDouble() / 5 * PI
+        x to sin(x)
+    }
+
+    val polynomial: PiecewisePolynomial<Double> = SplineInterpolator(
+        DoubleField, ::DoubleBuffer
+    ).interpolatePolynomials(data)
+
+    val function = polynomial.asFunction(DoubleField, 0.0)
+
+    val cmInterpolate = org.apache.commons.math3.analysis.interpolation.SplineInterpolator().interpolate(
+        data.map { it.first }.toDoubleArray(),
+        data.map { it.second }.toDoubleArray()
+    )
+
+    println(function(2.0))
+    println(cmInterpolate.value(2.0))
+
+//
+//    Plotly.plot {
+//        scatter {
+//            name = "interpolated"
+//            x.numbers = data.map { it.first }
+//            y.numbers = x.doubles.map { function(it) }
+//        }
+//        scatter {
+//            name = "original"
+//            functionXY(0.0..(2 * PI), 0.1) { sin(it) }
+//        }
+//        scatter {
+//            name = "cm"
+//            x.numbers = data.map { it.first }
+//            y.numbers = x.doubles.map { cmInterpolate.value(it) }
+//        }
+//    }.makeFile()
+}
\ No newline at end of file
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
index 139c55697..6f74ab24f 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
@@ -8,28 +8,18 @@
 package space.kscience.kmath.ejml
 
 import org.ejml.data.*
-import org.ejml.dense.row.CommonOps_DDRM
-import org.ejml.dense.row.CommonOps_FDRM
-import org.ejml.dense.row.factory.DecompositionFactory_DDRM
-import org.ejml.dense.row.factory.DecompositionFactory_FDRM
-import org.ejml.sparse.FillReducing
-import org.ejml.sparse.csc.CommonOps_DSCC
-import org.ejml.sparse.csc.CommonOps_FSCC
-import org.ejml.sparse.csc.factory.DecompositionFactory_DSCC
-import org.ejml.sparse.csc.factory.DecompositionFactory_FSCC
-import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
-import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
 import space.kscience.kmath.linear.*
+import space.kscience.kmath.operations.*
+import space.kscience.kmath.structures.*
+import space.kscience.kmath.misc.*
+import kotlin.reflect.*
+import org.ejml.dense.row.*
+import org.ejml.dense.row.factory.*
+import org.ejml.sparse.*
+import org.ejml.sparse.csc.*
+import org.ejml.sparse.csc.factory.*
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.linear.Matrix
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.StructureFeature
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.FloatField
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.FloatBuffer
-import kotlin.reflect.KClass
-import kotlin.reflect.cast
 
 /**
  * [EjmlVector] specialization for [Double].
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index dae55502d..6bb2a1656 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -26,12 +26,12 @@ public fun interface Piecewise<T, R> {
 public fun interface PiecewisePolynomial<T : Any> : Piecewise<T, Polynomial<T>>
 
 /**
- * Basic [Piecewise] implementation where all the pieces are ordered by the [Comparable] type instances.
+ * A [Piecewise]  builder where all the pieces are ordered by the [Comparable] type instances.
  *
  * @param T the comparable piece key type.
+ * @param delimiter the initial piecewise separator
  */
-public class OrderedPiecewisePolynomial<T : Comparable<T>>(delimiter: T) :
-    PiecewisePolynomial<T> {
+public class OrderedPiecewisePolynomial<T : Comparable<T>>(delimiter: T) : PiecewisePolynomial<T> {
     private val delimiters: MutableList<T> = arrayListOf(delimiter)
     private val pieces: MutableList<Polynomial<T>> = arrayListOf()
 
@@ -64,9 +64,7 @@ public class OrderedPiecewisePolynomial<T : Comparable<T>>(delimiter: T) :
             return null
         else {
             for (index in 1 until delimiters.size)
-                if (arg < delimiters[index])
-                    return pieces[index - 1]
-
+                if (arg < delimiters[index]) return pieces[index - 1]
             error("Piece not found")
         }
     }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index efae71b0e..325010f99 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -19,7 +19,9 @@ import kotlin.math.pow
  *
  * @param coefficients constant is the leftmost coefficient.
  */
-public class Polynomial<T : Any>(public val coefficients: List<T>)
+public class Polynomial<T : Any>(public val coefficients: List<T>){
+    override fun toString(): String = "Polynomial$coefficients"
+}
 
 /**
  * Returns a [Polynomial] instance with given [coefficients].
@@ -34,19 +36,15 @@ public fun Polynomial<Double>.value(): Double = coefficients.reduceIndexed { ind
 
 /**
  * Evaluates the value of the given polynomial for given argument.
+ * https://en.wikipedia.org/wiki/Horner%27s_method
  */
 public fun <T : Any, C : Ring<T>> Polynomial<T>.value(ring: C, arg: T): T = ring {
     if (coefficients.isEmpty()) return@ring zero
-    var res = coefficients.first()
-    var powerArg = arg
-
-    for (index in 1 until coefficients.size) {
-        res += coefficients[index] * powerArg
-        // recalculating power on each step to avoid power costs on long polynomials
-        powerArg *= arg
+    var result: T = coefficients.last()
+    for (j in coefficients.size - 2 downTo 0) {
+        result = (arg * result) + coefficients[j]
     }
-
-    res
+    return result
 }
 
 /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
index 2d2ff6f26..fc341e019 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -34,19 +34,16 @@ public class SplineInterpolator<T : Comparable<T>>(
         // Number of intervals.  The number of data points is n + 1.
         val n = points.size - 1
         // Differences between knot points
-        val h = bufferFactory(points.size) { i -> points.x[i + 1] - points.x[i] }
-        val mu = bufferFactory(points.size - 1) { zero }
-        val z = bufferFactory(points.size) { zero }
+        val h = bufferFactory(n) { i -> points.x[i + 1] - points.x[i] }
+        val mu = bufferFactory(n) { zero }
+        val z = bufferFactory(n + 1) { zero }
 
         for (i in 1 until n) {
             val g = 2.0 * (points.x[i + 1] - points.x[i - 1]) - h[i - 1] * mu[i - 1]
             mu[i] = h[i] / g
-
-            z[i] = (3.0 * (points.y[i + 1] * h[i - 1]
-                    - points.x[i] * (points.x[i + 1] - points.x[i - 1])
-                    + points.y[i - 1] * h[i]) / (h[i - 1] * h[i])
-                    - h[i - 1] * z[i - 1]
-                    ) / g
+            z[i] =
+                ((points.y[i + 1] * h[i - 1] - points.y[i] * (points.x[i + 1] - points.x[i - 1]) + points.y[i - 1] * h[i]) * 3.0 /
+                        (h[i - 1] * h[i]) - h[i - 1] * z[i - 1]) / g
         }
 
         // cubic spline coefficients --  b is linear, c quadratic, d is cubic (original y's are constants)
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
new file mode 100644
index 000000000..c3bd8195a
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.interpolation
+
+import space.kscience.kmath.functions.PiecewisePolynomial
+import space.kscience.kmath.functions.asFunction
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.structures.DoubleBuffer
+import kotlin.math.PI
+import kotlin.math.sin
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+internal class SplineInterpolatorTest {
+    @Test
+    fun testInterpolation() {
+        val data = (0..10).map {
+            val x = it.toDouble() / 5 * PI
+            x to sin(x)
+        }
+
+        val polynomial: PiecewisePolynomial<Double> = SplineInterpolator(
+            DoubleField, ::DoubleBuffer
+        ).interpolatePolynomials(data)
+
+        val function = polynomial.asFunction(DoubleField)
+        assertEquals(null, function(-1.0))
+        assertEquals(sin(0.5), function(0.5)!!, 0.1)
+        assertEquals(sin(1.5), function(1.5)!!, 0.1)
+        assertEquals(sin(2.0), function(2.0)!!, 0.1)
+    }
+}
-- 
2.34.1


From d45d44f96d87596594b9f60935b742f2a407b6df Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 17 May 2021 21:55:32 +0300
Subject: [PATCH 256/713] Fix Interpolation

---
 .../kscience/kmath/functions/interpolate.kt   | 35 +++++++++----------
 .../space/kscience/kmath/ejml/_generated.kt   | 30 ++++++++++------
 .../kmath/interpolation/SplineInterpolator.kt | 19 ++++++++--
 .../interpolation/SplineInterpolatorTest.kt   | 15 ++++----
 4 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
index 54120ac50..69ba80fb6 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
@@ -33,24 +33,21 @@ fun main() {
         data.map { it.second }.toDoubleArray()
     )
 
-    println(function(2.0))
-    println(cmInterpolate.value(2.0))
 
-//
-//    Plotly.plot {
-//        scatter {
-//            name = "interpolated"
-//            x.numbers = data.map { it.first }
-//            y.numbers = x.doubles.map { function(it) }
-//        }
-//        scatter {
-//            name = "original"
-//            functionXY(0.0..(2 * PI), 0.1) { sin(it) }
-//        }
-//        scatter {
-//            name = "cm"
-//            x.numbers = data.map { it.first }
-//            y.numbers = x.doubles.map { cmInterpolate.value(it) }
-//        }
-//    }.makeFile()
+    Plotly.plot {
+        scatter {
+            name = "interpolated"
+            x.numbers = data.map { it.first }
+            y.numbers = x.doubles.map { function(it) }
+        }
+        scatter {
+            name = "original"
+            functionXY(0.0..(2 * PI), 0.1) { sin(it) }
+        }
+        scatter {
+            name = "cm"
+            x.numbers = data.map { it.first }
+            y.numbers = x.doubles.map { cmInterpolate.value(it) }
+        }
+    }.makeFile()
 }
\ No newline at end of file
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
index 6f74ab24f..139c55697 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
@@ -8,18 +8,28 @@
 package space.kscience.kmath.ejml
 
 import org.ejml.data.*
+import org.ejml.dense.row.CommonOps_DDRM
+import org.ejml.dense.row.CommonOps_FDRM
+import org.ejml.dense.row.factory.DecompositionFactory_DDRM
+import org.ejml.dense.row.factory.DecompositionFactory_FDRM
+import org.ejml.sparse.FillReducing
+import org.ejml.sparse.csc.CommonOps_DSCC
+import org.ejml.sparse.csc.CommonOps_FSCC
+import org.ejml.sparse.csc.factory.DecompositionFactory_DSCC
+import org.ejml.sparse.csc.factory.DecompositionFactory_FSCC
+import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
+import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
 import space.kscience.kmath.linear.*
-import space.kscience.kmath.operations.*
-import space.kscience.kmath.structures.*
-import space.kscience.kmath.misc.*
-import kotlin.reflect.*
-import org.ejml.dense.row.*
-import org.ejml.dense.row.factory.*
-import org.ejml.sparse.*
-import org.ejml.sparse.csc.*
-import org.ejml.sparse.csc.factory.*
-import space.kscience.kmath.nd.*
 import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.nd.StructureFeature
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.FloatField
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.FloatBuffer
+import kotlin.reflect.KClass
+import kotlin.reflect.cast
 
 /**
  * [EjmlVector] specialization for [Double].
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
index fc341e019..c3d6ffae7 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -10,8 +10,10 @@ import space.kscience.kmath.functions.OrderedPiecewisePolynomial
 import space.kscience.kmath.functions.PiecewisePolynomial
 import space.kscience.kmath.functions.Polynomial
 import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.MutableBufferFactory
 
 /**
@@ -56,10 +58,23 @@ public class SplineInterpolator<T : Comparable<T>>(
                 val a = points.y[j]
                 val b = (points.y[j + 1] - points.y[j]) / h[j] - h[j] * (cOld + 2.0 * c) / 3.0
                 val d = (cOld - c) / (3.0 * h[j])
-                val polynomial = Polynomial(a, b, c, d)
+                val x0 = points.x[j]
+                val x02 = x0 * x0
+                val x03 = x02 * x0
+                //Shift coefficients to represent absolute polynomial instead of one with an offset
+                val polynomial = Polynomial(
+                    a - b * x0 + c * x02 - d * x03,
+                    b - 2*c*x0 + 3*d*x02,
+                    c - 3*d*x0,
+                    d
+                )
                 cOld = c
-                putLeft(points.x[j], polynomial)
+                putLeft(x0, polynomial)
             }
         }
     }
+
+    public companion object {
+        public val double: SplineInterpolator<Double> = SplineInterpolator(DoubleField, ::DoubleBuffer)
+    }
 }
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
index c3bd8195a..3adaab2d1 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
@@ -8,7 +8,6 @@ package space.kscience.kmath.interpolation
 import space.kscience.kmath.functions.PiecewisePolynomial
 import space.kscience.kmath.functions.asFunction
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.math.PI
 import kotlin.math.sin
 import kotlin.test.Test
@@ -22,14 +21,12 @@ internal class SplineInterpolatorTest {
             x to sin(x)
         }
 
-        val polynomial: PiecewisePolynomial<Double> = SplineInterpolator(
-            DoubleField, ::DoubleBuffer
-        ).interpolatePolynomials(data)
+        val polynomial: PiecewisePolynomial<Double> = SplineInterpolator.double.interpolatePolynomials(data)
 
-        val function = polynomial.asFunction(DoubleField)
-        assertEquals(null, function(-1.0))
-        assertEquals(sin(0.5), function(0.5)!!, 0.1)
-        assertEquals(sin(1.5), function(1.5)!!, 0.1)
-        assertEquals(sin(2.0), function(2.0)!!, 0.1)
+        val function = polynomial.asFunction(DoubleField, Double.NaN)
+        assertEquals(Double.NaN, function(-1.0))
+        assertEquals(sin(0.5), function(0.5), 0.1)
+        assertEquals(sin(1.5), function(1.5), 0.1)
+        assertEquals(sin(2.0), function(2.0), 0.1)
     }
 }
-- 
2.34.1


From 8b92db9923adfe334ae472a8d6d525802241113f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 18 May 2021 10:07:55 +0300
Subject: [PATCH 257/713] bump version

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6e1aa76f4..93f5059ff 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-10"
+    version = "0.3.0-dev-11"
 }
 
 subprojects {
-- 
2.34.1


From a67c112793fc2f86964e785182f83ee92aca568a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 18 May 2021 10:22:33 +0300
Subject: [PATCH 258/713] add xor

---
 kmath-core/api/kmath-core.api                             | 5 +++++
 .../kotlin/space/kscience/kmath/expressions/MstAlgebra.kt | 2 ++
 .../space/kscience/kmath/operations/LogicAlgebra.kt       | 8 ++++++++
 3 files changed, 15 insertions(+)

diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index ead4b96b5..b424b59ff 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -522,6 +522,11 @@ public final class space/kscience/kmath/linear/LFeature : space/kscience/kmath/l
 	public static final field INSTANCE Lspace/kscience/kmath/linear/LFeature;
 }
 
+public abstract interface class space/kscience/kmath/linear/LUDecompositionFeature : space/kscience/kmath/linear/MatrixFeature {
+	public abstract fun getL ()Lspace/kscience/kmath/nd/Structure2D;
+	public abstract fun getU ()Lspace/kscience/kmath/nd/Structure2D;
+}
+
 public abstract interface class space/kscience/kmath/linear/LinearSolver {
 	public abstract fun inverse (Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
 	public abstract fun solve (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
index fb2e38449..4729f19ea 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
@@ -177,4 +177,6 @@ public object MstLogicAlgebra : LogicAlgebra<MST> {
     override fun MST.and(other: MST): MST = MST.Binary(Boolean::and.name, this, other)
 
     override fun MST.or(other: MST): MST  = MST.Binary(Boolean::or.name, this, other)
+
+    override fun MST.xor(other: MST): MST  = MST.Binary(Boolean::xor.name, this, other)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
index 406967897..9037525e1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
@@ -54,6 +54,12 @@ public interface LogicAlgebra<T : Any> : Algebra<T> {
      */
     public infix fun T.or(other: T): T
 
+    /**
+     * Logic 'xor'
+     */
+    public infix fun T.xor(other: T): T
+
+
     public companion object {
         public val TRUE: Symbol by symbol
         public val FALSE: Symbol by symbol
@@ -74,4 +80,6 @@ public object BooleanAlgebra : LogicAlgebra<Boolean> {
     override fun Boolean.and(other: Boolean): Boolean = this && other
 
     override fun Boolean.or(other: Boolean): Boolean = this || other
+
+    override fun Boolean.xor(other: Boolean): Boolean = this xor other
 }
\ No newline at end of file
-- 
2.34.1


From b4dd4380c070e22a61691a1f7a5f0245b2ddb4b2 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 18 May 2021 18:02:13 +0700
Subject: [PATCH 259/713] Hard code specific imports in codegen

---
 .../kmath/ejml/codegen/ejmlCodegen.kt         | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
index e4b157973..5da7d0f67 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
@@ -369,19 +369,29 @@ fun ejmlCodegen(outputFile: String): Unit = File(outputFile).run {
         it.appendLine()
         it.appendLine("package space.kscience.kmath.ejml")
         it.appendLine()
-        it.appendLine("import org.ejml.data.*")
-        it.appendLine("import space.kscience.kmath.linear.*")
-        it.appendLine("import space.kscience.kmath.operations.*")
-        it.appendLine("import space.kscience.kmath.structures.*")
-        it.appendLine("import space.kscience.kmath.misc.*")
-        it.appendLine("import kotlin.reflect.*")
-        it.appendLine("import org.ejml.dense.row.*")
-        it.appendLine("import org.ejml.dense.row.factory.*")
-        it.appendLine("import org.ejml.sparse.*")
-        it.appendLine("import org.ejml.sparse.csc.*")
-        it.appendLine("import org.ejml.sparse.csc.factory.*")
-        it.appendLine("import space.kscience.kmath.nd.*")
-        it.appendLine("import space.kscience.kmath.linear.Matrix")
+        it.appendLine("""import org.ejml.data.*
+import org.ejml.dense.row.CommonOps_DDRM
+import org.ejml.dense.row.CommonOps_FDRM
+import org.ejml.dense.row.factory.DecompositionFactory_DDRM
+import org.ejml.dense.row.factory.DecompositionFactory_FDRM
+import org.ejml.sparse.FillReducing
+import org.ejml.sparse.csc.CommonOps_DSCC
+import org.ejml.sparse.csc.CommonOps_FSCC
+import org.ejml.sparse.csc.factory.DecompositionFactory_DSCC
+import org.ejml.sparse.csc.factory.DecompositionFactory_FSCC
+import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
+import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
+import space.kscience.kmath.linear.*
+import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.nd.StructureFeature
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.FloatField
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.FloatBuffer
+import kotlin.reflect.KClass
+import kotlin.reflect.cast""")
         it.appendLine()
         it.appendEjmlVector("Double", "DMatrix")
         it.appendEjmlVector("Float", "FMatrix")
-- 
2.34.1


From 08982855426eefe6ba2cf0987b1da732abba0064 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 19 May 2021 12:58:01 +0300
Subject: [PATCH 260/713] Removed Any restriction on polynomials

---
 CHANGELOG.md                                    |  1 +
 .../space/kscience/kmath/functions/integrate.kt |  4 ++--
 .../kmath/functions/matrixIntegration.kt        |  4 ++--
 .../kscience/kmath/functions/Polynomial.kt      | 14 ++++++++------
 .../kmath/integration/GaussIntegrator.kt        | 13 +++++++------
 .../kmath/integration/SimpsonIntegrator.kt      | 17 +++++++++++++++++
 .../kmath/integration/UnivariateIntegrand.kt    | 10 ++++++++++
 .../kmath/integration/GaussIntegralTest.kt      |  4 ++--
 settings.gradle.kts                             |  2 +-
 9 files changed, 50 insertions(+), 19 deletions(-)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acdf9899b..c5acd4660 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 - ColumnarData returns nullable column
 - MST is made sealed interface
 - Replaced MST.Symbolic by Symbol, Symbol now implements MST
+- Removed Any restriction on polynomials
 
 ### Deprecated
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
index 8d5349bce..f60b1ab45 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.integration.gaussIntegrator
 import space.kscience.kmath.integration.integrate
-import space.kscience.kmath.integration.integrator
 import space.kscience.kmath.integration.value
 import space.kscience.kmath.operations.DoubleField
 import kotlin.math.pow
@@ -16,7 +16,7 @@ fun main() {
     val function: UnivariateFunction<Double> = { x -> 3 * x.pow(2) + 2 * x + 1 }
 
     //get the result of the integration
-    val result = DoubleField.integrator.integrate(0.0..10.0, function = function)
+    val result = DoubleField.gaussIntegrator.integrate(0.0..10.0, function = function)
 
     //the value is nullable because in some cases the integration could not succeed
     println(result.value)
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index 601a0e3c4..2619d3d74 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.integration.gaussIntegrator
 import space.kscience.kmath.integration.integrate
-import space.kscience.kmath.integration.integrator
 import space.kscience.kmath.integration.value
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.nd
@@ -25,7 +25,7 @@ fun main(): Unit = DoubleField {
         val function: (Double) -> StructureND<Double> = { x: Double -> 3 * number(x).pow(2) + 2 * diagonal(x) + 1 }
 
         //get the result of the integration
-        val result = integrator.integrate(0.0..10.0, function = function)
+        val result = gaussIntegrator.integrate(0.0..10.0, function = function)
 
         //the value is nullable because in some cases the integration could not succeed
         println(result.value)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 325010f99..427a17385 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -19,7 +19,7 @@ import kotlin.math.pow
  *
  * @param coefficients constant is the leftmost coefficient.
  */
-public class Polynomial<T : Any>(public val coefficients: List<T>){
+public class Polynomial<T>(public val coefficients: List<T>){
     override fun toString(): String = "Polynomial$coefficients"
 }
 
@@ -27,7 +27,7 @@ public class Polynomial<T : Any>(public val coefficients: List<T>){
  * Returns a [Polynomial] instance with given [coefficients].
  */
 @Suppress("FunctionName")
-public fun <T : Any> Polynomial(vararg coefficients: T): Polynomial<T> = Polynomial(coefficients.toList())
+public fun <T> Polynomial(vararg coefficients: T): Polynomial<T> = Polynomial(coefficients.toList())
 
 /**
  * Evaluates the value of the given double polynomial for given double argument.
@@ -38,7 +38,7 @@ public fun Polynomial<Double>.value(): Double = coefficients.reduceIndexed { ind
  * Evaluates the value of the given polynomial for given argument.
  * https://en.wikipedia.org/wiki/Horner%27s_method
  */
-public fun <T : Any, C : Ring<T>> Polynomial<T>.value(ring: C, arg: T): T = ring {
+public fun <T, C : Ring<T>> Polynomial<T>.value(ring: C, arg: T): T = ring {
     if (coefficients.isEmpty()) return@ring zero
     var result: T = coefficients.last()
     for (j in coefficients.size - 2 downTo 0) {
@@ -50,7 +50,9 @@ public fun <T : Any, C : Ring<T>> Polynomial<T>.value(ring: C, arg: T): T = ring
 /**
  * Represent the polynomial as a regular context-less function.
  */
-public fun <T : Any, C : Ring<T>> Polynomial<T>.asFunction(ring: C): (T) -> T = { value(ring, it) }
+public fun <T , C : Ring<T>> Polynomial<T>.asFunction(ring: C): (T) -> T = { value(ring, it) }
+
+//public fun <T: Any>
 
 /**
  * Space of polynomials.
@@ -59,7 +61,7 @@ public fun <T : Any, C : Ring<T>> Polynomial<T>.asFunction(ring: C): (T) -> T =
  * @param C the intersection of [Ring] of [T] and [ScaleOperations] of [T].
  * @param ring the [C] instance.
  */
-public class PolynomialSpace<T : Any, C>(
+public class PolynomialSpace<T, C>(
     private val ring: C,
 ) : Group<Polynomial<T>>, ScaleOperations<Polynomial<T>> where C : Ring<T>, C : ScaleOperations<T> {
     public override val zero: Polynomial<T> = Polynomial(emptyList())
@@ -87,7 +89,7 @@ public class PolynomialSpace<T : Any, C>(
     public operator fun Polynomial<T>.invoke(arg: T): T = value(ring, arg)
 }
 
-public inline fun <T : Any, C, R> C.polynomial(block: PolynomialSpace<T, C>.() -> R): R where C : Ring<T>, C : ScaleOperations<T> {
+public inline fun <T, C, R> C.polynomial(block: PolynomialSpace<T, C>.() -> R): R where C : Ring<T>, C : ScaleOperations<T> {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
     return PolynomialSpace(this).block()
 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index fcf47040e..26757ae68 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -20,6 +20,11 @@ public class UnivariateIntegrandRanges(public val ranges: List<Pair<ClosedRange<
 
 /**
  * A simple one-pass integrator based on Gauss rule
+ * Following integrand features are accepted:
+ * [GaussIntegratorRuleFactory] - A factory for computing the Gauss integration rule. By default uses [GaussLegendreRuleFactory]
+ * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
+ * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
+ * [UnivariateIntegrandRanges] - Set of ranges and number of points per range. Defaults to given [IntegrationRange] and [IntegrandMaxCalls]
  */
 public class GaussIntegrator<T : Any>(
     public val algebra: Field<T>,
@@ -73,13 +78,9 @@ public class GaussIntegrator<T : Any>(
 
 /**
  * Create a Gauss-Legendre integrator for this field
- * Following integrand features are accepted:
- * * [GaussIntegratorRuleFactory] - A factory for computing the Gauss integration rule. By default uses [GaussLegendreRuleFactory]
- * * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
- * * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
- * * [UnivariateIntegrandRanges] - Set of ranges and number of points per range. Defaults to given [IntegrationRange] and [IntegrandMaxCalls]
+ * @see [GaussIntegrator]
  */
-public val <T:Any> Field<T>.integrator: GaussIntegrator<T> get() = GaussIntegrator(this)
+public val <T:Any> Field<T>.gaussIntegrator: GaussIntegrator<T> get() = GaussIntegrator(this)
 
 
 /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
new file mode 100644
index 000000000..526d4d35d
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.integration
+
+import space.kscience.kmath.operations.Ring
+
+
+public class SimpsonIntegrator<T : Any>(
+    public val algebra: Ring<T>,
+) : UnivariateIntegrator<T> {
+    override fun integrate(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index 3cafc9782..c03cc8df0 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -45,6 +45,16 @@ public val <T : Any> UnivariateIntegrand<T>.valueOrNull: T? get() = getFeature<I
  */
 public val <T : Any> UnivariateIntegrand<T>.value: T get() = valueOrNull ?: error("No value in the integrand")
 
+/**
+ * A shortcut method to integrate a [function] with additional [features]. Range must be provided in features.
+ * The [function] is placed in the end position to allow passing a lambda.
+ */
+@UnstableKMathAPI
+public fun <T: Any> UnivariateIntegrator<T>.integrate(
+    vararg features: IntegrandFeature,
+    function: (Double) -> T,
+): UnivariateIntegrand<T> = integrate(UnivariateIntegrand(function, *features))
+
 /**
  * A shortcut method to integrate a [function] in [range] with additional [features].
  * The [function] is placed in the end position to allow passing a lambda.
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
index 6195d0ac6..5c9241120 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
@@ -16,7 +16,7 @@ import kotlin.test.assertEquals
 class GaussIntegralTest {
     @Test
     fun gaussSin() {
-        val res = DoubleField.integrator.integrate(0.0..2 * PI) { x ->
+        val res = DoubleField.gaussIntegrator.integrate(0.0..2 * PI) { x ->
             sin(x)
         }
         assertEquals(0.0, res.valueOrNull!!, 1e-2)
@@ -24,7 +24,7 @@ class GaussIntegralTest {
 
     @Test
     fun gaussUniform() {
-        val res = DoubleField.integrator.integrate(35.0..100.0) { x ->
+        val res = DoubleField.gaussIntegrator.integrate(35.0..100.0) { x ->
             if(x in 30.0..50.0){
                 1.0
             } else {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7ebfe1f59..cc9eb4860 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
         maven("https://repo.kotlin.link")
     }
 
-    val toolsVersion = "0.9.7"
+    val toolsVersion = "0.9.8"
     val kotlinVersion = "1.5.0"
 
     plugins {
-- 
2.34.1


From 8a07140f7c91e3ff0cf18cdc6ef95b9ac02e59da Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 19 May 2021 22:35:06 +0300
Subject: [PATCH 261/713] Minor piecewise rework

---
 .../kscience/kmath/functions/interpolate.kt   |  2 +
 .../kscience/kmath/functions/Piecewise.kt     | 34 +++++++++----
 .../kscience/kmath/functions/Polynomial.kt    | 48 +++++++++++++++----
 .../kmath/interpolation/LinearInterpolator.kt |  3 +-
 .../kmath/interpolation/SplineInterpolator.kt |  3 +-
 .../kmath/functions/PolynomialTest.kt         | 17 +++++++
 .../kmath/histogram/TreeHistogramSpace.kt     | 11 ++---
 .../kmath/histogram/UnivariateHistogram.kt    |  5 +-
 8 files changed, 91 insertions(+), 32 deletions(-)
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
index 69ba80fb6..b05c003a6 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
@@ -10,12 +10,14 @@ import space.kscience.kmath.interpolation.interpolatePolynomials
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.plotly.Plotly
+import space.kscience.plotly.UnstablePlotlyAPI
 import space.kscience.plotly.makeFile
 import space.kscience.plotly.models.functionXY
 import space.kscience.plotly.scatter
 import kotlin.math.PI
 import kotlin.math.sin
 
+@OptIn(UnstablePlotlyAPI::class)
 fun main() {
     val data = (0..10).map {
         val x = it.toDouble() / 5 * PI
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index 6bb2a1656..dd9c571b0 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -22,8 +22,20 @@ public fun interface Piecewise<T, R> {
 
 /**
  * Represents piecewise-defined function where all the sub-functions are polynomials.
+ * @param pieces An ordered list of range-polynomial pairs. The list does not in general guarantee that there are no "holes" in it.
  */
-public fun interface PiecewisePolynomial<T : Any> : Piecewise<T, Polynomial<T>>
+public class PiecewisePolynomial<T : Comparable<T>>(
+    public val pieces: List<Pair<ClosedRange<T>, Polynomial<T>>>,
+) : Piecewise<T, Polynomial<T>> {
+
+    public override fun findPiece(arg: T): Polynomial<T>? {
+        return if (arg < pieces.first().first.start || arg >= pieces.last().first.endInclusive)
+            null
+        else {
+            pieces.firstOrNull { arg in it.first }?.second
+        }
+    }
+}
 
 /**
  * A [Piecewise]  builder where all the pieces are ordered by the [Comparable] type instances.
@@ -31,7 +43,7 @@ public fun interface PiecewisePolynomial<T : Any> : Piecewise<T, Polynomial<T>>
  * @param T the comparable piece key type.
  * @param delimiter the initial piecewise separator
  */
-public class OrderedPiecewisePolynomial<T : Comparable<T>>(delimiter: T) : PiecewisePolynomial<T> {
+public class PiecewiseBuilder<T : Comparable<T>>(delimiter: T) {
     private val delimiters: MutableList<T> = arrayListOf(delimiter)
     private val pieces: MutableList<Polynomial<T>> = arrayListOf()
 
@@ -59,17 +71,19 @@ public class OrderedPiecewisePolynomial<T : Comparable<T>>(delimiter: T) : Piece
         pieces.add(0, piece)
     }
 
-    public override fun findPiece(arg: T): Polynomial<T>? {
-        if (arg < delimiters.first() || arg >= delimiters.last())
-            return null
-        else {
-            for (index in 1 until delimiters.size)
-                if (arg < delimiters[index]) return pieces[index - 1]
-            error("Piece not found")
-        }
+    public fun build(): PiecewisePolynomial<T> {
+        return PiecewisePolynomial(delimiters.zipWithNext { l, r -> l..r }.zip(pieces))
     }
 }
 
+/**
+ * A builder for [PiecewisePolynomial]
+ */
+public fun <T : Comparable<T>> PiecewisePolynomial(
+    startingPoint: T,
+    builder: PiecewiseBuilder<T>.() -> Unit,
+): PiecewisePolynomial<T> = PiecewiseBuilder(startingPoint).apply(builder).build()
+
 /**
  * Return a value of polynomial function with given [ring] an given [arg] or null if argument is outside of piecewise
  * definition.
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 427a17385..4976befcb 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -5,10 +5,8 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.Group
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.ScaleOperations
-import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.math.max
@@ -19,7 +17,7 @@ import kotlin.math.pow
  *
  * @param coefficients constant is the leftmost coefficient.
  */
-public class Polynomial<T>(public val coefficients: List<T>){
+public class Polynomial<T>(public val coefficients: List<T>) {
     override fun toString(): String = "Polynomial$coefficients"
 }
 
@@ -32,7 +30,9 @@ public fun <T> Polynomial(vararg coefficients: T): Polynomial<T> = Polynomial(co
 /**
  * Evaluates the value of the given double polynomial for given double argument.
  */
-public fun Polynomial<Double>.value(): Double = coefficients.reduceIndexed { index, acc, d -> acc + d.pow(index) }
+public fun Polynomial<Double>.value(arg: Double): Double = coefficients.reduceIndexed { index, acc, c ->
+    acc + c * arg.pow(index)
+}
 
 /**
  * Evaluates the value of the given polynomial for given argument.
@@ -50,9 +50,38 @@ public fun <T, C : Ring<T>> Polynomial<T>.value(ring: C, arg: T): T = ring {
 /**
  * Represent the polynomial as a regular context-less function.
  */
-public fun <T , C : Ring<T>> Polynomial<T>.asFunction(ring: C): (T) -> T = { value(ring, it) }
+public fun <T, C : Ring<T>> Polynomial<T>.asFunction(ring: C): (T) -> T = { value(ring, it) }
 
-//public fun <T: Any>
+/**
+ * Create a polynomial witch represents differentiated version of this polynomial
+ */
+@UnstableKMathAPI
+public fun <T, A> Polynomial<T>.differentiate(
+    algebra: A,
+): Polynomial<T> where  A : Ring<T>, A : NumericAlgebra<T> = algebra {
+    Polynomial(coefficients.drop(1).mapIndexed { index, t -> number(index) * t })
+}
+
+/**
+ * Create a polynomial witch represents indefinite integral version of this polynomial
+ */
+@UnstableKMathAPI
+public fun <T, A> Polynomial<T>.integrate(
+    algebra: A,
+): Polynomial<T> where  A : Field<T>, A : NumericAlgebra<T> = algebra {
+    Polynomial(coefficients.mapIndexed { index, t -> t / number(index) })
+}
+
+/**
+ * Compute a definite integral of a given polynomial in a [range]
+ */
+@UnstableKMathAPI
+public fun <T : Comparable<T>, A> Polynomial<T>.integrate(
+    algebra: A,
+    range: ClosedRange<T>,
+): T where  A : Field<T>, A : NumericAlgebra<T> = algebra {
+    value(algebra, range.endInclusive) - value(algebra, range.start)
+}
 
 /**
  * Space of polynomials.
@@ -87,6 +116,9 @@ public class PolynomialSpace<T, C>(
      * Evaluates the polynomial for the given value [arg].
      */
     public operator fun Polynomial<T>.invoke(arg: T): T = value(ring, arg)
+
+    public fun Polynomial<T>.asFunction(): (T) -> T = asFunction(ring)
+
 }
 
 public inline fun <T, C, R> C.polynomial(block: PolynomialSpace<T, C>.() -> R): R where C : Ring<T>, C : ScaleOperations<T> {
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
index 3fbf6157e..24c049647 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
@@ -6,7 +6,6 @@
 package space.kscience.kmath.interpolation
 
 import space.kscience.kmath.data.XYColumnarData
-import space.kscience.kmath.functions.OrderedPiecewisePolynomial
 import space.kscience.kmath.functions.PiecewisePolynomial
 import space.kscience.kmath.functions.Polynomial
 import space.kscience.kmath.misc.UnstableKMathAPI
@@ -28,7 +27,7 @@ public class LinearInterpolator<T : Comparable<T>>(public override val algebra:
         require(points.size > 0) { "Point array should not be empty" }
         insureSorted(points)
 
-        OrderedPiecewisePolynomial(points.x[0]).apply {
+        PiecewisePolynomial(points.x[0]) {
             for (i in 0 until points.size - 1) {
                 val slope = (points.y[i + 1] - points.y[i]) / (points.x[i + 1] - points.x[i])
                 val const = points.y[i] - slope * points.x[i]
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
index c3d6ffae7..bf291c315 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -6,7 +6,6 @@
 package space.kscience.kmath.interpolation
 
 import space.kscience.kmath.data.XYColumnarData
-import space.kscience.kmath.functions.OrderedPiecewisePolynomial
 import space.kscience.kmath.functions.PiecewisePolynomial
 import space.kscience.kmath.functions.Polynomial
 import space.kscience.kmath.misc.UnstableKMathAPI
@@ -50,7 +49,7 @@ public class SplineInterpolator<T : Comparable<T>>(
 
         // cubic spline coefficients --  b is linear, c quadratic, d is cubic (original y's are constants)
 
-        OrderedPiecewisePolynomial(points.x[points.size - 1]).apply {
+        PiecewisePolynomial(points.x[points.size - 1]) {
             var cOld = zero
 
             for (j in n - 1 downTo 0) {
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
new file mode 100644
index 000000000..05c16d17e
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class PolynomialTest {
+    @Test
+    fun testIntegration() {
+        val polynomial = Polynomial(1.0, -2.0, 1.0)
+        assertEquals(0.0, polynomial.value(1.0), 0.001)
+    }
+}
\ No newline at end of file
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
index 5a217f6c2..6ae8b5ee3 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
@@ -28,7 +28,6 @@ private fun <B : ClosedFloatingPointRange<Double>> TreeMap<Double, B>.getBin(val
 
 @UnstableKMathAPI
 public class TreeHistogram(
-    override val context: TreeHistogramSpace,
     private val binMap: TreeMap<Double, out UnivariateBin>,
 ) : UnivariateHistogram {
     override fun get(value: Double): UnivariateBin? = binMap.getBin(value)
@@ -79,15 +78,15 @@ public class TreeHistogramSpace(
             val count = binCounter.counter.value
             resBins[key] = UnivariateBin(binCounter.domain, count, sqrt(count))
         }
-        return TreeHistogram(this, resBins)
+        return TreeHistogram(resBins)
     }
 
     override fun add(
         a: UnivariateHistogram,
         b: UnivariateHistogram,
     ): UnivariateHistogram {
-        require(a.context == this) { "Histogram $a does not belong to this context" }
-        require(b.context == this) { "Histogram $b does not belong to this context" }
+//        require(a.context == this) { "Histogram $a does not belong to this context" }
+//        require(b.context == this) { "Histogram $b does not belong to this context" }
         val bins = TreeMap<Double, UnivariateBin>().apply {
             (a.bins.map { it.domain } union b.bins.map { it.domain }).forEach { def ->
                 put(def.center,
@@ -100,7 +99,7 @@ public class TreeHistogramSpace(
                 )
             }
         }
-        return TreeHistogram(this, bins)
+        return TreeHistogram(bins)
     }
 
     override fun scale(a: UnivariateHistogram, value: Double): UnivariateHistogram {
@@ -116,7 +115,7 @@ public class TreeHistogramSpace(
             }
         }
 
-        return TreeHistogram(this, bins)
+        return TreeHistogram(bins)
     }
 
     override fun UnivariateHistogram.unaryMinus(): UnivariateHistogram = this * (-1)
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
index 645116ade..70125e22e 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
@@ -7,8 +7,6 @@ package space.kscience.kmath.histogram
 
 import space.kscience.kmath.domains.UnivariateDomain
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Group
-import space.kscience.kmath.operations.GroupElement
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asSequence
 
@@ -35,8 +33,7 @@ public class UnivariateBin(
 }
 
 @OptIn(UnstableKMathAPI::class)
-public interface UnivariateHistogram : Histogram<Double, UnivariateBin>,
-    GroupElement<UnivariateHistogram, Group<UnivariateHistogram>> {
+public interface UnivariateHistogram : Histogram<Double, UnivariateBin>{
     public operator fun get(value: Double): UnivariateBin?
     public override operator fun get(point: Buffer<Double>): UnivariateBin? = get(point[0])
 
-- 
2.34.1


From d7a4228f5f5da85d425d6778080f8ab38488ee0e Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Thu, 20 May 2021 19:43:29 +0700
Subject: [PATCH 262/713] Add out variance to StructureND and some related
 types, make some unrelated changes

---
 CHANGELOG.md                                  | 19 ++++++++++---------
 README.md                                     | 15 +++++++--------
 docs/templates/README-TEMPLATE.md             |  2 +-
 .../space/kscience/kmath/tensors/PCA.kt       |  2 +-
 kmath-ast/README.md                           |  6 +++---
 kmath-complex/README.md                       |  6 +++---
 kmath-core/README.md                          |  6 +++---
 .../kscience/kmath/linear/MatrixBuilder.kt    |  2 +-
 .../kscience/kmath/linear/MatrixWrapper.kt    | 13 ++++++-------
 .../kscience/kmath/linear/VirtualMatrix.kt    |  2 +-
 .../space/kscience/kmath/nd/AlgebraND.kt      |  8 ++++----
 .../kscience/kmath/nd/BufferAlgebraND.kt      |  2 +-
 .../space/kscience/kmath/nd/BufferND.kt       |  2 +-
 .../space/kscience/kmath/nd/Structure1D.kt    | 12 ++++++++----
 .../space/kscience/kmath/nd/Structure2D.kt    |  4 ++--
 .../space/kscience/kmath/nd/StructureND.kt    |  6 ++----
 .../space/kscience/kmath/structures/Buffer.kt |  2 +-
 .../kmath/structures/FlaggedBuffer.kt         |  2 +-
 .../kmath/expressions/SimpleAutoDiffTest.kt   |  2 +-
 .../kmath/structures/LazyStructureND.kt       |  2 +-
 kmath-ejml/README.md                          |  6 +++---
 .../space/kscience/kmath/ejml/EjmlMatrix.kt   |  2 +-
 kmath-for-real/README.md                      |  6 +++---
 kmath-functions/README.md                     |  6 +++---
 kmath-kotlingrad/README.md                    |  8 ++++----
 kmath-memory/build.gradle.kts                 |  2 +-
 kmath-nd4j/README.md                          |  6 +++---
 kmath-tensors/README.md                       | 14 +++++++-------
 28 files changed, 83 insertions(+), 82 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5acd4660..274a403b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,19 +20,20 @@
 - Space is replaced by Group. Space is reserved for vector spaces.
 - VectorSpace is now a vector space
 - Buffer factories for primitives moved to MutableBuffer.Companion
-- NDStructure and NDAlgebra to StructureND and AlgebraND respectively
-- Real -> Double
+- Rename `NDStructure` and `NDAlgebra` to `StructureND` and `AlgebraND` respectively
+- `Real` -> `Double`
 - DataSets are moved from functions to core
 - Redesign advanced Chain API
-- Redesign MST. Remove MSTExpression.
-- Move MST to core
+- Redesign `MST`. Remove `MstExpression`.
+- Move `MST` to core
 - Separated benchmarks and examples
-- Rewritten EJML module without ejml-simple
-- Stability of kmath-ast and kmath-kotilngrad promoted to EXPERIMENTAL.
+- Rewrite `kmath-ejml` without `ejml-simple` artifact, support sparse matrices
+- Promote stability of kmath-ast and kmath-kotlingrad to EXPERIMENTAL.
 - ColumnarData returns nullable column
-- MST is made sealed interface
-- Replaced MST.Symbolic by Symbol, Symbol now implements MST
-- Removed Any restriction on polynomials
+- `MST` is made sealed interface
+- Replace `MST.Symbolic` by `Symbol`, `Symbol` now implements MST
+- Remove Any restriction on polynomials
+- Add `out` variance to type parameters of `StructureND` and its implementations where possible
 
 ### Deprecated
 
diff --git a/README.md b/README.md
index 519472a69..9117582ac 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ KMath is a modular library. Different modules provide different features with di
 
 * **PROTOTYPE**. On this level there are no compatibility guarantees. All methods and classes form those modules could break any moment. You can still use it, but be sure to fix the specific version.
 * **EXPERIMENTAL**. The general API is decided, but some changes could be made. Volatile API is marked with `@UnstableKmathAPI` or other stability warning annotations.
-* **DEVELOPMENT**. API breaking genrally follows semantic versioning ideology. There could be changes in minor versions, but not in patch versions. API is protected with [binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) tool.
+* **DEVELOPMENT**. API breaking generally follows semantic versioning ideology. There could be changes in minor versions, but not in patch versions. API is protected with [binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) tool.
 * **STABLE**. The API stabilized. Breaking changes are allowed only in major releases.
 
 <!--Current feature list is [here](/docs/features.md)-->
@@ -213,7 +213,7 @@ One can still use generic algebras though.
 >
 > **Features:**
 > - [differentiable-mst-expression](kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt) : MST based DifferentiableExpression.
-> - [differentiable-mst-expression](kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt) : Conversions between Kotlin&nabla;'s SFun and MST
+> - [differentiable-mst-expression](kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt) : Conversions between Kotlin∇'s SFun and MST
 
 <hr/>
 
@@ -247,10 +247,9 @@ One can still use generic algebras though.
 > **Maturity**: PROTOTYPE
 >
 > **Features:**
-> - [tensor algebra](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Interface for basic linear algebra operations on tensors (plus, dot, etc.)
-> - [linear algebra operations](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Interface for advanced linear algebra operations like LU decomposition, SVD, etc.
-> - [tensor algebra over Double](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt): Full implementation of operations for tensors over `Double`'s.
-> - [tensor algebra with broadcasting](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting for tensors over `Double`'s.
+> - [tensor algebra](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Basic linear algebra operations on tensors (plus, dot, etc.)
+> - [tensor algebra with broadcasting](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting.
+> - [linear algebra operations](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Advanced linear algebra operations like LU decomposition, SVD, etc.
 
 <hr/>
 
@@ -294,8 +293,8 @@ repositories {
 }
 
 dependencies {
-    api("space.kscience:kmath-core:0.3.0-dev-8")
-    // api("space.kscience:kmath-core-jvm:0.3.0-dev-8") for jvm-specific version
+    api("space.kscience:kmath-core:0.3.0-dev-11")
+    // api("space.kscience:kmath-core-jvm:0.3.0-dev-11") for jvm-specific version
 }
 ```
 
diff --git a/docs/templates/README-TEMPLATE.md b/docs/templates/README-TEMPLATE.md
index 99951b4d6..6bb1e9085 100644
--- a/docs/templates/README-TEMPLATE.md
+++ b/docs/templates/README-TEMPLATE.md
@@ -40,7 +40,7 @@ KMath is a modular library. Different modules provide different features with di
 
 * **PROTOTYPE**. On this level there are no compatibility guarantees. All methods and classes form those modules could break any moment. You can still use it, but be sure to fix the specific version.
 * **EXPERIMENTAL**. The general API is decided, but some changes could be made. Volatile API is marked with `@UnstableKmathAPI` or other stability warning annotations.
-* **DEVELOPMENT**. API breaking genrally follows semantic versioning ideology. There could be changes in minor versions, but not in patch versions. API is protected with [binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) tool.
+* **DEVELOPMENT**. API breaking generally follows semantic versioning ideology. There could be changes in minor versions, but not in patch versions. API is protected with [binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) tool.
 * **STABLE**. The API stabilized. Breaking changes are allowed only in major releases.
 
 <!--Current feature list is [here](/docs/features.md)-->
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index e47b87177..411e048d7 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
 
 // simple PCA
 
-fun main() = BroadcastDoubleTensorAlgebra {  // work in context with broadcast methods
+fun main(): Unit = BroadcastDoubleTensorAlgebra {  // work in context with broadcast methods
     val seed = 100500L
 
     // assume x is range from 0 until 10
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index 646ab4306..b0f2d59e5 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -10,7 +10,7 @@ Performance and visualization extensions to MST API.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-8`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-11`.
 
 **Gradle:**
 ```gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.0-dev-8'
+    implementation 'space.kscience:kmath-ast:0.3.0-dev-11'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.0-dev-8")
+    implementation("space.kscience:kmath-ast:0.3.0-dev-11")
 }
 ```
 
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index ee5ad416f..04431cf6c 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -8,7 +8,7 @@ Complex and hypercomplex number systems in KMath.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-8`.
+The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-11`.
 
 **Gradle:**
 ```gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-complex:0.3.0-dev-8'
+    implementation 'space.kscience:kmath-complex:0.3.0-dev-11'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-complex:0.3.0-dev-8")
+    implementation("space.kscience:kmath-complex:0.3.0-dev-11")
 }
 ```
diff --git a/kmath-core/README.md b/kmath-core/README.md
index 7283a18ce..700eaef38 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -15,7 +15,7 @@ performance calculations to code generation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-8`.
+The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-11`.
 
 **Gradle:**
 ```gradle
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-core:0.3.0-dev-8'
+    implementation 'space.kscience:kmath-core:0.3.0-dev-11'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -36,6 +36,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-core:0.3.0-dev-8")
+    implementation("space.kscience:kmath-core:0.3.0-dev-11")
 }
 ```
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
index e6115a1e5..72d22233a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.linear
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
 
-public class MatrixBuilder<T : Any, A : Ring<T>>(
+public class MatrixBuilder<T : Any, out A : Ring<T>>(
     public val linearSpace: LinearSpace<T, A>,
     public val rows: Int,
     public val columns: Int,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
index 4d1180c17..16aadab3b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
@@ -16,7 +16,7 @@ import kotlin.reflect.KClass
  *
  * @param T the type of items.
  */
-public class MatrixWrapper<T : Any> internal constructor(
+public class MatrixWrapper<out T : Any> internal constructor(
     public val origin: Matrix<T>,
     public val features: Set<MatrixFeature>,
 ) : Matrix<T> by origin {
@@ -26,12 +26,11 @@ public class MatrixWrapper<T : Any> internal constructor(
      */
     @UnstableKMathAPI
     @Suppress("UNCHECKED_CAST")
-    override fun <F : StructureFeature> getFeature(type: KClass<out F>): F? = features.singleOrNull { type.isInstance(it) } as? F
-        ?: origin.getFeature(type)
+    public override fun <F : StructureFeature> getFeature(type: KClass<out F>): F? =
+        features.singleOrNull(type::isInstance) as? F
+            ?: origin.getFeature(type)
 
-    override fun toString(): String {
-        return "MatrixWrapper(matrix=$origin, features=$features)"
-    }
+    public override fun toString(): String = "MatrixWrapper(matrix=$origin, features=$features)"
 }
 
 /**
@@ -82,7 +81,7 @@ public fun <T : Any> LinearSpace<T, Ring<T>>.zero(
     elementAlgebra.zero
 } + ZeroFeature
 
-public class TransposedFeature<T : Any>(public val original: Matrix<T>) : MatrixFeature
+public class TransposedFeature<out T : Any>(public val original: Matrix<T>) : MatrixFeature
 
 /**
  * Create a virtual transposed matrix without copying anything. `A.transpose().transpose() === A`
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
index e4c2b49f0..3751bd33b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
@@ -10,7 +10,7 @@ package space.kscience.kmath.linear
  *
  * @property generator the function that provides elements.
  */
-public class VirtualMatrix<T : Any>(
+public class VirtualMatrix<out T : Any>(
     override val rowNum: Int,
     override val colNum: Int,
     public val generator: (i: Int, j: Int) -> T,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index 1b3cb9e0a..93187eb41 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -26,7 +26,7 @@ public class ShapeMismatchException(public val expected: IntArray, public val ac
  * @param C the type of the element context.
  * @param N the type of the structure.
  */
-public interface AlgebraND<T, C : Algebra<T>> {
+public interface AlgebraND<T, out C : Algebra<T>> {
     /**
      * The shape of ND-structures this algebra operates on.
      */
@@ -121,7 +121,7 @@ internal fun <T, C : Algebra<T>> AlgebraND<T, C>.checkShape(element: StructureND
  * @param N the type of ND structure.
  * @param S the type of space of structure elements.
  */
-public interface GroupND<T, S : Group<T>> : Group<StructureND<T>>, AlgebraND<T, S> {
+public interface GroupND<T, out S : Group<T>> : Group<StructureND<T>>, AlgebraND<T, S> {
     /**
      * Element-wise addition.
      *
@@ -189,7 +189,7 @@ public interface GroupND<T, S : Group<T>> : Group<StructureND<T>>, AlgebraND<T,
  * @param N the type of ND structure.
  * @param R the type of ring of structure elements.
  */
-public interface RingND<T, R : Ring<T>> : Ring<StructureND<T>>, GroupND<T, R> {
+public interface RingND<T, out R : Ring<T>> : Ring<StructureND<T>>, GroupND<T, R> {
     /**
      * Element-wise multiplication.
      *
@@ -230,7 +230,7 @@ public interface RingND<T, R : Ring<T>> : Ring<StructureND<T>>, GroupND<T, R> {
  * @param N the type of ND structure.
  * @param F the type field of structure elements.
  */
-public interface FieldND<T, F : Field<T>> : Field<StructureND<T>>, RingND<T, F>, ScaleOperations<StructureND<T>> {
+public interface FieldND<T, out F : Field<T>> : Field<StructureND<T>>, RingND<T, F>, ScaleOperations<StructureND<T>> {
     /**
      * Element-wise division.
      *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index 905a48d5c..2b82a36ae 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.structures.BufferFactory
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 
-public interface BufferAlgebraND<T, A : Algebra<T>> : AlgebraND<T, A> {
+public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
     public val strides: Strides
     public val bufferFactory: BufferFactory<T>
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 425808aeb..904419302 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -18,7 +18,7 @@ import space.kscience.kmath.structures.MutableBufferFactory
  * @param strides The strides to access elements of [Buffer] by linear indices.
  * @param buffer The underlying buffer.
  */
-public open class BufferND<T>(
+public open class BufferND<out T>(
     public val strides: Strides,
     public val buffer: Buffer<T>,
 ) : StructureND<T> {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index cc0528793..150ebf6fb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -15,7 +15,7 @@ import kotlin.jvm.JvmInline
 /**
  * A structure that is guaranteed to be one-dimensional
  */
-public interface Structure1D<T> : StructureND<T>, Buffer<T> {
+public interface Structure1D<out T> : StructureND<T>, Buffer<T> {
     public override val dimension: Int get() = 1
 
     public override operator fun get(index: IntArray): T {
@@ -42,7 +42,7 @@ public interface MutableStructure1D<T> : Structure1D<T>, MutableStructureND<T>,
  * A 1D wrapper for nd-structure
  */
 @JvmInline
-private value class Structure1DWrapper<T>(val structure: StructureND<T>) : Structure1D<T> {
+private value class Structure1DWrapper<out T>(val structure: StructureND<T>) : Structure1D<T> {
     override val shape: IntArray get() = structure.shape
     override val size: Int get() = structure.shape[0]
 
@@ -68,7 +68,11 @@ private class MutableStructure1DWrapper<T>(val structure: MutableStructureND<T>)
     }
 
     @PerformancePitfall
-    override fun copy(): MutableBuffer<T> = structure.elements().map { it.second }.toMutableList().asMutableBuffer()
+    override fun copy(): MutableBuffer<T> = structure
+        .elements()
+        .map(Pair<IntArray, T>::second)
+        .toMutableList()
+        .asMutableBuffer()
 }
 
 
@@ -76,7 +80,7 @@ private class MutableStructure1DWrapper<T>(val structure: MutableStructureND<T>)
  * A structure wrapper for buffer
  */
 @JvmInline
-private value class Buffer1DWrapper<T>(val buffer: Buffer<T>) : Structure1D<T> {
+private value class Buffer1DWrapper<out T>(val buffer: Buffer<T>) : Structure1D<T> {
     override val shape: IntArray get() = intArrayOf(buffer.size)
     override val size: Int get() = buffer.size
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index 5b8183699..f353b6974 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -18,7 +18,7 @@ import kotlin.reflect.KClass
  *
  * @param T the type of items.
  */
-public interface Structure2D<T> : StructureND<T> {
+public interface Structure2D<out T> : StructureND<T> {
     /**
      * The number of rows in this structure.
      */
@@ -100,7 +100,7 @@ public interface MutableStructure2D<T> : Structure2D<T>, MutableStructureND<T> {
  * A 2D wrapper for nd-structure
  */
 @JvmInline
-private value class Structure2DWrapper<T>(val structure: StructureND<T>) : Structure2D<T> {
+private value class Structure2DWrapper<out T>(val structure: StructureND<T>) : Structure2D<T> {
     override val shape: IntArray get() = structure.shape
 
     override val rowNum: Int get() = shape[0]
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index b9f1a063a..7fc91e321 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -24,7 +24,7 @@ public interface StructureFeature
  *
  * @param T the type of items.
  */
-public interface StructureND<T> {
+public interface StructureND<out T> {
     /**
      * The shape of structure, i.e. non-empty sequence of non-negative integers that specify sizes of dimensions of
      * this structure.
@@ -213,9 +213,7 @@ public interface Strides {
     /**
      * Iterate over ND indices in a natural order
      */
-    public fun indices(): Sequence<IntArray> = (0 until linearSize).asSequence().map {
-        index(it)
-    }
+    public fun indices(): Sequence<IntArray> = (0 until linearSize).asSequence().map(::index)
 }
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index be5dfb359..82f17b807 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -283,7 +283,7 @@ public value class ReadOnlyBuffer<T>(public val buffer: MutableBuffer<T>) : Buff
  *
  * @param T the type of elements provided by the buffer.
  */
-public class VirtualBuffer<T>(override val size: Int, private val generator: (Int) -> T) : Buffer<T> {
+public class VirtualBuffer<out T>(override val size: Int, private val generator: (Int) -> T) : Buffer<T> {
     override operator fun get(index: Int): T {
         if (index < 0 || index >= size) throw IndexOutOfBoundsException("Expected index from 0 to ${size - 1}, but found $index")
         return generator(index)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
index a63f452f5..0b16a3afc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
@@ -37,7 +37,7 @@ public enum class ValueFlag(public val mask: Byte) {
 /**
  * A buffer with flagged values.
  */
-public interface FlaggedBuffer<T> : Buffer<T> {
+public interface FlaggedBuffer<out T> : Buffer<T> {
     public fun getFlag(index: Int): Byte
 }
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
index c6852cbbf..201890933 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
@@ -17,7 +17,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
-class SimpleAutoDiffTest {
+internal class SimpleAutoDiffTest {
 
     fun dx(
         xBinding: Pair<Symbol, Double>,
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
index 1cd16054a..ded8c9c44 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.DefaultStrides
 import space.kscience.kmath.nd.StructureND
 
-public class LazyStructureND<T>(
+public class LazyStructureND<out T>(
     public val scope: CoroutineScope,
     public override val shape: IntArray,
     public val function: suspend (IntArray) -> T,
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index cb12ef98d..79a28b824 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -9,7 +9,7 @@ EJML based linear algebra implementation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-8`.
+The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-11`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ejml:0.3.0-dev-8'
+    implementation 'space.kscience:kmath-ejml:0.3.0-dev-11'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ejml:0.3.0-dev-8")
+    implementation("space.kscience:kmath-ejml:0.3.0-dev-11")
 }
 ```
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
index fd43f295c..cec31eb7d 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
@@ -16,7 +16,7 @@ import space.kscience.kmath.nd.Structure2D
  * @property origin The underlying EJML matrix.
  * @author Iaroslav Postovalov
  */
-public abstract class EjmlMatrix<T, out M : Matrix>(public open val origin: M) : Structure2D<T> {
+public abstract class EjmlMatrix<out T, out M : Matrix>(public open val origin: M) : Structure2D<T> {
     public override val rowNum: Int get() = origin.numRows
     public override val colNum: Int get() = origin.numCols
 }
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index 8b3b8e9e0..5ca805093 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -9,7 +9,7 @@ Specialization of KMath APIs for Double numbers.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-8`.
+The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-11`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-for-real:0.3.0-dev-8'
+    implementation 'space.kscience:kmath-for-real:0.3.0-dev-11'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-for-real:0.3.0-dev-8")
+    implementation("space.kscience:kmath-for-real:0.3.0-dev-11")
 }
 ```
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index 4f592c845..2497f7102 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -11,7 +11,7 @@ Functions and interpolations.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-8`.
+The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-11`.
 
 **Gradle:**
 ```gradle
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-functions:0.3.0-dev-8'
+    implementation 'space.kscience:kmath-functions:0.3.0-dev-11'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-functions:0.3.0-dev-8")
+    implementation("space.kscience:kmath-functions:0.3.0-dev-11")
 }
 ```
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
index 686df3271..4393cbf8c 100644
--- a/kmath-kotlingrad/README.md
+++ b/kmath-kotlingrad/README.md
@@ -1,6 +1,6 @@
 # Module kmath-kotlingrad
 
-[Kotlin∇](https://github.com/breandan/kotlingrad) integration module.
+[Kotlin∇](https://www.htmlsymbols.xyz/unicode/U+2207) integration module.
 
  - [differentiable-mst-expression](src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt) : MST based DifferentiableExpression.
  - [differentiable-mst-expression](src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt) : Conversions between Kotlin∇'s SFun and MST
@@ -8,7 +8,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-8`.
+The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-11`.
 
 **Gradle:**
 ```gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-8'
+    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-11'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-8")
+    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-11")
 }
 ```
diff --git a/kmath-memory/build.gradle.kts b/kmath-memory/build.gradle.kts
index 288c61a51..4478e5b80 100644
--- a/kmath-memory/build.gradle.kts
+++ b/kmath-memory/build.gradle.kts
@@ -7,6 +7,6 @@ plugins {
 readme {
     maturity = ru.mipt.npm.gradle.Maturity.DEVELOPMENT
     description = """
-        An API and basic implementation for arranging objects in a continous memory block.
+        An API and basic implementation for arranging objects in a continuous memory block.
     """.trimIndent()
 }
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index 5f33c1db1..6408be13b 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -9,7 +9,7 @@ ND4J based implementations of KMath abstractions.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-8`.
+The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-11`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-8'
+    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-11'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-nd4j:0.3.0-dev-8")
+    implementation("space.kscience:kmath-nd4j:0.3.0-dev-11")
 }
 ```
 
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index affdad665..75de2bf35 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -2,14 +2,14 @@
 
 Common linear algebra operations on tensors.
 
- - [tensor algebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Interface for basic linear algebra operations on tensors (plus, dot, etc.)
- - [linear algebra operations](src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Interface for advanced linear algebra operations like LU decomposition, SVD, etc.
- - [tensor algebra over Double](src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt): Full implementation of operations for tensors over `Double`'s.
- - [tensor algebra with broadcasting](src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting for tensors over `Double`'s.
+ - [tensor algebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Basic linear algebra operations on tensors (plus, dot, etc.)
+ - [tensor algebra with broadcasting](src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting.
+ - [linear algebra operations](src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Advanced linear algebra operations like LU decomposition, SVD, etc.
+
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-8`.
+The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-11`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensors:0.3.0-dev-8'
+    implementation 'space.kscience:kmath-tensors:0.3.0-dev-11'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensors:0.3.0-dev-8")
+    implementation("space.kscience:kmath-tensors:0.3.0-dev-11")
 }
 ```
-- 
2.34.1


From 15a0258b7d860c861239d26d33528935ce98083c Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Fri, 14 May 2021 00:37:33 +0700
Subject: [PATCH 263/713] Nd4j based TensorAlgebra implementation, drop
 Nd4jArrayLongStructure

---
 .../space/kscience/kmath/nd/AlgebraND.kt      |   1 -
 kmath-nd4j/build.gradle.kts                   |  20 +-
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   | 179 ++++++++----------
 .../kscience/kmath/nd4j/Nd4jArrayIterator.kt  |   6 -
 .../kscience/kmath/nd4j/Nd4jArrayStructure.kt |  15 +-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  | 175 +++++++++++++++++
 .../space/kscience/kmath/nd4j/arrays.kt       |   1 -
 .../kmath/nd4j/Nd4jArrayAlgebraTest.kt        |   2 +-
 .../kmath/nd4j/Nd4jArrayStructureTest.kt      |   2 +-
 .../kmath/tensors/api/TensorAlgebra.kt        |  22 +--
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  23 +--
 11 files changed, 280 insertions(+), 166 deletions(-)
 create mode 100644 kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index 93187eb41..35bbc44f6 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -227,7 +227,6 @@ public interface RingND<T, out R : Ring<T>> : Ring<StructureND<T>>, GroupND<T, R
  * Field of [StructureND].
  *
  * @param T the type of the element contained in ND structure.
- * @param N the type of ND structure.
  * @param F the type field of structure elements.
  */
 public interface FieldND<T, out F : Field<T>> : Field<StructureND<T>>, RingND<T, F>, ScaleOperations<StructureND<T>> {
diff --git a/kmath-nd4j/build.gradle.kts b/kmath-nd4j/build.gradle.kts
index bc61060db..12ea5c130 100644
--- a/kmath-nd4j/build.gradle.kts
+++ b/kmath-nd4j/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api(project(":kmath-core"))
+    api(project(":kmath-tensors"))
     api("org.nd4j:nd4j-api:1.0.0-beta7")
     testImplementation("org.nd4j:nd4j-native:1.0.0-beta7")
     testImplementation("org.nd4j:nd4j-native-platform:1.0.0-beta7")
@@ -15,19 +15,7 @@ readme {
     description = "ND4J NDStructure implementation and according NDAlgebra classes"
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
-
-    feature(
-        id = "nd4jarraystructure",
-        description = "NDStructure wrapper for INDArray"
-    )
-
-    feature(
-        id = "nd4jarrayrings",
-        description = "Rings over Nd4jArrayStructure of Int and Long"
-    )
-
-    feature(
-        id = "nd4jarrayfields",
-        description = "Fields over Nd4jArrayStructure of Float and Double"
-    )
+    feature(id = "nd4jarraystructure") { "NDStructure wrapper for INDArray" }
+    feature(id = "nd4jarrayrings") { "Rings over Nd4jArrayStructure of Int and Long" }
+    feature(id = "nd4jarrayfields") { "Fields over Nd4jArrayStructure of Float and Double" }
 }
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index 3cac44c47..e94bda12a 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -6,15 +6,14 @@
 package space.kscience.kmath.nd4j
 
 import org.nd4j.linalg.api.ndarray.INDArray
-import org.nd4j.linalg.api.ops.impl.scalar.Pow
-import org.nd4j.linalg.api.ops.impl.transforms.strict.*
+import org.nd4j.linalg.api.ops.impl.transforms.strict.ACosh
+import org.nd4j.linalg.api.ops.impl.transforms.strict.ASinh
 import org.nd4j.linalg.factory.Nd4j
 import org.nd4j.linalg.ops.transforms.Transforms
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.*
-import space.kscience.kmath.structures.*
 
 internal fun AlgebraND<*, *>.checkShape(array: INDArray): INDArray {
     val arrayShape = array.shape().toIntArray()
@@ -29,23 +28,16 @@ internal fun AlgebraND<*, *>.checkShape(array: INDArray): INDArray {
  * @param T the type of ND-structure element.
  * @param C the type of the element context.
  */
-public interface Nd4jArrayAlgebra<T, C : Algebra<T>> : AlgebraND<T, C> {
+public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C> {
     /**
-     * Wraps [INDArray] to [N].
+     * Wraps [INDArray] to [Nd4jArrayStructure].
      */
     public fun INDArray.wrap(): Nd4jArrayStructure<T>
 
+    /**
+     * Unwraps to or acquires [INDArray] from [StructureND].
+     */
     public val StructureND<T>.ndArray: INDArray
-        get() = when {
-            !shape.contentEquals(this@Nd4jArrayAlgebra.shape) -> throw ShapeMismatchException(
-                this@Nd4jArrayAlgebra.shape,
-                shape
-            )
-            this is Nd4jArrayStructure -> ndArray //TODO check strides
-            else -> {
-                TODO()
-            }
-        }
 
     public override fun produce(initializer: C.(IntArray) -> T): Nd4jArrayStructure<T> {
         val struct = Nd4j.create(*shape)!!.wrap()
@@ -85,7 +77,7 @@ public interface Nd4jArrayAlgebra<T, C : Algebra<T>> : AlgebraND<T, C> {
  * @param T the type of the element contained in ND structure.
  * @param S the type of space of structure elements.
  */
-public interface Nd4JArrayGroup<T, S : Ring<T>> : GroupND<T, S>, Nd4jArrayAlgebra<T, S> {
+public sealed interface Nd4jArrayGroup<T, out S : Ring<T>> : GroupND<T, S>, Nd4jArrayAlgebra<T, S> {
 
     public override val zero: Nd4jArrayStructure<T>
         get() = Nd4j.zeros(*shape).wrap()
@@ -110,7 +102,7 @@ public interface Nd4JArrayGroup<T, S : Ring<T>> : GroupND<T, S>, Nd4jArrayAlgebr
  * @param R the type of ring of structure elements.
  */
 @OptIn(UnstableKMathAPI::class)
-public interface Nd4jArrayRing<T, R : Ring<T>> : RingND<T, R>, Nd4JArrayGroup<T, R> {
+public sealed interface Nd4jArrayRing<T, out R : Ring<T>> : RingND<T, R>, Nd4jArrayGroup<T, R> {
 
     public override val one: Nd4jArrayStructure<T>
         get() = Nd4j.ones(*shape).wrap()
@@ -135,10 +127,7 @@ public interface Nd4jArrayRing<T, R : Ring<T>> : RingND<T, R>, Nd4JArrayGroup<T,
 
     public companion object {
         private val intNd4jArrayRingCache: ThreadLocal<MutableMap<IntArray, IntNd4jArrayRing>> =
-            ThreadLocal.withInitial { hashMapOf() }
-
-        private val longNd4jArrayRingCache: ThreadLocal<MutableMap<IntArray, LongNd4jArrayRing>> =
-            ThreadLocal.withInitial { hashMapOf() }
+            ThreadLocal.withInitial(::HashMap)
 
         /**
          * Creates an [RingND] for [Int] values or pull it from cache if it was created previously.
@@ -146,20 +135,13 @@ public interface Nd4jArrayRing<T, R : Ring<T>> : RingND<T, R>, Nd4JArrayGroup<T,
         public fun int(vararg shape: Int): Nd4jArrayRing<Int, IntRing> =
             intNd4jArrayRingCache.get().getOrPut(shape) { IntNd4jArrayRing(shape) }
 
-        /**
-         * Creates an [RingND] for [Long] values or pull it from cache if it was created previously.
-         */
-        public fun long(vararg shape: Int): Nd4jArrayRing<Long, LongRing> =
-            longNd4jArrayRingCache.get().getOrPut(shape) { LongNd4jArrayRing(shape) }
-
         /**
          * Creates a most suitable implementation of [RingND] using reified class.
          */
         @Suppress("UNCHECKED_CAST")
-        public inline fun <reified T : Any> auto(vararg shape: Int): Nd4jArrayRing<T, out Ring<T>> = when {
-            T::class == Int::class -> int(*shape) as Nd4jArrayRing<T, out Ring<T>>
-            T::class == Long::class -> long(*shape) as Nd4jArrayRing<T, out Ring<T>>
-            else -> throw UnsupportedOperationException("This factory method only supports Int and Long types.")
+        public inline fun <reified T : Number> auto(vararg shape: Int): Nd4jArrayRing<T, Ring<T>> = when {
+            T::class == Int::class -> int(*shape) as Nd4jArrayRing<T, Ring<T>>
+            else -> throw UnsupportedOperationException("This factory method only supports Long type.")
         }
     }
 }
@@ -168,11 +150,9 @@ public interface Nd4jArrayRing<T, R : Ring<T>> : RingND<T, R>, Nd4JArrayGroup<T,
  * Represents [FieldND] over [Nd4jArrayStructure].
  *
  * @param T the type of the element contained in ND structure.
- * @param N the type of ND structure.
  * @param F the type field of structure elements.
  */
-public interface Nd4jArrayField<T, F : Field<T>> : FieldND<T, F>, Nd4jArrayRing<T, F> {
-
+public sealed interface Nd4jArrayField<T, out F : Field<T>> : FieldND<T, F>, Nd4jArrayRing<T, F> {
     public override fun divide(a: StructureND<T>, b: StructureND<T>): Nd4jArrayStructure<T> =
         a.ndArray.div(b.ndArray).wrap()
 
@@ -180,10 +160,10 @@ public interface Nd4jArrayField<T, F : Field<T>> : FieldND<T, F>, Nd4jArrayRing<
 
     public companion object {
         private val floatNd4jArrayFieldCache: ThreadLocal<MutableMap<IntArray, FloatNd4jArrayField>> =
-            ThreadLocal.withInitial { hashMapOf() }
+            ThreadLocal.withInitial(::HashMap)
 
         private val doubleNd4JArrayFieldCache: ThreadLocal<MutableMap<IntArray, DoubleNd4jArrayField>> =
-            ThreadLocal.withInitial { hashMapOf() }
+            ThreadLocal.withInitial(::HashMap)
 
         /**
          * Creates an [FieldND] for [Float] values or pull it from cache if it was created previously.
@@ -198,26 +178,64 @@ public interface Nd4jArrayField<T, F : Field<T>> : FieldND<T, F>, Nd4jArrayRing<
             doubleNd4JArrayFieldCache.get().getOrPut(shape) { DoubleNd4jArrayField(shape) }
 
         /**
-         * Creates a most suitable implementation of [RingND] using reified class.
+         * Creates a most suitable implementation of [FieldND] using reified class.
          */
         @Suppress("UNCHECKED_CAST")
-        public inline fun <reified T : Any> auto(vararg shape: Int): Nd4jArrayField<T, out Field<T>> = when {
-            T::class == Float::class -> float(*shape) as Nd4jArrayField<T, out Field<T>>
-            T::class == Double::class -> real(*shape) as Nd4jArrayField<T, out Field<T>>
+        public inline fun <reified T : Any> auto(vararg shape: Int): Nd4jArrayField<T, Field<T>> = when {
+            T::class == Float::class -> float(*shape) as Nd4jArrayField<T, Field<T>>
+            T::class == Double::class -> real(*shape) as Nd4jArrayField<T, Field<T>>
             else -> throw UnsupportedOperationException("This factory method only supports Float and Double types.")
         }
     }
 }
 
+/**
+ * Represents intersection of [ExtendedField] and [Field] over [Nd4jArrayStructure].
+ */
+public sealed interface Nd4jArrayExtendedField<T, out F : ExtendedField<T>> : ExtendedField<StructureND<T>>,
+    Nd4jArrayField<T, F> {
+    public override fun sin(arg: StructureND<T>): StructureND<T> = Transforms.sin(arg.ndArray).wrap()
+    public override fun cos(arg: StructureND<T>): StructureND<T> = Transforms.cos(arg.ndArray).wrap()
+    public override fun asin(arg: StructureND<T>): StructureND<T> = Transforms.asin(arg.ndArray).wrap()
+    public override fun acos(arg: StructureND<T>): StructureND<T> = Transforms.acos(arg.ndArray).wrap()
+    public override fun atan(arg: StructureND<T>): StructureND<T> = Transforms.atan(arg.ndArray).wrap()
+
+    public override fun power(arg: StructureND<T>, pow: Number): StructureND<T> =
+        Transforms.pow(arg.ndArray, pow).wrap()
+
+    public override fun exp(arg: StructureND<T>): StructureND<T> = Transforms.exp(arg.ndArray).wrap()
+    public override fun ln(arg: StructureND<T>): StructureND<T> = Transforms.log(arg.ndArray).wrap()
+    public override fun sqrt(arg: StructureND<T>): StructureND<T> = Transforms.sqrt(arg.ndArray).wrap()
+    public override fun sinh(arg: StructureND<T>): StructureND<T> = Transforms.sinh(arg.ndArray).wrap()
+    public override fun cosh(arg: StructureND<T>): StructureND<T> = Transforms.cosh(arg.ndArray).wrap()
+    public override fun tanh(arg: StructureND<T>): StructureND<T> = Transforms.tanh(arg.ndArray).wrap()
+
+    public override fun asinh(arg: StructureND<T>): StructureND<T> =
+        Nd4j.getExecutioner().exec(ASinh(arg.ndArray, arg.ndArray.ulike())).wrap()
+
+    public override fun acosh(arg: StructureND<T>): StructureND<T> =
+        Nd4j.getExecutioner().exec(ACosh(arg.ndArray, arg.ndArray.ulike())).wrap()
+
+    public override fun atanh(arg: StructureND<T>): StructureND<T> = Transforms.atanh(arg.ndArray).wrap()
+}
+
 /**
  * Represents [FieldND] over [Nd4jArrayDoubleStructure].
  */
-public class DoubleNd4jArrayField(public override val shape: IntArray) : Nd4jArrayField<Double, DoubleField>,
-    ExtendedField<StructureND<Double>> {
+public class DoubleNd4jArrayField(public override val shape: IntArray) : Nd4jArrayExtendedField<Double, DoubleField> {
     public override val elementContext: DoubleField get() = DoubleField
 
     public override fun INDArray.wrap(): Nd4jArrayStructure<Double> = checkShape(this).asDoubleStructure()
 
+    @OptIn(PerformancePitfall::class)
+    override val StructureND<Double>.ndArray: INDArray
+        get() = when (this) {
+            is Nd4jArrayStructure<Double> -> checkShape(ndArray)
+            else -> Nd4j.zeros(*shape).also {
+                elements().forEach { (idx, value) -> it.putScalar(idx, value) }
+            }
+        }
+
     override fun scale(a: StructureND<Double>, value: Double): Nd4jArrayStructure<Double> {
         return a.ndArray.mul(value).wrap()
     }
@@ -245,34 +263,25 @@ public class DoubleNd4jArrayField(public override val shape: IntArray) : Nd4jArr
     public override operator fun Double.minus(arg: StructureND<Double>): Nd4jArrayStructure<Double> {
         return arg.ndArray.rsub(this).wrap()
     }
-
-    override fun sin(arg: StructureND<Double>): StructureND<Double> = Transforms.sin(arg.ndArray).wrap()
-
-    override fun cos(arg: StructureND<Double>): StructureND<Double> = Transforms.cos(arg.ndArray).wrap()
-
-    override fun asin(arg: StructureND<Double>): StructureND<Double> = Transforms.asin(arg.ndArray).wrap()
-
-    override fun acos(arg: StructureND<Double>): StructureND<Double> = Transforms.acos(arg.ndArray).wrap()
-
-    override fun atan(arg: StructureND<Double>): StructureND<Double> = Transforms.atan(arg.ndArray).wrap()
-
-    override fun power(arg: StructureND<Double>, pow: Number): StructureND<Double> =
-        Transforms.pow(arg.ndArray,pow).wrap()
-
-    override fun exp(arg: StructureND<Double>): StructureND<Double> = Transforms.exp(arg.ndArray).wrap()
-
-    override fun ln(arg: StructureND<Double>): StructureND<Double> = Transforms.log(arg.ndArray).wrap()
 }
 
 /**
  * Represents [FieldND] over [Nd4jArrayStructure] of [Float].
  */
-public class FloatNd4jArrayField(public override val shape: IntArray) : Nd4jArrayField<Float, FloatField>,
-    ExtendedField<StructureND<Float>> {
+public class FloatNd4jArrayField(public override val shape: IntArray) : Nd4jArrayExtendedField<Float, FloatField> {
     public override val elementContext: FloatField get() = FloatField
 
     public override fun INDArray.wrap(): Nd4jArrayStructure<Float> = checkShape(this).asFloatStructure()
 
+    @OptIn(PerformancePitfall::class)
+    public override val StructureND<Float>.ndArray: INDArray
+        get() = when (this) {
+            is Nd4jArrayStructure<Float> -> checkShape(ndArray)
+            else -> Nd4j.zeros(*shape).also {
+                elements().forEach { (idx, value) -> it.putScalar(idx, value) }
+            }
+        }
+
     override fun scale(a: StructureND<Float>, value: Double): StructureND<Float> =
         a.ndArray.mul(value).wrap()
 
@@ -293,23 +302,6 @@ public class FloatNd4jArrayField(public override val shape: IntArray) : Nd4jArra
 
     public override operator fun Float.minus(arg: StructureND<Float>): Nd4jArrayStructure<Float> =
         arg.ndArray.rsub(this).wrap()
-
-    override fun sin(arg: StructureND<Float>): StructureND<Float> = Sin(arg.ndArray).z().wrap()
-
-    override fun cos(arg: StructureND<Float>): StructureND<Float> = Cos(arg.ndArray).z().wrap()
-
-    override fun asin(arg: StructureND<Float>): StructureND<Float> = ASin(arg.ndArray).z().wrap()
-
-    override fun acos(arg: StructureND<Float>): StructureND<Float> = ACos(arg.ndArray).z().wrap()
-
-    override fun atan(arg: StructureND<Float>): StructureND<Float> = ATan(arg.ndArray).z().wrap()
-
-    override fun power(arg: StructureND<Float>, pow: Number): StructureND<Float> =
-        Pow(arg.ndArray, pow.toDouble()).z().wrap()
-
-    override fun exp(arg: StructureND<Float>): StructureND<Float> = Exp(arg.ndArray).z().wrap()
-
-    override fun ln(arg: StructureND<Float>): StructureND<Float> = Log(arg.ndArray).z().wrap()
 }
 
 /**
@@ -321,6 +313,15 @@ public class IntNd4jArrayRing(public override val shape: IntArray) : Nd4jArrayRi
 
     public override fun INDArray.wrap(): Nd4jArrayStructure<Int> = checkShape(this).asIntStructure()
 
+    @OptIn(PerformancePitfall::class)
+    public override val StructureND<Int>.ndArray: INDArray
+        get() = when (this) {
+            is Nd4jArrayStructure<Int> -> checkShape(ndArray)
+            else -> Nd4j.zeros(*shape).also {
+                elements().forEach { (idx, value) -> it.putScalar(idx, value) }
+            }
+        }
+
     public override operator fun StructureND<Int>.plus(arg: Int): Nd4jArrayStructure<Int> =
         ndArray.add(arg).wrap()
 
@@ -333,25 +334,3 @@ public class IntNd4jArrayRing(public override val shape: IntArray) : Nd4jArrayRi
     public override operator fun Int.minus(arg: StructureND<Int>): Nd4jArrayStructure<Int> =
         arg.ndArray.rsub(this).wrap()
 }
-
-/**
- * Represents [RingND] over [Nd4jArrayStructure] of [Long].
- */
-public class LongNd4jArrayRing(public override val shape: IntArray) : Nd4jArrayRing<Long, LongRing> {
-    public override val elementContext: LongRing
-        get() = LongRing
-
-    public override fun INDArray.wrap(): Nd4jArrayStructure<Long> = checkShape(this).asLongStructure()
-
-    public override operator fun StructureND<Long>.plus(arg: Long): Nd4jArrayStructure<Long> =
-        ndArray.add(arg).wrap()
-
-    public override operator fun StructureND<Long>.minus(arg: Long): Nd4jArrayStructure<Long> =
-        ndArray.sub(arg).wrap()
-
-    public override operator fun StructureND<Long>.times(arg: Long): Nd4jArrayStructure<Long> =
-        ndArray.mul(arg).wrap()
-
-    public override operator fun Long.minus(arg: StructureND<Long>): Nd4jArrayStructure<Long> =
-        arg.ndArray.rsub(this).wrap()
-}
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
index 71887ca3c..140a212f8 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
@@ -48,12 +48,6 @@ private class Nd4jArrayDoubleIterator(iterateOver: INDArray) : Nd4jArrayIterator
 
 internal fun INDArray.realIterator(): Iterator<Pair<IntArray, Double>> = Nd4jArrayDoubleIterator(this)
 
-private class Nd4jArrayLongIterator(iterateOver: INDArray) : Nd4jArrayIteratorBase<Long>(iterateOver) {
-    override fun getSingle(indices: LongArray) = iterateOver.getLong(*indices)
-}
-
-internal fun INDArray.longIterator(): Iterator<Pair<IntArray, Long>> = Nd4jArrayLongIterator(this)
-
 private class Nd4jArrayIntIterator(iterateOver: INDArray) : Nd4jArrayIteratorBase<Int>(iterateOver) {
     override fun getSingle(indices: LongArray) = iterateOver.getInt(*indices.toIntArray())
 }
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
index d37c91cb6..ffddcef90 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
@@ -17,7 +17,8 @@ import space.kscience.kmath.nd.StructureND
  */
 public sealed class Nd4jArrayStructure<T> : MutableStructureND<T> {
     /**
-     * The wrapped [INDArray].
+     * The wrapped [INDArray]. Since KMath uses [Int] indexes, assuming that the size of [INDArray] is less or equal to
+     * [Int.MAX_VALUE].
      */
     public abstract val ndArray: INDArray
 
@@ -25,6 +26,7 @@ public sealed class Nd4jArrayStructure<T> : MutableStructureND<T> {
 
     internal abstract fun elementsIterator(): Iterator<Pair<IntArray, T>>
     internal fun indicesIterator(): Iterator<IntArray> = ndArray.indicesIterator()
+
     @PerformancePitfall
     public override fun elements(): Sequence<Pair<IntArray, T>> = Sequence(::elementsIterator)
 }
@@ -40,17 +42,6 @@ private data class Nd4jArrayIntStructure(override val ndArray: INDArray) : Nd4jA
  */
 public fun INDArray.asIntStructure(): Nd4jArrayStructure<Int> = Nd4jArrayIntStructure(this)
 
-private data class Nd4jArrayLongStructure(override val ndArray: INDArray) : Nd4jArrayStructure<Long>() {
-    override fun elementsIterator(): Iterator<Pair<IntArray, Long>> = ndArray.longIterator()
-    override fun get(index: IntArray): Long = ndArray.getLong(*index.toLongArray())
-    override fun set(index: IntArray, value: Long): Unit = run { ndArray.putScalar(index, value.toDouble()) }
-}
-
-/**
- * Wraps this [INDArray] to [Nd4jArrayStructure].
- */
-public fun INDArray.asLongStructure(): Nd4jArrayStructure<Long> = Nd4jArrayLongStructure(this)
-
 private data class Nd4jArrayDoubleStructure(override val ndArray: INDArray) : Nd4jArrayStructure<Double>() {
     override fun elementsIterator(): Iterator<Pair<IntArray, Double>> = ndArray.realIterator()
     override fun get(index: IntArray): Double = ndArray.getDouble(*index)
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
new file mode 100644
index 000000000..456f7c2a9
--- /dev/null
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.nd4j
+
+import org.nd4j.linalg.api.ndarray.INDArray
+import org.nd4j.linalg.api.ops.impl.summarystats.Variance
+import org.nd4j.linalg.api.ops.impl.transforms.strict.ACosh
+import org.nd4j.linalg.api.ops.impl.transforms.strict.ASinh
+import org.nd4j.linalg.factory.Nd4j
+import org.nd4j.linalg.factory.ops.NDBase
+import org.nd4j.linalg.ops.transforms.Transforms
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
+import space.kscience.kmath.tensors.api.Tensor
+import space.kscience.kmath.tensors.api.TensorAlgebra
+import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
+
+/**
+ * ND4J based [TensorAlgebra] implementation.
+ */
+public sealed interface Nd4jTensorAlgebra<T : Number> : AnalyticTensorAlgebra<T> {
+    /**
+     * Wraps [INDArray] to [Nd4jArrayStructure].
+     */
+    public fun INDArray.wrap(): Nd4jArrayStructure<T>
+
+    /**
+     * Unwraps to or acquires [INDArray] from [StructureND].
+     */
+    public val StructureND<T>.ndArray: INDArray
+
+    public override fun T.plus(other: Tensor<T>): Tensor<T> = other.ndArray.add(this).wrap()
+    public override fun Tensor<T>.plus(value: T): Tensor<T> = ndArray.add(value).wrap()
+
+    public override fun Tensor<T>.plus(other: Tensor<T>): Tensor<T> = ndArray.add(other.ndArray).wrap()
+
+    public override fun Tensor<T>.plusAssign(value: T) {
+        ndArray.addi(value)
+    }
+
+    public override fun Tensor<T>.plusAssign(other: Tensor<T>) {
+        ndArray.addi(other.ndArray)
+    }
+
+    public override fun T.minus(other: Tensor<T>): Tensor<T> = other.ndArray.rsub(this).wrap()
+    public override fun Tensor<T>.minus(value: T): Tensor<T> = ndArray.sub(value).wrap()
+    public override fun Tensor<T>.minus(other: Tensor<T>): Tensor<T> = ndArray.sub(other.ndArray).wrap()
+
+    public override fun Tensor<T>.minusAssign(value: T) {
+        ndArray.rsubi(value)
+    }
+
+    public override fun Tensor<T>.minusAssign(other: Tensor<T>) {
+        ndArray.subi(other.ndArray)
+    }
+
+    public override fun T.times(other: Tensor<T>): Tensor<T> = other.ndArray.mul(this).wrap()
+
+    public override fun Tensor<T>.times(value: T): Tensor<T> =
+        ndArray.mul(value).wrap()
+
+    public override fun Tensor<T>.times(other: Tensor<T>): Tensor<T> = ndArray.mul(other.ndArray).wrap()
+
+    public override fun Tensor<T>.timesAssign(value: T) {
+        ndArray.muli(value)
+    }
+
+    public override fun Tensor<T>.timesAssign(other: Tensor<T>) {
+        ndArray.mmuli(other.ndArray)
+    }
+
+    public override fun Tensor<T>.unaryMinus(): Tensor<T> = ndArray.neg().wrap()
+    public override fun Tensor<T>.get(i: Int): Tensor<T> = ndArray.slice(i.toLong()).wrap()
+    public override fun Tensor<T>.transpose(i: Int, j: Int): Tensor<T> = ndArray.swapAxes(i, j).wrap()
+    public override fun Tensor<T>.dot(other: Tensor<T>): Tensor<T> = ndArray.mmul(other.ndArray).wrap()
+
+    public override fun Tensor<T>.min(dim: Int, keepDim: Boolean): Tensor<T> =
+        ndArray.min(keepDim, dim).wrap()
+
+    public override fun Tensor<T>.sum(dim: Int, keepDim: Boolean): Tensor<T> =
+        ndArray.sum(keepDim, dim).wrap()
+
+    public override fun Tensor<T>.max(dim: Int, keepDim: Boolean): Tensor<T> =
+        ndArray.max(keepDim, dim).wrap()
+
+    public override fun Tensor<T>.view(shape: IntArray): Tensor<T> = ndArray.reshape(shape).wrap()
+    public override fun Tensor<T>.viewAs(other: Tensor<T>): Tensor<T> = view(other.shape)
+
+    public override fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T> =
+        ndBase.get().argmax(ndArray, keepDim, dim).wrap()
+
+    public override fun Tensor<T>.mean(dim: Int, keepDim: Boolean): Tensor<T> = ndArray.mean(keepDim, dim).wrap()
+
+    public override fun Tensor<T>.exp(): Tensor<T> = Transforms.exp(ndArray).wrap()
+    public override fun Tensor<T>.ln(): Tensor<T> = Transforms.log(ndArray).wrap()
+    public override fun Tensor<T>.sqrt(): Tensor<T> = Transforms.sqrt(ndArray).wrap()
+    public override fun Tensor<T>.cos(): Tensor<T> = Transforms.cos(ndArray).wrap()
+    public override fun Tensor<T>.acos(): Tensor<T> = Transforms.acos(ndArray).wrap()
+    public override fun Tensor<T>.cosh(): Tensor<T> = Transforms.cosh(ndArray).wrap()
+
+    public override fun Tensor<T>.acosh(): Tensor<T> =
+        Nd4j.getExecutioner().exec(ACosh(ndArray, ndArray.ulike())).wrap()
+
+    public override fun Tensor<T>.sin(): Tensor<T> = Transforms.sin(ndArray).wrap()
+    public override fun Tensor<T>.asin(): Tensor<T> = Transforms.asin(ndArray).wrap()
+    public override fun Tensor<T>.sinh(): Tensor<T> = Transforms.sinh(ndArray).wrap()
+
+    public override fun Tensor<T>.asinh(): Tensor<T> =
+        Nd4j.getExecutioner().exec(ASinh(ndArray, ndArray.ulike())).wrap()
+
+    public override fun Tensor<T>.tan(): Tensor<T> = Transforms.tan(ndArray).wrap()
+    public override fun Tensor<T>.atan(): Tensor<T> = Transforms.atan(ndArray).wrap()
+    public override fun Tensor<T>.tanh(): Tensor<T> = Transforms.tanh(ndArray).wrap()
+    public override fun Tensor<T>.atanh(): Tensor<T> = Transforms.atanh(ndArray).wrap()
+    public override fun Tensor<T>.ceil(): Tensor<T> = Transforms.ceil(ndArray).wrap()
+    public override fun Tensor<T>.floor(): Tensor<T> = Transforms.floor(ndArray).wrap()
+    public override fun Tensor<T>.std(dim: Int, keepDim: Boolean): Tensor<T> = ndArray.std(true, keepDim, dim).wrap()
+    public override fun T.div(other: Tensor<T>): Tensor<T> = other.ndArray.rdiv(this).wrap()
+    public override fun Tensor<T>.div(value: T): Tensor<T> = ndArray.div(value).wrap()
+    public override fun Tensor<T>.div(other: Tensor<T>): Tensor<T> = ndArray.div(other.ndArray).wrap()
+
+    public override fun Tensor<T>.divAssign(value: T) {
+        ndArray.divi(value)
+    }
+
+    public override fun Tensor<T>.divAssign(other: Tensor<T>) {
+        ndArray.divi(other.ndArray)
+    }
+
+    public override fun Tensor<T>.variance(dim: Int, keepDim: Boolean): Tensor<T> =
+        Nd4j.getExecutioner().exec(Variance(ndArray, true, true, dim)).wrap()
+
+    private companion object {
+        private val ndBase: ThreadLocal<NDBase> = ThreadLocal.withInitial(::NDBase)
+    }
+}
+
+/**
+ * [Double] specialization of [Nd4jTensorAlgebra].
+ */
+public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double> {
+    public override fun INDArray.wrap(): Nd4jArrayStructure<Double> = asDoubleStructure()
+
+    @OptIn(PerformancePitfall::class)
+    public override val StructureND<Double>.ndArray: INDArray
+        get() = when (this) {
+            is Nd4jArrayStructure<Double> -> ndArray
+            else -> Nd4j.zeros(*shape).also {
+                elements().forEach { (idx, value) -> it.putScalar(idx, value) }
+            }
+        }
+
+    public override fun Tensor<Double>.valueOrNull(): Double? =
+        if (shape contentEquals intArrayOf(1)) ndArray.getDouble(0) else null
+
+    // TODO rewrite
+    @PerformancePitfall
+    public override fun diagonalEmbedding(
+        diagonalEntries: Tensor<Double>,
+        offset: Int,
+        dim1: Int,
+        dim2: Int,
+    ): Tensor<Double> = DoubleTensorAlgebra.diagonalEmbedding(diagonalEntries, offset, dim1, dim2)
+
+    public override fun Tensor<Double>.sum(): Double = ndArray.sumNumber().toDouble()
+    public override fun Tensor<Double>.min(): Double = ndArray.minNumber().toDouble()
+    public override fun Tensor<Double>.max(): Double = ndArray.maxNumber().toDouble()
+    public override fun Tensor<Double>.mean(): Double = ndArray.meanNumber().toDouble()
+    public override fun Tensor<Double>.std(): Double = ndArray.stdNumber().toDouble()
+    public override fun Tensor<Double>.variance(): Double = ndArray.varNumber().toDouble()
+}
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
index 6c414cc13..75a334ca7 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
@@ -5,5 +5,4 @@
 
 package space.kscience.kmath.nd4j
 
-internal fun IntArray.toLongArray(): LongArray = LongArray(size) { this[it].toLong() }
 internal fun LongArray.toIntArray(): IntArray = IntArray(size) { this[it].toInt() }
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
index c80a1d771..40da22763 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
@@ -52,7 +52,7 @@ internal class Nd4jArrayAlgebraTest {
 
     @Test
     fun testSin() = DoubleNd4jArrayField(intArrayOf(2, 2)).invoke {
-        val initial = produce { (i, j) -> if (i == j) PI/2 else 0.0 }
+        val initial = produce { (i, j) -> if (i == j) PI / 2 else 0.0 }
         val transformed = sin(initial)
         val expected = produce { (i, j) -> if (i == j) 1.0 else 0.0 }
 
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
index bdfec2ba6..30d01338f 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
@@ -72,7 +72,7 @@ internal class Nd4jArrayStructureTest {
     @Test
     fun testSet() {
         val nd = Nd4j.rand(17, 12, 4, 8)!!
-        val struct = nd.asLongStructure()
+        val struct = nd.asIntStructure()
         struct[intArrayOf(1, 2, 3, 4)] = 777
         assertEquals(777, struct[1, 2, 3, 4])
     }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 2eb18ada6..62b8ef046 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -13,7 +13,7 @@ import space.kscience.kmath.operations.Algebra
  *
  * @param T the type of items in the tensors.
  */
-public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
+public interface TensorAlgebra<T> : Algebra<Tensor<T>> {
 
     /**
      * Returns a single tensor value of unit dimension if tensor shape equals to [1].
@@ -27,7 +27,8 @@ public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
      *
      * @return the value of a scalar tensor.
      */
-    public fun Tensor<T>.value(): T
+    public fun Tensor<T>.value(): T =
+        valueOrNull() ?: throw IllegalArgumentException("Inconsistent value for tensor of with $shape shape")
 
     /**
      * Each element of the tensor [other] is added to this value.
@@ -60,15 +61,14 @@ public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
      *
      * @param value the number to be added to each element of this tensor.
      */
-    public operator fun Tensor<T>.plusAssign(value: T): Unit
+    public operator fun Tensor<T>.plusAssign(value: T)
 
     /**
      * Each element of the tensor [other] is added to each element of this tensor.
      *
      * @param other tensor to be added.
      */
-    public operator fun Tensor<T>.plusAssign(other: Tensor<T>): Unit
-
+    public operator fun Tensor<T>.plusAssign(other: Tensor<T>)
 
     /**
      * Each element of the tensor [other] is subtracted from this value.
@@ -101,14 +101,14 @@ public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
      *
      * @param value the number to be subtracted from each element of this tensor.
      */
-    public operator fun Tensor<T>.minusAssign(value: T): Unit
+    public operator fun Tensor<T>.minusAssign(value: T)
 
     /**
      * Each element of the tensor [other] is subtracted from each element of this tensor.
      *
      * @param other tensor to be subtracted.
      */
-    public operator fun Tensor<T>.minusAssign(other: Tensor<T>): Unit
+    public operator fun Tensor<T>.minusAssign(other: Tensor<T>)
 
 
     /**
@@ -142,14 +142,14 @@ public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
      *
      * @param value the number to be multiplied by each element of this tensor.
      */
-    public operator fun Tensor<T>.timesAssign(value: T): Unit
+    public operator fun Tensor<T>.timesAssign(value: T)
 
     /**
      * Each element of the tensor [other] is multiplied by each element of this tensor.
      *
      * @param other tensor to be multiplied.
      */
-    public operator fun Tensor<T>.timesAssign(other: Tensor<T>): Unit
+    public operator fun Tensor<T>.timesAssign(other: Tensor<T>)
 
     /**
      * Numerical negative, element-wise.
@@ -217,7 +217,7 @@ public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
      * a 1 is prepended to its dimension for the purpose of the batched matrix multiply and removed after.
      * If the second argument is 1-dimensional, a 1 is appended to its dimension for the purpose of the batched matrix
      * multiple and removed after.
-     * The non-matrix (i.e. batch) dimensions are broadcasted (and thus must be broadcastable).
+     * The non-matrix (i.e. batch) dimensions are broadcast (and thus must be broadcastable).
      * For example, if `input` is a (j &times; 1 &times; n &times; n) tensor and `other` is a
      * (k &times; n &times; n) tensor, out will be a (j &times; k &times; n &times; n) tensor.
      *
@@ -255,7 +255,7 @@ public interface TensorAlgebra<T>: Algebra<Tensor<T>> {
         diagonalEntries: Tensor<T>,
         offset: Int = 0,
         dim1: Int = -2,
-        dim2: Int = -1
+        dim2: Int = -1,
     ): Tensor<T>
 
     /**
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 78989f1f3..1fd46bd57 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -9,20 +9,9 @@ import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
 import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
-import space.kscience.kmath.tensors.api.TensorPartialDivisionAlgebra
 import space.kscience.kmath.tensors.api.Tensor
-import space.kscience.kmath.tensors.core.internal.dotHelper
-import space.kscience.kmath.tensors.core.internal.getRandomNormals
+import space.kscience.kmath.tensors.api.TensorPartialDivisionAlgebra
 import space.kscience.kmath.tensors.core.internal.*
-import space.kscience.kmath.tensors.core.internal.broadcastOuterTensors
-import space.kscience.kmath.tensors.core.internal.checkBufferShapeConsistency
-import space.kscience.kmath.tensors.core.internal.checkEmptyDoubleBuffer
-import space.kscience.kmath.tensors.core.internal.checkEmptyShape
-import space.kscience.kmath.tensors.core.internal.checkShapesCompatible
-import space.kscience.kmath.tensors.core.internal.checkSquareMatrix
-import space.kscience.kmath.tensors.core.internal.checkTranspose
-import space.kscience.kmath.tensors.core.internal.checkView
-import space.kscience.kmath.tensors.core.internal.minusIndexFrom
 import kotlin.math.*
 
 /**
@@ -38,8 +27,8 @@ public open class DoubleTensorAlgebra :
     override fun Tensor<Double>.valueOrNull(): Double? = if (tensor.shape contentEquals intArrayOf(1))
         tensor.mutableBuffer.array()[tensor.bufferStart] else null
 
-    override fun Tensor<Double>.value(): Double =
-        valueOrNull() ?: throw IllegalArgumentException("Inconsistent value for tensor of with $shape shape")
+    override fun Tensor<Double>.value(): Double = valueOrNull()
+        ?: throw IllegalArgumentException("The tensor shape is $shape, but value method is allowed only for shape [1]")
 
     /**
      * Constructs a tensor with the specified shape and data.
@@ -466,7 +455,7 @@ public open class DoubleTensorAlgebra :
 
     private fun Tensor<Double>.eq(
         other: Tensor<Double>,
-        eqFunction: (Double, Double) -> Boolean
+        eqFunction: (Double, Double) -> Boolean,
     ): Boolean {
         checkShapesCompatible(tensor, other)
         val n = tensor.numElements
@@ -540,7 +529,7 @@ public open class DoubleTensorAlgebra :
     internal fun Tensor<Double>.foldDim(
         foldFunction: (DoubleArray) -> Double,
         dim: Int,
-        keepDim: Boolean
+        keepDim: Boolean,
     ): DoubleTensor {
         check(dim < dimension) { "Dimension $dim out of range $dimension" }
         val resShape = if (keepDim) {
@@ -729,7 +718,7 @@ public open class DoubleTensorAlgebra :
      */
     public fun luPivot(
         luTensor: Tensor<Double>,
-        pivotsTensor: Tensor<Int>
+        pivotsTensor: Tensor<Int>,
     ): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         checkSquareMatrix(luTensor.shape)
         check(
-- 
2.34.1


From 485e90fcd0f3e66ea5a1566634041117b983ae84 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Thu, 20 May 2021 23:32:56 +0700
Subject: [PATCH 264/713] Rename DifferentiableMstExpression, fix #349

---
 CHANGELOG.md                                  |  1 +
 build.gradle.kts                              |  1 +
 kmath-kotlingrad/build.gradle.kts             |  6 ++++--
 ...tExpression.kt => KotlingradExpression.kt} | 20 +++++++++----------
 ...{ScalarsAdapters.kt => scalarsAdapters.kt} | 12 ++++++++---
 kmath-nd4j/build.gradle.kts                   |  3 ++-
 6 files changed, 27 insertions(+), 16 deletions(-)
 rename kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/{DifferentiableMstExpression.kt => KotlingradExpression.kt} (68%)
 rename kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/{ScalarsAdapters.kt => scalarsAdapters.kt} (84%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 274a403b1..9c6b14b95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - Replace `MST.Symbolic` by `Symbol`, `Symbol` now implements MST
 - Remove Any restriction on polynomials
 - Add `out` variance to type parameters of `StructureND` and its implementations where possible
+- Rename `DifferentiableMstExpression` to `KotlingradExpression`
 
 ### Deprecated
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 93f5059ff..d44833445 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,6 +11,7 @@ allprojects {
             isAllowInsecureProtocol = true
         }
         maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
+        maven("https://oss.sonatype.org/content/repositories/snapshots")
         mavenCentral()
     }
 
diff --git a/kmath-kotlingrad/build.gradle.kts b/kmath-kotlingrad/build.gradle.kts
index 0e8e49971..01b42d7ba 100644
--- a/kmath-kotlingrad/build.gradle.kts
+++ b/kmath-kotlingrad/build.gradle.kts
@@ -3,14 +3,16 @@ plugins {
     id("ru.mipt.npm.gradle.common")
 }
 
+description = "Kotlin∇ integration module"
+
 dependencies {
     api("com.github.breandan:kaliningraph:0.1.6")
     api("com.github.breandan:kotlingrad:0.4.5")
-    api(project(":kmath-ast"))
+    api(project(":kmath-core"))
+    testImplementation(project(":kmath-ast"))
 }
 
 readme {
-    description = "Functions, integration and interpolation"
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
similarity index 68%
rename from kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt
rename to kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
index 59d481d02..72ecee4f1 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
@@ -11,24 +11,24 @@ import space.kscience.kmath.expressions.*
 import space.kscience.kmath.operations.NumericAlgebra
 
 /**
- * Represents [MST] based [DifferentiableExpression].
+ * Represents [MST] based [DifferentiableExpression] relying on [Kotlin∇](https://github.com/breandan/kotlingrad).
  *
- * The principle of this API is converting the [mst] to an [SFun], differentiating it with
- * [Kotlin∇](https://github.com/breandan/kotlingrad), then converting [SFun] back to [MST].
+ * The principle of this API is converting the [mst] to an [SFun], differentiating it with Kotlin∇, then converting
+ * [SFun] back to [MST].
  *
  * @param T The type of number.
  * @param A The [NumericAlgebra] of [T].
  * @property algebra The [A] instance.
  * @property mst The [MST] node.
  */
-public class DifferentiableMstExpression<T : Number, A : NumericAlgebra<T>>(
+public class KotlingradExpression<T : Number, A : NumericAlgebra<T>>(
     public val algebra: A,
     public val mst: MST,
-) : DifferentiableExpression<T, DifferentiableMstExpression<T, A>> {
+) : DifferentiableExpression<T, KotlingradExpression<T, A>> {
     public override fun invoke(arguments: Map<Symbol, T>): T = mst.interpret(algebra, arguments)
 
-    public override fun derivativeOrNull(symbols: List<Symbol>): DifferentiableMstExpression<T, A> =
-        DifferentiableMstExpression(
+    public override fun derivativeOrNull(symbols: List<Symbol>): KotlingradExpression<T, A> =
+        KotlingradExpression(
             algebra,
             symbols.map(Symbol::identity)
                 .map(MstNumericAlgebra::bindSymbol)
@@ -39,7 +39,7 @@ public class DifferentiableMstExpression<T : Number, A : NumericAlgebra<T>>(
 }
 
 /**
- * Wraps this [MST] into [DifferentiableMstExpression].
+ * Wraps this [MST] into [KotlingradExpression].
  */
-public fun <T : Number, A : NumericAlgebra<T>> MST.toDiffExpression(algebra: A): DifferentiableMstExpression<T, A> =
-    DifferentiableMstExpression(algebra, this)
+public fun <T : Number, A : NumericAlgebra<T>> MST.toDiffExpression(algebra: A): KotlingradExpression<T, A> =
+    KotlingradExpression(algebra, this)
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/ScalarsAdapters.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
similarity index 84%
rename from kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/ScalarsAdapters.kt
rename to kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
index 8e3c54035..6c0b98c59 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/ScalarsAdapters.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
@@ -14,7 +14,7 @@ import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.*
 
 /**
- * Maps [SVar] to [MST.Symbolic] directly.
+ * Maps [SVar] to [Symbol] directly.
  *
  * @receiver The variable.
  * @returnAa node.
@@ -81,7 +81,7 @@ public fun <X : SFun<X>> SFun<X>.toMst(): MST = MstExtendedField {
 public fun <X : SFun<X>> MST.Numeric.toSConst(): SConst<X> = SConst(value)
 
 /**
- * Maps [MST.Symbolic] to [SVar] directly.
+ * Maps [Symbol] to [SVar] directly.
  *
  * @receiver The node.
  * @return A new variable.
@@ -94,7 +94,7 @@ internal fun <X : SFun<X>> Symbol.toSVar(): SVar<X> = SVar(identity)
  * Detailed mapping is:
  *
  * - [MST.Numeric] -> [SConst];
- * - [MST.Symbolic] -> [SVar];
+ * - [Symbol] -> [SVar];
  * - [MST.Unary] -> [Negative], [Sine], [Cosine], [Tangent], [Power], [Log];
  * - [MST.Binary] -> [Sum], [Prod], [Power].
  *
@@ -114,6 +114,12 @@ public fun <X : SFun<X>> MST.toSFun(): SFun<X> = when (this) {
         PowerOperations.SQRT_OPERATION -> sqrt(value.toSFun())
         ExponentialOperations.EXP_OPERATION -> exp(value.toSFun())
         ExponentialOperations.LN_OPERATION -> value.toSFun<X>().ln()
+        ExponentialOperations.SINH_OPERATION -> MstExtendedField { (exp(value) - exp(-value)) / 2.0 }.toSFun()
+        ExponentialOperations.COSH_OPERATION -> MstExtendedField { (exp(value) + exp(-value)) / 2.0 }.toSFun()
+        ExponentialOperations.TANH_OPERATION -> MstExtendedField { (exp(value) - exp(-value)) / (exp(-value) + exp(value)) }.toSFun()
+        ExponentialOperations.ASINH_OPERATION -> MstExtendedField { ln(sqrt(value * value + one) + value) }.toSFun()
+        ExponentialOperations.ACOSH_OPERATION -> MstExtendedField { ln(value + sqrt((value - one) * (value + one))) }.toSFun()
+        ExponentialOperations.ATANH_OPERATION -> MstExtendedField { (ln(value + one) - ln(one - value)) / 2.0 }.toSFun()
         else -> error("Unary operation $operation not defined in $this")
     }
 
diff --git a/kmath-nd4j/build.gradle.kts b/kmath-nd4j/build.gradle.kts
index 12ea5c130..abcc02962 100644
--- a/kmath-nd4j/build.gradle.kts
+++ b/kmath-nd4j/build.gradle.kts
@@ -3,6 +3,8 @@ plugins {
     id("ru.mipt.npm.gradle.common")
 }
 
+description = "ND4J NDStructure implementation and according NDAlgebra classes"
+
 dependencies {
     api(project(":kmath-tensors"))
     api("org.nd4j:nd4j-api:1.0.0-beta7")
@@ -12,7 +14,6 @@ dependencies {
 }
 
 readme {
-    description = "ND4J NDStructure implementation and according NDAlgebra classes"
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
     feature(id = "nd4jarraystructure") { "NDStructure wrapper for INDArray" }
-- 
2.34.1


From a722cf0cdb7810c5cf1bde7c076fcef28f0d7452 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Fri, 21 May 2021 15:47:35 +0700
Subject: [PATCH 265/713] Integration between MST and Symja IExpr

---
 CHANGELOG.md                                  |  9 +-
 examples/build.gradle.kts                     |  2 +-
 .../kscience/kmath/ast/kotlingradSupport.kt   | 20 ++--
 .../space/kscience/kmath/ast/symjaSupport.kt  | 27 ++++++
 .../kmath/kotlingrad/KotlingradExpression.kt  |  4 +-
 kmath-symja/build.gradle.kts                  | 21 ++++
 .../kscience/kmath/symja/SymjaExpression.kt   | 34 +++++++
 .../space/kscience/kmath/symja/adapters.kt    | 95 +++++++++++++++++++
 settings.gradle.kts                           |  1 +
 9 files changed, 195 insertions(+), 18 deletions(-)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
 create mode 100644 kmath-symja/build.gradle.kts
 create mode 100644 kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
 create mode 100644 kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c6b14b95..2ff5dd623 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,18 +2,19 @@
 
 ## [Unreleased]
 ### Added
-- ScaleOperations interface
-- Field extends ScaleOperations
+- `ScaleOperations` interface
+- `Field` extends `ScaleOperations`
 - Basic integration API
 - Basic MPP distributions and samplers
-- bindSymbolOrNull
+- `bindSymbolOrNull`
 - Blocking chains and Statistics
 - Multiplatform integration
 - Integration for any Field element
 - Extended operations for ND4J fields
 - Jupyter Notebook integration module (kmath-jupyter)
 - `@PerformancePitfall` annotation to mark possibly slow API
-- BigInt operation performance improvement and fixes by @zhelenskiy (#328)
+- `BigInt` operation performance improvement and fixes by @zhelenskiy (#328)
+- Integration between `MST` and Symja `IExpr`
 
 ### Changed
 - Exponential operations merged with hyperbolic functions
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index d095db1ba..568bde153 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     implementation(project(":kmath-ejml"))
     implementation(project(":kmath-nd4j"))
     implementation(project(":kmath-tensors"))
-
+    implementation(project(":kmath-symja"))
     implementation(project(":kmath-for-real"))
 
     implementation("org.nd4j:nd4j-native:1.0.0-beta7")
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
index 420b23f9f..6ceaa962a 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
@@ -5,25 +5,23 @@
 
 package space.kscience.kmath.ast
 
-import space.kscience.kmath.asm.compileToExpression
 import space.kscience.kmath.expressions.derivative
 import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.kotlingrad.toDiffExpression
+import space.kscience.kmath.expressions.Symbol.Companion.x
+import space.kscience.kmath.expressions.toExpression
+import space.kscience.kmath.kotlingrad.toKotlingradExpression
 import space.kscience.kmath.operations.DoubleField
 
 /**
  * In this example, x^2-4*x-44 function is differentiated with Kotlin∇, and the autodiff result is compared with
- * valid derivative.
+ * valid derivative in a certain point.
  */
 fun main() {
-    val x by symbol
-
-    val actualDerivative = "x^2-4*x-44".parseMath()
-        .toDiffExpression(DoubleField)
+    val actualDerivative = "x^2-4*x-44"
+        .parseMath()
+        .toKotlingradExpression(DoubleField)
         .derivative(x)
 
-
-    val expectedDerivative = "2*x-4".parseMath().compileToExpression(DoubleField)
-    assert(actualDerivative(x to 123.0) == expectedDerivative(x to 123.0))
+    val expectedDerivative = "2*x-4".parseMath().toExpression(DoubleField)
+    check(actualDerivative(x to 123.0) == expectedDerivative(x to 123.0))
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
new file mode 100644
index 000000000..a9eca0500
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast
+
+import space.kscience.kmath.expressions.Symbol.Companion.x
+import space.kscience.kmath.expressions.derivative
+import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.expressions.toExpression
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.symja.toSymjaExpression
+
+/**
+ * In this example, x^2-4*x-44 function is differentiated with Symja, and the autodiff result is compared with
+ * valid derivative in a certain point.
+ */
+fun main() {
+    val actualDerivative = "x^2-4*x-44"
+        .parseMath()
+        .toSymjaExpression(DoubleField)
+        .derivative(x)
+
+    val expectedDerivative = "2*x-4".parseMath().toExpression(DoubleField)
+    check(actualDerivative(x to 123.0) == expectedDerivative(x to 123.0))
+}
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
index 72ecee4f1..8312eaff3 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
@@ -39,7 +39,7 @@ public class KotlingradExpression<T : Number, A : NumericAlgebra<T>>(
 }
 
 /**
- * Wraps this [MST] into [KotlingradExpression].
+ * Wraps this [MST] into [KotlingradExpression] in the context of [algebra].
  */
-public fun <T : Number, A : NumericAlgebra<T>> MST.toDiffExpression(algebra: A): KotlingradExpression<T, A> =
+public fun <T : Number, A : NumericAlgebra<T>> MST.toKotlingradExpression(algebra: A): KotlingradExpression<T, A> =
     KotlingradExpression(algebra, this)
diff --git a/kmath-symja/build.gradle.kts b/kmath-symja/build.gradle.kts
new file mode 100644
index 000000000..c06020bb6
--- /dev/null
+++ b/kmath-symja/build.gradle.kts
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+plugins {
+    kotlin("jvm")
+    id("ru.mipt.npm.gradle.common")
+}
+
+description = "Symja integration module"
+
+dependencies {
+    api("org.matheclipse:matheclipse-core:2.0.0-SNAPSHOT")
+    api(project(":kmath-core"))
+    testImplementation("org.slf4j:slf4j-simple:1.7.30")
+}
+
+readme {
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+}
diff --git a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
new file mode 100644
index 000000000..301678916
--- /dev/null
+++ b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.symja
+
+import org.matheclipse.core.eval.ExprEvaluator
+import org.matheclipse.core.expression.F
+import space.kscience.kmath.expressions.DifferentiableExpression
+import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.interpret
+import space.kscience.kmath.operations.NumericAlgebra
+
+public class SymjaExpression<T : Number, A : NumericAlgebra<T>>(
+    public val algebra: A,
+    public val mst: MST,
+    public val evaluator: ExprEvaluator = DEFAULT_EVALUATOR,
+) : DifferentiableExpression<T, SymjaExpression<T, A>> {
+    public override fun invoke(arguments: Map<Symbol, T>): T = mst.interpret(algebra, arguments)
+
+    public override fun derivativeOrNull(symbols: List<Symbol>): SymjaExpression<T, A> = SymjaExpression(
+        algebra,
+        symbols.map(Symbol::toIExpr).fold(mst.toIExpr(), F::D).toMst(evaluator),
+        evaluator,
+    )
+}
+
+/**
+ * Wraps this [MST] into [SymjaExpression] in the context of [algebra].
+ */
+public fun <T : Number, A : NumericAlgebra<T>> MST.toSymjaExpression(algebra: A): SymjaExpression<T, A> =
+    SymjaExpression(algebra, this)
diff --git a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
new file mode 100644
index 000000000..95dd1ebbf
--- /dev/null
+++ b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.symja
+
+import org.matheclipse.core.eval.ExprEvaluator
+import org.matheclipse.core.expression.ComplexNum
+import org.matheclipse.core.expression.F
+import org.matheclipse.core.interfaces.IExpr
+import org.matheclipse.core.interfaces.ISymbol
+import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.expressions.MstExtendedField
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.operations.*
+
+internal val DEFAULT_EVALUATOR = ExprEvaluator(false, 100)
+
+/**
+ * Matches the given [IExpr] instance to appropriate [MST] node or evaluates it with [evaluator].
+ */
+public fun IExpr.toMst(evaluator: ExprEvaluator = DEFAULT_EVALUATOR): MST = MstExtendedField {
+    when {
+        isPlus -> first().toMst(evaluator) + second().toMst(evaluator)
+        isSin -> sin(first().toMst(evaluator))
+        isSinh -> sinh(first().toMst(evaluator))
+        isCos -> cos(first().toMst(evaluator))
+        isCosh -> cosh(first().toMst(evaluator))
+        isTan -> tan(first().toMst(evaluator))
+        isTanh -> tanh(first().toMst(evaluator))
+        isArcSin -> asin(first().toMst(evaluator))
+        isArcCos -> acos(first().toMst(evaluator))
+        isArcTan -> atan(first().toMst(evaluator))
+        isArcTanh -> atanh(first().toMst(evaluator))
+        isE -> bindSymbol("e")
+        isPi -> bindSymbol("pi")
+        isTimes -> first().toMst(evaluator) * second().toMst(evaluator)
+        isOne -> one
+        isZero -> zero
+        isImaginaryUnit -> bindSymbol("i")
+        isMinusOne -> -one
+        this@toMst is ISymbol -> bindSymbol(symbolName)
+        isPower -> power(first().toMst(evaluator), evaluator.evalf(second()))
+        isExp -> exp(first().toMst(evaluator))
+        isNumber -> number(evaluator.evalf(this@toMst))
+        this@toMst === F.NIL -> error("NIL cannot be converted to MST")
+        else -> evaluator.eval(this@toMst.toString()).toMst(evaluator)
+    }
+}
+
+/**
+ * Matches the given [MST] instance to appropriate [IExpr] node, only standard operations and symbols (which are
+ * present in, say, [MstExtendedField]) are supported.
+ */
+public fun MST.toIExpr(): IExpr = when (this) {
+    is MST.Numeric -> F.symjify(value)
+
+    is Symbol -> when (identity) {
+        "e" -> F.E
+        "pi" -> F.Pi
+        "i" -> ComplexNum.I
+        else -> F.Dummy(identity)
+    }
+
+    is MST.Unary -> when (operation) {
+        GroupOperations.PLUS_OPERATION -> value.toIExpr()
+        GroupOperations.MINUS_OPERATION -> F.Negate(value.toIExpr())
+        TrigonometricOperations.SIN_OPERATION -> F.Sin(value.toIExpr())
+        TrigonometricOperations.COS_OPERATION -> F.Cos(value.toIExpr())
+        TrigonometricOperations.TAN_OPERATION -> F.Tan(value.toIExpr())
+        TrigonometricOperations.ASIN_OPERATION -> F.ArcSin(value.toIExpr())
+        TrigonometricOperations.ACOS_OPERATION -> F.ArcCos(value.toIExpr())
+        TrigonometricOperations.ATAN_OPERATION -> F.ArcTan(value.toIExpr())
+        ExponentialOperations.SINH_OPERATION -> F.Sinh(value.toIExpr())
+        ExponentialOperations.COSH_OPERATION -> F.Cosh(value.toIExpr())
+        ExponentialOperations.TANH_OPERATION -> F.Tanh(value.toIExpr())
+        ExponentialOperations.ASINH_OPERATION -> F.ArcSinh(value.toIExpr())
+        ExponentialOperations.ACOSH_OPERATION -> F.ArcCosh(value.toIExpr())
+        ExponentialOperations.ATANH_OPERATION -> F.ArcTanh(value.toIExpr())
+        PowerOperations.SQRT_OPERATION -> F.Sqrt(value.toIExpr())
+        ExponentialOperations.EXP_OPERATION -> F.Exp(value.toIExpr())
+        ExponentialOperations.LN_OPERATION -> F.Log(value.toIExpr())
+        else -> error("Unary operation $operation not defined in $this")
+    }
+
+    is MST.Binary -> when (operation) {
+        GroupOperations.PLUS_OPERATION -> left.toIExpr() + right.toIExpr()
+        GroupOperations.MINUS_OPERATION -> left.toIExpr() - right.toIExpr()
+        RingOperations.TIMES_OPERATION -> left.toIExpr() * right.toIExpr()
+        FieldOperations.DIV_OPERATION -> F.Divide(left.toIExpr(), right.toIExpr())
+        PowerOperations.POW_OPERATION -> F.Power(left.toIExpr(), F.symjify((right as MST.Numeric).value))
+        else -> error("Binary operation $operation not defined in $this")
+    }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cc9eb4860..d47aea2a7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -42,6 +42,7 @@ include(
     ":kmath-kotlingrad",
     ":kmath-tensors",
     ":kmath-jupyter",
+    ":kmath-symja",
     ":examples",
     ":benchmarks"
 )
-- 
2.34.1


From 189449f40e2d84c314225f92cec3cf04c4565aa8 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Fri, 21 May 2021 20:08:17 +0700
Subject: [PATCH 266/713] Fix unresolved reference in generated type parameter

---
 .../space/kscience/kmath/asm/internal/AsmBuilder.kt       | 4 ++--
 .../kotlin/space/kscience/kmath/expressions/Symbol.kt     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
index 39ebf049d..a796ae2a5 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
@@ -342,8 +342,8 @@ internal class AsmBuilder<T>(
         val MAP_INTRINSICS_TYPE: Type by lazy { getObjectType("space/kscience/kmath/asm/internal/MapIntrinsics") }
 
         /**
-         * ASM Type for [space.kscience.kmath.misc.Symbol].
+         * ASM Type for [space.kscience.kmath.expressions.Symbol].
          */
-        val SYMBOL_TYPE: Type by lazy { getObjectType("space/kscience/kmath/misc/Symbol") }
+        val SYMBOL_TYPE: Type by lazy { getObjectType("space/kscience/kmath/expressions/Symbol") }
     }
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
index 10a9ca5a1..74dc7aedc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
@@ -12,13 +12,13 @@ import kotlin.properties.ReadOnlyProperty
  * A marker interface for a symbol. A symbol must have an identity.
  * Ic
  */
-public interface Symbol: MST {
+public interface Symbol : MST {
     /**
      * Identity object for the symbol. Two symbols with the same identity are considered to be the same symbol.
      */
     public val identity: String
 
-    public companion object{
+    public companion object {
         public val x: StringSymbol = StringSymbol("x")
         public val y: StringSymbol = StringSymbol("y")
         public val z: StringSymbol = StringSymbol("z")
@@ -48,7 +48,7 @@ public operator fun <T> Map<String, T>.get(symbol: Symbol): T? = get(symbol.iden
 /**
  * Set a value of [String]-keyed map by a [Symbol]
  */
-public operator fun <T> MutableMap<String, T>.set(symbol: Symbol, value: T){
+public operator fun <T> MutableMap<String, T>.set(symbol: Symbol, value: T) {
     set(symbol.identity, value)
 }
 
@@ -60,6 +60,6 @@ public operator fun <T> Map<Symbol, T>.get(string: String): T? = get(StringSymbo
 /**
  * Set a value of [String]-keyed map by a [Symbol]
  */
-public operator fun <T> MutableMap<Symbol, T>.set(string: String, value: T){
+public operator fun <T> MutableMap<Symbol, T>.set(string: String, value: T) {
     set(StringSymbol(string), value)
 }
\ No newline at end of file
-- 
2.34.1


From 18509f1259ca5363ce3059e68bcc69a85f94c429 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 21 May 2021 23:14:07 +0300
Subject: [PATCH 267/713] Simpson integrator

---
 .../kscience/kmath/functions/interpolate.kt   |  1 -
 ...Integrator.kt => CMGaussRuleIntegrator.kt} |  4 +-
 .../kmath/integration/SimpsonIntegrator.kt    | 36 +++++++++++++++---
 .../kmath/integration/SplineIntegrator.kt     | 12 ++++++
 .../kmath/integration/UnivariateIntegrand.kt  |  2 +-
 .../kmath/integration/GaussIntegralTest.kt    |  4 +-
 .../kmath/integration/SimpsonIntegralTest.kt  | 38 +++++++++++++++++++
 7 files changed, 85 insertions(+), 12 deletions(-)
 rename kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/{GaussRuleIntegrator.kt => CMGaussRuleIntegrator.kt} (96%)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
index b05c003a6..8dbc7b7a4 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
@@ -35,7 +35,6 @@ fun main() {
         data.map { it.second }.toDoubleArray()
     )
 
-
     Plotly.plot {
         scatter {
             name = "interpolated"
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
similarity index 96%
rename from kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt
rename to kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
index 304fdec8f..4e174723d 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/GaussRuleIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.integration.*
 /**
  * A simple one-pass integrator based on Gauss rule
  */
-public class GaussRuleIntegrator(
+public class CMGaussRuleIntegrator(
     private val numpoints: Int,
     private var type: GaussRule = GaussRule.LEGANDRE,
 ) : UnivariateIntegrator<Double> {
@@ -76,7 +76,7 @@ public class GaussRuleIntegrator(
             numPoints: Int = 100,
             type: GaussRule = GaussRule.LEGANDRE,
             function: (Double) -> Double,
-        ): Double = GaussRuleIntegrator(numPoints, type).integrate(
+        ): Double = CMGaussRuleIntegrator(numPoints, type).integrate(
             UnivariateIntegrand(function, IntegrationRange(range))
         ).valueOrNull!!
     }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
index 526d4d35d..7eca90f88 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
@@ -5,13 +5,37 @@
 
 package space.kscience.kmath.integration
 
-import space.kscience.kmath.operations.Ring
-
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.BufferFactory
 
+/**
+ * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
+ * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
+ */
 public class SimpsonIntegrator<T : Any>(
-    public val algebra: Ring<T>,
+    public val algebra: Field<T>,
+    public val bufferFactory: BufferFactory<T>,
 ) : UnivariateIntegrator<T> {
-    override fun integrate(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> {
-        TODO("Not yet implemented")
+    override fun integrate(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> = with(algebra) {
+        val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
+        require(numPoints >= 4)
+        val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
+        val h: Double = (range.endInclusive - range.start) / (numPoints - 1)
+        val points: Buffer<T> = bufferFactory(numPoints) { i ->
+            integrand.function(range.start + i * h)
+        }// equally distributed point
+
+        fun simpson(index: Int) = h / 3 * (points[index - 1] + 4 * points[index] + points[index + 1])
+        var res = zero
+        res += simpson(1) / 1.5 //border points with 1.5 factor
+        for (i in 2 until (points.size - 2)) {
+            res += simpson(i) / 2
+        }
+        res += simpson(points.size - 2) / 1.5 //border points with 1.5 factor
+        return integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + points.size)
     }
-}
\ No newline at end of file
+}
+
+public inline val <reified T : Any> Field<T>.simpsonIntegrator: SimpsonIntegrator<T>
+    get() = SimpsonIntegrator(this, Buffer.Companion::auto)
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
new file mode 100644
index 000000000..da5730497
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.integration
+
+public class SplineIntegrator<T>: UnivariateIntegrator<T> {
+    override fun integrate(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index c03cc8df0..d3d0220f6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -9,7 +9,7 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import kotlin.jvm.JvmInline
 import kotlin.reflect.KClass
 
-public class UnivariateIntegrand<T : Any> internal constructor(
+public class UnivariateIntegrand<T> internal constructor(
     private val features: Map<KClass<*>, IntegrandFeature>,
     public val function: (Double) -> T,
 ) : Integrand {
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
index 5c9241120..9f48a15ea 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
@@ -19,7 +19,7 @@ class GaussIntegralTest {
         val res = DoubleField.gaussIntegrator.integrate(0.0..2 * PI) { x ->
             sin(x)
         }
-        assertEquals(0.0, res.valueOrNull!!, 1e-2)
+        assertEquals(0.0, res.value, 1e-2)
     }
 
     @Test
@@ -31,7 +31,7 @@ class GaussIntegralTest {
                 0.0
             }
         }
-        assertEquals(15.0, res.valueOrNull!!, 0.5)
+        assertEquals(15.0, res.value, 0.5)
     }
 
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
new file mode 100644
index 000000000..b0c0cd098
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.integration
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField
+import kotlin.math.PI
+import kotlin.math.sin
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+@OptIn(UnstableKMathAPI::class)
+class SimpsonIntegralTest {
+    @Test
+    fun gaussSin() {
+        val res = DoubleField.simpsonIntegrator.integrate(0.0..2 * PI, IntegrandMaxCalls(5)) { x ->
+            sin(x)
+        }
+        assertEquals(0.0, res.value, 1e-2)
+    }
+
+    @Test
+    fun gaussUniform() {
+        val res = DoubleField.simpsonIntegrator.integrate(35.0..100.0) { x ->
+            if(x in 30.0..50.0){
+                1.0
+            } else {
+                0.0
+            }
+        }
+        assertEquals(15.0, res.value, 0.5)
+    }
+
+
+}
\ No newline at end of file
-- 
2.34.1


From a24c8dcbce3256bb0f707fcf373cbaccbec1760a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 22 May 2021 20:08:49 +0300
Subject: [PATCH 268/713] Simpson and spline integration

---
 .../kmath/functions/interpolateSquare.kt      | 45 +++++++++
 .../kmath/operations/algebraExtensions.kt     |  2 +
 .../kmath/structures/NumberNDFieldTest.kt     |  4 +-
 .../kscience/kmath/functions/Polynomial.kt    | 15 ++-
 .../kmath/integration/GaussIntegrator.kt      |  8 +-
 .../kmath/integration/SimpsonIntegrator.kt    | 45 ++++++---
 .../kmath/integration/SplineIntegrator.kt     | 98 ++++++++++++++++++-
 .../kmath/integration/UnivariateIntegrand.kt  | 15 +++
 .../kmath/interpolation/Interpolator.kt       |  6 ++
 .../kmath/integration/SimpsonIntegralTest.kt  |  6 +-
 .../kmath/integration/SplineIntegralTest.kt   | 48 +++++++++
 settings.gradle.kts                           |  8 +-
 12 files changed, 260 insertions(+), 40 deletions(-)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
new file mode 100644
index 000000000..33973c880
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.interpolation.SplineInterpolator
+import space.kscience.kmath.interpolation.interpolatePolynomials
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.real.step
+import space.kscience.kmath.structures.map
+import space.kscience.plotly.Plotly
+import space.kscience.plotly.UnstablePlotlyAPI
+import space.kscience.plotly.makeFile
+import space.kscience.plotly.models.functionXY
+import space.kscience.plotly.scatter
+
+@OptIn(UnstablePlotlyAPI::class)
+fun main() {
+    val function: UnivariateFunction<Double> = { x ->
+        if (x in 30.0..50.0) {
+            1.0
+        } else {
+            0.0
+        }
+    }
+    val xs = 0.0..100.0 step 0.5
+    val ys = xs.map(function)
+
+    val polynomial: PiecewisePolynomial<Double> = SplineInterpolator.double.interpolatePolynomials(xs, ys)
+
+    val polyFunction = polynomial.asFunction(DoubleField, 0.0)
+
+    Plotly.plot {
+        scatter {
+            name = "interpolated"
+            functionXY(25.0..55.0, 0.1) { polyFunction(it) }
+        }
+        scatter {
+            name = "original"
+            functionXY(25.0..55.0, 0.1) { function(it) }
+        }
+    }.makeFile()
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index 7967aeadb..d52be943a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -16,6 +16,8 @@ public fun <T> Ring<T>.sum(data: Iterable<T>): T = data.fold(zero) { left, right
     add(left, right)
 }
 
+//TODO replace by sumOf with multi-receivers
+
 /**
  * Returns the sum of all elements in the sequence in this [Ring].
  *
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index 57393fadd..fb51553f7 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -74,9 +74,9 @@ class NumberNDFieldTest {
         val division = array1.combine(array2, Double::div)
     }
 
-    object L2Norm : Norm<StructureND<out Number>, Double> {
+    object L2Norm : Norm<StructureND<Number>, Double> {
         @OptIn(PerformancePitfall::class)
-        override fun norm(arg: StructureND<out Number>): Double =
+        override fun norm(arg: StructureND<Number>): Double =
             kotlin.math.sqrt(arg.elements().sumOf { it.second.toDouble() })
     }
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 4976befcb..ba77d7b25 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -69,18 +69,23 @@ public fun <T, A> Polynomial<T>.differentiate(
 public fun <T, A> Polynomial<T>.integrate(
     algebra: A,
 ): Polynomial<T> where  A : Field<T>, A : NumericAlgebra<T> = algebra {
-    Polynomial(coefficients.mapIndexed { index, t -> t / number(index) })
+    val integratedCoefficients = buildList<T>(coefficients.size + 1) {
+        add(zero)
+        coefficients.forEachIndexed{ index, t -> add(t / (number(index) + one)) }
+    }
+    Polynomial(integratedCoefficients)
 }
 
 /**
  * Compute a definite integral of a given polynomial in a [range]
  */
 @UnstableKMathAPI
-public fun <T : Comparable<T>, A> Polynomial<T>.integrate(
-    algebra: A,
+public fun <T : Comparable<T>> Polynomial<T>.integrate(
+    algebra: Field<T>,
     range: ClosedRange<T>,
-): T where  A : Field<T>, A : NumericAlgebra<T> = algebra {
-    value(algebra, range.endInclusive) - value(algebra, range.start)
+): T = algebra {
+    val integral = integrate(algebra)
+    integral.value(algebra, range.endInclusive) - integral.value(algebra, range.start)
 }
 
 /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index 26757ae68..283f97557 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -10,13 +10,7 @@ import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.structures.indices
 
-/**
- * Set of univariate integration ranges. First components correspond to ranges themselves, second components to number of
- * integration nodes per range
- */
-public class UnivariateIntegrandRanges(public val ranges: List<Pair<ClosedRange<Double>, Int>>) : IntegrandFeature {
-    public constructor(vararg pairs: Pair<ClosedRange<Double>, Int>) : this(pairs.toList())
-}
+
 
 /**
  * A simple one-pass integrator based on Gauss rule
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
index 7eca90f88..56647bace 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
@@ -6,36 +6,53 @@
 package space.kscience.kmath.integration
 
 import space.kscience.kmath.operations.Field
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.BufferFactory
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.operations.sum
 
 /**
+ * Use double pass Simpson rule integration with a fixed number of points.
+ * Requires [UnivariateIntegrandRanges] or [IntegrationRange] and [IntegrandMaxCalls]
  * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
  * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
  */
 public class SimpsonIntegrator<T : Any>(
     public val algebra: Field<T>,
-    public val bufferFactory: BufferFactory<T>,
 ) : UnivariateIntegrator<T> {
-    override fun integrate(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> = with(algebra) {
-        val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
-        require(numPoints >= 4)
-        val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
+
+    private fun integrateRange(
+        integrand: UnivariateIntegrand<T>, range: ClosedRange<Double>, numPoints: Int,
+    ): T = algebra {
         val h: Double = (range.endInclusive - range.start) / (numPoints - 1)
-        val points: Buffer<T> = bufferFactory(numPoints) { i ->
+        val values: List<T> = List(numPoints) { i ->
             integrand.function(range.start + i * h)
         }// equally distributed point
 
-        fun simpson(index: Int) = h / 3 * (points[index - 1] + 4 * points[index] + points[index + 1])
+        //TODO don't use list, reassign values instead
+        fun simpson(index: Int) = h / 3 * (values[index - 1] + 4 * values[index] + values[index + 1])
+
         var res = zero
         res += simpson(1) / 1.5 //border points with 1.5 factor
-        for (i in 2 until (points.size - 2)) {
+        for (i in 2 until (values.size - 2)) {
+            //each half-interval is computed twice, therefore /2
             res += simpson(i) / 2
         }
-        res += simpson(points.size - 2) / 1.5 //border points with 1.5 factor
-        return integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + points.size)
+        res += simpson(values.size - 2) / 1.5 //border points with 1.5 factor
+        return res
+    }
+
+    override fun integrate(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> {
+        val ranges = integrand.getFeature<UnivariateIntegrandRanges>()
+        return if (ranges != null) {
+            val res = algebra.sum(ranges.ranges.map { integrateRange(integrand, it.first, it.second) })
+            integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + ranges.ranges.sumOf { it.second })
+        } else {
+            val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
+            require(numPoints >= 4) { "Simpson integrator requires at least 4 nodes" }
+            val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
+            val res = integrateRange(integrand, range, numPoints)
+            integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + numPoints)
+        }
     }
 }
 
-public inline val <reified T : Any> Field<T>.simpsonIntegrator: SimpsonIntegrator<T>
-    get() = SimpsonIntegrator(this, Buffer.Companion::auto)
\ No newline at end of file
+public val <T : Any> Field<T>.simpsonIntegrator: SimpsonIntegrator<T> get() = SimpsonIntegrator(this)
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index da5730497..23d7bdd8d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -5,8 +5,98 @@
 
 package space.kscience.kmath.integration
 
-public class SplineIntegrator<T>: UnivariateIntegrator<T> {
-    override fun integrate(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> {
-        TODO("Not yet implemented")
+import space.kscience.kmath.functions.PiecewisePolynomial
+import space.kscience.kmath.functions.integrate
+import space.kscience.kmath.interpolation.PolynomialInterpolator
+import space.kscience.kmath.interpolation.SplineInterpolator
+import space.kscience.kmath.interpolation.interpolatePolynomials
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.operations.sum
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.MutableBufferFactory
+import space.kscience.kmath.structures.map
+
+/**
+ * Compute analytical indefinite integral of this [PiecewisePolynomial], keeping all intervals intact
+ */
+@UnstableKMathAPI
+public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(algebra: Field<T>): PiecewisePolynomial<T> =
+    PiecewisePolynomial(pieces.map { it.first to it.second.integrate(algebra) })
+
+/**
+ * Compute definite integral of given [PiecewisePolynomial] piece by piece in a given [range]
+ * Requires [UnivariateIntegrationNodes] or [IntegrationRange] and [IntegrandMaxCalls]
+ */
+@UnstableKMathAPI
+public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(
+    algebra: Field<T>, range: ClosedRange<T>,
+): T = algebra.sum(
+    pieces.map { (region, poly) ->
+        val intersectedRange = maxOf(range.start, region.start)..minOf(range.endInclusive, region.endInclusive)
+        //Check if polynomial range is not used
+        if (intersectedRange.start == intersectedRange.endInclusive) algebra.zero
+        else poly.integrate(algebra, intersectedRange)
     }
-}
\ No newline at end of file
+)
+
+/**
+ * A generic spline-interpolation-based analytic integration
+ * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
+ * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
+ */
+@UnstableKMathAPI
+public class SplineIntegrator<T : Comparable<T>>(
+    public val algebra: Field<T>,
+    public val bufferFactory: MutableBufferFactory<T>,
+) : UnivariateIntegrator<T> {
+    override fun integrate(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> = algebra {
+        val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
+
+        val interpolator: PolynomialInterpolator<T> = SplineInterpolator(algebra, bufferFactory)
+        val nodes: Buffer<Double> = integrand.getFeature<UnivariateIntegrationNodes>()?.nodes ?: run {
+            val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
+            val step = (range.endInclusive - range.start) / (numPoints - 1)
+            DoubleBuffer(numPoints) { i -> range.start + i * step }
+        }
+
+        val values = nodes.map(bufferFactory) { integrand.function(it) }
+        val polynomials = interpolator.interpolatePolynomials(
+            nodes.map(bufferFactory) { number(it) },
+            values
+        )
+        val res = polynomials.integrate(algebra, number(range.start)..number(range.endInclusive))
+        integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + nodes.size)
+    }
+}
+
+/**
+ * A simplified double-based spline-interpolation-based analytic integration
+ * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
+ * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
+ */
+@UnstableKMathAPI
+public object DoubleSplineIntegrator : UnivariateIntegrator<Double> {
+    override fun integrate(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
+        val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
+
+        val interpolator: PolynomialInterpolator<Double> = SplineInterpolator(DoubleField, ::DoubleBuffer)
+        val nodes: Buffer<Double> = integrand.getFeature<UnivariateIntegrationNodes>()?.nodes ?: run {
+            val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
+            val step = (range.endInclusive - range.start) / (numPoints - 1)
+            DoubleBuffer(numPoints) { i -> range.start + i * step }
+        }
+
+        val values = nodes.map { integrand.function(it) }
+        val polynomials = interpolator.interpolatePolynomials(nodes, values)
+        val res = polynomials.integrate(DoubleField, range)
+        return integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + nodes.size)
+    }
+}
+
+@UnstableKMathAPI
+public inline val DoubleField.splineIntegrator: UnivariateIntegrator<Double>
+    get() = DoubleSplineIntegrator
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index d3d0220f6..8c515065f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -6,6 +6,8 @@
 package space.kscience.kmath.integration
 
 import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.jvm.JvmInline
 import kotlin.reflect.KClass
 
@@ -35,6 +37,19 @@ public typealias UnivariateIntegrator<T> = Integrator<UnivariateIntegrand<T>>
 @JvmInline
 public value class IntegrationRange(public val range: ClosedRange<Double>) : IntegrandFeature
 
+/**
+ * Set of univariate integration ranges. First components correspond to ranges themselves, second components to number of
+ * integration nodes per range
+ */
+public class UnivariateIntegrandRanges(public val ranges: List<Pair<ClosedRange<Double>, Int>>) : IntegrandFeature {
+    public constructor(vararg pairs: Pair<ClosedRange<Double>, Int>) : this(pairs.toList())
+}
+
+public class UnivariateIntegrationNodes(public val nodes: Buffer<Double>) : IntegrandFeature {
+    public constructor(vararg nodes: Double) : this(DoubleBuffer(nodes))
+}
+
+
 /**
  * Value of the integrand if it is present or null
  */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
index 08090a522..c9ec0d527 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
@@ -15,10 +15,16 @@ import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asBuffer
 
+/**
+ * And interpolator for data with x column type [X], y column type [Y].
+ */
 public fun interface Interpolator<T, X : T, Y : T> {
     public fun interpolate(points: XYColumnarData<T, X, Y>): (X) -> Y
 }
 
+/**
+ * And interpolator returning [PiecewisePolynomial] function
+ */
 public interface PolynomialInterpolator<T : Comparable<T>> : Interpolator<T, T, T> {
     public val algebra: Ring<T>
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
index b0c0cd098..9f2d71554 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
@@ -24,8 +24,8 @@ class SimpsonIntegralTest {
 
     @Test
     fun gaussUniform() {
-        val res = DoubleField.simpsonIntegrator.integrate(35.0..100.0) { x ->
-            if(x in 30.0..50.0){
+        val res = DoubleField.simpsonIntegrator.integrate(35.0..100.0, IntegrandMaxCalls(20)) { x ->
+            if (x in 30.0..50.0) {
                 1.0
             } else {
                 0.0
@@ -33,6 +33,4 @@ class SimpsonIntegralTest {
         }
         assertEquals(15.0, res.value, 0.5)
     }
-
-
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
new file mode 100644
index 000000000..afeba0be4
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.integration
+
+import space.kscience.kmath.functions.Polynomial
+import space.kscience.kmath.functions.integrate
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField
+import kotlin.math.PI
+import kotlin.math.sin
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+@OptIn(UnstableKMathAPI::class)
+class SplineIntegralTest {
+
+    @Test
+    fun integratePolynomial(){
+        val polynomial = Polynomial(1.0, 2.0, 3.0)
+        val integral = polynomial.integrate(DoubleField,1.0..2.0)
+        assertEquals(11.0, integral, 0.001)
+    }
+
+    @Test
+    fun gaussSin() {
+        val res = DoubleField.splineIntegrator.integrate(0.0..2 * PI, IntegrandMaxCalls(5)) { x ->
+            sin(x)
+        }
+        assertEquals(0.0, res.value, 1e-2)
+    }
+
+    @Test
+    fun gaussUniform() {
+        val res = DoubleField.splineIntegrator.integrate(35.0..100.0, IntegrandMaxCalls(20)) { x ->
+            if(x in 30.0..50.0){
+                1.0
+            } else {
+                0.0
+            }
+        }
+        assertEquals(15.0, res.value, 0.5)
+    }
+
+
+}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cc9eb4860..065dd3ac4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,11 +1,11 @@
 pluginManagement {
     repositories {
+        maven("https://repo.kotlin.link")
         mavenCentral()
         gradlePluginPortal()
-        maven("https://repo.kotlin.link")
     }
 
-    val toolsVersion = "0.9.8"
+    val toolsVersion = "0.9.9"
     val kotlinVersion = "1.5.0"
 
     plugins {
@@ -15,8 +15,8 @@ pluginManagement {
         kotlin("multiplatform") version kotlinVersion
         kotlin("jvm") version kotlinVersion
         kotlin("plugin.allopen") version kotlinVersion
-        id("org.jetbrains.kotlinx.benchmark") version "0.3.0"
-        kotlin("jupyter.api") version "0.9.1-61"
+        id("org.jetbrains.kotlinx.benchmark") version "0.3.1"
+        kotlin("jupyter.api") version "0.10.0-25"
 
     }
 }
-- 
2.34.1


From ec7a971df71e4371c2720ffb77d2c3dafbd0c0bf Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 22 May 2021 20:17:52 +0300
Subject: [PATCH 269/713] Separate double-based integrator for a Simpson rule

---
 build.gradle.kts                              |  3 +-
 .../kmath/integration/SimpsonIntegrator.kt    | 51 ++++++++++++++++++-
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d44833445..ef9c60c55 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,13 +10,12 @@ allprojects {
         maven("http://logicrunch.research.it.uu.se/maven") {
             isAllowInsecureProtocol = true
         }
-        maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
         maven("https://oss.sonatype.org/content/repositories/snapshots")
         mavenCentral()
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-11"
+    version = "0.3.0-dev-12"
 }
 
 subprojects {
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
index 56647bace..baa9d4af8 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.integration
 
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.operations.sum
@@ -15,6 +17,7 @@ import space.kscience.kmath.operations.sum
  * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
  * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
  */
+@UnstableKMathAPI
 public class SimpsonIntegrator<T : Any>(
     public val algebra: Field<T>,
 ) : UnivariateIntegrator<T> {
@@ -55,4 +58,50 @@ public class SimpsonIntegrator<T : Any>(
     }
 }
 
-public val <T : Any> Field<T>.simpsonIntegrator: SimpsonIntegrator<T> get() = SimpsonIntegrator(this)
\ No newline at end of file
+@UnstableKMathAPI
+public val <T : Any> Field<T>.simpsonIntegrator: SimpsonIntegrator<T> get() = SimpsonIntegrator(this)
+
+/**
+ * Use double pass Simpson rule integration with a fixed number of points.
+ * Requires [UnivariateIntegrandRanges] or [IntegrationRange] and [IntegrandMaxCalls]
+ * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
+ * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
+ */
+public object DoubleSimpsonIntegrator : UnivariateIntegrator<Double> {
+
+    private fun integrateRange(
+        integrand: UnivariateIntegrand<Double>, range: ClosedRange<Double>, numPoints: Int,
+    ): Double {
+        val h: Double = (range.endInclusive - range.start) / (numPoints - 1)
+        val values = DoubleArray(numPoints) { i ->
+            integrand.function(range.start + i * h)
+        }// equally distributed point
+
+        fun simpson(index: Int) = h / 3 * (values[index - 1] + 4 * values[index] + values[index + 1])
+
+        var res = 0.0
+        res += simpson(1) / 1.5 //border points with 1.5 factor
+        for (i in 2 until (values.size - 2)) {
+            //each half-interval is computed twice, therefore /2
+            res += simpson(i) / 2
+        }
+        res += simpson(values.size - 2) / 1.5 //border points with 1.5 factor
+        return res
+    }
+
+    override fun integrate(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
+        val ranges = integrand.getFeature<UnivariateIntegrandRanges>()
+        return if (ranges != null) {
+            val res = ranges.ranges.sumOf { integrateRange(integrand, it.first, it.second) }
+            integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + ranges.ranges.sumOf { it.second })
+        } else {
+            val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
+            require(numPoints >= 4) { "Simpson integrator requires at least 4 nodes" }
+            val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
+            val res = integrateRange(integrand, range, numPoints)
+            integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + numPoints)
+        }
+    }
+}
+
+public val DoubleField.simpsonIntegrator: DoubleSimpsonIntegrator get() = DoubleSimpsonIntegrator
\ No newline at end of file
-- 
2.34.1


From 380c76fe40d2cdaeca9731aeb0d5b54b225ea37a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 23 May 2021 20:01:07 +0300
Subject: [PATCH 270/713] Piecewise optimization

---
 build.gradle.kts                              |  2 +-
 .../space/kscience/kmath/misc/annotations.kt  |  4 +-
 .../kscience/kmath/functions/Piecewise.kt     | 49 ++++++++++++++-----
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ef9c60c55..4de6d8bad 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-12"
+    version = "0.3.0-dev-13"
 }
 
 subprojects {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
index 18718de97..e521e6237 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
@@ -26,4 +26,6 @@ public annotation class UnstableKMathAPI
     "Refer to the documentation to use this API in performance-critical code",
     RequiresOptIn.Level.WARNING
 )
-public annotation class PerformancePitfall
+public annotation class PerformancePitfall(
+    val message: String = "Potential performance problem"
+)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index dd9c571b0..73fa57c7b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.operations.Ring
 
 /**
@@ -24,17 +25,43 @@ public fun interface Piecewise<T, R> {
  * Represents piecewise-defined function where all the sub-functions are polynomials.
  * @param pieces An ordered list of range-polynomial pairs. The list does not in general guarantee that there are no "holes" in it.
  */
-public class PiecewisePolynomial<T : Comparable<T>>(
-    public val pieces: List<Pair<ClosedRange<T>, Polynomial<T>>>,
-) : Piecewise<T, Polynomial<T>> {
+public interface PiecewisePolynomial<T : Comparable<T>> : Piecewise<T, Polynomial<T>> {
+    public val pieces: Collection<Pair<ClosedRange<T>, Polynomial<T>>>
 
-    public override fun findPiece(arg: T): Polynomial<T>? {
-        return if (arg < pieces.first().first.start || arg >= pieces.last().first.endInclusive)
-            null
-        else {
-            pieces.firstOrNull { arg in it.first }?.second
+    public override fun findPiece(arg: T): Polynomial<T>?
+}
+
+/**
+ * A generic piecewise without constraints on how pieces are placed
+ */
+@PerformancePitfall("findPiece method of resulting piecewise is slow")
+public fun <T : Comparable<T>> PiecewisePolynomial(
+    pieces: Collection<Pair<ClosedRange<T>, Polynomial<T>>>,
+): PiecewisePolynomial<T> = object : PiecewisePolynomial<T> {
+    override val pieces: Collection<Pair<ClosedRange<T>, Polynomial<T>>> = pieces
+
+    override fun findPiece(arg: T): Polynomial<T>? = pieces.firstOrNull { arg in it.first }?.second
+}
+
+/**
+ * An optimized piecewise which uses not separate pieces, but a range separated by delimiters.
+ * The pices search is logarithmic
+ */
+private class OrderedPiecewisePolynomial<T : Comparable<T>>(
+    override val pieces: List<Pair<ClosedRange<T>, Polynomial<T>>>,
+) : PiecewisePolynomial<T> {
+
+    override fun findPiece(arg: T): Polynomial<T>? {
+        val index = pieces.binarySearch { (range, _) ->
+            when {
+                arg >= range.endInclusive -> -1
+                arg < range.start -> +1
+                else -> 0
+            }
         }
+        return if (index < 0) null else pieces[index].second
     }
+
 }
 
 /**
@@ -71,9 +98,9 @@ public class PiecewiseBuilder<T : Comparable<T>>(delimiter: T) {
         pieces.add(0, piece)
     }
 
-    public fun build(): PiecewisePolynomial<T> {
-        return PiecewisePolynomial(delimiters.zipWithNext { l, r -> l..r }.zip(pieces))
-    }
+    public fun build(): PiecewisePolynomial<T> = OrderedPiecewisePolynomial(delimiters.zipWithNext { l, r ->
+        l..r
+    }.zip(pieces))
 }
 
 /**
-- 
2.34.1


From 12805712d3a42092c7b4ca65c1fd2507acf2c0f3 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 24 May 2021 14:30:51 +0300
Subject: [PATCH 271/713] Integrand toString

---
 .../kmath/commons/integration/CMIntegrator.kt | 41 ++++++++-----------
 .../integration/GaussIntegratorRuleFactory.kt |  2 +
 .../kscience/kmath/integration/Integrand.kt   | 29 ++++++++++---
 .../integration/MultivariateIntegrand.kt      |  8 ++--
 .../kmath/integration/UnivariateIntegrand.kt  | 29 +++++++++----
 5 files changed, 66 insertions(+), 43 deletions(-)

diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
index 92bf86128..bcddccdc4 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
@@ -18,12 +18,6 @@ public class CMIntegrator(
     public val integratorBuilder: (Integrand) -> org.apache.commons.math3.analysis.integration.UnivariateIntegrator,
 ) : UnivariateIntegrator<Double> {
 
-    public class TargetRelativeAccuracy(public val value: Double) : IntegrandFeature
-    public class TargetAbsoluteAccuracy(public val value: Double) : IntegrandFeature
-
-    public class MinIterations(public val value: Int) : IntegrandFeature
-    public class MaxIterations(public val value: Int) : IntegrandFeature
-
     override fun integrate(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
         val integrator = integratorBuilder(integrand)
         val maxCalls = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: defaultMaxCalls
@@ -45,16 +39,15 @@ public class CMIntegrator(
          * Create a Simpson integrator based on [SimpsonIntegrator]
          */
         public fun simpson(defaultMaxCalls: Int = 200): CMIntegrator = CMIntegrator(defaultMaxCalls) { integrand ->
-            val absoluteAccuracy = integrand.getFeature<TargetAbsoluteAccuracy>()?.value
+            val absoluteAccuracy = integrand.getFeature<IntegrandAbsoluteAccuracy>()?.accuracy
                 ?: SimpsonIntegrator.DEFAULT_ABSOLUTE_ACCURACY
-            val relativeAccuracy = integrand.getFeature<TargetRelativeAccuracy>()?.value
+            val relativeAccuracy = integrand.getFeature<IntegrandRelativeAccuracy>()?.accuracy
                 ?: SimpsonIntegrator.DEFAULT_ABSOLUTE_ACCURACY
-            val minIterations = integrand.getFeature<MinIterations>()?.value
-                ?: SimpsonIntegrator.DEFAULT_MIN_ITERATIONS_COUNT
-            val maxIterations = integrand.getFeature<MaxIterations>()?.value
-                ?: SimpsonIntegrator.SIMPSON_MAX_ITERATIONS_COUNT
+            val iterations = integrand.getFeature<IntegrandIterationsRange>()?.range
+                ?: SimpsonIntegrator.DEFAULT_MIN_ITERATIONS_COUNT..SimpsonIntegrator.SIMPSON_MAX_ITERATIONS_COUNT
 
-            SimpsonIntegrator(relativeAccuracy, absoluteAccuracy, minIterations, maxIterations)
+
+            SimpsonIntegrator(relativeAccuracy, absoluteAccuracy, iterations.first, iterations.last)
         }
 
         /**
@@ -62,21 +55,19 @@ public class CMIntegrator(
          */
         public fun legandre(numPoints: Int, defaultMaxCalls: Int = numPoints * 5): CMIntegrator =
             CMIntegrator(defaultMaxCalls) { integrand ->
-                val absoluteAccuracy = integrand.getFeature<TargetAbsoluteAccuracy>()?.value
+                val absoluteAccuracy = integrand.getFeature<IntegrandAbsoluteAccuracy>()?.accuracy
                     ?: IterativeLegendreGaussIntegrator.DEFAULT_ABSOLUTE_ACCURACY
-                val relativeAccuracy = integrand.getFeature<TargetRelativeAccuracy>()?.value
+                val relativeAccuracy = integrand.getFeature<IntegrandRelativeAccuracy>()?.accuracy
                     ?: IterativeLegendreGaussIntegrator.DEFAULT_ABSOLUTE_ACCURACY
-                val minIterations = integrand.getFeature<MinIterations>()?.value
-                    ?: IterativeLegendreGaussIntegrator.DEFAULT_MIN_ITERATIONS_COUNT
-                val maxIterations = integrand.getFeature<MaxIterations>()?.value
-                    ?: IterativeLegendreGaussIntegrator.DEFAULT_MAX_ITERATIONS_COUNT
+                val iterations = integrand.getFeature<IntegrandIterationsRange>()?.range
+                    ?: IterativeLegendreGaussIntegrator.DEFAULT_MIN_ITERATIONS_COUNT..IterativeLegendreGaussIntegrator.DEFAULT_MAX_ITERATIONS_COUNT
 
                 IterativeLegendreGaussIntegrator(
                     numPoints,
                     relativeAccuracy,
                     absoluteAccuracy,
-                    minIterations,
-                    maxIterations
+                    iterations.first,
+                    iterations.last
                 )
             }
     }
@@ -84,14 +75,14 @@ public class CMIntegrator(
 
 @UnstableKMathAPI
 public var MutableList<IntegrandFeature>.targetAbsoluteAccuracy: Double?
-    get() = filterIsInstance<CMIntegrator.TargetAbsoluteAccuracy>().lastOrNull()?.value
+    get() = filterIsInstance<IntegrandAbsoluteAccuracy>().lastOrNull()?.accuracy
     set(value) {
-        value?.let { add(CMIntegrator.TargetAbsoluteAccuracy(value)) }
+        value?.let { add(IntegrandAbsoluteAccuracy(value)) }
     }
 
 @UnstableKMathAPI
 public var MutableList<IntegrandFeature>.targetRelativeAccuracy: Double?
-    get() = filterIsInstance<CMIntegrator.TargetRelativeAccuracy>().lastOrNull()?.value
+    get() = filterIsInstance<IntegrandRelativeAccuracy>().lastOrNull()?.accuracy
     set(value) {
-        value?.let { add(CMIntegrator.TargetRelativeAccuracy(value)) }
+        value?.let { add(IntegrandRelativeAccuracy(value)) }
     }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
index 133f829e3..594ca9940 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
@@ -164,4 +164,6 @@ public object GaussLegendreRuleFactory : GaussIntegratorRuleFactory {
     }
 
     override fun build(numPoints: Int): Pair<Buffer<Double>, Buffer<Double>> = getOrBuildRule(numPoints)
+
+    override fun toString(): String = "GaussLegendreRule"
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
index 1ff8e422e..f9c26e88b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
@@ -7,22 +7,39 @@ package space.kscience.kmath.integration
 
 import kotlin.reflect.KClass
 
-public interface IntegrandFeature
+public interface IntegrandFeature {
+    override fun toString(): String
+}
 
 public interface Integrand {
+    public val features: Set<IntegrandFeature>
     public fun <T : IntegrandFeature> getFeature(type: KClass<T>): T?
 }
 
 public inline fun <reified T : IntegrandFeature> Integrand.getFeature(): T? = getFeature(T::class)
 
-public class IntegrandValue<T : Any>(public val value: T) : IntegrandFeature
+public class IntegrandValue<T : Any>(public val value: T) : IntegrandFeature {
+    override fun toString(): String = "Value($value)"
+}
 
-public class IntegrandRelativeAccuracy(public val accuracy: Double) : IntegrandFeature
+public class IntegrandRelativeAccuracy(public val accuracy: Double) : IntegrandFeature {
+    override fun toString(): String = "TargetRelativeAccuracy($accuracy)"
+}
 
-public class IntegrandAbsoluteAccuracy(public val accuracy: Double) : IntegrandFeature
+public class IntegrandAbsoluteAccuracy(public val accuracy: Double) : IntegrandFeature {
+    override fun toString(): String = "TargetAbsoluteAccuracy($accuracy)"
+}
 
-public class IntegrandCallsPerformed(public val calls: Int) : IntegrandFeature
+public class IntegrandCallsPerformed(public val calls: Int) : IntegrandFeature {
+    override fun toString(): String = "Calls($calls)"
+}
 
 public val Integrand.calls: Int get() = getFeature<IntegrandCallsPerformed>()?.calls ?: 0
 
-public class IntegrandMaxCalls(public val maxCalls: Int) : IntegrandFeature
+public class IntegrandMaxCalls(public val maxCalls: Int) : IntegrandFeature {
+    override fun toString(): String = "MaxCalls($maxCalls)"
+}
+
+public class IntegrandIterationsRange(public val range: IntRange) : IntegrandFeature {
+    override fun toString(): String = "Iterations(${range.first}..${range.last})"
+}
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
index 12d0ef0a6..5ba411bf9 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
@@ -9,15 +9,17 @@ import space.kscience.kmath.linear.Point
 import kotlin.reflect.KClass
 
 public class MultivariateIntegrand<T : Any> internal constructor(
-    private val features: Map<KClass<*>, IntegrandFeature>,
+    private val featureMap: Map<KClass<*>, IntegrandFeature>,
     public val function: (Point<T>) -> T,
 ) : Integrand {
 
+    override val features: Set<IntegrandFeature> get() = featureMap.values.toSet()
+
     @Suppress("UNCHECKED_CAST")
-    override fun <T : IntegrandFeature> getFeature(type: KClass<T>): T? = features[type] as? T
+    override fun <T : IntegrandFeature> getFeature(type: KClass<T>): T? = featureMap[type] as? T
 
     public operator fun <F : IntegrandFeature> plus(pair: Pair<KClass<out F>, F>): MultivariateIntegrand<T> =
-        MultivariateIntegrand(features + pair, function)
+        MultivariateIntegrand(featureMap + pair, function)
 
     public operator fun <F : IntegrandFeature> plus(feature: F): MultivariateIntegrand<T> =
         plus(feature::class to feature)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index 8c515065f..e265f54e8 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -8,19 +8,20 @@ package space.kscience.kmath.integration
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
-import kotlin.jvm.JvmInline
 import kotlin.reflect.KClass
 
 public class UnivariateIntegrand<T> internal constructor(
-    private val features: Map<KClass<*>, IntegrandFeature>,
+    private val featureMap: Map<KClass<*>, IntegrandFeature>,
     public val function: (Double) -> T,
 ) : Integrand {
 
+    override val features: Set<IntegrandFeature> get() = featureMap.values.toSet()
+
     @Suppress("UNCHECKED_CAST")
-    override fun <T : IntegrandFeature> getFeature(type: KClass<T>): T? = features[type] as? T
+    override fun <T : IntegrandFeature> getFeature(type: KClass<T>): T? = featureMap[type] as? T
 
     public operator fun <F : IntegrandFeature> plus(pair: Pair<KClass<out F>, F>): UnivariateIntegrand<T> =
-        UnivariateIntegrand(features + pair, function)
+        UnivariateIntegrand(featureMap + pair, function)
 
     public operator fun <F : IntegrandFeature> plus(feature: F): UnivariateIntegrand<T> =
         plus(feature::class to feature)
@@ -34,8 +35,9 @@ public fun <T : Any> UnivariateIntegrand(
 
 public typealias UnivariateIntegrator<T> = Integrator<UnivariateIntegrand<T>>
 
-@JvmInline
-public value class IntegrationRange(public val range: ClosedRange<Double>) : IntegrandFeature
+public class IntegrationRange(public val range: ClosedRange<Double>) : IntegrandFeature {
+    override fun toString(): String = "Range(${range.start}..${range.endInclusive})"
+}
 
 /**
  * Set of univariate integration ranges. First components correspond to ranges themselves, second components to number of
@@ -43,10 +45,19 @@ public value class IntegrationRange(public val range: ClosedRange<Double>) : Int
  */
 public class UnivariateIntegrandRanges(public val ranges: List<Pair<ClosedRange<Double>, Int>>) : IntegrandFeature {
     public constructor(vararg pairs: Pair<ClosedRange<Double>, Int>) : this(pairs.toList())
+
+    override fun toString(): String {
+        val rangesString = ranges.joinToString(separator = ",") { (range, points) ->
+            "${range.start}..${range.endInclusive} : $points"
+        }
+        return "UnivariateRanges($rangesString)"
+    }
 }
 
 public class UnivariateIntegrationNodes(public val nodes: Buffer<Double>) : IntegrandFeature {
     public constructor(vararg nodes: Double) : this(DoubleBuffer(nodes))
+
+    override fun toString(): String = "UnivariateNodes($nodes)"
 }
 
 
@@ -65,7 +76,7 @@ public val <T : Any> UnivariateIntegrand<T>.value: T get() = valueOrNull ?: erro
  * The [function] is placed in the end position to allow passing a lambda.
  */
 @UnstableKMathAPI
-public fun <T: Any> UnivariateIntegrator<T>.integrate(
+public fun <T : Any> UnivariateIntegrator<T>.integrate(
     vararg features: IntegrandFeature,
     function: (Double) -> T,
 ): UnivariateIntegrand<T> = integrate(UnivariateIntegrand(function, *features))
@@ -75,7 +86,7 @@ public fun <T: Any> UnivariateIntegrator<T>.integrate(
  * The [function] is placed in the end position to allow passing a lambda.
  */
 @UnstableKMathAPI
-public fun <T: Any> UnivariateIntegrator<T>.integrate(
+public fun <T : Any> UnivariateIntegrator<T>.integrate(
     range: ClosedRange<Double>,
     vararg features: IntegrandFeature,
     function: (Double) -> T,
@@ -86,7 +97,7 @@ public fun <T: Any> UnivariateIntegrator<T>.integrate(
  * The [function] is placed in the end position to allow passing a lambda.
  */
 @UnstableKMathAPI
-public fun <T: Any> UnivariateIntegrator<T>.integrate(
+public fun <T : Any> UnivariateIntegrator<T>.integrate(
     range: ClosedRange<Double>,
     featureBuilder: MutableList<IntegrandFeature>.() -> Unit = {},
     function: (Double) -> T,
-- 
2.34.1


From 88e94a7fd9cc64dbb4d892b21cedef237bfd0045 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 24 May 2021 17:02:12 +0300
Subject: [PATCH 272/713] [WIP] Optimization

---
 .../kmath/commons/fit/fitWithAutoDiff.kt      |   1 -
 .../commons/optimization/CMOptimization.kt    | 103 ++++++++++--------
 .../kmath/commons/optimization/cmFit.kt       |   2 +-
 .../kmath/data/XYErrorColumnarData.kt         |   6 +-
 .../kmath/integration/GaussIntegrator.kt      |   4 +-
 .../kscience/kmath/integration/Integrand.kt   |  10 +-
 .../integration/MultivariateIntegrand.kt      |  16 +--
 .../kmath/integration/SimpsonIntegrator.kt    |   4 +-
 .../kmath/integration/SplineIntegrator.kt     |   4 +-
 .../kmath/integration/UnivariateIntegrand.kt  |  23 ++--
 .../optimization/FunctionOptimization.kt      |  10 +-
 .../kmath/optimization/OptimizationProblem.kt |  43 +++-----
 .../kscience/kmath/optimization/XYFit.kt      |  21 ++--
 .../kmath/optimization/minuit/Range.kt        |  32 ------
 .../kscience/kmath/optimization/qow/QowFit.kt |   6 +-
 15 files changed, 119 insertions(+), 166 deletions(-)
 delete mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Range.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt b/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
index 5e64235e3..5660c76e8 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
@@ -8,7 +8,6 @@ package space.kscience.kmath.commons.fit
 import kotlinx.html.br
 import kotlinx.html.h3
 import space.kscience.kmath.commons.optimization.chiSquared
-import space.kscience.kmath.commons.optimization.minimize
 import space.kscience.kmath.distributions.NormalDistribution
 import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.optimization.FunctionOptimization
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
index 6bde14627..282f1670d 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
@@ -13,7 +13,6 @@ import org.apache.commons.math3.optim.nonlinear.scalar.ObjectiveFunctionGradient
 import org.apache.commons.math3.optim.nonlinear.scalar.gradient.NonLinearConjugateGradientOptimizer
 import space.kscience.kmath.expressions.derivative
 import space.kscience.kmath.expressions.withSymbols
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.optimization.*
 import kotlin.reflect.KClass
@@ -21,9 +20,15 @@ import kotlin.reflect.KClass
 public operator fun PointValuePair.component1(): DoubleArray = point
 public operator fun PointValuePair.component2(): Double = value
 
-public class CMOptimizerFactory(public val optimizerBuilder: () -> MultivariateOptimizer) : OptimizationFeature
+public class CMOptimizer(public val optimizerBuilder: () -> MultivariateOptimizer): OptimizationFeature{
+    override fun toString(): String = "CMOptimizer($optimizerBuilder)"
+}
+
 public class CMOptimizerData(public val data: List<OptimizationData>) : OptimizationFeature {
     public constructor(vararg data: OptimizationData) : this(data.toList())
+
+    override fun toString(): String = "CMOptimizerData($data)"
+
 }
 
 @OptIn(UnstableKMathAPI::class)
@@ -31,59 +36,69 @@ public class CMOptimization : Optimizer<FunctionOptimization<Double>> {
 
     override suspend fun process(
         problem: FunctionOptimization<Double>,
-    ): FunctionOptimization<Double> = withSymbols(problem.parameters) {
-        val convergenceChecker: ConvergenceChecker<PointValuePair> = SimpleValueChecker(
-            DEFAULT_RELATIVE_TOLERANCE,
-            DEFAULT_ABSOLUTE_TOLERANCE,
-            DEFAULT_MAX_ITER
-        )
+    ): FunctionOptimization<Double> {
+        val startPoint = problem.getFeature<OptimizationStartPoint<Double>>()?.point
+            ?: error("Starting point not defined in $problem")
 
-        val cmOptimizer: MultivariateOptimizer = problem.getFeature<CMOptimizerFactory>()?.optimizerBuilder?.invoke()
-            ?: NonLinearConjugateGradientOptimizer(
-                NonLinearConjugateGradientOptimizer.Formula.FLETCHER_REEVES,
-                convergenceChecker
+        val parameters = problem.getFeature<OptimizationParameters>()?.symbols
+            ?: problem.getFeature<OptimizationStartPoint<Double>>()?.point?.keys
+            ?:startPoint.keys
+
+
+        withSymbols(parameters) {
+            val convergenceChecker: ConvergenceChecker<PointValuePair> = SimpleValueChecker(
+                DEFAULT_RELATIVE_TOLERANCE,
+                DEFAULT_ABSOLUTE_TOLERANCE,
+                DEFAULT_MAX_ITER
             )
 
-        val optimizationData: HashMap<KClass<out OptimizationData>, OptimizationData> = HashMap()
+            val cmOptimizer: MultivariateOptimizer = problem.getFeature<CMOptimizer>()?.optimizerBuilder?.invoke()
+                ?: NonLinearConjugateGradientOptimizer(
+                    NonLinearConjugateGradientOptimizer.Formula.FLETCHER_REEVES,
+                    convergenceChecker
+                )
 
-        fun addOptimizationData(data: OptimizationData) {
-            optimizationData[data::class] = data
-        }
+            val optimizationData: HashMap<KClass<out OptimizationData>, OptimizationData> = HashMap()
 
-        addOptimizationData(MaxEval.unlimited())
-        addOptimizationData(InitialGuess(problem.initialGuess.toDoubleArray()))
-
-        fun exportOptimizationData(): List<OptimizationData> = optimizationData.values.toList()
-
-        val objectiveFunction = ObjectiveFunction {
-            val args = problem.initialGuess + it.toMap()
-            problem.expression(args)
-        }
-        addOptimizationData(objectiveFunction)
-
-        val gradientFunction = ObjectiveFunctionGradient {
-            val args = problem.initialGuess + it.toMap()
-            DoubleArray(symbols.size) { index ->
-                problem.expression.derivative(symbols[index])(args)
+            fun addOptimizationData(data: OptimizationData) {
+                optimizationData[data::class] = data
             }
-        }
-        addOptimizationData(gradientFunction)
 
-        val logger = problem.getFeature<OptimizationLog>()
+            addOptimizationData(MaxEval.unlimited())
+            addOptimizationData(InitialGuess(startPoint.toDoubleArray()))
 
-        for (feature in problem.features) {
-            when (feature) {
-                is CMOptimizerData -> feature.data.forEach { addOptimizationData(it) }
-                is FunctionOptimizationTarget -> when(feature){
-                    FunctionOptimizationTarget.MAXIMIZE -> addOptimizationData(GoalType.MAXIMIZE)
-                    FunctionOptimizationTarget.MINIMIZE -> addOptimizationData(GoalType.MINIMIZE)
+            fun exportOptimizationData(): List<OptimizationData> = optimizationData.values.toList()
+
+            val objectiveFunction = ObjectiveFunction {
+                val args = startPoint + it.toMap()
+                problem.expression(args)
+            }
+            addOptimizationData(objectiveFunction)
+
+            val gradientFunction = ObjectiveFunctionGradient {
+                val args = startPoint + it.toMap()
+                DoubleArray(symbols.size) { index ->
+                    problem.expression.derivative(symbols[index])(args)
                 }
-                else -> logger?.log { "The feature $feature is unused in optimization" }
             }
-        }
+            addOptimizationData(gradientFunction)
 
-        val (point, value) = cmOptimizer.optimize(*optimizationData.values.toTypedArray())
-        return problem.withFeatures(FunctionOptimizationResult(point.toMap(), value))
+            val logger = problem.getFeature<OptimizationLog>()
+
+            for (feature in problem.features) {
+                when (feature) {
+                    is CMOptimizerData -> feature.data.forEach { addOptimizationData(it) }
+                    is FunctionOptimizationTarget -> when (feature) {
+                        FunctionOptimizationTarget.MAXIMIZE -> addOptimizationData(GoalType.MAXIMIZE)
+                        FunctionOptimizationTarget.MINIMIZE -> addOptimizationData(GoalType.MINIMIZE)
+                    }
+                    else -> logger?.log { "The feature $feature is unused in optimization" }
+                }
+            }
+
+            val (point, value) = cmOptimizer.optimize(*optimizationData.values.toTypedArray())
+            return problem.withFeatures(OptimizationResult(point.toMap()), OptimizationValue(value))
+        }
     }
 
     public companion object {
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
index 9c0089b3d..f1095ef73 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
@@ -9,7 +9,7 @@ import org.apache.commons.math3.analysis.differentiation.DerivativeStructure
 import space.kscience.kmath.commons.expressions.DerivativeStructureField
 import space.kscience.kmath.expressions.DifferentiableExpression
 import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.misc.Symbol
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.optimization.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asBuffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
index ea98e88b1..7199de888 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.data
 
-import space.kscience.kmath.misc.Symbol
-import space.kscience.kmath.misc.Symbol.Companion.z
+import space.kscience.kmath.data.XYErrorColumnarData.Companion
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.misc.symbol
 import space.kscience.kmath.structures.Buffer
 
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index 283f97557..f794b075f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -51,7 +51,7 @@ public class GaussIntegrator<T : Any>(
         }
     }
 
-    override fun integrate(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> = with(algebra) {
+    override fun process(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> = with(algebra) {
         val f = integrand.function
         val (points, weights) = buildRule(integrand)
         var res = zero
@@ -95,7 +95,7 @@ public fun <T : Any> GaussIntegrator<T>.integrate(
     val ranges = UnivariateIntegrandRanges(
         (0 until intervals).map { i -> (range.start + rangeSize * i)..(range.start + rangeSize * (i + 1)) to order }
     )
-    return integrate(
+    return process(
         UnivariateIntegrand(
             function,
             IntegrationRange(range),
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
index f9c26e88b..dcf711c3b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
@@ -5,18 +5,20 @@
 
 package space.kscience.kmath.integration
 
+import space.kscience.kmath.misc.FeatureSet
+import space.kscience.kmath.misc.Featured
 import kotlin.reflect.KClass
 
 public interface IntegrandFeature {
     override fun toString(): String
 }
 
-public interface Integrand {
-    public val features: Set<IntegrandFeature>
-    public fun <T : IntegrandFeature> getFeature(type: KClass<T>): T?
+public interface Integrand : Featured<IntegrandFeature> {
+    public val features: FeatureSet<IntegrandFeature>
+    override fun <T : IntegrandFeature> getFeature(type: KClass<out T>): T? = features.getFeature(type)
 }
 
-public inline fun <reified T : IntegrandFeature> Integrand.getFeature(): T? = getFeature(T::class)
+public inline fun <reified T: IntegrandFeature> Integrand.getFeature(): T? = getFeature(T::class)
 
 public class IntegrandValue<T : Any>(public val value: T) : IntegrandFeature {
     override fun toString(): String = "Value($value)"
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
index 5ba411bf9..96b81aaa6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
@@ -6,29 +6,21 @@
 package space.kscience.kmath.integration
 
 import space.kscience.kmath.linear.Point
-import kotlin.reflect.KClass
+import space.kscience.kmath.misc.FeatureSet
 
 public class MultivariateIntegrand<T : Any> internal constructor(
-    private val featureMap: Map<KClass<*>, IntegrandFeature>,
+    override val features: FeatureSet<IntegrandFeature>,
     public val function: (Point<T>) -> T,
 ) : Integrand {
 
-    override val features: Set<IntegrandFeature> get() = featureMap.values.toSet()
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : IntegrandFeature> getFeature(type: KClass<T>): T? = featureMap[type] as? T
-
-    public operator fun <F : IntegrandFeature> plus(pair: Pair<KClass<out F>, F>): MultivariateIntegrand<T> =
-        MultivariateIntegrand(featureMap + pair, function)
-
     public operator fun <F : IntegrandFeature> plus(feature: F): MultivariateIntegrand<T> =
-        plus(feature::class to feature)
+        MultivariateIntegrand(features.with(feature), function)
 }
 
 @Suppress("FunctionName")
 public fun <T : Any> MultivariateIntegrand(
     vararg features: IntegrandFeature,
     function: (Point<T>) -> T,
-): MultivariateIntegrand<T> = MultivariateIntegrand(features.associateBy { it::class }, function)
+): MultivariateIntegrand<T> = MultivariateIntegrand(FeatureSet.of(*features), function)
 
 public val <T : Any> MultivariateIntegrand<T>.value: T? get() = getFeature<IntegrandValue<T>>()?.value
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
index baa9d4af8..77f01101a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
@@ -43,7 +43,7 @@ public class SimpsonIntegrator<T : Any>(
         return res
     }
 
-    override fun integrate(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> {
+    override fun process(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> {
         val ranges = integrand.getFeature<UnivariateIntegrandRanges>()
         return if (ranges != null) {
             val res = algebra.sum(ranges.ranges.map { integrateRange(integrand, it.first, it.second) })
@@ -89,7 +89,7 @@ public object DoubleSimpsonIntegrator : UnivariateIntegrator<Double> {
         return res
     }
 
-    override fun integrate(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
+    override fun process(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
         val ranges = integrand.getFeature<UnivariateIntegrandRanges>()
         return if (ranges != null) {
             val res = ranges.ranges.sumOf { integrateRange(integrand, it.first, it.second) }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index 23d7bdd8d..54fa29e83 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -53,7 +53,7 @@ public class SplineIntegrator<T : Comparable<T>>(
     public val algebra: Field<T>,
     public val bufferFactory: MutableBufferFactory<T>,
 ) : UnivariateIntegrator<T> {
-    override fun integrate(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> = algebra {
+    override fun process(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> = algebra {
         val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
 
         val interpolator: PolynomialInterpolator<T> = SplineInterpolator(algebra, bufferFactory)
@@ -80,7 +80,7 @@ public class SplineIntegrator<T : Comparable<T>>(
  */
 @UnstableKMathAPI
 public object DoubleSplineIntegrator : UnivariateIntegrator<Double> {
-    override fun integrate(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
+    override fun process(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
         val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
 
         val interpolator: PolynomialInterpolator<Double> = SplineInterpolator(DoubleField, ::DoubleBuffer)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index e265f54e8..82fed30cd 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -5,33 +5,24 @@
 
 package space.kscience.kmath.integration
 
+import space.kscience.kmath.misc.FeatureSet
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
-import kotlin.reflect.KClass
 
 public class UnivariateIntegrand<T> internal constructor(
-    private val featureMap: Map<KClass<*>, IntegrandFeature>,
+    override val features: FeatureSet<IntegrandFeature>,
     public val function: (Double) -> T,
 ) : Integrand {
-
-    override val features: Set<IntegrandFeature> get() = featureMap.values.toSet()
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : IntegrandFeature> getFeature(type: KClass<T>): T? = featureMap[type] as? T
-
-    public operator fun <F : IntegrandFeature> plus(pair: Pair<KClass<out F>, F>): UnivariateIntegrand<T> =
-        UnivariateIntegrand(featureMap + pair, function)
-
     public operator fun <F : IntegrandFeature> plus(feature: F): UnivariateIntegrand<T> =
-        plus(feature::class to feature)
+        UnivariateIntegrand(features.with(feature), function)
 }
 
 @Suppress("FunctionName")
 public fun <T : Any> UnivariateIntegrand(
     function: (Double) -> T,
     vararg features: IntegrandFeature,
-): UnivariateIntegrand<T> = UnivariateIntegrand(features.associateBy { it::class }, function)
+): UnivariateIntegrand<T> = UnivariateIntegrand(FeatureSet.of(*features), function)
 
 public typealias UnivariateIntegrator<T> = Integrator<UnivariateIntegrand<T>>
 
@@ -79,7 +70,7 @@ public val <T : Any> UnivariateIntegrand<T>.value: T get() = valueOrNull ?: erro
 public fun <T : Any> UnivariateIntegrator<T>.integrate(
     vararg features: IntegrandFeature,
     function: (Double) -> T,
-): UnivariateIntegrand<T> = integrate(UnivariateIntegrand(function, *features))
+): UnivariateIntegrand<T> = process(UnivariateIntegrand(function, *features))
 
 /**
  * A shortcut method to integrate a [function] in [range] with additional [features].
@@ -90,7 +81,7 @@ public fun <T : Any> UnivariateIntegrator<T>.integrate(
     range: ClosedRange<Double>,
     vararg features: IntegrandFeature,
     function: (Double) -> T,
-): UnivariateIntegrand<T> = integrate(UnivariateIntegrand(function, IntegrationRange(range), *features))
+): UnivariateIntegrand<T> = process(UnivariateIntegrand(function, IntegrationRange(range), *features))
 
 /**
  * A shortcut method to integrate a [function] in [range] with additional [features].
@@ -107,5 +98,5 @@ public fun <T : Any> UnivariateIntegrator<T>.integrate(
         featureBuilder()
         add(IntegrationRange(range))
     }
-    return integrate(UnivariateIntegrand(function, *features.toTypedArray()))
+    return process(UnivariateIntegrand(function, *features.toTypedArray()))
 }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
index db613e236..e5edb17e0 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
@@ -10,12 +10,13 @@ import space.kscience.kmath.expressions.DifferentiableExpression
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.ExpressionAlgebra
 import space.kscience.kmath.misc.FeatureSet
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.indices
 
-public class FunctionOptimizationResult<T>(point: Map<Symbol, T>, public val value: T) : OptimizationResult<T>(point)
+public class OptimizationValue<T>(public val value: T) : OptimizationFeature{
+    override fun toString(): String = "Value($value)"
+}
 
 public enum class FunctionOptimizationTarget : OptimizationFeature {
     MAXIMIZE,
@@ -25,9 +26,8 @@ public enum class FunctionOptimizationTarget : OptimizationFeature {
 public class FunctionOptimization<T>(
     override val features: FeatureSet<OptimizationFeature>,
     public val expression: DifferentiableExpression<T, Expression<T>>,
-    public val initialGuess: Map<Symbol, T>,
-    public val parameters: Collection<Symbol>,
 ) : OptimizationProblem{
+
     public companion object{
         /**
          * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic differentiation
@@ -65,7 +65,5 @@ public fun <T> FunctionOptimization<T>.withFeatures(
 ): FunctionOptimization<T> = FunctionOptimization(
     features.with(*newFeature),
     expression,
-    initialGuess,
-    parameters
 )
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
index 0d2e3cb83..53b6af144 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
@@ -5,13 +5,15 @@
 
 package space.kscience.kmath.optimization
 
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.FeatureSet
 import space.kscience.kmath.misc.Featured
 import space.kscience.kmath.misc.Loggable
-import space.kscience.kmath.misc.Symbol
 import kotlin.reflect.KClass
 
-public interface OptimizationFeature
+public interface OptimizationFeature {
+    override fun toString(): String
+}
 
 public interface OptimizationProblem : Featured<OptimizationFeature> {
     public val features: FeatureSet<OptimizationFeature>
@@ -20,31 +22,22 @@ public interface OptimizationProblem : Featured<OptimizationFeature> {
 
 public inline fun <reified T : OptimizationFeature> OptimizationProblem.getFeature(): T? = getFeature(T::class)
 
-public open class OptimizationResult<T>(public val point: Map<Symbol, T>) : OptimizationFeature
+public open class OptimizationStartPoint<T>(public val point: Map<Symbol, T>) : OptimizationFeature {
+    override fun toString(): String = "StartPoint($point)"
+}
 
-public class OptimizationLog(private val loggable: Loggable) : Loggable by loggable, OptimizationFeature
+public open class OptimizationResult<T>(public val point: Map<Symbol, T>) : OptimizationFeature {
+    override fun toString(): String = "Result($point)"
+}
+
+public class OptimizationLog(private val loggable: Loggable) : Loggable by loggable, OptimizationFeature {
+    override fun toString(): String = "Log($loggable)"
+}
+
+public class OptimizationParameters(public val symbols: List<Symbol>): OptimizationFeature{
+    override fun toString(): String = "Parameters($symbols)"
+}
 
-//public class OptimizationResult<T>(
-//    public val point: Map<Symbol, T>,
-//    public val value: T,
-//    public val features: Set<OptimizationFeature> = emptySet(),
-//) {
-//    override fun toString(): String {
-//        return "OptimizationResult(point=$point, value=$value)"
-//    }
-//}
-//
-//public operator fun <T> OptimizationResult<T>.plus(
-//    feature: OptimizationFeature,
-//): OptimizationResult<T> = OptimizationResult(point, value, features + feature)
-//public fun interface OptimizationProblemFactory<T : Any, out P : OptimizationProblem<T>> {
-//    public fun build(symbols: List<Symbol>): P
-//}
-//
-//public operator fun <T : Any, P : OptimizationProblem<T>> OptimizationProblemFactory<T, P>.invoke(
-//    symbols: List<Symbol>,
-//    block: P.() -> Unit,
-//): P = build(symbols).apply(block)
 
 public interface Optimizer<P : OptimizationProblem> {
     public suspend fun process(problem: P): P
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
index 637746a27..050f95a10 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
@@ -10,8 +10,6 @@ import space.kscience.kmath.expressions.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.Field
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.indices
 
 @UnstableKMathAPI
 public interface XYFit<T> : OptimizationProblem {
@@ -59,15 +57,16 @@ public interface XYFit<T> : OptimizationProblem {
 //}
 
 /**
- * Optimize differentiable expression using specific [OptimizationProblemFactory]
+ * Optimize differentiable expression using specific [Optimizer]
  */
 public suspend fun <T : Any, F : FunctionOptimization<T>> DifferentiableExpression<T, Expression<T>>.optimizeWith(
-    factory: OptimizationProblemFactory<T, F>,
-    vararg symbols: Symbol,
-    configuration: F.() -> Unit,
-): OptimizationResult<T> {
-    require(symbols.isNotEmpty()) { "Must provide a list of symbols for optimization" }
-    val problem = factory(symbols.toList(), configuration)
-    problem.function(this)
-    return problem.optimize()
+    optimizer: Optimizer<F>,
+    startingPoint: Map<Symbol,T>,
+    vararg features: OptimizationFeature
+): OptimizationProblem {
+//    require(startingPoint.isNotEmpty()) { "Must provide a list of symbols for optimization" }
+//    val problem = factory(symbols.toList(), configuration)
+//    problem.function(this)
+//    return problem.optimize()
+    val problem = FunctionOptimization<T>()
 }
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Range.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Range.kt
deleted file mode 100644
index ebeedf7e8..000000000
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Range.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 
- * Copyright 2015 Alexander Nozik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package ru.inr.mass.minuit
-
-/**
- * A class representing a pair of double (x,y) or (lower,upper)
- *
- * @version $Id$
- * @author Darksnake
- */
-class Range
-/**
- *
- * Constructor for Range.
- *
- * @param k a double.
- * @param v a double.
- */
-    (k: Double, v: Double) : Pair<Double?, Double?>(k, v)
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt
index d611adf50..2ae33d82f 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt
@@ -7,12 +7,8 @@ package space.kscience.kmath.optimization.qow
 
 import space.kscience.kmath.data.ColumnarData
 import space.kscience.kmath.data.XYErrorColumnarData
-import space.kscience.kmath.expressions.DifferentiableExpression
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.SymbolIndexer
-import space.kscience.kmath.expressions.derivative
+import space.kscience.kmath.expressions.*
 import space.kscience.kmath.linear.*
-import space.kscience.kmath.misc.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Field
-- 
2.34.1


From c240fa4a9efb55116571622fa57a5c3332a1a166 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 25 May 2021 16:42:23 +0300
Subject: [PATCH 273/713] [WIP] optimization refactoring

---
 .../kscience/kmath/data/XYColumnarData.kt     | 21 +++++
 .../kscience/kmath/expressions/Symbol.kt      | 16 +++-
 .../optimization/FunctionOptimization.kt      | 17 +++-
 .../kmath/optimization/OptimizationProblem.kt |  1 +
 .../kscience/kmath/optimization/XYFit.kt      | 72 ---------------
 .../kmath/optimization/XYOptimization.kt      | 92 +++++++++++++++++++
 .../kscience/kmath/optimization/qow/QowFit.kt |  4 +-
 7 files changed, 141 insertions(+), 82 deletions(-)
 delete mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
index 08bfd3ca3..2dc82c02e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
@@ -45,6 +45,27 @@ public fun <T, X : T, Y : T> XYColumnarData(x: Buffer<X>, y: Buffer<Y>): XYColum
     }
 }
 
+/**
+ * Represent a [ColumnarData] as an [XYColumnarData]. The presence or respective columns is checked on creation.
+ */
+@UnstableKMathAPI
+public fun <T> ColumnarData<T>.asXYData(
+    xSymbol: Symbol,
+    ySymbol: Symbol,
+): XYColumnarData<T, T, T> = object : XYColumnarData<T, T, T> {
+    init {
+        requireNotNull(this@asXYData[xSymbol]){"The column with name $xSymbol is not present in $this"}
+        requireNotNull(this@asXYData[ySymbol]){"The column with name $ySymbol is not present in $this"}
+    }
+    override val size: Int get() = this@asXYData.size
+    override val x: Buffer<T> get() = this@asXYData[xSymbol]!!
+    override val y: Buffer<T> get() = this@asXYData[ySymbol]!!
+    override fun get(symbol: Symbol): Buffer<T>? = when (symbol) {
+        Symbol.x -> x
+        Symbol.y -> y
+        else -> this@asXYData.get(symbol)
+    }
+}
 
 /**
  * A zero-copy method to represent a [Structure2D] as a two-column x-y data.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
index 74dc7aedc..4cbdbf55b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
@@ -19,9 +19,12 @@ public interface Symbol : MST {
     public val identity: String
 
     public companion object {
-        public val x: StringSymbol = StringSymbol("x")
-        public val y: StringSymbol = StringSymbol("y")
-        public val z: StringSymbol = StringSymbol("z")
+        public val x: Symbol = Symbol("x")
+        public val xError: Symbol = Symbol("x.error")
+        public val y: Symbol = Symbol("y")
+        public val yError: Symbol = Symbol("y.error")
+        public val z: Symbol = Symbol("z")
+        public val zError: Symbol = Symbol("z.error")
     }
 }
 
@@ -29,10 +32,15 @@ public interface Symbol : MST {
  * A [Symbol] with a [String] identity
  */
 @JvmInline
-public value class StringSymbol(override val identity: String) : Symbol {
+internal value class StringSymbol(override val identity: String) : Symbol {
     override fun toString(): String = identity
 }
 
+/**
+ * Create s Symbols with a string identity
+ */
+public fun Symbol(identity: String): Symbol = StringSymbol(identity)
+
 /**
  * A delegate to create a symbol with a string identity in this scope
  */
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
index e5edb17e0..2c70da308 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
@@ -5,10 +5,7 @@
 
 package space.kscience.kmath.optimization
 
-import space.kscience.kmath.expressions.AutoDiffProcessor
-import space.kscience.kmath.expressions.DifferentiableExpression
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.ExpressionAlgebra
+import space.kscience.kmath.expressions.*
 import space.kscience.kmath.misc.FeatureSet
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.structures.Buffer
@@ -67,3 +64,15 @@ public fun <T> FunctionOptimization<T>.withFeatures(
     expression,
 )
 
+/**
+ * Optimize differentiable expression using specific [optimizer] form given [startingPoint]
+ */
+public suspend fun <T : Any> DifferentiableExpression<T, Expression<T>>.optimizeWith(
+    optimizer: Optimizer<FunctionOptimization<T>>,
+    startingPoint: Map<Symbol, T>,
+    vararg features: OptimizationFeature,
+): FunctionOptimization<T> {
+    val problem = FunctionOptimization<T>(FeatureSet.of(OptimizationStartPoint(startingPoint), *features), this)
+    return optimizer.process(problem)
+}
+
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
index 53b6af144..2594fa182 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
@@ -35,6 +35,7 @@ public class OptimizationLog(private val loggable: Loggable) : Loggable by logga
 }
 
 public class OptimizationParameters(public val symbols: List<Symbol>): OptimizationFeature{
+    public constructor(vararg symbols: Symbol) : this(listOf(*symbols))
     override fun toString(): String = "Parameters($symbols)"
 }
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
deleted file mode 100644
index 050f95a10..000000000
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.optimization
-
-import space.kscience.kmath.data.ColumnarData
-import space.kscience.kmath.expressions.*
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.ExtendedField
-import space.kscience.kmath.operations.Field
-
-@UnstableKMathAPI
-public interface XYFit<T> : OptimizationProblem {
-
-    public val algebra: Field<T>
-
-    /**
-     * Set X-Y data for this fit optionally including x and y errors
-     */
-    public fun data(
-        dataSet: ColumnarData<T>,
-        xSymbol: Symbol,
-        ySymbol: Symbol,
-        xErrSymbol: Symbol? = null,
-        yErrSymbol: Symbol? = null,
-    )
-
-    public fun model(model: (T) -> DifferentiableExpression<T, *>)
-
-    /**
-     * Set the differentiable model for this fit
-     */
-    public fun <I : Any, A> model(
-        autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
-        modelFunction: A.(I) -> I,
-    ): Unit where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> = model { arg ->
-        autoDiff.process { modelFunction(const(arg)) }
-    }
-}
-
-//
-///**
-// * Define a chi-squared-based objective function
-// */
-//public fun <T : Any, I : Any, A> FunctionOptimization<T>.chiSquared(
-//    autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
-//    x: Buffer<T>,
-//    y: Buffer<T>,
-//    yErr: Buffer<T>,
-//    model: A.(I) -> I,
-//) where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> {
-//    val chiSquared = FunctionOptimization.chiSquared(autoDiff, x, y, yErr, model)
-//    function(chiSquared)
-//    maximize = false
-//}
-
-/**
- * Optimize differentiable expression using specific [Optimizer]
- */
-public suspend fun <T : Any, F : FunctionOptimization<T>> DifferentiableExpression<T, Expression<T>>.optimizeWith(
-    optimizer: Optimizer<F>,
-    startingPoint: Map<Symbol,T>,
-    vararg features: OptimizationFeature
-): OptimizationProblem {
-//    require(startingPoint.isNotEmpty()) { "Must provide a list of symbols for optimization" }
-//    val problem = factory(symbols.toList(), configuration)
-//    problem.function(this)
-//    return problem.optimize()
-    val problem = FunctionOptimization<T>()
-}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt
new file mode 100644
index 000000000..dda95fcd7
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+@file:OptIn(UnstableKMathAPI::class)
+
+package space.kscience.kmath.optimization
+
+import space.kscience.kmath.data.XYColumnarData
+import space.kscience.kmath.expressions.DifferentiableExpression
+import space.kscience.kmath.expressions.Expression
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.misc.FeatureSet
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.invoke
+
+public fun interface PointToCurveDistance<T> {
+    public fun distance(problem: XYOptimization<T>, index: Int): DifferentiableExpression<T, Expression<T>>
+
+    public companion object {
+        public fun <T> byY(
+            algebra: Field<T>,
+        ): PointToCurveDistance<T> = PointToCurveDistance { problem, index ->
+            algebra {
+                val x = problem.data.x[index]
+                val y = problem.data.y[index]
+                
+                val model = problem.model(args + (Symbol.x to x))
+                model - y
+            }
+        }
+
+
+//        val default = PointToCurveDistance<Double>{args, data, index ->
+//
+//        }
+    }
+}
+
+
+public class XYOptimization<T>(
+    override val features: FeatureSet<OptimizationFeature>,
+    public val data: XYColumnarData<T, T, T>,
+    public val model: DifferentiableExpression<T, Expression<T>>,
+) : OptimizationProblem
+
+//
+//@UnstableKMathAPI
+//public interface XYFit<T> : OptimizationProblem {
+//
+//    public val algebra: Field<T>
+//
+//    /**
+//     * Set X-Y data for this fit optionally including x and y errors
+//     */
+//    public fun data(
+//        dataSet: ColumnarData<T>,
+//        xSymbol: Symbol,
+//        ySymbol: Symbol,
+//        xErrSymbol: Symbol? = null,
+//        yErrSymbol: Symbol? = null,
+//    )
+//
+//    public fun model(model: (T) -> DifferentiableExpression<T, *>)
+//
+//    /**
+//     * Set the differentiable model for this fit
+//     */
+//    public fun <I : Any, A> model(
+//        autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
+//        modelFunction: A.(I) -> I,
+//    ): Unit where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> = model { arg ->
+//        autoDiff.process { modelFunction(const(arg)) }
+//    }
+//}
+
+//
+///**
+// * Define a chi-squared-based objective function
+// */
+//public fun <T : Any, I : Any, A> FunctionOptimization<T>.chiSquared(
+//    autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
+//    x: Buffer<T>,
+//    y: Buffer<T>,
+//    yErr: Buffer<T>,
+//    model: A.(I) -> I,
+//) where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> {
+//    val chiSquared = FunctionOptimization.chiSquared(autoDiff, x, y, yErr, model)
+//    function(chiSquared)
+//    maximize = false
+//}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt
index 2ae33d82f..c78aef401 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt
@@ -15,7 +15,7 @@ import space.kscience.kmath.operations.Field
 import space.kscience.kmath.optimization.OptimizationFeature
 import space.kscience.kmath.optimization.OptimizationProblemFactory
 import space.kscience.kmath.optimization.OptimizationResult
-import space.kscience.kmath.optimization.XYFit
+import space.kscience.kmath.optimization.XYOptimization
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.DoubleL2Norm
 import kotlin.math.pow
@@ -28,7 +28,7 @@ public class QowFit(
     override val symbols: List<Symbol>,
     private val space: LinearSpace<Double, DoubleField>,
     private val solver: LinearSolver<Double>,
-) : XYFit<Double>, SymbolIndexer {
+) : XYOptimization<Double>, SymbolIndexer {
 
     private var logger: FitLogger? = null
 
-- 
2.34.1


From f2b7a08ad8018d508a1edc3c5af9894fb89bafd5 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 25 May 2021 16:53:53 +0300
Subject: [PATCH 274/713] Remove second generic from DifferentiableExpression

---
 CHANGELOG.md                                  |  1 +
 .../DerivativeStructureExpression.kt          |  4 +--
 .../commons/optimization/CMOptimization.kt    |  9 +----
 .../kmath/commons/optimization/cmFit.kt       |  8 ++---
 .../expressions/DifferentiableExpression.kt   | 34 ++++++++++++++-----
 .../kmath/expressions/SimpleAutoDiff.kt       |  2 +-
 .../kmath/kotlingrad/KotlingradExpression.kt  |  2 +-
 .../optimization/FunctionOptimization.kt      |  6 ++--
 .../kscience/kmath/optimization/XYFit.kt      |  2 +-
 9 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c6b14b95..524d2a1de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 - MSTExpression
 - Expression algebra builders
 - Complex and Quaternion no longer are elements.
+- Second generic from DifferentiableExpression
 
 ### Fixed
 - Ring inherits RingOperations, not GroupOperations
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
index 89e216601..361027968 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
@@ -106,7 +106,7 @@ public class DerivativeStructureField(
 
     public companion object :
         AutoDiffProcessor<Double, DerivativeStructure, DerivativeStructureField, Expression<Double>> {
-        public override fun process(function: DerivativeStructureField.() -> DerivativeStructure): DifferentiableExpression<Double, Expression<Double>> =
+        public override fun process(function: DerivativeStructureField.() -> DerivativeStructure): DifferentiableExpression<Double> =
             DerivativeStructureExpression(function)
     }
 }
@@ -116,7 +116,7 @@ public class DerivativeStructureField(
  */
 public class DerivativeStructureExpression(
     public val function: DerivativeStructureField.() -> DerivativeStructure,
-) : DifferentiableExpression<Double, Expression<Double>> {
+) : DifferentiableExpression<Double> {
     public override operator fun invoke(arguments: Map<Symbol, Double>): Double =
         DerivativeStructureField(0, arguments).function().value
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
index bca00de46..400ee0310 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
@@ -17,14 +17,7 @@ import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.SimplexOptimizer
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.optimization.*
-import kotlin.collections.HashMap
-import kotlin.collections.List
-import kotlin.collections.Map
 import kotlin.collections.set
-import kotlin.collections.setOf
-import kotlin.collections.toList
-import kotlin.collections.toMap
-import kotlin.collections.toTypedArray
 import kotlin.reflect.KClass
 
 public operator fun PointValuePair.component1(): DoubleArray = point
@@ -71,7 +64,7 @@ public class CMOptimization(
         addOptimizationData(objectiveFunction)
     }
 
-    public override fun diffFunction(expression: DifferentiableExpression<Double, Expression<Double>>) {
+    public override fun diffFunction(expression: DifferentiableExpression<Double>) {
         function(expression)
         val gradientFunction = ObjectiveFunctionGradient {
             val args = it.toMap()
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
index a5a913623..645c41291 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
@@ -25,7 +25,7 @@ public fun FunctionOptimization.Companion.chiSquared(
     y: Buffer<Double>,
     yErr: Buffer<Double>,
     model: DerivativeStructureField.(x: DerivativeStructure) -> DerivativeStructure,
-): DifferentiableExpression<Double, Expression<Double>> = chiSquared(DerivativeStructureField, x, y, yErr, model)
+): DifferentiableExpression<Double> = chiSquared(DerivativeStructureField, x, y, yErr, model)
 
 /**
  * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic differentiation
@@ -35,7 +35,7 @@ public fun FunctionOptimization.Companion.chiSquared(
     y: Iterable<Double>,
     yErr: Iterable<Double>,
     model: DerivativeStructureField.(x: DerivativeStructure) -> DerivativeStructure,
-): DifferentiableExpression<Double, Expression<Double>> = chiSquared(
+): DifferentiableExpression<Double> = chiSquared(
     DerivativeStructureField,
     x.toList().asBuffer(),
     y.toList().asBuffer(),
@@ -54,12 +54,12 @@ public fun Expression<Double>.optimize(
 /**
  * Optimize differentiable expression
  */
-public fun DifferentiableExpression<Double, Expression<Double>>.optimize(
+public fun DifferentiableExpression<Double>.optimize(
     vararg symbols: Symbol,
     configuration: CMOptimization.() -> Unit,
 ): OptimizationResult<Double> = optimizeWith(CMOptimization, symbols = symbols, configuration)
 
-public fun DifferentiableExpression<Double, Expression<Double>>.minimize(
+public fun DifferentiableExpression<Double>.minimize(
     vararg startPoint: Pair<Symbol, Double>,
     configuration: CMOptimization.() -> Unit = {},
 ): OptimizationResult<Double> {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
index 33d72afad..1dcada6d3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
@@ -11,35 +11,51 @@ package space.kscience.kmath.expressions
  * @param T the type this expression takes as argument and returns.
  * @param R the type of expression this expression can be differentiated to.
  */
-public interface DifferentiableExpression<T, out R : Expression<T>> : Expression<T> {
+public interface DifferentiableExpression<T> : Expression<T> {
     /**
      * Differentiates this expression by ordered collection of [symbols].
      *
      * @param symbols the symbols.
      * @return the derivative or `null`.
      */
-    public fun derivativeOrNull(symbols: List<Symbol>): R?
+    public fun derivativeOrNull(symbols: List<Symbol>): Expression<T>?
 }
 
-public fun <T, R : Expression<T>> DifferentiableExpression<T, R>.derivative(symbols: List<Symbol>): R =
+public fun <T> DifferentiableExpression<T>.derivative(symbols: List<Symbol>): Expression<T> =
     derivativeOrNull(symbols) ?: error("Derivative by symbols $symbols not provided")
 
-public fun <T, R : Expression<T>> DifferentiableExpression<T, R>.derivative(vararg symbols: Symbol): R =
+public fun <T> DifferentiableExpression<T>.derivative(vararg symbols: Symbol):  Expression<T> =
     derivative(symbols.toList())
 
-public fun <T, R : Expression<T>> DifferentiableExpression<T, R>.derivative(name: String): R =
+public fun <T> DifferentiableExpression<T>.derivative(name: String):  Expression<T> =
+    derivative(StringSymbol(name))
+
+/**
+ * A special type of [DifferentiableExpression] which returns typed expressions as derivatives
+ */
+public interface SpecialDifferentiableExpression<T, R: Expression<T>>: DifferentiableExpression<T> {
+    override fun derivativeOrNull(symbols: List<Symbol>): R?
+}
+
+public fun <T, R : Expression<T>> SpecialDifferentiableExpression<T, R>.derivative(symbols: List<Symbol>): R =
+    derivativeOrNull(symbols) ?: error("Derivative by symbols $symbols not provided")
+
+public fun <T, R : Expression<T>> SpecialDifferentiableExpression<T, R>.derivative(vararg symbols: Symbol): R =
+    derivative(symbols.toList())
+
+public fun <T, R : Expression<T>> SpecialDifferentiableExpression<T, R>.derivative(name: String): R =
     derivative(StringSymbol(name))
 
 /**
  * A [DifferentiableExpression] that defines only first derivatives
  */
-public abstract class FirstDerivativeExpression<T, R : Expression<T>> : DifferentiableExpression<T, R> {
+public abstract class FirstDerivativeExpression<T> : DifferentiableExpression<T> {
     /**
      * Returns first derivative of this expression by given [symbol].
      */
-    public abstract fun derivativeOrNull(symbol: Symbol): R?
+    public abstract fun derivativeOrNull(symbol: Symbol):  Expression<T>?
 
-    public final override fun derivativeOrNull(symbols: List<Symbol>): R? {
+    public final override fun derivativeOrNull(symbols: List<Symbol>):  Expression<T>? {
         val dSymbol = symbols.firstOrNull() ?: return null
         return derivativeOrNull(dSymbol)
     }
@@ -49,5 +65,5 @@ public abstract class FirstDerivativeExpression<T, R : Expression<T>> : Differen
  * A factory that converts an expression in autodiff variables to a [DifferentiableExpression]
  */
 public fun interface AutoDiffProcessor<T : Any, I : Any, A : ExpressionAlgebra<T, I>, out R : Expression<T>> {
-    public fun process(function: A.() -> I): DifferentiableExpression<T, R>
+    public fun process(function: A.() -> I): DifferentiableExpression<T>
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
index 254d60b3d..478b85620 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
@@ -232,7 +232,7 @@ public fun <T : Any, F : Field<T>> F.simpleAutoDiff(
 public class SimpleAutoDiffExpression<T : Any, F : Field<T>>(
     public val field: F,
     public val function: SimpleAutoDiffField<T, F>.() -> AutoDiffValue<T>,
-) : FirstDerivativeExpression<T, Expression<T>>() {
+) : FirstDerivativeExpression<T>() {
     public override operator fun invoke(arguments: Map<Symbol, T>): T {
         //val bindings = arguments.entries.map { it.key.bind(it.value) }
         return SimpleAutoDiffField(field, arguments).function().value
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
index 72ecee4f1..4294462c0 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
@@ -24,7 +24,7 @@ import space.kscience.kmath.operations.NumericAlgebra
 public class KotlingradExpression<T : Number, A : NumericAlgebra<T>>(
     public val algebra: A,
     public val mst: MST,
-) : DifferentiableExpression<T, KotlingradExpression<T, A>> {
+) : SpecialDifferentiableExpression<T, KotlingradExpression<T, A>> {
     public override fun invoke(arguments: Map<Symbol, T>): T = mst.interpret(algebra, arguments)
 
     public override fun derivativeOrNull(symbols: List<Symbol>): KotlingradExpression<T, A> =
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
index 4cf5aea84..f54ba5723 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
@@ -27,7 +27,7 @@ public interface FunctionOptimization<T : Any> : Optimization<T> {
     /**
      * Set a differentiable expression as objective function as function and gradient provider
      */
-    public fun diffFunction(expression: DifferentiableExpression<T, Expression<T>>)
+    public fun diffFunction(expression: DifferentiableExpression<T>)
 
     public companion object {
         /**
@@ -39,7 +39,7 @@ public interface FunctionOptimization<T : Any> : Optimization<T> {
             y: Buffer<T>,
             yErr: Buffer<T>,
             model: A.(I) -> I,
-        ): DifferentiableExpression<T, Expression<T>> where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> {
+        ): DifferentiableExpression<T> where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> {
             require(x.size == y.size) { "X and y buffers should be of the same size" }
             require(y.size == yErr.size) { "Y and yErr buffer should of the same size" }
 
@@ -78,7 +78,7 @@ public fun <T: Any, I : Any, A> FunctionOptimization<T>.chiSquared(
 /**
  * Optimize differentiable expression using specific [OptimizationProblemFactory]
  */
-public fun <T : Any, F : FunctionOptimization<T>> DifferentiableExpression<T, Expression<T>>.optimizeWith(
+public fun <T : Any, F : FunctionOptimization<T>> DifferentiableExpression<T>.optimizeWith(
     factory: OptimizationProblemFactory<T, F>,
     vararg symbols: Symbol,
     configuration: F.() -> Unit,
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
index 633e9ae0e..70d7fdf79 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
@@ -27,7 +27,7 @@ public interface XYFit<T : Any> : Optimization<T> {
         yErrSymbol: Symbol? = null,
     )
 
-    public fun model(model: (T) -> DifferentiableExpression<T, *>)
+    public fun model(model: (T) -> DifferentiableExpression<T>)
 
     /**
      * Set the differentiable model for this fit
-- 
2.34.1


From c8621ee5b759cc364f94e1df3fbdf3262e6a7878 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 25 May 2021 21:11:57 +0300
Subject: [PATCH 275/713] [WIP] optimization refactoring

---
 .../commons/optimization/CMOptimization.kt    |  2 +-
 .../optimization/FunctionOptimization.kt      |  4 +-
 .../kmath/optimization/OptimizationProblem.kt |  4 --
 .../kscience/kmath/optimization/Optimizer.kt  | 10 +++
 .../kmath/optimization/XYOptimization.kt      | 62 +++++++++++++------
 5 files changed, 56 insertions(+), 26 deletions(-)
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt

diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
index 549683d60..2faee1f5d 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
@@ -35,7 +35,7 @@ public class CMOptimizerData(public val data: List<OptimizationData>) : Optimiza
 @OptIn(UnstableKMathAPI::class)
 public class CMOptimization : Optimizer<FunctionOptimization<Double>> {
 
-    override suspend fun process(
+    override suspend fun optimize(
         problem: FunctionOptimization<Double>,
     ): FunctionOptimization<Double> {
         val startPoint = problem.getFeature<OptimizationStartPoint<Double>>()?.point
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
index ee75bfbd6..62288242a 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
@@ -67,12 +67,12 @@ public fun <T> FunctionOptimization<T>.withFeatures(
 /**
  * Optimize differentiable expression using specific [optimizer] form given [startingPoint]
  */
-public suspend fun <T : Any> DifferentiableExpression<T, Expression<T>>.optimizeWith(
+public suspend fun <T : Any> DifferentiableExpression<T>.optimizeWith(
     optimizer: Optimizer<FunctionOptimization<T>>,
     startingPoint: Map<Symbol, T>,
     vararg features: OptimizationFeature,
 ): FunctionOptimization<T> {
     val problem = FunctionOptimization<T>(FeatureSet.of(OptimizationStartPoint(startingPoint), *features), this)
-    return optimizer.process(problem)
+    return optimizer.optimize(problem)
 }
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
index 2594fa182..739ce8ca5 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
@@ -40,7 +40,3 @@ public class OptimizationParameters(public val symbols: List<Symbol>): Optimizat
 }
 
 
-public interface Optimizer<P : OptimizationProblem> {
-    public suspend fun process(problem: P): P
-}
-
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt
new file mode 100644
index 000000000..ad1a16007
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.optimization
+
+public interface Optimizer<P : OptimizationProblem> {
+    public suspend fun optimize(problem: P): P
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt
index dda95fcd7..7dc17f6d9 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt
@@ -12,39 +12,63 @@ import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.FeatureSet
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.invoke
+import kotlin.math.pow
 
-public fun interface PointToCurveDistance<T> {
-    public fun distance(problem: XYOptimization<T>, index: Int): DifferentiableExpression<T, Expression<T>>
+public interface PointToCurveDistance : OptimizationFeature {
+    public fun distance(problem: XYOptimization, index: Int): DifferentiableExpression<Double>
 
     public companion object {
-        public fun <T> byY(
-            algebra: Field<T>,
-        ): PointToCurveDistance<T> = PointToCurveDistance { problem, index ->
-            algebra {
+        public val byY: PointToCurveDistance = object : PointToCurveDistance {
+            override fun distance(problem: XYOptimization, index: Int): DifferentiableExpression<Double> {
+
                 val x = problem.data.x[index]
                 val y = problem.data.y[index]
-                
-                val model = problem.model(args + (Symbol.x to x))
-                model - y
+                return object : DifferentiableExpression<Double> {
+                    override fun derivativeOrNull(symbols: List<Symbol>): Expression<Double>? =
+                        problem.model.derivativeOrNull(symbols)
+
+                    override fun invoke(arguments: Map<Symbol, Double>): Double =
+                        problem.model(arguments + (Symbol.x to x)) - y
+                }
             }
+
+            override fun toString(): String = "PointToCurveDistanceByY"
+
         }
 
-
-//        val default = PointToCurveDistance<Double>{args, data, index ->
-//
-//        }
     }
 }
 
-
-public class XYOptimization<T>(
+public class XYOptimization(
     override val features: FeatureSet<OptimizationFeature>,
-    public val data: XYColumnarData<T, T, T>,
-    public val model: DifferentiableExpression<T, Expression<T>>,
+    public val data: XYColumnarData<Double, Double, Double>,
+    public val model: DifferentiableExpression<Double>,
 ) : OptimizationProblem
 
+
+public suspend fun Optimizer<FunctionOptimization<Double>>.maximumLogLikelihood(problem: XYOptimization): XYOptimization {
+    val distanceBuilder = problem.getFeature() ?: PointToCurveDistance.byY
+    val likelihood: DifferentiableExpression<Double> = object : DifferentiableExpression<Double> {
+        override fun derivativeOrNull(symbols: List<Symbol>): Expression<Double>? {
+            TODO("Not yet implemented")
+        }
+
+        override fun invoke(arguments: Map<Symbol, Double>): Double {
+            var res = 0.0
+            for (index in 0 until problem.data.size) {
+                val d = distanceBuilder.distance(problem, index).invoke(arguments)
+                val sigma: Double = TODO()
+                res -= (d / sigma).pow(2)
+            }
+            return res
+        }
+
+    }
+    val functionOptimization = FunctionOptimization(problem.features, likelihood)
+    val result = optimize(functionOptimization)
+    return XYOptimization(result.features, problem.data, problem.model)
+}
+
 //
 //@UnstableKMathAPI
 //public interface XYFit<T> : OptimizationProblem {
-- 
2.34.1


From 65e05605533a033fff621b83a447c7a78a07cd58 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sat, 29 May 2021 15:50:16 +0700
Subject: [PATCH 276/713] Fix Symja build issues

---
 build.gradle.kts                                  |  5 ++++-
 kmath-symja/build.gradle.kts                      |  9 ++++++++-
 .../space/kscience/kmath/symja/SymjaExpression.kt | 15 +++++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 4de6d8bad..1826a2e7e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,9 @@ allprojects {
         maven("http://logicrunch.research.it.uu.se/maven") {
             isAllowInsecureProtocol = true
         }
-        maven("https://oss.sonatype.org/content/repositories/snapshots")
+        maven("https://oss.sonatype.org/content/repositories/snapshots") {
+
+        }
         mavenCentral()
     }
 
@@ -31,6 +33,7 @@ subprojects {
                 externalDocumentationLink("http://ejml.org/javadoc/")
                 externalDocumentationLink("https://commons.apache.org/proper/commons-math/javadocs/api-3.6.1/")
                 externalDocumentationLink("https://deeplearning4j.org/api/latest/")
+                externalDocumentationLink("https://axelclk.bitbucket.io/symja/javadoc/")
                 externalDocumentationLink("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
             }
         }
diff --git a/kmath-symja/build.gradle.kts b/kmath-symja/build.gradle.kts
index c06020bb6..c67b42e3f 100644
--- a/kmath-symja/build.gradle.kts
+++ b/kmath-symja/build.gradle.kts
@@ -11,7 +11,14 @@ plugins {
 description = "Symja integration module"
 
 dependencies {
-    api("org.matheclipse:matheclipse-core:2.0.0-SNAPSHOT")
+    api("org.matheclipse:matheclipse-core:2.0.0-SNAPSHOT") {
+        // Incorrect transitive dependency org.apfloat:apfloat:1.10.0-SNAPSHOT
+        exclude("org.apfloat", "apfloat")
+    }
+
+    // Replace for org.apfloat:apfloat:1.10.0-SNAPSHOT
+    api("org.apfloat:apfloat:1.10.0")
+
     api(project(":kmath-core"))
     testImplementation("org.slf4j:slf4j-simple:1.7.30")
 }
diff --git a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
index 301678916..a6773c709 100644
--- a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
+++ b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
@@ -7,17 +7,28 @@ package space.kscience.kmath.symja
 
 import org.matheclipse.core.eval.ExprEvaluator
 import org.matheclipse.core.expression.F
-import space.kscience.kmath.expressions.DifferentiableExpression
+import space.kscience.kmath.expressions.SpecialDifferentiableExpression
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.interpret
 import space.kscience.kmath.operations.NumericAlgebra
 
+/**
+ * Represents [MST] based [DifferentiableExpression] relying on [Symja](https://github.com/axkr/symja_android_library).
+ *
+ * The principle of this API is converting the [mst] to an [org.matheclipse.core.interfaces.IExpr], differentiating it
+ * with Symja's [F.D], then converting [org.matheclipse.core.interfaces.IExpr] back to [MST].
+ *
+ * @param T The type of number.
+ * @param A The [NumericAlgebra] of [T].
+ * @property algebra The [A] instance.
+ * @property mst The [MST] node.
+ */
 public class SymjaExpression<T : Number, A : NumericAlgebra<T>>(
     public val algebra: A,
     public val mst: MST,
     public val evaluator: ExprEvaluator = DEFAULT_EVALUATOR,
-) : DifferentiableExpression<T, SymjaExpression<T, A>> {
+) : SpecialDifferentiableExpression<T, SymjaExpression<T, A>> {
     public override fun invoke(arguments: Map<Symbol, T>): T = mst.interpret(algebra, arguments)
 
     public override fun derivativeOrNull(symbols: List<Symbol>): SymjaExpression<T, A> = SymjaExpression(
-- 
2.34.1


From 7f32348e7a1c1701288c35db3c0dd020baa6726b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 2 Jun 2021 21:10:05 +0300
Subject: [PATCH 277/713] Slight adjustment to tensor internals

---
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 60 ++++++++-----
 .../kmath/tensors/core/internal/linUtils.kt   | 87 ++++++++++---------
 2 files changed, 84 insertions(+), 63 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 1fd46bd57..f854beb29 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -5,8 +5,10 @@
 
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.structures.indices
 import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
 import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
 import space.kscience.kmath.tensors.api.Tensor
@@ -813,28 +815,32 @@ public open class DoubleTensorAlgebra :
         val sTensor = zeros(commonShape + intArrayOf(min(n, m)))
         val vTensor = zeros(commonShape + intArrayOf(min(n, m), m))
 
-        tensor.matrixSequence()
-            .zip(
-                uTensor.matrixSequence()
-                    .zip(
-                        sTensor.vectorSequence()
-                            .zip(vTensor.matrixSequence())
-                    )
-            ).forEach { (matrix, USV) ->
-                val matrixSize = matrix.shape.reduce { acc, i -> acc * i }
-                val curMatrix = DoubleTensor(
-                    matrix.shape,
-                    matrix.mutableBuffer.array().slice(matrix.bufferStart until matrix.bufferStart + matrixSize)
-                        .toDoubleArray()
-                )
-                svdHelper(curMatrix, USV, m, n, epsilon)
-            }
+        val matrices = tensor.matrices
+        val uTensors = uTensor.matrices
+        val sTensorVectors = sTensor.vectors
+        val vTensors = vTensor.matrices
+
+        for (index in matrices.indices) {
+            val matrix = matrices[index]
+            val usv = Triple(
+                uTensors[index],
+                sTensorVectors[index],
+                vTensors[index]
+            )
+            val matrixSize = matrix.shape.reduce { acc, i -> acc * i }
+            val curMatrix = DoubleTensor(
+                matrix.shape,
+                matrix.mutableBuffer.array()
+                    .slice(matrix.bufferStart until matrix.bufferStart + matrixSize)
+                    .toDoubleArray()
+            )
+            svdHelper(curMatrix, usv, m, n, epsilon)
+        }
 
         return Triple(uTensor.transpose(), sTensor, vTensor.transpose())
     }
 
-    override fun Tensor<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> =
-        symEig(epsilon = 1e-15)
+    override fun Tensor<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> = symEig(epsilon = 1e-15)
 
     /**
      * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
@@ -846,12 +852,26 @@ public open class DoubleTensorAlgebra :
      */
     public fun Tensor<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
         checkSymmetric(tensor, epsilon)
+
+        fun MutableStructure2D<Double>.cleanSym(n: Int) {
+            for (i in 0 until n) {
+                for (j in 0 until n) {
+                    if (i == j) {
+                        this[i, j] = sign(this[i, j])
+                    } else {
+                        this[i, j] = 0.0
+                    }
+                }
+            }
+        }
+
         val (u, s, v) = tensor.svd(epsilon)
         val shp = s.shape + intArrayOf(1)
         val utv = u.transpose() dot v
         val n = s.shape.last()
-        for (matrix in utv.matrixSequence())
-            cleanSymHelper(matrix.as2D(), n)
+        for (matrix in utv.matrixSequence()) {
+            matrix.as2D().cleanSym(n)
+        }
 
         val eig = (utv dot s.view(shp)).view(s.shape)
         return eig to v
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index 7d3617547..0434bf96f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -10,41 +10,54 @@ import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.*
+import space.kscience.kmath.structures.VirtualBuffer
+import space.kscience.kmath.structures.asSequence
+import space.kscience.kmath.tensors.core.BufferedTensor
+import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
-import space.kscience.kmath.tensors.core.DoubleTensorAlgebra.Companion.valueOrNull
+import space.kscience.kmath.tensors.core.IntTensor
 import kotlin.math.abs
 import kotlin.math.min
-import kotlin.math.sign
 import kotlin.math.sqrt
 
+internal val <T> BufferedTensor<T>.vectors: VirtualBuffer<BufferedTensor<T>>
+    get() {
+        val n = shape.size
+        val vectorOffset = shape[n - 1]
+        val vectorShape = intArrayOf(shape.last())
 
-internal fun <T> BufferedTensor<T>.vectorSequence(): Sequence<BufferedTensor<T>> = sequence {
-    val n = shape.size
-    val vectorOffset = shape[n - 1]
-    val vectorShape = intArrayOf(shape.last())
-    for (offset in 0 until numElements step vectorOffset) {
-        val vector = BufferedTensor(vectorShape, mutableBuffer, bufferStart + offset)
-        yield(vector)
+        return VirtualBuffer(numElements / vectorOffset) { index ->
+            val offset = index * vectorOffset
+            BufferedTensor(vectorShape, mutableBuffer, bufferStart + offset)
+        }
     }
-}
 
-internal fun <T> BufferedTensor<T>.matrixSequence(): Sequence<BufferedTensor<T>> = sequence {
-    val n = shape.size
-    check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
-    val matrixOffset = shape[n - 1] * shape[n - 2]
-    val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
-    for (offset in 0 until numElements step matrixOffset) {
-        val matrix = BufferedTensor(matrixShape, mutableBuffer, bufferStart + offset)
-        yield(matrix)
+
+internal fun <T> BufferedTensor<T>.vectorSequence(): Sequence<BufferedTensor<T>> = vectors.asSequence()
+
+/**
+ * A random access alternative to [matrixSequence]
+ */
+internal val <T> BufferedTensor<T>.matrices: VirtualBuffer<BufferedTensor<T>>
+    get() {
+        val n = shape.size
+        check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
+        val matrixOffset = shape[n - 1] * shape[n - 2]
+        val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
+
+        return VirtualBuffer(numElements / matrixOffset) { index ->
+            val offset = index * matrixOffset
+            BufferedTensor(matrixShape, mutableBuffer, bufferStart + offset)
+        }
     }
-}
+
+internal fun <T> BufferedTensor<T>.matrixSequence(): Sequence<BufferedTensor<T>> = matrices.asSequence()
 
 internal fun dotHelper(
     a: MutableStructure2D<Double>,
     b: MutableStructure2D<Double>,
     res: MutableStructure2D<Double>,
-    l: Int, m: Int, n: Int
+    l: Int, m: Int, n: Int,
 ) {
     for (i in 0 until l) {
         for (j in 0 until n) {
@@ -60,7 +73,7 @@ internal fun dotHelper(
 internal fun luHelper(
     lu: MutableStructure2D<Double>,
     pivots: MutableStructure1D<Int>,
-    epsilon: Double
+    epsilon: Double,
 ): Boolean {
 
     val m = lu.rowNum
@@ -122,7 +135,7 @@ internal fun <T> BufferedTensor<T>.setUpPivots(): IntTensor {
 
 internal fun DoubleTensorAlgebra.computeLU(
     tensor: DoubleTensor,
-    epsilon: Double
+    epsilon: Double,
 ): Pair<DoubleTensor, IntTensor>? {
 
     checkSquareMatrix(tensor.shape)
@@ -139,7 +152,7 @@ internal fun DoubleTensorAlgebra.computeLU(
 internal fun pivInit(
     p: MutableStructure2D<Double>,
     pivot: MutableStructure1D<Int>,
-    n: Int
+    n: Int,
 ) {
     for (i in 0 until n) {
         p[i, pivot[i]] = 1.0
@@ -150,7 +163,7 @@ internal fun luPivotHelper(
     l: MutableStructure2D<Double>,
     u: MutableStructure2D<Double>,
     lu: MutableStructure2D<Double>,
-    n: Int
+    n: Int,
 ) {
     for (i in 0 until n) {
         for (j in 0 until n) {
@@ -170,7 +183,7 @@ internal fun luPivotHelper(
 internal fun choleskyHelper(
     a: MutableStructure2D<Double>,
     l: MutableStructure2D<Double>,
-    n: Int
+    n: Int,
 ) {
     for (i in 0 until n) {
         for (j in 0 until i) {
@@ -200,7 +213,7 @@ internal fun luMatrixDet(lu: MutableStructure2D<Double>, pivots: MutableStructur
 internal fun luMatrixInv(
     lu: MutableStructure2D<Double>,
     pivots: MutableStructure1D<Int>,
-    invMatrix: MutableStructure2D<Double>
+    invMatrix: MutableStructure2D<Double>,
 ) {
     val m = lu.shape[0]
 
@@ -227,7 +240,7 @@ internal fun luMatrixInv(
 internal fun DoubleTensorAlgebra.qrHelper(
     matrix: DoubleTensor,
     q: DoubleTensor,
-    r: MutableStructure2D<Double>
+    r: MutableStructure2D<Double>,
 ) {
     checkSquareMatrix(matrix.shape)
     val n = matrix.shape[0]
@@ -280,12 +293,11 @@ internal fun DoubleTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double = 1e-10)
 
 internal fun DoubleTensorAlgebra.svdHelper(
     matrix: DoubleTensor,
-    USV: Pair<BufferedTensor<Double>, Pair<BufferedTensor<Double>, BufferedTensor<Double>>>,
-    m: Int, n: Int, epsilon: Double
+    USV: Triple<BufferedTensor<Double>, BufferedTensor<Double>, BufferedTensor<Double>>,
+    m: Int, n: Int, epsilon: Double,
 ) {
     val res = ArrayList<Triple<Double, DoubleTensor, DoubleTensor>>(0)
-    val (matrixU, SV) = USV
-    val (matrixS, matrixV) = SV
+    val (matrixU, matrixS, matrixV) = USV
 
     for (k in 0 until min(n, m)) {
         var a = matrix.copy()
@@ -329,14 +341,3 @@ internal fun DoubleTensorAlgebra.svdHelper(
         matrixV.mutableBuffer.array()[matrixV.bufferStart + i] = vBuffer[i]
     }
 }
-
-internal fun cleanSymHelper(matrix: MutableStructure2D<Double>, n: Int) {
-    for (i in 0 until n)
-        for (j in 0 until n) {
-            if (i == j) {
-                matrix[i, j] = sign(matrix[i, j])
-            } else {
-                matrix[i, j] = 0.0
-            }
-        }
-}
-- 
2.34.1


From 95c0b2d3f097dfaec47ab449004befce7e349472 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 8 Jun 2021 14:27:45 +0300
Subject: [PATCH 278/713] [WIP] optimization with QOW

---
 .gitignore                                    |   2 +
 CHANGELOG.md                                  |   3 +
 .../kscience/kmath/benchmarks/DotBenchmark.kt |   6 +-
 .../benchmarks/MatrixInverseBenchmark.kt      |   4 +-
 .../kmath/ejml/codegen/ejmlCodegen.kt         |   2 +-
 .../kscience/kmath/ast/kotlingradSupport.kt   |   4 +-
 .../kotlin/space/kscience/kmath/ast/parser.kt |   4 +-
 .../kmath/asm/internal/mapIntrinsics.kt       |   3 +-
 .../DerivativeStructureExpression.kt          |  10 +-
 .../integration/CMGaussRuleIntegrator.kt      |   6 +-
 .../kmath/commons/integration/CMIntegrator.kt |   2 +-
 .../kscience/kmath/commons/linear/CMMatrix.kt |  14 +-
 .../kscience/kmath/commons/linear/CMSolver.kt |  10 +
 .../{CMOptimization.kt => CMOptimizer.kt}     |  66 +-
 .../kmath/commons/optimization/cmFit.kt       |  75 --
 .../commons/optimization/OptimizeTest.kt      |  36 +-
 .../space/kscience/kmath/data/ColumnarData.kt |   3 +
 .../expressions/DifferentiableExpression.kt   |   9 +-
 .../kscience/kmath/linear/LinearSolver.kt     |  19 -
 .../kscience/kmath/linear/LinearSpace.kt      |  30 +-
 .../kscience/kmath/linear/LupDecomposition.kt |  65 +-
 .../kscience/kmath/linear/MatrixBuilder.kt    |  31 +-
 .../kscience/kmath/linear/MatrixWrapper.kt    |  27 +-
 .../kscience/kmath/linear/VirtualMatrix.kt    |   3 +
 .../space/kscience/kmath/linear/symmetric.kt  |  34 -
 .../space/kscience/kmath/misc/Featured.kt     |  27 +-
 .../space/kscience/kmath/misc/annotations.kt  |   4 +-
 .../space/kscience/kmath/nd/StructureND.kt    |   8 +-
 .../kmath/structures/BufferAccessor2D.kt      |  18 +-
 .../kmath/linear/DoubleLUSolverTest.kt        |  12 +-
 .../space/kscience/kmath/linear/MatrixTest.kt |   8 +-
 .../kmath/structures/NumberNDFieldTest.kt     |   2 +-
 .../kscience/kmath/dimensions/Wrappers.kt     |   2 +-
 .../space/kscience/kmath/ejml/_generated.kt   | 995 ------------------
 .../kscience/kmath/ejml/EjmlMatrixTest.kt     |   6 +-
 .../space/kscience/kmath/real/RealMatrix.kt   |  36 +-
 .../kotlin/space/kscience/kmath/real/dot.kt   |   2 +-
 .../kaceince/kmath/real/DoubleMatrixTest.kt   |   4 +-
 .../kaceince/kmath/real/DoubleVectorTest.kt   |   2 +-
 .../kscience/kmath/integration/Integrand.kt   |   5 +-
 .../kmath/kotlingrad/KotlingradExpression.kt  |  31 +-
 .../optimization/FunctionOptimization.kt      |  10 +-
 .../kmath/optimization/OptimizationBuilder.kt |  93 ++
 .../kmath/optimization/OptimizationProblem.kt |  40 +-
 .../kscience/kmath/optimization/Optimizer.kt  |   2 +-
 .../kmath/optimization/QowOptimizer.kt        | 247 +++++
 .../kmath/optimization/XYOptimization.kt      | 115 +-
 .../kmath/optimization/qow => tmp}/QowFit.kt  |   0
 .../minuit/AnalyticalGradientCalculator.kt    |   0
 .../minuit/CombinedMinimizer.kt               |   0
 .../minuit/CombinedMinimumBuilder.kt          |   1 +
 .../minuit/ContoursError.kt                   |   0
 .../minuit/DavidonErrorUpdator.kt             |   0
 .../minuit/FunctionGradient.kt                |   0
 .../minuit/FunctionMinimum.kt                 |   1 +
 .../minuit/GradientCalculator.kt              |   0
 .../minuit/HessianGradientCalculator.kt       |   0
 .../minuit/InitialGradientCalculator.kt       |   0
 .../minuit/MINOSResult.kt                     |   0
 .../minuit/MINUITFitter.kt                    |   0
 .../minuit/MINUITPlugin.kt                    |   0
 .../minuit/MINUITUtils.kt                     |   0
 .../minuit/MinimumBuilder.kt                  |   2 +
 .../minuit/MinimumError.kt                    |   0
 .../minuit/MinimumErrorUpdator.kt             |   0
 .../minuit/MinimumParameters.kt               |   0
 .../minuit/MinimumSeed.kt                     |   4 +-
 .../minuit/MinimumSeedGenerator.kt            |   2 +
 .../minuit/MinimumState.kt                    |   0
 .../optimization => tmp}/minuit/MinosError.kt |   0
 .../minuit/MinuitParameter.kt                 |   0
 .../minuit/MnAlgebraicSymMatrix.kt            |   0
 .../minuit/MnApplication.kt                   |   0
 .../optimization => tmp}/minuit/MnContours.kt |   0
 .../minuit/MnCovarianceSqueeze.kt             |   0
 .../optimization => tmp}/minuit/MnCross.kt    |   0
 .../optimization => tmp}/minuit/MnEigen.kt    |   0
 .../optimization => tmp}/minuit/MnFcn.kt      |   0
 .../minuit/MnFunctionCross.kt                 |   0
 .../minuit/MnGlobalCorrelationCoeff.kt        |   0
 .../optimization => tmp}/minuit/MnHesse.kt    |   0
 .../minuit/MnLineSearch.kt                    |   0
 .../minuit/MnMachinePrecision.kt              |   0
 .../optimization => tmp}/minuit/MnMigrad.kt   |   0
 .../optimization => tmp}/minuit/MnMinimize.kt |   0
 .../optimization => tmp}/minuit/MnMinos.kt    |   0
 .../optimization => tmp}/minuit/MnParabola.kt |   0
 .../minuit/MnParabolaFactory.kt               |   0
 .../minuit/MnParabolaPoint.kt                 |   0
 .../minuit/MnParameterScan.kt                 |   0
 .../optimization => tmp}/minuit/MnPlot.kt     |   0
 .../optimization => tmp}/minuit/MnPosDef.kt   |   0
 .../optimization => tmp}/minuit/MnPrint.kt    |   0
 .../optimization => tmp}/minuit/MnScan.kt     |   0
 .../minuit/MnSeedGenerator.kt                 |   1 +
 .../optimization => tmp}/minuit/MnSimplex.kt  |   0
 .../optimization => tmp}/minuit/MnStrategy.kt |   0
 .../minuit/MnUserCovariance.kt                |   0
 .../optimization => tmp}/minuit/MnUserFcn.kt  |   0
 .../minuit/MnUserParameterState.kt            |   0
 .../minuit/MnUserParameters.kt                |   0
 .../minuit/MnUserTransformation.kt            |   0
 .../optimization => tmp}/minuit/MnUtils.kt    |   0
 .../minuit/ModularFunctionMinimizer.kt        |   1 +
 .../minuit/NegativeG2LineSearch.kt            |   0
 .../minuit/Numerical2PGradientCalculator.kt   |   0
 .../minuit/ScanBuilder.kt                     |   1 +
 .../minuit/ScanMinimizer.kt                   |   0
 .../minuit/SimplexBuilder.kt                  |   1 +
 .../minuit/SimplexMinimizer.kt                |   0
 .../minuit/SimplexParameters.kt               |   0
 .../minuit/SimplexSeedGenerator.kt            |   1 +
 .../minuit/SinParameterTransformation.kt      |   0
 .../minuit/SqrtLowParameterTransformation.kt  |   0
 .../minuit/SqrtUpParameterTransformation.kt   |   0
 .../minuit/VariableMetricBuilder.kt           |   1 +
 .../minuit/VariableMetricEDMEstimator.kt      |   0
 .../minuit/VariableMetricMinimizer.kt         |   0
 .../minuit/package-info.kt                    |   0
 119 files changed, 804 insertions(+), 1349 deletions(-)
 rename kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/{CMOptimization.kt => CMOptimizer.kt} (63%)
 delete mode 100644 kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/symmetric.kt
 delete mode 100644 kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization/qow => tmp}/QowFit.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/AnalyticalGradientCalculator.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/CombinedMinimizer.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/CombinedMinimumBuilder.kt (97%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/ContoursError.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/DavidonErrorUpdator.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/FunctionGradient.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/FunctionMinimum.kt (99%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/GradientCalculator.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/HessianGradientCalculator.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/InitialGradientCalculator.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MINOSResult.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MINUITFitter.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MINUITPlugin.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MINUITUtils.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MinimumBuilder.kt (95%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MinimumError.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MinimumErrorUpdator.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MinimumParameters.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MinimumSeed.kt (95%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MinimumSeedGenerator.kt (95%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MinimumState.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MinosError.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MinuitParameter.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnAlgebraicSymMatrix.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnApplication.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnContours.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnCovarianceSqueeze.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnCross.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnEigen.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnFcn.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnFunctionCross.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnGlobalCorrelationCoeff.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnHesse.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnLineSearch.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnMachinePrecision.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnMigrad.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnMinimize.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnMinos.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnParabola.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnParabolaFactory.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnParabolaPoint.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnParameterScan.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnPlot.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnPosDef.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnPrint.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnScan.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnSeedGenerator.kt (98%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnSimplex.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnStrategy.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnUserCovariance.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnUserFcn.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnUserParameterState.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnUserParameters.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnUserTransformation.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/MnUtils.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/ModularFunctionMinimizer.kt (97%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/NegativeG2LineSearch.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/Numerical2PGradientCalculator.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/ScanBuilder.kt (97%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/ScanMinimizer.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/SimplexBuilder.kt (99%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/SimplexMinimizer.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/SimplexParameters.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/SimplexSeedGenerator.kt (97%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/SinParameterTransformation.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/SqrtLowParameterTransformation.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/SqrtUpParameterTransformation.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/VariableMetricBuilder.kt (98%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/VariableMetricEDMEstimator.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/VariableMetricMinimizer.kt (100%)
 rename kmath-stat/src/commonMain/{kotlin/space/kscience/kmath/optimization => tmp}/minuit/package-info.kt (100%)

diff --git a/.gitignore b/.gitignore
index d6c4af4e3..c5903368f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ out/
 # Generated by javac -h and runtime
 *.class
 *.log
+
+/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 524d2a1de..e35153d81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Jupyter Notebook integration module (kmath-jupyter)
 - `@PerformancePitfall` annotation to mark possibly slow API
 - BigInt operation performance improvement and fixes by @zhelenskiy (#328)
+- Unified architecture for Integration and Optimization using features.
 
 ### Changed
 - Exponential operations merged with hyperbolic functions
@@ -35,6 +36,8 @@
 - Remove Any restriction on polynomials
 - Add `out` variance to type parameters of `StructureND` and its implementations where possible
 - Rename `DifferentiableMstExpression` to `KotlingradExpression`
+- `FeatureSet` now accepts only `Feature`. It is possible to override keys and use interfaces.
+- Use `Symbol` factory function instead of `StringSymbol`
 
 ### Deprecated
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 2c5a03a97..698f1a702 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -23,8 +23,8 @@ internal class DotBenchmark {
         const val dim = 1000
 
         //creating invertible matrix
-        val matrix1 = LinearSpace.real.buildMatrix(dim, dim) { i, j -> if (i <= j) random.nextDouble() else 0.0 }
-        val matrix2 = LinearSpace.real.buildMatrix(dim, dim) { i, j -> if (i <= j) random.nextDouble() else 0.0 }
+        val matrix1 = LinearSpace.double.buildMatrix(dim, dim) { i, j -> if (i <= j) random.nextDouble() else 0.0 }
+        val matrix2 = LinearSpace.double.buildMatrix(dim, dim) { i, j -> if (i <= j) random.nextDouble() else 0.0 }
 
         val cmMatrix1 = CMLinearSpace { matrix1.toCM() }
         val cmMatrix2 = CMLinearSpace { matrix2.toCM() }
@@ -63,7 +63,7 @@ internal class DotBenchmark {
 
     @Benchmark
     fun realDot(blackhole: Blackhole) {
-        LinearSpace.real {
+        LinearSpace.double {
             blackhole.consume(matrix1 dot matrix2)
         }
     }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
index 7bb32af28..ff67ccc84 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
@@ -25,7 +25,7 @@ internal class MatrixInverseBenchmark {
         private val random = Random(1224)
         private const val dim = 100
 
-        private val space = LinearSpace.real
+        private val space = LinearSpace.double
 
         //creating invertible matrix
         private val u = space.buildMatrix(dim, dim) { i, j -> if (i <= j) random.nextDouble() else 0.0 }
@@ -35,7 +35,7 @@ internal class MatrixInverseBenchmark {
 
     @Benchmark
     fun kmathLupInversion(blackhole: Blackhole) {
-        blackhole.consume(LinearSpace.real.inverseWithLup(matrix))
+        blackhole.consume(LinearSpace.double.inverseWithLup(matrix))
     }
 
     @Benchmark
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
index 5da7d0f67..da1f45c1f 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
@@ -203,7 +203,7 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
     public override fun ${type}.times(v: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> = v * this
 
     @UnstableKMathAPI
-    public override fun <F : StructureFeature> getFeature(structure: Matrix<${type}>, type: KClass<out F>): F? {
+    public override fun <F : StructureFeature> computeFeature(structure: Matrix<${type}>, type: KClass<out F>): F? {
         structure.getFeature(type)?.let { return it }
         val origin = structure.toEjml().origin
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
index 420b23f9f..88fd312c7 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
@@ -9,7 +9,7 @@ import space.kscience.kmath.asm.compileToExpression
 import space.kscience.kmath.expressions.derivative
 import space.kscience.kmath.expressions.invoke
 import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.kotlingrad.toDiffExpression
+import space.kscience.kmath.kotlingrad.toKotlingradExpression
 import space.kscience.kmath.operations.DoubleField
 
 /**
@@ -20,7 +20,7 @@ fun main() {
     val x by symbol
 
     val actualDerivative = "x^2-4*x-44".parseMath()
-        .toDiffExpression(DoubleField)
+        .toKotlingradExpression(DoubleField)
         .derivative(x)
 
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
index 5201fec38..bfba08bbd 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
@@ -17,7 +17,7 @@ import com.github.h0tk3y.betterParse.lexer.regexToken
 import com.github.h0tk3y.betterParse.parser.ParseResult
 import com.github.h0tk3y.betterParse.parser.Parser
 import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.expressions.StringSymbol
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.FieldOperations
 import space.kscience.kmath.operations.GroupOperations
 import space.kscience.kmath.operations.PowerOperations
@@ -43,7 +43,7 @@ public object ArithmeticsEvaluator : Grammar<MST>() {
     private val ws: Token by regexToken("\\s+".toRegex(), ignore = true)
 
     private val number: Parser<MST> by num use { MST.Numeric(text.toDouble()) }
-    private val singular: Parser<MST> by id use { StringSymbol(text) }
+    private val singular: Parser<MST> by id use { Symbol(text) }
 
     private val unaryFunction: Parser<MST> by (id and -lpar and parser(ArithmeticsEvaluator::subSumChain) and -rpar)
         .map { (id, term) -> MST.Unary(id.text, term) }
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
index 8f4daecf9..948e7eab9 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
@@ -7,7 +7,6 @@
 
 package space.kscience.kmath.asm.internal
 
-import space.kscience.kmath.expressions.StringSymbol
 import space.kscience.kmath.expressions.Symbol
 
 /**
@@ -15,4 +14,4 @@ import space.kscience.kmath.expressions.Symbol
  *
  * @author Iaroslav Postovalov
  */
-internal fun <V> Map<Symbol, V>.getOrFail(key: String): V = getValue(StringSymbol(key))
+internal fun <V> Map<Symbol, V>.getOrFail(key: String): V = getValue(Symbol(key))
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
index 361027968..a7ee9ff3f 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
@@ -103,12 +103,12 @@ public class DerivativeStructureField(
     public override operator fun DerivativeStructure.minus(b: Number): DerivativeStructure = subtract(b.toDouble())
     public override operator fun Number.plus(b: DerivativeStructure): DerivativeStructure = b + this
     public override operator fun Number.minus(b: DerivativeStructure): DerivativeStructure = b - this
+}
 
-    public companion object :
-        AutoDiffProcessor<Double, DerivativeStructure, DerivativeStructureField, Expression<Double>> {
-        public override fun process(function: DerivativeStructureField.() -> DerivativeStructure): DifferentiableExpression<Double> =
-            DerivativeStructureExpression(function)
-    }
+public object DSProcessor : AutoDiffProcessor<Double, DerivativeStructure, DerivativeStructureField> {
+    public override fun differentiate(
+        function: DerivativeStructureField.() -> DerivativeStructure,
+    ): DerivativeStructureExpression = DerivativeStructureExpression(function)
 }
 
 /**
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
index 4e174723d..e0a2f4931 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
@@ -16,7 +16,7 @@ public class CMGaussRuleIntegrator(
     private var type: GaussRule = GaussRule.LEGANDRE,
 ) : UnivariateIntegrator<Double> {
 
-    override fun integrate(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
+    override fun process(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
         val range = integrand.getFeature<IntegrationRange>()?.range
             ?: error("Integration range is not provided")
         val integrator: GaussIntegrator = getIntegrator(range)
@@ -76,8 +76,8 @@ public class CMGaussRuleIntegrator(
             numPoints: Int = 100,
             type: GaussRule = GaussRule.LEGANDRE,
             function: (Double) -> Double,
-        ): Double = CMGaussRuleIntegrator(numPoints, type).integrate(
+        ): Double = CMGaussRuleIntegrator(numPoints, type).process(
             UnivariateIntegrand(function, IntegrationRange(range))
-        ).valueOrNull!!
+        ).value
     }
 }
\ No newline at end of file
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
index bcddccdc4..257429fa7 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
@@ -18,7 +18,7 @@ public class CMIntegrator(
     public val integratorBuilder: (Integrand) -> org.apache.commons.math3.analysis.integration.UnivariateIntegrator,
 ) : UnivariateIntegrator<Double> {
 
-    override fun integrate(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
+    override fun process(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
         val integrator = integratorBuilder(integrand)
         val maxCalls = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: defaultMaxCalls
         val remainingCalls = maxCalls - integrand.calls
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
index 11b097831..c6f1cd852 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
@@ -95,7 +95,7 @@ public object CMLinearSpace : LinearSpace<Double, DoubleField> {
         v * this
 
     @UnstableKMathAPI
-    override fun <F : StructureFeature> getFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
+    override fun <F : StructureFeature> computeFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
         //Return the feature if it is intrinsic to the structure
         structure.getFeature(type)?.let { return it }
 
@@ -109,22 +109,22 @@ public object CMLinearSpace : LinearSpace<Double, DoubleField> {
                 LupDecompositionFeature<Double> {
                 private val lup by lazy { LUDecomposition(origin) }
                 override val determinant: Double by lazy { lup.determinant }
-                override val l: Matrix<Double> by lazy { CMMatrix(lup.l) + LFeature }
-                override val u: Matrix<Double> by lazy { CMMatrix(lup.u) + UFeature }
+                override val l: Matrix<Double> by lazy<Matrix<Double>> { CMMatrix(lup.l).withFeature(LFeature) }
+                override val u: Matrix<Double> by lazy<Matrix<Double>> { CMMatrix(lup.u).withFeature(UFeature) }
                 override val p: Matrix<Double> by lazy { CMMatrix(lup.p) }
             }
 
             CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Double> {
-                override val l: Matrix<Double> by lazy {
+                override val l: Matrix<Double> by lazy<Matrix<Double>> {
                     val cholesky = CholeskyDecomposition(origin)
-                    CMMatrix(cholesky.l) + LFeature
+                    CMMatrix(cholesky.l).withFeature(LFeature)
                 }
             }
 
             QRDecompositionFeature::class -> object : QRDecompositionFeature<Double> {
                 private val qr by lazy { QRDecomposition(origin) }
-                override val q: Matrix<Double> by lazy { CMMatrix(qr.q) + OrthogonalFeature }
-                override val r: Matrix<Double> by lazy { CMMatrix(qr.r) + UFeature }
+                override val q: Matrix<Double> by lazy<Matrix<Double>> { CMMatrix(qr.q).withFeature(OrthogonalFeature) }
+                override val r: Matrix<Double> by lazy<Matrix<Double>> { CMMatrix(qr.r).withFeature(UFeature) }
             }
 
             SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<Double> {
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
index ee602ca06..9085974ea 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.commons.linear
 
 import org.apache.commons.math3.linear.*
+import space.kscience.kmath.linear.LinearSolver
 import space.kscience.kmath.linear.Matrix
 import space.kscience.kmath.linear.Point
 
@@ -44,3 +45,12 @@ public fun CMLinearSpace.inverse(
     a: Matrix<Double>,
     decomposition: CMDecomposition = CMDecomposition.LUP,
 ): CMMatrix = solver(a, decomposition).inverse.wrap()
+
+
+public fun CMLinearSpace.solver(decomposition: CMDecomposition): LinearSolver<Double> = object : LinearSolver<Double> {
+    override fun solve(a: Matrix<Double>, b: Matrix<Double>): Matrix<Double> = solve(a, b, decomposition)
+
+    override fun solve(a: Matrix<Double>, b: Point<Double>): Point<Double> = solve(a, b, decomposition)
+
+    override fun inverse(matrix: Matrix<Double>): Matrix<Double> = inverse(matrix, decomposition)
+}
\ No newline at end of file
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
similarity index 63%
rename from kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
rename to kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
index 2faee1f5d..abf95daf6 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
@@ -2,7 +2,7 @@
  * Copyright 2018-2021 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
-
+@file:OptIn(UnstableKMathAPI::class)
 package space.kscience.kmath.commons.optimization
 
 import org.apache.commons.math3.optim.*
@@ -11,6 +11,10 @@ import org.apache.commons.math3.optim.nonlinear.scalar.MultivariateOptimizer
 import org.apache.commons.math3.optim.nonlinear.scalar.ObjectiveFunction
 import org.apache.commons.math3.optim.nonlinear.scalar.ObjectiveFunctionGradient
 import org.apache.commons.math3.optim.nonlinear.scalar.gradient.NonLinearConjugateGradientOptimizer
+import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.NelderMeadSimplex
+import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.SimplexOptimizer
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.SymbolIndexer
 import space.kscience.kmath.expressions.derivative
 import space.kscience.kmath.expressions.withSymbols
 import space.kscience.kmath.misc.UnstableKMathAPI
@@ -21,29 +25,61 @@ import kotlin.reflect.KClass
 public operator fun PointValuePair.component1(): DoubleArray = point
 public operator fun PointValuePair.component2(): Double = value
 
-public class CMOptimizer(public val optimizerBuilder: () -> MultivariateOptimizer): OptimizationFeature{
+public class CMOptimizerEngine(public val optimizerBuilder: () -> MultivariateOptimizer) : OptimizationFeature {
     override fun toString(): String = "CMOptimizer($optimizerBuilder)"
 }
 
-public class CMOptimizerData(public val data: List<OptimizationData>) : OptimizationFeature {
-    public constructor(vararg data: OptimizationData) : this(data.toList())
+/**
+ * Specify a Commons-maths optimization engine
+ */
+public fun FunctionOptimizationBuilder<Double>.cmEngine(optimizerBuilder: () -> MultivariateOptimizer) {
+    addFeature(CMOptimizerEngine(optimizerBuilder))
+}
+
+public class CMOptimizerData(public val data: List<SymbolIndexer.() -> OptimizationData>) : OptimizationFeature {
+    public constructor(vararg data: (SymbolIndexer.() -> OptimizationData)) : this(data.toList())
 
     override fun toString(): String = "CMOptimizerData($data)"
+}
 
+/**
+ * Specify Commons-maths optimization data.
+ */
+public fun FunctionOptimizationBuilder<Double>.cmOptimizationData(data: SymbolIndexer.() -> OptimizationData) {
+    updateFeature<CMOptimizerData> {
+        val newData = (it?.data ?: emptyList()) + data
+        CMOptimizerData(newData)
+    }
+}
+
+public fun FunctionOptimizationBuilder<Double>.simplexSteps(vararg steps: Pair<Symbol, Double>) {
+    //TODO use convergence checker from features
+    cmEngine { SimplexOptimizer(CMOptimizer.defaultConvergenceChecker) }
+    cmOptimizationData { NelderMeadSimplex(mapOf(*steps).toDoubleArray()) }
 }
 
 @OptIn(UnstableKMathAPI::class)
-public class CMOptimization : Optimizer<FunctionOptimization<Double>> {
+public object CMOptimizer : Optimizer<Double, FunctionOptimization<Double>> {
+
+    public const val DEFAULT_RELATIVE_TOLERANCE: Double = 1e-4
+    public const val DEFAULT_ABSOLUTE_TOLERANCE: Double = 1e-4
+    public const val DEFAULT_MAX_ITER: Int = 1000
+
+    public val defaultConvergenceChecker: SimpleValueChecker = SimpleValueChecker(
+        DEFAULT_RELATIVE_TOLERANCE,
+        DEFAULT_ABSOLUTE_TOLERANCE,
+        DEFAULT_MAX_ITER
+    )
+
 
     override suspend fun optimize(
         problem: FunctionOptimization<Double>,
     ): FunctionOptimization<Double> {
-        val startPoint = problem.getFeature<OptimizationStartPoint<Double>>()?.point
-            ?: error("Starting point not defined in $problem")
+        val startPoint = problem.startPoint
 
         val parameters = problem.getFeature<OptimizationParameters>()?.symbols
             ?: problem.getFeature<OptimizationStartPoint<Double>>()?.point?.keys
-            ?:startPoint.keys
+            ?: startPoint.keys
 
 
         withSymbols(parameters) {
@@ -53,7 +89,7 @@ public class CMOptimization : Optimizer<FunctionOptimization<Double>> {
                 DEFAULT_MAX_ITER
             )
 
-            val cmOptimizer: MultivariateOptimizer = problem.getFeature<CMOptimizer>()?.optimizerBuilder?.invoke()
+            val cmOptimizer: MultivariateOptimizer = problem.getFeature<CMOptimizerEngine>()?.optimizerBuilder?.invoke()
                 ?: NonLinearConjugateGradientOptimizer(
                     NonLinearConjugateGradientOptimizer.Formula.FLETCHER_REEVES,
                     convergenceChecker
@@ -68,7 +104,7 @@ public class CMOptimization : Optimizer<FunctionOptimization<Double>> {
             addOptimizationData(MaxEval.unlimited())
             addOptimizationData(InitialGuess(startPoint.toDoubleArray()))
 
-            fun exportOptimizationData(): List<OptimizationData> = optimizationData.values.toList()
+            //fun exportOptimizationData(): List<OptimizationData> = optimizationData.values.toList()
 
             val objectiveFunction = ObjectiveFunction {
                 val args = startPoint + it.toMap()
@@ -88,7 +124,9 @@ public class CMOptimization : Optimizer<FunctionOptimization<Double>> {
 
             for (feature in problem.features) {
                 when (feature) {
-                    is CMOptimizerData -> feature.data.forEach { addOptimizationData(it) }
+                    is CMOptimizerData -> feature.data.forEach { dataBuilder ->
+                        addOptimizationData(dataBuilder())
+                    }
                     is FunctionOptimizationTarget -> when (feature) {
                         FunctionOptimizationTarget.MAXIMIZE -> addOptimizationData(GoalType.MAXIMIZE)
                         FunctionOptimizationTarget.MINIMIZE -> addOptimizationData(GoalType.MINIMIZE)
@@ -101,10 +139,4 @@ public class CMOptimization : Optimizer<FunctionOptimization<Double>> {
             return problem.withFeatures(OptimizationResult(point.toMap()), OptimizationValue(value))
         }
     }
-
-    public companion object {
-        public const val DEFAULT_RELATIVE_TOLERANCE: Double = 1e-4
-        public const val DEFAULT_ABSOLUTE_TOLERANCE: Double = 1e-4
-        public const val DEFAULT_MAX_ITER: Int = 1000
-    }
 }
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
deleted file mode 100644
index b1d7f5ca3..000000000
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.commons.optimization
-
-import org.apache.commons.math3.analysis.differentiation.DerivativeStructure
-import space.kscience.kmath.commons.expressions.DerivativeStructureField
-import space.kscience.kmath.expressions.DifferentiableExpression
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.optimization.*
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asBuffer
-
-/**
- * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic differentiation
- */
-public fun FunctionOptimization.Companion.chiSquaredExpression(
-    x: Buffer<Double>,
-    y: Buffer<Double>,
-    yErr: Buffer<Double>,
-    model: DerivativeStructureField.(x: DerivativeStructure) -> DerivativeStructure,
-): DifferentiableExpression<Double> = chiSquaredExpression(DerivativeStructureField, x, y, yErr, model)
-
-/**
- * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic differentiation
- */
-public fun FunctionOptimization.Companion.chiSquaredExpression(
-    x: Iterable<Double>,
-    y: Iterable<Double>,
-    yErr: Iterable<Double>,
-    model: DerivativeStructureField.(x: DerivativeStructure) -> DerivativeStructure,
-): DifferentiableExpression<Double> = chiSquaredExpression(
-    DerivativeStructureField,
-    x.toList().asBuffer(),
-    y.toList().asBuffer(),
-    yErr.toList().asBuffer(),
-    model
-)
-
-/**
- * Optimize expression without derivatives
- */
-public suspend fun Expression<Double>.optimize(
-    vararg symbols: Symbol,
-    configuration: CMOptimization.() -> Unit,
-): OptimizationResult<Double> {
-    require(symbols.isNotEmpty()) { "Must provide a list of symbols for optimization" }
-    val problem = CMOptimization(symbols.toList(), configuration)
-    problem.noDerivFunction(this)
-    return problem.optimize()
-}
-
-/**
- * Optimize differentiable expression
- */
-public suspend fun DifferentiableExpression<Double>.optimize(
-    vararg symbols: Symbol,
-    configuration: CMOptimization.() -> Unit,
-): OptimizationResult<Double> = optimizeWith(CMOptimization, symbols = symbols, configuration)
-
-public suspend fun DifferentiableExpression<Double>.minimize(
-    vararg startPoint: Pair<Symbol, Double>,
-    configuration: CMOptimization.() -> Unit = {},
-): OptimizationResult<Double> {
-    val symbols = startPoint.map { it.first }.toTypedArray()
-    return optimize(*symbols){
-        maximize = false
-        initialGuess(startPoint.toMap())
-        function(this@minimize)
-        configuration()
-    }
-}
\ No newline at end of file
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index b47d7da24..97761cfa2 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -6,43 +6,38 @@
 package space.kscience.kmath.commons.optimization
 
 import kotlinx.coroutines.runBlocking
+import space.kscience.kmath.commons.expressions.DSProcessor
 import space.kscience.kmath.commons.expressions.DerivativeStructureExpression
 import space.kscience.kmath.distributions.NormalDistribution
+import space.kscience.kmath.expressions.Symbol.Companion.x
+import space.kscience.kmath.expressions.Symbol.Companion.y
 import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.optimization.FunctionOptimization
+import space.kscience.kmath.optimization.*
 import space.kscience.kmath.stat.RandomGenerator
 import kotlin.math.pow
 import kotlin.test.Test
 
 internal class OptimizeTest {
-    val x by symbol
-    val y by symbol
-
     val normal = DerivativeStructureExpression {
-        exp(-bindSymbol(x).pow(2) / 2) + exp(-bindSymbol(y)
-            .pow(2) / 2)
+        exp(-bindSymbol(x).pow(2) / 2) + exp(-bindSymbol(y).pow(2) / 2)
     }
 
     @Test
-    fun testGradientOptimization() = runBlocking{
-        val result = normal.optimize(x, y) {
-            initialGuess(x to 1.0, y to 1.0)
-            //no need to select optimizer. Gradient optimizer is used by default because gradients are provided by function
-        }
-        println(result.point)
-        println(result.value)
+    fun testGradientOptimization() = runBlocking {
+        val result = normal.optimizeWith(CMOptimizer, x to 1.0, y to 1.0)
+        println(result.resultPoint)
+        println(result.resultValue)
     }
 
     @Test
-    fun testSimplexOptimization() = runBlocking{
-        val result = normal.optimize(x, y) {
-            initialGuess(x to 1.0, y to 1.0)
+    fun testSimplexOptimization() = runBlocking {
+        val result = normal.optimizeWith(CMOptimizer, x to 1.0, y to 1.0) {
             simplexSteps(x to 2.0, y to 0.5)
             //this sets simplex optimizer
         }
 
-        println(result.point)
-        println(result.value)
+        println(result.resultPoint)
+        println(result.resultValue)
     }
 
     @Test
@@ -62,6 +57,11 @@ internal class OptimizeTest {
 
         val yErr = List(x.size) { sigma }
 
+        val model = DSProcessor.differentiate { x1 ->
+            val cWithDefault = bindSymbolOrNull(c) ?: one
+            bindSymbol(a) * x1.pow(2) + bindSymbol(b) * x1 + cWithDefault
+        }
+
         val chi2 = FunctionOptimization.chiSquared(x, y, yErr) { x1 ->
             val cWithDefault = bindSymbolOrNull(c) ?: one
             bindSymbol(a) * x1.pow(2) + bindSymbol(b) * x1 + cWithDefault
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
index 88c14d311..e06b774fd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
@@ -25,6 +25,9 @@ public interface ColumnarData<out T> {
     public operator fun get(symbol: Symbol): Buffer<T>?
 }
 
+@UnstableKMathAPI
+public val ColumnarData<*>.indices: IntRange get() = 0 until size
+
 /**
  * A zero-copy method to represent a [Structure2D] as a two-column x-y data.
  * There could more than two columns in the structure.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
index 011dc26e2..1782ff406 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.expressions
 
+import space.kscience.kmath.operations.Algebra
+
 /**
  * Represents expression which structure can be differentiated.
  *
@@ -63,7 +65,10 @@ public abstract class FirstDerivativeExpression<T> : DifferentiableExpression<T>
 
 /**
  * A factory that converts an expression in autodiff variables to a [DifferentiableExpression]
+ * @param T type of the constants for the expression
+ * @param I type of the actual expression state
+ * @param A type of expression algebra
  */
-public fun interface AutoDiffProcessor<T, I, A : ExpressionAlgebra<T, I>, out R : Expression<T>> {
-    public fun process(function: A.() -> I): DifferentiableExpression<T>
+public fun interface AutoDiffProcessor<T, I, A : Algebra<I>> {
+    public fun differentiate(function: A.() -> I): DifferentiableExpression<T>
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
index 9c3ffd819..288fabbaf 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
@@ -5,8 +5,6 @@
 
 package space.kscience.kmath.linear
 
-import space.kscience.kmath.nd.as1D
-
 /**
  * A group of methods to solve for *X* in equation *X = A <sup>-1</sup> &middot; B*, where *A* and *B* are matrices or
  * vectors.
@@ -30,20 +28,3 @@ public interface LinearSolver<T : Any> {
     public fun inverse(matrix: Matrix<T>): Matrix<T>
 }
 
-/**
- * Convert matrix to vector if it is possible.
- */
-public fun <T : Any> Matrix<T>.asVector(): Point<T> =
-    if (this.colNum == 1)
-        as1D()
-    else
-        error("Can't convert matrix with more than one column to vector")
-
-/**
- * Creates an n &times; 1 [VirtualMatrix], where n is the size of the given buffer.
- *
- * @param T the type of elements contained in the buffer.
- * @receiver a buffer.
- * @return the new matrix.
- */
-public fun <T : Any> Point<T>.asMatrix(): VirtualMatrix<T> = VirtualMatrix(size, 1) { i, _ -> get(i) }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
index ec073ac48..94083f70d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
@@ -164,7 +164,7 @@ public interface LinearSpace<T : Any, out A : Ring<T>> {
     public operator fun T.times(v: Point<T>): Point<T> = v * this
 
     /**
-     * Get a feature of the structure in this scope. Structure features take precedence other context features
+     * Compute a feature of the structure in this scope. Structure features take precedence other context features
      *
      * @param F the type of feature.
      * @param structure the structure.
@@ -172,7 +172,7 @@ public interface LinearSpace<T : Any, out A : Ring<T>> {
      * @return a feature object or `null` if it isn't present.
      */
     @UnstableKMathAPI
-    public fun <F : StructureFeature> getFeature(structure: Matrix<T>, type: KClass<out F>): F? = structure.getFeature(type)
+    public fun <F : StructureFeature> computeFeature(structure: Matrix<T>, type: KClass<out F>): F? = structure.getFeature(type)
 
     public companion object {
 
@@ -184,7 +184,7 @@ public interface LinearSpace<T : Any, out A : Ring<T>> {
             bufferFactory: BufferFactory<T> = Buffer.Companion::boxing,
         ): LinearSpace<T, A> = BufferedLinearSpace(algebra, bufferFactory)
 
-        public val real: LinearSpace<Double, DoubleField> = buffered(DoubleField, ::DoubleBuffer)
+        public val double: LinearSpace<Double, DoubleField> = buffered(DoubleField, ::DoubleBuffer)
 
         /**
          * Automatic buffered matrix, unboxed if it is possible
@@ -202,9 +202,27 @@ public interface LinearSpace<T : Any, out A : Ring<T>> {
  * @return a feature object or `null` if it isn't present.
  */
 @UnstableKMathAPI
-public inline fun <T : Any, reified F : StructureFeature> LinearSpace<T, *>.getFeature(structure: Matrix<T>): F? =
-    getFeature(structure, F::class)
+public inline fun <T : Any, reified F : StructureFeature> LinearSpace<T, *>.computeFeature(structure: Matrix<T>): F? =
+    computeFeature(structure, F::class)
 
 
-public operator fun <LS : LinearSpace<*, *>, R> LS.invoke(block: LS.() -> R): R = run(block)
+public inline operator fun <LS : LinearSpace<*, *>, R> LS.invoke(block: LS.() -> R): R = run(block)
 
+
+/**
+ * Convert matrix to vector if it is possible.
+ */
+public fun <T : Any> Matrix<T>.asVector(): Point<T> =
+    if (this.colNum == 1)
+        as1D()
+    else
+        error("Can't convert matrix with more than one column to vector")
+
+/**
+ * Creates an n &times; 1 [VirtualMatrix], where n is the size of the given buffer.
+ *
+ * @param T the type of elements contained in the buffer.
+ * @receiver a buffer.
+ * @return the new matrix.
+ */
+public fun <T : Any> Point<T>.asMatrix(): VirtualMatrix<T> = VirtualMatrix(size, 1) { i, _ -> get(i) }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
index f3653d394..3b6208468 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.linear
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.getFeature
 import space.kscience.kmath.operations.*
@@ -34,7 +35,7 @@ public class LupDecomposition<T : Any>(
             j == i -> elementContext.one
             else -> elementContext.zero
         }
-    } + LFeature
+    }.withFeature(LFeature)
 
 
     /**
@@ -44,7 +45,7 @@ public class LupDecomposition<T : Any>(
      */
     override val u: Matrix<T> = VirtualMatrix(lu.shape[0], lu.shape[1]) { i, j ->
         if (j >= i) lu[i, j] else elementContext.zero
-    } + UFeature
+    }.withFeature(UFeature)
 
     /**
      * Returns the P rows permutation matrix.
@@ -82,7 +83,7 @@ public fun <T : Comparable<T>> LinearSpace<T, Field<T>>.lup(
     val m = matrix.colNum
     val pivot = IntArray(matrix.rowNum)
 
-    //TODO just waits for KEEP-176
+    //TODO just waits for multi-receivers
     BufferAccessor2D(matrix.rowNum, matrix.colNum, factory).run {
         elementAlgebra {
             val lu = create(matrix)
@@ -156,10 +157,13 @@ public inline fun <reified T : Comparable<T>> LinearSpace<T, Field<T>>.lup(
     noinline checkSingular: (T) -> Boolean,
 ): LupDecomposition<T> = lup(MutableBuffer.Companion::auto, matrix, checkSingular)
 
-public fun LinearSpace<Double, DoubleField>.lup(matrix: Matrix<Double>): LupDecomposition<Double> =
-    lup(::DoubleBuffer, matrix) { it < 1e-11 }
+public fun LinearSpace<Double, DoubleField>.lup(
+    matrix: Matrix<Double>,
+    singularityThreshold: Double = 1e-11,
+): LupDecomposition<Double> =
+    lup(::DoubleBuffer, matrix) { it < singularityThreshold }
 
-public fun <T : Any> LupDecomposition<T>.solveWithLup(
+internal fun <T : Any> LupDecomposition<T>.solve(
     factory: MutableBufferFactory<T>,
     matrix: Matrix<T>,
 ): Matrix<T> {
@@ -207,41 +211,24 @@ public fun <T : Any> LupDecomposition<T>.solveWithLup(
     }
 }
 
-public inline fun <reified T : Any> LupDecomposition<T>.solveWithLup(matrix: Matrix<T>): Matrix<T> =
-    solveWithLup(MutableBuffer.Companion::auto, matrix)
-
 /**
- * Solves a system of linear equations *ax = b** using LUP decomposition.
+ * Produce a generic solver based on LUP decomposition
  */
+@PerformancePitfall()
 @OptIn(UnstableKMathAPI::class)
-public inline fun <reified T : Comparable<T>> LinearSpace<T, Field<T>>.solveWithLup(
-    a: Matrix<T>,
-    b: Matrix<T>,
-    noinline bufferFactory: MutableBufferFactory<T> = MutableBuffer.Companion::auto,
-    noinline checkSingular: (T) -> Boolean,
-): Matrix<T> {
-    // Use existing decomposition if it is provided by matrix
-    val decomposition = a.getFeature() ?: lup(bufferFactory, a, checkSingular)
-    return decomposition.solveWithLup(bufferFactory, b)
+public fun <T : Comparable<T>, F : Field<T>> LinearSpace<T, F>.lupSolver(
+    bufferFactory: MutableBufferFactory<T>,
+    singularityCheck: (T) -> Boolean,
+): LinearSolver<T> = object : LinearSolver<T> {
+    override fun solve(a: Matrix<T>, b: Matrix<T>): Matrix<T> {
+        // Use existing decomposition if it is provided by matrix
+        val decomposition = a.getFeature() ?: lup(bufferFactory, a, singularityCheck)
+        return decomposition.solve(bufferFactory, b)
+    }
+
+    override fun inverse(matrix: Matrix<T>): Matrix<T> = solve(matrix, one(matrix.rowNum, matrix.colNum))
 }
 
-public inline fun <reified T : Comparable<T>> LinearSpace<T, Field<T>>.inverseWithLup(
-    matrix: Matrix<T>,
-    noinline bufferFactory: MutableBufferFactory<T> = MutableBuffer.Companion::auto,
-    noinline checkSingular: (T) -> Boolean,
-): Matrix<T> = solveWithLup(matrix, one(matrix.rowNum, matrix.colNum), bufferFactory, checkSingular)
-
-
-@OptIn(UnstableKMathAPI::class)
-public fun LinearSpace<Double, DoubleField>.solveWithLup(a: Matrix<Double>, b: Matrix<Double>): Matrix<Double> {
-    // Use existing decomposition if it is provided by matrix
-    val bufferFactory: MutableBufferFactory<Double> = ::DoubleBuffer
-    val decomposition: LupDecomposition<Double> = a.getFeature() ?: lup(bufferFactory, a) { it < 1e-11 }
-    return decomposition.solveWithLup(bufferFactory, b)
-}
-
-/**
- * Inverses a square matrix using LUP decomposition. Non square matrix will throw a error.
- */
-public fun LinearSpace<Double, DoubleField>.inverseWithLup(matrix: Matrix<Double>): Matrix<Double> =
-    solveWithLup(matrix, one(matrix.rowNum, matrix.colNum))
\ No newline at end of file
+@PerformancePitfall
+public fun LinearSpace<Double, DoubleField>.lupSolver(singularityThreshold: Double = 1e-11): LinearSolver<Double> =
+    lupSolver(::DoubleBuffer) { it < singularityThreshold }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
index 72d22233a..029612bc5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
@@ -7,6 +7,8 @@ package space.kscience.kmath.linear
 
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.structures.BufferAccessor2D
+import space.kscience.kmath.structures.MutableBuffer
 
 public class MatrixBuilder<T : Any, out A : Ring<T>>(
     public val linearSpace: LinearSpace<T, A>,
@@ -45,4 +47,31 @@ public inline fun <T : Any> LinearSpace<T, Ring<T>>.column(
     crossinline builder: (Int) -> T,
 ): Matrix<T> = buildMatrix(size, 1) { i, _ -> builder(i) }
 
-public fun <T : Any> LinearSpace<T, Ring<T>>.column(vararg values: T): Matrix<T> = column(values.size, values::get)
\ No newline at end of file
+public fun <T : Any> LinearSpace<T, Ring<T>>.column(vararg values: T): Matrix<T> = column(values.size, values::get)
+
+public object SymmetricMatrixFeature : MatrixFeature
+
+/**
+ * Naive implementation of a symmetric matrix builder, that adds a [SymmetricMatrixFeature] tag. The resulting matrix contains
+ * full `size^2` number of elements, but caches elements during calls to save [builder] calls. [builder] is always called in the
+ * upper triangle region meaning that `i <= j`
+ */
+public fun <T : Any, A : Ring<T>> MatrixBuilder<T, A>.symmetric(
+    builder: (i: Int, j: Int) -> T,
+): Matrix<T> {
+    require(columns == rows) { "In order to build symmetric matrix, number of rows $rows should be equal to number of columns $columns" }
+    return with(BufferAccessor2D<T?>(rows, rows, MutableBuffer.Companion::boxing)) {
+        val cache = factory(rows * rows) { null }
+        linearSpace.buildMatrix(rows, rows) { i, j ->
+            val cached = cache[i, j]
+            if (cached == null) {
+                val value = if (i <= j) builder(i, j) else builder(j, i)
+                cache[i, j] = value
+                cache[j, i] = value
+                value
+            } else {
+                cached
+            }
+        }.withFeature(SymmetricMatrixFeature)
+    }
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
index 16aadab3b..df62c6fc0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.linear
 
+import space.kscience.kmath.misc.FeatureSet
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureFeature
 import space.kscience.kmath.nd.getFeature
@@ -18,7 +19,7 @@ import kotlin.reflect.KClass
  */
 public class MatrixWrapper<out T : Any> internal constructor(
     public val origin: Matrix<T>,
-    public val features: Set<MatrixFeature>,
+    public val features: FeatureSet<StructureFeature>,
 ) : Matrix<T> by origin {
 
     /**
@@ -27,8 +28,7 @@ public class MatrixWrapper<out T : Any> internal constructor(
     @UnstableKMathAPI
     @Suppress("UNCHECKED_CAST")
     public override fun <F : StructureFeature> getFeature(type: KClass<out F>): F? =
-        features.singleOrNull(type::isInstance) as? F
-            ?: origin.getFeature(type)
+        features.getFeature(type) ?: origin.getFeature(type)
 
     public override fun toString(): String = "MatrixWrapper(matrix=$origin, features=$features)"
 }
@@ -44,20 +44,23 @@ public val <T : Any> Matrix<T>.origin: Matrix<T>
 /**
  * Add a single feature to a [Matrix]
  */
-public operator fun <T : Any> Matrix<T>.plus(newFeature: MatrixFeature): MatrixWrapper<T> = if (this is MatrixWrapper) {
-    MatrixWrapper(origin, features + newFeature)
+public fun <T : Any> Matrix<T>.withFeature(newFeature: MatrixFeature): MatrixWrapper<T> = if (this is MatrixWrapper) {
+    MatrixWrapper(origin, features.with(newFeature))
 } else {
-    MatrixWrapper(this, setOf(newFeature))
+    MatrixWrapper(this, FeatureSet.of(newFeature))
 }
 
+@Deprecated("To be replaced by withFeature")
+public operator fun <T : Any> Matrix<T>.plus(newFeature: MatrixFeature): MatrixWrapper<T> = withFeature(newFeature)
+
 /**
  * Add a collection of features to a [Matrix]
  */
-public operator fun <T : Any> Matrix<T>.plus(newFeatures: Collection<MatrixFeature>): MatrixWrapper<T> =
+public fun <T : Any> Matrix<T>.withFeatures(newFeatures: Iterable<MatrixFeature>): MatrixWrapper<T> =
     if (this is MatrixWrapper) {
-        MatrixWrapper(origin, features + newFeatures)
+        MatrixWrapper(origin, features.with(newFeatures))
     } else {
-        MatrixWrapper(this, newFeatures.toSet())
+        MatrixWrapper(this, FeatureSet.of(newFeatures))
     }
 
 /**
@@ -68,7 +71,7 @@ public fun <T : Any> LinearSpace<T, Ring<T>>.one(
     columns: Int,
 ): Matrix<T> = VirtualMatrix(rows, columns) { i, j ->
     if (i == j) elementAlgebra.one else elementAlgebra.zero
-} + UnitFeature
+}.withFeature(UnitFeature)
 
 
 /**
@@ -79,7 +82,7 @@ public fun <T : Any> LinearSpace<T, Ring<T>>.zero(
     columns: Int,
 ): Matrix<T> = VirtualMatrix(rows, columns) { _, _ ->
     elementAlgebra.zero
-} + ZeroFeature
+}.withFeature(ZeroFeature)
 
 public class TransposedFeature<out T : Any>(public val original: Matrix<T>) : MatrixFeature
 
@@ -90,4 +93,4 @@ public class TransposedFeature<out T : Any>(public val original: Matrix<T>) : Ma
 public fun <T : Any> Matrix<T>.transpose(): Matrix<T> = getFeature<TransposedFeature<T>>()?.original ?: VirtualMatrix(
     colNum,
     rowNum,
-) { i, j -> get(j, i) } + TransposedFeature(this)
\ No newline at end of file
+) { i, j -> get(j, i) }.withFeature(TransposedFeature(this))
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
index 3751bd33b..fb2b1e547 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
@@ -20,3 +20,6 @@ public class VirtualMatrix<out T : Any>(
 
     override operator fun get(i: Int, j: Int): T = generator(i, j)
 }
+
+public fun <T : Any> MatrixBuilder<T, *>.virtual(generator: (i: Int, j: Int) -> T): VirtualMatrix<T> =
+    VirtualMatrix(rows, columns, generator)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/symmetric.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/symmetric.kt
deleted file mode 100644
index 04d9a9897..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/symmetric.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.linear
-
-import space.kscience.kmath.structures.BufferAccessor2D
-import space.kscience.kmath.structures.MutableBuffer
-
-public object SymmetricMatrixFeature : MatrixFeature
-
-/**
- * Naive implementation of a symmetric matrix builder, that adds a [SymmetricMatrixFeature] tag. The resulting matrix contains
- * full `size^2` number of elements, but caches elements during calls to save [builder] calls. [builder] is always called in the
- * upper triangle region meaning that `i <= j`
- */
-public fun <T : Any, LS : LinearSpace<T, *>> LS.buildSymmetricMatrix(
-    size: Int,
-    builder: (i: Int, j: Int) -> T,
-): Matrix<T> = BufferAccessor2D<T?>(size, size, MutableBuffer.Companion::boxing).run {
-    val cache = factory(size * size) { null }
-    buildMatrix(size, size) { i, j ->
-        val cached = cache[i, j]
-        if (cached == null) {
-            val value = if (i <= j) builder(i, j) else builder(j, i)
-            cache[i, j] = value
-            cache[j, i] = value
-            value
-        } else {
-            cached
-        }
-    } + SymmetricMatrixFeature
-}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
index a94efc788..648b6376f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
@@ -11,29 +11,44 @@ import kotlin.reflect.KClass
  * A entity that contains a set of features defined by their types
  */
 public interface Featured<F : Any> {
-    public fun <T : F> getFeature(type: KClass<out T>): T?
+    public fun <T : F> getFeature(type: FeatureKey<T>): T?
+}
+
+public typealias FeatureKey<T> = KClass<out T>
+
+public interface Feature<F: Feature<F>> {
+
+    /**
+     * A key used for extraction
+     */
+    @Suppress("UNCHECKED_CAST")
+    public val key: FeatureKey<F> get() = this::class as FeatureKey<F>
 }
 
 /**
  * A container for a set of features
  */
-public class FeatureSet<F : Any> private constructor(public val features: Map<KClass<out F>, F>) : Featured<F> {
+public class FeatureSet<F : Feature<F>> private constructor(public val features: Map<FeatureKey<F>, F>) : Featured<F> {
     @Suppress("UNCHECKED_CAST")
-    override fun <T : F> getFeature(type: KClass<out T>): T? = features[type] as? T
+    override fun <T : F> getFeature(type: FeatureKey<T>): T? = features[type] as? T
 
     public inline fun <reified T : F> getFeature(): T? = getFeature(T::class)
 
-    public fun <T : F> with(feature: T, type: KClass<out T> = feature::class): FeatureSet<F> =
+    public fun <T : F> with(feature: T, type: FeatureKey<F> = feature.key): FeatureSet<F> =
         FeatureSet(features + (type to feature))
 
     public fun with(other: FeatureSet<F>): FeatureSet<F> = FeatureSet(features + other.features)
 
     public fun with(vararg otherFeatures: F): FeatureSet<F> =
-        FeatureSet(features + otherFeatures.associateBy { it::class })
+        FeatureSet(features + otherFeatures.associateBy { it.key })
+
+    public fun with(otherFeatures: Iterable<F>): FeatureSet<F> =
+        FeatureSet(features + otherFeatures.associateBy { it.key })
 
     public operator fun iterator(): Iterator<F> = features.values.iterator()
 
     public companion object {
-        public fun <F : Any> of(vararg features: F): FeatureSet<F> = FeatureSet(features.associateBy { it::class })
+        public fun <F : Feature<F>> of(vararg features: F): FeatureSet<F> = FeatureSet(features.associateBy { it.key })
+        public fun <F : Feature<F>> of(features: Iterable<F>): FeatureSet<F> = FeatureSet(features.associateBy { it.key })
     }
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
index e521e6237..39b2779eb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
@@ -12,7 +12,7 @@ package space.kscience.kmath.misc
  * in some way that may break some code.
  */
 @MustBeDocumented
-@Retention(value = AnnotationRetention.BINARY)
+@Retention(value = AnnotationRetention.SOURCE)
 @RequiresOptIn("This API is unstable and could change in future", RequiresOptIn.Level.WARNING)
 public annotation class UnstableKMathAPI
 
@@ -21,7 +21,7 @@ public annotation class UnstableKMathAPI
  * slow-down in some cases. Refer to the documentation and benchmark it to be sure.
  */
 @MustBeDocumented
-@Retention(value = AnnotationRetention.BINARY)
+@Retention(value = AnnotationRetention.SOURCE)
 @RequiresOptIn(
     "Refer to the documentation to use this API in performance-critical code",
     RequiresOptIn.Level.WARNING
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 7fc91e321..4962dcb7d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.Feature
+import space.kscience.kmath.misc.Featured
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
@@ -13,7 +15,7 @@ import kotlin.jvm.JvmName
 import kotlin.native.concurrent.ThreadLocal
 import kotlin.reflect.KClass
 
-public interface StructureFeature
+public interface StructureFeature : Feature<StructureFeature>
 
 /**
  * Represents n-dimensional structure, i.e. multidimensional container of items of the same type and size. The number
@@ -24,7 +26,7 @@ public interface StructureFeature
  *
  * @param T the type of items.
  */
-public interface StructureND<out T> {
+public interface StructureND<out T> : Featured<StructureFeature> {
     /**
      * The shape of structure, i.e. non-empty sequence of non-negative integers that specify sizes of dimensions of
      * this structure.
@@ -57,7 +59,7 @@ public interface StructureND<out T> {
      * If the feature is not present, null is returned.
      */
     @UnstableKMathAPI
-    public fun <F : StructureFeature> getFeature(type: KClass<out F>): F? = null
+    override fun <F : StructureFeature> getFeature(type: KClass<out F>): F? = null
 
     public companion object {
         /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
index d29c54d46..a96253939 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
@@ -14,30 +14,30 @@ import space.kscience.kmath.nd.as2D
  * A context that allows to operate on a [MutableBuffer] as on 2d array
  */
 internal class BufferAccessor2D<T>(
-    public val rowNum: Int,
-    public val colNum: Int,
+    val rowNum: Int,
+    val colNum: Int,
     val factory: MutableBufferFactory<T>,
 ) {
-    public operator fun Buffer<T>.get(i: Int, j: Int): T = get(i * colNum + j)
+    operator fun Buffer<T>.get(i: Int, j: Int): T = get(i * colNum + j)
 
-    public operator fun MutableBuffer<T>.set(i: Int, j: Int, value: T) {
+    operator fun MutableBuffer<T>.set(i: Int, j: Int, value: T) {
         set(i * colNum + j, value)
     }
 
-    public inline fun create(crossinline init: (i: Int, j: Int) -> T): MutableBuffer<T> =
+    inline fun create(crossinline init: (i: Int, j: Int) -> T): MutableBuffer<T> =
         factory(rowNum * colNum) { offset -> init(offset / colNum, offset % colNum) }
 
-    public fun create(mat: Structure2D<T>): MutableBuffer<T> = create { i, j -> mat[i, j] }
+    fun create(mat: Structure2D<T>): MutableBuffer<T> = create { i, j -> mat[i, j] }
 
     //TODO optimize wrapper
-    public fun MutableBuffer<T>.collect(): Structure2D<T> = StructureND.buffered(
+    fun MutableBuffer<T>.collect(): Structure2D<T> = StructureND.buffered(
         DefaultStrides(intArrayOf(rowNum, colNum)),
         factory
     ) { (i, j) ->
         get(i, j)
     }.as2D()
 
-    public inner class Row(public val buffer: MutableBuffer<T>, public val rowIndex: Int) : MutableBuffer<T> {
+    inner class Row(val buffer: MutableBuffer<T>, val rowIndex: Int) : MutableBuffer<T> {
         override val size: Int get() = colNum
 
         override operator fun get(index: Int): T = buffer[rowIndex, index]
@@ -54,5 +54,5 @@ internal class BufferAccessor2D<T>(
     /**
      * Get row
      */
-    public fun MutableBuffer<T>.row(i: Int): Row = Row(this, i)
+    fun MutableBuffer<T>.row(i: Int): Row = Row(this, i)
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
index 2d2a0952b..3be473e54 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
@@ -22,14 +22,14 @@ class DoubleLUSolverTest {
 
     @Test
     fun testInvertOne() {
-        val matrix = LinearSpace.real.one(2, 2)
-        val inverted = LinearSpace.real.inverseWithLup(matrix)
+        val matrix = LinearSpace.double.one(2, 2)
+        val inverted = LinearSpace.double.lupSolver().inverse(matrix)
         assertMatrixEquals(matrix, inverted)
     }
 
     @Test
     fun testDecomposition() {
-        LinearSpace.real.run {
+        LinearSpace.double.run {
             val matrix = matrix(2, 2)(
                 3.0, 1.0,
                 2.0, 3.0
@@ -46,14 +46,14 @@ class DoubleLUSolverTest {
 
     @Test
     fun testInvert() {
-        val matrix = LinearSpace.real.matrix(2, 2)(
+        val matrix = LinearSpace.double.matrix(2, 2)(
             3.0, 1.0,
             1.0, 3.0
         )
 
-        val inverted = LinearSpace.real.inverseWithLup(matrix)
+        val inverted = LinearSpace.double.lupSolver().inverse(matrix)
 
-        val expected = LinearSpace.real.matrix(2, 2)(
+        val expected = LinearSpace.double.matrix(2, 2)(
             0.375, -0.125,
             -0.125, 0.375
         )
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
index 170f9caf4..feae07c1e 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
@@ -19,14 +19,14 @@ import kotlin.test.assertTrue
 class MatrixTest {
     @Test
     fun testTranspose() {
-        val matrix = LinearSpace.real.one(3, 3)
+        val matrix = LinearSpace.double.one(3, 3)
         val transposed = matrix.transpose()
         assertTrue { StructureND.contentEquals(matrix, transposed) }
     }
 
     @Test
     fun testBuilder() {
-        val matrix = LinearSpace.real.matrix(2, 3)(
+        val matrix = LinearSpace.double.matrix(2, 3)(
             1.0, 0.0, 0.0,
             0.0, 1.0, 2.0
         )
@@ -48,7 +48,7 @@ class MatrixTest {
         infix fun Matrix<Double>.pow(power: Int): Matrix<Double> {
             var res = this
             repeat(power - 1) {
-                res = LinearSpace.real.run { res dot this@pow }
+                res = LinearSpace.double.run { res dot this@pow }
             }
             return res
         }
@@ -61,7 +61,7 @@ class MatrixTest {
         val firstMatrix = StructureND.auto(2, 3) { (i, j) -> (i + j).toDouble() }.as2D()
         val secondMatrix = StructureND.auto(3, 2) { (i, j) -> (i + j).toDouble() }.as2D()
 
-        LinearSpace.real.run {
+        LinearSpace.double.run {
 //            val firstMatrix = produce(2, 3) { i, j -> (i + j).toDouble() }
 //            val secondMatrix = produce(3, 2) { i, j -> (i + j).toDouble() }
             val result = firstMatrix dot secondMatrix
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index fb51553f7..8a03115b5 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -40,7 +40,7 @@ class NumberNDFieldTest {
     @Test
     fun testGeneration() {
 
-        val array = LinearSpace.real.buildMatrix(3, 3) { i, j ->
+        val array = LinearSpace.double.buildMatrix(3, 3) { i, j ->
             (i * 10 + j).toDouble()
         }
 
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
index 2ebcc454d..91ab6a5d6 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
@@ -151,7 +151,7 @@ public value class DMatrixContext<T : Any, out A : Ring<T>>(public val context:
         context.run { (this@transpose as Matrix<T>).transpose() }.coerce()
 
     public companion object {
-        public val real: DMatrixContext<Double, DoubleField> = DMatrixContext(LinearSpace.real)
+        public val real: DMatrixContext<Double, DoubleField> = DMatrixContext(LinearSpace.double)
     }
 }
 
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
deleted file mode 100644
index 139c55697..000000000
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
+++ /dev/null
@@ -1,995 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-/* This file is generated with buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt */
-
-package space.kscience.kmath.ejml
-
-import org.ejml.data.*
-import org.ejml.dense.row.CommonOps_DDRM
-import org.ejml.dense.row.CommonOps_FDRM
-import org.ejml.dense.row.factory.DecompositionFactory_DDRM
-import org.ejml.dense.row.factory.DecompositionFactory_FDRM
-import org.ejml.sparse.FillReducing
-import org.ejml.sparse.csc.CommonOps_DSCC
-import org.ejml.sparse.csc.CommonOps_FSCC
-import org.ejml.sparse.csc.factory.DecompositionFactory_DSCC
-import org.ejml.sparse.csc.factory.DecompositionFactory_FSCC
-import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
-import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
-import space.kscience.kmath.linear.*
-import space.kscience.kmath.linear.Matrix
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.StructureFeature
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.FloatField
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.FloatBuffer
-import kotlin.reflect.KClass
-import kotlin.reflect.cast
-
-/**
- * [EjmlVector] specialization for [Double].
- */
-public class EjmlDoubleVector<out M : DMatrix>(public override val origin: M) : EjmlVector<Double, M>(origin) {
-    init {
-        require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
-    }
-
-    public override operator fun get(index: Int): Double = origin[0, index]
-}
-
-/**
- * [EjmlVector] specialization for [Float].
- */
-public class EjmlFloatVector<out M : FMatrix>(public override val origin: M) : EjmlVector<Float, M>(origin) {
-    init {
-        require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
-    }
-
-    public override operator fun get(index: Int): Float = origin[0, index]
-}
-
-/**
- * [EjmlMatrix] specialization for [Double].
- */
-public class EjmlDoubleMatrix<out M : DMatrix>(public override val origin: M) : EjmlMatrix<Double, M>(origin) {
-    public override operator fun get(i: Int, j: Int): Double = origin[i, j]
-}
-
-/**
- * [EjmlMatrix] specialization for [Float].
- */
-public class EjmlFloatMatrix<out M : FMatrix>(public override val origin: M) : EjmlMatrix<Float, M>(origin) {
-    public override operator fun get(i: Int, j: Int): Float = origin[i, j]
-}
-
-/**
- * [EjmlLinearSpace] implementation based on [CommonOps_DDRM], [DecompositionFactory_DDRM] operations and
- * [DMatrixRMaj] matrices.
- */
-public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrixRMaj>() {
-    /**
-     * The [DoubleField] reference.
-     */
-    public override val elementAlgebra: DoubleField get() = DoubleField
-
-    @Suppress("UNCHECKED_CAST")
-    public override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixRMaj> = when {
-        this is EjmlDoubleMatrix<*> && origin is DMatrixRMaj -> this as EjmlDoubleMatrix<DMatrixRMaj>
-        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    public override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixRMaj> = when {
-        this is EjmlDoubleVector<*> && origin is DMatrixRMaj -> this as EjmlDoubleVector<DMatrixRMaj>
-        else -> EjmlDoubleVector(DMatrixRMaj(size, 1).also {
-            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
-        })
-    }
-
-    public override fun buildMatrix(
-        rows: Int,
-        columns: Int,
-        initializer: DoubleField.(i: Int, j: Int) -> Double,
-    ): EjmlDoubleMatrix<DMatrixRMaj> = DMatrixRMaj(rows, columns).also {
-        (0 until rows).forEach { row ->
-            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
-        }
-    }.wrapMatrix()
-
-    public override fun buildVector(
-        size: Int,
-        initializer: DoubleField.(Int) -> Double,
-    ): EjmlDoubleVector<DMatrixRMaj> = EjmlDoubleVector(DMatrixRMaj(size, 1).also {
-        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
-    })
-
-    private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
-    private fun <T : DMatrix> T.wrapVector() = EjmlDoubleVector(this)
-
-    public override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
-
-    public override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.mult(toEjml().origin, other.toEjml().origin, out)
-        return out.wrapMatrix()
-    }
-
-    public override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.mult(toEjml().origin, vector.toEjml().origin, out)
-        return out.wrapVector()
-    }
-
-    public override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-
-        CommonOps_DDRM.add(
-            elementAlgebra.one, 
-            toEjml().origin, 
-            elementAlgebra { -one },
-            other.toEjml().origin, 
-            out,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    public override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixRMaj> {
-        val res = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.scale(value, toEjml().origin, res)
-        return res.wrapMatrix()
-    }
-
-    public override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixRMaj> {
-        val res = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.changeSign(toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    public override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-        
-        CommonOps_DDRM.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin, 
-            out,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    public override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-
-        CommonOps_DDRM.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin,
-            out,
-        )
-
-        return out.wrapVector()
-    }
-
-    public override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-
-        CommonOps_DDRM.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra { -one },
-            other.toEjml().origin,
-            out,
-        )
-
-        return out.wrapVector()
-    }
-
-    public override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> = m * this
-
-    public override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixRMaj> {
-        val res = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.scale(value, toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    public override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixRMaj> = v * this
-
-    @UnstableKMathAPI
-    public override fun <F : StructureFeature> getFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
-        structure.getFeature(type)?.let { return it }
-        val origin = structure.toEjml().origin
-
-        return when (type) {
-            InverseMatrixFeature::class -> object : InverseMatrixFeature<Double> {
-                override val inverse: Matrix<Double> by lazy {
-                    val res = origin.copy()
-                    CommonOps_DDRM.invert(res)
-                    res.wrapMatrix()
-                }
-            }
-
-            DeterminantFeature::class -> object : DeterminantFeature<Double> {
-                override val determinant: Double by lazy { CommonOps_DDRM.det(origin) }
-            }
-
-            SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<Double> {
-                private val svd by lazy {
-                    DecompositionFactory_DDRM.svd(origin.numRows, origin.numCols, true, true, false)
-                        .apply { decompose(origin.copy()) }
-                }
-
-                override val u: Matrix<Double> by lazy { svd.getU(null, false).wrapMatrix() }
-                override val s: Matrix<Double> by lazy { svd.getW(null).wrapMatrix() }
-                override val v: Matrix<Double> by lazy { svd.getV(null, false).wrapMatrix() }
-                override val singularValues: Point<Double> by lazy { DoubleBuffer(svd.singularValues) }
-            }
-
-            QRDecompositionFeature::class -> object : QRDecompositionFeature<Double> {
-                private val qr by lazy {
-                    DecompositionFactory_DDRM.qr().apply { decompose(origin.copy()) }
-                }
-
-                override val q: Matrix<Double> by lazy {
-                    qr.getQ(null, false).wrapMatrix() + OrthogonalFeature
-                }
-
-                override val r: Matrix<Double> by lazy { qr.getR(null, false).wrapMatrix() + UFeature }
-            }
-
-            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Double> {
-                override val l: Matrix<Double> by lazy {
-                    val cholesky =
-                        DecompositionFactory_DDRM.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
-
-                    cholesky.getT(null).wrapMatrix() + LFeature
-                }
-            }
-
-            LupDecompositionFeature::class -> object : LupDecompositionFeature<Double> {
-                private val lup by lazy {
-                    DecompositionFactory_DDRM.lu(origin.numRows, origin.numCols).apply { decompose(origin.copy()) }
-                }
-
-                override val l: Matrix<Double> by lazy {
-                    lup.getLower(null).wrapMatrix() + LFeature
-                }
-
-                override val u: Matrix<Double> by lazy {
-                    lup.getUpper(null).wrapMatrix() + UFeature
-                }
-
-                override val p: Matrix<Double> by lazy { lup.getRowPivot(null).wrapMatrix() }
-            }
-
-            else -> null
-        }?.let(type::cast)
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p matrix.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Double>, b: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
-        val res = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
-        return res.wrapMatrix()
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p vector.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Double>, b: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
-        val res = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
-        return EjmlDoubleVector(res)
-    }
-}
-
-/**
- * [EjmlLinearSpace] implementation based on [CommonOps_FDRM], [DecompositionFactory_FDRM] operations and
- * [FMatrixRMaj] matrices.
- */
-public object EjmlLinearSpaceFDRM : EjmlLinearSpace<Float, FloatField, FMatrixRMaj>() {
-    /**
-     * The [FloatField] reference.
-     */
-    public override val elementAlgebra: FloatField get() = FloatField
-
-    @Suppress("UNCHECKED_CAST")
-    public override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixRMaj> = when {
-        this is EjmlFloatMatrix<*> && origin is FMatrixRMaj -> this as EjmlFloatMatrix<FMatrixRMaj>
-        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    public override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixRMaj> = when {
-        this is EjmlFloatVector<*> && origin is FMatrixRMaj -> this as EjmlFloatVector<FMatrixRMaj>
-        else -> EjmlFloatVector(FMatrixRMaj(size, 1).also {
-            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
-        })
-    }
-
-    public override fun buildMatrix(
-        rows: Int,
-        columns: Int,
-        initializer: FloatField.(i: Int, j: Int) -> Float,
-    ): EjmlFloatMatrix<FMatrixRMaj> = FMatrixRMaj(rows, columns).also {
-        (0 until rows).forEach { row ->
-            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
-        }
-    }.wrapMatrix()
-
-    public override fun buildVector(
-        size: Int,
-        initializer: FloatField.(Int) -> Float,
-    ): EjmlFloatVector<FMatrixRMaj> = EjmlFloatVector(FMatrixRMaj(size, 1).also {
-        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
-    })
-
-    private fun <T : FMatrix> T.wrapMatrix() = EjmlFloatMatrix(this)
-    private fun <T : FMatrix> T.wrapVector() = EjmlFloatVector(this)
-
-    public override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
-
-    public override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
-        val out = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.mult(toEjml().origin, other.toEjml().origin, out)
-        return out.wrapMatrix()
-    }
-
-    public override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
-        val out = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.mult(toEjml().origin, vector.toEjml().origin, out)
-        return out.wrapVector()
-    }
-
-    public override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
-        val out = FMatrixRMaj(1, 1)
-
-        CommonOps_FDRM.add(
-            elementAlgebra.one, 
-            toEjml().origin, 
-            elementAlgebra { -one },
-            other.toEjml().origin, 
-            out,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    public override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixRMaj> {
-        val res = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.scale(value, toEjml().origin, res)
-        return res.wrapMatrix()
-    }
-
-    public override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixRMaj> {
-        val res = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.changeSign(toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    public override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
-        val out = FMatrixRMaj(1, 1)
-        
-        CommonOps_FDRM.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin, 
-            out,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    public override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
-        val out = FMatrixRMaj(1, 1)
-
-        CommonOps_FDRM.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin,
-            out,
-        )
-
-        return out.wrapVector()
-    }
-
-    public override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
-        val out = FMatrixRMaj(1, 1)
-
-        CommonOps_FDRM.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra { -one },
-            other.toEjml().origin,
-            out,
-        )
-
-        return out.wrapVector()
-    }
-
-    public override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> = m * this
-
-    public override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixRMaj> {
-        val res = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.scale(value, toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    public override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixRMaj> = v * this
-
-    @UnstableKMathAPI
-    public override fun <F : StructureFeature> getFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
-        structure.getFeature(type)?.let { return it }
-        val origin = structure.toEjml().origin
-
-        return when (type) {
-            InverseMatrixFeature::class -> object : InverseMatrixFeature<Float> {
-                override val inverse: Matrix<Float> by lazy {
-                    val res = origin.copy()
-                    CommonOps_FDRM.invert(res)
-                    res.wrapMatrix()
-                }
-            }
-
-            DeterminantFeature::class -> object : DeterminantFeature<Float> {
-                override val determinant: Float by lazy { CommonOps_FDRM.det(origin) }
-            }
-
-            SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<Float> {
-                private val svd by lazy {
-                    DecompositionFactory_FDRM.svd(origin.numRows, origin.numCols, true, true, false)
-                        .apply { decompose(origin.copy()) }
-                }
-
-                override val u: Matrix<Float> by lazy { svd.getU(null, false).wrapMatrix() }
-                override val s: Matrix<Float> by lazy { svd.getW(null).wrapMatrix() }
-                override val v: Matrix<Float> by lazy { svd.getV(null, false).wrapMatrix() }
-                override val singularValues: Point<Float> by lazy { FloatBuffer(svd.singularValues) }
-            }
-
-            QRDecompositionFeature::class -> object : QRDecompositionFeature<Float> {
-                private val qr by lazy {
-                    DecompositionFactory_FDRM.qr().apply { decompose(origin.copy()) }
-                }
-
-                override val q: Matrix<Float> by lazy {
-                    qr.getQ(null, false).wrapMatrix() + OrthogonalFeature
-                }
-
-                override val r: Matrix<Float> by lazy { qr.getR(null, false).wrapMatrix() + UFeature }
-            }
-
-            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Float> {
-                override val l: Matrix<Float> by lazy {
-                    val cholesky =
-                        DecompositionFactory_FDRM.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
-
-                    cholesky.getT(null).wrapMatrix() + LFeature
-                }
-            }
-
-            LupDecompositionFeature::class -> object : LupDecompositionFeature<Float> {
-                private val lup by lazy {
-                    DecompositionFactory_FDRM.lu(origin.numRows, origin.numCols).apply { decompose(origin.copy()) }
-                }
-
-                override val l: Matrix<Float> by lazy {
-                    lup.getLower(null).wrapMatrix() + LFeature
-                }
-
-                override val u: Matrix<Float> by lazy {
-                    lup.getUpper(null).wrapMatrix() + UFeature
-                }
-
-                override val p: Matrix<Float> by lazy { lup.getRowPivot(null).wrapMatrix() }
-            }
-
-            else -> null
-        }?.let(type::cast)
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p matrix.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Float>, b: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
-        val res = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.solve(FMatrixRMaj(a.toEjml().origin), FMatrixRMaj(b.toEjml().origin), res)
-        return res.wrapMatrix()
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p vector.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Float>, b: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
-        val res = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.solve(FMatrixRMaj(a.toEjml().origin), FMatrixRMaj(b.toEjml().origin), res)
-        return EjmlFloatVector(res)
-    }
-}
-
-/**
- * [EjmlLinearSpace] implementation based on [CommonOps_DSCC], [DecompositionFactory_DSCC] operations and
- * [DMatrixSparseCSC] matrices.
- */
-public object EjmlLinearSpaceDSCC : EjmlLinearSpace<Double, DoubleField, DMatrixSparseCSC>() {
-    /**
-     * The [DoubleField] reference.
-     */
-    public override val elementAlgebra: DoubleField get() = DoubleField
-
-    @Suppress("UNCHECKED_CAST")
-    public override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixSparseCSC> = when {
-        this is EjmlDoubleMatrix<*> && origin is DMatrixSparseCSC -> this as EjmlDoubleMatrix<DMatrixSparseCSC>
-        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    public override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixSparseCSC> = when {
-        this is EjmlDoubleVector<*> && origin is DMatrixSparseCSC -> this as EjmlDoubleVector<DMatrixSparseCSC>
-        else -> EjmlDoubleVector(DMatrixSparseCSC(size, 1).also {
-            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
-        })
-    }
-
-    public override fun buildMatrix(
-        rows: Int,
-        columns: Int,
-        initializer: DoubleField.(i: Int, j: Int) -> Double,
-    ): EjmlDoubleMatrix<DMatrixSparseCSC> = DMatrixSparseCSC(rows, columns).also {
-        (0 until rows).forEach { row ->
-            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
-        }
-    }.wrapMatrix()
-
-    public override fun buildVector(
-        size: Int,
-        initializer: DoubleField.(Int) -> Double,
-    ): EjmlDoubleVector<DMatrixSparseCSC> = EjmlDoubleVector(DMatrixSparseCSC(size, 1).also {
-        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
-    })
-
-    private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
-    private fun <T : DMatrix> T.wrapVector() = EjmlDoubleVector(this)
-
-    public override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
-
-    public override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
-        val out = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.mult(toEjml().origin, other.toEjml().origin, out)
-        return out.wrapMatrix()
-    }
-
-    public override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
-        val out = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.mult(toEjml().origin, vector.toEjml().origin, out)
-        return out.wrapVector()
-    }
-
-    public override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
-        val out = DMatrixSparseCSC(1, 1)
-
-        CommonOps_DSCC.add(
-            elementAlgebra.one, 
-            toEjml().origin, 
-            elementAlgebra { -one },
-            other.toEjml().origin, 
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    public override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixSparseCSC> {
-        val res = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.scale(value, toEjml().origin, res)
-        return res.wrapMatrix()
-    }
-
-    public override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixSparseCSC> {
-        val res = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.changeSign(toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    public override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
-        val out = DMatrixSparseCSC(1, 1)
-        
-        CommonOps_DSCC.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin, 
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    public override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
-        val out = DMatrixSparseCSC(1, 1)
-
-        CommonOps_DSCC.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin,
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapVector()
-    }
-
-    public override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
-        val out = DMatrixSparseCSC(1, 1)
-
-        CommonOps_DSCC.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra { -one },
-            other.toEjml().origin,
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapVector()
-    }
-
-    public override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> = m * this
-
-    public override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixSparseCSC> {
-        val res = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.scale(value, toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    public override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> = v * this
-
-    @UnstableKMathAPI
-    public override fun <F : StructureFeature> getFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
-        structure.getFeature(type)?.let { return it }
-        val origin = structure.toEjml().origin
-
-        return when (type) {
-            QRDecompositionFeature::class -> object : QRDecompositionFeature<Double> {
-                private val qr by lazy {
-                    DecompositionFactory_DSCC.qr(FillReducing.NONE).apply { decompose(origin.copy()) }
-                }
-
-                override val q: Matrix<Double> by lazy {
-                    qr.getQ(null, false).wrapMatrix() + OrthogonalFeature
-                }
-
-                override val r: Matrix<Double> by lazy { qr.getR(null, false).wrapMatrix() + UFeature }
-            }
-
-            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Double> {
-                override val l: Matrix<Double> by lazy {
-                    val cholesky =
-                        DecompositionFactory_DSCC.cholesky().apply { decompose(origin.copy()) }
-
-                    (cholesky.getT(null) as DMatrix).wrapMatrix() + LFeature
-                }
-            }
-
-            LUDecompositionFeature::class, DeterminantFeature::class, InverseMatrixFeature::class -> object :
-                LUDecompositionFeature<Double>, DeterminantFeature<Double>, InverseMatrixFeature<Double> {
-                private val lu by lazy {
-                    DecompositionFactory_DSCC.lu(FillReducing.NONE).apply { decompose(origin.copy()) }
-                }
-
-                override val l: Matrix<Double> by lazy {
-                    lu.getLower(null).wrapMatrix() + LFeature
-                }
-
-                override val u: Matrix<Double> by lazy {
-                    lu.getUpper(null).wrapMatrix() + UFeature
-                }
-
-                override val inverse: Matrix<Double> by lazy {
-                    var a = origin
-                    val inverse = DMatrixRMaj(1, 1)
-                    val solver = LinearSolverFactory_DSCC.lu(FillReducing.NONE)
-                    if (solver.modifiesA()) a = a.copy()
-                    val i = CommonOps_DDRM.identity(a.numRows)
-                    solver.solve(i, inverse)
-                    inverse.wrapMatrix()
-                }
-
-                override val determinant: Double by lazy { elementAlgebra.number(lu.computeDeterminant().real) }
-            }
-
-            else -> null
-        }?.let(type::cast)
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p matrix.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Double>, b: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
-        val res = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.solve(DMatrixSparseCSC(a.toEjml().origin), DMatrixSparseCSC(b.toEjml().origin), res)
-        return res.wrapMatrix()
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p vector.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Double>, b: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
-        val res = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.solve(DMatrixSparseCSC(a.toEjml().origin), DMatrixSparseCSC(b.toEjml().origin), res)
-        return EjmlDoubleVector(res)
-    }
-}
-
-/**
- * [EjmlLinearSpace] implementation based on [CommonOps_FSCC], [DecompositionFactory_FSCC] operations and
- * [FMatrixSparseCSC] matrices.
- */
-public object EjmlLinearSpaceFSCC : EjmlLinearSpace<Float, FloatField, FMatrixSparseCSC>() {
-    /**
-     * The [FloatField] reference.
-     */
-    public override val elementAlgebra: FloatField get() = FloatField
-
-    @Suppress("UNCHECKED_CAST")
-    public override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixSparseCSC> = when {
-        this is EjmlFloatMatrix<*> && origin is FMatrixSparseCSC -> this as EjmlFloatMatrix<FMatrixSparseCSC>
-        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    public override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixSparseCSC> = when {
-        this is EjmlFloatVector<*> && origin is FMatrixSparseCSC -> this as EjmlFloatVector<FMatrixSparseCSC>
-        else -> EjmlFloatVector(FMatrixSparseCSC(size, 1).also {
-            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
-        })
-    }
-
-    public override fun buildMatrix(
-        rows: Int,
-        columns: Int,
-        initializer: FloatField.(i: Int, j: Int) -> Float,
-    ): EjmlFloatMatrix<FMatrixSparseCSC> = FMatrixSparseCSC(rows, columns).also {
-        (0 until rows).forEach { row ->
-            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
-        }
-    }.wrapMatrix()
-
-    public override fun buildVector(
-        size: Int,
-        initializer: FloatField.(Int) -> Float,
-    ): EjmlFloatVector<FMatrixSparseCSC> = EjmlFloatVector(FMatrixSparseCSC(size, 1).also {
-        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
-    })
-
-    private fun <T : FMatrix> T.wrapMatrix() = EjmlFloatMatrix(this)
-    private fun <T : FMatrix> T.wrapVector() = EjmlFloatVector(this)
-
-    public override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
-
-    public override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
-        val out = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.mult(toEjml().origin, other.toEjml().origin, out)
-        return out.wrapMatrix()
-    }
-
-    public override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
-        val out = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.mult(toEjml().origin, vector.toEjml().origin, out)
-        return out.wrapVector()
-    }
-
-    public override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
-        val out = FMatrixSparseCSC(1, 1)
-
-        CommonOps_FSCC.add(
-            elementAlgebra.one, 
-            toEjml().origin, 
-            elementAlgebra { -one },
-            other.toEjml().origin, 
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    public override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixSparseCSC> {
-        val res = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.scale(value, toEjml().origin, res)
-        return res.wrapMatrix()
-    }
-
-    public override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixSparseCSC> {
-        val res = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.changeSign(toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    public override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
-        val out = FMatrixSparseCSC(1, 1)
-        
-        CommonOps_FSCC.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin, 
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    public override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
-        val out = FMatrixSparseCSC(1, 1)
-
-        CommonOps_FSCC.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin,
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapVector()
-    }
-
-    public override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
-        val out = FMatrixSparseCSC(1, 1)
-
-        CommonOps_FSCC.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra { -one },
-            other.toEjml().origin,
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapVector()
-    }
-
-    public override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> = m * this
-
-    public override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixSparseCSC> {
-        val res = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.scale(value, toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    public override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> = v * this
-
-    @UnstableKMathAPI
-    public override fun <F : StructureFeature> getFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
-        structure.getFeature(type)?.let { return it }
-        val origin = structure.toEjml().origin
-
-        return when (type) {
-            QRDecompositionFeature::class -> object : QRDecompositionFeature<Float> {
-                private val qr by lazy {
-                    DecompositionFactory_FSCC.qr(FillReducing.NONE).apply { decompose(origin.copy()) }
-                }
-
-                override val q: Matrix<Float> by lazy {
-                    qr.getQ(null, false).wrapMatrix() + OrthogonalFeature
-                }
-
-                override val r: Matrix<Float> by lazy { qr.getR(null, false).wrapMatrix() + UFeature }
-            }
-
-            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Float> {
-                override val l: Matrix<Float> by lazy {
-                    val cholesky =
-                        DecompositionFactory_FSCC.cholesky().apply { decompose(origin.copy()) }
-
-                    (cholesky.getT(null) as FMatrix).wrapMatrix() + LFeature
-                }
-            }
-
-            LUDecompositionFeature::class, DeterminantFeature::class, InverseMatrixFeature::class -> object :
-                LUDecompositionFeature<Float>, DeterminantFeature<Float>, InverseMatrixFeature<Float> {
-                private val lu by lazy {
-                    DecompositionFactory_FSCC.lu(FillReducing.NONE).apply { decompose(origin.copy()) }
-                }
-
-                override val l: Matrix<Float> by lazy {
-                    lu.getLower(null).wrapMatrix() + LFeature
-                }
-
-                override val u: Matrix<Float> by lazy {
-                    lu.getUpper(null).wrapMatrix() + UFeature
-                }
-
-                override val inverse: Matrix<Float> by lazy {
-                    var a = origin
-                    val inverse = FMatrixRMaj(1, 1)
-                    val solver = LinearSolverFactory_FSCC.lu(FillReducing.NONE)
-                    if (solver.modifiesA()) a = a.copy()
-                    val i = CommonOps_FDRM.identity(a.numRows)
-                    solver.solve(i, inverse)
-                    inverse.wrapMatrix()
-                }
-
-                override val determinant: Float by lazy { elementAlgebra.number(lu.computeDeterminant().real) }
-            }
-
-            else -> null
-        }?.let(type::cast)
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p matrix.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Float>, b: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
-        val res = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.solve(FMatrixSparseCSC(a.toEjml().origin), FMatrixSparseCSC(b.toEjml().origin), res)
-        return res.wrapMatrix()
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p vector.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Float>, b: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
-        val res = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.solve(FMatrixSparseCSC(a.toEjml().origin), FMatrixSparseCSC(b.toEjml().origin), res)
-        return EjmlFloatVector(res)
-    }
-}
-
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
index 50675bdac..6055ae1d8 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
@@ -11,7 +11,7 @@ import org.ejml.dense.row.RandomMatrices_DDRM
 import org.ejml.dense.row.factory.DecompositionFactory_DDRM
 import space.kscience.kmath.linear.DeterminantFeature
 import space.kscience.kmath.linear.LupDecompositionFeature
-import space.kscience.kmath.linear.getFeature
+import space.kscience.kmath.linear.computeFeature
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
@@ -59,9 +59,9 @@ internal class EjmlMatrixTest {
     fun features() {
         val m = randomMatrix
         val w = EjmlDoubleMatrix(m)
-        val det: DeterminantFeature<Double> = EjmlLinearSpaceDDRM.getFeature(w) ?: fail()
+        val det: DeterminantFeature<Double> = EjmlLinearSpaceDDRM.computeFeature(w) ?: fail()
         assertEquals(CommonOps_DDRM.det(m), det.determinant)
-        val lup: LupDecompositionFeature<Double> = EjmlLinearSpaceDDRM.getFeature(w) ?: fail()
+        val lup: LupDecompositionFeature<Double> = EjmlLinearSpaceDDRM.computeFeature(w) ?: fail()
 
         val ludecompositionF64 = DecompositionFactory_DDRM.lu(m.numRows, m.numCols)
             .also { it.decompose(m.copy()) }
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
index 8023236ea..38e5b4beb 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
@@ -32,18 +32,18 @@ import kotlin.math.pow
 public typealias RealMatrix = Matrix<Double>
 
 public fun realMatrix(rowNum: Int, colNum: Int, initializer: DoubleField.(i: Int, j: Int) -> Double): RealMatrix =
-    LinearSpace.real.buildMatrix(rowNum, colNum, initializer)
+    LinearSpace.double.buildMatrix(rowNum, colNum, initializer)
 
 @OptIn(UnstableKMathAPI::class)
 public fun realMatrix(rowNum: Int, colNum: Int): MatrixBuilder<Double, DoubleField> =
-    LinearSpace.real.matrix(rowNum, colNum)
+    LinearSpace.double.matrix(rowNum, colNum)
 
 public fun Array<DoubleArray>.toMatrix(): RealMatrix {
-    return LinearSpace.real.buildMatrix(size, this[0].size) { row, col -> this@toMatrix[row][col] }
+    return LinearSpace.double.buildMatrix(size, this[0].size) { row, col -> this@toMatrix[row][col] }
 }
 
 public fun Sequence<DoubleArray>.toMatrix(): RealMatrix = toList().let {
-    LinearSpace.real.buildMatrix(it.size, it[0].size) { row, col -> it[row][col] }
+    LinearSpace.double.buildMatrix(it.size, it[0].size) { row, col -> it[row][col] }
 }
 
 public fun RealMatrix.repeatStackVertical(n: Int): RealMatrix =
@@ -56,37 +56,37 @@ public fun RealMatrix.repeatStackVertical(n: Int): RealMatrix =
  */
 
 public operator fun RealMatrix.times(double: Double): RealMatrix =
-    LinearSpace.real.buildMatrix(rowNum, colNum) { row, col ->
+    LinearSpace.double.buildMatrix(rowNum, colNum) { row, col ->
         get(row, col) * double
     }
 
 public operator fun RealMatrix.plus(double: Double): RealMatrix =
-    LinearSpace.real.buildMatrix(rowNum, colNum) { row, col ->
+    LinearSpace.double.buildMatrix(rowNum, colNum) { row, col ->
         get(row, col) + double
     }
 
 public operator fun RealMatrix.minus(double: Double): RealMatrix =
-    LinearSpace.real.buildMatrix(rowNum, colNum) { row, col ->
+    LinearSpace.double.buildMatrix(rowNum, colNum) { row, col ->
         get(row, col) - double
     }
 
 public operator fun RealMatrix.div(double: Double): RealMatrix =
-    LinearSpace.real.buildMatrix(rowNum, colNum) { row, col ->
+    LinearSpace.double.buildMatrix(rowNum, colNum) { row, col ->
         get(row, col) / double
     }
 
 public operator fun Double.times(matrix: RealMatrix): RealMatrix =
-    LinearSpace.real.buildMatrix(matrix.rowNum, matrix.colNum) { row, col ->
+    LinearSpace.double.buildMatrix(matrix.rowNum, matrix.colNum) { row, col ->
         this@times * matrix[row, col]
     }
 
 public operator fun Double.plus(matrix: RealMatrix): RealMatrix =
-    LinearSpace.real.buildMatrix(matrix.rowNum, matrix.colNum) { row, col ->
+    LinearSpace.double.buildMatrix(matrix.rowNum, matrix.colNum) { row, col ->
         this@plus + matrix[row, col]
     }
 
 public operator fun Double.minus(matrix: RealMatrix): RealMatrix =
-    LinearSpace.real.buildMatrix(matrix.rowNum, matrix.colNum) { row, col ->
+    LinearSpace.double.buildMatrix(matrix.rowNum, matrix.colNum) { row, col ->
         this@minus - matrix[row, col]
     }
 
@@ -101,20 +101,20 @@ public operator fun Double.minus(matrix: RealMatrix): RealMatrix =
 
 @UnstableKMathAPI
 public operator fun RealMatrix.times(other: RealMatrix): RealMatrix =
-    LinearSpace.real.buildMatrix(rowNum, colNum) { row, col -> this@times[row, col] * other[row, col] }
+    LinearSpace.double.buildMatrix(rowNum, colNum) { row, col -> this@times[row, col] * other[row, col] }
 
 public operator fun RealMatrix.plus(other: RealMatrix): RealMatrix =
-    LinearSpace.real.run { this@plus + other }
+    LinearSpace.double.run { this@plus + other }
 
 public operator fun RealMatrix.minus(other: RealMatrix): RealMatrix =
-    LinearSpace.real.buildMatrix(rowNum, colNum) { row, col -> this@minus[row, col] - other[row, col] }
+    LinearSpace.double.buildMatrix(rowNum, colNum) { row, col -> this@minus[row, col] - other[row, col] }
 
 /*
  *  Operations on columns
  */
 
 public inline fun RealMatrix.appendColumn(crossinline mapper: (Buffer<Double>) -> Double): RealMatrix =
-    LinearSpace.real.buildMatrix(rowNum, colNum + 1) { row, col ->
+    LinearSpace.double.buildMatrix(rowNum, colNum + 1) { row, col ->
         if (col < colNum)
             get(row, col)
         else
@@ -122,7 +122,7 @@ public inline fun RealMatrix.appendColumn(crossinline mapper: (Buffer<Double>) -
     }
 
 public fun RealMatrix.extractColumns(columnRange: IntRange): RealMatrix =
-    LinearSpace.real.buildMatrix(rowNum, columnRange.count()) { row, col ->
+    LinearSpace.double.buildMatrix(rowNum, columnRange.count()) { row, col ->
         this@extractColumns[row, columnRange.first + col]
     }
 
@@ -155,14 +155,14 @@ public fun RealMatrix.max(): Double? = elements().map { (_, value) -> value }.ma
 public fun RealMatrix.average(): Double = elements().map { (_, value) -> value }.average()
 
 public inline fun RealMatrix.map(crossinline transform: (Double) -> Double): RealMatrix =
-    LinearSpace.real.buildMatrix(rowNum, colNum) { i, j ->
+    LinearSpace.double.buildMatrix(rowNum, colNum) { i, j ->
         transform(get(i, j))
     }
 
 /**
  * Inverse a square real matrix using LUP decomposition
  */
-public fun RealMatrix.inverseWithLup(): RealMatrix = LinearSpace.real.inverseWithLup(this)
+public fun RealMatrix.inverseWithLup(): RealMatrix = LinearSpace.double.lupSolver().inverse(this)
 
 //extended operations
 
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
index b79e5030c..395c94838 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
@@ -12,6 +12,6 @@ import space.kscience.kmath.linear.Matrix
 /**
  * Optimized dot product for real matrices
  */
-public infix fun Matrix<Double>.dot(other: Matrix<Double>): Matrix<Double> = LinearSpace.real.run {
+public infix fun Matrix<Double>.dot(other: Matrix<Double>): Matrix<Double> = LinearSpace.double.run {
     this@dot dot other
 }
\ No newline at end of file
diff --git a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt b/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt
index b3e129c2e..5a80ee677 100644
--- a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt
@@ -65,7 +65,7 @@ internal class DoubleMatrixTest {
             4.0, 6.0, 2.0
         )
         val matrix2 = (matrix1 * 2.5 + 1.0 - 2.0) / 2.0
-        val expectedResult = LinearSpace.real.matrix(2, 3)(
+        val expectedResult = LinearSpace.double.matrix(2, 3)(
             0.75, -0.5, 3.25,
             4.5, 7.0, 2.0
         )
@@ -160,7 +160,7 @@ internal class DoubleMatrixTest {
 
     @Test
     fun testAllElementOperations() {
-        val matrix1 = LinearSpace.real.matrix(2, 4)(
+        val matrix1 = LinearSpace.double.matrix(2, 4)(
             -1.0, 0.0, 3.0, 15.0,
             4.0, -6.0, 7.0, -11.0
         )
diff --git a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleVectorTest.kt b/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleVectorTest.kt
index 9de54381c..ec7b536ba 100644
--- a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleVectorTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleVectorTest.kt
@@ -35,7 +35,7 @@ internal class DoubleVectorTest {
         val vector2 = DoubleBuffer(5) { 5 - it.toDouble() }
         val matrix1 = vector1.asMatrix()
         val matrix2 = vector2.asMatrix().transpose()
-        val product = LinearSpace.real.run { matrix1 dot matrix2 }
+        val product = LinearSpace.double.run { matrix1 dot matrix2 }
         assertEquals(5.0, product[1, 0])
         assertEquals(6.0, product[2, 2])
     }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
index dcf711c3b..f90159c81 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
@@ -5,11 +5,12 @@
 
 package space.kscience.kmath.integration
 
+import space.kscience.kmath.misc.Feature
 import space.kscience.kmath.misc.FeatureSet
 import space.kscience.kmath.misc.Featured
 import kotlin.reflect.KClass
 
-public interface IntegrandFeature {
+public interface IntegrandFeature : Feature<IntegrandFeature> {
     override fun toString(): String
 }
 
@@ -18,7 +19,7 @@ public interface Integrand : Featured<IntegrandFeature> {
     override fun <T : IntegrandFeature> getFeature(type: KClass<out T>): T? = features.getFeature(type)
 }
 
-public inline fun <reified T: IntegrandFeature> Integrand.getFeature(): T? = getFeature(T::class)
+public inline fun <reified T : IntegrandFeature> Integrand.getFeature(): T? = getFeature(T::class)
 
 public class IntegrandValue<T : Any>(public val value: T) : IntegrandFeature {
     override fun toString(): String = "Value($value)"
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
index 4294462c0..a59c301cf 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
@@ -27,19 +27,30 @@ public class KotlingradExpression<T : Number, A : NumericAlgebra<T>>(
 ) : SpecialDifferentiableExpression<T, KotlingradExpression<T, A>> {
     public override fun invoke(arguments: Map<Symbol, T>): T = mst.interpret(algebra, arguments)
 
-    public override fun derivativeOrNull(symbols: List<Symbol>): KotlingradExpression<T, A> =
-        KotlingradExpression(
-            algebra,
-            symbols.map(Symbol::identity)
-                .map(MstNumericAlgebra::bindSymbol)
-                .map<Symbol, SVar<KMathNumber<T, A>>>(Symbol::toSVar)
-                .fold(mst.toSFun(), SFun<KMathNumber<T, A>>::d)
-                .toMst(),
-        )
+    public override fun derivativeOrNull(
+        symbols: List<Symbol>,
+    ): KotlingradExpression<T, A> = KotlingradExpression(
+        algebra,
+        symbols.map(Symbol::identity)
+            .map(MstNumericAlgebra::bindSymbol)
+            .map<Symbol, SVar<KMathNumber<T, A>>>(Symbol::toSVar)
+            .fold(mst.toSFun(), SFun<KMathNumber<T, A>>::d)
+            .toMst(),
+    )
+}
+
+/**
+ * A diff processor using [MST] to Kotlingrad converter
+ */
+public class KotlingradProcessor<T : Number, A : NumericAlgebra<T>>(
+    public val algebra: A,
+) : AutoDiffProcessor<T, MST, MstExtendedField> {
+    override fun differentiate(function: MstExtendedField.() -> MST): DifferentiableExpression<T> =
+        MstExtendedField.function().toKotlingradExpression(algebra)
 }
 
 /**
  * Wraps this [MST] into [KotlingradExpression].
  */
-public fun <T : Number, A : NumericAlgebra<T>> MST.toDiffExpression(algebra: A): KotlingradExpression<T, A> =
+public fun <T : Number, A : NumericAlgebra<T>> MST.toKotlingradExpression(algebra: A): KotlingradExpression<T, A> =
     KotlingradExpression(algebra, this)
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
index 62288242a..4d4f99b71 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
@@ -23,7 +23,7 @@ public enum class FunctionOptimizationTarget : OptimizationFeature {
 public class FunctionOptimization<T>(
     override val features: FeatureSet<OptimizationFeature>,
     public val expression: DifferentiableExpression<T>,
-) : OptimizationProblem{
+) : OptimizationProblem<T>{
 
     public companion object{
         /**
@@ -56,7 +56,6 @@ public class FunctionOptimization<T>(
     }
 }
 
-
 public fun <T> FunctionOptimization<T>.withFeatures(
     vararg newFeature: OptimizationFeature,
 ): FunctionOptimization<T> = FunctionOptimization(
@@ -68,7 +67,7 @@ public fun <T> FunctionOptimization<T>.withFeatures(
  * Optimize differentiable expression using specific [optimizer] form given [startingPoint]
  */
 public suspend fun <T : Any> DifferentiableExpression<T>.optimizeWith(
-    optimizer: Optimizer<FunctionOptimization<T>>,
+    optimizer: Optimizer<T, FunctionOptimization<T>>,
     startingPoint: Map<Symbol, T>,
     vararg features: OptimizationFeature,
 ): FunctionOptimization<T> {
@@ -76,3 +75,8 @@ public suspend fun <T : Any> DifferentiableExpression<T>.optimizeWith(
     return optimizer.optimize(problem)
 }
 
+public val <T> FunctionOptimization<T>.resultValueOrNull:T?
+    get() = getFeature<OptimizationResult<T>>()?.point?.let { expression(it) }
+
+public val <T> FunctionOptimization<T>.resultValue: T
+    get() = resultValueOrNull ?: error("Result is not present in $this")
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
new file mode 100644
index 000000000..7d52ae26e
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.optimization
+
+import space.kscience.kmath.data.XYColumnarData
+import space.kscience.kmath.expressions.DifferentiableExpression
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.misc.FeatureSet
+
+public abstract class OptimizationBuilder<T, R : OptimizationProblem<T>> {
+    public val features: ArrayList<OptimizationFeature> = ArrayList()
+
+    public fun addFeature(feature: OptimizationFeature) {
+        features.add(feature)
+    }
+
+    public inline fun <reified T : OptimizationFeature> updateFeature(update: (T?) -> T) {
+        val existing = features.find { it.key == T::class } as? T
+        val new = update(existing)
+        if (existing != null) {
+            features.remove(existing)
+        }
+        addFeature(new)
+    }
+
+    public abstract fun build(): R
+}
+
+public fun <T> OptimizationBuilder<T, *>.startAt(startingPoint: Map<Symbol, T>) {
+    addFeature(OptimizationStartPoint(startingPoint))
+}
+
+public class FunctionOptimizationBuilder<T>(
+    private val expression: DifferentiableExpression<T>,
+) : OptimizationBuilder<T, FunctionOptimization<T>>() {
+    override fun build(): FunctionOptimization<T> = FunctionOptimization(FeatureSet.of(features), expression)
+}
+
+public fun <T> FunctionOptimization(
+    expression: DifferentiableExpression<T>,
+    builder: FunctionOptimizationBuilder<T>.() -> Unit,
+): FunctionOptimization<T> = FunctionOptimizationBuilder(expression).apply(builder).build()
+
+public suspend fun <T> DifferentiableExpression<T>.optimizeWith(
+    optimizer: Optimizer<T, FunctionOptimization<T>>,
+    startingPoint: Map<Symbol, T>,
+    builder: FunctionOptimizationBuilder<T>.() -> Unit = {},
+): FunctionOptimization<T> {
+    val problem = FunctionOptimization<T>(this) {
+        startAt(startingPoint)
+        builder()
+    }
+    return optimizer.optimize(problem)
+}
+
+public suspend fun <T> DifferentiableExpression<T>.optimizeWith(
+    optimizer: Optimizer<T, FunctionOptimization<T>>,
+    vararg startingPoint: Pair<Symbol, T>,
+    builder: FunctionOptimizationBuilder<T>.() -> Unit = {},
+): FunctionOptimization<T> {
+    val problem = FunctionOptimization<T>(this) {
+        startAt(mapOf(*startingPoint))
+        builder()
+    }
+    return optimizer.optimize(problem)
+}
+
+
+public class XYOptimizationBuilder(
+    public val data: XYColumnarData<Double, Double, Double>,
+    public val model: DifferentiableExpression<Double>,
+) : OptimizationBuilder<Double, XYOptimization>() {
+
+    public var pointToCurveDistance: PointToCurveDistance = PointToCurveDistance.byY
+    public var pointWeight: PointWeight = PointWeight.byYSigma
+
+    override fun build(): XYOptimization = XYOptimization(
+        FeatureSet.of(features),
+        data,
+        model,
+        pointToCurveDistance,
+        pointWeight
+    )
+}
+
+public fun XYOptimization(
+    data: XYColumnarData<Double, Double, Double>,
+    model: DifferentiableExpression<Double>,
+    builder: XYOptimizationBuilder.() -> Unit,
+): XYOptimization = XYOptimizationBuilder(data, model).apply(builder).build()
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
index 739ce8ca5..b42be4035 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
@@ -5,37 +5,61 @@
 
 package space.kscience.kmath.optimization
 
+import space.kscience.kmath.expressions.DifferentiableExpression
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.FeatureSet
-import space.kscience.kmath.misc.Featured
-import space.kscience.kmath.misc.Loggable
+import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.misc.*
 import kotlin.reflect.KClass
 
-public interface OptimizationFeature {
+public interface OptimizationFeature : Feature<OptimizationFeature> {
+    // enforce toString override
     override fun toString(): String
 }
 
-public interface OptimizationProblem : Featured<OptimizationFeature> {
+public interface OptimizationProblem<T> : Featured<OptimizationFeature> {
     public val features: FeatureSet<OptimizationFeature>
-    override fun <T : OptimizationFeature> getFeature(type: KClass<out T>): T? = features.getFeature(type)
+    override fun <F : OptimizationFeature> getFeature(type: KClass<out F>): F? = features.getFeature(type)
 }
 
-public inline fun <reified T : OptimizationFeature> OptimizationProblem.getFeature(): T? = getFeature(T::class)
+public inline fun <reified F : OptimizationFeature> OptimizationProblem<*>.getFeature(): F? = getFeature(F::class)
 
 public open class OptimizationStartPoint<T>(public val point: Map<Symbol, T>) : OptimizationFeature {
     override fun toString(): String = "StartPoint($point)"
 }
 
+
+public interface OptimizationPrior<T> : OptimizationFeature, DifferentiableExpression<T> {
+    override val key: FeatureKey<OptimizationFeature> get() = OptimizationPrior::class
+}
+
+public class OptimizationCovariance<T>(public val covariance: Matrix<T>) : OptimizationFeature {
+    override fun toString(): String = "Covariance($covariance)"
+}
+
+/**
+ * Get the starting point for optimization. Throws error if not defined.
+ */
+public val <T> OptimizationProblem<T>.startPoint: Map<Symbol, T>
+    get() = getFeature<OptimizationStartPoint<T>>()?.point
+        ?: error("Starting point not defined in $this")
+
 public open class OptimizationResult<T>(public val point: Map<Symbol, T>) : OptimizationFeature {
     override fun toString(): String = "Result($point)"
 }
 
+public val <T> OptimizationProblem<T>.resultPointOrNull: Map<Symbol, T>?
+    get() = getFeature<OptimizationResult<T>>()?.point
+
+public val <T> OptimizationProblem<T>.resultPoint: Map<Symbol, T>
+    get() = resultPointOrNull ?: error("Result is not present in $this")
+
 public class OptimizationLog(private val loggable: Loggable) : Loggable by loggable, OptimizationFeature {
     override fun toString(): String = "Log($loggable)"
 }
 
-public class OptimizationParameters(public val symbols: List<Symbol>): OptimizationFeature{
+public class OptimizationParameters(public val symbols: List<Symbol>) : OptimizationFeature {
     public constructor(vararg symbols: Symbol) : this(listOf(*symbols))
+
     override fun toString(): String = "Parameters($symbols)"
 }
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt
index ad1a16007..78385a99b 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt
@@ -5,6 +5,6 @@
 
 package space.kscience.kmath.optimization
 
-public interface Optimizer<P : OptimizationProblem> {
+public interface Optimizer<T, P : OptimizationProblem<T>> {
     public suspend fun optimize(problem: P): P
 }
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
new file mode 100644
index 000000000..acfc7e445
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
@@ -0,0 +1,247 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.optimization
+
+import space.kscience.kmath.expressions.DifferentiableExpression
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.SymbolIndexer
+import space.kscience.kmath.expressions.derivative
+import space.kscience.kmath.linear.*
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.DoubleL2Norm
+
+
+/**
+ * An optimizer based onf Fyodor Tkachev's quasi-optimal weights method.
+ * See [the article](http://arxiv.org/abs/physics/0604127).
+ */
+@UnstableKMathAPI
+public class QowOptimizer : Optimizer<Double, XYOptimization> {
+
+    private val linearSpace: LinearSpace<Double, DoubleField> = LinearSpace.double
+    private val solver: LinearSolver<Double> = linearSpace.lupSolver()
+
+    @OptIn(UnstableKMathAPI::class)
+    private inner class QoWeight(
+        val problem: XYOptimization,
+        val parameters: Map<Symbol, Double>,
+    ) : Map<Symbol, Double> by parameters, SymbolIndexer {
+        override val symbols: List<Symbol> = parameters.keys.toList()
+
+        val data get() = problem.data
+
+        /**
+         * Derivatives of the spectrum over parameters. First index in the point number, second one - index of parameter
+         */
+        val derivs: Matrix<Double> by lazy {
+            linearSpace.buildMatrix(problem.data.size, symbols.size) { i, k ->
+                problem.distance(i).derivative(symbols[k])(parameters)
+            }
+        }
+
+        /**
+         * Array of dispersions in each point
+         */
+        val dispersion: Point<Double> by lazy {
+            DoubleBuffer(problem.data.size) { i ->
+                problem.weight(i).invoke(parameters)
+            }
+        }
+
+        val prior: DifferentiableExpression<Double>? get() = problem.getFeature<OptimizationPrior<Double>>()
+    }
+
+    /**
+     * The signed distance from the model to the [i]-th point of data.
+     */
+    private fun QoWeight.distance(i: Int, parameters: Map<Symbol, Double>): Double = problem.distance(i)(parameters)
+
+
+    /**
+     * The derivative of [distance]
+     */
+    private fun QoWeight.distanceDerivative(symbol: Symbol, i: Int, parameters: Map<Symbol, Double>): Double =
+        problem.distance(i).derivative(symbol)(parameters)
+
+    /**
+     * Теоретическая ковариация весовых функций.
+     *
+     * D(\phi)=E(\phi_k(\theta_0) \phi_l(\theta_0))= disDeriv_k * disDeriv_l /sigma^2
+     */
+    private fun QoWeight.covarF(): Matrix<Double> =
+        linearSpace.matrix(size, size).symmetric { k, l ->
+            (0 until data.size).sumOf { i -> derivs[k, i] * derivs[l, i] / dispersion[i] }
+        }
+
+    /**
+     * Экспериментальная ковариация весов. Формула (22) из
+     * http://arxiv.org/abs/physics/0604127
+     */
+    private fun QoWeight.covarFExp(theta: Map<Symbol, Double>): Matrix<Double> =
+        with(linearSpace) {
+            /*
+             * Важно! Если не делать предварителього вычисления этих производных, то
+             * количество вызывов функции будет dim^2 вместо dim Первый индекс -
+             * номер точки, второй - номер переменной, по которой берется производная
+             */
+            val eqvalues = linearSpace.buildMatrix(data.size, size) { i, l ->
+                distance(i, theta) * derivs[l, i] / dispersion[i]
+            }
+
+            buildMatrix(size, size) { k, l ->
+                (0 until data.size).sumOf { i -> eqvalues[i, l] * eqvalues[i, k] }
+            }
+        }
+
+    /**
+     * Equation derivatives for Newton run
+     */
+    private fun QoWeight.getEqDerivValues(
+        theta: Map<Symbol, Double> = parameters,
+    ): Matrix<Double> = with(linearSpace) {
+        val fitDim = size
+        //Возвращает производную k-того Eq по l-тому параметру
+        //val res = Array(fitDim) { DoubleArray(fitDim) }
+        val sderiv = buildMatrix(data.size, size) { i, l ->
+            distanceDerivative(symbols[l], i, theta)
+        }
+
+        buildMatrix(size, size) { k, l ->
+            val base = (0 until data.size).sumOf { i ->
+                require(dispersion[i] > 0)
+                sderiv[i, l] * derivs[k, i] / dispersion[i]
+            }
+            prior?.let { prior ->
+                //Check if this one is correct
+                val pi = prior(theta)
+                val deriv1 = prior.derivative(symbols[k])(theta)
+                val deriv2 = prior.derivative(symbols[l])(theta)
+                base + deriv1 * deriv2 / pi / pi
+            } ?: base
+        }
+    }
+
+
+    /**
+     * Значения уравнений метода квазиоптимальных весов
+     */
+    private fun QoWeight.getEqValues(theta: Map<Symbol, Double> = this): Point<Double> {
+        val distances = DoubleBuffer(data.size) { i -> distance(i, theta) }
+
+        return DoubleBuffer(size) { k ->
+            val base = (0 until data.size).sumOf { i -> distances[i] * derivs[k, i] / dispersion[i] }
+            //Поправка на априорную вероятность
+            prior?.let { prior ->
+                base - prior.derivative(symbols[k])(theta) / prior(theta)
+            } ?: base
+        }
+    }
+
+
+    private fun QoWeight.newtonianStep(
+        theta: Map<Symbol, Double>,
+        eqvalues: Point<Double>,
+    ): QoWeight = linearSpace {
+        with(this@newtonianStep) {
+            val start = theta.toPoint()
+            val invJacob = solver.inverse(this@newtonianStep.getEqDerivValues(theta))
+
+            val step = invJacob.dot(eqvalues)
+            return QoWeight(problem, theta + (start - step).toMap())
+        }
+    }
+
+    private fun QoWeight.newtonianRun(
+        maxSteps: Int = 100,
+        tolerance: Double = 0.0,
+        fast: Boolean = false,
+    ): QoWeight {
+
+        val logger = problem.getFeature<OptimizationLog>()
+
+        var dis: Double//норма невязки
+        // Для удобства работаем всегда с полным набором параметров
+        var par = problem.startPoint
+
+        logger?.log { "Starting newtonian iteration from: \n\t$par" }
+
+        var eqvalues = getEqValues(par)//значения функций
+
+        dis = DoubleL2Norm.norm(eqvalues)// невязка
+        logger?.log { "Starting discrepancy is $dis" }
+        var i = 0
+        var flag = false
+        while (!flag) {
+            i++
+            logger?.log { "Starting step number $i" }
+
+            val currentSolution = if (fast) {
+                //Берет значения матрицы в той точке, где считается вес
+                newtonianStep(this, eqvalues)
+            } else {
+                //Берет значения матрицы в точке par
+                newtonianStep(par, eqvalues)
+            }
+            // здесь должен стоять учет границ параметров
+            logger?.log { "Parameter values after step are: \n\t$currentSolution" }
+
+            eqvalues = getEqValues(currentSolution)
+            val currentDis = DoubleL2Norm.norm(eqvalues)// невязка после шага
+
+            logger?.log { "The discrepancy after step is: $currentDis." }
+
+            if (currentDis >= dis && i > 1) {
+                //дополнительно проверяем, чтобы был сделан хотя бы один шаг
+                flag = true
+                logger?.log { "The discrepancy does not decrease. Stopping iteration." }
+            } else {
+                par = currentSolution
+                dis = currentDis
+            }
+            if (i >= maxSteps) {
+                flag = true
+                logger?.log { "Maximum number of iterations reached. Stopping iteration." }
+            }
+            if (dis <= tolerance) {
+                flag = true
+                logger?.log { "Tolerance threshold is reached. Stopping iteration." }
+            }
+        }
+
+        return QoWeight(problem, par)
+    }
+
+    private fun QoWeight.covariance(): Matrix<Double> {
+        val logger = problem.getFeature<OptimizationLog>()
+
+        logger?.log {
+            """
+            Starting errors estimation using quasioptimal weights method. The starting weight is:
+                ${problem.startPoint}
+             """.trimIndent()
+        }
+
+        val covar = solver.inverse(getEqDerivValues())
+        //TODO fix eigenvalues check
+//        val decomposition = EigenDecomposition(covar.matrix)
+//        var valid = true
+//        for (lambda in decomposition.realEigenvalues) {
+//            if (lambda <= 0) {
+//                logger?.log { "The covariance matrix is not positive defined. Error estimation is not valid" }
+//                valid = false
+//            }
+//        }
+        return covar
+    }
+
+    override suspend fun optimize(problem: XYOptimization): XYOptimization {
+        val initialWeight = QoWeight(problem, problem.startPoint)
+        val res = initialWeight.newtonianRun()
+        return res.problem.withFeature(OptimizationResult(res.parameters))
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt
index 7dc17f6d9..68c0c77eb 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt
@@ -7,13 +7,21 @@
 package space.kscience.kmath.optimization
 
 import space.kscience.kmath.data.XYColumnarData
+import space.kscience.kmath.data.indices
 import space.kscience.kmath.expressions.DifferentiableExpression
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.derivative
 import space.kscience.kmath.misc.FeatureSet
 import space.kscience.kmath.misc.UnstableKMathAPI
+import kotlin.math.PI
+import kotlin.math.ln
 import kotlin.math.pow
+import kotlin.math.sqrt
 
+/**
+ * Specify the way to compute distance from point to the curve as DifferentiableExpression
+ */
 public interface PointToCurveDistance : OptimizationFeature {
     public fun distance(problem: XYOptimization, index: Int): DifferentiableExpression<Double>
 
@@ -33,42 +41,107 @@ public interface PointToCurveDistance : OptimizationFeature {
             }
 
             override fun toString(): String = "PointToCurveDistanceByY"
-
         }
-
     }
 }
 
+/**
+ * Compute a wight of the point. The more the weight, the more impact this point will have on the fit.
+ * By default uses Dispersion^-1
+ */
+public interface PointWeight : OptimizationFeature {
+    public fun weight(problem: XYOptimization, index: Int): DifferentiableExpression<Double>
+
+    public companion object {
+        public fun bySigma(sigmaSymbol: Symbol): PointWeight = object : PointWeight {
+            override fun weight(problem: XYOptimization, index: Int): DifferentiableExpression<Double> =
+                object : DifferentiableExpression<Double> {
+                    override fun invoke(arguments: Map<Symbol, Double>): Double {
+                        return problem.data[sigmaSymbol]?.get(index)?.pow(-2) ?: 1.0
+                    }
+
+                    override fun derivativeOrNull(symbols: List<Symbol>): Expression<Double> = Expression { 0.0 }
+                }
+
+            override fun toString(): String = "PointWeightBySigma($sigmaSymbol)"
+
+        }
+
+        public val byYSigma: PointWeight = bySigma(Symbol.yError)
+    }
+}
+
+/**
+ * An optimization for XY data.
+ */
 public class XYOptimization(
     override val features: FeatureSet<OptimizationFeature>,
     public val data: XYColumnarData<Double, Double, Double>,
     public val model: DifferentiableExpression<Double>,
-) : OptimizationProblem
+    internal val pointToCurveDistance: PointToCurveDistance = PointToCurveDistance.byY,
+    internal val pointWeight: PointWeight = PointWeight.byYSigma,
+) : OptimizationProblem<Double> {
+    public fun distance(index: Int): DifferentiableExpression<Double> = pointToCurveDistance.distance(this, index)
 
+    public fun weight(index: Int): DifferentiableExpression<Double> = pointWeight.weight(this, index)
+}
 
-public suspend fun Optimizer<FunctionOptimization<Double>>.maximumLogLikelihood(problem: XYOptimization): XYOptimization {
-    val distanceBuilder = problem.getFeature() ?: PointToCurveDistance.byY
-    val likelihood: DifferentiableExpression<Double> = object : DifferentiableExpression<Double> {
-        override fun derivativeOrNull(symbols: List<Symbol>): Expression<Double>? {
-            TODO("Not yet implemented")
+public fun XYOptimization.withFeature(vararg features: OptimizationFeature): XYOptimization {
+    return XYOptimization(this.features.with(*features), data, model, pointToCurveDistance, pointWeight)
+}
+
+private val oneOver2Pi = 1.0 / sqrt(2 * PI)
+
+internal fun XYOptimization.likelihood(): DifferentiableExpression<Double> = object : DifferentiableExpression<Double> {
+    override fun derivativeOrNull(symbols: List<Symbol>): Expression<Double> = Expression { arguments ->
+        data.indices.sumOf { index ->
+
+            val d = distance(index)(arguments)
+            val weight = weight(index)(arguments)
+            val weightDerivative = weight(index)(arguments)
+
+            //  -1 / (sqrt(2 PI) * sigma) + 2 (x-mu)/ 2 sigma^2 * d mu/ d theta - (x-mu)^2 / 2 * d w/ d theta
+            return@sumOf -oneOver2Pi * sqrt(weight) + //offset derivative
+                    d * model.derivative(symbols)(arguments) * weight - //model derivative
+                    d.pow(2) * weightDerivative / 2 //weight derivative
         }
-
-        override fun invoke(arguments: Map<Symbol, Double>): Double {
-            var res = 0.0
-            for (index in 0 until problem.data.size) {
-                val d = distanceBuilder.distance(problem, index).invoke(arguments)
-                val sigma: Double = TODO()
-                res -= (d / sigma).pow(2)
-            }
-            return res
-        }
-
     }
-    val functionOptimization = FunctionOptimization(problem.features, likelihood)
-    val result = optimize(functionOptimization)
+
+    override fun invoke(arguments: Map<Symbol, Double>): Double {
+        return data.indices.sumOf { index ->
+            val d = distance(index)(arguments)
+            val weight = weight(index)(arguments)
+            //1/sqrt(2 PI sigma^2) - (x-mu)^2/ (2 * sigma^2)
+            oneOver2Pi * ln(weight) - d.pow(2) * weight
+        } / 2
+    }
+
+}
+
+/**
+ * Optimize given XY (least squares) [problem] using this function [Optimizer].
+ * The problem is treated as maximum likelihood problem and is done via maximizing logarithmic likelihood, respecting
+ * possible weight dependency on the model and parameters.
+ */
+public suspend fun Optimizer<Double, FunctionOptimization<Double>>.maximumLogLikelihood(problem: XYOptimization): XYOptimization {
+    val functionOptimization = FunctionOptimization(problem.features, problem.likelihood())
+    val result = optimize(functionOptimization.withFeatures(FunctionOptimizationTarget.MAXIMIZE))
     return XYOptimization(result.features, problem.data, problem.model)
 }
 
+public suspend fun Optimizer<Double, FunctionOptimization<Double>>.maximumLogLikelihood(
+    data: XYColumnarData<Double, Double, Double>,
+    model: DifferentiableExpression<Double>,
+    builder: XYOptimizationBuilder.() -> Unit,
+): XYOptimization = maximumLogLikelihood(XYOptimization(data, model, builder))
+
+//public suspend fun XYColumnarData<Double, Double, Double>.fitWith(
+//    optimizer: XYOptimization,
+//    problemBuilder: XYOptimizationBuilder.() -> Unit = {},
+//
+//)
+
+
 //
 //@UnstableKMathAPI
 //public interface XYFit<T> : OptimizationProblem {
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt b/kmath-stat/src/commonMain/tmp/QowFit.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/qow/QowFit.kt
rename to kmath-stat/src/commonMain/tmp/QowFit.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/AnalyticalGradientCalculator.kt b/kmath-stat/src/commonMain/tmp/minuit/AnalyticalGradientCalculator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/AnalyticalGradientCalculator.kt
rename to kmath-stat/src/commonMain/tmp/minuit/AnalyticalGradientCalculator.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/CombinedMinimizer.kt b/kmath-stat/src/commonMain/tmp/minuit/CombinedMinimizer.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/CombinedMinimizer.kt
rename to kmath-stat/src/commonMain/tmp/minuit/CombinedMinimizer.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/CombinedMinimumBuilder.kt b/kmath-stat/src/commonMain/tmp/minuit/CombinedMinimumBuilder.kt
similarity index 97%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/CombinedMinimumBuilder.kt
rename to kmath-stat/src/commonMain/tmp/minuit/CombinedMinimumBuilder.kt
index a2f0a644a..8c5452575 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/CombinedMinimumBuilder.kt
+++ b/kmath-stat/src/commonMain/tmp/minuit/CombinedMinimumBuilder.kt
@@ -16,6 +16,7 @@
 package ru.inr.mass.minuit
 
 import space.kscience.kmath.optimization.minuit.MINUITPlugin
+import space.kscience.kmath.optimization.minuit.MinimumSeed
 
 /**
  *
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ContoursError.kt b/kmath-stat/src/commonMain/tmp/minuit/ContoursError.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ContoursError.kt
rename to kmath-stat/src/commonMain/tmp/minuit/ContoursError.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/DavidonErrorUpdator.kt b/kmath-stat/src/commonMain/tmp/minuit/DavidonErrorUpdator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/DavidonErrorUpdator.kt
rename to kmath-stat/src/commonMain/tmp/minuit/DavidonErrorUpdator.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/FunctionGradient.kt b/kmath-stat/src/commonMain/tmp/minuit/FunctionGradient.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/FunctionGradient.kt
rename to kmath-stat/src/commonMain/tmp/minuit/FunctionGradient.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/FunctionMinimum.kt b/kmath-stat/src/commonMain/tmp/minuit/FunctionMinimum.kt
similarity index 99%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/FunctionMinimum.kt
rename to kmath-stat/src/commonMain/tmp/minuit/FunctionMinimum.kt
index 56908f00d..e43523291 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/FunctionMinimum.kt
+++ b/kmath-stat/src/commonMain/tmp/minuit/FunctionMinimum.kt
@@ -16,6 +16,7 @@
 package ru.inr.mass.minuit
 
 import ru.inr.mass.minuit.*
+import space.kscience.kmath.optimization.minuit.MinimumSeed
 
 /**
  * Result of the minimization.
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/GradientCalculator.kt b/kmath-stat/src/commonMain/tmp/minuit/GradientCalculator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/GradientCalculator.kt
rename to kmath-stat/src/commonMain/tmp/minuit/GradientCalculator.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/HessianGradientCalculator.kt b/kmath-stat/src/commonMain/tmp/minuit/HessianGradientCalculator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/HessianGradientCalculator.kt
rename to kmath-stat/src/commonMain/tmp/minuit/HessianGradientCalculator.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/InitialGradientCalculator.kt b/kmath-stat/src/commonMain/tmp/minuit/InitialGradientCalculator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/InitialGradientCalculator.kt
rename to kmath-stat/src/commonMain/tmp/minuit/InitialGradientCalculator.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINOSResult.kt b/kmath-stat/src/commonMain/tmp/minuit/MINOSResult.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINOSResult.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MINOSResult.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITFitter.kt b/kmath-stat/src/commonMain/tmp/minuit/MINUITFitter.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITFitter.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MINUITFitter.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITPlugin.kt b/kmath-stat/src/commonMain/tmp/minuit/MINUITPlugin.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITPlugin.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MINUITPlugin.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITUtils.kt b/kmath-stat/src/commonMain/tmp/minuit/MINUITUtils.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MINUITUtils.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MINUITUtils.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumBuilder.kt b/kmath-stat/src/commonMain/tmp/minuit/MinimumBuilder.kt
similarity index 95%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumBuilder.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MinimumBuilder.kt
index eadeeb91d..7d918c339 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumBuilder.kt
+++ b/kmath-stat/src/commonMain/tmp/minuit/MinimumBuilder.kt
@@ -15,6 +15,8 @@
  */
 package ru.inr.mass.minuit
 
+import space.kscience.kmath.optimization.minuit.MinimumSeed
+
 /**
  *
  * @version $Id$
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumError.kt b/kmath-stat/src/commonMain/tmp/minuit/MinimumError.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumError.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MinimumError.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumErrorUpdator.kt b/kmath-stat/src/commonMain/tmp/minuit/MinimumErrorUpdator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumErrorUpdator.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MinimumErrorUpdator.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumParameters.kt b/kmath-stat/src/commonMain/tmp/minuit/MinimumParameters.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumParameters.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MinimumParameters.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeed.kt b/kmath-stat/src/commonMain/tmp/minuit/MinimumSeed.kt
similarity index 95%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeed.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MinimumSeed.kt
index aef672bb7..53a78da75 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeed.kt
+++ b/kmath-stat/src/commonMain/tmp/minuit/MinimumSeed.kt
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ru.inr.mass.minuit
+package space.kscience.kmath.optimization.minuit
+
+import ru.inr.mass.minuit.*
 
 /**
  *
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeedGenerator.kt b/kmath-stat/src/commonMain/tmp/minuit/MinimumSeedGenerator.kt
similarity index 95%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeedGenerator.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MinimumSeedGenerator.kt
index bd04c1a45..e152559b5 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumSeedGenerator.kt
+++ b/kmath-stat/src/commonMain/tmp/minuit/MinimumSeedGenerator.kt
@@ -15,6 +15,8 @@
  */
 package ru.inr.mass.minuit
 
+import space.kscience.kmath.optimization.minuit.MinimumSeed
+
 /**
  * base class for seed generators (starting values); the seed generator prepares
  * initial starting values from the input (MnUserParameterState) for the
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumState.kt b/kmath-stat/src/commonMain/tmp/minuit/MinimumState.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinimumState.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MinimumState.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinosError.kt b/kmath-stat/src/commonMain/tmp/minuit/MinosError.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinosError.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MinosError.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinuitParameter.kt b/kmath-stat/src/commonMain/tmp/minuit/MinuitParameter.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MinuitParameter.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MinuitParameter.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnAlgebraicSymMatrix.kt b/kmath-stat/src/commonMain/tmp/minuit/MnAlgebraicSymMatrix.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnAlgebraicSymMatrix.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnAlgebraicSymMatrix.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnApplication.kt b/kmath-stat/src/commonMain/tmp/minuit/MnApplication.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnApplication.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnApplication.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnContours.kt b/kmath-stat/src/commonMain/tmp/minuit/MnContours.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnContours.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnContours.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnCovarianceSqueeze.kt b/kmath-stat/src/commonMain/tmp/minuit/MnCovarianceSqueeze.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnCovarianceSqueeze.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnCovarianceSqueeze.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnCross.kt b/kmath-stat/src/commonMain/tmp/minuit/MnCross.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnCross.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnCross.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnEigen.kt b/kmath-stat/src/commonMain/tmp/minuit/MnEigen.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnEigen.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnEigen.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnFcn.kt b/kmath-stat/src/commonMain/tmp/minuit/MnFcn.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnFcn.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnFcn.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnFunctionCross.kt b/kmath-stat/src/commonMain/tmp/minuit/MnFunctionCross.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnFunctionCross.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnFunctionCross.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnGlobalCorrelationCoeff.kt b/kmath-stat/src/commonMain/tmp/minuit/MnGlobalCorrelationCoeff.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnGlobalCorrelationCoeff.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnGlobalCorrelationCoeff.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnHesse.kt b/kmath-stat/src/commonMain/tmp/minuit/MnHesse.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnHesse.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnHesse.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnLineSearch.kt b/kmath-stat/src/commonMain/tmp/minuit/MnLineSearch.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnLineSearch.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnLineSearch.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMachinePrecision.kt b/kmath-stat/src/commonMain/tmp/minuit/MnMachinePrecision.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMachinePrecision.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnMachinePrecision.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMigrad.kt b/kmath-stat/src/commonMain/tmp/minuit/MnMigrad.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMigrad.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnMigrad.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMinimize.kt b/kmath-stat/src/commonMain/tmp/minuit/MnMinimize.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMinimize.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnMinimize.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMinos.kt b/kmath-stat/src/commonMain/tmp/minuit/MnMinos.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnMinos.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnMinos.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabola.kt b/kmath-stat/src/commonMain/tmp/minuit/MnParabola.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabola.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnParabola.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabolaFactory.kt b/kmath-stat/src/commonMain/tmp/minuit/MnParabolaFactory.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabolaFactory.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnParabolaFactory.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabolaPoint.kt b/kmath-stat/src/commonMain/tmp/minuit/MnParabolaPoint.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParabolaPoint.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnParabolaPoint.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParameterScan.kt b/kmath-stat/src/commonMain/tmp/minuit/MnParameterScan.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnParameterScan.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnParameterScan.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPlot.kt b/kmath-stat/src/commonMain/tmp/minuit/MnPlot.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPlot.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnPlot.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPosDef.kt b/kmath-stat/src/commonMain/tmp/minuit/MnPosDef.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPosDef.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnPosDef.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPrint.kt b/kmath-stat/src/commonMain/tmp/minuit/MnPrint.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnPrint.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnPrint.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnScan.kt b/kmath-stat/src/commonMain/tmp/minuit/MnScan.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnScan.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnScan.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnSeedGenerator.kt b/kmath-stat/src/commonMain/tmp/minuit/MnSeedGenerator.kt
similarity index 98%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnSeedGenerator.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnSeedGenerator.kt
index cc3f9547e..a42edf4f1 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnSeedGenerator.kt
+++ b/kmath-stat/src/commonMain/tmp/minuit/MnSeedGenerator.kt
@@ -17,6 +17,7 @@ package ru.inr.mass.minuit
 
 import space.kscience.kmath.optimization.minuit.MINUITPlugin
 import ru.inr.mass.minuit.*
+import space.kscience.kmath.optimization.minuit.MinimumSeed
 
 /**
  *
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnSimplex.kt b/kmath-stat/src/commonMain/tmp/minuit/MnSimplex.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnSimplex.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnSimplex.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnStrategy.kt b/kmath-stat/src/commonMain/tmp/minuit/MnStrategy.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnStrategy.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnStrategy.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserCovariance.kt b/kmath-stat/src/commonMain/tmp/minuit/MnUserCovariance.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserCovariance.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnUserCovariance.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserFcn.kt b/kmath-stat/src/commonMain/tmp/minuit/MnUserFcn.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserFcn.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnUserFcn.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserParameterState.kt b/kmath-stat/src/commonMain/tmp/minuit/MnUserParameterState.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserParameterState.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnUserParameterState.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserParameters.kt b/kmath-stat/src/commonMain/tmp/minuit/MnUserParameters.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserParameters.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnUserParameters.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserTransformation.kt b/kmath-stat/src/commonMain/tmp/minuit/MnUserTransformation.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUserTransformation.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnUserTransformation.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUtils.kt b/kmath-stat/src/commonMain/tmp/minuit/MnUtils.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/MnUtils.kt
rename to kmath-stat/src/commonMain/tmp/minuit/MnUtils.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ModularFunctionMinimizer.kt b/kmath-stat/src/commonMain/tmp/minuit/ModularFunctionMinimizer.kt
similarity index 97%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ModularFunctionMinimizer.kt
rename to kmath-stat/src/commonMain/tmp/minuit/ModularFunctionMinimizer.kt
index f234bcd48..84130d24f 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ModularFunctionMinimizer.kt
+++ b/kmath-stat/src/commonMain/tmp/minuit/ModularFunctionMinimizer.kt
@@ -17,6 +17,7 @@ package ru.inr.mass.minuit
 
 import ru.inr.mass.maths.MultiFunction
 import ru.inr.mass.minuit.*
+import space.kscience.kmath.optimization.minuit.MinimumSeed
 
 /**
  *
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/NegativeG2LineSearch.kt b/kmath-stat/src/commonMain/tmp/minuit/NegativeG2LineSearch.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/NegativeG2LineSearch.kt
rename to kmath-stat/src/commonMain/tmp/minuit/NegativeG2LineSearch.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Numerical2PGradientCalculator.kt b/kmath-stat/src/commonMain/tmp/minuit/Numerical2PGradientCalculator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/Numerical2PGradientCalculator.kt
rename to kmath-stat/src/commonMain/tmp/minuit/Numerical2PGradientCalculator.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ScanBuilder.kt b/kmath-stat/src/commonMain/tmp/minuit/ScanBuilder.kt
similarity index 97%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ScanBuilder.kt
rename to kmath-stat/src/commonMain/tmp/minuit/ScanBuilder.kt
index b7e773924..57f910a26 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ScanBuilder.kt
+++ b/kmath-stat/src/commonMain/tmp/minuit/ScanBuilder.kt
@@ -17,6 +17,7 @@ package ru.inr.mass.minuit
 
 import org.apache.commons.math3.linear.ArrayRealVector
 import ru.inr.mass.minuit.*
+import space.kscience.kmath.optimization.minuit.MinimumSeed
 
 /**
  * Performs a minimization using the simplex method of Nelder and Mead (ref.
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ScanMinimizer.kt b/kmath-stat/src/commonMain/tmp/minuit/ScanMinimizer.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/ScanMinimizer.kt
rename to kmath-stat/src/commonMain/tmp/minuit/ScanMinimizer.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexBuilder.kt b/kmath-stat/src/commonMain/tmp/minuit/SimplexBuilder.kt
similarity index 99%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexBuilder.kt
rename to kmath-stat/src/commonMain/tmp/minuit/SimplexBuilder.kt
index 8441a4177..0b10155ff 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexBuilder.kt
+++ b/kmath-stat/src/commonMain/tmp/minuit/SimplexBuilder.kt
@@ -17,6 +17,7 @@ package ru.inr.mass.minuit
 
 import space.kscience.kmath.optimization.minuit.MINUITPlugin
 import ru.inr.mass.minuit.*
+import space.kscience.kmath.optimization.minuit.MinimumSeed
 
 /**
  *
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexMinimizer.kt b/kmath-stat/src/commonMain/tmp/minuit/SimplexMinimizer.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexMinimizer.kt
rename to kmath-stat/src/commonMain/tmp/minuit/SimplexMinimizer.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexParameters.kt b/kmath-stat/src/commonMain/tmp/minuit/SimplexParameters.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexParameters.kt
rename to kmath-stat/src/commonMain/tmp/minuit/SimplexParameters.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexSeedGenerator.kt b/kmath-stat/src/commonMain/tmp/minuit/SimplexSeedGenerator.kt
similarity index 97%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexSeedGenerator.kt
rename to kmath-stat/src/commonMain/tmp/minuit/SimplexSeedGenerator.kt
index e5025ff3d..577545fc3 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SimplexSeedGenerator.kt
+++ b/kmath-stat/src/commonMain/tmp/minuit/SimplexSeedGenerator.kt
@@ -17,6 +17,7 @@ package ru.inr.mass.minuit
 
 import org.apache.commons.math3.linear.ArrayRealVector
 import ru.inr.mass.minuit.*
+import space.kscience.kmath.optimization.minuit.MinimumSeed
 
 /**
  *
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SinParameterTransformation.kt b/kmath-stat/src/commonMain/tmp/minuit/SinParameterTransformation.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SinParameterTransformation.kt
rename to kmath-stat/src/commonMain/tmp/minuit/SinParameterTransformation.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SqrtLowParameterTransformation.kt b/kmath-stat/src/commonMain/tmp/minuit/SqrtLowParameterTransformation.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SqrtLowParameterTransformation.kt
rename to kmath-stat/src/commonMain/tmp/minuit/SqrtLowParameterTransformation.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SqrtUpParameterTransformation.kt b/kmath-stat/src/commonMain/tmp/minuit/SqrtUpParameterTransformation.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/SqrtUpParameterTransformation.kt
rename to kmath-stat/src/commonMain/tmp/minuit/SqrtUpParameterTransformation.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricBuilder.kt b/kmath-stat/src/commonMain/tmp/minuit/VariableMetricBuilder.kt
similarity index 98%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricBuilder.kt
rename to kmath-stat/src/commonMain/tmp/minuit/VariableMetricBuilder.kt
index 8362c5e7e..edc6783b6 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricBuilder.kt
+++ b/kmath-stat/src/commonMain/tmp/minuit/VariableMetricBuilder.kt
@@ -17,6 +17,7 @@ package ru.inr.mass.minuit
 
 import space.kscience.kmath.optimization.minuit.MINUITPlugin
 import ru.inr.mass.minuit.*
+import space.kscience.kmath.optimization.minuit.MinimumSeed
 
 /**
  *
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricEDMEstimator.kt b/kmath-stat/src/commonMain/tmp/minuit/VariableMetricEDMEstimator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricEDMEstimator.kt
rename to kmath-stat/src/commonMain/tmp/minuit/VariableMetricEDMEstimator.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricMinimizer.kt b/kmath-stat/src/commonMain/tmp/minuit/VariableMetricMinimizer.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/VariableMetricMinimizer.kt
rename to kmath-stat/src/commonMain/tmp/minuit/VariableMetricMinimizer.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/package-info.kt b/kmath-stat/src/commonMain/tmp/minuit/package-info.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/minuit/package-info.kt
rename to kmath-stat/src/commonMain/tmp/minuit/package-info.kt
-- 
2.34.1


From 7d0eff74f6b48f26d16343f5a0c4e9d38fe73e68 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 8 Jun 2021 20:39:47 +0700
Subject: [PATCH 279/713] Fix shield README.md, fix build

---
 README.md                         |  2 +-
 docs/templates/README-TEMPLATE.md |  2 +-
 kmath-symja/build.gradle.kts      | 18 ++++++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9117582ac..dfb9cba9c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![DOI](https://zenodo.org/badge/129486382.svg)](https://zenodo.org/badge/latestdoi/129486382)
 ![Gradle build](https://github.com/mipt-npm/kmath/workflows/Gradle%20build/badge.svg)
 [![Maven Central](https://img.shields.io/maven-central/v/space.kscience/kmath-core.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22space.kscience%22)
-[![Space](https://img.shields.io/maven-metadata/v?label=Space&metadataUrl=https%3A%2F%2Fmaven.pkg.jetbrains.space%2Fmipt-npm%2Fp%2Fsci%2Fmaven%2Fkscience%2Fkmath%2Fkmath-core%2Fmaven-metadata.xml)](https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven/space/kscience/)
+[![Space](https://img.shields.io/maven-metadata/v?label=Space&metadataUrl=https%3A%2F%2Fmaven.pkg.jetbrains.space%2Fmipt-npm%2Fp%2Fsci%2Fmaven%2Fspace%2Fkscience%2Fkmath-core%2Fmaven-metadata.xml)](https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven/space/kscience/)
 
 # KMath
 
diff --git a/docs/templates/README-TEMPLATE.md b/docs/templates/README-TEMPLATE.md
index 6bb1e9085..c981cb0bd 100644
--- a/docs/templates/README-TEMPLATE.md
+++ b/docs/templates/README-TEMPLATE.md
@@ -2,7 +2,7 @@
 [![DOI](https://zenodo.org/badge/129486382.svg)](https://zenodo.org/badge/latestdoi/129486382)
 ![Gradle build](https://github.com/mipt-npm/kmath/workflows/Gradle%20build/badge.svg)
 [![Maven Central](https://img.shields.io/maven-central/v/space.kscience/kmath-core.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22space.kscience%22)
-[![Space](https://img.shields.io/maven-metadata/v?label=Space&metadataUrl=https%3A%2F%2Fmaven.pkg.jetbrains.space%2Fmipt-npm%2Fp%2Fsci%2Fmaven%2Fkscience%2Fkmath%2Fkmath-core%2Fmaven-metadata.xml)](https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven/space/kscience/)
+[![Space](https://img.shields.io/maven-metadata/v?label=Space&metadataUrl=https%3A%2F%2Fmaven.pkg.jetbrains.space%2Fmipt-npm%2Fp%2Fsci%2Fmaven%2Fspace%2Fkscience%2Fkmath-core%2Fmaven-metadata.xml)](https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven/space/kscience/)
 
 # KMath
 
diff --git a/kmath-symja/build.gradle.kts b/kmath-symja/build.gradle.kts
index c67b42e3f..f305c03b8 100644
--- a/kmath-symja/build.gradle.kts
+++ b/kmath-symja/build.gradle.kts
@@ -12,12 +12,26 @@ description = "Symja integration module"
 
 dependencies {
     api("org.matheclipse:matheclipse-core:2.0.0-SNAPSHOT") {
-        // Incorrect transitive dependency org.apfloat:apfloat:1.10.0-SNAPSHOT
+        // Incorrect transitive dependencies
         exclude("org.apfloat", "apfloat")
+        exclude("org.hipparchus", "hipparchus-clustering")
+        exclude("org.hipparchus", "hipparchus-core")
+        exclude("org.hipparchus", "hipparchus-fft")
+        exclude("org.hipparchus", "hipparchus-fitting")
+        exclude("org.hipparchus", "hipparchus-ode")
+        exclude("org.hipparchus", "hipparchus-optim")
+        exclude("org.hipparchus", "hipparchus-stat")
     }
 
-    // Replace for org.apfloat:apfloat:1.10.0-SNAPSHOT
+    // Replaces for incorrect transitive dependencies
     api("org.apfloat:apfloat:1.10.0")
+    api("org.hipparchus:hipparchus-clustering:1.8")
+    api("org.hipparchus:hipparchus-core:1.8")
+    api("org.hipparchus:hipparchus-fft:1.8")
+    api("org.hipparchus:hipparchus-fitting:1.8")
+    api("org.hipparchus:hipparchus-ode:1.8")
+    api("org.hipparchus:hipparchus-optim:1.8")
+    api("org.hipparchus:hipparchus-stat:1.8")
 
     api(project(":kmath-core"))
     testImplementation("org.slf4j:slf4j-simple:1.7.30")
-- 
2.34.1


From c0ab082d240d64f3476707912ba4aea31ecae6bc Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 8 Jun 2021 20:53:33 +0700
Subject: [PATCH 280/713] Run build workflow for PRs

---
 .github/workflows/build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9a9f04621..98f4d2ec2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,9 @@
 name: Gradle build
 
-on: [ push ]
+on:
+  push:
+  pull_request:
+    types: [opened, edited]
 
 jobs:
   build:
-- 
2.34.1


From 7b736a7c81391493c48eea54bdb4f263c01b1cb7 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 9 Jun 2021 21:40:47 +0700
Subject: [PATCH 281/713] Fix README.md again

---
 README.md                         | 18 ++++++++++++------
 docs/templates/README-TEMPLATE.md |  2 +-
 kmath-ast/README.md               |  6 +++---
 kmath-complex/README.md           |  6 +++---
 kmath-core/README.md              |  6 +++---
 kmath-ejml/README.md              |  6 +++---
 kmath-for-real/README.md          |  6 +++---
 kmath-functions/README.md         |  6 +++---
 kmath-kotlingrad/README.md        |  6 +++---
 kmath-nd4j/README.md              |  6 +++---
 kmath-tensors/README.md           |  6 +++---
 11 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index dfb9cba9c..7c6f7ea2b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![DOI](https://zenodo.org/badge/129486382.svg)](https://zenodo.org/badge/latestdoi/129486382)
 ![Gradle build](https://github.com/mipt-npm/kmath/workflows/Gradle%20build/badge.svg)
 [![Maven Central](https://img.shields.io/maven-central/v/space.kscience/kmath-core.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22space.kscience%22)
-[![Space](https://img.shields.io/maven-metadata/v?label=Space&metadataUrl=https%3A%2F%2Fmaven.pkg.jetbrains.space%2Fmipt-npm%2Fp%2Fsci%2Fmaven%2Fspace%2Fkscience%2Fkmath-core%2Fmaven-metadata.xml)](https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven/space/kscience/)
+[![Space](https://img.shields.io/badge/dynamic/xml?color=orange&label=Space&query=//metadata/versioning/latest&url=https%3A%2F%2Fmaven.pkg.jetbrains.space%2Fmipt-npm%2Fp%2Fsci%2Fmaven%2Fspace%2Fkscience%2Fkmath-core%2Fmaven-metadata.xml)](https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven/space/kscience/)
 
 # KMath
 
@@ -207,7 +207,7 @@ One can still use generic algebras though.
 <hr/>
 
 * ### [kmath-kotlingrad](kmath-kotlingrad)
-> Functions, integration and interpolation
+> 
 >
 > **Maturity**: EXPERIMENTAL
 >
@@ -218,13 +218,13 @@ One can still use generic algebras though.
 <hr/>
 
 * ### [kmath-memory](kmath-memory)
-> An API and basic implementation for arranging objects in a continous memory block.
+> An API and basic implementation for arranging objects in a continuous memory block.
 >
 > **Maturity**: DEVELOPMENT
 <hr/>
 
 * ### [kmath-nd4j](kmath-nd4j)
-> ND4J NDStructure implementation and according NDAlgebra classes
+> 
 >
 > **Maturity**: EXPERIMENTAL
 >
@@ -241,6 +241,12 @@ One can still use generic algebras though.
 > **Maturity**: EXPERIMENTAL
 <hr/>
 
+* ### [kmath-symja](kmath-symja)
+> 
+>
+> **Maturity**: PROTOTYPE
+<hr/>
+
 * ### [kmath-tensors](kmath-tensors)
 > 
 >
@@ -293,8 +299,8 @@ repositories {
 }
 
 dependencies {
-    api("space.kscience:kmath-core:0.3.0-dev-11")
-    // api("space.kscience:kmath-core-jvm:0.3.0-dev-11") for jvm-specific version
+    api("space.kscience:kmath-core:0.3.0-dev-13")
+    // api("space.kscience:kmath-core-jvm:0.3.0-dev-13") for jvm-specific version
 }
 ```
 
diff --git a/docs/templates/README-TEMPLATE.md b/docs/templates/README-TEMPLATE.md
index c981cb0bd..bad11a31a 100644
--- a/docs/templates/README-TEMPLATE.md
+++ b/docs/templates/README-TEMPLATE.md
@@ -2,7 +2,7 @@
 [![DOI](https://zenodo.org/badge/129486382.svg)](https://zenodo.org/badge/latestdoi/129486382)
 ![Gradle build](https://github.com/mipt-npm/kmath/workflows/Gradle%20build/badge.svg)
 [![Maven Central](https://img.shields.io/maven-central/v/space.kscience/kmath-core.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22space.kscience%22)
-[![Space](https://img.shields.io/maven-metadata/v?label=Space&metadataUrl=https%3A%2F%2Fmaven.pkg.jetbrains.space%2Fmipt-npm%2Fp%2Fsci%2Fmaven%2Fspace%2Fkscience%2Fkmath-core%2Fmaven-metadata.xml)](https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven/space/kscience/)
+[![Space](https://img.shields.io/badge/dynamic/xml?color=orange&label=Space&query=//metadata/versioning/latest&url=https%3A%2F%2Fmaven.pkg.jetbrains.space%2Fmipt-npm%2Fp%2Fsci%2Fmaven%2Fspace%2Fkscience%2Fkmath-core%2Fmaven-metadata.xml)](https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven/space/kscience/)
 
 # KMath
 
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index b0f2d59e5..2f6b21094 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -10,7 +10,7 @@ Performance and visualization extensions to MST API.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-11`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-13`.
 
 **Gradle:**
 ```gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.0-dev-11'
+    implementation 'space.kscience:kmath-ast:0.3.0-dev-13'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.0-dev-11")
+    implementation("space.kscience:kmath-ast:0.3.0-dev-13")
 }
 ```
 
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index 04431cf6c..18a83756d 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -8,7 +8,7 @@ Complex and hypercomplex number systems in KMath.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-11`.
+The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-13`.
 
 **Gradle:**
 ```gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-complex:0.3.0-dev-11'
+    implementation 'space.kscience:kmath-complex:0.3.0-dev-13'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-complex:0.3.0-dev-11")
+    implementation("space.kscience:kmath-complex:0.3.0-dev-13")
 }
 ```
diff --git a/kmath-core/README.md b/kmath-core/README.md
index 700eaef38..6ca8c8ef8 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -15,7 +15,7 @@ performance calculations to code generation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-11`.
+The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-13`.
 
 **Gradle:**
 ```gradle
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-core:0.3.0-dev-11'
+    implementation 'space.kscience:kmath-core:0.3.0-dev-13'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -36,6 +36,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-core:0.3.0-dev-11")
+    implementation("space.kscience:kmath-core:0.3.0-dev-13")
 }
 ```
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index 79a28b824..10e7bd606 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -9,7 +9,7 @@ EJML based linear algebra implementation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-11`.
+The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-13`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ejml:0.3.0-dev-11'
+    implementation 'space.kscience:kmath-ejml:0.3.0-dev-13'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ejml:0.3.0-dev-11")
+    implementation("space.kscience:kmath-ejml:0.3.0-dev-13")
 }
 ```
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index 5ca805093..6339782dd 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -9,7 +9,7 @@ Specialization of KMath APIs for Double numbers.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-11`.
+The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-13`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-for-real:0.3.0-dev-11'
+    implementation 'space.kscience:kmath-for-real:0.3.0-dev-13'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-for-real:0.3.0-dev-11")
+    implementation("space.kscience:kmath-for-real:0.3.0-dev-13")
 }
 ```
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index 2497f7102..77f55528a 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -11,7 +11,7 @@ Functions and interpolations.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-11`.
+The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-13`.
 
 **Gradle:**
 ```gradle
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-functions:0.3.0-dev-11'
+    implementation 'space.kscience:kmath-functions:0.3.0-dev-13'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-functions:0.3.0-dev-11")
+    implementation("space.kscience:kmath-functions:0.3.0-dev-13")
 }
 ```
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
index 4393cbf8c..31c7bb819 100644
--- a/kmath-kotlingrad/README.md
+++ b/kmath-kotlingrad/README.md
@@ -8,7 +8,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-11`.
+The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-13`.
 
 **Gradle:**
 ```gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-11'
+    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-13'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-11")
+    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-13")
 }
 ```
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index 6408be13b..1c945f06a 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -9,7 +9,7 @@ ND4J based implementations of KMath abstractions.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-11`.
+The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-13`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-11'
+    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-13'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-nd4j:0.3.0-dev-11")
+    implementation("space.kscience:kmath-nd4j:0.3.0-dev-13")
 }
 ```
 
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index 75de2bf35..dd21a9f2f 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -9,7 +9,7 @@ Common linear algebra operations on tensors.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-11`.
+The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-13`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensors:0.3.0-dev-11'
+    implementation 'space.kscience:kmath-tensors:0.3.0-dev-13'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensors:0.3.0-dev-11")
+    implementation("space.kscience:kmath-tensors:0.3.0-dev-13")
 }
 ```
-- 
2.34.1


From 46bf66c8ee28f6c3fa1645e19001b878cef60b7e Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 26 May 2021 20:24:29 +0700
Subject: [PATCH 282/713] Add justCalculate benchmark, some minor refactorings

---
 .../ExpressionsInterpretersBenchmark.kt       | 46 ++++++++++++++---
 .../space/kscience/kmath/ast/expressions.kt   |  2 -
 kmath-ast/README.md                           | 15 +++---
 kmath-ast/docs/README-TEMPLATE.md             |  9 ++--
 .../TestCompilerConsistencyWithInterpreter.kt |  4 +-
 .../kmath/ast/TestCompilerOperations.kt       |  6 +--
 .../kmath/ast/TestCompilerVariables.kt        |  4 +-
 .../kmath/wasm/internal/WasmBuilder.kt        |  6 +--
 .../kscience/kmath/ast/TestExecutionTime.kt   | 51 +++++++++++++++++--
 .../kscience/kmath/wasm/TestWasmSpecific.kt   |  4 +-
 .../kmath/asm/internal/codegenUtils.kt        |  2 +-
 .../kmath/kotlingrad/AdaptingTests.kt         |  7 ++-
 12 files changed, 113 insertions(+), 43 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
index 15cd14399..0294f924b 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
@@ -14,22 +14,51 @@ import space.kscience.kmath.expressions.*
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
+import kotlin.math.sin
 import kotlin.random.Random
 
 @State(Scope.Benchmark)
 internal class ExpressionsInterpretersBenchmark {
+    /**
+     * Benchmark case for [Expression] created with [expressionInExtendedField].
+     */
     @Benchmark
     fun functionalExpression(blackhole: Blackhole) = invokeAndSum(functional, blackhole)
 
+    /**
+     * Benchmark case for [Expression] created with [toExpression].
+     */
     @Benchmark
     fun mstExpression(blackhole: Blackhole) = invokeAndSum(mst, blackhole)
 
+    /**
+     * Benchmark case for [Expression] created with [compileToExpression].
+     */
     @Benchmark
     fun asmExpression(blackhole: Blackhole) = invokeAndSum(asm, blackhole)
 
+    /**
+     * Benchmark case for [Expression] implemented manually with `kotlin.math` functions.
+     */
     @Benchmark
     fun rawExpression(blackhole: Blackhole) = invokeAndSum(raw, blackhole)
 
+    /**
+     * Benchmark case for direct computation w/o [Expression].
+     */
+    @Benchmark
+    fun justCalculate(blackhole: Blackhole) {
+        val random = Random(0)
+        var sum = 0.0
+
+        repeat(times) {
+            val x = random.nextDouble()
+            sum += x * 2.0 + 2.0 / x - 16.0 / sin(x)
+        }
+
+        blackhole.consume(sum)
+    }
+
     private fun invokeAndSum(expr: Expression<Double>, blackhole: Blackhole) {
         val random = Random(0)
         var sum = 0.0
@@ -42,23 +71,24 @@ internal class ExpressionsInterpretersBenchmark {
     }
 
     private companion object {
-        private val x: Symbol by symbol
-        private val algebra: DoubleField = DoubleField
+        private val x by symbol
+        private val algebra = DoubleField
         private const val times = 1_000_000
 
-        private val functional: Expression<Double> = DoubleField.expressionInExtendedField {
+        private val functional = DoubleField.expressionInExtendedField {
             bindSymbol(x) * number(2.0) + number(2.0) / bindSymbol(x) - number(16.0) / sin(bindSymbol(x))
         }
 
         private val node = MstExtendedField {
-            bindSymbol(x) * 2.0 + number(2.0) / bindSymbol(x) - number(16.0) / sin(bindSymbol(x))
+            x * 2.0 + number(2.0) / x - number(16.0) / sin(x)
         }
 
-        private val mst: Expression<Double> = node.toExpression(DoubleField)
-        private val asm: Expression<Double> = node.compileToExpression(DoubleField)
+        private val mst = node.toExpression(DoubleField)
+        private val asm = node.compileToExpression(DoubleField)
 
-        private val raw: Expression<Double> = Expression { args ->
-            args.getValue(x) * 2.0 + 2.0 / args.getValue(x) - 16.0 / kotlin.math.sin(args.getValue(x))
+        private val raw = Expression<Double> { args ->
+            val x = args[x]!!
+            x * 2.0 + 2.0 / x - 16.0 / sin(x)
         }
     }
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
index d5a82590f..96c9856cf 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
@@ -9,12 +9,10 @@ import space.kscience.kmath.expressions.MstField
 import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.interpret
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 
 fun main() {
     val expr = MstField {
-        val x = bindSymbol(x)
         x * 2.0 + number(2.0) / x - 16.0
     }
 
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index b0f2d59e5..026c5a625 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -10,7 +10,7 @@ Performance and visualization extensions to MST API.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-11`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-13`.
 
 **Gradle:**
 ```gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.0-dev-11'
+    implementation 'space.kscience:kmath-ast:0.3.0-dev-13'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.0-dev-11")
+    implementation("space.kscience:kmath-ast:0.3.0-dev-13")
 }
 ```
 
@@ -45,11 +45,12 @@ special implementation of `Expression<T>` with implemented `invoke` function.
 For example, the following builder:
 
 ```kotlin
+import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.asm.*
 
-MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
+MstField { x + 2 }.compileToExpression(DoubleField)
 ``` 
 
 ... leads to generation of bytecode, which can be decompiled to the following Java class:
@@ -89,11 +90,12 @@ public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
 A similar feature is also available on JS.
 
 ```kotlin
+import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.estree.*
 
-MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
+MstField { x + 2 }.compileToExpression(DoubleField)
 ``` 
 
 The code above returns expression implemented with such a JS function:
@@ -108,11 +110,12 @@ JS also supports very experimental expression optimization with [WebAssembly](ht
 Currently, only expressions inside `DoubleField` and `IntRing` are supported.
 
 ```kotlin
+import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.wasm.*
 
-MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
+MstField { x + 2 }.compileToExpression(DoubleField)
 ```
 
 An example of emitted Wasm IR in the form of WAT:
diff --git a/kmath-ast/docs/README-TEMPLATE.md b/kmath-ast/docs/README-TEMPLATE.md
index 80ea31642..b90f8ff08 100644
--- a/kmath-ast/docs/README-TEMPLATE.md
+++ b/kmath-ast/docs/README-TEMPLATE.md
@@ -16,11 +16,12 @@ special implementation of `Expression<T>` with implemented `invoke` function.
 For example, the following builder:
 
 ```kotlin
+import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.asm.*
 
-MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
+MstField { x + 2 }.compileToExpression(DoubleField)
 ``` 
 
 ... leads to generation of bytecode, which can be decompiled to the following Java class:
@@ -60,11 +61,12 @@ public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
 A similar feature is also available on JS.
 
 ```kotlin
+import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.estree.*
 
-MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
+MstField { x + 2 }.compileToExpression(DoubleField)
 ``` 
 
 The code above returns expression implemented with such a JS function:
@@ -79,11 +81,12 @@ JS also supports very experimental expression optimization with [WebAssembly](ht
 Currently, only expressions inside `DoubleField` and `IntRing` are supported.
 
 ```kotlin
+import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.wasm.*
 
-MstField { bindSymbol("x") + 2 }.compileToExpression(DoubleField)
+MstField { x + 2 }.compileToExpression(DoubleField)
 ```
 
 An example of emitted Wasm IR in the form of WAT:
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
index 6209661b3..3116466e6 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
@@ -22,7 +22,7 @@ internal class TestCompilerConsistencyWithInterpreter {
         val mst = MstRing {
             binaryOperationFunction("+")(
                 unaryOperationFunction("+")(
-                    (bindSymbol(x) - (2.toByte() + (scale(
+                    (x - (2.toByte() + (scale(
                         add(number(1), number(1)),
                         2.0,
                     ) + 1.toByte()))) * 3.0 - 1.toByte()
@@ -42,7 +42,7 @@ internal class TestCompilerConsistencyWithInterpreter {
     fun doubleField() = runCompilerTest {
         val mst = MstField {
             +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
-                (3.0 - (bindSymbol(x) + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
+                (3.0 - (x + (scale(add(number(1.0), number(1.0)), 2.0) + 1.0))) * 3 - 1.0
                         + number(1),
                 number(1) / 2 + number(2.0) * one,
             ) + zero
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
index 073a03f14..f869efd62 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
@@ -47,19 +47,19 @@ internal class TestCompilerOperations {
 
     @Test
     fun testSubtract() = runCompilerTest {
-        val expr = MstExtendedField { bindSymbol(x) - bindSymbol(x) }.compileToExpression(DoubleField)
+        val expr = MstExtendedField { x - x }.compileToExpression(DoubleField)
         assertEquals(0.0, expr(x to 2.0))
     }
 
     @Test
     fun testDivide() = runCompilerTest {
-        val expr = MstExtendedField { bindSymbol(x) / bindSymbol(x) }.compileToExpression(DoubleField)
+        val expr = MstExtendedField { x / x }.compileToExpression(DoubleField)
         assertEquals(1.0, expr(x to 2.0))
     }
 
     @Test
     fun testPower() = runCompilerTest {
-        val expr = MstExtendedField { bindSymbol(x) pow 2 }.compileToExpression(DoubleField)
+        val expr = MstExtendedField { x pow 2 }.compileToExpression(DoubleField)
         assertEquals(4.0, expr(x to 2.0))
     }
 }
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
index dcc15b311..bed5bc7fa 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
@@ -18,13 +18,13 @@ import kotlin.test.assertFailsWith
 internal class TestCompilerVariables {
     @Test
     fun testVariable() = runCompilerTest {
-        val expr = MstRing { bindSymbol(x) }.compileToExpression(IntRing)
+        val expr = MstRing { x }.compileToExpression(IntRing)
         assertEquals(1, expr(x to 1))
     }
 
     @Test
     fun testUndefinedVariableFails() = runCompilerTest {
-        val expr = MstRing { bindSymbol(x) }.compileToExpression(IntRing)
+        val expr = MstRing { x }.compileToExpression(IntRing)
         assertFailsWith<NoSuchElementException> { expr() }
     }
 }
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index 95ace1bad..c89ad83c4 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -27,11 +27,7 @@ internal sealed class WasmBuilder<T>(
     lateinit var ctx: BinaryenModule
 
     open fun visitSymbolic(mst: Symbol): ExpressionRef {
-        try {
-            algebra.bindSymbol(mst)
-        } catch (ignored: Throwable) {
-            null
-        }?.let { return visitNumeric(Numeric(it)) }
+        algebra.bindSymbolOrNull(mst)?.let { return visitNumeric(Numeric(it)) }
 
         var idx = keys.indexOf(mst)
 
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
index 6cb378182..d0e8128b4 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
@@ -7,7 +7,6 @@ package space.kscience.kmath.ast
 
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 import kotlin.math.sin
@@ -17,18 +16,19 @@ import kotlin.time.measureTime
 import space.kscience.kmath.estree.compileToExpression as estreeCompileToExpression
 import space.kscience.kmath.wasm.compileToExpression as wasmCompileToExpression
 
+// TODO move to benchmarks when https://github.com/Kotlin/kotlinx-benchmark/pull/38 or similar feature is merged
 internal class TestExecutionTime {
     private companion object {
         private const val times = 1_000_000
         private val x by symbol
-        private val algebra: ExtendedField<Double> = DoubleField
+        private val algebra = DoubleField
 
         private val functional = DoubleField.expressionInExtendedField {
             bindSymbol(x) * const(2.0) + const(2.0) / bindSymbol(x) - const(16.0) / sin(bindSymbol(x))
         }
 
         private val node = MstExtendedField {
-            bindSymbol(x) * number(2.0) + number(2.0) / bindSymbol(x) - number(16.0) / sin(bindSymbol(x))
+            x * number(2.0) + number(2.0) / x - number(16.0) / sin(x)
         }
 
         private val mst = node.toExpression(DoubleField)
@@ -43,7 +43,13 @@ internal class TestExecutionTime {
         //  };
 
         private val raw = Expression<Double> { args ->
-            args.getValue(x) * 2.0 + 2.0 / args.getValue(x) - 16.0 / sin(args.getValue(x))
+            val x = args[x]!!
+            x * 2.0 + 2.0 / x - 16.0 / sin(x)
+        }
+
+        private val justCalculate = { args: dynamic ->
+            val x = args[x].unsafeCast<Double>()
+            x * 2.0 + 2.0 / x - 16.0 / sin(x)
         }
     }
 
@@ -51,21 +57,56 @@ internal class TestExecutionTime {
         println(name)
         val rng = Random(0)
         var sum = 0.0
-        measureTime { repeat(times) { sum += expr(x to rng.nextDouble()) } }.also(::println)
+        measureTime {
+            repeat(times) { sum += expr(x to rng.nextDouble()) }
+        }.also(::println)
     }
 
+    /**
+     * [Expression] created with [expressionInExtendedField].
+     */
     @Test
     fun functionalExpression() = invokeAndSum("functional", functional)
 
+    /**
+     * [Expression] created with [mstExpression].
+     */
     @Test
     fun mstExpression() = invokeAndSum("mst", mst)
 
+    /**
+     * [Expression] created with [wasmCompileToExpression].
+     */
     @Test
     fun wasmExpression() = invokeAndSum("wasm", wasm)
 
+    /**
+     * [Expression] created with [estreeCompileToExpression].
+     */
     @Test
     fun estreeExpression() = invokeAndSum("estree", wasm)
 
+    /**
+     * [Expression] implemented manually with `kotlin.math`.
+     */
     @Test
     fun rawExpression() = invokeAndSum("raw", raw)
+
+    /**
+     * Direct computation w/o [Expression].
+     */
+    @Test
+    fun justCalculateExpression() {
+        println("justCalculate")
+        val rng = Random(0)
+        var sum = 0.0
+        measureTime {
+            repeat(times) {
+                val arg = rng.nextDouble()
+                val o = js("{}")
+                o["x"] = arg
+                sum += justCalculate(o)
+            }
+        }.also(::println)
+    }
 }
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
index abdf865c7..45776c191 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
@@ -31,7 +31,7 @@ internal class TestWasmSpecific {
 
     @Test
     fun argsPassing() {
-        val res = MstExtendedField { bindSymbol(y) + bindSymbol(x).pow(10) }.compile(
+        val res = MstExtendedField { y + x.pow(10) }.compile(
             DoubleField,
             x to 2.0,
             y to 100000000.0,
@@ -42,7 +42,7 @@ internal class TestWasmSpecific {
 
     @Test
     fun powFunction() {
-        val expr = MstExtendedField { bindSymbol(x).pow(1.0 / 6.0) }.compileToExpression(DoubleField)
+        val expr = MstExtendedField { x.pow(1.0 / 6.0) }.compileToExpression(DoubleField)
         assertEquals(0.9730585187140817, expr(x to 0.8488554755054833))
     }
 
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
index cfac59847..a84248f63 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
@@ -63,7 +63,7 @@ internal fun MethodVisitor.label(): Label = Label().also(::visitLabel)
  * @author Iaroslav Postovalov
  */
 internal tailrec fun buildName(mst: MST, collision: Int = 0): String {
-    val name = "kscience.kmath.asm.generated.AsmCompiledExpression_${mst.hashCode()}_$collision"
+    val name = "space.kscience.kmath.asm.generated.AsmCompiledExpression_${mst.hashCode()}_$collision"
 
     try {
         Class.forName(name)
diff --git a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
index 57fe2411c..9378adfea 100644
--- a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
+++ b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
@@ -20,8 +20,7 @@ import kotlin.test.fail
 internal class AdaptingTests {
     @Test
     fun symbol() {
-        val c1 = MstNumericAlgebra.bindSymbol(x.identity)
-        assertEquals(x.identity, c1.toSVar<KMathNumber<Double, DoubleField>>().name)
+        assertEquals(x.identity, x.toSVar<KMathNumber<Double, DoubleField>>().name)
         val c2 = "kitten".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
         if (c2 is SVar) assertTrue(c2.name == "kitten") else fail()
     }
@@ -46,7 +45,7 @@ internal class AdaptingTests {
 
     @Test
     fun simpleFunctionDerivative() {
-        val xSVar = MstNumericAlgebra.bindSymbol(x.identity).toSVar<KMathNumber<Double, DoubleField>>()
+        val xSVar = x.toSVar<KMathNumber<Double, DoubleField>>()
         val quadratic = "x^2-4*x-44".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
         val actualDerivative = quadratic.d(xSVar).toMst().compileToExpression(DoubleField)
         val expectedDerivative = "2*x-4".parseMath().compileToExpression(DoubleField)
@@ -55,7 +54,7 @@ internal class AdaptingTests {
 
     @Test
     fun moreComplexDerivative() {
-        val xSVar = MstNumericAlgebra.bindSymbol(x.identity).toSVar<KMathNumber<Double, DoubleField>>()
+        val xSVar = x.toSVar<KMathNumber<Double, DoubleField>>()
         val composition = "-sqrt(sin(x^2)-cos(x)^2-16*x)".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
         val actualDerivative = composition.d(xSVar).toMst().compileToExpression(DoubleField)
 
-- 
2.34.1


From 2dff15c5aa2afe2ce99edfe8ae0fe4dc1db64087 Mon Sep 17 00:00:00 2001
From: therealansh <tyagiansh23@hotmail.com>
Date: Thu, 3 Jun 2021 01:14:19 +0530
Subject: [PATCH 283/713] integrate: Jafama + KMath

---
 kmath-jafama/build.gradle.kts                 |   21 +
 .../kscience/kmath/jafama/CmnFastMath.java    | 2112 ++++++++++++
 .../kscience/kmath/jafama/DoubleWrapper.java  |   13 +
 .../space/kscience/kmath/jafama/FastMath.java | 2986 ++++++++++++++++
 .../kscience/kmath/jafama/IntWrapper.java     |   13 +
 .../kscience/kmath/jafama/KMathJafama.kt      |  102 +
 .../kscience/kmath/jafama/NumbersUtils.java   | 2647 +++++++++++++++
 .../kscience/kmath/jafama/StrictFastMath.java | 2998 +++++++++++++++++
 settings.gradle.kts                           |    1 +
 9 files changed, 10893 insertions(+)
 create mode 100644 kmath-jafama/build.gradle.kts
 create mode 100644 kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/CmnFastMath.java
 create mode 100644 kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/DoubleWrapper.java
 create mode 100644 kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/FastMath.java
 create mode 100644 kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/IntWrapper.java
 create mode 100644 kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
 create mode 100644 kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/NumbersUtils.java
 create mode 100644 kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/StrictFastMath.java

diff --git a/kmath-jafama/build.gradle.kts b/kmath-jafama/build.gradle.kts
new file mode 100644
index 000000000..22d50f89c
--- /dev/null
+++ b/kmath-jafama/build.gradle.kts
@@ -0,0 +1,21 @@
+plugins {
+    id("ru.mipt.npm.gradle.jvm")
+}
+
+dependencies {
+    api(project(":kmath-ast"))
+    api(project(":kmath-complex"))
+    api(project(":kmath-for-real"))
+}
+
+kscience{
+    useHtml()
+}
+
+readme {
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+}
+
+kotlin.sourceSets.all {
+    languageSettings.useExperimentalAnnotation("space.kscience.kmath.misc.UnstableKMathAPI")
+}
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/CmnFastMath.java b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/CmnFastMath.java
new file mode 100644
index 000000000..0abc5d95d
--- /dev/null
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/CmnFastMath.java
@@ -0,0 +1,2112 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.jafama;
+
+/**
+ * Stuffs for FastMath and StrictFastMath.
+ */
+abstract class CmnFastMath {
+
+    /*
+     * For trigonometric functions, use of look-up tables and Taylor-Lagrange formula
+     * with 4 derivatives (more take longer to compute and don't add much accuracy,
+     * less require larger tables (which use more memory, take more time to initialize,
+     * and are slower to access (at least on the machine they were developed on))).
+     *
+     * For angles reduction of cos/sin/tan functions:
+     * - for small values, instead of reducing angles, and then computing the best index
+     *   for look-up tables, we compute this index right away, and use it for reduction,
+     * - for large values, treatments derived from fdlibm package are used, as done in
+     *   java.lang.Math. They are faster but still "slow", so if you work with
+     *   large numbers and need speed over accuracy for them, you might want to use
+     *   normalizeXXXFast treatments before your function, or modify cos/sin/tan
+     *   so that they call the fast normalization treatments instead of the accurate ones.
+     *   NB: If an angle is huge (like PI*1e20), in double precision format its last digits
+     *       are zeros, which most likely is not the case for the intended value, and doing
+     *       an accurate reduction on a very inaccurate value is most likely pointless.
+     *       But it gives some sort of coherence that could be needed in some cases.
+     *
+     * Multiplication on double appears to be about as fast (or not much slower) than call
+     * to <double_array>[<index>], and regrouping some doubles in a private class, to use
+     * index only once, does not seem to speed things up, so:
+     * - for uniformly tabulated values, to retrieve the parameter corresponding to
+     *   an index, we recompute it rather than using an array to store it,
+     * - for cos/sin, we recompute derivatives divided by (multiplied by inverse of)
+     *   factorial each time, rather than storing them in arrays.
+     *
+     * Lengths of look-up tables are usually of the form 2^n+1, for their values to be
+     * of the form (<a_constant> * k/2^n, k in 0 .. 2^n), so that particular values
+     * (PI/2, etc.) are "exactly" computed, as well as for other reasons.
+     *
+     * Tables are put in specific inner classes, to be lazily initialized.
+     * Always doing strict tables initialization, even if StrictFastMath delegates
+     * to StrictMath and doesn't use tables, which makes tables initialization a bit
+     * slower but code simpler.
+     * Using redefined pure Java treatments during tables initialization,
+     * instead of Math or StrictMath ones (even asin(double)), can be very slow,
+     * because class loading is likely not to be optimized.
+     *
+     * Most math treatments I could find on the web, including "fast" ones,
+     * usually take care of special cases (NaN, etc.) at the beginning, and
+     * then deal with the general case, which adds a useless overhead for the
+     * general (and common) case. In this class, special cases are only dealt
+     * with when needed, and if the general case does not already handle them.
+     */
+
+    /*
+     * Regarding strictfp-ness:
+     *
+     * Switching from/to strictfp has some overhead, so we try to only
+     * strictfp-ize when needed (or when clueless).
+     * Compile-time constants are computed in a FP-strict way, so no need
+     * to make this whole class strictfp.
+     */
+
+    //--------------------------------------------------------------------------
+    // CONFIGURATION
+    //--------------------------------------------------------------------------
+
+    /*
+     * FastMath
+     */
+
+    static final boolean FM_USE_JDK_MATH = getBooleanProperty("jafama.usejdk", false);
+
+    /**
+     * Used for both FastMath.log(double) and FastMath.log10(double).
+     */
+    static final boolean FM_USE_REDEFINED_LOG = getBooleanProperty("jafama.fastlog", false);
+
+    static final boolean FM_USE_REDEFINED_SQRT = getBooleanProperty("jafama.fastsqrt", false);
+
+    /**
+     * Set it to true if FastMath.sqrt(double) is slow
+     * (more tables, but less calls to FastMath.sqrt(double)).
+     */
+    static final boolean FM_USE_POWTABS_FOR_ASIN = false;
+
+    /*
+     * StrictFastMath
+     */
+
+    static final boolean SFM_USE_JDK_MATH = getBooleanProperty("jafama.strict.usejdk", false);
+
+    /**
+     * Used for both StrictFastMath.log(double) and StrictFastMath.log10(double).
+     * True by default because the StrictMath implementations can be slow.
+     */
+    static final boolean SFM_USE_REDEFINED_LOG = getBooleanProperty("jafama.strict.fastlog", true);
+
+    static final boolean SFM_USE_REDEFINED_SQRT = getBooleanProperty("jafama.strict.fastsqrt", false);
+
+    /**
+     * Set it to true if StrictFastMath.sqrt(double) is slow
+     * (more tables, but less calls to StrictFastMath.sqrt(double)).
+     */
+    static final boolean SFM_USE_POWTABS_FOR_ASIN = false;
+
+    /*
+     * Common to FastMath and StrictFastMath.
+     */
+
+    /**
+     * Using two pow tab can just make things barely faster,
+     * and could relatively hurt in case of cache-misses,
+     * especially for methods that otherwise wouldn't rely
+     * on any tab, so we don't use it.
+     */
+    static final boolean USE_TWO_POW_TAB = false;
+
+    /**
+     * Because on some architectures, some casts can be slow,
+     * especially for large values.
+     * Might make things a bit slower for latest architectures,
+     * but not as much as it makes them faster for older ones.
+     */
+    static final boolean ANTI_SLOW_CASTS = true;
+
+    /**
+     * If some methods get JIT-optimized, they might crash
+     * if they contain "(var == xxx)" with var being NaN
+     * (can happen with Java 6u29).
+     *
+     * The crash does not happen if we replace "==" with "<" or ">".
+     *
+     * Only the code that has been observed to trigger the bug
+     * has been modified.
+     */
+    static final boolean ANTI_JIT_OPTIM_CRASH_ON_NAN = true;
+
+    //--------------------------------------------------------------------------
+    // GENERAL CONSTANTS
+    //--------------------------------------------------------------------------
+
+    /**
+     * Closest double approximation of e.
+     */
+    public static final double E = Math.E;
+
+    /**
+     * Closest double approximation of pi, which is inferior to mathematical pi:
+     * pi ~= 3.14159265358979323846...
+     * PI ~= 3.141592653589793
+     */
+    public static final double PI = Math.PI;
+
+    /**
+     * High double approximation of pi, which is further from pi
+     * than the low approximation PI:
+     *     pi ~= 3.14159265358979323846...
+     *     PI ~= 3.141592653589793
+     * PI_SUP ~= 3.1415926535897936
+     */
+    public static final double PI_SUP = Double.longBitsToDouble(Double.doubleToRawLongBits(Math.PI)+1);
+
+    static final double ONE_DIV_F2 = 1/2.0;
+    static final double ONE_DIV_F3 = 1/6.0;
+    static final double ONE_DIV_F4 = 1/24.0;
+
+    static final float TWO_POW_23_F = (float)NumbersUtils.twoPow(23);
+
+    static final double TWO_POW_24 = NumbersUtils.twoPow(24);
+    private static final double TWO_POW_N24 = NumbersUtils.twoPow(-24);
+
+    static final double TWO_POW_26 = NumbersUtils.twoPow(26);
+    static final double TWO_POW_N26 = NumbersUtils.twoPow(-26);
+
+    // First double value (from zero) such as (value+-1/value == value).
+    static final double TWO_POW_27 = NumbersUtils.twoPow(27);
+    static final double TWO_POW_N27 = NumbersUtils.twoPow(-27);
+
+    static final double TWO_POW_N28 = NumbersUtils.twoPow(-28);
+
+    static final double TWO_POW_52 = NumbersUtils.twoPow(52);
+
+    static final double TWO_POW_N55 = NumbersUtils.twoPow(-55);
+
+    static final double TWO_POW_66 = NumbersUtils.twoPow(66);
+
+    static final double TWO_POW_512 = NumbersUtils.twoPow(512);
+    static final double TWO_POW_N512 = NumbersUtils.twoPow(-512);
+
+    /**
+     * Double.MIN_NORMAL since Java 6.
+     */
+    static final double DOUBLE_MIN_NORMAL = Double.longBitsToDouble(0x0010000000000000L); // 2.2250738585072014E-308
+
+    // Not storing float/double mantissa size in constants,
+    // for 23 and 52 are shorter to read and more
+    // bitwise-explicit than some constant's name.
+
+    static final int MIN_DOUBLE_EXPONENT = -1074;
+    static final int MIN_DOUBLE_NORMAL_EXPONENT = -1022;
+    static final int MAX_DOUBLE_EXPONENT = 1023;
+
+    static final int MIN_FLOAT_NORMAL_EXPONENT = -126;
+    static final int MAX_FLOAT_EXPONENT = 127;
+
+    private static final double SQRT_2 = StrictMath.sqrt(2.0);
+
+    static final double LOG_2 = StrictMath.log(2.0);
+    static final double LOG_TWO_POW_27 = StrictMath.log(TWO_POW_27);
+    static final double LOG_DOUBLE_MAX_VALUE = StrictMath.log(Double.MAX_VALUE);
+
+    static final double INV_LOG_10 = 1.0/StrictMath.log(10.0);
+
+    static final double DOUBLE_BEFORE_60 = Double.longBitsToDouble(Double.doubleToRawLongBits(60.0)-1);
+
+    //--------------------------------------------------------------------------
+    // CONSTANTS FOR NORMALIZATIONS
+    //--------------------------------------------------------------------------
+
+    /**
+     * Table of constants for 1/(PI/2), 282 Hex digits (enough for normalizing doubles).
+     * 1/(PI/2) approximation = sum of TWO_OVER_PI_TAB[i]*2^(-24*(i+1)).
+     *
+     * double and not int, to avoid int-to-double cast during computations.
+     */
+    private static final double TWO_OVER_PI_TAB[] = {
+        0xA2F983, 0x6E4E44, 0x1529FC, 0x2757D1, 0xF534DD, 0xC0DB62,
+        0x95993C, 0x439041, 0xFE5163, 0xABDEBB, 0xC561B7, 0x246E3A,
+        0x424DD2, 0xe00649, 0x2EEA09, 0xD1921C, 0xFE1DEB, 0x1CB129,
+        0xA73EE8, 0x8235F5, 0x2EBB44, 0x84E99C, 0x7026B4, 0x5F7E41,
+        0x3991d6, 0x398353, 0x39F49C, 0x845F8B, 0xBDF928, 0x3B1FF8,
+        0x97FFDE, 0x05980F, 0xEF2F11, 0x8B5A0A, 0x6D1F6D, 0x367ECF,
+        0x27CB09, 0xB74F46, 0x3F669E, 0x5FEA2D, 0x7527BA, 0xC7EBE5,
+        0xF17B3D, 0x0739F7, 0x8A5292, 0xEA6BFB, 0x5FB11F, 0x8D5D08,
+        0x560330, 0x46FC7B, 0x6BABF0, 0xCFBC20, 0x9AF436, 0x1DA9E3,
+        0x91615E, 0xE61B08, 0x659985, 0x5F14A0, 0x68408D, 0xFFD880,
+        0x4D7327, 0x310606, 0x1556CA, 0x73A8C9, 0x60E27B, 0xC08C6B};
+
+    /*
+     * Constants for PI/2. Only the 23 most significant bits of each mantissa are used.
+     * 2*PI approximation = sum of TWOPI_TAB<i>.
+     */
+    private static final double PIO2_TAB0 = Double.longBitsToDouble(0x3FF921FB40000000L);
+    private static final double PIO2_TAB1 = Double.longBitsToDouble(0x3E74442D00000000L);
+    private static final double PIO2_TAB2 = Double.longBitsToDouble(0x3CF8469880000000L);
+    private static final double PIO2_TAB3 = Double.longBitsToDouble(0x3B78CC5160000000L);
+    private static final double PIO2_TAB4 = Double.longBitsToDouble(0x39F01B8380000000L);
+    private static final double PIO2_TAB5 = Double.longBitsToDouble(0x387A252040000000L);
+
+    static final double PIO2_INV = Double.longBitsToDouble(0x3FE45F306DC9C883L); // 6.36619772367581382433e-01 53 bits of 2/pi
+    static final double PIO2_HI = Double.longBitsToDouble(0x3FF921FB54400000L); // 1.57079632673412561417e+00 first 33 bits of pi/2
+    static final double PIO2_LO = Double.longBitsToDouble(0x3DD0B4611A626331L); // 6.07710050650619224932e-11 pi/2 - PIO2_HI
+    static final double PI_INV = PIO2_INV/2;
+    static final double PI_HI = 2*PIO2_HI;
+    static final double PI_LO = 2*PIO2_LO;
+    static final double TWOPI_INV = PIO2_INV/4;
+    static final double TWOPI_HI = 4*PIO2_HI;
+    static final double TWOPI_LO = 4*PIO2_LO;
+
+    /**
+     * Bit = 0 where quadrant is encoded in remainder bits.
+     */
+    private static final long QUADRANT_BITS_0_MASK = 0xCFFFFFFFFFFFFFFFL;
+
+    /**
+     * Remainder bits where quadrant is encoded, 0 elsewhere.
+     */
+    private static final long QUADRANT_PLACE_BITS = 0x3000000000000000L;
+
+    /**
+     * fdlibm uses 2^19*PI/2 here.
+     * With 2^18*PI/2 we would be more accurate, for example when normalizing
+     * 822245.903631403, which is close to 2^19*PI/2, but we are still in
+     * our accuracy tolerance with fdlibm's value (but not 2^20*PI/2) so we
+     * stick to it, to help being faster than (Strict)Math for values in
+     * [2^18*PI/2,2^19*PI/2].
+     *
+     * For tests, can use a smaller value, for heavy remainder
+     * not to only be used with huge values.
+     */
+    static final double NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2 = StrictMath.pow(2.0,19.0)*(Math.PI/2);
+
+    /**
+     * 2*Math.PI, normalized into [-PI,PI], as returned by
+     * StrictMath.asin(StrictMath.sin(2*Math.PI))
+     * (asin behaves as identity for this).
+     *
+     * NB: NumbersUtils.minus2PI(2*Math.PI) returns  -2.449293598153844E-16,
+     * which is different due to not using an accurate enough definition of PI.
+     */
+    static final double TWO_MATH_PI_IN_MINUS_PI_PI = -2.4492935982947064E-16;
+
+    //--------------------------------------------------------------------------
+    // CONSTANTS AND TABLES FOR SIN AND COS
+    //--------------------------------------------------------------------------
+
+    static final int SIN_COS_TABS_SIZE = (1<<getTabSizePower(11)) + 1;
+    static final double SIN_COS_DELTA_HI = TWOPI_HI/(SIN_COS_TABS_SIZE-1);
+    static final double SIN_COS_DELTA_LO = TWOPI_LO/(SIN_COS_TABS_SIZE-1);
+    static final double SIN_COS_INDEXER = 1/(SIN_COS_DELTA_HI+SIN_COS_DELTA_LO);
+
+    static final class MyTSinCos {
+        static final double[] sinTab = new double[SIN_COS_TABS_SIZE];
+        static final double[] cosTab = new double[SIN_COS_TABS_SIZE];
+        static {
+            init();
+        }
+        private static strictfp void init() {
+            final int SIN_COS_PI_INDEX = (SIN_COS_TABS_SIZE-1)/2;
+            final int SIN_COS_PI_MUL_2_INDEX = 2*SIN_COS_PI_INDEX;
+            final int SIN_COS_PI_MUL_0_5_INDEX = SIN_COS_PI_INDEX/2;
+            final int SIN_COS_PI_MUL_1_5_INDEX = 3*SIN_COS_PI_INDEX/2;
+            for (int i=0;i<SIN_COS_TABS_SIZE;i++) {
+                // angle: in [0,2*PI] (doesn't seem to help to have it in [-PI,PI]).
+                double angle = i * SIN_COS_DELTA_HI + i * SIN_COS_DELTA_LO;
+                double sinAngle = StrictMath.sin(angle);
+                double cosAngle = StrictMath.cos(angle);
+                // For indexes corresponding to zero cosine or sine, we make sure
+                // the value is zero and not an epsilon, since each value
+                // corresponds to sin-or-cos(i*PI/n), where PI is a more accurate
+                // definition of PI than Math.PI.
+                // This allows for a much better accuracy for results close to zero.
+                if (i == SIN_COS_PI_INDEX) {
+                    sinAngle = 0.0;
+                } else if (i == SIN_COS_PI_MUL_2_INDEX) {
+                    sinAngle = 0.0;
+                } else if (i == SIN_COS_PI_MUL_0_5_INDEX) {
+                    cosAngle = 0.0;
+                } else if (i == SIN_COS_PI_MUL_1_5_INDEX) {
+                    cosAngle = 0.0;
+                }
+                sinTab[i] = sinAngle;
+                cosTab[i] = cosAngle;
+            }
+        }
+    }
+
+    /**
+     * Max abs value for index-based reduction, above which we use regular angle normalization.
+     * This value must be < (Integer.MAX_VALUE / SIN_COS_INDEXER), to stay in range of int type.
+     * If too high, error gets larger because index-based reduction doesn't use an accurate
+     * enough definition of PI.
+     * If too low, and if we would be using remainder into [-PI,PI] instead of into [-PI/4,PI/4],
+     * error would get larger as well, because remainder would just provide a double, while
+     * index-based reduction is more accurate, using delta from index values and HI/LO values.
+     */
+    static final double SIN_COS_MAX_VALUE_FOR_INT_MODULO = ((Integer.MAX_VALUE>>9) / SIN_COS_INDEXER) * 0.99;
+
+    //--------------------------------------------------------------------------
+    // CONSTANTS AND TABLES FOR TAN
+    //--------------------------------------------------------------------------
+
+    // We use the following formula:
+    // 1) tan(-x) = -tan(x)
+    // 2) tan(x) = 1/tan(PI/2-x)
+    // ---> we only have to compute tan(x) on [0,A] with PI/4<=A<PI/2.
+
+    /**
+     * We use indexing past look-up tables, so that indexing information
+     * allows for fast recomputation of angle in [0,PI/2] range.
+     */
+    static final int TAN_VIRTUAL_TABS_SIZE = (1<<getTabSizePower(12)) + 1;
+
+    /**
+     * Must be >= 45deg, and supposed to be >= 51.4deg, as fdlibm code is not
+     * supposed to work with values inferior to that (51.4deg is about
+     * (PI/2-Double.longBitsToDouble(0x3FE5942800000000L))).
+     */
+    static final double TAN_MAX_VALUE_FOR_TABS = StrictMath.toRadians(77.0);
+
+    static final int TAN_TABS_SIZE = (int)((TAN_MAX_VALUE_FOR_TABS/(Math.PI/2)) * (TAN_VIRTUAL_TABS_SIZE-1)) + 1;
+    static final double TAN_DELTA_HI = PIO2_HI/(TAN_VIRTUAL_TABS_SIZE-1);
+    static final double TAN_DELTA_LO = PIO2_LO/(TAN_VIRTUAL_TABS_SIZE-1);
+    static final double TAN_INDEXER = 1/(TAN_DELTA_HI+TAN_DELTA_LO);
+
+    static final class MyTTan {
+        static final double[] tanTab = new double[TAN_TABS_SIZE];
+        static final double[] tanDer1DivF1Tab = new double[TAN_TABS_SIZE];
+        static final double[] tanDer2DivF2Tab = new double[TAN_TABS_SIZE];
+        static final double[] tanDer3DivF3Tab = new double[TAN_TABS_SIZE];
+        static final double[] tanDer4DivF4Tab = new double[TAN_TABS_SIZE];
+        static {
+            init();
+        }
+        private static strictfp void init() {
+            for (int i=0;i<TAN_TABS_SIZE;i++) {
+                // angle: in [0,TAN_MAX_VALUE_FOR_TABS].
+                double angle = i * TAN_DELTA_HI + i * TAN_DELTA_LO;
+                double sinAngle = StrictMath.sin(angle);
+                double cosAngle = StrictMath.cos(angle);
+                double cosAngleInv = 1/cosAngle;
+                double cosAngleInv2 = cosAngleInv*cosAngleInv;
+                double cosAngleInv3 = cosAngleInv2*cosAngleInv;
+                double cosAngleInv4 = cosAngleInv2*cosAngleInv2;
+                double cosAngleInv5 = cosAngleInv3*cosAngleInv2;
+                tanTab[i] = sinAngle * cosAngleInv;
+                tanDer1DivF1Tab[i] = cosAngleInv2;
+                tanDer2DivF2Tab[i] = ((2*sinAngle)*cosAngleInv3) * ONE_DIV_F2;
+                tanDer3DivF3Tab[i] = ((2*(1+2*sinAngle*sinAngle))*cosAngleInv4) * ONE_DIV_F3;
+                tanDer4DivF4Tab[i] = ((8*sinAngle*(2+sinAngle*sinAngle))*cosAngleInv5) * ONE_DIV_F4;
+            }
+        }
+    }
+
+    /**
+     * Max abs value for fast modulo, above which we use regular angle normalization.
+     * This value must be < (Integer.MAX_VALUE / TAN_INDEXER), to stay in range of int type.
+     * If too high, error gets larger because index-based reduction doesn't use an accurate
+     * enough definition of PI.
+     * If too low, error gets larger as well, because we use remainder into [-PI/2,PI/2],
+     * just provides a double, while index-based reduction is more accurate, using delta
+     * from index values and HI/LO values.
+     */
+    static final double TAN_MAX_VALUE_FOR_INT_MODULO = (((Integer.MAX_VALUE>>9) / TAN_INDEXER) * 0.99);
+
+    //--------------------------------------------------------------------------
+    // CONSTANTS AND TABLES FOR ACOS, ASIN
+    //--------------------------------------------------------------------------
+
+    // We use the following formula:
+    // 1) acos(x) = PI/2 - asin(x)
+    // 2) asin(-x) = -asin(x)
+    // ---> we only have to compute asin(x) on [0,1].
+    // For values not close to +-1, we use look-up tables;
+    // for values near +-1, we use code derived from fdlibm.
+
+    /**
+     * Supposed to be >= sin(77.2deg), as fdlibm code is supposed to work with values > 0.975,
+     * but seems to work well enough as long as value >= sin(25deg).
+     */
+    static final double ASIN_MAX_VALUE_FOR_TABS = StrictMath.sin(StrictMath.toRadians(73.0));
+
+    static final int ASIN_TABS_SIZE = (1<<getTabSizePower(13)) + 1;
+    static final double ASIN_DELTA = ASIN_MAX_VALUE_FOR_TABS/(ASIN_TABS_SIZE - 1);
+    static final double ASIN_INDEXER = 1/ASIN_DELTA;
+
+    static final class MyTAsin {
+        static final double[] asinTab = new double[ASIN_TABS_SIZE];
+        static final double[] asinDer1DivF1Tab = new double[ASIN_TABS_SIZE];
+        static final double[] asinDer2DivF2Tab = new double[ASIN_TABS_SIZE];
+        static final double[] asinDer3DivF3Tab = new double[ASIN_TABS_SIZE];
+        static final double[] asinDer4DivF4Tab = new double[ASIN_TABS_SIZE];
+        static {
+            init();
+        }
+        private static strictfp void init() {
+            for (int i=0;i<ASIN_TABS_SIZE;i++) {
+                // x: in [0,ASIN_MAX_VALUE_FOR_TABS].
+                double x = i * ASIN_DELTA;
+                double oneMinusXSqInv = 1/(1-x*x);
+                double oneMinusXSqInv0_5 = StrictMath.sqrt(oneMinusXSqInv);
+                double oneMinusXSqInv1_5 = oneMinusXSqInv0_5*oneMinusXSqInv;
+                double oneMinusXSqInv2_5 = oneMinusXSqInv1_5*oneMinusXSqInv;
+                double oneMinusXSqInv3_5 = oneMinusXSqInv2_5*oneMinusXSqInv;
+                asinTab[i] = StrictMath.asin(x);
+                asinDer1DivF1Tab[i] = oneMinusXSqInv0_5;
+                asinDer2DivF2Tab[i] = (x*oneMinusXSqInv1_5) * ONE_DIV_F2;
+                asinDer3DivF3Tab[i] = ((1+2*x*x)*oneMinusXSqInv2_5) * ONE_DIV_F3;
+                asinDer4DivF4Tab[i] = ((5+2*x*(2+x*(5-2*x)))*oneMinusXSqInv3_5) * ONE_DIV_F4;
+            }
+        }
+    }
+
+    static final double ASIN_MAX_VALUE_FOR_POWTABS = StrictMath.sin(StrictMath.toRadians(88.6));
+    static final int ASIN_POWTABS_POWER = 84;
+
+    static final double ASIN_POWTABS_ONE_DIV_MAX_VALUE = 1/ASIN_MAX_VALUE_FOR_POWTABS;
+    static final int ASIN_POWTABS_SIZE = (FM_USE_POWTABS_FOR_ASIN || SFM_USE_POWTABS_FOR_ASIN) ? (1<<getTabSizePower(12)) + 1 : 0;
+    static final int ASIN_POWTABS_SIZE_MINUS_ONE = ASIN_POWTABS_SIZE - 1;
+
+    static final class MyTAsinPow {
+        static final double[] asinParamPowTab = new double[ASIN_POWTABS_SIZE];
+        static final double[] asinPowTab = new double[ASIN_POWTABS_SIZE];
+        static final double[] asinDer1DivF1PowTab = new double[ASIN_POWTABS_SIZE];
+        static final double[] asinDer2DivF2PowTab = new double[ASIN_POWTABS_SIZE];
+        static final double[] asinDer3DivF3PowTab = new double[ASIN_POWTABS_SIZE];
+        static final double[] asinDer4DivF4PowTab = new double[ASIN_POWTABS_SIZE];
+        static {
+            init();
+        }
+        private static strictfp void init() {
+            if (FM_USE_POWTABS_FOR_ASIN || SFM_USE_POWTABS_FOR_ASIN) {
+                for (int i=0;i<ASIN_POWTABS_SIZE;i++) {
+                    // x: in [0,ASIN_MAX_VALUE_FOR_POWTABS].
+                    double x = StrictMath.pow(i*(1.0/ASIN_POWTABS_SIZE_MINUS_ONE), 1.0/ASIN_POWTABS_POWER) * ASIN_MAX_VALUE_FOR_POWTABS;
+                    double oneMinusXSqInv = 1/(1-x*x);
+                    double oneMinusXSqInv0_5 = StrictMath.sqrt(oneMinusXSqInv);
+                    double oneMinusXSqInv1_5 = oneMinusXSqInv0_5*oneMinusXSqInv;
+                    double oneMinusXSqInv2_5 = oneMinusXSqInv1_5*oneMinusXSqInv;
+                    double oneMinusXSqInv3_5 = oneMinusXSqInv2_5*oneMinusXSqInv;
+                    asinParamPowTab[i] = x;
+                    asinPowTab[i] = StrictMath.asin(x);
+                    asinDer1DivF1PowTab[i] = oneMinusXSqInv0_5;
+                    asinDer2DivF2PowTab[i] = (x*oneMinusXSqInv1_5) * ONE_DIV_F2;
+                    asinDer3DivF3PowTab[i] = ((1+2*x*x)*oneMinusXSqInv2_5) * ONE_DIV_F3;
+                    asinDer4DivF4PowTab[i] = ((5+2*x*(2+x*(5-2*x)))*oneMinusXSqInv3_5) * ONE_DIV_F4;
+                }
+            }
+        }
+    }
+
+    static final double ASIN_PIO2_HI = Double.longBitsToDouble(0x3FF921FB54442D18L); // 1.57079632679489655800e+00
+    static final double ASIN_PIO2_LO = Double.longBitsToDouble(0x3C91A62633145C07L); // 6.12323399573676603587e-17
+    static final double ASIN_PS0 = Double.longBitsToDouble(0x3fc5555555555555L); //  1.66666666666666657415e-01
+    static final double ASIN_PS1 = Double.longBitsToDouble(0xbfd4d61203eb6f7dL); // -3.25565818622400915405e-01
+    static final double ASIN_PS2 = Double.longBitsToDouble(0x3fc9c1550e884455L); //  2.01212532134862925881e-01
+    static final double ASIN_PS3 = Double.longBitsToDouble(0xbfa48228b5688f3bL); // -4.00555345006794114027e-02
+    static final double ASIN_PS4 = Double.longBitsToDouble(0x3f49efe07501b288L); //  7.91534994289814532176e-04
+    static final double ASIN_PS5 = Double.longBitsToDouble(0x3f023de10dfdf709L); //  3.47933107596021167570e-05
+    static final double ASIN_QS1 = Double.longBitsToDouble(0xc0033a271c8a2d4bL); // -2.40339491173441421878e+00
+    static final double ASIN_QS2 = Double.longBitsToDouble(0x40002ae59c598ac8L); //  2.02094576023350569471e+00
+    static final double ASIN_QS3 = Double.longBitsToDouble(0xbfe6066c1b8d0159L); // -6.88283971605453293030e-01
+    static final double ASIN_QS4 = Double.longBitsToDouble(0x3fb3b8c5b12e9282L); //  7.70381505559019352791e-02
+
+    //--------------------------------------------------------------------------
+    // CONSTANTS AND TABLES FOR ATAN
+    //--------------------------------------------------------------------------
+
+    // We use the formula atan(-x) = -atan(x)
+    // ---> we only have to compute atan(x) on [0,+Infinity[.
+    // For values corresponding to angles not close to +-PI/2, we use look-up tables;
+    // for values corresponding to angles near +-PI/2, we use code derived from fdlibm.
+
+    /**
+     * Supposed to be >= tan(67.7deg), as fdlibm code is supposed to work with values > 2.4375.
+     */
+    static final double ATAN_MAX_VALUE_FOR_TABS = StrictMath.tan(StrictMath.toRadians(74.0));
+
+    static final int ATAN_TABS_SIZE = (1<<getTabSizePower(12)) + 1;
+    static final double ATAN_DELTA = ATAN_MAX_VALUE_FOR_TABS/(ATAN_TABS_SIZE - 1);
+    static final double ATAN_INDEXER = 1/ATAN_DELTA;
+
+    static final class MyTAtan {
+        static final double[] atanTab = new double[ATAN_TABS_SIZE];
+        static final double[] atanDer1DivF1Tab = new double[ATAN_TABS_SIZE];
+        static final double[] atanDer2DivF2Tab = new double[ATAN_TABS_SIZE];
+        static final double[] atanDer3DivF3Tab = new double[ATAN_TABS_SIZE];
+        static final double[] atanDer4DivF4Tab = new double[ATAN_TABS_SIZE];
+        static {
+            init();
+        }
+        private static strictfp void init() {
+            for (int i=0;i<ATAN_TABS_SIZE;i++) {
+                // x: in [0,ATAN_MAX_VALUE_FOR_TABS].
+                double x = i * ATAN_DELTA;
+                double onePlusXSqInv = 1/(1+x*x);
+                double onePlusXSqInv2 = onePlusXSqInv*onePlusXSqInv;
+                double onePlusXSqInv3 = onePlusXSqInv2*onePlusXSqInv;
+                double onePlusXSqInv4 = onePlusXSqInv2*onePlusXSqInv2;
+                atanTab[i] = StrictMath.atan(x);
+                atanDer1DivF1Tab[i] = onePlusXSqInv;
+                atanDer2DivF2Tab[i] = (-2*x*onePlusXSqInv2) * ONE_DIV_F2;
+                atanDer3DivF3Tab[i] = ((-2+6*x*x)*onePlusXSqInv3) * ONE_DIV_F3;
+                atanDer4DivF4Tab[i] = ((24*x*(1-x*x))*onePlusXSqInv4) * ONE_DIV_F4;
+            }
+        }
+    }
+
+    static final double ATAN_HI3 = Double.longBitsToDouble(0x3ff921fb54442d18L); // 1.57079632679489655800e+00 atan(inf)hi
+    static final double ATAN_LO3 = Double.longBitsToDouble(0x3c91a62633145c07L); // 6.12323399573676603587e-17 atan(inf)lo
+    static final double ATAN_AT0 = Double.longBitsToDouble(0x3fd555555555550dL); //  3.33333333333329318027e-01
+    static final double ATAN_AT1 = Double.longBitsToDouble(0xbfc999999998ebc4L); // -1.99999999998764832476e-01
+    static final double ATAN_AT2 = Double.longBitsToDouble(0x3fc24924920083ffL); //  1.42857142725034663711e-01
+    static final double ATAN_AT3 = Double.longBitsToDouble(0xbfbc71c6fe231671L); // -1.11111104054623557880e-01
+    static final double ATAN_AT4 = Double.longBitsToDouble(0x3fb745cdc54c206eL); //  9.09088713343650656196e-02
+    static final double ATAN_AT5 = Double.longBitsToDouble(0xbfb3b0f2af749a6dL); // -7.69187620504482999495e-02
+    static final double ATAN_AT6 = Double.longBitsToDouble(0x3fb10d66a0d03d51L); //  6.66107313738753120669e-02
+    static final double ATAN_AT7 = Double.longBitsToDouble(0xbfadde2d52defd9aL); // -5.83357013379057348645e-02
+    static final double ATAN_AT8 = Double.longBitsToDouble(0x3fa97b4b24760debL); //  4.97687799461593236017e-02
+    static final double ATAN_AT9 = Double.longBitsToDouble(0xbfa2b4442c6a6c2fL); // -3.65315727442169155270e-02
+    static final double ATAN_AT10 = Double.longBitsToDouble(0x3f90ad3ae322da11L); // 1.62858201153657823623e-02
+
+    //--------------------------------------------------------------------------
+    // CONSTANTS AND TABLES FOR TANH
+    //--------------------------------------------------------------------------
+
+    /**
+     * Constant found experimentally:
+     * StrictMath.tanh(TANH_1_THRESHOLD) = 1,
+     * StrictMath.tanh(nextDown(TANH_1_THRESHOLD)) = FastMath.tanh(nextDown(TANH_1_THRESHOLD)) < 1.
+     */
+    static final double TANH_1_THRESHOLD = 19.061547465398498;
+
+    //--------------------------------------------------------------------------
+    // CONSTANTS AND TABLES FOR ASINH AND ACOSH
+    //--------------------------------------------------------------------------
+
+    static final double ASINH_LOG1P_THRESHOLD = 0.04;
+
+    /**
+     * sqrt(x*x+-1) should yield higher threshold, but it's enough due to
+     * subsequent log.
+     */
+    static final double ASINH_ACOSH_SQRT_ELISION_THRESHOLD = (1<<24);
+
+    //--------------------------------------------------------------------------
+    // CONSTANTS AND TABLES FOR EXP AND EXPM1
+    //--------------------------------------------------------------------------
+
+    static final double EXP_OVERFLOW_LIMIT = Double.longBitsToDouble(0x40862E42FEFA39EFL); // 7.09782712893383973096e+02
+    static final double EXP_UNDERFLOW_LIMIT = Double.longBitsToDouble(0xC0874910D52D3051L); // -7.45133219101941108420e+02
+    static final int EXP_LO_DISTANCE_TO_ZERO_POT = 0;
+    static final int EXP_LO_DISTANCE_TO_ZERO = (1<<EXP_LO_DISTANCE_TO_ZERO_POT);
+    static final int EXP_LO_TAB_SIZE_POT = getTabSizePower(11);
+    static final int EXP_LO_TAB_SIZE = (1<<EXP_LO_TAB_SIZE_POT)+1;
+    static final int EXP_LO_TAB_MID_INDEX = ((EXP_LO_TAB_SIZE-1)/2);
+    static final int EXP_LO_INDEXING = EXP_LO_TAB_MID_INDEX/EXP_LO_DISTANCE_TO_ZERO;
+    static final int EXP_LO_INDEXING_DIV_SHIFT = EXP_LO_TAB_SIZE_POT-1-EXP_LO_DISTANCE_TO_ZERO_POT;
+
+    static final class MyTExp {
+        static final double[] expHiTab = new double[1+(int)EXP_OVERFLOW_LIMIT-(int)EXP_UNDERFLOW_LIMIT];
+        static final double[] expLoPosTab = new double[EXP_LO_TAB_SIZE];
+        static final double[] expLoNegTab = new double[EXP_LO_TAB_SIZE];
+        static {
+            init();
+        }
+        private static strictfp void init() {
+            for (int i=(int)EXP_UNDERFLOW_LIMIT;i<=(int)EXP_OVERFLOW_LIMIT;i++) {
+                expHiTab[i-(int)EXP_UNDERFLOW_LIMIT] = StrictMath.exp(i);
+            }
+            for (int i=0;i<EXP_LO_TAB_SIZE;i++) {
+                // x: in [-EXPM1_DISTANCE_TO_ZERO,EXPM1_DISTANCE_TO_ZERO].
+                double x = -EXP_LO_DISTANCE_TO_ZERO + i/(double)EXP_LO_INDEXING;
+                // exp(x)
+                expLoPosTab[i] = StrictMath.exp(x);
+                // 1-exp(-x), accurately computed
+                expLoNegTab[i] = -StrictMath.expm1(-x);
+            }
+        }
+    }
+
+    //--------------------------------------------------------------------------
+    // CONSTANTS AND TABLES FOR LOG AND LOG1P
+    //--------------------------------------------------------------------------
+
+    static final int LOG_BITS = getTabSizePower(12);
+    static final int LOG_TAB_SIZE = (1<<LOG_BITS);
+
+    static final class MyTLog {
+        static final double[] logXLogTab = new double[LOG_TAB_SIZE];
+        static final double[] logXTab = new double[LOG_TAB_SIZE];
+        static final double[] logXInvTab = new double[LOG_TAB_SIZE];
+        static {
+            init();
+        }
+        private static strictfp void init() {
+            for (int i=0;i<LOG_TAB_SIZE;i++) {
+                // Exact to use inverse of tab size, since it is a power of two.
+                double x = 1+i*(1.0/LOG_TAB_SIZE);
+                logXLogTab[i] = StrictMath.log(x);
+                logXTab[i] = x;
+                logXInvTab[i] = 1/x;
+            }
+        }
+    }
+
+    //--------------------------------------------------------------------------
+    // TABLE FOR POWERS OF TWO
+    //--------------------------------------------------------------------------
+
+    static final int TWO_POW_TAB_SIZE = USE_TWO_POW_TAB ? (MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT)+1 : 0;
+
+    static final class MyTTwoPow {
+        static final double[] twoPowTab = new double[TWO_POW_TAB_SIZE];
+        static {
+            init();
+        }
+        private static strictfp void init() {
+            if (USE_TWO_POW_TAB) {
+                for (int i=MIN_DOUBLE_EXPONENT;i<=MAX_DOUBLE_EXPONENT;i++) {
+                    twoPowTab[i-MIN_DOUBLE_EXPONENT] = NumbersUtils.twoPow(i);
+                }
+            }
+        }
+    }
+
+    //--------------------------------------------------------------------------
+    // CONSTANTS AND TABLES FOR SQRT
+    //--------------------------------------------------------------------------
+
+    static final int SQRT_LO_BITS = getTabSizePower(12);
+    static final int SQRT_LO_TAB_SIZE = (1<<SQRT_LO_BITS);
+
+    static final class MyTSqrt {
+        static final double[] sqrtXSqrtHiTab = new double[MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT+1];
+        static final double[] sqrtXSqrtLoTab = new double[SQRT_LO_TAB_SIZE];
+        static final double[] sqrtSlopeHiTab = new double[MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT+1];
+        static final double[] sqrtSlopeLoTab = new double[SQRT_LO_TAB_SIZE];
+        static {
+            init();
+        }
+        private static strictfp void init() {
+            for (int i=MIN_DOUBLE_EXPONENT;i<=MAX_DOUBLE_EXPONENT;i++) {
+                double twoPowExpDiv2 = StrictMath.pow(2.0,i*0.5);
+                sqrtXSqrtHiTab[i-MIN_DOUBLE_EXPONENT] = twoPowExpDiv2 * 0.5; // Half sqrt, to avoid overflows.
+                sqrtSlopeHiTab[i-MIN_DOUBLE_EXPONENT] = 1/twoPowExpDiv2;
+            }
+            sqrtXSqrtLoTab[0] = 1.0;
+            sqrtSlopeLoTab[0] = 1.0;
+            final long SQRT_LO_MASK = (0x3FF0000000000000L | (0x000FFFFFFFFFFFFFL>>SQRT_LO_BITS));
+            for (int i=1;i<SQRT_LO_TAB_SIZE;i++) {
+                long xBits = SQRT_LO_MASK | (((long)(i-1))<<(52-SQRT_LO_BITS));
+                double sqrtX = StrictMath.sqrt(Double.longBitsToDouble(xBits));
+                sqrtXSqrtLoTab[i] = sqrtX;
+                sqrtSlopeLoTab[i] = 1/sqrtX;
+            }
+        }
+    }
+
+    //--------------------------------------------------------------------------
+    // CONSTANTS AND TABLES FOR CBRT
+    //--------------------------------------------------------------------------
+
+    static final int CBRT_LO_BITS = getTabSizePower(12);
+    static final int CBRT_LO_TAB_SIZE = (1<<CBRT_LO_BITS);
+
+    // For CBRT_LO_BITS = 12:
+    // cbrtXCbrtLoTab[0] = 1.0.
+    // cbrtXCbrtLoTab[1] = cbrt(1. 000000000000 1111111111111111111111111111111111111111b)
+    // cbrtXCbrtLoTab[2] = cbrt(1. 000000000001 1111111111111111111111111111111111111111b)
+    // cbrtXCbrtLoTab[3] = cbrt(1. 000000000010 1111111111111111111111111111111111111111b)
+    // cbrtXCbrtLoTab[4] = cbrt(1. 000000000011 1111111111111111111111111111111111111111b)
+    // etc.
+    static final class MyTCbrt {
+        static final double[] cbrtXCbrtHiTab = new double[MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT+1];
+        static final double[] cbrtXCbrtLoTab = new double[CBRT_LO_TAB_SIZE];
+        static final double[] cbrtSlopeHiTab = new double[MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT+1];
+        static final double[] cbrtSlopeLoTab = new double[CBRT_LO_TAB_SIZE];
+        static {
+            init();
+        }
+        private static strictfp void init() {
+            for (int i=MIN_DOUBLE_EXPONENT;i<=MAX_DOUBLE_EXPONENT;i++) {
+                double twoPowExpDiv3 = StrictMath.pow(2.0,i*(1.0/3));
+                cbrtXCbrtHiTab[i-MIN_DOUBLE_EXPONENT] = twoPowExpDiv3 * 0.5; // Half cbrt, to avoid overflows.
+                cbrtSlopeHiTab[i-MIN_DOUBLE_EXPONENT] = (4.0/3)/(twoPowExpDiv3*twoPowExpDiv3);
+            }
+            cbrtXCbrtLoTab[0] = 1.0;
+            cbrtSlopeLoTab[0] = 1.0;
+            final long CBRT_LO_MASK = (0x3FF0000000000000L | (0x000FFFFFFFFFFFFFL>>CBRT_LO_BITS));
+            for (int i=1;i<CBRT_LO_TAB_SIZE;i++) {
+                long xBits = CBRT_LO_MASK | (((long)(i-1))<<(52-CBRT_LO_BITS));
+                double cbrtX = StrictMath.cbrt(Double.longBitsToDouble(xBits));
+                cbrtXCbrtLoTab[i] = cbrtX;
+                cbrtSlopeLoTab[i] = 1/(cbrtX*cbrtX);
+            }
+        }
+    }
+
+    //--------------------------------------------------------------------------
+    // CONSTANTS FOR HYPOT
+    //--------------------------------------------------------------------------
+
+    /**
+     * For using sqrt, to avoid overflow/underflow, we want values magnitude in
+     * [1/sqrt(Double.MAX_VALUE/n),sqrt(Double.MAX_VALUE/n)],
+     * n being the number of arguments.
+     *
+     * sqrt(Double.MAX_VALUE/2) = 9.480751908109176E153
+     * and
+     * sqrt(Double.MAX_VALUE/3) = 7.741001517595157E153
+     * so
+     * 2^511 = 6.7039039649712985E153
+     * works for both.
+     */
+    static final double HYPOT_MAX_MAG = NumbersUtils.twoPow(511);
+
+    /**
+     * Large enough to get a value's magnitude back into [2^-511,2^511]
+     * from Double.MIN_VALUE or Double.MAX_VALUE, and small enough
+     * not to get it across that range (considering a 2*53 tolerance
+     * due to only checking magnitude of min/max value, and scaling
+     * all values together).
+     */
+    static final double HYPOT_FACTOR = NumbersUtils.twoPow(750);
+
+    //--------------------------------------------------------------------------
+    // PUBLIC METHODS
+    //--------------------------------------------------------------------------
+
+    /**
+     * Ensures that all look-up tables are initialized - otherwise they are
+     * initialized lazily.
+     */
+    public static void initTables() {
+        /*
+         * Taking care not to call init methods here, which would
+         * recompute tables each time (even though the computations
+         * should be identical, since done with strictfp and StrictMath).
+         */
+        int antiOptim = 0;
+        antiOptim += MyTSinCos.sinTab.length;
+        antiOptim += MyTTan.tanTab.length;
+        antiOptim += MyTAsin.asinTab.length;
+        antiOptim += MyTAsinPow.asinPowTab.length;
+        antiOptim += MyTAtan.atanTab.length;
+        antiOptim += MyTExp.expHiTab.length;
+        antiOptim += MyTLog.logXTab.length;
+        antiOptim += MyTTwoPow.twoPowTab.length;
+        antiOptim += MyTSqrt.sqrtXSqrtHiTab.length;
+        antiOptim += MyTCbrt.cbrtXCbrtHiTab.length;
+        if (StrictMath.cos((double)antiOptim) == 0.0) {
+            // Can't happen, cos is never +-0.0.
+            throw new AssertionError();
+        }
+    }
+
+    /*
+     * logarithms
+     */
+
+    /**
+     * @param value An integer value in [1,Integer.MAX_VALUE].
+     * @return The integer part of the logarithm, in base 2, of the specified value,
+     *         i.e. a result in [0,30]
+     * @throws IllegalArgumentException if the specified value is <= 0.
+     */
+    public static int log2(int value) {
+        return NumbersUtils.log2(value);
+    }
+
+    /**
+     * @param value An integer value in [1,Long.MAX_VALUE].
+     * @return The integer part of the logarithm, in base 2, of the specified value,
+     *         i.e. a result in [0,62]
+     * @throws IllegalArgumentException if the specified value is <= 0.
+     */
+    public static int log2(long value) {
+        return NumbersUtils.log2(value);
+    }
+
+    /*
+     * powers
+     */
+
+    /**
+     * Returns the exact result, provided it's in double range,
+     * i.e. if power is in [-1074,1023].
+     *
+     * @param power An int power.
+     * @return 2^power as a double, or +-Infinity in case of overflow.
+     */
+    public static double twoPow(int power) {
+        /*
+         * OK to have this method factored here even though it returns
+         * a floating point value, because it only does integer operations
+         * and only takes integer arguments, so should behave the same
+         * even if inlined into FP-wide context.
+         */
+        if (USE_TWO_POW_TAB) {
+            if (power >= MIN_DOUBLE_EXPONENT) {
+                if (power <= MAX_DOUBLE_EXPONENT) { // Normal or subnormal.
+                    return MyTTwoPow.twoPowTab[power-MIN_DOUBLE_EXPONENT];
+                } else { // Overflow.
+                    return Double.POSITIVE_INFINITY;
+                }
+            } else { // Underflow.
+                return 0.0;
+            }
+        } else {
+            return NumbersUtils.twoPow(power);
+        }
+    }
+
+    /**
+     * @param value An int value.
+     * @return value*value.
+     */
+    public static int pow2(int value) {
+        return value*value;
+    }
+
+    /**
+     * @param value A long value.
+     * @return value*value.
+     */
+    public static long pow2(long value) {
+        return value*value;
+    }
+
+    /**
+     * @param value An int value.
+     * @return value*value*value.
+     */
+    public static int pow3(int value) {
+        return value*value*value;
+    }
+
+    /**
+     * @param value A long value.
+     * @return value*value*value.
+     */
+    public static long pow3(long value) {
+        return value*value*value;
+    }
+
+    /*
+     * absolute values
+     */
+
+    /**
+     * @param value An int value.
+     * @return The absolute value, except if value is Integer.MIN_VALUE, for which it returns Integer.MIN_VALUE.
+     */
+    public static int abs(int value) {
+        if (FM_USE_JDK_MATH || SFM_USE_JDK_MATH) {
+            return Math.abs(value);
+        }
+        return NumbersUtils.abs(value);
+    }
+
+    /**
+     * @param value A long value.
+     * @return The absolute value, except if value is Long.MIN_VALUE, for which it returns Long.MIN_VALUE.
+     */
+    public static long abs(long value) {
+        if (FM_USE_JDK_MATH || SFM_USE_JDK_MATH) {
+            return Math.abs(value);
+        }
+        return NumbersUtils.abs(value);
+    }
+
+    /*
+     * close values
+     */
+
+    /**
+     * @param value A long value.
+     * @return The specified value as int.
+     * @throws ArithmeticException if the specified value is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
+     */
+    public static int toIntExact(long value) {
+        return NumbersUtils.asInt(value);
+    }
+
+    /**
+     * @param value A long value.
+     * @return The closest int value in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
+     */
+    public static int toInt(long value) {
+        return NumbersUtils.toInt(value);
+    }
+
+    /*
+     * ranges
+     */
+
+    /**
+     * @param min An int value.
+     * @param max An int value.
+     * @param value An int value.
+     * @return minValue if value < minValue, maxValue if value > maxValue, value otherwise.
+     */
+    public static int toRange(int min, int max, int value) {
+        return NumbersUtils.toRange(min, max, value);
+    }
+
+    /**
+     * @param min A long value.
+     * @param max A long value.
+     * @param value A long value.
+     * @return min if value < min, max if value > max, value otherwise.
+     */
+    public static long toRange(long min, long max, long value) {
+        return NumbersUtils.toRange(min, max, value);
+    }
+
+    /*
+     * unary operators (increment,decrement,negate)
+     */
+
+    /**
+     * @param value An int value.
+     * @return The argument incremented by one.
+     * @throws ArithmeticException if the mathematical result
+     *         is not in int range.
+     */
+    public static int incrementExact(int value) {
+        if (value == Integer.MAX_VALUE) {
+            throw new ArithmeticException("integer overflow");
+        }
+        return value + 1;
+    }
+
+    /**
+     * @param value A long value.
+     * @return The argument incremented by one.
+     * @throws ArithmeticException if the mathematical result
+     *         is not in long range.
+     */
+    public static long incrementExact(long value) {
+        if (value == Long.MAX_VALUE) {
+            throw new ArithmeticException("long overflow");
+        }
+        return value + 1L;
+    }
+
+    /**
+     * @param value An int value.
+     * @return The argument incremented by one, or the argument
+     *         if the mathematical result is not in int range.
+     */
+    public static int incrementBounded(int value) {
+        if (value == Integer.MAX_VALUE) {
+            return value;
+        }
+        return value + 1;
+    }
+
+    /**
+     * @param value A long value.
+     * @return The argument incremented by one, or the argument
+     *         if the mathematical result is not in long range.
+     */
+    public static long incrementBounded(long value) {
+        if (value == Long.MAX_VALUE) {
+            return value;
+        }
+        return value + 1L;
+    }
+
+    /**
+     * @param value An int value.
+     * @return The argument decremented by one.
+     * @throws ArithmeticException if the mathematical result
+     *         is not in int range.
+     */
+    public static int decrementExact(int value) {
+        if (value == Integer.MIN_VALUE) {
+            throw new ArithmeticException("integer overflow");
+        }
+        return value - 1;
+    }
+
+    /**
+     * @param value A long value.
+     * @return The argument decremented by one.
+     * @throws ArithmeticException if the mathematical result
+     *         is not in long range.
+     */
+    public static long decrementExact(long value) {
+        if (value == Long.MIN_VALUE) {
+            throw new ArithmeticException("long overflow");
+        }
+        return value - 1L;
+    }
+
+    /**
+     * @param value An int value.
+     * @return The argument decremented by one, or the argument
+     *         if the mathematical result is not in int range.
+     */
+    public static int decrementBounded(int value) {
+        if (value == Integer.MIN_VALUE) {
+            return value;
+        }
+        return value - 1;
+    }
+
+    /**
+     * @param value A long value.
+     * @return The argument decremented by one, or the argument
+     *         if the mathematical result is not in long range.
+     */
+    public static long decrementBounded(long value) {
+        if (value == Long.MIN_VALUE) {
+            return value;
+        }
+        return value - 1L;
+    }
+
+    /**
+     * @param value An int value.
+     * @return The argument negated.
+     * @throws ArithmeticException if the mathematical result
+     *         is not in int range.
+     */
+    public static int negateExact(int value) {
+        if (value == Integer.MIN_VALUE) {
+            throw new ArithmeticException("integer overflow");
+        }
+        return -value;
+    }
+
+    /**
+     * @param value A long value.
+     * @return The argument negated.
+     * @throws ArithmeticException if the mathematical result
+     *         is not in long range.
+     */
+    public static long negateExact(long value) {
+        if (value == Long.MIN_VALUE) {
+            throw new ArithmeticException("long overflow");
+        }
+        return -value;
+    }
+
+    /**
+     * @param value An int value.
+     * @return The argument negated, or Integer.MAX_VALUE
+     *         if the argument is Integer.MIN_VALUE.
+     */
+    public static int negateBounded(int value) {
+        if (value == Integer.MIN_VALUE) {
+            return Integer.MAX_VALUE;
+        }
+        return -value;
+    }
+
+    /**
+     * @param value A long value.
+     * @return The argument negated, or Long.MAX_VALUE
+     *         if the argument is Long.MIN_VALUE.
+     */
+    public static long negateBounded(long value) {
+        if (value == Long.MIN_VALUE) {
+            return Long.MAX_VALUE;
+        }
+        return -value;
+    }
+
+    /*
+     * binary operators (+,-,*)
+     */
+
+    /**
+     * @param a An int value.
+     * @param b An int value.
+     * @return The mathematical result of a+b.
+     * @throws ArithmeticException if the mathematical result of a+b is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
+     */
+    public static int addExact(int a, int b) {
+        return NumbersUtils.plusExact(a, b);
+    }
+
+    /**
+     * @param a A long value.
+     * @param b A long value.
+     * @return The mathematical result of a+b.
+     * @throws ArithmeticException if the mathematical result of a+b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
+     */
+    public static long addExact(long a, long b) {
+        return NumbersUtils.plusExact(a, b);
+    }
+
+    /**
+     * @param a An int value.
+     * @param b An int value.
+     * @return The int value of [Integer.MIN_VALUE,Integer.MAX_VALUE] range which is the closest to mathematical result of a+b.
+     */
+    public static int addBounded(int a, int b) {
+        return NumbersUtils.plusBounded(a, b);
+    }
+
+    /**
+     * @param a A long value.
+     * @param b A long value.
+     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a+b.
+     */
+    public static long addBounded(long a, long b) {
+        return NumbersUtils.plusBounded(a, b);
+    }
+
+    /**
+     * @param a An int value.
+     * @param b An int value.
+     * @return The mathematical result of a-b.
+     * @throws ArithmeticException if the mathematical result of a-b is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
+     */
+    public static int subtractExact(int a, int b) {
+        return NumbersUtils.minusExact(a, b);
+    }
+
+    /**
+     * @param a A long value.
+     * @param b A long value.
+     * @return The mathematical result of a-b.
+     * @throws ArithmeticException if the mathematical result of a-b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
+     */
+    public static long subtractExact(long a, long b) {
+        return NumbersUtils.minusExact(a, b);
+    }
+
+    /**
+     * @param a An int value.
+     * @param b An int value.
+     * @return The int value of [Integer.MIN_VALUE,Integer.MAX_VALUE] range which is the closest to mathematical result of a-b.
+     */
+    public static int subtractBounded(int a, int b) {
+        return NumbersUtils.minusBounded(a, b);
+    }
+
+    /**
+     * @param a A long value.
+     * @param b A long value.
+     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a-b.
+     */
+    public static long subtractBounded(long a, long b) {
+        return NumbersUtils.minusBounded(a, b);
+    }
+
+    /**
+     * @param a An int value.
+     * @param b An int value.
+     * @return The mathematical result of a*b.
+     * @throws ArithmeticException if the mathematical result of a*b is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
+     */
+    public static int multiplyExact(int a, int b) {
+        return NumbersUtils.timesExact(a, b);
+    }
+
+    /**
+     * @param a A long value.
+     * @param b An int value.
+     * @return The mathematical result of a*b.
+     * @throws ArithmeticException if the mathematical result of a*b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
+     */
+    public static long multiplyExact(long a, int b) {
+        return NumbersUtils.timesExact(a, (long) b);
+    }
+
+    /**
+     * @param a A long value.
+     * @param b A long value.
+     * @return The mathematical result of a*b.
+     * @throws ArithmeticException if the mathematical result of a*b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
+     */
+    public static long multiplyExact(long a, long b) {
+        return NumbersUtils.timesExact(a, b);
+    }
+
+    /**
+     * @param a An int value.
+     * @param b An int value.
+     * @return The int value of [Integer.MIN_VALUE,Integer.MAX_VALUE] range which is the closest to mathematical result of a*b.
+     */
+    public static int multiplyBounded(int a, int b) {
+        return NumbersUtils.timesBounded(a, b);
+    }
+
+    /**
+     * @param a A long value.
+     * @param b An int value.
+     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a*b.
+     */
+    public static long multiplyBounded(long a, int b) {
+        return NumbersUtils.timesBounded(a, (long) b);
+    }
+
+    /**
+     * @param a A long value.
+     * @param b A long value.
+     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a*b.
+     */
+    public static long multiplyBounded(long a, long b) {
+        return NumbersUtils.timesBounded(a, b);
+    }
+
+    /**
+     * @param x An int value.
+     * @param y An int value.
+     * @return The mathematical product as a long.
+     */
+    public static long multiplyFull(int x, int y) {
+        return ((long) x) * ((long) y);
+    }
+
+    /**
+     * @param x A long value.
+     * @param y A long value.
+     * @return The most significant 64 bits of the 128-bit product of two 64-bit factors.
+     */
+    public static long multiplyHigh(long x, long y) {
+        if ((x|y) < 0) {
+            // Use technique from section 8-2 of Henry S. Warren, Jr.,
+            // Hacker's Delight (2nd ed.) (Addison Wesley, 2013), 173-174.
+            long x1 = (x >> 32);
+            long y1 = (y >> 32);
+            long x2 = (x & 0xFFFFFFFFL);
+            long y2 = (y & 0xFFFFFFFFL);
+            long z2 = x2 * y2;
+            long t = x1 * y2 + (z2 >>> 32);
+            long z1 = (t & 0xFFFFFFFFL) + x2 * y1;
+            long z0 = (t >> 32);
+            return x1 * y1 + z0 + (z1 >> 32);
+        } else {
+            // Use Karatsuba technique with two base 2^32 digits.
+            long x1 = (x >>> 32);
+            long y1 = (y >>> 32);
+            long x2 = (x & 0xFFFFFFFFL);
+            long y2 = (y & 0xFFFFFFFFL);
+            long A = x1 * y1;
+            long B = x2 * y2;
+            long C = (x1 + x2) * (y1 + y2);
+            long K = C - A - B;
+            return (((B >>> 32) + K) >>> 32) + A;
+        }
+    }
+
+    /*
+     * binary operators (/,%)
+     */
+
+    /**
+     * Returns the largest int <= dividend/divisor.
+     *
+     * Unlike "/" operator, which rounds towards 0, this division
+     * rounds towards -Infinity (which give different result
+     * when the exact result is negative).
+     *
+     * @param x The dividend.
+     * @param y The divisor.
+     * @return The largest int <= dividend/divisor, unless dividend is
+     *         Integer.MIN_VALUE and divisor is -1, in which case
+     *         Integer.MIN_VALUE is returned.
+     * @throws ArithmeticException if the divisor is zero.
+     */
+    public static int floorDiv(int x, int y) {
+        int r = x / y;
+        // If the signs are different and modulo not zero, rounding down.
+        if (((x ^ y) < 0) && ((r * y) != x)) {
+            r--;
+        }
+        return r;
+    }
+
+    /**
+     * Returns the largest long <= dividend/divisor.
+     *
+     * Unlike "/" operator, which rounds towards 0, this division
+     * rounds towards -Infinity (which give different result
+     * when the exact result is negative).
+     *
+     * @param x The dividend.
+     * @param y The divisor.
+     * @return The largest long <= dividend/divisor, unless dividend is
+     *         Long.MIN_VALUE and divisor is -1, in which case
+     *         Long.MIN_VALUE is returned.
+     * @throws ArithmeticException if the divisor is zero.
+     */
+    public static long floorDiv(long x, int y) {
+        return floorDiv(x, (long) y);
+    }
+
+    /**
+     * Returns the largest long <= dividend/divisor.
+     *
+     * Unlike "/" operator, which rounds towards 0, this division
+     * rounds towards -Infinity (which give different result
+     * when the exact result is negative).
+     *
+     * @param x The dividend.
+     * @param y The divisor.
+     * @return The largest long <= dividend/divisor, unless dividend is
+     *         Long.MIN_VALUE and divisor is -1, in which case
+     *         Long.MIN_VALUE is returned.
+     * @throws ArithmeticException if the divisor is zero.
+     */
+    public static long floorDiv(long x, long y) {
+        long r = x / y;
+        // If the signs are different and modulo not zero, rounding down.
+        if (((x ^ y) < 0) && ((r * y) != x)) {
+            r--;
+        }
+        return r;
+    }
+
+    /**
+     * Returns the floor modulus, which is "x - floorDiv(x,y) * y",
+     * has the same sign as y, and is in ]-abs(y),abs(y)[.
+     *
+     * The relationship between floorMod and floorDiv is the same
+     * than between "%" and "/".
+     *
+     * @param x The dividend.
+     * @param y The divisor.
+     * @return The floor modulus, i.e. "x - (floorDiv(x, y) * y)".
+     * @throws ArithmeticException if the divisor is zero.
+     */
+    public static int floorMod(int x, int y) {
+        return x - floorDiv(x, y) * y;
+    }
+
+    /**
+     * Returns the floor modulus, which is "x - floorDiv(x,y) * y",
+     * has the same sign as y, and is in ]-abs(y),abs(y)[.
+     *
+     * The relationship between floorMod and floorDiv is the same
+     * than between "%" and "/".
+     *
+     * @param x The dividend.
+     * @param y The divisor.
+     * @return The floor modulus, i.e. "x - (floorDiv(x, y) * y)".
+     * @throws ArithmeticException if the divisor is zero.
+     */
+    public static int floorMod(long x, int y) {
+        // No overflow so can cast.
+        return (int) (x - floorDiv(x,y) * y);
+    }
+
+    /**
+     * Returns the floor modulus, which is "x - floorDiv(x,y) * y",
+     * has the same sign as y, and is in ]-abs(y),abs(y)[.
+     *
+     * The relationship between floorMod and floorDiv is the same
+     * than between "%" and "/".
+     *
+     * @param x The dividend.
+     * @param y The divisor.
+     * @return The floor modulus, i.e. "x - (floorDiv(x, y) * y)".
+     * @throws ArithmeticException if the divisor is zero.
+     */
+    public static long floorMod(long x, long y) {
+        return x - floorDiv(x, y) * y;
+    }
+
+    /*
+     * Non-redefined Math public values and treatments.
+     */
+
+    public static int min(int a, int b) {
+        return Math.min(a,b);
+    }
+
+    public static long min(long a, long b) {
+        return Math.min(a,b);
+    }
+
+    public static int max(int a, int b) {
+        return Math.max(a,b);
+    }
+
+    public static long max(long a, long b) {
+        return Math.max(a,b);
+    }
+
+    //--------------------------------------------------------------------------
+    // PACKAGE-PRIVATE METHODS
+    //--------------------------------------------------------------------------
+
+    /**
+     * @param power Must be in normal values range.
+     */
+    static double twoPowNormal(int power) {
+        if (USE_TWO_POW_TAB) {
+            return MyTTwoPow.twoPowTab[power-MIN_DOUBLE_EXPONENT];
+        } else {
+            return Double.longBitsToDouble(((long)(power+MAX_DOUBLE_EXPONENT))<<52);
+        }
+    }
+
+    /**
+     * @param power Must be in normal or subnormal values range.
+     */
+    static double twoPowNormalOrSubnormal(int power) {
+        if (USE_TWO_POW_TAB) {
+            return MyTTwoPow.twoPowTab[power-MIN_DOUBLE_EXPONENT];
+        } else {
+            if (power <= -MAX_DOUBLE_EXPONENT) { // Not normal.
+                return Double.longBitsToDouble(0x0008000000000000L>>(-(power+MAX_DOUBLE_EXPONENT)));
+            } else { // Normal.
+                return Double.longBitsToDouble(((long)(power+MAX_DOUBLE_EXPONENT))<<52);
+            }
+        }
+    }
+
+    static double atan2_pinf_yyy(double y) {
+        if (y == Double.POSITIVE_INFINITY) {
+            return Math.PI/4;
+        } else if (y == Double.NEGATIVE_INFINITY) {
+            return -Math.PI/4;
+        } else if (y > 0.0) {
+            return 0.0;
+        } else if (y < 0.0) {
+            return -0.0;
+        } else {
+            return Double.NaN;
+        }
+    }
+
+    static double atan2_ninf_yyy(double y) {
+        if (y == Double.POSITIVE_INFINITY) {
+            return 3*Math.PI/4;
+        } else if (y == Double.NEGATIVE_INFINITY) {
+            return -3*Math.PI/4;
+        } else if (y > 0.0) {
+            return Math.PI;
+        } else if (y < 0.0) {
+            return -Math.PI;
+        } else {
+            return Double.NaN;
+        }
+    }
+
+    static double atan2_yyy_zeroOrNaN(double y, double x) {
+        if (x == 0.0) {
+            if (y == 0.0) {
+                if (signFromBit_antiCyclic(x) < 0) {
+                    // x is -0.0
+                    return signFromBit_antiCyclic(y) * Math.PI;
+                } else {
+                    // +-0.0
+                    return y;
+                }
+            }
+            if (y > 0.0) {
+                return Math.PI/2;
+            } else if (y < 0.0) {
+                return -Math.PI/2;
+            } else {
+                return Double.NaN;
+            }
+        } else {
+            return Double.NaN;
+        }
+    }
+
+    /**
+     * At least one of the arguments must be NaN.
+     */
+    static double hypot_NaN(double xAbs, double yAbs) {
+        if ((xAbs == Double.POSITIVE_INFINITY) || (yAbs == Double.POSITIVE_INFINITY)) {
+            return Double.POSITIVE_INFINITY;
+        } else {
+            return Double.NaN;
+        }
+    }
+
+    /**
+     * At least one of the arguments must be NaN.
+     */
+    static double hypot_NaN(double xAbs, double yAbs, double zAbs) {
+        if ((xAbs == Double.POSITIVE_INFINITY) || (yAbs == Double.POSITIVE_INFINITY) || (zAbs == Double.POSITIVE_INFINITY)) {
+            return Double.POSITIVE_INFINITY;
+        } else {
+            return Double.NaN;
+        }
+    }
+
+    /*
+     *
+     */
+
+    /**
+     * @param remainder Must have 1 for 2nd and 3rd exponent bits, which is the
+     *        case for heavyRemPiO2 remainders (their absolute values are >=
+     *        Double.longBitsToDouble(0x3000000000000000L)
+     *        = 1.727233711018889E-77, and even if they were not, turning these
+     *        bits from 0 to 1 on decoding would not change the absolute error
+     *        much), and also works for +-Infinity or NaN encoding.
+     * @param quadrant Must be in [0,3].
+     * @return Bits holding remainder, and quadrant instead of
+     *         reamainder's 2nd and 3rd exponent bits.
+     */
+    static long encodeRemainderAndQuadrant(double remainder, int quadrant) {
+        final long bits = Double.doubleToRawLongBits(remainder);
+        return (bits&QUADRANT_BITS_0_MASK)|(((long)quadrant)<<60);
+    }
+
+    static double decodeRemainder(long bits) {
+        return Double.longBitsToDouble((bits&QUADRANT_BITS_0_MASK)|QUADRANT_PLACE_BITS);
+    }
+
+    static int decodeQuadrant(long bits) {
+        return ((int)(bits>>60))&3;
+    }
+
+    /*
+     * JDK-based remainders.
+     * Since a strict one for (% (PI/2)) is needed for heavyRemainderPiO2,
+     * we need it in this class.
+     * Then, for homogeneity, we put them all in this class.
+     * Then, to avoid code duplication for these slow-anyway methods,
+     * we just stick with strict versions, for both FastMath and StrictFastMath.
+     */
+
+    /**
+     * @param angle Angle, in radians.
+     * @return Remainder of (angle % (2*PI)), in [-PI,PI].
+     */
+    static strictfp double jdkRemainderTwoPi(double angle) {
+        final double sin = StrictMath.sin(angle);
+        final double cos = StrictMath.cos(angle);
+        return StrictMath.atan2(sin, cos);
+    }
+
+    /**
+     * @param angle Angle, in radians.
+     * @return Remainder of (angle % PI), in [-PI/2,PI/2].
+     */
+    static strictfp double jdkRemainderPi(double angle) {
+        final double sin = StrictMath.sin(angle);
+        final double cos = StrictMath.cos(angle);
+        /*
+         * Making sure atan2's result ends up in [-PI/2,PI/2],
+         * i.e. has maximum accuracy.
+         */
+        return StrictMath.atan2(sin, Math.abs(cos));
+    }
+
+    /**
+     * @param angle Angle, in radians.
+     * @return Bits of double corresponding to remainder of (angle % (PI/2)),
+     *         in [-PI/4,PI/4], with quadrant encoded in exponent bits.
+     */
+    static strictfp long jdkRemainderPiO2(double angle, boolean negateRem) {
+        final double sin = StrictMath.sin(angle);
+        final double cos = StrictMath.cos(angle);
+
+        /*
+         * Computing quadrant first, and then computing
+         * atan2, to make sure its result ends up in [-PI/4,PI/4],
+         * i.e. has maximum accuracy.
+         */
+
+        final int q;
+        final double sinForAtan2;
+        final double cosForAtan2;
+        if (cos >= (SQRT_2/2)) {
+            // [-PI/4,PI/4]
+            q = 0;
+            sinForAtan2 = sin;
+            cosForAtan2 = cos;
+        } else if (cos <= -(SQRT_2/2)) {
+            // [3*PI/4,5*PI/4]
+            q = 2;
+            sinForAtan2 = -sin;
+            cosForAtan2 = -cos;
+        } else if (sin > 0.0) {
+            // [PI/4,3*PI/4]
+            q = 1;
+            sinForAtan2 = -cos;
+            cosForAtan2 = sin;
+        } else {
+            // [5*PI/4,7*PI/4]
+            q = 3;
+            sinForAtan2 = cos;
+            cosForAtan2 = -sin;
+        }
+
+        double fw = StrictMath.atan2(sinForAtan2, cosForAtan2);
+
+        return encodeRemainderAndQuadrant(negateRem ? -fw : fw, q);
+    }
+
+    /*
+     * Our remainders implementations.
+     */
+
+    /**
+     * @param angle Angle, in radians. Must not be NaN nor +-Infinity.
+     * @return Remainder of (angle % (2*PI)), in [-PI,PI].
+     */
+    static strictfp double heavyRemainderTwoPi(double angle) {
+        final long remAndQuad = heavyRemainderPiO2(angle, false);
+        final double rem = decodeRemainder(remAndQuad);
+        final int q = decodeQuadrant(remAndQuad);
+        if (q == 0) {
+            return rem;
+        } else if (q == 1) {
+            return (rem + PIO2_LO) + PIO2_HI;
+        } else if (q == 2) {
+            if (rem < 0.0) {
+                return (rem + PI_LO) + PI_HI;
+            } else {
+                return (rem - PI_LO) - PI_HI;
+            }
+        } else {
+            return (rem - PIO2_LO) - PIO2_HI;
+        }
+    }
+
+    /**
+     * @param angle Angle, in radians. Must not be NaN nor +-Infinity.
+     * @return Remainder of (angle % PI), in [-PI/2,PI/2].
+     */
+    static strictfp double heavyRemainderPi(double angle) {
+        final long remAndQuad = heavyRemainderPiO2(angle, false);
+        final double rem = decodeRemainder(remAndQuad);
+        final int q = decodeQuadrant(remAndQuad);
+        if ((q&1) != 0) {
+            // q is 1 or 3
+            if (rem < 0.0) {
+                return (rem + PIO2_LO) + PIO2_HI;
+            } else {
+                return (rem - PIO2_LO) - PIO2_HI;
+            }
+        }
+        return rem;
+    }
+
+    /**
+     * Remainder using an accurate definition of PI.
+     * Derived from a fdlibm treatment called __kernel_rem_pio2.
+     *
+     * Not defining a non-strictfp version for FastMath, to avoid duplicating
+     * its long and messy code, and because it's slow anyway, and should be
+     * rarely used when speed matters.
+     *
+     * @param angle Angle, in radians. Must not be NaN nor +-Infinity.
+     * @param negateRem True if remainder must be negated before encoded into returned long.
+     * @return Bits of double corresponding to remainder of (angle % (PI/2)),
+     *         in [-PI/4,PI/4], with quadrant encoded in exponent bits.
+     */
+    static strictfp long heavyRemainderPiO2(double angle, boolean negateRem) {
+
+        /*
+         * fdlibm treatments unrolled, to avoid garbage and be OOME-free,
+         * corresponding to:
+         * 1) initial jk = 4 (precision = 3 = 64 bits (extended)),
+         *    which is more accurate than using precision = 2
+         *    (53 bits, double), even though we work with doubles
+         *    and use strictfp!
+         * 2) max lengths of 8 for f[], 6 for q[], fq[] and iq[].
+         * 3) at most one recomputation (one goto).
+         * These limitations were experimentally found to
+         * be sufficient for billions of random doubles
+         * of random magnitudes.
+         * For the rare cases that our unrolled treatments can't handle,
+         * we fall back to a JDK-based implementation.
+         */
+
+        int n,i,j,ih;
+        double fw;
+
+        /*
+         * Turning angle into 24-bits integer chunks.
+         * Done outside __kernel_rem_pio2, but we factor it inside our method.
+         */
+
+        // Reworking exponent to have a value < 2^24.
+        final long lx = Double.doubleToRawLongBits(angle);
+        final long exp = ((lx>>52)&0x7FF) - (1023+23);
+        double z = Double.longBitsToDouble(lx - (exp<<52));
+
+        double x0 = (double)(int)z;
+        z = (z-x0)*TWO_POW_24;
+        double x1 = (double)(int)z;
+        z = (z-x1)*TWO_POW_24;
+        double x2 = (double)(int)z;
+
+        final int e0 = (int)exp;
+        // in [1,3]
+        final int nx = (x2 == 0.0) ? ((x1 == 0.0) ? 1 : 2) : 3;
+
+        /*
+         *
+         */
+
+        double f0,f1,f2,f3,f4,f5,f6,f7;
+        double q0,q1,q2,q3,q4,q5;
+        int iq0,iq1,iq2,iq3,iq4,iq5;
+
+        int jk = 4;
+
+        int jx = nx-1;
+        int jv = Math.max(0,(e0-3)/24);
+        // In fdlibm, this is q0, but we prefer to use q0 for q[0].
+        int qZero = e0-24*(jv+1);
+
+        j = jv-jx;
+        if (jx == 0) {
+            f6 = 0.0;
+            f5 = 0.0;
+            f4 = (j >= -4) ? TWO_OVER_PI_TAB[j+4] : 0.0;
+            f3 = (j >= -3) ? TWO_OVER_PI_TAB[j+3] : 0.0;
+            f2 = (j >= -2) ? TWO_OVER_PI_TAB[j+2] : 0.0;
+            f1 = (j >= -1) ? TWO_OVER_PI_TAB[j+1] : 0.0;
+            f0 = (j >= 0) ? TWO_OVER_PI_TAB[j] : 0.0;
+
+            q0 = x0*f0;
+            q1 = x0*f1;
+            q2 = x0*f2;
+            q3 = x0*f3;
+            q4 = x0*f4;
+        } else if (jx == 1) {
+            f6 = 0.0;
+            f5 = (j >= -5) ? TWO_OVER_PI_TAB[j+5] : 0.0;
+            f4 = (j >= -4) ? TWO_OVER_PI_TAB[j+4] : 0.0;
+            f3 = (j >= -3) ? TWO_OVER_PI_TAB[j+3] : 0.0;
+            f2 = (j >= -2) ? TWO_OVER_PI_TAB[j+2] : 0.0;
+            f1 = (j >= -1) ? TWO_OVER_PI_TAB[j+1] : 0.0;
+            f0 = (j >= 0) ? TWO_OVER_PI_TAB[j] : 0.0;
+
+            q0 = x0*f1 + x1*f0;
+            q1 = x0*f2 + x1*f1;
+            q2 = x0*f3 + x1*f2;
+            q3 = x0*f4 + x1*f3;
+            q4 = x0*f5 + x1*f4;
+        } else { // jx == 2
+            f6 = (j >= -6) ? TWO_OVER_PI_TAB[j+6] : 0.0;
+            f5 = (j >= -5) ? TWO_OVER_PI_TAB[j+5] : 0.0;
+            f4 = (j >= -4) ? TWO_OVER_PI_TAB[j+4] : 0.0;
+            f3 = (j >= -3) ? TWO_OVER_PI_TAB[j+3] : 0.0;
+            f2 = (j >= -2) ? TWO_OVER_PI_TAB[j+2] : 0.0;
+            f1 = (j >= -1) ? TWO_OVER_PI_TAB[j+1] : 0.0;
+            f0 = (j >= 0) ? TWO_OVER_PI_TAB[j] : 0.0;
+
+            q0 = x0*f2 + x1*f1 + x2*f0;
+            q1 = x0*f3 + x1*f2 + x2*f1;
+            q2 = x0*f4 + x1*f3 + x2*f2;
+            q3 = x0*f5 + x1*f4 + x2*f3;
+            q4 = x0*f6 + x1*f5 + x2*f4;
+        }
+
+        double twoPowQZero = twoPowNormal(qZero);
+
+        int jz = jk;
+
+        /*
+         * Unrolling of first round.
+         */
+
+        z = q4;
+        fw = (double)(int)(TWO_POW_N24*z);
+        iq0 = (int)(z-TWO_POW_24*fw);
+        z = q3+fw;
+        fw = (double)(int)(TWO_POW_N24*z);
+        iq1 = (int)(z-TWO_POW_24*fw);
+        z = q2+fw;
+        fw = (double)(int)(TWO_POW_N24*z);
+        iq2 = (int)(z-TWO_POW_24*fw);
+        z = q1+fw;
+        fw = (double)(int)(TWO_POW_N24*z);
+        iq3 = (int)(z-TWO_POW_24*fw);
+        z = q0+fw;
+        iq4 = 0;
+        iq5 = 0;
+
+        z = (z*twoPowQZero) % 8.0;
+        n = (int)z;
+        z -= (double)n;
+
+        ih = 0;
+        if (qZero > 0) {
+            // Parentheses against code formatter bug.
+            i = (iq3>>(24-qZero));
+            n += i;
+            iq3 -= i<<(24-qZero);
+            ih = iq3>>(23-qZero);
+        } else if (qZero == 0) {
+            ih = iq3>>23;
+        } else if (z >= 0.5) {
+            ih = 2;
+        }
+
+        if (ih > 0) {
+            n += 1;
+            // carry = 1 is common case,
+            // so using it as initial value.
+            int carry = 1;
+            if (iq0 != 0) {
+                iq0 = 0x1000000 - iq0;
+                iq1 = 0xFFFFFF - iq1;
+                iq2 = 0xFFFFFF - iq2;
+                iq3 = 0xFFFFFF - iq3;
+            } else if (iq1 != 0) {
+                iq1 = 0x1000000 - iq1;
+                iq2 = 0xFFFFFF - iq2;
+                iq3 = 0xFFFFFF - iq3;
+            } else if (iq2 != 0) {
+                iq2 = 0x1000000 - iq2;
+                iq3 = 0xFFFFFF - iq3;
+            } else if (iq3 != 0) {
+                iq3 = 0x1000000 - iq3;
+            } else {
+                carry = 0;
+            }
+            if (qZero > 0) {
+                if (qZero == 1) {
+                    iq3 &= 0x7FFFFF;
+                } else if (qZero == 2) {
+                    iq3 &= 0x3FFFFF;
+                }
+            }
+            if (ih == 2) {
+                z = 1.0 - z;
+                if (carry != 0) {
+                    z -= twoPowQZero;
+                }
+            }
+        }
+
+        if (z == 0.0) {
+            if (iq3 == 0) {
+                // With random values of random magnitude,
+                // probability for this to happen seems lower than 1e-6.
+                // jz would be more than just incremented by one,
+                // which our unrolling doesn't support.
+                return jdkRemainderPiO2(angle, negateRem);
+            }
+            if (jx == 0) {
+                f5 = TWO_OVER_PI_TAB[jv+5];
+                q5 = x0*f5;
+            } else if (jx == 1) {
+                f6 = TWO_OVER_PI_TAB[jv+5];
+                q5 = x0*f6 + x1*f5;
+            } else { // jx == 2
+                f7 = TWO_OVER_PI_TAB[jv+5];
+                q5 = x0*f7 + x1*f6 + x2*f5;
+            }
+
+            jz++;
+
+            /*
+             * Unrolling of second round.
+             */
+
+            z = q5;
+            fw = (double)(int)(TWO_POW_N24*z);
+            iq0 = (int)(z-TWO_POW_24*fw);
+            z = q4+fw;
+            fw = (double)(int)(TWO_POW_N24*z);
+            iq1 = (int)(z-TWO_POW_24*fw);
+            z = q3+fw;
+            fw = (double)(int)(TWO_POW_N24*z);
+            iq2 = (int)(z-TWO_POW_24*fw);
+            z = q2+fw;
+            fw = (double)(int)(TWO_POW_N24*z);
+            iq3 = (int)(z-TWO_POW_24*fw);
+            z = q1+fw;
+            fw = (double)(int)(TWO_POW_N24*z);
+            iq4 = (int)(z-TWO_POW_24*fw);
+            z = q0+fw;
+            iq5 = 0;
+
+            z = (z*twoPowQZero) % 8.0;
+            n = (int)z;
+            z -= (double)n;
+
+            ih = 0;
+            if (qZero > 0) {
+                // Parentheses against code formatter bug.
+                i = (iq4>>(24-qZero));
+                n += i;
+                iq4 -= i<<(24-qZero);
+                ih = iq4>>(23-qZero);
+            } else if (qZero == 0) {
+                ih = iq4>>23;
+            } else if (z >= 0.5) {
+                ih = 2;
+            }
+
+            if (ih > 0) {
+                n += 1;
+                // carry = 1 is common case,
+                // so using it as initial value.
+                int carry = 1;
+                if (iq0 != 0) {
+                    iq0 = 0x1000000 - iq0;
+                    iq1 = 0xFFFFFF - iq1;
+                    iq2 = 0xFFFFFF - iq2;
+                    iq3 = 0xFFFFFF - iq3;
+                    iq4 = 0xFFFFFF - iq4;
+                } else if (iq1 != 0) {
+                    iq1 = 0x1000000 - iq1;
+                    iq2 = 0xFFFFFF - iq2;
+                    iq3 = 0xFFFFFF - iq3;
+                    iq4 = 0xFFFFFF - iq4;
+                } else if (iq2 != 0) {
+                    iq2 = 0x1000000 - iq2;
+                    iq3 = 0xFFFFFF - iq3;
+                    iq4 = 0xFFFFFF - iq4;
+                } else if (iq3 != 0) {
+                    iq3 = 0x1000000 - iq3;
+                    iq4 = 0xFFFFFF - iq4;
+                } else if (iq4 != 0) {
+                    iq4 = 0x1000000 - iq4;
+                } else {
+                    carry = 0;
+                }
+                if (qZero > 0) {
+                    if (qZero == 1) {
+                        iq4 &= 0x7FFFFF;
+                    } else if (qZero == 2) {
+                        iq4 &= 0x3FFFFF;
+                    }
+                }
+                if (ih == 2) {
+                    z = 1.0 - z;
+                    if (carry != 0) {
+                        z -= twoPowQZero;
+                    }
+                }
+            }
+
+            if (z == 0.0) {
+                if (iq4 == 0) {
+                    // Case not encountered in tests, but still handling it.
+                    // Would require a third loop unrolling.
+                    return jdkRemainderPiO2(angle, negateRem);
+                } else {
+                    // z == 0.0, and iq4 != 0,
+                    // so we remove 24 from qZero only once,
+                    // but since we no longer use qZero,
+                    // we just bother to multiply its 2-power
+                    // by 2^-24.
+                    jz--;
+                    twoPowQZero *= TWO_POW_N24;
+                }
+            } else {
+                // z != 0.0 at end of second round.
+            }
+        } else {
+            // z != 0.0 at end of first round.
+        }
+
+        /*
+         * After loop.
+         */
+
+        if (z != 0.0) {
+            z /= twoPowQZero;
+            if (z >= TWO_POW_24) {
+                fw = (double)(int)(TWO_POW_N24*z);
+                if (jz == jk) {
+                    iq4 = (int)(z-TWO_POW_24*fw);
+                    jz++; // jz to 5
+                    // Not using qZero anymore so not updating it.
+                    twoPowQZero *= TWO_POW_24;
+                    iq5 = (int)fw;
+                } else { // jz == jk+1 == 5
+                    // Case not encountered in tests, but still handling it.
+                    // Would require use of iq6, with jz = 6.
+                    return jdkRemainderPiO2(angle, negateRem);
+                }
+            } else {
+                if (jz == jk) {
+                    iq4 = (int)z;
+                } else { // jz == jk+1 == 5
+                    // Case not encountered in tests, but still handling it.
+                    iq5 = (int)z;
+                }
+            }
+        }
+
+        fw = twoPowQZero;
+
+        if (jz == 5) {
+            q5 = fw*(double)iq5;
+            fw *= TWO_POW_N24;
+        } else {
+            q5 = 0.0;
+        }
+        q4 = fw*(double)iq4;
+        fw *= TWO_POW_N24;
+        q3 = fw*(double)iq3;
+        fw *= TWO_POW_N24;
+        q2 = fw*(double)iq2;
+        fw *= TWO_POW_N24;
+        q1 = fw*(double)iq1;
+        fw *= TWO_POW_N24;
+        q0 = fw*(double)iq0;
+
+        /*
+         * We just use HI part of the result.
+         */
+
+        fw = PIO2_TAB0*q5;
+        fw += PIO2_TAB0*q4 + PIO2_TAB1*q5;
+        fw += PIO2_TAB0*q3 + PIO2_TAB1*q4 + PIO2_TAB2*q5;
+        fw += PIO2_TAB0*q2 + PIO2_TAB1*q3 + PIO2_TAB2*q4 + PIO2_TAB3*q5;
+        fw += PIO2_TAB0*q1 + PIO2_TAB1*q2 + PIO2_TAB2*q3 + PIO2_TAB3*q4 + PIO2_TAB4*q5;
+        fw += PIO2_TAB0*q0 + PIO2_TAB1*q1 + PIO2_TAB2*q2 + PIO2_TAB3*q3 + PIO2_TAB4*q4 + PIO2_TAB5*q5;
+
+        if ((ih != 0) ^ negateRem) {
+            fw = -fw;
+        }
+
+        return encodeRemainderAndQuadrant(fw, n&3);
+    }
+
+    //--------------------------------------------------------------------------
+    // PRIVATE METHODS
+    //--------------------------------------------------------------------------
+
+    /**
+     * Redefined here, to avoid cyclic dependency with (Strict)FastMath.
+     *
+     * @param value A double value.
+     * @return -1 if sign bit is 1, 1 if sign bit is 0.
+     */
+    private static long signFromBit_antiCyclic(double value) {
+        // Returning a long, to avoid useless cast into int.
+        return ((Double.doubleToRawLongBits(value)>>62)|1);
+    }
+
+    private static boolean getBooleanProperty(
+            final String key,
+            boolean defaultValue) {
+        final String tmp = System.getProperty(key);
+        if (tmp != null) {
+            return Boolean.parseBoolean(tmp);
+        } else {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * Use look-up tables size power through this method,
+     * to make sure is it small in case java.lang.Math
+     * is directly used.
+     */
+    private static int getTabSizePower(int tabSizePower) {
+        return (FM_USE_JDK_MATH && SFM_USE_JDK_MATH) ? Math.min(2, tabSizePower) : tabSizePower;
+    }
+}
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/DoubleWrapper.java b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/DoubleWrapper.java
new file mode 100644
index 000000000..e7adc8d59
--- /dev/null
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/DoubleWrapper.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+package space.kscience.kmath.jafama;
+
+public class DoubleWrapper {
+    public double value;
+    @Override
+    public String toString() {
+        return Double.toString(this.value);
+    }
+}
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/FastMath.java b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/FastMath.java
new file mode 100644
index 000000000..a83c01f7b
--- /dev/null
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/FastMath.java
@@ -0,0 +1,2986 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.jafama;
+
+/**
+ * Faster (hopefully) versions of java.lang.Math methods, plus additional ones.
+ * Cf. README.txt for more info.
+ */
+public final class FastMath extends CmnFastMath {
+
+    //--------------------------------------------------------------------------
+    // CONFIGURATION
+    //--------------------------------------------------------------------------
+
+    private static final boolean USE_JDK_MATH = FM_USE_JDK_MATH;
+
+    private static final boolean USE_REDEFINED_LOG = FM_USE_REDEFINED_LOG;
+
+    private static final boolean USE_REDEFINED_SQRT = FM_USE_REDEFINED_SQRT;
+
+    private static final boolean USE_POWTABS_FOR_ASIN = FM_USE_POWTABS_FOR_ASIN;
+
+    //--------------------------------------------------------------------------
+    // PUBLIC METHODS
+    //--------------------------------------------------------------------------
+
+    /*
+     * trigonometry
+     */
+
+    /**
+     * @param angle Angle in radians.
+     * @return Angle sine.
+     */
+    public static double sin(double angle) {
+        if (USE_JDK_MATH) {
+            return Math.sin(angle);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        if (angle > SIN_COS_MAX_VALUE_FOR_INT_MODULO) {
+            if (false) {
+                // Can give very bad relative error near PI (mod 2*PI).
+                angle = remainderTwoPi(angle);
+                if (angle < 0.0) {
+                    angle = -angle;
+                    negateResult = !negateResult;
+                }
+            } else {
+                final long remAndQuad = remainderPiO2(angle);
+                angle = decodeRemainder(remAndQuad);
+                final double sin;
+                final int q = decodeQuadrant(remAndQuad);
+                if (q == 0) {
+                    sin = sin(angle);
+                } else if (q == 1) {
+                    sin = cos(angle);
+                } else if (q == 2) {
+                    sin = -sin(angle);
+                } else {
+                    sin = -cos(angle);
+                }
+                return (negateResult ? -sin : sin);
+            }
+        }
+        // index: possibly outside tables range.
+        int index = (int)(angle * SIN_COS_INDEXER + 0.5);
+        double delta = (angle - index * SIN_COS_DELTA_HI) - index * SIN_COS_DELTA_LO;
+        // Making sure index is within tables range.
+        // Last value of each table is the same than first,
+        // so we ignore it (tabs size minus one) for modulo.
+        index &= (SIN_COS_TABS_SIZE-2); // index % (SIN_COS_TABS_SIZE-1)
+        double indexSin = MyTSinCos.sinTab[index];
+        double indexCos = MyTSinCos.cosTab[index];
+        double result = indexSin + delta * (indexCos + delta * (-indexSin * ONE_DIV_F2 + delta * (-indexCos * ONE_DIV_F3 + delta * indexSin * ONE_DIV_F4)));
+        return negateResult ? -result : result;
+    }
+
+    /**
+     * Quick sin, with accuracy of about 1.6e-3 (PI/<look-up tabs size>)
+     * for |angle| < 6588395.0 (Integer.MAX_VALUE * (2*PI/<look-up tabs size>) - 2)
+     * (- 2 due to removing PI/2 before using cosine tab),
+     * and no accuracy at all for larger values.
+     *
+     * @param angle Angle in radians.
+     * @return Angle sine.
+     */
+    public static double sinQuick(double angle) {
+        if (USE_JDK_MATH) {
+            return Math.sin(angle);
+        }
+        return MyTSinCos.cosTab[((int)(Math.abs(angle-Math.PI/2) * SIN_COS_INDEXER + 0.5)) & (SIN_COS_TABS_SIZE-2)];
+    }
+
+    /**
+     * @param angle Angle in radians.
+     * @return Angle cosine.
+     */
+    public static double cos(double angle) {
+        if (USE_JDK_MATH) {
+            return Math.cos(angle);
+        }
+        angle = Math.abs(angle);
+        if (angle > SIN_COS_MAX_VALUE_FOR_INT_MODULO) {
+            if (false) {
+                // Can give very bad relative error near PI (mod 2*PI).
+                angle = remainderTwoPi(angle);
+                if (angle < 0.0) {
+                    angle = -angle;
+                }
+            } else {
+                final long remAndQuad = remainderPiO2(angle);
+                angle = decodeRemainder(remAndQuad);
+                final double cos;
+                final int q = decodeQuadrant(remAndQuad);
+                if (q == 0) {
+                    cos = cos(angle);
+                } else if (q == 1) {
+                    cos = -sin(angle);
+                } else if (q == 2) {
+                    cos = -cos(angle);
+                } else {
+                    cos = sin(angle);
+                }
+                return cos;
+            }
+        }
+        // index: possibly outside tables range.
+        int index = (int)(angle * SIN_COS_INDEXER + 0.5);
+        double delta = (angle - index * SIN_COS_DELTA_HI) - index * SIN_COS_DELTA_LO;
+        // Making sure index is within tables range.
+        // Last value of each table is the same than first,
+        // so we ignore it (tabs size minus one) for modulo.
+        index &= (SIN_COS_TABS_SIZE-2); // index % (SIN_COS_TABS_SIZE-1)
+        double indexCos = MyTSinCos.cosTab[index];
+        double indexSin = MyTSinCos.sinTab[index];
+        return indexCos + delta * (-indexSin + delta * (-indexCos * ONE_DIV_F2 + delta * (indexSin * ONE_DIV_F3 + delta * indexCos * ONE_DIV_F4)));
+    }
+
+    /**
+     * Quick cos, with accuracy of about 1.6e-3 (PI/<look-up tabs size>)
+     * for |angle| < 6588397.0 (Integer.MAX_VALUE * (2*PI/<look-up tabs size>)),
+     * and no accuracy at all for larger values.
+     *
+     * @param angle Angle in radians.
+     * @return Angle cosine.
+     */
+    public static double cosQuick(double angle) {
+        if (USE_JDK_MATH) {
+            return Math.cos(angle);
+        }
+        return MyTSinCos.cosTab[((int)(Math.abs(angle) * SIN_COS_INDEXER + 0.5)) & (SIN_COS_TABS_SIZE-2)];
+    }
+
+    /**
+     * Computes sine and cosine together.
+     *
+     * @param angle Angle in radians.
+     * @param cosine (out) Angle cosine.
+     * @return Angle sine.
+     */
+    public static double sinAndCos(double angle, DoubleWrapper cosine) {
+        if (USE_JDK_MATH) {
+            cosine.value = Math.cos(angle);
+            return Math.sin(angle);
+        }
+        // Using the same algorithm than sin(double) method,
+        // and computing also cosine at the end.
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        if (angle > SIN_COS_MAX_VALUE_FOR_INT_MODULO) {
+            if (false) {
+                // Can give very bad relative error near PI (mod 2*PI).
+                angle = remainderTwoPi(angle);
+                if (angle < 0.0) {
+                    angle = -angle;
+                    negateResult = !negateResult;
+                }
+            } else {
+                final long remAndQuad = remainderPiO2(angle);
+                angle = decodeRemainder(remAndQuad);
+                final double sin;
+                final int q = decodeQuadrant(remAndQuad);
+                if (q == 0) {
+                    sin = sin(angle);
+                    cosine.value = cos(angle);
+                } else if (q == 1) {
+                    sin = cos(angle);
+                    cosine.value = -sin(angle);
+                } else if (q == 2) {
+                    sin = -sin(angle);
+                    cosine.value = -cos(angle);
+                } else {
+                    sin = -cos(angle);
+                    cosine.value = sin(angle);
+                }
+                return (negateResult ? -sin : sin);
+            }
+        }
+        int index = (int)(angle * SIN_COS_INDEXER + 0.5);
+        double delta = (angle - index * SIN_COS_DELTA_HI) - index * SIN_COS_DELTA_LO;
+        index &= (SIN_COS_TABS_SIZE-2); // index % (SIN_COS_TABS_SIZE-1)
+        double indexSin = MyTSinCos.sinTab[index];
+        double indexCos = MyTSinCos.cosTab[index];
+        // Could factor some multiplications (delta * factorials), but then is less accurate.
+        cosine.value = indexCos + delta * (-indexSin + delta * (-indexCos * ONE_DIV_F2 + delta * (indexSin * ONE_DIV_F3 + delta * indexCos * ONE_DIV_F4)));
+        double result = indexSin + delta * (indexCos + delta * (-indexSin * ONE_DIV_F2 + delta * (-indexCos * ONE_DIV_F3 + delta * indexSin * ONE_DIV_F4)));
+        return negateResult ? -result : result;
+    }
+
+    /**
+     * Can have very bad relative error near +-PI/2,
+     * but of the same magnitude than the relative delta between
+     * StrictMath.tan(PI/2) and StrictMath.tan(nextDown(PI/2)).
+     *
+     * @param angle Angle in radians.
+     * @return Angle tangent.
+     */
+    public static double tan(double angle) {
+        if (USE_JDK_MATH) {
+            return Math.tan(angle);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        if (angle > TAN_MAX_VALUE_FOR_INT_MODULO) {
+            angle = remainderPi(angle);
+            if (angle < 0.0) {
+                angle = -angle;
+                negateResult = !negateResult;
+            }
+        }
+        // index: possibly outside tables range.
+        int index = (int)(angle * TAN_INDEXER + 0.5);
+        double delta = (angle - index * TAN_DELTA_HI) - index * TAN_DELTA_LO;
+        // Making sure index is within tables range.
+        // index modulo PI, i.e. 2*(virtual tab size minus one).
+        index &= (2*(TAN_VIRTUAL_TABS_SIZE-1)-1); // index % (2*(TAN_VIRTUAL_TABS_SIZE-1))
+        // Here, index is in [0,2*(TAN_VIRTUAL_TABS_SIZE-1)-1], i.e. indicates an angle in [0,PI[.
+        if (index > (TAN_VIRTUAL_TABS_SIZE-1)) {
+            index = (2*(TAN_VIRTUAL_TABS_SIZE-1)) - index;
+            delta = -delta;
+            negateResult = !negateResult;
+        }
+        double result;
+        if (index < TAN_TABS_SIZE) {
+            result = MyTTan.tanTab[index]
+                    + delta * (MyTTan.tanDer1DivF1Tab[index]
+                            + delta * (MyTTan.tanDer2DivF2Tab[index]
+                                    + delta * (MyTTan.tanDer3DivF3Tab[index]
+                                            + delta * MyTTan.tanDer4DivF4Tab[index])));
+        } else { // angle in ]TAN_MAX_VALUE_FOR_TABS,TAN_MAX_VALUE_FOR_INT_MODULO], or angle is NaN
+            // Using tan(angle) == 1/tan(PI/2-angle) formula: changing angle (index and delta), and inverting.
+            index = (TAN_VIRTUAL_TABS_SIZE-1) - index;
+            result = 1/(MyTTan.tanTab[index]
+                    - delta * (MyTTan.tanDer1DivF1Tab[index]
+                            - delta * (MyTTan.tanDer2DivF2Tab[index]
+                                    - delta * (MyTTan.tanDer3DivF3Tab[index]
+                                            - delta * MyTTan.tanDer4DivF4Tab[index]))));
+        }
+        return negateResult ? -result : result;
+    }
+
+    /**
+     * @param value Value in [-1,1].
+     * @return Value arcsine, in radians, in [-PI/2,PI/2].
+     */
+    public static double asin(double value) {
+        if (USE_JDK_MATH) {
+            return Math.asin(value);
+        }
+        boolean negateResult = false;
+        if (value < 0.0) {
+            value = -value;
+            negateResult = true;
+        }
+        if (value <= ASIN_MAX_VALUE_FOR_TABS) {
+            int index = (int)(value * ASIN_INDEXER + 0.5);
+            double delta = value - index * ASIN_DELTA;
+            double result = MyTAsin.asinTab[index]
+                    + delta * (MyTAsin.asinDer1DivF1Tab[index]
+                            + delta * (MyTAsin.asinDer2DivF2Tab[index]
+                                    + delta * (MyTAsin.asinDer3DivF3Tab[index]
+                                            + delta * MyTAsin.asinDer4DivF4Tab[index])));
+            return negateResult ? -result : result;
+        } else if (USE_POWTABS_FOR_ASIN && (value <= ASIN_MAX_VALUE_FOR_POWTABS)) {
+            int index = (int)(powFast(value * ASIN_POWTABS_ONE_DIV_MAX_VALUE, ASIN_POWTABS_POWER) * ASIN_POWTABS_SIZE_MINUS_ONE + 0.5);
+            double delta = value - MyTAsinPow.asinParamPowTab[index];
+            double result = MyTAsinPow.asinPowTab[index]
+                    + delta * (MyTAsinPow.asinDer1DivF1PowTab[index]
+                            + delta * (MyTAsinPow.asinDer2DivF2PowTab[index]
+                                    + delta * (MyTAsinPow.asinDer3DivF3PowTab[index]
+                                            + delta * MyTAsinPow.asinDer4DivF4PowTab[index])));
+            return negateResult ? -result : result;
+        } else { // value > ASIN_MAX_VALUE_FOR_TABS, or value is NaN
+            // This part is derived from fdlibm.
+            if (value < 1.0) {
+                double t = (1.0 - value)*0.5;
+                double p = t*(ASIN_PS0+t*(ASIN_PS1+t*(ASIN_PS2+t*(ASIN_PS3+t*(ASIN_PS4+t*ASIN_PS5)))));
+                double q = 1.0+t*(ASIN_QS1+t*(ASIN_QS2+t*(ASIN_QS3+t*ASIN_QS4)));
+                double s = sqrt(t);
+                double z = s+s*(p/q);
+                double result = ASIN_PIO2_HI-((z+z)-ASIN_PIO2_LO);
+                return negateResult ? -result : result;
+            } else { // value >= 1.0, or value is NaN
+                if (value == 1.0) {
+                    return negateResult ? -Math.PI/2 : Math.PI/2;
+                } else {
+                    return Double.NaN;
+                }
+            }
+        }
+    }
+
+    /**
+     * If value is not NaN and is outside [-1,1] range, closest value in this range is used.
+     *
+     * @param value Value in [-1,1].
+     * @return Value arcsine, in radians, in [-PI/2,PI/2].
+     */
+    public static double asinInRange(double value) {
+        if (value <= -1.0) {
+            return -Math.PI/2;
+        } else if (value >= 1.0) {
+            return Math.PI/2;
+        } else {
+            return asin(value);
+        }
+    }
+
+    /**
+     * @param value Value in [-1,1].
+     * @return Value arccosine, in radians, in [0,PI].
+     */
+    public static double acos(double value) {
+        if (USE_JDK_MATH) {
+            return Math.acos(value);
+        }
+        return Math.PI/2 - asin(value);
+    }
+
+    /**
+     * If value is not NaN and is outside [-1,1] range,
+     * closest value in this range is used.
+     *
+     * @param value Value in [-1,1].
+     * @return Value arccosine, in radians, in [0,PI].
+     */
+    public static double acosInRange(double value) {
+        if (value <= -1.0) {
+            return Math.PI;
+        } else if (value >= 1.0) {
+            return 0.0;
+        } else {
+            return acos(value);
+        }
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value arctangent, in radians, in [-PI/2,PI/2].
+     */
+    public static double atan(double value) {
+        if (USE_JDK_MATH) {
+            return Math.atan(value);
+        }
+        boolean negateResult = false;
+        if (value < 0.0) {
+            value = -value;
+            negateResult = true;
+        }
+        if (value == 1.0) {
+            // We want "exact" result for 1.0.
+            return negateResult ? -Math.PI/4 : Math.PI/4;
+        } else if (value <= ATAN_MAX_VALUE_FOR_TABS) {
+            int index = (int)(value * ATAN_INDEXER + 0.5);
+            double delta = value - index * ATAN_DELTA;
+            double result = MyTAtan.atanTab[index]
+                    + delta * (MyTAtan.atanDer1DivF1Tab[index]
+                            + delta * (MyTAtan.atanDer2DivF2Tab[index]
+                                    + delta * (MyTAtan.atanDer3DivF3Tab[index]
+                                            + delta * MyTAtan.atanDer4DivF4Tab[index])));
+            return negateResult ? -result : result;
+        } else { // value > ATAN_MAX_VALUE_FOR_TABS, or value is NaN
+            // This part is derived from fdlibm.
+            if (value < TWO_POW_66) {
+                double x = -1/value;
+                double x2 = x*x;
+                double x4 = x2*x2;
+                double s1 = x2*(ATAN_AT0+x4*(ATAN_AT2+x4*(ATAN_AT4+x4*(ATAN_AT6+x4*(ATAN_AT8+x4*ATAN_AT10)))));
+                double s2 = x4*(ATAN_AT1+x4*(ATAN_AT3+x4*(ATAN_AT5+x4*(ATAN_AT7+x4*ATAN_AT9))));
+                double result = ATAN_HI3-((x*(s1+s2)-ATAN_LO3)-x);
+                return negateResult ? -result : result;
+            } else { // value >= 2^66, or value is NaN
+                if (value != value) {
+                    return Double.NaN;
+                } else {
+                    return negateResult ? -Math.PI/2 : Math.PI/2;
+                }
+            }
+        }
+    }
+
+    /**
+     * For special values for which multiple conventions could be adopted,
+     * behaves like Math.atan2(double,double).
+     *
+     * @param y Coordinate on y axis.
+     * @param x Coordinate on x axis.
+     * @return Angle from x axis positive side to (x,y) position, in radians, in [-PI,PI].
+     *         Angle measure is positive when going from x axis to y axis (positive sides).
+     */
+    public static double atan2(double y, double x) {
+        if (USE_JDK_MATH) {
+            return Math.atan2(y,x);
+        }
+        /*
+         * Using sub-methods, to make method lighter for general case,
+         * and to avoid JIT-optimization crash on NaN.
+         */
+        if (x > 0.0) {
+            if (y == 0.0) {
+                // +-0.0
+                return y;
+            }
+            if (x == Double.POSITIVE_INFINITY) {
+                return atan2_pinf_yyy(y);
+            } else {
+                return atan(y/x);
+            }
+        } else if (x < 0.0) {
+            if (y == 0.0) {
+                return signFromBit(y) * Math.PI;
+            }
+            if (x == Double.NEGATIVE_INFINITY) {
+                return atan2_ninf_yyy(y);
+            } else if (y > 0.0) {
+                return Math.PI/2 - atan(x/y);
+            } else if (y < 0.0) {
+                return -Math.PI/2 - atan(x/y);
+            } else {
+                return Double.NaN;
+            }
+        } else {
+            return atan2_yyy_zeroOrNaN(y, x);
+        }
+    }
+
+    /**
+     * Gives same result as Math.toRadians for some particular values
+     * like 90.0, 180.0 or 360.0, but is faster (no division).
+     *
+     * @param angdeg Angle value in degrees.
+     * @return Angle value in radians.
+     */
+    public static double toRadians(double angdeg) {
+        if (USE_JDK_MATH) {
+            return Math.toRadians(angdeg);
+        }
+        return angdeg * (Math.PI/180);
+    }
+
+    /**
+     * Gives same result as Math.toDegrees for some particular values
+     * like Math.PI/2, Math.PI or 2*Math.PI, but is faster (no division).
+     *
+     * @param angrad Angle value in radians.
+     * @return Angle value in degrees.
+     */
+    public static double toDegrees(double angrad) {
+        if (USE_JDK_MATH) {
+            return Math.toDegrees(angrad);
+        }
+        return angrad * (180/Math.PI);
+    }
+
+    /**
+     * @param sign Sign of the angle: true for positive, false for negative.
+     * @param degrees Degrees, in [0,180].
+     * @param minutes Minutes, in [0,59].
+     * @param seconds Seconds, in [0.0,60.0[.
+     * @return Angle in radians.
+     */
+    public static double toRadians(boolean sign, int degrees, int minutes, double seconds) {
+        return toRadians(toDegrees(sign, degrees, minutes, seconds));
+    }
+
+    /**
+     * @param sign Sign of the angle: true for positive, false for negative.
+     * @param degrees Degrees, in [0,180].
+     * @param minutes Minutes, in [0,59].
+     * @param seconds Seconds, in [0.0,60.0[.
+     * @return Angle in degrees.
+     */
+    public static double toDegrees(boolean sign, int degrees, int minutes, double seconds) {
+        double signFactor = sign ? 1.0 : -1.0;
+        return signFactor * (degrees + (1.0/60)*(minutes + (1.0/60)*seconds));
+    }
+
+    /**
+     * @param angrad Angle in radians.
+     * @param degrees (out) Degrees, in [0,180].
+     * @param minutes (out) Minutes, in [0,59].
+     * @param seconds (out) Seconds, in [0.0,60.0[.
+     * @return true if the resulting angle in [-180deg,180deg] is positive, false if it is negative.
+     */
+    public static boolean toDMS(double angrad, IntWrapper degrees, IntWrapper minutes, DoubleWrapper seconds) {
+        // Computing longitude DMS.
+        double tmp = toDegrees(normalizeMinusPiPi(angrad));
+        boolean isNeg = (tmp < 0.0);
+        if (isNeg) {
+            tmp = -tmp;
+        }
+        degrees.value = (int)tmp;
+        tmp = (tmp-degrees.value)*60.0;
+        minutes.value = (int)tmp;
+        seconds.value = Math.min((tmp-minutes.value)*60.0,DOUBLE_BEFORE_60);
+        return !isNeg;
+    }
+
+    /**
+     * NB: Since 2*Math.PI < 2*PI, a span of 2*Math.PI does not mean full angular range.
+     * ex.: isInClockwiseDomain(0.0, 2*Math.PI, -1e-20) returns false.
+     * ---> For full angular range, use a span > 2*Math.PI, like 2*PI_SUP constant of this class.
+     *
+     * @param startAngRad An angle, in radians.
+     * @param angSpanRad An angular span, >= 0.0, in radians.
+     * @param angRad An angle, in radians.
+     * @return true if angRad is in the clockwise angular domain going from startAngRad, over angSpanRad,
+     *         extremities included, false otherwise.
+     */
+    public static boolean isInClockwiseDomain(double startAngRad, double angSpanRad, double angRad) {
+        if (Math.abs(angRad) < -TWO_MATH_PI_IN_MINUS_PI_PI) {
+            // special case for angular values of small magnitude
+            if (angSpanRad <= 2*Math.PI) {
+                if (angSpanRad < 0.0) {
+                    // empty domain
+                    return false;
+                }
+                // angSpanRad is in [0,2*PI]
+                startAngRad = normalizeMinusPiPi(startAngRad);
+                double endAngRad = normalizeMinusPiPi(startAngRad + angSpanRad);
+                if (startAngRad <= endAngRad) {
+                    return (angRad >= startAngRad) && (angRad <= endAngRad);
+                } else {
+                    return (angRad >= startAngRad) || (angRad <= endAngRad);
+                }
+            } else { // angSpanRad > 2*Math.PI, or is NaN
+                return (angSpanRad == angSpanRad);
+            }
+        } else {
+            // general case
+            return (normalizeZeroTwoPi(angRad - startAngRad) <= angSpanRad);
+        }
+    }
+
+    /*
+     * hyperbolic trigonometry
+     */
+
+    /**
+     * Some properties of sinh(x) = (exp(x)-exp(-x))/2:
+     * 1) defined on ]-Infinity,+Infinity[
+     * 2) result in ]-Infinity,+Infinity[
+     * 3) sinh(x) = -sinh(-x) (implies sinh(0) = 0)
+     * 4) sinh(epsilon) ~= epsilon
+     * 5) lim(sinh(x),x->+Infinity) = +Infinity
+     *    (y increasing exponentially faster than x)
+     * 6) reaches +Infinity (double overflow) for x >= 710.475860073944,
+     *    i.e. a bit further than exp(x)
+     *
+     * @param value A double value.
+     * @return Value hyperbolic sine.
+     */
+    public static double sinh(double value) {
+        if (USE_JDK_MATH) {
+            return Math.sinh(value);
+        }
+        // sinh(x) = (exp(x)-exp(-x))/2
+        double h;
+        if (value < 0.0) {
+            value = -value;
+            h = -0.5;
+        } else {
+            h = 0.5;
+        }
+        if (value < 22.0) {
+            if (value < TWO_POW_N28) {
+                return (h < 0.0) ? -value : value;
+            } else {
+                // sinh(x)
+                // = (exp(x)-exp(-x))/2
+                // = (exp(x)-1/exp(x))/2
+                // = (expm1(x) + 1 - 1/(expm1(x)+1))/2
+                // = (expm1(x) + (expm1(x)+1)/(expm1(x)+1) - 1/(expm1(x)+1))/2
+                // = (expm1(x) + expm1(x)/(expm1(x)+1))/2
+                double t = expm1(value);
+                // Might be more accurate, if value < 1: return h*((t+t)-t*t/(t+1.0)).
+                return h * (t + t/(t+1.0));
+            }
+        } else if (value < LOG_DOUBLE_MAX_VALUE) {
+            return h * exp(value);
+        } else {
+            double t = exp(value*0.5);
+            return (h*t)*t;
+        }
+    }
+
+    /**
+     * Some properties of cosh(x) = (exp(x)+exp(-x))/2:
+     * 1) defined on ]-Infinity,+Infinity[
+     * 2) result in [1,+Infinity[
+     * 3) cosh(0) = 1
+     * 4) cosh(x) = cosh(-x)
+     * 5) lim(cosh(x),x->+Infinity) = +Infinity
+     *    (y increasing exponentially faster than x)
+     * 6) reaches +Infinity (double overflow) for x >= 710.475860073944,
+     *    i.e. a bit further than exp(x)
+     *
+     * @param value A double value.
+     * @return Value hyperbolic cosine.
+     */
+    public static double cosh(double value) {
+        if (USE_JDK_MATH) {
+            return Math.cosh(value);
+        }
+        // cosh(x) = (exp(x)+exp(-x))/2
+        if (value < 0.0) {
+            value = -value;
+        }
+        if (value < LOG_TWO_POW_27) {
+            if (value < TWO_POW_N27) {
+                // cosh(x)
+                // = (exp(x)+exp(-x))/2
+                // = ((1+x+x^2/2!+...) + (1-x+x^2/2!-...))/2
+                // = 1+x^2/2!+x^4/4!+...
+                // For value of x small in magnitude, the sum of the terms does not add to 1.
+                return 1;
+            } else {
+                // cosh(x)
+                // = (exp(x)+exp(-x))/2
+                // = (exp(x)+1/exp(x))/2
+                double t = exp(value);
+                return 0.5 * (t+1/t);
+            }
+        } else if (value < LOG_DOUBLE_MAX_VALUE) {
+            return 0.5 * exp(value);
+        } else {
+            double t = exp(value*0.5);
+            return (0.5*t)*t;
+        }
+    }
+
+    /**
+     * Much more accurate than cosh(value)-1,
+     * for arguments (and results) close to zero.
+     *
+     * coshm1(-0.0) = -0.0, for homogeneity with
+     * acosh1p(-0.0) = -0.0.
+     *
+     * @param value A double value.
+     * @return Value hyperbolic cosine, minus 1.
+     */
+    public static double coshm1(double value) {
+        // cosh(x)-1 = (exp(x)+exp(-x))/2 - 1
+        if (value < 0.0) {
+            value = -value;
+        }
+        if (value < LOG_TWO_POW_27) {
+            if (value < TWO_POW_N27) {
+                if (value == 0.0) {
+                    // +-0.0
+                    return value;
+                }
+                // Using (expm1(x)+expm1(-x))/2
+                // is not accurate for tiny values,
+                // for expm1 results are of higher
+                // magnitude than the result and
+                // of different signs, such as their
+                // sum is not accurate.
+                // cosh(x) - 1
+                // = (exp(x)+exp(-x))/2 - 1
+                // = ((1+x+x^2/2!+...) + (1-x+x^2/2!-...))/2 - 1
+                // = x^2/2!+x^4/4!+...
+                // ~= x^2 * (1/2 + x^2 * 1/24)
+                //  = x^2 * 0.5 (since x < 2^-27)
+                return 0.5 * value*value;
+            } else {
+                // cosh(x) - 1
+                // = (exp(x)+exp(-x))/2 - 1
+                // = (exp(x)-1+exp(-x)-1)/2
+                // = (expm1(x)+expm1(-x))/2
+                return 0.5 * (expm1(value)+expm1(-value));
+            }
+        } else if (value < LOG_DOUBLE_MAX_VALUE) {
+            return 0.5 * exp(value) - 1.0;
+        } else {
+            // No need to subtract 1 from result.
+            double t = exp(value*0.5);
+            return (0.5*t)*t;
+        }
+    }
+
+    /**
+     * Computes hyperbolic sine and hyperbolic cosine together.
+     *
+     * @param value A double value.
+     * @param hcosine (out) Value hyperbolic cosine.
+     * @return Value hyperbolic sine.
+     */
+    public static double sinhAndCosh(double value, DoubleWrapper hcosine) {
+        if (USE_JDK_MATH) {
+            hcosine.value = Math.cosh(value);
+            return Math.sinh(value);
+        }
+        // Mixup of sinh and cosh treatments: if you modify them,
+        // you might want to also modify this.
+        double h;
+        if (value < 0.0) {
+            value = -value;
+            h = -0.5;
+        } else {
+            h = 0.5;
+        }
+        final double hsine;
+        // LOG_TWO_POW_27 = 18.714973875118524
+        if (value < LOG_TWO_POW_27) { // test from cosh
+            // sinh
+            if (value < TWO_POW_N28) {
+                hsine = (h < 0.0) ? -value : value;
+            } else {
+                double t = expm1(value);
+                hsine = h * (t + t/(t+1.0));
+            }
+            // cosh
+            if (value < TWO_POW_N27) {
+                hcosine.value = 1;
+            } else {
+                double t = exp(value);
+                hcosine.value = 0.5 * (t+1/t);
+            }
+        } else if (value < 22.0) { // test from sinh
+            // Here, value is in [18.714973875118524,22.0[.
+            double t = expm1(value);
+            hsine = h * (t + t/(t+1.0));
+            hcosine.value = 0.5 * (t+1.0);
+        } else {
+            if (value < LOG_DOUBLE_MAX_VALUE) {
+                hsine = h * exp(value);
+            } else {
+                double t = exp(value*0.5);
+                hsine = (h*t)*t;
+            }
+            hcosine.value = Math.abs(hsine);
+        }
+        return hsine;
+    }
+
+    /**
+     * Some properties of tanh(x) = sinh(x)/cosh(x) = (exp(2*x)-1)/(exp(2*x)+1):
+     * 1) defined on ]-Infinity,+Infinity[
+     * 2) result in ]-1,1[
+     * 3) tanh(x) = -tanh(-x) (implies tanh(0) = 0)
+     * 4) tanh(epsilon) ~= epsilon
+     * 5) lim(tanh(x),x->+Infinity) = 1
+     * 6) reaches 1 (double loss of precision) for x = 19.061547465398498
+     *
+     * @param value A double value.
+     * @return Value hyperbolic tangent.
+     */
+    public static double tanh(double value) {
+        if (USE_JDK_MATH) {
+            return Math.tanh(value);
+        }
+        // tanh(x) = sinh(x)/cosh(x)
+        //         = (exp(x)-exp(-x))/(exp(x)+exp(-x))
+        //         = (exp(2*x)-1)/(exp(2*x)+1)
+        boolean negateResult = false;
+        if (value < 0.0) {
+            value = -value;
+            negateResult = true;
+        }
+        double z;
+        if (value < TANH_1_THRESHOLD) {
+            if (value < TWO_POW_N55) {
+                return negateResult ? -value*(1.0-value) : value*(1.0+value);
+            } else if (value >= 1) {
+                z = 1.0-2.0/(expm1(value+value)+2.0);
+            } else {
+                double t = expm1(-(value+value));
+                z = -t/(t+2.0);
+            }
+        } else {
+            z = (value != value) ? Double.NaN : 1.0;
+        }
+        return negateResult ? -z : z;
+    }
+
+    /**
+     * Some properties of asinh(x) = log(x + sqrt(x^2 + 1))
+     * 1) defined on ]-Infinity,+Infinity[
+     * 2) result in ]-Infinity,+Infinity[
+     * 3) asinh(x) = -asinh(-x) (implies asinh(0) = 0)
+     * 4) asinh(epsilon) ~= epsilon
+     * 5) lim(asinh(x),x->+Infinity) = +Infinity
+     *    (y increasing logarithmically slower than x)
+     *
+     * @param value A double value.
+     * @return Value hyperbolic arcsine.
+     */
+    public static double asinh(double value) {
+        // asinh(x) = log(x + sqrt(x^2 + 1))
+        boolean negateResult = false;
+        if (value < 0.0) {
+            value = -value;
+            negateResult = true;
+        }
+        double result;
+        // (about) smallest possible for
+        // non-log1p case to be accurate.
+        if (value < ASINH_LOG1P_THRESHOLD) {
+            // Around this range, FDLIBM uses
+            // log1p(value+value*value/(1+sqrt(value*value+1))),
+            // but it's slower, so we don't use it.
+            /*
+             * If x is close to zero, log argument is close to 1,
+             * so to avoid precision loss we use log1p(double),
+             * with
+             * (1+x)^p = 1 + p * x + (p*(p-1))/2! * x^2 + (p*(p-1)*(p-2))/3! * x^3 + ...
+             * (1+x)^p = 1 + p * x * (1 + (p-1)/2 * x * (1 + (p-2)/3 * x + ...)
+             * (1+x)^0.5 = 1 + 0.5 * x * (1 + (0.5-1)/2 * x * (1 + (0.5-2)/3 * x + ...)
+             * (1+x^2)^0.5 = 1 + 0.5 * x^2 * (1 + (0.5-1)/2 * x^2 * (1 + (0.5-2)/3 * x^2 + ...)
+             * x + (1+x^2)^0.5 = 1 + x * (1 + 0.5 * x * (1 + (0.5-1)/2 * x^2 * (1 + (0.5-2)/3 * x^2 + ...))
+             * so
+             * asinh(x) = log1p(x * (1 + 0.5 * x * (1 + (0.5-1)/2 * x^2 * (1 + (0.5-2)/3 * x^2 + ...)))
+             */
+            final double x = value;
+            final double x2 = x*x;
+            // Enough terms for good accuracy,
+            // given our threshold.
+            final double argLog1p = (x *
+                    (1 + 0.5 * x
+                            * (1 + (0.5-1)/2 * x2
+                                    * (1 + (0.5-2)/3 * x2
+                                            * (1 + (0.5-3)/4 * x2
+                                                    * (1 + (0.5-4)/5 * x2
+                                                    ))))));
+            result = log1p(argLog1p);
+        } else if (value < ASINH_ACOSH_SQRT_ELISION_THRESHOLD) {
+            // Around this range, FDLIBM uses
+            // log(2*value+1/(value+sqrt(value*value+1))),
+            // but it involves an additional division
+            // so we don't use it.
+            result = log(value + sqrt(value*value + 1.0));
+        } else {
+            // log(2*value) would overflow for value > Double.MAX_VALUE/2,
+            // so we compute otherwise.
+            result = LOG_2 + log(value);
+        }
+        return negateResult ? -result : result;
+    }
+
+    /**
+     * Some properties of acosh(x) = log(x + sqrt(x^2 - 1)):
+     * 1) defined on [1,+Infinity[
+     * 2) result in ]0,+Infinity[ (by convention, since cosh(x) = cosh(-x))
+     * 3) acosh(1) = 0
+     * 4) acosh(1+epsilon) ~= log(1 + sqrt(2*epsilon)) ~= sqrt(2*epsilon)
+     * 5) lim(acosh(x),x->+Infinity) = +Infinity
+     *    (y increasing logarithmically slower than x)
+     *
+     * @param value A double value.
+     * @return Value hyperbolic arccosine.
+     */
+    public static double acosh(double value) {
+        if (!(value > 1.0)) {
+            // NaN, or value <= 1
+            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
+                return (value < 1.0) ? Double.NaN : value - 1.0;
+            } else {
+                return (value == 1.0) ? 0.0 : Double.NaN;
+            }
+        }
+        double result;
+        if (value < ASINH_ACOSH_SQRT_ELISION_THRESHOLD) {
+            // Around this range, FDLIBM uses
+            // log(2*value-1/(value+sqrt(value*value-1))),
+            // but it involves an additional division
+            // so we don't use it.
+            result = log(value + sqrt(value*value - 1.0));
+        } else {
+            // log(2*value) would overflow for value > Double.MAX_VALUE/2,
+            // so we compute otherwise.
+            result = LOG_2 + log(value);
+        }
+        return result;
+    }
+
+    /**
+     * Much more accurate than acosh(1+value),
+     * for arguments (and results) close to zero.
+     *
+     * acosh1p(-0.0) = -0.0, for homogeneity with
+     * sqrt(-0.0) = -0.0, which looks about the same
+     * near 0.
+     *
+     * @param value A double value.
+     * @return Hyperbolic arccosine of (1+value).
+     */
+    public static double acosh1p(double value) {
+        if (!(value > 0.0)) {
+            // NaN, or value <= 0.
+            // If value is -0.0, returning -0.0.
+            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
+                return (value < 0.0) ? Double.NaN : value;
+            } else {
+                return (value == 0.0) ? value : Double.NaN;
+            }
+        }
+        double result;
+        if (value < (ASINH_ACOSH_SQRT_ELISION_THRESHOLD-1)) {
+            // acosh(1+x)
+            // = log((1+x) + sqrt((1+x)^2 - 1))
+            // = log(1 + x + sqrt(1 + 2*x + x^2 - 1))
+            // = log1p(x + sqrt(2*x + x^2))
+            // = log1p(x + sqrt(x * (2 + x))
+            result = log1p(value + sqrt(value * (2 + value)));
+        } else {
+            result = LOG_2 + log(1+value);
+        }
+        return result;
+    }
+
+    /**
+     * Some properties of atanh(x) = log((1+x)/(1-x))/2:
+     * 1) defined on ]-1,1[
+     * 2) result in ]-Infinity,+Infinity[
+     * 3) atanh(-1) = -Infinity (by continuity)
+     * 4) atanh(1) = +Infinity (by continuity)
+     * 5) atanh(epsilon) ~= epsilon
+     * 6) lim(atanh(x),x->1) = +Infinity
+     *
+     * @param value A double value.
+     * @return Value hyperbolic arctangent.
+     */
+    public static double atanh(double value) {
+        boolean negateResult = false;
+        if (value < 0.0) {
+            value = -value;
+            negateResult = true;
+        }
+        double result;
+        if (!(value < 1.0)) {
+            // NaN, or value >= 1
+            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
+                result = (value > 1.0) ? Double.NaN : Double.POSITIVE_INFINITY + value;
+            } else {
+                result = (value == 1.0) ? Double.POSITIVE_INFINITY : Double.NaN;
+            }
+        } else {
+            // For value < 0.5, FDLIBM uses
+            // 0.5 * log1p((value+value) + (value+value)*value/(1-value)),
+            // instead, but this is good enough for us.
+            // atanh(x)
+            // = log((1+x)/(1-x))/2
+            // = log((1-x+2x)/(1-x))/2
+            // = log1p(2x/(1-x))/2
+            result = 0.5 * log1p((value+value)/(1.0-value));
+        }
+        return negateResult ? -result : result;
+    }
+
+    /*
+     * exponentials
+     */
+
+    /**
+     * @param value A double value.
+     * @return e^value.
+     */
+    public static double exp(double value) {
+        if (USE_JDK_MATH) {
+            return Math.exp(value);
+        }
+        // exp(x) = exp([x])*exp(y)
+        // with [x] the integer part of x, and y = x-[x]
+        // ===>
+        // We find an approximation of y, called z.
+        // ===>
+        // exp(x) = exp([x])*(exp(z)*exp(epsilon))
+        // with epsilon = y - z
+        // ===>
+        // We have exp([x]) and exp(z) pre-computed in tables, we "just" have to compute exp(epsilon).
+        //
+        // We use the same indexing (cast to int) to compute x integer part and the
+        // table index corresponding to z, to avoid two int casts.
+        // Also, to optimize index multiplication and division, we use powers of two,
+        // so that we can do it with bits shifts.
+
+        if (value > EXP_OVERFLOW_LIMIT) {
+            return Double.POSITIVE_INFINITY;
+        } else if (!(value >= EXP_UNDERFLOW_LIMIT)) {
+            return (value != value) ? Double.NaN : 0.0;
+        }
+
+        final int indexes = (int)(value*EXP_LO_INDEXING);
+
+        final int valueInt;
+        if (indexes >= 0) {
+            valueInt = (indexes>>EXP_LO_INDEXING_DIV_SHIFT);
+        } else {
+            valueInt = -((-indexes)>>EXP_LO_INDEXING_DIV_SHIFT);
+        }
+        final double hiTerm = MyTExp.expHiTab[valueInt-(int)EXP_UNDERFLOW_LIMIT];
+
+        final int zIndex = indexes - (valueInt<<EXP_LO_INDEXING_DIV_SHIFT);
+        final double y = (value-valueInt);
+        final double z = zIndex*(1.0/EXP_LO_INDEXING);
+        final double eps = y-z;
+        final double expZ = MyTExp.expLoPosTab[zIndex+EXP_LO_TAB_MID_INDEX];
+        final double expEps = (1+eps*(1+eps*(1.0/2+eps*(1.0/6+eps*(1.0/24)))));
+        final double loTerm = expZ * expEps;
+
+        return hiTerm * loTerm;
+    }
+
+    /**
+     * Quick exp, with a max relative error of about 2.94e-2 for |value| < 700.0 or so,
+     * and no accuracy at all outside this range.
+     * Derived from a note by Nicol N. Schraudolph, IDSIA, 1998.
+     *
+     * @param value A double value.
+     * @return e^value.
+     */
+    public static double expQuick(double value) {
+        if (USE_JDK_MATH) {
+            return Math.exp(value);
+        }
+        /*
+         * Cast of double values, even in long range, into long, is slower than
+         * from double to int for values in int range, and then from int to long.
+         * For that reason, we only work with integer values in int range
+         * (corresponding to the 32 first bits of the long, containing sign,
+         * exponent, and highest significant bits of double's mantissa),
+         * and cast twice.
+         *
+         * Constants determined empirically, using a random-based metaheuristic.
+         * Should be possible to find better ones.
+         */
+        return Double.longBitsToDouble(((long)(int)(1512775.3952 * value + 1.0726481222E9))<<32);
+    }
+
+    /**
+     * Much more accurate than exp(value)-1,
+     * for arguments (and results) close to zero.
+     *
+     * @param value A double value.
+     * @return e^value-1.
+     */
+    public static double expm1(double value) {
+        if (USE_JDK_MATH) {
+            return Math.expm1(value);
+        }
+        // If value is far from zero, we use exp(value)-1.
+        //
+        // If value is close to zero, we use the following formula:
+        // exp(value)-1
+        // = exp(valueApprox)*exp(epsilon)-1
+        // = exp(valueApprox)*(exp(epsilon)-exp(-valueApprox))
+        // = exp(valueApprox)*(1+epsilon+epsilon^2/2!+...-exp(-valueApprox))
+        // = exp(valueApprox)*((1-exp(-valueApprox))+epsilon+epsilon^2/2!+...)
+        // exp(valueApprox) and exp(-valueApprox) being stored in tables.
+
+        if (Math.abs(value) < EXP_LO_DISTANCE_TO_ZERO) {
+            // Taking int part instead of rounding, which takes too long.
+            int i = (int)(value*EXP_LO_INDEXING);
+            double delta = value-i*(1.0/EXP_LO_INDEXING);
+            return MyTExp.expLoPosTab[i+EXP_LO_TAB_MID_INDEX]*(MyTExp.expLoNegTab[i+EXP_LO_TAB_MID_INDEX]+delta*(1+delta*(1.0/2+delta*(1.0/6+delta*(1.0/24+delta*(1.0/120))))));
+        } else {
+            return exp(value)-1;
+        }
+    }
+
+    /*
+     * logarithms
+     */
+
+    /**
+     * @param value A double value.
+     * @return Value logarithm (base e).
+     */
+    public static double log(double value) {
+        if (USE_JDK_MATH || (!USE_REDEFINED_LOG)) {
+            return Math.log(value);
+        }
+        if (value > 0.0) {
+            if (value == Double.POSITIVE_INFINITY) {
+                return Double.POSITIVE_INFINITY;
+            }
+
+            // For normal values not close to 1.0, we use the following formula:
+            // log(value)
+            // = log(2^exponent*1.mantissa)
+            // = log(2^exponent) + log(1.mantissa)
+            // = exponent * log(2) + log(1.mantissa)
+            // = exponent * log(2) + log(1.mantissaApprox) + log(1.mantissa/1.mantissaApprox)
+            // = exponent * log(2) + log(1.mantissaApprox) + log(1+epsilon)
+            // = exponent * log(2) + log(1.mantissaApprox) + epsilon-epsilon^2/2+epsilon^3/3-epsilon^4/4+...
+            // with:
+            // 1.mantissaApprox <= 1.mantissa,
+            // log(1.mantissaApprox) in table,
+            // epsilon = (1.mantissa/1.mantissaApprox)-1
+            //
+            // To avoid bad relative error for small results,
+            // values close to 1.0 are treated aside, with the formula:
+            // log(x) = z*(2+z^2*((2.0/3)+z^2*((2.0/5))+z^2*((2.0/7))+...)))
+            // with z=(x-1)/(x+1)
+
+            double h;
+            if (value > 0.95) {
+                if (value < 1.14) {
+                    double z = (value-1.0)/(value+1.0);
+                    double z2 = z*z;
+                    return z*(2+z2*((2.0/3)+z2*((2.0/5)+z2*((2.0/7)+z2*((2.0/9)+z2*((2.0/11)))))));
+                }
+                h = 0.0;
+            } else if (value < DOUBLE_MIN_NORMAL) {
+                // Ensuring value is normal.
+                value *= TWO_POW_52;
+                // log(x*2^52)
+                // = log(x)-ln(2^52)
+                // = log(x)-52*ln(2)
+                h = -52*LOG_2;
+            } else {
+                h = 0.0;
+            }
+
+            int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
+            int valueExp = (valueBitsHi>>20)-MAX_DOUBLE_EXPONENT;
+            // Getting the first LOG_BITS bits of the mantissa.
+            int xIndex = ((valueBitsHi<<12)>>>(32-LOG_BITS));
+
+            // 1.mantissa/1.mantissaApprox - 1
+            double z = (value * twoPowNormalOrSubnormal(-valueExp)) * MyTLog.logXInvTab[xIndex] - 1;
+
+            z *= (1-z*((1.0/2)-z*((1.0/3))));
+
+            return h + valueExp * LOG_2 + (MyTLog.logXLogTab[xIndex] + z);
+
+        } else if (value == 0.0) {
+            return Double.NEGATIVE_INFINITY;
+        } else { // value < 0.0, or value is NaN
+            return Double.NaN;
+        }
+    }
+
+    /**
+     * Quick log, with a max relative error of about 1.9e-3
+     * for values in ]Double.MIN_NORMAL,+Infinity[, and
+     * worse accuracy outside this range.
+     *
+     * @param value A double value, in ]0,+Infinity[ (strictly positive and finite).
+     * @return Value logarithm (base e).
+     */
+    public static double logQuick(double value) {
+        if (USE_JDK_MATH) {
+            return Math.log(value);
+        }
+        /*
+         * Inverse of Schraudolph's method for exp, is very inaccurate near 1,
+         * and not that fast (even using floats), especially with added if's
+         * to deal with values near 1, so we don't use it, and use a simplified
+         * version of our log's redefined algorithm.
+         */
+
+        // Simplified version of log's redefined algorithm:
+        // log(value) ~= exponent * log(2) + log(1.mantissaApprox)
+
+        double h;
+        if (value > 0.87) {
+            if (value < 1.16) {
+                return 2.0 * (value-1.0)/(value+1.0);
+            }
+            h = 0.0;
+        } else if (value < DOUBLE_MIN_NORMAL) {
+            value *= TWO_POW_52;
+            h = -52*LOG_2;
+        } else {
+            h = 0.0;
+        }
+
+        int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
+        int valueExp = (valueBitsHi>>20)-MAX_DOUBLE_EXPONENT;
+        int xIndex = ((valueBitsHi<<12)>>>(32-LOG_BITS));
+
+        return h + valueExp * LOG_2 + MyTLog.logXLogTab[xIndex];
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value logarithm (base 10).
+     */
+    public static double log10(double value) {
+        if (USE_JDK_MATH || (!USE_REDEFINED_LOG)) {
+            return Math.log10(value);
+        }
+        // INV_LOG_10 is < 1, but there is no risk of log(double)
+        // overflow (positive or negative) while the end result shouldn't,
+        // since log(Double.MIN_VALUE) and log(Double.MAX_VALUE) have
+        // magnitudes of just a few hundreds.
+        return log(value) * INV_LOG_10;
+    }
+
+    /**
+     * Much more accurate than log(1+value),
+     * for arguments (and results) close to zero.
+     *
+     * @param value A double value.
+     * @return Logarithm (base e) of (1+value).
+     */
+    public static double log1p(double value) {
+        if (USE_JDK_MATH) {
+            return Math.log1p(value);
+        }
+        if (false) {
+            // This also works. Simpler but a bit slower.
+            if (value == Double.POSITIVE_INFINITY) {
+                return Double.POSITIVE_INFINITY;
+            }
+            double valuePlusOne = 1+value;
+            if (valuePlusOne == 1.0) {
+                return value;
+            } else {
+                return log(valuePlusOne)*(value/(valuePlusOne-1.0));
+            }
+        }
+        if (value > -1.0) {
+            if (value == Double.POSITIVE_INFINITY) {
+                return Double.POSITIVE_INFINITY;
+            }
+
+            // ln'(x) = 1/x
+            // so
+            // log(x+epsilon) ~= log(x) + epsilon/x
+            //
+            // Let u be 1+value rounded:
+            // 1+value = u+epsilon
+            //
+            // log(1+value)
+            // = log(u+epsilon)
+            // ~= log(u) + epsilon/value
+            // We compute log(u) as done in log(double), and then add the corrective term.
+
+            double valuePlusOne = 1.0+value;
+            if (valuePlusOne == 1.0) {
+                return value;
+            } else if (Math.abs(value) < 0.15) {
+                double z = value/(value+2.0);
+                double z2 = z*z;
+                return z*(2+z2*((2.0/3)+z2*((2.0/5)+z2*((2.0/7)+z2*((2.0/9)+z2*((2.0/11)))))));
+            }
+
+            int valuePlusOneBitsHi = (int)(Double.doubleToRawLongBits(valuePlusOne)>>32) & 0x7FFFFFFF;
+            int valuePlusOneExp = (valuePlusOneBitsHi>>20)-MAX_DOUBLE_EXPONENT;
+            // Getting the first LOG_BITS bits of the mantissa.
+            int xIndex = ((valuePlusOneBitsHi<<12)>>>(32-LOG_BITS));
+
+            // 1.mantissa/1.mantissaApprox - 1
+            double z = (valuePlusOne * twoPowNormalOrSubnormal(-valuePlusOneExp)) * MyTLog.logXInvTab[xIndex] - 1;
+
+            z *= (1-z*((1.0/2)-z*(1.0/3)));
+
+            // Adding epsilon/valuePlusOne to z,
+            // with
+            // epsilon = value - (valuePlusOne-1)
+            // (valuePlusOne + epsilon ~= 1+value (not rounded))
+
+            return valuePlusOneExp * LOG_2 + MyTLog.logXLogTab[xIndex] + (z + (value - (valuePlusOne-1))/valuePlusOne);
+        } else if (value == -1.0) {
+            return Double.NEGATIVE_INFINITY;
+        } else { // value < -1.0, or value is NaN
+            return Double.NaN;
+        }
+    }
+
+    /*
+     * powers
+     */
+
+    /**
+     * 1e-13ish accuracy or better on whole double range.
+     *
+     * @param value A double value.
+     * @param power A power.
+     * @return value^power.
+     */
+    public static double pow(double value, double power) {
+        if (USE_JDK_MATH) {
+            return Math.pow(value,power);
+        }
+        if (power == 0.0) {
+            return 1.0;
+        } else if (power == 1.0) {
+            return value;
+        }
+        if (value <= 0.0) {
+            // powerInfo: 0 if not integer, 1 if even integer, -1 if odd integer
+            int powerInfo;
+            if (Math.abs(power) >= (TWO_POW_52*2)) {
+                // The binary digit just before comma is outside mantissa,
+                // thus it is always 0: power is an even integer.
+                powerInfo = 1;
+            } else {
+                // If power's magnitude permits, we cast into int instead of into long,
+                // as it is faster.
+                if (Math.abs(power) <= (double)Integer.MAX_VALUE) {
+                    int powerAsInt = (int)power;
+                    if (power == (double)powerAsInt) {
+                        powerInfo = ((powerAsInt & 1) == 0) ? 1 : -1;
+                    } else { // power is not an integer (and not NaN, due to test against Integer.MAX_VALUE)
+                        powerInfo = 0;
+                    }
+                } else {
+                    long powerAsLong = (long)power;
+                    if (power == (double)powerAsLong) {
+                        powerInfo = ((powerAsLong & 1) == 0) ? 1 : -1;
+                    } else { // power is not an integer, or is NaN
+                        if (power != power) {
+                            return Double.NaN;
+                        }
+                        powerInfo = 0;
+                    }
+                }
+            }
+
+            if (value == 0.0) {
+                if (power < 0.0) {
+                    return (powerInfo < 0) ? 1/value : Double.POSITIVE_INFINITY;
+                } else { // power > 0.0 (0 and NaN cases already treated)
+                    return (powerInfo < 0) ? value : 0.0;
+                }
+            } else { // value < 0.0
+                if (value == Double.NEGATIVE_INFINITY) {
+                    if (powerInfo < 0) { // power odd integer
+                        return (power < 0.0) ? -0.0 : Double.NEGATIVE_INFINITY;
+                    } else { // power even integer, or not an integer
+                        return (power < 0.0) ? 0.0 : Double.POSITIVE_INFINITY;
+                    }
+                } else {
+                    return (powerInfo == 0) ? Double.NaN : powerInfo * exp(power*log(-value));
+                }
+            }
+        } else { // value > 0.0, or value is NaN
+            return exp(power*log(value));
+        }
+    }
+
+    /**
+     * Quick pow, with a max relative error of about 1e-2
+     * for value >= Double.MIN_NORMAL and 1e-10 < |value^power| < 1e10,
+     * of about 6e-2 for value >= Double.MIN_NORMAL and 1e-40 < |value^power| < 1e40,
+     * and worse accuracy otherwise.
+     *
+     * @param value A double value, in ]0,+Infinity[ (strictly positive and finite).
+     * @param power A double value.
+     * @return value^power.
+     */
+    public static double powQuick(double value, double power) {
+        if (USE_JDK_MATH) {
+            return Math.pow(value,power);
+        }
+        return exp(power*logQuick(value));
+    }
+
+    /**
+     * This treatment is somehow accurate for low values of |power|,
+     * and for |power*getExponent(value)| < 1023 or so (to stay away
+     * from double extreme magnitudes (large and small)).
+     *
+     * @param value A double value.
+     * @param power A power.
+     * @return value^power.
+     */
+    public static double powFast(double value, int power) {
+        if (USE_JDK_MATH) {
+            return Math.pow(value,power);
+        }
+        if (power < 3) {
+            if (power < 0) {
+                // Opposite of Integer.MIN_VALUE does not exist as int.
+                if (power == Integer.MIN_VALUE) {
+                    // Integer.MAX_VALUE = -(power+1)
+                    return 1.0/(powFast(value,Integer.MAX_VALUE) * value);
+                } else {
+                    return 1.0/powFast(value,-power);
+                }
+            } else {
+                // Here, power is in [0,2].
+                if (power == 2) { // Most common case first.
+                    return value * value;
+                } else if (power == 0) {
+                    return 1.0;
+                } else { // power == 1
+                    return value;
+                }
+            }
+        } else { // power >= 4
+            double oddRemains = 1.0;
+            // If power <= 5, faster to finish outside the loop.
+            while (power > 5) {
+                // Test if power is odd.
+                if ((power & 1) != 0) {
+                    oddRemains *= value;
+                }
+                value *= value;
+                power >>= 1; // power = power / 2
+            }
+            // Here, power is in [3,5].
+            if (power == 3) {
+                return oddRemains * value * value * value;
+            } else { // power in [4,5].
+                double v2 = value * value;
+                if (power == 4) {
+                    return oddRemains * v2 * v2;
+                } else { // power == 5
+                    return oddRemains * v2 * v2 * value;
+                }
+            }
+        }
+    }
+
+    /**
+     * @param value A float value.
+     * @return value*value.
+     */
+    public static float pow2(float value) {
+        return value*value;
+    }
+
+    /**
+     * @param value A double value.
+     * @return value*value.
+     */
+    public static double pow2(double value) {
+        return value*value;
+    }
+
+    /**
+     * @param value A float value.
+     * @return value*value*value.
+     */
+    public static float pow3(float value) {
+        return value*value*value;
+    }
+
+    /**
+     * @param value A double value.
+     * @return value*value*value.
+     */
+    public static double pow3(double value) {
+        return value*value*value;
+    }
+
+    /*
+     * roots
+     */
+
+    /**
+     * @param value A double value.
+     * @return Value square root.
+     */
+    public static double sqrt(double value) {
+        if (USE_JDK_MATH || (!USE_REDEFINED_SQRT)) {
+            return Math.sqrt(value);
+        }
+        // See cbrt for comments, sqrt uses the same ideas.
+
+        if (!(value > 0.0)) { // value <= 0.0, or value is NaN
+            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
+                return (value < 0.0) ? Double.NaN : value;
+            } else {
+                return (value == 0.0) ? value : Double.NaN;
+            }
+        } else if (value == Double.POSITIVE_INFINITY) {
+            return Double.POSITIVE_INFINITY;
+        }
+
+        double h;
+        if (value < DOUBLE_MIN_NORMAL) {
+            value *= TWO_POW_52;
+            h = 2*TWO_POW_N26;
+        } else {
+            h = 2.0;
+        }
+
+        int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
+        int valueExponentIndex = (valueBitsHi>>20)+(-MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT);
+        int xIndex = ((valueBitsHi<<12)>>>(32-SQRT_LO_BITS));
+
+        double result = MyTSqrt.sqrtXSqrtHiTab[valueExponentIndex] * MyTSqrt.sqrtXSqrtLoTab[xIndex];
+        double slope = MyTSqrt.sqrtSlopeHiTab[valueExponentIndex] * MyTSqrt.sqrtSlopeLoTab[xIndex];
+        value *= 0.25;
+
+        result += (value - result * result) * slope;
+        result += (value - result * result) * slope;
+        return h*(result + (value - result * result) * slope);
+    }
+
+    /**
+     * Quick sqrt, with with a max relative error of about 3.41e-2
+     * for values in [Double.MIN_NORMAL,Double.MAX_VALUE], and worse
+     * accuracy outside this range.
+     *
+     * @param value A double value.
+     * @return Value square root.
+     */
+    public static double sqrtQuick(double value) {
+        if (USE_JDK_MATH) {
+            return Math.sqrt(value);
+        }
+        final long bits = Double.doubleToRawLongBits(value);
+        /*
+         * Constant determined empirically, using a random-based metaheuristic.
+         * Should be possible to find a better one.
+         */
+        return Double.longBitsToDouble((bits+4606859074900000000L)>>>1);
+    }
+
+    /**
+     * Quick inverse of square root, with a max relative error of about 3.44e-2
+     * for values in [Double.MIN_NORMAL,Double.MAX_VALUE], and worse accuracy
+     * outside this range.
+     *
+     * This implementation uses zero step of Newton's method.
+     * Here are the max relative errors on [Double.MIN_NORMAL,Double.MAX_VALUE]
+     * depending on number of steps, if you want to copy-paste this code
+     * and use your own number:
+     * n=0: about 3.44e-2
+     * n=1: about 1.75e-3
+     * n=2: about 4.6e-6
+     * n=3: about 3.17e-11
+     * n=4: about 3.92e-16
+     * n=5: about 3.03e-16
+     *
+     * @param value A double value.
+     * @return Inverse of value square root.
+     */
+    public static double invSqrtQuick(double value) {
+        if (USE_JDK_MATH) {
+            return 1/Math.sqrt(value);
+        }
+        /*
+         * http://en.wikipedia.org/wiki/Fast_inverse_square_root
+         */
+        if (false) {
+            // With one Newton step (much slower than
+            // 1/Math.sqrt(double) if not optimized).
+            final double halfInitial = value * 0.5;
+            long bits = Double.doubleToRawLongBits(value);
+            // If n=0, 6910474759270000000L might be better (3.38e-2 max relative error).
+            bits = 0x5FE6EB50C7B537A9L - (bits>>1);
+            value = Double.longBitsToDouble(bits);
+            value = value * (1.5 - halfInitial * value * value); // Newton step, can repeat.
+            return value;
+        } else {
+            return Double.longBitsToDouble(0x5FE6EB50C7B537A9L - (Double.doubleToRawLongBits(value)>>1));
+        }
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value cubic root.
+     */
+    public static double cbrt(double value) {
+        if (USE_JDK_MATH) {
+            return Math.cbrt(value);
+        }
+        double h;
+        if (value < 0.0) {
+            if (value == Double.NEGATIVE_INFINITY) {
+                return Double.NEGATIVE_INFINITY;
+            }
+            value = -value;
+            // Making sure value is normal.
+            if (value < DOUBLE_MIN_NORMAL) {
+                value *= (TWO_POW_52*TWO_POW_26);
+                // h = <result_sign> * <result_multiplicator_to_avoid_overflow> / <cbrt(value_multiplicator_to_avoid_subnormal)>
+                h = -2*TWO_POW_N26;
+            } else {
+                h = -2.0;
+            }
+        } else {
+            if (!(value < Double.POSITIVE_INFINITY)) { // value is +Infinity, or value is NaN
+                return value;
+            }
+            // Making sure value is normal.
+            if (value < DOUBLE_MIN_NORMAL) {
+                if (value == 0.0) {
+                    // cbrt(0.0) = 0.0, cbrt(-0.0) = -0.0
+                    return value;
+                }
+                value *= (TWO_POW_52*TWO_POW_26);
+                h = 2*TWO_POW_N26;
+            } else {
+                h = 2.0;
+            }
+        }
+
+        // Normal value is (2^<value exponent> * <a value in [1,2[>).
+        // First member cubic root is computed, and multiplied with an approximation
+        // of the cubic root of the second member, to end up with a good guess of
+        // the result before using Newton's (or Archimedes's) method.
+        // To compute the cubic root approximation, we use the formula "cbrt(value) = cbrt(x) * cbrt(value/x)",
+        // choosing x as close to value as possible but inferior to it, so that cbrt(value/x) is close to 1
+        // (we could iterate on this method, using value/x as new value for each iteration,
+        // but finishing with Newton's method is faster).
+
+        // Shift and cast into an int, which overall is faster than working with a long.
+        int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
+        int valueExponentIndex = (valueBitsHi>>20)+(-MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT);
+        // Getting the first CBRT_LO_BITS bits of the mantissa.
+        int xIndex = ((valueBitsHi<<12)>>>(32-CBRT_LO_BITS));
+        double result = MyTCbrt.cbrtXCbrtHiTab[valueExponentIndex] * MyTCbrt.cbrtXCbrtLoTab[xIndex];
+        double slope = MyTCbrt.cbrtSlopeHiTab[valueExponentIndex] * MyTCbrt.cbrtSlopeLoTab[xIndex];
+
+        // Lowering values to avoid overflows when using Newton's method
+        // (we will then just have to return twice the result).
+        // result^3 = value
+        // (result/2)^3 = value/8
+        value *= 0.125;
+        // No need to divide result here, as division is factorized in result computation tables.
+        // result *= 0.5;
+
+        // Newton's method, looking for y = x^(1/p):
+        // y(n) = y(n-1) + (x-y(n-1)^p) * slope(y(n-1))
+        // y(n) = y(n-1) + (x-y(n-1)^p) * (1/p)*(x(n-1)^(1/p-1))
+        // y(n) = y(n-1) + (x-y(n-1)^p) * (1/p)*(x(n-1)^((1-p)/p))
+        // with x(n-1)=y(n-1)^p, i.e.:
+        // y(n) = y(n-1) + (x-y(n-1)^p) * (1/p)*(y(n-1)^(1-p))
+        //
+        // For p=3:
+        // y(n) = y(n-1) + (x-y(n-1)^3) * (1/(3*y(n-1)^2))
+
+        // To save time, we don't recompute the slope between Newton's method steps,
+        // as initial slope is good enough for a few iterations.
+        //
+        // NB: slope = 1/(3*trueResult*trueResult)
+        //     As we have result = trueResult/2 (to avoid overflows), we have:
+        //     slope = 4/(3*result*result)
+        //           = (4/3)*resultInv*resultInv
+        //     with newResultInv = 1/newResult
+        //                       = 1/(oldResult+resultDelta)
+        //                       = (oldResultInv)*1/(1+resultDelta/oldResult)
+        //                       = (oldResultInv)*1/(1+resultDelta*oldResultInv)
+        //                      ~= (oldResultInv)*(1-resultDelta*oldResultInv)
+        //     ===> Successive slopes could be computed without division, if needed,
+        //          by computing resultInv (instead of slope right away) and retrieving
+        //          slopes from it.
+
+        result += (value - result * result * result) * slope;
+        result += (value - result * result * result) * slope;
+        return h*(result + (value - result * result * result) * slope);
+    }
+
+    /**
+     * @return sqrt(x^2+y^2) without intermediate overflow or underflow.
+     */
+    public static double hypot(double x, double y) {
+        if (USE_JDK_MATH) {
+            return Math.hypot(x,y);
+        }
+        x = Math.abs(x);
+        y = Math.abs(y);
+        // Ensuring x <= y.
+        if (y < x) {
+            double a = x;
+            x = y;
+            y = a;
+        } else if (!(y >= x)) { // Testing if we have some NaN.
+            return hypot_NaN(x, y);
+        }
+
+        if (y-x == y) {
+            // x too small to subtract from y.
+            return y;
+        } else {
+            double factor;
+            if (y > HYPOT_MAX_MAG) {
+                // y is too large: scaling down.
+                x *= (1/HYPOT_FACTOR);
+                y *= (1/HYPOT_FACTOR);
+                factor = HYPOT_FACTOR;
+            } else if (x < (1/HYPOT_MAX_MAG)) {
+                // x is too small: scaling up.
+                x *= HYPOT_FACTOR;
+                y *= HYPOT_FACTOR;
+                factor = (1/HYPOT_FACTOR);
+            } else {
+                factor = 1.0;
+            }
+            return factor * sqrt(x*x+y*y);
+        }
+    }
+
+    /**
+     * @return sqrt(x^2+y^2+z^2) without intermediate overflow or underflow.
+     */
+    public static double hypot(double x, double y, double z) {
+        if (USE_JDK_MATH) {
+            // No simple JDK equivalent.
+        }
+        x = Math.abs(x);
+        y = Math.abs(y);
+        z = Math.abs(z);
+        /*
+         * Considering that z magnitude is the most likely to be the smaller,
+         * hence ensuring z <= y <= x, and not x <= y <= z, for less swaps.
+         */
+        // Ensuring z <= y.
+        if (z > y) {
+            // y < z: swapping y and z
+            double a = z;
+            z = y;
+            y = a;
+        } else if (!(z <= y)) { // Testing if y or z is NaN.
+            return hypot_NaN(x, y, z);
+        }
+        // Ensuring y <= x.
+        if (z > x) {
+            // x < z <= y: moving x
+            double oldZ = z;
+            z = x;
+            double oldY = y;
+            y = oldZ;
+            x = oldY;
+        } else if (y > x) {
+            // z <= x < y: swapping x and y
+            double a = y;
+            y = x;
+            x = a;
+        } else if (x != x) { // Testing if x is NaN.
+            return hypot_NaN(x, y, z);
+        }
+
+        if (x-y == x) {
+            // y, hence z, too small to subtract from x.
+            return x;
+        } else if (y-z == y) {
+            // z too small to subtract from y, hence x.
+            double factor;
+            if (x > HYPOT_MAX_MAG) {
+                // x is too large: scaling down.
+                x *= (1/HYPOT_FACTOR);
+                y *= (1/HYPOT_FACTOR);
+                factor = HYPOT_FACTOR;
+            } else if (y < (1/HYPOT_MAX_MAG)) {
+                // y is too small: scaling up.
+                x *= HYPOT_FACTOR;
+                y *= HYPOT_FACTOR;
+                factor = (1/HYPOT_FACTOR);
+            } else {
+                factor = 1.0;
+            }
+            return factor * sqrt(x*x+y*y);
+        } else {
+            double factor;
+            if (x > HYPOT_MAX_MAG) {
+                // x is too large: scaling down.
+                x *= (1/HYPOT_FACTOR);
+                y *= (1/HYPOT_FACTOR);
+                z *= (1/HYPOT_FACTOR);
+                factor = HYPOT_FACTOR;
+            } else if (z < (1/HYPOT_MAX_MAG)) {
+                // z is too small: scaling up.
+                x *= HYPOT_FACTOR;
+                y *= HYPOT_FACTOR;
+                z *= HYPOT_FACTOR;
+                factor = (1/HYPOT_FACTOR);
+            } else {
+                factor = 1.0;
+            }
+            // Adding smaller magnitudes together first.
+            return factor * sqrt(x*x+(y*y+z*z));
+        }
+    }
+
+    /*
+     * close values
+     */
+
+    /**
+     * @param value A float value.
+     * @return Floor of value.
+     */
+    public static float floor(float value) {
+        final int exponent = getExponent(value);
+        if (exponent < 0) {
+            // abs(value) < 1.
+            if (value < 0.0f) {
+                return -1.0f;
+            } else {
+                // 0.0f, or -0.0f if value is -0.0f
+                return 0.0f * value;
+            }
+        } else if (exponent < 23) {
+            // A bit faster than using casts.
+            final int bits = Float.floatToRawIntBits(value);
+            final int anteCommaBits = bits & (0xFF800000>>exponent);
+            if ((value < 0.0f) && (anteCommaBits != bits)) {
+                return Float.intBitsToFloat(anteCommaBits) - 1.0f;
+            } else {
+                return Float.intBitsToFloat(anteCommaBits);
+            }
+        } else {
+            // +-Infinity, NaN, or a mathematical integer.
+            return value;
+        }
+    }
+
+    /**
+     * @param value A double value.
+     * @return Floor of value.
+     */
+    public static double floor(double value) {
+        if (USE_JDK_MATH) {
+            return Math.floor(value);
+        }
+        if (ANTI_SLOW_CASTS) {
+            double valueAbs = Math.abs(value);
+            if (valueAbs <= (double)Integer.MAX_VALUE) {
+                if (value > 0.0) {
+                    return (double)(int)value;
+                } else if (value < 0.0) {
+                    double anteCommaDigits = (double)(int)value;
+                    if (value != anteCommaDigits) {
+                        return anteCommaDigits - 1.0;
+                    } else {
+                        return anteCommaDigits;
+                    }
+                } else { // value is +-0.0 (not NaN due to test against Integer.MAX_VALUE)
+                    return value;
+                }
+            } else if (valueAbs < TWO_POW_52) {
+                // We split the value in two:
+                // high part, which is a mathematical integer,
+                // and the rest, for which we can get rid of the
+                // post comma digits by casting into an int.
+                double highPart = ((int)(value * TWO_POW_N26)) * TWO_POW_26;
+                if (value > 0.0) {
+                    return highPart + (double)((int)(value - highPart));
+                } else {
+                    double anteCommaDigits = highPart + (double)((int)(value - highPart));
+                    if (value != anteCommaDigits) {
+                        return anteCommaDigits - 1.0;
+                    } else {
+                        return anteCommaDigits;
+                    }
+                }
+            } else { // abs(value) >= 2^52, or value is NaN
+                return value;
+            }
+        } else {
+            final int exponent = getExponent(value);
+            if (exponent < 0) {
+                // abs(value) < 1.
+                if (value < 0.0) {
+                    return -1.0;
+                } else {
+                    // 0.0, or -0.0 if value is -0.0
+                    return 0.0 * value;
+                }
+            } else if (exponent < 52) {
+                // A bit faster than working on bits.
+                final long matIntPart = (long)value;
+                final double matIntToValue = value-(double)matIntPart;
+                if (matIntToValue >= 0.0) {
+                    return (double)matIntPart;
+                } else {
+                    return (double)(matIntPart - 1);
+                }
+            } else {
+                // +-Infinity, NaN, or a mathematical integer.
+                return value;
+            }
+        }
+    }
+
+    /**
+     * @param value A float value.
+     * @return Ceiling of value.
+     */
+    public static float ceil(float value) {
+        return -floor(-value);
+    }
+
+    /**
+     * @param value A double value.
+     * @return Ceiling of value.
+     */
+    public static double ceil(double value) {
+        if (USE_JDK_MATH) {
+            return Math.ceil(value);
+        }
+        return -floor(-value);
+    }
+
+    /**
+     * Might have different semantics than Math.round(float),
+     * see bugs 6430675 and 8010430.
+     *
+     * @param value A double value.
+     * @return Value rounded to nearest int, choosing superior int in case two
+     *         are equally close (i.e. rounding-up).
+     */
+    public static int round(float value) {
+        /*
+         * Not delegating to JDK, because we want delegation to provide
+         * at least as good results, and some supported JDK versions
+         * have bugged round() methods.
+         */
+        // Algorithm by Dmitry Nadezhin (but replaced an if by a multiply)
+        // (http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-August/020247.html).
+        final int bits = Float.floatToRawIntBits(value);
+        final int biasedExp = ((bits>>23)&0xFF);
+        // Shift to get rid of bits past comma except first one: will need to
+        // 1-shift to the right to end up with correct magnitude.
+        final int shift = (23 - 1 + MAX_FLOAT_EXPONENT) - biasedExp;
+        if ((shift & -32) == 0) {
+            int bitsSignum = (((bits >> 31) << 1) + 1);
+            // shift in [0,31], so unbiased exp in [-9,22].
+            int extendedMantissa = (0x00800000 | (bits & 0x007FFFFF)) * bitsSignum;
+            // If value is positive and first bit past comma is 0, rounding
+            // to lower integer, else to upper one, which is what "+1" and
+            // then ">>1" do.
+            return ((extendedMantissa >> shift) + 1) >> 1;
+        } else {
+            // +-Infinity, NaN, or a mathematical integer, or tiny.
+            if (false && ANTI_SLOW_CASTS) { // not worth it
+                if (Math.abs(value) >= -(float)Integer.MIN_VALUE) {
+                    // +-Infinity or a mathematical integer (mostly) out of int range.
+                    return (value < 0.0) ? Integer.MIN_VALUE : Integer.MAX_VALUE;
+                }
+                // NaN or a mathematical integer (mostly) in int range.
+            }
+            return (int)value;
+        }
+    }
+
+    /**
+     * Might have different semantics than Math.round(double),
+     * see bugs 6430675 and 8010430.
+     *
+     * @param value A double value.
+     * @return Value rounded to nearest long, choosing superior long in case two
+     *         are equally close (i.e. rounding-up).
+     */
+    public static long round(double value) {
+        /*
+         * Not delegating to JDK, because we want delegation to provide
+         * at least as good results, and some supported JDK versions
+         * have bugged round() methods.
+         */
+        final long bits = Double.doubleToRawLongBits(value);
+        final int biasedExp = (((int)(bits>>52))&0x7FF);
+        // Shift to get rid of bits past comma except first one: will need to
+        // 1-shift to the right to end up with correct magnitude.
+        final int shift = (52 - 1 + MAX_DOUBLE_EXPONENT) - biasedExp;
+        if ((shift & -64) == 0) {
+            long bitsSignum = (((bits >> 63) << 1) + 1);
+            // shift in [0,63], so unbiased exp in [-12,51].
+            long extendedMantissa = (0x0010000000000000L | (bits & 0x000FFFFFFFFFFFFFL)) * bitsSignum;
+            // If value is positive and first bit past comma is 0, rounding
+            // to lower integer, else to upper one, which is what "+1" and
+            // then ">>1" do.
+            return ((extendedMantissa >> shift) + 1L) >> 1;
+        } else {
+            // +-Infinity, NaN, or a mathematical integer, or tiny.
+            if (ANTI_SLOW_CASTS) {
+                if (Math.abs(value) >= -(double)Long.MIN_VALUE) {
+                    // +-Infinity or a mathematical integer (mostly) out of long range.
+                    return (value < 0.0) ? Long.MIN_VALUE : Long.MAX_VALUE;
+                }
+                // NaN or a mathematical integer (mostly) in long range.
+            }
+            return (long)value;
+        }
+    }
+
+    /**
+     * @param value A float value.
+     * @return Value rounded to nearest int, choosing even int in case two
+     *         are equally close.
+     */
+    public static int roundEven(float value) {
+        final int sign = signFromBit(value);
+        value = Math.abs(value);
+        if (ANTI_SLOW_CASTS) {
+            if (value < TWO_POW_23_F) {
+                // Getting rid of post-comma bits.
+                value = ((value + TWO_POW_23_F) - TWO_POW_23_F);
+                return sign * (int)value;
+            } else if (value < (float)Integer.MAX_VALUE) { // "<=" doesn't work, because of float precision
+                // value is in [-Integer.MAX_VALUE,Integer.MAX_VALUE]
+                return sign * (int)value;
+            }
+        } else {
+            if (value < TWO_POW_23_F) {
+                // Getting rid of post-comma bits.
+                value = ((value + TWO_POW_23_F) - TWO_POW_23_F);
+            }
+        }
+        return (int)(sign * value);
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value rounded to nearest long, choosing even long in case two
+     *         are equally close.
+     */
+    public static long roundEven(double value) {
+        final int sign = (int)signFromBit(value);
+        value = Math.abs(value);
+        if (value < TWO_POW_52) {
+            // Getting rid of post-comma bits.
+            value = ((value + TWO_POW_52) - TWO_POW_52);
+        }
+        if (ANTI_SLOW_CASTS) {
+            if (value <= (double)Integer.MAX_VALUE) {
+                // value is in [-Integer.MAX_VALUE,Integer.MAX_VALUE]
+                return sign * (int)value;
+            }
+        }
+        return (long)(sign * value);
+    }
+
+    /**
+     * @param value A float value.
+     * @return The float mathematical integer closest to the specified value,
+     *         choosing even one if two are equally close, or respectively
+     *         NaN, +-Infinity or +-0.0f if the value is any of these.
+     */
+    public static float rint(float value) {
+        final int sign = signFromBit(value);
+        value = Math.abs(value);
+        if (value < TWO_POW_23_F) {
+            // Getting rid of post-comma bits.
+            value = ((TWO_POW_23_F + value ) - TWO_POW_23_F);
+        }
+        // Restoring original sign.
+        return sign * value;
+    }
+
+    /**
+     * @param value A double value.
+     * @return The double mathematical integer closest to the specified value,
+     *         choosing even one if two are equally close, or respectively
+     *         NaN, +-Infinity or +-0.0 if the value is any of these.
+     */
+    public static double rint(double value) {
+        if (USE_JDK_MATH) {
+            return Math.rint(value);
+        }
+        final int sign = (int)signFromBit(value);
+        value = Math.abs(value);
+        if (value < TWO_POW_52) {
+            // Getting rid of post-comma bits.
+            value = ((TWO_POW_52 + value ) - TWO_POW_52);
+        }
+        // Restoring original sign.
+        return sign * value;
+    }
+
+    /*
+     * close int values
+     *
+     * Never delegating to JDK for these methods, for we should always
+     * be faster and exact, and JDK doesn't exactly have such methods.
+     */
+
+    /**
+     * @param value A double value.
+     * @return Floor of value as int, or closest int if floor is out
+     *         of int range, or 0 if value is NaN.
+     */
+    public static int floorToInt(double value) {
+        int valueInt = (int) value;
+        if (value < 0.0) {
+            if (value == (double) valueInt) {
+                return valueInt;
+            } else {
+                if (valueInt == Integer.MIN_VALUE) {
+                    return valueInt;
+                } else {
+                    return valueInt - 1;
+                }
+            }
+        } else { // >= 0 or NaN.
+            return valueInt;
+        }
+    }
+
+    /**
+     * @param value A double value.
+     * @return Ceiling of value as int, or closest int if ceiling is out
+     *         of int range, or 0 if value is NaN.
+     */
+    public static int ceilToInt(double value) {
+        int valueInt = (int) value;
+        if (value > 0.0) {
+            if (value == (double) valueInt) {
+                return valueInt;
+            } else {
+                if (valueInt == Integer.MAX_VALUE) {
+                    return valueInt;
+                } else {
+                    return valueInt + 1;
+                }
+            }
+        } else { // <= 0 or NaN.
+            return valueInt;
+        }
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value rounded to nearest int, choosing superior int in case two
+     *         are equally close (i.e. rounding-up).
+     */
+    public static int roundToInt(double value) {
+        /*
+         * We don't gain much by reimplementing rounding, except for
+         * pathologically large values, which should not be a common case
+         * when dealing with ints, so we just use round(double).
+         */
+        return NumbersUtils.toInt(round(value));
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value rounded to nearest int, choosing even int in case two
+     *         are equally close.
+     */
+    public static int roundEvenToInt(double value) {
+        final int sign = (int)signFromBit(value);
+        value = Math.abs(value);
+        /*
+         * Applying the post-comma bits removal logic even if value is out
+         * of int range, to avoid a test, for it doesn't mess up the result,
+         * and we want to optimize for the case of values in int range.
+         */
+        value = ((value + TWO_POW_52) - TWO_POW_52);
+        return (int)(sign * value);
+    }
+
+    /*
+     * ranges
+     */
+
+    /**
+     * @param min A float value.
+     * @param max A float value.
+     * @param value A float value.
+     * @return min if value < min, max if value > max, value otherwise.
+     */
+    public static float toRange(float min, float max, float value) {
+        return NumbersUtils.toRange(min, max, value);
+    }
+
+    /**
+     * @param min A double value.
+     * @param max A double value.
+     * @param value A double value.
+     * @return min if value < min, max if value > max, value otherwise.
+     */
+    public static double toRange(double min, double max, double value) {
+        return NumbersUtils.toRange(min, max, value);
+    }
+
+    /*
+     * binary operators (/,%)
+     */
+
+    /**
+     * Returns dividend - divisor * n, where n is the mathematical integer
+     * closest to dividend/divisor.
+     * If dividend/divisor is equally close to surrounding integers,
+     * we choose n to be the integer of smallest magnitude, which makes
+     * this treatment differ from Math.IEEEremainder(double,double),
+     * where n is chosen to be the even integer.
+     * Note that the choice of n is not done considering the double
+     * approximation of dividend/divisor, because it could cause
+     * result to be outside [-|divisor|/2,|divisor|/2] range.
+     * The practical effect is that if multiple results would be possible,
+     * we always choose the result that is the closest to (and has the same
+     * sign as) the dividend.
+     * Ex. :
+     * - for (-3.0,2.0), this method returns -1.0,
+     *   whereas Math.IEEEremainder returns 1.0.
+     * - for (-5.0,2.0), both this method and Math.IEEEremainder return -1.0.
+     *
+     * If the remainder is zero, its sign is the same as the sign of the first argument.
+     * If either argument is NaN, or the first argument is infinite,
+     * or the second argument is positive zero or negative zero,
+     * then the result is NaN.
+     * If the first argument is finite and the second argument is
+     * infinite, then the result is the same as the first argument.
+     *
+     * NB:
+     * - Modulo operator (%) returns a value in ]-|divisor|,|divisor|[,
+     *   which sign is the same as dividend.
+     * - As for modulo operator, the sign of the divisor has no effect on the result.
+     * - On some architecture, % operator has been observed to return NaN
+     *   for some subnormal values of divisor, when dividend exponent is 1023,
+     *   which impacts the correctness of this method.
+     *
+     * @param dividend Dividend.
+     * @param divisor Divisor.
+     * @return Remainder of dividend/divisor, i.e. a value in [-|divisor|/2,|divisor|/2].
+     */
+    public static double remainder(double dividend, double divisor) {
+        if (Double.isInfinite(divisor)) {
+            if (Double.isInfinite(dividend)) {
+                return Double.NaN;
+            } else {
+                return dividend;
+            }
+        }
+        double value = dividend % divisor;
+        if (Math.abs(value+value) > Math.abs(divisor)) {
+            return value + ((value > 0.0) ? -Math.abs(divisor) : Math.abs(divisor));
+        } else {
+            return value;
+        }
+    }
+
+    /**
+     * @param angle Angle in radians.
+     * @return The same angle, in radians, but in [-PI,PI].
+     */
+    public static double normalizeMinusPiPi(double angle) {
+        // Not modifying values in output range.
+        if ((angle >= -Math.PI) && (angle <= Math.PI)) {
+            return angle;
+        }
+        return remainderTwoPi(angle);
+    }
+
+    /**
+     * Not accurate for large values.
+     *
+     * @param angle Angle in radians.
+     * @return The same angle, in radians, but in [-PI,PI].
+     */
+    public static double normalizeMinusPiPiFast(double angle) {
+        // Not modifying values in output range.
+        if ((angle >= -Math.PI) && (angle <= Math.PI)) {
+            return angle;
+        }
+        return remainderTwoPiFast(angle);
+    }
+
+    /**
+     * @param angle Angle in radians.
+     * @return The same angle, in radians, but in [0,2*PI].
+     */
+    public static double normalizeZeroTwoPi(double angle) {
+        // Not modifying values in output range.
+        if ((angle >= 0.0) && (angle <= 2*Math.PI)) {
+            return angle;
+        }
+        angle = remainderTwoPi(angle);
+        if (angle < 0.0) {
+            // LO then HI is theoretically better (when starting near 0).
+            return (angle + TWOPI_LO) + TWOPI_HI;
+        } else {
+            return angle;
+        }
+    }
+
+    /**
+     * Not accurate for large values.
+     *
+     * @param angle Angle in radians.
+     * @return The same angle, in radians, but in [0,2*PI].
+     */
+    public static double normalizeZeroTwoPiFast(double angle) {
+        // Not modifying values in output range.
+        if ((angle >= 0.0) && (angle <= 2*Math.PI)) {
+            return angle;
+        }
+        angle = remainderTwoPiFast(angle);
+        if (angle < 0.0) {
+            // LO then HI is theoretically better (when starting near 0).
+            return (angle + TWOPI_LO) + TWOPI_HI;
+        } else {
+            return angle;
+        }
+    }
+
+    /**
+     * @param angle Angle in radians.
+     * @return Angle value modulo PI, in radians, in [-PI/2,PI/2].
+     */
+    public static double normalizeMinusHalfPiHalfPi(double angle) {
+        // Not modifying values in output range.
+        if ((angle >= -Math.PI/2) && (angle <= Math.PI/2)) {
+            return angle;
+        }
+        return remainderPi(angle);
+    }
+
+    /**
+     * Not accurate for large values.
+     *
+     * @param angle Angle in radians.
+     * @return Angle value modulo PI, in radians, in [-PI/2,PI/2].
+     */
+    public static double normalizeMinusHalfPiHalfPiFast(double angle) {
+        // Not modifying values in output range.
+        if ((angle >= -Math.PI/2) && (angle <= Math.PI/2)) {
+            return angle;
+        }
+        return remainderPiFast(angle);
+    }
+
+    /*
+     * floating points utils
+     */
+
+    /**
+     * @param value A float value.
+     * @return true if the specified value is NaN or +-Infinity, false otherwise.
+     */
+    public static boolean isNaNOrInfinite(float value) {
+        return NumbersUtils.isNaNOrInfinite(value);
+    }
+
+    /**
+     * @param value A double value.
+     * @return true if the specified value is NaN or +-Infinity, false otherwise.
+     */
+    public static boolean isNaNOrInfinite(double value) {
+        return NumbersUtils.isNaNOrInfinite(value);
+    }
+
+    /**
+     * @param value A float value.
+     * @return Value unbiased exponent.
+     */
+    public static int getExponent(float value) {
+        return ((Float.floatToRawIntBits(value)>>23)&0xFF)-MAX_FLOAT_EXPONENT;
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value unbiased exponent.
+     */
+    public static int getExponent(double value) {
+        return (((int)(Double.doubleToRawLongBits(value)>>52))&0x7FF)-MAX_DOUBLE_EXPONENT;
+    }
+
+    /**
+     * @param value A float value.
+     * @return -1.0f if the specified value is < 0, 1.0f if it is > 0,
+     *         and the value itself if it is NaN or +-0.0f.
+     */
+    public static float signum(float value) {
+        if (USE_JDK_MATH) {
+            return Math.signum(value);
+        }
+        if ((value == 0.0f) || (value != value)) {
+            return value;
+        }
+        return (float)signFromBit(value);
+    }
+
+    /**
+     * @param value A double value.
+     * @return -1.0 if the specified value is < 0, 1.0 if it is > 0,
+     *         and the value itself if it is NaN or +-0.0.
+     */
+    public static double signum(double value) {
+        if (USE_JDK_MATH) {
+            return Math.signum(value);
+        }
+        if ((value == 0.0) || (value != value)) {
+            return value;
+        }
+        if (ANTI_SLOW_CASTS) {
+            return (double)(int)signFromBit(value);
+        } else {
+            return (double)signFromBit(value);
+        }
+    }
+
+    /**
+     * @param value A float value.
+     * @return -1 if sign bit is 1, 1 if sign bit is 0.
+     */
+    public static int signFromBit(float value) {
+        return ((Float.floatToRawIntBits(value)>>30)|1);
+    }
+
+    /**
+     * @param value A double value.
+     * @return -1 if sign bit is 1, 1 if sign bit is 0.
+     */
+    public static long signFromBit(double value) {
+        // Returning a long, to avoid useless cast into int.
+        return ((Double.doubleToRawLongBits(value)>>62)|1);
+    }
+
+    /**
+     * A sign of NaN can be interpreted as positive or negative.
+     *
+     * @param magnitude A float value.
+     * @param sign A float value.
+     * @return A value with the magnitude of the first argument, and the sign
+     *         of the second argument.
+     */
+    public static float copySign(float magnitude, float sign) {
+        return Float.intBitsToFloat(
+                (Float.floatToRawIntBits(sign) & Integer.MIN_VALUE)
+                | (Float.floatToRawIntBits(magnitude) & Integer.MAX_VALUE));
+    }
+
+    /**
+     * A sign of NaN can be interpreted as positive or negative.
+     *
+     * @param magnitude A double value.
+     * @param sign A double value.
+     * @return A value with the magnitude of the first argument, and the sign
+     *         of the second argument.
+     */
+    public static double copySign(double magnitude, double sign) {
+        return Double.longBitsToDouble(
+                (Double.doubleToRawLongBits(sign) & Long.MIN_VALUE)
+                | (Double.doubleToRawLongBits(magnitude) & Long.MAX_VALUE));
+    }
+
+    /**
+     * The ULP (Unit in the Last Place) is the distance to the next value larger
+     * in magnitude.
+     *
+     * @param value A float value.
+     * @return The size of an ulp of the specified value, or Float.MIN_VALUE
+     *         if it is +-0.0f, or +Infinity if it is +-Infinity, or NaN
+     *         if it is NaN.
+     */
+    public static float ulp(float value) {
+        if (USE_JDK_MATH) {
+            return Math.ulp(value);
+        }
+        /*
+         * Look-up table not really worth it in micro-benchmark,
+         * so should be worse with cache-misses.
+         */
+        final int exponent = getExponent(value);
+        if (exponent >= (MIN_FLOAT_NORMAL_EXPONENT+23)) {
+            if (exponent == MAX_FLOAT_EXPONENT+1) {
+                // NaN or +-Infinity
+                return Math.abs(value);
+            }
+            // normal: returning 2^(exponent-23)
+            return Float.intBitsToFloat((exponent+(MAX_FLOAT_EXPONENT-23))<<23);
+        } else {
+            if (exponent == MIN_FLOAT_NORMAL_EXPONENT-1) {
+                // +-0.0f or subnormal
+                return Float.MIN_VALUE;
+            }
+            // subnormal result
+            return Float.intBitsToFloat(1<<(exponent-MIN_FLOAT_NORMAL_EXPONENT));
+        }
+    }
+
+    /**
+     * The ULP (Unit in the Last Place) is the distance to the next value larger
+     * in magnitude.
+     *
+     * @param value A double value.
+     * @return The size of an ulp of the specified value, or Double.MIN_VALUE
+     *         if it is +-0.0, or +Infinity if it is +-Infinity, or NaN
+     *         if it is NaN.
+     */
+    public static double ulp(double value) {
+        if (USE_JDK_MATH) {
+            return Math.ulp(value);
+        }
+        /*
+         * Look-up table not really worth it in micro-benchmark,
+         * so should be worse with cache-misses.
+         */
+        final int exponent = getExponent(value);
+        if (exponent >= (MIN_DOUBLE_NORMAL_EXPONENT+52)) {
+            if (exponent == MAX_DOUBLE_EXPONENT+1) {
+                // NaN or +-Infinity
+                return Math.abs(value);
+            }
+            // normal: returning 2^(exponent-52)
+            return Double.longBitsToDouble((exponent+(MAX_DOUBLE_EXPONENT-52L))<<52);
+        } else {
+            if (exponent == MIN_DOUBLE_NORMAL_EXPONENT-1) {
+                // +-0.0f or subnormal
+                return Double.MIN_VALUE;
+            }
+            // subnormal result
+            return Double.longBitsToDouble(1L<<(exponent-MIN_DOUBLE_NORMAL_EXPONENT));
+        }
+    }
+
+    /**
+     * If both arguments are +-0.0(f), (float)direction is returned.
+     *
+     * If both arguments are +Infinity or -Infinity,
+     * respectively +Infinity or -Infinity is returned.
+     *
+     * @param start A float value.
+     * @param direction A double value.
+     * @return The float adjacent to start towards direction, considering that
+     *         +(-)Float.MIN_VALUE is adjacent to +(-)0.0f, and that
+     *         +(-)Float.MAX_VALUE is adjacent to +(-)Infinity,
+     *         or NaN if any argument is NaN.
+     */
+    public static float nextAfter(float start, double direction) {
+        if (direction < start) {
+            // Going towards -Infinity.
+            if (start == 0.0f) {
+                // +-0.0f
+                return -Float.MIN_VALUE;
+            }
+            final int bits = Float.floatToRawIntBits(start);
+            return Float.intBitsToFloat(bits + ((bits > 0) ? -1 : 1));
+        } else if (direction > start) {
+            // Going towards +Infinity.
+            // +0.0f to get rid of eventual -0.0f
+            final int bits = Float.floatToRawIntBits(start + 0.0f);
+            return Float.intBitsToFloat(bits + (bits >= 0 ? 1 : -1));
+        } else if (start == direction) {
+            return (float)direction;
+        } else {
+            // Returning a NaN derived from the input NaN(s).
+            return start + (float)direction;
+        }
+    }
+
+    /**
+     * If both arguments are +-0.0, direction is returned.
+     *
+     * If both arguments are +Infinity or -Infinity,
+     * respectively +Infinity or -Infinity is returned.
+     *
+     * @param start A double value.
+     * @param direction A double value.
+     * @return The double adjacent to start towards direction, considering that
+     *         +(-)Double.MIN_VALUE is adjacent to +(-)0.0, and that
+     *         +(-)Double.MAX_VALUE is adjacent to +(-)Infinity,
+     *         or NaN if any argument is NaN.
+     */
+    public static double nextAfter(double start, double direction) {
+        if (direction < start) {
+            // Going towards -Infinity.
+            if (start == 0.0) {
+                // +-0.0
+                return -Double.MIN_VALUE;
+            }
+            final long bits = Double.doubleToRawLongBits(start);
+            return Double.longBitsToDouble(bits + ((bits > 0) ? -1 : 1));
+        } else if (direction > start) {
+            // Going towards +Infinity.
+            // +0.0 to get rid of eventual -0.0
+            final long bits = Double.doubleToRawLongBits(start + 0.0f);
+            return Double.longBitsToDouble(bits + (bits >= 0 ? 1 : -1));
+        } else if (start == direction) {
+            return direction;
+        } else {
+            // Returning a NaN derived from the input NaN(s).
+            return start + direction;
+        }
+    }
+
+    /**
+     * Semantically equivalent to nextAfter(start,Double.NEGATIVE_INFINITY).
+     */
+    public static float nextDown(float start) {
+        if (start > Float.NEGATIVE_INFINITY) {
+            if (start == 0.0f) {
+                // +-0.0f
+                return -Float.MIN_VALUE;
+            }
+            final int bits = Float.floatToRawIntBits(start);
+            return Float.intBitsToFloat(bits + ((bits > 0) ? -1 : 1));
+        } else if (start == Float.NEGATIVE_INFINITY) {
+            return Float.NEGATIVE_INFINITY;
+        } else {
+            // NaN
+            return start;
+        }
+    }
+
+    /**
+     * Semantically equivalent to nextAfter(start,Double.NEGATIVE_INFINITY).
+     */
+    public static double nextDown(double start) {
+        if (start > Double.NEGATIVE_INFINITY) {
+            if (start == 0.0) {
+                // +-0.0
+                return -Double.MIN_VALUE;
+            }
+            final long bits = Double.doubleToRawLongBits(start);
+            return Double.longBitsToDouble(bits + ((bits > 0) ? -1 : 1));
+        } else if (start == Double.NEGATIVE_INFINITY) {
+            return Double.NEGATIVE_INFINITY;
+        } else {
+            // NaN
+            return start;
+        }
+    }
+
+    /**
+     * Semantically equivalent to nextAfter(start,Double.POSITIVE_INFINITY).
+     */
+    public static float nextUp(float start) {
+        if (start < Float.POSITIVE_INFINITY) {
+            // +0.0f to get rid of eventual -0.0f
+            final int bits = Float.floatToRawIntBits(start + 0.0f);
+            return Float.intBitsToFloat(bits + (bits >= 0 ? 1 : -1));
+        } else if (start == Float.POSITIVE_INFINITY) {
+            return Float.POSITIVE_INFINITY;
+        } else {
+            // NaN
+            return start;
+        }
+    }
+
+    /**
+     * Semantically equivalent to nextAfter(start,Double.POSITIVE_INFINITY).
+     */
+    public static double nextUp(double start) {
+        if (start < Double.POSITIVE_INFINITY) {
+            // +0.0 to get rid of eventual -0.0
+            final long bits = Double.doubleToRawLongBits(start + 0.0);
+            return Double.longBitsToDouble(bits + (bits >= 0 ? 1 : -1));
+        } else if (start == Double.POSITIVE_INFINITY) {
+            return Double.POSITIVE_INFINITY;
+        } else {
+            // NaN
+            return start;
+        }
+    }
+
+    /**
+     * Precision may be lost if the result is subnormal.
+     *
+     * @param value A float value.
+     * @param scaleFactor An int value.
+     * @return value * 2^scaleFactor, or a value equivalent to the specified
+     *         one if it is NaN, +-Infinity or +-0.0f.
+     */
+    public static float scalb(float value, int scaleFactor) {
+        // Large enough to imply overflow or underflow for
+        // a finite non-zero value.
+        final int MAX_SCALE = 2*MAX_FLOAT_EXPONENT+23+1;
+
+        // Making sure scaling factor is in a reasonable range.
+        scaleFactor = Math.max(Math.min(scaleFactor, MAX_SCALE), -MAX_SCALE);
+
+        return (float)(((double)value) * twoPowNormal(scaleFactor));
+    }
+
+    /**
+     * Precision may be lost if the result is subnormal.
+     *
+     * @param value A double value.
+     * @param scaleFactor An int value.
+     * @return value * 2^scaleFactor, or a value equivalent to the specified
+     *         one if it is NaN, +-Infinity or +-0.0.
+     */
+    public static double scalb(double value, int scaleFactor) {
+        if ((scaleFactor > -MAX_DOUBLE_EXPONENT) && (scaleFactor <= MAX_DOUBLE_EXPONENT)) {
+            // Quick case (as done in apache FastMath).
+            return value * twoPowNormal(scaleFactor);
+        }
+
+        // Large enough to imply overflow or underflow for
+        // a finite non-zero value.
+        final int MAX_SCALE = 2*MAX_DOUBLE_EXPONENT+52+1;
+
+        // Making sure scaling factor is in a reasonable range.
+        final int exponentAdjust;
+        final int scaleIncrement;
+        final double exponentDelta;
+        if (scaleFactor < 0) {
+            scaleFactor = Math.max(scaleFactor, -MAX_SCALE);
+            scaleIncrement = -512;
+            exponentDelta = TWO_POW_N512;
+        } else {
+            scaleFactor = Math.min(scaleFactor, MAX_SCALE);
+            scaleIncrement = 512;
+            exponentDelta = TWO_POW_512;
+        }
+
+        // Calculating (scaleFactor % +-512), 512 = 2^9, using
+        // technique from "Hacker's Delight" section 10-2.
+        final int t = ((scaleFactor >> (9-1)) >>> (32-9));
+        exponentAdjust = ((scaleFactor + t) & (512-1)) - t;
+
+        value *= twoPowNormal(exponentAdjust);
+        scaleFactor -= exponentAdjust;
+
+        while (scaleFactor != 0) {
+            value *= exponentDelta;
+            scaleFactor -= scaleIncrement;
+        }
+
+        return value;
+    }
+
+    /*
+     * Non-redefined Math public values and treatments.
+     */
+
+    public static float abs(float a) {
+        return Math.abs(a);
+    }
+
+    public static double abs(double a) {
+        return Math.abs(a);
+    }
+
+    public static float min(float a, float b) {
+        return Math.min(a,b);
+    }
+
+    public static double min(double a, double b) {
+        return Math.min(a,b);
+    }
+
+    public static float max(float a, float b) {
+        return Math.max(a,b);
+    }
+
+    public static double max(double a, double b) {
+        return Math.max(a,b);
+    }
+
+    public static double IEEEremainder(double f1, double f2) {
+        return Math.IEEEremainder(f1,f2);
+    }
+
+    public static double random() {
+        return Math.random();
+    }
+
+    //--------------------------------------------------------------------------
+    //  PRIVATE METHODS
+    //--------------------------------------------------------------------------
+
+    /**
+     * Non-instantiable.
+     */
+    private FastMath() {
+    }
+
+    /*
+     * Remainders (accurate).
+     */
+
+    /**
+     * @param angle Angle in radians.
+     * @return Remainder of (angle % (2*PI)), in [-PI,PI].
+     */
+    private static double remainderTwoPi(double angle) {
+        if (USE_JDK_MATH) {
+            return jdkRemainderTwoPi(angle);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        if (angle <= (4*NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2)) {
+            double fn = (double)(int)(angle*TWOPI_INV+0.5);
+            angle = (angle - fn*TWOPI_HI) - fn*TWOPI_LO;
+            // Ensuring range.
+            // HI/LO can help a bit, even though we are always far from 0.
+            if (angle < -Math.PI) {
+                angle = (angle + TWOPI_HI) + TWOPI_LO;
+            } else if (angle > Math.PI) {
+                angle = (angle - TWOPI_HI) - TWOPI_LO;
+            }
+            return negateResult ? -angle : angle;
+        } else if (angle < Double.POSITIVE_INFINITY) {
+            angle = heavyRemainderTwoPi(angle);
+            return negateResult ? -angle : angle;
+        } else { // angle is +Infinity or NaN
+            return Double.NaN;
+        }
+    }
+
+    /**
+     * @param angle Angle in radians.
+     * @return Remainder of (angle % PI), in [-PI/2,PI/2].
+     */
+    private static double remainderPi(double angle) {
+        if (USE_JDK_MATH) {
+            return jdkRemainderPi(angle);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        if (angle <= (2*NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2)) {
+            double fn = (double)(int)(angle*PI_INV+0.5);
+            angle = (angle - fn*PI_HI) - fn*PI_LO;
+            // Ensuring range.
+            // HI/LO can help a bit, even though we are always far from 0.
+            if (angle < -Math.PI/2) {
+                angle = (angle + PI_HI) + PI_LO;
+            } else if (angle > Math.PI/2) {
+                angle = (angle - PI_HI) - PI_LO;
+            }
+            return negateResult ? -angle : angle;
+        } else if (angle < Double.POSITIVE_INFINITY) {
+            angle = heavyRemainderPi(angle);
+            return negateResult ? -angle : angle;
+        } else { // angle is +Infinity or NaN
+            return Double.NaN;
+        }
+    }
+
+    /**
+     * @param angle Angle in radians.
+     * @return Bits of double corresponding to remainder of (angle % (PI/2)),
+     *         in [-PI/4,PI/4], with quadrant encoded in exponent bits.
+     */
+    private static long remainderPiO2(double angle) {
+        if (USE_JDK_MATH) {
+            return jdkRemainderPiO2(angle, false);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        if (angle <= NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2) {
+            int n = (int)(angle*PIO2_INV+0.5);
+            double fn = (double)n;
+            angle = (angle - fn*PIO2_HI) - fn*PIO2_LO;
+            // Ensuring range.
+            // HI/LO can help a bit, even though we are always far from 0.
+            if (angle < -Math.PI/4) {
+                angle = (angle + PIO2_HI) + PIO2_LO;
+                n--;
+            } else if (angle > Math.PI/4) {
+                angle = (angle - PIO2_HI) - PIO2_LO;
+                n++;
+            }
+            if (negateResult) {
+                angle = -angle;
+            }
+            return encodeRemainderAndQuadrant(angle, n&3);
+        } else if (angle < Double.POSITIVE_INFINITY) {
+            return heavyRemainderPiO2(angle, negateResult);
+        } else { // angle is +Infinity or NaN
+            return encodeRemainderAndQuadrant(Double.NaN, 0);
+        }
+    }
+
+    /*
+     * Remainders (fast).
+     */
+
+    /**
+     * Not accurate for large values.
+     *
+     * @param angle Angle in radians.
+     * @return Remainder of (angle % (2*PI)), in [-PI,PI].
+     */
+    private static double remainderTwoPiFast(double angle) {
+        if (USE_JDK_MATH) {
+            return jdkRemainderTwoPi(angle);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        // - We don't bother with values higher than (2*PI*(2^52)),
+        //   since they are spaced by 2*PI or more from each other.
+        // - For large values, we don't use % because it might be very slow,
+        //   and we split computation in two, because cast from double to int
+        //   with large numbers might be very slow also.
+        if (angle <= TWO_POW_26*(2*Math.PI)) {
+            // ok
+        } else if (angle <= TWO_POW_52*(2*Math.PI)) {
+            // Computing remainder of angle modulo TWO_POW_26*(2*PI).
+            double fn = (double)(int)(angle*(TWOPI_INV/TWO_POW_26)+0.5);
+            angle = (angle - fn*(TWOPI_HI*TWO_POW_26)) - fn*(TWOPI_LO*TWO_POW_26);
+            // Here, angle is in [-TWO_POW_26*PI,TWO_POW_26*PI], or so.
+            if (angle < 0.0) {
+                angle = -angle;
+                negateResult = !negateResult;
+            }
+        } else if (angle < Double.POSITIVE_INFINITY) {
+            return 0.0;
+        } else { // angle is +Infinity or NaN
+            return Double.NaN;
+        }
+
+        // Computing remainder of angle modulo 2*PI.
+        double fn = (double)(int)(angle*TWOPI_INV+0.5);
+        angle = (angle - fn*TWOPI_HI) - fn*TWOPI_LO;
+
+        // Ensuring range.
+        // HI/LO can help a bit, even though we are always far from 0.
+        if (angle < -Math.PI) {
+            angle = (angle + TWOPI_HI) + TWOPI_LO;
+        } else if (angle > Math.PI) {
+            angle = (angle - TWOPI_HI) - TWOPI_LO;
+        }
+        return negateResult ? -angle : angle;
+    }
+
+    /**
+     * Not accurate for large values.
+     *
+     * @param angle Angle in radians.
+     * @return Remainder of (angle % PI), in [-PI/2,PI/2].
+     */
+    private static double remainderPiFast(double angle) {
+        if (USE_JDK_MATH) {
+            return jdkRemainderPi(angle);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        // - We don't bother with values higher than (PI*(2^52)),
+        //   since they are spaced by PI or more from each other.
+        // - For large values, we don't use % because it might be very slow,
+        //   and we split computation in two, because cast from double to int
+        //   with large numbers might be very slow also.
+        if (angle <= TWO_POW_26*Math.PI) {
+            // ok
+        } else if (angle <= TWO_POW_52*Math.PI) {
+            // Computing remainder of angle modulo TWO_POW_26*PI.
+            double fn = (double)(int)(angle*(PI_INV/TWO_POW_26)+0.5);
+            angle = (angle - fn*(PI_HI*TWO_POW_26)) - fn*(PI_LO*TWO_POW_26);
+            // Here, angle is in [-TWO_POW_26*PI/2,TWO_POW_26*PI/2], or so.
+            if (angle < 0.0) {
+                angle = -angle;
+                negateResult = !negateResult;
+            }
+        } else if (angle < Double.POSITIVE_INFINITY) {
+            return 0.0;
+        } else { // angle is +Infinity or NaN
+            return Double.NaN;
+        }
+
+        // Computing remainder of angle modulo PI.
+        double fn = (double)(int)(angle*PI_INV+0.5);
+        angle = (angle - fn*PI_HI) - fn*PI_LO;
+
+        // Ensuring range.
+        // HI/LO can help a bit, even though we are always far from 0.
+        if (angle < -Math.PI/2) {
+            angle = (angle + PI_HI) + PI_LO;
+        } else if (angle > Math.PI/2) {
+            angle = (angle - PI_HI) - PI_LO;
+        }
+        return negateResult ? -angle : angle;
+    }
+}
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/IntWrapper.java b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/IntWrapper.java
new file mode 100644
index 000000000..812e5a22d
--- /dev/null
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/IntWrapper.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+package space.kscience.kmath.jafama;
+
+public class IntWrapper {
+    public int value;
+    @Override
+    public String toString() {
+        return Integer.toString(this.value);
+    }
+}
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
new file mode 100644
index 000000000..2b6cc3a5a
--- /dev/null
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
@@ -0,0 +1,102 @@
+package space.kscience.kmath.jafama
+
+import space.kscience.kmath.operations.*
+
+/**
+ * Advanced Number-like semifield that implements basic operations.
+ */
+public interface ExtendedFieldOperations<T> :
+    FieldOperations<T>,
+    TrigonometricOperations<T>,
+    PowerOperations<T>,
+    ExponentialOperations<T> {
+    public override fun tan(arg: T): T = sin(arg) / cos(arg)
+    public override fun tanh(arg: T): T = sinh(arg) / cosh(arg)
+
+    public override fun unaryOperationFunction(operation: String): (arg: T) -> T = when (operation) {
+        TrigonometricOperations.COS_OPERATION -> ::cos
+        TrigonometricOperations.SIN_OPERATION -> ::sin
+        TrigonometricOperations.TAN_OPERATION -> ::tan
+        TrigonometricOperations.ACOS_OPERATION -> ::acos
+        TrigonometricOperations.ASIN_OPERATION -> ::asin
+        TrigonometricOperations.ATAN_OPERATION -> ::atan
+        PowerOperations.SQRT_OPERATION -> ::sqrt
+        ExponentialOperations.EXP_OPERATION -> ::exp
+        ExponentialOperations.LN_OPERATION -> ::ln
+        ExponentialOperations.COSH_OPERATION -> ::cosh
+        ExponentialOperations.SINH_OPERATION -> ::sinh
+        ExponentialOperations.TANH_OPERATION -> ::tanh
+        ExponentialOperations.ACOSH_OPERATION -> ::acosh
+        ExponentialOperations.ASINH_OPERATION -> ::asinh
+        ExponentialOperations.ATANH_OPERATION -> ::atanh
+        else -> super<FieldOperations>.unaryOperationFunction(operation)
+    }
+}
+
+/**
+ * Advanced Number-like field that implements basic operations.
+ */
+public interface ExtendedField<T> : ExtendedFieldOperations<T>, Field<T>, NumericAlgebra<T>, ScaleOperations<T> {
+    public override fun sinh(arg: T): T = (exp(arg) - exp(-arg)) / 2.0
+    public override fun cosh(arg: T): T = (exp(arg) + exp(-arg)) / 2.0
+    public override fun tanh(arg: T): T = (exp(arg) - exp(-arg)) / (exp(-arg) + exp(arg))
+    public override fun asinh(arg: T): T = ln(sqrt(arg * arg + one) + arg)
+    public override fun acosh(arg: T): T = ln(arg + sqrt((arg - one) * (arg + one)))
+    public override fun atanh(arg: T): T = (ln(arg + one) - ln(one - arg)) / 2.0
+
+    public override fun rightSideNumberOperationFunction(operation: String): (left: T, right: Number) -> T =
+        when (operation) {
+            PowerOperations.POW_OPERATION -> ::power
+            else -> super<Field>.rightSideNumberOperationFunction(operation)
+        }
+}
+
+/**
+ * A field for [Double] without boxing. Does not produce appropriate field element.
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
+    public override inline val zero: Double get() = 0.0
+    public override inline val one: Double get() = 1.0
+
+    public override fun number(value: Number): Double = value.toDouble()
+
+    public override fun binaryOperationFunction(operation: String): (left: Double, right: Double) -> Double =
+        when (operation) {
+            PowerOperations.POW_OPERATION -> ::power
+            else -> super<ExtendedField>.binaryOperationFunction(operation)
+        }
+
+    public override inline fun add(a: Double, b: Double): Double = a + b
+
+    public override inline fun multiply(a: Double, b: Double): Double = a * b
+    public override inline fun divide(a: Double, b: Double): Double = a / b
+
+    public override fun scale(a: Double, value: Double): Double = a * value
+
+    public override inline fun sin(arg: Double): Double = FastMath.sin(arg)
+    public override inline fun cos(arg: Double): Double = FastMath.cos(arg)
+    public override inline fun tan(arg: Double): Double = FastMath.tan(arg)
+    public override inline fun acos(arg: Double): Double = FastMath.acos(arg)
+    public override inline fun asin(arg: Double): Double = FastMath.asin(arg)
+    public override inline fun atan(arg: Double): Double = FastMath.atan(arg)
+
+    public override inline fun sinh(arg: Double): Double = FastMath.sinh(arg)
+    public override inline fun cosh(arg: Double): Double = FastMath.cosh(arg)
+    public override inline fun tanh(arg: Double): Double = FastMath.tanh(arg)
+    public override inline fun asinh(arg: Double): Double = FastMath.asinh(arg)
+    public override inline fun acosh(arg: Double): Double = FastMath.acosh(arg)
+    public override inline fun atanh(arg: Double): Double = FastMath.atanh(arg)
+
+    public override inline fun power(arg: Double, pow: Number): Double = FastMath.pow(arg, pow.toDouble())
+    public override inline fun exp(arg: Double): Double = FastMath.exp(arg)
+    public override inline fun ln(arg: Double): Double = FastMath.log(arg)
+
+    public override inline fun norm(arg: Double): Double = FastMath.abs(arg)
+
+    public override inline fun Double.unaryMinus(): Double = -this
+    public override inline fun Double.plus(b: Double): Double = this + b
+    public override inline fun Double.minus(b: Double): Double = this - b
+    public override inline fun Double.times(b: Double): Double = this * b
+    public override inline fun Double.div(b: Double): Double = this / b
+}
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/NumbersUtils.java b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/NumbersUtils.java
new file mode 100644
index 000000000..6fdd9dea5
--- /dev/null
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/NumbersUtils.java
@@ -0,0 +1,2647 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+package space.kscience.kmath.jafama;
+
+/**
+ * Class containing various basic utility methods to deal with numbers.
+ * This class is meant to be light (no big look-up tables or such).
+ *
+ * Check methods return boolean if success,
+ * for it allows to use them in assertions.
+ *
+ * toString methods use capital letters, unlike JDK's toStrings, for it is more
+ * readable (especially, "l" and "1" can easily be confused with one another).
+ *
+ * Some methods have an int version additionally to the long version,
+ * even though long version could be used instead, for performance reasons,
+ * either for the methods themselves (if they do computations with ints
+ * instead of longs), or to be used in an int use case (like methods
+ * checking whether or not a signed int can fit in such number of bits).
+ */
+public final class NumbersUtils {
+
+    //--------------------------------------------------------------------------
+    // MEMBERS
+    //--------------------------------------------------------------------------
+
+    /**
+     * Double.MIN_NORMAL since Java 6.
+     */
+    public static final double DOUBLE_MIN_NORMAL = Double.longBitsToDouble(0x0010000000000000L); // 2.2250738585072014E-308
+
+    /**
+     * Float.MIN_NORMAL since Java 6.
+     */
+    public static final float FLOAT_MIN_NORMAL = Float.intBitsToFloat(0x00800000); // 1.17549435E-38f
+
+    private static final int MIN_DOUBLE_EXPONENT = -1074;
+    private static final int MAX_DOUBLE_EXPONENT = 1023;
+
+    /**
+     * All possible upper case chars for representing a number as a String.
+     */
+    private final static char[] CHAR_BY_DIGIT;
+    static {
+        final char minDecimal = '0';
+        final char maxDecimal = '9';
+        final int n1 = maxDecimal - minDecimal + 1;
+        final char minLetter = 'A';
+        final char maxLetter = 'Z';
+        final int n2 = maxLetter - minLetter + 1;
+        CHAR_BY_DIGIT = new char[n1+n2];
+        int i=0;
+        for (char c=minDecimal;c<=maxDecimal;c++) {
+            CHAR_BY_DIGIT[i++] = c;
+        }
+        for (char c=minLetter;c<=maxLetter;c++) {
+            CHAR_BY_DIGIT[i++] = c;
+        }
+    }
+
+    /**
+     * For power-of-two radixes only.
+     */
+    private static final int[] DIV_SHIFT_BY_RADIX;
+    static {
+        DIV_SHIFT_BY_RADIX = new int[32+1];
+        int shift=1;
+        for (int radix=2;radix<=32;radix*=2) {
+            DIV_SHIFT_BY_RADIX[radix] = shift++;
+        }
+    }
+
+    private final static int[] MAX_NBR_OF_NEG_INT_DIGITS_BY_RADIX = new int[Character.MAX_RADIX+1];
+    private final static int[] MAX_NBR_OF_NEG_LONG_DIGITS_BY_RADIX = new int[Character.MAX_RADIX+1];
+    static {
+        for (int radix=Character.MIN_RADIX;radix<=Character.MAX_RADIX;radix++) {
+            /*
+             * Brutal but works.
+             * -1 for the sign.
+             */
+            MAX_NBR_OF_NEG_INT_DIGITS_BY_RADIX[radix] = Integer.toString(Integer.MIN_VALUE, radix).length()-1;
+            MAX_NBR_OF_NEG_LONG_DIGITS_BY_RADIX[radix] = Long.toString(Long.MIN_VALUE, radix).length()-1;
+        }
+    }
+
+    static final double NO_CSN_MIN_BOUND_INCL = 1e-3;
+    static final double NO_CSN_MAX_BOUND_EXCL = 1e7;
+
+    private static final double PIO2_HI = Double.longBitsToDouble(0x3FF921FB54400000L); // 1.57079632673412561417e+00 first 33 bits of pi/2
+    private static final double PIO2_LO = Double.longBitsToDouble(0x3DD0B4611A626331L); // 6.07710050650619224932e-11 pi/2 - PIO2_HI
+    private static final double PI_HI = 2*PIO2_HI;
+    private static final double PI_LO = 2*PIO2_LO;
+    private static final double TWOPI_HI = 4*PIO2_HI;
+    private static final double TWOPI_LO = 4*PIO2_LO;
+
+    //--------------------------------------------------------------------------
+    // PUBLIC METHODS
+    //--------------------------------------------------------------------------
+
+    /**
+     * @return True if the specified values are equal or both NaN, false otherwise.
+     */
+    public static boolean equal(float a, float b) {
+        // Only does one test if a == b.
+        return (a == b) ? true : ((a != a) && (b != b));
+    }
+
+    /**
+     * @return True if the specified values are equal or both NaN, false otherwise.
+     */
+    public static boolean equal(double a, double b) {
+        // Only does one test if a == b.
+        return (a == b) ? true : ((a != a) && (b != b));
+    }
+
+    /**
+     * @return True if the specified value is a mathematical integer,
+     *         false otherwise (which includes NaN and +-Infinity).
+     */
+    public static boolean isMathematicalInteger(float value) {
+        // Doing magnitude test first, for cast
+        // might be very slow for huge values.
+        // It also helps be faster for huge values,
+        // for which the test with cast always fail.
+        value = Math.abs(value);
+        return ((value >= (float)(1<<23)
+                && (value != Float.POSITIVE_INFINITY)))
+                || (value == (float)(int)value);
+    }
+
+    /**
+     * @return True if the specified value is a mathematical integer,
+     *         false otherwise (which includes NaN and +-Infinity).
+     */
+    public static boolean isMathematicalInteger(double value) {
+        // Doing magnitude test first, for cast
+        // might be very slow for huge values.
+        // It also helps be faster for huge values,
+        // for which the test with cast always fail.
+        value = Math.abs(value);
+        return ((value >= (double)(1L<<52))
+                && (value != Double.POSITIVE_INFINITY))
+                || (value == (double)(long)value);
+    }
+
+    /**
+     * @param value A float value.
+     * @return True if the specified value is equidistant from two adjacent
+     *         mathematical integers, false otherwise (which includes NaN
+     *         and +-Infinity).
+     */
+    public static boolean isEquidistant(float value) {
+        if (false) {
+            // Also works, but slower.
+            final int bits = Float.floatToRawIntBits(value);
+            final int exponent = ((bits>>23)&0xFF)-127;
+            final int nbrOfPostCommaBits = 23 - exponent;
+            if ((nbrOfPostCommaBits <= 0) || (nbrOfPostCommaBits >= 25)) {
+                // No mantissa bit after comma, or all mantissa bits
+                // (including implicit 1) are at least one bit away from it.
+                //System.out.println("can't be");
+                return false;
+            }
+            final int mantissa = 0x00800000|(bits&0x007FFFFF);
+            final int postCommaMask = ~((-1)<<nbrOfPostCommaBits);
+            // True if in post-comma bits the only 1-bit is the one for 0.5.
+            return ((mantissa & postCommaMask) == (1<<(nbrOfPostCommaBits-1)));
+        }
+        final float valueAbs = Math.abs(value);
+        if (!(valueAbs < (float)(1<<23))) {
+            // NaN or too large to have a chance
+            return false;
+        }
+        final float twice = valueAbs+valueAbs;
+        // Test on twice first, for it's the most likely to fail.
+        return (twice == (float)(int)twice)
+                && (value != (float)(int)value);
+    }
+
+    /**
+     * @param value A double value.
+     * @return True if the specified value is equidistant from two adjacent
+     *         mathematical integers, false otherwise (which includes NaN
+     *         and +-Infinity).
+     */
+    public static boolean isEquidistant(double value) {
+        if (false) {
+            // Also works, but slower.
+            final long bits = Double.doubleToRawLongBits(value);
+            final int exponent = (((int)(bits>>52))&0x7FF)-1023;
+            final int nbrOfPostCommaBits = 52 - exponent;
+            if ((nbrOfPostCommaBits <= 0) || (nbrOfPostCommaBits >= 54)) {
+                // No mantissa bit after comma, or all mantissa bits
+                // (including implicit 1) are at least one bit away from it.
+                return false;
+            }
+            final long mantissa = 0x0010000000000000L|(bits&0x000FFFFFFFFFFFFFL);
+            final long postCommaMask = ~((-1L)<<nbrOfPostCommaBits);
+            // True if in post-comma bits the only 1-bit is the one for 0.5.
+            return ((mantissa & postCommaMask) == (1L<<(nbrOfPostCommaBits-1)));
+        }
+        final double valueAbs = Math.abs(value);
+        if (!(valueAbs < (double)(1L<<52))) {
+            return false;
+        }
+        final double twice = valueAbs+valueAbs;
+        // Test on twice first, for it's the most likely to fail.
+        return (twice == (double)(long)twice)
+                && (value != (double)(long)value);
+    }
+
+    /**
+     * @param value A float value.
+     * @return True if the specified value is NaN or +-Infinity, false otherwise.
+     */
+    public static boolean isNaNOrInfinite(float value) {
+        // value-value is not equal to 0.0f (and is NaN) <-> value is NaN or +-Infinity
+        return !(value-value == 0.0f);
+    }
+
+    /**
+     * @param value A double value.
+     * @return True if the specified value is NaN or +-Infinity, false otherwise.
+     */
+    public static boolean isNaNOrInfinite(double value) {
+        // value-value is not equal to 0.0 (and is NaN) <-> value is NaN or +-Infinity
+        return !(value-value == 0.0);
+    }
+
+    /**
+     * @param value A float value.
+     * @return -1 if sign bit is 1, 1 if sign bit is 0.
+     */
+    public static int signFromBit(float value) {
+        return ((Float.floatToRawIntBits(value)>>30)|1);
+    }
+
+    /**
+     * @param value A double value.
+     * @return -1 if sign bit is 1, 1 if sign bit is 0.
+     */
+    public static long signFromBit(double value) {
+        // Returning a long, to avoid useless cast into int.
+        return ((Double.doubleToRawLongBits(value)>>62)|1);
+    }
+
+    /*
+     * min/max ranges
+     */
+
+    /**
+     * @return True if the specified value is in the specified range (inclusive), false otherwise.
+     */
+    public static boolean isInRange(int min, int max, int a) {
+        return (min <= a) && (a <= max);
+    }
+
+    /**
+     * @return True if the specified value is in the specified range (inclusive), false otherwise.
+     */
+    public static boolean isInRange(long min, long max, long a) {
+        return (min <= a) && (a <= max);
+    }
+
+    /**
+     * Returns false if any value is NaN.
+     *
+     * @return True if the specified value is in the specified range (inclusive), false otherwise.
+     */
+    public static boolean isInRange(float min, float max, float a) {
+        return (min <= a) && (a <= max);
+    }
+
+    /**
+     * Returns false if any value is NaN.
+     *
+     * @return True if the specified value is in the specified range (inclusive), false otherwise.
+     */
+    public static boolean isInRange(double min, double max, double a) {
+        return (min <= a) && (a <= max);
+    }
+
+    /*
+     *
+     */
+
+    /**
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if the specified value is not in the specified range (inclusive).
+     */
+    public static boolean checkIsInRange(int min, int max, int a) {
+        if (!isInRange(min, max, a)) {
+            throw new IllegalArgumentException(a+" not in ["+min+","+max+"]");
+        }
+        return true;
+    }
+
+    /**
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if the specified value is not in the specified range (inclusive).
+     */
+    public static boolean checkIsInRange(long min, long max, long a) {
+        if (!isInRange(min, max, a)) {
+            throw new IllegalArgumentException(a+" not in ["+min+","+max+"]");
+        }
+        return true;
+    }
+
+    /**
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if the specified value is not in the specified range (inclusive)
+     *         or any parameter is NaN.
+     */
+    public static boolean checkIsInRange(float min, float max, float a) {
+        if (!isInRange(min, max, a)) {
+            throw new IllegalArgumentException(a+" not in ["+min+","+max+"]");
+        }
+        return true;
+    }
+
+    /**
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if the specified value is not in the specified range (inclusive)
+     *         or any parameter is NaN.
+     */
+    public static boolean checkIsInRange(double min, double max, double a) {
+        if (!isInRange(min, max, a)) {
+            throw new IllegalArgumentException(a+" not in ["+min+","+max+"]");
+        }
+        return true;
+    }
+
+    /*
+     *
+     */
+
+    /**
+     * @param min A value.
+     * @param max A value.
+     * @param a A value.
+     * @return min if a <= min, else max if a >= max, else a.
+     */
+    public static int toRange(int min, int max, int a) {
+        if (a <= min) {
+            return min;
+        } else if (a >= max) {
+            return max;
+        } else {
+            return a;
+        }
+    }
+
+    /**
+     * @param min A value.
+     * @param max A value.
+     * @param a A value.
+     * @return min if a <= min, else max if a >= max, else a.
+     */
+    public static long toRange(long min, long max, long a) {
+        if (a <= min) {
+            return min;
+        } else if (a >= max) {
+            return max;
+        } else {
+            return a;
+        }
+    }
+
+    /**
+     * @param min A value.
+     * @param max A value.
+     * @param a A value.
+     * @return min if a <= min, else max if a >= max, else a.
+     */
+    public static float toRange(float min, float max, float a) {
+        if (a <= min) {
+            return min;
+        } else if (a >= max) {
+            return max;
+        } else {
+            return a;
+        }
+    }
+
+    /**
+     * @param min A value.
+     * @param max A value.
+     * @param a A value.
+     * @return min if a <= min, else max if a >= max, else a.
+     */
+    public static double toRange(double min, double max, double a) {
+        if (a <= min) {
+            return min;
+        } else if (a >= max) {
+            return max;
+        } else {
+            return a;
+        }
+    }
+
+    /*
+     * bitwise ranges
+     */
+
+    /**
+     * @param bitSize A number of bits, in [1,32].
+     * @return True if the specified value fits as a signed integer
+     *         over the specified number of bits, false otherwise.
+     * @throws IllegalArgumentException if the specified number of bits is not in [1,32].
+     */
+    public static boolean isInRangeSigned(int a, int bitSize) {
+        checkBitSizeForSignedInt(bitSize);
+        return (minSignedIntForBitSize_noCheck(bitSize) <= a) && (a <= maxSignedIntForBitSize_noCheck(bitSize));
+    }
+
+    /**
+     * @param bitSize A number of bits, in [1,64].
+     * @return True if the specified value fits as a signed integer
+     *         over the specified number of bits, false otherwise.
+     * @throws IllegalArgumentException if the specified number of bits is not in [1,64].
+     */
+    public static boolean isInRangeSigned(long a, int bitSize) {
+        checkBitSizeForSignedLong(bitSize);
+        return (minSignedLongForBitSize_noCheck(bitSize) <= a) && (a <= maxSignedLongForBitSize_noCheck(bitSize));
+    }
+
+    /**
+     * @param bitSize A number of bits, in [1,31].
+     * @return True if the specified value fits as an unsigned integer
+     *         over the specified number of bits, false otherwise.
+     * @throws IllegalArgumentException if the specified number of bits is not in [1,31].
+     */
+    public static boolean isInRangeUnsigned(int a, int bitSize) {
+        return isInRange(0, maxUnsignedIntForBitSize(bitSize), a);
+    }
+
+    /**
+     * @param bitSize A number of bits, in [1,63].
+     * @return True if the specified value fits as an unsigned integer
+     *         over the specified number of bits, false otherwise.
+     * @throws IllegalArgumentException if the specified number of bits is not in [1,63].
+     */
+    public static boolean isInRangeUnsigned(long a, int bitSize) {
+        return isInRange(0, maxUnsignedLongForBitSize(bitSize), a);
+    }
+
+    /*
+     *
+     */
+
+    /**
+     * @param bitSize A number of bits, in [1,32].
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if the specified value does not fit
+     *         as a signed integer over the specified number of bits.
+     */
+    public static boolean checkIsInRangeSigned(int a, int bitSize) {
+        if (!isInRangeSigned(a, bitSize)) {
+            throw new IllegalArgumentException(a+" does not fit as a signed value over "+bitSize+" bits");
+        }
+        return true;
+    }
+
+    /**
+     * @param bitSize A number of bits, in [1,64].
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if the specified value does not fit
+     *         as a signed integer over the specified number of bits.
+     */
+    public static boolean checkIsInRangeSigned(long a, int bitSize) {
+        if (!isInRangeSigned(a, bitSize)) {
+            throw new IllegalArgumentException(a+" does not fit as a signed value over "+bitSize+" bits");
+        }
+        return true;
+    }
+
+    /**
+     * @param bitSize A number of bits, in [1,31].
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if the specified value does not fit
+     *         as an unsigned integer over the specified number of bits.
+     */
+    public static boolean checkIsInRangeUnsigned(int a, int bitSize) {
+        if (!isInRangeUnsigned(a, bitSize)) {
+            throw new IllegalArgumentException(a+" does not fit as an unsigned value over "+bitSize+" bits");
+        }
+        return true;
+    }
+
+    /**
+     * @param bitSize A number of bits, in [1,63].
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if the specified value does not fit
+     *         as an unsigned integer over the specified number of bits.
+     */
+    public static boolean checkIsInRangeUnsigned(long a, int bitSize) {
+        if (!isInRangeUnsigned(a, bitSize)) {
+            throw new IllegalArgumentException(a+" does not fit as an unsigned value over "+bitSize+" bits");
+        }
+        return true;
+    }
+
+    /*
+     * masks (int)
+     */
+
+    /**
+     * @param bitSize A number of bits, in [0,32].
+     * @return Mask with the specified number of left bits set with 0,
+     *         and other bits set with 1.
+     */
+    public static int intMaskMSBits0(int bitSize) {
+        checkIsInRange(0, 32, bitSize);
+        // Shifting in two times, for >>> doesn't work for full bit size (<< as well).
+        final int halfish = (bitSize>>1);
+        return ((-1)>>>halfish)>>>(bitSize-halfish);
+    }
+
+    /**
+     * @param bitSize A number of bits, in [0,32].
+     * @return Mask with the specified number of left bits set with 1,
+     *         and other bits set with 0.
+     */
+    public static int intMaskMSBits1(int bitSize) {
+        return ~intMaskMSBits0(bitSize);
+    }
+
+    /**
+     * @param bitSize A number of bits, in [0,32].
+     * @return Mask with the specified number of right bits set with 0,
+     *         and other bits set with 1.
+     */
+    public static int intMaskLSBits0(int bitSize) {
+        return ~intMaskMSBits0(32-bitSize);
+    }
+
+    /**
+     * @param bitSize A number of bits, in [0,32].
+     * @return Mask with the specified number of right bits set with 1,
+     *         and other bits set with 0.
+     */
+    public static int intMaskLSBits1(int bitSize) {
+        return intMaskMSBits0(32-bitSize);
+    }
+
+    /*
+     * masks (long)
+     */
+
+    /**
+     * @param bitSize A number of bits, in [0,64].
+     * @return Mask with the specified number of left bits set with 0,
+     *         and other bits set with 1.
+     */
+    public static long longMaskMSBits0(int bitSize) {
+        checkIsInRange(0, 64, bitSize);
+        // Shifting in two times, for >>> doesn't work for full bit size (<< as well).
+        final int halfish = (bitSize>>1);
+        return ((-1L)>>>halfish)>>>(bitSize-halfish);
+    }
+
+    /**
+     * @param bitSize A number of bits, in [0,64].
+     * @return Mask with the specified number of left bits set with 1,
+     *         and other bits set with 0.
+     */
+    public static long longMaskMSBits1(int bitSize) {
+        return ~longMaskMSBits0(bitSize);
+    }
+
+    /**
+     * @param bitSize A number of bits, in [0,64].
+     * @return Mask with the specified number of right bits set with 0,
+     *         and other bits set with 1.
+     */
+    public static long longMaskLSBits0(int bitSize) {
+        return ~longMaskMSBits0(64-bitSize);
+    }
+
+    /**
+     * @param bitSize A number of bits, in [0,64].
+     * @return Mask with the specified number of right bits set with 1,
+     *         and other bits set with 0.
+     */
+    public static long longMaskLSBits1(int bitSize) {
+        return longMaskMSBits0(64-bitSize);
+    }
+
+    /*
+     * signed/unsigned
+     */
+
+    /**
+     * @return Unsigned value corresponding to bits of the specified byte.
+     */
+    public static short byteAsUnsigned(byte value) {
+        return (short)(((short)value) & 0xFF);
+    }
+
+    /**
+     * @return Unsigned value corresponding to bits of the specified short.
+     */
+    public static int shortAsUnsigned(short value) {
+        return ((int)value) & 0xFFFF;
+    }
+
+    /**
+     * @return Unsigned value corresponding to bits of the specified int.
+     */
+    public static long intAsUnsigned(int value) {
+        return ((long)value) & 0xFFFFFFFF;
+    }
+
+    /*
+     * bitwise ranges
+     */
+
+    /**
+     * @return True if a signed int value can be read over the specified number of bits,
+     *         i.e. if it is in [1,32], false otherwise.
+     */
+    public static boolean isValidBitSizeForSignedInt(int bitSize) {
+        return (bitSize > 0) && (bitSize <= 32);
+    }
+
+    /**
+     * @return True if a signed long value can be read over the specified number of bits,
+     *         i.e. if it is in [1,64], false otherwise.
+     */
+    public static boolean isValidBitSizeForSignedLong(int bitSize) {
+        return (bitSize > 0) && (bitSize <= 64);
+    }
+
+    /**
+     * @return True if an unsigned int value can be read over the specified number of bits,
+     *         i.e. if it is in [1,31], false otherwise.
+     */
+    public static boolean isValidBitSizeForUnsignedInt(int bitSize) {
+        return (bitSize > 0) && (bitSize < 32);
+    }
+
+    /**
+     * @return True if an unsigned long value can be read over the specified number of bits,
+     *         i.e. if it is in [1,63], false otherwise.
+     */
+    public static boolean isValidBitSizeForUnsignedLong(int bitSize) {
+        return (bitSize > 0) && (bitSize < 64);
+    }
+
+    /*
+     *
+     */
+
+    /**
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if a signed int value can't be read over the
+     *         specified number of bits, i.e. if it is not in [1,32].
+     */
+    public static boolean checkBitSizeForSignedInt(int bitSize) {
+        if (!isValidBitSizeForSignedInt(bitSize)) {
+            throw new IllegalArgumentException("bit size ["+bitSize+"] must be in [1,32] for signed int values");
+        }
+        return true;
+    }
+
+    /**
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if a signed long value can't be read over the
+     *         specified number of bits, i.e. if it is not in [1,64].
+     */
+    public static boolean checkBitSizeForSignedLong(int bitSize) {
+        if (!isValidBitSizeForSignedLong(bitSize)) {
+            throw new IllegalArgumentException("bit size ["+bitSize+"] must be in [1,64] for signed long values");
+        }
+        return true;
+    }
+
+    /**
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if an unsigned int value can't be read over the
+     *         specified number of bits, i.e. if it is not in [1,31].
+     */
+    public static boolean checkBitSizeForUnsignedInt(int bitSize) {
+        if (!isValidBitSizeForUnsignedInt(bitSize)) {
+            throw new IllegalArgumentException("bit size ["+bitSize+"] must be in [1,31] for unsigned int values");
+        }
+        return true;
+    }
+
+    /**
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if an unsigned long value can't be read over the
+     *         specified number of bits, i.e. if it is not in [1,63].
+     */
+    public static boolean checkBitSizeForUnsignedLong(int bitSize) {
+        if (!isValidBitSizeForUnsignedLong(bitSize)) {
+            throw new IllegalArgumentException("bit size ["+bitSize+"] must be in [1,63] for unsigned long values");
+        }
+        return true;
+    }
+
+    /*
+     *
+     */
+
+    /**
+     * @param bitSize A number of bits in [1,32].
+     * @return The min signed int value that can be stored over the specified number of bits.
+     * @throws IllegalArgumentException if the specified number of bits is out of range.
+     */
+    public static int minSignedIntForBitSize(int bitSize) {
+        checkBitSizeForSignedInt(bitSize);
+        return minSignedIntForBitSize_noCheck(bitSize);
+    }
+
+    /**
+     * @param bitSize A number of bits in [1,64].
+     * @return The min signed long value that can be stored over the specified number of bits.
+     * @throws IllegalArgumentException if the specified number of bits is out of range.
+     */
+    public static long minSignedLongForBitSize(int bitSize) {
+        checkBitSizeForSignedLong(bitSize);
+        return minSignedLongForBitSize_noCheck(bitSize);
+    }
+
+    /**
+     * @param bitSize A number of bits in [1,32].
+     * @return The max signed int value that can be stored over the specified number of bits.
+     * @throws IllegalArgumentException if the specified number of bits is out of range.
+     */
+    public static int maxSignedIntForBitSize(int bitSize) {
+        checkBitSizeForSignedInt(bitSize);
+        return maxSignedIntForBitSize_noCheck(bitSize);
+    }
+
+    /**
+     * @param bitSize A number of bits in [1,64].
+     * @return The max signed long value that can be stored over the specified number of bits.
+     * @throws IllegalArgumentException if the specified number of bits is out of range.
+     */
+    public static long maxSignedLongForBitSize(int bitSize) {
+        checkBitSizeForSignedLong(bitSize);
+        return maxSignedLongForBitSize_noCheck(bitSize);
+    }
+
+    /**
+     * @param bitSize A number of bits in [1,31].
+     * @return The max unsigned int value that can be stored over the specified number of bits.
+     * @throws IllegalArgumentException if the specified number of bits is out of range.
+     */
+    public static int maxUnsignedIntForBitSize(int bitSize) {
+        checkBitSizeForUnsignedInt(bitSize);
+        // i.e. (1<<bitSize)-1
+        return (Integer.MAX_VALUE>>(31-bitSize));
+    }
+
+    /**
+     * @param bitSize A number of bits in [1,63].
+     * @return The max unsigned long value that can be stored over the specified number of bits.
+     * @throws IllegalArgumentException if the specified number of bits is out of range.
+     */
+    public static long maxUnsignedLongForBitSize(int bitSize) {
+        checkBitSizeForUnsignedLong(bitSize);
+        // i.e. (1L<<bitSize)-1
+        return (Long.MAX_VALUE>>(63-bitSize));
+    }
+
+    /*
+     *
+     */
+
+    /**
+     * @return The number of bits required to store the specified value as a signed integer,
+     *         i.e. a result in [1,32].
+     */
+    public static int bitSizeForSignedValue(int value) {
+        if (value > 0) {
+            return 33-Integer.numberOfLeadingZeros(value);
+        } else if (value == 0) {
+            return 1;
+        } else {
+            // Works for Integer.MIN_VALUE as well.
+            return 33-Integer.numberOfLeadingZeros(-value-1);
+        }
+    }
+
+    /**
+     * @return The number of bits required to store the specified value as a signed integer,
+     *         i.e. a result in [1,64].
+     */
+    public static int bitSizeForSignedValue(long value) {
+        if (value > 0) {
+            return 65-Long.numberOfLeadingZeros(value);
+        } else if (value == 0) {
+            return 1;
+        } else {
+            // Works for Long.MIN_VALUE as well.
+            return 65-Long.numberOfLeadingZeros(-value-1);
+        }
+    }
+
+    /**
+     * @param value An integer value in [0,Integer.MAX_VALUE].
+     * @return The number of bits required to store the specified value as an unsigned integer,
+     *         i.e. a result in [1,31].
+     * @throws IllegalArgumentException if the specified value is < 0.
+     */
+    public static int bitSizeForUnsignedValue(int value) {
+        if (value > 0) {
+            return 32-Integer.numberOfLeadingZeros(value);
+        } else {
+            if (value == 0) {
+                return 1;
+            } else {
+                throw new IllegalArgumentException("unsigned value ["+value+"] must be >= 0");
+            }
+        }
+    }
+
+    /**
+     * @param value An integer value in [0,Long.MAX_VALUE].
+     * @return The number of bits required to store the specified value as an unsigned integer,
+     *         i.e. a result in [1,63].
+     * @throws IllegalArgumentException if the specified value is < 0.
+     */
+    public static int bitSizeForUnsignedValue(long value) {
+        if (value > 0) {
+            return 64-Long.numberOfLeadingZeros(value);
+        } else {
+            if (value == 0) {
+                return 1;
+            } else {
+                throw new IllegalArgumentException("unsigned value ["+value+"] must be >= 0");
+            }
+        }
+    }
+
+    /*
+     * integer functions
+     */
+
+    /**
+     * @return 1 if the specified value is > 0, 0 if it is 0, -1 otherwise.
+     */
+    public static int signum(int a) {
+        return (a < 0) ? -1 : ((a == 0) ? 0 : 1);
+    }
+
+    /**
+     * @return 1 if the specified value is > 0, 0 if it is 0, -1 otherwise.
+     */
+    public static int signum(long a) {
+        return (a < 0) ? -1 : ((a == 0) ? 0 : 1);
+    }
+
+    /**
+     * @return True if the specified value is even, false otherwise.
+     */
+    public static boolean isEven(int a) {
+        return ((a&1) == 0);
+    }
+
+    /**
+     * @return True if the specified value is even, false otherwise.
+     */
+    public static boolean isEven(long a) {
+        // faster to work on ints
+        return isEven((int)a);
+    }
+
+    /**
+     * @return True if the specified value is odd, false otherwise.
+     */
+    public static boolean isOdd(int a) {
+        return ((a&1) != 0);
+    }
+
+    /**
+     * @return True if the specified value is odd, false otherwise.
+     */
+    public static boolean isOdd(long a) {
+        // faster to work on ints
+        return isOdd((int)a);
+    }
+
+    /**
+     * @return True if the specified values are both even or both odd, false otherwise.
+     */
+    public static boolean haveSameEvenness(int a, int b) {
+        return (((a^b)&1) == 0);
+    }
+
+    /**
+     * @return True if the specified values are both even or both odd, false otherwise.
+     */
+    public static boolean haveSameEvenness(long a, long b) {
+        // faster to work on ints
+        return haveSameEvenness((int)a, (int)b);
+    }
+
+    /**
+     * @return True if the specified values are both >= 0 or both < 0, false otherwise.
+     */
+    public static boolean haveSameSign(int a, int b) {
+        return ((a^b) >= 0);
+    }
+
+    /**
+     * @return True if the specified values are both >= 0 or both < 0, false otherwise.
+     */
+    public static boolean haveSameSign(long a, long b) {
+        return ((a^b) >= 0);
+    }
+
+    /**
+     * @return True if the specified value is a power of two,
+     *         i.e. a value of the form 2^k, with k >= 0.
+     */
+    public static boolean isPowerOfTwo(int a) {
+        if (a <= 0) {
+            return false;
+        }
+        if (false) {
+            // also works
+            return (a & -a) == a;
+        }
+        return (a & (a-1)) == 0;
+    }
+
+    /**
+     * @return True if the specified value is a power of two,
+     *         i.e. a value of the form 2^k, with k >= 0.
+     */
+    public static boolean isPowerOfTwo(long a) {
+        if (a <= 0) {
+            return false;
+        }
+        if (false) {
+            // also works
+            return (a & -a) == a;
+        }
+        return (a & (a-1)) == 0;
+    }
+
+    /**
+     * @return True if the specified value is a signed power of two,
+     *         i.e. a value of the form +-2^k, with k >= 0.
+     */
+    public static boolean isSignedPowerOfTwo(int a) {
+        if (a > 0) {
+            return (a & (a-1)) == 0;
+        } else {
+            if (a == -a) {
+                // a is 0 or Integer.MIN_VALUE
+                return (a != 0);
+            }
+            return ((-a) & (-a-1)) == 0;
+        }
+    }
+
+    /**
+     * @return True if the specified value is a signed power of two,
+     *         i.e. a value of the form +-2^k, with k >= 0.
+     */
+    public static boolean isSignedPowerOfTwo(long a) {
+        if (a > 0) {
+            return (a & (a-1)) == 0;
+        } else {
+            if (a == -a) {
+                // a is 0 or Long.MIN_VALUE
+                return (a != 0);
+            }
+            return ((-a) & (-a-1)) == 0;
+        }
+    }
+
+    /**
+     * @param a A value in [1,Integer.MAX_VALUE].
+     * @return The highest power of two <= a.
+     */
+    public static int floorPowerOfTwo(int a) {
+        if (a <= 0) {
+            throw new IllegalArgumentException("a ["+a+"] must be > 0");
+        }
+        return Integer.highestOneBit(a);
+    }
+
+    /**
+     * @param a A value in [1,Long.MAX_VALUE].
+     * @return The highest power of two <= a.
+     */
+    public static long floorPowerOfTwo(long a) {
+        if (a <= 0) {
+            throw new IllegalArgumentException("a ["+a+"] must be > 0");
+        }
+        // Faster than copying int method
+        // (less computations on long).
+        return 1L << (63 - Long.numberOfLeadingZeros(a));
+    }
+
+    /**
+     * @param a A value in [0,2^30].
+     * @return The lowest power of two >= a.
+     */
+    public static int ceilingPowerOfTwo(int a) {
+        checkIsInRange(0, (1<<30), a);
+        return (a >= 2) ? Integer.highestOneBit((a-1)<<1) : 1;
+    }
+
+    /**
+     * @param a A value in [0,2^62].
+     * @return The lowest power of two >= a.
+     */
+    public static long ceilingPowerOfTwo(long a) {
+        checkIsInRange(0L, (1L<<62), a);
+        // Faster than copying int method
+        // (less computations on long).
+        return 1L << (64 - Long.numberOfLeadingZeros(a - 1));
+    }
+
+    /**
+     * @return Mean without overflow, rounded to the lowest value (i.e. mathematical floor((a+b)/2), using floating point division).
+     */
+    public static int meanLow(int a, int b) {
+        return (a & b) + ((a ^ b) >> 1);
+    }
+
+    /**
+     * @return Mean without overflow, rounded to the lowest value (i.e. mathematical floor((a+b)/2), using floating point division).
+     */
+    public static long meanLow(long a, long b) {
+        return (a & b) + ((a ^ b) >> 1);
+    }
+
+    /**
+     * @return Mean without overflow, rounded to the value of smallest magnitude (i.e. mathematical (a+b)/2, using integer division).
+     */
+    public static int meanSml(int a, int b) {
+        int result = meanLow(a,b);
+        if (!haveSameEvenness(a, b)) {
+            // inexact
+            if (((a&b) < 0) || (((a|b) < 0) && (a+b < 0))) {
+                // both < 0, or only one is < 0 and it has the largest magnitude
+                result++;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * @return Mean without overflow, rounded to the value of smallest magnitude (i.e. mathematical (a+b)/2, using integer division).
+     */
+    public static long meanSml(long a, long b) {
+        long result = meanLow(a,b);
+        if (!haveSameEvenness(a, b)) {
+            // inexact
+            if (((a&b) < 0) || (((a|b) < 0) && (a+b < 0))) {
+                // both < 0, or only one is < 0 and it has the largest magnitude
+                result++;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Useful because a positive int value could not represent half the width
+     * of full int range width, which is mathematically Integer.MAX_VALUE+1.
+     *
+     * @return Minus half the range width (inclusive, and rounded to the value of smaller magnitude)
+     *         between the specified bounds.
+     * @throws IllegalArgumentException if min > max.
+     */
+    public static int negHalfWidth(int min, int max) {
+        if (min > max) {
+            throw new IllegalArgumentException("min ["+min+"] must be <= max ["+max+"]");
+        }
+        int mean = meanLow(min, max);
+        return min - mean - ((min^max)&1);
+    }
+
+    /**
+     * Useful because a positive long value could not represent half the width
+     * of full long range width, which is mathematically Long.MAX_VALUE+1.
+     *
+     * @return Minus half the range width (inclusive, and rounded to the value of smaller magnitude)
+     *         between the specified bounds.
+     * @throws IllegalArgumentException if min > max.
+     */
+    public static long negHalfWidth(long min, long max) {
+        if (min > max) {
+            throw new IllegalArgumentException("min ["+min+"] must be <= max ["+max+"]");
+        }
+        long mean = meanLow(min, max);
+        return min - mean - ((min^max)&1);
+    }
+
+    /**
+     * This treatment being designed for optimization, the fact that spot
+     * is a signed power of two is not checked.
+     *
+     * @param value A value.
+     * @param spot A signed power of two (i.e. a value of the form +-2^k, k >= 0).
+     * @return value % spot, i.e. a value in ]-|spot|,|spot|[.
+     */
+    public static int moduloSignedPowerOfTwo(int value, int spot) {
+        if (spot == Integer.MIN_VALUE) {
+            return (value != Integer.MIN_VALUE) ? value : 0;
+        } else {
+            int s = (value>>31);
+            return ((((value+s) ^ s) & (abs(spot)-1)) + s) ^ s;
+        }
+    }
+
+    /**
+     * This treatment being designed for optimization, the fact that spot
+     * is a signed power of two is not checked.
+     *
+     * @param value A value.
+     * @param spot A signed power of two (i.e. a value of the form +-2^k, k >= 0).
+     * @return value % spot, i.e. a value in ]-|spot|,|spot|[.
+     */
+    public static long moduloSignedPowerOfTwo(long value, long spot) {
+        if (spot == Long.MIN_VALUE) {
+            return (value != Long.MIN_VALUE) ? value : 0;
+        } else {
+            long s = (value>>63);
+            return ((((value+s) ^ s) & (abs(spot)-1)) + s) ^ s;
+        }
+    }
+
+    /**
+     * @param value An integer value > 0.
+     * @return The integer part of the logarithm, in base 2, of the specified value,
+     *         i.e. a result in [0,30]
+     * @throws IllegalArgumentException if the specified value is <= 0.
+     */
+    public static int log2(int value) {
+        if (value <= 0) {
+            throw new IllegalArgumentException("value ["+value+"] must be > 0");
+        }
+        return 31-Integer.numberOfLeadingZeros(value);
+    }
+
+    /**
+     * @param value An integer value > 0.
+     * @return The integer part of the logarithm, in base 2, of the specified value,
+     *         i.e. a result in [0,62]
+     * @throws IllegalArgumentException if the specified value is <= 0.
+     */
+    public static int log2(long value) {
+        if (value <= 0) {
+            throw new IllegalArgumentException("value ["+value+"] must be > 0");
+        }
+        return 63-Long.numberOfLeadingZeros(value);
+    }
+
+    /**
+     * Possibly faster than java.lang.Math.abs(int).
+     *
+     * @return The absolute value, except if value is Integer.MIN_VALUE, for which it returns Integer.MIN_VALUE.
+     */
+    public static int abs(int a) {
+        return (a^(a>>31))-(a>>31);
+    }
+
+    /**
+     * Possibly faster than java.lang.Math.abs(long).
+     *
+     * @return The absolute value, except if value is Long.MIN_VALUE, for which it returns Long.MIN_VALUE.
+     */
+    public static long abs(long a) {
+        return (a^(a>>63))-(a>>63);
+    }
+
+    /**
+     * @return The negative of the absolute value (always exact).
+     */
+    public static int absNeg(int a) {
+        return (a>>31)-(a^(a>>31));
+    }
+
+    /**
+     * @return The negative of the absolute value (always exact).
+     */
+    public static long absNeg(long a) {
+        return (a>>63)-(a^(a>>63));
+    }
+
+    /**
+     * If the specified value is in int range, the returned value is identical.
+     *
+     * @return An int hash of the specified value.
+     */
+    public static int intHash(long a) {
+        if (false) {
+            // also works
+            int hash = ((int)(a>>32)) ^ ((int)a);
+            if (a < 0) {
+                hash = -hash-1;
+            }
+            return hash;
+        }
+        int hash = ((int)(a>>32)) + ((int)a);
+        if (a < 0) {
+            hash++;
+        }
+        return hash;
+    }
+
+    /**
+     * @param a An int value.
+     * @return The specified value as byte.
+     * @throws ArithmeticException if the specified value is not in [Byte.MIN_VALUE,Byte.MAX_VALUE] range.
+     */
+    public static byte asByte(int a) {
+        if (a != (byte)a) {
+            throw new ArithmeticException("overflow: "+a);
+        }
+        return (byte)a;
+    }
+
+    /**
+     * @param a A long value.
+     * @return The specified value as int.
+     * @throws ArithmeticException if the specified value is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
+     */
+    public static int asInt(long a) {
+        if (a != (int)a) {
+            throw new ArithmeticException("overflow: "+a);
+        }
+        return (int)a;
+    }
+
+    /**
+     * @param a A long value.
+     * @return The closest int value in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
+     */
+    public static int toInt(long a) {
+        if (a != (int)a) {
+            return (a < 0) ? Integer.MIN_VALUE : Integer.MAX_VALUE;
+        }
+        return (int)a;
+    }
+
+    /**
+     * @param a An int value.
+     * @param b An int value.
+     * @return The mathematical result of a+b.
+     * @throws ArithmeticException if the mathematical result of a+b is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
+     */
+    public static int plusExact(int a, int b) {
+        final int sum = a + b;
+        // HD 2-12 Overflow iff both arguments
+        // have the opposite sign of the result.
+        if (((a ^ sum) & (b ^ sum)) < 0) {
+            throw new ArithmeticException("overflow: "+a+"+"+b);
+        }
+        return sum;
+    }
+
+    /**
+     * @param a A long value.
+     * @param b A long value.
+     * @return The mathematical result of a+b.
+     * @throws ArithmeticException if the mathematical result of a+b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
+     */
+    public static long plusExact(long a, long b) {
+        final long sum = a + b;
+        // HD 2-12 Overflow iff both arguments
+        // have the opposite sign of the result.
+        if (((a ^ sum) & (b ^ sum)) < 0) {
+            throw new ArithmeticException("overflow: "+a+"+"+b);
+        }
+        return sum;
+    }
+
+    /**
+     * @param a An int value.
+     * @param b An int value.
+     * @return The int value of [Integer.MIN_VALUE,Integer.MAX_VALUE] range which is the closest to mathematical result of a+b.
+     */
+    public static int plusBounded(int a, int b) {
+        return toInt(((long)a) + ((long)b));
+    }
+
+    /**
+     * @param a A long value.
+     * @param b A long value.
+     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a+b.
+     */
+    public static long plusBounded(long a, long b) {
+        final long sum = a + b;
+        if (((a ^ sum) & (b ^ sum)) < 0) {
+            return (sum >= 0) ? Long.MIN_VALUE : Long.MAX_VALUE;
+        }
+        return sum;
+    }
+
+    /**
+     * @param a An int value.
+     * @param b An int value.
+     * @return The mathematical result of a-b.
+     * @throws ArithmeticException if the mathematical result of a-b is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
+     */
+    public static int minusExact(int a, int b) {
+        final int diff = a - b;
+        // HD 2-12 Overflow iff the arguments have different signs and
+        // the sign of the result is different than the sign of "a".
+        if (((a ^ b) & (a ^ diff)) < 0) {
+            throw new ArithmeticException("integer overflow");
+        }
+        return diff;
+    }
+
+    /**
+     * @param a A long value.
+     * @param b A long value.
+     * @return The mathematical result of a-b.
+     * @throws ArithmeticException if the mathematical result of a-b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
+     */
+    public static long minusExact(long a, long b) {
+        final long diff = a - b;
+        // HD 2-12 Overflow iff the arguments have different signs and
+        // the sign of the result is different than the sign of "a".
+        if (((a ^ b) & (a ^ diff)) < 0) {
+            throw new ArithmeticException("integer overflow");
+        }
+        return diff;
+    }
+
+    /**
+     * @param a An int value.
+     * @param b An int value.
+     * @return The int value of [Integer.MIN_VALUE,Integer.MAX_VALUE] range which is the closest to mathematical result of a-b.
+     */
+    public static int minusBounded(int a, int b) {
+        return toInt(((long)a) - ((long)b));
+    }
+
+    /**
+     * @param a A long value.
+     * @param b A long value.
+     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a-b.
+     */
+    public static long minusBounded(long a, long b) {
+        final long diff = a - b;
+        if (((a ^ b) & (a ^ diff)) < 0) {
+            return (diff >= 0) ? Long.MIN_VALUE : Long.MAX_VALUE;
+        }
+        return diff;
+    }
+
+    /**
+     * @param a An int value.
+     * @param b An int value.
+     * @return The mathematical result of a*b.
+     * @throws ArithmeticException if the mathematical result of a*b is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
+     */
+    public static int timesExact(int a, int b) {
+        final long prod = a * (long)b;
+        if (prod != (int)prod) {
+            throw new ArithmeticException("overflow: "+a+"*"+b);
+        }
+        return (int)prod;
+    }
+
+    /**
+     * @param a A long value.
+     * @param b A long value.
+     * @return The mathematical result of a*b.
+     * @throws ArithmeticException if the mathematical result of a*b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
+     */
+    public static long timesExact(long a, long b) {
+        final long prod = a * b;
+        final long absA = abs(a);
+        final long absB = abs(b);
+        if (((absA|absB)>>>31) != 0) {
+            // Some bits greater than 2^31 that might cause overflow
+            // Check the result using the divide operator
+            // and check for the special case of Long.MIN_VALUE * -1
+            if (((b != 0) && (prod/b != a)) ||
+                    ((a == Long.MIN_VALUE) && (b == -1))) {
+                throw new ArithmeticException("overflow: "+a+"*"+b);
+            }
+        }
+        return prod;
+    }
+
+    /**
+     * @param a An int value.
+     * @param b An int value.
+     * @return The int value of [Integer.MIN_VALUE,Integer.MAX_VALUE] range which is the closest to mathematical result of a*b.
+     */
+    public static int timesBounded(int a, int b) {
+        return (int)(a * (double)b);
+    }
+
+    /**
+     * @param a A long value.
+     * @param b A long value.
+     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a*b.
+     */
+    public static long timesBounded(long a, long b) {
+        final long prod = a * b;
+        final long absA = abs(a);
+        final long absB = abs(b);
+        if (((absA|absB)>>>31) != 0) {
+            // Some bits greater than 2^31 that might cause overflow
+            // Check the result using the divide operator
+            // and check for the special case of Long.MIN_VALUE * -1
+            if (((b != 0) && (prod/b != a)) ||
+                    ((a == Long.MIN_VALUE) && (b == -1))) {
+                return ((a^b) >= 0) ? Long.MAX_VALUE : Long.MIN_VALUE;
+            }
+        }
+        return prod;
+    }
+
+    /*
+     * powers
+     */
+
+    /**
+     * Returns the exact result, provided it's in double range,
+     * i.e. if power is in [-1074,1023].
+     *
+     * @param power An int power.
+     * @return 2^power as a double, or +-Infinity in case of overflow.
+     */
+    public static double twoPow(int power) {
+        if (power <= -MAX_DOUBLE_EXPONENT) { // Not normal.
+            if (power >= MIN_DOUBLE_EXPONENT) { // Subnormal.
+                return Double.longBitsToDouble(0x0008000000000000L>>(-(power+MAX_DOUBLE_EXPONENT)));
+            } else { // Underflow.
+                return 0.0;
+            }
+        } else if (power > MAX_DOUBLE_EXPONENT) { // Overflow.
+            return Double.POSITIVE_INFINITY;
+        } else { // Normal.
+            return Double.longBitsToDouble(((long)(power+MAX_DOUBLE_EXPONENT))<<52);
+        }
+    }
+
+    /**
+     * @param power An int power.
+     * @return 2^power as an int.
+     * @throws ArithmeticException if the mathematical result
+     *         is not in int range, i.e. if power is not in [0,30].
+     */
+    public static int twoPowAsIntExact(int power) {
+        if ((power < 0) || (power > 30)) {
+            throw new ArithmeticException("integer overflow");
+        }
+        return 1 << power;
+    }
+
+    /**
+     * @param power An int power.
+     * @return 2^power as an int, or the closest power of two in int range
+     *         in case of overflow, i.e. if power is not in [0,30].
+     */
+    public static int twoPowAsIntBounded(int power) {
+        power = toRange(0, 30, power);
+        return 1 << power;
+    }
+
+    /**
+     * @param power An int power.
+     * @return 2^power as a long.
+     * @throws ArithmeticException if the mathematical result
+     *         is not in long range, i.e. if power is not in [0,62].
+     */
+    public static long twoPowAsLongExact(int power) {
+        if ((power < 0) || (power > 62)) {
+            throw new ArithmeticException("long overflow");
+        }
+        return 1L << power;
+    }
+
+    /**
+     * @param power An int power.
+     * @return 2^power as a long, or the closest power of two in long range
+     *         in case of overflow, i.e. if power is not in [0,62].
+     */
+    public static long twoPowAsLongBounded(int power) {
+        power = toRange(0, 62, power);
+        return 1L << power;
+    }
+
+    /**
+     * @param a A value.
+     * @return a*a.
+     */
+    public static int pow2(int a) {
+        return a*a;
+    }
+
+    /**
+     * @param a A value.
+     * @return a*a.
+     */
+    public static long pow2(long a) {
+        return a*a;
+    }
+
+    /**
+     * @param a A value.
+     * @return a*a.
+     */
+    public static float pow2(float a) {
+        return a*a;
+    }
+
+    /**
+     * Strict version.
+     *
+     * @param a A value.
+     * @return a*a.
+     */
+    public static strictfp float pow2_strict(float a) {
+        return a*a;
+    }
+
+    /**
+     * @param a A value.
+     * @return a*a.
+     */
+    public static double pow2(double a) {
+        return a*a;
+    }
+
+    /**
+     * Strict version.
+     *
+     * @param a A value.
+     * @return a*a.
+     */
+    public static strictfp double pow2_strict(double a) {
+        return a*a;
+    }
+
+    /**
+     * @param a A value.
+     * @return a*a*a.
+     */
+    public static int pow3(int a) {
+        return a*a*a;
+    }
+
+    /**
+     * @param a A value.
+     * @return a*a*a.
+     */
+    public static long pow3(long a) {
+        return a*a*a;
+    }
+
+    /**
+     * @param a A value.
+     * @return a*a*a.
+     */
+    public static float pow3(float a) {
+        return a*a*a;
+    }
+
+    /**
+     * Strict version.
+     *
+     * @param a A value.
+     * @return a*a*a.
+     */
+    public static strictfp float pow3_strict(float a) {
+        return a*a*a;
+    }
+
+    /**
+     * @param a A value.
+     * @return a*a*a.
+     */
+    public static double pow3(double a) {
+        return a*a*a;
+    }
+
+    /**
+     * Strict version.
+     *
+     * @param a A value.
+     * @return a*a*a.
+     */
+    public static strictfp double pow3_strict(double a) {
+        return a*a*a;
+    }
+
+    /*
+     * Accurate +-m*PI/n.
+     */
+
+    /**
+     * @param angRad An angle, in radians.
+     * @return angRad + 2*PI, accurately computed.
+     */
+    public static double plus2PI(double angRad) {
+        if (angRad > -Math.PI) {
+            // LO then HI, for better accuracy (if starting near 0).
+            return (angRad + TWOPI_LO) + TWOPI_HI;
+        } else {
+            // HI then LO, for better accuracy (if ending near 0).
+            return (angRad + TWOPI_HI) + TWOPI_LO;
+        }
+    }
+
+    /**
+     * Strict version.
+     *
+     * @param angRad An angle, in radians.
+     * @return angRad + 2*PI, accurately computed.
+     */
+    public static strictfp double plus2PI_strict(double angRad) {
+        if (angRad > -Math.PI) {
+            // LO then HI, for better accuracy (if starting near 0).
+            return (angRad + TWOPI_LO) + TWOPI_HI;
+        } else {
+            // HI then LO, for better accuracy (if ending near 0).
+            return (angRad + TWOPI_HI) + TWOPI_LO;
+        }
+    }
+
+    /**
+     * @param angRad An angle, in radians.
+     * @return angRad - 2*PI, accurately computed.
+     */
+    public static double minus2PI(double angRad) {
+        if (angRad < Math.PI) {
+            // LO then HI, for better accuracy (if starting near 0).
+            return (angRad - TWOPI_LO) - TWOPI_HI;
+        } else {
+            // HI then LO, for better accuracy (if ending near 0).
+            return (angRad - TWOPI_HI) - TWOPI_LO;
+        }
+    }
+
+    /**
+     * Strict version.
+     *
+     * @param angRad An angle, in radians.
+     * @return angRad - 2*PI, accurately computed.
+     */
+    public static strictfp double minus2PI_strict(double angRad) {
+        if (angRad < Math.PI) {
+            // LO then HI, for better accuracy (if starting near 0).
+            return (angRad - TWOPI_LO) - TWOPI_HI;
+        } else {
+            // HI then LO, for better accuracy (if ending near 0).
+            return (angRad - TWOPI_HI) - TWOPI_LO;
+        }
+    }
+
+    /**
+     * @param angRad An angle, in radians.
+     * @return angRad + PI, accurately computed.
+     */
+    public static double plusPI(double angRad) {
+        if (angRad > -Math.PI/2) {
+            // LO then HI, for better accuracy (if starting near 0).
+            return (angRad + PI_LO) + PI_HI;
+        } else {
+            // HI then LO, for better accuracy (if ending near 0).
+            return (angRad + PI_HI) + PI_LO;
+        }
+    }
+
+    /**
+     * Strict version.
+     *
+     * @param angRad An angle, in radians.
+     * @return angRad + PI, accurately computed.
+     */
+    public static strictfp double plusPI_strict(double angRad) {
+        if (angRad > -Math.PI/2) {
+            // LO then HI, for better accuracy (if starting near 0).
+            return (angRad + PI_LO) + PI_HI;
+        } else {
+            // HI then LO, for better accuracy (if ending near 0).
+            return (angRad + PI_HI) + PI_LO;
+        }
+    }
+
+    /**
+     * @param angRad An angle, in radians.
+     * @return angRad - PI, accurately computed.
+     */
+    public static double minusPI(double angRad) {
+        if (angRad < Math.PI/2) {
+            // LO then HI, for better accuracy (if starting near 0).
+            return (angRad - PI_LO) - PI_HI;
+        } else {
+            // HI then LO, for better accuracy (if ending near 0).
+            return (angRad - PI_HI) - PI_LO;
+        }
+    }
+
+    /**
+     * Strict version.
+     *
+     * @param angRad An angle, in radians.
+     * @return angRad - PI, accurately computed.
+     */
+    public static strictfp double minusPI_strict(double angRad) {
+        if (angRad < Math.PI/2) {
+            // LO then HI, for better accuracy (if starting near 0).
+            return (angRad - PI_LO) - PI_HI;
+        } else {
+            // HI then LO, for better accuracy (if ending near 0).
+            return (angRad - PI_HI) - PI_LO;
+        }
+    }
+
+    /**
+     * @param angRad An angle, in radians.
+     * @return angRad + PI/2, accurately computed.
+     */
+    public static double plusPIO2(double angRad) {
+        if (angRad > -Math.PI/4) {
+            // LO then HI, for better accuracy (if starting near 0).
+            return (angRad + PIO2_LO) + PIO2_HI;
+        } else {
+            // HI then LO, for better accuracy (if ending near 0).
+            return (angRad + PIO2_HI) + PIO2_LO;
+        }
+    }
+
+    /**
+     * Strict version.
+     *
+     * @param angRad An angle, in radians.
+     * @return angRad + PI/2, accurately computed.
+     */
+    public static strictfp double plusPIO2_strict(double angRad) {
+        if (angRad > -Math.PI/4) {
+            // LO then HI, for better accuracy (if starting near 0).
+            return (angRad + PIO2_LO) + PIO2_HI;
+        } else {
+            // HI then LO, for better accuracy (if ending near 0).
+            return (angRad + PIO2_HI) + PIO2_LO;
+        }
+    }
+
+    /**
+     * @param angRad An angle, in radians.
+     * @return angRad - PI/2, accurately computed.
+     */
+    public static double minusPIO2(double angRad) {
+        if (angRad < Math.PI/4) {
+            // LO then HI, for better accuracy (if starting near 0).
+            return (angRad - PIO2_LO) - PIO2_HI;
+        } else {
+            // HI then LO, for better accuracy (if ending near 0).
+            return (angRad - PIO2_HI) - PIO2_LO;
+        }
+    }
+
+    /**
+     * Strict version.
+     *
+     * @param angRad An angle, in radians.
+     * @return angRad - PI/2, accurately computed.
+     */
+    public static strictfp double minusPIO2_strict(double angRad) {
+        if (angRad < Math.PI/4) {
+            // LO then HI, for better accuracy (if starting near 0).
+            return (angRad - PIO2_LO) - PIO2_HI;
+        } else {
+            // HI then LO, for better accuracy (if ending near 0).
+            return (angRad - PIO2_HI) - PIO2_LO;
+        }
+    }
+
+    /*
+     * toString (radix)
+     */
+
+    /**
+     * @param radix Radix to be checked.
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if the specified radix is not in [2,36].
+     */
+    public static boolean checkRadix(int radix) {
+        if (!isInRange(Character.MIN_RADIX, Character.MAX_RADIX, radix)) {
+            throw new IllegalArgumentException("radix ["+radix+"] must be in ["+Character.MIN_RADIX+","+Character.MAX_RADIX+"]");
+        }
+        return true;
+    }
+
+    /**
+     * @param radix A radix in [2,36].
+     * @return Number of characters (minus sign included)
+     *         to represent the specified value in the specified radix.
+     */
+    public static int computeNbrOfChars(int value, int radix) {
+        if (value < 0) {
+            // 1 for sign
+            return 1 + computeNbrOfDigits_negValue(value, radix);
+        } else {
+            return computeNbrOfDigits_negValue(-value, radix);
+        }
+    }
+
+    /**
+     * @param radix A radix in [2,36].
+     * @return Number of characters (minus sign included)
+     *         to represent the specified value in the specified radix.
+     */
+    public static int computeNbrOfChars(long value, int radix) {
+        if (value < 0) {
+            // 1 for sign
+            return 1 + computeNbrOfDigits_negValue(value, radix);
+        } else {
+            return computeNbrOfDigits_negValue(-value, radix);
+        }
+    }
+
+    /**
+     * @param radix A radix in [2,36].
+     * @param paddingUpTo Number of digits (sign excluded) up to which left-padding with zeros is done.
+     * @return Number of characters (minus sign included)
+     *         to represent the specified value in the specified radix.
+     */
+    public static int computeNbrOfChars(int value, int radix, int paddingUpTo) {
+        if (value < 0) {
+            // 1 for sign
+            return 1 + Math.max(paddingUpTo, computeNbrOfDigits_negValue(value, radix));
+        } else {
+            return Math.max(paddingUpTo, computeNbrOfDigits_negValue(-value, radix));
+        }
+    }
+
+    /**
+     * @param radix A radix in [2,36].
+     * @param paddingUpTo Number of digits (sign excluded) up to which left-padding with zeros is done.
+     * @return Number of characters (minus sign included)
+     *         to represent the specified value in the specified radix.
+     */
+    public static int computeNbrOfChars(long value, int radix, int paddingUpTo) {
+        if (value < 0) {
+            // 1 for sign
+            return 1 + Math.max(paddingUpTo, computeNbrOfDigits_negValue(value, radix));
+        } else {
+            return Math.max(paddingUpTo, computeNbrOfDigits_negValue(-value, radix));
+        }
+    }
+
+    /**
+     * @param radix A radix in [2,36].
+     * @return Number of digits of the specified value in the specified radix.
+     */
+    public static int computeNbrOfDigits(int value, int radix) {
+        return computeNbrOfDigits_negValue(-abs(value), radix);
+    }
+
+    /**
+     * @param radix A radix in [2,36].
+     * @return Number of digits of the specified value in the specified radix.
+     */
+    public static int computeNbrOfDigits(long value, int radix) {
+        return computeNbrOfDigits_negValue(-abs(value), radix);
+    }
+
+    /**
+     * @param radix A radix in [2,36].
+     * @param paddingUpTo Number of digits (sign excluded) up to which left-padding with zeros is done.
+     * @return Number of digits of the specified value in the specified radix,
+     *         including the specified padding.
+     */
+    public static int computeNbrOfDigits(int value, int radix, int paddingUpTo) {
+        return Math.max(paddingUpTo,computeNbrOfDigits(value, radix));
+    }
+
+    /**
+     * @param radix A radix in [2,36].
+     * @param paddingUpTo Number of digits (sign excluded) up to which left-padding with zeros is done.
+     * @return Number of digits of the specified value in the specified radix,
+     *         including the specified padding.
+     */
+    public static int computeNbrOfDigits(long value, int radix, int paddingUpTo) {
+        return Math.max(paddingUpTo,computeNbrOfDigits(value, radix));
+    }
+
+    /**
+     * This method just delegates to Integer.toString(int),
+     * but is defined here to complete the API.
+     *
+     * @return String representation of the specified value in base 10.
+     */
+    public static String toString(int value) {
+        return Integer.toString(value);
+    }
+
+    /**
+     * This method just delegates to Long.toString(long),
+     * but is defined here to complete the API.
+     *
+     * @return String representation of the specified value in base 10.
+     */
+    public static String toString(long value) {
+        return Long.toString(value);
+    }
+
+    /**
+     * @param radix A radix in [2,36].
+     * @return String representation of the specified value in the specified radix.
+     * @throws IllegalArgumentException if the specified radix is out of range.
+     */
+    public static String toString(int value, int radix) {
+        return toString(value, radix, 0);
+    }
+
+    /**
+     * @param radix A radix in [2,36].
+     * @return String representation of the specified value in the specified radix.
+     * @throws IllegalArgumentException if the specified radix is out of range.
+     */
+    public static String toString(long value, int radix) {
+        return toString(value, radix, 0);
+    }
+
+    /**
+     * @param radix A radix in [2,36].
+     * @param paddingUpTo Number of digits (sign excluded) up to which left-padding with zeros is done.
+     * @return String representation of the specified value in the specified radix.
+     * @throws IllegalArgumentException if the specified radix is out of range.
+     */
+    public static String toString(int value, int radix, int paddingUpTo) {
+        // Only one test if radix+paddingUpTo != 10.
+        if ((radix+paddingUpTo == 10) && (paddingUpTo == 0)) {
+            // Using JDK's optimized algorithm.
+            return Integer.toString(value);
+        }
+
+        int negValue;
+        final int signSize;
+        final boolean negative = (value < 0);
+        if (negative) {
+            negValue = value;
+            signSize = 1;
+        } else {
+            negValue = -value;
+            signSize = 0;
+        }
+        // Faster if we just use max possible number of characters (33),
+        // but we prefer to take care of garbage's memory footprint.
+        // Checks radix.
+        final int nbrOfChars = signSize + Math.max(paddingUpTo, computeNbrOfDigits_negValue(negValue, radix));
+
+        final char[] chars = new char[nbrOfChars];
+
+        int charPos = nbrOfChars;
+
+        final boolean radixIsPowerOfTwo = ((radix & (radix-1)) == 0);
+        // Not allowing Integer.MIN_VALUE so it can be negated.
+        if (radixIsPowerOfTwo && (negValue != Integer.MIN_VALUE)) {
+            final int mask = radix-1;
+            final int divShift = DIV_SHIFT_BY_RADIX[radix];
+            while (negValue <= -radix) {
+                chars[--charPos] = CHAR_BY_DIGIT[(int)((-negValue) & mask)];
+                negValue = -((-negValue) >> divShift);
+            }
+        } else {
+            while (negValue <= -radix) {
+                chars[--charPos] = CHAR_BY_DIGIT[(int)(-(negValue % radix))];
+                negValue /= radix;
+            }
+        }
+        chars[--charPos] = CHAR_BY_DIGIT[(int)(-negValue)];
+
+        while (charPos > signSize) {
+            chars[--charPos] = '0';
+        }
+
+        if (negative) {
+            chars[0] = '-';
+        }
+
+        return new String(chars);
+    }
+
+    /**
+     * @param radix A radix in [2,36].
+     * @param paddingUpTo Number of digits (sign excluded) up to which left-padding with zeros is done.
+     * @return String representation of the specified value in the specified radix.
+     * @throws IllegalArgumentException if the specified radix is out of range.
+     */
+    public static String toString(long value, int radix, int paddingUpTo) {
+        // Only one test if radix+paddingUpTo != 10.
+        if ((radix+paddingUpTo == 10) && (paddingUpTo == 0)) {
+            // Using JDK's optimized algorithm.
+            return Long.toString(value);
+        }
+
+        long negValue;
+        final int signSize;
+        final boolean negative = (value < 0);
+        if (negative) {
+            negValue = value;
+            signSize = 1;
+        } else {
+            negValue = -value;
+            signSize = 0;
+        }
+        // Checks radix.
+        final int nbrOfChars = signSize + Math.max(paddingUpTo, computeNbrOfDigits_negValue(negValue, radix));
+
+        final char[] chars = new char[nbrOfChars];
+
+        int charPos = nbrOfChars;
+
+        final boolean radixIsPowerOfTwo = ((radix & (radix-1)) == 0);
+        // Not allowing Long.MIN_VALUE so it can be negated.
+        if (radixIsPowerOfTwo && (negValue != Long.MIN_VALUE)) {
+            final int mask = radix-1;
+            final int divShift = DIV_SHIFT_BY_RADIX[radix];
+            while (negValue <= -radix) {
+                chars[--charPos] = CHAR_BY_DIGIT[(int)((-negValue) & mask)];
+                negValue = -((-negValue) >> divShift);
+            }
+        } else {
+            while (negValue <= -radix) {
+                chars[--charPos] = CHAR_BY_DIGIT[(int)(-(negValue % radix))];
+                negValue /= radix;
+            }
+        }
+        chars[--charPos] = CHAR_BY_DIGIT[(int)(-negValue)];
+
+        while (charPos > signSize) {
+            chars[--charPos] = '0';
+        }
+
+        if (negative) {
+            chars[0] = '-';
+        }
+
+        return new String(chars);
+    }
+
+    /*
+     * toString (bits)
+     */
+
+    /**
+     * @param firstBitPos First bit position (inclusive).
+     * @param lastBitPosExcl Last bit position (exclusive).
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if the specified bit range does not fit in a byte.
+     */
+    public static boolean checkBitPositionsByte(int firstBitPos, int lastBitPosExcl) {
+        return checkBitPositions(firstBitPos, lastBitPosExcl, 8);
+    }
+
+    /**
+     * @param firstBitPos First bit position (inclusive).
+     * @param lastBitPosExcl Last bit position (exclusive).
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if the specified bit range does not fit in a short.
+     */
+    public static boolean checkBitPositionsShort(int firstBitPos, int lastBitPosExcl) {
+        return checkBitPositions(firstBitPos, lastBitPosExcl, 16);
+    }
+
+    /**
+     * @param firstBitPos First bit position (inclusive).
+     * @param lastBitPosExcl Last bit position (exclusive).
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if the specified bit range does not fit in an int.
+     */
+    public static boolean checkBitPositionsInt(int firstBitPos, int lastBitPosExcl) {
+        return checkBitPositions(firstBitPos, lastBitPosExcl, 32);
+    }
+
+    /**
+     * @param firstBitPos First bit position (inclusive).
+     * @param lastBitPosExcl Last bit position (exclusive).
+     * @return True if does not throw.
+     * @throws IllegalArgumentException if the specified bit range does not fit in a long.
+     */
+    public static boolean checkBitPositionsLong(int firstBitPos, int lastBitPosExcl) {
+        return checkBitPositions(firstBitPos, lastBitPosExcl, 64);
+    }
+
+    /**
+     * @return String representation of specified bits, in big endian.
+     */
+    public static String toStringBits(byte bits) {
+        final char[] chars = new char[8];
+        int bitIndex = 8;
+        while (--bitIndex >= 0) {
+            chars[7-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
+        }
+        return new String(chars);
+    }
+
+    /**
+     * @return String representation of specified bits, in big endian.
+     */
+    public static String toStringBits(short bits) {
+        final char[] chars = new char[16];
+        int bitIndex = 16;
+        while (--bitIndex >= 0) {
+            chars[15-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
+        }
+        return new String(chars);
+    }
+
+    /**
+     * @return String representation of specified bits, in big endian.
+     */
+    public static String toStringBits(int bits) {
+        final char[] chars = new char[32];
+        int bitIndex = 32;
+        while (--bitIndex >= 0) {
+            chars[31-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
+        }
+        return new String(chars);
+    }
+
+    /**
+     * @return String representation of specified bits, in big endian.
+     */
+    public static String toStringBits(long bits) {
+        final char[] chars = new char[64];
+        int bitIndex = 64;
+        while (--bitIndex >= 0) {
+            chars[63-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
+        }
+        return new String(chars);
+    }
+
+    /**
+     * @param firstBitPos First bit position (inclusive).
+     * @param lastBitPosExcl Last bit position (exclusive).
+     * @param bigEndian True for bits to be added in big endian order (MSBit to LSBit)
+     *                  false for little endian order.
+     * @param padding True if underscores must be added instead of out-of-range bits,
+     *                false to just add characters corresponding to in-range bits.
+     * @return String representation of specified bits.
+     */
+    public static String toStringBits(
+            byte bits,
+            int firstBitPos,
+            int lastBitPosExcl,
+            boolean bigEndian,
+            boolean padding) {
+        checkBitPositionsByte(firstBitPos, lastBitPosExcl);
+        return toStringBits_0_32_bitPosAlreadyChecked(8,bits, firstBitPos, lastBitPosExcl, bigEndian, padding);
+    }
+
+    /**
+     * @param firstBitPos First bit position (inclusive).
+     * @param lastBitPosExcl Last bit position (exclusive).
+     * @param bigEndian True for bits to be added in big endian order (MSBit to LSBit)
+     *                  false for little endian order.
+     * @param padding True if underscores must be added instead of out-of-range bits,
+     *                false to just add characters corresponding to in-range bits.
+     * @return String representation of specified bits.
+     */
+    public static String toStringBits(
+            short bits,
+            int firstBitPos,
+            int lastBitPosExcl,
+            boolean bigEndian,
+            boolean padding) {
+        checkBitPositionsShort(firstBitPos, lastBitPosExcl);
+        return toStringBits_0_32_bitPosAlreadyChecked(16,bits, firstBitPos, lastBitPosExcl, bigEndian, padding);
+    }
+
+    /**
+     * @param firstBitPos First bit position (inclusive).
+     * @param lastBitPosExcl Last bit position (exclusive).
+     * @param bigEndian True for bits to be added in big endian order (MSBit to LSBit)
+     *                  false for little endian order.
+     * @param padding True if underscores must be added instead of out-of-range bits,
+     *                false to just add characters corresponding to in-range bits.
+     * @return String representation of specified bits.
+     */
+    public static String toStringBits(
+            int bits,
+            int firstBitPos,
+            int lastBitPosExcl,
+            boolean bigEndian,
+            boolean padding) {
+        checkBitPositionsInt(firstBitPos, lastBitPosExcl);
+        return toStringBits_0_32_bitPosAlreadyChecked(32,bits, firstBitPos, lastBitPosExcl, bigEndian, padding);
+    }
+
+    /**
+     * @param firstBitPos First bit position (inclusive).
+     * @param lastBitPosExcl Last bit position (exclusive).
+     * @param bigEndian True for bits to be added in big endian order (MSBit to LSBit)
+     *                  false for little endian order.
+     * @param padding True if underscores must be added instead of out-of-range bits,
+     *                false to just add characters corresponding to in-range bits.
+     * @return String representation of specified bits.
+     */
+    public static String toStringBits(
+            long bits,
+            int firstBitPos,
+            int lastBitPosExcl,
+            boolean bigEndian,
+            boolean padding) {
+        checkBitPositionsLong(firstBitPos, lastBitPosExcl);
+        final int bitSize = 64;
+        final int bitSizeM1 = bitSize-1;
+        final int lastBitPos = lastBitPosExcl-1;
+        if (padding) {
+            final int nbrOfChars = bitSize;
+            final char[] chars = new char[nbrOfChars];
+            int bitIndex = bitSizeM1;
+            if (bigEndian) {
+                final int firstBitIndex = bitSizeM1-lastBitPos;
+                final int lastBitIndex = bitSizeM1-firstBitPos;
+                while (bitIndex > lastBitIndex) {
+                    chars[bitSizeM1-bitIndex] = '_';
+                    --bitIndex;
+                }
+                while (bitIndex >= firstBitIndex) {
+                    chars[bitSizeM1-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
+                    --bitIndex;
+                }
+                while (bitIndex >= 0) {
+                    chars[bitSizeM1-bitIndex] = '_';
+                    --bitIndex;
+                }
+            } else {
+                while (bitIndex > lastBitPos) {
+                    chars[bitIndex] = '_';
+                    --bitIndex;
+                }
+                while (bitIndex >= firstBitPos) {
+                    chars[bitIndex] = (char)('0'+((bits>>bitIndex)&1));
+                    --bitIndex;
+                }
+                while (bitIndex >= 0) {
+                    chars[bitIndex] = '_';
+                    --bitIndex;
+                }
+            }
+            return new String(chars);
+        } else {
+            final int nbrOfChars = (lastBitPosExcl - firstBitPos);
+            final char[] chars = new char[nbrOfChars];
+            if (bigEndian) {
+                final int firstBitIndex = bitSizeM1-lastBitPos;
+                final int lastBitIndex = bitSizeM1-firstBitPos;
+                int bitIndex = lastBitIndex;
+                while (bitIndex >= firstBitIndex) {
+                    chars[lastBitIndex-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
+                    --bitIndex;
+                }
+            } else {
+                int bitIndex = lastBitPos;
+                while (bitIndex >= firstBitPos) {
+                    chars[bitIndex-firstBitPos] = (char)('0'+((bits>>bitIndex)&1));
+                    --bitIndex;
+                }
+            }
+            return new String(chars);
+        }
+    }
+
+    /*
+     * toString (floating points)
+     *
+     * toStringCSN(double) and toStringNoCSN(double)
+     * could be made faster, by using directly internals
+     * of Double.toString(double), but this would require
+     * copy-paste of much tricky code from JDK, and
+     * the overhead of our little rework is relatively
+     * negligible.
+     */
+
+    /**
+     * @param value A double value.
+     * @return String representing the specified value,
+     *         using "computerized scientific notation",
+     *         which Double.toString(double) uses for non-infinite
+     *         values, when |value| < 1e-3 or |value| >= 1e7.
+     */
+    public static String toStringCSN(double value) {
+        // Quick case (also to get rid of +-0.0,
+        // for which Double.toString(double) doesn't use CSN).
+        if (value == 0.0) {
+            if (Double.doubleToRawLongBits(value) < 0) {
+                return "-0.0E0";
+            } else {
+                return "0.0E0";
+            }
+        }
+
+        final double abs = Math.abs(value);
+        if ((abs >= NO_CSN_MIN_BOUND_INCL) && (abs < NO_CSN_MAX_BOUND_EXCL)) {
+            final boolean neg = (value < 0.0);
+
+            final String rawAbs = Double.toString(abs);
+            if (abs >= 1.0) {
+                /*
+                 * 0123456
+                 * 12.3456 ===> 1.23456E1
+                 * 123.0   ===> 1.23E2
+                 */
+                final int dotIndex = rawAbs.indexOf((int)'.');
+                final int powerOfTen = dotIndex-1;
+                final StringBuilder sb = new StringBuilder();
+                if (neg) {
+                    sb.append('-');
+                }
+                // Adding unit-or-above digits, with dot after first one.
+                sb.append(rawAbs.charAt(0));
+                sb.append('.');
+                sb.append(rawAbs,1,dotIndex);
+                if ((value != (int)value) || (abs < 10.0)) {
+                    // Adding below-unit digits (possibly just 0 if abs < 10.0,
+                    // to end up for example with "3.0E0" instead of "3.E0").
+                    sb.append(rawAbs,dotIndex+1,rawAbs.length());
+                }
+                sb.append('E');
+                sb.append(CHAR_BY_DIGIT[powerOfTen]);
+                return sb.toString();
+            } else {
+                /*
+                 * 012345678
+                 * 0.0123456 ===> 1.23456E-2
+                 * 0.01      ===> 1.0E-2
+                 */
+                int nonZeroIndex = 1;
+                while (rawAbs.charAt(++nonZeroIndex) == '0') {
+                }
+                // Negative.
+                final int powerOfTen = 1-nonZeroIndex;
+                final int nbrOfSignificantDigitsPastDot = (rawAbs.length() - (nonZeroIndex+1));
+                final StringBuilder sb = new StringBuilder();
+                if (neg) {
+                    sb.append('-');
+                }
+                sb.append(rawAbs.charAt(nonZeroIndex));
+                sb.append('.');
+                if (nbrOfSignificantDigitsPastDot > 0) {
+                    // If bug 4428022 make rawAbs being something like "0.0010",
+                    // we add the last '0' here after the dot, which is fine.
+                    sb.append(rawAbs,nonZeroIndex+1,rawAbs.length());
+                } else {
+                    sb.append('0');
+                }
+                sb.append("E-");
+                sb.append(CHAR_BY_DIGIT[-powerOfTen]);
+                return sb.toString();
+            }
+        } else {
+            return Double.toString(value);
+        }
+    }
+
+    /**
+     * @param value A double value.
+     * @return String representing the specified value,
+     *         not in "computerized scientific notation",
+     *         which Double.toString(double) uses for non-infinite
+     *         values, when |value| < 1e-3 or |value| >= 1e7.
+     */
+    public static String toStringNoCSN(double value) {
+        // Quick case.
+        // Should also work with long instead of int,
+        // but less obvious (due to roundings...),
+        // and we just want to speed up the more common
+        // case of "small" integer values.
+        final int intValue = (int)value;
+        if (value == intValue) {
+            if (value == 0.0) {
+                if (Double.doubleToRawLongBits(value) < 0) {
+                    return "-0.0";
+                } else {
+                    return "0.0";
+                }
+            } else {
+                return Integer.toString(intValue)+".0";
+            }
+        }
+
+        final String raw = Double.toString(value);
+        final double abs = Math.abs(value);
+        if (abs >= NO_CSN_MAX_BOUND_EXCL) {
+            if (abs == Double.POSITIVE_INFINITY) {
+                return raw;
+            }
+            /*
+             * 0123456789
+             * 1.234567E5 ===> 123456.7
+             * 1.23456E5  ===> 123456.0 (adding 0)
+             * 1.23E5     ===> 123000.0
+             * 1.0E5      ===> 100000.0
+             */
+            // "." close to start, so using indexOf.
+            final int dotIndex = raw.indexOf((int)'.');
+            // "E" close to end, so using lastIndexOf.
+            final int eIndex = raw.lastIndexOf((int)'E');
+            final int powerOfTen = Integer.parseInt(raw.substring(eIndex+1));
+            final int nbrOfSignificantLoDigits = (eIndex - dotIndex - 1);
+            final int nbrOfZerosToAddBeforeDot = (powerOfTen - nbrOfSignificantLoDigits);
+
+            int start;
+            int end;
+
+            final StringBuilder sb = new StringBuilder();
+            sb.append(raw,0,dotIndex);
+            if (nbrOfZerosToAddBeforeDot >= 0) {
+                // Can copy all digits that were between '.' and 'E'.
+                sb.append(raw,dotIndex+1,eIndex);
+                for (int i=0;i<nbrOfZerosToAddBeforeDot;i++) {
+                    sb.append('0');
+                }
+                sb.append(".0");
+            } else {
+                start = dotIndex+1;
+                sb.append(raw,start,end = start+powerOfTen);
+
+                sb.append('.');
+
+                start = end;
+                sb.append(raw,start,end = eIndex);
+            }
+            return sb.toString();
+        } else if (abs < NO_CSN_MIN_BOUND_INCL) {
+            // Not +-0.0 since already handled.
+            /*
+             * 01234567
+             * 1.234E-4 ===> 0.0001234
+             * 1.0E-4   ===> 0.0001
+             */
+            // "." close to start, so using indexOf.
+            final int dotIndex = raw.indexOf((int)'.');
+            // "E" close to end, so using lastIndexOf.
+            final int eIndex = raw.lastIndexOf((int)'E');
+            // Negative.
+            final int powerOfTen = Integer.parseInt(raw.substring(eIndex+1));
+            final int nbrOfZerosToAddAfterDot = (-powerOfTen-1);
+
+            final StringBuilder sb = new StringBuilder();
+            if (value < 0.0) {
+                sb.append("-0.");
+            } else {
+                sb.append("0.");
+            }
+            for (int i=0;i<nbrOfZerosToAddAfterDot;i++) {
+                sb.append('0');
+            }
+            // First raw digit.
+            sb.append(raw,dotIndex-1,dotIndex);
+            if ((eIndex == dotIndex + 2) && (raw.charAt(dotIndex+1) == '0')) {
+                // Char past dot is alone and '0': no need to add it.
+            } else {
+                // Raw digits that were past dot.
+                sb.append(raw,dotIndex+1,eIndex);
+            }
+            return sb.toString();
+        } else {
+            // abs in [0.001,1e7[.
+            if ((abs < 1.0) && (raw.charAt(raw.length()-1) == '0')) {
+                // Workaround for bug 4428022 (Double.toString(0.004) returns
+                // "0.0040", same with 0.001 etc.).
+                return raw.substring(0, raw.length()-1);
+            } else {
+                return raw;
+            }
+        }
+    }
+
+    //--------------------------------------------------------------------------
+    // PRIVATE METHODS
+    //--------------------------------------------------------------------------
+
+    private NumbersUtils() {
+    }
+
+    /*
+     *
+     */
+
+    /**
+     * Had such isInXXX methods, and corresponding checkXXX methods,
+     * but they seem actually slower in practice, so just keeping this
+     * code here in case some day it becomes faster than regular isInXXX.
+     *
+     * Only works for non-empty ranges, i.e. such as min <= max.
+     * This treatment being designed for optimization, min <= max
+     * is not checked.
+     *
+     * @return True if the specified value is in the specified range (inclusive), false otherwise.
+     */
+    private static boolean dontUseMe_isInNonEmptyRange_(int min, int max, int a) {
+        // Using modulo arithmetic.
+        return (Integer.MIN_VALUE+(a-min) <= Integer.MIN_VALUE+(max-min));
+    }
+
+    /*
+     *
+     */
+
+    private static int minSignedIntForBitSize_noCheck(int bitSize) {
+        // i.e. (-1<<(bitSize-1))
+        return (Integer.MIN_VALUE>>(32-bitSize));
+    }
+
+    private static long minSignedLongForBitSize_noCheck(int bitSize) {
+        // i.e. (-1L<<(bitSize-1))
+        return (Long.MIN_VALUE>>(64-bitSize));
+    }
+
+    private static int maxSignedIntForBitSize_noCheck(int bitSize) {
+        // i.e. (1<<(bitSize-1))-1
+        return (Integer.MAX_VALUE>>(32-bitSize));
+    }
+
+    private static long maxSignedLongForBitSize_noCheck(int bitSize) {
+        // i.e. (1L<<(bitSize-1))-1
+        return (Long.MAX_VALUE>>(64-bitSize));
+    }
+
+    /*
+     *
+     */
+
+    /**
+     * @throws IllegalArgumentException if the specified radix is out of range.
+     */
+    private static int computeNbrOfDigits_negValue(int negValue, int radix) {
+        checkRadix(radix);
+        final int maxNbrOfDigits = MAX_NBR_OF_NEG_INT_DIGITS_BY_RADIX[radix];
+        int p = radix;
+        for (int i=1;i<maxNbrOfDigits;i++) {
+            if (negValue > -p) {
+                return i;
+            }
+            p *= radix;
+        }
+        return maxNbrOfDigits;
+    }
+
+    /**
+     * @throws IllegalArgumentException if the specified radix is out of range.
+     */
+    private static int computeNbrOfDigits_negValue(long negValue, int radix) {
+        checkRadix(radix);
+        final int maxNbrOfDigits = MAX_NBR_OF_NEG_LONG_DIGITS_BY_RADIX[radix];
+        long p = radix;
+        for (int i=1;i<maxNbrOfDigits;i++) {
+            if (negValue > -p) {
+                return i;
+            }
+            p *= radix;
+        }
+        return maxNbrOfDigits;
+    }
+
+    /*
+     *
+     */
+
+    private static boolean checkBitPositions(int firstBitPos, int lastBitPosExcl, int bitSize) {
+        if ((firstBitPos < 0) || (firstBitPos > lastBitPosExcl) || (lastBitPosExcl > bitSize)) {
+            throw new IllegalArgumentException(
+                    "bit positions (first="+firstBitPos+",lastExcl="+lastBitPosExcl
+                    +") must verify 0 <= first <= lastExcl <= "+bitSize);
+        }
+        return true;
+    }
+
+    /**
+     * Common method for byte, short and int.
+     * Could be a bit faster to have specific methods for byte and short,
+     * but not much, and that would also make more messy (byte-)code.
+     *
+     * @param bitSize Must be in [0,32].
+     */
+    private static String toStringBits_0_32_bitPosAlreadyChecked(
+            int bitSize,
+            int bits,
+            int firstBitPos,
+            int lastBitPosExcl,
+            boolean bigEndian,
+            boolean padding) {
+        final int bitSizeM1 = bitSize-1;
+        final int lastBitPos = lastBitPosExcl-1;
+        if (padding) {
+            final int nbrOfChars = bitSize;
+            final char[] chars = new char[nbrOfChars];
+            int bitIndex = bitSizeM1;
+            if (bigEndian) {
+                final int firstBitIndex = bitSizeM1-lastBitPos;
+                final int lastBitIndex = bitSizeM1-firstBitPos;
+                while (bitIndex > lastBitIndex) {
+                    chars[bitSizeM1-bitIndex] = '_';
+                    --bitIndex;
+                }
+                while (bitIndex >= firstBitIndex) {
+                    chars[bitSizeM1-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
+                    --bitIndex;
+                }
+                while (bitIndex >= 0) {
+                    chars[bitSizeM1-bitIndex] = '_';
+                    --bitIndex;
+                }
+            } else {
+                while (bitIndex > lastBitPos) {
+                    chars[bitIndex] = '_';
+                    --bitIndex;
+                }
+                while (bitIndex >= firstBitPos) {
+                    chars[bitIndex] = (char)('0'+((bits>>bitIndex)&1));
+                    --bitIndex;
+                }
+                while (bitIndex >= 0) {
+                    chars[bitIndex] = '_';
+                    --bitIndex;
+                }
+            }
+            return new String(chars);
+        } else {
+            final int nbrOfChars = (lastBitPosExcl - firstBitPos);
+            final char[] chars = new char[nbrOfChars];
+            if (bigEndian) {
+                final int firstBitIndex = bitSizeM1-lastBitPos;
+                final int lastBitIndex = bitSizeM1-firstBitPos;
+                int bitIndex = lastBitIndex;
+                while (bitIndex >= firstBitIndex) {
+                    chars[lastBitIndex-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
+                    --bitIndex;
+                }
+            } else {
+                int bitIndex = lastBitPos;
+                while (bitIndex >= firstBitPos) {
+                    chars[bitIndex-firstBitPos] = (char)('0'+((bits>>bitIndex)&1));
+                    --bitIndex;
+                }
+            }
+            return new String(chars);
+        }
+    }
+}
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/StrictFastMath.java b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/StrictFastMath.java
new file mode 100644
index 000000000..a61ac9772
--- /dev/null
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/StrictFastMath.java
@@ -0,0 +1,2998 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.jafama;
+
+/**
+ * Strict versions of FastMath methods.
+ * Cf. README.txt for more info.
+ */
+public final strictfp class StrictFastMath extends CmnFastMath {
+
+    /*
+     * We use strictfp for the whole class:
+     * - for simplicity,
+     * - to reduce strictfp/non-strictfp switching, which can add overhead,
+     *   when these treatments are used from within strictfp code,
+     * - to make sure that we only use and return non-extended values,
+     *   else if strictfp gets added later to some treatments they might then
+     *   behave differently due to no longer being inlinable into FP-wide
+     *   expressions,
+     * - to make sure we don't mistakenly not use it.
+     */
+
+    //--------------------------------------------------------------------------
+    // CONFIGURATION
+    //--------------------------------------------------------------------------
+
+    private static final boolean USE_JDK_MATH = SFM_USE_JDK_MATH;
+
+    private static final boolean USE_REDEFINED_LOG = SFM_USE_REDEFINED_LOG;
+
+    private static final boolean USE_REDEFINED_SQRT = SFM_USE_REDEFINED_SQRT;
+
+    private static final boolean USE_POWTABS_FOR_ASIN = SFM_USE_POWTABS_FOR_ASIN;
+
+    //--------------------------------------------------------------------------
+    // PUBLIC METHODS
+    //--------------------------------------------------------------------------
+
+    /*
+     * trigonometry
+     */
+
+    /**
+     * @param angle Angle in radians.
+     * @return Angle sine.
+     */
+    public static double sin(double angle) {
+        if (USE_JDK_MATH) {
+            return StrictMath.sin(angle);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        if (angle > SIN_COS_MAX_VALUE_FOR_INT_MODULO) {
+            if (false) {
+                // Can give very bad relative error near PI (mod 2*PI).
+                angle = remainderTwoPi(angle);
+                if (angle < 0.0) {
+                    angle = -angle;
+                    negateResult = !negateResult;
+                }
+            } else {
+                final long remAndQuad = remainderPiO2(angle);
+                angle = decodeRemainder(remAndQuad);
+                final double sin;
+                final int q = decodeQuadrant(remAndQuad);
+                if (q == 0) {
+                    sin = sin(angle);
+                } else if (q == 1) {
+                    sin = cos(angle);
+                } else if (q == 2) {
+                    sin = -sin(angle);
+                } else {
+                    sin = -cos(angle);
+                }
+                return (negateResult ? -sin : sin);
+            }
+        }
+        // index: possibly outside tables range.
+        int index = (int)(angle * SIN_COS_INDEXER + 0.5);
+        double delta = (angle - index * SIN_COS_DELTA_HI) - index * SIN_COS_DELTA_LO;
+        // Making sure index is within tables range.
+        // Last value of each table is the same than first,
+        // so we ignore it (tabs size minus one) for modulo.
+        index &= (SIN_COS_TABS_SIZE-2); // index % (SIN_COS_TABS_SIZE-1)
+        double indexSin = MyTSinCos.sinTab[index];
+        double indexCos = MyTSinCos.cosTab[index];
+        double result = indexSin + delta * (indexCos + delta * (-indexSin * ONE_DIV_F2 + delta * (-indexCos * ONE_DIV_F3 + delta * indexSin * ONE_DIV_F4)));
+        return negateResult ? -result : result;
+    }
+
+    /**
+     * Quick sin, with accuracy of about 1.6e-3 (PI/<look-up tabs size>)
+     * for |angle| < 6588395.0 (Integer.MAX_VALUE * (2*PI/<look-up tabs size>) - 2)
+     * (- 2 due to removing PI/2 before using cosine tab),
+     * and no accuracy at all for larger values.
+     *
+     * @param angle Angle in radians.
+     * @return Angle sine.
+     */
+    public static double sinQuick(double angle) {
+        if (USE_JDK_MATH) {
+            return StrictMath.sin(angle);
+        }
+        return MyTSinCos.cosTab[((int)(Math.abs(angle-Math.PI/2) * SIN_COS_INDEXER + 0.5)) & (SIN_COS_TABS_SIZE-2)];
+    }
+
+    /**
+     * @param angle Angle in radians.
+     * @return Angle cosine.
+     */
+    public static double cos(double angle) {
+        if (USE_JDK_MATH) {
+            return StrictMath.cos(angle);
+        }
+        angle = Math.abs(angle);
+        if (angle > SIN_COS_MAX_VALUE_FOR_INT_MODULO) {
+            if (false) {
+                // Can give very bad relative error near PI (mod 2*PI).
+                angle = remainderTwoPi(angle);
+                if (angle < 0.0) {
+                    angle = -angle;
+                }
+            } else {
+                final long remAndQuad = remainderPiO2(angle);
+                angle = decodeRemainder(remAndQuad);
+                final double cos;
+                final int q = decodeQuadrant(remAndQuad);
+                if (q == 0) {
+                    cos = cos(angle);
+                } else if (q == 1) {
+                    cos = -sin(angle);
+                } else if (q == 2) {
+                    cos = -cos(angle);
+                } else {
+                    cos = sin(angle);
+                }
+                return cos;
+            }
+        }
+        // index: possibly outside tables range.
+        int index = (int)(angle * SIN_COS_INDEXER + 0.5);
+        double delta = (angle - index * SIN_COS_DELTA_HI) - index * SIN_COS_DELTA_LO;
+        // Making sure index is within tables range.
+        // Last value of each table is the same than first,
+        // so we ignore it (tabs size minus one) for modulo.
+        index &= (SIN_COS_TABS_SIZE-2); // index % (SIN_COS_TABS_SIZE-1)
+        double indexCos = MyTSinCos.cosTab[index];
+        double indexSin = MyTSinCos.sinTab[index];
+        return indexCos + delta * (-indexSin + delta * (-indexCos * ONE_DIV_F2 + delta * (indexSin * ONE_DIV_F3 + delta * indexCos * ONE_DIV_F4)));
+    }
+
+    /**
+     * Quick cos, with accuracy of about 1.6e-3 (PI/<look-up tabs size>)
+     * for |angle| < 6588397.0 (Integer.MAX_VALUE * (2*PI/<look-up tabs size>)),
+     * and no accuracy at all for larger values.
+     *
+     * @param angle Angle in radians.
+     * @return Angle cosine.
+     */
+    public static double cosQuick(double angle) {
+        if (USE_JDK_MATH) {
+            return StrictMath.cos(angle);
+        }
+        return MyTSinCos.cosTab[((int)(Math.abs(angle) * SIN_COS_INDEXER + 0.5)) & (SIN_COS_TABS_SIZE-2)];
+    }
+
+    /**
+     * Computes sine and cosine together.
+     *
+     * @param angle Angle in radians.
+     * @param cosine (out) Angle cosine.
+     * @return Angle sine.
+     */
+    public static double sinAndCos(double angle, DoubleWrapper cosine) {
+        if (USE_JDK_MATH) {
+            cosine.value = StrictMath.cos(angle);
+            return StrictMath.sin(angle);
+        }
+        // Using the same algorithm than sin(double) method,
+        // and computing also cosine at the end.
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        if (angle > SIN_COS_MAX_VALUE_FOR_INT_MODULO) {
+            if (false) {
+                // Can give very bad relative error near PI (mod 2*PI).
+                angle = remainderTwoPi(angle);
+                if (angle < 0.0) {
+                    angle = -angle;
+                    negateResult = !negateResult;
+                }
+            } else {
+                final long remAndQuad = remainderPiO2(angle);
+                angle = decodeRemainder(remAndQuad);
+                final double sin;
+                final int q = decodeQuadrant(remAndQuad);
+                if (q == 0) {
+                    sin = sin(angle);
+                    cosine.value = cos(angle);
+                } else if (q == 1) {
+                    sin = cos(angle);
+                    cosine.value = -sin(angle);
+                } else if (q == 2) {
+                    sin = -sin(angle);
+                    cosine.value = -cos(angle);
+                } else {
+                    sin = -cos(angle);
+                    cosine.value = sin(angle);
+                }
+                return (negateResult ? -sin : sin);
+            }
+        }
+        int index = (int)(angle * SIN_COS_INDEXER + 0.5);
+        double delta = (angle - index * SIN_COS_DELTA_HI) - index * SIN_COS_DELTA_LO;
+        index &= (SIN_COS_TABS_SIZE-2); // index % (SIN_COS_TABS_SIZE-1)
+        double indexSin = MyTSinCos.sinTab[index];
+        double indexCos = MyTSinCos.cosTab[index];
+        // Could factor some multiplications (delta * factorials), but then is less accurate.
+        cosine.value = indexCos + delta * (-indexSin + delta * (-indexCos * ONE_DIV_F2 + delta * (indexSin * ONE_DIV_F3 + delta * indexCos * ONE_DIV_F4)));
+        double result = indexSin + delta * (indexCos + delta * (-indexSin * ONE_DIV_F2 + delta * (-indexCos * ONE_DIV_F3 + delta * indexSin * ONE_DIV_F4)));
+        return negateResult ? -result : result;
+    }
+
+    /**
+     * Can have very bad relative error near +-PI/2,
+     * but of the same magnitude than the relative delta between
+     * StrictMath.tan(PI/2) and StrictMath.tan(nextDown(PI/2)).
+     *
+     * @param angle Angle in radians.
+     * @return Angle tangent.
+     */
+    public static double tan(double angle) {
+        if (USE_JDK_MATH) {
+            return StrictMath.tan(angle);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        if (angle > TAN_MAX_VALUE_FOR_INT_MODULO) {
+            angle = remainderPi(angle);
+            if (angle < 0.0) {
+                angle = -angle;
+                negateResult = !negateResult;
+            }
+        }
+        // index: possibly outside tables range.
+        int index = (int)(angle * TAN_INDEXER + 0.5);
+        double delta = (angle - index * TAN_DELTA_HI) - index * TAN_DELTA_LO;
+        // Making sure index is within tables range.
+        // index modulo PI, i.e. 2*(virtual tab size minus one).
+        index &= (2*(TAN_VIRTUAL_TABS_SIZE-1)-1); // index % (2*(TAN_VIRTUAL_TABS_SIZE-1))
+        // Here, index is in [0,2*(TAN_VIRTUAL_TABS_SIZE-1)-1], i.e. indicates an angle in [0,PI[.
+        if (index > (TAN_VIRTUAL_TABS_SIZE-1)) {
+            index = (2*(TAN_VIRTUAL_TABS_SIZE-1)) - index;
+            delta = -delta;
+            negateResult = !negateResult;
+        }
+        double result;
+        if (index < TAN_TABS_SIZE) {
+            result = MyTTan.tanTab[index]
+                    + delta * (MyTTan.tanDer1DivF1Tab[index]
+                            + delta * (MyTTan.tanDer2DivF2Tab[index]
+                                    + delta * (MyTTan.tanDer3DivF3Tab[index]
+                                            + delta * MyTTan.tanDer4DivF4Tab[index])));
+        } else { // angle in ]TAN_MAX_VALUE_FOR_TABS,TAN_MAX_VALUE_FOR_INT_MODULO], or angle is NaN
+            // Using tan(angle) == 1/tan(PI/2-angle) formula: changing angle (index and delta), and inverting.
+            index = (TAN_VIRTUAL_TABS_SIZE-1) - index;
+            result = 1/(MyTTan.tanTab[index]
+                    - delta * (MyTTan.tanDer1DivF1Tab[index]
+                            - delta * (MyTTan.tanDer2DivF2Tab[index]
+                                    - delta * (MyTTan.tanDer3DivF3Tab[index]
+                                            - delta * MyTTan.tanDer4DivF4Tab[index]))));
+        }
+        return negateResult ? -result : result;
+    }
+
+    /**
+     * @param value Value in [-1,1].
+     * @return Value arcsine, in radians, in [-PI/2,PI/2].
+     */
+    public static double asin(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.asin(value);
+        }
+        boolean negateResult = false;
+        if (value < 0.0) {
+            value = -value;
+            negateResult = true;
+        }
+        if (value <= ASIN_MAX_VALUE_FOR_TABS) {
+            int index = (int)(value * ASIN_INDEXER + 0.5);
+            double delta = value - index * ASIN_DELTA;
+            double result = MyTAsin.asinTab[index]
+                    + delta * (MyTAsin.asinDer1DivF1Tab[index]
+                            + delta * (MyTAsin.asinDer2DivF2Tab[index]
+                                    + delta * (MyTAsin.asinDer3DivF3Tab[index]
+                                            + delta * MyTAsin.asinDer4DivF4Tab[index])));
+            return negateResult ? -result : result;
+        } else if (USE_POWTABS_FOR_ASIN && (value <= ASIN_MAX_VALUE_FOR_POWTABS)) {
+            int index = (int)(powFast(value * ASIN_POWTABS_ONE_DIV_MAX_VALUE, ASIN_POWTABS_POWER) * ASIN_POWTABS_SIZE_MINUS_ONE + 0.5);
+            double delta = value - MyTAsinPow.asinParamPowTab[index];
+            double result = MyTAsinPow.asinPowTab[index]
+                    + delta * (MyTAsinPow.asinDer1DivF1PowTab[index]
+                            + delta * (MyTAsinPow.asinDer2DivF2PowTab[index]
+                                    + delta * (MyTAsinPow.asinDer3DivF3PowTab[index]
+                                            + delta * MyTAsinPow.asinDer4DivF4PowTab[index])));
+            return negateResult ? -result : result;
+        } else { // value > ASIN_MAX_VALUE_FOR_TABS, or value is NaN
+            // This part is derived from fdlibm.
+            if (value < 1.0) {
+                double t = (1.0 - value)*0.5;
+                double p = t*(ASIN_PS0+t*(ASIN_PS1+t*(ASIN_PS2+t*(ASIN_PS3+t*(ASIN_PS4+t*ASIN_PS5)))));
+                double q = 1.0+t*(ASIN_QS1+t*(ASIN_QS2+t*(ASIN_QS3+t*ASIN_QS4)));
+                double s = sqrt(t);
+                double z = s+s*(p/q);
+                double result = ASIN_PIO2_HI-((z+z)-ASIN_PIO2_LO);
+                return negateResult ? -result : result;
+            } else { // value >= 1.0, or value is NaN
+                if (value == 1.0) {
+                    return negateResult ? -Math.PI/2 : Math.PI/2;
+                } else {
+                    return Double.NaN;
+                }
+            }
+        }
+    }
+
+    /**
+     * If value is not NaN and is outside [-1,1] range, closest value in this range is used.
+     *
+     * @param value Value in [-1,1].
+     * @return Value arcsine, in radians, in [-PI/2,PI/2].
+     */
+    public static double asinInRange(double value) {
+        if (value <= -1.0) {
+            return -Math.PI/2;
+        } else if (value >= 1.0) {
+            return Math.PI/2;
+        } else {
+            return asin(value);
+        }
+    }
+
+    /**
+     * @param value Value in [-1,1].
+     * @return Value arccosine, in radians, in [0,PI].
+     */
+    public static double acos(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.acos(value);
+        }
+        return Math.PI/2 - asin(value);
+    }
+
+    /**
+     * If value is not NaN and is outside [-1,1] range,
+     * closest value in this range is used.
+     *
+     * @param value Value in [-1,1].
+     * @return Value arccosine, in radians, in [0,PI].
+     */
+    public static double acosInRange(double value) {
+        if (value <= -1.0) {
+            return Math.PI;
+        } else if (value >= 1.0) {
+            return 0.0;
+        } else {
+            return acos(value);
+        }
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value arctangent, in radians, in [-PI/2,PI/2].
+     */
+    public static double atan(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.atan(value);
+        }
+        boolean negateResult = false;
+        if (value < 0.0) {
+            value = -value;
+            negateResult = true;
+        }
+        if (value == 1.0) {
+            // We want "exact" result for 1.0.
+            return negateResult ? -Math.PI/4 : Math.PI/4;
+        } else if (value <= ATAN_MAX_VALUE_FOR_TABS) {
+            int index = (int)(value * ATAN_INDEXER + 0.5);
+            double delta = value - index * ATAN_DELTA;
+            double result = MyTAtan.atanTab[index]
+                    + delta * (MyTAtan.atanDer1DivF1Tab[index]
+                            + delta * (MyTAtan.atanDer2DivF2Tab[index]
+                                    + delta * (MyTAtan.atanDer3DivF3Tab[index]
+                                            + delta * MyTAtan.atanDer4DivF4Tab[index])));
+            return negateResult ? -result : result;
+        } else { // value > ATAN_MAX_VALUE_FOR_TABS, or value is NaN
+            // This part is derived from fdlibm.
+            if (value < TWO_POW_66) {
+                double x = -1/value;
+                double x2 = x*x;
+                double x4 = x2*x2;
+                double s1 = x2*(ATAN_AT0+x4*(ATAN_AT2+x4*(ATAN_AT4+x4*(ATAN_AT6+x4*(ATAN_AT8+x4*ATAN_AT10)))));
+                double s2 = x4*(ATAN_AT1+x4*(ATAN_AT3+x4*(ATAN_AT5+x4*(ATAN_AT7+x4*ATAN_AT9))));
+                double result = ATAN_HI3-((x*(s1+s2)-ATAN_LO3)-x);
+                return negateResult ? -result : result;
+            } else { // value >= 2^66, or value is NaN
+                if (value != value) {
+                    return Double.NaN;
+                } else {
+                    return negateResult ? -Math.PI/2 : Math.PI/2;
+                }
+            }
+        }
+    }
+
+    /**
+     * For special values for which multiple conventions could be adopted,
+     * behaves like StrictMath.atan2(double,double).
+     *
+     * @param y Coordinate on y axis.
+     * @param x Coordinate on x axis.
+     * @return Angle from x axis positive side to (x,y) position, in radians, in [-PI,PI].
+     *         Angle measure is positive when going from x axis to y axis (positive sides).
+     */
+    public static double atan2(double y, double x) {
+        if (USE_JDK_MATH) {
+            return StrictMath.atan2(y,x);
+        }
+        /*
+         * Using sub-methods, to make method lighter for general case,
+         * and to avoid JIT-optimization crash on NaN.
+         */
+        if (x > 0.0) {
+            if (y == 0.0) {
+                // +-0.0
+                return y;
+            }
+            if (x == Double.POSITIVE_INFINITY) {
+                return atan2_pinf_yyy(y);
+            } else {
+                return atan(y/x);
+            }
+        } else if (x < 0.0) {
+            if (y == 0.0) {
+                return signFromBit(y) * Math.PI;
+            }
+            if (x == Double.NEGATIVE_INFINITY) {
+                return atan2_ninf_yyy(y);
+            } else if (y > 0.0) {
+                return Math.PI/2 - atan(x/y);
+            } else if (y < 0.0) {
+                return -Math.PI/2 - atan(x/y);
+            } else {
+                return Double.NaN;
+            }
+        } else {
+            return atan2_yyy_zeroOrNaN(y, x);
+        }
+    }
+
+    /**
+     * Gives same result as StrictMath.toRadians for some particular values
+     * like 90.0, 180.0 or 360.0, but is faster (no division).
+     *
+     * @param angdeg Angle value in degrees.
+     * @return Angle value in radians.
+     */
+    public static double toRadians(double angdeg) {
+        if (USE_JDK_MATH) {
+            return StrictMath.toRadians(angdeg);
+        }
+        return angdeg * (Math.PI/180);
+    }
+
+    /**
+     * Gives same result as StrictMath.toDegrees for some particular values
+     * like Math.PI/2, Math.PI or 2*Math.PI, but is faster (no division).
+     *
+     * @param angrad Angle value in radians.
+     * @return Angle value in degrees.
+     */
+    public static double toDegrees(double angrad) {
+        if (USE_JDK_MATH) {
+            return StrictMath.toDegrees(angrad);
+        }
+        return angrad * (180/Math.PI);
+    }
+
+    /**
+     * @param sign Sign of the angle: true for positive, false for negative.
+     * @param degrees Degrees, in [0,180].
+     * @param minutes Minutes, in [0,59].
+     * @param seconds Seconds, in [0.0,60.0[.
+     * @return Angle in radians.
+     */
+    public static double toRadians(boolean sign, int degrees, int minutes, double seconds) {
+        return toRadians(toDegrees(sign, degrees, minutes, seconds));
+    }
+
+    /**
+     * @param sign Sign of the angle: true for positive, false for negative.
+     * @param degrees Degrees, in [0,180].
+     * @param minutes Minutes, in [0,59].
+     * @param seconds Seconds, in [0.0,60.0[.
+     * @return Angle in degrees.
+     */
+    public static double toDegrees(boolean sign, int degrees, int minutes, double seconds) {
+        double signFactor = sign ? 1.0 : -1.0;
+        return signFactor * (degrees + (1.0/60)*(minutes + (1.0/60)*seconds));
+    }
+
+    /**
+     * @param angrad Angle in radians.
+     * @param degrees (out) Degrees, in [0,180].
+     * @param minutes (out) Minutes, in [0,59].
+     * @param seconds (out) Seconds, in [0.0,60.0[.
+     * @return true if the resulting angle in [-180deg,180deg] is positive, false if it is negative.
+     */
+    public static boolean toDMS(double angrad, IntWrapper degrees, IntWrapper minutes, DoubleWrapper seconds) {
+        // Computing longitude DMS.
+        double tmp = toDegrees(normalizeMinusPiPi(angrad));
+        boolean isNeg = (tmp < 0.0);
+        if (isNeg) {
+            tmp = -tmp;
+        }
+        degrees.value = (int)tmp;
+        tmp = (tmp-degrees.value)*60.0;
+        minutes.value = (int)tmp;
+        seconds.value = Math.min((tmp-minutes.value)*60.0,DOUBLE_BEFORE_60);
+        return !isNeg;
+    }
+
+    /**
+     * NB: Since 2*Math.PI < 2*PI, a span of 2*Math.PI does not mean full angular range.
+     * ex.: isInClockwiseDomain(0.0, 2*Math.PI, -1e-20) returns false.
+     * ---> For full angular range, use a span > 2*Math.PI, like 2*PI_SUP constant of this class.
+     *
+     * @param startAngRad An angle, in radians.
+     * @param angSpanRad An angular span, >= 0.0, in radians.
+     * @param angRad An angle, in radians.
+     * @return true if angRad is in the clockwise angular domain going from startAngRad, over angSpanRad,
+     *         extremities included, false otherwise.
+     */
+    public static boolean isInClockwiseDomain(double startAngRad, double angSpanRad, double angRad) {
+        if (Math.abs(angRad) < -TWO_MATH_PI_IN_MINUS_PI_PI) {
+            // special case for angular values of small magnitude
+            if (angSpanRad <= 2*Math.PI) {
+                if (angSpanRad < 0.0) {
+                    // empty domain
+                    return false;
+                }
+                // angSpanRad is in [0,2*PI]
+                startAngRad = normalizeMinusPiPi(startAngRad);
+                double endAngRad = normalizeMinusPiPi(startAngRad + angSpanRad);
+                if (startAngRad <= endAngRad) {
+                    return (angRad >= startAngRad) && (angRad <= endAngRad);
+                } else {
+                    return (angRad >= startAngRad) || (angRad <= endAngRad);
+                }
+            } else { // angSpanRad > 2*Math.PI, or is NaN
+                return (angSpanRad == angSpanRad);
+            }
+        } else {
+            // general case
+            return (normalizeZeroTwoPi(angRad - startAngRad) <= angSpanRad);
+        }
+    }
+
+    /*
+     * hyperbolic trigonometry
+     */
+
+    /**
+     * Some properties of sinh(x) = (exp(x)-exp(-x))/2:
+     * 1) defined on ]-Infinity,+Infinity[
+     * 2) result in ]-Infinity,+Infinity[
+     * 3) sinh(x) = -sinh(-x) (implies sinh(0) = 0)
+     * 4) sinh(epsilon) ~= epsilon
+     * 5) lim(sinh(x),x->+Infinity) = +Infinity
+     *    (y increasing exponentially faster than x)
+     * 6) reaches +Infinity (double overflow) for x >= 710.475860073944,
+     *    i.e. a bit further than exp(x)
+     *
+     * @param value A double value.
+     * @return Value hyperbolic sine.
+     */
+    public static double sinh(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.sinh(value);
+        }
+        // sinh(x) = (exp(x)-exp(-x))/2
+        double h;
+        if (value < 0.0) {
+            value = -value;
+            h = -0.5;
+        } else {
+            h = 0.5;
+        }
+        if (value < 22.0) {
+            if (value < TWO_POW_N28) {
+                return (h < 0.0) ? -value : value;
+            } else {
+                // sinh(x)
+                // = (exp(x)-exp(-x))/2
+                // = (exp(x)-1/exp(x))/2
+                // = (expm1(x) + 1 - 1/(expm1(x)+1))/2
+                // = (expm1(x) + (expm1(x)+1)/(expm1(x)+1) - 1/(expm1(x)+1))/2
+                // = (expm1(x) + expm1(x)/(expm1(x)+1))/2
+                double t = expm1(value);
+                // Might be more accurate, if value < 1: return h*((t+t)-t*t/(t+1.0)).
+                return h * (t + t/(t+1.0));
+            }
+        } else if (value < LOG_DOUBLE_MAX_VALUE) {
+            return h * exp(value);
+        } else {
+            double t = exp(value*0.5);
+            return (h*t)*t;
+        }
+    }
+
+    /**
+     * Some properties of cosh(x) = (exp(x)+exp(-x))/2:
+     * 1) defined on ]-Infinity,+Infinity[
+     * 2) result in [1,+Infinity[
+     * 3) cosh(0) = 1
+     * 4) cosh(x) = cosh(-x)
+     * 5) lim(cosh(x),x->+Infinity) = +Infinity
+     *    (y increasing exponentially faster than x)
+     * 6) reaches +Infinity (double overflow) for x >= 710.475860073944,
+     *    i.e. a bit further than exp(x)
+     *
+     * @param value A double value.
+     * @return Value hyperbolic cosine.
+     */
+    public static double cosh(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.cosh(value);
+        }
+        // cosh(x) = (exp(x)+exp(-x))/2
+        if (value < 0.0) {
+            value = -value;
+        }
+        if (value < LOG_TWO_POW_27) {
+            if (value < TWO_POW_N27) {
+                // cosh(x)
+                // = (exp(x)+exp(-x))/2
+                // = ((1+x+x^2/2!+...) + (1-x+x^2/2!-...))/2
+                // = 1+x^2/2!+x^4/4!+...
+                // For value of x small in magnitude, the sum of the terms does not add to 1.
+                return 1;
+            } else {
+                // cosh(x)
+                // = (exp(x)+exp(-x))/2
+                // = (exp(x)+1/exp(x))/2
+                double t = exp(value);
+                return 0.5 * (t+1/t);
+            }
+        } else if (value < LOG_DOUBLE_MAX_VALUE) {
+            return 0.5 * exp(value);
+        } else {
+            double t = exp(value*0.5);
+            return (0.5*t)*t;
+        }
+    }
+
+    /**
+     * Much more accurate than cosh(value)-1,
+     * for arguments (and results) close to zero.
+     *
+     * coshm1(-0.0) = -0.0, for homogeneity with
+     * acosh1p(-0.0) = -0.0.
+     *
+     * @param value A double value.
+     * @return Value hyperbolic cosine, minus 1.
+     */
+    public static double coshm1(double value) {
+        // cosh(x)-1 = (exp(x)+exp(-x))/2 - 1
+        if (value < 0.0) {
+            value = -value;
+        }
+        if (value < LOG_TWO_POW_27) {
+            if (value < TWO_POW_N27) {
+                if (value == 0.0) {
+                    // +-0.0
+                    return value;
+                }
+                // Using (expm1(x)+expm1(-x))/2
+                // is not accurate for tiny values,
+                // for expm1 results are of higher
+                // magnitude than the result and
+                // of different signs, such as their
+                // sum is not accurate.
+                // cosh(x) - 1
+                // = (exp(x)+exp(-x))/2 - 1
+                // = ((1+x+x^2/2!+...) + (1-x+x^2/2!-...))/2 - 1
+                // = x^2/2!+x^4/4!+...
+                // ~= x^2 * (1/2 + x^2 * 1/24)
+                //  = x^2 * 0.5 (since x < 2^-27)
+                return 0.5 * value*value;
+            } else {
+                // cosh(x) - 1
+                // = (exp(x)+exp(-x))/2 - 1
+                // = (exp(x)-1+exp(-x)-1)/2
+                // = (expm1(x)+expm1(-x))/2
+                return 0.5 * (expm1(value)+expm1(-value));
+            }
+        } else if (value < LOG_DOUBLE_MAX_VALUE) {
+            return 0.5 * exp(value) - 1.0;
+        } else {
+            // No need to subtract 1 from result.
+            double t = exp(value*0.5);
+            return (0.5*t)*t;
+        }
+    }
+
+    /**
+     * Computes hyperbolic sine and hyperbolic cosine together.
+     *
+     * @param value A double value.
+     * @param hcosine (out) Value hyperbolic cosine.
+     * @return Value hyperbolic sine.
+     */
+    public static double sinhAndCosh(double value, DoubleWrapper hcosine) {
+        if (USE_JDK_MATH) {
+            hcosine.value = StrictMath.cosh(value);
+            return StrictMath.sinh(value);
+        }
+        // Mixup of sinh and cosh treatments: if you modify them,
+        // you might want to also modify this.
+        double h;
+        if (value < 0.0) {
+            value = -value;
+            h = -0.5;
+        } else {
+            h = 0.5;
+        }
+        final double hsine;
+        // LOG_TWO_POW_27 = 18.714973875118524
+        if (value < LOG_TWO_POW_27) { // test from cosh
+            // sinh
+            if (value < TWO_POW_N28) {
+                hsine = (h < 0.0) ? -value : value;
+            } else {
+                double t = expm1(value);
+                hsine = h * (t + t/(t+1.0));
+            }
+            // cosh
+            if (value < TWO_POW_N27) {
+                hcosine.value = 1;
+            } else {
+                double t = exp(value);
+                hcosine.value = 0.5 * (t+1/t);
+            }
+        } else if (value < 22.0) { // test from sinh
+            // Here, value is in [18.714973875118524,22.0[.
+            double t = expm1(value);
+            hsine = h * (t + t/(t+1.0));
+            hcosine.value = 0.5 * (t+1.0);
+        } else {
+            if (value < LOG_DOUBLE_MAX_VALUE) {
+                hsine = h * exp(value);
+            } else {
+                double t = exp(value*0.5);
+                hsine = (h*t)*t;
+            }
+            hcosine.value = Math.abs(hsine);
+        }
+        return hsine;
+    }
+
+    /**
+     * Some properties of tanh(x) = sinh(x)/cosh(x) = (exp(2*x)-1)/(exp(2*x)+1):
+     * 1) defined on ]-Infinity,+Infinity[
+     * 2) result in ]-1,1[
+     * 3) tanh(x) = -tanh(-x) (implies tanh(0) = 0)
+     * 4) tanh(epsilon) ~= epsilon
+     * 5) lim(tanh(x),x->+Infinity) = 1
+     * 6) reaches 1 (double loss of precision) for x = 19.061547465398498
+     *
+     * @param value A double value.
+     * @return Value hyperbolic tangent.
+     */
+    public static double tanh(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.tanh(value);
+        }
+        // tanh(x) = sinh(x)/cosh(x)
+        //         = (exp(x)-exp(-x))/(exp(x)+exp(-x))
+        //         = (exp(2*x)-1)/(exp(2*x)+1)
+        boolean negateResult = false;
+        if (value < 0.0) {
+            value = -value;
+            negateResult = true;
+        }
+        double z;
+        if (value < TANH_1_THRESHOLD) {
+            if (value < TWO_POW_N55) {
+                return negateResult ? -value*(1.0-value) : value*(1.0+value);
+            } else if (value >= 1) {
+                z = 1.0-2.0/(expm1(value+value)+2.0);
+            } else {
+                double t = expm1(-(value+value));
+                z = -t/(t+2.0);
+            }
+        } else {
+            z = (value != value) ? Double.NaN : 1.0;
+        }
+        return negateResult ? -z : z;
+    }
+
+    /**
+     * Some properties of asinh(x) = log(x + sqrt(x^2 + 1))
+     * 1) defined on ]-Infinity,+Infinity[
+     * 2) result in ]-Infinity,+Infinity[
+     * 3) asinh(x) = -asinh(-x) (implies asinh(0) = 0)
+     * 4) asinh(epsilon) ~= epsilon
+     * 5) lim(asinh(x),x->+Infinity) = +Infinity
+     *    (y increasing logarithmically slower than x)
+     *
+     * @param value A double value.
+     * @return Value hyperbolic arcsine.
+     */
+    public static double asinh(double value) {
+        // asinh(x) = log(x + sqrt(x^2 + 1))
+        boolean negateResult = false;
+        if (value < 0.0) {
+            value = -value;
+            negateResult = true;
+        }
+        double result;
+        // (about) smallest possible for
+        // non-log1p case to be accurate.
+        if (value < ASINH_LOG1P_THRESHOLD) {
+            // Around this range, FDLIBM uses
+            // log1p(value+value*value/(1+sqrt(value*value+1))),
+            // but it's slower, so we don't use it.
+            /*
+             * If x is close to zero, log argument is close to 1,
+             * so to avoid precision loss we use log1p(double),
+             * with
+             * (1+x)^p = 1 + p * x + (p*(p-1))/2! * x^2 + (p*(p-1)*(p-2))/3! * x^3 + ...
+             * (1+x)^p = 1 + p * x * (1 + (p-1)/2 * x * (1 + (p-2)/3 * x + ...)
+             * (1+x)^0.5 = 1 + 0.5 * x * (1 + (0.5-1)/2 * x * (1 + (0.5-2)/3 * x + ...)
+             * (1+x^2)^0.5 = 1 + 0.5 * x^2 * (1 + (0.5-1)/2 * x^2 * (1 + (0.5-2)/3 * x^2 + ...)
+             * x + (1+x^2)^0.5 = 1 + x * (1 + 0.5 * x * (1 + (0.5-1)/2 * x^2 * (1 + (0.5-2)/3 * x^2 + ...))
+             * so
+             * asinh(x) = log1p(x * (1 + 0.5 * x * (1 + (0.5-1)/2 * x^2 * (1 + (0.5-2)/3 * x^2 + ...)))
+             */
+            final double x = value;
+            final double x2 = x*x;
+            // Enough terms for good accuracy,
+            // given our threshold.
+            final double argLog1p = (x *
+                    (1 + 0.5 * x
+                            * (1 + (0.5-1)/2 * x2
+                                    * (1 + (0.5-2)/3 * x2
+                                            * (1 + (0.5-3)/4 * x2
+                                                    * (1 + (0.5-4)/5 * x2
+                                                    ))))));
+            result = log1p(argLog1p);
+        } else if (value < ASINH_ACOSH_SQRT_ELISION_THRESHOLD) {
+            // Around this range, FDLIBM uses
+            // log(2*value+1/(value+sqrt(value*value+1))),
+            // but it involves an additional division
+            // so we don't use it.
+            result = log(value + sqrt(value*value + 1.0));
+        } else {
+            // log(2*value) would overflow for value > Double.MAX_VALUE/2,
+            // so we compute otherwise.
+            result = LOG_2 + log(value);
+        }
+        return negateResult ? -result : result;
+    }
+
+    /**
+     * Some properties of acosh(x) = log(x + sqrt(x^2 - 1)):
+     * 1) defined on [1,+Infinity[
+     * 2) result in ]0,+Infinity[ (by convention, since cosh(x) = cosh(-x))
+     * 3) acosh(1) = 0
+     * 4) acosh(1+epsilon) ~= log(1 + sqrt(2*epsilon)) ~= sqrt(2*epsilon)
+     * 5) lim(acosh(x),x->+Infinity) = +Infinity
+     *    (y increasing logarithmically slower than x)
+     *
+     * @param value A double value.
+     * @return Value hyperbolic arccosine.
+     */
+    public static double acosh(double value) {
+        if (!(value > 1.0)) {
+            // NaN, or value <= 1
+            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
+                return (value < 1.0) ? Double.NaN : value - 1.0;
+            } else {
+                return (value == 1.0) ? 0.0 : Double.NaN;
+            }
+        }
+        double result;
+        if (value < ASINH_ACOSH_SQRT_ELISION_THRESHOLD) {
+            // Around this range, FDLIBM uses
+            // log(2*value-1/(value+sqrt(value*value-1))),
+            // but it involves an additional division
+            // so we don't use it.
+            result = log(value + sqrt(value*value - 1.0));
+        } else {
+            // log(2*value) would overflow for value > Double.MAX_VALUE/2,
+            // so we compute otherwise.
+            result = LOG_2 + log(value);
+        }
+        return result;
+    }
+
+    /**
+     * Much more accurate than acosh(1+value),
+     * for arguments (and results) close to zero.
+     *
+     * acosh1p(-0.0) = -0.0, for homogeneity with
+     * sqrt(-0.0) = -0.0, which looks about the same
+     * near 0.
+     *
+     * @param value A double value.
+     * @return Hyperbolic arccosine of (1+value).
+     */
+    public static double acosh1p(double value) {
+        if (!(value > 0.0)) {
+            // NaN, or value <= 0.
+            // If value is -0.0, returning -0.0.
+            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
+                return (value < 0.0) ? Double.NaN : value;
+            } else {
+                return (value == 0.0) ? value : Double.NaN;
+            }
+        }
+        double result;
+        if (value < (ASINH_ACOSH_SQRT_ELISION_THRESHOLD-1)) {
+            // acosh(1+x)
+            // = log((1+x) + sqrt((1+x)^2 - 1))
+            // = log(1 + x + sqrt(1 + 2*x + x^2 - 1))
+            // = log1p(x + sqrt(2*x + x^2))
+            // = log1p(x + sqrt(x * (2 + x))
+            result = log1p(value + sqrt(value * (2 + value)));
+        } else {
+            result = LOG_2 + log(1+value);
+        }
+        return result;
+    }
+
+    /**
+     * Some properties of atanh(x) = log((1+x)/(1-x))/2:
+     * 1) defined on ]-1,1[
+     * 2) result in ]-Infinity,+Infinity[
+     * 3) atanh(-1) = -Infinity (by continuity)
+     * 4) atanh(1) = +Infinity (by continuity)
+     * 5) atanh(epsilon) ~= epsilon
+     * 6) lim(atanh(x),x->1) = +Infinity
+     *
+     * @param value A double value.
+     * @return Value hyperbolic arctangent.
+     */
+    public static double atanh(double value) {
+        boolean negateResult = false;
+        if (value < 0.0) {
+            value = -value;
+            negateResult = true;
+        }
+        double result;
+        if (!(value < 1.0)) {
+            // NaN, or value >= 1
+            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
+                result = (value > 1.0) ? Double.NaN : Double.POSITIVE_INFINITY + value;
+            } else {
+                result = (value == 1.0) ? Double.POSITIVE_INFINITY : Double.NaN;
+            }
+        } else {
+            // For value < 0.5, FDLIBM uses
+            // 0.5 * log1p((value+value) + (value+value)*value/(1-value)),
+            // instead, but this is good enough for us.
+            // atanh(x)
+            // = log((1+x)/(1-x))/2
+            // = log((1-x+2x)/(1-x))/2
+            // = log1p(2x/(1-x))/2
+            result = 0.5 * log1p((value+value)/(1.0-value));
+        }
+        return negateResult ? -result : result;
+    }
+
+    /*
+     * exponentials
+     */
+
+    /**
+     * @param value A double value.
+     * @return e^value.
+     */
+    public static double exp(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.exp(value);
+        }
+        // exp(x) = exp([x])*exp(y)
+        // with [x] the integer part of x, and y = x-[x]
+        // ===>
+        // We find an approximation of y, called z.
+        // ===>
+        // exp(x) = exp([x])*(exp(z)*exp(epsilon))
+        // with epsilon = y - z
+        // ===>
+        // We have exp([x]) and exp(z) pre-computed in tables, we "just" have to compute exp(epsilon).
+        //
+        // We use the same indexing (cast to int) to compute x integer part and the
+        // table index corresponding to z, to avoid two int casts.
+        // Also, to optimize index multiplication and division, we use powers of two,
+        // so that we can do it with bits shifts.
+
+        if (value > EXP_OVERFLOW_LIMIT) {
+            return Double.POSITIVE_INFINITY;
+        } else if (!(value >= EXP_UNDERFLOW_LIMIT)) {
+            return (value != value) ? Double.NaN : 0.0;
+        }
+
+        final int indexes = (int)(value*EXP_LO_INDEXING);
+
+        final int valueInt;
+        if (indexes >= 0) {
+            valueInt = (indexes>>EXP_LO_INDEXING_DIV_SHIFT);
+        } else {
+            valueInt = -((-indexes)>>EXP_LO_INDEXING_DIV_SHIFT);
+        }
+        final double hiTerm = MyTExp.expHiTab[valueInt-(int)EXP_UNDERFLOW_LIMIT];
+
+        final int zIndex = indexes - (valueInt<<EXP_LO_INDEXING_DIV_SHIFT);
+        final double y = (value-valueInt);
+        final double z = zIndex*(1.0/EXP_LO_INDEXING);
+        final double eps = y-z;
+        final double expZ = MyTExp.expLoPosTab[zIndex+EXP_LO_TAB_MID_INDEX];
+        final double expEps = (1+eps*(1+eps*(1.0/2+eps*(1.0/6+eps*(1.0/24)))));
+        final double loTerm = expZ * expEps;
+
+        return hiTerm * loTerm;
+    }
+
+    /**
+     * Quick exp, with a max relative error of about 2.94e-2 for |value| < 700.0 or so,
+     * and no accuracy at all outside this range.
+     * Derived from a note by Nicol N. Schraudolph, IDSIA, 1998.
+     *
+     * @param value A double value.
+     * @return e^value.
+     */
+    public static double expQuick(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.exp(value);
+        }
+        /*
+         * Cast of double values, even in long range, into long, is slower than
+         * from double to int for values in int range, and then from int to long.
+         * For that reason, we only work with integer values in int range
+         * (corresponding to the 32 first bits of the long, containing sign,
+         * exponent, and highest significant bits of double's mantissa),
+         * and cast twice.
+         *
+         * Constants determined empirically, using a random-based metaheuristic.
+         * Should be possible to find better ones.
+         */
+        return Double.longBitsToDouble(((long)(int)(1512775.3952 * value + 1.0726481222E9))<<32);
+    }
+
+    /**
+     * Much more accurate than exp(value)-1,
+     * for arguments (and results) close to zero.
+     *
+     * @param value A double value.
+     * @return e^value-1.
+     */
+    public static double expm1(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.expm1(value);
+        }
+        // If value is far from zero, we use exp(value)-1.
+        //
+        // If value is close to zero, we use the following formula:
+        // exp(value)-1
+        // = exp(valueApprox)*exp(epsilon)-1
+        // = exp(valueApprox)*(exp(epsilon)-exp(-valueApprox))
+        // = exp(valueApprox)*(1+epsilon+epsilon^2/2!+...-exp(-valueApprox))
+        // = exp(valueApprox)*((1-exp(-valueApprox))+epsilon+epsilon^2/2!+...)
+        // exp(valueApprox) and exp(-valueApprox) being stored in tables.
+
+        if (Math.abs(value) < EXP_LO_DISTANCE_TO_ZERO) {
+            // Taking int part instead of rounding, which takes too long.
+            int i = (int)(value*EXP_LO_INDEXING);
+            double delta = value-i*(1.0/EXP_LO_INDEXING);
+            return MyTExp.expLoPosTab[i+EXP_LO_TAB_MID_INDEX]*(MyTExp.expLoNegTab[i+EXP_LO_TAB_MID_INDEX]+delta*(1+delta*(1.0/2+delta*(1.0/6+delta*(1.0/24+delta*(1.0/120))))));
+        } else {
+            return exp(value)-1;
+        }
+    }
+
+    /*
+     * logarithms
+     */
+
+    /**
+     * @param value A double value.
+     * @return Value logarithm (base e).
+     */
+    public static double log(double value) {
+        if (USE_JDK_MATH || (!USE_REDEFINED_LOG)) {
+            return StrictMath.log(value);
+        }
+        if (value > 0.0) {
+            if (value == Double.POSITIVE_INFINITY) {
+                return Double.POSITIVE_INFINITY;
+            }
+
+            // For normal values not close to 1.0, we use the following formula:
+            // log(value)
+            // = log(2^exponent*1.mantissa)
+            // = log(2^exponent) + log(1.mantissa)
+            // = exponent * log(2) + log(1.mantissa)
+            // = exponent * log(2) + log(1.mantissaApprox) + log(1.mantissa/1.mantissaApprox)
+            // = exponent * log(2) + log(1.mantissaApprox) + log(1+epsilon)
+            // = exponent * log(2) + log(1.mantissaApprox) + epsilon-epsilon^2/2+epsilon^3/3-epsilon^4/4+...
+            // with:
+            // 1.mantissaApprox <= 1.mantissa,
+            // log(1.mantissaApprox) in table,
+            // epsilon = (1.mantissa/1.mantissaApprox)-1
+            //
+            // To avoid bad relative error for small results,
+            // values close to 1.0 are treated aside, with the formula:
+            // log(x) = z*(2+z^2*((2.0/3)+z^2*((2.0/5))+z^2*((2.0/7))+...)))
+            // with z=(x-1)/(x+1)
+
+            double h;
+            if (value > 0.95) {
+                if (value < 1.14) {
+                    double z = (value-1.0)/(value+1.0);
+                    double z2 = z*z;
+                    return z*(2+z2*((2.0/3)+z2*((2.0/5)+z2*((2.0/7)+z2*((2.0/9)+z2*((2.0/11)))))));
+                }
+                h = 0.0;
+            } else if (value < DOUBLE_MIN_NORMAL) {
+                // Ensuring value is normal.
+                value *= TWO_POW_52;
+                // log(x*2^52)
+                // = log(x)-ln(2^52)
+                // = log(x)-52*ln(2)
+                h = -52*LOG_2;
+            } else {
+                h = 0.0;
+            }
+
+            int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
+            int valueExp = (valueBitsHi>>20)-MAX_DOUBLE_EXPONENT;
+            // Getting the first LOG_BITS bits of the mantissa.
+            int xIndex = ((valueBitsHi<<12)>>>(32-LOG_BITS));
+
+            // 1.mantissa/1.mantissaApprox - 1
+            double z = (value * twoPowNormalOrSubnormal(-valueExp)) * MyTLog.logXInvTab[xIndex] - 1;
+
+            z *= (1-z*((1.0/2)-z*((1.0/3))));
+
+            return h + valueExp * LOG_2 + (MyTLog.logXLogTab[xIndex] + z);
+
+        } else if (value == 0.0) {
+            return Double.NEGATIVE_INFINITY;
+        } else { // value < 0.0, or value is NaN
+            return Double.NaN;
+        }
+    }
+
+    /**
+     * Quick log, with a max relative error of about 1.9e-3
+     * for values in ]Double.MIN_NORMAL,+Infinity[, and
+     * worse accuracy outside this range.
+     *
+     * @param value A double value, in ]0,+Infinity[ (strictly positive and finite).
+     * @return Value logarithm (base e).
+     */
+    public static double logQuick(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.log(value);
+        }
+        /*
+         * Inverse of Schraudolph's method for exp, is very inaccurate near 1,
+         * and not that fast (even using floats), especially with added if's
+         * to deal with values near 1, so we don't use it, and use a simplified
+         * version of our log's redefined algorithm.
+         */
+
+        // Simplified version of log's redefined algorithm:
+        // log(value) ~= exponent * log(2) + log(1.mantissaApprox)
+
+        double h;
+        if (value > 0.87) {
+            if (value < 1.16) {
+                return 2.0 * (value-1.0)/(value+1.0);
+            }
+            h = 0.0;
+        } else if (value < DOUBLE_MIN_NORMAL) {
+            value *= TWO_POW_52;
+            h = -52*LOG_2;
+        } else {
+            h = 0.0;
+        }
+
+        int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
+        int valueExp = (valueBitsHi>>20)-MAX_DOUBLE_EXPONENT;
+        int xIndex = ((valueBitsHi<<12)>>>(32-LOG_BITS));
+
+        return h + valueExp * LOG_2 + MyTLog.logXLogTab[xIndex];
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value logarithm (base 10).
+     */
+    public static double log10(double value) {
+        if (USE_JDK_MATH || (!USE_REDEFINED_LOG)) {
+            return StrictMath.log10(value);
+        }
+        // INV_LOG_10 is < 1, but there is no risk of log(double)
+        // overflow (positive or negative) while the end result shouldn't,
+        // since log(Double.MIN_VALUE) and log(Double.MAX_VALUE) have
+        // magnitudes of just a few hundreds.
+        return log(value) * INV_LOG_10;
+    }
+
+    /**
+     * Much more accurate than log(1+value),
+     * for arguments (and results) close to zero.
+     *
+     * @param value A double value.
+     * @return Logarithm (base e) of (1+value).
+     */
+    public static double log1p(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.log1p(value);
+        }
+        if (false) {
+            // This also works. Simpler but a bit slower.
+            if (value == Double.POSITIVE_INFINITY) {
+                return Double.POSITIVE_INFINITY;
+            }
+            double valuePlusOne = 1+value;
+            if (valuePlusOne == 1.0) {
+                return value;
+            } else {
+                return log(valuePlusOne)*(value/(valuePlusOne-1.0));
+            }
+        }
+        if (value > -1.0) {
+            if (value == Double.POSITIVE_INFINITY) {
+                return Double.POSITIVE_INFINITY;
+            }
+
+            // ln'(x) = 1/x
+            // so
+            // log(x+epsilon) ~= log(x) + epsilon/x
+            //
+            // Let u be 1+value rounded:
+            // 1+value = u+epsilon
+            //
+            // log(1+value)
+            // = log(u+epsilon)
+            // ~= log(u) + epsilon/value
+            // We compute log(u) as done in log(double), and then add the corrective term.
+
+            double valuePlusOne = 1.0+value;
+            if (valuePlusOne == 1.0) {
+                return value;
+            } else if (Math.abs(value) < 0.15) {
+                double z = value/(value+2.0);
+                double z2 = z*z;
+                return z*(2+z2*((2.0/3)+z2*((2.0/5)+z2*((2.0/7)+z2*((2.0/9)+z2*((2.0/11)))))));
+            }
+
+            int valuePlusOneBitsHi = (int)(Double.doubleToRawLongBits(valuePlusOne)>>32) & 0x7FFFFFFF;
+            int valuePlusOneExp = (valuePlusOneBitsHi>>20)-MAX_DOUBLE_EXPONENT;
+            // Getting the first LOG_BITS bits of the mantissa.
+            int xIndex = ((valuePlusOneBitsHi<<12)>>>(32-LOG_BITS));
+
+            // 1.mantissa/1.mantissaApprox - 1
+            double z = (valuePlusOne * twoPowNormalOrSubnormal(-valuePlusOneExp)) * MyTLog.logXInvTab[xIndex] - 1;
+
+            z *= (1-z*((1.0/2)-z*(1.0/3)));
+
+            // Adding epsilon/valuePlusOne to z,
+            // with
+            // epsilon = value - (valuePlusOne-1)
+            // (valuePlusOne + epsilon ~= 1+value (not rounded))
+
+            return valuePlusOneExp * LOG_2 + MyTLog.logXLogTab[xIndex] + (z + (value - (valuePlusOne-1))/valuePlusOne);
+        } else if (value == -1.0) {
+            return Double.NEGATIVE_INFINITY;
+        } else { // value < -1.0, or value is NaN
+            return Double.NaN;
+        }
+    }
+
+    /*
+     * powers
+     */
+
+    /**
+     * 1e-13ish accuracy or better on whole double range.
+     *
+     * @param value A double value.
+     * @param power A power.
+     * @return value^power.
+     */
+    public static double pow(double value, double power) {
+        if (USE_JDK_MATH) {
+            return StrictMath.pow(value,power);
+        }
+        if (power == 0.0) {
+            return 1.0;
+        } else if (power == 1.0) {
+            return value;
+        }
+        if (value <= 0.0) {
+            // powerInfo: 0 if not integer, 1 if even integer, -1 if odd integer
+            int powerInfo;
+            if (Math.abs(power) >= (TWO_POW_52*2)) {
+                // The binary digit just before comma is outside mantissa,
+                // thus it is always 0: power is an even integer.
+                powerInfo = 1;
+            } else {
+                // If power's magnitude permits, we cast into int instead of into long,
+                // as it is faster.
+                if (Math.abs(power) <= (double)Integer.MAX_VALUE) {
+                    int powerAsInt = (int)power;
+                    if (power == (double)powerAsInt) {
+                        powerInfo = ((powerAsInt & 1) == 0) ? 1 : -1;
+                    } else { // power is not an integer (and not NaN, due to test against Integer.MAX_VALUE)
+                        powerInfo = 0;
+                    }
+                } else {
+                    long powerAsLong = (long)power;
+                    if (power == (double)powerAsLong) {
+                        powerInfo = ((powerAsLong & 1) == 0) ? 1 : -1;
+                    } else { // power is not an integer, or is NaN
+                        if (power != power) {
+                            return Double.NaN;
+                        }
+                        powerInfo = 0;
+                    }
+                }
+            }
+
+            if (value == 0.0) {
+                if (power < 0.0) {
+                    return (powerInfo < 0) ? 1/value : Double.POSITIVE_INFINITY;
+                } else { // power > 0.0 (0 and NaN cases already treated)
+                    return (powerInfo < 0) ? value : 0.0;
+                }
+            } else { // value < 0.0
+                if (value == Double.NEGATIVE_INFINITY) {
+                    if (powerInfo < 0) { // power odd integer
+                        return (power < 0.0) ? -0.0 : Double.NEGATIVE_INFINITY;
+                    } else { // power even integer, or not an integer
+                        return (power < 0.0) ? 0.0 : Double.POSITIVE_INFINITY;
+                    }
+                } else {
+                    return (powerInfo == 0) ? Double.NaN : powerInfo * exp(power*log(-value));
+                }
+            }
+        } else { // value > 0.0, or value is NaN
+            return exp(power*log(value));
+        }
+    }
+
+    /**
+     * Quick pow, with a max relative error of about 1e-2
+     * for value >= Double.MIN_NORMAL and 1e-10 < |value^power| < 1e10,
+     * of about 6e-2 for value >= Double.MIN_NORMAL and 1e-40 < |value^power| < 1e40,
+     * and worse accuracy otherwise.
+     *
+     * @param value A double value, in ]0,+Infinity[ (strictly positive and finite).
+     * @param power A double value.
+     * @return value^power.
+     */
+    public static double powQuick(double value, double power) {
+        if (USE_JDK_MATH) {
+            return StrictMath.pow(value,power);
+        }
+        return exp(power*logQuick(value));
+    }
+
+    /**
+     * This treatment is somehow accurate for low values of |power|,
+     * and for |power*getExponent(value)| < 1023 or so (to stay away
+     * from double extreme magnitudes (large and small)).
+     *
+     * @param value A double value.
+     * @param power A power.
+     * @return value^power.
+     */
+    public static double powFast(double value, int power) {
+        if (USE_JDK_MATH) {
+            return StrictMath.pow(value,power);
+        }
+        if (power < 3) {
+            if (power < 0) {
+                // Opposite of Integer.MIN_VALUE does not exist as int.
+                if (power == Integer.MIN_VALUE) {
+                    // Integer.MAX_VALUE = -(power+1)
+                    return 1.0/(powFast(value,Integer.MAX_VALUE) * value);
+                } else {
+                    return 1.0/powFast(value,-power);
+                }
+            } else {
+                // Here, power is in [0,2].
+                if (power == 2) { // Most common case first.
+                    return value * value;
+                } else if (power == 0) {
+                    return 1.0;
+                } else { // power == 1
+                    return value;
+                }
+            }
+        } else { // power >= 4
+            double oddRemains = 1.0;
+            // If power <= 5, faster to finish outside the loop.
+            while (power > 5) {
+                // Test if power is odd.
+                if ((power & 1) != 0) {
+                    oddRemains *= value;
+                }
+                value *= value;
+                power >>= 1; // power = power / 2
+            }
+            // Here, power is in [3,5].
+            if (power == 3) {
+                return oddRemains * value * value * value;
+            } else { // power in [4,5].
+                double v2 = value * value;
+                if (power == 4) {
+                    return oddRemains * v2 * v2;
+                } else { // power == 5
+                    return oddRemains * v2 * v2 * value;
+                }
+            }
+        }
+    }
+
+    /**
+     * @param value A float value.
+     * @return value*value.
+     */
+    public static float pow2(float value) {
+        return value*value;
+    }
+
+    /**
+     * @param value A double value.
+     * @return value*value.
+     */
+    public static double pow2(double value) {
+        return value*value;
+    }
+
+    /**
+     * @param value A float value.
+     * @return value*value*value.
+     */
+    public static float pow3(float value) {
+        return value*value*value;
+    }
+
+    /**
+     * @param value A double value.
+     * @return value*value*value.
+     */
+    public static double pow3(double value) {
+        return value*value*value;
+    }
+
+    /*
+     * roots
+     */
+
+    /**
+     * @param value A double value.
+     * @return Value square root.
+     */
+    public static double sqrt(double value) {
+        if (USE_JDK_MATH || (!USE_REDEFINED_SQRT)) {
+            return StrictMath.sqrt(value);
+        }
+        // See cbrt for comments, sqrt uses the same ideas.
+
+        if (!(value > 0.0)) { // value <= 0.0, or value is NaN
+            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
+                return (value < 0.0) ? Double.NaN : value;
+            } else {
+                return (value == 0.0) ? value : Double.NaN;
+            }
+        } else if (value == Double.POSITIVE_INFINITY) {
+            return Double.POSITIVE_INFINITY;
+        }
+
+        double h;
+        if (value < DOUBLE_MIN_NORMAL) {
+            value *= TWO_POW_52;
+            h = 2*TWO_POW_N26;
+        } else {
+            h = 2.0;
+        }
+
+        int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
+        int valueExponentIndex = (valueBitsHi>>20)+(-MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT);
+        int xIndex = ((valueBitsHi<<12)>>>(32-SQRT_LO_BITS));
+
+        double result = MyTSqrt.sqrtXSqrtHiTab[valueExponentIndex] * MyTSqrt.sqrtXSqrtLoTab[xIndex];
+        double slope = MyTSqrt.sqrtSlopeHiTab[valueExponentIndex] * MyTSqrt.sqrtSlopeLoTab[xIndex];
+        value *= 0.25;
+
+        result += (value - result * result) * slope;
+        result += (value - result * result) * slope;
+        return h*(result + (value - result * result) * slope);
+    }
+
+    /**
+     * Quick sqrt, with with a max relative error of about 3.41e-2
+     * for values in [Double.MIN_NORMAL,Double.MAX_VALUE], and worse
+     * accuracy outside this range.
+     *
+     * @param value A double value.
+     * @return Value square root.
+     */
+    public static double sqrtQuick(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.sqrt(value);
+        }
+        final long bits = Double.doubleToRawLongBits(value);
+        /*
+         * Constant determined empirically, using a random-based metaheuristic.
+         * Should be possible to find a better one.
+         */
+        return Double.longBitsToDouble((bits+4606859074900000000L)>>>1);
+    }
+
+    /**
+     * Quick inverse of square root, with a max relative error of about 3.44e-2
+     * for values in [Double.MIN_NORMAL,Double.MAX_VALUE], and worse accuracy
+     * outside this range.
+     *
+     * This implementation uses zero step of Newton's method.
+     * Here are the max relative errors on [Double.MIN_NORMAL,Double.MAX_VALUE]
+     * depending on number of steps, if you want to copy-paste this code
+     * and use your own number:
+     * n=0: about 3.44e-2
+     * n=1: about 1.75e-3
+     * n=2: about 4.6e-6
+     * n=3: about 3.17e-11
+     * n=4: about 3.92e-16
+     * n=5: about 3.03e-16
+     *
+     * @param value A double value.
+     * @return Inverse of value square root.
+     */
+    public static double invSqrtQuick(double value) {
+        if (USE_JDK_MATH) {
+            return 1/StrictMath.sqrt(value);
+        }
+        /*
+         * http://en.wikipedia.org/wiki/Fast_inverse_square_root
+         */
+        if (false) {
+            // With one Newton step (much slower than
+            // 1/Math.sqrt(double) if not optimized).
+            final double halfInitial = value * 0.5;
+            long bits = Double.doubleToRawLongBits(value);
+            // If n=0, 6910474759270000000L might be better (3.38e-2 max relative error).
+            bits = 0x5FE6EB50C7B537A9L - (bits>>1);
+            value = Double.longBitsToDouble(bits);
+            value = value * (1.5 - halfInitial * value * value); // Newton step, can repeat.
+            return value;
+        } else {
+            return Double.longBitsToDouble(0x5FE6EB50C7B537A9L - (Double.doubleToRawLongBits(value)>>1));
+        }
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value cubic root.
+     */
+    public static double cbrt(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.cbrt(value);
+        }
+        double h;
+        if (value < 0.0) {
+            if (value == Double.NEGATIVE_INFINITY) {
+                return Double.NEGATIVE_INFINITY;
+            }
+            value = -value;
+            // Making sure value is normal.
+            if (value < DOUBLE_MIN_NORMAL) {
+                value *= (TWO_POW_52*TWO_POW_26);
+                // h = <result_sign> * <result_multiplicator_to_avoid_overflow> / <cbrt(value_multiplicator_to_avoid_subnormal)>
+                h = -2*TWO_POW_N26;
+            } else {
+                h = -2.0;
+            }
+        } else {
+            if (!(value < Double.POSITIVE_INFINITY)) { // value is +Infinity, or value is NaN
+                return value;
+            }
+            // Making sure value is normal.
+            if (value < DOUBLE_MIN_NORMAL) {
+                if (value == 0.0) {
+                    // cbrt(0.0) = 0.0, cbrt(-0.0) = -0.0
+                    return value;
+                }
+                value *= (TWO_POW_52*TWO_POW_26);
+                h = 2*TWO_POW_N26;
+            } else {
+                h = 2.0;
+            }
+        }
+
+        // Normal value is (2^<value exponent> * <a value in [1,2[>).
+        // First member cubic root is computed, and multiplied with an approximation
+        // of the cubic root of the second member, to end up with a good guess of
+        // the result before using Newton's (or Archimedes's) method.
+        // To compute the cubic root approximation, we use the formula "cbrt(value) = cbrt(x) * cbrt(value/x)",
+        // choosing x as close to value as possible but inferior to it, so that cbrt(value/x) is close to 1
+        // (we could iterate on this method, using value/x as new value for each iteration,
+        // but finishing with Newton's method is faster).
+
+        // Shift and cast into an int, which overall is faster than working with a long.
+        int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
+        int valueExponentIndex = (valueBitsHi>>20)+(-MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT);
+        // Getting the first CBRT_LO_BITS bits of the mantissa.
+        int xIndex = ((valueBitsHi<<12)>>>(32-CBRT_LO_BITS));
+        double result = MyTCbrt.cbrtXCbrtHiTab[valueExponentIndex] * MyTCbrt.cbrtXCbrtLoTab[xIndex];
+        double slope = MyTCbrt.cbrtSlopeHiTab[valueExponentIndex] * MyTCbrt.cbrtSlopeLoTab[xIndex];
+
+        // Lowering values to avoid overflows when using Newton's method
+        // (we will then just have to return twice the result).
+        // result^3 = value
+        // (result/2)^3 = value/8
+        value *= 0.125;
+        // No need to divide result here, as division is factorized in result computation tables.
+        // result *= 0.5;
+
+        // Newton's method, looking for y = x^(1/p):
+        // y(n) = y(n-1) + (x-y(n-1)^p) * slope(y(n-1))
+        // y(n) = y(n-1) + (x-y(n-1)^p) * (1/p)*(x(n-1)^(1/p-1))
+        // y(n) = y(n-1) + (x-y(n-1)^p) * (1/p)*(x(n-1)^((1-p)/p))
+        // with x(n-1)=y(n-1)^p, i.e.:
+        // y(n) = y(n-1) + (x-y(n-1)^p) * (1/p)*(y(n-1)^(1-p))
+        //
+        // For p=3:
+        // y(n) = y(n-1) + (x-y(n-1)^3) * (1/(3*y(n-1)^2))
+
+        // To save time, we don't recompute the slope between Newton's method steps,
+        // as initial slope is good enough for a few iterations.
+        //
+        // NB: slope = 1/(3*trueResult*trueResult)
+        //     As we have result = trueResult/2 (to avoid overflows), we have:
+        //     slope = 4/(3*result*result)
+        //           = (4/3)*resultInv*resultInv
+        //     with newResultInv = 1/newResult
+        //                       = 1/(oldResult+resultDelta)
+        //                       = (oldResultInv)*1/(1+resultDelta/oldResult)
+        //                       = (oldResultInv)*1/(1+resultDelta*oldResultInv)
+        //                      ~= (oldResultInv)*(1-resultDelta*oldResultInv)
+        //     ===> Successive slopes could be computed without division, if needed,
+        //          by computing resultInv (instead of slope right away) and retrieving
+        //          slopes from it.
+
+        result += (value - result * result * result) * slope;
+        result += (value - result * result * result) * slope;
+        return h*(result + (value - result * result * result) * slope);
+    }
+
+    /**
+     * @return sqrt(x^2+y^2) without intermediate overflow or underflow.
+     */
+    public static double hypot(double x, double y) {
+        if (USE_JDK_MATH) {
+            return StrictMath.hypot(x,y);
+        }
+        x = Math.abs(x);
+        y = Math.abs(y);
+        // Ensuring x <= y.
+        if (y < x) {
+            double a = x;
+            x = y;
+            y = a;
+        } else if (!(y >= x)) { // Testing if we have some NaN.
+            return hypot_NaN(x, y);
+        }
+
+        if (y-x == y) {
+            // x too small to subtract from y.
+            return y;
+        } else {
+            double factor;
+            if (y > HYPOT_MAX_MAG) {
+                // y is too large: scaling down.
+                x *= (1/HYPOT_FACTOR);
+                y *= (1/HYPOT_FACTOR);
+                factor = HYPOT_FACTOR;
+            } else if (x < (1/HYPOT_MAX_MAG)) {
+                // x is too small: scaling up.
+                x *= HYPOT_FACTOR;
+                y *= HYPOT_FACTOR;
+                factor = (1/HYPOT_FACTOR);
+            } else {
+                factor = 1.0;
+            }
+            return factor * sqrt(x*x+y*y);
+        }
+    }
+
+    /**
+     * @return sqrt(x^2+y^2+z^2) without intermediate overflow or underflow.
+     */
+    public static double hypot(double x, double y, double z) {
+        if (USE_JDK_MATH) {
+            // No simple JDK equivalent.
+        }
+        x = Math.abs(x);
+        y = Math.abs(y);
+        z = Math.abs(z);
+        /*
+         * Considering that z magnitude is the most likely to be the smaller,
+         * hence ensuring z <= y <= x, and not x <= y <= z, for less swaps.
+         */
+        // Ensuring z <= y.
+        if (z > y) {
+            // y < z: swapping y and z
+            double a = z;
+            z = y;
+            y = a;
+        } else if (!(z <= y)) { // Testing if y or z is NaN.
+            return hypot_NaN(x, y, z);
+        }
+        // Ensuring y <= x.
+        if (z > x) {
+            // x < z <= y: moving x
+            double oldZ = z;
+            z = x;
+            double oldY = y;
+            y = oldZ;
+            x = oldY;
+        } else if (y > x) {
+            // z <= x < y: swapping x and y
+            double a = y;
+            y = x;
+            x = a;
+        } else if (x != x) { // Testing if x is NaN.
+            return hypot_NaN(x, y, z);
+        }
+
+        if (x-y == x) {
+            // y, hence z, too small to subtract from x.
+            return x;
+        } else if (y-z == y) {
+            // z too small to subtract from y, hence x.
+            double factor;
+            if (x > HYPOT_MAX_MAG) {
+                // x is too large: scaling down.
+                x *= (1/HYPOT_FACTOR);
+                y *= (1/HYPOT_FACTOR);
+                factor = HYPOT_FACTOR;
+            } else if (y < (1/HYPOT_MAX_MAG)) {
+                // y is too small: scaling up.
+                x *= HYPOT_FACTOR;
+                y *= HYPOT_FACTOR;
+                factor = (1/HYPOT_FACTOR);
+            } else {
+                factor = 1.0;
+            }
+            return factor * sqrt(x*x+y*y);
+        } else {
+            double factor;
+            if (x > HYPOT_MAX_MAG) {
+                // x is too large: scaling down.
+                x *= (1/HYPOT_FACTOR);
+                y *= (1/HYPOT_FACTOR);
+                z *= (1/HYPOT_FACTOR);
+                factor = HYPOT_FACTOR;
+            } else if (z < (1/HYPOT_MAX_MAG)) {
+                // z is too small: scaling up.
+                x *= HYPOT_FACTOR;
+                y *= HYPOT_FACTOR;
+                z *= HYPOT_FACTOR;
+                factor = (1/HYPOT_FACTOR);
+            } else {
+                factor = 1.0;
+            }
+            // Adding smaller magnitudes together first.
+            return factor * sqrt(x*x+(y*y+z*z));
+        }
+    }
+
+    /*
+     * close values
+     */
+
+    /**
+     * @param value A float value.
+     * @return Floor of value.
+     */
+    public static float floor(float value) {
+        final int exponent = getExponent(value);
+        if (exponent < 0) {
+            // abs(value) < 1.
+            if (value < 0.0f) {
+                return -1.0f;
+            } else {
+                // 0.0f, or -0.0f if value is -0.0f
+                return 0.0f * value;
+            }
+        } else if (exponent < 23) {
+            // A bit faster than using casts.
+            final int bits = Float.floatToRawIntBits(value);
+            final int anteCommaBits = bits & (0xFF800000>>exponent);
+            if ((value < 0.0f) && (anteCommaBits != bits)) {
+                return Float.intBitsToFloat(anteCommaBits) - 1.0f;
+            } else {
+                return Float.intBitsToFloat(anteCommaBits);
+            }
+        } else {
+            // +-Infinity, NaN, or a mathematical integer.
+            return value;
+        }
+    }
+
+    /**
+     * @param value A double value.
+     * @return Floor of value.
+     */
+    public static double floor(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.floor(value);
+        }
+        if (ANTI_SLOW_CASTS) {
+            double valueAbs = Math.abs(value);
+            if (valueAbs <= (double)Integer.MAX_VALUE) {
+                if (value > 0.0) {
+                    return (double)(int)value;
+                } else if (value < 0.0) {
+                    double anteCommaDigits = (double)(int)value;
+                    if (value != anteCommaDigits) {
+                        return anteCommaDigits - 1.0;
+                    } else {
+                        return anteCommaDigits;
+                    }
+                } else { // value is +-0.0 (not NaN due to test against Integer.MAX_VALUE)
+                    return value;
+                }
+            } else if (valueAbs < TWO_POW_52) {
+                // We split the value in two:
+                // high part, which is a mathematical integer,
+                // and the rest, for which we can get rid of the
+                // post comma digits by casting into an int.
+                double highPart = ((int)(value * TWO_POW_N26)) * TWO_POW_26;
+                if (value > 0.0) {
+                    return highPart + (double)((int)(value - highPart));
+                } else {
+                    double anteCommaDigits = highPart + (double)((int)(value - highPart));
+                    if (value != anteCommaDigits) {
+                        return anteCommaDigits - 1.0;
+                    } else {
+                        return anteCommaDigits;
+                    }
+                }
+            } else { // abs(value) >= 2^52, or value is NaN
+                return value;
+            }
+        } else {
+            final int exponent = getExponent(value);
+            if (exponent < 0) {
+                // abs(value) < 1.
+                if (value < 0.0) {
+                    return -1.0;
+                } else {
+                    // 0.0, or -0.0 if value is -0.0
+                    return 0.0 * value;
+                }
+            } else if (exponent < 52) {
+                // A bit faster than working on bits.
+                final long matIntPart = (long)value;
+                final double matIntToValue = value-(double)matIntPart;
+                if (matIntToValue >= 0.0) {
+                    return (double)matIntPart;
+                } else {
+                    return (double)(matIntPart - 1);
+                }
+            } else {
+                // +-Infinity, NaN, or a mathematical integer.
+                return value;
+            }
+        }
+    }
+
+    /**
+     * @param value A float value.
+     * @return Ceiling of value.
+     */
+    public static float ceil(float value) {
+        return -floor(-value);
+    }
+
+    /**
+     * @param value A double value.
+     * @return Ceiling of value.
+     */
+    public static double ceil(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.ceil(value);
+        }
+        return -floor(-value);
+    }
+
+    /**
+     * Might have different semantics than StrictMath.round(float),
+     * see bugs 6430675 and 8010430.
+     *
+     * @param value A double value.
+     * @return Value rounded to nearest int, choosing superior int in case two
+     *         are equally close (i.e. rounding-up).
+     */
+    public static int round(float value) {
+        /*
+         * Not delegating to JDK, because we want delegation to provide
+         * at least as good results, and some supported JDK versions
+         * have bugged round() methods.
+         */
+        // Algorithm by Dmitry Nadezhin (but replaced an if by a multiply)
+        // (http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-August/020247.html).
+        final int bits = Float.floatToRawIntBits(value);
+        final int biasedExp = ((bits>>23)&0xFF);
+        // Shift to get rid of bits past comma except first one: will need to
+        // 1-shift to the right to end up with correct magnitude.
+        final int shift = (23 - 1 + MAX_FLOAT_EXPONENT) - biasedExp;
+        if ((shift & -32) == 0) {
+            int bitsSignum = (((bits >> 31) << 1) + 1);
+            // shift in [0,31], so unbiased exp in [-9,22].
+            int extendedMantissa = (0x00800000 | (bits & 0x007FFFFF)) * bitsSignum;
+            // If value is positive and first bit past comma is 0, rounding
+            // to lower integer, else to upper one, which is what "+1" and
+            // then ">>1" do.
+            return ((extendedMantissa >> shift) + 1) >> 1;
+        } else {
+            // +-Infinity, NaN, or a mathematical integer, or tiny.
+            if (false && ANTI_SLOW_CASTS) { // not worth it
+                if (Math.abs(value) >= -(float)Integer.MIN_VALUE) {
+                    // +-Infinity or a mathematical integer (mostly) out of int range.
+                    return (value < 0.0) ? Integer.MIN_VALUE : Integer.MAX_VALUE;
+                }
+                // NaN or a mathematical integer (mostly) in int range.
+            }
+            return (int)value;
+        }
+    }
+
+    /**
+     * Might have different semantics than StrictMath.round(double),
+     * see bugs 6430675 and 8010430.
+     *
+     * @param value A double value.
+     * @return Value rounded to nearest long, choosing superior long in case two
+     *         are equally close (i.e. rounding-up).
+     */
+    public static long round(double value) {
+        /*
+         * Not delegating to JDK, because we want delegation to provide
+         * at least as good results, and some supported JDK versions
+         * have bugged round() methods.
+         */
+        final long bits = Double.doubleToRawLongBits(value);
+        final int biasedExp = (((int)(bits>>52))&0x7FF);
+        // Shift to get rid of bits past comma except first one: will need to
+        // 1-shift to the right to end up with correct magnitude.
+        final int shift = (52 - 1 + MAX_DOUBLE_EXPONENT) - biasedExp;
+        if ((shift & -64) == 0) {
+            long bitsSignum = (((bits >> 63) << 1) + 1);
+            // shift in [0,63], so unbiased exp in [-12,51].
+            long extendedMantissa = (0x0010000000000000L | (bits & 0x000FFFFFFFFFFFFFL)) * bitsSignum;
+            // If value is positive and first bit past comma is 0, rounding
+            // to lower integer, else to upper one, which is what "+1" and
+            // then ">>1" do.
+            return ((extendedMantissa >> shift) + 1L) >> 1;
+        } else {
+            // +-Infinity, NaN, or a mathematical integer, or tiny.
+            if (ANTI_SLOW_CASTS) {
+                if (Math.abs(value) >= -(double)Long.MIN_VALUE) {
+                    // +-Infinity or a mathematical integer (mostly) out of long range.
+                    return (value < 0.0) ? Long.MIN_VALUE : Long.MAX_VALUE;
+                }
+                // NaN or a mathematical integer (mostly) in long range.
+            }
+            return (long)value;
+        }
+    }
+
+    /**
+     * @param value A float value.
+     * @return Value rounded to nearest int, choosing even int in case two
+     *         are equally close.
+     */
+    public static int roundEven(float value) {
+        final int sign = signFromBit(value);
+        value = Math.abs(value);
+        if (ANTI_SLOW_CASTS) {
+            if (value < TWO_POW_23_F) {
+                // Getting rid of post-comma bits.
+                value = ((value + TWO_POW_23_F) - TWO_POW_23_F);
+                return sign * (int)value;
+            } else if (value < (float)Integer.MAX_VALUE) { // "<=" doesn't work, because of float precision
+                // value is in [-Integer.MAX_VALUE,Integer.MAX_VALUE]
+                return sign * (int)value;
+            }
+        } else {
+            if (value < TWO_POW_23_F) {
+                // Getting rid of post-comma bits.
+                value = ((value + TWO_POW_23_F) - TWO_POW_23_F);
+            }
+        }
+        return (int)(sign * value);
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value rounded to nearest long, choosing even long in case two
+     *         are equally close.
+     */
+    public static long roundEven(double value) {
+        final int sign = (int)signFromBit(value);
+        value = Math.abs(value);
+        if (value < TWO_POW_52) {
+            // Getting rid of post-comma bits.
+            value = ((value + TWO_POW_52) - TWO_POW_52);
+        }
+        if (ANTI_SLOW_CASTS) {
+            if (value <= (double)Integer.MAX_VALUE) {
+                // value is in [-Integer.MAX_VALUE,Integer.MAX_VALUE]
+                return sign * (int)value;
+            }
+        }
+        return (long)(sign * value);
+    }
+
+    /**
+     * @param value A float value.
+     * @return The float mathematical integer closest to the specified value,
+     *         choosing even one if two are equally close, or respectively
+     *         NaN, +-Infinity or +-0.0f if the value is any of these.
+     */
+    public static float rint(float value) {
+        final int sign = signFromBit(value);
+        value = Math.abs(value);
+        if (value < TWO_POW_23_F) {
+            // Getting rid of post-comma bits.
+            value = ((TWO_POW_23_F + value ) - TWO_POW_23_F);
+        }
+        // Restoring original sign.
+        return sign * value;
+    }
+
+    /**
+     * @param value A double value.
+     * @return The double mathematical integer closest to the specified value,
+     *         choosing even one if two are equally close, or respectively
+     *         NaN, +-Infinity or +-0.0 if the value is any of these.
+     */
+    public static double rint(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.rint(value);
+        }
+        final int sign = (int)signFromBit(value);
+        value = Math.abs(value);
+        if (value < TWO_POW_52) {
+            // Getting rid of post-comma bits.
+            value = ((TWO_POW_52 + value ) - TWO_POW_52);
+        }
+        // Restoring original sign.
+        return sign * value;
+    }
+
+    /*
+     * close int values
+     *
+     * Never delegating to JDK for these methods, for we should always
+     * be faster and exact, and JDK doesn't exactly have such methods.
+     */
+
+    /**
+     * @param value A double value.
+     * @return Floor of value as int, or closest int if floor is out
+     *         of int range, or 0 if value is NaN.
+     */
+    public static int floorToInt(double value) {
+        int valueInt = (int) value;
+        if (value < 0.0) {
+            if (value == (double) valueInt) {
+                return valueInt;
+            } else {
+                if (valueInt == Integer.MIN_VALUE) {
+                    return valueInt;
+                } else {
+                    return valueInt - 1;
+                }
+            }
+        } else { // >= 0 or NaN.
+            return valueInt;
+        }
+    }
+
+    /**
+     * @param value A double value.
+     * @return Ceiling of value as int, or closest int if ceiling is out
+     *         of int range, or 0 if value is NaN.
+     */
+    public static int ceilToInt(double value) {
+        int valueInt = (int) value;
+        if (value > 0.0) {
+            if (value == (double) valueInt) {
+                return valueInt;
+            } else {
+                if (valueInt == Integer.MAX_VALUE) {
+                    return valueInt;
+                } else {
+                    return valueInt + 1;
+                }
+            }
+        } else { // <= 0 or NaN.
+            return valueInt;
+        }
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value rounded to nearest int, choosing superior int in case two
+     *         are equally close (i.e. rounding-up).
+     */
+    public static int roundToInt(double value) {
+        /*
+         * We don't gain much by reimplementing rounding, except for
+         * pathologically large values, which should not be a common case
+         * when dealing with ints, so we just use round(double).
+         */
+        return NumbersUtils.toInt(round(value));
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value rounded to nearest int, choosing even int in case two
+     *         are equally close.
+     */
+    public static int roundEvenToInt(double value) {
+        final int sign = (int)signFromBit(value);
+        value = Math.abs(value);
+        /*
+         * Applying the post-comma bits removal logic even if value is out
+         * of int range, to avoid a test, for it doesn't mess up the result,
+         * and we want to optimize for the case of values in int range.
+         */
+        value = ((value + TWO_POW_52) - TWO_POW_52);
+        return (int)(sign * value);
+    }
+
+    /*
+     * ranges
+     */
+
+    /**
+     * @param min A float value.
+     * @param max A float value.
+     * @param value A float value.
+     * @return min if value < min, max if value > max, value otherwise.
+     */
+    public static float toRange(float min, float max, float value) {
+        return NumbersUtils.toRange(min, max, value);
+    }
+
+    /**
+     * @param min A double value.
+     * @param max A double value.
+     * @param value A double value.
+     * @return min if value < min, max if value > max, value otherwise.
+     */
+    public static double toRange(double min, double max, double value) {
+        return NumbersUtils.toRange(min, max, value);
+    }
+
+    /*
+     * binary operators (/,%)
+     */
+
+    /**
+     * Returns dividend - divisor * n, where n is the mathematical integer
+     * closest to dividend/divisor.
+     * If dividend/divisor is equally close to surrounding integers,
+     * we choose n to be the integer of smallest magnitude, which makes
+     * this treatment differ from StrictMath.IEEEremainder(double,double),
+     * where n is chosen to be the even integer.
+     * Note that the choice of n is not done considering the double
+     * approximation of dividend/divisor, because it could cause
+     * result to be outside [-|divisor|/2,|divisor|/2] range.
+     * The practical effect is that if multiple results would be possible,
+     * we always choose the result that is the closest to (and has the same
+     * sign as) the dividend.
+     * Ex. :
+     * - for (-3.0,2.0), this method returns -1.0,
+     *   whereas StrictMath.IEEEremainder returns 1.0.
+     * - for (-5.0,2.0), both this method and StrictMath.IEEEremainder return -1.0.
+     *
+     * If the remainder is zero, its sign is the same as the sign of the first argument.
+     * If either argument is NaN, or the first argument is infinite,
+     * or the second argument is positive zero or negative zero,
+     * then the result is NaN.
+     * If the first argument is finite and the second argument is
+     * infinite, then the result is the same as the first argument.
+     *
+     * NB:
+     * - Modulo operator (%) returns a value in ]-|divisor|,|divisor|[,
+     *   which sign is the same as dividend.
+     * - As for modulo operator, the sign of the divisor has no effect on the result.
+     * - On some architecture, % operator has been observed to return NaN
+     *   for some subnormal values of divisor, when dividend exponent is 1023,
+     *   which impacts the correctness of this method.
+     *
+     * @param dividend Dividend.
+     * @param divisor Divisor.
+     * @return Remainder of dividend/divisor, i.e. a value in [-|divisor|/2,|divisor|/2].
+     */
+    public static double remainder(double dividend, double divisor) {
+        if (Double.isInfinite(divisor)) {
+            if (Double.isInfinite(dividend)) {
+                return Double.NaN;
+            } else {
+                return dividend;
+            }
+        }
+        double value = dividend % divisor;
+        if (Math.abs(value+value) > Math.abs(divisor)) {
+            return value + ((value > 0.0) ? -Math.abs(divisor) : Math.abs(divisor));
+        } else {
+            return value;
+        }
+    }
+
+    /**
+     * @param angle Angle in radians.
+     * @return The same angle, in radians, but in [-PI,PI].
+     */
+    public static double normalizeMinusPiPi(double angle) {
+        // Not modifying values in output range.
+        if ((angle >= -Math.PI) && (angle <= Math.PI)) {
+            return angle;
+        }
+        return remainderTwoPi(angle);
+    }
+
+    /**
+     * Not accurate for large values.
+     *
+     * @param angle Angle in radians.
+     * @return The same angle, in radians, but in [-PI,PI].
+     */
+    public static double normalizeMinusPiPiFast(double angle) {
+        // Not modifying values in output range.
+        if ((angle >= -Math.PI) && (angle <= Math.PI)) {
+            return angle;
+        }
+        return remainderTwoPiFast(angle);
+    }
+
+    /**
+     * @param angle Angle in radians.
+     * @return The same angle, in radians, but in [0,2*PI].
+     */
+    public static double normalizeZeroTwoPi(double angle) {
+        // Not modifying values in output range.
+        if ((angle >= 0.0) && (angle <= 2*Math.PI)) {
+            return angle;
+        }
+        angle = remainderTwoPi(angle);
+        if (angle < 0.0) {
+            // LO then HI is theoretically better (when starting near 0).
+            return (angle + TWOPI_LO) + TWOPI_HI;
+        } else {
+            return angle;
+        }
+    }
+
+    /**
+     * Not accurate for large values.
+     *
+     * @param angle Angle in radians.
+     * @return The same angle, in radians, but in [0,2*PI].
+     */
+    public static double normalizeZeroTwoPiFast(double angle) {
+        // Not modifying values in output range.
+        if ((angle >= 0.0) && (angle <= 2*Math.PI)) {
+            return angle;
+        }
+        angle = remainderTwoPiFast(angle);
+        if (angle < 0.0) {
+            // LO then HI is theoretically better (when starting near 0).
+            return (angle + TWOPI_LO) + TWOPI_HI;
+        } else {
+            return angle;
+        }
+    }
+
+    /**
+     * @param angle Angle in radians.
+     * @return Angle value modulo PI, in radians, in [-PI/2,PI/2].
+     */
+    public static double normalizeMinusHalfPiHalfPi(double angle) {
+        // Not modifying values in output range.
+        if ((angle >= -Math.PI/2) && (angle <= Math.PI/2)) {
+            return angle;
+        }
+        return remainderPi(angle);
+    }
+
+    /**
+     * Not accurate for large values.
+     *
+     * @param angle Angle in radians.
+     * @return Angle value modulo PI, in radians, in [-PI/2,PI/2].
+     */
+    public static double normalizeMinusHalfPiHalfPiFast(double angle) {
+        // Not modifying values in output range.
+        if ((angle >= -Math.PI/2) && (angle <= Math.PI/2)) {
+            return angle;
+        }
+        return remainderPiFast(angle);
+    }
+
+    /*
+     * floating points utils
+     */
+
+    /**
+     * @param value A float value.
+     * @return true if the specified value is NaN or +-Infinity, false otherwise.
+     */
+    public static boolean isNaNOrInfinite(float value) {
+        return NumbersUtils.isNaNOrInfinite(value);
+    }
+
+    /**
+     * @param value A double value.
+     * @return true if the specified value is NaN or +-Infinity, false otherwise.
+     */
+    public static boolean isNaNOrInfinite(double value) {
+        return NumbersUtils.isNaNOrInfinite(value);
+    }
+
+    /**
+     * @param value A float value.
+     * @return Value unbiased exponent.
+     */
+    public static int getExponent(float value) {
+        return ((Float.floatToRawIntBits(value)>>23)&0xFF)-MAX_FLOAT_EXPONENT;
+    }
+
+    /**
+     * @param value A double value.
+     * @return Value unbiased exponent.
+     */
+    public static int getExponent(double value) {
+        return (((int)(Double.doubleToRawLongBits(value)>>52))&0x7FF)-MAX_DOUBLE_EXPONENT;
+    }
+
+    /**
+     * @param value A float value.
+     * @return -1.0f if the specified value is < 0, 1.0f if it is > 0,
+     *         and the value itself if it is NaN or +-0.0f.
+     */
+    public static float signum(float value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.signum(value);
+        }
+        if ((value == 0.0f) || (value != value)) {
+            return value;
+        }
+        return (float)signFromBit(value);
+    }
+
+    /**
+     * @param value A double value.
+     * @return -1.0 if the specified value is < 0, 1.0 if it is > 0,
+     *         and the value itself if it is NaN or +-0.0.
+     */
+    public static double signum(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.signum(value);
+        }
+        if ((value == 0.0) || (value != value)) {
+            return value;
+        }
+        if (ANTI_SLOW_CASTS) {
+            return (double)(int)signFromBit(value);
+        } else {
+            return (double)signFromBit(value);
+        }
+    }
+
+    /**
+     * @param value A float value.
+     * @return -1 if sign bit is 1, 1 if sign bit is 0.
+     */
+    public static int signFromBit(float value) {
+        return ((Float.floatToRawIntBits(value)>>30)|1);
+    }
+
+    /**
+     * @param value A double value.
+     * @return -1 if sign bit is 1, 1 if sign bit is 0.
+     */
+    public static long signFromBit(double value) {
+        // Returning a long, to avoid useless cast into int.
+        return ((Double.doubleToRawLongBits(value)>>62)|1);
+    }
+
+    /**
+     * A sign of NaN is interpreted as positive.
+     *
+     * @param magnitude A float value.
+     * @param sign A float value.
+     * @return A value with the magnitude of the first argument, and the sign
+     *         of the second argument.
+     */
+    public static float copySign(float magnitude, float sign) {
+        return Float.intBitsToFloat(
+                (Float.floatToRawIntBits((sign != sign) ? 1.0f : sign) & Integer.MIN_VALUE)
+                | (Float.floatToRawIntBits(magnitude) & Integer.MAX_VALUE));
+    }
+
+    /**
+     * A sign of NaN is interpreted as positive.
+     *
+     * @param magnitude A double value.
+     * @param sign A double value.
+     * @return A value with the magnitude of the first argument, and the sign
+     *         of the second argument.
+     */
+    public static double copySign(double magnitude, double sign) {
+        return Double.longBitsToDouble(
+                (Double.doubleToRawLongBits((sign != sign) ? 1.0 : sign) & Long.MIN_VALUE)
+                | (Double.doubleToRawLongBits(magnitude) & Long.MAX_VALUE));
+    }
+
+    /**
+     * The ULP (Unit in the Last Place) is the distance to the next value larger
+     * in magnitude.
+     *
+     * @param value A float value.
+     * @return The size of an ulp of the specified value, or Float.MIN_VALUE
+     *         if it is +-0.0f, or +Infinity if it is +-Infinity, or NaN
+     *         if it is NaN.
+     */
+    public static float ulp(float value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.ulp(value);
+        }
+        /*
+         * Look-up table not really worth it in micro-benchmark,
+         * so should be worse with cache-misses.
+         */
+        final int exponent = getExponent(value);
+        if (exponent >= (MIN_FLOAT_NORMAL_EXPONENT+23)) {
+            if (exponent == MAX_FLOAT_EXPONENT+1) {
+                // NaN or +-Infinity
+                return Math.abs(value);
+            }
+            // normal: returning 2^(exponent-23)
+            return Float.intBitsToFloat((exponent+(MAX_FLOAT_EXPONENT-23))<<23);
+        } else {
+            if (exponent == MIN_FLOAT_NORMAL_EXPONENT-1) {
+                // +-0.0f or subnormal
+                return Float.MIN_VALUE;
+            }
+            // subnormal result
+            return Float.intBitsToFloat(1<<(exponent-MIN_FLOAT_NORMAL_EXPONENT));
+        }
+    }
+
+    /**
+     * The ULP (Unit in the Last Place) is the distance to the next value larger
+     * in magnitude.
+     *
+     * @param value A double value.
+     * @return The size of an ulp of the specified value, or Double.MIN_VALUE
+     *         if it is +-0.0, or +Infinity if it is +-Infinity, or NaN
+     *         if it is NaN.
+     */
+    public static double ulp(double value) {
+        if (USE_JDK_MATH) {
+            return StrictMath.ulp(value);
+        }
+        /*
+         * Look-up table not really worth it in micro-benchmark,
+         * so should be worse with cache-misses.
+         */
+        final int exponent = getExponent(value);
+        if (exponent >= (MIN_DOUBLE_NORMAL_EXPONENT+52)) {
+            if (exponent == MAX_DOUBLE_EXPONENT+1) {
+                // NaN or +-Infinity
+                return Math.abs(value);
+            }
+            // normal: returning 2^(exponent-52)
+            return Double.longBitsToDouble((exponent+(MAX_DOUBLE_EXPONENT-52L))<<52);
+        } else {
+            if (exponent == MIN_DOUBLE_NORMAL_EXPONENT-1) {
+                // +-0.0f or subnormal
+                return Double.MIN_VALUE;
+            }
+            // subnormal result
+            return Double.longBitsToDouble(1L<<(exponent-MIN_DOUBLE_NORMAL_EXPONENT));
+        }
+    }
+
+    /**
+     * If both arguments are +-0.0(f), (float)direction is returned.
+     *
+     * If both arguments are +Infinity or -Infinity,
+     * respectively +Infinity or -Infinity is returned.
+     *
+     * @param start A float value.
+     * @param direction A double value.
+     * @return The float adjacent to start towards direction, considering that
+     *         +(-)Float.MIN_VALUE is adjacent to +(-)0.0f, and that
+     *         +(-)Float.MAX_VALUE is adjacent to +(-)Infinity,
+     *         or NaN if any argument is NaN.
+     */
+    public static float nextAfter(float start, double direction) {
+        if (direction < start) {
+            // Going towards -Infinity.
+            if (start == 0.0f) {
+                // +-0.0f
+                return -Float.MIN_VALUE;
+            }
+            final int bits = Float.floatToRawIntBits(start);
+            return Float.intBitsToFloat(bits + ((bits > 0) ? -1 : 1));
+        } else if (direction > start) {
+            // Going towards +Infinity.
+            // +0.0f to get rid of eventual -0.0f
+            final int bits = Float.floatToRawIntBits(start + 0.0f);
+            return Float.intBitsToFloat(bits + (bits >= 0 ? 1 : -1));
+        } else if (start == direction) {
+            return (float)direction;
+        } else {
+            // Returning a NaN derived from the input NaN(s).
+            return start + (float)direction;
+        }
+    }
+
+    /**
+     * If both arguments are +-0.0, direction is returned.
+     *
+     * If both arguments are +Infinity or -Infinity,
+     * respectively +Infinity or -Infinity is returned.
+     *
+     * @param start A double value.
+     * @param direction A double value.
+     * @return The double adjacent to start towards direction, considering that
+     *         +(-)Double.MIN_VALUE is adjacent to +(-)0.0, and that
+     *         +(-)Double.MAX_VALUE is adjacent to +(-)Infinity,
+     *         or NaN if any argument is NaN.
+     */
+    public static double nextAfter(double start, double direction) {
+        if (direction < start) {
+            // Going towards -Infinity.
+            if (start == 0.0) {
+                // +-0.0
+                return -Double.MIN_VALUE;
+            }
+            final long bits = Double.doubleToRawLongBits(start);
+            return Double.longBitsToDouble(bits + ((bits > 0) ? -1 : 1));
+        } else if (direction > start) {
+            // Going towards +Infinity.
+            // +0.0 to get rid of eventual -0.0
+            final long bits = Double.doubleToRawLongBits(start + 0.0f);
+            return Double.longBitsToDouble(bits + (bits >= 0 ? 1 : -1));
+        } else if (start == direction) {
+            return direction;
+        } else {
+            // Returning a NaN derived from the input NaN(s).
+            return start + direction;
+        }
+    }
+
+    /**
+     * Semantically equivalent to nextAfter(start,Double.NEGATIVE_INFINITY).
+     */
+    public static float nextDown(float start) {
+        if (start > Float.NEGATIVE_INFINITY) {
+            if (start == 0.0f) {
+                // +-0.0f
+                return -Float.MIN_VALUE;
+            }
+            final int bits = Float.floatToRawIntBits(start);
+            return Float.intBitsToFloat(bits + ((bits > 0) ? -1 : 1));
+        } else if (start == Float.NEGATIVE_INFINITY) {
+            return Float.NEGATIVE_INFINITY;
+        } else {
+            // NaN
+            return start;
+        }
+    }
+
+    /**
+     * Semantically equivalent to nextAfter(start,Double.NEGATIVE_INFINITY).
+     */
+    public static double nextDown(double start) {
+        if (start > Double.NEGATIVE_INFINITY) {
+            if (start == 0.0) {
+                // +-0.0
+                return -Double.MIN_VALUE;
+            }
+            final long bits = Double.doubleToRawLongBits(start);
+            return Double.longBitsToDouble(bits + ((bits > 0) ? -1 : 1));
+        } else if (start == Double.NEGATIVE_INFINITY) {
+            return Double.NEGATIVE_INFINITY;
+        } else {
+            // NaN
+            return start;
+        }
+    }
+
+    /**
+     * Semantically equivalent to nextAfter(start,Double.POSITIVE_INFINITY).
+     */
+    public static float nextUp(float start) {
+        if (start < Float.POSITIVE_INFINITY) {
+            // +0.0f to get rid of eventual -0.0f
+            final int bits = Float.floatToRawIntBits(start + 0.0f);
+            return Float.intBitsToFloat(bits + (bits >= 0 ? 1 : -1));
+        } else if (start == Float.POSITIVE_INFINITY) {
+            return Float.POSITIVE_INFINITY;
+        } else {
+            // NaN
+            return start;
+        }
+    }
+
+    /**
+     * Semantically equivalent to nextAfter(start,Double.POSITIVE_INFINITY).
+     */
+    public static double nextUp(double start) {
+        if (start < Double.POSITIVE_INFINITY) {
+            // +0.0 to get rid of eventual -0.0
+            final long bits = Double.doubleToRawLongBits(start + 0.0);
+            return Double.longBitsToDouble(bits + (bits >= 0 ? 1 : -1));
+        } else if (start == Double.POSITIVE_INFINITY) {
+            return Double.POSITIVE_INFINITY;
+        } else {
+            // NaN
+            return start;
+        }
+    }
+
+    /**
+     * Precision may be lost if the result is subnormal.
+     *
+     * @param value A float value.
+     * @param scaleFactor An int value.
+     * @return value * 2^scaleFactor, or a value equivalent to the specified
+     *         one if it is NaN, +-Infinity or +-0.0f.
+     */
+    public static float scalb(float value, int scaleFactor) {
+        // Large enough to imply overflow or underflow for
+        // a finite non-zero value.
+        final int MAX_SCALE = 2*MAX_FLOAT_EXPONENT+23+1;
+
+        // Making sure scaling factor is in a reasonable range.
+        scaleFactor = Math.max(Math.min(scaleFactor, MAX_SCALE), -MAX_SCALE);
+
+        return (float)(((double)value) * twoPowNormal(scaleFactor));
+    }
+
+    /**
+     * Precision may be lost if the result is subnormal.
+     *
+     * @param value A double value.
+     * @param scaleFactor An int value.
+     * @return value * 2^scaleFactor, or a value equivalent to the specified
+     *         one if it is NaN, +-Infinity or +-0.0.
+     */
+    public static double scalb(double value, int scaleFactor) {
+        if ((scaleFactor > -MAX_DOUBLE_EXPONENT) && (scaleFactor <= MAX_DOUBLE_EXPONENT)) {
+            // Quick case (as done in apache FastMath).
+            return value * twoPowNormal(scaleFactor);
+        }
+
+        // Large enough to imply overflow or underflow for
+        // a finite non-zero value.
+        final int MAX_SCALE = 2*MAX_DOUBLE_EXPONENT+52+1;
+
+        // Making sure scaling factor is in a reasonable range.
+        final int exponentAdjust;
+        final int scaleIncrement;
+        final double exponentDelta;
+        if (scaleFactor < 0) {
+            scaleFactor = Math.max(scaleFactor, -MAX_SCALE);
+            scaleIncrement = -512;
+            exponentDelta = TWO_POW_N512;
+        } else {
+            scaleFactor = Math.min(scaleFactor, MAX_SCALE);
+            scaleIncrement = 512;
+            exponentDelta = TWO_POW_512;
+        }
+
+        // Calculating (scaleFactor % +-512), 512 = 2^9, using
+        // technique from "Hacker's Delight" section 10-2.
+        final int t = ((scaleFactor >> (9-1)) >>> (32-9));
+        exponentAdjust = ((scaleFactor + t) & (512-1)) - t;
+
+        value *= twoPowNormal(exponentAdjust);
+        scaleFactor -= exponentAdjust;
+
+        while (scaleFactor != 0) {
+            value *= exponentDelta;
+            scaleFactor -= scaleIncrement;
+        }
+
+        return value;
+    }
+
+    /*
+     * Non-redefined StrictMath public values and treatments.
+     */
+
+    public static float abs(float a) {
+        return StrictMath.abs(a);
+    }
+
+    public static double abs(double a) {
+        return StrictMath.abs(a);
+    }
+
+    public static float min(float a, float b) {
+        return StrictMath.min(a,b);
+    }
+
+    public static double min(double a, double b) {
+        return StrictMath.min(a,b);
+    }
+
+    public static float max(float a, float b) {
+        return StrictMath.max(a,b);
+    }
+
+    public static double max(double a, double b) {
+        return StrictMath.max(a,b);
+    }
+
+    public static double IEEEremainder(double f1, double f2) {
+        return StrictMath.IEEEremainder(f1,f2);
+    }
+
+    public static double random() {
+        return StrictMath.random();
+    }
+
+    //--------------------------------------------------------------------------
+    //  PRIVATE METHODS
+    //--------------------------------------------------------------------------
+
+    /**
+     * Non-instantiable.
+     */
+    private StrictFastMath() {
+    }
+
+    /*
+     * Remainders (accurate).
+     */
+
+    /**
+     * @param angle Angle in radians.
+     * @return Remainder of (angle % (2*PI)), in [-PI,PI].
+     */
+    private static double remainderTwoPi(double angle) {
+        if (USE_JDK_MATH) {
+            return jdkRemainderTwoPi(angle);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        if (angle <= (4*NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2)) {
+            double fn = (double)(int)(angle*TWOPI_INV+0.5);
+            angle = (angle - fn*TWOPI_HI) - fn*TWOPI_LO;
+            // Ensuring range.
+            // HI/LO can help a bit, even though we are always far from 0.
+            if (angle < -Math.PI) {
+                angle = (angle + TWOPI_HI) + TWOPI_LO;
+            } else if (angle > Math.PI) {
+                angle = (angle - TWOPI_HI) - TWOPI_LO;
+            }
+            return negateResult ? -angle : angle;
+        } else if (angle < Double.POSITIVE_INFINITY) {
+            angle = heavyRemainderTwoPi(angle);
+            return negateResult ? -angle : angle;
+        } else { // angle is +Infinity or NaN
+            return Double.NaN;
+        }
+    }
+
+    /**
+     * @param angle Angle in radians.
+     * @return Remainder of (angle % PI), in [-PI/2,PI/2].
+     */
+    private static double remainderPi(double angle) {
+        if (USE_JDK_MATH) {
+            return jdkRemainderPi(angle);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        if (angle <= (2*NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2)) {
+            double fn = (double)(int)(angle*PI_INV+0.5);
+            angle = (angle - fn*PI_HI) - fn*PI_LO;
+            // Ensuring range.
+            // HI/LO can help a bit, even though we are always far from 0.
+            if (angle < -Math.PI/2) {
+                angle = (angle + PI_HI) + PI_LO;
+            } else if (angle > Math.PI/2) {
+                angle = (angle - PI_HI) - PI_LO;
+            }
+            return negateResult ? -angle : angle;
+        } else if (angle < Double.POSITIVE_INFINITY) {
+            angle = heavyRemainderPi(angle);
+            return negateResult ? -angle : angle;
+        } else { // angle is +Infinity or NaN
+            return Double.NaN;
+        }
+    }
+
+    /**
+     * @param angle Angle in radians.
+     * @return Bits of double corresponding to remainder of (angle % (PI/2)),
+     *         in [-PI/4,PI/4], with quadrant encoded in exponent bits.
+     */
+    private static long remainderPiO2(double angle) {
+        if (USE_JDK_MATH) {
+            return jdkRemainderPiO2(angle, false);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        if (angle <= NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2) {
+            int n = (int)(angle*PIO2_INV+0.5);
+            double fn = (double)n;
+            angle = (angle - fn*PIO2_HI) - fn*PIO2_LO;
+            // Ensuring range.
+            // HI/LO can help a bit, even though we are always far from 0.
+            if (angle < -Math.PI/4) {
+                angle = (angle + PIO2_HI) + PIO2_LO;
+                n--;
+            } else if (angle > Math.PI/4) {
+                angle = (angle - PIO2_HI) - PIO2_LO;
+                n++;
+            }
+            if (negateResult) {
+                angle = -angle;
+            }
+            return encodeRemainderAndQuadrant(angle, n&3);
+        } else if (angle < Double.POSITIVE_INFINITY) {
+            return heavyRemainderPiO2(angle, negateResult);
+        } else { // angle is +Infinity or NaN
+            return encodeRemainderAndQuadrant(Double.NaN, 0);
+        }
+    }
+
+    /*
+     * Remainders (fast).
+     */
+
+    /**
+     * Not accurate for large values.
+     *
+     * @param angle Angle in radians.
+     * @return Remainder of (angle % (2*PI)), in [-PI,PI].
+     */
+    private static double remainderTwoPiFast(double angle) {
+        if (USE_JDK_MATH) {
+            return jdkRemainderTwoPi(angle);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        // - We don't bother with values higher than (2*PI*(2^52)),
+        //   since they are spaced by 2*PI or more from each other.
+        // - For large values, we don't use % because it might be very slow,
+        //   and we split computation in two, because cast from double to int
+        //   with large numbers might be very slow also.
+        if (angle <= TWO_POW_26*(2*Math.PI)) {
+            // ok
+        } else if (angle <= TWO_POW_52*(2*Math.PI)) {
+            // Computing remainder of angle modulo TWO_POW_26*(2*PI).
+            double fn = (double)(int)(angle*(TWOPI_INV/TWO_POW_26)+0.5);
+            angle = (angle - fn*(TWOPI_HI*TWO_POW_26)) - fn*(TWOPI_LO*TWO_POW_26);
+            // Here, angle is in [-TWO_POW_26*PI,TWO_POW_26*PI], or so.
+            if (angle < 0.0) {
+                angle = -angle;
+                negateResult = !negateResult;
+            }
+        } else if (angle < Double.POSITIVE_INFINITY) {
+            return 0.0;
+        } else { // angle is +Infinity or NaN
+            return Double.NaN;
+        }
+
+        // Computing remainder of angle modulo 2*PI.
+        double fn = (double)(int)(angle*TWOPI_INV+0.5);
+        angle = (angle - fn*TWOPI_HI) - fn*TWOPI_LO;
+
+        // Ensuring range.
+        // HI/LO can help a bit, even though we are always far from 0.
+        if (angle < -Math.PI) {
+            angle = (angle + TWOPI_HI) + TWOPI_LO;
+        } else if (angle > Math.PI) {
+            angle = (angle - TWOPI_HI) - TWOPI_LO;
+        }
+        return negateResult ? -angle : angle;
+    }
+
+    /**
+     * Not accurate for large values.
+     *
+     * @param angle Angle in radians.
+     * @return Remainder of (angle % PI), in [-PI/2,PI/2].
+     */
+    private static double remainderPiFast(double angle) {
+        if (USE_JDK_MATH) {
+            return jdkRemainderPi(angle);
+        }
+        boolean negateResult = false;
+        if (angle < 0.0) {
+            angle = -angle;
+            negateResult = true;
+        }
+        // - We don't bother with values higher than (PI*(2^52)),
+        //   since they are spaced by PI or more from each other.
+        // - For large values, we don't use % because it might be very slow,
+        //   and we split computation in two, because cast from double to int
+        //   with large numbers might be very slow also.
+        if (angle <= TWO_POW_26*Math.PI) {
+            // ok
+        } else if (angle <= TWO_POW_52*Math.PI) {
+            // Computing remainder of angle modulo TWO_POW_26*PI.
+            double fn = (double)(int)(angle*(PI_INV/TWO_POW_26)+0.5);
+            angle = (angle - fn*(PI_HI*TWO_POW_26)) - fn*(PI_LO*TWO_POW_26);
+            // Here, angle is in [-TWO_POW_26*PI/2,TWO_POW_26*PI/2], or so.
+            if (angle < 0.0) {
+                angle = -angle;
+                negateResult = !negateResult;
+            }
+        } else if (angle < Double.POSITIVE_INFINITY) {
+            return 0.0;
+        } else { // angle is +Infinity or NaN
+            return Double.NaN;
+        }
+
+        // Computing remainder of angle modulo PI.
+        double fn = (double)(int)(angle*PI_INV+0.5);
+        angle = (angle - fn*PI_HI) - fn*PI_LO;
+
+        // Ensuring range.
+        // HI/LO can help a bit, even though we are always far from 0.
+        if (angle < -Math.PI/2) {
+            angle = (angle + PI_HI) + PI_LO;
+        } else if (angle > Math.PI/2) {
+            angle = (angle - PI_HI) - PI_LO;
+        }
+        return negateResult ? -angle : angle;
+    }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 661afa67c..15a6a176c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -43,6 +43,7 @@ include(
     ":kmath-tensors",
     ":kmath-jupyter",
     ":kmath-symja",
+    ":kmath-jafama",
     ":examples",
     ":benchmarks"
 )
-- 
2.34.1


From 6c815abd54a248cd1f95e02d580382e4b55377ba Mon Sep 17 00:00:00 2001
From: therealansh <tyagiansh23@hotmail.com>
Date: Thu, 3 Jun 2021 01:37:23 +0530
Subject: [PATCH 284/713] chore: refactored and dependency add

---
 kmath-jafama/build.gradle.kts                 |    9 +-
 .../kscience/kmath/jafama/CmnFastMath.java    | 2112 ------------
 .../kscience/kmath/jafama/DoubleWrapper.java  |   13 -
 .../space/kscience/kmath/jafama/FastMath.java | 2986 ----------------
 .../kscience/kmath/jafama/IntWrapper.java     |   13 -
 .../kscience/kmath/jafama/KMathJafama.kt      |    3 +-
 .../kscience/kmath/jafama/NumbersUtils.java   | 2647 ---------------
 .../kscience/kmath/jafama/StrictFastMath.java | 2998 -----------------
 8 files changed, 6 insertions(+), 10775 deletions(-)
 delete mode 100644 kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/CmnFastMath.java
 delete mode 100644 kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/DoubleWrapper.java
 delete mode 100644 kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/FastMath.java
 delete mode 100644 kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/IntWrapper.java
 delete mode 100644 kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/NumbersUtils.java
 delete mode 100644 kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/StrictFastMath.java

diff --git a/kmath-jafama/build.gradle.kts b/kmath-jafama/build.gradle.kts
index 22d50f89c..f31f2602f 100644
--- a/kmath-jafama/build.gradle.kts
+++ b/kmath-jafama/build.gradle.kts
@@ -3,13 +3,12 @@ plugins {
 }
 
 dependencies {
-    api(project(":kmath-ast"))
-    api(project(":kmath-complex"))
-    api(project(":kmath-for-real"))
+    api(project(":kmath-core"))
+    api("net.jafama:jafama:2.3.2")
 }
 
-kscience{
-    useHtml()
+repositories {
+    mavenCentral()
 }
 
 readme {
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/CmnFastMath.java b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/CmnFastMath.java
deleted file mode 100644
index 0abc5d95d..000000000
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/CmnFastMath.java
+++ /dev/null
@@ -1,2112 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.jafama;
-
-/**
- * Stuffs for FastMath and StrictFastMath.
- */
-abstract class CmnFastMath {
-
-    /*
-     * For trigonometric functions, use of look-up tables and Taylor-Lagrange formula
-     * with 4 derivatives (more take longer to compute and don't add much accuracy,
-     * less require larger tables (which use more memory, take more time to initialize,
-     * and are slower to access (at least on the machine they were developed on))).
-     *
-     * For angles reduction of cos/sin/tan functions:
-     * - for small values, instead of reducing angles, and then computing the best index
-     *   for look-up tables, we compute this index right away, and use it for reduction,
-     * - for large values, treatments derived from fdlibm package are used, as done in
-     *   java.lang.Math. They are faster but still "slow", so if you work with
-     *   large numbers and need speed over accuracy for them, you might want to use
-     *   normalizeXXXFast treatments before your function, or modify cos/sin/tan
-     *   so that they call the fast normalization treatments instead of the accurate ones.
-     *   NB: If an angle is huge (like PI*1e20), in double precision format its last digits
-     *       are zeros, which most likely is not the case for the intended value, and doing
-     *       an accurate reduction on a very inaccurate value is most likely pointless.
-     *       But it gives some sort of coherence that could be needed in some cases.
-     *
-     * Multiplication on double appears to be about as fast (or not much slower) than call
-     * to <double_array>[<index>], and regrouping some doubles in a private class, to use
-     * index only once, does not seem to speed things up, so:
-     * - for uniformly tabulated values, to retrieve the parameter corresponding to
-     *   an index, we recompute it rather than using an array to store it,
-     * - for cos/sin, we recompute derivatives divided by (multiplied by inverse of)
-     *   factorial each time, rather than storing them in arrays.
-     *
-     * Lengths of look-up tables are usually of the form 2^n+1, for their values to be
-     * of the form (<a_constant> * k/2^n, k in 0 .. 2^n), so that particular values
-     * (PI/2, etc.) are "exactly" computed, as well as for other reasons.
-     *
-     * Tables are put in specific inner classes, to be lazily initialized.
-     * Always doing strict tables initialization, even if StrictFastMath delegates
-     * to StrictMath and doesn't use tables, which makes tables initialization a bit
-     * slower but code simpler.
-     * Using redefined pure Java treatments during tables initialization,
-     * instead of Math or StrictMath ones (even asin(double)), can be very slow,
-     * because class loading is likely not to be optimized.
-     *
-     * Most math treatments I could find on the web, including "fast" ones,
-     * usually take care of special cases (NaN, etc.) at the beginning, and
-     * then deal with the general case, which adds a useless overhead for the
-     * general (and common) case. In this class, special cases are only dealt
-     * with when needed, and if the general case does not already handle them.
-     */
-
-    /*
-     * Regarding strictfp-ness:
-     *
-     * Switching from/to strictfp has some overhead, so we try to only
-     * strictfp-ize when needed (or when clueless).
-     * Compile-time constants are computed in a FP-strict way, so no need
-     * to make this whole class strictfp.
-     */
-
-    //--------------------------------------------------------------------------
-    // CONFIGURATION
-    //--------------------------------------------------------------------------
-
-    /*
-     * FastMath
-     */
-
-    static final boolean FM_USE_JDK_MATH = getBooleanProperty("jafama.usejdk", false);
-
-    /**
-     * Used for both FastMath.log(double) and FastMath.log10(double).
-     */
-    static final boolean FM_USE_REDEFINED_LOG = getBooleanProperty("jafama.fastlog", false);
-
-    static final boolean FM_USE_REDEFINED_SQRT = getBooleanProperty("jafama.fastsqrt", false);
-
-    /**
-     * Set it to true if FastMath.sqrt(double) is slow
-     * (more tables, but less calls to FastMath.sqrt(double)).
-     */
-    static final boolean FM_USE_POWTABS_FOR_ASIN = false;
-
-    /*
-     * StrictFastMath
-     */
-
-    static final boolean SFM_USE_JDK_MATH = getBooleanProperty("jafama.strict.usejdk", false);
-
-    /**
-     * Used for both StrictFastMath.log(double) and StrictFastMath.log10(double).
-     * True by default because the StrictMath implementations can be slow.
-     */
-    static final boolean SFM_USE_REDEFINED_LOG = getBooleanProperty("jafama.strict.fastlog", true);
-
-    static final boolean SFM_USE_REDEFINED_SQRT = getBooleanProperty("jafama.strict.fastsqrt", false);
-
-    /**
-     * Set it to true if StrictFastMath.sqrt(double) is slow
-     * (more tables, but less calls to StrictFastMath.sqrt(double)).
-     */
-    static final boolean SFM_USE_POWTABS_FOR_ASIN = false;
-
-    /*
-     * Common to FastMath and StrictFastMath.
-     */
-
-    /**
-     * Using two pow tab can just make things barely faster,
-     * and could relatively hurt in case of cache-misses,
-     * especially for methods that otherwise wouldn't rely
-     * on any tab, so we don't use it.
-     */
-    static final boolean USE_TWO_POW_TAB = false;
-
-    /**
-     * Because on some architectures, some casts can be slow,
-     * especially for large values.
-     * Might make things a bit slower for latest architectures,
-     * but not as much as it makes them faster for older ones.
-     */
-    static final boolean ANTI_SLOW_CASTS = true;
-
-    /**
-     * If some methods get JIT-optimized, they might crash
-     * if they contain "(var == xxx)" with var being NaN
-     * (can happen with Java 6u29).
-     *
-     * The crash does not happen if we replace "==" with "<" or ">".
-     *
-     * Only the code that has been observed to trigger the bug
-     * has been modified.
-     */
-    static final boolean ANTI_JIT_OPTIM_CRASH_ON_NAN = true;
-
-    //--------------------------------------------------------------------------
-    // GENERAL CONSTANTS
-    //--------------------------------------------------------------------------
-
-    /**
-     * Closest double approximation of e.
-     */
-    public static final double E = Math.E;
-
-    /**
-     * Closest double approximation of pi, which is inferior to mathematical pi:
-     * pi ~= 3.14159265358979323846...
-     * PI ~= 3.141592653589793
-     */
-    public static final double PI = Math.PI;
-
-    /**
-     * High double approximation of pi, which is further from pi
-     * than the low approximation PI:
-     *     pi ~= 3.14159265358979323846...
-     *     PI ~= 3.141592653589793
-     * PI_SUP ~= 3.1415926535897936
-     */
-    public static final double PI_SUP = Double.longBitsToDouble(Double.doubleToRawLongBits(Math.PI)+1);
-
-    static final double ONE_DIV_F2 = 1/2.0;
-    static final double ONE_DIV_F3 = 1/6.0;
-    static final double ONE_DIV_F4 = 1/24.0;
-
-    static final float TWO_POW_23_F = (float)NumbersUtils.twoPow(23);
-
-    static final double TWO_POW_24 = NumbersUtils.twoPow(24);
-    private static final double TWO_POW_N24 = NumbersUtils.twoPow(-24);
-
-    static final double TWO_POW_26 = NumbersUtils.twoPow(26);
-    static final double TWO_POW_N26 = NumbersUtils.twoPow(-26);
-
-    // First double value (from zero) such as (value+-1/value == value).
-    static final double TWO_POW_27 = NumbersUtils.twoPow(27);
-    static final double TWO_POW_N27 = NumbersUtils.twoPow(-27);
-
-    static final double TWO_POW_N28 = NumbersUtils.twoPow(-28);
-
-    static final double TWO_POW_52 = NumbersUtils.twoPow(52);
-
-    static final double TWO_POW_N55 = NumbersUtils.twoPow(-55);
-
-    static final double TWO_POW_66 = NumbersUtils.twoPow(66);
-
-    static final double TWO_POW_512 = NumbersUtils.twoPow(512);
-    static final double TWO_POW_N512 = NumbersUtils.twoPow(-512);
-
-    /**
-     * Double.MIN_NORMAL since Java 6.
-     */
-    static final double DOUBLE_MIN_NORMAL = Double.longBitsToDouble(0x0010000000000000L); // 2.2250738585072014E-308
-
-    // Not storing float/double mantissa size in constants,
-    // for 23 and 52 are shorter to read and more
-    // bitwise-explicit than some constant's name.
-
-    static final int MIN_DOUBLE_EXPONENT = -1074;
-    static final int MIN_DOUBLE_NORMAL_EXPONENT = -1022;
-    static final int MAX_DOUBLE_EXPONENT = 1023;
-
-    static final int MIN_FLOAT_NORMAL_EXPONENT = -126;
-    static final int MAX_FLOAT_EXPONENT = 127;
-
-    private static final double SQRT_2 = StrictMath.sqrt(2.0);
-
-    static final double LOG_2 = StrictMath.log(2.0);
-    static final double LOG_TWO_POW_27 = StrictMath.log(TWO_POW_27);
-    static final double LOG_DOUBLE_MAX_VALUE = StrictMath.log(Double.MAX_VALUE);
-
-    static final double INV_LOG_10 = 1.0/StrictMath.log(10.0);
-
-    static final double DOUBLE_BEFORE_60 = Double.longBitsToDouble(Double.doubleToRawLongBits(60.0)-1);
-
-    //--------------------------------------------------------------------------
-    // CONSTANTS FOR NORMALIZATIONS
-    //--------------------------------------------------------------------------
-
-    /**
-     * Table of constants for 1/(PI/2), 282 Hex digits (enough for normalizing doubles).
-     * 1/(PI/2) approximation = sum of TWO_OVER_PI_TAB[i]*2^(-24*(i+1)).
-     *
-     * double and not int, to avoid int-to-double cast during computations.
-     */
-    private static final double TWO_OVER_PI_TAB[] = {
-        0xA2F983, 0x6E4E44, 0x1529FC, 0x2757D1, 0xF534DD, 0xC0DB62,
-        0x95993C, 0x439041, 0xFE5163, 0xABDEBB, 0xC561B7, 0x246E3A,
-        0x424DD2, 0xe00649, 0x2EEA09, 0xD1921C, 0xFE1DEB, 0x1CB129,
-        0xA73EE8, 0x8235F5, 0x2EBB44, 0x84E99C, 0x7026B4, 0x5F7E41,
-        0x3991d6, 0x398353, 0x39F49C, 0x845F8B, 0xBDF928, 0x3B1FF8,
-        0x97FFDE, 0x05980F, 0xEF2F11, 0x8B5A0A, 0x6D1F6D, 0x367ECF,
-        0x27CB09, 0xB74F46, 0x3F669E, 0x5FEA2D, 0x7527BA, 0xC7EBE5,
-        0xF17B3D, 0x0739F7, 0x8A5292, 0xEA6BFB, 0x5FB11F, 0x8D5D08,
-        0x560330, 0x46FC7B, 0x6BABF0, 0xCFBC20, 0x9AF436, 0x1DA9E3,
-        0x91615E, 0xE61B08, 0x659985, 0x5F14A0, 0x68408D, 0xFFD880,
-        0x4D7327, 0x310606, 0x1556CA, 0x73A8C9, 0x60E27B, 0xC08C6B};
-
-    /*
-     * Constants for PI/2. Only the 23 most significant bits of each mantissa are used.
-     * 2*PI approximation = sum of TWOPI_TAB<i>.
-     */
-    private static final double PIO2_TAB0 = Double.longBitsToDouble(0x3FF921FB40000000L);
-    private static final double PIO2_TAB1 = Double.longBitsToDouble(0x3E74442D00000000L);
-    private static final double PIO2_TAB2 = Double.longBitsToDouble(0x3CF8469880000000L);
-    private static final double PIO2_TAB3 = Double.longBitsToDouble(0x3B78CC5160000000L);
-    private static final double PIO2_TAB4 = Double.longBitsToDouble(0x39F01B8380000000L);
-    private static final double PIO2_TAB5 = Double.longBitsToDouble(0x387A252040000000L);
-
-    static final double PIO2_INV = Double.longBitsToDouble(0x3FE45F306DC9C883L); // 6.36619772367581382433e-01 53 bits of 2/pi
-    static final double PIO2_HI = Double.longBitsToDouble(0x3FF921FB54400000L); // 1.57079632673412561417e+00 first 33 bits of pi/2
-    static final double PIO2_LO = Double.longBitsToDouble(0x3DD0B4611A626331L); // 6.07710050650619224932e-11 pi/2 - PIO2_HI
-    static final double PI_INV = PIO2_INV/2;
-    static final double PI_HI = 2*PIO2_HI;
-    static final double PI_LO = 2*PIO2_LO;
-    static final double TWOPI_INV = PIO2_INV/4;
-    static final double TWOPI_HI = 4*PIO2_HI;
-    static final double TWOPI_LO = 4*PIO2_LO;
-
-    /**
-     * Bit = 0 where quadrant is encoded in remainder bits.
-     */
-    private static final long QUADRANT_BITS_0_MASK = 0xCFFFFFFFFFFFFFFFL;
-
-    /**
-     * Remainder bits where quadrant is encoded, 0 elsewhere.
-     */
-    private static final long QUADRANT_PLACE_BITS = 0x3000000000000000L;
-
-    /**
-     * fdlibm uses 2^19*PI/2 here.
-     * With 2^18*PI/2 we would be more accurate, for example when normalizing
-     * 822245.903631403, which is close to 2^19*PI/2, but we are still in
-     * our accuracy tolerance with fdlibm's value (but not 2^20*PI/2) so we
-     * stick to it, to help being faster than (Strict)Math for values in
-     * [2^18*PI/2,2^19*PI/2].
-     *
-     * For tests, can use a smaller value, for heavy remainder
-     * not to only be used with huge values.
-     */
-    static final double NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2 = StrictMath.pow(2.0,19.0)*(Math.PI/2);
-
-    /**
-     * 2*Math.PI, normalized into [-PI,PI], as returned by
-     * StrictMath.asin(StrictMath.sin(2*Math.PI))
-     * (asin behaves as identity for this).
-     *
-     * NB: NumbersUtils.minus2PI(2*Math.PI) returns  -2.449293598153844E-16,
-     * which is different due to not using an accurate enough definition of PI.
-     */
-    static final double TWO_MATH_PI_IN_MINUS_PI_PI = -2.4492935982947064E-16;
-
-    //--------------------------------------------------------------------------
-    // CONSTANTS AND TABLES FOR SIN AND COS
-    //--------------------------------------------------------------------------
-
-    static final int SIN_COS_TABS_SIZE = (1<<getTabSizePower(11)) + 1;
-    static final double SIN_COS_DELTA_HI = TWOPI_HI/(SIN_COS_TABS_SIZE-1);
-    static final double SIN_COS_DELTA_LO = TWOPI_LO/(SIN_COS_TABS_SIZE-1);
-    static final double SIN_COS_INDEXER = 1/(SIN_COS_DELTA_HI+SIN_COS_DELTA_LO);
-
-    static final class MyTSinCos {
-        static final double[] sinTab = new double[SIN_COS_TABS_SIZE];
-        static final double[] cosTab = new double[SIN_COS_TABS_SIZE];
-        static {
-            init();
-        }
-        private static strictfp void init() {
-            final int SIN_COS_PI_INDEX = (SIN_COS_TABS_SIZE-1)/2;
-            final int SIN_COS_PI_MUL_2_INDEX = 2*SIN_COS_PI_INDEX;
-            final int SIN_COS_PI_MUL_0_5_INDEX = SIN_COS_PI_INDEX/2;
-            final int SIN_COS_PI_MUL_1_5_INDEX = 3*SIN_COS_PI_INDEX/2;
-            for (int i=0;i<SIN_COS_TABS_SIZE;i++) {
-                // angle: in [0,2*PI] (doesn't seem to help to have it in [-PI,PI]).
-                double angle = i * SIN_COS_DELTA_HI + i * SIN_COS_DELTA_LO;
-                double sinAngle = StrictMath.sin(angle);
-                double cosAngle = StrictMath.cos(angle);
-                // For indexes corresponding to zero cosine or sine, we make sure
-                // the value is zero and not an epsilon, since each value
-                // corresponds to sin-or-cos(i*PI/n), where PI is a more accurate
-                // definition of PI than Math.PI.
-                // This allows for a much better accuracy for results close to zero.
-                if (i == SIN_COS_PI_INDEX) {
-                    sinAngle = 0.0;
-                } else if (i == SIN_COS_PI_MUL_2_INDEX) {
-                    sinAngle = 0.0;
-                } else if (i == SIN_COS_PI_MUL_0_5_INDEX) {
-                    cosAngle = 0.0;
-                } else if (i == SIN_COS_PI_MUL_1_5_INDEX) {
-                    cosAngle = 0.0;
-                }
-                sinTab[i] = sinAngle;
-                cosTab[i] = cosAngle;
-            }
-        }
-    }
-
-    /**
-     * Max abs value for index-based reduction, above which we use regular angle normalization.
-     * This value must be < (Integer.MAX_VALUE / SIN_COS_INDEXER), to stay in range of int type.
-     * If too high, error gets larger because index-based reduction doesn't use an accurate
-     * enough definition of PI.
-     * If too low, and if we would be using remainder into [-PI,PI] instead of into [-PI/4,PI/4],
-     * error would get larger as well, because remainder would just provide a double, while
-     * index-based reduction is more accurate, using delta from index values and HI/LO values.
-     */
-    static final double SIN_COS_MAX_VALUE_FOR_INT_MODULO = ((Integer.MAX_VALUE>>9) / SIN_COS_INDEXER) * 0.99;
-
-    //--------------------------------------------------------------------------
-    // CONSTANTS AND TABLES FOR TAN
-    //--------------------------------------------------------------------------
-
-    // We use the following formula:
-    // 1) tan(-x) = -tan(x)
-    // 2) tan(x) = 1/tan(PI/2-x)
-    // ---> we only have to compute tan(x) on [0,A] with PI/4<=A<PI/2.
-
-    /**
-     * We use indexing past look-up tables, so that indexing information
-     * allows for fast recomputation of angle in [0,PI/2] range.
-     */
-    static final int TAN_VIRTUAL_TABS_SIZE = (1<<getTabSizePower(12)) + 1;
-
-    /**
-     * Must be >= 45deg, and supposed to be >= 51.4deg, as fdlibm code is not
-     * supposed to work with values inferior to that (51.4deg is about
-     * (PI/2-Double.longBitsToDouble(0x3FE5942800000000L))).
-     */
-    static final double TAN_MAX_VALUE_FOR_TABS = StrictMath.toRadians(77.0);
-
-    static final int TAN_TABS_SIZE = (int)((TAN_MAX_VALUE_FOR_TABS/(Math.PI/2)) * (TAN_VIRTUAL_TABS_SIZE-1)) + 1;
-    static final double TAN_DELTA_HI = PIO2_HI/(TAN_VIRTUAL_TABS_SIZE-1);
-    static final double TAN_DELTA_LO = PIO2_LO/(TAN_VIRTUAL_TABS_SIZE-1);
-    static final double TAN_INDEXER = 1/(TAN_DELTA_HI+TAN_DELTA_LO);
-
-    static final class MyTTan {
-        static final double[] tanTab = new double[TAN_TABS_SIZE];
-        static final double[] tanDer1DivF1Tab = new double[TAN_TABS_SIZE];
-        static final double[] tanDer2DivF2Tab = new double[TAN_TABS_SIZE];
-        static final double[] tanDer3DivF3Tab = new double[TAN_TABS_SIZE];
-        static final double[] tanDer4DivF4Tab = new double[TAN_TABS_SIZE];
-        static {
-            init();
-        }
-        private static strictfp void init() {
-            for (int i=0;i<TAN_TABS_SIZE;i++) {
-                // angle: in [0,TAN_MAX_VALUE_FOR_TABS].
-                double angle = i * TAN_DELTA_HI + i * TAN_DELTA_LO;
-                double sinAngle = StrictMath.sin(angle);
-                double cosAngle = StrictMath.cos(angle);
-                double cosAngleInv = 1/cosAngle;
-                double cosAngleInv2 = cosAngleInv*cosAngleInv;
-                double cosAngleInv3 = cosAngleInv2*cosAngleInv;
-                double cosAngleInv4 = cosAngleInv2*cosAngleInv2;
-                double cosAngleInv5 = cosAngleInv3*cosAngleInv2;
-                tanTab[i] = sinAngle * cosAngleInv;
-                tanDer1DivF1Tab[i] = cosAngleInv2;
-                tanDer2DivF2Tab[i] = ((2*sinAngle)*cosAngleInv3) * ONE_DIV_F2;
-                tanDer3DivF3Tab[i] = ((2*(1+2*sinAngle*sinAngle))*cosAngleInv4) * ONE_DIV_F3;
-                tanDer4DivF4Tab[i] = ((8*sinAngle*(2+sinAngle*sinAngle))*cosAngleInv5) * ONE_DIV_F4;
-            }
-        }
-    }
-
-    /**
-     * Max abs value for fast modulo, above which we use regular angle normalization.
-     * This value must be < (Integer.MAX_VALUE / TAN_INDEXER), to stay in range of int type.
-     * If too high, error gets larger because index-based reduction doesn't use an accurate
-     * enough definition of PI.
-     * If too low, error gets larger as well, because we use remainder into [-PI/2,PI/2],
-     * just provides a double, while index-based reduction is more accurate, using delta
-     * from index values and HI/LO values.
-     */
-    static final double TAN_MAX_VALUE_FOR_INT_MODULO = (((Integer.MAX_VALUE>>9) / TAN_INDEXER) * 0.99);
-
-    //--------------------------------------------------------------------------
-    // CONSTANTS AND TABLES FOR ACOS, ASIN
-    //--------------------------------------------------------------------------
-
-    // We use the following formula:
-    // 1) acos(x) = PI/2 - asin(x)
-    // 2) asin(-x) = -asin(x)
-    // ---> we only have to compute asin(x) on [0,1].
-    // For values not close to +-1, we use look-up tables;
-    // for values near +-1, we use code derived from fdlibm.
-
-    /**
-     * Supposed to be >= sin(77.2deg), as fdlibm code is supposed to work with values > 0.975,
-     * but seems to work well enough as long as value >= sin(25deg).
-     */
-    static final double ASIN_MAX_VALUE_FOR_TABS = StrictMath.sin(StrictMath.toRadians(73.0));
-
-    static final int ASIN_TABS_SIZE = (1<<getTabSizePower(13)) + 1;
-    static final double ASIN_DELTA = ASIN_MAX_VALUE_FOR_TABS/(ASIN_TABS_SIZE - 1);
-    static final double ASIN_INDEXER = 1/ASIN_DELTA;
-
-    static final class MyTAsin {
-        static final double[] asinTab = new double[ASIN_TABS_SIZE];
-        static final double[] asinDer1DivF1Tab = new double[ASIN_TABS_SIZE];
-        static final double[] asinDer2DivF2Tab = new double[ASIN_TABS_SIZE];
-        static final double[] asinDer3DivF3Tab = new double[ASIN_TABS_SIZE];
-        static final double[] asinDer4DivF4Tab = new double[ASIN_TABS_SIZE];
-        static {
-            init();
-        }
-        private static strictfp void init() {
-            for (int i=0;i<ASIN_TABS_SIZE;i++) {
-                // x: in [0,ASIN_MAX_VALUE_FOR_TABS].
-                double x = i * ASIN_DELTA;
-                double oneMinusXSqInv = 1/(1-x*x);
-                double oneMinusXSqInv0_5 = StrictMath.sqrt(oneMinusXSqInv);
-                double oneMinusXSqInv1_5 = oneMinusXSqInv0_5*oneMinusXSqInv;
-                double oneMinusXSqInv2_5 = oneMinusXSqInv1_5*oneMinusXSqInv;
-                double oneMinusXSqInv3_5 = oneMinusXSqInv2_5*oneMinusXSqInv;
-                asinTab[i] = StrictMath.asin(x);
-                asinDer1DivF1Tab[i] = oneMinusXSqInv0_5;
-                asinDer2DivF2Tab[i] = (x*oneMinusXSqInv1_5) * ONE_DIV_F2;
-                asinDer3DivF3Tab[i] = ((1+2*x*x)*oneMinusXSqInv2_5) * ONE_DIV_F3;
-                asinDer4DivF4Tab[i] = ((5+2*x*(2+x*(5-2*x)))*oneMinusXSqInv3_5) * ONE_DIV_F4;
-            }
-        }
-    }
-
-    static final double ASIN_MAX_VALUE_FOR_POWTABS = StrictMath.sin(StrictMath.toRadians(88.6));
-    static final int ASIN_POWTABS_POWER = 84;
-
-    static final double ASIN_POWTABS_ONE_DIV_MAX_VALUE = 1/ASIN_MAX_VALUE_FOR_POWTABS;
-    static final int ASIN_POWTABS_SIZE = (FM_USE_POWTABS_FOR_ASIN || SFM_USE_POWTABS_FOR_ASIN) ? (1<<getTabSizePower(12)) + 1 : 0;
-    static final int ASIN_POWTABS_SIZE_MINUS_ONE = ASIN_POWTABS_SIZE - 1;
-
-    static final class MyTAsinPow {
-        static final double[] asinParamPowTab = new double[ASIN_POWTABS_SIZE];
-        static final double[] asinPowTab = new double[ASIN_POWTABS_SIZE];
-        static final double[] asinDer1DivF1PowTab = new double[ASIN_POWTABS_SIZE];
-        static final double[] asinDer2DivF2PowTab = new double[ASIN_POWTABS_SIZE];
-        static final double[] asinDer3DivF3PowTab = new double[ASIN_POWTABS_SIZE];
-        static final double[] asinDer4DivF4PowTab = new double[ASIN_POWTABS_SIZE];
-        static {
-            init();
-        }
-        private static strictfp void init() {
-            if (FM_USE_POWTABS_FOR_ASIN || SFM_USE_POWTABS_FOR_ASIN) {
-                for (int i=0;i<ASIN_POWTABS_SIZE;i++) {
-                    // x: in [0,ASIN_MAX_VALUE_FOR_POWTABS].
-                    double x = StrictMath.pow(i*(1.0/ASIN_POWTABS_SIZE_MINUS_ONE), 1.0/ASIN_POWTABS_POWER) * ASIN_MAX_VALUE_FOR_POWTABS;
-                    double oneMinusXSqInv = 1/(1-x*x);
-                    double oneMinusXSqInv0_5 = StrictMath.sqrt(oneMinusXSqInv);
-                    double oneMinusXSqInv1_5 = oneMinusXSqInv0_5*oneMinusXSqInv;
-                    double oneMinusXSqInv2_5 = oneMinusXSqInv1_5*oneMinusXSqInv;
-                    double oneMinusXSqInv3_5 = oneMinusXSqInv2_5*oneMinusXSqInv;
-                    asinParamPowTab[i] = x;
-                    asinPowTab[i] = StrictMath.asin(x);
-                    asinDer1DivF1PowTab[i] = oneMinusXSqInv0_5;
-                    asinDer2DivF2PowTab[i] = (x*oneMinusXSqInv1_5) * ONE_DIV_F2;
-                    asinDer3DivF3PowTab[i] = ((1+2*x*x)*oneMinusXSqInv2_5) * ONE_DIV_F3;
-                    asinDer4DivF4PowTab[i] = ((5+2*x*(2+x*(5-2*x)))*oneMinusXSqInv3_5) * ONE_DIV_F4;
-                }
-            }
-        }
-    }
-
-    static final double ASIN_PIO2_HI = Double.longBitsToDouble(0x3FF921FB54442D18L); // 1.57079632679489655800e+00
-    static final double ASIN_PIO2_LO = Double.longBitsToDouble(0x3C91A62633145C07L); // 6.12323399573676603587e-17
-    static final double ASIN_PS0 = Double.longBitsToDouble(0x3fc5555555555555L); //  1.66666666666666657415e-01
-    static final double ASIN_PS1 = Double.longBitsToDouble(0xbfd4d61203eb6f7dL); // -3.25565818622400915405e-01
-    static final double ASIN_PS2 = Double.longBitsToDouble(0x3fc9c1550e884455L); //  2.01212532134862925881e-01
-    static final double ASIN_PS3 = Double.longBitsToDouble(0xbfa48228b5688f3bL); // -4.00555345006794114027e-02
-    static final double ASIN_PS4 = Double.longBitsToDouble(0x3f49efe07501b288L); //  7.91534994289814532176e-04
-    static final double ASIN_PS5 = Double.longBitsToDouble(0x3f023de10dfdf709L); //  3.47933107596021167570e-05
-    static final double ASIN_QS1 = Double.longBitsToDouble(0xc0033a271c8a2d4bL); // -2.40339491173441421878e+00
-    static final double ASIN_QS2 = Double.longBitsToDouble(0x40002ae59c598ac8L); //  2.02094576023350569471e+00
-    static final double ASIN_QS3 = Double.longBitsToDouble(0xbfe6066c1b8d0159L); // -6.88283971605453293030e-01
-    static final double ASIN_QS4 = Double.longBitsToDouble(0x3fb3b8c5b12e9282L); //  7.70381505559019352791e-02
-
-    //--------------------------------------------------------------------------
-    // CONSTANTS AND TABLES FOR ATAN
-    //--------------------------------------------------------------------------
-
-    // We use the formula atan(-x) = -atan(x)
-    // ---> we only have to compute atan(x) on [0,+Infinity[.
-    // For values corresponding to angles not close to +-PI/2, we use look-up tables;
-    // for values corresponding to angles near +-PI/2, we use code derived from fdlibm.
-
-    /**
-     * Supposed to be >= tan(67.7deg), as fdlibm code is supposed to work with values > 2.4375.
-     */
-    static final double ATAN_MAX_VALUE_FOR_TABS = StrictMath.tan(StrictMath.toRadians(74.0));
-
-    static final int ATAN_TABS_SIZE = (1<<getTabSizePower(12)) + 1;
-    static final double ATAN_DELTA = ATAN_MAX_VALUE_FOR_TABS/(ATAN_TABS_SIZE - 1);
-    static final double ATAN_INDEXER = 1/ATAN_DELTA;
-
-    static final class MyTAtan {
-        static final double[] atanTab = new double[ATAN_TABS_SIZE];
-        static final double[] atanDer1DivF1Tab = new double[ATAN_TABS_SIZE];
-        static final double[] atanDer2DivF2Tab = new double[ATAN_TABS_SIZE];
-        static final double[] atanDer3DivF3Tab = new double[ATAN_TABS_SIZE];
-        static final double[] atanDer4DivF4Tab = new double[ATAN_TABS_SIZE];
-        static {
-            init();
-        }
-        private static strictfp void init() {
-            for (int i=0;i<ATAN_TABS_SIZE;i++) {
-                // x: in [0,ATAN_MAX_VALUE_FOR_TABS].
-                double x = i * ATAN_DELTA;
-                double onePlusXSqInv = 1/(1+x*x);
-                double onePlusXSqInv2 = onePlusXSqInv*onePlusXSqInv;
-                double onePlusXSqInv3 = onePlusXSqInv2*onePlusXSqInv;
-                double onePlusXSqInv4 = onePlusXSqInv2*onePlusXSqInv2;
-                atanTab[i] = StrictMath.atan(x);
-                atanDer1DivF1Tab[i] = onePlusXSqInv;
-                atanDer2DivF2Tab[i] = (-2*x*onePlusXSqInv2) * ONE_DIV_F2;
-                atanDer3DivF3Tab[i] = ((-2+6*x*x)*onePlusXSqInv3) * ONE_DIV_F3;
-                atanDer4DivF4Tab[i] = ((24*x*(1-x*x))*onePlusXSqInv4) * ONE_DIV_F4;
-            }
-        }
-    }
-
-    static final double ATAN_HI3 = Double.longBitsToDouble(0x3ff921fb54442d18L); // 1.57079632679489655800e+00 atan(inf)hi
-    static final double ATAN_LO3 = Double.longBitsToDouble(0x3c91a62633145c07L); // 6.12323399573676603587e-17 atan(inf)lo
-    static final double ATAN_AT0 = Double.longBitsToDouble(0x3fd555555555550dL); //  3.33333333333329318027e-01
-    static final double ATAN_AT1 = Double.longBitsToDouble(0xbfc999999998ebc4L); // -1.99999999998764832476e-01
-    static final double ATAN_AT2 = Double.longBitsToDouble(0x3fc24924920083ffL); //  1.42857142725034663711e-01
-    static final double ATAN_AT3 = Double.longBitsToDouble(0xbfbc71c6fe231671L); // -1.11111104054623557880e-01
-    static final double ATAN_AT4 = Double.longBitsToDouble(0x3fb745cdc54c206eL); //  9.09088713343650656196e-02
-    static final double ATAN_AT5 = Double.longBitsToDouble(0xbfb3b0f2af749a6dL); // -7.69187620504482999495e-02
-    static final double ATAN_AT6 = Double.longBitsToDouble(0x3fb10d66a0d03d51L); //  6.66107313738753120669e-02
-    static final double ATAN_AT7 = Double.longBitsToDouble(0xbfadde2d52defd9aL); // -5.83357013379057348645e-02
-    static final double ATAN_AT8 = Double.longBitsToDouble(0x3fa97b4b24760debL); //  4.97687799461593236017e-02
-    static final double ATAN_AT9 = Double.longBitsToDouble(0xbfa2b4442c6a6c2fL); // -3.65315727442169155270e-02
-    static final double ATAN_AT10 = Double.longBitsToDouble(0x3f90ad3ae322da11L); // 1.62858201153657823623e-02
-
-    //--------------------------------------------------------------------------
-    // CONSTANTS AND TABLES FOR TANH
-    //--------------------------------------------------------------------------
-
-    /**
-     * Constant found experimentally:
-     * StrictMath.tanh(TANH_1_THRESHOLD) = 1,
-     * StrictMath.tanh(nextDown(TANH_1_THRESHOLD)) = FastMath.tanh(nextDown(TANH_1_THRESHOLD)) < 1.
-     */
-    static final double TANH_1_THRESHOLD = 19.061547465398498;
-
-    //--------------------------------------------------------------------------
-    // CONSTANTS AND TABLES FOR ASINH AND ACOSH
-    //--------------------------------------------------------------------------
-
-    static final double ASINH_LOG1P_THRESHOLD = 0.04;
-
-    /**
-     * sqrt(x*x+-1) should yield higher threshold, but it's enough due to
-     * subsequent log.
-     */
-    static final double ASINH_ACOSH_SQRT_ELISION_THRESHOLD = (1<<24);
-
-    //--------------------------------------------------------------------------
-    // CONSTANTS AND TABLES FOR EXP AND EXPM1
-    //--------------------------------------------------------------------------
-
-    static final double EXP_OVERFLOW_LIMIT = Double.longBitsToDouble(0x40862E42FEFA39EFL); // 7.09782712893383973096e+02
-    static final double EXP_UNDERFLOW_LIMIT = Double.longBitsToDouble(0xC0874910D52D3051L); // -7.45133219101941108420e+02
-    static final int EXP_LO_DISTANCE_TO_ZERO_POT = 0;
-    static final int EXP_LO_DISTANCE_TO_ZERO = (1<<EXP_LO_DISTANCE_TO_ZERO_POT);
-    static final int EXP_LO_TAB_SIZE_POT = getTabSizePower(11);
-    static final int EXP_LO_TAB_SIZE = (1<<EXP_LO_TAB_SIZE_POT)+1;
-    static final int EXP_LO_TAB_MID_INDEX = ((EXP_LO_TAB_SIZE-1)/2);
-    static final int EXP_LO_INDEXING = EXP_LO_TAB_MID_INDEX/EXP_LO_DISTANCE_TO_ZERO;
-    static final int EXP_LO_INDEXING_DIV_SHIFT = EXP_LO_TAB_SIZE_POT-1-EXP_LO_DISTANCE_TO_ZERO_POT;
-
-    static final class MyTExp {
-        static final double[] expHiTab = new double[1+(int)EXP_OVERFLOW_LIMIT-(int)EXP_UNDERFLOW_LIMIT];
-        static final double[] expLoPosTab = new double[EXP_LO_TAB_SIZE];
-        static final double[] expLoNegTab = new double[EXP_LO_TAB_SIZE];
-        static {
-            init();
-        }
-        private static strictfp void init() {
-            for (int i=(int)EXP_UNDERFLOW_LIMIT;i<=(int)EXP_OVERFLOW_LIMIT;i++) {
-                expHiTab[i-(int)EXP_UNDERFLOW_LIMIT] = StrictMath.exp(i);
-            }
-            for (int i=0;i<EXP_LO_TAB_SIZE;i++) {
-                // x: in [-EXPM1_DISTANCE_TO_ZERO,EXPM1_DISTANCE_TO_ZERO].
-                double x = -EXP_LO_DISTANCE_TO_ZERO + i/(double)EXP_LO_INDEXING;
-                // exp(x)
-                expLoPosTab[i] = StrictMath.exp(x);
-                // 1-exp(-x), accurately computed
-                expLoNegTab[i] = -StrictMath.expm1(-x);
-            }
-        }
-    }
-
-    //--------------------------------------------------------------------------
-    // CONSTANTS AND TABLES FOR LOG AND LOG1P
-    //--------------------------------------------------------------------------
-
-    static final int LOG_BITS = getTabSizePower(12);
-    static final int LOG_TAB_SIZE = (1<<LOG_BITS);
-
-    static final class MyTLog {
-        static final double[] logXLogTab = new double[LOG_TAB_SIZE];
-        static final double[] logXTab = new double[LOG_TAB_SIZE];
-        static final double[] logXInvTab = new double[LOG_TAB_SIZE];
-        static {
-            init();
-        }
-        private static strictfp void init() {
-            for (int i=0;i<LOG_TAB_SIZE;i++) {
-                // Exact to use inverse of tab size, since it is a power of two.
-                double x = 1+i*(1.0/LOG_TAB_SIZE);
-                logXLogTab[i] = StrictMath.log(x);
-                logXTab[i] = x;
-                logXInvTab[i] = 1/x;
-            }
-        }
-    }
-
-    //--------------------------------------------------------------------------
-    // TABLE FOR POWERS OF TWO
-    //--------------------------------------------------------------------------
-
-    static final int TWO_POW_TAB_SIZE = USE_TWO_POW_TAB ? (MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT)+1 : 0;
-
-    static final class MyTTwoPow {
-        static final double[] twoPowTab = new double[TWO_POW_TAB_SIZE];
-        static {
-            init();
-        }
-        private static strictfp void init() {
-            if (USE_TWO_POW_TAB) {
-                for (int i=MIN_DOUBLE_EXPONENT;i<=MAX_DOUBLE_EXPONENT;i++) {
-                    twoPowTab[i-MIN_DOUBLE_EXPONENT] = NumbersUtils.twoPow(i);
-                }
-            }
-        }
-    }
-
-    //--------------------------------------------------------------------------
-    // CONSTANTS AND TABLES FOR SQRT
-    //--------------------------------------------------------------------------
-
-    static final int SQRT_LO_BITS = getTabSizePower(12);
-    static final int SQRT_LO_TAB_SIZE = (1<<SQRT_LO_BITS);
-
-    static final class MyTSqrt {
-        static final double[] sqrtXSqrtHiTab = new double[MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT+1];
-        static final double[] sqrtXSqrtLoTab = new double[SQRT_LO_TAB_SIZE];
-        static final double[] sqrtSlopeHiTab = new double[MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT+1];
-        static final double[] sqrtSlopeLoTab = new double[SQRT_LO_TAB_SIZE];
-        static {
-            init();
-        }
-        private static strictfp void init() {
-            for (int i=MIN_DOUBLE_EXPONENT;i<=MAX_DOUBLE_EXPONENT;i++) {
-                double twoPowExpDiv2 = StrictMath.pow(2.0,i*0.5);
-                sqrtXSqrtHiTab[i-MIN_DOUBLE_EXPONENT] = twoPowExpDiv2 * 0.5; // Half sqrt, to avoid overflows.
-                sqrtSlopeHiTab[i-MIN_DOUBLE_EXPONENT] = 1/twoPowExpDiv2;
-            }
-            sqrtXSqrtLoTab[0] = 1.0;
-            sqrtSlopeLoTab[0] = 1.0;
-            final long SQRT_LO_MASK = (0x3FF0000000000000L | (0x000FFFFFFFFFFFFFL>>SQRT_LO_BITS));
-            for (int i=1;i<SQRT_LO_TAB_SIZE;i++) {
-                long xBits = SQRT_LO_MASK | (((long)(i-1))<<(52-SQRT_LO_BITS));
-                double sqrtX = StrictMath.sqrt(Double.longBitsToDouble(xBits));
-                sqrtXSqrtLoTab[i] = sqrtX;
-                sqrtSlopeLoTab[i] = 1/sqrtX;
-            }
-        }
-    }
-
-    //--------------------------------------------------------------------------
-    // CONSTANTS AND TABLES FOR CBRT
-    //--------------------------------------------------------------------------
-
-    static final int CBRT_LO_BITS = getTabSizePower(12);
-    static final int CBRT_LO_TAB_SIZE = (1<<CBRT_LO_BITS);
-
-    // For CBRT_LO_BITS = 12:
-    // cbrtXCbrtLoTab[0] = 1.0.
-    // cbrtXCbrtLoTab[1] = cbrt(1. 000000000000 1111111111111111111111111111111111111111b)
-    // cbrtXCbrtLoTab[2] = cbrt(1. 000000000001 1111111111111111111111111111111111111111b)
-    // cbrtXCbrtLoTab[3] = cbrt(1. 000000000010 1111111111111111111111111111111111111111b)
-    // cbrtXCbrtLoTab[4] = cbrt(1. 000000000011 1111111111111111111111111111111111111111b)
-    // etc.
-    static final class MyTCbrt {
-        static final double[] cbrtXCbrtHiTab = new double[MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT+1];
-        static final double[] cbrtXCbrtLoTab = new double[CBRT_LO_TAB_SIZE];
-        static final double[] cbrtSlopeHiTab = new double[MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT+1];
-        static final double[] cbrtSlopeLoTab = new double[CBRT_LO_TAB_SIZE];
-        static {
-            init();
-        }
-        private static strictfp void init() {
-            for (int i=MIN_DOUBLE_EXPONENT;i<=MAX_DOUBLE_EXPONENT;i++) {
-                double twoPowExpDiv3 = StrictMath.pow(2.0,i*(1.0/3));
-                cbrtXCbrtHiTab[i-MIN_DOUBLE_EXPONENT] = twoPowExpDiv3 * 0.5; // Half cbrt, to avoid overflows.
-                cbrtSlopeHiTab[i-MIN_DOUBLE_EXPONENT] = (4.0/3)/(twoPowExpDiv3*twoPowExpDiv3);
-            }
-            cbrtXCbrtLoTab[0] = 1.0;
-            cbrtSlopeLoTab[0] = 1.0;
-            final long CBRT_LO_MASK = (0x3FF0000000000000L | (0x000FFFFFFFFFFFFFL>>CBRT_LO_BITS));
-            for (int i=1;i<CBRT_LO_TAB_SIZE;i++) {
-                long xBits = CBRT_LO_MASK | (((long)(i-1))<<(52-CBRT_LO_BITS));
-                double cbrtX = StrictMath.cbrt(Double.longBitsToDouble(xBits));
-                cbrtXCbrtLoTab[i] = cbrtX;
-                cbrtSlopeLoTab[i] = 1/(cbrtX*cbrtX);
-            }
-        }
-    }
-
-    //--------------------------------------------------------------------------
-    // CONSTANTS FOR HYPOT
-    //--------------------------------------------------------------------------
-
-    /**
-     * For using sqrt, to avoid overflow/underflow, we want values magnitude in
-     * [1/sqrt(Double.MAX_VALUE/n),sqrt(Double.MAX_VALUE/n)],
-     * n being the number of arguments.
-     *
-     * sqrt(Double.MAX_VALUE/2) = 9.480751908109176E153
-     * and
-     * sqrt(Double.MAX_VALUE/3) = 7.741001517595157E153
-     * so
-     * 2^511 = 6.7039039649712985E153
-     * works for both.
-     */
-    static final double HYPOT_MAX_MAG = NumbersUtils.twoPow(511);
-
-    /**
-     * Large enough to get a value's magnitude back into [2^-511,2^511]
-     * from Double.MIN_VALUE or Double.MAX_VALUE, and small enough
-     * not to get it across that range (considering a 2*53 tolerance
-     * due to only checking magnitude of min/max value, and scaling
-     * all values together).
-     */
-    static final double HYPOT_FACTOR = NumbersUtils.twoPow(750);
-
-    //--------------------------------------------------------------------------
-    // PUBLIC METHODS
-    //--------------------------------------------------------------------------
-
-    /**
-     * Ensures that all look-up tables are initialized - otherwise they are
-     * initialized lazily.
-     */
-    public static void initTables() {
-        /*
-         * Taking care not to call init methods here, which would
-         * recompute tables each time (even though the computations
-         * should be identical, since done with strictfp and StrictMath).
-         */
-        int antiOptim = 0;
-        antiOptim += MyTSinCos.sinTab.length;
-        antiOptim += MyTTan.tanTab.length;
-        antiOptim += MyTAsin.asinTab.length;
-        antiOptim += MyTAsinPow.asinPowTab.length;
-        antiOptim += MyTAtan.atanTab.length;
-        antiOptim += MyTExp.expHiTab.length;
-        antiOptim += MyTLog.logXTab.length;
-        antiOptim += MyTTwoPow.twoPowTab.length;
-        antiOptim += MyTSqrt.sqrtXSqrtHiTab.length;
-        antiOptim += MyTCbrt.cbrtXCbrtHiTab.length;
-        if (StrictMath.cos((double)antiOptim) == 0.0) {
-            // Can't happen, cos is never +-0.0.
-            throw new AssertionError();
-        }
-    }
-
-    /*
-     * logarithms
-     */
-
-    /**
-     * @param value An integer value in [1,Integer.MAX_VALUE].
-     * @return The integer part of the logarithm, in base 2, of the specified value,
-     *         i.e. a result in [0,30]
-     * @throws IllegalArgumentException if the specified value is <= 0.
-     */
-    public static int log2(int value) {
-        return NumbersUtils.log2(value);
-    }
-
-    /**
-     * @param value An integer value in [1,Long.MAX_VALUE].
-     * @return The integer part of the logarithm, in base 2, of the specified value,
-     *         i.e. a result in [0,62]
-     * @throws IllegalArgumentException if the specified value is <= 0.
-     */
-    public static int log2(long value) {
-        return NumbersUtils.log2(value);
-    }
-
-    /*
-     * powers
-     */
-
-    /**
-     * Returns the exact result, provided it's in double range,
-     * i.e. if power is in [-1074,1023].
-     *
-     * @param power An int power.
-     * @return 2^power as a double, or +-Infinity in case of overflow.
-     */
-    public static double twoPow(int power) {
-        /*
-         * OK to have this method factored here even though it returns
-         * a floating point value, because it only does integer operations
-         * and only takes integer arguments, so should behave the same
-         * even if inlined into FP-wide context.
-         */
-        if (USE_TWO_POW_TAB) {
-            if (power >= MIN_DOUBLE_EXPONENT) {
-                if (power <= MAX_DOUBLE_EXPONENT) { // Normal or subnormal.
-                    return MyTTwoPow.twoPowTab[power-MIN_DOUBLE_EXPONENT];
-                } else { // Overflow.
-                    return Double.POSITIVE_INFINITY;
-                }
-            } else { // Underflow.
-                return 0.0;
-            }
-        } else {
-            return NumbersUtils.twoPow(power);
-        }
-    }
-
-    /**
-     * @param value An int value.
-     * @return value*value.
-     */
-    public static int pow2(int value) {
-        return value*value;
-    }
-
-    /**
-     * @param value A long value.
-     * @return value*value.
-     */
-    public static long pow2(long value) {
-        return value*value;
-    }
-
-    /**
-     * @param value An int value.
-     * @return value*value*value.
-     */
-    public static int pow3(int value) {
-        return value*value*value;
-    }
-
-    /**
-     * @param value A long value.
-     * @return value*value*value.
-     */
-    public static long pow3(long value) {
-        return value*value*value;
-    }
-
-    /*
-     * absolute values
-     */
-
-    /**
-     * @param value An int value.
-     * @return The absolute value, except if value is Integer.MIN_VALUE, for which it returns Integer.MIN_VALUE.
-     */
-    public static int abs(int value) {
-        if (FM_USE_JDK_MATH || SFM_USE_JDK_MATH) {
-            return Math.abs(value);
-        }
-        return NumbersUtils.abs(value);
-    }
-
-    /**
-     * @param value A long value.
-     * @return The absolute value, except if value is Long.MIN_VALUE, for which it returns Long.MIN_VALUE.
-     */
-    public static long abs(long value) {
-        if (FM_USE_JDK_MATH || SFM_USE_JDK_MATH) {
-            return Math.abs(value);
-        }
-        return NumbersUtils.abs(value);
-    }
-
-    /*
-     * close values
-     */
-
-    /**
-     * @param value A long value.
-     * @return The specified value as int.
-     * @throws ArithmeticException if the specified value is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
-     */
-    public static int toIntExact(long value) {
-        return NumbersUtils.asInt(value);
-    }
-
-    /**
-     * @param value A long value.
-     * @return The closest int value in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
-     */
-    public static int toInt(long value) {
-        return NumbersUtils.toInt(value);
-    }
-
-    /*
-     * ranges
-     */
-
-    /**
-     * @param min An int value.
-     * @param max An int value.
-     * @param value An int value.
-     * @return minValue if value < minValue, maxValue if value > maxValue, value otherwise.
-     */
-    public static int toRange(int min, int max, int value) {
-        return NumbersUtils.toRange(min, max, value);
-    }
-
-    /**
-     * @param min A long value.
-     * @param max A long value.
-     * @param value A long value.
-     * @return min if value < min, max if value > max, value otherwise.
-     */
-    public static long toRange(long min, long max, long value) {
-        return NumbersUtils.toRange(min, max, value);
-    }
-
-    /*
-     * unary operators (increment,decrement,negate)
-     */
-
-    /**
-     * @param value An int value.
-     * @return The argument incremented by one.
-     * @throws ArithmeticException if the mathematical result
-     *         is not in int range.
-     */
-    public static int incrementExact(int value) {
-        if (value == Integer.MAX_VALUE) {
-            throw new ArithmeticException("integer overflow");
-        }
-        return value + 1;
-    }
-
-    /**
-     * @param value A long value.
-     * @return The argument incremented by one.
-     * @throws ArithmeticException if the mathematical result
-     *         is not in long range.
-     */
-    public static long incrementExact(long value) {
-        if (value == Long.MAX_VALUE) {
-            throw new ArithmeticException("long overflow");
-        }
-        return value + 1L;
-    }
-
-    /**
-     * @param value An int value.
-     * @return The argument incremented by one, or the argument
-     *         if the mathematical result is not in int range.
-     */
-    public static int incrementBounded(int value) {
-        if (value == Integer.MAX_VALUE) {
-            return value;
-        }
-        return value + 1;
-    }
-
-    /**
-     * @param value A long value.
-     * @return The argument incremented by one, or the argument
-     *         if the mathematical result is not in long range.
-     */
-    public static long incrementBounded(long value) {
-        if (value == Long.MAX_VALUE) {
-            return value;
-        }
-        return value + 1L;
-    }
-
-    /**
-     * @param value An int value.
-     * @return The argument decremented by one.
-     * @throws ArithmeticException if the mathematical result
-     *         is not in int range.
-     */
-    public static int decrementExact(int value) {
-        if (value == Integer.MIN_VALUE) {
-            throw new ArithmeticException("integer overflow");
-        }
-        return value - 1;
-    }
-
-    /**
-     * @param value A long value.
-     * @return The argument decremented by one.
-     * @throws ArithmeticException if the mathematical result
-     *         is not in long range.
-     */
-    public static long decrementExact(long value) {
-        if (value == Long.MIN_VALUE) {
-            throw new ArithmeticException("long overflow");
-        }
-        return value - 1L;
-    }
-
-    /**
-     * @param value An int value.
-     * @return The argument decremented by one, or the argument
-     *         if the mathematical result is not in int range.
-     */
-    public static int decrementBounded(int value) {
-        if (value == Integer.MIN_VALUE) {
-            return value;
-        }
-        return value - 1;
-    }
-
-    /**
-     * @param value A long value.
-     * @return The argument decremented by one, or the argument
-     *         if the mathematical result is not in long range.
-     */
-    public static long decrementBounded(long value) {
-        if (value == Long.MIN_VALUE) {
-            return value;
-        }
-        return value - 1L;
-    }
-
-    /**
-     * @param value An int value.
-     * @return The argument negated.
-     * @throws ArithmeticException if the mathematical result
-     *         is not in int range.
-     */
-    public static int negateExact(int value) {
-        if (value == Integer.MIN_VALUE) {
-            throw new ArithmeticException("integer overflow");
-        }
-        return -value;
-    }
-
-    /**
-     * @param value A long value.
-     * @return The argument negated.
-     * @throws ArithmeticException if the mathematical result
-     *         is not in long range.
-     */
-    public static long negateExact(long value) {
-        if (value == Long.MIN_VALUE) {
-            throw new ArithmeticException("long overflow");
-        }
-        return -value;
-    }
-
-    /**
-     * @param value An int value.
-     * @return The argument negated, or Integer.MAX_VALUE
-     *         if the argument is Integer.MIN_VALUE.
-     */
-    public static int negateBounded(int value) {
-        if (value == Integer.MIN_VALUE) {
-            return Integer.MAX_VALUE;
-        }
-        return -value;
-    }
-
-    /**
-     * @param value A long value.
-     * @return The argument negated, or Long.MAX_VALUE
-     *         if the argument is Long.MIN_VALUE.
-     */
-    public static long negateBounded(long value) {
-        if (value == Long.MIN_VALUE) {
-            return Long.MAX_VALUE;
-        }
-        return -value;
-    }
-
-    /*
-     * binary operators (+,-,*)
-     */
-
-    /**
-     * @param a An int value.
-     * @param b An int value.
-     * @return The mathematical result of a+b.
-     * @throws ArithmeticException if the mathematical result of a+b is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
-     */
-    public static int addExact(int a, int b) {
-        return NumbersUtils.plusExact(a, b);
-    }
-
-    /**
-     * @param a A long value.
-     * @param b A long value.
-     * @return The mathematical result of a+b.
-     * @throws ArithmeticException if the mathematical result of a+b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
-     */
-    public static long addExact(long a, long b) {
-        return NumbersUtils.plusExact(a, b);
-    }
-
-    /**
-     * @param a An int value.
-     * @param b An int value.
-     * @return The int value of [Integer.MIN_VALUE,Integer.MAX_VALUE] range which is the closest to mathematical result of a+b.
-     */
-    public static int addBounded(int a, int b) {
-        return NumbersUtils.plusBounded(a, b);
-    }
-
-    /**
-     * @param a A long value.
-     * @param b A long value.
-     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a+b.
-     */
-    public static long addBounded(long a, long b) {
-        return NumbersUtils.plusBounded(a, b);
-    }
-
-    /**
-     * @param a An int value.
-     * @param b An int value.
-     * @return The mathematical result of a-b.
-     * @throws ArithmeticException if the mathematical result of a-b is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
-     */
-    public static int subtractExact(int a, int b) {
-        return NumbersUtils.minusExact(a, b);
-    }
-
-    /**
-     * @param a A long value.
-     * @param b A long value.
-     * @return The mathematical result of a-b.
-     * @throws ArithmeticException if the mathematical result of a-b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
-     */
-    public static long subtractExact(long a, long b) {
-        return NumbersUtils.minusExact(a, b);
-    }
-
-    /**
-     * @param a An int value.
-     * @param b An int value.
-     * @return The int value of [Integer.MIN_VALUE,Integer.MAX_VALUE] range which is the closest to mathematical result of a-b.
-     */
-    public static int subtractBounded(int a, int b) {
-        return NumbersUtils.minusBounded(a, b);
-    }
-
-    /**
-     * @param a A long value.
-     * @param b A long value.
-     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a-b.
-     */
-    public static long subtractBounded(long a, long b) {
-        return NumbersUtils.minusBounded(a, b);
-    }
-
-    /**
-     * @param a An int value.
-     * @param b An int value.
-     * @return The mathematical result of a*b.
-     * @throws ArithmeticException if the mathematical result of a*b is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
-     */
-    public static int multiplyExact(int a, int b) {
-        return NumbersUtils.timesExact(a, b);
-    }
-
-    /**
-     * @param a A long value.
-     * @param b An int value.
-     * @return The mathematical result of a*b.
-     * @throws ArithmeticException if the mathematical result of a*b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
-     */
-    public static long multiplyExact(long a, int b) {
-        return NumbersUtils.timesExact(a, (long) b);
-    }
-
-    /**
-     * @param a A long value.
-     * @param b A long value.
-     * @return The mathematical result of a*b.
-     * @throws ArithmeticException if the mathematical result of a*b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
-     */
-    public static long multiplyExact(long a, long b) {
-        return NumbersUtils.timesExact(a, b);
-    }
-
-    /**
-     * @param a An int value.
-     * @param b An int value.
-     * @return The int value of [Integer.MIN_VALUE,Integer.MAX_VALUE] range which is the closest to mathematical result of a*b.
-     */
-    public static int multiplyBounded(int a, int b) {
-        return NumbersUtils.timesBounded(a, b);
-    }
-
-    /**
-     * @param a A long value.
-     * @param b An int value.
-     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a*b.
-     */
-    public static long multiplyBounded(long a, int b) {
-        return NumbersUtils.timesBounded(a, (long) b);
-    }
-
-    /**
-     * @param a A long value.
-     * @param b A long value.
-     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a*b.
-     */
-    public static long multiplyBounded(long a, long b) {
-        return NumbersUtils.timesBounded(a, b);
-    }
-
-    /**
-     * @param x An int value.
-     * @param y An int value.
-     * @return The mathematical product as a long.
-     */
-    public static long multiplyFull(int x, int y) {
-        return ((long) x) * ((long) y);
-    }
-
-    /**
-     * @param x A long value.
-     * @param y A long value.
-     * @return The most significant 64 bits of the 128-bit product of two 64-bit factors.
-     */
-    public static long multiplyHigh(long x, long y) {
-        if ((x|y) < 0) {
-            // Use technique from section 8-2 of Henry S. Warren, Jr.,
-            // Hacker's Delight (2nd ed.) (Addison Wesley, 2013), 173-174.
-            long x1 = (x >> 32);
-            long y1 = (y >> 32);
-            long x2 = (x & 0xFFFFFFFFL);
-            long y2 = (y & 0xFFFFFFFFL);
-            long z2 = x2 * y2;
-            long t = x1 * y2 + (z2 >>> 32);
-            long z1 = (t & 0xFFFFFFFFL) + x2 * y1;
-            long z0 = (t >> 32);
-            return x1 * y1 + z0 + (z1 >> 32);
-        } else {
-            // Use Karatsuba technique with two base 2^32 digits.
-            long x1 = (x >>> 32);
-            long y1 = (y >>> 32);
-            long x2 = (x & 0xFFFFFFFFL);
-            long y2 = (y & 0xFFFFFFFFL);
-            long A = x1 * y1;
-            long B = x2 * y2;
-            long C = (x1 + x2) * (y1 + y2);
-            long K = C - A - B;
-            return (((B >>> 32) + K) >>> 32) + A;
-        }
-    }
-
-    /*
-     * binary operators (/,%)
-     */
-
-    /**
-     * Returns the largest int <= dividend/divisor.
-     *
-     * Unlike "/" operator, which rounds towards 0, this division
-     * rounds towards -Infinity (which give different result
-     * when the exact result is negative).
-     *
-     * @param x The dividend.
-     * @param y The divisor.
-     * @return The largest int <= dividend/divisor, unless dividend is
-     *         Integer.MIN_VALUE and divisor is -1, in which case
-     *         Integer.MIN_VALUE is returned.
-     * @throws ArithmeticException if the divisor is zero.
-     */
-    public static int floorDiv(int x, int y) {
-        int r = x / y;
-        // If the signs are different and modulo not zero, rounding down.
-        if (((x ^ y) < 0) && ((r * y) != x)) {
-            r--;
-        }
-        return r;
-    }
-
-    /**
-     * Returns the largest long <= dividend/divisor.
-     *
-     * Unlike "/" operator, which rounds towards 0, this division
-     * rounds towards -Infinity (which give different result
-     * when the exact result is negative).
-     *
-     * @param x The dividend.
-     * @param y The divisor.
-     * @return The largest long <= dividend/divisor, unless dividend is
-     *         Long.MIN_VALUE and divisor is -1, in which case
-     *         Long.MIN_VALUE is returned.
-     * @throws ArithmeticException if the divisor is zero.
-     */
-    public static long floorDiv(long x, int y) {
-        return floorDiv(x, (long) y);
-    }
-
-    /**
-     * Returns the largest long <= dividend/divisor.
-     *
-     * Unlike "/" operator, which rounds towards 0, this division
-     * rounds towards -Infinity (which give different result
-     * when the exact result is negative).
-     *
-     * @param x The dividend.
-     * @param y The divisor.
-     * @return The largest long <= dividend/divisor, unless dividend is
-     *         Long.MIN_VALUE and divisor is -1, in which case
-     *         Long.MIN_VALUE is returned.
-     * @throws ArithmeticException if the divisor is zero.
-     */
-    public static long floorDiv(long x, long y) {
-        long r = x / y;
-        // If the signs are different and modulo not zero, rounding down.
-        if (((x ^ y) < 0) && ((r * y) != x)) {
-            r--;
-        }
-        return r;
-    }
-
-    /**
-     * Returns the floor modulus, which is "x - floorDiv(x,y) * y",
-     * has the same sign as y, and is in ]-abs(y),abs(y)[.
-     *
-     * The relationship between floorMod and floorDiv is the same
-     * than between "%" and "/".
-     *
-     * @param x The dividend.
-     * @param y The divisor.
-     * @return The floor modulus, i.e. "x - (floorDiv(x, y) * y)".
-     * @throws ArithmeticException if the divisor is zero.
-     */
-    public static int floorMod(int x, int y) {
-        return x - floorDiv(x, y) * y;
-    }
-
-    /**
-     * Returns the floor modulus, which is "x - floorDiv(x,y) * y",
-     * has the same sign as y, and is in ]-abs(y),abs(y)[.
-     *
-     * The relationship between floorMod and floorDiv is the same
-     * than between "%" and "/".
-     *
-     * @param x The dividend.
-     * @param y The divisor.
-     * @return The floor modulus, i.e. "x - (floorDiv(x, y) * y)".
-     * @throws ArithmeticException if the divisor is zero.
-     */
-    public static int floorMod(long x, int y) {
-        // No overflow so can cast.
-        return (int) (x - floorDiv(x,y) * y);
-    }
-
-    /**
-     * Returns the floor modulus, which is "x - floorDiv(x,y) * y",
-     * has the same sign as y, and is in ]-abs(y),abs(y)[.
-     *
-     * The relationship between floorMod and floorDiv is the same
-     * than between "%" and "/".
-     *
-     * @param x The dividend.
-     * @param y The divisor.
-     * @return The floor modulus, i.e. "x - (floorDiv(x, y) * y)".
-     * @throws ArithmeticException if the divisor is zero.
-     */
-    public static long floorMod(long x, long y) {
-        return x - floorDiv(x, y) * y;
-    }
-
-    /*
-     * Non-redefined Math public values and treatments.
-     */
-
-    public static int min(int a, int b) {
-        return Math.min(a,b);
-    }
-
-    public static long min(long a, long b) {
-        return Math.min(a,b);
-    }
-
-    public static int max(int a, int b) {
-        return Math.max(a,b);
-    }
-
-    public static long max(long a, long b) {
-        return Math.max(a,b);
-    }
-
-    //--------------------------------------------------------------------------
-    // PACKAGE-PRIVATE METHODS
-    //--------------------------------------------------------------------------
-
-    /**
-     * @param power Must be in normal values range.
-     */
-    static double twoPowNormal(int power) {
-        if (USE_TWO_POW_TAB) {
-            return MyTTwoPow.twoPowTab[power-MIN_DOUBLE_EXPONENT];
-        } else {
-            return Double.longBitsToDouble(((long)(power+MAX_DOUBLE_EXPONENT))<<52);
-        }
-    }
-
-    /**
-     * @param power Must be in normal or subnormal values range.
-     */
-    static double twoPowNormalOrSubnormal(int power) {
-        if (USE_TWO_POW_TAB) {
-            return MyTTwoPow.twoPowTab[power-MIN_DOUBLE_EXPONENT];
-        } else {
-            if (power <= -MAX_DOUBLE_EXPONENT) { // Not normal.
-                return Double.longBitsToDouble(0x0008000000000000L>>(-(power+MAX_DOUBLE_EXPONENT)));
-            } else { // Normal.
-                return Double.longBitsToDouble(((long)(power+MAX_DOUBLE_EXPONENT))<<52);
-            }
-        }
-    }
-
-    static double atan2_pinf_yyy(double y) {
-        if (y == Double.POSITIVE_INFINITY) {
-            return Math.PI/4;
-        } else if (y == Double.NEGATIVE_INFINITY) {
-            return -Math.PI/4;
-        } else if (y > 0.0) {
-            return 0.0;
-        } else if (y < 0.0) {
-            return -0.0;
-        } else {
-            return Double.NaN;
-        }
-    }
-
-    static double atan2_ninf_yyy(double y) {
-        if (y == Double.POSITIVE_INFINITY) {
-            return 3*Math.PI/4;
-        } else if (y == Double.NEGATIVE_INFINITY) {
-            return -3*Math.PI/4;
-        } else if (y > 0.0) {
-            return Math.PI;
-        } else if (y < 0.0) {
-            return -Math.PI;
-        } else {
-            return Double.NaN;
-        }
-    }
-
-    static double atan2_yyy_zeroOrNaN(double y, double x) {
-        if (x == 0.0) {
-            if (y == 0.0) {
-                if (signFromBit_antiCyclic(x) < 0) {
-                    // x is -0.0
-                    return signFromBit_antiCyclic(y) * Math.PI;
-                } else {
-                    // +-0.0
-                    return y;
-                }
-            }
-            if (y > 0.0) {
-                return Math.PI/2;
-            } else if (y < 0.0) {
-                return -Math.PI/2;
-            } else {
-                return Double.NaN;
-            }
-        } else {
-            return Double.NaN;
-        }
-    }
-
-    /**
-     * At least one of the arguments must be NaN.
-     */
-    static double hypot_NaN(double xAbs, double yAbs) {
-        if ((xAbs == Double.POSITIVE_INFINITY) || (yAbs == Double.POSITIVE_INFINITY)) {
-            return Double.POSITIVE_INFINITY;
-        } else {
-            return Double.NaN;
-        }
-    }
-
-    /**
-     * At least one of the arguments must be NaN.
-     */
-    static double hypot_NaN(double xAbs, double yAbs, double zAbs) {
-        if ((xAbs == Double.POSITIVE_INFINITY) || (yAbs == Double.POSITIVE_INFINITY) || (zAbs == Double.POSITIVE_INFINITY)) {
-            return Double.POSITIVE_INFINITY;
-        } else {
-            return Double.NaN;
-        }
-    }
-
-    /*
-     *
-     */
-
-    /**
-     * @param remainder Must have 1 for 2nd and 3rd exponent bits, which is the
-     *        case for heavyRemPiO2 remainders (their absolute values are >=
-     *        Double.longBitsToDouble(0x3000000000000000L)
-     *        = 1.727233711018889E-77, and even if they were not, turning these
-     *        bits from 0 to 1 on decoding would not change the absolute error
-     *        much), and also works for +-Infinity or NaN encoding.
-     * @param quadrant Must be in [0,3].
-     * @return Bits holding remainder, and quadrant instead of
-     *         reamainder's 2nd and 3rd exponent bits.
-     */
-    static long encodeRemainderAndQuadrant(double remainder, int quadrant) {
-        final long bits = Double.doubleToRawLongBits(remainder);
-        return (bits&QUADRANT_BITS_0_MASK)|(((long)quadrant)<<60);
-    }
-
-    static double decodeRemainder(long bits) {
-        return Double.longBitsToDouble((bits&QUADRANT_BITS_0_MASK)|QUADRANT_PLACE_BITS);
-    }
-
-    static int decodeQuadrant(long bits) {
-        return ((int)(bits>>60))&3;
-    }
-
-    /*
-     * JDK-based remainders.
-     * Since a strict one for (% (PI/2)) is needed for heavyRemainderPiO2,
-     * we need it in this class.
-     * Then, for homogeneity, we put them all in this class.
-     * Then, to avoid code duplication for these slow-anyway methods,
-     * we just stick with strict versions, for both FastMath and StrictFastMath.
-     */
-
-    /**
-     * @param angle Angle, in radians.
-     * @return Remainder of (angle % (2*PI)), in [-PI,PI].
-     */
-    static strictfp double jdkRemainderTwoPi(double angle) {
-        final double sin = StrictMath.sin(angle);
-        final double cos = StrictMath.cos(angle);
-        return StrictMath.atan2(sin, cos);
-    }
-
-    /**
-     * @param angle Angle, in radians.
-     * @return Remainder of (angle % PI), in [-PI/2,PI/2].
-     */
-    static strictfp double jdkRemainderPi(double angle) {
-        final double sin = StrictMath.sin(angle);
-        final double cos = StrictMath.cos(angle);
-        /*
-         * Making sure atan2's result ends up in [-PI/2,PI/2],
-         * i.e. has maximum accuracy.
-         */
-        return StrictMath.atan2(sin, Math.abs(cos));
-    }
-
-    /**
-     * @param angle Angle, in radians.
-     * @return Bits of double corresponding to remainder of (angle % (PI/2)),
-     *         in [-PI/4,PI/4], with quadrant encoded in exponent bits.
-     */
-    static strictfp long jdkRemainderPiO2(double angle, boolean negateRem) {
-        final double sin = StrictMath.sin(angle);
-        final double cos = StrictMath.cos(angle);
-
-        /*
-         * Computing quadrant first, and then computing
-         * atan2, to make sure its result ends up in [-PI/4,PI/4],
-         * i.e. has maximum accuracy.
-         */
-
-        final int q;
-        final double sinForAtan2;
-        final double cosForAtan2;
-        if (cos >= (SQRT_2/2)) {
-            // [-PI/4,PI/4]
-            q = 0;
-            sinForAtan2 = sin;
-            cosForAtan2 = cos;
-        } else if (cos <= -(SQRT_2/2)) {
-            // [3*PI/4,5*PI/4]
-            q = 2;
-            sinForAtan2 = -sin;
-            cosForAtan2 = -cos;
-        } else if (sin > 0.0) {
-            // [PI/4,3*PI/4]
-            q = 1;
-            sinForAtan2 = -cos;
-            cosForAtan2 = sin;
-        } else {
-            // [5*PI/4,7*PI/4]
-            q = 3;
-            sinForAtan2 = cos;
-            cosForAtan2 = -sin;
-        }
-
-        double fw = StrictMath.atan2(sinForAtan2, cosForAtan2);
-
-        return encodeRemainderAndQuadrant(negateRem ? -fw : fw, q);
-    }
-
-    /*
-     * Our remainders implementations.
-     */
-
-    /**
-     * @param angle Angle, in radians. Must not be NaN nor +-Infinity.
-     * @return Remainder of (angle % (2*PI)), in [-PI,PI].
-     */
-    static strictfp double heavyRemainderTwoPi(double angle) {
-        final long remAndQuad = heavyRemainderPiO2(angle, false);
-        final double rem = decodeRemainder(remAndQuad);
-        final int q = decodeQuadrant(remAndQuad);
-        if (q == 0) {
-            return rem;
-        } else if (q == 1) {
-            return (rem + PIO2_LO) + PIO2_HI;
-        } else if (q == 2) {
-            if (rem < 0.0) {
-                return (rem + PI_LO) + PI_HI;
-            } else {
-                return (rem - PI_LO) - PI_HI;
-            }
-        } else {
-            return (rem - PIO2_LO) - PIO2_HI;
-        }
-    }
-
-    /**
-     * @param angle Angle, in radians. Must not be NaN nor +-Infinity.
-     * @return Remainder of (angle % PI), in [-PI/2,PI/2].
-     */
-    static strictfp double heavyRemainderPi(double angle) {
-        final long remAndQuad = heavyRemainderPiO2(angle, false);
-        final double rem = decodeRemainder(remAndQuad);
-        final int q = decodeQuadrant(remAndQuad);
-        if ((q&1) != 0) {
-            // q is 1 or 3
-            if (rem < 0.0) {
-                return (rem + PIO2_LO) + PIO2_HI;
-            } else {
-                return (rem - PIO2_LO) - PIO2_HI;
-            }
-        }
-        return rem;
-    }
-
-    /**
-     * Remainder using an accurate definition of PI.
-     * Derived from a fdlibm treatment called __kernel_rem_pio2.
-     *
-     * Not defining a non-strictfp version for FastMath, to avoid duplicating
-     * its long and messy code, and because it's slow anyway, and should be
-     * rarely used when speed matters.
-     *
-     * @param angle Angle, in radians. Must not be NaN nor +-Infinity.
-     * @param negateRem True if remainder must be negated before encoded into returned long.
-     * @return Bits of double corresponding to remainder of (angle % (PI/2)),
-     *         in [-PI/4,PI/4], with quadrant encoded in exponent bits.
-     */
-    static strictfp long heavyRemainderPiO2(double angle, boolean negateRem) {
-
-        /*
-         * fdlibm treatments unrolled, to avoid garbage and be OOME-free,
-         * corresponding to:
-         * 1) initial jk = 4 (precision = 3 = 64 bits (extended)),
-         *    which is more accurate than using precision = 2
-         *    (53 bits, double), even though we work with doubles
-         *    and use strictfp!
-         * 2) max lengths of 8 for f[], 6 for q[], fq[] and iq[].
-         * 3) at most one recomputation (one goto).
-         * These limitations were experimentally found to
-         * be sufficient for billions of random doubles
-         * of random magnitudes.
-         * For the rare cases that our unrolled treatments can't handle,
-         * we fall back to a JDK-based implementation.
-         */
-
-        int n,i,j,ih;
-        double fw;
-
-        /*
-         * Turning angle into 24-bits integer chunks.
-         * Done outside __kernel_rem_pio2, but we factor it inside our method.
-         */
-
-        // Reworking exponent to have a value < 2^24.
-        final long lx = Double.doubleToRawLongBits(angle);
-        final long exp = ((lx>>52)&0x7FF) - (1023+23);
-        double z = Double.longBitsToDouble(lx - (exp<<52));
-
-        double x0 = (double)(int)z;
-        z = (z-x0)*TWO_POW_24;
-        double x1 = (double)(int)z;
-        z = (z-x1)*TWO_POW_24;
-        double x2 = (double)(int)z;
-
-        final int e0 = (int)exp;
-        // in [1,3]
-        final int nx = (x2 == 0.0) ? ((x1 == 0.0) ? 1 : 2) : 3;
-
-        /*
-         *
-         */
-
-        double f0,f1,f2,f3,f4,f5,f6,f7;
-        double q0,q1,q2,q3,q4,q5;
-        int iq0,iq1,iq2,iq3,iq4,iq5;
-
-        int jk = 4;
-
-        int jx = nx-1;
-        int jv = Math.max(0,(e0-3)/24);
-        // In fdlibm, this is q0, but we prefer to use q0 for q[0].
-        int qZero = e0-24*(jv+1);
-
-        j = jv-jx;
-        if (jx == 0) {
-            f6 = 0.0;
-            f5 = 0.0;
-            f4 = (j >= -4) ? TWO_OVER_PI_TAB[j+4] : 0.0;
-            f3 = (j >= -3) ? TWO_OVER_PI_TAB[j+3] : 0.0;
-            f2 = (j >= -2) ? TWO_OVER_PI_TAB[j+2] : 0.0;
-            f1 = (j >= -1) ? TWO_OVER_PI_TAB[j+1] : 0.0;
-            f0 = (j >= 0) ? TWO_OVER_PI_TAB[j] : 0.0;
-
-            q0 = x0*f0;
-            q1 = x0*f1;
-            q2 = x0*f2;
-            q3 = x0*f3;
-            q4 = x0*f4;
-        } else if (jx == 1) {
-            f6 = 0.0;
-            f5 = (j >= -5) ? TWO_OVER_PI_TAB[j+5] : 0.0;
-            f4 = (j >= -4) ? TWO_OVER_PI_TAB[j+4] : 0.0;
-            f3 = (j >= -3) ? TWO_OVER_PI_TAB[j+3] : 0.0;
-            f2 = (j >= -2) ? TWO_OVER_PI_TAB[j+2] : 0.0;
-            f1 = (j >= -1) ? TWO_OVER_PI_TAB[j+1] : 0.0;
-            f0 = (j >= 0) ? TWO_OVER_PI_TAB[j] : 0.0;
-
-            q0 = x0*f1 + x1*f0;
-            q1 = x0*f2 + x1*f1;
-            q2 = x0*f3 + x1*f2;
-            q3 = x0*f4 + x1*f3;
-            q4 = x0*f5 + x1*f4;
-        } else { // jx == 2
-            f6 = (j >= -6) ? TWO_OVER_PI_TAB[j+6] : 0.0;
-            f5 = (j >= -5) ? TWO_OVER_PI_TAB[j+5] : 0.0;
-            f4 = (j >= -4) ? TWO_OVER_PI_TAB[j+4] : 0.0;
-            f3 = (j >= -3) ? TWO_OVER_PI_TAB[j+3] : 0.0;
-            f2 = (j >= -2) ? TWO_OVER_PI_TAB[j+2] : 0.0;
-            f1 = (j >= -1) ? TWO_OVER_PI_TAB[j+1] : 0.0;
-            f0 = (j >= 0) ? TWO_OVER_PI_TAB[j] : 0.0;
-
-            q0 = x0*f2 + x1*f1 + x2*f0;
-            q1 = x0*f3 + x1*f2 + x2*f1;
-            q2 = x0*f4 + x1*f3 + x2*f2;
-            q3 = x0*f5 + x1*f4 + x2*f3;
-            q4 = x0*f6 + x1*f5 + x2*f4;
-        }
-
-        double twoPowQZero = twoPowNormal(qZero);
-
-        int jz = jk;
-
-        /*
-         * Unrolling of first round.
-         */
-
-        z = q4;
-        fw = (double)(int)(TWO_POW_N24*z);
-        iq0 = (int)(z-TWO_POW_24*fw);
-        z = q3+fw;
-        fw = (double)(int)(TWO_POW_N24*z);
-        iq1 = (int)(z-TWO_POW_24*fw);
-        z = q2+fw;
-        fw = (double)(int)(TWO_POW_N24*z);
-        iq2 = (int)(z-TWO_POW_24*fw);
-        z = q1+fw;
-        fw = (double)(int)(TWO_POW_N24*z);
-        iq3 = (int)(z-TWO_POW_24*fw);
-        z = q0+fw;
-        iq4 = 0;
-        iq5 = 0;
-
-        z = (z*twoPowQZero) % 8.0;
-        n = (int)z;
-        z -= (double)n;
-
-        ih = 0;
-        if (qZero > 0) {
-            // Parentheses against code formatter bug.
-            i = (iq3>>(24-qZero));
-            n += i;
-            iq3 -= i<<(24-qZero);
-            ih = iq3>>(23-qZero);
-        } else if (qZero == 0) {
-            ih = iq3>>23;
-        } else if (z >= 0.5) {
-            ih = 2;
-        }
-
-        if (ih > 0) {
-            n += 1;
-            // carry = 1 is common case,
-            // so using it as initial value.
-            int carry = 1;
-            if (iq0 != 0) {
-                iq0 = 0x1000000 - iq0;
-                iq1 = 0xFFFFFF - iq1;
-                iq2 = 0xFFFFFF - iq2;
-                iq3 = 0xFFFFFF - iq3;
-            } else if (iq1 != 0) {
-                iq1 = 0x1000000 - iq1;
-                iq2 = 0xFFFFFF - iq2;
-                iq3 = 0xFFFFFF - iq3;
-            } else if (iq2 != 0) {
-                iq2 = 0x1000000 - iq2;
-                iq3 = 0xFFFFFF - iq3;
-            } else if (iq3 != 0) {
-                iq3 = 0x1000000 - iq3;
-            } else {
-                carry = 0;
-            }
-            if (qZero > 0) {
-                if (qZero == 1) {
-                    iq3 &= 0x7FFFFF;
-                } else if (qZero == 2) {
-                    iq3 &= 0x3FFFFF;
-                }
-            }
-            if (ih == 2) {
-                z = 1.0 - z;
-                if (carry != 0) {
-                    z -= twoPowQZero;
-                }
-            }
-        }
-
-        if (z == 0.0) {
-            if (iq3 == 0) {
-                // With random values of random magnitude,
-                // probability for this to happen seems lower than 1e-6.
-                // jz would be more than just incremented by one,
-                // which our unrolling doesn't support.
-                return jdkRemainderPiO2(angle, negateRem);
-            }
-            if (jx == 0) {
-                f5 = TWO_OVER_PI_TAB[jv+5];
-                q5 = x0*f5;
-            } else if (jx == 1) {
-                f6 = TWO_OVER_PI_TAB[jv+5];
-                q5 = x0*f6 + x1*f5;
-            } else { // jx == 2
-                f7 = TWO_OVER_PI_TAB[jv+5];
-                q5 = x0*f7 + x1*f6 + x2*f5;
-            }
-
-            jz++;
-
-            /*
-             * Unrolling of second round.
-             */
-
-            z = q5;
-            fw = (double)(int)(TWO_POW_N24*z);
-            iq0 = (int)(z-TWO_POW_24*fw);
-            z = q4+fw;
-            fw = (double)(int)(TWO_POW_N24*z);
-            iq1 = (int)(z-TWO_POW_24*fw);
-            z = q3+fw;
-            fw = (double)(int)(TWO_POW_N24*z);
-            iq2 = (int)(z-TWO_POW_24*fw);
-            z = q2+fw;
-            fw = (double)(int)(TWO_POW_N24*z);
-            iq3 = (int)(z-TWO_POW_24*fw);
-            z = q1+fw;
-            fw = (double)(int)(TWO_POW_N24*z);
-            iq4 = (int)(z-TWO_POW_24*fw);
-            z = q0+fw;
-            iq5 = 0;
-
-            z = (z*twoPowQZero) % 8.0;
-            n = (int)z;
-            z -= (double)n;
-
-            ih = 0;
-            if (qZero > 0) {
-                // Parentheses against code formatter bug.
-                i = (iq4>>(24-qZero));
-                n += i;
-                iq4 -= i<<(24-qZero);
-                ih = iq4>>(23-qZero);
-            } else if (qZero == 0) {
-                ih = iq4>>23;
-            } else if (z >= 0.5) {
-                ih = 2;
-            }
-
-            if (ih > 0) {
-                n += 1;
-                // carry = 1 is common case,
-                // so using it as initial value.
-                int carry = 1;
-                if (iq0 != 0) {
-                    iq0 = 0x1000000 - iq0;
-                    iq1 = 0xFFFFFF - iq1;
-                    iq2 = 0xFFFFFF - iq2;
-                    iq3 = 0xFFFFFF - iq3;
-                    iq4 = 0xFFFFFF - iq4;
-                } else if (iq1 != 0) {
-                    iq1 = 0x1000000 - iq1;
-                    iq2 = 0xFFFFFF - iq2;
-                    iq3 = 0xFFFFFF - iq3;
-                    iq4 = 0xFFFFFF - iq4;
-                } else if (iq2 != 0) {
-                    iq2 = 0x1000000 - iq2;
-                    iq3 = 0xFFFFFF - iq3;
-                    iq4 = 0xFFFFFF - iq4;
-                } else if (iq3 != 0) {
-                    iq3 = 0x1000000 - iq3;
-                    iq4 = 0xFFFFFF - iq4;
-                } else if (iq4 != 0) {
-                    iq4 = 0x1000000 - iq4;
-                } else {
-                    carry = 0;
-                }
-                if (qZero > 0) {
-                    if (qZero == 1) {
-                        iq4 &= 0x7FFFFF;
-                    } else if (qZero == 2) {
-                        iq4 &= 0x3FFFFF;
-                    }
-                }
-                if (ih == 2) {
-                    z = 1.0 - z;
-                    if (carry != 0) {
-                        z -= twoPowQZero;
-                    }
-                }
-            }
-
-            if (z == 0.0) {
-                if (iq4 == 0) {
-                    // Case not encountered in tests, but still handling it.
-                    // Would require a third loop unrolling.
-                    return jdkRemainderPiO2(angle, negateRem);
-                } else {
-                    // z == 0.0, and iq4 != 0,
-                    // so we remove 24 from qZero only once,
-                    // but since we no longer use qZero,
-                    // we just bother to multiply its 2-power
-                    // by 2^-24.
-                    jz--;
-                    twoPowQZero *= TWO_POW_N24;
-                }
-            } else {
-                // z != 0.0 at end of second round.
-            }
-        } else {
-            // z != 0.0 at end of first round.
-        }
-
-        /*
-         * After loop.
-         */
-
-        if (z != 0.0) {
-            z /= twoPowQZero;
-            if (z >= TWO_POW_24) {
-                fw = (double)(int)(TWO_POW_N24*z);
-                if (jz == jk) {
-                    iq4 = (int)(z-TWO_POW_24*fw);
-                    jz++; // jz to 5
-                    // Not using qZero anymore so not updating it.
-                    twoPowQZero *= TWO_POW_24;
-                    iq5 = (int)fw;
-                } else { // jz == jk+1 == 5
-                    // Case not encountered in tests, but still handling it.
-                    // Would require use of iq6, with jz = 6.
-                    return jdkRemainderPiO2(angle, negateRem);
-                }
-            } else {
-                if (jz == jk) {
-                    iq4 = (int)z;
-                } else { // jz == jk+1 == 5
-                    // Case not encountered in tests, but still handling it.
-                    iq5 = (int)z;
-                }
-            }
-        }
-
-        fw = twoPowQZero;
-
-        if (jz == 5) {
-            q5 = fw*(double)iq5;
-            fw *= TWO_POW_N24;
-        } else {
-            q5 = 0.0;
-        }
-        q4 = fw*(double)iq4;
-        fw *= TWO_POW_N24;
-        q3 = fw*(double)iq3;
-        fw *= TWO_POW_N24;
-        q2 = fw*(double)iq2;
-        fw *= TWO_POW_N24;
-        q1 = fw*(double)iq1;
-        fw *= TWO_POW_N24;
-        q0 = fw*(double)iq0;
-
-        /*
-         * We just use HI part of the result.
-         */
-
-        fw = PIO2_TAB0*q5;
-        fw += PIO2_TAB0*q4 + PIO2_TAB1*q5;
-        fw += PIO2_TAB0*q3 + PIO2_TAB1*q4 + PIO2_TAB2*q5;
-        fw += PIO2_TAB0*q2 + PIO2_TAB1*q3 + PIO2_TAB2*q4 + PIO2_TAB3*q5;
-        fw += PIO2_TAB0*q1 + PIO2_TAB1*q2 + PIO2_TAB2*q3 + PIO2_TAB3*q4 + PIO2_TAB4*q5;
-        fw += PIO2_TAB0*q0 + PIO2_TAB1*q1 + PIO2_TAB2*q2 + PIO2_TAB3*q3 + PIO2_TAB4*q4 + PIO2_TAB5*q5;
-
-        if ((ih != 0) ^ negateRem) {
-            fw = -fw;
-        }
-
-        return encodeRemainderAndQuadrant(fw, n&3);
-    }
-
-    //--------------------------------------------------------------------------
-    // PRIVATE METHODS
-    //--------------------------------------------------------------------------
-
-    /**
-     * Redefined here, to avoid cyclic dependency with (Strict)FastMath.
-     *
-     * @param value A double value.
-     * @return -1 if sign bit is 1, 1 if sign bit is 0.
-     */
-    private static long signFromBit_antiCyclic(double value) {
-        // Returning a long, to avoid useless cast into int.
-        return ((Double.doubleToRawLongBits(value)>>62)|1);
-    }
-
-    private static boolean getBooleanProperty(
-            final String key,
-            boolean defaultValue) {
-        final String tmp = System.getProperty(key);
-        if (tmp != null) {
-            return Boolean.parseBoolean(tmp);
-        } else {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * Use look-up tables size power through this method,
-     * to make sure is it small in case java.lang.Math
-     * is directly used.
-     */
-    private static int getTabSizePower(int tabSizePower) {
-        return (FM_USE_JDK_MATH && SFM_USE_JDK_MATH) ? Math.min(2, tabSizePower) : tabSizePower;
-    }
-}
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/DoubleWrapper.java b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/DoubleWrapper.java
deleted file mode 100644
index e7adc8d59..000000000
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/DoubleWrapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-package space.kscience.kmath.jafama;
-
-public class DoubleWrapper {
-    public double value;
-    @Override
-    public String toString() {
-        return Double.toString(this.value);
-    }
-}
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/FastMath.java b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/FastMath.java
deleted file mode 100644
index a83c01f7b..000000000
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/FastMath.java
+++ /dev/null
@@ -1,2986 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.jafama;
-
-/**
- * Faster (hopefully) versions of java.lang.Math methods, plus additional ones.
- * Cf. README.txt for more info.
- */
-public final class FastMath extends CmnFastMath {
-
-    //--------------------------------------------------------------------------
-    // CONFIGURATION
-    //--------------------------------------------------------------------------
-
-    private static final boolean USE_JDK_MATH = FM_USE_JDK_MATH;
-
-    private static final boolean USE_REDEFINED_LOG = FM_USE_REDEFINED_LOG;
-
-    private static final boolean USE_REDEFINED_SQRT = FM_USE_REDEFINED_SQRT;
-
-    private static final boolean USE_POWTABS_FOR_ASIN = FM_USE_POWTABS_FOR_ASIN;
-
-    //--------------------------------------------------------------------------
-    // PUBLIC METHODS
-    //--------------------------------------------------------------------------
-
-    /*
-     * trigonometry
-     */
-
-    /**
-     * @param angle Angle in radians.
-     * @return Angle sine.
-     */
-    public static double sin(double angle) {
-        if (USE_JDK_MATH) {
-            return Math.sin(angle);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        if (angle > SIN_COS_MAX_VALUE_FOR_INT_MODULO) {
-            if (false) {
-                // Can give very bad relative error near PI (mod 2*PI).
-                angle = remainderTwoPi(angle);
-                if (angle < 0.0) {
-                    angle = -angle;
-                    negateResult = !negateResult;
-                }
-            } else {
-                final long remAndQuad = remainderPiO2(angle);
-                angle = decodeRemainder(remAndQuad);
-                final double sin;
-                final int q = decodeQuadrant(remAndQuad);
-                if (q == 0) {
-                    sin = sin(angle);
-                } else if (q == 1) {
-                    sin = cos(angle);
-                } else if (q == 2) {
-                    sin = -sin(angle);
-                } else {
-                    sin = -cos(angle);
-                }
-                return (negateResult ? -sin : sin);
-            }
-        }
-        // index: possibly outside tables range.
-        int index = (int)(angle * SIN_COS_INDEXER + 0.5);
-        double delta = (angle - index * SIN_COS_DELTA_HI) - index * SIN_COS_DELTA_LO;
-        // Making sure index is within tables range.
-        // Last value of each table is the same than first,
-        // so we ignore it (tabs size minus one) for modulo.
-        index &= (SIN_COS_TABS_SIZE-2); // index % (SIN_COS_TABS_SIZE-1)
-        double indexSin = MyTSinCos.sinTab[index];
-        double indexCos = MyTSinCos.cosTab[index];
-        double result = indexSin + delta * (indexCos + delta * (-indexSin * ONE_DIV_F2 + delta * (-indexCos * ONE_DIV_F3 + delta * indexSin * ONE_DIV_F4)));
-        return negateResult ? -result : result;
-    }
-
-    /**
-     * Quick sin, with accuracy of about 1.6e-3 (PI/<look-up tabs size>)
-     * for |angle| < 6588395.0 (Integer.MAX_VALUE * (2*PI/<look-up tabs size>) - 2)
-     * (- 2 due to removing PI/2 before using cosine tab),
-     * and no accuracy at all for larger values.
-     *
-     * @param angle Angle in radians.
-     * @return Angle sine.
-     */
-    public static double sinQuick(double angle) {
-        if (USE_JDK_MATH) {
-            return Math.sin(angle);
-        }
-        return MyTSinCos.cosTab[((int)(Math.abs(angle-Math.PI/2) * SIN_COS_INDEXER + 0.5)) & (SIN_COS_TABS_SIZE-2)];
-    }
-
-    /**
-     * @param angle Angle in radians.
-     * @return Angle cosine.
-     */
-    public static double cos(double angle) {
-        if (USE_JDK_MATH) {
-            return Math.cos(angle);
-        }
-        angle = Math.abs(angle);
-        if (angle > SIN_COS_MAX_VALUE_FOR_INT_MODULO) {
-            if (false) {
-                // Can give very bad relative error near PI (mod 2*PI).
-                angle = remainderTwoPi(angle);
-                if (angle < 0.0) {
-                    angle = -angle;
-                }
-            } else {
-                final long remAndQuad = remainderPiO2(angle);
-                angle = decodeRemainder(remAndQuad);
-                final double cos;
-                final int q = decodeQuadrant(remAndQuad);
-                if (q == 0) {
-                    cos = cos(angle);
-                } else if (q == 1) {
-                    cos = -sin(angle);
-                } else if (q == 2) {
-                    cos = -cos(angle);
-                } else {
-                    cos = sin(angle);
-                }
-                return cos;
-            }
-        }
-        // index: possibly outside tables range.
-        int index = (int)(angle * SIN_COS_INDEXER + 0.5);
-        double delta = (angle - index * SIN_COS_DELTA_HI) - index * SIN_COS_DELTA_LO;
-        // Making sure index is within tables range.
-        // Last value of each table is the same than first,
-        // so we ignore it (tabs size minus one) for modulo.
-        index &= (SIN_COS_TABS_SIZE-2); // index % (SIN_COS_TABS_SIZE-1)
-        double indexCos = MyTSinCos.cosTab[index];
-        double indexSin = MyTSinCos.sinTab[index];
-        return indexCos + delta * (-indexSin + delta * (-indexCos * ONE_DIV_F2 + delta * (indexSin * ONE_DIV_F3 + delta * indexCos * ONE_DIV_F4)));
-    }
-
-    /**
-     * Quick cos, with accuracy of about 1.6e-3 (PI/<look-up tabs size>)
-     * for |angle| < 6588397.0 (Integer.MAX_VALUE * (2*PI/<look-up tabs size>)),
-     * and no accuracy at all for larger values.
-     *
-     * @param angle Angle in radians.
-     * @return Angle cosine.
-     */
-    public static double cosQuick(double angle) {
-        if (USE_JDK_MATH) {
-            return Math.cos(angle);
-        }
-        return MyTSinCos.cosTab[((int)(Math.abs(angle) * SIN_COS_INDEXER + 0.5)) & (SIN_COS_TABS_SIZE-2)];
-    }
-
-    /**
-     * Computes sine and cosine together.
-     *
-     * @param angle Angle in radians.
-     * @param cosine (out) Angle cosine.
-     * @return Angle sine.
-     */
-    public static double sinAndCos(double angle, DoubleWrapper cosine) {
-        if (USE_JDK_MATH) {
-            cosine.value = Math.cos(angle);
-            return Math.sin(angle);
-        }
-        // Using the same algorithm than sin(double) method,
-        // and computing also cosine at the end.
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        if (angle > SIN_COS_MAX_VALUE_FOR_INT_MODULO) {
-            if (false) {
-                // Can give very bad relative error near PI (mod 2*PI).
-                angle = remainderTwoPi(angle);
-                if (angle < 0.0) {
-                    angle = -angle;
-                    negateResult = !negateResult;
-                }
-            } else {
-                final long remAndQuad = remainderPiO2(angle);
-                angle = decodeRemainder(remAndQuad);
-                final double sin;
-                final int q = decodeQuadrant(remAndQuad);
-                if (q == 0) {
-                    sin = sin(angle);
-                    cosine.value = cos(angle);
-                } else if (q == 1) {
-                    sin = cos(angle);
-                    cosine.value = -sin(angle);
-                } else if (q == 2) {
-                    sin = -sin(angle);
-                    cosine.value = -cos(angle);
-                } else {
-                    sin = -cos(angle);
-                    cosine.value = sin(angle);
-                }
-                return (negateResult ? -sin : sin);
-            }
-        }
-        int index = (int)(angle * SIN_COS_INDEXER + 0.5);
-        double delta = (angle - index * SIN_COS_DELTA_HI) - index * SIN_COS_DELTA_LO;
-        index &= (SIN_COS_TABS_SIZE-2); // index % (SIN_COS_TABS_SIZE-1)
-        double indexSin = MyTSinCos.sinTab[index];
-        double indexCos = MyTSinCos.cosTab[index];
-        // Could factor some multiplications (delta * factorials), but then is less accurate.
-        cosine.value = indexCos + delta * (-indexSin + delta * (-indexCos * ONE_DIV_F2 + delta * (indexSin * ONE_DIV_F3 + delta * indexCos * ONE_DIV_F4)));
-        double result = indexSin + delta * (indexCos + delta * (-indexSin * ONE_DIV_F2 + delta * (-indexCos * ONE_DIV_F3 + delta * indexSin * ONE_DIV_F4)));
-        return negateResult ? -result : result;
-    }
-
-    /**
-     * Can have very bad relative error near +-PI/2,
-     * but of the same magnitude than the relative delta between
-     * StrictMath.tan(PI/2) and StrictMath.tan(nextDown(PI/2)).
-     *
-     * @param angle Angle in radians.
-     * @return Angle tangent.
-     */
-    public static double tan(double angle) {
-        if (USE_JDK_MATH) {
-            return Math.tan(angle);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        if (angle > TAN_MAX_VALUE_FOR_INT_MODULO) {
-            angle = remainderPi(angle);
-            if (angle < 0.0) {
-                angle = -angle;
-                negateResult = !negateResult;
-            }
-        }
-        // index: possibly outside tables range.
-        int index = (int)(angle * TAN_INDEXER + 0.5);
-        double delta = (angle - index * TAN_DELTA_HI) - index * TAN_DELTA_LO;
-        // Making sure index is within tables range.
-        // index modulo PI, i.e. 2*(virtual tab size minus one).
-        index &= (2*(TAN_VIRTUAL_TABS_SIZE-1)-1); // index % (2*(TAN_VIRTUAL_TABS_SIZE-1))
-        // Here, index is in [0,2*(TAN_VIRTUAL_TABS_SIZE-1)-1], i.e. indicates an angle in [0,PI[.
-        if (index > (TAN_VIRTUAL_TABS_SIZE-1)) {
-            index = (2*(TAN_VIRTUAL_TABS_SIZE-1)) - index;
-            delta = -delta;
-            negateResult = !negateResult;
-        }
-        double result;
-        if (index < TAN_TABS_SIZE) {
-            result = MyTTan.tanTab[index]
-                    + delta * (MyTTan.tanDer1DivF1Tab[index]
-                            + delta * (MyTTan.tanDer2DivF2Tab[index]
-                                    + delta * (MyTTan.tanDer3DivF3Tab[index]
-                                            + delta * MyTTan.tanDer4DivF4Tab[index])));
-        } else { // angle in ]TAN_MAX_VALUE_FOR_TABS,TAN_MAX_VALUE_FOR_INT_MODULO], or angle is NaN
-            // Using tan(angle) == 1/tan(PI/2-angle) formula: changing angle (index and delta), and inverting.
-            index = (TAN_VIRTUAL_TABS_SIZE-1) - index;
-            result = 1/(MyTTan.tanTab[index]
-                    - delta * (MyTTan.tanDer1DivF1Tab[index]
-                            - delta * (MyTTan.tanDer2DivF2Tab[index]
-                                    - delta * (MyTTan.tanDer3DivF3Tab[index]
-                                            - delta * MyTTan.tanDer4DivF4Tab[index]))));
-        }
-        return negateResult ? -result : result;
-    }
-
-    /**
-     * @param value Value in [-1,1].
-     * @return Value arcsine, in radians, in [-PI/2,PI/2].
-     */
-    public static double asin(double value) {
-        if (USE_JDK_MATH) {
-            return Math.asin(value);
-        }
-        boolean negateResult = false;
-        if (value < 0.0) {
-            value = -value;
-            negateResult = true;
-        }
-        if (value <= ASIN_MAX_VALUE_FOR_TABS) {
-            int index = (int)(value * ASIN_INDEXER + 0.5);
-            double delta = value - index * ASIN_DELTA;
-            double result = MyTAsin.asinTab[index]
-                    + delta * (MyTAsin.asinDer1DivF1Tab[index]
-                            + delta * (MyTAsin.asinDer2DivF2Tab[index]
-                                    + delta * (MyTAsin.asinDer3DivF3Tab[index]
-                                            + delta * MyTAsin.asinDer4DivF4Tab[index])));
-            return negateResult ? -result : result;
-        } else if (USE_POWTABS_FOR_ASIN && (value <= ASIN_MAX_VALUE_FOR_POWTABS)) {
-            int index = (int)(powFast(value * ASIN_POWTABS_ONE_DIV_MAX_VALUE, ASIN_POWTABS_POWER) * ASIN_POWTABS_SIZE_MINUS_ONE + 0.5);
-            double delta = value - MyTAsinPow.asinParamPowTab[index];
-            double result = MyTAsinPow.asinPowTab[index]
-                    + delta * (MyTAsinPow.asinDer1DivF1PowTab[index]
-                            + delta * (MyTAsinPow.asinDer2DivF2PowTab[index]
-                                    + delta * (MyTAsinPow.asinDer3DivF3PowTab[index]
-                                            + delta * MyTAsinPow.asinDer4DivF4PowTab[index])));
-            return negateResult ? -result : result;
-        } else { // value > ASIN_MAX_VALUE_FOR_TABS, or value is NaN
-            // This part is derived from fdlibm.
-            if (value < 1.0) {
-                double t = (1.0 - value)*0.5;
-                double p = t*(ASIN_PS0+t*(ASIN_PS1+t*(ASIN_PS2+t*(ASIN_PS3+t*(ASIN_PS4+t*ASIN_PS5)))));
-                double q = 1.0+t*(ASIN_QS1+t*(ASIN_QS2+t*(ASIN_QS3+t*ASIN_QS4)));
-                double s = sqrt(t);
-                double z = s+s*(p/q);
-                double result = ASIN_PIO2_HI-((z+z)-ASIN_PIO2_LO);
-                return negateResult ? -result : result;
-            } else { // value >= 1.0, or value is NaN
-                if (value == 1.0) {
-                    return negateResult ? -Math.PI/2 : Math.PI/2;
-                } else {
-                    return Double.NaN;
-                }
-            }
-        }
-    }
-
-    /**
-     * If value is not NaN and is outside [-1,1] range, closest value in this range is used.
-     *
-     * @param value Value in [-1,1].
-     * @return Value arcsine, in radians, in [-PI/2,PI/2].
-     */
-    public static double asinInRange(double value) {
-        if (value <= -1.0) {
-            return -Math.PI/2;
-        } else if (value >= 1.0) {
-            return Math.PI/2;
-        } else {
-            return asin(value);
-        }
-    }
-
-    /**
-     * @param value Value in [-1,1].
-     * @return Value arccosine, in radians, in [0,PI].
-     */
-    public static double acos(double value) {
-        if (USE_JDK_MATH) {
-            return Math.acos(value);
-        }
-        return Math.PI/2 - asin(value);
-    }
-
-    /**
-     * If value is not NaN and is outside [-1,1] range,
-     * closest value in this range is used.
-     *
-     * @param value Value in [-1,1].
-     * @return Value arccosine, in radians, in [0,PI].
-     */
-    public static double acosInRange(double value) {
-        if (value <= -1.0) {
-            return Math.PI;
-        } else if (value >= 1.0) {
-            return 0.0;
-        } else {
-            return acos(value);
-        }
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value arctangent, in radians, in [-PI/2,PI/2].
-     */
-    public static double atan(double value) {
-        if (USE_JDK_MATH) {
-            return Math.atan(value);
-        }
-        boolean negateResult = false;
-        if (value < 0.0) {
-            value = -value;
-            negateResult = true;
-        }
-        if (value == 1.0) {
-            // We want "exact" result for 1.0.
-            return negateResult ? -Math.PI/4 : Math.PI/4;
-        } else if (value <= ATAN_MAX_VALUE_FOR_TABS) {
-            int index = (int)(value * ATAN_INDEXER + 0.5);
-            double delta = value - index * ATAN_DELTA;
-            double result = MyTAtan.atanTab[index]
-                    + delta * (MyTAtan.atanDer1DivF1Tab[index]
-                            + delta * (MyTAtan.atanDer2DivF2Tab[index]
-                                    + delta * (MyTAtan.atanDer3DivF3Tab[index]
-                                            + delta * MyTAtan.atanDer4DivF4Tab[index])));
-            return negateResult ? -result : result;
-        } else { // value > ATAN_MAX_VALUE_FOR_TABS, or value is NaN
-            // This part is derived from fdlibm.
-            if (value < TWO_POW_66) {
-                double x = -1/value;
-                double x2 = x*x;
-                double x4 = x2*x2;
-                double s1 = x2*(ATAN_AT0+x4*(ATAN_AT2+x4*(ATAN_AT4+x4*(ATAN_AT6+x4*(ATAN_AT8+x4*ATAN_AT10)))));
-                double s2 = x4*(ATAN_AT1+x4*(ATAN_AT3+x4*(ATAN_AT5+x4*(ATAN_AT7+x4*ATAN_AT9))));
-                double result = ATAN_HI3-((x*(s1+s2)-ATAN_LO3)-x);
-                return negateResult ? -result : result;
-            } else { // value >= 2^66, or value is NaN
-                if (value != value) {
-                    return Double.NaN;
-                } else {
-                    return negateResult ? -Math.PI/2 : Math.PI/2;
-                }
-            }
-        }
-    }
-
-    /**
-     * For special values for which multiple conventions could be adopted,
-     * behaves like Math.atan2(double,double).
-     *
-     * @param y Coordinate on y axis.
-     * @param x Coordinate on x axis.
-     * @return Angle from x axis positive side to (x,y) position, in radians, in [-PI,PI].
-     *         Angle measure is positive when going from x axis to y axis (positive sides).
-     */
-    public static double atan2(double y, double x) {
-        if (USE_JDK_MATH) {
-            return Math.atan2(y,x);
-        }
-        /*
-         * Using sub-methods, to make method lighter for general case,
-         * and to avoid JIT-optimization crash on NaN.
-         */
-        if (x > 0.0) {
-            if (y == 0.0) {
-                // +-0.0
-                return y;
-            }
-            if (x == Double.POSITIVE_INFINITY) {
-                return atan2_pinf_yyy(y);
-            } else {
-                return atan(y/x);
-            }
-        } else if (x < 0.0) {
-            if (y == 0.0) {
-                return signFromBit(y) * Math.PI;
-            }
-            if (x == Double.NEGATIVE_INFINITY) {
-                return atan2_ninf_yyy(y);
-            } else if (y > 0.0) {
-                return Math.PI/2 - atan(x/y);
-            } else if (y < 0.0) {
-                return -Math.PI/2 - atan(x/y);
-            } else {
-                return Double.NaN;
-            }
-        } else {
-            return atan2_yyy_zeroOrNaN(y, x);
-        }
-    }
-
-    /**
-     * Gives same result as Math.toRadians for some particular values
-     * like 90.0, 180.0 or 360.0, but is faster (no division).
-     *
-     * @param angdeg Angle value in degrees.
-     * @return Angle value in radians.
-     */
-    public static double toRadians(double angdeg) {
-        if (USE_JDK_MATH) {
-            return Math.toRadians(angdeg);
-        }
-        return angdeg * (Math.PI/180);
-    }
-
-    /**
-     * Gives same result as Math.toDegrees for some particular values
-     * like Math.PI/2, Math.PI or 2*Math.PI, but is faster (no division).
-     *
-     * @param angrad Angle value in radians.
-     * @return Angle value in degrees.
-     */
-    public static double toDegrees(double angrad) {
-        if (USE_JDK_MATH) {
-            return Math.toDegrees(angrad);
-        }
-        return angrad * (180/Math.PI);
-    }
-
-    /**
-     * @param sign Sign of the angle: true for positive, false for negative.
-     * @param degrees Degrees, in [0,180].
-     * @param minutes Minutes, in [0,59].
-     * @param seconds Seconds, in [0.0,60.0[.
-     * @return Angle in radians.
-     */
-    public static double toRadians(boolean sign, int degrees, int minutes, double seconds) {
-        return toRadians(toDegrees(sign, degrees, minutes, seconds));
-    }
-
-    /**
-     * @param sign Sign of the angle: true for positive, false for negative.
-     * @param degrees Degrees, in [0,180].
-     * @param minutes Minutes, in [0,59].
-     * @param seconds Seconds, in [0.0,60.0[.
-     * @return Angle in degrees.
-     */
-    public static double toDegrees(boolean sign, int degrees, int minutes, double seconds) {
-        double signFactor = sign ? 1.0 : -1.0;
-        return signFactor * (degrees + (1.0/60)*(minutes + (1.0/60)*seconds));
-    }
-
-    /**
-     * @param angrad Angle in radians.
-     * @param degrees (out) Degrees, in [0,180].
-     * @param minutes (out) Minutes, in [0,59].
-     * @param seconds (out) Seconds, in [0.0,60.0[.
-     * @return true if the resulting angle in [-180deg,180deg] is positive, false if it is negative.
-     */
-    public static boolean toDMS(double angrad, IntWrapper degrees, IntWrapper minutes, DoubleWrapper seconds) {
-        // Computing longitude DMS.
-        double tmp = toDegrees(normalizeMinusPiPi(angrad));
-        boolean isNeg = (tmp < 0.0);
-        if (isNeg) {
-            tmp = -tmp;
-        }
-        degrees.value = (int)tmp;
-        tmp = (tmp-degrees.value)*60.0;
-        minutes.value = (int)tmp;
-        seconds.value = Math.min((tmp-minutes.value)*60.0,DOUBLE_BEFORE_60);
-        return !isNeg;
-    }
-
-    /**
-     * NB: Since 2*Math.PI < 2*PI, a span of 2*Math.PI does not mean full angular range.
-     * ex.: isInClockwiseDomain(0.0, 2*Math.PI, -1e-20) returns false.
-     * ---> For full angular range, use a span > 2*Math.PI, like 2*PI_SUP constant of this class.
-     *
-     * @param startAngRad An angle, in radians.
-     * @param angSpanRad An angular span, >= 0.0, in radians.
-     * @param angRad An angle, in radians.
-     * @return true if angRad is in the clockwise angular domain going from startAngRad, over angSpanRad,
-     *         extremities included, false otherwise.
-     */
-    public static boolean isInClockwiseDomain(double startAngRad, double angSpanRad, double angRad) {
-        if (Math.abs(angRad) < -TWO_MATH_PI_IN_MINUS_PI_PI) {
-            // special case for angular values of small magnitude
-            if (angSpanRad <= 2*Math.PI) {
-                if (angSpanRad < 0.0) {
-                    // empty domain
-                    return false;
-                }
-                // angSpanRad is in [0,2*PI]
-                startAngRad = normalizeMinusPiPi(startAngRad);
-                double endAngRad = normalizeMinusPiPi(startAngRad + angSpanRad);
-                if (startAngRad <= endAngRad) {
-                    return (angRad >= startAngRad) && (angRad <= endAngRad);
-                } else {
-                    return (angRad >= startAngRad) || (angRad <= endAngRad);
-                }
-            } else { // angSpanRad > 2*Math.PI, or is NaN
-                return (angSpanRad == angSpanRad);
-            }
-        } else {
-            // general case
-            return (normalizeZeroTwoPi(angRad - startAngRad) <= angSpanRad);
-        }
-    }
-
-    /*
-     * hyperbolic trigonometry
-     */
-
-    /**
-     * Some properties of sinh(x) = (exp(x)-exp(-x))/2:
-     * 1) defined on ]-Infinity,+Infinity[
-     * 2) result in ]-Infinity,+Infinity[
-     * 3) sinh(x) = -sinh(-x) (implies sinh(0) = 0)
-     * 4) sinh(epsilon) ~= epsilon
-     * 5) lim(sinh(x),x->+Infinity) = +Infinity
-     *    (y increasing exponentially faster than x)
-     * 6) reaches +Infinity (double overflow) for x >= 710.475860073944,
-     *    i.e. a bit further than exp(x)
-     *
-     * @param value A double value.
-     * @return Value hyperbolic sine.
-     */
-    public static double sinh(double value) {
-        if (USE_JDK_MATH) {
-            return Math.sinh(value);
-        }
-        // sinh(x) = (exp(x)-exp(-x))/2
-        double h;
-        if (value < 0.0) {
-            value = -value;
-            h = -0.5;
-        } else {
-            h = 0.5;
-        }
-        if (value < 22.0) {
-            if (value < TWO_POW_N28) {
-                return (h < 0.0) ? -value : value;
-            } else {
-                // sinh(x)
-                // = (exp(x)-exp(-x))/2
-                // = (exp(x)-1/exp(x))/2
-                // = (expm1(x) + 1 - 1/(expm1(x)+1))/2
-                // = (expm1(x) + (expm1(x)+1)/(expm1(x)+1) - 1/(expm1(x)+1))/2
-                // = (expm1(x) + expm1(x)/(expm1(x)+1))/2
-                double t = expm1(value);
-                // Might be more accurate, if value < 1: return h*((t+t)-t*t/(t+1.0)).
-                return h * (t + t/(t+1.0));
-            }
-        } else if (value < LOG_DOUBLE_MAX_VALUE) {
-            return h * exp(value);
-        } else {
-            double t = exp(value*0.5);
-            return (h*t)*t;
-        }
-    }
-
-    /**
-     * Some properties of cosh(x) = (exp(x)+exp(-x))/2:
-     * 1) defined on ]-Infinity,+Infinity[
-     * 2) result in [1,+Infinity[
-     * 3) cosh(0) = 1
-     * 4) cosh(x) = cosh(-x)
-     * 5) lim(cosh(x),x->+Infinity) = +Infinity
-     *    (y increasing exponentially faster than x)
-     * 6) reaches +Infinity (double overflow) for x >= 710.475860073944,
-     *    i.e. a bit further than exp(x)
-     *
-     * @param value A double value.
-     * @return Value hyperbolic cosine.
-     */
-    public static double cosh(double value) {
-        if (USE_JDK_MATH) {
-            return Math.cosh(value);
-        }
-        // cosh(x) = (exp(x)+exp(-x))/2
-        if (value < 0.0) {
-            value = -value;
-        }
-        if (value < LOG_TWO_POW_27) {
-            if (value < TWO_POW_N27) {
-                // cosh(x)
-                // = (exp(x)+exp(-x))/2
-                // = ((1+x+x^2/2!+...) + (1-x+x^2/2!-...))/2
-                // = 1+x^2/2!+x^4/4!+...
-                // For value of x small in magnitude, the sum of the terms does not add to 1.
-                return 1;
-            } else {
-                // cosh(x)
-                // = (exp(x)+exp(-x))/2
-                // = (exp(x)+1/exp(x))/2
-                double t = exp(value);
-                return 0.5 * (t+1/t);
-            }
-        } else if (value < LOG_DOUBLE_MAX_VALUE) {
-            return 0.5 * exp(value);
-        } else {
-            double t = exp(value*0.5);
-            return (0.5*t)*t;
-        }
-    }
-
-    /**
-     * Much more accurate than cosh(value)-1,
-     * for arguments (and results) close to zero.
-     *
-     * coshm1(-0.0) = -0.0, for homogeneity with
-     * acosh1p(-0.0) = -0.0.
-     *
-     * @param value A double value.
-     * @return Value hyperbolic cosine, minus 1.
-     */
-    public static double coshm1(double value) {
-        // cosh(x)-1 = (exp(x)+exp(-x))/2 - 1
-        if (value < 0.0) {
-            value = -value;
-        }
-        if (value < LOG_TWO_POW_27) {
-            if (value < TWO_POW_N27) {
-                if (value == 0.0) {
-                    // +-0.0
-                    return value;
-                }
-                // Using (expm1(x)+expm1(-x))/2
-                // is not accurate for tiny values,
-                // for expm1 results are of higher
-                // magnitude than the result and
-                // of different signs, such as their
-                // sum is not accurate.
-                // cosh(x) - 1
-                // = (exp(x)+exp(-x))/2 - 1
-                // = ((1+x+x^2/2!+...) + (1-x+x^2/2!-...))/2 - 1
-                // = x^2/2!+x^4/4!+...
-                // ~= x^2 * (1/2 + x^2 * 1/24)
-                //  = x^2 * 0.5 (since x < 2^-27)
-                return 0.5 * value*value;
-            } else {
-                // cosh(x) - 1
-                // = (exp(x)+exp(-x))/2 - 1
-                // = (exp(x)-1+exp(-x)-1)/2
-                // = (expm1(x)+expm1(-x))/2
-                return 0.5 * (expm1(value)+expm1(-value));
-            }
-        } else if (value < LOG_DOUBLE_MAX_VALUE) {
-            return 0.5 * exp(value) - 1.0;
-        } else {
-            // No need to subtract 1 from result.
-            double t = exp(value*0.5);
-            return (0.5*t)*t;
-        }
-    }
-
-    /**
-     * Computes hyperbolic sine and hyperbolic cosine together.
-     *
-     * @param value A double value.
-     * @param hcosine (out) Value hyperbolic cosine.
-     * @return Value hyperbolic sine.
-     */
-    public static double sinhAndCosh(double value, DoubleWrapper hcosine) {
-        if (USE_JDK_MATH) {
-            hcosine.value = Math.cosh(value);
-            return Math.sinh(value);
-        }
-        // Mixup of sinh and cosh treatments: if you modify them,
-        // you might want to also modify this.
-        double h;
-        if (value < 0.0) {
-            value = -value;
-            h = -0.5;
-        } else {
-            h = 0.5;
-        }
-        final double hsine;
-        // LOG_TWO_POW_27 = 18.714973875118524
-        if (value < LOG_TWO_POW_27) { // test from cosh
-            // sinh
-            if (value < TWO_POW_N28) {
-                hsine = (h < 0.0) ? -value : value;
-            } else {
-                double t = expm1(value);
-                hsine = h * (t + t/(t+1.0));
-            }
-            // cosh
-            if (value < TWO_POW_N27) {
-                hcosine.value = 1;
-            } else {
-                double t = exp(value);
-                hcosine.value = 0.5 * (t+1/t);
-            }
-        } else if (value < 22.0) { // test from sinh
-            // Here, value is in [18.714973875118524,22.0[.
-            double t = expm1(value);
-            hsine = h * (t + t/(t+1.0));
-            hcosine.value = 0.5 * (t+1.0);
-        } else {
-            if (value < LOG_DOUBLE_MAX_VALUE) {
-                hsine = h * exp(value);
-            } else {
-                double t = exp(value*0.5);
-                hsine = (h*t)*t;
-            }
-            hcosine.value = Math.abs(hsine);
-        }
-        return hsine;
-    }
-
-    /**
-     * Some properties of tanh(x) = sinh(x)/cosh(x) = (exp(2*x)-1)/(exp(2*x)+1):
-     * 1) defined on ]-Infinity,+Infinity[
-     * 2) result in ]-1,1[
-     * 3) tanh(x) = -tanh(-x) (implies tanh(0) = 0)
-     * 4) tanh(epsilon) ~= epsilon
-     * 5) lim(tanh(x),x->+Infinity) = 1
-     * 6) reaches 1 (double loss of precision) for x = 19.061547465398498
-     *
-     * @param value A double value.
-     * @return Value hyperbolic tangent.
-     */
-    public static double tanh(double value) {
-        if (USE_JDK_MATH) {
-            return Math.tanh(value);
-        }
-        // tanh(x) = sinh(x)/cosh(x)
-        //         = (exp(x)-exp(-x))/(exp(x)+exp(-x))
-        //         = (exp(2*x)-1)/(exp(2*x)+1)
-        boolean negateResult = false;
-        if (value < 0.0) {
-            value = -value;
-            negateResult = true;
-        }
-        double z;
-        if (value < TANH_1_THRESHOLD) {
-            if (value < TWO_POW_N55) {
-                return negateResult ? -value*(1.0-value) : value*(1.0+value);
-            } else if (value >= 1) {
-                z = 1.0-2.0/(expm1(value+value)+2.0);
-            } else {
-                double t = expm1(-(value+value));
-                z = -t/(t+2.0);
-            }
-        } else {
-            z = (value != value) ? Double.NaN : 1.0;
-        }
-        return negateResult ? -z : z;
-    }
-
-    /**
-     * Some properties of asinh(x) = log(x + sqrt(x^2 + 1))
-     * 1) defined on ]-Infinity,+Infinity[
-     * 2) result in ]-Infinity,+Infinity[
-     * 3) asinh(x) = -asinh(-x) (implies asinh(0) = 0)
-     * 4) asinh(epsilon) ~= epsilon
-     * 5) lim(asinh(x),x->+Infinity) = +Infinity
-     *    (y increasing logarithmically slower than x)
-     *
-     * @param value A double value.
-     * @return Value hyperbolic arcsine.
-     */
-    public static double asinh(double value) {
-        // asinh(x) = log(x + sqrt(x^2 + 1))
-        boolean negateResult = false;
-        if (value < 0.0) {
-            value = -value;
-            negateResult = true;
-        }
-        double result;
-        // (about) smallest possible for
-        // non-log1p case to be accurate.
-        if (value < ASINH_LOG1P_THRESHOLD) {
-            // Around this range, FDLIBM uses
-            // log1p(value+value*value/(1+sqrt(value*value+1))),
-            // but it's slower, so we don't use it.
-            /*
-             * If x is close to zero, log argument is close to 1,
-             * so to avoid precision loss we use log1p(double),
-             * with
-             * (1+x)^p = 1 + p * x + (p*(p-1))/2! * x^2 + (p*(p-1)*(p-2))/3! * x^3 + ...
-             * (1+x)^p = 1 + p * x * (1 + (p-1)/2 * x * (1 + (p-2)/3 * x + ...)
-             * (1+x)^0.5 = 1 + 0.5 * x * (1 + (0.5-1)/2 * x * (1 + (0.5-2)/3 * x + ...)
-             * (1+x^2)^0.5 = 1 + 0.5 * x^2 * (1 + (0.5-1)/2 * x^2 * (1 + (0.5-2)/3 * x^2 + ...)
-             * x + (1+x^2)^0.5 = 1 + x * (1 + 0.5 * x * (1 + (0.5-1)/2 * x^2 * (1 + (0.5-2)/3 * x^2 + ...))
-             * so
-             * asinh(x) = log1p(x * (1 + 0.5 * x * (1 + (0.5-1)/2 * x^2 * (1 + (0.5-2)/3 * x^2 + ...)))
-             */
-            final double x = value;
-            final double x2 = x*x;
-            // Enough terms for good accuracy,
-            // given our threshold.
-            final double argLog1p = (x *
-                    (1 + 0.5 * x
-                            * (1 + (0.5-1)/2 * x2
-                                    * (1 + (0.5-2)/3 * x2
-                                            * (1 + (0.5-3)/4 * x2
-                                                    * (1 + (0.5-4)/5 * x2
-                                                    ))))));
-            result = log1p(argLog1p);
-        } else if (value < ASINH_ACOSH_SQRT_ELISION_THRESHOLD) {
-            // Around this range, FDLIBM uses
-            // log(2*value+1/(value+sqrt(value*value+1))),
-            // but it involves an additional division
-            // so we don't use it.
-            result = log(value + sqrt(value*value + 1.0));
-        } else {
-            // log(2*value) would overflow for value > Double.MAX_VALUE/2,
-            // so we compute otherwise.
-            result = LOG_2 + log(value);
-        }
-        return negateResult ? -result : result;
-    }
-
-    /**
-     * Some properties of acosh(x) = log(x + sqrt(x^2 - 1)):
-     * 1) defined on [1,+Infinity[
-     * 2) result in ]0,+Infinity[ (by convention, since cosh(x) = cosh(-x))
-     * 3) acosh(1) = 0
-     * 4) acosh(1+epsilon) ~= log(1 + sqrt(2*epsilon)) ~= sqrt(2*epsilon)
-     * 5) lim(acosh(x),x->+Infinity) = +Infinity
-     *    (y increasing logarithmically slower than x)
-     *
-     * @param value A double value.
-     * @return Value hyperbolic arccosine.
-     */
-    public static double acosh(double value) {
-        if (!(value > 1.0)) {
-            // NaN, or value <= 1
-            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
-                return (value < 1.0) ? Double.NaN : value - 1.0;
-            } else {
-                return (value == 1.0) ? 0.0 : Double.NaN;
-            }
-        }
-        double result;
-        if (value < ASINH_ACOSH_SQRT_ELISION_THRESHOLD) {
-            // Around this range, FDLIBM uses
-            // log(2*value-1/(value+sqrt(value*value-1))),
-            // but it involves an additional division
-            // so we don't use it.
-            result = log(value + sqrt(value*value - 1.0));
-        } else {
-            // log(2*value) would overflow for value > Double.MAX_VALUE/2,
-            // so we compute otherwise.
-            result = LOG_2 + log(value);
-        }
-        return result;
-    }
-
-    /**
-     * Much more accurate than acosh(1+value),
-     * for arguments (and results) close to zero.
-     *
-     * acosh1p(-0.0) = -0.0, for homogeneity with
-     * sqrt(-0.0) = -0.0, which looks about the same
-     * near 0.
-     *
-     * @param value A double value.
-     * @return Hyperbolic arccosine of (1+value).
-     */
-    public static double acosh1p(double value) {
-        if (!(value > 0.0)) {
-            // NaN, or value <= 0.
-            // If value is -0.0, returning -0.0.
-            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
-                return (value < 0.0) ? Double.NaN : value;
-            } else {
-                return (value == 0.0) ? value : Double.NaN;
-            }
-        }
-        double result;
-        if (value < (ASINH_ACOSH_SQRT_ELISION_THRESHOLD-1)) {
-            // acosh(1+x)
-            // = log((1+x) + sqrt((1+x)^2 - 1))
-            // = log(1 + x + sqrt(1 + 2*x + x^2 - 1))
-            // = log1p(x + sqrt(2*x + x^2))
-            // = log1p(x + sqrt(x * (2 + x))
-            result = log1p(value + sqrt(value * (2 + value)));
-        } else {
-            result = LOG_2 + log(1+value);
-        }
-        return result;
-    }
-
-    /**
-     * Some properties of atanh(x) = log((1+x)/(1-x))/2:
-     * 1) defined on ]-1,1[
-     * 2) result in ]-Infinity,+Infinity[
-     * 3) atanh(-1) = -Infinity (by continuity)
-     * 4) atanh(1) = +Infinity (by continuity)
-     * 5) atanh(epsilon) ~= epsilon
-     * 6) lim(atanh(x),x->1) = +Infinity
-     *
-     * @param value A double value.
-     * @return Value hyperbolic arctangent.
-     */
-    public static double atanh(double value) {
-        boolean negateResult = false;
-        if (value < 0.0) {
-            value = -value;
-            negateResult = true;
-        }
-        double result;
-        if (!(value < 1.0)) {
-            // NaN, or value >= 1
-            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
-                result = (value > 1.0) ? Double.NaN : Double.POSITIVE_INFINITY + value;
-            } else {
-                result = (value == 1.0) ? Double.POSITIVE_INFINITY : Double.NaN;
-            }
-        } else {
-            // For value < 0.5, FDLIBM uses
-            // 0.5 * log1p((value+value) + (value+value)*value/(1-value)),
-            // instead, but this is good enough for us.
-            // atanh(x)
-            // = log((1+x)/(1-x))/2
-            // = log((1-x+2x)/(1-x))/2
-            // = log1p(2x/(1-x))/2
-            result = 0.5 * log1p((value+value)/(1.0-value));
-        }
-        return negateResult ? -result : result;
-    }
-
-    /*
-     * exponentials
-     */
-
-    /**
-     * @param value A double value.
-     * @return e^value.
-     */
-    public static double exp(double value) {
-        if (USE_JDK_MATH) {
-            return Math.exp(value);
-        }
-        // exp(x) = exp([x])*exp(y)
-        // with [x] the integer part of x, and y = x-[x]
-        // ===>
-        // We find an approximation of y, called z.
-        // ===>
-        // exp(x) = exp([x])*(exp(z)*exp(epsilon))
-        // with epsilon = y - z
-        // ===>
-        // We have exp([x]) and exp(z) pre-computed in tables, we "just" have to compute exp(epsilon).
-        //
-        // We use the same indexing (cast to int) to compute x integer part and the
-        // table index corresponding to z, to avoid two int casts.
-        // Also, to optimize index multiplication and division, we use powers of two,
-        // so that we can do it with bits shifts.
-
-        if (value > EXP_OVERFLOW_LIMIT) {
-            return Double.POSITIVE_INFINITY;
-        } else if (!(value >= EXP_UNDERFLOW_LIMIT)) {
-            return (value != value) ? Double.NaN : 0.0;
-        }
-
-        final int indexes = (int)(value*EXP_LO_INDEXING);
-
-        final int valueInt;
-        if (indexes >= 0) {
-            valueInt = (indexes>>EXP_LO_INDEXING_DIV_SHIFT);
-        } else {
-            valueInt = -((-indexes)>>EXP_LO_INDEXING_DIV_SHIFT);
-        }
-        final double hiTerm = MyTExp.expHiTab[valueInt-(int)EXP_UNDERFLOW_LIMIT];
-
-        final int zIndex = indexes - (valueInt<<EXP_LO_INDEXING_DIV_SHIFT);
-        final double y = (value-valueInt);
-        final double z = zIndex*(1.0/EXP_LO_INDEXING);
-        final double eps = y-z;
-        final double expZ = MyTExp.expLoPosTab[zIndex+EXP_LO_TAB_MID_INDEX];
-        final double expEps = (1+eps*(1+eps*(1.0/2+eps*(1.0/6+eps*(1.0/24)))));
-        final double loTerm = expZ * expEps;
-
-        return hiTerm * loTerm;
-    }
-
-    /**
-     * Quick exp, with a max relative error of about 2.94e-2 for |value| < 700.0 or so,
-     * and no accuracy at all outside this range.
-     * Derived from a note by Nicol N. Schraudolph, IDSIA, 1998.
-     *
-     * @param value A double value.
-     * @return e^value.
-     */
-    public static double expQuick(double value) {
-        if (USE_JDK_MATH) {
-            return Math.exp(value);
-        }
-        /*
-         * Cast of double values, even in long range, into long, is slower than
-         * from double to int for values in int range, and then from int to long.
-         * For that reason, we only work with integer values in int range
-         * (corresponding to the 32 first bits of the long, containing sign,
-         * exponent, and highest significant bits of double's mantissa),
-         * and cast twice.
-         *
-         * Constants determined empirically, using a random-based metaheuristic.
-         * Should be possible to find better ones.
-         */
-        return Double.longBitsToDouble(((long)(int)(1512775.3952 * value + 1.0726481222E9))<<32);
-    }
-
-    /**
-     * Much more accurate than exp(value)-1,
-     * for arguments (and results) close to zero.
-     *
-     * @param value A double value.
-     * @return e^value-1.
-     */
-    public static double expm1(double value) {
-        if (USE_JDK_MATH) {
-            return Math.expm1(value);
-        }
-        // If value is far from zero, we use exp(value)-1.
-        //
-        // If value is close to zero, we use the following formula:
-        // exp(value)-1
-        // = exp(valueApprox)*exp(epsilon)-1
-        // = exp(valueApprox)*(exp(epsilon)-exp(-valueApprox))
-        // = exp(valueApprox)*(1+epsilon+epsilon^2/2!+...-exp(-valueApprox))
-        // = exp(valueApprox)*((1-exp(-valueApprox))+epsilon+epsilon^2/2!+...)
-        // exp(valueApprox) and exp(-valueApprox) being stored in tables.
-
-        if (Math.abs(value) < EXP_LO_DISTANCE_TO_ZERO) {
-            // Taking int part instead of rounding, which takes too long.
-            int i = (int)(value*EXP_LO_INDEXING);
-            double delta = value-i*(1.0/EXP_LO_INDEXING);
-            return MyTExp.expLoPosTab[i+EXP_LO_TAB_MID_INDEX]*(MyTExp.expLoNegTab[i+EXP_LO_TAB_MID_INDEX]+delta*(1+delta*(1.0/2+delta*(1.0/6+delta*(1.0/24+delta*(1.0/120))))));
-        } else {
-            return exp(value)-1;
-        }
-    }
-
-    /*
-     * logarithms
-     */
-
-    /**
-     * @param value A double value.
-     * @return Value logarithm (base e).
-     */
-    public static double log(double value) {
-        if (USE_JDK_MATH || (!USE_REDEFINED_LOG)) {
-            return Math.log(value);
-        }
-        if (value > 0.0) {
-            if (value == Double.POSITIVE_INFINITY) {
-                return Double.POSITIVE_INFINITY;
-            }
-
-            // For normal values not close to 1.0, we use the following formula:
-            // log(value)
-            // = log(2^exponent*1.mantissa)
-            // = log(2^exponent) + log(1.mantissa)
-            // = exponent * log(2) + log(1.mantissa)
-            // = exponent * log(2) + log(1.mantissaApprox) + log(1.mantissa/1.mantissaApprox)
-            // = exponent * log(2) + log(1.mantissaApprox) + log(1+epsilon)
-            // = exponent * log(2) + log(1.mantissaApprox) + epsilon-epsilon^2/2+epsilon^3/3-epsilon^4/4+...
-            // with:
-            // 1.mantissaApprox <= 1.mantissa,
-            // log(1.mantissaApprox) in table,
-            // epsilon = (1.mantissa/1.mantissaApprox)-1
-            //
-            // To avoid bad relative error for small results,
-            // values close to 1.0 are treated aside, with the formula:
-            // log(x) = z*(2+z^2*((2.0/3)+z^2*((2.0/5))+z^2*((2.0/7))+...)))
-            // with z=(x-1)/(x+1)
-
-            double h;
-            if (value > 0.95) {
-                if (value < 1.14) {
-                    double z = (value-1.0)/(value+1.0);
-                    double z2 = z*z;
-                    return z*(2+z2*((2.0/3)+z2*((2.0/5)+z2*((2.0/7)+z2*((2.0/9)+z2*((2.0/11)))))));
-                }
-                h = 0.0;
-            } else if (value < DOUBLE_MIN_NORMAL) {
-                // Ensuring value is normal.
-                value *= TWO_POW_52;
-                // log(x*2^52)
-                // = log(x)-ln(2^52)
-                // = log(x)-52*ln(2)
-                h = -52*LOG_2;
-            } else {
-                h = 0.0;
-            }
-
-            int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
-            int valueExp = (valueBitsHi>>20)-MAX_DOUBLE_EXPONENT;
-            // Getting the first LOG_BITS bits of the mantissa.
-            int xIndex = ((valueBitsHi<<12)>>>(32-LOG_BITS));
-
-            // 1.mantissa/1.mantissaApprox - 1
-            double z = (value * twoPowNormalOrSubnormal(-valueExp)) * MyTLog.logXInvTab[xIndex] - 1;
-
-            z *= (1-z*((1.0/2)-z*((1.0/3))));
-
-            return h + valueExp * LOG_2 + (MyTLog.logXLogTab[xIndex] + z);
-
-        } else if (value == 0.0) {
-            return Double.NEGATIVE_INFINITY;
-        } else { // value < 0.0, or value is NaN
-            return Double.NaN;
-        }
-    }
-
-    /**
-     * Quick log, with a max relative error of about 1.9e-3
-     * for values in ]Double.MIN_NORMAL,+Infinity[, and
-     * worse accuracy outside this range.
-     *
-     * @param value A double value, in ]0,+Infinity[ (strictly positive and finite).
-     * @return Value logarithm (base e).
-     */
-    public static double logQuick(double value) {
-        if (USE_JDK_MATH) {
-            return Math.log(value);
-        }
-        /*
-         * Inverse of Schraudolph's method for exp, is very inaccurate near 1,
-         * and not that fast (even using floats), especially with added if's
-         * to deal with values near 1, so we don't use it, and use a simplified
-         * version of our log's redefined algorithm.
-         */
-
-        // Simplified version of log's redefined algorithm:
-        // log(value) ~= exponent * log(2) + log(1.mantissaApprox)
-
-        double h;
-        if (value > 0.87) {
-            if (value < 1.16) {
-                return 2.0 * (value-1.0)/(value+1.0);
-            }
-            h = 0.0;
-        } else if (value < DOUBLE_MIN_NORMAL) {
-            value *= TWO_POW_52;
-            h = -52*LOG_2;
-        } else {
-            h = 0.0;
-        }
-
-        int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
-        int valueExp = (valueBitsHi>>20)-MAX_DOUBLE_EXPONENT;
-        int xIndex = ((valueBitsHi<<12)>>>(32-LOG_BITS));
-
-        return h + valueExp * LOG_2 + MyTLog.logXLogTab[xIndex];
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value logarithm (base 10).
-     */
-    public static double log10(double value) {
-        if (USE_JDK_MATH || (!USE_REDEFINED_LOG)) {
-            return Math.log10(value);
-        }
-        // INV_LOG_10 is < 1, but there is no risk of log(double)
-        // overflow (positive or negative) while the end result shouldn't,
-        // since log(Double.MIN_VALUE) and log(Double.MAX_VALUE) have
-        // magnitudes of just a few hundreds.
-        return log(value) * INV_LOG_10;
-    }
-
-    /**
-     * Much more accurate than log(1+value),
-     * for arguments (and results) close to zero.
-     *
-     * @param value A double value.
-     * @return Logarithm (base e) of (1+value).
-     */
-    public static double log1p(double value) {
-        if (USE_JDK_MATH) {
-            return Math.log1p(value);
-        }
-        if (false) {
-            // This also works. Simpler but a bit slower.
-            if (value == Double.POSITIVE_INFINITY) {
-                return Double.POSITIVE_INFINITY;
-            }
-            double valuePlusOne = 1+value;
-            if (valuePlusOne == 1.0) {
-                return value;
-            } else {
-                return log(valuePlusOne)*(value/(valuePlusOne-1.0));
-            }
-        }
-        if (value > -1.0) {
-            if (value == Double.POSITIVE_INFINITY) {
-                return Double.POSITIVE_INFINITY;
-            }
-
-            // ln'(x) = 1/x
-            // so
-            // log(x+epsilon) ~= log(x) + epsilon/x
-            //
-            // Let u be 1+value rounded:
-            // 1+value = u+epsilon
-            //
-            // log(1+value)
-            // = log(u+epsilon)
-            // ~= log(u) + epsilon/value
-            // We compute log(u) as done in log(double), and then add the corrective term.
-
-            double valuePlusOne = 1.0+value;
-            if (valuePlusOne == 1.0) {
-                return value;
-            } else if (Math.abs(value) < 0.15) {
-                double z = value/(value+2.0);
-                double z2 = z*z;
-                return z*(2+z2*((2.0/3)+z2*((2.0/5)+z2*((2.0/7)+z2*((2.0/9)+z2*((2.0/11)))))));
-            }
-
-            int valuePlusOneBitsHi = (int)(Double.doubleToRawLongBits(valuePlusOne)>>32) & 0x7FFFFFFF;
-            int valuePlusOneExp = (valuePlusOneBitsHi>>20)-MAX_DOUBLE_EXPONENT;
-            // Getting the first LOG_BITS bits of the mantissa.
-            int xIndex = ((valuePlusOneBitsHi<<12)>>>(32-LOG_BITS));
-
-            // 1.mantissa/1.mantissaApprox - 1
-            double z = (valuePlusOne * twoPowNormalOrSubnormal(-valuePlusOneExp)) * MyTLog.logXInvTab[xIndex] - 1;
-
-            z *= (1-z*((1.0/2)-z*(1.0/3)));
-
-            // Adding epsilon/valuePlusOne to z,
-            // with
-            // epsilon = value - (valuePlusOne-1)
-            // (valuePlusOne + epsilon ~= 1+value (not rounded))
-
-            return valuePlusOneExp * LOG_2 + MyTLog.logXLogTab[xIndex] + (z + (value - (valuePlusOne-1))/valuePlusOne);
-        } else if (value == -1.0) {
-            return Double.NEGATIVE_INFINITY;
-        } else { // value < -1.0, or value is NaN
-            return Double.NaN;
-        }
-    }
-
-    /*
-     * powers
-     */
-
-    /**
-     * 1e-13ish accuracy or better on whole double range.
-     *
-     * @param value A double value.
-     * @param power A power.
-     * @return value^power.
-     */
-    public static double pow(double value, double power) {
-        if (USE_JDK_MATH) {
-            return Math.pow(value,power);
-        }
-        if (power == 0.0) {
-            return 1.0;
-        } else if (power == 1.0) {
-            return value;
-        }
-        if (value <= 0.0) {
-            // powerInfo: 0 if not integer, 1 if even integer, -1 if odd integer
-            int powerInfo;
-            if (Math.abs(power) >= (TWO_POW_52*2)) {
-                // The binary digit just before comma is outside mantissa,
-                // thus it is always 0: power is an even integer.
-                powerInfo = 1;
-            } else {
-                // If power's magnitude permits, we cast into int instead of into long,
-                // as it is faster.
-                if (Math.abs(power) <= (double)Integer.MAX_VALUE) {
-                    int powerAsInt = (int)power;
-                    if (power == (double)powerAsInt) {
-                        powerInfo = ((powerAsInt & 1) == 0) ? 1 : -1;
-                    } else { // power is not an integer (and not NaN, due to test against Integer.MAX_VALUE)
-                        powerInfo = 0;
-                    }
-                } else {
-                    long powerAsLong = (long)power;
-                    if (power == (double)powerAsLong) {
-                        powerInfo = ((powerAsLong & 1) == 0) ? 1 : -1;
-                    } else { // power is not an integer, or is NaN
-                        if (power != power) {
-                            return Double.NaN;
-                        }
-                        powerInfo = 0;
-                    }
-                }
-            }
-
-            if (value == 0.0) {
-                if (power < 0.0) {
-                    return (powerInfo < 0) ? 1/value : Double.POSITIVE_INFINITY;
-                } else { // power > 0.0 (0 and NaN cases already treated)
-                    return (powerInfo < 0) ? value : 0.0;
-                }
-            } else { // value < 0.0
-                if (value == Double.NEGATIVE_INFINITY) {
-                    if (powerInfo < 0) { // power odd integer
-                        return (power < 0.0) ? -0.0 : Double.NEGATIVE_INFINITY;
-                    } else { // power even integer, or not an integer
-                        return (power < 0.0) ? 0.0 : Double.POSITIVE_INFINITY;
-                    }
-                } else {
-                    return (powerInfo == 0) ? Double.NaN : powerInfo * exp(power*log(-value));
-                }
-            }
-        } else { // value > 0.0, or value is NaN
-            return exp(power*log(value));
-        }
-    }
-
-    /**
-     * Quick pow, with a max relative error of about 1e-2
-     * for value >= Double.MIN_NORMAL and 1e-10 < |value^power| < 1e10,
-     * of about 6e-2 for value >= Double.MIN_NORMAL and 1e-40 < |value^power| < 1e40,
-     * and worse accuracy otherwise.
-     *
-     * @param value A double value, in ]0,+Infinity[ (strictly positive and finite).
-     * @param power A double value.
-     * @return value^power.
-     */
-    public static double powQuick(double value, double power) {
-        if (USE_JDK_MATH) {
-            return Math.pow(value,power);
-        }
-        return exp(power*logQuick(value));
-    }
-
-    /**
-     * This treatment is somehow accurate for low values of |power|,
-     * and for |power*getExponent(value)| < 1023 or so (to stay away
-     * from double extreme magnitudes (large and small)).
-     *
-     * @param value A double value.
-     * @param power A power.
-     * @return value^power.
-     */
-    public static double powFast(double value, int power) {
-        if (USE_JDK_MATH) {
-            return Math.pow(value,power);
-        }
-        if (power < 3) {
-            if (power < 0) {
-                // Opposite of Integer.MIN_VALUE does not exist as int.
-                if (power == Integer.MIN_VALUE) {
-                    // Integer.MAX_VALUE = -(power+1)
-                    return 1.0/(powFast(value,Integer.MAX_VALUE) * value);
-                } else {
-                    return 1.0/powFast(value,-power);
-                }
-            } else {
-                // Here, power is in [0,2].
-                if (power == 2) { // Most common case first.
-                    return value * value;
-                } else if (power == 0) {
-                    return 1.0;
-                } else { // power == 1
-                    return value;
-                }
-            }
-        } else { // power >= 4
-            double oddRemains = 1.0;
-            // If power <= 5, faster to finish outside the loop.
-            while (power > 5) {
-                // Test if power is odd.
-                if ((power & 1) != 0) {
-                    oddRemains *= value;
-                }
-                value *= value;
-                power >>= 1; // power = power / 2
-            }
-            // Here, power is in [3,5].
-            if (power == 3) {
-                return oddRemains * value * value * value;
-            } else { // power in [4,5].
-                double v2 = value * value;
-                if (power == 4) {
-                    return oddRemains * v2 * v2;
-                } else { // power == 5
-                    return oddRemains * v2 * v2 * value;
-                }
-            }
-        }
-    }
-
-    /**
-     * @param value A float value.
-     * @return value*value.
-     */
-    public static float pow2(float value) {
-        return value*value;
-    }
-
-    /**
-     * @param value A double value.
-     * @return value*value.
-     */
-    public static double pow2(double value) {
-        return value*value;
-    }
-
-    /**
-     * @param value A float value.
-     * @return value*value*value.
-     */
-    public static float pow3(float value) {
-        return value*value*value;
-    }
-
-    /**
-     * @param value A double value.
-     * @return value*value*value.
-     */
-    public static double pow3(double value) {
-        return value*value*value;
-    }
-
-    /*
-     * roots
-     */
-
-    /**
-     * @param value A double value.
-     * @return Value square root.
-     */
-    public static double sqrt(double value) {
-        if (USE_JDK_MATH || (!USE_REDEFINED_SQRT)) {
-            return Math.sqrt(value);
-        }
-        // See cbrt for comments, sqrt uses the same ideas.
-
-        if (!(value > 0.0)) { // value <= 0.0, or value is NaN
-            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
-                return (value < 0.0) ? Double.NaN : value;
-            } else {
-                return (value == 0.0) ? value : Double.NaN;
-            }
-        } else if (value == Double.POSITIVE_INFINITY) {
-            return Double.POSITIVE_INFINITY;
-        }
-
-        double h;
-        if (value < DOUBLE_MIN_NORMAL) {
-            value *= TWO_POW_52;
-            h = 2*TWO_POW_N26;
-        } else {
-            h = 2.0;
-        }
-
-        int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
-        int valueExponentIndex = (valueBitsHi>>20)+(-MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT);
-        int xIndex = ((valueBitsHi<<12)>>>(32-SQRT_LO_BITS));
-
-        double result = MyTSqrt.sqrtXSqrtHiTab[valueExponentIndex] * MyTSqrt.sqrtXSqrtLoTab[xIndex];
-        double slope = MyTSqrt.sqrtSlopeHiTab[valueExponentIndex] * MyTSqrt.sqrtSlopeLoTab[xIndex];
-        value *= 0.25;
-
-        result += (value - result * result) * slope;
-        result += (value - result * result) * slope;
-        return h*(result + (value - result * result) * slope);
-    }
-
-    /**
-     * Quick sqrt, with with a max relative error of about 3.41e-2
-     * for values in [Double.MIN_NORMAL,Double.MAX_VALUE], and worse
-     * accuracy outside this range.
-     *
-     * @param value A double value.
-     * @return Value square root.
-     */
-    public static double sqrtQuick(double value) {
-        if (USE_JDK_MATH) {
-            return Math.sqrt(value);
-        }
-        final long bits = Double.doubleToRawLongBits(value);
-        /*
-         * Constant determined empirically, using a random-based metaheuristic.
-         * Should be possible to find a better one.
-         */
-        return Double.longBitsToDouble((bits+4606859074900000000L)>>>1);
-    }
-
-    /**
-     * Quick inverse of square root, with a max relative error of about 3.44e-2
-     * for values in [Double.MIN_NORMAL,Double.MAX_VALUE], and worse accuracy
-     * outside this range.
-     *
-     * This implementation uses zero step of Newton's method.
-     * Here are the max relative errors on [Double.MIN_NORMAL,Double.MAX_VALUE]
-     * depending on number of steps, if you want to copy-paste this code
-     * and use your own number:
-     * n=0: about 3.44e-2
-     * n=1: about 1.75e-3
-     * n=2: about 4.6e-6
-     * n=3: about 3.17e-11
-     * n=4: about 3.92e-16
-     * n=5: about 3.03e-16
-     *
-     * @param value A double value.
-     * @return Inverse of value square root.
-     */
-    public static double invSqrtQuick(double value) {
-        if (USE_JDK_MATH) {
-            return 1/Math.sqrt(value);
-        }
-        /*
-         * http://en.wikipedia.org/wiki/Fast_inverse_square_root
-         */
-        if (false) {
-            // With one Newton step (much slower than
-            // 1/Math.sqrt(double) if not optimized).
-            final double halfInitial = value * 0.5;
-            long bits = Double.doubleToRawLongBits(value);
-            // If n=0, 6910474759270000000L might be better (3.38e-2 max relative error).
-            bits = 0x5FE6EB50C7B537A9L - (bits>>1);
-            value = Double.longBitsToDouble(bits);
-            value = value * (1.5 - halfInitial * value * value); // Newton step, can repeat.
-            return value;
-        } else {
-            return Double.longBitsToDouble(0x5FE6EB50C7B537A9L - (Double.doubleToRawLongBits(value)>>1));
-        }
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value cubic root.
-     */
-    public static double cbrt(double value) {
-        if (USE_JDK_MATH) {
-            return Math.cbrt(value);
-        }
-        double h;
-        if (value < 0.0) {
-            if (value == Double.NEGATIVE_INFINITY) {
-                return Double.NEGATIVE_INFINITY;
-            }
-            value = -value;
-            // Making sure value is normal.
-            if (value < DOUBLE_MIN_NORMAL) {
-                value *= (TWO_POW_52*TWO_POW_26);
-                // h = <result_sign> * <result_multiplicator_to_avoid_overflow> / <cbrt(value_multiplicator_to_avoid_subnormal)>
-                h = -2*TWO_POW_N26;
-            } else {
-                h = -2.0;
-            }
-        } else {
-            if (!(value < Double.POSITIVE_INFINITY)) { // value is +Infinity, or value is NaN
-                return value;
-            }
-            // Making sure value is normal.
-            if (value < DOUBLE_MIN_NORMAL) {
-                if (value == 0.0) {
-                    // cbrt(0.0) = 0.0, cbrt(-0.0) = -0.0
-                    return value;
-                }
-                value *= (TWO_POW_52*TWO_POW_26);
-                h = 2*TWO_POW_N26;
-            } else {
-                h = 2.0;
-            }
-        }
-
-        // Normal value is (2^<value exponent> * <a value in [1,2[>).
-        // First member cubic root is computed, and multiplied with an approximation
-        // of the cubic root of the second member, to end up with a good guess of
-        // the result before using Newton's (or Archimedes's) method.
-        // To compute the cubic root approximation, we use the formula "cbrt(value) = cbrt(x) * cbrt(value/x)",
-        // choosing x as close to value as possible but inferior to it, so that cbrt(value/x) is close to 1
-        // (we could iterate on this method, using value/x as new value for each iteration,
-        // but finishing with Newton's method is faster).
-
-        // Shift and cast into an int, which overall is faster than working with a long.
-        int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
-        int valueExponentIndex = (valueBitsHi>>20)+(-MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT);
-        // Getting the first CBRT_LO_BITS bits of the mantissa.
-        int xIndex = ((valueBitsHi<<12)>>>(32-CBRT_LO_BITS));
-        double result = MyTCbrt.cbrtXCbrtHiTab[valueExponentIndex] * MyTCbrt.cbrtXCbrtLoTab[xIndex];
-        double slope = MyTCbrt.cbrtSlopeHiTab[valueExponentIndex] * MyTCbrt.cbrtSlopeLoTab[xIndex];
-
-        // Lowering values to avoid overflows when using Newton's method
-        // (we will then just have to return twice the result).
-        // result^3 = value
-        // (result/2)^3 = value/8
-        value *= 0.125;
-        // No need to divide result here, as division is factorized in result computation tables.
-        // result *= 0.5;
-
-        // Newton's method, looking for y = x^(1/p):
-        // y(n) = y(n-1) + (x-y(n-1)^p) * slope(y(n-1))
-        // y(n) = y(n-1) + (x-y(n-1)^p) * (1/p)*(x(n-1)^(1/p-1))
-        // y(n) = y(n-1) + (x-y(n-1)^p) * (1/p)*(x(n-1)^((1-p)/p))
-        // with x(n-1)=y(n-1)^p, i.e.:
-        // y(n) = y(n-1) + (x-y(n-1)^p) * (1/p)*(y(n-1)^(1-p))
-        //
-        // For p=3:
-        // y(n) = y(n-1) + (x-y(n-1)^3) * (1/(3*y(n-1)^2))
-
-        // To save time, we don't recompute the slope between Newton's method steps,
-        // as initial slope is good enough for a few iterations.
-        //
-        // NB: slope = 1/(3*trueResult*trueResult)
-        //     As we have result = trueResult/2 (to avoid overflows), we have:
-        //     slope = 4/(3*result*result)
-        //           = (4/3)*resultInv*resultInv
-        //     with newResultInv = 1/newResult
-        //                       = 1/(oldResult+resultDelta)
-        //                       = (oldResultInv)*1/(1+resultDelta/oldResult)
-        //                       = (oldResultInv)*1/(1+resultDelta*oldResultInv)
-        //                      ~= (oldResultInv)*(1-resultDelta*oldResultInv)
-        //     ===> Successive slopes could be computed without division, if needed,
-        //          by computing resultInv (instead of slope right away) and retrieving
-        //          slopes from it.
-
-        result += (value - result * result * result) * slope;
-        result += (value - result * result * result) * slope;
-        return h*(result + (value - result * result * result) * slope);
-    }
-
-    /**
-     * @return sqrt(x^2+y^2) without intermediate overflow or underflow.
-     */
-    public static double hypot(double x, double y) {
-        if (USE_JDK_MATH) {
-            return Math.hypot(x,y);
-        }
-        x = Math.abs(x);
-        y = Math.abs(y);
-        // Ensuring x <= y.
-        if (y < x) {
-            double a = x;
-            x = y;
-            y = a;
-        } else if (!(y >= x)) { // Testing if we have some NaN.
-            return hypot_NaN(x, y);
-        }
-
-        if (y-x == y) {
-            // x too small to subtract from y.
-            return y;
-        } else {
-            double factor;
-            if (y > HYPOT_MAX_MAG) {
-                // y is too large: scaling down.
-                x *= (1/HYPOT_FACTOR);
-                y *= (1/HYPOT_FACTOR);
-                factor = HYPOT_FACTOR;
-            } else if (x < (1/HYPOT_MAX_MAG)) {
-                // x is too small: scaling up.
-                x *= HYPOT_FACTOR;
-                y *= HYPOT_FACTOR;
-                factor = (1/HYPOT_FACTOR);
-            } else {
-                factor = 1.0;
-            }
-            return factor * sqrt(x*x+y*y);
-        }
-    }
-
-    /**
-     * @return sqrt(x^2+y^2+z^2) without intermediate overflow or underflow.
-     */
-    public static double hypot(double x, double y, double z) {
-        if (USE_JDK_MATH) {
-            // No simple JDK equivalent.
-        }
-        x = Math.abs(x);
-        y = Math.abs(y);
-        z = Math.abs(z);
-        /*
-         * Considering that z magnitude is the most likely to be the smaller,
-         * hence ensuring z <= y <= x, and not x <= y <= z, for less swaps.
-         */
-        // Ensuring z <= y.
-        if (z > y) {
-            // y < z: swapping y and z
-            double a = z;
-            z = y;
-            y = a;
-        } else if (!(z <= y)) { // Testing if y or z is NaN.
-            return hypot_NaN(x, y, z);
-        }
-        // Ensuring y <= x.
-        if (z > x) {
-            // x < z <= y: moving x
-            double oldZ = z;
-            z = x;
-            double oldY = y;
-            y = oldZ;
-            x = oldY;
-        } else if (y > x) {
-            // z <= x < y: swapping x and y
-            double a = y;
-            y = x;
-            x = a;
-        } else if (x != x) { // Testing if x is NaN.
-            return hypot_NaN(x, y, z);
-        }
-
-        if (x-y == x) {
-            // y, hence z, too small to subtract from x.
-            return x;
-        } else if (y-z == y) {
-            // z too small to subtract from y, hence x.
-            double factor;
-            if (x > HYPOT_MAX_MAG) {
-                // x is too large: scaling down.
-                x *= (1/HYPOT_FACTOR);
-                y *= (1/HYPOT_FACTOR);
-                factor = HYPOT_FACTOR;
-            } else if (y < (1/HYPOT_MAX_MAG)) {
-                // y is too small: scaling up.
-                x *= HYPOT_FACTOR;
-                y *= HYPOT_FACTOR;
-                factor = (1/HYPOT_FACTOR);
-            } else {
-                factor = 1.0;
-            }
-            return factor * sqrt(x*x+y*y);
-        } else {
-            double factor;
-            if (x > HYPOT_MAX_MAG) {
-                // x is too large: scaling down.
-                x *= (1/HYPOT_FACTOR);
-                y *= (1/HYPOT_FACTOR);
-                z *= (1/HYPOT_FACTOR);
-                factor = HYPOT_FACTOR;
-            } else if (z < (1/HYPOT_MAX_MAG)) {
-                // z is too small: scaling up.
-                x *= HYPOT_FACTOR;
-                y *= HYPOT_FACTOR;
-                z *= HYPOT_FACTOR;
-                factor = (1/HYPOT_FACTOR);
-            } else {
-                factor = 1.0;
-            }
-            // Adding smaller magnitudes together first.
-            return factor * sqrt(x*x+(y*y+z*z));
-        }
-    }
-
-    /*
-     * close values
-     */
-
-    /**
-     * @param value A float value.
-     * @return Floor of value.
-     */
-    public static float floor(float value) {
-        final int exponent = getExponent(value);
-        if (exponent < 0) {
-            // abs(value) < 1.
-            if (value < 0.0f) {
-                return -1.0f;
-            } else {
-                // 0.0f, or -0.0f if value is -0.0f
-                return 0.0f * value;
-            }
-        } else if (exponent < 23) {
-            // A bit faster than using casts.
-            final int bits = Float.floatToRawIntBits(value);
-            final int anteCommaBits = bits & (0xFF800000>>exponent);
-            if ((value < 0.0f) && (anteCommaBits != bits)) {
-                return Float.intBitsToFloat(anteCommaBits) - 1.0f;
-            } else {
-                return Float.intBitsToFloat(anteCommaBits);
-            }
-        } else {
-            // +-Infinity, NaN, or a mathematical integer.
-            return value;
-        }
-    }
-
-    /**
-     * @param value A double value.
-     * @return Floor of value.
-     */
-    public static double floor(double value) {
-        if (USE_JDK_MATH) {
-            return Math.floor(value);
-        }
-        if (ANTI_SLOW_CASTS) {
-            double valueAbs = Math.abs(value);
-            if (valueAbs <= (double)Integer.MAX_VALUE) {
-                if (value > 0.0) {
-                    return (double)(int)value;
-                } else if (value < 0.0) {
-                    double anteCommaDigits = (double)(int)value;
-                    if (value != anteCommaDigits) {
-                        return anteCommaDigits - 1.0;
-                    } else {
-                        return anteCommaDigits;
-                    }
-                } else { // value is +-0.0 (not NaN due to test against Integer.MAX_VALUE)
-                    return value;
-                }
-            } else if (valueAbs < TWO_POW_52) {
-                // We split the value in two:
-                // high part, which is a mathematical integer,
-                // and the rest, for which we can get rid of the
-                // post comma digits by casting into an int.
-                double highPart = ((int)(value * TWO_POW_N26)) * TWO_POW_26;
-                if (value > 0.0) {
-                    return highPart + (double)((int)(value - highPart));
-                } else {
-                    double anteCommaDigits = highPart + (double)((int)(value - highPart));
-                    if (value != anteCommaDigits) {
-                        return anteCommaDigits - 1.0;
-                    } else {
-                        return anteCommaDigits;
-                    }
-                }
-            } else { // abs(value) >= 2^52, or value is NaN
-                return value;
-            }
-        } else {
-            final int exponent = getExponent(value);
-            if (exponent < 0) {
-                // abs(value) < 1.
-                if (value < 0.0) {
-                    return -1.0;
-                } else {
-                    // 0.0, or -0.0 if value is -0.0
-                    return 0.0 * value;
-                }
-            } else if (exponent < 52) {
-                // A bit faster than working on bits.
-                final long matIntPart = (long)value;
-                final double matIntToValue = value-(double)matIntPart;
-                if (matIntToValue >= 0.0) {
-                    return (double)matIntPart;
-                } else {
-                    return (double)(matIntPart - 1);
-                }
-            } else {
-                // +-Infinity, NaN, or a mathematical integer.
-                return value;
-            }
-        }
-    }
-
-    /**
-     * @param value A float value.
-     * @return Ceiling of value.
-     */
-    public static float ceil(float value) {
-        return -floor(-value);
-    }
-
-    /**
-     * @param value A double value.
-     * @return Ceiling of value.
-     */
-    public static double ceil(double value) {
-        if (USE_JDK_MATH) {
-            return Math.ceil(value);
-        }
-        return -floor(-value);
-    }
-
-    /**
-     * Might have different semantics than Math.round(float),
-     * see bugs 6430675 and 8010430.
-     *
-     * @param value A double value.
-     * @return Value rounded to nearest int, choosing superior int in case two
-     *         are equally close (i.e. rounding-up).
-     */
-    public static int round(float value) {
-        /*
-         * Not delegating to JDK, because we want delegation to provide
-         * at least as good results, and some supported JDK versions
-         * have bugged round() methods.
-         */
-        // Algorithm by Dmitry Nadezhin (but replaced an if by a multiply)
-        // (http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-August/020247.html).
-        final int bits = Float.floatToRawIntBits(value);
-        final int biasedExp = ((bits>>23)&0xFF);
-        // Shift to get rid of bits past comma except first one: will need to
-        // 1-shift to the right to end up with correct magnitude.
-        final int shift = (23 - 1 + MAX_FLOAT_EXPONENT) - biasedExp;
-        if ((shift & -32) == 0) {
-            int bitsSignum = (((bits >> 31) << 1) + 1);
-            // shift in [0,31], so unbiased exp in [-9,22].
-            int extendedMantissa = (0x00800000 | (bits & 0x007FFFFF)) * bitsSignum;
-            // If value is positive and first bit past comma is 0, rounding
-            // to lower integer, else to upper one, which is what "+1" and
-            // then ">>1" do.
-            return ((extendedMantissa >> shift) + 1) >> 1;
-        } else {
-            // +-Infinity, NaN, or a mathematical integer, or tiny.
-            if (false && ANTI_SLOW_CASTS) { // not worth it
-                if (Math.abs(value) >= -(float)Integer.MIN_VALUE) {
-                    // +-Infinity or a mathematical integer (mostly) out of int range.
-                    return (value < 0.0) ? Integer.MIN_VALUE : Integer.MAX_VALUE;
-                }
-                // NaN or a mathematical integer (mostly) in int range.
-            }
-            return (int)value;
-        }
-    }
-
-    /**
-     * Might have different semantics than Math.round(double),
-     * see bugs 6430675 and 8010430.
-     *
-     * @param value A double value.
-     * @return Value rounded to nearest long, choosing superior long in case two
-     *         are equally close (i.e. rounding-up).
-     */
-    public static long round(double value) {
-        /*
-         * Not delegating to JDK, because we want delegation to provide
-         * at least as good results, and some supported JDK versions
-         * have bugged round() methods.
-         */
-        final long bits = Double.doubleToRawLongBits(value);
-        final int biasedExp = (((int)(bits>>52))&0x7FF);
-        // Shift to get rid of bits past comma except first one: will need to
-        // 1-shift to the right to end up with correct magnitude.
-        final int shift = (52 - 1 + MAX_DOUBLE_EXPONENT) - biasedExp;
-        if ((shift & -64) == 0) {
-            long bitsSignum = (((bits >> 63) << 1) + 1);
-            // shift in [0,63], so unbiased exp in [-12,51].
-            long extendedMantissa = (0x0010000000000000L | (bits & 0x000FFFFFFFFFFFFFL)) * bitsSignum;
-            // If value is positive and first bit past comma is 0, rounding
-            // to lower integer, else to upper one, which is what "+1" and
-            // then ">>1" do.
-            return ((extendedMantissa >> shift) + 1L) >> 1;
-        } else {
-            // +-Infinity, NaN, or a mathematical integer, or tiny.
-            if (ANTI_SLOW_CASTS) {
-                if (Math.abs(value) >= -(double)Long.MIN_VALUE) {
-                    // +-Infinity or a mathematical integer (mostly) out of long range.
-                    return (value < 0.0) ? Long.MIN_VALUE : Long.MAX_VALUE;
-                }
-                // NaN or a mathematical integer (mostly) in long range.
-            }
-            return (long)value;
-        }
-    }
-
-    /**
-     * @param value A float value.
-     * @return Value rounded to nearest int, choosing even int in case two
-     *         are equally close.
-     */
-    public static int roundEven(float value) {
-        final int sign = signFromBit(value);
-        value = Math.abs(value);
-        if (ANTI_SLOW_CASTS) {
-            if (value < TWO_POW_23_F) {
-                // Getting rid of post-comma bits.
-                value = ((value + TWO_POW_23_F) - TWO_POW_23_F);
-                return sign * (int)value;
-            } else if (value < (float)Integer.MAX_VALUE) { // "<=" doesn't work, because of float precision
-                // value is in [-Integer.MAX_VALUE,Integer.MAX_VALUE]
-                return sign * (int)value;
-            }
-        } else {
-            if (value < TWO_POW_23_F) {
-                // Getting rid of post-comma bits.
-                value = ((value + TWO_POW_23_F) - TWO_POW_23_F);
-            }
-        }
-        return (int)(sign * value);
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value rounded to nearest long, choosing even long in case two
-     *         are equally close.
-     */
-    public static long roundEven(double value) {
-        final int sign = (int)signFromBit(value);
-        value = Math.abs(value);
-        if (value < TWO_POW_52) {
-            // Getting rid of post-comma bits.
-            value = ((value + TWO_POW_52) - TWO_POW_52);
-        }
-        if (ANTI_SLOW_CASTS) {
-            if (value <= (double)Integer.MAX_VALUE) {
-                // value is in [-Integer.MAX_VALUE,Integer.MAX_VALUE]
-                return sign * (int)value;
-            }
-        }
-        return (long)(sign * value);
-    }
-
-    /**
-     * @param value A float value.
-     * @return The float mathematical integer closest to the specified value,
-     *         choosing even one if two are equally close, or respectively
-     *         NaN, +-Infinity or +-0.0f if the value is any of these.
-     */
-    public static float rint(float value) {
-        final int sign = signFromBit(value);
-        value = Math.abs(value);
-        if (value < TWO_POW_23_F) {
-            // Getting rid of post-comma bits.
-            value = ((TWO_POW_23_F + value ) - TWO_POW_23_F);
-        }
-        // Restoring original sign.
-        return sign * value;
-    }
-
-    /**
-     * @param value A double value.
-     * @return The double mathematical integer closest to the specified value,
-     *         choosing even one if two are equally close, or respectively
-     *         NaN, +-Infinity or +-0.0 if the value is any of these.
-     */
-    public static double rint(double value) {
-        if (USE_JDK_MATH) {
-            return Math.rint(value);
-        }
-        final int sign = (int)signFromBit(value);
-        value = Math.abs(value);
-        if (value < TWO_POW_52) {
-            // Getting rid of post-comma bits.
-            value = ((TWO_POW_52 + value ) - TWO_POW_52);
-        }
-        // Restoring original sign.
-        return sign * value;
-    }
-
-    /*
-     * close int values
-     *
-     * Never delegating to JDK for these methods, for we should always
-     * be faster and exact, and JDK doesn't exactly have such methods.
-     */
-
-    /**
-     * @param value A double value.
-     * @return Floor of value as int, or closest int if floor is out
-     *         of int range, or 0 if value is NaN.
-     */
-    public static int floorToInt(double value) {
-        int valueInt = (int) value;
-        if (value < 0.0) {
-            if (value == (double) valueInt) {
-                return valueInt;
-            } else {
-                if (valueInt == Integer.MIN_VALUE) {
-                    return valueInt;
-                } else {
-                    return valueInt - 1;
-                }
-            }
-        } else { // >= 0 or NaN.
-            return valueInt;
-        }
-    }
-
-    /**
-     * @param value A double value.
-     * @return Ceiling of value as int, or closest int if ceiling is out
-     *         of int range, or 0 if value is NaN.
-     */
-    public static int ceilToInt(double value) {
-        int valueInt = (int) value;
-        if (value > 0.0) {
-            if (value == (double) valueInt) {
-                return valueInt;
-            } else {
-                if (valueInt == Integer.MAX_VALUE) {
-                    return valueInt;
-                } else {
-                    return valueInt + 1;
-                }
-            }
-        } else { // <= 0 or NaN.
-            return valueInt;
-        }
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value rounded to nearest int, choosing superior int in case two
-     *         are equally close (i.e. rounding-up).
-     */
-    public static int roundToInt(double value) {
-        /*
-         * We don't gain much by reimplementing rounding, except for
-         * pathologically large values, which should not be a common case
-         * when dealing with ints, so we just use round(double).
-         */
-        return NumbersUtils.toInt(round(value));
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value rounded to nearest int, choosing even int in case two
-     *         are equally close.
-     */
-    public static int roundEvenToInt(double value) {
-        final int sign = (int)signFromBit(value);
-        value = Math.abs(value);
-        /*
-         * Applying the post-comma bits removal logic even if value is out
-         * of int range, to avoid a test, for it doesn't mess up the result,
-         * and we want to optimize for the case of values in int range.
-         */
-        value = ((value + TWO_POW_52) - TWO_POW_52);
-        return (int)(sign * value);
-    }
-
-    /*
-     * ranges
-     */
-
-    /**
-     * @param min A float value.
-     * @param max A float value.
-     * @param value A float value.
-     * @return min if value < min, max if value > max, value otherwise.
-     */
-    public static float toRange(float min, float max, float value) {
-        return NumbersUtils.toRange(min, max, value);
-    }
-
-    /**
-     * @param min A double value.
-     * @param max A double value.
-     * @param value A double value.
-     * @return min if value < min, max if value > max, value otherwise.
-     */
-    public static double toRange(double min, double max, double value) {
-        return NumbersUtils.toRange(min, max, value);
-    }
-
-    /*
-     * binary operators (/,%)
-     */
-
-    /**
-     * Returns dividend - divisor * n, where n is the mathematical integer
-     * closest to dividend/divisor.
-     * If dividend/divisor is equally close to surrounding integers,
-     * we choose n to be the integer of smallest magnitude, which makes
-     * this treatment differ from Math.IEEEremainder(double,double),
-     * where n is chosen to be the even integer.
-     * Note that the choice of n is not done considering the double
-     * approximation of dividend/divisor, because it could cause
-     * result to be outside [-|divisor|/2,|divisor|/2] range.
-     * The practical effect is that if multiple results would be possible,
-     * we always choose the result that is the closest to (and has the same
-     * sign as) the dividend.
-     * Ex. :
-     * - for (-3.0,2.0), this method returns -1.0,
-     *   whereas Math.IEEEremainder returns 1.0.
-     * - for (-5.0,2.0), both this method and Math.IEEEremainder return -1.0.
-     *
-     * If the remainder is zero, its sign is the same as the sign of the first argument.
-     * If either argument is NaN, or the first argument is infinite,
-     * or the second argument is positive zero or negative zero,
-     * then the result is NaN.
-     * If the first argument is finite and the second argument is
-     * infinite, then the result is the same as the first argument.
-     *
-     * NB:
-     * - Modulo operator (%) returns a value in ]-|divisor|,|divisor|[,
-     *   which sign is the same as dividend.
-     * - As for modulo operator, the sign of the divisor has no effect on the result.
-     * - On some architecture, % operator has been observed to return NaN
-     *   for some subnormal values of divisor, when dividend exponent is 1023,
-     *   which impacts the correctness of this method.
-     *
-     * @param dividend Dividend.
-     * @param divisor Divisor.
-     * @return Remainder of dividend/divisor, i.e. a value in [-|divisor|/2,|divisor|/2].
-     */
-    public static double remainder(double dividend, double divisor) {
-        if (Double.isInfinite(divisor)) {
-            if (Double.isInfinite(dividend)) {
-                return Double.NaN;
-            } else {
-                return dividend;
-            }
-        }
-        double value = dividend % divisor;
-        if (Math.abs(value+value) > Math.abs(divisor)) {
-            return value + ((value > 0.0) ? -Math.abs(divisor) : Math.abs(divisor));
-        } else {
-            return value;
-        }
-    }
-
-    /**
-     * @param angle Angle in radians.
-     * @return The same angle, in radians, but in [-PI,PI].
-     */
-    public static double normalizeMinusPiPi(double angle) {
-        // Not modifying values in output range.
-        if ((angle >= -Math.PI) && (angle <= Math.PI)) {
-            return angle;
-        }
-        return remainderTwoPi(angle);
-    }
-
-    /**
-     * Not accurate for large values.
-     *
-     * @param angle Angle in radians.
-     * @return The same angle, in radians, but in [-PI,PI].
-     */
-    public static double normalizeMinusPiPiFast(double angle) {
-        // Not modifying values in output range.
-        if ((angle >= -Math.PI) && (angle <= Math.PI)) {
-            return angle;
-        }
-        return remainderTwoPiFast(angle);
-    }
-
-    /**
-     * @param angle Angle in radians.
-     * @return The same angle, in radians, but in [0,2*PI].
-     */
-    public static double normalizeZeroTwoPi(double angle) {
-        // Not modifying values in output range.
-        if ((angle >= 0.0) && (angle <= 2*Math.PI)) {
-            return angle;
-        }
-        angle = remainderTwoPi(angle);
-        if (angle < 0.0) {
-            // LO then HI is theoretically better (when starting near 0).
-            return (angle + TWOPI_LO) + TWOPI_HI;
-        } else {
-            return angle;
-        }
-    }
-
-    /**
-     * Not accurate for large values.
-     *
-     * @param angle Angle in radians.
-     * @return The same angle, in radians, but in [0,2*PI].
-     */
-    public static double normalizeZeroTwoPiFast(double angle) {
-        // Not modifying values in output range.
-        if ((angle >= 0.0) && (angle <= 2*Math.PI)) {
-            return angle;
-        }
-        angle = remainderTwoPiFast(angle);
-        if (angle < 0.0) {
-            // LO then HI is theoretically better (when starting near 0).
-            return (angle + TWOPI_LO) + TWOPI_HI;
-        } else {
-            return angle;
-        }
-    }
-
-    /**
-     * @param angle Angle in radians.
-     * @return Angle value modulo PI, in radians, in [-PI/2,PI/2].
-     */
-    public static double normalizeMinusHalfPiHalfPi(double angle) {
-        // Not modifying values in output range.
-        if ((angle >= -Math.PI/2) && (angle <= Math.PI/2)) {
-            return angle;
-        }
-        return remainderPi(angle);
-    }
-
-    /**
-     * Not accurate for large values.
-     *
-     * @param angle Angle in radians.
-     * @return Angle value modulo PI, in radians, in [-PI/2,PI/2].
-     */
-    public static double normalizeMinusHalfPiHalfPiFast(double angle) {
-        // Not modifying values in output range.
-        if ((angle >= -Math.PI/2) && (angle <= Math.PI/2)) {
-            return angle;
-        }
-        return remainderPiFast(angle);
-    }
-
-    /*
-     * floating points utils
-     */
-
-    /**
-     * @param value A float value.
-     * @return true if the specified value is NaN or +-Infinity, false otherwise.
-     */
-    public static boolean isNaNOrInfinite(float value) {
-        return NumbersUtils.isNaNOrInfinite(value);
-    }
-
-    /**
-     * @param value A double value.
-     * @return true if the specified value is NaN or +-Infinity, false otherwise.
-     */
-    public static boolean isNaNOrInfinite(double value) {
-        return NumbersUtils.isNaNOrInfinite(value);
-    }
-
-    /**
-     * @param value A float value.
-     * @return Value unbiased exponent.
-     */
-    public static int getExponent(float value) {
-        return ((Float.floatToRawIntBits(value)>>23)&0xFF)-MAX_FLOAT_EXPONENT;
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value unbiased exponent.
-     */
-    public static int getExponent(double value) {
-        return (((int)(Double.doubleToRawLongBits(value)>>52))&0x7FF)-MAX_DOUBLE_EXPONENT;
-    }
-
-    /**
-     * @param value A float value.
-     * @return -1.0f if the specified value is < 0, 1.0f if it is > 0,
-     *         and the value itself if it is NaN or +-0.0f.
-     */
-    public static float signum(float value) {
-        if (USE_JDK_MATH) {
-            return Math.signum(value);
-        }
-        if ((value == 0.0f) || (value != value)) {
-            return value;
-        }
-        return (float)signFromBit(value);
-    }
-
-    /**
-     * @param value A double value.
-     * @return -1.0 if the specified value is < 0, 1.0 if it is > 0,
-     *         and the value itself if it is NaN or +-0.0.
-     */
-    public static double signum(double value) {
-        if (USE_JDK_MATH) {
-            return Math.signum(value);
-        }
-        if ((value == 0.0) || (value != value)) {
-            return value;
-        }
-        if (ANTI_SLOW_CASTS) {
-            return (double)(int)signFromBit(value);
-        } else {
-            return (double)signFromBit(value);
-        }
-    }
-
-    /**
-     * @param value A float value.
-     * @return -1 if sign bit is 1, 1 if sign bit is 0.
-     */
-    public static int signFromBit(float value) {
-        return ((Float.floatToRawIntBits(value)>>30)|1);
-    }
-
-    /**
-     * @param value A double value.
-     * @return -1 if sign bit is 1, 1 if sign bit is 0.
-     */
-    public static long signFromBit(double value) {
-        // Returning a long, to avoid useless cast into int.
-        return ((Double.doubleToRawLongBits(value)>>62)|1);
-    }
-
-    /**
-     * A sign of NaN can be interpreted as positive or negative.
-     *
-     * @param magnitude A float value.
-     * @param sign A float value.
-     * @return A value with the magnitude of the first argument, and the sign
-     *         of the second argument.
-     */
-    public static float copySign(float magnitude, float sign) {
-        return Float.intBitsToFloat(
-                (Float.floatToRawIntBits(sign) & Integer.MIN_VALUE)
-                | (Float.floatToRawIntBits(magnitude) & Integer.MAX_VALUE));
-    }
-
-    /**
-     * A sign of NaN can be interpreted as positive or negative.
-     *
-     * @param magnitude A double value.
-     * @param sign A double value.
-     * @return A value with the magnitude of the first argument, and the sign
-     *         of the second argument.
-     */
-    public static double copySign(double magnitude, double sign) {
-        return Double.longBitsToDouble(
-                (Double.doubleToRawLongBits(sign) & Long.MIN_VALUE)
-                | (Double.doubleToRawLongBits(magnitude) & Long.MAX_VALUE));
-    }
-
-    /**
-     * The ULP (Unit in the Last Place) is the distance to the next value larger
-     * in magnitude.
-     *
-     * @param value A float value.
-     * @return The size of an ulp of the specified value, or Float.MIN_VALUE
-     *         if it is +-0.0f, or +Infinity if it is +-Infinity, or NaN
-     *         if it is NaN.
-     */
-    public static float ulp(float value) {
-        if (USE_JDK_MATH) {
-            return Math.ulp(value);
-        }
-        /*
-         * Look-up table not really worth it in micro-benchmark,
-         * so should be worse with cache-misses.
-         */
-        final int exponent = getExponent(value);
-        if (exponent >= (MIN_FLOAT_NORMAL_EXPONENT+23)) {
-            if (exponent == MAX_FLOAT_EXPONENT+1) {
-                // NaN or +-Infinity
-                return Math.abs(value);
-            }
-            // normal: returning 2^(exponent-23)
-            return Float.intBitsToFloat((exponent+(MAX_FLOAT_EXPONENT-23))<<23);
-        } else {
-            if (exponent == MIN_FLOAT_NORMAL_EXPONENT-1) {
-                // +-0.0f or subnormal
-                return Float.MIN_VALUE;
-            }
-            // subnormal result
-            return Float.intBitsToFloat(1<<(exponent-MIN_FLOAT_NORMAL_EXPONENT));
-        }
-    }
-
-    /**
-     * The ULP (Unit in the Last Place) is the distance to the next value larger
-     * in magnitude.
-     *
-     * @param value A double value.
-     * @return The size of an ulp of the specified value, or Double.MIN_VALUE
-     *         if it is +-0.0, or +Infinity if it is +-Infinity, or NaN
-     *         if it is NaN.
-     */
-    public static double ulp(double value) {
-        if (USE_JDK_MATH) {
-            return Math.ulp(value);
-        }
-        /*
-         * Look-up table not really worth it in micro-benchmark,
-         * so should be worse with cache-misses.
-         */
-        final int exponent = getExponent(value);
-        if (exponent >= (MIN_DOUBLE_NORMAL_EXPONENT+52)) {
-            if (exponent == MAX_DOUBLE_EXPONENT+1) {
-                // NaN or +-Infinity
-                return Math.abs(value);
-            }
-            // normal: returning 2^(exponent-52)
-            return Double.longBitsToDouble((exponent+(MAX_DOUBLE_EXPONENT-52L))<<52);
-        } else {
-            if (exponent == MIN_DOUBLE_NORMAL_EXPONENT-1) {
-                // +-0.0f or subnormal
-                return Double.MIN_VALUE;
-            }
-            // subnormal result
-            return Double.longBitsToDouble(1L<<(exponent-MIN_DOUBLE_NORMAL_EXPONENT));
-        }
-    }
-
-    /**
-     * If both arguments are +-0.0(f), (float)direction is returned.
-     *
-     * If both arguments are +Infinity or -Infinity,
-     * respectively +Infinity or -Infinity is returned.
-     *
-     * @param start A float value.
-     * @param direction A double value.
-     * @return The float adjacent to start towards direction, considering that
-     *         +(-)Float.MIN_VALUE is adjacent to +(-)0.0f, and that
-     *         +(-)Float.MAX_VALUE is adjacent to +(-)Infinity,
-     *         or NaN if any argument is NaN.
-     */
-    public static float nextAfter(float start, double direction) {
-        if (direction < start) {
-            // Going towards -Infinity.
-            if (start == 0.0f) {
-                // +-0.0f
-                return -Float.MIN_VALUE;
-            }
-            final int bits = Float.floatToRawIntBits(start);
-            return Float.intBitsToFloat(bits + ((bits > 0) ? -1 : 1));
-        } else if (direction > start) {
-            // Going towards +Infinity.
-            // +0.0f to get rid of eventual -0.0f
-            final int bits = Float.floatToRawIntBits(start + 0.0f);
-            return Float.intBitsToFloat(bits + (bits >= 0 ? 1 : -1));
-        } else if (start == direction) {
-            return (float)direction;
-        } else {
-            // Returning a NaN derived from the input NaN(s).
-            return start + (float)direction;
-        }
-    }
-
-    /**
-     * If both arguments are +-0.0, direction is returned.
-     *
-     * If both arguments are +Infinity or -Infinity,
-     * respectively +Infinity or -Infinity is returned.
-     *
-     * @param start A double value.
-     * @param direction A double value.
-     * @return The double adjacent to start towards direction, considering that
-     *         +(-)Double.MIN_VALUE is adjacent to +(-)0.0, and that
-     *         +(-)Double.MAX_VALUE is adjacent to +(-)Infinity,
-     *         or NaN if any argument is NaN.
-     */
-    public static double nextAfter(double start, double direction) {
-        if (direction < start) {
-            // Going towards -Infinity.
-            if (start == 0.0) {
-                // +-0.0
-                return -Double.MIN_VALUE;
-            }
-            final long bits = Double.doubleToRawLongBits(start);
-            return Double.longBitsToDouble(bits + ((bits > 0) ? -1 : 1));
-        } else if (direction > start) {
-            // Going towards +Infinity.
-            // +0.0 to get rid of eventual -0.0
-            final long bits = Double.doubleToRawLongBits(start + 0.0f);
-            return Double.longBitsToDouble(bits + (bits >= 0 ? 1 : -1));
-        } else if (start == direction) {
-            return direction;
-        } else {
-            // Returning a NaN derived from the input NaN(s).
-            return start + direction;
-        }
-    }
-
-    /**
-     * Semantically equivalent to nextAfter(start,Double.NEGATIVE_INFINITY).
-     */
-    public static float nextDown(float start) {
-        if (start > Float.NEGATIVE_INFINITY) {
-            if (start == 0.0f) {
-                // +-0.0f
-                return -Float.MIN_VALUE;
-            }
-            final int bits = Float.floatToRawIntBits(start);
-            return Float.intBitsToFloat(bits + ((bits > 0) ? -1 : 1));
-        } else if (start == Float.NEGATIVE_INFINITY) {
-            return Float.NEGATIVE_INFINITY;
-        } else {
-            // NaN
-            return start;
-        }
-    }
-
-    /**
-     * Semantically equivalent to nextAfter(start,Double.NEGATIVE_INFINITY).
-     */
-    public static double nextDown(double start) {
-        if (start > Double.NEGATIVE_INFINITY) {
-            if (start == 0.0) {
-                // +-0.0
-                return -Double.MIN_VALUE;
-            }
-            final long bits = Double.doubleToRawLongBits(start);
-            return Double.longBitsToDouble(bits + ((bits > 0) ? -1 : 1));
-        } else if (start == Double.NEGATIVE_INFINITY) {
-            return Double.NEGATIVE_INFINITY;
-        } else {
-            // NaN
-            return start;
-        }
-    }
-
-    /**
-     * Semantically equivalent to nextAfter(start,Double.POSITIVE_INFINITY).
-     */
-    public static float nextUp(float start) {
-        if (start < Float.POSITIVE_INFINITY) {
-            // +0.0f to get rid of eventual -0.0f
-            final int bits = Float.floatToRawIntBits(start + 0.0f);
-            return Float.intBitsToFloat(bits + (bits >= 0 ? 1 : -1));
-        } else if (start == Float.POSITIVE_INFINITY) {
-            return Float.POSITIVE_INFINITY;
-        } else {
-            // NaN
-            return start;
-        }
-    }
-
-    /**
-     * Semantically equivalent to nextAfter(start,Double.POSITIVE_INFINITY).
-     */
-    public static double nextUp(double start) {
-        if (start < Double.POSITIVE_INFINITY) {
-            // +0.0 to get rid of eventual -0.0
-            final long bits = Double.doubleToRawLongBits(start + 0.0);
-            return Double.longBitsToDouble(bits + (bits >= 0 ? 1 : -1));
-        } else if (start == Double.POSITIVE_INFINITY) {
-            return Double.POSITIVE_INFINITY;
-        } else {
-            // NaN
-            return start;
-        }
-    }
-
-    /**
-     * Precision may be lost if the result is subnormal.
-     *
-     * @param value A float value.
-     * @param scaleFactor An int value.
-     * @return value * 2^scaleFactor, or a value equivalent to the specified
-     *         one if it is NaN, +-Infinity or +-0.0f.
-     */
-    public static float scalb(float value, int scaleFactor) {
-        // Large enough to imply overflow or underflow for
-        // a finite non-zero value.
-        final int MAX_SCALE = 2*MAX_FLOAT_EXPONENT+23+1;
-
-        // Making sure scaling factor is in a reasonable range.
-        scaleFactor = Math.max(Math.min(scaleFactor, MAX_SCALE), -MAX_SCALE);
-
-        return (float)(((double)value) * twoPowNormal(scaleFactor));
-    }
-
-    /**
-     * Precision may be lost if the result is subnormal.
-     *
-     * @param value A double value.
-     * @param scaleFactor An int value.
-     * @return value * 2^scaleFactor, or a value equivalent to the specified
-     *         one if it is NaN, +-Infinity or +-0.0.
-     */
-    public static double scalb(double value, int scaleFactor) {
-        if ((scaleFactor > -MAX_DOUBLE_EXPONENT) && (scaleFactor <= MAX_DOUBLE_EXPONENT)) {
-            // Quick case (as done in apache FastMath).
-            return value * twoPowNormal(scaleFactor);
-        }
-
-        // Large enough to imply overflow or underflow for
-        // a finite non-zero value.
-        final int MAX_SCALE = 2*MAX_DOUBLE_EXPONENT+52+1;
-
-        // Making sure scaling factor is in a reasonable range.
-        final int exponentAdjust;
-        final int scaleIncrement;
-        final double exponentDelta;
-        if (scaleFactor < 0) {
-            scaleFactor = Math.max(scaleFactor, -MAX_SCALE);
-            scaleIncrement = -512;
-            exponentDelta = TWO_POW_N512;
-        } else {
-            scaleFactor = Math.min(scaleFactor, MAX_SCALE);
-            scaleIncrement = 512;
-            exponentDelta = TWO_POW_512;
-        }
-
-        // Calculating (scaleFactor % +-512), 512 = 2^9, using
-        // technique from "Hacker's Delight" section 10-2.
-        final int t = ((scaleFactor >> (9-1)) >>> (32-9));
-        exponentAdjust = ((scaleFactor + t) & (512-1)) - t;
-
-        value *= twoPowNormal(exponentAdjust);
-        scaleFactor -= exponentAdjust;
-
-        while (scaleFactor != 0) {
-            value *= exponentDelta;
-            scaleFactor -= scaleIncrement;
-        }
-
-        return value;
-    }
-
-    /*
-     * Non-redefined Math public values and treatments.
-     */
-
-    public static float abs(float a) {
-        return Math.abs(a);
-    }
-
-    public static double abs(double a) {
-        return Math.abs(a);
-    }
-
-    public static float min(float a, float b) {
-        return Math.min(a,b);
-    }
-
-    public static double min(double a, double b) {
-        return Math.min(a,b);
-    }
-
-    public static float max(float a, float b) {
-        return Math.max(a,b);
-    }
-
-    public static double max(double a, double b) {
-        return Math.max(a,b);
-    }
-
-    public static double IEEEremainder(double f1, double f2) {
-        return Math.IEEEremainder(f1,f2);
-    }
-
-    public static double random() {
-        return Math.random();
-    }
-
-    //--------------------------------------------------------------------------
-    //  PRIVATE METHODS
-    //--------------------------------------------------------------------------
-
-    /**
-     * Non-instantiable.
-     */
-    private FastMath() {
-    }
-
-    /*
-     * Remainders (accurate).
-     */
-
-    /**
-     * @param angle Angle in radians.
-     * @return Remainder of (angle % (2*PI)), in [-PI,PI].
-     */
-    private static double remainderTwoPi(double angle) {
-        if (USE_JDK_MATH) {
-            return jdkRemainderTwoPi(angle);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        if (angle <= (4*NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2)) {
-            double fn = (double)(int)(angle*TWOPI_INV+0.5);
-            angle = (angle - fn*TWOPI_HI) - fn*TWOPI_LO;
-            // Ensuring range.
-            // HI/LO can help a bit, even though we are always far from 0.
-            if (angle < -Math.PI) {
-                angle = (angle + TWOPI_HI) + TWOPI_LO;
-            } else if (angle > Math.PI) {
-                angle = (angle - TWOPI_HI) - TWOPI_LO;
-            }
-            return negateResult ? -angle : angle;
-        } else if (angle < Double.POSITIVE_INFINITY) {
-            angle = heavyRemainderTwoPi(angle);
-            return negateResult ? -angle : angle;
-        } else { // angle is +Infinity or NaN
-            return Double.NaN;
-        }
-    }
-
-    /**
-     * @param angle Angle in radians.
-     * @return Remainder of (angle % PI), in [-PI/2,PI/2].
-     */
-    private static double remainderPi(double angle) {
-        if (USE_JDK_MATH) {
-            return jdkRemainderPi(angle);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        if (angle <= (2*NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2)) {
-            double fn = (double)(int)(angle*PI_INV+0.5);
-            angle = (angle - fn*PI_HI) - fn*PI_LO;
-            // Ensuring range.
-            // HI/LO can help a bit, even though we are always far from 0.
-            if (angle < -Math.PI/2) {
-                angle = (angle + PI_HI) + PI_LO;
-            } else if (angle > Math.PI/2) {
-                angle = (angle - PI_HI) - PI_LO;
-            }
-            return negateResult ? -angle : angle;
-        } else if (angle < Double.POSITIVE_INFINITY) {
-            angle = heavyRemainderPi(angle);
-            return negateResult ? -angle : angle;
-        } else { // angle is +Infinity or NaN
-            return Double.NaN;
-        }
-    }
-
-    /**
-     * @param angle Angle in radians.
-     * @return Bits of double corresponding to remainder of (angle % (PI/2)),
-     *         in [-PI/4,PI/4], with quadrant encoded in exponent bits.
-     */
-    private static long remainderPiO2(double angle) {
-        if (USE_JDK_MATH) {
-            return jdkRemainderPiO2(angle, false);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        if (angle <= NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2) {
-            int n = (int)(angle*PIO2_INV+0.5);
-            double fn = (double)n;
-            angle = (angle - fn*PIO2_HI) - fn*PIO2_LO;
-            // Ensuring range.
-            // HI/LO can help a bit, even though we are always far from 0.
-            if (angle < -Math.PI/4) {
-                angle = (angle + PIO2_HI) + PIO2_LO;
-                n--;
-            } else if (angle > Math.PI/4) {
-                angle = (angle - PIO2_HI) - PIO2_LO;
-                n++;
-            }
-            if (negateResult) {
-                angle = -angle;
-            }
-            return encodeRemainderAndQuadrant(angle, n&3);
-        } else if (angle < Double.POSITIVE_INFINITY) {
-            return heavyRemainderPiO2(angle, negateResult);
-        } else { // angle is +Infinity or NaN
-            return encodeRemainderAndQuadrant(Double.NaN, 0);
-        }
-    }
-
-    /*
-     * Remainders (fast).
-     */
-
-    /**
-     * Not accurate for large values.
-     *
-     * @param angle Angle in radians.
-     * @return Remainder of (angle % (2*PI)), in [-PI,PI].
-     */
-    private static double remainderTwoPiFast(double angle) {
-        if (USE_JDK_MATH) {
-            return jdkRemainderTwoPi(angle);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        // - We don't bother with values higher than (2*PI*(2^52)),
-        //   since they are spaced by 2*PI or more from each other.
-        // - For large values, we don't use % because it might be very slow,
-        //   and we split computation in two, because cast from double to int
-        //   with large numbers might be very slow also.
-        if (angle <= TWO_POW_26*(2*Math.PI)) {
-            // ok
-        } else if (angle <= TWO_POW_52*(2*Math.PI)) {
-            // Computing remainder of angle modulo TWO_POW_26*(2*PI).
-            double fn = (double)(int)(angle*(TWOPI_INV/TWO_POW_26)+0.5);
-            angle = (angle - fn*(TWOPI_HI*TWO_POW_26)) - fn*(TWOPI_LO*TWO_POW_26);
-            // Here, angle is in [-TWO_POW_26*PI,TWO_POW_26*PI], or so.
-            if (angle < 0.0) {
-                angle = -angle;
-                negateResult = !negateResult;
-            }
-        } else if (angle < Double.POSITIVE_INFINITY) {
-            return 0.0;
-        } else { // angle is +Infinity or NaN
-            return Double.NaN;
-        }
-
-        // Computing remainder of angle modulo 2*PI.
-        double fn = (double)(int)(angle*TWOPI_INV+0.5);
-        angle = (angle - fn*TWOPI_HI) - fn*TWOPI_LO;
-
-        // Ensuring range.
-        // HI/LO can help a bit, even though we are always far from 0.
-        if (angle < -Math.PI) {
-            angle = (angle + TWOPI_HI) + TWOPI_LO;
-        } else if (angle > Math.PI) {
-            angle = (angle - TWOPI_HI) - TWOPI_LO;
-        }
-        return negateResult ? -angle : angle;
-    }
-
-    /**
-     * Not accurate for large values.
-     *
-     * @param angle Angle in radians.
-     * @return Remainder of (angle % PI), in [-PI/2,PI/2].
-     */
-    private static double remainderPiFast(double angle) {
-        if (USE_JDK_MATH) {
-            return jdkRemainderPi(angle);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        // - We don't bother with values higher than (PI*(2^52)),
-        //   since they are spaced by PI or more from each other.
-        // - For large values, we don't use % because it might be very slow,
-        //   and we split computation in two, because cast from double to int
-        //   with large numbers might be very slow also.
-        if (angle <= TWO_POW_26*Math.PI) {
-            // ok
-        } else if (angle <= TWO_POW_52*Math.PI) {
-            // Computing remainder of angle modulo TWO_POW_26*PI.
-            double fn = (double)(int)(angle*(PI_INV/TWO_POW_26)+0.5);
-            angle = (angle - fn*(PI_HI*TWO_POW_26)) - fn*(PI_LO*TWO_POW_26);
-            // Here, angle is in [-TWO_POW_26*PI/2,TWO_POW_26*PI/2], or so.
-            if (angle < 0.0) {
-                angle = -angle;
-                negateResult = !negateResult;
-            }
-        } else if (angle < Double.POSITIVE_INFINITY) {
-            return 0.0;
-        } else { // angle is +Infinity or NaN
-            return Double.NaN;
-        }
-
-        // Computing remainder of angle modulo PI.
-        double fn = (double)(int)(angle*PI_INV+0.5);
-        angle = (angle - fn*PI_HI) - fn*PI_LO;
-
-        // Ensuring range.
-        // HI/LO can help a bit, even though we are always far from 0.
-        if (angle < -Math.PI/2) {
-            angle = (angle + PI_HI) + PI_LO;
-        } else if (angle > Math.PI/2) {
-            angle = (angle - PI_HI) - PI_LO;
-        }
-        return negateResult ? -angle : angle;
-    }
-}
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/IntWrapper.java b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/IntWrapper.java
deleted file mode 100644
index 812e5a22d..000000000
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/IntWrapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-package space.kscience.kmath.jafama;
-
-public class IntWrapper {
-    public int value;
-    @Override
-    public String toString() {
-        return Integer.toString(this.value);
-    }
-}
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
index 2b6cc3a5a..2557004e9 100644
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
@@ -1,6 +1,7 @@
 package space.kscience.kmath.jafama
 
 import space.kscience.kmath.operations.*
+import net.jafama.*
 
 /**
  * Advanced Number-like semifield that implements basic operations.
@@ -55,7 +56,7 @@ public interface ExtendedField<T> : ExtendedFieldOperations<T>, Field<T>, Numeri
  * A field for [Double] without boxing. Does not produce appropriate field element.
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
+public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
     public override inline val zero: Double get() = 0.0
     public override inline val one: Double get() = 1.0
 
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/NumbersUtils.java b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/NumbersUtils.java
deleted file mode 100644
index 6fdd9dea5..000000000
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/NumbersUtils.java
+++ /dev/null
@@ -1,2647 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-package space.kscience.kmath.jafama;
-
-/**
- * Class containing various basic utility methods to deal with numbers.
- * This class is meant to be light (no big look-up tables or such).
- *
- * Check methods return boolean if success,
- * for it allows to use them in assertions.
- *
- * toString methods use capital letters, unlike JDK's toStrings, for it is more
- * readable (especially, "l" and "1" can easily be confused with one another).
- *
- * Some methods have an int version additionally to the long version,
- * even though long version could be used instead, for performance reasons,
- * either for the methods themselves (if they do computations with ints
- * instead of longs), or to be used in an int use case (like methods
- * checking whether or not a signed int can fit in such number of bits).
- */
-public final class NumbersUtils {
-
-    //--------------------------------------------------------------------------
-    // MEMBERS
-    //--------------------------------------------------------------------------
-
-    /**
-     * Double.MIN_NORMAL since Java 6.
-     */
-    public static final double DOUBLE_MIN_NORMAL = Double.longBitsToDouble(0x0010000000000000L); // 2.2250738585072014E-308
-
-    /**
-     * Float.MIN_NORMAL since Java 6.
-     */
-    public static final float FLOAT_MIN_NORMAL = Float.intBitsToFloat(0x00800000); // 1.17549435E-38f
-
-    private static final int MIN_DOUBLE_EXPONENT = -1074;
-    private static final int MAX_DOUBLE_EXPONENT = 1023;
-
-    /**
-     * All possible upper case chars for representing a number as a String.
-     */
-    private final static char[] CHAR_BY_DIGIT;
-    static {
-        final char minDecimal = '0';
-        final char maxDecimal = '9';
-        final int n1 = maxDecimal - minDecimal + 1;
-        final char minLetter = 'A';
-        final char maxLetter = 'Z';
-        final int n2 = maxLetter - minLetter + 1;
-        CHAR_BY_DIGIT = new char[n1+n2];
-        int i=0;
-        for (char c=minDecimal;c<=maxDecimal;c++) {
-            CHAR_BY_DIGIT[i++] = c;
-        }
-        for (char c=minLetter;c<=maxLetter;c++) {
-            CHAR_BY_DIGIT[i++] = c;
-        }
-    }
-
-    /**
-     * For power-of-two radixes only.
-     */
-    private static final int[] DIV_SHIFT_BY_RADIX;
-    static {
-        DIV_SHIFT_BY_RADIX = new int[32+1];
-        int shift=1;
-        for (int radix=2;radix<=32;radix*=2) {
-            DIV_SHIFT_BY_RADIX[radix] = shift++;
-        }
-    }
-
-    private final static int[] MAX_NBR_OF_NEG_INT_DIGITS_BY_RADIX = new int[Character.MAX_RADIX+1];
-    private final static int[] MAX_NBR_OF_NEG_LONG_DIGITS_BY_RADIX = new int[Character.MAX_RADIX+1];
-    static {
-        for (int radix=Character.MIN_RADIX;radix<=Character.MAX_RADIX;radix++) {
-            /*
-             * Brutal but works.
-             * -1 for the sign.
-             */
-            MAX_NBR_OF_NEG_INT_DIGITS_BY_RADIX[radix] = Integer.toString(Integer.MIN_VALUE, radix).length()-1;
-            MAX_NBR_OF_NEG_LONG_DIGITS_BY_RADIX[radix] = Long.toString(Long.MIN_VALUE, radix).length()-1;
-        }
-    }
-
-    static final double NO_CSN_MIN_BOUND_INCL = 1e-3;
-    static final double NO_CSN_MAX_BOUND_EXCL = 1e7;
-
-    private static final double PIO2_HI = Double.longBitsToDouble(0x3FF921FB54400000L); // 1.57079632673412561417e+00 first 33 bits of pi/2
-    private static final double PIO2_LO = Double.longBitsToDouble(0x3DD0B4611A626331L); // 6.07710050650619224932e-11 pi/2 - PIO2_HI
-    private static final double PI_HI = 2*PIO2_HI;
-    private static final double PI_LO = 2*PIO2_LO;
-    private static final double TWOPI_HI = 4*PIO2_HI;
-    private static final double TWOPI_LO = 4*PIO2_LO;
-
-    //--------------------------------------------------------------------------
-    // PUBLIC METHODS
-    //--------------------------------------------------------------------------
-
-    /**
-     * @return True if the specified values are equal or both NaN, false otherwise.
-     */
-    public static boolean equal(float a, float b) {
-        // Only does one test if a == b.
-        return (a == b) ? true : ((a != a) && (b != b));
-    }
-
-    /**
-     * @return True if the specified values are equal or both NaN, false otherwise.
-     */
-    public static boolean equal(double a, double b) {
-        // Only does one test if a == b.
-        return (a == b) ? true : ((a != a) && (b != b));
-    }
-
-    /**
-     * @return True if the specified value is a mathematical integer,
-     *         false otherwise (which includes NaN and +-Infinity).
-     */
-    public static boolean isMathematicalInteger(float value) {
-        // Doing magnitude test first, for cast
-        // might be very slow for huge values.
-        // It also helps be faster for huge values,
-        // for which the test with cast always fail.
-        value = Math.abs(value);
-        return ((value >= (float)(1<<23)
-                && (value != Float.POSITIVE_INFINITY)))
-                || (value == (float)(int)value);
-    }
-
-    /**
-     * @return True if the specified value is a mathematical integer,
-     *         false otherwise (which includes NaN and +-Infinity).
-     */
-    public static boolean isMathematicalInteger(double value) {
-        // Doing magnitude test first, for cast
-        // might be very slow for huge values.
-        // It also helps be faster for huge values,
-        // for which the test with cast always fail.
-        value = Math.abs(value);
-        return ((value >= (double)(1L<<52))
-                && (value != Double.POSITIVE_INFINITY))
-                || (value == (double)(long)value);
-    }
-
-    /**
-     * @param value A float value.
-     * @return True if the specified value is equidistant from two adjacent
-     *         mathematical integers, false otherwise (which includes NaN
-     *         and +-Infinity).
-     */
-    public static boolean isEquidistant(float value) {
-        if (false) {
-            // Also works, but slower.
-            final int bits = Float.floatToRawIntBits(value);
-            final int exponent = ((bits>>23)&0xFF)-127;
-            final int nbrOfPostCommaBits = 23 - exponent;
-            if ((nbrOfPostCommaBits <= 0) || (nbrOfPostCommaBits >= 25)) {
-                // No mantissa bit after comma, or all mantissa bits
-                // (including implicit 1) are at least one bit away from it.
-                //System.out.println("can't be");
-                return false;
-            }
-            final int mantissa = 0x00800000|(bits&0x007FFFFF);
-            final int postCommaMask = ~((-1)<<nbrOfPostCommaBits);
-            // True if in post-comma bits the only 1-bit is the one for 0.5.
-            return ((mantissa & postCommaMask) == (1<<(nbrOfPostCommaBits-1)));
-        }
-        final float valueAbs = Math.abs(value);
-        if (!(valueAbs < (float)(1<<23))) {
-            // NaN or too large to have a chance
-            return false;
-        }
-        final float twice = valueAbs+valueAbs;
-        // Test on twice first, for it's the most likely to fail.
-        return (twice == (float)(int)twice)
-                && (value != (float)(int)value);
-    }
-
-    /**
-     * @param value A double value.
-     * @return True if the specified value is equidistant from two adjacent
-     *         mathematical integers, false otherwise (which includes NaN
-     *         and +-Infinity).
-     */
-    public static boolean isEquidistant(double value) {
-        if (false) {
-            // Also works, but slower.
-            final long bits = Double.doubleToRawLongBits(value);
-            final int exponent = (((int)(bits>>52))&0x7FF)-1023;
-            final int nbrOfPostCommaBits = 52 - exponent;
-            if ((nbrOfPostCommaBits <= 0) || (nbrOfPostCommaBits >= 54)) {
-                // No mantissa bit after comma, or all mantissa bits
-                // (including implicit 1) are at least one bit away from it.
-                return false;
-            }
-            final long mantissa = 0x0010000000000000L|(bits&0x000FFFFFFFFFFFFFL);
-            final long postCommaMask = ~((-1L)<<nbrOfPostCommaBits);
-            // True if in post-comma bits the only 1-bit is the one for 0.5.
-            return ((mantissa & postCommaMask) == (1L<<(nbrOfPostCommaBits-1)));
-        }
-        final double valueAbs = Math.abs(value);
-        if (!(valueAbs < (double)(1L<<52))) {
-            return false;
-        }
-        final double twice = valueAbs+valueAbs;
-        // Test on twice first, for it's the most likely to fail.
-        return (twice == (double)(long)twice)
-                && (value != (double)(long)value);
-    }
-
-    /**
-     * @param value A float value.
-     * @return True if the specified value is NaN or +-Infinity, false otherwise.
-     */
-    public static boolean isNaNOrInfinite(float value) {
-        // value-value is not equal to 0.0f (and is NaN) <-> value is NaN or +-Infinity
-        return !(value-value == 0.0f);
-    }
-
-    /**
-     * @param value A double value.
-     * @return True if the specified value is NaN or +-Infinity, false otherwise.
-     */
-    public static boolean isNaNOrInfinite(double value) {
-        // value-value is not equal to 0.0 (and is NaN) <-> value is NaN or +-Infinity
-        return !(value-value == 0.0);
-    }
-
-    /**
-     * @param value A float value.
-     * @return -1 if sign bit is 1, 1 if sign bit is 0.
-     */
-    public static int signFromBit(float value) {
-        return ((Float.floatToRawIntBits(value)>>30)|1);
-    }
-
-    /**
-     * @param value A double value.
-     * @return -1 if sign bit is 1, 1 if sign bit is 0.
-     */
-    public static long signFromBit(double value) {
-        // Returning a long, to avoid useless cast into int.
-        return ((Double.doubleToRawLongBits(value)>>62)|1);
-    }
-
-    /*
-     * min/max ranges
-     */
-
-    /**
-     * @return True if the specified value is in the specified range (inclusive), false otherwise.
-     */
-    public static boolean isInRange(int min, int max, int a) {
-        return (min <= a) && (a <= max);
-    }
-
-    /**
-     * @return True if the specified value is in the specified range (inclusive), false otherwise.
-     */
-    public static boolean isInRange(long min, long max, long a) {
-        return (min <= a) && (a <= max);
-    }
-
-    /**
-     * Returns false if any value is NaN.
-     *
-     * @return True if the specified value is in the specified range (inclusive), false otherwise.
-     */
-    public static boolean isInRange(float min, float max, float a) {
-        return (min <= a) && (a <= max);
-    }
-
-    /**
-     * Returns false if any value is NaN.
-     *
-     * @return True if the specified value is in the specified range (inclusive), false otherwise.
-     */
-    public static boolean isInRange(double min, double max, double a) {
-        return (min <= a) && (a <= max);
-    }
-
-    /*
-     *
-     */
-
-    /**
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if the specified value is not in the specified range (inclusive).
-     */
-    public static boolean checkIsInRange(int min, int max, int a) {
-        if (!isInRange(min, max, a)) {
-            throw new IllegalArgumentException(a+" not in ["+min+","+max+"]");
-        }
-        return true;
-    }
-
-    /**
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if the specified value is not in the specified range (inclusive).
-     */
-    public static boolean checkIsInRange(long min, long max, long a) {
-        if (!isInRange(min, max, a)) {
-            throw new IllegalArgumentException(a+" not in ["+min+","+max+"]");
-        }
-        return true;
-    }
-
-    /**
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if the specified value is not in the specified range (inclusive)
-     *         or any parameter is NaN.
-     */
-    public static boolean checkIsInRange(float min, float max, float a) {
-        if (!isInRange(min, max, a)) {
-            throw new IllegalArgumentException(a+" not in ["+min+","+max+"]");
-        }
-        return true;
-    }
-
-    /**
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if the specified value is not in the specified range (inclusive)
-     *         or any parameter is NaN.
-     */
-    public static boolean checkIsInRange(double min, double max, double a) {
-        if (!isInRange(min, max, a)) {
-            throw new IllegalArgumentException(a+" not in ["+min+","+max+"]");
-        }
-        return true;
-    }
-
-    /*
-     *
-     */
-
-    /**
-     * @param min A value.
-     * @param max A value.
-     * @param a A value.
-     * @return min if a <= min, else max if a >= max, else a.
-     */
-    public static int toRange(int min, int max, int a) {
-        if (a <= min) {
-            return min;
-        } else if (a >= max) {
-            return max;
-        } else {
-            return a;
-        }
-    }
-
-    /**
-     * @param min A value.
-     * @param max A value.
-     * @param a A value.
-     * @return min if a <= min, else max if a >= max, else a.
-     */
-    public static long toRange(long min, long max, long a) {
-        if (a <= min) {
-            return min;
-        } else if (a >= max) {
-            return max;
-        } else {
-            return a;
-        }
-    }
-
-    /**
-     * @param min A value.
-     * @param max A value.
-     * @param a A value.
-     * @return min if a <= min, else max if a >= max, else a.
-     */
-    public static float toRange(float min, float max, float a) {
-        if (a <= min) {
-            return min;
-        } else if (a >= max) {
-            return max;
-        } else {
-            return a;
-        }
-    }
-
-    /**
-     * @param min A value.
-     * @param max A value.
-     * @param a A value.
-     * @return min if a <= min, else max if a >= max, else a.
-     */
-    public static double toRange(double min, double max, double a) {
-        if (a <= min) {
-            return min;
-        } else if (a >= max) {
-            return max;
-        } else {
-            return a;
-        }
-    }
-
-    /*
-     * bitwise ranges
-     */
-
-    /**
-     * @param bitSize A number of bits, in [1,32].
-     * @return True if the specified value fits as a signed integer
-     *         over the specified number of bits, false otherwise.
-     * @throws IllegalArgumentException if the specified number of bits is not in [1,32].
-     */
-    public static boolean isInRangeSigned(int a, int bitSize) {
-        checkBitSizeForSignedInt(bitSize);
-        return (minSignedIntForBitSize_noCheck(bitSize) <= a) && (a <= maxSignedIntForBitSize_noCheck(bitSize));
-    }
-
-    /**
-     * @param bitSize A number of bits, in [1,64].
-     * @return True if the specified value fits as a signed integer
-     *         over the specified number of bits, false otherwise.
-     * @throws IllegalArgumentException if the specified number of bits is not in [1,64].
-     */
-    public static boolean isInRangeSigned(long a, int bitSize) {
-        checkBitSizeForSignedLong(bitSize);
-        return (minSignedLongForBitSize_noCheck(bitSize) <= a) && (a <= maxSignedLongForBitSize_noCheck(bitSize));
-    }
-
-    /**
-     * @param bitSize A number of bits, in [1,31].
-     * @return True if the specified value fits as an unsigned integer
-     *         over the specified number of bits, false otherwise.
-     * @throws IllegalArgumentException if the specified number of bits is not in [1,31].
-     */
-    public static boolean isInRangeUnsigned(int a, int bitSize) {
-        return isInRange(0, maxUnsignedIntForBitSize(bitSize), a);
-    }
-
-    /**
-     * @param bitSize A number of bits, in [1,63].
-     * @return True if the specified value fits as an unsigned integer
-     *         over the specified number of bits, false otherwise.
-     * @throws IllegalArgumentException if the specified number of bits is not in [1,63].
-     */
-    public static boolean isInRangeUnsigned(long a, int bitSize) {
-        return isInRange(0, maxUnsignedLongForBitSize(bitSize), a);
-    }
-
-    /*
-     *
-     */
-
-    /**
-     * @param bitSize A number of bits, in [1,32].
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if the specified value does not fit
-     *         as a signed integer over the specified number of bits.
-     */
-    public static boolean checkIsInRangeSigned(int a, int bitSize) {
-        if (!isInRangeSigned(a, bitSize)) {
-            throw new IllegalArgumentException(a+" does not fit as a signed value over "+bitSize+" bits");
-        }
-        return true;
-    }
-
-    /**
-     * @param bitSize A number of bits, in [1,64].
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if the specified value does not fit
-     *         as a signed integer over the specified number of bits.
-     */
-    public static boolean checkIsInRangeSigned(long a, int bitSize) {
-        if (!isInRangeSigned(a, bitSize)) {
-            throw new IllegalArgumentException(a+" does not fit as a signed value over "+bitSize+" bits");
-        }
-        return true;
-    }
-
-    /**
-     * @param bitSize A number of bits, in [1,31].
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if the specified value does not fit
-     *         as an unsigned integer over the specified number of bits.
-     */
-    public static boolean checkIsInRangeUnsigned(int a, int bitSize) {
-        if (!isInRangeUnsigned(a, bitSize)) {
-            throw new IllegalArgumentException(a+" does not fit as an unsigned value over "+bitSize+" bits");
-        }
-        return true;
-    }
-
-    /**
-     * @param bitSize A number of bits, in [1,63].
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if the specified value does not fit
-     *         as an unsigned integer over the specified number of bits.
-     */
-    public static boolean checkIsInRangeUnsigned(long a, int bitSize) {
-        if (!isInRangeUnsigned(a, bitSize)) {
-            throw new IllegalArgumentException(a+" does not fit as an unsigned value over "+bitSize+" bits");
-        }
-        return true;
-    }
-
-    /*
-     * masks (int)
-     */
-
-    /**
-     * @param bitSize A number of bits, in [0,32].
-     * @return Mask with the specified number of left bits set with 0,
-     *         and other bits set with 1.
-     */
-    public static int intMaskMSBits0(int bitSize) {
-        checkIsInRange(0, 32, bitSize);
-        // Shifting in two times, for >>> doesn't work for full bit size (<< as well).
-        final int halfish = (bitSize>>1);
-        return ((-1)>>>halfish)>>>(bitSize-halfish);
-    }
-
-    /**
-     * @param bitSize A number of bits, in [0,32].
-     * @return Mask with the specified number of left bits set with 1,
-     *         and other bits set with 0.
-     */
-    public static int intMaskMSBits1(int bitSize) {
-        return ~intMaskMSBits0(bitSize);
-    }
-
-    /**
-     * @param bitSize A number of bits, in [0,32].
-     * @return Mask with the specified number of right bits set with 0,
-     *         and other bits set with 1.
-     */
-    public static int intMaskLSBits0(int bitSize) {
-        return ~intMaskMSBits0(32-bitSize);
-    }
-
-    /**
-     * @param bitSize A number of bits, in [0,32].
-     * @return Mask with the specified number of right bits set with 1,
-     *         and other bits set with 0.
-     */
-    public static int intMaskLSBits1(int bitSize) {
-        return intMaskMSBits0(32-bitSize);
-    }
-
-    /*
-     * masks (long)
-     */
-
-    /**
-     * @param bitSize A number of bits, in [0,64].
-     * @return Mask with the specified number of left bits set with 0,
-     *         and other bits set with 1.
-     */
-    public static long longMaskMSBits0(int bitSize) {
-        checkIsInRange(0, 64, bitSize);
-        // Shifting in two times, for >>> doesn't work for full bit size (<< as well).
-        final int halfish = (bitSize>>1);
-        return ((-1L)>>>halfish)>>>(bitSize-halfish);
-    }
-
-    /**
-     * @param bitSize A number of bits, in [0,64].
-     * @return Mask with the specified number of left bits set with 1,
-     *         and other bits set with 0.
-     */
-    public static long longMaskMSBits1(int bitSize) {
-        return ~longMaskMSBits0(bitSize);
-    }
-
-    /**
-     * @param bitSize A number of bits, in [0,64].
-     * @return Mask with the specified number of right bits set with 0,
-     *         and other bits set with 1.
-     */
-    public static long longMaskLSBits0(int bitSize) {
-        return ~longMaskMSBits0(64-bitSize);
-    }
-
-    /**
-     * @param bitSize A number of bits, in [0,64].
-     * @return Mask with the specified number of right bits set with 1,
-     *         and other bits set with 0.
-     */
-    public static long longMaskLSBits1(int bitSize) {
-        return longMaskMSBits0(64-bitSize);
-    }
-
-    /*
-     * signed/unsigned
-     */
-
-    /**
-     * @return Unsigned value corresponding to bits of the specified byte.
-     */
-    public static short byteAsUnsigned(byte value) {
-        return (short)(((short)value) & 0xFF);
-    }
-
-    /**
-     * @return Unsigned value corresponding to bits of the specified short.
-     */
-    public static int shortAsUnsigned(short value) {
-        return ((int)value) & 0xFFFF;
-    }
-
-    /**
-     * @return Unsigned value corresponding to bits of the specified int.
-     */
-    public static long intAsUnsigned(int value) {
-        return ((long)value) & 0xFFFFFFFF;
-    }
-
-    /*
-     * bitwise ranges
-     */
-
-    /**
-     * @return True if a signed int value can be read over the specified number of bits,
-     *         i.e. if it is in [1,32], false otherwise.
-     */
-    public static boolean isValidBitSizeForSignedInt(int bitSize) {
-        return (bitSize > 0) && (bitSize <= 32);
-    }
-
-    /**
-     * @return True if a signed long value can be read over the specified number of bits,
-     *         i.e. if it is in [1,64], false otherwise.
-     */
-    public static boolean isValidBitSizeForSignedLong(int bitSize) {
-        return (bitSize > 0) && (bitSize <= 64);
-    }
-
-    /**
-     * @return True if an unsigned int value can be read over the specified number of bits,
-     *         i.e. if it is in [1,31], false otherwise.
-     */
-    public static boolean isValidBitSizeForUnsignedInt(int bitSize) {
-        return (bitSize > 0) && (bitSize < 32);
-    }
-
-    /**
-     * @return True if an unsigned long value can be read over the specified number of bits,
-     *         i.e. if it is in [1,63], false otherwise.
-     */
-    public static boolean isValidBitSizeForUnsignedLong(int bitSize) {
-        return (bitSize > 0) && (bitSize < 64);
-    }
-
-    /*
-     *
-     */
-
-    /**
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if a signed int value can't be read over the
-     *         specified number of bits, i.e. if it is not in [1,32].
-     */
-    public static boolean checkBitSizeForSignedInt(int bitSize) {
-        if (!isValidBitSizeForSignedInt(bitSize)) {
-            throw new IllegalArgumentException("bit size ["+bitSize+"] must be in [1,32] for signed int values");
-        }
-        return true;
-    }
-
-    /**
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if a signed long value can't be read over the
-     *         specified number of bits, i.e. if it is not in [1,64].
-     */
-    public static boolean checkBitSizeForSignedLong(int bitSize) {
-        if (!isValidBitSizeForSignedLong(bitSize)) {
-            throw new IllegalArgumentException("bit size ["+bitSize+"] must be in [1,64] for signed long values");
-        }
-        return true;
-    }
-
-    /**
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if an unsigned int value can't be read over the
-     *         specified number of bits, i.e. if it is not in [1,31].
-     */
-    public static boolean checkBitSizeForUnsignedInt(int bitSize) {
-        if (!isValidBitSizeForUnsignedInt(bitSize)) {
-            throw new IllegalArgumentException("bit size ["+bitSize+"] must be in [1,31] for unsigned int values");
-        }
-        return true;
-    }
-
-    /**
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if an unsigned long value can't be read over the
-     *         specified number of bits, i.e. if it is not in [1,63].
-     */
-    public static boolean checkBitSizeForUnsignedLong(int bitSize) {
-        if (!isValidBitSizeForUnsignedLong(bitSize)) {
-            throw new IllegalArgumentException("bit size ["+bitSize+"] must be in [1,63] for unsigned long values");
-        }
-        return true;
-    }
-
-    /*
-     *
-     */
-
-    /**
-     * @param bitSize A number of bits in [1,32].
-     * @return The min signed int value that can be stored over the specified number of bits.
-     * @throws IllegalArgumentException if the specified number of bits is out of range.
-     */
-    public static int minSignedIntForBitSize(int bitSize) {
-        checkBitSizeForSignedInt(bitSize);
-        return minSignedIntForBitSize_noCheck(bitSize);
-    }
-
-    /**
-     * @param bitSize A number of bits in [1,64].
-     * @return The min signed long value that can be stored over the specified number of bits.
-     * @throws IllegalArgumentException if the specified number of bits is out of range.
-     */
-    public static long minSignedLongForBitSize(int bitSize) {
-        checkBitSizeForSignedLong(bitSize);
-        return minSignedLongForBitSize_noCheck(bitSize);
-    }
-
-    /**
-     * @param bitSize A number of bits in [1,32].
-     * @return The max signed int value that can be stored over the specified number of bits.
-     * @throws IllegalArgumentException if the specified number of bits is out of range.
-     */
-    public static int maxSignedIntForBitSize(int bitSize) {
-        checkBitSizeForSignedInt(bitSize);
-        return maxSignedIntForBitSize_noCheck(bitSize);
-    }
-
-    /**
-     * @param bitSize A number of bits in [1,64].
-     * @return The max signed long value that can be stored over the specified number of bits.
-     * @throws IllegalArgumentException if the specified number of bits is out of range.
-     */
-    public static long maxSignedLongForBitSize(int bitSize) {
-        checkBitSizeForSignedLong(bitSize);
-        return maxSignedLongForBitSize_noCheck(bitSize);
-    }
-
-    /**
-     * @param bitSize A number of bits in [1,31].
-     * @return The max unsigned int value that can be stored over the specified number of bits.
-     * @throws IllegalArgumentException if the specified number of bits is out of range.
-     */
-    public static int maxUnsignedIntForBitSize(int bitSize) {
-        checkBitSizeForUnsignedInt(bitSize);
-        // i.e. (1<<bitSize)-1
-        return (Integer.MAX_VALUE>>(31-bitSize));
-    }
-
-    /**
-     * @param bitSize A number of bits in [1,63].
-     * @return The max unsigned long value that can be stored over the specified number of bits.
-     * @throws IllegalArgumentException if the specified number of bits is out of range.
-     */
-    public static long maxUnsignedLongForBitSize(int bitSize) {
-        checkBitSizeForUnsignedLong(bitSize);
-        // i.e. (1L<<bitSize)-1
-        return (Long.MAX_VALUE>>(63-bitSize));
-    }
-
-    /*
-     *
-     */
-
-    /**
-     * @return The number of bits required to store the specified value as a signed integer,
-     *         i.e. a result in [1,32].
-     */
-    public static int bitSizeForSignedValue(int value) {
-        if (value > 0) {
-            return 33-Integer.numberOfLeadingZeros(value);
-        } else if (value == 0) {
-            return 1;
-        } else {
-            // Works for Integer.MIN_VALUE as well.
-            return 33-Integer.numberOfLeadingZeros(-value-1);
-        }
-    }
-
-    /**
-     * @return The number of bits required to store the specified value as a signed integer,
-     *         i.e. a result in [1,64].
-     */
-    public static int bitSizeForSignedValue(long value) {
-        if (value > 0) {
-            return 65-Long.numberOfLeadingZeros(value);
-        } else if (value == 0) {
-            return 1;
-        } else {
-            // Works for Long.MIN_VALUE as well.
-            return 65-Long.numberOfLeadingZeros(-value-1);
-        }
-    }
-
-    /**
-     * @param value An integer value in [0,Integer.MAX_VALUE].
-     * @return The number of bits required to store the specified value as an unsigned integer,
-     *         i.e. a result in [1,31].
-     * @throws IllegalArgumentException if the specified value is < 0.
-     */
-    public static int bitSizeForUnsignedValue(int value) {
-        if (value > 0) {
-            return 32-Integer.numberOfLeadingZeros(value);
-        } else {
-            if (value == 0) {
-                return 1;
-            } else {
-                throw new IllegalArgumentException("unsigned value ["+value+"] must be >= 0");
-            }
-        }
-    }
-
-    /**
-     * @param value An integer value in [0,Long.MAX_VALUE].
-     * @return The number of bits required to store the specified value as an unsigned integer,
-     *         i.e. a result in [1,63].
-     * @throws IllegalArgumentException if the specified value is < 0.
-     */
-    public static int bitSizeForUnsignedValue(long value) {
-        if (value > 0) {
-            return 64-Long.numberOfLeadingZeros(value);
-        } else {
-            if (value == 0) {
-                return 1;
-            } else {
-                throw new IllegalArgumentException("unsigned value ["+value+"] must be >= 0");
-            }
-        }
-    }
-
-    /*
-     * integer functions
-     */
-
-    /**
-     * @return 1 if the specified value is > 0, 0 if it is 0, -1 otherwise.
-     */
-    public static int signum(int a) {
-        return (a < 0) ? -1 : ((a == 0) ? 0 : 1);
-    }
-
-    /**
-     * @return 1 if the specified value is > 0, 0 if it is 0, -1 otherwise.
-     */
-    public static int signum(long a) {
-        return (a < 0) ? -1 : ((a == 0) ? 0 : 1);
-    }
-
-    /**
-     * @return True if the specified value is even, false otherwise.
-     */
-    public static boolean isEven(int a) {
-        return ((a&1) == 0);
-    }
-
-    /**
-     * @return True if the specified value is even, false otherwise.
-     */
-    public static boolean isEven(long a) {
-        // faster to work on ints
-        return isEven((int)a);
-    }
-
-    /**
-     * @return True if the specified value is odd, false otherwise.
-     */
-    public static boolean isOdd(int a) {
-        return ((a&1) != 0);
-    }
-
-    /**
-     * @return True if the specified value is odd, false otherwise.
-     */
-    public static boolean isOdd(long a) {
-        // faster to work on ints
-        return isOdd((int)a);
-    }
-
-    /**
-     * @return True if the specified values are both even or both odd, false otherwise.
-     */
-    public static boolean haveSameEvenness(int a, int b) {
-        return (((a^b)&1) == 0);
-    }
-
-    /**
-     * @return True if the specified values are both even or both odd, false otherwise.
-     */
-    public static boolean haveSameEvenness(long a, long b) {
-        // faster to work on ints
-        return haveSameEvenness((int)a, (int)b);
-    }
-
-    /**
-     * @return True if the specified values are both >= 0 or both < 0, false otherwise.
-     */
-    public static boolean haveSameSign(int a, int b) {
-        return ((a^b) >= 0);
-    }
-
-    /**
-     * @return True if the specified values are both >= 0 or both < 0, false otherwise.
-     */
-    public static boolean haveSameSign(long a, long b) {
-        return ((a^b) >= 0);
-    }
-
-    /**
-     * @return True if the specified value is a power of two,
-     *         i.e. a value of the form 2^k, with k >= 0.
-     */
-    public static boolean isPowerOfTwo(int a) {
-        if (a <= 0) {
-            return false;
-        }
-        if (false) {
-            // also works
-            return (a & -a) == a;
-        }
-        return (a & (a-1)) == 0;
-    }
-
-    /**
-     * @return True if the specified value is a power of two,
-     *         i.e. a value of the form 2^k, with k >= 0.
-     */
-    public static boolean isPowerOfTwo(long a) {
-        if (a <= 0) {
-            return false;
-        }
-        if (false) {
-            // also works
-            return (a & -a) == a;
-        }
-        return (a & (a-1)) == 0;
-    }
-
-    /**
-     * @return True if the specified value is a signed power of two,
-     *         i.e. a value of the form +-2^k, with k >= 0.
-     */
-    public static boolean isSignedPowerOfTwo(int a) {
-        if (a > 0) {
-            return (a & (a-1)) == 0;
-        } else {
-            if (a == -a) {
-                // a is 0 or Integer.MIN_VALUE
-                return (a != 0);
-            }
-            return ((-a) & (-a-1)) == 0;
-        }
-    }
-
-    /**
-     * @return True if the specified value is a signed power of two,
-     *         i.e. a value of the form +-2^k, with k >= 0.
-     */
-    public static boolean isSignedPowerOfTwo(long a) {
-        if (a > 0) {
-            return (a & (a-1)) == 0;
-        } else {
-            if (a == -a) {
-                // a is 0 or Long.MIN_VALUE
-                return (a != 0);
-            }
-            return ((-a) & (-a-1)) == 0;
-        }
-    }
-
-    /**
-     * @param a A value in [1,Integer.MAX_VALUE].
-     * @return The highest power of two <= a.
-     */
-    public static int floorPowerOfTwo(int a) {
-        if (a <= 0) {
-            throw new IllegalArgumentException("a ["+a+"] must be > 0");
-        }
-        return Integer.highestOneBit(a);
-    }
-
-    /**
-     * @param a A value in [1,Long.MAX_VALUE].
-     * @return The highest power of two <= a.
-     */
-    public static long floorPowerOfTwo(long a) {
-        if (a <= 0) {
-            throw new IllegalArgumentException("a ["+a+"] must be > 0");
-        }
-        // Faster than copying int method
-        // (less computations on long).
-        return 1L << (63 - Long.numberOfLeadingZeros(a));
-    }
-
-    /**
-     * @param a A value in [0,2^30].
-     * @return The lowest power of two >= a.
-     */
-    public static int ceilingPowerOfTwo(int a) {
-        checkIsInRange(0, (1<<30), a);
-        return (a >= 2) ? Integer.highestOneBit((a-1)<<1) : 1;
-    }
-
-    /**
-     * @param a A value in [0,2^62].
-     * @return The lowest power of two >= a.
-     */
-    public static long ceilingPowerOfTwo(long a) {
-        checkIsInRange(0L, (1L<<62), a);
-        // Faster than copying int method
-        // (less computations on long).
-        return 1L << (64 - Long.numberOfLeadingZeros(a - 1));
-    }
-
-    /**
-     * @return Mean without overflow, rounded to the lowest value (i.e. mathematical floor((a+b)/2), using floating point division).
-     */
-    public static int meanLow(int a, int b) {
-        return (a & b) + ((a ^ b) >> 1);
-    }
-
-    /**
-     * @return Mean without overflow, rounded to the lowest value (i.e. mathematical floor((a+b)/2), using floating point division).
-     */
-    public static long meanLow(long a, long b) {
-        return (a & b) + ((a ^ b) >> 1);
-    }
-
-    /**
-     * @return Mean without overflow, rounded to the value of smallest magnitude (i.e. mathematical (a+b)/2, using integer division).
-     */
-    public static int meanSml(int a, int b) {
-        int result = meanLow(a,b);
-        if (!haveSameEvenness(a, b)) {
-            // inexact
-            if (((a&b) < 0) || (((a|b) < 0) && (a+b < 0))) {
-                // both < 0, or only one is < 0 and it has the largest magnitude
-                result++;
-            }
-        }
-        return result;
-    }
-
-    /**
-     * @return Mean without overflow, rounded to the value of smallest magnitude (i.e. mathematical (a+b)/2, using integer division).
-     */
-    public static long meanSml(long a, long b) {
-        long result = meanLow(a,b);
-        if (!haveSameEvenness(a, b)) {
-            // inexact
-            if (((a&b) < 0) || (((a|b) < 0) && (a+b < 0))) {
-                // both < 0, or only one is < 0 and it has the largest magnitude
-                result++;
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Useful because a positive int value could not represent half the width
-     * of full int range width, which is mathematically Integer.MAX_VALUE+1.
-     *
-     * @return Minus half the range width (inclusive, and rounded to the value of smaller magnitude)
-     *         between the specified bounds.
-     * @throws IllegalArgumentException if min > max.
-     */
-    public static int negHalfWidth(int min, int max) {
-        if (min > max) {
-            throw new IllegalArgumentException("min ["+min+"] must be <= max ["+max+"]");
-        }
-        int mean = meanLow(min, max);
-        return min - mean - ((min^max)&1);
-    }
-
-    /**
-     * Useful because a positive long value could not represent half the width
-     * of full long range width, which is mathematically Long.MAX_VALUE+1.
-     *
-     * @return Minus half the range width (inclusive, and rounded to the value of smaller magnitude)
-     *         between the specified bounds.
-     * @throws IllegalArgumentException if min > max.
-     */
-    public static long negHalfWidth(long min, long max) {
-        if (min > max) {
-            throw new IllegalArgumentException("min ["+min+"] must be <= max ["+max+"]");
-        }
-        long mean = meanLow(min, max);
-        return min - mean - ((min^max)&1);
-    }
-
-    /**
-     * This treatment being designed for optimization, the fact that spot
-     * is a signed power of two is not checked.
-     *
-     * @param value A value.
-     * @param spot A signed power of two (i.e. a value of the form +-2^k, k >= 0).
-     * @return value % spot, i.e. a value in ]-|spot|,|spot|[.
-     */
-    public static int moduloSignedPowerOfTwo(int value, int spot) {
-        if (spot == Integer.MIN_VALUE) {
-            return (value != Integer.MIN_VALUE) ? value : 0;
-        } else {
-            int s = (value>>31);
-            return ((((value+s) ^ s) & (abs(spot)-1)) + s) ^ s;
-        }
-    }
-
-    /**
-     * This treatment being designed for optimization, the fact that spot
-     * is a signed power of two is not checked.
-     *
-     * @param value A value.
-     * @param spot A signed power of two (i.e. a value of the form +-2^k, k >= 0).
-     * @return value % spot, i.e. a value in ]-|spot|,|spot|[.
-     */
-    public static long moduloSignedPowerOfTwo(long value, long spot) {
-        if (spot == Long.MIN_VALUE) {
-            return (value != Long.MIN_VALUE) ? value : 0;
-        } else {
-            long s = (value>>63);
-            return ((((value+s) ^ s) & (abs(spot)-1)) + s) ^ s;
-        }
-    }
-
-    /**
-     * @param value An integer value > 0.
-     * @return The integer part of the logarithm, in base 2, of the specified value,
-     *         i.e. a result in [0,30]
-     * @throws IllegalArgumentException if the specified value is <= 0.
-     */
-    public static int log2(int value) {
-        if (value <= 0) {
-            throw new IllegalArgumentException("value ["+value+"] must be > 0");
-        }
-        return 31-Integer.numberOfLeadingZeros(value);
-    }
-
-    /**
-     * @param value An integer value > 0.
-     * @return The integer part of the logarithm, in base 2, of the specified value,
-     *         i.e. a result in [0,62]
-     * @throws IllegalArgumentException if the specified value is <= 0.
-     */
-    public static int log2(long value) {
-        if (value <= 0) {
-            throw new IllegalArgumentException("value ["+value+"] must be > 0");
-        }
-        return 63-Long.numberOfLeadingZeros(value);
-    }
-
-    /**
-     * Possibly faster than java.lang.Math.abs(int).
-     *
-     * @return The absolute value, except if value is Integer.MIN_VALUE, for which it returns Integer.MIN_VALUE.
-     */
-    public static int abs(int a) {
-        return (a^(a>>31))-(a>>31);
-    }
-
-    /**
-     * Possibly faster than java.lang.Math.abs(long).
-     *
-     * @return The absolute value, except if value is Long.MIN_VALUE, for which it returns Long.MIN_VALUE.
-     */
-    public static long abs(long a) {
-        return (a^(a>>63))-(a>>63);
-    }
-
-    /**
-     * @return The negative of the absolute value (always exact).
-     */
-    public static int absNeg(int a) {
-        return (a>>31)-(a^(a>>31));
-    }
-
-    /**
-     * @return The negative of the absolute value (always exact).
-     */
-    public static long absNeg(long a) {
-        return (a>>63)-(a^(a>>63));
-    }
-
-    /**
-     * If the specified value is in int range, the returned value is identical.
-     *
-     * @return An int hash of the specified value.
-     */
-    public static int intHash(long a) {
-        if (false) {
-            // also works
-            int hash = ((int)(a>>32)) ^ ((int)a);
-            if (a < 0) {
-                hash = -hash-1;
-            }
-            return hash;
-        }
-        int hash = ((int)(a>>32)) + ((int)a);
-        if (a < 0) {
-            hash++;
-        }
-        return hash;
-    }
-
-    /**
-     * @param a An int value.
-     * @return The specified value as byte.
-     * @throws ArithmeticException if the specified value is not in [Byte.MIN_VALUE,Byte.MAX_VALUE] range.
-     */
-    public static byte asByte(int a) {
-        if (a != (byte)a) {
-            throw new ArithmeticException("overflow: "+a);
-        }
-        return (byte)a;
-    }
-
-    /**
-     * @param a A long value.
-     * @return The specified value as int.
-     * @throws ArithmeticException if the specified value is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
-     */
-    public static int asInt(long a) {
-        if (a != (int)a) {
-            throw new ArithmeticException("overflow: "+a);
-        }
-        return (int)a;
-    }
-
-    /**
-     * @param a A long value.
-     * @return The closest int value in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
-     */
-    public static int toInt(long a) {
-        if (a != (int)a) {
-            return (a < 0) ? Integer.MIN_VALUE : Integer.MAX_VALUE;
-        }
-        return (int)a;
-    }
-
-    /**
-     * @param a An int value.
-     * @param b An int value.
-     * @return The mathematical result of a+b.
-     * @throws ArithmeticException if the mathematical result of a+b is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
-     */
-    public static int plusExact(int a, int b) {
-        final int sum = a + b;
-        // HD 2-12 Overflow iff both arguments
-        // have the opposite sign of the result.
-        if (((a ^ sum) & (b ^ sum)) < 0) {
-            throw new ArithmeticException("overflow: "+a+"+"+b);
-        }
-        return sum;
-    }
-
-    /**
-     * @param a A long value.
-     * @param b A long value.
-     * @return The mathematical result of a+b.
-     * @throws ArithmeticException if the mathematical result of a+b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
-     */
-    public static long plusExact(long a, long b) {
-        final long sum = a + b;
-        // HD 2-12 Overflow iff both arguments
-        // have the opposite sign of the result.
-        if (((a ^ sum) & (b ^ sum)) < 0) {
-            throw new ArithmeticException("overflow: "+a+"+"+b);
-        }
-        return sum;
-    }
-
-    /**
-     * @param a An int value.
-     * @param b An int value.
-     * @return The int value of [Integer.MIN_VALUE,Integer.MAX_VALUE] range which is the closest to mathematical result of a+b.
-     */
-    public static int plusBounded(int a, int b) {
-        return toInt(((long)a) + ((long)b));
-    }
-
-    /**
-     * @param a A long value.
-     * @param b A long value.
-     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a+b.
-     */
-    public static long plusBounded(long a, long b) {
-        final long sum = a + b;
-        if (((a ^ sum) & (b ^ sum)) < 0) {
-            return (sum >= 0) ? Long.MIN_VALUE : Long.MAX_VALUE;
-        }
-        return sum;
-    }
-
-    /**
-     * @param a An int value.
-     * @param b An int value.
-     * @return The mathematical result of a-b.
-     * @throws ArithmeticException if the mathematical result of a-b is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
-     */
-    public static int minusExact(int a, int b) {
-        final int diff = a - b;
-        // HD 2-12 Overflow iff the arguments have different signs and
-        // the sign of the result is different than the sign of "a".
-        if (((a ^ b) & (a ^ diff)) < 0) {
-            throw new ArithmeticException("integer overflow");
-        }
-        return diff;
-    }
-
-    /**
-     * @param a A long value.
-     * @param b A long value.
-     * @return The mathematical result of a-b.
-     * @throws ArithmeticException if the mathematical result of a-b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
-     */
-    public static long minusExact(long a, long b) {
-        final long diff = a - b;
-        // HD 2-12 Overflow iff the arguments have different signs and
-        // the sign of the result is different than the sign of "a".
-        if (((a ^ b) & (a ^ diff)) < 0) {
-            throw new ArithmeticException("integer overflow");
-        }
-        return diff;
-    }
-
-    /**
-     * @param a An int value.
-     * @param b An int value.
-     * @return The int value of [Integer.MIN_VALUE,Integer.MAX_VALUE] range which is the closest to mathematical result of a-b.
-     */
-    public static int minusBounded(int a, int b) {
-        return toInt(((long)a) - ((long)b));
-    }
-
-    /**
-     * @param a A long value.
-     * @param b A long value.
-     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a-b.
-     */
-    public static long minusBounded(long a, long b) {
-        final long diff = a - b;
-        if (((a ^ b) & (a ^ diff)) < 0) {
-            return (diff >= 0) ? Long.MIN_VALUE : Long.MAX_VALUE;
-        }
-        return diff;
-    }
-
-    /**
-     * @param a An int value.
-     * @param b An int value.
-     * @return The mathematical result of a*b.
-     * @throws ArithmeticException if the mathematical result of a*b is not in [Integer.MIN_VALUE,Integer.MAX_VALUE] range.
-     */
-    public static int timesExact(int a, int b) {
-        final long prod = a * (long)b;
-        if (prod != (int)prod) {
-            throw new ArithmeticException("overflow: "+a+"*"+b);
-        }
-        return (int)prod;
-    }
-
-    /**
-     * @param a A long value.
-     * @param b A long value.
-     * @return The mathematical result of a*b.
-     * @throws ArithmeticException if the mathematical result of a*b is not in [Long.MIN_VALUE,Long.MAX_VALUE] range.
-     */
-    public static long timesExact(long a, long b) {
-        final long prod = a * b;
-        final long absA = abs(a);
-        final long absB = abs(b);
-        if (((absA|absB)>>>31) != 0) {
-            // Some bits greater than 2^31 that might cause overflow
-            // Check the result using the divide operator
-            // and check for the special case of Long.MIN_VALUE * -1
-            if (((b != 0) && (prod/b != a)) ||
-                    ((a == Long.MIN_VALUE) && (b == -1))) {
-                throw new ArithmeticException("overflow: "+a+"*"+b);
-            }
-        }
-        return prod;
-    }
-
-    /**
-     * @param a An int value.
-     * @param b An int value.
-     * @return The int value of [Integer.MIN_VALUE,Integer.MAX_VALUE] range which is the closest to mathematical result of a*b.
-     */
-    public static int timesBounded(int a, int b) {
-        return (int)(a * (double)b);
-    }
-
-    /**
-     * @param a A long value.
-     * @param b A long value.
-     * @return The long value of [Long.MIN_VALUE,Long.MAX_VALUE] range which is the closest to mathematical result of a*b.
-     */
-    public static long timesBounded(long a, long b) {
-        final long prod = a * b;
-        final long absA = abs(a);
-        final long absB = abs(b);
-        if (((absA|absB)>>>31) != 0) {
-            // Some bits greater than 2^31 that might cause overflow
-            // Check the result using the divide operator
-            // and check for the special case of Long.MIN_VALUE * -1
-            if (((b != 0) && (prod/b != a)) ||
-                    ((a == Long.MIN_VALUE) && (b == -1))) {
-                return ((a^b) >= 0) ? Long.MAX_VALUE : Long.MIN_VALUE;
-            }
-        }
-        return prod;
-    }
-
-    /*
-     * powers
-     */
-
-    /**
-     * Returns the exact result, provided it's in double range,
-     * i.e. if power is in [-1074,1023].
-     *
-     * @param power An int power.
-     * @return 2^power as a double, or +-Infinity in case of overflow.
-     */
-    public static double twoPow(int power) {
-        if (power <= -MAX_DOUBLE_EXPONENT) { // Not normal.
-            if (power >= MIN_DOUBLE_EXPONENT) { // Subnormal.
-                return Double.longBitsToDouble(0x0008000000000000L>>(-(power+MAX_DOUBLE_EXPONENT)));
-            } else { // Underflow.
-                return 0.0;
-            }
-        } else if (power > MAX_DOUBLE_EXPONENT) { // Overflow.
-            return Double.POSITIVE_INFINITY;
-        } else { // Normal.
-            return Double.longBitsToDouble(((long)(power+MAX_DOUBLE_EXPONENT))<<52);
-        }
-    }
-
-    /**
-     * @param power An int power.
-     * @return 2^power as an int.
-     * @throws ArithmeticException if the mathematical result
-     *         is not in int range, i.e. if power is not in [0,30].
-     */
-    public static int twoPowAsIntExact(int power) {
-        if ((power < 0) || (power > 30)) {
-            throw new ArithmeticException("integer overflow");
-        }
-        return 1 << power;
-    }
-
-    /**
-     * @param power An int power.
-     * @return 2^power as an int, or the closest power of two in int range
-     *         in case of overflow, i.e. if power is not in [0,30].
-     */
-    public static int twoPowAsIntBounded(int power) {
-        power = toRange(0, 30, power);
-        return 1 << power;
-    }
-
-    /**
-     * @param power An int power.
-     * @return 2^power as a long.
-     * @throws ArithmeticException if the mathematical result
-     *         is not in long range, i.e. if power is not in [0,62].
-     */
-    public static long twoPowAsLongExact(int power) {
-        if ((power < 0) || (power > 62)) {
-            throw new ArithmeticException("long overflow");
-        }
-        return 1L << power;
-    }
-
-    /**
-     * @param power An int power.
-     * @return 2^power as a long, or the closest power of two in long range
-     *         in case of overflow, i.e. if power is not in [0,62].
-     */
-    public static long twoPowAsLongBounded(int power) {
-        power = toRange(0, 62, power);
-        return 1L << power;
-    }
-
-    /**
-     * @param a A value.
-     * @return a*a.
-     */
-    public static int pow2(int a) {
-        return a*a;
-    }
-
-    /**
-     * @param a A value.
-     * @return a*a.
-     */
-    public static long pow2(long a) {
-        return a*a;
-    }
-
-    /**
-     * @param a A value.
-     * @return a*a.
-     */
-    public static float pow2(float a) {
-        return a*a;
-    }
-
-    /**
-     * Strict version.
-     *
-     * @param a A value.
-     * @return a*a.
-     */
-    public static strictfp float pow2_strict(float a) {
-        return a*a;
-    }
-
-    /**
-     * @param a A value.
-     * @return a*a.
-     */
-    public static double pow2(double a) {
-        return a*a;
-    }
-
-    /**
-     * Strict version.
-     *
-     * @param a A value.
-     * @return a*a.
-     */
-    public static strictfp double pow2_strict(double a) {
-        return a*a;
-    }
-
-    /**
-     * @param a A value.
-     * @return a*a*a.
-     */
-    public static int pow3(int a) {
-        return a*a*a;
-    }
-
-    /**
-     * @param a A value.
-     * @return a*a*a.
-     */
-    public static long pow3(long a) {
-        return a*a*a;
-    }
-
-    /**
-     * @param a A value.
-     * @return a*a*a.
-     */
-    public static float pow3(float a) {
-        return a*a*a;
-    }
-
-    /**
-     * Strict version.
-     *
-     * @param a A value.
-     * @return a*a*a.
-     */
-    public static strictfp float pow3_strict(float a) {
-        return a*a*a;
-    }
-
-    /**
-     * @param a A value.
-     * @return a*a*a.
-     */
-    public static double pow3(double a) {
-        return a*a*a;
-    }
-
-    /**
-     * Strict version.
-     *
-     * @param a A value.
-     * @return a*a*a.
-     */
-    public static strictfp double pow3_strict(double a) {
-        return a*a*a;
-    }
-
-    /*
-     * Accurate +-m*PI/n.
-     */
-
-    /**
-     * @param angRad An angle, in radians.
-     * @return angRad + 2*PI, accurately computed.
-     */
-    public static double plus2PI(double angRad) {
-        if (angRad > -Math.PI) {
-            // LO then HI, for better accuracy (if starting near 0).
-            return (angRad + TWOPI_LO) + TWOPI_HI;
-        } else {
-            // HI then LO, for better accuracy (if ending near 0).
-            return (angRad + TWOPI_HI) + TWOPI_LO;
-        }
-    }
-
-    /**
-     * Strict version.
-     *
-     * @param angRad An angle, in radians.
-     * @return angRad + 2*PI, accurately computed.
-     */
-    public static strictfp double plus2PI_strict(double angRad) {
-        if (angRad > -Math.PI) {
-            // LO then HI, for better accuracy (if starting near 0).
-            return (angRad + TWOPI_LO) + TWOPI_HI;
-        } else {
-            // HI then LO, for better accuracy (if ending near 0).
-            return (angRad + TWOPI_HI) + TWOPI_LO;
-        }
-    }
-
-    /**
-     * @param angRad An angle, in radians.
-     * @return angRad - 2*PI, accurately computed.
-     */
-    public static double minus2PI(double angRad) {
-        if (angRad < Math.PI) {
-            // LO then HI, for better accuracy (if starting near 0).
-            return (angRad - TWOPI_LO) - TWOPI_HI;
-        } else {
-            // HI then LO, for better accuracy (if ending near 0).
-            return (angRad - TWOPI_HI) - TWOPI_LO;
-        }
-    }
-
-    /**
-     * Strict version.
-     *
-     * @param angRad An angle, in radians.
-     * @return angRad - 2*PI, accurately computed.
-     */
-    public static strictfp double minus2PI_strict(double angRad) {
-        if (angRad < Math.PI) {
-            // LO then HI, for better accuracy (if starting near 0).
-            return (angRad - TWOPI_LO) - TWOPI_HI;
-        } else {
-            // HI then LO, for better accuracy (if ending near 0).
-            return (angRad - TWOPI_HI) - TWOPI_LO;
-        }
-    }
-
-    /**
-     * @param angRad An angle, in radians.
-     * @return angRad + PI, accurately computed.
-     */
-    public static double plusPI(double angRad) {
-        if (angRad > -Math.PI/2) {
-            // LO then HI, for better accuracy (if starting near 0).
-            return (angRad + PI_LO) + PI_HI;
-        } else {
-            // HI then LO, for better accuracy (if ending near 0).
-            return (angRad + PI_HI) + PI_LO;
-        }
-    }
-
-    /**
-     * Strict version.
-     *
-     * @param angRad An angle, in radians.
-     * @return angRad + PI, accurately computed.
-     */
-    public static strictfp double plusPI_strict(double angRad) {
-        if (angRad > -Math.PI/2) {
-            // LO then HI, for better accuracy (if starting near 0).
-            return (angRad + PI_LO) + PI_HI;
-        } else {
-            // HI then LO, for better accuracy (if ending near 0).
-            return (angRad + PI_HI) + PI_LO;
-        }
-    }
-
-    /**
-     * @param angRad An angle, in radians.
-     * @return angRad - PI, accurately computed.
-     */
-    public static double minusPI(double angRad) {
-        if (angRad < Math.PI/2) {
-            // LO then HI, for better accuracy (if starting near 0).
-            return (angRad - PI_LO) - PI_HI;
-        } else {
-            // HI then LO, for better accuracy (if ending near 0).
-            return (angRad - PI_HI) - PI_LO;
-        }
-    }
-
-    /**
-     * Strict version.
-     *
-     * @param angRad An angle, in radians.
-     * @return angRad - PI, accurately computed.
-     */
-    public static strictfp double minusPI_strict(double angRad) {
-        if (angRad < Math.PI/2) {
-            // LO then HI, for better accuracy (if starting near 0).
-            return (angRad - PI_LO) - PI_HI;
-        } else {
-            // HI then LO, for better accuracy (if ending near 0).
-            return (angRad - PI_HI) - PI_LO;
-        }
-    }
-
-    /**
-     * @param angRad An angle, in radians.
-     * @return angRad + PI/2, accurately computed.
-     */
-    public static double plusPIO2(double angRad) {
-        if (angRad > -Math.PI/4) {
-            // LO then HI, for better accuracy (if starting near 0).
-            return (angRad + PIO2_LO) + PIO2_HI;
-        } else {
-            // HI then LO, for better accuracy (if ending near 0).
-            return (angRad + PIO2_HI) + PIO2_LO;
-        }
-    }
-
-    /**
-     * Strict version.
-     *
-     * @param angRad An angle, in radians.
-     * @return angRad + PI/2, accurately computed.
-     */
-    public static strictfp double plusPIO2_strict(double angRad) {
-        if (angRad > -Math.PI/4) {
-            // LO then HI, for better accuracy (if starting near 0).
-            return (angRad + PIO2_LO) + PIO2_HI;
-        } else {
-            // HI then LO, for better accuracy (if ending near 0).
-            return (angRad + PIO2_HI) + PIO2_LO;
-        }
-    }
-
-    /**
-     * @param angRad An angle, in radians.
-     * @return angRad - PI/2, accurately computed.
-     */
-    public static double minusPIO2(double angRad) {
-        if (angRad < Math.PI/4) {
-            // LO then HI, for better accuracy (if starting near 0).
-            return (angRad - PIO2_LO) - PIO2_HI;
-        } else {
-            // HI then LO, for better accuracy (if ending near 0).
-            return (angRad - PIO2_HI) - PIO2_LO;
-        }
-    }
-
-    /**
-     * Strict version.
-     *
-     * @param angRad An angle, in radians.
-     * @return angRad - PI/2, accurately computed.
-     */
-    public static strictfp double minusPIO2_strict(double angRad) {
-        if (angRad < Math.PI/4) {
-            // LO then HI, for better accuracy (if starting near 0).
-            return (angRad - PIO2_LO) - PIO2_HI;
-        } else {
-            // HI then LO, for better accuracy (if ending near 0).
-            return (angRad - PIO2_HI) - PIO2_LO;
-        }
-    }
-
-    /*
-     * toString (radix)
-     */
-
-    /**
-     * @param radix Radix to be checked.
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if the specified radix is not in [2,36].
-     */
-    public static boolean checkRadix(int radix) {
-        if (!isInRange(Character.MIN_RADIX, Character.MAX_RADIX, radix)) {
-            throw new IllegalArgumentException("radix ["+radix+"] must be in ["+Character.MIN_RADIX+","+Character.MAX_RADIX+"]");
-        }
-        return true;
-    }
-
-    /**
-     * @param radix A radix in [2,36].
-     * @return Number of characters (minus sign included)
-     *         to represent the specified value in the specified radix.
-     */
-    public static int computeNbrOfChars(int value, int radix) {
-        if (value < 0) {
-            // 1 for sign
-            return 1 + computeNbrOfDigits_negValue(value, radix);
-        } else {
-            return computeNbrOfDigits_negValue(-value, radix);
-        }
-    }
-
-    /**
-     * @param radix A radix in [2,36].
-     * @return Number of characters (minus sign included)
-     *         to represent the specified value in the specified radix.
-     */
-    public static int computeNbrOfChars(long value, int radix) {
-        if (value < 0) {
-            // 1 for sign
-            return 1 + computeNbrOfDigits_negValue(value, radix);
-        } else {
-            return computeNbrOfDigits_negValue(-value, radix);
-        }
-    }
-
-    /**
-     * @param radix A radix in [2,36].
-     * @param paddingUpTo Number of digits (sign excluded) up to which left-padding with zeros is done.
-     * @return Number of characters (minus sign included)
-     *         to represent the specified value in the specified radix.
-     */
-    public static int computeNbrOfChars(int value, int radix, int paddingUpTo) {
-        if (value < 0) {
-            // 1 for sign
-            return 1 + Math.max(paddingUpTo, computeNbrOfDigits_negValue(value, radix));
-        } else {
-            return Math.max(paddingUpTo, computeNbrOfDigits_negValue(-value, radix));
-        }
-    }
-
-    /**
-     * @param radix A radix in [2,36].
-     * @param paddingUpTo Number of digits (sign excluded) up to which left-padding with zeros is done.
-     * @return Number of characters (minus sign included)
-     *         to represent the specified value in the specified radix.
-     */
-    public static int computeNbrOfChars(long value, int radix, int paddingUpTo) {
-        if (value < 0) {
-            // 1 for sign
-            return 1 + Math.max(paddingUpTo, computeNbrOfDigits_negValue(value, radix));
-        } else {
-            return Math.max(paddingUpTo, computeNbrOfDigits_negValue(-value, radix));
-        }
-    }
-
-    /**
-     * @param radix A radix in [2,36].
-     * @return Number of digits of the specified value in the specified radix.
-     */
-    public static int computeNbrOfDigits(int value, int radix) {
-        return computeNbrOfDigits_negValue(-abs(value), radix);
-    }
-
-    /**
-     * @param radix A radix in [2,36].
-     * @return Number of digits of the specified value in the specified radix.
-     */
-    public static int computeNbrOfDigits(long value, int radix) {
-        return computeNbrOfDigits_negValue(-abs(value), radix);
-    }
-
-    /**
-     * @param radix A radix in [2,36].
-     * @param paddingUpTo Number of digits (sign excluded) up to which left-padding with zeros is done.
-     * @return Number of digits of the specified value in the specified radix,
-     *         including the specified padding.
-     */
-    public static int computeNbrOfDigits(int value, int radix, int paddingUpTo) {
-        return Math.max(paddingUpTo,computeNbrOfDigits(value, radix));
-    }
-
-    /**
-     * @param radix A radix in [2,36].
-     * @param paddingUpTo Number of digits (sign excluded) up to which left-padding with zeros is done.
-     * @return Number of digits of the specified value in the specified radix,
-     *         including the specified padding.
-     */
-    public static int computeNbrOfDigits(long value, int radix, int paddingUpTo) {
-        return Math.max(paddingUpTo,computeNbrOfDigits(value, radix));
-    }
-
-    /**
-     * This method just delegates to Integer.toString(int),
-     * but is defined here to complete the API.
-     *
-     * @return String representation of the specified value in base 10.
-     */
-    public static String toString(int value) {
-        return Integer.toString(value);
-    }
-
-    /**
-     * This method just delegates to Long.toString(long),
-     * but is defined here to complete the API.
-     *
-     * @return String representation of the specified value in base 10.
-     */
-    public static String toString(long value) {
-        return Long.toString(value);
-    }
-
-    /**
-     * @param radix A radix in [2,36].
-     * @return String representation of the specified value in the specified radix.
-     * @throws IllegalArgumentException if the specified radix is out of range.
-     */
-    public static String toString(int value, int radix) {
-        return toString(value, radix, 0);
-    }
-
-    /**
-     * @param radix A radix in [2,36].
-     * @return String representation of the specified value in the specified radix.
-     * @throws IllegalArgumentException if the specified radix is out of range.
-     */
-    public static String toString(long value, int radix) {
-        return toString(value, radix, 0);
-    }
-
-    /**
-     * @param radix A radix in [2,36].
-     * @param paddingUpTo Number of digits (sign excluded) up to which left-padding with zeros is done.
-     * @return String representation of the specified value in the specified radix.
-     * @throws IllegalArgumentException if the specified radix is out of range.
-     */
-    public static String toString(int value, int radix, int paddingUpTo) {
-        // Only one test if radix+paddingUpTo != 10.
-        if ((radix+paddingUpTo == 10) && (paddingUpTo == 0)) {
-            // Using JDK's optimized algorithm.
-            return Integer.toString(value);
-        }
-
-        int negValue;
-        final int signSize;
-        final boolean negative = (value < 0);
-        if (negative) {
-            negValue = value;
-            signSize = 1;
-        } else {
-            negValue = -value;
-            signSize = 0;
-        }
-        // Faster if we just use max possible number of characters (33),
-        // but we prefer to take care of garbage's memory footprint.
-        // Checks radix.
-        final int nbrOfChars = signSize + Math.max(paddingUpTo, computeNbrOfDigits_negValue(negValue, radix));
-
-        final char[] chars = new char[nbrOfChars];
-
-        int charPos = nbrOfChars;
-
-        final boolean radixIsPowerOfTwo = ((radix & (radix-1)) == 0);
-        // Not allowing Integer.MIN_VALUE so it can be negated.
-        if (radixIsPowerOfTwo && (negValue != Integer.MIN_VALUE)) {
-            final int mask = radix-1;
-            final int divShift = DIV_SHIFT_BY_RADIX[radix];
-            while (negValue <= -radix) {
-                chars[--charPos] = CHAR_BY_DIGIT[(int)((-negValue) & mask)];
-                negValue = -((-negValue) >> divShift);
-            }
-        } else {
-            while (negValue <= -radix) {
-                chars[--charPos] = CHAR_BY_DIGIT[(int)(-(negValue % radix))];
-                negValue /= radix;
-            }
-        }
-        chars[--charPos] = CHAR_BY_DIGIT[(int)(-negValue)];
-
-        while (charPos > signSize) {
-            chars[--charPos] = '0';
-        }
-
-        if (negative) {
-            chars[0] = '-';
-        }
-
-        return new String(chars);
-    }
-
-    /**
-     * @param radix A radix in [2,36].
-     * @param paddingUpTo Number of digits (sign excluded) up to which left-padding with zeros is done.
-     * @return String representation of the specified value in the specified radix.
-     * @throws IllegalArgumentException if the specified radix is out of range.
-     */
-    public static String toString(long value, int radix, int paddingUpTo) {
-        // Only one test if radix+paddingUpTo != 10.
-        if ((radix+paddingUpTo == 10) && (paddingUpTo == 0)) {
-            // Using JDK's optimized algorithm.
-            return Long.toString(value);
-        }
-
-        long negValue;
-        final int signSize;
-        final boolean negative = (value < 0);
-        if (negative) {
-            negValue = value;
-            signSize = 1;
-        } else {
-            negValue = -value;
-            signSize = 0;
-        }
-        // Checks radix.
-        final int nbrOfChars = signSize + Math.max(paddingUpTo, computeNbrOfDigits_negValue(negValue, radix));
-
-        final char[] chars = new char[nbrOfChars];
-
-        int charPos = nbrOfChars;
-
-        final boolean radixIsPowerOfTwo = ((radix & (radix-1)) == 0);
-        // Not allowing Long.MIN_VALUE so it can be negated.
-        if (radixIsPowerOfTwo && (negValue != Long.MIN_VALUE)) {
-            final int mask = radix-1;
-            final int divShift = DIV_SHIFT_BY_RADIX[radix];
-            while (negValue <= -radix) {
-                chars[--charPos] = CHAR_BY_DIGIT[(int)((-negValue) & mask)];
-                negValue = -((-negValue) >> divShift);
-            }
-        } else {
-            while (negValue <= -radix) {
-                chars[--charPos] = CHAR_BY_DIGIT[(int)(-(negValue % radix))];
-                negValue /= radix;
-            }
-        }
-        chars[--charPos] = CHAR_BY_DIGIT[(int)(-negValue)];
-
-        while (charPos > signSize) {
-            chars[--charPos] = '0';
-        }
-
-        if (negative) {
-            chars[0] = '-';
-        }
-
-        return new String(chars);
-    }
-
-    /*
-     * toString (bits)
-     */
-
-    /**
-     * @param firstBitPos First bit position (inclusive).
-     * @param lastBitPosExcl Last bit position (exclusive).
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if the specified bit range does not fit in a byte.
-     */
-    public static boolean checkBitPositionsByte(int firstBitPos, int lastBitPosExcl) {
-        return checkBitPositions(firstBitPos, lastBitPosExcl, 8);
-    }
-
-    /**
-     * @param firstBitPos First bit position (inclusive).
-     * @param lastBitPosExcl Last bit position (exclusive).
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if the specified bit range does not fit in a short.
-     */
-    public static boolean checkBitPositionsShort(int firstBitPos, int lastBitPosExcl) {
-        return checkBitPositions(firstBitPos, lastBitPosExcl, 16);
-    }
-
-    /**
-     * @param firstBitPos First bit position (inclusive).
-     * @param lastBitPosExcl Last bit position (exclusive).
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if the specified bit range does not fit in an int.
-     */
-    public static boolean checkBitPositionsInt(int firstBitPos, int lastBitPosExcl) {
-        return checkBitPositions(firstBitPos, lastBitPosExcl, 32);
-    }
-
-    /**
-     * @param firstBitPos First bit position (inclusive).
-     * @param lastBitPosExcl Last bit position (exclusive).
-     * @return True if does not throw.
-     * @throws IllegalArgumentException if the specified bit range does not fit in a long.
-     */
-    public static boolean checkBitPositionsLong(int firstBitPos, int lastBitPosExcl) {
-        return checkBitPositions(firstBitPos, lastBitPosExcl, 64);
-    }
-
-    /**
-     * @return String representation of specified bits, in big endian.
-     */
-    public static String toStringBits(byte bits) {
-        final char[] chars = new char[8];
-        int bitIndex = 8;
-        while (--bitIndex >= 0) {
-            chars[7-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
-        }
-        return new String(chars);
-    }
-
-    /**
-     * @return String representation of specified bits, in big endian.
-     */
-    public static String toStringBits(short bits) {
-        final char[] chars = new char[16];
-        int bitIndex = 16;
-        while (--bitIndex >= 0) {
-            chars[15-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
-        }
-        return new String(chars);
-    }
-
-    /**
-     * @return String representation of specified bits, in big endian.
-     */
-    public static String toStringBits(int bits) {
-        final char[] chars = new char[32];
-        int bitIndex = 32;
-        while (--bitIndex >= 0) {
-            chars[31-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
-        }
-        return new String(chars);
-    }
-
-    /**
-     * @return String representation of specified bits, in big endian.
-     */
-    public static String toStringBits(long bits) {
-        final char[] chars = new char[64];
-        int bitIndex = 64;
-        while (--bitIndex >= 0) {
-            chars[63-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
-        }
-        return new String(chars);
-    }
-
-    /**
-     * @param firstBitPos First bit position (inclusive).
-     * @param lastBitPosExcl Last bit position (exclusive).
-     * @param bigEndian True for bits to be added in big endian order (MSBit to LSBit)
-     *                  false for little endian order.
-     * @param padding True if underscores must be added instead of out-of-range bits,
-     *                false to just add characters corresponding to in-range bits.
-     * @return String representation of specified bits.
-     */
-    public static String toStringBits(
-            byte bits,
-            int firstBitPos,
-            int lastBitPosExcl,
-            boolean bigEndian,
-            boolean padding) {
-        checkBitPositionsByte(firstBitPos, lastBitPosExcl);
-        return toStringBits_0_32_bitPosAlreadyChecked(8,bits, firstBitPos, lastBitPosExcl, bigEndian, padding);
-    }
-
-    /**
-     * @param firstBitPos First bit position (inclusive).
-     * @param lastBitPosExcl Last bit position (exclusive).
-     * @param bigEndian True for bits to be added in big endian order (MSBit to LSBit)
-     *                  false for little endian order.
-     * @param padding True if underscores must be added instead of out-of-range bits,
-     *                false to just add characters corresponding to in-range bits.
-     * @return String representation of specified bits.
-     */
-    public static String toStringBits(
-            short bits,
-            int firstBitPos,
-            int lastBitPosExcl,
-            boolean bigEndian,
-            boolean padding) {
-        checkBitPositionsShort(firstBitPos, lastBitPosExcl);
-        return toStringBits_0_32_bitPosAlreadyChecked(16,bits, firstBitPos, lastBitPosExcl, bigEndian, padding);
-    }
-
-    /**
-     * @param firstBitPos First bit position (inclusive).
-     * @param lastBitPosExcl Last bit position (exclusive).
-     * @param bigEndian True for bits to be added in big endian order (MSBit to LSBit)
-     *                  false for little endian order.
-     * @param padding True if underscores must be added instead of out-of-range bits,
-     *                false to just add characters corresponding to in-range bits.
-     * @return String representation of specified bits.
-     */
-    public static String toStringBits(
-            int bits,
-            int firstBitPos,
-            int lastBitPosExcl,
-            boolean bigEndian,
-            boolean padding) {
-        checkBitPositionsInt(firstBitPos, lastBitPosExcl);
-        return toStringBits_0_32_bitPosAlreadyChecked(32,bits, firstBitPos, lastBitPosExcl, bigEndian, padding);
-    }
-
-    /**
-     * @param firstBitPos First bit position (inclusive).
-     * @param lastBitPosExcl Last bit position (exclusive).
-     * @param bigEndian True for bits to be added in big endian order (MSBit to LSBit)
-     *                  false for little endian order.
-     * @param padding True if underscores must be added instead of out-of-range bits,
-     *                false to just add characters corresponding to in-range bits.
-     * @return String representation of specified bits.
-     */
-    public static String toStringBits(
-            long bits,
-            int firstBitPos,
-            int lastBitPosExcl,
-            boolean bigEndian,
-            boolean padding) {
-        checkBitPositionsLong(firstBitPos, lastBitPosExcl);
-        final int bitSize = 64;
-        final int bitSizeM1 = bitSize-1;
-        final int lastBitPos = lastBitPosExcl-1;
-        if (padding) {
-            final int nbrOfChars = bitSize;
-            final char[] chars = new char[nbrOfChars];
-            int bitIndex = bitSizeM1;
-            if (bigEndian) {
-                final int firstBitIndex = bitSizeM1-lastBitPos;
-                final int lastBitIndex = bitSizeM1-firstBitPos;
-                while (bitIndex > lastBitIndex) {
-                    chars[bitSizeM1-bitIndex] = '_';
-                    --bitIndex;
-                }
-                while (bitIndex >= firstBitIndex) {
-                    chars[bitSizeM1-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
-                    --bitIndex;
-                }
-                while (bitIndex >= 0) {
-                    chars[bitSizeM1-bitIndex] = '_';
-                    --bitIndex;
-                }
-            } else {
-                while (bitIndex > lastBitPos) {
-                    chars[bitIndex] = '_';
-                    --bitIndex;
-                }
-                while (bitIndex >= firstBitPos) {
-                    chars[bitIndex] = (char)('0'+((bits>>bitIndex)&1));
-                    --bitIndex;
-                }
-                while (bitIndex >= 0) {
-                    chars[bitIndex] = '_';
-                    --bitIndex;
-                }
-            }
-            return new String(chars);
-        } else {
-            final int nbrOfChars = (lastBitPosExcl - firstBitPos);
-            final char[] chars = new char[nbrOfChars];
-            if (bigEndian) {
-                final int firstBitIndex = bitSizeM1-lastBitPos;
-                final int lastBitIndex = bitSizeM1-firstBitPos;
-                int bitIndex = lastBitIndex;
-                while (bitIndex >= firstBitIndex) {
-                    chars[lastBitIndex-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
-                    --bitIndex;
-                }
-            } else {
-                int bitIndex = lastBitPos;
-                while (bitIndex >= firstBitPos) {
-                    chars[bitIndex-firstBitPos] = (char)('0'+((bits>>bitIndex)&1));
-                    --bitIndex;
-                }
-            }
-            return new String(chars);
-        }
-    }
-
-    /*
-     * toString (floating points)
-     *
-     * toStringCSN(double) and toStringNoCSN(double)
-     * could be made faster, by using directly internals
-     * of Double.toString(double), but this would require
-     * copy-paste of much tricky code from JDK, and
-     * the overhead of our little rework is relatively
-     * negligible.
-     */
-
-    /**
-     * @param value A double value.
-     * @return String representing the specified value,
-     *         using "computerized scientific notation",
-     *         which Double.toString(double) uses for non-infinite
-     *         values, when |value| < 1e-3 or |value| >= 1e7.
-     */
-    public static String toStringCSN(double value) {
-        // Quick case (also to get rid of +-0.0,
-        // for which Double.toString(double) doesn't use CSN).
-        if (value == 0.0) {
-            if (Double.doubleToRawLongBits(value) < 0) {
-                return "-0.0E0";
-            } else {
-                return "0.0E0";
-            }
-        }
-
-        final double abs = Math.abs(value);
-        if ((abs >= NO_CSN_MIN_BOUND_INCL) && (abs < NO_CSN_MAX_BOUND_EXCL)) {
-            final boolean neg = (value < 0.0);
-
-            final String rawAbs = Double.toString(abs);
-            if (abs >= 1.0) {
-                /*
-                 * 0123456
-                 * 12.3456 ===> 1.23456E1
-                 * 123.0   ===> 1.23E2
-                 */
-                final int dotIndex = rawAbs.indexOf((int)'.');
-                final int powerOfTen = dotIndex-1;
-                final StringBuilder sb = new StringBuilder();
-                if (neg) {
-                    sb.append('-');
-                }
-                // Adding unit-or-above digits, with dot after first one.
-                sb.append(rawAbs.charAt(0));
-                sb.append('.');
-                sb.append(rawAbs,1,dotIndex);
-                if ((value != (int)value) || (abs < 10.0)) {
-                    // Adding below-unit digits (possibly just 0 if abs < 10.0,
-                    // to end up for example with "3.0E0" instead of "3.E0").
-                    sb.append(rawAbs,dotIndex+1,rawAbs.length());
-                }
-                sb.append('E');
-                sb.append(CHAR_BY_DIGIT[powerOfTen]);
-                return sb.toString();
-            } else {
-                /*
-                 * 012345678
-                 * 0.0123456 ===> 1.23456E-2
-                 * 0.01      ===> 1.0E-2
-                 */
-                int nonZeroIndex = 1;
-                while (rawAbs.charAt(++nonZeroIndex) == '0') {
-                }
-                // Negative.
-                final int powerOfTen = 1-nonZeroIndex;
-                final int nbrOfSignificantDigitsPastDot = (rawAbs.length() - (nonZeroIndex+1));
-                final StringBuilder sb = new StringBuilder();
-                if (neg) {
-                    sb.append('-');
-                }
-                sb.append(rawAbs.charAt(nonZeroIndex));
-                sb.append('.');
-                if (nbrOfSignificantDigitsPastDot > 0) {
-                    // If bug 4428022 make rawAbs being something like "0.0010",
-                    // we add the last '0' here after the dot, which is fine.
-                    sb.append(rawAbs,nonZeroIndex+1,rawAbs.length());
-                } else {
-                    sb.append('0');
-                }
-                sb.append("E-");
-                sb.append(CHAR_BY_DIGIT[-powerOfTen]);
-                return sb.toString();
-            }
-        } else {
-            return Double.toString(value);
-        }
-    }
-
-    /**
-     * @param value A double value.
-     * @return String representing the specified value,
-     *         not in "computerized scientific notation",
-     *         which Double.toString(double) uses for non-infinite
-     *         values, when |value| < 1e-3 or |value| >= 1e7.
-     */
-    public static String toStringNoCSN(double value) {
-        // Quick case.
-        // Should also work with long instead of int,
-        // but less obvious (due to roundings...),
-        // and we just want to speed up the more common
-        // case of "small" integer values.
-        final int intValue = (int)value;
-        if (value == intValue) {
-            if (value == 0.0) {
-                if (Double.doubleToRawLongBits(value) < 0) {
-                    return "-0.0";
-                } else {
-                    return "0.0";
-                }
-            } else {
-                return Integer.toString(intValue)+".0";
-            }
-        }
-
-        final String raw = Double.toString(value);
-        final double abs = Math.abs(value);
-        if (abs >= NO_CSN_MAX_BOUND_EXCL) {
-            if (abs == Double.POSITIVE_INFINITY) {
-                return raw;
-            }
-            /*
-             * 0123456789
-             * 1.234567E5 ===> 123456.7
-             * 1.23456E5  ===> 123456.0 (adding 0)
-             * 1.23E5     ===> 123000.0
-             * 1.0E5      ===> 100000.0
-             */
-            // "." close to start, so using indexOf.
-            final int dotIndex = raw.indexOf((int)'.');
-            // "E" close to end, so using lastIndexOf.
-            final int eIndex = raw.lastIndexOf((int)'E');
-            final int powerOfTen = Integer.parseInt(raw.substring(eIndex+1));
-            final int nbrOfSignificantLoDigits = (eIndex - dotIndex - 1);
-            final int nbrOfZerosToAddBeforeDot = (powerOfTen - nbrOfSignificantLoDigits);
-
-            int start;
-            int end;
-
-            final StringBuilder sb = new StringBuilder();
-            sb.append(raw,0,dotIndex);
-            if (nbrOfZerosToAddBeforeDot >= 0) {
-                // Can copy all digits that were between '.' and 'E'.
-                sb.append(raw,dotIndex+1,eIndex);
-                for (int i=0;i<nbrOfZerosToAddBeforeDot;i++) {
-                    sb.append('0');
-                }
-                sb.append(".0");
-            } else {
-                start = dotIndex+1;
-                sb.append(raw,start,end = start+powerOfTen);
-
-                sb.append('.');
-
-                start = end;
-                sb.append(raw,start,end = eIndex);
-            }
-            return sb.toString();
-        } else if (abs < NO_CSN_MIN_BOUND_INCL) {
-            // Not +-0.0 since already handled.
-            /*
-             * 01234567
-             * 1.234E-4 ===> 0.0001234
-             * 1.0E-4   ===> 0.0001
-             */
-            // "." close to start, so using indexOf.
-            final int dotIndex = raw.indexOf((int)'.');
-            // "E" close to end, so using lastIndexOf.
-            final int eIndex = raw.lastIndexOf((int)'E');
-            // Negative.
-            final int powerOfTen = Integer.parseInt(raw.substring(eIndex+1));
-            final int nbrOfZerosToAddAfterDot = (-powerOfTen-1);
-
-            final StringBuilder sb = new StringBuilder();
-            if (value < 0.0) {
-                sb.append("-0.");
-            } else {
-                sb.append("0.");
-            }
-            for (int i=0;i<nbrOfZerosToAddAfterDot;i++) {
-                sb.append('0');
-            }
-            // First raw digit.
-            sb.append(raw,dotIndex-1,dotIndex);
-            if ((eIndex == dotIndex + 2) && (raw.charAt(dotIndex+1) == '0')) {
-                // Char past dot is alone and '0': no need to add it.
-            } else {
-                // Raw digits that were past dot.
-                sb.append(raw,dotIndex+1,eIndex);
-            }
-            return sb.toString();
-        } else {
-            // abs in [0.001,1e7[.
-            if ((abs < 1.0) && (raw.charAt(raw.length()-1) == '0')) {
-                // Workaround for bug 4428022 (Double.toString(0.004) returns
-                // "0.0040", same with 0.001 etc.).
-                return raw.substring(0, raw.length()-1);
-            } else {
-                return raw;
-            }
-        }
-    }
-
-    //--------------------------------------------------------------------------
-    // PRIVATE METHODS
-    //--------------------------------------------------------------------------
-
-    private NumbersUtils() {
-    }
-
-    /*
-     *
-     */
-
-    /**
-     * Had such isInXXX methods, and corresponding checkXXX methods,
-     * but they seem actually slower in practice, so just keeping this
-     * code here in case some day it becomes faster than regular isInXXX.
-     *
-     * Only works for non-empty ranges, i.e. such as min <= max.
-     * This treatment being designed for optimization, min <= max
-     * is not checked.
-     *
-     * @return True if the specified value is in the specified range (inclusive), false otherwise.
-     */
-    private static boolean dontUseMe_isInNonEmptyRange_(int min, int max, int a) {
-        // Using modulo arithmetic.
-        return (Integer.MIN_VALUE+(a-min) <= Integer.MIN_VALUE+(max-min));
-    }
-
-    /*
-     *
-     */
-
-    private static int minSignedIntForBitSize_noCheck(int bitSize) {
-        // i.e. (-1<<(bitSize-1))
-        return (Integer.MIN_VALUE>>(32-bitSize));
-    }
-
-    private static long minSignedLongForBitSize_noCheck(int bitSize) {
-        // i.e. (-1L<<(bitSize-1))
-        return (Long.MIN_VALUE>>(64-bitSize));
-    }
-
-    private static int maxSignedIntForBitSize_noCheck(int bitSize) {
-        // i.e. (1<<(bitSize-1))-1
-        return (Integer.MAX_VALUE>>(32-bitSize));
-    }
-
-    private static long maxSignedLongForBitSize_noCheck(int bitSize) {
-        // i.e. (1L<<(bitSize-1))-1
-        return (Long.MAX_VALUE>>(64-bitSize));
-    }
-
-    /*
-     *
-     */
-
-    /**
-     * @throws IllegalArgumentException if the specified radix is out of range.
-     */
-    private static int computeNbrOfDigits_negValue(int negValue, int radix) {
-        checkRadix(radix);
-        final int maxNbrOfDigits = MAX_NBR_OF_NEG_INT_DIGITS_BY_RADIX[radix];
-        int p = radix;
-        for (int i=1;i<maxNbrOfDigits;i++) {
-            if (negValue > -p) {
-                return i;
-            }
-            p *= radix;
-        }
-        return maxNbrOfDigits;
-    }
-
-    /**
-     * @throws IllegalArgumentException if the specified radix is out of range.
-     */
-    private static int computeNbrOfDigits_negValue(long negValue, int radix) {
-        checkRadix(radix);
-        final int maxNbrOfDigits = MAX_NBR_OF_NEG_LONG_DIGITS_BY_RADIX[radix];
-        long p = radix;
-        for (int i=1;i<maxNbrOfDigits;i++) {
-            if (negValue > -p) {
-                return i;
-            }
-            p *= radix;
-        }
-        return maxNbrOfDigits;
-    }
-
-    /*
-     *
-     */
-
-    private static boolean checkBitPositions(int firstBitPos, int lastBitPosExcl, int bitSize) {
-        if ((firstBitPos < 0) || (firstBitPos > lastBitPosExcl) || (lastBitPosExcl > bitSize)) {
-            throw new IllegalArgumentException(
-                    "bit positions (first="+firstBitPos+",lastExcl="+lastBitPosExcl
-                    +") must verify 0 <= first <= lastExcl <= "+bitSize);
-        }
-        return true;
-    }
-
-    /**
-     * Common method for byte, short and int.
-     * Could be a bit faster to have specific methods for byte and short,
-     * but not much, and that would also make more messy (byte-)code.
-     *
-     * @param bitSize Must be in [0,32].
-     */
-    private static String toStringBits_0_32_bitPosAlreadyChecked(
-            int bitSize,
-            int bits,
-            int firstBitPos,
-            int lastBitPosExcl,
-            boolean bigEndian,
-            boolean padding) {
-        final int bitSizeM1 = bitSize-1;
-        final int lastBitPos = lastBitPosExcl-1;
-        if (padding) {
-            final int nbrOfChars = bitSize;
-            final char[] chars = new char[nbrOfChars];
-            int bitIndex = bitSizeM1;
-            if (bigEndian) {
-                final int firstBitIndex = bitSizeM1-lastBitPos;
-                final int lastBitIndex = bitSizeM1-firstBitPos;
-                while (bitIndex > lastBitIndex) {
-                    chars[bitSizeM1-bitIndex] = '_';
-                    --bitIndex;
-                }
-                while (bitIndex >= firstBitIndex) {
-                    chars[bitSizeM1-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
-                    --bitIndex;
-                }
-                while (bitIndex >= 0) {
-                    chars[bitSizeM1-bitIndex] = '_';
-                    --bitIndex;
-                }
-            } else {
-                while (bitIndex > lastBitPos) {
-                    chars[bitIndex] = '_';
-                    --bitIndex;
-                }
-                while (bitIndex >= firstBitPos) {
-                    chars[bitIndex] = (char)('0'+((bits>>bitIndex)&1));
-                    --bitIndex;
-                }
-                while (bitIndex >= 0) {
-                    chars[bitIndex] = '_';
-                    --bitIndex;
-                }
-            }
-            return new String(chars);
-        } else {
-            final int nbrOfChars = (lastBitPosExcl - firstBitPos);
-            final char[] chars = new char[nbrOfChars];
-            if (bigEndian) {
-                final int firstBitIndex = bitSizeM1-lastBitPos;
-                final int lastBitIndex = bitSizeM1-firstBitPos;
-                int bitIndex = lastBitIndex;
-                while (bitIndex >= firstBitIndex) {
-                    chars[lastBitIndex-bitIndex] = (char)('0'+((bits>>bitIndex)&1));
-                    --bitIndex;
-                }
-            } else {
-                int bitIndex = lastBitPos;
-                while (bitIndex >= firstBitPos) {
-                    chars[bitIndex-firstBitPos] = (char)('0'+((bits>>bitIndex)&1));
-                    --bitIndex;
-                }
-            }
-            return new String(chars);
-        }
-    }
-}
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/StrictFastMath.java b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/StrictFastMath.java
deleted file mode 100644
index a61ac9772..000000000
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/StrictFastMath.java
+++ /dev/null
@@ -1,2998 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.jafama;
-
-/**
- * Strict versions of FastMath methods.
- * Cf. README.txt for more info.
- */
-public final strictfp class StrictFastMath extends CmnFastMath {
-
-    /*
-     * We use strictfp for the whole class:
-     * - for simplicity,
-     * - to reduce strictfp/non-strictfp switching, which can add overhead,
-     *   when these treatments are used from within strictfp code,
-     * - to make sure that we only use and return non-extended values,
-     *   else if strictfp gets added later to some treatments they might then
-     *   behave differently due to no longer being inlinable into FP-wide
-     *   expressions,
-     * - to make sure we don't mistakenly not use it.
-     */
-
-    //--------------------------------------------------------------------------
-    // CONFIGURATION
-    //--------------------------------------------------------------------------
-
-    private static final boolean USE_JDK_MATH = SFM_USE_JDK_MATH;
-
-    private static final boolean USE_REDEFINED_LOG = SFM_USE_REDEFINED_LOG;
-
-    private static final boolean USE_REDEFINED_SQRT = SFM_USE_REDEFINED_SQRT;
-
-    private static final boolean USE_POWTABS_FOR_ASIN = SFM_USE_POWTABS_FOR_ASIN;
-
-    //--------------------------------------------------------------------------
-    // PUBLIC METHODS
-    //--------------------------------------------------------------------------
-
-    /*
-     * trigonometry
-     */
-
-    /**
-     * @param angle Angle in radians.
-     * @return Angle sine.
-     */
-    public static double sin(double angle) {
-        if (USE_JDK_MATH) {
-            return StrictMath.sin(angle);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        if (angle > SIN_COS_MAX_VALUE_FOR_INT_MODULO) {
-            if (false) {
-                // Can give very bad relative error near PI (mod 2*PI).
-                angle = remainderTwoPi(angle);
-                if (angle < 0.0) {
-                    angle = -angle;
-                    negateResult = !negateResult;
-                }
-            } else {
-                final long remAndQuad = remainderPiO2(angle);
-                angle = decodeRemainder(remAndQuad);
-                final double sin;
-                final int q = decodeQuadrant(remAndQuad);
-                if (q == 0) {
-                    sin = sin(angle);
-                } else if (q == 1) {
-                    sin = cos(angle);
-                } else if (q == 2) {
-                    sin = -sin(angle);
-                } else {
-                    sin = -cos(angle);
-                }
-                return (negateResult ? -sin : sin);
-            }
-        }
-        // index: possibly outside tables range.
-        int index = (int)(angle * SIN_COS_INDEXER + 0.5);
-        double delta = (angle - index * SIN_COS_DELTA_HI) - index * SIN_COS_DELTA_LO;
-        // Making sure index is within tables range.
-        // Last value of each table is the same than first,
-        // so we ignore it (tabs size minus one) for modulo.
-        index &= (SIN_COS_TABS_SIZE-2); // index % (SIN_COS_TABS_SIZE-1)
-        double indexSin = MyTSinCos.sinTab[index];
-        double indexCos = MyTSinCos.cosTab[index];
-        double result = indexSin + delta * (indexCos + delta * (-indexSin * ONE_DIV_F2 + delta * (-indexCos * ONE_DIV_F3 + delta * indexSin * ONE_DIV_F4)));
-        return negateResult ? -result : result;
-    }
-
-    /**
-     * Quick sin, with accuracy of about 1.6e-3 (PI/<look-up tabs size>)
-     * for |angle| < 6588395.0 (Integer.MAX_VALUE * (2*PI/<look-up tabs size>) - 2)
-     * (- 2 due to removing PI/2 before using cosine tab),
-     * and no accuracy at all for larger values.
-     *
-     * @param angle Angle in radians.
-     * @return Angle sine.
-     */
-    public static double sinQuick(double angle) {
-        if (USE_JDK_MATH) {
-            return StrictMath.sin(angle);
-        }
-        return MyTSinCos.cosTab[((int)(Math.abs(angle-Math.PI/2) * SIN_COS_INDEXER + 0.5)) & (SIN_COS_TABS_SIZE-2)];
-    }
-
-    /**
-     * @param angle Angle in radians.
-     * @return Angle cosine.
-     */
-    public static double cos(double angle) {
-        if (USE_JDK_MATH) {
-            return StrictMath.cos(angle);
-        }
-        angle = Math.abs(angle);
-        if (angle > SIN_COS_MAX_VALUE_FOR_INT_MODULO) {
-            if (false) {
-                // Can give very bad relative error near PI (mod 2*PI).
-                angle = remainderTwoPi(angle);
-                if (angle < 0.0) {
-                    angle = -angle;
-                }
-            } else {
-                final long remAndQuad = remainderPiO2(angle);
-                angle = decodeRemainder(remAndQuad);
-                final double cos;
-                final int q = decodeQuadrant(remAndQuad);
-                if (q == 0) {
-                    cos = cos(angle);
-                } else if (q == 1) {
-                    cos = -sin(angle);
-                } else if (q == 2) {
-                    cos = -cos(angle);
-                } else {
-                    cos = sin(angle);
-                }
-                return cos;
-            }
-        }
-        // index: possibly outside tables range.
-        int index = (int)(angle * SIN_COS_INDEXER + 0.5);
-        double delta = (angle - index * SIN_COS_DELTA_HI) - index * SIN_COS_DELTA_LO;
-        // Making sure index is within tables range.
-        // Last value of each table is the same than first,
-        // so we ignore it (tabs size minus one) for modulo.
-        index &= (SIN_COS_TABS_SIZE-2); // index % (SIN_COS_TABS_SIZE-1)
-        double indexCos = MyTSinCos.cosTab[index];
-        double indexSin = MyTSinCos.sinTab[index];
-        return indexCos + delta * (-indexSin + delta * (-indexCos * ONE_DIV_F2 + delta * (indexSin * ONE_DIV_F3 + delta * indexCos * ONE_DIV_F4)));
-    }
-
-    /**
-     * Quick cos, with accuracy of about 1.6e-3 (PI/<look-up tabs size>)
-     * for |angle| < 6588397.0 (Integer.MAX_VALUE * (2*PI/<look-up tabs size>)),
-     * and no accuracy at all for larger values.
-     *
-     * @param angle Angle in radians.
-     * @return Angle cosine.
-     */
-    public static double cosQuick(double angle) {
-        if (USE_JDK_MATH) {
-            return StrictMath.cos(angle);
-        }
-        return MyTSinCos.cosTab[((int)(Math.abs(angle) * SIN_COS_INDEXER + 0.5)) & (SIN_COS_TABS_SIZE-2)];
-    }
-
-    /**
-     * Computes sine and cosine together.
-     *
-     * @param angle Angle in radians.
-     * @param cosine (out) Angle cosine.
-     * @return Angle sine.
-     */
-    public static double sinAndCos(double angle, DoubleWrapper cosine) {
-        if (USE_JDK_MATH) {
-            cosine.value = StrictMath.cos(angle);
-            return StrictMath.sin(angle);
-        }
-        // Using the same algorithm than sin(double) method,
-        // and computing also cosine at the end.
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        if (angle > SIN_COS_MAX_VALUE_FOR_INT_MODULO) {
-            if (false) {
-                // Can give very bad relative error near PI (mod 2*PI).
-                angle = remainderTwoPi(angle);
-                if (angle < 0.0) {
-                    angle = -angle;
-                    negateResult = !negateResult;
-                }
-            } else {
-                final long remAndQuad = remainderPiO2(angle);
-                angle = decodeRemainder(remAndQuad);
-                final double sin;
-                final int q = decodeQuadrant(remAndQuad);
-                if (q == 0) {
-                    sin = sin(angle);
-                    cosine.value = cos(angle);
-                } else if (q == 1) {
-                    sin = cos(angle);
-                    cosine.value = -sin(angle);
-                } else if (q == 2) {
-                    sin = -sin(angle);
-                    cosine.value = -cos(angle);
-                } else {
-                    sin = -cos(angle);
-                    cosine.value = sin(angle);
-                }
-                return (negateResult ? -sin : sin);
-            }
-        }
-        int index = (int)(angle * SIN_COS_INDEXER + 0.5);
-        double delta = (angle - index * SIN_COS_DELTA_HI) - index * SIN_COS_DELTA_LO;
-        index &= (SIN_COS_TABS_SIZE-2); // index % (SIN_COS_TABS_SIZE-1)
-        double indexSin = MyTSinCos.sinTab[index];
-        double indexCos = MyTSinCos.cosTab[index];
-        // Could factor some multiplications (delta * factorials), but then is less accurate.
-        cosine.value = indexCos + delta * (-indexSin + delta * (-indexCos * ONE_DIV_F2 + delta * (indexSin * ONE_DIV_F3 + delta * indexCos * ONE_DIV_F4)));
-        double result = indexSin + delta * (indexCos + delta * (-indexSin * ONE_DIV_F2 + delta * (-indexCos * ONE_DIV_F3 + delta * indexSin * ONE_DIV_F4)));
-        return negateResult ? -result : result;
-    }
-
-    /**
-     * Can have very bad relative error near +-PI/2,
-     * but of the same magnitude than the relative delta between
-     * StrictMath.tan(PI/2) and StrictMath.tan(nextDown(PI/2)).
-     *
-     * @param angle Angle in radians.
-     * @return Angle tangent.
-     */
-    public static double tan(double angle) {
-        if (USE_JDK_MATH) {
-            return StrictMath.tan(angle);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        if (angle > TAN_MAX_VALUE_FOR_INT_MODULO) {
-            angle = remainderPi(angle);
-            if (angle < 0.0) {
-                angle = -angle;
-                negateResult = !negateResult;
-            }
-        }
-        // index: possibly outside tables range.
-        int index = (int)(angle * TAN_INDEXER + 0.5);
-        double delta = (angle - index * TAN_DELTA_HI) - index * TAN_DELTA_LO;
-        // Making sure index is within tables range.
-        // index modulo PI, i.e. 2*(virtual tab size minus one).
-        index &= (2*(TAN_VIRTUAL_TABS_SIZE-1)-1); // index % (2*(TAN_VIRTUAL_TABS_SIZE-1))
-        // Here, index is in [0,2*(TAN_VIRTUAL_TABS_SIZE-1)-1], i.e. indicates an angle in [0,PI[.
-        if (index > (TAN_VIRTUAL_TABS_SIZE-1)) {
-            index = (2*(TAN_VIRTUAL_TABS_SIZE-1)) - index;
-            delta = -delta;
-            negateResult = !negateResult;
-        }
-        double result;
-        if (index < TAN_TABS_SIZE) {
-            result = MyTTan.tanTab[index]
-                    + delta * (MyTTan.tanDer1DivF1Tab[index]
-                            + delta * (MyTTan.tanDer2DivF2Tab[index]
-                                    + delta * (MyTTan.tanDer3DivF3Tab[index]
-                                            + delta * MyTTan.tanDer4DivF4Tab[index])));
-        } else { // angle in ]TAN_MAX_VALUE_FOR_TABS,TAN_MAX_VALUE_FOR_INT_MODULO], or angle is NaN
-            // Using tan(angle) == 1/tan(PI/2-angle) formula: changing angle (index and delta), and inverting.
-            index = (TAN_VIRTUAL_TABS_SIZE-1) - index;
-            result = 1/(MyTTan.tanTab[index]
-                    - delta * (MyTTan.tanDer1DivF1Tab[index]
-                            - delta * (MyTTan.tanDer2DivF2Tab[index]
-                                    - delta * (MyTTan.tanDer3DivF3Tab[index]
-                                            - delta * MyTTan.tanDer4DivF4Tab[index]))));
-        }
-        return negateResult ? -result : result;
-    }
-
-    /**
-     * @param value Value in [-1,1].
-     * @return Value arcsine, in radians, in [-PI/2,PI/2].
-     */
-    public static double asin(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.asin(value);
-        }
-        boolean negateResult = false;
-        if (value < 0.0) {
-            value = -value;
-            negateResult = true;
-        }
-        if (value <= ASIN_MAX_VALUE_FOR_TABS) {
-            int index = (int)(value * ASIN_INDEXER + 0.5);
-            double delta = value - index * ASIN_DELTA;
-            double result = MyTAsin.asinTab[index]
-                    + delta * (MyTAsin.asinDer1DivF1Tab[index]
-                            + delta * (MyTAsin.asinDer2DivF2Tab[index]
-                                    + delta * (MyTAsin.asinDer3DivF3Tab[index]
-                                            + delta * MyTAsin.asinDer4DivF4Tab[index])));
-            return negateResult ? -result : result;
-        } else if (USE_POWTABS_FOR_ASIN && (value <= ASIN_MAX_VALUE_FOR_POWTABS)) {
-            int index = (int)(powFast(value * ASIN_POWTABS_ONE_DIV_MAX_VALUE, ASIN_POWTABS_POWER) * ASIN_POWTABS_SIZE_MINUS_ONE + 0.5);
-            double delta = value - MyTAsinPow.asinParamPowTab[index];
-            double result = MyTAsinPow.asinPowTab[index]
-                    + delta * (MyTAsinPow.asinDer1DivF1PowTab[index]
-                            + delta * (MyTAsinPow.asinDer2DivF2PowTab[index]
-                                    + delta * (MyTAsinPow.asinDer3DivF3PowTab[index]
-                                            + delta * MyTAsinPow.asinDer4DivF4PowTab[index])));
-            return negateResult ? -result : result;
-        } else { // value > ASIN_MAX_VALUE_FOR_TABS, or value is NaN
-            // This part is derived from fdlibm.
-            if (value < 1.0) {
-                double t = (1.0 - value)*0.5;
-                double p = t*(ASIN_PS0+t*(ASIN_PS1+t*(ASIN_PS2+t*(ASIN_PS3+t*(ASIN_PS4+t*ASIN_PS5)))));
-                double q = 1.0+t*(ASIN_QS1+t*(ASIN_QS2+t*(ASIN_QS3+t*ASIN_QS4)));
-                double s = sqrt(t);
-                double z = s+s*(p/q);
-                double result = ASIN_PIO2_HI-((z+z)-ASIN_PIO2_LO);
-                return negateResult ? -result : result;
-            } else { // value >= 1.0, or value is NaN
-                if (value == 1.0) {
-                    return negateResult ? -Math.PI/2 : Math.PI/2;
-                } else {
-                    return Double.NaN;
-                }
-            }
-        }
-    }
-
-    /**
-     * If value is not NaN and is outside [-1,1] range, closest value in this range is used.
-     *
-     * @param value Value in [-1,1].
-     * @return Value arcsine, in radians, in [-PI/2,PI/2].
-     */
-    public static double asinInRange(double value) {
-        if (value <= -1.0) {
-            return -Math.PI/2;
-        } else if (value >= 1.0) {
-            return Math.PI/2;
-        } else {
-            return asin(value);
-        }
-    }
-
-    /**
-     * @param value Value in [-1,1].
-     * @return Value arccosine, in radians, in [0,PI].
-     */
-    public static double acos(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.acos(value);
-        }
-        return Math.PI/2 - asin(value);
-    }
-
-    /**
-     * If value is not NaN and is outside [-1,1] range,
-     * closest value in this range is used.
-     *
-     * @param value Value in [-1,1].
-     * @return Value arccosine, in radians, in [0,PI].
-     */
-    public static double acosInRange(double value) {
-        if (value <= -1.0) {
-            return Math.PI;
-        } else if (value >= 1.0) {
-            return 0.0;
-        } else {
-            return acos(value);
-        }
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value arctangent, in radians, in [-PI/2,PI/2].
-     */
-    public static double atan(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.atan(value);
-        }
-        boolean negateResult = false;
-        if (value < 0.0) {
-            value = -value;
-            negateResult = true;
-        }
-        if (value == 1.0) {
-            // We want "exact" result for 1.0.
-            return negateResult ? -Math.PI/4 : Math.PI/4;
-        } else if (value <= ATAN_MAX_VALUE_FOR_TABS) {
-            int index = (int)(value * ATAN_INDEXER + 0.5);
-            double delta = value - index * ATAN_DELTA;
-            double result = MyTAtan.atanTab[index]
-                    + delta * (MyTAtan.atanDer1DivF1Tab[index]
-                            + delta * (MyTAtan.atanDer2DivF2Tab[index]
-                                    + delta * (MyTAtan.atanDer3DivF3Tab[index]
-                                            + delta * MyTAtan.atanDer4DivF4Tab[index])));
-            return negateResult ? -result : result;
-        } else { // value > ATAN_MAX_VALUE_FOR_TABS, or value is NaN
-            // This part is derived from fdlibm.
-            if (value < TWO_POW_66) {
-                double x = -1/value;
-                double x2 = x*x;
-                double x4 = x2*x2;
-                double s1 = x2*(ATAN_AT0+x4*(ATAN_AT2+x4*(ATAN_AT4+x4*(ATAN_AT6+x4*(ATAN_AT8+x4*ATAN_AT10)))));
-                double s2 = x4*(ATAN_AT1+x4*(ATAN_AT3+x4*(ATAN_AT5+x4*(ATAN_AT7+x4*ATAN_AT9))));
-                double result = ATAN_HI3-((x*(s1+s2)-ATAN_LO3)-x);
-                return negateResult ? -result : result;
-            } else { // value >= 2^66, or value is NaN
-                if (value != value) {
-                    return Double.NaN;
-                } else {
-                    return negateResult ? -Math.PI/2 : Math.PI/2;
-                }
-            }
-        }
-    }
-
-    /**
-     * For special values for which multiple conventions could be adopted,
-     * behaves like StrictMath.atan2(double,double).
-     *
-     * @param y Coordinate on y axis.
-     * @param x Coordinate on x axis.
-     * @return Angle from x axis positive side to (x,y) position, in radians, in [-PI,PI].
-     *         Angle measure is positive when going from x axis to y axis (positive sides).
-     */
-    public static double atan2(double y, double x) {
-        if (USE_JDK_MATH) {
-            return StrictMath.atan2(y,x);
-        }
-        /*
-         * Using sub-methods, to make method lighter for general case,
-         * and to avoid JIT-optimization crash on NaN.
-         */
-        if (x > 0.0) {
-            if (y == 0.0) {
-                // +-0.0
-                return y;
-            }
-            if (x == Double.POSITIVE_INFINITY) {
-                return atan2_pinf_yyy(y);
-            } else {
-                return atan(y/x);
-            }
-        } else if (x < 0.0) {
-            if (y == 0.0) {
-                return signFromBit(y) * Math.PI;
-            }
-            if (x == Double.NEGATIVE_INFINITY) {
-                return atan2_ninf_yyy(y);
-            } else if (y > 0.0) {
-                return Math.PI/2 - atan(x/y);
-            } else if (y < 0.0) {
-                return -Math.PI/2 - atan(x/y);
-            } else {
-                return Double.NaN;
-            }
-        } else {
-            return atan2_yyy_zeroOrNaN(y, x);
-        }
-    }
-
-    /**
-     * Gives same result as StrictMath.toRadians for some particular values
-     * like 90.0, 180.0 or 360.0, but is faster (no division).
-     *
-     * @param angdeg Angle value in degrees.
-     * @return Angle value in radians.
-     */
-    public static double toRadians(double angdeg) {
-        if (USE_JDK_MATH) {
-            return StrictMath.toRadians(angdeg);
-        }
-        return angdeg * (Math.PI/180);
-    }
-
-    /**
-     * Gives same result as StrictMath.toDegrees for some particular values
-     * like Math.PI/2, Math.PI or 2*Math.PI, but is faster (no division).
-     *
-     * @param angrad Angle value in radians.
-     * @return Angle value in degrees.
-     */
-    public static double toDegrees(double angrad) {
-        if (USE_JDK_MATH) {
-            return StrictMath.toDegrees(angrad);
-        }
-        return angrad * (180/Math.PI);
-    }
-
-    /**
-     * @param sign Sign of the angle: true for positive, false for negative.
-     * @param degrees Degrees, in [0,180].
-     * @param minutes Minutes, in [0,59].
-     * @param seconds Seconds, in [0.0,60.0[.
-     * @return Angle in radians.
-     */
-    public static double toRadians(boolean sign, int degrees, int minutes, double seconds) {
-        return toRadians(toDegrees(sign, degrees, minutes, seconds));
-    }
-
-    /**
-     * @param sign Sign of the angle: true for positive, false for negative.
-     * @param degrees Degrees, in [0,180].
-     * @param minutes Minutes, in [0,59].
-     * @param seconds Seconds, in [0.0,60.0[.
-     * @return Angle in degrees.
-     */
-    public static double toDegrees(boolean sign, int degrees, int minutes, double seconds) {
-        double signFactor = sign ? 1.0 : -1.0;
-        return signFactor * (degrees + (1.0/60)*(minutes + (1.0/60)*seconds));
-    }
-
-    /**
-     * @param angrad Angle in radians.
-     * @param degrees (out) Degrees, in [0,180].
-     * @param minutes (out) Minutes, in [0,59].
-     * @param seconds (out) Seconds, in [0.0,60.0[.
-     * @return true if the resulting angle in [-180deg,180deg] is positive, false if it is negative.
-     */
-    public static boolean toDMS(double angrad, IntWrapper degrees, IntWrapper minutes, DoubleWrapper seconds) {
-        // Computing longitude DMS.
-        double tmp = toDegrees(normalizeMinusPiPi(angrad));
-        boolean isNeg = (tmp < 0.0);
-        if (isNeg) {
-            tmp = -tmp;
-        }
-        degrees.value = (int)tmp;
-        tmp = (tmp-degrees.value)*60.0;
-        minutes.value = (int)tmp;
-        seconds.value = Math.min((tmp-minutes.value)*60.0,DOUBLE_BEFORE_60);
-        return !isNeg;
-    }
-
-    /**
-     * NB: Since 2*Math.PI < 2*PI, a span of 2*Math.PI does not mean full angular range.
-     * ex.: isInClockwiseDomain(0.0, 2*Math.PI, -1e-20) returns false.
-     * ---> For full angular range, use a span > 2*Math.PI, like 2*PI_SUP constant of this class.
-     *
-     * @param startAngRad An angle, in radians.
-     * @param angSpanRad An angular span, >= 0.0, in radians.
-     * @param angRad An angle, in radians.
-     * @return true if angRad is in the clockwise angular domain going from startAngRad, over angSpanRad,
-     *         extremities included, false otherwise.
-     */
-    public static boolean isInClockwiseDomain(double startAngRad, double angSpanRad, double angRad) {
-        if (Math.abs(angRad) < -TWO_MATH_PI_IN_MINUS_PI_PI) {
-            // special case for angular values of small magnitude
-            if (angSpanRad <= 2*Math.PI) {
-                if (angSpanRad < 0.0) {
-                    // empty domain
-                    return false;
-                }
-                // angSpanRad is in [0,2*PI]
-                startAngRad = normalizeMinusPiPi(startAngRad);
-                double endAngRad = normalizeMinusPiPi(startAngRad + angSpanRad);
-                if (startAngRad <= endAngRad) {
-                    return (angRad >= startAngRad) && (angRad <= endAngRad);
-                } else {
-                    return (angRad >= startAngRad) || (angRad <= endAngRad);
-                }
-            } else { // angSpanRad > 2*Math.PI, or is NaN
-                return (angSpanRad == angSpanRad);
-            }
-        } else {
-            // general case
-            return (normalizeZeroTwoPi(angRad - startAngRad) <= angSpanRad);
-        }
-    }
-
-    /*
-     * hyperbolic trigonometry
-     */
-
-    /**
-     * Some properties of sinh(x) = (exp(x)-exp(-x))/2:
-     * 1) defined on ]-Infinity,+Infinity[
-     * 2) result in ]-Infinity,+Infinity[
-     * 3) sinh(x) = -sinh(-x) (implies sinh(0) = 0)
-     * 4) sinh(epsilon) ~= epsilon
-     * 5) lim(sinh(x),x->+Infinity) = +Infinity
-     *    (y increasing exponentially faster than x)
-     * 6) reaches +Infinity (double overflow) for x >= 710.475860073944,
-     *    i.e. a bit further than exp(x)
-     *
-     * @param value A double value.
-     * @return Value hyperbolic sine.
-     */
-    public static double sinh(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.sinh(value);
-        }
-        // sinh(x) = (exp(x)-exp(-x))/2
-        double h;
-        if (value < 0.0) {
-            value = -value;
-            h = -0.5;
-        } else {
-            h = 0.5;
-        }
-        if (value < 22.0) {
-            if (value < TWO_POW_N28) {
-                return (h < 0.0) ? -value : value;
-            } else {
-                // sinh(x)
-                // = (exp(x)-exp(-x))/2
-                // = (exp(x)-1/exp(x))/2
-                // = (expm1(x) + 1 - 1/(expm1(x)+1))/2
-                // = (expm1(x) + (expm1(x)+1)/(expm1(x)+1) - 1/(expm1(x)+1))/2
-                // = (expm1(x) + expm1(x)/(expm1(x)+1))/2
-                double t = expm1(value);
-                // Might be more accurate, if value < 1: return h*((t+t)-t*t/(t+1.0)).
-                return h * (t + t/(t+1.0));
-            }
-        } else if (value < LOG_DOUBLE_MAX_VALUE) {
-            return h * exp(value);
-        } else {
-            double t = exp(value*0.5);
-            return (h*t)*t;
-        }
-    }
-
-    /**
-     * Some properties of cosh(x) = (exp(x)+exp(-x))/2:
-     * 1) defined on ]-Infinity,+Infinity[
-     * 2) result in [1,+Infinity[
-     * 3) cosh(0) = 1
-     * 4) cosh(x) = cosh(-x)
-     * 5) lim(cosh(x),x->+Infinity) = +Infinity
-     *    (y increasing exponentially faster than x)
-     * 6) reaches +Infinity (double overflow) for x >= 710.475860073944,
-     *    i.e. a bit further than exp(x)
-     *
-     * @param value A double value.
-     * @return Value hyperbolic cosine.
-     */
-    public static double cosh(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.cosh(value);
-        }
-        // cosh(x) = (exp(x)+exp(-x))/2
-        if (value < 0.0) {
-            value = -value;
-        }
-        if (value < LOG_TWO_POW_27) {
-            if (value < TWO_POW_N27) {
-                // cosh(x)
-                // = (exp(x)+exp(-x))/2
-                // = ((1+x+x^2/2!+...) + (1-x+x^2/2!-...))/2
-                // = 1+x^2/2!+x^4/4!+...
-                // For value of x small in magnitude, the sum of the terms does not add to 1.
-                return 1;
-            } else {
-                // cosh(x)
-                // = (exp(x)+exp(-x))/2
-                // = (exp(x)+1/exp(x))/2
-                double t = exp(value);
-                return 0.5 * (t+1/t);
-            }
-        } else if (value < LOG_DOUBLE_MAX_VALUE) {
-            return 0.5 * exp(value);
-        } else {
-            double t = exp(value*0.5);
-            return (0.5*t)*t;
-        }
-    }
-
-    /**
-     * Much more accurate than cosh(value)-1,
-     * for arguments (and results) close to zero.
-     *
-     * coshm1(-0.0) = -0.0, for homogeneity with
-     * acosh1p(-0.0) = -0.0.
-     *
-     * @param value A double value.
-     * @return Value hyperbolic cosine, minus 1.
-     */
-    public static double coshm1(double value) {
-        // cosh(x)-1 = (exp(x)+exp(-x))/2 - 1
-        if (value < 0.0) {
-            value = -value;
-        }
-        if (value < LOG_TWO_POW_27) {
-            if (value < TWO_POW_N27) {
-                if (value == 0.0) {
-                    // +-0.0
-                    return value;
-                }
-                // Using (expm1(x)+expm1(-x))/2
-                // is not accurate for tiny values,
-                // for expm1 results are of higher
-                // magnitude than the result and
-                // of different signs, such as their
-                // sum is not accurate.
-                // cosh(x) - 1
-                // = (exp(x)+exp(-x))/2 - 1
-                // = ((1+x+x^2/2!+...) + (1-x+x^2/2!-...))/2 - 1
-                // = x^2/2!+x^4/4!+...
-                // ~= x^2 * (1/2 + x^2 * 1/24)
-                //  = x^2 * 0.5 (since x < 2^-27)
-                return 0.5 * value*value;
-            } else {
-                // cosh(x) - 1
-                // = (exp(x)+exp(-x))/2 - 1
-                // = (exp(x)-1+exp(-x)-1)/2
-                // = (expm1(x)+expm1(-x))/2
-                return 0.5 * (expm1(value)+expm1(-value));
-            }
-        } else if (value < LOG_DOUBLE_MAX_VALUE) {
-            return 0.5 * exp(value) - 1.0;
-        } else {
-            // No need to subtract 1 from result.
-            double t = exp(value*0.5);
-            return (0.5*t)*t;
-        }
-    }
-
-    /**
-     * Computes hyperbolic sine and hyperbolic cosine together.
-     *
-     * @param value A double value.
-     * @param hcosine (out) Value hyperbolic cosine.
-     * @return Value hyperbolic sine.
-     */
-    public static double sinhAndCosh(double value, DoubleWrapper hcosine) {
-        if (USE_JDK_MATH) {
-            hcosine.value = StrictMath.cosh(value);
-            return StrictMath.sinh(value);
-        }
-        // Mixup of sinh and cosh treatments: if you modify them,
-        // you might want to also modify this.
-        double h;
-        if (value < 0.0) {
-            value = -value;
-            h = -0.5;
-        } else {
-            h = 0.5;
-        }
-        final double hsine;
-        // LOG_TWO_POW_27 = 18.714973875118524
-        if (value < LOG_TWO_POW_27) { // test from cosh
-            // sinh
-            if (value < TWO_POW_N28) {
-                hsine = (h < 0.0) ? -value : value;
-            } else {
-                double t = expm1(value);
-                hsine = h * (t + t/(t+1.0));
-            }
-            // cosh
-            if (value < TWO_POW_N27) {
-                hcosine.value = 1;
-            } else {
-                double t = exp(value);
-                hcosine.value = 0.5 * (t+1/t);
-            }
-        } else if (value < 22.0) { // test from sinh
-            // Here, value is in [18.714973875118524,22.0[.
-            double t = expm1(value);
-            hsine = h * (t + t/(t+1.0));
-            hcosine.value = 0.5 * (t+1.0);
-        } else {
-            if (value < LOG_DOUBLE_MAX_VALUE) {
-                hsine = h * exp(value);
-            } else {
-                double t = exp(value*0.5);
-                hsine = (h*t)*t;
-            }
-            hcosine.value = Math.abs(hsine);
-        }
-        return hsine;
-    }
-
-    /**
-     * Some properties of tanh(x) = sinh(x)/cosh(x) = (exp(2*x)-1)/(exp(2*x)+1):
-     * 1) defined on ]-Infinity,+Infinity[
-     * 2) result in ]-1,1[
-     * 3) tanh(x) = -tanh(-x) (implies tanh(0) = 0)
-     * 4) tanh(epsilon) ~= epsilon
-     * 5) lim(tanh(x),x->+Infinity) = 1
-     * 6) reaches 1 (double loss of precision) for x = 19.061547465398498
-     *
-     * @param value A double value.
-     * @return Value hyperbolic tangent.
-     */
-    public static double tanh(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.tanh(value);
-        }
-        // tanh(x) = sinh(x)/cosh(x)
-        //         = (exp(x)-exp(-x))/(exp(x)+exp(-x))
-        //         = (exp(2*x)-1)/(exp(2*x)+1)
-        boolean negateResult = false;
-        if (value < 0.0) {
-            value = -value;
-            negateResult = true;
-        }
-        double z;
-        if (value < TANH_1_THRESHOLD) {
-            if (value < TWO_POW_N55) {
-                return negateResult ? -value*(1.0-value) : value*(1.0+value);
-            } else if (value >= 1) {
-                z = 1.0-2.0/(expm1(value+value)+2.0);
-            } else {
-                double t = expm1(-(value+value));
-                z = -t/(t+2.0);
-            }
-        } else {
-            z = (value != value) ? Double.NaN : 1.0;
-        }
-        return negateResult ? -z : z;
-    }
-
-    /**
-     * Some properties of asinh(x) = log(x + sqrt(x^2 + 1))
-     * 1) defined on ]-Infinity,+Infinity[
-     * 2) result in ]-Infinity,+Infinity[
-     * 3) asinh(x) = -asinh(-x) (implies asinh(0) = 0)
-     * 4) asinh(epsilon) ~= epsilon
-     * 5) lim(asinh(x),x->+Infinity) = +Infinity
-     *    (y increasing logarithmically slower than x)
-     *
-     * @param value A double value.
-     * @return Value hyperbolic arcsine.
-     */
-    public static double asinh(double value) {
-        // asinh(x) = log(x + sqrt(x^2 + 1))
-        boolean negateResult = false;
-        if (value < 0.0) {
-            value = -value;
-            negateResult = true;
-        }
-        double result;
-        // (about) smallest possible for
-        // non-log1p case to be accurate.
-        if (value < ASINH_LOG1P_THRESHOLD) {
-            // Around this range, FDLIBM uses
-            // log1p(value+value*value/(1+sqrt(value*value+1))),
-            // but it's slower, so we don't use it.
-            /*
-             * If x is close to zero, log argument is close to 1,
-             * so to avoid precision loss we use log1p(double),
-             * with
-             * (1+x)^p = 1 + p * x + (p*(p-1))/2! * x^2 + (p*(p-1)*(p-2))/3! * x^3 + ...
-             * (1+x)^p = 1 + p * x * (1 + (p-1)/2 * x * (1 + (p-2)/3 * x + ...)
-             * (1+x)^0.5 = 1 + 0.5 * x * (1 + (0.5-1)/2 * x * (1 + (0.5-2)/3 * x + ...)
-             * (1+x^2)^0.5 = 1 + 0.5 * x^2 * (1 + (0.5-1)/2 * x^2 * (1 + (0.5-2)/3 * x^2 + ...)
-             * x + (1+x^2)^0.5 = 1 + x * (1 + 0.5 * x * (1 + (0.5-1)/2 * x^2 * (1 + (0.5-2)/3 * x^2 + ...))
-             * so
-             * asinh(x) = log1p(x * (1 + 0.5 * x * (1 + (0.5-1)/2 * x^2 * (1 + (0.5-2)/3 * x^2 + ...)))
-             */
-            final double x = value;
-            final double x2 = x*x;
-            // Enough terms for good accuracy,
-            // given our threshold.
-            final double argLog1p = (x *
-                    (1 + 0.5 * x
-                            * (1 + (0.5-1)/2 * x2
-                                    * (1 + (0.5-2)/3 * x2
-                                            * (1 + (0.5-3)/4 * x2
-                                                    * (1 + (0.5-4)/5 * x2
-                                                    ))))));
-            result = log1p(argLog1p);
-        } else if (value < ASINH_ACOSH_SQRT_ELISION_THRESHOLD) {
-            // Around this range, FDLIBM uses
-            // log(2*value+1/(value+sqrt(value*value+1))),
-            // but it involves an additional division
-            // so we don't use it.
-            result = log(value + sqrt(value*value + 1.0));
-        } else {
-            // log(2*value) would overflow for value > Double.MAX_VALUE/2,
-            // so we compute otherwise.
-            result = LOG_2 + log(value);
-        }
-        return negateResult ? -result : result;
-    }
-
-    /**
-     * Some properties of acosh(x) = log(x + sqrt(x^2 - 1)):
-     * 1) defined on [1,+Infinity[
-     * 2) result in ]0,+Infinity[ (by convention, since cosh(x) = cosh(-x))
-     * 3) acosh(1) = 0
-     * 4) acosh(1+epsilon) ~= log(1 + sqrt(2*epsilon)) ~= sqrt(2*epsilon)
-     * 5) lim(acosh(x),x->+Infinity) = +Infinity
-     *    (y increasing logarithmically slower than x)
-     *
-     * @param value A double value.
-     * @return Value hyperbolic arccosine.
-     */
-    public static double acosh(double value) {
-        if (!(value > 1.0)) {
-            // NaN, or value <= 1
-            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
-                return (value < 1.0) ? Double.NaN : value - 1.0;
-            } else {
-                return (value == 1.0) ? 0.0 : Double.NaN;
-            }
-        }
-        double result;
-        if (value < ASINH_ACOSH_SQRT_ELISION_THRESHOLD) {
-            // Around this range, FDLIBM uses
-            // log(2*value-1/(value+sqrt(value*value-1))),
-            // but it involves an additional division
-            // so we don't use it.
-            result = log(value + sqrt(value*value - 1.0));
-        } else {
-            // log(2*value) would overflow for value > Double.MAX_VALUE/2,
-            // so we compute otherwise.
-            result = LOG_2 + log(value);
-        }
-        return result;
-    }
-
-    /**
-     * Much more accurate than acosh(1+value),
-     * for arguments (and results) close to zero.
-     *
-     * acosh1p(-0.0) = -0.0, for homogeneity with
-     * sqrt(-0.0) = -0.0, which looks about the same
-     * near 0.
-     *
-     * @param value A double value.
-     * @return Hyperbolic arccosine of (1+value).
-     */
-    public static double acosh1p(double value) {
-        if (!(value > 0.0)) {
-            // NaN, or value <= 0.
-            // If value is -0.0, returning -0.0.
-            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
-                return (value < 0.0) ? Double.NaN : value;
-            } else {
-                return (value == 0.0) ? value : Double.NaN;
-            }
-        }
-        double result;
-        if (value < (ASINH_ACOSH_SQRT_ELISION_THRESHOLD-1)) {
-            // acosh(1+x)
-            // = log((1+x) + sqrt((1+x)^2 - 1))
-            // = log(1 + x + sqrt(1 + 2*x + x^2 - 1))
-            // = log1p(x + sqrt(2*x + x^2))
-            // = log1p(x + sqrt(x * (2 + x))
-            result = log1p(value + sqrt(value * (2 + value)));
-        } else {
-            result = LOG_2 + log(1+value);
-        }
-        return result;
-    }
-
-    /**
-     * Some properties of atanh(x) = log((1+x)/(1-x))/2:
-     * 1) defined on ]-1,1[
-     * 2) result in ]-Infinity,+Infinity[
-     * 3) atanh(-1) = -Infinity (by continuity)
-     * 4) atanh(1) = +Infinity (by continuity)
-     * 5) atanh(epsilon) ~= epsilon
-     * 6) lim(atanh(x),x->1) = +Infinity
-     *
-     * @param value A double value.
-     * @return Value hyperbolic arctangent.
-     */
-    public static double atanh(double value) {
-        boolean negateResult = false;
-        if (value < 0.0) {
-            value = -value;
-            negateResult = true;
-        }
-        double result;
-        if (!(value < 1.0)) {
-            // NaN, or value >= 1
-            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
-                result = (value > 1.0) ? Double.NaN : Double.POSITIVE_INFINITY + value;
-            } else {
-                result = (value == 1.0) ? Double.POSITIVE_INFINITY : Double.NaN;
-            }
-        } else {
-            // For value < 0.5, FDLIBM uses
-            // 0.5 * log1p((value+value) + (value+value)*value/(1-value)),
-            // instead, but this is good enough for us.
-            // atanh(x)
-            // = log((1+x)/(1-x))/2
-            // = log((1-x+2x)/(1-x))/2
-            // = log1p(2x/(1-x))/2
-            result = 0.5 * log1p((value+value)/(1.0-value));
-        }
-        return negateResult ? -result : result;
-    }
-
-    /*
-     * exponentials
-     */
-
-    /**
-     * @param value A double value.
-     * @return e^value.
-     */
-    public static double exp(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.exp(value);
-        }
-        // exp(x) = exp([x])*exp(y)
-        // with [x] the integer part of x, and y = x-[x]
-        // ===>
-        // We find an approximation of y, called z.
-        // ===>
-        // exp(x) = exp([x])*(exp(z)*exp(epsilon))
-        // with epsilon = y - z
-        // ===>
-        // We have exp([x]) and exp(z) pre-computed in tables, we "just" have to compute exp(epsilon).
-        //
-        // We use the same indexing (cast to int) to compute x integer part and the
-        // table index corresponding to z, to avoid two int casts.
-        // Also, to optimize index multiplication and division, we use powers of two,
-        // so that we can do it with bits shifts.
-
-        if (value > EXP_OVERFLOW_LIMIT) {
-            return Double.POSITIVE_INFINITY;
-        } else if (!(value >= EXP_UNDERFLOW_LIMIT)) {
-            return (value != value) ? Double.NaN : 0.0;
-        }
-
-        final int indexes = (int)(value*EXP_LO_INDEXING);
-
-        final int valueInt;
-        if (indexes >= 0) {
-            valueInt = (indexes>>EXP_LO_INDEXING_DIV_SHIFT);
-        } else {
-            valueInt = -((-indexes)>>EXP_LO_INDEXING_DIV_SHIFT);
-        }
-        final double hiTerm = MyTExp.expHiTab[valueInt-(int)EXP_UNDERFLOW_LIMIT];
-
-        final int zIndex = indexes - (valueInt<<EXP_LO_INDEXING_DIV_SHIFT);
-        final double y = (value-valueInt);
-        final double z = zIndex*(1.0/EXP_LO_INDEXING);
-        final double eps = y-z;
-        final double expZ = MyTExp.expLoPosTab[zIndex+EXP_LO_TAB_MID_INDEX];
-        final double expEps = (1+eps*(1+eps*(1.0/2+eps*(1.0/6+eps*(1.0/24)))));
-        final double loTerm = expZ * expEps;
-
-        return hiTerm * loTerm;
-    }
-
-    /**
-     * Quick exp, with a max relative error of about 2.94e-2 for |value| < 700.0 or so,
-     * and no accuracy at all outside this range.
-     * Derived from a note by Nicol N. Schraudolph, IDSIA, 1998.
-     *
-     * @param value A double value.
-     * @return e^value.
-     */
-    public static double expQuick(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.exp(value);
-        }
-        /*
-         * Cast of double values, even in long range, into long, is slower than
-         * from double to int for values in int range, and then from int to long.
-         * For that reason, we only work with integer values in int range
-         * (corresponding to the 32 first bits of the long, containing sign,
-         * exponent, and highest significant bits of double's mantissa),
-         * and cast twice.
-         *
-         * Constants determined empirically, using a random-based metaheuristic.
-         * Should be possible to find better ones.
-         */
-        return Double.longBitsToDouble(((long)(int)(1512775.3952 * value + 1.0726481222E9))<<32);
-    }
-
-    /**
-     * Much more accurate than exp(value)-1,
-     * for arguments (and results) close to zero.
-     *
-     * @param value A double value.
-     * @return e^value-1.
-     */
-    public static double expm1(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.expm1(value);
-        }
-        // If value is far from zero, we use exp(value)-1.
-        //
-        // If value is close to zero, we use the following formula:
-        // exp(value)-1
-        // = exp(valueApprox)*exp(epsilon)-1
-        // = exp(valueApprox)*(exp(epsilon)-exp(-valueApprox))
-        // = exp(valueApprox)*(1+epsilon+epsilon^2/2!+...-exp(-valueApprox))
-        // = exp(valueApprox)*((1-exp(-valueApprox))+epsilon+epsilon^2/2!+...)
-        // exp(valueApprox) and exp(-valueApprox) being stored in tables.
-
-        if (Math.abs(value) < EXP_LO_DISTANCE_TO_ZERO) {
-            // Taking int part instead of rounding, which takes too long.
-            int i = (int)(value*EXP_LO_INDEXING);
-            double delta = value-i*(1.0/EXP_LO_INDEXING);
-            return MyTExp.expLoPosTab[i+EXP_LO_TAB_MID_INDEX]*(MyTExp.expLoNegTab[i+EXP_LO_TAB_MID_INDEX]+delta*(1+delta*(1.0/2+delta*(1.0/6+delta*(1.0/24+delta*(1.0/120))))));
-        } else {
-            return exp(value)-1;
-        }
-    }
-
-    /*
-     * logarithms
-     */
-
-    /**
-     * @param value A double value.
-     * @return Value logarithm (base e).
-     */
-    public static double log(double value) {
-        if (USE_JDK_MATH || (!USE_REDEFINED_LOG)) {
-            return StrictMath.log(value);
-        }
-        if (value > 0.0) {
-            if (value == Double.POSITIVE_INFINITY) {
-                return Double.POSITIVE_INFINITY;
-            }
-
-            // For normal values not close to 1.0, we use the following formula:
-            // log(value)
-            // = log(2^exponent*1.mantissa)
-            // = log(2^exponent) + log(1.mantissa)
-            // = exponent * log(2) + log(1.mantissa)
-            // = exponent * log(2) + log(1.mantissaApprox) + log(1.mantissa/1.mantissaApprox)
-            // = exponent * log(2) + log(1.mantissaApprox) + log(1+epsilon)
-            // = exponent * log(2) + log(1.mantissaApprox) + epsilon-epsilon^2/2+epsilon^3/3-epsilon^4/4+...
-            // with:
-            // 1.mantissaApprox <= 1.mantissa,
-            // log(1.mantissaApprox) in table,
-            // epsilon = (1.mantissa/1.mantissaApprox)-1
-            //
-            // To avoid bad relative error for small results,
-            // values close to 1.0 are treated aside, with the formula:
-            // log(x) = z*(2+z^2*((2.0/3)+z^2*((2.0/5))+z^2*((2.0/7))+...)))
-            // with z=(x-1)/(x+1)
-
-            double h;
-            if (value > 0.95) {
-                if (value < 1.14) {
-                    double z = (value-1.0)/(value+1.0);
-                    double z2 = z*z;
-                    return z*(2+z2*((2.0/3)+z2*((2.0/5)+z2*((2.0/7)+z2*((2.0/9)+z2*((2.0/11)))))));
-                }
-                h = 0.0;
-            } else if (value < DOUBLE_MIN_NORMAL) {
-                // Ensuring value is normal.
-                value *= TWO_POW_52;
-                // log(x*2^52)
-                // = log(x)-ln(2^52)
-                // = log(x)-52*ln(2)
-                h = -52*LOG_2;
-            } else {
-                h = 0.0;
-            }
-
-            int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
-            int valueExp = (valueBitsHi>>20)-MAX_DOUBLE_EXPONENT;
-            // Getting the first LOG_BITS bits of the mantissa.
-            int xIndex = ((valueBitsHi<<12)>>>(32-LOG_BITS));
-
-            // 1.mantissa/1.mantissaApprox - 1
-            double z = (value * twoPowNormalOrSubnormal(-valueExp)) * MyTLog.logXInvTab[xIndex] - 1;
-
-            z *= (1-z*((1.0/2)-z*((1.0/3))));
-
-            return h + valueExp * LOG_2 + (MyTLog.logXLogTab[xIndex] + z);
-
-        } else if (value == 0.0) {
-            return Double.NEGATIVE_INFINITY;
-        } else { // value < 0.0, or value is NaN
-            return Double.NaN;
-        }
-    }
-
-    /**
-     * Quick log, with a max relative error of about 1.9e-3
-     * for values in ]Double.MIN_NORMAL,+Infinity[, and
-     * worse accuracy outside this range.
-     *
-     * @param value A double value, in ]0,+Infinity[ (strictly positive and finite).
-     * @return Value logarithm (base e).
-     */
-    public static double logQuick(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.log(value);
-        }
-        /*
-         * Inverse of Schraudolph's method for exp, is very inaccurate near 1,
-         * and not that fast (even using floats), especially with added if's
-         * to deal with values near 1, so we don't use it, and use a simplified
-         * version of our log's redefined algorithm.
-         */
-
-        // Simplified version of log's redefined algorithm:
-        // log(value) ~= exponent * log(2) + log(1.mantissaApprox)
-
-        double h;
-        if (value > 0.87) {
-            if (value < 1.16) {
-                return 2.0 * (value-1.0)/(value+1.0);
-            }
-            h = 0.0;
-        } else if (value < DOUBLE_MIN_NORMAL) {
-            value *= TWO_POW_52;
-            h = -52*LOG_2;
-        } else {
-            h = 0.0;
-        }
-
-        int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
-        int valueExp = (valueBitsHi>>20)-MAX_DOUBLE_EXPONENT;
-        int xIndex = ((valueBitsHi<<12)>>>(32-LOG_BITS));
-
-        return h + valueExp * LOG_2 + MyTLog.logXLogTab[xIndex];
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value logarithm (base 10).
-     */
-    public static double log10(double value) {
-        if (USE_JDK_MATH || (!USE_REDEFINED_LOG)) {
-            return StrictMath.log10(value);
-        }
-        // INV_LOG_10 is < 1, but there is no risk of log(double)
-        // overflow (positive or negative) while the end result shouldn't,
-        // since log(Double.MIN_VALUE) and log(Double.MAX_VALUE) have
-        // magnitudes of just a few hundreds.
-        return log(value) * INV_LOG_10;
-    }
-
-    /**
-     * Much more accurate than log(1+value),
-     * for arguments (and results) close to zero.
-     *
-     * @param value A double value.
-     * @return Logarithm (base e) of (1+value).
-     */
-    public static double log1p(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.log1p(value);
-        }
-        if (false) {
-            // This also works. Simpler but a bit slower.
-            if (value == Double.POSITIVE_INFINITY) {
-                return Double.POSITIVE_INFINITY;
-            }
-            double valuePlusOne = 1+value;
-            if (valuePlusOne == 1.0) {
-                return value;
-            } else {
-                return log(valuePlusOne)*(value/(valuePlusOne-1.0));
-            }
-        }
-        if (value > -1.0) {
-            if (value == Double.POSITIVE_INFINITY) {
-                return Double.POSITIVE_INFINITY;
-            }
-
-            // ln'(x) = 1/x
-            // so
-            // log(x+epsilon) ~= log(x) + epsilon/x
-            //
-            // Let u be 1+value rounded:
-            // 1+value = u+epsilon
-            //
-            // log(1+value)
-            // = log(u+epsilon)
-            // ~= log(u) + epsilon/value
-            // We compute log(u) as done in log(double), and then add the corrective term.
-
-            double valuePlusOne = 1.0+value;
-            if (valuePlusOne == 1.0) {
-                return value;
-            } else if (Math.abs(value) < 0.15) {
-                double z = value/(value+2.0);
-                double z2 = z*z;
-                return z*(2+z2*((2.0/3)+z2*((2.0/5)+z2*((2.0/7)+z2*((2.0/9)+z2*((2.0/11)))))));
-            }
-
-            int valuePlusOneBitsHi = (int)(Double.doubleToRawLongBits(valuePlusOne)>>32) & 0x7FFFFFFF;
-            int valuePlusOneExp = (valuePlusOneBitsHi>>20)-MAX_DOUBLE_EXPONENT;
-            // Getting the first LOG_BITS bits of the mantissa.
-            int xIndex = ((valuePlusOneBitsHi<<12)>>>(32-LOG_BITS));
-
-            // 1.mantissa/1.mantissaApprox - 1
-            double z = (valuePlusOne * twoPowNormalOrSubnormal(-valuePlusOneExp)) * MyTLog.logXInvTab[xIndex] - 1;
-
-            z *= (1-z*((1.0/2)-z*(1.0/3)));
-
-            // Adding epsilon/valuePlusOne to z,
-            // with
-            // epsilon = value - (valuePlusOne-1)
-            // (valuePlusOne + epsilon ~= 1+value (not rounded))
-
-            return valuePlusOneExp * LOG_2 + MyTLog.logXLogTab[xIndex] + (z + (value - (valuePlusOne-1))/valuePlusOne);
-        } else if (value == -1.0) {
-            return Double.NEGATIVE_INFINITY;
-        } else { // value < -1.0, or value is NaN
-            return Double.NaN;
-        }
-    }
-
-    /*
-     * powers
-     */
-
-    /**
-     * 1e-13ish accuracy or better on whole double range.
-     *
-     * @param value A double value.
-     * @param power A power.
-     * @return value^power.
-     */
-    public static double pow(double value, double power) {
-        if (USE_JDK_MATH) {
-            return StrictMath.pow(value,power);
-        }
-        if (power == 0.0) {
-            return 1.0;
-        } else if (power == 1.0) {
-            return value;
-        }
-        if (value <= 0.0) {
-            // powerInfo: 0 if not integer, 1 if even integer, -1 if odd integer
-            int powerInfo;
-            if (Math.abs(power) >= (TWO_POW_52*2)) {
-                // The binary digit just before comma is outside mantissa,
-                // thus it is always 0: power is an even integer.
-                powerInfo = 1;
-            } else {
-                // If power's magnitude permits, we cast into int instead of into long,
-                // as it is faster.
-                if (Math.abs(power) <= (double)Integer.MAX_VALUE) {
-                    int powerAsInt = (int)power;
-                    if (power == (double)powerAsInt) {
-                        powerInfo = ((powerAsInt & 1) == 0) ? 1 : -1;
-                    } else { // power is not an integer (and not NaN, due to test against Integer.MAX_VALUE)
-                        powerInfo = 0;
-                    }
-                } else {
-                    long powerAsLong = (long)power;
-                    if (power == (double)powerAsLong) {
-                        powerInfo = ((powerAsLong & 1) == 0) ? 1 : -1;
-                    } else { // power is not an integer, or is NaN
-                        if (power != power) {
-                            return Double.NaN;
-                        }
-                        powerInfo = 0;
-                    }
-                }
-            }
-
-            if (value == 0.0) {
-                if (power < 0.0) {
-                    return (powerInfo < 0) ? 1/value : Double.POSITIVE_INFINITY;
-                } else { // power > 0.0 (0 and NaN cases already treated)
-                    return (powerInfo < 0) ? value : 0.0;
-                }
-            } else { // value < 0.0
-                if (value == Double.NEGATIVE_INFINITY) {
-                    if (powerInfo < 0) { // power odd integer
-                        return (power < 0.0) ? -0.0 : Double.NEGATIVE_INFINITY;
-                    } else { // power even integer, or not an integer
-                        return (power < 0.0) ? 0.0 : Double.POSITIVE_INFINITY;
-                    }
-                } else {
-                    return (powerInfo == 0) ? Double.NaN : powerInfo * exp(power*log(-value));
-                }
-            }
-        } else { // value > 0.0, or value is NaN
-            return exp(power*log(value));
-        }
-    }
-
-    /**
-     * Quick pow, with a max relative error of about 1e-2
-     * for value >= Double.MIN_NORMAL and 1e-10 < |value^power| < 1e10,
-     * of about 6e-2 for value >= Double.MIN_NORMAL and 1e-40 < |value^power| < 1e40,
-     * and worse accuracy otherwise.
-     *
-     * @param value A double value, in ]0,+Infinity[ (strictly positive and finite).
-     * @param power A double value.
-     * @return value^power.
-     */
-    public static double powQuick(double value, double power) {
-        if (USE_JDK_MATH) {
-            return StrictMath.pow(value,power);
-        }
-        return exp(power*logQuick(value));
-    }
-
-    /**
-     * This treatment is somehow accurate for low values of |power|,
-     * and for |power*getExponent(value)| < 1023 or so (to stay away
-     * from double extreme magnitudes (large and small)).
-     *
-     * @param value A double value.
-     * @param power A power.
-     * @return value^power.
-     */
-    public static double powFast(double value, int power) {
-        if (USE_JDK_MATH) {
-            return StrictMath.pow(value,power);
-        }
-        if (power < 3) {
-            if (power < 0) {
-                // Opposite of Integer.MIN_VALUE does not exist as int.
-                if (power == Integer.MIN_VALUE) {
-                    // Integer.MAX_VALUE = -(power+1)
-                    return 1.0/(powFast(value,Integer.MAX_VALUE) * value);
-                } else {
-                    return 1.0/powFast(value,-power);
-                }
-            } else {
-                // Here, power is in [0,2].
-                if (power == 2) { // Most common case first.
-                    return value * value;
-                } else if (power == 0) {
-                    return 1.0;
-                } else { // power == 1
-                    return value;
-                }
-            }
-        } else { // power >= 4
-            double oddRemains = 1.0;
-            // If power <= 5, faster to finish outside the loop.
-            while (power > 5) {
-                // Test if power is odd.
-                if ((power & 1) != 0) {
-                    oddRemains *= value;
-                }
-                value *= value;
-                power >>= 1; // power = power / 2
-            }
-            // Here, power is in [3,5].
-            if (power == 3) {
-                return oddRemains * value * value * value;
-            } else { // power in [4,5].
-                double v2 = value * value;
-                if (power == 4) {
-                    return oddRemains * v2 * v2;
-                } else { // power == 5
-                    return oddRemains * v2 * v2 * value;
-                }
-            }
-        }
-    }
-
-    /**
-     * @param value A float value.
-     * @return value*value.
-     */
-    public static float pow2(float value) {
-        return value*value;
-    }
-
-    /**
-     * @param value A double value.
-     * @return value*value.
-     */
-    public static double pow2(double value) {
-        return value*value;
-    }
-
-    /**
-     * @param value A float value.
-     * @return value*value*value.
-     */
-    public static float pow3(float value) {
-        return value*value*value;
-    }
-
-    /**
-     * @param value A double value.
-     * @return value*value*value.
-     */
-    public static double pow3(double value) {
-        return value*value*value;
-    }
-
-    /*
-     * roots
-     */
-
-    /**
-     * @param value A double value.
-     * @return Value square root.
-     */
-    public static double sqrt(double value) {
-        if (USE_JDK_MATH || (!USE_REDEFINED_SQRT)) {
-            return StrictMath.sqrt(value);
-        }
-        // See cbrt for comments, sqrt uses the same ideas.
-
-        if (!(value > 0.0)) { // value <= 0.0, or value is NaN
-            if (ANTI_JIT_OPTIM_CRASH_ON_NAN) {
-                return (value < 0.0) ? Double.NaN : value;
-            } else {
-                return (value == 0.0) ? value : Double.NaN;
-            }
-        } else if (value == Double.POSITIVE_INFINITY) {
-            return Double.POSITIVE_INFINITY;
-        }
-
-        double h;
-        if (value < DOUBLE_MIN_NORMAL) {
-            value *= TWO_POW_52;
-            h = 2*TWO_POW_N26;
-        } else {
-            h = 2.0;
-        }
-
-        int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
-        int valueExponentIndex = (valueBitsHi>>20)+(-MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT);
-        int xIndex = ((valueBitsHi<<12)>>>(32-SQRT_LO_BITS));
-
-        double result = MyTSqrt.sqrtXSqrtHiTab[valueExponentIndex] * MyTSqrt.sqrtXSqrtLoTab[xIndex];
-        double slope = MyTSqrt.sqrtSlopeHiTab[valueExponentIndex] * MyTSqrt.sqrtSlopeLoTab[xIndex];
-        value *= 0.25;
-
-        result += (value - result * result) * slope;
-        result += (value - result * result) * slope;
-        return h*(result + (value - result * result) * slope);
-    }
-
-    /**
-     * Quick sqrt, with with a max relative error of about 3.41e-2
-     * for values in [Double.MIN_NORMAL,Double.MAX_VALUE], and worse
-     * accuracy outside this range.
-     *
-     * @param value A double value.
-     * @return Value square root.
-     */
-    public static double sqrtQuick(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.sqrt(value);
-        }
-        final long bits = Double.doubleToRawLongBits(value);
-        /*
-         * Constant determined empirically, using a random-based metaheuristic.
-         * Should be possible to find a better one.
-         */
-        return Double.longBitsToDouble((bits+4606859074900000000L)>>>1);
-    }
-
-    /**
-     * Quick inverse of square root, with a max relative error of about 3.44e-2
-     * for values in [Double.MIN_NORMAL,Double.MAX_VALUE], and worse accuracy
-     * outside this range.
-     *
-     * This implementation uses zero step of Newton's method.
-     * Here are the max relative errors on [Double.MIN_NORMAL,Double.MAX_VALUE]
-     * depending on number of steps, if you want to copy-paste this code
-     * and use your own number:
-     * n=0: about 3.44e-2
-     * n=1: about 1.75e-3
-     * n=2: about 4.6e-6
-     * n=3: about 3.17e-11
-     * n=4: about 3.92e-16
-     * n=5: about 3.03e-16
-     *
-     * @param value A double value.
-     * @return Inverse of value square root.
-     */
-    public static double invSqrtQuick(double value) {
-        if (USE_JDK_MATH) {
-            return 1/StrictMath.sqrt(value);
-        }
-        /*
-         * http://en.wikipedia.org/wiki/Fast_inverse_square_root
-         */
-        if (false) {
-            // With one Newton step (much slower than
-            // 1/Math.sqrt(double) if not optimized).
-            final double halfInitial = value * 0.5;
-            long bits = Double.doubleToRawLongBits(value);
-            // If n=0, 6910474759270000000L might be better (3.38e-2 max relative error).
-            bits = 0x5FE6EB50C7B537A9L - (bits>>1);
-            value = Double.longBitsToDouble(bits);
-            value = value * (1.5 - halfInitial * value * value); // Newton step, can repeat.
-            return value;
-        } else {
-            return Double.longBitsToDouble(0x5FE6EB50C7B537A9L - (Double.doubleToRawLongBits(value)>>1));
-        }
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value cubic root.
-     */
-    public static double cbrt(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.cbrt(value);
-        }
-        double h;
-        if (value < 0.0) {
-            if (value == Double.NEGATIVE_INFINITY) {
-                return Double.NEGATIVE_INFINITY;
-            }
-            value = -value;
-            // Making sure value is normal.
-            if (value < DOUBLE_MIN_NORMAL) {
-                value *= (TWO_POW_52*TWO_POW_26);
-                // h = <result_sign> * <result_multiplicator_to_avoid_overflow> / <cbrt(value_multiplicator_to_avoid_subnormal)>
-                h = -2*TWO_POW_N26;
-            } else {
-                h = -2.0;
-            }
-        } else {
-            if (!(value < Double.POSITIVE_INFINITY)) { // value is +Infinity, or value is NaN
-                return value;
-            }
-            // Making sure value is normal.
-            if (value < DOUBLE_MIN_NORMAL) {
-                if (value == 0.0) {
-                    // cbrt(0.0) = 0.0, cbrt(-0.0) = -0.0
-                    return value;
-                }
-                value *= (TWO_POW_52*TWO_POW_26);
-                h = 2*TWO_POW_N26;
-            } else {
-                h = 2.0;
-            }
-        }
-
-        // Normal value is (2^<value exponent> * <a value in [1,2[>).
-        // First member cubic root is computed, and multiplied with an approximation
-        // of the cubic root of the second member, to end up with a good guess of
-        // the result before using Newton's (or Archimedes's) method.
-        // To compute the cubic root approximation, we use the formula "cbrt(value) = cbrt(x) * cbrt(value/x)",
-        // choosing x as close to value as possible but inferior to it, so that cbrt(value/x) is close to 1
-        // (we could iterate on this method, using value/x as new value for each iteration,
-        // but finishing with Newton's method is faster).
-
-        // Shift and cast into an int, which overall is faster than working with a long.
-        int valueBitsHi = (int)(Double.doubleToRawLongBits(value)>>32);
-        int valueExponentIndex = (valueBitsHi>>20)+(-MAX_DOUBLE_EXPONENT-MIN_DOUBLE_EXPONENT);
-        // Getting the first CBRT_LO_BITS bits of the mantissa.
-        int xIndex = ((valueBitsHi<<12)>>>(32-CBRT_LO_BITS));
-        double result = MyTCbrt.cbrtXCbrtHiTab[valueExponentIndex] * MyTCbrt.cbrtXCbrtLoTab[xIndex];
-        double slope = MyTCbrt.cbrtSlopeHiTab[valueExponentIndex] * MyTCbrt.cbrtSlopeLoTab[xIndex];
-
-        // Lowering values to avoid overflows when using Newton's method
-        // (we will then just have to return twice the result).
-        // result^3 = value
-        // (result/2)^3 = value/8
-        value *= 0.125;
-        // No need to divide result here, as division is factorized in result computation tables.
-        // result *= 0.5;
-
-        // Newton's method, looking for y = x^(1/p):
-        // y(n) = y(n-1) + (x-y(n-1)^p) * slope(y(n-1))
-        // y(n) = y(n-1) + (x-y(n-1)^p) * (1/p)*(x(n-1)^(1/p-1))
-        // y(n) = y(n-1) + (x-y(n-1)^p) * (1/p)*(x(n-1)^((1-p)/p))
-        // with x(n-1)=y(n-1)^p, i.e.:
-        // y(n) = y(n-1) + (x-y(n-1)^p) * (1/p)*(y(n-1)^(1-p))
-        //
-        // For p=3:
-        // y(n) = y(n-1) + (x-y(n-1)^3) * (1/(3*y(n-1)^2))
-
-        // To save time, we don't recompute the slope between Newton's method steps,
-        // as initial slope is good enough for a few iterations.
-        //
-        // NB: slope = 1/(3*trueResult*trueResult)
-        //     As we have result = trueResult/2 (to avoid overflows), we have:
-        //     slope = 4/(3*result*result)
-        //           = (4/3)*resultInv*resultInv
-        //     with newResultInv = 1/newResult
-        //                       = 1/(oldResult+resultDelta)
-        //                       = (oldResultInv)*1/(1+resultDelta/oldResult)
-        //                       = (oldResultInv)*1/(1+resultDelta*oldResultInv)
-        //                      ~= (oldResultInv)*(1-resultDelta*oldResultInv)
-        //     ===> Successive slopes could be computed without division, if needed,
-        //          by computing resultInv (instead of slope right away) and retrieving
-        //          slopes from it.
-
-        result += (value - result * result * result) * slope;
-        result += (value - result * result * result) * slope;
-        return h*(result + (value - result * result * result) * slope);
-    }
-
-    /**
-     * @return sqrt(x^2+y^2) without intermediate overflow or underflow.
-     */
-    public static double hypot(double x, double y) {
-        if (USE_JDK_MATH) {
-            return StrictMath.hypot(x,y);
-        }
-        x = Math.abs(x);
-        y = Math.abs(y);
-        // Ensuring x <= y.
-        if (y < x) {
-            double a = x;
-            x = y;
-            y = a;
-        } else if (!(y >= x)) { // Testing if we have some NaN.
-            return hypot_NaN(x, y);
-        }
-
-        if (y-x == y) {
-            // x too small to subtract from y.
-            return y;
-        } else {
-            double factor;
-            if (y > HYPOT_MAX_MAG) {
-                // y is too large: scaling down.
-                x *= (1/HYPOT_FACTOR);
-                y *= (1/HYPOT_FACTOR);
-                factor = HYPOT_FACTOR;
-            } else if (x < (1/HYPOT_MAX_MAG)) {
-                // x is too small: scaling up.
-                x *= HYPOT_FACTOR;
-                y *= HYPOT_FACTOR;
-                factor = (1/HYPOT_FACTOR);
-            } else {
-                factor = 1.0;
-            }
-            return factor * sqrt(x*x+y*y);
-        }
-    }
-
-    /**
-     * @return sqrt(x^2+y^2+z^2) without intermediate overflow or underflow.
-     */
-    public static double hypot(double x, double y, double z) {
-        if (USE_JDK_MATH) {
-            // No simple JDK equivalent.
-        }
-        x = Math.abs(x);
-        y = Math.abs(y);
-        z = Math.abs(z);
-        /*
-         * Considering that z magnitude is the most likely to be the smaller,
-         * hence ensuring z <= y <= x, and not x <= y <= z, for less swaps.
-         */
-        // Ensuring z <= y.
-        if (z > y) {
-            // y < z: swapping y and z
-            double a = z;
-            z = y;
-            y = a;
-        } else if (!(z <= y)) { // Testing if y or z is NaN.
-            return hypot_NaN(x, y, z);
-        }
-        // Ensuring y <= x.
-        if (z > x) {
-            // x < z <= y: moving x
-            double oldZ = z;
-            z = x;
-            double oldY = y;
-            y = oldZ;
-            x = oldY;
-        } else if (y > x) {
-            // z <= x < y: swapping x and y
-            double a = y;
-            y = x;
-            x = a;
-        } else if (x != x) { // Testing if x is NaN.
-            return hypot_NaN(x, y, z);
-        }
-
-        if (x-y == x) {
-            // y, hence z, too small to subtract from x.
-            return x;
-        } else if (y-z == y) {
-            // z too small to subtract from y, hence x.
-            double factor;
-            if (x > HYPOT_MAX_MAG) {
-                // x is too large: scaling down.
-                x *= (1/HYPOT_FACTOR);
-                y *= (1/HYPOT_FACTOR);
-                factor = HYPOT_FACTOR;
-            } else if (y < (1/HYPOT_MAX_MAG)) {
-                // y is too small: scaling up.
-                x *= HYPOT_FACTOR;
-                y *= HYPOT_FACTOR;
-                factor = (1/HYPOT_FACTOR);
-            } else {
-                factor = 1.0;
-            }
-            return factor * sqrt(x*x+y*y);
-        } else {
-            double factor;
-            if (x > HYPOT_MAX_MAG) {
-                // x is too large: scaling down.
-                x *= (1/HYPOT_FACTOR);
-                y *= (1/HYPOT_FACTOR);
-                z *= (1/HYPOT_FACTOR);
-                factor = HYPOT_FACTOR;
-            } else if (z < (1/HYPOT_MAX_MAG)) {
-                // z is too small: scaling up.
-                x *= HYPOT_FACTOR;
-                y *= HYPOT_FACTOR;
-                z *= HYPOT_FACTOR;
-                factor = (1/HYPOT_FACTOR);
-            } else {
-                factor = 1.0;
-            }
-            // Adding smaller magnitudes together first.
-            return factor * sqrt(x*x+(y*y+z*z));
-        }
-    }
-
-    /*
-     * close values
-     */
-
-    /**
-     * @param value A float value.
-     * @return Floor of value.
-     */
-    public static float floor(float value) {
-        final int exponent = getExponent(value);
-        if (exponent < 0) {
-            // abs(value) < 1.
-            if (value < 0.0f) {
-                return -1.0f;
-            } else {
-                // 0.0f, or -0.0f if value is -0.0f
-                return 0.0f * value;
-            }
-        } else if (exponent < 23) {
-            // A bit faster than using casts.
-            final int bits = Float.floatToRawIntBits(value);
-            final int anteCommaBits = bits & (0xFF800000>>exponent);
-            if ((value < 0.0f) && (anteCommaBits != bits)) {
-                return Float.intBitsToFloat(anteCommaBits) - 1.0f;
-            } else {
-                return Float.intBitsToFloat(anteCommaBits);
-            }
-        } else {
-            // +-Infinity, NaN, or a mathematical integer.
-            return value;
-        }
-    }
-
-    /**
-     * @param value A double value.
-     * @return Floor of value.
-     */
-    public static double floor(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.floor(value);
-        }
-        if (ANTI_SLOW_CASTS) {
-            double valueAbs = Math.abs(value);
-            if (valueAbs <= (double)Integer.MAX_VALUE) {
-                if (value > 0.0) {
-                    return (double)(int)value;
-                } else if (value < 0.0) {
-                    double anteCommaDigits = (double)(int)value;
-                    if (value != anteCommaDigits) {
-                        return anteCommaDigits - 1.0;
-                    } else {
-                        return anteCommaDigits;
-                    }
-                } else { // value is +-0.0 (not NaN due to test against Integer.MAX_VALUE)
-                    return value;
-                }
-            } else if (valueAbs < TWO_POW_52) {
-                // We split the value in two:
-                // high part, which is a mathematical integer,
-                // and the rest, for which we can get rid of the
-                // post comma digits by casting into an int.
-                double highPart = ((int)(value * TWO_POW_N26)) * TWO_POW_26;
-                if (value > 0.0) {
-                    return highPart + (double)((int)(value - highPart));
-                } else {
-                    double anteCommaDigits = highPart + (double)((int)(value - highPart));
-                    if (value != anteCommaDigits) {
-                        return anteCommaDigits - 1.0;
-                    } else {
-                        return anteCommaDigits;
-                    }
-                }
-            } else { // abs(value) >= 2^52, or value is NaN
-                return value;
-            }
-        } else {
-            final int exponent = getExponent(value);
-            if (exponent < 0) {
-                // abs(value) < 1.
-                if (value < 0.0) {
-                    return -1.0;
-                } else {
-                    // 0.0, or -0.0 if value is -0.0
-                    return 0.0 * value;
-                }
-            } else if (exponent < 52) {
-                // A bit faster than working on bits.
-                final long matIntPart = (long)value;
-                final double matIntToValue = value-(double)matIntPart;
-                if (matIntToValue >= 0.0) {
-                    return (double)matIntPart;
-                } else {
-                    return (double)(matIntPart - 1);
-                }
-            } else {
-                // +-Infinity, NaN, or a mathematical integer.
-                return value;
-            }
-        }
-    }
-
-    /**
-     * @param value A float value.
-     * @return Ceiling of value.
-     */
-    public static float ceil(float value) {
-        return -floor(-value);
-    }
-
-    /**
-     * @param value A double value.
-     * @return Ceiling of value.
-     */
-    public static double ceil(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.ceil(value);
-        }
-        return -floor(-value);
-    }
-
-    /**
-     * Might have different semantics than StrictMath.round(float),
-     * see bugs 6430675 and 8010430.
-     *
-     * @param value A double value.
-     * @return Value rounded to nearest int, choosing superior int in case two
-     *         are equally close (i.e. rounding-up).
-     */
-    public static int round(float value) {
-        /*
-         * Not delegating to JDK, because we want delegation to provide
-         * at least as good results, and some supported JDK versions
-         * have bugged round() methods.
-         */
-        // Algorithm by Dmitry Nadezhin (but replaced an if by a multiply)
-        // (http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-August/020247.html).
-        final int bits = Float.floatToRawIntBits(value);
-        final int biasedExp = ((bits>>23)&0xFF);
-        // Shift to get rid of bits past comma except first one: will need to
-        // 1-shift to the right to end up with correct magnitude.
-        final int shift = (23 - 1 + MAX_FLOAT_EXPONENT) - biasedExp;
-        if ((shift & -32) == 0) {
-            int bitsSignum = (((bits >> 31) << 1) + 1);
-            // shift in [0,31], so unbiased exp in [-9,22].
-            int extendedMantissa = (0x00800000 | (bits & 0x007FFFFF)) * bitsSignum;
-            // If value is positive and first bit past comma is 0, rounding
-            // to lower integer, else to upper one, which is what "+1" and
-            // then ">>1" do.
-            return ((extendedMantissa >> shift) + 1) >> 1;
-        } else {
-            // +-Infinity, NaN, or a mathematical integer, or tiny.
-            if (false && ANTI_SLOW_CASTS) { // not worth it
-                if (Math.abs(value) >= -(float)Integer.MIN_VALUE) {
-                    // +-Infinity or a mathematical integer (mostly) out of int range.
-                    return (value < 0.0) ? Integer.MIN_VALUE : Integer.MAX_VALUE;
-                }
-                // NaN or a mathematical integer (mostly) in int range.
-            }
-            return (int)value;
-        }
-    }
-
-    /**
-     * Might have different semantics than StrictMath.round(double),
-     * see bugs 6430675 and 8010430.
-     *
-     * @param value A double value.
-     * @return Value rounded to nearest long, choosing superior long in case two
-     *         are equally close (i.e. rounding-up).
-     */
-    public static long round(double value) {
-        /*
-         * Not delegating to JDK, because we want delegation to provide
-         * at least as good results, and some supported JDK versions
-         * have bugged round() methods.
-         */
-        final long bits = Double.doubleToRawLongBits(value);
-        final int biasedExp = (((int)(bits>>52))&0x7FF);
-        // Shift to get rid of bits past comma except first one: will need to
-        // 1-shift to the right to end up with correct magnitude.
-        final int shift = (52 - 1 + MAX_DOUBLE_EXPONENT) - biasedExp;
-        if ((shift & -64) == 0) {
-            long bitsSignum = (((bits >> 63) << 1) + 1);
-            // shift in [0,63], so unbiased exp in [-12,51].
-            long extendedMantissa = (0x0010000000000000L | (bits & 0x000FFFFFFFFFFFFFL)) * bitsSignum;
-            // If value is positive and first bit past comma is 0, rounding
-            // to lower integer, else to upper one, which is what "+1" and
-            // then ">>1" do.
-            return ((extendedMantissa >> shift) + 1L) >> 1;
-        } else {
-            // +-Infinity, NaN, or a mathematical integer, or tiny.
-            if (ANTI_SLOW_CASTS) {
-                if (Math.abs(value) >= -(double)Long.MIN_VALUE) {
-                    // +-Infinity or a mathematical integer (mostly) out of long range.
-                    return (value < 0.0) ? Long.MIN_VALUE : Long.MAX_VALUE;
-                }
-                // NaN or a mathematical integer (mostly) in long range.
-            }
-            return (long)value;
-        }
-    }
-
-    /**
-     * @param value A float value.
-     * @return Value rounded to nearest int, choosing even int in case two
-     *         are equally close.
-     */
-    public static int roundEven(float value) {
-        final int sign = signFromBit(value);
-        value = Math.abs(value);
-        if (ANTI_SLOW_CASTS) {
-            if (value < TWO_POW_23_F) {
-                // Getting rid of post-comma bits.
-                value = ((value + TWO_POW_23_F) - TWO_POW_23_F);
-                return sign * (int)value;
-            } else if (value < (float)Integer.MAX_VALUE) { // "<=" doesn't work, because of float precision
-                // value is in [-Integer.MAX_VALUE,Integer.MAX_VALUE]
-                return sign * (int)value;
-            }
-        } else {
-            if (value < TWO_POW_23_F) {
-                // Getting rid of post-comma bits.
-                value = ((value + TWO_POW_23_F) - TWO_POW_23_F);
-            }
-        }
-        return (int)(sign * value);
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value rounded to nearest long, choosing even long in case two
-     *         are equally close.
-     */
-    public static long roundEven(double value) {
-        final int sign = (int)signFromBit(value);
-        value = Math.abs(value);
-        if (value < TWO_POW_52) {
-            // Getting rid of post-comma bits.
-            value = ((value + TWO_POW_52) - TWO_POW_52);
-        }
-        if (ANTI_SLOW_CASTS) {
-            if (value <= (double)Integer.MAX_VALUE) {
-                // value is in [-Integer.MAX_VALUE,Integer.MAX_VALUE]
-                return sign * (int)value;
-            }
-        }
-        return (long)(sign * value);
-    }
-
-    /**
-     * @param value A float value.
-     * @return The float mathematical integer closest to the specified value,
-     *         choosing even one if two are equally close, or respectively
-     *         NaN, +-Infinity or +-0.0f if the value is any of these.
-     */
-    public static float rint(float value) {
-        final int sign = signFromBit(value);
-        value = Math.abs(value);
-        if (value < TWO_POW_23_F) {
-            // Getting rid of post-comma bits.
-            value = ((TWO_POW_23_F + value ) - TWO_POW_23_F);
-        }
-        // Restoring original sign.
-        return sign * value;
-    }
-
-    /**
-     * @param value A double value.
-     * @return The double mathematical integer closest to the specified value,
-     *         choosing even one if two are equally close, or respectively
-     *         NaN, +-Infinity or +-0.0 if the value is any of these.
-     */
-    public static double rint(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.rint(value);
-        }
-        final int sign = (int)signFromBit(value);
-        value = Math.abs(value);
-        if (value < TWO_POW_52) {
-            // Getting rid of post-comma bits.
-            value = ((TWO_POW_52 + value ) - TWO_POW_52);
-        }
-        // Restoring original sign.
-        return sign * value;
-    }
-
-    /*
-     * close int values
-     *
-     * Never delegating to JDK for these methods, for we should always
-     * be faster and exact, and JDK doesn't exactly have such methods.
-     */
-
-    /**
-     * @param value A double value.
-     * @return Floor of value as int, or closest int if floor is out
-     *         of int range, or 0 if value is NaN.
-     */
-    public static int floorToInt(double value) {
-        int valueInt = (int) value;
-        if (value < 0.0) {
-            if (value == (double) valueInt) {
-                return valueInt;
-            } else {
-                if (valueInt == Integer.MIN_VALUE) {
-                    return valueInt;
-                } else {
-                    return valueInt - 1;
-                }
-            }
-        } else { // >= 0 or NaN.
-            return valueInt;
-        }
-    }
-
-    /**
-     * @param value A double value.
-     * @return Ceiling of value as int, or closest int if ceiling is out
-     *         of int range, or 0 if value is NaN.
-     */
-    public static int ceilToInt(double value) {
-        int valueInt = (int) value;
-        if (value > 0.0) {
-            if (value == (double) valueInt) {
-                return valueInt;
-            } else {
-                if (valueInt == Integer.MAX_VALUE) {
-                    return valueInt;
-                } else {
-                    return valueInt + 1;
-                }
-            }
-        } else { // <= 0 or NaN.
-            return valueInt;
-        }
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value rounded to nearest int, choosing superior int in case two
-     *         are equally close (i.e. rounding-up).
-     */
-    public static int roundToInt(double value) {
-        /*
-         * We don't gain much by reimplementing rounding, except for
-         * pathologically large values, which should not be a common case
-         * when dealing with ints, so we just use round(double).
-         */
-        return NumbersUtils.toInt(round(value));
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value rounded to nearest int, choosing even int in case two
-     *         are equally close.
-     */
-    public static int roundEvenToInt(double value) {
-        final int sign = (int)signFromBit(value);
-        value = Math.abs(value);
-        /*
-         * Applying the post-comma bits removal logic even if value is out
-         * of int range, to avoid a test, for it doesn't mess up the result,
-         * and we want to optimize for the case of values in int range.
-         */
-        value = ((value + TWO_POW_52) - TWO_POW_52);
-        return (int)(sign * value);
-    }
-
-    /*
-     * ranges
-     */
-
-    /**
-     * @param min A float value.
-     * @param max A float value.
-     * @param value A float value.
-     * @return min if value < min, max if value > max, value otherwise.
-     */
-    public static float toRange(float min, float max, float value) {
-        return NumbersUtils.toRange(min, max, value);
-    }
-
-    /**
-     * @param min A double value.
-     * @param max A double value.
-     * @param value A double value.
-     * @return min if value < min, max if value > max, value otherwise.
-     */
-    public static double toRange(double min, double max, double value) {
-        return NumbersUtils.toRange(min, max, value);
-    }
-
-    /*
-     * binary operators (/,%)
-     */
-
-    /**
-     * Returns dividend - divisor * n, where n is the mathematical integer
-     * closest to dividend/divisor.
-     * If dividend/divisor is equally close to surrounding integers,
-     * we choose n to be the integer of smallest magnitude, which makes
-     * this treatment differ from StrictMath.IEEEremainder(double,double),
-     * where n is chosen to be the even integer.
-     * Note that the choice of n is not done considering the double
-     * approximation of dividend/divisor, because it could cause
-     * result to be outside [-|divisor|/2,|divisor|/2] range.
-     * The practical effect is that if multiple results would be possible,
-     * we always choose the result that is the closest to (and has the same
-     * sign as) the dividend.
-     * Ex. :
-     * - for (-3.0,2.0), this method returns -1.0,
-     *   whereas StrictMath.IEEEremainder returns 1.0.
-     * - for (-5.0,2.0), both this method and StrictMath.IEEEremainder return -1.0.
-     *
-     * If the remainder is zero, its sign is the same as the sign of the first argument.
-     * If either argument is NaN, or the first argument is infinite,
-     * or the second argument is positive zero or negative zero,
-     * then the result is NaN.
-     * If the first argument is finite and the second argument is
-     * infinite, then the result is the same as the first argument.
-     *
-     * NB:
-     * - Modulo operator (%) returns a value in ]-|divisor|,|divisor|[,
-     *   which sign is the same as dividend.
-     * - As for modulo operator, the sign of the divisor has no effect on the result.
-     * - On some architecture, % operator has been observed to return NaN
-     *   for some subnormal values of divisor, when dividend exponent is 1023,
-     *   which impacts the correctness of this method.
-     *
-     * @param dividend Dividend.
-     * @param divisor Divisor.
-     * @return Remainder of dividend/divisor, i.e. a value in [-|divisor|/2,|divisor|/2].
-     */
-    public static double remainder(double dividend, double divisor) {
-        if (Double.isInfinite(divisor)) {
-            if (Double.isInfinite(dividend)) {
-                return Double.NaN;
-            } else {
-                return dividend;
-            }
-        }
-        double value = dividend % divisor;
-        if (Math.abs(value+value) > Math.abs(divisor)) {
-            return value + ((value > 0.0) ? -Math.abs(divisor) : Math.abs(divisor));
-        } else {
-            return value;
-        }
-    }
-
-    /**
-     * @param angle Angle in radians.
-     * @return The same angle, in radians, but in [-PI,PI].
-     */
-    public static double normalizeMinusPiPi(double angle) {
-        // Not modifying values in output range.
-        if ((angle >= -Math.PI) && (angle <= Math.PI)) {
-            return angle;
-        }
-        return remainderTwoPi(angle);
-    }
-
-    /**
-     * Not accurate for large values.
-     *
-     * @param angle Angle in radians.
-     * @return The same angle, in radians, but in [-PI,PI].
-     */
-    public static double normalizeMinusPiPiFast(double angle) {
-        // Not modifying values in output range.
-        if ((angle >= -Math.PI) && (angle <= Math.PI)) {
-            return angle;
-        }
-        return remainderTwoPiFast(angle);
-    }
-
-    /**
-     * @param angle Angle in radians.
-     * @return The same angle, in radians, but in [0,2*PI].
-     */
-    public static double normalizeZeroTwoPi(double angle) {
-        // Not modifying values in output range.
-        if ((angle >= 0.0) && (angle <= 2*Math.PI)) {
-            return angle;
-        }
-        angle = remainderTwoPi(angle);
-        if (angle < 0.0) {
-            // LO then HI is theoretically better (when starting near 0).
-            return (angle + TWOPI_LO) + TWOPI_HI;
-        } else {
-            return angle;
-        }
-    }
-
-    /**
-     * Not accurate for large values.
-     *
-     * @param angle Angle in radians.
-     * @return The same angle, in radians, but in [0,2*PI].
-     */
-    public static double normalizeZeroTwoPiFast(double angle) {
-        // Not modifying values in output range.
-        if ((angle >= 0.0) && (angle <= 2*Math.PI)) {
-            return angle;
-        }
-        angle = remainderTwoPiFast(angle);
-        if (angle < 0.0) {
-            // LO then HI is theoretically better (when starting near 0).
-            return (angle + TWOPI_LO) + TWOPI_HI;
-        } else {
-            return angle;
-        }
-    }
-
-    /**
-     * @param angle Angle in radians.
-     * @return Angle value modulo PI, in radians, in [-PI/2,PI/2].
-     */
-    public static double normalizeMinusHalfPiHalfPi(double angle) {
-        // Not modifying values in output range.
-        if ((angle >= -Math.PI/2) && (angle <= Math.PI/2)) {
-            return angle;
-        }
-        return remainderPi(angle);
-    }
-
-    /**
-     * Not accurate for large values.
-     *
-     * @param angle Angle in radians.
-     * @return Angle value modulo PI, in radians, in [-PI/2,PI/2].
-     */
-    public static double normalizeMinusHalfPiHalfPiFast(double angle) {
-        // Not modifying values in output range.
-        if ((angle >= -Math.PI/2) && (angle <= Math.PI/2)) {
-            return angle;
-        }
-        return remainderPiFast(angle);
-    }
-
-    /*
-     * floating points utils
-     */
-
-    /**
-     * @param value A float value.
-     * @return true if the specified value is NaN or +-Infinity, false otherwise.
-     */
-    public static boolean isNaNOrInfinite(float value) {
-        return NumbersUtils.isNaNOrInfinite(value);
-    }
-
-    /**
-     * @param value A double value.
-     * @return true if the specified value is NaN or +-Infinity, false otherwise.
-     */
-    public static boolean isNaNOrInfinite(double value) {
-        return NumbersUtils.isNaNOrInfinite(value);
-    }
-
-    /**
-     * @param value A float value.
-     * @return Value unbiased exponent.
-     */
-    public static int getExponent(float value) {
-        return ((Float.floatToRawIntBits(value)>>23)&0xFF)-MAX_FLOAT_EXPONENT;
-    }
-
-    /**
-     * @param value A double value.
-     * @return Value unbiased exponent.
-     */
-    public static int getExponent(double value) {
-        return (((int)(Double.doubleToRawLongBits(value)>>52))&0x7FF)-MAX_DOUBLE_EXPONENT;
-    }
-
-    /**
-     * @param value A float value.
-     * @return -1.0f if the specified value is < 0, 1.0f if it is > 0,
-     *         and the value itself if it is NaN or +-0.0f.
-     */
-    public static float signum(float value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.signum(value);
-        }
-        if ((value == 0.0f) || (value != value)) {
-            return value;
-        }
-        return (float)signFromBit(value);
-    }
-
-    /**
-     * @param value A double value.
-     * @return -1.0 if the specified value is < 0, 1.0 if it is > 0,
-     *         and the value itself if it is NaN or +-0.0.
-     */
-    public static double signum(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.signum(value);
-        }
-        if ((value == 0.0) || (value != value)) {
-            return value;
-        }
-        if (ANTI_SLOW_CASTS) {
-            return (double)(int)signFromBit(value);
-        } else {
-            return (double)signFromBit(value);
-        }
-    }
-
-    /**
-     * @param value A float value.
-     * @return -1 if sign bit is 1, 1 if sign bit is 0.
-     */
-    public static int signFromBit(float value) {
-        return ((Float.floatToRawIntBits(value)>>30)|1);
-    }
-
-    /**
-     * @param value A double value.
-     * @return -1 if sign bit is 1, 1 if sign bit is 0.
-     */
-    public static long signFromBit(double value) {
-        // Returning a long, to avoid useless cast into int.
-        return ((Double.doubleToRawLongBits(value)>>62)|1);
-    }
-
-    /**
-     * A sign of NaN is interpreted as positive.
-     *
-     * @param magnitude A float value.
-     * @param sign A float value.
-     * @return A value with the magnitude of the first argument, and the sign
-     *         of the second argument.
-     */
-    public static float copySign(float magnitude, float sign) {
-        return Float.intBitsToFloat(
-                (Float.floatToRawIntBits((sign != sign) ? 1.0f : sign) & Integer.MIN_VALUE)
-                | (Float.floatToRawIntBits(magnitude) & Integer.MAX_VALUE));
-    }
-
-    /**
-     * A sign of NaN is interpreted as positive.
-     *
-     * @param magnitude A double value.
-     * @param sign A double value.
-     * @return A value with the magnitude of the first argument, and the sign
-     *         of the second argument.
-     */
-    public static double copySign(double magnitude, double sign) {
-        return Double.longBitsToDouble(
-                (Double.doubleToRawLongBits((sign != sign) ? 1.0 : sign) & Long.MIN_VALUE)
-                | (Double.doubleToRawLongBits(magnitude) & Long.MAX_VALUE));
-    }
-
-    /**
-     * The ULP (Unit in the Last Place) is the distance to the next value larger
-     * in magnitude.
-     *
-     * @param value A float value.
-     * @return The size of an ulp of the specified value, or Float.MIN_VALUE
-     *         if it is +-0.0f, or +Infinity if it is +-Infinity, or NaN
-     *         if it is NaN.
-     */
-    public static float ulp(float value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.ulp(value);
-        }
-        /*
-         * Look-up table not really worth it in micro-benchmark,
-         * so should be worse with cache-misses.
-         */
-        final int exponent = getExponent(value);
-        if (exponent >= (MIN_FLOAT_NORMAL_EXPONENT+23)) {
-            if (exponent == MAX_FLOAT_EXPONENT+1) {
-                // NaN or +-Infinity
-                return Math.abs(value);
-            }
-            // normal: returning 2^(exponent-23)
-            return Float.intBitsToFloat((exponent+(MAX_FLOAT_EXPONENT-23))<<23);
-        } else {
-            if (exponent == MIN_FLOAT_NORMAL_EXPONENT-1) {
-                // +-0.0f or subnormal
-                return Float.MIN_VALUE;
-            }
-            // subnormal result
-            return Float.intBitsToFloat(1<<(exponent-MIN_FLOAT_NORMAL_EXPONENT));
-        }
-    }
-
-    /**
-     * The ULP (Unit in the Last Place) is the distance to the next value larger
-     * in magnitude.
-     *
-     * @param value A double value.
-     * @return The size of an ulp of the specified value, or Double.MIN_VALUE
-     *         if it is +-0.0, or +Infinity if it is +-Infinity, or NaN
-     *         if it is NaN.
-     */
-    public static double ulp(double value) {
-        if (USE_JDK_MATH) {
-            return StrictMath.ulp(value);
-        }
-        /*
-         * Look-up table not really worth it in micro-benchmark,
-         * so should be worse with cache-misses.
-         */
-        final int exponent = getExponent(value);
-        if (exponent >= (MIN_DOUBLE_NORMAL_EXPONENT+52)) {
-            if (exponent == MAX_DOUBLE_EXPONENT+1) {
-                // NaN or +-Infinity
-                return Math.abs(value);
-            }
-            // normal: returning 2^(exponent-52)
-            return Double.longBitsToDouble((exponent+(MAX_DOUBLE_EXPONENT-52L))<<52);
-        } else {
-            if (exponent == MIN_DOUBLE_NORMAL_EXPONENT-1) {
-                // +-0.0f or subnormal
-                return Double.MIN_VALUE;
-            }
-            // subnormal result
-            return Double.longBitsToDouble(1L<<(exponent-MIN_DOUBLE_NORMAL_EXPONENT));
-        }
-    }
-
-    /**
-     * If both arguments are +-0.0(f), (float)direction is returned.
-     *
-     * If both arguments are +Infinity or -Infinity,
-     * respectively +Infinity or -Infinity is returned.
-     *
-     * @param start A float value.
-     * @param direction A double value.
-     * @return The float adjacent to start towards direction, considering that
-     *         +(-)Float.MIN_VALUE is adjacent to +(-)0.0f, and that
-     *         +(-)Float.MAX_VALUE is adjacent to +(-)Infinity,
-     *         or NaN if any argument is NaN.
-     */
-    public static float nextAfter(float start, double direction) {
-        if (direction < start) {
-            // Going towards -Infinity.
-            if (start == 0.0f) {
-                // +-0.0f
-                return -Float.MIN_VALUE;
-            }
-            final int bits = Float.floatToRawIntBits(start);
-            return Float.intBitsToFloat(bits + ((bits > 0) ? -1 : 1));
-        } else if (direction > start) {
-            // Going towards +Infinity.
-            // +0.0f to get rid of eventual -0.0f
-            final int bits = Float.floatToRawIntBits(start + 0.0f);
-            return Float.intBitsToFloat(bits + (bits >= 0 ? 1 : -1));
-        } else if (start == direction) {
-            return (float)direction;
-        } else {
-            // Returning a NaN derived from the input NaN(s).
-            return start + (float)direction;
-        }
-    }
-
-    /**
-     * If both arguments are +-0.0, direction is returned.
-     *
-     * If both arguments are +Infinity or -Infinity,
-     * respectively +Infinity or -Infinity is returned.
-     *
-     * @param start A double value.
-     * @param direction A double value.
-     * @return The double adjacent to start towards direction, considering that
-     *         +(-)Double.MIN_VALUE is adjacent to +(-)0.0, and that
-     *         +(-)Double.MAX_VALUE is adjacent to +(-)Infinity,
-     *         or NaN if any argument is NaN.
-     */
-    public static double nextAfter(double start, double direction) {
-        if (direction < start) {
-            // Going towards -Infinity.
-            if (start == 0.0) {
-                // +-0.0
-                return -Double.MIN_VALUE;
-            }
-            final long bits = Double.doubleToRawLongBits(start);
-            return Double.longBitsToDouble(bits + ((bits > 0) ? -1 : 1));
-        } else if (direction > start) {
-            // Going towards +Infinity.
-            // +0.0 to get rid of eventual -0.0
-            final long bits = Double.doubleToRawLongBits(start + 0.0f);
-            return Double.longBitsToDouble(bits + (bits >= 0 ? 1 : -1));
-        } else if (start == direction) {
-            return direction;
-        } else {
-            // Returning a NaN derived from the input NaN(s).
-            return start + direction;
-        }
-    }
-
-    /**
-     * Semantically equivalent to nextAfter(start,Double.NEGATIVE_INFINITY).
-     */
-    public static float nextDown(float start) {
-        if (start > Float.NEGATIVE_INFINITY) {
-            if (start == 0.0f) {
-                // +-0.0f
-                return -Float.MIN_VALUE;
-            }
-            final int bits = Float.floatToRawIntBits(start);
-            return Float.intBitsToFloat(bits + ((bits > 0) ? -1 : 1));
-        } else if (start == Float.NEGATIVE_INFINITY) {
-            return Float.NEGATIVE_INFINITY;
-        } else {
-            // NaN
-            return start;
-        }
-    }
-
-    /**
-     * Semantically equivalent to nextAfter(start,Double.NEGATIVE_INFINITY).
-     */
-    public static double nextDown(double start) {
-        if (start > Double.NEGATIVE_INFINITY) {
-            if (start == 0.0) {
-                // +-0.0
-                return -Double.MIN_VALUE;
-            }
-            final long bits = Double.doubleToRawLongBits(start);
-            return Double.longBitsToDouble(bits + ((bits > 0) ? -1 : 1));
-        } else if (start == Double.NEGATIVE_INFINITY) {
-            return Double.NEGATIVE_INFINITY;
-        } else {
-            // NaN
-            return start;
-        }
-    }
-
-    /**
-     * Semantically equivalent to nextAfter(start,Double.POSITIVE_INFINITY).
-     */
-    public static float nextUp(float start) {
-        if (start < Float.POSITIVE_INFINITY) {
-            // +0.0f to get rid of eventual -0.0f
-            final int bits = Float.floatToRawIntBits(start + 0.0f);
-            return Float.intBitsToFloat(bits + (bits >= 0 ? 1 : -1));
-        } else if (start == Float.POSITIVE_INFINITY) {
-            return Float.POSITIVE_INFINITY;
-        } else {
-            // NaN
-            return start;
-        }
-    }
-
-    /**
-     * Semantically equivalent to nextAfter(start,Double.POSITIVE_INFINITY).
-     */
-    public static double nextUp(double start) {
-        if (start < Double.POSITIVE_INFINITY) {
-            // +0.0 to get rid of eventual -0.0
-            final long bits = Double.doubleToRawLongBits(start + 0.0);
-            return Double.longBitsToDouble(bits + (bits >= 0 ? 1 : -1));
-        } else if (start == Double.POSITIVE_INFINITY) {
-            return Double.POSITIVE_INFINITY;
-        } else {
-            // NaN
-            return start;
-        }
-    }
-
-    /**
-     * Precision may be lost if the result is subnormal.
-     *
-     * @param value A float value.
-     * @param scaleFactor An int value.
-     * @return value * 2^scaleFactor, or a value equivalent to the specified
-     *         one if it is NaN, +-Infinity or +-0.0f.
-     */
-    public static float scalb(float value, int scaleFactor) {
-        // Large enough to imply overflow or underflow for
-        // a finite non-zero value.
-        final int MAX_SCALE = 2*MAX_FLOAT_EXPONENT+23+1;
-
-        // Making sure scaling factor is in a reasonable range.
-        scaleFactor = Math.max(Math.min(scaleFactor, MAX_SCALE), -MAX_SCALE);
-
-        return (float)(((double)value) * twoPowNormal(scaleFactor));
-    }
-
-    /**
-     * Precision may be lost if the result is subnormal.
-     *
-     * @param value A double value.
-     * @param scaleFactor An int value.
-     * @return value * 2^scaleFactor, or a value equivalent to the specified
-     *         one if it is NaN, +-Infinity or +-0.0.
-     */
-    public static double scalb(double value, int scaleFactor) {
-        if ((scaleFactor > -MAX_DOUBLE_EXPONENT) && (scaleFactor <= MAX_DOUBLE_EXPONENT)) {
-            // Quick case (as done in apache FastMath).
-            return value * twoPowNormal(scaleFactor);
-        }
-
-        // Large enough to imply overflow or underflow for
-        // a finite non-zero value.
-        final int MAX_SCALE = 2*MAX_DOUBLE_EXPONENT+52+1;
-
-        // Making sure scaling factor is in a reasonable range.
-        final int exponentAdjust;
-        final int scaleIncrement;
-        final double exponentDelta;
-        if (scaleFactor < 0) {
-            scaleFactor = Math.max(scaleFactor, -MAX_SCALE);
-            scaleIncrement = -512;
-            exponentDelta = TWO_POW_N512;
-        } else {
-            scaleFactor = Math.min(scaleFactor, MAX_SCALE);
-            scaleIncrement = 512;
-            exponentDelta = TWO_POW_512;
-        }
-
-        // Calculating (scaleFactor % +-512), 512 = 2^9, using
-        // technique from "Hacker's Delight" section 10-2.
-        final int t = ((scaleFactor >> (9-1)) >>> (32-9));
-        exponentAdjust = ((scaleFactor + t) & (512-1)) - t;
-
-        value *= twoPowNormal(exponentAdjust);
-        scaleFactor -= exponentAdjust;
-
-        while (scaleFactor != 0) {
-            value *= exponentDelta;
-            scaleFactor -= scaleIncrement;
-        }
-
-        return value;
-    }
-
-    /*
-     * Non-redefined StrictMath public values and treatments.
-     */
-
-    public static float abs(float a) {
-        return StrictMath.abs(a);
-    }
-
-    public static double abs(double a) {
-        return StrictMath.abs(a);
-    }
-
-    public static float min(float a, float b) {
-        return StrictMath.min(a,b);
-    }
-
-    public static double min(double a, double b) {
-        return StrictMath.min(a,b);
-    }
-
-    public static float max(float a, float b) {
-        return StrictMath.max(a,b);
-    }
-
-    public static double max(double a, double b) {
-        return StrictMath.max(a,b);
-    }
-
-    public static double IEEEremainder(double f1, double f2) {
-        return StrictMath.IEEEremainder(f1,f2);
-    }
-
-    public static double random() {
-        return StrictMath.random();
-    }
-
-    //--------------------------------------------------------------------------
-    //  PRIVATE METHODS
-    //--------------------------------------------------------------------------
-
-    /**
-     * Non-instantiable.
-     */
-    private StrictFastMath() {
-    }
-
-    /*
-     * Remainders (accurate).
-     */
-
-    /**
-     * @param angle Angle in radians.
-     * @return Remainder of (angle % (2*PI)), in [-PI,PI].
-     */
-    private static double remainderTwoPi(double angle) {
-        if (USE_JDK_MATH) {
-            return jdkRemainderTwoPi(angle);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        if (angle <= (4*NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2)) {
-            double fn = (double)(int)(angle*TWOPI_INV+0.5);
-            angle = (angle - fn*TWOPI_HI) - fn*TWOPI_LO;
-            // Ensuring range.
-            // HI/LO can help a bit, even though we are always far from 0.
-            if (angle < -Math.PI) {
-                angle = (angle + TWOPI_HI) + TWOPI_LO;
-            } else if (angle > Math.PI) {
-                angle = (angle - TWOPI_HI) - TWOPI_LO;
-            }
-            return negateResult ? -angle : angle;
-        } else if (angle < Double.POSITIVE_INFINITY) {
-            angle = heavyRemainderTwoPi(angle);
-            return negateResult ? -angle : angle;
-        } else { // angle is +Infinity or NaN
-            return Double.NaN;
-        }
-    }
-
-    /**
-     * @param angle Angle in radians.
-     * @return Remainder of (angle % PI), in [-PI/2,PI/2].
-     */
-    private static double remainderPi(double angle) {
-        if (USE_JDK_MATH) {
-            return jdkRemainderPi(angle);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        if (angle <= (2*NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2)) {
-            double fn = (double)(int)(angle*PI_INV+0.5);
-            angle = (angle - fn*PI_HI) - fn*PI_LO;
-            // Ensuring range.
-            // HI/LO can help a bit, even though we are always far from 0.
-            if (angle < -Math.PI/2) {
-                angle = (angle + PI_HI) + PI_LO;
-            } else if (angle > Math.PI/2) {
-                angle = (angle - PI_HI) - PI_LO;
-            }
-            return negateResult ? -angle : angle;
-        } else if (angle < Double.POSITIVE_INFINITY) {
-            angle = heavyRemainderPi(angle);
-            return negateResult ? -angle : angle;
-        } else { // angle is +Infinity or NaN
-            return Double.NaN;
-        }
-    }
-
-    /**
-     * @param angle Angle in radians.
-     * @return Bits of double corresponding to remainder of (angle % (PI/2)),
-     *         in [-PI/4,PI/4], with quadrant encoded in exponent bits.
-     */
-    private static long remainderPiO2(double angle) {
-        if (USE_JDK_MATH) {
-            return jdkRemainderPiO2(angle, false);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        if (angle <= NORMALIZE_ANGLE_MAX_MEDIUM_DOUBLE_PIO2) {
-            int n = (int)(angle*PIO2_INV+0.5);
-            double fn = (double)n;
-            angle = (angle - fn*PIO2_HI) - fn*PIO2_LO;
-            // Ensuring range.
-            // HI/LO can help a bit, even though we are always far from 0.
-            if (angle < -Math.PI/4) {
-                angle = (angle + PIO2_HI) + PIO2_LO;
-                n--;
-            } else if (angle > Math.PI/4) {
-                angle = (angle - PIO2_HI) - PIO2_LO;
-                n++;
-            }
-            if (negateResult) {
-                angle = -angle;
-            }
-            return encodeRemainderAndQuadrant(angle, n&3);
-        } else if (angle < Double.POSITIVE_INFINITY) {
-            return heavyRemainderPiO2(angle, negateResult);
-        } else { // angle is +Infinity or NaN
-            return encodeRemainderAndQuadrant(Double.NaN, 0);
-        }
-    }
-
-    /*
-     * Remainders (fast).
-     */
-
-    /**
-     * Not accurate for large values.
-     *
-     * @param angle Angle in radians.
-     * @return Remainder of (angle % (2*PI)), in [-PI,PI].
-     */
-    private static double remainderTwoPiFast(double angle) {
-        if (USE_JDK_MATH) {
-            return jdkRemainderTwoPi(angle);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        // - We don't bother with values higher than (2*PI*(2^52)),
-        //   since they are spaced by 2*PI or more from each other.
-        // - For large values, we don't use % because it might be very slow,
-        //   and we split computation in two, because cast from double to int
-        //   with large numbers might be very slow also.
-        if (angle <= TWO_POW_26*(2*Math.PI)) {
-            // ok
-        } else if (angle <= TWO_POW_52*(2*Math.PI)) {
-            // Computing remainder of angle modulo TWO_POW_26*(2*PI).
-            double fn = (double)(int)(angle*(TWOPI_INV/TWO_POW_26)+0.5);
-            angle = (angle - fn*(TWOPI_HI*TWO_POW_26)) - fn*(TWOPI_LO*TWO_POW_26);
-            // Here, angle is in [-TWO_POW_26*PI,TWO_POW_26*PI], or so.
-            if (angle < 0.0) {
-                angle = -angle;
-                negateResult = !negateResult;
-            }
-        } else if (angle < Double.POSITIVE_INFINITY) {
-            return 0.0;
-        } else { // angle is +Infinity or NaN
-            return Double.NaN;
-        }
-
-        // Computing remainder of angle modulo 2*PI.
-        double fn = (double)(int)(angle*TWOPI_INV+0.5);
-        angle = (angle - fn*TWOPI_HI) - fn*TWOPI_LO;
-
-        // Ensuring range.
-        // HI/LO can help a bit, even though we are always far from 0.
-        if (angle < -Math.PI) {
-            angle = (angle + TWOPI_HI) + TWOPI_LO;
-        } else if (angle > Math.PI) {
-            angle = (angle - TWOPI_HI) - TWOPI_LO;
-        }
-        return negateResult ? -angle : angle;
-    }
-
-    /**
-     * Not accurate for large values.
-     *
-     * @param angle Angle in radians.
-     * @return Remainder of (angle % PI), in [-PI/2,PI/2].
-     */
-    private static double remainderPiFast(double angle) {
-        if (USE_JDK_MATH) {
-            return jdkRemainderPi(angle);
-        }
-        boolean negateResult = false;
-        if (angle < 0.0) {
-            angle = -angle;
-            negateResult = true;
-        }
-        // - We don't bother with values higher than (PI*(2^52)),
-        //   since they are spaced by PI or more from each other.
-        // - For large values, we don't use % because it might be very slow,
-        //   and we split computation in two, because cast from double to int
-        //   with large numbers might be very slow also.
-        if (angle <= TWO_POW_26*Math.PI) {
-            // ok
-        } else if (angle <= TWO_POW_52*Math.PI) {
-            // Computing remainder of angle modulo TWO_POW_26*PI.
-            double fn = (double)(int)(angle*(PI_INV/TWO_POW_26)+0.5);
-            angle = (angle - fn*(PI_HI*TWO_POW_26)) - fn*(PI_LO*TWO_POW_26);
-            // Here, angle is in [-TWO_POW_26*PI/2,TWO_POW_26*PI/2], or so.
-            if (angle < 0.0) {
-                angle = -angle;
-                negateResult = !negateResult;
-            }
-        } else if (angle < Double.POSITIVE_INFINITY) {
-            return 0.0;
-        } else { // angle is +Infinity or NaN
-            return Double.NaN;
-        }
-
-        // Computing remainder of angle modulo PI.
-        double fn = (double)(int)(angle*PI_INV+0.5);
-        angle = (angle - fn*PI_HI) - fn*PI_LO;
-
-        // Ensuring range.
-        // HI/LO can help a bit, even though we are always far from 0.
-        if (angle < -Math.PI/2) {
-            angle = (angle + PI_HI) + PI_LO;
-        } else if (angle > Math.PI/2) {
-            angle = (angle - PI_HI) - PI_LO;
-        }
-        return negateResult ? -angle : angle;
-    }
-}
-- 
2.34.1


From abb3d9fe5024f31d72354a38efeb3582b9357f46 Mon Sep 17 00:00:00 2001
From: therealansh <tyagiansh23@hotmail.com>
Date: Thu, 3 Jun 2021 10:17:13 +0530
Subject: [PATCH 285/713] add: Double using StrictMath

---
 .../kscience/kmath/jafama/KMathJafama.kt      | 103 +++++++++---------
 1 file changed, 53 insertions(+), 50 deletions(-)

diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
index 2557004e9..9d4341036 100644
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
@@ -4,56 +4,7 @@ import space.kscience.kmath.operations.*
 import net.jafama.*
 
 /**
- * Advanced Number-like semifield that implements basic operations.
- */
-public interface ExtendedFieldOperations<T> :
-    FieldOperations<T>,
-    TrigonometricOperations<T>,
-    PowerOperations<T>,
-    ExponentialOperations<T> {
-    public override fun tan(arg: T): T = sin(arg) / cos(arg)
-    public override fun tanh(arg: T): T = sinh(arg) / cosh(arg)
-
-    public override fun unaryOperationFunction(operation: String): (arg: T) -> T = when (operation) {
-        TrigonometricOperations.COS_OPERATION -> ::cos
-        TrigonometricOperations.SIN_OPERATION -> ::sin
-        TrigonometricOperations.TAN_OPERATION -> ::tan
-        TrigonometricOperations.ACOS_OPERATION -> ::acos
-        TrigonometricOperations.ASIN_OPERATION -> ::asin
-        TrigonometricOperations.ATAN_OPERATION -> ::atan
-        PowerOperations.SQRT_OPERATION -> ::sqrt
-        ExponentialOperations.EXP_OPERATION -> ::exp
-        ExponentialOperations.LN_OPERATION -> ::ln
-        ExponentialOperations.COSH_OPERATION -> ::cosh
-        ExponentialOperations.SINH_OPERATION -> ::sinh
-        ExponentialOperations.TANH_OPERATION -> ::tanh
-        ExponentialOperations.ACOSH_OPERATION -> ::acosh
-        ExponentialOperations.ASINH_OPERATION -> ::asinh
-        ExponentialOperations.ATANH_OPERATION -> ::atanh
-        else -> super<FieldOperations>.unaryOperationFunction(operation)
-    }
-}
-
-/**
- * Advanced Number-like field that implements basic operations.
- */
-public interface ExtendedField<T> : ExtendedFieldOperations<T>, Field<T>, NumericAlgebra<T>, ScaleOperations<T> {
-    public override fun sinh(arg: T): T = (exp(arg) - exp(-arg)) / 2.0
-    public override fun cosh(arg: T): T = (exp(arg) + exp(-arg)) / 2.0
-    public override fun tanh(arg: T): T = (exp(arg) - exp(-arg)) / (exp(-arg) + exp(arg))
-    public override fun asinh(arg: T): T = ln(sqrt(arg * arg + one) + arg)
-    public override fun acosh(arg: T): T = ln(arg + sqrt((arg - one) * (arg + one)))
-    public override fun atanh(arg: T): T = (ln(arg + one) - ln(one - arg)) / 2.0
-
-    public override fun rightSideNumberOperationFunction(operation: String): (left: T, right: Number) -> T =
-        when (operation) {
-            PowerOperations.POW_OPERATION -> ::power
-            else -> super<Field>.rightSideNumberOperationFunction(operation)
-        }
-}
-
-/**
- * A field for [Double] without boxing. Does not produce appropriate field element.
+ * A field for [Double] (using FastMath) without boxing. Does not produce appropriate field element.
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
@@ -101,3 +52,55 @@ public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, S
     public override inline fun Double.times(b: Double): Double = this * b
     public override inline fun Double.div(b: Double): Double = this / b
 }
+
+/**
+ * A field for [Double] (using StrictMath) without boxing. Does not produce appropriate field element.
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+public object StrictJafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
+    public override inline val zero: Double get() = 0.0
+    public override inline val one: Double get() = 1.0
+
+    public override fun number(value: Number): Double = value.toDouble()
+
+    public override fun binaryOperationFunction(operation: String): (left: Double, right: Double) -> Double =
+        when (operation) {
+            PowerOperations.POW_OPERATION -> ::power
+            else -> super<ExtendedField>.binaryOperationFunction(operation)
+        }
+
+    public override inline fun add(a: Double, b: Double): Double = a + b
+
+    public override inline fun multiply(a: Double, b: Double): Double = a * b
+    public override inline fun divide(a: Double, b: Double): Double = a / b
+
+    public override fun scale(a: Double, value: Double): Double = a * value
+
+    public override inline fun sin(arg: Double): Double = StrictFastMath.sin(arg)
+    public override inline fun cos(arg: Double): Double = StrictFastMath.cos(arg)
+    public override inline fun tan(arg: Double): Double = StrictFastMath.tan(arg)
+    public override inline fun acos(arg: Double): Double = StrictFastMath.acos(arg)
+    public override inline fun asin(arg: Double): Double = StrictFastMath.asin(arg)
+    public override inline fun atan(arg: Double): Double = StrictFastMath.atan(arg)
+
+    public override inline fun sinh(arg: Double): Double = StrictFastMath.sinh(arg)
+    public override inline fun cosh(arg: Double): Double = StrictFastMath.cosh(arg)
+    public override inline fun tanh(arg: Double): Double = StrictFastMath.tanh(arg)
+    public override inline fun asinh(arg: Double): Double = StrictFastMath.asinh(arg)
+    public override inline fun acosh(arg: Double): Double = StrictFastMath.acosh(arg)
+    public override inline fun atanh(arg: Double): Double = StrictFastMath.atanh(arg)
+
+    public override inline fun power(arg: Double, pow: Number): Double = StrictFastMath.pow(arg, pow.toDouble())
+    public override inline fun exp(arg: Double): Double = StrictFastMath.exp(arg)
+    public override inline fun ln(arg: Double): Double = StrictFastMath.log(arg)
+
+    public override inline fun norm(arg: Double): Double = StrictFastMath.abs(arg)
+
+    public override inline fun Double.unaryMinus(): Double = -this
+    public override inline fun Double.plus(b: Double): Double = this + b
+    public override inline fun Double.minus(b: Double): Double = this - b
+    public override inline fun Double.times(b: Double): Double = this * b
+    public override inline fun Double.div(b: Double): Double = this / b
+}
+
+
-- 
2.34.1


From 590910ac2dcb0028046442ad0b740328eaecd356 Mon Sep 17 00:00:00 2001
From: therealansh <tyagiansh23@hotmail.com>
Date: Sat, 5 Jun 2021 11:14:02 +0530
Subject: [PATCH 286/713] add: example and Readme

---
 README.md                                     |  6 +++++
 examples/build.gradle.kts                     |  2 ++
 .../kscience/kmath/jafama/KMathaJafamaDemo.kt | 17 +++++++++++++
 kmath-jafama/README.md                        | 24 +++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/jafama/KMathaJafamaDemo.kt
 create mode 100644 kmath-jafama/README.md

diff --git a/README.md b/README.md
index 7c6f7ea2b..90ab524e2 100644
--- a/README.md
+++ b/README.md
@@ -200,6 +200,12 @@ One can still use generic algebras though.
 > **Maturity**: PROTOTYPE
 <hr/>
 
+* ### [kmath-jafama](kmath-jafama)
+>
+>
+> **Maturity**: PROTOTYPE
+<hr/>
+
 * ### [kmath-jupyter](kmath-jupyter)
 > 
 >
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 568bde153..406b8f470 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -44,6 +44,8 @@ dependencies {
     implementation("org.slf4j:slf4j-simple:1.7.30")
     // plotting
     implementation("space.kscience:plotlykt-server:0.4.0")
+    //jafama
+    implementation(project(":kmath-jafama"))
 }
 
 kotlin.sourceSets.all {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/jafama/KMathaJafamaDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/jafama/KMathaJafamaDemo.kt
new file mode 100644
index 000000000..879aab08f
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/jafama/KMathaJafamaDemo.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.jafama
+
+import net.jafama.FastMath
+
+
+fun main(){
+    val a = JafamaDoubleField.number(2.0)
+    val b = StrictJafamaDoubleField.power(FastMath.E,a)
+
+    println(JafamaDoubleField.add(b,a))
+    println(StrictJafamaDoubleField.ln(b))
+}
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
new file mode 100644
index 000000000..fab777bf4
--- /dev/null
+++ b/kmath-jafama/README.md
@@ -0,0 +1,24 @@
+# Module kmath-jafama
+
+Jafama based implementation of DoubleField of kmath-operations.
+
+- JafamaDoubleField : DoubleField implementation using FastMath
+- StrictJafamaDoubleField - DoubleField implementation using StrictFastMath
+
+## Examples
+
+Different Operations on DoubleField
+
+```kotlin
+package space.kscience.kmath.jafama
+
+import net.jafama.FastMath
+
+
+fun main(){
+    val a = JafamaDoubleField.number(2.0)
+    val b = StrictJafamaDoubleField.power(FastMath.E,a)
+    println(JafamaDoubleField.add(b,a))
+    println(StrictJafamaDoubleField.ln(b))
+}
+```
-- 
2.34.1


From 9a9ebc730453735c5b6c0364d9fdbed1e92b3bc3 Mon Sep 17 00:00:00 2001
From: therealansh <tyagiansh23@hotmail.com>
Date: Tue, 8 Jun 2021 19:19:55 +0530
Subject: [PATCH 287/713] add: benchmarks for Jafama

---
 benchmarks/build.gradle.kts                   |   7 +-
 .../kmath/benchmarks/JafamaBenchmark.kt       |  48 ++++++++
 .../kscience/kmath/jafama/KMathJafama.kt      | 104 +++++++++---------
 3 files changed, 106 insertions(+), 53 deletions(-)
 create mode 100644 benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 98ffc5a96..182c182d9 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -30,6 +30,7 @@ kotlin {
                 implementation(project(":kmath-stat"))
                 implementation(project(":kmath-dimensions"))
                 implementation(project(":kmath-for-real"))
+                implementation(project(":kmath-jafama"))
                 implementation("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:0.3.0")
             }
         }
@@ -42,7 +43,6 @@ kotlin {
                 implementation(project(":kmath-kotlingrad"))
                 implementation(project(":kmath-viktor"))
                 implementation("org.nd4j:nd4j-native:1.0.0-beta7")
-
                 //    uncomment if your system supports AVX2
                 //    val os = System.getProperty("os.name")
                 //
@@ -95,6 +95,11 @@ benchmark {
         commonConfiguration()
         include("BigIntBenchmark")
     }
+
+    configurations.register("jafamaDouble") {
+        commonConfiguration()
+        include("JafamaBenchmark")
+    }
 }
 
 // Fix kotlinx-benchmarks bug
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
new file mode 100644
index 000000000..c828de82b
--- /dev/null
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.benchmarks
+
+import kotlinx.benchmark.Blackhole
+import org.openjdk.jmh.annotations.Benchmark
+import org.openjdk.jmh.annotations.Scope
+import org.openjdk.jmh.annotations.State
+import space.kscience.kmath.jafama.JafamaDoubleField
+import space.kscience.kmath.jafama.StrictJafamaDoubleField
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.invoke
+
+
+@State(Scope.Benchmark)
+internal class JafamaBenchmark {
+    @Benchmark
+    fun jafamaBench(blackhole: Blackhole) = invokeBenchmarks(jafama, blackhole)
+
+    @Benchmark
+    fun coreBench(blackhole: Blackhole) = invokeBenchmarks(core,blackhole)
+
+    @Benchmark
+    fun strictJafamaBench(blackhole: Blackhole) = invokeBenchmarks(strictJafama,blackhole)
+
+    private fun invokeBenchmarks(expr: Double, blackhole: Blackhole) {
+        blackhole.consume(expr)
+    }
+
+    private companion object {
+        private val x: Double = Double.MAX_VALUE
+
+        private val jafama = JafamaDoubleField{
+            x * power(x, 1_000_000) * exp(x) / cos(x)
+        }
+
+        private val core = DoubleField {
+            x * power(x, 1_000_000) * exp(x) / cos(x)
+        }
+
+        private val strictJafama = StrictJafamaDoubleField {
+            x * power(x, 1_000_000) * exp(x) / cos(x)
+        }
+    }
+}
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
index 9d4341036..f37d8e7b3 100644
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
@@ -8,8 +8,8 @@ import net.jafama.*
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
-    public override inline val zero: Double get() = 0.0
-    public override inline val one: Double get() = 1.0
+    public override val zero: Double get() = 0.0
+    public override val one: Double get() = 1.0
 
     public override fun number(value: Number): Double = value.toDouble()
 
@@ -19,38 +19,38 @@ public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, S
             else -> super<ExtendedField>.binaryOperationFunction(operation)
         }
 
-    public override inline fun add(a: Double, b: Double): Double = a + b
+    public override fun add(a: Double, b: Double): Double = a + b
 
-    public override inline fun multiply(a: Double, b: Double): Double = a * b
-    public override inline fun divide(a: Double, b: Double): Double = a / b
+    public override fun multiply(a: Double, b: Double): Double = a * b
+    public override fun divide(a: Double, b: Double): Double = a / b
 
     public override fun scale(a: Double, value: Double): Double = a * value
 
-    public override inline fun sin(arg: Double): Double = FastMath.sin(arg)
-    public override inline fun cos(arg: Double): Double = FastMath.cos(arg)
-    public override inline fun tan(arg: Double): Double = FastMath.tan(arg)
-    public override inline fun acos(arg: Double): Double = FastMath.acos(arg)
-    public override inline fun asin(arg: Double): Double = FastMath.asin(arg)
-    public override inline fun atan(arg: Double): Double = FastMath.atan(arg)
+    public override fun sin(arg: Double): Double = FastMath.sin(arg)
+    public override fun cos(arg: Double): Double = FastMath.cos(arg)
+    public override fun tan(arg: Double): Double = FastMath.tan(arg)
+    public override fun acos(arg: Double): Double = FastMath.acos(arg)
+    public override fun asin(arg: Double): Double = FastMath.asin(arg)
+    public override fun atan(arg: Double): Double = FastMath.atan(arg)
 
-    public override inline fun sinh(arg: Double): Double = FastMath.sinh(arg)
-    public override inline fun cosh(arg: Double): Double = FastMath.cosh(arg)
-    public override inline fun tanh(arg: Double): Double = FastMath.tanh(arg)
-    public override inline fun asinh(arg: Double): Double = FastMath.asinh(arg)
-    public override inline fun acosh(arg: Double): Double = FastMath.acosh(arg)
-    public override inline fun atanh(arg: Double): Double = FastMath.atanh(arg)
+    public override fun sinh(arg: Double): Double = FastMath.sinh(arg)
+    public override fun cosh(arg: Double): Double = FastMath.cosh(arg)
+    public override fun tanh(arg: Double): Double = FastMath.tanh(arg)
+    public override fun asinh(arg: Double): Double = FastMath.asinh(arg)
+    public override fun acosh(arg: Double): Double = FastMath.acosh(arg)
+    public override fun atanh(arg: Double): Double = FastMath.atanh(arg)
 
-    public override inline fun power(arg: Double, pow: Number): Double = FastMath.pow(arg, pow.toDouble())
-    public override inline fun exp(arg: Double): Double = FastMath.exp(arg)
-    public override inline fun ln(arg: Double): Double = FastMath.log(arg)
+    public override fun power(arg: Double, pow: Number): Double = FastMath.pow(arg, pow.toDouble())
+    public override fun exp(arg: Double): Double = FastMath.exp(arg)
+    public override fun ln(arg: Double): Double = FastMath.log(arg)
 
-    public override inline fun norm(arg: Double): Double = FastMath.abs(arg)
+    public override fun norm(arg: Double): Double = FastMath.abs(arg)
 
-    public override inline fun Double.unaryMinus(): Double = -this
-    public override inline fun Double.plus(b: Double): Double = this + b
-    public override inline fun Double.minus(b: Double): Double = this - b
-    public override inline fun Double.times(b: Double): Double = this * b
-    public override inline fun Double.div(b: Double): Double = this / b
+    public override fun Double.unaryMinus(): Double = -this
+    public override fun Double.plus(b: Double): Double = this + b
+    public override fun Double.minus(b: Double): Double = this - b
+    public override fun Double.times(b: Double): Double = this * b
+    public override fun Double.div(b: Double): Double = this / b
 }
 
 /**
@@ -58,8 +58,8 @@ public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, S
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object StrictJafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
-    public override inline val zero: Double get() = 0.0
-    public override inline val one: Double get() = 1.0
+    public override  val zero: Double get() = 0.0
+    public override  val one: Double get() = 1.0
 
     public override fun number(value: Number): Double = value.toDouble()
 
@@ -69,38 +69,38 @@ public object StrictJafamaDoubleField : ExtendedField<Double>, Norm<Double, Doub
             else -> super<ExtendedField>.binaryOperationFunction(operation)
         }
 
-    public override inline fun add(a: Double, b: Double): Double = a + b
+    public override fun add(a: Double, b: Double): Double = a + b
 
-    public override inline fun multiply(a: Double, b: Double): Double = a * b
-    public override inline fun divide(a: Double, b: Double): Double = a / b
+    public override fun multiply(a: Double, b: Double): Double = a * b
+    public override fun divide(a: Double, b: Double): Double = a / b
 
     public override fun scale(a: Double, value: Double): Double = a * value
 
-    public override inline fun sin(arg: Double): Double = StrictFastMath.sin(arg)
-    public override inline fun cos(arg: Double): Double = StrictFastMath.cos(arg)
-    public override inline fun tan(arg: Double): Double = StrictFastMath.tan(arg)
-    public override inline fun acos(arg: Double): Double = StrictFastMath.acos(arg)
-    public override inline fun asin(arg: Double): Double = StrictFastMath.asin(arg)
-    public override inline fun atan(arg: Double): Double = StrictFastMath.atan(arg)
+    public override fun sin(arg: Double): Double = StrictFastMath.sin(arg)
+    public override fun cos(arg: Double): Double = StrictFastMath.cos(arg)
+    public override fun tan(arg: Double): Double = StrictFastMath.tan(arg)
+    public override fun acos(arg: Double): Double = StrictFastMath.acos(arg)
+    public override fun asin(arg: Double): Double = StrictFastMath.asin(arg)
+    public override fun atan(arg: Double): Double = StrictFastMath.atan(arg)
 
-    public override inline fun sinh(arg: Double): Double = StrictFastMath.sinh(arg)
-    public override inline fun cosh(arg: Double): Double = StrictFastMath.cosh(arg)
-    public override inline fun tanh(arg: Double): Double = StrictFastMath.tanh(arg)
-    public override inline fun asinh(arg: Double): Double = StrictFastMath.asinh(arg)
-    public override inline fun acosh(arg: Double): Double = StrictFastMath.acosh(arg)
-    public override inline fun atanh(arg: Double): Double = StrictFastMath.atanh(arg)
+    public override fun sinh(arg: Double): Double = StrictFastMath.sinh(arg)
+    public override fun cosh(arg: Double): Double = StrictFastMath.cosh(arg)
+    public override fun tanh(arg: Double): Double = StrictFastMath.tanh(arg)
+    public override fun asinh(arg: Double): Double = StrictFastMath.asinh(arg)
+    public override fun acosh(arg: Double): Double = StrictFastMath.acosh(arg)
+    public override fun atanh(arg: Double): Double = StrictFastMath.atanh(arg)
 
-    public override inline fun power(arg: Double, pow: Number): Double = StrictFastMath.pow(arg, pow.toDouble())
-    public override inline fun exp(arg: Double): Double = StrictFastMath.exp(arg)
-    public override inline fun ln(arg: Double): Double = StrictFastMath.log(arg)
+    public override fun power(arg: Double, pow: Number): Double = StrictFastMath.pow(arg, pow.toDouble())
+    public override fun exp(arg: Double): Double = StrictFastMath.exp(arg)
+    public override fun ln(arg: Double): Double = StrictFastMath.log(arg)
 
-    public override inline fun norm(arg: Double): Double = StrictFastMath.abs(arg)
+    public override fun norm(arg: Double): Double = StrictFastMath.abs(arg)
 
-    public override inline fun Double.unaryMinus(): Double = -this
-    public override inline fun Double.plus(b: Double): Double = this + b
-    public override inline fun Double.minus(b: Double): Double = this - b
-    public override inline fun Double.times(b: Double): Double = this * b
-    public override inline fun Double.div(b: Double): Double = this / b
+    public override fun Double.unaryMinus(): Double = -this
+    public override fun Double.plus(b: Double): Double = this + b
+    public override fun Double.minus(b: Double): Double = this - b
+    public override fun Double.times(b: Double): Double = this * b
+    public override fun Double.div(b: Double): Double = this / b
 }
 
 
-- 
2.34.1


From b99d0b96d82289a738326b7b4a71df6064734519 Mon Sep 17 00:00:00 2001
From: therealansh <tyagiansh23@hotmail.com>
Date: Tue, 8 Jun 2021 19:28:34 +0530
Subject: [PATCH 288/713] add:benchmarks to readme

---
 kmath-jafama/README.md | 44 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index fab777bf4..bc5655a1e 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -22,3 +22,47 @@ fun main(){
     println(StrictJafamaDoubleField.ln(b))
 }
 ```
+
+## Benchmarks
+Comparing Operations on DoubleField and JafamaDoubleField 
+```bash
+jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.coreBench
+
+Warm-up 1: 242556635.528 ops/s
+Iteration 1: 236249893.335 ops/s
+Iteration 2: 294526940.968 ops/s
+Iteration 3: 295973752.533 ops/s
+Iteration 4: 296467676.763 ops/s
+Iteration 5: 295929441.421 ops/s
+
+283829541.004 ±(99.9%) 102456604.440 ops/s [Average]
+  (min, avg, max) = (236249893.335, 283829541.004, 296467676.763), stdev = 26607654.808
+  CI (99.9%): [181372936.564, 386286145.444] (assumes normal distribution)
+
+jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.jafamaBench
+
+Warm-up 1: 234737640.196 ops/s
+Iteration 1: 231689614.905 ops/s
+Iteration 2: 296629612.909 ops/s
+Iteration 3: 297456237.453 ops/s
+Iteration 4: 296754794.513 ops/s
+Iteration 5: 293722557.848 ops/s
+
+283250563.526 ±(99.9%) 111125582.233 ops/s [Average]
+  (min, avg, max) = (231689614.905, 283250563.526, 297456237.453), stdev = 28858960.811
+  CI (99.9%): [172124981.293, 394376145.759] (assumes normal distribution)
+
+jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafamaBench
+
+Warm-up 1: 234895701.589 ops/s
+Iteration 1: 236061284.195 ops/s
+Iteration 2: 296894799.416 ops/s
+Iteration 3: 286852020.677 ops/s
+Iteration 4: 284021863.614 ops/s
+Iteration 5: 284404358.656 ops/s
+
+277646865.312 ±(99.9%) 91748868.927 ops/s [Average]
+  (min, avg, max) = (236061284.195, 277646865.312, 296894799.416), stdev = 23826889.899
+  CI (99.9%): [185897996.385, 369395734.239] (assumes normal distribution)
+
+```
-- 
2.34.1


From 03be37bb4f6843a8fb08b3c44256df4f6bbdb15f Mon Sep 17 00:00:00 2001
From: therealansh <tyagiansh23@hotmail.com>
Date: Sat, 12 Jun 2021 10:00:36 +0530
Subject: [PATCH 289/713] add: kotlin math benchmarks

---
 .../kmath/benchmarks/JafamaBenchmark.kt       |  8 +++
 kmath-jafama/README.md                        | 68 +++++++++++--------
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
index c828de82b..e998054fb 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
@@ -13,6 +13,9 @@ import space.kscience.kmath.jafama.JafamaDoubleField
 import space.kscience.kmath.jafama.StrictJafamaDoubleField
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
+import kotlin.math.cos
+import kotlin.math.exp
+import kotlin.math.pow
 
 
 @State(Scope.Benchmark)
@@ -26,6 +29,9 @@ internal class JafamaBenchmark {
     @Benchmark
     fun strictJafamaBench(blackhole: Blackhole) = invokeBenchmarks(strictJafama,blackhole)
 
+    @Benchmark
+    fun kotlinMathBench(blackhole: Blackhole) = invokeBenchmarks(kotlinMath, blackhole)
+
     private fun invokeBenchmarks(expr: Double, blackhole: Blackhole) {
         blackhole.consume(expr)
     }
@@ -37,6 +43,8 @@ internal class JafamaBenchmark {
             x * power(x, 1_000_000) * exp(x) / cos(x)
         }
 
+        private val kotlinMath = x * x.pow(1_000_000) * exp(x) / cos(x)
+
         private val core = DoubleField {
             x * power(x, 1_000_000) * exp(x) / cos(x)
         }
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index bc5655a1e..d170f6591 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -28,41 +28,53 @@ Comparing Operations on DoubleField and JafamaDoubleField
 ```bash
 jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.coreBench
 
-Warm-up 1: 242556635.528 ops/s
-Iteration 1: 236249893.335 ops/s
-Iteration 2: 294526940.968 ops/s
-Iteration 3: 295973752.533 ops/s
-Iteration 4: 296467676.763 ops/s
-Iteration 5: 295929441.421 ops/s
+Warm-up 1: 384414358.081 ops/s
+Iteration 1: 374827571.951 ops/s
+Iteration 2: 479335182.332 ops/s
+Iteration 3: 475483069.577 ops/s
+Iteration 4: 478235949.414 ops/s
+Iteration 5: 472256385.114 ops/s
 
-283829541.004 ±(99.9%) 102456604.440 ops/s [Average]
-  (min, avg, max) = (236249893.335, 283829541.004, 296467676.763), stdev = 26607654.808
-  CI (99.9%): [181372936.564, 386286145.444] (assumes normal distribution)
+456027631.678 ±(99.9%) 175106815.384 ops/s [Average]
+  (min, avg, max) = (374827571.951, 456027631.678, 479335182.332), stdev = 45474683.880
+  CI (99.9%): [280920816.294, 631134447.061] (assumes normal distribution)
 
 jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.jafamaBench
 
-Warm-up 1: 234737640.196 ops/s
-Iteration 1: 231689614.905 ops/s
-Iteration 2: 296629612.909 ops/s
-Iteration 3: 297456237.453 ops/s
-Iteration 4: 296754794.513 ops/s
-Iteration 5: 293722557.848 ops/s
+Warm-up 1: 359418665.041 ops/s
+Iteration 1: 335704885.798 ops/s
+Iteration 2: 427684801.542 ops/s
+Iteration 3: 452193034.265 ops/s
+Iteration 4: 433855064.931 ops/s
+Iteration 5: 453863386.566 ops/s
 
-283250563.526 ±(99.9%) 111125582.233 ops/s [Average]
-  (min, avg, max) = (231689614.905, 283250563.526, 297456237.453), stdev = 28858960.811
-  CI (99.9%): [172124981.293, 394376145.759] (assumes normal distribution)
+420660234.620 ±(99.9%) 188028426.875 ops/s [Average]
+  (min, avg, max) = (335704885.798, 420660234.620, 453863386.566), stdev = 48830385.349
+  CI (99.9%): [232631807.746, 608688661.495] (assumes normal distribution)
+
+jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.kotlinMathBench
+
+Warm-up 1: 371570418.113 ops/s
+Iteration 1: 379281146.127 ops/s
+Iteration 2: 465234403.109 ops/s
+Iteration 3: 470621634.240 ops/s
+Iteration 4: 467074553.006 ops/s
+Iteration 5: 466424840.144 ops/s
+
+449727315.325 ±(99.9%) 151837475.500 ops/s [Average]
+  (min, avg, max) = (379281146.127, 449727315.325, 470621634.240), stdev = 39431710.207
+  CI (99.9%): [297889839.825, 601564790.825] (assumes normal distribution)
 
 jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafamaBench
 
-Warm-up 1: 234895701.589 ops/s
-Iteration 1: 236061284.195 ops/s
-Iteration 2: 296894799.416 ops/s
-Iteration 3: 286852020.677 ops/s
-Iteration 4: 284021863.614 ops/s
-Iteration 5: 284404358.656 ops/s
-
-277646865.312 ±(99.9%) 91748868.927 ops/s [Average]
-  (min, avg, max) = (236061284.195, 277646865.312, 296894799.416), stdev = 23826889.899
-  CI (99.9%): [185897996.385, 369395734.239] (assumes normal distribution)
+Warm-up 1: 371241281.065 ops/s
+Iteration 1: 374490259.387 ops/s
+Iteration 2: 464995837.424 ops/s
+Iteration 3: 469788706.385 ops/s
+Iteration 4: 469528470.682 ops/s
+Iteration 5: 456727921.978 ops/s
 
+447106239.171 ±(99.9%) 157629035.980 ops/s [Average]
+  (min, avg, max) = (374490259.387, 447106239.171, 469788706.385), stdev = 40935760.071
+  CI (99.9%): [289477203.192, 604735275.151] (assumes normal distribution)
 ```
-- 
2.34.1


From 4d6428a3082c4c1b775cc1e70e35b42032e5ad49 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Mon, 14 Jun 2021 21:51:06 +0700
Subject: [PATCH 290/713] Update Jafama module documentation with some minor
 code amendments

---
 README.md                                     |   8 +-
 benchmarks/build.gradle.kts                   |   1 +
 .../kmath/benchmarks/JafamaBenchmark.kt       |  45 ++---
 kmath-ast/build.gradle.kts                    |   7 +-
 .../kmath/ast/TestCompilerOperations.kt       |   1 -
 .../kscience/kmath/operations/numbers.kt      |   6 +-
 kmath-functions/build.gradle.kts              |   5 +-
 kmath-jafama/README.md                        | 178 ++++++++++++------
 kmath-jafama/build.gradle.kts                 |   7 +
 kmath-jafama/docs/README-TEMPLATE.md          | 118 ++++++++++++
 .../kscience/kmath/jafama/KMathJafama.kt      | 124 ++++++------
 11 files changed, 341 insertions(+), 159 deletions(-)
 create mode 100644 kmath-jafama/docs/README-TEMPLATE.md

diff --git a/README.md b/README.md
index 90ab524e2..015988cd3 100644
--- a/README.md
+++ b/README.md
@@ -175,7 +175,7 @@ One can still use generic algebras though.
 <hr/>
 
 * ### [kmath-functions](kmath-functions)
-> Functions, integration and interpolation
+> 
 >
 > **Maturity**: EXPERIMENTAL
 >
@@ -201,9 +201,13 @@ One can still use generic algebras though.
 <hr/>
 
 * ### [kmath-jafama](kmath-jafama)
->
+> 
 >
 > **Maturity**: PROTOTYPE
+>
+> **Features:**
+> - [jafama-double](kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/) : Double ExtendedField implementations based on Jafama
+
 <hr/>
 
 * ### [kmath-jupyter](kmath-jupyter)
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 182c182d9..f171437d3 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -12,6 +12,7 @@ repositories {
     maven("https://repo.kotlin.link")
     maven("https://clojars.org/repo")
     maven("https://jitpack.io")
+
     maven("http://logicrunch.research.it.uu.se/maven") {
         isAllowInsecureProtocol = true
     }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
index e998054fb..260eea2b6 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
@@ -13,44 +13,27 @@ import space.kscience.kmath.jafama.JafamaDoubleField
 import space.kscience.kmath.jafama.StrictJafamaDoubleField
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
-import kotlin.math.cos
-import kotlin.math.exp
-import kotlin.math.pow
-
+import kotlin.random.Random
 
 @State(Scope.Benchmark)
 internal class JafamaBenchmark {
     @Benchmark
-    fun jafamaBench(blackhole: Blackhole) = invokeBenchmarks(jafama, blackhole)
-
-    @Benchmark
-    fun coreBench(blackhole: Blackhole) = invokeBenchmarks(core,blackhole)
-
-    @Benchmark
-    fun strictJafamaBench(blackhole: Blackhole) = invokeBenchmarks(strictJafama,blackhole)
-
-    @Benchmark
-    fun kotlinMathBench(blackhole: Blackhole) = invokeBenchmarks(kotlinMath, blackhole)
-
-    private fun invokeBenchmarks(expr: Double, blackhole: Blackhole) {
-        blackhole.consume(expr)
+    fun jafamaBench(blackhole: Blackhole) = invokeBenchmarks(blackhole) { x ->
+        JafamaDoubleField { x * power(x, 4) * exp(x) / cos(x) + sin(x) }
     }
 
-    private companion object {
-        private val x: Double = Double.MAX_VALUE
+    @Benchmark
+    fun coreBench(blackhole: Blackhole) = invokeBenchmarks(blackhole) { x ->
+        DoubleField { x * power(x, 4) * exp(x) / cos(x) + sin(x) }
+    }
 
-        private val jafama = JafamaDoubleField{
-            x * power(x, 1_000_000) * exp(x) / cos(x)
-        }
+    @Benchmark
+    fun strictJafamaBench(blackhole: Blackhole) = invokeBenchmarks(blackhole) { x ->
+        StrictJafamaDoubleField { x * power(x, 4) * exp(x) / cos(x) + sin(x) }
+    }
 
-        private val kotlinMath = x * x.pow(1_000_000) * exp(x) / cos(x)
-
-        private val core = DoubleField {
-            x * power(x, 1_000_000) * exp(x) / cos(x)
-        }
-
-        private val strictJafama = StrictJafamaDoubleField {
-            x * power(x, 1_000_000) * exp(x) / cos(x)
-        }
+    private inline fun invokeBenchmarks(blackhole: Blackhole, expr: (Double) -> Double) {
+        val rng = Random(0)
+        repeat(1000000) { blackhole.consume(expr(rng.nextDouble())) }
     }
 }
diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index 508374d82..89647c9e9 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -37,10 +37,9 @@ kotlin.sourceSets {
 
     jsMain {
         dependencies {
-            implementation(npm("astring", "1.7.4"))
-            implementation(npm("binaryen", "100.0"))
-            implementation(npm("js-base64", "3.6.0"))
-            implementation(npm("webassembly", "0.11.0"))
+            implementation(npm("astring", "1.7.5"))
+            implementation(npm("binaryen", "101.0.0"))
+            implementation(npm("js-base64", "3.6.1"))
         }
     }
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
index f869efd62..929d17775 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
@@ -9,7 +9,6 @@ import space.kscience.kmath.expressions.MstExtendedField
 import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.invoke
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index 0d6d9e98d..36c13d6ec 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -64,7 +64,7 @@ public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOp
     public override inline val zero: Double get() = 0.0
     public override inline val one: Double get() = 1.0
 
-    public override fun number(value: Number): Double = value.toDouble()
+    public override inline fun number(value: Number): Double = value.toDouble()
 
     public override fun binaryOperationFunction(operation: String): (left: Double, right: Double) -> Double =
         when (operation) {
@@ -77,7 +77,7 @@ public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOp
     public override inline fun multiply(a: Double, b: Double): Double = a * b
     public override inline fun divide(a: Double, b: Double): Double = a / b
 
-    public override fun scale(a: Double, value: Double): Double = a * value
+    public override inline fun scale(a: Double, value: Double): Double = a * value
 
     public override inline fun sin(arg: Double): Double = kotlin.math.sin(arg)
     public override inline fun cos(arg: Double): Double = kotlin.math.cos(arg)
@@ -93,6 +93,7 @@ public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOp
     public override inline fun acosh(arg: Double): Double = kotlin.math.acosh(arg)
     public override inline fun atanh(arg: Double): Double = kotlin.math.atanh(arg)
 
+    public override inline fun sqrt(arg: Double): Double = kotlin.math.sqrt(arg)
     public override inline fun power(arg: Double, pow: Number): Double = arg.kpow(pow.toDouble())
     public override inline fun exp(arg: Double): Double = kotlin.math.exp(arg)
     public override inline fun ln(arg: Double): Double = kotlin.math.ln(arg)
@@ -143,6 +144,7 @@ public object FloatField : ExtendedField<Float>, Norm<Float, Float> {
     public override inline fun acosh(arg: Float): Float = kotlin.math.acosh(arg)
     public override inline fun atanh(arg: Float): Float = kotlin.math.atanh(arg)
 
+    public override inline fun sqrt(arg: Float): Float = kotlin.math.sqrt(arg)
     public override inline fun power(arg: Float, pow: Number): Float = arg.kpow(pow.toFloat())
     public override inline fun exp(arg: Float): Float = kotlin.math.exp(arg)
     public override inline fun ln(arg: Float): Float = kotlin.math.ln(arg)
diff --git a/kmath-functions/build.gradle.kts b/kmath-functions/build.gradle.kts
index 622b8f8da..f77df3833 100644
--- a/kmath-functions/build.gradle.kts
+++ b/kmath-functions/build.gradle.kts
@@ -3,6 +3,8 @@ plugins {
     id("ru.mipt.npm.gradle.common")
 }
 
+description = "Functions, integration and interpolation"
+
 kotlin.sourceSets.commonMain {
     dependencies {
         api(project(":kmath-core"))
@@ -10,7 +12,6 @@ kotlin.sourceSets.commonMain {
 }
 
 readme {
-    description = "Functions, integration and interpolation"
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
@@ -29,4 +30,4 @@ readme {
     feature("integration") {
         "Univariate and multivariate quadratures"
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index d170f6591..9b439c5c2 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -1,80 +1,144 @@
 # Module kmath-jafama
 
-Jafama based implementation of DoubleField of kmath-operations.
+Integration with [Jafama](https://github.com/jeffhain/jafama).
 
-- JafamaDoubleField : DoubleField implementation using FastMath
-- StrictJafamaDoubleField - DoubleField implementation using StrictFastMath
+ - [jafama-double](src/main/kotlin/space/kscience/kmath/jafama/) : Double ExtendedField implementations based on Jafama
 
-## Examples
 
-Different Operations on DoubleField
+## Artifact:
 
+The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0-dev-13`.
+
+**Gradle:**
+```gradle
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-jafama:0.3.0-dev-13'
+}
+```
+**Gradle Kotlin DSL:**
 ```kotlin
-package space.kscience.kmath.jafama
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
 
-import net.jafama.FastMath
-
-
-fun main(){
-    val a = JafamaDoubleField.number(2.0)
-    val b = StrictJafamaDoubleField.power(FastMath.E,a)
-    println(JafamaDoubleField.add(b,a))
-    println(StrictJafamaDoubleField.ln(b))
+dependencies {
+    implementation("space.kscience:kmath-jafama:0.3.0-dev-13")
 }
 ```
 
-## Benchmarks
-Comparing Operations on DoubleField and JafamaDoubleField 
-```bash
+## Example usage
+
+All the `DoubleField` uses can be replaced with `JafamaDoubleField` or `StrictJafamaDoubleField`.
+
+```kotlin
+import space.kscience.kmath.jafama.*
+import space.kscience.kmath.operations.*
+
+fun main() {
+    val a = 2.0
+    val b = StrictJafamaDoubleField { exp(a) }
+    println(JafamaDoubleField { b + a })
+    println(StrictJafamaDoubleField { ln(b) })
+}
+```
+
+## Performance
+
+According to benchmarking data, on Hotspot Jafama functions are 20% faster than JDK math. On GraalVM, they are slower.
+
+<details>
+<summary>Raw data:</summary>
+
+**Hotspot**
+
+```
 jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.coreBench
 
-Warm-up 1: 384414358.081 ops/s
-Iteration 1: 374827571.951 ops/s
-Iteration 2: 479335182.332 ops/s
-Iteration 3: 475483069.577 ops/s
-Iteration 4: 478235949.414 ops/s
-Iteration 5: 472256385.114 ops/s
+Warm-up 1: 11.447 ops/s
+Iteration 1: 13.354 ops/s
+Iteration 2: 14.237 ops/s
+Iteration 3: 14.708 ops/s
+Iteration 4: 14.629 ops/s
+Iteration 5: 14.692 ops/s
 
-456027631.678 ±(99.9%) 175106815.384 ops/s [Average]
-  (min, avg, max) = (374827571.951, 456027631.678, 479335182.332), stdev = 45474683.880
-  CI (99.9%): [280920816.294, 631134447.061] (assumes normal distribution)
+14.324 ±(99.9%) 2.217 ops/s [Average]
+  (min, avg, max) = (13.354, 14.324, 14.708), stdev = 0.576
+  CI (99.9%): [12.107, 16.541] (assumes normal distribution)
 
 jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.jafamaBench
 
-Warm-up 1: 359418665.041 ops/s
-Iteration 1: 335704885.798 ops/s
-Iteration 2: 427684801.542 ops/s
-Iteration 3: 452193034.265 ops/s
-Iteration 4: 433855064.931 ops/s
-Iteration 5: 453863386.566 ops/s
+Warm-up 1: 15.628 ops/s
+Iteration 1: 15.991 ops/s
+Iteration 2: 16.633 ops/s
+Iteration 3: 16.583 ops/s
+Iteration 4: 16.716 ops/s
+Iteration 5: 16.762 ops/s
 
-420660234.620 ±(99.9%) 188028426.875 ops/s [Average]
-  (min, avg, max) = (335704885.798, 420660234.620, 453863386.566), stdev = 48830385.349
-  CI (99.9%): [232631807.746, 608688661.495] (assumes normal distribution)
-
-jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.kotlinMathBench
-
-Warm-up 1: 371570418.113 ops/s
-Iteration 1: 379281146.127 ops/s
-Iteration 2: 465234403.109 ops/s
-Iteration 3: 470621634.240 ops/s
-Iteration 4: 467074553.006 ops/s
-Iteration 5: 466424840.144 ops/s
-
-449727315.325 ±(99.9%) 151837475.500 ops/s [Average]
-  (min, avg, max) = (379281146.127, 449727315.325, 470621634.240), stdev = 39431710.207
-  CI (99.9%): [297889839.825, 601564790.825] (assumes normal distribution)
+16.537 ±(99.9%) 1.205 ops/s [Average]
+  (min, avg, max) = (15.991, 16.537, 16.762), stdev = 0.313
+  CI (99.9%): [15.332, 17.743] (assumes normal distribution)
 
 jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafamaBench
 
-Warm-up 1: 371241281.065 ops/s
-Iteration 1: 374490259.387 ops/s
-Iteration 2: 464995837.424 ops/s
-Iteration 3: 469788706.385 ops/s
-Iteration 4: 469528470.682 ops/s
-Iteration 5: 456727921.978 ops/s
+Warm-up 1: 13.378 ops/s
+Iteration 1: 15.049 ops/s
+Iteration 2: 14.468 ops/s
+Iteration 3: 14.469 ops/s
+Iteration 4: 14.753 ops/s
+Iteration 5: 14.958 ops/s
 
-447106239.171 ±(99.9%) 157629035.980 ops/s [Average]
-  (min, avg, max) = (374490259.387, 447106239.171, 469788706.385), stdev = 40935760.071
-  CI (99.9%): [289477203.192, 604735275.151] (assumes normal distribution)
+14.739 ±(99.9%) 1.038 ops/s [Average]
+  (min, avg, max) = (14.468, 14.739, 15.049), stdev = 0.269
+  CI (99.9%): [13.701, 15.777] (assumes normal distribution)
 ```
+
+**GraalVM**
+
+```
+jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.coreBench
+
+Warm-up 1: 14.357 ops/s
+Iteration 1: 14.768 ops/s
+Iteration 2: 14.922 ops/s
+Iteration 3: 14.966 ops/s
+Iteration 4: 14.805 ops/s
+Iteration 5: 14.520 ops/s
+
+14.796 ±(99.9%) 0.671 ops/s [Average]
+  (min, avg, max) = (14.520, 14.796, 14.966), stdev = 0.174
+  CI (99.9%): [14.125, 15.468] (assumes normal distribution)
+
+jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.jafamaBench
+
+Warm-up 1: 11.592 ops/s
+Iteration 1: 12.174 ops/s
+Iteration 2: 11.734 ops/s
+Iteration 3: 11.939 ops/s
+Iteration 4: 12.026 ops/s
+Iteration 5: 12.221 ops/s
+
+12.019 ±(99.9%) 0.752 ops/s [Average]
+  (min, avg, max) = (11.734, 12.019, 12.221), stdev = 0.195
+  CI (99.9%): [11.267, 12.771] (assumes normal distribution)
+
+jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafamaBench
+
+Warm-up 1: 12.097 ops/s
+Iteration 1: 13.072 ops/s
+Iteration 2: 13.112 ops/s
+Iteration 3: 13.103 ops/s
+Iteration 4: 12.950 ops/s
+Iteration 5: 13.011 ops/s
+
+13.049 ±(99.9%) 0.263 ops/s [Average]
+  (min, avg, max) = (12.950, 13.049, 13.112), stdev = 0.068
+  CI (99.9%): [12.787, 13.312] (assumes normal distribution)
+```
+
+</details>
diff --git a/kmath-jafama/build.gradle.kts b/kmath-jafama/build.gradle.kts
index f31f2602f..9cf328d0b 100644
--- a/kmath-jafama/build.gradle.kts
+++ b/kmath-jafama/build.gradle.kts
@@ -2,6 +2,8 @@ plugins {
     id("ru.mipt.npm.gradle.jvm")
 }
 
+description = "Jafama integration module"
+
 dependencies {
     api(project(":kmath-core"))
     api("net.jafama:jafama:2.3.2")
@@ -13,6 +15,11 @@ repositories {
 
 readme {
     maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
+
+    feature("jafama-double", "src/main/kotlin/space/kscience/kmath/jafama/") {
+        "Double ExtendedField implementations based on Jafama"
+    }
 }
 
 kotlin.sourceSets.all {
diff --git a/kmath-jafama/docs/README-TEMPLATE.md b/kmath-jafama/docs/README-TEMPLATE.md
new file mode 100644
index 000000000..fa58f7697
--- /dev/null
+++ b/kmath-jafama/docs/README-TEMPLATE.md
@@ -0,0 +1,118 @@
+# Module kmath-jafama
+
+Integration with [Jafama](https://github.com/jeffhain/jafama).
+
+${features}
+
+${artifact}
+
+## Example usage
+
+All the `DoubleField` uses can be replaced with `JafamaDoubleField` or `StrictJafamaDoubleField`.
+
+```kotlin
+import space.kscience.kmath.jafama.*
+import space.kscience.kmath.operations.*
+
+fun main() {
+    val a = 2.0
+    val b = StrictJafamaDoubleField { exp(a) }
+    println(JafamaDoubleField { b + a })
+    println(StrictJafamaDoubleField { ln(b) })
+}
+```
+
+## Performance
+
+According to benchmarking data, on Hotspot Jafama functions are 20% faster than JDK math. On GraalVM, they are slower.
+
+<details>
+<summary>Raw data:</summary>
+
+**Hotspot**
+
+```
+jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.coreBench
+
+Warm-up 1: 11.447 ops/s
+Iteration 1: 13.354 ops/s
+Iteration 2: 14.237 ops/s
+Iteration 3: 14.708 ops/s
+Iteration 4: 14.629 ops/s
+Iteration 5: 14.692 ops/s
+
+14.324 ±(99.9%) 2.217 ops/s [Average]
+  (min, avg, max) = (13.354, 14.324, 14.708), stdev = 0.576
+  CI (99.9%): [12.107, 16.541] (assumes normal distribution)
+
+jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.jafamaBench
+
+Warm-up 1: 15.628 ops/s
+Iteration 1: 15.991 ops/s
+Iteration 2: 16.633 ops/s
+Iteration 3: 16.583 ops/s
+Iteration 4: 16.716 ops/s
+Iteration 5: 16.762 ops/s
+
+16.537 ±(99.9%) 1.205 ops/s [Average]
+  (min, avg, max) = (15.991, 16.537, 16.762), stdev = 0.313
+  CI (99.9%): [15.332, 17.743] (assumes normal distribution)
+
+jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafamaBench
+
+Warm-up 1: 13.378 ops/s
+Iteration 1: 15.049 ops/s
+Iteration 2: 14.468 ops/s
+Iteration 3: 14.469 ops/s
+Iteration 4: 14.753 ops/s
+Iteration 5: 14.958 ops/s
+
+14.739 ±(99.9%) 1.038 ops/s [Average]
+  (min, avg, max) = (14.468, 14.739, 15.049), stdev = 0.269
+  CI (99.9%): [13.701, 15.777] (assumes normal distribution)
+```
+
+**GraalVM**
+
+```
+jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.coreBench
+
+Warm-up 1: 14.357 ops/s
+Iteration 1: 14.768 ops/s
+Iteration 2: 14.922 ops/s
+Iteration 3: 14.966 ops/s
+Iteration 4: 14.805 ops/s
+Iteration 5: 14.520 ops/s
+
+14.796 ±(99.9%) 0.671 ops/s [Average]
+  (min, avg, max) = (14.520, 14.796, 14.966), stdev = 0.174
+  CI (99.9%): [14.125, 15.468] (assumes normal distribution)
+
+jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.jafamaBench
+
+Warm-up 1: 11.592 ops/s
+Iteration 1: 12.174 ops/s
+Iteration 2: 11.734 ops/s
+Iteration 3: 11.939 ops/s
+Iteration 4: 12.026 ops/s
+Iteration 5: 12.221 ops/s
+
+12.019 ±(99.9%) 0.752 ops/s [Average]
+  (min, avg, max) = (11.734, 12.019, 12.221), stdev = 0.195
+  CI (99.9%): [11.267, 12.771] (assumes normal distribution)
+
+jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafamaBench
+
+Warm-up 1: 12.097 ops/s
+Iteration 1: 13.072 ops/s
+Iteration 2: 13.112 ops/s
+Iteration 3: 13.103 ops/s
+Iteration 4: 12.950 ops/s
+Iteration 5: 13.011 ops/s
+
+13.049 ±(99.9%) 0.263 ops/s [Average]
+  (min, avg, max) = (12.950, 13.049, 13.112), stdev = 0.068
+  CI (99.9%): [12.787, 13.312] (assumes normal distribution)
+```
+
+</details>
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
index f37d8e7b3..cf6f9471d 100644
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
@@ -1,17 +1,21 @@
 package space.kscience.kmath.jafama
 
-import space.kscience.kmath.operations.*
-import net.jafama.*
+import net.jafama.FastMath
+import net.jafama.StrictFastMath
+import space.kscience.kmath.operations.ExtendedField
+import space.kscience.kmath.operations.Norm
+import space.kscience.kmath.operations.PowerOperations
+import space.kscience.kmath.operations.ScaleOperations
 
 /**
  * A field for [Double] (using FastMath) without boxing. Does not produce appropriate field element.
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
-    public override val zero: Double get() = 0.0
-    public override val one: Double get() = 1.0
+    public override inline val zero: Double get() = 0.0
+    public override inline val one: Double get() = 1.0
 
-    public override fun number(value: Number): Double = value.toDouble()
+    public override inline fun number(value: Number): Double = value.toDouble()
 
     public override fun binaryOperationFunction(operation: String): (left: Double, right: Double) -> Double =
         when (operation) {
@@ -19,38 +23,39 @@ public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, S
             else -> super<ExtendedField>.binaryOperationFunction(operation)
         }
 
-    public override fun add(a: Double, b: Double): Double = a + b
+    public override inline fun add(a: Double, b: Double): Double = a + b
 
-    public override fun multiply(a: Double, b: Double): Double = a * b
-    public override fun divide(a: Double, b: Double): Double = a / b
+    public override inline fun multiply(a: Double, b: Double): Double = a * b
+    public override inline fun divide(a: Double, b: Double): Double = a / b
 
-    public override fun scale(a: Double, value: Double): Double = a * value
+    public override inline fun scale(a: Double, value: Double): Double = a * value
 
-    public override fun sin(arg: Double): Double = FastMath.sin(arg)
-    public override fun cos(arg: Double): Double = FastMath.cos(arg)
-    public override fun tan(arg: Double): Double = FastMath.tan(arg)
-    public override fun acos(arg: Double): Double = FastMath.acos(arg)
-    public override fun asin(arg: Double): Double = FastMath.asin(arg)
-    public override fun atan(arg: Double): Double = FastMath.atan(arg)
+    public override inline fun sin(arg: Double): Double = FastMath.sin(arg)
+    public override inline fun cos(arg: Double): Double = FastMath.cos(arg)
+    public override inline fun tan(arg: Double): Double = FastMath.tan(arg)
+    public override inline fun acos(arg: Double): Double = FastMath.acos(arg)
+    public override inline fun asin(arg: Double): Double = FastMath.asin(arg)
+    public override inline fun atan(arg: Double): Double = FastMath.atan(arg)
 
-    public override fun sinh(arg: Double): Double = FastMath.sinh(arg)
-    public override fun cosh(arg: Double): Double = FastMath.cosh(arg)
-    public override fun tanh(arg: Double): Double = FastMath.tanh(arg)
-    public override fun asinh(arg: Double): Double = FastMath.asinh(arg)
-    public override fun acosh(arg: Double): Double = FastMath.acosh(arg)
-    public override fun atanh(arg: Double): Double = FastMath.atanh(arg)
+    public override inline fun sinh(arg: Double): Double = FastMath.sinh(arg)
+    public override inline fun cosh(arg: Double): Double = FastMath.cosh(arg)
+    public override inline fun tanh(arg: Double): Double = FastMath.tanh(arg)
+    public override inline fun asinh(arg: Double): Double = FastMath.asinh(arg)
+    public override inline fun acosh(arg: Double): Double = FastMath.acosh(arg)
+    public override inline fun atanh(arg: Double): Double = FastMath.atanh(arg)
 
-    public override fun power(arg: Double, pow: Number): Double = FastMath.pow(arg, pow.toDouble())
-    public override fun exp(arg: Double): Double = FastMath.exp(arg)
-    public override fun ln(arg: Double): Double = FastMath.log(arg)
+    public override inline fun sqrt(arg: Double): Double = FastMath.sqrt(arg)
+    public override inline fun power(arg: Double, pow: Number): Double = FastMath.pow(arg, pow.toDouble())
+    public override inline fun exp(arg: Double): Double = FastMath.exp(arg)
+    public override inline fun ln(arg: Double): Double = FastMath.log(arg)
 
-    public override fun norm(arg: Double): Double = FastMath.abs(arg)
+    public override inline fun norm(arg: Double): Double = FastMath.abs(arg)
 
-    public override fun Double.unaryMinus(): Double = -this
-    public override fun Double.plus(b: Double): Double = this + b
-    public override fun Double.minus(b: Double): Double = this - b
-    public override fun Double.times(b: Double): Double = this * b
-    public override fun Double.div(b: Double): Double = this / b
+    public override inline fun Double.unaryMinus(): Double = -this
+    public override inline fun Double.plus(b: Double): Double = this + b
+    public override inline fun Double.minus(b: Double): Double = this - b
+    public override inline fun Double.times(b: Double): Double = this * b
+    public override inline fun Double.div(b: Double): Double = this / b
 }
 
 /**
@@ -58,10 +63,10 @@ public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, S
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object StrictJafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
-    public override  val zero: Double get() = 0.0
-    public override  val one: Double get() = 1.0
+    public override inline val zero: Double get() = 0.0
+    public override inline val one: Double get() = 1.0
 
-    public override fun number(value: Number): Double = value.toDouble()
+    public override inline fun number(value: Number): Double = value.toDouble()
 
     public override fun binaryOperationFunction(operation: String): (left: Double, right: Double) -> Double =
         when (operation) {
@@ -69,38 +74,37 @@ public object StrictJafamaDoubleField : ExtendedField<Double>, Norm<Double, Doub
             else -> super<ExtendedField>.binaryOperationFunction(operation)
         }
 
-    public override fun add(a: Double, b: Double): Double = a + b
+    public override inline fun add(a: Double, b: Double): Double = a + b
 
-    public override fun multiply(a: Double, b: Double): Double = a * b
-    public override fun divide(a: Double, b: Double): Double = a / b
+    public override inline fun multiply(a: Double, b: Double): Double = a * b
+    public override inline fun divide(a: Double, b: Double): Double = a / b
 
-    public override fun scale(a: Double, value: Double): Double = a * value
+    public override inline fun scale(a: Double, value: Double): Double = a * value
 
-    public override fun sin(arg: Double): Double = StrictFastMath.sin(arg)
-    public override fun cos(arg: Double): Double = StrictFastMath.cos(arg)
-    public override fun tan(arg: Double): Double = StrictFastMath.tan(arg)
-    public override fun acos(arg: Double): Double = StrictFastMath.acos(arg)
-    public override fun asin(arg: Double): Double = StrictFastMath.asin(arg)
-    public override fun atan(arg: Double): Double = StrictFastMath.atan(arg)
+    public override inline fun sin(arg: Double): Double = StrictFastMath.sin(arg)
+    public override inline fun cos(arg: Double): Double = StrictFastMath.cos(arg)
+    public override inline fun tan(arg: Double): Double = StrictFastMath.tan(arg)
+    public override inline fun acos(arg: Double): Double = StrictFastMath.acos(arg)
+    public override inline fun asin(arg: Double): Double = StrictFastMath.asin(arg)
+    public override inline fun atan(arg: Double): Double = StrictFastMath.atan(arg)
 
-    public override fun sinh(arg: Double): Double = StrictFastMath.sinh(arg)
-    public override fun cosh(arg: Double): Double = StrictFastMath.cosh(arg)
-    public override fun tanh(arg: Double): Double = StrictFastMath.tanh(arg)
-    public override fun asinh(arg: Double): Double = StrictFastMath.asinh(arg)
-    public override fun acosh(arg: Double): Double = StrictFastMath.acosh(arg)
-    public override fun atanh(arg: Double): Double = StrictFastMath.atanh(arg)
+    public override inline fun sinh(arg: Double): Double = StrictFastMath.sinh(arg)
+    public override inline fun cosh(arg: Double): Double = StrictFastMath.cosh(arg)
+    public override inline fun tanh(arg: Double): Double = StrictFastMath.tanh(arg)
+    public override inline fun asinh(arg: Double): Double = StrictFastMath.asinh(arg)
+    public override inline fun acosh(arg: Double): Double = StrictFastMath.acosh(arg)
+    public override inline fun atanh(arg: Double): Double = StrictFastMath.atanh(arg)
 
-    public override fun power(arg: Double, pow: Number): Double = StrictFastMath.pow(arg, pow.toDouble())
-    public override fun exp(arg: Double): Double = StrictFastMath.exp(arg)
-    public override fun ln(arg: Double): Double = StrictFastMath.log(arg)
+    public override inline fun sqrt(arg: Double): Double = StrictFastMath.sqrt(arg)
+    public override inline fun power(arg: Double, pow: Number): Double = StrictFastMath.pow(arg, pow.toDouble())
+    public override inline fun exp(arg: Double): Double = StrictFastMath.exp(arg)
+    public override inline fun ln(arg: Double): Double = StrictFastMath.log(arg)
 
-    public override fun norm(arg: Double): Double = StrictFastMath.abs(arg)
+    public override inline fun norm(arg: Double): Double = StrictFastMath.abs(arg)
 
-    public override fun Double.unaryMinus(): Double = -this
-    public override fun Double.plus(b: Double): Double = this + b
-    public override fun Double.minus(b: Double): Double = this - b
-    public override fun Double.times(b: Double): Double = this * b
-    public override fun Double.div(b: Double): Double = this / b
+    public override inline fun Double.unaryMinus(): Double = -this
+    public override inline fun Double.plus(b: Double): Double = this + b
+    public override inline fun Double.minus(b: Double): Double = this - b
+    public override inline fun Double.times(b: Double): Double = this * b
+    public override inline fun Double.div(b: Double): Double = this / b
 }
-
-
-- 
2.34.1


From 45f158817551cf277688d42c3cdb8994f6401023 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 15 Jun 2021 13:18:40 +0700
Subject: [PATCH 291/713] Generated benchmarking reports

---
 benchmarks/build.gradle.kts                   |   8 +-
 .../kmath/benchmarks/JafamaBenchmark.kt       |   6 +-
 buildSrc/build.gradle.kts                     |  16 ++-
 .../kscience/kmath/benchmarks/JmhReport.kt    |  60 ++++++++++
 .../benchmarks/addBenchmarkProperties.kt      | 105 ++++++++++++++++++
 kmath-ast/build.gradle.kts                    |  12 +-
 kmath-jafama/README.md                        |  97 +++-------------
 kmath-jafama/docs/README-TEMPLATE.md          |  93 +---------------
 settings.gradle.kts                           |   2 +-
 9 files changed, 210 insertions(+), 189 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
 create mode 100644 buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index f171437d3..2198ac5d6 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -1,3 +1,7 @@
+@file:Suppress("UNUSED_VARIABLE")
+
+import space.kscience.kmath.benchmarks.addBenchmarkProperties
+
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.allopen")
@@ -32,7 +36,7 @@ kotlin {
                 implementation(project(":kmath-dimensions"))
                 implementation(project(":kmath-for-real"))
                 implementation(project(":kmath-jafama"))
-                implementation("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:0.3.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:0.3.1")
             }
         }
 
@@ -130,3 +134,5 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
 readme {
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
 }
+
+addBenchmarkProperties()
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
index 260eea2b6..24a730375 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
@@ -18,17 +18,17 @@ import kotlin.random.Random
 @State(Scope.Benchmark)
 internal class JafamaBenchmark {
     @Benchmark
-    fun jafamaBench(blackhole: Blackhole) = invokeBenchmarks(blackhole) { x ->
+    fun jafama(blackhole: Blackhole) = invokeBenchmarks(blackhole) { x ->
         JafamaDoubleField { x * power(x, 4) * exp(x) / cos(x) + sin(x) }
     }
 
     @Benchmark
-    fun coreBench(blackhole: Blackhole) = invokeBenchmarks(blackhole) { x ->
+    fun core(blackhole: Blackhole) = invokeBenchmarks(blackhole) { x ->
         DoubleField { x * power(x, 4) * exp(x) / cos(x) + sin(x) }
     }
 
     @Benchmark
-    fun strictJafamaBench(blackhole: Blackhole) = invokeBenchmarks(blackhole) { x ->
+    fun strictJafama(blackhole: Blackhole) = invokeBenchmarks(blackhole) { x ->
         StrictJafamaDoubleField { x * power(x, 4) * exp(x) / cos(x) + sin(x) }
     }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 7ca4df19d..8ff1c4369 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,5 +1,19 @@
 plugins {
     `kotlin-dsl`
+    kotlin("plugin.serialization") version "1.4.31"
 }
 
-repositories.mavenCentral()
+repositories {
+    gradlePluginPortal()
+    mavenCentral()
+}
+
+dependencies {
+    api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
+    api("ru.mipt.npm:gradle-tools:0.9.10")
+    api("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.3.1")
+}
+
+kotlin.sourceSets.all {
+    languageSettings.useExperimentalAnnotation("kotlin.ExperimentalStdlibApi")
+}
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
new file mode 100644
index 000000000..eaa0f59d8
--- /dev/null
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.benchmarks
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class JmhReport(
+    val jmhVersion: String,
+    val benchmark: String,
+    val mode: String,
+    val threads: Int,
+    val forks: Int,
+    val jvm: String,
+    val jvmArgs: List<String>,
+    val jdkVersion: String,
+    val vmName: String,
+    val vmVersion: String,
+    val warmupIterations: Int,
+    val warmupTime: String,
+    val warmupBatchSize: Int,
+    val measurementIterations: Int,
+    val measurementTime: String,
+    val measurementBatchSize: Int,
+    val params: Map<String, String> = emptyMap(),
+    val primaryMetric: PrimaryMetric,
+    val secondaryMetrics: Map<String, SecondaryMetric>,
+) {
+    interface Metric {
+        val score: Double
+        val scoreError: Double
+        val scoreConfidence: List<Double>
+        val scorePercentiles: Map<Double, Double>
+        val scoreUnit: String
+    }
+
+    @Serializable
+    data class PrimaryMetric(
+        override val score: Double,
+        override val scoreError: Double,
+        override val scoreConfidence: List<Double>,
+        override val scorePercentiles: Map<Double, Double>,
+        override val scoreUnit: String,
+        val rawDataHistogram: List<List<List<List<Double>>>>? = null,
+        val rawData: List<List<Double>>? = null,
+    ) : Metric
+
+    @Serializable
+    data class SecondaryMetric(
+        override val score: Double,
+        override val scoreError: Double,
+        override val scoreConfidence: List<Double>,
+        override val scorePercentiles: Map<Double, Double>,
+        override val scoreUnit: String,
+        val rawData: List<List<Double>>,
+    ) : Metric
+}
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
new file mode 100644
index 000000000..31d952157
--- /dev/null
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.benchmarks
+
+import kotlinx.serialization.*
+import org.gradle.api.Project
+import java.time.*
+import java.time.format.*
+import java.time.temporal.ChronoField.*
+
+private val ISO_DATE_TIME: DateTimeFormatter = DateTimeFormatterBuilder().run {
+    parseCaseInsensitive()
+    appendValue(YEAR, 4, 10, SignStyle.EXCEEDS_PAD)
+    appendLiteral('-')
+    appendValue(MONTH_OF_YEAR, 2)
+    appendLiteral('-')
+    appendValue(DAY_OF_MONTH, 2)
+    appendLiteral('T')
+    appendValue(HOUR_OF_DAY, 2)
+    appendLiteral('.')
+    appendValue(MINUTE_OF_HOUR, 2)
+    optionalStart()
+    appendLiteral('.')
+    appendValue(SECOND_OF_MINUTE, 2)
+    optionalStart()
+    appendFraction(NANO_OF_SECOND, 0, 9, true)
+    optionalStart()
+    appendOffsetId()
+    optionalStart()
+    appendLiteral('[')
+    parseCaseSensitive()
+    appendZoneRegionId()
+    appendLiteral(']')
+    toFormatter()
+}
+
+private fun noun(number: Number, singular: String, plural: String) = if (number.toLong() == 1L) singular else plural
+
+fun Project.addBenchmarkProperties() {
+    val benchmarksProject = this
+    rootProject.subprojects.forEach { p ->
+        p.extensions.findByType(ru.mipt.npm.gradle.KScienceReadmeExtension::class.java)?.run {
+            benchmarksProject.extensions.findByType(kotlinx.benchmark.gradle.BenchmarksExtension::class.java)?.configurations?.forEach { cfg ->
+                // TODO remove this hack when https://github.com/mipt-npm/gradle-tools/pull/15 is merged
+                @Suppress("UNCHECKED_CAST")
+                (javaClass.getDeclaredField("properties")
+                    .also {
+                        it.isAccessible = true
+                    }[this] as MutableMap<String, () -> Any?>)["benchmark${cfg.name.replaceFirstChar(Char::uppercase)}"] =
+                    {
+                        val launches = benchmarksProject.buildDir.resolve("reports/benchmarks/${cfg.name}")
+
+                        val resDirectory = launches.listFiles()?.maxByOrNull {
+                            LocalDateTime.parse(it.name, ISO_DATE_TIME).atZone(ZoneId.systemDefault()).toInstant()
+                        }
+
+                        if (resDirectory == null) {
+                            "> **Can't find appropriate benchmark data. Try generating readme files after running benchmarks**."
+                        } else {
+                            val reports =
+                                kotlinx.serialization.json.Json.decodeFromString<List<JmhReport>>(
+                                    resDirectory.resolve("jvm.json").readText()
+                                )
+
+                            buildString {
+                                appendLine("<details>")
+                                appendLine("<summary>")
+                                appendLine("Report for benchmark configuration <code>${cfg.name}</code>")
+                                appendLine("</summary>")
+                                appendLine()
+                                val first = reports.first()
+
+                                appendLine("* Run on ${first.vmName} (build ${first.vmVersion}) with Java process:")
+                                appendLine()
+                                appendLine("```")
+                                appendLine("${first.jvm} ${
+                                    first.jvmArgs.joinToString(" ")
+                                }")
+                                appendLine("```")
+
+                                appendLine("* JMH ${first.jmhVersion} was used in `${first.mode}` mode with ${first.warmupIterations} warmup ${
+                                    noun(first.warmupIterations, "iteration", "iterations")
+                                } by ${first.warmupTime} and ${first.measurementIterations} measurement ${
+                                    noun(first.measurementIterations, "iteration", "iterations")
+                                } by ${first.measurementTime}.")
+
+                                appendLine()
+                                appendLine("| Benchmark | Score |")
+                                appendLine("|:---------:|:-----:|")
+
+                                reports.forEach { report ->
+                                    appendLine("|`${report.benchmark}`|${report.primaryMetric.score} &plusmn; ${report.primaryMetric.scoreError} ${report.primaryMetric.scoreUnit}|")
+                                }
+
+                                appendLine("</details>")
+                            }
+                        }
+                    }
+            }
+        }
+    }
+}
diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index 89647c9e9..8209a0dad 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -62,25 +62,21 @@ readme {
 
     feature(
         id = "expression-language",
-        description = "Expression language and its parser",
         ref = "src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt"
-    )
+    ) { "Expression language and its parser" }
 
     feature(
         id = "mst-jvm-codegen",
-        description = "Dynamic MST to JVM bytecode compiler",
         ref = "src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt"
-    )
+    ) { "Dynamic MST to JVM bytecode compiler" }
 
     feature(
         id = "mst-js-codegen",
-        description = "Dynamic MST to JS compiler",
         ref = "src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt"
-    )
+    ) { "Dynamic MST to JS compiler" }
 
     feature(
         id = "rendering",
-        description = "Extendable MST rendering",
         ref = "src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt"
-    )
+    ) { "Extendable MST rendering" }
 }
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index 9b439c5c2..ef8fcd352 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -50,95 +50,24 @@ fun main() {
 
 ## Performance
 
-According to benchmarking data, on Hotspot Jafama functions are 20% faster than JDK math. On GraalVM, they are slower.
+According to KMath benchmarks on GraalVM, Jafama functions are slower than JDK math; however, there are indications that on Hotspot Jafama is a bit faster.
 
 <details>
-<summary>Raw data:</summary>
+<summary>
+Report for benchmark configuration <code>jafamaDouble</code>
+</summary>
 
-**Hotspot**
+* Run on OpenJDK 64-Bit Server VM (build 11.0.11+8-jvmci-21.1-b05) with Java process:
 
 ```
-jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.coreBench
-
-Warm-up 1: 11.447 ops/s
-Iteration 1: 13.354 ops/s
-Iteration 2: 14.237 ops/s
-Iteration 3: 14.708 ops/s
-Iteration 4: 14.629 ops/s
-Iteration 5: 14.692 ops/s
-
-14.324 ±(99.9%) 2.217 ops/s [Average]
-  (min, avg, max) = (13.354, 14.324, 14.708), stdev = 0.576
-  CI (99.9%): [12.107, 16.541] (assumes normal distribution)
-
-jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.jafamaBench
-
-Warm-up 1: 15.628 ops/s
-Iteration 1: 15.991 ops/s
-Iteration 2: 16.633 ops/s
-Iteration 3: 16.583 ops/s
-Iteration 4: 16.716 ops/s
-Iteration 5: 16.762 ops/s
-
-16.537 ±(99.9%) 1.205 ops/s [Average]
-  (min, avg, max) = (15.991, 16.537, 16.762), stdev = 0.313
-  CI (99.9%): [15.332, 17.743] (assumes normal distribution)
-
-jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafamaBench
-
-Warm-up 1: 13.378 ops/s
-Iteration 1: 15.049 ops/s
-Iteration 2: 14.468 ops/s
-Iteration 3: 14.469 ops/s
-Iteration 4: 14.753 ops/s
-Iteration 5: 14.958 ops/s
-
-14.739 ±(99.9%) 1.038 ops/s [Average]
-  (min, avg, max) = (14.468, 14.739, 15.049), stdev = 0.269
-  CI (99.9%): [13.701, 15.777] (assumes normal distribution)
-```
-
-**GraalVM**
-
-```
-jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.coreBench
-
-Warm-up 1: 14.357 ops/s
-Iteration 1: 14.768 ops/s
-Iteration 2: 14.922 ops/s
-Iteration 3: 14.966 ops/s
-Iteration 4: 14.805 ops/s
-Iteration 5: 14.520 ops/s
-
-14.796 ±(99.9%) 0.671 ops/s [Average]
-  (min, avg, max) = (14.520, 14.796, 14.966), stdev = 0.174
-  CI (99.9%): [14.125, 15.468] (assumes normal distribution)
-
-jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.jafamaBench
-
-Warm-up 1: 11.592 ops/s
-Iteration 1: 12.174 ops/s
-Iteration 2: 11.734 ops/s
-Iteration 3: 11.939 ops/s
-Iteration 4: 12.026 ops/s
-Iteration 5: 12.221 ops/s
-
-12.019 ±(99.9%) 0.752 ops/s [Average]
-  (min, avg, max) = (11.734, 12.019, 12.221), stdev = 0.195
-  CI (99.9%): [11.267, 12.771] (assumes normal distribution)
-
-jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafamaBench
-
-Warm-up 1: 12.097 ops/s
-Iteration 1: 13.072 ops/s
-Iteration 2: 13.112 ops/s
-Iteration 3: 13.103 ops/s
-Iteration 4: 12.950 ops/s
-Iteration 5: 13.011 ops/s
-
-13.049 ±(99.9%) 0.263 ops/s [Average]
-  (min, avg, max) = (12.950, 13.049, 13.112), stdev = 0.068
-  CI (99.9%): [12.787, 13.312] (assumes normal distribution)
+/home/commandertvis/graalvm-ce-java11/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCIProduct -XX:-UnlockExperimentalVMOptions -XX:ThreadPriorityPolicy=1 -javaagent:/home/commandertvis/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.5.0/d8cebccdcddd029022aa8646a5a953ff88b13ac8/kotlinx-coroutines-core-jvm-1.5.0.jar -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -ea
 ```
+* JMH 1.21 was used in `thrpt` mode with 1 warmup iteration by 1000 ms and 5 measurement iterations by 1000 ms.
 
+| Benchmark | Score |
+|:---------:|:-----:|
+|`space.kscience.kmath.benchmarks.JafamaBenchmark.core`|14.296120859512893 &plusmn; 0.36462633435888736 ops/s|
+|`space.kscience.kmath.benchmarks.JafamaBenchmark.jafama`|11.431566395649781 &plusmn; 2.570896777898243 ops/s|
+|`space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafama`|11.746020495694117 &plusmn; 6.205909559197869 ops/s|
 </details>
+
diff --git a/kmath-jafama/docs/README-TEMPLATE.md b/kmath-jafama/docs/README-TEMPLATE.md
index fa58f7697..54348467b 100644
--- a/kmath-jafama/docs/README-TEMPLATE.md
+++ b/kmath-jafama/docs/README-TEMPLATE.md
@@ -24,95 +24,6 @@ fun main() {
 
 ## Performance
 
-According to benchmarking data, on Hotspot Jafama functions are 20% faster than JDK math. On GraalVM, they are slower.
+According to KMath benchmarks on GraalVM, Jafama functions are slower than JDK math; however, there are indications that on Hotspot Jafama is a bit faster.
 
-<details>
-<summary>Raw data:</summary>
-
-**Hotspot**
-
-```
-jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.coreBench
-
-Warm-up 1: 11.447 ops/s
-Iteration 1: 13.354 ops/s
-Iteration 2: 14.237 ops/s
-Iteration 3: 14.708 ops/s
-Iteration 4: 14.629 ops/s
-Iteration 5: 14.692 ops/s
-
-14.324 ±(99.9%) 2.217 ops/s [Average]
-  (min, avg, max) = (13.354, 14.324, 14.708), stdev = 0.576
-  CI (99.9%): [12.107, 16.541] (assumes normal distribution)
-
-jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.jafamaBench
-
-Warm-up 1: 15.628 ops/s
-Iteration 1: 15.991 ops/s
-Iteration 2: 16.633 ops/s
-Iteration 3: 16.583 ops/s
-Iteration 4: 16.716 ops/s
-Iteration 5: 16.762 ops/s
-
-16.537 ±(99.9%) 1.205 ops/s [Average]
-  (min, avg, max) = (15.991, 16.537, 16.762), stdev = 0.313
-  CI (99.9%): [15.332, 17.743] (assumes normal distribution)
-
-jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafamaBench
-
-Warm-up 1: 13.378 ops/s
-Iteration 1: 15.049 ops/s
-Iteration 2: 14.468 ops/s
-Iteration 3: 14.469 ops/s
-Iteration 4: 14.753 ops/s
-Iteration 5: 14.958 ops/s
-
-14.739 ±(99.9%) 1.038 ops/s [Average]
-  (min, avg, max) = (14.468, 14.739, 15.049), stdev = 0.269
-  CI (99.9%): [13.701, 15.777] (assumes normal distribution)
-```
-
-**GraalVM**
-
-```
-jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.coreBench
-
-Warm-up 1: 14.357 ops/s
-Iteration 1: 14.768 ops/s
-Iteration 2: 14.922 ops/s
-Iteration 3: 14.966 ops/s
-Iteration 4: 14.805 ops/s
-Iteration 5: 14.520 ops/s
-
-14.796 ±(99.9%) 0.671 ops/s [Average]
-  (min, avg, max) = (14.520, 14.796, 14.966), stdev = 0.174
-  CI (99.9%): [14.125, 15.468] (assumes normal distribution)
-
-jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.jafamaBench
-
-Warm-up 1: 11.592 ops/s
-Iteration 1: 12.174 ops/s
-Iteration 2: 11.734 ops/s
-Iteration 3: 11.939 ops/s
-Iteration 4: 12.026 ops/s
-Iteration 5: 12.221 ops/s
-
-12.019 ±(99.9%) 0.752 ops/s [Average]
-  (min, avg, max) = (11.734, 12.019, 12.221), stdev = 0.195
-  CI (99.9%): [11.267, 12.771] (assumes normal distribution)
-
-jvm: space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafamaBench
-
-Warm-up 1: 12.097 ops/s
-Iteration 1: 13.072 ops/s
-Iteration 2: 13.112 ops/s
-Iteration 3: 13.103 ops/s
-Iteration 4: 12.950 ops/s
-Iteration 5: 13.011 ops/s
-
-13.049 ±(99.9%) 0.263 ops/s [Average]
-  (min, avg, max) = (12.950, 13.049, 13.112), stdev = 0.068
-  CI (99.9%): [12.787, 13.312] (assumes normal distribution)
-```
-
-</details>
+${benchmarkJafamaDouble}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 15a6a176c..710017588 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
         gradlePluginPortal()
     }
 
-    val toolsVersion = "0.9.9"
+    val toolsVersion = "0.9.10"
     val kotlinVersion = "1.5.0"
 
     plugins {
-- 
2.34.1


From 94c58b7749e5e4ea69d167cda4ea282fa3d9077f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 15 Jun 2021 13:45:08 +0300
Subject: [PATCH 292/713] Fix Univariate histogram filling

---
 CHANGELOG.md                                  |  1 +
 build.gradle.kts                              |  2 +-
 .../kmath/histogram/TreeHistogramSpace.kt     | 89 ++++++++++---------
 .../kmath/histogram/UnivariateHistogram.kt    |  6 +-
 .../kmath/histogram/TreeHistogramTest.kt      | 24 +++++
 5 files changed, 77 insertions(+), 45 deletions(-)
 create mode 100644 kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f7b6b529..12540821e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@
 
 ### Fixed
 - Ring inherits RingOperations, not GroupOperations
+- Univariate histogram filling
 
 ### Security
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 86394d792..9978281f2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-13"
+    version = "0.3.0-dev-14"
 }
 
 subprojects {
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
index 6ae8b5ee3..8d05df68a 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
@@ -35,51 +35,56 @@ public class TreeHistogram(
     override val bins: Collection<UnivariateBin> get() = binMap.values
 }
 
+@OptIn(UnstableKMathAPI::class)
+private class TreeHistogramBuilder(val binFactory: (Double) -> UnivariateDomain) : UnivariateHistogramBuilder {
+
+    private class BinCounter(val domain: UnivariateDomain, val counter: Counter<Double> = Counter.real()) :
+        ClosedFloatingPointRange<Double> by domain.range
+
+    private val bins: TreeMap<Double, BinCounter> = TreeMap()
+
+    fun get(value: Double): BinCounter? = bins.getBin(value)
+
+    fun createBin(value: Double): BinCounter {
+        val binDefinition = binFactory(value)
+        val newBin = BinCounter(binDefinition)
+        synchronized(this) { bins[binDefinition.center] = newBin }
+        return newBin
+    }
+
+    /**
+     * Thread safe put operation
+     */
+    override fun putValue(at: Double, value: Double) {
+        (get(at) ?: createBin(at)).apply {
+            counter.add(value)
+        }
+    }
+
+    override fun putValue(point: Buffer<Double>, value: Number) {
+        require(point.size == 1) { "Only points with single value could be used in univariate histogram" }
+        putValue(point[0], value.toDouble())
+    }
+
+    fun build(): TreeHistogram {
+        val map = bins.mapValuesTo(TreeMap<Double, UnivariateBin>()) { (_, binCounter) ->
+            val count = binCounter.counter.value
+            UnivariateBin(binCounter.domain, count, sqrt(count))
+        }
+        return TreeHistogram(map)
+    }
+}
+
 /**
  * A space for univariate histograms with variable bin borders based on a tree map
  */
 @UnstableKMathAPI
 public class TreeHistogramSpace(
-    public val binFactory: (Double) -> UnivariateDomain,
+    private val binFactory: (Double) -> UnivariateDomain,
 ) : Group<UnivariateHistogram>, ScaleOperations<UnivariateHistogram> {
 
-    private class BinCounter(val domain: UnivariateDomain, val counter: Counter<Double> = Counter.real()) :
-        ClosedFloatingPointRange<Double> by domain.range
-
-    public fun produce(builder: UnivariateHistogramBuilder.() -> Unit): UnivariateHistogram {
-        val bins: TreeMap<Double, BinCounter> = TreeMap()
-        val hBuilder = object : UnivariateHistogramBuilder {
-
-            fun get(value: Double): BinCounter? = bins.getBin(value)
-
-            fun createBin(value: Double): BinCounter {
-                val binDefinition = binFactory(value)
-                val newBin = BinCounter(binDefinition)
-                synchronized(this) { bins[binDefinition.center] = newBin }
-                return newBin
-            }
-
-            /**
-             * Thread safe put operation
-             */
-            override fun putValue(at: Double, value: Double) {
-                (get(at) ?: createBin(at)).apply {
-                    counter.add(value)
-                }
-            }
-
-            override fun putValue(point: Buffer<Double>, value: Number) {
-                put(point[0], value.toDouble())
-            }
-        }
-        hBuilder.apply(builder)
-        val resBins = TreeMap<Double, UnivariateBin>()
-        bins.forEach { (key, binCounter) ->
-            val count = binCounter.counter.value
-            resBins[key] = UnivariateBin(binCounter.domain, count, sqrt(count))
-        }
-        return TreeHistogram(resBins)
-    }
+    public fun fill(block: UnivariateHistogramBuilder.() -> Unit): UnivariateHistogram =
+        TreeHistogramBuilder(binFactory).apply(block).build()
 
     override fun add(
         a: UnivariateHistogram,
@@ -89,7 +94,8 @@ public class TreeHistogramSpace(
 //        require(b.context == this) { "Histogram $b does not belong to this context" }
         val bins = TreeMap<Double, UnivariateBin>().apply {
             (a.bins.map { it.domain } union b.bins.map { it.domain }).forEach { def ->
-                put(def.center,
+                put(
+                    def.center,
                     UnivariateBin(
                         def,
                         value = (a[def.center]?.value ?: 0.0) + (b[def.center]?.value ?: 0.0),
@@ -105,7 +111,8 @@ public class TreeHistogramSpace(
     override fun scale(a: UnivariateHistogram, value: Double): UnivariateHistogram {
         val bins = TreeMap<Double, UnivariateBin>().apply {
             a.bins.forEach { bin ->
-                put(bin.domain.center,
+                put(
+                    bin.domain.center,
                     UnivariateBin(
                         bin.domain,
                         value = bin.value * value.toDouble(),
@@ -120,7 +127,7 @@ public class TreeHistogramSpace(
 
     override fun UnivariateHistogram.unaryMinus(): UnivariateHistogram = this * (-1)
 
-    override val zero: UnivariateHistogram = produce { }
+    override val zero: UnivariateHistogram by lazy { fill { } }
 
     public companion object {
         /**
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
index 70125e22e..0ad96ad46 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
@@ -13,7 +13,7 @@ import space.kscience.kmath.structures.asSequence
 
 @UnstableKMathAPI
 public val UnivariateDomain.center: Double
-    get() = (range.endInclusive - range.start) / 2
+    get() = (range.endInclusive + range.start) / 2
 
 /**
  * A univariate bin based an a range
@@ -45,7 +45,7 @@ public interface UnivariateHistogram : Histogram<Double, UnivariateBin>{
             binSize: Double,
             start: Double = 0.0,
             builder: UnivariateHistogramBuilder.() -> Unit,
-        ): UnivariateHistogram = TreeHistogramSpace.uniform(binSize, start).produce(builder)
+        ): UnivariateHistogram = TreeHistogramSpace.uniform(binSize, start).fill(builder)
 
         /**
          * Build and fill a histogram with custom borders. Returns a read-only histogram.
@@ -53,7 +53,7 @@ public interface UnivariateHistogram : Histogram<Double, UnivariateBin>{
         public fun custom(
             borders: DoubleArray,
             builder: UnivariateHistogramBuilder.() -> Unit,
-        ): UnivariateHistogram = TreeHistogramSpace.custom(borders).produce(builder)
+        ): UnivariateHistogram = TreeHistogramSpace.custom(borders).fill(builder)
 
     }
 }
diff --git a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
new file mode 100644
index 000000000..28a1b03cb
--- /dev/null
+++ b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.histogram
+
+import org.junit.jupiter.api.Test
+import kotlin.random.Random
+import kotlin.test.assertTrue
+
+class TreeHistogramTest {
+
+    @Test
+    fun normalFill() {
+        val histogram = UnivariateHistogram.uniform(0.1) {
+            repeat(100_000) {
+                putValue(Random.nextDouble())
+            }
+        }
+
+        assertTrue { histogram.bins.count() > 10 }
+    }
+}
\ No newline at end of file
-- 
2.34.1


From 5d5f84ad55e65af19c8b4a8daa549ba306a9f722 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 15 Jun 2021 20:37:40 +0700
Subject: [PATCH 293/713] Some refactoring of AST rendering

---
 .../kmath/ast/rendering/MathRenderer.kt       |  6 +-
 .../kscience/kmath/ast/rendering/features.kt  | 41 +++++----
 .../ast/rendering/{stages.kt => phases.kt}    | 89 ++++++++++---------
 3 files changed, 68 insertions(+), 68 deletions(-)
 rename kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/{stages.kt => phases.kt} (76%)

diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
index c33f95483..68d829724 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
@@ -54,7 +54,7 @@ public open class FeaturedMathRenderer(public val features: List<RenderFeature>)
 @UnstableKMathAPI
 public open class FeaturedMathRendererWithPostProcess(
     features: List<RenderFeature>,
-    public val stages: List<PostProcessStage>,
+    public val stages: List<PostProcessPhase>,
 ) : FeaturedMathRenderer(features) {
     public override fun render(mst: MST): MathSyntax {
         val res = super.render(mst)
@@ -65,7 +65,7 @@ public open class FeaturedMathRendererWithPostProcess(
     /**
      * Logical unit of [MathSyntax] post-processing.
      */
-    public fun interface PostProcessStage {
+    public fun interface PostProcessPhase {
         /**
          * Performs the specified action over [MathSyntax].
          */
@@ -102,7 +102,7 @@ public open class FeaturedMathRendererWithPostProcess(
 
                 // Printing terminal nodes as string
                 PrintNumeric,
-                PrintSymbolic,
+                PrintSymbol,
             ),
             listOf(
                 BetterExponent,
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index 863825799..a2f42d1bf 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -13,15 +13,14 @@ import space.kscience.kmath.operations.*
 import kotlin.reflect.KClass
 
 /**
- * Prints any [MST.Symbolic] as a [SymbolSyntax] containing the [MST.Symbolic.value] of it.
+ * Prints any [Symbol] as a [SymbolSyntax] containing the [Symbol.value] of it.
  *
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
-public object PrintSymbolic : RenderFeature {
-    public override fun render(renderer: FeaturedMathRenderer, node: MST): SymbolSyntax? =
-        if (node !is Symbol) null
-        else SymbolSyntax(string = node.identity)
+public val PrintSymbol: RenderFeature = RenderFeature { _, node ->
+    if (node !is Symbol) null
+    else SymbolSyntax(string = node.identity)
 }
 
 /**
@@ -30,8 +29,8 @@ public object PrintSymbolic : RenderFeature {
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
-public object PrintNumeric : RenderFeature {
-    public override fun render(renderer: FeaturedMathRenderer, node: MST): NumberSyntax? = if (node !is MST.Numeric)
+public val PrintNumeric: RenderFeature = RenderFeature { _, node ->
+    if (node !is MST.Numeric)
         null
     else
         NumberSyntax(string = node.value.toString())
@@ -141,7 +140,7 @@ public class PrettyPrintIntegers(public val types: Set<KClass<out Number>>) : Re
  */
 @UnstableKMathAPI
 public class PrettyPrintPi(public val symbols: Set<String>) : RenderFeature {
-    public override fun render(renderer: FeaturedMathRenderer, node: MST): SpecialSymbolSyntax? =
+    public override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? =
         if (node !is Symbol || node.identity !in symbols)
             null
         else
@@ -203,7 +202,7 @@ public abstract class Binary(public val operations: Collection<String>?) : Rende
  */
 @UnstableKMathAPI
 public class BinaryPlus(operations: Collection<String>?) : Binary(operations) {
-    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): BinaryPlusSyntax =
+    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         BinaryPlusSyntax(
             operation = node.operation,
             left = OperandSyntax(parent.render(node.left), true),
@@ -225,7 +224,7 @@ public class BinaryPlus(operations: Collection<String>?) : Binary(operations) {
  */
 @UnstableKMathAPI
 public class BinaryMinus(operations: Collection<String>?) : Binary(operations) {
-    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): BinaryMinusSyntax =
+    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         BinaryMinusSyntax(
             operation = node.operation,
             left = OperandSyntax(operand = parent.render(node.left), parentheses = true),
@@ -247,7 +246,7 @@ public class BinaryMinus(operations: Collection<String>?) : Binary(operations) {
  */
 @UnstableKMathAPI
 public class UnaryPlus(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): UnaryPlusSyntax = UnaryPlusSyntax(
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = UnaryPlusSyntax(
         operation = node.operation,
         operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
     )
@@ -267,7 +266,7 @@ public class UnaryPlus(operations: Collection<String>?) : Unary(operations) {
  */
 @UnstableKMathAPI
 public class UnaryMinus(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): UnaryMinusSyntax = UnaryMinusSyntax(
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = UnaryMinusSyntax(
         operation = node.operation,
         operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
     )
@@ -287,7 +286,7 @@ public class UnaryMinus(operations: Collection<String>?) : Unary(operations) {
  */
 @UnstableKMathAPI
 public class Fraction(operations: Collection<String>?) : Binary(operations) {
-    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): FractionSyntax = FractionSyntax(
+    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax = FractionSyntax(
         operation = node.operation,
         left = OperandSyntax(operand = parent.render(node.left), parentheses = true),
         right = OperandSyntax(operand = parent.render(node.right), parentheses = true),
@@ -309,7 +308,7 @@ public class Fraction(operations: Collection<String>?) : Binary(operations) {
  */
 @UnstableKMathAPI
 public class BinaryOperator(operations: Collection<String>?) : Binary(operations) {
-    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): BinaryOperatorSyntax =
+    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         BinaryOperatorSyntax(
             operation = node.operation,
             prefix = OperatorNameSyntax(name = node.operation),
@@ -332,7 +331,7 @@ public class BinaryOperator(operations: Collection<String>?) : Binary(operations
  */
 @UnstableKMathAPI
 public class UnaryOperator(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): UnaryOperatorSyntax =
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
         UnaryOperatorSyntax(
             operation = node.operation,
             prefix = OperatorNameSyntax(node.operation),
@@ -354,7 +353,7 @@ public class UnaryOperator(operations: Collection<String>?) : Unary(operations)
  */
 @UnstableKMathAPI
 public class Power(operations: Collection<String>?) : Binary(operations) {
-    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): SuperscriptSyntax =
+    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         SuperscriptSyntax(
             operation = node.operation,
             left = OperandSyntax(parent.render(node.left), true),
@@ -374,7 +373,7 @@ public class Power(operations: Collection<String>?) : Binary(operations) {
  */
 @UnstableKMathAPI
 public class SquareRoot(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): RadicalSyntax =
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
         RadicalSyntax(operation = node.operation, operand = parent.render(node.value))
 
     public companion object {
@@ -392,7 +391,7 @@ public class SquareRoot(operations: Collection<String>?) : Unary(operations) {
  */
 @UnstableKMathAPI
 public class Exponent(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): ExponentSyntax = ExponentSyntax(
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = ExponentSyntax(
         operation = node.operation,
         operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
         useOperatorForm = true,
@@ -413,7 +412,7 @@ public class Exponent(operations: Collection<String>?) : Unary(operations) {
  */
 @UnstableKMathAPI
 public class Multiplication(operations: Collection<String>?) : Binary(operations) {
-    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MultiplicationSyntax =
+    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         MultiplicationSyntax(
             operation = node.operation,
             left = OperandSyntax(operand = parent.render(node.left), parentheses = true),
@@ -436,7 +435,7 @@ public class Multiplication(operations: Collection<String>?) : Binary(operations
  */
 @UnstableKMathAPI
 public class InverseTrigonometricOperations(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): UnaryOperatorSyntax =
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
         UnaryOperatorSyntax(
             operation = node.operation,
             prefix = OperatorNameSyntax(name = node.operation.replaceFirst("a", "arc")),
@@ -463,7 +462,7 @@ public class InverseTrigonometricOperations(operations: Collection<String>?) : U
  */
 @UnstableKMathAPI
 public class InverseHyperbolicOperations(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): UnaryOperatorSyntax =
+    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
         UnaryOperatorSyntax(
             operation = node.operation,
             prefix = OperatorNameSyntax(name = node.operation.replaceFirst("a", "ar")),
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
similarity index 76%
rename from kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt
rename to kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
index 1f31af853..6da4994a6 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/stages.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.ast.rendering
 
+import space.kscience.kmath.ast.rendering.FeaturedMathRendererWithPostProcess.PostProcessPhase
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.FieldOperations
 import space.kscience.kmath.operations.GroupOperations
@@ -17,8 +18,8 @@ import space.kscience.kmath.operations.RingOperations
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
-public object BetterMultiplication : FeaturedMathRendererWithPostProcess.PostProcessStage {
-    public override fun perform(node: MathSyntax): Unit = when (node) {
+public val BetterMultiplication: PostProcessPhase = PostProcessPhase { node ->
+    fun perform(node: MathSyntax): Unit = when (node) {
         is NumberSyntax -> Unit
         is SymbolSyntax -> Unit
         is OperatorNameSyntax -> Unit
@@ -81,6 +82,8 @@ public object BetterMultiplication : FeaturedMathRendererWithPostProcess.PostPro
             perform(node.right)
         }
     }
+
+    perform(node)
 }
 
 /**
@@ -89,68 +92,68 @@ public object BetterMultiplication : FeaturedMathRendererWithPostProcess.PostPro
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
-public object BetterFraction : FeaturedMathRendererWithPostProcess.PostProcessStage {
-    private fun perform0(node: MathSyntax, infix: Boolean = false): Unit = when (node) {
+public val BetterFraction: PostProcessPhase = PostProcessPhase { node ->
+    fun perform(node: MathSyntax, infix: Boolean = false): Unit = when (node) {
         is NumberSyntax -> Unit
         is SymbolSyntax -> Unit
         is OperatorNameSyntax -> Unit
         is SpecialSymbolSyntax -> Unit
-        is OperandSyntax -> perform0(node.operand, infix)
+        is OperandSyntax -> perform(node.operand, infix)
 
         is UnaryOperatorSyntax -> {
-            perform0(node.prefix, infix)
-            perform0(node.operand, infix)
+            perform(node.prefix, infix)
+            perform(node.operand, infix)
         }
 
-        is UnaryPlusSyntax -> perform0(node.operand, infix)
-        is UnaryMinusSyntax -> perform0(node.operand, infix)
-        is RadicalSyntax -> perform0(node.operand, infix)
-        is ExponentSyntax -> perform0(node.operand, infix)
+        is UnaryPlusSyntax -> perform(node.operand, infix)
+        is UnaryMinusSyntax -> perform(node.operand, infix)
+        is RadicalSyntax -> perform(node.operand, infix)
+        is ExponentSyntax -> perform(node.operand, infix)
 
         is SuperscriptSyntax -> {
-            perform0(node.left, true)
-            perform0(node.right, true)
+            perform(node.left, true)
+            perform(node.right, true)
         }
 
         is SubscriptSyntax -> {
-            perform0(node.left, true)
-            perform0(node.right, true)
+            perform(node.left, true)
+            perform(node.right, true)
         }
 
         is BinaryOperatorSyntax -> {
-            perform0(node.prefix, infix)
-            perform0(node.left, infix)
-            perform0(node.right, infix)
+            perform(node.prefix, infix)
+            perform(node.left, infix)
+            perform(node.right, infix)
         }
 
         is BinaryPlusSyntax -> {
-            perform0(node.left, infix)
-            perform0(node.right, infix)
+            perform(node.left, infix)
+            perform(node.right, infix)
         }
 
         is BinaryMinusSyntax -> {
-            perform0(node.left, infix)
-            perform0(node.right, infix)
+            perform(node.left, infix)
+            perform(node.right, infix)
         }
 
         is FractionSyntax -> {
             node.infix = infix
-            perform0(node.left, infix)
-            perform0(node.right, infix)
+            perform(node.left, infix)
+            perform(node.right, infix)
         }
 
         is RadicalWithIndexSyntax -> {
-            perform0(node.left, true)
-            perform0(node.right, true)
+            perform(node.left, true)
+            perform(node.right, true)
         }
 
         is MultiplicationSyntax -> {
-            perform0(node.left, infix)
-            perform0(node.right, infix)
+            perform(node.left, infix)
+            perform(node.right, infix)
         }
     }
 
-    public override fun perform(node: MathSyntax): Unit = perform0(node)
+    perform(node)
 }
 
 /**
@@ -160,39 +163,37 @@ public object BetterFraction : FeaturedMathRendererWithPostProcess.PostProcessSt
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
-public object BetterExponent : FeaturedMathRendererWithPostProcess.PostProcessStage {
-    private fun perform0(node: MathSyntax): Boolean {
+public val BetterExponent: PostProcessPhase = PostProcessPhase { node ->
+    fun perform(node: MathSyntax): Boolean {
         return when (node) {
             is NumberSyntax -> false
             is SymbolSyntax -> false
             is OperatorNameSyntax -> false
             is SpecialSymbolSyntax -> false
-            is OperandSyntax -> perform0(node.operand)
-            is UnaryOperatorSyntax -> perform0(node.prefix) || perform0(node.operand)
-            is UnaryPlusSyntax -> perform0(node.operand)
-            is UnaryMinusSyntax -> perform0(node.operand)
+            is OperandSyntax -> perform(node.operand)
+            is UnaryOperatorSyntax -> perform(node.prefix) || perform(node.operand)
+            is UnaryPlusSyntax -> perform(node.operand)
+            is UnaryMinusSyntax -> perform(node.operand)
             is RadicalSyntax -> true
 
             is ExponentSyntax -> {
-                val r = perform0(node.operand)
+                val r = perform(node.operand)
                 node.useOperatorForm = r
                 r
             }
 
             is SuperscriptSyntax -> true
             is SubscriptSyntax -> true
-            is BinaryOperatorSyntax -> perform0(node.prefix) || perform0(node.left) || perform0(node.right)
-            is BinaryPlusSyntax -> perform0(node.left) || perform0(node.right)
-            is BinaryMinusSyntax -> perform0(node.left) || perform0(node.right)
+            is BinaryOperatorSyntax -> perform(node.prefix) || perform(node.left) || perform(node.right)
+            is BinaryPlusSyntax -> perform(node.left) || perform(node.right)
+            is BinaryMinusSyntax -> perform(node.left) || perform(node.right)
             is FractionSyntax -> true
             is RadicalWithIndexSyntax -> true
-            is MultiplicationSyntax -> perform0(node.left) || perform0(node.right)
+            is MultiplicationSyntax -> perform(node.left) || perform(node.right)
         }
     }
 
-    public override fun perform(node: MathSyntax) {
-        perform0(node)
-    }
+    perform(node)
 }
 
 /**
@@ -203,7 +204,7 @@ public object BetterExponent : FeaturedMathRendererWithPostProcess.PostProcessSt
  */
 @UnstableKMathAPI
 public class SimplifyParentheses(public val precedenceFunction: (MathSyntax) -> Int) :
-    FeaturedMathRendererWithPostProcess.PostProcessStage {
+    PostProcessPhase {
     public override fun perform(node: MathSyntax): Unit = when (node) {
         is NumberSyntax -> Unit
         is SymbolSyntax -> Unit
-- 
2.34.1


From 7feb87ff052b0a99b5790cf788814fbee46f08cc Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sat, 19 Jun 2021 20:52:26 +0700
Subject: [PATCH 294/713] Refactor benchmark report writer

---
 build.gradle.kts                              |  4 +-
 buildSrc/build.gradle.kts                     |  5 +-
 .../benchmarks/addBenchmarkProperties.kt      | 89 +++++++++----------
 settings.gradle.kts                           |  2 +-
 4 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9978281f2..93cd67d47 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,9 +10,7 @@ allprojects {
         maven("http://logicrunch.research.it.uu.se/maven") {
             isAllowInsecureProtocol = true
         }
-        maven("https://oss.sonatype.org/content/repositories/snapshots") {
-
-        }
+        maven("https://oss.sonatype.org/content/repositories/snapshots")
         mavenCentral()
     }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 8ff1c4369..fe69b05c6 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -4,13 +4,14 @@ plugins {
 }
 
 repositories {
-    gradlePluginPortal()
+    maven("https://repo.kotlin.link")
     mavenCentral()
+    gradlePluginPortal()
 }
 
 dependencies {
     api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
-    api("ru.mipt.npm:gradle-tools:0.9.10")
+    api("ru.mipt.npm:gradle-tools:0.10.0")
     api("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.3.1")
 }
 
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
index 31d952157..b55e1320e 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
@@ -5,8 +5,11 @@
 
 package space.kscience.kmath.benchmarks
 
+import kotlinx.benchmark.gradle.BenchmarksExtension
 import kotlinx.serialization.*
+import kotlinx.serialization.json.*
 import org.gradle.api.Project
+import ru.mipt.npm.gradle.KScienceReadmeExtension
 import java.time.*
 import java.time.format.*
 import java.time.temporal.ChronoField.*
@@ -42,63 +45,55 @@ private fun noun(number: Number, singular: String, plural: String) = if (number.
 fun Project.addBenchmarkProperties() {
     val benchmarksProject = this
     rootProject.subprojects.forEach { p ->
-        p.extensions.findByType(ru.mipt.npm.gradle.KScienceReadmeExtension::class.java)?.run {
-            benchmarksProject.extensions.findByType(kotlinx.benchmark.gradle.BenchmarksExtension::class.java)?.configurations?.forEach { cfg ->
-                // TODO remove this hack when https://github.com/mipt-npm/gradle-tools/pull/15 is merged
-                @Suppress("UNCHECKED_CAST")
-                (javaClass.getDeclaredField("properties")
-                    .also {
-                        it.isAccessible = true
-                    }[this] as MutableMap<String, () -> Any?>)["benchmark${cfg.name.replaceFirstChar(Char::uppercase)}"] =
-                    {
-                        val launches = benchmarksProject.buildDir.resolve("reports/benchmarks/${cfg.name}")
+        p.extensions.findByType(KScienceReadmeExtension::class.java)?.run {
+            benchmarksProject.extensions.findByType(BenchmarksExtension::class.java)?.configurations?.forEach { cfg ->
+                property("benchmark${cfg.name.replaceFirstChar(Char::uppercase)}") {
+                    val launches = benchmarksProject.buildDir.resolve("reports/benchmarks/${cfg.name}")
 
-                        val resDirectory = launches.listFiles()?.maxByOrNull {
-                            LocalDateTime.parse(it.name, ISO_DATE_TIME).atZone(ZoneId.systemDefault()).toInstant()
-                        }
+                    val resDirectory = launches.listFiles()?.maxByOrNull {
+                        LocalDateTime.parse(it.name, ISO_DATE_TIME).atZone(ZoneId.systemDefault()).toInstant()
+                    }
 
-                        if (resDirectory == null) {
-                            "> **Can't find appropriate benchmark data. Try generating readme files after running benchmarks**."
-                        } else {
-                            val reports =
-                                kotlinx.serialization.json.Json.decodeFromString<List<JmhReport>>(
-                                    resDirectory.resolve("jvm.json").readText()
-                                )
+                    if (resDirectory == null) {
+                        "> **Can't find appropriate benchmark data. Try generating readme files after running benchmarks**."
+                    } else {
+                        val reports =
+                            Json.decodeFromString<List<JmhReport>>(resDirectory.resolve("jvm.json").readText())
 
-                            buildString {
-                                appendLine("<details>")
-                                appendLine("<summary>")
-                                appendLine("Report for benchmark configuration <code>${cfg.name}</code>")
-                                appendLine("</summary>")
-                                appendLine()
-                                val first = reports.first()
+                        buildString {
+                            appendLine("<details>")
+                            appendLine("<summary>")
+                            appendLine("Report for benchmark configuration <code>${cfg.name}</code>")
+                            appendLine("</summary>")
+                            appendLine()
+                            val first = reports.first()
 
-                                appendLine("* Run on ${first.vmName} (build ${first.vmVersion}) with Java process:")
-                                appendLine()
-                                appendLine("```")
-                                appendLine("${first.jvm} ${
-                                    first.jvmArgs.joinToString(" ")
-                                }")
-                                appendLine("```")
+                            appendLine("* Run on ${first.vmName} (build ${first.vmVersion}) with Java process:")
+                            appendLine()
+                            appendLine("```")
+                            appendLine("${first.jvm} ${
+                                first.jvmArgs.joinToString(" ")
+                            }")
+                            appendLine("```")
 
-                                appendLine("* JMH ${first.jmhVersion} was used in `${first.mode}` mode with ${first.warmupIterations} warmup ${
-                                    noun(first.warmupIterations, "iteration", "iterations")
-                                } by ${first.warmupTime} and ${first.measurementIterations} measurement ${
-                                    noun(first.measurementIterations, "iteration", "iterations")
-                                } by ${first.measurementTime}.")
+                            appendLine("* JMH ${first.jmhVersion} was used in `${first.mode}` mode with ${first.warmupIterations} warmup ${
+                                noun(first.warmupIterations, "iteration", "iterations")
+                            } by ${first.warmupTime} and ${first.measurementIterations} measurement ${
+                                noun(first.measurementIterations, "iteration", "iterations")
+                            } by ${first.measurementTime}.")
 
-                                appendLine()
-                                appendLine("| Benchmark | Score |")
-                                appendLine("|:---------:|:-----:|")
+                            appendLine()
+                            appendLine("| Benchmark | Score |")
+                            appendLine("|:---------:|:-----:|")
 
-                                reports.forEach { report ->
-                                    appendLine("|`${report.benchmark}`|${report.primaryMetric.score} &plusmn; ${report.primaryMetric.scoreError} ${report.primaryMetric.scoreUnit}|")
-                                }
-
-                                appendLine("</details>")
+                            reports.forEach { report ->
+                                appendLine("|`${report.benchmark}`|${report.primaryMetric.score} &plusmn; ${report.primaryMetric.scoreError} ${report.primaryMetric.scoreUnit}|")
                             }
+
+                            appendLine("</details>")
                         }
                     }
+                }
             }
         }
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 710017588..063c69280 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
         gradlePluginPortal()
     }
 
-    val toolsVersion = "0.9.10"
+    val toolsVersion = "0.10.0"
     val kotlinVersion = "1.5.0"
 
     plugins {
-- 
2.34.1


From 9f513b355c767c2c0536c5e4d7ad8df7dc6c2691 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sun, 20 Jun 2021 01:16:08 +0700
Subject: [PATCH 295/713] Update CMRandomGeneratorWrapper

---
 .../kmath/commons/random/CMRandomGeneratorWrapper.kt     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
index 16a6967e2..4e2fbf980 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
@@ -5,7 +5,11 @@
 
 package space.kscience.kmath.commons.random
 
+import kotlinx.coroutines.runBlocking
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.stat.next
 
 public class CMRandomGeneratorWrapper(
     public val factory: (IntArray) -> RandomGenerator,
@@ -33,7 +37,10 @@ public class CMRandomGeneratorWrapper(
 
     public override fun nextInt(): Int = generator.nextInt()
     public override fun nextInt(n: Int): Int = generator.nextInt(n)
-    public override fun nextGaussian(): Double = TODO()
+
+    @PerformancePitfall
+    public override fun nextGaussian(): Double = runBlocking { GaussianSampler(0.0, 1.0).next(generator) }
+
     public override fun nextDouble(): Double = generator.nextDouble()
     public override fun nextLong(): Long = generator.nextLong()
 }
-- 
2.34.1


From 83fc4e28d825343860c724f9a16fcf0b86f5f56b Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sat, 3 Jul 2021 17:11:47 +0700
Subject: [PATCH 296/713] Generate README, bump versions of Kotlin, Gradle,
 ND4J, ASM

---
 README.md                                |   4 ++--
 benchmarks/build.gradle.kts              |   2 +-
 build.gradle.kts                         |   8 ++++++--
 gradle/wrapper/gradle-wrapper.jar        | Bin 59203 -> 59536 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 +-
 kmath-ast/README.md                      |   6 +++---
 kmath-ast/build.gradle.kts               |   3 +--
 kmath-complex/README.md                  |   6 +++---
 kmath-core/README.md                     |   6 +++---
 kmath-ejml/README.md                     |   6 +++---
 kmath-for-real/README.md                 |   6 +++---
 kmath-functions/README.md                |   6 +++---
 kmath-jafama/README.md                   |  12 ++++++------
 kmath-kotlingrad/README.md               |   6 +++---
 kmath-nd4j/README.md                     |   6 +++---
 kmath-nd4j/build.gradle.kts              |   5 ++---
 kmath-tensors/README.md                  |   6 +++---
 settings.gradle.kts                      |   5 ++---
 19 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/README.md b/README.md
index 015988cd3..7645256d9 100644
--- a/README.md
+++ b/README.md
@@ -309,8 +309,8 @@ repositories {
 }
 
 dependencies {
-    api("space.kscience:kmath-core:0.3.0-dev-13")
-    // api("space.kscience:kmath-core-jvm:0.3.0-dev-13") for jvm-specific version
+    api("space.kscience:kmath-core:0.3.0-dev-14")
+    // api("space.kscience:kmath-core-jvm:0.3.0-dev-14") for jvm-specific version
 }
 ```
 
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 2198ac5d6..d96c5a8b6 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -47,7 +47,7 @@ kotlin {
                 implementation(project(":kmath-nd4j"))
                 implementation(project(":kmath-kotlingrad"))
                 implementation(project(":kmath-viktor"))
-                implementation("org.nd4j:nd4j-native:1.0.0-beta7")
+                implementation("org.nd4j:nd4j-native:1.0.0-M1")
                 //    uncomment if your system supports AVX2
                 //    val os = System.getProperty("os.name")
                 //
diff --git a/build.gradle.kts b/build.gradle.kts
index 93cd67d47..d0f6ced78 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -28,12 +28,16 @@ subprojects {
             dokkaSourceSets.all {
                 val readmeFile = File(this@subprojects.projectDir, "README.md")
                 if (readmeFile.exists()) includes.from(readmeFile.absolutePath)
-                externalDocumentationLink("http://ejml.org/javadoc/")
+                externalDocumentationLink("https://ejml.org/javadoc/")
                 externalDocumentationLink("https://commons.apache.org/proper/commons-math/javadocs/api-3.6.1/")
                 externalDocumentationLink("https://deeplearning4j.org/api/latest/")
                 externalDocumentationLink("https://axelclk.bitbucket.io/symja/javadoc/")
                 externalDocumentationLink("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
-                externalDocumentationLink("https://breandan.net/kotlingrad/kotlingrad/", "https://breandan.net/kotlingrad/kotlingrad/kotlingrad/package-list")
+
+                externalDocumentationLink(
+                    "https://breandan.net/kotlingrad/kotlingrad/",
+                    "https://breandan.net/kotlingrad/kotlingrad/kotlingrad/package-list",
+                )
             }
         }
     }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644
GIT binary patch
delta 18435
zcmY&<19zBR)MXm8v2EM7ZQHi-#I|kQZfv7Tn#Q)%81v4zX3d)U4d<S{&&C~|14~>4
zYYc!v@NU%|U;_sM`2z(4BAilWijmR>4U^KdN)D8%@2KLcqkTDW<b;`{sz_0x=?HD$
zfRd}z!dlzv65-&;kfVv!%#n8?Y%uh6t_yvK3%vZ!=sQhW#x&$16>%^3U(Wg>{qkAF
z&RcYr;D1I5aD(N-PnqoEeBN~JyXiT(+@b`4Pv`;KmkBXYN48@0;iXuq6!ytn`vGp$
z6X4DQHMx^WlOek^bde&~cvEO@K$oJ}i`T`N;M|lX0mhmEH<Qh2bO23s<c<b?kJSx>
zuRpo!rS~#&rg}ajBdma$$}+vEhz?JAFUW|iZEcL%amAg_pzqul-B7Itq6Y_BGmOCC
zX*Bw3rFz3R)DXpCVBkI!SoOHt<r_Zw4g3Jlhii6BC+0g(i?Vec^cYS1yA*tD`4TKj
zOApa7lBa#WaS!-2<I(+955H!14q3}J>Ystv*e-May|+?b80ZRh$MZ$FerlC`)ZKt}
zTd0Arf9N2dimjs>mg5&@sfTP<FMra4imH+_IBlL4Nc_~AL#%VJCxe3)stbd02AEM|
z&D0&Tn5H7hbWpsy=sT;pxOd15(iWc{al!mn&C#+i%f3lDS<jx_mG|11KCBpX%ouSo
z@?~hUsz{+<!8=d398xo&@l@S~*jz8h-YM#AGsF0WGkRz@$<m!>sRXKXI;0L~&t+GH
zkB<>wxI9D+k5VHHcB7Rku{Z>i3$&hgd9Mt_hS_GaGg0#2EHzyV=j=u5xSyV~F0*qs
zW{k9}lFZ?H%@4hII_!bzao!S(J^^ZZVmG_;^qXkpJb7OyR*sPL<g~w=Zk9z5S1jDI
z71nU2i<Es|#qXTuJIRx-HjX+gJ*LMd1jHM#UfOkw#&q`-<mI*srz-Ay05DEYB_)#v
zvk_+YZbpT72OHLyzK&`<6&<^A=1Fr^E7_0s%OXF6r^I$M)pZ_3F4o5d`%I9#uyBlZ
zX1C9_iSi<5viI;Yrq>>))Jx{K4xtO2xTr@St!@CJ=y3q2wY5F`77Tqwz8!&Q{f7Dp
zifvzV<QA3qQ_icfAX<_Uh_AWeD00fmmOez9t>V1!Dj*dxG%BsQyRP6${X+Tc$+XOG
zzvq5xcC#&-iXlp$)L=9t{oD~bT~v^ZxQG;FRz|HcZj|^L#_(<kbHS<d%uD<k^y4GS
z_@nGkSrluLeGBfOtQ55e=_#qB)a=_z-;eBz1(Z7to$`|!g;(i3z=gq~yvKKK5sNc#
zl$gJ2XIR<<L*cw&uktYWH>VNG)k{=_6|6Bs-tRNCn-XuaZ^*^hpZ@qw<A`W4NXV_{
zECxbg>i`m|BxcF6IWc?_bhtK_cDZRTw#*bZ2`1@1HcB<A>`mLUmo_>@2R&nj7&CiH
zF&laHkG~7#U>c}rn#H)q^|sk+lc!?6wg0xy`VPn!{4P=u@cs%-V{VisOxVqAR{XX+
zw}R;{Ux@6A_QPka=48|tph^^ZFjSHS1BV3xfrbY84^=?&gX=bmz(7C({=*oy|BEp+
zYgj;<`j)GzINJA>{HeSHC)<cjl~xrBv-Ad;_(!35VQHb!n{j_(E9gc}-sAqiZ7)~T
zGr>bvp6ucoE`c+6#2KzY9)TClmtEB1^^Mk)(mXWYvup02e%Ghm9qyjz#fO3bNGBX}
zFiB>dvc1+If!><mtjfI+&uNcAL5R+)16aVAdoC-IdLWfR^loo9quT)qg_~Y<A<|%J
z{4}JG)2I+AA+2M<X=n8Tj%Y@|gL;a0cu?_0nya~Ds$JH`tyme!ug%h)y+8F-aj3Vs
zM_OOr;e%?DW<F8GdQP&*MHN=uF5OQ@*^d|_+48he#kR1%(q8FHxG~1)pjWd#*S~<-
zsO)|Q{2i9C8z1<O>I10;qZk`?6pEd*(?bI&G*3YLt;MWw&!?=Mf7%^Op?qnyXWur-
zwX|S^P>jF?{m9c&mmK-epCRg#WB+-VDe!2d2~YVoi%7_q(dyC{(}zB${!ElKB2D}P
z7QNFM!*O^?FrPMGZ}wQ0TrQAVqZy!weLhu_Zq&`rlD39r*9&2sJHE(JT0EY5<}~x@
z1>P0!L2IFDqAB!($H9s2fI`&J_c+5QT|b#%99HA3@zUWOuYh(~7q7!Pf_U3u!ij5R
zjFzeZta^~RvAmd_TY+RU@e}wQaB_PNZI26zmtzT4iGJg9U(Wrgrl>J%Z3MKHOWV(?
zj>~Ph$<~8Q_sI+)$DOP^9FE6WhO09EZJ?1W|KidtEjzBX3RCLUwmj9qH1CM=^}MaK
z59kGxRRfH(n|0*lkE?`Rpn6d^u5J6wPfi0WF(rucTv(I;`aW)3;nY=J=igkjsn?ED
ztH&ji>}TW8)o!Jg@9Z}=i2-;o4#xUksQHu}XT~yRny|kg-$Pqeq!^78xAz2mYP9+4
z9gwAot<F`HDf<=vVlS~}$IUDtF0klA`^#pB|G?>i2ICvUWxE&RZ~}E)#M8*zy1iwz
zHqN%q;u+f6Ti|SzI<FRGwCIa?0!fO9WN;kBsxILjw5}w5BK>Lm0s-)=4)>eb5o-0K
zbMW8ecB4p^6OuIX@u`f{>Yn~m9PINEl#+t*jqalwxIx=TeGB9(b6jA}9VOHnE$9sC
zH`;epyH!k-3kNk2XWXW!K`L_G!%xOqk0ljPCMjK&VweAxEaZ=<DzSWjCiKD^*;5J$
zl4gOX?qd<vHF|&G>=cT#;!<B?QV)Sxf^HT@cL_2la1`-IR6ZJ;P$+RaV<afLePi-(
z`iA)b_c_5yafTWN1f-H8r4X4C7}bXH(p^at7}wcudBoe0*%y<B25sgtkcNi&V-$%G
zMSGX5<q?c3;?<OIPu@&cT0xgeo?7m!1=~tj=2jG1wy=Q0Jt$O25951g=k|2gnn%q#
z)8}Dz@%7wCsofkVeUfvN<9Fx(obP+xb&~&3;CkI=_&w{&h_XoYrA)m7ECODqf@l4F
zr=J~G0aXj%UK8SkUZ>7)X&C|X{dY^IY(e4D#!tx^vV3NZqK~--JW~wtXJ8X19ad<I
zm9QB;RzH152H*y3tMn*3EvxkEox&n8T*@N+`8Grw?(i08(CyTVvrdYB<~KAN?m-af
z48ifc{b0Ob(DjSYG@#1{T-ASiogxS*?mdh?gD%n`&#ElaJuKw(ZVs>Xim<W6u2t)u
z6s_ppklZx{7yd_UKBw+|N=In~2BVl!;x!QFZ9|x}y<?)9OHecoqZy3Ivt=}#Q4OL}
zHX1K1MQ2CF*2uHy#a$|F7h=ma*&JbOw43$!kcjqs7DeysG@f1n)sS!+XLYaik%I6Q
zipAB_g8OF4y#?ZDYDeW}jgwU3o7%OecZ~=o`u6c&jknOzmB`r7um)wXimA2gUfH7y
zwN>?PdN(|@o(OdgH3AiHts~?#QkolO?*=U_buYC&tQ3sc(O5HGHN~=6wB@dgIAVT$
z_O<cn@nUEGUT$oFPywe(&63O<$H?qH$ZdDGyOrByWM-n!VN96r=4Si%R!g1l+UnD`
zQey?KU7qiwzmKU}0s?3Fj2Rin=8W1ZMnah!zlFm}iM17m<$e2;<DZ4?9$K``?YR+Q
zC}no$*}t0`uIi4yRIN32V9oeLrVI6T6+Jz_>JWJ^&*40Pw&%y^t8-Wn4@l9gOl`uU
z{Uda_uk9!Iix?KBu9CYwW9Rs=yt_lE11A+k$+)pkY5pXp<hVQ+lx!L-&x;bs6sTWy
z5-jLZ!#e0u)=!m;6eq(oP?P9YA*Tr@kg*nGSid%#)&Itd;r2X&XUd2s?PWTYrzq|2
z53Ns^<9hG_We_Zz8R90$En!t{KH(+#ajodOS-JLijl^nkBeB<yrw*j+6*uuXLyLF9
z{N3t`5+i>ocxIEJe|pTxwFgB%Kpr&tH;PzgOQ&m|<oUQ1dylfIc7Y5Z3j1x;-E4})
zlPALqD3U1psXL!B;q*ehz{Llf;>(#Otm?@H^r`v)9yiR8v&Uy>d#TNdRfyN4Jk;`g
zp+jr5@L2A7TS4=G-#O<`A9o;{En5!I8lVUG?!PMsv~{E_yP%QqqTxxG%8%KxZ{uwS
zOT+EA5`*moN8wwV`Z=wp<3?~f#frmID^K?t7YL<m6VWFb>`G^(X43g<oal-E1{f_!
zMM~2F^%K|Fu~`x<<&sTAc`V5n;Rw6{XkE{;s3-|c+NIU#Skt3b199qOwzF!22Tqf*
zE16<4@?5ePsR(z@^xu8!CWvB;_CSM&hm~uwsrVnilwfgKIQSi1c+dzpZ8QColu7eB
zT&F_jgPa+roCfk+v!rsEdW#ZFy2((cA!saskfsl5@-js1&&gA?clYAmax@Nf1=?Q4
zy-!%e31-Pm3`OUe=&CWnia;bDEY^Qu5IhxOnKWJv>Wbo!6(q*u%HxWh$$^2EOq`Hj
zp=-fS#Av+s9r-M)wGIggQ)b<@-BR`R8l1G@2+KODmn<_$Tzb7k35?e8;!V0G>`(!~
zY~qZz!6*&|TupOcnvsQYPbcMiJ!J{<AUkIQ?T$#YvpqqHZZT}0w>RyfezB^;fceBk
znpA1XS)~KcC%0^_;ihibczSxwBuy;^ksH7lwfq7*GU;TLt*WmUEV<B*)702m>Qxt{
zKSfJf;lk$0XO8~4<V91^$-vD;;s6SSgg|GI(=zrZRux(KOs}+`xmO>8Xn2d<xw$ML
z-Nox99yuWO;%tc<D!o9)3662vJevDRmH3`X>nh8tMC9WHu`%DZj&a`2!tNB`5%;Md
zBs|#T0Ktf?vkWQ)Y+q!At1qgL`C|nbzvgc(+28Q|4N6Geq)Il<kZ3mGp>%+I<Y$q}
zk%HyZpWUh@6{prl<|AyV2rx<i=^VB%K0@I+<ln!^usw3Em(Miio93@zcZ%-v{4&N2
zcYE0Tpd>5c@t02{9^=QJ?=h2BTe`~BEu=_u3xX2&?^zwcQWL+)7dI>JK0g8_`W1n~
zMaEP97X>Ok#=G*nkPmY`VoP8_{~+Rp7DtdSyWxI~?TZHxJ&=6KffcO2Qx1?j7=LZA
z?GQt`oD9QpXw+s7`t+eeLO$cpQpl9(6h3_l9a6OUpbwBasCeCw^UB6we!&h9Ik<t|
zD0oMP!MWpM*U(u`s*F9Hx|}0|3{SpW3>@1zvJ`j4i=tvG9X8o34+N|y(ay~ho$f=l
z514~mP>Z>#6+UxM<6@4z*|hFJ?KnkQBs_9{H(-v!_#Vm6Z4<deXWj{kD3-?t{z(at
z5F960+Lt}Rd_`N{v%m1^3E9$wcvIbH!uR*j0b^-{f_3#Jis!WwN*J7@HbvqL8Zdjq
z$T6F?1c?FFl=g%g8UXxRntAEHa6ofPAW?d>(xV5WgWMd3mB9A(>@XE292#k(HdI7P
zJkQ2)`bQXTKlr}{VrhSF5rK9TsjtGs0Rs&nUMcH@$ZX_`Hh$Uje*)(Wd&oLW($hZQ
z_tPt`{O@f8hZ<}?aQc6~|9iHt>=!%We3=F9yIfiqhXqp=QUVa!@UY@IF5^dr5H8$R
zIh{=%S{$BHG+>~a=vQ={!B9B=<-ID=nyjfA0V8->gN{jRL>Qc4Rc<86;~aY+R!~Vs
zV7MI~gVzGIY`B*Tt@rZk#Lg}H8sL39OE31wr_Bm%mn}8n773R&N)8B;l+-eOD@N$l
zh&~Wz`m1qavVdxwtZLACS(U{rAa0;}KzPq9r76xL?c{&G<UJ=R?LuB}PDO7HVNF<3
zfCse)dXXnk@duX_x6gxT#znrXeb8;xk?)n8E`2<|0F?)>aG5hX_NK!?)iq`t7q*F#
zFoKI{h{*8lb>&sOeHXoAiqm*vV6?C~5U%tXR8^XQ9Y|(XQvcz*>a?%HQ(Vy<2UhNf
zVmGeOO#v159KV@1g`m%gJ<w@$Jfr|I+t<O1vhU+3{qM1CnOgkF@lDWIFY2P&R7=ZP
z8`(YDAz*YyvmlEiqc#;+fy8?1CW()FxYZFSGN+f<<VQg&@m?XNaI27R(!Y^I-zolX
zPCRK)8i0Y7fjRSFQh*v<puB(gBc(MsA|^8jB6IY9u-_<pCipoS@#KuXUh!bv66|sJ
z@P<R+ErTIV%VE03mMc&bKh;NS(uYg30Kyk-WT%%e1g)=e#1+)!2MFss5qM=tVqWUJ
zq~^bP4dz-ZXl-uw@HZ;Ee0<FPo#JTdn9|^s3;-k4yD8(Rg7Q1B5V}fp8dvCBvO-&&
zP<En#@06*@fduhJn_yI@#Nj@hur=#<#27q0QXHv-e#oMi3}5Z28GP}@{CSkcPJVX9
zEhbEH)dxGPDRBmMS)0sW$HHzTu}xfXfFz%}&ac@@z(W!98m-Gh_Aiq9YRq+bsQ@3%
z4j>)XGPLa`a|?9HSzSSX{j;)xg>G(Ncc7+C>AyAWYa(k}5B3mtzg4tsA<Sh;28pD1
zIFs~Z><MDBdusACPh#gSuba$Zxq9XQ9zHgTm9jJRWBl;6MmD|7#OCb+r-NVhSxD`l
zpz{#9n=TYzv1i>=C^Wfezb1&LlyrBE1~kNfeiubLls{C)!<%#m@f}v^o+7<<peV!m
z=VC0_KSpi7FpU+=-~zA*iYIY`A$OK=V*+<-;yaWEHTS+fpQ9nF0e2pd-&@Jw1WOD3
z8GVsYvW1sKoZNTx4OK_oZ>VZ6!FZ;JeiAG@5vw7Li{flC8q1%jD_WP2ApBI{fQ}kN
zhvhmdZ0bb5(qK@VS5-)G+@GK(tuF6eJuuV5>)Odgmt?i_`tB69DWpC~e8gqh!>jr_
zL1~<WJ)Q75x^h;pF?{k_oIs!CDg4%}(~+#drio{%*&0bN?<+bgXDB){8A}v4#SS*<
zI#7-8DmoH|MGeJJ^ryCu?tbd$K%t}510M-_>L0xw@C<fO#AAX{JzQ=;ULY)<=J5}B
z9Z`iyf-Y%TuNp~D5)2(pu9Ft(%eU-|wt$z2&#v?|6IUFZ08w=fc1d*h-vc#mRUp@o
zJ>bMSTmQflpRyjif*Y*O-IVQ_OFhUw-zh<q;LT5p+$IR7zEGtb#X(0BaIHkAvMxDl
z&9|x2$0;2BOM24Yox5>PrXXW>6X}+73IoMsu2?uuK3lT>;W<df@J_cgG_U&D8b<+U
z3qBv6Z5ieNpqShbUSE@10^#D8JvDB<Cxnnc7^ASjodT6b&UsxZ-kMZhrAlLO-#Mi5
zrhImmEN-CGFF$Vg@GnIasHba~Uf74v>#38#qG5tDl66A7Y{mYh=jK8Se!+f=N7%nv
zYSHr6a~Nxd`jqov9VgII{%EpC_jFCEc>>SND0;}*Ja8Kv;G)MK7?T~h((c&FEBcQq
zvUU1hW2^TX(dDCeU@~a1LF-(+#lz3997A@pipD53&Dr@III2tlw>=!iGabjXzbyUJ
z4Hi~M1KCT-5!NR#I%!2Q*A>mqI{dpmUa_mW)%SDs{Iw1LG}0y=wbj@0ba-`q=0!`5
zr(9q1p{#;Rv2CY!L#uTbs(UHVR5+hB@m*zEf4jNu3(Kj$WwW|v?YL*F_0x)GtQC~!
zzrnZRmBmwt+i@uXnk05>uR5&1Ddsx1*WwMrIbPD3yU*2By`71pk@gt{|H0D<#B7&8
z2dVmXp*;B)SWY)U1VSNs4ds!yBAj;P=xtatUx^7_gC5tHsF#vvdV;NmKwmNa1GNWZ
zi_Jn-B4GnJ%xcYWD5h$*z^haku#_Irh818x^KB)3-;ufjf)D0TE#6>|zFf@~pU;Rs
zNw+}c9S+6aPzxkEA6R%s*xhJ37wmgc)-{Zd1&mD5QT}4BQvczWr-Xim>(P^)52`@R
z9<jpXM|@nDonMBF{3f<~Ch;-n8pq}dJ3Jn7z+9MKkVKZ6GC|_U4LQ}uqT7Qzdw&FT
z5rS%8>+Z}44203T5}`AM_G^Snp<_KKc!OrA(5h7{MT^$ZeDsSr(R@^kI?O;}QF)OU
zQ9-`t^ys=6DzgLcWt0U{Q(<zOjFK;@HBO@&MI050VARn}8^41fX2E~H8v7oK7t#cH
zT3cr37+EIOoR3$Tf{>F<SaIxIq6Ub`pA9KKWBtPeF7PVo!TPrUGQ;L27vT$GZ|f!6
zJ3t-%EM4F&3lV=3B&-O?3LtyEID6hjqP^*ia)+pq9l7DVnt4FWB~meyMR+>Bs22=r
zKD%fLQ^5ZF24c-Z)J{xv?x$&4VhO^mswyb4QTIofCvzq+27*WlYm;h@;Bq%i;{hZA
zM97mHI6pP}XFo|^pRTuWQzQs3B-8kY@<y697Pif_+Ask(KR3DV%AUDhMyUIANX3Dk
zwg)}aPAa<Qw({y>ajLV!Fb?OYAO3jFv*W-_;AX<NdmAQ7#KC=m{U8w@o~;*9u@fe3
zI-q=kJGTIh6>d;G!CbpZt04iW`Ie^_+cQZGY_Zd@P<*J9EdRsc>c=edf$K|;voXRJ
zk*aC@@=MKwR120(%I_HX`3pJ+8GMeO>%30t?~uXT0O-Tu-S{JA;zHoSyXs?Z;fy58
zi>sFtI7hoxNAdOt#3#AWFDW)4EPr4kDYq^`s%JkuO7^efX+u#-qZ56aoRM!tC^P6O
zP(cFuBnQGjhX(^LJ(^rVe4-_Vk*3PkBCj!?SsULdmVr0cGJM^=?8b0^DuOFq>0*yA
zk1g|C7n%pMS0A8@Aintd$fvRbH?SNdRaFrfoAJ=NoX)G5Gr}3-$^IGF+eI&t{I-GT
zp=1fj)2|*ur1Td)+s&w%p#E6tDXX3YYOC{HGHLiCvv?!%%3DO$B$>A}aC;8D0Ef#b
z{7NNqC8j+%1n95zq8|hFY`afAB4E)w_&7?oqG0IPJZv)lr{MT}>9p?}Y`=n+^CZ6E
zKkjIXPub5!82(B-O2xQojW^P(#Q*;ETpEr^+Wa=qDJ9_k=Wm@fZB6?b(u?LUzX(}+
zE6Oyapd<Pnn%^T*29yI$_#2T8ky75p(qWs)ooqKI2gN`dZpK3Y<kOCF-bmb>G$HC&
z&;oa*ALoyIxVvB2cm_N&h&{3ZTuU|aBrJlGOLtZc3<wB41_%hv|2W21e=t+(=n#Nn
zm*Oar0&(6b5;<nAAtYiLGCv|A6tP{9nAYT<*AAoG1mp_)ZWYNA(fAdZl+LgUxhajH
zBMP2AH!EkqQueuCEuY=Gn~D5i1=u<sj%R7VeIK^r69n!S%t35NNg(Fcnjq#?iuTuC
zyyEflYj(Y9WXQU}=QW)&f-zt2L<9i?G8jgUJCxqv39bRXa)Z<AYSLpgy&?>KDx)<{
z27@)~GtQF@%6B@w3emrGe?Cv_{iC@a#YO8~OyGRIvp@%RRKC?fclXMP*6GzB<W-|f
z1HB&QMc+Ib?@<fAbwIxv{Jg*T<>FO<w|z4X_0d^ajD|Sz3Z?D`jadD{q(TEoFqiL>
z5U4QK?~>AR>?KF@I;|(rx(rKxdT9-k-anYS+#S#e1SzKPslK!Z&r8iomPsWG#>`Ld
zJ<#+8GFHE!^wsXt(s=CGfVz5K+FHYP5T0E*?0A-z*lNBf)${Y`>Gwc@?j5{Q|6;Bl
zkHG1%r$r&O!N^><8AEL+=y(P$7E6hd=>BZ4ZZ9ukJ2*~HR4KGvUR~MUOe$d>E5UK3
z*~O2LK4AnED}4t1Fs$JgvPa*O+WeCji_cn1@Tv7XQ6l@($F1K%{E$!naeX)`bfCG>
z8iD<%_M6aeD?a-(Qqu61&fzQqC(E8ksa%CulMnPvR35d{<`VsmaH<C2uc@|>yzF+B
zF6a@1<cQrSK@^T2Jz<j^!(U`lVrtN6^K1{@&|Y%V?lh(s<qUgEfNklI&6tUgpAb*a
z_+C-rQUGf}bnsy~!Ygj~JcS);J7o!ttkA^>$CT0xGVjofcct4SyxA40uQ`b#9kI)&
z?B67-12X-$v#Im4CVUGZHXvPWwuspJ610ITG*A4xMoRVXJl5xbk;OL(;}=+$9?H`b
z>u2~yd~gFZ*V}-Q0K6E@p}mtsri&%Zep?ZrPJmv`Qo1>94Lo||Yl)nqwHXEbe)!g(
zo`w|LU@H14VvmBjjkl~=(?b{w^G$~q_G(HL`>|aQR%}A64mv0xGHa`S8!*Wb*eB}`
zZh)&rkjLK!Rqar)UH)fM<&h&@v*YyOr!Xk2OOMV%$S2mCRdJxKO1RL7xP_Assw)bb
z9$sQ30bapFfYTS`i1PihJZYA#0AWNmp>x(;C!?}kZG7Aq?zp!B+gGyJ^FrXQ0E<>2
zCjqZ(wDs-$#pVYP3NGA=en<@_uz!FjFvn1&w1_Igvqs_sL>ExMbcGx4X5f%`Wrri@
z{&vDs)V!rd=pS<gKlbfhp}ufon^L`I$St3=B`fTo6?X~-5*!da$WSC=wN0h_b|&|p
zL8tjMJDRM>?G(ri<ha&~1a}iabvy_b$vscbC%Y*}zodb|0`?CGVC9w*d$a$bIvm)g
zxfr>cfwPSg(w<8P_6=Qj`qBC7_XNE}1_5>+GBjpURPmvTNE7)~r)Y>ZZecMS7Ro2`
z0}nC_GYo3O7j|Wux?6-LFZs%1IV0H`f`l9or-8y0=5VGzjPqO2cd$RRHJIY06Cnh-
ztg@Pn1OeY=W`1Mv3`Ti6!@QIT{qcC*&vptnX4Pt1O|dWv8u2s|(CkV`)vBjAC_U5`
zCw1f&c4o;LbBSp0=*q<rKWROphY%8*dT*+-xv<)}6rSe7#pa+C2sRvc#pf}_5pS#>
z3Y^horBAnR)u=3t?!}e}14%K>^562K!)Vy6r~v({5{t#iRh8WIL|U9H6H97qX09xp
zjb0IJ^9Lqxop<-P*VA0By@In*5dq8Pr3bTPu|ArID*4tWM7w+mjit0PgmwLV4&2PW
z3MnIzbdR`3tPqtUICEuAH^MR$K_u8~-U2=N1)R=l>zhygus44>6V^6nJFbW-`^)f}
zI&h$FK<SfuVxz$9jz$%JfEvVgm?oA_vk80Mb*vtU&mY6DKMPelC~6k4d~PHleiT=i
z9i`)yHZ|VLG@A>)Mo*x?2`0npTD~jRd}5G~-h8=w<geTkn^ei*h^P_#kt4Dk-Ig(P
zw7emsMnh4haOAFEvCI*}Q6rgiCIEj<0mLdYm1>L#Y-G+a^C?d>OzsVl7BFAaM==(H
zR;ARWa^C3J)`p~_&FRsxt|@e+M&!84`eq)@aO9yBj8iifJv0xVW4F&N-(#E=k`AwJ
z3EFXWcpsRlB%l<ouYWjr+SUt7L1F}F&JAqs2YnGI@EauMTs3Lx>_0Vdu`0G(11F7(
zsl~*@XP{jS@?M#<a*IJCG;!^-k0mpcYSL3TA`mO-osDqvZe)rvFyj`CZ>ec~%Pr~h
z2`M*lIQaolzWN&;hkR2*<=!ORL(>YUMxOzj(60rQfr#wTrkLO!t{h<Ixt`{;>~qg%
zv$R}0IqVIg1v|YRu9w7RN&Uh7z$ijV=3U_M(sa`ZF=SIg$uY|=NdC-@%HtkUSEqJv
zg|c}mKTCM=Z8Y<XhcneSe|&PEGL?KEjv?$97<=EoEY%e)Y^wY7E2xeqEUPM20hy+h
zOBop<mL$3-WOlS|^wIV?j-e=QOSa4yQ;&3&vJ^e`I9~INys-f+JG)*Muyc444Xj{c
zOq>msFQu7k{VrXtL^!Cts-eb@*v0B3M#3A7JE*)MeW1cfFqz~^S6OXFOIP&iL;Vpy
z4dWKsw_1Wn%Y;eW1YOfeP_r1s4*p1C(iDG_hrr~-I%kA>ErxnMWRYu{IcG{sAW;*t
z9T|i4bI*g)FXPpKM@~!@a7LDVVGqF}C@mePD$ai|I>73B+9!Ks7W$pw;$W1B%-rb;
zJ*-q&ljb=&41dJ^*A0)7>Wa@khGZ;q1fL(2qW=|38j43mTl_;`PEEw07VKY%71l6p
z@F|jp88XEnm1p~<5c*cVXvKlj0{THF=n3sU7g>Ki&(ErR;!KSmfH=?49R5(|c_*xw
z4$jhCJ1gWT6-g5EV)Ahg?Nw=}`iCyQ6@0DqUb%AZEM^C#?B-@Hmw?LhJ^^VU>&phJ
zlB!n5&>I>@sndh~v$2I2Ue23F?0!0}+9H~jg7E`?CS_ERu75^jSwm%!FTAegT`6s7
z^$|%sj2?8wtPQR>@D3sA0-<U}>M-g-vL@47YCnxdvd|1mPymvk!j5W1jHnVB<xFe8
zIcRoD<goMv8Qu{5p3F6>&F-0R5e-vs`@u8a5GKdv`LF7uCfKncI4+??Z4iG@AxuX7
z6+@nP^TZ5HX#<H$*7$uZ^GJ)1l2_$4(ITNpbx11}-7Un19g4X?I6t&yby7^z8u_JG
z`AC$r&O%j3{*}u^#Roz?ZomEGRIFtrtzs00Z+Nf!0r=n1VG8UzPD-gMYD*Z0J`6&L
zrB#|AC<q8P<bMa={~UKhf1y&~g@^z<xK%_nv}iSIi1qs-80FZc5i6BP&}HzO@{J-o
zI{J0{72ps7Gh2!++v_Y$aLUWV<6RoTK080Fh4;pFyM?s}`1*Q*Fv3rOA4$qE<`y;<
z4~JsWUr|mx$PNNub+==}Qcuv-yK4?0!BQC|{mR!>*z(!y+-KJ3+Ku0M90BTY{SC^{
z&y2#RZPjfX_PE<<>XwGp;g4&wcXsQ0T&XTi(^f+}4qSFH1%^GYi+!rJo~t#ChTeAX
zmR0w(iODzQOL+b&{1OqTh*psAb;wT*drr^LKdN?c?HJ*gJl+%kEH&48&S{s28P=%p
z7*?(xFW_RYxJxxILS!kdLIJYu@p#mnQ(?moGD1)AxQd66X6b*KN?o&e`u9#N4wu8%
z^Gw#G!@|>c740RXziOR=tdbkqf(v~wS_N^CS^1hN-N4{Dww1lvSWcBTX*&9}Cz|s@
z*{O@jZ4RVHq19(HC9xSBZI0M)E;daza+Q*zayrX~N5H4xJ33BD4gn5Ka^Hj{995z4
zzm#Eo?ntC$q1a?)dD$qaC_M{NW!5R!vVZ(XQqS67xR3KP?rA1^+s3M$60WRTVHeTH
z6BJO$_jVx0<q=4oQ4^4&LjvZ?IFywiS^=+kIsr#`i;VVi*)oB%BBriVjqoaV2E?pE
z@XMJ$e#;GIWlvg=J_03_gz4T2CA}FlK-d#*_Y;iHV=RMMPp?H!FNNqW-KS|}te|O%
zX=X|Fk9k;c=4O1}iwo|p(I{gB7b!nXILr~V^6wx73`=LnKrWu#mjK^!-u;_MJqiVy
zI}_iQp3zGd=f-(%^bDpdj{*U0@S?aksQ)+FMid4y$fG+bLIVL2r3V2a`af?IA!S_z
z4w$_CLqZInLy9sX^Cv^7Ng5gjJ_scpQs*DJx3q-C!z^yfg19bvM*HgOQnbEZU0QoF
zdK$RAc-@Ll$Et(J%3uFw2SZF<oj1YfSviVH(Se<D#?ANbUnlv#>EGPXy}XK_&x597
zt(o6ArN8vZX0?~(lFGHRtHP{gO0y^$iU6Xt2e&v&ugLxfsl;GD)nf~3R^ACqSFLQ<
zV7`cXgry((wDMJB55a6<Cvg5*V@E&gp_hK?RXM9Cmb<zqULQcPsE{hc9a$%h#e|?8
zp9vcb$%gzMm_BsxVxuk9=8liQs|H!K>D4J;13$z6pupC{-F+wpToW%k1qKjUS^$Mo
zN3@}T!ZdpiV7<a`6mgu8))0n;&aR0X#=P(j$>rkNvqP3KbpEn|9aB;@V;gMS1iSb@
zwyD7!5mfj)q+4jE1dq3H`sEKgrVqk|y8{_vmn8bMOi873!rmnu5S=1=-DFx+Oj)Hi
zx?~ToiJqOrvSou?RVALltvMADodC7BOg7pOyc4m&6yd(qIuV5?dYUpYzpTe!BuWKi
zpTg(JHBYzO&X1e{5o|ZVU-X5e?<}mh=|eMY{ldm>V3NsOGwyxO2h)l#)rH@BI*TN;
z`yW<tZkAtgD1K4rH^*7E7L8y2DKR)GUqND5p=KRL(^>26bMSp=k6C4Ja{xB}s`dNp
zE+41IwEwo>7*PA|7v-F#jLN>h#a`Er9_86!fwPl{6yWR|fh?c%qc44uP~Ocm2V*(*
zICMpS*&aJjxutxKC0Tm8+FBz;3;R^=ajXQUB*nTN*Lb;mruQ<L?J}Py63aFL_JrF3
zuKjS?Xwj{ufizn|oPl*svKX+?myF1gv1i#2Pp%t_6Frc|49o-M$q1U(SoF1?czk~K
zQB+{`_(7#~5HDJ@$p0t9X4Bnjw_4k=Gtm&qcw$d~4o6S;S}fQ;i|ux0)${W9g+C7d
zoMy9g)h9D&t#es1s#qQ_(oec>HUE<&=I7pZ@F-O*VMkJbI#FOrBM8`QEL5Uy=q5e2
z_BwVH%c0^uIWO0*_qD;0jlPoA@sI7BPwOr-mrp7y`|EF)j;$GYdOtEPFRAKyUuUZS
z(N4)*6R*ux8s@pMdC*TP?Hx`Zh{{Ser;clg&}CXriXZCr2A!wIoh;j=_eq3_%n7V}
za?{KhXg2cXPpKHc90t6=`>s@QF-DNcTJRvLTS)E2FTb+og(wTV7?$kI?QZYgVBn)&
zdpJf@tZ{j>B;<<gei3eS+J#ghUE;%Jmd7Pk8%UGHJG8~c^XJ5t4rPt~H~LSUt)e@q
z%yI(@ouv9NKR5?@vcOt632S~0Yt3FWCmv2gPT|mGKc-q%RRCXu?Cj;w26j{76<LJf
zaS8h@vUzynu#YGS<gh$GHq+;%-9o4&y&kK|Wm^q<pRv}g+zU;U%KoOgxhXnt*?y!Q
z{V^AU0u#?=E3&#0wH*19Mnn~;N$z?E8?Rl9>MVHiPl_U&KlqBT)$ic+M0uUQWK|N1
zCMl~@o|}!!7yyT%7p#G4?T^Azxt=D(KP{tyx^lD_(q&|zNFgO%!i%7T`>mUuU^FeR
zHP&uClWgXm6iXgI8*DEA!O&X#X(zdrNctF{T#pyax16EZ5Lt5Z=RtAja!x+0Z31U8
zjfaky?W)wzd+66$L>o`n;DISQNs09g{GAv%8q2k>2n8q)O^M}=5r#^WR^=se#WSCt
zQ`7E1w4qdChz4r@v6hgR?nsaE7pg2<I`;}n^@4MI6vCedZ=C;ol}^bQ*dx&&8nb-&
z3)#xA-8T2gcffMYzDDo_+}wz+P8h>B6<gZ&R)|4Ts?jXVZVoqNhN_k%xHg&3BJR#@
zW~R&|0R@=eu%3D?zM3tcN^a`0bU8Qi)Uc&dq-Yp9jKcw-U#_Ld-XE55mxGO64=eaR
z!|?ouRtds{6xA*X*ir?L8T2|6t2X}m%@CA-7hu;HIu^0Tlxp+QjjALKeWuRI>~+i5
zcTTbBQ2ghUbC-PV(@xvIR(a>Kh?{%YAsMV#4gt1nxBF?$FZ2~nFLKMS!aK=(`WllA
zHS<_7ugqKw!#0aUtQwd#A$8|kPN3Af?Tkn)dHF?_?r#X68Wj;|$aw)Wj2Dkw{6)*^
zZfy!TWwh=%g~ECDCy1s8tTgWCi}F1BvTJ9p3H6IFq&zn#3FjZoecA_L_bxGWgeQup
zAAs~1IPCnI@H>g|6Lp^Bk)mjrA3_qD4(D(65}l=2RzF-8@h>|Aq!2K-qxt(Q9w7c^
z;gtx`I+=gKOl;h=#f<B(e8}^YI_Y_F$m<_@mU7iP@qM+(yD7oUVh}K##GPwk9D0yd
zeHhMzVMULpykwfv+lU+)mgprk!<ah^1r7%w_Qqy@;J2ghF_eBcu1B=+{UtO=Ex9lZ
zTr$(@oW060(mHv6jhqAHt9(%I%Q?HEL?>zSgw-V*YT~2_nnSz|!9hIxFb{~dKB!{H
zSi??dnmr@%(1w^Be=*Jz5bZeofEKKN&@@uHUMFr-DHS!pb1I&;x9*${bmg6=2I4Zt
zHb5LSvojY7ubCNGhp)=95jQ00sMAC{IZdAFsN!lAVQDeiec^HAu=8);2AKqNTT!&E
zo+FAR`!A1#T6w@0A+o%&*yzkvxsrqbrfVTG+@z8l4+mRi@j<&)U9n6L>uZoezW>qS
zA<uWB>4YfO;_9dQSyEYpkWnsk0IY}Nr2m(q<?iJ&^0JJY*WJVZ3B6DY<FXJr8Go@r
z6CZy0n;pNAl$k|qKz7;}tzyFUzN($R$VjbqGJYnWSFqb~_EE~`kN>l@KuQjLgY-@g
z4=$uai6^)A5+~^TvLdvhgfd+y?@+tRE^AJabamheJFnpA#O*5_B%s=t8<;?I;qJ}j
z&g-9?hbwWEez-!GIhqpB>nFvyi{>Yv>dPU=)qXnr;3v-cd`l}BV?6!v{|cHDOx@IG
z;TSiQQ(8=vlH^rCEaZ@Yw}?4#a_Qvx=}BJuxACxm(E7tP4<LzOM5%&sPL0AD{=s;s
z$R415QgAo#{smDow(OHv45*wK-Zi*?A$()F*V<y2E!TYT<^hcHA7K5-ZMT_!rB5`;
z|9vWN^0~I6awJfJRvcCAeNZ=j7mVNot7n9dih18do*-eAieGXMiY-4y>hki^jU@8A
zUS|4tTLd)gr@T|F$1eQXPY%fXb7u}(>&9gsd3It^B{W#6F2_g40cgo1^)@-xO&R5X
z>qKon+Nvp!4v?-rGQu#M_J2v+3e+?N-WbgPQWf`ZL{Xd9KO^s{uIHT<vv%?Nh+;B}
zmyBo-Ds%q}cQg+!oZgz$`xg$^mZZUJf3!&})t~fQTjTmEq}n-f2FtW>J6~@d=mc7i
z+##ya1p+ZHEL<ks3xMG;xOBNv36AC^Vp3h8`CZjBX4sayH7_@oJq-ndaT`jqB@IRP
zv!WtzH@kF&Wb?7eR`V`9dzcL0t|&Wer_hFfyyTy^`=Yg*D>mi%3C>g5V#yZt*jMv(
zc{m*Y;7v*sjVZ-3mBuaT{$g+^sbs8Rp7BU%Ypi+c%JxtC4O}|9pkF-p-}F{Z7-+45
zDaJQx&CNR)8x~0Yf&M|-1rw%KW3ScjWmKH%J1fBxUp(;F%E+w!U470e_3%+U_q7~P
zJm9VSWmZ->K`NfswW(|~fGdMQ!K2z%k-XS?Bh`zrjZDyBMu74Fb4q^A=j6+Vg@{Wc
zPRd5Vy*-RS4p1OE-&8f^Fo}^yDj$rb+^>``iDy%t)^pHSV=En5B5~*|32#VkH6S%9
zxgIbsG+|{-$v7mhOww#v-ejaS>u(9KV9_*X!AY#N*LXIxor9h<byy@5cbGEZK3=io
zT2V8>Dv%aie@+??X6@Et=xz>6ev9U>6Pn$g4^!}w2Z%Kpqpp+M%mk~?GE-jL&0xLC
zy(`*|&gm#mLeoRU8IU?Ujsv=;a<uB2wOxxbt+x_CGPXzy#@rDRkgcBVuX$j~bAGRw
zPYots=o?hh?dXy^E>b*URmsCl+r?%xcS1BVF*rP}XRR%MO_C!a9J^fOe>U;Y&3aj3
zX`3?i12*^W_|D@VEYR;h&b^s#Kd;JMNbZ#*x8*ZXm(jgw3!jyeHo14Zq!@_Q`V;Dv
zKik~!-&%xx`F|l^z2A92aCt4x*I|_oMH9oeqsQgQDgI0j2p!W@BOtCTK8Jp#txi}7
z9kz);EX-2~XmxF5kyAa@n_$YYP^Hd4UPQ>O0-U^-pw1*n{*kdX`Jhz6{!W=V8a$0S
z9mYboj#o)!d$gs6vf8I$OVOdZu7L5%)Vo0NhN`SwrQFhP3y4iXe2uV@(G{N{yjNG(
zKvcN{k@pXkxyB~9<aVnCIiZ=*k!Q8~L1tKaxVd|op5jWsB}Nz|CZHq!epa%JQd;)N
z4E$LOX+w8o^~cMe4a_enR1CKHIa{i@H>ucR(uPSZ7{~sC=lQtz&V(^A^HppuN!@B4
zS>B=kb14>M-sR>{`teApuHlca6YXs6&sRvRV;9G!XI08CHS~M$=%T~g5Xt~$exVk`
zWP^*0h{W%`>K{BktGr@+?ZP}2t0&smjKEVw@3=!rSjw5$gzlx`{dEajg$A58m|Okx
zG8@BTPODSk@iqLbS*6>FdVqk}KKHuAHb0UJNnPm!(XO{zg--&@#!niF4T!dGVdNif
z3_&r^3+rfQuV^8}2U?bkI5Ng*;&G>(O4&M<86GNxZK{IgKNbRfpg>+32I>(h`T&uv
zUN{PRP&onFj$tn1+Yh|0AF330en{b~R+#i9^QIbl9fBv>pN|k&IL2W~j7xbkPyTL^
z*TFONZUS2f3<j5d>3w3)fdzr?)Yg;(s|||=aWZV(nkDaACGSxNCF>XLJSZ=W@?$*`
z#sUftY&KqTV+l@2AP5$P-k^N`Bme-xcWPS|5O~arUq~%(z8z87JFB|llS&h>a>Som
zC34(_uDViE!H2jI3<@d+F)LYhY)hoW6)i=9u~lM*WH?hI(yA$X<G=8N1HS1Fvj49Y
zr{!e0ILA0423drY%0DfXJI9?mv)P9Sb^{}Ddi1|;33N^#;xwZ1s;uEy?|&@^T31A4
z1v}0pzH#c>#ip}yYld3RAv#1+sBt<)V_9c4(SN9Fn#$}_F}A-}P>N+8io}I3mh!}>
z*~*N}ZF4Zergb;`R_g49>ZtTCaEsCHiFb(V{9c@X0`YV2O<Utuc)<>^@c6~LXg2AE
zhA=a~!ALnP6aO9XOC^X15(1T)3!1lNXBEVj5s*G|Wm4YBPV`EOhU&)tTI9-KoLI-U
zFI@adu6{w$dvT(zu*#aW*4F=i=!7`P!?hZy(9iL;Z^De3?AW`-gYTPALhrZ*K2|3_
zfz;6xQN9?|;#_U=4t^uS2VkQ8$|?Ub5CgKOj#Ni5j|(zX>x#K(h7LgDP-QHwok~-I
zOu9rn%y97qrtKdG=ep)4MKF=TY9^n6CugQ3#G2yx;{))hvlxZGE~rzZ$qEHy-<GG^
zCw~Hee9AnIJK5!W2KGioRF>8?pU#G;bwufgSN6?*BeA!7N3RZEh{xS>>-G1!C(e1^
zzd#;39~PE_wFX3Tv;zo>5cc=md{Q}(Rb?37{;YPtAUGZo7j*yHfGH|TOVR#4ACaM2
z;1R0hO(Gl}+0gm9Bo}e@lW)J2OU4nukOTV<IRWfJ?LxQ}Cs$wH=@pn;(E!pGh(4PT
zCSf?oD0HK(b<eq@2#T{&XH0pqKhi2e@F&60q&GZT0!VOz3O!(?fv9x_9?Jl!@ic&&
zvAovwm9zWE2KtEoa+tIGL>KshHy7u)tLH^9@QI-jAnDBp(|J8&{fKu=_97$v&F67Z
zq+QsJ=gUx3_h_%=+q47msQ*Ub=gMzoSa@S<C&>2>`Y9Cj*@Op4plTc!jDhu51nSGI
z^sfZ(4=yzlR}kP2rcHRzAY9@T7f`z>fdCU0zibx^gVg&fMkcl)-0bRyWe12bT0}<@
z^h(RgGqS|1y#M;mER;8!CVmX!j=rfNa6>#_^j{^C+SxGhbSJ_a0O|ae!ZxiQCN2qA
zKs_Z#Zy|9BOw6x{0*APNm$6tYVG2F$K~JNZ!6>}gJ_NLRYhcIsxY1z~)mt#Yl0pvC
zO8#Nod;iow5{B*rUn(0WnN_~~M4|guwfkT(xv;z)olmj=f=aH<b>#Y|#f_*d1H!o(
z!E<ZksS#Iaz>XNxKxth9w1oRr0+1laQceWfgi8z`YS#uzg#s9-QlTT7y2O^^M1PZx
z3YS7iegfp6Cs0-ixlG93(JW4wuE7)mfihw}G~Uue{Xb+#F!BkDWs#*cHX^%(We}3%
zT%^;m&Juw{hLp^6eyM}J({luCL_$7iRFA6^8B!v|B9P{$42F>|M`4Z_yA{kK()WcM
zu#xAZWG%QtiANfX?@+QQOtbU;Avr*_>Yu0C2>=u}zhH9VLp6M>fS&yp*-7}yo8ZWB
z{h>ce@HgV?^HgwRThCYnHt{Py0MS=Ja{nIj5%z;0S@?nGQ`z`*EVs&WWNwbzlk`(t
zxDSc)$dD+4G6N(p?K>iEKXIk>GlGKTH{08Wvreh<CAf?TJ>nHhh%tgpp&8db4*FLN
zETA@<$V=I7S^_KxvYv$Em4S{gO>(J#(Wf;Y%(NeECoG3n+o;d~Bjme-4dldKukd`S
zRVAnKxOGjWc;L#OL{*BDEA8T=zL8^`J=2N)d&E#?OMUqk&9j_`GX*A<zR<6(@2+L7
z@1$o_@SdQ`j0ne14Py8~N$N(bF^OEP4yf&4{)E?@3uqgKCl~oc9JGOl%*Hj(+(E%G
z61_ReO+5gw$@3rF7*zTt16$e`KZAyGV)!rJwJ!yKjS4(jVys!9BpagJUf1M>9?V-G
zdA5QQ#(_Eb^+wDkDiZ6RXL`fck|rVy%)BVv;dvY#`msZ}<bv)Vrqcf?ms>{x5fmd!
zInmWSxvRgXbJ{unxAi*7=Lt&7_e0B#8M5a=Ad0yX#0rvMacnKnXgh>4<kzFZZ+q2=
zSI@wc!e-hJ!WKWxZcvCb6r;@e6kZ)gU~$!}pY}zm1`BBiO&Cp>iiRq<&wit93n!&p
zeq~-o37qf)L{KJo3!{l9l9AQb;&>)^-QO4RhG>j`rBlJ09~cbfNMR_~pJD1$UzcGp
zOEGTzz01j$=-kLC+O$r8B|VzBotz}sj(rUGOa7PDYwX~9Tum^sW^xjjoncxSz;kqz
z$Pz$Ze|sBCTjk7oM&`b5g2mFtuTx>xl{dj<a{IGbs&Xr_Lnl~=L#C-3f_=262-*SN
zks}N?-dkm-=nWk~RaP*30U<!1%uw|>*U$L%y-xeQL~|i>KzdUHeep-Yd@}p&L*ig<
zgg__3l9T=nbM3bw0Sq&Z2*FA)P~sx0h634BXz0AxV69cED7QGTbK3?P?MENkiy-mV
zZ1xV5ry3zIpy>xmThBL0Q!g+Wz@#?6fY<EaoNR>vzmEczs(rcujrfCN=^!iWQ6$EM
zaCnRThqt~gI-&6v@KZ78unqgv9j6-%TOxpbV`tK{KaoBbhc}$h+rK)5h<YjQ73BXl
zpM^mR_u6^E|NA0I`x69&;(xqnK0Q2uo^<*EVpO`Z33U{viEa`@8YY#iRIEJ;osRdP
zL>|bT6wY*t6st-4$e99+Egb#3ip+ERbve08G@Ref&hP)qB&?>B94<kOj@Q1fJNzg4
zo+oqf&lQ9L@Vi_Bum@NgI>?eq5i3k;dOuU#!y-@+&5>~!FZik=z4&4|YHy=~!F254
zQAOTZr26}Nc7jzgJ;V~+9ry#?7Z0o*;|Q)k+@a^87lC}}1C)S))f5tk+lMNqw>vh(
z`A9E~5m#b9!ZDBltf7QIuMh+VheCoD7nCFhuzThlhA?|8NCt3w?oWW|NDin&&eDU6
zwH`aY=<IrWwJm6AY&rFqmNW+-KZ@4)eR-L6R~2;>))lpWG?{fda=-auXYp1WIPu&3
zwK|t(Qiqvc@<;1_W#ALDJ}bR;3&v4$9rP)eAg`-~iCte`O^MY+SaP!w%~+{{1tMo`
zbp?T%ENs|mHP)Lsxno=nWL&qizR+!Ib=9i%4=B@(Umf$|7!WVxkD%hfRjvxV`Co<;
zG*g4QG_>;RE{3V_DOblu$GYm&!+}%>G*yO{-|V9GYG|bH2JIU2iO}ZvY>}Fl%1!OE
zZFsirH^$G>BDIy`8;R?lZl|uu@qWj2T5}((RG``6*05AWsVVa2Iu>!F5U>~7_Tlv{
zt=Dpgm~0QVa5mxta+fUt)I0gToeEm9eJX{yYZ~3sLR&nCuyuFWuiDIVJ+-lwViO(E
zH+@Rg$&GLueMR$*K8kOl>+aF84Hss5p+dZ8hbW$=bWNIk0paB!qEK$xIm5{*^ad&(
zgtA&gb&6FwaaR2G&+L+Pp>t^LrG*-B&Hv;-s(h0QTuYWdnUObu8LRSZoAVd7SJ;%$
zh%V?58mD~3G2X<$H7I)@x?lmbeeSY7X~QiE`dfQ5&K^FB#9e!6!@d9vrSt!);@ZQZ
zO#84N5yH$kjm9X4iY#f+U`FKhg=x*FiDoUeu1O5LcC2w&$~5hKB9ZnH+8BpbTGh5T
zi_nfmyQY$v<uZ;l&g@c%q;+Vgch$G^zJI*;eLwf}d#~$x|9P(K{XKVada<9+sIfYB
zKAm@-U=yZ;64wg$H}Z;yL)GoR=u$~I;@cnfU5TMi>Qh%ildbR7T;7TKPxS<Ob4E3(
znTaa+H!rSqa0vbx%SAld=m88TC+A_c(usssUb>s#vhKR|u<i0Ko**prU~S9yhY2+1
zPX%J@>up`qi1PufMa(tNCjRbllakshQgn1)a8OO-j8W&aBc_#q1hKDF5-X$h`!CeT
z+c#Ial~fDsGAenv7~f@!icm(~)a3OKi((=^zcOb^<lLk;-tgW3Xq;u|w+kECe)CSK
zcriMg^rmc3Yr@_+rl3D>qH$#DVciGXslUwTd$gt{7)<evvuvMrg(Ti)md>&#a`&Lp
ze%AnL0#U?lAl8vUkv$n>bxH*`qOujO0HZkPWZnE0;}0DSEu1O!hg-d9#{&#B1Dm)L
zvN%r^hdEt1vR<4zwshg*0_BNrDWjo65be1&_82SW8#iKWs7>TCjUT;-K~*NxpG2P%
zovXUo@S|fMGudVSRQrP}J3-Wxq;4xIxJJC|Y#TQBr>pwfy*%=`EUNE*dr-Y?9y9xK
zmh1zS@z{^|UL}v**LNYY!?1<k__7o+p+4(1NBmVoECA0-KiaC}AV_?C+7J`NK6$84
zBBqrmc2Of6i%(I;M!$`SXjC=j*Jb1-z1V$vmVAv$?q7A-UNUbIjPc&$&dCZYdrovY
zYk!tOxHv@D?D9y!F}6RcP($xyne%TppYSv>qIRPTvr!gNXzE{%=-`oKclPrfMKwn`
zUwPeIvLcxkIV>(SZ<gIk>-SeBo-yw~{p!<&_}eELG?wxp<p7ueiB^ha`u<BZpHY)>
zee-V59%@<kWnQ!o$=ScYaN1eg<h0xJ+n{>BtB+Z&Xs=O(@P$}v_qy1m=+`!~r^aT>
zY+l?+6(L-=<Qwd6r+5D1gjtj||7^9yk+4?S=Ggr8A1DHM$HUa2z2LxvD6=8#&qY;Z
zt8)xOz>P%m4ScfAYR8;f<Dr$LNuTmbgXDXglYV1=E&7Wn5{y|K*%IZ{6JLH|Dmg(}
znR2;>9dyVw)@(;v{|nO#lAPI1xDHXMYt~-BGiP&9y2OQsYdh7-Q1(vL<<EACIT8XT
z1qBbB|I*^xWzq`9+Gz$W)b?o0;B_{07?)m#_X&4NiqZ!@dMI95k-D2y@#kI!654RD
zYjUTZNp<Jd!Zn^%3j)3$jIWM4-Qun*WT<1+ge_~RzCUVOk8MJ|QtuNIQhY1uMB$;h
zMYbE)LIT&;DS?{%MXv&WEx~h?bBn#UB?S0m9+k!hKZsX-kfe7B^B<*@su?}#wF4VB
z?;H|rx{AeM@(Z*>$u6W0nxVn-qh=nwuRk}{d!uACozccRGx6~xZQ;=#JCE?OuA@;4
zadp$sm}jfgW4?La(pb!3f0B=HUI{5A4b$2rsB|ZGb?3@CTA{|zBf07pYpQ$NM<dsE
z+)HCvvfx}7?%s(mGoXS5m%y~{D7-?vfIM*E-Br$2)`nbbeI(JuN@9us|G8x)CDV5<
z`Lmq6gxN5v!A!|MaD3-`+9x>({C6Srv6%_{rVkCndT=1nS}qyEf}Wjtg<e&Ks@rVk
zCTmzRh=zK-IH2i_l=1F$2220Iw|x(Vy@q&&jtGSk7d?<UZ;dm(=6HqQ(+WnK_lD6C
z*aagnyAQvy-@DtV52PW8=n|p@r}`}M3VRKOLe0lFjJnWp7!6O#BVRO5AyO^F7?H{&
z(VFk3lyh;>$e{ng7Wgz$7itYy0sWW_$qld);iUm85GBH)fk3b=2|5mvflm?~inoVo
zDH_%e;y`DzoNj|NgZ`U%a9(N*=~8!q<HF%wJbappLVVp)97sNgNZK+YXiAqubI6nt
zz^x1f3S?e@nzaE{ASzP}l7_5+M-C#bWf{R<85&j(;XpwyA}tJ2fp5MXx<Tp~8p2^5
zVDpg?+d?DwY}g9Kl_K<Dg(`F?Hb7jFBRG&${$9Q_LIUX(@2T%~4C1mM#ex5Qw;}5w
z-+yc6zt@a=dt*=&%0@|mbr+$oV`R`;g+R{T?MS63V>qy0Etkxo#`r!!{|(NyT0;5=
z8nVZ6AiM+SjMG8J@6c4_f-KXd_}{My?Se1GWP|@wROFpD^5_lu?I%CBzpwi(`x~xh
B8dv}T

delta 17845
zcmV)CK*GO}(F4QI1F(Jx4W$DjNjn4p0N4ir06~)x5+0MO2`GQvQyWzj|J`gh3(E#l
zNGO!HfVMRRN~%`0q^)g%XlN*vP!O#;m*h5VyX@j-1N|HN;8S1vqEAj=eCdn`)tUB9
zXZjcT^`bL6qvL}g<Hw9Mj^|#&N2h?(F`1lu_ndpq?{_}-=D|N7-vjUr-ZBx#3-xHh
z2`L7p$e1Kf*5QAYiPLzo0STOunzJU(VW<Ja7%`AF@RErrUXGlZf%=%pVN{Cq2F46r
zFfh&#alCR__zWF+&o8ITJ})^Uz2x(S1>vXj%9vrOD+x!Gc_0{$Zg+6lTXG$bmoEBV
z*%y^c-mV0~Rjzv%e6eVI)yl>h;TMG)Ft8lqpR`>&IL&`>KDi5l$AavcVh9g;CF0tY
zw_S0eIzKD?Nj~e4raA8wxiiImTRzv6;b6|LFmw)!E4=CiJ4I%&axSey4zE-MIh@*!
z*P;K2Mx{xVYPLeagKA}Hj=N=1VrWU`ukuBnc14iBG?B}Uj>?=2UMk4|42=()8KOnc
zrJzAxxaEIfjw(CKV6F$35u=1qyf(%cY8fXaS9iS?yetY{mQ#Xyat*7sSoM9fJlZqq
zyasQ3>D>6p^`ck^Y|kYYZB*G})uAbQ#7)Jeb~glGz@2rPu}zBWDzo5K$tP<|meKV%
z{Swf^eq6NBioF)v&~9NLIxHMTKe6gJ@QQ^A6fA!n#u1C&n`aG7TDXKM1Jly-DwTB`
z+6?=Y)}hj;C#r5>&x;MCM4U13nuXVK*}@yRY~W3X%>U>*CB2C^K6_OZsXD!nG2RSX
zQg*0)$G3%Es<rMi9IFkILZk8W3*zmnaEl_-v&C>$otA@<d5B&i@NKtDgSW_?su;gQ
zolk$}wmPmIAgB0t!H8pWXh)p3t<)yxd~Zn^WNM9@hA}ROLYwE;<qYL=a)z{do7&c~
zOU=+lw_zN_7aE%7#L)HEEQf~HkenM@!(`u&10)a9(=6#VTH~n|uvG6dLaDxGXen(O
z;XBH!lVmG&lAn|B7pTXVXv9~9^flpue#(Cz-8iJK+qlAIYA2CHw5Qpu;k}OteSyKQ
z`kU`!PwGQxpTSIZwT4%qle~EgQBsDQBOk$-mgY|plS?ld@1iaO$x2hK4#FV$4PEx%
z64rN=-S>p_1N!hIPT(iSE=8OPZG+t)o<dTw8$=ITLu%Kn&h^n=hZc{ukec4F8s&cn
zHOkqTnd<CbL4C}0<_7eHehWv4SvaA;hXayxLSKbRv}1?wq9KIoR6?gJ-bT}){t2Qp
z?fMED@841214PiOrSSynNd8Pk{e>FyD~{nevj0gZen$p>U<7}uRE`t5Mk1f4M0K*5
zbn<D{nCwP+S(Ox1JDHTGlB$C?aL!zS)j)aC4N=Q$g0hm{@mNXgzR`KZi=*k<JFD2U
zislbCS|3r-{@$V0$7^VDJg3k?#9Vqlk0;eXFI_&!Q-<chP)h>@3IG5I2mk;8K>*RZ
zPV6iL006)S001<T5fUDgJPsUxQxZ`W|6N2E*F}j?Q}ZJ=15{A^(lk>s%0eYj)9hu1
z9o)iQT9(v*sAuZ|ot){RrZ0Qw4{E0A+!Yx_M~#Pj&OPUM&i$RU=Uxu}e*6Sr2ror=
z&?lmvFCO$)BY+^+21E>ENWe`I0{02H<-lz&?})gIVFyMWxX0B|0b?S6?qghp3lDgz
z2?0|ALJU=7s-~Lb3>9AA5`#UYCl!Xeh^i@bxs5f&SdiD!WN}CIgq&WI4VCW;M!UJL
zX2};d^sVj5oVl)OrkapV-C&SrG)*x=X*ru!2s04TjZ`pY$jP)4+%)7&MlpiZ`lgoF
z<z)BC1fvX1DaDLZ_@-`uBujj%t}%3ZeUVr4TREsHX7F?nWpHMA-Xk|J!iq`DS}GVf
z4OL4K$Uz`ePv~ieY74)ZRfxYcZpw+*vvS6&Rlqbur}xYv21j`ZZCe8j?dJd)#JHX_
z5=vO*eRLkV0-T?O1~f`|h(`h*OPIkE2~QCbFe_mW^9+sURZQi7)O1oYBt-FyQU{7<
zNQhxxKwQEC78z;-Weov$5b5@FdMV(!gk`L7YA+<TqeH+dL*W0uDMLf?oH9r2nf+pL
z(JaK2H#sFs@P+LRZ(7;jTRIZQ(sv(2QuDhnf@7$R#^#q-7<w+6w}d5qmBm<uOr@;I
zLMW+p&rrk1yf}h?o+JG6A+6#q(ddiydr!JgMid5uPq(QbnutmXYCCHx8^yD!+vYaa
zd7<2tbodnD1w&osHX>o_p>^4qGz^(Y*uB10dY2kcIbt=$FIdYNqk;~47wf@)6|nJp
z1cocL3zDR9N2Pxkw)dpi&_rvMW&Dh0@T*_}(1JFSc0S~Ph2Sr=vy)u*=TY$i_IHSo
zR+&dtWFNxHE*!miRJ%o5@~GK^G~4$LzEYR-(B-b(L*3jyTq}M3d0g6sdx!X3-m&O%
zK5g`P179KHJKXpIAAX`A2MFUA;`nXx^b?mboVbQgigIHTU8FI>`q53AjWaD&aowtj
z{XyIX>c)*nLO~-WZG~>I)4S1d2q@&?nwL)CVSWqWi&m1&#K1!gt`g%O4s$u^->Dwq
ziKc&0O9KQ7000OG0000%03-m(e&Y`S09YWC4iYDSty&3q8^?8ij|8zxaCt!zCFq1@
z9TX4Hl68`nY>}cQNW4Ullqp$~SHO~l1!CdFLKK}ij_t^a?I?C^CvlvnZkwiVn>dl2
z2$V(JN{`5`-8ShF_ek6HNRPBlPuIPYu>TAeAV5O2)35r3*_k(Q-h1<oe`Z&D<40Ft
zBcd&T{H%vo)9-oc7=5c8y|+a3`=a>+h5pb(Zu%oJ__pBsW0n5ILw`!&QR&YV`g0Fe
z(qDM!FX_7;`U3rxX#QHT{f%h;)<e7LdkX!XLVxd}I{F6>Eursw=*#qvV)~y%^Uo^%
zi-%sMe^uz;#Pe;@{JUu05zT*i=u7mU9{MkT`ft(vPdQZoK&2mg=tnf8FsaNQ+QcPg
zB>vP8Rd6Z0JoH5_Q`zldg;hx4azQCq*rRZThqlqTRMzn1O3_rQTrHk8LQ<{5UYN~`
zM6*~lOGHyAnx&#yCK{i@%N1Us@=6cw=UQxpSE;<(LnnES%6^q^QhBYQ-VCSmIu8wh
z@_Lmwc<AfAQRRAtHwjXM%8e>FDfAhIn>`%h7L{)iGBzu`Md4dj-m3C8mA9+BL*<>q
z#$7^ttIBOE-=^|zmG`K8yUKT{yjLu2SGYsreN0*~9yhFxn4U};Nv1XXj1fH*v-g=3
z@tCPc`YdzQGLp%zXwo*o$m9j-+~nSWls#s|?PyrHO%SUGdk**X9_=|b)Y%^j_V$3S
z>mL2A-V)Q}qb(uZipEFVm?}HWc+%G6_K+S+87g-&RkRQ8-{0APDil115eG|&>WQhU
zufO*|e`hFks^cJJmx_qNx{ltSp3aT|XgD<x?C$Ix95~e-?CJ`JIx({^gvA?wYnXif
zoqP8cWngm0%+XP?j}={}HQF+2>5-VxGGXb7gkiOG$w^qMVBDjR8%!Sbh72niHRDV*
ziFy8LE+*$j?t^6aZP9qt-ow;hzkmhvy*Hn-X^6?yVMbtNbyqZQ^rXg58`gk+I%Wv}
zn_)dRq+3xjc8D%}EQ%nnTF7L7m}o9&*^jf`_qvUhVKY7w9Zgxr-0YHWFRd3$l_6UX
zpXt^U&TiC*qZWx#pOG6k?3Tg)pra*fw(O6_45>lUBN1U5Qmc>^DHt)5b~Ntjsw!NI
z1n4{$HWFeIi)*qvgK^ui;(81VQc1(wJ8C#tjR>Dkjf{xYC^_B^#qrdCc)uZxtgua6
zk98UGQF|;;k`c+0_z)tQ&9DwLB~&12@D1!*mTz_!3Mp=cg;B7Oq4cKN>5v&dW7q@H
zal=g6Ipe`siZN4NZiBrkJCU*x216gmbV(FymgHuG@%%|8sgD?gR&0*{y4n=pukZnd
z4=Nl~_>jVfbIehu)pG)WvuUpLR}~OKlW|)=S738Wh^a&L+Vx~KJU25o6%G7+Cy5mB
zgmYsgkBC|@K4Jm_PwPoz`_|5QSk}^p`XV`649#jr4Lh^Q>Ne~#6Cqxn$7dNMF=%Va
z%z<AsBy*Nm$qcPRtn58~4;F#DO3=3TTAjKTiwdqKd0hD(l8ifl@)+GRtI%1Rw?ZO(
zmz+Szx|nJK58+fyw~fJ^C)O5^R^hg#=i(9@)dYl2m=<>9Ef6QmfoXAlQ3)PF8#3Y%
zadcE<1`fd1&Q9fMZZnyI;&L;YPuy#TQ8b>AnX<x$C{{p37Ks8vjz*8r1<^dA(Ff^4
zjUJ+uMh{bpsciv&6kGQ$XCNeUw?-eL^BR4Oo<Ib~Y&#K12;>r*SGY&xUb>2678A+Y
z8K%HOdgq_4LRFu_M>Ou|kj4W%sPPaV)#zDzN~25klE!!PFz_>5wCxglj7WZI13U5|
zEq_YLKPH;v8sEhyG`dV_jozR);a6dBvkauhC;1dk%mr+J*Z6MMH9jqxFk@)&h{mHl
zrf^i_d-#mTF=6-T8Rk?(1+rPGgl$9=j%#dkf@x6>czSc`jk7$f!9SrV{do%m!t8{?
z_iAi$Qe&GDR#Nz^#uJ>-_?(E$ns)(3)X3cYY)?gFvU+N>nnCoBSmwB2<4L|xH19+4
z`$u#*Gt%mRw=*&|em}h_Y`Pzno?k^8e*hEwfM`A_yz-#vJtUfkGb=s>-!6cHfR$Mz
z`*A8jVcz7T{n8M>ZTb_sl{EZ9Ctau4naX7TX?&g^VLE?wZ+}m)=YW4ODRy*lV4%-0
zG1XrPs($mVVfpnqoSihnIFkLdxG9um&n-U|`47l{bnr(|8dmglO7H~yeK7-wDwZXq
zaHT($Qy2=MMuj@lir(iyxI1HnMlaJ<jX%sE(fCn*3?3Gn4nSlq&@KU5<Hz}<NX%K-
zMTN~lIE^px$DD-EU%M{1qACNs17;@Nj-Gt*Rrm>wpX86je}e=2n|Esb6hB?SmtDH3
z2qH6o`33b{;M{mDa5@@~1or8+Zcio*97pi1Jkx6v5MXCaYsb~Ynq)eWpKnF{n)FXZ
z?Xd;o7ESu&rtMFr5(yJ(B7V>&0gnDdL*4MZH&eO+r*t!TR98ssbMRaw`7;`SLI8mT
z=)hSAt~F=mz;JbDI6g~J%w!;QI(X14AnOu;uve^4wyaP3>(?jS<ljwsU5!7<p8}i}
zL7L#c+-+~wLLj;s_n}*|CFnpNPNHIW9&Eq(bs-;&;(6@(b=_4E{(&*eoXA{DmlQp8
znGXNI-Kxc9CO;b|K^L%!!T>Lp+LQ7uU(iib%IyB<ywG`)hV2}Kh*;jWpny-xs1#~{
zbqmCdt821{{_GXnJ$@z<wUY88e+*@1o6>(d&g@+hg;78M>h7yAeq$ALRoHGkKXA+E
z$Sk-hd$Fs2<K7hR`?HSPSmeG}{4J#x%N=>nL4w<PeNfsVCF_wKy$W6_$epEmZYjK4
zi+d!*BDQw+O#prhLbfH}8_MdBw~JwaO+mWJsY>9p@O*Y$c;U)W#d~)&8Js;i^Dp^*
z0*7*zEGj~VehF4sRqSGny*K_CxeF=T^8;^lb}HF125G{kMRV?+hYktZWfNA^Mp7y8
zK~Q?ycf%rr+wgLaHQ|_<6z^eTG7izr@99SG9Q<u__?-*+Lj0<oJ4_lDPNp1xOi0I-
zBk-Z{m?6MYLI0qcv@^Xv0JziBMLwwL9Z4DDm=IOI-_l3N<qbRWo|1PyCHQ|^CaiX&
zfb>{$PCjJabSz`6L_QJJe7{LzTc$P&pwTy<&3RRUlSHmK;?}=QAhQaDW3#VWcNAH3
zeBPRTDf3?3mfdI$&WOg(nr9Gyzg<O~aeU!4%Dw6dhqX`I;`>`&u^o!f2rKJ57D_>p
z6|?Vg?h(@(*X=o071{g^le>*>qSbVam`o}sAK8>b|11%e&;%`~b2OP7--q%0^2YDS
z`2M`{2QYr1VC)sIW9WOu8<~7Q>^$*Og{KF+kI;wFegvaIDkB%3<qeI0+|)cpd`XIV
zR5F&JZ6TFzp~ui`$S~65^ilbpw_GY>*%PWtWKSq7l`1YcDxQQ2@nv{J!xWV?G+w6C
zhUUxUYVf%(Q(40_xrZB@rbxL=Dj3RV^{*yHd>4n-TOoHVRnazDOxxkS9kiZyN}IN3
zB<F0}kh5un+-`~NJtS>^5<Ov^3sk&XI@aAOttDFN^<1Hf*Qvs*;dz~^rm1q6r>N=*
zRSTO+rA<{*P8-$GZdyUNOB=MzddG$*@q>mM;pUIiQ_z)hbE#Ze-IS)9G}Rt$5PSB{
zZZ;#h9nS7Rf1ecW&n(Gpu9}{vXQZ-f`UHIvD?cTbF`YvH*{rgE(zE22pLAQfhg-`U
zuh612EpByB(~{w7svCylrBk%5$LCIyuhrGi=yOfca`=8ltKxHcSNfDRt@62QH^R_0
z&eQL6rRk>Dvf6rjMQv5ZXzg}S`HqV69hJT^pPHtdhqsrPJWs|IT9>BvpQa@*(FX6v
zG}TYjreQCnH(slMt5{NgUf)qsS1F&Bb(M>$X}tWI&yt2I&-rJbqveuj?5J$`Dyfa2
z)m6Mq0XH@K)Y2v8X=-_4=4niodT&Y7W?$KLQhjA<+R}WTdYjX9>kD+SRS^oOY1{A=
zZTId-(@wF^UEWso($wZtrs%e7t<}YaC_;#@`r0LUzKY&|qPJz*y~RHG`E6bypP5AX
zN!p0^AUu8uDR>xM-ALFzBxXM~Q3z=}fHWCIG>0&I6x2Iu7&U)49j7qeMI&?qb$=4I
zd<toLH_|bTXh!IH%zTALX`0694LSoG67(Iqm%d9DeGe<Xj|6_3#_1i3!<q!IqkDN1
zSsWmnw@`|Ix6=gg0)mMAc@}xHg?^SkjWr6i-%rocXOLkD==cd>MmhAJrO%@0f%YW!
z^gLByE<rzqUM2SO4f<*N8D!WybTfSpk`$3u*?dIL$w%}u`B=g`>GSk+R0<o|SzE^2
z=mq+Dc&Un;=ojc0k)5JQzDX4`P*$nXYK3+y^aX`~zNpZP3VlhTFDrCXSj;X!&J5Kr
z$i<TD=DHaeuN372_|0IC1(W1Vu|iuT3SFE5w$v13aQ=V=%?vhqBOQ6wsEW@=4#3<G
zKMNRYo~GTy4QblLXl}>v4*d4w*N$Ju6z#j%HBI}6y$2en=-@S3=6+yZX94m&1j@s-
z7T6|#0$c~dYq9IkA!P)AGkp~S$zYJ1SXZ#RM0|E~Q0PSm?DsT4N3f^)b#h(u9%_V5
zX*&EIX|gD~P!vtx?ra71pl%v)F!W~X2hcE!h8cu@6uKURdmo1-7icN4)ej4H1N~-C
zjXgOK+mi#aJv4;`DZ%QUbVVZclkx;9`2kgbAhL^d{@etnm+5N8pB#fyH)bxtZGCAv
z(%t0kPgBS{Q2HtjrfI0B$$M0c?{r~2T<RSTf!OM5X3QT;)A80apUYQ<$z#K%jo!P`
zbOH>=zeXo7V&&aprCzww=i*}Atu7g^(*ivauMz~kkB%Vt{Wydlz%%2c26%>0PAbZO
zVHx%tK(uzDl#ZZK`cW8TD2)eD77wB@gum{B2bO_jnqGl~01EF_^jx4Uqu1yfA~*&g
zXJ`-N?D-n~5_<grn_osx<j94buP;cy;tm9e`4#$A*eE>QNF_5+Un<iW1@v`M1E*$?
zJ+2%H1WCn`>-4&l$<JXVg1Oln#u3?n?Tw)AX}V5pfSfCwe8Ks)vj$jeG-vYVBC>1b
zVlHFq<avD&0lWm;Uqa1&1#o#eFH<(>tluoN85b^C{A==lp#hS9J(npJ#6P4aY41r)
zzCmv~c77X5L}H%sj>5t&@0heUDy;S1gSOS>JtH1v-k5l}z2h~i3^4NF6&iMb;ZYVE
zMw*0%-9GdbpF1?HHim|4+)Zed=Fk<2Uz~GKc^P(Ig@x0&XuX0<-K(gA*KkN&lY2Xu
zG054Q8wbK~$jE32#Ba*Id2vkqmfV{U$Nx9vJ;jeI`X+j1kh7hB8$CBTe@ANmT^tI8
z%U>zrTKuECin-M|B*gy(SPd`(_xvxjUL?s137KOyH>U{z01cBcFFt=Fp%d+BK4U;9
zQG_W5i)JASNpK)Q0wQpL<+Ml#cei41kCHe&P9?>p+KJN>I~`I^vK1h`IKB7k^xi`f
z$H_mtr_+@M>C5+_xt%v}{#WO{86J83;VS@Ei3JLtp<*+hsY1oG<nU}c+^yg_Dk>zo
z0?$?OJO$79;{|@aP!fO6t9TJ!?8i&|c&UPWRMbkwT3nEeFH`Yyyh6b%Rm^nBuTt@9
z+$&-4lf!G|@LCo3<8=yN@5dYbc%uq|Hz|0tiiLQKiUoM9g14zyECKGv0}3AW<LxTK
zc!!F2;$8CV-Ew%39Nz24ML#a7sKoo^{QW9EfDfw3U|7Wn9#VhtFh&)8NWo<l>v2WJ
zUAXGUhvkNk`0-H%ACsRSmy4fJ@kxBD3ZKSj6g(n1KPw?g{v19phcBr3BEF>J%lL|d
zud3LNuL;cR*xS+;X+N^Br+x2{&hDM<N4j_Sc6IL(2t-ckr}d_|o*ZcEv8`BgV1vNa
zRx_Eh^`yODkEeePfl$fzw)WnZu1I@Z4yP{5vS(jcdvA_9uYg*zsbXU+8M8MFl!Y7i
z3;0^ieoCu}#FECYbmEv{_3FpshE&pw>hb-$6_fKU(Pt0FQUXgNrZvzsVCnsFqv?#L
z4-FYsQ-?D>;LdjHu_TT1CHN~aGkmDjWJkJg4G^!+V_APd%_48tErDv6BW5;ji^UDD
zRu5Sw7wwplk`w{OGEKWJM&61c-AWn!SeUP8G#+beH4_Ov*)NUV?eGw&GHNDI6G(1Y
zTfCv?T*@{QyK|!Q09wbk5koPD>=@(cA<~i4pSO?f(^5sSbdhUc+K$DW#_7^d7i%At
z?KBg#vm$?P4h%?T=XymU;w*AsO_tJr)`+HUll+Uk_zx6vNw>G3jT){w3ck+Z=>7f0
zZV<RBTo{nTnT)OKN^+H6P{iI)9M0OTLisYLg-h7{ab~5|Ete5V!*1HQw~K3na^@Eh
zd(I_o{cO%2@`UmdZI{^^*HfuB<M=i+o$PP7EXRNTsXewHJ-JgKa&lh5Hw0FNCyr`~
zs#_+t=|&+`d(5;IHQe-`S#rKsNP$cP4~RDNOfqij{TlY7N5d15)?g#0;V9_W&_t&~
z!#D9Q`oH*4GKVH}@EHoSPIK9orwO=xkXfMN+xU)x?`rrSzE7T00_CUDF~b&E{eK)g
z4L^Ut4>kM<KUVM)4Ugid%%br_)TyTi8AJ^~!_O7`Lc=fdD-AI`MZ*wIX*hwWD)_aA
z-{7|bb3DxIlI1ua=izo2&QRr*(xJaA^xzo(ZrvViNu`Vgv&NEqzn8-w1nNDQx3X5H
zY)+)Vm~gH^f5e{zwER4xN$$=S<K<4m{#k#)Uo`v`f79@H8Qg#1nudSk8q33-%nNIg
zKvlt(f8pP9-(w2?qv3J<SD_#w#1uu8X~HMU6;YuHMfjOdH#kA`)Ob$pO(*SG!pJQW
zUsP&Bm0I|YQ+Z8P2~A*gtDa1ncBtQ=kqL${6qV<0i2e#4H?2_CCn47P&~eL5gra|J
zNyqe*5vpIDs$Wr%huz0c7*SgjQ$@8DSEGn&ny3{4Mbv3xI?}8(H$LE+n1O4Gn5l_b
zVm32U1Qjty6LTeTp3DzI1h0E2rOf#(iQ_WzT%+YXPS(wM+&r@{c{0hv*ge)C7KIxo
z)08UAEa*DV)_DVn?p&#xh=(aMsHcBgtbugGNZJ#rmcy0(@_1|@Z813)m(;jYV`MKV
zcRKQ9t?_J`dE1=gz(PG>*!k^Z_E@_pZK6uH#|vzoL{-j1VFlUHP&5~q?j=UvJJNQG
ztQdiCF$8_EaN_Pu8+afN6n8?m5UeR_p_6Log$5V(n9^W)-_vS~Ws`RJhQNPb1$C?|
zd9D_ePe*`aI9AZ~Ltbg)DZ;JUo@-tu*O7CJ=T)ZI1&tn%#cisS85EaSvpS~c#CN9B
z#Bx$vw|E@gm{;cJOuDi3F1#fxWZ9+5JC<e{LvdZ+7pxTd*M}z+T`$b~$!(=qYR0Kf
zt#wVO(KgF8>qVRCz5o`EDW890NUfNCuBn)3!&vFQE{E$L`Cf7FMSSX%ppLH+Z}#=p
zSow$)$z3IL7frW#M>Z4|^9T!=Z8}B0h*MrWXXiVschEA=$a|yX9T~o!=%C?T+l^Cc
zJx&MB$me(a*@lLLWZ=<H=nUNL9^OCXvBxWNGd%W6P27%^Wai1n>>PhKs!}#!ICa0!
zq%jNgnF$>zrBZ3z%)Y*yOqHbKzEe_P=@<5$u^!~9G2OAzi#}oP&UL9JljG!zf{JIK
z++G*8j)K=$#57N)hj_gSA8go<n<4*~1n?n<2zEkX7iUvY#d&w$T;qIq-n@qMJ$dtK
z@bjBDb&kEHH1SvPx4eIG7*j4eEc-ZCIK&Y4bJSc09KaL!TZuj#Bo{Y}d#F?uX;(*3
z7Fjw1-%bwYyGBvbHw>lO7xZP|KM?elUq)qLS)i(?&lk{oGMJh{^*FgklBY@Xfl<_Q
zXP~(}ST6V01$~VfOmD6j!Hi}lsE}GQikW1YmBH)`f<dm#Y4(2y{mVx%S5D?NS1udD
z{AM+%HjZLJU$Al%f@9#OKxh~@k78k8&_9e@hOuZAiwU$OgZgo^w<Ex@o?Z^q&<0dv
zDQ00A=3_b5U<Ep{lHR<Pj#$m-%~}|^4QH_)PeU{A#zvfHj4ogcuAtR%-H_`Z9KxMW
z>_+)KI!t#~B7=V;{F*`umxy#2Wt8(EbQ~ks9wZS(KV5#5Tn3Ia90r{}fI%pfbqBAG
zhZ)E7)ZzqA672%@izC5sBpo>dCcpXi$VNFztSQnmI&u`@zQ#bqFd9d&ls?RomgbSh
z9a2rjfNiKl2bR!$Y1B*?3Ko@s^L5lQN|i6ZtiZL|w5oq%{Fb@@E*2%%j=bcma{K~9
z*g1%nEZ;0g;S84ZZ$+Rfurh;Nhq0;{t~(EIRt}D@(Jb7fbe+_@H=t&)I)gPCtj*xI
z9S>k?WEAWBmJZ|gs}#{3*pR`-`!HJ)1Dkx8vAM6Tv1bHZhH=MLI;iC#Y!$c|$*R>h
zjP{ETat(izXB{@tTOAC4nWNhh1_%7AVaf!kVI5D=Jf5I1!?}stbx_Yv23hLf$iUTb
z-)WrTtd2X+;vBW_q*Z6}B!10fs=2FA=3gy*dljsE43!G*3Uw(Is>(-a*5E!T4}b-Y
zfvOC)-HYjN<T>fcpi`<nf-dRCvb<3DQ>=kG%(X3XcP?;p&=pz+F^6LKqRom~pA}O*
zitR+Np{QZ(D2~p_Jh<vCoM0+TuBZPGvkW<o2?W>-k|dL!LPmexLM?tEqI^qRDq9Mg
z5XBftj3z}dFir4oScbB&{m5>s{v&U=&_trq#7i&yQN}Z~OIu0}G)>RU*`4<}@7bB%
zKYxGx0#L#u199YKSWZwV$nZd>D>{mDTs4qDNyi$4QT6z~D_%Bgf?>3L#NTtvX;?2D
zS3IT*2i$Snp4fjDzR#<)A``4|dA(}wv^=L?rB!;kiotwU_gma`w+@AUtkSyhwp{M}
z!e`jbUR3AG4X<hiCae!0Z#IQzg_MO}8r9LZ8v9gatnAdq>vnBVcyIZht6Vi~?pC<x
z$UMBL*Un7qe%rPwVc5u??{Jvv@h48*X+33_?}H3zszQHeTZax+9HxTd_!Z$f2aech
zh-P!|7*abeZXa*+X4sU$RVNFp#Ueu?du6y}MLrh0fRY4k3<2mr8fTz23ECVQbp8Y-
z&)QObbuwkr*lDyqTgbBA1GXX|CT`-EiBViLVIpP1K+?n%?&?@)Sh}Jk6BD>C!$XF2
z*V~)DBVm8H7$*OZQJYl3482hadhsI2NCz~_NINtpC?|KI6H3`SG@1d%PsDdw{u}hq
zN;OU~F7L1jT&KAitilb&Fl3X12zfSuFm;X)xQWOHL&7d)Q5wgn{78QJ6k5J;is+XP
zCPO8_rlGMJB-kuQ*_=Yo1TswG4xnZd&eTjc8=-$6J^8TAa~kEnRQ@Zp-_W&B(4r@F
zA==}0vBzsF1mB~743XqBmL9=0RSkGn$cvHf*hyc{<2{@hW+jKjbC|y%CNupHY_NC%
zivz^btBLP-cDyV8j>u)=loBs>HoI5ME)xg)oK-Q0wAy|8WD$fm>K{-`0|W{H00;;G
z000j`0OWQ8aHA9e04^;603eeQIvtaXMG=2tcr1y8Fl-J;AS+=<0%DU8Bp3oEEDhA^
zOY)M8%o5+cF$rC?trfMcty*f)R;^v=f~}||Xe!#;T3eTDZELN&-50xk+J1heP5<Y<
znaL!12>AQ>h5O#S_uO;O@;~REd*_G$x$hVeE#bchX)otXQy|S5(oB)2a2%Sc(iDHm
z=d>V|a!BLp9^#)o7^EQ2kg=K4%nI^sK2w@-kmvB+ARXYdq?xC2age6)e4$^UaY=wn
zgLD^{X<Qzp>0A+{ySY+&7Rp<dye-mragf3s3i1+O8l*a2CZEftSs~5J@pO#O4)7|C
zt7Uj~klxE{r1P8rua)PyL4F6<1h{`zM(RZRbwXGlq#|A);Pd3ULF0xXt>ldwpC6=E
zSPq?y(rl8ZN%(A*sapd4PU+dIakIwT0=zxIJEUW0kZSo|(zFEWdETY*ZjIk9uNMUA
ze11=mHu8lUUlgRx!hItf0dAF#HfdIB+#aOuY--#Q<WBCACK9Bb(sOZ;c5{Cyz<cBw
zm1bp-V;m1~BFNo*$vCz+DJt0kPRa995vWJw-XL{}RlB%vJiX3)rFpN$?+a3lo1}Ta
z5Pm@8%QU_`NS4rE!XK0g9};Ch9HckI4PDZ_!B=Sf5sj~8(i`GQ+lWT%y3Dpc>N9Ry
zbx|XkG?PrBb@l6Owl{9Oa9w{x^R}%GwcEEfY;L-6OU<?oOa+Y>8<!eYQ6t`2)ofdl
zc;{-S33UnK7q@p9(UckBeN6snqO;Sqm}WF4tj?-V%V>|9RXvu`-ECS`jcO1x1MP{P
zcr;<OGtG7*Y*?2bmsPqAyQ>Bw##*Dod9K@pEx9z9G~MiNi>8v1OU-}vk*HbI)@CM?
zn~b=jWUF%HP=CS+VCP>GiAU_UOz$aq3%%Z2laq^Gx`WAEmuNScCN)OlW>YHGYFgV2
z42lO5ZANs5VMXLS-RZTvBJkWy*OeV#L;7HwWg51*E|RpFR=H}h(|N+79g)tIW!RBK
ze08bg^hlygY$C2`%N>7bDm`UZ(5M~DTanh3d~dg+OcNdUanr8azO?})g}EfnUB;5-
zE1FX=ru?X=zAk4_<Ezl!IJ%o@*-5QDZ_F&LtjWsjB34$YVV!lg_^wE|e8ZN&iP<gF
zk{VwPw_va>6@__o1fE+ml1r&u^f1Kb24Jf-)zKla%-dbd<mrDhd(j_(Z#&e2c`*dZ
zEQdkTY)e@YyRT{!&<SX+i*%Yv8@xOn0)xWrstxh(l#P{4BPP+-+6V6&w!t(G>>UZ1
zrj3!RR!Jg`ZnllKJ)4Yfg)@z>(fFepeOcp=F-^VHv?3jSxfa}-NB~*qkJ5Uq(yn+(
z<8)qbZh{C!xnO@-XC~XMNVnr-Z+paowv!$H7>`ypMwA(X4(knx7z{UcWWe-wXM!d?
zYT}xaVy|7T@yCbNOoy)$D=E%hUNTm(lPZqL)?$v+-~^-1P8m@Jm2t^L%4#!JK#Vtg
zyUjM+Y*!<JsDnwU8g|E1uIfHP3rHvJ9!aXvBUq$4(iwj@?39JY7oCLH7;6A1Nz<<H
z1@>$);1<)0MUqL00L0*EZcsE&usAK-?|{l|-)b7|PBKl}?TM6~#j9F+eZq<vwyg-f
zQ6xX`>25_L&oSl}D<NsQHWi6FoUn<~8Dj}##2gV0o3l~7I_rNmqaltZtyDLRo=Y;p
z0a9He7Bhe1h(8@f2`e3S8ea>OMv^-tacpDI)l*Ws3u+~jO@;t(T)P=HCEZ#s_5q=m
zOsVY!QsOJn)&+Ge6Tm)Ww_Bd@0PY(78ZJ)7_eP-cnXYk`>j9q`x2?Xc6O@55wF+6R
zUPdIX!2{VGA;FSivN@+;GNZ7H2(pTDnAOKqF*ARg+C54vZ@Ve`i?%nDDvQRh?m&`1
zq46gH)wV=;UrwfCT3F(m!Q5qYpa!#f6qr0wF=5b9rk%HF(ITc!*R3wIFaCcftGwPt
z(kzx{$*>g5L<;u}HzS4XD%m<I!)UoMT66l0a_guJuN5cfb<%8;;k8nDRh|y7UBi>l
zmdStbJcY@pn`!fUmkzJ8N>*8Y+DOO^r}1f4ix-`?x|khoRvF%jiA)8)P{?$8j2_qN
zcl3Lm9-s$xdYN9)>3j6BPFK)Jbovl|Sf_p((CHe!4hx@F)hd&&*Xb&{TBj>%pT;-n
z{3+hA^QZYnjXxtF2XwxPZ`S#<d^2juw?KdUVqx|<op0e=p+c^Pi1+3VHI*oQbiR#0
zkD$*T%?V;~fUbNye?jLj@|Se}GGC|jLH-JIk9!%S@mF>J8h>5qLwtwM-{5abbEnRS
z`9_`Zq8FJiI#0<P&Mg(f3yPBq!tDt&8IC9HFe+Bth{VH2yboj+w%3HDvxVXM^j?1(
zwiDqFWb&}ti)}gD7hasD>syE_V_3M&trw$P=ezkHosV$8&I5c0(*-9KBE5DJOC-Xv
zw<m$lNBLfj@6&mZzs0oi<Qj|X3`>}1bq~AD0_Xerm`<Ok+jV|`AJqBVFe!KKkg_Mz
zrgD2Y(cv~V++o1E?Q@Fb#qkz^+m(MNX7q)-j7!aMt7*o=wh`-=A|TuovAY%)$JOb;
ziiPbi!$xC<7r55`3&P!20u$}NF!bn?wH%06rXjj8Jr0A0r2+~^l2F?c>%ryiG9_$S
z5G|btfiAUNdV09SO2l9v+e#(H6HYO<P!tR27Pw*5XVu~2WN|!`P{UGP%8-B4o%Ll~
zx=yTCUICkMjVkuW4CwqFz7h4!Fut~?;&vovX6q0Mx`$8|3}@dO%QE^T1?&7>dQs=^
z@xwZQU)~;p1L*~ciC}9ao{nQ-@B>r<C#s-EpgVIa@U?Zt5-52*E0-_V`G<%#aCubc
z#~9)JgaCf3du7KIa@o9{F`a*Z#7_#Nr=<Du2&J->pUzK<MZ989iL#$$$VOIhI{#G2
zX1{e2r}58peujUp^RtpWi^k@dv<b@U5~*mriX4==h`~&q8}1%1bi*A9t2!+C=NB43
zr}OjT7%h=p7)QmY@e4Y?$S-O9vd*vYt2+OZe}&;5r#{sA*Zdouf6ITrLrLmd5$W`2
z{=LqB5J&!z|CF)tn6gdh*Ch4*S=>Bxv=cUusOP5Trs3QnvHxGh9e>s7AM{V1|HfYe
z3QwH;nHHR49fYzuGc3W3l5xrDAI392SFXx>lWE3V9Ds9il3PyZaN5>oC3>9W-^7vC
z3~KZ-@iD?tIkhg+6t{m;RGk2%>@I0&kf)o$+-^ls0(YABNbM(=l#ad@nKp_j=b~Xs
ziR;xu_+)lxy6|+af!@}gO2H_x)p;nZ-tYxW5Omq=l`GzMp*GTLr>vZN1?e}^C$t*Z
zvzEdIc2|HA2RFN_4#EkzMqKnb<pLBO4+WJ5@iu6<*yZ}5^dx`RJ6@oyUGTNLwp4D6
zQr+!_EwvXq9LV|FqKPDW{O#$8@RpRybyEJwEUB(P$J>bw!?!?%B@M0^^5Z<!X?H1X
z%bH?4ISS7xsT)h5y*R2kv373c0XvbALyIKqW8F4Rt^N+RBdC+p7-qZ2TG&<mY|Xw{
zYW8zn#X9x#oi~3O*$eA>;K?x-%lg?Z>}wMV8zEqHZ$cr~Y#Wv>9+)KMUZatUqbRU8
z8t9qrek(H^C0Tuzq|cP2$WL7tzj+Dj5y^2SF1D154CnsB$xbz`$wV||n-cG%rsT$p
z+3RHdadK(3-noj(2L#8c5lODg)V8pv(GEnNb@F>dEHQr>!qge@L>#qg)RAUtiOYqF
ziiV_ETExwD)bQ<))?-9$)E(FiRBYyC@}issHS!j9n)~I1tarxnQ2LfjdIJ)*jp{0E
z&1oTd%!Qbw$W58s!<?E8yP8T26Viz&^F4A~aC%qEomHk#Qm5Ec3e?P1Tj+$>6ms>F
z=p0!~_Mv~8jyaicOS*t(ntw`5uFi0Bc4*mH<SuY~bM{B5oPpIUn>8kSkk$>!f0;FM
zX<XOP5P@dz=8h9!x<TDSCLIj9Udx3_a=kV3LTpl(k=&H9%=)MqgIf>_<Kt$po&Fr{
zpKJorU@qqh(I4C6Tylqoku~P>t14I55!ZVsg0O$D2iuEDb7(J>5|NKW^Z~kzm@dax
z9(|As<jw)_1#$tQo>$U7^}LF%#`6r&UPB*6`!Rf74h~*C=ami6xUxYCwiJxdr$+`z
zKSC4A%8!s%R&j*<WtB&0;$gMI$I(tFKiavN8Kx<87G#)5v#A(w^XXcQlsP=<6ZA<U
z^(KEZv3e7!^3<Ei<w5UtbUk`RnxhmX4bQdZ{WNJ4n#oON_s~SV<X3w`-hL{m_Q~Un
zYCrlXg#3dvrKK$75BVy}D+j2spQb)YMR$&pvlKd(fpZ09t)v;W5Rxxaa&B-|%gVWy
zZlF&=A|I`y{q$*Y3DPpU5%%?9ZW(=sZiatmGoa^Z>2si(OEc*fy!q)?%=TjDZJ2}O
zxT6o>jlKXz_7_Y$N})}IG`*#KfMzs#R(SI#)3*ZEzCv%_tu(VT<m;!IE4+o?TZaBx
z5%PHoq2#QCL%*u*r`ZQdulCDJ$p1h^Kb=|a9i(u}0L`iPc~<xf{UPtM+i6ig4TXQa
zh5n@<I7)M?wUE|NXL)a<@gd*jMg25yXUHdA#XGO?^TDAfWV!iwLdZ#UHk}Ir&!rmm
z^eD6KphC1AP^%LZ5kTi+xOfkpNl{urF&HwAc^0jqBxYGukLLzTQ4{shPU@vr>Z5J|
zw2$5kK)xTa>xGFgS0?X(NecjzFVKG%VVn?neu=&eQ+DJ1APlY1E?Q1s!Kk=yf7Uho
z>8mg_!U{cKqpvI3ucSkC2V`!d^XMDk;>GG~>6>&X_z75-kv0UjevS5ORHV^e8r{tr
z-9z*y&0eq3k-&c_AKw~<`8dtjsP0XgFv6AnG?0eo5P14T{xW#b*Hn2gEnt5-KvN1z
zy!TUSi>IRbD3u+h@;fn7fy{F&hAKx7dG4i!c?5_GnvYV|_d&F16p;)pzEjB{zL-zr
z(0&AZUkQ!(A>ghC5U-)t7(EXb-3)tNgb=z`>8m8n+N?vtl-1i&*ftMbE~0zsKG^I$
zSbh+rUiucsb!Ax@yB}j>yGeiKIZk1Xj!i#K^I*LZW_bWQIA-}FmJ~<TRX$8LWfcRo
zq}p34A-eP?S`4%<+gY$&Qwo+hw|LR9qPfLa+1vuuio(^tL0Z`o@(s}04;;?o&(V25
zmb;P0Bj~2U&>^}>p=K$bX9F{}z{s^KWc~OK(zl_X57aB^J9v}yQ<s0WLmfS&Qlz{|
zxaO(1@2apqtdc1I3k-8L{2o1=b$p(R;f;f|3Q<=rX=(KVT7$=$CTP91Qk;2gg%ga0
zzT0Vz1mY4W2+uh{dPPXPm)7Qy6MQdLjCStV!T%5peg_o&22BHi7X!kpAX+WnHvohg
z=Pssv6$Tn8m(lm>5h#BE$+C)WOglV)nd0WWtaF{7`_Ur`my>4*NleQG#xae4fIo(b
zW(&|g*#YHZNvDtE|6}yHvu(hDekJ-t*f!2RK;FZHRMb*l@Qwkh*~CqQRNLaepXypX
z1?%ATf_nHIu3z6gK<7Dmd;{`0a!|toT0ck|TL$U;7Wr-*piO@R)KrbUz8SXO0vr1K
z>76arfrqImq!ny+VkH!4?x*IR$d6*;ZA}Mhro(mzUa?agrFZpHi*)P~4~4N;XoIvH
z9N%4VK|j4mV2DRQUD!_-9fmfA2(YVYyL#S$B;vqu7fnTbAFMqH``wS7^B5=|1O&fL
z)qq(oV6_u4x(I(**#mD}MnAy(C&B4a1n6V%$&=vrIDq^F_KhE5Uw8_@{V`_#M0vCu
zaNUXB=n0HT@D+ppDXi8-vp{tj)?7+k>1j}VvEKRgQ~DWva}8*pp`W8~KRo*kJ*&X}
zP!<CZsjx;t3k>~2fxQr@dM*q0dI|)Fux=pZWBk==RI7i{^BQf`kWlD2%|@R9!JA7&
zLbM$uJ12y}_62$|T|{)@OJZtzfpL^t@1nMTYHutrF#D+^?~CN~9`YQ@#&&@c_Zf)(
zbC~y8!2LO8jHwQXv>G~1q?c68ipT*%dY&c{<jL<V=~a)y5R&g!ma8yZh)3rp&)QiP
z*be8EDL{W#%vu6O4v<&2)|<%ZIdp{wA@~wVmko<FSH<^Bu>8wd_!Y#~tMJ7yk!F8|
zt?m_CLVw6cU@@p(#h4cY&Qsfz2Xp3w^4Cg%m03Tmq~9n%hyoMH^KY7{(QkRyn_!YB
zzZa!Tgr~5$MAG$x)Fs71#6j}Kvcv3=9VUX8C<A|XF(+o?2dGGttB{Wb)a$2igu>H<
zbP3|fY8f#$K*<5JQ7whM(v=GN2k26Xsh)#0!HKS(koLgAp-;)8z0w&_Z=nG4v6n8u
z&Tm0Fi){4_!Y5Kp?!zv$FKfUifQ{%c82uYfrvE{%ejUd72aNYmI*0z3-a-EYr+<Uj
z5G8+DxD62w6ZAeLoXgllSFo4%;dw2d*Rf9-dn@cRkKP5-{}C3u0K3(n=rwqJGHQ%J
zV=YO1*Jq7=J^eMk(_If41oYS8%b^P*ApZ`jyvh{@Y5%6l8oiD<J5E&^#fFepwH%zw
z2)Z?TgHS9Sd6UNF4Z-WaEQtzH85)A;e4~G6Vu{Q?vK?al1150x5!q@5uEqJ-asy4}
zsOV<4tnl7U6DulJz1Mee=rsUyHnLOC@Ls4&SPqb%$5TG*G?OQxTA57qI6r64FV0$`
z81}wHS)v$K&TDGVcWNvTAX`NLr|Pc5D#r4TOKo(|aVq3tp(h96t>bB->oH3#t(AY3
zV{Z=(SJr;D#0(`u*dc*~9T7D8Pudw894%!>c4wU&V1m<~0InidR6fbi?yPl(z+sKa
zdF*kS>_4^1UO>y4T%Ar>epSr5&vp`$KdY7B(F%P0@VyHk@1fJ=6X0=aGjD-)BrOJD
zW}IU@hg~^2r>a1fQvjTtvL*mKJ7q;pfP*U2=URL`VB_Y_JojbZ+MS=vaVN0C6L_MV
zG1#5=35-E`KsD%r>-Q_ndvJ2tOYcMMP9f*t0iJ`(Z`^+YP)h>@lR(@Wvrt-`0tHG+
zuP2R@@mx=T@fPoQ1s`e^1I0H*kQPBGDky@!ZQG@8jY-+2ihreG5q$6i{3vmDTg0j$
zzRb*-nKN@{_wD`V6+i*YS)?$XfrA-sW?js?SYU8#vXxxQCc|*K!EbpW<KRGsVy9Os
zNyU)fm61&L7?yMWP5o&7oWUu^HNh}amXSDW-&BNuI^&g)GJZL(^6;E1sc|pqBv-P<
zFlK5cTBl^Coya(1@D8I$sA9-lEkP~Y<yh5&y5hA^1b2!zn?eOAJh|GZ`V9?JYd?n2
z4SroDUsL9s(cJp?TeH+hub>fu)3~jwq6_@KC0m;3A%jH^18_a0;ksC2DEwa@2{9@{
z9@T??<4QwR69zk{UvcHHX;`ICOwrF;@U;etd@YE)4MzI1WCsadP=`%^B>xPS-{`=~
zZ+2im8meb#4p~XIL9}ZOBg7D8R=PC8V}ObDcxEEK(4yGKcyCQWUe{9jCs+@k!_y|I
z%s{W(&>P4w@hjQ>PQL$zY+=&aDU6cWr#hG)BVCyfP)h>@3IG5I2mk;8K>)Ppba*!h
z005B=001VF5fT=Y4_ytCUk`sv8hJckqSy&Gc2Jx^WJ$J~08N{il-M$fz_ML$)Cpil
z(nOv_nlZB^c4<p#(?a)_u4(B)SGtQ9q!hQL%eVebEx+D7GnQ;27x<v}?t8lL+;f+A
z=l%QbH{Swq3jdODKh`@i3QfXQT$4yD@lfVL7h&-B1}~lwVM>s&&O3h=OLiCz&(|f0
zxWU_-JZy>hxP*gvR>CLnNeQ1~g;6{g#-}AbkIzWR;j=8=6!AHpKQCbjFYxf9h%bov
zVi;eNa1>t-<14KERUW>^KwoF+8zNo`<C`pgD~xZ4@f``@#rK%RtuVeH#t-=LEfFsZ
zI51=6l~P)>Y*WiQwq}3m0_2RYtL9Wmu`JaRaQMQ)`Si^6+VbM`!rH~T?DX2=(n4nT
zf`G`(Rpq*pDk*v~wMYPZ@vMNZDMPnxMYmU!lA{Xfo?n=Ibb4y3eyY1@Dut4|Y^ml&
zqs$r}jAo=B(Ml>ogeEjyv(E`=kBzPf2uv9TQtO$~bamD#=Tv`lNy(K|w$J2O6jS51
zzZtOCHDWz7W0=L1XDW5WR5mtLGc~W+>*vX<GHIG*=s;|*X|~o=RPDX-Sc|p7dfc1I
z+bdepF%{N5JNm9xkG~_}9JBmx6ag(^S{f7(&MB5Ut8gI01%ma&PSY^R4bxkR{0FUk
z>5{e~U@rE~?7e>vKU-v8bj;F4#abtcV(3ZtwXo9ia93HiETyQXwW4a-0){;$OU*l`
zW^bjkyZ<KrU~bFi>TJ6_DL^0}`*)#EZ|2nvKRzMLH9-~@Z6$v#t8Dm%(qpP+<GMP%
zX{);BhCQIW(Gn;+LWW}KSArMA5#JMCwNuLrnSDaQ;az_=OZB4O(I)T>DgzNe6d)1q
zBqhyF$jJTyYFvl_=a>#I8jhJ)d6SBNPg#xg2^kZ3NX8kQ74ah(Y5Z8mlXyzTD&}Q8
ziY(pj-N-V2f>&hZQJ`Di%wp2fN(I%F@l)3M8GcSdNy+#HuO{$I8NXubRlFkL)cY@b
z#`v{}-^hRXEq*8B_cG=%PZvI$eo(|8Wc(2o8L#0_GX9L$1@yV>%7mGk)QTD1R*OvS
z4OW;ym1)%k9Bfem0tOqq3yyAUWp&q|LsN!RDnxa|j;>R|Mm2rIv7=tej5GFaa+`#|
z;7u9Z_^XV+vD@2hF8Xe63+Qd`oig6S9jX(*DbjzPb*K-H7c^7E-(~!R6E%T<QrU8a
zoQYBuMl~zy=+|`P2J!7}I5U^Ks^;xITZ?|FpLmb=m=4EAn+x?|Qv;lIYp*ZXvf!JQ
z*?%I>rgW;RvG;WS{Ziv*W*a*`9Bb;$Er3?MyF~5G<LECu4)?S?zq`}l-6Be9igL+N
zh`N7hDOc2GQxkBc_04ZYOy0dF-2c<LysnaQzmR#Nd~*K)?c4go+&{eT7l@5={|h-A
z1;r+~VC?cFyA~?=)<Ut2x6>cXv`k>U)n}lwv$Sp+H@IKA5$mKk0g*4Ln{!tfvITeY
zzr%8JJ5BdcEYsR9e<J*1QJ-;?lGTLgRri0{(Mx*^e9N-cvKPd8)1ZvmTl)}Mp*PMb
zJ>GzJ4B&$}4FMmbRU6{8{_w7Kl77@PNe<H<wNM(*(dvGh1)78L8idze)sN69(F_bD
zfFpRAB-vBKc}&vG08>7|Bc#c?5(C5&Z=kJ#(oM90D4`rh2S!|^L!P#e#1hkD5@~--
z`<QQ&C6VTv@kABvH3YKpWDUXD_*kNb(3!wC#8v()Ttmk;q}3WaX(d<D73rp7AV5PE
zJvH>63GV0~*rOZSqw7k^#-Y$Q4z3Oa2SPRURqEahB1B^h{7~+p03SwzqL9QU#$3-X
zdYtQ?-K5xDAdfomEd6(yP<r4XU0e%L6Gs?6mZyM_@USHu0!gS4d3Fj?NQ4o2RTLE!
zsZeABR7EXMsfc7!I><w4;nzxeSu{*)rP3*7pbb=qhn4}Y2n9kR0m4&2#L{A=NS7O+
zq<gb--~a#L?(KhfJM+)&{^xa2;9hFiS^M-I@96A#^P5^~n|$x<`ddB`%@&&L<Q!2c
z3T)0gzIbLnIPU9=rs~b%+*kaqOYa3~2NrY$**DZ_28oj!E0}c#hEXZW5#1F%_rp2Y
z@7+$!3(WI<_EWCV)`TqCTTmmZb^3u}aj?mmoaBAb!n-={l6S|)$2$1IvpT^qzBZEw
z8e=}4<>tZ!yY_<35bMedeq`z2JWorljz5-f9<^93HM-$#+acw%9r!JOM%O<|BR`W&
zd-%j_?b^q7Kl6{q^N{cg2u;11rFB5EP+oqG9&pHD#_Mo@aNMj;LUvsl&nK(ca(hT(
zzFc2oHC6WQv8g7jo+3ZSwK+9G$cvfRnql)?g=XeQ3+LTh3)79nhEle8OqS3T$qn(>
z(=5Bg?EWq-ldEywgzXW9<IVcZw0PFB^dyb+qfMQWtjsj)vresv4TXCoZ567G0y;gP
z?>65%H(9^ik*rH(8dNdkbcS9|ow&_r`X~R^R?B+(oT<WD#3|w3t>iMzzlx8KnHqUi
z<C-MSdTAJmKaI>8Rh-)VAnS-CO+3}yxqm8)X+N+uzieFVm-F#syP#M1p5&$wX3MJ8
z+R@grZ*5G^Uh4I@VT=>C4RJNc^~3mx$kS1F{L?3)BzdduD2MZKdu#jNno&f2&d{?`
zW(>$oktzY@GO{|Ln~Bt^A4)(%?<rC#>l-&(D<Yw`9>m!iL#$K_xOyhwAf=K2<+Bom
z<r)*8MZ!$_D%ll%W4Ye$$4y&cK*~WyOiCrNvVfg^98_+DMF;q@k4CQVgxx|A9Hkzk
zY%$3c2K(I6As4DS?_GUJlhQ!Vji$Rs6$y9lpo|T>w7|hl6E5}B$d%n0sfZv<a3(um
z6<;qRVVB1$nE}(k(@3SY^L5&aKgBpn4?AzyzXPQPQ}9ARNm5~`3PH@`&Rv!G*6&j!
z{V*$-!6Q(LiIj*sp{qn3B5ACQ7T%2B=uQTovb#r{!Sw+S`r-sQoh4y>fQRy9Fyz2~
z83#=#LaHnf1th^k*<o}w3D|OX)SLtn@-US^I4);^RK5=p7oq$X3H5?EAaoFSl}3p%
z6LeUX>p|ux8!!8pfHE!)x*%=_hAddl)P%4h4%&8!5-W#xqqb}c=H(i|wqcIS&oDQ{
zhI7N-$f$ra3=RjPmMh?-IEkJYQ<}R9Z!}wmp$#~Uc%u1oh#TP}wF*kJJmQX2#27kL
z_dz(yKufo<=m71bZfLp^Ll#t3(IHkrgMcvx@~om%Ib(h(<$Da7urTI`x|%`wD--sN
zJEEa>4DGSEG?0ulkosfj8IMNN4)B=ZtvGG{|4Fp=Xhg!wPNgYzS>{Bp%%Qa+624X@
X49Luk)baa85H9$5YCsTPT`SVRWMtMW

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f371643ee..05679dc3c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c8..744e882ed 100755
--- a/gradlew
+++ b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index 026c5a625..c3c4c38a1 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -10,7 +10,7 @@ Performance and visualization extensions to MST API.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-13`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-14`.
 
 **Gradle:**
 ```gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.0-dev-13'
+    implementation 'space.kscience:kmath-ast:0.3.0-dev-14'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.0-dev-13")
+    implementation("space.kscience:kmath-ast:0.3.0-dev-14")
 }
 ```
 
diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index 8209a0dad..9de7e9980 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -45,8 +45,7 @@ kotlin.sourceSets {
 
     jvmMain {
         dependencies {
-            implementation("org.ow2.asm:asm:9.1")
-            implementation("org.ow2.asm:asm-commons:9.1")
+            implementation("org.ow2.asm:asm-commons:9.2")
         }
     }
 }
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index 18a83756d..110529b72 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -8,7 +8,7 @@ Complex and hypercomplex number systems in KMath.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-13`.
+The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-14`.
 
 **Gradle:**
 ```gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-complex:0.3.0-dev-13'
+    implementation 'space.kscience:kmath-complex:0.3.0-dev-14'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-complex:0.3.0-dev-13")
+    implementation("space.kscience:kmath-complex:0.3.0-dev-14")
 }
 ```
diff --git a/kmath-core/README.md b/kmath-core/README.md
index 6ca8c8ef8..a563552bb 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -15,7 +15,7 @@ performance calculations to code generation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-13`.
+The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-14`.
 
 **Gradle:**
 ```gradle
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-core:0.3.0-dev-13'
+    implementation 'space.kscience:kmath-core:0.3.0-dev-14'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -36,6 +36,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-core:0.3.0-dev-13")
+    implementation("space.kscience:kmath-core:0.3.0-dev-14")
 }
 ```
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index 10e7bd606..f88f53000 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -9,7 +9,7 @@ EJML based linear algebra implementation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-13`.
+The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-14`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ejml:0.3.0-dev-13'
+    implementation 'space.kscience:kmath-ejml:0.3.0-dev-14'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ejml:0.3.0-dev-13")
+    implementation("space.kscience:kmath-ejml:0.3.0-dev-14")
 }
 ```
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index 6339782dd..d449b4540 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -9,7 +9,7 @@ Specialization of KMath APIs for Double numbers.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-13`.
+The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-14`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-for-real:0.3.0-dev-13'
+    implementation 'space.kscience:kmath-for-real:0.3.0-dev-14'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-for-real:0.3.0-dev-13")
+    implementation("space.kscience:kmath-for-real:0.3.0-dev-14")
 }
 ```
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index 77f55528a..d0beae2c8 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -11,7 +11,7 @@ Functions and interpolations.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-13`.
+The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-14`.
 
 **Gradle:**
 ```gradle
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-functions:0.3.0-dev-13'
+    implementation 'space.kscience:kmath-functions:0.3.0-dev-14'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-functions:0.3.0-dev-13")
+    implementation("space.kscience:kmath-functions:0.3.0-dev-14")
 }
 ```
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index ef8fcd352..71097771d 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -7,7 +7,7 @@ Integration with [Jafama](https://github.com/jeffhain/jafama).
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0-dev-13`.
+The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0-dev-14`.
 
 **Gradle:**
 ```gradle
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-jafama:0.3.0-dev-13'
+    implementation 'space.kscience:kmath-jafama:0.3.0-dev-14'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-jafama:0.3.0-dev-13")
+    implementation("space.kscience:kmath-jafama:0.3.0-dev-14")
 }
 ```
 
@@ -66,8 +66,8 @@ Report for benchmark configuration <code>jafamaDouble</code>
 
 | Benchmark | Score |
 |:---------:|:-----:|
-|`space.kscience.kmath.benchmarks.JafamaBenchmark.core`|14.296120859512893 &plusmn; 0.36462633435888736 ops/s|
-|`space.kscience.kmath.benchmarks.JafamaBenchmark.jafama`|11.431566395649781 &plusmn; 2.570896777898243 ops/s|
-|`space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafama`|11.746020495694117 &plusmn; 6.205909559197869 ops/s|
+|`space.kscience.kmath.benchmarks.JafamaBenchmark.core`|14.35014650168397 &plusmn; 0.9200669832937576 ops/s|
+|`space.kscience.kmath.benchmarks.JafamaBenchmark.jafama`|12.048429204455887 &plusmn; 1.2882929181842269 ops/s|
+|`space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafama`|12.977653357239152 &plusmn; 1.4122819627470866 ops/s|
 </details>
 
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
index 31c7bb819..304a0639b 100644
--- a/kmath-kotlingrad/README.md
+++ b/kmath-kotlingrad/README.md
@@ -8,7 +8,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-13`.
+The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-14`.
 
 **Gradle:**
 ```gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-13'
+    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-14'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-13")
+    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-14")
 }
 ```
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index 1c945f06a..5cbb31d5a 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -9,7 +9,7 @@ ND4J based implementations of KMath abstractions.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-13`.
+The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-14`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-13'
+    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-14'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-nd4j:0.3.0-dev-13")
+    implementation("space.kscience:kmath-nd4j:0.3.0-dev-14")
 }
 ```
 
diff --git a/kmath-nd4j/build.gradle.kts b/kmath-nd4j/build.gradle.kts
index abcc02962..6e890a937 100644
--- a/kmath-nd4j/build.gradle.kts
+++ b/kmath-nd4j/build.gradle.kts
@@ -7,9 +7,8 @@ description = "ND4J NDStructure implementation and according NDAlgebra classes"
 
 dependencies {
     api(project(":kmath-tensors"))
-    api("org.nd4j:nd4j-api:1.0.0-beta7")
-    testImplementation("org.nd4j:nd4j-native:1.0.0-beta7")
-    testImplementation("org.nd4j:nd4j-native-platform:1.0.0-beta7")
+    api("org.nd4j:nd4j-api:1.0.0-M1")
+    testImplementation("org.nd4j:nd4j-native-platform:1.0.0-M1")
     testImplementation("org.slf4j:slf4j-simple:1.7.30")
 }
 
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index dd21a9f2f..6b991d5df 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -9,7 +9,7 @@ Common linear algebra operations on tensors.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-13`.
+The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-14`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensors:0.3.0-dev-13'
+    implementation 'space.kscience:kmath-tensors:0.3.0-dev-14'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensors:0.3.0-dev-13")
+    implementation("space.kscience:kmath-tensors:0.3.0-dev-14")
 }
 ```
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 063c69280..02b75cddc 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
     }
 
     val toolsVersion = "0.10.0"
-    val kotlinVersion = "1.5.0"
+    val kotlinVersion = "1.5.20"
 
     plugins {
         id("ru.mipt.npm.gradle.project") version toolsVersion
@@ -17,7 +17,6 @@ pluginManagement {
         kotlin("plugin.allopen") version kotlinVersion
         id("org.jetbrains.kotlinx.benchmark") version "0.3.1"
         kotlin("jupyter.api") version "0.10.0-25"
-
     }
 }
 
@@ -45,5 +44,5 @@ include(
     ":kmath-symja",
     ":kmath-jafama",
     ":examples",
-    ":benchmarks"
+    ":benchmarks",
 )
-- 
2.34.1


From 3ba12f49993d03e9af6bd59b97186e72e78799f6 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 9 Jul 2021 14:11:26 +0300
Subject: [PATCH 297/713] Generic Buffer Algebra

---
 CHANGELOG.md                                  |   1 +
 .../kscience/kmath/structures/buffers.kt      |  22 +++
 .../kmath/operations/BufferAlgebra.kt         | 146 ++++++++++++++++++
 .../kmath/structures/DoubleBufferField.kt     |   4 +
 4 files changed, 173 insertions(+)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e35153d81..8c4f5b547 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
 - Use `Symbol` factory function instead of `StringSymbol`
 
 ### Deprecated
+- Specialized `DoubleBufferAlgebra`
 
 ### Removed
 - Nearest in Domain. To be implemented in geometry package.
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
new file mode 100644
index 000000000..eabb16701
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.structures
+
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.bufferAlgebra
+import space.kscience.kmath.operations.produce
+
+inline fun <reified R : Any> MutableBuffer.Companion.same(
+    n: Int,
+    value: R
+): MutableBuffer<R> = auto(n) { value }
+
+
+fun main() {
+    with(DoubleField.bufferAlgebra(5)) {
+        println(number(2.0) + produce(1, 2, 3, 4, 5))
+    }
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
new file mode 100644
index 000000000..9f4d741fd
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.operations
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.BufferFactory
+import space.kscience.kmath.structures.DoubleBuffer
+
+/**
+ * An algebra over [Buffer]
+ */
+@UnstableKMathAPI
+public interface BufferAlgebra<T, A : Algebra<T>> : Algebra<Buffer<T>> {
+    public val bufferFactory: BufferFactory<T>
+    public val elementAlgebra: A
+
+    //TODO move to multi-receiver inline extension
+    public fun Buffer<T>.map(block: (T) -> T): Buffer<T> = bufferFactory(size) { block(get(it)) }
+
+    public fun Buffer<T>.zip(other: Buffer<T>, block: (left: T, right: T) -> T): Buffer<T> {
+        require(size == other.size) { "Incompatible buffer sizes. left: $size, right: ${other.size}" }
+        return bufferFactory(size) { block(this[it], other[it]) }
+    }
+
+    override fun unaryOperationFunction(operation: String): (arg: Buffer<T>) -> Buffer<T> {
+        val operationFunction = elementAlgebra.unaryOperationFunction(operation)
+        return { arg -> bufferFactory(arg.size) { operationFunction(arg[it]) } }
+    }
+
+    override fun binaryOperationFunction(operation: String): (left: Buffer<T>, right: Buffer<T>) -> Buffer<T> {
+        val operationFunction = elementAlgebra.binaryOperationFunction(operation)
+        return { left, right ->
+            bufferFactory(left.size) { operationFunction(left[it], right[it]) }
+        }
+    }
+}
+
+@UnstableKMathAPI
+public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.sin(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::sin)
+
+@UnstableKMathAPI
+public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.cos(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::cos)
+
+@UnstableKMathAPI
+public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.tan(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::tan)
+
+@UnstableKMathAPI
+public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.asin(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::asin)
+
+@UnstableKMathAPI
+public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.acos(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::acos)
+
+@UnstableKMathAPI
+public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.atan(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::atan)
+
+@UnstableKMathAPI
+public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.exp(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::exp)
+
+@UnstableKMathAPI
+public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.ln(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::ln)
+
+@UnstableKMathAPI
+public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.sinh(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::sinh)
+
+@UnstableKMathAPI
+public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.cosh(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::cosh)
+
+@UnstableKMathAPI
+public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.tanh(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::tanh)
+
+@UnstableKMathAPI
+public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.asinh(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::asinh)
+
+@UnstableKMathAPI
+public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.acosh(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::acosh)
+
+@UnstableKMathAPI
+public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.atanh(arg: Buffer<T>): Buffer<T> =
+    arg.map(elementAlgebra::atanh)
+
+@UnstableKMathAPI
+public fun <T, A : PowerOperations<T>> BufferAlgebra<T, A>.pow(arg: Buffer<T>, pow: Number): Buffer<T> =
+    with(elementAlgebra) { arg.map { power(it, pow) } }
+
+
+@UnstableKMathAPI
+public class BufferField<T, A : Field<T>>(
+    override val bufferFactory: BufferFactory<T>,
+    override val elementAlgebra: A,
+    public val size: Int
+) : BufferAlgebra<T, A>, Field<Buffer<T>> {
+
+    public fun produce(vararg elements: T): Buffer<T> {
+        require(elements.size == size) { "Expected $size elements but found ${elements.size}" }
+        return bufferFactory(size) { elements[it] }
+    }
+
+    override val zero: Buffer<T> = bufferFactory(size) { elementAlgebra.zero }
+    override val one: Buffer<T> = bufferFactory(size) { elementAlgebra.one }
+
+
+    override fun add(a: Buffer<T>, b: Buffer<T>): Buffer<T> = a.zip(b, elementAlgebra::add)
+    override fun multiply(a: Buffer<T>, b: Buffer<T>): Buffer<T> = a.zip(b, elementAlgebra::multiply)
+    override fun divide(a: Buffer<T>, b: Buffer<T>): Buffer<T> = a.zip(b, elementAlgebra::divide)
+
+    override fun scale(a: Buffer<T>, value: Double): Buffer<T> = with(elementAlgebra) { a.map { scale(it, value) } }
+    override fun Buffer<T>.unaryMinus(): Buffer<T> = with(elementAlgebra) { map { -it } }
+
+    override fun unaryOperationFunction(operation: String): (arg: Buffer<T>) -> Buffer<T> {
+        return super<BufferAlgebra>.unaryOperationFunction(operation)
+    }
+
+    override fun binaryOperationFunction(operation: String): (left: Buffer<T>, right: Buffer<T>) -> Buffer<T> {
+        return super<BufferAlgebra>.binaryOperationFunction(operation)
+    }
+}
+
+//Double buffer specialization
+
+@UnstableKMathAPI
+public fun BufferField<Double, *>.produce(vararg elements: Number): Buffer<Double> {
+    require(elements.size == size) { "Expected $size elements but found ${elements.size}" }
+    return bufferFactory(size) { elements[it].toDouble() }
+}
+
+@UnstableKMathAPI
+public fun DoubleField.bufferAlgebra(size: Int): BufferField<Double, DoubleField> =
+    BufferField(::DoubleBuffer, DoubleField, size)
+
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
index e438995dd..c65a0a48a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
@@ -6,6 +6,8 @@
 package space.kscience.kmath.structures
 
 import space.kscience.kmath.linear.Point
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.ExtendedFieldOperations
 import space.kscience.kmath.operations.Norm
@@ -14,6 +16,7 @@ import kotlin.math.*
 /**
  * [ExtendedFieldOperations] over [DoubleBuffer].
  */
+@Deprecated("To be replaced by generic BufferAlgebra")
 public object DoubleBufferFieldOperations : ExtendedFieldOperations<Buffer<Double>> {
     override fun Buffer<Double>.unaryMinus(): DoubleBuffer = if (this is DoubleBuffer) {
         DoubleBuffer(size) { -array[it] }
@@ -172,6 +175,7 @@ public object DoubleL2Norm : Norm<Point<Double>, Double> {
  *
  * @property size the size of buffers to operate on.
  */
+@Deprecated("To be replaced by generic BufferAlgebra")
 public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Double>>, Norm<Buffer<Double>, Double> {
     public override val zero: Buffer<Double> by lazy { DoubleBuffer(size) { 0.0 } }
     public override val one: Buffer<Double> by lazy { DoubleBuffer(size) { 1.0 } }
-- 
2.34.1


From 5d2eaaf68aeb0b4c5d455aa46e366436d61de77d Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 13 Jul 2021 00:21:46 +0700
Subject: [PATCH 298/713] Add contracts to some functions, fix multiple style
 issues

---
 .../kmath/benchmarks/JafamaBenchmark.kt       | 13 +++---
 .../benchmarks/MatrixInverseBenchmark.kt      |  4 +-
 docs/nd-structure.md                          |  2 +
 .../space/kscience/kmath/ast/astRendering.kt  |  2 +-
 .../kscience/kmath/ast/rendering/features.kt  |  2 +-
 .../TestCompilerConsistencyWithInterpreter.kt |  1 -
 .../kmath/ast/TestCompilerVariables.kt        |  1 -
 .../kscience/kmath/internal/estree/estree.kt  |  2 +
 .../kotlin/space/kscience/kmath/ast/utils.kt  |  3 ++
 .../kscience/kmath/wasm/TestWasmSpecific.kt   |  1 -
 .../kotlin/space/kscience/kmath/ast/utils.kt  |  7 +++-
 .../DerivativeStructureExpression.kt          |  2 +-
 .../commons/optimization/CMOptimization.kt    |  4 +-
 .../commons/transform/Transformations.kt      |  2 +-
 .../DerivativeStructureExpressionTest.kt      |  2 +-
 .../kscience/kmath/complex/Quaternion.kt      |  2 +-
 .../kscience/kmath/data/XYColumnarData.kt     |  2 +-
 .../kscience/kmath/data/XYZColumnarData.kt    |  4 +-
 .../space/kscience/kmath/domains/Domain.kt    |  2 +-
 .../expressions/DifferentiableExpression.kt   | 17 ++++----
 .../FunctionalExpressionAlgebra.kt            | 42 +++++++++++--------
 .../kmath/expressions/SimpleAutoDiff.kt       |  9 ++--
 .../kmath/expressions/SymbolIndexer.kt        | 14 +++++--
 .../kmath/linear/BufferedLinearSpace.kt       |  4 +-
 .../kscience/kmath/linear/LinearSpace.kt      |  2 +-
 .../kscience/kmath/linear/MatrixFeatures.kt   | 14 +++----
 .../space/kscience/kmath/misc/cumulative.kt   |  2 +-
 .../space/kscience/kmath/nd/AlgebraND.kt      |  9 ++--
 .../kscience/kmath/nd/BufferAlgebraND.kt      |  6 +--
 .../space/kscience/kmath/nd/ShortRingND.kt    |  7 ++--
 .../space/kscience/kmath/nd/StructureND.kt    |  2 +-
 .../kmath/operations/AlgebraElements.kt       |  2 +-
 .../space/kscience/kmath/operations/BigInt.kt |  2 +-
 .../kmath/structures/BufferAccessor2D.kt      | 18 ++++----
 .../kmath/structures/bufferOperation.kt       |  4 +-
 .../kscience/kmath/linear/VectorSpaceTest.kt  |  5 ---
 .../kscience/kmath/testutils/FieldVerifier.kt |  2 +-
 .../kscience/kmath/testutils/RingVerifier.kt  |  2 +-
 .../kmath/chains/BlockingDoubleChain.kt       |  2 +-
 .../kmath/coroutines/coroutinesExtra.kt       | 15 ++++---
 .../kscience/kmath/dimensions/Wrappers.kt     | 10 ++---
 .../kscience/dimensions/DMatrixContextTest.kt |  0
 .../space/kscience/kmath/real/RealMatrix.kt   |  2 +-
 .../kaceince/kmath/real/DoubleMatrixTest.kt   |  2 +-
 .../kscience/kmath/functions/Piecewise.kt     |  8 ++--
 .../kscience/kmath/functions/Polynomial.kt    |  4 +-
 .../kscience/kmath/integration/Integrand.kt   |  2 +-
 .../kmath/integration/UnivariateIntegrand.kt  |  2 +-
 .../kmath/interpolation/Interpolator.kt       |  2 +-
 .../space/kscience/kmath/geometry/Line.kt     |  2 +-
 .../kscience/kmath/histogram/Histogram.kt     |  6 +--
 .../kmath/histogram/IndexedHistogramSpace.kt  |  2 +-
 .../kmath/histogram/TreeHistogramSpace.kt     | 13 +++---
 kmath-kotlingrad/build.gradle.kts             |  6 +--
 .../kscience/kmath/nd4j/Nd4jArrayIterator.kt  |  2 +-
 .../kmath/optimization/Optimization.kt        |  2 +-
 .../kmath/samplers/ConstantSampler.kt         | 18 --------
 .../space/kscience/kmath/stat/MCScope.kt      | 14 +++++--
 .../space/kscience/kmath/stat/Sampler.kt      |  2 +-
 .../kscience/kmath/stat/SamplerAlgebra.kt     |  6 +--
 .../space/kscience/kmath/stat/Statistic.kt    |  8 ++--
 .../kscience/kmath/symja/SymjaExpression.kt   |  3 +-
 kmath-tensors/README.md                       |  2 +-
 kmath-tensors/build.gradle.kts                | 14 +++----
 .../kmath/tensors/core/BufferedTensor.kt      |  4 +-
 .../kmath/tensors/core/DoubleTensor.kt        |  2 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 20 ++++-----
 .../kmath/tensors/core/internal/linUtils.kt   |  6 +--
 .../tensors/core/internal/tensorCastsUtils.kt |  1 +
 .../kmath/tensors/core/internal/utils.kt      |  1 +
 .../core/TestDoubleLinearOpsAlgebra.kt        |  2 +-
 .../tensors/core/TestDoubleTensorAlgebra.kt   |  2 +-
 .../kmath/viktor/ViktorStructureND.kt         |  2 +-
 73 files changed, 210 insertions(+), 200 deletions(-)
 delete mode 100644 kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/VectorSpaceTest.kt
 rename kmath-dimensions/src/commonTest/kotlin/{ => space}/kscience/dimensions/DMatrixContextTest.kt (100%)
 delete mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ConstantSampler.kt

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
index 24a730375..5d4eee7c0 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
@@ -13,6 +13,8 @@ import space.kscience.kmath.jafama.JafamaDoubleField
 import space.kscience.kmath.jafama.StrictJafamaDoubleField
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
 import kotlin.random.Random
 
 @State(Scope.Benchmark)
@@ -31,9 +33,10 @@ internal class JafamaBenchmark {
     fun strictJafama(blackhole: Blackhole) = invokeBenchmarks(blackhole) { x ->
         StrictJafamaDoubleField { x * power(x, 4) * exp(x) / cos(x) + sin(x) }
     }
-
-    private inline fun invokeBenchmarks(blackhole: Blackhole, expr: (Double) -> Double) {
-        val rng = Random(0)
-        repeat(1000000) { blackhole.consume(expr(rng.nextDouble())) }
-    }
+}
+
+private inline fun invokeBenchmarks(blackhole: Blackhole, expr: (Double) -> Double) {
+    contract { callsInPlace(expr, InvocationKind.AT_LEAST_ONCE) }
+    val rng = Random(0)
+    repeat(1000000) { blackhole.consume(expr(rng.nextDouble())) }
 }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
index 7bb32af28..e3179c05c 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
@@ -40,14 +40,14 @@ internal class MatrixInverseBenchmark {
 
     @Benchmark
     fun cmLUPInversion(blackhole: Blackhole) {
-        with(CMLinearSpace) {
+        CMLinearSpace {
             blackhole.consume(inverse(matrix))
         }
     }
 
     @Benchmark
     fun ejmlInverse(blackhole: Blackhole) {
-        with(EjmlLinearSpaceDDRM) {
+        EjmlLinearSpaceDDRM {
             blackhole.consume(matrix.getFeature<InverseMatrixFeature<Double>>()?.inverse)
         }
     }
diff --git a/docs/nd-structure.md b/docs/nd-structure.md
index ec9b4d521..ab214094e 100644
--- a/docs/nd-structure.md
+++ b/docs/nd-structure.md
@@ -115,6 +115,8 @@ via extension function.
 Usually it is bad idea to compare the direct numerical operation performance in different languages, but it hard to
 work completely without frame of reference. In this case, simple numpy code:
 ```python
+import numpy as np
+
 res = np.ones((1000,1000))
 for i in range(1000):
     res = res + 1.0
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt
index e16769464..c4f263f97 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt
@@ -10,7 +10,7 @@ import space.kscience.kmath.ast.rendering.LatexSyntaxRenderer
 import space.kscience.kmath.ast.rendering.MathMLSyntaxRenderer
 import space.kscience.kmath.ast.rendering.renderWithStringBuilder
 
-public fun main() {
+fun main() {
     val mst = "exp(sqrt(x))-asin(2*x)/(2e10+x^3)/(-12)".parseMath()
     val syntax = FeaturedMathRendererWithPostProcess.Default.render(mst)
     println("MathSyntax:")
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index a2f42d1bf..203cdf8b3 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -13,7 +13,7 @@ import space.kscience.kmath.operations.*
 import kotlin.reflect.KClass
 
 /**
- * Prints any [Symbol] as a [SymbolSyntax] containing the [Symbol.value] of it.
+ * Prints any [Symbol] as a [SymbolSyntax] containing the [Symbol.identity] of it.
  *
  * @author Iaroslav Postovalov
  */
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
index 3116466e6..1edb5923e 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
@@ -11,7 +11,6 @@ import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.interpret
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
-import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
index bed5bc7fa..af1a2e338 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
@@ -9,7 +9,6 @@ import space.kscience.kmath.expressions.MstRing
 import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.invoke
 import space.kscience.kmath.operations.IntRing
-import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
index e5254013e..b62b8c06c 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("ClassName")
+
 package space.kscience.kmath.internal.estree
 
 import kotlin.js.RegExp
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
index 93b7e9449..0d896c6f6 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -10,6 +10,8 @@ import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
 import space.kscience.kmath.estree.compile as estreeCompile
 import space.kscience.kmath.estree.compileToExpression as estreeCompileToExpression
 import space.kscience.kmath.wasm.compile as wasmCompile
@@ -34,6 +36,7 @@ private object ESTreeCompilerTestContext : CompilerTestContext {
 }
 
 internal actual inline fun runCompilerTest(action: CompilerTestContext.() -> Unit) {
+    contract { callsInPlace(action, InvocationKind.AT_LEAST_ONCE) }
     action(WasmCompilerTestContext)
     action(ESTreeCompilerTestContext)
 }
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
index 45776c191..8ae5fcb36 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
@@ -11,7 +11,6 @@ import space.kscience.kmath.expressions.invoke
 import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
-import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
index d3b554efd..a7f0bb3fb 100644
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -10,6 +10,8 @@ import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
 import space.kscience.kmath.asm.compile as asmCompile
 import space.kscience.kmath.asm.compileToExpression as asmCompileToExpression
 
@@ -22,4 +24,7 @@ private object AsmCompilerTestContext : CompilerTestContext {
         asmCompile(algebra, arguments)
 }
 
-internal actual inline fun runCompilerTest(action: CompilerTestContext.() -> Unit) = action(AsmCompilerTestContext)
+internal actual inline fun runCompilerTest(action: CompilerTestContext.() -> Unit) {
+    contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
+    action(AsmCompilerTestContext)
+}
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
index 361027968..d0ab8b1e8 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
@@ -15,7 +15,7 @@ import space.kscience.kmath.operations.NumbersAddOperations
  * A field over commons-math [DerivativeStructure].
  *
  * @property order The derivation order.
- * @property bindings The map of bindings values. All bindings are considered free parameters
+ * @param bindings The map of bindings values. All bindings are considered free parameters
  */
 @OptIn(UnstableKMathAPI::class)
 public class DerivativeStructureField(
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
index 400ee0310..a46f06568 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
@@ -52,11 +52,11 @@ public class CMOptimization(
 
     public fun exportOptimizationData(): List<OptimizationData> = optimizationData.values.toList()
 
-    public override fun initialGuess(map: Map<Symbol, Double>): Unit {
+    public override fun initialGuess(map: Map<Symbol, Double>) {
         addOptimizationData(InitialGuess(map.toDoubleArray()))
     }
 
-    public override fun function(expression: Expression<Double>): Unit {
+    public override fun function(expression: Expression<Double>) {
         val objectiveFunction = ObjectiveFunction {
             val args = it.toMap()
             expression(args)
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
index d29491d63..6fef12138 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
@@ -32,7 +32,7 @@ public object Transformations {
     /**
      * Create a virtual buffer on top of array
      */
-    private fun Array<org.apache.commons.math3.complex.Complex>.asBuffer() = VirtualBuffer<Complex>(size) {
+    private fun Array<org.apache.commons.math3.complex.Complex>.asBuffer() = VirtualBuffer(size) {
         val value = get(it)
         Complex(value.real, value.imaginary)
     }
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
index 966675062..0bf1d53f0 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
@@ -16,7 +16,7 @@ internal inline fun diff(
     order: Int,
     vararg parameters: Pair<Symbol, Double>,
     block: DerivativeStructureField.() -> Unit,
-): Unit {
+) {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
     DerivativeStructureField(order, mapOf(*parameters)).run(block)
 }
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index c59aabdcb..28aae7bb4 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -147,7 +147,7 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
             return if (arg.w > 0)
                 Quaternion(ln(arg.w), 0, 0, 0)
             else {
-                val l = ComplexField { ComplexField.ln(arg.w.toComplex()) }
+                val l = ComplexField { ln(arg.w.toComplex()) }
                 Quaternion(l.re, l.im, 0, 0)
             }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
index 08bfd3ca3..920fcc021 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
@@ -16,7 +16,7 @@ import kotlin.math.max
  * The buffer of X values.
  */
 @UnstableKMathAPI
-public interface XYColumnarData<T, out X : T, out Y : T> : ColumnarData<T> {
+public interface XYColumnarData<out T, out X : T, out Y : T> : ColumnarData<T> {
     /**
      * The buffer of X values
      */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
index 39a6b858c..6050c311c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
@@ -14,7 +14,7 @@ import space.kscience.kmath.structures.Buffer
  * Inherits [XYColumnarData].
  */
 @UnstableKMathAPI
-public interface XYZColumnarData<T, out X : T, out Y : T, out Z : T> : XYColumnarData<T, X, Y> {
+public interface XYZColumnarData<out T, out X : T, out Y : T, out Z : T> : XYColumnarData<T, X, Y> {
     public val z: Buffer<Z>
 
     override fun get(symbol: Symbol): Buffer<T>? = when (symbol) {
@@ -23,4 +23,4 @@ public interface XYZColumnarData<T, out X : T, out Y : T, out Z : T> : XYColumna
         Symbol.z -> z
         else -> null
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt
index e6e703cbf..b5a84cf6c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt
@@ -12,7 +12,7 @@ import space.kscience.kmath.linear.Point
  *
  * @param T the type of element of this domain.
  */
-public interface Domain<T : Any> {
+public interface Domain<in T : Any> {
     /**
      * Checks if the specified point is contained in this domain.
      */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
index 1dcada6d3..ce1265b2f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
@@ -9,7 +9,6 @@ package space.kscience.kmath.expressions
  * Represents expression which structure can be differentiated.
  *
  * @param T the type this expression takes as argument and returns.
- * @param R the type of expression this expression can be differentiated to.
  */
 public interface DifferentiableExpression<T> : Expression<T> {
     /**
@@ -24,16 +23,18 @@ public interface DifferentiableExpression<T> : Expression<T> {
 public fun <T> DifferentiableExpression<T>.derivative(symbols: List<Symbol>): Expression<T> =
     derivativeOrNull(symbols) ?: error("Derivative by symbols $symbols not provided")
 
-public fun <T> DifferentiableExpression<T>.derivative(vararg symbols: Symbol):  Expression<T> =
+public fun <T> DifferentiableExpression<T>.derivative(vararg symbols: Symbol): Expression<T> =
     derivative(symbols.toList())
 
-public fun <T> DifferentiableExpression<T>.derivative(name: String):  Expression<T> =
+public fun <T> DifferentiableExpression<T>.derivative(name: String): Expression<T> =
     derivative(StringSymbol(name))
 
 /**
- * A special type of [DifferentiableExpression] which returns typed expressions as derivatives
+ * A special type of [DifferentiableExpression] which returns typed expressions as derivatives.
+ *
+ * @param R the type of expression this expression can be differentiated to.
  */
-public interface SpecialDifferentiableExpression<T, R: Expression<T>>: DifferentiableExpression<T> {
+public interface SpecialDifferentiableExpression<T, out R : Expression<T>> : DifferentiableExpression<T> {
     override fun derivativeOrNull(symbols: List<Symbol>): R?
 }
 
@@ -53,9 +54,9 @@ public abstract class FirstDerivativeExpression<T> : DifferentiableExpression<T>
     /**
      * Returns first derivative of this expression by given [symbol].
      */
-    public abstract fun derivativeOrNull(symbol: Symbol):  Expression<T>?
+    public abstract fun derivativeOrNull(symbol: Symbol): Expression<T>?
 
-    public final override fun derivativeOrNull(symbols: List<Symbol>):  Expression<T>? {
+    public final override fun derivativeOrNull(symbols: List<Symbol>): Expression<T>? {
         val dSymbol = symbols.firstOrNull() ?: return null
         return derivativeOrNull(dSymbol)
     }
@@ -64,6 +65,6 @@ public abstract class FirstDerivativeExpression<T> : DifferentiableExpression<T>
 /**
  * A factory that converts an expression in autodiff variables to a [DifferentiableExpression]
  */
-public fun interface AutoDiffProcessor<T : Any, I : Any, A : ExpressionAlgebra<T, I>, out R : Expression<T>> {
+public fun interface AutoDiffProcessor<T : Any, I : Any, out A : ExpressionAlgebra<T, I>, out R : Expression<T>> {
     public fun process(function: A.() -> I): DifferentiableExpression<T>
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
index 951ec9474..a10e29cf0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
@@ -6,13 +6,15 @@
 package space.kscience.kmath.expressions
 
 import space.kscience.kmath.operations.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
 
 /**
  * A context class for [Expression] construction.
  *
  * @param algebra The algebra to provide for Expressions built.
  */
-public abstract class FunctionalExpressionAlgebra<T, A : Algebra<T>>(
+public abstract class FunctionalExpressionAlgebra<T, out A : Algebra<T>>(
     public val algebra: A,
 ) : ExpressionAlgebra<T, Expression<T>> {
     /**
@@ -29,9 +31,6 @@ public abstract class FunctionalExpressionAlgebra<T, A : Algebra<T>>(
             ?: error("Symbol '$value' is not supported in $this")
     }
 
-    /**
-     * Builds an Expression of dynamic call of binary operation [operation] on [left] and [right].
-     */
     public override fun binaryOperationFunction(operation: String): (left: Expression<T>, right: Expression<T>) -> Expression<T> =
         { left, right ->
             Expression { arguments ->
@@ -39,9 +38,6 @@ public abstract class FunctionalExpressionAlgebra<T, A : Algebra<T>>(
             }
         }
 
-    /**
-     * Builds an Expression of dynamic call of unary operation with name [operation] on [arg].
-     */
     public override fun unaryOperationFunction(operation: String): (arg: Expression<T>) -> Expression<T> = { arg ->
         Expression { arguments -> algebra.unaryOperationFunction(operation)(arg.invoke(arguments)) }
     }
@@ -50,7 +46,7 @@ public abstract class FunctionalExpressionAlgebra<T, A : Algebra<T>>(
 /**
  * A context class for [Expression] construction for [Ring] algebras.
  */
-public open class FunctionalExpressionGroup<T, A : Group<T>>(
+public open class FunctionalExpressionGroup<T, out A : Group<T>>(
     algebra: A,
 ) : FunctionalExpressionAlgebra<T, A>(algebra), Group<Expression<T>> {
     public override val zero: Expression<T> get() = const(algebra.zero)
@@ -84,7 +80,7 @@ public open class FunctionalExpressionGroup<T, A : Group<T>>(
 
 }
 
-public open class FunctionalExpressionRing<T, A : Ring<T>>(
+public open class FunctionalExpressionRing<T, out A : Ring<T>>(
     algebra: A,
 ) : FunctionalExpressionGroup<T, A>(algebra), Ring<Expression<T>> {
     public override val one: Expression<T> get() = const(algebra.one)
@@ -105,7 +101,7 @@ public open class FunctionalExpressionRing<T, A : Ring<T>>(
         super<FunctionalExpressionGroup>.binaryOperationFunction(operation)
 }
 
-public open class FunctionalExpressionField<T, A : Field<T>>(
+public open class FunctionalExpressionField<T, out A : Field<T>>(
     algebra: A,
 ) : FunctionalExpressionRing<T, A>(algebra), Field<Expression<T>>, ScaleOperations<Expression<T>> {
     /**
@@ -131,7 +127,7 @@ public open class FunctionalExpressionField<T, A : Field<T>>(
         super<FunctionalExpressionRing>.bindSymbolOrNull(value)
 }
 
-public open class FunctionalExpressionExtendedField<T, A : ExtendedField<T>>(
+public open class FunctionalExpressionExtendedField<T, out A : ExtendedField<T>>(
     algebra: A,
 ) : FunctionalExpressionField<T, A>(algebra), ExtendedField<Expression<T>> {
     public override fun number(value: Number): Expression<T> = const(algebra.number(value))
@@ -172,14 +168,26 @@ public open class FunctionalExpressionExtendedField<T, A : ExtendedField<T>>(
     public override fun bindSymbol(value: String): Expression<T> = super<FunctionalExpressionField>.bindSymbol(value)
 }
 
-public inline fun <T, A : Ring<T>> A.expressionInSpace(block: FunctionalExpressionGroup<T, A>.() -> Expression<T>): Expression<T> =
-    FunctionalExpressionGroup(this).block()
+public inline fun <T, A : Group<T>> A.expressionInGroup(
+    block: FunctionalExpressionGroup<T, A>.() -> Expression<T>,
+): Expression<T> {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return FunctionalExpressionGroup(this).block()
+}
 
-public inline fun <T, A : Ring<T>> A.expressionInRing(block: FunctionalExpressionRing<T, A>.() -> Expression<T>): Expression<T> =
-    FunctionalExpressionRing(this).block()
+public inline fun <T, A : Ring<T>> A.expressionInRing(
+    block: FunctionalExpressionRing<T, A>.() -> Expression<T>,
+): Expression<T> {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return FunctionalExpressionRing(this).block()
+}
 
-public inline fun <T, A : Field<T>> A.expressionInField(block: FunctionalExpressionField<T, A>.() -> Expression<T>): Expression<T> =
-    FunctionalExpressionField(this).block()
+public inline fun <T, A : Field<T>> A.expressionInField(
+    block: FunctionalExpressionField<T, A>.() -> Expression<T>,
+): Expression<T> {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return FunctionalExpressionField(this).block()
+}
 
 public inline fun <T, A : ExtendedField<T>> A.expressionInExtendedField(
     block: FunctionalExpressionExtendedField<T, A>.() -> Expression<T>,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
index 478b85620..960f6fd79 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
@@ -119,8 +119,6 @@ public open class SimpleAutoDiffField<T : Any, F : Field<T>>(
         get() = getDerivative(this)
         set(value) = setDerivative(this, value)
 
-    public inline fun const(block: F.() -> T): AutoDiffValue<T> = const(context.block())
-
     /**
      * Performs update of derivative after the rest of the formula in the back-pass.
      *
@@ -194,6 +192,11 @@ public open class SimpleAutoDiffField<T : Any, F : Field<T>>(
         }
 }
 
+public inline fun <T : Any, F : Field<T>> SimpleAutoDiffField<T, F>.const(block: F.() -> T): AutoDiffValue<T> {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return const(context.block())
+}
+
 
 /**
  * Runs differentiation and establishes [SimpleAutoDiffField] context inside the block of code.
@@ -208,7 +211,7 @@ public open class SimpleAutoDiffField<T : Any, F : Field<T>>(
  * assertEquals(9.0, x.d)  // dy/dx
  * ```
  *
- * @param body the action in [SimpleAutoDiffField] context returning [AutoDiffVariable] to differentiate with respect to.
+ * @param body the action in [SimpleAutoDiffField] context returning [AutoDiffValue] to differentiate with respect to.
  * @return the result of differentiation.
  */
 public fun <T : Any, F : Field<T>> F.simpleAutoDiff(
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
index 06634704c..c02bdad02 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
@@ -9,6 +9,8 @@ import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.structures.BufferFactory
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
 import kotlin.jvm.JvmInline
 
 /**
@@ -65,9 +67,13 @@ public value class SimpleSymbolIndexer(override val symbols: List<Symbol>) : Sym
  * Execute the block with symbol indexer based on given symbol order
  */
 @UnstableKMathAPI
-public inline fun <R> withSymbols(vararg symbols: Symbol, block: SymbolIndexer.() -> R): R =
-    with(SimpleSymbolIndexer(symbols.toList()), block)
+public inline fun <R> withSymbols(vararg symbols: Symbol, block: SymbolIndexer.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return with(SimpleSymbolIndexer(symbols.toList()), block)
+}
 
 @UnstableKMathAPI
-public inline fun <R> withSymbols(symbols: Collection<Symbol>, block: SymbolIndexer.() -> R): R =
-    with(SimpleSymbolIndexer(symbols.toList()), block)
\ No newline at end of file
+public inline fun <R> withSymbols(symbols: Collection<Symbol>, block: SymbolIndexer.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return with(SimpleSymbolIndexer(symbols.toList()), block)
+}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 9b4451a62..f1839077f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -15,7 +15,7 @@ import space.kscience.kmath.structures.VirtualBuffer
 import space.kscience.kmath.structures.indices
 
 
-public class BufferedLinearSpace<T : Any, A : Ring<T>>(
+public class BufferedLinearSpace<T : Any, out A : Ring<T>>(
     override val elementAlgebra: A,
     private val bufferFactory: BufferFactory<T>,
 ) : LinearSpace<T, A> {
@@ -88,4 +88,4 @@ public class BufferedLinearSpace<T : Any, A : Ring<T>>(
     override fun Matrix<T>.times(value: T): Matrix<T> = ndRing(rowNum, colNum).run {
         unwrap().map { it * value }.as2D()
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
index ec073ac48..badf2794e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
@@ -32,7 +32,7 @@ public typealias Point<T> = Buffer<T>
  * Basic operations on matrices and vectors. Operates on [Matrix].
  *
  * @param T the type of items in the matrices.
- * @param M the type of operated matrices.
+ * @param A the type of ring over [T].
  */
 public interface LinearSpace<T : Any, out A : Ring<T>> {
     public val elementAlgebra: A
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
index 37c93d249..e0d733a66 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
@@ -35,7 +35,7 @@ public object UnitFeature : DiagonalFeature
  *
  * @param T the type of matrices' items.
  */
-public interface InverseMatrixFeature<T : Any> : MatrixFeature {
+public interface InverseMatrixFeature<out T : Any> : MatrixFeature {
     /**
      * The inverse matrix of the matrix that owns this feature.
      */
@@ -47,7 +47,7 @@ public interface InverseMatrixFeature<T : Any> : MatrixFeature {
  *
  * @param T the type of matrices' items.
  */
-public interface DeterminantFeature<T : Any> : MatrixFeature {
+public interface DeterminantFeature<out T : Any> : MatrixFeature {
     /**
      * The determinant of the matrix that owns this feature.
      */
@@ -80,7 +80,7 @@ public object UFeature : MatrixFeature
  *
  * @param T the type of matrices' items.
  */
-public interface LUDecompositionFeature<T : Any> : MatrixFeature {
+public interface LUDecompositionFeature<out T : Any> : MatrixFeature {
     /**
      * The lower triangular matrix in this decomposition. It may have [LFeature].
      */
@@ -98,7 +98,7 @@ public interface LUDecompositionFeature<T : Any> : MatrixFeature {
  *
  * @param T the type of matrices' items.
  */
-public interface LupDecompositionFeature<T : Any> : MatrixFeature {
+public interface LupDecompositionFeature<out T : Any> : MatrixFeature {
     /**
      * The lower triangular matrix in this decomposition. It may have [LFeature].
      */
@@ -126,7 +126,7 @@ public object OrthogonalFeature : MatrixFeature
  *
  * @param T the type of matrices' items.
  */
-public interface QRDecompositionFeature<T : Any> : MatrixFeature {
+public interface QRDecompositionFeature<out T : Any> : MatrixFeature {
     /**
      * The orthogonal matrix in this decomposition. It may have [OrthogonalFeature].
      */
@@ -144,7 +144,7 @@ public interface QRDecompositionFeature<T : Any> : MatrixFeature {
  *
  * @param T the type of matrices' items.
  */
-public interface CholeskyDecompositionFeature<T : Any> : MatrixFeature {
+public interface CholeskyDecompositionFeature<out T : Any> : MatrixFeature {
     /**
      * The triangular matrix in this decomposition. It may have either [UFeature] or [LFeature].
      */
@@ -157,7 +157,7 @@ public interface CholeskyDecompositionFeature<T : Any> : MatrixFeature {
  *
  * @param T the type of matrices' items.
  */
-public interface SingularValueDecompositionFeature<T : Any> : MatrixFeature {
+public interface SingularValueDecompositionFeature<out T : Any> : MatrixFeature {
     /**
      * The matrix in this decomposition. It is unitary, and it consists from left singular vectors.
      */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
index 889eb4f22..ee7f1d8be 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
@@ -34,7 +34,7 @@ public inline fun <T, R> Iterable<T>.cumulative(initial: R, crossinline operatio
 public inline fun <T, R> Sequence<T>.cumulative(initial: R, crossinline operation: (R, T) -> R): Sequence<R> =
     Sequence { this@cumulative.iterator().cumulative(initial, operation) }
 
-public fun <T, R> List<T>.cumulative(initial: R, operation: (R, T) -> R): List<R> =
+public inline fun <T, R> List<T>.cumulative(initial: R, crossinline operation: (R, T) -> R): List<R> =
     iterator().cumulative(initial, operation).asSequence().toList()
 
 //Cumulative sum
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index 35bbc44f6..38985f216 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -24,7 +24,6 @@ public class ShapeMismatchException(public val expected: IntArray, public val ac
  *
  * @param T the type of ND-structure element.
  * @param C the type of the element context.
- * @param N the type of the structure.
  */
 public interface AlgebraND<T, out C : Algebra<T>> {
     /**
@@ -118,8 +117,7 @@ internal fun <T, C : Algebra<T>> AlgebraND<T, C>.checkShape(element: StructureND
  * Space of [StructureND].
  *
  * @param T the type of the element contained in ND structure.
- * @param N the type of ND structure.
- * @param S the type of space of structure elements.
+ * @param S the type of group over structure elements.
  */
 public interface GroupND<T, out S : Group<T>> : Group<StructureND<T>>, AlgebraND<T, S> {
     /**
@@ -186,8 +184,7 @@ public interface GroupND<T, out S : Group<T>> : Group<StructureND<T>>, AlgebraND
  * Ring of [StructureND].
  *
  * @param T the type of the element contained in ND structure.
- * @param N the type of ND structure.
- * @param R the type of ring of structure elements.
+ * @param R the type of ring over structure elements.
  */
 public interface RingND<T, out R : Ring<T>> : Ring<StructureND<T>>, GroupND<T, R> {
     /**
@@ -227,7 +224,7 @@ public interface RingND<T, out R : Ring<T>> : Ring<StructureND<T>>, GroupND<T, R
  * Field of [StructureND].
  *
  * @param T the type of the element contained in ND structure.
- * @param F the type field of structure elements.
+ * @param F the type field over structure elements.
  */
 public interface FieldND<T, out F : Field<T>> : Field<StructureND<T>>, RingND<T, F>, ScaleOperations<StructureND<T>> {
     /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index 2b82a36ae..6eacf1ca5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -57,7 +57,7 @@ public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
     }
 }
 
-public open class BufferedGroupND<T, A : Group<T>>(
+public open class BufferedGroupND<T, out A : Group<T>>(
     final override val shape: IntArray,
     final override val elementContext: A,
     final override val bufferFactory: BufferFactory<T>,
@@ -67,7 +67,7 @@ public open class BufferedGroupND<T, A : Group<T>>(
     override fun StructureND<T>.unaryMinus(): StructureND<T> = produce { -get(it) }
 }
 
-public open class BufferedRingND<T, R : Ring<T>>(
+public open class BufferedRingND<T, out R : Ring<T>>(
     shape: IntArray,
     elementContext: R,
     bufferFactory: BufferFactory<T>,
@@ -75,7 +75,7 @@ public open class BufferedRingND<T, R : Ring<T>>(
     override val one: BufferND<T> by lazy { produce { one } }
 }
 
-public open class BufferedFieldND<T, R : Field<T>>(
+public open class BufferedFieldND<T, out R : Field<T>>(
     shape: IntArray,
     elementContext: R,
     bufferFactory: BufferFactory<T>,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
index 720a06ace..1305558e5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
@@ -31,11 +31,10 @@ public class ShortRingND(
 /**
  * Fast element production using function inlining.
  */
-public inline fun BufferedRingND<Short, ShortRing>.produceInline(crossinline initializer: ShortRing.(Int) -> Short): BufferND<Short> {
-    return BufferND(strides, ShortBuffer(ShortArray(strides.linearSize) { offset -> ShortRing.initializer(offset) }))
-}
+public inline fun BufferedRingND<Short, ShortRing>.produceInline(crossinline initializer: ShortRing.(Int) -> Short): BufferND<Short> =
+    BufferND(strides, ShortBuffer(ShortArray(strides.linearSize) { offset -> ShortRing.initializer(offset) }))
 
 public inline fun <R> ShortRing.nd(vararg shape: Int, action: ShortRingND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
     return ShortRingND(shape).run(action)
-}
\ No newline at end of file
+}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 7fc91e321..1ad8289bc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -53,7 +53,7 @@ public interface StructureND<out T> {
     public fun elements(): Sequence<Pair<IntArray, T>>
 
     /**
-     * Feature is some additional strucure information which allows to access it special properties or hints.
+     * Feature is some additional structure information which allows to access it special properties or hints.
      * If the feature is not present, null is returned.
      */
     @UnstableKMathAPI
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
index cc058d3fc..403a9c9b1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
@@ -15,7 +15,7 @@ import space.kscience.kmath.misc.UnstableKMathAPI
  */
 @UnstableKMathAPI
 @Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public interface AlgebraElement<T, C : Algebra<T>> {
+public interface AlgebraElement<T, out C : Algebra<T>> {
     /**
      * The context this element belongs to.
      */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index ac53c4d5e..c332b086e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -445,7 +445,7 @@ public fun UIntArray.toBigInt(sign: Byte): BigInt {
  * Returns null if a valid number can not be read from a string
  */
 public fun String.parseBigInteger(): BigInt? {
-    if (this.isEmpty()) return null
+    if (isEmpty()) return null
     val sign: Int
 
     val positivePartIndex = when (this[0]) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
index 352c75956..03b3822c3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
@@ -14,30 +14,30 @@ import space.kscience.kmath.nd.as2D
  * A context that allows to operate on a [MutableBuffer] as on 2d array
  */
 internal class BufferAccessor2D<T : Any>(
-    public val rowNum: Int,
-    public val colNum: Int,
+    val rowNum: Int,
+    val colNum: Int,
     val factory: MutableBufferFactory<T>,
 ) {
-    public operator fun Buffer<T>.get(i: Int, j: Int): T = get(i * colNum + j)
+    operator fun Buffer<T>.get(i: Int, j: Int): T = get(i * colNum + j)
 
-    public operator fun MutableBuffer<T>.set(i: Int, j: Int, value: T) {
+    operator fun MutableBuffer<T>.set(i: Int, j: Int, value: T) {
         set(i * colNum + j, value)
     }
 
-    public inline fun create(crossinline init: (i: Int, j: Int) -> T): MutableBuffer<T> =
+    inline fun create(crossinline init: (i: Int, j: Int) -> T): MutableBuffer<T> =
         factory(rowNum * colNum) { offset -> init(offset / colNum, offset % colNum) }
 
-    public fun create(mat: Structure2D<T>): MutableBuffer<T> = create { i, j -> mat[i, j] }
+    fun create(mat: Structure2D<T>): MutableBuffer<T> = create { i, j -> mat[i, j] }
 
     //TODO optimize wrapper
-    public fun MutableBuffer<T>.collect(): Structure2D<T> = StructureND.buffered(
+    fun MutableBuffer<T>.collect(): Structure2D<T> = StructureND.buffered(
         DefaultStrides(intArrayOf(rowNum, colNum)),
         factory
     ) { (i, j) ->
         get(i, j)
     }.as2D()
 
-    public inner class Row(public val buffer: MutableBuffer<T>, public val rowIndex: Int) : MutableBuffer<T> {
+    inner class Row(val buffer: MutableBuffer<T>, val rowIndex: Int) : MutableBuffer<T> {
         override val size: Int get() = colNum
 
         override operator fun get(index: Int): T = buffer[rowIndex, index]
@@ -54,5 +54,5 @@ internal class BufferAccessor2D<T : Any>(
     /**
      * Get row
      */
-    public fun MutableBuffer<T>.row(i: Int): Row = Row(this, i)
+    fun MutableBuffer<T>.row(i: Int): Row = Row(this, i)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferOperation.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferOperation.kt
index 1b89e7838..3dad14ac5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferOperation.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferOperation.kt
@@ -67,9 +67,9 @@ public inline fun <T : Any, reified R : Any> Buffer<T>.map(block: (T) -> R): Buf
  * Create a new buffer from this one with the given mapping function.
  * Provided [bufferFactory] is used to construct the new buffer.
  */
-public fun <T : Any, R : Any> Buffer<T>.map(
+public inline fun <T : Any, R : Any> Buffer<T>.map(
     bufferFactory: BufferFactory<R>,
-    block: (T) -> R,
+    crossinline block: (T) -> R,
 ): Buffer<R> = bufferFactory(size) { block(get(it)) }
 
 /**
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/VectorSpaceTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/VectorSpaceTest.kt
deleted file mode 100644
index f2c7f1f90..000000000
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/VectorSpaceTest.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt
index bd09ff449..20a7b6a72 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt
@@ -10,7 +10,7 @@ import space.kscience.kmath.operations.invoke
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
 
-internal class FieldVerifier<T, A : Field<T>>(
+internal class FieldVerifier<T, out A : Field<T>>(
     algebra: A, a: T, b: T, c: T, x: Number,
 ) : RingVerifier<T, A>(algebra, a, b, c, x) {
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt
index 885857f04..daf18834a 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt
@@ -10,7 +10,7 @@ import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
 import kotlin.test.assertEquals
 
-internal open class RingVerifier<T, A>(algebra: A, a: T, b: T, c: T, x: Number) :
+internal open class RingVerifier<T, out A>(algebra: A, a: T, b: T, c: T, x: Number) :
     SpaceVerifier<T, A>(algebra, a, b, c, x) where A : Ring<T>, A : ScaleOperations<T> {
 
     override fun verify() {
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
index 526250cf0..88456e124 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
@@ -29,4 +29,4 @@ public fun BlockingDoubleChain.map(transform: (Double) -> Double): BlockingDoubl
     }
 
     override suspend fun fork(): BlockingDoubleChain = this@map.fork().map(transform)
-}
\ No newline at end of file
+}
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
index 49f32f82f..1f17efe49 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
@@ -15,30 +15,33 @@ public val Dispatchers.Math: CoroutineDispatcher
 /**
  * An imitator of [Deferred] which holds a suspended function block and dispatcher
  */
-internal class LazyDeferred<T>(val dispatcher: CoroutineDispatcher, val block: suspend CoroutineScope.() -> T) {
+@PublishedApi
+internal class LazyDeferred<out T>(val dispatcher: CoroutineDispatcher, val block: suspend CoroutineScope.() -> T) {
     private var deferred: Deferred<T>? = null
 
-    internal fun start(scope: CoroutineScope) {
+    fun start(scope: CoroutineScope) {
         if (deferred == null) deferred = scope.async(dispatcher, block = block)
     }
 
     suspend fun await(): T = deferred?.await() ?: error("Coroutine not started")
 }
 
-public class AsyncFlow<T> internal constructor(internal val deferredFlow: Flow<LazyDeferred<T>>) : Flow<T> {
+public class AsyncFlow<out T> @PublishedApi internal constructor(
+    @PublishedApi internal val deferredFlow: Flow<LazyDeferred<T>>,
+) : Flow<T> {
     override suspend fun collect(collector: FlowCollector<T>): Unit =
         deferredFlow.collect { collector.emit((it.await())) }
 }
 
-public fun <T, R> Flow<T>.async(
+public inline fun <T, R> Flow<T>.async(
     dispatcher: CoroutineDispatcher = Dispatchers.Default,
-    block: suspend CoroutineScope.(T) -> R,
+    crossinline block: suspend CoroutineScope.(T) -> R,
 ): AsyncFlow<R> {
     val flow = map { LazyDeferred(dispatcher) { block(it) } }
     return AsyncFlow(flow)
 }
 
-public fun <T, R> AsyncFlow<T>.map(action: (T) -> R): AsyncFlow<R> =
+public inline fun <T, R> AsyncFlow<T>.map(crossinline action: (T) -> R): AsyncFlow<R> =
     AsyncFlow(deferredFlow.map { input ->
         //TODO add function composition
         LazyDeferred(input.dispatcher) {
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
index 2ebcc454d..a2ee14301 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
@@ -17,7 +17,7 @@ import kotlin.jvm.JvmInline
 /**
  * A matrix with compile-time controlled dimension
  */
-public interface DMatrix<T, R : Dimension, C : Dimension> : Structure2D<T> {
+public interface DMatrix<out T, R : Dimension, C : Dimension> : Structure2D<T> {
     public companion object {
         /**
          * Coerces a regular matrix to a matrix with type-safe dimensions and throws a error if coercion failed
@@ -46,7 +46,7 @@ public interface DMatrix<T, R : Dimension, C : Dimension> : Structure2D<T> {
  * An inline wrapper for a Matrix
  */
 @JvmInline
-public value class DMatrixWrapper<T, R : Dimension, C : Dimension>(
+public value class DMatrixWrapper<out T, R : Dimension, C : Dimension>(
     private val structure: Structure2D<T>,
 ) : DMatrix<T, R, C> {
     override val shape: IntArray get() = structure.shape
@@ -58,7 +58,7 @@ public value class DMatrixWrapper<T, R : Dimension, C : Dimension>(
 /**
  * Dimension-safe point
  */
-public interface DPoint<T, D : Dimension> : Point<T> {
+public interface DPoint<out T, D : Dimension> : Point<T> {
     public companion object {
         public inline fun <T, reified D : Dimension> coerce(point: Point<T>): DPoint<T, D> {
             require(point.size == Dimension.dim<D>().toInt()) {
@@ -76,7 +76,7 @@ public interface DPoint<T, D : Dimension> : Point<T> {
  * Dimension-safe point wrapper
  */
 @JvmInline
-public value class DPointWrapper<T, D : Dimension>(public val point: Point<T>) :
+public value class DPointWrapper<out T, D : Dimension>(public val point: Point<T>) :
     DPoint<T, D> {
     override val size: Int get() = point.size
 
@@ -111,7 +111,7 @@ public value class DMatrixContext<T : Any, out A : Ring<T>>(public val context:
     ): DMatrix<T, R, C> {
         val rows = Dimension.dim<R>()
         val cols = Dimension.dim<C>()
-        return context.buildMatrix(rows.toInt(), cols.toInt(), initializer).coerce<R, C>()
+        return context.buildMatrix(rows.toInt(), cols.toInt(), initializer).coerce()
     }
 
     public inline fun <reified D : Dimension> point(noinline initializer: A.(Int) -> T): DPoint<T, D> {
diff --git a/kmath-dimensions/src/commonTest/kotlin/kscience/dimensions/DMatrixContextTest.kt b/kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt
similarity index 100%
rename from kmath-dimensions/src/commonTest/kotlin/kscience/dimensions/DMatrixContextTest.kt
rename to kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
index 8023236ea..091b5db3f 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
@@ -184,4 +184,4 @@ public fun tan(arg: RealMatrix): RealMatrix = arg.map { kotlin.math.tan(it) }
 
 public fun ln(arg: RealMatrix): RealMatrix = arg.map { kotlin.math.ln(it) }
 
-public fun log10(arg: RealMatrix): RealMatrix = arg.map { kotlin.math.log10(it) }
\ No newline at end of file
+public fun log10(arg: RealMatrix): RealMatrix = arg.map { kotlin.math.log10(it) }
diff --git a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt b/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt
index b3e129c2e..a9c5f9e1a 100644
--- a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt
@@ -32,7 +32,7 @@ internal class DoubleMatrixTest {
 
     @Test
     fun testSequenceToMatrix() {
-        val m = Sequence<DoubleArray> {
+        val m = Sequence {
             listOf(
                 DoubleArray(10) { 10.0 },
                 DoubleArray(10) { 20.0 },
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index 73fa57c7b..5f35d0ab6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -14,7 +14,7 @@ import space.kscience.kmath.operations.Ring
  * @param T the piece key type.
  * @param R the sub-function type.
  */
-public fun interface Piecewise<T, R> {
+public fun interface Piecewise<in T, out R> {
     /**
      * Returns the appropriate sub-function for given piece key.
      */
@@ -23,7 +23,9 @@ public fun interface Piecewise<T, R> {
 
 /**
  * Represents piecewise-defined function where all the sub-functions are polynomials.
- * @param pieces An ordered list of range-polynomial pairs. The list does not in general guarantee that there are no "holes" in it.
+ *
+ * @property pieces An ordered list of range-polynomial pairs. The list does not in general guarantee that there are no
+ * "holes" in it.
  */
 public interface PiecewisePolynomial<T : Comparable<T>> : Piecewise<T, Polynomial<T>> {
     public val pieces: Collection<Pair<ClosedRange<T>, Polynomial<T>>>
@@ -45,7 +47,7 @@ public fun <T : Comparable<T>> PiecewisePolynomial(
 
 /**
  * An optimized piecewise which uses not separate pieces, but a range separated by delimiters.
- * The pices search is logarithmic
+ * The pieces search is logarithmic
  */
 private class OrderedPiecewisePolynomial<T : Comparable<T>>(
     override val pieces: List<Pair<ClosedRange<T>, Polynomial<T>>>,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index ba77d7b25..f0c858b03 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -17,7 +17,7 @@ import kotlin.math.pow
  *
  * @param coefficients constant is the leftmost coefficient.
  */
-public class Polynomial<T>(public val coefficients: List<T>) {
+public class Polynomial<out T>(public val coefficients: List<T>) {
     override fun toString(): String = "Polynomial$coefficients"
 }
 
@@ -69,7 +69,7 @@ public fun <T, A> Polynomial<T>.differentiate(
 public fun <T, A> Polynomial<T>.integrate(
     algebra: A,
 ): Polynomial<T> where  A : Field<T>, A : NumericAlgebra<T> = algebra {
-    val integratedCoefficients = buildList<T>(coefficients.size + 1) {
+    val integratedCoefficients = buildList(coefficients.size + 1) {
         add(zero)
         coefficients.forEachIndexed{ index, t -> add(t / (number(index) + one)) }
     }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
index f9c26e88b..4f565a893 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
@@ -18,7 +18,7 @@ public interface Integrand {
 
 public inline fun <reified T : IntegrandFeature> Integrand.getFeature(): T? = getFeature(T::class)
 
-public class IntegrandValue<T : Any>(public val value: T) : IntegrandFeature {
+public class IntegrandValue<out T : Any>(public val value: T) : IntegrandFeature {
     override fun toString(): String = "Value($value)"
 }
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index e265f54e8..7f68284a7 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -93,7 +93,7 @@ public fun <T : Any> UnivariateIntegrator<T>.integrate(
 ): UnivariateIntegrand<T> = integrate(UnivariateIntegrand(function, IntegrationRange(range), *features))
 
 /**
- * A shortcut method to integrate a [function] in [range] with additional [features].
+ * A shortcut method to integrate a [function] in [range] with additional features.
  * The [function] is placed in the end position to allow passing a lambda.
  */
 @UnstableKMathAPI
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
index c9ec0d527..f4a0abd5d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
@@ -18,7 +18,7 @@ import space.kscience.kmath.structures.asBuffer
 /**
  * And interpolator for data with x column type [X], y column type [Y].
  */
-public fun interface Interpolator<T, X : T, Y : T> {
+public fun interface Interpolator<T, in X : T, Y : T> {
     public fun interpolate(points: XYColumnarData<T, X, Y>): (X) -> Y
 }
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
index 5a6d23709..8c6ccb55e 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.geometry
 
-public data class Line<V : Vector>(val base: V, val direction: V)
+public data class Line<out V : Vector>(val base: V, val direction: V)
 
 public typealias Line2D = Line<Vector2D>
 public typealias Line3D = Line<Vector3D>
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
index fcb5e96dc..31da4f392 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
@@ -13,14 +13,14 @@ import space.kscience.kmath.structures.asBuffer
 /**
  * The binned data element. Could be a histogram bin with a number of counts or an artificial construct
  */
-public interface Bin<T : Any> : Domain<T> {
+public interface Bin<in T : Any> : Domain<T> {
     /**
      * The value of this bin.
      */
     public val value: Number
 }
 
-public interface Histogram<T : Any, out B : Bin<T>> {
+public interface Histogram<in T : Any, out B : Bin<T>> {
     /**
      * Find existing bin, corresponding to given coordinates
      */
@@ -34,7 +34,7 @@ public interface Histogram<T : Any, out B : Bin<T>> {
     public val bins: Iterable<B>
 }
 
-public fun interface HistogramBuilder<T : Any> {
+public fun interface HistogramBuilder<in T : Any> {
 
     /**
      * Increment appropriate bin
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
index e5f6830c5..6d48d3738 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
@@ -18,7 +18,7 @@ import space.kscience.kmath.operations.invoke
 /**
  * A simple histogram bin based on domain
  */
-public data class DomainBin<T : Comparable<T>>(
+public data class DomainBin<in T : Comparable<T>>(
     public val domain: Domain<T>,
     public override val value: Number,
 ) : Bin<T>, Domain<T> by domain
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
index 8d05df68a..daea4a82e 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
@@ -36,9 +36,10 @@ public class TreeHistogram(
 }
 
 @OptIn(UnstableKMathAPI::class)
-private class TreeHistogramBuilder(val binFactory: (Double) -> UnivariateDomain) : UnivariateHistogramBuilder {
+@PublishedApi
+internal class TreeHistogramBuilder(val binFactory: (Double) -> UnivariateDomain) : UnivariateHistogramBuilder {
 
-    private class BinCounter(val domain: UnivariateDomain, val counter: Counter<Double> = Counter.real()) :
+    internal class BinCounter(val domain: UnivariateDomain, val counter: Counter<Double> = Counter.real()) :
         ClosedFloatingPointRange<Double> by domain.range
 
     private val bins: TreeMap<Double, BinCounter> = TreeMap()
@@ -80,10 +81,10 @@ private class TreeHistogramBuilder(val binFactory: (Double) -> UnivariateDomain)
  */
 @UnstableKMathAPI
 public class TreeHistogramSpace(
-    private val binFactory: (Double) -> UnivariateDomain,
+    @PublishedApi internal val binFactory: (Double) -> UnivariateDomain,
 ) : Group<UnivariateHistogram>, ScaleOperations<UnivariateHistogram> {
 
-    public fun fill(block: UnivariateHistogramBuilder.() -> Unit): UnivariateHistogram =
+    public inline fun fill(block: UnivariateHistogramBuilder.() -> Unit): UnivariateHistogram =
         TreeHistogramBuilder(binFactory).apply(block).build()
 
     override fun add(
@@ -115,8 +116,8 @@ public class TreeHistogramSpace(
                     bin.domain.center,
                     UnivariateBin(
                         bin.domain,
-                        value = bin.value * value.toDouble(),
-                        standardDeviation = abs(bin.standardDeviation * value.toDouble())
+                        value = bin.value * value,
+                        standardDeviation = abs(bin.standardDeviation * value)
                     )
                 )
             }
diff --git a/kmath-kotlingrad/build.gradle.kts b/kmath-kotlingrad/build.gradle.kts
index 01b42d7ba..d222ed7d6 100644
--- a/kmath-kotlingrad/build.gradle.kts
+++ b/kmath-kotlingrad/build.gradle.kts
@@ -18,14 +18,14 @@ readme {
 
     feature(
         "differentiable-mst-expression",
-        "src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt",
+        "src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt",
     ) {
         "MST based DifferentiableExpression."
     }
 
     feature(
-        "differentiable-mst-expression",
-        "src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt",
+        "scalars-adapters",
+        "src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt",
     ) {
         "Conversions between Kotlin∇'s SFun and MST"
     }
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
index 140a212f8..d4cad8996 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
@@ -25,7 +25,7 @@ private class Nd4jArrayIndicesIterator(private val iterateOver: INDArray) : Iter
 
 internal fun INDArray.indicesIterator(): Iterator<IntArray> = Nd4jArrayIndicesIterator(this)
 
-private sealed class Nd4jArrayIteratorBase<T>(protected val iterateOver: INDArray) : Iterator<Pair<IntArray, T>> {
+private sealed class Nd4jArrayIteratorBase<out T>(protected val iterateOver: INDArray) : Iterator<Pair<IntArray, T>> {
     private var i: Int = 0
 
     final override fun hasNext(): Boolean = i < iterateOver.length()
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
index 4a1676412..15ae494f6 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
@@ -9,7 +9,7 @@ import space.kscience.kmath.expressions.Symbol
 
 public interface OptimizationFeature
 
-public class OptimizationResult<T>(
+public class OptimizationResult<out T>(
     public val point: Map<Symbol, T>,
     public val value: T,
     public val features: Set<OptimizationFeature> = emptySet(),
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ConstantSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ConstantSampler.kt
deleted file mode 100644
index 0d38fe19b..000000000
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ConstantSampler.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.samplers
-
-import space.kscience.kmath.chains.BlockingBufferChain
-import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.stat.Sampler
-import space.kscience.kmath.structures.Buffer
-
-public class ConstantSampler<T : Any>(public val const: T) : Sampler<T> {
-    override fun sample(generator: RandomGenerator): BlockingBufferChain<T> = object : BlockingBufferChain<T> {
-        override fun nextBufferBlocking(size: Int): Buffer<T> = Buffer.boxing(size) { const }
-        override suspend fun fork(): BlockingBufferChain<T> = this
-    }
-}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
index 9e5c70a26..0e06fa162 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
@@ -6,6 +6,8 @@
 package space.kscience.kmath.stat
 
 import kotlinx.coroutines.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 import kotlin.coroutines.coroutineContext
@@ -23,14 +25,18 @@ public class MCScope(
 /**
  * Launches a supervised Monte-Carlo scope
  */
-public suspend inline fun <T> mcScope(generator: RandomGenerator, block: MCScope.() -> T): T =
-    MCScope(coroutineContext, generator).block()
+public suspend inline fun <T> mcScope(generator: RandomGenerator, block: MCScope.() -> T): T {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return MCScope(coroutineContext, generator).block()
+}
 
 /**
  * Launch mc scope with a given seed
  */
-public suspend inline fun <T> mcScope(seed: Long, block: MCScope.() -> T): T =
-    mcScope(RandomGenerator.default(seed), block)
+public suspend inline fun <T> mcScope(seed: Long, block: MCScope.() -> T): T {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return mcScope(RandomGenerator.default(seed), block)
+}
 
 /**
  * Specialized launch for [MCScope]. Behaves the same way as regular [CoroutineScope.launch], but also stores the generator fork.
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
index 51ae78d3d..4c11fdd65 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
@@ -12,7 +12,7 @@ import space.kscience.kmath.structures.*
 import kotlin.jvm.JvmName
 
 /**
- * Sampler that generates chains of values of type [T] in a chain of type [C].
+ * Sampler that generates chains of values of type [T].
  */
 public fun interface Sampler<out T : Any> {
     /**
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
index b3d607ab0..27465eff4 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
@@ -18,7 +18,7 @@ import space.kscience.kmath.operations.invoke
  *
  * @property value the value to sample.
  */
-public class ConstantSampler<T : Any>(public val value: T) : Sampler<T> {
+public class ConstantSampler<out T : Any>(public val value: T) : Sampler<T> {
     public override fun sample(generator: RandomGenerator): Chain<T> = ConstantChain(value)
 }
 
@@ -27,7 +27,7 @@ public class ConstantSampler<T : Any>(public val value: T) : Sampler<T> {
  *
  * @property chainBuilder the provider of [Chain].
  */
-public class BasicSampler<T : Any>(public val chainBuilder: (RandomGenerator) -> Chain<T>) : Sampler<T> {
+public class BasicSampler<out T : Any>(public val chainBuilder: (RandomGenerator) -> Chain<T>) : Sampler<T> {
     public override fun sample(generator: RandomGenerator): Chain<T> = chainBuilder(generator)
 }
 
@@ -36,7 +36,7 @@ public class BasicSampler<T : Any>(public val chainBuilder: (RandomGenerator) ->
  *
  * @property algebra the space to provide addition and scalar multiplication for [T].
  */
-public class SamplerSpace<T : Any, S>(public val algebra: S) : Group<Sampler<T>>,
+public class SamplerSpace<T : Any, out S>(public val algebra: S) : Group<Sampler<T>>,
     ScaleOperations<Sampler<T>> where S : Group<T>, S : ScaleOperations<T> {
 
     public override val zero: Sampler<T> = ConstantSampler(algebra.zero)
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
index 1b05aa9cd..f29b7415c 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
@@ -18,14 +18,14 @@ import space.kscience.kmath.structures.Buffer
 /**
  * A function, that transforms a buffer of random quantities to some resulting value
  */
-public interface Statistic<T, R> {
+public interface Statistic<in T, out R> {
     public suspend fun evaluate(data: Buffer<T>): R
 }
 
-public interface BlockingStatistic<T,R>: Statistic<T,R>{
+public interface BlockingStatistic<in T, out R> : Statistic<T, R> {
     public fun evaluateBlocking(data: Buffer<T>): R
 
-    override suspend fun evaluate(data: Buffer<T>): R  = evaluateBlocking(data)
+    override suspend fun evaluate(data: Buffer<T>): R = evaluateBlocking(data)
 }
 
 /**
@@ -34,7 +34,7 @@ public interface BlockingStatistic<T,R>: Statistic<T,R>{
  * @param I - intermediate block type
  * @param R - result type
  */
-public interface ComposableStatistic<T, I, R> : Statistic<T, R> {
+public interface ComposableStatistic<in T, I, out R> : Statistic<T, R> {
     //compute statistic on a single block
     public suspend fun computeIntermediate(data: Buffer<T>): I
 
diff --git a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
index a6773c709..88f0c941e 100644
--- a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
+++ b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
@@ -14,7 +14,8 @@ import space.kscience.kmath.expressions.interpret
 import space.kscience.kmath.operations.NumericAlgebra
 
 /**
- * Represents [MST] based [DifferentiableExpression] relying on [Symja](https://github.com/axkr/symja_android_library).
+ * Represents [MST] based [space.kscience.kmath.expressions.DifferentiableExpression] relying on
+ * [Symja](https://github.com/axkr/symja_android_library).
  *
  * The principle of this API is converting the [mst] to an [org.matheclipse.core.interfaces.IExpr], differentiating it
  * with Symja's [F.D], then converting [org.matheclipse.core.interfaces.IExpr] back to [MST].
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index 6b991d5df..b19a55381 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -3,7 +3,7 @@
 Common linear algebra operations on tensors.
 
  - [tensor algebra](src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Basic linear algebra operations on tensors (plus, dot, etc.)
- - [tensor algebra with broadcasting](src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting.
+ - [tensor algebra with broadcasting](src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting.
  - [linear algebra operations](src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Advanced linear algebra operations like LU decomposition, SVD, etc.
 
 
diff --git a/kmath-tensors/build.gradle.kts b/kmath-tensors/build.gradle.kts
index b7f24dc6a..2eff2d821 100644
--- a/kmath-tensors/build.gradle.kts
+++ b/kmath-tensors/build.gradle.kts
@@ -24,20 +24,16 @@ readme {
 
     feature(
         id = "tensor algebra",
-        description = "Basic linear algebra operations on tensors (plus, dot, etc.)",
         ref = "src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt"
-    )
+    ) { "Basic linear algebra operations on tensors (plus, dot, etc.)" }
 
     feature(
         id = "tensor algebra with broadcasting",
-        description = "Basic linear algebra operations implemented with broadcasting.",
-        ref = "src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt"
-    )
+        ref = "src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt"
+    ) { "Basic linear algebra operations implemented with broadcasting." }
 
     feature(
         id = "linear algebra operations",
-        description = "Advanced linear algebra operations like LU decomposition, SVD, etc.",
         ref = "src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt"
-    )
-
-}
\ No newline at end of file
+    ) { "Advanced linear algebra operations like LU decomposition, SVD, etc." }
+}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 315dc4505..87ac2fdf6 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -11,8 +11,8 @@ import space.kscience.kmath.tensors.core.internal.TensorLinearStructure
  */
 public open class BufferedTensor<T> internal constructor(
     override val shape: IntArray,
-    internal val mutableBuffer: MutableBuffer<T>,
-    internal val bufferStart: Int
+    @PublishedApi internal val mutableBuffer: MutableBuffer<T>,
+    @PublishedApi internal val bufferStart: Int,
 ) : Tensor<T> {
 
     /**
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
index 41df50cba..8e5116336 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.tensors.core.internal.toPrettyString
 /**
  * Default [BufferedTensor] implementation for [Double] values
  */
-public class DoubleTensor internal constructor(
+public class DoubleTensor @PublishedApi internal constructor(
     shape: IntArray,
     buffer: DoubleArray,
     offset: Int = 0
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 1fd46bd57..d182558c5 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -426,13 +426,11 @@ public open class DoubleTensorAlgebra :
      * @param transform the function to be applied to each element of the tensor.
      * @return the resulting tensor after applying the function.
      */
-    public fun Tensor<Double>.map(transform: (Double) -> Double): DoubleTensor {
-        return DoubleTensor(
-            tensor.shape,
-            tensor.mutableBuffer.array().map { transform(it) }.toDoubleArray(),
-            tensor.bufferStart
-        )
-    }
+    public inline fun Tensor<Double>.map(transform: (Double) -> Double): DoubleTensor = DoubleTensor(
+        tensor.shape,
+        tensor.mutableBuffer.array().map { transform(it) }.toDoubleArray(),
+        tensor.bufferStart
+    )
 
     /**
      * Compares element-wise two tensors with a specified precision.
@@ -519,14 +517,12 @@ public open class DoubleTensorAlgebra :
      * @param indices the [IntArray] of 1-dimensional indices
      * @return tensor with rows corresponding to rows by [indices]
      */
-    public fun Tensor<Double>.rowsByIndices(indices: IntArray): DoubleTensor {
-        return stack(indices.map { this[it] })
-    }
+    public fun Tensor<Double>.rowsByIndices(indices: IntArray): DoubleTensor = stack(indices.map { this[it] })
 
-    internal fun Tensor<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
+    internal inline fun Tensor<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
         foldFunction(tensor.toDoubleArray())
 
-    internal fun Tensor<Double>.foldDim(
+    internal inline fun Tensor<Double>.foldDim(
         foldFunction: (DoubleArray) -> Double,
         dim: Int,
         keepDim: Boolean,
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index 7d3617547..4c9c00552 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -10,15 +10,15 @@ import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.*
+import space.kscience.kmath.tensors.core.BufferedTensor
+import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
-import space.kscience.kmath.tensors.core.DoubleTensorAlgebra.Companion.valueOrNull
+import space.kscience.kmath.tensors.core.IntTensor
 import kotlin.math.abs
 import kotlin.math.min
 import kotlin.math.sign
 import kotlin.math.sqrt
 
-
 internal fun <T> BufferedTensor<T>.vectorSequence(): Sequence<BufferedTensor<T>> = sequence {
     val n = shape.size
     val vectorOffset = shape[n - 1]
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index d965b6bcd..77264ff92 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -31,6 +31,7 @@ internal fun <T> Tensor<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
     else -> this.copyToBufferedTensor()
 }
 
+@PublishedApi
 internal val Tensor<Double>.tensor: DoubleTensor
     get() = when (this) {
         is DoubleTensor -> this
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index 0ffaf39e7..e337eeef9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -24,6 +24,7 @@ internal fun Buffer<Int>.array(): IntArray = when (this) {
 /**
  * Returns a reference to [DoubleArray] containing all of the elements of this [Buffer] or copy the data.
  */
+@PublishedApi
 internal fun Buffer<Double>.array(): DoubleArray = when (this) {
     is DoubleBuffer -> array
     else -> this.toDoubleArray()
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 347bb683f..c525d5c83 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -183,7 +183,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 }
 
 
-private fun DoubleTensorAlgebra.testSVDFor(tensor: DoubleTensor, epsilon: Double = 1e-10): Unit {
+private fun DoubleTensorAlgebra.testSVDFor(tensor: DoubleTensor, epsilon: Double = 1e-10) {
     val svd = tensor.svd()
 
     val tensorSVD = svd.first
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index e7e898008..85c3e74e3 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -17,7 +17,7 @@ internal class TestDoubleTensorAlgebra {
     }
 
     @Test
-    fun TestDoubleDiv() = DoubleTensorAlgebra {
+    fun testDoubleDiv() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(2.0, 4.0))
         val res = 2.0/tensor
         assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(1.0, 0.5))
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index b7abf4304..915637e2c 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -92,7 +92,7 @@ public class ViktorFieldND(public override val shape: IntArray) : FieldND<Double
         (a.f64Buffer + b.f64Buffer).asStructure()
 
     public override fun scale(a: StructureND<Double>, value: Double): ViktorStructureND =
-        (a.f64Buffer * value.toDouble()).asStructure()
+        (a.f64Buffer * value).asStructure()
 
     public override inline fun StructureND<Double>.plus(b: StructureND<Double>): ViktorStructureND =
         (f64Buffer + b.f64Buffer).asStructure()
-- 
2.34.1


From ef41c3f1680ce67788c128ea3105c0c77e90c0c1 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sat, 17 Jul 2021 01:12:14 +0700
Subject: [PATCH 299/713] Build infrastructure changes

---
 .github/workflows/build.yml       |  7 +++--
 .github/workflows/pages.yml       | 25 ++++++++++--------
 .github/workflows/publish.yml     | 21 +++++----------
 build.gradle.kts                  | 42 ++++++++++++++++++++----------
 buildSrc/build.gradle.kts         |  2 +-
 gradle.properties                 |  1 -
 kmath-core/README.md              |  2 +-
 kmath-core/build.gradle.kts       | 43 ++++++++++++-------------------
 kmath-coroutines/build.gradle.kts |  1 +
 kmath-ejml/build.gradle.kts       |  8 +++---
 kmath-for-real/build.gradle.kts   |  1 +
 kmath-functions/build.gradle.kts  |  1 +
 kmath-geometry/build.gradle.kts   |  1 +
 kmath-histograms/build.gradle.kts |  1 +
 kmath-stat/build.gradle.kts       |  1 +
 kmath-tensors/build.gradle.kts    |  9 +++----
 settings.gradle.kts               |  6 ++---
 17 files changed, 87 insertions(+), 85 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 98f4d2ec2..2b611a46a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,8 +2,10 @@ name: Gradle build
 
 on:
   push:
+    branches:
+      - dev
+      - master
   pull_request:
-    types: [opened, edited]
 
 jobs:
   build:
@@ -21,9 +23,6 @@ jobs:
           graalvm: 21.1.0
           java: java11
           arch: amd64
-      - name: Add msys to path
-        if: matrix.os == 'windows-latest'
-        run: SETX PATH "%PATH%;C:\msys64\mingw64\bin"
       - name: Cache gradle
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 86fdac6a6..1836287c8 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -2,23 +2,26 @@ name: Dokka publication
 
 on:
   push:
-    branches:
-      - master
+    branches: [ master ]
 
 jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v2
+      - uses: DeLaGuardo/setup-graalvm@4.0
         with:
-          java-version: 11
-      - name: Build
-        run: ./gradlew dokkaHtmlMultiModule --no-daemon --no-parallel --stacktrace
-      - name: Deploy to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@4.1.0
+          graalvm: 21.1.0
+          java: java11
+          arch: amd64
+      - uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - run: ./gradlew dokkaHtmlMultiModule --no-daemon --no-parallel --stacktrace
+      - uses: JamesIves/github-pages-deploy-action@4.1.0
         with:
           branch: gh-pages
           folder: build/dokka/htmlMultiModule
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c5c110e89..d1698d79b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -3,8 +3,7 @@ name: Gradle publish
 on:
   workflow_dispatch:
   release:
-    types:
-      - created
+    types: [ created ]
 
 jobs:
   publish:
@@ -23,13 +22,12 @@ jobs:
           graalvm: 21.1.0
           java: java11
           arch: amd64
-      - name: Add msys to path
-        if: matrix.os == 'windows-latest'
-        run: SETX PATH "%PATH%;C:\msys64\mingw64\bin"
       - name: Cache gradle
         uses: actions/cache@v2
         with:
-          path: ~/.gradle/caches
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
@@ -43,19 +41,12 @@ jobs:
       - name: Publish Windows Artifacts
         if: matrix.os == 'windows-latest'
         run: >
-          ./gradlew release --no-daemon
-          -Ppublishing.enabled=true
-          -Ppublishing.github.user=${{ secrets.PUBLISHING_GITHUB_USER }}
-          -Ppublishing.github.token=${{ secrets.PUBLISHING_GITHUB_TOKEN }}
+          ./gradlew release --no-daemon -Ppublishing.enabled=true
           -Ppublishing.space.user=${{ secrets.PUBLISHING_SPACE_USER }}
           -Ppublishing.space.token=${{ secrets.PUBLISHING_SPACE_TOKEN }}
       - name: Publish Mac Artifacts
         if: matrix.os == 'macOS-latest'
         run: >
-          ./gradlew release --no-daemon
-          -Ppublishing.enabled=true
-          -Ppublishing.platform=macosX64
-          -Ppublishing.github.user=${{ secrets.PUBLISHING_GITHUB_USER }}
-          -Ppublishing.github.token=${{ secrets.PUBLISHING_GITHUB_TOKEN }}
+          ./gradlew release --no-daemon -Ppublishing.enabled=true -Ppublishing.platform=macosX64
           -Ppublishing.space.user=${{ secrets.PUBLISHING_SPACE_USER }}
           -Ppublishing.space.token=${{ secrets.PUBLISHING_SPACE_TOKEN }}
diff --git a/build.gradle.kts b/build.gradle.kts
index d0f6ced78..6bb19cd35 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,5 @@
+import java.net.URL
+
 plugins {
     id("ru.mipt.npm.gradle.project")
     kotlin("jupyter.api") apply false
@@ -7,9 +9,11 @@ allprojects {
     repositories {
         maven("https://clojars.org/repo")
         maven("https://jitpack.io")
+
         maven("http://logicrunch.research.it.uu.se/maven") {
             isAllowInsecureProtocol = true
         }
+
         maven("https://oss.sonatype.org/content/repositories/snapshots")
         mavenCentral()
     }
@@ -23,16 +27,30 @@ subprojects {
 
     afterEvaluate {
         tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial> {
-            dependsOn(tasks.getByName("assemble"))
+            dependsOn(tasks["assemble"])
 
             dokkaSourceSets.all {
-                val readmeFile = File(this@subprojects.projectDir, "README.md")
-                if (readmeFile.exists()) includes.from(readmeFile.absolutePath)
-                externalDocumentationLink("https://ejml.org/javadoc/")
+                val readmeFile = this@subprojects.projectDir.resolve("README.md")
+                if (readmeFile.exists()) includes.from(readmeFile)
+                val kotlinDirPath = "src/$name/kotlin"
+                val kotlinDir = file(kotlinDirPath)
+
+                if (kotlinDir.exists()) sourceLink {
+                    localDirectory.set(kotlinDir)
+
+                    remoteUrl.set(
+                        URL("https://github.com/mipt-npm/${rootProject.name}/tree/master/${this@subprojects.name}/$kotlinDirPath")
+                    )
+                }
+
                 externalDocumentationLink("https://commons.apache.org/proper/commons-math/javadocs/api-3.6.1/")
                 externalDocumentationLink("https://deeplearning4j.org/api/latest/")
                 externalDocumentationLink("https://axelclk.bitbucket.io/symja/javadoc/")
-                externalDocumentationLink("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
+
+                externalDocumentationLink(
+                    "https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/",
+                    "https://kotlin.github.io/kotlinx.coroutines/package-list",
+                )
 
                 externalDocumentationLink(
                     "https://breandan.net/kotlingrad/kotlingrad/",
@@ -43,16 +61,12 @@ subprojects {
     }
 }
 
-readme {
-    readmeTemplate = file("docs/templates/README-TEMPLATE.md")
-}
+readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md")
 
 ksciencePublish {
-    github("kmath")
-    space()
-    sonatype()
+    vcs("https://github.com/mipt-npm/kmath")
+    space(publish = true)
+    sonatype(publish = true)
 }
 
-apiValidation {
-    nonPublicMarkers.add("space.kscience.kmath.misc.UnstableKMathAPI")
-}
+apiValidation.nonPublicMarkers.add("space.kscience.kmath.misc.UnstableKMathAPI")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index fe69b05c6..3427a6d61 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
     api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
-    api("ru.mipt.npm:gradle-tools:0.10.0")
+    api("ru.mipt.npm:gradle-tools:0.10.1")
     api("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.3.1")
 }
 
diff --git a/gradle.properties b/gradle.properties
index 3aaade368..b97db1c54 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,6 @@ kotlin.code.style=official
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.stability.nowarn=true
 kotlin.native.enableDependencyPropagation=false
-kotlin.parallel.tasks.in.project=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=2G
 org.gradle.parallel=true
diff --git a/kmath-core/README.md b/kmath-core/README.md
index a563552bb..4ea493f44 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -10,7 +10,7 @@ The core interfaces of KMath.
 objects to the expression by providing a context. Expressions can be used for a wide variety of purposes from high 
 performance calculations to code generation.
  - [domains](src/commonMain/kotlin/space/kscience/kmath/domains) : Domains
- - [autodif](src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt) : Automatic differentiation
+ - [autodiff](src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt) : Automatic differentiation
 
 
 ## Artifact:
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index 92a5f419d..564d06f49 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -19,51 +19,42 @@ readme {
 
     feature(
         id = "algebras",
-        description = """
-            Algebraic structures like rings, spaces and fields.
-        """.trimIndent(),
-        ref = "src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt"
-    )
+        ref = "src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt",
+    ) { "Algebraic structures like rings, spaces and fields." }
 
     feature(
         id = "nd",
-        description = "Many-dimensional structures and operations on them.",
-        ref = "src/commonMain/kotlin/space/kscience/kmath/structures/StructureND.kt"
-    )
+        ref = "src/commonMain/kotlin/space/kscience/kmath/structures/StructureND.kt",
+    ) { "Many-dimensional structures and operations on them." }
 
     feature(
         id = "linear",
-        description = """
-            Basic linear algebra operations (sums, products, etc.), backed by the `Space` API. Advanced linear algebra operations like matrix inversion and LU decomposition.
-        """.trimIndent(),
-        ref = "src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt"
-    )
+        ref = "src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt",
+    ) { "Basic linear algebra operations (sums, products, etc.), backed by the `Space` API. Advanced linear algebra operations like matrix inversion and LU decomposition." }
 
     feature(
         id = "buffers",
-        description = "One-dimensional structure",
-        ref = "src/commonMain/kotlin/space/kscience/kmath/structures/Buffers.kt"
-    )
+        ref = "src/commonMain/kotlin/space/kscience/kmath/structures/Buffers.kt",
+    ) { "One-dimensional structure" }
 
     feature(
         id = "expressions",
-        description = """
+        ref = "src/commonMain/kotlin/space/kscience/kmath/expressions"
+    ) {
+        """
             By writing a single mathematical expression once, users will be able to apply different types of 
             objects to the expression by providing a context. Expressions can be used for a wide variety of purposes from high 
             performance calculations to code generation.
-        """.trimIndent(),
-        ref = "src/commonMain/kotlin/space/kscience/kmath/expressions"
-    )
+        """.trimIndent()
+    }
 
     feature(
         id = "domains",
-        description = "Domains",
-        ref = "src/commonMain/kotlin/space/kscience/kmath/domains"
-    )
+        ref = "src/commonMain/kotlin/space/kscience/kmath/domains",
+    ) { "Domains" }
 
     feature(
-        id = "autodif",
-        description = "Automatic differentiation",
+        id = "autodiff",
         ref = "src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt"
-    )
+    ) { "Automatic differentiation" }
 }
diff --git a/kmath-coroutines/build.gradle.kts b/kmath-coroutines/build.gradle.kts
index 1546e7d96..317691ae5 100644
--- a/kmath-coroutines/build.gradle.kts
+++ b/kmath-coroutines/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.native")
 }
 
 kotlin.sourceSets {
diff --git a/kmath-ejml/build.gradle.kts b/kmath-ejml/build.gradle.kts
index 5107cfb68..727d21e3a 100644
--- a/kmath-ejml/build.gradle.kts
+++ b/kmath-ejml/build.gradle.kts
@@ -6,10 +6,10 @@ plugins {
 }
 
 dependencies {
-    api("org.ejml:ejml-ddense:0.40")
-    api("org.ejml:ejml-fdense:0.40")
-    api("org.ejml:ejml-dsparse:0.40")
-    api("org.ejml:ejml-fsparse:0.40")
+    api("org.ejml:ejml-ddense:0.41")
+    api("org.ejml:ejml-fdense:0.41")
+    api("org.ejml:ejml-dsparse:0.41")
+    api("org.ejml:ejml-fsparse:0.41")
     api(project(":kmath-core"))
 }
 
diff --git a/kmath-for-real/build.gradle.kts b/kmath-for-real/build.gradle.kts
index f6d12decd..25fdefaba 100644
--- a/kmath-for-real/build.gradle.kts
+++ b/kmath-for-real/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.native")
 }
 
 kotlin.sourceSets.commonMain {
diff --git a/kmath-functions/build.gradle.kts b/kmath-functions/build.gradle.kts
index f77df3833..fadbac091 100644
--- a/kmath-functions/build.gradle.kts
+++ b/kmath-functions/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.native")
 }
 
 description = "Functions, integration and interpolation"
diff --git a/kmath-geometry/build.gradle.kts b/kmath-geometry/build.gradle.kts
index 9b6e593b2..7eb814683 100644
--- a/kmath-geometry/build.gradle.kts
+++ b/kmath-geometry/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.native")
 }
 
 kotlin.sourceSets.commonMain {
diff --git a/kmath-histograms/build.gradle.kts b/kmath-histograms/build.gradle.kts
index 2167726c0..7e511faa0 100644
--- a/kmath-histograms/build.gradle.kts
+++ b/kmath-histograms/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.native")
 }
 
 kscience {
diff --git a/kmath-stat/build.gradle.kts b/kmath-stat/build.gradle.kts
index e8f629f7a..e3e396b6f 100644
--- a/kmath-stat/build.gradle.kts
+++ b/kmath-stat/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.native")
 }
 
 kscience {
diff --git a/kmath-tensors/build.gradle.kts b/kmath-tensors/build.gradle.kts
index 2eff2d821..d084878ea 100644
--- a/kmath-tensors/build.gradle.kts
+++ b/kmath-tensors/build.gradle.kts
@@ -1,11 +1,14 @@
 plugins {
-    id("ru.mipt.npm.gradle.mpp")
+    kotlin("multiplatform")
+    id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.native")
 }
 
 kotlin.sourceSets {
     all {
         languageSettings.useExperimentalAnnotation("space.kscience.kmath.misc.UnstableKMathAPI")
     }
+
     commonMain {
         dependencies {
             api(project(":kmath-core"))
@@ -14,10 +17,6 @@ kotlin.sourceSets {
     }
 }
 
-tasks.dokkaHtml {
-    dependsOn(tasks.build)
-}
-
 readme {
     maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 02b75cddc..445f75c09 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,8 +5,8 @@ pluginManagement {
         gradlePluginPortal()
     }
 
-    val toolsVersion = "0.10.0"
-    val kotlinVersion = "1.5.20"
+    val toolsVersion = "0.10.1"
+    val kotlinVersion = "1.5.21"
 
     plugins {
         id("ru.mipt.npm.gradle.project") version toolsVersion
@@ -16,7 +16,7 @@ pluginManagement {
         kotlin("jvm") version kotlinVersion
         kotlin("plugin.allopen") version kotlinVersion
         id("org.jetbrains.kotlinx.benchmark") version "0.3.1"
-        kotlin("jupyter.api") version "0.10.0-25"
+        kotlin("jupyter.api") version "0.10.0-131-1"
     }
 }
 
-- 
2.34.1


From b1998ed1a90152027ab809686229365a8de8bdd9 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Mon, 19 Jul 2021 03:12:41 +0700
Subject: [PATCH 300/713] Replace public override with override

---
 .../kmath/ejml/codegen/ejmlCodegen.kt         |  44 ++--
 .../ast/rendering/LatexSyntaxRenderer.kt      |   2 +-
 .../ast/rendering/MathMLSyntaxRenderer.kt     |   2 +-
 .../kmath/ast/rendering/MathRenderer.kt       |   4 +-
 .../kmath/ast/rendering/MathSyntax.kt         |  68 +++---
 .../kscience/kmath/ast/rendering/features.kt  |  32 +--
 .../kscience/kmath/ast/rendering/phases.kt    |   2 +-
 .../DerivativeStructureExpression.kt          |  74 +++---
 .../kscience/kmath/commons/linear/CMMatrix.kt |  22 +-
 .../commons/optimization/CMOptimization.kt    |   6 +-
 .../random/CMRandomGeneratorWrapper.kt        |  22 +-
 .../space/kscience/kmath/complex/Complex.kt   |  42 ++--
 .../kscience/kmath/complex/ComplexFieldND.kt  |  36 +--
 .../kscience/kmath/complex/Quaternion.kt      |  50 ++--
 .../kmath/domains/HyperSquareDomain.kt        |  10 +-
 .../kmath/domains/UnconstrainedDomain.kt      |  10 +-
 .../kmath/domains/UnivariateDomain.kt         |  10 +-
 .../FunctionalExpressionAlgebra.kt            |  64 ++---
 .../kscience/kmath/expressions/MstAlgebra.kt  | 138 +++++------
 .../kmath/expressions/SimpleAutoDiff.kt       |  60 ++---
 .../kscience/kmath/linear/MatrixWrapper.kt    |   4 +-
 .../space/kscience/kmath/nd/AlgebraND.kt      |   8 +-
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |  48 ++--
 .../space/kscience/kmath/nd/Structure1D.kt    |   8 +-
 .../space/kscience/kmath/nd/Structure2D.kt    |   2 +-
 .../kscience/kmath/operations/Algebra.kt      |  10 +-
 .../space/kscience/kmath/operations/BigInt.kt |   6 +-
 .../kmath/operations/NumericAlgebra.kt        |   2 +-
 .../kscience/kmath/operations/numbers.kt      | 220 +++++++++---------
 .../kmath/structures/DoubleBufferField.kt     |  82 +++----
 .../kscience/kmath/structures/MemoryBuffer.kt |   4 +-
 .../kscience/kmath/structures/ShortBuffer.kt  |  10 +-
 .../kscience/kmath/operations/BigNumbers.kt   |  36 +--
 .../kscience/kmath/chains/BlockingChain.kt    |   4 +-
 .../kmath/chains/BlockingDoubleChain.kt       |   2 +-
 .../space/kscience/kmath/chains/Chain.kt      |  16 +-
 .../kscience/kmath/streaming/RingBuffer.kt    |   6 +-
 .../kmath/structures/LazyStructureND.kt       |   6 +-
 .../space/kscience/kmath/ejml/EjmlMatrix.kt   |   4 +-
 .../space/kscience/kmath/ejml/EjmlVector.kt   |   6 +-
 .../space/kscience/kmath/ejml/_generated.kt   | 160 ++++++-------
 .../kscience/kmath/functions/Piecewise.kt     |   2 +-
 .../kscience/kmath/functions/Polynomial.kt    |   6 +-
 .../kmath/interpolation/LinearInterpolator.kt |   4 +-
 .../kmath/interpolation/SplineInterpolator.kt |   4 +-
 .../kmath/geometry/Euclidean2DSpace.kt        |  16 +-
 .../kmath/geometry/Euclidean3DSpace.kt        |  16 +-
 .../kmath/histogram/IndexedHistogramSpace.kt  |   2 +-
 .../kmath/histogram/UnivariateHistogram.kt    |   6 +-
 .../kscience/kmath/jafama/KMathJafama.kt      | 120 +++++-----
 .../kscience/kmath/kotlingrad/KMathNumber.kt  |   6 +-
 .../kmath/kotlingrad/KotlingradExpression.kt  |   4 +-
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   | 112 ++++-----
 .../kscience/kmath/nd4j/Nd4jArrayStructure.kt |   4 +-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  | 120 +++++-----
 .../kmath/distributions/Distribution.kt       |   2 +-
 .../kmath/distributions/NormalDistribution.kt |   6 +-
 .../AhrensDieterExponentialSampler.kt         |   2 +-
 .../AhrensDieterMarsagliaTsangGammaSampler.kt |   4 +-
 .../samplers/AliasMethodDiscreteSampler.kt    |   4 +-
 .../kmath/samplers/GaussianSampler.kt         |   2 +-
 .../samplers/KempSmallMeanPoissonSampler.kt   |   4 +-
 .../kscience/kmath/samplers/PoissonSampler.kt |   8 +-
 .../kotlin/space/kscience/kmath/stat/Mean.kt  |   6 +-
 .../space/kscience/kmath/stat/Median.kt       |   2 +-
 .../space/kscience/kmath/stat/RandomChain.kt  |   2 +-
 .../kscience/kmath/stat/RandomGenerator.kt    |  18 +-
 .../kscience/kmath/stat/SamplerAlgebra.kt     |  12 +-
 .../space/kscience/kmath/stat/Statistic.kt    |   2 +-
 .../kmath/stat/RandomSourceGenerator.kt       |  34 +--
 .../kscience/kmath/symja/SymjaExpression.kt   |   4 +-
 .../kscience/kmath/viktor/ViktorBuffer.kt     |  10 +-
 .../kmath/viktor/ViktorStructureND.kt         |  58 ++---
 73 files changed, 972 insertions(+), 972 deletions(-)

diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
index 5da7d0f67..a0d40c1ee 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
@@ -14,12 +14,12 @@ private fun Appendable.appendEjmlVector(type: String, ejmlMatrixType: String) {
     @Language("kotlin") val text = """/**
  * [EjmlVector] specialization for [$type].
  */
-public class Ejml${type}Vector<out M : $ejmlMatrixType>(public override val origin: M) : EjmlVector<$type, M>(origin) {
+public class Ejml${type}Vector<out M : $ejmlMatrixType>(override val origin: M) : EjmlVector<$type, M>(origin) {
     init {
         require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
     }
 
-    public override operator fun get(index: Int): $type = origin[0, index]
+    override operator fun get(index: Int): $type = origin[0, index]
 }"""
     appendLine(text)
     appendLine()
@@ -29,8 +29,8 @@ private fun Appendable.appendEjmlMatrix(type: String, ejmlMatrixType: String) {
     val text = """/**
  * [EjmlMatrix] specialization for [$type].
  */
-public class Ejml${type}Matrix<out M : $ejmlMatrixType>(public override val origin: M) : EjmlMatrix<$type, M>(origin) {
-    public override operator fun get(i: Int, j: Int): $type = origin[i, j]
+public class Ejml${type}Matrix<out M : $ejmlMatrixType>(override val origin: M) : EjmlMatrix<$type, M>(origin) {
+    override operator fun get(i: Int, j: Int): $type = origin[i, j]
 }"""
     appendLine(text)
     appendLine()
@@ -54,23 +54,23 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
     /**
      * The [${kmathAlgebra}] reference.
      */
-    public override val elementAlgebra: $kmathAlgebra get() = $kmathAlgebra
+    override val elementAlgebra: $kmathAlgebra get() = $kmathAlgebra
 
     @Suppress("UNCHECKED_CAST")
-    public override fun Matrix<${type}>.toEjml(): Ejml${type}Matrix<${ejmlMatrixType}> = when {
+    override fun Matrix<${type}>.toEjml(): Ejml${type}Matrix<${ejmlMatrixType}> = when {
         this is Ejml${type}Matrix<*> && origin is $ejmlMatrixType -> this as Ejml${type}Matrix<${ejmlMatrixType}>
         else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
     }
 
     @Suppress("UNCHECKED_CAST")
-    public override fun Point<${type}>.toEjml(): Ejml${type}Vector<${ejmlMatrixType}> = when {
+    override fun Point<${type}>.toEjml(): Ejml${type}Vector<${ejmlMatrixType}> = when {
         this is Ejml${type}Vector<*> && origin is $ejmlMatrixType -> this as Ejml${type}Vector<${ejmlMatrixType}>
         else -> Ejml${type}Vector(${ejmlMatrixType}(size, 1).also {
             (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
         })
     }
 
-    public override fun buildMatrix(
+    override fun buildMatrix(
         rows: Int,
         columns: Int,
         initializer: ${kmathAlgebra}.(i: Int, j: Int) -> ${type},
@@ -80,7 +80,7 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
         }
     }.wrapMatrix()
 
-    public override fun buildVector(
+    override fun buildVector(
         size: Int,
         initializer: ${kmathAlgebra}.(Int) -> ${type},
     ): Ejml${type}Vector<${ejmlMatrixType}> = Ejml${type}Vector(${ejmlMatrixType}(size, 1).also {
@@ -90,21 +90,21 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
     private fun <T : ${ejmlMatrixParentTypeMatrix}> T.wrapMatrix() = Ejml${type}Matrix(this)
     private fun <T : ${ejmlMatrixParentTypeMatrix}> T.wrapVector() = Ejml${type}Vector(this)
 
-    public override fun Matrix<${type}>.unaryMinus(): Matrix<${type}> = this * elementAlgebra { -one }
+    override fun Matrix<${type}>.unaryMinus(): Matrix<${type}> = this * elementAlgebra { -one }
 
-    public override fun Matrix<${type}>.dot(other: Matrix<${type}>): Ejml${type}Matrix<${ejmlMatrixType}> {
+    override fun Matrix<${type}>.dot(other: Matrix<${type}>): Ejml${type}Matrix<${ejmlMatrixType}> {
         val out = ${ejmlMatrixType}(1, 1)
         CommonOps_${ops}.mult(toEjml().origin, other.toEjml().origin, out)
         return out.wrapMatrix()
     }
 
-    public override fun Matrix<${type}>.dot(vector: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> {
+    override fun Matrix<${type}>.dot(vector: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> {
         val out = ${ejmlMatrixType}(1, 1)
         CommonOps_${ops}.mult(toEjml().origin, vector.toEjml().origin, out)
         return out.wrapVector()
     }
 
-    public override operator fun Matrix<${type}>.minus(other: Matrix<${type}>): Ejml${type}Matrix<${ejmlMatrixType}> {
+    override operator fun Matrix<${type}>.minus(other: Matrix<${type}>): Ejml${type}Matrix<${ejmlMatrixType}> {
         val out = ${ejmlMatrixType}(1, 1)
 
         CommonOps_${ops}.add(
@@ -123,19 +123,19 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
         return out.wrapMatrix()
     }
 
-    public override operator fun Matrix<${type}>.times(value: ${type}): Ejml${type}Matrix<${ejmlMatrixType}> {
+    override operator fun Matrix<${type}>.times(value: ${type}): Ejml${type}Matrix<${ejmlMatrixType}> {
         val res = ${ejmlMatrixType}(1, 1)
         CommonOps_${ops}.scale(value, toEjml().origin, res)
         return res.wrapMatrix()
     }
 
-    public override fun Point<${type}>.unaryMinus(): Ejml${type}Vector<${ejmlMatrixType}> {
+    override fun Point<${type}>.unaryMinus(): Ejml${type}Vector<${ejmlMatrixType}> {
         val res = ${ejmlMatrixType}(1, 1)
         CommonOps_${ops}.changeSign(toEjml().origin, res)
         return res.wrapVector()
     }
 
-    public override fun Matrix<${type}>.plus(other: Matrix<${type}>): Ejml${type}Matrix<${ejmlMatrixType}> {
+    override fun Matrix<${type}>.plus(other: Matrix<${type}>): Ejml${type}Matrix<${ejmlMatrixType}> {
         val out = ${ejmlMatrixType}(1, 1)
         
         CommonOps_${ops}.add(
@@ -154,7 +154,7 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
         return out.wrapMatrix()
     }
 
-    public override fun Point<${type}>.plus(other: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> {
+    override fun Point<${type}>.plus(other: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> {
         val out = ${ejmlMatrixType}(1, 1)
 
         CommonOps_${ops}.add(
@@ -173,7 +173,7 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
         return out.wrapVector()
     }
 
-    public override fun Point<${type}>.minus(other: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> {
+    override fun Point<${type}>.minus(other: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> {
         val out = ${ejmlMatrixType}(1, 1)
 
         CommonOps_${ops}.add(
@@ -192,18 +192,18 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
         return out.wrapVector()
     }
 
-    public override fun ${type}.times(m: Matrix<${type}>): Ejml${type}Matrix<${ejmlMatrixType}> = m * this
+    override fun ${type}.times(m: Matrix<${type}>): Ejml${type}Matrix<${ejmlMatrixType}> = m * this
 
-    public override fun Point<${type}>.times(value: ${type}): Ejml${type}Vector<${ejmlMatrixType}> {
+    override fun Point<${type}>.times(value: ${type}): Ejml${type}Vector<${ejmlMatrixType}> {
         val res = ${ejmlMatrixType}(1, 1)
         CommonOps_${ops}.scale(value, toEjml().origin, res)
         return res.wrapVector()
     }
 
-    public override fun ${type}.times(v: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> = v * this
+    override fun ${type}.times(v: Point<${type}>): Ejml${type}Vector<${ejmlMatrixType}> = v * this
 
     @UnstableKMathAPI
-    public override fun <F : StructureFeature> getFeature(structure: Matrix<${type}>, type: KClass<out F>): F? {
+    override fun <F : StructureFeature> getFeature(structure: Matrix<${type}>, type: KClass<out F>): F? {
         structure.getFeature(type)?.let { return it }
         val origin = structure.toEjml().origin
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
index 01717b0f9..2df3d3cc7 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
@@ -27,7 +27,7 @@ import space.kscience.kmath.misc.UnstableKMathAPI
  */
 @UnstableKMathAPI
 public object LatexSyntaxRenderer : SyntaxRenderer {
-    public override fun render(node: MathSyntax, output: Appendable): Unit = output.run {
+    override fun render(node: MathSyntax, output: Appendable): Unit = output.run {
         fun render(syntax: MathSyntax) = render(syntax, output)
 
         when (node) {
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
index cda8e2322..8b5819b84 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
@@ -16,7 +16,7 @@ import space.kscience.kmath.misc.UnstableKMathAPI
  */
 @UnstableKMathAPI
 public object MathMLSyntaxRenderer : SyntaxRenderer {
-    public override fun render(node: MathSyntax, output: Appendable) {
+    override fun render(node: MathSyntax, output: Appendable) {
         output.append("<math xmlns=\"https://www.w3.org/1998/Math/MathML\"><mrow>")
         renderPart(node, output)
         output.append("</mrow></math>")
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
index 68d829724..fdef35ebd 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
@@ -29,7 +29,7 @@ public fun interface MathRenderer {
  */
 @UnstableKMathAPI
 public open class FeaturedMathRenderer(public val features: List<RenderFeature>) : MathRenderer {
-    public override fun render(mst: MST): MathSyntax {
+    override fun render(mst: MST): MathSyntax {
         for (feature in features) feature.render(this, mst)?.let { return it }
         throw UnsupportedOperationException("Renderer $this has no appropriate feature to render node $mst.")
     }
@@ -56,7 +56,7 @@ public open class FeaturedMathRendererWithPostProcess(
     features: List<RenderFeature>,
     public val stages: List<PostProcessPhase>,
 ) : FeaturedMathRenderer(features) {
-    public override fun render(mst: MST): MathSyntax {
+    override fun render(mst: MST): MathSyntax {
         val res = super.render(mst)
         for (stage in stages) stage.perform(res)
         return res
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
index a71985fbc..38450403d 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
@@ -150,9 +150,9 @@ public data class OperandSyntax(
  */
 @UnstableKMathAPI
 public data class UnaryOperatorSyntax(
-    public override val operation: String,
+    override val operation: String,
     public var prefix: MathSyntax,
-    public override val operand: OperandSyntax,
+    override val operand: OperandSyntax,
 ) : UnarySyntax() {
     init {
         operand.parent = this
@@ -166,8 +166,8 @@ public data class UnaryOperatorSyntax(
  */
 @UnstableKMathAPI
 public data class UnaryPlusSyntax(
-    public override val operation: String,
-    public override val operand: OperandSyntax,
+    override val operation: String,
+    override val operand: OperandSyntax,
 ) : UnarySyntax() {
     init {
         operand.parent = this
@@ -181,8 +181,8 @@ public data class UnaryPlusSyntax(
  */
 @UnstableKMathAPI
 public data class UnaryMinusSyntax(
-    public override val operation: String,
-    public override val operand: OperandSyntax,
+    override val operation: String,
+    override val operand: OperandSyntax,
 ) : UnarySyntax() {
     init {
         operand.parent = this
@@ -197,8 +197,8 @@ public data class UnaryMinusSyntax(
  */
 @UnstableKMathAPI
 public data class RadicalSyntax(
-    public override val operation: String,
-    public override val operand: MathSyntax,
+    override val operation: String,
+    override val operand: MathSyntax,
 ) : UnarySyntax() {
     init {
         operand.parent = this
@@ -215,8 +215,8 @@ public data class RadicalSyntax(
  */
 @UnstableKMathAPI
 public data class ExponentSyntax(
-    public override val operation: String,
-    public override val operand: OperandSyntax,
+    override val operation: String,
+    override val operand: OperandSyntax,
     public var useOperatorForm: Boolean,
 ) : UnarySyntax() {
     init {
@@ -233,9 +233,9 @@ public data class ExponentSyntax(
  */
 @UnstableKMathAPI
 public data class SuperscriptSyntax(
-    public override val operation: String,
-    public override val left: MathSyntax,
-    public override val right: MathSyntax,
+    override val operation: String,
+    override val left: MathSyntax,
+    override val right: MathSyntax,
 ) : BinarySyntax() {
     init {
         left.parent = this
@@ -252,9 +252,9 @@ public data class SuperscriptSyntax(
  */
 @UnstableKMathAPI
 public data class SubscriptSyntax(
-    public override val operation: String,
-    public override val left: MathSyntax,
-    public override val right: MathSyntax,
+    override val operation: String,
+    override val left: MathSyntax,
+    override val right: MathSyntax,
 ) : BinarySyntax() {
     init {
         left.parent = this
@@ -270,10 +270,10 @@ public data class SubscriptSyntax(
  */
 @UnstableKMathAPI
 public data class BinaryOperatorSyntax(
-    public override val operation: String,
+    override val operation: String,
     public var prefix: MathSyntax,
-    public override val left: MathSyntax,
-    public override val right: MathSyntax,
+    override val left: MathSyntax,
+    override val right: MathSyntax,
 ) : BinarySyntax() {
     init {
         left.parent = this
@@ -290,9 +290,9 @@ public data class BinaryOperatorSyntax(
  */
 @UnstableKMathAPI
 public data class BinaryPlusSyntax(
-    public override val operation: String,
-    public override val left: OperandSyntax,
-    public override val right: OperandSyntax,
+    override val operation: String,
+    override val left: OperandSyntax,
+    override val right: OperandSyntax,
 ) : BinarySyntax() {
     init {
         left.parent = this
@@ -309,9 +309,9 @@ public data class BinaryPlusSyntax(
  */
 @UnstableKMathAPI
 public data class BinaryMinusSyntax(
-    public override val operation: String,
-    public override val left: OperandSyntax,
-    public override val right: OperandSyntax,
+    override val operation: String,
+    override val left: OperandSyntax,
+    override val right: OperandSyntax,
 ) : BinarySyntax() {
     init {
         left.parent = this
@@ -329,9 +329,9 @@ public data class BinaryMinusSyntax(
  */
 @UnstableKMathAPI
 public data class FractionSyntax(
-    public override val operation: String,
-    public override val left: OperandSyntax,
-    public override val right: OperandSyntax,
+    override val operation: String,
+    override val left: OperandSyntax,
+    override val right: OperandSyntax,
     public var infix: Boolean,
 ) : BinarySyntax() {
     init {
@@ -349,9 +349,9 @@ public data class FractionSyntax(
  */
 @UnstableKMathAPI
 public data class RadicalWithIndexSyntax(
-    public override val operation: String,
-    public override val left: MathSyntax,
-    public override val right: MathSyntax,
+    override val operation: String,
+    override val left: MathSyntax,
+    override val right: MathSyntax,
 ) : BinarySyntax() {
     init {
         left.parent = this
@@ -369,9 +369,9 @@ public data class RadicalWithIndexSyntax(
  */
 @UnstableKMathAPI
 public data class MultiplicationSyntax(
-    public override val operation: String,
-    public override val left: OperandSyntax,
-    public override val right: OperandSyntax,
+    override val operation: String,
+    override val left: OperandSyntax,
+    override val right: OperandSyntax,
     public var times: Boolean,
 ) : BinarySyntax() {
     init {
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index 203cdf8b3..37e9a8c19 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -57,7 +57,7 @@ else
  */
 @UnstableKMathAPI
 public class PrettyPrintFloats(public val types: Set<KClass<out Number>>) : RenderFeature {
-    public override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? {
+    override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? {
         if (node !is MST.Numeric || node.value::class !in types) return null
 
         val toString = when (val v = node.value) {
@@ -117,7 +117,7 @@ public class PrettyPrintFloats(public val types: Set<KClass<out Number>>) : Rend
  */
 @UnstableKMathAPI
 public class PrettyPrintIntegers(public val types: Set<KClass<out Number>>) : RenderFeature {
-    public override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? =
+    override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? =
         if (node !is MST.Numeric || node.value::class !in types)
             null
         else
@@ -140,7 +140,7 @@ public class PrettyPrintIntegers(public val types: Set<KClass<out Number>>) : Re
  */
 @UnstableKMathAPI
 public class PrettyPrintPi(public val symbols: Set<String>) : RenderFeature {
-    public override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? =
+    override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? =
         if (node !is Symbol || node.identity !in symbols)
             null
         else
@@ -202,7 +202,7 @@ public abstract class Binary(public val operations: Collection<String>?) : Rende
  */
 @UnstableKMathAPI
 public class BinaryPlus(operations: Collection<String>?) : Binary(operations) {
-    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
+    override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         BinaryPlusSyntax(
             operation = node.operation,
             left = OperandSyntax(parent.render(node.left), true),
@@ -224,7 +224,7 @@ public class BinaryPlus(operations: Collection<String>?) : Binary(operations) {
  */
 @UnstableKMathAPI
 public class BinaryMinus(operations: Collection<String>?) : Binary(operations) {
-    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
+    override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         BinaryMinusSyntax(
             operation = node.operation,
             left = OperandSyntax(operand = parent.render(node.left), parentheses = true),
@@ -246,7 +246,7 @@ public class BinaryMinus(operations: Collection<String>?) : Binary(operations) {
  */
 @UnstableKMathAPI
 public class UnaryPlus(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = UnaryPlusSyntax(
+    override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = UnaryPlusSyntax(
         operation = node.operation,
         operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
     )
@@ -266,7 +266,7 @@ public class UnaryPlus(operations: Collection<String>?) : Unary(operations) {
  */
 @UnstableKMathAPI
 public class UnaryMinus(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = UnaryMinusSyntax(
+    override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = UnaryMinusSyntax(
         operation = node.operation,
         operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
     )
@@ -286,7 +286,7 @@ public class UnaryMinus(operations: Collection<String>?) : Unary(operations) {
  */
 @UnstableKMathAPI
 public class Fraction(operations: Collection<String>?) : Binary(operations) {
-    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax = FractionSyntax(
+    override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax = FractionSyntax(
         operation = node.operation,
         left = OperandSyntax(operand = parent.render(node.left), parentheses = true),
         right = OperandSyntax(operand = parent.render(node.right), parentheses = true),
@@ -308,7 +308,7 @@ public class Fraction(operations: Collection<String>?) : Binary(operations) {
  */
 @UnstableKMathAPI
 public class BinaryOperator(operations: Collection<String>?) : Binary(operations) {
-    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
+    override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         BinaryOperatorSyntax(
             operation = node.operation,
             prefix = OperatorNameSyntax(name = node.operation),
@@ -331,7 +331,7 @@ public class BinaryOperator(operations: Collection<String>?) : Binary(operations
  */
 @UnstableKMathAPI
 public class UnaryOperator(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
+    override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
         UnaryOperatorSyntax(
             operation = node.operation,
             prefix = OperatorNameSyntax(node.operation),
@@ -353,7 +353,7 @@ public class UnaryOperator(operations: Collection<String>?) : Unary(operations)
  */
 @UnstableKMathAPI
 public class Power(operations: Collection<String>?) : Binary(operations) {
-    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
+    override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         SuperscriptSyntax(
             operation = node.operation,
             left = OperandSyntax(parent.render(node.left), true),
@@ -373,7 +373,7 @@ public class Power(operations: Collection<String>?) : Binary(operations) {
  */
 @UnstableKMathAPI
 public class SquareRoot(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
+    override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
         RadicalSyntax(operation = node.operation, operand = parent.render(node.value))
 
     public companion object {
@@ -391,7 +391,7 @@ public class SquareRoot(operations: Collection<String>?) : Unary(operations) {
  */
 @UnstableKMathAPI
 public class Exponent(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = ExponentSyntax(
+    override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = ExponentSyntax(
         operation = node.operation,
         operand = OperandSyntax(operand = parent.render(node.value), parentheses = true),
         useOperatorForm = true,
@@ -412,7 +412,7 @@ public class Exponent(operations: Collection<String>?) : Unary(operations) {
  */
 @UnstableKMathAPI
 public class Multiplication(operations: Collection<String>?) : Binary(operations) {
-    public override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
+    override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         MultiplicationSyntax(
             operation = node.operation,
             left = OperandSyntax(operand = parent.render(node.left), parentheses = true),
@@ -435,7 +435,7 @@ public class Multiplication(operations: Collection<String>?) : Binary(operations
  */
 @UnstableKMathAPI
 public class InverseTrigonometricOperations(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
+    override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
         UnaryOperatorSyntax(
             operation = node.operation,
             prefix = OperatorNameSyntax(name = node.operation.replaceFirst("a", "arc")),
@@ -462,7 +462,7 @@ public class InverseTrigonometricOperations(operations: Collection<String>?) : U
  */
 @UnstableKMathAPI
 public class InverseHyperbolicOperations(operations: Collection<String>?) : Unary(operations) {
-    public override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
+    override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
         UnaryOperatorSyntax(
             operation = node.operation,
             prefix = OperatorNameSyntax(name = node.operation.replaceFirst("a", "ar")),
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
index 6da4994a6..574bb54f4 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
@@ -205,7 +205,7 @@ public val BetterExponent: PostProcessPhase = PostProcessPhase { node ->
 @UnstableKMathAPI
 public class SimplifyParentheses(public val precedenceFunction: (MathSyntax) -> Int) :
     PostProcessPhase {
-    public override fun perform(node: MathSyntax): Unit = when (node) {
+    override fun perform(node: MathSyntax): Unit = when (node) {
         is NumberSyntax -> Unit
         is SymbolSyntax -> Unit
         is OperatorNameSyntax -> Unit
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
index d0ab8b1e8..0925fee7e 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
@@ -25,10 +25,10 @@ public class DerivativeStructureField(
     NumbersAddOperations<DerivativeStructure> {
     public val numberOfVariables: Int = bindings.size
 
-    public override val zero: DerivativeStructure by lazy { DerivativeStructure(numberOfVariables, order) }
-    public override val one: DerivativeStructure by lazy { DerivativeStructure(numberOfVariables, order, 1.0) }
+    override val zero: DerivativeStructure by lazy { DerivativeStructure(numberOfVariables, order) }
+    override val one: DerivativeStructure by lazy { DerivativeStructure(numberOfVariables, order, 1.0) }
 
-    public override fun number(value: Number): DerivativeStructure = const(value.toDouble())
+    override fun number(value: Number): DerivativeStructure = const(value.toDouble())
 
     /**
      * A class that implements both [DerivativeStructure] and a [Symbol]
@@ -39,10 +39,10 @@ public class DerivativeStructureField(
         symbol: Symbol,
         value: Double,
     ) : DerivativeStructure(size, order, index, value), Symbol {
-        public override val identity: String = symbol.identity
-        public override fun toString(): String = identity
-        public override fun equals(other: Any?): Boolean = this.identity == (other as? Symbol)?.identity
-        public override fun hashCode(): Int = identity.hashCode()
+        override val identity: String = symbol.identity
+        override fun toString(): String = identity
+        override fun equals(other: Any?): Boolean = this.identity == (other as? Symbol)?.identity
+        override fun hashCode(): Int = identity.hashCode()
     }
 
     /**
@@ -52,10 +52,10 @@ public class DerivativeStructureField(
         key.identity to DerivativeStructureSymbol(numberOfVariables, index, key, value)
     }.toMap()
 
-    public override fun const(value: Double): DerivativeStructure = DerivativeStructure(numberOfVariables, order, value)
+    override fun const(value: Double): DerivativeStructure = DerivativeStructure(numberOfVariables, order, value)
 
-    public override fun bindSymbolOrNull(value: String): DerivativeStructureSymbol? = variables[value]
-    public override fun bindSymbol(value: String): DerivativeStructureSymbol = variables.getValue(value)
+    override fun bindSymbolOrNull(value: String): DerivativeStructureSymbol? = variables[value]
+    override fun bindSymbol(value: String): DerivativeStructureSymbol = variables.getValue(value)
 
     public fun bindSymbolOrNull(symbol: Symbol): DerivativeStructureSymbol? = variables[symbol.identity]
     public fun bindSymbol(symbol: Symbol): DerivativeStructureSymbol = variables.getValue(symbol.identity)
@@ -68,45 +68,45 @@ public class DerivativeStructureField(
 
     public fun DerivativeStructure.derivative(vararg symbols: Symbol): Double = derivative(symbols.toList())
 
-    public override fun DerivativeStructure.unaryMinus(): DerivativeStructure = negate()
+    override fun DerivativeStructure.unaryMinus(): DerivativeStructure = negate()
 
-    public override fun add(a: DerivativeStructure, b: DerivativeStructure): DerivativeStructure = a.add(b)
+    override fun add(a: DerivativeStructure, b: DerivativeStructure): DerivativeStructure = a.add(b)
 
-    public override fun scale(a: DerivativeStructure, value: Double): DerivativeStructure = a.multiply(value)
+    override fun scale(a: DerivativeStructure, value: Double): DerivativeStructure = a.multiply(value)
 
-    public override fun multiply(a: DerivativeStructure, b: DerivativeStructure): DerivativeStructure = a.multiply(b)
-    public override fun divide(a: DerivativeStructure, b: DerivativeStructure): DerivativeStructure = a.divide(b)
-    public override fun sin(arg: DerivativeStructure): DerivativeStructure = arg.sin()
-    public override fun cos(arg: DerivativeStructure): DerivativeStructure = arg.cos()
-    public override fun tan(arg: DerivativeStructure): DerivativeStructure = arg.tan()
-    public override fun asin(arg: DerivativeStructure): DerivativeStructure = arg.asin()
-    public override fun acos(arg: DerivativeStructure): DerivativeStructure = arg.acos()
-    public override fun atan(arg: DerivativeStructure): DerivativeStructure = arg.atan()
-    public override fun sinh(arg: DerivativeStructure): DerivativeStructure = arg.sinh()
-    public override fun cosh(arg: DerivativeStructure): DerivativeStructure = arg.cosh()
-    public override fun tanh(arg: DerivativeStructure): DerivativeStructure = arg.tanh()
-    public override fun asinh(arg: DerivativeStructure): DerivativeStructure = arg.asinh()
-    public override fun acosh(arg: DerivativeStructure): DerivativeStructure = arg.acosh()
-    public override fun atanh(arg: DerivativeStructure): DerivativeStructure = arg.atanh()
+    override fun multiply(a: DerivativeStructure, b: DerivativeStructure): DerivativeStructure = a.multiply(b)
+    override fun divide(a: DerivativeStructure, b: DerivativeStructure): DerivativeStructure = a.divide(b)
+    override fun sin(arg: DerivativeStructure): DerivativeStructure = arg.sin()
+    override fun cos(arg: DerivativeStructure): DerivativeStructure = arg.cos()
+    override fun tan(arg: DerivativeStructure): DerivativeStructure = arg.tan()
+    override fun asin(arg: DerivativeStructure): DerivativeStructure = arg.asin()
+    override fun acos(arg: DerivativeStructure): DerivativeStructure = arg.acos()
+    override fun atan(arg: DerivativeStructure): DerivativeStructure = arg.atan()
+    override fun sinh(arg: DerivativeStructure): DerivativeStructure = arg.sinh()
+    override fun cosh(arg: DerivativeStructure): DerivativeStructure = arg.cosh()
+    override fun tanh(arg: DerivativeStructure): DerivativeStructure = arg.tanh()
+    override fun asinh(arg: DerivativeStructure): DerivativeStructure = arg.asinh()
+    override fun acosh(arg: DerivativeStructure): DerivativeStructure = arg.acosh()
+    override fun atanh(arg: DerivativeStructure): DerivativeStructure = arg.atanh()
 
-    public override fun power(arg: DerivativeStructure, pow: Number): DerivativeStructure = when (pow) {
+    override fun power(arg: DerivativeStructure, pow: Number): DerivativeStructure = when (pow) {
         is Double -> arg.pow(pow)
         is Int -> arg.pow(pow)
         else -> arg.pow(pow.toDouble())
     }
 
     public fun power(arg: DerivativeStructure, pow: DerivativeStructure): DerivativeStructure = arg.pow(pow)
-    public override fun exp(arg: DerivativeStructure): DerivativeStructure = arg.exp()
-    public override fun ln(arg: DerivativeStructure): DerivativeStructure = arg.log()
+    override fun exp(arg: DerivativeStructure): DerivativeStructure = arg.exp()
+    override fun ln(arg: DerivativeStructure): DerivativeStructure = arg.log()
 
-    public override operator fun DerivativeStructure.plus(b: Number): DerivativeStructure = add(b.toDouble())
-    public override operator fun DerivativeStructure.minus(b: Number): DerivativeStructure = subtract(b.toDouble())
-    public override operator fun Number.plus(b: DerivativeStructure): DerivativeStructure = b + this
-    public override operator fun Number.minus(b: DerivativeStructure): DerivativeStructure = b - this
+    override operator fun DerivativeStructure.plus(b: Number): DerivativeStructure = add(b.toDouble())
+    override operator fun DerivativeStructure.minus(b: Number): DerivativeStructure = subtract(b.toDouble())
+    override operator fun Number.plus(b: DerivativeStructure): DerivativeStructure = b + this
+    override operator fun Number.minus(b: DerivativeStructure): DerivativeStructure = b - this
 
     public companion object :
         AutoDiffProcessor<Double, DerivativeStructure, DerivativeStructureField, Expression<Double>> {
-        public override fun process(function: DerivativeStructureField.() -> DerivativeStructure): DifferentiableExpression<Double> =
+        override fun process(function: DerivativeStructureField.() -> DerivativeStructure): DifferentiableExpression<Double> =
             DerivativeStructureExpression(function)
     }
 }
@@ -117,13 +117,13 @@ public class DerivativeStructureField(
 public class DerivativeStructureExpression(
     public val function: DerivativeStructureField.() -> DerivativeStructure,
 ) : DifferentiableExpression<Double> {
-    public override operator fun invoke(arguments: Map<Symbol, Double>): Double =
+    override operator fun invoke(arguments: Map<Symbol, Double>): Double =
         DerivativeStructureField(0, arguments).function().value
 
     /**
      * Get the derivative expression with given orders
      */
-    public override fun derivativeOrNull(symbols: List<Symbol>): Expression<Double> = Expression { arguments ->
+    override fun derivativeOrNull(symbols: List<Symbol>): Expression<Double> = Expression { arguments ->
         with(DerivativeStructureField(symbols.size, arguments)) { function().derivative(symbols) }
     }
 }
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
index 11b097831..1997a633e 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
@@ -15,18 +15,18 @@ import kotlin.reflect.KClass
 import kotlin.reflect.cast
 
 public class CMMatrix(public val origin: RealMatrix) : Matrix<Double> {
-    public override val rowNum: Int get() = origin.rowDimension
-    public override val colNum: Int get() = origin.columnDimension
+    override val rowNum: Int get() = origin.rowDimension
+    override val colNum: Int get() = origin.columnDimension
 
-    public override operator fun get(i: Int, j: Int): Double = origin.getEntry(i, j)
+    override operator fun get(i: Int, j: Int): Double = origin.getEntry(i, j)
 }
 
 public class CMVector(public val origin: RealVector) : Point<Double> {
-    public override val size: Int get() = origin.dimension
+    override val size: Int get() = origin.dimension
 
-    public override operator fun get(index: Int): Double = origin.getEntry(index)
+    override operator fun get(index: Int): Double = origin.getEntry(index)
 
-    public override operator fun iterator(): Iterator<Double> = origin.toArray().iterator()
+    override operator fun iterator(): Iterator<Double> = origin.toArray().iterator()
 }
 
 public fun RealVector.toPoint(): CMVector = CMVector(this)
@@ -34,7 +34,7 @@ public fun RealVector.toPoint(): CMVector = CMVector(this)
 public object CMLinearSpace : LinearSpace<Double, DoubleField> {
     override val elementAlgebra: DoubleField get() = DoubleField
 
-    public override fun buildMatrix(
+    override fun buildMatrix(
         rows: Int,
         columns: Int,
         initializer: DoubleField.(i: Int, j: Int) -> Double,
@@ -73,16 +73,16 @@ public object CMLinearSpace : LinearSpace<Double, DoubleField> {
     override fun Point<Double>.minus(other: Point<Double>): CMVector =
         toCM().origin.subtract(other.toCM().origin).wrap()
 
-    public override fun Matrix<Double>.dot(other: Matrix<Double>): CMMatrix =
+    override fun Matrix<Double>.dot(other: Matrix<Double>): CMMatrix =
         toCM().origin.multiply(other.toCM().origin).wrap()
 
-    public override fun Matrix<Double>.dot(vector: Point<Double>): CMVector =
+    override fun Matrix<Double>.dot(vector: Point<Double>): CMVector =
         toCM().origin.preMultiply(vector.toCM().origin).wrap()
 
-    public override operator fun Matrix<Double>.minus(other: Matrix<Double>): CMMatrix =
+    override operator fun Matrix<Double>.minus(other: Matrix<Double>): CMMatrix =
         toCM().origin.subtract(other.toCM().origin).wrap()
 
-    public override operator fun Matrix<Double>.times(value: Double): CMMatrix =
+    override operator fun Matrix<Double>.times(value: Double): CMMatrix =
         toCM().origin.scalarMultiply(value).wrap()
 
     override fun Double.times(m: Matrix<Double>): CMMatrix =
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
index a46f06568..bca106e68 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
@@ -52,11 +52,11 @@ public class CMOptimization(
 
     public fun exportOptimizationData(): List<OptimizationData> = optimizationData.values.toList()
 
-    public override fun initialGuess(map: Map<Symbol, Double>) {
+    override fun initialGuess(map: Map<Symbol, Double>) {
         addOptimizationData(InitialGuess(map.toDoubleArray()))
     }
 
-    public override fun function(expression: Expression<Double>) {
+    override fun function(expression: Expression<Double>) {
         val objectiveFunction = ObjectiveFunction {
             val args = it.toMap()
             expression(args)
@@ -64,7 +64,7 @@ public class CMOptimization(
         addOptimizationData(objectiveFunction)
     }
 
-    public override fun diffFunction(expression: DifferentiableExpression<Double>) {
+    override fun diffFunction(expression: DifferentiableExpression<Double>) {
         function(expression)
         val gradientFunction = ObjectiveFunctionGradient {
             val args = it.toMap()
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
index 4e2fbf980..afbfd9a24 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
@@ -16,31 +16,31 @@ public class CMRandomGeneratorWrapper(
 ) : org.apache.commons.math3.random.RandomGenerator {
     private var generator: RandomGenerator = factory(intArrayOf())
 
-    public override fun nextBoolean(): Boolean = generator.nextBoolean()
-    public override fun nextFloat(): Float = generator.nextDouble().toFloat()
+    override fun nextBoolean(): Boolean = generator.nextBoolean()
+    override fun nextFloat(): Float = generator.nextDouble().toFloat()
 
-    public override fun setSeed(seed: Int) {
+    override fun setSeed(seed: Int) {
         generator = factory(intArrayOf(seed))
     }
 
-    public override fun setSeed(seed: IntArray) {
+    override fun setSeed(seed: IntArray) {
         generator = factory(seed)
     }
 
-    public override fun setSeed(seed: Long) {
+    override fun setSeed(seed: Long) {
         setSeed(seed.toInt())
     }
 
-    public override fun nextBytes(bytes: ByteArray) {
+    override fun nextBytes(bytes: ByteArray) {
         generator.fillBytes(bytes)
     }
 
-    public override fun nextInt(): Int = generator.nextInt()
-    public override fun nextInt(n: Int): Int = generator.nextInt(n)
+    override fun nextInt(): Int = generator.nextInt()
+    override fun nextInt(n: Int): Int = generator.nextInt(n)
 
     @PerformancePitfall
-    public override fun nextGaussian(): Double = runBlocking { GaussianSampler(0.0, 1.0).next(generator) }
+    override fun nextGaussian(): Double = runBlocking { GaussianSampler(0.0, 1.0).next(generator) }
 
-    public override fun nextDouble(): Double = generator.nextDouble()
-    public override fun nextLong(): Long = generator.nextLong()
+    override fun nextDouble(): Double = generator.nextDouble()
+    override fun nextLong(): Long = generator.nextLong()
 }
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index a96d046c9..8b064a05f 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -54,8 +54,8 @@ private val PI_DIV_2 = Complex(PI / 2, 0)
 @OptIn(UnstableKMathAPI::class)
 public object ComplexField : ExtendedField<Complex>, Norm<Complex, Complex>, NumbersAddOperations<Complex>,
     ScaleOperations<Complex> {
-    public override val zero: Complex = 0.0.toComplex()
-    public override val one: Complex = 1.0.toComplex()
+    override val zero: Complex = 0.0.toComplex()
+    override val one: Complex = 1.0.toComplex()
 
     /**
      * The imaginary unit.
@@ -68,13 +68,13 @@ public object ComplexField : ExtendedField<Complex>, Norm<Complex, Complex>, Num
 
     override fun scale(a: Complex, value: Double): Complex = Complex(a.re * value, a.im * value)
 
-    public override fun add(a: Complex, b: Complex): Complex = Complex(a.re + b.re, a.im + b.im)
-//    public override fun multiply(a: Complex, k: Number): Complex = Complex(a.re * k.toDouble(), a.im * k.toDouble())
+    override fun add(a: Complex, b: Complex): Complex = Complex(a.re + b.re, a.im + b.im)
+//    override fun multiply(a: Complex, k: Number): Complex = Complex(a.re * k.toDouble(), a.im * k.toDouble())
 
-    public override fun multiply(a: Complex, b: Complex): Complex =
+    override fun multiply(a: Complex, b: Complex): Complex =
         Complex(a.re * b.re - a.im * b.im, a.re * b.im + a.im * b.re)
 
-    public override fun divide(a: Complex, b: Complex): Complex = when {
+    override fun divide(a: Complex, b: Complex): Complex = when {
         abs(b.im) < abs(b.re) -> {
             val wr = b.im / b.re
             val wd = b.re + wr * b.im
@@ -100,31 +100,31 @@ public object ComplexField : ExtendedField<Complex>, Norm<Complex, Complex>, Num
 
     override operator fun Complex.div(k: Number): Complex = Complex(re / k.toDouble(), im / k.toDouble())
 
-    public override fun sin(arg: Complex): Complex = i * (exp(-i * arg) - exp(i * arg)) / 2.0
-    public override fun cos(arg: Complex): Complex = (exp(-i * arg) + exp(i * arg)) / 2.0
+    override fun sin(arg: Complex): Complex = i * (exp(-i * arg) - exp(i * arg)) / 2.0
+    override fun cos(arg: Complex): Complex = (exp(-i * arg) + exp(i * arg)) / 2.0
 
-    public override fun tan(arg: Complex): Complex {
+    override fun tan(arg: Complex): Complex {
         val e1 = exp(-i * arg)
         val e2 = exp(i * arg)
         return i * (e1 - e2) / (e1 + e2)
     }
 
-    public override fun asin(arg: Complex): Complex = -i * ln(sqrt(1 - (arg * arg)) + i * arg)
-    public override fun acos(arg: Complex): Complex = PI_DIV_2 + i * ln(sqrt(1 - (arg * arg)) + i * arg)
+    override fun asin(arg: Complex): Complex = -i * ln(sqrt(1 - (arg * arg)) + i * arg)
+    override fun acos(arg: Complex): Complex = PI_DIV_2 + i * ln(sqrt(1 - (arg * arg)) + i * arg)
 
-    public override fun atan(arg: Complex): Complex {
+    override fun atan(arg: Complex): Complex {
         val iArg = i * arg
         return i * (ln(1 - iArg) - ln(1 + iArg)) / 2
     }
 
-    public override fun power(arg: Complex, pow: Number): Complex = if (arg.im == 0.0)
+    override fun power(arg: Complex, pow: Number): Complex = if (arg.im == 0.0)
         arg.re.pow(pow.toDouble()).toComplex()
     else
         exp(pow * ln(arg))
 
-    public override fun exp(arg: Complex): Complex = exp(arg.re) * (cos(arg.im) + i * sin(arg.im))
+    override fun exp(arg: Complex): Complex = exp(arg.re) * (cos(arg.im) + i * sin(arg.im))
 
-    public override fun ln(arg: Complex): Complex = ln(arg.r) + i * atan2(arg.im, arg.re)
+    override fun ln(arg: Complex): Complex = ln(arg.r) + i * atan2(arg.im, arg.re)
 
     /**
      * Adds complex number to real one.
@@ -171,9 +171,9 @@ public object ComplexField : ExtendedField<Complex>, Norm<Complex, Complex>, Num
      */
     public operator fun Double.times(c: Complex): Complex = Complex(c.re * this, c.im * this)
 
-    public override fun norm(arg: Complex): Complex = sqrt(arg.conjugate * arg)
+    override fun norm(arg: Complex): Complex = sqrt(arg.conjugate * arg)
 
-    public override fun bindSymbolOrNull(value: String): Complex? = if (value == "i") i else null
+    override fun bindSymbolOrNull(value: String): Complex? = if (value == "i") i else null
 }
 
 /**
@@ -187,16 +187,16 @@ public data class Complex(val re: Double, val im: Double) {
     public constructor(re: Number, im: Number) : this(re.toDouble(), im.toDouble())
     public constructor(re: Number) : this(re.toDouble(), 0.0)
 
-    public override fun toString(): String = "($re + i * $im)"
+    override fun toString(): String = "($re + i * $im)"
 
     public companion object : MemorySpec<Complex> {
-        public override val objectSize: Int
+        override val objectSize: Int
             get() = 16
 
-        public override fun MemoryReader.read(offset: Int): Complex =
+        override fun MemoryReader.read(offset: Int): Complex =
             Complex(readDouble(offset), readDouble(offset + 8))
 
-        public override fun MemoryWriter.write(offset: Int, value: Complex) {
+        override fun MemoryWriter.write(offset: Int, value: Complex) {
             writeDouble(offset, value.re)
             writeDouble(offset + 8, value.im)
         }
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
index 2c783eda0..1b54fc227 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
@@ -27,10 +27,10 @@ public class ComplexFieldND(
     NumbersAddOperations<StructureND<Complex>>,
     ExtendedField<StructureND<Complex>> {
 
-    public override val zero: BufferND<Complex> by lazy { produce { zero } }
-    public override val one: BufferND<Complex> by lazy { produce { one } }
+    override val zero: BufferND<Complex> by lazy { produce { zero } }
+    override val one: BufferND<Complex> by lazy { produce { one } }
 
-    public override fun number(value: Number): BufferND<Complex> {
+    override fun number(value: Number): BufferND<Complex> {
         val d = value.toComplex() // minimize conversions
         return produce { d }
     }
@@ -81,25 +81,25 @@ public class ComplexFieldND(
 //        return BufferedNDFieldElement(this, buffer)
 //    }
 
-    public override fun power(arg: StructureND<Complex>, pow: Number): BufferND<Complex> = arg.map { power(it, pow) }
+    override fun power(arg: StructureND<Complex>, pow: Number): BufferND<Complex> = arg.map { power(it, pow) }
 
-    public override fun exp(arg: StructureND<Complex>): BufferND<Complex> = arg.map { exp(it) }
+    override fun exp(arg: StructureND<Complex>): BufferND<Complex> = arg.map { exp(it) }
 
-    public override fun ln(arg: StructureND<Complex>): BufferND<Complex> = arg.map { ln(it) }
+    override fun ln(arg: StructureND<Complex>): BufferND<Complex> = arg.map { ln(it) }
 
-    public override fun sin(arg: StructureND<Complex>): BufferND<Complex> = arg.map { sin(it) }
-    public override fun cos(arg: StructureND<Complex>): BufferND<Complex> = arg.map { cos(it) }
-    public override fun tan(arg: StructureND<Complex>): BufferND<Complex> = arg.map { tan(it) }
-    public override fun asin(arg: StructureND<Complex>): BufferND<Complex> = arg.map { asin(it) }
-    public override fun acos(arg: StructureND<Complex>): BufferND<Complex> = arg.map { acos(it) }
-    public override fun atan(arg: StructureND<Complex>): BufferND<Complex> = arg.map { atan(it) }
+    override fun sin(arg: StructureND<Complex>): BufferND<Complex> = arg.map { sin(it) }
+    override fun cos(arg: StructureND<Complex>): BufferND<Complex> = arg.map { cos(it) }
+    override fun tan(arg: StructureND<Complex>): BufferND<Complex> = arg.map { tan(it) }
+    override fun asin(arg: StructureND<Complex>): BufferND<Complex> = arg.map { asin(it) }
+    override fun acos(arg: StructureND<Complex>): BufferND<Complex> = arg.map { acos(it) }
+    override fun atan(arg: StructureND<Complex>): BufferND<Complex> = arg.map { atan(it) }
 
-    public override fun sinh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { sinh(it) }
-    public override fun cosh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { cosh(it) }
-    public override fun tanh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { tanh(it) }
-    public override fun asinh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { asinh(it) }
-    public override fun acosh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { acosh(it) }
-    public override fun atanh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { atanh(it) }
+    override fun sinh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { sinh(it) }
+    override fun cosh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { cosh(it) }
+    override fun tanh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { tanh(it) }
+    override fun asinh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { asinh(it) }
+    override fun acosh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { acosh(it) }
+    override fun atanh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { atanh(it) }
 }
 
 
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index 28aae7bb4..423cef1d1 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -63,20 +63,20 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
      */
     public val k: Quaternion = Quaternion(0, 0, 0, 1)
 
-    public override fun add(a: Quaternion, b: Quaternion): Quaternion =
+    override fun add(a: Quaternion, b: Quaternion): Quaternion =
         Quaternion(a.w + b.w, a.x + b.x, a.y + b.y, a.z + b.z)
 
-    public override fun scale(a: Quaternion, value: Double): Quaternion =
+    override fun scale(a: Quaternion, value: Double): Quaternion =
         Quaternion(a.w * value, a.x * value, a.y * value, a.z * value)
 
-    public override fun multiply(a: Quaternion, b: Quaternion): Quaternion = Quaternion(
+    override fun multiply(a: Quaternion, b: Quaternion): Quaternion = Quaternion(
         a.w * b.w - a.x * b.x - a.y * b.y - a.z * b.z,
         a.w * b.x + a.x * b.w + a.y * b.z - a.z * b.y,
         a.w * b.y - a.x * b.z + a.y * b.w + a.z * b.x,
         a.w * b.z + a.x * b.y - a.y * b.x + a.z * b.w,
     )
 
-    public override fun divide(a: Quaternion, b: Quaternion): Quaternion {
+    override fun divide(a: Quaternion, b: Quaternion): Quaternion {
         val s = b.w * b.w + b.x * b.x + b.y * b.y + b.z * b.z
 
         return Quaternion(
@@ -87,7 +87,7 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
         )
     }
 
-    public override fun power(arg: Quaternion, pow: Number): Quaternion {
+    override fun power(arg: Quaternion, pow: Number): Quaternion {
         if (pow is Int) return pwr(arg, pow)
         if (floor(pow.toDouble()) == pow.toDouble()) return pwr(arg, pow.toInt())
         return exp(pow * ln(arg))
@@ -131,7 +131,7 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
         return Quaternion(a2 * a2 - 6 * a2 * n1 + n1 * n1, x.x * n2, x.y * n2, x.z * n2)
     }
 
-    public override fun exp(arg: Quaternion): Quaternion {
+    override fun exp(arg: Quaternion): Quaternion {
         val un = arg.x * arg.x + arg.y * arg.y + arg.z * arg.z
         if (un == 0.0) return exp(arg.w).toQuaternion()
         val n1 = sqrt(un)
@@ -140,7 +140,7 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
         return Quaternion(ea * cos(n1), n2 * arg.x, n2 * arg.y, n2 * arg.z)
     }
 
-    public override fun ln(arg: Quaternion): Quaternion {
+    override fun ln(arg: Quaternion): Quaternion {
         val nu2 = arg.x * arg.x + arg.y * arg.y + arg.z * arg.z
 
         if (nu2 == 0.0)
@@ -158,21 +158,21 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
         return Quaternion(ln(n), th * arg.x, th * arg.y, th * arg.z)
     }
 
-    public override operator fun Number.plus(b: Quaternion): Quaternion = Quaternion(toDouble() + b.w, b.x, b.y, b.z)
+    override operator fun Number.plus(b: Quaternion): Quaternion = Quaternion(toDouble() + b.w, b.x, b.y, b.z)
 
-    public override operator fun Number.minus(b: Quaternion): Quaternion =
+    override operator fun Number.minus(b: Quaternion): Quaternion =
         Quaternion(toDouble() - b.w, -b.x, -b.y, -b.z)
 
-    public override operator fun Quaternion.plus(b: Number): Quaternion = Quaternion(w + b.toDouble(), x, y, z)
-    public override operator fun Quaternion.minus(b: Number): Quaternion = Quaternion(w - b.toDouble(), x, y, z)
+    override operator fun Quaternion.plus(b: Number): Quaternion = Quaternion(w + b.toDouble(), x, y, z)
+    override operator fun Quaternion.minus(b: Number): Quaternion = Quaternion(w - b.toDouble(), x, y, z)
 
-    public override operator fun Number.times(b: Quaternion): Quaternion =
+    override operator fun Number.times(b: Quaternion): Quaternion =
         Quaternion(toDouble() * b.w, toDouble() * b.x, toDouble() * b.y, toDouble() * b.z)
 
-    public override fun Quaternion.unaryMinus(): Quaternion = Quaternion(-w, -x, -y, -z)
-    public override fun norm(arg: Quaternion): Quaternion = sqrt(arg.conjugate * arg)
+    override fun Quaternion.unaryMinus(): Quaternion = Quaternion(-w, -x, -y, -z)
+    override fun norm(arg: Quaternion): Quaternion = sqrt(arg.conjugate * arg)
 
-    public override fun bindSymbolOrNull(value: String): Quaternion? = when (value) {
+    override fun bindSymbolOrNull(value: String): Quaternion? = when (value) {
         "i" -> i
         "j" -> j
         "k" -> k
@@ -181,12 +181,12 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
 
     override fun number(value: Number): Quaternion = value.toQuaternion()
 
-    public override fun sinh(arg: Quaternion): Quaternion = (exp(arg) - exp(-arg)) / 2.0
-    public override fun cosh(arg: Quaternion): Quaternion = (exp(arg) + exp(-arg)) / 2.0
-    public override fun tanh(arg: Quaternion): Quaternion = (exp(arg) - exp(-arg)) / (exp(-arg) + exp(arg))
-    public override fun asinh(arg: Quaternion): Quaternion = ln(sqrt(arg * arg + one) + arg)
-    public override fun acosh(arg: Quaternion): Quaternion = ln(arg + sqrt((arg - one) * (arg + one)))
-    public override fun atanh(arg: Quaternion): Quaternion = (ln(arg + one) - ln(one - arg)) / 2.0
+    override fun sinh(arg: Quaternion): Quaternion = (exp(arg) - exp(-arg)) / 2.0
+    override fun cosh(arg: Quaternion): Quaternion = (exp(arg) + exp(-arg)) / 2.0
+    override fun tanh(arg: Quaternion): Quaternion = (exp(arg) - exp(-arg)) / (exp(-arg) + exp(arg))
+    override fun asinh(arg: Quaternion): Quaternion = ln(sqrt(arg * arg + one) + arg)
+    override fun acosh(arg: Quaternion): Quaternion = ln(arg + sqrt((arg - one) * (arg + one)))
+    override fun atanh(arg: Quaternion): Quaternion = (ln(arg + one) - ln(one - arg)) / 2.0
 }
 
 /**
@@ -224,16 +224,16 @@ public data class Quaternion(
     /**
      * Returns a string representation of this quaternion.
      */
-    public override fun toString(): String = "($w + $x * i + $y * j + $z * k)"
+    override fun toString(): String = "($w + $x * i + $y * j + $z * k)"
 
     public companion object : MemorySpec<Quaternion> {
-        public override val objectSize: Int
+        override val objectSize: Int
             get() = 32
 
-        public override fun MemoryReader.read(offset: Int): Quaternion =
+        override fun MemoryReader.read(offset: Int): Quaternion =
             Quaternion(readDouble(offset), readDouble(offset + 8), readDouble(offset + 16), readDouble(offset + 24))
 
-        public override fun MemoryWriter.write(offset: Int, value: Quaternion) {
+        override fun MemoryWriter.write(offset: Int, value: Quaternion) {
             writeDouble(offset, value.w)
             writeDouble(offset + 8, value.x)
             writeDouble(offset + 16, value.y)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
index f5560d935..bd5514623 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
@@ -17,17 +17,17 @@ import space.kscience.kmath.structures.indices
  */
 @UnstableKMathAPI
 public class HyperSquareDomain(private val lower: Buffer<Double>, private val upper: Buffer<Double>) : DoubleDomain {
-    public override val dimension: Int get() = lower.size
+    override val dimension: Int get() = lower.size
 
-    public override operator fun contains(point: Point<Double>): Boolean = point.indices.all { i ->
+    override operator fun contains(point: Point<Double>): Boolean = point.indices.all { i ->
         point[i] in lower[i]..upper[i]
     }
 
-    public override fun getLowerBound(num: Int): Double = lower[num]
+    override fun getLowerBound(num: Int): Double = lower[num]
 
-    public override fun getUpperBound(num: Int): Double = upper[num]
+    override fun getUpperBound(num: Int): Double = upper[num]
 
-    public override fun volume(): Double {
+    override fun volume(): Double {
         var res = 1.0
 
         for (i in 0 until dimension) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
index 7ffc0659d..32a5fc56c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
@@ -8,12 +8,12 @@ import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
 
 @UnstableKMathAPI
-public class UnconstrainedDomain(public override val dimension: Int) : DoubleDomain {
-    public override operator fun contains(point: Point<Double>): Boolean = true
+public class UnconstrainedDomain(override val dimension: Int) : DoubleDomain {
+    override operator fun contains(point: Point<Double>): Boolean = true
 
-    public override fun getLowerBound(num: Int): Double = Double.NEGATIVE_INFINITY
+    override fun getLowerBound(num: Int): Double = Double.NEGATIVE_INFINITY
 
-    public override fun getUpperBound(num: Int): Double = Double.POSITIVE_INFINITY
+    override fun getUpperBound(num: Int): Double = Double.POSITIVE_INFINITY
 
-    public override fun volume(): Double = Double.POSITIVE_INFINITY
+    override fun volume(): Double = Double.POSITIVE_INFINITY
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt
index e7acada85..9020ef8cb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt
@@ -10,24 +10,24 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 
 @UnstableKMathAPI
 public class UnivariateDomain(public val range: ClosedFloatingPointRange<Double>) : DoubleDomain {
-    public override val dimension: Int get() = 1
+    override val dimension: Int get() = 1
 
     public operator fun contains(d: Double): Boolean = range.contains(d)
 
-    public override operator fun contains(point: Point<Double>): Boolean {
+    override operator fun contains(point: Point<Double>): Boolean {
         require(point.size == 0)
         return contains(point[0])
     }
 
-    public override fun getLowerBound(num: Int): Double {
+    override fun getLowerBound(num: Int): Double {
         require(num == 0)
         return range.start
     }
 
-    public override fun getUpperBound(num: Int): Double {
+    override fun getUpperBound(num: Int): Double {
         require(num == 0)
         return range.endInclusive
     }
 
-    public override fun volume(): Double = range.endInclusive - range.start
+    override fun volume(): Double = range.endInclusive - range.start
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
index a10e29cf0..5935424b6 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
@@ -20,25 +20,25 @@ public abstract class FunctionalExpressionAlgebra<T, out A : Algebra<T>>(
     /**
      * Builds an Expression of constant expression which does not depend on arguments.
      */
-    public override fun const(value: T): Expression<T> = Expression { value }
+    override fun const(value: T): Expression<T> = Expression { value }
 
     /**
      * Builds an Expression to access a variable.
      */
-    public override fun bindSymbolOrNull(value: String): Expression<T>? = Expression { arguments ->
+    override fun bindSymbolOrNull(value: String): Expression<T>? = Expression { arguments ->
         algebra.bindSymbolOrNull(value)
             ?: arguments[StringSymbol(value)]
             ?: error("Symbol '$value' is not supported in $this")
     }
 
-    public override fun binaryOperationFunction(operation: String): (left: Expression<T>, right: Expression<T>) -> Expression<T> =
+    override fun binaryOperationFunction(operation: String): (left: Expression<T>, right: Expression<T>) -> Expression<T> =
         { left, right ->
             Expression { arguments ->
                 algebra.binaryOperationFunction(operation)(left.invoke(arguments), right.invoke(arguments))
             }
         }
 
-    public override fun unaryOperationFunction(operation: String): (arg: Expression<T>) -> Expression<T> = { arg ->
+    override fun unaryOperationFunction(operation: String): (arg: Expression<T>) -> Expression<T> = { arg ->
         Expression { arguments -> algebra.unaryOperationFunction(operation)(arg.invoke(arguments)) }
     }
 }
@@ -49,21 +49,21 @@ public abstract class FunctionalExpressionAlgebra<T, out A : Algebra<T>>(
 public open class FunctionalExpressionGroup<T, out A : Group<T>>(
     algebra: A,
 ) : FunctionalExpressionAlgebra<T, A>(algebra), Group<Expression<T>> {
-    public override val zero: Expression<T> get() = const(algebra.zero)
+    override val zero: Expression<T> get() = const(algebra.zero)
 
-    public override fun Expression<T>.unaryMinus(): Expression<T> =
+    override fun Expression<T>.unaryMinus(): Expression<T> =
         unaryOperation(GroupOperations.MINUS_OPERATION, this)
 
     /**
      * Builds an Expression of addition of two another expressions.
      */
-    public override fun add(a: Expression<T>, b: Expression<T>): Expression<T> =
+    override fun add(a: Expression<T>, b: Expression<T>): Expression<T> =
         binaryOperation(GroupOperations.PLUS_OPERATION, a, b)
 
 //    /**
 //     * Builds an Expression of multiplication of expression by number.
 //     */
-//    public override fun multiply(a: Expression<T>, k: Number): Expression<T> = Expression { arguments ->
+//    override fun multiply(a: Expression<T>, k: Number): Expression<T> = Expression { arguments ->
 //        algebra.multiply(a.invoke(arguments), k)
 //    }
 
@@ -72,10 +72,10 @@ public open class FunctionalExpressionGroup<T, out A : Group<T>>(
     public operator fun T.plus(arg: Expression<T>): Expression<T> = arg + this
     public operator fun T.minus(arg: Expression<T>): Expression<T> = arg - this
 
-    public override fun unaryOperationFunction(operation: String): (arg: Expression<T>) -> Expression<T> =
+    override fun unaryOperationFunction(operation: String): (arg: Expression<T>) -> Expression<T> =
         super<FunctionalExpressionAlgebra>.unaryOperationFunction(operation)
 
-    public override fun binaryOperationFunction(operation: String): (left: Expression<T>, right: Expression<T>) -> Expression<T> =
+    override fun binaryOperationFunction(operation: String): (left: Expression<T>, right: Expression<T>) -> Expression<T> =
         super<FunctionalExpressionAlgebra>.binaryOperationFunction(operation)
 
 }
@@ -83,21 +83,21 @@ public open class FunctionalExpressionGroup<T, out A : Group<T>>(
 public open class FunctionalExpressionRing<T, out A : Ring<T>>(
     algebra: A,
 ) : FunctionalExpressionGroup<T, A>(algebra), Ring<Expression<T>> {
-    public override val one: Expression<T> get() = const(algebra.one)
+    override val one: Expression<T> get() = const(algebra.one)
 
     /**
      * Builds an Expression of multiplication of two expressions.
      */
-    public override fun multiply(a: Expression<T>, b: Expression<T>): Expression<T> =
+    override fun multiply(a: Expression<T>, b: Expression<T>): Expression<T> =
         binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, b)
 
     public operator fun Expression<T>.times(arg: T): Expression<T> = this * const(arg)
     public operator fun T.times(arg: Expression<T>): Expression<T> = arg * this
 
-    public override fun unaryOperationFunction(operation: String): (arg: Expression<T>) -> Expression<T> =
+    override fun unaryOperationFunction(operation: String): (arg: Expression<T>) -> Expression<T> =
         super<FunctionalExpressionGroup>.unaryOperationFunction(operation)
 
-    public override fun binaryOperationFunction(operation: String): (left: Expression<T>, right: Expression<T>) -> Expression<T> =
+    override fun binaryOperationFunction(operation: String): (left: Expression<T>, right: Expression<T>) -> Expression<T> =
         super<FunctionalExpressionGroup>.binaryOperationFunction(operation)
 }
 
@@ -107,65 +107,65 @@ public open class FunctionalExpressionField<T, out A : Field<T>>(
     /**
      * Builds an Expression of division an expression by another one.
      */
-    public override fun divide(a: Expression<T>, b: Expression<T>): Expression<T> =
+    override fun divide(a: Expression<T>, b: Expression<T>): Expression<T> =
         binaryOperationFunction(FieldOperations.DIV_OPERATION)(a, b)
 
     public operator fun Expression<T>.div(arg: T): Expression<T> = this / const(arg)
     public operator fun T.div(arg: Expression<T>): Expression<T> = arg / this
 
-    public override fun unaryOperationFunction(operation: String): (arg: Expression<T>) -> Expression<T> =
+    override fun unaryOperationFunction(operation: String): (arg: Expression<T>) -> Expression<T> =
         super<FunctionalExpressionRing>.unaryOperationFunction(operation)
 
-    public override fun binaryOperationFunction(operation: String): (left: Expression<T>, right: Expression<T>) -> Expression<T> =
+    override fun binaryOperationFunction(operation: String): (left: Expression<T>, right: Expression<T>) -> Expression<T> =
         super<FunctionalExpressionRing>.binaryOperationFunction(operation)
 
-    public override fun scale(a: Expression<T>, value: Double): Expression<T> = algebra {
+    override fun scale(a: Expression<T>, value: Double): Expression<T> = algebra {
         Expression { args -> a(args) * value }
     }
 
-    public override fun bindSymbolOrNull(value: String): Expression<T>? =
+    override fun bindSymbolOrNull(value: String): Expression<T>? =
         super<FunctionalExpressionRing>.bindSymbolOrNull(value)
 }
 
 public open class FunctionalExpressionExtendedField<T, out A : ExtendedField<T>>(
     algebra: A,
 ) : FunctionalExpressionField<T, A>(algebra), ExtendedField<Expression<T>> {
-    public override fun number(value: Number): Expression<T> = const(algebra.number(value))
+    override fun number(value: Number): Expression<T> = const(algebra.number(value))
 
-    public override fun sqrt(arg: Expression<T>): Expression<T> =
+    override fun sqrt(arg: Expression<T>): Expression<T> =
         unaryOperationFunction(PowerOperations.SQRT_OPERATION)(arg)
 
-    public override fun sin(arg: Expression<T>): Expression<T> =
+    override fun sin(arg: Expression<T>): Expression<T> =
         unaryOperationFunction(TrigonometricOperations.SIN_OPERATION)(arg)
 
-    public override fun cos(arg: Expression<T>): Expression<T> =
+    override fun cos(arg: Expression<T>): Expression<T> =
         unaryOperationFunction(TrigonometricOperations.COS_OPERATION)(arg)
 
-    public override fun asin(arg: Expression<T>): Expression<T> =
+    override fun asin(arg: Expression<T>): Expression<T> =
         unaryOperationFunction(TrigonometricOperations.ASIN_OPERATION)(arg)
 
-    public override fun acos(arg: Expression<T>): Expression<T> =
+    override fun acos(arg: Expression<T>): Expression<T> =
         unaryOperationFunction(TrigonometricOperations.ACOS_OPERATION)(arg)
 
-    public override fun atan(arg: Expression<T>): Expression<T> =
+    override fun atan(arg: Expression<T>): Expression<T> =
         unaryOperationFunction(TrigonometricOperations.ATAN_OPERATION)(arg)
 
-    public override fun power(arg: Expression<T>, pow: Number): Expression<T> =
+    override fun power(arg: Expression<T>, pow: Number): Expression<T> =
         binaryOperationFunction(PowerOperations.POW_OPERATION)(arg, number(pow))
 
-    public override fun exp(arg: Expression<T>): Expression<T> =
+    override fun exp(arg: Expression<T>): Expression<T> =
         unaryOperationFunction(ExponentialOperations.EXP_OPERATION)(arg)
 
-    public override fun ln(arg: Expression<T>): Expression<T> =
+    override fun ln(arg: Expression<T>): Expression<T> =
         unaryOperationFunction(ExponentialOperations.LN_OPERATION)(arg)
 
-    public override fun unaryOperationFunction(operation: String): (arg: Expression<T>) -> Expression<T> =
+    override fun unaryOperationFunction(operation: String): (arg: Expression<T>) -> Expression<T> =
         super<FunctionalExpressionField>.unaryOperationFunction(operation)
 
-    public override fun binaryOperationFunction(operation: String): (left: Expression<T>, right: Expression<T>) -> Expression<T> =
+    override fun binaryOperationFunction(operation: String): (left: Expression<T>, right: Expression<T>) -> Expression<T> =
         super<FunctionalExpressionField>.binaryOperationFunction(operation)
 
-    public override fun bindSymbol(value: String): Expression<T> = super<FunctionalExpressionField>.bindSymbol(value)
+    override fun bindSymbol(value: String): Expression<T> = super<FunctionalExpressionField>.bindSymbol(value)
 }
 
 public inline fun <T, A : Group<T>> A.expressionInGroup(
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
index 4729f19ea..d8489e30c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
@@ -12,14 +12,14 @@ import space.kscience.kmath.operations.*
  * [Algebra] over [MST] nodes.
  */
 public object MstNumericAlgebra : NumericAlgebra<MST> {
-    public override fun number(value: Number): MST.Numeric = MST.Numeric(value)
-    public override fun bindSymbolOrNull(value: String): Symbol = StringSymbol(value)
+    override fun number(value: Number): MST.Numeric = MST.Numeric(value)
+    override fun bindSymbolOrNull(value: String): Symbol = StringSymbol(value)
     override fun bindSymbol(value: String): Symbol = bindSymbolOrNull(value)
 
-    public override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
+    override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
         { arg -> MST.Unary(operation, arg) }
 
-    public override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
+    override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
         { left, right -> MST.Binary(operation, left, right) }
 }
 
@@ -27,27 +27,27 @@ public object MstNumericAlgebra : NumericAlgebra<MST> {
  * [Group] over [MST] nodes.
  */
 public object MstGroup : Group<MST>, NumericAlgebra<MST>, ScaleOperations<MST> {
-    public override val zero: MST.Numeric = number(0.0)
+    override val zero: MST.Numeric = number(0.0)
 
-    public override fun number(value: Number): MST.Numeric = MstNumericAlgebra.number(value)
-    public override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
-    public override fun add(a: MST, b: MST): MST.Binary = binaryOperationFunction(GroupOperations.PLUS_OPERATION)(a, b)
-    public override operator fun MST.unaryPlus(): MST.Unary =
+    override fun number(value: Number): MST.Numeric = MstNumericAlgebra.number(value)
+    override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
+    override fun add(a: MST, b: MST): MST.Binary = binaryOperationFunction(GroupOperations.PLUS_OPERATION)(a, b)
+    override operator fun MST.unaryPlus(): MST.Unary =
         unaryOperationFunction(GroupOperations.PLUS_OPERATION)(this)
 
-    public override operator fun MST.unaryMinus(): MST.Unary =
+    override operator fun MST.unaryMinus(): MST.Unary =
         unaryOperationFunction(GroupOperations.MINUS_OPERATION)(this)
 
-    public override operator fun MST.minus(b: MST): MST.Binary =
+    override operator fun MST.minus(b: MST): MST.Binary =
         binaryOperationFunction(GroupOperations.MINUS_OPERATION)(this, b)
 
-    public override fun scale(a: MST, value: Double): MST.Binary =
+    override fun scale(a: MST, value: Double): MST.Binary =
         binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, number(value))
 
-    public override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
+    override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
         MstNumericAlgebra.binaryOperationFunction(operation)
 
-    public override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
+    override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
         MstNumericAlgebra.unaryOperationFunction(operation)
 }
 
@@ -57,27 +57,27 @@ public object MstGroup : Group<MST>, NumericAlgebra<MST>, ScaleOperations<MST> {
 @Suppress("OVERRIDE_BY_INLINE")
 @OptIn(UnstableKMathAPI::class)
 public object MstRing : Ring<MST>, NumbersAddOperations<MST>, ScaleOperations<MST> {
-    public override inline val zero: MST.Numeric get() = MstGroup.zero
-    public override val one: MST.Numeric = number(1.0)
+    override inline val zero: MST.Numeric get() = MstGroup.zero
+    override val one: MST.Numeric = number(1.0)
 
-    public override fun number(value: Number): MST.Numeric = MstGroup.number(value)
-    public override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
-    public override fun add(a: MST, b: MST): MST.Binary = MstGroup.add(a, b)
+    override fun number(value: Number): MST.Numeric = MstGroup.number(value)
+    override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
+    override fun add(a: MST, b: MST): MST.Binary = MstGroup.add(a, b)
 
-    public override fun scale(a: MST, value: Double): MST.Binary =
+    override fun scale(a: MST, value: Double): MST.Binary =
         MstGroup.binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, MstGroup.number(value))
 
-    public override fun multiply(a: MST, b: MST): MST.Binary =
+    override fun multiply(a: MST, b: MST): MST.Binary =
         binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, b)
 
-    public override operator fun MST.unaryPlus(): MST.Unary = MstGroup { +this@unaryPlus }
-    public override operator fun MST.unaryMinus(): MST.Unary = MstGroup { -this@unaryMinus }
-    public override operator fun MST.minus(b: MST): MST.Binary = MstGroup { this@minus - b }
+    override operator fun MST.unaryPlus(): MST.Unary = MstGroup { +this@unaryPlus }
+    override operator fun MST.unaryMinus(): MST.Unary = MstGroup { -this@unaryMinus }
+    override operator fun MST.minus(b: MST): MST.Binary = MstGroup { this@minus - b }
 
-    public override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
+    override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
         MstGroup.binaryOperationFunction(operation)
 
-    public override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
+    override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
         MstNumericAlgebra.unaryOperationFunction(operation)
 }
 
@@ -87,28 +87,28 @@ public object MstRing : Ring<MST>, NumbersAddOperations<MST>, ScaleOperations<MS
 @Suppress("OVERRIDE_BY_INLINE")
 @OptIn(UnstableKMathAPI::class)
 public object MstField : Field<MST>, NumbersAddOperations<MST>, ScaleOperations<MST> {
-    public override inline val zero: MST.Numeric get() = MstRing.zero
-    public override inline val one: MST.Numeric get() = MstRing.one
+    override inline val zero: MST.Numeric get() = MstRing.zero
+    override inline val one: MST.Numeric get() = MstRing.one
 
-    public override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
-    public override fun number(value: Number): MST.Numeric = MstRing.number(value)
-    public override fun add(a: MST, b: MST): MST.Binary = MstRing.add(a, b)
+    override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
+    override fun number(value: Number): MST.Numeric = MstRing.number(value)
+    override fun add(a: MST, b: MST): MST.Binary = MstRing.add(a, b)
 
-    public override fun scale(a: MST, value: Double): MST.Binary =
+    override fun scale(a: MST, value: Double): MST.Binary =
         MstGroup.binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, MstGroup.number(value))
 
-    public override fun multiply(a: MST, b: MST): MST.Binary = MstRing.multiply(a, b)
-    public override fun divide(a: MST, b: MST): MST.Binary =
+    override fun multiply(a: MST, b: MST): MST.Binary = MstRing.multiply(a, b)
+    override fun divide(a: MST, b: MST): MST.Binary =
         binaryOperationFunction(FieldOperations.DIV_OPERATION)(a, b)
 
-    public override operator fun MST.unaryPlus(): MST.Unary = MstRing { +this@unaryPlus }
-    public override operator fun MST.unaryMinus(): MST.Unary = MstRing { -this@unaryMinus }
-    public override operator fun MST.minus(b: MST): MST.Binary = MstRing { this@minus - b }
+    override operator fun MST.unaryPlus(): MST.Unary = MstRing { +this@unaryPlus }
+    override operator fun MST.unaryMinus(): MST.Unary = MstRing { -this@unaryMinus }
+    override operator fun MST.minus(b: MST): MST.Binary = MstRing { this@minus - b }
 
-    public override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
+    override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
         MstRing.binaryOperationFunction(operation)
 
-    public override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
+    override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
         MstRing.unaryOperationFunction(operation)
 }
 
@@ -117,45 +117,45 @@ public object MstField : Field<MST>, NumbersAddOperations<MST>, ScaleOperations<
  */
 @Suppress("OVERRIDE_BY_INLINE")
 public object MstExtendedField : ExtendedField<MST>, NumericAlgebra<MST> {
-    public override inline val zero: MST.Numeric get() = MstField.zero
-    public override inline val one: MST.Numeric get() = MstField.one
+    override inline val zero: MST.Numeric get() = MstField.zero
+    override inline val one: MST.Numeric get() = MstField.one
 
-    public override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
-    public override fun number(value: Number): MST.Numeric = MstRing.number(value)
-    public override fun sin(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.SIN_OPERATION)(arg)
-    public override fun cos(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.COS_OPERATION)(arg)
-    public override fun tan(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.TAN_OPERATION)(arg)
-    public override fun asin(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.ASIN_OPERATION)(arg)
-    public override fun acos(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.ACOS_OPERATION)(arg)
-    public override fun atan(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.ATAN_OPERATION)(arg)
-    public override fun sinh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.SINH_OPERATION)(arg)
-    public override fun cosh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.COSH_OPERATION)(arg)
-    public override fun tanh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.TANH_OPERATION)(arg)
-    public override fun asinh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.ASINH_OPERATION)(arg)
-    public override fun acosh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.ACOSH_OPERATION)(arg)
-    public override fun atanh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.ATANH_OPERATION)(arg)
-    public override fun add(a: MST, b: MST): MST.Binary = MstField.add(a, b)
-    public override fun sqrt(arg: MST): MST = unaryOperationFunction(PowerOperations.SQRT_OPERATION)(arg)
+    override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
+    override fun number(value: Number): MST.Numeric = MstRing.number(value)
+    override fun sin(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.SIN_OPERATION)(arg)
+    override fun cos(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.COS_OPERATION)(arg)
+    override fun tan(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.TAN_OPERATION)(arg)
+    override fun asin(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.ASIN_OPERATION)(arg)
+    override fun acos(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.ACOS_OPERATION)(arg)
+    override fun atan(arg: MST): MST.Unary = unaryOperationFunction(TrigonometricOperations.ATAN_OPERATION)(arg)
+    override fun sinh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.SINH_OPERATION)(arg)
+    override fun cosh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.COSH_OPERATION)(arg)
+    override fun tanh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.TANH_OPERATION)(arg)
+    override fun asinh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.ASINH_OPERATION)(arg)
+    override fun acosh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.ACOSH_OPERATION)(arg)
+    override fun atanh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.ATANH_OPERATION)(arg)
+    override fun add(a: MST, b: MST): MST.Binary = MstField.add(a, b)
+    override fun sqrt(arg: MST): MST = unaryOperationFunction(PowerOperations.SQRT_OPERATION)(arg)
 
-    public override fun scale(a: MST, value: Double): MST =
+    override fun scale(a: MST, value: Double): MST =
         binaryOperation(GroupOperations.PLUS_OPERATION, a, number(value))
 
-    public override fun multiply(a: MST, b: MST): MST.Binary = MstField.multiply(a, b)
-    public override fun divide(a: MST, b: MST): MST.Binary = MstField.divide(a, b)
-    public override operator fun MST.unaryPlus(): MST.Unary = MstField { +this@unaryPlus }
-    public override operator fun MST.unaryMinus(): MST.Unary = MstField { -this@unaryMinus }
-    public override operator fun MST.minus(b: MST): MST.Binary = MstField { this@minus - b }
+    override fun multiply(a: MST, b: MST): MST.Binary = MstField.multiply(a, b)
+    override fun divide(a: MST, b: MST): MST.Binary = MstField.divide(a, b)
+    override operator fun MST.unaryPlus(): MST.Unary = MstField { +this@unaryPlus }
+    override operator fun MST.unaryMinus(): MST.Unary = MstField { -this@unaryMinus }
+    override operator fun MST.minus(b: MST): MST.Binary = MstField { this@minus - b }
 
-    public override fun power(arg: MST, pow: Number): MST.Binary =
+    override fun power(arg: MST, pow: Number): MST.Binary =
         binaryOperationFunction(PowerOperations.POW_OPERATION)(arg, number(pow))
 
-    public override fun exp(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.EXP_OPERATION)(arg)
-    public override fun ln(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.LN_OPERATION)(arg)
+    override fun exp(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.EXP_OPERATION)(arg)
+    override fun ln(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.LN_OPERATION)(arg)
 
-    public override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
+    override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
         MstField.binaryOperationFunction(operation)
 
-    public override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
+    override fun unaryOperationFunction(operation: String): (arg: MST) -> MST.Unary =
         MstField.unaryOperationFunction(operation)
 }
 
@@ -164,7 +164,7 @@ public object MstExtendedField : ExtendedField<MST>, NumericAlgebra<MST> {
  */
 @UnstableKMathAPI
 public object MstLogicAlgebra : LogicAlgebra<MST> {
-    public override fun bindSymbolOrNull(value: String): MST = super.bindSymbolOrNull(value) ?: StringSymbol(value)
+    override fun bindSymbolOrNull(value: String): MST = super.bindSymbolOrNull(value) ?: StringSymbol(value)
 
     override fun const(boolean: Boolean): Symbol = if (boolean) {
         LogicAlgebra.TRUE
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
index 960f6fd79..bf9469f41 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
@@ -60,8 +60,8 @@ public open class SimpleAutoDiffField<T : Any, F : Field<T>>(
     public val context: F,
     bindings: Map<Symbol, T>,
 ) : Field<AutoDiffValue<T>>, ExpressionAlgebra<T, AutoDiffValue<T>>, NumbersAddOperations<AutoDiffValue<T>> {
-    public override val zero: AutoDiffValue<T> get() = const(context.zero)
-    public override val one: AutoDiffValue<T> get() = const(context.one)
+    override val zero: AutoDiffValue<T> get() = const(context.zero)
+    override val one: AutoDiffValue<T> get() = const(context.one)
 
     // this stack contains pairs of blocks and values to apply them to
     private var stack: Array<Any?> = arrayOfNulls<Any?>(8)
@@ -149,17 +149,17 @@ public open class SimpleAutoDiffField<T : Any, F : Field<T>>(
 
 //    // Overloads for Double constants
 //
-//    public override operator fun Number.plus(b: AutoDiffValue<T>): AutoDiffValue<T> =
+//    override operator fun Number.plus(b: AutoDiffValue<T>): AutoDiffValue<T> =
 //        derive(const { this@plus.toDouble() * one + b.value }) { z ->
 //            b.d += z.d
 //        }
 //
-//    public override operator fun AutoDiffValue<T>.plus(b: Number): AutoDiffValue<T> = b.plus(this)
+//    override operator fun AutoDiffValue<T>.plus(b: Number): AutoDiffValue<T> = b.plus(this)
 //
-//    public override operator fun Number.minus(b: AutoDiffValue<T>): AutoDiffValue<T> =
+//    override operator fun Number.minus(b: AutoDiffValue<T>): AutoDiffValue<T> =
 //        derive(const { this@minus.toDouble() * one - b.value }) { z -> b.d -= z.d }
 //
-//    public override operator fun AutoDiffValue<T>.minus(b: Number): AutoDiffValue<T> =
+//    override operator fun AutoDiffValue<T>.minus(b: Number): AutoDiffValue<T> =
 //        derive(const { this@minus.value - one * b.toDouble() }) { z -> d += z.d }
 
 
@@ -168,25 +168,25 @@ public open class SimpleAutoDiffField<T : Any, F : Field<T>>(
 
     // Basic math (+, -, *, /)
 
-    public override fun add(a: AutoDiffValue<T>, b: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun add(a: AutoDiffValue<T>, b: AutoDiffValue<T>): AutoDiffValue<T> =
         derive(const { a.value + b.value }) { z ->
             a.d += z.d
             b.d += z.d
         }
 
-    public override fun multiply(a: AutoDiffValue<T>, b: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun multiply(a: AutoDiffValue<T>, b: AutoDiffValue<T>): AutoDiffValue<T> =
         derive(const { a.value * b.value }) { z ->
             a.d += z.d * b.value
             b.d += z.d * a.value
         }
 
-    public override fun divide(a: AutoDiffValue<T>, b: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun divide(a: AutoDiffValue<T>, b: AutoDiffValue<T>): AutoDiffValue<T> =
         derive(const { a.value / b.value }) { z ->
             a.d += z.d / b.value
             b.d -= z.d * a.value / (b.value * b.value)
         }
 
-    public override fun scale(a: AutoDiffValue<T>, value: Double): AutoDiffValue<T> =
+    override fun scale(a: AutoDiffValue<T>, value: Double): AutoDiffValue<T> =
         derive(const { value * a.value }) { z ->
             a.d += z.d * value
         }
@@ -236,12 +236,12 @@ public class SimpleAutoDiffExpression<T : Any, F : Field<T>>(
     public val field: F,
     public val function: SimpleAutoDiffField<T, F>.() -> AutoDiffValue<T>,
 ) : FirstDerivativeExpression<T>() {
-    public override operator fun invoke(arguments: Map<Symbol, T>): T {
+    override operator fun invoke(arguments: Map<Symbol, T>): T {
         //val bindings = arguments.entries.map { it.key.bind(it.value) }
         return SimpleAutoDiffField(field, arguments).function().value
     }
 
-    public override fun derivativeOrNull(symbol: Symbol): Expression<T> = Expression { arguments ->
+    override fun derivativeOrNull(symbol: Symbol): Expression<T> = Expression { arguments ->
         //val bindings = arguments.entries.map { it.key.bind(it.value) }
         val derivationResult = SimpleAutoDiffField(field, arguments).differentiate(function)
         derivationResult.derivative(symbol)
@@ -346,28 +346,28 @@ public class SimpleAutoDiffExtendedField<T : Any, F : ExtendedField<T>>(
 
     override fun bindSymbol(value: String): AutoDiffValue<T> = super<SimpleAutoDiffField>.bindSymbol(value)
 
-    public override fun number(value: Number): AutoDiffValue<T> = const { number(value) }
+    override fun number(value: Number): AutoDiffValue<T> = const { number(value) }
 
-    public override fun scale(a: AutoDiffValue<T>, value: Double): AutoDiffValue<T> = a * number(value)
+    override fun scale(a: AutoDiffValue<T>, value: Double): AutoDiffValue<T> = a * number(value)
 
     // x ^ 2
     public fun sqr(x: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).sqr(x)
 
     // x ^ 1/2
-    public override fun sqrt(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun sqrt(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).sqrt(arg)
 
     // x ^ y (const)
-    public override fun power(arg: AutoDiffValue<T>, pow: Number): AutoDiffValue<T> =
+    override fun power(arg: AutoDiffValue<T>, pow: Number): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).pow(arg, pow.toDouble())
 
     // exp(x)
-    public override fun exp(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun exp(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).exp(arg)
 
     // ln(x)
-    public override fun ln(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun ln(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).ln(arg)
 
     // x ^ y (any)
@@ -377,40 +377,40 @@ public class SimpleAutoDiffExtendedField<T : Any, F : ExtendedField<T>>(
     ): AutoDiffValue<T> = exp(y * ln(x))
 
     // sin(x)
-    public override fun sin(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun sin(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).sin(arg)
 
     // cos(x)
-    public override fun cos(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun cos(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).cos(arg)
 
-    public override fun tan(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun tan(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).tan(arg)
 
-    public override fun asin(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun asin(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).asin(arg)
 
-    public override fun acos(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun acos(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).acos(arg)
 
-    public override fun atan(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun atan(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).atan(arg)
 
-    public override fun sinh(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun sinh(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).sinh(arg)
 
-    public override fun cosh(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun cosh(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).cosh(arg)
 
-    public override fun tanh(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun tanh(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).tanh(arg)
 
-    public override fun asinh(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun asinh(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).asinh(arg)
 
-    public override fun acosh(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun acosh(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).acosh(arg)
 
-    public override fun atanh(arg: AutoDiffValue<T>): AutoDiffValue<T> =
+    override fun atanh(arg: AutoDiffValue<T>): AutoDiffValue<T> =
         (this as SimpleAutoDiffField<T, F>).atanh(arg)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
index 16aadab3b..4b624b6a0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
@@ -26,11 +26,11 @@ public class MatrixWrapper<out T : Any> internal constructor(
      */
     @UnstableKMathAPI
     @Suppress("UNCHECKED_CAST")
-    public override fun <F : StructureFeature> getFeature(type: KClass<out F>): F? =
+    override fun <F : StructureFeature> getFeature(type: KClass<out F>): F? =
         features.singleOrNull(type::isInstance) as? F
             ?: origin.getFeature(type)
 
-    public override fun toString(): String = "MatrixWrapper(matrix=$origin, features=$features)"
+    override fun toString(): String = "MatrixWrapper(matrix=$origin, features=$features)"
 }
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index 38985f216..7b0b06a58 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -127,7 +127,7 @@ public interface GroupND<T, out S : Group<T>> : Group<StructureND<T>>, AlgebraND
      * @param b the addend.
      * @return the sum.
      */
-    public override fun add(a: StructureND<T>, b: StructureND<T>): StructureND<T> =
+    override fun add(a: StructureND<T>, b: StructureND<T>): StructureND<T> =
         combine(a, b) { aValue, bValue -> add(aValue, bValue) }
 
 //    /**
@@ -137,7 +137,7 @@ public interface GroupND<T, out S : Group<T>> : Group<StructureND<T>>, AlgebraND
 //     * @param k the multiplier.
 //     * @return the product.
 //     */
-//    public override fun multiply(a: NDStructure<T>, k: Number): NDStructure<T> =  a.map { multiply(it, k) }
+//    override fun multiply(a: NDStructure<T>, k: Number): NDStructure<T> =  a.map { multiply(it, k) }
 
     // TODO move to extensions after KEEP-176
 
@@ -194,7 +194,7 @@ public interface RingND<T, out R : Ring<T>> : Ring<StructureND<T>>, GroupND<T, R
      * @param b the multiplier.
      * @return the product.
      */
-    public override fun multiply(a: StructureND<T>, b: StructureND<T>): StructureND<T> =
+    override fun multiply(a: StructureND<T>, b: StructureND<T>): StructureND<T> =
         combine(a, b) { aValue, bValue -> multiply(aValue, bValue) }
 
     //TODO move to extensions after KEEP-176
@@ -234,7 +234,7 @@ public interface FieldND<T, out F : Field<T>> : Field<StructureND<T>>, RingND<T,
      * @param b the divisor.
      * @return the quotient.
      */
-    public override fun divide(a: StructureND<T>, b: StructureND<T>): StructureND<T> =
+    override fun divide(a: StructureND<T>, b: StructureND<T>): StructureND<T> =
         combine(a, b) { aValue, bValue -> divide(aValue, bValue) }
 
     //TODO move to extensions after KEEP-176
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 71532594e..925301272 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -22,15 +22,15 @@ public class DoubleFieldND(
     ScaleOperations<StructureND<Double>>,
     ExtendedField<StructureND<Double>> {
 
-    public override val zero: BufferND<Double> by lazy { produce { zero } }
-    public override val one: BufferND<Double> by lazy { produce { one } }
+    override val zero: BufferND<Double> by lazy { produce { zero } }
+    override val one: BufferND<Double> by lazy { produce { one } }
 
-    public override fun number(value: Number): BufferND<Double> {
+    override fun number(value: Number): BufferND<Double> {
         val d = value.toDouble() // minimize conversions
         return produce { d }
     }
 
-    public override val StructureND<Double>.buffer: DoubleBuffer
+    override val StructureND<Double>.buffer: DoubleBuffer
         get() = when {
             !shape.contentEquals(this@DoubleFieldND.shape) -> throw ShapeMismatchException(
                 this@DoubleFieldND.shape,
@@ -41,7 +41,7 @@ public class DoubleFieldND(
         }
 
     @Suppress("OVERRIDE_BY_INLINE")
-    public override inline fun StructureND<Double>.map(
+    override inline fun StructureND<Double>.map(
         transform: DoubleField.(Double) -> Double,
     ): BufferND<Double> {
         val buffer = DoubleBuffer(strides.linearSize) { offset -> DoubleField.transform(buffer.array[offset]) }
@@ -49,7 +49,7 @@ public class DoubleFieldND(
     }
 
     @Suppress("OVERRIDE_BY_INLINE")
-    public override inline fun produce(initializer: DoubleField.(IntArray) -> Double): BufferND<Double> {
+    override inline fun produce(initializer: DoubleField.(IntArray) -> Double): BufferND<Double> {
         val array = DoubleArray(strides.linearSize) { offset ->
             val index = strides.index(offset)
             DoubleField.initializer(index)
@@ -58,7 +58,7 @@ public class DoubleFieldND(
     }
 
     @Suppress("OVERRIDE_BY_INLINE")
-    public override inline fun StructureND<Double>.mapIndexed(
+    override inline fun StructureND<Double>.mapIndexed(
         transform: DoubleField.(index: IntArray, Double) -> Double,
     ): BufferND<Double> = BufferND(
         strides,
@@ -70,7 +70,7 @@ public class DoubleFieldND(
         })
 
     @Suppress("OVERRIDE_BY_INLINE")
-    public override inline fun combine(
+    override inline fun combine(
         a: StructureND<Double>,
         b: StructureND<Double>,
         transform: DoubleField.(Double, Double) -> Double,
@@ -81,26 +81,26 @@ public class DoubleFieldND(
         return BufferND(strides, buffer)
     }
 
-    public override fun scale(a: StructureND<Double>, value: Double): StructureND<Double> = a.map { it * value }
+    override fun scale(a: StructureND<Double>, value: Double): StructureND<Double> = a.map { it * value }
 
-    public override fun power(arg: StructureND<Double>, pow: Number): BufferND<Double> = arg.map { power(it, pow) }
+    override fun power(arg: StructureND<Double>, pow: Number): BufferND<Double> = arg.map { power(it, pow) }
 
-    public override fun exp(arg: StructureND<Double>): BufferND<Double> = arg.map { exp(it) }
-    public override fun ln(arg: StructureND<Double>): BufferND<Double> = arg.map { ln(it) }
+    override fun exp(arg: StructureND<Double>): BufferND<Double> = arg.map { exp(it) }
+    override fun ln(arg: StructureND<Double>): BufferND<Double> = arg.map { ln(it) }
 
-    public override fun sin(arg: StructureND<Double>): BufferND<Double> = arg.map { sin(it) }
-    public override fun cos(arg: StructureND<Double>): BufferND<Double> = arg.map { cos(it) }
-    public override fun tan(arg: StructureND<Double>): BufferND<Double> = arg.map { tan(it) }
-    public override fun asin(arg: StructureND<Double>): BufferND<Double> = arg.map { asin(it) }
-    public override fun acos(arg: StructureND<Double>): BufferND<Double> = arg.map { acos(it) }
-    public override fun atan(arg: StructureND<Double>): BufferND<Double> = arg.map { atan(it) }
+    override fun sin(arg: StructureND<Double>): BufferND<Double> = arg.map { sin(it) }
+    override fun cos(arg: StructureND<Double>): BufferND<Double> = arg.map { cos(it) }
+    override fun tan(arg: StructureND<Double>): BufferND<Double> = arg.map { tan(it) }
+    override fun asin(arg: StructureND<Double>): BufferND<Double> = arg.map { asin(it) }
+    override fun acos(arg: StructureND<Double>): BufferND<Double> = arg.map { acos(it) }
+    override fun atan(arg: StructureND<Double>): BufferND<Double> = arg.map { atan(it) }
 
-    public override fun sinh(arg: StructureND<Double>): BufferND<Double> = arg.map { sinh(it) }
-    public override fun cosh(arg: StructureND<Double>): BufferND<Double> = arg.map { cosh(it) }
-    public override fun tanh(arg: StructureND<Double>): BufferND<Double> = arg.map { tanh(it) }
-    public override fun asinh(arg: StructureND<Double>): BufferND<Double> = arg.map { asinh(it) }
-    public override fun acosh(arg: StructureND<Double>): BufferND<Double> = arg.map { acosh(it) }
-    public override fun atanh(arg: StructureND<Double>): BufferND<Double> = arg.map { atanh(it) }
+    override fun sinh(arg: StructureND<Double>): BufferND<Double> = arg.map { sinh(it) }
+    override fun cosh(arg: StructureND<Double>): BufferND<Double> = arg.map { cosh(it) }
+    override fun tanh(arg: StructureND<Double>): BufferND<Double> = arg.map { tanh(it) }
+    override fun asinh(arg: StructureND<Double>): BufferND<Double> = arg.map { asinh(it) }
+    override fun acosh(arg: StructureND<Double>): BufferND<Double> = arg.map { acosh(it) }
+    override fun atanh(arg: StructureND<Double>): BufferND<Double> = arg.map { atanh(it) }
 }
 
 public fun AlgebraND.Companion.real(vararg shape: Int): DoubleFieldND = DoubleFieldND(shape)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index 150ebf6fb..d916bc0d6 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -16,14 +16,14 @@ import kotlin.jvm.JvmInline
  * A structure that is guaranteed to be one-dimensional
  */
 public interface Structure1D<out T> : StructureND<T>, Buffer<T> {
-    public override val dimension: Int get() = 1
+    override val dimension: Int get() = 1
 
-    public override operator fun get(index: IntArray): T {
+    override operator fun get(index: IntArray): T {
         require(index.size == 1) { "Index dimension mismatch. Expected 1 but found ${index.size}" }
         return get(index[0])
     }
 
-    public override operator fun iterator(): Iterator<T> = (0 until size).asSequence().map(::get).iterator()
+    override operator fun iterator(): Iterator<T> = (0 until size).asSequence().map(::get).iterator()
 
     public companion object
 }
@@ -32,7 +32,7 @@ public interface Structure1D<out T> : StructureND<T>, Buffer<T> {
  * A mutable structure that is guaranteed to be one-dimensional
  */
 public interface MutableStructure1D<T> : Structure1D<T>, MutableStructureND<T>, MutableBuffer<T> {
-    public override operator fun set(index: IntArray, value: T) {
+    override operator fun set(index: IntArray, value: T) {
         require(index.size == 1) { "Index dimension mismatch. Expected 1 but found ${index.size}" }
         set(index[0], value)
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index f353b6974..cb69bdc00 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -29,7 +29,7 @@ public interface Structure2D<out T> : StructureND<T> {
      */
     public val colNum: Int
 
-    public override val shape: IntArray get() = intArrayOf(rowNum, colNum)
+    override val shape: IntArray get() = intArrayOf(rowNum, colNum)
 
     /**
      * The buffer of rows of this structure. It gets elements from the structure dynamically.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index 3a1ec430e..cef34dce2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -166,13 +166,13 @@ public interface GroupOperations<T> : Algebra<T> {
      */
     public operator fun T.minus(b: T): T = add(this, -b)
 
-    public override fun unaryOperationFunction(operation: String): (arg: T) -> T = when (operation) {
+    override fun unaryOperationFunction(operation: String): (arg: T) -> T = when (operation) {
         PLUS_OPERATION -> { arg -> +arg }
         MINUS_OPERATION -> { arg -> -arg }
         else -> super.unaryOperationFunction(operation)
     }
 
-    public override fun binaryOperationFunction(operation: String): (left: T, right: T) -> T = when (operation) {
+    override fun binaryOperationFunction(operation: String): (left: T, right: T) -> T = when (operation) {
         PLUS_OPERATION -> ::add
         MINUS_OPERATION -> { left, right -> left - right }
         else -> super.binaryOperationFunction(operation)
@@ -226,7 +226,7 @@ public interface RingOperations<T> : GroupOperations<T> {
      */
     public operator fun T.times(b: T): T = multiply(this, b)
 
-    public override fun binaryOperationFunction(operation: String): (left: T, right: T) -> T = when (operation) {
+    override fun binaryOperationFunction(operation: String): (left: T, right: T) -> T = when (operation) {
         TIMES_OPERATION -> ::multiply
         else -> super.binaryOperationFunction(operation)
     }
@@ -277,7 +277,7 @@ public interface FieldOperations<T> : RingOperations<T> {
      */
     public operator fun T.div(b: T): T = divide(this, b)
 
-    public override fun binaryOperationFunction(operation: String): (left: T, right: T) -> T = when (operation) {
+    override fun binaryOperationFunction(operation: String): (left: T, right: T) -> T = when (operation) {
         DIV_OPERATION -> ::divide
         else -> super.binaryOperationFunction(operation)
     }
@@ -298,5 +298,5 @@ public interface FieldOperations<T> : RingOperations<T> {
  * @param T the type of element of this field.
  */
 public interface Field<T> : Ring<T>, FieldOperations<T>, ScaleOperations<T>, NumericAlgebra<T> {
-    public override fun number(value: Number): T = scale(one, value.toDouble())
+    override fun number(value: Number): T = scale(one, value.toDouble())
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index c332b086e..4ccbfc531 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -49,16 +49,16 @@ public class BigInt internal constructor(
     private val sign: Byte,
     private val magnitude: Magnitude,
 ) : Comparable<BigInt> {
-    public override fun compareTo(other: BigInt): Int = when {
+    override fun compareTo(other: BigInt): Int = when {
         (sign == 0.toByte()) and (other.sign == 0.toByte()) -> 0
         sign < other.sign -> -1
         sign > other.sign -> 1
         else -> sign * compareMagnitudes(magnitude, other.magnitude)
     }
 
-    public override fun equals(other: Any?): Boolean = other is BigInt && compareTo(other) == 0
+    override fun equals(other: Any?): Boolean = other is BigInt && compareTo(other) == 0
 
-    public override fun hashCode(): Int = magnitude.hashCode() + sign
+    override fun hashCode(): Int = magnitude.hashCode() + sign
 
     public fun abs(): BigInt = if (sign == 0.toByte()) this else BigInt(1, magnitude)
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
index deeb07e0e..7a8fa5668 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
@@ -87,7 +87,7 @@ public interface NumericAlgebra<T> : Algebra<T> {
     public fun rightSideNumberOperation(operation: String, left: T, right: Number): T =
         rightSideNumberOperationFunction(operation)(left, right)
 
-    public override fun bindSymbolOrNull(value: String): T? = when (value) {
+    override fun bindSymbolOrNull(value: String): T? = when (value) {
         "pi" -> number(PI)
         "e" -> number(E)
         else -> super.bindSymbolOrNull(value)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index 36c13d6ec..19cb5f25c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -15,10 +15,10 @@ public interface ExtendedFieldOperations<T> :
     TrigonometricOperations<T>,
     PowerOperations<T>,
     ExponentialOperations<T> {
-    public override fun tan(arg: T): T = sin(arg) / cos(arg)
-    public override fun tanh(arg: T): T = sinh(arg) / cosh(arg)
+    override fun tan(arg: T): T = sin(arg) / cos(arg)
+    override fun tanh(arg: T): T = sinh(arg) / cosh(arg)
 
-    public override fun unaryOperationFunction(operation: String): (arg: T) -> T = when (operation) {
+    override fun unaryOperationFunction(operation: String): (arg: T) -> T = when (operation) {
         TrigonometricOperations.COS_OPERATION -> ::cos
         TrigonometricOperations.SIN_OPERATION -> ::sin
         TrigonometricOperations.TAN_OPERATION -> ::tan
@@ -42,14 +42,14 @@ public interface ExtendedFieldOperations<T> :
  * Advanced Number-like field that implements basic operations.
  */
 public interface ExtendedField<T> : ExtendedFieldOperations<T>, Field<T>, NumericAlgebra<T>, ScaleOperations<T> {
-    public override fun sinh(arg: T): T = (exp(arg) - exp(-arg)) / 2.0
-    public override fun cosh(arg: T): T = (exp(arg) + exp(-arg)) / 2.0
-    public override fun tanh(arg: T): T = (exp(arg) - exp(-arg)) / (exp(-arg) + exp(arg))
-    public override fun asinh(arg: T): T = ln(sqrt(arg * arg + one) + arg)
-    public override fun acosh(arg: T): T = ln(arg + sqrt((arg - one) * (arg + one)))
-    public override fun atanh(arg: T): T = (ln(arg + one) - ln(one - arg)) / 2.0
+    override fun sinh(arg: T): T = (exp(arg) - exp(-arg)) / 2.0
+    override fun cosh(arg: T): T = (exp(arg) + exp(-arg)) / 2.0
+    override fun tanh(arg: T): T = (exp(arg) - exp(-arg)) / (exp(-arg) + exp(arg))
+    override fun asinh(arg: T): T = ln(sqrt(arg * arg + one) + arg)
+    override fun acosh(arg: T): T = ln(arg + sqrt((arg - one) * (arg + one)))
+    override fun atanh(arg: T): T = (ln(arg + one) - ln(one - arg)) / 2.0
 
-    public override fun rightSideNumberOperationFunction(operation: String): (left: T, right: Number) -> T =
+    override fun rightSideNumberOperationFunction(operation: String): (left: T, right: Number) -> T =
         when (operation) {
             PowerOperations.POW_OPERATION -> ::power
             else -> super<Field>.rightSideNumberOperationFunction(operation)
@@ -61,50 +61,50 @@ public interface ExtendedField<T> : ExtendedFieldOperations<T>, Field<T>, Numeri
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
-    public override inline val zero: Double get() = 0.0
-    public override inline val one: Double get() = 1.0
+    override inline val zero: Double get() = 0.0
+    override inline val one: Double get() = 1.0
 
-    public override inline fun number(value: Number): Double = value.toDouble()
+    override inline fun number(value: Number): Double = value.toDouble()
 
-    public override fun binaryOperationFunction(operation: String): (left: Double, right: Double) -> Double =
+    override fun binaryOperationFunction(operation: String): (left: Double, right: Double) -> Double =
         when (operation) {
             PowerOperations.POW_OPERATION -> ::power
             else -> super<ExtendedField>.binaryOperationFunction(operation)
         }
 
-    public override inline fun add(a: Double, b: Double): Double = a + b
+    override inline fun add(a: Double, b: Double): Double = a + b
 
-    public override inline fun multiply(a: Double, b: Double): Double = a * b
-    public override inline fun divide(a: Double, b: Double): Double = a / b
+    override inline fun multiply(a: Double, b: Double): Double = a * b
+    override inline fun divide(a: Double, b: Double): Double = a / b
 
-    public override inline fun scale(a: Double, value: Double): Double = a * value
+    override inline fun scale(a: Double, value: Double): Double = a * value
 
-    public override inline fun sin(arg: Double): Double = kotlin.math.sin(arg)
-    public override inline fun cos(arg: Double): Double = kotlin.math.cos(arg)
-    public override inline fun tan(arg: Double): Double = kotlin.math.tan(arg)
-    public override inline fun acos(arg: Double): Double = kotlin.math.acos(arg)
-    public override inline fun asin(arg: Double): Double = kotlin.math.asin(arg)
-    public override inline fun atan(arg: Double): Double = kotlin.math.atan(arg)
+    override inline fun sin(arg: Double): Double = kotlin.math.sin(arg)
+    override inline fun cos(arg: Double): Double = kotlin.math.cos(arg)
+    override inline fun tan(arg: Double): Double = kotlin.math.tan(arg)
+    override inline fun acos(arg: Double): Double = kotlin.math.acos(arg)
+    override inline fun asin(arg: Double): Double = kotlin.math.asin(arg)
+    override inline fun atan(arg: Double): Double = kotlin.math.atan(arg)
 
-    public override inline fun sinh(arg: Double): Double = kotlin.math.sinh(arg)
-    public override inline fun cosh(arg: Double): Double = kotlin.math.cosh(arg)
-    public override inline fun tanh(arg: Double): Double = kotlin.math.tanh(arg)
-    public override inline fun asinh(arg: Double): Double = kotlin.math.asinh(arg)
-    public override inline fun acosh(arg: Double): Double = kotlin.math.acosh(arg)
-    public override inline fun atanh(arg: Double): Double = kotlin.math.atanh(arg)
+    override inline fun sinh(arg: Double): Double = kotlin.math.sinh(arg)
+    override inline fun cosh(arg: Double): Double = kotlin.math.cosh(arg)
+    override inline fun tanh(arg: Double): Double = kotlin.math.tanh(arg)
+    override inline fun asinh(arg: Double): Double = kotlin.math.asinh(arg)
+    override inline fun acosh(arg: Double): Double = kotlin.math.acosh(arg)
+    override inline fun atanh(arg: Double): Double = kotlin.math.atanh(arg)
 
-    public override inline fun sqrt(arg: Double): Double = kotlin.math.sqrt(arg)
-    public override inline fun power(arg: Double, pow: Number): Double = arg.kpow(pow.toDouble())
-    public override inline fun exp(arg: Double): Double = kotlin.math.exp(arg)
-    public override inline fun ln(arg: Double): Double = kotlin.math.ln(arg)
+    override inline fun sqrt(arg: Double): Double = kotlin.math.sqrt(arg)
+    override inline fun power(arg: Double, pow: Number): Double = arg.kpow(pow.toDouble())
+    override inline fun exp(arg: Double): Double = kotlin.math.exp(arg)
+    override inline fun ln(arg: Double): Double = kotlin.math.ln(arg)
 
-    public override inline fun norm(arg: Double): Double = abs(arg)
+    override inline fun norm(arg: Double): Double = abs(arg)
 
-    public override inline fun Double.unaryMinus(): Double = -this
-    public override inline fun Double.plus(b: Double): Double = this + b
-    public override inline fun Double.minus(b: Double): Double = this - b
-    public override inline fun Double.times(b: Double): Double = this * b
-    public override inline fun Double.div(b: Double): Double = this / b
+    override inline fun Double.unaryMinus(): Double = -this
+    override inline fun Double.plus(b: Double): Double = this + b
+    override inline fun Double.minus(b: Double): Double = this - b
+    override inline fun Double.times(b: Double): Double = this * b
+    override inline fun Double.div(b: Double): Double = this / b
 }
 
 /**
@@ -112,50 +112,50 @@ public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOp
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object FloatField : ExtendedField<Float>, Norm<Float, Float> {
-    public override inline val zero: Float get() = 0.0f
-    public override inline val one: Float get() = 1.0f
+    override inline val zero: Float get() = 0.0f
+    override inline val one: Float get() = 1.0f
 
-    public override fun number(value: Number): Float = value.toFloat()
+    override fun number(value: Number): Float = value.toFloat()
 
-    public override fun binaryOperationFunction(operation: String): (left: Float, right: Float) -> Float =
+    override fun binaryOperationFunction(operation: String): (left: Float, right: Float) -> Float =
         when (operation) {
             PowerOperations.POW_OPERATION -> ::power
             else -> super.binaryOperationFunction(operation)
         }
 
-    public override inline fun add(a: Float, b: Float): Float = a + b
-    public override fun scale(a: Float, value: Double): Float = a * value.toFloat()
+    override inline fun add(a: Float, b: Float): Float = a + b
+    override fun scale(a: Float, value: Double): Float = a * value.toFloat()
 
-    public override inline fun multiply(a: Float, b: Float): Float = a * b
+    override inline fun multiply(a: Float, b: Float): Float = a * b
 
-    public override inline fun divide(a: Float, b: Float): Float = a / b
+    override inline fun divide(a: Float, b: Float): Float = a / b
 
-    public override inline fun sin(arg: Float): Float = kotlin.math.sin(arg)
-    public override inline fun cos(arg: Float): Float = kotlin.math.cos(arg)
-    public override inline fun tan(arg: Float): Float = kotlin.math.tan(arg)
-    public override inline fun acos(arg: Float): Float = kotlin.math.acos(arg)
-    public override inline fun asin(arg: Float): Float = kotlin.math.asin(arg)
-    public override inline fun atan(arg: Float): Float = kotlin.math.atan(arg)
+    override inline fun sin(arg: Float): Float = kotlin.math.sin(arg)
+    override inline fun cos(arg: Float): Float = kotlin.math.cos(arg)
+    override inline fun tan(arg: Float): Float = kotlin.math.tan(arg)
+    override inline fun acos(arg: Float): Float = kotlin.math.acos(arg)
+    override inline fun asin(arg: Float): Float = kotlin.math.asin(arg)
+    override inline fun atan(arg: Float): Float = kotlin.math.atan(arg)
 
-    public override inline fun sinh(arg: Float): Float = kotlin.math.sinh(arg)
-    public override inline fun cosh(arg: Float): Float = kotlin.math.cosh(arg)
-    public override inline fun tanh(arg: Float): Float = kotlin.math.tanh(arg)
-    public override inline fun asinh(arg: Float): Float = kotlin.math.asinh(arg)
-    public override inline fun acosh(arg: Float): Float = kotlin.math.acosh(arg)
-    public override inline fun atanh(arg: Float): Float = kotlin.math.atanh(arg)
+    override inline fun sinh(arg: Float): Float = kotlin.math.sinh(arg)
+    override inline fun cosh(arg: Float): Float = kotlin.math.cosh(arg)
+    override inline fun tanh(arg: Float): Float = kotlin.math.tanh(arg)
+    override inline fun asinh(arg: Float): Float = kotlin.math.asinh(arg)
+    override inline fun acosh(arg: Float): Float = kotlin.math.acosh(arg)
+    override inline fun atanh(arg: Float): Float = kotlin.math.atanh(arg)
 
-    public override inline fun sqrt(arg: Float): Float = kotlin.math.sqrt(arg)
-    public override inline fun power(arg: Float, pow: Number): Float = arg.kpow(pow.toFloat())
-    public override inline fun exp(arg: Float): Float = kotlin.math.exp(arg)
-    public override inline fun ln(arg: Float): Float = kotlin.math.ln(arg)
+    override inline fun sqrt(arg: Float): Float = kotlin.math.sqrt(arg)
+    override inline fun power(arg: Float, pow: Number): Float = arg.kpow(pow.toFloat())
+    override inline fun exp(arg: Float): Float = kotlin.math.exp(arg)
+    override inline fun ln(arg: Float): Float = kotlin.math.ln(arg)
 
-    public override inline fun norm(arg: Float): Float = abs(arg)
+    override inline fun norm(arg: Float): Float = abs(arg)
 
-    public override inline fun Float.unaryMinus(): Float = -this
-    public override inline fun Float.plus(b: Float): Float = this + b
-    public override inline fun Float.minus(b: Float): Float = this - b
-    public override inline fun Float.times(b: Float): Float = this * b
-    public override inline fun Float.div(b: Float): Float = this / b
+    override inline fun Float.unaryMinus(): Float = -this
+    override inline fun Float.plus(b: Float): Float = this + b
+    override inline fun Float.minus(b: Float): Float = this - b
+    override inline fun Float.times(b: Float): Float = this * b
+    override inline fun Float.div(b: Float): Float = this / b
 }
 
 /**
@@ -163,21 +163,21 @@ public object FloatField : ExtendedField<Float>, Norm<Float, Float> {
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object IntRing : Ring<Int>, Norm<Int, Int>, NumericAlgebra<Int> {
-    public override inline val zero: Int
+    override inline val zero: Int
         get() = 0
 
-    public override inline val one: Int
+    override inline val one: Int
         get() = 1
 
-    public override fun number(value: Number): Int = value.toInt()
-    public override inline fun add(a: Int, b: Int): Int = a + b
-    public override inline fun multiply(a: Int, b: Int): Int = a * b
-    public override inline fun norm(arg: Int): Int = abs(arg)
+    override fun number(value: Number): Int = value.toInt()
+    override inline fun add(a: Int, b: Int): Int = a + b
+    override inline fun multiply(a: Int, b: Int): Int = a * b
+    override inline fun norm(arg: Int): Int = abs(arg)
 
-    public override inline fun Int.unaryMinus(): Int = -this
-    public override inline fun Int.plus(b: Int): Int = this + b
-    public override inline fun Int.minus(b: Int): Int = this - b
-    public override inline fun Int.times(b: Int): Int = this * b
+    override inline fun Int.unaryMinus(): Int = -this
+    override inline fun Int.plus(b: Int): Int = this + b
+    override inline fun Int.minus(b: Int): Int = this - b
+    override inline fun Int.times(b: Int): Int = this * b
 }
 
 /**
@@ -185,21 +185,21 @@ public object IntRing : Ring<Int>, Norm<Int, Int>, NumericAlgebra<Int> {
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object ShortRing : Ring<Short>, Norm<Short, Short>, NumericAlgebra<Short> {
-    public override inline val zero: Short
+    override inline val zero: Short
         get() = 0
 
-    public override inline val one: Short
+    override inline val one: Short
         get() = 1
 
-    public override fun number(value: Number): Short = value.toShort()
-    public override inline fun add(a: Short, b: Short): Short = (a + b).toShort()
-    public override inline fun multiply(a: Short, b: Short): Short = (a * b).toShort()
-    public override fun norm(arg: Short): Short = if (arg > 0) arg else (-arg).toShort()
+    override fun number(value: Number): Short = value.toShort()
+    override inline fun add(a: Short, b: Short): Short = (a + b).toShort()
+    override inline fun multiply(a: Short, b: Short): Short = (a * b).toShort()
+    override fun norm(arg: Short): Short = if (arg > 0) arg else (-arg).toShort()
 
-    public override inline fun Short.unaryMinus(): Short = (-this).toShort()
-    public override inline fun Short.plus(b: Short): Short = (this + b).toShort()
-    public override inline fun Short.minus(b: Short): Short = (this - b).toShort()
-    public override inline fun Short.times(b: Short): Short = (this * b).toShort()
+    override inline fun Short.unaryMinus(): Short = (-this).toShort()
+    override inline fun Short.plus(b: Short): Short = (this + b).toShort()
+    override inline fun Short.minus(b: Short): Short = (this - b).toShort()
+    override inline fun Short.times(b: Short): Short = (this * b).toShort()
 }
 
 /**
@@ -207,21 +207,21 @@ public object ShortRing : Ring<Short>, Norm<Short, Short>, NumericAlgebra<Short>
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object ByteRing : Ring<Byte>, Norm<Byte, Byte>, NumericAlgebra<Byte> {
-    public override inline val zero: Byte
+    override inline val zero: Byte
         get() = 0
 
-    public override inline val one: Byte
+    override inline val one: Byte
         get() = 1
 
-    public override fun number(value: Number): Byte = value.toByte()
-    public override inline fun add(a: Byte, b: Byte): Byte = (a + b).toByte()
-    public override inline fun multiply(a: Byte, b: Byte): Byte = (a * b).toByte()
-    public override fun norm(arg: Byte): Byte = if (arg > 0) arg else (-arg).toByte()
+    override fun number(value: Number): Byte = value.toByte()
+    override inline fun add(a: Byte, b: Byte): Byte = (a + b).toByte()
+    override inline fun multiply(a: Byte, b: Byte): Byte = (a * b).toByte()
+    override fun norm(arg: Byte): Byte = if (arg > 0) arg else (-arg).toByte()
 
-    public override inline fun Byte.unaryMinus(): Byte = (-this).toByte()
-    public override inline fun Byte.plus(b: Byte): Byte = (this + b).toByte()
-    public override inline fun Byte.minus(b: Byte): Byte = (this - b).toByte()
-    public override inline fun Byte.times(b: Byte): Byte = (this * b).toByte()
+    override inline fun Byte.unaryMinus(): Byte = (-this).toByte()
+    override inline fun Byte.plus(b: Byte): Byte = (this + b).toByte()
+    override inline fun Byte.minus(b: Byte): Byte = (this - b).toByte()
+    override inline fun Byte.times(b: Byte): Byte = (this * b).toByte()
 }
 
 /**
@@ -229,19 +229,19 @@ public object ByteRing : Ring<Byte>, Norm<Byte, Byte>, NumericAlgebra<Byte> {
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object LongRing : Ring<Long>, Norm<Long, Long>, NumericAlgebra<Long> {
-    public override inline val zero: Long
+    override inline val zero: Long
         get() = 0L
 
-    public override inline val one: Long
+    override inline val one: Long
         get() = 1L
 
-    public override fun number(value: Number): Long = value.toLong()
-    public override inline fun add(a: Long, b: Long): Long = a + b
-    public override inline fun multiply(a: Long, b: Long): Long = a * b
-    public override fun norm(arg: Long): Long = abs(arg)
+    override fun number(value: Number): Long = value.toLong()
+    override inline fun add(a: Long, b: Long): Long = a + b
+    override inline fun multiply(a: Long, b: Long): Long = a * b
+    override fun norm(arg: Long): Long = abs(arg)
 
-    public override inline fun Long.unaryMinus(): Long = (-this)
-    public override inline fun Long.plus(b: Long): Long = (this + b)
-    public override inline fun Long.minus(b: Long): Long = (this - b)
-    public override inline fun Long.times(b: Long): Long = (this * b)
+    override inline fun Long.unaryMinus(): Long = (-this)
+    override inline fun Long.plus(b: Long): Long = (this + b)
+    override inline fun Long.minus(b: Long): Long = (this - b)
+    override inline fun Long.times(b: Long): Long = (this * b)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
index 34b5e373b..c83496853 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
@@ -19,7 +19,7 @@ public object DoubleBufferFieldOperations : ExtendedFieldOperations<Buffer<Doubl
         DoubleBuffer(size) { -get(it) }
     }
 
-    public override fun add(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
+    override fun add(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
         require(b.size == a.size) {
             "The size of the first buffer ${a.size} should be the same as for second one: ${b.size} "
         }
@@ -31,7 +31,7 @@ public object DoubleBufferFieldOperations : ExtendedFieldOperations<Buffer<Doubl
         } else DoubleBuffer(DoubleArray(a.size) { a[it] + b[it] })
     }
 //
-//    public override fun multiply(a: Buffer<Double>, k: Number): RealBuffer {
+//    override fun multiply(a: Buffer<Double>, k: Number): RealBuffer {
 //        val kValue = k.toDouble()
 //
 //        return if (a is RealBuffer) {
@@ -40,7 +40,7 @@ public object DoubleBufferFieldOperations : ExtendedFieldOperations<Buffer<Doubl
 //        } else RealBuffer(DoubleArray(a.size) { a[it] * kValue })
 //    }
 //
-//    public override fun divide(a: Buffer<Double>, k: Number): RealBuffer {
+//    override fun divide(a: Buffer<Double>, k: Number): RealBuffer {
 //        val kValue = k.toDouble()
 //
 //        return if (a is RealBuffer) {
@@ -49,7 +49,7 @@ public object DoubleBufferFieldOperations : ExtendedFieldOperations<Buffer<Doubl
 //        } else RealBuffer(DoubleArray(a.size) { a[it] / kValue })
 //    }
 
-    public override fun multiply(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
+    override fun multiply(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
         require(b.size == a.size) {
             "The size of the first buffer ${a.size} should be the same as for second one: ${b.size} "
         }
@@ -62,7 +62,7 @@ public object DoubleBufferFieldOperations : ExtendedFieldOperations<Buffer<Doubl
             DoubleBuffer(DoubleArray(a.size) { a[it] * b[it] })
     }
 
-    public override fun divide(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
+    override fun divide(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
         require(b.size == a.size) {
             "The size of the first buffer ${a.size} should be the same as for second one: ${b.size} "
         }
@@ -74,87 +74,87 @@ public object DoubleBufferFieldOperations : ExtendedFieldOperations<Buffer<Doubl
         } else DoubleBuffer(DoubleArray(a.size) { a[it] / b[it] })
     }
 
-    public override fun sin(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun sin(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { sin(array[it]) })
     } else DoubleBuffer(DoubleArray(arg.size) { sin(arg[it]) })
 
-    public override fun cos(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun cos(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { cos(array[it]) })
     } else DoubleBuffer(DoubleArray(arg.size) { cos(arg[it]) })
 
-    public override fun tan(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun tan(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { tan(array[it]) })
     } else DoubleBuffer(DoubleArray(arg.size) { tan(arg[it]) })
 
-    public override fun asin(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun asin(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { asin(array[it]) })
     } else
         DoubleBuffer(DoubleArray(arg.size) { asin(arg[it]) })
 
-    public override fun acos(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun acos(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { acos(array[it]) })
     } else
         DoubleBuffer(DoubleArray(arg.size) { acos(arg[it]) })
 
-    public override fun atan(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun atan(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { atan(array[it]) })
     } else
         DoubleBuffer(DoubleArray(arg.size) { atan(arg[it]) })
 
-    public override fun sinh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun sinh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { sinh(array[it]) })
     } else
         DoubleBuffer(DoubleArray(arg.size) { sinh(arg[it]) })
 
-    public override fun cosh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun cosh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { cosh(array[it]) })
     } else
         DoubleBuffer(DoubleArray(arg.size) { cosh(arg[it]) })
 
-    public override fun tanh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun tanh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { tanh(array[it]) })
     } else
         DoubleBuffer(DoubleArray(arg.size) { tanh(arg[it]) })
 
-    public override fun asinh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun asinh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { asinh(array[it]) })
     } else
         DoubleBuffer(DoubleArray(arg.size) { asinh(arg[it]) })
 
-    public override fun acosh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun acosh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { acosh(array[it]) })
     } else
         DoubleBuffer(DoubleArray(arg.size) { acosh(arg[it]) })
 
-    public override fun atanh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun atanh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { atanh(array[it]) })
     } else
         DoubleBuffer(DoubleArray(arg.size) { atanh(arg[it]) })
 
-    public override fun power(arg: Buffer<Double>, pow: Number): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun power(arg: Buffer<Double>, pow: Number): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { array[it].pow(pow.toDouble()) })
     } else
         DoubleBuffer(DoubleArray(arg.size) { arg[it].pow(pow.toDouble()) })
 
-    public override fun exp(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun exp(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { exp(array[it]) })
     } else DoubleBuffer(DoubleArray(arg.size) { exp(arg[it]) })
 
-    public override fun ln(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
+    override fun ln(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { ln(array[it]) })
     } else
@@ -167,8 +167,8 @@ public object DoubleBufferFieldOperations : ExtendedFieldOperations<Buffer<Doubl
  * @property size the size of buffers to operate on.
  */
 public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Double>> {
-    public override val zero: Buffer<Double> by lazy { DoubleBuffer(size) { 0.0 } }
-    public override val one: Buffer<Double> by lazy { DoubleBuffer(size) { 1.0 } }
+    override val zero: Buffer<Double> by lazy { DoubleBuffer(size) { 0.0 } }
+    override val one: Buffer<Double> by lazy { DoubleBuffer(size) { 1.0 } }
 
     override fun number(value: Number): Buffer<Double> = DoubleBuffer(size) { value.toDouble() }
 
@@ -176,12 +176,12 @@ public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Doub
         -this@unaryMinus
     }
 
-    public override fun add(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
+    override fun add(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
         require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
         return DoubleBufferFieldOperations.add(a, b)
     }
 
-    public override fun scale(a: Buffer<Double>, value: Double): DoubleBuffer {
+    override fun scale(a: Buffer<Double>, value: Double): DoubleBuffer {
         require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
 
         return if (a is DoubleBuffer) {
@@ -190,87 +190,87 @@ public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Doub
         } else DoubleBuffer(DoubleArray(a.size) { a[it] * value })
     }
 
-    public override fun multiply(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
+    override fun multiply(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
         require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
         return DoubleBufferFieldOperations.multiply(a, b)
     }
 
-    public override fun divide(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
+    override fun divide(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
         require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
         return DoubleBufferFieldOperations.divide(a, b)
     }
 
-    public override fun sin(arg: Buffer<Double>): DoubleBuffer {
+    override fun sin(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.sin(arg)
     }
 
-    public override fun cos(arg: Buffer<Double>): DoubleBuffer {
+    override fun cos(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.cos(arg)
     }
 
-    public override fun tan(arg: Buffer<Double>): DoubleBuffer {
+    override fun tan(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.tan(arg)
     }
 
-    public override fun asin(arg: Buffer<Double>): DoubleBuffer {
+    override fun asin(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.asin(arg)
     }
 
-    public override fun acos(arg: Buffer<Double>): DoubleBuffer {
+    override fun acos(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.acos(arg)
     }
 
-    public override fun atan(arg: Buffer<Double>): DoubleBuffer {
+    override fun atan(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.atan(arg)
     }
 
-    public override fun sinh(arg: Buffer<Double>): DoubleBuffer {
+    override fun sinh(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.sinh(arg)
     }
 
-    public override fun cosh(arg: Buffer<Double>): DoubleBuffer {
+    override fun cosh(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.cosh(arg)
     }
 
-    public override fun tanh(arg: Buffer<Double>): DoubleBuffer {
+    override fun tanh(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.tanh(arg)
     }
 
-    public override fun asinh(arg: Buffer<Double>): DoubleBuffer {
+    override fun asinh(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.asinh(arg)
     }
 
-    public override fun acosh(arg: Buffer<Double>): DoubleBuffer {
+    override fun acosh(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.acosh(arg)
     }
 
-    public override fun atanh(arg: Buffer<Double>): DoubleBuffer {
+    override fun atanh(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.atanh(arg)
     }
 
-    public override fun power(arg: Buffer<Double>, pow: Number): DoubleBuffer {
+    override fun power(arg: Buffer<Double>, pow: Number): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.power(arg, pow)
     }
 
-    public override fun exp(arg: Buffer<Double>): DoubleBuffer {
+    override fun exp(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.exp(arg)
     }
 
-    public override fun ln(arg: Buffer<Double>): DoubleBuffer {
+    override fun ln(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
         return DoubleBufferFieldOperations.ln(arg)
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
index 8c98ab9c8..5d660c8cb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
@@ -48,8 +48,8 @@ public class MutableMemoryBuffer<T : Any>(memory: Memory, spec: MemorySpec<T>) :
 
     private val writer: MemoryWriter = memory.writer()
 
-    public override operator fun set(index: Int, value: T): Unit = writer.write(spec, spec.objectSize * index, value)
-    public override fun copy(): MutableBuffer<T> = MutableMemoryBuffer(memory.copy(), spec)
+    override operator fun set(index: Int, value: T): Unit = writer.write(spec, spec.objectSize * index, value)
+    override fun copy(): MutableBuffer<T> = MutableMemoryBuffer(memory.copy(), spec)
 
     public companion object {
         public fun <T : Any> create(spec: MemorySpec<T>, size: Int): MutableMemoryBuffer<T> =
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
index 3d4c68b3c..8dadecff7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
@@ -14,16 +14,16 @@ import kotlin.jvm.JvmInline
  */
 @JvmInline
 public value class ShortBuffer(public val array: ShortArray) : MutableBuffer<Short> {
-    public override val size: Int get() = array.size
+    override val size: Int get() = array.size
 
-    public override operator fun get(index: Int): Short = array[index]
+    override operator fun get(index: Int): Short = array[index]
 
-    public override operator fun set(index: Int, value: Short) {
+    override operator fun set(index: Int, value: Short) {
         array[index] = value
     }
 
-    public override operator fun iterator(): ShortIterator = array.iterator()
-    public override fun copy(): MutableBuffer<Short> = ShortBuffer(array.copyOf())
+    override operator fun iterator(): ShortIterator = array.iterator()
+    override fun copy(): MutableBuffer<Short> = ShortBuffer(array.copyOf())
 }
 
 /**
diff --git a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
index 9b46369bb..7ac2c6f83 100644
--- a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
+++ b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
@@ -13,16 +13,16 @@ import java.math.MathContext
  * A field over [BigInteger].
  */
 public object JBigIntegerField : Ring<BigInteger>, NumericAlgebra<BigInteger> {
-    public override val zero: BigInteger get() = BigInteger.ZERO
+    override val zero: BigInteger get() = BigInteger.ZERO
 
-    public override val one: BigInteger get() = BigInteger.ONE
+    override val one: BigInteger get() = BigInteger.ONE
 
-    public override fun number(value: Number): BigInteger = BigInteger.valueOf(value.toLong())
-    public override fun add(a: BigInteger, b: BigInteger): BigInteger = a.add(b)
-    public override operator fun BigInteger.minus(b: BigInteger): BigInteger = subtract(b)
-    public override fun multiply(a: BigInteger, b: BigInteger): BigInteger = a.multiply(b)
+    override fun number(value: Number): BigInteger = BigInteger.valueOf(value.toLong())
+    override fun add(a: BigInteger, b: BigInteger): BigInteger = a.add(b)
+    override operator fun BigInteger.minus(b: BigInteger): BigInteger = subtract(b)
+    override fun multiply(a: BigInteger, b: BigInteger): BigInteger = a.multiply(b)
 
-    public override operator fun BigInteger.unaryMinus(): BigInteger = negate()
+    override operator fun BigInteger.unaryMinus(): BigInteger = negate()
 }
 
 /**
@@ -33,24 +33,24 @@ public object JBigIntegerField : Ring<BigInteger>, NumericAlgebra<BigInteger> {
 public abstract class JBigDecimalFieldBase internal constructor(
     private val mathContext: MathContext = MathContext.DECIMAL64,
 ) : Field<BigDecimal>, PowerOperations<BigDecimal>, NumericAlgebra<BigDecimal>, ScaleOperations<BigDecimal> {
-    public override val zero: BigDecimal
+    override val zero: BigDecimal
         get() = BigDecimal.ZERO
 
-    public override val one: BigDecimal
+    override val one: BigDecimal
         get() = BigDecimal.ONE
 
-    public override fun add(a: BigDecimal, b: BigDecimal): BigDecimal = a.add(b)
-    public override operator fun BigDecimal.minus(b: BigDecimal): BigDecimal = subtract(b)
-    public override fun number(value: Number): BigDecimal = BigDecimal.valueOf(value.toDouble())
+    override fun add(a: BigDecimal, b: BigDecimal): BigDecimal = a.add(b)
+    override operator fun BigDecimal.minus(b: BigDecimal): BigDecimal = subtract(b)
+    override fun number(value: Number): BigDecimal = BigDecimal.valueOf(value.toDouble())
 
-    public override fun scale(a: BigDecimal, value: Double): BigDecimal =
+    override fun scale(a: BigDecimal, value: Double): BigDecimal =
         a.multiply(value.toBigDecimal(mathContext), mathContext)
 
-    public override fun multiply(a: BigDecimal, b: BigDecimal): BigDecimal = a.multiply(b, mathContext)
-    public override fun divide(a: BigDecimal, b: BigDecimal): BigDecimal = a.divide(b, mathContext)
-    public override fun power(arg: BigDecimal, pow: Number): BigDecimal = arg.pow(pow.toInt(), mathContext)
-    public override fun sqrt(arg: BigDecimal): BigDecimal = arg.sqrt(mathContext)
-    public override operator fun BigDecimal.unaryMinus(): BigDecimal = negate(mathContext)
+    override fun multiply(a: BigDecimal, b: BigDecimal): BigDecimal = a.multiply(b, mathContext)
+    override fun divide(a: BigDecimal, b: BigDecimal): BigDecimal = a.divide(b, mathContext)
+    override fun power(arg: BigDecimal, pow: Number): BigDecimal = arg.pow(pow.toInt(), mathContext)
+    override fun sqrt(arg: BigDecimal): BigDecimal = arg.sqrt(mathContext)
+    override operator fun BigDecimal.unaryMinus(): BigDecimal = negate(mathContext)
 }
 
 /**
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt
index 70849f942..87aebff61 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt
@@ -32,9 +32,9 @@ public interface BlockingBufferChain<out T> : BlockingChain<T>, BufferChain<T> {
 
     public fun nextBufferBlocking(size: Int): Buffer<T>
 
-    public override fun nextBlocking(): T = nextBufferBlocking(1)[0]
+    override fun nextBlocking(): T = nextBufferBlocking(1)[0]
 
-    public override suspend fun nextBuffer(size: Int): Buffer<T> = nextBufferBlocking(size)
+    override suspend fun nextBuffer(size: Int): Buffer<T> = nextBufferBlocking(size)
 
     override suspend fun fork(): BlockingBufferChain<T>
 }
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
index 88456e124..25e20291e 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
@@ -15,7 +15,7 @@ public interface BlockingDoubleChain : BlockingBufferChain<Double> {
     /**
      * Returns an [DoubleArray] chunk of [size] values of [next].
      */
-    public override fun nextBufferBlocking(size: Int): DoubleBuffer
+    override fun nextBufferBlocking(size: Int): DoubleBuffer
 
     override suspend fun fork(): BlockingDoubleChain
 
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
index b29165e32..8523ac864 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
@@ -39,8 +39,8 @@ public fun <T> Sequence<T>.asChain(): Chain<T> = iterator().asChain()
  * A simple chain of independent tokens. [fork] returns the same chain.
  */
 public class SimpleChain<out R>(private val gen: suspend () -> R) : Chain<R> {
-    public override suspend fun next(): R = gen()
-    public override suspend fun fork(): Chain<R> = this
+    override suspend fun next(): R = gen()
+    override suspend fun fork(): Chain<R> = this
 }
 
 /**
@@ -52,13 +52,13 @@ public class MarkovChain<out R : Any>(private val seed: suspend () -> R, private
 
     public fun value(): R? = value
 
-    public override suspend fun next(): R = mutex.withLock {
+    override suspend fun next(): R = mutex.withLock {
         val newValue = gen(value ?: seed())
         value = newValue
         newValue
     }
 
-    public override suspend fun fork(): Chain<R> = MarkovChain(seed = { value ?: seed() }, gen = gen)
+    override suspend fun fork(): Chain<R> = MarkovChain(seed = { value ?: seed() }, gen = gen)
 }
 
 /**
@@ -77,21 +77,21 @@ public class StatefulChain<S, out R>(
 
     public fun value(): R? = value
 
-    public override suspend fun next(): R = mutex.withLock {
+    override suspend fun next(): R = mutex.withLock {
         val newValue = state.gen(value ?: state.seed())
         value = newValue
         newValue
     }
 
-    public override suspend fun fork(): Chain<R> = StatefulChain(forkState(state), seed, forkState, gen)
+    override suspend fun fork(): Chain<R> = StatefulChain(forkState(state), seed, forkState, gen)
 }
 
 /**
  * A chain that repeats the same value
  */
 public class ConstantChain<out T>(public val value: T) : Chain<T> {
-    public override suspend fun next(): T = value
-    public override suspend fun fork(): Chain<T> = this
+    override suspend fun next(): T = value
+    override suspend fun fork(): Chain<T> = this
 }
 
 /**
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
index 05f2876e3..93c4a401b 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
@@ -22,10 +22,10 @@ public class RingBuffer<T>(
 ) : Buffer<T> {
     private val mutex: Mutex = Mutex()
 
-    public override var size: Int = size
+    override var size: Int = size
         private set
 
-    public override operator fun get(index: Int): T {
+    override operator fun get(index: Int): T {
         require(index >= 0) { "Index must be positive" }
         require(index < size) { "Index $index is out of circular buffer size $size" }
         return buffer[startIndex.forward(index)] as T
@@ -36,7 +36,7 @@ public class RingBuffer<T>(
     /**
      * Iterator could provide wrong results if buffer is changed in initialization (iteration is safe)
      */
-    public override operator fun iterator(): Iterator<T> = object : AbstractIterator<T>() {
+    override operator fun iterator(): Iterator<T> = object : AbstractIterator<T>() {
         private var count = size
         private var index = startIndex
         val copy = buffer.copy()
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
index ded8c9c44..f9ef62529 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
@@ -13,7 +13,7 @@ import space.kscience.kmath.nd.StructureND
 
 public class LazyStructureND<out T>(
     public val scope: CoroutineScope,
-    public override val shape: IntArray,
+    override val shape: IntArray,
     public val function: suspend (IntArray) -> T,
 ) : StructureND<T> {
     private val cache: MutableMap<IntArray, Deferred<T>> = HashMap()
@@ -23,10 +23,10 @@ public class LazyStructureND<out T>(
     }
 
     public suspend fun await(index: IntArray): T = deferred(index).await()
-    public override operator fun get(index: IntArray): T = runBlocking { deferred(index).await() }
+    override operator fun get(index: IntArray): T = runBlocking { deferred(index).await() }
 
     @OptIn(PerformancePitfall::class)
-    public override fun elements(): Sequence<Pair<IntArray, T>> {
+    override fun elements(): Sequence<Pair<IntArray, T>> {
         val strides = DefaultStrides(shape)
         val res = runBlocking { strides.indices().toList().map { index -> index to await(index) } }
         return res.asSequence()
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
index cec31eb7d..27fd3fc53 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
@@ -17,6 +17,6 @@ import space.kscience.kmath.nd.Structure2D
  * @author Iaroslav Postovalov
  */
 public abstract class EjmlMatrix<out T, out M : Matrix>(public open val origin: M) : Structure2D<T> {
-    public override val rowNum: Int get() = origin.numRows
-    public override val colNum: Int get() = origin.numCols
+    override val rowNum: Int get() = origin.numRows
+    override val colNum: Int get() = origin.numCols
 }
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
index 5d10d1fbb..37995c27e 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
@@ -17,10 +17,10 @@ import space.kscience.kmath.linear.Point
  * @author Iaroslav Postovalov
  */
 public abstract class EjmlVector<out T, out M : Matrix>(public open val origin: M) : Point<T> {
-    public override val size: Int
+    override val size: Int
         get() = origin.numCols
 
-    public override operator fun iterator(): Iterator<T> = object : Iterator<T> {
+    override operator fun iterator(): Iterator<T> = object : Iterator<T> {
         private var cursor: Int = 0
 
         override fun next(): T {
@@ -31,5 +31,5 @@ public abstract class EjmlVector<out T, out M : Matrix>(public open val origin:
         override fun hasNext(): Boolean = cursor < origin.numCols * origin.numRows
     }
 
-    public override fun toString(): String = "EjmlVector(origin=$origin)"
+    override fun toString(): String = "EjmlVector(origin=$origin)"
 }
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
index 139c55697..5de8fc8a5 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
@@ -34,37 +34,37 @@ import kotlin.reflect.cast
 /**
  * [EjmlVector] specialization for [Double].
  */
-public class EjmlDoubleVector<out M : DMatrix>(public override val origin: M) : EjmlVector<Double, M>(origin) {
+public class EjmlDoubleVector<out M : DMatrix>(override val origin: M) : EjmlVector<Double, M>(origin) {
     init {
         require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
     }
 
-    public override operator fun get(index: Int): Double = origin[0, index]
+    override operator fun get(index: Int): Double = origin[0, index]
 }
 
 /**
  * [EjmlVector] specialization for [Float].
  */
-public class EjmlFloatVector<out M : FMatrix>(public override val origin: M) : EjmlVector<Float, M>(origin) {
+public class EjmlFloatVector<out M : FMatrix>(override val origin: M) : EjmlVector<Float, M>(origin) {
     init {
         require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
     }
 
-    public override operator fun get(index: Int): Float = origin[0, index]
+    override operator fun get(index: Int): Float = origin[0, index]
 }
 
 /**
  * [EjmlMatrix] specialization for [Double].
  */
-public class EjmlDoubleMatrix<out M : DMatrix>(public override val origin: M) : EjmlMatrix<Double, M>(origin) {
-    public override operator fun get(i: Int, j: Int): Double = origin[i, j]
+public class EjmlDoubleMatrix<out M : DMatrix>(override val origin: M) : EjmlMatrix<Double, M>(origin) {
+    override operator fun get(i: Int, j: Int): Double = origin[i, j]
 }
 
 /**
  * [EjmlMatrix] specialization for [Float].
  */
-public class EjmlFloatMatrix<out M : FMatrix>(public override val origin: M) : EjmlMatrix<Float, M>(origin) {
-    public override operator fun get(i: Int, j: Int): Float = origin[i, j]
+public class EjmlFloatMatrix<out M : FMatrix>(override val origin: M) : EjmlMatrix<Float, M>(origin) {
+    override operator fun get(i: Int, j: Int): Float = origin[i, j]
 }
 
 /**
@@ -75,23 +75,23 @@ public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrix
     /**
      * The [DoubleField] reference.
      */
-    public override val elementAlgebra: DoubleField get() = DoubleField
+    override val elementAlgebra: DoubleField get() = DoubleField
 
     @Suppress("UNCHECKED_CAST")
-    public override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixRMaj> = when {
+    override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixRMaj> = when {
         this is EjmlDoubleMatrix<*> && origin is DMatrixRMaj -> this as EjmlDoubleMatrix<DMatrixRMaj>
         else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
     }
 
     @Suppress("UNCHECKED_CAST")
-    public override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixRMaj> = when {
+    override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixRMaj> = when {
         this is EjmlDoubleVector<*> && origin is DMatrixRMaj -> this as EjmlDoubleVector<DMatrixRMaj>
         else -> EjmlDoubleVector(DMatrixRMaj(size, 1).also {
             (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
         })
     }
 
-    public override fun buildMatrix(
+    override fun buildMatrix(
         rows: Int,
         columns: Int,
         initializer: DoubleField.(i: Int, j: Int) -> Double,
@@ -101,7 +101,7 @@ public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrix
         }
     }.wrapMatrix()
 
-    public override fun buildVector(
+    override fun buildVector(
         size: Int,
         initializer: DoubleField.(Int) -> Double,
     ): EjmlDoubleVector<DMatrixRMaj> = EjmlDoubleVector(DMatrixRMaj(size, 1).also {
@@ -111,21 +111,21 @@ public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrix
     private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
     private fun <T : DMatrix> T.wrapVector() = EjmlDoubleVector(this)
 
-    public override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
+    override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
 
-    public override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+    override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
         val out = DMatrixRMaj(1, 1)
         CommonOps_DDRM.mult(toEjml().origin, other.toEjml().origin, out)
         return out.wrapMatrix()
     }
 
-    public override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+    override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
         val out = DMatrixRMaj(1, 1)
         CommonOps_DDRM.mult(toEjml().origin, vector.toEjml().origin, out)
         return out.wrapVector()
     }
 
-    public override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+    override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
         val out = DMatrixRMaj(1, 1)
 
         CommonOps_DDRM.add(
@@ -139,19 +139,19 @@ public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrix
         return out.wrapMatrix()
     }
 
-    public override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixRMaj> {
+    override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixRMaj> {
         val res = DMatrixRMaj(1, 1)
         CommonOps_DDRM.scale(value, toEjml().origin, res)
         return res.wrapMatrix()
     }
 
-    public override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixRMaj> {
+    override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixRMaj> {
         val res = DMatrixRMaj(1, 1)
         CommonOps_DDRM.changeSign(toEjml().origin, res)
         return res.wrapVector()
     }
 
-    public override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+    override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
         val out = DMatrixRMaj(1, 1)
         
         CommonOps_DDRM.add(
@@ -165,7 +165,7 @@ public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrix
         return out.wrapMatrix()
     }
 
-    public override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+    override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
         val out = DMatrixRMaj(1, 1)
 
         CommonOps_DDRM.add(
@@ -179,7 +179,7 @@ public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrix
         return out.wrapVector()
     }
 
-    public override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+    override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
         val out = DMatrixRMaj(1, 1)
 
         CommonOps_DDRM.add(
@@ -193,18 +193,18 @@ public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrix
         return out.wrapVector()
     }
 
-    public override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> = m * this
+    override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> = m * this
 
-    public override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixRMaj> {
+    override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixRMaj> {
         val res = DMatrixRMaj(1, 1)
         CommonOps_DDRM.scale(value, toEjml().origin, res)
         return res.wrapVector()
     }
 
-    public override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixRMaj> = v * this
+    override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixRMaj> = v * this
 
     @UnstableKMathAPI
-    public override fun <F : StructureFeature> getFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
+    override fun <F : StructureFeature> getFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
         structure.getFeature(type)?.let { return it }
         val origin = structure.toEjml().origin
 
@@ -309,23 +309,23 @@ public object EjmlLinearSpaceFDRM : EjmlLinearSpace<Float, FloatField, FMatrixRM
     /**
      * The [FloatField] reference.
      */
-    public override val elementAlgebra: FloatField get() = FloatField
+    override val elementAlgebra: FloatField get() = FloatField
 
     @Suppress("UNCHECKED_CAST")
-    public override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixRMaj> = when {
+    override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixRMaj> = when {
         this is EjmlFloatMatrix<*> && origin is FMatrixRMaj -> this as EjmlFloatMatrix<FMatrixRMaj>
         else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
     }
 
     @Suppress("UNCHECKED_CAST")
-    public override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixRMaj> = when {
+    override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixRMaj> = when {
         this is EjmlFloatVector<*> && origin is FMatrixRMaj -> this as EjmlFloatVector<FMatrixRMaj>
         else -> EjmlFloatVector(FMatrixRMaj(size, 1).also {
             (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
         })
     }
 
-    public override fun buildMatrix(
+    override fun buildMatrix(
         rows: Int,
         columns: Int,
         initializer: FloatField.(i: Int, j: Int) -> Float,
@@ -335,7 +335,7 @@ public object EjmlLinearSpaceFDRM : EjmlLinearSpace<Float, FloatField, FMatrixRM
         }
     }.wrapMatrix()
 
-    public override fun buildVector(
+    override fun buildVector(
         size: Int,
         initializer: FloatField.(Int) -> Float,
     ): EjmlFloatVector<FMatrixRMaj> = EjmlFloatVector(FMatrixRMaj(size, 1).also {
@@ -345,21 +345,21 @@ public object EjmlLinearSpaceFDRM : EjmlLinearSpace<Float, FloatField, FMatrixRM
     private fun <T : FMatrix> T.wrapMatrix() = EjmlFloatMatrix(this)
     private fun <T : FMatrix> T.wrapVector() = EjmlFloatVector(this)
 
-    public override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
+    override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
 
-    public override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+    override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
         val out = FMatrixRMaj(1, 1)
         CommonOps_FDRM.mult(toEjml().origin, other.toEjml().origin, out)
         return out.wrapMatrix()
     }
 
-    public override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+    override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
         val out = FMatrixRMaj(1, 1)
         CommonOps_FDRM.mult(toEjml().origin, vector.toEjml().origin, out)
         return out.wrapVector()
     }
 
-    public override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+    override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
         val out = FMatrixRMaj(1, 1)
 
         CommonOps_FDRM.add(
@@ -373,19 +373,19 @@ public object EjmlLinearSpaceFDRM : EjmlLinearSpace<Float, FloatField, FMatrixRM
         return out.wrapMatrix()
     }
 
-    public override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixRMaj> {
+    override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixRMaj> {
         val res = FMatrixRMaj(1, 1)
         CommonOps_FDRM.scale(value, toEjml().origin, res)
         return res.wrapMatrix()
     }
 
-    public override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixRMaj> {
+    override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixRMaj> {
         val res = FMatrixRMaj(1, 1)
         CommonOps_FDRM.changeSign(toEjml().origin, res)
         return res.wrapVector()
     }
 
-    public override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+    override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
         val out = FMatrixRMaj(1, 1)
         
         CommonOps_FDRM.add(
@@ -399,7 +399,7 @@ public object EjmlLinearSpaceFDRM : EjmlLinearSpace<Float, FloatField, FMatrixRM
         return out.wrapMatrix()
     }
 
-    public override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+    override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
         val out = FMatrixRMaj(1, 1)
 
         CommonOps_FDRM.add(
@@ -413,7 +413,7 @@ public object EjmlLinearSpaceFDRM : EjmlLinearSpace<Float, FloatField, FMatrixRM
         return out.wrapVector()
     }
 
-    public override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+    override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
         val out = FMatrixRMaj(1, 1)
 
         CommonOps_FDRM.add(
@@ -427,18 +427,18 @@ public object EjmlLinearSpaceFDRM : EjmlLinearSpace<Float, FloatField, FMatrixRM
         return out.wrapVector()
     }
 
-    public override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> = m * this
+    override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> = m * this
 
-    public override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixRMaj> {
+    override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixRMaj> {
         val res = FMatrixRMaj(1, 1)
         CommonOps_FDRM.scale(value, toEjml().origin, res)
         return res.wrapVector()
     }
 
-    public override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixRMaj> = v * this
+    override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixRMaj> = v * this
 
     @UnstableKMathAPI
-    public override fun <F : StructureFeature> getFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
+    override fun <F : StructureFeature> getFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
         structure.getFeature(type)?.let { return it }
         val origin = structure.toEjml().origin
 
@@ -543,23 +543,23 @@ public object EjmlLinearSpaceDSCC : EjmlLinearSpace<Double, DoubleField, DMatrix
     /**
      * The [DoubleField] reference.
      */
-    public override val elementAlgebra: DoubleField get() = DoubleField
+    override val elementAlgebra: DoubleField get() = DoubleField
 
     @Suppress("UNCHECKED_CAST")
-    public override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixSparseCSC> = when {
+    override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixSparseCSC> = when {
         this is EjmlDoubleMatrix<*> && origin is DMatrixSparseCSC -> this as EjmlDoubleMatrix<DMatrixSparseCSC>
         else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
     }
 
     @Suppress("UNCHECKED_CAST")
-    public override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixSparseCSC> = when {
+    override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixSparseCSC> = when {
         this is EjmlDoubleVector<*> && origin is DMatrixSparseCSC -> this as EjmlDoubleVector<DMatrixSparseCSC>
         else -> EjmlDoubleVector(DMatrixSparseCSC(size, 1).also {
             (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
         })
     }
 
-    public override fun buildMatrix(
+    override fun buildMatrix(
         rows: Int,
         columns: Int,
         initializer: DoubleField.(i: Int, j: Int) -> Double,
@@ -569,7 +569,7 @@ public object EjmlLinearSpaceDSCC : EjmlLinearSpace<Double, DoubleField, DMatrix
         }
     }.wrapMatrix()
 
-    public override fun buildVector(
+    override fun buildVector(
         size: Int,
         initializer: DoubleField.(Int) -> Double,
     ): EjmlDoubleVector<DMatrixSparseCSC> = EjmlDoubleVector(DMatrixSparseCSC(size, 1).also {
@@ -579,21 +579,21 @@ public object EjmlLinearSpaceDSCC : EjmlLinearSpace<Double, DoubleField, DMatrix
     private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
     private fun <T : DMatrix> T.wrapVector() = EjmlDoubleVector(this)
 
-    public override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
+    override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
 
-    public override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+    override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
         val out = DMatrixSparseCSC(1, 1)
         CommonOps_DSCC.mult(toEjml().origin, other.toEjml().origin, out)
         return out.wrapMatrix()
     }
 
-    public override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+    override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
         val out = DMatrixSparseCSC(1, 1)
         CommonOps_DSCC.mult(toEjml().origin, vector.toEjml().origin, out)
         return out.wrapVector()
     }
 
-    public override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+    override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
         val out = DMatrixSparseCSC(1, 1)
 
         CommonOps_DSCC.add(
@@ -609,19 +609,19 @@ public object EjmlLinearSpaceDSCC : EjmlLinearSpace<Double, DoubleField, DMatrix
         return out.wrapMatrix()
     }
 
-    public override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixSparseCSC> {
+    override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixSparseCSC> {
         val res = DMatrixSparseCSC(1, 1)
         CommonOps_DSCC.scale(value, toEjml().origin, res)
         return res.wrapMatrix()
     }
 
-    public override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixSparseCSC> {
+    override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixSparseCSC> {
         val res = DMatrixSparseCSC(1, 1)
         CommonOps_DSCC.changeSign(toEjml().origin, res)
         return res.wrapVector()
     }
 
-    public override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+    override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
         val out = DMatrixSparseCSC(1, 1)
         
         CommonOps_DSCC.add(
@@ -637,7 +637,7 @@ public object EjmlLinearSpaceDSCC : EjmlLinearSpace<Double, DoubleField, DMatrix
         return out.wrapMatrix()
     }
 
-    public override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+    override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
         val out = DMatrixSparseCSC(1, 1)
 
         CommonOps_DSCC.add(
@@ -653,7 +653,7 @@ public object EjmlLinearSpaceDSCC : EjmlLinearSpace<Double, DoubleField, DMatrix
         return out.wrapVector()
     }
 
-    public override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+    override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
         val out = DMatrixSparseCSC(1, 1)
 
         CommonOps_DSCC.add(
@@ -669,18 +669,18 @@ public object EjmlLinearSpaceDSCC : EjmlLinearSpace<Double, DoubleField, DMatrix
         return out.wrapVector()
     }
 
-    public override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> = m * this
+    override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> = m * this
 
-    public override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixSparseCSC> {
+    override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixSparseCSC> {
         val res = DMatrixSparseCSC(1, 1)
         CommonOps_DSCC.scale(value, toEjml().origin, res)
         return res.wrapVector()
     }
 
-    public override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> = v * this
+    override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> = v * this
 
     @UnstableKMathAPI
-    public override fun <F : StructureFeature> getFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
+    override fun <F : StructureFeature> getFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
         structure.getFeature(type)?.let { return it }
         val origin = structure.toEjml().origin
 
@@ -772,23 +772,23 @@ public object EjmlLinearSpaceFSCC : EjmlLinearSpace<Float, FloatField, FMatrixSp
     /**
      * The [FloatField] reference.
      */
-    public override val elementAlgebra: FloatField get() = FloatField
+    override val elementAlgebra: FloatField get() = FloatField
 
     @Suppress("UNCHECKED_CAST")
-    public override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixSparseCSC> = when {
+    override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixSparseCSC> = when {
         this is EjmlFloatMatrix<*> && origin is FMatrixSparseCSC -> this as EjmlFloatMatrix<FMatrixSparseCSC>
         else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
     }
 
     @Suppress("UNCHECKED_CAST")
-    public override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixSparseCSC> = when {
+    override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixSparseCSC> = when {
         this is EjmlFloatVector<*> && origin is FMatrixSparseCSC -> this as EjmlFloatVector<FMatrixSparseCSC>
         else -> EjmlFloatVector(FMatrixSparseCSC(size, 1).also {
             (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
         })
     }
 
-    public override fun buildMatrix(
+    override fun buildMatrix(
         rows: Int,
         columns: Int,
         initializer: FloatField.(i: Int, j: Int) -> Float,
@@ -798,7 +798,7 @@ public object EjmlLinearSpaceFSCC : EjmlLinearSpace<Float, FloatField, FMatrixSp
         }
     }.wrapMatrix()
 
-    public override fun buildVector(
+    override fun buildVector(
         size: Int,
         initializer: FloatField.(Int) -> Float,
     ): EjmlFloatVector<FMatrixSparseCSC> = EjmlFloatVector(FMatrixSparseCSC(size, 1).also {
@@ -808,21 +808,21 @@ public object EjmlLinearSpaceFSCC : EjmlLinearSpace<Float, FloatField, FMatrixSp
     private fun <T : FMatrix> T.wrapMatrix() = EjmlFloatMatrix(this)
     private fun <T : FMatrix> T.wrapVector() = EjmlFloatVector(this)
 
-    public override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
+    override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
 
-    public override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+    override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
         val out = FMatrixSparseCSC(1, 1)
         CommonOps_FSCC.mult(toEjml().origin, other.toEjml().origin, out)
         return out.wrapMatrix()
     }
 
-    public override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+    override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
         val out = FMatrixSparseCSC(1, 1)
         CommonOps_FSCC.mult(toEjml().origin, vector.toEjml().origin, out)
         return out.wrapVector()
     }
 
-    public override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+    override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
         val out = FMatrixSparseCSC(1, 1)
 
         CommonOps_FSCC.add(
@@ -838,19 +838,19 @@ public object EjmlLinearSpaceFSCC : EjmlLinearSpace<Float, FloatField, FMatrixSp
         return out.wrapMatrix()
     }
 
-    public override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixSparseCSC> {
+    override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixSparseCSC> {
         val res = FMatrixSparseCSC(1, 1)
         CommonOps_FSCC.scale(value, toEjml().origin, res)
         return res.wrapMatrix()
     }
 
-    public override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixSparseCSC> {
+    override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixSparseCSC> {
         val res = FMatrixSparseCSC(1, 1)
         CommonOps_FSCC.changeSign(toEjml().origin, res)
         return res.wrapVector()
     }
 
-    public override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+    override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
         val out = FMatrixSparseCSC(1, 1)
         
         CommonOps_FSCC.add(
@@ -866,7 +866,7 @@ public object EjmlLinearSpaceFSCC : EjmlLinearSpace<Float, FloatField, FMatrixSp
         return out.wrapMatrix()
     }
 
-    public override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+    override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
         val out = FMatrixSparseCSC(1, 1)
 
         CommonOps_FSCC.add(
@@ -882,7 +882,7 @@ public object EjmlLinearSpaceFSCC : EjmlLinearSpace<Float, FloatField, FMatrixSp
         return out.wrapVector()
     }
 
-    public override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+    override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
         val out = FMatrixSparseCSC(1, 1)
 
         CommonOps_FSCC.add(
@@ -898,18 +898,18 @@ public object EjmlLinearSpaceFSCC : EjmlLinearSpace<Float, FloatField, FMatrixSp
         return out.wrapVector()
     }
 
-    public override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> = m * this
+    override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> = m * this
 
-    public override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixSparseCSC> {
+    override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixSparseCSC> {
         val res = FMatrixSparseCSC(1, 1)
         CommonOps_FSCC.scale(value, toEjml().origin, res)
         return res.wrapVector()
     }
 
-    public override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> = v * this
+    override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> = v * this
 
     @UnstableKMathAPI
-    public override fun <F : StructureFeature> getFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
+    override fun <F : StructureFeature> getFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
         structure.getFeature(type)?.let { return it }
         val origin = structure.toEjml().origin
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index 5f35d0ab6..a2ad5801c 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -30,7 +30,7 @@ public fun interface Piecewise<in T, out R> {
 public interface PiecewisePolynomial<T : Comparable<T>> : Piecewise<T, Polynomial<T>> {
     public val pieces: Collection<Pair<ClosedRange<T>, Polynomial<T>>>
 
-    public override fun findPiece(arg: T): Polynomial<T>?
+    override fun findPiece(arg: T): Polynomial<T>?
 }
 
 /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index f0c858b03..f0f744530 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -98,13 +98,13 @@ public fun <T : Comparable<T>> Polynomial<T>.integrate(
 public class PolynomialSpace<T, C>(
     private val ring: C,
 ) : Group<Polynomial<T>>, ScaleOperations<Polynomial<T>> where C : Ring<T>, C : ScaleOperations<T> {
-    public override val zero: Polynomial<T> = Polynomial(emptyList())
+    override val zero: Polynomial<T> = Polynomial(emptyList())
 
     override fun Polynomial<T>.unaryMinus(): Polynomial<T> = ring {
         Polynomial(coefficients.map { -it })
     }
 
-    public override fun add(a: Polynomial<T>, b: Polynomial<T>): Polynomial<T> {
+    override fun add(a: Polynomial<T>, b: Polynomial<T>): Polynomial<T> {
         val dim = max(a.coefficients.size, b.coefficients.size)
 
         return ring {
@@ -114,7 +114,7 @@ public class PolynomialSpace<T, C>(
         }
     }
 
-    public override fun scale(a: Polynomial<T>, value: Double): Polynomial<T> =
+    override fun scale(a: Polynomial<T>, value: Double): Polynomial<T> =
         ring { Polynomial(List(a.coefficients.size) { index -> a.coefficients[index] * value }) }
 
     /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
index 24c049647..edd0e6b0a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
@@ -21,9 +21,9 @@ internal fun <T : Comparable<T>> insureSorted(points: XYColumnarData<*, T, *>) {
 /**
  * Reference JVM implementation: https://github.com/apache/commons-math/blob/master/src/main/java/org/apache/commons/math4/analysis/interpolation/LinearInterpolator.java
  */
-public class LinearInterpolator<T : Comparable<T>>(public override val algebra: Field<T>) : PolynomialInterpolator<T> {
+public class LinearInterpolator<T : Comparable<T>>(override val algebra: Field<T>) : PolynomialInterpolator<T> {
     @OptIn(UnstableKMathAPI::class)
-    public override fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T> = algebra {
+    override fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T> = algebra {
         require(points.size > 0) { "Point array should not be empty" }
         insureSorted(points)
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
index bf291c315..39c33ee69 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -23,13 +23,13 @@ import space.kscience.kmath.structures.MutableBufferFactory
  * https://github.com/apache/commons-math/blob/eb57d6d457002a0bb5336d789a3381a24599affe/src/main/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolator.java
  */
 public class SplineInterpolator<T : Comparable<T>>(
-    public override val algebra: Field<T>,
+    override val algebra: Field<T>,
     public val bufferFactory: MutableBufferFactory<T>,
 ) : PolynomialInterpolator<T> {
     //TODO possibly optimize zeroed buffers
 
     @OptIn(UnstableKMathAPI::class)
-    public override fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T> = algebra {
+    override fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T> = algebra {
         require(points.size >= 3) { "Can't use spline interpolator with less than 3 points" }
         insureSorted(points)
         // Number of intervals.  The number of data points is n + 1.
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
index 2a4837ee0..2b91c2334 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
@@ -15,15 +15,15 @@ import kotlin.math.sqrt
 public interface Vector2D : Point<Double>, Vector{
     public val x: Double
     public val y: Double
-    public override val size: Int get() = 2
+    override val size: Int get() = 2
 
-    public override operator fun get(index: Int): Double = when (index) {
+    override operator fun get(index: Int): Double = when (index) {
         1 -> x
         2 -> y
         else -> error("Accessing outside of point bounds")
     }
 
-    public override operator fun iterator(): Iterator<Double> = listOf(x, y).iterator()
+    override operator fun iterator(): Iterator<Double> = listOf(x, y).iterator()
 }
 
 public val Vector2D.r: Double
@@ -41,13 +41,13 @@ private data class Vector2DImpl(
  * 2D Euclidean space
  */
 public object Euclidean2DSpace : GeometrySpace<Vector2D>, ScaleOperations<Vector2D> {
-    public override val zero: Vector2D by lazy { Vector2D(0.0, 0.0) }
+    override val zero: Vector2D by lazy { Vector2D(0.0, 0.0) }
 
     public fun Vector2D.norm(): Double = sqrt(x * x + y * y)
     override fun Vector2D.unaryMinus(): Vector2D = Vector2D(-x, -y)
 
-    public override fun Vector2D.distanceTo(other: Vector2D): Double = (this - other).norm()
-    public override fun add(a: Vector2D, b: Vector2D): Vector2D = Vector2D(a.x + b.x, a.y + b.y)
-    public override fun scale(a: Vector2D, value: Double): Vector2D = Vector2D(a.x * value, a.y * value)
-    public override fun Vector2D.dot(other: Vector2D): Double = x * other.x + y * other.y
+    override fun Vector2D.distanceTo(other: Vector2D): Double = (this - other).norm()
+    override fun add(a: Vector2D, b: Vector2D): Vector2D = Vector2D(a.x + b.x, a.y + b.y)
+    override fun scale(a: Vector2D, value: Double): Vector2D = Vector2D(a.x * value, a.y * value)
+    override fun Vector2D.dot(other: Vector2D): Double = x * other.x + y * other.y
 }
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index 37e7d2cb2..628106b0b 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -16,16 +16,16 @@ public interface Vector3D : Point<Double>, Vector {
     public val x: Double
     public val y: Double
     public val z: Double
-    public override val size: Int get() = 3
+    override val size: Int get() = 3
 
-    public override operator fun get(index: Int): Double = when (index) {
+    override operator fun get(index: Int): Double = when (index) {
         1 -> x
         2 -> y
         3 -> z
         else -> error("Accessing outside of point bounds")
     }
 
-    public override operator fun iterator(): Iterator<Double> = listOf(x, y, z).iterator()
+    override operator fun iterator(): Iterator<Double> = listOf(x, y, z).iterator()
 }
 
 @Suppress("FunctionName")
@@ -40,19 +40,19 @@ private data class Vector3DImpl(
 ) : Vector3D
 
 public object Euclidean3DSpace : GeometrySpace<Vector3D>, ScaleOperations<Vector3D> {
-    public override val zero: Vector3D by lazy { Vector3D(0.0, 0.0, 0.0) }
+    override val zero: Vector3D by lazy { Vector3D(0.0, 0.0, 0.0) }
 
     public fun Vector3D.norm(): Double = sqrt(x * x + y * y + z * z)
     override fun Vector3D.unaryMinus(): Vector3D = Vector3D(-x, -y, -z)
 
-    public override fun Vector3D.distanceTo(other: Vector3D): Double = (this - other).norm()
+    override fun Vector3D.distanceTo(other: Vector3D): Double = (this - other).norm()
 
-    public override fun add(a: Vector3D, b: Vector3D): Vector3D =
+    override fun add(a: Vector3D, b: Vector3D): Vector3D =
         Vector3D(a.x + b.x, a.y + b.y, a.z + b.z)
 
-    public override fun scale(a: Vector3D, value: Double): Vector3D =
+    override fun scale(a: Vector3D, value: Double): Vector3D =
         Vector3D(a.x * value, a.y * value, a.z * value)
 
-    public override fun Vector3D.dot(other: Vector3D): Double =
+    override fun Vector3D.dot(other: Vector3D): Double =
         x * other.x + y * other.y + z * other.z
 }
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
index 6d48d3738..79b6b4e02 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
@@ -20,7 +20,7 @@ import space.kscience.kmath.operations.invoke
  */
 public data class DomainBin<in T : Comparable<T>>(
     public val domain: Domain<T>,
-    public override val value: Number,
+    override val value: Number,
 ) : Bin<T>, Domain<T> by domain
 
 @OptIn(UnstableKMathAPI::class)
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
index 0ad96ad46..f461ee4fa 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
@@ -27,15 +27,15 @@ public class UnivariateBin(
     public val standardDeviation: Double,
 ) : Bin<Double>, ClosedFloatingPointRange<Double> by domain.range {
 
-    public override val dimension: Int get() = 1
+    override val dimension: Int get() = 1
 
-    public override fun contains(point: Buffer<Double>): Boolean = point.size == 1 && contains(point[0])
+    override fun contains(point: Buffer<Double>): Boolean = point.size == 1 && contains(point[0])
 }
 
 @OptIn(UnstableKMathAPI::class)
 public interface UnivariateHistogram : Histogram<Double, UnivariateBin>{
     public operator fun get(value: Double): UnivariateBin?
-    public override operator fun get(point: Buffer<Double>): UnivariateBin? = get(point[0])
+    override operator fun get(point: Buffer<Double>): UnivariateBin? = get(point[0])
 
     public companion object {
         /**
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
index cf6f9471d..a30020dff 100644
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
@@ -12,50 +12,50 @@ import space.kscience.kmath.operations.ScaleOperations
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
-    public override inline val zero: Double get() = 0.0
-    public override inline val one: Double get() = 1.0
+    override inline val zero: Double get() = 0.0
+    override inline val one: Double get() = 1.0
 
-    public override inline fun number(value: Number): Double = value.toDouble()
+    override inline fun number(value: Number): Double = value.toDouble()
 
-    public override fun binaryOperationFunction(operation: String): (left: Double, right: Double) -> Double =
+    override fun binaryOperationFunction(operation: String): (left: Double, right: Double) -> Double =
         when (operation) {
             PowerOperations.POW_OPERATION -> ::power
             else -> super<ExtendedField>.binaryOperationFunction(operation)
         }
 
-    public override inline fun add(a: Double, b: Double): Double = a + b
+    override inline fun add(a: Double, b: Double): Double = a + b
 
-    public override inline fun multiply(a: Double, b: Double): Double = a * b
-    public override inline fun divide(a: Double, b: Double): Double = a / b
+    override inline fun multiply(a: Double, b: Double): Double = a * b
+    override inline fun divide(a: Double, b: Double): Double = a / b
 
-    public override inline fun scale(a: Double, value: Double): Double = a * value
+    override inline fun scale(a: Double, value: Double): Double = a * value
 
-    public override inline fun sin(arg: Double): Double = FastMath.sin(arg)
-    public override inline fun cos(arg: Double): Double = FastMath.cos(arg)
-    public override inline fun tan(arg: Double): Double = FastMath.tan(arg)
-    public override inline fun acos(arg: Double): Double = FastMath.acos(arg)
-    public override inline fun asin(arg: Double): Double = FastMath.asin(arg)
-    public override inline fun atan(arg: Double): Double = FastMath.atan(arg)
+    override inline fun sin(arg: Double): Double = FastMath.sin(arg)
+    override inline fun cos(arg: Double): Double = FastMath.cos(arg)
+    override inline fun tan(arg: Double): Double = FastMath.tan(arg)
+    override inline fun acos(arg: Double): Double = FastMath.acos(arg)
+    override inline fun asin(arg: Double): Double = FastMath.asin(arg)
+    override inline fun atan(arg: Double): Double = FastMath.atan(arg)
 
-    public override inline fun sinh(arg: Double): Double = FastMath.sinh(arg)
-    public override inline fun cosh(arg: Double): Double = FastMath.cosh(arg)
-    public override inline fun tanh(arg: Double): Double = FastMath.tanh(arg)
-    public override inline fun asinh(arg: Double): Double = FastMath.asinh(arg)
-    public override inline fun acosh(arg: Double): Double = FastMath.acosh(arg)
-    public override inline fun atanh(arg: Double): Double = FastMath.atanh(arg)
+    override inline fun sinh(arg: Double): Double = FastMath.sinh(arg)
+    override inline fun cosh(arg: Double): Double = FastMath.cosh(arg)
+    override inline fun tanh(arg: Double): Double = FastMath.tanh(arg)
+    override inline fun asinh(arg: Double): Double = FastMath.asinh(arg)
+    override inline fun acosh(arg: Double): Double = FastMath.acosh(arg)
+    override inline fun atanh(arg: Double): Double = FastMath.atanh(arg)
 
-    public override inline fun sqrt(arg: Double): Double = FastMath.sqrt(arg)
-    public override inline fun power(arg: Double, pow: Number): Double = FastMath.pow(arg, pow.toDouble())
-    public override inline fun exp(arg: Double): Double = FastMath.exp(arg)
-    public override inline fun ln(arg: Double): Double = FastMath.log(arg)
+    override inline fun sqrt(arg: Double): Double = FastMath.sqrt(arg)
+    override inline fun power(arg: Double, pow: Number): Double = FastMath.pow(arg, pow.toDouble())
+    override inline fun exp(arg: Double): Double = FastMath.exp(arg)
+    override inline fun ln(arg: Double): Double = FastMath.log(arg)
 
-    public override inline fun norm(arg: Double): Double = FastMath.abs(arg)
+    override inline fun norm(arg: Double): Double = FastMath.abs(arg)
 
-    public override inline fun Double.unaryMinus(): Double = -this
-    public override inline fun Double.plus(b: Double): Double = this + b
-    public override inline fun Double.minus(b: Double): Double = this - b
-    public override inline fun Double.times(b: Double): Double = this * b
-    public override inline fun Double.div(b: Double): Double = this / b
+    override inline fun Double.unaryMinus(): Double = -this
+    override inline fun Double.plus(b: Double): Double = this + b
+    override inline fun Double.minus(b: Double): Double = this - b
+    override inline fun Double.times(b: Double): Double = this * b
+    override inline fun Double.div(b: Double): Double = this / b
 }
 
 /**
@@ -63,48 +63,48 @@ public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, S
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object StrictJafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
-    public override inline val zero: Double get() = 0.0
-    public override inline val one: Double get() = 1.0
+    override inline val zero: Double get() = 0.0
+    override inline val one: Double get() = 1.0
 
-    public override inline fun number(value: Number): Double = value.toDouble()
+    override inline fun number(value: Number): Double = value.toDouble()
 
-    public override fun binaryOperationFunction(operation: String): (left: Double, right: Double) -> Double =
+    override fun binaryOperationFunction(operation: String): (left: Double, right: Double) -> Double =
         when (operation) {
             PowerOperations.POW_OPERATION -> ::power
             else -> super<ExtendedField>.binaryOperationFunction(operation)
         }
 
-    public override inline fun add(a: Double, b: Double): Double = a + b
+    override inline fun add(a: Double, b: Double): Double = a + b
 
-    public override inline fun multiply(a: Double, b: Double): Double = a * b
-    public override inline fun divide(a: Double, b: Double): Double = a / b
+    override inline fun multiply(a: Double, b: Double): Double = a * b
+    override inline fun divide(a: Double, b: Double): Double = a / b
 
-    public override inline fun scale(a: Double, value: Double): Double = a * value
+    override inline fun scale(a: Double, value: Double): Double = a * value
 
-    public override inline fun sin(arg: Double): Double = StrictFastMath.sin(arg)
-    public override inline fun cos(arg: Double): Double = StrictFastMath.cos(arg)
-    public override inline fun tan(arg: Double): Double = StrictFastMath.tan(arg)
-    public override inline fun acos(arg: Double): Double = StrictFastMath.acos(arg)
-    public override inline fun asin(arg: Double): Double = StrictFastMath.asin(arg)
-    public override inline fun atan(arg: Double): Double = StrictFastMath.atan(arg)
+    override inline fun sin(arg: Double): Double = StrictFastMath.sin(arg)
+    override inline fun cos(arg: Double): Double = StrictFastMath.cos(arg)
+    override inline fun tan(arg: Double): Double = StrictFastMath.tan(arg)
+    override inline fun acos(arg: Double): Double = StrictFastMath.acos(arg)
+    override inline fun asin(arg: Double): Double = StrictFastMath.asin(arg)
+    override inline fun atan(arg: Double): Double = StrictFastMath.atan(arg)
 
-    public override inline fun sinh(arg: Double): Double = StrictFastMath.sinh(arg)
-    public override inline fun cosh(arg: Double): Double = StrictFastMath.cosh(arg)
-    public override inline fun tanh(arg: Double): Double = StrictFastMath.tanh(arg)
-    public override inline fun asinh(arg: Double): Double = StrictFastMath.asinh(arg)
-    public override inline fun acosh(arg: Double): Double = StrictFastMath.acosh(arg)
-    public override inline fun atanh(arg: Double): Double = StrictFastMath.atanh(arg)
+    override inline fun sinh(arg: Double): Double = StrictFastMath.sinh(arg)
+    override inline fun cosh(arg: Double): Double = StrictFastMath.cosh(arg)
+    override inline fun tanh(arg: Double): Double = StrictFastMath.tanh(arg)
+    override inline fun asinh(arg: Double): Double = StrictFastMath.asinh(arg)
+    override inline fun acosh(arg: Double): Double = StrictFastMath.acosh(arg)
+    override inline fun atanh(arg: Double): Double = StrictFastMath.atanh(arg)
 
-    public override inline fun sqrt(arg: Double): Double = StrictFastMath.sqrt(arg)
-    public override inline fun power(arg: Double, pow: Number): Double = StrictFastMath.pow(arg, pow.toDouble())
-    public override inline fun exp(arg: Double): Double = StrictFastMath.exp(arg)
-    public override inline fun ln(arg: Double): Double = StrictFastMath.log(arg)
+    override inline fun sqrt(arg: Double): Double = StrictFastMath.sqrt(arg)
+    override inline fun power(arg: Double, pow: Number): Double = StrictFastMath.pow(arg, pow.toDouble())
+    override inline fun exp(arg: Double): Double = StrictFastMath.exp(arg)
+    override inline fun ln(arg: Double): Double = StrictFastMath.log(arg)
 
-    public override inline fun norm(arg: Double): Double = StrictFastMath.abs(arg)
+    override inline fun norm(arg: Double): Double = StrictFastMath.abs(arg)
 
-    public override inline fun Double.unaryMinus(): Double = -this
-    public override inline fun Double.plus(b: Double): Double = this + b
-    public override inline fun Double.minus(b: Double): Double = this - b
-    public override inline fun Double.times(b: Double): Double = this * b
-    public override inline fun Double.div(b: Double): Double = this / b
+    override inline fun Double.unaryMinus(): Double = -this
+    override inline fun Double.plus(b: Double): Double = this + b
+    override inline fun Double.minus(b: Double): Double = this - b
+    override inline fun Double.times(b: Double): Double = this * b
+    override inline fun Double.div(b: Double): Double = this / b
 }
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
index 9c9d07b81..f4386f434 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
@@ -16,15 +16,15 @@ import space.kscience.kmath.operations.NumericAlgebra
  * @property algebra The algebra.
  * @property value The value of this number.
  */
-public class KMathNumber<T, A>(public val algebra: A, public override val value: T) :
+public class KMathNumber<T, A>(public val algebra: A, override val value: T) :
     SConst<KMathNumber<T, A>>(value) where T : Number, A : NumericAlgebra<T> {
     /**
      * Returns a string representation of the [value].
      */
-    public override fun toString(): String = value.toString()
+    override fun toString(): String = value.toString()
 
     /**
      * Wraps [Number] to [KMathNumber].
      */
-    public override fun wrap(number: Number): KMathNumber<T, A> = KMathNumber(algebra, algebra.number(number))
+    override fun wrap(number: Number): KMathNumber<T, A> = KMathNumber(algebra, algebra.number(number))
 }
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
index 28f6cd59e..3a94e8259 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
@@ -25,9 +25,9 @@ public class KotlingradExpression<T : Number, A : NumericAlgebra<T>>(
     public val algebra: A,
     public val mst: MST,
 ) : SpecialDifferentiableExpression<T, KotlingradExpression<T, A>> {
-    public override fun invoke(arguments: Map<Symbol, T>): T = mst.interpret(algebra, arguments)
+    override fun invoke(arguments: Map<Symbol, T>): T = mst.interpret(algebra, arguments)
 
-    public override fun derivativeOrNull(symbols: List<Symbol>): KotlingradExpression<T, A> =
+    override fun derivativeOrNull(symbols: List<Symbol>): KotlingradExpression<T, A> =
         KotlingradExpression(
             algebra,
             symbols.map(Symbol::identity)
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index e94bda12a..7a650df3c 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -39,20 +39,20 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
      */
     public val StructureND<T>.ndArray: INDArray
 
-    public override fun produce(initializer: C.(IntArray) -> T): Nd4jArrayStructure<T> {
+    override fun produce(initializer: C.(IntArray) -> T): Nd4jArrayStructure<T> {
         val struct = Nd4j.create(*shape)!!.wrap()
         struct.indicesIterator().forEach { struct[it] = elementContext.initializer(it) }
         return struct
     }
 
     @PerformancePitfall
-    public override fun StructureND<T>.map(transform: C.(T) -> T): Nd4jArrayStructure<T> {
+    override fun StructureND<T>.map(transform: C.(T) -> T): Nd4jArrayStructure<T> {
         val newStruct = ndArray.dup().wrap()
         newStruct.elements().forEach { (idx, value) -> newStruct[idx] = elementContext.transform(value) }
         return newStruct
     }
 
-    public override fun StructureND<T>.mapIndexed(
+    override fun StructureND<T>.mapIndexed(
         transform: C.(index: IntArray, T) -> T,
     ): Nd4jArrayStructure<T> {
         val new = Nd4j.create(*this@Nd4jArrayAlgebra.shape).wrap()
@@ -60,7 +60,7 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
         return new
     }
 
-    public override fun combine(
+    override fun combine(
         a: StructureND<T>,
         b: StructureND<T>,
         transform: C.(T, T) -> T,
@@ -79,16 +79,16 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
  */
 public sealed interface Nd4jArrayGroup<T, out S : Ring<T>> : GroupND<T, S>, Nd4jArrayAlgebra<T, S> {
 
-    public override val zero: Nd4jArrayStructure<T>
+    override val zero: Nd4jArrayStructure<T>
         get() = Nd4j.zeros(*shape).wrap()
 
-    public override fun add(a: StructureND<T>, b: StructureND<T>): Nd4jArrayStructure<T> =
+    override fun add(a: StructureND<T>, b: StructureND<T>): Nd4jArrayStructure<T> =
         a.ndArray.add(b.ndArray).wrap()
 
-    public override operator fun StructureND<T>.minus(b: StructureND<T>): Nd4jArrayStructure<T> =
+    override operator fun StructureND<T>.minus(b: StructureND<T>): Nd4jArrayStructure<T> =
         ndArray.sub(b.ndArray).wrap()
 
-    public override operator fun StructureND<T>.unaryMinus(): Nd4jArrayStructure<T> =
+    override operator fun StructureND<T>.unaryMinus(): Nd4jArrayStructure<T> =
         ndArray.neg().wrap()
 
     public fun multiply(a: StructureND<T>, k: Number): Nd4jArrayStructure<T> =
@@ -104,23 +104,23 @@ public sealed interface Nd4jArrayGroup<T, out S : Ring<T>> : GroupND<T, S>, Nd4j
 @OptIn(UnstableKMathAPI::class)
 public sealed interface Nd4jArrayRing<T, out R : Ring<T>> : RingND<T, R>, Nd4jArrayGroup<T, R> {
 
-    public override val one: Nd4jArrayStructure<T>
+    override val one: Nd4jArrayStructure<T>
         get() = Nd4j.ones(*shape).wrap()
 
-    public override fun multiply(a: StructureND<T>, b: StructureND<T>): Nd4jArrayStructure<T> =
+    override fun multiply(a: StructureND<T>, b: StructureND<T>): Nd4jArrayStructure<T> =
         a.ndArray.mul(b.ndArray).wrap()
 //
-//    public override operator fun Nd4jArrayStructure<T>.minus(b: Number): Nd4jArrayStructure<T> {
+//    override operator fun Nd4jArrayStructure<T>.minus(b: Number): Nd4jArrayStructure<T> {
 //        check(this)
 //        return ndArray.sub(b).wrap()
 //    }
 //
-//    public override operator fun Nd4jArrayStructure<T>.plus(b: Number): Nd4jArrayStructure<T> {
+//    override operator fun Nd4jArrayStructure<T>.plus(b: Number): Nd4jArrayStructure<T> {
 //        check(this)
 //        return ndArray.add(b).wrap()
 //    }
 //
-//    public override operator fun Number.minus(b: Nd4jArrayStructure<T>): Nd4jArrayStructure<T> {
+//    override operator fun Number.minus(b: Nd4jArrayStructure<T>): Nd4jArrayStructure<T> {
 //        check(b)
 //        return b.ndArray.rsub(this).wrap()
 //    }
@@ -153,7 +153,7 @@ public sealed interface Nd4jArrayRing<T, out R : Ring<T>> : RingND<T, R>, Nd4jAr
  * @param F the type field of structure elements.
  */
 public sealed interface Nd4jArrayField<T, out F : Field<T>> : FieldND<T, F>, Nd4jArrayRing<T, F> {
-    public override fun divide(a: StructureND<T>, b: StructureND<T>): Nd4jArrayStructure<T> =
+    override fun divide(a: StructureND<T>, b: StructureND<T>): Nd4jArrayStructure<T> =
         a.ndArray.div(b.ndArray).wrap()
 
     public operator fun Number.div(b: StructureND<T>): Nd4jArrayStructure<T> = b.ndArray.rdiv(this).wrap()
@@ -194,38 +194,38 @@ public sealed interface Nd4jArrayField<T, out F : Field<T>> : FieldND<T, F>, Nd4
  */
 public sealed interface Nd4jArrayExtendedField<T, out F : ExtendedField<T>> : ExtendedField<StructureND<T>>,
     Nd4jArrayField<T, F> {
-    public override fun sin(arg: StructureND<T>): StructureND<T> = Transforms.sin(arg.ndArray).wrap()
-    public override fun cos(arg: StructureND<T>): StructureND<T> = Transforms.cos(arg.ndArray).wrap()
-    public override fun asin(arg: StructureND<T>): StructureND<T> = Transforms.asin(arg.ndArray).wrap()
-    public override fun acos(arg: StructureND<T>): StructureND<T> = Transforms.acos(arg.ndArray).wrap()
-    public override fun atan(arg: StructureND<T>): StructureND<T> = Transforms.atan(arg.ndArray).wrap()
+    override fun sin(arg: StructureND<T>): StructureND<T> = Transforms.sin(arg.ndArray).wrap()
+    override fun cos(arg: StructureND<T>): StructureND<T> = Transforms.cos(arg.ndArray).wrap()
+    override fun asin(arg: StructureND<T>): StructureND<T> = Transforms.asin(arg.ndArray).wrap()
+    override fun acos(arg: StructureND<T>): StructureND<T> = Transforms.acos(arg.ndArray).wrap()
+    override fun atan(arg: StructureND<T>): StructureND<T> = Transforms.atan(arg.ndArray).wrap()
 
-    public override fun power(arg: StructureND<T>, pow: Number): StructureND<T> =
+    override fun power(arg: StructureND<T>, pow: Number): StructureND<T> =
         Transforms.pow(arg.ndArray, pow).wrap()
 
-    public override fun exp(arg: StructureND<T>): StructureND<T> = Transforms.exp(arg.ndArray).wrap()
-    public override fun ln(arg: StructureND<T>): StructureND<T> = Transforms.log(arg.ndArray).wrap()
-    public override fun sqrt(arg: StructureND<T>): StructureND<T> = Transforms.sqrt(arg.ndArray).wrap()
-    public override fun sinh(arg: StructureND<T>): StructureND<T> = Transforms.sinh(arg.ndArray).wrap()
-    public override fun cosh(arg: StructureND<T>): StructureND<T> = Transforms.cosh(arg.ndArray).wrap()
-    public override fun tanh(arg: StructureND<T>): StructureND<T> = Transforms.tanh(arg.ndArray).wrap()
+    override fun exp(arg: StructureND<T>): StructureND<T> = Transforms.exp(arg.ndArray).wrap()
+    override fun ln(arg: StructureND<T>): StructureND<T> = Transforms.log(arg.ndArray).wrap()
+    override fun sqrt(arg: StructureND<T>): StructureND<T> = Transforms.sqrt(arg.ndArray).wrap()
+    override fun sinh(arg: StructureND<T>): StructureND<T> = Transforms.sinh(arg.ndArray).wrap()
+    override fun cosh(arg: StructureND<T>): StructureND<T> = Transforms.cosh(arg.ndArray).wrap()
+    override fun tanh(arg: StructureND<T>): StructureND<T> = Transforms.tanh(arg.ndArray).wrap()
 
-    public override fun asinh(arg: StructureND<T>): StructureND<T> =
+    override fun asinh(arg: StructureND<T>): StructureND<T> =
         Nd4j.getExecutioner().exec(ASinh(arg.ndArray, arg.ndArray.ulike())).wrap()
 
-    public override fun acosh(arg: StructureND<T>): StructureND<T> =
+    override fun acosh(arg: StructureND<T>): StructureND<T> =
         Nd4j.getExecutioner().exec(ACosh(arg.ndArray, arg.ndArray.ulike())).wrap()
 
-    public override fun atanh(arg: StructureND<T>): StructureND<T> = Transforms.atanh(arg.ndArray).wrap()
+    override fun atanh(arg: StructureND<T>): StructureND<T> = Transforms.atanh(arg.ndArray).wrap()
 }
 
 /**
  * Represents [FieldND] over [Nd4jArrayDoubleStructure].
  */
-public class DoubleNd4jArrayField(public override val shape: IntArray) : Nd4jArrayExtendedField<Double, DoubleField> {
-    public override val elementContext: DoubleField get() = DoubleField
+public class DoubleNd4jArrayField(override val shape: IntArray) : Nd4jArrayExtendedField<Double, DoubleField> {
+    override val elementContext: DoubleField get() = DoubleField
 
-    public override fun INDArray.wrap(): Nd4jArrayStructure<Double> = checkShape(this).asDoubleStructure()
+    override fun INDArray.wrap(): Nd4jArrayStructure<Double> = checkShape(this).asDoubleStructure()
 
     @OptIn(PerformancePitfall::class)
     override val StructureND<Double>.ndArray: INDArray
@@ -240,27 +240,27 @@ public class DoubleNd4jArrayField(public override val shape: IntArray) : Nd4jArr
         return a.ndArray.mul(value).wrap()
     }
 
-    public override operator fun StructureND<Double>.div(arg: Double): Nd4jArrayStructure<Double> {
+    override operator fun StructureND<Double>.div(arg: Double): Nd4jArrayStructure<Double> {
         return ndArray.div(arg).wrap()
     }
 
-    public override operator fun StructureND<Double>.plus(arg: Double): Nd4jArrayStructure<Double> {
+    override operator fun StructureND<Double>.plus(arg: Double): Nd4jArrayStructure<Double> {
         return ndArray.add(arg).wrap()
     }
 
-    public override operator fun StructureND<Double>.minus(arg: Double): Nd4jArrayStructure<Double> {
+    override operator fun StructureND<Double>.minus(arg: Double): Nd4jArrayStructure<Double> {
         return ndArray.sub(arg).wrap()
     }
 
-    public override operator fun StructureND<Double>.times(arg: Double): Nd4jArrayStructure<Double> {
+    override operator fun StructureND<Double>.times(arg: Double): Nd4jArrayStructure<Double> {
         return ndArray.mul(arg).wrap()
     }
 
-    public override operator fun Double.div(arg: StructureND<Double>): Nd4jArrayStructure<Double> {
+    override operator fun Double.div(arg: StructureND<Double>): Nd4jArrayStructure<Double> {
         return arg.ndArray.rdiv(this).wrap()
     }
 
-    public override operator fun Double.minus(arg: StructureND<Double>): Nd4jArrayStructure<Double> {
+    override operator fun Double.minus(arg: StructureND<Double>): Nd4jArrayStructure<Double> {
         return arg.ndArray.rsub(this).wrap()
     }
 }
@@ -268,13 +268,13 @@ public class DoubleNd4jArrayField(public override val shape: IntArray) : Nd4jArr
 /**
  * Represents [FieldND] over [Nd4jArrayStructure] of [Float].
  */
-public class FloatNd4jArrayField(public override val shape: IntArray) : Nd4jArrayExtendedField<Float, FloatField> {
-    public override val elementContext: FloatField get() = FloatField
+public class FloatNd4jArrayField(override val shape: IntArray) : Nd4jArrayExtendedField<Float, FloatField> {
+    override val elementContext: FloatField get() = FloatField
 
-    public override fun INDArray.wrap(): Nd4jArrayStructure<Float> = checkShape(this).asFloatStructure()
+    override fun INDArray.wrap(): Nd4jArrayStructure<Float> = checkShape(this).asFloatStructure()
 
     @OptIn(PerformancePitfall::class)
-    public override val StructureND<Float>.ndArray: INDArray
+    override val StructureND<Float>.ndArray: INDArray
         get() = when (this) {
             is Nd4jArrayStructure<Float> -> checkShape(ndArray)
             else -> Nd4j.zeros(*shape).also {
@@ -285,36 +285,36 @@ public class FloatNd4jArrayField(public override val shape: IntArray) : Nd4jArra
     override fun scale(a: StructureND<Float>, value: Double): StructureND<Float> =
         a.ndArray.mul(value).wrap()
 
-    public override operator fun StructureND<Float>.div(arg: Float): Nd4jArrayStructure<Float> =
+    override operator fun StructureND<Float>.div(arg: Float): Nd4jArrayStructure<Float> =
         ndArray.div(arg).wrap()
 
-    public override operator fun StructureND<Float>.plus(arg: Float): Nd4jArrayStructure<Float> =
+    override operator fun StructureND<Float>.plus(arg: Float): Nd4jArrayStructure<Float> =
         ndArray.add(arg).wrap()
 
-    public override operator fun StructureND<Float>.minus(arg: Float): Nd4jArrayStructure<Float> =
+    override operator fun StructureND<Float>.minus(arg: Float): Nd4jArrayStructure<Float> =
         ndArray.sub(arg).wrap()
 
-    public override operator fun StructureND<Float>.times(arg: Float): Nd4jArrayStructure<Float> =
+    override operator fun StructureND<Float>.times(arg: Float): Nd4jArrayStructure<Float> =
         ndArray.mul(arg).wrap()
 
-    public override operator fun Float.div(arg: StructureND<Float>): Nd4jArrayStructure<Float> =
+    override operator fun Float.div(arg: StructureND<Float>): Nd4jArrayStructure<Float> =
         arg.ndArray.rdiv(this).wrap()
 
-    public override operator fun Float.minus(arg: StructureND<Float>): Nd4jArrayStructure<Float> =
+    override operator fun Float.minus(arg: StructureND<Float>): Nd4jArrayStructure<Float> =
         arg.ndArray.rsub(this).wrap()
 }
 
 /**
  * Represents [RingND] over [Nd4jArrayIntStructure].
  */
-public class IntNd4jArrayRing(public override val shape: IntArray) : Nd4jArrayRing<Int, IntRing> {
-    public override val elementContext: IntRing
+public class IntNd4jArrayRing(override val shape: IntArray) : Nd4jArrayRing<Int, IntRing> {
+    override val elementContext: IntRing
         get() = IntRing
 
-    public override fun INDArray.wrap(): Nd4jArrayStructure<Int> = checkShape(this).asIntStructure()
+    override fun INDArray.wrap(): Nd4jArrayStructure<Int> = checkShape(this).asIntStructure()
 
     @OptIn(PerformancePitfall::class)
-    public override val StructureND<Int>.ndArray: INDArray
+    override val StructureND<Int>.ndArray: INDArray
         get() = when (this) {
             is Nd4jArrayStructure<Int> -> checkShape(ndArray)
             else -> Nd4j.zeros(*shape).also {
@@ -322,15 +322,15 @@ public class IntNd4jArrayRing(public override val shape: IntArray) : Nd4jArrayRi
             }
         }
 
-    public override operator fun StructureND<Int>.plus(arg: Int): Nd4jArrayStructure<Int> =
+    override operator fun StructureND<Int>.plus(arg: Int): Nd4jArrayStructure<Int> =
         ndArray.add(arg).wrap()
 
-    public override operator fun StructureND<Int>.minus(arg: Int): Nd4jArrayStructure<Int> =
+    override operator fun StructureND<Int>.minus(arg: Int): Nd4jArrayStructure<Int> =
         ndArray.sub(arg).wrap()
 
-    public override operator fun StructureND<Int>.times(arg: Int): Nd4jArrayStructure<Int> =
+    override operator fun StructureND<Int>.times(arg: Int): Nd4jArrayStructure<Int> =
         ndArray.mul(arg).wrap()
 
-    public override operator fun Int.minus(arg: StructureND<Int>): Nd4jArrayStructure<Int> =
+    override operator fun Int.minus(arg: StructureND<Int>): Nd4jArrayStructure<Int> =
         arg.ndArray.rsub(this).wrap()
 }
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
index ffddcef90..97427d5c6 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
@@ -22,13 +22,13 @@ public sealed class Nd4jArrayStructure<T> : MutableStructureND<T> {
      */
     public abstract val ndArray: INDArray
 
-    public override val shape: IntArray get() = ndArray.shape().toIntArray()
+    override val shape: IntArray get() = ndArray.shape().toIntArray()
 
     internal abstract fun elementsIterator(): Iterator<Pair<IntArray, T>>
     internal fun indicesIterator(): Iterator<IntArray> = ndArray.indicesIterator()
 
     @PerformancePitfall
-    public override fun elements(): Sequence<Pair<IntArray, T>> = Sequence(::elementsIterator)
+    override fun elements(): Sequence<Pair<IntArray, T>> = Sequence(::elementsIterator)
 }
 
 private data class Nd4jArrayIntStructure(override val ndArray: INDArray) : Nd4jArrayStructure<Int>() {
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index 456f7c2a9..0674c565e 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -33,105 +33,105 @@ public sealed interface Nd4jTensorAlgebra<T : Number> : AnalyticTensorAlgebra<T>
      */
     public val StructureND<T>.ndArray: INDArray
 
-    public override fun T.plus(other: Tensor<T>): Tensor<T> = other.ndArray.add(this).wrap()
-    public override fun Tensor<T>.plus(value: T): Tensor<T> = ndArray.add(value).wrap()
+    override fun T.plus(other: Tensor<T>): Tensor<T> = other.ndArray.add(this).wrap()
+    override fun Tensor<T>.plus(value: T): Tensor<T> = ndArray.add(value).wrap()
 
-    public override fun Tensor<T>.plus(other: Tensor<T>): Tensor<T> = ndArray.add(other.ndArray).wrap()
+    override fun Tensor<T>.plus(other: Tensor<T>): Tensor<T> = ndArray.add(other.ndArray).wrap()
 
-    public override fun Tensor<T>.plusAssign(value: T) {
+    override fun Tensor<T>.plusAssign(value: T) {
         ndArray.addi(value)
     }
 
-    public override fun Tensor<T>.plusAssign(other: Tensor<T>) {
+    override fun Tensor<T>.plusAssign(other: Tensor<T>) {
         ndArray.addi(other.ndArray)
     }
 
-    public override fun T.minus(other: Tensor<T>): Tensor<T> = other.ndArray.rsub(this).wrap()
-    public override fun Tensor<T>.minus(value: T): Tensor<T> = ndArray.sub(value).wrap()
-    public override fun Tensor<T>.minus(other: Tensor<T>): Tensor<T> = ndArray.sub(other.ndArray).wrap()
+    override fun T.minus(other: Tensor<T>): Tensor<T> = other.ndArray.rsub(this).wrap()
+    override fun Tensor<T>.minus(value: T): Tensor<T> = ndArray.sub(value).wrap()
+    override fun Tensor<T>.minus(other: Tensor<T>): Tensor<T> = ndArray.sub(other.ndArray).wrap()
 
-    public override fun Tensor<T>.minusAssign(value: T) {
+    override fun Tensor<T>.minusAssign(value: T) {
         ndArray.rsubi(value)
     }
 
-    public override fun Tensor<T>.minusAssign(other: Tensor<T>) {
+    override fun Tensor<T>.minusAssign(other: Tensor<T>) {
         ndArray.subi(other.ndArray)
     }
 
-    public override fun T.times(other: Tensor<T>): Tensor<T> = other.ndArray.mul(this).wrap()
+    override fun T.times(other: Tensor<T>): Tensor<T> = other.ndArray.mul(this).wrap()
 
-    public override fun Tensor<T>.times(value: T): Tensor<T> =
+    override fun Tensor<T>.times(value: T): Tensor<T> =
         ndArray.mul(value).wrap()
 
-    public override fun Tensor<T>.times(other: Tensor<T>): Tensor<T> = ndArray.mul(other.ndArray).wrap()
+    override fun Tensor<T>.times(other: Tensor<T>): Tensor<T> = ndArray.mul(other.ndArray).wrap()
 
-    public override fun Tensor<T>.timesAssign(value: T) {
+    override fun Tensor<T>.timesAssign(value: T) {
         ndArray.muli(value)
     }
 
-    public override fun Tensor<T>.timesAssign(other: Tensor<T>) {
+    override fun Tensor<T>.timesAssign(other: Tensor<T>) {
         ndArray.mmuli(other.ndArray)
     }
 
-    public override fun Tensor<T>.unaryMinus(): Tensor<T> = ndArray.neg().wrap()
-    public override fun Tensor<T>.get(i: Int): Tensor<T> = ndArray.slice(i.toLong()).wrap()
-    public override fun Tensor<T>.transpose(i: Int, j: Int): Tensor<T> = ndArray.swapAxes(i, j).wrap()
-    public override fun Tensor<T>.dot(other: Tensor<T>): Tensor<T> = ndArray.mmul(other.ndArray).wrap()
+    override fun Tensor<T>.unaryMinus(): Tensor<T> = ndArray.neg().wrap()
+    override fun Tensor<T>.get(i: Int): Tensor<T> = ndArray.slice(i.toLong()).wrap()
+    override fun Tensor<T>.transpose(i: Int, j: Int): Tensor<T> = ndArray.swapAxes(i, j).wrap()
+    override fun Tensor<T>.dot(other: Tensor<T>): Tensor<T> = ndArray.mmul(other.ndArray).wrap()
 
-    public override fun Tensor<T>.min(dim: Int, keepDim: Boolean): Tensor<T> =
+    override fun Tensor<T>.min(dim: Int, keepDim: Boolean): Tensor<T> =
         ndArray.min(keepDim, dim).wrap()
 
-    public override fun Tensor<T>.sum(dim: Int, keepDim: Boolean): Tensor<T> =
+    override fun Tensor<T>.sum(dim: Int, keepDim: Boolean): Tensor<T> =
         ndArray.sum(keepDim, dim).wrap()
 
-    public override fun Tensor<T>.max(dim: Int, keepDim: Boolean): Tensor<T> =
+    override fun Tensor<T>.max(dim: Int, keepDim: Boolean): Tensor<T> =
         ndArray.max(keepDim, dim).wrap()
 
-    public override fun Tensor<T>.view(shape: IntArray): Tensor<T> = ndArray.reshape(shape).wrap()
-    public override fun Tensor<T>.viewAs(other: Tensor<T>): Tensor<T> = view(other.shape)
+    override fun Tensor<T>.view(shape: IntArray): Tensor<T> = ndArray.reshape(shape).wrap()
+    override fun Tensor<T>.viewAs(other: Tensor<T>): Tensor<T> = view(other.shape)
 
-    public override fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T> =
+    override fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T> =
         ndBase.get().argmax(ndArray, keepDim, dim).wrap()
 
-    public override fun Tensor<T>.mean(dim: Int, keepDim: Boolean): Tensor<T> = ndArray.mean(keepDim, dim).wrap()
+    override fun Tensor<T>.mean(dim: Int, keepDim: Boolean): Tensor<T> = ndArray.mean(keepDim, dim).wrap()
 
-    public override fun Tensor<T>.exp(): Tensor<T> = Transforms.exp(ndArray).wrap()
-    public override fun Tensor<T>.ln(): Tensor<T> = Transforms.log(ndArray).wrap()
-    public override fun Tensor<T>.sqrt(): Tensor<T> = Transforms.sqrt(ndArray).wrap()
-    public override fun Tensor<T>.cos(): Tensor<T> = Transforms.cos(ndArray).wrap()
-    public override fun Tensor<T>.acos(): Tensor<T> = Transforms.acos(ndArray).wrap()
-    public override fun Tensor<T>.cosh(): Tensor<T> = Transforms.cosh(ndArray).wrap()
+    override fun Tensor<T>.exp(): Tensor<T> = Transforms.exp(ndArray).wrap()
+    override fun Tensor<T>.ln(): Tensor<T> = Transforms.log(ndArray).wrap()
+    override fun Tensor<T>.sqrt(): Tensor<T> = Transforms.sqrt(ndArray).wrap()
+    override fun Tensor<T>.cos(): Tensor<T> = Transforms.cos(ndArray).wrap()
+    override fun Tensor<T>.acos(): Tensor<T> = Transforms.acos(ndArray).wrap()
+    override fun Tensor<T>.cosh(): Tensor<T> = Transforms.cosh(ndArray).wrap()
 
-    public override fun Tensor<T>.acosh(): Tensor<T> =
+    override fun Tensor<T>.acosh(): Tensor<T> =
         Nd4j.getExecutioner().exec(ACosh(ndArray, ndArray.ulike())).wrap()
 
-    public override fun Tensor<T>.sin(): Tensor<T> = Transforms.sin(ndArray).wrap()
-    public override fun Tensor<T>.asin(): Tensor<T> = Transforms.asin(ndArray).wrap()
-    public override fun Tensor<T>.sinh(): Tensor<T> = Transforms.sinh(ndArray).wrap()
+    override fun Tensor<T>.sin(): Tensor<T> = Transforms.sin(ndArray).wrap()
+    override fun Tensor<T>.asin(): Tensor<T> = Transforms.asin(ndArray).wrap()
+    override fun Tensor<T>.sinh(): Tensor<T> = Transforms.sinh(ndArray).wrap()
 
-    public override fun Tensor<T>.asinh(): Tensor<T> =
+    override fun Tensor<T>.asinh(): Tensor<T> =
         Nd4j.getExecutioner().exec(ASinh(ndArray, ndArray.ulike())).wrap()
 
-    public override fun Tensor<T>.tan(): Tensor<T> = Transforms.tan(ndArray).wrap()
-    public override fun Tensor<T>.atan(): Tensor<T> = Transforms.atan(ndArray).wrap()
-    public override fun Tensor<T>.tanh(): Tensor<T> = Transforms.tanh(ndArray).wrap()
-    public override fun Tensor<T>.atanh(): Tensor<T> = Transforms.atanh(ndArray).wrap()
-    public override fun Tensor<T>.ceil(): Tensor<T> = Transforms.ceil(ndArray).wrap()
-    public override fun Tensor<T>.floor(): Tensor<T> = Transforms.floor(ndArray).wrap()
-    public override fun Tensor<T>.std(dim: Int, keepDim: Boolean): Tensor<T> = ndArray.std(true, keepDim, dim).wrap()
-    public override fun T.div(other: Tensor<T>): Tensor<T> = other.ndArray.rdiv(this).wrap()
-    public override fun Tensor<T>.div(value: T): Tensor<T> = ndArray.div(value).wrap()
-    public override fun Tensor<T>.div(other: Tensor<T>): Tensor<T> = ndArray.div(other.ndArray).wrap()
+    override fun Tensor<T>.tan(): Tensor<T> = Transforms.tan(ndArray).wrap()
+    override fun Tensor<T>.atan(): Tensor<T> = Transforms.atan(ndArray).wrap()
+    override fun Tensor<T>.tanh(): Tensor<T> = Transforms.tanh(ndArray).wrap()
+    override fun Tensor<T>.atanh(): Tensor<T> = Transforms.atanh(ndArray).wrap()
+    override fun Tensor<T>.ceil(): Tensor<T> = Transforms.ceil(ndArray).wrap()
+    override fun Tensor<T>.floor(): Tensor<T> = Transforms.floor(ndArray).wrap()
+    override fun Tensor<T>.std(dim: Int, keepDim: Boolean): Tensor<T> = ndArray.std(true, keepDim, dim).wrap()
+    override fun T.div(other: Tensor<T>): Tensor<T> = other.ndArray.rdiv(this).wrap()
+    override fun Tensor<T>.div(value: T): Tensor<T> = ndArray.div(value).wrap()
+    override fun Tensor<T>.div(other: Tensor<T>): Tensor<T> = ndArray.div(other.ndArray).wrap()
 
-    public override fun Tensor<T>.divAssign(value: T) {
+    override fun Tensor<T>.divAssign(value: T) {
         ndArray.divi(value)
     }
 
-    public override fun Tensor<T>.divAssign(other: Tensor<T>) {
+    override fun Tensor<T>.divAssign(other: Tensor<T>) {
         ndArray.divi(other.ndArray)
     }
 
-    public override fun Tensor<T>.variance(dim: Int, keepDim: Boolean): Tensor<T> =
+    override fun Tensor<T>.variance(dim: Int, keepDim: Boolean): Tensor<T> =
         Nd4j.getExecutioner().exec(Variance(ndArray, true, true, dim)).wrap()
 
     private companion object {
@@ -143,10 +143,10 @@ public sealed interface Nd4jTensorAlgebra<T : Number> : AnalyticTensorAlgebra<T>
  * [Double] specialization of [Nd4jTensorAlgebra].
  */
 public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double> {
-    public override fun INDArray.wrap(): Nd4jArrayStructure<Double> = asDoubleStructure()
+    override fun INDArray.wrap(): Nd4jArrayStructure<Double> = asDoubleStructure()
 
     @OptIn(PerformancePitfall::class)
-    public override val StructureND<Double>.ndArray: INDArray
+    override val StructureND<Double>.ndArray: INDArray
         get() = when (this) {
             is Nd4jArrayStructure<Double> -> ndArray
             else -> Nd4j.zeros(*shape).also {
@@ -154,22 +154,22 @@ public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double> {
             }
         }
 
-    public override fun Tensor<Double>.valueOrNull(): Double? =
+    override fun Tensor<Double>.valueOrNull(): Double? =
         if (shape contentEquals intArrayOf(1)) ndArray.getDouble(0) else null
 
     // TODO rewrite
     @PerformancePitfall
-    public override fun diagonalEmbedding(
+    override fun diagonalEmbedding(
         diagonalEntries: Tensor<Double>,
         offset: Int,
         dim1: Int,
         dim2: Int,
     ): Tensor<Double> = DoubleTensorAlgebra.diagonalEmbedding(diagonalEntries, offset, dim1, dim2)
 
-    public override fun Tensor<Double>.sum(): Double = ndArray.sumNumber().toDouble()
-    public override fun Tensor<Double>.min(): Double = ndArray.minNumber().toDouble()
-    public override fun Tensor<Double>.max(): Double = ndArray.maxNumber().toDouble()
-    public override fun Tensor<Double>.mean(): Double = ndArray.meanNumber().toDouble()
-    public override fun Tensor<Double>.std(): Double = ndArray.stdNumber().toDouble()
-    public override fun Tensor<Double>.variance(): Double = ndArray.varNumber().toDouble()
+    override fun Tensor<Double>.sum(): Double = ndArray.sumNumber().toDouble()
+    override fun Tensor<Double>.min(): Double = ndArray.minNumber().toDouble()
+    override fun Tensor<Double>.max(): Double = ndArray.maxNumber().toDouble()
+    override fun Tensor<Double>.mean(): Double = ndArray.meanNumber().toDouble()
+    override fun Tensor<Double>.std(): Double = ndArray.stdNumber().toDouble()
+    override fun Tensor<Double>.variance(): Double = ndArray.varNumber().toDouble()
 }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
index e3adcdc44..5a74a9a18 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
@@ -19,7 +19,7 @@ public interface Distribution<T : Any> : Sampler<T> {
      */
     public fun probability(arg: T): Double
 
-    public override fun sample(generator: RandomGenerator): Chain<T>
+    override fun sample(generator: RandomGenerator): Chain<T>
 
     /**
      * An empty companion. Distribution factories should be written as its extensions
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
index 04ec8b171..66e041f05 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
@@ -23,14 +23,14 @@ public class NormalDistribution(public val sampler: GaussianSampler) : Univariat
         normalized: NormalizedGaussianSampler = ZigguratNormalizedGaussianSampler,
     ) : this(GaussianSampler(mean, standardDeviation, normalized))
 
-    public override fun probability(arg: Double): Double {
+    override fun probability(arg: Double): Double {
         val x1 = (arg - sampler.mean) / sampler.standardDeviation
         return exp(-0.5 * x1 * x1 - (ln(sampler.standardDeviation) + 0.5 * ln(2 * PI)))
     }
 
-    public override fun sample(generator: RandomGenerator): Chain<Double> = sampler.sample(generator)
+    override fun sample(generator: RandomGenerator): Chain<Double> = sampler.sample(generator)
 
-    public override fun cumulative(arg: Double): Double {
+    override fun cumulative(arg: Double): Double {
         val dev = arg - sampler.mean
 
         return when {
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
index a231842df..77d29981f 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
@@ -24,7 +24,7 @@ public class AhrensDieterExponentialSampler(public val mean: Double) : Sampler<D
         require(mean > 0) { "mean is not strictly positive: $mean" }
     }
 
-    public override fun sample(generator: RandomGenerator): BlockingDoubleChain = object : BlockingDoubleChain {
+    override fun sample(generator: RandomGenerator): BlockingDoubleChain = object : BlockingDoubleChain {
         override fun nextBlocking(): Double {
             // Step 1:
             var a = 0.0
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
index 2f32eee85..93605c7d8 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
@@ -113,8 +113,8 @@ public class AhrensDieterMarsagliaTsangGammaSampler private constructor(
         }
     }
 
-    public override fun sample(generator: RandomGenerator): Chain<Double> = delegate.sample(generator)
-    public override fun toString(): String = delegate.toString()
+    override fun sample(generator: RandomGenerator): Chain<Double> = delegate.sample(generator)
+    override fun toString(): String = delegate.toString()
 
     public companion object {
         public fun of(
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
index db4f598b7..36ddd3c8e 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
@@ -76,7 +76,7 @@ public open class AliasMethodDiscreteSampler private constructor(
         }
     }
 
-    public override fun sample(generator: RandomGenerator): Chain<Int> = generator.chain {
+    override fun sample(generator: RandomGenerator): Chain<Int> = generator.chain {
         // This implements the algorithm as per Vose (1991):
         // v = uniform()  in [0, 1)
         // j = uniform(n) in [0, n)
@@ -107,7 +107,7 @@ public open class AliasMethodDiscreteSampler private constructor(
         if (generator.nextLong() ushr 11 < probability[j]) j else alias[j]
     }
 
-    public override fun toString(): String = "Alias method"
+    override fun toString(): String = "Alias method"
 
     public companion object {
         private const val DEFAULT_ALPHA = 0
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
index d7d8e87b7..9219df43e 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
@@ -28,7 +28,7 @@ public class GaussianSampler(
         require(standardDeviation > 0.0) { "standard deviation is not strictly positive: $standardDeviation" }
     }
 
-    public override fun sample(generator: RandomGenerator): BlockingDoubleChain = normalized
+    override fun sample(generator: RandomGenerator): BlockingDoubleChain = normalized
         .sample(generator)
         .map { standardDeviation * it + mean }
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
index 9bb48fe4e..14737decb 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
@@ -27,7 +27,7 @@ public class KempSmallMeanPoissonSampler internal constructor(
     private val p0: Double,
     private val mean: Double,
 ) : Sampler<Int> {
-    public override fun sample(generator: RandomGenerator): BlockingIntChain = object : BlockingIntChain {
+    override fun sample(generator: RandomGenerator): BlockingIntChain = object : BlockingIntChain {
         override fun nextBlocking(): Int {
             //TODO move to nextBufferBlocking
             // Note on the algorithm:
@@ -60,7 +60,7 @@ public class KempSmallMeanPoissonSampler internal constructor(
         override suspend fun fork(): BlockingIntChain = sample(generator.fork())
     }
 
-    public override fun toString(): String = "Kemp Small Mean Poisson deviate"
+    override fun toString(): String = "Kemp Small Mean Poisson deviate"
 }
 
 public fun KempSmallMeanPoissonSampler(mean: Double): KempSmallMeanPoissonSampler {
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
index e95778b9e..2177e41ab 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
@@ -58,7 +58,7 @@ public class SmallMeanPoissonSampler(public val mean: Double) : Sampler<Int> {
         throw IllegalArgumentException("No p(x=0) probability for mean: $mean")
     }.toInt()
 
-    public override fun sample(generator: RandomGenerator): BlockingIntChain = object : BlockingIntChain {
+    override fun sample(generator: RandomGenerator): BlockingIntChain = object : BlockingIntChain {
         override fun nextBlocking(): Int {
             var n = 0
             var r = 1.0
@@ -76,7 +76,7 @@ public class SmallMeanPoissonSampler(public val mean: Double) : Sampler<Int> {
         override suspend fun fork(): BlockingIntChain = sample(generator.fork())
     }
 
-    public override fun toString(): String = "Small Mean Poisson deviate"
+    override fun toString(): String = "Small Mean Poisson deviate"
 }
 
 
@@ -113,7 +113,7 @@ public class LargeMeanPoissonSampler(public val mean: Double) : Sampler<Int> {
     private val p1: Double = a1 / aSum
     private val p2: Double = a2 / aSum
 
-    public override fun sample(generator: RandomGenerator): BlockingIntChain = object : BlockingIntChain {
+    override fun sample(generator: RandomGenerator): BlockingIntChain = object : BlockingIntChain {
         override fun nextBlocking(): Int {
             val exponential = AhrensDieterExponentialSampler(1.0).sample(generator)
             val gaussian = ZigguratNormalizedGaussianSampler.sample(generator)
@@ -197,7 +197,7 @@ public class LargeMeanPoissonSampler(public val mean: Double) : Sampler<Int> {
     }
 
     private fun getFactorialLog(n: Int): Double = factorialLog.value(n)
-    public override fun toString(): String = "Large Mean Poisson deviate"
+    override fun toString(): String = "Large Mean Poisson deviate"
 
     public companion object {
         private const val MAX_MEAN: Double = 0.5 * Int.MAX_VALUE
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
index 9769146fb..ac2c2098f 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
@@ -27,13 +27,13 @@ public class Mean<T>(
 
     override suspend fun evaluate(data: Buffer<T>): T = super<ComposableStatistic>.evaluate(data)
 
-    public override suspend fun computeIntermediate(data: Buffer<T>): Pair<T, Int> =
+    override suspend fun computeIntermediate(data: Buffer<T>): Pair<T, Int> =
         evaluateBlocking(data) to data.size
 
-    public override suspend fun composeIntermediate(first: Pair<T, Int>, second: Pair<T, Int>): Pair<T, Int> =
+    override suspend fun composeIntermediate(first: Pair<T, Int>, second: Pair<T, Int>): Pair<T, Int> =
         group { first.first + second.first } to (first.second + second.second)
 
-    public override suspend fun toResult(intermediate: Pair<T, Int>): T = group {
+    override suspend fun toResult(intermediate: Pair<T, Int>): T = group {
         division(intermediate.first, intermediate.second)
     }
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
index 70754eab7..2cc867fb2 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
@@ -12,7 +12,7 @@ import space.kscience.kmath.structures.asSequence
  * Non-composable median
  */
 public class Median<T>(private val comparator: Comparator<T>) : BlockingStatistic<T, T> {
-    public override fun evaluateBlocking(data: Buffer<T>): T =
+    override fun evaluateBlocking(data: Buffer<T>): T =
         data.asSequence().sortedWith(comparator).toList()[data.size / 2] //TODO check if this is correct
 
     public companion object {
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
index 5041e7359..d4bc36b5b 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
@@ -31,7 +31,7 @@ public fun <R> RandomGenerator.chain(generator: suspend RandomGenerator.() -> R)
  * A type-specific double chunk random chain
  */
 public class UniformDoubleChain(public val generator: RandomGenerator) : BlockingDoubleChain {
-    public override fun nextBufferBlocking(size: Int): DoubleBuffer = generator.nextDoubleBuffer(size)
+    override fun nextBufferBlocking(size: Int): DoubleBuffer = generator.nextDoubleBuffer(size)
     override suspend fun nextBuffer(size: Int): DoubleBuffer = nextBufferBlocking(size)
 
     override suspend fun fork(): UniformDoubleChain = UniformDoubleChain(generator.fork())
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
index 3ff12f383..5698f1a79 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
@@ -97,17 +97,17 @@ public interface RandomGenerator {
  * @property random the underlying [Random] object.
  */
 public class DefaultGenerator(public val random: Random = Random) : RandomGenerator {
-    public override fun nextBoolean(): Boolean = random.nextBoolean()
-    public override fun nextDouble(): Double = random.nextDouble()
-    public override fun nextInt(): Int = random.nextInt()
-    public override fun nextInt(until: Int): Int = random.nextInt(until)
-    public override fun nextLong(): Long = random.nextLong()
-    public override fun nextLong(until: Long): Long = random.nextLong(until)
+    override fun nextBoolean(): Boolean = random.nextBoolean()
+    override fun nextDouble(): Double = random.nextDouble()
+    override fun nextInt(): Int = random.nextInt()
+    override fun nextInt(until: Int): Int = random.nextInt(until)
+    override fun nextLong(): Long = random.nextLong()
+    override fun nextLong(until: Long): Long = random.nextLong(until)
 
-    public override fun fillBytes(array: ByteArray, fromIndex: Int, toIndex: Int) {
+    override fun fillBytes(array: ByteArray, fromIndex: Int, toIndex: Int) {
         random.nextBytes(array, fromIndex, toIndex)
     }
 
-    public override fun nextBytes(size: Int): ByteArray = random.nextBytes(size)
-    public override fun fork(): RandomGenerator = RandomGenerator.default(random.nextLong())
+    override fun nextBytes(size: Int): ByteArray = random.nextBytes(size)
+    override fun fork(): RandomGenerator = RandomGenerator.default(random.nextLong())
 }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
index 27465eff4..849cf152a 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
@@ -19,7 +19,7 @@ import space.kscience.kmath.operations.invoke
  * @property value the value to sample.
  */
 public class ConstantSampler<out T : Any>(public val value: T) : Sampler<T> {
-    public override fun sample(generator: RandomGenerator): Chain<T> = ConstantChain(value)
+    override fun sample(generator: RandomGenerator): Chain<T> = ConstantChain(value)
 }
 
 /**
@@ -28,7 +28,7 @@ public class ConstantSampler<out T : Any>(public val value: T) : Sampler<T> {
  * @property chainBuilder the provider of [Chain].
  */
 public class BasicSampler<out T : Any>(public val chainBuilder: (RandomGenerator) -> Chain<T>) : Sampler<T> {
-    public override fun sample(generator: RandomGenerator): Chain<T> = chainBuilder(generator)
+    override fun sample(generator: RandomGenerator): Chain<T> = chainBuilder(generator)
 }
 
 /**
@@ -39,17 +39,17 @@ public class BasicSampler<out T : Any>(public val chainBuilder: (RandomGenerator
 public class SamplerSpace<T : Any, out S>(public val algebra: S) : Group<Sampler<T>>,
     ScaleOperations<Sampler<T>> where S : Group<T>, S : ScaleOperations<T> {
 
-    public override val zero: Sampler<T> = ConstantSampler(algebra.zero)
+    override val zero: Sampler<T> = ConstantSampler(algebra.zero)
 
-    public override fun add(a: Sampler<T>, b: Sampler<T>): Sampler<T> = BasicSampler { generator ->
+    override fun add(a: Sampler<T>, b: Sampler<T>): Sampler<T> = BasicSampler { generator ->
         a.sample(generator).zip(b.sample(generator)) { aValue, bValue -> algebra { aValue + bValue } }
     }
 
-    public override fun scale(a: Sampler<T>, value: Double): Sampler<T> = BasicSampler { generator ->
+    override fun scale(a: Sampler<T>, value: Double): Sampler<T> = BasicSampler { generator ->
         a.sample(generator).map { a ->
             algebra { a * value }
         }
     }
 
-    public override fun Sampler<T>.unaryMinus(): Sampler<T> = scale(this, -1.0)
+    override fun Sampler<T>.unaryMinus(): Sampler<T> = scale(this, -1.0)
 }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
index f29b7415c..499dcac6a 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
@@ -44,7 +44,7 @@ public interface ComposableStatistic<in T, I, out R> : Statistic<T, R> {
     //Transform block to result
     public suspend fun toResult(intermediate: I): R
 
-    public override suspend fun evaluate(data: Buffer<T>): R = toResult(computeIntermediate(data))
+    override suspend fun evaluate(data: Buffer<T>): R = toResult(computeIntermediate(data))
 }
 
 @FlowPreview
diff --git a/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt b/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
index 1ff6481ac..7aaac7d32 100644
--- a/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
+++ b/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
@@ -17,19 +17,19 @@ public class RandomSourceGenerator internal constructor(public val source: Rando
     internal val random: UniformRandomProvider = seed?.let { RandomSource.create(source, seed) }
         ?: RandomSource.create(source)
 
-    public override fun nextBoolean(): Boolean = random.nextBoolean()
-    public override fun nextDouble(): Double = random.nextDouble()
-    public override fun nextInt(): Int = random.nextInt()
-    public override fun nextInt(until: Int): Int = random.nextInt(until)
-    public override fun nextLong(): Long = random.nextLong()
-    public override fun nextLong(until: Long): Long = random.nextLong(until)
+    override fun nextBoolean(): Boolean = random.nextBoolean()
+    override fun nextDouble(): Double = random.nextDouble()
+    override fun nextInt(): Int = random.nextInt()
+    override fun nextInt(until: Int): Int = random.nextInt(until)
+    override fun nextLong(): Long = random.nextLong()
+    override fun nextLong(until: Long): Long = random.nextLong(until)
 
-    public override fun fillBytes(array: ByteArray, fromIndex: Int, toIndex: Int) {
+    override fun fillBytes(array: ByteArray, fromIndex: Int, toIndex: Int) {
         require(toIndex > fromIndex)
         random.nextBytes(array, fromIndex, toIndex - fromIndex)
     }
 
-    public override fun fork(): RandomGenerator = RandomSourceGenerator(source, nextLong())
+    override fun fork(): RandomGenerator = RandomSourceGenerator(source, nextLong())
 }
 
 /**
@@ -43,14 +43,14 @@ public class RandomGeneratorProvider(public val generator: RandomGenerator) : Un
      *
      * @return the next random value.
      */
-    public override fun nextBoolean(): Boolean = generator.nextBoolean()
+    override fun nextBoolean(): Boolean = generator.nextBoolean()
 
     /**
      * Generates a [Float] value between 0 and 1.
      *
      * @return the next random value between 0 and 1.
      */
-    public override fun nextFloat(): Float = generator.nextDouble().toFloat()
+    override fun nextFloat(): Float = generator.nextDouble().toFloat()
 
     /**
      * Generates [Byte] values and places them into a user-supplied array.
@@ -59,7 +59,7 @@ public class RandomGeneratorProvider(public val generator: RandomGenerator) : Un
      *
      * @param bytes byte array in which to put the random bytes.
      */
-    public override fun nextBytes(bytes: ByteArray): Unit = generator.fillBytes(bytes)
+    override fun nextBytes(bytes: ByteArray): Unit = generator.fillBytes(bytes)
 
     /**
      * Generates [Byte] values and places them into a user-supplied array.
@@ -71,7 +71,7 @@ public class RandomGeneratorProvider(public val generator: RandomGenerator) : Un
      * @param start the index at which to start inserting the generated bytes.
      * @param len the number of bytes to insert.
      */
-    public override fun nextBytes(bytes: ByteArray, start: Int, len: Int) {
+    override fun nextBytes(bytes: ByteArray, start: Int, len: Int) {
         generator.fillBytes(bytes, start, start + len)
     }
 
@@ -80,7 +80,7 @@ public class RandomGeneratorProvider(public val generator: RandomGenerator) : Un
      *
      * @return the next random value.
      */
-    public override fun nextInt(): Int = generator.nextInt()
+    override fun nextInt(): Int = generator.nextInt()
 
     /**
      * Generates an [Int] value between 0 (inclusive) and the specified value (exclusive).
@@ -88,21 +88,21 @@ public class RandomGeneratorProvider(public val generator: RandomGenerator) : Un
      * @param n the bound on the random number to be returned. Must be positive.
      * @return a random integer between 0 (inclusive) and [n] (exclusive).
      */
-    public override fun nextInt(n: Int): Int = generator.nextInt(n)
+    override fun nextInt(n: Int): Int = generator.nextInt(n)
 
     /**
      * Generates a [Double] value between 0 and 1.
      *
      * @return the next random value between 0 and 1.
      */
-    public override fun nextDouble(): Double = generator.nextDouble()
+    override fun nextDouble(): Double = generator.nextDouble()
 
     /**
      * Generates a [Long] value.
      *
      * @return the next random value.
      */
-    public override fun nextLong(): Long = generator.nextLong()
+    override fun nextLong(): Long = generator.nextLong()
 
     /**
      * Generates a [Long] value between 0 (inclusive) and the specified value (exclusive).
@@ -110,7 +110,7 @@ public class RandomGeneratorProvider(public val generator: RandomGenerator) : Un
      * @param n Bound on the random number to be returned.  Must be positive.
      * @return a random long value between 0 (inclusive) and [n] (exclusive).
      */
-    public override fun nextLong(n: Long): Long = generator.nextLong(n)
+    override fun nextLong(n: Long): Long = generator.nextLong(n)
 }
 
 /**
diff --git a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
index 88f0c941e..3067b5efb 100644
--- a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
+++ b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
@@ -30,9 +30,9 @@ public class SymjaExpression<T : Number, A : NumericAlgebra<T>>(
     public val mst: MST,
     public val evaluator: ExprEvaluator = DEFAULT_EVALUATOR,
 ) : SpecialDifferentiableExpression<T, SymjaExpression<T, A>> {
-    public override fun invoke(arguments: Map<Symbol, T>): T = mst.interpret(algebra, arguments)
+    override fun invoke(arguments: Map<Symbol, T>): T = mst.interpret(algebra, arguments)
 
-    public override fun derivativeOrNull(symbols: List<Symbol>): SymjaExpression<T, A> = SymjaExpression(
+    override fun derivativeOrNull(symbols: List<Symbol>): SymjaExpression<T, A> = SymjaExpression(
         algebra,
         symbols.map(Symbol::toIExpr).fold(mst.toIExpr(), F::D).toMst(evaluator),
         evaluator,
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
index bbf502faf..c7f45c6da 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
@@ -10,15 +10,15 @@ import space.kscience.kmath.structures.MutableBuffer
 
 @Suppress("NOTHING_TO_INLINE", "OVERRIDE_BY_INLINE")
 public class ViktorBuffer(public val flatArray: F64FlatArray) : MutableBuffer<Double> {
-    public override val size: Int
+    override val size: Int
         get() = flatArray.size
 
-    public override inline fun get(index: Int): Double = flatArray[index]
+    override inline fun get(index: Int): Double = flatArray[index]
 
-    public override inline fun set(index: Int, value: Double) {
+    override inline fun set(index: Int, value: Double) {
         flatArray[index] = value
     }
 
-    public override fun copy(): MutableBuffer<Double> = ViktorBuffer(flatArray.copy().flatten())
-    public override operator fun iterator(): Iterator<Double> = flatArray.data.iterator()
+    override fun copy(): MutableBuffer<Double> = ViktorBuffer(flatArray.copy().flatten())
+    override operator fun iterator(): Iterator<Double> = flatArray.data.iterator()
 }
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index 915637e2c..2be964017 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -16,16 +16,16 @@ import space.kscience.kmath.operations.ScaleOperations
 
 @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public class ViktorStructureND(public val f64Buffer: F64Array) : MutableStructureND<Double> {
-    public override val shape: IntArray get() = f64Buffer.shape
+    override val shape: IntArray get() = f64Buffer.shape
 
-    public override inline fun get(index: IntArray): Double = f64Buffer.get(*index)
+    override inline fun get(index: IntArray): Double = f64Buffer.get(*index)
 
-    public override inline fun set(index: IntArray, value: Double) {
+    override inline fun set(index: IntArray, value: Double) {
         f64Buffer.set(*index, value = value)
     }
 
     @PerformancePitfall
-    public override fun elements(): Sequence<Pair<IntArray, Double>> =
+    override fun elements(): Sequence<Pair<IntArray, Double>> =
         DefaultStrides(shape).indices().map { it to get(it) }
 }
 
@@ -33,7 +33,7 @@ public fun F64Array.asStructure(): ViktorStructureND = ViktorStructureND(this)
 
 @OptIn(UnstableKMathAPI::class)
 @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-public class ViktorFieldND(public override val shape: IntArray) : FieldND<Double, DoubleField>,
+public class ViktorFieldND(override val shape: IntArray) : FieldND<Double, DoubleField>,
     NumbersAddOperations<StructureND<Double>>, ExtendedField<StructureND<Double>>,
     ScaleOperations<StructureND<Double>> {
 
@@ -47,30 +47,30 @@ public class ViktorFieldND(public override val shape: IntArray) : FieldND<Double
             else -> produce { this@f64Buffer[it] }.f64Buffer
         }
 
-    public override val zero: ViktorStructureND by lazy { F64Array.full(init = 0.0, shape = shape).asStructure() }
-    public override val one: ViktorStructureND by lazy { F64Array.full(init = 1.0, shape = shape).asStructure() }
+    override val zero: ViktorStructureND by lazy { F64Array.full(init = 0.0, shape = shape).asStructure() }
+    override val one: ViktorStructureND by lazy { F64Array.full(init = 1.0, shape = shape).asStructure() }
 
     private val strides: Strides = DefaultStrides(shape)
 
-    public override val elementContext: DoubleField get() = DoubleField
+    override val elementContext: DoubleField get() = DoubleField
 
-    public override fun produce(initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
+    override fun produce(initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
         F64Array(*shape).apply {
             this@ViktorFieldND.strides.indices().forEach { index ->
                 set(value = DoubleField.initializer(index), indices = index)
             }
         }.asStructure()
 
-    public override fun StructureND<Double>.unaryMinus(): StructureND<Double> = -1 * this
+    override fun StructureND<Double>.unaryMinus(): StructureND<Double> = -1 * this
 
-    public override fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): ViktorStructureND =
+    override fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): ViktorStructureND =
         F64Array(*this@ViktorFieldND.shape).apply {
             this@ViktorFieldND.strides.indices().forEach { index ->
                 set(value = DoubleField.transform(this@map[index]), indices = index)
             }
         }.asStructure()
 
-    public override fun StructureND<Double>.mapIndexed(
+    override fun StructureND<Double>.mapIndexed(
         transform: DoubleField.(index: IntArray, Double) -> Double,
     ): ViktorStructureND = F64Array(*this@ViktorFieldND.shape).apply {
         this@ViktorFieldND.strides.indices().forEach { index ->
@@ -78,7 +78,7 @@ public class ViktorFieldND(public override val shape: IntArray) : FieldND<Double
         }
     }.asStructure()
 
-    public override fun combine(
+    override fun combine(
         a: StructureND<Double>,
         b: StructureND<Double>,
         transform: DoubleField.(Double, Double) -> Double,
@@ -88,39 +88,39 @@ public class ViktorFieldND(public override val shape: IntArray) : FieldND<Double
         }
     }.asStructure()
 
-    public override fun add(a: StructureND<Double>, b: StructureND<Double>): ViktorStructureND =
+    override fun add(a: StructureND<Double>, b: StructureND<Double>): ViktorStructureND =
         (a.f64Buffer + b.f64Buffer).asStructure()
 
-    public override fun scale(a: StructureND<Double>, value: Double): ViktorStructureND =
+    override fun scale(a: StructureND<Double>, value: Double): ViktorStructureND =
         (a.f64Buffer * value).asStructure()
 
-    public override inline fun StructureND<Double>.plus(b: StructureND<Double>): ViktorStructureND =
+    override inline fun StructureND<Double>.plus(b: StructureND<Double>): ViktorStructureND =
         (f64Buffer + b.f64Buffer).asStructure()
 
-    public override inline fun StructureND<Double>.minus(b: StructureND<Double>): ViktorStructureND =
+    override inline fun StructureND<Double>.minus(b: StructureND<Double>): ViktorStructureND =
         (f64Buffer - b.f64Buffer).asStructure()
 
-    public override inline fun StructureND<Double>.times(k: Number): ViktorStructureND =
+    override inline fun StructureND<Double>.times(k: Number): ViktorStructureND =
         (f64Buffer * k.toDouble()).asStructure()
 
-    public override inline fun StructureND<Double>.plus(arg: Double): ViktorStructureND =
+    override inline fun StructureND<Double>.plus(arg: Double): ViktorStructureND =
         (f64Buffer.plus(arg)).asStructure()
 
-    public override fun number(value: Number): ViktorStructureND =
+    override fun number(value: Number): ViktorStructureND =
         F64Array.full(init = value.toDouble(), shape = shape).asStructure()
 
-    public override fun sin(arg: StructureND<Double>): ViktorStructureND = arg.map { sin(it) }
-    public override fun cos(arg: StructureND<Double>): ViktorStructureND = arg.map { cos(it) }
-    public override fun tan(arg: StructureND<Double>): ViktorStructureND = arg.map { tan(it) }
-    public override fun asin(arg: StructureND<Double>): ViktorStructureND = arg.map { asin(it) }
-    public override fun acos(arg: StructureND<Double>): ViktorStructureND = arg.map { acos(it) }
-    public override fun atan(arg: StructureND<Double>): ViktorStructureND = arg.map { atan(it) }
+    override fun sin(arg: StructureND<Double>): ViktorStructureND = arg.map { sin(it) }
+    override fun cos(arg: StructureND<Double>): ViktorStructureND = arg.map { cos(it) }
+    override fun tan(arg: StructureND<Double>): ViktorStructureND = arg.map { tan(it) }
+    override fun asin(arg: StructureND<Double>): ViktorStructureND = arg.map { asin(it) }
+    override fun acos(arg: StructureND<Double>): ViktorStructureND = arg.map { acos(it) }
+    override fun atan(arg: StructureND<Double>): ViktorStructureND = arg.map { atan(it) }
 
-    public override fun power(arg: StructureND<Double>, pow: Number): ViktorStructureND = arg.map { it.pow(pow) }
+    override fun power(arg: StructureND<Double>, pow: Number): ViktorStructureND = arg.map { it.pow(pow) }
 
-    public override fun exp(arg: StructureND<Double>): ViktorStructureND = arg.f64Buffer.exp().asStructure()
+    override fun exp(arg: StructureND<Double>): ViktorStructureND = arg.f64Buffer.exp().asStructure()
 
-    public override fun ln(arg: StructureND<Double>): ViktorStructureND = arg.f64Buffer.log().asStructure()
+    override fun ln(arg: StructureND<Double>): ViktorStructureND = arg.f64Buffer.log().asStructure()
 }
 
 public fun ViktorNDField(vararg shape: Int): ViktorFieldND = ViktorFieldND(shape)
-- 
2.34.1


From bc2841295027760a1d8110df7fbda04c84c47810 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 21 Jul 2021 00:00:35 +0700
Subject: [PATCH 301/713] Update publish.yml

---
 .github/workflows/build.yml   |  8 ++++----
 .github/workflows/publish.yml | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2b611a46a..2eb9f34b3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,9 +2,7 @@ name: Gradle build
 
 on:
   push:
-    branches:
-      - dev
-      - master
+    branches: [ dev, master ]
   pull_request:
 
 jobs:
@@ -26,7 +24,9 @@ jobs:
       - name: Cache gradle
         uses: actions/cache@v2
         with:
-          path: ~/.gradle/caches
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index d1698d79b..13bbabbc9 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -42,11 +42,13 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: >
           ./gradlew release --no-daemon -Ppublishing.enabled=true
-          -Ppublishing.space.user=${{ secrets.PUBLISHING_SPACE_USER }}
-          -Ppublishing.space.token=${{ secrets.PUBLISHING_SPACE_TOKEN }}
+          -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
+          -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
+          -Ppublishing.sonatype=false
       - name: Publish Mac Artifacts
         if: matrix.os == 'macOS-latest'
         run: >
           ./gradlew release --no-daemon -Ppublishing.enabled=true -Ppublishing.platform=macosX64
-          -Ppublishing.space.user=${{ secrets.PUBLISHING_SPACE_USER }}
-          -Ppublishing.space.token=${{ secrets.PUBLISHING_SPACE_TOKEN }}
+          -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
+          -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
+          -Ppublishing.sonatype=false
-- 
2.34.1


From ec8f14a6e91035fc5f3e01a55edaa8d99975ab38 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 21 Jul 2021 00:00:35 +0700
Subject: [PATCH 302/713] Fix publish.yml

---
 .github/workflows/publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 13bbabbc9..05c1c603e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -40,9 +40,9 @@ jobs:
             ${{ runner.os }}-gradle-
       - name: Publish Windows Artifacts
         if: matrix.os == 'windows-latest'
+        shell: cmd
         run: >
-          ./gradlew release --no-daemon -Ppublishing.enabled=true
-          -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
+          ./gradlew release --no-daemon -Ppublishing.enabled=true -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
           -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
           -Ppublishing.sonatype=false
       - name: Publish Mac Artifacts
-- 
2.34.1


From 8b3298f7a888bee9682d4ba9276ffb1c81b141ef Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sun, 20 Jun 2021 17:57:33 +0700
Subject: [PATCH 303/713] Exact conversions from Long to Int, Int indexing of
 Dimension

---
 .../kmath/structures/typeSafeDimensions.kt       |  2 +-
 .../commons/random/CMRandomGeneratorWrapper.kt   |  3 ++-
 .../kotlin/space/kscience/kmath/misc/numbers.kt  |  8 ++++++++
 .../kotlin/space/kscience/kmath/misc/numbers.kt  | 12 ++++++++++++
 .../space/kscience/kmath/misc/numbersJVM.kt      |  8 ++++++++
 .../kotlin/space/kscience/kmath/misc/numbers.kt  | 12 ++++++++++++
 .../dimensions/{Dimensions.kt => Dimension.kt}   | 16 ++++++++--------
 .../space/kscience/kmath/dimensions/Wrappers.kt  | 16 ++++++++--------
 .../kmath/dimensions/{dimJs.kt => Dimension.kt}  |  8 ++++----
 .../kmath/dimensions/{dimJvm.kt => Dimension.kt} | 14 ++++++++------
 .../dimensions/{dimNative.kt => Dimension.kt}    |  8 ++++----
 .../kotlin/space/kscience/kmath/nd4j/arrays.kt   |  4 +++-
 .../kscience/kmath/samplers/PoissonSampler.kt    |  5 +++--
 .../ZigguratNormalizedGaussianSampler.kt         |  3 ++-
 14 files changed, 83 insertions(+), 36 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt
 create mode 100644 kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt
 create mode 100644 kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt
 create mode 100644 kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt
 rename kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/{Dimensions.kt => Dimension.kt} (67%)
 rename kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/{dimJs.kt => Dimension.kt} (62%)
 rename kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/{dimJvm.kt => Dimension.kt} (69%)
 rename kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/{dimNative.kt => Dimension.kt} (65%)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt
index 955f86fa9..c28b566b9 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt
@@ -19,7 +19,7 @@ private fun DMatrixContext<Double, *>.simple() {
 }
 
 private object D5 : Dimension {
-    override val dim: UInt = 5u
+    override val dim: Int = 5
 }
 
 private fun DMatrixContext<Double, *>.custom() {
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
index afbfd9a24..6aeebb68c 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.commons.random
 import kotlinx.coroutines.runBlocking
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.samplers.GaussianSampler
+import space.kscience.kmath.misc.toIntExact
 import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.stat.next
 
@@ -28,7 +29,7 @@ public class CMRandomGeneratorWrapper(
     }
 
     override fun setSeed(seed: Long) {
-        setSeed(seed.toInt())
+        setSeed(seed.toIntExact())
     }
 
     override fun nextBytes(bytes: ByteArray) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt
new file mode 100644
index 000000000..f879a06d5
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.misc
+
+public expect fun Long.toIntExact(): Int
diff --git a/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt
new file mode 100644
index 000000000..68a3c995b
--- /dev/null
+++ b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.misc
+
+public actual fun Long.toIntExact(): Int {
+    val i = toInt()
+    if (i.toLong() == this) throw ArithmeticException("integer overflow")
+    return i
+}
diff --git a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt
new file mode 100644
index 000000000..5ba0dbc9b
--- /dev/null
+++ b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.misc
+
+public actual fun Long.toIntExact(): Int = Math.toIntExact(this)
diff --git a/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt
new file mode 100644
index 000000000..68a3c995b
--- /dev/null
+++ b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.misc
+
+public actual fun Long.toIntExact(): Int {
+    val i = toInt()
+    if (i.toLong() == this) throw ArithmeticException("integer overflow")
+    return i
+}
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimensions.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
similarity index 67%
rename from kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimensions.kt
rename to kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index 8b17d252f..e57c22834 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimensions.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -8,47 +8,47 @@ package space.kscience.kmath.dimensions
 import kotlin.reflect.KClass
 
 /**
- * Represents a quantity of dimensions in certain structure.
+ * Represents a quantity of dimensions in certain structure. **This interface must be implemented only by objects.**
  *
  * @property dim The number of dimensions.
  */
 public interface Dimension {
-    public val dim: UInt
+    public val dim: Int
 
     public companion object
 }
 
-public fun <D : Dimension> KClass<D>.dim(): UInt = Dimension.resolve(this).dim
+public fun <D : Dimension> KClass<D>.dim(): Int = Dimension.resolve(this).dim
 
 public expect fun <D : Dimension> Dimension.Companion.resolve(type: KClass<D>): D
 
 /**
  * Finds or creates [Dimension] with [Dimension.dim] equal to [dim].
  */
-public expect fun Dimension.Companion.of(dim: UInt): Dimension
+public expect fun Dimension.Companion.of(dim: Int): Dimension
 
 /**
  * Finds [Dimension.dim] of given type [D].
  */
-public inline fun <reified D : Dimension> Dimension.Companion.dim(): UInt = D::class.dim()
+public inline fun <reified D : Dimension> Dimension.Companion.dim(): Int = D::class.dim()
 
 /**
  * Type representing 1 dimension.
  */
 public object D1 : Dimension {
-    override val dim: UInt get() = 1U
+    override val dim: Int get() = 1
 }
 
 /**
  * Type representing 2 dimensions.
  */
 public object D2 : Dimension {
-    override val dim: UInt get() = 2U
+    override val dim: Int get() = 2
 }
 
 /**
  * Type representing 3 dimensions.
  */
 public object D3 : Dimension {
-    override val dim: UInt get() = 3U
+    override val dim: Int get() = 3
 }
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
index a2ee14301..deb297913 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
@@ -23,11 +23,11 @@ public interface DMatrix<out T, R : Dimension, C : Dimension> : Structure2D<T> {
          * Coerces a regular matrix to a matrix with type-safe dimensions and throws a error if coercion failed
          */
         public inline fun <T, reified R : Dimension, reified C : Dimension> coerce(structure: Structure2D<T>): DMatrix<T, R, C> {
-            require(structure.rowNum == Dimension.dim<R>().toInt()) {
+            require(structure.rowNum == Dimension.dim<R>()) {
                 "Row number mismatch: expected ${Dimension.dim<R>()} but found ${structure.rowNum}"
             }
 
-            require(structure.colNum == Dimension.dim<C>().toInt()) {
+            require(structure.colNum == Dimension.dim<C>()) {
                 "Column number mismatch: expected ${Dimension.dim<C>()} but found ${structure.colNum}"
             }
 
@@ -61,7 +61,7 @@ public value class DMatrixWrapper<out T, R : Dimension, C : Dimension>(
 public interface DPoint<out T, D : Dimension> : Point<T> {
     public companion object {
         public inline fun <T, reified D : Dimension> coerce(point: Point<T>): DPoint<T, D> {
-            require(point.size == Dimension.dim<D>().toInt()) {
+            require(point.size == Dimension.dim<D>()) {
                 "Vector dimension mismatch: expected ${Dimension.dim<D>()}, but found ${point.size}"
             }
 
@@ -92,11 +92,11 @@ public value class DPointWrapper<out T, D : Dimension>(public val point: Point<T
 @JvmInline
 public value class DMatrixContext<T : Any, out A : Ring<T>>(public val context: LinearSpace<T, A>) {
     public inline fun <reified R : Dimension, reified C : Dimension> Matrix<T>.coerce(): DMatrix<T, R, C> {
-        require(rowNum == Dimension.dim<R>().toInt()) {
+        require(rowNum == Dimension.dim<R>()) {
             "Row number mismatch: expected ${Dimension.dim<R>()} but found $rowNum"
         }
 
-        require(colNum == Dimension.dim<C>().toInt()) {
+        require(colNum == Dimension.dim<C>()) {
             "Column number mismatch: expected ${Dimension.dim<C>()} but found $colNum"
         }
 
@@ -111,7 +111,7 @@ public value class DMatrixContext<T : Any, out A : Ring<T>>(public val context:
     ): DMatrix<T, R, C> {
         val rows = Dimension.dim<R>()
         val cols = Dimension.dim<C>()
-        return context.buildMatrix(rows.toInt(), cols.toInt(), initializer).coerce()
+        return context.buildMatrix(rows, cols, initializer).coerce()
     }
 
     public inline fun <reified D : Dimension> point(noinline initializer: A.(Int) -> T): DPoint<T, D> {
@@ -119,7 +119,7 @@ public value class DMatrixContext<T : Any, out A : Ring<T>>(public val context:
 
         return DPoint.coerceUnsafe(
             context.buildVector(
-                size.toInt(),
+                size,
                 initializer
             )
         )
@@ -167,4 +167,4 @@ public inline fun <reified D : Dimension> DMatrixContext<Double, DoubleField>.on
 public inline fun <reified R : Dimension, reified C : Dimension> DMatrixContext<Double, DoubleField>.zero(): DMatrix<Double, R, C> =
     produce { _, _ ->
         0.0
-    }
\ No newline at end of file
+    }
diff --git a/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/dimJs.kt b/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
similarity index 62%
rename from kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/dimJs.kt
rename to kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index 27912f5bc..610e8b4c0 100644
--- a/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/dimJs.kt
+++ b/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -7,17 +7,17 @@ package space.kscience.kmath.dimensions
 
 import kotlin.reflect.KClass
 
-private val dimensionMap: MutableMap<UInt, Dimension> = hashMapOf(1u to D1, 2u to D2, 3u to D3)
+private val dimensionMap: MutableMap<Int, Dimension> = hashMapOf(1 to D1, 2 to D2, 3 to D3)
 
 @Suppress("UNCHECKED_CAST")
 public actual fun <D : Dimension> Dimension.Companion.resolve(type: KClass<D>): D = dimensionMap
     .entries
-    .map(MutableMap.MutableEntry<UInt, Dimension>::value)
+    .map(MutableMap.MutableEntry<Int, Dimension>::value)
     .find { it::class == type } as? D
     ?: error("Can't resolve dimension $type")
 
-public actual fun Dimension.Companion.of(dim: UInt): Dimension = dimensionMap.getOrPut(dim) {
+public actual fun Dimension.Companion.of(dim: Int): Dimension = dimensionMap.getOrPut(dim) {
     object : Dimension {
-        override val dim: UInt get() = dim
+        override val dim: Int get() = dim
     }
 }
diff --git a/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/dimJvm.kt b/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
similarity index 69%
rename from kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/dimJvm.kt
rename to kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index f21a3e18f..e6d8b3b35 100644
--- a/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/dimJvm.kt
+++ b/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:JvmName("DimensionJVM")
+
 package space.kscience.kmath.dimensions
 
 import kotlin.reflect.KClass
@@ -10,12 +12,12 @@ import kotlin.reflect.KClass
 public actual fun <D : Dimension> Dimension.Companion.resolve(type: KClass<D>): D =
     type.objectInstance ?: error("No object instance for dimension class")
 
-public actual fun Dimension.Companion.of(dim: UInt): Dimension = when (dim) {
-    1u -> D1
-    2u -> D2
-    3u -> D3
+public actual fun Dimension.Companion.of(dim: Int): Dimension = when (dim) {
+    1 -> D1
+    2 -> D2
+    3 -> D3
 
     else -> object : Dimension {
-        override val dim: UInt get() = dim
+        override val dim: Int get() = dim
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/dimNative.kt b/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
similarity index 65%
rename from kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/dimNative.kt
rename to kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index 9aa58e64a..64edbe935 100644
--- a/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/dimNative.kt
+++ b/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -9,17 +9,17 @@ import kotlin.native.concurrent.ThreadLocal
 import kotlin.reflect.KClass
 
 @ThreadLocal
-private val dimensionMap: MutableMap<UInt, Dimension> = hashMapOf(1u to D1, 2u to D2, 3u to D3)
+private val dimensionMap: MutableMap<Int, Dimension> = hashMapOf(1 to D1, 2 to D2, 3 to D3)
 
 @Suppress("UNCHECKED_CAST")
 public actual fun <D : Dimension> Dimension.Companion.resolve(type: KClass<D>): D = dimensionMap
     .entries
-    .map(MutableMap.MutableEntry<UInt, Dimension>::value)
+    .map(MutableMap.MutableEntry<Int, Dimension>::value)
     .find { it::class == type } as? D
     ?: error("Can't resolve dimension $type")
 
-public actual fun Dimension.Companion.of(dim: UInt): Dimension = dimensionMap.getOrPut(dim) {
+public actual fun Dimension.Companion.of(dim: Int): Dimension = dimensionMap.getOrPut(dim) {
     object : Dimension {
-        override val dim: UInt get() = dim
+        override val dim: Int get() = dim
     }
 }
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
index 75a334ca7..3ca756600 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
@@ -5,4 +5,6 @@
 
 package space.kscience.kmath.nd4j
 
-internal fun LongArray.toIntArray(): IntArray = IntArray(size) { this[it].toInt() }
+import space.kscience.kmath.misc.toIntExact
+
+internal fun LongArray.toIntArray(): IntArray = IntArray(size) { this[it].toIntExact() }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
index 2177e41ab..96131aa4b 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingIntChain
 import space.kscience.kmath.internal.InternalUtils
+import space.kscience.kmath.misc.toIntExact
 import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.stat.Sampler
 import space.kscience.kmath.structures.IntBuffer
@@ -119,7 +120,7 @@ public class LargeMeanPoissonSampler(public val mean: Double) : Sampler<Int> {
             val gaussian = ZigguratNormalizedGaussianSampler.sample(generator)
 
             val smallMeanPoissonSampler = if (mean - lambda < Double.MIN_VALUE) {
-               null
+                null
             } else {
                 KempSmallMeanPoissonSampler(mean - lambda).sample(generator)
             }
@@ -188,7 +189,7 @@ public class LargeMeanPoissonSampler(public val mean: Double) : Sampler<Int> {
                 }
             }
 
-            return min(y2 + y.toLong(), Int.MAX_VALUE.toLong()).toInt()
+            return min(y2 + y.toLong(), Int.MAX_VALUE.toLong()).toIntExact()
         }
 
         override fun nextBufferBlocking(size: Int): IntBuffer = IntBuffer(size) { nextBlocking() }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
index 24148271d..81b8c3d4b 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingDoubleChain
+import space.kscience.kmath.misc.toIntExact
 import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.math.*
@@ -58,7 +59,7 @@ public object ZigguratNormalizedGaussianSampler : NormalizedGaussianSampler {
 
     private fun sampleOne(generator: RandomGenerator): Double {
         val j = generator.nextLong()
-        val i = (j and LAST.toLong()).toInt()
+        val i = (j and LAST.toLong()).toIntExact()
         return if (abs(j) < K[i]) j * W[i] else fix(generator, j, i)
     }
 
-- 
2.34.1


From ef50a4d963e94581ad636cc956ba7fba6c1203c1 Mon Sep 17 00:00:00 2001
From: Peter Klimai <pklimai@gmail.com>
Date: Wed, 21 Jul 2021 12:33:45 +0300
Subject: [PATCH 304/713] Fix package name

---
 .../{kaceince => kscience}/kmath/real/DoubleMatrixTest.kt       | 2 +-
 .../{kaceince => kscience}/kmath/real/DoubleVectorTest.kt       | 2 +-
 .../kotlin/{kaceince => kscience}/kmath/real/GridTest.kt        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename kmath-for-real/src/commonTest/kotlin/{kaceince => kscience}/kmath/real/DoubleMatrixTest.kt (99%)
 rename kmath-for-real/src/commonTest/kotlin/{kaceince => kscience}/kmath/real/DoubleVectorTest.kt (97%)
 rename kmath-for-real/src/commonTest/kotlin/{kaceince => kscience}/kmath/real/GridTest.kt (96%)

diff --git a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt b/kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/DoubleMatrixTest.kt
similarity index 99%
rename from kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt
rename to kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/DoubleMatrixTest.kt
index a9c5f9e1a..e7b8434c5 100644
--- a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleMatrixTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/DoubleMatrixTest.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package kaceince.kmath.real
+package kscience.kmath.real
 
 import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.matrix
diff --git a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleVectorTest.kt b/kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/DoubleVectorTest.kt
similarity index 97%
rename from kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleVectorTest.kt
rename to kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/DoubleVectorTest.kt
index 9de54381c..345013306 100644
--- a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/DoubleVectorTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/DoubleVectorTest.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package kaceince.kmath.real
+package kscience.kmath.real
 
 import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.asMatrix
diff --git a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/GridTest.kt b/kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/GridTest.kt
similarity index 96%
rename from kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/GridTest.kt
rename to kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/GridTest.kt
index 0d3b80336..a59fdfca4 100644
--- a/kmath-for-real/src/commonTest/kotlin/kaceince/kmath/real/GridTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/GridTest.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package kaceince.kmath.real
+package kscience.kmath.real
 
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.real.DoubleVector
-- 
2.34.1


From c263b1acbe0a6de89bb45b9fa433c72c7323fc22 Mon Sep 17 00:00:00 2001
From: Peter Klimai <pklimai@gmail.com>
Date: Wed, 21 Jul 2021 13:25:35 +0300
Subject: [PATCH 305/713] Fix package name again

---
 .../kotlin/{ => space}/kscience/kmath/real/DoubleMatrixTest.kt  | 2 +-
 .../kotlin/{ => space}/kscience/kmath/real/DoubleVectorTest.kt  | 2 +-
 .../kotlin/{ => space}/kscience/kmath/real/GridTest.kt          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename kmath-for-real/src/commonTest/kotlin/{ => space}/kscience/kmath/real/DoubleMatrixTest.kt (99%)
 rename kmath-for-real/src/commonTest/kotlin/{ => space}/kscience/kmath/real/DoubleVectorTest.kt (97%)
 rename kmath-for-real/src/commonTest/kotlin/{ => space}/kscience/kmath/real/GridTest.kt (96%)

diff --git a/kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/DoubleMatrixTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
similarity index 99%
rename from kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/DoubleMatrixTest.kt
rename to kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
index e7b8434c5..e3f015511 100644
--- a/kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/DoubleMatrixTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package kscience.kmath.real
+package space.kscience.kmath.real
 
 import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.matrix
diff --git a/kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/DoubleVectorTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
similarity index 97%
rename from kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/DoubleVectorTest.kt
rename to kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
index 345013306..48e55ea01 100644
--- a/kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/DoubleVectorTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package kscience.kmath.real
+package space.kscience.kmath.real
 
 import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.asMatrix
diff --git a/kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/GridTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
similarity index 96%
rename from kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/GridTest.kt
rename to kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
index a59fdfca4..8fed8d10e 100644
--- a/kmath-for-real/src/commonTest/kotlin/kscience/kmath/real/GridTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package kscience.kmath.real
+package space.kscience.kmath.real
 
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.real.DoubleVector
-- 
2.34.1


From 2d3a5fb5c82bf47075596d4f13db2b9afb09d5b5 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 21 Jul 2021 00:45:29 +0700
Subject: [PATCH 306/713] Fix publish.yml

---
 .github/workflows/publish.yml | 2 --
 README.md                     | 8 ++++----
 kmath-kotlingrad/README.md    | 4 ++--
 settings.gradle.kts           | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 05c1c603e..cbf13d03d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -44,11 +44,9 @@ jobs:
         run: >
           ./gradlew release --no-daemon -Ppublishing.enabled=true -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
           -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
-          -Ppublishing.sonatype=false
       - name: Publish Mac Artifacts
         if: matrix.os == 'macOS-latest'
         run: >
           ./gradlew release --no-daemon -Ppublishing.enabled=true -Ppublishing.platform=macosX64
           -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
           -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
-          -Ppublishing.sonatype=false
diff --git a/README.md b/README.md
index 7645256d9..a15c4384f 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ KMath is a modular library. Different modules provide different features with di
 objects to the expression by providing a context. Expressions can be used for a wide variety of purposes from high 
 performance calculations to code generation.
 > - [domains](kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains) : Domains
-> - [autodif](kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt) : Automatic differentiation
+> - [autodiff](kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt) : Automatic differentiation
 
 <hr/>
 
@@ -222,8 +222,8 @@ One can still use generic algebras though.
 > **Maturity**: EXPERIMENTAL
 >
 > **Features:**
-> - [differentiable-mst-expression](kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt) : MST based DifferentiableExpression.
-> - [differentiable-mst-expression](kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt) : Conversions between Kotlin∇'s SFun and MST
+> - [differentiable-mst-expression](kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt) : MST based DifferentiableExpression.
+> - [scalars-adapters](kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt) : Conversions between Kotlin∇'s SFun and MST
 
 <hr/>
 
@@ -264,7 +264,7 @@ One can still use generic algebras though.
 >
 > **Features:**
 > - [tensor algebra](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt) : Basic linear algebra operations on tensors (plus, dot, etc.)
-> - [tensor algebra with broadcasting](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/algebras/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting.
+> - [tensor algebra with broadcasting](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting.
 > - [linear algebra operations](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Advanced linear algebra operations like LU decomposition, SVD, etc.
 
 <hr/>
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
index 304a0639b..3b337460f 100644
--- a/kmath-kotlingrad/README.md
+++ b/kmath-kotlingrad/README.md
@@ -2,8 +2,8 @@
 
 [Kotlin∇](https://www.htmlsymbols.xyz/unicode/U+2207) integration module.
 
- - [differentiable-mst-expression](src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt) : MST based DifferentiableExpression.
- - [differentiable-mst-expression](src/main/kotlin/space/kscience/kmath/kotlingrad/DifferentiableMstExpression.kt) : Conversions between Kotlin∇'s SFun and MST
+ - [differentiable-mst-expression](src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt) : MST based DifferentiableExpression.
+ - [scalars-adapters](src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt) : Conversions between Kotlin∇'s SFun and MST
 
 
 ## Artifact:
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 445f75c09..18f867df3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
         gradlePluginPortal()
     }
 
-    val toolsVersion = "0.10.1"
+    val toolsVersion = "0.10.2"
     val kotlinVersion = "1.5.21"
 
     plugins {
-- 
2.34.1


From dd01c39cbe6dbd080078731b2c3741215119a6ad Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 21 Jul 2021 00:45:29 +0700
Subject: [PATCH 307/713] Fix publish.yml

---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 3427a6d61..36a1ffd9e 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
     api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
-    api("ru.mipt.npm:gradle-tools:0.10.1")
+    api("ru.mipt.npm:gradle-tools:0.10.2")
     api("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.3.1")
 }
 
-- 
2.34.1


From fe21f0c954feeabacfe2aab976a533552a39a418 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 28 Jul 2021 05:52:23 +0700
Subject: [PATCH 308/713] Update plotly.kt and SLF4J

---
 examples/build.gradle.kts    | 4 ++--
 kmath-nd4j/build.gradle.kts  | 2 +-
 kmath-symja/build.gradle.kts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 406b8f470..4cc6fecc0 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -41,9 +41,9 @@ dependencies {
 //    } else
     implementation("org.nd4j:nd4j-native-platform:1.0.0-beta7")
 
-    implementation("org.slf4j:slf4j-simple:1.7.30")
+    implementation("org.slf4j:slf4j-simple:1.7.31")
     // plotting
-    implementation("space.kscience:plotlykt-server:0.4.0")
+    implementation("space.kscience:plotlykt-server:0.4.2")
     //jafama
     implementation(project(":kmath-jafama"))
 }
diff --git a/kmath-nd4j/build.gradle.kts b/kmath-nd4j/build.gradle.kts
index 6e890a937..dcb6f1b4a 100644
--- a/kmath-nd4j/build.gradle.kts
+++ b/kmath-nd4j/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     api(project(":kmath-tensors"))
     api("org.nd4j:nd4j-api:1.0.0-M1")
     testImplementation("org.nd4j:nd4j-native-platform:1.0.0-M1")
-    testImplementation("org.slf4j:slf4j-simple:1.7.30")
+    testImplementation("org.slf4j:slf4j-simple:1.7.31")
 }
 
 readme {
diff --git a/kmath-symja/build.gradle.kts b/kmath-symja/build.gradle.kts
index f305c03b8..65c329d52 100644
--- a/kmath-symja/build.gradle.kts
+++ b/kmath-symja/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
     api("org.hipparchus:hipparchus-stat:1.8")
 
     api(project(":kmath-core"))
-    testImplementation("org.slf4j:slf4j-simple:1.7.30")
+    testImplementation("org.slf4j:slf4j-simple:1.7.31")
 }
 
 readme {
-- 
2.34.1


From afd590878421093e4203aca8238f964900465a3e Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Fri, 7 May 2021 19:59:21 +0700
Subject: [PATCH 309/713] Revise grammar of KDoc comments, refresh
 documentation files

---
 README.md                                     | 68 ++++++++------
 docs/algebra.md                               | 83 +++++------------
 docs/buffers.md                               | 17 ++--
 docs/codestyle.md                             | 19 ++--
 docs/contexts.md                              | 44 ++++-----
 docs/expressions.md                           | 23 ++---
 docs/features.md                              | 14 ---
 docs/linear.md                                | 32 ++++---
 docs/nd-structure.md                          | 18 ++--
 docs/readme.md                                | 14 +++
 docs/templates/README-TEMPLATE.md             | 66 ++++++++------
 .../kscience/kmath/ast/kotlingradSupport.kt   |  4 +-
 .../space/kscience/kmath/ast/symjaSupport.kt  |  4 +-
 .../kmath/commons/fit/fitWithAutoDiff.kt      |  3 +-
 .../space/kscience/kmath/jafama/JafamaDemo.kt | 15 ++++
 .../kscience/kmath/jafama/KMathaJafamaDemo.kt | 17 ----
 .../kscience/kmath/stat/DistributionDemo.kt   |  3 -
 .../kscience/kmath/structures/NDField.kt      |  2 +-
 .../kmath/tensors/DataSetNormalization.kt     |  4 +-
 .../tensors/LinearSystemSolvingWithLUP.kt     |  2 +-
 .../kscience/kmath/tensors/NeuralNetwork.kt   |  2 +-
 .../space/kscience/kmath/tensors/PCA.kt       |  4 +-
 kmath-ast/README.md                           |  5 +-
 kmath-ast/docs/README-TEMPLATE.md             |  5 +-
 .../kmath/ast/rendering/MathSyntax.kt         |  4 +-
 .../kmath/ast/rendering/SyntaxRenderer.kt     |  2 +-
 .../kscience/kmath/ast/rendering/features.kt  |  8 +-
 .../kmath/asm/internal/codegenUtils.kt        |  4 +-
 .../DerivativeStructureExpression.kt          |  2 +-
 .../DerivativeStructureExpressionTest.kt      |  2 +-
 .../commons/optimization/OptimizeTest.kt      |  2 +-
 .../expressions/DifferentiableExpression.kt   |  2 +-
 .../kscience/kmath/expressions/Expression.kt  |  4 +-
 .../FunctionalExpressionAlgebra.kt            |  2 +-
 .../kscience/kmath/linear/LinearSolver.kt     |  4 +-
 .../kscience/kmath/linear/LinearSpace.kt      |  4 +-
 .../kscience/kmath/linear/LupDecomposition.kt |  4 +-
 .../kscience/kmath/linear/MatrixFeatures.kt   |  2 +-
 .../kscience/kmath/linear/MatrixWrapper.kt    |  9 +-
 .../space/kscience/kmath/misc/annotations.kt  |  6 +-
 .../space/kscience/kmath/nd/AlgebraND.kt      | 26 +++---
 .../space/kscience/kmath/nd/Structure1D.kt    |  2 +-
 .../space/kscience/kmath/nd/Structure2D.kt    |  5 +-
 .../space/kscience/kmath/nd/StructureND.kt    | 10 +--
 .../kscience/kmath/operations/Algebra.kt      | 62 +++++++------
 .../kmath/operations/AlgebraElements.kt       |  2 +-
 .../space/kscience/kmath/operations/BigInt.kt |  4 +-
 .../kmath/operations/NumericAlgebra.kt        | 32 +++----
 .../kmath/operations/OptionalOperations.kt    |  4 +-
 .../kscience/kmath/structures/DoubleBuffer.kt |  4 +-
 .../kmath/structures/FlaggedBuffer.kt         |  2 +-
 .../kscience/kmath/structures/FloatBuffer.kt  |  4 +-
 .../kscience/kmath/structures/IntBuffer.kt    |  4 +-
 .../kscience/kmath/structures/LongBuffer.kt   |  4 +-
 .../kscience/kmath/structures/ShortBuffer.kt  |  4 +-
 .../space/kscience/kmath/chains/Chain.kt      | 14 +--
 .../kscience/kmath/streaming/BufferFlow.kt    |  2 +-
 .../kscience/kmath/dimensions/Wrappers.kt     |  4 +-
 kmath-for-real/build.gradle.kts               |  2 +-
 .../space/kscience/kmath/real/RealVector.kt   |  2 +-
 .../kotlin/space/kscience/kmath/real/grids.kt |  4 +-
 .../kscience/kmath/functions/Piecewise.kt     | 10 +--
 .../kmath/integration/GaussIntegrator.kt      | 20 +++--
 .../integration/GaussIntegratorRuleFactory.kt |  4 +-
 .../kmath/integration/SimpsonIntegrator.kt    | 15 ++--
 .../kmath/integration/SplineIntegrator.kt     | 13 +--
 .../kmath/integration/UnivariateIntegrand.kt  |  4 +-
 .../kscience/kmath/histogram/Histogram.kt     |  2 +-
 .../kmath/histogram/UnivariateHistogram.kt    |  7 +-
 kmath-jafama/README.md                        | 20 +----
 kmath-kotlingrad/README.md                    |  2 +-
 kmath-kotlingrad/docs/README-TEMPLATE.md      |  2 +-
 .../space/kscience/kmath/memory/Memory.kt     |  2 +-
 .../kscience/kmath/memory/DataViewMemory.kt   |  2 +-
 .../kscience/kmath/memory/ByteBufferMemory.kt |  2 +-
 .../kscience/kmath/memory/NativeMemory.kt     |  4 +-
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   |  2 +-
 .../kscience/kmath/nd4j/Nd4jArrayStructure.kt |  2 +-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |  2 +-
 .../kmath/distributions/Distribution.kt       |  2 +-
 .../distributions/FactorizedDistribution.kt   |  4 +-
 .../kscience/kmath/internal/InternalGamma.kt  |  2 +-
 .../optimization/FunctionOptimization.kt      | 15 ++--
 .../NoDerivFunctionOptimization.kt            |  2 +-
 .../kmath/optimization/Optimization.kt        |  2 +-
 .../AhrensDieterMarsagliaTsangGammaSampler.kt |  4 +-
 .../samplers/AliasMethodDiscreteSampler.kt    | 12 +--
 .../samplers/KempSmallMeanPoissonSampler.kt   |  5 +-
 .../kscience/kmath/samplers/PoissonSampler.kt |  8 +-
 .../kscience/kmath/stat/RandomGenerator.kt    |  6 +-
 .../kscience/kmath/stat/SamplerAlgebra.kt     |  2 +-
 .../space/kscience/kmath/stat/Statistic.kt    |  7 +-
 .../kmath/stat/RandomSourceGenerator.kt       |  2 +-
 .../tensors/api/LinearOpsTensorAlgebra.kt     | 38 ++++----
 .../kmath/tensors/api/TensorAlgebra.kt        | 13 ++-
 .../api/TensorPartialDivisionAlgebra.kt       |  2 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 90 ++++++++++---------
 .../kmath/tensors/core/internal/utils.kt      |  4 +-
 98 files changed, 523 insertions(+), 538 deletions(-)
 delete mode 100644 docs/features.md
 create mode 100644 docs/readme.md
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt
 delete mode 100644 examples/src/main/kotlin/space/kscience/kmath/jafama/KMathaJafamaDemo.kt

diff --git a/README.md b/README.md
index a15c4384f..db069d4e0 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,10 @@
 
 # KMath
 
-Could be pronounced as `key-math`. The **K**otlin **Math**ematics library was initially intended as a Kotlin-based analog to
-Python's NumPy library. Later we found that kotlin is much more flexible language and allows superior architecture 
-designs. In contrast to `numpy` and `scipy` it is modular and has a lightweight core. The `numpy`-like experience could 
-be achieved with [kmath-for-real](/kmath-for-real) extension module.
+Could be pronounced as `key-math`. The **K**otlin **Math**ematics library was initially intended as a Kotlin-based
+analog to Python's NumPy library. Later we found that kotlin is much more flexible language and allows superior
+architecture designs. In contrast to `numpy` and `scipy` it is modular and has a lightweight core. The `numpy`-like
+experience could be achieved with [kmath-for-real](/kmath-for-real) extension module.
 
 [Documentation site (**WIP**)](https://mipt-npm.github.io/kmath/)
 
@@ -21,26 +21,33 @@ be achieved with [kmath-for-real](/kmath-for-real) extension module.
 
 # Goal
 
-* Provide a flexible and powerful API to work with mathematics abstractions in Kotlin-multiplatform (JVM, JS and Native). 
+* Provide a flexible and powerful API to work with mathematics abstractions in Kotlin-multiplatform (JVM, JS and Native)
+  .
 * Provide basic multiplatform implementations for those abstractions (without significant performance optimization).
 * Provide bindings and wrappers with those abstractions for popular optimized platform libraries.
 
 ## Non-goals
 
-* Be like NumPy. It was the idea at the beginning, but we decided that we can do better in terms of API.
+* Be like NumPy. It was the idea at the beginning, but we decided that we can do better in API.
 * Provide the best performance out of the box. We have specialized libraries for that. Need only API wrappers for them.
 * Cover all cases as immediately and in one bundle. We will modularize everything and add new features gradually.
-* Provide specialized behavior in the core. API is made generic on purpose, so one needs to specialize for types, like 
-for `Double` in the core. For that we will have specialization modules like `kmath-for-real`, which will give better
-experience for those, who want to work with specific types.
+* Provide specialized behavior in the core. API is made generic on purpose, so one needs to specialize for types, like
+  for `Double` in the core. For that we will have specialization modules like `kmath-for-real`, which will give better
+  experience for those, who want to work with specific types.
 
 ## Features and stability
 
-KMath is a modular library. Different modules provide different features with different API stability guarantees. All core modules are released with the same version, but with different API change policy. The features are described in module definitions below. The module stability could have following levels:
+KMath is a modular library. Different modules provide different features with different API stability guarantees. All
+core modules are released with the same version, but with different API change policy. The features are described in
+module definitions below. The module stability could have the following levels:
 
-* **PROTOTYPE**. On this level there are no compatibility guarantees. All methods and classes form those modules could break any moment. You can still use it, but be sure to fix the specific version.
-* **EXPERIMENTAL**. The general API is decided, but some changes could be made. Volatile API is marked with `@UnstableKmathAPI` or other stability warning annotations.
-* **DEVELOPMENT**. API breaking generally follows semantic versioning ideology. There could be changes in minor versions, but not in patch versions. API is protected with [binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) tool.
+* **PROTOTYPE**. On this level there are no compatibility guarantees. All methods and classes form those modules could
+  break any moment. You can still use it, but be sure to fix the specific version.
+* **EXPERIMENTAL**. The general API is decided, but some changes could be made. Volatile API is marked
+  with `@UnstableKmathAPI` or other stability warning annotations.
+* **DEVELOPMENT**. API breaking generally follows semantic versioning ideology. There could be changes in minor
+  versions, but not in patch versions. API is protected
+  with [binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) tool.
 * **STABLE**. The API stabilized. Breaking changes are allowed only in major releases.
 
 <!--Current feature list is [here](/docs/features.md)-->
@@ -161,7 +168,7 @@ performance calculations to code generation.
 <hr/>
 
 * ### [kmath-for-real](kmath-for-real)
-> Extension module that should be used to achieve numpy-like behavior. 
+> Extension module that should be used to achieve numpy-like behavior.
 All operations are specialized to work with `Double` numbers without declaring algebraic contexts.
 One can still use generic algebras though.
 >
@@ -278,30 +285,33 @@ One can still use generic algebras though.
 
 ## Multi-platform support
 
-KMath is developed as a multi-platform library, which means that most of the interfaces are declared in the 
-[common source sets](/kmath-core/src/commonMain) and implemented there wherever it is possible. In some cases, features 
-are delegated to platform-specific implementations even if they could be provided in the common module for performance 
-reasons. Currently, the Kotlin/JVM is the primary platform, however Kotlin/Native and Kotlin/JS contributions and 
+KMath is developed as a multi-platform library, which means that most of the interfaces are declared in the
+[common source sets](/kmath-core/src/commonMain) and implemented there wherever it is possible. In some cases, features
+are delegated to platform-specific implementations even if they could be provided in the common module for performance
+reasons. Currently, the Kotlin/JVM is the primary platform, however Kotlin/Native and Kotlin/JS contributions and
 feedback are also welcome.
 
 ## Performance
 
-Calculation performance is one of major goals of KMath in the future, but in some cases it is impossible to achieve 
-both performance and flexibility. 
+Calculation performance is one of major goals of KMath in the future, but in some cases it is impossible to achieve both
+performance and flexibility.
 
-We expect to focus on creating convenient universal API first and then work on increasing performance for specific 
-cases. We expect the worst KMath benchmarks will perform better than native Python, but worse than optimized 
-native/SciPy (mostly due to boxing operations on primitive numbers). The best performance of optimized parts could be 
+We expect to focus on creating convenient universal API first and then work on increasing performance for specific
+cases. We expect the worst KMath benchmarks will perform better than native Python, but worse than optimized
+native/SciPy (mostly due to boxing operations on primitive numbers). The best performance of optimized parts could be
 better than SciPy.
 
 ## Requirements
 
-KMath currently relies on JDK 11 for compilation and execution of Kotlin-JVM part. We recommend to use GraalVM-CE 11 for execution in order to get better performance.
+KMath currently relies on JDK 11 for compilation and execution of Kotlin-JVM part. We recommend to use GraalVM-CE 11 for
+execution to get better performance.
 
 ### Repositories
 
-Release and development artifacts are accessible from mipt-npm [Space](https://www.jetbrains.com/space/) repository `https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven` (see documentation of
-[Kotlin Multiplatform](https://kotlinlang.org/docs/reference/multiplatform.html) for more details). The repository could be reached through [repo.kotlin.link](https://repo.kotlin.link) proxy:
+Release and development artifacts are accessible from mipt-npm [Space](https://www.jetbrains.com/space/)
+repository `https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven` (see documentation of
+[Kotlin Multiplatform](https://kotlinlang.org/docs/reference/multiplatform.html) for more details). The repository could
+be reached through [repo.kotlin.link](https://repo.kotlin.link) proxy:
 
 ```kotlin
 repositories {
@@ -318,7 +328,7 @@ Gradle `6.0+` is required for multiplatform artifacts.
 
 ## Contributing
 
-The project requires a lot of additional work. The most important thing we need is a feedback about what features are 
-required the most. Feel free to create feature requests. We are also welcome to code contributions, 
-especially in issues marked with 
+The project requires a lot of additional work. The most important thing we need is a feedback about what features are
+required the most. Feel free to create feature requests. We are also welcome to code contributions, especially in issues
+marked with
 [waiting for a hero](https://github.com/mipt-npm/kmath/labels/waiting%20for%20a%20hero) label.
diff --git a/docs/algebra.md b/docs/algebra.md
index 84693bb81..20158a125 100644
--- a/docs/algebra.md
+++ b/docs/algebra.md
@@ -1,85 +1,45 @@
 # Algebraic Structures and Algebraic Elements
 
-The mathematical operations in KMath are generally separated from mathematical objects. This means that to perform an 
-operation, say `+`, one needs two objects of a type `T` and an algebra context, which draws appropriate operation up, 
-say `Space<T>`. Next one needs to run the actual operation in the context:
+The mathematical operations in KMath are generally separated from mathematical objects. This means that to perform an
+operation, say `+`, one needs two objects of a type `T` and an algebra context, which draws appropriate operation up,
+say `Group<T>`. Next one needs to run the actual operation in the context:
 
 ```kotlin
 import space.kscience.kmath.operations.*
 
 val a: T = ...
 val b: T = ...
-val space: Space<T> = ...
+val group: Group<T> = ...
 
-val c = space { a + b }
+val c = group { a + b }
 ```
 
-At first glance, this distinction seems to be a needless complication, but in fact one needs to remember that in 
-mathematics, one could draw up different operations on same objects. For example, one could use different types of 
+At first glance, this distinction seems to be a needless complication, but in fact one needs to remember that in
+mathematics, one could draw up different operations on same objects. For example, one could use different types of
 geometry for vectors.
 
 ## Algebraic Structures
 
-Mathematical contexts have the following hierarchy:
+Primary mathematical contexts have the following hierarchy:
 
-**Algebra** ← **Space** ← **Ring** ← **Field**
+`Field <: Ring <: Group <: Algebra`
 
 These interfaces follow real algebraic structures:
 
-- [Space](https://mathworld.wolfram.com/VectorSpace.html) defines addition, its neutral element (i.e. 0) and scalar 
-multiplication;
-- [Ring](http://mathworld.wolfram.com/Ring.html) adds multiplication and its neutral element (i.e. 1);
+- [Group](https://mathworld.wolfram.com/Group.html) defines addition, its identity element (i.e., 0) and additive
+  inverse (-x);
+- [Ring](http://mathworld.wolfram.com/Ring.html) adds multiplication and its identity element (i.e., 1);
 - [Field](http://mathworld.wolfram.com/Field.html) adds division operation.
 
 A typical implementation of `Field<T>` is the `DoubleField` which works on doubles, and `VectorSpace` for `Space<T>`.
 
 In some cases algebra context can hold additional operations like `exp` or `sin`, and then it inherits appropriate
-interface. Also, contexts may have operations, which produce elements outside of the context. For example, `Matrix.dot` 
-operation produces a matrix with new dimensions, which can be incompatible with initial matrix in terms of linear 
-operations.
-
-## Algebraic Element
-
-To achieve more familiar behavior (where you apply operations directly to mathematical objects), without involving 
-contexts KMath submits special type objects called `MathElement`. A `MathElement` is basically some object coupled to
-a mathematical context. For example `Complex` is the pair of real numbers representing real and imaginary parts,
-but it also holds reference to the `ComplexField` singleton, which allows performing direct operations on `Complex`
-numbers without explicit involving the context like:
-
-```kotlin
-import space.kscience.kmath.operations.*
-
-// Using elements
-val c1 = Complex(1.0, 1.0)
-val c2 = Complex(1.0, -1.0)
-val c3 = c1 + c2 + 3.0.toComplex()
-
-// Using context
-val c4 = ComplexField { c1 + i - 2.0 }
-```
-
-Both notations have their pros and cons.
-
-The hierarchy for algebraic elements follows the hierarchy for the corresponding algebraic structures.
-
-**MathElement** ← **SpaceElement** ← **RingElement** ← **FieldElement**
-
-`MathElement<C>` is the generic common ancestor of the class with context.
-
-One major distinction between algebraic elements and algebraic contexts is that elements have three type 
-parameters:
-
-1. The type of elements, the field operates on.
-2. The self-type of the element returned from operation (which has to be an algebraic element).
-3. The type of the algebra over first type-parameter.
-
-The middle type is needed for of algebra members do not store context. For example, it is impossible to add a context 
-to regular `Double`. The element performs automatic conversions from context types and back. One should use context 
-operations in all performance-critical places. The performance of element operations is not guaranteed.
+interface. Also, contexts may have operations, which produce elements outside the context. For example, `Matrix.dot`
+operation produces a matrix with new dimensions, which can be incompatible with initial matrix in linear operations.
 
 ## Spaces and Fields
 
-KMath submits both contexts and elements for builtin algebraic structures:
+KMath introduces contexts for builtin algebraic structures:
 
 ```kotlin
 import space.kscience.kmath.operations.*
@@ -102,13 +62,13 @@ val c2 = ComplexField { c1 - 1.0 } // Returns: Complex(re=0.0, im=2.0)
 val c3 = ComplexField { c1 - i * 2.0 }
 ```
 
-**Note**: In theory it is possible to add behaviors directly to the context, but as for now Kotlin does not support 
-that. Watch [KT-10468](https://youtrack.jetbrains.com/issue/KT-10468) and 
+**Note**: In theory it is possible to add behaviors directly to the context, but as for now Kotlin does not support
+that. Watch [KT-10468](https://youtrack.jetbrains.com/issue/KT-10468) and
 [KEEP-176](https://github.com/Kotlin/KEEP/pull/176) for updates.
 
 ## Nested fields
 
-Contexts allow one to build more complex structures. For example, it is possible to create a `Matrix` from complex 
+Contexts allow one to build more complex structures. For example, it is possible to create a `Matrix` from complex
 elements like so:
 
 ```kotlin
@@ -118,8 +78,9 @@ val element = NDElement.complex(shape = intArrayOf(2, 2)) { index: IntArray ->
 ```
 
 The `element` in this example is a member of the `Field` of 2D structures, each element of which is a member of its own
-`ComplexField`. It is important one does not need to create a special n-d class to hold complex
-numbers and implement operations on it, one just needs to provide a field for its elements.
+`ComplexField`. It is important one does not need to create a special n-d class to hold complex numbers and implement
+operations on it, one just needs to provide a field for its elements.
 
-**Note**: Fields themselves do not solve the problem of JVM boxing, but it is possible to solve with special contexts like
+**Note**: Fields themselves do not solve the problem of JVM boxing, but it is possible to solve with special contexts
+like
 `MemorySpec`.
diff --git a/docs/buffers.md b/docs/buffers.md
index 679bd4e78..e7573497e 100644
--- a/docs/buffers.md
+++ b/docs/buffers.md
@@ -1,17 +1,20 @@
 # Buffers
 
-Buffer is one of main building blocks of kmath. It is a basic interface allowing random-access read and write (with `MutableBuffer`).
-There are different types of buffers:
+Buffer is one of main building blocks of kmath. It is a basic interface allowing random-access read and write (
+with `MutableBuffer`). There are different types of buffers:
 
-* Primitive buffers wrapping like `RealBuffer` which are wrapping primitive arrays.
+* Primitive buffers wrapping like `DoubleBuffer` which are wrapping primitive arrays.
 * Boxing `ListBuffer` wrapping a list
 * Functionally defined `VirtualBuffer` which does not hold a state itself, but provides a function to calculate value
 * `MemoryBuffer` allows direct allocation of objects in continuous memory block.
 
-Some kmath features require a `BufferFactory` class to operate properly. A general convention is to use functions defined in
-`Buffer` and `MutableBuffer` companion classes. For example factory `Buffer.Companion::auto` in most cases creates the most suitable
-buffer for given reified type (for types with custom memory buffer it still better to use their own `MemoryBuffer.create()` factory).
+Some kmath features require a `BufferFactory` class to operate properly. A general convention is to use functions
+defined in
+`Buffer` and `MutableBuffer` companion classes. For example factory `Buffer.Companion::auto` in most cases creates the
+most suitable buffer for given reified type (for types with custom memory buffer it still better to use their
+own `MemoryBuffer.create()` factory).
 
 ## Buffer performance
 
-One should avoid using default boxing buffer wherever it is possible. Try to use primitive buffers or memory buffers instead  
+One should avoid using default boxing buffer wherever it is possible. Try to use primitive buffers or memory buffers
+instead  .
diff --git a/docs/codestyle.md b/docs/codestyle.md
index 541dc4973..73ba5f754 100644
--- a/docs/codestyle.md
+++ b/docs/codestyle.md
@@ -1,26 +1,20 @@
 # Coding Conventions
 
-KMath code follows general [Kotlin conventions](https://kotlinlang.org/docs/reference/coding-conventions.html), but 
-with a number of small changes and clarifications.
+Generally, KMath code follows general [Kotlin coding conventions](https://kotlinlang.org/docs/reference/coding-conventions.html), but with a number of small changes and clarifications.
 
 ## Utility Class Naming
 
-Filename should coincide with a name of one of the classes contained in the file or start with small letter and 
-describe its contents.
+Filename should coincide with a name of one of the classes contained in the file or start with small letter and describe its contents.
 
-The code convention [here](https://kotlinlang.org/docs/reference/coding-conventions.html#source-file-names) says that 
-file names should start with a capital letter even if file does not contain classes. Yet starting utility classes and 
-aggregators with a small letter seems to be a good way to visually separate those files.
+The code convention [here](https://kotlinlang.org/docs/reference/coding-conventions.html#source-file-names) says that file names should start with a capital letter even if file does not contain classes. Yet starting utility classes and aggregators with a small letter seems to be a good way to visually separate those files.
 
 This convention could be changed in future in a non-breaking way.
 
 ## Private Variable Naming
 
-Private variables' names may start with underscore `_` for of the private mutable variable is shadowed by the public 
-read-only value with the same meaning.
+Private variables' names may start with underscore `_` for of the private mutable variable is shadowed by the public read-only value with the same meaning.
 
-This rule does not permit underscores in names, but it is sometimes useful to "underscore" the fact that public and 
-private versions draw up the same entity. It is allowed only for private variables.
+This rule does not permit underscores in names, but it is sometimes useful to "underscore" the fact that public and private versions draw up the same entity. It is allowed only for private variables.
 
 This convention could be changed in future in a non-breaking way.
 
@@ -30,5 +24,4 @@ Use one-liners when they occupy single code window line both for functions and p
 `val b: String get() = "fff"`. The same should be performed with multiline expressions when they could be 
 cleanly separated.
 
-There is no universal consensus whenever use `fun a() = ...` or `fun a() { return ... }`. Yet from reader outlook 
-one-lines seem to better show that the property or function is easily calculated.
+There is no universal consensus whenever use `fun a() = ...` or `fun a() { return ... }`. Yet from reader outlook one-lines seem to better show that the property or function is easily calculated.
diff --git a/docs/contexts.md b/docs/contexts.md
index 58b198046..c26333860 100644
--- a/docs/contexts.md
+++ b/docs/contexts.md
@@ -2,18 +2,17 @@
 
 ## The problem
 
-A known problem for implementing mathematics in statically-typed languages (but not only in them) is that different
-sets of mathematical operators can be defined on the same mathematical objects. Sometimes there is no single way to
-treat some operations, including basic arithmetic operations, on a Java/Kotlin `Number`. Sometimes there are different ways to
-define the same structure, such as Euclidean and elliptic geometry vector spaces over real vectors. Another problem arises when
-one wants to add some kind of behavior to an existing entity. In dynamic languages those problems are usually solved
-by adding dynamic context-specific behaviors at runtime, but this solution has a lot of drawbacks.
+A known problem for implementing mathematics in statically-typed languages (but not only in them) is that different sets
+of mathematical operators can be defined on the same mathematical objects. Sometimes there is no single way to treat
+some operations, including basic arithmetic operations, on a Java/Kotlin `Number`. Sometimes there are different ways to
+define the same structure, such as Euclidean and elliptic geometry vector spaces over real vectors. Another problem
+arises when one wants to add some kind of behavior to an existing entity. In dynamic languages those problems are
+usually solved by adding dynamic context-specific behaviors at runtime, but this solution has a lot of drawbacks.
 
 ## Context-oriented approach
 
-One possible solution to these problems is to divorce numerical representations from behaviors.
-For example in Kotlin one can define a separate class which represents some entity without any operations,
-ex. a complex number:
+One possible solution to these problems is to divorce numerical representations from behaviors. For example in Kotlin
+one can define a separate class representing some entity without any operations, ex. a complex number:
 
 ```kotlin
 data class Complex(val re: Double, val im: Double)
@@ -28,9 +27,10 @@ object ComplexOperations {
 }
 ```
 
-In Java, applying such external operations could be very cumbersome, but Kotlin has a unique feature which allows us
-implement this naturally: [extensions with receivers](https://kotlinlang.org/docs/reference/extensions.html#extension-functions).
-In Kotlin, an operation on complex number could be implemented as:
+In Java, applying such external operations could be cumbersome, but Kotlin has a unique feature that allows us
+implement this
+naturally: [extensions with receivers](https://kotlinlang.org/docs/reference/extensions.html#extension-functions). In
+Kotlin, an operation on complex number could be implemented as:
 
 ```kotlin
 with(ComplexOperations) { c1 + c2 - c3 }
@@ -52,20 +52,20 @@ In KMath, contexts are not only responsible for operations, but also for raw obj
 
 ### Type classes
 
-An obvious candidate to get more or less the same functionality is the type class, which allows one to bind a behavior to
-a specific type without modifying the type itself. On the plus side, type classes do not require explicit context
+An obvious candidate to get more or less the same functionality is the type class, which allows one to bind a behavior
+to a specific type without modifying the type itself. On the plus side, type classes do not require explicit context
 declaration, so the code looks cleaner. On the minus side, if there are different sets of behaviors for the same types,
-it is impossible to combine them into one module. Also, unlike type classes, context can have parameters or even
-state. For example in KMath, sizes and strides for `NDElement` or `Matrix` could be moved to context to optimize
-performance in case of a large amount of structures.
+it is impossible to combine them into one module. Also, unlike type classes, context can have parameters or even state.
+For example in KMath, sizes and strides for `NDElement` or `Matrix` could be moved to context to optimize performance in
+case of a large amount of structures.
 
 ### Wildcard imports and importing-on-demand
 
-Sometimes, one may wish to use a single context throughout a file. In this case, is possible to import all members
-from a package or file, via `import context.complex.*`. Effectively, this is the same as enclosing an entire file
-with a single context. However when using multiple contexts, this technique can introduce operator ambiguity, due to
-namespace pollution. If there are multiple scoped contexts which define the same operation, it is still possible to
-to import specific operations as needed, without using an explicit context with extension functions, for example:
+Sometimes, one may wish to use a single context throughout a file. In this case, is possible to import all members from
+a package or file, via `import context.complex.*`. Effectively, this is the same as enclosing an entire file with a
+single context. However, when using multiple contexts, this technique can introduce operator ambiguity, due to namespace
+pollution. If there are multiple scoped contexts that define the same operation, it is still possible to import
+specific operations as needed, without using an explicit context with extension functions, for example:
 
 ```
 import context.complex.op1
diff --git a/docs/expressions.md b/docs/expressions.md
index 1e05e5340..e6250110c 100644
--- a/docs/expressions.md
+++ b/docs/expressions.md
@@ -1,26 +1,21 @@
 # Expressions
 
-**Experimental: this API is in early stage and could change any time**
-
-Expressions is an experimental feature which allows to construct lazily or immediately calculated parametric mathematical 
-expressions.
+Expressions is a feature, which allows constructing lazily or immediately calculated parametric mathematical expressions.
 
 The potential use-cases for it (so far) are following:
 
-* Lazy evaluation (in general simple lambda is better, but there are some border cases)
+* lazy evaluation (in general simple lambda is better, but there are some border cases);
+* automatic differentiation in single-dimension and in multiple dimensions;
+* generation of mathematical syntax trees with subsequent code generation for other languages;
+* symbolic computations, especially differentiation (and some other actions with `kmath-symja` integration with Symja's `IExpr`&mdash;integration, simplification, and more);
+* visualization with `kmath-jupyter`.
 
-* Automatic differentiation in single-dimension and in multiple dimensions
-
-* Generation of mathematical syntax trees with subsequent code generation for other languages
-
-* Maybe symbolic computations (needs additional research)
-
-The workhorse of this API is `Expression` interface which exposes single `operator fun invoke(arguments: Map<String, T>): T`
-method. `ExpressionContext` is used to generate expressions and introduce variables.
+The workhorse of this API is `Expression` interface, which exposes single `operator fun invoke(arguments: Map<Symbol, T>): T`
+method. `ExpressionAlgebra` is used to generate expressions and introduce variables.
 
 Currently there are two implementations:
 
 * Generic `ExpressionField` in `kmath-core` which allows construction of custom lazy expressions
 
-* Auto-differentiation expression in `kmath-commons` module allows to use full power of `DerivativeStructure` 
+* Auto-differentiation expression in `kmath-commons` module allows using full power of `DerivativeStructure` 
 from commons-math. **TODO: add example**
diff --git a/docs/features.md b/docs/features.md
deleted file mode 100644
index 1068a4417..000000000
--- a/docs/features.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Features
-
-* [Algebra](algebra.md) - [Context-based](contexts.md) operations on different primitives and structures.
-
-* [NDStructures](nd-structure.md)
-
-* [Linear algebra](linear.md) - Matrices, operations and linear equations solving. To be moved to separate module. Currently supports basic
-api and multiple library back-ends.
-
-* [Histograms](histograms.md) - Multidimensional histogram calculation and operations.
-
-* [Expressions](expressions.md)
-
-* Commons math integration
diff --git a/docs/linear.md b/docs/linear.md
index 6ccc6caac..2a05499ef 100644
--- a/docs/linear.md
+++ b/docs/linear.md
@@ -1,19 +1,31 @@
 ## Basic linear algebra layout
 
-KMath support for linear algebra organized in a context-oriented way. Meaning that operations are in most cases declared 
-in context classes, and are not the members of classes that store data. This allows more flexible approach to maintain multiple 
-back-ends. The new operations added as extensions to contexts instead of being member functions of data structures.
+KMath support for linear algebra organized in a context-oriented way, which means that operations are in most cases declared in context classes, and are not the members of classes that store data. This allows more flexible approach to maintain multiple back-ends. The new operations added as extensions to contexts instead of being member functions of data structures.
 
-Two major contexts used for linear algebra and hyper-geometry:
+The main context for linear algebra over matrices and vectors is `LinearSpace`, which defines addition and dot products of matrices and vectors:
 
-* `VectorSpace` forms a mathematical space on top of array-like structure (`Buffer` and its type alias `Point` used for geometry). 
+```kotlin
+import space.kscience.kmath.linear.*
 
-* `MatrixContext` forms a space-like context for 2d-structures. It does not store matrix size and therefore does not implement
-`Space` interface (it is impossible to create zero element without knowing the matrix size). 
+LinearSpace.Companion.real {
+    val vec = buildVector(10) { i -> i.toDouble() }
+    val mat = buildMatrix(10, 10) { i, j -> i.toDouble() + j }
 
-## Vector spaces
+    // Addition
+    vec + vec
+    mat + mat
 
+    // Multiplication by scalar
+    vec * 2.0
+    mat * 2.0
 
-## Matrix operations
+    // Dot product
+    mat dot vec
+    mat dot mat
+}
+```
 
-## Back-end overview
\ No newline at end of file
+## Backends overview
+
+### EJML
+### Commons Math
diff --git a/docs/nd-structure.md b/docs/nd-structure.md
index ab214094e..3e9203ec0 100644
--- a/docs/nd-structure.md
+++ b/docs/nd-structure.md
@@ -11,16 +11,16 @@ Let us consider following contexts:
 ```kotlin
     // automatically build context most suited for given type.
     val autoField = NDField.auto(DoubleField, dim, dim)
-    // specialized nd-field for Double. It works as generic Double field as well
+    // specialized nd-field for Double. It works as generic Double field as well.
     val specializedField = NDField.real(dim, dim)
     //A generic boxing field. It should be used for objects, not primitives.
     val genericField = NDField.buffered(DoubleField, dim, dim)
 ```
-Now let us perform several tests and see which implementation is best suited for each case:
+Now let us perform several tests and see, which implementation is best suited for each case:
 
 ## Test case
 
-In order to test performance we will take 2d-structures with `dim = 1000` and add a structure filled with `1.0`
+To test performance we will take 2d-structures with `dim = 1000` and add a structure filled with `1.0`
 to it `n = 1000` times.
 
 ## Specialized
@@ -35,8 +35,8 @@ The code to run this looks like:
 ```
 The performance of this code is the best of all tests since it inlines all operations and is specialized for operation
 with doubles. We will measure everything else relative to this one, so time for this test will be `1x` (real time
-on my computer is about 4.5 seconds). The only problem with this approach is that it requires to specify type
-from the beginning. Everyone do so anyway, so it is the recommended approach.
+on my computer is about 4.5 seconds). The only problem with this approach is that it requires specifying type
+from the beginning. Everyone does so anyway, so it is the recommended approach.
 
 ## Automatic
 Let's do the same with automatic field inference:
@@ -49,7 +49,7 @@ Let's do the same with automatic field inference:
     }
 ```
 Ths speed of this operation is approximately the same as for specialized case since `NDField.auto` just
-returns the same `RealNDField` in this case. Of course it is usually better to use specialized method to be sure.
+returns the same `RealNDField` in this case. Of course, it is usually better to use specialized method to be sure.
 
 ## Lazy
 Lazy field does not produce a structure when asked, instead it generates an empty structure and fills it on-demand
@@ -63,7 +63,7 @@ When one calls
         }
     }
 ```
-The result will be calculated almost immediately but the result will be empty. In order to get the full result
+The result will be calculated almost immediately but the result will be empty. To get the full result
 structure one needs to call all its elements. In this case computation overhead will be huge. So this field never
 should be used if one expects to use the full result structure. Though if one wants only small fraction, it could
 save a lot of time.
@@ -94,7 +94,7 @@ The boxing field produced by
         }
     }
 ```
-obviously is the slowest one, because it requires to box and unbox the `double` on each operation. It takes about
+is the slowest one, because it requires boxing and unboxing the `double` on each operation. It takes about
 `15x` time (**TODO: there seems to be a problem here, it should be slow, but not that slow**). This field should
 never be used for primitives.
 
@@ -123,6 +123,6 @@ for i in range(1000):
 ```
 gives the completion time of about `1.1x`, which means that specialized kotlin code in fact is working faster (I think it is
 because better memory management). Of course if one writes `res += 1.0`, the performance will be different,
-but it would be differenc case, because numpy overrides `+=` with in-place operations. In-place operations are
+but it would be different case, because numpy overrides `+=` with in-place operations. In-place operations are
 available in `kmath` with `MutableNDStructure` but there is no field for it (one can still work with mapping
 functions).
\ No newline at end of file
diff --git a/docs/readme.md b/docs/readme.md
new file mode 100644
index 000000000..2953b7113
--- /dev/null
+++ b/docs/readme.md
@@ -0,0 +1,14 @@
+# Documentation
+
+* [Algebra](algebra.md): [context-based](contexts.md) operations on different primitives and structures.
+
+* [NDStructures](nd-structure.md)
+
+* [Linear algebra](linear.md): matrices, operations and linear equations solving. To be moved to separate module.
+  Currently, supports basic API and multiple library back-ends.
+
+* [Histograms](histograms.md): multidimensional histogram calculation and operations.
+
+* [Expressions](expressions.md)
+
+* Commons math integration
diff --git a/docs/templates/README-TEMPLATE.md b/docs/templates/README-TEMPLATE.md
index bad11a31a..e75d4c5ed 100644
--- a/docs/templates/README-TEMPLATE.md
+++ b/docs/templates/README-TEMPLATE.md
@@ -6,10 +6,10 @@
 
 # KMath
 
-Could be pronounced as `key-math`. The **K**otlin **Math**ematics library was initially intended as a Kotlin-based analog to
-Python's NumPy library. Later we found that kotlin is much more flexible language and allows superior architecture 
-designs. In contrast to `numpy` and `scipy` it is modular and has a lightweight core. The `numpy`-like experience could 
-be achieved with [kmath-for-real](/kmath-for-real) extension module.
+Could be pronounced as `key-math`. The **K**otlin **Math**ematics library was initially intended as a Kotlin-based
+analog to Python's NumPy library. Later we found that kotlin is much more flexible language and allows superior
+architecture designs. In contrast to `numpy` and `scipy` it is modular and has a lightweight core. The `numpy`-like
+experience could be achieved with [kmath-for-real](/kmath-for-real) extension module.
 
 [Documentation site (**WIP**)](https://mipt-npm.github.io/kmath/)
 
@@ -21,26 +21,33 @@ be achieved with [kmath-for-real](/kmath-for-real) extension module.
 
 # Goal
 
-* Provide a flexible and powerful API to work with mathematics abstractions in Kotlin-multiplatform (JVM, JS and Native). 
+* Provide a flexible and powerful API to work with mathematics abstractions in Kotlin-multiplatform (JVM, JS and Native)
+  .
 * Provide basic multiplatform implementations for those abstractions (without significant performance optimization).
 * Provide bindings and wrappers with those abstractions for popular optimized platform libraries.
 
 ## Non-goals
 
-* Be like NumPy. It was the idea at the beginning, but we decided that we can do better in terms of API.
+* Be like NumPy. It was the idea at the beginning, but we decided that we can do better in API.
 * Provide the best performance out of the box. We have specialized libraries for that. Need only API wrappers for them.
 * Cover all cases as immediately and in one bundle. We will modularize everything and add new features gradually.
-* Provide specialized behavior in the core. API is made generic on purpose, so one needs to specialize for types, like 
-for `Double` in the core. For that we will have specialization modules like `kmath-for-real`, which will give better
-experience for those, who want to work with specific types.
+* Provide specialized behavior in the core. API is made generic on purpose, so one needs to specialize for types, like
+  for `Double` in the core. For that we will have specialization modules like `kmath-for-real`, which will give better
+  experience for those, who want to work with specific types.
 
 ## Features and stability
 
-KMath is a modular library. Different modules provide different features with different API stability guarantees. All core modules are released with the same version, but with different API change policy. The features are described in module definitions below. The module stability could have following levels:
+KMath is a modular library. Different modules provide different features with different API stability guarantees. All
+core modules are released with the same version, but with different API change policy. The features are described in
+module definitions below. The module stability could have the following levels:
 
-* **PROTOTYPE**. On this level there are no compatibility guarantees. All methods and classes form those modules could break any moment. You can still use it, but be sure to fix the specific version.
-* **EXPERIMENTAL**. The general API is decided, but some changes could be made. Volatile API is marked with `@UnstableKmathAPI` or other stability warning annotations.
-* **DEVELOPMENT**. API breaking generally follows semantic versioning ideology. There could be changes in minor versions, but not in patch versions. API is protected with [binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) tool.
+* **PROTOTYPE**. On this level there are no compatibility guarantees. All methods and classes form those modules could
+  break any moment. You can still use it, but be sure to fix the specific version.
+* **EXPERIMENTAL**. The general API is decided, but some changes could be made. Volatile API is marked
+  with `@UnstableKmathAPI` or other stability warning annotations.
+* **DEVELOPMENT**. API breaking generally follows semantic versioning ideology. There could be changes in minor
+  versions, but not in patch versions. API is protected
+  with [binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) tool.
 * **STABLE**. The API stabilized. Breaking changes are allowed only in major releases.
 
 <!--Current feature list is [here](/docs/features.md)-->
@@ -78,30 +85,33 @@ $modules
 
 ## Multi-platform support
 
-KMath is developed as a multi-platform library, which means that most of the interfaces are declared in the 
-[common source sets](/kmath-core/src/commonMain) and implemented there wherever it is possible. In some cases, features 
-are delegated to platform-specific implementations even if they could be provided in the common module for performance 
-reasons. Currently, the Kotlin/JVM is the primary platform, however Kotlin/Native and Kotlin/JS contributions and 
+KMath is developed as a multi-platform library, which means that most of the interfaces are declared in the
+[common source sets](/kmath-core/src/commonMain) and implemented there wherever it is possible. In some cases, features
+are delegated to platform-specific implementations even if they could be provided in the common module for performance
+reasons. Currently, the Kotlin/JVM is the primary platform, however Kotlin/Native and Kotlin/JS contributions and
 feedback are also welcome.
 
 ## Performance
 
-Calculation performance is one of major goals of KMath in the future, but in some cases it is impossible to achieve 
-both performance and flexibility. 
+Calculation performance is one of major goals of KMath in the future, but in some cases it is impossible to achieve both
+performance and flexibility.
 
-We expect to focus on creating convenient universal API first and then work on increasing performance for specific 
-cases. We expect the worst KMath benchmarks will perform better than native Python, but worse than optimized 
-native/SciPy (mostly due to boxing operations on primitive numbers). The best performance of optimized parts could be 
+We expect to focus on creating convenient universal API first and then work on increasing performance for specific
+cases. We expect the worst KMath benchmarks will perform better than native Python, but worse than optimized
+native/SciPy (mostly due to boxing operations on primitive numbers). The best performance of optimized parts could be
 better than SciPy.
 
 ## Requirements
 
-KMath currently relies on JDK 11 for compilation and execution of Kotlin-JVM part. We recommend to use GraalVM-CE 11 for execution in order to get better performance.
+KMath currently relies on JDK 11 for compilation and execution of Kotlin-JVM part. We recommend to use GraalVM-CE 11 for
+execution to get better performance.
 
 ### Repositories
 
-Release and development artifacts are accessible from mipt-npm [Space](https://www.jetbrains.com/space/) repository `https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven` (see documentation of
-[Kotlin Multiplatform](https://kotlinlang.org/docs/reference/multiplatform.html) for more details). The repository could be reached through [repo.kotlin.link](https://repo.kotlin.link) proxy:
+Release and development artifacts are accessible from mipt-npm [Space](https://www.jetbrains.com/space/)
+repository `https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven` (see documentation of
+[Kotlin Multiplatform](https://kotlinlang.org/docs/reference/multiplatform.html) for more details). The repository could
+be reached through [repo.kotlin.link](https://repo.kotlin.link) proxy:
 
 ```kotlin
 repositories {
@@ -118,7 +128,7 @@ Gradle `6.0+` is required for multiplatform artifacts.
 
 ## Contributing
 
-The project requires a lot of additional work. The most important thing we need is a feedback about what features are 
-required the most. Feel free to create feature requests. We are also welcome to code contributions, 
-especially in issues marked with 
+The project requires a lot of additional work. The most important thing we need is a feedback about what features are
+required the most. Feel free to create feature requests. We are also welcome to code contributions, especially in issues
+marked with
 [waiting for a hero](https://github.com/mipt-npm/kmath/labels/waiting%20for%20a%20hero) label.
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
index 6ceaa962a..dec3bfb81 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
@@ -13,8 +13,8 @@ import space.kscience.kmath.kotlingrad.toKotlingradExpression
 import space.kscience.kmath.operations.DoubleField
 
 /**
- * In this example, x^2-4*x-44 function is differentiated with Kotlin∇, and the autodiff result is compared with
- * valid derivative in a certain point.
+ * In this example, *x<sup>2</sup> &minus; 4 x &minus; 44* function is differentiated with Kotlin∇, and the
+ * derivation result is compared with valid derivative in a certain point.
  */
 fun main() {
     val actualDerivative = "x^2-4*x-44"
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
index a9eca0500..7e09faeff 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
@@ -13,8 +13,8 @@ import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.symja.toSymjaExpression
 
 /**
- * In this example, x^2-4*x-44 function is differentiated with Symja, and the autodiff result is compared with
- * valid derivative in a certain point.
+ * In this example, *x<sup>2</sup> &minus; 4 x &minus; 44* function is differentiated with Symja, and the
+ * derivation result is compared with valid derivative in a certain point.
  */
 fun main() {
     val actualDerivative = "x^2-4*x-44"
diff --git a/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt b/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
index 5e64235e3..9118d09ae 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
@@ -25,8 +25,7 @@ import space.kscience.plotly.models.TraceValues
 import kotlin.math.pow
 import kotlin.math.sqrt
 
-//Forward declaration of symbols that will be used in expressions.
-// This declaration is required for
+// Forward declaration of symbols that will be used in expressions.
 private val a by symbol
 private val b by symbol
 private val c by symbol
diff --git a/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt
new file mode 100644
index 000000000..9c3d0fdbe
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.jafama
+
+import space.kscience.kmath.operations.invoke
+
+fun main() {
+    val a = 2.0
+    val b = StrictJafamaDoubleField { exp(a) }
+    println(JafamaDoubleField { b + a })
+    println(StrictJafamaDoubleField { ln(b) })
+}
diff --git a/examples/src/main/kotlin/space/kscience/kmath/jafama/KMathaJafamaDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/jafama/KMathaJafamaDemo.kt
deleted file mode 100644
index 879aab08f..000000000
--- a/examples/src/main/kotlin/space/kscience/kmath/jafama/KMathaJafamaDemo.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.jafama
-
-import net.jafama.FastMath
-
-
-fun main(){
-    val a = JafamaDoubleField.number(2.0)
-    val b = StrictJafamaDoubleField.power(FastMath.E,a)
-
-    println(JafamaDoubleField.add(b,a))
-    println(StrictJafamaDoubleField.ln(b))
-}
diff --git a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
index b319766e3..bde83cea9 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
@@ -10,9 +10,6 @@ import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.chains.collectWithState
 import space.kscience.kmath.distributions.NormalDistribution
 
-/**
- * The state of distribution averager.
- */
 private data class AveragingChainState(var num: Int = 0, var value: Double = 0.0)
 
 /**
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
index 501bf98db..e1621d477 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
@@ -32,7 +32,7 @@ fun main() {
 
     // automatically build context most suited for given type.
     val autoField = AlgebraND.auto(DoubleField, dim, dim)
-    // specialized nd-field for Double. It works as generic Double field as well
+    // specialized nd-field for Double. It works as generic Double field as well.
     val realField = AlgebraND.real(dim, dim)
     //A generic boxing field. It should be used for objects, not primitives.
     val boxingField = AlgebraND.field(DoubleField, Buffer.Companion::boxing, dim, dim)
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
index 74795cc68..ad6890b15 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
@@ -17,7 +17,7 @@ fun main() = BroadcastDoubleTensorAlgebra {  // work in context with broadcast m
 
     dataset += fromArray(
         intArrayOf(5),
-        doubleArrayOf(0.0, 1.0, 1.5, 3.0, 5.0) // rows means
+        doubleArrayOf(0.0, 1.0, 1.5, 3.0, 5.0) // row means
     )
 
 
@@ -28,7 +28,7 @@ fun main() = BroadcastDoubleTensorAlgebra {  // work in context with broadcast m
     println("Mean:\n$mean")
     println("Standard deviation:\n$std")
 
-    // also we can calculate other statistic as minimum and maximum of rows
+    // also, we can calculate other statistic as minimum and maximum of rows
     println("Minimum:\n${dataset.min(0, false)}")
     println("Maximum:\n${dataset.max(0, false)}")
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
index 6453ca44e..3e6a60c31 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
@@ -42,7 +42,7 @@ fun main() = BroadcastDoubleTensorAlgebra {// work in context with linear operat
     // get P, L, U such that PA = LU
     val (p, l, u) = a.lu()
 
-    // check that P is permutation matrix
+    // check P is permutation matrix
     println("P:\n$p")
     // L is lower triangular matrix and U is upper triangular matrix
     println("L:\n$l")
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
index b262bee02..55a9aa67a 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
@@ -186,7 +186,7 @@ fun main() = BroadcastDoubleTensorAlgebra {
 
     x += fromArray(
         intArrayOf(5),
-        doubleArrayOf(0.0, -1.0, -2.5, -3.0, 5.5) // rows means
+        doubleArrayOf(0.0, -1.0, -2.5, -3.0, 5.5) // row means
     )
 
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index 411e048d7..b973abdef 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -65,8 +65,8 @@ fun main(): Unit = BroadcastDoubleTensorAlgebra {  // work in context with broad
     val datasetReduced  = v dot stack(listOf(xScaled, yScaled))
     println("Reduced data:\n$datasetReduced")
 
-    // we can restore original data from reduced data.
-    // for example, find 7th element of dataset
+    // we can restore original data from reduced data;
+    // for example, find 7th element of dataset.
     val n = 7
     val restored = (datasetReduced[n] dot v.view(intArrayOf(1, 2))) * std + mean
     println("Original value:\n${dataset[n]}")
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index c3c4c38a1..686506f6f 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -106,7 +106,7 @@ var executable = function (constants, arguments) {
 };
 ```
 
-JS also supports very experimental expression optimization with [WebAssembly](https://webassembly.org/) IR generation.
+JS also supports experimental expression optimization with [WebAssembly](https://webassembly.org/) IR generation.
 Currently, only expressions inside `DoubleField` and `IntRing` are supported.
 
 ```kotlin
@@ -161,7 +161,10 @@ public fun main() {
 
 Result LaTeX:
 
+<div style="background-color:white;">
+
 ![](https://latex.codecogs.com/gif.latex?%5Coperatorname{exp}%5C,%5Cleft(%5Csqrt{x}%5Cright)-%5Cfrac{%5Cfrac{%5Coperatorname{arcsin}%5C,%5Cleft(2%5C,x%5Cright)}{2%5Ctimes10^{10}%2Bx^{3}}}{12}+x^{2/3})
+</div>
 
 Result MathML (can be used with MathJax or other renderers):
 
diff --git a/kmath-ast/docs/README-TEMPLATE.md b/kmath-ast/docs/README-TEMPLATE.md
index b90f8ff08..9494af63a 100644
--- a/kmath-ast/docs/README-TEMPLATE.md
+++ b/kmath-ast/docs/README-TEMPLATE.md
@@ -77,7 +77,7 @@ var executable = function (constants, arguments) {
 };
 ```
 
-JS also supports very experimental expression optimization with [WebAssembly](https://webassembly.org/) IR generation.
+JS also supports experimental expression optimization with [WebAssembly](https://webassembly.org/) IR generation.
 Currently, only expressions inside `DoubleField` and `IntRing` are supported.
 
 ```kotlin
@@ -132,7 +132,10 @@ public fun main() {
 
 Result LaTeX:
 
+<div style="background-color:white;">
+
 ![](https://latex.codecogs.com/gif.latex?%5Coperatorname{exp}%5C,%5Cleft(%5Csqrt{x}%5Cright)-%5Cfrac{%5Cfrac{%5Coperatorname{arcsin}%5C,%5Cleft(2%5C,x%5Cright)}{2%5Ctimes10^{10}%2Bx^{3}}}{12}+x^{2/3})
+</div>
 
 Result MathML (can be used with MathJax or other renderers):
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
index 38450403d..ee23ab408 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.ast.rendering
 import space.kscience.kmath.misc.UnstableKMathAPI
 
 /**
- * Mathematical typography syntax node.
+ * Syntax node for mathematical typography.
  *
  * @author Iaroslav Postovalov
  */
@@ -301,7 +301,7 @@ public data class BinaryPlusSyntax(
 }
 
 /**
- * Represents binary, infix subtraction (*42 - 42*).
+ * Represents binary, infix subtraction (*42 &minus; 42*).
  *
  * @param left The minuend.
  * @param right The subtrahend.
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
index fb2b3b66f..362c07d72 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
@@ -9,7 +9,7 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 
 /**
  * Abstraction of writing [MathSyntax] as a string of an actual markup language. Typical implementation should
- * involve traversal of MathSyntax with handling each its subtype.
+ * involve traversal of MathSyntax with handling each subtype.
  *
  * @author Iaroslav Postovalov
  */
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index 37e9a8c19..8a4804916 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -49,7 +49,7 @@ else
     NumberSyntax(string = s)
 
 /**
- * Special printing for numeric types which are printed in form of
+ * Special printing for numeric types that are printed in form of
  * *('-'? (DIGIT+ ('.' DIGIT+)? ('E' '-'? DIGIT+)? | 'Infinity')) | 'NaN'*.
  *
  * @property types The suitable types.
@@ -110,7 +110,7 @@ public class PrettyPrintFloats(public val types: Set<KClass<out Number>>) : Rend
 }
 
 /**
- * Special printing for numeric types which are printed in form of *'-'? DIGIT+*.
+ * Special printing for numeric types that are printed in form of *'-'? DIGIT+*.
  *
  * @property types The suitable types.
  * @author Iaroslav Postovalov
@@ -155,7 +155,7 @@ public class PrettyPrintPi(public val symbols: Set<String>) : RenderFeature {
 }
 
 /**
- * Abstract printing of unary operations which discards [MST] if their operation is not in [operations] or its type is
+ * Abstract printing of unary operations that discards [MST] if their operation is not in [operations] or its type is
  * not [MST.Unary].
  *
  * @param operations the allowed operations. If `null`, any operation is accepted.
@@ -176,7 +176,7 @@ public abstract class Unary(public val operations: Collection<String>?) : Render
 }
 
 /**
- * Abstract printing of unary operations which discards [MST] if their operation is not in [operations] or its type is
+ * Abstract printing of unary operations that discards [MST] if their operation is not in [operations] or its type is
  * not [MST.Binary].
  *
  * @property operations the allowed operations. If `null`, any operation is accepted.
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
index a84248f63..06e040e93 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
@@ -57,13 +57,13 @@ internal fun MethodVisitor.label(): Label = Label().also(::visitLabel)
 /**
  * Creates a class name for [Expression] subclassed to implement [mst] provided.
  *
- * This methods helps to avoid collisions of class name to prevent loading several classes with the same name. If there
+ * These methods help to avoid collisions of class name to prevent loading several classes with the same name. If there
  * is a colliding class, change [collision] parameter or leave it `0` to check existing classes recursively.
  *
  * @author Iaroslav Postovalov
  */
 internal tailrec fun buildName(mst: MST, collision: Int = 0): String {
-    val name = "space.kscience.kmath.asm.generated.AsmCompiledExpression_${mst.hashCode()}_$collision"
+    val name = "space.kscience.kmath.asm.generated.CompiledExpression_${mst.hashCode()}_$collision"
 
     try {
         Class.forName(name)
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
index 0925fee7e..d5473063a 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
@@ -31,7 +31,7 @@ public class DerivativeStructureField(
     override fun number(value: Number): DerivativeStructure = const(value.toDouble())
 
     /**
-     * A class that implements both [DerivativeStructure] and a [Symbol]
+     * A class implementing both [DerivativeStructure] and [Symbol].
      */
     public inner class DerivativeStructureSymbol(
         size: Int,
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
index 0bf1d53f0..3c57f5467 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
@@ -34,7 +34,7 @@ internal class AutoDiffTest {
             println(z.derivative(x))
             println(z.derivative(y, x))
             assertEquals(z.derivative(x, y), z.derivative(y, x))
-            //check that improper order cause failure
+            // check improper order cause failure
             assertFails { z.derivative(x, x, y) }
         }
     }
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index 15c9120ec..b0e5d7904 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -27,7 +27,7 @@ internal class OptimizeTest {
     fun testGradientOptimization() {
         val result = normal.optimize(x, y) {
             initialGuess(x to 1.0, y to 1.0)
-            //no need to select optimizer. Gradient optimizer is used by default because gradients are provided by function
+            // no need to select optimizer. Gradient optimizer is used by default because gradients are provided by function.
         }
         println(result.point)
         println(result.value)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
index ce1265b2f..19befe6e6 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.expressions
 
 /**
- * Represents expression which structure can be differentiated.
+ * Represents expression, which structure can be differentiated.
  *
  * @param T the type this expression takes as argument and returns.
  */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
index 84e66918f..5105c2bec 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
@@ -43,7 +43,7 @@ public operator fun <T> Expression<T>.invoke(vararg pairs: Pair<Symbol, T>): T =
 /**
  * Calls this expression from arguments.
  *
- * @param pairs the pairs of arguments' names to values.
+ * @param pairs the pairs of arguments' names to value.
  * @return a value.
  */
 @JvmName("callByString")
@@ -60,7 +60,7 @@ public operator fun <T> Expression<T>.invoke(vararg pairs: Pair<String, T>): T =
 public interface ExpressionAlgebra<in T, E> : Algebra<E> {
 
     /**
-     * A constant expression which does not depend on arguments
+     * A constant expression that does not depend on arguments.
      */
     public fun const(value: T): E
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
index 5935424b6..838118339 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
@@ -18,7 +18,7 @@ public abstract class FunctionalExpressionAlgebra<T, out A : Algebra<T>>(
     public val algebra: A,
 ) : ExpressionAlgebra<T, Expression<T>> {
     /**
-     * Builds an Expression of constant expression which does not depend on arguments.
+     * Builds an Expression of constant expression that does not depend on arguments.
      */
     override fun const(value: T): Expression<T> = Expression { value }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
index 9c3ffd819..d63f141ba 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
@@ -8,8 +8,8 @@ package space.kscience.kmath.linear
 import space.kscience.kmath.nd.as1D
 
 /**
- * A group of methods to solve for *X* in equation *X = A <sup>-1</sup> &middot; B*, where *A* and *B* are matrices or
- * vectors.
+ * A group of methods to solve for *X* in equation *X = A<sup>&minus;1</sup> &middot; B*, where *A* and *B* are
+ * matrices or vectors.
  *
  * @param T the type of items.
  */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
index badf2794e..63b881105 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
@@ -164,7 +164,7 @@ public interface LinearSpace<T : Any, out A : Ring<T>> {
     public operator fun T.times(v: Point<T>): Point<T> = v * this
 
     /**
-     * Get a feature of the structure in this scope. Structure features take precedence other context features
+     * Get a feature of the structure in this scope. Structure features take precedence other context features.
      *
      * @param F the type of feature.
      * @param structure the structure.
@@ -195,7 +195,7 @@ public interface LinearSpace<T : Any, out A : Ring<T>> {
 }
 
 /**
- * Get a feature of the structure in this scope. Structure features take precedence other context features
+ * Get a feature of the structure in this scope. Structure features take precedence other context features.
  *
  * @param T the type of items in the matrices.
  * @param F the type of feature.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
index f3653d394..25f53f65d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
@@ -114,7 +114,7 @@ public fun <T : Comparable<T>> LinearSpace<T, Field<T>>.lup(
                     for (i in 0 until col) sum -= luRow[i] * lu[i, col]
                     luRow[col] = sum
 
-                    // maintain best permutation choice
+                    // maintain the best permutation choice
                     if (abs(sum) > largest) {
                         largest = abs(sum)
                         max = row
@@ -241,7 +241,7 @@ public fun LinearSpace<Double, DoubleField>.solveWithLup(a: Matrix<Double>, b: M
 }
 
 /**
- * Inverses a square matrix using LUP decomposition. Non square matrix will throw a error.
+ * Inverses a square matrix using LUP decomposition. Non square matrix will throw an error.
  */
 public fun LinearSpace<Double, DoubleField>.inverseWithLup(matrix: Matrix<Double>): Matrix<Double> =
     solveWithLup(matrix, one(matrix.rowNum, matrix.colNum))
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
index e0d733a66..b70e9d8a9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
@@ -31,7 +31,7 @@ public object ZeroFeature : DiagonalFeature
 public object UnitFeature : DiagonalFeature
 
 /**
- * Matrices with this feature can be inverted: [inverse] = `a`<sup>-1</sup> where `a` is the owning matrix.
+ * Matrices with this feature can be inverted: *[inverse] = a<sup>&minus;1</sup>* where *a* is the owning matrix.
  *
  * @param T the type of matrices' items.
  */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
index 4b624b6a0..df3852d72 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
@@ -22,7 +22,8 @@ public class MatrixWrapper<out T : Any> internal constructor(
 ) : Matrix<T> by origin {
 
     /**
-     * Get the first feature matching given class. Does not guarantee that matrix has only one feature matching the criteria
+     * Get the first feature matching given class. Does not guarantee that matrix has only one feature matching the
+     * criteria.
      */
     @UnstableKMathAPI
     @Suppress("UNCHECKED_CAST")
@@ -61,7 +62,7 @@ public operator fun <T : Any> Matrix<T>.plus(newFeatures: Collection<MatrixFeatu
     }
 
 /**
- * Diagonal matrix of ones. The matrix is virtual no actual matrix is created
+ * Diagonal matrix of ones. The matrix is virtual no actual matrix is created.
  */
 public fun <T : Any> LinearSpace<T, Ring<T>>.one(
     rows: Int,
@@ -87,7 +88,7 @@ public class TransposedFeature<out T : Any>(public val original: Matrix<T>) : Ma
  * Create a virtual transposed matrix without copying anything. `A.transpose().transpose() === A`
  */
 @OptIn(UnstableKMathAPI::class)
-public fun <T : Any> Matrix<T>.transpose(): Matrix<T> = getFeature<TransposedFeature<T>>()?.original ?: VirtualMatrix(
+public fun <T : Any> Matrix<T>.transpose(): Matrix<T> = getFeature<TransposedFeature<T>>()?.original ?: (VirtualMatrix(
     colNum,
     rowNum,
-) { i, j -> get(j, i) } + TransposedFeature(this)
\ No newline at end of file
+) { i, j -> get(j, i) } + TransposedFeature(this))
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
index e521e6237..99f959c86 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
@@ -7,8 +7,8 @@ package space.kscience.kmath.misc
 
 /**
  * Marks declarations that are still experimental in the KMath APIs, which means that the design of the corresponding
- * declarations has open issues which may (or may not) lead to their changes in the future. Roughly speaking, there is
- * a chance that those declarations will be deprecated in the near future or the semantics of their behavior may change
+ * declarations has open issues that may (or may not) lead to their changes in the future. Roughly speaking, there is
+ * a chance of those declarations will be deprecated in the near future or the semantics of their behavior may change
  * in some way that may break some code.
  */
 @MustBeDocumented
@@ -17,7 +17,7 @@ package space.kscience.kmath.misc
 public annotation class UnstableKMathAPI
 
 /**
- * Marks API which could cause performance problems. The code, marked by this API is not necessary slow, but could cause
+ * Marks API that could cause performance problems. The code marked by this API is unnecessary slow but could cause
  * slow-down in some cases. Refer to the documentation and benchmark it to be sure.
  */
 @MustBeDocumented
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index 7b0b06a58..454a33e86 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.structures.*
 import kotlin.reflect.KClass
 
 /**
- * An exception is thrown when the expected ans actual shape of NDArray differs.
+ * An exception is thrown when the expected and actual shape of NDArray differ.
  *
  * @property expected the expected shape.
  * @property actual the actual shape.
@@ -63,7 +63,7 @@ public interface AlgebraND<T, out C : Algebra<T>> {
         structure.map { value -> this@invoke(value) }
 
     /**
-     * Get a feature of the structure in this scope. Structure features take precedence other context features
+     * Get a feature of the structure in this scope. Structure features take precedence other context features.
      *
      * @param F the type of feature.
      * @param structure the structure.
@@ -79,7 +79,7 @@ public interface AlgebraND<T, out C : Algebra<T>> {
 
 
 /**
- * Get a feature of the structure in this scope. Structure features take precedence other context features
+ * Get a feature of the structure in this scope. Structure features take precedence other context features.
  *
  * @param T the type of items in the matrices.
  * @param F the type of feature.
@@ -130,15 +130,6 @@ public interface GroupND<T, out S : Group<T>> : Group<StructureND<T>>, AlgebraND
     override fun add(a: StructureND<T>, b: StructureND<T>): StructureND<T> =
         combine(a, b) { aValue, bValue -> add(aValue, bValue) }
 
-//    /**
-//     * Element-wise multiplication by scalar.
-//     *
-//     * @param a the multiplicand.
-//     * @param k the multiplier.
-//     * @return the product.
-//     */
-//    override fun multiply(a: NDStructure<T>, k: Number): NDStructure<T> =  a.map { multiply(it, k) }
-
     // TODO move to extensions after KEEP-176
 
     /**
@@ -226,7 +217,7 @@ public interface RingND<T, out R : Ring<T>> : Ring<StructureND<T>>, GroupND<T, R
  * @param T the type of the element contained in ND structure.
  * @param F the type field over structure elements.
  */
-public interface FieldND<T, out F : Field<T>> : Field<StructureND<T>>, RingND<T, F>, ScaleOperations<StructureND<T>> {
+public interface FieldND<T, out F : Field<T>> : Field<StructureND<T>>, RingND<T, F> {
     /**
      * Element-wise division.
      *
@@ -256,6 +247,15 @@ public interface FieldND<T, out F : Field<T>> : Field<StructureND<T>>, RingND<T,
      */
     public operator fun T.div(arg: StructureND<T>): StructureND<T> = arg.map { divide(it, this@div) }
 
+    /**
+     * Element-wise scaling.
+     *
+     * @param a the multiplicand.
+     * @param value the multiplier.
+     * @return the product.
+     */
+    override fun scale(a: StructureND<T>, value: Double): StructureND<T> = a.map { scale(it, value) }
+
 //    @ThreadLocal
 //    public companion object {
 //        private val realNDFieldCache: MutableMap<IntArray, RealNDField> = hashMapOf()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index d916bc0d6..1af80149c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -110,7 +110,7 @@ internal class MutableBuffer1DWrapper<T>(val buffer: MutableBuffer<T>) : Mutable
 }
 
 /**
- * Represent a [StructureND] as [Structure1D]. Throw error in case of dimension mismatch
+ * Represent a [StructureND] as [Structure1D]. Throw error in case of dimension mismatch.
  */
 public fun <T> StructureND<T>.as1D(): Structure1D<T> = this as? Structure1D<T> ?: if (shape.size == 1) {
     when (this) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index cb69bdc00..293faaeda 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -144,13 +144,16 @@ private class MutableStructure2DWrapper<T>(val structure: MutableStructureND<T>)
 }
 
 /**
- * Represent a [StructureND] as [Structure1D]. Throw error in case of dimension mismatch
+ * Represents a [StructureND] as [Structure2D]. Throws runtime error in case of dimension mismatch.
  */
 public fun <T> StructureND<T>.as2D(): Structure2D<T> = this as? Structure2D<T> ?: when (shape.size) {
     2 -> Structure2DWrapper(this)
     else -> error("Can't create 2d-structure from ${shape.size}d-structure")
 }
 
+/**
+ * Represents a [StructureND] as [Structure2D]. Throws runtime error in case of dimension mismatch.
+ */
 public fun <T> MutableStructureND<T>.as2D(): MutableStructure2D<T> = this as? MutableStructure2D<T> ?: when (shape.size) {
     2 -> MutableStructure2DWrapper(this)
     else -> error("Can't create 2d-structure from ${shape.size}d-structure")
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 1ad8289bc..716bd15f3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -16,7 +16,7 @@ import kotlin.reflect.KClass
 public interface StructureFeature
 
 /**
- * Represents n-dimensional structure, i.e. multidimensional container of items of the same type and size. The number
+ * Represents n-dimensional structure i.e., multidimensional container of items of the same type and size. The number
  * of dimensions and items in an array is defined by its shape, which is a sequence of non-negative integers that
  * specify the sizes of each dimension.
  *
@@ -26,7 +26,7 @@ public interface StructureFeature
  */
 public interface StructureND<out T> {
     /**
-     * The shape of structure, i.e. non-empty sequence of non-negative integers that specify sizes of dimensions of
+     * The shape of structure i.e., non-empty sequence of non-negative integers that specify sizes of dimensions of
      * this structure.
      */
     public val shape: IntArray
@@ -53,8 +53,8 @@ public interface StructureND<out T> {
     public fun elements(): Sequence<Pair<IntArray, T>>
 
     /**
-     * Feature is some additional structure information which allows to access it special properties or hints.
-     * If the feature is not present, null is returned.
+     * Feature is some additional structure information that allows to access it special properties or hints.
+     * If the feature is not present, `null` is returned.
      */
     @UnstableKMathAPI
     public fun <F : StructureFeature> getFeature(type: KClass<out F>): F? = null
@@ -177,7 +177,7 @@ public inline fun <T> MutableStructureND<T>.mapInPlace(action: (IntArray, T) ->
     elements().forEach { (index, oldValue) -> this[index] = action(index, oldValue) }
 
 /**
- * A way to convert ND index to linear one and back.
+ * A way to convert ND indices to linear one and back.
  */
 public interface Strides {
     /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index cef34dce2..1009742e1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -23,15 +23,13 @@ public interface Algebra<T> {
      * Wraps a raw string to [T] object. This method is designed for three purposes:
      *
      * 1. Mathematical constants (`e`, `pi`).
-     * 2. Variables for expression-like contexts (`a`, `b`, `c`...).
-     * 3. Literals (`{1, 2}`, (`(3; 4)`)).
+     * 1. Variables for expression-like contexts (`a`, `b`, `c`&hellip;).
+     * 1. Literals (`{1, 2}`, (`(3; 4)`)).
      *
-     * In case if algebra can't parse the string, this method must throw [kotlin.IllegalStateException].
-     *
-     * Returns `null` if symbol could not be bound to the context
+     * If algebra can't parse the string, then this method must throw [kotlin.IllegalStateException].
      *
      * @param value the raw string.
-     * @return an object.
+     * @return an object or `null` if symbol could not be bound to the context.
      */
     public fun bindSymbolOrNull(value: String): T? = null
 
@@ -42,13 +40,12 @@ public interface Algebra<T> {
         bindSymbolOrNull(value) ?: error("Symbol '$value' is not supported in $this")
 
     /**
-     * Dynamically dispatches an unary operation with the certain name.
+     * Dynamically dispatches a unary operation with the certain name.
      *
-     * This function must has two features:
+     * Implementations must fulfil the following requirements:
      *
-     * 1. In case operation is not defined in the structure, the function throws [kotlin.IllegalStateException].
-     * 2. This function is symmetric with second `unaryOperation` overload:
-     * i.e. `unaryOperationFunction(a)(b) == unaryOperation(a, b)`.
+     * 1. If operation is not defined in the structure, then the function throws [kotlin.IllegalStateException].
+     * 1. Equivalence to [unaryOperation]: for any `a` and `b`, `unaryOperationFunction(a)(b) == unaryOperation(a, b)`.
      *
      * @param operation the name of operation.
      * @return an operation.
@@ -57,13 +54,13 @@ public interface Algebra<T> {
         error("Unary operation $operation not defined in $this")
 
     /**
-     * Dynamically invokes an unary operation with the certain name.
+     * Dynamically invokes a unary operation with the certain name.
      *
-     * This function must follow two properties:
+     * Implementations must fulfil the following requirements:
      *
-     * 1. In case if operation is not defined in the structure, the function throws [kotlin.IllegalStateException].
-     * 2. This function is symmetric with second [unaryOperationFunction] overload:
-     * i.e. `unaryOperationFunction(a)(b) == unaryOperation(a, b)`.
+     * 1. If operation is not defined in the structure, then the function throws [kotlin.IllegalStateException].
+     * 1. Equivalence to [unaryOperationFunction]: i.e., for any `a` and `b`,
+     * `unaryOperationFunction(a)(b) == unaryOperation(a, b)`.
      *
      * @param operation the name of operation.
      * @param arg the argument of operation.
@@ -74,11 +71,11 @@ public interface Algebra<T> {
     /**
      * Dynamically dispatches a binary operation with the certain name.
      *
-     * This function must follow two properties:
+     * Implementations must fulfil the following requirements:
      *
-     * 1. In case if operation is not defined in the structure, the function throws [kotlin.IllegalStateException].
-     * 2. This function is symmetric with second [binaryOperationFunction] overload:
-     * i.e. `binaryOperationFunction(a)(b, c) == binaryOperation(a, b, c)`.
+     * 1. If operation is not defined in the structure, then the function throws [kotlin.IllegalStateException].
+     * 1. Equivalence to [binaryOperation]: for any `a`, `b`, and `c`,
+     * `binaryOperationFunction(a)(b, c) == binaryOperation(a, b, c)`.
      *
      * @param operation the name of operation.
      * @return an operation.
@@ -89,11 +86,11 @@ public interface Algebra<T> {
     /**
      * Dynamically invokes a binary operation with the certain name.
      *
-     * This function must follow two properties:
+     * Implementations must fulfil the following requirements:
      *
-     * 1. In case if operation is not defined in the structure, the function throws [kotlin.IllegalStateException].
-     * 2. This function is symmetric with second [binaryOperationFunction] overload:
-     * i.e. `binaryOperationFunction(a)(b, c) == binaryOperation(a, b, c)`.
+     * 1. If operation is not defined in the structure, then the function throws [kotlin.IllegalStateException].
+     * 1. Equivalence to [binaryOperationFunction]: for any `a`, `b`, and `c`,
+     * `binaryOperationFunction(a)(b, c) == binaryOperation(a, b, c)`.
      *
      * @param operation the name of operation.
      * @param left the first argument of operation.
@@ -115,7 +112,7 @@ public fun <T> Algebra<T>.bindSymbol(symbol: Symbol): T = bindSymbol(symbol.iden
 public inline operator fun <A : Algebra<*>, R> A.invoke(block: A.() -> R): R = run(block)
 
 /**
- * Represents group without neutral element (also known as inverse semigroup), i.e. algebraic structure with
+ * Represents group without neutral element (also known as inverse semigroup) i.e., algebraic structure with
  * associative, binary operation [add].
  *
  * @param T the type of element of this semispace.
@@ -130,7 +127,7 @@ public interface GroupOperations<T> : Algebra<T> {
      */
     public fun add(a: T, b: T): T
 
-    // Operations to be performed in this context. Could be moved to extensions in case of KEEP-176
+    // Operations to be performed in this context. Could be moved to extensions in case of KEEP-176.
 
     /**
      * The negation of this element.
@@ -192,7 +189,7 @@ public interface GroupOperations<T> : Algebra<T> {
 }
 
 /**
- * Represents group, i.e. algebraic structure with associative, binary operation [add].
+ * Represents group i.e., algebraic structure with associative, binary operation [add].
  *
  * @param T the type of element of this semispace.
  */
@@ -204,7 +201,7 @@ public interface Group<T> : GroupOperations<T> {
 }
 
 /**
- * Represents ring without multiplicative and additive identities, i.e. algebraic structure with
+ * Represents ring without multiplicative and additive identities i.e., algebraic structure with
  * associative, binary, commutative operation [add] and associative, operation [multiply] distributive over [add].
  *
  * @param T the type of element of this semiring.
@@ -240,7 +237,7 @@ public interface RingOperations<T> : GroupOperations<T> {
 }
 
 /**
- * Represents ring, i.e. algebraic structure with two associative binary operations called "addition" and
+ * Represents ring i.e., algebraic structure with two associative binary operations called "addition" and
  * "multiplication" and their neutral elements.
  *
  * @param T the type of element of this ring.
@@ -253,8 +250,9 @@ public interface Ring<T> : Group<T>, RingOperations<T> {
 }
 
 /**
- * Represents field without without multiplicative and additive identities, i.e. algebraic structure with associative, binary, commutative operations
- * [add] and [multiply]; binary operation [divide] as multiplication of left operand by reciprocal of right one.
+ * Represents field without multiplicative and additive identities i.e., algebraic structure with associative, binary,
+ * commutative operations [add] and [multiply]; binary operation [divide] as multiplication of left operand by
+ * reciprocal of right one.
  *
  * @param T the type of element of this semifield.
  */
@@ -291,7 +289,7 @@ public interface FieldOperations<T> : RingOperations<T> {
 }
 
 /**
- * Represents field, i.e. algebraic structure with three operations: associative, commutative addition and
+ * Represents field i.e., algebraic structure with three operations: associative, commutative addition and
  * multiplication, and division. **This interface differs from the eponymous mathematical definition: fields in KMath
  * also support associative multiplication by scalar.**
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
index 403a9c9b1..6b0e2cabd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.operations
 import space.kscience.kmath.misc.UnstableKMathAPI
 
 /**
- * The generic mathematics elements which is able to store its context
+ * The generic mathematics elements that is able to store its context
  *
  * @param C the type of mathematical context for this element.
  * @param T the type wrapped by this wrapper.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 4ccbfc531..8111691aa 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -121,7 +121,7 @@ public class BigInt internal constructor(
         var r = ZERO
 
         val bitSize =
-            (BASE_SIZE * (this.magnitude.size - 1) + log2(this.magnitude.lastOrNull()?.toFloat() ?: 0f + 1)).toInt()
+            (BASE_SIZE * (this.magnitude.size - 1) + log2(this.magnitude.lastOrNull()?.toFloat() ?: (0f + 1))).toInt()
 
         for (i in bitSize downTo 0) {
             r = r shl 1
@@ -442,7 +442,7 @@ public fun UIntArray.toBigInt(sign: Byte): BigInt {
 }
 
 /**
- * Returns null if a valid number can not be read from a string
+ * Returns `null` if a valid number cannot be read from a string
  */
 public fun String.parseBigInteger(): BigInt? {
     if (isEmpty()) return null
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
index 7a8fa5668..92070b33d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
@@ -26,11 +26,11 @@ public interface NumericAlgebra<T> : Algebra<T> {
     /**
      * Dynamically dispatches a binary operation with the certain name with numeric first argument.
      *
-     * This function must follow two properties:
+     * Implementations must fulfil the following requirements:
      *
-     * 1. In case if operation is not defined in the structure, the function throws [kotlin.IllegalStateException].
-     * 2. This function is symmetric with the other [leftSideNumberOperation] overload:
-     * i.e. `leftSideNumberOperationFunction(a)(b, c) == leftSideNumberOperation(a, b)`.
+     * 1. If operation is not defined in the structure, then function throws [kotlin.IllegalStateException].
+     * 1. Equivalence to [leftSideNumberOperation]: for any `a`, `b`, and `c`,
+     * `leftSideNumberOperationFunction(a)(b, c) == leftSideNumberOperation(a, b)`.
      *
      * @param operation the name of operation.
      * @return an operation.
@@ -41,11 +41,11 @@ public interface NumericAlgebra<T> : Algebra<T> {
     /**
      * Dynamically invokes a binary operation with the certain name with numeric first argument.
      *
-     * This function must follow two properties:
+     * Implementations must fulfil the following requirements:
      *
-     * 1. In case if operation is not defined in the structure, the function throws [kotlin.IllegalStateException].
-     * 2. This function is symmetric with second [leftSideNumberOperation] overload:
-     * i.e. `leftSideNumberOperationFunction(a)(b, c) == leftSideNumberOperation(a, b, c)`.
+     * 1. If operation is not defined in the structure, then the function throws [kotlin.IllegalStateException].
+     * 1. Equivalence to [leftSideNumberOperation]: for any `a`, `b`, and `c`,
+     * `leftSideNumberOperationFunction(a)(b, c) == leftSideNumberOperation(a, b, c)`.
      *
      * @param operation the name of operation.
      * @param left the first argument of operation.
@@ -58,11 +58,11 @@ public interface NumericAlgebra<T> : Algebra<T> {
     /**
      * Dynamically dispatches a binary operation with the certain name with numeric first argument.
      *
-     * This function must follow two properties:
+     * Implementations must fulfil the following requirements:
      *
-     * 1. In case if operation is not defined in the structure, the function throws [kotlin.IllegalStateException].
-     * 2. This function is symmetric with the other [rightSideNumberOperationFunction] overload:
-     * i.e. `rightSideNumberOperationFunction(a)(b, c) == leftSideNumberOperation(a, b, c)`.
+     * 1. If operation is not defined in the structure, then the function throws [kotlin.IllegalStateException].
+     * 1. Equivalence to [rightSideNumberOperation]: for any `a`, `b`, and `c`,
+     * `rightSideNumberOperationFunction(a)(b, c) == leftSideNumberOperation(a, b, c)`.
      *
      * @param operation the name of operation.
      * @return an operation.
@@ -73,11 +73,11 @@ public interface NumericAlgebra<T> : Algebra<T> {
     /**
      * Dynamically invokes a binary operation with the certain name with numeric second argument.
      *
-     * This function must follow two properties:
+     * Implementations must fulfil the following requirements:
      *
-     * 1. In case if operation is not defined in the structure, the function throws [kotlin.IllegalStateException].
-     * 2. This function is symmetric with the other [rightSideNumberOperationFunction] overload:
-     * i.e. `rightSideNumberOperationFunction(a)(b, c) == rightSideNumberOperation(a, b, c)`.
+     * 1. If operation is not defined in the structure, then the function throws [kotlin.IllegalStateException].
+     * 1. Equivalence to [rightSideNumberOperationFunction]: for any `a`, `b`, and `c`,
+     * `rightSideNumberOperationFunction(a)(b, c) == rightSideNumberOperation(a, b, c)`.
      *
      * @param operation the name of operation.
      * @param left the first argument of operation.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
index 86365394f..31bd47bc3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
@@ -330,13 +330,13 @@ public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> atanh(arg: T):
  */
 public interface Norm<in T : Any, out R> {
     /**
-     * Computes the norm of [arg] (i.e. absolute value or vector length).
+     * Computes the norm of [arg] (i.e., absolute value or vector length).
      */
     public fun norm(arg: T): R
 }
 
 /**
- * Computes the norm of [arg] (i.e. absolute value or vector length).
+ * Computes the norm of [arg] (i.e., absolute value or vector length).
  */
 @UnstableKMathAPI
 public fun <T : AlgebraElement<T, out Norm<T, R>>, R> norm(arg: T): R = arg.context.norm(arg)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
index b4ef37598..7a79663c4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
@@ -32,7 +32,7 @@ public value class DoubleBuffer(public val array: DoubleArray) : MutableBuffer<D
  * [init] function.
  *
  * The function [init] is called for each array element sequentially starting from the first one.
- * It should return the value for an buffer element given its index.
+ * It should return the value for a buffer element given its index.
  */
 public inline fun DoubleBuffer(size: Int, init: (Int) -> Double): DoubleBuffer = DoubleBuffer(DoubleArray(size) { init(it) })
 
@@ -47,7 +47,7 @@ public fun DoubleBuffer(vararg doubles: Double): DoubleBuffer = DoubleBuffer(dou
 public fun DoubleBuffer.contentEquals(vararg doubles: Double): Boolean = array.contentEquals(doubles)
 
 /**
- * Returns a new [DoubleArray] containing all of the elements of this [Buffer].
+ * Returns a new [DoubleArray] containing all the elements of this [Buffer].
  */
 public fun Buffer<Double>.toDoubleArray(): DoubleArray = when (this) {
     is DoubleBuffer -> array.copyOf()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
index 0b16a3afc..efb8504c2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
@@ -51,7 +51,7 @@ public fun FlaggedBuffer<*>.hasFlag(index: Int, flag: ValueFlag): Boolean = (get
 public fun FlaggedBuffer<*>.isMissing(index: Int): Boolean = hasFlag(index, ValueFlag.MISSING)
 
 /**
- * A real buffer which supports flags for each value like NaN or Missing
+ * A [Double] buffer that supports flags for each value like `NaN` or Missing.
  */
 public class FlaggedDoubleBuffer(public val values: DoubleArray, public val flags: ByteArray) : FlaggedBuffer<Double?>,
     Buffer<Double?> {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
index 58b7c6aea..e7e98fc71 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
@@ -34,7 +34,7 @@ public value class FloatBuffer(public val array: FloatArray) : MutableBuffer<Flo
  * [init] function.
  *
  * The function [init] is called for each array element sequentially starting from the first one.
- * It should return the value for an buffer element given its index.
+ * It should return the value for a buffer element given its index.
  */
 public inline fun FloatBuffer(size: Int, init: (Int) -> Float): FloatBuffer = FloatBuffer(FloatArray(size) { init(it) })
 
@@ -44,7 +44,7 @@ public inline fun FloatBuffer(size: Int, init: (Int) -> Float): FloatBuffer = Fl
 public fun FloatBuffer(vararg floats: Float): FloatBuffer = FloatBuffer(floats)
 
 /**
- * Returns a new [FloatArray] containing all of the elements of this [Buffer].
+ * Returns a new [FloatArray] containing all the elements of this [Buffer].
  */
 public fun Buffer<Float>.toFloatArray(): FloatArray = when (this) {
     is FloatBuffer -> array.copyOf()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
index 57b6cfde3..35b722e2b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
@@ -33,7 +33,7 @@ public value class IntBuffer(public val array: IntArray) : MutableBuffer<Int> {
  * [init] function.
  *
  * The function [init] is called for each array element sequentially starting from the first one.
- * It should return the value for an buffer element given its index.
+ * It should return the value for a buffer element given its index.
  */
 public inline fun IntBuffer(size: Int, init: (Int) -> Int): IntBuffer = IntBuffer(IntArray(size) { init(it) })
 
@@ -43,7 +43,7 @@ public inline fun IntBuffer(size: Int, init: (Int) -> Int): IntBuffer = IntBuffe
 public fun IntBuffer(vararg ints: Int): IntBuffer = IntBuffer(ints)
 
 /**
- * Returns a new [IntArray] containing all of the elements of this [Buffer].
+ * Returns a new [IntArray] containing all the elements of this [Buffer].
  */
 public fun Buffer<Int>.toIntArray(): IntArray = when (this) {
     is IntBuffer -> array.copyOf()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
index 57affa1c5..c69f4646d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
@@ -33,7 +33,7 @@ public value class LongBuffer(public val array: LongArray) : MutableBuffer<Long>
  * [init] function.
  *
  * The function [init] is called for each array element sequentially starting from the first one.
- * It should return the value for an buffer element given its index.
+ * It should return the value for a buffer element given its index.
  */
 public inline fun LongBuffer(size: Int, init: (Int) -> Long): LongBuffer = LongBuffer(LongArray(size) { init(it) })
 
@@ -43,7 +43,7 @@ public inline fun LongBuffer(size: Int, init: (Int) -> Long): LongBuffer = LongB
 public fun LongBuffer(vararg longs: Long): LongBuffer = LongBuffer(longs)
 
 /**
- * Returns a new [LongArray] containing all of the elements of this [Buffer].
+ * Returns a new [LongArray] containing all the elements of this [Buffer].
  */
 public fun Buffer<Long>.toLongArray(): LongArray = when (this) {
     is LongBuffer -> array.copyOf()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
index 8dadecff7..20691511b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
@@ -31,7 +31,7 @@ public value class ShortBuffer(public val array: ShortArray) : MutableBuffer<Sho
  * [init] function.
  *
  * The function [init] is called for each array element sequentially starting from the first one.
- * It should return the value for an buffer element given its index.
+ * It should return the value for a buffer element given its index.
  */
 public inline fun ShortBuffer(size: Int, init: (Int) -> Short): ShortBuffer = ShortBuffer(ShortArray(size) { init(it) })
 
@@ -41,7 +41,7 @@ public inline fun ShortBuffer(size: Int, init: (Int) -> Short): ShortBuffer = Sh
 public fun ShortBuffer(vararg shorts: Short): ShortBuffer = ShortBuffer(shorts)
 
 /**
- * Returns a new [ShortArray] containing all of the elements of this [Buffer].
+ * Returns a new [ShortArray] containing all the elements of this [Buffer].
  */
 public fun Buffer<Short>.toShortArray(): ShortArray = when (this) {
     is ShortBuffer -> array.copyOf()
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
index 8523ac864..f8d2549e5 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.sync.withLock
 
 /**
  * A not-necessary-Markov chain of some type
- * @param T - the chain element type
+ * @param T the chain element type
  */
 public interface Chain<out T> : Flow<T> {
     /**
@@ -22,7 +22,7 @@ public interface Chain<out T> : Flow<T> {
     public suspend fun next(): T
 
     /**
-     * Create a copy of current chain state. Consuming resulting chain does not affect initial chain
+     * Create a copy of current chain state. Consuming resulting chain does not affect initial chain.
      */
     public suspend fun fork(): Chain<T>
 
@@ -62,9 +62,11 @@ public class MarkovChain<out R : Any>(private val seed: suspend () -> R, private
 }
 
 /**
- * A chain with possibly mutable state. The state must not be changed outside the chain. Two chins should never share the state
- * @param S - the state of the chain
- * @param forkState - the function to copy current state without modifying it
+ * A chain with possibly mutable state. The state must not be changed outside the chain. Two chins should never share
+ * the state.
+ *
+ * @param S the state of the chain.
+ * @param forkState the function to copy current state without modifying it.
  */
 public class StatefulChain<S, out R>(
     private val state: S,
@@ -96,7 +98,7 @@ public class ConstantChain<out T>(public val value: T) : Chain<T> {
 
 /**
  * Map the chain result using suspended transformation. Initial chain result can no longer be safely consumed
- * since mapped chain consumes tokens. Accepts regular transformation function
+ * since mapped chain consumes tokens. Accepts regular transformation function.
  */
 public fun <T, R> Chain<T>.map(func: suspend (T) -> R): Chain<R> = object : Chain<R> {
     override suspend fun next(): R = func(this@map.next())
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
index 0d6a1178a..4d4493aa4 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
@@ -76,7 +76,7 @@ public fun Flow<Double>.chunked(bufferSize: Int): Flow<DoubleBuffer> = flow {
 
 /**
  * Map a flow to a moving window buffer. The window step is one.
- * In order to get different steps, one could use skip operation.
+ * To get different steps, one could use skip operation.
  */
 public fun <T> Flow<T>.windowed(window: Int): Flow<Buffer<T>> = flow {
     require(window > 1) { "Window size must be more than one" }
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
index deb297913..eb099bd79 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
@@ -20,7 +20,7 @@ import kotlin.jvm.JvmInline
 public interface DMatrix<out T, R : Dimension, C : Dimension> : Structure2D<T> {
     public companion object {
         /**
-         * Coerces a regular matrix to a matrix with type-safe dimensions and throws a error if coercion failed
+         * Coerces a regular matrix to a matrix with type-safe dimensions and throws an error if coercion failed
          */
         public inline fun <T, reified R : Dimension, reified C : Dimension> coerce(structure: Structure2D<T>): DMatrix<T, R, C> {
             require(structure.rowNum == Dimension.dim<R>()) {
@@ -35,7 +35,7 @@ public interface DMatrix<out T, R : Dimension, C : Dimension> : Structure2D<T> {
         }
 
         /**
-         * The same as [DMatrix.coerce] but without dimension checks. Use with caution
+         * The same as [DMatrix.coerce] but without dimension checks. Use with caution.
          */
         public fun <T, R : Dimension, C : Dimension> coerceUnsafe(structure: Structure2D<T>): DMatrix<T, R, C> =
             DMatrixWrapper(structure)
diff --git a/kmath-for-real/build.gradle.kts b/kmath-for-real/build.gradle.kts
index 25fdefaba..4cccaef5c 100644
--- a/kmath-for-real/build.gradle.kts
+++ b/kmath-for-real/build.gradle.kts
@@ -12,7 +12,7 @@ kotlin.sourceSets.commonMain {
 
 readme {
     description = """
-        Extension module that should be used to achieve numpy-like behavior. 
+        Extension module that should be used to achieve numpy-like behavior.
         All operations are specialized to work with `Double` numbers without declaring algebraic contexts.
         One can still use generic algebras though.
         """.trimIndent()
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
index d3867ea89..0508e9ca3 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
@@ -22,7 +22,7 @@ public typealias DoubleVector = Point<Double>
 public fun DoubleVector(vararg doubles: Double): DoubleVector = doubles.asBuffer()
 
 /**
- * Fill the vector of given [size] with given [value]
+ * Fill the vector with given [size] with given [value]
  */
 @UnstableKMathAPI
 public fun Buffer.Companion.same(size: Int, value: Number): DoubleVector = double(size) { value.toDouble() }
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
index c3556216d..1926ef02c 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
@@ -45,8 +45,8 @@ public fun Buffer.Companion.withFixedStep(range: ClosedFloatingPointRange<Double
 /**
  * Convert double range to sequence.
  *
- * If the step is positive, than the sequence starts with the lower boundary and increments by [step] until current value is lower than upper boundary.
- * The boundary itself is not necessary included.
+ * If the step is positive, then the sequence starts with the lower boundary and increments by [step] until current value is lower than upper boundary.
+ * The boundary itself is unnecessarily included.
  *
  * If step is negative, the same goes from upper boundary downwards
  */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index a2ad5801c..16af7f555 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -46,8 +46,8 @@ public fun <T : Comparable<T>> PiecewisePolynomial(
 }
 
 /**
- * An optimized piecewise which uses not separate pieces, but a range separated by delimiters.
- * The pieces search is logarithmic
+ * An optimized piecewise that uses not separate pieces, but a range separated by delimiters.
+ * The pieces search is logarithmic.
  */
 private class OrderedPiecewisePolynomial<T : Comparable<T>>(
     override val pieces: List<Pair<ClosedRange<T>, Polynomial<T>>>,
@@ -79,7 +79,7 @@ public class PiecewiseBuilder<T : Comparable<T>>(delimiter: T) {
     /**
      * Dynamically adds a piece to the right side (beyond maximum argument value of previous piece)
      *
-     * @param right new rightmost position. If is less then current rightmost position, an error is thrown.
+     * @param right new rightmost position. If is less than current rightmost position, an error is thrown.
      * @param piece the sub-function.
      */
     public fun putRight(right: T, piece: Polynomial<T>) {
@@ -91,7 +91,7 @@ public class PiecewiseBuilder<T : Comparable<T>>(delimiter: T) {
     /**
      * Dynamically adds a piece to the left side (beyond maximum argument value of previous piece)
      *
-     * @param left the new leftmost position. If is less then current rightmost position, an error is thrown.
+     * @param left the new leftmost position. If is less than current rightmost position, an error is thrown.
      * @param piece the sub-function.
      */
     public fun putLeft(left: T, piece: Polynomial<T>) {
@@ -114,7 +114,7 @@ public fun <T : Comparable<T>> PiecewisePolynomial(
 ): PiecewisePolynomial<T> = PiecewiseBuilder(startingPoint).apply(builder).build()
 
 /**
- * Return a value of polynomial function with given [ring] an given [arg] or null if argument is outside of piecewise
+ * Return a value of polynomial function with given [ring] a given [arg] or null if argument is outside piecewise
  * definition.
  */
 public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.value(ring: C, arg: T): T? =
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index 283f97557..278ef6abe 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -10,15 +10,17 @@ import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.structures.indices
 
-
-
 /**
  * A simple one-pass integrator based on Gauss rule
  * Following integrand features are accepted:
- * [GaussIntegratorRuleFactory] - A factory for computing the Gauss integration rule. By default uses [GaussLegendreRuleFactory]
- * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
- * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
- * [UnivariateIntegrandRanges] - Set of ranges and number of points per range. Defaults to given [IntegrationRange] and [IntegrandMaxCalls]
+ *
+ * * [GaussIntegratorRuleFactory]&mdash;a factory for computing the Gauss integration rule. By default, uses
+ * [GaussLegendreRuleFactory].
+ * * [IntegrationRange]&mdash;the univariate range of integration. By default, uses `0..1` interval.
+ * * [IntegrandMaxCalls]&mdash;the maximum number of function calls during integration. For non-iterative rules, always
+ * uses the maximum number of points. By default, uses 10 points.
+ * * [UnivariateIntegrandRanges]&mdash;set of ranges and number of points per range. Defaults to given
+ * [IntegrationRange] and [IntegrandMaxCalls].
  */
 public class GaussIntegrator<T : Any>(
     public val algebra: Field<T>,
@@ -71,14 +73,14 @@ public class GaussIntegrator<T : Any>(
 }
 
 /**
- * Create a Gauss-Legendre integrator for this field
+ * Create a Gauss-Legendre integrator for this field.
  * @see [GaussIntegrator]
  */
-public val <T:Any> Field<T>.gaussIntegrator: GaussIntegrator<T> get() = GaussIntegrator(this)
+public val <T : Any> Field<T>.gaussIntegrator: GaussIntegrator<T> get() = GaussIntegrator(this)
 
 
 /**
- * Integrate using [intervals] segments with Gauss-Legendre rule of [order] order
+ * Integrate using [intervals] segments with Gauss-Legendre rule of [order] order.
  */
 @UnstableKMathAPI
 public fun <T : Any> GaussIntegrator<T>.integrate(
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
index 594ca9940..2eceec135 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
@@ -72,7 +72,7 @@ public object GaussLegendreRuleFactory : GaussIntegratorRuleFactory {
         }
 
         // Get previous rule.
-        // If it has not been computed yet it will trigger a recursive call
+        // If it has not been computed, yet it will trigger a recursive call
         // to this method.
         val previousPoints: Buffer<Double> = getOrBuildRule(numPoints - 1).first
 
@@ -146,7 +146,7 @@ public object GaussLegendreRuleFactory : GaussIntegratorRuleFactory {
         }
         // If "numPoints" is odd, 0 is a root.
         // Note: as written, the test for oddness will work for negative
-        // integers too (although it is not necessary here), preventing
+        // integers too (although it is unnecessary here), preventing
         // a FindBugs warning.
         if (numPoints % 2 != 0) {
             var pmc = 1.0
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
index baa9d4af8..c01c30ec2 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
@@ -13,9 +13,10 @@ import space.kscience.kmath.operations.sum
 
 /**
  * Use double pass Simpson rule integration with a fixed number of points.
- * Requires [UnivariateIntegrandRanges] or [IntegrationRange] and [IntegrandMaxCalls]
- * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
- * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
+ * Requires [UnivariateIntegrandRanges] or [IntegrationRange] and [IntegrandMaxCalls].
+ * * [IntegrationRange]&mdash;the univariate range of integration. By default, uses `0..1` interval.
+ * * [IntegrandMaxCalls]&mdash;the maximum number of function calls during integration. For non-iterative rules, always
+ * uses the maximum number of points. By default, uses 10 points.
  */
 @UnstableKMathAPI
 public class SimpsonIntegrator<T : Any>(
@@ -63,12 +64,12 @@ public val <T : Any> Field<T>.simpsonIntegrator: SimpsonIntegrator<T> get() = Si
 
 /**
  * Use double pass Simpson rule integration with a fixed number of points.
- * Requires [UnivariateIntegrandRanges] or [IntegrationRange] and [IntegrandMaxCalls]
- * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
- * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
+ * Requires [UnivariateIntegrandRanges] or [IntegrationRange] and [IntegrandMaxCalls].
+ * * [IntegrationRange]&mdash;the univariate range of integration. By default, uses `0.0..1.0` interval.
+ * * [IntegrandMaxCalls]&mdash;the maximum number of function calls during integration. For non-iterative rules, always uses
+ * the maximum number of points. By default, uses 10 points.
  */
 public object DoubleSimpsonIntegrator : UnivariateIntegrator<Double> {
-
     private fun integrateRange(
         integrand: UnivariateIntegrand<Double>, range: ClosedRange<Double>, numPoints: Int,
     ): Double {
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index 23d7bdd8d..07b37bd6a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -45,8 +45,9 @@ public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(
 
 /**
  * A generic spline-interpolation-based analytic integration
- * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
- * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
+ * * [IntegrationRange]&mdash;the univariate range of integration. By default, uses `0..1` interval.
+ * * [IntegrandMaxCalls]&mdash;the maximum number of function calls during integration. For non-iterative rules, always uses
+ * the maximum number of points. By default, uses 10 points.
  */
 @UnstableKMathAPI
 public class SplineIntegrator<T : Comparable<T>>(
@@ -57,6 +58,7 @@ public class SplineIntegrator<T : Comparable<T>>(
         val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
 
         val interpolator: PolynomialInterpolator<T> = SplineInterpolator(algebra, bufferFactory)
+
         val nodes: Buffer<Double> = integrand.getFeature<UnivariateIntegrationNodes>()?.nodes ?: run {
             val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
             val step = (range.endInclusive - range.start) / (numPoints - 1)
@@ -75,15 +77,16 @@ public class SplineIntegrator<T : Comparable<T>>(
 
 /**
  * A simplified double-based spline-interpolation-based analytic integration
- * [IntegrationRange] - the univariate range of integration. By default uses 0..1 interval.
- * [IntegrandMaxCalls] - the maximum number of function calls during integration. For non-iterative rules, always uses the maximum number of points. By default uses 10 points.
+ * * [IntegrationRange]&mdash;the univariate range of integration. By default, uses `0.0..1.0` interval.
+ * * [IntegrandMaxCalls]&mdash;the maximum number of function calls during integration. For non-iterative rules, always
+ * uses the maximum number of points. By default, uses 10 points.
  */
 @UnstableKMathAPI
 public object DoubleSplineIntegrator : UnivariateIntegrator<Double> {
     override fun integrate(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
         val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
-
         val interpolator: PolynomialInterpolator<Double> = SplineInterpolator(DoubleField, ::DoubleBuffer)
+
         val nodes: Buffer<Double> = integrand.getFeature<UnivariateIntegrationNodes>()?.nodes ?: run {
             val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
             val step = (range.endInclusive - range.start) / (numPoints - 1)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index 7f68284a7..9c8aeef1b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -40,8 +40,8 @@ public class IntegrationRange(public val range: ClosedRange<Double>) : Integrand
 }
 
 /**
- * Set of univariate integration ranges. First components correspond to ranges themselves, second components to number of
- * integration nodes per range
+ * Set of univariate integration ranges. First components correspond to the ranges themselves, second components to
+ * number of integration nodes per range.
  */
 public class UnivariateIntegrandRanges(public val ranges: List<Pair<ClosedRange<Double>, Int>>) : IntegrandFeature {
     public constructor(vararg pairs: Pair<ClosedRange<Double>, Int>) : this(pairs.toList())
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
index 31da4f392..4e803fc63 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
 
 /**
- * The binned data element. Could be a histogram bin with a number of counts or an artificial construct
+ * The binned data element. Could be a histogram bin with a number of counts or an artificial construct.
  */
 public interface Bin<in T : Any> : Domain<T> {
     /**
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
index f461ee4fa..ca37279c3 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
@@ -16,9 +16,10 @@ public val UnivariateDomain.center: Double
     get() = (range.endInclusive + range.start) / 2
 
 /**
- * A univariate bin based an a range
- * @param value The value of histogram including weighting
- * @param standardDeviation Standard deviation of the bin value. Zero or negative if not applicable
+ * A univariate bin based on a range
+ *
+ * @property value The value of histogram including weighting
+ * @property standardDeviation Standard deviation of the bin value. Zero or negative if not applicable
  */
 @UnstableKMathAPI
 public class UnivariateBin(
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index 71097771d..3c5d4e19d 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -52,22 +52,4 @@ fun main() {
 
 According to KMath benchmarks on GraalVM, Jafama functions are slower than JDK math; however, there are indications that on Hotspot Jafama is a bit faster.
 
-<details>
-<summary>
-Report for benchmark configuration <code>jafamaDouble</code>
-</summary>
-
-* Run on OpenJDK 64-Bit Server VM (build 11.0.11+8-jvmci-21.1-b05) with Java process:
-
-```
-/home/commandertvis/graalvm-ce-java11/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCIProduct -XX:-UnlockExperimentalVMOptions -XX:ThreadPriorityPolicy=1 -javaagent:/home/commandertvis/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.5.0/d8cebccdcddd029022aa8646a5a953ff88b13ac8/kotlinx-coroutines-core-jvm-1.5.0.jar -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -ea
-```
-* JMH 1.21 was used in `thrpt` mode with 1 warmup iteration by 1000 ms and 5 measurement iterations by 1000 ms.
-
-| Benchmark | Score |
-|:---------:|:-----:|
-|`space.kscience.kmath.benchmarks.JafamaBenchmark.core`|14.35014650168397 &plusmn; 0.9200669832937576 ops/s|
-|`space.kscience.kmath.benchmarks.JafamaBenchmark.jafama`|12.048429204455887 &plusmn; 1.2882929181842269 ops/s|
-|`space.kscience.kmath.benchmarks.JafamaBenchmark.strictJafama`|12.977653357239152 &plusmn; 1.4122819627470866 ops/s|
-</details>
-
+> **Can't find appropriate benchmark data. Try generating readme files after running benchmarks**.
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
index 3b337460f..aeb44ea13 100644
--- a/kmath-kotlingrad/README.md
+++ b/kmath-kotlingrad/README.md
@@ -1,6 +1,6 @@
 # Module kmath-kotlingrad
 
-[Kotlin∇](https://www.htmlsymbols.xyz/unicode/U+2207) integration module.
+[Kotlin∇](https://github.com/breandan/kotlingrad) integration module.
 
  - [differentiable-mst-expression](src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt) : MST based DifferentiableExpression.
  - [scalars-adapters](src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt) : Conversions between Kotlin∇'s SFun and MST
diff --git a/kmath-kotlingrad/docs/README-TEMPLATE.md b/kmath-kotlingrad/docs/README-TEMPLATE.md
index ac38c849b..bc99bdf5f 100644
--- a/kmath-kotlingrad/docs/README-TEMPLATE.md
+++ b/kmath-kotlingrad/docs/README-TEMPLATE.md
@@ -1,6 +1,6 @@
 # Module kmath-kotlingrad
 
-[Kotlin∇](https://www.htmlsymbols.xyz/unicode/U+2207) integration module.
+[Kotlin∇](https://github.com/breandan/kotlingrad) integration module.
 
 ${features}
 
diff --git a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
index 930b21095..e8e51e9e2 100644
--- a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
+++ b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
@@ -156,6 +156,6 @@ public expect fun Memory.Companion.allocate(length: Int): Memory
 
 /**
  * Wraps a [Memory] around existing [ByteArray]. This operation is unsafe since the array is not copied
- * and could be mutated independently from the resulting [Memory].
+ * and could be mutated independently of the resulting [Memory].
  */
 public expect fun Memory.Companion.wrap(array: ByteArray): Memory
diff --git a/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt b/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
index 9a622ea36..6153743fc 100644
--- a/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
+++ b/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
@@ -95,7 +95,7 @@ public actual fun Memory.Companion.allocate(length: Int): Memory {
 
 /**
  * Wraps a [Memory] around existing [ByteArray]. This operation is unsafe since the array is not copied
- * and could be mutated independently from the resulting [Memory].
+ * and could be mutated independently of the resulting [Memory].
  */
 public actual fun Memory.Companion.wrap(array: ByteArray): Memory {
     @Suppress("CAST_NEVER_SUCCEEDS") val int8Array = array as Int8Array
diff --git a/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt b/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
index 944e8455b..aef68fd80 100644
--- a/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
+++ b/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
@@ -103,7 +103,7 @@ public actual fun Memory.Companion.allocate(length: Int): Memory =
 
 /**
  * Wraps a [Memory] around existing [ByteArray]. This operation is unsafe since the array is not copied
- * and could be mutated independently from the resulting [Memory].
+ * and could be mutated independently of the resulting [Memory].
  */
 public actual fun Memory.Companion.wrap(array: ByteArray): Memory =
     ByteBufferMemory(checkNotNull(ByteBuffer.wrap(array)))
diff --git a/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt b/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
index d31c9e8f4..5146d9689 100644
--- a/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
+++ b/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
@@ -60,7 +60,7 @@ internal class NativeMemory(
         }
 
         override fun writeByte(offset: Int, value: Byte) {
-            array.set(position(offset), value)
+            array[position(offset)] = value
         }
 
         override fun writeShort(offset: Int, value: Short) {
@@ -85,7 +85,7 @@ internal class NativeMemory(
 
 /**
  * Wraps a [Memory] around existing [ByteArray]. This operation is unsafe since the array is not copied
- * and could be mutated independently from the resulting [Memory].
+ * and could be mutated independently of the resulting [Memory].
  */
 public actual fun Memory.Companion.wrap(array: ByteArray): Memory = NativeMemory(array)
 
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index 7a650df3c..f69f831e8 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -35,7 +35,7 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
     public fun INDArray.wrap(): Nd4jArrayStructure<T>
 
     /**
-     * Unwraps to or acquires [INDArray] from [StructureND].
+     * Unwraps to or get [INDArray] from [StructureND].
      */
     public val StructureND<T>.ndArray: INDArray
 
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
index 97427d5c6..2a0fdc86c 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
@@ -17,7 +17,7 @@ import space.kscience.kmath.nd.StructureND
  */
 public sealed class Nd4jArrayStructure<T> : MutableStructureND<T> {
     /**
-     * The wrapped [INDArray]. Since KMath uses [Int] indexes, assuming that the size of [INDArray] is less or equal to
+     * The wrapped [INDArray]. Since KMath uses [Int] indexes, assuming the size of [INDArray] is less or equal to
      * [Int.MAX_VALUE].
      */
     public abstract val ndArray: INDArray
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index 0674c565e..1fdf845a6 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -29,7 +29,7 @@ public sealed interface Nd4jTensorAlgebra<T : Number> : AnalyticTensorAlgebra<T>
     public fun INDArray.wrap(): Nd4jArrayStructure<T>
 
     /**
-     * Unwraps to or acquires [INDArray] from [StructureND].
+     * Unwraps to or gets [INDArray] from [StructureND].
      */
     public val StructureND<T>.ndArray: INDArray
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
index 5a74a9a18..3d3f95f8f 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
@@ -22,7 +22,7 @@ public interface Distribution<T : Any> : Sampler<T> {
     override fun sample(generator: RandomGenerator): Chain<T>
 
     /**
-     * An empty companion. Distribution factories should be written as its extensions
+     * An empty companion. Distribution factories should be written as its extensions.
      */
     public companion object
 }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
index dde429244..1218f13c5 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
@@ -10,12 +10,12 @@ import space.kscience.kmath.chains.SimpleChain
 import space.kscience.kmath.stat.RandomGenerator
 
 /**
- * A multivariate distribution which takes a map of parameters
+ * A multivariate distribution that takes a map of parameters.
  */
 public interface NamedDistribution<T> : Distribution<Map<String, T>>
 
 /**
- * A multivariate distribution that has independent distributions for separate axis
+ * A multivariate distribution that has independent distributions for separate axis.
  */
 public class FactorizedDistribution<T>(public val distributions: Collection<NamedDistribution<T>>) :
     NamedDistribution<T> {
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
index a584af4f9..6e7eb039d 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
@@ -110,7 +110,7 @@ internal object InternalGamma {
 
         x <= 8.0 -> {
             val n = floor(x - 1.5).toInt()
-            val prod = (1..n).fold(1.0, { prod, i -> prod * (x - i) })
+            val prod = (1..n).fold(1.0) { prod, i -> prod * (x - i) }
             logGamma1p(x - (n + 1)) + ln(prod)
         }
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
index f54ba5723..997f1bbe3 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
@@ -11,27 +11,28 @@ import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.indices
 
 /**
- * A likelihood function optimization problem with provided derivatives
+ * A likelihood function optimization problem with provided derivatives.
  */
 public interface FunctionOptimization<T : Any> : Optimization<T> {
     /**
-     * The optimization direction. If true search for function maximum, if false, search for the minimum
+     * The optimization direction. If true search for function maximum, if false, search for the minimum.
      */
     public var maximize: Boolean
 
     /**
-     * Define the initial guess for the optimization problem
+     * Defines the initial guess for the optimization problem.
      */
     public fun initialGuess(map: Map<Symbol, T>)
 
     /**
-     * Set a differentiable expression as objective function as function and gradient provider
+     * Set a differentiable expression as objective function as function and gradient provider.
      */
     public fun diffFunction(expression: DifferentiableExpression<T>)
 
     public companion object {
         /**
-         * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic differentiation
+         * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic
+         * differentiation.
          */
         public fun <T : Any, I : Any, A> chiSquared(
             autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
@@ -61,7 +62,7 @@ public interface FunctionOptimization<T : Any> : Optimization<T> {
 }
 
 /**
- * Define a chi-squared-based objective function
+ * Defines a chi-squared-based objective function.
  */
 public fun <T: Any, I : Any, A> FunctionOptimization<T>.chiSquared(
     autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
@@ -76,7 +77,7 @@ public fun <T: Any, I : Any, A> FunctionOptimization<T>.chiSquared(
 }
 
 /**
- * Optimize differentiable expression using specific [OptimizationProblemFactory]
+ * Optimizes differentiable expression using specific [OptimizationProblemFactory].
  */
 public fun <T : Any, F : FunctionOptimization<T>> DifferentiableExpression<T>.optimizeWith(
     factory: OptimizationProblemFactory<T, F>,
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt
index 0f2167549..44b66169f 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt
@@ -16,7 +16,7 @@ import kotlin.math.pow
  */
 public interface NoDerivFunctionOptimization<T : Any> : Optimization<T> {
     /**
-     * The optimization direction. If true search for function maximum, if false, search for the minimum
+     * The optimization direction. If `true` search for function maximum, search for the minimum otherwise.
      */
     public var maximize: Boolean
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
index 15ae494f6..f85658d87 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
@@ -24,7 +24,7 @@ public operator fun <T> OptimizationResult<T>.plus(
 ): OptimizationResult<T> = OptimizationResult(point, value, features + feature)
 
 /**
- * An optimization problem builder over [T] variables
+ * A builder of optimization problems over [T] variables
  */
 public interface Optimization<T : Any> {
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
index 93605c7d8..993215d41 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
@@ -14,9 +14,9 @@ import kotlin.math.*
 
 /**
  * Sampling from the [gamma distribution](http://mathworld.wolfram.com/GammaDistribution.html).
- *  - For 0 < alpha < 1:
+ * * For 0 < alpha < 1:
  *    Ahrens, J. H. and Dieter, U., Computer methods for sampling from gamma, beta, Poisson and binomial distributions, Computing, 12, 223-246, 1974.
- *  - For alpha >= 1:
+ * * For alpha >= 1:
  *    Marsaglia and Tsang, A Simple Method for Generating Gamma Variables. ACM Transactions on Mathematical Software, Volume 26 Issue 3, September, 2000.
  *
  * Based on Commons RNG implementation.
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
index 36ddd3c8e..5390a2e09 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
@@ -20,7 +20,7 @@ import kotlin.math.min
  * implements Vose's algorithm.
  *
  * Vose, M.D., A linear algorithm for generating random numbers with a given distribution, IEEE Transactions on
- * Software Engineering, 17, 972-975, 1991. he algorithm will sample values in O(1) time after a pre-processing step
+ * Software Engineering, 17, 972-975, 1991. The algorithm will sample values in O(1) time after a pre-processing step
  * of O(n) time.
  *
  * The alias tables are constructed using fraction probabilities with an assumed denominator of 253. In the generic
@@ -77,7 +77,7 @@ public open class AliasMethodDiscreteSampler private constructor(
     }
 
     override fun sample(generator: RandomGenerator): Chain<Int> = generator.chain {
-        // This implements the algorithm as per Vose (1991):
+        // This implements the algorithm in accordance with Vose (1991):
         // v = uniform()  in [0, 1)
         // j = uniform(n) in [0, n)
         // if v < prob[j] then
@@ -95,7 +95,7 @@ public open class AliasMethodDiscreteSampler private constructor(
         // p(j) == 1  => j
         // However it is assumed these edge cases are rare:
         //
-        // The probability table will be 1 for approximately 1/n samples, i.e. only the
+        // The probability table will be 1 for approximately 1/n samples i.e., only the
         // last unpaired probability. This is only worth checking for when the table size (n)
         // is small. But in that case the user should zero-pad the table for performance.
         //
@@ -211,7 +211,7 @@ public open class AliasMethodDiscreteSampler private constructor(
         // c: 2=2/3; 6=1/3   (6 is the alias)
         // d: 1=1/3; 6=2/3   (6 is the alias)
         //
-        // The sample is obtained by randomly selecting a section, then choosing which category
+        // The sample is obtained by randomly selecting a section, then choosing, which category
         // from the pair based on a uniform random deviate.
         val sumProb = InternalUtils.validateProbabilities(probabilities)
         // Allow zero-padding
@@ -241,9 +241,9 @@ public open class AliasMethodDiscreteSampler private constructor(
         val alias = IntArray(n)
 
         // This loop uses each large in turn to fill the alias table for small probabilities that
-        // do not reach the requirement to fill an entire section alone (i.e. p < mean).
+        // do not reach the requirement to fill an entire section alone (i.e., p < mean).
         // Since the sum of the small should be less than the sum of the large it should use up
-        // all the small first. However floating point round-off can result in
+        // all the small first. However, floating point round-off can result in
         // misclassification of items as small or large. The Vose algorithm handles this using
         // a while loop conditioned on the size of both sets and a subsequent loop to use
         // unpaired items.
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
index 14737decb..0105731c4 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
@@ -13,7 +13,7 @@ import kotlin.math.exp
 
 /**
  * Sampler for the Poisson distribution.
- * - Kemp, A, W, (1981) Efficient Generation of Logarithmically Distributed Pseudo-Random Variables. Journal of the Royal Statistical Society. Vol. 30, No. 3, pp. 249-253.
+ * * Kemp, A, W, (1981) Efficient Generation of Logarithmically Distributed Pseudo-Random Variables. Journal of the Royal Statistical Society. Vol. 30, No. 3, pp. 249-253.
  * This sampler is suitable for mean < 40. For large means, LargeMeanPoissonSampler should be used instead.
  *
  * Note: The algorithm uses a recurrence relation to compute the Poisson probability and a rolling summation for the cumulative probability. When the mean is large the initial probability (Math.exp(-mean)) is zero and an exception is raised by the constructor.
@@ -66,8 +66,7 @@ public class KempSmallMeanPoissonSampler internal constructor(
 public fun KempSmallMeanPoissonSampler(mean: Double): KempSmallMeanPoissonSampler {
     require(mean > 0) { "Mean is not strictly positive: $mean" }
     val p0 = exp(-mean)
-    // Probability must be positive. As mean increases then p(0) decreases.
+    // Probability must be positive. As mean increases, p(0) decreases.
     require(p0 > 0) { "No probability for mean: $mean" }
     return KempSmallMeanPoissonSampler(p0, mean)
 }
-
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
index 96131aa4b..f0f94900e 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
@@ -18,11 +18,11 @@ private const val PIVOT = 40.0
 
 /**
  * Sampler for the Poisson distribution.
- * - For small means, a Poisson process is simulated using uniform deviates, as described in
+ * * For small means, a Poisson process is simulated using uniform deviates, as described in
  *   Knuth (1969). Seminumerical Algorithms. The Art of Computer Programming, Volume 2. Chapter 3.4.1.F.3
  *   Important integer-valued distributions: The Poisson distribution. Addison Wesley.
  * The Poisson process (and hence, the returned value) is bounded by 1000 * mean.
- * - For large means, we use the rejection algorithm described in
+ * * For large means, we use the rejection algorithm described in
  *   Devroye, Luc. (1981). The Computer Generation of Poisson Random Variables Computing vol. 26 pp. 197-207.
  *
  * Based on Commons RNG implementation.
@@ -35,10 +35,10 @@ public fun PoissonSampler(mean: Double): Sampler<Int> {
 
 /**
  * Sampler for the Poisson distribution.
- * - For small means, a Poisson process is simulated using uniform deviates, as described in
+ * * For small means, a Poisson process is simulated using uniform deviates, as described in
  *   Knuth (1969). Seminumerical Algorithms. The Art of Computer Programming, Volume 2. Chapter 3.4.1.F.3 Important
  *   integer-valued distributions: The Poisson distribution. Addison Wesley.
- * - The Poisson process (and hence, the returned value) is bounded by 1000 * mean.
+ * * The Poisson process (and hence, the returned value) is bounded by 1000 * mean.
  *   This sampler is suitable for mean < 40. For large means, [LargeMeanPoissonSampler] should be used instead.
  *
  * Based on Commons RNG implementation.
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
index 5698f1a79..f280a78aa 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
@@ -23,7 +23,7 @@ public interface RandomGenerator {
     public fun nextDouble(): Double
 
     /**
-     * A chunk of doubles of given [size]
+     * A chunk of doubles of given [size].
      */
     public fun nextDoubleBuffer(size: Int): DoubleBuffer = DoubleBuffer(size) { nextDouble() }
 
@@ -57,7 +57,7 @@ public interface RandomGenerator {
     public fun nextLong(until: Long): Long
 
     /**
-     * Fills a subrange of the specified byte [array] starting from [fromIndex] inclusive and ending [toIndex] exclusive
+     * Fills a subrange with the specified byte [array] starting from [fromIndex] inclusive and ending [toIndex] exclusive
      * with random bytes.
      *
      * @return [array] with the subrange filled with random bytes.
@@ -70,7 +70,7 @@ public interface RandomGenerator {
     public fun nextBytes(size: Int): ByteArray = ByteArray(size).also { fillBytes(it) }
 
     /**
-     * Create a new generator which is independent from current generator (operations on new generator do not affect this one
+     * Create a new generator that is independent of current generator (operations on new generator do not affect this one
      * and vise versa). The statistical properties of new generator should be the same as for this one.
      * For pseudo-random generator, the fork is keeping the same sequence of numbers for given call order for each run.
      *
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
index 849cf152a..044e489b2 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
@@ -32,7 +32,7 @@ public class BasicSampler<out T : Any>(public val chainBuilder: (RandomGenerator
 }
 
 /**
- * A space of samplers. Allows to perform simple operations on distributions.
+ * A space of samplers. Allows performing simple operations on distributions.
  *
  * @property algebra the space to provide addition and scalar multiplication for [T].
  */
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
index 499dcac6a..0af901fc9 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
@@ -30,9 +30,10 @@ public interface BlockingStatistic<in T, out R> : Statistic<T, R> {
 
 /**
  * A statistic tha could be computed separately on different blocks of data and then composed
- * @param T - source type
- * @param I - intermediate block type
- * @param R - result type
+ *
+ * @param T the source type.
+ * @param I the intermediate block type.
+ * @param R the result type.
  */
 public interface ComposableStatistic<in T, I, out R> : Statistic<T, R> {
     //compute statistic on a single block
diff --git a/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt b/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
index 7aaac7d32..202a1c8dd 100644
--- a/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
+++ b/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
@@ -55,7 +55,7 @@ public class RandomGeneratorProvider(public val generator: RandomGenerator) : Un
     /**
      * Generates [Byte] values and places them into a user-supplied array.
      *
-     * The number of random bytes produced is equal to the length of the the byte array.
+     * The number of random bytes produced is equal to the length of the byte array.
      *
      * @param bytes byte array in which to put the random bytes.
      */
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index 6bdecfa85..af4ae8239 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -23,7 +23,7 @@ public interface LinearOpsTensorAlgebra<T> : TensorPartialDivisionAlgebra<T> {
     /**
      * Computes the multiplicative inverse matrix of a square matrix input, or of each square matrix in a batched input.
      * Given a square matrix `A`, return the matrix `AInv` satisfying
-     * `A dot AInv  = AInv dot A = eye(a.shape[0])`.
+     * `A dot AInv == AInv dot A == eye(a.shape[0])`.
      * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.inv
      *
      * @return the multiplicative inverse of a matrix.
@@ -36,25 +36,27 @@ public interface LinearOpsTensorAlgebra<T> : TensorPartialDivisionAlgebra<T> {
      * Computes the Cholesky decomposition of a Hermitian (or symmetric for real-valued matrices)
      * positive-definite matrix or the Cholesky decompositions for a batch of such matrices.
      * Each decomposition has the form:
-     * Given a tensor `input`, return the tensor `L` satisfying `input = L dot L.H`,
-     * where L is a lower-triangular matrix and L.H is the conjugate transpose of L,
+     * Given a tensor `input`, return the tensor `L` satisfying `input = L dot LH`,
+     * where `L` is a lower-triangular matrix and `LH` is the conjugate transpose of `L`,
      * which is just a transpose for the case of real-valued input matrices.
      * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.cholesky
      *
-     * @return the batch of L matrices.
+     * @receiver the `input`.
+     * @return the batch of `L` matrices.
      */
     public fun Tensor<T>.cholesky(): Tensor<T>
 
     /**
      * QR decomposition.
      *
-     * Computes the QR decomposition of a matrix or a batch of matrices, and returns a pair `(Q, R)` of tensors.
-     * Given a tensor `input`, return tensors (Q, R) satisfying ``input = Q dot R``,
+     * Computes the QR decomposition of a matrix or a batch of matrices, and returns a pair `Q to R` of tensors.
+     * Given a tensor `input`, return tensors `Q to R` satisfying `input == Q dot R`,
      * with `Q` being an orthogonal matrix or batch of orthogonal matrices
      * and `R` being an upper triangular matrix or batch of upper triangular matrices.
      * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.qr
      *
-     * @return pair of Q and R tensors.
+     * @receiver the `input`.
+     * @return pair of `Q` and `R` tensors.
      */
     public fun Tensor<T>.qr(): Pair<Tensor<T>, Tensor<T>>
 
@@ -67,7 +69,8 @@ public interface LinearOpsTensorAlgebra<T> : TensorPartialDivisionAlgebra<T> {
      * `L` being a lower triangular matrix or batch of matrices,
      * `U` being an upper triangular matrix or batch of matrices.
      *
-     * * @return triple of P, L and U tensors
+     * @receiver the `input`.
+     * @return triple of P, L and U tensors
      */
     public fun Tensor<T>.lu(): Triple<Tensor<T>, Tensor<T>, Tensor<T>>
 
@@ -75,22 +78,25 @@ public interface LinearOpsTensorAlgebra<T> : TensorPartialDivisionAlgebra<T> {
      * Singular Value Decomposition.
      *
      * Computes the singular value decomposition of either a matrix or batch of matrices `input`.
-     * The singular value decomposition is represented as a triple `(U, S, V)`,
-     * such that `input = U dot diagonalEmbedding(S) dot  V.H`,
-     * where V.H is the conjugate transpose of V.
-     * If input is a batch of tensors, then U, S, and Vh are also batched with the same batch dimensions as input.
+     * The singular value decomposition is represented as a triple `Triple(U, S, V)`,
+     * such that `input = U dot diagonalEmbedding(S) dot VH`,
+     * where `VH` is the conjugate transpose of V.
+     * If `input` is a batch of tensors, then `U`, `S`, and `VH` are also batched with the same batch dimensions as
+     * `input`.
      * For more information: https://pytorch.org/docs/stable/linalg.html#torch.linalg.svd
      *
-     * @return triple `(U, S, V)`.
+     * @receiver the `input`.
+     * @return triple `Triple(U, S, V)`.
      */
     public fun Tensor<T>.svd(): Triple<Tensor<T>, Tensor<T>, Tensor<T>>
 
     /**
-     * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
-     * represented by a pair (eigenvalues, eigenvectors).
+     * Returns eigenvalues and eigenvectors of a real symmetric matrix `input` or a batch of real symmetric matrices,
+     * represented by a pair `eigenvalues to eigenvectors`.
      * For more information: https://pytorch.org/docs/stable/generated/torch.symeig.html
      *
-     * @return a pair (eigenvalues, eigenvectors)
+     * @receiver the `input`.
+     * @return a pair `eigenvalues to eigenvectors`
      */
     public fun Tensor<T>.symEig(): Pair<Tensor<T>, Tensor<T>>
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 62b8ef046..d48e7b1c9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -14,7 +14,6 @@ import space.kscience.kmath.operations.Algebra
  * @param T the type of items in the tensors.
  */
 public interface TensorAlgebra<T> : Algebra<Tensor<T>> {
-
     /**
      * Returns a single tensor value of unit dimension if tensor shape equals to [1].
      *
@@ -189,7 +188,7 @@ public interface TensorAlgebra<T> : Algebra<Tensor<T>> {
 
     /**
      * View this tensor as the same size as [other].
-     * ``this.viewAs(other) is equivalent to this.view(other.shape)``.
+     * `this.viewAs(other)` is equivalent to `this.view(other.shape)`.
      * For more information: https://pytorch.org/cppdocs/notes/tensor_indexing.html
      *
      * @param other the result tensor has the same size as other.
@@ -217,14 +216,14 @@ public interface TensorAlgebra<T> : Algebra<Tensor<T>> {
      * a 1 is prepended to its dimension for the purpose of the batched matrix multiply and removed after.
      * If the second argument is 1-dimensional, a 1 is appended to its dimension for the purpose of the batched matrix
      * multiple and removed after.
-     * The non-matrix (i.e. batch) dimensions are broadcast (and thus must be broadcastable).
+     * The non-matrix (i.e., batch) dimensions are broadcast (and thus must be broadcastable).
      * For example, if `input` is a (j &times; 1 &times; n &times; n) tensor and `other` is a
      * (k &times; n &times; n) tensor, out will be a (j &times; k &times; n &times; n) tensor.
      *
      * For more information: https://pytorch.org/docs/stable/generated/torch.matmul.html
      *
-     * @param other tensor to be multiplied
-     * @return mathematical product of two tensors
+     * @param other tensor to be multiplied.
+     * @return a mathematical product of two tensors.
      */
     public infix fun Tensor<T>.dot(other: Tensor<T>): Tensor<T>
 
@@ -234,7 +233,7 @@ public interface TensorAlgebra<T> : Algebra<Tensor<T>> {
      * To facilitate creating batched diagonal matrices,
      * the 2D planes formed by the last two dimensions of the returned tensor are chosen by default.
      *
-     * The argument [offset]  controls which diagonal to consider:
+     * The argument [offset] controls, which diagonal to consider:
      * 1. If [offset] = 0, it is the main diagonal.
      * 1. If [offset] > 0, it is above the main diagonal.
      * 1. If [offset] < 0, it is below the main diagonal.
@@ -321,7 +320,7 @@ public interface TensorAlgebra<T> : Algebra<Tensor<T>> {
      *
      * @param dim the dimension to reduce.
      * @param keepDim whether the output tensor has [dim] retained or not.
-     * @return the the index of maximum value of each row of the input tensor in the given dimension [dim].
+     * @return the index of maximum value of each row of the input tensor in the given dimension [dim].
      */
     public fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T>
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
index 02bf5415d..867d4b26e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
@@ -49,7 +49,7 @@ public interface TensorPartialDivisionAlgebra<T> : TensorAlgebra<T> {
     /**
      * Each element of this tensor is divided by each element of the [other] tensor.
      *
-     * @param other tensor to be divide by.
+     * @param other tensor to be divided by.
      */
     public operator fun Tensor<T>.divAssign(other: Tensor<T>)
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index d182558c5..d6ad8e8e2 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -90,37 +90,37 @@ public open class DoubleTensorAlgebra :
     }
 
     /**
-     * Returns a tensor filled with the scalar value 0.0, with the shape defined by the variable argument [shape].
+     * Returns a tensor filled with the scalar value `0.0`, with the shape defined by the variable argument [shape].
      *
      * @param shape array of integers defining the shape of the output tensor.
-     * @return tensor filled with the scalar value 0.0, with the [shape] shape.
+     * @return tensor filled with the scalar value `0.0`, with the [shape] shape.
      */
     public fun zeros(shape: IntArray): DoubleTensor = full(0.0, shape)
 
     /**
-     * Returns a tensor filled with the scalar value 0.0, with the same shape as a given array.
+     * Returns a tensor filled with the scalar value `0.0`, with the same shape as a given array.
      *
-     * @return tensor filled with the scalar value 0.0, with the same shape as `input` tensor.
+     * @return tensor filled with the scalar value `0.0`, with the same shape as `input` tensor.
      */
     public fun Tensor<Double>.zeroesLike(): DoubleTensor = tensor.fullLike(0.0)
 
     /**
-     * Returns a tensor filled with the scalar value 1.0, with the shape defined by the variable argument [shape].
+     * Returns a tensor filled with the scalar value `1.0`, with the shape defined by the variable argument [shape].
      *
      * @param shape array of integers defining the shape of the output tensor.
-     * @return tensor filled with the scalar value 1.0, with the [shape] shape.
+     * @return tensor filled with the scalar value `1.0`, with the [shape] shape.
      */
     public fun ones(shape: IntArray): DoubleTensor = full(1.0, shape)
 
     /**
-     * Returns a tensor filled with the scalar value 1.0, with the same shape as a given array.
+     * Returns a tensor filled with the scalar value `1.0`, with the same shape as a given array.
      *
-     * @return tensor filled with the scalar value 1.0, with the same shape as `input` tensor.
+     * @return tensor filled with the scalar value `1.0`, with the same shape as `input` tensor.
      */
     public fun Tensor<Double>.onesLike(): DoubleTensor = tensor.fullLike(1.0)
 
     /**
-     * Returns a 2-D tensor with shape ([n], [n]), with ones on the diagonal and zeros elsewhere.
+     * Returns a 2D tensor with shape ([n], [n]), with ones on the diagonal and zeros elsewhere.
      *
      * @param n the number of rows and columns
      * @return a 2-D tensor with ones on the diagonal and zeros elsewhere.
@@ -311,7 +311,6 @@ public open class DoubleTensorAlgebra :
         return resTensor
     }
 
-
     override fun Tensor<Double>.view(shape: IntArray): DoubleTensor {
         checkView(tensor, shape)
         return DoubleTensor(shape, tensor.mutableBuffer.array(), tensor.bufferStart)
@@ -444,7 +443,7 @@ public open class DoubleTensorAlgebra :
 
     /**
      * Compares element-wise two tensors.
-     * Comparison of two Double values occurs with 1e-5 precision.
+     * Comparison of two Double values occurs with `1e-5` precision.
      *
      * @param other the tensor to compare with `input` tensor.
      * @return true if two tensors have the same shape and elements, false otherwise.
@@ -473,23 +472,24 @@ public open class DoubleTensorAlgebra :
     }
 
     /**
-     * Returns a tensor of random numbers drawn from normal distributions with 0.0 mean and 1.0 standard deviation.
+     * Returns a tensor of random numbers drawn from normal distributions with `0.0` mean and `1.0` standard deviation.
      *
      * @param shape the desired shape for the output tensor.
      * @param seed the random seed of the pseudo-random number generator.
      * @return tensor of a given shape filled with numbers from the normal distribution
-     * with 0.0 mean and 1.0 standard deviation.
+     * with `0.0` mean and `1.0` standard deviation.
      */
     public fun randomNormal(shape: IntArray, seed: Long = 0): DoubleTensor =
         DoubleTensor(shape, getRandomNormals(shape.reduce(Int::times), seed))
 
     /**
      * Returns a tensor with the same shape as `input` of random numbers drawn from normal distributions
-     * with 0.0 mean and 1.0 standard deviation.
+     * with `0.0` mean and `1.0` standard deviation.
      *
+     * @receiver the `input`.
      * @param seed the random seed of the pseudo-random number generator.
-     * @return tensor with the same shape as `input` filled with numbers from the normal distribution
-     * with 0.0 mean and 1.0 standard deviation.
+     * @return a tensor with the same shape as `input` filled with numbers from the normal distribution
+     * with `0.0` mean and `1.0` standard deviation.
      */
     public fun Tensor<Double>.randomNormalLike(seed: Long = 0): DoubleTensor =
         DoubleTensor(tensor.shape, getRandomNormals(tensor.shape.reduce(Int::times), seed))
@@ -512,10 +512,10 @@ public open class DoubleTensorAlgebra :
     }
 
     /**
-     * Builds tensor from rows of input tensor
+     * Builds tensor from rows of the input tensor.
      *
      * @param indices the [IntArray] of 1-dimensional indices
-     * @return tensor with rows corresponding to rows by [indices]
+     * @return tensor with rows corresponding to row by [indices]
      */
     public fun Tensor<Double>.rowsByIndices(indices: IntArray): DoubleTensor = stack(indices.map { this[it] })
 
@@ -615,12 +615,12 @@ public open class DoubleTensorAlgebra :
     }
 
     /**
-     * Returns the covariance matrix M of given vectors.
+     * Returns the covariance matrix `M` of given vectors.
      *
-     * M[i, j] contains covariance of i-th and j-th given vectors
+     * `M[i, j]` contains covariance of `i`-th and `j`-th given vectors
      *
      * @param tensors the [List] of 1-dimensional tensors with same shape
-     * @return the covariance matrix
+     * @return `M`.
      */
     public fun cov(tensors: List<Tensor<Double>>): DoubleTensor {
         check(tensors.isNotEmpty()) { "List must have at least 1 element" }
@@ -703,14 +703,14 @@ public open class DoubleTensorAlgebra :
 
     /**
      * Unpacks the data and pivots from a LU factorization of a tensor.
-     * Given a tensor [luTensor], return tensors (P, L, U) satisfying ``P * luTensor = L * U``,
+     * Given a tensor [luTensor], return tensors `Triple(P, L, U)` satisfying `P dot luTensor = L dot U`,
      * with `P` being a permutation matrix or batch of matrices,
      * `L` being a lower triangular matrix or batch of matrices,
      * `U` being an upper triangular matrix or batch of matrices.
      *
      * @param luTensor the packed LU factorization data
      * @param pivotsTensor the packed LU factorization pivots
-     * @return triple of P, L and U tensors
+     * @return triple of `P`, `L` and `U` tensors
      */
     public fun luPivot(
         luTensor: Tensor<Double>,
@@ -746,14 +746,15 @@ public open class DoubleTensorAlgebra :
     /**
      * QR decomposition.
      *
-     * Computes the QR decomposition of a matrix or a batch of matrices, and returns a pair `(Q, R)` of tensors.
-     * Given a tensor `input`, return tensors (Q, R) satisfying ``input = Q * R``,
+     * Computes the QR decomposition of a matrix or a batch of matrices, and returns a pair `Q to R` of tensors.
+     * Given a tensor `input`, return tensors `Q to R` satisfying `input == Q dot R`,
      * with `Q` being an orthogonal matrix or batch of orthogonal matrices
      * and `R` being an upper triangular matrix or batch of upper triangular matrices.
      *
-     * @param epsilon permissible error when comparing tensors for equality.
+     * @receiver the `input`.
+     * @param epsilon the permissible error when comparing tensors for equality.
      * Used when checking the positive definiteness of the input matrix or matrices.
-     * @return pair of Q and R tensors.
+     * @return a pair of `Q` and `R` tensors.
      */
     public fun Tensor<Double>.cholesky(epsilon: Double): DoubleTensor {
         checkSquareMatrix(shape)
@@ -793,13 +794,14 @@ public open class DoubleTensorAlgebra :
      * Singular Value Decomposition.
      *
      * Computes the singular value decomposition of either a matrix or batch of matrices `input`.
-     * The singular value decomposition is represented as a triple `(U, S, V)`,
-     * such that ``input = U.dot(diagonalEmbedding(S).dot(V.T))``.
-     * If input is a batch of tensors, then U, S, and Vh are also batched with the same batch dimensions as input.
+     * The singular value decomposition is represented as a triple `Triple(U, S, V)`,
+     * such that `input == U dot diagonalEmbedding(S) dot V.transpose()`.
+     * If `input` is a batch of tensors, then U, S, and Vh are also batched with the same batch dimensions as `input.
      *
-     * @param epsilon permissible error when calculating the dot product of vectors,
-     * i.e. the precision with which the cosine approaches 1 in an iterative algorithm.
-     * @return triple `(U, S, V)`.
+     * @receiver the `input`.
+     * @param epsilon permissible error when calculating the dot product of vectors
+     * i.e., the precision with which the cosine approaches 1 in an iterative algorithm.
+     * @return a triple `Triple(U, S, V)`.
      */
     public fun Tensor<Double>.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         val size = tensor.dimension
@@ -834,11 +836,11 @@ public open class DoubleTensorAlgebra :
 
     /**
      * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
-     * represented by a pair (eigenvalues, eigenvectors).
+     * represented by a pair `eigenvalues to eigenvectors`.
      *
-     * @param epsilon permissible error when comparing tensors for equality
+     * @param epsilon the permissible error when comparing tensors for equality
      * and when the cosine approaches 1 in the SVD algorithm.
-     * @return a pair (eigenvalues, eigenvectors)
+     * @return a pair `eigenvalues to eigenvectors`.
      */
     public fun Tensor<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
         checkSymmetric(tensor, epsilon)
@@ -857,11 +859,11 @@ public open class DoubleTensorAlgebra :
      * Computes the determinant of a square matrix input, or of each square matrix in a batched input
      * using LU factorization algorithm.
      *
-     * @param epsilon error in the LU algorithm - permissible error when comparing the determinant of a matrix with zero
+     * @param epsilon the error in the LU algorithm&mdash;permissible error when comparing the determinant of a matrix
+     * with zero.
      * @return the determinant.
      */
     public fun Tensor<Double>.detLU(epsilon: Double = 1e-9): DoubleTensor {
-
         checkSquareMatrix(tensor.shape)
         val luTensor = tensor.copy()
         val pivotsTensor = tensor.setUpPivots()
@@ -889,9 +891,9 @@ public open class DoubleTensorAlgebra :
      * Computes the multiplicative inverse matrix of a square matrix input, or of each square matrix in a batched input
      * using LU factorization algorithm.
      * Given a square matrix `a`, return the matrix `aInv` satisfying
-     * ``a.dot(aInv) = aInv.dot(a) = eye(a.shape[0])``.
+     * `a dot aInv == aInv dot a == eye(a.shape[0])`.
      *
-     * @param epsilon error in the LU algorithm - permissible error when comparing the determinant of a matrix with zero
+     * @param epsilon error in the LU algorithm&mdash;permissible error when comparing the determinant of a matrix with zero
      * @return the multiplicative inverse of a matrix.
      */
     public fun Tensor<Double>.invLU(epsilon: Double = 1e-9): DoubleTensor {
@@ -908,16 +910,16 @@ public open class DoubleTensorAlgebra :
     }
 
     /**
-     * LUP decomposition
+     * LUP decomposition.
      *
      * Computes the LUP decomposition of a matrix or a batch of matrices.
-     * Given a tensor `input`, return tensors (P, L, U) satisfying ``P * input = L * U``,
+     * Given a tensor `input`, return tensors `Triple(P, L, U)` satisfying `P dot input == L dot U`,
      * with `P` being a permutation matrix or batch of matrices,
      * `L` being a lower triangular matrix or batch of matrices,
      * `U` being an upper triangular matrix or batch of matrices.
      *
-     * @param epsilon permissible error when comparing the determinant of a matrix with zero
-     * @return triple of P, L and U tensors
+     * @param epsilon permissible error when comparing the determinant of a matrix with zero.
+     * @return triple of `P`, `L` and `U` tensors.
      */
     public fun Tensor<Double>.lu(epsilon: Double = 1e-9): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         val (lu, pivots) = tensor.luFactor(epsilon)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index e337eeef9..ff89568ea 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -14,7 +14,7 @@ import space.kscience.kmath.tensors.core.DoubleTensor
 import kotlin.math.*
 
 /**
- * Returns a reference to [IntArray] containing all of the elements of this [Buffer] or copy the data.
+ * Returns a reference to [IntArray] containing all the elements of this [Buffer] or copy the data.
  */
 internal fun Buffer<Int>.array(): IntArray = when (this) {
     is IntBuffer -> array
@@ -22,7 +22,7 @@ internal fun Buffer<Int>.array(): IntArray = when (this) {
 }
 
 /**
- * Returns a reference to [DoubleArray] containing all of the elements of this [Buffer] or copy the data.
+ * Returns a reference to [DoubleArray] containing all the elements of this [Buffer] or copy the data.
  */
 @PublishedApi
 internal fun Buffer<Double>.array(): DoubleArray = when (this) {
-- 
2.34.1


From 56fed6c16a9f721504e484547370bf721a5356fd Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Thu, 29 Jul 2021 23:55:27 +0700
Subject: [PATCH 310/713] Use Gradle caching

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/pages.yml   | 2 +-
 .github/workflows/publish.yml | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2eb9f34b3..78c1522c7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,4 +38,4 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Build
-        run: ./gradlew build --no-daemon --stacktrace
+        run: ./gradlew build --build-cache --no-daemon --stacktrace
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 1836287c8..86a0e130e 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -20,7 +20,7 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - run: ./gradlew dokkaHtmlMultiModule --no-daemon --no-parallel --stacktrace
+      - run: ./gradlew dokkaHtmlMultiModule --build-cache --no-daemon --no-parallel --stacktrace
       - uses: JamesIves/github-pages-deploy-action@4.1.0
         with:
           branch: gh-pages
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index cbf13d03d..dbc4a9473 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -42,11 +42,12 @@ jobs:
         if: matrix.os == 'windows-latest'
         shell: cmd
         run: >
-          ./gradlew release --no-daemon -Ppublishing.enabled=true -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
+          ./gradlew release --no-daemon --build-cache -Ppublishing.enabled=true
+          -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
           -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
       - name: Publish Mac Artifacts
         if: matrix.os == 'macOS-latest'
         run: >
-          ./gradlew release --no-daemon -Ppublishing.enabled=true -Ppublishing.platform=macosX64
+          ./gradlew release --no-daemon --build-cache -Ppublishing.enabled=true -Ppublishing.platform=macosX64
           -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
           -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
-- 
2.34.1


From 8e766497c628b190fba9814d8b39c2556ddddd6c Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Thu, 5 Aug 2021 16:09:12 +0700
Subject: [PATCH 311/713] Extend CI timeout and update GraalVM

---
 .github/workflows/build.yml   | 4 ++--
 .github/workflows/pages.yml   | 3 ++-
 .github/workflows/publish.yml | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 78c1522c7..cde58b6d6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,14 +11,14 @@ jobs:
       matrix:
         os: [ macOS-latest, windows-latest ]
     runs-on: ${{matrix.os}}
-    timeout-minutes: 30
+    timeout-minutes: 40
     steps:
       - name: Checkout the repo
         uses: actions/checkout@v2
       - name: Set up JDK 11
         uses: DeLaGuardo/setup-graalvm@4.0
         with:
-          graalvm: 21.1.0
+          graalvm: 21.2.0
           java: java11
           arch: amd64
       - name: Cache gradle
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 86a0e130e..23ed54357 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -7,11 +7,12 @@ on:
 jobs:
   build:
     runs-on: ubuntu-20.04
+    timeout-minutes: 40
     steps:
       - uses: actions/checkout@v2
       - uses: DeLaGuardo/setup-graalvm@4.0
         with:
-          graalvm: 21.1.0
+          graalvm: 21.2.0
           java: java11
           arch: amd64
       - uses: actions/cache@v2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index dbc4a9473..c5075cb0f 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up JDK 11
         uses: DeLaGuardo/setup-graalvm@4.0
         with:
-          graalvm: 21.1.0
+          graalvm: 21.2.0
           java: java11
           arch: amd64
       - name: Cache gradle
-- 
2.34.1


From 86a45504e37d93be835e2d31da15a61acc074160 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Thu, 10 Jun 2021 01:02:57 +0700
Subject: [PATCH 312/713] Add contentEquals extension to ND algebra and
 LinearSpace

---
 .../kscience/kmath/linear/LinearSpace.kt      |  2 +-
 .../space/kscience/kmath/nd/StructureND.kt    | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
index 63b881105..fdb5c2090 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
@@ -29,7 +29,7 @@ public typealias MutableMatrix<T> = MutableStructure2D<T>
 public typealias Point<T> = Buffer<T>
 
 /**
- * Basic operations on matrices and vectors. Operates on [Matrix].
+ * Basic operations on matrices and vectors.
  *
  * @param T the type of items in the matrices.
  * @param A the type of ring over [T].
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 716bd15f3..cfb20f441 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -5,8 +5,11 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import kotlin.jvm.JvmName
@@ -145,6 +148,44 @@ public interface StructureND<out T> {
     }
 }
 
+/**
+ * Indicates whether some [StructureND] is equal to another one.
+ */
+@PerformancePitfall
+public fun <T : Comparable<T>> AlgebraND<T, Ring<T>>.contentEquals(
+    st1: StructureND<T>,
+    st2: StructureND<T>,
+): Boolean = StructureND.contentEquals(st1, st2)
+
+/**
+ * Indicates whether some [StructureND] is equal to another one.
+ */
+@PerformancePitfall
+public fun <T : Comparable<T>> LinearSpace<T, Ring<T>>.contentEquals(
+    st1: StructureND<T>,
+    st2: StructureND<T>,
+): Boolean = StructureND.contentEquals(st1, st2)
+
+/**
+ * Indicates whether some [StructureND] is equal to another one with [absoluteTolerance].
+ */
+@PerformancePitfall
+public fun <T : Comparable<T>> GroupND<T, Ring<T>>.contentEquals(
+    st1: StructureND<T>,
+    st2: StructureND<T>,
+    absoluteTolerance: T,
+): Boolean = st1.elements().all { (index, value) -> elementContext { (value - st2[index]) } < absoluteTolerance }
+
+/**
+ * Indicates whether some [StructureND] is equal to another one with [absoluteTolerance].
+ */
+@PerformancePitfall
+public fun <T : Comparable<T>> LinearSpace<T, Ring<T>>.contentEquals(
+    st1: StructureND<T>,
+    st2: StructureND<T>,
+    absoluteTolerance: T,
+): Boolean = st1.elements().all { (index, value) -> elementAlgebra { (value - st2[index]) } < absoluteTolerance }
+
 /**
  * Returns the value at the specified indices.
  *
-- 
2.34.1


From adff75bb6b616ec93d4e8ca1ce87e37fdbfc8648 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Thu, 5 Aug 2021 18:56:29 +0700
Subject: [PATCH 313/713] Avoid using kapt in kmath-jupyter #398

---
 kmath-jupyter/build.gradle.kts |  4 ++++
 settings.gradle.kts            | 11 +++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/kmath-jupyter/build.gradle.kts b/kmath-jupyter/build.gradle.kts
index 83a6a771a..5bd08c485 100644
--- a/kmath-jupyter/build.gradle.kts
+++ b/kmath-jupyter/build.gradle.kts
@@ -20,3 +20,7 @@ readme {
 kotlin.sourceSets.all {
     languageSettings.useExperimentalAnnotation("space.kscience.kmath.misc.UnstableKMathAPI")
 }
+
+tasks.processJupyterApiResources {
+    libraryProducers = listOf("space.kscience.kmath.jupyter.KMathJupyter")
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 18f867df3..f05092bb1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,18 +5,13 @@ pluginManagement {
         gradlePluginPortal()
     }
 
-    val toolsVersion = "0.10.2"
     val kotlinVersion = "1.5.21"
 
     plugins {
-        id("ru.mipt.npm.gradle.project") version toolsVersion
-        id("ru.mipt.npm.gradle.mpp") version toolsVersion
-        id("ru.mipt.npm.gradle.jvm") version toolsVersion
-        kotlin("multiplatform") version kotlinVersion
-        kotlin("jvm") version kotlinVersion
-        kotlin("plugin.allopen") version kotlinVersion
         id("org.jetbrains.kotlinx.benchmark") version "0.3.1"
-        kotlin("jupyter.api") version "0.10.0-131-1"
+        id("ru.mipt.npm.gradle.project") version "0.10.2"
+        kotlin("multiplatform") version kotlinVersion
+        kotlin("plugin.allopen") version kotlinVersion
     }
 }
 
-- 
2.34.1


From da27c2e49482ff8286ee4d805e04e4e69b64dad9 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sun, 8 Aug 2021 12:27:16 +0700
Subject: [PATCH 314/713] Fix path to LICENSE in the notice

---
 .idea/copyright/kmath.xml                                    | 2 +-
 .../kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt | 2 +-
 .../space/kscience/kmath/benchmarks/BigIntBenchmark.kt       | 2 +-
 .../space/kscience/kmath/benchmarks/BufferBenchmark.kt       | 2 +-
 .../kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt   | 2 +-
 .../kmath/benchmarks/ExpressionsInterpretersBenchmark.kt     | 2 +-
 .../space/kscience/kmath/benchmarks/JafamaBenchmark.kt       | 2 +-
 .../kscience/kmath/benchmarks/MatrixInverseBenchmark.kt      | 2 +-
 .../space/kscience/kmath/benchmarks/NDFieldBenchmark.kt      | 2 +-
 .../space/kscience/kmath/benchmarks/ViktorBenchmark.kt       | 2 +-
 .../space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt    | 2 +-
 .../main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt | 2 +-
 .../kscience/kmath/benchmarks/addBenchmarkProperties.kt      | 2 +-
 .../kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt  | 2 +-
 docs/images/KM.svg                                           | 5 +++++
 docs/images/KM_mono.svg                                      | 5 +++++
 docs/images/KMath.svg                                        | 5 +++++
 docs/images/KMath_mono.svg                                   | 5 +++++
 .../src/main/kotlin/space/kscience/kmath/ast/astRendering.kt | 2 +-
 .../src/main/kotlin/space/kscience/kmath/ast/expressions.kt  | 2 +-
 .../kotlin/space/kscience/kmath/ast/kotlingradSupport.kt     | 2 +-
 .../src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt | 2 +-
 .../space/kscience/kmath/commons/fit/fitWithAutoDiff.kt      | 2 +-
 .../main/kotlin/space/kscience/kmath/functions/integrate.kt  | 2 +-
 .../kotlin/space/kscience/kmath/functions/interpolate.kt     | 2 +-
 .../space/kscience/kmath/functions/interpolateSquare.kt      | 2 +-
 .../space/kscience/kmath/functions/matrixIntegration.kt      | 2 +-
 .../main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt    | 2 +-
 .../src/main/kotlin/space/kscience/kmath/linear/gradient.kt  | 2 +-
 .../kotlin/space/kscience/kmath/operations/BigIntDemo.kt     | 2 +-
 .../kotlin/space/kscience/kmath/operations/ComplexDemo.kt    | 2 +-
 .../space/kscience/kmath/stat/DistributionBenchmark.kt       | 2 +-
 .../kotlin/space/kscience/kmath/stat/DistributionDemo.kt     | 2 +-
 .../main/kotlin/space/kscience/kmath/structures/ComplexND.kt | 2 +-
 .../main/kotlin/space/kscience/kmath/structures/NDField.kt   | 2 +-
 .../space/kscience/kmath/structures/StreamDoubleFieldND.kt   | 2 +-
 .../kscience/kmath/structures/StructureReadBenchmark.kt      | 2 +-
 .../kscience/kmath/structures/StructureWriteBenchmark.kt     | 2 +-
 .../space/kscience/kmath/structures/typeSafeDimensions.kt    | 2 +-
 .../space/kscience/kmath/tensors/DataSetNormalization.kt     | 2 +-
 .../kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt     | 2 +-
 .../kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt     | 2 +-
 .../main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt   | 2 +-
 examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt | 2 +-
 .../src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt | 2 +-
 .../kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt      | 2 +-
 .../kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt     | 2 +-
 .../space/kscience/kmath/ast/rendering/MathRenderer.kt       | 2 +-
 .../kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt  | 2 +-
 .../space/kscience/kmath/ast/rendering/SyntaxRenderer.kt     | 2 +-
 .../kotlin/space/kscience/kmath/ast/rendering/features.kt    | 2 +-
 .../kscience/kmath/ast/rendering/multiplatformToString.kt    | 2 +-
 .../kotlin/space/kscience/kmath/ast/rendering/phases.kt      | 2 +-
 .../kmath/ast/TestCompilerConsistencyWithInterpreter.kt      | 2 +-
 .../space/kscience/kmath/ast/TestCompilerOperations.kt       | 2 +-
 .../kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt | 2 +-
 .../commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt | 2 +-
 .../kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt  | 2 +-
 .../space/kscience/kmath/ast/rendering/TestFeatures.kt       | 2 +-
 .../kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt   | 2 +-
 .../kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt  | 2 +-
 .../kotlin/space/kscience/kmath/ast/rendering/TestStages.kt  | 2 +-
 .../kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt   | 2 +-
 .../src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt  | 2 +-
 .../kscience/kmath/ast/rendering/multiplatformToString.kt    | 2 +-
 .../src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt  | 2 +-
 .../space/kscience/kmath/estree/internal/ESTreeBuilder.kt    | 2 +-
 .../kmath/estree/internal/astring/astring.typealises.kt      | 2 +-
 .../kotlin/space/kscience/kmath/internal/astring/astring.kt  | 2 +-
 .../kscience/kmath/internal/astring/astring.typealises.kt    | 2 +-
 .../kotlin/space/kscience/kmath/internal/base64/base64.kt    | 2 +-
 .../space/kscience/kmath/internal/binaryen/index.binaryen.kt | 2 +-
 .../kmath/internal/binaryen/index.binaryen.typealiases.kt    | 2 +-
 .../kotlin/space/kscience/kmath/internal/emitter/emitter.kt  | 2 +-
 .../kscience/kmath/internal/estree/estree.extensions.kt      | 2 +-
 .../kotlin/space/kscience/kmath/internal/estree/estree.kt    | 2 +-
 .../kotlin/space/kscience/kmath/internal/stream/stream.kt    | 2 +-
 .../kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt  | 2 +-
 .../kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt | 2 +-
 .../internal/webassembly/lib.dom.WebAssembly.module_dukat.kt | 2 +-
 .../internal/webassembly/nonDeclarations.WebAssembly.kt      | 2 +-
 .../kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt | 2 +-
 .../kscience/kmath/wasm/internal/f64StandardFunctions.kt     | 2 +-
 .../src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt      | 2 +-
 .../kotlin/space/kscience/kmath/ast/TestExecutionTime.kt     | 2 +-
 .../src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt      | 2 +-
 .../kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt     | 2 +-
 kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt | 2 +-
 .../kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt   | 2 +-
 .../kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt | 2 +-
 .../space/kscience/kmath/asm/internal/mapIntrinsics.kt       | 2 +-
 .../kscience/kmath/ast/rendering/multiplatformToString.kt    | 2 +-
 .../src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt     | 2 +-
 .../commons/expressions/DerivativeStructureExpression.kt     | 2 +-
 .../kmath/commons/integration/CMGaussRuleIntegrator.kt       | 2 +-
 .../space/kscience/kmath/commons/integration/CMIntegrator.kt | 2 +-
 .../kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt   | 2 +-
 .../kotlin/space/kscience/kmath/commons/linear/CMSolver.kt   | 2 +-
 .../kscience/kmath/commons/optimization/CMOptimization.kt    | 2 +-
 .../space/kscience/kmath/commons/optimization/cmFit.kt       | 2 +-
 .../kmath/commons/random/CMRandomGeneratorWrapper.kt         | 2 +-
 .../kscience/kmath/commons/transform/Transformations.kt      | 2 +-
 .../commons/expressions/DerivativeStructureExpressionTest.kt | 2 +-
 .../kscience/kmath/commons/integration/IntegrationTest.kt    | 2 +-
 .../kscience/kmath/commons/optimization/OptimizeTest.kt      | 2 +-
 .../kotlin/space/kscience/kmath/complex/Complex.kt           | 2 +-
 .../kotlin/space/kscience/kmath/complex/ComplexFieldND.kt    | 2 +-
 .../kotlin/space/kscience/kmath/complex/Quaternion.kt        | 2 +-
 .../space/kscience/kmath/complex/ComplexBufferSpecTest.kt    | 2 +-
 .../kotlin/space/kscience/kmath/complex/ComplexFieldTest.kt  | 2 +-
 .../kotlin/space/kscience/kmath/complex/ComplexTest.kt       | 2 +-
 .../kscience/kmath/complex/ExpressionFieldForComplexTest.kt  | 2 +-
 .../space/kscience/kmath/complex/QuaternionFieldTest.kt      | 2 +-
 .../kotlin/space/kscience/kmath/data/ColumnarData.kt         | 2 +-
 .../kotlin/space/kscience/kmath/data/XYColumnarData.kt       | 2 +-
 .../kotlin/space/kscience/kmath/data/XYZColumnarData.kt      | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/domains/Domain.kt | 2 +-
 .../kotlin/space/kscience/kmath/domains/DoubleDomain.kt      | 2 +-
 .../kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt | 2 +-
 .../space/kscience/kmath/domains/UnconstrainedDomain.kt      | 2 +-
 .../kotlin/space/kscience/kmath/domains/UnivariateDomain.kt  | 2 +-
 .../kscience/kmath/expressions/DifferentiableExpression.kt   | 2 +-
 .../kotlin/space/kscience/kmath/expressions/Expression.kt    | 2 +-
 .../kmath/expressions/FunctionalExpressionAlgebra.kt         | 2 +-
 .../kotlin/space/kscience/kmath/expressions/MST.kt           | 2 +-
 .../kotlin/space/kscience/kmath/expressions/MstAlgebra.kt    | 2 +-
 .../space/kscience/kmath/expressions/SimpleAutoDiff.kt       | 2 +-
 .../kotlin/space/kscience/kmath/expressions/Symbol.kt        | 2 +-
 .../kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt | 2 +-
 .../space/kscience/kmath/linear/BufferedLinearSpace.kt       | 2 +-
 .../kotlin/space/kscience/kmath/linear/LinearSolver.kt       | 2 +-
 .../kotlin/space/kscience/kmath/linear/LinearSpace.kt        | 2 +-
 .../kotlin/space/kscience/kmath/linear/LupDecomposition.kt   | 2 +-
 .../kotlin/space/kscience/kmath/linear/MatrixBuilder.kt      | 2 +-
 .../kotlin/space/kscience/kmath/linear/MatrixFeatures.kt     | 2 +-
 .../kotlin/space/kscience/kmath/linear/MatrixWrapper.kt      | 2 +-
 .../kotlin/space/kscience/kmath/linear/VirtualMatrix.kt      | 2 +-
 .../kotlin/space/kscience/kmath/misc/annotations.kt          | 2 +-
 .../kotlin/space/kscience/kmath/misc/cumulative.kt           | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/misc/numbers.kt   | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt   | 2 +-
 .../kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt        | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt    | 2 +-
 .../kotlin/space/kscience/kmath/nd/DoubleFieldND.kt          | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt | 2 +-
 .../kotlin/space/kscience/kmath/operations/Algebra.kt        | 2 +-
 .../space/kscience/kmath/operations/AlgebraElements.kt       | 2 +-
 .../kotlin/space/kscience/kmath/operations/BigInt.kt         | 2 +-
 .../kotlin/space/kscience/kmath/operations/LogicAlgebra.kt   | 2 +-
 .../kotlin/space/kscience/kmath/operations/NumericAlgebra.kt | 2 +-
 .../space/kscience/kmath/operations/OptionalOperations.kt    | 2 +-
 .../space/kscience/kmath/operations/algebraExtensions.kt     | 2 +-
 .../kotlin/space/kscience/kmath/operations/numbers.kt        | 2 +-
 .../kotlin/space/kscience/kmath/structures/Buffer.kt         | 2 +-
 .../space/kscience/kmath/structures/BufferAccessor2D.kt      | 2 +-
 .../kotlin/space/kscience/kmath/structures/DoubleBuffer.kt   | 2 +-
 .../space/kscience/kmath/structures/DoubleBufferField.kt     | 2 +-
 .../kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt  | 2 +-
 .../kotlin/space/kscience/kmath/structures/FloatBuffer.kt    | 2 +-
 .../kotlin/space/kscience/kmath/structures/IntBuffer.kt      | 2 +-
 .../kotlin/space/kscience/kmath/structures/LongBuffer.kt     | 2 +-
 .../kotlin/space/kscience/kmath/structures/MemoryBuffer.kt   | 2 +-
 .../kotlin/space/kscience/kmath/structures/ShortBuffer.kt    | 2 +-
 .../space/kscience/kmath/structures/bufferOperation.kt       | 2 +-
 .../space/kscience/kmath/expressions/ExpressionFieldTest.kt  | 2 +-
 .../kotlin/space/kscience/kmath/expressions/InterpretTest.kt | 2 +-
 .../space/kscience/kmath/expressions/SimpleAutoDiffTest.kt   | 2 +-
 .../kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt | 2 +-
 .../kotlin/space/kscience/kmath/linear/MatrixTest.kt         | 2 +-
 .../kotlin/space/kscience/kmath/misc/CumulativeKtTest.kt     | 2 +-
 .../space/kscience/kmath/operations/BigIntAlgebraTest.kt     | 2 +-
 .../space/kscience/kmath/operations/BigIntConstructorTest.kt | 2 +-
 .../space/kscience/kmath/operations/BigIntConversionsTest.kt | 2 +-
 .../space/kscience/kmath/operations/BigIntOperationsTest.kt  | 2 +-
 .../space/kscience/kmath/operations/DoubleFieldTest.kt       | 2 +-
 .../kotlin/space/kscience/kmath/structures/NDFieldTest.kt    | 2 +-
 .../space/kscience/kmath/structures/NumberNDFieldTest.kt     | 2 +-
 .../space/kscience/kmath/testutils/AlgebraicVerifier.kt      | 2 +-
 .../kotlin/space/kscience/kmath/testutils/FieldVerifier.kt   | 2 +-
 .../kotlin/space/kscience/kmath/testutils/RingVerifier.kt    | 2 +-
 .../kotlin/space/kscience/kmath/testutils/SpaceVerifier.kt   | 2 +-
 .../src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt   | 2 +-
 .../jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt   | 2 +-
 .../kotlin/space/kscience/kmath/operations/BigNumbers.kt     | 2 +-
 .../nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt   | 2 +-
 .../kotlin/space/kscience/kmath/chains/BlockingChain.kt      | 2 +-
 .../space/kscience/kmath/chains/BlockingDoubleChain.kt       | 2 +-
 .../kotlin/space/kscience/kmath/chains/BlockingIntChain.kt   | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/chains/Chain.kt   | 2 +-
 .../kotlin/space/kscience/kmath/chains/flowExtra.kt          | 2 +-
 .../space/kscience/kmath/coroutines/coroutinesExtra.kt       | 2 +-
 .../kotlin/space/kscience/kmath/streaming/BufferFlow.kt      | 2 +-
 .../kotlin/space/kscience/kmath/streaming/RingBuffer.kt      | 2 +-
 .../jvmMain/kotlin/space/kscience/kmath/chains/ChainExt.kt   | 2 +-
 .../space/kscience/kmath/structures/LazyStructureND.kt       | 2 +-
 .../kotlin/space/kscience/kmath/streaming/BufferFlowTest.kt  | 2 +-
 .../kotlin/space/kscience/kmath/streaming/RingBufferTest.kt  | 2 +-
 .../kotlin/space/kscience/kmath/dimensions/Dimension.kt      | 2 +-
 .../kotlin/space/kscience/kmath/dimensions/Wrappers.kt       | 2 +-
 .../kotlin/space/kscience/dimensions/DMatrixContextTest.kt   | 2 +-
 .../kotlin/space/kscience/kmath/dimensions/Dimension.kt      | 2 +-
 .../kotlin/space/kscience/kmath/dimensions/Dimension.kt      | 2 +-
 .../kotlin/space/kscience/kmath/dimensions/Dimension.kt      | 2 +-
 .../main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt | 2 +-
 .../src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt  | 2 +-
 .../src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt  | 2 +-
 .../src/main/kotlin/space/kscience/kmath/ejml/_generated.kt  | 2 +-
 .../test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt  | 2 +-
 .../test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt  | 2 +-
 .../kotlin/space/kscience/kmath/real/RealMatrix.kt           | 2 +-
 .../kotlin/space/kscience/kmath/real/RealVector.kt           | 2 +-
 .../src/commonMain/kotlin/space/kscience/kmath/real/dot.kt   | 2 +-
 .../src/commonMain/kotlin/space/kscience/kmath/real/grids.kt | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/real/realND.kt    | 2 +-
 .../kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt     | 2 +-
 .../kotlin/space/kscience/kmath/real/DoubleVectorTest.kt     | 2 +-
 .../commonTest/kotlin/space/kscience/kmath/real/GridTest.kt  | 2 +-
 .../kotlin/space/kscience/kmath/functions/Piecewise.kt       | 2 +-
 .../kotlin/space/kscience/kmath/functions/Polynomial.kt      | 2 +-
 .../kotlin/space/kscience/kmath/functions/functionTypes.kt   | 2 +-
 .../space/kscience/kmath/integration/GaussIntegrator.kt      | 2 +-
 .../kscience/kmath/integration/GaussIntegratorRuleFactory.kt | 2 +-
 .../kotlin/space/kscience/kmath/integration/Integrand.kt     | 2 +-
 .../kotlin/space/kscience/kmath/integration/Integrator.kt    | 2 +-
 .../kscience/kmath/integration/MultivariateIntegrand.kt      | 2 +-
 .../space/kscience/kmath/integration/SimpsonIntegrator.kt    | 2 +-
 .../space/kscience/kmath/integration/SplineIntegrator.kt     | 2 +-
 .../space/kscience/kmath/integration/UnivariateIntegrand.kt  | 2 +-
 .../space/kscience/kmath/interpolation/Interpolator.kt       | 2 +-
 .../space/kscience/kmath/interpolation/LinearInterpolator.kt | 2 +-
 .../space/kscience/kmath/interpolation/SplineInterpolator.kt | 2 +-
 .../kotlin/space/kscience/kmath/functions/PolynomialTest.kt  | 2 +-
 .../space/kscience/kmath/integration/GaussIntegralTest.kt    | 2 +-
 .../space/kscience/kmath/integration/SimpsonIntegralTest.kt  | 2 +-
 .../space/kscience/kmath/integration/SplineIntegralTest.kt   | 2 +-
 .../kscience/kmath/interpolation/LinearInterpolatorTest.kt   | 2 +-
 .../kscience/kmath/interpolation/SplineInterpolatorTest.kt   | 2 +-
 .../kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt | 2 +-
 .../kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt | 2 +-
 .../kotlin/space/kscience/kmath/geometry/GeometrySpace.kt    | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/geometry/Line.kt  | 2 +-
 .../kotlin/space/kscience/kmath/geometry/ReferenceFrame.kt   | 2 +-
 .../kotlin/space/kscience/kmath/histogram/Counter.kt         | 2 +-
 .../space/kscience/kmath/histogram/DoubleHistogramSpace.kt   | 2 +-
 .../kotlin/space/kscience/kmath/histogram/Histogram.kt       | 2 +-
 .../space/kscience/kmath/histogram/IndexedHistogramSpace.kt  | 2 +-
 .../kscience/kmath/histogram/MultivariateHistogramTest.kt    | 2 +-
 .../space/kscience/kmath/histogram/TreeHistogramSpace.kt     | 2 +-
 .../space/kscience/kmath/histogram/UnivariateHistogram.kt    | 2 +-
 .../space/kscience/kmath/histogram/TreeHistogramTest.kt      | 2 +-
 .../main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt   | 5 +++++
 .../main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt | 5 +++++
 .../kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt    | 2 +-
 .../space/kscience/kmath/kotlingrad/KotlingradExpression.kt  | 2 +-
 .../space/kscience/kmath/kotlingrad/scalarsAdapters.kt       | 2 +-
 .../kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt  | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/memory/Memory.kt  | 2 +-
 .../kotlin/space/kscience/kmath/memory/MemorySpec.kt         | 2 +-
 .../kotlin/space/kscience/kmath/memory/DataViewMemory.kt     | 2 +-
 .../kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt   | 2 +-
 .../kotlin/space/kscience/kmath/memory/NativeMemory.kt       | 2 +-
 .../kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt     | 2 +-
 .../kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt    | 2 +-
 .../kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt   | 2 +-
 .../kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt    | 2 +-
 .../src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt      | 2 +-
 .../kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt | 2 +-
 .../space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt      | 2 +-
 .../space/kscience/kmath/distributions/Distribution.kt       | 2 +-
 .../kscience/kmath/distributions/FactorizedDistribution.kt   | 2 +-
 .../space/kscience/kmath/distributions/NormalDistribution.kt | 2 +-
 .../kotlin/space/kscience/kmath/internal/InternalErf.kt      | 2 +-
 .../kotlin/space/kscience/kmath/internal/InternalGamma.kt    | 2 +-
 .../kotlin/space/kscience/kmath/internal/InternalUtils.kt    | 2 +-
 .../kscience/kmath/optimization/FunctionOptimization.kt      | 2 +-
 .../kmath/optimization/NoDerivFunctionOptimization.kt        | 2 +-
 .../kotlin/space/kscience/kmath/optimization/Optimization.kt | 2 +-
 .../kotlin/space/kscience/kmath/optimization/XYFit.kt        | 2 +-
 .../kmath/samplers/AhrensDieterExponentialSampler.kt         | 2 +-
 .../kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt | 2 +-
 .../kscience/kmath/samplers/AliasMethodDiscreteSampler.kt    | 2 +-
 .../kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt | 2 +-
 .../kotlin/space/kscience/kmath/samplers/GaussianSampler.kt  | 2 +-
 .../kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt   | 2 +-
 .../kmath/samplers/MarsagliaNormalizedGaussianSampler.kt     | 2 +-
 .../kscience/kmath/samplers/NormalizedGaussianSampler.kt     | 2 +-
 .../kotlin/space/kscience/kmath/samplers/PoissonSampler.kt   | 2 +-
 .../kmath/samplers/ZigguratNormalizedGaussianSampler.kt      | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt   | 2 +-
 .../src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt  | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/stat/Median.kt    | 2 +-
 .../kotlin/space/kscience/kmath/stat/RandomChain.kt          | 2 +-
 .../kotlin/space/kscience/kmath/stat/RandomGenerator.kt      | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt   | 2 +-
 .../kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt       | 2 +-
 .../commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt | 2 +-
 .../kotlin/space/kscience/kmath/stat/UniformDistribution.kt  | 2 +-
 .../space/kscience/kmath/stat/RandomSourceGenerator.kt       | 2 +-
 .../space/kscience/kmath/stat/CommonsDistributionsTest.kt    | 2 +-
 .../jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt  | 2 +-
 .../jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt  | 2 +-
 .../kotlin/space/kscience/kmath/stat/StatisticTest.kt        | 2 +-
 .../kotlin/space/kscience/kmath/symja/SymjaExpression.kt     | 2 +-
 .../src/main/kotlin/space/kscience/kmath/symja/adapters.kt   | 2 +-
 .../kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt      | 2 +-
 .../kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt     | 2 +-
 .../kotlin/space/kscience/kmath/tensors/api/Tensor.kt        | 5 +++++
 .../kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt | 2 +-
 .../kmath/tensors/api/TensorPartialDivisionAlgebra.kt        | 2 +-
 .../kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt       | 2 +-
 .../space/kscience/kmath/tensors/core/BufferedTensor.kt      | 5 +++++
 .../kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt | 2 +-
 .../space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt | 2 +-
 .../kotlin/space/kscience/kmath/tensors/core/IntTensor.kt    | 2 +-
 .../kmath/tensors/core/internal/TensorLinearStructure.kt     | 2 +-
 .../kscience/kmath/tensors/core/internal/broadcastUtils.kt   | 2 +-
 .../space/kscience/kmath/tensors/core/internal/checks.kt     | 2 +-
 .../space/kscience/kmath/tensors/core/internal/linUtils.kt   | 2 +-
 .../kscience/kmath/tensors/core/internal/tensorCastsUtils.kt | 2 +-
 .../space/kscience/kmath/tensors/core/internal/utils.kt      | 2 +-
 .../kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt  | 2 +-
 .../space/kscience/kmath/tensors/core/TestBroadcasting.kt    | 5 +++++
 .../kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt    | 5 +++++
 .../kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt         | 5 +++++
 .../space/kscience/kmath/tensors/core/TestDoubleTensor.kt    | 5 +++++
 .../kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt   | 5 +++++
 .../main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt  | 2 +-
 .../kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt  | 2 +-
 331 files changed, 383 insertions(+), 318 deletions(-)

diff --git a/.idea/copyright/kmath.xml b/.idea/copyright/kmath.xml
index 17e44e4d0..1070e5d33 100644
--- a/.idea/copyright/kmath.xml
+++ b/.idea/copyright/kmath.xml
@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
     <copyright>
-        <option name="notice" value="Copyright 2018-2021 KMath contributors.&#10;Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file." />
+        <option name="notice" value="Copyright 2018-2021 KMath contributors.&#10;Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file." />
         <option name="myName" value="kmath" />
     </copyright>
 </component>
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt
index ff933997f..17983e88c 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index 749cd5e75..6f501dedb 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
index 39819d407..5cf194b67 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 2c5a03a97..629408479 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
index 0294f924b..8c3c8ec2b 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
index 5d4eee7c0..9c6551302 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
index e3179c05c..1072a55c3 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index 5e0c6735f..0cd9a46ab 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
index d2359a791..1ddc79cf8 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
index eac8634f5..8622e8f30 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
index eaa0f59d8..6859de845 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
index b55e1320e..72c9ff0ad 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
index a0d40c1ee..1d2aaeaaf 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:Suppress("KDocUnresolvedReference")
diff --git a/docs/images/KM.svg b/docs/images/KM.svg
index 83af21f35..f5ec452c7 100644
--- a/docs/images/KM.svg
+++ b/docs/images/KM.svg
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  - Copyright 2018-2021 KMath contributors.
+  - Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+  -->
+
 <svg
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:cc="http://creativecommons.org/ns#"
diff --git a/docs/images/KM_mono.svg b/docs/images/KM_mono.svg
index 90566b87b..e583324d7 100644
--- a/docs/images/KM_mono.svg
+++ b/docs/images/KM_mono.svg
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  - Copyright 2018-2021 KMath contributors.
+  - Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+  -->
+
 <svg
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:cc="http://creativecommons.org/ns#"
diff --git a/docs/images/KMath.svg b/docs/images/KMath.svg
index 4ee4b87d0..e99464a17 100644
--- a/docs/images/KMath.svg
+++ b/docs/images/KMath.svg
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  - Copyright 2018-2021 KMath contributors.
+  - Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+  -->
+
 <svg
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:cc="http://creativecommons.org/ns#"
diff --git a/docs/images/KMath_mono.svg b/docs/images/KMath_mono.svg
index dfcff9ec9..3ef61bbf1 100644
--- a/docs/images/KMath_mono.svg
+++ b/docs/images/KMath_mono.svg
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  - Copyright 2018-2021 KMath contributors.
+  - Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+  -->
+
 <svg
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:cc="http://creativecommons.org/ns#"
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt
index c4f263f97..0c16d82d1 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
index 96c9856cf..887d76c42 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
index dec3bfb81..4e3528b3e 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
index 7e09faeff..209523c89 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt b/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
index 9118d09ae..406cbd040 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.commons.fit
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
index f60b1ab45..c77d1d70c 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.functions
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
index 8dbc7b7a4..a98467ced 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.functions
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
index 33973c880..76422d658 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.functions
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index 2619d3d74..5af867061 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.functions
diff --git a/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt
index 9c3d0fdbe..10ed30728 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.jafama
diff --git a/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt b/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt
index a01ea7fe2..afc42ea26 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.linear
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/BigIntDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/BigIntDemo.kt
index 51f439612..2039953b5 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/BigIntDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/BigIntDemo.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt
index f99dd8c0e..eefc6e896 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
index 8e3cdf86f..732c9a8e3 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
index bde83cea9..685214c39 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
index b30165f71..752e00bdf 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:Suppress("unused")
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
index e1621d477..c842960be 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index d53cfa9b9..e443a588d 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
index 0d5358354..84dd6538c 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
index dea7095a8..84644ddd9 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt
index c28b566b9..853ebad32 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
index ad6890b15..3ef745da3 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
index 3e6a60c31..27886413f 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
index 55a9aa67a..3025ff8a3 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index b42602988..a266d4849 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index b973abdef..3302b49a8 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
index 5201fec38..b02cc926b 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
index 2df3d3cc7..bf5916fa5 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
index 8b5819b84..5439c42fa 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
index fdef35ebd..24bac425a 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
index ee23ab408..81b7d2afb 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
index 362c07d72..2f285c600 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index 8a4804916..a7a28d87f 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
index 291399cee..3e33d6415 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
index 574bb54f4..3d05e03d6 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
index 1edb5923e..802d4c10e 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
index 929d17775..f5b1e2842 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
index af1a2e338..8d9a2301f 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
index b838245e1..4c834a9ca 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
index bb6bb3ce1..9776da45c 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
index a40c785b9..ae429d97e 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
index 6322df25d..d8e432230 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
index 2d7bfad19..a7fcbc75b 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
index 09ec127c7..4485605a6 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
index bf87b6fd0..6b418821b 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
index ec7436188..ef9f3145a 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
index 521907d2c..2e69a536f 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
index 0c15e994c..316fdeeff 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.estree
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
index 4907d8225..850f20be7 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.estree.internal
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.typealises.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.typealises.kt
index eb5c1e3dd..c7faf73e0 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.typealises.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.typealises.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.estree.internal.astring
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt
index cca2d83af..c36860654 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:JsModule("astring")
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
index 93b4f6ce6..0a5b059ba 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.internal.astring
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
index 86e0cede7..26186c453 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:Suppress(
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
index 42b6ac7d8..13e3a49e2 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:Suppress(
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
index 523b13b40..8e449627c 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:Suppress("PackageDirectoryMismatch", "NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING", "KDocMissingDocumentation")
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt
index 1f7b09af8..d85857de8 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.internal.emitter
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
index 3aa31f921..122a3a397 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.internal.estree
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
index b62b8c06c..ad079dbd0 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:Suppress("ClassName")
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
index 52be5530f..caab91731 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.internal.stream
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt
index 9c012e3a3..5c091e3a1 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.internal.tsstdlib
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt
index 0cd395f2c..bb7fd44ca 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:Suppress("UNUSED_TYPEALIAS_PARAMETER", "DEPRECATION")
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
index 3754c3eff..52dd64a5e 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:JsQualifier("WebAssembly")
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
index c5023c384..d59a52701 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:Suppress(
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index c89ad83c4..5b6cf65db 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.wasm.internal
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
index 21a88b5d0..fe9c22c18 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.wasm.internal
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
index 6ea8f26c1..5b28b8782 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.wasm
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
index d0e8128b4..2433f6316 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
index 0d896c6f6..3c2a9bd13 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
index 8ae5fcb36..6c91df866 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.wasm
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
index 4147324ee..2426d6ee4 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.asm
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
index a796ae2a5..de7da30df 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.asm.internal
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
index 06e040e93..5e2e7d8c6 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.asm.internal
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
index 8f4daecf9..56cfa4cbf 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:JvmName("MapIntrinsics")
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
index 556adbe7d..3e5253084 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
index a7f0bb3fb..a0bdd68a0 100644
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
index d5473063a..8fafabf19 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.commons.expressions
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
index 4e174723d..58b69b3d8 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package space.kscience.kmath.commons.integration
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
index bcddccdc4..ee7bda251 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.commons.integration
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
index 1997a633e..3f8dccf27 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.commons.linear
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
index ee602ca06..c5144c482 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.commons.linear
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
index bca106e68..03a1abafb 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimization.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.commons.optimization
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
index 645c41291..267f2f1f9 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/cmFit.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.commons.optimization
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
index 6aeebb68c..28294cf14 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.commons.random
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
index 6fef12138..1a99e9fc6 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.commons.transform
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
index 3c57f5467..4ed4f808f 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.commons.expressions
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
index c5573fef1..bab3aecb6 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.commons.integration
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index b0e5d7904..2f7f0c9f2 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.commons.optimization
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index 8b064a05f..08bd12205 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
index 1b54fc227..ae4e05631 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index 423cef1d1..e5d7ebd1e 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexBufferSpecTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexBufferSpecTest.kt
index 17a077ea7..87239654d 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexBufferSpecTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexBufferSpecTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexFieldTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexFieldTest.kt
index cbaaa815b..90e624343 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexFieldTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexFieldTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexTest.kt
index 7ad7f883d..a37006f75 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt
index 4279471d4..00ae5ede1 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionFieldTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionFieldTest.kt
index 6784f3516..319460c74 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionFieldTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionFieldTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
index 88c14d311..de7f30680 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.data
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
index 920fcc021..f3ecc7e37 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.data
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
index 6050c311c..42866afc4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.data
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt
index b5a84cf6c..0c4d2307b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.domains
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt
index ee1bebde0..aee1d52c5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package space.kscience.kmath.domains
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
index bd5514623..7ea3e22c4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package space.kscience.kmath.domains
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
index 32a5fc56c..040bb80b0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package space.kscience.kmath.domains
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt
index 9020ef8cb..a5add6a0b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.domains
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
index 19befe6e6..4887f3c74 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
index 5105c2bec..c7dafec3b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
index 838118339..bb7f36fc5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
index 7533024a1..fe50902b1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
index d8489e30c..bbc74005c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
index bf9469f41..4a97baac4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
index 74dc7aedc..d72b94b2a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
index c02bdad02..25d2ece51 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index f1839077f..5471cb925 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
index d63f141ba..86a35a6a4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
index fdb5c2090..bb5a1b530 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
index 25f53f65d..145088b56 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
index 72d22233a..01dc21198 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
index b70e9d8a9..4c2b5c73c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
index df3852d72..e5448899b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
index 3751bd33b..c3327bc6b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
index 99f959c86..a643dc0bf 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
index ee7f1d8be..413f44960 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt
index f879a06d5..e048eb746 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index 454a33e86..b925c2642 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index 6eacf1ca5..9ece51ff8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 904419302..694e0ceae 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 925301272..a448e351e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
index 1305558e5..f96978cfc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index 1af80149c..d0e2354d2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index 293faaeda..7fb8ea251 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index cfb20f441..45153f7bd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index 1009742e1..daff58d9a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
index 6b0e2cabd..7669e073a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 8111691aa..2dd61270d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
index 9037525e1..d50f1e79e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
index 92070b33d..a3d8f5ffe 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
index 31bd47bc3..7f44eda49 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index d52be943a..b26ebb2ea 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index 19cb5f25c..e75d815cf 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index 82f17b807..6a97d18c2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
index 03b3822c3..5f1f8a738 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
index 7a79663c4..b94a36bab 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
index c83496853..264d4ffbb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
index efb8504c2..665558829 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
index e7e98fc71..dc7903cbf 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
index 35b722e2b..ca078746c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
index c69f4646d..a0b5c78fa 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
index 5d660c8cb..996785570 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
index 20691511b..1d2b0188a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferOperation.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferOperation.kt
index 3dad14ac5..bc3f5b64b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferOperation.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferOperation.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
index 4d1b00b3d..034839041 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
index 156334b2e..8bf852653 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
index 201890933..7d8ff6202 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
index 2d2a0952b..98b0bf02a 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
index 170f9caf4..507f816d3 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/CumulativeKtTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/CumulativeKtTest.kt
index e5f3f337f..aa7abd8ff 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/CumulativeKtTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/CumulativeKtTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
index 0527f5252..75100b116 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConstructorTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConstructorTest.kt
index eec3dc3bf..c121c86ae 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConstructorTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConstructorTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
index 85f368f3e..78dcdfe19 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
index 26d6af224..11b8b161c 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
index 76171fedd..9be75d68e 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
index fdfa49d1d..f623b00e8 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index fb51553f7..86e9bb083 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/AlgebraicVerifier.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/AlgebraicVerifier.kt
index ddd8fc3ea..544e05707 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/AlgebraicVerifier.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/AlgebraicVerifier.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.testutils
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt
index 20a7b6a72..d0a312bb2 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.testutils
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt
index daf18834a..3b0b49f31 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.testutils
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/SpaceVerifier.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/SpaceVerifier.kt
index 951197fc6..4afa97ce5 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/SpaceVerifier.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/SpaceVerifier.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.testutils
diff --git a/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt
index 68a3c995b..a24243cb4 100644
--- a/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt
+++ b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt
index 5ba0dbc9b..c50919e88 100644
--- a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt
+++ b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
index 7ac2c6f83..69dd858c4 100644
--- a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
+++ b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt
index 68a3c995b..a24243cb4 100644
--- a/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt
+++ b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt
index 87aebff61..a41a30f55 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.chains
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
index 25e20291e..7b4d1f2af 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.chains
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingIntChain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingIntChain.kt
index ac0327d0b..f13d9907c 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingIntChain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingIntChain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.chains
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
index f8d2549e5..403472f28 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.chains
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt
index ec1203740..1821daac9 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.chains
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
index 1f17efe49..3b90222dd 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.coroutines
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
index 4d4493aa4..914139a3e 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.streaming
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
index 93c4a401b..4b12b031d 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.streaming
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/chains/ChainExt.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/chains/ChainExt.kt
index dd6e39071..0e36706cf 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/chains/ChainExt.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/chains/ChainExt.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.chains
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
index f9ef62529..3eb6f3aa6 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/BufferFlowTest.kt b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/BufferFlowTest.kt
index 9b67f7253..057ac5feb 100644
--- a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/BufferFlowTest.kt
+++ b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/BufferFlowTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.streaming
diff --git a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
index 32e3b2c74..14081b0f5 100644
--- a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
+++ b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.streaming
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index e57c22834..53482f020 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.dimensions
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
index eb099bd79..70dc1001d 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.dimensions
diff --git a/kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt b/kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt
index 59260fe73..efa3170a3 100644
--- a/kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt
+++ b/kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.dimensions
diff --git a/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt b/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index 610e8b4c0..324c78108 100644
--- a/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
+++ b/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.dimensions
diff --git a/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt b/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index e6d8b3b35..8fc683ed6 100644
--- a/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
+++ b/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:JvmName("DimensionJVM")
diff --git a/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt b/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index 64edbe935..001d68935 100644
--- a/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
+++ b/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.dimensions
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
index f88e83369..022a7874e 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ejml
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
index 27fd3fc53..9ad0f9c77 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ejml
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
index 37995c27e..a6de1b657 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ejml
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
index 5de8fc8a5..492d16510 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 /* This file is generated with buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt */
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
index 50675bdac..08afa4c68 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ejml
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
index 9592bfa6c..c87a01436 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.ejml
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
index 091b5db3f..16889aea4 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:OptIn(PerformancePitfall::class)
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
index 0508e9ca3..d942c31f2 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
index b79e5030c..f42a47a27 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
index 1926ef02c..fba999e6c 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
index 31a00c1ca..b2c3209c2 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
index e3f015511..1400ed0b7 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
index 48e55ea01..9a254a0b0 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
index 8fed8d10e..ec1ed8f50 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index 16af7f555..4225a7572 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.functions
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index f0f744530..54b285a70 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.functions
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt
index 88b24c756..52b7e50db 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.functions
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index 278ef6abe..dc3f41861 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package space.kscience.kmath.integration
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
index 2eceec135..b09129626 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
index 4f565a893..0fdfee6c6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt
index abe6ea5ff..18c428667 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
index 5ba411bf9..fcc0a8d62 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
index c01c30ec2..9bcc8e4d9 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index 07b37bd6a..65a3d5e82 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index 9c8aeef1b..f994ba9f9 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
index f4a0abd5d..7a096f902 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 @file:OptIn(UnstableKMathAPI::class)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
index edd0e6b0a..eff9cd97d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.interpolation
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
index 39c33ee69..ac9708d01 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.interpolation
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
index 05c16d17e..21e5473a0 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.functions
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
index 9f48a15ea..533389a6e 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
index 9f2d71554..eaf7abbfd 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
index afeba0be4..4dffb276f 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
index bec678bae..c3388c265 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.interpolation
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
index 3adaab2d1..42f41ab80 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.interpolation
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
index 2b91c2334..252e2fcd5 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.geometry
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index 628106b0b..b0b2d2079 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.geometry
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
index d4245c744..3d3f8b653 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.geometry
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
index 8c6ccb55e..d9dc57ec2 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.geometry
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/ReferenceFrame.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/ReferenceFrame.kt
index a7a28b596..7bb95c009 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/ReferenceFrame.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/ReferenceFrame.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.geometry
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
index 3e5d93768..4f5a1ceba 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
index e792ef767..27b14b65e 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
index 4e803fc63..946aa814b 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
index 79b6b4e02..44f3072d2 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
index 51f9dabc5..c797eb65a 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
index daea4a82e..96f945f6a 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
index ca37279c3..0841fcb4c 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
index 28a1b03cb..e71602c7b 100644
--- a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
+++ b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
index a30020dff..1a6e3325b 100644
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
 package space.kscience.kmath.jafama
 
 import net.jafama.FastMath
diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
index e3767e13c..05e2dc0da 100644
--- a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
 package space.kscience.kmath.jupyter
 
 import kotlinx.html.Unsafe
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
index f4386f434..0f10c6cdd 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.kotlingrad
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
index 3a94e8259..06214ca1a 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.kotlingrad
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
index 6c0b98c59..857824275 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.kotlingrad
diff --git a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
index 9378adfea..67332a680 100644
--- a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
+++ b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.kotlingrad
diff --git a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
index e8e51e9e2..9f73ae2f3 100644
--- a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
+++ b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.memory
diff --git a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/MemorySpec.kt b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/MemorySpec.kt
index 1ee1cf4e2..2f2af4d9c 100644
--- a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/MemorySpec.kt
+++ b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/MemorySpec.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.memory
diff --git a/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt b/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
index 6153743fc..db5eb556e 100644
--- a/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
+++ b/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.memory
diff --git a/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt b/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
index aef68fd80..6e60514f8 100644
--- a/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
+++ b/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.memory
diff --git a/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt b/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
index 5146d9689..d13da1191 100644
--- a/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
+++ b/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.memory
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index f69f831e8..54df31556 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
index d4cad8996..5ae6f6b01 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
index 2a0fdc86c..82f560fdb 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index 1fdf845a6..0ac37e19b 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
index 3ca756600..cc9211b20 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
index 40da22763..a03a7269e 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
index 30d01338f..ff55ad521 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
index 3d3f95f8f..298bbc858 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.distributions
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
index 1218f13c5..067b47796 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.distributions
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
index 66e041f05..24429cf32 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.distributions
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt
index 25668446c..5b3cb1859 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.internal
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
index 6e7eb039d..18abd669f 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.internal
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
index 3997a77b3..77ba02a25 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.internal
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
index 997f1bbe3..16f616fe2 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.optimization
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt
index 44b66169f..fbc5074ef 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/NoDerivFunctionOptimization.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.optimization
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
index f85658d87..d6d15755c 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimization.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.optimization
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
index 70d7fdf79..33400040d 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.optimization
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
index 77d29981f..5f923fe5f 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
index 993215d41..063e055ce 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
index 5390a2e09..b00db5b30 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
index b3c014553..14aa26275 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
index 9219df43e..e5d1ecb49 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
index 0105731c4..16f91570f 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
index 0a68e5c88..5e636f246 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
index 83f87e832..ceb324e8d 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
index f0f94900e..d3ff05b06 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
index 81b8c3d4b..2d5750bc7 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
index 0e06fa162..5e1e577ba 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
index ac2c2098f..7daed5798 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
index 2cc867fb2..54b2e42b3 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
index d4bc36b5b..61e472334 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
index f280a78aa..98ee6402a 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
index 4c11fdd65..0b3b52cab 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
index 044e489b2..c1bbace86 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
index 0af901fc9..ab80fbe1c 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
index 970a3aab5..4c0d08720 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt b/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
index 202a1c8dd..a8e6a3362 100644
--- a/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
+++ b/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
index 19c01e099..2b6b1ca60 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
index 075d7f3e5..0c3d9cb0d 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
index 1dbbf591b..4060c0505 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
index 1dd5c5161..c64bcc78c 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
index 3067b5efb..a343256fa 100644
--- a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
+++ b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.symja
diff --git a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
index 95dd1ebbf..8def1ae83 100644
--- a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
+++ b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.symja
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index e58af14db..851810c8d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.api
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index af4ae8239..78aad2189 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.api
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt
index 179787684..e0f296057 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
 package space.kscience.kmath.tensors.api
 
 import space.kscience.kmath.nd.MutableStructureND
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index d48e7b1c9..6076748d9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.api
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
index 867d4b26e..ce519288b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.api
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index b8530f637..3eb8e5636 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 87ac2fdf6..bf9a9f7f7 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.PerformancePitfall
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
index 8e5116336..ad7831fb9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index d6ad8e8e2..4b9d13827 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
index ae1e6c8c8..dd9f9c0c1 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt
index 4bdd987db..817ed60d8 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.core.internal
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
index 6324dc242..4b9c0c382 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.core.internal
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index f1c158770..e901415d1 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.core.internal
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index 4c9c00552..f3ac92872 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.core.internal
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index 77264ff92..29aa02931 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.core.internal
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index ff89568ea..6088c32e4 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.core.internal
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
index 142cb2156..021ca539c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 35e605fd9..1171b5217 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index 3b4c615b4..ba8182da2 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index c525d5c83..c50c99b54 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index a176abdd4..2686df19e 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.PerformancePitfall
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 85c3e74e3..2aee03b82 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
 package space.kscience.kmath.tensors.core
 
 
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
index c7f45c6da..caebd9783 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.viktor
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index 2be964017..682123ddd 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 package space.kscience.kmath.viktor
-- 
2.34.1


From 9b8da4cdcc07648dbd337a2aa254e1338325a966 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 12 Aug 2021 20:28:45 +0300
Subject: [PATCH 315/713] Fix JS bug with null cast

---
 .../kotlin/space/kscience/kmath/misc/Featured.kt       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
index 648b6376f..be1c8380c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
@@ -16,13 +16,14 @@ public interface Featured<F : Any> {
 
 public typealias FeatureKey<T> = KClass<out T>
 
-public interface Feature<F: Feature<F>> {
+public interface Feature<F : Feature<F>> {
 
     /**
      * A key used for extraction
      */
     @Suppress("UNCHECKED_CAST")
-    public val key: FeatureKey<F> get() = this::class as FeatureKey<F>
+    public val key: FeatureKey<F>
+        get() = this::class as FeatureKey<F>
 }
 
 /**
@@ -30,7 +31,7 @@ public interface Feature<F: Feature<F>> {
  */
 public class FeatureSet<F : Feature<F>> private constructor(public val features: Map<FeatureKey<F>, F>) : Featured<F> {
     @Suppress("UNCHECKED_CAST")
-    override fun <T : F> getFeature(type: FeatureKey<T>): T? = features[type] as? T
+    override fun <T : F> getFeature(type: FeatureKey<T>): T? = features[type]?.let { it as T }
 
     public inline fun <reified T : F> getFeature(): T? = getFeature(T::class)
 
@@ -49,6 +50,7 @@ public class FeatureSet<F : Feature<F>> private constructor(public val features:
 
     public companion object {
         public fun <F : Feature<F>> of(vararg features: F): FeatureSet<F> = FeatureSet(features.associateBy { it.key })
-        public fun <F : Feature<F>> of(features: Iterable<F>): FeatureSet<F> = FeatureSet(features.associateBy { it.key })
+        public fun <F : Feature<F>> of(features: Iterable<F>): FeatureSet<F> =
+            FeatureSet(features.associateBy { it.key })
     }
 }
-- 
2.34.1


From aaa298616d2668f80062079ede547f4228246b5e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 16 Aug 2021 09:55:03 +0300
Subject: [PATCH 316/713] QOW is working more or less

---
 examples/build.gradle.kts                     |   1 +
 .../fitWithAutoDiff.kt => fit/chiSquared.kt}  |  13 +-
 .../kotlin/space/kscience/kmath/fit/qowFit.kt | 105 ++++++++++
 .../kmath/functions/matrixIntegration.kt      |   2 +-
 kmath-commons/build.gradle.kts                |   1 +
 .../kmath/commons/optimization/CMOptimizer.kt |   7 +-
 .../DerivativeStructureExpressionTest.kt      |   4 +-
 .../commons/optimization/OptimizeTest.kt      |   3 +-
 .../kscience/kmath/data/XYColumnarData.kt     |  20 +-
 .../kmath/data/XYErrorColumnarData.kt         |  25 ++-
 .../kscience/kmath/expressions/Expression.kt  |   7 +-
 .../kmath/expressions/specialExpressions.kt   |  17 +-
 .../space/kscience/kmath/misc/Featured.kt     |   7 +-
 .../space/kscience/kmath/misc/logging.kt      |  14 +-
 .../kmath/expressions/ExpressionFieldTest.kt  |   6 +-
 .../kmath/integration/GaussIntegrator.kt      |   3 +-
 .../kmath/interpolation/Interpolator.kt       |   6 +-
 kmath-optimization/build.gradle.kts           |  20 ++
 .../optimization/FunctionOptimization.kt      |  33 ++-
 .../kmath/optimization/OptimizationBuilder.kt |   8 +-
 .../kmath/optimization/OptimizationProblem.kt |   0
 .../kscience/kmath/optimization/Optimizer.kt  |   0
 .../kmath/optimization/QowOptimizer.kt        |  72 +++----
 .../kscience/kmath/optimization/XYFit.kt      | 125 ++++++++++++
 .../kmath/optimization/logLikelihood.kt       |  66 ++++++
 kmath-stat/build.gradle.kts                   |   3 +-
 .../kmath/optimization/XYOptimization.kt      | 189 ------------------
 settings.gradle.kts                           |   1 +
 28 files changed, 477 insertions(+), 281 deletions(-)
 rename examples/src/main/kotlin/space/kscience/kmath/{commons/fit/fitWithAutoDiff.kt => fit/chiSquared.kt} (91%)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
 create mode 100644 kmath-optimization/build.gradle.kts
 rename {kmath-stat => kmath-optimization}/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt (65%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt (94%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt (77%)
 create mode 100644 kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
 create mode 100644 kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt
 delete mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 4cc6fecc0..d06005321 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     implementation(project(":kmath-coroutines"))
     implementation(project(":kmath-commons"))
     implementation(project(":kmath-complex"))
+    implementation(project(":kmath-optimization"))
     implementation(project(":kmath-stat"))
     implementation(project(":kmath-viktor"))
     implementation(project(":kmath-dimensions"))
diff --git a/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
similarity index 91%
rename from examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
rename to examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
index 8d95ebb4a..c1070de52 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/commons/fit/fitWithAutoDiff.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
@@ -3,19 +3,17 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.commons.fit
+package space.kscience.kmath.fit
 
 import kotlinx.html.br
 import kotlinx.html.h3
 import space.kscience.kmath.commons.expressions.DSProcessor
 import space.kscience.kmath.commons.optimization.CMOptimizer
 import space.kscience.kmath.distributions.NormalDistribution
+import space.kscience.kmath.expressions.binding
 import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.optimization.FunctionOptimizationTarget
-import space.kscience.kmath.optimization.optimizeWith
-import space.kscience.kmath.optimization.resultPoint
-import space.kscience.kmath.optimization.resultValue
+import space.kscience.kmath.optimization.*
 import space.kscience.kmath.real.DoubleVector
 import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
@@ -25,6 +23,7 @@ import space.kscience.kmath.structures.toList
 import space.kscience.plotly.*
 import space.kscience.plotly.models.ScatterMode
 import space.kscience.plotly.models.TraceValues
+import kotlin.math.abs
 import kotlin.math.pow
 import kotlin.math.sqrt
 
@@ -45,7 +44,7 @@ operator fun TraceValues.invoke(vector: DoubleVector) {
  */
 suspend fun main() {
     //A generator for a normally distributed values
-    val generator = NormalDistribution(2.0, 7.0)
+    val generator = NormalDistribution(0.0, 1.0)
 
     //A chain/flow of random values with the given seed
     val chain = generator.sample(RandomGenerator.default(112667))
@@ -56,7 +55,7 @@ suspend fun main() {
 
 
     //Perform an operation on each x value (much more effective, than numpy)
-    val y = x.map {
+    val y = x.map { it ->
         val value = it.pow(2) + it + 1
         value + chain.next() * sqrt(value)
     }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
new file mode 100644
index 000000000..944f80697
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.fit
+
+import kotlinx.html.br
+import kotlinx.html.h3
+import space.kscience.kmath.commons.expressions.DSProcessor
+import space.kscience.kmath.data.XYErrorColumnarData
+import space.kscience.kmath.distributions.NormalDistribution
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.binding
+import space.kscience.kmath.expressions.symbol
+import space.kscience.kmath.optimization.QowOptimizer
+import space.kscience.kmath.optimization.fitWith
+import space.kscience.kmath.optimization.resultPoint
+import space.kscience.kmath.real.map
+import space.kscience.kmath.real.step
+import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.structures.asIterable
+import space.kscience.kmath.structures.toList
+import space.kscience.plotly.*
+import space.kscience.plotly.models.ScatterMode
+import kotlin.math.abs
+import kotlin.math.pow
+import kotlin.math.sqrt
+
+// Forward declaration of symbols that will be used in expressions.
+private val a by symbol
+private val b by symbol
+private val c by symbol
+
+
+/**
+ * Least squares fie with auto-differentiation. Uses `kmath-commons` and `kmath-for-real` modules.
+ */
+suspend fun main() {
+    //A generator for a normally distributed values
+    val generator = NormalDistribution(0.0, 1.0)
+
+    //A chain/flow of random values with the given seed
+    val chain = generator.sample(RandomGenerator.default(112667))
+
+
+    //Create a uniformly distributed x values like numpy.arrange
+    val x = 1.0..100.0 step 1.0
+
+
+    //Perform an operation on each x value (much more effective, than numpy)
+    val y = x.map { it ->
+        val value = it.pow(2) + it + 100
+        value + chain.next() * sqrt(value)
+    }
+    // this will also work, but less effective:
+    // val y = x.pow(2)+ x + 1 + chain.nextDouble()
+
+    // create same errors for all xs
+    val yErr = y.map { sqrt(abs(it)) }
+    require(yErr.asIterable().all { it > 0 }) { "All errors must be strictly positive" }
+
+    val result = XYErrorColumnarData.of(x, y, yErr).fitWith(
+        QowOptimizer,
+        DSProcessor,
+        mapOf(a to 1.0, b to 1.2, c to 99.0)
+    ) { arg ->
+        //bind variables to autodiff context
+        val a by binding
+        val b by binding
+        //Include default value for c if it is not provided as a parameter
+        val c = bindSymbolOrNull(c) ?: one
+        a * arg.pow(2) + b * arg + c
+    }
+
+    //display a page with plot and numerical results
+    val page = Plotly.page {
+        plot {
+            scatter {
+                mode = ScatterMode.markers
+                x(x)
+                y(y)
+                error_y {
+                    array = yErr.toList()
+                }
+                name = "data"
+            }
+            scatter {
+                mode = ScatterMode.lines
+                x(x)
+                y(x.map { result.model(result.resultPoint + (Symbol.x to it)) })
+                name = "fit"
+            }
+        }
+        br()
+        h3 {
+            +"Fit result: ${result.resultPoint}"
+        }
+//        h3 {
+//            +"Chi2/dof = ${result.resultValue / (x.size - 3)}"
+//        }
+    }
+
+    page.makeFile()
+}
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index 2619d3d74..e5ba29d73 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -22,7 +22,7 @@ fun main(): Unit = DoubleField {
         }
 
         //Define a function in a nd space
-        val function: (Double) -> StructureND<Double> = { x: Double -> 3 * number(x).pow(2) + 2 * diagonal(x) + 1 }
+        val function: (Double) -> StructureND<Double> = { x: Double -> 3 * x.pow(2) + 2 * diagonal(x) + 1 }
 
         //get the result of the integration
         val result = gaussIntegrator.integrate(0.0..10.0, function = function)
diff --git a/kmath-commons/build.gradle.kts b/kmath-commons/build.gradle.kts
index a208c956c..96c17a215 100644
--- a/kmath-commons/build.gradle.kts
+++ b/kmath-commons/build.gradle.kts
@@ -9,6 +9,7 @@ dependencies {
     api(project(":kmath-core"))
     api(project(":kmath-complex"))
     api(project(":kmath-coroutines"))
+    api(project(":kmath-optimization"))
     api(project(":kmath-stat"))
     api(project(":kmath-functions"))
     api("org.apache.commons:commons-math3:3.6.1")
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
index abf95daf6..11eb6fba8 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
@@ -18,6 +18,7 @@ import space.kscience.kmath.expressions.SymbolIndexer
 import space.kscience.kmath.expressions.derivative
 import space.kscience.kmath.expressions.withSymbols
 import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.misc.log
 import space.kscience.kmath.optimization.*
 import kotlin.collections.set
 import kotlin.reflect.KClass
@@ -108,15 +109,17 @@ public object CMOptimizer : Optimizer<Double, FunctionOptimization<Double>> {
 
             val objectiveFunction = ObjectiveFunction {
                 val args = startPoint + it.toMap()
-                problem.expression(args)
+                val res = problem.expression(args)
+                res
             }
             addOptimizationData(objectiveFunction)
 
             val gradientFunction = ObjectiveFunctionGradient {
                 val args = startPoint + it.toMap()
-                DoubleArray(symbols.size) { index ->
+                val res = DoubleArray(symbols.size) { index ->
                     problem.expression.derivative(symbols[index])(args)
                 }
+                res
             }
             addOptimizationData(gradientFunction)
 
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
index 3c57f5467..56252ab34 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
@@ -42,8 +42,8 @@ internal class AutoDiffTest {
     @Test
     fun autoDifTest() {
         val f = DerivativeStructureExpression {
-            val x by binding()
-            val y by binding()
+            val x by binding
+            val y by binding
             x.pow(2) + 2 * x * y + y.pow(2) + 1
         }
 
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index 170fceceb..facbf3a9a 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -15,6 +15,7 @@ import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.optimization.*
 import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.structures.map
 import kotlin.math.pow
@@ -58,7 +59,7 @@ internal class OptimizeTest {
             it.pow(2) + it + 1 + chain.next()
         }
 
-        val yErr = List(x.size) { sigma }.asBuffer()
+        val yErr = DoubleBuffer(x.size) { sigma }
 
         val chi2 = DSProcessor.chiSquaredExpression(
             x, y, yErr
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
index bd0e13b9d..2fce772cc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
@@ -32,19 +32,21 @@ public interface XYColumnarData<out T, out X : T, out Y : T> : ColumnarData<T> {
         Symbol.y -> y
         else -> null
     }
-}
 
-@Suppress("FunctionName")
-@UnstableKMathAPI
-public fun <T, X : T, Y : T> XYColumnarData(x: Buffer<X>, y: Buffer<Y>): XYColumnarData<T, X, Y> {
-    require(x.size == y.size) { "Buffer size mismatch. x buffer size is ${x.size}, y buffer size is ${y.size}" }
-    return object : XYColumnarData<T, X, Y> {
-        override val size: Int = x.size
-        override val x: Buffer<X> = x
-        override val y: Buffer<Y> = y
+    public companion object{
+        @UnstableKMathAPI
+        public fun <T, X : T, Y : T> of(x: Buffer<X>, y: Buffer<Y>): XYColumnarData<T, X, Y> {
+            require(x.size == y.size) { "Buffer size mismatch. x buffer size is ${x.size}, y buffer size is ${y.size}" }
+            return object : XYColumnarData<T, X, Y> {
+                override val size: Int = x.size
+                override val x: Buffer<X> = x
+                override val y: Buffer<Y> = y
+            }
+        }
     }
 }
 
+
 /**
  * Represent a [ColumnarData] as an [XYColumnarData]. The presence or respective columns is checked on creation.
  */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
index 7199de888..8ddd6406f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
@@ -5,15 +5,13 @@
 
 package space.kscience.kmath.data
 
-import space.kscience.kmath.data.XYErrorColumnarData.Companion
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 
 
 /**
- * A [ColumnarData] with additional [Companion.yErr] column for an [Symbol.y] error
+ * A [ColumnarData] with additional [Symbol.yError] column for an [Symbol.y] error
  * Inherits [XYColumnarData].
  */
 @UnstableKMathAPI
@@ -23,11 +21,24 @@ public interface XYErrorColumnarData<T, out X : T, out Y : T> : XYColumnarData<T
     override fun get(symbol: Symbol): Buffer<T> = when (symbol) {
         Symbol.x -> x
         Symbol.y -> y
-        Companion.yErr -> yErr
+        Symbol.yError -> yErr
         else -> error("A column for symbol $symbol not found")
     }
 
-    public companion object{
-        public val yErr: Symbol by symbol
+    public companion object {
+        public fun <T, X : T, Y : T> of(
+            x: Buffer<X>, y: Buffer<Y>, yErr: Buffer<Y>
+        ): XYErrorColumnarData<T, X, Y> {
+            require(x.size == y.size) { "Buffer size mismatch. x buffer size is ${x.size}, y buffer size is ${y.size}" }
+            require(y.size == yErr.size) { "Buffer size mismatch. y buffer size is ${x.size}, yErr buffer size is ${y.size}" }
+
+            return object : XYErrorColumnarData<T, X, Y> {
+                override val size: Int = x.size
+                override val x: Buffer<X> = x
+                override val y: Buffer<Y> = y
+                override val yErr: Buffer<Y> = yErr
+            }
+        }
     }
-}
\ No newline at end of file
+}
+
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
index 5105c2bec..e94cb98eb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
@@ -68,6 +68,7 @@ public interface ExpressionAlgebra<in T, E> : Algebra<E> {
 /**
  * Bind a symbol by name inside the [ExpressionAlgebra]
  */
-public fun <T, E> ExpressionAlgebra<T, E>.binding(): ReadOnlyProperty<Any?, E> = ReadOnlyProperty { _, property ->
-    bindSymbol(property.name) ?: error("A variable with name ${property.name} does not exist")
-}
+public val <T, E> ExpressionAlgebra<T, E>.binding: ReadOnlyProperty<Any?, E>
+    get() = ReadOnlyProperty { _, property ->
+        bindSymbol(property.name) ?: error("A variable with name ${property.name} does not exist")
+    }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
index ede4a779c..6b17dfca5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
@@ -7,13 +7,18 @@ package space.kscience.kmath.expressions
 
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.asIterable
 import space.kscience.kmath.structures.indices
+import kotlin.jvm.JvmName
 
 /**
  * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic
  * differentiation.
+ *
+ * **WARNING** All elements of [yErr] must be positive.
  */
-public fun <T : Any, I : Any, A> AutoDiffProcessor<T, I, A>.chiSquaredExpression(
+@JvmName("genericChiSquaredExpression")
+public fun <T : Comparable<T>, I : Any, A> AutoDiffProcessor<T, I, A>.chiSquaredExpression(
     x: Buffer<T>,
     y: Buffer<T>,
     yErr: Buffer<T>,
@@ -35,4 +40,14 @@ public fun <T : Any, I : Any, A> AutoDiffProcessor<T, I, A>.chiSquaredExpression
 
         sum
     }
+}
+
+public fun <I : Any, A> AutoDiffProcessor<Double, I, A>.chiSquaredExpression(
+    x: Buffer<Double>,
+    y: Buffer<Double>,
+    yErr: Buffer<Double>,
+    model: A.(I) -> I,
+): DifferentiableExpression<Double> where A : ExtendedField<I>, A : ExpressionAlgebra<Double, I> {
+    require(yErr.asIterable().all { it > 0.0 }) { "All errors must be strictly positive" }
+    return chiSquaredExpression<Double, I, A>(x, y, yErr, model)
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
index be1c8380c..29b7caec6 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.misc
 
+import kotlin.jvm.JvmInline
 import kotlin.reflect.KClass
 
 /**
@@ -29,7 +30,8 @@ public interface Feature<F : Feature<F>> {
 /**
  * A container for a set of features
  */
-public class FeatureSet<F : Feature<F>> private constructor(public val features: Map<FeatureKey<F>, F>) : Featured<F> {
+@JvmInline
+public value class FeatureSet<F : Feature<F>> private constructor(public val features: Map<FeatureKey<F>, F>) : Featured<F> {
     @Suppress("UNCHECKED_CAST")
     override fun <T : F> getFeature(type: FeatureKey<T>): T? = features[type]?.let { it as T }
 
@@ -48,6 +50,9 @@ public class FeatureSet<F : Feature<F>> private constructor(public val features:
 
     public operator fun iterator(): Iterator<F> = features.values.iterator()
 
+    override fun toString(): String = features.values.joinToString(prefix = "[ ", postfix = " ]")
+
+
     public companion object {
         public fun <F : Feature<F>> of(vararg features: F): FeatureSet<F> = FeatureSet(features.associateBy { it.key })
         public fun <F : Feature<F>> of(features: Iterable<F>): FeatureSet<F> =
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/logging.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/logging.kt
index d13840841..9dfc564c3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/logging.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/logging.kt
@@ -5,10 +5,18 @@
 
 package space.kscience.kmath.misc
 
-public interface Loggable {
-    public fun log(tag: String = INFO, block: () -> String)
+import space.kscience.kmath.misc.Loggable.Companion.INFO
+
+public fun interface Loggable {
+    public fun log(tag: String, block: () -> String)
 
     public companion object {
         public const val INFO: String = "INFO"
+
+        public val console: Loggable = Loggable { tag, block ->
+            println("[$tag] ${block()}")
+        }
     }
-}
\ No newline at end of file
+}
+
+public fun Loggable.log(block: () -> String): Unit = log(INFO, block)
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
index 4d1b00b3d..80c5943cf 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
@@ -16,7 +16,7 @@ class ExpressionFieldTest {
     @Test
     fun testExpression() {
         val expression = with(FunctionalExpressionField(DoubleField)) {
-            val x by binding()
+            val x by binding
             x * x + 2 * x + one
         }
 
@@ -27,7 +27,7 @@ class ExpressionFieldTest {
     @Test
     fun separateContext() {
         fun <T> FunctionalExpressionField<T, *>.expression(): Expression<T> {
-            val x by binding()
+            val x by binding
             return x * x + 2 * x + one
         }
 
@@ -38,7 +38,7 @@ class ExpressionFieldTest {
     @Test
     fun valueExpression() {
         val expressionBuilder: FunctionalExpressionField<Double, *>.() -> Expression<Double> = {
-            val x by binding()
+            val x by binding
             x * x + 2 * x + one
         }
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index 9b938394a..9785d7744 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -73,7 +73,8 @@ public class GaussIntegrator<T : Any>(
 }
 
 /**
- * Create a Gauss-Legendre integrator for this field.
+ * Create a Gauss integrator for this field. By default, uses Legendre rule to compute points and weights.
+ * Custom rules could be provided by [GaussIntegratorRuleFactory] feature.
  * @see [GaussIntegrator]
  */
 public val <T : Any> Field<T>.gaussIntegrator: GaussIntegrator<T> get() = GaussIntegrator(this)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
index f4a0abd5d..b13adefa5 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
@@ -42,20 +42,20 @@ public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolatePolynomials(
     x: Buffer<T>,
     y: Buffer<T>,
 ): PiecewisePolynomial<T> {
-    val pointSet = XYColumnarData(x, y)
+    val pointSet = XYColumnarData.of(x, y)
     return interpolatePolynomials(pointSet)
 }
 
 public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolatePolynomials(
     data: Map<T, T>,
 ): PiecewisePolynomial<T> {
-    val pointSet = XYColumnarData(data.keys.toList().asBuffer(), data.values.toList().asBuffer())
+    val pointSet = XYColumnarData.of(data.keys.toList().asBuffer(), data.values.toList().asBuffer())
     return interpolatePolynomials(pointSet)
 }
 
 public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolatePolynomials(
     data: List<Pair<T, T>>,
 ): PiecewisePolynomial<T> {
-    val pointSet = XYColumnarData(data.map { it.first }.asBuffer(), data.map { it.second }.asBuffer())
+    val pointSet = XYColumnarData.of(data.map { it.first }.asBuffer(), data.map { it.second }.asBuffer())
     return interpolatePolynomials(pointSet)
 }
diff --git a/kmath-optimization/build.gradle.kts b/kmath-optimization/build.gradle.kts
new file mode 100644
index 000000000..ca013b2f4
--- /dev/null
+++ b/kmath-optimization/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    id("ru.mipt.npm.gradle.mpp")
+    id("ru.mipt.npm.gradle.native")
+}
+
+kscience {
+    useAtomic()
+}
+
+kotlin.sourceSets {
+    commonMain {
+        dependencies {
+            api(project(":kmath-coroutines"))
+        }
+    }
+}
+
+readme {
+    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
similarity index 65%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
rename to kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
index 1af6c4bda..02602b068 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
@@ -5,13 +5,11 @@
 
 package space.kscience.kmath.optimization
 
-import space.kscience.kmath.expressions.*
+import space.kscience.kmath.expressions.DifferentiableExpression
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.FeatureSet
-import space.kscience.kmath.operations.ExtendedField
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.indices
 
-public class OptimizationValue<T>(public val value: T) : OptimizationFeature{
+public class OptimizationValue<T>(public val value: T) : OptimizationFeature {
     override fun toString(): String = "Value($value)"
 }
 
@@ -23,9 +21,28 @@ public enum class FunctionOptimizationTarget : OptimizationFeature {
 public class FunctionOptimization<T>(
     override val features: FeatureSet<OptimizationFeature>,
     public val expression: DifferentiableExpression<T>,
-) : OptimizationProblem<T>{
+) : OptimizationProblem<T> {
 
-    public companion object
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || this::class != other::class) return false
+
+        other as FunctionOptimization<*>
+
+        if (features != other.features) return false
+        if (expression != other.expression) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = features.hashCode()
+        result = 31 * result + expression.hashCode()
+        return result
+    }
+
+    override fun toString(): String = "FunctionOptimization(features=$features)"
 }
 
 public fun <T> FunctionOptimization<T>.withFeatures(
@@ -47,7 +64,7 @@ public suspend fun <T : Any> DifferentiableExpression<T>.optimizeWith(
     return optimizer.optimize(problem)
 }
 
-public val <T> FunctionOptimization<T>.resultValueOrNull:T?
+public val <T> FunctionOptimization<T>.resultValueOrNull: T?
     get() = getFeature<OptimizationResult<T>>()?.point?.let { expression(it) }
 
 public val <T> FunctionOptimization<T>.resultValue: T
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
similarity index 94%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
rename to kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
index 7d52ae26e..10a25c029 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
@@ -72,15 +72,15 @@ public suspend fun <T> DifferentiableExpression<T>.optimizeWith(
 public class XYOptimizationBuilder(
     public val data: XYColumnarData<Double, Double, Double>,
     public val model: DifferentiableExpression<Double>,
-) : OptimizationBuilder<Double, XYOptimization>() {
+) : OptimizationBuilder<Double, XYFit>() {
 
     public var pointToCurveDistance: PointToCurveDistance = PointToCurveDistance.byY
     public var pointWeight: PointWeight = PointWeight.byYSigma
 
-    override fun build(): XYOptimization = XYOptimization(
-        FeatureSet.of(features),
+    override fun build(): XYFit = XYFit(
         data,
         model,
+        FeatureSet.of(features),
         pointToCurveDistance,
         pointWeight
     )
@@ -90,4 +90,4 @@ public fun XYOptimization(
     data: XYColumnarData<Double, Double, Double>,
     model: DifferentiableExpression<Double>,
     builder: XYOptimizationBuilder.() -> Unit,
-): XYOptimization = XYOptimizationBuilder(data, model).apply(builder).build()
\ No newline at end of file
+): XYFit = XYOptimizationBuilder(data, model).apply(builder).build()
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
rename to kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt
similarity index 100%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt
rename to kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
similarity index 77%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
rename to kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
index 365c58952..f0969d2f6 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
@@ -11,6 +11,7 @@ import space.kscience.kmath.expressions.SymbolIndexer
 import space.kscience.kmath.expressions.derivative
 import space.kscience.kmath.linear.*
 import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.misc.log
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.DoubleL2Norm
@@ -21,14 +22,14 @@ import space.kscience.kmath.structures.DoubleL2Norm
  * See [the article](http://arxiv.org/abs/physics/0604127).
  */
 @UnstableKMathAPI
-public class QowOptimizer : Optimizer<Double, XYOptimization> {
+public object QowOptimizer : Optimizer<Double, XYFit> {
 
     private val linearSpace: LinearSpace<Double, DoubleField> = LinearSpace.double
     private val solver: LinearSolver<Double> = linearSpace.lupSolver()
 
     @OptIn(UnstableKMathAPI::class)
-    private inner class QoWeight(
-        val problem: XYOptimization,
+    private class QoWeight(
+        val problem: XYFit,
         val parameters: Map<Symbol, Double>,
     ) : Map<Symbol, Double> by parameters, SymbolIndexer {
         override val symbols: List<Symbol> = parameters.keys.toList()
@@ -39,8 +40,8 @@ public class QowOptimizer : Optimizer<Double, XYOptimization> {
          * Derivatives of the spectrum over parameters. First index in the point number, second one - index of parameter
          */
         val derivs: Matrix<Double> by lazy {
-            linearSpace.buildMatrix(problem.data.size, symbols.size) { i, k ->
-                problem.distance(i).derivative(symbols[k])(parameters)
+            linearSpace.buildMatrix(problem.data.size, symbols.size) { d, s ->
+                problem.distance(d).derivative(symbols[s])(parameters)
             }
         }
 
@@ -48,25 +49,27 @@ public class QowOptimizer : Optimizer<Double, XYOptimization> {
          * Array of dispersions in each point
          */
         val dispersion: Point<Double> by lazy {
-            DoubleBuffer(problem.data.size) { i ->
-                problem.weight(i).invoke(parameters)
+            DoubleBuffer(problem.data.size) { d ->
+                problem.weight(d).invoke(parameters)
             }
         }
 
         val prior: DifferentiableExpression<Double>? get() = problem.getFeature<OptimizationPrior<Double>>()
+
+        override fun toString(): String  = parameters.toString()
     }
 
     /**
-     * The signed distance from the model to the [i]-th point of data.
+     * The signed distance from the model to the [d]-th point of data.
      */
-    private fun QoWeight.distance(i: Int, parameters: Map<Symbol, Double>): Double = problem.distance(i)(parameters)
+    private fun QoWeight.distance(d: Int, parameters: Map<Symbol, Double>): Double = problem.distance(d)(parameters)
 
 
     /**
      * The derivative of [distance]
      */
-    private fun QoWeight.distanceDerivative(symbol: Symbol, i: Int, parameters: Map<Symbol, Double>): Double =
-        problem.distance(i).derivative(symbol)(parameters)
+    private fun QoWeight.distanceDerivative(symbol: Symbol, d: Int, parameters: Map<Symbol, Double>): Double =
+        problem.distance(d).derivative(symbol)(parameters)
 
     /**
      * Теоретическая ковариация весовых функций.
@@ -74,8 +77,8 @@ public class QowOptimizer : Optimizer<Double, XYOptimization> {
      * D(\phi)=E(\phi_k(\theta_0) \phi_l(\theta_0))= disDeriv_k * disDeriv_l /sigma^2
      */
     private fun QoWeight.covarF(): Matrix<Double> =
-        linearSpace.matrix(size, size).symmetric { k, l ->
-            (0 until data.size).sumOf { i -> derivs[k, i] * derivs[l, i] / dispersion[i] }
+        linearSpace.matrix(size, size).symmetric { s1, s2 ->
+            (0 until data.size).sumOf { d -> derivs[d, s1] * derivs[d, s2] / dispersion[d] }
         }
 
     /**
@@ -89,12 +92,12 @@ public class QowOptimizer : Optimizer<Double, XYOptimization> {
              * количество вызывов функции будет dim^2 вместо dim Первый индекс -
              * номер точки, второй - номер переменной, по которой берется производная
              */
-            val eqvalues = linearSpace.buildMatrix(data.size, size) { i, l ->
-                distance(i, theta) * derivs[l, i] / dispersion[i]
+            val eqvalues = linearSpace.buildMatrix(data.size, size) { d, s ->
+                distance(d, theta) * derivs[d, s] / dispersion[d]
             }
 
-            buildMatrix(size, size) { k, l ->
-                (0 until data.size).sumOf { i -> eqvalues[i, l] * eqvalues[i, k] }
+            buildMatrix(size, size) { s1, s2 ->
+                (0 until data.size).sumOf { d -> eqvalues[d, s2] * eqvalues[d, s1] }
             }
         }
 
@@ -106,20 +109,20 @@ public class QowOptimizer : Optimizer<Double, XYOptimization> {
     ): Matrix<Double> = with(linearSpace) {
         //Возвращает производную k-того Eq по l-тому параметру
         //val res = Array(fitDim) { DoubleArray(fitDim) }
-        val sderiv = buildMatrix(data.size, size) { i, l ->
-            distanceDerivative(symbols[l], i, theta)
+        val sderiv = buildMatrix(data.size, size) { d, s ->
+            distanceDerivative(symbols[s], d, theta)
         }
 
-        buildMatrix(size, size) { k, l ->
-            val base = (0 until data.size).sumOf { i ->
-                require(dispersion[i] > 0)
-                sderiv[i, l] * derivs[k, i] / dispersion[i]
+        buildMatrix(size, size) { s1, s2 ->
+            val base = (0 until data.size).sumOf { d ->
+                require(dispersion[d] > 0)
+                sderiv[d, s2] * derivs[d, s1] / dispersion[d]
             }
             prior?.let { prior ->
                 //Check if this one is correct
                 val pi = prior(theta)
-                val deriv1 = prior.derivative(symbols[k])(theta)
-                val deriv2 = prior.derivative(symbols[l])(theta)
+                val deriv1 = prior.derivative(symbols[s1])(theta)
+                val deriv2 = prior.derivative(symbols[s2])(theta)
                 base + deriv1 * deriv2 / pi / pi
             } ?: base
         }
@@ -130,13 +133,13 @@ public class QowOptimizer : Optimizer<Double, XYOptimization> {
      * Значения уравнений метода квазиоптимальных весов
      */
     private fun QoWeight.getEqValues(theta: Map<Symbol, Double> = this): Point<Double> {
-        val distances = DoubleBuffer(data.size) { i -> distance(i, theta) }
+        val distances = DoubleBuffer(data.size) { d -> distance(d, theta) }
 
-        return DoubleBuffer(size) { k ->
-            val base = (0 until data.size).sumOf { i -> distances[i] * derivs[k, i] / dispersion[i] }
+        return DoubleBuffer(size) { s ->
+            val base = (0 until data.size).sumOf { d -> distances[d] * derivs[d, s] / dispersion[d] }
             //Поправка на априорную вероятность
             prior?.let { prior ->
-                base - prior.derivative(symbols[k])(theta) / prior(theta)
+                base - prior.derivative(symbols[s])(theta) / prior(theta)
             } ?: base
         }
     }
@@ -163,15 +166,15 @@ public class QowOptimizer : Optimizer<Double, XYOptimization> {
 
         val logger = problem.getFeature<OptimizationLog>()
 
-        var dis: Double//норма невязки
-        // Для удобства работаем всегда с полным набором параметров
+        var dis: Double //discrepancy value
+        // Working with the full set of parameters
         var par = problem.startPoint
 
         logger?.log { "Starting newtonian iteration from: \n\t$par" }
 
-        var eqvalues = getEqValues(par)//значения функций
+        var eqvalues = getEqValues(par) //Values of the weight functions
 
-        dis = DoubleL2Norm.norm(eqvalues)// невязка
+        dis = DoubleL2Norm.norm(eqvalues) // discrepancy
         logger?.log { "Starting discrepancy is $dis" }
         var i = 0
         var flag = false
@@ -238,7 +241,8 @@ public class QowOptimizer : Optimizer<Double, XYOptimization> {
         return covar
     }
 
-    override suspend fun optimize(problem: XYOptimization): XYOptimization {
+    override suspend fun optimize(problem: XYFit): XYFit {
+        val qowSteps = 2
         val initialWeight = QoWeight(problem, problem.startPoint)
         val res = initialWeight.newtonianRun()
         return res.problem.withFeature(OptimizationResult(res.parameters))
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
new file mode 100644
index 000000000..cbd765923
--- /dev/null
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+@file:OptIn(UnstableKMathAPI::class)
+
+package space.kscience.kmath.optimization
+
+import space.kscience.kmath.data.XYColumnarData
+import space.kscience.kmath.expressions.*
+import space.kscience.kmath.misc.FeatureSet
+import space.kscience.kmath.misc.Loggable
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.ExtendedField
+import space.kscience.kmath.operations.bindSymbol
+import kotlin.math.pow
+
+/**
+ * Specify the way to compute distance from point to the curve as DifferentiableExpression
+ */
+public interface PointToCurveDistance : OptimizationFeature {
+    public fun distance(problem: XYFit, index: Int): DifferentiableExpression<Double>
+
+    public companion object {
+        public val byY: PointToCurveDistance = object : PointToCurveDistance {
+            override fun distance(problem: XYFit, index: Int): DifferentiableExpression<Double> {
+                val x = problem.data.x[index]
+                val y = problem.data.y[index]
+
+                return object : DifferentiableExpression<Double> {
+                    override fun derivativeOrNull(
+                        symbols: List<Symbol>
+                    ): Expression<Double>? = problem.model.derivativeOrNull(symbols)?.let { derivExpression ->
+                        Expression { arguments ->
+                            derivExpression.invoke(arguments + (Symbol.x to x))
+                        }
+                    }
+
+                    override fun invoke(arguments: Map<Symbol, Double>): Double =
+                        problem.model(arguments + (Symbol.x to x)) - y
+                }
+            }
+
+            override fun toString(): String = "PointToCurveDistanceByY"
+        }
+    }
+}
+
+/**
+ * Compute a wight of the point. The more the weight, the more impact this point will have on the fit.
+ * By default, uses Dispersion^-1
+ */
+public interface PointWeight : OptimizationFeature {
+    public fun weight(problem: XYFit, index: Int): DifferentiableExpression<Double>
+
+    public companion object {
+        public fun bySigma(sigmaSymbol: Symbol): PointWeight = object : PointWeight {
+            override fun weight(problem: XYFit, index: Int): DifferentiableExpression<Double> =
+                object : DifferentiableExpression<Double> {
+                    override fun invoke(arguments: Map<Symbol, Double>): Double {
+                        return problem.data[sigmaSymbol]?.get(index)?.pow(-2) ?: 1.0
+                    }
+
+                    override fun derivativeOrNull(symbols: List<Symbol>): Expression<Double> = Expression { 0.0 }
+                }
+
+            override fun toString(): String = "PointWeightBySigma($sigmaSymbol)"
+
+        }
+
+        public val byYSigma: PointWeight = bySigma(Symbol.yError)
+    }
+}
+
+/**
+ * A fit problem for X-Y-Yerr data. Also known as "least-squares" problem.
+ */
+public class XYFit(
+    public val data: XYColumnarData<Double, Double, Double>,
+    public val model: DifferentiableExpression<Double>,
+    override val features: FeatureSet<OptimizationFeature>,
+    internal val pointToCurveDistance: PointToCurveDistance = PointToCurveDistance.byY,
+    internal val pointWeight: PointWeight = PointWeight.byYSigma,
+) : OptimizationProblem<Double> {
+    public fun distance(index: Int): DifferentiableExpression<Double> = pointToCurveDistance.distance(this, index)
+
+    public fun weight(index: Int): DifferentiableExpression<Double> = pointWeight.weight(this, index)
+}
+
+public fun XYFit.withFeature(vararg features: OptimizationFeature): XYFit {
+    return XYFit(data, model, this.features.with(*features), pointToCurveDistance, pointWeight)
+}
+
+/**
+ * Fit given dta with
+ */
+public suspend fun <I : Any, A> XYColumnarData<Double, Double, Double>.fitWith(
+    optimizer: Optimizer<Double, XYFit>,
+    processor: AutoDiffProcessor<Double, I, A>,
+    startingPoint: Map<Symbol, Double>,
+    vararg features: OptimizationFeature = emptyArray(),
+    xSymbol: Symbol = Symbol.x,
+    pointToCurveDistance: PointToCurveDistance = PointToCurveDistance.byY,
+    pointWeight: PointWeight = PointWeight.byYSigma,
+    model: A.(I) -> I
+): XYFit where A : ExtendedField<I>, A : ExpressionAlgebra<Double, I> {
+    val modelExpression = processor.differentiate {
+        val x = bindSymbol(xSymbol)
+        model(x)
+    }
+
+    var actualFeatures = FeatureSet.of(*features, OptimizationStartPoint(startingPoint))
+
+    if (actualFeatures.getFeature<OptimizationLog>() == null) {
+        actualFeatures = actualFeatures.with(OptimizationLog(Loggable.console))
+    }
+    val problem = XYFit(
+        this,
+        modelExpression,
+        actualFeatures,
+        pointToCurveDistance,
+        pointWeight
+    )
+    return optimizer.optimize(problem)
+}
\ No newline at end of file
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt
new file mode 100644
index 000000000..6701887a2
--- /dev/null
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.optimization
+
+import space.kscience.kmath.data.XYColumnarData
+import space.kscience.kmath.data.indices
+import space.kscience.kmath.expressions.DifferentiableExpression
+import space.kscience.kmath.expressions.Expression
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.derivative
+import space.kscience.kmath.misc.UnstableKMathAPI
+import kotlin.math.PI
+import kotlin.math.ln
+import kotlin.math.pow
+import kotlin.math.sqrt
+
+
+private val oneOver2Pi = 1.0 / sqrt(2 * PI)
+
+@UnstableKMathAPI
+internal fun XYFit.logLikelihood(): DifferentiableExpression<Double> = object : DifferentiableExpression<Double> {
+    override fun derivativeOrNull(symbols: List<Symbol>): Expression<Double> = Expression { arguments ->
+        data.indices.sumOf { index ->
+            val d = distance(index)(arguments)
+            val weight = weight(index)(arguments)
+            val weightDerivative = weight(index)(arguments)
+
+            //  -1 / (sqrt(2 PI) * sigma) + 2 (x-mu)/ 2 sigma^2 * d mu/ d theta - (x-mu)^2 / 2 * d w/ d theta
+            return@sumOf -oneOver2Pi * sqrt(weight) + //offset derivative
+                    d * model.derivative(symbols)(arguments) * weight - //model derivative
+                    d.pow(2) * weightDerivative / 2 //weight derivative
+        }
+    }
+
+    override fun invoke(arguments: Map<Symbol, Double>): Double {
+        return data.indices.sumOf { index ->
+            val d = distance(index)(arguments)
+            val weight = weight(index)(arguments)
+            //1/sqrt(2 PI sigma^2) - (x-mu)^2/ (2 * sigma^2)
+            oneOver2Pi * ln(weight) - d.pow(2) * weight
+        } / 2
+    }
+
+}
+
+/**
+ * Optimize given XY (least squares) [problem] using this function [Optimizer].
+ * The problem is treated as maximum likelihood problem and is done via maximizing logarithmic likelihood, respecting
+ * possible weight dependency on the model and parameters.
+ */
+@UnstableKMathAPI
+public suspend fun Optimizer<Double, FunctionOptimization<Double>>.maximumLogLikelihood(problem: XYFit): XYFit {
+    val functionOptimization = FunctionOptimization(problem.features, problem.logLikelihood())
+    val result = optimize(functionOptimization.withFeatures(FunctionOptimizationTarget.MAXIMIZE))
+    return XYFit(problem.data, problem.model, result.features)
+}
+
+@UnstableKMathAPI
+public suspend fun Optimizer<Double, FunctionOptimization<Double>>.maximumLogLikelihood(
+    data: XYColumnarData<Double, Double, Double>,
+    model: DifferentiableExpression<Double>,
+    builder: XYOptimizationBuilder.() -> Unit,
+): XYFit = maximumLogLikelihood(XYOptimization(data, model, builder))
diff --git a/kmath-stat/build.gradle.kts b/kmath-stat/build.gradle.kts
index e3e396b6f..41a1666f8 100644
--- a/kmath-stat/build.gradle.kts
+++ b/kmath-stat/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-    kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.mpp")
     id("ru.mipt.npm.gradle.native")
 }
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt
deleted file mode 100644
index 68c0c77eb..000000000
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/optimization/XYOptimization.kt
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-@file:OptIn(UnstableKMathAPI::class)
-
-package space.kscience.kmath.optimization
-
-import space.kscience.kmath.data.XYColumnarData
-import space.kscience.kmath.data.indices
-import space.kscience.kmath.expressions.DifferentiableExpression
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.expressions.derivative
-import space.kscience.kmath.misc.FeatureSet
-import space.kscience.kmath.misc.UnstableKMathAPI
-import kotlin.math.PI
-import kotlin.math.ln
-import kotlin.math.pow
-import kotlin.math.sqrt
-
-/**
- * Specify the way to compute distance from point to the curve as DifferentiableExpression
- */
-public interface PointToCurveDistance : OptimizationFeature {
-    public fun distance(problem: XYOptimization, index: Int): DifferentiableExpression<Double>
-
-    public companion object {
-        public val byY: PointToCurveDistance = object : PointToCurveDistance {
-            override fun distance(problem: XYOptimization, index: Int): DifferentiableExpression<Double> {
-
-                val x = problem.data.x[index]
-                val y = problem.data.y[index]
-                return object : DifferentiableExpression<Double> {
-                    override fun derivativeOrNull(symbols: List<Symbol>): Expression<Double>? =
-                        problem.model.derivativeOrNull(symbols)
-
-                    override fun invoke(arguments: Map<Symbol, Double>): Double =
-                        problem.model(arguments + (Symbol.x to x)) - y
-                }
-            }
-
-            override fun toString(): String = "PointToCurveDistanceByY"
-        }
-    }
-}
-
-/**
- * Compute a wight of the point. The more the weight, the more impact this point will have on the fit.
- * By default uses Dispersion^-1
- */
-public interface PointWeight : OptimizationFeature {
-    public fun weight(problem: XYOptimization, index: Int): DifferentiableExpression<Double>
-
-    public companion object {
-        public fun bySigma(sigmaSymbol: Symbol): PointWeight = object : PointWeight {
-            override fun weight(problem: XYOptimization, index: Int): DifferentiableExpression<Double> =
-                object : DifferentiableExpression<Double> {
-                    override fun invoke(arguments: Map<Symbol, Double>): Double {
-                        return problem.data[sigmaSymbol]?.get(index)?.pow(-2) ?: 1.0
-                    }
-
-                    override fun derivativeOrNull(symbols: List<Symbol>): Expression<Double> = Expression { 0.0 }
-                }
-
-            override fun toString(): String = "PointWeightBySigma($sigmaSymbol)"
-
-        }
-
-        public val byYSigma: PointWeight = bySigma(Symbol.yError)
-    }
-}
-
-/**
- * An optimization for XY data.
- */
-public class XYOptimization(
-    override val features: FeatureSet<OptimizationFeature>,
-    public val data: XYColumnarData<Double, Double, Double>,
-    public val model: DifferentiableExpression<Double>,
-    internal val pointToCurveDistance: PointToCurveDistance = PointToCurveDistance.byY,
-    internal val pointWeight: PointWeight = PointWeight.byYSigma,
-) : OptimizationProblem<Double> {
-    public fun distance(index: Int): DifferentiableExpression<Double> = pointToCurveDistance.distance(this, index)
-
-    public fun weight(index: Int): DifferentiableExpression<Double> = pointWeight.weight(this, index)
-}
-
-public fun XYOptimization.withFeature(vararg features: OptimizationFeature): XYOptimization {
-    return XYOptimization(this.features.with(*features), data, model, pointToCurveDistance, pointWeight)
-}
-
-private val oneOver2Pi = 1.0 / sqrt(2 * PI)
-
-internal fun XYOptimization.likelihood(): DifferentiableExpression<Double> = object : DifferentiableExpression<Double> {
-    override fun derivativeOrNull(symbols: List<Symbol>): Expression<Double> = Expression { arguments ->
-        data.indices.sumOf { index ->
-
-            val d = distance(index)(arguments)
-            val weight = weight(index)(arguments)
-            val weightDerivative = weight(index)(arguments)
-
-            //  -1 / (sqrt(2 PI) * sigma) + 2 (x-mu)/ 2 sigma^2 * d mu/ d theta - (x-mu)^2 / 2 * d w/ d theta
-            return@sumOf -oneOver2Pi * sqrt(weight) + //offset derivative
-                    d * model.derivative(symbols)(arguments) * weight - //model derivative
-                    d.pow(2) * weightDerivative / 2 //weight derivative
-        }
-    }
-
-    override fun invoke(arguments: Map<Symbol, Double>): Double {
-        return data.indices.sumOf { index ->
-            val d = distance(index)(arguments)
-            val weight = weight(index)(arguments)
-            //1/sqrt(2 PI sigma^2) - (x-mu)^2/ (2 * sigma^2)
-            oneOver2Pi * ln(weight) - d.pow(2) * weight
-        } / 2
-    }
-
-}
-
-/**
- * Optimize given XY (least squares) [problem] using this function [Optimizer].
- * The problem is treated as maximum likelihood problem and is done via maximizing logarithmic likelihood, respecting
- * possible weight dependency on the model and parameters.
- */
-public suspend fun Optimizer<Double, FunctionOptimization<Double>>.maximumLogLikelihood(problem: XYOptimization): XYOptimization {
-    val functionOptimization = FunctionOptimization(problem.features, problem.likelihood())
-    val result = optimize(functionOptimization.withFeatures(FunctionOptimizationTarget.MAXIMIZE))
-    return XYOptimization(result.features, problem.data, problem.model)
-}
-
-public suspend fun Optimizer<Double, FunctionOptimization<Double>>.maximumLogLikelihood(
-    data: XYColumnarData<Double, Double, Double>,
-    model: DifferentiableExpression<Double>,
-    builder: XYOptimizationBuilder.() -> Unit,
-): XYOptimization = maximumLogLikelihood(XYOptimization(data, model, builder))
-
-//public suspend fun XYColumnarData<Double, Double, Double>.fitWith(
-//    optimizer: XYOptimization,
-//    problemBuilder: XYOptimizationBuilder.() -> Unit = {},
-//
-//)
-
-
-//
-//@UnstableKMathAPI
-//public interface XYFit<T> : OptimizationProblem {
-//
-//    public val algebra: Field<T>
-//
-//    /**
-//     * Set X-Y data for this fit optionally including x and y errors
-//     */
-//    public fun data(
-//        dataSet: ColumnarData<T>,
-//        xSymbol: Symbol,
-//        ySymbol: Symbol,
-//        xErrSymbol: Symbol? = null,
-//        yErrSymbol: Symbol? = null,
-//    )
-//
-//    public fun model(model: (T) -> DifferentiableExpression<T, *>)
-//
-//    /**
-//     * Set the differentiable model for this fit
-//     */
-//    public fun <I : Any, A> model(
-//        autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
-//        modelFunction: A.(I) -> I,
-//    ): Unit where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> = model { arg ->
-//        autoDiff.process { modelFunction(const(arg)) }
-//    }
-//}
-
-//
-///**
-// * Define a chi-squared-based objective function
-// */
-//public fun <T : Any, I : Any, A> FunctionOptimization<T>.chiSquared(
-//    autoDiff: AutoDiffProcessor<T, I, A, Expression<T>>,
-//    x: Buffer<T>,
-//    y: Buffer<T>,
-//    yErr: Buffer<T>,
-//    model: A.(I) -> I,
-//) where A : ExtendedField<I>, A : ExpressionAlgebra<T, I> {
-//    val chiSquared = FunctionOptimization.chiSquared(autoDiff, x, y, yErr, model)
-//    function(chiSquared)
-//    maximize = false
-//}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f05092bb1..d1cbbe74c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,6 +26,7 @@ include(
     ":kmath-histograms",
     ":kmath-commons",
     ":kmath-viktor",
+    ":kmath-optimization",
     ":kmath-stat",
     ":kmath-nd4j",
     ":kmath-dimensions",
-- 
2.34.1


From 8d33d6beabf859a75317d087dd4adf70051b6c1a Mon Sep 17 00:00:00 2001
From: darksnake <altavir@gmail.com>
Date: Mon, 16 Aug 2021 16:40:56 +0300
Subject: [PATCH 317/713] Fixed QOW optimization

---
 .../kotlin/space/kscience/kmath/fit/qowFit.kt | 11 +++++----
 .../kmath/optimization/QowOptimizer.kt        |  2 +-
 .../kscience/kmath/optimization/XYFit.kt      | 23 ++++++++++++++++++-
 .../kmath/optimization/logLikelihood.kt       |  2 +-
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
index 944f80697..04764d763 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
@@ -14,6 +14,7 @@ import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.binding
 import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.optimization.QowOptimizer
+import space.kscience.kmath.optimization.chiSquaredOrNull
 import space.kscience.kmath.optimization.fitWith
 import space.kscience.kmath.optimization.resultPoint
 import space.kscience.kmath.real.map
@@ -50,7 +51,7 @@ suspend fun main() {
 
     //Perform an operation on each x value (much more effective, than numpy)
     val y = x.map { it ->
-        val value = it.pow(2) + it + 100
+        val value = it.pow(2) + it + 1
         value + chain.next() * sqrt(value)
     }
     // this will also work, but less effective:
@@ -63,7 +64,7 @@ suspend fun main() {
     val result = XYErrorColumnarData.of(x, y, yErr).fitWith(
         QowOptimizer,
         DSProcessor,
-        mapOf(a to 1.0, b to 1.2, c to 99.0)
+        mapOf(a to 0.9, b to 1.2, c to 2.0)
     ) { arg ->
         //bind variables to autodiff context
         val a by binding
@@ -96,9 +97,9 @@ suspend fun main() {
         h3 {
             +"Fit result: ${result.resultPoint}"
         }
-//        h3 {
-//            +"Chi2/dof = ${result.resultValue / (x.size - 3)}"
-//        }
+        h3 {
+            +"Chi2/dof = ${result.chiSquaredOrNull!! / (x.size - 3)}"
+        }
     }
 
     page.makeFile()
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
index f0969d2f6..4fe8520da 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
@@ -50,7 +50,7 @@ public object QowOptimizer : Optimizer<Double, XYFit> {
          */
         val dispersion: Point<Double> by lazy {
             DoubleBuffer(problem.data.size) { d ->
-                problem.weight(d).invoke(parameters)
+                1.0/problem.weight(d).invoke(parameters)
             }
         }
 
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
index cbd765923..07fea3126 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
@@ -7,6 +7,7 @@
 package space.kscience.kmath.optimization
 
 import space.kscience.kmath.data.XYColumnarData
+import space.kscience.kmath.data.indices
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.misc.FeatureSet
 import space.kscience.kmath.misc.Loggable
@@ -81,6 +82,7 @@ public class XYFit(
     override val features: FeatureSet<OptimizationFeature>,
     internal val pointToCurveDistance: PointToCurveDistance = PointToCurveDistance.byY,
     internal val pointWeight: PointWeight = PointWeight.byYSigma,
+    public val xSymbol: Symbol = Symbol.x,
 ) : OptimizationProblem<Double> {
     public fun distance(index: Int): DifferentiableExpression<Double> = pointToCurveDistance.distance(this, index)
 
@@ -119,7 +121,26 @@ public suspend fun <I : Any, A> XYColumnarData<Double, Double, Double>.fitWith(
         modelExpression,
         actualFeatures,
         pointToCurveDistance,
-        pointWeight
+        pointWeight,
+        xSymbol
     )
     return optimizer.optimize(problem)
+}
+
+/**
+ * Compute chi squared value for completed fit. Return null for incomplete fit
+ */
+public val XYFit.chiSquaredOrNull: Double? get() {
+    val result = resultPointOrNull ?: return null
+
+    return data.indices.sumOf { index->
+
+        val x = data.x[index]
+        val y = data.y[index]
+        val yErr = data[Symbol.yError]?.get(index) ?: 1.0
+
+        val mu = model.invoke(result + (xSymbol to x) )
+
+        ((y - mu)/yErr).pow(2)
+    }
 }
\ No newline at end of file
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt
index 6701887a2..b4cb2f1cf 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt
@@ -26,7 +26,7 @@ internal fun XYFit.logLikelihood(): DifferentiableExpression<Double> = object :
         data.indices.sumOf { index ->
             val d = distance(index)(arguments)
             val weight = weight(index)(arguments)
-            val weightDerivative = weight(index)(arguments)
+            val weightDerivative = weight(index).derivative(symbols)(arguments)
 
             //  -1 / (sqrt(2 PI) * sigma) + 2 (x-mu)/ 2 sigma^2 * d mu/ d theta - (x-mu)^2 / 2 * d w/ d theta
             return@sumOf -oneOver2Pi * sqrt(weight) + //offset derivative
-- 
2.34.1


From 9023098090d16ea8131d1f1bd179169a2b72d2b3 Mon Sep 17 00:00:00 2001
From: Veniamin Viflyantsev <knok16@gmail.com>
Date: Tue, 17 Aug 2021 13:59:59 +0300
Subject: [PATCH 318/713] implementation of geometry projections of vectors to
 a line/plane

---
 .../kmath/geometry/Euclidean2DSpace.kt        |  8 +-
 .../kmath/geometry/Euclidean3DSpace.kt        |  8 +-
 .../kscience/kmath/geometry/Projections.kt    | 20 +++++
 .../kmath/geometry/Euclidean2DSpaceTest.kt    | 62 ++++++++++++++
 .../kmath/geometry/Euclidean3DSpaceTest.kt    | 74 +++++++++++++++++
 .../kmath/geometry/ProjectionAlongTest.kt     | 60 ++++++++++++++
 .../kmath/geometry/ProjectionOntoLineTest.kt  | 82 +++++++++++++++++++
 .../kscience/kmath/geometry/Vector2DTest.kt   | 36 ++++++++
 .../kscience/kmath/geometry/Vector3DTest.kt   | 41 ++++++++++
 .../kscience/kmath/geometry/testUtils.kt      | 41 ++++++++++
 10 files changed, 424 insertions(+), 8 deletions(-)
 create mode 100644 kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt
 create mode 100644 kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
 create mode 100644 kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
 create mode 100644 kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
 create mode 100644 kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
 create mode 100644 kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
 create mode 100644 kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
 create mode 100644 kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
index 252e2fcd5..e8b1ce95b 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
@@ -12,14 +12,14 @@ import space.kscience.kmath.operations.invoke
 import kotlin.math.sqrt
 
 @OptIn(UnstableKMathAPI::class)
-public interface Vector2D : Point<Double>, Vector{
+public interface Vector2D : Point<Double>, Vector {
     public val x: Double
     public val y: Double
     override val size: Int get() = 2
 
     override operator fun get(index: Int): Double = when (index) {
-        1 -> x
-        2 -> y
+        0 -> x
+        1 -> y
         else -> error("Accessing outside of point bounds")
     }
 
@@ -27,7 +27,7 @@ public interface Vector2D : Point<Double>, Vector{
 }
 
 public val Vector2D.r: Double
-    get() = Euclidean2DSpace { sqrt(norm()) }
+    get() = Euclidean2DSpace { norm() }
 
 @Suppress("FunctionName")
 public fun Vector2D(x: Double, y: Double): Vector2D = Vector2DImpl(x, y)
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index b0b2d2079..d567bee9a 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -19,9 +19,9 @@ public interface Vector3D : Point<Double>, Vector {
     override val size: Int get() = 3
 
     override operator fun get(index: Int): Double = when (index) {
-        1 -> x
-        2 -> y
-        3 -> z
+        0 -> x
+        1 -> y
+        2 -> z
         else -> error("Accessing outside of point bounds")
     }
 
@@ -31,7 +31,7 @@ public interface Vector3D : Point<Double>, Vector {
 @Suppress("FunctionName")
 public fun Vector3D(x: Double, y: Double, z: Double): Vector3D = Vector3DImpl(x, y, z)
 
-public val Vector3D.r: Double get() = Euclidean3DSpace { sqrt(norm()) }
+public val Vector3D.r: Double get() = Euclidean3DSpace { norm() }
 
 private data class Vector3DImpl(
     override val x: Double,
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt
new file mode 100644
index 000000000..d13ef03a1
--- /dev/null
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt
@@ -0,0 +1,20 @@
+package space.kscience.kmath.geometry
+
+/**
+ * Project vector to a line
+ * @param vector to project
+ * @param line line to which vector should be projected
+ */
+public fun <V : Vector> GeometrySpace<V>.projectToLine(vector: V, line: Line<V>): V = with(line) {
+    base + (direction dot (vector - base)) / (direction dot direction) * direction
+}
+
+/**
+ * Project vector to a hyper-plane, which is defined by a normal and base
+ * In 2d case it is projection to a line, in 3d case it is projection to a plane
+ * @param vector to project
+ * @param normal normal (perpendicular) vector to a hyper-plane to which vector should be projected
+ * @param base point belonging to a hyper-plane to which vector should be projected
+ */
+public fun <V : Vector> GeometrySpace<V>.projectAlong(vector: V, normal: V, base: V): V =
+    vector + normal * ((base - vector) dot normal) / (normal dot normal)
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
new file mode 100644
index 000000000..6d5ae9948
--- /dev/null
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
@@ -0,0 +1,62 @@
+package space.kscience.kmath.geometry
+
+import kotlin.math.sqrt
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+internal class Euclidean2DSpaceTest {
+    @Test
+    fun getZero() {
+        assertVectorEquals(Vector2D(0.0, 0.0), Euclidean2DSpace.zero)
+    }
+
+    @Test
+    fun norm() {
+        with(Euclidean2DSpace) {
+            assertEquals(0.0, zero.norm())
+            assertEquals(1.0, Vector2D(1.0, 0.0).norm())
+            assertEquals(sqrt(2.0), Vector2D(1.0, 1.0).norm())
+            assertEquals(sqrt(5.002001), Vector2D(-2.0, 1.001).norm())
+        }
+    }
+
+    @Test
+    fun dotProduct() {
+        with(Euclidean2DSpace) {
+            assertEquals(0.0, zero dot zero)
+            assertEquals(0.0, zero dot Vector2D(1.0, 0.0))
+            assertEquals(0.0, Vector2D(-2.0, 0.001) dot zero)
+            assertEquals(0.0, Vector2D(1.0, 0.0) dot Vector2D(0.0, 1.0))
+
+            assertEquals(1.0, Vector2D(1.0, 0.0) dot Vector2D(1.0, 0.0))
+            assertEquals(-2.0, Vector2D(0.0, 1.0) dot Vector2D(1.0, -2.0))
+            assertEquals(2.0, Vector2D(1.0, 1.0) dot Vector2D(1.0, 1.0))
+            assertEquals(4.001001, Vector2D(-2.0, 1.001) dot Vector2D(-2.0, 0.001))
+
+            assertEquals(-4.998, Vector2D(1.0, 2.0) dot Vector2D(-5.0, 0.001))
+        }
+    }
+
+    @Test
+    fun add() {
+        with(Euclidean2DSpace) {
+            assertVectorEquals(
+                Vector2D(-2.0, 0.001),
+                Vector2D(-2.0, 0.001) + zero
+            )
+            assertVectorEquals(
+                Vector2D(-3.0, 3.001),
+                Vector2D(2.0, 3.0) + Vector2D(-5.0, 0.001)
+            )
+        }
+    }
+
+    @Test
+    fun multiply() {
+        with(Euclidean2DSpace) {
+            assertVectorEquals(Vector2D(-4.0, 0.0), Vector2D(-2.0, 0.0) * 2)
+            assertVectorEquals(Vector2D(4.0, 0.0), Vector2D(-2.0, 0.0) * -2)
+            assertVectorEquals(Vector2D(300.0, 0.0003), Vector2D(100.0, 0.0001) * 3)
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
new file mode 100644
index 000000000..9cce44c65
--- /dev/null
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
@@ -0,0 +1,74 @@
+package space.kscience.kmath.geometry
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+internal class Euclidean3DSpaceTest {
+    @Test
+    fun getZero() {
+        assertVectorEquals(Vector3D(0.0, 0.0, 0.0), Euclidean3DSpace.zero)
+    }
+
+    @Test
+    fun distance() {
+        with(Euclidean3DSpace) {
+            assertEquals(0.0, zero.distanceTo(zero))
+            assertEquals(1.0, zero.distanceTo(Vector3D(1.0, 0.0, 0.0)))
+            assertEquals(kotlin.math.sqrt(5.000001), Vector3D(1.0, -2.0, 0.001).distanceTo(zero))
+            assertEquals(0.0, Vector3D(1.0, -2.0, 0.001).distanceTo(Vector3D(1.0, -2.0, 0.001)))
+            assertEquals(0.0, Vector3D(1.0, 0.0, 0.0).distanceTo(Vector3D(1.0, 0.0, 0.0)))
+            assertEquals(kotlin.math.sqrt(2.0), Vector3D(1.0, 0.0, 0.0).distanceTo(Vector3D(1.0, 1.0, 1.0)))
+            assertEquals(3.1622778182822584, Vector3D(0.0, 1.0, 0.0).distanceTo(Vector3D(1.0, -2.0, 0.001)))
+            assertEquals(0.0, Vector3D(1.0, -2.0, 0.001).distanceTo(Vector3D(1.0, -2.0, 0.001)))
+            assertEquals(9.695050335093676, Vector3D(1.0, 2.0, 3.0).distanceTo(Vector3D(7.0, -5.0, 0.001)))
+        }
+    }
+
+    @Test
+    fun norm() {
+        with(Euclidean3DSpace) {
+            assertEquals(0.0, zero.norm())
+            assertEquals(1.0, Vector3D(1.0, 0.0, 0.0).norm())
+            assertEquals(kotlin.math.sqrt(3.0), Vector3D(1.0, 1.0, 1.0).norm())
+            assertEquals(kotlin.math.sqrt(5.000001), Vector3D(1.0, -2.0, 0.001).norm())
+        }
+    }
+
+    @Test
+    fun dotProduct() {
+        with(Euclidean3DSpace) {
+            assertEquals(0.0, zero dot zero)
+            assertEquals(0.0, zero dot Vector3D(1.0, 0.0, 0.0))
+            assertEquals(0.0, Vector3D(1.0, -2.0, 0.001) dot zero)
+
+            assertEquals(1.0, Vector3D(1.0, 0.0, 0.0) dot Vector3D(1.0, 0.0, 0.0))
+            assertEquals(1.0, Vector3D(1.0, 0.0, 0.0) dot Vector3D(1.0, 1.0, 1.0))
+            assertEquals(-2.0, Vector3D(0.0, 1.0, 0.0) dot Vector3D(1.0, -2.0, 0.001))
+            assertEquals(3.0, Vector3D(1.0, 1.0, 1.0) dot Vector3D(1.0, 1.0, 1.0))
+            assertEquals(5.000001, Vector3D(1.0, -2.0, 0.001) dot Vector3D(1.0, -2.0, 0.001))
+
+            assertEquals(-2.997, Vector3D(1.0, 2.0, 3.0) dot Vector3D(7.0, -5.0, 0.001))
+        }
+    }
+
+    @Test
+    fun add() {
+        with(Euclidean3DSpace) {
+            assertVectorEquals(
+                Vector3D(1.0, -2.0, 0.001),
+                Vector3D(1.0, -2.0, 0.001) + zero
+            )
+            assertVectorEquals(
+                Vector3D(8.0, -3.0, 3.001),
+                Vector3D(1.0, 2.0, 3.0) + Vector3D(7.0, -5.0, 0.001)
+            )
+        }
+    }
+
+    @Test
+    fun multiply() {
+        with(Euclidean3DSpace) {
+            assertVectorEquals(Vector3D(2.0, -4.0, 0.0), Vector3D(1.0, -2.0, 0.0) * 2)
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
new file mode 100644
index 000000000..cc940035f
--- /dev/null
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
@@ -0,0 +1,60 @@
+package space.kscience.kmath.geometry
+
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+internal class ProjectionAlongTest {
+    @Test
+    fun projectionIntoYEqualsX() {
+        with(Euclidean2DSpace) {
+            val normal = Vector2D(-2.0, 2.0)
+            val base = Vector2D(2.3, 2.3)
+
+            assertVectorEquals(zero, projectAlong(zero, normal, base))
+
+            grid(-10.0..10.0, -10.0..10.0, 0.15).forEach { (x, y) ->
+                val d = (y - x) / 2.0
+                assertVectorEquals(Vector2D(x + d, y - d), projectAlong(Vector2D(x, y), normal, base))
+            }
+        }
+    }
+
+    @Test
+    fun projectionOntoLine() {
+        with(Euclidean2DSpace) {
+            val a = 5.0
+            val b = -3.0
+            val c = -15.0
+            val normal = Vector2D(-5.0, 3.0)
+            val base = Vector2D(3.0, 0.0)
+
+            grid(-10.0..10.0, -10.0..10.0, 0.15).forEach { (x, y) ->
+                val xProj = (b * (b * x - a * y) - a * c) / (a * a + b * b)
+                val yProj = (a * (-b * x + a * y) - b * c) / (a * a + b * b)
+                assertVectorEquals(Vector2D(xProj, yProj), projectAlong(Vector2D(x, y), normal, base))
+            }
+        }
+    }
+
+    @Test
+    fun projectOntoPlane() {
+        val normal = Vector3D(1.0, 3.5, 0.07)
+        val base = Vector3D(2.0, -0.0037, 11.1111)
+
+        with(Euclidean3DSpace) {
+            for (x in (-10.0..10.0).generateList(0.15)) {
+                for (y in (-10.0..10.0).generateList(0.15)) {
+                    for (z in (-10.0..10.0).generateList(0.15)) {
+                        val v = Vector3D(x, y, z)
+                        val result = projectAlong(v, normal, base)
+
+                        // assert that result is on plane
+                        assertTrue(isOrthogonal(result - base, normal))
+                        // assert that PV vector is collinear to normal vector
+                        assertTrue(isCollinear(v - result, normal))
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
new file mode 100644
index 000000000..1190b156d
--- /dev/null
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
@@ -0,0 +1,82 @@
+package space.kscience.kmath.geometry
+
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+internal class ProjectionOntoLineTest {
+    @Test
+    fun projectionIntoOx() {
+        with(Euclidean2DSpace) {
+            val ox = Line(zero, Vector2D(1.0, 0.0))
+
+            grid(-10.0..10.0, -10.0..10.0, 0.15).forEach { (x, y) ->
+                assertVectorEquals(Vector2D(x, 0.0), projectToLine(Vector2D(x, y), ox))
+            }
+        }
+    }
+
+    @Test
+    fun projectionIntoOy() {
+        with(Euclidean2DSpace) {
+            val line = Line(zero, Vector2D(0.0, 1.0))
+
+            grid(-10.0..10.0, -10.0..10.0, 0.15).forEach { (x, y) ->
+                assertVectorEquals(Vector2D(0.0, y), projectToLine(Vector2D(x, y), line))
+            }
+        }
+    }
+
+    @Test
+    fun projectionIntoYEqualsX() {
+        with(Euclidean2DSpace) {
+            val line = Line(zero, Vector2D(1.0, 1.0))
+
+            assertVectorEquals(zero, projectToLine(zero, line))
+
+            grid(-10.0..10.0, -10.0..10.0, 0.15).forEach { (x, y) ->
+                val d = (y - x) / 2.0
+                assertVectorEquals(Vector2D(x + d, y - d), projectToLine(Vector2D(x, y), line))
+            }
+        }
+    }
+
+    @Test
+    fun projectionOntoLine2d() {
+        with(Euclidean2DSpace) {
+            val a = 5.0
+            val b = -3.0
+            val c = -15.0
+            val line = Line(Vector2D(3.0, 0.0), Vector2D(3.0, 5.0))
+
+            grid(-10.0..10.0, -10.0..10.0, 0.15).forEach { (x, y) ->
+                val xProj = (b * (b * x - a * y) - a * c) / (a * a + b * b)
+                val yProj = (a * (-b * x + a * y) - b * c) / (a * a + b * b)
+                assertVectorEquals(Vector2D(xProj, yProj), projectToLine(Vector2D(x, y), line))
+            }
+        }
+    }
+
+    @Test
+    fun projectionOntoLine3d() {
+        val line = Line3D(
+            base = Vector3D(1.0, 3.5, 0.07),
+            direction = Vector3D(2.0, -0.0037, 11.1111)
+        )
+
+        with(Euclidean3DSpace) {
+            for (x in (-10.0..10.0).generateList(0.15)) {
+                for (y in (-10.0..10.0).generateList(0.15)) {
+                    for (z in (-10.0..10.0).generateList(0.15)) {
+                        val v = Vector3D(x, y, z)
+                        val result = projectToLine(v, line)
+
+                        // assert that result is on line
+                        assertTrue(isCollinear(result - line.base, line.direction))
+                        // assert that PV vector is orthogonal to direction vector
+                        assertTrue(isOrthogonal(v - result, line.direction))
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
new file mode 100644
index 000000000..647004f43
--- /dev/null
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
@@ -0,0 +1,36 @@
+package space.kscience.kmath.geometry
+
+import space.kscience.kmath.structures.asSequence
+import space.kscience.kmath.structures.toList
+import kotlin.test.assertEquals
+import kotlin.test.Test
+
+internal class Vector2DTest {
+    private val vector = Vector2D(1.0, -7.999)
+
+    @Test
+    fun getSize() {
+        assertEquals(2, vector.size)
+    }
+
+    @Test
+    fun get() {
+        assertEquals(1.0, vector[0])
+        assertEquals(-7.999, vector[1])
+    }
+
+    @Test
+    operator fun iterator() {
+        assertEquals(listOf(1.0, -7.999), vector.toList())
+    }
+
+    @Test
+    fun getX() {
+        assertEquals(1.0, vector.x)
+    }
+
+    @Test
+    fun getY() {
+        assertEquals(-7.999, vector.y)
+    }
+}
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
new file mode 100644
index 000000000..83271160f
--- /dev/null
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
@@ -0,0 +1,41 @@
+package space.kscience.kmath.geometry
+
+import space.kscience.kmath.structures.toList
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+internal class Vector3DTest {
+    private val vector = Vector3D(1.0, -7.999, 0.001)
+
+    @Test
+    fun getSize() {
+        assertEquals(3, vector.size)
+    }
+
+    @Test
+    fun get() {
+        assertEquals(1.0, vector[0])
+        assertEquals(-7.999, vector[1])
+        assertEquals(0.001, vector[2])
+    }
+
+    @Test
+    operator fun iterator() {
+        assertEquals(listOf(1.0, -7.999, 0.001), vector.toList())
+    }
+
+    @Test
+    fun getX() {
+        assertEquals(1.0, vector.x)
+    }
+
+    @Test
+    fun getY() {
+        assertEquals(-7.999, vector.y)
+    }
+
+    @Test
+    fun getZ() {
+        assertEquals(0.001, vector.z)
+    }
+}
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
new file mode 100644
index 000000000..773d6d90c
--- /dev/null
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
@@ -0,0 +1,41 @@
+package space.kscience.kmath.geometry
+
+import kotlin.math.abs
+import kotlin.test.assertEquals
+
+fun ClosedRange<Double>.generateList(step: Double): List<Double> = generateSequence(start) { previous ->
+    if (previous == Double.POSITIVE_INFINITY) return@generateSequence null
+    val next = previous + step
+    if (next > endInclusive) null else next
+}.toList()
+
+fun grid(
+    xRange: ClosedRange<Double>,
+    yRange: ClosedRange<Double>,
+    step: Double
+): List<Pair<Double, Double>> {
+    val xs = xRange.generateList(step)
+    val ys = yRange.generateList(step)
+
+    return xs.flatMap { x -> ys.map { y -> x to y } }
+}
+
+fun assertVectorEquals(expected: Vector2D, actual: Vector2D, eps: Double = 1e-6) {
+    assertEquals(expected.x, actual.x, eps)
+    assertEquals(expected.y, actual.y, eps)
+}
+
+fun assertVectorEquals(expected: Vector3D, actual: Vector3D, eps: Double = 1e-6) {
+    assertEquals(expected.x, actual.x, eps)
+    assertEquals(expected.y, actual.y, eps)
+    assertEquals(expected.z, actual.z, eps)
+}
+
+fun <V : Vector> GeometrySpace<V>.isCollinear(a: V, b: V, eps: Double = 1e-6): Boolean {
+    val aDist = a.distanceTo(zero)
+    val bDist = b.distanceTo(zero)
+    return abs(aDist) < eps || abs(bDist) < eps || abs(abs((a dot b) / (aDist * bDist)) - 1) < eps
+}
+
+fun <V : Vector> GeometrySpace<V>.isOrthogonal(a: V, b: V, eps: Double = 1e-6): Boolean =
+    abs(a dot b) < eps
-- 
2.34.1


From b74bc320159c8cc1124058773d07b73a0b015cb7 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Mon, 16 Aug 2021 13:24:45 +0300
Subject: [PATCH 319/713] Ignore TestExecutionTime suite to reduce build time

---
 .../space/kscience/kmath/ast/TestExecutionTime.kt    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
index 2433f6316..f8c429d5a 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
@@ -11,19 +11,21 @@ import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
 import kotlin.math.sin
 import kotlin.random.Random
+import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.time.measureTime
 import space.kscience.kmath.estree.compileToExpression as estreeCompileToExpression
 import space.kscience.kmath.wasm.compileToExpression as wasmCompileToExpression
 
 // TODO move to benchmarks when https://github.com/Kotlin/kotlinx-benchmark/pull/38 or similar feature is merged
+@Ignore
 internal class TestExecutionTime {
     private companion object {
         private const val times = 1_000_000
         private val x by symbol
         private val algebra = DoubleField
 
-        private val functional = DoubleField.expressionInExtendedField {
+        private val functional = algebra.expressionInExtendedField {
             bindSymbol(x) * const(2.0) + const(2.0) / bindSymbol(x) - const(16.0) / sin(bindSymbol(x))
         }
 
@@ -31,9 +33,9 @@ internal class TestExecutionTime {
             x * number(2.0) + number(2.0) / x - number(16.0) / sin(x)
         }
 
-        private val mst = node.toExpression(DoubleField)
-        private val wasm = node.wasmCompileToExpression(DoubleField)
-        private val estree = node.estreeCompileToExpression(DoubleField)
+        private val mst = node.toExpression(algebra)
+        private val wasm = node.wasmCompileToExpression(algebra)
+        private val estree = node.estreeCompileToExpression(algebra)
 
         // In JavaScript, the expression below is implemented like
         //   _no_name_provided__125.prototype.invoke_178 = function (args) {
@@ -44,7 +46,7 @@ internal class TestExecutionTime {
 
         private val raw = Expression<Double> { args ->
             val x = args[x]!!
-            x * 2.0 + 2.0 / x - 16.0 / sin(x)
+            algebra { x * 2.0 + 2.0 / x - 16.0 / sin(x) }
         }
 
         private val justCalculate = { args: dynamic ->
-- 
2.34.1


From ca6955beb557f662da2f77578dc6c95cdddfd015 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 17 Aug 2021 21:38:54 +0700
Subject: [PATCH 320/713] Fix copyright in ejmlCodegen.kt

---
 .../kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
index 1d2aaeaaf..68bb10428 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
@@ -362,7 +362,7 @@ fun ejmlCodegen(outputFile: String): Unit = File(outputFile).run {
     writer().use {
         it.appendLine("/*")
         it.appendLine(" * Copyright 2018-2021 KMath contributors.")
-        it.appendLine(" * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.")
+        it.appendLine(" * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.")
         it.appendLine(" */")
         it.appendLine()
         it.appendLine("/* This file is generated with buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt */")
-- 
2.34.1


From 603db46eb848e1ac3d1c7015bfe25f74fc78f3e2 Mon Sep 17 00:00:00 2001
From: Veniamin Viflyantsev <knok16@gmail.com>
Date: Tue, 17 Aug 2021 21:10:26 +0300
Subject: [PATCH 321/713] increased test timeouts in geometry project

---
 kmath-geometry/build.gradle.kts                    | 14 ++++++++++++++
 .../kscience/kmath/geometry/ProjectionAlongTest.kt |  7 ++++---
 .../kmath/geometry/ProjectionOntoLineTest.kt       |  7 ++++---
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/kmath-geometry/build.gradle.kts b/kmath-geometry/build.gradle.kts
index 7eb814683..653d113a6 100644
--- a/kmath-geometry/build.gradle.kts
+++ b/kmath-geometry/build.gradle.kts
@@ -4,6 +4,20 @@ plugins {
     id("ru.mipt.npm.gradle.native")
 }
 
+kotlin.js {
+    nodejs {
+        testTask {
+            useMocha().timeout = "5000"
+        }
+    }
+
+    browser {
+        testTask {
+            useMocha().timeout = "5000"
+        }
+    }
+}
+
 kotlin.sourceSets.commonMain {
     dependencies {
         api(project(":kmath-core"))
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
index cc940035f..78ce98dc4 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
@@ -42,9 +42,10 @@ internal class ProjectionAlongTest {
         val base = Vector3D(2.0, -0.0037, 11.1111)
 
         with(Euclidean3DSpace) {
-            for (x in (-10.0..10.0).generateList(0.15)) {
-                for (y in (-10.0..10.0).generateList(0.15)) {
-                    for (z in (-10.0..10.0).generateList(0.15)) {
+            val testDomain = (-10.0..10.0).generateList(0.15)
+            for (x in testDomain) {
+                for (y in testDomain) {
+                    for (z in testDomain) {
                         val v = Vector3D(x, y, z)
                         val result = projectAlong(v, normal, base)
 
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
index 1190b156d..ec74ff59b 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
@@ -64,9 +64,10 @@ internal class ProjectionOntoLineTest {
         )
 
         with(Euclidean3DSpace) {
-            for (x in (-10.0..10.0).generateList(0.15)) {
-                for (y in (-10.0..10.0).generateList(0.15)) {
-                    for (z in (-10.0..10.0).generateList(0.15)) {
+            val testDomain = (-10.0..10.0).generateList(0.15)
+            for (x in testDomain) {
+                for (y in testDomain) {
+                    for (z in testDomain) {
                         val v = Vector3D(x, y, z)
                         val result = projectToLine(v, line)
 
-- 
2.34.1


From f271ded526ca5c3dcc07a0afed900a60ca181299 Mon Sep 17 00:00:00 2001
From: Ven <knok16@gmail.com>
Date: Tue, 17 Aug 2021 21:17:02 +0300
Subject: [PATCH 322/713] Apply suggestions from code review

Co-authored-by: Iaroslav Postovalov <38042667+CommanderTvis@users.noreply.github.com>
---
 .../kscience/kmath/geometry/Projections.kt    |  6 ++---
 .../kmath/geometry/Euclidean2DSpaceTest.kt    |  4 ++--
 .../kmath/geometry/Euclidean3DSpaceTest.kt    |  4 ++--
 .../kmath/geometry/ProjectionAlongTest.kt     |  2 +-
 .../kmath/geometry/ProjectionOntoLineTest.kt  |  2 +-
 .../kscience/kmath/geometry/Vector2DTest.kt   | 10 ++++-----
 .../kscience/kmath/geometry/Vector3DTest.kt   | 12 +++++-----
 .../kscience/kmath/geometry/testUtils.kt      | 22 +++++++++----------
 8 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt
index d13ef03a1..205bc17e7 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt
@@ -1,7 +1,7 @@
 package space.kscience.kmath.geometry
 
 /**
- * Project vector to a line
+ * Project vector onto a line.
  * @param vector to project
  * @param line line to which vector should be projected
  */
@@ -10,8 +10,8 @@ public fun <V : Vector> GeometrySpace<V>.projectToLine(vector: V, line: Line<V>)
 }
 
 /**
- * Project vector to a hyper-plane, which is defined by a normal and base
- * In 2d case it is projection to a line, in 3d case it is projection to a plane
+ * Project vector onto a hyperplane, which is defined by a normal and base.
+ * In 2D case it is the projection to a line, in 3d case it is the one to a plane.
  * @param vector to project
  * @param normal normal (perpendicular) vector to a hyper-plane to which vector should be projected
  * @param base point belonging to a hyper-plane to which vector should be projected
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
index 6d5ae9948..5913b2fa9 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
@@ -6,7 +6,7 @@ import kotlin.test.assertEquals
 
 internal class Euclidean2DSpaceTest {
     @Test
-    fun getZero() {
+    fun zero() {
         assertVectorEquals(Vector2D(0.0, 0.0), Euclidean2DSpace.zero)
     }
 
@@ -59,4 +59,4 @@ internal class Euclidean2DSpaceTest {
             assertVectorEquals(Vector2D(300.0, 0.0003), Vector2D(100.0, 0.0001) * 3)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
index 9cce44c65..2c74cbd27 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
@@ -5,7 +5,7 @@ import kotlin.test.assertEquals
 
 internal class Euclidean3DSpaceTest {
     @Test
-    fun getZero() {
+    fun zero() {
         assertVectorEquals(Vector3D(0.0, 0.0, 0.0), Euclidean3DSpace.zero)
     }
 
@@ -71,4 +71,4 @@ internal class Euclidean3DSpaceTest {
             assertVectorEquals(Vector3D(2.0, -4.0, 0.0), Vector3D(1.0, -2.0, 0.0) * 2)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
index 78ce98dc4..65291ee4e 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
@@ -58,4 +58,4 @@ internal class ProjectionAlongTest {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
index ec74ff59b..0f74e1efb 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
@@ -80,4 +80,4 @@ internal class ProjectionOntoLineTest {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
index 647004f43..84b1f4fd6 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
@@ -9,7 +9,7 @@ internal class Vector2DTest {
     private val vector = Vector2D(1.0, -7.999)
 
     @Test
-    fun getSize() {
+    fun size() {
         assertEquals(2, vector.size)
     }
 
@@ -20,17 +20,17 @@ internal class Vector2DTest {
     }
 
     @Test
-    operator fun iterator() {
+    fun iterator() {
         assertEquals(listOf(1.0, -7.999), vector.toList())
     }
 
     @Test
-    fun getX() {
+    fun x() {
         assertEquals(1.0, vector.x)
     }
 
     @Test
-    fun getY() {
+    fun y() {
         assertEquals(-7.999, vector.y)
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
index 83271160f..717e78871 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
@@ -8,7 +8,7 @@ internal class Vector3DTest {
     private val vector = Vector3D(1.0, -7.999, 0.001)
 
     @Test
-    fun getSize() {
+    fun size() {
         assertEquals(3, vector.size)
     }
 
@@ -20,22 +20,22 @@ internal class Vector3DTest {
     }
 
     @Test
-    operator fun iterator() {
+    fun iterator() {
         assertEquals(listOf(1.0, -7.999, 0.001), vector.toList())
     }
 
     @Test
-    fun getX() {
+    fun x() {
         assertEquals(1.0, vector.x)
     }
 
     @Test
-    fun getY() {
+    fun y() {
         assertEquals(-7.999, vector.y)
     }
 
     @Test
-    fun getZ() {
+    fun z() {
         assertEquals(0.001, vector.z)
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
index 773d6d90c..1277c0130 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
@@ -20,22 +20,22 @@ fun grid(
     return xs.flatMap { x -> ys.map { y -> x to y } }
 }
 
-fun assertVectorEquals(expected: Vector2D, actual: Vector2D, eps: Double = 1e-6) {
-    assertEquals(expected.x, actual.x, eps)
-    assertEquals(expected.y, actual.y, eps)
+fun assertVectorEquals(expected: Vector2D, actual: Vector2D, absoluteTolerance: Double = 1e-6) {
+    assertEquals(expected.x, actual.x, absoluteTolerance)
+    assertEquals(expected.y, actual.y, absoluteTolerance)
 }
 
-fun assertVectorEquals(expected: Vector3D, actual: Vector3D, eps: Double = 1e-6) {
-    assertEquals(expected.x, actual.x, eps)
-    assertEquals(expected.y, actual.y, eps)
-    assertEquals(expected.z, actual.z, eps)
+fun assertVectorEquals(expected: Vector3D, actual: Vector3D, absoluteTolerance: Double = 1e-6) {
+    assertEquals(expected.x, actual.x, absoluteTolerance)
+    assertEquals(expected.y, actual.y, absoluteTolerance)
+    assertEquals(expected.z, actual.z, absoluteTolerance)
 }
 
-fun <V : Vector> GeometrySpace<V>.isCollinear(a: V, b: V, eps: Double = 1e-6): Boolean {
+fun <V : Vector> GeometrySpace<V>.isCollinear(a: V, b: V, absoluteTolerance: Double = 1e-6): Boolean {
     val aDist = a.distanceTo(zero)
     val bDist = b.distanceTo(zero)
-    return abs(aDist) < eps || abs(bDist) < eps || abs(abs((a dot b) / (aDist * bDist)) - 1) < eps
+    return abs(aDist) < absoluteTolerance || abs(bDist) < absoluteTolerance || abs(abs((a dot b) / (aDist * bDist)) - 1) < absoluteTolerance
 }
 
-fun <V : Vector> GeometrySpace<V>.isOrthogonal(a: V, b: V, eps: Double = 1e-6): Boolean =
-    abs(a dot b) < eps
+fun <V : Vector> GeometrySpace<V>.isOrthogonal(a: V, b: V, absoluteTolerance: Double = 1e-6): Boolean =
+    abs(a dot b) < absoluteTolerance
-- 
2.34.1


From 47ac2dd0a9959072c1e9cc19e78cc88d99f1c68f Mon Sep 17 00:00:00 2001
From: Veniamin Viflyantsev <knok16@gmail.com>
Date: Tue, 17 Aug 2021 23:47:52 +0300
Subject: [PATCH 323/713] returned back test timeouts, decrease number of cases
 that tests check to make it faster

---
 kmath-geometry/build.gradle.kts                    | 14 --------------
 .../kscience/kmath/geometry/ProjectionAlongTest.kt |  2 +-
 .../kmath/geometry/ProjectionOntoLineTest.kt       |  2 +-
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/kmath-geometry/build.gradle.kts b/kmath-geometry/build.gradle.kts
index 653d113a6..7eb814683 100644
--- a/kmath-geometry/build.gradle.kts
+++ b/kmath-geometry/build.gradle.kts
@@ -4,20 +4,6 @@ plugins {
     id("ru.mipt.npm.gradle.native")
 }
 
-kotlin.js {
-    nodejs {
-        testTask {
-            useMocha().timeout = "5000"
-        }
-    }
-
-    browser {
-        testTask {
-            useMocha().timeout = "5000"
-        }
-    }
-}
-
 kotlin.sourceSets.commonMain {
     dependencies {
         api(project(":kmath-core"))
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
index 65291ee4e..55fc39aad 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
@@ -42,7 +42,7 @@ internal class ProjectionAlongTest {
         val base = Vector3D(2.0, -0.0037, 11.1111)
 
         with(Euclidean3DSpace) {
-            val testDomain = (-10.0..10.0).generateList(0.15)
+            val testDomain = (-10.0..10.0).generateList(0.43)
             for (x in testDomain) {
                 for (y in testDomain) {
                     for (z in testDomain) {
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
index 0f74e1efb..ab6ef3628 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
@@ -64,7 +64,7 @@ internal class ProjectionOntoLineTest {
         )
 
         with(Euclidean3DSpace) {
-            val testDomain = (-10.0..10.0).generateList(0.15)
+            val testDomain = (-10.0..10.0).generateList(0.43)
             for (x in testDomain) {
                 for (y in testDomain) {
                     for (z in testDomain) {
-- 
2.34.1


From 3c6b068c395c64adead8f8248798dae5038e9a2f Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 18 Aug 2021 20:33:53 +0700
Subject: [PATCH 324/713] Avoid using kapt in kmath-jupyter

---
 .../src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
index 05e2dc0da..d7438bf0f 100644
--- a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -31,7 +31,6 @@ import space.kscience.kmath.structures.asSequence
  */
 public fun Number.toMst(): MST.Numeric = MST.Numeric(this)
 
-@JupyterLibrary
 internal class KMathJupyter : JupyterIntegration() {
     private val mathRender = FeaturedMathRendererWithPostProcess.Default
     private val syntaxRender = MathMLSyntaxRenderer
-- 
2.34.1


From 0b90dd4df25a34f48b7446341d64ad85534b2281 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Thu, 19 Aug 2021 03:24:54 +0700
Subject: [PATCH 325/713] Fix #408

---
 .../kmath/samplers/ZigguratNormalizedGaussianSampler.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
index 2d5750bc7..bda6f9819 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
@@ -59,7 +59,7 @@ public object ZigguratNormalizedGaussianSampler : NormalizedGaussianSampler {
 
     private fun sampleOne(generator: RandomGenerator): Double {
         val j = generator.nextLong()
-        val i = (j and LAST.toLong()).toIntExact()
+        val i = (j and LAST.toLong()).toInt()
         return if (abs(j) < K[i]) j * W[i] else fix(generator, j, i)
     }
 
-- 
2.34.1


From 7e0820d861763535e5c163215feb6d3f3bb86432 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sat, 21 Aug 2021 19:58:06 +0700
Subject: [PATCH 326/713] Add debug property for dumping classes generated with
 ASM

---
 .../kscience/kmath/asm/internal/AsmBuilder.kt   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
index de7da30df..418d6141b 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
@@ -14,9 +14,11 @@ import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
 import java.lang.invoke.MethodHandles
 import java.lang.invoke.MethodType
+import java.nio.file.Paths
 import java.util.stream.Collectors.toMap
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
+import kotlin.io.path.writeBytes
 
 /**
  * ASM Builder is a structure that abstracts building a class designated to unwrap [MST] to plain Java expression.
@@ -194,15 +196,18 @@ internal class AsmBuilder<T>(
             visitEnd()
         }
 
-        val cls = classLoader.defineClass(className, classWriter.toByteArray())
-        // java.io.File("dump.class").writeBytes(classWriter.toByteArray())
+        val binary = classWriter.toByteArray()
+        val cls = classLoader.defineClass(className, binary)
+
+        if (System.getProperty("space.kscience.communicator.prettyapi.dump.generated.classes") == "1")
+            Paths.get("$className.class").writeBytes(binary)
+
         val l = MethodHandles.publicLookup()
 
-        if (hasConstants)
-            l.findConstructor(cls, MethodType.methodType(Void.TYPE, Array<Any>::class.java))
-                .invoke(constants.toTypedArray()) as Expression<T>
+        (if (hasConstants)
+            l.findConstructor(cls, MethodType.methodType(Void.TYPE, Array<Any>::class.java))(constants.toTypedArray())
         else
-            l.findConstructor(cls, MethodType.methodType(Void.TYPE)).invoke() as Expression<T>
+            l.findConstructor(cls, MethodType.methodType(Void.TYPE))()) as Expression<T>
     }
 
     /**
-- 
2.34.1


From 8581b32448e92e94cac04866426377beddc2f2a3 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Fri, 27 Aug 2021 18:13:54 +0300
Subject: [PATCH 327/713] Apply suggestions from code review

Co-authored-by: Iaroslav Postovalov <38042667+CommanderTvis@users.noreply.github.com>
---
 .gitignore                                                      | 2 --
 .../src/main/kotlin/space/kscience/kmath/structures/buffers.kt  | 2 +-
 kmath-optimization/build.gradle.kts                             | 2 +-
 .../space/kscience/kmath/optimization/OptimizationBuilder.kt    | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index c5903368f..d6c4af4e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,3 @@ out/
 # Generated by javac -h and runtime
 *.class
 *.log
-
-/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
index eabb16701..0f7fdc46a 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
@@ -19,4 +19,4 @@ fun main() {
     with(DoubleField.bufferAlgebra(5)) {
         println(number(2.0) + produce(1, 2, 3, 4, 5))
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-optimization/build.gradle.kts b/kmath-optimization/build.gradle.kts
index ca013b2f4..68b82ad65 100644
--- a/kmath-optimization/build.gradle.kts
+++ b/kmath-optimization/build.gradle.kts
@@ -17,4 +17,4 @@ kotlin.sourceSets {
 
 readme {
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
-}
\ No newline at end of file
+}
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
index 10a25c029..416d0195d 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.FeatureSet
 
 public abstract class OptimizationBuilder<T, R : OptimizationProblem<T>> {
-    public val features: ArrayList<OptimizationFeature> = ArrayList()
+    public val features: MutableList<OptimizationFeature> = ArrayList()
 
     public fun addFeature(feature: OptimizationFeature) {
         features.add(feature)
-- 
2.34.1


From 55ea3658b99a26200475fd705f208cd4acdc9f8b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Fri, 27 Aug 2021 18:16:24 +0300
Subject: [PATCH 328/713] Update CHANGELOG.md

Co-authored-by: Iaroslav Postovalov <38042667+CommanderTvis@users.noreply.github.com>
---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eadf5877d..ec3f5252a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,6 @@
 - Extended operations for ND4J fields
 - Jupyter Notebook integration module (kmath-jupyter)
 - `@PerformancePitfall` annotation to mark possibly slow API
-- BigInt operation performance improvement and fixes by @zhelenskiy (#328)
 - Unified architecture for Integration and Optimization using features.
 - `BigInt` operation performance improvement and fixes by @zhelenskiy (#328)
 - Integration between `MST` and Symja `IExpr`
-- 
2.34.1


From 49ec5d15549daaf3848a09f9f3c6f441803587d6 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 19 Sep 2021 20:48:36 +0300
Subject: [PATCH 329/713] Refactor ND builders to suit new discoverability
 pattern

---
 .../kmath/benchmarks/NDFieldBenchmark.kt      |    6 +-
 .../kmath/benchmarks/ViktorBenchmark.kt       |    9 +-
 .../kmath/benchmarks/ViktorLogBenchmark.kt    |    9 +-
 docs/diagrams/core.puml                       | 1020 +++++++++++++++++
 .../kmath/functions/matrixIntegration.kt      |    4 +-
 .../kscience/kmath/operations/ComplexDemo.kt  |   12 +-
 .../kscience/kmath/structures/ComplexND.kt    |   10 +-
 .../kscience/kmath/structures/NDField.kt      |   12 +-
 .../kmath/structures/StreamDoubleFieldND.kt   |    2 +-
 gradle.properties                             |    2 +
 .../kscience/kmath/complex/ComplexFieldND.kt  |    5 +-
 kmath-core/build.gradle.kts                   |    7 +
 .../kmath/linear/BufferedLinearSpace.kt       |    7 +-
 .../kscience/kmath/nd/BufferAlgebraND.kt      |   43 +-
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |    4 +-
 .../space/kscience/kmath/nd/ShortRingND.kt    |    2 +-
 .../space/kscience/kmath/operations/BigInt.kt |    3 +-
 .../kscience/kmath/structures/NDFieldTest.kt  |    8 +-
 .../kmath/structures/NumberNDFieldTest.kt     |   10 +-
 .../kmath/histogram/DoubleHistogramSpace.kt   |    3 +-
 .../kscience/kmath/jupyter/KMathJupyter.kt    |    1 -
 .../kmath/optimization/QowOptimizer.kt        |   22 +-
 settings.gradle.kts                           |    4 +-
 23 files changed, 1130 insertions(+), 75 deletions(-)
 create mode 100644 docs/diagrams/core.puml

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index 0cd9a46ab..fbf4bdaba 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -46,8 +46,8 @@ internal class NDFieldBenchmark {
     private companion object {
         private const val dim = 1000
         private const val n = 100
-        private val autoField = AlgebraND.auto(DoubleField, dim, dim)
-        private val specializedField = AlgebraND.real(dim, dim)
-        private val genericField = AlgebraND.field(DoubleField, Buffer.Companion::boxing, dim, dim)
+        private val autoField = DoubleField.autoNd(dim, dim)
+        private val specializedField = DoubleField.nd(dim, dim)
+        private val genericField = DoubleField.nd(Buffer.Companion::boxing, dim, dim)
     }
 }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
index 1ddc79cf8..6ea64ba3c 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
@@ -10,10 +10,9 @@ import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import org.jetbrains.bio.viktor.F64Array
-import space.kscience.kmath.nd.AlgebraND
 import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.auto
-import space.kscience.kmath.nd.real
+import space.kscience.kmath.nd.autoNd
+import space.kscience.kmath.nd.nd
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.viktor.ViktorNDField
 
@@ -59,8 +58,8 @@ internal class ViktorBenchmark {
         private const val n = 100
 
         // automatically build context most suited for given type.
-        private val autoField = AlgebraND.auto(DoubleField, dim, dim)
-        private val realField = AlgebraND.real(dim, dim)
+        private val autoField = DoubleField.autoNd(dim, dim)
+        private val realField = DoubleField.nd(dim, dim)
         private val viktorField = ViktorNDField(dim, dim)
     }
 }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
index 8622e8f30..afe44ea99 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
@@ -10,9 +10,8 @@ import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import org.jetbrains.bio.viktor.F64Array
-import space.kscience.kmath.nd.AlgebraND
-import space.kscience.kmath.nd.auto
-import space.kscience.kmath.nd.real
+import space.kscience.kmath.nd.autoNd
+import space.kscience.kmath.nd.nd
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.viktor.ViktorFieldND
 
@@ -51,8 +50,8 @@ internal class ViktorLogBenchmark {
         private const val n = 100
 
         // automatically build context most suited for given type.
-        private val autoField = AlgebraND.auto(DoubleField, dim, dim)
-        private val realNdField = AlgebraND.real(dim, dim)
+        private val autoField = DoubleField.autoNd(dim, dim)
+        private val realNdField = DoubleField.nd(dim, dim)
         private val viktorField = ViktorFieldND(intArrayOf(dim, dim))
     }
 }
diff --git a/docs/diagrams/core.puml b/docs/diagrams/core.puml
new file mode 100644
index 000000000..87f8f2e2d
--- /dev/null
+++ b/docs/diagrams/core.puml
@@ -0,0 +1,1020 @@
+@startuml
+interface "ColumnarData" {
+    size: Int
+}
+interface "XYColumnarData" {
+    x: Buffer
+	y: Buffer
+}
+interface "XYErrorColumnarData" {
+    yErr: Buffer
+}
+interface "XYZColumnarData" {
+    z: Buffer
+}
+interface "Domain" {
+    dimension: Int
+}
+interface "DoubleDomain" {
+    
+}
+class "HyperSquareDomain" {
+    lower: Buffer
+	upper: Buffer
+}
+class "UnconstrainedDomain" {
+    dimension: Int
+}
+class "UnivariateDomain" {
+    range: ClosedFloatingPointRange
+}
+interface "DifferentiableExpression" {
+    
+}
+interface "SpecialDifferentiableExpression" {
+    
+}
+abstract "FirstDerivativeExpression" {
+    
+}
+interface "AutoDiffProcessor" {
+    
+}
+interface "Expression" {
+    
+}
+interface "ExpressionAlgebra" {
+    
+}
+abstract "FunctionalExpressionAlgebra" {
+    algebra: A
+}
+class "FunctionalExpressionGroup" {
+    algebra: A
+}
+class "FunctionalExpressionRing" {
+    algebra: A
+}
+class "FunctionalExpressionField" {
+    algebra: A
+}
+class "FunctionalExpressionExtendedField" {
+    algebra: A
+}
+interface "MST" {
+    
+}
+class "Numeric"  {
+    value: Number
+}
+class "Unary"  {
+    operation: String
+	value: MST
+}
+class "Binary"  {
+    operation: String
+	left: MST
+	right: MST
+}
+class "InnerAlgebra" {
+    algebra: Algebra
+	arguments: Map
+}
+class "MstNumericAlgebra"  {
+   number()
+	bindSymbolOrNull()
+	bindSymbol()
+	unaryOperationFunction()
+	binaryOperationFunction()
+}
+class "MstGroup"  {
+   zero: MST.Numericnumber()
+	bindSymbolOrNull()
+	add()
+	unaryPlus()
+	unaryMinus()
+	minus()
+	scale()
+	binaryOperationFunction()
+	unaryOperationFunction()
+}
+class "MstRing"  {
+   zero: MST.Numeric
+	one: MST.Numericnumber()
+	bindSymbolOrNull()
+	add()
+	scale()
+	multiply()
+	unaryPlus()
+	unaryMinus()
+	minus()
+	binaryOperationFunction()
+	unaryOperationFunction()
+}
+class "MstField"  {
+   zero: MST.Numeric
+	one: MST.NumericbindSymbolOrNull()
+	number()
+	add()
+	scale()
+	multiply()
+	divide()
+	unaryPlus()
+	unaryMinus()
+	minus()
+	binaryOperationFunction()
+	unaryOperationFunction()
+}
+class "MstExtendedField"  {
+   zero: MST.Numeric
+	one: MST.NumericbindSymbolOrNull()
+	number()
+	sin()
+	cos()
+	tan()
+	asin()
+	acos()
+	atan()
+	sinh()
+	cosh()
+	tanh()
+	asinh()
+	acosh()
+	atanh()
+	add()
+	sqrt()
+	scale()
+	multiply()
+	divide()
+	unaryPlus()
+	unaryMinus()
+	minus()
+	power()
+	exp()
+	ln()
+	binaryOperationFunction()
+	unaryOperationFunction()
+}
+class "MstLogicAlgebra"  {
+   bindSymbolOrNull()
+	const()
+	not()
+	and()
+	or()
+	xor()
+}
+class "AutoDiffValue" {
+    value: T
+}
+class "DerivationResult" {
+    value: T
+	derivativeValues: Map
+	context: Field
+}
+class "SimpleAutoDiffField" {
+    context: F
+	bindings: Map
+}
+class "AutoDiffVariableWithDerivative" {
+    identity: String
+	value: T
+	d: T
+}
+class "SimpleAutoDiffExpression" {
+    field: F
+	function: SimpleAutoDiffField
+}
+class "SimpleAutoDiffExtendedField" {
+    context: F
+	bindings: Map
+}
+interface "Symbol" {
+    identity: String
+}
+class "StringSymbol" {
+    identity: String
+}
+interface "SymbolIndexer" {
+    symbols: List
+}
+class "SimpleSymbolIndexer" {
+    symbols: List
+}
+class "BufferedLinearSpace" {
+    elementAlgebra: A
+	bufferFactory: BufferFactory
+}
+interface "LinearSolver" {
+    
+}
+interface "LinearSpace" {
+    elementAlgebra: A
+}
+class "LupDecomposition" {
+    context: LinearSpace
+	elementContext: Field
+	lu: Matrix
+	pivot: IntArray
+	even: Boolean
+}
+class "MatrixBuilder" {
+    linearSpace: LinearSpace
+	rows: Int
+	columns: Int
+}
+class "SymmetricMatrixFeature"  {
+   
+}
+interface "MatrixFeature" {
+    
+}
+interface "DiagonalFeature" {
+    
+}
+class "ZeroFeature"  {
+   
+}
+class "UnitFeature"  {
+   
+}
+interface "InverseMatrixFeature" {
+    inverse: Matrix
+}
+interface "DeterminantFeature" {
+    determinant: T
+}
+class "LFeature"  {
+   
+}
+class "UFeature"  {
+   
+}
+interface "LUDecompositionFeature" {
+    l: Matrix
+	u: Matrix
+}
+interface "LupDecompositionFeature" {
+    l: Matrix
+	u: Matrix
+	p: Matrix
+}
+class "OrthogonalFeature"  {
+   
+}
+interface "QRDecompositionFeature" {
+    q: Matrix
+	r: Matrix
+}
+interface "CholeskyDecompositionFeature" {
+    l: Matrix
+}
+interface "SingularValueDecompositionFeature" {
+    u: Matrix
+	s: Matrix
+	v: Matrix
+	singularValues: Point
+}
+class "MatrixWrapper" {
+    origin: Matrix
+	features: FeatureSet
+}
+class "TransposedFeature" {
+    original: Matrix
+}
+class "VirtualMatrix" {
+    rowNum: Int
+	colNum: Int
+	generator: (i:Int,j:Int)->T
+}
+class "UnstableKMathAPI" {
+    
+}
+class "PerformancePitfall" {
+    message: String
+}
+interface "Featured" {
+    
+}
+interface "Feature" {
+    key: FeatureKey
+}
+class "FeatureSet" {
+    features: Map
+}
+interface "Loggable" {
+    
+}
+class "ShapeMismatchException" {
+    expected: IntArray
+	actual: IntArray
+}
+interface "AlgebraND" {
+    shape: IntArray
+	elementContext: C
+}
+interface "GroupND" {
+    
+}
+interface "RingND" {
+    
+}
+interface "FieldND" {
+    
+}
+interface "BufferAlgebraND" {
+    strides: Strides
+	bufferFactory: BufferFactory
+	buffer: Buffer
+}
+class "BufferedGroupND" {
+    shape: IntArray
+	elementContext: A
+	bufferFactory: BufferFactory
+}
+class "BufferedRingND" {
+    shape: IntArray
+	elementContext: R
+	bufferFactory: BufferFactory
+}
+class "BufferedFieldND" {
+    shape: IntArray
+	elementContext: R
+	bufferFactory: BufferFactory
+}
+class "BufferND" {
+    strides: Strides
+	buffer: Buffer
+}
+class "MutableBufferND" {
+    strides: Strides
+	mutableBuffer: MutableBuffer
+}
+class "DoubleFieldND" {
+    shape: IntArray
+}
+class "ShortRingND" {
+    shape: IntArray
+}
+interface "Structure1D" {
+    dimension: Int
+}
+interface "MutableStructure1D" {
+    
+}
+class "Structure1DWrapper" {
+    structure: StructureND
+}
+class "MutableStructure1DWrapper" {
+    structure: MutableStructureND
+}
+class "Buffer1DWrapper" {
+    buffer: Buffer
+}
+class "MutableBuffer1DWrapper" {
+    buffer: MutableBuffer
+}
+interface "Structure2D" {
+    rowNum: Int
+	colNum: Int
+	shape: IntArray
+	rows: List
+	columns: List
+}
+interface "MutableStructure2D" {
+    rows: List
+	columns: List
+}
+class "Structure2DWrapper" {
+    structure: StructureND
+}
+class "MutableStructure2DWrapper" {
+    structure: MutableStructureND
+}
+interface "StructureFeature" {
+    
+}
+interface "StructureND" {
+    shape: IntArray
+	dimension: Int
+}
+interface "MutableStructureND" {
+    
+}
+interface "Strides" {
+    shape: IntArray
+	strides: IntArray
+	linearSize: Int
+}
+class "DefaultStrides" {
+    shape: IntArray
+}
+class "KMathContext" {
+    
+}
+interface "Algebra" {
+    
+}
+interface "GroupOperations" {
+    
+}
+interface "Group" {
+    zero: T
+}
+interface "RingOperations" {
+    
+}
+interface "Ring" {
+    one: T
+}
+interface "FieldOperations" {
+    
+}
+interface "Field" {
+    
+}
+interface "AlgebraElement" {
+    context: C
+}
+interface "GroupElement" {
+    
+}
+interface "RingElement" {
+    
+}
+interface "FieldElement" {
+    
+}
+class "BigIntField"  {
+   zero: BigInt
+	one: BigIntnumber()
+	unaryMinus()
+	add()
+	scale()
+	multiply()
+	divide()
+	unaryPlus()
+	unaryMinus()
+}
+class "BigInt" {
+    sign: Byte
+	magnitude: Magnitude
+}
+interface "BufferAlgebra" {
+    bufferFactory: BufferFactory
+	elementAlgebra: A
+}
+class "BufferField" {
+    bufferFactory: BufferFactory
+	elementAlgebra: A
+	size: Int
+}
+interface "LogicAlgebra" {
+    
+}
+class "BooleanAlgebra"  {
+   const()
+	not()
+	and()
+	or()
+	xor()
+}
+interface "ExtendedFieldOperations" {
+    
+}
+interface "ExtendedField" {
+    
+}
+class "DoubleField"  {
+   zero: Double
+	one: Doublenumber()
+	binaryOperationFunction()
+	add()
+	multiply()
+	divide()
+	scale()
+	sin()
+	cos()
+	tan()
+	acos()
+	asin()
+	atan()
+	sinh()
+	cosh()
+	tanh()
+	asinh()
+	acosh()
+	atanh()
+	sqrt()
+	power()
+	exp()
+	ln()
+	norm()
+	unaryMinus()
+	plus()
+	minus()
+	times()
+	div()
+}
+class "FloatField"  {
+   zero: Float
+	one: Floatnumber()
+	binaryOperationFunction()
+	add()
+	scale()
+	multiply()
+	divide()
+	sin()
+	cos()
+	tan()
+	acos()
+	asin()
+	atan()
+	sinh()
+	cosh()
+	tanh()
+	asinh()
+	acosh()
+	atanh()
+	sqrt()
+	power()
+	exp()
+	ln()
+	norm()
+	unaryMinus()
+	plus()
+	minus()
+	times()
+	div()
+}
+class "IntRing"  {
+   zero: Int
+	one: Intnumber()
+	add()
+	multiply()
+	norm()
+	unaryMinus()
+	plus()
+	minus()
+	times()
+}
+class "ShortRing"  {
+   zero: Short
+	one: Shortnumber()
+	add()
+	multiply()
+	norm()
+	unaryMinus()
+	plus()
+	minus()
+	times()
+}
+class "ByteRing"  {
+   zero: Byte
+	one: Bytenumber()
+	add()
+	multiply()
+	norm()
+	unaryMinus()
+	plus()
+	minus()
+	times()
+}
+class "LongRing"  {
+   zero: Long
+	one: Longnumber()
+	add()
+	multiply()
+	norm()
+	unaryMinus()
+	plus()
+	minus()
+	times()
+}
+interface "NumericAlgebra" {
+    
+}
+interface "ScaleOperations" {
+    
+}
+interface "NumbersAddOperations" {
+    
+}
+interface "TrigonometricOperations" {
+    
+}
+interface "PowerOperations" {
+    
+}
+interface "ExponentialOperations" {
+    
+}
+interface "Norm" {
+    
+}
+interface "Buffer" {
+    size: Int
+}
+interface "MutableBuffer" {
+    
+}
+class "ListBuffer" {
+    list: List
+}
+class "MutableListBuffer" {
+    list: MutableList
+}
+class "ArrayBuffer" {
+    array: Array
+}
+class "ReadOnlyBuffer" {
+    buffer: MutableBuffer
+}
+class "VirtualBuffer" {
+    size: Int
+	generator: (Int)->T
+}
+class "BufferAccessor2D" {
+    rowNum: Int
+	colNum: Int
+	factory: MutableBufferFactory
+}
+class "Row" {
+    buffer: MutableBuffer
+	rowIndex: Int
+}
+class "DoubleBuffer" {
+    array: DoubleArray
+}
+class "DoubleBufferFieldOperations"  {
+   unaryMinus()
+	add()
+	multiply()
+	divide()
+	sin()
+	cos()
+	tan()
+	asin()
+	acos()
+	atan()
+	sinh()
+	cosh()
+	tanh()
+	asinh()
+	acosh()
+	atanh()
+	power()
+	exp()
+	ln()
+}
+class "DoubleL2Norm"  {
+   norm()
+}
+class "DoubleBufferField" {
+    size: Int
+}
+enum "ValueFlag" {
+    NAN
+	MISSING
+	NEGATIVE_INFINITY
+	POSITIVE_INFINITY
+}
+interface "FlaggedBuffer" {
+    
+}
+class "FlaggedDoubleBuffer" {
+    values: DoubleArray
+	flags: ByteArray
+}
+class "FloatBuffer" {
+    array: FloatArray
+}
+class "IntBuffer" {
+    array: IntArray
+}
+class "LongBuffer" {
+    array: LongArray
+}
+class "MemoryBuffer" {
+    memory: Memory
+	spec: MemorySpec
+}
+class "MutableMemoryBuffer" {
+    memory: Memory
+	spec: MemorySpec
+}
+class "ShortBuffer" {
+    array: ShortArray
+}
+class "ExpressionFieldTest" {
+    x
+}
+class "InterpretTest" {
+    
+}
+class "SimpleAutoDiffTest" {
+    x
+	y
+	z
+}
+class "DoubleLUSolverTest" {
+    
+}
+class "MatrixTest" {
+    
+}
+class "CumulativeKtTest" {
+    
+}
+class "BigIntAlgebraTest" {
+    
+}
+class "BigIntConstructorTest" {
+    
+}
+class "BigIntConversionsTest" {
+    
+}
+class "BigIntOperationsTest" {
+    
+}
+class "DoubleFieldTest" {
+    
+}
+class "NDFieldTest" {
+    
+}
+class "NumberNDFieldTest" {
+    algebra
+	array1
+	array2
+}
+class "L2Norm"  {
+   norm()
+}
+interface "AlgebraicVerifier" {
+    algebra: A
+}
+class "FieldVerifier" {
+    algebra: A
+	a: T
+	b: T
+	c: T
+	x: Number
+}
+class "RingVerifier" {
+    algebra: A
+	a: T
+	b: T
+	c: T
+	x: Number
+}
+class "SpaceVerifier" {
+    algebra: S
+	a: T
+	b: T
+	c: T
+	x: Number
+}
+class "JBigIntegerField"  {
+   zero: BigInteger
+	one: BigIntegernumber()
+	add()
+	minus()
+	multiply()
+	unaryMinus()
+}
+abstract "JBigDecimalFieldBase" {
+    mathContext: MathContext
+}
+class "JBigDecimalField" {
+    mathContext: MathContext
+}
+"ColumnarData" <|--- XYColumnarData
+"XYColumnarData" <|--- XYErrorColumnarData
+"XYColumnarData" <|--- XYZColumnarData
+"Domain" <|--- DoubleDomain
+"DoubleDomain" <|--- HyperSquareDomain
+"DoubleDomain" <|--- UnconstrainedDomain
+"DoubleDomain" <|--- UnivariateDomain
+"Expression" <|--- DifferentiableExpression
+"DifferentiableExpression" <|--- SpecialDifferentiableExpression
+"DifferentiableExpression" <|--- FirstDerivativeExpression
+"Algebra" <|--- ExpressionAlgebra
+"ExpressionAlgebra" <|--- FunctionalExpressionAlgebra
+"FunctionalExpressionAlgebra" <|--- FunctionalExpressionGroup
+"Group" <|--- FunctionalExpressionGroup
+"FunctionalExpressionGroup" <|--- FunctionalExpressionRing
+"Ring" <|--- FunctionalExpressionRing
+"FunctionalExpressionRing" <|--- FunctionalExpressionField
+"Field" <|--- FunctionalExpressionField
+"ScaleOperations" <|--- FunctionalExpressionField
+"FunctionalExpressionField" <|--- FunctionalExpressionExtendedField
+"ExtendedField" <|--- FunctionalExpressionExtendedField
+"MST" <|--- Numeric
+"MST" <|--- Unary
+"MST" <|--- Binary
+"NumericAlgebra" <|--- InnerAlgebra
+"NumericAlgebra" <|--- MstNumericAlgebra
+"Group" <|--- MstGroup
+"NumericAlgebra" <|--- MstGroup
+"ScaleOperations" <|--- MstGroup
+"Ring" <|--- MstRing
+"NumbersAddOperations" <|--- MstRing
+"ScaleOperations" <|--- MstRing
+"Field" <|--- MstField
+"NumbersAddOperations" <|--- MstField
+"ScaleOperations" <|--- MstField
+"ExtendedField" <|--- MstExtendedField
+"NumericAlgebra" <|--- MstExtendedField
+"LogicAlgebra" <|--- MstLogicAlgebra
+"Field" <|--- SimpleAutoDiffField
+"ExpressionAlgebra" <|--- SimpleAutoDiffField
+"NumbersAddOperations" <|--- SimpleAutoDiffField
+"AutoDiffValue" <|--- AutoDiffVariableWithDerivative
+"Symbol" <|--- AutoDiffVariableWithDerivative
+"FirstDerivativeExpression" <|--- SimpleAutoDiffExpression
+"ExtendedField" <|--- SimpleAutoDiffExtendedField
+"ScaleOperations" <|--- SimpleAutoDiffExtendedField
+'"" <|--- SimpleAutoDiffExtendedField
+"SimpleAutoDiffField" <|--- SimpleAutoDiffExtendedField
+"MST" <|--- Symbol
+"Symbol" <|--- StringSymbol
+"SymbolIndexer" <|--- SimpleSymbolIndexer
+"LinearSpace" <|--- BufferedLinearSpace
+"LupDecompositionFeature" <|--- LupDecomposition
+"DeterminantFeature" <|--- LupDecomposition
+"MatrixFeature" <|--- SymmetricMatrixFeature
+"StructureFeature" <|--- MatrixFeature
+"MatrixFeature" <|--- DiagonalFeature
+"DiagonalFeature" <|--- ZeroFeature
+"DiagonalFeature" <|--- UnitFeature
+"MatrixFeature" <|--- InverseMatrixFeature
+"MatrixFeature" <|--- DeterminantFeature
+"MatrixFeature" <|--- LFeature
+"MatrixFeature" <|--- UFeature
+"MatrixFeature" <|--- LUDecompositionFeature
+"MatrixFeature" <|--- LupDecompositionFeature
+"MatrixFeature" <|--- OrthogonalFeature
+"MatrixFeature" <|--- QRDecompositionFeature
+"MatrixFeature" <|--- CholeskyDecompositionFeature
+"MatrixFeature" <|--- SingularValueDecompositionFeature
+'"Matrixbyorigin{
+'
+'
+' @UnstableKMathAPI
+' @Suppress
+'overridefungetFeature:F? =
+'features.getFeature
+'
+'overridefuntoString"
+'}" <|--- MatrixWrapper
+"MatrixFeature" <|--- TransposedFeature
+"Matrix" <|--- VirtualMatrix
+"Featured" <|--- FeatureSet
+"RuntimeException" <|--- ShapeMismatchException
+"Group" <|--- GroupND
+"AlgebraND" <|--- GroupND
+"Ring" <|--- RingND
+"GroupND" <|--- RingND
+"Field" <|--- FieldND
+"RingND" <|--- FieldND
+"AlgebraND" <|--- BufferAlgebraND
+"GroupND" <|--- BufferedGroupND
+"BufferAlgebraND" <|--- BufferedGroupND
+"BufferedGroupND" <|--- BufferedRingND
+"RingND" <|--- BufferedRingND
+"BufferedRingND" <|--- BufferedFieldND
+"FieldND" <|--- BufferedFieldND
+"StructureND" <|--- BufferND
+"MutableStructureND" <|--- MutableBufferND
+"BufferND" <|--- MutableBufferND
+"BufferedFieldND" <|--- DoubleFieldND
+'"
+'" <|--- DoubleFieldND
+'"NumbersAddOperations" <|--- DoubleFieldND
+'"
+'" <|--- DoubleFieldND
+'"ScaleOperations" <|--- DoubleFieldND
+'"
+'" <|--- DoubleFieldND
+"ExtendedField" <|--- DoubleFieldND
+"BufferedRingND" <|--- ShortRingND
+'"
+'" <|--- ShortRingND
+"NumbersAddOperations" <|--- ShortRingND
+"StructureND" <|--- Structure1D
+"Buffer" <|--- Structure1D
+"Structure1D" <|--- MutableStructure1D
+"MutableStructureND" <|--- MutableStructure1D
+"MutableBuffer" <|--- MutableStructure1D
+"Structure1D" <|--- Structure1DWrapper
+"MutableStructure1D" <|--- MutableStructure1DWrapper
+"Structure1D" <|--- Buffer1DWrapper
+"MutableStructure1D" <|--- MutableBuffer1DWrapper
+"StructureND" <|--- Structure2D
+"Structure2D" <|--- MutableStructure2D
+"MutableStructureND" <|--- MutableStructure2D
+"Structure2D" <|--- Structure2DWrapper
+"MutableStructure2D" <|--- MutableStructure2DWrapper
+"Feature" <|--- StructureFeature
+"Featured" <|--- StructureND
+"StructureND" <|--- MutableStructureND
+"Strides" <|--- DefaultStrides
+"Algebra" <|--- GroupOperations
+"GroupOperations" <|--- Group
+"GroupOperations" <|--- RingOperations
+"Group" <|--- Ring
+"RingOperations" <|--- Ring
+"RingOperations" <|--- FieldOperations
+"Ring" <|--- Field
+"FieldOperations" <|--- Field
+"ScaleOperations" <|--- Field
+"NumericAlgebra" <|--- Field
+"AlgebraElement" <|--- GroupElement
+"GroupElement" <|--- RingElement
+"RingElement" <|--- FieldElement
+"Field" <|--- BigIntField
+"NumbersAddOperations" <|--- BigIntField
+"ScaleOperations" <|--- BigIntField
+"Comparable" <|--- BigInt
+"Algebra" <|--- BufferAlgebra
+"BufferAlgebra" <|--- BufferField
+"Field" <|--- BufferField
+"Algebra" <|--- LogicAlgebra
+"LogicAlgebra" <|--- BooleanAlgebra
+"FieldOperations" <|--- ExtendedFieldOperations
+'"
+'" <|--- ExtendedFieldOperations
+'"TrigonometricOperations" <|--- ExtendedFieldOperations
+'"
+'" <|--- ExtendedFieldOperations
+'"PowerOperations" <|--- ExtendedFieldOperations
+'"
+'" <|--- ExtendedFieldOperations
+"ExponentialOperations" <|--- ExtendedFieldOperations
+"ExtendedFieldOperations" <|--- ExtendedField
+"Field" <|--- ExtendedField
+"NumericAlgebra" <|--- ExtendedField
+"ScaleOperations" <|--- ExtendedField
+"ExtendedField" <|--- DoubleField
+"Norm" <|--- DoubleField
+"ScaleOperations" <|--- DoubleField
+"ExtendedField" <|--- FloatField
+"Norm" <|--- FloatField
+"Ring" <|--- IntRing
+"Norm" <|--- IntRing
+"NumericAlgebra" <|--- IntRing
+"Ring" <|--- ShortRing
+"Norm" <|--- ShortRing
+"NumericAlgebra" <|--- ShortRing
+"Ring" <|--- ByteRing
+"Norm" <|--- ByteRing
+"NumericAlgebra" <|--- ByteRing
+"Ring" <|--- LongRing
+"Norm" <|--- LongRing
+"NumericAlgebra" <|--- LongRing
+"Algebra" <|--- NumericAlgebra
+"Algebra" <|--- ScaleOperations
+"Ring" <|--- NumbersAddOperations
+"NumericAlgebra" <|--- NumbersAddOperations
+"Algebra" <|--- TrigonometricOperations
+"Algebra" <|--- PowerOperations
+"Algebra" <|--- ExponentialOperations
+"Buffer" <|--- MutableBuffer
+"Buffer" <|--- ListBuffer
+"MutableBuffer" <|--- MutableListBuffer
+"MutableBuffer" <|--- ArrayBuffer
+"Buffer" <|--- ReadOnlyBuffer
+"Buffer" <|--- VirtualBuffer
+"MutableBuffer" <|--- Row
+"MutableBuffer" <|--- DoubleBuffer
+"ExtendedFieldOperations" <|--- DoubleBufferFieldOperations
+"Norm" <|--- DoubleL2Norm
+"ExtendedField" <|--- DoubleBufferField
+"Norm" <|--- DoubleBufferField
+"Buffer" <|--- FlaggedBuffer
+"FlaggedBuffer" <|--- FlaggedDoubleBuffer
+'"
+'" <|--- FlaggedDoubleBuffer
+"Buffer" <|--- FlaggedDoubleBuffer
+"MutableBuffer" <|--- FloatBuffer
+"MutableBuffer" <|--- IntBuffer
+"MutableBuffer" <|--- LongBuffer
+"Buffer" <|--- MemoryBuffer
+"MemoryBuffer" <|--- MutableMemoryBuffer
+'"
+'" <|--- MutableMemoryBuffer
+"MutableBuffer" <|--- MutableMemoryBuffer
+"MutableBuffer" <|--- ShortBuffer
+"Norm" <|--- L2Norm
+"RingVerifier" <|--- FieldVerifier
+"SpaceVerifier" <|--- RingVerifier
+"AlgebraicVerifier" <|--- SpaceVerifier
+"Ring" <|--- JBigIntegerField
+"NumericAlgebra" <|--- JBigIntegerField
+"Field" <|--- JBigDecimalFieldBase
+"PowerOperations" <|--- JBigDecimalFieldBase
+"NumericAlgebra" <|--- JBigDecimalFieldBase
+"ScaleOperations" <|--- JBigDecimalFieldBase
+"JBigDecimalFieldBase" <|--- JBigDecimalField
+@enduml
\ No newline at end of file
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index 569a57070..d932fdb9f 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -9,12 +9,12 @@ import space.kscience.kmath.integration.gaussIntegrator
 import space.kscience.kmath.integration.integrate
 import space.kscience.kmath.integration.value
 import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.nd
+import space.kscience.kmath.nd.withNd
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 
 fun main(): Unit = DoubleField {
-    nd(2, 2) {
+    withNd(2, 2) {
 
         //Produce a diagonal StructureND
         fun diagonal(v: Double) = produce { (i, j) ->
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt
index eefc6e896..8b511f961 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt
@@ -6,18 +6,20 @@
 package space.kscience.kmath.operations
 
 import space.kscience.kmath.complex.Complex
-import space.kscience.kmath.complex.complex
-import space.kscience.kmath.nd.AlgebraND
+import space.kscience.kmath.complex.ComplexField
+import space.kscience.kmath.complex.withNd
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.autoNd
 
 fun main() {
     // 2d element
-    val element = AlgebraND.complex(2, 2).produce { (i, j) ->
-        Complex(i.toDouble() - j.toDouble(), i.toDouble() + j.toDouble())
+    val element = ComplexField.autoNd(2, 2).produce { (i, j) ->
+        Complex(i - j, i + j)
     }
     println(element)
 
     // 1d element operation
-    val result = with(AlgebraND.complex(8)) {
+    val result: StructureND<Complex> = ComplexField.withNd(8) {
         val a = produce { (it) -> i * it - it.toDouble() }
         val b = 3
         val c = Complex(1.0, 1.0)
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
index 752e00bdf..c591f5682 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
@@ -9,10 +9,10 @@ package space.kscience.kmath.structures
 
 import space.kscience.kmath.complex.*
 import space.kscience.kmath.linear.transpose
-import space.kscience.kmath.nd.AlgebraND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.nd.real
+import space.kscience.kmath.nd.nd
+import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 import kotlin.system.measureTimeMillis
 
@@ -20,8 +20,8 @@ fun main() {
     val dim = 1000
     val n = 1000
 
-    val realField = AlgebraND.real(dim, dim)
-    val complexField: ComplexFieldND = AlgebraND.complex(dim, dim)
+    val realField = DoubleField.nd(dim, dim)
+    val complexField: ComplexFieldND = ComplexField.nd(dim, dim)
 
     val realTime = measureTimeMillis {
         realField {
@@ -49,7 +49,7 @@ fun main() {
 fun complexExample() {
     //Create a context for 2-d structure with complex values
     ComplexField {
-        nd(4, 8) {
+        withNd(4, 8) {
             //a constant real-valued structure
             val x = one * 2.5
             operator fun Number.plus(other: Complex) = Complex(this.toDouble() + other.re, other.im)
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
index c842960be..c9cafbba8 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
@@ -8,7 +8,9 @@ package space.kscience.kmath.structures
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import org.nd4j.linalg.factory.Nd4j
-import space.kscience.kmath.nd.*
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.autoNd
+import space.kscience.kmath.nd.nd
 import space.kscience.kmath.nd4j.Nd4jArrayField
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
@@ -31,17 +33,17 @@ fun main() {
     val n = 1000
 
     // automatically build context most suited for given type.
-    val autoField = AlgebraND.auto(DoubleField, dim, dim)
+    val autoField = DoubleField.autoNd(dim, dim)
     // specialized nd-field for Double. It works as generic Double field as well.
-    val realField = AlgebraND.real(dim, dim)
+    val realField = DoubleField.nd(dim, dim)
     //A generic boxing field. It should be used for objects, not primitives.
-    val boxingField = AlgebraND.field(DoubleField, Buffer.Companion::boxing, dim, dim)
+    val boxingField = DoubleField.nd(Buffer.Companion::boxing, dim, dim)
     // Nd4j specialized field.
     val nd4jField = Nd4jArrayField.real(dim, dim)
     //viktor field
     val viktorField = ViktorNDField(dim, dim)
     //parallel processing based on Java Streams
-    val parallelField = AlgebraND.realWithStream(dim, dim)
+    val parallelField = DoubleField.ndStreaming(dim, dim)
 
     measureAndPrint("Boxing addition") {
         boxingField {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index e443a588d..b1248bd0f 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -105,4 +105,4 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
     override fun atanh(arg: StructureND<Double>): BufferND<Double> = arg.map { atanh(it) }
 }
 
-fun AlgebraND.Companion.realWithStream(vararg shape: Int): StreamDoubleFieldND = StreamDoubleFieldND(shape)
+fun DoubleField.ndStreaming(vararg shape: Int): StreamDoubleFieldND = StreamDoubleFieldND(shape)
diff --git a/gradle.properties b/gradle.properties
index b97db1c54..49bbf36dd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,6 +7,8 @@ kotlin.code.style=official
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.stability.nowarn=true
 kotlin.native.enableDependencyPropagation=false
+kotlin.jupyter.add.scanner=false
+
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=2G
 org.gradle.parallel=true
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
index ae4e05631..41bcb83df 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
@@ -6,7 +6,6 @@
 package space.kscience.kmath.complex
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.AlgebraND
 import space.kscience.kmath.nd.BufferND
 import space.kscience.kmath.nd.BufferedFieldND
 import space.kscience.kmath.nd.StructureND
@@ -113,12 +112,12 @@ public inline fun BufferedFieldND<Complex, ComplexField>.produceInline(initializ
 }
 
 
-public fun AlgebraND.Companion.complex(vararg shape: Int): ComplexFieldND = ComplexFieldND(shape)
+public fun ComplexField.nd(vararg shape: Int): ComplexFieldND = ComplexFieldND(shape)
 
 /**
  * Produce a context for n-dimensional operations inside this real field
  */
-public inline fun <R> ComplexField.nd(vararg shape: Int, action: ComplexFieldND.() -> R): R {
+public inline fun <R> ComplexField.withNd(vararg shape: Int, action: ComplexFieldND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
     return ComplexFieldND(shape).action()
 }
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index 564d06f49..e4436c1df 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
     id("ru.mipt.npm.gradle.native")
+//    id("com.xcporter.metaview") version "0.0.5"
 }
 
 kotlin.sourceSets {
@@ -12,6 +13,12 @@ kotlin.sourceSets {
     }
 }
 
+//generateUml {
+//    classTree {
+//
+//    }
+//}
+
 readme {
     description = "Core classes, algebra definitions, basic linear algebra"
     maturity = ru.mipt.npm.gradle.Maturity.DEVELOPMENT
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 5471cb925..14235515c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -6,7 +6,10 @@
 package space.kscience.kmath.linear
 
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.*
+import space.kscience.kmath.nd.BufferedRingND
+import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.nd.nd
+import space.kscience.kmath.nd.unwrap
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
@@ -23,7 +26,7 @@ public class BufferedLinearSpace<T : Any, out A : Ring<T>>(
     private fun ndRing(
         rows: Int,
         cols: Int,
-    ): BufferedRingND<T, A> = AlgebraND.ring(elementAlgebra, bufferFactory, rows, cols)
+    ): BufferedRingND<T, A> = elementAlgebra.nd(bufferFactory, rows, cols)
 
     override fun buildMatrix(rows: Int, columns: Int, initializer: A.(i: Int, j: Int) -> T): Matrix<T> =
         ndRing(rows, columns).produce { (i, j) -> elementAlgebra.initializer(i, j) }.as2D()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index 9ece51ff8..b01beb02d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -5,11 +5,13 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
+import kotlin.jvm.JvmName
 
 public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
     public val strides: Strides
@@ -85,58 +87,61 @@ public open class BufferedFieldND<T, out R : Field<T>>(
 }
 
 // group factories
-public fun <T, A : Ring<T>> AlgebraND.Companion.group(
-    space: A,
+public fun <T, A : Group<T>> A.nd(
     bufferFactory: BufferFactory<T>,
     vararg shape: Int,
-): BufferedGroupND<T, A> = BufferedGroupND(shape, space, bufferFactory)
+): BufferedGroupND<T, A> = BufferedGroupND(shape, this, bufferFactory)
 
-public inline fun <T, A : Ring<T>, R> A.ndGroup(
+@JvmName("withNdGroup")
+public inline fun <T, A : Group<T>, R> A.withNd(
     noinline bufferFactory: BufferFactory<T>,
     vararg shape: Int,
     action: BufferedGroupND<T, A>.() -> R,
 ): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return AlgebraND.group(this, bufferFactory, *shape).run(action)
+    return nd(bufferFactory, *shape).run(action)
 }
 
 //ring factories
-public fun <T, A : Ring<T>> AlgebraND.Companion.ring(
-    ring: A,
+public fun <T, A : Ring<T>> A.nd(
     bufferFactory: BufferFactory<T>,
     vararg shape: Int,
-): BufferedRingND<T, A> = BufferedRingND(shape, ring, bufferFactory)
+): BufferedRingND<T, A> = BufferedRingND(shape, this, bufferFactory)
 
-public inline fun <T, A : Ring<T>, R> A.ndRing(
+@JvmName("withNdRing")
+public inline fun <T, A : Ring<T>, R> A.withNd(
     noinline bufferFactory: BufferFactory<T>,
     vararg shape: Int,
     action: BufferedRingND<T, A>.() -> R,
 ): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return AlgebraND.ring(this, bufferFactory, *shape).run(action)
+    return nd(bufferFactory, *shape).run(action)
 }
 
 //field factories
-public fun <T, A : Field<T>> AlgebraND.Companion.field(
-    field: A,
+public fun <T, A : Field<T>> A.nd(
     bufferFactory: BufferFactory<T>,
     vararg shape: Int,
-): BufferedFieldND<T, A> = BufferedFieldND(shape, field, bufferFactory)
+): BufferedFieldND<T, A> = BufferedFieldND(shape, this, bufferFactory)
 
+/**
+ * Create a [FieldND] for this [Field] inferring proper buffer factory from the type
+ */
+@UnstableKMathAPI
 @Suppress("UNCHECKED_CAST")
-public inline fun <reified T : Any, A : Field<T>> AlgebraND.Companion.auto(
-    field: A,
+public inline fun <reified T : Any, A : Field<T>> A.autoNd(
     vararg shape: Int,
-): FieldND<T, A> = when (field) {
+): FieldND<T, A> = when (this) {
     DoubleField -> DoubleFieldND(shape) as FieldND<T, A>
-    else -> BufferedFieldND(shape, field, Buffer.Companion::auto)
+    else -> BufferedFieldND(shape, this, Buffer.Companion::auto)
 }
 
-public inline fun <T, A : Field<T>, R> A.ndField(
+@JvmName("withNdField")
+public inline fun <T, A : Field<T>, R> A.withNd(
     noinline bufferFactory: BufferFactory<T>,
     vararg shape: Int,
     action: BufferedFieldND<T, A>.() -> R,
 ): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return AlgebraND.field(this, bufferFactory, *shape).run(action)
+    return nd(bufferFactory, *shape).run(action)
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index a448e351e..fed4aca0b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -103,12 +103,12 @@ public class DoubleFieldND(
     override fun atanh(arg: StructureND<Double>): BufferND<Double> = arg.map { atanh(it) }
 }
 
-public fun AlgebraND.Companion.real(vararg shape: Int): DoubleFieldND = DoubleFieldND(shape)
+public fun DoubleField.nd(vararg shape: Int): DoubleFieldND = DoubleFieldND(shape)
 
 /**
  * Produce a context for n-dimensional operations inside this real field
  */
-public inline fun <R> DoubleField.nd(vararg shape: Int, action: DoubleFieldND.() -> R): R {
+public inline fun <R> DoubleField.withNd(vararg shape: Int, action: DoubleFieldND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
     return DoubleFieldND(shape).run(action)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
index f96978cfc..5b6e2cd22 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
@@ -34,7 +34,7 @@ public class ShortRingND(
 public inline fun BufferedRingND<Short, ShortRing>.produceInline(crossinline initializer: ShortRing.(Int) -> Short): BufferND<Short> =
     BufferND(strides, ShortBuffer(ShortArray(strides.linearSize) { offset -> ShortRing.initializer(offset) }))
 
-public inline fun <R> ShortRing.nd(vararg shape: Int, action: ShortRingND.() -> R): R {
+public inline fun <R> ShortRing.withNd(vararg shape: Int, action: ShortRingND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
     return ShortRingND(shape).run(action)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 2dd61270d..02741e6ab 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -6,7 +6,6 @@
 package space.kscience.kmath.operations
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.AlgebraND
 import space.kscience.kmath.nd.BufferedRingND
 import space.kscience.kmath.operations.BigInt.Companion.BASE
 import space.kscience.kmath.operations.BigInt.Companion.BASE_SIZE
@@ -533,5 +532,5 @@ public inline fun Buffer.Companion.bigInt(size: Int, initializer: (Int) -> BigIn
 public inline fun MutableBuffer.Companion.bigInt(size: Int, initializer: (Int) -> BigInt): MutableBuffer<BigInt> =
     boxing(size, initializer)
 
-public fun AlgebraND.Companion.bigInt(vararg shape: Int): BufferedRingND<BigInt, BigIntField> =
+public fun BigIntField.nd(vararg shape: Int): BufferedRingND<BigInt, BigIntField> =
     BufferedRingND(shape, BigIntField, Buffer.Companion::bigInt)
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
index f623b00e8..6d4531f41 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
@@ -5,9 +5,9 @@
 
 package space.kscience.kmath.structures
 
-import space.kscience.kmath.nd.AlgebraND
 import space.kscience.kmath.nd.get
-import space.kscience.kmath.nd.real
+import space.kscience.kmath.nd.nd
+import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.testutils.FieldVerifier
 import kotlin.test.Test
@@ -16,12 +16,12 @@ import kotlin.test.assertEquals
 internal class NDFieldTest {
     @Test
     fun verify() {
-        (AlgebraND.real(12, 32)) { FieldVerifier(this, one + 3, one - 23, one * 12, 6.66) }
+        (DoubleField.nd(12, 32)) { FieldVerifier(this, one + 3, one - 23, one * 12, 6.66) }
     }
 
     @Test
     fun testStrides() {
-        val ndArray = AlgebraND.real(10, 10).produce { (it[0] + it[1]).toDouble() }
+        val ndArray = DoubleField.nd(10, 10).produce { (it[0] + it[1]).toDouble() }
         assertEquals(ndArray[5, 5], 10.0)
     }
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index 1803fff71..1045933b7 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -7,7 +7,11 @@ package space.kscience.kmath.structures
 
 import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.*
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.combine
+import space.kscience.kmath.nd.get
+import space.kscience.kmath.nd.nd
+import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Norm
 import space.kscience.kmath.operations.invoke
 import kotlin.math.abs
@@ -17,7 +21,7 @@ import kotlin.test.assertEquals
 
 @Suppress("UNUSED_VARIABLE")
 class NumberNDFieldTest {
-    val algebra = AlgebraND.real(3, 3)
+    val algebra = DoubleField.nd(3, 3)
     val array1 = algebra.produce { (i, j) -> (i + j).toDouble() }
     val array2 = algebra.produce { (i, j) -> (i - j).toDouble() }
 
@@ -83,7 +87,7 @@ class NumberNDFieldTest {
     @Test
     fun testInternalContext() {
         algebra {
-            (AlgebraND.real(*array1.shape)) { with(L2Norm) { 1 + norm(array1) + exp(array2) } }
+            (DoubleField.nd(*array1.shape)) { with(L2Norm) { 1 + norm(array1) + exp(array2) } }
         }
     }
 }
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
index 27b14b65e..37ab8a1b2 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
@@ -9,6 +9,7 @@ import space.kscience.kmath.domains.Domain
 import space.kscience.kmath.domains.HyperSquareDomain
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
+import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.*
 import kotlin.math.floor
 
@@ -28,7 +29,7 @@ public class DoubleHistogramSpace(
     public val dimension: Int get() = lower.size
 
     private val shape = IntArray(binNums.size) { binNums[it] + 2 }
-    override val histogramValueSpace: DoubleFieldND = AlgebraND.real(*shape)
+    override val histogramValueSpace: DoubleFieldND = DoubleField.nd(*shape)
 
     override val strides: Strides get() = histogramValueSpace.strides
     private val binSize = DoubleBuffer(dimension) { (upper[it] - lower[it]) / binNums[it] }
diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
index d7438bf0f..e646d2bd0 100644
--- a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -11,7 +11,6 @@ import kotlinx.html.stream.createHTML
 import kotlinx.html.unsafe
 import org.jetbrains.kotlinx.jupyter.api.DisplayResult
 import org.jetbrains.kotlinx.jupyter.api.HTML
-import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
 import space.kscience.kmath.ast.rendering.FeaturedMathRendererWithPostProcess
 import space.kscience.kmath.ast.rendering.MathMLSyntaxRenderer
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
index 4fe8520da..00df0944f 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
@@ -16,6 +16,14 @@ import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.DoubleL2Norm
 
+public class QowRuns(public val runs: Int) : OptimizationFeature {
+    init {
+        require(runs >= 1) { "Number of runs must be more than zero" }
+    }
+
+    override fun toString(): String = "QowRuns(runs=$runs)"
+}
+
 
 /**
  * An optimizer based onf Fyodor Tkachev's quasi-optimal weights method.
@@ -56,7 +64,7 @@ public object QowOptimizer : Optimizer<Double, XYFit> {
 
         val prior: DifferentiableExpression<Double>? get() = problem.getFeature<OptimizationPrior<Double>>()
 
-        override fun toString(): String  = parameters.toString()
+        override fun toString(): String = parameters.toString()
     }
 
     /**
@@ -242,9 +250,15 @@ public object QowOptimizer : Optimizer<Double, XYFit> {
     }
 
     override suspend fun optimize(problem: XYFit): XYFit {
-        val qowSteps = 2
-        val initialWeight = QoWeight(problem, problem.startPoint)
-        val res = initialWeight.newtonianRun()
+        val qowRuns = problem.getFeature<QowRuns>()?.runs ?: 2
+
+
+        var qow = QoWeight(problem, problem.startPoint)
+        var res = qow.newtonianRun()
+        repeat(qowRuns - 1) {
+            qow = QoWeight(problem, res.parameters)
+            res = qow.newtonianRun()
+        }
         return res.problem.withFeature(OptimizationResult(res.parameters))
     }
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d1cbbe74c..0fc77b38e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,11 +5,11 @@ pluginManagement {
         gradlePluginPortal()
     }
 
-    val kotlinVersion = "1.5.21"
+    val kotlinVersion = "1.5.30"
 
     plugins {
         id("org.jetbrains.kotlinx.benchmark") version "0.3.1"
-        id("ru.mipt.npm.gradle.project") version "0.10.2"
+        id("ru.mipt.npm.gradle.project") version "0.10.3"
         kotlin("multiplatform") version kotlinVersion
         kotlin("plugin.allopen") version kotlinVersion
     }
-- 
2.34.1


From 546d56aeee3615d66fcbfda22d7e27329eb711ca Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 19 Sep 2021 21:13:07 +0300
Subject: [PATCH 330/713] Refactor buffer builders to suit new discoverability
 pattern

---
 CHANGELOG.md                                         |  1 +
 .../space/kscience/kmath/operations/ComplexDemo.kt   |  4 ++--
 .../kotlin/space/kscience/kmath/complex/Complex.kt   |  2 ++
 .../kotlin/space/kscience/kmath/operations/BigInt.kt | 10 ++++++++++
 .../space/kscience/kmath/operations/numbers.kt       | 12 ++++++++++++
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec3f5252a..19b7dae32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
 - Rename `DifferentiableMstExpression` to `KotlingradExpression`
 - `FeatureSet` now accepts only `Feature`. It is possible to override keys and use interfaces.
 - Use `Symbol` factory function instead of `StringSymbol`
+- New discoverability pattern: `<Type>.algebra.<nd/etc>`
 
 ### Deprecated
 - Specialized `DoubleBufferAlgebra`
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt
index 8b511f961..743f05b13 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt
@@ -7,13 +7,13 @@ package space.kscience.kmath.operations
 
 import space.kscience.kmath.complex.Complex
 import space.kscience.kmath.complex.ComplexField
+import space.kscience.kmath.complex.nd
 import space.kscience.kmath.complex.withNd
 import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.autoNd
 
 fun main() {
     // 2d element
-    val element = ComplexField.autoNd(2, 2).produce { (i, j) ->
+    val element = ComplexField.nd(2, 2).produce { (i, j) ->
         Complex(i - j, i + j)
     }
     println(element)
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index 08bd12205..793587492 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -203,6 +203,8 @@ public data class Complex(val re: Double, val im: Double) {
     }
 }
 
+public val Complex.Companion.algebra: ComplexField get() = ComplexField
+
 
 /**
  * Creates a complex number with real part equal to this real.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 02741e6ab..9797027c7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -526,11 +526,21 @@ public fun String.parseBigInteger(): BigInt? {
     }
 }
 
+public val BigInt.algebra: BigIntField get() = BigIntField
+
+@Deprecated("Use BigInt::buffer")
 public inline fun Buffer.Companion.bigInt(size: Int, initializer: (Int) -> BigInt): Buffer<BigInt> =
     boxing(size, initializer)
 
+public inline fun BigInt.buffer(size: Int, initializer: (Int) -> BigInt): Buffer<BigInt> =
+    Buffer.boxing(size, initializer)
+
+@Deprecated("Use BigInt::mutableBuffer")
 public inline fun MutableBuffer.Companion.bigInt(size: Int, initializer: (Int) -> BigInt): MutableBuffer<BigInt> =
     boxing(size, initializer)
 
+public inline fun BigInt.mutableBuffer(size: Int, initializer: (Int) -> BigInt): Buffer<BigInt> =
+    Buffer.boxing(size, initializer)
+
 public fun BigIntField.nd(vararg shape: Int): BufferedRingND<BigInt, BigIntField> =
     BufferedRingND(shape, BigIntField, Buffer.Companion::bigInt)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index e75d815cf..c90553aaa 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -107,6 +107,8 @@ public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOp
     override inline fun Double.div(b: Double): Double = this / b
 }
 
+public val Double.Companion.algebra: DoubleField get() = DoubleField
+
 /**
  * A field for [Float] without boxing. Does not produce appropriate field element.
  */
@@ -158,6 +160,8 @@ public object FloatField : ExtendedField<Float>, Norm<Float, Float> {
     override inline fun Float.div(b: Float): Float = this / b
 }
 
+public val Float.Companion.algebra: FloatField get() = FloatField
+
 /**
  * A field for [Int] without boxing. Does not produce corresponding ring element.
  */
@@ -180,6 +184,8 @@ public object IntRing : Ring<Int>, Norm<Int, Int>, NumericAlgebra<Int> {
     override inline fun Int.times(b: Int): Int = this * b
 }
 
+public val Int.Companion.algebra: IntRing get() = IntRing
+
 /**
  * A field for [Short] without boxing. Does not produce appropriate ring element.
  */
@@ -202,6 +208,8 @@ public object ShortRing : Ring<Short>, Norm<Short, Short>, NumericAlgebra<Short>
     override inline fun Short.times(b: Short): Short = (this * b).toShort()
 }
 
+public val Short.Companion.algebra: ShortRing get() = ShortRing
+
 /**
  * A field for [Byte] without boxing. Does not produce appropriate ring element.
  */
@@ -224,6 +232,8 @@ public object ByteRing : Ring<Byte>, Norm<Byte, Byte>, NumericAlgebra<Byte> {
     override inline fun Byte.times(b: Byte): Byte = (this * b).toByte()
 }
 
+public val Byte.Companion.algebra: ByteRing get() = ByteRing
+
 /**
  * A field for [Double] without boxing. Does not produce appropriate ring element.
  */
@@ -245,3 +255,5 @@ public object LongRing : Ring<Long>, Norm<Long, Long>, NumericAlgebra<Long> {
     override inline fun Long.minus(b: Long): Long = (this - b)
     override inline fun Long.times(b: Long): Long = (this * b)
 }
+
+public val Long.Companion.algebra: LongRing get() = LongRing
-- 
2.34.1


From 9fcc1b3af27ad348b44d6fc073d9cef832f7786b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 19 Sep 2021 21:17:26 +0300
Subject: [PATCH 331/713] Split Buffer.kt for better readability

---
 .../kscience/kmath/structures/ArrayBuffer.kt  |  32 ++++
 .../space/kscience/kmath/structures/Buffer.kt | 164 ------------------
 .../kscience/kmath/structures/ListBuffer.kt   |  58 +++++++
 .../kmath/structures/MutableBuffer.kt         |  97 +++++++++++
 4 files changed, 187 insertions(+), 164 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt
new file mode 100644
index 000000000..d49f70355
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.structures
+
+/**
+ * [MutableBuffer] implementation over [Array].
+ *
+ * @param T the type of elements contained in the buffer.
+ * @property array The underlying array.
+ */
+public class ArrayBuffer<T>(internal val array: Array<T>) : MutableBuffer<T> {
+    // Can't inline because array is invariant
+    override val size: Int get() = array.size
+
+    override operator fun get(index: Int): T = array[index]
+
+    override operator fun set(index: Int, value: T) {
+        array[index] = value
+    }
+
+    override operator fun iterator(): Iterator<T> = array.iterator()
+    override fun copy(): MutableBuffer<T> = ArrayBuffer(array.copyOf())
+}
+
+
+/**
+ * Returns an [ArrayBuffer] that wraps the original array.
+ */
+public fun <T> Array<T>.asBuffer(): ArrayBuffer<T> = ArrayBuffer(this)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index 6a97d18c2..c22a4ba39 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -98,170 +98,6 @@ public interface Buffer<out T> {
  */
 public val Buffer<*>.indices: IntRange get() = 0 until size
 
-/**
- * A generic mutable random-access structure for both primitives and objects.
- *
- * @param T the type of elements contained in the buffer.
- */
-public interface MutableBuffer<T> : Buffer<T> {
-    /**
-     * Sets the array element at the specified [index] to the specified [value].
-     */
-    public operator fun set(index: Int, value: T)
-
-    /**
-     * Returns a shallow copy of the buffer.
-     */
-    public fun copy(): MutableBuffer<T>
-
-    public companion object {
-        /**
-         * Creates a [DoubleBuffer] with the specified [size], where each element is calculated by calling the specified
-         * [initializer] function.
-         */
-        public inline fun double(size: Int, initializer: (Int) -> Double): DoubleBuffer =
-            DoubleBuffer(size, initializer)
-
-        /**
-         * Creates a [ShortBuffer] with the specified [size], where each element is calculated by calling the specified
-         * [initializer] function.
-         */
-        public inline fun short(size: Int, initializer: (Int) -> Short): ShortBuffer =
-            ShortBuffer(size, initializer)
-
-        /**
-         * Creates a [IntBuffer] with the specified [size], where each element is calculated by calling the specified
-         * [initializer] function.
-         */
-        public inline fun int(size: Int, initializer: (Int) -> Int): IntBuffer =
-            IntBuffer(size, initializer)
-
-        /**
-         * Creates a [LongBuffer] with the specified [size], where each element is calculated by calling the specified
-         * [initializer] function.
-         */
-        public inline fun long(size: Int, initializer: (Int) -> Long): LongBuffer =
-            LongBuffer(size, initializer)
-
-
-        /**
-         * Creates a [FloatBuffer] with the specified [size], where each element is calculated by calling the specified
-         * [initializer] function.
-         */
-        public inline fun float(size: Int, initializer: (Int) -> Float): FloatBuffer =
-            FloatBuffer(size, initializer)
-
-
-        /**
-         * Create a boxing mutable buffer of given type
-         */
-        public inline fun <T> boxing(size: Int, initializer: (Int) -> T): MutableBuffer<T> =
-            MutableListBuffer(MutableList(size, initializer))
-
-        /**
-         * Creates a [MutableBuffer] of given [type]. If the type is primitive, specialized buffers are used
-         * ([IntBuffer], [DoubleBuffer], etc.), [ListBuffer] is returned otherwise.
-         *
-         * The [size] is specified, and each element is calculated by calling the specified [initializer] function.
-         */
-        @Suppress("UNCHECKED_CAST")
-        public inline fun <T : Any> auto(type: KClass<out T>, size: Int, initializer: (Int) -> T): MutableBuffer<T> =
-            when (type) {
-                Double::class -> double(size) { initializer(it) as Double } as MutableBuffer<T>
-                Short::class -> short(size) { initializer(it) as Short } as MutableBuffer<T>
-                Int::class -> int(size) { initializer(it) as Int } as MutableBuffer<T>
-                Float::class -> float(size) { initializer(it) as Float } as MutableBuffer<T>
-                Long::class -> long(size) { initializer(it) as Long } as MutableBuffer<T>
-                else -> boxing(size, initializer)
-            }
-
-        /**
-         * Creates a [MutableBuffer] of given type [T]. If the type is primitive, specialized buffers are used
-         * ([IntBuffer], [DoubleBuffer], etc.), [ListBuffer] is returned otherwise.
-         *
-         * The [size] is specified, and each element is calculated by calling the specified [initializer] function.
-         */
-        @Suppress("UNCHECKED_CAST")
-        public inline fun <reified T : Any> auto(size: Int, initializer: (Int) -> T): MutableBuffer<T> =
-            auto(T::class, size, initializer)
-    }
-}
-
-/**
- * [Buffer] implementation over [List].
- *
- * @param T the type of elements contained in the buffer.
- * @property list The underlying list.
- */
-public class ListBuffer<T>(public val list: List<T>) : Buffer<T> {
-
-    public constructor(size: Int, initializer: (Int) -> T) : this(List(size, initializer))
-
-    override val size: Int get() = list.size
-
-    override operator fun get(index: Int): T = list[index]
-    override operator fun iterator(): Iterator<T> = list.iterator()
-}
-
-/**
- * Returns an [ListBuffer] that wraps the original list.
- */
-public fun <T> List<T>.asBuffer(): ListBuffer<T> = ListBuffer(this)
-
-/**
- * [MutableBuffer] implementation over [MutableList].
- *
- * @param T the type of elements contained in the buffer.
- * @property list The underlying list.
- */
-@JvmInline
-public value class MutableListBuffer<T>(public val list: MutableList<T>) : MutableBuffer<T> {
-
-    public constructor(size: Int, initializer: (Int) -> T) : this(MutableList(size, initializer))
-
-    override val size: Int get() = list.size
-
-    override operator fun get(index: Int): T = list[index]
-
-    override operator fun set(index: Int, value: T) {
-        list[index] = value
-    }
-
-    override operator fun iterator(): Iterator<T> = list.iterator()
-    override fun copy(): MutableBuffer<T> = MutableListBuffer(ArrayList(list))
-}
-
-/**
- * Returns an [MutableListBuffer] that wraps the original list.
- */
-public fun <T> MutableList<T>.asMutableBuffer(): MutableListBuffer<T> = MutableListBuffer(this)
-
-/**
- * [MutableBuffer] implementation over [Array].
- *
- * @param T the type of elements contained in the buffer.
- * @property array The underlying array.
- */
-public class ArrayBuffer<T>(internal val array: Array<T>) : MutableBuffer<T> {
-    // Can't inline because array is invariant
-    override val size: Int get() = array.size
-
-    override operator fun get(index: Int): T = array[index]
-
-    override operator fun set(index: Int, value: T) {
-        array[index] = value
-    }
-
-    override operator fun iterator(): Iterator<T> = array.iterator()
-    override fun copy(): MutableBuffer<T> = ArrayBuffer(array.copyOf())
-}
-
-
-/**
- * Returns an [ArrayBuffer] that wraps the original array.
- */
-public fun <T> Array<T>.asBuffer(): ArrayBuffer<T> = ArrayBuffer(this)
-
 /**
  * Immutable wrapper for [MutableBuffer].
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt
new file mode 100644
index 000000000..fdba68d19
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.structures
+
+import kotlin.jvm.JvmInline
+
+/**
+ * [Buffer] implementation over [List].
+ *
+ * @param T the type of elements contained in the buffer.
+ * @property list The underlying list.
+ */
+public class ListBuffer<T>(public val list: List<T>) : Buffer<T> {
+
+    public constructor(size: Int, initializer: (Int) -> T) : this(List(size, initializer))
+
+    override val size: Int get() = list.size
+
+    override operator fun get(index: Int): T = list[index]
+    override operator fun iterator(): Iterator<T> = list.iterator()
+}
+
+
+/**
+ * Returns an [ListBuffer] that wraps the original list.
+ */
+public fun <T> List<T>.asBuffer(): ListBuffer<T> = ListBuffer(this)
+
+/**
+ * [MutableBuffer] implementation over [MutableList].
+ *
+ * @param T the type of elements contained in the buffer.
+ * @property list The underlying list.
+ */
+@JvmInline
+public value class MutableListBuffer<T>(public val list: MutableList<T>) : MutableBuffer<T> {
+
+    public constructor(size: Int, initializer: (Int) -> T) : this(MutableList(size, initializer))
+
+    override val size: Int get() = list.size
+
+    override operator fun get(index: Int): T = list[index]
+
+    override operator fun set(index: Int, value: T) {
+        list[index] = value
+    }
+
+    override operator fun iterator(): Iterator<T> = list.iterator()
+    override fun copy(): MutableBuffer<T> = MutableListBuffer(ArrayList(list))
+}
+
+/**
+ * Returns an [MutableListBuffer] that wraps the original list.
+ */
+public fun <T> MutableList<T>.asMutableBuffer(): MutableListBuffer<T> = MutableListBuffer(this)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt
new file mode 100644
index 000000000..97185b918
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.structures
+
+import kotlin.reflect.KClass
+
+/**
+ * A generic mutable random-access structure for both primitives and objects.
+ *
+ * @param T the type of elements contained in the buffer.
+ */
+public interface MutableBuffer<T> : Buffer<T> {
+    /**
+     * Sets the array element at the specified [index] to the specified [value].
+     */
+    public operator fun set(index: Int, value: T)
+
+    /**
+     * Returns a shallow copy of the buffer.
+     */
+    public fun copy(): MutableBuffer<T>
+
+    public companion object {
+        /**
+         * Creates a [DoubleBuffer] with the specified [size], where each element is calculated by calling the specified
+         * [initializer] function.
+         */
+        public inline fun double(size: Int, initializer: (Int) -> Double): DoubleBuffer =
+            DoubleBuffer(size, initializer)
+
+        /**
+         * Creates a [ShortBuffer] with the specified [size], where each element is calculated by calling the specified
+         * [initializer] function.
+         */
+        public inline fun short(size: Int, initializer: (Int) -> Short): ShortBuffer =
+            ShortBuffer(size, initializer)
+
+        /**
+         * Creates a [IntBuffer] with the specified [size], where each element is calculated by calling the specified
+         * [initializer] function.
+         */
+        public inline fun int(size: Int, initializer: (Int) -> Int): IntBuffer =
+            IntBuffer(size, initializer)
+
+        /**
+         * Creates a [LongBuffer] with the specified [size], where each element is calculated by calling the specified
+         * [initializer] function.
+         */
+        public inline fun long(size: Int, initializer: (Int) -> Long): LongBuffer =
+            LongBuffer(size, initializer)
+
+
+        /**
+         * Creates a [FloatBuffer] with the specified [size], where each element is calculated by calling the specified
+         * [initializer] function.
+         */
+        public inline fun float(size: Int, initializer: (Int) -> Float): FloatBuffer =
+            FloatBuffer(size, initializer)
+
+
+        /**
+         * Create a boxing mutable buffer of given type
+         */
+        public inline fun <T> boxing(size: Int, initializer: (Int) -> T): MutableBuffer<T> =
+            MutableListBuffer(MutableList(size, initializer))
+
+        /**
+         * Creates a [MutableBuffer] of given [type]. If the type is primitive, specialized buffers are used
+         * ([IntBuffer], [DoubleBuffer], etc.), [ListBuffer] is returned otherwise.
+         *
+         * The [size] is specified, and each element is calculated by calling the specified [initializer] function.
+         */
+        @Suppress("UNCHECKED_CAST")
+        public inline fun <T : Any> auto(type: KClass<out T>, size: Int, initializer: (Int) -> T): MutableBuffer<T> =
+            when (type) {
+                Double::class -> double(size) { initializer(it) as Double } as MutableBuffer<T>
+                Short::class -> short(size) { initializer(it) as Short } as MutableBuffer<T>
+                Int::class -> int(size) { initializer(it) as Int } as MutableBuffer<T>
+                Float::class -> float(size) { initializer(it) as Float } as MutableBuffer<T>
+                Long::class -> long(size) { initializer(it) as Long } as MutableBuffer<T>
+                else -> boxing(size, initializer)
+            }
+
+        /**
+         * Creates a [MutableBuffer] of given type [T]. If the type is primitive, specialized buffers are used
+         * ([IntBuffer], [DoubleBuffer], etc.), [ListBuffer] is returned otherwise.
+         *
+         * The [size] is specified, and each element is calculated by calling the specified [initializer] function.
+         */
+        @Suppress("UNCHECKED_CAST")
+        public inline fun <reified T : Any> auto(size: Int, initializer: (Int) -> T): MutableBuffer<T> =
+            auto(T::class, size, initializer)
+    }
+}
\ No newline at end of file
-- 
2.34.1


From 89eebbecb76280586f39646bc08cf6a6975bdae7 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 21 Sep 2021 21:24:27 +0300
Subject: [PATCH 332/713] Fix EJML inversion issue

---
 CHANGELOG.md                                  |  1 +
 benchmarks/build.gradle.kts                   | 10 +++++
 .../kscience/kmath/benchmarks/DotBenchmark.kt | 11 +++--
 .../benchmarks/MatrixInverseBenchmark.kt      | 15 ++++---
 .../kmath/benchmarks/NDFieldBenchmark.kt      | 10 +++--
 .../kmath/benchmarks/ViktorBenchmark.kt       |  8 ++--
 .../kmath/benchmarks/ViktorLogBenchmark.kt    |  8 ++--
 .../kmath/functions/matrixIntegration.kt      |  8 ++--
 .../kscience/kmath/operations/ComplexDemo.kt  | 31 --------------
 .../kscience/kmath/operations/complexDemo.kt  | 41 +++++++++++++++++++
 .../kscience/kmath/structures/ComplexND.kt    |  8 ++--
 .../kscience/kmath/structures/NDField.kt      | 10 ++---
 .../kscience/kmath/structures/buffers.kt      |  4 +-
 .../kscience/kmath/commons/linear/CMMatrix.kt |  6 ++-
 .../kscience/kmath/commons/linear/CMSolver.kt | 12 +++---
 .../kscience/kmath/complex/ComplexFieldND.kt  |  9 +++-
 .../kmath/linear/BufferedLinearSpace.kt       | 19 +++++----
 .../kscience/kmath/linear/LinearSpace.kt      | 21 ++++++----
 .../kscience/kmath/linear/LupDecomposition.kt |  6 +--
 .../kscience/kmath/linear/MatrixWrapper.kt    |  9 ++--
 .../kscience/kmath/nd/BufferAlgebraND.kt      | 20 ++++-----
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |  4 +-
 .../space/kscience/kmath/nd/ShortRingND.kt    |  2 +-
 .../space/kscience/kmath/nd/Structure1D.kt    |  6 ++-
 .../space/kscience/kmath/nd/Structure2D.kt    |  2 -
 .../space/kscience/kmath/nd/StructureND.kt    | 23 +++++++++--
 .../kmath/operations/BufferAlgebra.kt         | 24 +++++++----
 .../kscience/kmath/structures/ArrayBuffer.kt  |  2 +
 .../space/kscience/kmath/structures/Buffer.kt |  7 ++++
 .../kmath/structures/BufferAccessor2D.kt      |  2 +
 .../kmath/structures/FlaggedBuffer.kt         |  8 +++-
 .../kscience/kmath/structures/ListBuffer.kt   |  2 +
 .../kscience/kmath/structures/MemoryBuffer.kt |  2 +
 .../kscience/kmath/structures/NDFieldTest.kt  |  6 +--
 .../kmath/structures/NumberNDFieldTest.kt     |  6 +--
 .../kscience/kmath/streaming/RingBuffer.kt    |  2 +
 .../kscience/kmath/ejml/EjmlLinearSpace.kt    |  6 +++
 .../kscience/kmath/ejml/EjmlMatrixTest.kt     | 25 +++++++++--
 .../space/kscience/kmath/real/RealMatrix.kt   | 37 +++++++++--------
 .../kotlin/space/kscience/kmath/real/dot.kt   |  5 ++-
 .../kmath/integration/SplineIntegrator.kt     |  2 +
 .../kmath/histogram/DoubleHistogramSpace.kt   |  2 +-
 .../kscience/kmath/viktor/ViktorBuffer.kt     |  6 ++-
 43 files changed, 284 insertions(+), 164 deletions(-)
 delete mode 100644 examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19b7dae32..c27dafeb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
 - `FeatureSet` now accepts only `Feature`. It is possible to override keys and use interfaces.
 - Use `Symbol` factory function instead of `StringSymbol`
 - New discoverability pattern: `<Type>.algebra.<nd/etc>`
+- Adjusted commons-math API for linear solvers to match conventions.
 
 ### Deprecated
 - Specialized `DoubleBufferAlgebra`
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index d96c5a8b6..fa72dc8ee 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -105,6 +105,16 @@ benchmark {
         commonConfiguration()
         include("JafamaBenchmark")
     }
+
+    configurations.register("viktor") {
+        commonConfiguration()
+        include("ViktorBenchmark")
+    }
+
+    configurations.register("viktorLog") {
+        commonConfiguration()
+        include("ViktorLogBenchmark")
+    }
 }
 
 // Fix kotlinx-benchmarks bug
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 7806cd06c..6373d1ce5 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -13,7 +13,10 @@ import space.kscience.kmath.commons.linear.CMLinearSpace
 import space.kscience.kmath.ejml.EjmlLinearSpaceDDRM
 import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.invoke
+import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.structures.Buffer
 import kotlin.random.Random
 
 @State(Scope.Benchmark)
@@ -35,7 +38,7 @@ internal class DotBenchmark {
 
     @Benchmark
     fun cmDot(blackhole: Blackhole) {
-        CMLinearSpace.run {
+        CMLinearSpace {
             blackhole.consume(cmMatrix1 dot cmMatrix2)
         }
     }
@@ -56,14 +59,14 @@ internal class DotBenchmark {
 
     @Benchmark
     fun bufferedDot(blackhole: Blackhole) {
-        LinearSpace.auto(DoubleField).invoke {
+        with(DoubleField.linearSpace(Buffer.Companion::auto)) {
             blackhole.consume(matrix1 dot matrix2)
         }
     }
 
     @Benchmark
-    fun realDot(blackhole: Blackhole) {
-        LinearSpace.double {
+    fun doubleDot(blackhole: Blackhole) {
+        with(Double.algebra.linearSpace) {
             blackhole.consume(matrix1 dot matrix2)
         }
     }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
index 21d7ca41c..5d331af9a 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
@@ -10,13 +10,12 @@ import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import space.kscience.kmath.commons.linear.CMLinearSpace
-import space.kscience.kmath.commons.linear.inverse
+import space.kscience.kmath.commons.linear.lupSolver
 import space.kscience.kmath.ejml.EjmlLinearSpaceDDRM
-import space.kscience.kmath.linear.InverseMatrixFeature
-import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.invoke
+import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.linear.lupSolver
-import space.kscience.kmath.nd.getFeature
+import space.kscience.kmath.operations.algebra
 import kotlin.random.Random
 
 @State(Scope.Benchmark)
@@ -25,7 +24,7 @@ internal class MatrixInverseBenchmark {
         private val random = Random(1224)
         private const val dim = 100
 
-        private val space = LinearSpace.double
+        private val space = Double.algebra.linearSpace
 
         //creating invertible matrix
         private val u = space.buildMatrix(dim, dim) { i, j -> if (i <= j) random.nextDouble() else 0.0 }
@@ -35,20 +34,20 @@ internal class MatrixInverseBenchmark {
 
     @Benchmark
     fun kmathLupInversion(blackhole: Blackhole) {
-        blackhole.consume(LinearSpace.double.lupSolver().inverse(matrix))
+        blackhole.consume(Double.algebra.linearSpace.lupSolver().inverse(matrix))
     }
 
     @Benchmark
     fun cmLUPInversion(blackhole: Blackhole) {
         CMLinearSpace {
-            blackhole.consume(inverse(matrix))
+            blackhole.consume(lupSolver().inverse(matrix))
         }
     }
 
     @Benchmark
     fun ejmlInverse(blackhole: Blackhole) {
         EjmlLinearSpaceDDRM {
-            blackhole.consume(matrix.getFeature<InverseMatrixFeature<Double>>()?.inverse)
+            blackhole.consume(matrix.toEjml().inverse())
         }
     }
 }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index fbf4bdaba..f72bc3ba0 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -9,7 +9,9 @@ import kotlinx.benchmark.Benchmark
 import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
-import space.kscience.kmath.nd.*
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.autoNdAlgebra
+import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.Buffer
 
@@ -46,8 +48,8 @@ internal class NDFieldBenchmark {
     private companion object {
         private const val dim = 1000
         private const val n = 100
-        private val autoField = DoubleField.autoNd(dim, dim)
-        private val specializedField = DoubleField.nd(dim, dim)
-        private val genericField = DoubleField.nd(Buffer.Companion::boxing, dim, dim)
+        private val autoField = DoubleField.autoNdAlgebra(dim, dim)
+        private val specializedField = DoubleField.ndAlgebra(dim, dim)
+        private val genericField = DoubleField.ndAlgebra(Buffer.Companion::boxing, dim, dim)
     }
 }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
index 6ea64ba3c..b97a05a52 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
@@ -11,8 +11,8 @@ import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import org.jetbrains.bio.viktor.F64Array
 import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.autoNd
-import space.kscience.kmath.nd.nd
+import space.kscience.kmath.nd.autoNdAlgebra
+import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.viktor.ViktorNDField
 
@@ -58,8 +58,8 @@ internal class ViktorBenchmark {
         private const val n = 100
 
         // automatically build context most suited for given type.
-        private val autoField = DoubleField.autoNd(dim, dim)
-        private val realField = DoubleField.nd(dim, dim)
+        private val autoField = DoubleField.autoNdAlgebra(dim, dim)
+        private val realField = DoubleField.ndAlgebra(dim, dim)
         private val viktorField = ViktorNDField(dim, dim)
     }
 }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
index afe44ea99..91e9dcd76 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
@@ -10,8 +10,8 @@ import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import org.jetbrains.bio.viktor.F64Array
-import space.kscience.kmath.nd.autoNd
-import space.kscience.kmath.nd.nd
+import space.kscience.kmath.nd.autoNdAlgebra
+import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.viktor.ViktorFieldND
 
@@ -50,8 +50,8 @@ internal class ViktorLogBenchmark {
         private const val n = 100
 
         // automatically build context most suited for given type.
-        private val autoField = DoubleField.autoNd(dim, dim)
-        private val realNdField = DoubleField.nd(dim, dim)
+        private val autoField = DoubleField.autoNdAlgebra(dim, dim)
+        private val realNdField = DoubleField.ndAlgebra(dim, dim)
         private val viktorField = ViktorFieldND(intArrayOf(dim, dim))
     }
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index d932fdb9f..93b5671fe 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -9,12 +9,12 @@ import space.kscience.kmath.integration.gaussIntegrator
 import space.kscience.kmath.integration.integrate
 import space.kscience.kmath.integration.value
 import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.withNd
-import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.nd.withNdAlgebra
+import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.invoke
 
-fun main(): Unit = DoubleField {
-    withNd(2, 2) {
+fun main(): Unit = Double.algebra {
+    withNdAlgebra(2, 2) {
 
         //Produce a diagonal StructureND
         fun diagonal(v: Double) = produce { (i, j) ->
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt
deleted file mode 100644
index 743f05b13..000000000
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/ComplexDemo.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
-
-package space.kscience.kmath.operations
-
-import space.kscience.kmath.complex.Complex
-import space.kscience.kmath.complex.ComplexField
-import space.kscience.kmath.complex.nd
-import space.kscience.kmath.complex.withNd
-import space.kscience.kmath.nd.StructureND
-
-fun main() {
-    // 2d element
-    val element = ComplexField.nd(2, 2).produce { (i, j) ->
-        Complex(i - j, i + j)
-    }
-    println(element)
-
-    // 1d element operation
-    val result: StructureND<Complex> = ComplexField.withNd(8) {
-        val a = produce { (it) -> i * it - it.toDouble() }
-        val b = 3
-        val c = Complex(1.0, 1.0)
-
-        (a pow b) + c
-    }
-
-    println(result)
-}
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
new file mode 100644
index 000000000..319221bcc
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.operations
+
+import space.kscience.kmath.complex.Complex
+import space.kscience.kmath.complex.algebra
+import space.kscience.kmath.complex.bufferAlgebra
+import space.kscience.kmath.complex.ndAlgebra
+import space.kscience.kmath.nd.BufferND
+import space.kscience.kmath.nd.StructureND
+
+fun main() = Complex.algebra {
+    val complex = 2 + 2 * i
+    println(complex * 8 - 5 * i)
+
+    //flat buffer
+    val buffer = bufferAlgebra(8).run {
+        buffer { Complex(it, -it) }.map { Complex(it.im, it.re) }
+    }
+    println(buffer)
+
+
+    // 2d element
+    val element: BufferND<Complex> = ndAlgebra(2, 2).produce { (i, j) ->
+        Complex(i - j, i + j)
+    }
+    println(element)
+
+    // 1d element operation
+    val result: StructureND<Complex> = ndAlgebra(8).run {
+        val a = produce { (it) -> i * it - it.toDouble() }
+        val b = 3
+        val c = Complex(1.0, 1.0)
+
+        (a pow b) + c
+    }
+    println(result)
+}
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
index c591f5682..d4554b3ba 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.complex.*
 import space.kscience.kmath.linear.transpose
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.nd.nd
+import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 import kotlin.system.measureTimeMillis
@@ -20,8 +20,8 @@ fun main() {
     val dim = 1000
     val n = 1000
 
-    val realField = DoubleField.nd(dim, dim)
-    val complexField: ComplexFieldND = ComplexField.nd(dim, dim)
+    val realField = DoubleField.ndAlgebra(dim, dim)
+    val complexField: ComplexFieldND = ComplexField.ndAlgebra(dim, dim)
 
     val realTime = measureTimeMillis {
         realField {
@@ -49,7 +49,7 @@ fun main() {
 fun complexExample() {
     //Create a context for 2-d structure with complex values
     ComplexField {
-        withNd(4, 8) {
+        withNdAlgebra(4, 8) {
             //a constant real-valued structure
             val x = one * 2.5
             operator fun Number.plus(other: Complex) = Complex(this.toDouble() + other.re, other.im)
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
index c9cafbba8..5b0e2eb30 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
@@ -9,8 +9,8 @@ import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import org.nd4j.linalg.factory.Nd4j
 import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.autoNd
-import space.kscience.kmath.nd.nd
+import space.kscience.kmath.nd.autoNdAlgebra
+import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.nd4j.Nd4jArrayField
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
@@ -33,11 +33,11 @@ fun main() {
     val n = 1000
 
     // automatically build context most suited for given type.
-    val autoField = DoubleField.autoNd(dim, dim)
+    val autoField = DoubleField.autoNdAlgebra(dim, dim)
     // specialized nd-field for Double. It works as generic Double field as well.
-    val realField = DoubleField.nd(dim, dim)
+    val realField = DoubleField.ndAlgebra(dim, dim)
     //A generic boxing field. It should be used for objects, not primitives.
-    val boxingField = DoubleField.nd(Buffer.Companion::boxing, dim, dim)
+    val boxingField = DoubleField.ndAlgebra(Buffer.Companion::boxing, dim, dim)
     // Nd4j specialized field.
     val nd4jField = Nd4jArrayField.real(dim, dim)
     //viktor field
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
index 0f7fdc46a..d78141507 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.structures
 
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.buffer
 import space.kscience.kmath.operations.bufferAlgebra
-import space.kscience.kmath.operations.produce
 
 inline fun <reified R : Any> MutableBuffer.Companion.same(
     n: Int,
@@ -17,6 +17,6 @@ inline fun <reified R : Any> MutableBuffer.Companion.same(
 
 fun main() {
     with(DoubleField.bufferAlgebra(5)) {
-        println(number(2.0) + produce(1, 2, 3, 4, 5))
+        println(number(2.0) + buffer(1, 2, 3, 4, 5))
     }
 }
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
index 7defd6841..14e7fc365 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
@@ -10,6 +10,7 @@ import space.kscience.kmath.linear.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureFeature
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.reflect.KClass
 import kotlin.reflect.cast
@@ -21,12 +22,15 @@ public class CMMatrix(public val origin: RealMatrix) : Matrix<Double> {
     override operator fun get(i: Int, j: Int): Double = origin.getEntry(i, j)
 }
 
-public class CMVector(public val origin: RealVector) : Point<Double> {
+@JvmInline
+public value class CMVector(public val origin: RealVector) : Point<Double> {
     override val size: Int get() = origin.dimension
 
     override operator fun get(index: Int): Double = origin.getEntry(index)
 
     override operator fun iterator(): Iterator<Double> = origin.toArray().iterator()
+
+    override fun toString(): String = Buffer.toString(this)
 }
 
 public fun RealVector.toPoint(): CMVector = CMVector(this)
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
index b9fbc07ae..d1fb441b0 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
@@ -18,7 +18,7 @@ public enum class CMDecomposition {
     CHOLESKY
 }
 
-public fun CMLinearSpace.solver(
+private fun CMLinearSpace.solver(
     a: Matrix<Double>,
     decomposition: CMDecomposition = CMDecomposition.LUP,
 ): DecompositionSolver = when (decomposition) {
@@ -48,9 +48,11 @@ public fun CMLinearSpace.inverse(
 
 
 public fun CMLinearSpace.solver(decomposition: CMDecomposition): LinearSolver<Double> = object : LinearSolver<Double> {
-    override fun solve(a: Matrix<Double>, b: Matrix<Double>): Matrix<Double> = solve(a, b, decomposition)
+    override fun solve(a: Matrix<Double>, b: Matrix<Double>): Matrix<Double> = solver(a, decomposition).solve(b.toCM().origin).wrap()
 
-    override fun solve(a: Matrix<Double>, b: Point<Double>): Point<Double> = solve(a, b, decomposition)
+    override fun solve(a: Matrix<Double>, b: Point<Double>): Point<Double> = solver(a, decomposition).solve(b.toCM().origin).toPoint()
 
-    override fun inverse(matrix: Matrix<Double>): Matrix<Double> = inverse(matrix, decomposition)
-}
\ No newline at end of file
+    override fun inverse(matrix: Matrix<Double>): Matrix<Double> = solver(matrix, decomposition).inverse.wrap()
+}
+
+public fun CMLinearSpace.lupSolver(): LinearSolver<Double> = solver((CMDecomposition.LUP))
\ No newline at end of file
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
index 41bcb83df..29e790d16 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
@@ -9,8 +9,10 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.BufferND
 import space.kscience.kmath.nd.BufferedFieldND
 import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.BufferField
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.NumbersAddOperations
+import space.kscience.kmath.operations.bufferAlgebra
 import space.kscience.kmath.structures.Buffer
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
@@ -111,13 +113,16 @@ public inline fun BufferedFieldND<Complex, ComplexField>.produceInline(initializ
     return BufferND(strides, buffer)
 }
 
+@UnstableKMathAPI
+public fun ComplexField.bufferAlgebra(size: Int): BufferField<Complex, ComplexField> =
+    bufferAlgebra(Buffer.Companion::complex, size)
 
-public fun ComplexField.nd(vararg shape: Int): ComplexFieldND = ComplexFieldND(shape)
+public fun ComplexField.ndAlgebra(vararg shape: Int): ComplexFieldND = ComplexFieldND(shape)
 
 /**
  * Produce a context for n-dimensional operations inside this real field
  */
-public inline fun <R> ComplexField.withNd(vararg shape: Int, action: ComplexFieldND.() -> R): R {
+public inline fun <R> ComplexField.withNdAlgebra(vararg shape: Int, action: ComplexFieldND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
     return ComplexFieldND(shape).action()
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 14235515c..5f17de607 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -8,17 +8,15 @@ package space.kscience.kmath.linear
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.BufferedRingND
 import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.nd.nd
+import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.nd.unwrap
+import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.BufferFactory
-import space.kscience.kmath.structures.VirtualBuffer
-import space.kscience.kmath.structures.indices
+import space.kscience.kmath.structures.*
 
 
-public class BufferedLinearSpace<T : Any, out A : Ring<T>>(
+public class BufferedLinearSpace<T, out A : Ring<T>>(
     override val elementAlgebra: A,
     private val bufferFactory: BufferFactory<T>,
 ) : LinearSpace<T, A> {
@@ -26,7 +24,7 @@ public class BufferedLinearSpace<T : Any, out A : Ring<T>>(
     private fun ndRing(
         rows: Int,
         cols: Int,
-    ): BufferedRingND<T, A> = elementAlgebra.nd(bufferFactory, rows, cols)
+    ): BufferedRingND<T, A> = elementAlgebra.ndAlgebra(bufferFactory, rows, cols)
 
     override fun buildMatrix(rows: Int, columns: Int, initializer: A.(i: Int, j: Int) -> T): Matrix<T> =
         ndRing(rows, columns).produce { (i, j) -> elementAlgebra.initializer(i, j) }.as2D()
@@ -92,3 +90,10 @@ public class BufferedLinearSpace<T : Any, out A : Ring<T>>(
         unwrap().map { it * value }.as2D()
     }
 }
+
+
+public fun <T, A : Ring<T>> A.linearSpace(bufferFactory: BufferFactory<T>): BufferedLinearSpace<T, A> =
+    BufferedLinearSpace(this, bufferFactory)
+
+public val DoubleField.linearSpace: BufferedLinearSpace<Double, DoubleField>
+    get() = BufferedLinearSpace(this, ::DoubleBuffer)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
index e94e984b3..1d8985b59 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
@@ -6,8 +6,13 @@
 package space.kscience.kmath.linear
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.*
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.nd.MutableStructure2D
+import space.kscience.kmath.nd.Structure2D
+import space.kscience.kmath.nd.StructureFeature
+import space.kscience.kmath.nd.as1D
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.DoubleBuffer
@@ -34,7 +39,7 @@ public typealias Point<T> = Buffer<T>
  * @param T the type of items in the matrices.
  * @param A the type of ring over [T].
  */
-public interface LinearSpace<T : Any, out A : Ring<T>> {
+public interface LinearSpace<T, out A : Ring<T>> {
     public val elementAlgebra: A
 
     /**
@@ -172,7 +177,8 @@ public interface LinearSpace<T : Any, out A : Ring<T>> {
      * @return a feature object or `null` if it isn't present.
      */
     @UnstableKMathAPI
-    public fun <F : StructureFeature> computeFeature(structure: Matrix<T>, type: KClass<out F>): F? = structure.getFeature(type)
+    public fun <F : StructureFeature> computeFeature(structure: Matrix<T>, type: KClass<out F>): F? =
+        structure.getFeature(type)
 
     public companion object {
 
@@ -184,6 +190,7 @@ public interface LinearSpace<T : Any, out A : Ring<T>> {
             bufferFactory: BufferFactory<T> = Buffer.Companion::boxing,
         ): LinearSpace<T, A> = BufferedLinearSpace(algebra, bufferFactory)
 
+        @Deprecated("use DoubleField.linearSpace")
         public val double: LinearSpace<Double, DoubleField> = buffered(DoubleField, ::DoubleBuffer)
 
         /**
@@ -213,10 +220,8 @@ public inline operator fun <LS : LinearSpace<*, *>, R> LS.invoke(block: LS.() ->
  * Convert matrix to vector if it is possible.
  */
 public fun <T : Any> Matrix<T>.asVector(): Point<T> =
-    if (this.colNum == 1)
-        as1D()
-    else
-        error("Can't convert matrix with more than one column to vector")
+    if (this.colNum == 1) as1D()
+    else error("Can't convert matrix with more than one column to vector")
 
 /**
  * Creates an n &times; 1 [VirtualMatrix], where n is the size of the given buffer.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
index 34fc661ed..95dd6d45c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
@@ -5,9 +5,7 @@
 
 package space.kscience.kmath.linear
 
-import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.getFeature
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.BufferAccessor2D
 import space.kscience.kmath.structures.DoubleBuffer
@@ -214,7 +212,6 @@ internal fun <T : Any> LupDecomposition<T>.solve(
 /**
  * Produce a generic solver based on LUP decomposition
  */
-@PerformancePitfall()
 @OptIn(UnstableKMathAPI::class)
 public fun <T : Comparable<T>, F : Field<T>> LinearSpace<T, F>.lupSolver(
     bufferFactory: MutableBufferFactory<T>,
@@ -222,13 +219,12 @@ public fun <T : Comparable<T>, F : Field<T>> LinearSpace<T, F>.lupSolver(
 ): LinearSolver<T> = object : LinearSolver<T> {
     override fun solve(a: Matrix<T>, b: Matrix<T>): Matrix<T> {
         // Use existing decomposition if it is provided by matrix
-        val decomposition = a.getFeature() ?: lup(bufferFactory, a, singularityCheck)
+        val decomposition = computeFeature(a) ?: lup(bufferFactory, a, singularityCheck)
         return decomposition.solve(bufferFactory, b)
     }
 
     override fun inverse(matrix: Matrix<T>): Matrix<T> = solve(matrix, one(matrix.rowNum, matrix.colNum))
 }
 
-@PerformancePitfall
 public fun LinearSpace<Double, DoubleField>.lupSolver(singularityThreshold: Double = 1e-11): LinearSolver<Double> =
     lupSolver(::DoubleBuffer) { it < singularityThreshold }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
index 3ba4e8648..a40c0384c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
@@ -8,7 +8,6 @@ package space.kscience.kmath.linear
 import space.kscience.kmath.misc.FeatureSet
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureFeature
-import space.kscience.kmath.nd.getFeature
 import space.kscience.kmath.operations.Ring
 import kotlin.reflect.KClass
 
@@ -26,7 +25,6 @@ public class MatrixWrapper<out T : Any> internal constructor(
      * Get the first feature matching given class. Does not guarantee that matrix has only one feature matching the
      * criteria.
      */
-    @UnstableKMathAPI
     @Suppress("UNCHECKED_CAST")
     override fun <F : StructureFeature> getFeature(type: KClass<out F>): F? =
         features.getFeature(type) ?: origin.getFeature(type)
@@ -90,8 +88,7 @@ public class TransposedFeature<out T : Any>(public val original: Matrix<T>) : Ma
 /**
  * Create a virtual transposed matrix without copying anything. `A.transpose().transpose() === A`
  */
+@Suppress("UNCHECKED_CAST")
 @OptIn(UnstableKMathAPI::class)
-public fun <T : Any> Matrix<T>.transpose(): Matrix<T> = getFeature<TransposedFeature<T>>()?.original ?: VirtualMatrix(
-    colNum,
-    rowNum,
-) { i, j -> get(j, i) }.withFeature(TransposedFeature(this))
+public fun <T : Any> Matrix<T>.transpose(): Matrix<T> = getFeature(TransposedFeature::class)?.original as? Matrix<T>
+    ?: VirtualMatrix(colNum, rowNum) { i, j -> get(j, i) }.withFeature(TransposedFeature(this))
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index b01beb02d..ae72f3689 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -87,39 +87,39 @@ public open class BufferedFieldND<T, out R : Field<T>>(
 }
 
 // group factories
-public fun <T, A : Group<T>> A.nd(
+public fun <T, A : Group<T>> A.ndAlgebra(
     bufferFactory: BufferFactory<T>,
     vararg shape: Int,
 ): BufferedGroupND<T, A> = BufferedGroupND(shape, this, bufferFactory)
 
 @JvmName("withNdGroup")
-public inline fun <T, A : Group<T>, R> A.withNd(
+public inline fun <T, A : Group<T>, R> A.withNdAlgebra(
     noinline bufferFactory: BufferFactory<T>,
     vararg shape: Int,
     action: BufferedGroupND<T, A>.() -> R,
 ): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return nd(bufferFactory, *shape).run(action)
+    return ndAlgebra(bufferFactory, *shape).run(action)
 }
 
 //ring factories
-public fun <T, A : Ring<T>> A.nd(
+public fun <T, A : Ring<T>> A.ndAlgebra(
     bufferFactory: BufferFactory<T>,
     vararg shape: Int,
 ): BufferedRingND<T, A> = BufferedRingND(shape, this, bufferFactory)
 
 @JvmName("withNdRing")
-public inline fun <T, A : Ring<T>, R> A.withNd(
+public inline fun <T, A : Ring<T>, R> A.withNdAlgebra(
     noinline bufferFactory: BufferFactory<T>,
     vararg shape: Int,
     action: BufferedRingND<T, A>.() -> R,
 ): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return nd(bufferFactory, *shape).run(action)
+    return ndAlgebra(bufferFactory, *shape).run(action)
 }
 
 //field factories
-public fun <T, A : Field<T>> A.nd(
+public fun <T, A : Field<T>> A.ndAlgebra(
     bufferFactory: BufferFactory<T>,
     vararg shape: Int,
 ): BufferedFieldND<T, A> = BufferedFieldND(shape, this, bufferFactory)
@@ -129,7 +129,7 @@ public fun <T, A : Field<T>> A.nd(
  */
 @UnstableKMathAPI
 @Suppress("UNCHECKED_CAST")
-public inline fun <reified T : Any, A : Field<T>> A.autoNd(
+public inline fun <reified T : Any, A : Field<T>> A.autoNdAlgebra(
     vararg shape: Int,
 ): FieldND<T, A> = when (this) {
     DoubleField -> DoubleFieldND(shape) as FieldND<T, A>
@@ -137,11 +137,11 @@ public inline fun <reified T : Any, A : Field<T>> A.autoNd(
 }
 
 @JvmName("withNdField")
-public inline fun <T, A : Field<T>, R> A.withNd(
+public inline fun <T, A : Field<T>, R> A.withNdAlgebra(
     noinline bufferFactory: BufferFactory<T>,
     vararg shape: Int,
     action: BufferedFieldND<T, A>.() -> R,
 ): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return nd(bufferFactory, *shape).run(action)
+    return ndAlgebra(bufferFactory, *shape).run(action)
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index fed4aca0b..0c7d4d5d1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -103,12 +103,12 @@ public class DoubleFieldND(
     override fun atanh(arg: StructureND<Double>): BufferND<Double> = arg.map { atanh(it) }
 }
 
-public fun DoubleField.nd(vararg shape: Int): DoubleFieldND = DoubleFieldND(shape)
+public fun DoubleField.ndAlgebra(vararg shape: Int): DoubleFieldND = DoubleFieldND(shape)
 
 /**
  * Produce a context for n-dimensional operations inside this real field
  */
-public inline fun <R> DoubleField.withNd(vararg shape: Int, action: DoubleFieldND.() -> R): R {
+public inline fun <R> DoubleField.withNdAlgebra(vararg shape: Int, action: DoubleFieldND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
     return DoubleFieldND(shape).run(action)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
index 5b6e2cd22..b56bef230 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
@@ -34,7 +34,7 @@ public class ShortRingND(
 public inline fun BufferedRingND<Short, ShortRing>.produceInline(crossinline initializer: ShortRing.(Int) -> Short): BufferND<Short> =
     BufferND(strides, ShortBuffer(ShortArray(strides.linearSize) { offset -> ShortRing.initializer(offset) }))
 
-public inline fun <R> ShortRing.withNd(vararg shape: Int, action: ShortRingND.() -> R): R {
+public inline fun <R> ShortRing.withNdAlgebra(vararg shape: Int, action: ShortRingND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
     return ShortRingND(shape).run(action)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index d0e2354d2..91cd5abe9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -67,12 +67,14 @@ private class MutableStructure1DWrapper<T>(val structure: MutableStructureND<T>)
         structure[intArrayOf(index)] = value
     }
 
-    @PerformancePitfall
+    @OptIn(PerformancePitfall::class)
     override fun copy(): MutableBuffer<T> = structure
         .elements()
         .map(Pair<IntArray, T>::second)
         .toMutableList()
         .asMutableBuffer()
+
+    override fun toString(): String = Buffer.toString(this)
 }
 
 
@@ -107,6 +109,8 @@ internal class MutableBuffer1DWrapper<T>(val buffer: MutableBuffer<T>) : Mutable
     }
 
     override fun copy(): MutableBuffer<T> = buffer.copy()
+
+    override fun toString(): String = Buffer.toString(this)
 }
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index 7fb8ea251..57836a9ef 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -6,7 +6,6 @@
 package space.kscience.kmath.nd
 
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableListBuffer
 import space.kscience.kmath.structures.VirtualBuffer
@@ -108,7 +107,6 @@ private value class Structure2DWrapper<out T>(val structure: StructureND<T>) : S
 
     override operator fun get(i: Int, j: Int): T = structure[i, j]
 
-    @UnstableKMathAPI
     override fun <F : StructureFeature> getFeature(type: KClass<out F>): F? = structure.getFeature(type)
 
     @PerformancePitfall
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 0675f5baf..6123336ba 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -9,12 +9,12 @@ import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.misc.Feature
 import space.kscience.kmath.misc.Featured
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import kotlin.jvm.JvmName
+import kotlin.math.abs
 import kotlin.native.concurrent.ThreadLocal
 import kotlin.reflect.KClass
 
@@ -61,7 +61,6 @@ public interface StructureND<out T> : Featured<StructureFeature> {
      * Feature is some additional structure information that allows to access it special properties or hints.
      * If the feature is not present, `null` is returned.
      */
-    @UnstableKMathAPI
     override fun <F : StructureFeature> getFeature(type: KClass<out F>): F? = null
 
     public companion object {
@@ -80,6 +79,22 @@ public interface StructureND<out T> : Featured<StructureFeature> {
             return st1.elements().all { (index, value) -> value == st2[index] }
         }
 
+        @PerformancePitfall
+        public fun contentEquals(
+            st1: StructureND<Double>,
+            st2: StructureND<Double>,
+            tolerance: Double = 1e-11
+        ): Boolean {
+            if (st1 === st2) return true
+
+            // fast comparison of buffers if possible
+            if (st1 is BufferND && st2 is BufferND && st1.strides == st2.strides)
+                return Buffer.contentEquals(st1.buffer, st2.buffer)
+
+            //element by element comparison if it could not be avoided
+            return st1.elements().all { (index, value) -> abs(value - st2[index]) < tolerance }
+        }
+
         /**
          * Debug output to string
          */
@@ -196,8 +211,8 @@ public fun <T : Comparable<T>> LinearSpace<T, Ring<T>>.contentEquals(
  */
 public operator fun <T> StructureND<T>.get(vararg index: Int): T = get(index)
 
-@UnstableKMathAPI
-public inline fun <reified T : StructureFeature> StructureND<*>.getFeature(): T? = getFeature(T::class)
+//@UnstableKMathAPI
+//public inline fun <reified T : StructureFeature> StructureND<*>.getFeature(): T? = getFeature(T::class)
 
 /**
  * Represents mutable [StructureND].
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
index 9f4d741fd..e82b62c1b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
@@ -17,6 +17,12 @@ import space.kscience.kmath.structures.DoubleBuffer
 public interface BufferAlgebra<T, A : Algebra<T>> : Algebra<Buffer<T>> {
     public val bufferFactory: BufferFactory<T>
     public val elementAlgebra: A
+    public val size: Int
+
+    public fun buffer(vararg elements: T): Buffer<T> {
+        require(elements.size == size) { "Expected $size elements but found ${elements.size}" }
+        return bufferFactory(size) { elements[it] }
+    }
 
     //TODO move to multi-receiver inline extension
     public fun Buffer<T>.map(block: (T) -> T): Buffer<T> = bufferFactory(size) { block(get(it)) }
@@ -39,6 +45,11 @@ public interface BufferAlgebra<T, A : Algebra<T>> : Algebra<Buffer<T>> {
     }
 }
 
+@UnstableKMathAPI
+public fun <T> BufferField<T, *>.buffer(initializer: (Int) -> T): Buffer<T> {
+    return bufferFactory(size, initializer)
+}
+
 @UnstableKMathAPI
 public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.sin(arg: Buffer<T>): Buffer<T> =
     arg.map(elementAlgebra::sin)
@@ -104,14 +115,9 @@ public fun <T, A : PowerOperations<T>> BufferAlgebra<T, A>.pow(arg: Buffer<T>, p
 public class BufferField<T, A : Field<T>>(
     override val bufferFactory: BufferFactory<T>,
     override val elementAlgebra: A,
-    public val size: Int
+    override val size: Int
 ) : BufferAlgebra<T, A>, Field<Buffer<T>> {
 
-    public fun produce(vararg elements: T): Buffer<T> {
-        require(elements.size == size) { "Expected $size elements but found ${elements.size}" }
-        return bufferFactory(size) { elements[it] }
-    }
-
     override val zero: Buffer<T> = bufferFactory(size) { elementAlgebra.zero }
     override val one: Buffer<T> = bufferFactory(size) { elementAlgebra.one }
 
@@ -135,11 +141,15 @@ public class BufferField<T, A : Field<T>>(
 //Double buffer specialization
 
 @UnstableKMathAPI
-public fun BufferField<Double, *>.produce(vararg elements: Number): Buffer<Double> {
+public fun BufferField<Double, *>.buffer(vararg elements: Number): Buffer<Double> {
     require(elements.size == size) { "Expected $size elements but found ${elements.size}" }
     return bufferFactory(size) { elements[it].toDouble() }
 }
 
+@UnstableKMathAPI
+public fun <T, A : Field<T>> A.bufferAlgebra(bufferFactory: BufferFactory<T>, size: Int): BufferField<T, A> =
+    BufferField(bufferFactory, this, size)
+
 @UnstableKMathAPI
 public fun DoubleField.bufferAlgebra(size: Int): BufferField<Double, DoubleField> =
     BufferField(::DoubleBuffer, DoubleField, size)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt
index d49f70355..393ee99d6 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt
@@ -23,6 +23,8 @@ public class ArrayBuffer<T>(internal val array: Array<T>) : MutableBuffer<T> {
 
     override operator fun iterator(): Iterator<T> = array.iterator()
     override fun copy(): MutableBuffer<T> = ArrayBuffer(array.copyOf())
+
+    override fun toString(): String = Buffer.toString(this)
 }
 
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index c22a4ba39..fc23169ca 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -45,7 +45,12 @@ public interface Buffer<out T> {
      */
     public operator fun iterator(): Iterator<T>
 
+    override fun toString(): String
+
     public companion object {
+
+        public fun toString(buffer: Buffer<*>): String = buffer.asSequence().joinToString(prefix = "[", separator = ", ", postfix = "]")
+
         /**
          * Check the element-by-element match of content of two buffers.
          */
@@ -126,6 +131,8 @@ public class VirtualBuffer<out T>(override val size: Int, private val generator:
     }
 
     override operator fun iterator(): Iterator<T> = (0 until size).asSequence().map(generator).iterator()
+
+    override fun toString(): String = Buffer.toString(this)
 }
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
index 005a693eb..d6a48f42d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
@@ -49,6 +49,8 @@ internal class BufferAccessor2D<T>(
         override fun copy(): MutableBuffer<T> = factory(colNum) { get(it) }
         override operator fun iterator(): Iterator<T> = (0 until colNum).map(::get).iterator()
 
+        override fun toString(): String = Buffer.toString(this)
+
     }
 
     /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
index 665558829..700a4f17f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
@@ -53,8 +53,10 @@ public fun FlaggedBuffer<*>.isMissing(index: Int): Boolean = hasFlag(index, Valu
 /**
  * A [Double] buffer that supports flags for each value like `NaN` or Missing.
  */
-public class FlaggedDoubleBuffer(public val values: DoubleArray, public val flags: ByteArray) : FlaggedBuffer<Double?>,
-    Buffer<Double?> {
+public class FlaggedDoubleBuffer(
+    public val values: DoubleArray,
+    public val flags: ByteArray
+) : FlaggedBuffer<Double?>, Buffer<Double?> {
     init {
         require(values.size == flags.size) { "Values and flags must have the same dimensions" }
     }
@@ -68,6 +70,8 @@ public class FlaggedDoubleBuffer(public val values: DoubleArray, public val flag
     override operator fun iterator(): Iterator<Double?> = values.indices.asSequence().map {
         if (isValid(it)) values[it] else null
     }.iterator()
+
+    override fun toString(): String = Buffer.toString(this)
 }
 
 public inline fun FlaggedDoubleBuffer.forEachValid(block: (Double) -> Unit) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt
index fdba68d19..666722177 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt
@@ -21,6 +21,8 @@ public class ListBuffer<T>(public val list: List<T>) : Buffer<T> {
 
     override operator fun get(index: Int): T = list[index]
     override operator fun iterator(): Iterator<T> = list.iterator()
+
+    override fun toString(): String = Buffer.toString(this)
 }
 
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
index 996785570..3e08dbbb1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
@@ -22,6 +22,8 @@ public open class MemoryBuffer<T : Any>(protected val memory: Memory, protected
     override operator fun get(index: Int): T = reader.read(spec, spec.objectSize * index)
     override operator fun iterator(): Iterator<T> = (0 until size).asSequence().map { get(it) }.iterator()
 
+    override fun toString(): String = Buffer.toString(this)
+
     public companion object {
         public fun <T : Any> create(spec: MemorySpec<T>, size: Int): MemoryBuffer<T> =
             MemoryBuffer(Memory.allocate(size * spec.objectSize), spec)
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
index 6d4531f41..05a67ab09 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.structures
 
 import space.kscience.kmath.nd.get
-import space.kscience.kmath.nd.nd
+import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.testutils.FieldVerifier
@@ -16,12 +16,12 @@ import kotlin.test.assertEquals
 internal class NDFieldTest {
     @Test
     fun verify() {
-        (DoubleField.nd(12, 32)) { FieldVerifier(this, one + 3, one - 23, one * 12, 6.66) }
+        (DoubleField.ndAlgebra(12, 32)) { FieldVerifier(this, one + 3, one - 23, one * 12, 6.66) }
     }
 
     @Test
     fun testStrides() {
-        val ndArray = DoubleField.nd(10, 10).produce { (it[0] + it[1]).toDouble() }
+        val ndArray = DoubleField.ndAlgebra(10, 10).produce { (it[0] + it[1]).toDouble() }
         assertEquals(ndArray[5, 5], 10.0)
     }
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index 1045933b7..b2982b335 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -10,7 +10,7 @@ import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.combine
 import space.kscience.kmath.nd.get
-import space.kscience.kmath.nd.nd
+import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Norm
 import space.kscience.kmath.operations.invoke
@@ -21,7 +21,7 @@ import kotlin.test.assertEquals
 
 @Suppress("UNUSED_VARIABLE")
 class NumberNDFieldTest {
-    val algebra = DoubleField.nd(3, 3)
+    val algebra = DoubleField.ndAlgebra(3, 3)
     val array1 = algebra.produce { (i, j) -> (i + j).toDouble() }
     val array2 = algebra.produce { (i, j) -> (i - j).toDouble() }
 
@@ -87,7 +87,7 @@ class NumberNDFieldTest {
     @Test
     fun testInternalContext() {
         algebra {
-            (DoubleField.nd(*array1.shape)) { with(L2Norm) { 1 + norm(array1) + exp(array2) } }
+            (DoubleField.ndAlgebra(*array1.shape)) { with(L2Norm) { 1 + norm(array1) + exp(array2) } }
         }
     }
 }
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
index 4b12b031d..573b406e2 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
@@ -69,6 +69,8 @@ public class RingBuffer<T>(
     @Suppress("NOTHING_TO_INLINE")
     private inline fun Int.forward(n: Int): Int = (this + n) % (buffer.size)
 
+    override fun toString(): String = Buffer.toString(this)
+
     public companion object {
         public inline fun <reified T : Any> build(size: Int, empty: T): RingBuffer<T> {
             val buffer = MutableBuffer.auto(size) { empty } as MutableBuffer<T?>
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
index 022a7874e..4a53af60d 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
@@ -5,9 +5,12 @@
 
 package space.kscience.kmath.ejml
 
+import space.kscience.kmath.linear.InverseMatrixFeature
 import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.Matrix
 import space.kscience.kmath.linear.Point
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.operations.Ring
 
 /**
@@ -36,4 +39,7 @@ public abstract class EjmlLinearSpace<T : Any, out A : Ring<T>, out M : org.ejml
     ): EjmlMatrix<T, M>
 
     public abstract override fun buildVector(size: Int, initializer: A.(Int) -> T): EjmlVector<T, M>
+
+    @UnstableKMathAPI
+    public fun EjmlMatrix<T, *>.inverse(): Structure2D<Double> = computeFeature(this, InverseMatrixFeature::class)?.inverse as Structure2D<Double>
 }
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
index 5667815ac..5b8b2af98 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
@@ -9,12 +9,11 @@ import org.ejml.data.DMatrixRMaj
 import org.ejml.dense.row.CommonOps_DDRM
 import org.ejml.dense.row.RandomMatrices_DDRM
 import org.ejml.dense.row.factory.DecompositionFactory_DDRM
-import space.kscience.kmath.linear.DeterminantFeature
-import space.kscience.kmath.linear.LupDecompositionFeature
-import space.kscience.kmath.linear.computeFeature
+import space.kscience.kmath.linear.*
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.algebra
 import kotlin.random.Random
 import kotlin.random.asJavaRandom
 import kotlin.test.*
@@ -82,4 +81,24 @@ internal class EjmlMatrixTest {
         val m = randomMatrix
         assertSame(m, EjmlDoubleMatrix(m).origin)
     }
+
+    @Test
+    fun inverse() = EjmlLinearSpaceDDRM {
+        val random = Random(1224)
+        val dim = 20
+
+        val space = Double.algebra.linearSpace
+
+        //creating invertible matrix
+        val u = space.buildMatrix(dim, dim) { i, j -> if (i <= j) random.nextDouble() else 0.0 }
+        val l = space.buildMatrix(dim, dim) { i, j -> if (i >= j) random.nextDouble() else 0.0 }
+        val matrix = space { l dot u }
+        val inverted = matrix.toEjml().inverse()
+
+        val res = matrix dot inverted
+
+        println(StructureND.toString(res))
+
+        assertTrue { StructureND.contentEquals(one(dim, dim), res, 1e-3) }
+    }
 }
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
index 098beb2cf..88932d59b 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
@@ -12,6 +12,7 @@ import space.kscience.kmath.linear.*
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asIterable
@@ -32,18 +33,18 @@ import kotlin.math.pow
 public typealias RealMatrix = Matrix<Double>
 
 public fun realMatrix(rowNum: Int, colNum: Int, initializer: DoubleField.(i: Int, j: Int) -> Double): RealMatrix =
-    LinearSpace.double.buildMatrix(rowNum, colNum, initializer)
+    Double.algebra.linearSpace.buildMatrix(rowNum, colNum, initializer)
 
 @OptIn(UnstableKMathAPI::class)
 public fun realMatrix(rowNum: Int, colNum: Int): MatrixBuilder<Double, DoubleField> =
-    LinearSpace.double.matrix(rowNum, colNum)
+    Double.algebra.linearSpace.matrix(rowNum, colNum)
 
 public fun Array<DoubleArray>.toMatrix(): RealMatrix {
-    return LinearSpace.double.buildMatrix(size, this[0].size) { row, col -> this@toMatrix[row][col] }
+    return Double.algebra.linearSpace.buildMatrix(size, this[0].size) { row, col -> this@toMatrix[row][col] }
 }
 
 public fun Sequence<DoubleArray>.toMatrix(): RealMatrix = toList().let {
-    LinearSpace.double.buildMatrix(it.size, it[0].size) { row, col -> it[row][col] }
+    Double.algebra.linearSpace.buildMatrix(it.size, it[0].size) { row, col -> it[row][col] }
 }
 
 public fun RealMatrix.repeatStackVertical(n: Int): RealMatrix =
@@ -56,37 +57,37 @@ public fun RealMatrix.repeatStackVertical(n: Int): RealMatrix =
  */
 
 public operator fun RealMatrix.times(double: Double): RealMatrix =
-    LinearSpace.double.buildMatrix(rowNum, colNum) { row, col ->
+    Double.algebra.linearSpace.buildMatrix(rowNum, colNum) { row, col ->
         get(row, col) * double
     }
 
 public operator fun RealMatrix.plus(double: Double): RealMatrix =
-    LinearSpace.double.buildMatrix(rowNum, colNum) { row, col ->
+    Double.algebra.linearSpace.buildMatrix(rowNum, colNum) { row, col ->
         get(row, col) + double
     }
 
 public operator fun RealMatrix.minus(double: Double): RealMatrix =
-    LinearSpace.double.buildMatrix(rowNum, colNum) { row, col ->
+    Double.algebra.linearSpace.buildMatrix(rowNum, colNum) { row, col ->
         get(row, col) - double
     }
 
 public operator fun RealMatrix.div(double: Double): RealMatrix =
-    LinearSpace.double.buildMatrix(rowNum, colNum) { row, col ->
+    Double.algebra.linearSpace.buildMatrix(rowNum, colNum) { row, col ->
         get(row, col) / double
     }
 
 public operator fun Double.times(matrix: RealMatrix): RealMatrix =
-    LinearSpace.double.buildMatrix(matrix.rowNum, matrix.colNum) { row, col ->
+    Double.algebra.linearSpace.buildMatrix(matrix.rowNum, matrix.colNum) { row, col ->
         this@times * matrix[row, col]
     }
 
 public operator fun Double.plus(matrix: RealMatrix): RealMatrix =
-    LinearSpace.double.buildMatrix(matrix.rowNum, matrix.colNum) { row, col ->
+    Double.algebra.linearSpace.buildMatrix(matrix.rowNum, matrix.colNum) { row, col ->
         this@plus + matrix[row, col]
     }
 
 public operator fun Double.minus(matrix: RealMatrix): RealMatrix =
-    LinearSpace.double.buildMatrix(matrix.rowNum, matrix.colNum) { row, col ->
+    Double.algebra.linearSpace.buildMatrix(matrix.rowNum, matrix.colNum) { row, col ->
         this@minus - matrix[row, col]
     }
 
@@ -101,20 +102,20 @@ public operator fun Double.minus(matrix: RealMatrix): RealMatrix =
 
 @UnstableKMathAPI
 public operator fun RealMatrix.times(other: RealMatrix): RealMatrix =
-    LinearSpace.double.buildMatrix(rowNum, colNum) { row, col -> this@times[row, col] * other[row, col] }
+    Double.algebra.linearSpace.buildMatrix(rowNum, colNum) { row, col -> this@times[row, col] * other[row, col] }
 
 public operator fun RealMatrix.plus(other: RealMatrix): RealMatrix =
-    LinearSpace.double.run { this@plus + other }
+    Double.algebra.linearSpace.run { this@plus + other }
 
 public operator fun RealMatrix.minus(other: RealMatrix): RealMatrix =
-    LinearSpace.double.buildMatrix(rowNum, colNum) { row, col -> this@minus[row, col] - other[row, col] }
+    Double.algebra.linearSpace.buildMatrix(rowNum, colNum) { row, col -> this@minus[row, col] - other[row, col] }
 
 /*
  *  Operations on columns
  */
 
 public inline fun RealMatrix.appendColumn(crossinline mapper: (Buffer<Double>) -> Double): RealMatrix =
-    LinearSpace.double.buildMatrix(rowNum, colNum + 1) { row, col ->
+    Double.algebra.linearSpace.buildMatrix(rowNum, colNum + 1) { row, col ->
         if (col < colNum)
             get(row, col)
         else
@@ -122,7 +123,7 @@ public inline fun RealMatrix.appendColumn(crossinline mapper: (Buffer<Double>) -
     }
 
 public fun RealMatrix.extractColumns(columnRange: IntRange): RealMatrix =
-    LinearSpace.double.buildMatrix(rowNum, columnRange.count()) { row, col ->
+    Double.algebra.linearSpace.buildMatrix(rowNum, columnRange.count()) { row, col ->
         this@extractColumns[row, columnRange.first + col]
     }
 
@@ -155,14 +156,14 @@ public fun RealMatrix.max(): Double? = elements().map { (_, value) -> value }.ma
 public fun RealMatrix.average(): Double = elements().map { (_, value) -> value }.average()
 
 public inline fun RealMatrix.map(crossinline transform: (Double) -> Double): RealMatrix =
-    LinearSpace.double.buildMatrix(rowNum, colNum) { i, j ->
+    Double.algebra.linearSpace.buildMatrix(rowNum, colNum) { i, j ->
         transform(get(i, j))
     }
 
 /**
  * Inverse a square real matrix using LUP decomposition
  */
-public fun RealMatrix.inverseWithLup(): RealMatrix = LinearSpace.double.lupSolver().inverse(this)
+public fun RealMatrix.inverseWithLup(): RealMatrix = Double.algebra.linearSpace.lupSolver().inverse(this)
 
 //extended operations
 
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
index ca2db8131..883a63f46 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
@@ -5,13 +5,14 @@
 
 package space.kscience.kmath.real
 
-import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.linear.linearSpace
+import space.kscience.kmath.operations.algebra
 
 
 /**
  * Optimized dot product for real matrices
  */
-public infix fun Matrix<Double>.dot(other: Matrix<Double>): Matrix<Double> = LinearSpace.double.run {
+public infix fun Matrix<Double>.dot(other: Matrix<Double>): Matrix<Double> = Double.algebra.linearSpace.run {
     this@dot dot other
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index c99f3ff99..662cdf3d7 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -10,6 +10,7 @@ import space.kscience.kmath.functions.integrate
 import space.kscience.kmath.interpolation.PolynomialInterpolator
 import space.kscience.kmath.interpolation.SplineInterpolator
 import space.kscience.kmath.interpolation.interpolatePolynomials
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Field
@@ -23,6 +24,7 @@ import space.kscience.kmath.structures.map
 /**
  * Compute analytical indefinite integral of this [PiecewisePolynomial], keeping all intervals intact
  */
+@OptIn(PerformancePitfall::class)
 @UnstableKMathAPI
 public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(algebra: Field<T>): PiecewisePolynomial<T> =
     PiecewisePolynomial(pieces.map { it.first to it.second.integrate(algebra) })
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
index 37ab8a1b2..5446f05f8 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
@@ -29,7 +29,7 @@ public class DoubleHistogramSpace(
     public val dimension: Int get() = lower.size
 
     private val shape = IntArray(binNums.size) { binNums[it] + 2 }
-    override val histogramValueSpace: DoubleFieldND = DoubleField.nd(*shape)
+    override val histogramValueSpace: DoubleFieldND = DoubleField.ndAlgebra(*shape)
 
     override val strides: Strides get() = histogramValueSpace.strides
     private val binSize = DoubleBuffer(dimension) { (upper[it] - lower[it]) / binNums[it] }
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
index caebd9783..32fb65b8a 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
@@ -6,10 +6,12 @@
 package space.kscience.kmath.viktor
 
 import org.jetbrains.bio.viktor.F64FlatArray
+import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer
 
 @Suppress("NOTHING_TO_INLINE", "OVERRIDE_BY_INLINE")
-public class ViktorBuffer(public val flatArray: F64FlatArray) : MutableBuffer<Double> {
+@JvmInline
+public value class ViktorBuffer(public val flatArray: F64FlatArray) : MutableBuffer<Double> {
     override val size: Int
         get() = flatArray.size
 
@@ -21,4 +23,6 @@ public class ViktorBuffer(public val flatArray: F64FlatArray) : MutableBuffer<Do
 
     override fun copy(): MutableBuffer<Double> = ViktorBuffer(flatArray.copy().flatten())
     override operator fun iterator(): Iterator<Double> = flatArray.data.iterator()
+
+    override fun toString(): String = Buffer.toString(this)
 }
-- 
2.34.1


From 974d73e25c3e5c44956848a2b877cdc20f7c7436 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 22 Sep 2021 22:09:46 +0300
Subject: [PATCH 333/713] Adjust benchmarks.

---
 .../kmath/benchmarks/BigIntBenchmark.kt       | 29 +++++++++---
 .../kscience/kmath/benchmarks/DotBenchmark.kt | 44 +++++++++----------
 .../kscience/kmath/linear/dotPerformance.kt   | 34 ++++++++++++++
 3 files changed, 77 insertions(+), 30 deletions(-)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index 6f501dedb..f2b2d4d7a 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -11,7 +11,10 @@ import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.BigIntField
+import space.kscience.kmath.operations.JBigIntegerField
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.operations.parseBigInteger
 import java.math.BigInteger
 
 
@@ -19,12 +22,24 @@ import java.math.BigInteger
 @State(Scope.Benchmark)
 internal class BigIntBenchmark {
 
+    val kmSmallNumber = BigIntField.number(100)
+    val jvmSmallNumber = JBigIntegerField.number(100)
     val kmNumber = BigIntField.number(Int.MAX_VALUE)
     val jvmNumber = JBigIntegerField.number(Int.MAX_VALUE)
-    val largeKmNumber = BigIntField { number(11).pow(100_000U) }
-    val largeJvmNumber: BigInteger = JBigIntegerField { number(11).pow(100_000) }
+    val kmLargeNumber = BigIntField { number(11).pow(100_000U) }
+    val jvmLargeNumber: BigInteger = JBigIntegerField { number(11).pow(100_000) }
     val bigExponent = 50_000
 
+    @Benchmark
+    fun kmSmallAdd(blackhole: Blackhole) = BigIntField {
+        blackhole.consume(kmSmallNumber + kmSmallNumber + kmSmallNumber)
+    }
+
+    @Benchmark
+    fun jvmSmallAdd(blackhole: Blackhole) = JBigIntegerField {
+        blackhole.consume(jvmSmallNumber + jvmSmallNumber + jvmSmallNumber)
+    }
+
     @Benchmark
     fun kmAdd(blackhole: Blackhole) = BigIntField {
         blackhole.consume(kmNumber + kmNumber + kmNumber)
@@ -37,12 +52,12 @@ internal class BigIntBenchmark {
 
     @Benchmark
     fun kmAddLarge(blackhole: Blackhole) = BigIntField {
-        blackhole.consume(largeKmNumber + largeKmNumber + largeKmNumber)
+        blackhole.consume(kmLargeNumber + kmLargeNumber + kmLargeNumber)
     }
 
     @Benchmark
     fun jvmAddLarge(blackhole: Blackhole) = JBigIntegerField {
-        blackhole.consume(largeJvmNumber + largeJvmNumber + largeJvmNumber)
+        blackhole.consume(jvmLargeNumber + jvmLargeNumber + jvmLargeNumber)
     }
 
     @Benchmark
@@ -52,7 +67,7 @@ internal class BigIntBenchmark {
 
     @Benchmark
     fun kmMultiplyLarge(blackhole: Blackhole) = BigIntField {
-        blackhole.consume(largeKmNumber*largeKmNumber)
+        blackhole.consume(kmLargeNumber*kmLargeNumber)
     }
 
     @Benchmark
@@ -62,7 +77,7 @@ internal class BigIntBenchmark {
 
     @Benchmark
     fun jvmMultiplyLarge(blackhole: Blackhole) = JBigIntegerField {
-        blackhole.consume(largeJvmNumber*largeJvmNumber)
+        blackhole.consume(jvmLargeNumber*jvmLargeNumber)
     }
 
     @Benchmark
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 6373d1ce5..33cb57c6f 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -11,7 +11,6 @@ import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import space.kscience.kmath.commons.linear.CMLinearSpace
 import space.kscience.kmath.ejml.EjmlLinearSpaceDDRM
-import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.invoke
 import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.operations.DoubleField
@@ -26,8 +25,12 @@ internal class DotBenchmark {
         const val dim = 1000
 
         //creating invertible matrix
-        val matrix1 = LinearSpace.double.buildMatrix(dim, dim) { i, j -> if (i <= j) random.nextDouble() else 0.0 }
-        val matrix2 = LinearSpace.double.buildMatrix(dim, dim) { i, j -> if (i <= j) random.nextDouble() else 0.0 }
+        val matrix1 = Double.algebra.linearSpace.buildMatrix(dim, dim) { i, j ->
+            if (i <= j) random.nextDouble() else 0.0
+        }
+        val matrix2 = Double.algebra.linearSpace.buildMatrix(dim, dim) { i, j ->
+            if (i <= j) random.nextDouble() else 0.0
+        }
 
         val cmMatrix1 = CMLinearSpace { matrix1.toCM() }
         val cmMatrix2 = CMLinearSpace { matrix2.toCM() }
@@ -37,37 +40,32 @@ internal class DotBenchmark {
     }
 
     @Benchmark
-    fun cmDot(blackhole: Blackhole) {
-        CMLinearSpace {
-            blackhole.consume(cmMatrix1 dot cmMatrix2)
-        }
+    fun cmDotWithConversion(blackhole: Blackhole) = CMLinearSpace {
+        blackhole.consume(matrix1 dot matrix2)
     }
 
     @Benchmark
-    fun ejmlDot(blackhole: Blackhole) {
-        EjmlLinearSpaceDDRM {
-            blackhole.consume(ejmlMatrix1 dot ejmlMatrix2)
-        }
+    fun cmDot(blackhole: Blackhole) = CMLinearSpace {
+        blackhole.consume(cmMatrix1 dot cmMatrix2)
     }
 
     @Benchmark
-    fun ejmlDotWithConversion(blackhole: Blackhole) {
-        EjmlLinearSpaceDDRM {
-            blackhole.consume(matrix1 dot matrix2)
-        }
+    fun ejmlDot(blackhole: Blackhole) = EjmlLinearSpaceDDRM {
+        blackhole.consume(ejmlMatrix1 dot ejmlMatrix2)
     }
 
     @Benchmark
-    fun bufferedDot(blackhole: Blackhole) {
-        with(DoubleField.linearSpace(Buffer.Companion::auto)) {
-            blackhole.consume(matrix1 dot matrix2)
-        }
+    fun ejmlDotWithConversion(blackhole: Blackhole) = EjmlLinearSpaceDDRM {
+        blackhole.consume(matrix1 dot matrix2)
     }
 
     @Benchmark
-    fun doubleDot(blackhole: Blackhole) {
-        with(Double.algebra.linearSpace) {
-            blackhole.consume(matrix1 dot matrix2)
-        }
+    fun bufferedDot(blackhole: Blackhole) = with(DoubleField.linearSpace(Buffer.Companion::auto)) {
+        blackhole.consume(matrix1 dot matrix2)
+    }
+
+    @Benchmark
+    fun doubleDot(blackhole: Blackhole) = with(Double.algebra.linearSpace) {
+        blackhole.consume(matrix1 dot matrix2)
     }
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt b/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
new file mode 100644
index 000000000..31762b6d8
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.linear
+
+import space.kscience.kmath.operations.algebra
+import kotlin.random.Random
+import kotlin.system.measureTimeMillis
+
+fun main() {
+    val random = Random(12224)
+    val dim = 1000
+
+    //creating invertible matrix
+    val matrix1 = Double.algebra.linearSpace.buildMatrix(dim, dim) { i, j ->
+        if (i <= j) random.nextDouble() else 0.0
+    }
+    val matrix2 = Double.algebra.linearSpace.buildMatrix(dim, dim) { i, j ->
+        if (i <= j) random.nextDouble() else 0.0
+    }
+
+    val time = measureTimeMillis {
+        with(Double.algebra.linearSpace) {
+            repeat(10) {
+                val res = matrix1 dot matrix2
+            }
+        }
+    }
+
+    println(time)
+
+}
\ No newline at end of file
-- 
2.34.1


From 64781a6785dd2aef35ab3e99e2bb8a22413ad297 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 23 Sep 2021 21:44:18 +0300
Subject: [PATCH 334/713] Move Minuit tmp classes to optimization

---
 {kmath-stat => kmath-optimization}/src/commonMain/tmp/QowFit.kt   | 0
 .../src/commonMain/tmp/minuit/AnalyticalGradientCalculator.kt     | 0
 .../src/commonMain/tmp/minuit/CombinedMinimizer.kt                | 0
 .../src/commonMain/tmp/minuit/CombinedMinimumBuilder.kt           | 0
 .../src/commonMain/tmp/minuit/ContoursError.kt                    | 0
 .../src/commonMain/tmp/minuit/DavidonErrorUpdator.kt              | 0
 .../src/commonMain/tmp/minuit/FunctionGradient.kt                 | 0
 .../src/commonMain/tmp/minuit/FunctionMinimum.kt                  | 0
 .../src/commonMain/tmp/minuit/GradientCalculator.kt               | 0
 .../src/commonMain/tmp/minuit/HessianGradientCalculator.kt        | 0
 .../src/commonMain/tmp/minuit/InitialGradientCalculator.kt        | 0
 .../src/commonMain/tmp/minuit/MINOSResult.kt                      | 0
 .../src/commonMain/tmp/minuit/MINUITFitter.kt                     | 0
 .../src/commonMain/tmp/minuit/MINUITPlugin.kt                     | 0
 .../src/commonMain/tmp/minuit/MINUITUtils.kt                      | 0
 .../src/commonMain/tmp/minuit/MinimumBuilder.kt                   | 0
 .../src/commonMain/tmp/minuit/MinimumError.kt                     | 0
 .../src/commonMain/tmp/minuit/MinimumErrorUpdator.kt              | 0
 .../src/commonMain/tmp/minuit/MinimumParameters.kt                | 0
 .../src/commonMain/tmp/minuit/MinimumSeed.kt                      | 0
 .../src/commonMain/tmp/minuit/MinimumSeedGenerator.kt             | 0
 .../src/commonMain/tmp/minuit/MinimumState.kt                     | 0
 .../src/commonMain/tmp/minuit/MinosError.kt                       | 0
 .../src/commonMain/tmp/minuit/MinuitParameter.kt                  | 0
 .../src/commonMain/tmp/minuit/MnAlgebraicSymMatrix.kt             | 0
 .../src/commonMain/tmp/minuit/MnApplication.kt                    | 0
 .../src/commonMain/tmp/minuit/MnContours.kt                       | 0
 .../src/commonMain/tmp/minuit/MnCovarianceSqueeze.kt              | 0
 .../src/commonMain/tmp/minuit/MnCross.kt                          | 0
 .../src/commonMain/tmp/minuit/MnEigen.kt                          | 0
 .../src/commonMain/tmp/minuit/MnFcn.kt                            | 0
 .../src/commonMain/tmp/minuit/MnFunctionCross.kt                  | 0
 .../src/commonMain/tmp/minuit/MnGlobalCorrelationCoeff.kt         | 0
 .../src/commonMain/tmp/minuit/MnHesse.kt                          | 0
 .../src/commonMain/tmp/minuit/MnLineSearch.kt                     | 0
 .../src/commonMain/tmp/minuit/MnMachinePrecision.kt               | 0
 .../src/commonMain/tmp/minuit/MnMigrad.kt                         | 0
 .../src/commonMain/tmp/minuit/MnMinimize.kt                       | 0
 .../src/commonMain/tmp/minuit/MnMinos.kt                          | 0
 .../src/commonMain/tmp/minuit/MnParabola.kt                       | 0
 .../src/commonMain/tmp/minuit/MnParabolaFactory.kt                | 0
 .../src/commonMain/tmp/minuit/MnParabolaPoint.kt                  | 0
 .../src/commonMain/tmp/minuit/MnParameterScan.kt                  | 0
 .../src/commonMain/tmp/minuit/MnPlot.kt                           | 0
 .../src/commonMain/tmp/minuit/MnPosDef.kt                         | 0
 .../src/commonMain/tmp/minuit/MnPrint.kt                          | 0
 .../src/commonMain/tmp/minuit/MnScan.kt                           | 0
 .../src/commonMain/tmp/minuit/MnSeedGenerator.kt                  | 0
 .../src/commonMain/tmp/minuit/MnSimplex.kt                        | 0
 .../src/commonMain/tmp/minuit/MnStrategy.kt                       | 0
 .../src/commonMain/tmp/minuit/MnUserCovariance.kt                 | 0
 .../src/commonMain/tmp/minuit/MnUserFcn.kt                        | 0
 .../src/commonMain/tmp/minuit/MnUserParameterState.kt             | 0
 .../src/commonMain/tmp/minuit/MnUserParameters.kt                 | 0
 .../src/commonMain/tmp/minuit/MnUserTransformation.kt             | 0
 .../src/commonMain/tmp/minuit/MnUtils.kt                          | 0
 .../src/commonMain/tmp/minuit/ModularFunctionMinimizer.kt         | 0
 .../src/commonMain/tmp/minuit/NegativeG2LineSearch.kt             | 0
 .../src/commonMain/tmp/minuit/Numerical2PGradientCalculator.kt    | 0
 .../src/commonMain/tmp/minuit/ScanBuilder.kt                      | 0
 .../src/commonMain/tmp/minuit/ScanMinimizer.kt                    | 0
 .../src/commonMain/tmp/minuit/SimplexBuilder.kt                   | 0
 .../src/commonMain/tmp/minuit/SimplexMinimizer.kt                 | 0
 .../src/commonMain/tmp/minuit/SimplexParameters.kt                | 0
 .../src/commonMain/tmp/minuit/SimplexSeedGenerator.kt             | 0
 .../src/commonMain/tmp/minuit/SinParameterTransformation.kt       | 0
 .../src/commonMain/tmp/minuit/SqrtLowParameterTransformation.kt   | 0
 .../src/commonMain/tmp/minuit/SqrtUpParameterTransformation.kt    | 0
 .../src/commonMain/tmp/minuit/VariableMetricBuilder.kt            | 0
 .../src/commonMain/tmp/minuit/VariableMetricEDMEstimator.kt       | 0
 .../src/commonMain/tmp/minuit/VariableMetricMinimizer.kt          | 0
 .../src/commonMain/tmp/minuit/package-info.kt                     | 0
 72 files changed, 0 insertions(+), 0 deletions(-)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/QowFit.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/AnalyticalGradientCalculator.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/CombinedMinimizer.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/CombinedMinimumBuilder.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/ContoursError.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/DavidonErrorUpdator.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/FunctionGradient.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/FunctionMinimum.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/GradientCalculator.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/HessianGradientCalculator.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/InitialGradientCalculator.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MINOSResult.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MINUITFitter.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MINUITPlugin.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MINUITUtils.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MinimumBuilder.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MinimumError.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MinimumErrorUpdator.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MinimumParameters.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MinimumSeed.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MinimumSeedGenerator.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MinimumState.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MinosError.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MinuitParameter.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnAlgebraicSymMatrix.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnApplication.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnContours.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnCovarianceSqueeze.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnCross.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnEigen.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnFcn.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnFunctionCross.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnGlobalCorrelationCoeff.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnHesse.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnLineSearch.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnMachinePrecision.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnMigrad.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnMinimize.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnMinos.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnParabola.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnParabolaFactory.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnParabolaPoint.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnParameterScan.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnPlot.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnPosDef.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnPrint.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnScan.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnSeedGenerator.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnSimplex.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnStrategy.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnUserCovariance.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnUserFcn.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnUserParameterState.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnUserParameters.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnUserTransformation.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/MnUtils.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/ModularFunctionMinimizer.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/NegativeG2LineSearch.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/Numerical2PGradientCalculator.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/ScanBuilder.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/ScanMinimizer.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/SimplexBuilder.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/SimplexMinimizer.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/SimplexParameters.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/SimplexSeedGenerator.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/SinParameterTransformation.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/SqrtLowParameterTransformation.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/SqrtUpParameterTransformation.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/VariableMetricBuilder.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/VariableMetricEDMEstimator.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/VariableMetricMinimizer.kt (100%)
 rename {kmath-stat => kmath-optimization}/src/commonMain/tmp/minuit/package-info.kt (100%)

diff --git a/kmath-stat/src/commonMain/tmp/QowFit.kt b/kmath-optimization/src/commonMain/tmp/QowFit.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/QowFit.kt
rename to kmath-optimization/src/commonMain/tmp/QowFit.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/AnalyticalGradientCalculator.kt b/kmath-optimization/src/commonMain/tmp/minuit/AnalyticalGradientCalculator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/AnalyticalGradientCalculator.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/AnalyticalGradientCalculator.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/CombinedMinimizer.kt b/kmath-optimization/src/commonMain/tmp/minuit/CombinedMinimizer.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/CombinedMinimizer.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/CombinedMinimizer.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/CombinedMinimumBuilder.kt b/kmath-optimization/src/commonMain/tmp/minuit/CombinedMinimumBuilder.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/CombinedMinimumBuilder.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/CombinedMinimumBuilder.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/ContoursError.kt b/kmath-optimization/src/commonMain/tmp/minuit/ContoursError.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/ContoursError.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/ContoursError.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/DavidonErrorUpdator.kt b/kmath-optimization/src/commonMain/tmp/minuit/DavidonErrorUpdator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/DavidonErrorUpdator.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/DavidonErrorUpdator.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/FunctionGradient.kt b/kmath-optimization/src/commonMain/tmp/minuit/FunctionGradient.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/FunctionGradient.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/FunctionGradient.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/FunctionMinimum.kt b/kmath-optimization/src/commonMain/tmp/minuit/FunctionMinimum.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/FunctionMinimum.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/FunctionMinimum.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/GradientCalculator.kt b/kmath-optimization/src/commonMain/tmp/minuit/GradientCalculator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/GradientCalculator.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/GradientCalculator.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/HessianGradientCalculator.kt b/kmath-optimization/src/commonMain/tmp/minuit/HessianGradientCalculator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/HessianGradientCalculator.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/HessianGradientCalculator.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/InitialGradientCalculator.kt b/kmath-optimization/src/commonMain/tmp/minuit/InitialGradientCalculator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/InitialGradientCalculator.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/InitialGradientCalculator.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MINOSResult.kt b/kmath-optimization/src/commonMain/tmp/minuit/MINOSResult.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MINOSResult.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MINOSResult.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MINUITFitter.kt b/kmath-optimization/src/commonMain/tmp/minuit/MINUITFitter.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MINUITFitter.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MINUITFitter.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MINUITPlugin.kt b/kmath-optimization/src/commonMain/tmp/minuit/MINUITPlugin.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MINUITPlugin.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MINUITPlugin.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MINUITUtils.kt b/kmath-optimization/src/commonMain/tmp/minuit/MINUITUtils.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MINUITUtils.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MINUITUtils.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MinimumBuilder.kt b/kmath-optimization/src/commonMain/tmp/minuit/MinimumBuilder.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MinimumBuilder.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MinimumBuilder.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MinimumError.kt b/kmath-optimization/src/commonMain/tmp/minuit/MinimumError.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MinimumError.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MinimumError.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MinimumErrorUpdator.kt b/kmath-optimization/src/commonMain/tmp/minuit/MinimumErrorUpdator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MinimumErrorUpdator.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MinimumErrorUpdator.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MinimumParameters.kt b/kmath-optimization/src/commonMain/tmp/minuit/MinimumParameters.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MinimumParameters.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MinimumParameters.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MinimumSeed.kt b/kmath-optimization/src/commonMain/tmp/minuit/MinimumSeed.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MinimumSeed.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MinimumSeed.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MinimumSeedGenerator.kt b/kmath-optimization/src/commonMain/tmp/minuit/MinimumSeedGenerator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MinimumSeedGenerator.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MinimumSeedGenerator.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MinimumState.kt b/kmath-optimization/src/commonMain/tmp/minuit/MinimumState.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MinimumState.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MinimumState.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MinosError.kt b/kmath-optimization/src/commonMain/tmp/minuit/MinosError.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MinosError.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MinosError.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MinuitParameter.kt b/kmath-optimization/src/commonMain/tmp/minuit/MinuitParameter.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MinuitParameter.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MinuitParameter.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnAlgebraicSymMatrix.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnAlgebraicSymMatrix.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnAlgebraicSymMatrix.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnAlgebraicSymMatrix.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnApplication.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnApplication.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnApplication.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnApplication.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnContours.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnContours.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnContours.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnContours.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnCovarianceSqueeze.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnCovarianceSqueeze.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnCovarianceSqueeze.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnCovarianceSqueeze.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnCross.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnCross.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnCross.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnCross.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnEigen.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnEigen.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnEigen.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnEigen.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnFcn.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnFcn.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnFcn.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnFcn.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnFunctionCross.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnFunctionCross.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnFunctionCross.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnFunctionCross.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnGlobalCorrelationCoeff.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnGlobalCorrelationCoeff.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnGlobalCorrelationCoeff.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnGlobalCorrelationCoeff.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnHesse.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnHesse.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnHesse.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnHesse.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnLineSearch.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnLineSearch.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnLineSearch.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnLineSearch.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnMachinePrecision.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnMachinePrecision.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnMachinePrecision.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnMachinePrecision.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnMigrad.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnMigrad.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnMigrad.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnMigrad.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnMinimize.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnMinimize.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnMinimize.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnMinimize.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnMinos.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnMinos.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnMinos.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnMinos.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnParabola.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnParabola.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnParabola.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnParabola.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnParabolaFactory.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnParabolaFactory.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnParabolaFactory.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnParabolaFactory.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnParabolaPoint.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnParabolaPoint.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnParabolaPoint.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnParabolaPoint.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnParameterScan.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnParameterScan.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnParameterScan.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnParameterScan.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnPlot.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnPlot.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnPlot.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnPlot.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnPosDef.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnPosDef.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnPosDef.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnPosDef.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnPrint.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnPrint.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnPrint.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnPrint.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnScan.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnScan.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnScan.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnScan.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnSeedGenerator.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnSeedGenerator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnSeedGenerator.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnSeedGenerator.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnSimplex.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnSimplex.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnSimplex.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnSimplex.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnStrategy.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnStrategy.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnStrategy.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnStrategy.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnUserCovariance.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnUserCovariance.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnUserCovariance.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnUserCovariance.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnUserFcn.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnUserFcn.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnUserFcn.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnUserFcn.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnUserParameterState.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnUserParameterState.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnUserParameterState.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnUserParameterState.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnUserParameters.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnUserParameters.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnUserParameters.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnUserParameters.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnUserTransformation.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnUserTransformation.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnUserTransformation.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnUserTransformation.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/MnUtils.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnUtils.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/MnUtils.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/MnUtils.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/ModularFunctionMinimizer.kt b/kmath-optimization/src/commonMain/tmp/minuit/ModularFunctionMinimizer.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/ModularFunctionMinimizer.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/ModularFunctionMinimizer.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/NegativeG2LineSearch.kt b/kmath-optimization/src/commonMain/tmp/minuit/NegativeG2LineSearch.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/NegativeG2LineSearch.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/NegativeG2LineSearch.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/Numerical2PGradientCalculator.kt b/kmath-optimization/src/commonMain/tmp/minuit/Numerical2PGradientCalculator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/Numerical2PGradientCalculator.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/Numerical2PGradientCalculator.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/ScanBuilder.kt b/kmath-optimization/src/commonMain/tmp/minuit/ScanBuilder.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/ScanBuilder.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/ScanBuilder.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/ScanMinimizer.kt b/kmath-optimization/src/commonMain/tmp/minuit/ScanMinimizer.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/ScanMinimizer.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/ScanMinimizer.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/SimplexBuilder.kt b/kmath-optimization/src/commonMain/tmp/minuit/SimplexBuilder.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/SimplexBuilder.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/SimplexBuilder.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/SimplexMinimizer.kt b/kmath-optimization/src/commonMain/tmp/minuit/SimplexMinimizer.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/SimplexMinimizer.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/SimplexMinimizer.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/SimplexParameters.kt b/kmath-optimization/src/commonMain/tmp/minuit/SimplexParameters.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/SimplexParameters.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/SimplexParameters.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/SimplexSeedGenerator.kt b/kmath-optimization/src/commonMain/tmp/minuit/SimplexSeedGenerator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/SimplexSeedGenerator.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/SimplexSeedGenerator.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/SinParameterTransformation.kt b/kmath-optimization/src/commonMain/tmp/minuit/SinParameterTransformation.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/SinParameterTransformation.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/SinParameterTransformation.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/SqrtLowParameterTransformation.kt b/kmath-optimization/src/commonMain/tmp/minuit/SqrtLowParameterTransformation.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/SqrtLowParameterTransformation.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/SqrtLowParameterTransformation.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/SqrtUpParameterTransformation.kt b/kmath-optimization/src/commonMain/tmp/minuit/SqrtUpParameterTransformation.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/SqrtUpParameterTransformation.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/SqrtUpParameterTransformation.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/VariableMetricBuilder.kt b/kmath-optimization/src/commonMain/tmp/minuit/VariableMetricBuilder.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/VariableMetricBuilder.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/VariableMetricBuilder.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/VariableMetricEDMEstimator.kt b/kmath-optimization/src/commonMain/tmp/minuit/VariableMetricEDMEstimator.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/VariableMetricEDMEstimator.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/VariableMetricEDMEstimator.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/VariableMetricMinimizer.kt b/kmath-optimization/src/commonMain/tmp/minuit/VariableMetricMinimizer.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/VariableMetricMinimizer.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/VariableMetricMinimizer.kt
diff --git a/kmath-stat/src/commonMain/tmp/minuit/package-info.kt b/kmath-optimization/src/commonMain/tmp/minuit/package-info.kt
similarity index 100%
rename from kmath-stat/src/commonMain/tmp/minuit/package-info.kt
rename to kmath-optimization/src/commonMain/tmp/minuit/package-info.kt
-- 
2.34.1


From a68884142fd65e42e9cb02d308beb8294ae11512 Mon Sep 17 00:00:00 2001
From: Paule <44635962+V3lop5@users.noreply.github.com>
Date: Mon, 27 Sep 2021 12:36:48 +0200
Subject: [PATCH 335/713] Added gradle wrapper validation

See https://github.com/marketplace/actions/gradle-wrapper-validation
---
 .github/workflows/build.yml   | 2 ++
 .github/workflows/publish.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9a9f04621..4ea3428c6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,5 +35,7 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
+      - name: Gradle Wrapper Validation
+        uses: gradle/wrapper-validation-action@v1.0.4
       - name: Build
         run: ./gradlew build --no-daemon --stacktrace
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c5c110e89..2e51e72d8 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -40,6 +40,8 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
+      - name: Gradle Wrapper Validation
+        uses: gradle/wrapper-validation-action@v1.0.4
       - name: Publish Windows Artifacts
         if: matrix.os == 'windows-latest'
         run: >
-- 
2.34.1


From 01bbb4bb1313f91cc584a6c9b6fdf904e34cddb7 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 2 Oct 2021 09:55:52 +0300
Subject: [PATCH 336/713] API cleanup

---
 build.gradle.kts                              |   2 +-
 .../space/kscience/kmath/tensors/PCA.kt       |  10 +-
 ...rmalization.kt => dataSetNormalization.kt} |   6 +-
 ...thLUP.kt => linearSystemSolvingWithLUP.kt} |   6 +-
 .../{NeuralNetwork.kt => neuralNetwork.kt}    |   0
 .../kmath/linear/BufferedLinearSpace.kt       |  19 ++-
 .../kmath/linear/DoubleLinearSpace.kt         | 109 ++++++++++++++++++
 .../space/kscience/kmath/nd/Structure1D.kt    |   2 +-
 .../space/kscience/kmath/nd/Structure2D.kt    |   4 +-
 .../space/kscience/kmath/operations/BigInt.kt |   4 +-
 .../kscience/kmath/structures/DoubleBuffer.kt |   6 +
 .../kmath/linear/DoubleLUSolverTest.kt        |  35 +++---
 .../space/kscience/kmath/linear/MatrixTest.kt |  30 ++---
 .../kmath/structures/NumberNDFieldTest.kt     |  10 +-
 .../kscience/kmath/dimensions/Wrappers.kt     |   8 +-
 .../kscience/kmath/real/DoubleMatrixTest.kt   |  12 +-
 .../kscience/kmath/real/DoubleVectorTest.kt   |   8 +-
 .../kmath/optimization/QowOptimizer.kt        |   3 +-
 .../core/BroadcastDoubleTensorAlgebra.kt      |  11 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |   2 +
 settings.gradle.kts                           |   7 +-
 21 files changed, 211 insertions(+), 83 deletions(-)
 rename examples/src/main/kotlin/space/kscience/kmath/tensors/{DataSetNormalization.kt => dataSetNormalization.kt} (84%)
 rename examples/src/main/kotlin/space/kscience/kmath/tensors/{LinearSystemSolvingWithLUP.kt => linearSystemSolvingWithLUP.kt} (92%)
 rename examples/src/main/kotlin/space/kscience/kmath/tensors/{NeuralNetwork.kt => neuralNetwork.kt} (100%)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 6bb19cd35..68b894d06 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-14"
+    version = "0.3.0-dev-15"
 }
 
 subprojects {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index 3302b49a8..d83d47805 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -5,19 +5,19 @@
 
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.tensorAlgebra
+import space.kscience.kmath.tensors.core.withBroadcast
 
 
 // simple PCA
 
-fun main(): Unit = BroadcastDoubleTensorAlgebra {  // work in context with broadcast methods
+fun main(): Unit = Double.tensorAlgebra.withBroadcast {  // work in context with broadcast methods
     val seed = 100500L
 
     // assume x is range from 0 until 10
     val x = fromArray(
         intArrayOf(10),
-        (0 until 10).toList().map { it.toDouble() }.toDoubleArray()
+        DoubleArray(10) { it.toDouble() }
     )
 
     // take y dependent on x with noise
@@ -62,7 +62,7 @@ fun main(): Unit = BroadcastDoubleTensorAlgebra {  // work in context with broad
     println("Eigenvector:\n$v")
 
     // reduce dimension of dataset
-    val datasetReduced  = v dot stack(listOf(xScaled, yScaled))
+    val datasetReduced = v dot stack(listOf(xScaled, yScaled))
     println("Reduced data:\n$datasetReduced")
 
     // we can restore original data from reduced data;
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
similarity index 84%
rename from examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
rename to examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
index 3ef745da3..9d5b8c2a5 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/DataSetNormalization.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
@@ -5,13 +5,13 @@
 
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.tensorAlgebra
+import space.kscience.kmath.tensors.core.withBroadcast
 
 
 // Dataset normalization
 
-fun main() = BroadcastDoubleTensorAlgebra {  // work in context with broadcast methods
+fun main() = Double.tensorAlgebra.withBroadcast {  // work in context with broadcast methods
     // take dataset of 5-element vectors from normal distribution
     val dataset = randomNormal(intArrayOf(100, 5)) * 1.5 // all elements from N(0, 1.5)
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
similarity index 92%
rename from examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
rename to examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
index 27886413f..846e338da 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/LinearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
@@ -5,13 +5,13 @@
 
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.DoubleTensor
+import space.kscience.kmath.tensors.core.tensorAlgebra
+import space.kscience.kmath.tensors.core.withBroadcast
 
 // solving linear system with LUP decomposition
 
-fun main() = BroadcastDoubleTensorAlgebra {// work in context with linear operations
+fun main() = Double.tensorAlgebra.withBroadcast {// work in context with linear operations
 
     // set true value of x
     val trueX = fromArray(
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
similarity index 100%
rename from examples/src/main/kotlin/space/kscience/kmath/tensors/NeuralNetwork.kt
rename to examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 5f17de607..3d562f26f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -8,12 +8,14 @@ package space.kscience.kmath.linear
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.BufferedRingND
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.nd.asND
 import space.kscience.kmath.nd.ndAlgebra
-import space.kscience.kmath.nd.unwrap
-import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.structures.*
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.BufferFactory
+import space.kscience.kmath.structures.VirtualBuffer
+import space.kscience.kmath.structures.indices
 
 
 public class BufferedLinearSpace<T, out A : Ring<T>>(
@@ -33,17 +35,17 @@ public class BufferedLinearSpace<T, out A : Ring<T>>(
         bufferFactory(size) { elementAlgebra.initializer(it) }
 
     override fun Matrix<T>.unaryMinus(): Matrix<T> = ndRing(rowNum, colNum).run {
-        unwrap().map { -it }.as2D()
+        asND().map { -it }.as2D()
     }
 
     override fun Matrix<T>.plus(other: Matrix<T>): Matrix<T> = ndRing(rowNum, colNum).run {
         require(shape.contentEquals(other.shape)) { "Shape mismatch on Matrix::plus. Expected $shape but found ${other.shape}" }
-        unwrap().plus(other.unwrap()).as2D()
+        asND().plus(other.asND()).as2D()
     }
 
     override fun Matrix<T>.minus(other: Matrix<T>): Matrix<T> = ndRing(rowNum, colNum).run {
         require(shape.contentEquals(other.shape)) { "Shape mismatch on Matrix::minus. Expected $shape but found ${other.shape}" }
-        unwrap().minus(other.unwrap()).as2D()
+        asND().minus(other.asND()).as2D()
     }
 
     private fun Buffer<T>.linearize() = if (this is VirtualBuffer) {
@@ -87,13 +89,10 @@ public class BufferedLinearSpace<T, out A : Ring<T>>(
     }
 
     override fun Matrix<T>.times(value: T): Matrix<T> = ndRing(rowNum, colNum).run {
-        unwrap().map { it * value }.as2D()
+        asND().map { it * value }.as2D()
     }
 }
 
 
 public fun <T, A : Ring<T>> A.linearSpace(bufferFactory: BufferFactory<T>): BufferedLinearSpace<T, A> =
     BufferedLinearSpace(this, bufferFactory)
-
-public val DoubleField.linearSpace: BufferedLinearSpace<Double, DoubleField>
-    get() = BufferedLinearSpace(this, ::DoubleBuffer)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
new file mode 100644
index 000000000..a3e031902
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.linear
+
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.DoubleFieldND
+import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.nd.asND
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.indices
+
+public object DoubleLinearSpace : LinearSpace<Double, DoubleField> {
+
+    override val elementAlgebra: DoubleField get() = DoubleField
+
+    private fun ndRing(
+        rows: Int,
+        cols: Int,
+    ): DoubleFieldND = DoubleFieldND(intArrayOf(rows, cols))
+
+    override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: DoubleField.(i: Int, j: Int) -> Double
+    ): Matrix<Double> = ndRing(rows, columns).produce { (i, j) -> DoubleField.initializer(i, j) }.as2D()
+
+
+    override fun buildVector(size: Int, initializer: DoubleField.(Int) -> Double): DoubleBuffer =
+        DoubleBuffer(size) { DoubleField.initializer(it) }
+
+    override fun Matrix<Double>.unaryMinus(): Matrix<Double> = ndRing(rowNum, colNum).run {
+        asND().map { -it }.as2D()
+    }
+
+    override fun Matrix<Double>.plus(other: Matrix<Double>): Matrix<Double> = ndRing(rowNum, colNum).run {
+        require(shape.contentEquals(other.shape)) { "Shape mismatch on Matrix::plus. Expected $shape but found ${other.shape}" }
+        asND().plus(other.asND()).as2D()
+    }
+
+    override fun Matrix<Double>.minus(other: Matrix<Double>): Matrix<Double> = ndRing(rowNum, colNum).run {
+        require(shape.contentEquals(other.shape)) { "Shape mismatch on Matrix::minus. Expected $shape but found ${other.shape}" }
+        asND().minus(other.asND()).as2D()
+    }
+
+    // Create a continuous in-memory representation of this vector for better memory layout handling
+    private fun Buffer<Double>.linearize() = if (this is DoubleBuffer) {
+        this
+    } else {
+        DoubleBuffer(size) { get(it) }
+    }
+
+    @OptIn(PerformancePitfall::class)
+    override fun Matrix<Double>.dot(other: Matrix<Double>): Matrix<Double> {
+        require(colNum == other.rowNum) { "Matrix dot operation dimension mismatch: ($rowNum, $colNum) x (${other.rowNum}, ${other.colNum})" }
+        val rows = this@dot.rows.map { it.linearize() }
+        val columns = other.columns.map { it.linearize() }
+        return buildMatrix(rowNum, other.colNum) { i, j ->
+            val r = rows[i]
+            val c = columns[j]
+            var res = 0.0
+            for (l in r.indices) {
+                res += r[l] * c[l]
+            }
+            res
+        }
+    }
+
+    @OptIn(PerformancePitfall::class)
+    override fun Matrix<Double>.dot(vector: Point<Double>): DoubleBuffer {
+        require(colNum == vector.size) { "Matrix dot vector operation dimension mismatch: ($rowNum, $colNum) x (${vector.size})" }
+        val rows = this@dot.rows.map { it.linearize() }
+        return DoubleBuffer(rowNum) { i ->
+            val r = rows[i]
+            var res = 0.0
+            for (j in r.indices) {
+                res += r[j] * vector[j]
+            }
+            res
+        }
+
+    }
+
+    override fun Matrix<Double>.times(value: Double): Matrix<Double> = ndRing(rowNum, colNum).run {
+        asND().map { it * value }.as2D()
+    }
+
+    public override fun Point<Double>.plus(other: Point<Double>): DoubleBuffer = DoubleBuffer(size) {
+        get(it) + other[it]
+    }
+
+    public override fun Point<Double>.minus(other: Point<Double>): DoubleBuffer = DoubleBuffer(size) {
+        get(it) - other[it]
+    }
+
+    public override fun Point<Double>.times(value: Double): DoubleBuffer = DoubleBuffer(size) { i -> get(i) * value }
+
+    public operator fun Point<Double>.div(value: Double): DoubleBuffer = DoubleBuffer(size) { i -> get(i) / value }
+
+    public override fun Double.times(v: Point<Double>): DoubleBuffer = v * this
+
+
+}
+
+public val DoubleField.linearSpace: DoubleLinearSpace get() = DoubleLinearSpace
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index 91cd5abe9..f2a4336eb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -136,7 +136,7 @@ public fun <T> Buffer<T>.asND(): Structure1D<T> = Buffer1DWrapper(this)
 /**
  * Expose inner buffer of this [Structure1D] if possible
  */
-internal fun <T : Any> Structure1D<T>.unwrap(): Buffer<T> = when {
+internal fun <T : Any> Structure1D<T>.asND(): Buffer<T> = when {
     this is Buffer1DWrapper<T> -> buffer
     this is Structure1DWrapper && structure is BufferND<T> -> structure.buffer
     else -> this
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index 57836a9ef..8d3cc3a3f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -160,10 +160,10 @@ public fun <T> MutableStructureND<T>.as2D(): MutableStructure2D<T> = this as? Mu
 /**
  * Expose inner [StructureND] if possible
  */
-internal fun <T> Structure2D<T>.unwrap(): StructureND<T> =
+internal fun <T> Structure2D<T>.asND(): StructureND<T> =
     if (this is Structure2DWrapper) structure
     else this
 
-internal fun <T> MutableStructure2D<T>.unwrap(): MutableStructureND<T> =
+internal fun <T> MutableStructure2D<T>.asND(): MutableStructureND<T> =
     if (this is MutableStructure2DWrapper) structure else this
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 9797027c7..82754e43d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -532,7 +532,7 @@ public val BigInt.algebra: BigIntField get() = BigIntField
 public inline fun Buffer.Companion.bigInt(size: Int, initializer: (Int) -> BigInt): Buffer<BigInt> =
     boxing(size, initializer)
 
-public inline fun BigInt.buffer(size: Int, initializer: (Int) -> BigInt): Buffer<BigInt> =
+public inline fun BigInt.Companion.buffer(size: Int, initializer: (Int) -> BigInt): Buffer<BigInt> =
     Buffer.boxing(size, initializer)
 
 @Deprecated("Use BigInt::mutableBuffer")
@@ -543,4 +543,4 @@ public inline fun BigInt.mutableBuffer(size: Int, initializer: (Int) -> BigInt):
     Buffer.boxing(size, initializer)
 
 public fun BigIntField.nd(vararg shape: Int): BufferedRingND<BigInt, BigIntField> =
-    BufferedRingND(shape, BigIntField, Buffer.Companion::bigInt)
+    BufferedRingND(shape, BigIntField, BigInt::buffer)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
index b94a36bab..3b554ab07 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
@@ -25,6 +25,12 @@ public value class DoubleBuffer(public val array: DoubleArray) : MutableBuffer<D
     override operator fun iterator(): DoubleIterator = array.iterator()
 
     override fun copy(): DoubleBuffer = DoubleBuffer(array.copyOf())
+
+    override fun toString(): String = Buffer.toString(this)
+
+    public companion object{
+        public fun zero(size: Int): DoubleBuffer = DoubleArray(size).asBuffer()
+    }
 }
 
 /**
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
index c6c595383..79153d95d 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.linear
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.algebra
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -21,39 +22,37 @@ fun <T : Any> assertMatrixEquals(expected: StructureND<T>, actual: StructureND<T
 class DoubleLUSolverTest {
 
     @Test
-    fun testInvertOne() {
-        val matrix = LinearSpace.double.one(2, 2)
-        val inverted = LinearSpace.double.lupSolver().inverse(matrix)
+    fun testInvertOne() = Double.algebra.linearSpace.run{
+        val matrix = one(2, 2)
+        val inverted = lupSolver().inverse(matrix)
         assertMatrixEquals(matrix, inverted)
     }
 
     @Test
-    fun testDecomposition() {
-        LinearSpace.double.run {
-            val matrix = matrix(2, 2)(
-                3.0, 1.0,
-                2.0, 3.0
-            )
+    fun testDecomposition() = Double.algebra.linearSpace.run {
+        val matrix = matrix(2, 2)(
+            3.0, 1.0,
+            2.0, 3.0
+        )
 
-            val lup = lup(matrix)
+        val lup = lup(matrix)
 
-            //Check determinant
-            assertEquals(7.0, lup.determinant)
+        //Check determinant
+        assertEquals(7.0, lup.determinant)
 
-            assertMatrixEquals(lup.p dot matrix, lup.l dot lup.u)
-        }
+        assertMatrixEquals(lup.p dot matrix, lup.l dot lup.u)
     }
 
     @Test
-    fun testInvert() {
-        val matrix = LinearSpace.double.matrix(2, 2)(
+    fun testInvert()  = Double.algebra.linearSpace.run{
+        val matrix = matrix(2, 2)(
             3.0, 1.0,
             1.0, 3.0
         )
 
-        val inverted = LinearSpace.double.lupSolver().inverse(matrix)
+        val inverted = lupSolver().inverse(matrix)
 
-        val expected = LinearSpace.double.matrix(2, 2)(
+        val expected = matrix(2, 2)(
             0.375, -0.125,
             -0.125, 0.375
         )
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
index d6478e07b..0e2369e35 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
@@ -9,6 +9,7 @@ import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.operations.algebra
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -19,15 +20,15 @@ import kotlin.test.assertTrue
 class MatrixTest {
 
     @Test
-    fun testTranspose() {
-        val matrix = LinearSpace.double.one(3, 3)
+    fun testTranspose() = Double.algebra.linearSpace.run {
+        val matrix = one(3, 3)
         val transposed = matrix.transpose()
         assertTrue { StructureND.contentEquals(matrix, transposed) }
     }
 
     @Test
-    fun testBuilder() {
-        val matrix = LinearSpace.double.matrix(2, 3)(
+    fun testBuilder() = Double.algebra.linearSpace.run {
+        val matrix = matrix(2, 3)(
             1.0, 0.0, 0.0,
             0.0, 1.0, 2.0
         )
@@ -36,7 +37,7 @@ class MatrixTest {
     }
 
     @Test
-    fun testMatrixExtension() {
+    fun testMatrixExtension() = Double.algebra.linearSpace.run {
         val transitionMatrix: Matrix<Double> = VirtualMatrix(6, 6) { row, col ->
             when {
                 col == 0 -> .50
@@ -49,7 +50,7 @@ class MatrixTest {
         infix fun Matrix<Double>.pow(power: Int): Matrix<Double> {
             var res = this
             repeat(power - 1) {
-                res = LinearSpace.double.run { res dot this@pow }
+                res =  res dot this@pow
             }
             return res
         }
@@ -58,19 +59,18 @@ class MatrixTest {
     }
 
     @Test
-    fun test2DDot() {
+    fun test2DDot() = Double.algebra.linearSpace.run {
         val firstMatrix = StructureND.auto(2, 3) { (i, j) -> (i + j).toDouble() }.as2D()
         val secondMatrix = StructureND.auto(3, 2) { (i, j) -> (i + j).toDouble() }.as2D()
 
-        LinearSpace.double.run {
 //            val firstMatrix = produce(2, 3) { i, j -> (i + j).toDouble() }
 //            val secondMatrix = produce(3, 2) { i, j -> (i + j).toDouble() }
-            val result = firstMatrix dot secondMatrix
-            assertEquals(2, result.rowNum)
-            assertEquals(2, result.colNum)
-            assertEquals(8.0, result[0, 1])
-            assertEquals(8.0, result[1, 0])
-            assertEquals(14.0, result[1, 1])
-        }
+        val result = firstMatrix dot secondMatrix
+        assertEquals(2, result.rowNum)
+        assertEquals(2, result.colNum)
+        assertEquals(8.0, result[0, 1])
+        assertEquals(8.0, result[1, 0])
+        assertEquals(14.0, result[1, 1])
+
     }
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index b2982b335..e58976f4a 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.structures
 
-import space.kscience.kmath.linear.LinearSpace
+import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.combine
@@ -13,6 +13,7 @@ import space.kscience.kmath.nd.get
 import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Norm
+import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.invoke
 import kotlin.math.abs
 import kotlin.math.pow
@@ -42,17 +43,18 @@ class NumberNDFieldTest {
     }
 
     @Test
-    fun testGeneration() {
+    fun testGeneration() = Double.algebra.linearSpace.run {
 
-        val array = LinearSpace.double.buildMatrix(3, 3) { i, j ->
+        val array = buildMatrix(3, 3) { i, j ->
             (i * 10 + j).toDouble()
         }
 
-        for (i in 0..2)
+        for (i in 0..2) {
             for (j in 0..2) {
                 val expected = (i * 10 + j).toDouble()
                 assertEquals(expected, array[i, j], "Error at index [$i, $j]")
             }
+        }
     }
 
     @Test
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
index f6c4415dc..c47f43723 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
@@ -5,13 +5,11 @@
 
 package space.kscience.kmath.dimensions
 
-import space.kscience.kmath.linear.LinearSpace
-import space.kscience.kmath.linear.Matrix
-import space.kscience.kmath.linear.Point
-import space.kscience.kmath.linear.transpose
+import space.kscience.kmath.linear.*
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.algebra
 import kotlin.jvm.JvmInline
 
 /**
@@ -151,7 +149,7 @@ public value class DMatrixContext<T : Any, out A : Ring<T>>(public val context:
         context.run { (this@transpose as Matrix<T>).transpose() }.coerce()
 
     public companion object {
-        public val real: DMatrixContext<Double, DoubleField> = DMatrixContext(LinearSpace.double)
+        public val real: DMatrixContext<Double, DoubleField> = DMatrixContext(Double.algebra.linearSpace)
     }
 }
 
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
index 79f05daa5..3277410c0 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
@@ -5,12 +5,12 @@
 
 package space.kscience.kmath.real
 
-import space.kscience.kmath.linear.LinearSpace
+import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.linear.matrix
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.real.*
+import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.structures.contentEquals
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -59,13 +59,13 @@ internal class DoubleMatrixTest {
     }
 
     @Test
-    fun testMatrixAndDouble() {
+    fun testMatrixAndDouble() = Double.algebra.linearSpace.run {
         val matrix1 = realMatrix(2, 3)(
             1.0, 0.0, 3.0,
             4.0, 6.0, 2.0
         )
         val matrix2 = (matrix1 * 2.5 + 1.0 - 2.0) / 2.0
-        val expectedResult = LinearSpace.double.matrix(2, 3)(
+        val expectedResult = matrix(2, 3)(
             0.75, -0.5, 3.25,
             4.5, 7.0, 2.0
         )
@@ -159,8 +159,8 @@ internal class DoubleMatrixTest {
     }
 
     @Test
-    fun testAllElementOperations() {
-        val matrix1 = LinearSpace.double.matrix(2, 4)(
+    fun testAllElementOperations() = Double.algebra.linearSpace.run {
+        val matrix1 = matrix(2, 4)(
             -1.0, 0.0, 3.0, 15.0,
             4.0, -6.0, 7.0, -11.0
         )
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
index 7bb936658..771981772 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.real
 
-import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.asMatrix
+import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.linear.transpose
-import space.kscience.kmath.real.plus
+import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -30,12 +30,12 @@ internal class DoubleVectorTest {
     }
 
     @Test
-    fun testDot() {
+    fun testDot() = Double.algebra.linearSpace.run {
         val vector1 = DoubleBuffer(5) { it.toDouble() }
         val vector2 = DoubleBuffer(5) { 5 - it.toDouble() }
         val matrix1 = vector1.asMatrix()
         val matrix2 = vector2.asMatrix().transpose()
-        val product = LinearSpace.double.run { matrix1 dot matrix2 }
+        val product = matrix1 dot matrix2
         assertEquals(5.0, product[1, 0])
         assertEquals(6.0, product[2, 2])
     }
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
index 00df0944f..68941304f 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
@@ -13,6 +13,7 @@ import space.kscience.kmath.linear.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.misc.log
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.DoubleL2Norm
 
@@ -32,7 +33,7 @@ public class QowRuns(public val runs: Int) : OptimizationFeature {
 @UnstableKMathAPI
 public object QowOptimizer : Optimizer<Double, XYFit> {
 
-    private val linearSpace: LinearSpace<Double, DoubleField> = LinearSpace.double
+    private val linearSpace: LinearSpace<Double, DoubleField> = Double.algebra.linearSpace
     private val solver: LinearSolver<Double> = linearSpace.lupSolver()
 
     @OptIn(UnstableKMathAPI::class)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index 3eb8e5636..3d73fd53b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.internal.array
 import space.kscience.kmath.tensors.core.internal.broadcastTensors
@@ -90,4 +91,12 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
-}
\ No newline at end of file
+}
+
+
+/**
+ * Compute a value using broadcast double tensor algebra
+ */
+@UnstableKMathAPI
+public fun <R> DoubleTensorAlgebra.withBroadcast(block: BroadcastDoubleTensorAlgebra.() -> R): R =
+    BroadcastDoubleTensorAlgebra.block()
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index db18220cd..8e39e6cdd 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -949,4 +949,6 @@ public open class DoubleTensorAlgebra :
     override fun Tensor<Double>.lu(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> = lu(1e-9)
 }
 
+public val Double.Companion.tensorAlgebra: DoubleTensorAlgebra.Companion get() = DoubleTensorAlgebra
+
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0fc77b38e..8cfa62133 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,11 +5,11 @@ pluginManagement {
         gradlePluginPortal()
     }
 
-    val kotlinVersion = "1.5.30"
+    val kotlinVersion = "1.6.0-M1"
 
     plugins {
         id("org.jetbrains.kotlinx.benchmark") version "0.3.1"
-        id("ru.mipt.npm.gradle.project") version "0.10.3"
+        id("ru.mipt.npm.gradle.project") version "0.10.4"
         kotlin("multiplatform") version kotlinVersion
         kotlin("plugin.allopen") version kotlinVersion
     }
@@ -17,6 +17,9 @@ pluginManagement {
 
 rootProject.name = "kmath"
 
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+enableFeaturePreview("VERSION_CATALOGS")
+
 include(
     ":kmath-memory",
     ":kmath-complex",
-- 
2.34.1


From 0f634688cc4ed5cba39596a4c72b58e30fec4d2f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 2 Oct 2021 15:56:57 +0300
Subject: [PATCH 337/713] API cleanup

---
 gradle.properties                             |  6 ++-
 .../DoubleBufferOperations.kt}                | 48 +++++++++----------
 .../kmath/operations/OptionalOperations.kt    |  4 +-
 .../kscience/kmath/ejml/EjmlLinearSpace.kt    |  4 +-
 .../space/kscience/kmath/real/RealVector.kt   |  7 +--
 5 files changed, 37 insertions(+), 32 deletions(-)
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/{structures/DoubleBufferField.kt => operations/DoubleBufferOperations.kt} (89%)

diff --git a/gradle.properties b/gradle.properties
index 49bbf36dd..959511c68 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,9 +4,11 @@
 #
 
 kotlin.code.style=official
-kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.stability.nowarn=true
-kotlin.native.enableDependencyPropagation=false
+
+#kotlin.mpp.enableGranularSourceSetsMetadata=true
+#kotlin.native.enableDependencyPropagation=false
+
 kotlin.jupyter.add.scanner=false
 
 org.gradle.configureondemand=true
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOperations.kt
similarity index 89%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOperations.kt
index 2bf6de3cb..a95bd2541 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBufferField.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOperations.kt
@@ -3,18 +3,18 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
-package space.kscience.kmath.structures
+package space.kscience.kmath.operations
 
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.fold
 import kotlin.math.*
 
 /**
  * [ExtendedFieldOperations] over [DoubleBuffer].
  */
-@Deprecated("To be replaced by generic BufferAlgebra")
-public object DoubleBufferFieldOperations : ExtendedFieldOperations<Buffer<Double>> {
+public object DoubleBufferOperations : ExtendedFieldOperations<Buffer<Double>> {
     override fun Buffer<Double>.unaryMinus(): DoubleBuffer = if (this is DoubleBuffer) {
         DoubleBuffer(size) { -array[it] }
     } else {
@@ -179,13 +179,13 @@ public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Doub
 
     override fun number(value: Number): Buffer<Double> = DoubleBuffer(size) { value.toDouble() }
 
-    override fun Buffer<Double>.unaryMinus(): Buffer<Double> = DoubleBufferFieldOperations.run {
+    override fun Buffer<Double>.unaryMinus(): Buffer<Double> = DoubleBufferOperations.run {
         -this@unaryMinus
     }
 
     override fun add(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
         require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.add(a, b)
+        return DoubleBufferOperations.add(a, b)
     }
 
     override fun scale(a: Buffer<Double>, value: Double): DoubleBuffer {
@@ -199,87 +199,87 @@ public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Doub
 
     override fun multiply(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
         require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.multiply(a, b)
+        return DoubleBufferOperations.multiply(a, b)
     }
 
     override fun divide(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
         require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.divide(a, b)
+        return DoubleBufferOperations.divide(a, b)
     }
 
     override fun sin(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.sin(arg)
+        return DoubleBufferOperations.sin(arg)
     }
 
     override fun cos(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.cos(arg)
+        return DoubleBufferOperations.cos(arg)
     }
 
     override fun tan(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.tan(arg)
+        return DoubleBufferOperations.tan(arg)
     }
 
     override fun asin(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.asin(arg)
+        return DoubleBufferOperations.asin(arg)
     }
 
     override fun acos(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.acos(arg)
+        return DoubleBufferOperations.acos(arg)
     }
 
     override fun atan(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.atan(arg)
+        return DoubleBufferOperations.atan(arg)
     }
 
     override fun sinh(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.sinh(arg)
+        return DoubleBufferOperations.sinh(arg)
     }
 
     override fun cosh(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.cosh(arg)
+        return DoubleBufferOperations.cosh(arg)
     }
 
     override fun tanh(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.tanh(arg)
+        return DoubleBufferOperations.tanh(arg)
     }
 
     override fun asinh(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.asinh(arg)
+        return DoubleBufferOperations.asinh(arg)
     }
 
     override fun acosh(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.acosh(arg)
+        return DoubleBufferOperations.acosh(arg)
     }
 
     override fun atanh(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.atanh(arg)
+        return DoubleBufferOperations.atanh(arg)
     }
 
     override fun power(arg: Buffer<Double>, pow: Number): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.power(arg, pow)
+        return DoubleBufferOperations.power(arg, pow)
     }
 
     override fun exp(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.exp(arg)
+        return DoubleBufferOperations.exp(arg)
     }
 
     override fun ln(arg: Buffer<Double>): DoubleBuffer {
         require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferFieldOperations.ln(arg)
+        return DoubleBufferOperations.ln(arg)
     }
 
     override fun norm(arg: Buffer<Double>): Double  = DoubleL2Norm.norm(arg)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
index 7f44eda49..3a2703c54 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
@@ -306,14 +306,14 @@ public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> tanh(arg: T): T
  */
 @UnstableKMathAPI
 @Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> asinh(arg: T): T = arg.context.asinh(arg)
+public fun <T : AlgebraElement<T, ExponentialOperations<T>>> asinh(arg: T): T = arg.context.asinh(arg)
 
 /**
  * Computes the inverse hyperbolic cosine of [arg].
  */
 @UnstableKMathAPI
 @Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> acosh(arg: T): T = arg.context.acosh(arg)
+public fun <T : AlgebraElement<T, ExponentialOperations<T>>> acosh(arg: T): T = arg.context.acosh(arg)
 
 /**
  * Computes the inverse hyperbolic tangent of [arg].
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
index 4a53af60d..25333157a 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
@@ -40,6 +40,8 @@ public abstract class EjmlLinearSpace<T : Any, out A : Ring<T>, out M : org.ejml
 
     public abstract override fun buildVector(size: Int, initializer: A.(Int) -> T): EjmlVector<T, M>
 
+    @Suppress("UNCHECKED_CAST")
     @UnstableKMathAPI
-    public fun EjmlMatrix<T, *>.inverse(): Structure2D<Double> = computeFeature(this, InverseMatrixFeature::class)?.inverse as Structure2D<Double>
+    public fun EjmlMatrix<T, *>.inverse(): Structure2D<Double> =
+        computeFeature(this, InverseMatrixFeature::class)?.inverse as Structure2D<Double>
 }
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
index b707ebfc5..cca1c3551 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
@@ -7,11 +7,12 @@ package space.kscience.kmath.real
 
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Norm
-import space.kscience.kmath.structures.*
+import space.kscience.kmath.operations.DoubleL2Norm
+import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer.Companion.double
+import space.kscience.kmath.structures.asBuffer
+import space.kscience.kmath.structures.indices
 import kotlin.math.pow
-import kotlin.math.sqrt
 
 public typealias DoubleVector = Point<Double>
 
-- 
2.34.1


From 85aefb538096e96f9e50d68896c20378f3d9ba49 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 2 Oct 2021 16:14:38 +0300
Subject: [PATCH 338/713] Completely remove AlgebraElements.kt

---
 CHANGELOG.md                                  |   1 +
 .../kmath/ejml/codegen/ejmlCodegen.kt         |  20 +--
 .../kscience/kmath/linear/dotPerformance.kt   |   2 +-
 .../kmath/operations/AlgebraElements.kt       | 128 -----------------
 .../kmath/operations/OptionalOperations.kt    | 130 ------------------
 .../kmath/optimization/QowOptimizer.kt        |   3 +-
 6 files changed, 14 insertions(+), 270 deletions(-)
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c27dafeb4..6cb9f57f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@
 - Expression algebra builders
 - Complex and Quaternion no longer are elements.
 - Second generic from DifferentiableExpression
+- Algebra elements are completely removed. Use algebra contexts instead.
 
 ### Fixed
 - Ring inherits RingOperations, not GroupOperations
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
index a533e98a5..cfebf61e7 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
@@ -240,10 +240,10 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
                 }
 
                 override val q: Matrix<${type}> by lazy {
-                    qr.getQ(null, false).wrapMatrix() + OrthogonalFeature
+                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
                 }
 
-                override val r: Matrix<${type}> by lazy { qr.getR(null, false).wrapMatrix() + UFeature }
+                override val r: Matrix<${type}> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
             }
 
             CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<${type}> {
@@ -251,7 +251,7 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
                     val cholesky =
                         DecompositionFactory_${ops}.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
 
-                    cholesky.getT(null).wrapMatrix() + LFeature
+                    cholesky.getT(null).wrapMatrix().withFeature(LFeature)
                 }
             }
 
@@ -261,11 +261,11 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
                 }
 
                 override val l: Matrix<${type}> by lazy {
-                    lup.getLower(null).wrapMatrix() + LFeature
+                    lup.getLower(null).wrapMatrix().withFeature(LFeature)
                 }
 
                 override val u: Matrix<${type}> by lazy {
-                    lup.getUpper(null).wrapMatrix() + UFeature
+                    lup.getUpper(null).wrapMatrix().withFeature(UFeature)
                 }
 
                 override val p: Matrix<${type}> by lazy { lup.getRowPivot(null).wrapMatrix() }
@@ -275,10 +275,10 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
                 }
 
                 override val q: Matrix<${type}> by lazy {
-                    qr.getQ(null, false).wrapMatrix() + OrthogonalFeature
+                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
                 }
 
-                override val r: Matrix<${type}> by lazy { qr.getR(null, false).wrapMatrix() + UFeature }
+                override val r: Matrix<${type}> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
             }
 
             CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<${type}> {
@@ -286,7 +286,7 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
                     val cholesky =
                         DecompositionFactory_${ops}.cholesky().apply { decompose(origin.copy()) }
 
-                    (cholesky.getT(null) as ${ejmlMatrixParentTypeMatrix}).wrapMatrix() + LFeature
+                    (cholesky.getT(null) as ${ejmlMatrixParentTypeMatrix}).wrapMatrix().withFeature(LFeature)
                 }
             }
 
@@ -297,11 +297,11 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
                 }
 
                 override val l: Matrix<${type}> by lazy {
-                    lu.getLower(null).wrapMatrix() + LFeature
+                    lu.getLower(null).wrapMatrix().withFeature(LFeature)
                 }
 
                 override val u: Matrix<${type}> by lazy {
-                    lu.getUpper(null).wrapMatrix() + UFeature
+                    lu.getUpper(null).wrapMatrix().withFeature(UFeature)
                 }
 
                 override val inverse: Matrix<${type}> by lazy {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt b/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
index 31762b6d8..6e8767a5b 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
@@ -24,7 +24,7 @@ fun main() {
     val time = measureTimeMillis {
         with(Double.algebra.linearSpace) {
             repeat(10) {
-                val res = matrix1 dot matrix2
+                matrix1 dot matrix2
             }
         }
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
deleted file mode 100644
index 7669e073a..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/AlgebraElements.kt
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
-
-package space.kscience.kmath.operations
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-
-/**
- * The generic mathematics elements that is able to store its context
- *
- * @param C the type of mathematical context for this element.
- * @param T the type wrapped by this wrapper.
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public interface AlgebraElement<T, out C : Algebra<T>> {
-    /**
-     * The context this element belongs to.
-     */
-    public val context: C
-}
-//
-///**
-// * Divides this element by number.
-// *
-// * @param k the divisor.
-// * @return the quotient.
-// */
-//public operator fun <T : AlgebraElement<T, S>, S : Space<T>> T.div(k: Number): T =
-//    context.multiply(this, 1.0 / k.toDouble())
-//
-///**
-// * Multiplies this element by number.
-// *
-// * @param k the multiplicand.
-// * @return the product.
-// */
-//public operator fun <T : AlgebraElement<T, S>, S : Space<T>> T.times(k: Number): T =
-//    context.multiply(this, k.toDouble())
-
-/**
- * Subtracts element from this one.
- *
- * @param b the subtrahend.
- * @return the difference.
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public operator fun <T : AlgebraElement<T, S>, S : NumbersAddOperations<T>> T.minus(b: T): T =
-    context.add(this, context.run { -b })
-
-/**
- * Adds element to this one.
- *
- * @receiver the augend.
- * @param b the addend.
- * @return the sum.
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public operator fun <T : AlgebraElement<T, S>, S : Ring<T>> T.plus(b: T): T =
-    context.add(this, b)
-
-///**
-// * Number times element
-// */
-//public operator fun <T : AlgebraElement<T, S>, S : Space<T>> Number.times(element: T): T =
-//    element.times(this)
-
-/**
- * Multiplies this element by another one.
- *
- * @receiver the multiplicand.
- * @param b the multiplier.
- * @return the product.
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public operator fun <T : AlgebraElement<T, R>, R : Ring<T>> T.times(b: T): T =
-    context.multiply(this, b)
-
-
-/**
- * Divides this element by another one.
- *
- * @param b the divisor.
- * @return the quotient.
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public operator fun <T : AlgebraElement<T, F>, F : Field<T>> T.div(b: T): T =
-    context.divide(this, b)
-
-
-/**
- * The element of [Group].
- *
- * @param T the type of space operation results.
- * @param I self type of the element. Needed for static type checking.
- * @param S the type of space.
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public interface GroupElement<T : GroupElement<T, S>, S : Group<T>> : AlgebraElement<T, S>
-
-/**
- * The element of [Ring].
- *
- * @param T the type of ring operation results.
- * @param I self type of the element. Needed for static type checking.
- * @param R the type of ring.
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public interface RingElement<T : RingElement<T, R>, R : Ring<T>> : GroupElement<T, R>
-
-/**
- * The element of [Field].
- *
- * @param T the type of field operation results.
- * @param I self type of the element. Needed for static type checking.
- * @param F the type of field.
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public interface FieldElement<T : FieldElement<T, F>, F : Field<T>> : RingElement<T, F>
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
index 3a2703c54..d32e03533 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
@@ -5,8 +5,6 @@
 
 package space.kscience.kmath.operations
 
-import space.kscience.kmath.misc.UnstableKMathAPI
-
 /**
  * A container for trigonometric operations for specific type.
  *
@@ -76,48 +74,6 @@ public interface TrigonometricOperations<T> : Algebra<T> {
     }
 }
 
-/**
- * Computes the sine of [arg].
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out TrigonometricOperations<T>>> sin(arg: T): T = arg.context.sin(arg)
-
-/**
- * Computes the cosine of [arg].
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out TrigonometricOperations<T>>> cos(arg: T): T = arg.context.cos(arg)
-
-/**
- * Computes the tangent of [arg].
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out TrigonometricOperations<T>>> tan(arg: T): T = arg.context.tan(arg)
-
-/**
- * Computes the inverse sine of [arg].
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out TrigonometricOperations<T>>> asin(arg: T): T = arg.context.asin(arg)
-
-/**
- * Computes the inverse cosine of [arg].
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out TrigonometricOperations<T>>> acos(arg: T): T = arg.context.acos(arg)
-
-/**
- * Computes the inverse tangent of [arg].
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out TrigonometricOperations<T>>> atan(arg: T): T = arg.context.atan(arg)
-
 /**
  * A context extension to include power operations based on exponentiation.
  *
@@ -152,31 +108,6 @@ public interface PowerOperations<T> : Algebra<T> {
     }
 }
 
-/**
- * Raises this element to the power [power].
- *
- * @receiver the base.
- * @param power the exponent.
- * @return the base raised to the power.
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public infix fun <T : AlgebraElement<T, out PowerOperations<T>>> T.pow(power: Double): T = context.power(this, power)
-
-/**
- * Computes the square root of the value [arg].
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out PowerOperations<T>>> sqrt(arg: T): T = arg pow 0.5
-
-/**
- * Computes the square of the value [arg].
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out PowerOperations<T>>> sqr(arg: T): T = arg pow 2.0
-
 /**
  * A container for operations related to `exp` and `ln` functions.
  *
@@ -266,62 +197,6 @@ public interface ExponentialOperations<T> : Algebra<T> {
     }
 }
 
-/**
- * The identifier of exponential function.
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> exp(arg: T): T = arg.context.exp(arg)
-
-/**
- * The identifier of natural logarithm.
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> ln(arg: T): T = arg.context.ln(arg)
-
-
-/**
- * Computes the hyperbolic sine of [arg].
- */
-@UnstableKMathAPI
-public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> sinh(arg: T): T = arg.context.sinh(arg)
-
-/**
- * Computes the hyperbolic cosine of [arg].
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> cosh(arg: T): T = arg.context.cosh(arg)
-
-/**
- * Computes the hyperbolic tangent of [arg].
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> tanh(arg: T): T = arg.context.tanh(arg)
-
-/**
- * Computes the inverse hyperbolic sine of [arg].
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, ExponentialOperations<T>>> asinh(arg: T): T = arg.context.asinh(arg)
-
-/**
- * Computes the inverse hyperbolic cosine of [arg].
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, ExponentialOperations<T>>> acosh(arg: T): T = arg.context.acosh(arg)
-
-/**
- * Computes the inverse hyperbolic tangent of [arg].
- */
-@UnstableKMathAPI
-@Deprecated("AlgebraElements are considered odd and will be removed in future releases.")
-public fun <T : AlgebraElement<T, out ExponentialOperations<T>>> atanh(arg: T): T = arg.context.atanh(arg)
-
 /**
  * A container for norm functional on element.
  *
@@ -335,8 +210,3 @@ public interface Norm<in T : Any, out R> {
     public fun norm(arg: T): R
 }
 
-/**
- * Computes the norm of [arg] (i.e., absolute value or vector length).
- */
-@UnstableKMathAPI
-public fun <T : AlgebraElement<T, out Norm<T, R>>, R> norm(arg: T): R = arg.context.norm(arg)
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
index 68941304f..babbaf6cd 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
@@ -13,9 +13,10 @@ import space.kscience.kmath.linear.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.misc.log
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.DoubleL2Norm
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.DoubleL2Norm
+
 
 public class QowRuns(public val runs: Int) : OptimizationFeature {
     init {
-- 
2.34.1


From abae29bbede98231c17ebe00708443ac39fbb854 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 2 Oct 2021 18:54:45 +0300
Subject: [PATCH 339/713] DoubleBuffer algebra refactoring

---
 .../space/kscience/kmath/fit/chiSquared.kt    |  11 +-
 .../kotlin/space/kscience/kmath/fit/qowFit.kt |   4 +-
 .../kmath/functions/interpolateSquare.kt      |   2 +-
 .../commons/transform/Transformations.kt      |   7 +-
 .../commons/optimization/OptimizeTest.kt      |   2 +-
 .../kmath/expressions/specialExpressions.kt   |   2 +-
 .../kmath/linear/DoubleLinearSpace.kt         |  17 +-
 .../space/kscience/kmath/nd/Structure1D.kt    |   2 +-
 .../kmath/operations/DoubleBufferField.kt     | 130 +++
 .../operations/DoubleBufferOperations.kt      | 150 +--
 .../bufferOperation.kt                        |   3 +-
 .../kscience/kmath/operations/numbers.kt      |   5 +-
 .../space/kscience/kmath/structures/Buffer.kt |   4 +-
 .../kmath/streaming/RingBufferTest.kt         |   2 +-
 .../space/kscience/kmath/ejml/_generated.kt   | 995 ++++++++++++++++++
 .../space/kscience/kmath/real/RealMatrix.kt   |   2 +-
 .../integration/GaussIntegratorRuleFactory.kt |   2 +-
 .../kmath/integration/SplineIntegrator.kt     |   6 +-
 .../kscience/kmath/geometry/Vector2DTest.kt   |   5 +-
 .../kscience/kmath/geometry/Vector3DTest.kt   |   2 +-
 .../kmath/histogram/UnivariateHistogram.kt    |   4 +-
 .../kscience/kmath/jupyter/KMathJupyter.kt    |   2 +-
 .../space/kscience/kmath/stat/Median.kt       |   2 +-
 .../kmath/tensors/core/internal/linUtils.kt   |   2 +-
 .../kmath/tensors/core/internal/utils.kt      |   1 +
 25 files changed, 1203 insertions(+), 161 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/{structures => operations}/bufferOperation.kt (97%)
 create mode 100644 kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
index 8db97d672..dbe0b8454 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
@@ -10,20 +10,21 @@ import kotlinx.html.h3
 import space.kscience.kmath.commons.expressions.DSProcessor
 import space.kscience.kmath.commons.optimization.CMOptimizer
 import space.kscience.kmath.distributions.NormalDistribution
-import space.kscience.kmath.expressions.binding
 import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.optimization.*
+import space.kscience.kmath.operations.asIterable
+import space.kscience.kmath.operations.toList
+import space.kscience.kmath.optimization.FunctionOptimizationTarget
+import space.kscience.kmath.optimization.optimizeWith
+import space.kscience.kmath.optimization.resultPoint
+import space.kscience.kmath.optimization.resultValue
 import space.kscience.kmath.real.DoubleVector
 import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
 import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.structures.asIterable
-import space.kscience.kmath.structures.toList
 import space.kscience.plotly.*
 import space.kscience.plotly.models.ScatterMode
 import space.kscience.plotly.models.TraceValues
-import kotlin.math.abs
 import kotlin.math.pow
 import kotlin.math.sqrt
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
index 04764d763..d52976671 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
@@ -13,6 +13,8 @@ import space.kscience.kmath.distributions.NormalDistribution
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.binding
 import space.kscience.kmath.expressions.symbol
+import space.kscience.kmath.operations.asIterable
+import space.kscience.kmath.operations.toList
 import space.kscience.kmath.optimization.QowOptimizer
 import space.kscience.kmath.optimization.chiSquaredOrNull
 import space.kscience.kmath.optimization.fitWith
@@ -20,8 +22,6 @@ import space.kscience.kmath.optimization.resultPoint
 import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
 import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.structures.asIterable
-import space.kscience.kmath.structures.toList
 import space.kscience.plotly.*
 import space.kscience.plotly.models.ScatterMode
 import kotlin.math.abs
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
index 76422d658..3f958b3b0 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
@@ -8,8 +8,8 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.interpolation.SplineInterpolator
 import space.kscience.kmath.interpolation.interpolatePolynomials
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
-import space.kscience.kmath.structures.map
 import space.kscience.plotly.Plotly
 import space.kscience.plotly.UnstablePlotlyAPI
 import space.kscience.plotly.makeFile
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
index 1a99e9fc6..73ab91542 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
@@ -10,10 +10,13 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import org.apache.commons.math3.transform.*
 import space.kscience.kmath.complex.Complex
+import space.kscience.kmath.operations.SuspendBufferTransform
 import space.kscience.kmath.streaming.chunked
 import space.kscience.kmath.streaming.spread
-import space.kscience.kmath.structures.*
-
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.VirtualBuffer
+import space.kscience.kmath.structures.asBuffer
 
 
 /**
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index 681ec9ebc..c670ceead 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -13,11 +13,11 @@ import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.Symbol.Companion.y
 import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
+import space.kscience.kmath.operations.map
 import space.kscience.kmath.optimization.*
 import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
-import space.kscience.kmath.structures.map
 import kotlin.math.pow
 import kotlin.test.Test
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
index 6b17dfca5..907ce4004 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.expressions
 
 import space.kscience.kmath.operations.ExtendedField
+import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asIterable
 import space.kscience.kmath.structures.indices
 import kotlin.jvm.JvmName
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
index a3e031902..4a1311b54 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
@@ -9,6 +9,7 @@ import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.DoubleFieldND
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.nd.asND
+import space.kscience.kmath.operations.DoubleBufferOperations
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
@@ -89,17 +90,21 @@ public object DoubleLinearSpace : LinearSpace<Double, DoubleField> {
         asND().map { it * value }.as2D()
     }
 
-    public override fun Point<Double>.plus(other: Point<Double>): DoubleBuffer = DoubleBuffer(size) {
-        get(it) + other[it]
+    public override fun Point<Double>.plus(other: Point<Double>): DoubleBuffer = DoubleBufferOperations.run {
+        this@plus + other
     }
 
-    public override fun Point<Double>.minus(other: Point<Double>): DoubleBuffer = DoubleBuffer(size) {
-        get(it) - other[it]
+    public override fun Point<Double>.minus(other: Point<Double>): DoubleBuffer = DoubleBufferOperations.run {
+        this@minus - other
     }
 
-    public override fun Point<Double>.times(value: Double): DoubleBuffer = DoubleBuffer(size) { i -> get(i) * value }
+    public override fun Point<Double>.times(value: Double): DoubleBuffer = DoubleBufferOperations.run {
+        scale(this@times, value)
+    }
 
-    public operator fun Point<Double>.div(value: Double): DoubleBuffer = DoubleBuffer(size) { i -> get(i) / value }
+    public operator fun Point<Double>.div(value: Double): DoubleBuffer = DoubleBufferOperations.run {
+        scale(this@div, 1.0 / value)
+    }
 
     public override fun Double.times(v: Point<Double>): DoubleBuffer = v * this
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index f2a4336eb..3dcc77334 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -6,10 +6,10 @@
 package space.kscience.kmath.nd
 
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.structures.asMutableBuffer
-import space.kscience.kmath.structures.asSequence
 import kotlin.jvm.JvmInline
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
new file mode 100644
index 000000000..acc2c2dc0
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.operations
+
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.DoubleBuffer
+
+/**
+ * [ExtendedField] over [DoubleBuffer].
+ *
+ * @property size the size of buffers to operate on.
+ */
+public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Double>>, DoubleBufferOperations() {
+    override val zero: Buffer<Double> by lazy { DoubleBuffer(size) { 0.0 } }
+    override val one: Buffer<Double> by lazy { DoubleBuffer(size) { 1.0 } }
+
+    override fun sinh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOperations>.sinh(arg)
+
+    override fun cosh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOperations>.cosh(arg)
+
+    override fun tanh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOperations>.tanh(arg)
+
+    override fun asinh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOperations>.asinh(arg)
+
+    override fun acosh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOperations>.acosh(arg)
+
+    override fun atanh(arg: Buffer<Double>): DoubleBuffer= super<DoubleBufferOperations>.atanh(arg)
+
+    //    override fun number(value: Number): Buffer<Double> = DoubleBuffer(size) { value.toDouble() }
+//
+//    override fun Buffer<Double>.unaryMinus(): Buffer<Double> = DoubleBufferOperations.run {
+//        -this@unaryMinus
+//    }
+//
+//    override fun add(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
+//        require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
+//        return DoubleBufferOperations.add(a, b)
+//    }
+//
+
+//
+//    override fun multiply(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
+//        require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
+//        return DoubleBufferOperations.multiply(a, b)
+//    }
+//
+//    override fun divide(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
+//        require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
+//        return DoubleBufferOperations.divide(a, b)
+//    }
+//
+//    override fun sin(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.sin(arg)
+//    }
+//
+//    override fun cos(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.cos(arg)
+//    }
+//
+//    override fun tan(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.tan(arg)
+//    }
+//
+//    override fun asin(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.asin(arg)
+//    }
+//
+//    override fun acos(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.acos(arg)
+//    }
+//
+//    override fun atan(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.atan(arg)
+//    }
+//
+//    override fun sinh(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.sinh(arg)
+//    }
+//
+//    override fun cosh(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.cosh(arg)
+//    }
+//
+//    override fun tanh(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.tanh(arg)
+//    }
+//
+//    override fun asinh(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.asinh(arg)
+//    }
+//
+//    override fun acosh(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.acosh(arg)
+//    }
+//
+//    override fun atanh(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.atanh(arg)
+//    }
+//
+//    override fun power(arg: Buffer<Double>, pow: Number): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.power(arg, pow)
+//    }
+//
+//    override fun exp(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.exp(arg)
+//    }
+//
+//    override fun ln(arg: Buffer<Double>): DoubleBuffer {
+//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
+//        return DoubleBufferOperations.ln(arg)
+//    }
+
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOperations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOperations.kt
index a95bd2541..50b821962 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOperations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOperations.kt
@@ -8,13 +8,13 @@ package space.kscience.kmath.operations
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.fold
+
 import kotlin.math.*
 
 /**
  * [ExtendedFieldOperations] over [DoubleBuffer].
  */
-public object DoubleBufferOperations : ExtendedFieldOperations<Buffer<Double>> {
+public abstract class DoubleBufferOperations : ExtendedFieldOperations<Buffer<Double>>, Norm<Buffer<Double>, Double> {
     override fun Buffer<Double>.unaryMinus(): DoubleBuffer = if (this is DoubleBuffer) {
         DoubleBuffer(size) { -array[it] }
     } else {
@@ -32,7 +32,22 @@ public object DoubleBufferOperations : ExtendedFieldOperations<Buffer<Double>> {
             DoubleBuffer(DoubleArray(a.size) { aArray[it] + bArray[it] })
         } else DoubleBuffer(DoubleArray(a.size) { a[it] + b[it] })
     }
-//
+
+    override fun Buffer<Double>.plus(b: Buffer<Double>): DoubleBuffer = add(this, b)
+
+    override fun Buffer<Double>.minus(b: Buffer<Double>): DoubleBuffer {
+        require(b.size == this.size) {
+            "The size of the first buffer ${this.size} should be the same as for second one: ${b.size} "
+        }
+
+        return if (this is DoubleBuffer && b is DoubleBuffer) {
+            val aArray = this.array
+            val bArray = b.array
+            DoubleBuffer(DoubleArray(this.size) { aArray[it] - bArray[it] })
+        } else DoubleBuffer(DoubleArray(this.size) { this[it] - b[it] })
+    }
+
+    //
 //    override fun multiply(a: Buffer<Double>, k: Number): RealBuffer {
 //        val kValue = k.toDouble()
 //
@@ -159,128 +174,21 @@ public object DoubleBufferOperations : ExtendedFieldOperations<Buffer<Double>> {
     override fun ln(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
         val array = arg.array
         DoubleBuffer(DoubleArray(arg.size) { ln(array[it]) })
-    } else
+    } else {
         DoubleBuffer(DoubleArray(arg.size) { ln(arg[it]) })
+    }
+
+    override fun norm(arg: Buffer<Double>): Double = DoubleL2Norm.norm(arg)
+
+    override fun scale(a: Buffer<Double>, value: Double): DoubleBuffer = if (a is DoubleBuffer) {
+        val aArray = a.array
+        DoubleBuffer(DoubleArray(a.size) { aArray[it] * value })
+    } else DoubleBuffer(DoubleArray(a.size) { a[it] * value })
+
+    public companion object : DoubleBufferOperations()
 }
 
 public object DoubleL2Norm : Norm<Point<Double>, Double> {
     override fun norm(arg: Point<Double>): Double = sqrt(arg.fold(0.0) { acc: Double, d: Double -> acc + d.pow(2) })
 }
 
-/**
- * [ExtendedField] over [DoubleBuffer].
- *
- * @property size the size of buffers to operate on.
- */
-@Deprecated("To be replaced by generic BufferAlgebra")
-public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Double>>, Norm<Buffer<Double>, Double> {
-    override val zero: Buffer<Double> by lazy { DoubleBuffer(size) { 0.0 } }
-    override val one: Buffer<Double> by lazy { DoubleBuffer(size) { 1.0 } }
-
-    override fun number(value: Number): Buffer<Double> = DoubleBuffer(size) { value.toDouble() }
-
-    override fun Buffer<Double>.unaryMinus(): Buffer<Double> = DoubleBufferOperations.run {
-        -this@unaryMinus
-    }
-
-    override fun add(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
-        require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
-        return DoubleBufferOperations.add(a, b)
-    }
-
-    override fun scale(a: Buffer<Double>, value: Double): DoubleBuffer {
-        require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
-
-        return if (a is DoubleBuffer) {
-            val aArray = a.array
-            DoubleBuffer(DoubleArray(a.size) { aArray[it] * value })
-        } else DoubleBuffer(DoubleArray(a.size) { a[it] * value })
-    }
-
-    override fun multiply(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
-        require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
-        return DoubleBufferOperations.multiply(a, b)
-    }
-
-    override fun divide(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
-        require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
-        return DoubleBufferOperations.divide(a, b)
-    }
-
-    override fun sin(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.sin(arg)
-    }
-
-    override fun cos(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.cos(arg)
-    }
-
-    override fun tan(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.tan(arg)
-    }
-
-    override fun asin(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.asin(arg)
-    }
-
-    override fun acos(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.acos(arg)
-    }
-
-    override fun atan(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.atan(arg)
-    }
-
-    override fun sinh(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.sinh(arg)
-    }
-
-    override fun cosh(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.cosh(arg)
-    }
-
-    override fun tanh(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.tanh(arg)
-    }
-
-    override fun asinh(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.asinh(arg)
-    }
-
-    override fun acosh(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.acosh(arg)
-    }
-
-    override fun atanh(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.atanh(arg)
-    }
-
-    override fun power(arg: Buffer<Double>, pow: Number): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.power(arg, pow)
-    }
-
-    override fun exp(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.exp(arg)
-    }
-
-    override fun ln(arg: Buffer<Double>): DoubleBuffer {
-        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-        return DoubleBufferOperations.ln(arg)
-    }
-
-    override fun norm(arg: Buffer<Double>): Double  = DoubleL2Norm.norm(arg)
-}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferOperation.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
similarity index 97%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferOperation.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
index bc3f5b64b..6bf3266e3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferOperation.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
@@ -3,9 +3,10 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
-package space.kscience.kmath.structures
+package space.kscience.kmath.operations
 
 import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.structures.*
 
 /**
  * Typealias for buffer transformations.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index c90553aaa..4c0010bf9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -14,7 +14,8 @@ public interface ExtendedFieldOperations<T> :
     FieldOperations<T>,
     TrigonometricOperations<T>,
     PowerOperations<T>,
-    ExponentialOperations<T> {
+    ExponentialOperations<T>,
+    ScaleOperations<T>  {
     override fun tan(arg: T): T = sin(arg) / cos(arg)
     override fun tanh(arg: T): T = sinh(arg) / cosh(arg)
 
@@ -41,7 +42,7 @@ public interface ExtendedFieldOperations<T> :
 /**
  * Advanced Number-like field that implements basic operations.
  */
-public interface ExtendedField<T> : ExtendedFieldOperations<T>, Field<T>, NumericAlgebra<T>, ScaleOperations<T> {
+public interface ExtendedField<T> : ExtendedFieldOperations<T>, Field<T>, NumericAlgebra<T>{
     override fun sinh(arg: T): T = (exp(arg) - exp(-arg)) / 2.0
     override fun cosh(arg: T): T = (exp(arg) + exp(-arg)) / 2.0
     override fun tanh(arg: T): T = (exp(arg) - exp(-arg)) / (exp(-arg) + exp(arg))
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index fc23169ca..c68bca2d9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.structures
 
+import space.kscience.kmath.operations.asSequence
 import kotlin.jvm.JvmInline
 import kotlin.reflect.KClass
 
@@ -49,7 +50,8 @@ public interface Buffer<out T> {
 
     public companion object {
 
-        public fun toString(buffer: Buffer<*>): String = buffer.asSequence().joinToString(prefix = "[", separator = ", ", postfix = "]")
+        public fun toString(buffer: Buffer<*>): String =
+            buffer.asSequence().joinToString(prefix = "[", separator = ", ", postfix = "]")
 
         /**
          * Check the element-by-element match of content of two buffers.
diff --git a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
index 14081b0f5..a3143a1ac 100644
--- a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
+++ b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.streaming
 
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.runBlocking
-import space.kscience.kmath.structures.asSequence
+import space.kscience.kmath.operations.asSequence
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
new file mode 100644
index 000000000..dce739dc2
--- /dev/null
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
@@ -0,0 +1,995 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+/* This file is generated with buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt */
+
+package space.kscience.kmath.ejml
+
+import org.ejml.data.*
+import org.ejml.dense.row.CommonOps_DDRM
+import org.ejml.dense.row.CommonOps_FDRM
+import org.ejml.dense.row.factory.DecompositionFactory_DDRM
+import org.ejml.dense.row.factory.DecompositionFactory_FDRM
+import org.ejml.sparse.FillReducing
+import org.ejml.sparse.csc.CommonOps_DSCC
+import org.ejml.sparse.csc.CommonOps_FSCC
+import org.ejml.sparse.csc.factory.DecompositionFactory_DSCC
+import org.ejml.sparse.csc.factory.DecompositionFactory_FSCC
+import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
+import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
+import space.kscience.kmath.linear.*
+import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.nd.StructureFeature
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.FloatField
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.FloatBuffer
+import kotlin.reflect.KClass
+import kotlin.reflect.cast
+
+/**
+ * [EjmlVector] specialization for [Double].
+ */
+public class EjmlDoubleVector<out M : DMatrix>(override val origin: M) : EjmlVector<Double, M>(origin) {
+    init {
+        require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
+    }
+
+    override operator fun get(index: Int): Double = origin[0, index]
+}
+
+/**
+ * [EjmlVector] specialization for [Float].
+ */
+public class EjmlFloatVector<out M : FMatrix>(override val origin: M) : EjmlVector<Float, M>(origin) {
+    init {
+        require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
+    }
+
+    override operator fun get(index: Int): Float = origin[0, index]
+}
+
+/**
+ * [EjmlMatrix] specialization for [Double].
+ */
+public class EjmlDoubleMatrix<out M : DMatrix>(override val origin: M) : EjmlMatrix<Double, M>(origin) {
+    override operator fun get(i: Int, j: Int): Double = origin[i, j]
+}
+
+/**
+ * [EjmlMatrix] specialization for [Float].
+ */
+public class EjmlFloatMatrix<out M : FMatrix>(override val origin: M) : EjmlMatrix<Float, M>(origin) {
+    override operator fun get(i: Int, j: Int): Float = origin[i, j]
+}
+
+/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_DDRM], [DecompositionFactory_DDRM] operations and
+ * [DMatrixRMaj] matrices.
+ */
+public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrixRMaj>() {
+    /**
+     * The [DoubleField] reference.
+     */
+    override val elementAlgebra: DoubleField get() = DoubleField
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixRMaj> = when {
+        this is EjmlDoubleMatrix<*> && origin is DMatrixRMaj -> this as EjmlDoubleMatrix<DMatrixRMaj>
+        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixRMaj> = when {
+        this is EjmlDoubleVector<*> && origin is DMatrixRMaj -> this as EjmlDoubleVector<DMatrixRMaj>
+        else -> EjmlDoubleVector(DMatrixRMaj(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
+        })
+    }
+
+    override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: DoubleField.(i: Int, j: Int) -> Double,
+    ): EjmlDoubleMatrix<DMatrixRMaj> = DMatrixRMaj(rows, columns).also {
+        (0 until rows).forEach { row ->
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
+        }
+    }.wrapMatrix()
+
+    override fun buildVector(
+        size: Int,
+        initializer: DoubleField.(Int) -> Double,
+    ): EjmlDoubleVector<DMatrixRMaj> = EjmlDoubleVector(DMatrixRMaj(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
+
+    private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
+    private fun <T : DMatrix> T.wrapVector() = EjmlDoubleVector(this)
+
+    override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
+
+    override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
+
+    override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
+
+    override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+
+        CommonOps_DDRM.add(
+            elementAlgebra.one, 
+            toEjml().origin, 
+            elementAlgebra { -one },
+            other.toEjml().origin, 
+            out,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.scale(value, toEjml().origin, res)
+        return res.wrapMatrix()
+    }
+
+    override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.changeSign(toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        
+        CommonOps_DDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin, 
+            out,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+
+        CommonOps_DDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin,
+            out,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+
+        CommonOps_DDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra { -one },
+            other.toEjml().origin,
+            out,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> = m * this
+
+    override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.scale(value, toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixRMaj> = v * this
+
+    @UnstableKMathAPI
+    override fun <F : StructureFeature> computeFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
+        structure.getFeature(type)?.let { return it }
+        val origin = structure.toEjml().origin
+
+        return when (type) {
+            InverseMatrixFeature::class -> object : InverseMatrixFeature<Double> {
+                override val inverse: Matrix<Double> by lazy {
+                    val res = origin.copy()
+                    CommonOps_DDRM.invert(res)
+                    res.wrapMatrix()
+                }
+            }
+
+            DeterminantFeature::class -> object : DeterminantFeature<Double> {
+                override val determinant: Double by lazy { CommonOps_DDRM.det(origin) }
+            }
+
+            SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<Double> {
+                private val svd by lazy {
+                    DecompositionFactory_DDRM.svd(origin.numRows, origin.numCols, true, true, false)
+                        .apply { decompose(origin.copy()) }
+                }
+
+                override val u: Matrix<Double> by lazy { svd.getU(null, false).wrapMatrix() }
+                override val s: Matrix<Double> by lazy { svd.getW(null).wrapMatrix() }
+                override val v: Matrix<Double> by lazy { svd.getV(null, false).wrapMatrix() }
+                override val singularValues: Point<Double> by lazy { DoubleBuffer(svd.singularValues) }
+            }
+
+            QRDecompositionFeature::class -> object : QRDecompositionFeature<Double> {
+                private val qr by lazy {
+                    DecompositionFactory_DDRM.qr().apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<Double> by lazy {
+                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
+                }
+
+                override val r: Matrix<Double> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Double> {
+                override val l: Matrix<Double> by lazy {
+                    val cholesky =
+                        DecompositionFactory_DDRM.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
+
+                    cholesky.getT(null).wrapMatrix().withFeature(LFeature)
+                }
+            }
+
+            LupDecompositionFeature::class -> object : LupDecompositionFeature<Double> {
+                private val lup by lazy {
+                    DecompositionFactory_DDRM.lu(origin.numRows, origin.numCols).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<Double> by lazy {
+                    lup.getLower(null).wrapMatrix().withFeature(LFeature)
+                }
+
+                override val u: Matrix<Double> by lazy {
+                    lup.getUpper(null).wrapMatrix().withFeature(UFeature)
+                }
+
+                override val p: Matrix<Double> by lazy { lup.getRowPivot(null).wrapMatrix() }
+            }
+
+            else -> null
+        }?.let(type::cast)
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
+        return res.wrapMatrix()
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
+        return EjmlDoubleVector(res)
+    }
+}
+
+/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_FDRM], [DecompositionFactory_FDRM] operations and
+ * [FMatrixRMaj] matrices.
+ */
+public object EjmlLinearSpaceFDRM : EjmlLinearSpace<Float, FloatField, FMatrixRMaj>() {
+    /**
+     * The [FloatField] reference.
+     */
+    override val elementAlgebra: FloatField get() = FloatField
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixRMaj> = when {
+        this is EjmlFloatMatrix<*> && origin is FMatrixRMaj -> this as EjmlFloatMatrix<FMatrixRMaj>
+        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixRMaj> = when {
+        this is EjmlFloatVector<*> && origin is FMatrixRMaj -> this as EjmlFloatVector<FMatrixRMaj>
+        else -> EjmlFloatVector(FMatrixRMaj(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
+        })
+    }
+
+    override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: FloatField.(i: Int, j: Int) -> Float,
+    ): EjmlFloatMatrix<FMatrixRMaj> = FMatrixRMaj(rows, columns).also {
+        (0 until rows).forEach { row ->
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
+        }
+    }.wrapMatrix()
+
+    override fun buildVector(
+        size: Int,
+        initializer: FloatField.(Int) -> Float,
+    ): EjmlFloatVector<FMatrixRMaj> = EjmlFloatVector(FMatrixRMaj(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
+
+    private fun <T : FMatrix> T.wrapMatrix() = EjmlFloatMatrix(this)
+    private fun <T : FMatrix> T.wrapVector() = EjmlFloatVector(this)
+
+    override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
+
+    override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
+
+    override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
+
+    override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+
+        CommonOps_FDRM.add(
+            elementAlgebra.one, 
+            toEjml().origin, 
+            elementAlgebra { -one },
+            other.toEjml().origin, 
+            out,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.scale(value, toEjml().origin, res)
+        return res.wrapMatrix()
+    }
+
+    override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.changeSign(toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+        
+        CommonOps_FDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin, 
+            out,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+
+        CommonOps_FDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin,
+            out,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+
+        CommonOps_FDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra { -one },
+            other.toEjml().origin,
+            out,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> = m * this
+
+    override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.scale(value, toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixRMaj> = v * this
+
+    @UnstableKMathAPI
+    override fun <F : StructureFeature> computeFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
+        structure.getFeature(type)?.let { return it }
+        val origin = structure.toEjml().origin
+
+        return when (type) {
+            InverseMatrixFeature::class -> object : InverseMatrixFeature<Float> {
+                override val inverse: Matrix<Float> by lazy {
+                    val res = origin.copy()
+                    CommonOps_FDRM.invert(res)
+                    res.wrapMatrix()
+                }
+            }
+
+            DeterminantFeature::class -> object : DeterminantFeature<Float> {
+                override val determinant: Float by lazy { CommonOps_FDRM.det(origin) }
+            }
+
+            SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<Float> {
+                private val svd by lazy {
+                    DecompositionFactory_FDRM.svd(origin.numRows, origin.numCols, true, true, false)
+                        .apply { decompose(origin.copy()) }
+                }
+
+                override val u: Matrix<Float> by lazy { svd.getU(null, false).wrapMatrix() }
+                override val s: Matrix<Float> by lazy { svd.getW(null).wrapMatrix() }
+                override val v: Matrix<Float> by lazy { svd.getV(null, false).wrapMatrix() }
+                override val singularValues: Point<Float> by lazy { FloatBuffer(svd.singularValues) }
+            }
+
+            QRDecompositionFeature::class -> object : QRDecompositionFeature<Float> {
+                private val qr by lazy {
+                    DecompositionFactory_FDRM.qr().apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<Float> by lazy {
+                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
+                }
+
+                override val r: Matrix<Float> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Float> {
+                override val l: Matrix<Float> by lazy {
+                    val cholesky =
+                        DecompositionFactory_FDRM.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
+
+                    cholesky.getT(null).wrapMatrix().withFeature(LFeature)
+                }
+            }
+
+            LupDecompositionFeature::class -> object : LupDecompositionFeature<Float> {
+                private val lup by lazy {
+                    DecompositionFactory_FDRM.lu(origin.numRows, origin.numCols).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<Float> by lazy {
+                    lup.getLower(null).wrapMatrix().withFeature(LFeature)
+                }
+
+                override val u: Matrix<Float> by lazy {
+                    lup.getUpper(null).wrapMatrix().withFeature(UFeature)
+                }
+
+                override val p: Matrix<Float> by lazy { lup.getRowPivot(null).wrapMatrix() }
+            }
+
+            else -> null
+        }?.let(type::cast)
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Float>, b: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.solve(FMatrixRMaj(a.toEjml().origin), FMatrixRMaj(b.toEjml().origin), res)
+        return res.wrapMatrix()
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Float>, b: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.solve(FMatrixRMaj(a.toEjml().origin), FMatrixRMaj(b.toEjml().origin), res)
+        return EjmlFloatVector(res)
+    }
+}
+
+/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_DSCC], [DecompositionFactory_DSCC] operations and
+ * [DMatrixSparseCSC] matrices.
+ */
+public object EjmlLinearSpaceDSCC : EjmlLinearSpace<Double, DoubleField, DMatrixSparseCSC>() {
+    /**
+     * The [DoubleField] reference.
+     */
+    override val elementAlgebra: DoubleField get() = DoubleField
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixSparseCSC> = when {
+        this is EjmlDoubleMatrix<*> && origin is DMatrixSparseCSC -> this as EjmlDoubleMatrix<DMatrixSparseCSC>
+        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixSparseCSC> = when {
+        this is EjmlDoubleVector<*> && origin is DMatrixSparseCSC -> this as EjmlDoubleVector<DMatrixSparseCSC>
+        else -> EjmlDoubleVector(DMatrixSparseCSC(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
+        })
+    }
+
+    override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: DoubleField.(i: Int, j: Int) -> Double,
+    ): EjmlDoubleMatrix<DMatrixSparseCSC> = DMatrixSparseCSC(rows, columns).also {
+        (0 until rows).forEach { row ->
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
+        }
+    }.wrapMatrix()
+
+    override fun buildVector(
+        size: Int,
+        initializer: DoubleField.(Int) -> Double,
+    ): EjmlDoubleVector<DMatrixSparseCSC> = EjmlDoubleVector(DMatrixSparseCSC(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
+
+    private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
+    private fun <T : DMatrix> T.wrapVector() = EjmlDoubleVector(this)
+
+    override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
+
+    override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
+
+    override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
+
+    override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+
+        CommonOps_DSCC.add(
+            elementAlgebra.one, 
+            toEjml().origin, 
+            elementAlgebra { -one },
+            other.toEjml().origin, 
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.scale(value, toEjml().origin, res)
+        return res.wrapMatrix()
+    }
+
+    override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.changeSign(toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+        
+        CommonOps_DSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin, 
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+
+        CommonOps_DSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin,
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+
+        CommonOps_DSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra { -one },
+            other.toEjml().origin,
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> = m * this
+
+    override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.scale(value, toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> = v * this
+
+    @UnstableKMathAPI
+    override fun <F : StructureFeature> computeFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
+        structure.getFeature(type)?.let { return it }
+        val origin = structure.toEjml().origin
+
+        return when (type) {
+            QRDecompositionFeature::class -> object : QRDecompositionFeature<Double> {
+                private val qr by lazy {
+                    DecompositionFactory_DSCC.qr(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<Double> by lazy {
+                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
+                }
+
+                override val r: Matrix<Double> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Double> {
+                override val l: Matrix<Double> by lazy {
+                    val cholesky =
+                        DecompositionFactory_DSCC.cholesky().apply { decompose(origin.copy()) }
+
+                    (cholesky.getT(null) as DMatrix).wrapMatrix().withFeature(LFeature)
+                }
+            }
+
+            LUDecompositionFeature::class, DeterminantFeature::class, InverseMatrixFeature::class -> object :
+                LUDecompositionFeature<Double>, DeterminantFeature<Double>, InverseMatrixFeature<Double> {
+                private val lu by lazy {
+                    DecompositionFactory_DSCC.lu(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<Double> by lazy {
+                    lu.getLower(null).wrapMatrix().withFeature(LFeature)
+                }
+
+                override val u: Matrix<Double> by lazy {
+                    lu.getUpper(null).wrapMatrix().withFeature(UFeature)
+                }
+
+                override val inverse: Matrix<Double> by lazy {
+                    var a = origin
+                    val inverse = DMatrixRMaj(1, 1)
+                    val solver = LinearSolverFactory_DSCC.lu(FillReducing.NONE)
+                    if (solver.modifiesA()) a = a.copy()
+                    val i = CommonOps_DDRM.identity(a.numRows)
+                    solver.solve(i, inverse)
+                    inverse.wrapMatrix()
+                }
+
+                override val determinant: Double by lazy { elementAlgebra.number(lu.computeDeterminant().real) }
+            }
+
+            else -> null
+        }?.let(type::cast)
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.solve(DMatrixSparseCSC(a.toEjml().origin), DMatrixSparseCSC(b.toEjml().origin), res)
+        return res.wrapMatrix()
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.solve(DMatrixSparseCSC(a.toEjml().origin), DMatrixSparseCSC(b.toEjml().origin), res)
+        return EjmlDoubleVector(res)
+    }
+}
+
+/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_FSCC], [DecompositionFactory_FSCC] operations and
+ * [FMatrixSparseCSC] matrices.
+ */
+public object EjmlLinearSpaceFSCC : EjmlLinearSpace<Float, FloatField, FMatrixSparseCSC>() {
+    /**
+     * The [FloatField] reference.
+     */
+    override val elementAlgebra: FloatField get() = FloatField
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixSparseCSC> = when {
+        this is EjmlFloatMatrix<*> && origin is FMatrixSparseCSC -> this as EjmlFloatMatrix<FMatrixSparseCSC>
+        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixSparseCSC> = when {
+        this is EjmlFloatVector<*> && origin is FMatrixSparseCSC -> this as EjmlFloatVector<FMatrixSparseCSC>
+        else -> EjmlFloatVector(FMatrixSparseCSC(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
+        })
+    }
+
+    override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: FloatField.(i: Int, j: Int) -> Float,
+    ): EjmlFloatMatrix<FMatrixSparseCSC> = FMatrixSparseCSC(rows, columns).also {
+        (0 until rows).forEach { row ->
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
+        }
+    }.wrapMatrix()
+
+    override fun buildVector(
+        size: Int,
+        initializer: FloatField.(Int) -> Float,
+    ): EjmlFloatVector<FMatrixSparseCSC> = EjmlFloatVector(FMatrixSparseCSC(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
+
+    private fun <T : FMatrix> T.wrapMatrix() = EjmlFloatMatrix(this)
+    private fun <T : FMatrix> T.wrapVector() = EjmlFloatVector(this)
+
+    override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
+
+    override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
+
+    override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
+
+    override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+
+        CommonOps_FSCC.add(
+            elementAlgebra.one, 
+            toEjml().origin, 
+            elementAlgebra { -one },
+            other.toEjml().origin, 
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.scale(value, toEjml().origin, res)
+        return res.wrapMatrix()
+    }
+
+    override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.changeSign(toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+        
+        CommonOps_FSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin, 
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+
+        CommonOps_FSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin,
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+
+        CommonOps_FSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra { -one },
+            other.toEjml().origin,
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> = m * this
+
+    override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.scale(value, toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> = v * this
+
+    @UnstableKMathAPI
+    override fun <F : StructureFeature> computeFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
+        structure.getFeature(type)?.let { return it }
+        val origin = structure.toEjml().origin
+
+        return when (type) {
+            QRDecompositionFeature::class -> object : QRDecompositionFeature<Float> {
+                private val qr by lazy {
+                    DecompositionFactory_FSCC.qr(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<Float> by lazy {
+                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
+                }
+
+                override val r: Matrix<Float> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Float> {
+                override val l: Matrix<Float> by lazy {
+                    val cholesky =
+                        DecompositionFactory_FSCC.cholesky().apply { decompose(origin.copy()) }
+
+                    (cholesky.getT(null) as FMatrix).wrapMatrix().withFeature(LFeature)
+                }
+            }
+
+            LUDecompositionFeature::class, DeterminantFeature::class, InverseMatrixFeature::class -> object :
+                LUDecompositionFeature<Float>, DeterminantFeature<Float>, InverseMatrixFeature<Float> {
+                private val lu by lazy {
+                    DecompositionFactory_FSCC.lu(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<Float> by lazy {
+                    lu.getLower(null).wrapMatrix().withFeature(LFeature)
+                }
+
+                override val u: Matrix<Float> by lazy {
+                    lu.getUpper(null).wrapMatrix().withFeature(UFeature)
+                }
+
+                override val inverse: Matrix<Float> by lazy {
+                    var a = origin
+                    val inverse = FMatrixRMaj(1, 1)
+                    val solver = LinearSolverFactory_FSCC.lu(FillReducing.NONE)
+                    if (solver.modifiesA()) a = a.copy()
+                    val i = CommonOps_FDRM.identity(a.numRows)
+                    solver.solve(i, inverse)
+                    inverse.wrapMatrix()
+                }
+
+                override val determinant: Float by lazy { elementAlgebra.number(lu.computeDeterminant().real) }
+            }
+
+            else -> null
+        }?.let(type::cast)
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Float>, b: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.solve(FMatrixSparseCSC(a.toEjml().origin), FMatrixSparseCSC(b.toEjml().origin), res)
+        return res.wrapMatrix()
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Float>, b: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.solve(FMatrixSparseCSC(a.toEjml().origin), FMatrixSparseCSC(b.toEjml().origin), res)
+        return EjmlFloatVector(res)
+    }
+}
+
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
index 88932d59b..c1ee8b48f 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
@@ -13,9 +13,9 @@ import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.asIterable
 import kotlin.math.pow
 
 /*
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
index b09129626..94c73832b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.integration
 
+import space.kscience.kmath.operations.map
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
-import space.kscience.kmath.structures.map
 import kotlin.jvm.Synchronized
 import kotlin.math.ulp
 import kotlin.native.concurrent.ThreadLocal
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index 662cdf3d7..6abe89aad 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -12,14 +12,10 @@ import space.kscience.kmath.interpolation.SplineInterpolator
 import space.kscience.kmath.interpolation.interpolatePolynomials
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.operations.sum
+import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.MutableBufferFactory
-import space.kscience.kmath.structures.map
 
 /**
  * Compute analytical indefinite integral of this [PiecewisePolynomial], keeping all intervals intact
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
index 84b1f4fd6..89ee23354 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
@@ -1,9 +1,8 @@
 package space.kscience.kmath.geometry
 
-import space.kscience.kmath.structures.asSequence
-import space.kscience.kmath.structures.toList
-import kotlin.test.assertEquals
+import space.kscience.kmath.operations.toList
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 internal class Vector2DTest {
     private val vector = Vector2D(1.0, -7.999)
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
index 717e78871..70f8f4ebd 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.geometry
 
-import space.kscience.kmath.structures.toList
+import space.kscience.kmath.operations.toList
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
index 0841fcb4c..d5b74fb9b 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
@@ -7,8 +7,8 @@ package space.kscience.kmath.histogram
 
 import space.kscience.kmath.domains.UnivariateDomain
 import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asSequence
 
 
 @UnstableKMathAPI
@@ -34,7 +34,7 @@ public class UnivariateBin(
 }
 
 @OptIn(UnstableKMathAPI::class)
-public interface UnivariateHistogram : Histogram<Double, UnivariateBin>{
+public interface UnivariateHistogram : Histogram<Double, UnivariateBin> {
     public operator fun get(value: Double): UnivariateBin?
     override operator fun get(point: Buffer<Double>): UnivariateBin? = get(point[0])
 
diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
index e646d2bd0..9731908b3 100644
--- a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -21,9 +21,9 @@ import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.MstRing
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.Structure2D
+import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asSequence
 
 /**
  * A function for conversion of number to MST for pretty print
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
index 54b2e42b3..664e4e8e7 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.stat
 
+import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asSequence
 
 /**
  * Non-composable median
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index a0f5d8080..d31e02677 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -9,9 +9,9 @@ import space.kscience.kmath.nd.MutableStructure1D
 import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.VirtualBuffer
-import space.kscience.kmath.structures.asSequence
 import space.kscience.kmath.tensors.core.BufferedTensor
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index 6088c32e4..8428dae5c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.nd.as1D
+import space.kscience.kmath.operations.toMutableList
 import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.*
-- 
2.34.1


From fd8a61c852b2514324647b39c8c4fc6c085035d2 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 4 Oct 2021 12:40:30 +0300
Subject: [PATCH 340/713] Fix Mean bug

---
 .../kscience/kmath/benchmarks/DotBenchmark.kt | 11 +++----
 .../ExpressionsInterpretersBenchmark.kt       |  5 +--
 .../FunctionalExpressionAlgebra.kt            |  4 +++
 .../kmath/linear/DoubleLinearSpace.kt         |  6 ++--
 .../kotlin/space/kscience/kmath/stat/Mean.kt  | 23 ++++++++++---
 .../space/kscience/kmath/stat/Statistic.kt    | 20 +++++++----
 .../kscience/kmath/stat/StatisticTest.kt      | 33 ++++++++++++++-----
 7 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 33cb57c6f..64f9b5dff 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -14,7 +14,6 @@ import space.kscience.kmath.ejml.EjmlLinearSpaceDDRM
 import space.kscience.kmath.linear.invoke
 import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.structures.Buffer
 import kotlin.random.Random
 
@@ -25,11 +24,11 @@ internal class DotBenchmark {
         const val dim = 1000
 
         //creating invertible matrix
-        val matrix1 = Double.algebra.linearSpace.buildMatrix(dim, dim) { i, j ->
-            if (i <= j) random.nextDouble() else 0.0
+        val matrix1 = DoubleField.linearSpace.buildMatrix(dim, dim) { _, _ ->
+            random.nextDouble()
         }
-        val matrix2 = Double.algebra.linearSpace.buildMatrix(dim, dim) { i, j ->
-            if (i <= j) random.nextDouble() else 0.0
+        val matrix2 = DoubleField.linearSpace.buildMatrix(dim, dim) { _, _ ->
+            random.nextDouble()
         }
 
         val cmMatrix1 = CMLinearSpace { matrix1.toCM() }
@@ -65,7 +64,7 @@ internal class DotBenchmark {
     }
 
     @Benchmark
-    fun doubleDot(blackhole: Blackhole) = with(Double.algebra.linearSpace) {
+    fun doubleDot(blackhole: Blackhole) = with(DoubleField.linearSpace) {
         blackhole.consume(matrix1 dot matrix2)
     }
 }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
index 8c3c8ec2b..63e1511bd 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
@@ -75,8 +75,9 @@ internal class ExpressionsInterpretersBenchmark {
         private val algebra = DoubleField
         private const val times = 1_000_000
 
-        private val functional = DoubleField.expressionInExtendedField {
-            bindSymbol(x) * number(2.0) + number(2.0) / bindSymbol(x) - number(16.0) / sin(bindSymbol(x))
+        private val functional = DoubleField.expression {
+            val x = bindSymbol(Symbol.x)
+            x * number(2.0) + 2.0 / x - 16.0 / sin(x)
         }
 
         private val node = MstExtendedField {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
index bb7f36fc5..36ccb96f7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
@@ -192,3 +192,7 @@ public inline fun <T, A : Field<T>> A.expressionInField(
 public inline fun <T, A : ExtendedField<T>> A.expressionInExtendedField(
     block: FunctionalExpressionExtendedField<T, A>.() -> Expression<T>,
 ): Expression<T> = FunctionalExpressionExtendedField(this).block()
+
+public inline fun DoubleField.expression(
+    block: FunctionalExpressionExtendedField<Double, DoubleField>.() -> Expression<Double>,
+): Expression<Double> = FunctionalExpressionExtendedField(this).block()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
index 4a1311b54..c2f53939f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
@@ -13,7 +13,6 @@ import space.kscience.kmath.operations.DoubleBufferOperations
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.indices
 
 public object DoubleLinearSpace : LinearSpace<Double, DoubleField> {
 
@@ -30,7 +29,6 @@ public object DoubleLinearSpace : LinearSpace<Double, DoubleField> {
         initializer: DoubleField.(i: Int, j: Int) -> Double
     ): Matrix<Double> = ndRing(rows, columns).produce { (i, j) -> DoubleField.initializer(i, j) }.as2D()
 
-
     override fun buildVector(size: Int, initializer: DoubleField.(Int) -> Double): DoubleBuffer =
         DoubleBuffer(size) { DoubleField.initializer(it) }
 
@@ -50,9 +48,9 @@ public object DoubleLinearSpace : LinearSpace<Double, DoubleField> {
 
     // Create a continuous in-memory representation of this vector for better memory layout handling
     private fun Buffer<Double>.linearize() = if (this is DoubleBuffer) {
-        this
+        this.array
     } else {
-        DoubleBuffer(size) { get(it) }
+        DoubleArray(size) { get(it) }
     }
 
     @OptIn(PerformancePitfall::class)
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
index 7daed5798..1d09fffd1 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
@@ -27,8 +27,13 @@ public class Mean<T>(
 
     override suspend fun evaluate(data: Buffer<T>): T = super<ComposableStatistic>.evaluate(data)
 
-    override suspend fun computeIntermediate(data: Buffer<T>): Pair<T, Int> =
-        evaluateBlocking(data) to data.size
+    override suspend fun computeIntermediate(data: Buffer<T>): Pair<T, Int> = group {
+        var res = zero
+        for (i in data.indices) {
+            res += data[i]
+        }
+        res to data.size
+    }
 
     override suspend fun composeIntermediate(first: Pair<T, Int>, second: Pair<T, Int>): Pair<T, Int> =
         group { first.first + second.first } to (first.second + second.second)
@@ -38,13 +43,23 @@ public class Mean<T>(
     }
 
     public companion object {
-        //TODO replace with optimized version which respects overflow
+        @Deprecated("Use Double.mean instead")
         public val double: Mean<Double> = Mean(DoubleField) { sum, count -> sum / count }
+        @Deprecated("Use Int.mean instead")
         public val int: Mean<Int> = Mean(IntRing) { sum, count -> sum / count }
+        @Deprecated("Use Long.mean instead")
         public val long: Mean<Long> = Mean(LongRing) { sum, count -> sum / count }
 
         public fun evaluate(buffer: Buffer<Double>): Double = double.evaluateBlocking(buffer)
         public fun evaluate(buffer: Buffer<Int>): Int = int.evaluateBlocking(buffer)
         public fun evaluate(buffer: Buffer<Long>): Long = long.evaluateBlocking(buffer)
     }
-}
\ No newline at end of file
+}
+
+
+//TODO replace with optimized version which respects overflow
+public val Double.Companion.mean: Mean<Double> get() = Mean(DoubleField) { sum, count -> sum / count }
+public val Int.Companion.mean: Mean<Int> get() = Mean(IntRing) { sum, count -> sum / count }
+public val Long.Companion.mean: Mean<Long> get() =  Mean(LongRing) { sum, count -> sum / count }
+
+
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
index ab80fbe1c..107161514 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
@@ -8,7 +8,6 @@ package space.kscience.kmath.stat
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.runningReduce
@@ -18,16 +17,23 @@ import space.kscience.kmath.structures.Buffer
 /**
  * A function, that transforms a buffer of random quantities to some resulting value
  */
-public interface Statistic<in T, out R> {
+public fun interface Statistic<in T, out R> {
     public suspend fun evaluate(data: Buffer<T>): R
 }
 
-public interface BlockingStatistic<in T, out R> : Statistic<T, R> {
+public suspend operator fun <T, R> Statistic<T, R>.invoke(data: Buffer<T>): R = evaluate(data)
+
+/**
+ * A statistic that is computed in a synchronous blocking mode
+ */
+public fun interface BlockingStatistic<in T, out R> : Statistic<T, R> {
     public fun evaluateBlocking(data: Buffer<T>): R
 
     override suspend fun evaluate(data: Buffer<T>): R = evaluateBlocking(data)
 }
 
+public operator fun <T, R> BlockingStatistic<T, R>.invoke(data: Buffer<T>): R = evaluateBlocking(data)
+
 /**
  * A statistic tha could be computed separately on different blocks of data and then composed
  *
@@ -48,8 +54,10 @@ public interface ComposableStatistic<in T, I, out R> : Statistic<T, R> {
     override suspend fun evaluate(data: Buffer<T>): R = toResult(computeIntermediate(data))
 }
 
-@FlowPreview
-@ExperimentalCoroutinesApi
+/**
+ * Flow intermediate state of the [ComposableStatistic]
+ */
+@OptIn(ExperimentalCoroutinesApi::class)
 private fun <T, I, R> ComposableStatistic<T, I, R>.flowIntermediate(
     flow: Flow<Buffer<T>>,
     dispatcher: CoroutineDispatcher = Dispatchers.Default,
@@ -64,7 +72,7 @@ private fun <T, I, R> ComposableStatistic<T, I, R>.flowIntermediate(
  *
  * The resulting flow contains values that include the whole previous statistics, not only the last chunk.
  */
-@OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class)
+@OptIn(ExperimentalCoroutinesApi::class)
 public fun <T, I, R> ComposableStatistic<T, I, R>.flow(
     flow: Flow<Buffer<T>>,
     dispatcher: CoroutineDispatcher = Dispatchers.Default,
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
index c64bcc78c..2a3147869 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
@@ -5,11 +5,13 @@
 
 package space.kscience.kmath.stat
 
-import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.last
+import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.runBlocking
 import space.kscience.kmath.streaming.chunked
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 internal class StatisticTest {
     //create a random number generator.
@@ -22,12 +24,27 @@ internal class StatisticTest {
     val chunked = data.chunked(1000)
 
     @Test
-    fun testParallelMean() = runBlocking {
-        val average = Mean.double
-            .flow(chunked) //create a flow with results
-            .drop(99) // Skip first 99 values and use one with total data
-            .first() //get 1e5 data samples average
-
-        println(average)
+    fun singleBlockingMean() {
+        val first = runBlocking { chunked.first()}
+        val res = Double.mean(first)
+        assertEquals(0.5,res, 1e-1)
     }
+
+    @Test
+    fun singleSuspendMean() = runBlocking {
+        val first = runBlocking { chunked.first()}
+        val res = Double.mean(first)
+        assertEquals(0.5,res, 1e-1)
+    }
+
+    @Test
+    fun parallelMean() = runBlocking {
+        val average = Double.mean
+            .flow(chunked) //create a flow from evaluated results
+            .take(100) // Take 100 data chunks from the source and accumulate them
+            .last() //get 1e5 data samples average
+
+        assertEquals(0.5,average, 1e-3)
+    }
+
 }
-- 
2.34.1


From d9f36365d9caac00f70b2dfb9b0c352260e1ded9 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 4 Oct 2021 22:31:06 +0300
Subject: [PATCH 341/713] Fix Mean bug

---
 .../src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt | 6 +++---
 .../kotlin/space/kscience/kmath/stat/StatisticTest.kt       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
index 1d09fffd1..2a9bd3cd4 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
@@ -50,9 +50,9 @@ public class Mean<T>(
         @Deprecated("Use Long.mean instead")
         public val long: Mean<Long> = Mean(LongRing) { sum, count -> sum / count }
 
-        public fun evaluate(buffer: Buffer<Double>): Double = double.evaluateBlocking(buffer)
-        public fun evaluate(buffer: Buffer<Int>): Int = int.evaluateBlocking(buffer)
-        public fun evaluate(buffer: Buffer<Long>): Long = long.evaluateBlocking(buffer)
+        public fun evaluate(buffer: Buffer<Double>): Double = Double.mean.evaluateBlocking(buffer)
+        public fun evaluate(buffer: Buffer<Int>): Int = Int.mean.evaluateBlocking(buffer)
+        public fun evaluate(buffer: Buffer<Long>): Long = Long.mean.evaluateBlocking(buffer)
     }
 }
 
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
index 2a3147869..777b93c29 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
@@ -44,7 +44,7 @@ internal class StatisticTest {
             .take(100) // Take 100 data chunks from the source and accumulate them
             .last() //get 1e5 data samples average
 
-        assertEquals(0.5,average, 1e-3)
+        assertEquals(0.5,average, 1e-2)
     }
 
 }
-- 
2.34.1


From 30e3e8039724bf84645f3efd28c4bf8fe7195a9f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 6 Oct 2021 12:25:32 +0300
Subject: [PATCH 342/713] Add nd add benchmarks

---
 benchmarks/build.gradle.kts                   |  6 ++
 .../kmath/benchmarks/NDFieldBenchmark.kt      | 57 ++++++++++++-------
 kmath-nd4j/build.gradle.kts                   |  2 +-
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   |  3 +-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |  1 -
 .../tensors/core/tensorAlgebraExtensions.kt   |  8 +++
 6 files changed, 55 insertions(+), 22 deletions(-)
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index fa72dc8ee..686c491b9 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -36,6 +36,7 @@ kotlin {
                 implementation(project(":kmath-dimensions"))
                 implementation(project(":kmath-for-real"))
                 implementation(project(":kmath-jafama"))
+                implementation(project(":kmath-tensors"))
                 implementation("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:0.3.1")
             }
         }
@@ -81,6 +82,11 @@ benchmark {
         include("BufferBenchmark")
     }
 
+    configurations.register("nd") {
+        commonConfiguration()
+        include("NDFieldBenchmark")
+    }
+
     configurations.register("dot") {
         commonConfiguration()
         include("DotBenchmark")
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index f72bc3ba0..76fec05d3 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -12,44 +12,63 @@ import kotlinx.benchmark.State
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.autoNdAlgebra
 import space.kscience.kmath.nd.ndAlgebra
+import space.kscience.kmath.nd4j.nd4j
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.tensors.core.DoubleTensor
+import space.kscience.kmath.tensors.core.ones
+import space.kscience.kmath.tensors.core.tensorAlgebra
 
 @State(Scope.Benchmark)
 internal class NDFieldBenchmark {
     @Benchmark
-    fun autoFieldAdd(blackhole: Blackhole) {
-        with(autoField) {
-            var res: StructureND<Double> = one
-            repeat(n) { res += one }
-            blackhole.consume(res)
-        }
+    fun autoFieldAdd(blackhole: Blackhole) = with(autoField) {
+        var res: StructureND<Double> = one
+        repeat(n) { res += one }
+        blackhole.consume(res)
     }
 
     @Benchmark
-    fun specializedFieldAdd(blackhole: Blackhole) {
-        with(specializedField) {
-            var res: StructureND<Double> = one
-            repeat(n) { res += 1.0 }
-            blackhole.consume(res)
-        }
+    fun specializedFieldAdd(blackhole: Blackhole) = with(specializedField) {
+        var res: StructureND<Double> = one
+        repeat(n) { res += 1.0 }
+        blackhole.consume(res)
     }
 
-
     @Benchmark
-    fun boxingFieldAdd(blackhole: Blackhole) {
-        with(genericField) {
-            var res: StructureND<Double> = one
-            repeat(n) { res += 1.0 }
-            blackhole.consume(res)
-        }
+    fun boxingFieldAdd(blackhole: Blackhole) = with(genericField) {
+        var res: StructureND<Double> = one
+        repeat(n) { res += 1.0 }
+        blackhole.consume(res)
     }
 
+    @Benchmark
+    fun tensorAdd(blackhole: Blackhole) = with(Double.tensorAlgebra) {
+        var res: DoubleTensor = ones(dim, dim)
+        repeat(n) { res = res + 1.0 }
+        blackhole.consume(res)
+    }
+
+    @Benchmark
+    fun tensorInPlaceAdd(blackhole: Blackhole) = with(Double.tensorAlgebra) {
+        val res: DoubleTensor = ones(dim, dim)
+        repeat(n) { res += 1.0 }
+        blackhole.consume(res)
+    }
+
+//    @Benchmark
+//    fun nd4jAdd(blackhole: Blackhole) = with(nd4jField) {
+//        var res: StructureND<Double> = one
+//        repeat(n) { res += 1.0 }
+//        blackhole.consume(res)
+//    }
+
     private companion object {
         private const val dim = 1000
         private const val n = 100
         private val autoField = DoubleField.autoNdAlgebra(dim, dim)
         private val specializedField = DoubleField.ndAlgebra(dim, dim)
         private val genericField = DoubleField.ndAlgebra(Buffer.Companion::boxing, dim, dim)
+        private val nd4jField = DoubleField.nd4j(dim, dim)
     }
 }
diff --git a/kmath-nd4j/build.gradle.kts b/kmath-nd4j/build.gradle.kts
index dcb6f1b4a..09264501f 100644
--- a/kmath-nd4j/build.gradle.kts
+++ b/kmath-nd4j/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     api(project(":kmath-tensors"))
     api("org.nd4j:nd4j-api:1.0.0-M1")
     testImplementation("org.nd4j:nd4j-native-platform:1.0.0-M1")
-    testImplementation("org.slf4j:slf4j-simple:1.7.31")
+    testImplementation("org.slf4j:slf4j-simple:1.7.32")
 }
 
 readme {
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index 54df31556..b604bf5f2 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -45,7 +45,6 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
         return struct
     }
 
-    @PerformancePitfall
     override fun StructureND<T>.map(transform: C.(T) -> T): Nd4jArrayStructure<T> {
         val newStruct = ndArray.dup().wrap()
         newStruct.elements().forEach { (idx, value) -> newStruct[idx] = elementContext.transform(value) }
@@ -265,6 +264,8 @@ public class DoubleNd4jArrayField(override val shape: IntArray) : Nd4jArrayExten
     }
 }
 
+public fun DoubleField.nd4j(vararg shape: Int): DoubleNd4jArrayField = DoubleNd4jArrayField(intArrayOf(*shape))
+
 /**
  * Represents [FieldND] over [Nd4jArrayStructure] of [Float].
  */
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index 0ac37e19b..ee9251dd1 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -158,7 +158,6 @@ public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double> {
         if (shape contentEquals intArrayOf(1)) ndArray.getDouble(0) else null
 
     // TODO rewrite
-    @PerformancePitfall
     override fun diagonalEmbedding(
         diagonalEntries: Tensor<Double>,
         offset: Int,
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
new file mode 100644
index 000000000..b73f95054
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.tensors.core
+
+public fun DoubleTensorAlgebra.ones(vararg shape: Int): DoubleTensor = ones(intArrayOf(*shape))
\ No newline at end of file
-- 
2.34.1


From 09a9df5213b273c6848183355736729f58b39ba3 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 9 Oct 2021 20:19:36 +0300
Subject: [PATCH 343/713] Add complex power

---
 CHANGELOG.md                                  |  1 +
 .../space/kscience/kmath/complex/Complex.kt   | 29 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cb9f57f4..05376d425 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - Unified architecture for Integration and Optimization using features.
 - `BigInt` operation performance improvement and fixes by @zhelenskiy (#328)
 - Integration between `MST` and Symja `IExpr`
+- Complex power
 
 ### Changed
 - Exponential operations merged with hyperbolic functions
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index 793587492..7d948cb61 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -9,10 +9,7 @@ import space.kscience.kmath.memory.MemoryReader
 import space.kscience.kmath.memory.MemorySpec
 import space.kscience.kmath.memory.MemoryWriter
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.ExtendedField
-import space.kscience.kmath.operations.Norm
-import space.kscience.kmath.operations.NumbersAddOperations
-import space.kscience.kmath.operations.ScaleOperations
+import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MemoryBuffer
 import space.kscience.kmath.structures.MutableBuffer
@@ -52,11 +49,23 @@ private val PI_DIV_2 = Complex(PI / 2, 0)
  * A field of [Complex].
  */
 @OptIn(UnstableKMathAPI::class)
-public object ComplexField : ExtendedField<Complex>, Norm<Complex, Complex>, NumbersAddOperations<Complex>,
+public object ComplexField :
+    ExtendedField<Complex>,
+    Norm<Complex, Complex>,
+    NumbersAddOperations<Complex>,
     ScaleOperations<Complex> {
+
     override val zero: Complex = 0.0.toComplex()
     override val one: Complex = 1.0.toComplex()
 
+    override fun bindSymbolOrNull(value: String): Complex? = if (value == "i") i else null
+
+    override fun binaryOperationFunction(operation: String): (left: Complex, right: Complex) -> Complex =
+        when (operation) {
+            PowerOperations.POW_OPERATION -> ComplexField::power
+            else -> super<ExtendedField>.binaryOperationFunction(operation)
+        }
+
     /**
      * The imaginary unit.
      */
@@ -117,10 +126,14 @@ public object ComplexField : ExtendedField<Complex>, Norm<Complex, Complex>, Num
         return i * (ln(1 - iArg) - ln(1 + iArg)) / 2
     }
 
-    override fun power(arg: Complex, pow: Number): Complex = if (arg.im == 0.0)
+    override fun power(arg: Complex, pow: Number): Complex = if (arg.im == 0.0) {
         arg.re.pow(pow.toDouble()).toComplex()
-    else
+    } else {
         exp(pow * ln(arg))
+    }
+
+    public fun power(arg: Complex, pow: Complex): Complex = exp(pow * ln(arg))
+
 
     override fun exp(arg: Complex): Complex = exp(arg.re) * (cos(arg.im) + i * sin(arg.im))
 
@@ -172,8 +185,6 @@ public object ComplexField : ExtendedField<Complex>, Norm<Complex, Complex>, Num
     public operator fun Double.times(c: Complex): Complex = Complex(c.re * this, c.im * this)
 
     override fun norm(arg: Complex): Complex = sqrt(arg.conjugate * arg)
-
-    override fun bindSymbolOrNull(value: String): Complex? = if (value == "i") i else null
 }
 
 /**
-- 
2.34.1


From 8d2770c275e931e0e3788539f0d5067dc4c4f333 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 13 Oct 2021 09:06:54 +0300
Subject: [PATCH 344/713] Build tools to 0.10.5

---
 build.gradle.kts    | 2 +-
 settings.gradle.kts | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 68b894d06..665c057e9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-15"
+    version = "0.3.0-dev-16"
 }
 
 subprojects {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8cfa62133..528adb336 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,5 +1,6 @@
 pluginManagement {
     repositories {
+        mavenLocal()
         maven("https://repo.kotlin.link")
         mavenCentral()
         gradlePluginPortal()
@@ -9,7 +10,7 @@ pluginManagement {
 
     plugins {
         id("org.jetbrains.kotlinx.benchmark") version "0.3.1"
-        id("ru.mipt.npm.gradle.project") version "0.10.4"
+        id("ru.mipt.npm.gradle.project") version "0.10.5"
         kotlin("multiplatform") version kotlinVersion
         kotlin("plugin.allopen") version kotlinVersion
     }
-- 
2.34.1


From 0ac5363acf7c6717275989ec6c3376a05002b953 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 16 Oct 2021 11:10:34 +0300
Subject: [PATCH 345/713] Multik wrapper prototype

---
 examples/build.gradle.kts                     |  14 +-
 .../space/kscience/kmath/tensors/multik.kt    |  21 ++
 kmath-multik/build.gradle.kts                 |  14 ++
 .../kmath/multik/MultikTensorAlgebra.kt       | 199 ++++++++++++++++++
 4 files changed, 244 insertions(+), 4 deletions(-)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
 create mode 100644 kmath-multik/build.gradle.kts
 create mode 100644 kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index d06005321..7b1bce26a 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -29,6 +29,11 @@ dependencies {
     implementation(project(":kmath-tensors"))
     implementation(project(":kmath-symja"))
     implementation(project(":kmath-for-real"))
+    //jafama
+    implementation(project(":kmath-jafama"))
+    //multik
+    implementation(projects.kmathMultik)
+
 
     implementation("org.nd4j:nd4j-native:1.0.0-beta7")
 
@@ -42,11 +47,12 @@ dependencies {
 //    } else
     implementation("org.nd4j:nd4j-native-platform:1.0.0-beta7")
 
-    implementation("org.slf4j:slf4j-simple:1.7.31")
+    // multik implementation
+    implementation("org.jetbrains.kotlinx:multik-default:0.1.0")
+
+    implementation("org.slf4j:slf4j-simple:1.7.32")
     // plotting
-    implementation("space.kscience:plotlykt-server:0.4.2")
-    //jafama
-    implementation(project(":kmath-jafama"))
+    implementation("space.kscience:plotlykt-server:0.5.0")
 }
 
 kotlin.sourceSets.all {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
new file mode 100644
index 000000000..820a793ac
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.tensors
+
+import org.jetbrains.kotlinx.multik.api.Multik
+import org.jetbrains.kotlinx.multik.api.linalg.dot
+import org.jetbrains.kotlinx.multik.api.ndarray
+import org.jetbrains.kotlinx.multik.ndarray.operations.minus
+import org.jetbrains.kotlinx.multik.ndarray.operations.plus
+import org.jetbrains.kotlinx.multik.ndarray.operations.unaryMinus
+
+fun main() {
+    val a = Multik.ndarray(intArrayOf(1, 2, 3))
+    val b = Multik.ndarray(doubleArrayOf(1.0, 2.0, 3.0))
+    2 + (-a) - 2
+
+    a dot a
+}
\ No newline at end of file
diff --git a/kmath-multik/build.gradle.kts b/kmath-multik/build.gradle.kts
new file mode 100644
index 000000000..16a7ab652
--- /dev/null
+++ b/kmath-multik/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    id("ru.mipt.npm.gradle.jvm")
+}
+
+description = "JetBrains Multik connector"
+
+dependencies {
+    api(project(":kmath-tensors"))
+    api("org.jetbrains.kotlinx:multik-api:0.1.0")
+}
+
+readme {
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+}
\ No newline at end of file
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
new file mode 100644
index 000000000..b25d3ef56
--- /dev/null
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.multik
+
+import org.jetbrains.kotlinx.multik.ndarray.data.*
+import org.jetbrains.kotlinx.multik.ndarray.operations.*
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.mapInPlace
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.tensors.api.Tensor
+import space.kscience.kmath.tensors.api.TensorAlgebra
+
+@JvmInline
+public value class MultikTensor<T>(public val array: MutableMultiArray<T, DN>) : Tensor<T> {
+    override val shape: IntArray get() = array.shape
+
+    override fun get(index: IntArray): T = array[index]
+
+    @PerformancePitfall
+    override fun elements(): Sequence<Pair<IntArray, T>> =
+        array.multiIndices.iterator().asSequence().map { it to get(it) }
+
+    override fun set(index: IntArray, value: T) {
+        array[index] = value
+    }
+}
+
+
+public abstract class MultikTensorAlgebra<T>(
+    public val elementAlgebra: Ring<T>,
+    public val comparator: Comparator<T>
+) : TensorAlgebra<T> {
+
+    /**
+     * Convert a tensor to [MultikTensor] if necessary. If tensor is converted, changes on the resulting tensor
+     * are not reflected back onto the source
+     */
+    public fun Tensor<T>.asMultik(): MultikTensor<T> {
+        return if (this is MultikTensor) {
+            this
+        } else {
+            TODO()
+        }
+    }
+
+    public fun MutableMultiArray<T, DN>.wrap(): MultikTensor<T> = MultikTensor(this)
+
+    override fun Tensor<T>.valueOrNull(): T? = if (shape contentEquals intArrayOf(1)) {
+        get(intArrayOf(0))
+    } else null
+
+    override fun T.plus(other: Tensor<T>): MultikTensor<T> =
+        other.plus(this)
+
+    override fun Tensor<T>.plus(value: T): MultikTensor<T> =
+        asMultik().array.deepCopy().apply { plusAssign(value) }.wrap()
+
+    override fun Tensor<T>.plus(other: Tensor<T>): MultikTensor<T> =
+        asMultik().array.plus(other.asMultik().array).wrap()
+
+    override fun Tensor<T>.plusAssign(value: T) {
+        if (this is MultikTensor) {
+            array.plusAssign(value)
+        } else {
+            mapInPlace { _, t -> elementAlgebra.add(t, value) }
+        }
+    }
+
+    override fun Tensor<T>.plusAssign(other: Tensor<T>) {
+        if (this is MultikTensor) {
+            array.plusAssign(other.asMultik().array)
+        } else {
+            mapInPlace { index, t -> elementAlgebra.add(t, other[index]) }
+        }
+    }
+
+    //TODO avoid additional copy
+    override fun T.minus(other: Tensor<T>): MultikTensor<T> = -(other - this)
+
+    override fun Tensor<T>.minus(value: T): MultikTensor<T> =
+        asMultik().array.deepCopy().apply { minusAssign(value) }.wrap()
+
+    override fun Tensor<T>.minus(other: Tensor<T>): MultikTensor<T> =
+        asMultik().array.minus(other.asMultik().array).wrap()
+
+    override fun Tensor<T>.minusAssign(value: T) {
+        if (this is MultikTensor) {
+            array.minusAssign(value)
+        } else {
+            mapInPlace { _, t -> elementAlgebra.run { t - value } }
+        }
+    }
+
+    override fun Tensor<T>.minusAssign(other: Tensor<T>) {
+        if (this is MultikTensor) {
+            array.minusAssign(other.asMultik().array)
+        } else {
+            mapInPlace { index, t -> elementAlgebra.run { t - other[index] } }
+        }
+    }
+
+    override fun T.times(other: Tensor<T>): MultikTensor<T> =
+        other.asMultik().array.deepCopy().apply { timesAssign(this@times) }.wrap()
+
+    override fun Tensor<T>.times(value: T): Tensor<T> =
+        asMultik().array.deepCopy().apply { timesAssign(value) }.wrap()
+
+    override fun Tensor<T>.times(other: Tensor<T>): MultikTensor<T> =
+        asMultik().array.times(other.asMultik().array).wrap()
+
+    override fun Tensor<T>.timesAssign(value: T) {
+        if (this is MultikTensor) {
+            array.timesAssign(value)
+        } else {
+            mapInPlace { _, t -> elementAlgebra.multiply(t, value) }
+        }
+    }
+
+    override fun Tensor<T>.timesAssign(other: Tensor<T>) {
+        if (this is MultikTensor) {
+            array.timesAssign(other.asMultik().array)
+        } else {
+            mapInPlace { index, t -> elementAlgebra.multiply(t, other[index]) }
+        }
+    }
+
+    override fun Tensor<T>.unaryMinus(): MultikTensor<T> =
+        asMultik().array.unaryMinus().wrap()
+
+    override fun Tensor<T>.get(i: Int): MultikTensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.transpose(i: Int, j: Int): MultikTensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.view(shape: IntArray): MultikTensor<T> {
+        require(shape.all { it > 0 })
+        require(shape.fold(1, Int::times) == this.shape.size) {
+            "Cannot reshape array of size ${this.shape.size} into a new shape ${
+                shape.joinToString(
+                    prefix = "(",
+                    postfix = ")"
+                )
+            }"
+        }
+
+        val mt = asMultik().array
+        return if (mt.shape.contentEquals(shape)) {
+            @Suppress("UNCHECKED_CAST")
+            this as NDArray<T, DN>
+        } else {
+            NDArray(mt.data, mt.offset, shape, dim = DN(shape.size), base = mt.base ?: mt)
+        }.wrap()
+    }
+
+    override fun Tensor<T>.viewAs(other: Tensor<T>): MultikTensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.dot(other: Tensor<T>): MultikTensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun diagonalEmbedding(diagonalEntries: Tensor<T>, offset: Int, dim1: Int, dim2: Int): MultikTensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.sum(): T = asMultik().array.reduceMultiIndexed { _: IntArray, acc: T, t: T ->
+        elementAlgebra.add(acc, t)
+    }
+
+    override fun Tensor<T>.sum(dim: Int, keepDim: Boolean): MultikTensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.min(): T =
+        asMultik().array.minWith(comparator) ?: error("No elements in tensor")
+
+    override fun Tensor<T>.min(dim: Int, keepDim: Boolean): MultikTensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.max(): T =
+        asMultik().array.maxWith(comparator) ?: error("No elements in tensor")
+
+
+    override fun Tensor<T>.max(dim: Int, keepDim: Boolean): MultikTensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): MultikTensor<T> {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
-- 
2.34.1


From d0354da80a52e56fdb81dadd881a0ab4fa0a0d24 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 17 Oct 2021 11:12:35 +0300
Subject: [PATCH 346/713] Shapeless ND and Buffer algebras

---
 CHANGELOG.md                                  |   3 +
 .../kmath/benchmarks/NDFieldBenchmark.kt      |  32 ++-
 .../kmath/benchmarks/ViktorBenchmark.kt       |  20 +-
 .../kmath/benchmarks/ViktorLogBenchmark.kt    |  20 +-
 .../kscience/kmath/operations/complexDemo.kt  |  12 +-
 .../kscience/kmath/structures/NDField.kt      |   4 +-
 .../kmath/structures/StreamDoubleFieldND.kt   |  10 +-
 .../kscience/kmath/structures/buffers.kt      |   3 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 .../kotlin/space/kscience/kmath/ast/parser.kt |  16 +-
 .../kscience/kmath/ast/rendering/features.kt  |  30 +-
 .../kscience/kmath/ast/rendering/phases.kt    |  14 +-
 .../kscience/kmath/ast/rendering/TestLatex.kt |   4 +-
 .../kmath/ast/rendering/TestMathML.kt         |   4 +-
 .../kmath/wasm/internal/WasmBuilder.kt        |  22 +-
 .../DerivativeStructureExpression.kt          |   4 +-
 .../space/kscience/kmath/complex/Complex.kt   |   3 +-
 .../kscience/kmath/complex/ComplexFieldND.kt  | 134 +++------
 .../kscience/kmath/complex/Quaternion.kt      |   2 +-
 .../FunctionalExpressionAlgebra.kt            |   8 +-
 .../kscience/kmath/expressions/MstAlgebra.kt  |  24 +-
 .../kmath/expressions/SimpleAutoDiff.kt       |   2 +-
 .../kmath/linear/BufferedLinearSpace.kt       |  29 +-
 .../kmath/linear/DoubleLinearSpace.kt         |  30 +-
 .../kscience/kmath/linear/LinearSpace.kt      |   3 +-
 .../space/kscience/kmath/nd/AlgebraND.kt      | 116 +++-----
 .../kscience/kmath/nd/BufferAlgebraND.kt      | 262 ++++++++++--------
 .../space/kscience/kmath/nd/BufferND.kt       |  24 +-
 .../space/kscience/kmath/nd/DoubleFieldND.kt  | 132 +++------
 .../space/kscience/kmath/nd/ShapeIndex.kt     | 120 ++++++++
 .../space/kscience/kmath/nd/ShortRingND.kt    |  25 +-
 .../space/kscience/kmath/nd/StructureND.kt    | 110 +-------
 .../kscience/kmath/nd/algebraNDExtentions.kt  |  34 +++
 .../kscience/kmath/operations/Algebra.kt      |  14 +-
 .../space/kscience/kmath/operations/BigInt.kt |   8 +-
 .../kmath/operations/BufferAlgebra.kt         | 179 +++++++-----
 .../kmath/operations/DoubleBufferField.kt     |  14 +-
 ...BufferOperations.kt => DoubleBufferOps.kt} |   6 +-
 .../kmath/operations/NumericAlgebra.kt        |   2 +-
 .../kscience/kmath/operations/numbers.kt      |   8 +-
 .../kscience/kmath/structures/NDFieldTest.kt  |   3 +-
 .../kmath/structures/NumberNDFieldTest.kt     |  13 +-
 .../space/kscience/kmath/chains/flowExtra.kt  |   4 +-
 .../space/kscience/kmath/real/realND.kt       |   4 +-
 .../kmath/histogram/DoubleHistogramSpace.kt   |   9 +-
 .../kmath/histogram/IndexedHistogramSpace.kt  |   9 +-
 .../histogram/MultivariateHistogramTest.kt    |   3 +-
 .../kmath/kotlingrad/scalarsAdapters.kt       |  12 +-
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   | 164 +++++------
 .../kmath/nd4j/Nd4jArrayAlgebraTest.kt        |  18 +-
 .../space/kscience/kmath/symja/adapters.kt    |  12 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |   8 +-
 .../core/internal/TensorLinearStructure.kt    |  16 +-
 .../tensors/core/internal/tensorCastsUtils.kt |   7 +-
 .../kmath/viktor/ViktorStructureND.kt         |  20 +-
 settings.gradle.kts                           |   8 +-
 56 files changed, 893 insertions(+), 906 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndex.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/{DoubleBufferOperations.kt => DoubleBufferOps.kt} (97%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05376d425..bb267744e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,9 @@
 - Use `Symbol` factory function instead of `StringSymbol`
 - New discoverability pattern: `<Type>.algebra.<nd/etc>`
 - Adjusted commons-math API for linear solvers to match conventions.
+- Buffer algebra does not require size anymore
+- Operations -> Ops
+- Default Buffer and ND algebras are now Ops and lack neutral elements (0, 1) as well as algebra-level shapes.
 
 ### Deprecated
 - Specialized `DoubleBufferAlgebra`
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index 76fec05d3..950a10b33 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -9,9 +9,10 @@ import kotlinx.benchmark.Benchmark
 import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
+import space.kscience.kmath.nd.BufferedFieldOpsND
 import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.autoNdAlgebra
 import space.kscience.kmath.nd.ndAlgebra
+import space.kscience.kmath.nd.one
 import space.kscience.kmath.nd4j.nd4j
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.Buffer
@@ -23,21 +24,21 @@ import space.kscience.kmath.tensors.core.tensorAlgebra
 internal class NDFieldBenchmark {
     @Benchmark
     fun autoFieldAdd(blackhole: Blackhole) = with(autoField) {
-        var res: StructureND<Double> = one
-        repeat(n) { res += one }
+        var res: StructureND<Double> = one(shape)
+        repeat(n) { res += 1.0 }
         blackhole.consume(res)
     }
 
     @Benchmark
     fun specializedFieldAdd(blackhole: Blackhole) = with(specializedField) {
-        var res: StructureND<Double> = one
+        var res: StructureND<Double> = one(shape)
         repeat(n) { res += 1.0 }
         blackhole.consume(res)
     }
 
     @Benchmark
     fun boxingFieldAdd(blackhole: Blackhole) = with(genericField) {
-        var res: StructureND<Double> = one
+        var res: StructureND<Double> = one(shape)
         repeat(n) { res += 1.0 }
         blackhole.consume(res)
     }
@@ -56,19 +57,20 @@ internal class NDFieldBenchmark {
         blackhole.consume(res)
     }
 
-//    @Benchmark
-//    fun nd4jAdd(blackhole: Blackhole) = with(nd4jField) {
-//        var res: StructureND<Double> = one
-//        repeat(n) { res += 1.0 }
-//        blackhole.consume(res)
-//    }
+    @Benchmark
+    fun nd4jAdd(blackhole: Blackhole) = with(nd4jField) {
+        var res: StructureND<Double> = one(dim, dim)
+        repeat(n) { res += 1.0 }
+        blackhole.consume(res)
+    }
 
     private companion object {
         private const val dim = 1000
         private const val n = 100
-        private val autoField = DoubleField.autoNdAlgebra(dim, dim)
-        private val specializedField = DoubleField.ndAlgebra(dim, dim)
-        private val genericField = DoubleField.ndAlgebra(Buffer.Companion::boxing, dim, dim)
-        private val nd4jField = DoubleField.nd4j(dim, dim)
+        private val shape = intArrayOf(dim, dim)
+        private val autoField = BufferedFieldOpsND(DoubleField, Buffer.Companion::auto)
+        private val specializedField = DoubleField.ndAlgebra
+        private val genericField = BufferedFieldOpsND(DoubleField, Buffer.Companion::boxing)
+        private val nd4jField = DoubleField.nd4j
     }
 }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
index b97a05a52..6b4d5759b 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
@@ -10,18 +10,17 @@ import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import org.jetbrains.bio.viktor.F64Array
-import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.autoNdAlgebra
-import space.kscience.kmath.nd.ndAlgebra
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.viktor.ViktorNDField
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.viktor.ViktorFieldND
 
 @State(Scope.Benchmark)
 internal class ViktorBenchmark {
     @Benchmark
     fun automaticFieldAddition(blackhole: Blackhole) {
         with(autoField) {
-            var res: StructureND<Double> = one
+            var res: StructureND<Double> = one(shape)
             repeat(n) { res += 1.0 }
             blackhole.consume(res)
         }
@@ -30,7 +29,7 @@ internal class ViktorBenchmark {
     @Benchmark
     fun realFieldAddition(blackhole: Blackhole) {
         with(realField) {
-            var res: StructureND<Double> = one
+            var res: StructureND<Double> = one(shape)
             repeat(n) { res += 1.0 }
             blackhole.consume(res)
         }
@@ -39,7 +38,7 @@ internal class ViktorBenchmark {
     @Benchmark
     fun viktorFieldAddition(blackhole: Blackhole) {
         with(viktorField) {
-            var res = one
+            var res = one(shape)
             repeat(n) { res += 1.0 }
             blackhole.consume(res)
         }
@@ -56,10 +55,11 @@ internal class ViktorBenchmark {
     private companion object {
         private const val dim = 1000
         private const val n = 100
+        private val shape = Shape(dim, dim)
 
         // automatically build context most suited for given type.
-        private val autoField = DoubleField.autoNdAlgebra(dim, dim)
-        private val realField = DoubleField.ndAlgebra(dim, dim)
-        private val viktorField = ViktorNDField(dim, dim)
+        private val autoField = BufferedFieldOpsND(DoubleField, Buffer.Companion::auto)
+        private val realField = DoubleField.ndAlgebra
+        private val viktorField = ViktorFieldND(dim, dim)
     }
 }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
index 91e9dcd76..ef2adaad8 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
@@ -10,18 +10,21 @@ import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import org.jetbrains.bio.viktor.F64Array
-import space.kscience.kmath.nd.autoNdAlgebra
+import space.kscience.kmath.nd.BufferedFieldOpsND
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.ndAlgebra
+import space.kscience.kmath.nd.one
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.viktor.ViktorFieldND
 
 @State(Scope.Benchmark)
 internal class ViktorLogBenchmark {
     @Benchmark
     fun realFieldLog(blackhole: Blackhole) {
-        with(realNdField) {
-            val fortyTwo = produce { 42.0 }
-            var res = one
+        with(realField) {
+            val fortyTwo = produce(shape) { 42.0 }
+            var res = one(shape)
             repeat(n) { res = ln(fortyTwo) }
             blackhole.consume(res)
         }
@@ -30,7 +33,7 @@ internal class ViktorLogBenchmark {
     @Benchmark
     fun viktorFieldLog(blackhole: Blackhole) {
         with(viktorField) {
-            val fortyTwo = produce { 42.0 }
+            val fortyTwo = produce(shape) { 42.0 }
             var res = one
             repeat(n) { res = ln(fortyTwo) }
             blackhole.consume(res)
@@ -48,10 +51,11 @@ internal class ViktorLogBenchmark {
     private companion object {
         private const val dim = 1000
         private const val n = 100
+        private val shape = Shape(dim, dim)
 
         // automatically build context most suited for given type.
-        private val autoField = DoubleField.autoNdAlgebra(dim, dim)
-        private val realNdField = DoubleField.ndAlgebra(dim, dim)
-        private val viktorField = ViktorFieldND(intArrayOf(dim, dim))
+        private val autoField = BufferedFieldOpsND(DoubleField, Buffer.Companion::auto)
+        private val realField = DoubleField.ndAlgebra
+        private val viktorField = ViktorFieldND(dim, dim)
     }
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
index 319221bcc..67d83d77c 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
@@ -11,27 +11,27 @@ import space.kscience.kmath.complex.bufferAlgebra
 import space.kscience.kmath.complex.ndAlgebra
 import space.kscience.kmath.nd.BufferND
 import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.produce
 
 fun main() = Complex.algebra {
     val complex = 2 + 2 * i
     println(complex * 8 - 5 * i)
 
     //flat buffer
-    val buffer = bufferAlgebra(8).run {
-        buffer { Complex(it, -it) }.map { Complex(it.im, it.re) }
+    val buffer = with(bufferAlgebra){
+        buffer(8) { Complex(it, -it) }.map { Complex(it.im, it.re) }
     }
     println(buffer)
 
-
     // 2d element
-    val element: BufferND<Complex> = ndAlgebra(2, 2).produce { (i, j) ->
+    val element: BufferND<Complex> = ndAlgebra.produce(2, 2) { (i, j) ->
         Complex(i - j, i + j)
     }
     println(element)
 
     // 1d element operation
-    val result: StructureND<Complex> = ndAlgebra(8).run {
-        val a = produce { (it) -> i * it - it.toDouble() }
+    val result: StructureND<Complex> = ndAlgebra{
+        val a = produce(8) { (it) -> i * it - it.toDouble() }
         val b = 3
         val c = Complex(1.0, 1.0)
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
index 5b0e2eb30..7359f3bf6 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
@@ -14,7 +14,7 @@ import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.nd4j.Nd4jArrayField
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.viktor.ViktorNDField
+import space.kscience.kmath.viktor.ViktorFieldND
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.system.measureTimeMillis
@@ -41,7 +41,7 @@ fun main() {
     // Nd4j specialized field.
     val nd4jField = Nd4jArrayField.real(dim, dim)
     //viktor field
-    val viktorField = ViktorNDField(dim, dim)
+    val viktorField = ViktorFieldND(dim, dim)
     //parallel processing based on Java Streams
     val parallelField = DoubleField.ndStreaming(dim, dim)
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index b1248bd0f..f1f5f2e84 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.structures
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.ExtendedField
-import space.kscience.kmath.operations.NumbersAddOperations
+import space.kscience.kmath.operations.NumbersAddOps
 import java.util.*
 import java.util.stream.IntStream
 
@@ -17,11 +17,11 @@ import java.util.stream.IntStream
  * execution.
  */
 class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, DoubleField>,
-    NumbersAddOperations<StructureND<Double>>,
+    NumbersAddOps<StructureND<Double>>,
     ExtendedField<StructureND<Double>> {
 
     private val strides = DefaultStrides(shape)
-    override val elementContext: DoubleField get() = DoubleField
+    override val elementAlgebra: DoubleField get() = DoubleField
     override val zero: BufferND<Double> by lazy { produce { zero } }
     override val one: BufferND<Double> by lazy { produce { one } }
 
@@ -36,7 +36,7 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
                 this@StreamDoubleFieldND.shape,
                 shape
             )
-            this is BufferND && this.strides == this@StreamDoubleFieldND.strides -> this.buffer as DoubleBuffer
+            this is BufferND && this.indexes == this@StreamDoubleFieldND.strides -> this.buffer as DoubleBuffer
             else -> DoubleBuffer(strides.linearSize) { offset -> get(strides.index(offset)) }
         }
 
@@ -69,7 +69,7 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
         return BufferND(strides, array.asBuffer())
     }
 
-    override fun combine(
+    override fun zip(
         a: StructureND<Double>,
         b: StructureND<Double>,
         transform: DoubleField.(Double, Double) -> Double,
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
index d78141507..889ea99bd 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.structures
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.buffer
 import space.kscience.kmath.operations.bufferAlgebra
+import space.kscience.kmath.operations.withSize
 
 inline fun <reified R : Any> MutableBuffer.Companion.same(
     n: Int,
@@ -16,7 +17,7 @@ inline fun <reified R : Any> MutableBuffer.Companion.same(
 
 
 fun main() {
-    with(DoubleField.bufferAlgebra(5)) {
+    with(DoubleField.bufferAlgebra.withSize(5)) {
         println(number(2.0) + buffer(1, 2, 3, 4, 5))
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 05679dc3c..ffed3a254 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
index ef6d51c7b..7f2780548 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
@@ -18,10 +18,10 @@ import com.github.h0tk3y.betterParse.parser.ParseResult
 import com.github.h0tk3y.betterParse.parser.Parser
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.operations.FieldOperations
-import space.kscience.kmath.operations.GroupOperations
+import space.kscience.kmath.operations.FieldOps
+import space.kscience.kmath.operations.GroupOps
 import space.kscience.kmath.operations.PowerOperations
-import space.kscience.kmath.operations.RingOperations
+import space.kscience.kmath.operations.RingOps
 
 /**
  * better-parse implementation of grammar defined in the ArithmeticsEvaluator.g4.
@@ -60,7 +60,7 @@ public object ArithmeticsEvaluator : Grammar<MST>() {
         .or(binaryFunction)
         .or(unaryFunction)
         .or(singular)
-        .or(-minus and parser(ArithmeticsEvaluator::term) map { MST.Unary(GroupOperations.MINUS_OPERATION, it) })
+        .or(-minus and parser(ArithmeticsEvaluator::term) map { MST.Unary(GroupOps.MINUS_OPERATION, it) })
         .or(-lpar and parser(ArithmeticsEvaluator::subSumChain) and -rpar)
 
     private val powChain: Parser<MST> by leftAssociative(term = term, operator = pow) { a, _, b ->
@@ -72,9 +72,9 @@ public object ArithmeticsEvaluator : Grammar<MST>() {
         operator = div or mul use TokenMatch::type
     ) { a, op, b ->
         if (op == div)
-            MST.Binary(FieldOperations.DIV_OPERATION, a, b)
+            MST.Binary(FieldOps.DIV_OPERATION, a, b)
         else
-            MST.Binary(RingOperations.TIMES_OPERATION, a, b)
+            MST.Binary(RingOps.TIMES_OPERATION, a, b)
     }
 
     private val subSumChain: Parser<MST> by leftAssociative(
@@ -82,9 +82,9 @@ public object ArithmeticsEvaluator : Grammar<MST>() {
         operator = plus or minus use TokenMatch::type
     ) { a, op, b ->
         if (op == plus)
-            MST.Binary(GroupOperations.PLUS_OPERATION, a, b)
+            MST.Binary(GroupOps.PLUS_OPERATION, a, b)
         else
-            MST.Binary(GroupOperations.MINUS_OPERATION, a, b)
+            MST.Binary(GroupOps.MINUS_OPERATION, a, b)
     }
 
     override val rootParser: Parser<MST> by subSumChain
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index a7a28d87f..8b76b6f19 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -39,7 +39,7 @@ public val PrintNumeric: RenderFeature = RenderFeature { _, node ->
 @UnstableKMathAPI
 private fun printSignedNumberString(s: String): MathSyntax = if (s.startsWith('-'))
     UnaryMinusSyntax(
-        operation = GroupOperations.MINUS_OPERATION,
+        operation = GroupOps.MINUS_OPERATION,
         operand = OperandSyntax(
             operand = NumberSyntax(string = s.removePrefix("-")),
             parentheses = true,
@@ -72,7 +72,7 @@ public class PrettyPrintFloats(public val types: Set<KClass<out Number>>) : Rend
             val exponent = afterE.toDouble().toString().removeSuffix(".0")
 
             return MultiplicationSyntax(
-                operation = RingOperations.TIMES_OPERATION,
+                operation = RingOps.TIMES_OPERATION,
                 left = OperandSyntax(operand = NumberSyntax(significand), parentheses = true),
                 right = OperandSyntax(
                     operand = SuperscriptSyntax(
@@ -91,7 +91,7 @@ public class PrettyPrintFloats(public val types: Set<KClass<out Number>>) : Rend
 
             if (toString.startsWith('-'))
                 return UnaryMinusSyntax(
-                    operation = GroupOperations.MINUS_OPERATION,
+                    operation = GroupOps.MINUS_OPERATION,
                     operand = OperandSyntax(operand = infty, parentheses = true),
                 )
 
@@ -211,9 +211,9 @@ public class BinaryPlus(operations: Collection<String>?) : Binary(operations) {
 
     public companion object {
         /**
-         * The default instance configured with [GroupOperations.PLUS_OPERATION].
+         * The default instance configured with [GroupOps.PLUS_OPERATION].
          */
-        public val Default: BinaryPlus = BinaryPlus(setOf(GroupOperations.PLUS_OPERATION))
+        public val Default: BinaryPlus = BinaryPlus(setOf(GroupOps.PLUS_OPERATION))
     }
 }
 
@@ -233,9 +233,9 @@ public class BinaryMinus(operations: Collection<String>?) : Binary(operations) {
 
     public companion object {
         /**
-         * The default instance configured with [GroupOperations.MINUS_OPERATION].
+         * The default instance configured with [GroupOps.MINUS_OPERATION].
          */
-        public val Default: BinaryMinus = BinaryMinus(setOf(GroupOperations.MINUS_OPERATION))
+        public val Default: BinaryMinus = BinaryMinus(setOf(GroupOps.MINUS_OPERATION))
     }
 }
 
@@ -253,9 +253,9 @@ public class UnaryPlus(operations: Collection<String>?) : Unary(operations) {
 
     public companion object {
         /**
-         * The default instance configured with [GroupOperations.PLUS_OPERATION].
+         * The default instance configured with [GroupOps.PLUS_OPERATION].
          */
-        public val Default: UnaryPlus = UnaryPlus(setOf(GroupOperations.PLUS_OPERATION))
+        public val Default: UnaryPlus = UnaryPlus(setOf(GroupOps.PLUS_OPERATION))
     }
 }
 
@@ -273,9 +273,9 @@ public class UnaryMinus(operations: Collection<String>?) : Unary(operations) {
 
     public companion object {
         /**
-         * The default instance configured with [GroupOperations.MINUS_OPERATION].
+         * The default instance configured with [GroupOps.MINUS_OPERATION].
          */
-        public val Default: UnaryMinus = UnaryMinus(setOf(GroupOperations.MINUS_OPERATION))
+        public val Default: UnaryMinus = UnaryMinus(setOf(GroupOps.MINUS_OPERATION))
     }
 }
 
@@ -295,9 +295,9 @@ public class Fraction(operations: Collection<String>?) : Binary(operations) {
 
     public companion object {
         /**
-         * The default instance configured with [FieldOperations.DIV_OPERATION].
+         * The default instance configured with [FieldOps.DIV_OPERATION].
          */
-        public val Default: Fraction = Fraction(setOf(FieldOperations.DIV_OPERATION))
+        public val Default: Fraction = Fraction(setOf(FieldOps.DIV_OPERATION))
     }
 }
 
@@ -422,9 +422,9 @@ public class Multiplication(operations: Collection<String>?) : Binary(operations
 
     public companion object {
         /**
-         * The default instance configured with [RingOperations.TIMES_OPERATION].
+         * The default instance configured with [RingOps.TIMES_OPERATION].
          */
-        public val Default: Multiplication = Multiplication(setOf(RingOperations.TIMES_OPERATION))
+        public val Default: Multiplication = Multiplication(setOf(RingOps.TIMES_OPERATION))
     }
 }
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
index 3d05e03d6..ecea2d104 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
@@ -7,10 +7,10 @@ package space.kscience.kmath.ast.rendering
 
 import space.kscience.kmath.ast.rendering.FeaturedMathRendererWithPostProcess.PostProcessPhase
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.FieldOperations
-import space.kscience.kmath.operations.GroupOperations
+import space.kscience.kmath.operations.FieldOps
+import space.kscience.kmath.operations.GroupOps
 import space.kscience.kmath.operations.PowerOperations
-import space.kscience.kmath.operations.RingOperations
+import space.kscience.kmath.operations.RingOps
 
 /**
  * Removes unnecessary times (&times;) symbols from [MultiplicationSyntax].
@@ -306,10 +306,10 @@ public class SimplifyParentheses(public val precedenceFunction: (MathSyntax) ->
 
                 is BinarySyntax -> when (it.operation) {
                     PowerOperations.POW_OPERATION -> 1
-                    RingOperations.TIMES_OPERATION -> 3
-                    FieldOperations.DIV_OPERATION -> 3
-                    GroupOperations.MINUS_OPERATION -> 4
-                    GroupOperations.PLUS_OPERATION -> 4
+                    RingOps.TIMES_OPERATION -> 3
+                    FieldOps.DIV_OPERATION -> 3
+                    GroupOps.MINUS_OPERATION -> 4
+                    GroupOps.PLUS_OPERATION -> 4
                     else -> 0
                 }
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
index d8e432230..aba713c43 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.ast.rendering
 
 import space.kscience.kmath.ast.rendering.TestUtils.testLatex
 import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.operations.GroupOperations
+import space.kscience.kmath.operations.GroupOps
 import kotlin.test.Test
 
 internal class TestLatex {
@@ -36,7 +36,7 @@ internal class TestLatex {
     fun unaryOperator() = testLatex("sin(1)", "\\operatorname{sin}\\,\\left(1\\right)")
 
     @Test
-    fun unaryPlus() = testLatex(MST.Unary(GroupOperations.PLUS_OPERATION, MST.Numeric(1)), "+1")
+    fun unaryPlus() = testLatex(MST.Unary(GroupOps.PLUS_OPERATION, MST.Numeric(1)), "+1")
 
     @Test
     fun unaryMinus() = testLatex("-x", "-x")
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
index a7fcbc75b..658ecd47a 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.ast.rendering
 
 import space.kscience.kmath.ast.rendering.TestUtils.testMathML
 import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.operations.GroupOperations
+import space.kscience.kmath.operations.GroupOps
 import kotlin.test.Test
 
 internal class TestMathML {
@@ -47,7 +47,7 @@ internal class TestMathML {
 
     @Test
     fun unaryPlus() =
-        testMathML(MST.Unary(GroupOperations.PLUS_OPERATION, MST.Numeric(1)), "<mo>+</mo><mn>1</mn>")
+        testMathML(MST.Unary(GroupOps.PLUS_OPERATION, MST.Numeric(1)), "<mo>+</mo><mn>1</mn>")
 
     @Test
     fun unaryMinus() = testMathML("-x", "<mo>-</mo><mi>x</mi>")
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index 5b6cf65db..b04c4d48f 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -108,8 +108,8 @@ internal class DoubleWasmBuilder(target: MST) : WasmBuilder<Double>(f64, DoubleF
     override fun visitNumeric(mst: Numeric): ExpressionRef = ctx.f64.const(mst.value)
 
     override fun visitUnary(mst: Unary): ExpressionRef = when (mst.operation) {
-        GroupOperations.MINUS_OPERATION -> ctx.f64.neg(visit(mst.value))
-        GroupOperations.PLUS_OPERATION -> visit(mst.value)
+        GroupOps.MINUS_OPERATION -> ctx.f64.neg(visit(mst.value))
+        GroupOps.PLUS_OPERATION -> visit(mst.value)
         PowerOperations.SQRT_OPERATION -> ctx.f64.sqrt(visit(mst.value))
         TrigonometricOperations.SIN_OPERATION -> ctx.call("sin", arrayOf(visit(mst.value)), f64)
         TrigonometricOperations.COS_OPERATION -> ctx.call("cos", arrayOf(visit(mst.value)), f64)
@@ -129,10 +129,10 @@ internal class DoubleWasmBuilder(target: MST) : WasmBuilder<Double>(f64, DoubleF
     }
 
     override fun visitBinary(mst: Binary): ExpressionRef = when (mst.operation) {
-        GroupOperations.PLUS_OPERATION -> ctx.f64.add(visit(mst.left), visit(mst.right))
-        GroupOperations.MINUS_OPERATION -> ctx.f64.sub(visit(mst.left), visit(mst.right))
-        RingOperations.TIMES_OPERATION -> ctx.f64.mul(visit(mst.left), visit(mst.right))
-        FieldOperations.DIV_OPERATION -> ctx.f64.div(visit(mst.left), visit(mst.right))
+        GroupOps.PLUS_OPERATION -> ctx.f64.add(visit(mst.left), visit(mst.right))
+        GroupOps.MINUS_OPERATION -> ctx.f64.sub(visit(mst.left), visit(mst.right))
+        RingOps.TIMES_OPERATION -> ctx.f64.mul(visit(mst.left), visit(mst.right))
+        FieldOps.DIV_OPERATION -> ctx.f64.div(visit(mst.left), visit(mst.right))
         PowerOperations.POW_OPERATION -> ctx.call("pow", arrayOf(visit(mst.left), visit(mst.right)), f64)
         else -> super.visitBinary(mst)
     }
@@ -142,15 +142,15 @@ internal class IntWasmBuilder(target: MST) : WasmBuilder<Int>(i32, IntRing, targ
     override fun visitNumeric(mst: Numeric): ExpressionRef = ctx.i32.const(mst.value)
 
     override fun visitUnary(mst: Unary): ExpressionRef = when (mst.operation) {
-        GroupOperations.MINUS_OPERATION -> ctx.i32.sub(ctx.i32.const(0), visit(mst.value))
-        GroupOperations.PLUS_OPERATION -> visit(mst.value)
+        GroupOps.MINUS_OPERATION -> ctx.i32.sub(ctx.i32.const(0), visit(mst.value))
+        GroupOps.PLUS_OPERATION -> visit(mst.value)
         else -> super.visitUnary(mst)
     }
 
     override fun visitBinary(mst: Binary): ExpressionRef = when (mst.operation) {
-        GroupOperations.PLUS_OPERATION -> ctx.i32.add(visit(mst.left), visit(mst.right))
-        GroupOperations.MINUS_OPERATION -> ctx.i32.sub(visit(mst.left), visit(mst.right))
-        RingOperations.TIMES_OPERATION -> ctx.i32.mul(visit(mst.left), visit(mst.right))
+        GroupOps.PLUS_OPERATION -> ctx.i32.add(visit(mst.left), visit(mst.right))
+        GroupOps.MINUS_OPERATION -> ctx.i32.sub(visit(mst.left), visit(mst.right))
+        RingOps.TIMES_OPERATION -> ctx.i32.mul(visit(mst.left), visit(mst.right))
         else -> super.visitBinary(mst)
     }
 }
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
index bc0119ca2..a178e8dd7 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
@@ -9,7 +9,7 @@ import org.apache.commons.math3.analysis.differentiation.DerivativeStructure
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.ExtendedField
-import space.kscience.kmath.operations.NumbersAddOperations
+import space.kscience.kmath.operations.NumbersAddOps
 
 /**
  * A field over commons-math [DerivativeStructure].
@@ -22,7 +22,7 @@ public class DerivativeStructureField(
     public val order: Int,
     bindings: Map<Symbol, Double>,
 ) : ExtendedField<DerivativeStructure>, ExpressionAlgebra<Double, DerivativeStructure>,
-    NumbersAddOperations<DerivativeStructure> {
+    NumbersAddOps<DerivativeStructure> {
     public val numberOfVariables: Int = bindings.size
 
     override val zero: DerivativeStructure by lazy { DerivativeStructure(numberOfVariables, order) }
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index 7d948cb61..e61a7bccc 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -52,7 +52,7 @@ private val PI_DIV_2 = Complex(PI / 2, 0)
 public object ComplexField :
     ExtendedField<Complex>,
     Norm<Complex, Complex>,
-    NumbersAddOperations<Complex>,
+    NumbersAddOps<Complex>,
     ScaleOperations<Complex> {
 
     override val zero: Complex = 0.0.toComplex()
@@ -216,7 +216,6 @@ public data class Complex(val re: Double, val im: Double) {
 
 public val Complex.Companion.algebra: ComplexField get() = ComplexField
 
-
 /**
  * Creates a complex number with real part equal to this real.
  *
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
index 29e790d16..3951b5de0 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
@@ -6,13 +6,8 @@
 package space.kscience.kmath.complex
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.BufferND
-import space.kscience.kmath.nd.BufferedFieldND
-import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.operations.BufferField
-import space.kscience.kmath.operations.ExtendedField
-import space.kscience.kmath.operations.NumbersAddOperations
-import space.kscience.kmath.operations.bufferAlgebra
+import space.kscience.kmath.nd.*
+import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
@@ -22,100 +17,61 @@ import kotlin.contracts.contract
  * An optimized nd-field for complex numbers
  */
 @OptIn(UnstableKMathAPI::class)
-public class ComplexFieldND(
-    shape: IntArray,
-) : BufferedFieldND<Complex, ComplexField>(shape, ComplexField, Buffer.Companion::complex),
-    NumbersAddOperations<StructureND<Complex>>,
-    ExtendedField<StructureND<Complex>> {
+public sealed class ComplexFieldOpsND : BufferedFieldOpsND<Complex, ComplexField>(ComplexField.bufferAlgebra),
+    ScaleOperations<StructureND<Complex>>, ExtendedFieldOps<StructureND<Complex>> {
 
-    override val zero: BufferND<Complex> by lazy { produce { zero } }
-    override val one: BufferND<Complex> by lazy { produce { one } }
-
-    override fun number(value: Number): BufferND<Complex> {
-        val d = value.toComplex() // minimize conversions
-        return produce { d }
+    override fun StructureND<Complex>.toBufferND(): BufferND<Complex> = when (this) {
+        is BufferND -> this
+        else -> {
+            val indexer = indexerBuilder(shape)
+            BufferND(indexer, Buffer.complex(indexer.linearSize) { offset -> get(indexer.index(offset)) })
+        }
     }
 
-//
-//    @Suppress("OVERRIDE_BY_INLINE")
-//    override inline fun map(
-//        arg: AbstractNDBuffer<Double>,
-//        transform: DoubleField.(Double) -> Double,
-//    ): RealNDElement {
-//        check(arg)
-//        val array = RealBuffer(arg.strides.linearSize) { offset -> DoubleField.transform(arg.buffer[offset]) }
-//        return BufferedNDFieldElement(this, array)
-//    }
-//
-//    @Suppress("OVERRIDE_BY_INLINE")
-//    override inline fun produce(initializer: DoubleField.(IntArray) -> Double): RealNDElement {
-//        val array = RealBuffer(strides.linearSize) { offset -> elementContext.initializer(strides.index(offset)) }
-//        return BufferedNDFieldElement(this, array)
-//    }
-//
-//    @Suppress("OVERRIDE_BY_INLINE")
-//    override inline fun mapIndexed(
-//        arg: AbstractNDBuffer<Double>,
-//        transform: DoubleField.(index: IntArray, Double) -> Double,
-//    ): RealNDElement {
-//        check(arg)
-//        return BufferedNDFieldElement(
-//            this,
-//            RealBuffer(arg.strides.linearSize) { offset ->
-//                elementContext.transform(
-//                    arg.strides.index(offset),
-//                    arg.buffer[offset]
-//                )
-//            })
-//    }
-//
-//    @Suppress("OVERRIDE_BY_INLINE")
-//    override inline fun combine(
-//        a: AbstractNDBuffer<Double>,
-//        b: AbstractNDBuffer<Double>,
-//        transform: DoubleField.(Double, Double) -> Double,
-//    ): RealNDElement {
-//        check(a, b)
-//        val buffer = RealBuffer(strides.linearSize) { offset ->
-//            elementContext.transform(a.buffer[offset], b.buffer[offset])
-//        }
-//        return BufferedNDFieldElement(this, buffer)
-//    }
+    //TODO do specialization
 
-    override fun power(arg: StructureND<Complex>, pow: Number): BufferND<Complex> = arg.map { power(it, pow) }
+    override fun scale(a: StructureND<Complex>, value: Double): BufferND<Complex> =
+        mapInline(a.toBufferND()) { it * value }
 
-    override fun exp(arg: StructureND<Complex>): BufferND<Complex> = arg.map { exp(it) }
+    override fun power(arg: StructureND<Complex>, pow: Number): BufferND<Complex> =
+        mapInline(arg.toBufferND()) { power(it, pow) }
 
-    override fun ln(arg: StructureND<Complex>): BufferND<Complex> = arg.map { ln(it) }
+    override fun exp(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { exp(it) }
+    override fun ln(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { ln(it) }
 
-    override fun sin(arg: StructureND<Complex>): BufferND<Complex> = arg.map { sin(it) }
-    override fun cos(arg: StructureND<Complex>): BufferND<Complex> = arg.map { cos(it) }
-    override fun tan(arg: StructureND<Complex>): BufferND<Complex> = arg.map { tan(it) }
-    override fun asin(arg: StructureND<Complex>): BufferND<Complex> = arg.map { asin(it) }
-    override fun acos(arg: StructureND<Complex>): BufferND<Complex> = arg.map { acos(it) }
-    override fun atan(arg: StructureND<Complex>): BufferND<Complex> = arg.map { atan(it) }
+    override fun sin(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { sin(it) }
+    override fun cos(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { cos(it) }
+    override fun tan(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { tan(it) }
+    override fun asin(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { asin(it) }
+    override fun acos(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { acos(it) }
+    override fun atan(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { atan(it) }
 
-    override fun sinh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { sinh(it) }
-    override fun cosh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { cosh(it) }
-    override fun tanh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { tanh(it) }
-    override fun asinh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { asinh(it) }
-    override fun acosh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { acosh(it) }
-    override fun atanh(arg: StructureND<Complex>): BufferND<Complex> = arg.map { atanh(it) }
-}
+    override fun sinh(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { sinh(it) }
+    override fun cosh(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { cosh(it) }
+    override fun tanh(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { tanh(it) }
+    override fun asinh(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { asinh(it) }
+    override fun acosh(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { acosh(it) }
+    override fun atanh(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { atanh(it) }
 
-
-/**
- * Fast element production using function inlining
- */
-public inline fun BufferedFieldND<Complex, ComplexField>.produceInline(initializer: ComplexField.(Int) -> Complex): BufferND<Complex> {
-    contract { callsInPlace(initializer, InvocationKind.EXACTLY_ONCE) }
-    val buffer = Buffer.complex(strides.linearSize) { offset -> ComplexField.initializer(offset) }
-    return BufferND(strides, buffer)
+    public companion object : ComplexFieldOpsND()
 }
 
 @UnstableKMathAPI
-public fun ComplexField.bufferAlgebra(size: Int): BufferField<Complex, ComplexField> =
-    bufferAlgebra(Buffer.Companion::complex, size)
+public val ComplexField.bufferAlgebra: BufferFieldOps<Complex, ComplexField>
+    get() = bufferAlgebra(Buffer.Companion::complex)
+
+
+@OptIn(UnstableKMathAPI::class)
+public class ComplexFieldND(override val shape: Shape) :
+    ComplexFieldOpsND(), FieldND<Complex, ComplexField>, NumbersAddOps<StructureND<Complex>> {
+
+    override fun number(value: Number): BufferND<Complex> {
+        val d = value.toDouble() // minimize conversions
+        return produce(shape) { d.toComplex() }
+    }
+}
+
+public val ComplexField.ndAlgebra: ComplexFieldOpsND get() = ComplexFieldOpsND
 
 public fun ComplexField.ndAlgebra(vararg shape: Int): ComplexFieldND = ComplexFieldND(shape)
 
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index e5d7ebd1e..b0ec10c35 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -44,7 +44,7 @@ public val Quaternion.r: Double
  */
 @OptIn(UnstableKMathAPI::class)
 public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>, PowerOperations<Quaternion>,
-    ExponentialOperations<Quaternion>, NumbersAddOperations<Quaternion>, ScaleOperations<Quaternion> {
+    ExponentialOperations<Quaternion>, NumbersAddOps<Quaternion>, ScaleOperations<Quaternion> {
     override val zero: Quaternion = 0.toQuaternion()
     override val one: Quaternion = 1.toQuaternion()
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
index 36ccb96f7..1baca0f55 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
@@ -52,13 +52,13 @@ public open class FunctionalExpressionGroup<T, out A : Group<T>>(
     override val zero: Expression<T> get() = const(algebra.zero)
 
     override fun Expression<T>.unaryMinus(): Expression<T> =
-        unaryOperation(GroupOperations.MINUS_OPERATION, this)
+        unaryOperation(GroupOps.MINUS_OPERATION, this)
 
     /**
      * Builds an Expression of addition of two another expressions.
      */
     override fun add(a: Expression<T>, b: Expression<T>): Expression<T> =
-        binaryOperation(GroupOperations.PLUS_OPERATION, a, b)
+        binaryOperation(GroupOps.PLUS_OPERATION, a, b)
 
 //    /**
 //     * Builds an Expression of multiplication of expression by number.
@@ -89,7 +89,7 @@ public open class FunctionalExpressionRing<T, out A : Ring<T>>(
      * Builds an Expression of multiplication of two expressions.
      */
     override fun multiply(a: Expression<T>, b: Expression<T>): Expression<T> =
-        binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, b)
+        binaryOperationFunction(RingOps.TIMES_OPERATION)(a, b)
 
     public operator fun Expression<T>.times(arg: T): Expression<T> = this * const(arg)
     public operator fun T.times(arg: Expression<T>): Expression<T> = arg * this
@@ -108,7 +108,7 @@ public open class FunctionalExpressionField<T, out A : Field<T>>(
      * Builds an Expression of division an expression by another one.
      */
     override fun divide(a: Expression<T>, b: Expression<T>): Expression<T> =
-        binaryOperationFunction(FieldOperations.DIV_OPERATION)(a, b)
+        binaryOperationFunction(FieldOps.DIV_OPERATION)(a, b)
 
     public operator fun Expression<T>.div(arg: T): Expression<T> = this / const(arg)
     public operator fun T.div(arg: Expression<T>): Expression<T> = arg / this
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
index bbc74005c..360715408 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
@@ -31,18 +31,18 @@ public object MstGroup : Group<MST>, NumericAlgebra<MST>, ScaleOperations<MST> {
 
     override fun number(value: Number): MST.Numeric = MstNumericAlgebra.number(value)
     override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
-    override fun add(a: MST, b: MST): MST.Binary = binaryOperationFunction(GroupOperations.PLUS_OPERATION)(a, b)
+    override fun add(a: MST, b: MST): MST.Binary = binaryOperationFunction(GroupOps.PLUS_OPERATION)(a, b)
     override operator fun MST.unaryPlus(): MST.Unary =
-        unaryOperationFunction(GroupOperations.PLUS_OPERATION)(this)
+        unaryOperationFunction(GroupOps.PLUS_OPERATION)(this)
 
     override operator fun MST.unaryMinus(): MST.Unary =
-        unaryOperationFunction(GroupOperations.MINUS_OPERATION)(this)
+        unaryOperationFunction(GroupOps.MINUS_OPERATION)(this)
 
     override operator fun MST.minus(b: MST): MST.Binary =
-        binaryOperationFunction(GroupOperations.MINUS_OPERATION)(this, b)
+        binaryOperationFunction(GroupOps.MINUS_OPERATION)(this, b)
 
     override fun scale(a: MST, value: Double): MST.Binary =
-        binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, number(value))
+        binaryOperationFunction(RingOps.TIMES_OPERATION)(a, number(value))
 
     override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
         MstNumericAlgebra.binaryOperationFunction(operation)
@@ -56,7 +56,7 @@ public object MstGroup : Group<MST>, NumericAlgebra<MST>, ScaleOperations<MST> {
  */
 @Suppress("OVERRIDE_BY_INLINE")
 @OptIn(UnstableKMathAPI::class)
-public object MstRing : Ring<MST>, NumbersAddOperations<MST>, ScaleOperations<MST> {
+public object MstRing : Ring<MST>, NumbersAddOps<MST>, ScaleOperations<MST> {
     override inline val zero: MST.Numeric get() = MstGroup.zero
     override val one: MST.Numeric = number(1.0)
 
@@ -65,10 +65,10 @@ public object MstRing : Ring<MST>, NumbersAddOperations<MST>, ScaleOperations<MS
     override fun add(a: MST, b: MST): MST.Binary = MstGroup.add(a, b)
 
     override fun scale(a: MST, value: Double): MST.Binary =
-        MstGroup.binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, MstGroup.number(value))
+        MstGroup.binaryOperationFunction(RingOps.TIMES_OPERATION)(a, MstGroup.number(value))
 
     override fun multiply(a: MST, b: MST): MST.Binary =
-        binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, b)
+        binaryOperationFunction(RingOps.TIMES_OPERATION)(a, b)
 
     override operator fun MST.unaryPlus(): MST.Unary = MstGroup { +this@unaryPlus }
     override operator fun MST.unaryMinus(): MST.Unary = MstGroup { -this@unaryMinus }
@@ -86,7 +86,7 @@ public object MstRing : Ring<MST>, NumbersAddOperations<MST>, ScaleOperations<MS
  */
 @Suppress("OVERRIDE_BY_INLINE")
 @OptIn(UnstableKMathAPI::class)
-public object MstField : Field<MST>, NumbersAddOperations<MST>, ScaleOperations<MST> {
+public object MstField : Field<MST>, NumbersAddOps<MST>, ScaleOperations<MST> {
     override inline val zero: MST.Numeric get() = MstRing.zero
     override inline val one: MST.Numeric get() = MstRing.one
 
@@ -95,11 +95,11 @@ public object MstField : Field<MST>, NumbersAddOperations<MST>, ScaleOperations<
     override fun add(a: MST, b: MST): MST.Binary = MstRing.add(a, b)
 
     override fun scale(a: MST, value: Double): MST.Binary =
-        MstGroup.binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, MstGroup.number(value))
+        MstGroup.binaryOperationFunction(RingOps.TIMES_OPERATION)(a, MstGroup.number(value))
 
     override fun multiply(a: MST, b: MST): MST.Binary = MstRing.multiply(a, b)
     override fun divide(a: MST, b: MST): MST.Binary =
-        binaryOperationFunction(FieldOperations.DIV_OPERATION)(a, b)
+        binaryOperationFunction(FieldOps.DIV_OPERATION)(a, b)
 
     override operator fun MST.unaryPlus(): MST.Unary = MstRing { +this@unaryPlus }
     override operator fun MST.unaryMinus(): MST.Unary = MstRing { -this@unaryMinus }
@@ -138,7 +138,7 @@ public object MstExtendedField : ExtendedField<MST>, NumericAlgebra<MST> {
     override fun sqrt(arg: MST): MST = unaryOperationFunction(PowerOperations.SQRT_OPERATION)(arg)
 
     override fun scale(a: MST, value: Double): MST =
-        binaryOperation(GroupOperations.PLUS_OPERATION, a, number(value))
+        binaryOperation(GroupOps.PLUS_OPERATION, a, number(value))
 
     override fun multiply(a: MST, b: MST): MST.Binary = MstField.multiply(a, b)
     override fun divide(a: MST, b: MST): MST.Binary = MstField.divide(a, b)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
index d5b80da2c..089503dc8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
@@ -59,7 +59,7 @@ public fun <T : Any> DerivationResult<T>.grad(vararg variables: Symbol): Point<T
 public open class SimpleAutoDiffField<T : Any, F : Field<T>>(
     public val context: F,
     bindings: Map<Symbol, T>,
-) : Field<AutoDiffValue<T>>, ExpressionAlgebra<T, AutoDiffValue<T>>, NumbersAddOperations<AutoDiffValue<T>> {
+) : Field<AutoDiffValue<T>>, ExpressionAlgebra<T, AutoDiffValue<T>>, NumbersAddOps<AutoDiffValue<T>> {
     override val zero: AutoDiffValue<T> get() = const(context.zero)
     override val one: AutoDiffValue<T> get() = const(context.one)
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 3d562f26f..39dbe3a81 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -6,12 +6,10 @@
 package space.kscience.kmath.linear
 
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.BufferedRingND
+import space.kscience.kmath.nd.BufferedRingOpsND
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.nd.asND
-import space.kscience.kmath.nd.ndAlgebra
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.VirtualBuffer
@@ -19,31 +17,28 @@ import space.kscience.kmath.structures.indices
 
 
 public class BufferedLinearSpace<T, out A : Ring<T>>(
-    override val elementAlgebra: A,
-    private val bufferFactory: BufferFactory<T>,
+    private val bufferAlgebra: BufferAlgebra<T, A>
 ) : LinearSpace<T, A> {
+    override val elementAlgebra: A get() = bufferAlgebra.elementAlgebra
 
-    private fun ndRing(
-        rows: Int,
-        cols: Int,
-    ): BufferedRingND<T, A> = elementAlgebra.ndAlgebra(bufferFactory, rows, cols)
+    private val ndAlgebra = BufferedRingOpsND(bufferAlgebra)
 
     override fun buildMatrix(rows: Int, columns: Int, initializer: A.(i: Int, j: Int) -> T): Matrix<T> =
-        ndRing(rows, columns).produce { (i, j) -> elementAlgebra.initializer(i, j) }.as2D()
+        ndAlgebra.produce(intArrayOf(rows, columns)) { (i, j) -> elementAlgebra.initializer(i, j) }.as2D()
 
     override fun buildVector(size: Int, initializer: A.(Int) -> T): Point<T> =
-        bufferFactory(size) { elementAlgebra.initializer(it) }
+        bufferAlgebra.buffer(size) { elementAlgebra.initializer(it) }
 
-    override fun Matrix<T>.unaryMinus(): Matrix<T> = ndRing(rowNum, colNum).run {
+    override fun Matrix<T>.unaryMinus(): Matrix<T> = ndAlgebra {
         asND().map { -it }.as2D()
     }
 
-    override fun Matrix<T>.plus(other: Matrix<T>): Matrix<T> = ndRing(rowNum, colNum).run {
+    override fun Matrix<T>.plus(other: Matrix<T>): Matrix<T> = ndAlgebra {
         require(shape.contentEquals(other.shape)) { "Shape mismatch on Matrix::plus. Expected $shape but found ${other.shape}" }
         asND().plus(other.asND()).as2D()
     }
 
-    override fun Matrix<T>.minus(other: Matrix<T>): Matrix<T> = ndRing(rowNum, colNum).run {
+    override fun Matrix<T>.minus(other: Matrix<T>): Matrix<T> = ndAlgebra {
         require(shape.contentEquals(other.shape)) { "Shape mismatch on Matrix::minus. Expected $shape but found ${other.shape}" }
         asND().minus(other.asND()).as2D()
     }
@@ -88,11 +83,11 @@ public class BufferedLinearSpace<T, out A : Ring<T>>(
         }
     }
 
-    override fun Matrix<T>.times(value: T): Matrix<T> = ndRing(rowNum, colNum).run {
+    override fun Matrix<T>.times(value: T): Matrix<T> = ndAlgebra {
         asND().map { it * value }.as2D()
     }
 }
 
 
 public fun <T, A : Ring<T>> A.linearSpace(bufferFactory: BufferFactory<T>): BufferedLinearSpace<T, A> =
-    BufferedLinearSpace(this, bufferFactory)
+    BufferedLinearSpace(BufferRingOps(this, bufferFactory))
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
index c2f53939f..ec6040af0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
@@ -6,11 +6,12 @@
 package space.kscience.kmath.linear
 
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.DoubleFieldND
+import space.kscience.kmath.nd.DoubleFieldOpsND
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.nd.asND
-import space.kscience.kmath.operations.DoubleBufferOperations
+import space.kscience.kmath.operations.DoubleBufferOps
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 
@@ -18,30 +19,27 @@ public object DoubleLinearSpace : LinearSpace<Double, DoubleField> {
 
     override val elementAlgebra: DoubleField get() = DoubleField
 
-    private fun ndRing(
-        rows: Int,
-        cols: Int,
-    ): DoubleFieldND = DoubleFieldND(intArrayOf(rows, cols))
-
     override fun buildMatrix(
         rows: Int,
         columns: Int,
         initializer: DoubleField.(i: Int, j: Int) -> Double
-    ): Matrix<Double> = ndRing(rows, columns).produce { (i, j) -> DoubleField.initializer(i, j) }.as2D()
+    ): Matrix<Double> = DoubleFieldOpsND.produce(intArrayOf(rows, columns)) { (i, j) ->
+        DoubleField.initializer(i, j)
+    }.as2D()
 
     override fun buildVector(size: Int, initializer: DoubleField.(Int) -> Double): DoubleBuffer =
         DoubleBuffer(size) { DoubleField.initializer(it) }
 
-    override fun Matrix<Double>.unaryMinus(): Matrix<Double> = ndRing(rowNum, colNum).run {
+    override fun Matrix<Double>.unaryMinus(): Matrix<Double> = DoubleFieldOpsND {
         asND().map { -it }.as2D()
     }
 
-    override fun Matrix<Double>.plus(other: Matrix<Double>): Matrix<Double> = ndRing(rowNum, colNum).run {
+    override fun Matrix<Double>.plus(other: Matrix<Double>): Matrix<Double> = DoubleFieldOpsND {
         require(shape.contentEquals(other.shape)) { "Shape mismatch on Matrix::plus. Expected $shape but found ${other.shape}" }
         asND().plus(other.asND()).as2D()
     }
 
-    override fun Matrix<Double>.minus(other: Matrix<Double>): Matrix<Double> = ndRing(rowNum, colNum).run {
+    override fun Matrix<Double>.minus(other: Matrix<Double>): Matrix<Double> = DoubleFieldOpsND {
         require(shape.contentEquals(other.shape)) { "Shape mismatch on Matrix::minus. Expected $shape but found ${other.shape}" }
         asND().minus(other.asND()).as2D()
     }
@@ -84,23 +82,23 @@ public object DoubleLinearSpace : LinearSpace<Double, DoubleField> {
 
     }
 
-    override fun Matrix<Double>.times(value: Double): Matrix<Double> = ndRing(rowNum, colNum).run {
+    override fun Matrix<Double>.times(value: Double): Matrix<Double> = DoubleFieldOpsND {
         asND().map { it * value }.as2D()
     }
 
-    public override fun Point<Double>.plus(other: Point<Double>): DoubleBuffer = DoubleBufferOperations.run {
+    public override fun Point<Double>.plus(other: Point<Double>): DoubleBuffer = DoubleBufferOps.run {
         this@plus + other
     }
 
-    public override fun Point<Double>.minus(other: Point<Double>): DoubleBuffer = DoubleBufferOperations.run {
+    public override fun Point<Double>.minus(other: Point<Double>): DoubleBuffer = DoubleBufferOps.run {
         this@minus - other
     }
 
-    public override fun Point<Double>.times(value: Double): DoubleBuffer = DoubleBufferOperations.run {
+    public override fun Point<Double>.times(value: Double): DoubleBuffer = DoubleBufferOps.run {
         scale(this@times, value)
     }
 
-    public operator fun Point<Double>.div(value: Double): DoubleBuffer = DoubleBufferOperations.run {
+    public operator fun Point<Double>.div(value: Double): DoubleBuffer = DoubleBufferOps.run {
         scale(this@div, 1.0 / value)
     }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
index 1d8985b59..5349ad864 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
@@ -10,6 +10,7 @@ import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.nd.StructureFeature
 import space.kscience.kmath.nd.as1D
+import space.kscience.kmath.operations.BufferRingOps
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.invoke
@@ -188,7 +189,7 @@ public interface LinearSpace<T, out A : Ring<T>> {
         public fun <T : Any, A : Ring<T>> buffered(
             algebra: A,
             bufferFactory: BufferFactory<T> = Buffer.Companion::boxing,
-        ): LinearSpace<T, A> = BufferedLinearSpace(algebra, bufferFactory)
+        ): LinearSpace<T, A> = BufferedLinearSpace(BufferRingOps(algebra, bufferFactory))
 
         @Deprecated("use DoubleField.linearSpace")
         public val double: LinearSpace<Double, DoubleField> = buffered(DoubleField, ::DoubleBuffer)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index b925c2642..dde04a97a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -7,7 +7,6 @@ package space.kscience.kmath.nd
 
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
-import space.kscience.kmath.structures.*
 import kotlin.reflect.KClass
 
 /**
@@ -19,6 +18,14 @@ import kotlin.reflect.KClass
 public class ShapeMismatchException(public val expected: IntArray, public val actual: IntArray) :
     RuntimeException("Shape ${actual.contentToString()} doesn't fit in expected shape ${expected.contentToString()}.")
 
+public typealias Shape = IntArray
+
+public fun Shape(shapeFirst: Int, vararg shapeRest: Int): Shape = intArrayOf(shapeFirst, *shapeRest)
+
+public interface WithShape {
+    public val shape: Shape
+}
+
 /**
  * The base interface for all ND-algebra implementations.
  *
@@ -26,20 +33,15 @@ public class ShapeMismatchException(public val expected: IntArray, public val ac
  * @param C the type of the element context.
  */
 public interface AlgebraND<T, out C : Algebra<T>> {
-    /**
-     * The shape of ND-structures this algebra operates on.
-     */
-    public val shape: IntArray
-
     /**
      * The algebra over elements of ND structure.
      */
-    public val elementContext: C
+    public val elementAlgebra: C
 
     /**
      * Produces a new NDStructure using given initializer function.
      */
-    public fun produce(initializer: C.(IntArray) -> T): StructureND<T>
+    public fun produce(shape: Shape, initializer: C.(IntArray) -> T): StructureND<T>
 
     /**
      * Maps elements from one structure to another one by applying [transform] to them.
@@ -54,7 +56,7 @@ public interface AlgebraND<T, out C : Algebra<T>> {
     /**
      * Combines two structures into one.
      */
-    public fun combine(a: StructureND<T>, b: StructureND<T>, transform: C.(T, T) -> T): StructureND<T>
+    public fun zip(left: StructureND<T>, right: StructureND<T>, transform: C.(T, T) -> T): StructureND<T>
 
     /**
      * Element-wise invocation of function working on [T] on a [StructureND].
@@ -77,7 +79,6 @@ public interface AlgebraND<T, out C : Algebra<T>> {
     public companion object
 }
 
-
 /**
  * Get a feature of the structure in this scope. Structure features take precedence other context features.
  *
@@ -89,37 +90,13 @@ public interface AlgebraND<T, out C : Algebra<T>> {
 public inline fun <T : Any, reified F : StructureFeature> AlgebraND<T, *>.getFeature(structure: StructureND<T>): F? =
     getFeature(structure, F::class)
 
-/**
- * Checks if given elements are consistent with this context.
- *
- * @param structures the structures to check.
- * @return the array of valid structures.
- */
-internal fun <T, C : Algebra<T>> AlgebraND<T, C>.checkShape(vararg structures: StructureND<T>): Array<out StructureND<T>> =
-    structures
-        .map(StructureND<T>::shape)
-        .singleOrNull { !shape.contentEquals(it) }
-        ?.let<IntArray, Array<out StructureND<T>>> { throw ShapeMismatchException(shape, it) }
-        ?: structures
-
-/**
- * Checks if given element is consistent with this context.
- *
- * @param element the structure to check.
- * @return the valid structure.
- */
-internal fun <T, C : Algebra<T>> AlgebraND<T, C>.checkShape(element: StructureND<T>): StructureND<T> {
-    if (!element.shape.contentEquals(shape)) throw ShapeMismatchException(shape, element.shape)
-    return element
-}
-
 /**
  * Space of [StructureND].
  *
  * @param T the type of the element contained in ND structure.
- * @param S the type of group over structure elements.
+ * @param A the type of group over structure elements.
  */
-public interface GroupND<T, out S : Group<T>> : Group<StructureND<T>>, AlgebraND<T, S> {
+public interface GroupOpsND<T, out A : GroupOps<T>> : GroupOps<StructureND<T>>, AlgebraND<T, A> {
     /**
      * Element-wise addition.
      *
@@ -128,7 +105,7 @@ public interface GroupND<T, out S : Group<T>> : Group<StructureND<T>>, AlgebraND
      * @return the sum.
      */
     override fun add(a: StructureND<T>, b: StructureND<T>): StructureND<T> =
-        combine(a, b) { aValue, bValue -> add(aValue, bValue) }
+        zip(a, b) { aValue, bValue -> add(aValue, bValue) }
 
     // TODO move to extensions after KEEP-176
 
@@ -171,13 +148,17 @@ public interface GroupND<T, out S : Group<T>> : Group<StructureND<T>>, AlgebraND
     public companion object
 }
 
+public interface GroupND<T, out A : Group<T>> : Group<StructureND<T>>, GroupOpsND<T, A>, WithShape {
+    override val zero: StructureND<T> get() = produce(shape) { elementAlgebra.zero }
+}
+
 /**
  * Ring of [StructureND].
  *
  * @param T the type of the element contained in ND structure.
- * @param R the type of ring over structure elements.
+ * @param A the type of ring over structure elements.
  */
-public interface RingND<T, out R : Ring<T>> : Ring<StructureND<T>>, GroupND<T, R> {
+public interface RingOpsND<T, out A : RingOps<T>> : RingOps<StructureND<T>>, GroupOpsND<T, A> {
     /**
      * Element-wise multiplication.
      *
@@ -186,7 +167,7 @@ public interface RingND<T, out R : Ring<T>> : Ring<StructureND<T>>, GroupND<T, R
      * @return the product.
      */
     override fun multiply(a: StructureND<T>, b: StructureND<T>): StructureND<T> =
-        combine(a, b) { aValue, bValue -> multiply(aValue, bValue) }
+        zip(a, b) { aValue, bValue -> multiply(aValue, bValue) }
 
     //TODO move to extensions after KEEP-176
 
@@ -211,13 +192,19 @@ public interface RingND<T, out R : Ring<T>> : Ring<StructureND<T>>, GroupND<T, R
     public companion object
 }
 
+public interface RingND<T, out A : Ring<T>> : Ring<StructureND<T>>, RingOpsND<T, A>, GroupND<T, A>, WithShape {
+    override val one: StructureND<T> get() = produce(shape) { elementAlgebra.one }
+}
+
+
 /**
  * Field of [StructureND].
  *
  * @param T the type of the element contained in ND structure.
- * @param F the type field over structure elements.
+ * @param A the type field over structure elements.
  */
-public interface FieldND<T, out F : Field<T>> : Field<StructureND<T>>, RingND<T, F> {
+public interface FieldOpsND<T, out A : Field<T>> : FieldOps<StructureND<T>>, RingOpsND<T, A>,
+    ScaleOperations<StructureND<T>> {
     /**
      * Element-wise division.
      *
@@ -226,9 +213,9 @@ public interface FieldND<T, out F : Field<T>> : Field<StructureND<T>>, RingND<T,
      * @return the quotient.
      */
     override fun divide(a: StructureND<T>, b: StructureND<T>): StructureND<T> =
-        combine(a, b) { aValue, bValue -> divide(aValue, bValue) }
+        zip(a, b) { aValue, bValue -> divide(aValue, bValue) }
 
-    //TODO move to extensions after KEEP-176
+    //TODO move to extensions after https://github.com/Kotlin/KEEP/blob/master/proposals/context-receivers.md
     /**
      * Divides an ND structure by an element of it.
      *
@@ -247,42 +234,9 @@ public interface FieldND<T, out F : Field<T>> : Field<StructureND<T>>, RingND<T,
      */
     public operator fun T.div(arg: StructureND<T>): StructureND<T> = arg.map { divide(it, this@div) }
 
-    /**
-     * Element-wise scaling.
-     *
-     * @param a the multiplicand.
-     * @param value the multiplier.
-     * @return the product.
-     */
     override fun scale(a: StructureND<T>, value: Double): StructureND<T> = a.map { scale(it, value) }
-
-//    @ThreadLocal
-//    public companion object {
-//        private val realNDFieldCache: MutableMap<IntArray, RealNDField> = hashMapOf()
-//
-//        /**
-//         * Create a nd-field for [Double] values or pull it from cache if it was created previously.
-//         */
-//        public fun real(vararg shape: Int): RealNDField = realNDFieldCache.getOrPut(shape) { RealNDField(shape) }
-//
-//        /**
-//         * Create an ND field with boxing generic buffer.
-//         */
-//        public fun <T : Any, F : Field<T>> boxing(
-//            field: F,
-//            vararg shape: Int,
-//            bufferFactory: BufferFactory<T> = Buffer.Companion::boxing,
-//        ): BufferedNDField<T, F> = BufferedNDField(shape, field, bufferFactory)
-//
-//        /**
-//         * Create a most suitable implementation for nd-field using reified class.
-//         */
-//        @Suppress("UNCHECKED_CAST")
-//        public inline fun <reified T : Any, F : Field<T>> auto(field: F, vararg shape: Int): NDField<T, F> =
-//            when {
-//                T::class == Double::class -> real(*shape) as NDField<T, F>
-//                T::class == Complex::class -> complex(*shape) as BufferedNDField<T, F>
-//                else -> BoxingNDField(shape, field, Buffer.Companion::auto)
-//            }
-//    }
 }
+
+public interface FieldND<T, out A : Field<T>> : Field<StructureND<T>>, FieldOpsND<T, A>, RingND<T, A>, WithShape {
+    override val one: StructureND<T> get() = produce(shape) { elementAlgebra.one }
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index ae72f3689..06534c5e5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -3,145 +3,173 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
+@file:OptIn(UnstableKMathAPI::class)
+
 package space.kscience.kmath.nd
 
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
-import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.jvm.JvmName
 
 public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
-    public val strides: Strides
-    public val bufferFactory: BufferFactory<T>
+    public val indexerBuilder: (IntArray) -> ShapeIndex
+    public val bufferAlgebra: BufferAlgebra<T, A>
+    override val elementAlgebra: A get() = bufferAlgebra.elementAlgebra
 
-    override fun produce(initializer: A.(IntArray) -> T): BufferND<T> = BufferND(
-        strides,
-        bufferFactory(strides.linearSize) { offset ->
-            elementContext.initializer(strides.index(offset))
+    override fun produce(shape: Shape, initializer: A.(IntArray) -> T): BufferND<T> {
+        val indexer = indexerBuilder(shape)
+        return BufferND(
+            indexer,
+            bufferAlgebra.buffer(indexer.linearSize) { offset ->
+                elementAlgebra.initializer(indexer.index(offset))
+            }
+        )
+    }
+
+    public fun StructureND<T>.toBufferND(): BufferND<T> = when (this) {
+        is BufferND -> this
+        else -> {
+            val indexer = indexerBuilder(shape)
+            BufferND(indexer, bufferAlgebra.buffer(indexer.linearSize) { offset -> get(indexer.index(offset)) })
+        }
+    }
+
+    override fun StructureND<T>.map(transform: A.(T) -> T): BufferND<T> = mapInline(toBufferND(), transform)
+
+    override fun StructureND<T>.mapIndexed(transform: A.(index: IntArray, T) -> T): BufferND<T> =
+        mapIndexedInline(toBufferND(), transform)
+
+    override fun zip(left: StructureND<T>, right: StructureND<T>, transform: A.(T, T) -> T): BufferND<T> =
+        zipInline(left.toBufferND(), right.toBufferND(), transform)
+
+    public companion object {
+        public val defaultIndexerBuilder: (IntArray) -> ShapeIndex = DefaultStrides.Companion::invoke
+    }
+}
+
+public inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.mapInline(
+    arg: BufferND<T>,
+    crossinline transform: A.(T) -> T
+): BufferND<T> {
+    val indexes = arg.indexes
+    return BufferND(indexes, bufferAlgebra.mapInline(arg.buffer, transform))
+}
+
+internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.mapIndexedInline(
+    arg: BufferND<T>,
+    crossinline transform: A.(index: IntArray, arg: T) -> T
+): BufferND<T> {
+    val indexes = arg.indexes
+    return BufferND(
+        indexes,
+        bufferAlgebra.mapIndexedInline(arg.buffer) { offset, value ->
+            transform(indexes.index(offset), value)
         }
     )
-
-    public val StructureND<T>.buffer: Buffer<T>
-        get() = when {
-            !shape.contentEquals(this@BufferAlgebraND.shape) -> throw ShapeMismatchException(
-                this@BufferAlgebraND.shape,
-                shape
-            )
-            this is BufferND && this.strides == this@BufferAlgebraND.strides -> this.buffer
-            else -> bufferFactory(strides.linearSize) { offset -> get(strides.index(offset)) }
-        }
-
-    override fun StructureND<T>.map(transform: A.(T) -> T): BufferND<T> {
-        val buffer = bufferFactory(strides.linearSize) { offset ->
-            elementContext.transform(buffer[offset])
-        }
-        return BufferND(strides, buffer)
-    }
-
-    override fun StructureND<T>.mapIndexed(transform: A.(index: IntArray, T) -> T): BufferND<T> {
-        val buffer = bufferFactory(strides.linearSize) { offset ->
-            elementContext.transform(
-                strides.index(offset),
-                buffer[offset]
-            )
-        }
-        return BufferND(strides, buffer)
-    }
-
-    override fun combine(a: StructureND<T>, b: StructureND<T>, transform: A.(T, T) -> T): BufferND<T> {
-        val buffer = bufferFactory(strides.linearSize) { offset ->
-            elementContext.transform(a.buffer[offset], b.buffer[offset])
-        }
-        return BufferND(strides, buffer)
-    }
 }
 
-public open class BufferedGroupND<T, out A : Group<T>>(
-    final override val shape: IntArray,
-    final override val elementContext: A,
-    final override val bufferFactory: BufferFactory<T>,
-) : GroupND<T, A>, BufferAlgebraND<T, A> {
-    override val strides: Strides = DefaultStrides(shape)
-    override val zero: BufferND<T> by lazy { produce { zero } }
-    override fun StructureND<T>.unaryMinus(): StructureND<T> = produce { -get(it) }
+internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.zipInline(
+    l: BufferND<T>,
+    r: BufferND<T>,
+    crossinline block: A.(l: T, r: T) -> T
+): BufferND<T> {
+    require(l.indexes == r.indexes)
+    val indexes = l.indexes
+    return BufferND(indexes, bufferAlgebra.zipInline(l.buffer, r.buffer, block))
 }
 
-public open class BufferedRingND<T, out R : Ring<T>>(
-    shape: IntArray,
-    elementContext: R,
-    bufferFactory: BufferFactory<T>,
-) : BufferedGroupND<T, R>(shape, elementContext, bufferFactory), RingND<T, R> {
-    override val one: BufferND<T> by lazy { produce { one } }
+public open class BufferedGroupNDOps<T, out A : Group<T>>(
+    override val bufferAlgebra: BufferAlgebra<T, A>,
+    override val indexerBuilder: (IntArray) -> ShapeIndex = BufferAlgebraND.defaultIndexerBuilder
+) : GroupOpsND<T, A>, BufferAlgebraND<T, A> {
+    override fun StructureND<T>.unaryMinus(): StructureND<T> = map { -it }
 }
 
-public open class BufferedFieldND<T, out R : Field<T>>(
-    shape: IntArray,
-    elementContext: R,
-    bufferFactory: BufferFactory<T>,
-) : BufferedRingND<T, R>(shape, elementContext, bufferFactory), FieldND<T, R> {
+public open class BufferedRingOpsND<T, out A : Ring<T>>(
+    bufferAlgebra: BufferAlgebra<T, A>,
+    indexerBuilder: (IntArray) -> ShapeIndex = BufferAlgebraND.defaultIndexerBuilder
+) : BufferedGroupNDOps<T, A>(bufferAlgebra, indexerBuilder), RingOpsND<T, A>
+
+public open class BufferedFieldOpsND<T, out A : Field<T>>(
+    bufferAlgebra: BufferAlgebra<T, A>,
+    indexerBuilder: (IntArray) -> ShapeIndex = BufferAlgebraND.defaultIndexerBuilder
+) : BufferedRingOpsND<T, A>(bufferAlgebra, indexerBuilder), FieldOpsND<T, A> {
+
+    public constructor(
+        elementAlgebra: A,
+        bufferFactory: BufferFactory<T>,
+        indexerBuilder: (IntArray) -> ShapeIndex = BufferAlgebraND.defaultIndexerBuilder
+    ) : this(BufferFieldOps(elementAlgebra, bufferFactory), indexerBuilder)
 
     override fun scale(a: StructureND<T>, value: Double): StructureND<T> = a.map { it * value }
 }
 
-// group factories
-public fun <T, A : Group<T>> A.ndAlgebra(
-    bufferFactory: BufferFactory<T>,
-    vararg shape: Int,
-): BufferedGroupND<T, A> = BufferedGroupND(shape, this, bufferFactory)
+public val <T, A : Group<T>> BufferAlgebra<T, A>.nd: BufferedGroupNDOps<T, A> get() = BufferedGroupNDOps(this)
+public val <T, A : Ring<T>> BufferAlgebra<T, A>.nd: BufferedRingOpsND<T, A> get() = BufferedRingOpsND(this)
+public val <T, A : Field<T>> BufferAlgebra<T, A>.nd: BufferedFieldOpsND<T, A> get() = BufferedFieldOpsND(this)
 
-@JvmName("withNdGroup")
-public inline fun <T, A : Group<T>, R> A.withNdAlgebra(
-    noinline bufferFactory: BufferFactory<T>,
-    vararg shape: Int,
-    action: BufferedGroupND<T, A>.() -> R,
-): R {
-    contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return ndAlgebra(bufferFactory, *shape).run(action)
-}
 
-//ring factories
-public fun <T, A : Ring<T>> A.ndAlgebra(
-    bufferFactory: BufferFactory<T>,
+public fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.produce(
     vararg shape: Int,
-): BufferedRingND<T, A> = BufferedRingND(shape, this, bufferFactory)
+    initializer: A.(IntArray) -> T
+): BufferND<T> = produce(shape, initializer)
 
-@JvmName("withNdRing")
-public inline fun <T, A : Ring<T>, R> A.withNdAlgebra(
-    noinline bufferFactory: BufferFactory<T>,
-    vararg shape: Int,
-    action: BufferedRingND<T, A>.() -> R,
-): R {
-    contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return ndAlgebra(bufferFactory, *shape).run(action)
-}
+//// group factories
+//public fun <T, A : Group<T>> A.ndAlgebra(
+//    bufferAlgebra: BufferAlgebra<T, A>,
+//    vararg shape: Int,
+//): BufferedGroupNDOps<T, A> = BufferedGroupNDOps(bufferAlgebra)
+//
+//@JvmName("withNdGroup")
+//public inline fun <T, A : Group<T>, R> A.withNdAlgebra(
+//    noinline bufferFactory: BufferFactory<T>,
+//    vararg shape: Int,
+//    action: BufferedGroupNDOps<T, A>.() -> R,
+//): R {
+//    contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
+//    return ndAlgebra(bufferFactory, *shape).run(action)
+//}
 
-//field factories
-public fun <T, A : Field<T>> A.ndAlgebra(
-    bufferFactory: BufferFactory<T>,
-    vararg shape: Int,
-): BufferedFieldND<T, A> = BufferedFieldND(shape, this, bufferFactory)
-
-/**
- * Create a [FieldND] for this [Field] inferring proper buffer factory from the type
- */
-@UnstableKMathAPI
-@Suppress("UNCHECKED_CAST")
-public inline fun <reified T : Any, A : Field<T>> A.autoNdAlgebra(
-    vararg shape: Int,
-): FieldND<T, A> = when (this) {
-    DoubleField -> DoubleFieldND(shape) as FieldND<T, A>
-    else -> BufferedFieldND(shape, this, Buffer.Companion::auto)
-}
-
-@JvmName("withNdField")
-public inline fun <T, A : Field<T>, R> A.withNdAlgebra(
-    noinline bufferFactory: BufferFactory<T>,
-    vararg shape: Int,
-    action: BufferedFieldND<T, A>.() -> R,
-): R {
-    contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return ndAlgebra(bufferFactory, *shape).run(action)
-}
\ No newline at end of file
+////ring factories
+//public fun <T, A : Ring<T>> A.ndAlgebra(
+//    bufferFactory: BufferFactory<T>,
+//    vararg shape: Int,
+//): BufferedRingNDOps<T, A> = BufferedRingNDOps(shape, this, bufferFactory)
+//
+//@JvmName("withNdRing")
+//public inline fun <T, A : Ring<T>, R> A.withNdAlgebra(
+//    noinline bufferFactory: BufferFactory<T>,
+//    vararg shape: Int,
+//    action: BufferedRingNDOps<T, A>.() -> R,
+//): R {
+//    contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
+//    return ndAlgebra(bufferFactory, *shape).run(action)
+//}
+//
+////field factories
+//public fun <T, A : Field<T>> A.ndAlgebra(
+//    bufferFactory: BufferFactory<T>,
+//    vararg shape: Int,
+//): BufferedFieldNDOps<T, A> = BufferedFieldNDOps(shape, this, bufferFactory)
+//
+///**
+// * Create a [FieldND] for this [Field] inferring proper buffer factory from the type
+// */
+//@UnstableKMathAPI
+//@Suppress("UNCHECKED_CAST")
+//public inline fun <reified T : Any, A : Field<T>> A.autoNdAlgebra(
+//    vararg shape: Int,
+//): FieldND<T, A> = when (this) {
+//    DoubleField -> DoubleFieldND(shape) as FieldND<T, A>
+//    else -> BufferedFieldNDOps(shape, this, Buffer.Companion::auto)
+//}
+//
+//@JvmName("withNdField")
+//public inline fun <T, A : Field<T>, R> A.withNdAlgebra(
+//    noinline bufferFactory: BufferFactory<T>,
+//    vararg shape: Int,
+//    action: BufferedFieldNDOps<T, A>.() -> R,
+//): R {
+//    contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
+//    return ndAlgebra(bufferFactory, *shape).run(action)
+//}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 694e0ceae..9eba401ab 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -15,26 +15,20 @@ import space.kscience.kmath.structures.MutableBufferFactory
  * Represents [StructureND] over [Buffer].
  *
  * @param T the type of items.
- * @param strides The strides to access elements of [Buffer] by linear indices.
+ * @param indexes The strides to access elements of [Buffer] by linear indices.
  * @param buffer The underlying buffer.
  */
 public open class BufferND<out T>(
-    public val strides: Strides,
+    public val indexes: ShapeIndex,
     public val buffer: Buffer<T>,
 ) : StructureND<T> {
 
-    init {
-        if (strides.linearSize != buffer.size) {
-            error("Expected buffer side of ${strides.linearSize}, but found ${buffer.size}")
-        }
-    }
+    override operator fun get(index: IntArray): T = buffer[indexes.offset(index)]
 
-    override operator fun get(index: IntArray): T = buffer[strides.offset(index)]
-
-    override val shape: IntArray get() = strides.shape
+    override val shape: IntArray get() = indexes.shape
 
     @PerformancePitfall
-    override fun elements(): Sequence<Pair<IntArray, T>> = strides.indices().map {
+    override fun elements(): Sequence<Pair<IntArray, T>> = indexes.indices().map {
         it to this[it]
     }
 
@@ -49,7 +43,7 @@ public inline fun <T, reified R : Any> StructureND<T>.mapToBuffer(
     crossinline transform: (T) -> R,
 ): BufferND<R> {
     return if (this is BufferND<T>)
-        BufferND(this.strides, factory.invoke(strides.linearSize) { transform(buffer[it]) })
+        BufferND(this.indexes, factory.invoke(indexes.linearSize) { transform(buffer[it]) })
     else {
         val strides = DefaultStrides(shape)
         BufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
@@ -64,11 +58,11 @@ public inline fun <T, reified R : Any> StructureND<T>.mapToBuffer(
  * @param mutableBuffer The underlying buffer.
  */
 public class MutableBufferND<T>(
-    strides: Strides,
+    strides: ShapeIndex,
     public val mutableBuffer: MutableBuffer<T>,
 ) : MutableStructureND<T>, BufferND<T>(strides, mutableBuffer) {
     override fun set(index: IntArray, value: T) {
-        mutableBuffer[strides.offset(index)] = value
+        mutableBuffer[indexes.offset(index)] = value
     }
 }
 
@@ -80,7 +74,7 @@ public inline fun <T, reified R : Any> MutableStructureND<T>.mapToMutableBuffer(
     crossinline transform: (T) -> R,
 ): MutableBufferND<R> {
     return if (this is MutableBufferND<T>)
-        MutableBufferND(this.strides, factory.invoke(strides.linearSize) { transform(mutableBuffer[it]) })
+        MutableBufferND(this.indexes, factory.invoke(indexes.linearSize) { transform(mutableBuffer[it]) })
     else {
         val strides = DefaultStrides(shape)
         MutableBufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 0c7d4d5d1..294c44ec4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -6,108 +6,68 @@
 package space.kscience.kmath.nd
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.ExtendedField
-import space.kscience.kmath.operations.NumbersAddOperations
-import space.kscience.kmath.operations.ScaleOperations
+import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 
-@OptIn(UnstableKMathAPI::class)
-public class DoubleFieldND(
-    shape: IntArray,
-) : BufferedFieldND<Double, DoubleField>(shape, DoubleField, ::DoubleBuffer),
-    NumbersAddOperations<StructureND<Double>>,
-    ScaleOperations<StructureND<Double>>,
-    ExtendedField<StructureND<Double>> {
+public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(DoubleField.bufferAlgebra),
+    ScaleOperations<StructureND<Double>>, ExtendedFieldOps<StructureND<Double>> {
 
-    override val zero: BufferND<Double> by lazy { produce { zero } }
-    override val one: BufferND<Double> by lazy { produce { one } }
+    override fun StructureND<Double>.toBufferND(): BufferND<Double> = when (this) {
+        is BufferND -> this
+        else -> {
+            val indexer = indexerBuilder(shape)
+            BufferND(indexer, DoubleBuffer(indexer.linearSize) { offset -> get(indexer.index(offset)) })
+        }
+    }
+
+    //TODO do specialization
+
+    override fun scale(a: StructureND<Double>, value: Double): BufferND<Double> =
+        mapInline(a.toBufferND()) { it * value }
+
+    override fun power(arg: StructureND<Double>, pow: Number): BufferND<Double> =
+        mapInline(arg.toBufferND()) { power(it, pow) }
+
+    override fun exp(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { exp(it) }
+    override fun ln(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { ln(it) }
+
+    override fun sin(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { sin(it) }
+    override fun cos(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { cos(it) }
+    override fun tan(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { tan(it) }
+    override fun asin(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { asin(it) }
+    override fun acos(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { acos(it) }
+    override fun atan(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { atan(it) }
+
+    override fun sinh(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { sinh(it) }
+    override fun cosh(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { cosh(it) }
+    override fun tanh(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { tanh(it) }
+    override fun asinh(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { asinh(it) }
+    override fun acosh(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { acosh(it) }
+    override fun atanh(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { atanh(it) }
+
+    public companion object : DoubleFieldOpsND()
+}
+
+@OptIn(UnstableKMathAPI::class)
+public class DoubleFieldND(override val shape: Shape) :
+    DoubleFieldOpsND(), FieldND<Double, DoubleField>, NumbersAddOps<StructureND<Double>> {
 
     override fun number(value: Number): BufferND<Double> {
         val d = value.toDouble() // minimize conversions
-        return produce { d }
+        return produce(shape) { d }
     }
-
-    override val StructureND<Double>.buffer: DoubleBuffer
-        get() = when {
-            !shape.contentEquals(this@DoubleFieldND.shape) -> throw ShapeMismatchException(
-                this@DoubleFieldND.shape,
-                shape
-            )
-            this is BufferND && this.strides == this@DoubleFieldND.strides -> this.buffer as DoubleBuffer
-            else -> DoubleBuffer(strides.linearSize) { offset -> get(strides.index(offset)) }
-        }
-
-    @Suppress("OVERRIDE_BY_INLINE")
-    override inline fun StructureND<Double>.map(
-        transform: DoubleField.(Double) -> Double,
-    ): BufferND<Double> {
-        val buffer = DoubleBuffer(strides.linearSize) { offset -> DoubleField.transform(buffer.array[offset]) }
-        return BufferND(strides, buffer)
-    }
-
-    @Suppress("OVERRIDE_BY_INLINE")
-    override inline fun produce(initializer: DoubleField.(IntArray) -> Double): BufferND<Double> {
-        val array = DoubleArray(strides.linearSize) { offset ->
-            val index = strides.index(offset)
-            DoubleField.initializer(index)
-        }
-        return BufferND(strides, DoubleBuffer(array))
-    }
-
-    @Suppress("OVERRIDE_BY_INLINE")
-    override inline fun StructureND<Double>.mapIndexed(
-        transform: DoubleField.(index: IntArray, Double) -> Double,
-    ): BufferND<Double> = BufferND(
-        strides,
-        buffer = DoubleBuffer(strides.linearSize) { offset ->
-            DoubleField.transform(
-                strides.index(offset),
-                buffer.array[offset]
-            )
-        })
-
-    @Suppress("OVERRIDE_BY_INLINE")
-    override inline fun combine(
-        a: StructureND<Double>,
-        b: StructureND<Double>,
-        transform: DoubleField.(Double, Double) -> Double,
-    ): BufferND<Double> {
-        val buffer = DoubleBuffer(strides.linearSize) { offset ->
-            DoubleField.transform(a.buffer.array[offset], b.buffer.array[offset])
-        }
-        return BufferND(strides, buffer)
-    }
-
-    override fun scale(a: StructureND<Double>, value: Double): StructureND<Double> = a.map { it * value }
-
-    override fun power(arg: StructureND<Double>, pow: Number): BufferND<Double> = arg.map { power(it, pow) }
-
-    override fun exp(arg: StructureND<Double>): BufferND<Double> = arg.map { exp(it) }
-    override fun ln(arg: StructureND<Double>): BufferND<Double> = arg.map { ln(it) }
-
-    override fun sin(arg: StructureND<Double>): BufferND<Double> = arg.map { sin(it) }
-    override fun cos(arg: StructureND<Double>): BufferND<Double> = arg.map { cos(it) }
-    override fun tan(arg: StructureND<Double>): BufferND<Double> = arg.map { tan(it) }
-    override fun asin(arg: StructureND<Double>): BufferND<Double> = arg.map { asin(it) }
-    override fun acos(arg: StructureND<Double>): BufferND<Double> = arg.map { acos(it) }
-    override fun atan(arg: StructureND<Double>): BufferND<Double> = arg.map { atan(it) }
-
-    override fun sinh(arg: StructureND<Double>): BufferND<Double> = arg.map { sinh(it) }
-    override fun cosh(arg: StructureND<Double>): BufferND<Double> = arg.map { cosh(it) }
-    override fun tanh(arg: StructureND<Double>): BufferND<Double> = arg.map { tanh(it) }
-    override fun asinh(arg: StructureND<Double>): BufferND<Double> = arg.map { asinh(it) }
-    override fun acosh(arg: StructureND<Double>): BufferND<Double> = arg.map { acosh(it) }
-    override fun atanh(arg: StructureND<Double>): BufferND<Double> = arg.map { atanh(it) }
 }
 
+public val DoubleField.ndAlgebra: DoubleFieldOpsND get() = DoubleFieldOpsND
+
 public fun DoubleField.ndAlgebra(vararg shape: Int): DoubleFieldND = DoubleFieldND(shape)
 
 /**
  * Produce a context for n-dimensional operations inside this real field
  */
+@UnstableKMathAPI
 public inline fun <R> DoubleField.withNdAlgebra(vararg shape: Int, action: DoubleFieldND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
     return DoubleFieldND(shape).run(action)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndex.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndex.kt
new file mode 100644
index 000000000..bdbae70c2
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndex.kt
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.nd
+
+import kotlin.native.concurrent.ThreadLocal
+
+/**
+ * A converter from linear index to multivariate index
+ */
+public interface ShapeIndex{
+    public val shape: Shape
+
+    /**
+     * Get linear index from multidimensional index
+     */
+    public fun offset(index: IntArray): Int
+
+    /**
+     * Get multidimensional from linear
+     */
+    public fun index(offset: Int): IntArray
+
+    /**
+     * The size of linear buffer to accommodate all elements of ND-structure corresponding to strides
+     */
+    public val linearSize: Int
+
+    // TODO introduce a fast way to calculate index of the next element?
+
+    /**
+     * Iterate over ND indices in a natural order
+     */
+    public fun indices(): Sequence<IntArray>
+
+    override fun equals(other: Any?): Boolean
+    override fun hashCode(): Int
+}
+
+/**
+ * Linear transformation of indexes
+ */
+public abstract class Strides: ShapeIndex {
+    /**
+     * Array strides
+     */
+    public abstract val strides: IntArray
+
+    public override fun offset(index: IntArray): Int = index.mapIndexed { i, value ->
+        if (value < 0 || value >= shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0,${this.shape[i]})")
+        value * strides[i]
+    }.sum()
+
+    // TODO introduce a fast way to calculate index of the next element?
+
+    /**
+     * Iterate over ND indices in a natural order
+     */
+    public override fun indices(): Sequence<IntArray> = (0 until linearSize).asSequence().map(::index)
+}
+
+/**
+ * Simple implementation of [Strides].
+ */
+public class DefaultStrides private constructor(override val shape: IntArray) : Strides() {
+    override val linearSize: Int get() = strides[shape.size]
+
+    /**
+     * Strides for memory access
+     */
+    override val strides: IntArray by lazy {
+        sequence {
+            var current = 1
+            yield(1)
+
+            shape.forEach {
+                current *= it
+                yield(current)
+            }
+        }.toList().toIntArray()
+    }
+
+    override fun index(offset: Int): IntArray {
+        val res = IntArray(shape.size)
+        var current = offset
+        var strideIndex = strides.size - 2
+
+        while (strideIndex >= 0) {
+            res[strideIndex] = (current / strides[strideIndex])
+            current %= strides[strideIndex]
+            strideIndex--
+        }
+
+        return res
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is DefaultStrides) return false
+        if (!shape.contentEquals(other.shape)) return false
+        return true
+    }
+
+    override fun hashCode(): Int = shape.contentHashCode()
+
+    @ThreadLocal
+    public companion object {
+        //private val defaultStridesCache = HashMap<IntArray, Strides>()
+
+        /**
+         * Cached builder for default strides
+         */
+        public operator fun invoke(shape: IntArray): Strides = DefaultStrides(shape)
+            //defaultStridesCache.getOrPut(shape) { DefaultStrides(shape) }
+
+        //TODO fix cache
+    }
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
index b56bef230..65c1f71b4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
@@ -6,34 +6,27 @@
 package space.kscience.kmath.nd
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.NumbersAddOperations
+import space.kscience.kmath.operations.NumbersAddOps
 import space.kscience.kmath.operations.ShortRing
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.ShortBuffer
+import space.kscience.kmath.operations.bufferAlgebra
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 
+public sealed class ShortRingOpsND : BufferedRingOpsND<Short, ShortRing>(ShortRing.bufferAlgebra) {
+    public companion object : ShortRingOpsND()
+}
+
 @OptIn(UnstableKMathAPI::class)
 public class ShortRingND(
-    shape: IntArray,
-) : BufferedRingND<Short, ShortRing>(shape, ShortRing, Buffer.Companion::auto),
-    NumbersAddOperations<StructureND<Short>> {
-
-    override val zero: BufferND<Short> by lazy { produce { zero } }
-    override val one: BufferND<Short> by lazy { produce { one } }
+    override val shape: Shape
+) : ShortRingOpsND(), RingND<Short, ShortRing>, NumbersAddOps<StructureND<Short>> {
 
     override fun number(value: Number): BufferND<Short> {
         val d = value.toShort() // minimize conversions
-        return produce { d }
+        return produce(shape) { d }
     }
 }
 
-/**
- * Fast element production using function inlining.
- */
-public inline fun BufferedRingND<Short, ShortRing>.produceInline(crossinline initializer: ShortRing.(Int) -> Short): BufferND<Short> =
-    BufferND(strides, ShortBuffer(ShortArray(strides.linearSize) { offset -> ShortRing.initializer(offset) }))
-
 public inline fun <R> ShortRing.withNdAlgebra(vararg shape: Int, action: ShortRingND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
     return ShortRingND(shape).run(action)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 6123336ba..611d2724f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -15,7 +15,6 @@ import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import kotlin.jvm.JvmName
 import kotlin.math.abs
-import kotlin.native.concurrent.ThreadLocal
 import kotlin.reflect.KClass
 
 public interface StructureFeature : Feature<StructureFeature>
@@ -72,7 +71,7 @@ public interface StructureND<out T> : Featured<StructureFeature> {
             if (st1 === st2) return true
 
             // fast comparison of buffers if possible
-            if (st1 is BufferND && st2 is BufferND && st1.strides == st2.strides)
+            if (st1 is BufferND && st2 is BufferND && st1.indexes == st2.indexes)
                 return Buffer.contentEquals(st1.buffer, st2.buffer)
 
             //element by element comparison if it could not be avoided
@@ -88,7 +87,7 @@ public interface StructureND<out T> : Featured<StructureFeature> {
             if (st1 === st2) return true
 
             // fast comparison of buffers if possible
-            if (st1 is BufferND && st2 is BufferND && st1.strides == st2.strides)
+            if (st1 is BufferND && st2 is BufferND && st1.indexes == st2.indexes)
                 return Buffer.contentEquals(st1.buffer, st2.buffer)
 
             //element by element comparison if it could not be avoided
@@ -187,11 +186,11 @@ public fun <T : Comparable<T>> LinearSpace<T, Ring<T>>.contentEquals(
  * Indicates whether some [StructureND] is equal to another one with [absoluteTolerance].
  */
 @PerformancePitfall
-public fun <T : Comparable<T>> GroupND<T, Ring<T>>.contentEquals(
+public fun <T : Comparable<T>> GroupOpsND<T, Ring<T>>.contentEquals(
     st1: StructureND<T>,
     st2: StructureND<T>,
     absoluteTolerance: T,
-): Boolean = st1.elements().all { (index, value) -> elementContext { (value - st2[index]) } < absoluteTolerance }
+): Boolean = st1.elements().all { (index, value) -> elementAlgebra { (value - st2[index]) } < absoluteTolerance }
 
 /**
  * Indicates whether some [StructureND] is equal to another one with [absoluteTolerance].
@@ -231,107 +230,10 @@ public interface MutableStructureND<T> : StructureND<T> {
  * Transform a structure element-by element in place.
  */
 @OptIn(PerformancePitfall::class)
-public inline fun <T> MutableStructureND<T>.mapInPlace(action: (IntArray, T) -> T): Unit =
+public inline fun <T> MutableStructureND<T>.mapInPlace(action: (index: IntArray, t: T) -> T): Unit =
     elements().forEach { (index, oldValue) -> this[index] = action(index, oldValue) }
 
-/**
- * A way to convert ND indices to linear one and back.
- */
-public interface Strides {
-    /**
-     * Shape of NDStructure
-     */
-    public val shape: IntArray
-
-    /**
-     * Array strides
-     */
-    public val strides: IntArray
-
-    /**
-     * Get linear index from multidimensional index
-     */
-    public fun offset(index: IntArray): Int = index.mapIndexed { i, value ->
-        if (value < 0 || value >= shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0,${this.shape[i]})")
-        value * strides[i]
-    }.sum()
-
-    /**
-     * Get multidimensional from linear
-     */
-    public fun index(offset: Int): IntArray
-
-    /**
-     * The size of linear buffer to accommodate all elements of ND-structure corresponding to strides
-     */
-    public val linearSize: Int
-
-    // TODO introduce a fast way to calculate index of the next element?
-
-    /**
-     * Iterate over ND indices in a natural order
-     */
-    public fun indices(): Sequence<IntArray> = (0 until linearSize).asSequence().map(::index)
-}
-
-/**
- * Simple implementation of [Strides].
- */
-public class DefaultStrides private constructor(override val shape: IntArray) : Strides {
-    override val linearSize: Int
-        get() = strides[shape.size]
-
-    /**
-     * Strides for memory access
-     */
-    override val strides: IntArray by lazy {
-        sequence {
-            var current = 1
-            yield(1)
-
-            shape.forEach {
-                current *= it
-                yield(current)
-            }
-        }.toList().toIntArray()
-    }
-
-    override fun index(offset: Int): IntArray {
-        val res = IntArray(shape.size)
-        var current = offset
-        var strideIndex = strides.size - 2
-
-        while (strideIndex >= 0) {
-            res[strideIndex] = (current / strides[strideIndex])
-            current %= strides[strideIndex]
-            strideIndex--
-        }
-
-        return res
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is DefaultStrides) return false
-        if (!shape.contentEquals(other.shape)) return false
-        return true
-    }
-
-    override fun hashCode(): Int = shape.contentHashCode()
-
-    @ThreadLocal
-    public companion object {
-        private val defaultStridesCache = HashMap<IntArray, Strides>()
-
-        /**
-         * Cached builder for default strides
-         */
-        public operator fun invoke(shape: IntArray): Strides =
-            defaultStridesCache.getOrPut(shape) { DefaultStrides(shape) }
-    }
-}
-
-public inline fun <reified T : Any> StructureND<T>.combine(
+public inline fun <reified T : Any> StructureND<T>.zip(
     struct: StructureND<T>,
     crossinline block: (T, T) -> T,
 ): StructureND<T> {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
new file mode 100644
index 000000000..7bc18a4dd
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.nd
+
+import space.kscience.kmath.operations.Algebra
+import space.kscience.kmath.operations.Group
+import space.kscience.kmath.operations.Ring
+import kotlin.jvm.JvmName
+
+
+public fun <T, A : Algebra<T>> AlgebraND<T, A>.produce(
+    shapeFirst: Int,
+    vararg shapeRest: Int,
+    initializer: A.(IntArray) -> T
+): StructureND<T> = produce(Shape(shapeFirst, *shapeRest), initializer)
+
+public fun <T, A : Group<T>> AlgebraND<T, A>.zero(shape: Shape): StructureND<T> = produce(shape) { zero }
+
+@JvmName("zeroVarArg")
+public fun <T, A : Group<T>> AlgebraND<T, A>.zero(
+    shapeFirst: Int,
+    vararg shapeRest: Int,
+): StructureND<T> = produce(shapeFirst, *shapeRest) { zero }
+
+public fun <T, A : Ring<T>> AlgebraND<T, A>.one(shape: Shape): StructureND<T> = produce(shape) { one }
+
+@JvmName("oneVarArg")
+public fun <T, A : Ring<T>> AlgebraND<T, A>.one(
+    shapeFirst: Int,
+    vararg shapeRest: Int,
+): StructureND<T> = produce(shapeFirst, *shapeRest) { one }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index daff58d9a..d731ee4ee 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -117,7 +117,7 @@ public inline operator fun <A : Algebra<*>, R> A.invoke(block: A.() -> R): R = r
  *
  * @param T the type of element of this semispace.
  */
-public interface GroupOperations<T> : Algebra<T> {
+public interface GroupOps<T> : Algebra<T> {
     /**
      * Addition of two elements.
      *
@@ -162,7 +162,7 @@ public interface GroupOperations<T> : Algebra<T> {
      * @return the difference.
      */
     public operator fun T.minus(b: T): T = add(this, -b)
-
+    // Dynamic dispatch of operations
     override fun unaryOperationFunction(operation: String): (arg: T) -> T = when (operation) {
         PLUS_OPERATION -> { arg -> +arg }
         MINUS_OPERATION -> { arg -> -arg }
@@ -193,7 +193,7 @@ public interface GroupOperations<T> : Algebra<T> {
  *
  * @param T the type of element of this semispace.
  */
-public interface Group<T> : GroupOperations<T> {
+public interface Group<T> : GroupOps<T> {
     /**
      * The neutral element of addition.
      */
@@ -206,7 +206,7 @@ public interface Group<T> : GroupOperations<T> {
  *
  * @param T the type of element of this semiring.
  */
-public interface RingOperations<T> : GroupOperations<T> {
+public interface RingOps<T> : GroupOps<T> {
     /**
      * Multiplies two elements.
      *
@@ -242,7 +242,7 @@ public interface RingOperations<T> : GroupOperations<T> {
  *
  * @param T the type of element of this ring.
  */
-public interface Ring<T> : Group<T>, RingOperations<T> {
+public interface Ring<T> : Group<T>, RingOps<T> {
     /**
      * The neutral element of multiplication
      */
@@ -256,7 +256,7 @@ public interface Ring<T> : Group<T>, RingOperations<T> {
  *
  * @param T the type of element of this semifield.
  */
-public interface FieldOperations<T> : RingOperations<T> {
+public interface FieldOps<T> : RingOps<T> {
     /**
      * Division of two elements.
      *
@@ -295,6 +295,6 @@ public interface FieldOperations<T> : RingOperations<T> {
  *
  * @param T the type of element of this field.
  */
-public interface Field<T> : Ring<T>, FieldOperations<T>, ScaleOperations<T>, NumericAlgebra<T> {
+public interface Field<T> : Ring<T>, FieldOps<T>, ScaleOperations<T>, NumericAlgebra<T> {
     override fun number(value: Number): T = scale(one, value.toDouble())
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 82754e43d..97e35e4b0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.operations
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.BufferedRingND
+import space.kscience.kmath.nd.BufferedRingOpsND
 import space.kscience.kmath.operations.BigInt.Companion.BASE
 import space.kscience.kmath.operations.BigInt.Companion.BASE_SIZE
 import space.kscience.kmath.structures.Buffer
@@ -26,7 +26,7 @@ private typealias TBase = ULong
  * @author Peter Klimai
  */
 @OptIn(UnstableKMathAPI::class)
-public object BigIntField : Field<BigInt>, NumbersAddOperations<BigInt>, ScaleOperations<BigInt> {
+public object BigIntField : Field<BigInt>, NumbersAddOps<BigInt>, ScaleOperations<BigInt> {
     override val zero: BigInt = BigInt.ZERO
     override val one: BigInt = BigInt.ONE
 
@@ -542,5 +542,5 @@ public inline fun MutableBuffer.Companion.bigInt(size: Int, initializer: (Int) -
 public inline fun BigInt.mutableBuffer(size: Int, initializer: (Int) -> BigInt): Buffer<BigInt> =
     Buffer.boxing(size, initializer)
 
-public fun BigIntField.nd(vararg shape: Int): BufferedRingND<BigInt, BigIntField> =
-    BufferedRingND(shape, BigIntField, BigInt::buffer)
+public val BigIntField.nd: BufferedRingOpsND<BigInt, BigIntField>
+    get() = BufferedRingOpsND(BufferRingOps(BigIntField, BigInt::buffer))
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
index e82b62c1b..5a14e7734 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
@@ -5,32 +5,34 @@
 
 package space.kscience.kmath.operations
 
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.ShortBuffer
+
+public interface WithSize {
+    public val size: Int
+}
 
 /**
  * An algebra over [Buffer]
  */
-@UnstableKMathAPI
-public interface BufferAlgebra<T, A : Algebra<T>> : Algebra<Buffer<T>> {
-    public val bufferFactory: BufferFactory<T>
+public interface BufferAlgebra<T, out A : Algebra<T>> : Algebra<Buffer<T>> {
     public val elementAlgebra: A
-    public val size: Int
+    public val bufferFactory: BufferFactory<T>
 
-    public fun buffer(vararg elements: T): Buffer<T> {
+    public fun buffer(size: Int, vararg elements: T): Buffer<T> {
         require(elements.size == size) { "Expected $size elements but found ${elements.size}" }
         return bufferFactory(size) { elements[it] }
     }
 
     //TODO move to multi-receiver inline extension
-    public fun Buffer<T>.map(block: (T) -> T): Buffer<T> = bufferFactory(size) { block(get(it)) }
+    public fun Buffer<T>.map(block: A.(T) -> T): Buffer<T> = mapInline(this, block)
 
-    public fun Buffer<T>.zip(other: Buffer<T>, block: (left: T, right: T) -> T): Buffer<T> {
-        require(size == other.size) { "Incompatible buffer sizes. left: $size, right: ${other.size}" }
-        return bufferFactory(size) { block(this[it], other[it]) }
-    }
+    public fun Buffer<T>.mapIndexed(block: A.(index: Int, arg: T) -> T): Buffer<T> = mapIndexedInline(this, block)
+
+    public fun Buffer<T>.zip(other: Buffer<T>, block: A.(left: T, right: T) -> T): Buffer<T> =
+        zipInline(this, other, block)
 
     override fun unaryOperationFunction(operation: String): (arg: Buffer<T>) -> Buffer<T> {
         val operationFunction = elementAlgebra.unaryOperationFunction(operation)
@@ -45,112 +47,149 @@ public interface BufferAlgebra<T, A : Algebra<T>> : Algebra<Buffer<T>> {
     }
 }
 
-@UnstableKMathAPI
-public fun <T> BufferField<T, *>.buffer(initializer: (Int) -> T): Buffer<T> {
+/**
+ * Inline map
+ */
+public inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapInline(
+    buffer: Buffer<T>,
+    crossinline block: A.(T) -> T
+): Buffer<T> = bufferFactory(buffer.size) { elementAlgebra.block(buffer[it]) }
+
+/**
+ * Inline map
+ */
+public inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapIndexedInline(
+    buffer: Buffer<T>,
+    crossinline block: A.(index: Int, arg: T) -> T
+): Buffer<T> = bufferFactory(buffer.size) { elementAlgebra.block(it, buffer[it]) }
+
+/**
+ * Inline zip
+ */
+public inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.zipInline(
+    l: Buffer<T>,
+    r: Buffer<T>,
+    crossinline block: A.(l: T, r: T) -> T
+): Buffer<T> {
+    require(l.size == r.size) { "Incompatible buffer sizes. left: ${l.size}, right: ${r.size}" }
+    return bufferFactory(l.size) { elementAlgebra.block(l[it], r[it]) }
+}
+
+public fun <T> BufferAlgebra<T, *>.buffer(size: Int, initializer: (Int) -> T): Buffer<T> {
+    return bufferFactory(size, initializer)
+}
+
+public fun <T, A> A.buffer(initializer: (Int) -> T): Buffer<T> where A : BufferAlgebra<T, *>, A : WithSize {
     return bufferFactory(size, initializer)
 }
 
-@UnstableKMathAPI
 public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.sin(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::sin)
+    mapInline(arg) { sin(it) }
 
-@UnstableKMathAPI
 public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.cos(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::cos)
+    mapInline(arg) { cos(it) }
 
-@UnstableKMathAPI
 public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.tan(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::tan)
+    mapInline(arg) { tan(it) }
 
-@UnstableKMathAPI
 public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.asin(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::asin)
+    mapInline(arg) { asin(it) }
 
-@UnstableKMathAPI
 public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.acos(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::acos)
+    mapInline(arg) { acos(it) }
 
-@UnstableKMathAPI
 public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.atan(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::atan)
+    mapInline(arg) { atan(it) }
 
-@UnstableKMathAPI
 public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.exp(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::exp)
+    mapInline(arg) { exp(it) }
 
-@UnstableKMathAPI
 public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.ln(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::ln)
+    mapInline(arg) { ln(it) }
 
-@UnstableKMathAPI
 public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.sinh(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::sinh)
+    mapInline(arg) { sinh(it) }
 
-@UnstableKMathAPI
 public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.cosh(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::cosh)
+    mapInline(arg) { cosh(it) }
 
-@UnstableKMathAPI
 public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.tanh(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::tanh)
+    mapInline(arg) { tanh(it) }
 
-@UnstableKMathAPI
 public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.asinh(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::asinh)
+    mapInline(arg) { asinh(it) }
 
-@UnstableKMathAPI
 public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.acosh(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::acosh)
+    mapInline(arg) { acosh(it) }
 
-@UnstableKMathAPI
 public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.atanh(arg: Buffer<T>): Buffer<T> =
-    arg.map(elementAlgebra::atanh)
+    mapInline(arg) { atanh(it) }
 
-@UnstableKMathAPI
 public fun <T, A : PowerOperations<T>> BufferAlgebra<T, A>.pow(arg: Buffer<T>, pow: Number): Buffer<T> =
-    with(elementAlgebra) { arg.map { power(it, pow) } }
+    mapInline(arg) { power(it, pow) }
 
 
-@UnstableKMathAPI
-public class BufferField<T, A : Field<T>>(
-    override val bufferFactory: BufferFactory<T>,
+public open class BufferRingOps<T, A: Ring<T>>(
     override val elementAlgebra: A,
+    override val bufferFactory: BufferFactory<T>,
+) : BufferAlgebra<T, A>, RingOps<Buffer<T>>{
+
+    override fun add(a: Buffer<T>, b: Buffer<T>): Buffer<T> = zipInline(a, b) { l, r -> l + r }
+    override fun multiply(a: Buffer<T>, b: Buffer<T>): Buffer<T> = zipInline(a, b) { l, r -> l * r }
+    override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
+
+    override fun unaryOperationFunction(operation: String): (arg: Buffer<T>) -> Buffer<T> =
+        super<BufferAlgebra>.unaryOperationFunction(operation)
+
+    override fun binaryOperationFunction(operation: String): (left: Buffer<T>, right: Buffer<T>) -> Buffer<T> =
+        super<BufferAlgebra>.binaryOperationFunction(operation)
+}
+
+public val ShortRing.bufferAlgebra: BufferRingOps<Short, ShortRing>
+    get() = BufferRingOps(ShortRing, ::ShortBuffer)
+
+public open class BufferFieldOps<T, A : Field<T>>(
+    elementAlgebra: A,
+    bufferFactory: BufferFactory<T>,
+) : BufferRingOps<T, A>(elementAlgebra, bufferFactory), BufferAlgebra<T, A>, FieldOps<Buffer<T>>, ScaleOperations<Buffer<T>> {
+
+    override fun add(a: Buffer<T>, b: Buffer<T>): Buffer<T> = zipInline(a, b) { l, r -> l + r }
+    override fun multiply(a: Buffer<T>, b: Buffer<T>): Buffer<T> = zipInline(a, b) { l, r -> l * r }
+    override fun divide(a: Buffer<T>, b: Buffer<T>): Buffer<T> = zipInline(a, b) { l, r -> l / r }
+
+    override fun scale(a: Buffer<T>, value: Double): Buffer<T> = a.map { scale(it, value) }
+    override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
+
+    override fun binaryOperationFunction(operation: String): (left: Buffer<T>, right: Buffer<T>) -> Buffer<T> =
+        super<BufferRingOps>.binaryOperationFunction(operation)
+}
+
+public class BufferField<T, A : Field<T>>(
+    elementAlgebra: A,
+    bufferFactory: BufferFactory<T>,
     override val size: Int
-) : BufferAlgebra<T, A>, Field<Buffer<T>> {
+) : BufferFieldOps<T, A>(elementAlgebra, bufferFactory), Field<Buffer<T>>, WithSize {
 
     override val zero: Buffer<T> = bufferFactory(size) { elementAlgebra.zero }
     override val one: Buffer<T> = bufferFactory(size) { elementAlgebra.one }
-
-
-    override fun add(a: Buffer<T>, b: Buffer<T>): Buffer<T> = a.zip(b, elementAlgebra::add)
-    override fun multiply(a: Buffer<T>, b: Buffer<T>): Buffer<T> = a.zip(b, elementAlgebra::multiply)
-    override fun divide(a: Buffer<T>, b: Buffer<T>): Buffer<T> = a.zip(b, elementAlgebra::divide)
-
-    override fun scale(a: Buffer<T>, value: Double): Buffer<T> = with(elementAlgebra) { a.map { scale(it, value) } }
-    override fun Buffer<T>.unaryMinus(): Buffer<T> = with(elementAlgebra) { map { -it } }
-
-    override fun unaryOperationFunction(operation: String): (arg: Buffer<T>) -> Buffer<T> {
-        return super<BufferAlgebra>.unaryOperationFunction(operation)
-    }
-
-    override fun binaryOperationFunction(operation: String): (left: Buffer<T>, right: Buffer<T>) -> Buffer<T> {
-        return super<BufferAlgebra>.binaryOperationFunction(operation)
-    }
 }
 
+/**
+ * Generate full buffer field from given buffer operations
+ */
+public fun <T, A : Field<T>> BufferFieldOps<T, A>.withSize(size: Int): BufferField<T, A> =
+    BufferField(elementAlgebra, bufferFactory, size)
+
 //Double buffer specialization
 
-@UnstableKMathAPI
 public fun BufferField<Double, *>.buffer(vararg elements: Number): Buffer<Double> {
     require(elements.size == size) { "Expected $size elements but found ${elements.size}" }
     return bufferFactory(size) { elements[it].toDouble() }
 }
 
-@UnstableKMathAPI
-public fun <T, A : Field<T>> A.bufferAlgebra(bufferFactory: BufferFactory<T>, size: Int): BufferField<T, A> =
-    BufferField(bufferFactory, this, size)
+public fun <T, A : Field<T>> A.bufferAlgebra(bufferFactory: BufferFactory<T>): BufferFieldOps<T, A> =
+    BufferFieldOps(this, bufferFactory)
 
-@UnstableKMathAPI
-public fun DoubleField.bufferAlgebra(size: Int): BufferField<Double, DoubleField> =
-    BufferField(::DoubleBuffer, DoubleField, size)
+public val DoubleField.bufferAlgebra: BufferFieldOps<Double, DoubleField>
+    get() = BufferFieldOps(DoubleField, ::DoubleBuffer)
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
index acc2c2dc0..060ea5a7e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
@@ -13,21 +13,21 @@ import space.kscience.kmath.structures.DoubleBuffer
  *
  * @property size the size of buffers to operate on.
  */
-public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Double>>, DoubleBufferOperations() {
+public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Double>>, DoubleBufferOps() {
     override val zero: Buffer<Double> by lazy { DoubleBuffer(size) { 0.0 } }
     override val one: Buffer<Double> by lazy { DoubleBuffer(size) { 1.0 } }
 
-    override fun sinh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOperations>.sinh(arg)
+    override fun sinh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOps>.sinh(arg)
 
-    override fun cosh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOperations>.cosh(arg)
+    override fun cosh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOps>.cosh(arg)
 
-    override fun tanh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOperations>.tanh(arg)
+    override fun tanh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOps>.tanh(arg)
 
-    override fun asinh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOperations>.asinh(arg)
+    override fun asinh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOps>.asinh(arg)
 
-    override fun acosh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOperations>.acosh(arg)
+    override fun acosh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOps>.acosh(arg)
 
-    override fun atanh(arg: Buffer<Double>): DoubleBuffer= super<DoubleBufferOperations>.atanh(arg)
+    override fun atanh(arg: Buffer<Double>): DoubleBuffer= super<DoubleBufferOps>.atanh(arg)
 
     //    override fun number(value: Number): Buffer<Double> = DoubleBuffer(size) { value.toDouble() }
 //
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOperations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
similarity index 97%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOperations.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index 50b821962..2580cd6f8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOperations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -12,9 +12,9 @@ import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.math.*
 
 /**
- * [ExtendedFieldOperations] over [DoubleBuffer].
+ * [ExtendedFieldOps] over [DoubleBuffer].
  */
-public abstract class DoubleBufferOperations : ExtendedFieldOperations<Buffer<Double>>, Norm<Buffer<Double>, Double> {
+public abstract class DoubleBufferOps : ExtendedFieldOps<Buffer<Double>>, Norm<Buffer<Double>, Double> {
     override fun Buffer<Double>.unaryMinus(): DoubleBuffer = if (this is DoubleBuffer) {
         DoubleBuffer(size) { -array[it] }
     } else {
@@ -185,7 +185,7 @@ public abstract class DoubleBufferOperations : ExtendedFieldOperations<Buffer<Do
         DoubleBuffer(DoubleArray(a.size) { aArray[it] * value })
     } else DoubleBuffer(DoubleArray(a.size) { a[it] * value })
 
-    public companion object : DoubleBufferOperations()
+    public companion object : DoubleBufferOps()
 }
 
 public object DoubleL2Norm : Norm<Point<Double>, Double> {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
index a3d8f5ffe..ca88ad42d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
@@ -150,7 +150,7 @@ public interface ScaleOperations<T> : Algebra<T> {
  * TODO to be removed and replaced by extensions after multiple receivers are there
  */
 @UnstableKMathAPI
-public interface NumbersAddOperations<T> : Ring<T>, NumericAlgebra<T> {
+public interface NumbersAddOps<T> : Ring<T>, NumericAlgebra<T> {
     /**
      * Addition of element and scalar.
      *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index 4c0010bf9..c1775296c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -10,8 +10,8 @@ import kotlin.math.pow as kpow
 /**
  * Advanced Number-like semifield that implements basic operations.
  */
-public interface ExtendedFieldOperations<T> :
-    FieldOperations<T>,
+public interface ExtendedFieldOps<T> :
+    FieldOps<T>,
     TrigonometricOperations<T>,
     PowerOperations<T>,
     ExponentialOperations<T>,
@@ -35,14 +35,14 @@ public interface ExtendedFieldOperations<T> :
         ExponentialOperations.ACOSH_OPERATION -> ::acosh
         ExponentialOperations.ASINH_OPERATION -> ::asinh
         ExponentialOperations.ATANH_OPERATION -> ::atanh
-        else -> super<FieldOperations>.unaryOperationFunction(operation)
+        else -> super<FieldOps>.unaryOperationFunction(operation)
     }
 }
 
 /**
  * Advanced Number-like field that implements basic operations.
  */
-public interface ExtendedField<T> : ExtendedFieldOperations<T>, Field<T>, NumericAlgebra<T>{
+public interface ExtendedField<T> : ExtendedFieldOps<T>, Field<T>, NumericAlgebra<T>{
     override fun sinh(arg: T): T = (exp(arg) - exp(-arg)) / 2.0
     override fun cosh(arg: T): T = (exp(arg) + exp(-arg)) / 2.0
     override fun tanh(arg: T): T = (exp(arg) - exp(-arg)) / (exp(-arg) + exp(arg))
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
index 05a67ab09..2009eb64f 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.structures
 
 import space.kscience.kmath.nd.get
 import space.kscience.kmath.nd.ndAlgebra
+import space.kscience.kmath.nd.produce
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.testutils.FieldVerifier
@@ -21,7 +22,7 @@ internal class NDFieldTest {
 
     @Test
     fun testStrides() {
-        val ndArray = DoubleField.ndAlgebra(10, 10).produce { (it[0] + it[1]).toDouble() }
+        val ndArray = DoubleField.ndAlgebra.produce(10, 10) { (it[0] + it[1]).toDouble() }
         assertEquals(ndArray[5, 5], 10.0)
     }
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index e58976f4a..907301a53 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -7,10 +7,7 @@ package space.kscience.kmath.structures
 
 import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.combine
-import space.kscience.kmath.nd.get
-import space.kscience.kmath.nd.ndAlgebra
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Norm
 import space.kscience.kmath.operations.algebra
@@ -22,9 +19,9 @@ import kotlin.test.assertEquals
 
 @Suppress("UNUSED_VARIABLE")
 class NumberNDFieldTest {
-    val algebra = DoubleField.ndAlgebra(3, 3)
-    val array1 = algebra.produce { (i, j) -> (i + j).toDouble() }
-    val array2 = algebra.produce { (i, j) -> (i - j).toDouble() }
+    val algebra = DoubleField.ndAlgebra
+    val array1 = algebra.produce(3, 3) { (i, j) -> (i + j).toDouble() }
+    val array2 = algebra.produce(3, 3) { (i, j) -> (i - j).toDouble() }
 
     @Test
     fun testSum() {
@@ -77,7 +74,7 @@ class NumberNDFieldTest {
 
     @Test
     fun combineTest() {
-        val division = array1.combine(array2, Double::div)
+        val division = array1.zip(array2, Double::div)
     }
 
     object L2Norm : Norm<StructureND<Number>, Double> {
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt
index 1821daac9..1620f029c 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt
@@ -10,12 +10,12 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.runningReduce
 import kotlinx.coroutines.flow.scan
-import space.kscience.kmath.operations.GroupOperations
+import space.kscience.kmath.operations.GroupOps
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
 
-public fun <T> Flow<T>.cumulativeSum(group: GroupOperations<T>): Flow<T> =
+public fun <T> Flow<T>.cumulativeSum(group: GroupOps<T>): Flow<T> =
     group { runningReduce { sum, element -> sum + element } }
 
 @ExperimentalCoroutinesApi
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
index b2c3209c2..0edd51be2 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
@@ -13,8 +13,8 @@ import space.kscience.kmath.structures.DoubleBuffer
  * Map one [BufferND] using function without indices.
  */
 public inline fun BufferND<Double>.mapInline(crossinline transform: DoubleField.(Double) -> Double): BufferND<Double> {
-    val array = DoubleArray(strides.linearSize) { offset -> DoubleField.transform(buffer[offset]) }
-    return BufferND(strides, DoubleBuffer(array))
+    val array = DoubleArray(indexes.linearSize) { offset -> DoubleField.transform(buffer[offset]) }
+    return BufferND(indexes, DoubleBuffer(array))
 }
 
 /**
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
index 5446f05f8..c452edc9c 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
@@ -28,10 +28,9 @@ public class DoubleHistogramSpace(
 
     public val dimension: Int get() = lower.size
 
-    private val shape = IntArray(binNums.size) { binNums[it] + 2 }
+    override val shape: IntArray = IntArray(binNums.size) { binNums[it] + 2 }
     override val histogramValueSpace: DoubleFieldND = DoubleField.ndAlgebra(*shape)
 
-    override val strides: Strides get() = histogramValueSpace.strides
     private val binSize = DoubleBuffer(dimension) { (upper[it] - lower[it]) / binNums[it] }
 
     /**
@@ -52,7 +51,7 @@ public class DoubleHistogramSpace(
         val lowerBoundary = index.mapIndexed { axis, i ->
             when (i) {
                 0 -> Double.NEGATIVE_INFINITY
-                strides.shape[axis] - 1 -> upper[axis]
+                shape[axis] - 1 -> upper[axis]
                 else -> lower[axis] + (i.toDouble()) * binSize[axis]
             }
         }.asBuffer()
@@ -60,7 +59,7 @@ public class DoubleHistogramSpace(
         val upperBoundary = index.mapIndexed { axis, i ->
             when (i) {
                 0 -> lower[axis]
-                strides.shape[axis] - 1 -> Double.POSITIVE_INFINITY
+                shape[axis] - 1 -> Double.POSITIVE_INFINITY
                 else -> lower[axis] + (i.toDouble() + 1) * binSize[axis]
             }
         }.asBuffer()
@@ -75,7 +74,7 @@ public class DoubleHistogramSpace(
     }
 
     override fun produce(builder: HistogramBuilder<Double>.() -> Unit): IndexedHistogram<Double, Double> {
-        val ndCounter = StructureND.auto(strides) { Counter.real() }
+        val ndCounter = StructureND.auto(shape) { Counter.real() }
         val hBuilder = HistogramBuilder<Double> { point, value ->
             val index = getIndex(point)
             ndCounter[index].add(value.toDouble())
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
index 44f3072d2..7c719ccd7 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
@@ -8,8 +8,9 @@ package space.kscience.kmath.histogram
 import space.kscience.kmath.domains.Domain
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.nd.DefaultStrides
 import space.kscience.kmath.nd.FieldND
-import space.kscience.kmath.nd.Strides
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.Group
 import space.kscience.kmath.operations.ScaleOperations
@@ -34,10 +35,10 @@ public class IndexedHistogram<T : Comparable<T>, V : Any>(
         return context.produceBin(index, values[index])
     }
 
-    override val dimension: Int get() = context.strides.shape.size
+    override val dimension: Int get() = context.shape.size
 
     override val bins: Iterable<Bin<T>>
-        get() = context.strides.indices().map {
+        get() = DefaultStrides(context.shape).indices().map {
             context.produceBin(it, values[it])
         }.asIterable()
 
@@ -49,7 +50,7 @@ public class IndexedHistogram<T : Comparable<T>, V : Any>(
 public interface IndexedHistogramSpace<T : Comparable<T>, V : Any>
     : Group<IndexedHistogram<T, V>>, ScaleOperations<IndexedHistogram<T, V>> {
     //public val valueSpace: Space<V>
-    public val strides: Strides
+    public val shape: Shape
     public val histogramValueSpace: FieldND<V, *> //= NDAlgebra.space(valueSpace, Buffer.Companion::boxing, *shape),
 
     /**
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
index c797eb65a..23dd076e1 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.histogram
 
+import space.kscience.kmath.nd.DefaultStrides
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.real.DoubleVector
 import kotlin.random.Random
@@ -69,7 +70,7 @@ internal class MultivariateHistogramTest {
             }
             val res = histogram1 - histogram2
             assertTrue {
-                strides.indices().all { index ->
+                DefaultStrides(shape).indices().all { index ->
                     res.values[index] <= histogram1.values[index]
                 }
             }
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
index 857824275..11e5853a8 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
@@ -106,8 +106,8 @@ public fun <X : SFun<X>> MST.toSFun(): SFun<X> = when (this) {
     is Symbol -> toSVar()
 
     is MST.Unary -> when (operation) {
-        GroupOperations.PLUS_OPERATION -> +value.toSFun<X>()
-        GroupOperations.MINUS_OPERATION -> -value.toSFun<X>()
+        GroupOps.PLUS_OPERATION -> +value.toSFun<X>()
+        GroupOps.MINUS_OPERATION -> -value.toSFun<X>()
         TrigonometricOperations.SIN_OPERATION -> sin(value.toSFun())
         TrigonometricOperations.COS_OPERATION -> cos(value.toSFun())
         TrigonometricOperations.TAN_OPERATION -> tan(value.toSFun())
@@ -124,10 +124,10 @@ public fun <X : SFun<X>> MST.toSFun(): SFun<X> = when (this) {
     }
 
     is MST.Binary -> when (operation) {
-        GroupOperations.PLUS_OPERATION -> left.toSFun<X>() + right.toSFun()
-        GroupOperations.MINUS_OPERATION -> left.toSFun<X>() - right.toSFun()
-        RingOperations.TIMES_OPERATION -> left.toSFun<X>() * right.toSFun()
-        FieldOperations.DIV_OPERATION -> left.toSFun<X>() / right.toSFun()
+        GroupOps.PLUS_OPERATION -> left.toSFun<X>() + right.toSFun()
+        GroupOps.MINUS_OPERATION -> left.toSFun<X>() - right.toSFun()
+        RingOps.TIMES_OPERATION -> left.toSFun<X>() * right.toSFun()
+        FieldOps.DIV_OPERATION -> left.toSFun<X>() / right.toSFun()
         PowerOperations.POW_OPERATION -> left.toSFun<X>() pow (right as MST.Numeric).toSConst()
         else -> error("Binary operation $operation not defined in $this")
     }
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index b604bf5f2..d65ad0dc9 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -15,13 +15,6 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.*
 
-internal fun AlgebraND<*, *>.checkShape(array: INDArray): INDArray {
-    val arrayShape = array.shape().toIntArray()
-    if (!shape.contentEquals(arrayShape)) throw ShapeMismatchException(shape, arrayShape)
-    return array
-}
-
-
 /**
  * Represents [AlgebraND] over [Nd4jArrayAlgebra].
  *
@@ -39,33 +32,34 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
      */
     public val StructureND<T>.ndArray: INDArray
 
-    override fun produce(initializer: C.(IntArray) -> T): Nd4jArrayStructure<T> {
+    override fun produce(shape: Shape, initializer: C.(IntArray) -> T): Nd4jArrayStructure<T> {
         val struct = Nd4j.create(*shape)!!.wrap()
-        struct.indicesIterator().forEach { struct[it] = elementContext.initializer(it) }
+        struct.indicesIterator().forEach { struct[it] = elementAlgebra.initializer(it) }
         return struct
     }
 
     override fun StructureND<T>.map(transform: C.(T) -> T): Nd4jArrayStructure<T> {
         val newStruct = ndArray.dup().wrap()
-        newStruct.elements().forEach { (idx, value) -> newStruct[idx] = elementContext.transform(value) }
+        newStruct.elements().forEach { (idx, value) -> newStruct[idx] = elementAlgebra.transform(value) }
         return newStruct
     }
 
     override fun StructureND<T>.mapIndexed(
         transform: C.(index: IntArray, T) -> T,
     ): Nd4jArrayStructure<T> {
-        val new = Nd4j.create(*this@Nd4jArrayAlgebra.shape).wrap()
-        new.indicesIterator().forEach { idx -> new[idx] = elementContext.transform(idx, this[idx]) }
+        val new = Nd4j.create(*shape).wrap()
+        new.indicesIterator().forEach { idx -> new[idx] = elementAlgebra.transform(idx, this[idx]) }
         return new
     }
 
-    override fun combine(
-        a: StructureND<T>,
-        b: StructureND<T>,
+    override fun zip(
+        left: StructureND<T>,
+        right: StructureND<T>,
         transform: C.(T, T) -> T,
     ): Nd4jArrayStructure<T> {
-        val new = Nd4j.create(*shape).wrap()
-        new.indicesIterator().forEach { idx -> new[idx] = elementContext.transform(a[idx], b[idx]) }
+        require(left.shape.contentEquals(right.shape)) { "Can't zip tow structures of shape ${left.shape} and ${right.shape}" }
+        val new = Nd4j.create(*left.shape).wrap()
+        new.indicesIterator().forEach { idx -> new[idx] = elementAlgebra.transform(left[idx], right[idx]) }
         return new
     }
 }
@@ -76,10 +70,7 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
  * @param T the type of the element contained in ND structure.
  * @param S the type of space of structure elements.
  */
-public sealed interface Nd4jArrayGroup<T, out S : Ring<T>> : GroupND<T, S>, Nd4jArrayAlgebra<T, S> {
-
-    override val zero: Nd4jArrayStructure<T>
-        get() = Nd4j.zeros(*shape).wrap()
+public sealed interface Nd4jArrayGroupOps<T, out S : Ring<T>> : GroupOpsND<T, S>, Nd4jArrayAlgebra<T, S> {
 
     override fun add(a: StructureND<T>, b: StructureND<T>): Nd4jArrayStructure<T> =
         a.ndArray.add(b.ndArray).wrap()
@@ -101,10 +92,7 @@ public sealed interface Nd4jArrayGroup<T, out S : Ring<T>> : GroupND<T, S>, Nd4j
  * @param R the type of ring of structure elements.
  */
 @OptIn(UnstableKMathAPI::class)
-public sealed interface Nd4jArrayRing<T, out R : Ring<T>> : RingND<T, R>, Nd4jArrayGroup<T, R> {
-
-    override val one: Nd4jArrayStructure<T>
-        get() = Nd4j.ones(*shape).wrap()
+public sealed interface Nd4jArrayRingOps<T, out R : Ring<T>> : RingOpsND<T, R>, Nd4jArrayGroupOps<T, R> {
 
     override fun multiply(a: StructureND<T>, b: StructureND<T>): Nd4jArrayStructure<T> =
         a.ndArray.mul(b.ndArray).wrap()
@@ -125,21 +113,12 @@ public sealed interface Nd4jArrayRing<T, out R : Ring<T>> : RingND<T, R>, Nd4jAr
 //    }
 
     public companion object {
-        private val intNd4jArrayRingCache: ThreadLocal<MutableMap<IntArray, IntNd4jArrayRing>> =
-            ThreadLocal.withInitial(::HashMap)
-
-        /**
-         * Creates an [RingND] for [Int] values or pull it from cache if it was created previously.
-         */
-        public fun int(vararg shape: Int): Nd4jArrayRing<Int, IntRing> =
-            intNd4jArrayRingCache.get().getOrPut(shape) { IntNd4jArrayRing(shape) }
-
         /**
          * Creates a most suitable implementation of [RingND] using reified class.
          */
         @Suppress("UNCHECKED_CAST")
-        public inline fun <reified T : Number> auto(vararg shape: Int): Nd4jArrayRing<T, Ring<T>> = when {
-            T::class == Int::class -> int(*shape) as Nd4jArrayRing<T, Ring<T>>
+        public inline fun <reified T : Number> auto(vararg shape: Int): Nd4jArrayRingOps<T, Ring<T>> = when {
+            T::class == Int::class -> IntRing.nd4j as Nd4jArrayRingOps<T, Ring<T>>
             else -> throw UnsupportedOperationException("This factory method only supports Long type.")
         }
     }
@@ -151,38 +130,21 @@ public sealed interface Nd4jArrayRing<T, out R : Ring<T>> : RingND<T, R>, Nd4jAr
  * @param T the type of the element contained in ND structure.
  * @param F the type field of structure elements.
  */
-public sealed interface Nd4jArrayField<T, out F : Field<T>> : FieldND<T, F>, Nd4jArrayRing<T, F> {
+public sealed interface Nd4jArrayField<T, out F : Field<T>> : FieldOpsND<T, F>, Nd4jArrayRingOps<T, F> {
+
     override fun divide(a: StructureND<T>, b: StructureND<T>): Nd4jArrayStructure<T> =
         a.ndArray.div(b.ndArray).wrap()
 
     public operator fun Number.div(b: StructureND<T>): Nd4jArrayStructure<T> = b.ndArray.rdiv(this).wrap()
 
     public companion object {
-        private val floatNd4jArrayFieldCache: ThreadLocal<MutableMap<IntArray, FloatNd4jArrayField>> =
-            ThreadLocal.withInitial(::HashMap)
-
-        private val doubleNd4JArrayFieldCache: ThreadLocal<MutableMap<IntArray, DoubleNd4jArrayField>> =
-            ThreadLocal.withInitial(::HashMap)
-
-        /**
-         * Creates an [FieldND] for [Float] values or pull it from cache if it was created previously.
-         */
-        public fun float(vararg shape: Int): Nd4jArrayRing<Float, FloatField> =
-            floatNd4jArrayFieldCache.get().getOrPut(shape) { FloatNd4jArrayField(shape) }
-
-        /**
-         * Creates an [FieldND] for [Double] values or pull it from cache if it was created previously.
-         */
-        public fun real(vararg shape: Int): Nd4jArrayRing<Double, DoubleField> =
-            doubleNd4JArrayFieldCache.get().getOrPut(shape) { DoubleNd4jArrayField(shape) }
-
         /**
          * Creates a most suitable implementation of [FieldND] using reified class.
          */
         @Suppress("UNCHECKED_CAST")
         public inline fun <reified T : Any> auto(vararg shape: Int): Nd4jArrayField<T, Field<T>> = when {
-            T::class == Float::class -> float(*shape) as Nd4jArrayField<T, Field<T>>
-            T::class == Double::class -> real(*shape) as Nd4jArrayField<T, Field<T>>
+            T::class == Float::class -> FloatField.nd4j as Nd4jArrayField<T, Field<T>>
+            T::class == Double::class -> DoubleField.nd4j as Nd4jArrayField<T, Field<T>>
             else -> throw UnsupportedOperationException("This factory method only supports Float and Double types.")
         }
     }
@@ -191,8 +153,9 @@ public sealed interface Nd4jArrayField<T, out F : Field<T>> : FieldND<T, F>, Nd4
 /**
  * Represents intersection of [ExtendedField] and [Field] over [Nd4jArrayStructure].
  */
-public sealed interface Nd4jArrayExtendedField<T, out F : ExtendedField<T>> : ExtendedField<StructureND<T>>,
-    Nd4jArrayField<T, F> {
+public sealed interface Nd4jArrayExtendedFieldOps<T, out F : ExtendedField<T>> :
+    ExtendedFieldOps<StructureND<T>>, Nd4jArrayField<T, F> {
+
     override fun sin(arg: StructureND<T>): StructureND<T> = Transforms.sin(arg.ndArray).wrap()
     override fun cos(arg: StructureND<T>): StructureND<T> = Transforms.cos(arg.ndArray).wrap()
     override fun asin(arg: StructureND<T>): StructureND<T> = Transforms.asin(arg.ndArray).wrap()
@@ -221,63 +184,59 @@ public sealed interface Nd4jArrayExtendedField<T, out F : ExtendedField<T>> : Ex
 /**
  * Represents [FieldND] over [Nd4jArrayDoubleStructure].
  */
-public class DoubleNd4jArrayField(override val shape: IntArray) : Nd4jArrayExtendedField<Double, DoubleField> {
-    override val elementContext: DoubleField get() = DoubleField
+public open class DoubleNd4jArrayFieldOps : Nd4jArrayExtendedFieldOps<Double, DoubleField> {
+    override val elementAlgebra: DoubleField get() = DoubleField
 
-    override fun INDArray.wrap(): Nd4jArrayStructure<Double> = checkShape(this).asDoubleStructure()
+    override fun INDArray.wrap(): Nd4jArrayStructure<Double> = asDoubleStructure()
 
     @OptIn(PerformancePitfall::class)
     override val StructureND<Double>.ndArray: INDArray
         get() = when (this) {
-            is Nd4jArrayStructure<Double> -> checkShape(ndArray)
+            is Nd4jArrayStructure<Double> -> ndArray
             else -> Nd4j.zeros(*shape).also {
                 elements().forEach { (idx, value) -> it.putScalar(idx, value) }
             }
         }
 
-    override fun scale(a: StructureND<Double>, value: Double): Nd4jArrayStructure<Double> {
-        return a.ndArray.mul(value).wrap()
-    }
+    override fun scale(a: StructureND<Double>, value: Double): Nd4jArrayStructure<Double> = a.ndArray.mul(value).wrap()
 
-    override operator fun StructureND<Double>.div(arg: Double): Nd4jArrayStructure<Double> {
-        return ndArray.div(arg).wrap()
-    }
+    override operator fun StructureND<Double>.div(arg: Double): Nd4jArrayStructure<Double> = ndArray.div(arg).wrap()
 
-    override operator fun StructureND<Double>.plus(arg: Double): Nd4jArrayStructure<Double> {
-        return ndArray.add(arg).wrap()
-    }
+    override operator fun StructureND<Double>.plus(arg: Double): Nd4jArrayStructure<Double> = ndArray.add(arg).wrap()
 
-    override operator fun StructureND<Double>.minus(arg: Double): Nd4jArrayStructure<Double> {
-        return ndArray.sub(arg).wrap()
-    }
+    override operator fun StructureND<Double>.minus(arg: Double): Nd4jArrayStructure<Double> = ndArray.sub(arg).wrap()
 
-    override operator fun StructureND<Double>.times(arg: Double): Nd4jArrayStructure<Double> {
-        return ndArray.mul(arg).wrap()
-    }
+    override operator fun StructureND<Double>.times(arg: Double): Nd4jArrayStructure<Double> = ndArray.mul(arg).wrap()
 
-    override operator fun Double.div(arg: StructureND<Double>): Nd4jArrayStructure<Double> {
-        return arg.ndArray.rdiv(this).wrap()
-    }
+    override operator fun Double.div(arg: StructureND<Double>): Nd4jArrayStructure<Double> =
+        arg.ndArray.rdiv(this).wrap()
 
-    override operator fun Double.minus(arg: StructureND<Double>): Nd4jArrayStructure<Double> {
-        return arg.ndArray.rsub(this).wrap()
-    }
+    override operator fun Double.minus(arg: StructureND<Double>): Nd4jArrayStructure<Double> =
+        arg.ndArray.rsub(this).wrap()
+
+    public companion object : DoubleNd4jArrayFieldOps()
 }
 
-public fun DoubleField.nd4j(vararg shape: Int): DoubleNd4jArrayField = DoubleNd4jArrayField(intArrayOf(*shape))
+public val DoubleField.nd4j: DoubleNd4jArrayFieldOps get() = DoubleNd4jArrayFieldOps
+
+public class DoubleNd4jArrayField(override val shape: Shape) : DoubleNd4jArrayFieldOps(), FieldND<Double, DoubleField>
+
+public fun DoubleField.nd4j(shapeFirst: Int, vararg shapeRest: Int): DoubleNd4jArrayField =
+    DoubleNd4jArrayField(intArrayOf(shapeFirst, * shapeRest))
+
 
 /**
  * Represents [FieldND] over [Nd4jArrayStructure] of [Float].
  */
-public class FloatNd4jArrayField(override val shape: IntArray) : Nd4jArrayExtendedField<Float, FloatField> {
-    override val elementContext: FloatField get() = FloatField
+public open class FloatNd4jArrayFieldOps : Nd4jArrayExtendedFieldOps<Float, FloatField> {
+    override val elementAlgebra: FloatField get() = FloatField
 
-    override fun INDArray.wrap(): Nd4jArrayStructure<Float> = checkShape(this).asFloatStructure()
+    override fun INDArray.wrap(): Nd4jArrayStructure<Float> = asFloatStructure()
 
     @OptIn(PerformancePitfall::class)
     override val StructureND<Float>.ndArray: INDArray
         get() = when (this) {
-            is Nd4jArrayStructure<Float> -> checkShape(ndArray)
+            is Nd4jArrayStructure<Float> -> ndArray
             else -> Nd4j.zeros(*shape).also {
                 elements().forEach { (idx, value) -> it.putScalar(idx, value) }
             }
@@ -303,21 +262,29 @@ public class FloatNd4jArrayField(override val shape: IntArray) : Nd4jArrayExtend
 
     override operator fun Float.minus(arg: StructureND<Float>): Nd4jArrayStructure<Float> =
         arg.ndArray.rsub(this).wrap()
+
+    public companion object : FloatNd4jArrayFieldOps()
 }
 
+public class FloatNd4jArrayField(override val shape: Shape) : FloatNd4jArrayFieldOps(), RingND<Float, FloatField>
+
+public val FloatField.nd4j: FloatNd4jArrayFieldOps get() = FloatNd4jArrayFieldOps
+
+public fun FloatField.nd4j(shapeFirst: Int, vararg shapeRest: Int): FloatNd4jArrayField =
+    FloatNd4jArrayField(intArrayOf(shapeFirst, * shapeRest))
+
 /**
  * Represents [RingND] over [Nd4jArrayIntStructure].
  */
-public class IntNd4jArrayRing(override val shape: IntArray) : Nd4jArrayRing<Int, IntRing> {
-    override val elementContext: IntRing
-        get() = IntRing
+public open class IntNd4jArrayRingOps : Nd4jArrayRingOps<Int, IntRing> {
+    override val elementAlgebra: IntRing get() = IntRing
 
-    override fun INDArray.wrap(): Nd4jArrayStructure<Int> = checkShape(this).asIntStructure()
+    override fun INDArray.wrap(): Nd4jArrayStructure<Int> = asIntStructure()
 
     @OptIn(PerformancePitfall::class)
     override val StructureND<Int>.ndArray: INDArray
         get() = when (this) {
-            is Nd4jArrayStructure<Int> -> checkShape(ndArray)
+            is Nd4jArrayStructure<Int> -> ndArray
             else -> Nd4j.zeros(*shape).also {
                 elements().forEach { (idx, value) -> it.putScalar(idx, value) }
             }
@@ -334,4 +301,13 @@ public class IntNd4jArrayRing(override val shape: IntArray) : Nd4jArrayRing<Int,
 
     override operator fun Int.minus(arg: StructureND<Int>): Nd4jArrayStructure<Int> =
         arg.ndArray.rsub(this).wrap()
+
+    public companion object : IntNd4jArrayRingOps()
 }
+
+public val IntRing.nd4j: IntNd4jArrayRingOps get() = IntNd4jArrayRingOps
+
+public class IntNd4jArrayRing(override val shape: Shape) : IntNd4jArrayRingOps(), RingND<Int, IntRing>
+
+public fun IntRing.nd4j(shapeFirst: Int, vararg shapeRest: Int): IntNd4jArrayRing =
+    IntNd4jArrayRing(intArrayOf(shapeFirst, * shapeRest))
\ No newline at end of file
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
index a03a7269e..465937fa9 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
@@ -8,6 +8,10 @@ package space.kscience.kmath.nd4j
 import org.nd4j.linalg.factory.Nd4j
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.one
+import space.kscience.kmath.nd.produce
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.operations.invoke
 import kotlin.math.PI
 import kotlin.test.Test
@@ -19,7 +23,7 @@ import kotlin.test.fail
 internal class Nd4jArrayAlgebraTest {
     @Test
     fun testProduce() {
-        val res = with(DoubleNd4jArrayField(intArrayOf(2, 2))) { produce { it.sum().toDouble() } }
+        val res = DoubleField.nd4j.produce(2, 2) { it.sum().toDouble() }
         val expected = (Nd4j.create(2, 2) ?: fail()).asDoubleStructure()
         expected[intArrayOf(0, 0)] = 0.0
         expected[intArrayOf(0, 1)] = 1.0
@@ -30,7 +34,9 @@ internal class Nd4jArrayAlgebraTest {
 
     @Test
     fun testMap() {
-        val res = with(IntNd4jArrayRing(intArrayOf(2, 2))) { one.map { it + it * 2 } }
+        val res = IntRing.nd4j {
+            one(2, 2).map { it + it * 2 }
+        }
         val expected = (Nd4j.create(2, 2) ?: fail()).asIntStructure()
         expected[intArrayOf(0, 0)] = 3
         expected[intArrayOf(0, 1)] = 3
@@ -41,7 +47,7 @@ internal class Nd4jArrayAlgebraTest {
 
     @Test
     fun testAdd() {
-        val res = with(IntNd4jArrayRing(intArrayOf(2, 2))) { one + 25 }
+        val res = IntRing.nd4j { one(2, 2) + 25 }
         val expected = (Nd4j.create(2, 2) ?: fail()).asIntStructure()
         expected[intArrayOf(0, 0)] = 26
         expected[intArrayOf(0, 1)] = 26
@@ -51,10 +57,10 @@ internal class Nd4jArrayAlgebraTest {
     }
 
     @Test
-    fun testSin() = DoubleNd4jArrayField(intArrayOf(2, 2)).invoke {
-        val initial = produce { (i, j) -> if (i == j) PI / 2 else 0.0 }
+    fun testSin() = DoubleField.nd4j{
+        val initial = produce(2, 2) { (i, j) -> if (i == j) PI / 2 else 0.0 }
         val transformed = sin(initial)
-        val expected = produce { (i, j) -> if (i == j) 1.0 else 0.0 }
+        val expected = produce(2, 2) { (i, j) -> if (i == j) 1.0 else 0.0 }
 
         println(transformed)
         assertTrue { StructureND.contentEquals(transformed, expected) }
diff --git a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
index 8def1ae83..a7ca298a9 100644
--- a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
+++ b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
@@ -64,8 +64,8 @@ public fun MST.toIExpr(): IExpr = when (this) {
     }
 
     is MST.Unary -> when (operation) {
-        GroupOperations.PLUS_OPERATION -> value.toIExpr()
-        GroupOperations.MINUS_OPERATION -> F.Negate(value.toIExpr())
+        GroupOps.PLUS_OPERATION -> value.toIExpr()
+        GroupOps.MINUS_OPERATION -> F.Negate(value.toIExpr())
         TrigonometricOperations.SIN_OPERATION -> F.Sin(value.toIExpr())
         TrigonometricOperations.COS_OPERATION -> F.Cos(value.toIExpr())
         TrigonometricOperations.TAN_OPERATION -> F.Tan(value.toIExpr())
@@ -85,10 +85,10 @@ public fun MST.toIExpr(): IExpr = when (this) {
     }
 
     is MST.Binary -> when (operation) {
-        GroupOperations.PLUS_OPERATION -> left.toIExpr() + right.toIExpr()
-        GroupOperations.MINUS_OPERATION -> left.toIExpr() - right.toIExpr()
-        RingOperations.TIMES_OPERATION -> left.toIExpr() * right.toIExpr()
-        FieldOperations.DIV_OPERATION -> F.Divide(left.toIExpr(), right.toIExpr())
+        GroupOps.PLUS_OPERATION -> left.toIExpr() + right.toIExpr()
+        GroupOps.MINUS_OPERATION -> left.toIExpr() - right.toIExpr()
+        RingOps.TIMES_OPERATION -> left.toIExpr() * right.toIExpr()
+        FieldOps.DIV_OPERATION -> F.Divide(left.toIExpr(), right.toIExpr())
         PowerOperations.POW_OPERATION -> F.Power(left.toIExpr(), F.symjify((right as MST.Numeric).value))
         else -> error("Binary operation $operation not defined in $this")
     }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 8e39e6cdd..594070cd2 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -373,8 +373,12 @@ public open class DoubleTensorAlgebra :
         return resTensor
     }
 
-    override fun diagonalEmbedding(diagonalEntries: Tensor<Double>, offset: Int, dim1: Int, dim2: Int):
-            DoubleTensor {
+    override fun diagonalEmbedding(
+        diagonalEntries: Tensor<Double>,
+        offset: Int,
+        dim1: Int,
+        dim2: Int
+    ): DoubleTensor {
         val n = diagonalEntries.shape.size
         val d1 = minusIndexFrom(n + 1, dim1)
         val d2 = minusIndexFrom(n + 1, dim2)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt
index 817ed60d8..57668722a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt
@@ -44,7 +44,7 @@ internal fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): IntArra
  *
  * @param shape the shape of the tensor.
  */
-internal class TensorLinearStructure(override val shape: IntArray) : Strides {
+internal class TensorLinearStructure(override val shape: IntArray) : Strides() {
     override val strides: IntArray
         get() = stridesFromShape(shape)
 
@@ -54,4 +54,18 @@ internal class TensorLinearStructure(override val shape: IntArray) : Strides {
     override val linearSize: Int
         get() = shape.reduce(Int::times)
 
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || this::class != other::class) return false
+
+        other as TensorLinearStructure
+
+        if (!shape.contentEquals(other.shape)) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return shape.contentHashCode()
+    }
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index 29aa02931..e0451c2eb 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -26,8 +26,11 @@ internal fun <T> Tensor<T>.copyToBufferedTensor(): BufferedTensor<T> =
 
 internal fun <T> Tensor<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
     is BufferedTensor<T> -> this
-    is MutableBufferND<T> -> if (this.strides.strides contentEquals TensorLinearStructure(this.shape).strides)
-        BufferedTensor(this.shape, this.mutableBuffer, 0) else this.copyToBufferedTensor()
+    is MutableBufferND<T> -> if (this.indexes == TensorLinearStructure(this.shape)) {
+        BufferedTensor(this.shape, this.mutableBuffer, 0)
+    } else {
+        this.copyToBufferedTensor()
+    }
     else -> this.copyToBufferedTensor()
 }
 
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index 682123ddd..fca23bc16 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.ExtendedField
-import space.kscience.kmath.operations.NumbersAddOperations
+import space.kscience.kmath.operations.NumbersAddOps
 import space.kscience.kmath.operations.ScaleOperations
 
 @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
@@ -34,7 +34,7 @@ public fun F64Array.asStructure(): ViktorStructureND = ViktorStructureND(this)
 @OptIn(UnstableKMathAPI::class)
 @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public class ViktorFieldND(override val shape: IntArray) : FieldND<Double, DoubleField>,
-    NumbersAddOperations<StructureND<Double>>, ExtendedField<StructureND<Double>>,
+    NumbersAddOps<StructureND<Double>>, ExtendedField<StructureND<Double>>,
     ScaleOperations<StructureND<Double>> {
 
     public val StructureND<Double>.f64Buffer: F64Array
@@ -44,7 +44,7 @@ public class ViktorFieldND(override val shape: IntArray) : FieldND<Double, Doubl
                 shape
             )
             this is ViktorStructureND && this.f64Buffer.shape.contentEquals(this@ViktorFieldND.shape) -> this.f64Buffer
-            else -> produce { this@f64Buffer[it] }.f64Buffer
+            else -> produce(shape) { this@f64Buffer[it] }.f64Buffer
         }
 
     override val zero: ViktorStructureND by lazy { F64Array.full(init = 0.0, shape = shape).asStructure() }
@@ -52,9 +52,9 @@ public class ViktorFieldND(override val shape: IntArray) : FieldND<Double, Doubl
 
     private val strides: Strides = DefaultStrides(shape)
 
-    override val elementContext: DoubleField get() = DoubleField
+    override val elementAlgebra: DoubleField get() = DoubleField
 
-    override fun produce(initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
+    override fun produce(shape: IntArray, initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
         F64Array(*shape).apply {
             this@ViktorFieldND.strides.indices().forEach { index ->
                 set(value = DoubleField.initializer(index), indices = index)
@@ -78,13 +78,13 @@ public class ViktorFieldND(override val shape: IntArray) : FieldND<Double, Doubl
         }
     }.asStructure()
 
-    override fun combine(
-        a: StructureND<Double>,
-        b: StructureND<Double>,
+    override fun zip(
+        left: StructureND<Double>,
+        right: StructureND<Double>,
         transform: DoubleField.(Double, Double) -> Double,
     ): ViktorStructureND = F64Array(*shape).apply {
         this@ViktorFieldND.strides.indices().forEach { index ->
-            set(value = DoubleField.transform(a[index], b[index]), indices = index)
+            set(value = DoubleField.transform(left[index], right[index]), indices = index)
         }
     }.asStructure()
 
@@ -123,4 +123,4 @@ public class ViktorFieldND(override val shape: IntArray) : FieldND<Double, Doubl
     override fun ln(arg: StructureND<Double>): ViktorStructureND = arg.f64Buffer.log().asStructure()
 }
 
-public fun ViktorNDField(vararg shape: Int): ViktorFieldND = ViktorFieldND(shape)
+public fun ViktorFieldND(vararg shape: Int): ViktorFieldND = ViktorFieldND(shape)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 528adb336..dc70cbb9e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,16 +1,18 @@
 pluginManagement {
     repositories {
-        mavenLocal()
         maven("https://repo.kotlin.link")
         mavenCentral()
         gradlePluginPortal()
     }
 
-    val kotlinVersion = "1.6.0-M1"
+    val kotlinVersion = "1.6.0-RC"
+    val toolsVersion = "0.10.5"
 
     plugins {
         id("org.jetbrains.kotlinx.benchmark") version "0.3.1"
-        id("ru.mipt.npm.gradle.project") version "0.10.5"
+        id("ru.mipt.npm.gradle.project") version toolsVersion
+        id("ru.mipt.npm.gradle.jvm") version toolsVersion
+        id("ru.mipt.npm.gradle.mpp") version toolsVersion
         kotlin("multiplatform") version kotlinVersion
         kotlin("plugin.allopen") version kotlinVersion
     }
-- 
2.34.1


From 688382eed6e514cf61d00047b75a8669c7599ce8 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 17 Oct 2021 12:42:35 +0300
Subject: [PATCH 347/713] Shapeless ND and Buffer algebras

---
 .../kmath/benchmarks/NDFieldBenchmark.kt      |  12 +-
 .../kmath/functions/matrixIntegration.kt      |   3 +-
 .../kscience/kmath/structures/ComplexND.kt    |   1 +
 .../kscience/kmath/structures/NDField.kt      |  26 ++--
 .../kmath/structures/StreamDoubleFieldND.kt   |  14 +-
 .../DerivativeStructureExpression.kt          |   6 +-
 .../space/kscience/kmath/complex/Complex.kt   |  24 ++--
 .../kscience/kmath/complex/Quaternion.kt      |  26 ++--
 .../FunctionalExpressionAlgebra.kt            |  12 +-
 .../kscience/kmath/expressions/MstAlgebra.kt  |  32 ++---
 .../kmath/expressions/SimpleAutoDiff.kt       |  24 ++--
 .../space/kscience/kmath/nd/AlgebraND.kt      |  26 ++--
 .../kscience/kmath/nd/BufferAlgebraND.kt      |   6 +-
 .../space/kscience/kmath/nd/BufferND.kt       |  12 +-
 .../space/kscience/kmath/nd/DoubleFieldND.kt  | 134 +++++++++++++++---
 .../kscience/kmath/operations/Algebra.kt      |  34 ++---
 .../space/kscience/kmath/operations/BigInt.kt |   6 +-
 .../kmath/operations/BufferAlgebra.kt         |  10 +-
 .../kmath/operations/DoubleBufferOps.kt       |  63 ++++----
 .../kscience/kmath/operations/numbers.kt      |  68 ++++-----
 .../kscience/kmath/operations/BigNumbers.kt   |  14 +-
 .../kscience/kmath/functions/Polynomial.kt    |   6 +-
 .../kmath/geometry/Euclidean2DSpace.kt        |   2 +-
 .../kmath/geometry/Euclidean3DSpace.kt        |   4 +-
 .../kmath/histogram/IndexedHistogramSpace.kt  |   8 +-
 .../kmath/histogram/TreeHistogramSpace.kt     |  12 +-
 .../kscience/kmath/jafama/KMathJafama.kt      |  28 ++--
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   |  16 +--
 .../kscience/kmath/stat/SamplerAlgebra.kt     |   4 +-
 .../kmath/tensors/api/TensorAlgebra.kt        |  16 ++-
 .../tensors/core/internal/tensorCastsUtils.kt |   2 +-
 .../kmath/viktor/ViktorStructureND.kt         |  12 +-
 32 files changed, 382 insertions(+), 281 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index 950a10b33..7f7c03412 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -57,12 +57,12 @@ internal class NDFieldBenchmark {
         blackhole.consume(res)
     }
 
-    @Benchmark
-    fun nd4jAdd(blackhole: Blackhole) = with(nd4jField) {
-        var res: StructureND<Double> = one(dim, dim)
-        repeat(n) { res += 1.0 }
-        blackhole.consume(res)
-    }
+//    @Benchmark
+//    fun nd4jAdd(blackhole: Blackhole) = with(nd4jField) {
+//        var res: StructureND<Double> = one(dim, dim)
+//        repeat(n) { res += 1.0 }
+//        blackhole.consume(res)
+//    }
 
     private companion object {
         private const val dim = 1000
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index 93b5671fe..609afb47e 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -9,6 +9,7 @@ import space.kscience.kmath.integration.gaussIntegrator
 import space.kscience.kmath.integration.integrate
 import space.kscience.kmath.integration.value
 import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.produce
 import space.kscience.kmath.nd.withNdAlgebra
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.invoke
@@ -17,7 +18,7 @@ fun main(): Unit = Double.algebra {
     withNdAlgebra(2, 2) {
 
         //Produce a diagonal StructureND
-        fun diagonal(v: Double) = produce { (i, j) ->
+        fun diagonal(v: Double) = produce {  (i, j) ->
             if (i == j) v else 0.0
         }
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
index d4554b3ba..42636fafb 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
@@ -12,6 +12,7 @@ import space.kscience.kmath.linear.transpose
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.nd.ndAlgebra
+import space.kscience.kmath.nd.produce
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 import kotlin.system.measureTimeMillis
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
index 7359f3bf6..cf0721ce7 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
@@ -8,10 +8,8 @@ package space.kscience.kmath.structures
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import org.nd4j.linalg.factory.Nd4j
-import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.autoNdAlgebra
-import space.kscience.kmath.nd.ndAlgebra
-import space.kscience.kmath.nd4j.Nd4jArrayField
+import space.kscience.kmath.nd.*
+import space.kscience.kmath.nd4j.nd4j
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.viktor.ViktorFieldND
@@ -31,15 +29,17 @@ fun main() {
     Nd4j.zeros(0)
     val dim = 1000
     val n = 1000
+    val shape = Shape(dim, dim)
+
 
     // automatically build context most suited for given type.
-    val autoField = DoubleField.autoNdAlgebra(dim, dim)
+    val autoField = BufferedFieldOpsND(DoubleField, Buffer.Companion::auto)
     // specialized nd-field for Double. It works as generic Double field as well.
-    val realField = DoubleField.ndAlgebra(dim, dim)
+    val realField = DoubleField.ndAlgebra
     //A generic boxing field. It should be used for objects, not primitives.
-    val boxingField = DoubleField.ndAlgebra(Buffer.Companion::boxing, dim, dim)
+    val boxingField = BufferedFieldOpsND(DoubleField, Buffer.Companion::boxing)
     // Nd4j specialized field.
-    val nd4jField = Nd4jArrayField.real(dim, dim)
+    val nd4jField = DoubleField.nd4j
     //viktor field
     val viktorField = ViktorFieldND(dim, dim)
     //parallel processing based on Java Streams
@@ -47,21 +47,21 @@ fun main() {
 
     measureAndPrint("Boxing addition") {
         boxingField {
-            var res: StructureND<Double> = one
+            var res: StructureND<Double> = one(shape)
             repeat(n) { res += 1.0 }
         }
     }
 
     measureAndPrint("Specialized addition") {
         realField {
-            var res: StructureND<Double> = one
+            var res: StructureND<Double> = one(shape)
             repeat(n) { res += 1.0 }
         }
     }
 
     measureAndPrint("Nd4j specialized addition") {
         nd4jField {
-            var res: StructureND<Double> = one
+            var res: StructureND<Double> = one(shape)
             repeat(n) { res += 1.0 }
         }
     }
@@ -82,13 +82,13 @@ fun main() {
 
     measureAndPrint("Automatic field addition") {
         autoField {
-            var res: StructureND<Double> = one
+            var res: StructureND<Double> = one(shape)
             repeat(n) { res += 1.0 }
         }
     }
 
     measureAndPrint("Lazy addition") {
-        val res = realField.one.mapAsync(GlobalScope) {
+        val res = realField.one(shape).mapAsync(GlobalScope) {
             var c = 0.0
             repeat(n) {
                 c += 1.0
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index f1f5f2e84..dfd06973e 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -22,12 +22,12 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
 
     private val strides = DefaultStrides(shape)
     override val elementAlgebra: DoubleField get() = DoubleField
-    override val zero: BufferND<Double> by lazy { produce { zero } }
-    override val one: BufferND<Double> by lazy { produce { one } }
+    override val zero: BufferND<Double> by lazy { produce(shape) { zero } }
+    override val one: BufferND<Double> by lazy { produce(shape) { one } }
 
     override fun number(value: Number): BufferND<Double> {
         val d = value.toDouble() // minimize conversions
-        return produce { d }
+        return produce(shape) { d }
     }
 
     private val StructureND<Double>.buffer: DoubleBuffer
@@ -40,7 +40,7 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
             else -> DoubleBuffer(strides.linearSize) { offset -> get(strides.index(offset)) }
         }
 
-    override fun produce(initializer: DoubleField.(IntArray) -> Double): BufferND<Double> {
+    override fun produce(shape: Shape, initializer: DoubleField.(IntArray) -> Double): BufferND<Double> {
         val array = IntStream.range(0, strides.linearSize).parallel().mapToDouble { offset ->
             val index = strides.index(offset)
             DoubleField.initializer(index)
@@ -70,12 +70,12 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
     }
 
     override fun zip(
-        a: StructureND<Double>,
-        b: StructureND<Double>,
+        left: StructureND<Double>,
+        right: StructureND<Double>,
         transform: DoubleField.(Double, Double) -> Double,
     ): BufferND<Double> {
         val array = IntStream.range(0, strides.linearSize).parallel().mapToDouble { offset ->
-            DoubleField.transform(a.buffer.array[offset], b.buffer.array[offset])
+            DoubleField.transform(left.buffer.array[offset], right.buffer.array[offset])
         }.toArray()
         return BufferND(strides, array.asBuffer())
     }
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
index a178e8dd7..d42e40d1e 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
@@ -70,12 +70,12 @@ public class DerivativeStructureField(
 
     override fun DerivativeStructure.unaryMinus(): DerivativeStructure = negate()
 
-    override fun add(a: DerivativeStructure, b: DerivativeStructure): DerivativeStructure = a.add(b)
+    override fun add(left: DerivativeStructure, right: DerivativeStructure): DerivativeStructure = left.add(right)
 
     override fun scale(a: DerivativeStructure, value: Double): DerivativeStructure = a.multiply(value)
 
-    override fun multiply(a: DerivativeStructure, b: DerivativeStructure): DerivativeStructure = a.multiply(b)
-    override fun divide(a: DerivativeStructure, b: DerivativeStructure): DerivativeStructure = a.divide(b)
+    override fun multiply(left: DerivativeStructure, right: DerivativeStructure): DerivativeStructure = left.multiply(right)
+    override fun divide(left: DerivativeStructure, right: DerivativeStructure): DerivativeStructure = left.divide(right)
     override fun sin(arg: DerivativeStructure): DerivativeStructure = arg.sin()
     override fun cos(arg: DerivativeStructure): DerivativeStructure = arg.cos()
     override fun tan(arg: DerivativeStructure): DerivativeStructure = arg.tan()
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index e61a7bccc..879cfe94e 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -77,33 +77,33 @@ public object ComplexField :
 
     override fun scale(a: Complex, value: Double): Complex = Complex(a.re * value, a.im * value)
 
-    override fun add(a: Complex, b: Complex): Complex = Complex(a.re + b.re, a.im + b.im)
+    override fun add(left: Complex, right: Complex): Complex = Complex(left.re + right.re, left.im + right.im)
 //    override fun multiply(a: Complex, k: Number): Complex = Complex(a.re * k.toDouble(), a.im * k.toDouble())
 
-    override fun multiply(a: Complex, b: Complex): Complex =
-        Complex(a.re * b.re - a.im * b.im, a.re * b.im + a.im * b.re)
+    override fun multiply(left: Complex, right: Complex): Complex =
+        Complex(left.re * right.re - left.im * right.im, left.re * right.im + left.im * right.re)
 
-    override fun divide(a: Complex, b: Complex): Complex = when {
-        abs(b.im) < abs(b.re) -> {
-            val wr = b.im / b.re
-            val wd = b.re + wr * b.im
+    override fun divide(left: Complex, right: Complex): Complex = when {
+        abs(right.im) < abs(right.re) -> {
+            val wr = right.im / right.re
+            val wd = right.re + wr * right.im
 
             if (wd.isNaN() || wd == 0.0)
                 throw ArithmeticException("Division by zero or infinity")
             else
-                Complex((a.re + a.im * wr) / wd, (a.im - a.re * wr) / wd)
+                Complex((left.re + left.im * wr) / wd, (left.im - left.re * wr) / wd)
         }
 
-        b.im == 0.0 -> throw ArithmeticException("Division by zero")
+        right.im == 0.0 -> throw ArithmeticException("Division by zero")
 
         else -> {
-            val wr = b.re / b.im
-            val wd = b.im + wr * b.re
+            val wr = right.re / right.im
+            val wd = right.im + wr * right.re
 
             if (wd.isNaN() || wd == 0.0)
                 throw ArithmeticException("Division by zero or infinity")
             else
-                Complex((a.re * wr + a.im) / wd, (a.im * wr - a.re) / wd)
+                Complex((left.re * wr + left.im) / wd, (left.im * wr - left.re) / wd)
         }
     }
 
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index b0ec10c35..9fdd60e1f 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -63,27 +63,27 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
      */
     public val k: Quaternion = Quaternion(0, 0, 0, 1)
 
-    override fun add(a: Quaternion, b: Quaternion): Quaternion =
-        Quaternion(a.w + b.w, a.x + b.x, a.y + b.y, a.z + b.z)
+    override fun add(left: Quaternion, right: Quaternion): Quaternion =
+        Quaternion(left.w + right.w, left.x + right.x, left.y + right.y, left.z + right.z)
 
     override fun scale(a: Quaternion, value: Double): Quaternion =
         Quaternion(a.w * value, a.x * value, a.y * value, a.z * value)
 
-    override fun multiply(a: Quaternion, b: Quaternion): Quaternion = Quaternion(
-        a.w * b.w - a.x * b.x - a.y * b.y - a.z * b.z,
-        a.w * b.x + a.x * b.w + a.y * b.z - a.z * b.y,
-        a.w * b.y - a.x * b.z + a.y * b.w + a.z * b.x,
-        a.w * b.z + a.x * b.y - a.y * b.x + a.z * b.w,
+    override fun multiply(left: Quaternion, right: Quaternion): Quaternion = Quaternion(
+        left.w * right.w - left.x * right.x - left.y * right.y - left.z * right.z,
+        left.w * right.x + left.x * right.w + left.y * right.z - left.z * right.y,
+        left.w * right.y - left.x * right.z + left.y * right.w + left.z * right.x,
+        left.w * right.z + left.x * right.y - left.y * right.x + left.z * right.w,
     )
 
-    override fun divide(a: Quaternion, b: Quaternion): Quaternion {
-        val s = b.w * b.w + b.x * b.x + b.y * b.y + b.z * b.z
+    override fun divide(left: Quaternion, right: Quaternion): Quaternion {
+        val s = right.w * right.w + right.x * right.x + right.y * right.y + right.z * right.z
 
         return Quaternion(
-            (b.w * a.w + b.x * a.x + b.y * a.y + b.z * a.z) / s,
-            (b.w * a.x - b.x * a.w - b.y * a.z + b.z * a.y) / s,
-            (b.w * a.y + b.x * a.z - b.y * a.w - b.z * a.x) / s,
-            (b.w * a.z - b.x * a.y + b.y * a.x - b.z * a.w) / s,
+            (right.w * left.w + right.x * left.x + right.y * left.y + right.z * left.z) / s,
+            (right.w * left.x - right.x * left.w - right.y * left.z + right.z * left.y) / s,
+            (right.w * left.y + right.x * left.z - right.y * left.w - right.z * left.x) / s,
+            (right.w * left.z - right.x * left.y + right.y * left.x - right.z * left.w) / s,
         )
     }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
index 1baca0f55..661680565 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
@@ -57,8 +57,8 @@ public open class FunctionalExpressionGroup<T, out A : Group<T>>(
     /**
      * Builds an Expression of addition of two another expressions.
      */
-    override fun add(a: Expression<T>, b: Expression<T>): Expression<T> =
-        binaryOperation(GroupOps.PLUS_OPERATION, a, b)
+    override fun add(left: Expression<T>, right: Expression<T>): Expression<T> =
+        binaryOperation(GroupOps.PLUS_OPERATION, left, right)
 
 //    /**
 //     * Builds an Expression of multiplication of expression by number.
@@ -88,8 +88,8 @@ public open class FunctionalExpressionRing<T, out A : Ring<T>>(
     /**
      * Builds an Expression of multiplication of two expressions.
      */
-    override fun multiply(a: Expression<T>, b: Expression<T>): Expression<T> =
-        binaryOperationFunction(RingOps.TIMES_OPERATION)(a, b)
+    override fun multiply(left: Expression<T>, right: Expression<T>): Expression<T> =
+        binaryOperationFunction(RingOps.TIMES_OPERATION)(left, right)
 
     public operator fun Expression<T>.times(arg: T): Expression<T> = this * const(arg)
     public operator fun T.times(arg: Expression<T>): Expression<T> = arg * this
@@ -107,8 +107,8 @@ public open class FunctionalExpressionField<T, out A : Field<T>>(
     /**
      * Builds an Expression of division an expression by another one.
      */
-    override fun divide(a: Expression<T>, b: Expression<T>): Expression<T> =
-        binaryOperationFunction(FieldOps.DIV_OPERATION)(a, b)
+    override fun divide(left: Expression<T>, right: Expression<T>): Expression<T> =
+        binaryOperationFunction(FieldOps.DIV_OPERATION)(left, right)
 
     public operator fun Expression<T>.div(arg: T): Expression<T> = this / const(arg)
     public operator fun T.div(arg: Expression<T>): Expression<T> = arg / this
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
index 360715408..dd3c46207 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
@@ -31,15 +31,15 @@ public object MstGroup : Group<MST>, NumericAlgebra<MST>, ScaleOperations<MST> {
 
     override fun number(value: Number): MST.Numeric = MstNumericAlgebra.number(value)
     override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
-    override fun add(a: MST, b: MST): MST.Binary = binaryOperationFunction(GroupOps.PLUS_OPERATION)(a, b)
+    override fun add(left: MST, right: MST): MST.Binary = binaryOperationFunction(GroupOps.PLUS_OPERATION)(left, right)
     override operator fun MST.unaryPlus(): MST.Unary =
         unaryOperationFunction(GroupOps.PLUS_OPERATION)(this)
 
     override operator fun MST.unaryMinus(): MST.Unary =
         unaryOperationFunction(GroupOps.MINUS_OPERATION)(this)
 
-    override operator fun MST.minus(b: MST): MST.Binary =
-        binaryOperationFunction(GroupOps.MINUS_OPERATION)(this, b)
+    override operator fun MST.minus(other: MST): MST.Binary =
+        binaryOperationFunction(GroupOps.MINUS_OPERATION)(this, other)
 
     override fun scale(a: MST, value: Double): MST.Binary =
         binaryOperationFunction(RingOps.TIMES_OPERATION)(a, number(value))
@@ -62,17 +62,17 @@ public object MstRing : Ring<MST>, NumbersAddOps<MST>, ScaleOperations<MST> {
 
     override fun number(value: Number): MST.Numeric = MstGroup.number(value)
     override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
-    override fun add(a: MST, b: MST): MST.Binary = MstGroup.add(a, b)
+    override fun add(left: MST, right: MST): MST.Binary = MstGroup.add(left, right)
 
     override fun scale(a: MST, value: Double): MST.Binary =
         MstGroup.binaryOperationFunction(RingOps.TIMES_OPERATION)(a, MstGroup.number(value))
 
-    override fun multiply(a: MST, b: MST): MST.Binary =
-        binaryOperationFunction(RingOps.TIMES_OPERATION)(a, b)
+    override fun multiply(left: MST, right: MST): MST.Binary =
+        binaryOperationFunction(RingOps.TIMES_OPERATION)(left, right)
 
     override operator fun MST.unaryPlus(): MST.Unary = MstGroup { +this@unaryPlus }
     override operator fun MST.unaryMinus(): MST.Unary = MstGroup { -this@unaryMinus }
-    override operator fun MST.minus(b: MST): MST.Binary = MstGroup { this@minus - b }
+    override operator fun MST.minus(other: MST): MST.Binary = MstGroup { this@minus - other }
 
     override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
         MstGroup.binaryOperationFunction(operation)
@@ -92,18 +92,18 @@ public object MstField : Field<MST>, NumbersAddOps<MST>, ScaleOperations<MST> {
 
     override fun bindSymbolOrNull(value: String): Symbol = MstNumericAlgebra.bindSymbolOrNull(value)
     override fun number(value: Number): MST.Numeric = MstRing.number(value)
-    override fun add(a: MST, b: MST): MST.Binary = MstRing.add(a, b)
+    override fun add(left: MST, right: MST): MST.Binary = MstRing.add(left, right)
 
     override fun scale(a: MST, value: Double): MST.Binary =
         MstGroup.binaryOperationFunction(RingOps.TIMES_OPERATION)(a, MstGroup.number(value))
 
-    override fun multiply(a: MST, b: MST): MST.Binary = MstRing.multiply(a, b)
-    override fun divide(a: MST, b: MST): MST.Binary =
-        binaryOperationFunction(FieldOps.DIV_OPERATION)(a, b)
+    override fun multiply(left: MST, right: MST): MST.Binary = MstRing.multiply(left, right)
+    override fun divide(left: MST, right: MST): MST.Binary =
+        binaryOperationFunction(FieldOps.DIV_OPERATION)(left, right)
 
     override operator fun MST.unaryPlus(): MST.Unary = MstRing { +this@unaryPlus }
     override operator fun MST.unaryMinus(): MST.Unary = MstRing { -this@unaryMinus }
-    override operator fun MST.minus(b: MST): MST.Binary = MstRing { this@minus - b }
+    override operator fun MST.minus(other: MST): MST.Binary = MstRing { this@minus - other }
 
     override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
         MstRing.binaryOperationFunction(operation)
@@ -134,17 +134,17 @@ public object MstExtendedField : ExtendedField<MST>, NumericAlgebra<MST> {
     override fun asinh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.ASINH_OPERATION)(arg)
     override fun acosh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.ACOSH_OPERATION)(arg)
     override fun atanh(arg: MST): MST.Unary = unaryOperationFunction(ExponentialOperations.ATANH_OPERATION)(arg)
-    override fun add(a: MST, b: MST): MST.Binary = MstField.add(a, b)
+    override fun add(left: MST, right: MST): MST.Binary = MstField.add(left, right)
     override fun sqrt(arg: MST): MST = unaryOperationFunction(PowerOperations.SQRT_OPERATION)(arg)
 
     override fun scale(a: MST, value: Double): MST =
         binaryOperation(GroupOps.PLUS_OPERATION, a, number(value))
 
-    override fun multiply(a: MST, b: MST): MST.Binary = MstField.multiply(a, b)
-    override fun divide(a: MST, b: MST): MST.Binary = MstField.divide(a, b)
+    override fun multiply(left: MST, right: MST): MST.Binary = MstField.multiply(left, right)
+    override fun divide(left: MST, right: MST): MST.Binary = MstField.divide(left, right)
     override operator fun MST.unaryPlus(): MST.Unary = MstField { +this@unaryPlus }
     override operator fun MST.unaryMinus(): MST.Unary = MstField { -this@unaryMinus }
-    override operator fun MST.minus(b: MST): MST.Binary = MstField { this@minus - b }
+    override operator fun MST.minus(other: MST): MST.Binary = MstField { this@minus - other }
 
     override fun power(arg: MST, pow: Number): MST.Binary =
         binaryOperationFunction(PowerOperations.POW_OPERATION)(arg, number(pow))
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
index 089503dc8..704c4edd8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
@@ -168,22 +168,22 @@ public open class SimpleAutoDiffField<T : Any, F : Field<T>>(
 
     // Basic math (+, -, *, /)
 
-    override fun add(a: AutoDiffValue<T>, b: AutoDiffValue<T>): AutoDiffValue<T> =
-        derive(const { a.value + b.value }) { z ->
-            a.d += z.d
-            b.d += z.d
+    override fun add(left: AutoDiffValue<T>, right: AutoDiffValue<T>): AutoDiffValue<T> =
+        derive(const { left.value + right.value }) { z ->
+            left.d += z.d
+            right.d += z.d
         }
 
-    override fun multiply(a: AutoDiffValue<T>, b: AutoDiffValue<T>): AutoDiffValue<T> =
-        derive(const { a.value * b.value }) { z ->
-            a.d += z.d * b.value
-            b.d += z.d * a.value
+    override fun multiply(left: AutoDiffValue<T>, right: AutoDiffValue<T>): AutoDiffValue<T> =
+        derive(const { left.value * right.value }) { z ->
+            left.d += z.d * right.value
+            right.d += z.d * left.value
         }
 
-    override fun divide(a: AutoDiffValue<T>, b: AutoDiffValue<T>): AutoDiffValue<T> =
-        derive(const { a.value / b.value }) { z ->
-            a.d += z.d / b.value
-            b.d -= z.d * a.value / (b.value * b.value)
+    override fun divide(left: AutoDiffValue<T>, right: AutoDiffValue<T>): AutoDiffValue<T> =
+        derive(const { left.value / right.value }) { z ->
+            left.d += z.d / right.value
+            right.d -= z.d * left.value / (right.value * right.value)
         }
 
     override fun scale(a: AutoDiffValue<T>, value: Double): AutoDiffValue<T> =
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index dde04a97a..3f9b43f03 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -100,12 +100,12 @@ public interface GroupOpsND<T, out A : GroupOps<T>> : GroupOps<StructureND<T>>,
     /**
      * Element-wise addition.
      *
-     * @param a the augend.
-     * @param b the addend.
+     * @param left the augend.
+     * @param right the addend.
      * @return the sum.
      */
-    override fun add(a: StructureND<T>, b: StructureND<T>): StructureND<T> =
-        zip(a, b) { aValue, bValue -> add(aValue, bValue) }
+    override fun add(left: StructureND<T>, right: StructureND<T>): StructureND<T> =
+        zip(left, right) { aValue, bValue -> add(aValue, bValue) }
 
     // TODO move to extensions after KEEP-176
 
@@ -134,7 +134,7 @@ public interface GroupOpsND<T, out A : GroupOps<T>> : GroupOps<StructureND<T>>,
      * @param arg the addend.
      * @return the sum.
      */
-    public operator fun T.plus(arg: StructureND<T>): StructureND<T> = arg.map { value -> add(this@plus, value) }
+    public operator fun T.plus(arg: StructureND<T>): StructureND<T> = arg + this
 
     /**
      * Subtracts an ND structure from an element of it.
@@ -162,12 +162,12 @@ public interface RingOpsND<T, out A : RingOps<T>> : RingOps<StructureND<T>>, Gro
     /**
      * Element-wise multiplication.
      *
-     * @param a the multiplicand.
-     * @param b the multiplier.
+     * @param left the multiplicand.
+     * @param right the multiplier.
      * @return the product.
      */
-    override fun multiply(a: StructureND<T>, b: StructureND<T>): StructureND<T> =
-        zip(a, b) { aValue, bValue -> multiply(aValue, bValue) }
+    override fun multiply(left: StructureND<T>, right: StructureND<T>): StructureND<T> =
+        zip(left, right) { aValue, bValue -> multiply(aValue, bValue) }
 
     //TODO move to extensions after KEEP-176
 
@@ -208,12 +208,12 @@ public interface FieldOpsND<T, out A : Field<T>> : FieldOps<StructureND<T>>, Rin
     /**
      * Element-wise division.
      *
-     * @param a the dividend.
-     * @param b the divisor.
+     * @param left the dividend.
+     * @param right the divisor.
      * @return the quotient.
      */
-    override fun divide(a: StructureND<T>, b: StructureND<T>): StructureND<T> =
-        zip(a, b) { aValue, bValue -> divide(aValue, bValue) }
+    override fun divide(left: StructureND<T>, right: StructureND<T>): StructureND<T> =
+        zip(left, right) { aValue, bValue -> divide(aValue, bValue) }
 
     //TODO move to extensions after https://github.com/Kotlin/KEEP/blob/master/proposals/context-receivers.md
     /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index 06534c5e5..c94988eef 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -73,7 +73,7 @@ internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.zipInline(
     r: BufferND<T>,
     crossinline block: A.(l: T, r: T) -> T
 ): BufferND<T> {
-    require(l.indexes == r.indexes)
+    require(l.indexes == r.indexes) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
     val indexes = l.indexes
     return BufferND(indexes, bufferAlgebra.zipInline(l.buffer, r.buffer, block))
 }
@@ -114,6 +114,10 @@ public fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.produce(
     initializer: A.(IntArray) -> T
 ): BufferND<T> = produce(shape, initializer)
 
+public fun <T, EA : Algebra<T>, A> A.produce(
+    initializer: EA.(IntArray) -> T
+): BufferND<T> where A : BufferAlgebraND<T, EA>, A : WithShape = produce(shape, initializer)
+
 //// group factories
 //public fun <T, A : Group<T>> A.ndAlgebra(
 //    bufferAlgebra: BufferAlgebra<T, A>,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 9eba401ab..c17632101 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -20,7 +20,7 @@ import space.kscience.kmath.structures.MutableBufferFactory
  */
 public open class BufferND<out T>(
     public val indexes: ShapeIndex,
-    public val buffer: Buffer<T>,
+    public open val buffer: Buffer<T>,
 ) : StructureND<T> {
 
     override operator fun get(index: IntArray): T = buffer[indexes.offset(index)]
@@ -55,14 +55,14 @@ public inline fun <T, reified R : Any> StructureND<T>.mapToBuffer(
  *
  * @param T the type of items.
  * @param strides The strides to access elements of [MutableBuffer] by linear indices.
- * @param mutableBuffer The underlying buffer.
+ * @param buffer The underlying buffer.
  */
 public class MutableBufferND<T>(
     strides: ShapeIndex,
-    public val mutableBuffer: MutableBuffer<T>,
-) : MutableStructureND<T>, BufferND<T>(strides, mutableBuffer) {
+    override val buffer: MutableBuffer<T>,
+) : MutableStructureND<T>, BufferND<T>(strides, buffer) {
     override fun set(index: IntArray, value: T) {
-        mutableBuffer[indexes.offset(index)] = value
+        buffer[indexes.offset(index)] = value
     }
 }
 
@@ -74,7 +74,7 @@ public inline fun <T, reified R : Any> MutableStructureND<T>.mapToMutableBuffer(
     crossinline transform: (T) -> R,
 ): MutableBufferND<R> {
     return if (this is MutableBufferND<T>)
-        MutableBufferND(this.indexes, factory.invoke(indexes.linearSize) { transform(mutableBuffer[it]) })
+        MutableBufferND(this.indexes, factory.invoke(indexes.linearSize) { transform(buffer[it]) })
     else {
         val strides = DefaultStrides(shape)
         MutableBufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 294c44ec4..1502a6fd0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -10,42 +10,132 @@ import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
+import kotlin.math.pow
+
+public class DoubleBufferND(
+    indexes: ShapeIndex,
+    override val buffer: DoubleBuffer,
+) : BufferND<Double>(indexes, buffer)
+
 
 public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(DoubleField.bufferAlgebra),
     ScaleOperations<StructureND<Double>>, ExtendedFieldOps<StructureND<Double>> {
 
-    override fun StructureND<Double>.toBufferND(): BufferND<Double> = when (this) {
-        is BufferND -> this
+    override fun StructureND<Double>.toBufferND(): DoubleBufferND = when (this) {
+        is DoubleBufferND -> this
         else -> {
             val indexer = indexerBuilder(shape)
-            BufferND(indexer, DoubleBuffer(indexer.linearSize) { offset -> get(indexer.index(offset)) })
+            DoubleBufferND(indexer, DoubleBuffer(indexer.linearSize) { offset -> get(indexer.index(offset)) })
         }
     }
 
-    //TODO do specialization
+    private inline fun mapInline(
+        arg: DoubleBufferND,
+        transform: (Double) -> Double
+    ): DoubleBufferND {
+        val indexes = arg.indexes
+        val array = arg.buffer.array
+        return DoubleBufferND(indexes, DoubleBuffer(indexes.linearSize) { transform(array[it]) })
+    }
 
-    override fun scale(a: StructureND<Double>, value: Double): BufferND<Double> =
+    private inline fun zipInline(
+        l: DoubleBufferND,
+        r: DoubleBufferND,
+        block: (l: Double, r: Double) -> Double
+    ): DoubleBufferND {
+        require(l.indexes == r.indexes) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
+        val indexes = l.indexes
+        val lArray = l.buffer.array
+        val rArray = r.buffer.array
+        return DoubleBufferND(indexes, DoubleBuffer(indexes.linearSize) { block(lArray[it], rArray[it]) })
+    }
+
+    override fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): BufferND<Double> =
+        mapInline(toBufferND()) { DoubleField.transform(it) }
+
+
+    override fun zip(
+        left: StructureND<Double>,
+        right: StructureND<Double>,
+        transform: DoubleField.(Double, Double) -> Double
+    ): BufferND<Double> = zipInline(left.toBufferND(), right.toBufferND()) { l, r -> DoubleField.transform(l, r) }
+
+    override fun produce(shape: Shape, initializer: DoubleField.(IntArray) -> Double): DoubleBufferND {
+        val indexer = indexerBuilder(shape)
+        return DoubleBufferND(
+            indexer,
+            DoubleBuffer(indexer.linearSize) { offset ->
+                elementAlgebra.initializer(indexer.index(offset))
+            }
+        )
+    }
+
+    override fun add(left: StructureND<Double>, right: StructureND<Double>): DoubleBufferND =
+        zipInline(left.toBufferND(), right.toBufferND()) { l, r -> l + r }
+
+    override fun multiply(left: StructureND<Double>, right: StructureND<Double>): DoubleBufferND =
+        zipInline(left.toBufferND(), right.toBufferND()) { l, r -> l * r }
+
+    override fun StructureND<Double>.unaryMinus(): DoubleBufferND = mapInline(toBufferND()) { -it }
+
+    override fun StructureND<Double>.div(other: StructureND<Double>): DoubleBufferND =
+        zipInline(toBufferND(), other.toBufferND()) { l, r -> l / r }
+
+    override fun StructureND<Double>.plus(arg: Double): DoubleBufferND = mapInline(toBufferND()) { it + arg }
+
+    override fun StructureND<Double>.minus(arg: Double): StructureND<Double> = mapInline(toBufferND()) { it - arg }
+
+    override fun Double.plus(arg: StructureND<Double>): StructureND<Double> = arg + this
+
+    override fun Double.minus(arg: StructureND<Double>): StructureND<Double> = mapInline(arg.toBufferND()) { this - it }
+
+    override fun scale(a: StructureND<Double>, value: Double): DoubleBufferND =
         mapInline(a.toBufferND()) { it * value }
 
-    override fun power(arg: StructureND<Double>, pow: Number): BufferND<Double> =
-        mapInline(arg.toBufferND()) { power(it, pow) }
+    override fun power(arg: StructureND<Double>, pow: Number): DoubleBufferND =
+        mapInline(arg.toBufferND()) { it.pow(pow.toDouble()) }
 
-    override fun exp(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { exp(it) }
-    override fun ln(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { ln(it) }
+    override fun exp(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.exp(it) }
 
-    override fun sin(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { sin(it) }
-    override fun cos(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { cos(it) }
-    override fun tan(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { tan(it) }
-    override fun asin(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { asin(it) }
-    override fun acos(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { acos(it) }
-    override fun atan(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { atan(it) }
+    override fun ln(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.ln(it) }
 
-    override fun sinh(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { sinh(it) }
-    override fun cosh(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { cosh(it) }
-    override fun tanh(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { tanh(it) }
-    override fun asinh(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { asinh(it) }
-    override fun acosh(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { acosh(it) }
-    override fun atanh(arg: StructureND<Double>): BufferND<Double> = mapInline(arg.toBufferND()) { atanh(it) }
+    override fun sin(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.sin(it) }
+
+    override fun cos(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.cos(it) }
+
+    override fun tan(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.tan(it) }
+
+    override fun asin(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.asin(it) }
+
+    override fun acos(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.acos(it) }
+
+    override fun atan(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.atan(it) }
+
+    override fun sinh(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.sinh(it) }
+
+    override fun cosh(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.cosh(it) }
+
+    override fun tanh(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.tanh(it) }
+
+    override fun asinh(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.asinh(it) }
+
+    override fun acosh(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.acosh(it) }
+
+    override fun atanh(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { kotlin.math.atanh(it) }
 
     public companion object : DoubleFieldOpsND()
 }
@@ -54,7 +144,7 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
 public class DoubleFieldND(override val shape: Shape) :
     DoubleFieldOpsND(), FieldND<Double, DoubleField>, NumbersAddOps<StructureND<Double>> {
 
-    override fun number(value: Number): BufferND<Double> {
+    override fun number(value: Number): DoubleBufferND {
         val d = value.toDouble() // minimize conversions
         return produce(shape) { d }
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index d731ee4ee..d0b0c0b73 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -121,11 +121,11 @@ public interface GroupOps<T> : Algebra<T> {
     /**
      * Addition of two elements.
      *
-     * @param a the augend.
-     * @param b the addend.
+     * @param left the augend.
+     * @param right the addend.
      * @return the sum.
      */
-    public fun add(a: T, b: T): T
+    public fun add(left: T, right: T): T
 
     // Operations to be performed in this context. Could be moved to extensions in case of KEEP-176.
 
@@ -149,19 +149,19 @@ public interface GroupOps<T> : Algebra<T> {
      * Addition of two elements.
      *
      * @receiver the augend.
-     * @param b the addend.
+     * @param other the addend.
      * @return the sum.
      */
-    public operator fun T.plus(b: T): T = add(this, b)
+    public operator fun T.plus(other: T): T = add(this, other)
 
     /**
      * Subtraction of two elements.
      *
      * @receiver the minuend.
-     * @param b the subtrahend.
+     * @param other the subtrahend.
      * @return the difference.
      */
-    public operator fun T.minus(b: T): T = add(this, -b)
+    public operator fun T.minus(other: T): T = add(this, -other)
     // Dynamic dispatch of operations
     override fun unaryOperationFunction(operation: String): (arg: T) -> T = when (operation) {
         PLUS_OPERATION -> { arg -> +arg }
@@ -210,18 +210,18 @@ public interface RingOps<T> : GroupOps<T> {
     /**
      * Multiplies two elements.
      *
-     * @param a the multiplier.
-     * @param b the multiplicand.
+     * @param left the multiplier.
+     * @param right the multiplicand.
      */
-    public fun multiply(a: T, b: T): T
+    public fun multiply(left: T, right: T): T
 
     /**
      * Multiplies this element by scalar.
      *
      * @receiver the multiplier.
-     * @param b the multiplicand.
+     * @param other the multiplicand.
      */
-    public operator fun T.times(b: T): T = multiply(this, b)
+    public operator fun T.times(other: T): T = multiply(this, other)
 
     override fun binaryOperationFunction(operation: String): (left: T, right: T) -> T = when (operation) {
         TIMES_OPERATION -> ::multiply
@@ -260,20 +260,20 @@ public interface FieldOps<T> : RingOps<T> {
     /**
      * Division of two elements.
      *
-     * @param a the dividend.
-     * @param b the divisor.
+     * @param left the dividend.
+     * @param right the divisor.
      * @return the quotient.
      */
-    public fun divide(a: T, b: T): T
+    public fun divide(left: T, right: T): T
 
     /**
      * Division of two elements.
      *
      * @receiver the dividend.
-     * @param b the divisor.
+     * @param other the divisor.
      * @return the quotient.
      */
-    public operator fun T.div(b: T): T = divide(this, b)
+    public operator fun T.div(other: T): T = divide(this, other)
 
     override fun binaryOperationFunction(operation: String): (left: T, right: T) -> T = when (operation) {
         DIV_OPERATION -> ::divide
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 97e35e4b0..5a713049e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -34,10 +34,10 @@ public object BigIntField : Field<BigInt>, NumbersAddOps<BigInt>, ScaleOperation
 
     @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
     override fun BigInt.unaryMinus(): BigInt = -this
-    override fun add(a: BigInt, b: BigInt): BigInt = a.plus(b)
+    override fun add(left: BigInt, right: BigInt): BigInt = left.plus(right)
     override fun scale(a: BigInt, value: Double): BigInt = a.times(number(value))
-    override fun multiply(a: BigInt, b: BigInt): BigInt = a.times(b)
-    override fun divide(a: BigInt, b: BigInt): BigInt = a.div(b)
+    override fun multiply(left: BigInt, right: BigInt): BigInt = left.times(right)
+    override fun divide(left: BigInt, right: BigInt): BigInt = left.div(right)
 
     public operator fun String.unaryPlus(): BigInt = this.parseBigInteger() ?: error("Can't parse $this as big integer")
     public operator fun String.unaryMinus(): BigInt =
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
index 5a14e7734..bc05f3904 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
@@ -134,8 +134,8 @@ public open class BufferRingOps<T, A: Ring<T>>(
     override val bufferFactory: BufferFactory<T>,
 ) : BufferAlgebra<T, A>, RingOps<Buffer<T>>{
 
-    override fun add(a: Buffer<T>, b: Buffer<T>): Buffer<T> = zipInline(a, b) { l, r -> l + r }
-    override fun multiply(a: Buffer<T>, b: Buffer<T>): Buffer<T> = zipInline(a, b) { l, r -> l * r }
+    override fun add(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l + r }
+    override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l * r }
     override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
 
     override fun unaryOperationFunction(operation: String): (arg: Buffer<T>) -> Buffer<T> =
@@ -153,9 +153,9 @@ public open class BufferFieldOps<T, A : Field<T>>(
     bufferFactory: BufferFactory<T>,
 ) : BufferRingOps<T, A>(elementAlgebra, bufferFactory), BufferAlgebra<T, A>, FieldOps<Buffer<T>>, ScaleOperations<Buffer<T>> {
 
-    override fun add(a: Buffer<T>, b: Buffer<T>): Buffer<T> = zipInline(a, b) { l, r -> l + r }
-    override fun multiply(a: Buffer<T>, b: Buffer<T>): Buffer<T> = zipInline(a, b) { l, r -> l * r }
-    override fun divide(a: Buffer<T>, b: Buffer<T>): Buffer<T> = zipInline(a, b) { l, r -> l / r }
+    override fun add(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l + r }
+    override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l * r }
+    override fun divide(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l / r }
 
     override fun scale(a: Buffer<T>, value: Double): Buffer<T> = a.map { scale(it, value) }
     override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index 2580cd6f8..29b25aae8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -15,36 +15,37 @@ import kotlin.math.*
  * [ExtendedFieldOps] over [DoubleBuffer].
  */
 public abstract class DoubleBufferOps : ExtendedFieldOps<Buffer<Double>>, Norm<Buffer<Double>, Double> {
+
     override fun Buffer<Double>.unaryMinus(): DoubleBuffer = if (this is DoubleBuffer) {
         DoubleBuffer(size) { -array[it] }
     } else {
         DoubleBuffer(size) { -get(it) }
     }
 
-    override fun add(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
-        require(b.size == a.size) {
-            "The size of the first buffer ${a.size} should be the same as for second one: ${b.size} "
+    override fun add(left: Buffer<Double>, right: Buffer<Double>): DoubleBuffer {
+        require(right.size == left.size) {
+            "The size of the first buffer ${left.size} should be the same as for second one: ${right.size} "
         }
 
-        return if (a is DoubleBuffer && b is DoubleBuffer) {
-            val aArray = a.array
-            val bArray = b.array
-            DoubleBuffer(DoubleArray(a.size) { aArray[it] + bArray[it] })
-        } else DoubleBuffer(DoubleArray(a.size) { a[it] + b[it] })
+        return if (left is DoubleBuffer && right is DoubleBuffer) {
+            val aArray = left.array
+            val bArray = right.array
+            DoubleBuffer(DoubleArray(left.size) { aArray[it] + bArray[it] })
+        } else DoubleBuffer(DoubleArray(left.size) { left[it] + right[it] })
     }
 
-    override fun Buffer<Double>.plus(b: Buffer<Double>): DoubleBuffer = add(this, b)
+    override fun Buffer<Double>.plus(other: Buffer<Double>): DoubleBuffer = add(this, other)
 
-    override fun Buffer<Double>.minus(b: Buffer<Double>): DoubleBuffer {
-        require(b.size == this.size) {
-            "The size of the first buffer ${this.size} should be the same as for second one: ${b.size} "
+    override fun Buffer<Double>.minus(other: Buffer<Double>): DoubleBuffer {
+        require(other.size == this.size) {
+            "The size of the first buffer ${this.size} should be the same as for second one: ${other.size} "
         }
 
-        return if (this is DoubleBuffer && b is DoubleBuffer) {
+        return if (this is DoubleBuffer && other is DoubleBuffer) {
             val aArray = this.array
-            val bArray = b.array
+            val bArray = other.array
             DoubleBuffer(DoubleArray(this.size) { aArray[it] - bArray[it] })
-        } else DoubleBuffer(DoubleArray(this.size) { this[it] - b[it] })
+        } else DoubleBuffer(DoubleArray(this.size) { this[it] - other[it] })
     }
 
     //
@@ -66,29 +67,29 @@ public abstract class DoubleBufferOps : ExtendedFieldOps<Buffer<Double>>, Norm<B
 //        } else RealBuffer(DoubleArray(a.size) { a[it] / kValue })
 //    }
 
-    override fun multiply(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
-        require(b.size == a.size) {
-            "The size of the first buffer ${a.size} should be the same as for second one: ${b.size} "
+    override fun multiply(left: Buffer<Double>, right: Buffer<Double>): DoubleBuffer {
+        require(right.size == left.size) {
+            "The size of the first buffer ${left.size} should be the same as for second one: ${right.size} "
         }
 
-        return if (a is DoubleBuffer && b is DoubleBuffer) {
-            val aArray = a.array
-            val bArray = b.array
-            DoubleBuffer(DoubleArray(a.size) { aArray[it] * bArray[it] })
+        return if (left is DoubleBuffer && right is DoubleBuffer) {
+            val aArray = left.array
+            val bArray = right.array
+            DoubleBuffer(DoubleArray(left.size) { aArray[it] * bArray[it] })
         } else
-            DoubleBuffer(DoubleArray(a.size) { a[it] * b[it] })
+            DoubleBuffer(DoubleArray(left.size) { left[it] * right[it] })
     }
 
-    override fun divide(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
-        require(b.size == a.size) {
-            "The size of the first buffer ${a.size} should be the same as for second one: ${b.size} "
+    override fun divide(left: Buffer<Double>, right: Buffer<Double>): DoubleBuffer {
+        require(right.size == left.size) {
+            "The size of the first buffer ${left.size} should be the same as for second one: ${right.size} "
         }
 
-        return if (a is DoubleBuffer && b is DoubleBuffer) {
-            val aArray = a.array
-            val bArray = b.array
-            DoubleBuffer(DoubleArray(a.size) { aArray[it] / bArray[it] })
-        } else DoubleBuffer(DoubleArray(a.size) { a[it] / b[it] })
+        return if (left is DoubleBuffer && right is DoubleBuffer) {
+            val aArray = left.array
+            val bArray = right.array
+            DoubleBuffer(DoubleArray(left.size) { aArray[it] / bArray[it] })
+        } else DoubleBuffer(DoubleArray(left.size) { left[it] / right[it] })
     }
 
     override fun sin(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index c1775296c..1168dc6ba 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -73,10 +73,10 @@ public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOp
             else -> super<ExtendedField>.binaryOperationFunction(operation)
         }
 
-    override inline fun add(a: Double, b: Double): Double = a + b
+    override inline fun add(left: Double, right: Double): Double = left + right
 
-    override inline fun multiply(a: Double, b: Double): Double = a * b
-    override inline fun divide(a: Double, b: Double): Double = a / b
+    override inline fun multiply(left: Double, right: Double): Double = left * right
+    override inline fun divide(left: Double, right: Double): Double = left / right
 
     override inline fun scale(a: Double, value: Double): Double = a * value
 
@@ -102,10 +102,10 @@ public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOp
     override inline fun norm(arg: Double): Double = abs(arg)
 
     override inline fun Double.unaryMinus(): Double = -this
-    override inline fun Double.plus(b: Double): Double = this + b
-    override inline fun Double.minus(b: Double): Double = this - b
-    override inline fun Double.times(b: Double): Double = this * b
-    override inline fun Double.div(b: Double): Double = this / b
+    override inline fun Double.plus(other: Double): Double = this + other
+    override inline fun Double.minus(other: Double): Double = this - other
+    override inline fun Double.times(other: Double): Double = this * other
+    override inline fun Double.div(other: Double): Double = this / other
 }
 
 public val Double.Companion.algebra: DoubleField get() = DoubleField
@@ -126,12 +126,12 @@ public object FloatField : ExtendedField<Float>, Norm<Float, Float> {
             else -> super.binaryOperationFunction(operation)
         }
 
-    override inline fun add(a: Float, b: Float): Float = a + b
+    override inline fun add(left: Float, right: Float): Float = left + right
     override fun scale(a: Float, value: Double): Float = a * value.toFloat()
 
-    override inline fun multiply(a: Float, b: Float): Float = a * b
+    override inline fun multiply(left: Float, right: Float): Float = left * right
 
-    override inline fun divide(a: Float, b: Float): Float = a / b
+    override inline fun divide(left: Float, right: Float): Float = left / right
 
     override inline fun sin(arg: Float): Float = kotlin.math.sin(arg)
     override inline fun cos(arg: Float): Float = kotlin.math.cos(arg)
@@ -155,10 +155,10 @@ public object FloatField : ExtendedField<Float>, Norm<Float, Float> {
     override inline fun norm(arg: Float): Float = abs(arg)
 
     override inline fun Float.unaryMinus(): Float = -this
-    override inline fun Float.plus(b: Float): Float = this + b
-    override inline fun Float.minus(b: Float): Float = this - b
-    override inline fun Float.times(b: Float): Float = this * b
-    override inline fun Float.div(b: Float): Float = this / b
+    override inline fun Float.plus(other: Float): Float = this + other
+    override inline fun Float.minus(other: Float): Float = this - other
+    override inline fun Float.times(other: Float): Float = this * other
+    override inline fun Float.div(other: Float): Float = this / other
 }
 
 public val Float.Companion.algebra: FloatField get() = FloatField
@@ -175,14 +175,14 @@ public object IntRing : Ring<Int>, Norm<Int, Int>, NumericAlgebra<Int> {
         get() = 1
 
     override fun number(value: Number): Int = value.toInt()
-    override inline fun add(a: Int, b: Int): Int = a + b
-    override inline fun multiply(a: Int, b: Int): Int = a * b
+    override inline fun add(left: Int, right: Int): Int = left + right
+    override inline fun multiply(left: Int, right: Int): Int = left * right
     override inline fun norm(arg: Int): Int = abs(arg)
 
     override inline fun Int.unaryMinus(): Int = -this
-    override inline fun Int.plus(b: Int): Int = this + b
-    override inline fun Int.minus(b: Int): Int = this - b
-    override inline fun Int.times(b: Int): Int = this * b
+    override inline fun Int.plus(other: Int): Int = this + other
+    override inline fun Int.minus(other: Int): Int = this - other
+    override inline fun Int.times(other: Int): Int = this * other
 }
 
 public val Int.Companion.algebra: IntRing get() = IntRing
@@ -199,14 +199,14 @@ public object ShortRing : Ring<Short>, Norm<Short, Short>, NumericAlgebra<Short>
         get() = 1
 
     override fun number(value: Number): Short = value.toShort()
-    override inline fun add(a: Short, b: Short): Short = (a + b).toShort()
-    override inline fun multiply(a: Short, b: Short): Short = (a * b).toShort()
+    override inline fun add(left: Short, right: Short): Short = (left + right).toShort()
+    override inline fun multiply(left: Short, right: Short): Short = (left * right).toShort()
     override fun norm(arg: Short): Short = if (arg > 0) arg else (-arg).toShort()
 
     override inline fun Short.unaryMinus(): Short = (-this).toShort()
-    override inline fun Short.plus(b: Short): Short = (this + b).toShort()
-    override inline fun Short.minus(b: Short): Short = (this - b).toShort()
-    override inline fun Short.times(b: Short): Short = (this * b).toShort()
+    override inline fun Short.plus(other: Short): Short = (this + other).toShort()
+    override inline fun Short.minus(other: Short): Short = (this - other).toShort()
+    override inline fun Short.times(other: Short): Short = (this * other).toShort()
 }
 
 public val Short.Companion.algebra: ShortRing get() = ShortRing
@@ -223,14 +223,14 @@ public object ByteRing : Ring<Byte>, Norm<Byte, Byte>, NumericAlgebra<Byte> {
         get() = 1
 
     override fun number(value: Number): Byte = value.toByte()
-    override inline fun add(a: Byte, b: Byte): Byte = (a + b).toByte()
-    override inline fun multiply(a: Byte, b: Byte): Byte = (a * b).toByte()
+    override inline fun add(left: Byte, right: Byte): Byte = (left + right).toByte()
+    override inline fun multiply(left: Byte, right: Byte): Byte = (left * right).toByte()
     override fun norm(arg: Byte): Byte = if (arg > 0) arg else (-arg).toByte()
 
     override inline fun Byte.unaryMinus(): Byte = (-this).toByte()
-    override inline fun Byte.plus(b: Byte): Byte = (this + b).toByte()
-    override inline fun Byte.minus(b: Byte): Byte = (this - b).toByte()
-    override inline fun Byte.times(b: Byte): Byte = (this * b).toByte()
+    override inline fun Byte.plus(other: Byte): Byte = (this + other).toByte()
+    override inline fun Byte.minus(other: Byte): Byte = (this - other).toByte()
+    override inline fun Byte.times(other: Byte): Byte = (this * other).toByte()
 }
 
 public val Byte.Companion.algebra: ByteRing get() = ByteRing
@@ -247,14 +247,14 @@ public object LongRing : Ring<Long>, Norm<Long, Long>, NumericAlgebra<Long> {
         get() = 1L
 
     override fun number(value: Number): Long = value.toLong()
-    override inline fun add(a: Long, b: Long): Long = a + b
-    override inline fun multiply(a: Long, b: Long): Long = a * b
+    override inline fun add(left: Long, right: Long): Long = left + right
+    override inline fun multiply(left: Long, right: Long): Long = left * right
     override fun norm(arg: Long): Long = abs(arg)
 
     override inline fun Long.unaryMinus(): Long = (-this)
-    override inline fun Long.plus(b: Long): Long = (this + b)
-    override inline fun Long.minus(b: Long): Long = (this - b)
-    override inline fun Long.times(b: Long): Long = (this * b)
+    override inline fun Long.plus(other: Long): Long = (this + other)
+    override inline fun Long.minus(other: Long): Long = (this - other)
+    override inline fun Long.times(other: Long): Long = (this * other)
 }
 
 public val Long.Companion.algebra: LongRing get() = LongRing
diff --git a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
index 69dd858c4..3a9c242fc 100644
--- a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
+++ b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
@@ -18,9 +18,9 @@ public object JBigIntegerField : Ring<BigInteger>, NumericAlgebra<BigInteger> {
     override val one: BigInteger get() = BigInteger.ONE
 
     override fun number(value: Number): BigInteger = BigInteger.valueOf(value.toLong())
-    override fun add(a: BigInteger, b: BigInteger): BigInteger = a.add(b)
-    override operator fun BigInteger.minus(b: BigInteger): BigInteger = subtract(b)
-    override fun multiply(a: BigInteger, b: BigInteger): BigInteger = a.multiply(b)
+    override fun add(left: BigInteger, right: BigInteger): BigInteger = left.add(right)
+    override operator fun BigInteger.minus(other: BigInteger): BigInteger = subtract(other)
+    override fun multiply(left: BigInteger, right: BigInteger): BigInteger = left.multiply(right)
 
     override operator fun BigInteger.unaryMinus(): BigInteger = negate()
 }
@@ -39,15 +39,15 @@ public abstract class JBigDecimalFieldBase internal constructor(
     override val one: BigDecimal
         get() = BigDecimal.ONE
 
-    override fun add(a: BigDecimal, b: BigDecimal): BigDecimal = a.add(b)
-    override operator fun BigDecimal.minus(b: BigDecimal): BigDecimal = subtract(b)
+    override fun add(left: BigDecimal, right: BigDecimal): BigDecimal = left.add(right)
+    override operator fun BigDecimal.minus(other: BigDecimal): BigDecimal = subtract(other)
     override fun number(value: Number): BigDecimal = BigDecimal.valueOf(value.toDouble())
 
     override fun scale(a: BigDecimal, value: Double): BigDecimal =
         a.multiply(value.toBigDecimal(mathContext), mathContext)
 
-    override fun multiply(a: BigDecimal, b: BigDecimal): BigDecimal = a.multiply(b, mathContext)
-    override fun divide(a: BigDecimal, b: BigDecimal): BigDecimal = a.divide(b, mathContext)
+    override fun multiply(left: BigDecimal, right: BigDecimal): BigDecimal = left.multiply(right, mathContext)
+    override fun divide(left: BigDecimal, right: BigDecimal): BigDecimal = left.divide(right, mathContext)
     override fun power(arg: BigDecimal, pow: Number): BigDecimal = arg.pow(pow.toInt(), mathContext)
     override fun sqrt(arg: BigDecimal): BigDecimal = arg.sqrt(mathContext)
     override operator fun BigDecimal.unaryMinus(): BigDecimal = negate(mathContext)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 54b285a70..e862c0b9d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -104,12 +104,12 @@ public class PolynomialSpace<T, C>(
         Polynomial(coefficients.map { -it })
     }
 
-    override fun add(a: Polynomial<T>, b: Polynomial<T>): Polynomial<T> {
-        val dim = max(a.coefficients.size, b.coefficients.size)
+    override fun add(left: Polynomial<T>, right: Polynomial<T>): Polynomial<T> {
+        val dim = max(left.coefficients.size, right.coefficients.size)
 
         return ring {
             Polynomial(List(dim) { index ->
-                a.coefficients.getOrElse(index) { zero } + b.coefficients.getOrElse(index) { zero }
+                left.coefficients.getOrElse(index) { zero } + right.coefficients.getOrElse(index) { zero }
             })
         }
     }
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
index e8b1ce95b..5e3cbff83 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
@@ -47,7 +47,7 @@ public object Euclidean2DSpace : GeometrySpace<Vector2D>, ScaleOperations<Vector
     override fun Vector2D.unaryMinus(): Vector2D = Vector2D(-x, -y)
 
     override fun Vector2D.distanceTo(other: Vector2D): Double = (this - other).norm()
-    override fun add(a: Vector2D, b: Vector2D): Vector2D = Vector2D(a.x + b.x, a.y + b.y)
+    override fun add(left: Vector2D, right: Vector2D): Vector2D = Vector2D(left.x + right.x, left.y + right.y)
     override fun scale(a: Vector2D, value: Double): Vector2D = Vector2D(a.x * value, a.y * value)
     override fun Vector2D.dot(other: Vector2D): Double = x * other.x + y * other.y
 }
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index d567bee9a..96f307ed6 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -47,8 +47,8 @@ public object Euclidean3DSpace : GeometrySpace<Vector3D>, ScaleOperations<Vector
 
     override fun Vector3D.distanceTo(other: Vector3D): Double = (this - other).norm()
 
-    override fun add(a: Vector3D, b: Vector3D): Vector3D =
-        Vector3D(a.x + b.x, a.y + b.y, a.z + b.z)
+    override fun add(left: Vector3D, right: Vector3D): Vector3D =
+        Vector3D(left.x + right.x, left.y + right.y, left.z + right.z)
 
     override fun scale(a: Vector3D, value: Double): Vector3D =
         Vector3D(a.x * value, a.y * value, a.z * value)
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
index 7c719ccd7..a495577c3 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
@@ -67,10 +67,10 @@ public interface IndexedHistogramSpace<T : Comparable<T>, V : Any>
 
     public fun produce(builder: HistogramBuilder<T>.() -> Unit): IndexedHistogram<T, V>
 
-    override fun add(a: IndexedHistogram<T, V>, b: IndexedHistogram<T, V>): IndexedHistogram<T, V> {
-        require(a.context == this) { "Can't operate on a histogram produced by external space" }
-        require(b.context == this) { "Can't operate on a histogram produced by external space" }
-        return IndexedHistogram(this, histogramValueSpace { a.values + b.values })
+    override fun add(left: IndexedHistogram<T, V>, right: IndexedHistogram<T, V>): IndexedHistogram<T, V> {
+        require(left.context == this) { "Can't operate on a histogram produced by external space" }
+        require(right.context == this) { "Can't operate on a histogram produced by external space" }
+        return IndexedHistogram(this, histogramValueSpace { left.values + right.values })
     }
 
     override fun scale(a: IndexedHistogram<T, V>, value: Double): IndexedHistogram<T, V> {
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
index 96f945f6a..cc54d7e1a 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
@@ -88,20 +88,20 @@ public class TreeHistogramSpace(
         TreeHistogramBuilder(binFactory).apply(block).build()
 
     override fun add(
-        a: UnivariateHistogram,
-        b: UnivariateHistogram,
+        left: UnivariateHistogram,
+        right: UnivariateHistogram,
     ): UnivariateHistogram {
 //        require(a.context == this) { "Histogram $a does not belong to this context" }
 //        require(b.context == this) { "Histogram $b does not belong to this context" }
         val bins = TreeMap<Double, UnivariateBin>().apply {
-            (a.bins.map { it.domain } union b.bins.map { it.domain }).forEach { def ->
+            (left.bins.map { it.domain } union right.bins.map { it.domain }).forEach { def ->
                 put(
                     def.center,
                     UnivariateBin(
                         def,
-                        value = (a[def.center]?.value ?: 0.0) + (b[def.center]?.value ?: 0.0),
-                        standardDeviation = (a[def.center]?.standardDeviation
-                            ?: 0.0) + (b[def.center]?.standardDeviation ?: 0.0)
+                        value = (left[def.center]?.value ?: 0.0) + (right[def.center]?.value ?: 0.0),
+                        standardDeviation = (left[def.center]?.standardDeviation
+                            ?: 0.0) + (right[def.center]?.standardDeviation ?: 0.0)
                     )
                 )
             }
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
index 1a6e3325b..645a14e30 100644
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
@@ -28,10 +28,10 @@ public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, S
             else -> super<ExtendedField>.binaryOperationFunction(operation)
         }
 
-    override inline fun add(a: Double, b: Double): Double = a + b
+    override inline fun add(left: Double, right: Double): Double = left + right
 
-    override inline fun multiply(a: Double, b: Double): Double = a * b
-    override inline fun divide(a: Double, b: Double): Double = a / b
+    override inline fun multiply(left: Double, right: Double): Double = left * right
+    override inline fun divide(left: Double, right: Double): Double = left / right
 
     override inline fun scale(a: Double, value: Double): Double = a * value
 
@@ -57,10 +57,10 @@ public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, S
     override inline fun norm(arg: Double): Double = FastMath.abs(arg)
 
     override inline fun Double.unaryMinus(): Double = -this
-    override inline fun Double.plus(b: Double): Double = this + b
-    override inline fun Double.minus(b: Double): Double = this - b
-    override inline fun Double.times(b: Double): Double = this * b
-    override inline fun Double.div(b: Double): Double = this / b
+    override inline fun Double.plus(other: Double): Double = this + other
+    override inline fun Double.minus(other: Double): Double = this - other
+    override inline fun Double.times(other: Double): Double = this * other
+    override inline fun Double.div(other: Double): Double = this / other
 }
 
 /**
@@ -79,10 +79,10 @@ public object StrictJafamaDoubleField : ExtendedField<Double>, Norm<Double, Doub
             else -> super<ExtendedField>.binaryOperationFunction(operation)
         }
 
-    override inline fun add(a: Double, b: Double): Double = a + b
+    override inline fun add(left: Double, right: Double): Double = left + right
 
-    override inline fun multiply(a: Double, b: Double): Double = a * b
-    override inline fun divide(a: Double, b: Double): Double = a / b
+    override inline fun multiply(left: Double, right: Double): Double = left * right
+    override inline fun divide(left: Double, right: Double): Double = left / right
 
     override inline fun scale(a: Double, value: Double): Double = a * value
 
@@ -108,8 +108,8 @@ public object StrictJafamaDoubleField : ExtendedField<Double>, Norm<Double, Doub
     override inline fun norm(arg: Double): Double = StrictFastMath.abs(arg)
 
     override inline fun Double.unaryMinus(): Double = -this
-    override inline fun Double.plus(b: Double): Double = this + b
-    override inline fun Double.minus(b: Double): Double = this - b
-    override inline fun Double.times(b: Double): Double = this * b
-    override inline fun Double.div(b: Double): Double = this / b
+    override inline fun Double.plus(other: Double): Double = this + other
+    override inline fun Double.minus(other: Double): Double = this - other
+    override inline fun Double.times(other: Double): Double = this * other
+    override inline fun Double.div(other: Double): Double = this / other
 }
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index d65ad0dc9..792890a2d 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -72,11 +72,11 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
  */
 public sealed interface Nd4jArrayGroupOps<T, out S : Ring<T>> : GroupOpsND<T, S>, Nd4jArrayAlgebra<T, S> {
 
-    override fun add(a: StructureND<T>, b: StructureND<T>): Nd4jArrayStructure<T> =
-        a.ndArray.add(b.ndArray).wrap()
+    override fun add(left: StructureND<T>, right: StructureND<T>): Nd4jArrayStructure<T> =
+        left.ndArray.add(right.ndArray).wrap()
 
-    override operator fun StructureND<T>.minus(b: StructureND<T>): Nd4jArrayStructure<T> =
-        ndArray.sub(b.ndArray).wrap()
+    override operator fun StructureND<T>.minus(other: StructureND<T>): Nd4jArrayStructure<T> =
+        ndArray.sub(other.ndArray).wrap()
 
     override operator fun StructureND<T>.unaryMinus(): Nd4jArrayStructure<T> =
         ndArray.neg().wrap()
@@ -94,8 +94,8 @@ public sealed interface Nd4jArrayGroupOps<T, out S : Ring<T>> : GroupOpsND<T, S>
 @OptIn(UnstableKMathAPI::class)
 public sealed interface Nd4jArrayRingOps<T, out R : Ring<T>> : RingOpsND<T, R>, Nd4jArrayGroupOps<T, R> {
 
-    override fun multiply(a: StructureND<T>, b: StructureND<T>): Nd4jArrayStructure<T> =
-        a.ndArray.mul(b.ndArray).wrap()
+    override fun multiply(left: StructureND<T>, right: StructureND<T>): Nd4jArrayStructure<T> =
+        left.ndArray.mul(right.ndArray).wrap()
 //
 //    override operator fun Nd4jArrayStructure<T>.minus(b: Number): Nd4jArrayStructure<T> {
 //        check(this)
@@ -132,8 +132,8 @@ public sealed interface Nd4jArrayRingOps<T, out R : Ring<T>> : RingOpsND<T, R>,
  */
 public sealed interface Nd4jArrayField<T, out F : Field<T>> : FieldOpsND<T, F>, Nd4jArrayRingOps<T, F> {
 
-    override fun divide(a: StructureND<T>, b: StructureND<T>): Nd4jArrayStructure<T> =
-        a.ndArray.div(b.ndArray).wrap()
+    override fun divide(left: StructureND<T>, right: StructureND<T>): Nd4jArrayStructure<T> =
+        left.ndArray.div(right.ndArray).wrap()
 
     public operator fun Number.div(b: StructureND<T>): Nd4jArrayStructure<T> = b.ndArray.rdiv(this).wrap()
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
index c1bbace86..e0be72d4b 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
@@ -41,8 +41,8 @@ public class SamplerSpace<T : Any, out S>(public val algebra: S) : Group<Sampler
 
     override val zero: Sampler<T> = ConstantSampler(algebra.zero)
 
-    override fun add(a: Sampler<T>, b: Sampler<T>): Sampler<T> = BasicSampler { generator ->
-        a.sample(generator).zip(b.sample(generator)) { aValue, bValue -> algebra { aValue + bValue } }
+    override fun add(left: Sampler<T>, right: Sampler<T>): Sampler<T> = BasicSampler { generator ->
+        left.sample(generator).zip(right.sample(generator)) { aValue, bValue -> algebra { aValue + bValue } }
     }
 
     override fun scale(a: Sampler<T>, value: Double): Sampler<T> = BasicSampler { generator ->
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 6076748d9..810ebe777 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.api
 
-import space.kscience.kmath.operations.Algebra
+import space.kscience.kmath.operations.RingOps
 
 /**
  * Algebra over a ring on [Tensor].
@@ -13,7 +13,7 @@ import space.kscience.kmath.operations.Algebra
  *
  * @param T the type of items in the tensors.
  */
-public interface TensorAlgebra<T> : Algebra<Tensor<T>> {
+public interface TensorAlgebra<T> : RingOps<Tensor<T>> {
     /**
      * Returns a single tensor value of unit dimension if tensor shape equals to [1].
      *
@@ -53,7 +53,7 @@ public interface TensorAlgebra<T> : Algebra<Tensor<T>> {
      * @param other tensor to be added.
      * @return the sum of this tensor and [other].
      */
-    public operator fun Tensor<T>.plus(other: Tensor<T>): Tensor<T>
+    override fun Tensor<T>.plus(other: Tensor<T>): Tensor<T>
 
     /**
      * Adds the scalar [value] to each element of this tensor.
@@ -93,7 +93,7 @@ public interface TensorAlgebra<T> : Algebra<Tensor<T>> {
      * @param other tensor to be subtracted.
      * @return the difference between this tensor and [other].
      */
-    public operator fun Tensor<T>.minus(other: Tensor<T>): Tensor<T>
+    override fun Tensor<T>.minus(other: Tensor<T>): Tensor<T>
 
     /**
      * Subtracts the scalar [value] from each element of this tensor.
@@ -134,7 +134,7 @@ public interface TensorAlgebra<T> : Algebra<Tensor<T>> {
      * @param other tensor to be multiplied.
      * @return the product of this tensor and [other].
      */
-    public operator fun Tensor<T>.times(other: Tensor<T>): Tensor<T>
+    override fun Tensor<T>.times(other: Tensor<T>): Tensor<T>
 
     /**
      * Multiplies the scalar [value] by each element of this tensor.
@@ -155,7 +155,7 @@ public interface TensorAlgebra<T> : Algebra<Tensor<T>> {
      *
      * @return tensor negation of the original tensor.
      */
-    public operator fun Tensor<T>.unaryMinus(): Tensor<T>
+    override fun Tensor<T>.unaryMinus(): Tensor<T>
 
     /**
      * Returns the tensor at index i
@@ -323,4 +323,8 @@ public interface TensorAlgebra<T> : Algebra<Tensor<T>> {
      * @return the index of maximum value of each row of the input tensor in the given dimension [dim].
      */
     public fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T>
+
+    override fun add(left: Tensor<T>, right: Tensor<T>): Tensor<T> = left + right
+
+    override fun multiply(left: Tensor<T>, right: Tensor<T>): Tensor<T> = left * right
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index e0451c2eb..1f5778d5e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -27,7 +27,7 @@ internal fun <T> Tensor<T>.copyToBufferedTensor(): BufferedTensor<T> =
 internal fun <T> Tensor<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
     is BufferedTensor<T> -> this
     is MutableBufferND<T> -> if (this.indexes == TensorLinearStructure(this.shape)) {
-        BufferedTensor(this.shape, this.mutableBuffer, 0)
+        BufferedTensor(this.shape, this.buffer, 0)
     } else {
         this.copyToBufferedTensor()
     }
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index fca23bc16..a914542bc 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -88,17 +88,17 @@ public class ViktorFieldND(override val shape: IntArray) : FieldND<Double, Doubl
         }
     }.asStructure()
 
-    override fun add(a: StructureND<Double>, b: StructureND<Double>): ViktorStructureND =
-        (a.f64Buffer + b.f64Buffer).asStructure()
+    override fun add(left: StructureND<Double>, right: StructureND<Double>): ViktorStructureND =
+        (left.f64Buffer + right.f64Buffer).asStructure()
 
     override fun scale(a: StructureND<Double>, value: Double): ViktorStructureND =
         (a.f64Buffer * value).asStructure()
 
-    override inline fun StructureND<Double>.plus(b: StructureND<Double>): ViktorStructureND =
-        (f64Buffer + b.f64Buffer).asStructure()
+    override inline fun StructureND<Double>.plus(other: StructureND<Double>): ViktorStructureND =
+        (f64Buffer + other.f64Buffer).asStructure()
 
-    override inline fun StructureND<Double>.minus(b: StructureND<Double>): ViktorStructureND =
-        (f64Buffer - b.f64Buffer).asStructure()
+    override inline fun StructureND<Double>.minus(other: StructureND<Double>): ViktorStructureND =
+        (f64Buffer - other.f64Buffer).asStructure()
 
     override inline fun StructureND<Double>.times(k: Number): ViktorStructureND =
         (f64Buffer * k.toDouble()).asStructure()
-- 
2.34.1


From 4513b06e87d4bb2a16266eb5cba5e96167c0e0cd Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 17 Oct 2021 13:09:21 +0300
Subject: [PATCH 348/713] Shapeless ND and Buffer algebras

---
 .idea/copyright/kmath.xml                     |   6 -
 .idea/copyright/profiles_settings.xml         |  21 ---
 .idea/scopes/Apply_copyright.xml              |   4 -
 .../space/kscience/kmath/nd/AlgebraND.kt      |   4 +-
 .../kmath/operations/NumericAlgebra.kt        |   2 +-
 .../kscience/kmath/viktor/ViktorFieldOpsND.kt | 124 ++++++++++++++++++
 .../kmath/viktor/ViktorStructureND.kt         | 100 +-------------
 7 files changed, 130 insertions(+), 131 deletions(-)
 delete mode 100644 .idea/copyright/kmath.xml
 delete mode 100644 .idea/copyright/profiles_settings.xml
 delete mode 100644 .idea/scopes/Apply_copyright.xml
 create mode 100644 kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt

diff --git a/.idea/copyright/kmath.xml b/.idea/copyright/kmath.xml
deleted file mode 100644
index 1070e5d33..000000000
--- a/.idea/copyright/kmath.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="CopyrightManager">
-    <copyright>
-        <option name="notice" value="Copyright 2018-2021 KMath contributors.&#10;Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file." />
-        <option name="myName" value="kmath" />
-    </copyright>
-</component>
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index b538bdf41..000000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="kmath">
-    <module2copyright>
-      <element module="Apply copyright" copyright="kmath" />
-    </module2copyright>
-    <LanguageOptions name="Groovy">
-      <option name="fileTypeOverride" value="1" />
-    </LanguageOptions>
-    <LanguageOptions name="HTML">
-      <option name="fileTypeOverride" value="1" />
-      <option name="prefixLines" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="Properties">
-      <option name="fileTypeOverride" value="1" />
-    </LanguageOptions>
-    <LanguageOptions name="XML">
-      <option name="fileTypeOverride" value="1" />
-      <option name="prefixLines" value="false" />
-    </LanguageOptions>
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/scopes/Apply_copyright.xml b/.idea/scopes/Apply_copyright.xml
deleted file mode 100644
index 0eb589133..000000000
--- a/.idea/scopes/Apply_copyright.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<component name="DependencyValidationManager">
-    <scope name="Apply copyright"
-           pattern="!file[*]:*//testData//*&amp;&amp;!file[*]:testData//*&amp;&amp;!file[*]:*.gradle.kts&amp;&amp;!file[*]:*.gradle&amp;&amp;!file[group:kotlin-ultimate]:*/&amp;&amp;!file[kotlin.libraries]:stdlib/api//*"/>
-</component>
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index 3f9b43f03..b4e8b7487 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -203,7 +203,9 @@ public interface RingND<T, out A : Ring<T>> : Ring<StructureND<T>>, RingOpsND<T,
  * @param T the type of the element contained in ND structure.
  * @param A the type field over structure elements.
  */
-public interface FieldOpsND<T, out A : Field<T>> : FieldOps<StructureND<T>>, RingOpsND<T, A>,
+public interface FieldOpsND<T, out A : Field<T>> :
+    FieldOps<StructureND<T>>,
+    RingOpsND<T, A>,
     ScaleOperations<StructureND<T>> {
     /**
      * Element-wise division.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
index ca88ad42d..5f6848211 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
@@ -150,7 +150,7 @@ public interface ScaleOperations<T> : Algebra<T> {
  * TODO to be removed and replaced by extensions after multiple receivers are there
  */
 @UnstableKMathAPI
-public interface NumbersAddOps<T> : Ring<T>, NumericAlgebra<T> {
+public interface NumbersAddOps<T> : RingOps<T>, NumericAlgebra<T> {
     /**
      * Addition of element and scalar.
      *
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
new file mode 100644
index 000000000..c72553a64
--- /dev/null
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.viktor
+
+import org.jetbrains.bio.viktor.F64Array
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.nd.*
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.ExtendedFieldOps
+import space.kscience.kmath.operations.NumbersAddOps
+
+@OptIn(UnstableKMathAPI::class)
+@Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+public open class ViktorFieldOpsND :
+    FieldOpsND<Double, DoubleField>,
+    ExtendedFieldOps<StructureND<Double>> {
+
+    public val StructureND<Double>.f64Buffer: F64Array
+        get() = when (this) {
+            is ViktorStructureND -> this.f64Buffer
+            else -> produce(shape) { this@f64Buffer[it] }.f64Buffer
+        }
+
+    override val elementAlgebra: DoubleField get() = DoubleField
+
+    override fun produce(shape: IntArray, initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
+        F64Array(*shape).apply {
+            DefaultStrides(shape).indices().forEach { index ->
+                set(value = DoubleField.initializer(index), indices = index)
+            }
+        }.asStructure()
+
+    override fun StructureND<Double>.unaryMinus(): StructureND<Double> = -1 * this
+
+    override fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): ViktorStructureND =
+        F64Array(*shape).apply {
+            DefaultStrides(shape).indices().forEach { index ->
+                set(value = DoubleField.transform(this@map[index]), indices = index)
+            }
+        }.asStructure()
+
+    override fun StructureND<Double>.mapIndexed(
+        transform: DoubleField.(index: IntArray, Double) -> Double,
+    ): ViktorStructureND = F64Array(*shape).apply {
+        DefaultStrides(shape).indices().forEach { index ->
+            set(value = DoubleField.transform(index, this@mapIndexed[index]), indices = index)
+        }
+    }.asStructure()
+
+    override fun zip(
+        left: StructureND<Double>,
+        right: StructureND<Double>,
+        transform: DoubleField.(Double, Double) -> Double,
+    ): ViktorStructureND {
+        require(left.shape.contentEquals(right.shape))
+        return F64Array(*left.shape).apply {
+            DefaultStrides(left.shape).indices().forEach { index ->
+                set(value = DoubleField.transform(left[index], right[index]), indices = index)
+            }
+        }.asStructure()
+    }
+
+    override fun add(left: StructureND<Double>, right: StructureND<Double>): ViktorStructureND =
+        (left.f64Buffer + right.f64Buffer).asStructure()
+
+    override fun scale(a: StructureND<Double>, value: Double): ViktorStructureND =
+        (a.f64Buffer * value).asStructure()
+
+    override fun StructureND<Double>.plus(other: StructureND<Double>): ViktorStructureND =
+        (f64Buffer + other.f64Buffer).asStructure()
+
+    override fun StructureND<Double>.minus(other: StructureND<Double>): ViktorStructureND =
+        (f64Buffer - other.f64Buffer).asStructure()
+
+    override fun StructureND<Double>.times(k: Number): ViktorStructureND =
+        (f64Buffer * k.toDouble()).asStructure()
+
+    override fun StructureND<Double>.plus(arg: Double): ViktorStructureND =
+        (f64Buffer.plus(arg)).asStructure()
+
+    override fun sin(arg: StructureND<Double>): ViktorStructureND = arg.map { sin(it) }
+    override fun cos(arg: StructureND<Double>): ViktorStructureND = arg.map { cos(it) }
+    override fun tan(arg: StructureND<Double>): ViktorStructureND = arg.map { tan(it) }
+    override fun asin(arg: StructureND<Double>): ViktorStructureND = arg.map { asin(it) }
+    override fun acos(arg: StructureND<Double>): ViktorStructureND = arg.map { acos(it) }
+    override fun atan(arg: StructureND<Double>): ViktorStructureND = arg.map { atan(it) }
+
+    override fun power(arg: StructureND<Double>, pow: Number): ViktorStructureND = arg.map { it.pow(pow) }
+
+    override fun exp(arg: StructureND<Double>): ViktorStructureND = arg.f64Buffer.exp().asStructure()
+
+    override fun ln(arg: StructureND<Double>): ViktorStructureND = arg.f64Buffer.log().asStructure()
+
+    override fun sinh(arg: StructureND<Double>): ViktorStructureND = arg.map { sinh(it) }
+
+    override fun cosh(arg: StructureND<Double>): ViktorStructureND = arg.map { cosh(it) }
+
+    override fun asinh(arg: StructureND<Double>): ViktorStructureND = arg.map { asinh(it) }
+
+    override fun acosh(arg: StructureND<Double>): ViktorStructureND = arg.map { acosh(it) }
+
+    override fun atanh(arg: StructureND<Double>): ViktorStructureND = arg.map { atanh(it) }
+
+    public companion object : ViktorFieldOpsND()
+}
+
+public val DoubleField.viktorAlgebra: ViktorFieldOpsND get() = ViktorFieldOpsND
+
+public open class ViktorFieldND(
+    override val shape: Shape
+) : ViktorFieldOpsND(), FieldND<Double, DoubleField>, NumbersAddOps<StructureND<Double>> {
+    override val zero: ViktorStructureND by lazy { F64Array.full(init = 0.0, shape = shape).asStructure() }
+    override val one: ViktorStructureND by lazy { F64Array.full(init = 1.0, shape = shape).asStructure() }
+
+    override fun number(value: Number): ViktorStructureND =
+        F64Array.full(init = value.toDouble(), shape = shape).asStructure()
+}
+
+public fun DoubleField.viktorAlgebra(vararg shape: Int): ViktorFieldND = ViktorFieldND(shape)
+
+public fun ViktorFieldND(vararg shape: Int): ViktorFieldND = ViktorFieldND(shape)
\ No newline at end of file
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index a914542bc..0d29983f9 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -7,12 +7,8 @@ package space.kscience.kmath.viktor
 
 import org.jetbrains.bio.viktor.F64Array
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.*
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.ExtendedField
-import space.kscience.kmath.operations.NumbersAddOps
-import space.kscience.kmath.operations.ScaleOperations
+import space.kscience.kmath.nd.DefaultStrides
+import space.kscience.kmath.nd.MutableStructureND
 
 @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public class ViktorStructureND(public val f64Buffer: F64Array) : MutableStructureND<Double> {
@@ -31,96 +27,4 @@ public class ViktorStructureND(public val f64Buffer: F64Array) : MutableStructur
 
 public fun F64Array.asStructure(): ViktorStructureND = ViktorStructureND(this)
 
-@OptIn(UnstableKMathAPI::class)
-@Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-public class ViktorFieldND(override val shape: IntArray) : FieldND<Double, DoubleField>,
-    NumbersAddOps<StructureND<Double>>, ExtendedField<StructureND<Double>>,
-    ScaleOperations<StructureND<Double>> {
 
-    public val StructureND<Double>.f64Buffer: F64Array
-        get() = when {
-            !shape.contentEquals(this@ViktorFieldND.shape) -> throw ShapeMismatchException(
-                this@ViktorFieldND.shape,
-                shape
-            )
-            this is ViktorStructureND && this.f64Buffer.shape.contentEquals(this@ViktorFieldND.shape) -> this.f64Buffer
-            else -> produce(shape) { this@f64Buffer[it] }.f64Buffer
-        }
-
-    override val zero: ViktorStructureND by lazy { F64Array.full(init = 0.0, shape = shape).asStructure() }
-    override val one: ViktorStructureND by lazy { F64Array.full(init = 1.0, shape = shape).asStructure() }
-
-    private val strides: Strides = DefaultStrides(shape)
-
-    override val elementAlgebra: DoubleField get() = DoubleField
-
-    override fun produce(shape: IntArray, initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
-        F64Array(*shape).apply {
-            this@ViktorFieldND.strides.indices().forEach { index ->
-                set(value = DoubleField.initializer(index), indices = index)
-            }
-        }.asStructure()
-
-    override fun StructureND<Double>.unaryMinus(): StructureND<Double> = -1 * this
-
-    override fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): ViktorStructureND =
-        F64Array(*this@ViktorFieldND.shape).apply {
-            this@ViktorFieldND.strides.indices().forEach { index ->
-                set(value = DoubleField.transform(this@map[index]), indices = index)
-            }
-        }.asStructure()
-
-    override fun StructureND<Double>.mapIndexed(
-        transform: DoubleField.(index: IntArray, Double) -> Double,
-    ): ViktorStructureND = F64Array(*this@ViktorFieldND.shape).apply {
-        this@ViktorFieldND.strides.indices().forEach { index ->
-            set(value = DoubleField.transform(index, this@mapIndexed[index]), indices = index)
-        }
-    }.asStructure()
-
-    override fun zip(
-        left: StructureND<Double>,
-        right: StructureND<Double>,
-        transform: DoubleField.(Double, Double) -> Double,
-    ): ViktorStructureND = F64Array(*shape).apply {
-        this@ViktorFieldND.strides.indices().forEach { index ->
-            set(value = DoubleField.transform(left[index], right[index]), indices = index)
-        }
-    }.asStructure()
-
-    override fun add(left: StructureND<Double>, right: StructureND<Double>): ViktorStructureND =
-        (left.f64Buffer + right.f64Buffer).asStructure()
-
-    override fun scale(a: StructureND<Double>, value: Double): ViktorStructureND =
-        (a.f64Buffer * value).asStructure()
-
-    override inline fun StructureND<Double>.plus(other: StructureND<Double>): ViktorStructureND =
-        (f64Buffer + other.f64Buffer).asStructure()
-
-    override inline fun StructureND<Double>.minus(other: StructureND<Double>): ViktorStructureND =
-        (f64Buffer - other.f64Buffer).asStructure()
-
-    override inline fun StructureND<Double>.times(k: Number): ViktorStructureND =
-        (f64Buffer * k.toDouble()).asStructure()
-
-    override inline fun StructureND<Double>.plus(arg: Double): ViktorStructureND =
-        (f64Buffer.plus(arg)).asStructure()
-
-    override fun number(value: Number): ViktorStructureND =
-        F64Array.full(init = value.toDouble(), shape = shape).asStructure()
-
-    override fun sin(arg: StructureND<Double>): ViktorStructureND = arg.map { sin(it) }
-    override fun cos(arg: StructureND<Double>): ViktorStructureND = arg.map { cos(it) }
-    override fun tan(arg: StructureND<Double>): ViktorStructureND = arg.map { tan(it) }
-    override fun asin(arg: StructureND<Double>): ViktorStructureND = arg.map { asin(it) }
-    override fun acos(arg: StructureND<Double>): ViktorStructureND = arg.map { acos(it) }
-    override fun atan(arg: StructureND<Double>): ViktorStructureND = arg.map { atan(it) }
-
-    override fun power(arg: StructureND<Double>, pow: Number): ViktorStructureND = arg.map { it.pow(pow) }
-
-    override fun exp(arg: StructureND<Double>): ViktorStructureND = arg.f64Buffer.exp().asStructure()
-
-    override fun ln(arg: StructureND<Double>): ViktorStructureND = arg.f64Buffer.log().asStructure()
-}
-
-public fun ViktorFieldND(vararg shape: Int): ViktorFieldND = ViktorFieldND(shape)
-- 
2.34.1


From 6de43ee4bae0f224c44b798e82e00a60921d9b74 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 17 Oct 2021 13:52:40 +0300
Subject: [PATCH 349/713] update multik module

---
 .../src/main/kotlin/space/kscience/kmath/tensors/multik.kt     | 3 +++
 settings.gradle.kts                                            | 1 +
 2 files changed, 4 insertions(+)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
index 820a793ac..fc6d7dd56 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.tensors
 
 import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.linalg.dot
+import org.jetbrains.kotlinx.multik.api.math.exp
 import org.jetbrains.kotlinx.multik.api.ndarray
 import org.jetbrains.kotlinx.multik.ndarray.operations.minus
 import org.jetbrains.kotlinx.multik.ndarray.operations.plus
@@ -18,4 +19,6 @@ fun main() {
     2 + (-a) - 2
 
     a dot a
+
+    a.exp()
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index dc70cbb9e..e73381bf2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -32,6 +32,7 @@ include(
     ":kmath-histograms",
     ":kmath-commons",
     ":kmath-viktor",
+    ":kmath-multik",
     ":kmath-optimization",
     ":kmath-stat",
     ":kmath-nd4j",
-- 
2.34.1


From 9b9fe07044ff25b8ebc8bb25b57d951bae02dd36 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 17 Oct 2021 16:42:46 +0300
Subject: [PATCH 350/713] Specialized operations for ND algebra

---
 .../kmath/operations/mixedNDOperations.kt     | 24 ++++++++++++++++
 .../DerivativeStructureExpression.kt          |  8 +++---
 .../kscience/kmath/complex/Quaternion.kt      | 14 +++++-----
 .../space/kscience/kmath/nd/DoubleFieldND.kt  | 28 +++++++++++++++++++
 .../kmath/operations/NumericAlgebra.kt        | 20 ++++++-------
 5 files changed, 73 insertions(+), 21 deletions(-)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
new file mode 100644
index 000000000..628344ceb
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
@@ -0,0 +1,24 @@
+package space.kscience.kmath.operations
+
+import space.kscience.kmath.commons.linear.CMLinearSpace
+import space.kscience.kmath.linear.matrix
+import space.kscience.kmath.nd.DoubleBufferND
+import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.Structure2D
+import space.kscience.kmath.nd.ndAlgebra
+import space.kscience.kmath.viktor.ViktorStructureND
+import space.kscience.kmath.viktor.viktorAlgebra
+
+fun main() {
+    val viktorStructure: ViktorStructureND = DoubleField.viktorAlgebra.produce(Shape(2, 2)) { (i, j) ->
+        if (i == j) 2.0 else 0.0
+    }
+
+    val cmMatrix: Structure2D<Double> = CMLinearSpace.matrix(2, 2)(0.0, 1.0, 0.0, 3.0)
+
+    val res: DoubleBufferND = DoubleField.ndAlgebra {
+        exp(viktorStructure) + 2.0 * cmMatrix
+    }
+
+    println(res)
+}
\ No newline at end of file
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
index d42e40d1e..4d2bd6237 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
@@ -99,10 +99,10 @@ public class DerivativeStructureField(
     override fun exp(arg: DerivativeStructure): DerivativeStructure = arg.exp()
     override fun ln(arg: DerivativeStructure): DerivativeStructure = arg.log()
 
-    override operator fun DerivativeStructure.plus(b: Number): DerivativeStructure = add(b.toDouble())
-    override operator fun DerivativeStructure.minus(b: Number): DerivativeStructure = subtract(b.toDouble())
-    override operator fun Number.plus(b: DerivativeStructure): DerivativeStructure = b + this
-    override operator fun Number.minus(b: DerivativeStructure): DerivativeStructure = b - this
+    override operator fun DerivativeStructure.plus(other: Number): DerivativeStructure = add(other.toDouble())
+    override operator fun DerivativeStructure.minus(other: Number): DerivativeStructure = subtract(other.toDouble())
+    override operator fun Number.plus(other: DerivativeStructure): DerivativeStructure = other + this
+    override operator fun Number.minus(other: DerivativeStructure): DerivativeStructure = other - this
 }
 
 /**
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index 9fdd60e1f..47cc61313 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -158,16 +158,16 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
         return Quaternion(ln(n), th * arg.x, th * arg.y, th * arg.z)
     }
 
-    override operator fun Number.plus(b: Quaternion): Quaternion = Quaternion(toDouble() + b.w, b.x, b.y, b.z)
+    override operator fun Number.plus(other: Quaternion): Quaternion = Quaternion(toDouble() + other.w, other.x, other.y, other.z)
 
-    override operator fun Number.minus(b: Quaternion): Quaternion =
-        Quaternion(toDouble() - b.w, -b.x, -b.y, -b.z)
+    override operator fun Number.minus(other: Quaternion): Quaternion =
+        Quaternion(toDouble() - other.w, -other.x, -other.y, -other.z)
 
-    override operator fun Quaternion.plus(b: Number): Quaternion = Quaternion(w + b.toDouble(), x, y, z)
-    override operator fun Quaternion.minus(b: Number): Quaternion = Quaternion(w - b.toDouble(), x, y, z)
+    override operator fun Quaternion.plus(other: Number): Quaternion = Quaternion(w + other.toDouble(), x, y, z)
+    override operator fun Quaternion.minus(other: Number): Quaternion = Quaternion(w - other.toDouble(), x, y, z)
 
-    override operator fun Number.times(b: Quaternion): Quaternion =
-        Quaternion(toDouble() * b.w, toDouble() * b.x, toDouble() * b.y, toDouble() * b.z)
+    override operator fun Number.times(other: Quaternion): Quaternion =
+        Quaternion(toDouble() * other.w, toDouble() * other.x, toDouble() * other.y, toDouble() * other.z)
 
     override fun Quaternion.unaryMinus(): Quaternion = Quaternion(-w, -x, -y, -z)
     override fun norm(arg: Quaternion): Quaternion = sqrt(arg.conjugate * arg)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 1502a6fd0..6235971a2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -81,6 +81,34 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
     override fun StructureND<Double>.div(other: StructureND<Double>): DoubleBufferND =
         zipInline(toBufferND(), other.toBufferND()) { l, r -> l / r }
 
+    override fun divide(left: StructureND<Double>, right: StructureND<Double>): DoubleBufferND =
+        zipInline(left.toBufferND(), right.toBufferND()) { l: Double, r: Double -> l / r }
+
+    override fun StructureND<Double>.div(arg: Double): DoubleBufferND =
+        mapInline(toBufferND()) { it / arg }
+
+    override fun Double.div(arg: StructureND<Double>): DoubleBufferND =
+        mapInline(arg.toBufferND()) { this / it }
+
+    override fun StructureND<Double>.unaryPlus(): DoubleBufferND = toBufferND()
+
+    override fun StructureND<Double>.plus(other: StructureND<Double>): DoubleBufferND =
+        zipInline(toBufferND(), other.toBufferND()) { l: Double, r: Double -> l + r }
+
+    override fun StructureND<Double>.minus(other: StructureND<Double>): DoubleBufferND =
+        zipInline(toBufferND(), other.toBufferND()) { l: Double, r: Double -> l - r }
+
+    override fun StructureND<Double>.times(other: StructureND<Double>): DoubleBufferND =
+        zipInline(toBufferND(), other.toBufferND()) { l: Double, r: Double -> l * r }
+
+    override fun StructureND<Double>.times(k: Number): DoubleBufferND =
+        mapInline(toBufferND()) { it * k.toDouble() }
+
+    override fun StructureND<Double>.div(k: Number): DoubleBufferND =
+        mapInline(toBufferND()) { it / k.toDouble() }
+
+    override fun Number.times(other: StructureND<Double>): DoubleBufferND = other * this
+
     override fun StructureND<Double>.plus(arg: Double): DoubleBufferND = mapInline(toBufferND()) { it + arg }
 
     override fun StructureND<Double>.minus(arg: Double): StructureND<Double> = mapInline(toBufferND()) { it - arg }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
index 5f6848211..6be3449f9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
@@ -139,10 +139,10 @@ public interface ScaleOperations<T> : Algebra<T> {
      * Multiplication of this number by element.
      *
      * @receiver the multiplier.
-     * @param b the multiplicand.
+     * @param other the multiplicand.
      * @return the product.
      */
-    public operator fun Number.times(b: T): T = b * this
+    public operator fun Number.times(other: T): T = other * this
 }
 
 /**
@@ -155,33 +155,33 @@ public interface NumbersAddOps<T> : RingOps<T>, NumericAlgebra<T> {
      * Addition of element and scalar.
      *
      * @receiver the augend.
-     * @param b the addend.
+     * @param other the addend.
      */
-    public operator fun T.plus(b: Number): T = this + number(b)
+    public operator fun T.plus(other: Number): T = this + number(other)
 
     /**
      * Addition of scalar and element.
      *
      * @receiver the augend.
-     * @param b the addend.
+     * @param other the addend.
      */
-    public operator fun Number.plus(b: T): T = b + this
+    public operator fun Number.plus(other: T): T = other + this
 
     /**
      * Subtraction of element from number.
      *
      * @receiver the minuend.
-     * @param b the subtrahend.
+     * @param other the subtrahend.
      * @receiver the difference.
      */
-    public operator fun T.minus(b: Number): T = this - number(b)
+    public operator fun T.minus(other: Number): T = this - number(other)
 
     /**
      * Subtraction of number from element.
      *
      * @receiver the minuend.
-     * @param b the subtrahend.
+     * @param other the subtrahend.
      * @receiver the difference.
      */
-    public operator fun Number.minus(b: T): T = -b + this
+    public operator fun Number.minus(other: T): T = -other + this
 }
\ No newline at end of file
-- 
2.34.1


From 827f115a9257235e8e36ee43af06937e2488eb75 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 17 Oct 2021 21:12:14 +0300
Subject: [PATCH 351/713] Multik wrapper

---
 benchmarks/build.gradle.kts                   |   1 +
 .../kmath/benchmarks/NDFieldBenchmark.kt      |  24 +++-
 .../space/kscience/kmath/nd/ShapeIndex.kt     |  15 +-
 .../kscience/kmath/multik/MultikOpsND.kt      | 135 ++++++++++++++++++
 .../kmath/multik/MultikTensorAlgebra.kt       |  30 ++--
 .../kscience/kmath/multik/MultikNDTest.kt     |  13 ++
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   |   5 +-
 .../tensors/core/tensorAlgebraExtensions.kt   |  10 +-
 8 files changed, 204 insertions(+), 29 deletions(-)
 create mode 100644 kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt
 create mode 100644 kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 686c491b9..cca3d312d 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -48,6 +48,7 @@ kotlin {
                 implementation(project(":kmath-nd4j"))
                 implementation(project(":kmath-kotlingrad"))
                 implementation(project(":kmath-viktor"))
+                implementation(projects.kmathMultik)
                 implementation("org.nd4j:nd4j-native:1.0.0-M1")
                 //    uncomment if your system supports AVX2
                 //    val os = System.getProperty("os.name")
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index 7f7c03412..672aa4307 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -9,6 +9,7 @@ import kotlinx.benchmark.Benchmark
 import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
+import space.kscience.kmath.multik.multikND
 import space.kscience.kmath.nd.BufferedFieldOpsND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.ndAlgebra
@@ -17,8 +18,9 @@ import space.kscience.kmath.nd4j.nd4j
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.tensors.core.DoubleTensor
-import space.kscience.kmath.tensors.core.ones
+import space.kscience.kmath.tensors.core.one
 import space.kscience.kmath.tensors.core.tensorAlgebra
+import space.kscience.kmath.viktor.viktorAlgebra
 
 @State(Scope.Benchmark)
 internal class NDFieldBenchmark {
@@ -43,16 +45,30 @@ internal class NDFieldBenchmark {
         blackhole.consume(res)
     }
 
+    @Benchmark
+    fun multikAdd(blackhole: Blackhole) = with(multikField) {
+        var res: StructureND<Double> = one(shape)
+        repeat(n) { res += 1.0 }
+        blackhole.consume(res)
+    }
+
+    @Benchmark
+    fun viktorAdd(blackhole: Blackhole) = with(viktorField) {
+        var res: StructureND<Double> = one(shape)
+        repeat(n) { res += 1.0 }
+        blackhole.consume(res)
+    }
+
     @Benchmark
     fun tensorAdd(blackhole: Blackhole) = with(Double.tensorAlgebra) {
-        var res: DoubleTensor = ones(dim, dim)
+        var res: DoubleTensor = one(shape)
         repeat(n) { res = res + 1.0 }
         blackhole.consume(res)
     }
 
     @Benchmark
     fun tensorInPlaceAdd(blackhole: Blackhole) = with(Double.tensorAlgebra) {
-        val res: DoubleTensor = ones(dim, dim)
+        val res: DoubleTensor = one(shape)
         repeat(n) { res += 1.0 }
         blackhole.consume(res)
     }
@@ -72,5 +88,7 @@ internal class NDFieldBenchmark {
         private val specializedField = DoubleField.ndAlgebra
         private val genericField = BufferedFieldOpsND(DoubleField, Buffer.Companion::boxing)
         private val nd4jField = DoubleField.nd4j
+        private val multikField = DoubleField.multikND
+        private val viktorField = DoubleField.viktorAlgebra
     }
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndex.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndex.kt
index bdbae70c2..a78bcfa70 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndex.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndex.kt
@@ -105,16 +105,15 @@ public class DefaultStrides private constructor(override val shape: IntArray) :
 
     override fun hashCode(): Int = shape.contentHashCode()
 
-    @ThreadLocal
-    public companion object {
-        //private val defaultStridesCache = HashMap<IntArray, Strides>()
 
+    public companion object {
         /**
          * Cached builder for default strides
          */
-        public operator fun invoke(shape: IntArray): Strides = DefaultStrides(shape)
-            //defaultStridesCache.getOrPut(shape) { DefaultStrides(shape) }
-
-        //TODO fix cache
+        public operator fun invoke(shape: IntArray): Strides =
+            defaultStridesCache.getOrPut(shape) { DefaultStrides(shape) }
     }
-}
\ No newline at end of file
+}
+
+@ThreadLocal
+private val defaultStridesCache = HashMap<IntArray, Strides>()
\ No newline at end of file
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt
new file mode 100644
index 000000000..d6996d427
--- /dev/null
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt
@@ -0,0 +1,135 @@
+package space.kscience.kmath.multik
+
+import org.jetbrains.kotlinx.multik.api.mk
+import org.jetbrains.kotlinx.multik.api.zeros
+import org.jetbrains.kotlinx.multik.ndarray.data.*
+import org.jetbrains.kotlinx.multik.ndarray.operations.*
+import space.kscience.kmath.nd.FieldOpsND
+import space.kscience.kmath.nd.RingOpsND
+import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.*
+
+/**
+ * A ring algebra for Multik operations
+ */
+public open class MultikRingOpsND<T, A : Ring<T>> internal constructor(
+    public val type: DataType,
+    override val elementAlgebra: A
+) : RingOpsND<T, A> {
+
+    protected fun MutableMultiArray<T, DN>.wrap(): MultikTensor<T> = MultikTensor(this)
+
+    override fun produce(shape: Shape, initializer: A.(IntArray) -> T): MultikTensor<T> {
+        val res = mk.zeros<T, DN>(shape, type).asDNArray()
+        for (index in res.multiIndices) {
+            res[index] = elementAlgebra.initializer(index)
+        }
+        return res.wrap()
+    }
+
+    protected fun StructureND<T>.asMultik(): MultikTensor<T> = if (this is MultikTensor) {
+        this
+    } else {
+        produce(shape) { get(it) }
+    }
+
+    override fun StructureND<T>.map(transform: A.(T) -> T): MultikTensor<T> {
+        //taken directly from Multik sources
+        val array = asMultik().array
+        val data = initMemoryView<T>(array.size, type)
+        var count = 0
+        for (el in array) data[count++] = elementAlgebra.transform(el)
+        return NDArray(data, shape = array.shape, dim = array.dim).wrap()
+    }
+
+    override fun StructureND<T>.mapIndexed(transform: A.(index: IntArray, T) -> T): MultikTensor<T> {
+        //taken directly from Multik sources
+        val array = asMultik().array
+        val data = initMemoryView<T>(array.size, type)
+        val indexIter = array.multiIndices.iterator()
+        var index = 0
+        for (item in array) {
+            if (indexIter.hasNext()) {
+                data[index++] = elementAlgebra.transform(indexIter.next(), item)
+            } else {
+                throw ArithmeticException("Index overflow has happened.")
+            }
+        }
+        return NDArray(data, shape = array.shape, dim = array.dim).wrap()
+    }
+
+    override fun zip(left: StructureND<T>, right: StructureND<T>, transform: A.(T, T) -> T): MultikTensor<T> {
+        require(left.shape.contentEquals(right.shape)) { "ND array shape mismatch" } //TODO replace by ShapeMismatchException
+        val leftArray = left.asMultik().array
+        val rightArray = right.asMultik().array
+        val data = initMemoryView<T>(leftArray.size, type)
+        var counter = 0
+        val leftIterator = leftArray.iterator()
+        val rightIterator = rightArray.iterator()
+        //iterating them together
+        while (leftIterator.hasNext()) {
+            data[counter++] = elementAlgebra.transform(leftIterator.next(), rightIterator.next())
+        }
+        return NDArray(data, shape = leftArray.shape, dim = leftArray.dim).wrap()
+    }
+
+    override fun StructureND<T>.unaryMinus(): MultikTensor<T> = asMultik().array.unaryMinus().wrap()
+
+    override fun add(left: StructureND<T>, right: StructureND<T>): MultikTensor<T> =
+        (left.asMultik().array + right.asMultik().array).wrap()
+
+    override fun StructureND<T>.plus(arg: T): MultikTensor<T> =
+        asMultik().array.plus(arg).wrap()
+
+    override fun StructureND<T>.minus(arg: T): MultikTensor<T> = asMultik().array.minus(arg).wrap()
+
+    override fun T.plus(arg: StructureND<T>): MultikTensor<T> = arg + this
+
+    override fun T.minus(arg: StructureND<T>): MultikTensor<T> = arg.map { this@minus - it }
+
+    override fun multiply(left: StructureND<T>, right: StructureND<T>): MultikTensor<T> =
+        left.asMultik().array.times(right.asMultik().array).wrap()
+
+    override fun StructureND<T>.times(arg: T): MultikTensor<T> =
+        asMultik().array.times(arg).wrap()
+
+    override fun T.times(arg: StructureND<T>): MultikTensor<T> = arg * this
+
+    override fun StructureND<T>.unaryPlus(): MultikTensor<T> = asMultik()
+
+    override fun StructureND<T>.plus(other: StructureND<T>): MultikTensor<T> =
+        asMultik().array.plus(other.asMultik().array).wrap()
+
+    override fun StructureND<T>.minus(other: StructureND<T>): MultikTensor<T> =
+        asMultik().array.minus(other.asMultik().array).wrap()
+
+    override fun StructureND<T>.times(other: StructureND<T>): MultikTensor<T> =
+        asMultik().array.times(other.asMultik().array).wrap()
+}
+
+/**
+ * A field algebra for multik operations
+ */
+public class MultikFieldOpsND<T, A : Field<T>> internal constructor(
+    type: DataType,
+    elementAlgebra: A
+) : MultikRingOpsND<T, A>(type, elementAlgebra), FieldOpsND<T, A> {
+    override fun StructureND<T>.div(other: StructureND<T>): StructureND<T> =
+        asMultik().array.div(other.asMultik().array).wrap()
+}
+
+public val DoubleField.multikND: MultikFieldOpsND<Double, DoubleField>
+    get() = MultikFieldOpsND(DataType.DoubleDataType, DoubleField)
+
+public val FloatField.multikND: MultikFieldOpsND<Float, FloatField>
+    get() = MultikFieldOpsND(DataType.FloatDataType, FloatField)
+
+public val ShortRing.multikND: MultikRingOpsND<Short, ShortRing>
+    get() = MultikRingOpsND(DataType.ShortDataType, ShortRing)
+
+public val IntRing.multikND: MultikRingOpsND<Int, IntRing>
+    get() = MultikRingOpsND(DataType.IntDataType, IntRing)
+
+public val LongRing.multikND: MultikRingOpsND<Long, LongRing>
+    get() = MultikRingOpsND(DataType.LongDataType, LongRing)
\ No newline at end of file
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index b25d3ef56..e9e56e06e 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.multik
 
+import org.jetbrains.kotlinx.multik.api.mk
+import org.jetbrains.kotlinx.multik.api.zeros
 import org.jetbrains.kotlinx.multik.ndarray.data.*
 import org.jetbrains.kotlinx.multik.ndarray.operations.*
 import space.kscience.kmath.misc.PerformancePitfall
@@ -30,6 +32,7 @@ public value class MultikTensor<T>(public val array: MutableMultiArray<T, DN>) :
 
 
 public abstract class MultikTensorAlgebra<T>(
+    public val type: DataType,
     public val elementAlgebra: Ring<T>,
     public val comparator: Comparator<T>
 ) : TensorAlgebra<T> {
@@ -38,15 +41,19 @@ public abstract class MultikTensorAlgebra<T>(
      * Convert a tensor to [MultikTensor] if necessary. If tensor is converted, changes on the resulting tensor
      * are not reflected back onto the source
      */
-    public fun Tensor<T>.asMultik(): MultikTensor<T> {
+    private fun Tensor<T>.asMultik(): MultikTensor<T> {
         return if (this is MultikTensor) {
             this
         } else {
-            TODO()
+            val res = mk.zeros<T, DN>(shape, type).asDNArray()
+            for (index in res.multiIndices) {
+                res[index] = this[index]
+            }
+            res.wrap()
         }
     }
 
-    public fun MutableMultiArray<T, DN>.wrap(): MultikTensor<T> = MultikTensor(this)
+    private fun MutableMultiArray<T, DN>.wrap(): MultikTensor<T> = MultikTensor(this)
 
     override fun Tensor<T>.valueOrNull(): T? = if (shape contentEquals intArrayOf(1)) {
         get(intArrayOf(0))
@@ -77,8 +84,7 @@ public abstract class MultikTensorAlgebra<T>(
         }
     }
 
-    //TODO avoid additional copy
-    override fun T.minus(other: Tensor<T>): MultikTensor<T> = -(other - this)
+    override fun T.minus(other: Tensor<T>): MultikTensor<T> = (-(other.asMultik().array - this)).wrap()
 
     override fun Tensor<T>.minus(value: T): MultikTensor<T> =
         asMultik().array.deepCopy().apply { minusAssign(value) }.wrap()
@@ -130,13 +136,9 @@ public abstract class MultikTensorAlgebra<T>(
     override fun Tensor<T>.unaryMinus(): MultikTensor<T> =
         asMultik().array.unaryMinus().wrap()
 
-    override fun Tensor<T>.get(i: Int): MultikTensor<T> {
-        TODO("Not yet implemented")
-    }
+    override fun Tensor<T>.get(i: Int): MultikTensor<T> = asMultik().array.mutableView(i).wrap()
 
-    override fun Tensor<T>.transpose(i: Int, j: Int): MultikTensor<T> {
-        TODO("Not yet implemented")
-    }
+    override fun Tensor<T>.transpose(i: Int, j: Int): MultikTensor<T> = asMultik().array.transpose(i, j).wrap()
 
     override fun Tensor<T>.view(shape: IntArray): MultikTensor<T> {
         require(shape.all { it > 0 })
@@ -158,16 +160,14 @@ public abstract class MultikTensorAlgebra<T>(
         }.wrap()
     }
 
-    override fun Tensor<T>.viewAs(other: Tensor<T>): MultikTensor<T> {
-        TODO("Not yet implemented")
-    }
+    override fun Tensor<T>.viewAs(other: Tensor<T>): MultikTensor<T> = view(other.shape)
 
     override fun Tensor<T>.dot(other: Tensor<T>): MultikTensor<T> {
         TODO("Not yet implemented")
     }
 
     override fun diagonalEmbedding(diagonalEntries: Tensor<T>, offset: Int, dim1: Int, dim2: Int): MultikTensor<T> {
-        TODO("Not yet implemented")
+        TODO("Diagonal embedding not implemented")
     }
 
     override fun Tensor<T>.sum(): T = asMultik().array.reduceMultiIndexed { _: IntArray, acc: T, t: T ->
diff --git a/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt b/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
new file mode 100644
index 000000000..9dd9854c7
--- /dev/null
+++ b/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
@@ -0,0 +1,13 @@
+package space.kscience.kmath.multik
+
+import org.junit.jupiter.api.Test
+import space.kscience.kmath.nd.one
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.invoke
+
+internal class MultikNDTest {
+    @Test
+    fun basicAlgebra(): Unit = DoubleField.multikND{
+        one(2,2) + 1.0
+    }
+}
\ No newline at end of file
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index 792890a2d..259b1a934 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -38,6 +38,7 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
         return struct
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<T>.map(transform: C.(T) -> T): Nd4jArrayStructure<T> {
         val newStruct = ndArray.dup().wrap()
         newStruct.elements().forEach { (idx, value) -> newStruct[idx] = elementAlgebra.transform(value) }
@@ -117,7 +118,7 @@ public sealed interface Nd4jArrayRingOps<T, out R : Ring<T>> : RingOpsND<T, R>,
          * Creates a most suitable implementation of [RingND] using reified class.
          */
         @Suppress("UNCHECKED_CAST")
-        public inline fun <reified T : Number> auto(vararg shape: Int): Nd4jArrayRingOps<T, Ring<T>> = when {
+        public inline fun <reified T : Number> auto(): Nd4jArrayRingOps<T, Ring<T>> = when {
             T::class == Int::class -> IntRing.nd4j as Nd4jArrayRingOps<T, Ring<T>>
             else -> throw UnsupportedOperationException("This factory method only supports Long type.")
         }
@@ -142,7 +143,7 @@ public sealed interface Nd4jArrayField<T, out F : Field<T>> : FieldOpsND<T, F>,
          * Creates a most suitable implementation of [FieldND] using reified class.
          */
         @Suppress("UNCHECKED_CAST")
-        public inline fun <reified T : Any> auto(vararg shape: Int): Nd4jArrayField<T, Field<T>> = when {
+        public inline fun <reified T : Any> auto(): Nd4jArrayField<T, Field<T>> = when {
             T::class == Float::class -> FloatField.nd4j as Nd4jArrayField<T, Field<T>>
             T::class == Double::class -> DoubleField.nd4j as Nd4jArrayField<T, Field<T>>
             else -> throw UnsupportedOperationException("This factory method only supports Float and Double types.")
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
index b73f95054..916388ba9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
@@ -5,4 +5,12 @@
 
 package space.kscience.kmath.tensors.core
 
-public fun DoubleTensorAlgebra.ones(vararg shape: Int): DoubleTensor = ones(intArrayOf(*shape))
\ No newline at end of file
+import space.kscience.kmath.nd.Shape
+import kotlin.jvm.JvmName
+
+@JvmName("varArgOne")
+public fun DoubleTensorAlgebra.one(vararg shape: Int): DoubleTensor = ones(intArrayOf(*shape))
+public fun DoubleTensorAlgebra.one(shape: Shape): DoubleTensor = ones(shape)
+@JvmName("varArgZero")
+public fun DoubleTensorAlgebra.zero(vararg shape: Int): DoubleTensor = zeros(intArrayOf(*shape))
+public fun DoubleTensorAlgebra.zero(shape: Shape): DoubleTensor = zeros(shape)
\ No newline at end of file
-- 
2.34.1


From a81ab474f73c2a6ce1ef3819d3c39df34c139065 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 18 Oct 2021 11:35:09 +0300
Subject: [PATCH 352/713] Add multik tensor factories and benchmarks

---
 .../kmath/benchmarks/NDFieldBenchmark.kt      | 12 +++++++++
 .../kmath/benchmarks/ViktorLogBenchmark.kt    |  4 +--
 .../kmath/functions/matrixIntegration.kt      |  4 +--
 .../kscience/kmath/operations/complexDemo.kt  |  6 ++---
 .../kmath/operations/mixedNDOperations.kt     |  2 +-
 .../kscience/kmath/structures/ComplexND.kt    |  4 +--
 .../kmath/structures/StreamDoubleFieldND.kt   |  8 +++---
 .../kscience/kmath/complex/ComplexFieldND.kt  |  2 +-
 .../kmath/linear/BufferedLinearSpace.kt       |  2 +-
 .../kmath/linear/DoubleLinearSpace.kt         |  2 +-
 .../space/kscience/kmath/nd/AlgebraND.kt      | 10 ++++----
 .../kscience/kmath/nd/BufferAlgebraND.kt      | 10 ++++----
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |  4 +--
 .../space/kscience/kmath/nd/ShortRingND.kt    |  2 +-
 .../kscience/kmath/nd/algebraNDExtentions.kt  | 12 ++++-----
 .../kscience/kmath/structures/NDFieldTest.kt  |  4 +--
 .../kmath/structures/NumberNDFieldTest.kt     |  4 +--
 .../kscience/kmath/multik/MultikOpsND.kt      |  8 +++---
 .../kmath/multik/MultikTensorAlgebra.kt       | 25 +++++++++++++++----
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   |  2 +-
 .../kmath/nd4j/Nd4jArrayAlgebraTest.kt        |  8 +++---
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  2 +-
 .../kscience/kmath/viktor/ViktorFieldOpsND.kt |  4 +--
 23 files changed, 84 insertions(+), 57 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index 672aa4307..8f9a3e2b8 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -9,7 +9,12 @@ import kotlinx.benchmark.Benchmark
 import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
+import org.jetbrains.kotlinx.multik.api.Multik
+import org.jetbrains.kotlinx.multik.api.ones
+import org.jetbrains.kotlinx.multik.ndarray.data.DN
+import org.jetbrains.kotlinx.multik.ndarray.data.DataType
 import space.kscience.kmath.multik.multikND
+import space.kscience.kmath.multik.multikTensorAlgebra
 import space.kscience.kmath.nd.BufferedFieldOpsND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.ndAlgebra
@@ -73,6 +78,13 @@ internal class NDFieldBenchmark {
         blackhole.consume(res)
     }
 
+    @Benchmark
+    fun multikInPlaceAdd(blackhole: Blackhole) = with(DoubleField.multikTensorAlgebra) {
+        val res = Multik.ones<Double, DN>(shape, DataType.DoubleDataType).wrap()
+        repeat(n) { res += 1.0 }
+        blackhole.consume(res)
+    }
+
 //    @Benchmark
 //    fun nd4jAdd(blackhole: Blackhole) = with(nd4jField) {
 //        var res: StructureND<Double> = one(dim, dim)
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
index ef2adaad8..a9d1e68fc 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
@@ -23,7 +23,7 @@ internal class ViktorLogBenchmark {
     @Benchmark
     fun realFieldLog(blackhole: Blackhole) {
         with(realField) {
-            val fortyTwo = produce(shape) { 42.0 }
+            val fortyTwo = structureND(shape) { 42.0 }
             var res = one(shape)
             repeat(n) { res = ln(fortyTwo) }
             blackhole.consume(res)
@@ -33,7 +33,7 @@ internal class ViktorLogBenchmark {
     @Benchmark
     fun viktorFieldLog(blackhole: Blackhole) {
         with(viktorField) {
-            val fortyTwo = produce(shape) { 42.0 }
+            val fortyTwo = structureND(shape) { 42.0 }
             var res = one
             repeat(n) { res = ln(fortyTwo) }
             blackhole.consume(res)
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index 609afb47e..4b6ac475c 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -9,7 +9,7 @@ import space.kscience.kmath.integration.gaussIntegrator
 import space.kscience.kmath.integration.integrate
 import space.kscience.kmath.integration.value
 import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.produce
+import space.kscience.kmath.nd.structureND
 import space.kscience.kmath.nd.withNdAlgebra
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.invoke
@@ -18,7 +18,7 @@ fun main(): Unit = Double.algebra {
     withNdAlgebra(2, 2) {
 
         //Produce a diagonal StructureND
-        fun diagonal(v: Double) = produce {  (i, j) ->
+        fun diagonal(v: Double) = structureND { (i, j) ->
             if (i == j) v else 0.0
         }
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
index 67d83d77c..3b9c32f4b 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.complex.bufferAlgebra
 import space.kscience.kmath.complex.ndAlgebra
 import space.kscience.kmath.nd.BufferND
 import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.produce
+import space.kscience.kmath.nd.structureND
 
 fun main() = Complex.algebra {
     val complex = 2 + 2 * i
@@ -24,14 +24,14 @@ fun main() = Complex.algebra {
     println(buffer)
 
     // 2d element
-    val element: BufferND<Complex> = ndAlgebra.produce(2, 2) { (i, j) ->
+    val element: BufferND<Complex> = ndAlgebra.structureND(2, 2) { (i, j) ->
         Complex(i - j, i + j)
     }
     println(element)
 
     // 1d element operation
     val result: StructureND<Complex> = ndAlgebra{
-        val a = produce(8) { (it) -> i * it - it.toDouble() }
+        val a = structureND(8) { (it) -> i * it - it.toDouble() }
         val b = 3
         val c = Complex(1.0, 1.0)
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
index 628344ceb..f517046ee 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
@@ -10,7 +10,7 @@ import space.kscience.kmath.viktor.ViktorStructureND
 import space.kscience.kmath.viktor.viktorAlgebra
 
 fun main() {
-    val viktorStructure: ViktorStructureND = DoubleField.viktorAlgebra.produce(Shape(2, 2)) { (i, j) ->
+    val viktorStructure: ViktorStructureND = DoubleField.viktorAlgebra.structureND(Shape(2, 2)) { (i, j) ->
         if (i == j) 2.0 else 0.0
     }
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
index 42636fafb..61df3d065 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
@@ -12,7 +12,7 @@ import space.kscience.kmath.linear.transpose
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.nd.ndAlgebra
-import space.kscience.kmath.nd.produce
+import space.kscience.kmath.nd.structureND
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 import kotlin.system.measureTimeMillis
@@ -55,7 +55,7 @@ fun complexExample() {
             val x = one * 2.5
             operator fun Number.plus(other: Complex) = Complex(this.toDouble() + other.re, other.im)
             //a structure generator specific to this context
-            val matrix = produce { (k, l) -> k + l * i }
+            val matrix = structureND { (k, l) -> k + l * i }
             //Perform sum
             val sum = matrix + x + 1.0
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index dfd06973e..2b3e72136 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -22,12 +22,12 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
 
     private val strides = DefaultStrides(shape)
     override val elementAlgebra: DoubleField get() = DoubleField
-    override val zero: BufferND<Double> by lazy { produce(shape) { zero } }
-    override val one: BufferND<Double> by lazy { produce(shape) { one } }
+    override val zero: BufferND<Double> by lazy { structureND(shape) { zero } }
+    override val one: BufferND<Double> by lazy { structureND(shape) { one } }
 
     override fun number(value: Number): BufferND<Double> {
         val d = value.toDouble() // minimize conversions
-        return produce(shape) { d }
+        return structureND(shape) { d }
     }
 
     private val StructureND<Double>.buffer: DoubleBuffer
@@ -40,7 +40,7 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
             else -> DoubleBuffer(strides.linearSize) { offset -> get(strides.index(offset)) }
         }
 
-    override fun produce(shape: Shape, initializer: DoubleField.(IntArray) -> Double): BufferND<Double> {
+    override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): BufferND<Double> {
         val array = IntStream.range(0, strides.linearSize).parallel().mapToDouble { offset ->
             val index = strides.index(offset)
             DoubleField.initializer(index)
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
index 3951b5de0..9d5b1cddd 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
@@ -67,7 +67,7 @@ public class ComplexFieldND(override val shape: Shape) :
 
     override fun number(value: Number): BufferND<Complex> {
         val d = value.toDouble() // minimize conversions
-        return produce(shape) { d.toComplex() }
+        return structureND(shape) { d.toComplex() }
     }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 39dbe3a81..f72b9bd81 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -24,7 +24,7 @@ public class BufferedLinearSpace<T, out A : Ring<T>>(
     private val ndAlgebra = BufferedRingOpsND(bufferAlgebra)
 
     override fun buildMatrix(rows: Int, columns: Int, initializer: A.(i: Int, j: Int) -> T): Matrix<T> =
-        ndAlgebra.produce(intArrayOf(rows, columns)) { (i, j) -> elementAlgebra.initializer(i, j) }.as2D()
+        ndAlgebra.structureND(intArrayOf(rows, columns)) { (i, j) -> elementAlgebra.initializer(i, j) }.as2D()
 
     override fun buildVector(size: Int, initializer: A.(Int) -> T): Point<T> =
         bufferAlgebra.buffer(size) { elementAlgebra.initializer(it) }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
index ec6040af0..91db33bce 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
@@ -23,7 +23,7 @@ public object DoubleLinearSpace : LinearSpace<Double, DoubleField> {
         rows: Int,
         columns: Int,
         initializer: DoubleField.(i: Int, j: Int) -> Double
-    ): Matrix<Double> = DoubleFieldOpsND.produce(intArrayOf(rows, columns)) { (i, j) ->
+    ): Matrix<Double> = DoubleFieldOpsND.structureND(intArrayOf(rows, columns)) { (i, j) ->
         DoubleField.initializer(i, j)
     }.as2D()
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index b4e8b7487..30cb01146 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -39,9 +39,9 @@ public interface AlgebraND<T, out C : Algebra<T>> {
     public val elementAlgebra: C
 
     /**
-     * Produces a new NDStructure using given initializer function.
+     * Produces a new [StructureND] using given initializer function.
      */
-    public fun produce(shape: Shape, initializer: C.(IntArray) -> T): StructureND<T>
+    public fun structureND(shape: Shape, initializer: C.(IntArray) -> T): StructureND<T>
 
     /**
      * Maps elements from one structure to another one by applying [transform] to them.
@@ -149,7 +149,7 @@ public interface GroupOpsND<T, out A : GroupOps<T>> : GroupOps<StructureND<T>>,
 }
 
 public interface GroupND<T, out A : Group<T>> : Group<StructureND<T>>, GroupOpsND<T, A>, WithShape {
-    override val zero: StructureND<T> get() = produce(shape) { elementAlgebra.zero }
+    override val zero: StructureND<T> get() = structureND(shape) { elementAlgebra.zero }
 }
 
 /**
@@ -193,7 +193,7 @@ public interface RingOpsND<T, out A : RingOps<T>> : RingOps<StructureND<T>>, Gro
 }
 
 public interface RingND<T, out A : Ring<T>> : Ring<StructureND<T>>, RingOpsND<T, A>, GroupND<T, A>, WithShape {
-    override val one: StructureND<T> get() = produce(shape) { elementAlgebra.one }
+    override val one: StructureND<T> get() = structureND(shape) { elementAlgebra.one }
 }
 
 
@@ -240,5 +240,5 @@ public interface FieldOpsND<T, out A : Field<T>> :
 }
 
 public interface FieldND<T, out A : Field<T>> : Field<StructureND<T>>, FieldOpsND<T, A>, RingND<T, A>, WithShape {
-    override val one: StructureND<T> get() = produce(shape) { elementAlgebra.one }
+    override val one: StructureND<T> get() = structureND(shape) { elementAlgebra.one }
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index c94988eef..1f231ce9f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -16,7 +16,7 @@ public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
     public val bufferAlgebra: BufferAlgebra<T, A>
     override val elementAlgebra: A get() = bufferAlgebra.elementAlgebra
 
-    override fun produce(shape: Shape, initializer: A.(IntArray) -> T): BufferND<T> {
+    override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): BufferND<T> {
         val indexer = indexerBuilder(shape)
         return BufferND(
             indexer,
@@ -109,14 +109,14 @@ public val <T, A : Ring<T>> BufferAlgebra<T, A>.nd: BufferedRingOpsND<T, A> get(
 public val <T, A : Field<T>> BufferAlgebra<T, A>.nd: BufferedFieldOpsND<T, A> get() = BufferedFieldOpsND(this)
 
 
-public fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.produce(
+public fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.structureND(
     vararg shape: Int,
     initializer: A.(IntArray) -> T
-): BufferND<T> = produce(shape, initializer)
+): BufferND<T> = structureND(shape, initializer)
 
-public fun <T, EA : Algebra<T>, A> A.produce(
+public fun <T, EA : Algebra<T>, A> A.structureND(
     initializer: EA.(IntArray) -> T
-): BufferND<T> where A : BufferAlgebraND<T, EA>, A : WithShape = produce(shape, initializer)
+): BufferND<T> where A : BufferAlgebraND<T, EA>, A : WithShape = structureND(shape, initializer)
 
 //// group factories
 //public fun <T, A : Group<T>> A.ndAlgebra(
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 6235971a2..961f5869a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -60,7 +60,7 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
         transform: DoubleField.(Double, Double) -> Double
     ): BufferND<Double> = zipInline(left.toBufferND(), right.toBufferND()) { l, r -> DoubleField.transform(l, r) }
 
-    override fun produce(shape: Shape, initializer: DoubleField.(IntArray) -> Double): DoubleBufferND {
+    override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): DoubleBufferND {
         val indexer = indexerBuilder(shape)
         return DoubleBufferND(
             indexer,
@@ -174,7 +174,7 @@ public class DoubleFieldND(override val shape: Shape) :
 
     override fun number(value: Number): DoubleBufferND {
         val d = value.toDouble() // minimize conversions
-        return produce(shape) { d }
+        return structureND(shape) { d }
     }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
index 65c1f71b4..827f0e21e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
@@ -23,7 +23,7 @@ public class ShortRingND(
 
     override fun number(value: Number): BufferND<Short> {
         val d = value.toShort() // minimize conversions
-        return produce(shape) { d }
+        return structureND(shape) { d }
     }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
index 7bc18a4dd..0e694bcb3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
@@ -11,24 +11,24 @@ import space.kscience.kmath.operations.Ring
 import kotlin.jvm.JvmName
 
 
-public fun <T, A : Algebra<T>> AlgebraND<T, A>.produce(
+public fun <T, A : Algebra<T>> AlgebraND<T, A>.structureND(
     shapeFirst: Int,
     vararg shapeRest: Int,
     initializer: A.(IntArray) -> T
-): StructureND<T> = produce(Shape(shapeFirst, *shapeRest), initializer)
+): StructureND<T> = structureND(Shape(shapeFirst, *shapeRest), initializer)
 
-public fun <T, A : Group<T>> AlgebraND<T, A>.zero(shape: Shape): StructureND<T> = produce(shape) { zero }
+public fun <T, A : Group<T>> AlgebraND<T, A>.zero(shape: Shape): StructureND<T> = structureND(shape) { zero }
 
 @JvmName("zeroVarArg")
 public fun <T, A : Group<T>> AlgebraND<T, A>.zero(
     shapeFirst: Int,
     vararg shapeRest: Int,
-): StructureND<T> = produce(shapeFirst, *shapeRest) { zero }
+): StructureND<T> = structureND(shapeFirst, *shapeRest) { zero }
 
-public fun <T, A : Ring<T>> AlgebraND<T, A>.one(shape: Shape): StructureND<T> = produce(shape) { one }
+public fun <T, A : Ring<T>> AlgebraND<T, A>.one(shape: Shape): StructureND<T> = structureND(shape) { one }
 
 @JvmName("oneVarArg")
 public fun <T, A : Ring<T>> AlgebraND<T, A>.one(
     shapeFirst: Int,
     vararg shapeRest: Int,
-): StructureND<T> = produce(shapeFirst, *shapeRest) { one }
\ No newline at end of file
+): StructureND<T> = structureND(shapeFirst, *shapeRest) { one }
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
index 2009eb64f..82172af62 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.structures
 
 import space.kscience.kmath.nd.get
 import space.kscience.kmath.nd.ndAlgebra
-import space.kscience.kmath.nd.produce
+import space.kscience.kmath.nd.structureND
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.testutils.FieldVerifier
@@ -22,7 +22,7 @@ internal class NDFieldTest {
 
     @Test
     fun testStrides() {
-        val ndArray = DoubleField.ndAlgebra.produce(10, 10) { (it[0] + it[1]).toDouble() }
+        val ndArray = DoubleField.ndAlgebra.structureND(10, 10) { (it[0] + it[1]).toDouble() }
         assertEquals(ndArray[5, 5], 10.0)
     }
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index 907301a53..61eb6acc8 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -20,8 +20,8 @@ import kotlin.test.assertEquals
 @Suppress("UNUSED_VARIABLE")
 class NumberNDFieldTest {
     val algebra = DoubleField.ndAlgebra
-    val array1 = algebra.produce(3, 3) { (i, j) -> (i + j).toDouble() }
-    val array2 = algebra.produce(3, 3) { (i, j) -> (i - j).toDouble() }
+    val array1 = algebra.structureND(3, 3) { (i, j) -> (i + j).toDouble() }
+    val array2 = algebra.structureND(3, 3) { (i, j) -> (i - j).toDouble() }
 
     @Test
     fun testSum() {
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt
index d6996d427..9ee5087e9 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt
@@ -18,9 +18,9 @@ public open class MultikRingOpsND<T, A : Ring<T>> internal constructor(
     override val elementAlgebra: A
 ) : RingOpsND<T, A> {
 
-    protected fun MutableMultiArray<T, DN>.wrap(): MultikTensor<T> = MultikTensor(this)
+    public fun MutableMultiArray<T, DN>.wrap(): MultikTensor<T> = MultikTensor(this)
 
-    override fun produce(shape: Shape, initializer: A.(IntArray) -> T): MultikTensor<T> {
+    override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): MultikTensor<T> {
         val res = mk.zeros<T, DN>(shape, type).asDNArray()
         for (index in res.multiIndices) {
             res[index] = elementAlgebra.initializer(index)
@@ -28,10 +28,10 @@ public open class MultikRingOpsND<T, A : Ring<T>> internal constructor(
         return res.wrap()
     }
 
-    protected fun StructureND<T>.asMultik(): MultikTensor<T> = if (this is MultikTensor) {
+    public fun StructureND<T>.asMultik(): MultikTensor<T> = if (this is MultikTensor) {
         this
     } else {
-        produce(shape) { get(it) }
+        structureND(shape) { get(it) }
     }
 
     override fun StructureND<T>.map(transform: A.(T) -> T): MultikTensor<T> {
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index e9e56e06e..c229a44bf 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlinx.multik.ndarray.data.*
 import org.jetbrains.kotlinx.multik.ndarray.operations.*
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.mapInPlace
-import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.*
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.api.TensorAlgebra
 
@@ -31,7 +31,7 @@ public value class MultikTensor<T>(public val array: MutableMultiArray<T, DN>) :
 }
 
 
-public abstract class MultikTensorAlgebra<T>(
+public class MultikTensorAlgebra<T> internal constructor(
     public val type: DataType,
     public val elementAlgebra: Ring<T>,
     public val comparator: Comparator<T>
@@ -41,7 +41,7 @@ public abstract class MultikTensorAlgebra<T>(
      * Convert a tensor to [MultikTensor] if necessary. If tensor is converted, changes on the resulting tensor
      * are not reflected back onto the source
      */
-    private fun Tensor<T>.asMultik(): MultikTensor<T> {
+    public fun Tensor<T>.asMultik(): MultikTensor<T> {
         return if (this is MultikTensor) {
             this
         } else {
@@ -53,7 +53,7 @@ public abstract class MultikTensorAlgebra<T>(
         }
     }
 
-    private fun MutableMultiArray<T, DN>.wrap(): MultikTensor<T> = MultikTensor(this)
+    public fun MutableMultiArray<T, DN>.wrap(): MultikTensor<T> = MultikTensor(this)
 
     override fun Tensor<T>.valueOrNull(): T? = if (shape contentEquals intArrayOf(1)) {
         get(intArrayOf(0))
@@ -196,4 +196,19 @@ public abstract class MultikTensorAlgebra<T>(
     override fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): MultikTensor<T> {
         TODO("Not yet implemented")
     }
-}
\ No newline at end of file
+}
+
+public val DoubleField.multikTensorAlgebra: MultikTensorAlgebra<Double>
+    get() = MultikTensorAlgebra(DataType.DoubleDataType, DoubleField) { o1, o2 -> o1.compareTo(o2) }
+
+public val FloatField.multikTensorAlgebra: MultikTensorAlgebra<Float>
+    get() = MultikTensorAlgebra(DataType.FloatDataType, FloatField) { o1, o2 -> o1.compareTo(o2) }
+
+public val ShortRing.multikTensorAlgebra: MultikTensorAlgebra<Short>
+    get() = MultikTensorAlgebra(DataType.ShortDataType, ShortRing) { o1, o2 -> o1.compareTo(o2) }
+
+public val IntRing.multikTensorAlgebra: MultikTensorAlgebra<Int>
+    get() = MultikTensorAlgebra(DataType.IntDataType, IntRing) { o1, o2 -> o1.compareTo(o2) }
+
+public val LongRing.multikTensorAlgebra: MultikTensorAlgebra<Long>
+    get() = MultikTensorAlgebra(DataType.LongDataType, LongRing) { o1, o2 -> o1.compareTo(o2) }
\ No newline at end of file
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index 259b1a934..1f312849a 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -32,7 +32,7 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
      */
     public val StructureND<T>.ndArray: INDArray
 
-    override fun produce(shape: Shape, initializer: C.(IntArray) -> T): Nd4jArrayStructure<T> {
+    override fun structureND(shape: Shape, initializer: C.(IntArray) -> T): Nd4jArrayStructure<T> {
         val struct = Nd4j.create(*shape)!!.wrap()
         struct.indicesIterator().forEach { struct[it] = elementAlgebra.initializer(it) }
         return struct
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
index 465937fa9..103416120 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
@@ -9,7 +9,7 @@ import org.nd4j.linalg.factory.Nd4j
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.one
-import space.kscience.kmath.nd.produce
+import space.kscience.kmath.nd.structureND
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.operations.invoke
@@ -23,7 +23,7 @@ import kotlin.test.fail
 internal class Nd4jArrayAlgebraTest {
     @Test
     fun testProduce() {
-        val res = DoubleField.nd4j.produce(2, 2) { it.sum().toDouble() }
+        val res = DoubleField.nd4j.structureND(2, 2) { it.sum().toDouble() }
         val expected = (Nd4j.create(2, 2) ?: fail()).asDoubleStructure()
         expected[intArrayOf(0, 0)] = 0.0
         expected[intArrayOf(0, 1)] = 1.0
@@ -58,9 +58,9 @@ internal class Nd4jArrayAlgebraTest {
 
     @Test
     fun testSin() = DoubleField.nd4j{
-        val initial = produce(2, 2) { (i, j) -> if (i == j) PI / 2 else 0.0 }
+        val initial = structureND(2, 2) { (i, j) -> if (i == j) PI / 2 else 0.0 }
         val transformed = sin(initial)
-        val expected = produce(2, 2) { (i, j) -> if (i == j) 1.0 else 0.0 }
+        val expected = structureND(2, 2) { (i, j) -> if (i == j) 1.0 else 0.0 }
 
         println(transformed)
         assertTrue { StructureND.contentEquals(transformed, expected) }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 594070cd2..16ed4b834 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -22,7 +22,7 @@ import kotlin.math.*
 public open class DoubleTensorAlgebra :
     TensorPartialDivisionAlgebra<Double>,
     AnalyticTensorAlgebra<Double>,
-    LinearOpsTensorAlgebra<Double> {
+    LinearOpsTensorAlgebra<Double>{
 
     public companion object : DoubleTensorAlgebra()
 
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
index c72553a64..aaa113e56 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
@@ -21,12 +21,12 @@ public open class ViktorFieldOpsND :
     public val StructureND<Double>.f64Buffer: F64Array
         get() = when (this) {
             is ViktorStructureND -> this.f64Buffer
-            else -> produce(shape) { this@f64Buffer[it] }.f64Buffer
+            else -> structureND(shape) { this@f64Buffer[it] }.f64Buffer
         }
 
     override val elementAlgebra: DoubleField get() = DoubleField
 
-    override fun produce(shape: IntArray, initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
+    override fun structureND(shape: IntArray, initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
         F64Array(*shape).apply {
             DefaultStrides(shape).indices().forEach { index ->
                 set(value = DoubleField.initializer(index), indices = index)
-- 
2.34.1


From dccc92bf2fd9f979e70386a25d1ff1db231d368f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 18 Oct 2021 12:52:24 +0300
Subject: [PATCH 353/713] Switch to multik-default

---
 .../kotlin/space/kscience/kmath/tensors/multik.kt  | 14 +++++++-------
 kmath-multik/build.gradle.kts                      |  2 +-
 .../space/kscience/kmath/multik/MultikOpsND.kt     |  4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
index fc6d7dd56..5383b5c3e 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors
 
+import edu.mcgill.kaliningraph.power
 import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.linalg.dot
 import org.jetbrains.kotlinx.multik.api.math.exp
@@ -12,13 +13,12 @@ import org.jetbrains.kotlinx.multik.api.ndarray
 import org.jetbrains.kotlinx.multik.ndarray.operations.minus
 import org.jetbrains.kotlinx.multik.ndarray.operations.plus
 import org.jetbrains.kotlinx.multik.ndarray.operations.unaryMinus
+import space.kscience.kmath.multik.multikND
+import space.kscience.kmath.nd.one
+import space.kscience.kmath.operations.DoubleField
 
-fun main() {
-    val a = Multik.ndarray(intArrayOf(1, 2, 3))
+fun main(): Unit = with(DoubleField.multikND) {
+    val a = Multik.ndarray(intArrayOf(1, 2, 3)).asType<Double>().wrap()
     val b = Multik.ndarray(doubleArrayOf(1.0, 2.0, 3.0))
-    2 + (-a) - 2
-
-    a dot a
-
-    a.exp()
+    one(a.shape) - a + power()
 }
\ No newline at end of file
diff --git a/kmath-multik/build.gradle.kts b/kmath-multik/build.gradle.kts
index 16a7ab652..df2292f2e 100644
--- a/kmath-multik/build.gradle.kts
+++ b/kmath-multik/build.gradle.kts
@@ -6,7 +6,7 @@ description = "JetBrains Multik connector"
 
 dependencies {
     api(project(":kmath-tensors"))
-    api("org.jetbrains.kotlinx:multik-api:0.1.0")
+    api("org.jetbrains.kotlinx:multik-default:0.1.0")
 }
 
 readme {
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt
index 9ee5087e9..4068ba9b9 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt
@@ -1,5 +1,7 @@
 package space.kscience.kmath.multik
 
+import org.jetbrains.kotlinx.multik.api.math.cos
+import org.jetbrains.kotlinx.multik.api.math.sin
 import org.jetbrains.kotlinx.multik.api.mk
 import org.jetbrains.kotlinx.multik.api.zeros
 import org.jetbrains.kotlinx.multik.ndarray.data.*
@@ -18,7 +20,7 @@ public open class MultikRingOpsND<T, A : Ring<T>> internal constructor(
     override val elementAlgebra: A
 ) : RingOpsND<T, A> {
 
-    public fun MutableMultiArray<T, DN>.wrap(): MultikTensor<T> = MultikTensor(this)
+    public fun MutableMultiArray<T, *>.wrap(): MultikTensor<T> = MultikTensor(this.asDNArray())
 
     override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): MultikTensor<T> {
         val res = mk.zeros<T, DN>(shape, type).asDNArray()
-- 
2.34.1


From bfc6cbe5d8fdda11db1ffd8dd6da73271a184eaa Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Mon, 18 Oct 2021 13:04:36 +0300
Subject: [PATCH 354/713] Update multik.kt

---
 .../src/main/kotlin/space/kscience/kmath/tensors/multik.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
index 5383b5c3e..b1cf435d4 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
@@ -20,5 +20,5 @@ import space.kscience.kmath.operations.DoubleField
 fun main(): Unit = with(DoubleField.multikND) {
     val a = Multik.ndarray(intArrayOf(1, 2, 3)).asType<Double>().wrap()
     val b = Multik.ndarray(doubleArrayOf(1.0, 2.0, 3.0))
-    one(a.shape) - a + power()
-}
\ No newline at end of file
+    one(a.shape) - a
+}
-- 
2.34.1


From 98bbc8349c54d871bd0fffe07a704957ebdd580a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 18 Oct 2021 13:18:10 +0300
Subject: [PATCH 355/713] 0.3.0-dev-17

---
 build.gradle.kts                                       |  2 +-
 .../main/kotlin/space/kscience/kmath/tensors/multik.kt | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 665c057e9..c2347f7be 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-16"
+    version = "0.3.0-dev-17"
 }
 
 subprojects {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
index b1cf435d4..f0b776f75 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
@@ -5,20 +5,14 @@
 
 package space.kscience.kmath.tensors
 
-import edu.mcgill.kaliningraph.power
 import org.jetbrains.kotlinx.multik.api.Multik
-import org.jetbrains.kotlinx.multik.api.linalg.dot
-import org.jetbrains.kotlinx.multik.api.math.exp
 import org.jetbrains.kotlinx.multik.api.ndarray
-import org.jetbrains.kotlinx.multik.ndarray.operations.minus
-import org.jetbrains.kotlinx.multik.ndarray.operations.plus
-import org.jetbrains.kotlinx.multik.ndarray.operations.unaryMinus
 import space.kscience.kmath.multik.multikND
 import space.kscience.kmath.nd.one
 import space.kscience.kmath.operations.DoubleField
 
 fun main(): Unit = with(DoubleField.multikND) {
     val a = Multik.ndarray(intArrayOf(1, 2, 3)).asType<Double>().wrap()
-    val b = Multik.ndarray(doubleArrayOf(1.0, 2.0, 3.0))
-    one(a.shape) - a
+    val b = Multik.ndarray(doubleArrayOf(1.0, 2.0, 3.0)).wrap()
+    one(a.shape) - a + b * 3
 }
-- 
2.34.1


From 40c02f4bd719cad22fe4586471f398092c4686b0 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 19 Oct 2021 10:50:13 +0300
Subject: [PATCH 356/713] Add multik dot for tensors

---
 .../kmath/multik/MultikTensorAlgebra.kt       | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index c229a44bf..ed5575b93 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -3,9 +3,14 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
+@file:Suppress("unused")
+
 package space.kscience.kmath.multik
 
+import org.jetbrains.kotlinx.multik.api.Multik
+import org.jetbrains.kotlinx.multik.api.linalg.dot
 import org.jetbrains.kotlinx.multik.api.mk
+import org.jetbrains.kotlinx.multik.api.ndarrayOf
 import org.jetbrains.kotlinx.multik.api.zeros
 import org.jetbrains.kotlinx.multik.ndarray.data.*
 import org.jetbrains.kotlinx.multik.ndarray.operations.*
@@ -30,8 +35,20 @@ public value class MultikTensor<T>(public val array: MutableMultiArray<T, DN>) :
     }
 }
 
+private fun <T, D : Dimension> MultiArray<T, D>.asD1Array(): D1Array<T> {
+    if (this is NDArray<T, D>)
+        return this.asD1Array()
+    else throw ClassCastException("Cannot cast MultiArray to NDArray.")
+}
 
-public class MultikTensorAlgebra<T> internal constructor(
+
+private fun <T, D : Dimension> MultiArray<T, D>.asD2Array(): D2Array<T> {
+    if (this is NDArray<T, D>)
+        return this.asD2Array()
+    else throw ClassCastException("Cannot cast MultiArray to NDArray.")
+}
+
+public class MultikTensorAlgebra<T : Number> internal constructor(
     public val type: DataType,
     public val elementAlgebra: Ring<T>,
     public val comparator: Comparator<T>
@@ -162,9 +179,18 @@ public class MultikTensorAlgebra<T> internal constructor(
 
     override fun Tensor<T>.viewAs(other: Tensor<T>): MultikTensor<T> = view(other.shape)
 
-    override fun Tensor<T>.dot(other: Tensor<T>): MultikTensor<T> {
-        TODO("Not yet implemented")
-    }
+    override fun Tensor<T>.dot(other: Tensor<T>): MultikTensor<T> =
+        if (this.shape.size == 1 && other.shape.size == 1) {
+            Multik.ndarrayOf(
+                asMultik().array.asD1Array() dot other.asMultik().array.asD1Array()
+            ).asDNArray().wrap()
+        } else if (this.shape.size == 2 && other.shape.size == 2) {
+            (asMultik().array.asD2Array() dot other.asMultik().array.asD2Array()).asDNArray().wrap()
+        } else if(this.shape.size == 2 && other.shape.size == 1) {
+            (asMultik().array.asD2Array() dot other.asMultik().array.asD1Array()).asDNArray().wrap()
+        } else {
+            TODO("Not implemented for broadcasting")
+        }
 
     override fun diagonalEmbedding(diagonalEntries: Tensor<T>, offset: Int, dim1: Int, dim2: Int): MultikTensor<T> {
         TODO("Diagonal embedding not implemented")
-- 
2.34.1


From 6c4741ede6558f53e5b90e35f934ba0a83ceb13a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 20 Oct 2021 16:06:45 +0300
Subject: [PATCH 357/713] [WIP] TensorFlow

---
 kmath-tensorflow/build.gradle.kts             |  14 ++
 .../kmath/tensorflow/TensorFlowAlgebra.kt     | 220 ++++++++++++++++++
 settings.gradle.kts                           |   1 +
 3 files changed, 235 insertions(+)
 create mode 100644 kmath-tensorflow/build.gradle.kts
 create mode 100644 kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt

diff --git a/kmath-tensorflow/build.gradle.kts b/kmath-tensorflow/build.gradle.kts
new file mode 100644
index 000000000..fa77a272a
--- /dev/null
+++ b/kmath-tensorflow/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    id("ru.mipt.npm.gradle.jvm")
+}
+
+description = "Google tensorflow connector"
+
+dependencies {
+    api(project(":kmath-tensors"))
+    api("org.tensorflow:tensorflow-core-api:0.3.3")
+}
+
+readme {
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+}
\ No newline at end of file
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
new file mode 100644
index 000000000..849a2e909
--- /dev/null
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -0,0 +1,220 @@
+package space.kscience.kmath.tensorflow
+
+
+import org.tensorflow.Graph
+import org.tensorflow.Operand
+import org.tensorflow.Output
+import org.tensorflow.Session
+import org.tensorflow.ndarray.NdArray
+import org.tensorflow.op.Ops
+import org.tensorflow.op.core.Constant
+import org.tensorflow.types.family.TType
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.tensors.api.Tensor
+import space.kscience.kmath.tensors.api.TensorAlgebra
+
+private fun IntArray.toLongArray() = LongArray(size) { get(it).toLong() }
+private fun LongArray.toIntArray() = IntArray(size) { get(it).toInt() }
+
+private val <T> NdArray<T>.scalar: T
+    get() = getObject()
+
+
+public sealed interface TensorFlowTensor<T> : Tensor<T>
+
+@JvmInline
+public value class TensorFlowArray<T>(public val tensor: NdArray<T>) : Tensor<T> {
+    override val shape: Shape get() = tensor.shape().asArray().toIntArray()
+
+    override fun get(index: IntArray): T = tensor.getObject(*index.toLongArray())
+
+    @PerformancePitfall
+    override fun elements(): Sequence<Pair<IntArray, T>> = sequence {
+        tensor.scalars().forEachIndexed { index: LongArray, ndArray: NdArray<T> ->
+            //yield(index.toIntArray() to ndArray.scalar)
+            TODO()
+        }
+    }
+
+    override fun set(index: IntArray, value: T) {
+        tensor.setObject(value, *index.toLongArray())
+    }
+}
+
+public abstract class TensorFlowOutput<T, TT : TType>(
+    private val graph: Graph,
+    output: Output<TT>
+) : TensorFlowTensor<T> {
+
+    public var output: Output<TT> = output
+        internal set
+
+    override val shape: Shape get() = output.shape().asArray().toIntArray()
+
+    protected abstract fun org.tensorflow.Tensor.actualizeTensor(): NdArray<T>
+
+    private val actualTensor by lazy {
+        val session = Session(graph)
+        TensorFlowArray(session.runner().fetch(output).run().first().actualizeTensor())
+    }
+
+    override fun get(index: IntArray): T = actualTensor[index]
+
+    @PerformancePitfall
+    override fun elements(): Sequence<Pair<IntArray, T>> = actualTensor.elements()
+
+    override fun set(index: IntArray, value: T) {
+        actualTensor[index] = value
+    }
+
+}
+
+
+public abstract class TensorFlowAlgebra<T, TT : TType> internal constructor(
+    private val graph: Graph
+) : TensorAlgebra<T> {
+
+    private val ops by lazy { Ops.create(graph) }
+
+    protected fun Tensor<T>.asTensorFlow(): TensorFlowOutput<T, TT> = if (this is TensorFlowOutput<T, TT>) this else {
+        TODO()
+    }
+
+    protected abstract fun Output<TT>.wrap(): TensorFlowOutput<T, TT>
+
+    protected abstract fun const(value: T): Constant<TT>
+
+    override fun Tensor<T>.valueOrNull(): T? = if (shape contentEquals intArrayOf(1))
+        get(Shape(0)) else null
+
+    private inline fun Tensor<T>.biOp(
+        other: Tensor<T>,
+        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
+    ): TensorFlowOutput<T, TT> {
+        val left = asTensorFlow().output
+        val right = other.asTensorFlow().output
+        return operation(left, right).asOutput().wrap()
+    }
+
+    private inline fun T.biOp(
+        other: Tensor<T>,
+        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
+    ): TensorFlowOutput<T, TT> {
+        val left = const(this)
+        val right = other.asTensorFlow().output
+        return operation(left, right).asOutput().wrap()
+    }
+
+    private inline fun Tensor<T>.biOp(
+        value: T,
+        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
+    ): TensorFlowOutput<T, TT> {
+        val left = asTensorFlow().output
+        val right = const(value)
+        return operation(left, right).asOutput().wrap()
+    }
+
+    private inline fun Tensor<T>.inPlaceOp(
+        other: Tensor<T>,
+        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
+    ): Unit {
+        val origin = asTensorFlow()
+        val left = origin.output
+        val right = other.asTensorFlow().output
+        origin.output = operation(left, right).asOutput()
+    }
+
+    private inline fun Tensor<T>.inPlaceOp(
+        value: T,
+        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
+    ): Unit {
+        val origin = asTensorFlow()
+        val left = origin.output
+        val right = const(value)
+        origin.output = operation(left, right).asOutput()
+    }
+
+    private inline fun unOp(value: Tensor<T>, operation: (Operand<TT>) -> Operand<TT>): TensorFlowOutput<T, TT> =
+        operation(value.asTensorFlow().output).asOutput().wrap()
+
+    override fun T.plus(other: Tensor<T>) = biOp(other, ops.math::add)
+
+    override fun Tensor<T>.plus(value: T) = biOp(value, ops.math::add)
+
+    override fun Tensor<T>.plus(other: Tensor<T>) = biOp(other, ops.math::add)
+
+    override fun Tensor<T>.plusAssign(value: T): Unit = inPlaceOp(value, ops.math::add)
+
+    override fun Tensor<T>.plusAssign(other: Tensor<T>): Unit = inPlaceOp(other, ops.math::add)
+
+    override fun Tensor<T>.minus(value: T) = biOp(value, ops.math::sub)
+
+    override fun Tensor<T>.minus(other: Tensor<T>) = biOp(other, ops.math::sub)
+
+    override fun Tensor<T>.minusAssign(value: T): Unit = inPlaceOp(value, ops.math::sub)
+
+    override fun Tensor<T>.minusAssign(other: Tensor<T>): Unit = inPlaceOp(other, ops.math::sub)
+
+    override fun T.times(other: Tensor<T>) = biOp(other, ops.math::mul)
+
+    override fun Tensor<T>.times(value: T) = biOp(value, ops.math::mul)
+
+    override fun Tensor<T>.times(other: Tensor<T>): TensorFlowOutput<T, TT> = biOp(other, ops.math::mul)
+
+    override fun Tensor<T>.timesAssign(value: T): Unit = inPlaceOp(value, ops.math::mul)
+
+    override fun Tensor<T>.timesAssign(other: Tensor<T>): Unit = inPlaceOp(other, ops.math::mul)
+
+    override fun Tensor<T>.unaryMinus() = unOp(this, ops.math::neg)
+
+    override fun Tensor<T>.get(i: Int): Tensor<T>{
+        ops.
+    }
+
+    override fun Tensor<T>.transpose(i: Int, j: Int): Tensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.view(shape: IntArray): Tensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.viewAs(other: Tensor<T>): Tensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.dot(other: Tensor<T>) = biOp(other, ops.math.)
+
+    override fun diagonalEmbedding(diagonalEntries: Tensor<T>, offset: Int, dim1: Int, dim2: Int): Tensor<T> = ops.run {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.sum(): T {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.sum(dim: Int, keepDim: Boolean): Tensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.min(): T {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.min(dim: Int, keepDim: Boolean): Tensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.max(): T {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.max(dim: Int, keepDim: Boolean): Tensor<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T> {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e73381bf2..a29f33824 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -33,6 +33,7 @@ include(
     ":kmath-commons",
     ":kmath-viktor",
     ":kmath-multik",
+    ":kmath-tensorflow",
     ":kmath-optimization",
     ":kmath-stat",
     ":kmath-nd4j",
-- 
2.34.1


From 69e6849a129453d00f855ee60ff76432dceb8e18 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 20 Oct 2021 16:11:36 +0300
Subject: [PATCH 358/713] Name refactoring for tensors

---
 .../kscience/kmath/nd/BufferAlgebraND.kt      | 12 +++++------
 .../space/kscience/kmath/nd/BufferND.kt       |  4 ++--
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |  2 +-
 .../nd/{ShapeIndex.kt => ShapeIndexer.kt}     |  4 ++--
 .../space/kscience/kmath/nd/Structure2D.kt    | 20 +++++++++----------
 .../space/kscience/kmath/nd/StructureND.kt    |  2 +-
 .../kmath/multik/MultikTensorAlgebra.kt       |  3 ++-
 7 files changed, 24 insertions(+), 23 deletions(-)
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/{ShapeIndex.kt => ShapeIndexer.kt} (95%)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index 1f231ce9f..859edefb8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -12,7 +12,7 @@ import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.BufferFactory
 
 public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
-    public val indexerBuilder: (IntArray) -> ShapeIndex
+    public val indexerBuilder: (IntArray) -> ShapeIndexer
     public val bufferAlgebra: BufferAlgebra<T, A>
     override val elementAlgebra: A get() = bufferAlgebra.elementAlgebra
 
@@ -43,7 +43,7 @@ public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
         zipInline(left.toBufferND(), right.toBufferND(), transform)
 
     public companion object {
-        public val defaultIndexerBuilder: (IntArray) -> ShapeIndex = DefaultStrides.Companion::invoke
+        public val defaultIndexerBuilder: (IntArray) -> ShapeIndexer = DefaultStrides.Companion::invoke
     }
 }
 
@@ -80,25 +80,25 @@ internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.zipInline(
 
 public open class BufferedGroupNDOps<T, out A : Group<T>>(
     override val bufferAlgebra: BufferAlgebra<T, A>,
-    override val indexerBuilder: (IntArray) -> ShapeIndex = BufferAlgebraND.defaultIndexerBuilder
+    override val indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder
 ) : GroupOpsND<T, A>, BufferAlgebraND<T, A> {
     override fun StructureND<T>.unaryMinus(): StructureND<T> = map { -it }
 }
 
 public open class BufferedRingOpsND<T, out A : Ring<T>>(
     bufferAlgebra: BufferAlgebra<T, A>,
-    indexerBuilder: (IntArray) -> ShapeIndex = BufferAlgebraND.defaultIndexerBuilder
+    indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder
 ) : BufferedGroupNDOps<T, A>(bufferAlgebra, indexerBuilder), RingOpsND<T, A>
 
 public open class BufferedFieldOpsND<T, out A : Field<T>>(
     bufferAlgebra: BufferAlgebra<T, A>,
-    indexerBuilder: (IntArray) -> ShapeIndex = BufferAlgebraND.defaultIndexerBuilder
+    indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder
 ) : BufferedRingOpsND<T, A>(bufferAlgebra, indexerBuilder), FieldOpsND<T, A> {
 
     public constructor(
         elementAlgebra: A,
         bufferFactory: BufferFactory<T>,
-        indexerBuilder: (IntArray) -> ShapeIndex = BufferAlgebraND.defaultIndexerBuilder
+        indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder
     ) : this(BufferFieldOps(elementAlgebra, bufferFactory), indexerBuilder)
 
     override fun scale(a: StructureND<T>, value: Double): StructureND<T> = a.map { it * value }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index c17632101..afa8f8250 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -19,7 +19,7 @@ import space.kscience.kmath.structures.MutableBufferFactory
  * @param buffer The underlying buffer.
  */
 public open class BufferND<out T>(
-    public val indexes: ShapeIndex,
+    public val indexes: ShapeIndexer,
     public open val buffer: Buffer<T>,
 ) : StructureND<T> {
 
@@ -58,7 +58,7 @@ public inline fun <T, reified R : Any> StructureND<T>.mapToBuffer(
  * @param buffer The underlying buffer.
  */
 public class MutableBufferND<T>(
-    strides: ShapeIndex,
+    strides: ShapeIndexer,
     override val buffer: MutableBuffer<T>,
 ) : MutableStructureND<T>, BufferND<T>(strides, buffer) {
     override fun set(index: IntArray, value: T) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 961f5869a..853ac43b0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -13,7 +13,7 @@ import kotlin.contracts.contract
 import kotlin.math.pow
 
 public class DoubleBufferND(
-    indexes: ShapeIndex,
+    indexes: ShapeIndexer,
     override val buffer: DoubleBuffer,
 ) : BufferND<Double>(indexes, buffer)
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndex.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
similarity index 95%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndex.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
index a78bcfa70..1ce6b7519 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndex.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
@@ -10,7 +10,7 @@ import kotlin.native.concurrent.ThreadLocal
 /**
  * A converter from linear index to multivariate index
  */
-public interface ShapeIndex{
+public interface ShapeIndexer{
     public val shape: Shape
 
     /**
@@ -42,7 +42,7 @@ public interface ShapeIndex{
 /**
  * Linear transformation of indexes
  */
-public abstract class Strides: ShapeIndex {
+public abstract class Strides: ShapeIndexer {
     /**
      * Array strides
      */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index 8d3cc3a3f..e3552c02e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -85,7 +85,7 @@ public interface MutableStructure2D<T> : Structure2D<T>, MutableStructureND<T> {
      */
     @PerformancePitfall
     override val rows: List<MutableStructure1D<T>>
-        get() = List(rowNum) { i -> MutableBuffer1DWrapper(MutableListBuffer(colNum) { j -> get(i, j) })}
+        get() = List(rowNum) { i -> MutableBuffer1DWrapper(MutableListBuffer(colNum) { j -> get(i, j) }) }
 
     /**
      * The buffer of columns of this structure. It gets elements from the structure dynamically.
@@ -100,7 +100,7 @@ public interface MutableStructure2D<T> : Structure2D<T>, MutableStructureND<T> {
  */
 @JvmInline
 private value class Structure2DWrapper<out T>(val structure: StructureND<T>) : Structure2D<T> {
-    override val shape: IntArray get() = structure.shape
+    override val shape: Shape get() = structure.shape
 
     override val rowNum: Int get() = shape[0]
     override val colNum: Int get() = shape[1]
@@ -116,9 +116,8 @@ private value class Structure2DWrapper<out T>(val structure: StructureND<T>) : S
 /**
  * A 2D wrapper for a mutable nd-structure
  */
-private class MutableStructure2DWrapper<T>(val structure: MutableStructureND<T>): MutableStructure2D<T>
-{
-    override val shape: IntArray get() = structure.shape
+private class MutableStructure2DWrapper<T>(val structure: MutableStructureND<T>) : MutableStructure2D<T> {
+    override val shape: Shape get() = structure.shape
 
     override val rowNum: Int get() = shape[0]
     override val colNum: Int get() = shape[1]
@@ -129,7 +128,7 @@ private class MutableStructure2DWrapper<T>(val structure: MutableStructureND<T>)
         structure[index] = value
     }
 
-    override operator fun set(i: Int, j: Int, value: T){
+    override operator fun set(i: Int, j: Int, value: T) {
         structure[intArrayOf(i, j)] = value
     }
 
@@ -152,10 +151,11 @@ public fun <T> StructureND<T>.as2D(): Structure2D<T> = this as? Structure2D<T> ?
 /**
  * Represents a [StructureND] as [Structure2D]. Throws runtime error in case of dimension mismatch.
  */
-public fun <T> MutableStructureND<T>.as2D(): MutableStructure2D<T> = this as? MutableStructure2D<T> ?: when (shape.size) {
-    2 -> MutableStructure2DWrapper(this)
-    else -> error("Can't create 2d-structure from ${shape.size}d-structure")
-}
+public fun <T> MutableStructureND<T>.as2D(): MutableStructure2D<T> =
+    this as? MutableStructure2D<T> ?: when (shape.size) {
+        2 -> MutableStructure2DWrapper(this)
+        else -> error("Can't create 2d-structure from ${shape.size}d-structure")
+    }
 
 /**
  * Expose inner [StructureND] if possible
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 611d2724f..b4e62366a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -33,7 +33,7 @@ public interface StructureND<out T> : Featured<StructureFeature> {
      * The shape of structure i.e., non-empty sequence of non-negative integers that specify sizes of dimensions of
      * this structure.
      */
-    public val shape: IntArray
+    public val shape: Shape
 
     /**
      * The count of dimensions in this structure. It should be equal to size of [shape].
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index ed5575b93..a89e92c8e 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -15,6 +15,7 @@ import org.jetbrains.kotlinx.multik.api.zeros
 import org.jetbrains.kotlinx.multik.ndarray.data.*
 import org.jetbrains.kotlinx.multik.ndarray.operations.*
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.mapInPlace
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.tensors.api.Tensor
@@ -22,7 +23,7 @@ import space.kscience.kmath.tensors.api.TensorAlgebra
 
 @JvmInline
 public value class MultikTensor<T>(public val array: MutableMultiArray<T, DN>) : Tensor<T> {
-    override val shape: IntArray get() = array.shape
+    override val shape: Shape get() = array.shape
 
     override fun get(index: IntArray): T = array[index]
 
-- 
2.34.1


From cfd3f3b7e152cf7bb12413534cf950f6987353b2 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 20 Oct 2021 16:35:52 +0300
Subject: [PATCH 359/713] fix NDArray cast

---
 .../kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index a89e92c8e..04c467861 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -171,8 +171,7 @@ public class MultikTensorAlgebra<T : Number> internal constructor(
 
         val mt = asMultik().array
         return if (mt.shape.contentEquals(shape)) {
-            @Suppress("UNCHECKED_CAST")
-            this as NDArray<T, DN>
+            (this as MultikTensor<T>).array
         } else {
             NDArray(mt.data, mt.offset, shape, dim = DN(shape.size), base = mt.base ?: mt)
         }.wrap()
-- 
2.34.1


From 47aeb36979d3501def28d920a86cf60916d5166b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 20 Oct 2021 17:04:00 +0300
Subject: [PATCH 360/713] fix NDArray cast

---
 .../kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index 04c467861..ed15199a6 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -171,7 +171,7 @@ public class MultikTensorAlgebra<T : Number> internal constructor(
 
         val mt = asMultik().array
         return if (mt.shape.contentEquals(shape)) {
-            (this as MultikTensor<T>).array
+            mt
         } else {
             NDArray(mt.data, mt.offset, shape, dim = DN(shape.size), base = mt.base ?: mt)
         }.wrap()
@@ -186,7 +186,7 @@ public class MultikTensorAlgebra<T : Number> internal constructor(
             ).asDNArray().wrap()
         } else if (this.shape.size == 2 && other.shape.size == 2) {
             (asMultik().array.asD2Array() dot other.asMultik().array.asD2Array()).asDNArray().wrap()
-        } else if(this.shape.size == 2 && other.shape.size == 1) {
+        } else if (this.shape.size == 2 && other.shape.size == 1) {
             (asMultik().array.asD2Array() dot other.asMultik().array.asD1Array()).asDNArray().wrap()
         } else {
             TODO("Not implemented for broadcasting")
-- 
2.34.1


From cc114041c4eb2c71248d8a54876d57668286cc95 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 24 Oct 2021 18:33:39 +0300
Subject: [PATCH 361/713] Initial implementation of TensorFlow connector

---
 .../tensorflow/DoubleTensorFlowAlgebra.kt     | 40 +++++++++++++++
 .../kmath/tensorflow/TensorFlowAlgebra.kt     | 49 +++++++++----------
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 14 +++---
 3 files changed, 71 insertions(+), 32 deletions(-)
 create mode 100644 kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt

diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
new file mode 100644
index 000000000..864205e17
--- /dev/null
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
@@ -0,0 +1,40 @@
+package space.kscience.kmath.tensorflow
+
+import org.tensorflow.Graph
+import org.tensorflow.Output
+import org.tensorflow.ndarray.NdArray
+import org.tensorflow.ndarray.Shape
+import org.tensorflow.op.core.Constant
+import org.tensorflow.types.TFloat64
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.tensors.api.Tensor
+
+public class DoubleTensorFlowOutput(
+    graph: Graph,
+    output: Output<TFloat64>
+) : TensorFlowOutput<Double, TFloat64>(graph, output) {
+    override fun org.tensorflow.Tensor.actualizeTensor(): NdArray<Double> = output.asTensor()
+}
+
+public class DoubleTensorFlowAlgebra internal constructor(
+    graph: Graph
+) : TensorFlowAlgebra<Double, TFloat64>(graph) {
+
+    override fun Tensor<Double>.asTensorFlow(): TensorFlowOutput<Double, TFloat64> =
+        if (this is TensorFlowOutput<Double, *> && output.type() == TFloat64::class.java) {
+            @Suppress("UNCHECKED_CAST")
+            this as TensorFlowOutput<Double, TFloat64>
+        } else {
+            val res = TFloat64.tensorOf(Shape.of(*shape.toLongArray())) { array ->
+                @OptIn(PerformancePitfall::class)
+                elements().forEach { (index, value) ->
+                    array.setDouble(value, *index.toLongArray())
+                }
+            }
+            DoubleTensorFlowOutput(graph, ops.constant(res).asOutput())
+        }
+
+    override fun Output<TFloat64>.wrap(): TensorFlowOutput<Double, TFloat64> = DoubleTensorFlowOutput(graph, this)
+
+    override fun const(value: Double): Constant<TFloat64> = ops.constant(value)
+}
\ No newline at end of file
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index 849a2e909..12c1211db 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -14,11 +14,10 @@ import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.api.TensorAlgebra
 
-private fun IntArray.toLongArray() = LongArray(size) { get(it).toLong() }
-private fun LongArray.toIntArray() = IntArray(size) { get(it).toInt() }
+internal fun IntArray.toLongArray() = LongArray(size) { get(it).toLong() }
+internal fun LongArray.toIntArray() = IntArray(size) { get(it).toInt() }
 
-private val <T> NdArray<T>.scalar: T
-    get() = getObject()
+internal val <T> NdArray<T>.scalar: T get() = getObject()
 
 
 public sealed interface TensorFlowTensor<T> : Tensor<T>
@@ -72,14 +71,12 @@ public abstract class TensorFlowOutput<T, TT : TType>(
 
 
 public abstract class TensorFlowAlgebra<T, TT : TType> internal constructor(
-    private val graph: Graph
+    protected val graph: Graph
 ) : TensorAlgebra<T> {
 
-    private val ops by lazy { Ops.create(graph) }
+    protected val ops: Ops by lazy { Ops.create(graph) }
 
-    protected fun Tensor<T>.asTensorFlow(): TensorFlowOutput<T, TT> = if (this is TensorFlowOutput<T, TT>) this else {
-        TODO()
-    }
+    protected abstract fun Tensor<T>.asTensorFlow(): TensorFlowOutput<T, TT>
 
     protected abstract fun Output<TT>.wrap(): TensorFlowOutput<T, TT>
 
@@ -138,27 +135,29 @@ public abstract class TensorFlowAlgebra<T, TT : TType> internal constructor(
     private inline fun unOp(value: Tensor<T>, operation: (Operand<TT>) -> Operand<TT>): TensorFlowOutput<T, TT> =
         operation(value.asTensorFlow().output).asOutput().wrap()
 
-    override fun T.plus(other: Tensor<T>) = biOp(other, ops.math::add)
+    override fun T.plus(other: Tensor<T>): TensorFlowOutput<T, TT> = biOp(other, ops.math::add)
 
-    override fun Tensor<T>.plus(value: T) = biOp(value, ops.math::add)
+    override fun Tensor<T>.plus(value: T): TensorFlowOutput<T, TT> = biOp(value, ops.math::add)
 
-    override fun Tensor<T>.plus(other: Tensor<T>) = biOp(other, ops.math::add)
+    override fun Tensor<T>.plus(other: Tensor<T>): TensorFlowOutput<T, TT> = biOp(other, ops.math::add)
 
     override fun Tensor<T>.plusAssign(value: T): Unit = inPlaceOp(value, ops.math::add)
 
     override fun Tensor<T>.plusAssign(other: Tensor<T>): Unit = inPlaceOp(other, ops.math::add)
 
-    override fun Tensor<T>.minus(value: T) = biOp(value, ops.math::sub)
+    override fun Tensor<T>.minus(value: T): TensorFlowOutput<T, TT> = biOp(value, ops.math::sub)
 
-    override fun Tensor<T>.minus(other: Tensor<T>) = biOp(other, ops.math::sub)
+    override fun Tensor<T>.minus(other: Tensor<T>): TensorFlowOutput<T, TT> = biOp(other, ops.math::sub)
+
+    override fun T.minus(other: Tensor<T>): Tensor<T> = biOp(other, ops.math::sub)
 
     override fun Tensor<T>.minusAssign(value: T): Unit = inPlaceOp(value, ops.math::sub)
 
     override fun Tensor<T>.minusAssign(other: Tensor<T>): Unit = inPlaceOp(other, ops.math::sub)
 
-    override fun T.times(other: Tensor<T>) = biOp(other, ops.math::mul)
+    override fun T.times(other: Tensor<T>): TensorFlowOutput<T, TT> = biOp(other, ops.math::mul)
 
-    override fun Tensor<T>.times(value: T) = biOp(value, ops.math::mul)
+    override fun Tensor<T>.times(value: T): TensorFlowOutput<T, TT> = biOp(value, ops.math::mul)
 
     override fun Tensor<T>.times(other: Tensor<T>): TensorFlowOutput<T, TT> = biOp(other, ops.math::mul)
 
@@ -166,14 +165,14 @@ public abstract class TensorFlowAlgebra<T, TT : TType> internal constructor(
 
     override fun Tensor<T>.timesAssign(other: Tensor<T>): Unit = inPlaceOp(other, ops.math::mul)
 
-    override fun Tensor<T>.unaryMinus() = unOp(this, ops.math::neg)
+    override fun Tensor<T>.unaryMinus(): TensorFlowOutput<T, TT> = unOp(this, ops.math::neg)
 
-    override fun Tensor<T>.get(i: Int): Tensor<T>{
-        ops.
+    override fun Tensor<T>.get(i: Int): Tensor<T> {
+        TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.transpose(i: Int, j: Int): Tensor<T> {
-        TODO("Not yet implemented")
+    override fun Tensor<T>.transpose(i: Int, j: Int): Tensor<T> = unOp(this) {
+        ops.linalg.transpose(it, ops.constant(intArrayOf(i, j)))
     }
 
     override fun Tensor<T>.view(shape: IntArray): Tensor<T> {
@@ -184,15 +183,15 @@ public abstract class TensorFlowAlgebra<T, TT : TType> internal constructor(
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.dot(other: Tensor<T>) = biOp(other, ops.math.)
+    override fun Tensor<T>.dot(other: Tensor<T>): TensorFlowOutput<T, TT> = biOp(other) { l, r ->
+        ops.linalg.matMul(l, r)
+    }
 
     override fun diagonalEmbedding(diagonalEntries: Tensor<T>, offset: Int, dim1: Int, dim2: Int): Tensor<T> = ops.run {
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.sum(): T {
-        TODO("Not yet implemented")
-    }
+    override fun Tensor<T>.sum(): T = TODO("Not yet implemented")
 
     override fun Tensor<T>.sum(dim: Int, keepDim: Boolean): Tensor<T> {
         TODO("Not yet implemented")
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 16ed4b834..3267e4adb 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -22,7 +22,7 @@ import kotlin.math.*
 public open class DoubleTensorAlgebra :
     TensorPartialDivisionAlgebra<Double>,
     AnalyticTensorAlgebra<Double>,
-    LinearOpsTensorAlgebra<Double>{
+    LinearOpsTensorAlgebra<Double> {
 
     public companion object : DoubleTensorAlgebra()
 
@@ -361,16 +361,16 @@ public open class DoubleTensorAlgebra :
             dotHelper(a.as2D(), b.as2D(), res.as2D(), l, m1, n)
         }
 
-        if (penultimateDim) {
-            return resTensor.view(
+        return if (penultimateDim) {
+            resTensor.view(
                 resTensor.shape.dropLast(2).toIntArray() +
                         intArrayOf(resTensor.shape.last())
             )
+        } else if (lastDim) {
+            resTensor.view(resTensor.shape.dropLast(1).toIntArray())
+        } else {
+            resTensor
         }
-        if (lastDim) {
-            return resTensor.view(resTensor.shape.dropLast(1).toIntArray())
-        }
-        return resTensor
     }
 
     override fun diagonalEmbedding(
-- 
2.34.1


From 7e59ec5804370829d85b858362a5187b3cec1740 Mon Sep 17 00:00:00 2001
From: darksnake <altavir@gmail.com>
Date: Tue, 26 Oct 2021 09:16:24 +0300
Subject: [PATCH 362/713] Refactor TensorAlgebra to take StructureND and
 inherit AlgebraND

---
 .../kmath/structures/StreamDoubleFieldND.kt   |   2 +-
 .../kscience/kmath/tensors/neuralNetwork.kt   |   4 +-
 .../space/kscience/kmath/nd/AlgebraND.kt      |   8 +-
 .../kscience/kmath/nd/BufferAlgebraND.kt      |   8 +-
 .../space/kscience/kmath/nd/BufferND.kt       |  16 +-
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |   6 +-
 .../space/kscience/kmath/nd/StructureND.kt    |   4 +-
 .../space/kscience/kmath/real/realND.kt       |   4 +-
 .../kmath/multik/MultikTensorAlgebra.kt       |  53 +++---
 .../tensors/api/AnalyticTensorAlgebra.kt      |   4 +-
 .../tensors/api/LinearOpsTensorAlgebra.kt     |   4 +-
 .../kmath/tensors/api/TensorAlgebra.kt        |  58 +++---
 .../api/TensorPartialDivisionAlgebra.kt       |  26 ++-
 .../core/BroadcastDoubleTensorAlgebra.kt      |  31 +--
 .../kmath/tensors/core/BufferedTensor.kt      |  10 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 180 +++++++++++-------
 .../tensors/core/internal/broadcastUtils.kt   |  14 +-
 .../kmath/tensors/core/internal/checks.kt     |   3 +-
 .../tensors/core/internal/tensorCastsUtils.kt |   9 +-
 .../kmath/tensors/core/internal/utils.kt      |   2 +-
 .../kmath/tensors/core/tensorCasts.kt         |   9 +-
 21 files changed, 258 insertions(+), 197 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index 2b3e72136..05a13f5d2 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -36,7 +36,7 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
                 this@StreamDoubleFieldND.shape,
                 shape
             )
-            this is BufferND && this.indexes == this@StreamDoubleFieldND.strides -> this.buffer as DoubleBuffer
+            this is BufferND && this.indices == this@StreamDoubleFieldND.strides -> this.buffer as DoubleBuffer
             else -> DoubleBuffer(strides.linearSize) { offset -> get(strides.index(offset)) }
         }
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
index 3025ff8a3..cdfc06922 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
@@ -9,7 +9,7 @@ import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
-import space.kscience.kmath.tensors.core.toDoubleArray
+import space.kscience.kmath.tensors.core.copyArray
 import kotlin.math.sqrt
 
 const val seed = 100500L
@@ -111,7 +111,7 @@ class NeuralNetwork(private val layers: List<Layer>) {
     private fun softMaxLoss(yPred: DoubleTensor, yTrue: DoubleTensor): DoubleTensor = BroadcastDoubleTensorAlgebra {
 
         val onesForAnswers = yPred.zeroesLike()
-        yTrue.toDoubleArray().forEachIndexed { index, labelDouble ->
+        yTrue.copyArray().forEachIndexed { index, labelDouble ->
             val label = labelDouble.toInt()
             onesForAnswers[intArrayOf(index, label)] = 1.0
         }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index 30cb01146..3d2d08fac 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -131,19 +131,19 @@ public interface GroupOpsND<T, out A : GroupOps<T>> : GroupOps<StructureND<T>>,
      * Adds an element to ND structure of it.
      *
      * @receiver the augend.
-     * @param arg the addend.
+     * @param other the addend.
      * @return the sum.
      */
-    public operator fun T.plus(arg: StructureND<T>): StructureND<T> = arg + this
+    public operator fun T.plus(other: StructureND<T>): StructureND<T> = other.map { value -> add(this@plus, value) }
 
     /**
      * Subtracts an ND structure from an element of it.
      *
      * @receiver the dividend.
-     * @param arg the divisor.
+     * @param other the divisor.
      * @return the quotient.
      */
-    public operator fun T.minus(arg: StructureND<T>): StructureND<T> = arg.map { value -> add(-this@minus, value) }
+    public operator fun T.minus(other: StructureND<T>): StructureND<T> = other.map { value -> add(-this@minus, value) }
 
     public companion object
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index 859edefb8..cf007e7c9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -51,7 +51,7 @@ public inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.mapInline(
     arg: BufferND<T>,
     crossinline transform: A.(T) -> T
 ): BufferND<T> {
-    val indexes = arg.indexes
+    val indexes = arg.indices
     return BufferND(indexes, bufferAlgebra.mapInline(arg.buffer, transform))
 }
 
@@ -59,7 +59,7 @@ internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.mapIndexedInline(
     arg: BufferND<T>,
     crossinline transform: A.(index: IntArray, arg: T) -> T
 ): BufferND<T> {
-    val indexes = arg.indexes
+    val indexes = arg.indices
     return BufferND(
         indexes,
         bufferAlgebra.mapIndexedInline(arg.buffer) { offset, value ->
@@ -73,8 +73,8 @@ internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.zipInline(
     r: BufferND<T>,
     crossinline block: A.(l: T, r: T) -> T
 ): BufferND<T> {
-    require(l.indexes == r.indexes) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
-    val indexes = l.indexes
+    require(l.indices == r.indices) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
+    val indexes = l.indices
     return BufferND(indexes, bufferAlgebra.zipInline(l.buffer, r.buffer, block))
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index afa8f8250..2b6fd3693 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -15,20 +15,20 @@ import space.kscience.kmath.structures.MutableBufferFactory
  * Represents [StructureND] over [Buffer].
  *
  * @param T the type of items.
- * @param indexes The strides to access elements of [Buffer] by linear indices.
+ * @param indices The strides to access elements of [Buffer] by linear indices.
  * @param buffer The underlying buffer.
  */
 public open class BufferND<out T>(
-    public val indexes: ShapeIndexer,
+    public val indices: ShapeIndexer,
     public open val buffer: Buffer<T>,
 ) : StructureND<T> {
 
-    override operator fun get(index: IntArray): T = buffer[indexes.offset(index)]
+    override operator fun get(index: IntArray): T = buffer[indices.offset(index)]
 
-    override val shape: IntArray get() = indexes.shape
+    override val shape: IntArray get() = indices.shape
 
     @PerformancePitfall
-    override fun elements(): Sequence<Pair<IntArray, T>> = indexes.indices().map {
+    override fun elements(): Sequence<Pair<IntArray, T>> = indices.indices().map {
         it to this[it]
     }
 
@@ -43,7 +43,7 @@ public inline fun <T, reified R : Any> StructureND<T>.mapToBuffer(
     crossinline transform: (T) -> R,
 ): BufferND<R> {
     return if (this is BufferND<T>)
-        BufferND(this.indexes, factory.invoke(indexes.linearSize) { transform(buffer[it]) })
+        BufferND(this.indices, factory.invoke(indices.linearSize) { transform(buffer[it]) })
     else {
         val strides = DefaultStrides(shape)
         BufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
@@ -62,7 +62,7 @@ public class MutableBufferND<T>(
     override val buffer: MutableBuffer<T>,
 ) : MutableStructureND<T>, BufferND<T>(strides, buffer) {
     override fun set(index: IntArray, value: T) {
-        buffer[indexes.offset(index)] = value
+        buffer[indices.offset(index)] = value
     }
 }
 
@@ -74,7 +74,7 @@ public inline fun <T, reified R : Any> MutableStructureND<T>.mapToMutableBuffer(
     crossinline transform: (T) -> R,
 ): MutableBufferND<R> {
     return if (this is MutableBufferND<T>)
-        MutableBufferND(this.indexes, factory.invoke(indexes.linearSize) { transform(buffer[it]) })
+        MutableBufferND(this.indices, factory.invoke(indices.linearSize) { transform(buffer[it]) })
     else {
         val strides = DefaultStrides(shape)
         MutableBufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 853ac43b0..abb8e46ea 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -33,7 +33,7 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
         arg: DoubleBufferND,
         transform: (Double) -> Double
     ): DoubleBufferND {
-        val indexes = arg.indexes
+        val indexes = arg.indices
         val array = arg.buffer.array
         return DoubleBufferND(indexes, DoubleBuffer(indexes.linearSize) { transform(array[it]) })
     }
@@ -43,8 +43,8 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
         r: DoubleBufferND,
         block: (l: Double, r: Double) -> Double
     ): DoubleBufferND {
-        require(l.indexes == r.indexes) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
-        val indexes = l.indexes
+        require(l.indices == r.indices) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
+        val indexes = l.indices
         val lArray = l.buffer.array
         val rArray = r.buffer.array
         return DoubleBufferND(indexes, DoubleBuffer(indexes.linearSize) { block(lArray[it], rArray[it]) })
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index b4e62366a..496abf60f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -71,7 +71,7 @@ public interface StructureND<out T> : Featured<StructureFeature> {
             if (st1 === st2) return true
 
             // fast comparison of buffers if possible
-            if (st1 is BufferND && st2 is BufferND && st1.indexes == st2.indexes)
+            if (st1 is BufferND && st2 is BufferND && st1.indices == st2.indices)
                 return Buffer.contentEquals(st1.buffer, st2.buffer)
 
             //element by element comparison if it could not be avoided
@@ -87,7 +87,7 @@ public interface StructureND<out T> : Featured<StructureFeature> {
             if (st1 === st2) return true
 
             // fast comparison of buffers if possible
-            if (st1 is BufferND && st2 is BufferND && st1.indexes == st2.indexes)
+            if (st1 is BufferND && st2 is BufferND && st1.indices == st2.indices)
                 return Buffer.contentEquals(st1.buffer, st2.buffer)
 
             //element by element comparison if it could not be avoided
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
index 0edd51be2..56f50acbc 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
@@ -13,8 +13,8 @@ import space.kscience.kmath.structures.DoubleBuffer
  * Map one [BufferND] using function without indices.
  */
 public inline fun BufferND<Double>.mapInline(crossinline transform: DoubleField.(Double) -> Double): BufferND<Double> {
-    val array = DoubleArray(indexes.linearSize) { offset -> DoubleField.transform(buffer[offset]) }
-    return BufferND(indexes, DoubleBuffer(array))
+    val array = DoubleArray(indices.linearSize) { offset -> DoubleField.transform(buffer[offset]) }
+    return BufferND(indices, DoubleBuffer(array))
 }
 
 /**
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index ed15199a6..3bbe8e672 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.multik.ndarray.data.*
 import org.jetbrains.kotlinx.multik.ndarray.operations.*
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.mapInPlace
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.tensors.api.Tensor
@@ -49,17 +50,17 @@ private fun <T, D : Dimension> MultiArray<T, D>.asD2Array(): D2Array<T> {
     else throw ClassCastException("Cannot cast MultiArray to NDArray.")
 }
 
-public class MultikTensorAlgebra<T : Number> internal constructor(
+public class MultikTensorAlgebra<T : Number, A: Ring<T>> internal constructor(
     public val type: DataType,
-    public val elementAlgebra: Ring<T>,
+    override val elementAlgebra: A,
     public val comparator: Comparator<T>
-) : TensorAlgebra<T> {
+) : TensorAlgebra<T, A> {
 
     /**
      * Convert a tensor to [MultikTensor] if necessary. If tensor is converted, changes on the resulting tensor
      * are not reflected back onto the source
      */
-    public fun Tensor<T>.asMultik(): MultikTensor<T> {
+    public fun StructureND<T>.asMultik(): MultikTensor<T> {
         return if (this is MultikTensor) {
             this
         } else {
@@ -73,17 +74,17 @@ public class MultikTensorAlgebra<T : Number> internal constructor(
 
     public fun MutableMultiArray<T, DN>.wrap(): MultikTensor<T> = MultikTensor(this)
 
-    override fun Tensor<T>.valueOrNull(): T? = if (shape contentEquals intArrayOf(1)) {
+    override fun StructureND<T>.valueOrNull(): T? = if (shape contentEquals intArrayOf(1)) {
         get(intArrayOf(0))
     } else null
 
-    override fun T.plus(other: Tensor<T>): MultikTensor<T> =
+    override fun T.plus(other: StructureND<T>): MultikTensor<T> =
         other.plus(this)
 
-    override fun Tensor<T>.plus(value: T): MultikTensor<T> =
+    override fun StructureND<T>.plus(value: T): MultikTensor<T> =
         asMultik().array.deepCopy().apply { plusAssign(value) }.wrap()
 
-    override fun Tensor<T>.plus(other: Tensor<T>): MultikTensor<T> =
+    override fun StructureND<T>.plus(other: StructureND<T>): MultikTensor<T> =
         asMultik().array.plus(other.asMultik().array).wrap()
 
     override fun Tensor<T>.plusAssign(value: T) {
@@ -94,7 +95,7 @@ public class MultikTensorAlgebra<T : Number> internal constructor(
         }
     }
 
-    override fun Tensor<T>.plusAssign(other: Tensor<T>) {
+    override fun Tensor<T>.plusAssign(other: StructureND<T>) {
         if (this is MultikTensor) {
             array.plusAssign(other.asMultik().array)
         } else {
@@ -102,12 +103,12 @@ public class MultikTensorAlgebra<T : Number> internal constructor(
         }
     }
 
-    override fun T.minus(other: Tensor<T>): MultikTensor<T> = (-(other.asMultik().array - this)).wrap()
+    override fun T.minus(other: StructureND<T>): MultikTensor<T> = (-(other.asMultik().array - this)).wrap()
 
-    override fun Tensor<T>.minus(value: T): MultikTensor<T> =
-        asMultik().array.deepCopy().apply { minusAssign(value) }.wrap()
+    override fun StructureND<T>.minus(arg: T): MultikTensor<T> =
+        asMultik().array.deepCopy().apply { minusAssign(arg) }.wrap()
 
-    override fun Tensor<T>.minus(other: Tensor<T>): MultikTensor<T> =
+    override fun StructureND<T>.minus(other: StructureND<T>): MultikTensor<T> =
         asMultik().array.minus(other.asMultik().array).wrap()
 
     override fun Tensor<T>.minusAssign(value: T) {
@@ -118,7 +119,7 @@ public class MultikTensorAlgebra<T : Number> internal constructor(
         }
     }
 
-    override fun Tensor<T>.minusAssign(other: Tensor<T>) {
+    override fun Tensor<T>.minusAssign(other: StructureND<T>) {
         if (this is MultikTensor) {
             array.minusAssign(other.asMultik().array)
         } else {
@@ -126,13 +127,13 @@ public class MultikTensorAlgebra<T : Number> internal constructor(
         }
     }
 
-    override fun T.times(other: Tensor<T>): MultikTensor<T> =
-        other.asMultik().array.deepCopy().apply { timesAssign(this@times) }.wrap()
+    override fun T.times(arg: StructureND<T>): MultikTensor<T> =
+        arg.asMultik().array.deepCopy().apply { timesAssign(this@times) }.wrap()
 
-    override fun Tensor<T>.times(value: T): Tensor<T> =
-        asMultik().array.deepCopy().apply { timesAssign(value) }.wrap()
+    override fun StructureND<T>.times(arg: T): Tensor<T> =
+        asMultik().array.deepCopy().apply { timesAssign(arg) }.wrap()
 
-    override fun Tensor<T>.times(other: Tensor<T>): MultikTensor<T> =
+    override fun StructureND<T>.times(other: StructureND<T>): MultikTensor<T> =
         asMultik().array.times(other.asMultik().array).wrap()
 
     override fun Tensor<T>.timesAssign(value: T) {
@@ -143,7 +144,7 @@ public class MultikTensorAlgebra<T : Number> internal constructor(
         }
     }
 
-    override fun Tensor<T>.timesAssign(other: Tensor<T>) {
+    override fun Tensor<T>.timesAssign(other: StructureND<T>) {
         if (this is MultikTensor) {
             array.timesAssign(other.asMultik().array)
         } else {
@@ -151,7 +152,7 @@ public class MultikTensorAlgebra<T : Number> internal constructor(
         }
     }
 
-    override fun Tensor<T>.unaryMinus(): MultikTensor<T> =
+    override fun StructureND<T>.unaryMinus(): MultikTensor<T> =
         asMultik().array.unaryMinus().wrap()
 
     override fun Tensor<T>.get(i: Int): MultikTensor<T> = asMultik().array.mutableView(i).wrap()
@@ -224,17 +225,17 @@ public class MultikTensorAlgebra<T : Number> internal constructor(
     }
 }
 
-public val DoubleField.multikTensorAlgebra: MultikTensorAlgebra<Double>
+public val DoubleField.multikTensorAlgebra: MultikTensorAlgebra<Double, DoubleField>
     get() = MultikTensorAlgebra(DataType.DoubleDataType, DoubleField) { o1, o2 -> o1.compareTo(o2) }
 
-public val FloatField.multikTensorAlgebra: MultikTensorAlgebra<Float>
+public val FloatField.multikTensorAlgebra: MultikTensorAlgebra<Float, FloatField>
     get() = MultikTensorAlgebra(DataType.FloatDataType, FloatField) { o1, o2 -> o1.compareTo(o2) }
 
-public val ShortRing.multikTensorAlgebra: MultikTensorAlgebra<Short>
+public val ShortRing.multikTensorAlgebra: MultikTensorAlgebra<Short, ShortRing>
     get() = MultikTensorAlgebra(DataType.ShortDataType, ShortRing) { o1, o2 -> o1.compareTo(o2) }
 
-public val IntRing.multikTensorAlgebra: MultikTensorAlgebra<Int>
+public val IntRing.multikTensorAlgebra: MultikTensorAlgebra<Int, IntRing>
     get() = MultikTensorAlgebra(DataType.IntDataType, IntRing) { o1, o2 -> o1.compareTo(o2) }
 
-public val LongRing.multikTensorAlgebra: MultikTensorAlgebra<Long>
+public val LongRing.multikTensorAlgebra: MultikTensorAlgebra<Long, LongRing>
     get() = MultikTensorAlgebra(DataType.LongDataType, LongRing) { o1, o2 -> o1.compareTo(o2) }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index 851810c8d..caafcc7c1 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -5,13 +5,15 @@
 
 package space.kscience.kmath.tensors.api
 
+import space.kscience.kmath.operations.Field
+
 
 /**
  * Analytic operations on [Tensor].
  *
  * @param T the type of items closed under analytic functions in the tensors.
  */
-public interface AnalyticTensorAlgebra<T> : TensorPartialDivisionAlgebra<T> {
+public interface AnalyticTensorAlgebra<T, A : Field<T>> : TensorPartialDivisionAlgebra<T, A> {
 
     /**
      * @return the mean of all elements in the input tensor.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index 78aad2189..3f32eb9ca 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -5,12 +5,14 @@
 
 package space.kscience.kmath.tensors.api
 
+import space.kscience.kmath.operations.Field
+
 /**
  * Common linear algebra operations. Operates on [Tensor].
  *
  * @param T the type of items closed under division in the tensors.
  */
-public interface LinearOpsTensorAlgebra<T> : TensorPartialDivisionAlgebra<T> {
+public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivisionAlgebra<T, A> {
 
     /**
      * Computes the determinant of a square matrix input, or of each square matrix in a batched input.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 810ebe777..e910c5c31 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -5,7 +5,9 @@
 
 package space.kscience.kmath.tensors.api
 
-import space.kscience.kmath.operations.RingOps
+import space.kscience.kmath.nd.RingOpsND
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.Ring
 
 /**
  * Algebra over a ring on [Tensor].
@@ -13,20 +15,20 @@ import space.kscience.kmath.operations.RingOps
  *
  * @param T the type of items in the tensors.
  */
-public interface TensorAlgebra<T> : RingOps<Tensor<T>> {
+public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
     /**
      * Returns a single tensor value of unit dimension if tensor shape equals to [1].
      *
      * @return a nullable value of a potentially scalar tensor.
      */
-    public fun Tensor<T>.valueOrNull(): T?
+    public fun StructureND<T>.valueOrNull(): T?
 
     /**
      * Returns a single tensor value of unit dimension. The tensor shape must be equal to [1].
      *
      * @return the value of a scalar tensor.
      */
-    public fun Tensor<T>.value(): T =
+    public fun StructureND<T>.value(): T =
         valueOrNull() ?: throw IllegalArgumentException("Inconsistent value for tensor of with $shape shape")
 
     /**
@@ -36,7 +38,7 @@ public interface TensorAlgebra<T> : RingOps<Tensor<T>> {
      * @param other tensor to be added.
      * @return the sum of this value and tensor [other].
      */
-    public operator fun T.plus(other: Tensor<T>): Tensor<T>
+    override operator fun T.plus(other: StructureND<T>): Tensor<T>
 
     /**
      * Adds the scalar [value] to each element of this tensor and returns a new resulting tensor.
@@ -44,7 +46,7 @@ public interface TensorAlgebra<T> : RingOps<Tensor<T>> {
      * @param value the number to be added to each element of this tensor.
      * @return the sum of this tensor and [value].
      */
-    public operator fun Tensor<T>.plus(value: T): Tensor<T>
+    override operator fun StructureND<T>.plus(value: T): Tensor<T>
 
     /**
      * Each element of the tensor [other] is added to each element of this tensor.
@@ -53,7 +55,7 @@ public interface TensorAlgebra<T> : RingOps<Tensor<T>> {
      * @param other tensor to be added.
      * @return the sum of this tensor and [other].
      */
-    override fun Tensor<T>.plus(other: Tensor<T>): Tensor<T>
+    override operator fun StructureND<T>.plus(other: StructureND<T>): Tensor<T>
 
     /**
      * Adds the scalar [value] to each element of this tensor.
@@ -67,7 +69,7 @@ public interface TensorAlgebra<T> : RingOps<Tensor<T>> {
      *
      * @param other tensor to be added.
      */
-    public operator fun Tensor<T>.plusAssign(other: Tensor<T>)
+    public operator fun Tensor<T>.plusAssign(other: StructureND<T>)
 
     /**
      * Each element of the tensor [other] is subtracted from this value.
@@ -76,15 +78,15 @@ public interface TensorAlgebra<T> : RingOps<Tensor<T>> {
      * @param other tensor to be subtracted.
      * @return the difference between this value and tensor [other].
      */
-    public operator fun T.minus(other: Tensor<T>): Tensor<T>
+    override operator fun T.minus(other: StructureND<T>): Tensor<T>
 
     /**
-     * Subtracts the scalar [value] from each element of this tensor and returns a new resulting tensor.
+     * Subtracts the scalar [arg] from each element of this tensor and returns a new resulting tensor.
      *
-     * @param value the number to be subtracted from each element of this tensor.
-     * @return the difference between this tensor and [value].
+     * @param arg the number to be subtracted from each element of this tensor.
+     * @return the difference between this tensor and [arg].
      */
-    public operator fun Tensor<T>.minus(value: T): Tensor<T>
+    override operator fun StructureND<T>.minus(arg: T): Tensor<T>
 
     /**
      * Each element of the tensor [other] is subtracted from each element of this tensor.
@@ -93,7 +95,7 @@ public interface TensorAlgebra<T> : RingOps<Tensor<T>> {
      * @param other tensor to be subtracted.
      * @return the difference between this tensor and [other].
      */
-    override fun Tensor<T>.minus(other: Tensor<T>): Tensor<T>
+    override operator fun StructureND<T>.minus(other: StructureND<T>): Tensor<T>
 
     /**
      * Subtracts the scalar [value] from each element of this tensor.
@@ -107,25 +109,25 @@ public interface TensorAlgebra<T> : RingOps<Tensor<T>> {
      *
      * @param other tensor to be subtracted.
      */
-    public operator fun Tensor<T>.minusAssign(other: Tensor<T>)
+    public operator fun Tensor<T>.minusAssign(other: StructureND<T>)
 
 
     /**
-     * Each element of the tensor [other] is multiplied by this value.
+     * Each element of the tensor [arg] is multiplied by this value.
      * The resulting tensor is returned.
      *
-     * @param other tensor to be multiplied.
-     * @return the product of this value and tensor [other].
+     * @param arg tensor to be multiplied.
+     * @return the product of this value and tensor [arg].
      */
-    public operator fun T.times(other: Tensor<T>): Tensor<T>
+    override operator fun T.times(arg: StructureND<T>): Tensor<T>
 
     /**
-     * Multiplies the scalar [value] by each element of this tensor and returns a new resulting tensor.
+     * Multiplies the scalar [arg] by each element of this tensor and returns a new resulting tensor.
      *
-     * @param value the number to be multiplied by each element of this tensor.
-     * @return the product of this tensor and [value].
+     * @param arg the number to be multiplied by each element of this tensor.
+     * @return the product of this tensor and [arg].
      */
-    public operator fun Tensor<T>.times(value: T): Tensor<T>
+    override operator fun StructureND<T>.times(arg: T): Tensor<T>
 
     /**
      * Each element of the tensor [other] is multiplied by each element of this tensor.
@@ -134,7 +136,7 @@ public interface TensorAlgebra<T> : RingOps<Tensor<T>> {
      * @param other tensor to be multiplied.
      * @return the product of this tensor and [other].
      */
-    override fun Tensor<T>.times(other: Tensor<T>): Tensor<T>
+    override operator fun StructureND<T>.times(other: StructureND<T>): Tensor<T>
 
     /**
      * Multiplies the scalar [value] by each element of this tensor.
@@ -148,14 +150,14 @@ public interface TensorAlgebra<T> : RingOps<Tensor<T>> {
      *
      * @param other tensor to be multiplied.
      */
-    public operator fun Tensor<T>.timesAssign(other: Tensor<T>)
+    public operator fun Tensor<T>.timesAssign(other: StructureND<T>)
 
     /**
      * Numerical negative, element-wise.
      *
      * @return tensor negation of the original tensor.
      */
-    override fun Tensor<T>.unaryMinus(): Tensor<T>
+    override operator fun StructureND<T>.unaryMinus(): Tensor<T>
 
     /**
      * Returns the tensor at index i
@@ -324,7 +326,7 @@ public interface TensorAlgebra<T> : RingOps<Tensor<T>> {
      */
     public fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T>
 
-    override fun add(left: Tensor<T>, right: Tensor<T>): Tensor<T> = left + right
+    override fun add(left: StructureND<T>, right: StructureND<T>): Tensor<T> = left + right
 
-    override fun multiply(left: Tensor<T>, right: Tensor<T>): Tensor<T> = left * right
+    override fun multiply(left: StructureND<T>, right: StructureND<T>): Tensor<T> = left * right
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
index ce519288b..43c901ed5 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
@@ -5,30 +5,34 @@
 
 package space.kscience.kmath.tensors.api
 
+import space.kscience.kmath.nd.FieldOpsND
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.Field
+
 /**
  * Algebra over a field with partial division on [Tensor].
  * For more information: https://proofwiki.org/wiki/Definition:Division_Algebra
  *
  * @param T the type of items closed under division in the tensors.
  */
-public interface TensorPartialDivisionAlgebra<T> : TensorAlgebra<T> {
+public interface TensorPartialDivisionAlgebra<T, A : Field<T>> : TensorAlgebra<T, A>, FieldOpsND<T, A> {
 
     /**
-     * Each element of the tensor [other] is divided by this value.
+     * Each element of the tensor [arg] is divided by this value.
      * The resulting tensor is returned.
      *
-     * @param other tensor to divide by.
-     * @return the division of this value by the tensor [other].
+     * @param arg tensor to divide by.
+     * @return the division of this value by the tensor [arg].
      */
-    public operator fun T.div(other: Tensor<T>): Tensor<T>
+    override operator fun T.div(arg: StructureND<T>): Tensor<T>
 
     /**
-     * Divide by the scalar [value] each element of this tensor returns a new resulting tensor.
+     * Divide by the scalar [arg] each element of this tensor returns a new resulting tensor.
      *
-     * @param value the number to divide by each element of this tensor.
-     * @return the division of this tensor by the [value].
+     * @param arg the number to divide by each element of this tensor.
+     * @return the division of this tensor by the [arg].
      */
-    public operator fun Tensor<T>.div(value: T): Tensor<T>
+    override operator fun StructureND<T>.div(arg: T): Tensor<T>
 
     /**
      * Each element of the tensor [other] is divided by each element of this tensor.
@@ -37,7 +41,9 @@ public interface TensorPartialDivisionAlgebra<T> : TensorAlgebra<T> {
      * @param other tensor to be divided by.
      * @return the division of this tensor by [other].
      */
-    public operator fun Tensor<T>.div(other: Tensor<T>): Tensor<T>
+    override operator fun StructureND<T>.div(other: StructureND<T>): Tensor<T>
+
+    override fun divide(left: StructureND<T>, right: StructureND<T>): StructureND<T> = left.div(right)
 
     /**
      * Divides by the scalar [value] each element of this tensor.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index 3d73fd53b..f3c5d2540 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.internal.array
 import space.kscience.kmath.tensors.core.internal.broadcastTensors
@@ -18,66 +19,66 @@ import space.kscience.kmath.tensors.core.internal.tensor
  */
 public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
-    override fun Tensor<Double>.plus(other: Tensor<Double>): DoubleTensor {
+    override fun StructureND<Double>.plus(other: StructureND<Double>): DoubleTensor {
         val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.linearStructure.linearSize) { i ->
+        val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
             newThis.mutableBuffer.array()[i] + newOther.mutableBuffer.array()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.plusAssign(other: Tensor<Double>) {
+    override fun Tensor<Double>.plusAssign(other: StructureND<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
-        for (i in 0 until tensor.linearStructure.linearSize) {
+        for (i in 0 until tensor.indices.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
-    override fun Tensor<Double>.minus(other: Tensor<Double>): DoubleTensor {
+    override fun StructureND<Double>.minus(other: StructureND<Double>): DoubleTensor {
         val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.linearStructure.linearSize) { i ->
+        val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
             newThis.mutableBuffer.array()[i] - newOther.mutableBuffer.array()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.minusAssign(other: Tensor<Double>) {
+    override fun Tensor<Double>.minusAssign(other: StructureND<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
-        for (i in 0 until tensor.linearStructure.linearSize) {
+        for (i in 0 until tensor.indices.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
-    override fun Tensor<Double>.times(other: Tensor<Double>): DoubleTensor {
+    override fun StructureND<Double>.times(other: StructureND<Double>): DoubleTensor {
         val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.linearStructure.linearSize) { i ->
+        val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
             newThis.mutableBuffer.array()[newThis.bufferStart + i] *
                     newOther.mutableBuffer.array()[newOther.bufferStart + i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.timesAssign(other: Tensor<Double>) {
+    override fun Tensor<Double>.timesAssign(other: StructureND<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
-        for (i in 0 until tensor.linearStructure.linearSize) {
+        for (i in 0 until tensor.indices.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
-    override fun Tensor<Double>.div(other: Tensor<Double>): DoubleTensor {
+    override fun StructureND<Double>.div(other: StructureND<Double>): DoubleTensor {
         val broadcast = broadcastTensors(tensor, other.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.linearStructure.linearSize) { i ->
+        val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
             newThis.mutableBuffer.array()[newOther.bufferStart + i] /
                     newOther.mutableBuffer.array()[newOther.bufferStart + i]
         }
@@ -86,7 +87,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun Tensor<Double>.divAssign(other: Tensor<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
-        for (i in 0 until tensor.linearStructure.linearSize) {
+        for (i in 0 until tensor.indices.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] /=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index bf9a9f7f7..ba3331067 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -23,23 +23,23 @@ public open class BufferedTensor<T> internal constructor(
     /**
      * Buffer strides based on [TensorLinearStructure] implementation
      */
-    public val linearStructure: Strides
+    public val indices: Strides
         get() = TensorLinearStructure(shape)
 
     /**
      * Number of elements in tensor
      */
     public val numElements: Int
-        get() = linearStructure.linearSize
+        get() = indices.linearSize
 
-    override fun get(index: IntArray): T = mutableBuffer[bufferStart + linearStructure.offset(index)]
+    override fun get(index: IntArray): T = mutableBuffer[bufferStart + indices.offset(index)]
 
     override fun set(index: IntArray, value: T) {
-        mutableBuffer[bufferStart + linearStructure.offset(index)] = value
+        mutableBuffer[bufferStart + indices.offset(index)] = value
     }
 
     @PerformancePitfall
-    override fun elements(): Sequence<Pair<IntArray, T>> = linearStructure.indices().map {
+    override fun elements(): Sequence<Pair<IntArray, T>> = indices.indices().map {
         it to get(it)
     }
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 16ed4b834..472db8f5f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -6,8 +6,10 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.nd.MutableStructure2D
+import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.indices
 import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
 import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
@@ -20,16 +22,71 @@ import kotlin.math.*
  * Implementation of basic operations over double tensors and basic algebra operations on them.
  */
 public open class DoubleTensorAlgebra :
-    TensorPartialDivisionAlgebra<Double>,
-    AnalyticTensorAlgebra<Double>,
-    LinearOpsTensorAlgebra<Double>{
+    TensorPartialDivisionAlgebra<Double, DoubleField>,
+    AnalyticTensorAlgebra<Double, DoubleField>,
+    LinearOpsTensorAlgebra<Double, DoubleField> {
 
     public companion object : DoubleTensorAlgebra()
 
-    override fun Tensor<Double>.valueOrNull(): Double? = if (tensor.shape contentEquals intArrayOf(1))
+    override val elementAlgebra: DoubleField
+        get() = DoubleField
+
+
+    /**
+     * Applies the [transform] function to each element of the tensor and returns the resulting modified tensor.
+     *
+     * @param transform the function to be applied to each element of the tensor.
+     * @return the resulting tensor after applying the function.
+     */
+    @Suppress("OVERRIDE_BY_INLINE")
+    final override inline fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): DoubleTensor {
+        val tensor = this.tensor
+        //TODO remove additional copy
+        val sourceArray = tensor.copyArray()
+        val array = DoubleArray(tensor.numElements) { DoubleField.transform(sourceArray[it]) }
+        return DoubleTensor(
+            tensor.shape,
+            array,
+            tensor.bufferStart
+        )
+    }
+
+    @Suppress("OVERRIDE_BY_INLINE")
+    final override inline fun StructureND<Double>.mapIndexed(transform: DoubleField.(index: IntArray, Double) -> Double): DoubleTensor {
+        val tensor = this.tensor
+        //TODO remove additional copy
+        val sourceArray = tensor.copyArray()
+        val array = DoubleArray(tensor.numElements) { DoubleField.transform(tensor.indices.index(it), sourceArray[it]) }
+        return DoubleTensor(
+            tensor.shape,
+            array,
+            tensor.bufferStart
+        )
+    }
+
+    override fun zip(
+        left: StructureND<Double>,
+        right: StructureND<Double>,
+        transform: DoubleField.(Double, Double) -> Double
+    ): DoubleTensor {
+        require(left.shape.contentEquals(right.shape)){
+            "The shapes in zip are not equal: left - ${left.shape}, right - ${right.shape}"
+        }
+        val leftTensor = left.tensor
+        val leftArray = leftTensor.copyArray()
+        val rightTensor = right.tensor
+        val rightArray = rightTensor.copyArray()
+        val array = DoubleArray(leftTensor.numElements) { DoubleField.transform(leftArray[it], rightArray[it]) }
+        return DoubleTensor(
+            leftTensor.shape,
+            array
+        )
+    }
+
+    override fun StructureND<Double>.valueOrNull(): Double? = if (tensor.shape contentEquals intArrayOf(1))
         tensor.mutableBuffer.array()[tensor.bufferStart] else null
 
-    override fun Tensor<Double>.value(): Double = valueOrNull()
+    override fun StructureND<Double>.value(): Double = valueOrNull()
         ?: throw IllegalArgumentException("The tensor shape is $shape, but value method is allowed only for shape [1]")
 
     /**
@@ -53,11 +110,10 @@ public open class DoubleTensorAlgebra :
      * @param initializer mapping tensor indices to values.
      * @return tensor with the [shape] shape and data generated by the [initializer].
      */
-    public fun produce(shape: IntArray, initializer: (IntArray) -> Double): DoubleTensor =
-        fromArray(
-            shape,
-            TensorLinearStructure(shape).indices().map(initializer).toMutableList().toDoubleArray()
-        )
+    override fun structureND(shape: IntArray, initializer: DoubleField.(IntArray) -> Double): DoubleTensor = fromArray(
+        shape,
+        TensorLinearStructure(shape).indices().map { DoubleField.initializer(it) }.toMutableList().toDoubleArray()
+    )
 
     override operator fun Tensor<Double>.get(i: Int): DoubleTensor {
         val lastShape = tensor.shape.drop(1).toIntArray()
@@ -146,16 +202,16 @@ public open class DoubleTensorAlgebra :
         return DoubleTensor(tensor.shape, tensor.mutableBuffer.array().copyOf(), tensor.bufferStart)
     }
 
-    override fun Double.plus(other: Tensor<Double>): DoubleTensor {
+    override fun Double.plus(other: StructureND<Double>): DoubleTensor {
         val resBuffer = DoubleArray(other.tensor.numElements) { i ->
             other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i] + this
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.plus(value: Double): DoubleTensor = value + tensor
+    override fun StructureND<Double>.plus(value: Double): DoubleTensor = value + tensor
 
-    override fun Tensor<Double>.plus(other: Tensor<Double>): DoubleTensor {
+    override fun StructureND<Double>.plus(other: StructureND<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other.tensor)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
             tensor.mutableBuffer.array()[i] + other.tensor.mutableBuffer.array()[i]
@@ -169,7 +225,7 @@ public open class DoubleTensorAlgebra :
         }
     }
 
-    override fun Tensor<Double>.plusAssign(other: Tensor<Double>) {
+    override fun Tensor<Double>.plusAssign(other: StructureND<Double>) {
         checkShapesCompatible(tensor, other.tensor)
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
@@ -177,21 +233,21 @@ public open class DoubleTensorAlgebra :
         }
     }
 
-    override fun Double.minus(other: Tensor<Double>): DoubleTensor {
+    override fun Double.minus(other: StructureND<Double>): DoubleTensor {
         val resBuffer = DoubleArray(other.tensor.numElements) { i ->
             this - other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i]
         }
         return DoubleTensor(other.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.minus(value: Double): DoubleTensor {
+    override fun StructureND<Double>.minus(arg: Double): DoubleTensor {
         val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] - value
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] - arg
         }
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.minus(other: Tensor<Double>): DoubleTensor {
+    override fun StructureND<Double>.minus(other: StructureND<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
             tensor.mutableBuffer.array()[i] - other.tensor.mutableBuffer.array()[i]
@@ -205,7 +261,7 @@ public open class DoubleTensorAlgebra :
         }
     }
 
-    override fun Tensor<Double>.minusAssign(other: Tensor<Double>) {
+    override fun Tensor<Double>.minusAssign(other: StructureND<Double>) {
         checkShapesCompatible(tensor, other)
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
@@ -213,16 +269,16 @@ public open class DoubleTensorAlgebra :
         }
     }
 
-    override fun Double.times(other: Tensor<Double>): DoubleTensor {
-        val resBuffer = DoubleArray(other.tensor.numElements) { i ->
-            other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i] * this
+    override fun Double.times(arg: StructureND<Double>): DoubleTensor {
+        val resBuffer = DoubleArray(arg.tensor.numElements) { i ->
+            arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i] * this
         }
-        return DoubleTensor(other.shape, resBuffer)
+        return DoubleTensor(arg.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.times(value: Double): DoubleTensor = value * tensor
+    override fun StructureND<Double>.times(arg: Double): DoubleTensor = arg * tensor
 
-    override fun Tensor<Double>.times(other: Tensor<Double>): DoubleTensor {
+    override fun StructureND<Double>.times(other: StructureND<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
             tensor.mutableBuffer.array()[tensor.bufferStart + i] *
@@ -237,7 +293,7 @@ public open class DoubleTensorAlgebra :
         }
     }
 
-    override fun Tensor<Double>.timesAssign(other: Tensor<Double>) {
+    override fun Tensor<Double>.timesAssign(other: StructureND<Double>) {
         checkShapesCompatible(tensor, other)
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
@@ -245,21 +301,21 @@ public open class DoubleTensorAlgebra :
         }
     }
 
-    override fun Double.div(other: Tensor<Double>): DoubleTensor {
-        val resBuffer = DoubleArray(other.tensor.numElements) { i ->
-            this / other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i]
+    override fun Double.div(arg: StructureND<Double>): DoubleTensor {
+        val resBuffer = DoubleArray(arg.tensor.numElements) { i ->
+            this / arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i]
         }
-        return DoubleTensor(other.shape, resBuffer)
+        return DoubleTensor(arg.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.div(value: Double): DoubleTensor {
+    override fun StructureND<Double>.div(arg: Double): DoubleTensor {
         val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] / value
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] / arg
         }
         return DoubleTensor(shape, resBuffer)
     }
 
-    override fun Tensor<Double>.div(other: Tensor<Double>): DoubleTensor {
+    override fun StructureND<Double>.div(other: StructureND<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
             tensor.mutableBuffer.array()[other.tensor.bufferStart + i] /
@@ -282,7 +338,7 @@ public open class DoubleTensorAlgebra :
         }
     }
 
-    override fun Tensor<Double>.unaryMinus(): DoubleTensor {
+    override fun StructureND<Double>.unaryMinus(): DoubleTensor {
         val resBuffer = DoubleArray(tensor.numElements) { i ->
             tensor.mutableBuffer.array()[tensor.bufferStart + i].unaryMinus()
         }
@@ -302,11 +358,11 @@ public open class DoubleTensorAlgebra :
         val resTensor = DoubleTensor(resShape, resBuffer)
 
         for (offset in 0 until n) {
-            val oldMultiIndex = tensor.linearStructure.index(offset)
+            val oldMultiIndex = tensor.indices.index(offset)
             val newMultiIndex = oldMultiIndex.copyOf()
             newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
 
-            val linearIndex = resTensor.linearStructure.offset(newMultiIndex)
+            val linearIndex = resTensor.indices.offset(newMultiIndex)
             resTensor.mutableBuffer.array()[linearIndex] =
                 tensor.mutableBuffer.array()[tensor.bufferStart + offset]
         }
@@ -406,7 +462,7 @@ public open class DoubleTensorAlgebra :
         val resTensor = zeros(resShape)
 
         for (i in 0 until diagonalEntries.tensor.numElements) {
-            val multiIndex = diagonalEntries.tensor.linearStructure.index(i)
+            val multiIndex = diagonalEntries.tensor.indices.index(i)
 
             var offset1 = 0
             var offset2 = abs(realOffset)
@@ -425,18 +481,6 @@ public open class DoubleTensorAlgebra :
         return resTensor.tensor
     }
 
-    /**
-     * Applies the [transform] function to each element of the tensor and returns the resulting modified tensor.
-     *
-     * @param transform the function to be applied to each element of the tensor.
-     * @return the resulting tensor after applying the function.
-     */
-    public inline fun Tensor<Double>.map(transform: (Double) -> Double): DoubleTensor = DoubleTensor(
-        tensor.shape,
-        tensor.mutableBuffer.array().map { transform(it) }.toDoubleArray(),
-        tensor.bufferStart
-    )
-
     /**
      * Compares element-wise two tensors with a specified precision.
      *
@@ -526,7 +570,7 @@ public open class DoubleTensorAlgebra :
     public fun Tensor<Double>.rowsByIndices(indices: IntArray): DoubleTensor = stack(indices.map { this[it] })
 
     internal inline fun Tensor<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
-        foldFunction(tensor.toDoubleArray())
+        foldFunction(tensor.copyArray())
 
     internal inline fun Tensor<Double>.foldDim(
         foldFunction: (DoubleArray) -> Double,
@@ -541,7 +585,7 @@ public open class DoubleTensorAlgebra :
         }
         val resNumElements = resShape.reduce(Int::times)
         val resTensor = DoubleTensor(resShape, DoubleArray(resNumElements) { 0.0 }, 0)
-        for (index in resTensor.linearStructure.indices()) {
+        for (index in resTensor.indices.indices()) {
             val prefix = index.take(dim).toIntArray()
             val suffix = index.takeLast(dimension - dim - 1).toIntArray()
             resTensor[index] = foldFunction(DoubleArray(shape[dim]) { i ->
@@ -645,39 +689,39 @@ public open class DoubleTensorAlgebra :
         return resTensor
     }
 
-    override fun Tensor<Double>.exp(): DoubleTensor = tensor.map(::exp)
+    override fun Tensor<Double>.exp(): DoubleTensor = tensor.map { exp(it) }
 
-    override fun Tensor<Double>.ln(): DoubleTensor = tensor.map(::ln)
+    override fun Tensor<Double>.ln(): DoubleTensor = tensor.map { ln(it) }
 
-    override fun Tensor<Double>.sqrt(): DoubleTensor = tensor.map(::sqrt)
+    override fun Tensor<Double>.sqrt(): DoubleTensor = tensor.map { sqrt(it) }
 
-    override fun Tensor<Double>.cos(): DoubleTensor = tensor.map(::cos)
+    override fun Tensor<Double>.cos(): DoubleTensor = tensor.map { cos(it) }
 
-    override fun Tensor<Double>.acos(): DoubleTensor = tensor.map(::acos)
+    override fun Tensor<Double>.acos(): DoubleTensor = tensor.map { acos(it) }
 
-    override fun Tensor<Double>.cosh(): DoubleTensor = tensor.map(::cosh)
+    override fun Tensor<Double>.cosh(): DoubleTensor = tensor.map { cosh(it) }
 
-    override fun Tensor<Double>.acosh(): DoubleTensor = tensor.map(::acosh)
+    override fun Tensor<Double>.acosh(): DoubleTensor = tensor.map { acosh(it) }
 
-    override fun Tensor<Double>.sin(): DoubleTensor = tensor.map(::sin)
+    override fun Tensor<Double>.sin(): DoubleTensor = tensor.map { sin(it) }
 
-    override fun Tensor<Double>.asin(): DoubleTensor = tensor.map(::asin)
+    override fun Tensor<Double>.asin(): DoubleTensor = tensor.map { asin(it) }
 
-    override fun Tensor<Double>.sinh(): DoubleTensor = tensor.map(::sinh)
+    override fun Tensor<Double>.sinh(): DoubleTensor = tensor.map { sinh(it) }
 
-    override fun Tensor<Double>.asinh(): DoubleTensor = tensor.map(::asinh)
+    override fun Tensor<Double>.asinh(): DoubleTensor = tensor.map { asinh(it) }
 
-    override fun Tensor<Double>.tan(): DoubleTensor = tensor.map(::tan)
+    override fun Tensor<Double>.tan(): DoubleTensor = tensor.map { tan(it) }
 
-    override fun Tensor<Double>.atan(): DoubleTensor = tensor.map(::atan)
+    override fun Tensor<Double>.atan(): DoubleTensor = tensor.map { atan(it) }
 
-    override fun Tensor<Double>.tanh(): DoubleTensor = tensor.map(::tanh)
+    override fun Tensor<Double>.tanh(): DoubleTensor = tensor.map { tanh(it) }
 
-    override fun Tensor<Double>.atanh(): DoubleTensor = tensor.map(::atanh)
+    override fun Tensor<Double>.atanh(): DoubleTensor = tensor.map { atanh(it) }
 
-    override fun Tensor<Double>.ceil(): DoubleTensor = tensor.map(::ceil)
+    override fun Tensor<Double>.ceil(): DoubleTensor = tensor.map { ceil(it) }
 
-    override fun Tensor<Double>.floor(): DoubleTensor = tensor.map(::floor)
+    override fun Tensor<Double>.floor(): DoubleTensor = tensor.map { floor(it) }
 
     override fun Tensor<Double>.inv(): DoubleTensor = invLU(1e-9)
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
index 4b9c0c382..3787c0972 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
@@ -10,7 +10,7 @@ import kotlin.math.max
 
 internal fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: DoubleTensor, linearSize: Int) {
     for (linearIndex in 0 until linearSize) {
-        val totalMultiIndex = resTensor.linearStructure.index(linearIndex)
+        val totalMultiIndex = resTensor.indices.index(linearIndex)
         val curMultiIndex = tensor.shape.copyOf()
 
         val offset = totalMultiIndex.size - curMultiIndex.size
@@ -23,7 +23,7 @@ internal fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: DoubleTenso
             }
         }
 
-        val curLinearIndex = tensor.linearStructure.offset(curMultiIndex)
+        val curLinearIndex = tensor.indices.offset(curMultiIndex)
         resTensor.mutableBuffer.array()[linearIndex] =
             tensor.mutableBuffer.array()[tensor.bufferStart + curLinearIndex]
     }
@@ -112,7 +112,7 @@ internal fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTen
             val resTensor = DoubleTensor(totalShape + matrixShape, DoubleArray(n * matrixSize))
 
             for (linearIndex in 0 until n) {
-                val totalMultiIndex = outerTensor.linearStructure.index(linearIndex)
+                val totalMultiIndex = outerTensor.indices.index(linearIndex)
                 var curMultiIndex = tensor.shape.sliceArray(0..tensor.shape.size - 3).copyOf()
                 curMultiIndex = IntArray(totalMultiIndex.size - curMultiIndex.size) { 1 } + curMultiIndex
 
@@ -127,13 +127,13 @@ internal fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTen
                 }
 
                 for (i in 0 until matrixSize) {
-                    val curLinearIndex = newTensor.linearStructure.offset(
+                    val curLinearIndex = newTensor.indices.offset(
                         curMultiIndex +
-                                matrix.linearStructure.index(i)
+                                matrix.indices.index(i)
                     )
-                    val newLinearIndex = resTensor.linearStructure.offset(
+                    val newLinearIndex = resTensor.indices.offset(
                         totalMultiIndex +
-                                matrix.linearStructure.index(i)
+                                matrix.indices.index(i)
                     )
 
                     resTensor.mutableBuffer.array()[resTensor.bufferStart + newLinearIndex] =
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index e901415d1..3a3b30485 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors.core.internal
 
+import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
@@ -25,7 +26,7 @@ internal fun checkBufferShapeConsistency(shape: IntArray, buffer: DoubleArray) =
         "Inconsistent shape ${shape.toList()} for buffer of size ${buffer.size} provided"
     }
 
-internal fun <T> checkShapesCompatible(a: Tensor<T>, b: Tensor<T>) =
+internal fun <T> checkShapesCompatible(a: StructureND<T>, b: StructureND<T>) =
     check(a.shape contentEquals b.shape) {
         "Incompatible shapes ${a.shape.toList()} and ${b.shape.toList()} "
     }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index 1f5778d5e..4123ff923 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.nd.MutableBufferND
+import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.structures.asMutableBuffer
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.BufferedTensor
@@ -18,15 +19,15 @@ internal fun BufferedTensor<Int>.asTensor(): IntTensor =
 internal fun BufferedTensor<Double>.asTensor(): DoubleTensor =
     DoubleTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
 
-internal fun <T> Tensor<T>.copyToBufferedTensor(): BufferedTensor<T> =
+internal fun <T> StructureND<T>.copyToBufferedTensor(): BufferedTensor<T> =
     BufferedTensor(
         this.shape,
         TensorLinearStructure(this.shape).indices().map(this::get).toMutableList().asMutableBuffer(), 0
     )
 
-internal fun <T> Tensor<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
+internal fun <T> StructureND<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
     is BufferedTensor<T> -> this
-    is MutableBufferND<T> -> if (this.indexes == TensorLinearStructure(this.shape)) {
+    is MutableBufferND<T> -> if (this.indices == TensorLinearStructure(this.shape)) {
         BufferedTensor(this.shape, this.buffer, 0)
     } else {
         this.copyToBufferedTensor()
@@ -35,7 +36,7 @@ internal fun <T> Tensor<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
 }
 
 @PublishedApi
-internal val Tensor<Double>.tensor: DoubleTensor
+internal val StructureND<Double>.tensor: DoubleTensor
     get() = when (this) {
         is DoubleTensor -> this
         else -> this.toBufferedTensor().asTensor()
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index 8428dae5c..553ed6add 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -85,7 +85,7 @@ internal fun format(value: Double, digits: Int = 4): String = buildString {
 internal fun DoubleTensor.toPrettyString(): String = buildString {
     var offset = 0
     val shape = this@toPrettyString.shape
-    val linearStructure = this@toPrettyString.linearStructure
+    val linearStructure = this@toPrettyString.indices
     val vectorSize = shape.last()
     append("DoubleTensor(\n")
     var charOffset = 3
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
index 021ca539c..feade56de 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
@@ -19,18 +19,19 @@ public fun Tensor<Double>.toDoubleTensor(): DoubleTensor = this.tensor
 public fun Tensor<Int>.toIntTensor(): IntTensor = this.tensor
 
 /**
- * Returns [DoubleArray] of tensor elements
+ * Returns a copy-protected [DoubleArray] of tensor elements
  */
-public fun DoubleTensor.toDoubleArray(): DoubleArray {
+public fun DoubleTensor.copyArray(): DoubleArray {
+    //TODO use ArrayCopy
     return DoubleArray(numElements) { i ->
         mutableBuffer[bufferStart + i]
     }
 }
 
 /**
- * Returns [IntArray] of tensor elements
+ * Returns a copy-protected [IntArray] of tensor elements
  */
-public fun IntTensor.toIntArray(): IntArray {
+public fun IntTensor.copyArray(): IntArray {
     return IntArray(numElements) { i ->
         mutableBuffer[bufferStart + i]
     }
-- 
2.34.1


From 4635cd3fb3eaab8aac97936b50a08d463e7f91c6 Mon Sep 17 00:00:00 2001
From: darksnake <altavir@gmail.com>
Date: Tue, 26 Oct 2021 16:08:02 +0300
Subject: [PATCH 363/713] Refactor TensorAlgebra to take StructureND and
 inherit AlgebraND

---
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  | 123 +++++++++++-------
 .../api/TensorPartialDivisionAlgebra.kt       |   2 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |   2 +-
 3 files changed, 76 insertions(+), 51 deletions(-)

diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index ee9251dd1..e40ea3dbc 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -13,7 +13,10 @@ import org.nd4j.linalg.factory.Nd4j
 import org.nd4j.linalg.factory.ops.NDBase
 import org.nd4j.linalg.ops.transforms.Transforms
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.Field
 import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.api.TensorAlgebra
@@ -22,7 +25,24 @@ import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 /**
  * ND4J based [TensorAlgebra] implementation.
  */
-public sealed interface Nd4jTensorAlgebra<T : Number> : AnalyticTensorAlgebra<T> {
+public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTensorAlgebra<T, A> {
+
+    override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): Nd4jArrayStructure<T> {
+        val array =
+    }
+
+    override fun StructureND<T>.map(transform: A.(T) -> T): Nd4jArrayStructure<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<T>.mapIndexed(transform: A.(index: IntArray, T) -> T): Nd4jArrayStructure<T> {
+        TODO("Not yet implemented")
+    }
+
+    override fun zip(left: StructureND<T>, right: StructureND<T>, transform: A.(T, T) -> T): Nd4jArrayStructure<T> {
+        TODO("Not yet implemented")
+    }
+
     /**
      * Wraps [INDArray] to [Nd4jArrayStructure].
      */
@@ -33,105 +53,107 @@ public sealed interface Nd4jTensorAlgebra<T : Number> : AnalyticTensorAlgebra<T>
      */
     public val StructureND<T>.ndArray: INDArray
 
-    override fun T.plus(other: Tensor<T>): Tensor<T> = other.ndArray.add(this).wrap()
-    override fun Tensor<T>.plus(value: T): Tensor<T> = ndArray.add(value).wrap()
+    override fun T.plus(other: StructureND<T>): Nd4jArrayStructure<T> = other.ndArray.add(this).wrap()
+    override fun StructureND<T>.plus(value: T): Nd4jArrayStructure<T> = ndArray.add(value).wrap()
 
-    override fun Tensor<T>.plus(other: Tensor<T>): Tensor<T> = ndArray.add(other.ndArray).wrap()
+    override fun StructureND<T>.plus(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.add(other.ndArray).wrap()
 
     override fun Tensor<T>.plusAssign(value: T) {
         ndArray.addi(value)
     }
 
-    override fun Tensor<T>.plusAssign(other: Tensor<T>) {
+    override fun Tensor<T>.plusAssign(other: StructureND<T>) {
         ndArray.addi(other.ndArray)
     }
 
-    override fun T.minus(other: Tensor<T>): Tensor<T> = other.ndArray.rsub(this).wrap()
-    override fun Tensor<T>.minus(value: T): Tensor<T> = ndArray.sub(value).wrap()
-    override fun Tensor<T>.minus(other: Tensor<T>): Tensor<T> = ndArray.sub(other.ndArray).wrap()
+    override fun T.minus(other: StructureND<T>): Nd4jArrayStructure<T> = other.ndArray.rsub(this).wrap()
+    override fun StructureND<T>.minus(arg: T): Nd4jArrayStructure<T> = ndArray.sub(arg).wrap()
+    override fun StructureND<T>.minus(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.sub(other.ndArray).wrap()
 
     override fun Tensor<T>.minusAssign(value: T) {
         ndArray.rsubi(value)
     }
 
-    override fun Tensor<T>.minusAssign(other: Tensor<T>) {
+    override fun Tensor<T>.minusAssign(other: StructureND<T>) {
         ndArray.subi(other.ndArray)
     }
 
-    override fun T.times(other: Tensor<T>): Tensor<T> = other.ndArray.mul(this).wrap()
+    override fun T.times(arg: StructureND<T>): Nd4jArrayStructure<T> = arg.ndArray.mul(this).wrap()
 
-    override fun Tensor<T>.times(value: T): Tensor<T> =
-        ndArray.mul(value).wrap()
+    override fun StructureND<T>.times(arg: T): Nd4jArrayStructure<T> =
+        ndArray.mul(arg).wrap()
 
-    override fun Tensor<T>.times(other: Tensor<T>): Tensor<T> = ndArray.mul(other.ndArray).wrap()
+    override fun StructureND<T>.times(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.mul(other.ndArray).wrap()
 
     override fun Tensor<T>.timesAssign(value: T) {
         ndArray.muli(value)
     }
 
-    override fun Tensor<T>.timesAssign(other: Tensor<T>) {
+    override fun Tensor<T>.timesAssign(other: StructureND<T>) {
         ndArray.mmuli(other.ndArray)
     }
 
-    override fun Tensor<T>.unaryMinus(): Tensor<T> = ndArray.neg().wrap()
-    override fun Tensor<T>.get(i: Int): Tensor<T> = ndArray.slice(i.toLong()).wrap()
-    override fun Tensor<T>.transpose(i: Int, j: Int): Tensor<T> = ndArray.swapAxes(i, j).wrap()
-    override fun Tensor<T>.dot(other: Tensor<T>): Tensor<T> = ndArray.mmul(other.ndArray).wrap()
+    override fun StructureND<T>.unaryMinus(): Nd4jArrayStructure<T> = ndArray.neg().wrap()
+    override fun Tensor<T>.get(i: Int): Nd4jArrayStructure<T> = ndArray.slice(i.toLong()).wrap()
+    override fun Tensor<T>.transpose(i: Int, j: Int): Nd4jArrayStructure<T> = ndArray.swapAxes(i, j).wrap()
+    override fun Tensor<T>.dot(other: Tensor<T>): Nd4jArrayStructure<T> = ndArray.mmul(other.ndArray).wrap()
 
-    override fun Tensor<T>.min(dim: Int, keepDim: Boolean): Tensor<T> =
+    override fun Tensor<T>.min(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         ndArray.min(keepDim, dim).wrap()
 
-    override fun Tensor<T>.sum(dim: Int, keepDim: Boolean): Tensor<T> =
+    override fun Tensor<T>.sum(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         ndArray.sum(keepDim, dim).wrap()
 
-    override fun Tensor<T>.max(dim: Int, keepDim: Boolean): Tensor<T> =
+    override fun Tensor<T>.max(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         ndArray.max(keepDim, dim).wrap()
 
-    override fun Tensor<T>.view(shape: IntArray): Tensor<T> = ndArray.reshape(shape).wrap()
-    override fun Tensor<T>.viewAs(other: Tensor<T>): Tensor<T> = view(other.shape)
+    override fun Tensor<T>.view(shape: IntArray): Nd4jArrayStructure<T> = ndArray.reshape(shape).wrap()
+    override fun Tensor<T>.viewAs(other: Tensor<T>): Nd4jArrayStructure<T> = view(other.shape)
 
-    override fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T> =
+    override fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         ndBase.get().argmax(ndArray, keepDim, dim).wrap()
 
-    override fun Tensor<T>.mean(dim: Int, keepDim: Boolean): Tensor<T> = ndArray.mean(keepDim, dim).wrap()
+    override fun Tensor<T>.mean(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> = ndArray.mean(keepDim, dim).wrap()
 
-    override fun Tensor<T>.exp(): Tensor<T> = Transforms.exp(ndArray).wrap()
-    override fun Tensor<T>.ln(): Tensor<T> = Transforms.log(ndArray).wrap()
-    override fun Tensor<T>.sqrt(): Tensor<T> = Transforms.sqrt(ndArray).wrap()
-    override fun Tensor<T>.cos(): Tensor<T> = Transforms.cos(ndArray).wrap()
-    override fun Tensor<T>.acos(): Tensor<T> = Transforms.acos(ndArray).wrap()
-    override fun Tensor<T>.cosh(): Tensor<T> = Transforms.cosh(ndArray).wrap()
+    override fun Tensor<T>.exp(): Nd4jArrayStructure<T> = Transforms.exp(ndArray).wrap()
+    override fun Tensor<T>.ln(): Nd4jArrayStructure<T> = Transforms.log(ndArray).wrap()
+    override fun Tensor<T>.sqrt(): Nd4jArrayStructure<T> = Transforms.sqrt(ndArray).wrap()
+    override fun Tensor<T>.cos(): Nd4jArrayStructure<T> = Transforms.cos(ndArray).wrap()
+    override fun Tensor<T>.acos(): Nd4jArrayStructure<T> = Transforms.acos(ndArray).wrap()
+    override fun Tensor<T>.cosh(): Nd4jArrayStructure<T> = Transforms.cosh(ndArray).wrap()
 
-    override fun Tensor<T>.acosh(): Tensor<T> =
+    override fun Tensor<T>.acosh(): Nd4jArrayStructure<T> =
         Nd4j.getExecutioner().exec(ACosh(ndArray, ndArray.ulike())).wrap()
 
-    override fun Tensor<T>.sin(): Tensor<T> = Transforms.sin(ndArray).wrap()
-    override fun Tensor<T>.asin(): Tensor<T> = Transforms.asin(ndArray).wrap()
+    override fun Tensor<T>.sin(): Nd4jArrayStructure<T> = Transforms.sin(ndArray).wrap()
+    override fun Tensor<T>.asin(): Nd4jArrayStructure<T> = Transforms.asin(ndArray).wrap()
     override fun Tensor<T>.sinh(): Tensor<T> = Transforms.sinh(ndArray).wrap()
 
-    override fun Tensor<T>.asinh(): Tensor<T> =
+    override fun Tensor<T>.asinh(): Nd4jArrayStructure<T> =
         Nd4j.getExecutioner().exec(ASinh(ndArray, ndArray.ulike())).wrap()
 
-    override fun Tensor<T>.tan(): Tensor<T> = Transforms.tan(ndArray).wrap()
-    override fun Tensor<T>.atan(): Tensor<T> = Transforms.atan(ndArray).wrap()
-    override fun Tensor<T>.tanh(): Tensor<T> = Transforms.tanh(ndArray).wrap()
-    override fun Tensor<T>.atanh(): Tensor<T> = Transforms.atanh(ndArray).wrap()
-    override fun Tensor<T>.ceil(): Tensor<T> = Transforms.ceil(ndArray).wrap()
-    override fun Tensor<T>.floor(): Tensor<T> = Transforms.floor(ndArray).wrap()
-    override fun Tensor<T>.std(dim: Int, keepDim: Boolean): Tensor<T> = ndArray.std(true, keepDim, dim).wrap()
-    override fun T.div(other: Tensor<T>): Tensor<T> = other.ndArray.rdiv(this).wrap()
-    override fun Tensor<T>.div(value: T): Tensor<T> = ndArray.div(value).wrap()
-    override fun Tensor<T>.div(other: Tensor<T>): Tensor<T> = ndArray.div(other.ndArray).wrap()
+    override fun Tensor<T>.tan(): Nd4jArrayStructure<T> = Transforms.tan(ndArray).wrap()
+    override fun Tensor<T>.atan(): Nd4jArrayStructure<T> = Transforms.atan(ndArray).wrap()
+    override fun Tensor<T>.tanh(): Nd4jArrayStructure<T> = Transforms.tanh(ndArray).wrap()
+    override fun Tensor<T>.atanh(): Nd4jArrayStructure<T> = Transforms.atanh(ndArray).wrap()
+    override fun Tensor<T>.ceil(): Nd4jArrayStructure<T> = Transforms.ceil(ndArray).wrap()
+    override fun Tensor<T>.floor(): Nd4jArrayStructure<T> = Transforms.floor(ndArray).wrap()
+    override fun Tensor<T>.std(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
+        ndArray.std(true, keepDim, dim).wrap()
+
+    override fun T.div(arg: StructureND<T>): Nd4jArrayStructure<T> = arg.ndArray.rdiv(this).wrap()
+    override fun StructureND<T>.div(arg: T): Nd4jArrayStructure<T> = ndArray.div(arg).wrap()
+    override fun StructureND<T>.div(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.div(other.ndArray).wrap()
 
     override fun Tensor<T>.divAssign(value: T) {
         ndArray.divi(value)
     }
 
-    override fun Tensor<T>.divAssign(other: Tensor<T>) {
+    override fun Tensor<T>.divAssign(other: StructureND<T>) {
         ndArray.divi(other.ndArray)
     }
 
-    override fun Tensor<T>.variance(dim: Int, keepDim: Boolean): Tensor<T> =
+    override fun Tensor<T>.variance(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         Nd4j.getExecutioner().exec(Variance(ndArray, true, true, dim)).wrap()
 
     private companion object {
@@ -142,7 +164,10 @@ public sealed interface Nd4jTensorAlgebra<T : Number> : AnalyticTensorAlgebra<T>
 /**
  * [Double] specialization of [Nd4jTensorAlgebra].
  */
-public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double> {
+public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double, DoubleField> {
+
+    override val elementAlgebra: DoubleField get() = DoubleField
+
     override fun INDArray.wrap(): Nd4jArrayStructure<Double> = asDoubleStructure()
 
     @OptIn(PerformancePitfall::class)
@@ -154,7 +179,7 @@ public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double> {
             }
         }
 
-    override fun Tensor<Double>.valueOrNull(): Double? =
+    override fun StructureND<Double>.valueOrNull(): Double? =
         if (shape contentEquals intArrayOf(1)) ndArray.getDouble(0) else null
 
     // TODO rewrite
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
index 43c901ed5..dece54834 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
@@ -57,5 +57,5 @@ public interface TensorPartialDivisionAlgebra<T, A : Field<T>> : TensorAlgebra<T
      *
      * @param other tensor to be divided by.
      */
-    public operator fun Tensor<T>.divAssign(other: Tensor<T>)
+    public operator fun Tensor<T>.divAssign(other: StructureND<T>)
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 472db8f5f..3d343604b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -330,7 +330,7 @@ public open class DoubleTensorAlgebra :
         }
     }
 
-    override fun Tensor<Double>.divAssign(other: Tensor<Double>) {
+    override fun Tensor<Double>.divAssign(other: StructureND<Double>) {
         checkShapesCompatible(tensor, other)
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] /=
-- 
2.34.1


From 29a90efca5eaa3c7669cae8c6dd0f24a8f31058f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 27 Oct 2021 14:48:36 +0300
Subject: [PATCH 364/713] Tensor algebra generified

---
 CHANGELOG.md                                  |   1 +
 .../kmath/benchmarks/NDFieldBenchmark.kt      |   7 +-
 .../space/kscience/kmath/tensors/multik.kt    |   6 +-
 .../kscience/kmath/multik/MultikOpsND.kt      | 137 -------------
 .../kmath/multik/MultikTensorAlgebra.kt       | 187 ++++++++++++++----
 .../kscience/kmath/multik/MultikNDTest.kt     |   2 +-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  | 113 ++++++-----
 .../tensors/api/AnalyticTensorAlgebra.kt      |  47 ++---
 .../tensors/api/LinearOpsTensorAlgebra.kt     |  15 +-
 .../kmath/tensors/api/TensorAlgebra.kt        |  36 ++--
 .../core/BroadcastDoubleTensorAlgebra.kt      |   2 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 117 ++++++-----
 12 files changed, 323 insertions(+), 347 deletions(-)
 delete mode 100644 kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb267744e..6733c1211 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 - Buffer algebra does not require size anymore
 - Operations -> Ops
 - Default Buffer and ND algebras are now Ops and lack neutral elements (0, 1) as well as algebra-level shapes.
+- Tensor algebra takes read-only structures as input and inherits AlgebraND
 
 ### Deprecated
 - Specialized `DoubleBufferAlgebra`
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index 8f9a3e2b8..b5af5aa19 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -13,8 +13,7 @@ import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.ones
 import org.jetbrains.kotlinx.multik.ndarray.data.DN
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
-import space.kscience.kmath.multik.multikND
-import space.kscience.kmath.multik.multikTensorAlgebra
+import space.kscience.kmath.multik.multikAlgebra
 import space.kscience.kmath.nd.BufferedFieldOpsND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.ndAlgebra
@@ -79,7 +78,7 @@ internal class NDFieldBenchmark {
     }
 
     @Benchmark
-    fun multikInPlaceAdd(blackhole: Blackhole) = with(DoubleField.multikTensorAlgebra) {
+    fun multikInPlaceAdd(blackhole: Blackhole) = with(DoubleField.multikAlgebra) {
         val res = Multik.ones<Double, DN>(shape, DataType.DoubleDataType).wrap()
         repeat(n) { res += 1.0 }
         blackhole.consume(res)
@@ -100,7 +99,7 @@ internal class NDFieldBenchmark {
         private val specializedField = DoubleField.ndAlgebra
         private val genericField = BufferedFieldOpsND(DoubleField, Buffer.Companion::boxing)
         private val nd4jField = DoubleField.nd4j
-        private val multikField = DoubleField.multikND
+        private val multikField = DoubleField.multikAlgebra
         private val viktorField = DoubleField.viktorAlgebra
     }
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
index f0b776f75..fad68fa96 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
@@ -7,12 +7,12 @@ package space.kscience.kmath.tensors
 
 import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.ndarray
-import space.kscience.kmath.multik.multikND
+import space.kscience.kmath.multik.multikAlgebra
 import space.kscience.kmath.nd.one
 import space.kscience.kmath.operations.DoubleField
 
-fun main(): Unit = with(DoubleField.multikND) {
+fun main(): Unit = with(DoubleField.multikAlgebra) {
     val a = Multik.ndarray(intArrayOf(1, 2, 3)).asType<Double>().wrap()
     val b = Multik.ndarray(doubleArrayOf(1.0, 2.0, 3.0)).wrap()
-    one(a.shape) - a + b * 3
+    one(a.shape) - a + b * 3.0
 }
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt
deleted file mode 100644
index 4068ba9b9..000000000
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikOpsND.kt
+++ /dev/null
@@ -1,137 +0,0 @@
-package space.kscience.kmath.multik
-
-import org.jetbrains.kotlinx.multik.api.math.cos
-import org.jetbrains.kotlinx.multik.api.math.sin
-import org.jetbrains.kotlinx.multik.api.mk
-import org.jetbrains.kotlinx.multik.api.zeros
-import org.jetbrains.kotlinx.multik.ndarray.data.*
-import org.jetbrains.kotlinx.multik.ndarray.operations.*
-import space.kscience.kmath.nd.FieldOpsND
-import space.kscience.kmath.nd.RingOpsND
-import space.kscience.kmath.nd.Shape
-import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.operations.*
-
-/**
- * A ring algebra for Multik operations
- */
-public open class MultikRingOpsND<T, A : Ring<T>> internal constructor(
-    public val type: DataType,
-    override val elementAlgebra: A
-) : RingOpsND<T, A> {
-
-    public fun MutableMultiArray<T, *>.wrap(): MultikTensor<T> = MultikTensor(this.asDNArray())
-
-    override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): MultikTensor<T> {
-        val res = mk.zeros<T, DN>(shape, type).asDNArray()
-        for (index in res.multiIndices) {
-            res[index] = elementAlgebra.initializer(index)
-        }
-        return res.wrap()
-    }
-
-    public fun StructureND<T>.asMultik(): MultikTensor<T> = if (this is MultikTensor) {
-        this
-    } else {
-        structureND(shape) { get(it) }
-    }
-
-    override fun StructureND<T>.map(transform: A.(T) -> T): MultikTensor<T> {
-        //taken directly from Multik sources
-        val array = asMultik().array
-        val data = initMemoryView<T>(array.size, type)
-        var count = 0
-        for (el in array) data[count++] = elementAlgebra.transform(el)
-        return NDArray(data, shape = array.shape, dim = array.dim).wrap()
-    }
-
-    override fun StructureND<T>.mapIndexed(transform: A.(index: IntArray, T) -> T): MultikTensor<T> {
-        //taken directly from Multik sources
-        val array = asMultik().array
-        val data = initMemoryView<T>(array.size, type)
-        val indexIter = array.multiIndices.iterator()
-        var index = 0
-        for (item in array) {
-            if (indexIter.hasNext()) {
-                data[index++] = elementAlgebra.transform(indexIter.next(), item)
-            } else {
-                throw ArithmeticException("Index overflow has happened.")
-            }
-        }
-        return NDArray(data, shape = array.shape, dim = array.dim).wrap()
-    }
-
-    override fun zip(left: StructureND<T>, right: StructureND<T>, transform: A.(T, T) -> T): MultikTensor<T> {
-        require(left.shape.contentEquals(right.shape)) { "ND array shape mismatch" } //TODO replace by ShapeMismatchException
-        val leftArray = left.asMultik().array
-        val rightArray = right.asMultik().array
-        val data = initMemoryView<T>(leftArray.size, type)
-        var counter = 0
-        val leftIterator = leftArray.iterator()
-        val rightIterator = rightArray.iterator()
-        //iterating them together
-        while (leftIterator.hasNext()) {
-            data[counter++] = elementAlgebra.transform(leftIterator.next(), rightIterator.next())
-        }
-        return NDArray(data, shape = leftArray.shape, dim = leftArray.dim).wrap()
-    }
-
-    override fun StructureND<T>.unaryMinus(): MultikTensor<T> = asMultik().array.unaryMinus().wrap()
-
-    override fun add(left: StructureND<T>, right: StructureND<T>): MultikTensor<T> =
-        (left.asMultik().array + right.asMultik().array).wrap()
-
-    override fun StructureND<T>.plus(arg: T): MultikTensor<T> =
-        asMultik().array.plus(arg).wrap()
-
-    override fun StructureND<T>.minus(arg: T): MultikTensor<T> = asMultik().array.minus(arg).wrap()
-
-    override fun T.plus(arg: StructureND<T>): MultikTensor<T> = arg + this
-
-    override fun T.minus(arg: StructureND<T>): MultikTensor<T> = arg.map { this@minus - it }
-
-    override fun multiply(left: StructureND<T>, right: StructureND<T>): MultikTensor<T> =
-        left.asMultik().array.times(right.asMultik().array).wrap()
-
-    override fun StructureND<T>.times(arg: T): MultikTensor<T> =
-        asMultik().array.times(arg).wrap()
-
-    override fun T.times(arg: StructureND<T>): MultikTensor<T> = arg * this
-
-    override fun StructureND<T>.unaryPlus(): MultikTensor<T> = asMultik()
-
-    override fun StructureND<T>.plus(other: StructureND<T>): MultikTensor<T> =
-        asMultik().array.plus(other.asMultik().array).wrap()
-
-    override fun StructureND<T>.minus(other: StructureND<T>): MultikTensor<T> =
-        asMultik().array.minus(other.asMultik().array).wrap()
-
-    override fun StructureND<T>.times(other: StructureND<T>): MultikTensor<T> =
-        asMultik().array.times(other.asMultik().array).wrap()
-}
-
-/**
- * A field algebra for multik operations
- */
-public class MultikFieldOpsND<T, A : Field<T>> internal constructor(
-    type: DataType,
-    elementAlgebra: A
-) : MultikRingOpsND<T, A>(type, elementAlgebra), FieldOpsND<T, A> {
-    override fun StructureND<T>.div(other: StructureND<T>): StructureND<T> =
-        asMultik().array.div(other.asMultik().array).wrap()
-}
-
-public val DoubleField.multikND: MultikFieldOpsND<Double, DoubleField>
-    get() = MultikFieldOpsND(DataType.DoubleDataType, DoubleField)
-
-public val FloatField.multikND: MultikFieldOpsND<Float, FloatField>
-    get() = MultikFieldOpsND(DataType.FloatDataType, FloatField)
-
-public val ShortRing.multikND: MultikRingOpsND<Short, ShortRing>
-    get() = MultikRingOpsND(DataType.ShortDataType, ShortRing)
-
-public val IntRing.multikND: MultikRingOpsND<Int, IntRing>
-    get() = MultikRingOpsND(DataType.IntDataType, IntRing)
-
-public val LongRing.multikND: MultikRingOpsND<Long, LongRing>
-    get() = MultikRingOpsND(DataType.LongDataType, LongRing)
\ No newline at end of file
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index 3bbe8e672..ec0d4c6d9 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -15,12 +15,14 @@ import org.jetbrains.kotlinx.multik.api.zeros
 import org.jetbrains.kotlinx.multik.ndarray.data.*
 import org.jetbrains.kotlinx.multik.ndarray.operations.*
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.DefaultStrides
 import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.mapInPlace
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.api.TensorAlgebra
+import space.kscience.kmath.tensors.api.TensorPartialDivisionAlgebra
 
 @JvmInline
 public value class MultikTensor<T>(public val array: MutableMultiArray<T, DN>) : Tensor<T> {
@@ -50,29 +52,80 @@ private fun <T, D : Dimension> MultiArray<T, D>.asD2Array(): D2Array<T> {
     else throw ClassCastException("Cannot cast MultiArray to NDArray.")
 }
 
-public class MultikTensorAlgebra<T : Number, A: Ring<T>> internal constructor(
-    public val type: DataType,
-    override val elementAlgebra: A,
-    public val comparator: Comparator<T>
-) : TensorAlgebra<T, A> {
+public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A> where T : Number, T : Comparable<T> {
+
+    public abstract val type: DataType
+
+    override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): MultikTensor<T> {
+        val strides = DefaultStrides(shape)
+        val memoryView = initMemoryView<T>(strides.linearSize, type)
+        strides.indices().forEachIndexed { linearIndex, tensorIndex ->
+            memoryView[linearIndex] = elementAlgebra.initializer(tensorIndex)
+        }
+        return MultikTensor(NDArray(memoryView, shape = shape, dim = DN(shape.size)))
+    }
+
+    override fun StructureND<T>.map(transform: A.(T) -> T): MultikTensor<T> = if (this is MultikTensor) {
+        val data = initMemoryView<T>(array.size, type)
+        var count = 0
+        for (el in array) data[count++] = elementAlgebra.transform(el)
+        NDArray(data, shape = shape, dim = array.dim).wrap()
+    } else {
+        structureND(shape) { index ->
+            transform(get(index))
+        }
+    }
+
+    override fun StructureND<T>.mapIndexed(transform: A.(index: IntArray, T) -> T): MultikTensor<T> =
+        if (this is MultikTensor) {
+            val array = asMultik().array
+            val data = initMemoryView<T>(array.size, type)
+            val indexIter = array.multiIndices.iterator()
+            var index = 0
+            for (item in array) {
+                if (indexIter.hasNext()) {
+                    data[index++] = elementAlgebra.transform(indexIter.next(), item)
+                } else {
+                    throw ArithmeticException("Index overflow has happened.")
+                }
+            }
+            NDArray(data, shape = array.shape, dim = array.dim).wrap()
+        } else {
+            structureND(shape) { index ->
+                transform(index, get(index))
+            }
+        }
+
+    override fun zip(left: StructureND<T>, right: StructureND<T>, transform: A.(T, T) -> T): MultikTensor<T> {
+        require(left.shape.contentEquals(right.shape)) { "ND array shape mismatch" } //TODO replace by ShapeMismatchException
+        val leftArray = left.asMultik().array
+        val rightArray = right.asMultik().array
+        val data = initMemoryView<T>(leftArray.size, type)
+        var counter = 0
+        val leftIterator = leftArray.iterator()
+        val rightIterator = rightArray.iterator()
+        //iterating them together
+        while (leftIterator.hasNext()) {
+            data[counter++] = elementAlgebra.transform(leftIterator.next(), rightIterator.next())
+        }
+        return NDArray(data, shape = leftArray.shape, dim = leftArray.dim).wrap()
+    }
 
     /**
      * Convert a tensor to [MultikTensor] if necessary. If tensor is converted, changes on the resulting tensor
      * are not reflected back onto the source
      */
-    public fun StructureND<T>.asMultik(): MultikTensor<T> {
-        return if (this is MultikTensor) {
-            this
-        } else {
-            val res = mk.zeros<T, DN>(shape, type).asDNArray()
-            for (index in res.multiIndices) {
-                res[index] = this[index]
-            }
-            res.wrap()
+    public fun StructureND<T>.asMultik(): MultikTensor<T> = if (this is MultikTensor) {
+        this
+    } else {
+        val res = mk.zeros<T, DN>(shape, type).asDNArray()
+        for (index in res.multiIndices) {
+            res[index] = this[index]
         }
+        res.wrap()
     }
 
-    public fun MutableMultiArray<T, DN>.wrap(): MultikTensor<T> = MultikTensor(this)
+    public fun MutableMultiArray<T, *>.wrap(): MultikTensor<T> = MultikTensor(this.asDNArray())
 
     override fun StructureND<T>.valueOrNull(): T? = if (shape contentEquals intArrayOf(1)) {
         get(intArrayOf(0))
@@ -81,8 +134,8 @@ public class MultikTensorAlgebra<T : Number, A: Ring<T>> internal constructor(
     override fun T.plus(other: StructureND<T>): MultikTensor<T> =
         other.plus(this)
 
-    override fun StructureND<T>.plus(value: T): MultikTensor<T> =
-        asMultik().array.deepCopy().apply { plusAssign(value) }.wrap()
+    override fun StructureND<T>.plus(arg: T): MultikTensor<T> =
+        asMultik().array.deepCopy().apply { plusAssign(arg) }.wrap()
 
     override fun StructureND<T>.plus(other: StructureND<T>): MultikTensor<T> =
         asMultik().array.plus(other.asMultik().array).wrap()
@@ -155,11 +208,11 @@ public class MultikTensorAlgebra<T : Number, A: Ring<T>> internal constructor(
     override fun StructureND<T>.unaryMinus(): MultikTensor<T> =
         asMultik().array.unaryMinus().wrap()
 
-    override fun Tensor<T>.get(i: Int): MultikTensor<T> = asMultik().array.mutableView(i).wrap()
+    override fun StructureND<T>.get(i: Int): MultikTensor<T> = asMultik().array.mutableView(i).wrap()
 
-    override fun Tensor<T>.transpose(i: Int, j: Int): MultikTensor<T> = asMultik().array.transpose(i, j).wrap()
+    override fun StructureND<T>.transpose(i: Int, j: Int): MultikTensor<T> = asMultik().array.transpose(i, j).wrap()
 
-    override fun Tensor<T>.view(shape: IntArray): MultikTensor<T> {
+    override fun StructureND<T>.view(shape: IntArray): MultikTensor<T> {
         require(shape.all { it > 0 })
         require(shape.fold(1, Int::times) == this.shape.size) {
             "Cannot reshape array of size ${this.shape.size} into a new shape ${
@@ -178,9 +231,9 @@ public class MultikTensorAlgebra<T : Number, A: Ring<T>> internal constructor(
         }.wrap()
     }
 
-    override fun Tensor<T>.viewAs(other: Tensor<T>): MultikTensor<T> = view(other.shape)
+    override fun StructureND<T>.viewAs(other: StructureND<T>): MultikTensor<T> = view(other.shape)
 
-    override fun Tensor<T>.dot(other: Tensor<T>): MultikTensor<T> =
+    override fun StructureND<T>.dot(other: StructureND<T>): MultikTensor<T> =
         if (this.shape.size == 1 && other.shape.size == 1) {
             Multik.ndarrayOf(
                 asMultik().array.asD1Array() dot other.asMultik().array.asD1Array()
@@ -197,45 +250,95 @@ public class MultikTensorAlgebra<T : Number, A: Ring<T>> internal constructor(
         TODO("Diagonal embedding not implemented")
     }
 
-    override fun Tensor<T>.sum(): T = asMultik().array.reduceMultiIndexed { _: IntArray, acc: T, t: T ->
+    override fun StructureND<T>.sum(): T = asMultik().array.reduceMultiIndexed { _: IntArray, acc: T, t: T ->
         elementAlgebra.add(acc, t)
     }
 
-    override fun Tensor<T>.sum(dim: Int, keepDim: Boolean): MultikTensor<T> {
+    override fun StructureND<T>.sum(dim: Int, keepDim: Boolean): MultikTensor<T> {
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.min(): T =
-        asMultik().array.minWith(comparator) ?: error("No elements in tensor")
+    override fun StructureND<T>.min(): T? = asMultik().array.min()
 
-    override fun Tensor<T>.min(dim: Int, keepDim: Boolean): MultikTensor<T> {
+    override fun StructureND<T>.min(dim: Int, keepDim: Boolean): Tensor<T> {
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.max(): T =
-        asMultik().array.maxWith(comparator) ?: error("No elements in tensor")
+    override fun StructureND<T>.max(): T? = asMultik().array.max()
 
-
-    override fun Tensor<T>.max(dim: Int, keepDim: Boolean): MultikTensor<T> {
+    override fun StructureND<T>.max(dim: Int, keepDim: Boolean): Tensor<T> {
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): MultikTensor<T> {
+    override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T> {
         TODO("Not yet implemented")
     }
 }
 
-public val DoubleField.multikTensorAlgebra: MultikTensorAlgebra<Double, DoubleField>
-    get() = MultikTensorAlgebra(DataType.DoubleDataType, DoubleField) { o1, o2 -> o1.compareTo(o2) }
+public abstract class MultikDivisionTensorAlgebra<T, A : Field<T>>
+    : MultikTensorAlgebra<T, A>(), TensorPartialDivisionAlgebra<T, A> where T : Number, T : Comparable<T> {
 
-public val FloatField.multikTensorAlgebra: MultikTensorAlgebra<Float, FloatField>
-    get() = MultikTensorAlgebra(DataType.FloatDataType, FloatField) { o1, o2 -> o1.compareTo(o2) }
+    override fun T.div(arg: StructureND<T>): MultikTensor<T> = arg.map { elementAlgebra.divide(this@div, it) }
 
-public val ShortRing.multikTensorAlgebra: MultikTensorAlgebra<Short, ShortRing>
-    get() = MultikTensorAlgebra(DataType.ShortDataType, ShortRing) { o1, o2 -> o1.compareTo(o2) }
+    override fun StructureND<T>.div(arg: T): MultikTensor<T> =
+        asMultik().array.deepCopy().apply { divAssign(arg) }.wrap()
 
-public val IntRing.multikTensorAlgebra: MultikTensorAlgebra<Int, IntRing>
-    get() = MultikTensorAlgebra(DataType.IntDataType, IntRing) { o1, o2 -> o1.compareTo(o2) }
+    override fun StructureND<T>.div(other: StructureND<T>): MultikTensor<T> =
+        asMultik().array.div(other.asMultik().array).wrap()
 
-public val LongRing.multikTensorAlgebra: MultikTensorAlgebra<Long, LongRing>
-    get() = MultikTensorAlgebra(DataType.LongDataType, LongRing) { o1, o2 -> o1.compareTo(o2) }
\ No newline at end of file
+    override fun Tensor<T>.divAssign(value: T) {
+        if (this is MultikTensor) {
+            array.divAssign(value)
+        } else {
+            mapInPlace { _, t -> elementAlgebra.divide(t, value) }
+        }
+    }
+
+    override fun Tensor<T>.divAssign(other: StructureND<T>) {
+        if (this is MultikTensor) {
+            array.divAssign(other.asMultik().array)
+        } else {
+            mapInPlace { index, t -> elementAlgebra.divide(t, other[index]) }
+        }
+    }
+}
+
+public object MultikDoubleAlgebra : MultikDivisionTensorAlgebra<Double, DoubleField>() {
+    override val elementAlgebra: DoubleField get() = DoubleField
+    override val type: DataType get() = DataType.DoubleDataType
+}
+
+public val Double.Companion.multikAlgebra: MultikTensorAlgebra<Double, DoubleField> get() = MultikDoubleAlgebra
+public val DoubleField.multikAlgebra: MultikTensorAlgebra<Double, DoubleField> get() = MultikDoubleAlgebra
+
+public object MultikFloatAlgebra : MultikDivisionTensorAlgebra<Float, FloatField>() {
+    override val elementAlgebra: FloatField get() = FloatField
+    override val type: DataType get() = DataType.FloatDataType
+}
+
+public val Float.Companion.multikAlgebra: MultikTensorAlgebra<Float, FloatField> get() = MultikFloatAlgebra
+public val FloatField.multikAlgebra: MultikTensorAlgebra<Float, FloatField> get() = MultikFloatAlgebra
+
+public object MultikShortAlgebra : MultikTensorAlgebra<Short, ShortRing>() {
+    override val elementAlgebra: ShortRing get() = ShortRing
+    override val type: DataType get() = DataType.ShortDataType
+}
+
+public val Short.Companion.multikAlgebra: MultikTensorAlgebra<Short, ShortRing> get() = MultikShortAlgebra
+public val ShortRing.multikAlgebra: MultikTensorAlgebra<Short, ShortRing> get() = MultikShortAlgebra
+
+public object MultikIntAlgebra : MultikTensorAlgebra<Int, IntRing>() {
+    override val elementAlgebra: IntRing get() = IntRing
+    override val type: DataType get() = DataType.IntDataType
+}
+
+public val Int.Companion.multikAlgebra: MultikTensorAlgebra<Int, IntRing> get() = MultikIntAlgebra
+public val IntRing.multikAlgebra: MultikTensorAlgebra<Int, IntRing> get() = MultikIntAlgebra
+
+public object MultikLongAlgebra : MultikTensorAlgebra<Long, LongRing>() {
+    override val elementAlgebra: LongRing get() = LongRing
+    override val type: DataType get() = DataType.LongDataType
+}
+
+public val Long.Companion.multikAlgebra: MultikTensorAlgebra<Long, LongRing> get() = MultikLongAlgebra
+public val LongRing.multikAlgebra: MultikTensorAlgebra<Long, LongRing> get() = MultikLongAlgebra
\ No newline at end of file
diff --git a/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt b/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
index 9dd9854c7..66ba7db2d 100644
--- a/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
+++ b/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
@@ -7,7 +7,7 @@ import space.kscience.kmath.operations.invoke
 
 internal class MultikNDTest {
     @Test
-    fun basicAlgebra(): Unit = DoubleField.multikND{
+    fun basicAlgebra(): Unit = DoubleField.multikAlgebra{
         one(2,2) + 1.0
     }
 }
\ No newline at end of file
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index e40ea3dbc..3fb03c964 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -13,6 +13,7 @@ import org.nd4j.linalg.factory.Nd4j
 import org.nd4j.linalg.factory.ops.NDBase
 import org.nd4j.linalg.ops.transforms.Transforms
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.DefaultStrides
 import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.DoubleField
@@ -27,22 +28,6 @@ import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
  */
 public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTensorAlgebra<T, A> {
 
-    override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): Nd4jArrayStructure<T> {
-        val array =
-    }
-
-    override fun StructureND<T>.map(transform: A.(T) -> T): Nd4jArrayStructure<T> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<T>.mapIndexed(transform: A.(index: IntArray, T) -> T): Nd4jArrayStructure<T> {
-        TODO("Not yet implemented")
-    }
-
-    override fun zip(left: StructureND<T>, right: StructureND<T>, transform: A.(T, T) -> T): Nd4jArrayStructure<T> {
-        TODO("Not yet implemented")
-    }
-
     /**
      * Wraps [INDArray] to [Nd4jArrayStructure].
      */
@@ -53,8 +38,21 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
      */
     public val StructureND<T>.ndArray: INDArray
 
+    override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): Nd4jArrayStructure<T>
+
+    override fun StructureND<T>.map(transform: A.(T) -> T): Nd4jArrayStructure<T> =
+        structureND(shape) { index -> elementAlgebra.transform(get(index)) }
+
+    override fun StructureND<T>.mapIndexed(transform: A.(index: IntArray, T) -> T): Nd4jArrayStructure<T> =
+        structureND(shape) { index -> elementAlgebra.transform(index, get(index)) }
+
+    override fun zip(left: StructureND<T>, right: StructureND<T>, transform: A.(T, T) -> T): Nd4jArrayStructure<T> {
+        require(left.shape.contentEquals(right.shape))
+        return structureND(left.shape) { index -> elementAlgebra.transform(left[index], right[index]) }
+    }
+
     override fun T.plus(other: StructureND<T>): Nd4jArrayStructure<T> = other.ndArray.add(this).wrap()
-    override fun StructureND<T>.plus(value: T): Nd4jArrayStructure<T> = ndArray.add(value).wrap()
+    override fun StructureND<T>.plus(arg: T): Nd4jArrayStructure<T> = ndArray.add(arg).wrap()
 
     override fun StructureND<T>.plus(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.add(other.ndArray).wrap()
 
@@ -94,51 +92,52 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
     }
 
     override fun StructureND<T>.unaryMinus(): Nd4jArrayStructure<T> = ndArray.neg().wrap()
-    override fun Tensor<T>.get(i: Int): Nd4jArrayStructure<T> = ndArray.slice(i.toLong()).wrap()
-    override fun Tensor<T>.transpose(i: Int, j: Int): Nd4jArrayStructure<T> = ndArray.swapAxes(i, j).wrap()
-    override fun Tensor<T>.dot(other: Tensor<T>): Nd4jArrayStructure<T> = ndArray.mmul(other.ndArray).wrap()
+    override fun StructureND<T>.get(i: Int): Nd4jArrayStructure<T> = ndArray.slice(i.toLong()).wrap()
+    override fun StructureND<T>.transpose(i: Int, j: Int): Nd4jArrayStructure<T> = ndArray.swapAxes(i, j).wrap()
+    override fun StructureND<T>.dot(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.mmul(other.ndArray).wrap()
 
-    override fun Tensor<T>.min(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
+    override fun StructureND<T>.min(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         ndArray.min(keepDim, dim).wrap()
 
-    override fun Tensor<T>.sum(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
+    override fun StructureND<T>.sum(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         ndArray.sum(keepDim, dim).wrap()
 
-    override fun Tensor<T>.max(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
+    override fun StructureND<T>.max(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         ndArray.max(keepDim, dim).wrap()
 
-    override fun Tensor<T>.view(shape: IntArray): Nd4jArrayStructure<T> = ndArray.reshape(shape).wrap()
-    override fun Tensor<T>.viewAs(other: Tensor<T>): Nd4jArrayStructure<T> = view(other.shape)
+    override fun StructureND<T>.view(shape: IntArray): Nd4jArrayStructure<T> = ndArray.reshape(shape).wrap()
+    override fun StructureND<T>.viewAs(other: StructureND<T>): Nd4jArrayStructure<T> = view(other.shape)
 
-    override fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
+    override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         ndBase.get().argmax(ndArray, keepDim, dim).wrap()
 
-    override fun Tensor<T>.mean(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> = ndArray.mean(keepDim, dim).wrap()
+    override fun StructureND<T>.mean(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
+        ndArray.mean(keepDim, dim).wrap()
 
-    override fun Tensor<T>.exp(): Nd4jArrayStructure<T> = Transforms.exp(ndArray).wrap()
-    override fun Tensor<T>.ln(): Nd4jArrayStructure<T> = Transforms.log(ndArray).wrap()
-    override fun Tensor<T>.sqrt(): Nd4jArrayStructure<T> = Transforms.sqrt(ndArray).wrap()
-    override fun Tensor<T>.cos(): Nd4jArrayStructure<T> = Transforms.cos(ndArray).wrap()
-    override fun Tensor<T>.acos(): Nd4jArrayStructure<T> = Transforms.acos(ndArray).wrap()
-    override fun Tensor<T>.cosh(): Nd4jArrayStructure<T> = Transforms.cosh(ndArray).wrap()
+    override fun StructureND<T>.exp(): Nd4jArrayStructure<T> = Transforms.exp(ndArray).wrap()
+    override fun StructureND<T>.ln(): Nd4jArrayStructure<T> = Transforms.log(ndArray).wrap()
+    override fun StructureND<T>.sqrt(): Nd4jArrayStructure<T> = Transforms.sqrt(ndArray).wrap()
+    override fun StructureND<T>.cos(): Nd4jArrayStructure<T> = Transforms.cos(ndArray).wrap()
+    override fun StructureND<T>.acos(): Nd4jArrayStructure<T> = Transforms.acos(ndArray).wrap()
+    override fun StructureND<T>.cosh(): Nd4jArrayStructure<T> = Transforms.cosh(ndArray).wrap()
 
-    override fun Tensor<T>.acosh(): Nd4jArrayStructure<T> =
+    override fun StructureND<T>.acosh(): Nd4jArrayStructure<T> =
         Nd4j.getExecutioner().exec(ACosh(ndArray, ndArray.ulike())).wrap()
 
-    override fun Tensor<T>.sin(): Nd4jArrayStructure<T> = Transforms.sin(ndArray).wrap()
-    override fun Tensor<T>.asin(): Nd4jArrayStructure<T> = Transforms.asin(ndArray).wrap()
-    override fun Tensor<T>.sinh(): Tensor<T> = Transforms.sinh(ndArray).wrap()
+    override fun StructureND<T>.sin(): Nd4jArrayStructure<T> = Transforms.sin(ndArray).wrap()
+    override fun StructureND<T>.asin(): Nd4jArrayStructure<T> = Transforms.asin(ndArray).wrap()
+    override fun StructureND<T>.sinh(): Tensor<T> = Transforms.sinh(ndArray).wrap()
 
-    override fun Tensor<T>.asinh(): Nd4jArrayStructure<T> =
+    override fun StructureND<T>.asinh(): Nd4jArrayStructure<T> =
         Nd4j.getExecutioner().exec(ASinh(ndArray, ndArray.ulike())).wrap()
 
-    override fun Tensor<T>.tan(): Nd4jArrayStructure<T> = Transforms.tan(ndArray).wrap()
-    override fun Tensor<T>.atan(): Nd4jArrayStructure<T> = Transforms.atan(ndArray).wrap()
-    override fun Tensor<T>.tanh(): Nd4jArrayStructure<T> = Transforms.tanh(ndArray).wrap()
-    override fun Tensor<T>.atanh(): Nd4jArrayStructure<T> = Transforms.atanh(ndArray).wrap()
-    override fun Tensor<T>.ceil(): Nd4jArrayStructure<T> = Transforms.ceil(ndArray).wrap()
-    override fun Tensor<T>.floor(): Nd4jArrayStructure<T> = Transforms.floor(ndArray).wrap()
-    override fun Tensor<T>.std(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
+    override fun StructureND<T>.tan(): Nd4jArrayStructure<T> = Transforms.tan(ndArray).wrap()
+    override fun StructureND<T>.atan(): Nd4jArrayStructure<T> = Transforms.atan(ndArray).wrap()
+    override fun StructureND<T>.tanh(): Nd4jArrayStructure<T> = Transforms.tanh(ndArray).wrap()
+    override fun StructureND<T>.atanh(): Nd4jArrayStructure<T> = Transforms.atanh(ndArray).wrap()
+    override fun StructureND<T>.ceil(): Nd4jArrayStructure<T> = Transforms.ceil(ndArray).wrap()
+    override fun StructureND<T>.floor(): Nd4jArrayStructure<T> = Transforms.floor(ndArray).wrap()
+    override fun StructureND<T>.std(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         ndArray.std(true, keepDim, dim).wrap()
 
     override fun T.div(arg: StructureND<T>): Nd4jArrayStructure<T> = arg.ndArray.rdiv(this).wrap()
@@ -153,7 +152,7 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
         ndArray.divi(other.ndArray)
     }
 
-    override fun Tensor<T>.variance(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
+    override fun StructureND<T>.variance(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         Nd4j.getExecutioner().exec(Variance(ndArray, true, true, dim)).wrap()
 
     private companion object {
@@ -170,6 +169,16 @@ public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double, DoubleField> {
 
     override fun INDArray.wrap(): Nd4jArrayStructure<Double> = asDoubleStructure()
 
+    override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): Nd4jArrayStructure<Double> {
+        val array: INDArray = Nd4j.zeros(*shape)
+        val indices = DefaultStrides(shape)
+        indices.indices().forEach { index ->
+            array.putScalar(index, elementAlgebra.initializer(index))
+        }
+        return array.wrap()
+    }
+
+
     @OptIn(PerformancePitfall::class)
     override val StructureND<Double>.ndArray: INDArray
         get() = when (this) {
@@ -190,10 +199,10 @@ public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double, DoubleField> {
         dim2: Int,
     ): Tensor<Double> = DoubleTensorAlgebra.diagonalEmbedding(diagonalEntries, offset, dim1, dim2)
 
-    override fun Tensor<Double>.sum(): Double = ndArray.sumNumber().toDouble()
-    override fun Tensor<Double>.min(): Double = ndArray.minNumber().toDouble()
-    override fun Tensor<Double>.max(): Double = ndArray.maxNumber().toDouble()
-    override fun Tensor<Double>.mean(): Double = ndArray.meanNumber().toDouble()
-    override fun Tensor<Double>.std(): Double = ndArray.stdNumber().toDouble()
-    override fun Tensor<Double>.variance(): Double = ndArray.varNumber().toDouble()
+    override fun StructureND<Double>.sum(): Double = ndArray.sumNumber().toDouble()
+    override fun StructureND<Double>.min(): Double = ndArray.minNumber().toDouble()
+    override fun StructureND<Double>.max(): Double = ndArray.maxNumber().toDouble()
+    override fun StructureND<Double>.mean(): Double = ndArray.meanNumber().toDouble()
+    override fun StructureND<Double>.std(): Double = ndArray.stdNumber().toDouble()
+    override fun StructureND<Double>.variance(): Double = ndArray.varNumber().toDouble()
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index caafcc7c1..debfb3ef0 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors.api
 
+import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.Field
 
 
@@ -18,7 +19,7 @@ public interface AnalyticTensorAlgebra<T, A : Field<T>> : TensorPartialDivisionA
     /**
      * @return the mean of all elements in the input tensor.
      */
-    public fun Tensor<T>.mean(): T
+    public fun StructureND<T>.mean(): T
 
     /**
      * Returns the mean of each row of the input tensor in the given dimension [dim].
@@ -31,12 +32,12 @@ public interface AnalyticTensorAlgebra<T, A : Field<T>> : TensorPartialDivisionA
      * @param keepDim whether the output tensor has [dim] retained or not.
      * @return the mean of each row of the input tensor in the given dimension [dim].
      */
-    public fun Tensor<T>.mean(dim: Int, keepDim: Boolean): Tensor<T>
+    public fun StructureND<T>.mean(dim: Int, keepDim: Boolean): Tensor<T>
 
     /**
      * @return the standard deviation of all elements in the input tensor.
      */
-    public fun Tensor<T>.std(): T
+    public fun StructureND<T>.std(): T
 
     /**
      * Returns the standard deviation of each row of the input tensor in the given dimension [dim].
@@ -49,12 +50,12 @@ public interface AnalyticTensorAlgebra<T, A : Field<T>> : TensorPartialDivisionA
      * @param keepDim whether the output tensor has [dim] retained or not.
      * @return the standard deviation of each row of the input tensor in the given dimension [dim].
      */
-    public fun Tensor<T>.std(dim: Int, keepDim: Boolean): Tensor<T>
+    public fun StructureND<T>.std(dim: Int, keepDim: Boolean): Tensor<T>
 
     /**
      * @return the variance of all elements in the input tensor.
      */
-    public fun Tensor<T>.variance(): T
+    public fun StructureND<T>.variance(): T
 
     /**
      * Returns the variance of each row of the input tensor in the given dimension [dim].
@@ -67,57 +68,57 @@ public interface AnalyticTensorAlgebra<T, A : Field<T>> : TensorPartialDivisionA
      * @param keepDim whether the output tensor has [dim] retained or not.
      * @return the variance of each row of the input tensor in the given dimension [dim].
      */
-    public fun Tensor<T>.variance(dim: Int, keepDim: Boolean): Tensor<T>
+    public fun StructureND<T>.variance(dim: Int, keepDim: Boolean): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.exp.html
-    public fun Tensor<T>.exp(): Tensor<T>
+    public fun StructureND<T>.exp(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.log.html
-    public fun Tensor<T>.ln(): Tensor<T>
+    public fun StructureND<T>.ln(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.sqrt.html
-    public fun Tensor<T>.sqrt(): Tensor<T>
+    public fun StructureND<T>.sqrt(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.acos.html#torch.cos
-    public fun Tensor<T>.cos(): Tensor<T>
+    public fun StructureND<T>.cos(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.acos.html#torch.acos
-    public fun Tensor<T>.acos(): Tensor<T>
+    public fun StructureND<T>.acos(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.cosh
-    public fun Tensor<T>.cosh(): Tensor<T>
+    public fun StructureND<T>.cosh(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.acosh
-    public fun Tensor<T>.acosh(): Tensor<T>
+    public fun StructureND<T>.acosh(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sin
-    public fun Tensor<T>.sin(): Tensor<T>
+    public fun StructureND<T>.sin(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asin
-    public fun Tensor<T>.asin(): Tensor<T>
+    public fun StructureND<T>.asin(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sinh
-    public fun Tensor<T>.sinh(): Tensor<T>
+    public fun StructureND<T>.sinh(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asinh
-    public fun Tensor<T>.asinh(): Tensor<T>
+    public fun StructureND<T>.asinh(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.atan.html#torch.tan
-    public fun Tensor<T>.tan(): Tensor<T>
+    public fun StructureND<T>.tan(): Tensor<T>
 
     //https://pytorch.org/docs/stable/generated/torch.atan.html#torch.atan
-    public fun Tensor<T>.atan(): Tensor<T>
+    public fun StructureND<T>.atan(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.tanh
-    public fun Tensor<T>.tanh(): Tensor<T>
+    public fun StructureND<T>.tanh(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.atanh
-    public fun Tensor<T>.atanh(): Tensor<T>
+    public fun StructureND<T>.atanh(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.ceil.html#torch.ceil
-    public fun Tensor<T>.ceil(): Tensor<T>
+    public fun StructureND<T>.ceil(): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.floor.html#torch.floor
-    public fun Tensor<T>.floor(): Tensor<T>
+    public fun StructureND<T>.floor(): Tensor<T>
 
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index 3f32eb9ca..e8fa7dacd 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors.api
 
+import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.Field
 
 /**
@@ -20,7 +21,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      *
      * @return the determinant.
      */
-    public fun Tensor<T>.det(): Tensor<T>
+    public fun StructureND<T>.det(): Tensor<T>
 
     /**
      * Computes the multiplicative inverse matrix of a square matrix input, or of each square matrix in a batched input.
@@ -30,7 +31,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      *
      * @return the multiplicative inverse of a matrix.
      */
-    public fun Tensor<T>.inv(): Tensor<T>
+    public fun StructureND<T>.inv(): Tensor<T>
 
     /**
      * Cholesky decomposition.
@@ -46,7 +47,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return the batch of `L` matrices.
      */
-    public fun Tensor<T>.cholesky(): Tensor<T>
+    public fun StructureND<T>.cholesky(): Tensor<T>
 
     /**
      * QR decomposition.
@@ -60,7 +61,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return pair of `Q` and `R` tensors.
      */
-    public fun Tensor<T>.qr(): Pair<Tensor<T>, Tensor<T>>
+    public fun StructureND<T>.qr(): Pair<Tensor<T>, Tensor<T>>
 
     /**
      * LUP decomposition
@@ -74,7 +75,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return triple of P, L and U tensors
      */
-    public fun Tensor<T>.lu(): Triple<Tensor<T>, Tensor<T>, Tensor<T>>
+    public fun StructureND<T>.lu(): Triple<Tensor<T>, Tensor<T>, Tensor<T>>
 
     /**
      * Singular Value Decomposition.
@@ -90,7 +91,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return triple `Triple(U, S, V)`.
      */
-    public fun Tensor<T>.svd(): Triple<Tensor<T>, Tensor<T>, Tensor<T>>
+    public fun StructureND<T>.svd(): Triple<Tensor<T>, Tensor<T>, Tensor<T>>
 
     /**
      * Returns eigenvalues and eigenvectors of a real symmetric matrix `input` or a batch of real symmetric matrices,
@@ -100,6 +101,6 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return a pair `eigenvalues to eigenvectors`
      */
-    public fun Tensor<T>.symEig(): Pair<Tensor<T>, Tensor<T>>
+    public fun StructureND<T>.symEig(): Pair<Tensor<T>, Tensor<T>>
 
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index e910c5c31..28d7c4677 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -41,12 +41,12 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
     override operator fun T.plus(other: StructureND<T>): Tensor<T>
 
     /**
-     * Adds the scalar [value] to each element of this tensor and returns a new resulting tensor.
+     * Adds the scalar [arg] to each element of this tensor and returns a new resulting tensor.
      *
-     * @param value the number to be added to each element of this tensor.
-     * @return the sum of this tensor and [value].
+     * @param arg the number to be added to each element of this tensor.
+     * @return the sum of this tensor and [arg].
      */
-    override operator fun StructureND<T>.plus(value: T): Tensor<T>
+    override operator fun StructureND<T>.plus(arg: T): Tensor<T>
 
     /**
      * Each element of the tensor [other] is added to each element of this tensor.
@@ -166,7 +166,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param i index of the extractable tensor
      * @return subtensor of the original tensor with index [i]
      */
-    public operator fun Tensor<T>.get(i: Int): Tensor<T>
+    public operator fun StructureND<T>.get(i: Int): Tensor<T>
 
     /**
      * Returns a tensor that is a transposed version of this tensor. The given dimensions [i] and [j] are swapped.
@@ -176,7 +176,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param j the second dimension to be transposed
      * @return transposed tensor
      */
-    public fun Tensor<T>.transpose(i: Int = -2, j: Int = -1): Tensor<T>
+    public fun StructureND<T>.transpose(i: Int = -2, j: Int = -1): Tensor<T>
 
     /**
      * Returns a new tensor with the same data as the self tensor but of a different shape.
@@ -186,7 +186,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param shape the desired size
      * @return tensor with new shape
      */
-    public fun Tensor<T>.view(shape: IntArray): Tensor<T>
+    public fun StructureND<T>.view(shape: IntArray): Tensor<T>
 
     /**
      * View this tensor as the same size as [other].
@@ -196,7 +196,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param other the result tensor has the same size as other.
      * @return the result tensor with the same size as other.
      */
-    public fun Tensor<T>.viewAs(other: Tensor<T>): Tensor<T>
+    public fun StructureND<T>.viewAs(other: StructureND<T>): Tensor<T>
 
     /**
      * Matrix product of two tensors.
@@ -227,7 +227,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param other tensor to be multiplied.
      * @return a mathematical product of two tensors.
      */
-    public infix fun Tensor<T>.dot(other: Tensor<T>): Tensor<T>
+    public infix fun StructureND<T>.dot(other: StructureND<T>): Tensor<T>
 
     /**
      * Creates a tensor whose diagonals of certain 2D planes (specified by [dim1] and [dim2])
@@ -262,7 +262,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
     /**
      * @return the sum of all elements in the input tensor.
      */
-    public fun Tensor<T>.sum(): T
+    public fun StructureND<T>.sum(): T
 
     /**
      * Returns the sum of each row of the input tensor in the given dimension [dim].
@@ -275,12 +275,12 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param keepDim whether the output tensor has [dim] retained or not.
      * @return the sum of each row of the input tensor in the given dimension [dim].
      */
-    public fun Tensor<T>.sum(dim: Int, keepDim: Boolean): Tensor<T>
+    public fun StructureND<T>.sum(dim: Int, keepDim: Boolean): Tensor<T>
 
     /**
-     * @return the minimum value of all elements in the input tensor.
+     * @return the minimum value of all elements in the input tensor or null if there are no values
      */
-    public fun Tensor<T>.min(): T
+    public fun StructureND<T>.min(): T?
 
     /**
      * Returns the minimum value of each row of the input tensor in the given dimension [dim].
@@ -293,12 +293,12 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param keepDim whether the output tensor has [dim] retained or not.
      * @return the minimum value of each row of the input tensor in the given dimension [dim].
      */
-    public fun Tensor<T>.min(dim: Int, keepDim: Boolean): Tensor<T>
+    public fun StructureND<T>.min(dim: Int, keepDim: Boolean): Tensor<T>
 
     /**
-     * Returns the maximum value of all elements in the input tensor.
+     * Returns the maximum value of all elements in the input tensor or null if there are no values
      */
-    public fun Tensor<T>.max(): T
+    public fun StructureND<T>.max(): T?
 
     /**
      * Returns the maximum value of each row of the input tensor in the given dimension [dim].
@@ -311,7 +311,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param keepDim whether the output tensor has [dim] retained or not.
      * @return the maximum value of each row of the input tensor in the given dimension [dim].
      */
-    public fun Tensor<T>.max(dim: Int, keepDim: Boolean): Tensor<T>
+    public fun StructureND<T>.max(dim: Int, keepDim: Boolean): Tensor<T>
 
     /**
      * Returns the index of maximum value of each row of the input tensor in the given dimension [dim].
@@ -324,7 +324,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param keepDim whether the output tensor has [dim] retained or not.
      * @return the index of maximum value of each row of the input tensor in the given dimension [dim].
      */
-    public fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T>
+    public fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T>
 
     override fun add(left: StructureND<T>, right: StructureND<T>): Tensor<T> = left + right
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index f3c5d2540..f53a0ca55 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -85,7 +85,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.divAssign(other: Tensor<Double>) {
+    override fun Tensor<Double>.divAssign(other: StructureND<Double>) {
         val newOther = broadcastTo(other.tensor, tensor.shape)
         for (i in 0 until tensor.indices.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] /=
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 3d343604b..be87f8019 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -115,7 +115,7 @@ public open class DoubleTensorAlgebra :
         TensorLinearStructure(shape).indices().map { DoubleField.initializer(it) }.toMutableList().toDoubleArray()
     )
 
-    override operator fun Tensor<Double>.get(i: Int): DoubleTensor {
+    override operator fun StructureND<Double>.get(i: Int): DoubleTensor {
         val lastShape = tensor.shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
         val newStart = newShape.reduce(Int::times) * i + tensor.bufferStart
@@ -160,7 +160,7 @@ public open class DoubleTensorAlgebra :
      *
      * @return tensor filled with the scalar value `0.0`, with the same shape as `input` tensor.
      */
-    public fun Tensor<Double>.zeroesLike(): DoubleTensor = tensor.fullLike(0.0)
+    public fun StructureND<Double>.zeroesLike(): DoubleTensor = tensor.fullLike(0.0)
 
     /**
      * Returns a tensor filled with the scalar value `1.0`, with the shape defined by the variable argument [shape].
@@ -198,9 +198,8 @@ public open class DoubleTensorAlgebra :
      *
      * @return a copy of the `input` tensor with a copied buffer.
      */
-    public fun Tensor<Double>.copy(): DoubleTensor {
-        return DoubleTensor(tensor.shape, tensor.mutableBuffer.array().copyOf(), tensor.bufferStart)
-    }
+    public fun StructureND<Double>.copy(): DoubleTensor =
+        DoubleTensor(tensor.shape, tensor.mutableBuffer.array().copyOf(), tensor.bufferStart)
 
     override fun Double.plus(other: StructureND<Double>): DoubleTensor {
         val resBuffer = DoubleArray(other.tensor.numElements) { i ->
@@ -209,7 +208,7 @@ public open class DoubleTensorAlgebra :
         return DoubleTensor(other.shape, resBuffer)
     }
 
-    override fun StructureND<Double>.plus(value: Double): DoubleTensor = value + tensor
+    override fun StructureND<Double>.plus(arg: Double): DoubleTensor = arg + tensor
 
     override fun StructureND<Double>.plus(other: StructureND<Double>): DoubleTensor {
         checkShapesCompatible(tensor, other.tensor)
@@ -345,7 +344,7 @@ public open class DoubleTensorAlgebra :
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.transpose(i: Int, j: Int): DoubleTensor {
+    override fun StructureND<Double>.transpose(i: Int, j: Int): DoubleTensor {
         val ii = tensor.minusIndex(i)
         val jj = tensor.minusIndex(j)
         checkTranspose(tensor.dimension, ii, jj)
@@ -369,15 +368,15 @@ public open class DoubleTensorAlgebra :
         return resTensor
     }
 
-    override fun Tensor<Double>.view(shape: IntArray): DoubleTensor {
+    override fun StructureND<Double>.view(shape: IntArray): DoubleTensor {
         checkView(tensor, shape)
         return DoubleTensor(shape, tensor.mutableBuffer.array(), tensor.bufferStart)
     }
 
-    override fun Tensor<Double>.viewAs(other: Tensor<Double>): DoubleTensor =
+    override fun StructureND<Double>.viewAs(other: StructureND<Double>): DoubleTensor =
         tensor.view(other.shape)
 
-    override infix fun Tensor<Double>.dot(other: Tensor<Double>): DoubleTensor {
+    override infix fun StructureND<Double>.dot(other: StructureND<Double>): DoubleTensor {
         if (tensor.shape.size == 1 && other.shape.size == 1) {
             return DoubleTensor(intArrayOf(1), doubleArrayOf(tensor.times(other).tensor.mutableBuffer.array().sum()))
         }
@@ -569,10 +568,10 @@ public open class DoubleTensorAlgebra :
      */
     public fun Tensor<Double>.rowsByIndices(indices: IntArray): DoubleTensor = stack(indices.map { this[it] })
 
-    internal inline fun Tensor<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
+    internal inline fun StructureND<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
         foldFunction(tensor.copyArray())
 
-    internal inline fun Tensor<Double>.foldDim(
+    internal inline fun StructureND<Double>.foldDim(
         foldFunction: (DoubleArray) -> Double,
         dim: Int,
         keepDim: Boolean,
@@ -596,30 +595,30 @@ public open class DoubleTensorAlgebra :
         return resTensor
     }
 
-    override fun Tensor<Double>.sum(): Double = tensor.fold { it.sum() }
+    override fun StructureND<Double>.sum(): Double = tensor.fold { it.sum() }
 
-    override fun Tensor<Double>.sum(dim: Int, keepDim: Boolean): DoubleTensor =
+    override fun StructureND<Double>.sum(dim: Int, keepDim: Boolean): DoubleTensor =
         foldDim({ x -> x.sum() }, dim, keepDim)
 
-    override fun Tensor<Double>.min(): Double = this.fold { it.minOrNull()!! }
+    override fun StructureND<Double>.min(): Double = this.fold { it.minOrNull()!! }
 
-    override fun Tensor<Double>.min(dim: Int, keepDim: Boolean): DoubleTensor =
+    override fun StructureND<Double>.min(dim: Int, keepDim: Boolean): DoubleTensor =
         foldDim({ x -> x.minOrNull()!! }, dim, keepDim)
 
-    override fun Tensor<Double>.max(): Double = this.fold { it.maxOrNull()!! }
+    override fun StructureND<Double>.max(): Double = this.fold { it.maxOrNull()!! }
 
-    override fun Tensor<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
+    override fun StructureND<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
         foldDim({ x -> x.maxOrNull()!! }, dim, keepDim)
 
-    override fun Tensor<Double>.argMax(dim: Int, keepDim: Boolean): DoubleTensor =
+    override fun StructureND<Double>.argMax(dim: Int, keepDim: Boolean): DoubleTensor =
         foldDim({ x ->
             x.withIndex().maxByOrNull { it.value }?.index!!.toDouble()
         }, dim, keepDim)
 
 
-    override fun Tensor<Double>.mean(): Double = this.fold { it.sum() / tensor.numElements }
+    override fun StructureND<Double>.mean(): Double = this.fold { it.sum() / tensor.numElements }
 
-    override fun Tensor<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor =
+    override fun StructureND<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor =
         foldDim(
             { arr ->
                 check(dim < dimension) { "Dimension $dim out of range $dimension" }
@@ -629,12 +628,12 @@ public open class DoubleTensorAlgebra :
             keepDim
         )
 
-    override fun Tensor<Double>.std(): Double = this.fold { arr ->
+    override fun StructureND<Double>.std(): Double = this.fold { arr ->
         val mean = arr.sum() / tensor.numElements
         sqrt(arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1))
     }
 
-    override fun Tensor<Double>.std(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
+    override fun StructureND<Double>.std(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
         { arr ->
             check(dim < dimension) { "Dimension $dim out of range $dimension" }
             val mean = arr.sum() / shape[dim]
@@ -644,12 +643,12 @@ public open class DoubleTensorAlgebra :
         keepDim
     )
 
-    override fun Tensor<Double>.variance(): Double = this.fold { arr ->
+    override fun StructureND<Double>.variance(): Double = this.fold { arr ->
         val mean = arr.sum() / tensor.numElements
         arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1)
     }
 
-    override fun Tensor<Double>.variance(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
+    override fun StructureND<Double>.variance(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
         { arr ->
             check(dim < dimension) { "Dimension $dim out of range $dimension" }
             val mean = arr.sum() / shape[dim]
@@ -672,7 +671,7 @@ public open class DoubleTensorAlgebra :
      * @param tensors the [List] of 1-dimensional tensors with same shape
      * @return `M`.
      */
-    public fun cov(tensors: List<Tensor<Double>>): DoubleTensor {
+    public fun cov(tensors: List<StructureND<Double>>): DoubleTensor {
         check(tensors.isNotEmpty()) { "List must have at least 1 element" }
         val n = tensors.size
         val m = tensors[0].shape[0]
@@ -689,43 +688,43 @@ public open class DoubleTensorAlgebra :
         return resTensor
     }
 
-    override fun Tensor<Double>.exp(): DoubleTensor = tensor.map { exp(it) }
+    override fun StructureND<Double>.exp(): DoubleTensor = tensor.map { exp(it) }
 
-    override fun Tensor<Double>.ln(): DoubleTensor = tensor.map { ln(it) }
+    override fun StructureND<Double>.ln(): DoubleTensor = tensor.map { ln(it) }
 
-    override fun Tensor<Double>.sqrt(): DoubleTensor = tensor.map { sqrt(it) }
+    override fun StructureND<Double>.sqrt(): DoubleTensor = tensor.map { sqrt(it) }
 
-    override fun Tensor<Double>.cos(): DoubleTensor = tensor.map { cos(it) }
+    override fun StructureND<Double>.cos(): DoubleTensor = tensor.map { cos(it) }
 
-    override fun Tensor<Double>.acos(): DoubleTensor = tensor.map { acos(it) }
+    override fun StructureND<Double>.acos(): DoubleTensor = tensor.map { acos(it) }
 
-    override fun Tensor<Double>.cosh(): DoubleTensor = tensor.map { cosh(it) }
+    override fun StructureND<Double>.cosh(): DoubleTensor = tensor.map { cosh(it) }
 
-    override fun Tensor<Double>.acosh(): DoubleTensor = tensor.map { acosh(it) }
+    override fun StructureND<Double>.acosh(): DoubleTensor = tensor.map { acosh(it) }
 
-    override fun Tensor<Double>.sin(): DoubleTensor = tensor.map { sin(it) }
+    override fun StructureND<Double>.sin(): DoubleTensor = tensor.map { sin(it) }
 
-    override fun Tensor<Double>.asin(): DoubleTensor = tensor.map { asin(it) }
+    override fun StructureND<Double>.asin(): DoubleTensor = tensor.map { asin(it) }
 
-    override fun Tensor<Double>.sinh(): DoubleTensor = tensor.map { sinh(it) }
+    override fun StructureND<Double>.sinh(): DoubleTensor = tensor.map { sinh(it) }
 
-    override fun Tensor<Double>.asinh(): DoubleTensor = tensor.map { asinh(it) }
+    override fun StructureND<Double>.asinh(): DoubleTensor = tensor.map { asinh(it) }
 
-    override fun Tensor<Double>.tan(): DoubleTensor = tensor.map { tan(it) }
+    override fun StructureND<Double>.tan(): DoubleTensor = tensor.map { tan(it) }
 
-    override fun Tensor<Double>.atan(): DoubleTensor = tensor.map { atan(it) }
+    override fun StructureND<Double>.atan(): DoubleTensor = tensor.map { atan(it) }
 
-    override fun Tensor<Double>.tanh(): DoubleTensor = tensor.map { tanh(it) }
+    override fun StructureND<Double>.tanh(): DoubleTensor = tensor.map { tanh(it) }
 
-    override fun Tensor<Double>.atanh(): DoubleTensor = tensor.map { atanh(it) }
+    override fun StructureND<Double>.atanh(): DoubleTensor = tensor.map { atanh(it) }
 
-    override fun Tensor<Double>.ceil(): DoubleTensor = tensor.map { ceil(it) }
+    override fun StructureND<Double>.ceil(): DoubleTensor = tensor.map { ceil(it) }
 
-    override fun Tensor<Double>.floor(): DoubleTensor = tensor.map { floor(it) }
+    override fun StructureND<Double>.floor(): DoubleTensor = tensor.map { floor(it) }
 
-    override fun Tensor<Double>.inv(): DoubleTensor = invLU(1e-9)
+    override fun StructureND<Double>.inv(): DoubleTensor = invLU(1e-9)
 
-    override fun Tensor<Double>.det(): DoubleTensor = detLU(1e-9)
+    override fun StructureND<Double>.det(): DoubleTensor = detLU(1e-9)
 
     /**
      * Computes the LU factorization of a matrix or batches of matrices `input`.
@@ -736,7 +735,7 @@ public open class DoubleTensorAlgebra :
      * The `factorization` has the shape ``(*, m, n)``, where``(*, m, n)`` is the shape of the `input` tensor.
      * The `pivots`  has the shape ``(∗, min(m, n))``. `pivots` stores all the intermediate transpositions of rows.
      */
-    public fun Tensor<Double>.luFactor(epsilon: Double): Pair<DoubleTensor, IntTensor> =
+    public fun StructureND<Double>.luFactor(epsilon: Double): Pair<DoubleTensor, IntTensor> =
         computeLU(tensor, epsilon)
             ?: throw IllegalArgumentException("Tensor contains matrices which are singular at precision $epsilon")
 
@@ -749,7 +748,7 @@ public open class DoubleTensorAlgebra :
      * The `factorization` has the shape ``(*, m, n)``, where``(*, m, n)`` is the shape of the `input` tensor.
      * The `pivots`  has the shape ``(∗, min(m, n))``. `pivots` stores all the intermediate transpositions of rows.
      */
-    public fun Tensor<Double>.luFactor(): Pair<DoubleTensor, IntTensor> = luFactor(1e-9)
+    public fun StructureND<Double>.luFactor(): Pair<DoubleTensor, IntTensor> = luFactor(1e-9)
 
     /**
      * Unpacks the data and pivots from a LU factorization of a tensor.
@@ -763,7 +762,7 @@ public open class DoubleTensorAlgebra :
      * @return triple of `P`, `L` and `U` tensors
      */
     public fun luPivot(
-        luTensor: Tensor<Double>,
+        luTensor: StructureND<Double>,
         pivotsTensor: Tensor<Int>,
     ): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         checkSquareMatrix(luTensor.shape)
@@ -806,7 +805,7 @@ public open class DoubleTensorAlgebra :
      * Used when checking the positive definiteness of the input matrix or matrices.
      * @return a pair of `Q` and `R` tensors.
      */
-    public fun Tensor<Double>.cholesky(epsilon: Double): DoubleTensor {
+    public fun StructureND<Double>.cholesky(epsilon: Double): DoubleTensor {
         checkSquareMatrix(shape)
         checkPositiveDefinite(tensor, epsilon)
 
@@ -819,9 +818,9 @@ public open class DoubleTensorAlgebra :
         return lTensor
     }
 
-    override fun Tensor<Double>.cholesky(): DoubleTensor = cholesky(1e-6)
+    override fun StructureND<Double>.cholesky(): DoubleTensor = cholesky(1e-6)
 
-    override fun Tensor<Double>.qr(): Pair<DoubleTensor, DoubleTensor> {
+    override fun StructureND<Double>.qr(): Pair<DoubleTensor, DoubleTensor> {
         checkSquareMatrix(shape)
         val qTensor = zeroesLike()
         val rTensor = zeroesLike()
@@ -837,7 +836,7 @@ public open class DoubleTensorAlgebra :
         return qTensor to rTensor
     }
 
-    override fun Tensor<Double>.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> =
+    override fun StructureND<Double>.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> =
         svd(epsilon = 1e-10)
 
     /**
@@ -853,7 +852,7 @@ public open class DoubleTensorAlgebra :
      * i.e., the precision with which the cosine approaches 1 in an iterative algorithm.
      * @return a triple `Triple(U, S, V)`.
      */
-    public fun Tensor<Double>.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+    public fun StructureND<Double>.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         val size = tensor.dimension
         val commonShape = tensor.shape.sliceArray(0 until size - 2)
         val (n, m) = tensor.shape.sliceArray(size - 2 until size)
@@ -886,7 +885,7 @@ public open class DoubleTensorAlgebra :
         return Triple(uTensor.transpose(), sTensor, vTensor.transpose())
     }
 
-    override fun Tensor<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> = symEig(epsilon = 1e-15)
+    override fun StructureND<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> = symEig(epsilon = 1e-15)
 
     /**
      * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
@@ -896,7 +895,7 @@ public open class DoubleTensorAlgebra :
      * and when the cosine approaches 1 in the SVD algorithm.
      * @return a pair `eigenvalues to eigenvectors`.
      */
-    public fun Tensor<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
+    public fun StructureND<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
         checkSymmetric(tensor, epsilon)
 
         fun MutableStructure2D<Double>.cleanSym(n: Int) {
@@ -931,7 +930,7 @@ public open class DoubleTensorAlgebra :
      * with zero.
      * @return the determinant.
      */
-    public fun Tensor<Double>.detLU(epsilon: Double = 1e-9): DoubleTensor {
+    public fun StructureND<Double>.detLU(epsilon: Double = 1e-9): DoubleTensor {
         checkSquareMatrix(tensor.shape)
         val luTensor = tensor.copy()
         val pivotsTensor = tensor.setUpPivots()
@@ -964,7 +963,7 @@ public open class DoubleTensorAlgebra :
      * @param epsilon error in the LU algorithm&mdash;permissible error when comparing the determinant of a matrix with zero
      * @return the multiplicative inverse of a matrix.
      */
-    public fun Tensor<Double>.invLU(epsilon: Double = 1e-9): DoubleTensor {
+    public fun StructureND<Double>.invLU(epsilon: Double = 1e-9): DoubleTensor {
         val (luTensor, pivotsTensor) = luFactor(epsilon)
         val invTensor = luTensor.zeroesLike()
 
@@ -989,12 +988,12 @@ public open class DoubleTensorAlgebra :
      * @param epsilon permissible error when comparing the determinant of a matrix with zero.
      * @return triple of `P`, `L` and `U` tensors.
      */
-    public fun Tensor<Double>.lu(epsilon: Double = 1e-9): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+    public fun StructureND<Double>.lu(epsilon: Double = 1e-9): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         val (lu, pivots) = tensor.luFactor(epsilon)
         return luPivot(lu, pivots)
     }
 
-    override fun Tensor<Double>.lu(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> = lu(1e-9)
+    override fun StructureND<Double>.lu(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> = lu(1e-9)
 }
 
 public val Double.Companion.tensorAlgebra: DoubleTensorAlgebra.Companion get() = DoubleTensorAlgebra
-- 
2.34.1


From 64629561afed6465ef74bc8f51b892c94d17adac Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 28 Oct 2021 10:52:40 +0300
Subject: [PATCH 365/713] [WIP] TensorFlow refactoring

---
 .../tensorflow/DoubleTensorFlowAlgebra.kt     | 26 +++++--
 .../kmath/tensorflow/TensorFlowAlgebra.kt     | 78 +++++++++----------
 2 files changed, 58 insertions(+), 46 deletions(-)

diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
index 864205e17..44420cd76 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
@@ -3,11 +3,13 @@ package space.kscience.kmath.tensorflow
 import org.tensorflow.Graph
 import org.tensorflow.Output
 import org.tensorflow.ndarray.NdArray
-import org.tensorflow.ndarray.Shape
 import org.tensorflow.op.core.Constant
 import org.tensorflow.types.TFloat64
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.tensors.api.Tensor
+import space.kscience.kmath.nd.DefaultStrides
+import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.DoubleField
 
 public class DoubleTensorFlowOutput(
     graph: Graph,
@@ -18,14 +20,28 @@ public class DoubleTensorFlowOutput(
 
 public class DoubleTensorFlowAlgebra internal constructor(
     graph: Graph
-) : TensorFlowAlgebra<Double, TFloat64>(graph) {
+) : TensorFlowAlgebra<Double, TFloat64, DoubleField>(graph) {
 
-    override fun Tensor<Double>.asTensorFlow(): TensorFlowOutput<Double, TFloat64> =
+    override val elementAlgebra: DoubleField get() = DoubleField
+
+    override fun structureND(
+        shape: Shape,
+        initializer: DoubleField.(IntArray) -> Double
+    ): StructureND<Double> {
+        val res = TFloat64.tensorOf(org.tensorflow.ndarray.Shape.of(*shape.toLongArray())) { array ->
+            DefaultStrides(shape).forEach { index ->
+                array.setDouble(elementAlgebra.initializer(index), *index.toLongArray())
+            }
+        }
+        return DoubleTensorFlowOutput(graph, ops.constant(res).asOutput())
+    }
+
+    override fun StructureND<Double>.asTensorFlow(): TensorFlowOutput<Double, TFloat64> =
         if (this is TensorFlowOutput<Double, *> && output.type() == TFloat64::class.java) {
             @Suppress("UNCHECKED_CAST")
             this as TensorFlowOutput<Double, TFloat64>
         } else {
-            val res = TFloat64.tensorOf(Shape.of(*shape.toLongArray())) { array ->
+            val res = TFloat64.tensorOf(org.tensorflow.ndarray.Shape.of(*shape.toLongArray())) { array ->
                 @OptIn(PerformancePitfall::class)
                 elements().forEach { (index, value) ->
                     array.setDouble(value, *index.toLongArray())
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index 12c1211db..e73620d01 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -11,6 +11,8 @@ import org.tensorflow.op.core.Constant
 import org.tensorflow.types.family.TType
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.api.TensorAlgebra
 
@@ -28,13 +30,7 @@ public value class TensorFlowArray<T>(public val tensor: NdArray<T>) : Tensor<T>
 
     override fun get(index: IntArray): T = tensor.getObject(*index.toLongArray())
 
-    @PerformancePitfall
-    override fun elements(): Sequence<Pair<IntArray, T>> = sequence {
-        tensor.scalars().forEachIndexed { index: LongArray, ndArray: NdArray<T> ->
-            //yield(index.toIntArray() to ndArray.scalar)
-            TODO()
-        }
-    }
+    //TODO implement native element sequence
 
     override fun set(index: IntArray, value: T) {
         tensor.setObject(value, *index.toLongArray())
@@ -70,23 +66,23 @@ public abstract class TensorFlowOutput<T, TT : TType>(
 }
 
 
-public abstract class TensorFlowAlgebra<T, TT : TType> internal constructor(
+public abstract class TensorFlowAlgebra<T, TT : TType, A: Ring<T>> internal constructor(
     protected val graph: Graph
-) : TensorAlgebra<T> {
+) : TensorAlgebra<T,A> {
 
     protected val ops: Ops by lazy { Ops.create(graph) }
 
-    protected abstract fun Tensor<T>.asTensorFlow(): TensorFlowOutput<T, TT>
+    protected abstract fun StructureND<T>.asTensorFlow(): TensorFlowOutput<T, TT>
 
     protected abstract fun Output<TT>.wrap(): TensorFlowOutput<T, TT>
 
     protected abstract fun const(value: T): Constant<TT>
 
-    override fun Tensor<T>.valueOrNull(): T? = if (shape contentEquals intArrayOf(1))
+    override fun StructureND<T>.valueOrNull(): T? = if (shape contentEquals intArrayOf(1))
         get(Shape(0)) else null
 
-    private inline fun Tensor<T>.biOp(
-        other: Tensor<T>,
+    private inline fun StructureND<T>.biOp(
+        other: StructureND<T>,
         operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
     ): TensorFlowOutput<T, TT> {
         val left = asTensorFlow().output
@@ -95,7 +91,7 @@ public abstract class TensorFlowAlgebra<T, TT : TType> internal constructor(
     }
 
     private inline fun T.biOp(
-        other: Tensor<T>,
+        other: StructureND<T>,
         operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
     ): TensorFlowOutput<T, TT> {
         val left = const(this)
@@ -103,7 +99,7 @@ public abstract class TensorFlowAlgebra<T, TT : TType> internal constructor(
         return operation(left, right).asOutput().wrap()
     }
 
-    private inline fun Tensor<T>.biOp(
+    private inline fun StructureND<T>.biOp(
         value: T,
         operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
     ): TensorFlowOutput<T, TT> {
@@ -113,7 +109,7 @@ public abstract class TensorFlowAlgebra<T, TT : TType> internal constructor(
     }
 
     private inline fun Tensor<T>.inPlaceOp(
-        other: Tensor<T>,
+        other: StructureND<T>,
         operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
     ): Unit {
         val origin = asTensorFlow()
@@ -132,46 +128,46 @@ public abstract class TensorFlowAlgebra<T, TT : TType> internal constructor(
         origin.output = operation(left, right).asOutput()
     }
 
-    private inline fun unOp(value: Tensor<T>, operation: (Operand<TT>) -> Operand<TT>): TensorFlowOutput<T, TT> =
+    private inline fun unOp(value: StructureND<T>, operation: (Operand<TT>) -> Operand<TT>): TensorFlowOutput<T, TT> =
         operation(value.asTensorFlow().output).asOutput().wrap()
 
-    override fun T.plus(other: Tensor<T>): TensorFlowOutput<T, TT> = biOp(other, ops.math::add)
+    override fun T.plus(arg: StructureND<T>): TensorFlowOutput<T, TT> = biOp(arg, ops.math::add)
 
-    override fun Tensor<T>.plus(value: T): TensorFlowOutput<T, TT> = biOp(value, ops.math::add)
+    override fun StructureND<T>.plus(arg: T): TensorFlowOutput<T, TT> = biOp(arg, ops.math::add)
 
-    override fun Tensor<T>.plus(other: Tensor<T>): TensorFlowOutput<T, TT> = biOp(other, ops.math::add)
+    override fun StructureND<T>.plus(arg: StructureND<T>): TensorFlowOutput<T, TT> = biOp(arg, ops.math::add)
 
     override fun Tensor<T>.plusAssign(value: T): Unit = inPlaceOp(value, ops.math::add)
 
-    override fun Tensor<T>.plusAssign(other: Tensor<T>): Unit = inPlaceOp(other, ops.math::add)
+    override fun Tensor<T>.plusAssign(arg: StructureND<T>): Unit = inPlaceOp(arg, ops.math::add)
 
-    override fun Tensor<T>.minus(value: T): TensorFlowOutput<T, TT> = biOp(value, ops.math::sub)
+    override fun StructureND<T>.minus(arg: T): TensorFlowOutput<T, TT> = biOp(arg, ops.math::sub)
 
-    override fun Tensor<T>.minus(other: Tensor<T>): TensorFlowOutput<T, TT> = biOp(other, ops.math::sub)
+    override fun StructureND<T>.minus(arg: StructureND<T>): TensorFlowOutput<T, TT> = biOp(arg, ops.math::sub)
 
-    override fun T.minus(other: Tensor<T>): Tensor<T> = biOp(other, ops.math::sub)
+    override fun T.minus(arg: StructureND<T>): Tensor<T> = biOp(arg, ops.math::sub)
 
     override fun Tensor<T>.minusAssign(value: T): Unit = inPlaceOp(value, ops.math::sub)
 
-    override fun Tensor<T>.minusAssign(other: Tensor<T>): Unit = inPlaceOp(other, ops.math::sub)
+    override fun Tensor<T>.minusAssign(other: StructureND<T>): Unit = inPlaceOp(other, ops.math::sub)
 
-    override fun T.times(other: Tensor<T>): TensorFlowOutput<T, TT> = biOp(other, ops.math::mul)
+    override fun T.times(arg: StructureND<T>): TensorFlowOutput<T, TT> = biOp(arg, ops.math::mul)
 
-    override fun Tensor<T>.times(value: T): TensorFlowOutput<T, TT> = biOp(value, ops.math::mul)
+    override fun StructureND<T>.times(arg: T): TensorFlowOutput<T, TT> = biOp(arg, ops.math::mul)
 
-    override fun Tensor<T>.times(other: Tensor<T>): TensorFlowOutput<T, TT> = biOp(other, ops.math::mul)
+    override fun StructureND<T>.times(other: StructureND<T>): TensorFlowOutput<T, TT> = biOp(other, ops.math::mul)
 
     override fun Tensor<T>.timesAssign(value: T): Unit = inPlaceOp(value, ops.math::mul)
 
-    override fun Tensor<T>.timesAssign(other: Tensor<T>): Unit = inPlaceOp(other, ops.math::mul)
+    override fun Tensor<T>.timesAssign(arg: StructureND<T>): Unit = inPlaceOp(arg, ops.math::mul)
 
-    override fun Tensor<T>.unaryMinus(): TensorFlowOutput<T, TT> = unOp(this, ops.math::neg)
+    override fun StructureND<T>.unaryMinus(): TensorFlowOutput<T, TT> = unOp(this, ops.math::neg)
 
-    override fun Tensor<T>.get(i: Int): Tensor<T> {
+    override fun StructureND<T>.get(i: Int): Tensor<T> {
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.transpose(i: Int, j: Int): Tensor<T> = unOp(this) {
+    override fun StructureND<T>.transpose(i: Int, j: Int): Tensor<T> = unOp(this) {
         ops.linalg.transpose(it, ops.constant(intArrayOf(i, j)))
     }
 
@@ -179,11 +175,11 @@ public abstract class TensorFlowAlgebra<T, TT : TType> internal constructor(
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.viewAs(other: Tensor<T>): Tensor<T> {
+    override fun Tensor<T>.viewAs(other: StructureND<T>): Tensor<T> {
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.dot(other: Tensor<T>): TensorFlowOutput<T, TT> = biOp(other) { l, r ->
+    override fun StructureND<T>.dot(other: StructureND<T>): TensorFlowOutput<T, TT> = biOp(other) { l, r ->
         ops.linalg.matMul(l, r)
     }
 
@@ -191,29 +187,29 @@ public abstract class TensorFlowAlgebra<T, TT : TType> internal constructor(
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.sum(): T = TODO("Not yet implemented")
+    override fun StructureND<T>.sum(): T = TODO("Not yet implemented")
 
-    override fun Tensor<T>.sum(dim: Int, keepDim: Boolean): Tensor<T> {
+    override fun StructureND<T>.sum(dim: Int, keepDim: Boolean): Tensor<T> {
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.min(): T {
+    override fun StructureND<T>.min(): T {
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.min(dim: Int, keepDim: Boolean): Tensor<T> {
+    override fun StructureND<T>.min(dim: Int, keepDim: Boolean): Tensor<T> {
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.max(): T {
+    override fun StructureND<T>.max(): T {
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.max(dim: Int, keepDim: Boolean): Tensor<T> {
+    override fun StructureND<T>.max(dim: Int, keepDim: Boolean): Tensor<T> {
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T> {
+    override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T> {
         TODO("Not yet implemented")
     }
 }
\ No newline at end of file
-- 
2.34.1


From 4db7398a288cec1939b4b3bbcd02908bd89c501a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 28 Oct 2021 10:58:22 +0300
Subject: [PATCH 366/713] Tensor algebra generified

---
 .../structures/StructureReadBenchmark.kt      |  8 +--
 .../kscience/kmath/complex/Quaternion.kt      |  4 +-
 .../kscience/kmath/expressions/MstAlgebra.kt  | 10 +--
 .../kmath/linear/BufferedLinearSpace.kt       |  2 +
 .../space/kscience/kmath/nd/AlgebraND.kt      | 45 +++++++++++---
 .../kscience/kmath/nd/BufferAlgebraND.kt      |  6 ++
 .../space/kscience/kmath/nd/BufferND.kt       |  4 +-
 .../space/kscience/kmath/nd/DoubleFieldND.kt  | 13 ++--
 .../space/kscience/kmath/nd/ShapeIndexer.kt   |  8 ++-
 .../space/kscience/kmath/nd/StructureND.kt    |  6 +-
 .../kscience/kmath/operations/Algebra.kt      | 12 ++--
 .../kmath/operations/NumericAlgebra.kt        |  4 +-
 .../kscience/kmath/operations/numbers.kt      |  4 +-
 .../kscience/kmath/operations/BigNumbers.kt   |  4 +-
 .../kmath/structures/LazyStructureND.kt       |  2 +-
 .../kmath/histogram/IndexedHistogramSpace.kt  |  2 +-
 .../histogram/MultivariateHistogramTest.kt    |  2 +-
 .../kscience/kmath/jafama/KMathJafama.kt      |  4 +-
 .../kmath/multik/MultikTensorAlgebra.kt       | 46 +++++++-------
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   |  4 +-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  | 30 ++++-----
 .../kmath/tensors/api/TensorAlgebra.kt        | 62 +++++++++----------
 .../api/TensorPartialDivisionAlgebra.kt       |  8 +--
 .../core/BroadcastDoubleTensorAlgebra.kt      | 24 +++----
 .../kmath/tensors/core/BufferedTensor.kt      |  5 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 60 +++++++++---------
 .../tensors/core/internal/tensorCastsUtils.kt |  2 +-
 .../kscience/kmath/viktor/ViktorFieldOpsND.kt | 16 ++---
 .../kmath/viktor/ViktorStructureND.kt         |  2 +-
 29 files changed, 221 insertions(+), 178 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
index 84dd6538c..db77129a2 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
@@ -19,24 +19,24 @@ fun main() {
 
     measureTimeMillis {
         var res = 0.0
-        strides.indices().forEach { res = structure[it] }
+        strides.asSequence().forEach { res = structure[it] }
     } // warmup
 
     val time1 = measureTimeMillis {
         var res = 0.0
-        strides.indices().forEach { res = structure[it] }
+        strides.asSequence().forEach { res = structure[it] }
     }
     println("Structure reading finished in $time1 millis")
 
     val time2 = measureTimeMillis {
         var res = 0.0
-        strides.indices().forEach { res = buffer[strides.offset(it)] }
+        strides.asSequence().forEach { res = buffer[strides.offset(it)] }
     }
     println("Buffer reading finished in $time2 millis")
 
     val time3 = measureTimeMillis {
         var res = 0.0
-        strides.indices().forEach { res = array[strides.offset(it)] }
+        strides.asSequence().forEach { res = array[strides.offset(it)] }
     }
     println("Array reading finished in $time3 millis")
 }
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index 47cc61313..ff9a8302a 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -166,8 +166,8 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
     override operator fun Quaternion.plus(other: Number): Quaternion = Quaternion(w + other.toDouble(), x, y, z)
     override operator fun Quaternion.minus(other: Number): Quaternion = Quaternion(w - other.toDouble(), x, y, z)
 
-    override operator fun Number.times(other: Quaternion): Quaternion =
-        Quaternion(toDouble() * other.w, toDouble() * other.x, toDouble() * other.y, toDouble() * other.z)
+    override operator fun Number.times(arg: Quaternion): Quaternion =
+        Quaternion(toDouble() * arg.w, toDouble() * arg.x, toDouble() * arg.y, toDouble() * arg.z)
 
     override fun Quaternion.unaryMinus(): Quaternion = Quaternion(-w, -x, -y, -z)
     override fun norm(arg: Quaternion): Quaternion = sqrt(arg.conjugate * arg)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
index dd3c46207..ca0671ccb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
@@ -38,8 +38,8 @@ public object MstGroup : Group<MST>, NumericAlgebra<MST>, ScaleOperations<MST> {
     override operator fun MST.unaryMinus(): MST.Unary =
         unaryOperationFunction(GroupOps.MINUS_OPERATION)(this)
 
-    override operator fun MST.minus(other: MST): MST.Binary =
-        binaryOperationFunction(GroupOps.MINUS_OPERATION)(this, other)
+    override operator fun MST.minus(arg: MST): MST.Binary =
+        binaryOperationFunction(GroupOps.MINUS_OPERATION)(this, arg)
 
     override fun scale(a: MST, value: Double): MST.Binary =
         binaryOperationFunction(RingOps.TIMES_OPERATION)(a, number(value))
@@ -72,7 +72,7 @@ public object MstRing : Ring<MST>, NumbersAddOps<MST>, ScaleOperations<MST> {
 
     override operator fun MST.unaryPlus(): MST.Unary = MstGroup { +this@unaryPlus }
     override operator fun MST.unaryMinus(): MST.Unary = MstGroup { -this@unaryMinus }
-    override operator fun MST.minus(other: MST): MST.Binary = MstGroup { this@minus - other }
+    override operator fun MST.minus(arg: MST): MST.Binary = MstGroup { this@minus - arg }
 
     override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
         MstGroup.binaryOperationFunction(operation)
@@ -103,7 +103,7 @@ public object MstField : Field<MST>, NumbersAddOps<MST>, ScaleOperations<MST> {
 
     override operator fun MST.unaryPlus(): MST.Unary = MstRing { +this@unaryPlus }
     override operator fun MST.unaryMinus(): MST.Unary = MstRing { -this@unaryMinus }
-    override operator fun MST.minus(other: MST): MST.Binary = MstRing { this@minus - other }
+    override operator fun MST.minus(arg: MST): MST.Binary = MstRing { this@minus - arg }
 
     override fun binaryOperationFunction(operation: String): (left: MST, right: MST) -> MST.Binary =
         MstRing.binaryOperationFunction(operation)
@@ -144,7 +144,7 @@ public object MstExtendedField : ExtendedField<MST>, NumericAlgebra<MST> {
     override fun divide(left: MST, right: MST): MST.Binary = MstField.divide(left, right)
     override operator fun MST.unaryPlus(): MST.Unary = MstField { +this@unaryPlus }
     override operator fun MST.unaryMinus(): MST.Unary = MstField { -this@unaryMinus }
-    override operator fun MST.minus(other: MST): MST.Binary = MstField { this@minus - other }
+    override operator fun MST.minus(arg: MST): MST.Binary = MstField { this@minus - arg }
 
     override fun power(arg: MST, pow: Number): MST.Binary =
         binaryOperationFunction(PowerOperations.POW_OPERATION)(arg, number(pow))
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index f72b9bd81..410fb8505 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -29,6 +29,7 @@ public class BufferedLinearSpace<T, out A : Ring<T>>(
     override fun buildVector(size: Int, initializer: A.(Int) -> T): Point<T> =
         bufferAlgebra.buffer(size) { elementAlgebra.initializer(it) }
 
+    @OptIn(PerformancePitfall::class)
     override fun Matrix<T>.unaryMinus(): Matrix<T> = ndAlgebra {
         asND().map { -it }.as2D()
     }
@@ -83,6 +84,7 @@ public class BufferedLinearSpace<T, out A : Ring<T>>(
         }
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun Matrix<T>.times(value: T): Matrix<T> = ndAlgebra {
         asND().map { it * value }.as2D()
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index 3d2d08fac..4e52c8ba9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import kotlin.reflect.KClass
@@ -24,6 +25,8 @@ public fun Shape(shapeFirst: Int, vararg shapeRest: Int): Shape = intArrayOf(sha
 
 public interface WithShape {
     public val shape: Shape
+
+    public val indices: ShapeIndexer get() = DefaultStrides(shape)
 }
 
 /**
@@ -46,21 +49,37 @@ public interface AlgebraND<T, out C : Algebra<T>> {
     /**
      * Maps elements from one structure to another one by applying [transform] to them.
      */
-    public fun StructureND<T>.map(transform: C.(T) -> T): StructureND<T>
+    @PerformancePitfall("Very slow on remote execution algebras")
+    public fun StructureND<T>.map(transform: C.(T) -> T): StructureND<T> = structureND(shape) { index ->
+        elementAlgebra.transform(get(index))
+    }
 
     /**
      * Maps elements from one structure to another one by applying [transform] to them alongside with their indices.
      */
-    public fun StructureND<T>.mapIndexed(transform: C.(index: IntArray, T) -> T): StructureND<T>
+    @PerformancePitfall("Very slow on remote execution algebras")
+    public fun StructureND<T>.mapIndexed(transform: C.(index: IntArray, T) -> T): StructureND<T> =
+        structureND(shape) { index ->
+            elementAlgebra.transform(index, get(index))
+        }
 
     /**
      * Combines two structures into one.
      */
-    public fun zip(left: StructureND<T>, right: StructureND<T>, transform: C.(T, T) -> T): StructureND<T>
+    @PerformancePitfall("Very slow on remote execution algebras")
+    public fun zip(left: StructureND<T>, right: StructureND<T>, transform: C.(T, T) -> T): StructureND<T> {
+        require(left.shape.contentEquals(right.shape)) {
+            "Expected left and right of the same shape, but left - ${left.shape} and right - ${right.shape}"
+        }
+        return structureND(left.shape) { index ->
+            elementAlgebra.transform(left[index], right[index])
+        }
+    }
 
     /**
      * Element-wise invocation of function working on [T] on a [StructureND].
      */
+    @PerformancePitfall
     public operator fun Function1<T, T>.invoke(structure: StructureND<T>): StructureND<T> =
         structure.map { value -> this@invoke(value) }
 
@@ -104,6 +123,7 @@ public interface GroupOpsND<T, out A : GroupOps<T>> : GroupOps<StructureND<T>>,
      * @param right the addend.
      * @return the sum.
      */
+    @OptIn(PerformancePitfall::class)
     override fun add(left: StructureND<T>, right: StructureND<T>): StructureND<T> =
         zip(left, right) { aValue, bValue -> add(aValue, bValue) }
 
@@ -116,6 +136,7 @@ public interface GroupOpsND<T, out A : GroupOps<T>> : GroupOps<StructureND<T>>,
      * @param arg the addend.
      * @return the sum.
      */
+    @OptIn(PerformancePitfall::class)
     public operator fun StructureND<T>.plus(arg: T): StructureND<T> = this.map { value -> add(arg, value) }
 
     /**
@@ -125,25 +146,28 @@ public interface GroupOpsND<T, out A : GroupOps<T>> : GroupOps<StructureND<T>>,
      * @param arg the divisor.
      * @return the quotient.
      */
+    @OptIn(PerformancePitfall::class)
     public operator fun StructureND<T>.minus(arg: T): StructureND<T> = this.map { value -> add(arg, -value) }
 
     /**
      * Adds an element to ND structure of it.
      *
      * @receiver the augend.
-     * @param other the addend.
+     * @param arg the addend.
      * @return the sum.
      */
-    public operator fun T.plus(other: StructureND<T>): StructureND<T> = other.map { value -> add(this@plus, value) }
+    @OptIn(PerformancePitfall::class)
+    public operator fun T.plus(arg: StructureND<T>): StructureND<T> = arg.map { value -> add(this@plus, value) }
 
     /**
      * Subtracts an ND structure from an element of it.
      *
      * @receiver the dividend.
-     * @param other the divisor.
+     * @param arg the divisor.
      * @return the quotient.
      */
-    public operator fun T.minus(other: StructureND<T>): StructureND<T> = other.map { value -> add(-this@minus, value) }
+    @OptIn(PerformancePitfall::class)
+    public operator fun T.minus(arg: StructureND<T>): StructureND<T> = arg.map { value -> add(-this@minus, value) }
 
     public companion object
 }
@@ -166,6 +190,7 @@ public interface RingOpsND<T, out A : RingOps<T>> : RingOps<StructureND<T>>, Gro
      * @param right the multiplier.
      * @return the product.
      */
+    @OptIn(PerformancePitfall::class)
     override fun multiply(left: StructureND<T>, right: StructureND<T>): StructureND<T> =
         zip(left, right) { aValue, bValue -> multiply(aValue, bValue) }
 
@@ -178,6 +203,7 @@ public interface RingOpsND<T, out A : RingOps<T>> : RingOps<StructureND<T>>, Gro
      * @param arg the multiplier.
      * @return the product.
      */
+    @OptIn(PerformancePitfall::class)
     public operator fun StructureND<T>.times(arg: T): StructureND<T> = this.map { value -> multiply(arg, value) }
 
     /**
@@ -187,6 +213,7 @@ public interface RingOpsND<T, out A : RingOps<T>> : RingOps<StructureND<T>>, Gro
      * @param arg the multiplier.
      * @return the product.
      */
+    @OptIn(PerformancePitfall::class)
     public operator fun T.times(arg: StructureND<T>): StructureND<T> = arg.map { value -> multiply(this@times, value) }
 
     public companion object
@@ -214,6 +241,7 @@ public interface FieldOpsND<T, out A : Field<T>> :
      * @param right the divisor.
      * @return the quotient.
      */
+    @OptIn(PerformancePitfall::class)
     override fun divide(left: StructureND<T>, right: StructureND<T>): StructureND<T> =
         zip(left, right) { aValue, bValue -> divide(aValue, bValue) }
 
@@ -225,6 +253,7 @@ public interface FieldOpsND<T, out A : Field<T>> :
      * @param arg the divisor.
      * @return the quotient.
      */
+    @OptIn(PerformancePitfall::class)
     public operator fun StructureND<T>.div(arg: T): StructureND<T> = this.map { value -> divide(arg, value) }
 
     /**
@@ -234,8 +263,10 @@ public interface FieldOpsND<T, out A : Field<T>> :
      * @param arg the divisor.
      * @return the quotient.
      */
+    @OptIn(PerformancePitfall::class)
     public operator fun T.div(arg: StructureND<T>): StructureND<T> = arg.map { divide(it, this@div) }
 
+    @OptIn(PerformancePitfall::class)
     override fun scale(a: StructureND<T>, value: Double): StructureND<T> = a.map { scale(it, value) }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index cf007e7c9..0e094a8c7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -7,6 +7,7 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.BufferFactory
@@ -34,11 +35,14 @@ public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
         }
     }
 
+    @PerformancePitfall
     override fun StructureND<T>.map(transform: A.(T) -> T): BufferND<T> = mapInline(toBufferND(), transform)
 
+    @PerformancePitfall
     override fun StructureND<T>.mapIndexed(transform: A.(index: IntArray, T) -> T): BufferND<T> =
         mapIndexedInline(toBufferND(), transform)
 
+    @PerformancePitfall
     override fun zip(left: StructureND<T>, right: StructureND<T>, transform: A.(T, T) -> T): BufferND<T> =
         zipInline(left.toBufferND(), right.toBufferND(), transform)
 
@@ -78,6 +82,7 @@ internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.zipInline(
     return BufferND(indexes, bufferAlgebra.zipInline(l.buffer, r.buffer, block))
 }
 
+@OptIn(PerformancePitfall::class)
 public open class BufferedGroupNDOps<T, out A : Group<T>>(
     override val bufferAlgebra: BufferAlgebra<T, A>,
     override val indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder
@@ -101,6 +106,7 @@ public open class BufferedFieldOpsND<T, out A : Field<T>>(
         indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder
     ) : this(BufferFieldOps(elementAlgebra, bufferFactory), indexerBuilder)
 
+    @OptIn(PerformancePitfall::class)
     override fun scale(a: StructureND<T>, value: Double): StructureND<T> = a.map { it * value }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 2b6fd3693..19924616d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -19,7 +19,7 @@ import space.kscience.kmath.structures.MutableBufferFactory
  * @param buffer The underlying buffer.
  */
 public open class BufferND<out T>(
-    public val indices: ShapeIndexer,
+    override val indices: ShapeIndexer,
     public open val buffer: Buffer<T>,
 ) : StructureND<T> {
 
@@ -28,7 +28,7 @@ public open class BufferND<out T>(
     override val shape: IntArray get() = indices.shape
 
     @PerformancePitfall
-    override fun elements(): Sequence<Pair<IntArray, T>> = indices.indices().map {
+    override fun elements(): Sequence<Pair<IntArray, T>> = indices.asSequence().map {
         it to this[it]
     }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index abb8e46ea..8cc5472a9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.DoubleBuffer
@@ -50,10 +51,12 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
         return DoubleBufferND(indexes, DoubleBuffer(indexes.linearSize) { block(lArray[it], rArray[it]) })
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): BufferND<Double> =
         mapInline(toBufferND()) { DoubleField.transform(it) }
 
 
+    @OptIn(PerformancePitfall::class)
     override fun zip(
         left: StructureND<Double>,
         right: StructureND<Double>,
@@ -92,11 +95,11 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
 
     override fun StructureND<Double>.unaryPlus(): DoubleBufferND = toBufferND()
 
-    override fun StructureND<Double>.plus(other: StructureND<Double>): DoubleBufferND =
-        zipInline(toBufferND(), other.toBufferND()) { l: Double, r: Double -> l + r }
+    override fun StructureND<Double>.plus(arg: StructureND<Double>): DoubleBufferND =
+        zipInline(toBufferND(), arg.toBufferND()) { l: Double, r: Double -> l + r }
 
-    override fun StructureND<Double>.minus(other: StructureND<Double>): DoubleBufferND =
-        zipInline(toBufferND(), other.toBufferND()) { l: Double, r: Double -> l - r }
+    override fun StructureND<Double>.minus(arg: StructureND<Double>): DoubleBufferND =
+        zipInline(toBufferND(), arg.toBufferND()) { l: Double, r: Double -> l - r }
 
     override fun StructureND<Double>.times(other: StructureND<Double>): DoubleBufferND =
         zipInline(toBufferND(), other.toBufferND()) { l: Double, r: Double -> l * r }
@@ -107,7 +110,7 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
     override fun StructureND<Double>.div(k: Number): DoubleBufferND =
         mapInline(toBufferND()) { it / k.toDouble() }
 
-    override fun Number.times(other: StructureND<Double>): DoubleBufferND = other * this
+    override fun Number.times(arg: StructureND<Double>): DoubleBufferND = arg * this
 
     override fun StructureND<Double>.plus(arg: Double): DoubleBufferND = mapInline(toBufferND()) { it + arg }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
index 1ce6b7519..20e180dd1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
@@ -10,7 +10,7 @@ import kotlin.native.concurrent.ThreadLocal
 /**
  * A converter from linear index to multivariate index
  */
-public interface ShapeIndexer{
+public interface ShapeIndexer: Iterable<IntArray>{
     public val shape: Shape
 
     /**
@@ -33,7 +33,9 @@ public interface ShapeIndexer{
     /**
      * Iterate over ND indices in a natural order
      */
-    public fun indices(): Sequence<IntArray>
+    public fun asSequence(): Sequence<IntArray>
+
+    override fun iterator(): Iterator<IntArray> = asSequence().iterator()
 
     override fun equals(other: Any?): Boolean
     override fun hashCode(): Int
@@ -58,7 +60,7 @@ public abstract class Strides: ShapeIndexer {
     /**
      * Iterate over ND indices in a natural order
      */
-    public override fun indices(): Sequence<IntArray> = (0 until linearSize).asSequence().map(::index)
+    public override fun asSequence(): Sequence<IntArray> = (0 until linearSize).asSequence().map(::index)
 }
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 496abf60f..614d97950 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -28,12 +28,12 @@ public interface StructureFeature : Feature<StructureFeature>
  *
  * @param T the type of items.
  */
-public interface StructureND<out T> : Featured<StructureFeature> {
+public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
     /**
      * The shape of structure i.e., non-empty sequence of non-negative integers that specify sizes of dimensions of
      * this structure.
      */
-    public val shape: Shape
+    override val shape: Shape
 
     /**
      * The count of dimensions in this structure. It should be equal to size of [shape].
@@ -54,7 +54,7 @@ public interface StructureND<out T> : Featured<StructureFeature> {
      * @return the lazy sequence of pairs of indices to values.
      */
     @PerformancePitfall
-    public fun elements(): Sequence<Pair<IntArray, T>>
+    public fun elements(): Sequence<Pair<IntArray, T>> = indices.asSequence().map { it to get(it) }
 
     /**
      * Feature is some additional structure information that allows to access it special properties or hints.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index d0b0c0b73..c6af75237 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -149,19 +149,19 @@ public interface GroupOps<T> : Algebra<T> {
      * Addition of two elements.
      *
      * @receiver the augend.
-     * @param other the addend.
+     * @param arg the addend.
      * @return the sum.
      */
-    public operator fun T.plus(other: T): T = add(this, other)
+    public operator fun T.plus(arg: T): T = add(this, arg)
 
     /**
      * Subtraction of two elements.
      *
      * @receiver the minuend.
-     * @param other the subtrahend.
+     * @param arg the subtrahend.
      * @return the difference.
      */
-    public operator fun T.minus(other: T): T = add(this, -other)
+    public operator fun T.minus(arg: T): T = add(this, -arg)
     // Dynamic dispatch of operations
     override fun unaryOperationFunction(operation: String): (arg: T) -> T = when (operation) {
         PLUS_OPERATION -> { arg -> +arg }
@@ -219,9 +219,9 @@ public interface RingOps<T> : GroupOps<T> {
      * Multiplies this element by scalar.
      *
      * @receiver the multiplier.
-     * @param other the multiplicand.
+     * @param arg the multiplicand.
      */
-    public operator fun T.times(other: T): T = multiply(this, other)
+    public operator fun T.times(arg: T): T = multiply(this, arg)
 
     override fun binaryOperationFunction(operation: String): (left: T, right: T) -> T = when (operation) {
         TIMES_OPERATION -> ::multiply
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
index 6be3449f9..9d9fc0885 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
@@ -139,10 +139,10 @@ public interface ScaleOperations<T> : Algebra<T> {
      * Multiplication of this number by element.
      *
      * @receiver the multiplier.
-     * @param other the multiplicand.
+     * @param arg the multiplicand.
      * @return the product.
      */
-    public operator fun Number.times(other: T): T = other * this
+    public operator fun Number.times(arg: T): T = arg * this
 }
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index 1168dc6ba..0b111349c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -228,8 +228,8 @@ public object ByteRing : Ring<Byte>, Norm<Byte, Byte>, NumericAlgebra<Byte> {
     override fun norm(arg: Byte): Byte = if (arg > 0) arg else (-arg).toByte()
 
     override inline fun Byte.unaryMinus(): Byte = (-this).toByte()
-    override inline fun Byte.plus(other: Byte): Byte = (this + other).toByte()
-    override inline fun Byte.minus(other: Byte): Byte = (this - other).toByte()
+    override inline fun Byte.plus(arg: Byte): Byte = (this + arg).toByte()
+    override inline fun Byte.minus(arg: Byte): Byte = (this - arg).toByte()
     override inline fun Byte.times(other: Byte): Byte = (this * other).toByte()
 }
 
diff --git a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
index 3a9c242fc..f63efbef2 100644
--- a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
+++ b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
@@ -19,7 +19,7 @@ public object JBigIntegerField : Ring<BigInteger>, NumericAlgebra<BigInteger> {
 
     override fun number(value: Number): BigInteger = BigInteger.valueOf(value.toLong())
     override fun add(left: BigInteger, right: BigInteger): BigInteger = left.add(right)
-    override operator fun BigInteger.minus(other: BigInteger): BigInteger = subtract(other)
+    override operator fun BigInteger.minus(arg: BigInteger): BigInteger = subtract(arg)
     override fun multiply(left: BigInteger, right: BigInteger): BigInteger = left.multiply(right)
 
     override operator fun BigInteger.unaryMinus(): BigInteger = negate()
@@ -40,7 +40,7 @@ public abstract class JBigDecimalFieldBase internal constructor(
         get() = BigDecimal.ONE
 
     override fun add(left: BigDecimal, right: BigDecimal): BigDecimal = left.add(right)
-    override operator fun BigDecimal.minus(other: BigDecimal): BigDecimal = subtract(other)
+    override operator fun BigDecimal.minus(arg: BigDecimal): BigDecimal = subtract(arg)
     override fun number(value: Number): BigDecimal = BigDecimal.valueOf(value.toDouble())
 
     override fun scale(a: BigDecimal, value: Double): BigDecimal =
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
index 3eb6f3aa6..1feb43f33 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
@@ -28,7 +28,7 @@ public class LazyStructureND<out T>(
     @OptIn(PerformancePitfall::class)
     override fun elements(): Sequence<Pair<IntArray, T>> {
         val strides = DefaultStrides(shape)
-        val res = runBlocking { strides.indices().toList().map { index -> index to await(index) } }
+        val res = runBlocking { strides.asSequence().toList().map { index -> index to await(index) } }
         return res.asSequence()
     }
 }
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
index a495577c3..f36f45389 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
@@ -38,7 +38,7 @@ public class IndexedHistogram<T : Comparable<T>, V : Any>(
     override val dimension: Int get() = context.shape.size
 
     override val bins: Iterable<Bin<T>>
-        get() = DefaultStrides(context.shape).indices().map {
+        get() = DefaultStrides(context.shape).asSequence().map {
             context.produceBin(it, values[it])
         }.asIterable()
 
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
index 23dd076e1..e07488741 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
@@ -70,7 +70,7 @@ internal class MultivariateHistogramTest {
             }
             val res = histogram1 - histogram2
             assertTrue {
-                DefaultStrides(shape).indices().all { index ->
+                DefaultStrides(shape).asSequence().all { index ->
                     res.values[index] <= histogram1.values[index]
                 }
             }
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
index 645a14e30..9ff7ffc9c 100644
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
@@ -57,8 +57,8 @@ public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, S
     override inline fun norm(arg: Double): Double = FastMath.abs(arg)
 
     override inline fun Double.unaryMinus(): Double = -this
-    override inline fun Double.plus(other: Double): Double = this + other
-    override inline fun Double.minus(other: Double): Double = this - other
+    override inline fun Double.plus(arg: Double): Double = this + arg
+    override inline fun Double.minus(arg: Double): Double = this - arg
     override inline fun Double.times(other: Double): Double = this * other
     override inline fun Double.div(other: Double): Double = this / other
 }
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index ec0d4c6d9..02959d4fb 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -59,7 +59,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
     override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): MultikTensor<T> {
         val strides = DefaultStrides(shape)
         val memoryView = initMemoryView<T>(strides.linearSize, type)
-        strides.indices().forEachIndexed { linearIndex, tensorIndex ->
+        strides.asSequence().forEachIndexed { linearIndex, tensorIndex ->
             memoryView[linearIndex] = elementAlgebra.initializer(tensorIndex)
         }
         return MultikTensor(NDArray(memoryView, shape = shape, dim = DN(shape.size)))
@@ -131,14 +131,14 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
         get(intArrayOf(0))
     } else null
 
-    override fun T.plus(other: StructureND<T>): MultikTensor<T> =
-        other.plus(this)
+    override fun T.plus(arg: StructureND<T>): MultikTensor<T> =
+        arg.plus(this)
 
     override fun StructureND<T>.plus(arg: T): MultikTensor<T> =
         asMultik().array.deepCopy().apply { plusAssign(arg) }.wrap()
 
-    override fun StructureND<T>.plus(other: StructureND<T>): MultikTensor<T> =
-        asMultik().array.plus(other.asMultik().array).wrap()
+    override fun StructureND<T>.plus(arg: StructureND<T>): MultikTensor<T> =
+        asMultik().array.plus(arg.asMultik().array).wrap()
 
     override fun Tensor<T>.plusAssign(value: T) {
         if (this is MultikTensor) {
@@ -148,21 +148,21 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
         }
     }
 
-    override fun Tensor<T>.plusAssign(other: StructureND<T>) {
+    override fun Tensor<T>.plusAssign(arg: StructureND<T>) {
         if (this is MultikTensor) {
-            array.plusAssign(other.asMultik().array)
+            array.plusAssign(arg.asMultik().array)
         } else {
-            mapInPlace { index, t -> elementAlgebra.add(t, other[index]) }
+            mapInPlace { index, t -> elementAlgebra.add(t, arg[index]) }
         }
     }
 
-    override fun T.minus(other: StructureND<T>): MultikTensor<T> = (-(other.asMultik().array - this)).wrap()
+    override fun T.minus(arg: StructureND<T>): MultikTensor<T> = (-(arg.asMultik().array - this)).wrap()
 
     override fun StructureND<T>.minus(arg: T): MultikTensor<T> =
         asMultik().array.deepCopy().apply { minusAssign(arg) }.wrap()
 
-    override fun StructureND<T>.minus(other: StructureND<T>): MultikTensor<T> =
-        asMultik().array.minus(other.asMultik().array).wrap()
+    override fun StructureND<T>.minus(arg: StructureND<T>): MultikTensor<T> =
+        asMultik().array.minus(arg.asMultik().array).wrap()
 
     override fun Tensor<T>.minusAssign(value: T) {
         if (this is MultikTensor) {
@@ -172,11 +172,11 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
         }
     }
 
-    override fun Tensor<T>.minusAssign(other: StructureND<T>) {
+    override fun Tensor<T>.minusAssign(arg: StructureND<T>) {
         if (this is MultikTensor) {
-            array.minusAssign(other.asMultik().array)
+            array.minusAssign(arg.asMultik().array)
         } else {
-            mapInPlace { index, t -> elementAlgebra.run { t - other[index] } }
+            mapInPlace { index, t -> elementAlgebra.run { t - arg[index] } }
         }
     }
 
@@ -186,8 +186,8 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
     override fun StructureND<T>.times(arg: T): Tensor<T> =
         asMultik().array.deepCopy().apply { timesAssign(arg) }.wrap()
 
-    override fun StructureND<T>.times(other: StructureND<T>): MultikTensor<T> =
-        asMultik().array.times(other.asMultik().array).wrap()
+    override fun StructureND<T>.times(arg: StructureND<T>): MultikTensor<T> =
+        asMultik().array.times(arg.asMultik().array).wrap()
 
     override fun Tensor<T>.timesAssign(value: T) {
         if (this is MultikTensor) {
@@ -197,11 +197,11 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
         }
     }
 
-    override fun Tensor<T>.timesAssign(other: StructureND<T>) {
+    override fun Tensor<T>.timesAssign(arg: StructureND<T>) {
         if (this is MultikTensor) {
-            array.timesAssign(other.asMultik().array)
+            array.timesAssign(arg.asMultik().array)
         } else {
-            mapInPlace { index, t -> elementAlgebra.multiply(t, other[index]) }
+            mapInPlace { index, t -> elementAlgebra.multiply(t, arg[index]) }
         }
     }
 
@@ -212,7 +212,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
 
     override fun StructureND<T>.transpose(i: Int, j: Int): MultikTensor<T> = asMultik().array.transpose(i, j).wrap()
 
-    override fun StructureND<T>.view(shape: IntArray): MultikTensor<T> {
+    override fun Tensor<T>.view(shape: IntArray): MultikTensor<T> {
         require(shape.all { it > 0 })
         require(shape.fold(1, Int::times) == this.shape.size) {
             "Cannot reshape array of size ${this.shape.size} into a new shape ${
@@ -231,7 +231,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
         }.wrap()
     }
 
-    override fun StructureND<T>.viewAs(other: StructureND<T>): MultikTensor<T> = view(other.shape)
+    override fun Tensor<T>.viewAs(other: StructureND<T>): MultikTensor<T> = view(other.shape)
 
     override fun StructureND<T>.dot(other: StructureND<T>): MultikTensor<T> =
         if (this.shape.size == 1 && other.shape.size == 1) {
@@ -283,8 +283,8 @@ public abstract class MultikDivisionTensorAlgebra<T, A : Field<T>>
     override fun StructureND<T>.div(arg: T): MultikTensor<T> =
         asMultik().array.deepCopy().apply { divAssign(arg) }.wrap()
 
-    override fun StructureND<T>.div(other: StructureND<T>): MultikTensor<T> =
-        asMultik().array.div(other.asMultik().array).wrap()
+    override fun StructureND<T>.div(arg: StructureND<T>): MultikTensor<T> =
+        asMultik().array.div(arg.asMultik().array).wrap()
 
     override fun Tensor<T>.divAssign(value: T) {
         if (this is MultikTensor) {
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index 1f312849a..b1cc1f834 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -76,8 +76,8 @@ public sealed interface Nd4jArrayGroupOps<T, out S : Ring<T>> : GroupOpsND<T, S>
     override fun add(left: StructureND<T>, right: StructureND<T>): Nd4jArrayStructure<T> =
         left.ndArray.add(right.ndArray).wrap()
 
-    override operator fun StructureND<T>.minus(other: StructureND<T>): Nd4jArrayStructure<T> =
-        ndArray.sub(other.ndArray).wrap()
+    override operator fun StructureND<T>.minus(arg: StructureND<T>): Nd4jArrayStructure<T> =
+        ndArray.sub(arg.ndArray).wrap()
 
     override operator fun StructureND<T>.unaryMinus(): Nd4jArrayStructure<T> =
         ndArray.neg().wrap()
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index 3fb03c964..33765b40a 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -51,29 +51,29 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
         return structureND(left.shape) { index -> elementAlgebra.transform(left[index], right[index]) }
     }
 
-    override fun T.plus(other: StructureND<T>): Nd4jArrayStructure<T> = other.ndArray.add(this).wrap()
+    override fun T.plus(arg: StructureND<T>): Nd4jArrayStructure<T> = arg.ndArray.add(this).wrap()
     override fun StructureND<T>.plus(arg: T): Nd4jArrayStructure<T> = ndArray.add(arg).wrap()
 
-    override fun StructureND<T>.plus(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.add(other.ndArray).wrap()
+    override fun StructureND<T>.plus(arg: StructureND<T>): Nd4jArrayStructure<T> = ndArray.add(arg.ndArray).wrap()
 
     override fun Tensor<T>.plusAssign(value: T) {
         ndArray.addi(value)
     }
 
-    override fun Tensor<T>.plusAssign(other: StructureND<T>) {
-        ndArray.addi(other.ndArray)
+    override fun Tensor<T>.plusAssign(arg: StructureND<T>) {
+        ndArray.addi(arg.ndArray)
     }
 
-    override fun T.minus(other: StructureND<T>): Nd4jArrayStructure<T> = other.ndArray.rsub(this).wrap()
+    override fun T.minus(arg: StructureND<T>): Nd4jArrayStructure<T> = arg.ndArray.rsub(this).wrap()
     override fun StructureND<T>.minus(arg: T): Nd4jArrayStructure<T> = ndArray.sub(arg).wrap()
-    override fun StructureND<T>.minus(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.sub(other.ndArray).wrap()
+    override fun StructureND<T>.minus(arg: StructureND<T>): Nd4jArrayStructure<T> = ndArray.sub(arg.ndArray).wrap()
 
     override fun Tensor<T>.minusAssign(value: T) {
         ndArray.rsubi(value)
     }
 
-    override fun Tensor<T>.minusAssign(other: StructureND<T>) {
-        ndArray.subi(other.ndArray)
+    override fun Tensor<T>.minusAssign(arg: StructureND<T>) {
+        ndArray.subi(arg.ndArray)
     }
 
     override fun T.times(arg: StructureND<T>): Nd4jArrayStructure<T> = arg.ndArray.mul(this).wrap()
@@ -81,14 +81,14 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
     override fun StructureND<T>.times(arg: T): Nd4jArrayStructure<T> =
         ndArray.mul(arg).wrap()
 
-    override fun StructureND<T>.times(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.mul(other.ndArray).wrap()
+    override fun StructureND<T>.times(arg: StructureND<T>): Nd4jArrayStructure<T> = ndArray.mul(arg.ndArray).wrap()
 
     override fun Tensor<T>.timesAssign(value: T) {
         ndArray.muli(value)
     }
 
-    override fun Tensor<T>.timesAssign(other: StructureND<T>) {
-        ndArray.mmuli(other.ndArray)
+    override fun Tensor<T>.timesAssign(arg: StructureND<T>) {
+        ndArray.mmuli(arg.ndArray)
     }
 
     override fun StructureND<T>.unaryMinus(): Nd4jArrayStructure<T> = ndArray.neg().wrap()
@@ -105,8 +105,8 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
     override fun StructureND<T>.max(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         ndArray.max(keepDim, dim).wrap()
 
-    override fun StructureND<T>.view(shape: IntArray): Nd4jArrayStructure<T> = ndArray.reshape(shape).wrap()
-    override fun StructureND<T>.viewAs(other: StructureND<T>): Nd4jArrayStructure<T> = view(other.shape)
+    override fun Tensor<T>.view(shape: IntArray): Nd4jArrayStructure<T> = ndArray.reshape(shape).wrap()
+    override fun Tensor<T>.viewAs(other: StructureND<T>): Nd4jArrayStructure<T> = view(other.shape)
 
     override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         ndBase.get().argmax(ndArray, keepDim, dim).wrap()
@@ -142,7 +142,7 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
 
     override fun T.div(arg: StructureND<T>): Nd4jArrayStructure<T> = arg.ndArray.rdiv(this).wrap()
     override fun StructureND<T>.div(arg: T): Nd4jArrayStructure<T> = ndArray.div(arg).wrap()
-    override fun StructureND<T>.div(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.div(other.ndArray).wrap()
+    override fun StructureND<T>.div(arg: StructureND<T>): Nd4jArrayStructure<T> = ndArray.div(arg.ndArray).wrap()
 
     override fun Tensor<T>.divAssign(value: T) {
         ndArray.divi(value)
@@ -172,7 +172,7 @@ public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double, DoubleField> {
     override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): Nd4jArrayStructure<Double> {
         val array: INDArray = Nd4j.zeros(*shape)
         val indices = DefaultStrides(shape)
-        indices.indices().forEach { index ->
+        indices.asSequence().forEach { index ->
             array.putScalar(index, elementAlgebra.initializer(index))
         }
         return array.wrap()
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 28d7c4677..8c445cf2d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -32,13 +32,13 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
         valueOrNull() ?: throw IllegalArgumentException("Inconsistent value for tensor of with $shape shape")
 
     /**
-     * Each element of the tensor [other] is added to this value.
+     * Each element of the tensor [arg] is added to this value.
      * The resulting tensor is returned.
      *
-     * @param other tensor to be added.
-     * @return the sum of this value and tensor [other].
+     * @param arg tensor to be added.
+     * @return the sum of this value and tensor [arg].
      */
-    override operator fun T.plus(other: StructureND<T>): Tensor<T>
+    override operator fun T.plus(arg: StructureND<T>): Tensor<T>
 
     /**
      * Adds the scalar [arg] to each element of this tensor and returns a new resulting tensor.
@@ -49,13 +49,13 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
     override operator fun StructureND<T>.plus(arg: T): Tensor<T>
 
     /**
-     * Each element of the tensor [other] is added to each element of this tensor.
+     * Each element of the tensor [arg] is added to each element of this tensor.
      * The resulting tensor is returned.
      *
-     * @param other tensor to be added.
-     * @return the sum of this tensor and [other].
+     * @param arg tensor to be added.
+     * @return the sum of this tensor and [arg].
      */
-    override operator fun StructureND<T>.plus(other: StructureND<T>): Tensor<T>
+    override operator fun StructureND<T>.plus(arg: StructureND<T>): Tensor<T>
 
     /**
      * Adds the scalar [value] to each element of this tensor.
@@ -65,20 +65,20 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
     public operator fun Tensor<T>.plusAssign(value: T)
 
     /**
-     * Each element of the tensor [other] is added to each element of this tensor.
+     * Each element of the tensor [arg] is added to each element of this tensor.
      *
-     * @param other tensor to be added.
+     * @param arg tensor to be added.
      */
-    public operator fun Tensor<T>.plusAssign(other: StructureND<T>)
+    public operator fun Tensor<T>.plusAssign(arg: StructureND<T>)
 
     /**
-     * Each element of the tensor [other] is subtracted from this value.
+     * Each element of the tensor [arg] is subtracted from this value.
      * The resulting tensor is returned.
      *
-     * @param other tensor to be subtracted.
-     * @return the difference between this value and tensor [other].
+     * @param arg tensor to be subtracted.
+     * @return the difference between this value and tensor [arg].
      */
-    override operator fun T.minus(other: StructureND<T>): Tensor<T>
+    override operator fun T.minus(arg: StructureND<T>): Tensor<T>
 
     /**
      * Subtracts the scalar [arg] from each element of this tensor and returns a new resulting tensor.
@@ -89,13 +89,13 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
     override operator fun StructureND<T>.minus(arg: T): Tensor<T>
 
     /**
-     * Each element of the tensor [other] is subtracted from each element of this tensor.
+     * Each element of the tensor [arg] is subtracted from each element of this tensor.
      * The resulting tensor is returned.
      *
-     * @param other tensor to be subtracted.
-     * @return the difference between this tensor and [other].
+     * @param arg tensor to be subtracted.
+     * @return the difference between this tensor and [arg].
      */
-    override operator fun StructureND<T>.minus(other: StructureND<T>): Tensor<T>
+    override operator fun StructureND<T>.minus(arg: StructureND<T>): Tensor<T>
 
     /**
      * Subtracts the scalar [value] from each element of this tensor.
@@ -105,11 +105,11 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
     public operator fun Tensor<T>.minusAssign(value: T)
 
     /**
-     * Each element of the tensor [other] is subtracted from each element of this tensor.
+     * Each element of the tensor [arg] is subtracted from each element of this tensor.
      *
-     * @param other tensor to be subtracted.
+     * @param arg tensor to be subtracted.
      */
-    public operator fun Tensor<T>.minusAssign(other: StructureND<T>)
+    public operator fun Tensor<T>.minusAssign(arg: StructureND<T>)
 
 
     /**
@@ -130,13 +130,13 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
     override operator fun StructureND<T>.times(arg: T): Tensor<T>
 
     /**
-     * Each element of the tensor [other] is multiplied by each element of this tensor.
+     * Each element of the tensor [arg] is multiplied by each element of this tensor.
      * The resulting tensor is returned.
      *
-     * @param other tensor to be multiplied.
-     * @return the product of this tensor and [other].
+     * @param arg tensor to be multiplied.
+     * @return the product of this tensor and [arg].
      */
-    override operator fun StructureND<T>.times(other: StructureND<T>): Tensor<T>
+    override operator fun StructureND<T>.times(arg: StructureND<T>): Tensor<T>
 
     /**
      * Multiplies the scalar [value] by each element of this tensor.
@@ -146,11 +146,11 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
     public operator fun Tensor<T>.timesAssign(value: T)
 
     /**
-     * Each element of the tensor [other] is multiplied by each element of this tensor.
+     * Each element of the tensor [arg] is multiplied by each element of this tensor.
      *
-     * @param other tensor to be multiplied.
+     * @param arg tensor to be multiplied.
      */
-    public operator fun Tensor<T>.timesAssign(other: StructureND<T>)
+    public operator fun Tensor<T>.timesAssign(arg: StructureND<T>)
 
     /**
      * Numerical negative, element-wise.
@@ -186,7 +186,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param shape the desired size
      * @return tensor with new shape
      */
-    public fun StructureND<T>.view(shape: IntArray): Tensor<T>
+    public fun Tensor<T>.view(shape: IntArray): Tensor<T>
 
     /**
      * View this tensor as the same size as [other].
@@ -196,7 +196,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param other the result tensor has the same size as other.
      * @return the result tensor with the same size as other.
      */
-    public fun StructureND<T>.viewAs(other: StructureND<T>): Tensor<T>
+    public fun Tensor<T>.viewAs(other: StructureND<T>): Tensor<T>
 
     /**
      * Matrix product of two tensors.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
index dece54834..304cc66cc 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
@@ -35,13 +35,13 @@ public interface TensorPartialDivisionAlgebra<T, A : Field<T>> : TensorAlgebra<T
     override operator fun StructureND<T>.div(arg: T): Tensor<T>
 
     /**
-     * Each element of the tensor [other] is divided by each element of this tensor.
+     * Each element of the tensor [arg] is divided by each element of this tensor.
      * The resulting tensor is returned.
      *
-     * @param other tensor to be divided by.
-     * @return the division of this tensor by [other].
+     * @param arg tensor to be divided by.
+     * @return the division of this tensor by [arg].
      */
-    override operator fun StructureND<T>.div(other: StructureND<T>): Tensor<T>
+    override operator fun StructureND<T>.div(arg: StructureND<T>): Tensor<T>
 
     override fun divide(left: StructureND<T>, right: StructureND<T>): StructureND<T> = left.div(right)
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index f53a0ca55..83d1f7b35 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -19,8 +19,8 @@ import space.kscience.kmath.tensors.core.internal.tensor
  */
 public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
-    override fun StructureND<Double>.plus(other: StructureND<Double>): DoubleTensor {
-        val broadcast = broadcastTensors(tensor, other.tensor)
+    override fun StructureND<Double>.plus(arg: StructureND<Double>): DoubleTensor {
+        val broadcast = broadcastTensors(tensor, arg.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
@@ -29,16 +29,16 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.plusAssign(other: StructureND<Double>) {
-        val newOther = broadcastTo(other.tensor, tensor.shape)
+    override fun Tensor<Double>.plusAssign(arg: StructureND<Double>) {
+        val newOther = broadcastTo(arg.tensor, tensor.shape)
         for (i in 0 until tensor.indices.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
-    override fun StructureND<Double>.minus(other: StructureND<Double>): DoubleTensor {
-        val broadcast = broadcastTensors(tensor, other.tensor)
+    override fun StructureND<Double>.minus(arg: StructureND<Double>): DoubleTensor {
+        val broadcast = broadcastTensors(tensor, arg.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
@@ -47,16 +47,16 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.minusAssign(other: StructureND<Double>) {
-        val newOther = broadcastTo(other.tensor, tensor.shape)
+    override fun Tensor<Double>.minusAssign(arg: StructureND<Double>) {
+        val newOther = broadcastTo(arg.tensor, tensor.shape)
         for (i in 0 until tensor.indices.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
-    override fun StructureND<Double>.times(other: StructureND<Double>): DoubleTensor {
-        val broadcast = broadcastTensors(tensor, other.tensor)
+    override fun StructureND<Double>.times(arg: StructureND<Double>): DoubleTensor {
+        val broadcast = broadcastTensors(tensor, arg.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
@@ -66,8 +66,8 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.timesAssign(other: StructureND<Double>) {
-        val newOther = broadcastTo(other.tensor, tensor.shape)
+    override fun Tensor<Double>.timesAssign(arg: StructureND<Double>) {
+        val newOther = broadcastTo(arg.tensor, tensor.shape)
         for (i in 0 until tensor.indices.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index ba3331067..eab4d3d5b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -23,8 +23,7 @@ public open class BufferedTensor<T> internal constructor(
     /**
      * Buffer strides based on [TensorLinearStructure] implementation
      */
-    public val indices: Strides
-        get() = TensorLinearStructure(shape)
+    override val indices: Strides get() = TensorLinearStructure(shape)
 
     /**
      * Number of elements in tensor
@@ -39,7 +38,7 @@ public open class BufferedTensor<T> internal constructor(
     }
 
     @PerformancePitfall
-    override fun elements(): Sequence<Pair<IntArray, T>> = indices.indices().map {
+    override fun elements(): Sequence<Pair<IntArray, T>> = indices.asSequence().map {
         it to get(it)
     }
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index be87f8019..8b6f6403f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -112,7 +112,7 @@ public open class DoubleTensorAlgebra :
      */
     override fun structureND(shape: IntArray, initializer: DoubleField.(IntArray) -> Double): DoubleTensor = fromArray(
         shape,
-        TensorLinearStructure(shape).indices().map { DoubleField.initializer(it) }.toMutableList().toDoubleArray()
+        TensorLinearStructure(shape).asSequence().map { DoubleField.initializer(it) }.toMutableList().toDoubleArray()
     )
 
     override operator fun StructureND<Double>.get(i: Int): DoubleTensor {
@@ -201,19 +201,19 @@ public open class DoubleTensorAlgebra :
     public fun StructureND<Double>.copy(): DoubleTensor =
         DoubleTensor(tensor.shape, tensor.mutableBuffer.array().copyOf(), tensor.bufferStart)
 
-    override fun Double.plus(other: StructureND<Double>): DoubleTensor {
-        val resBuffer = DoubleArray(other.tensor.numElements) { i ->
-            other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i] + this
+    override fun Double.plus(arg: StructureND<Double>): DoubleTensor {
+        val resBuffer = DoubleArray(arg.tensor.numElements) { i ->
+            arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i] + this
         }
-        return DoubleTensor(other.shape, resBuffer)
+        return DoubleTensor(arg.shape, resBuffer)
     }
 
     override fun StructureND<Double>.plus(arg: Double): DoubleTensor = arg + tensor
 
-    override fun StructureND<Double>.plus(other: StructureND<Double>): DoubleTensor {
-        checkShapesCompatible(tensor, other.tensor)
+    override fun StructureND<Double>.plus(arg: StructureND<Double>): DoubleTensor {
+        checkShapesCompatible(tensor, arg.tensor)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[i] + other.tensor.mutableBuffer.array()[i]
+            tensor.mutableBuffer.array()[i] + arg.tensor.mutableBuffer.array()[i]
         }
         return DoubleTensor(tensor.shape, resBuffer)
     }
@@ -224,19 +224,19 @@ public open class DoubleTensorAlgebra :
         }
     }
 
-    override fun Tensor<Double>.plusAssign(other: StructureND<Double>) {
-        checkShapesCompatible(tensor, other.tensor)
+    override fun Tensor<Double>.plusAssign(arg: StructureND<Double>) {
+        checkShapesCompatible(tensor, arg.tensor)
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
-                other.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
-    override fun Double.minus(other: StructureND<Double>): DoubleTensor {
-        val resBuffer = DoubleArray(other.tensor.numElements) { i ->
-            this - other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i]
+    override fun Double.minus(arg: StructureND<Double>): DoubleTensor {
+        val resBuffer = DoubleArray(arg.tensor.numElements) { i ->
+            this - arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i]
         }
-        return DoubleTensor(other.shape, resBuffer)
+        return DoubleTensor(arg.shape, resBuffer)
     }
 
     override fun StructureND<Double>.minus(arg: Double): DoubleTensor {
@@ -246,10 +246,10 @@ public open class DoubleTensorAlgebra :
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun StructureND<Double>.minus(other: StructureND<Double>): DoubleTensor {
-        checkShapesCompatible(tensor, other)
+    override fun StructureND<Double>.minus(arg: StructureND<Double>): DoubleTensor {
+        checkShapesCompatible(tensor, arg)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[i] - other.tensor.mutableBuffer.array()[i]
+            tensor.mutableBuffer.array()[i] - arg.tensor.mutableBuffer.array()[i]
         }
         return DoubleTensor(tensor.shape, resBuffer)
     }
@@ -260,11 +260,11 @@ public open class DoubleTensorAlgebra :
         }
     }
 
-    override fun Tensor<Double>.minusAssign(other: StructureND<Double>) {
-        checkShapesCompatible(tensor, other)
+    override fun Tensor<Double>.minusAssign(arg: StructureND<Double>) {
+        checkShapesCompatible(tensor, arg)
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
-                other.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
@@ -277,11 +277,11 @@ public open class DoubleTensorAlgebra :
 
     override fun StructureND<Double>.times(arg: Double): DoubleTensor = arg * tensor
 
-    override fun StructureND<Double>.times(other: StructureND<Double>): DoubleTensor {
-        checkShapesCompatible(tensor, other)
+    override fun StructureND<Double>.times(arg: StructureND<Double>): DoubleTensor {
+        checkShapesCompatible(tensor, arg)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
             tensor.mutableBuffer.array()[tensor.bufferStart + i] *
-                    other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i]
+                    arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i]
         }
         return DoubleTensor(tensor.shape, resBuffer)
     }
@@ -292,11 +292,11 @@ public open class DoubleTensorAlgebra :
         }
     }
 
-    override fun Tensor<Double>.timesAssign(other: StructureND<Double>) {
-        checkShapesCompatible(tensor, other)
+    override fun Tensor<Double>.timesAssign(arg: StructureND<Double>) {
+        checkShapesCompatible(tensor, arg)
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
-                other.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
@@ -368,12 +368,12 @@ public open class DoubleTensorAlgebra :
         return resTensor
     }
 
-    override fun StructureND<Double>.view(shape: IntArray): DoubleTensor {
+    override fun Tensor<Double>.view(shape: IntArray): DoubleTensor {
         checkView(tensor, shape)
         return DoubleTensor(shape, tensor.mutableBuffer.array(), tensor.bufferStart)
     }
 
-    override fun StructureND<Double>.viewAs(other: StructureND<Double>): DoubleTensor =
+    override fun Tensor<Double>.viewAs(other: StructureND<Double>): DoubleTensor =
         tensor.view(other.shape)
 
     override infix fun StructureND<Double>.dot(other: StructureND<Double>): DoubleTensor {
@@ -584,7 +584,7 @@ public open class DoubleTensorAlgebra :
         }
         val resNumElements = resShape.reduce(Int::times)
         val resTensor = DoubleTensor(resShape, DoubleArray(resNumElements) { 0.0 }, 0)
-        for (index in resTensor.indices.indices()) {
+        for (index in resTensor.indices.asSequence()) {
             val prefix = index.take(dim).toIntArray()
             val suffix = index.takeLast(dimension - dim - 1).toIntArray()
             resTensor[index] = foldFunction(DoubleArray(shape[dim]) { i ->
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index 4123ff923..d3d327f66 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -22,7 +22,7 @@ internal fun BufferedTensor<Double>.asTensor(): DoubleTensor =
 internal fun <T> StructureND<T>.copyToBufferedTensor(): BufferedTensor<T> =
     BufferedTensor(
         this.shape,
-        TensorLinearStructure(this.shape).indices().map(this::get).toMutableList().asMutableBuffer(), 0
+        TensorLinearStructure(this.shape).asSequence().map(this::get).toMutableList().asMutableBuffer(), 0
     )
 
 internal fun <T> StructureND<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
index aaa113e56..c50404c9c 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
@@ -28,7 +28,7 @@ public open class ViktorFieldOpsND :
 
     override fun structureND(shape: IntArray, initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
         F64Array(*shape).apply {
-            DefaultStrides(shape).indices().forEach { index ->
+            DefaultStrides(shape).asSequence().forEach { index ->
                 set(value = DoubleField.initializer(index), indices = index)
             }
         }.asStructure()
@@ -37,7 +37,7 @@ public open class ViktorFieldOpsND :
 
     override fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): ViktorStructureND =
         F64Array(*shape).apply {
-            DefaultStrides(shape).indices().forEach { index ->
+            DefaultStrides(shape).asSequence().forEach { index ->
                 set(value = DoubleField.transform(this@map[index]), indices = index)
             }
         }.asStructure()
@@ -45,7 +45,7 @@ public open class ViktorFieldOpsND :
     override fun StructureND<Double>.mapIndexed(
         transform: DoubleField.(index: IntArray, Double) -> Double,
     ): ViktorStructureND = F64Array(*shape).apply {
-        DefaultStrides(shape).indices().forEach { index ->
+        DefaultStrides(shape).asSequence().forEach { index ->
             set(value = DoubleField.transform(index, this@mapIndexed[index]), indices = index)
         }
     }.asStructure()
@@ -57,7 +57,7 @@ public open class ViktorFieldOpsND :
     ): ViktorStructureND {
         require(left.shape.contentEquals(right.shape))
         return F64Array(*left.shape).apply {
-            DefaultStrides(left.shape).indices().forEach { index ->
+            DefaultStrides(left.shape).asSequence().forEach { index ->
                 set(value = DoubleField.transform(left[index], right[index]), indices = index)
             }
         }.asStructure()
@@ -69,11 +69,11 @@ public open class ViktorFieldOpsND :
     override fun scale(a: StructureND<Double>, value: Double): ViktorStructureND =
         (a.f64Buffer * value).asStructure()
 
-    override fun StructureND<Double>.plus(other: StructureND<Double>): ViktorStructureND =
-        (f64Buffer + other.f64Buffer).asStructure()
+    override fun StructureND<Double>.plus(arg: StructureND<Double>): ViktorStructureND =
+        (f64Buffer + arg.f64Buffer).asStructure()
 
-    override fun StructureND<Double>.minus(other: StructureND<Double>): ViktorStructureND =
-        (f64Buffer - other.f64Buffer).asStructure()
+    override fun StructureND<Double>.minus(arg: StructureND<Double>): ViktorStructureND =
+        (f64Buffer - arg.f64Buffer).asStructure()
 
     override fun StructureND<Double>.times(k: Number): ViktorStructureND =
         (f64Buffer * k.toDouble()).asStructure()
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index 0d29983f9..4926652ed 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -22,7 +22,7 @@ public class ViktorStructureND(public val f64Buffer: F64Array) : MutableStructur
 
     @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, Double>> =
-        DefaultStrides(shape).indices().map { it to get(it) }
+        DefaultStrides(shape).asSequence().map { it to get(it) }
 }
 
 public fun F64Array.asStructure(): ViktorStructureND = ViktorStructureND(this)
-- 
2.34.1


From 46e7da9ae00ae6470201624583adc47e2187a840 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 28 Oct 2021 11:18:16 +0300
Subject: [PATCH 367/713] Tensor algebra generified

---
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |  8 ++---
 .../kscience/kmath/operations/Algebra.kt      |  4 +--
 .../kmath/operations/DoubleBufferOps.kt       | 14 ++++----
 .../kscience/kmath/operations/numbers.kt      | 36 +++++++++----------
 .../kscience/kmath/jafama/KMathJafama.kt      | 12 +++----
 .../kmath/multik/MultikTensorAlgebra.kt       |  6 ++--
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |  4 +--
 .../api/TensorPartialDivisionAlgebra.kt       |  6 ++--
 .../core/BroadcastDoubleTensorAlgebra.kt      |  8 ++---
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 14 ++++----
 10 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 8cc5472a9..7285fdb24 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -81,8 +81,8 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
 
     override fun StructureND<Double>.unaryMinus(): DoubleBufferND = mapInline(toBufferND()) { -it }
 
-    override fun StructureND<Double>.div(other: StructureND<Double>): DoubleBufferND =
-        zipInline(toBufferND(), other.toBufferND()) { l, r -> l / r }
+    override fun StructureND<Double>.div(arg: StructureND<Double>): DoubleBufferND =
+        zipInline(toBufferND(), arg.toBufferND()) { l, r -> l / r }
 
     override fun divide(left: StructureND<Double>, right: StructureND<Double>): DoubleBufferND =
         zipInline(left.toBufferND(), right.toBufferND()) { l: Double, r: Double -> l / r }
@@ -101,8 +101,8 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
     override fun StructureND<Double>.minus(arg: StructureND<Double>): DoubleBufferND =
         zipInline(toBufferND(), arg.toBufferND()) { l: Double, r: Double -> l - r }
 
-    override fun StructureND<Double>.times(other: StructureND<Double>): DoubleBufferND =
-        zipInline(toBufferND(), other.toBufferND()) { l: Double, r: Double -> l * r }
+    override fun StructureND<Double>.times(arg: StructureND<Double>): DoubleBufferND =
+        zipInline(toBufferND(), arg.toBufferND()) { l: Double, r: Double -> l * r }
 
     override fun StructureND<Double>.times(k: Number): DoubleBufferND =
         mapInline(toBufferND()) { it * k.toDouble() }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index c6af75237..0e5c6de1f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -270,10 +270,10 @@ public interface FieldOps<T> : RingOps<T> {
      * Division of two elements.
      *
      * @receiver the dividend.
-     * @param other the divisor.
+     * @param arg the divisor.
      * @return the quotient.
      */
-    public operator fun T.div(other: T): T = divide(this, other)
+    public operator fun T.div(arg: T): T = divide(this, arg)
 
     override fun binaryOperationFunction(operation: String): (left: T, right: T) -> T = when (operation) {
         DIV_OPERATION -> ::divide
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index 29b25aae8..3d51b3d32 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -34,18 +34,18 @@ public abstract class DoubleBufferOps : ExtendedFieldOps<Buffer<Double>>, Norm<B
         } else DoubleBuffer(DoubleArray(left.size) { left[it] + right[it] })
     }
 
-    override fun Buffer<Double>.plus(other: Buffer<Double>): DoubleBuffer = add(this, other)
+    override fun Buffer<Double>.plus(arg: Buffer<Double>): DoubleBuffer = add(this, arg)
 
-    override fun Buffer<Double>.minus(other: Buffer<Double>): DoubleBuffer {
-        require(other.size == this.size) {
-            "The size of the first buffer ${this.size} should be the same as for second one: ${other.size} "
+    override fun Buffer<Double>.minus(arg: Buffer<Double>): DoubleBuffer {
+        require(arg.size == this.size) {
+            "The size of the first buffer ${this.size} should be the same as for second one: ${arg.size} "
         }
 
-        return if (this is DoubleBuffer && other is DoubleBuffer) {
+        return if (this is DoubleBuffer && arg is DoubleBuffer) {
             val aArray = this.array
-            val bArray = other.array
+            val bArray = arg.array
             DoubleBuffer(DoubleArray(this.size) { aArray[it] - bArray[it] })
-        } else DoubleBuffer(DoubleArray(this.size) { this[it] - other[it] })
+        } else DoubleBuffer(DoubleArray(this.size) { this[it] - arg[it] })
     }
 
     //
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index 0b111349c..ceb85f3ab 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -102,10 +102,10 @@ public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOp
     override inline fun norm(arg: Double): Double = abs(arg)
 
     override inline fun Double.unaryMinus(): Double = -this
-    override inline fun Double.plus(other: Double): Double = this + other
-    override inline fun Double.minus(other: Double): Double = this - other
-    override inline fun Double.times(other: Double): Double = this * other
-    override inline fun Double.div(other: Double): Double = this / other
+    override inline fun Double.plus(arg: Double): Double = this + arg
+    override inline fun Double.minus(arg: Double): Double = this - arg
+    override inline fun Double.times(arg: Double): Double = this * arg
+    override inline fun Double.div(arg: Double): Double = this / arg
 }
 
 public val Double.Companion.algebra: DoubleField get() = DoubleField
@@ -155,10 +155,10 @@ public object FloatField : ExtendedField<Float>, Norm<Float, Float> {
     override inline fun norm(arg: Float): Float = abs(arg)
 
     override inline fun Float.unaryMinus(): Float = -this
-    override inline fun Float.plus(other: Float): Float = this + other
-    override inline fun Float.minus(other: Float): Float = this - other
-    override inline fun Float.times(other: Float): Float = this * other
-    override inline fun Float.div(other: Float): Float = this / other
+    override inline fun Float.plus(arg: Float): Float = this + arg
+    override inline fun Float.minus(arg: Float): Float = this - arg
+    override inline fun Float.times(arg: Float): Float = this * arg
+    override inline fun Float.div(arg: Float): Float = this / arg
 }
 
 public val Float.Companion.algebra: FloatField get() = FloatField
@@ -180,9 +180,9 @@ public object IntRing : Ring<Int>, Norm<Int, Int>, NumericAlgebra<Int> {
     override inline fun norm(arg: Int): Int = abs(arg)
 
     override inline fun Int.unaryMinus(): Int = -this
-    override inline fun Int.plus(other: Int): Int = this + other
-    override inline fun Int.minus(other: Int): Int = this - other
-    override inline fun Int.times(other: Int): Int = this * other
+    override inline fun Int.plus(arg: Int): Int = this + arg
+    override inline fun Int.minus(arg: Int): Int = this - arg
+    override inline fun Int.times(arg: Int): Int = this * arg
 }
 
 public val Int.Companion.algebra: IntRing get() = IntRing
@@ -204,9 +204,9 @@ public object ShortRing : Ring<Short>, Norm<Short, Short>, NumericAlgebra<Short>
     override fun norm(arg: Short): Short = if (arg > 0) arg else (-arg).toShort()
 
     override inline fun Short.unaryMinus(): Short = (-this).toShort()
-    override inline fun Short.plus(other: Short): Short = (this + other).toShort()
-    override inline fun Short.minus(other: Short): Short = (this - other).toShort()
-    override inline fun Short.times(other: Short): Short = (this * other).toShort()
+    override inline fun Short.plus(arg: Short): Short = (this + arg).toShort()
+    override inline fun Short.minus(arg: Short): Short = (this - arg).toShort()
+    override inline fun Short.times(arg: Short): Short = (this * arg).toShort()
 }
 
 public val Short.Companion.algebra: ShortRing get() = ShortRing
@@ -230,7 +230,7 @@ public object ByteRing : Ring<Byte>, Norm<Byte, Byte>, NumericAlgebra<Byte> {
     override inline fun Byte.unaryMinus(): Byte = (-this).toByte()
     override inline fun Byte.plus(arg: Byte): Byte = (this + arg).toByte()
     override inline fun Byte.minus(arg: Byte): Byte = (this - arg).toByte()
-    override inline fun Byte.times(other: Byte): Byte = (this * other).toByte()
+    override inline fun Byte.times(arg: Byte): Byte = (this * arg).toByte()
 }
 
 public val Byte.Companion.algebra: ByteRing get() = ByteRing
@@ -252,9 +252,9 @@ public object LongRing : Ring<Long>, Norm<Long, Long>, NumericAlgebra<Long> {
     override fun norm(arg: Long): Long = abs(arg)
 
     override inline fun Long.unaryMinus(): Long = (-this)
-    override inline fun Long.plus(other: Long): Long = (this + other)
-    override inline fun Long.minus(other: Long): Long = (this - other)
-    override inline fun Long.times(other: Long): Long = (this * other)
+    override inline fun Long.plus(arg: Long): Long = (this + arg)
+    override inline fun Long.minus(arg: Long): Long = (this - arg)
+    override inline fun Long.times(arg: Long): Long = (this * arg)
 }
 
 public val Long.Companion.algebra: LongRing get() = LongRing
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
index 9ff7ffc9c..64a935705 100644
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
@@ -59,8 +59,8 @@ public object JafamaDoubleField : ExtendedField<Double>, Norm<Double, Double>, S
     override inline fun Double.unaryMinus(): Double = -this
     override inline fun Double.plus(arg: Double): Double = this + arg
     override inline fun Double.minus(arg: Double): Double = this - arg
-    override inline fun Double.times(other: Double): Double = this * other
-    override inline fun Double.div(other: Double): Double = this / other
+    override inline fun Double.times(arg: Double): Double = this * arg
+    override inline fun Double.div(arg: Double): Double = this / arg
 }
 
 /**
@@ -108,8 +108,8 @@ public object StrictJafamaDoubleField : ExtendedField<Double>, Norm<Double, Doub
     override inline fun norm(arg: Double): Double = StrictFastMath.abs(arg)
 
     override inline fun Double.unaryMinus(): Double = -this
-    override inline fun Double.plus(other: Double): Double = this + other
-    override inline fun Double.minus(other: Double): Double = this - other
-    override inline fun Double.times(other: Double): Double = this * other
-    override inline fun Double.div(other: Double): Double = this / other
+    override inline fun Double.plus(arg: Double): Double = this + arg
+    override inline fun Double.minus(arg: Double): Double = this - arg
+    override inline fun Double.times(arg: Double): Double = this * arg
+    override inline fun Double.div(arg: Double): Double = this / arg
 }
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index 02959d4fb..c8fc23a2c 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -294,11 +294,11 @@ public abstract class MultikDivisionTensorAlgebra<T, A : Field<T>>
         }
     }
 
-    override fun Tensor<T>.divAssign(other: StructureND<T>) {
+    override fun Tensor<T>.divAssign(arg: StructureND<T>) {
         if (this is MultikTensor) {
-            array.divAssign(other.asMultik().array)
+            array.divAssign(arg.asMultik().array)
         } else {
-            mapInPlace { index, t -> elementAlgebra.divide(t, other[index]) }
+            mapInPlace { index, t -> elementAlgebra.divide(t, arg[index]) }
         }
     }
 }
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index 33765b40a..a537c0629 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -148,8 +148,8 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
         ndArray.divi(value)
     }
 
-    override fun Tensor<T>.divAssign(other: StructureND<T>) {
-        ndArray.divi(other.ndArray)
+    override fun Tensor<T>.divAssign(arg: StructureND<T>) {
+        ndArray.divi(arg.ndArray)
     }
 
     override fun StructureND<T>.variance(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
index 304cc66cc..0a1e09081 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
@@ -53,9 +53,9 @@ public interface TensorPartialDivisionAlgebra<T, A : Field<T>> : TensorAlgebra<T
     public operator fun Tensor<T>.divAssign(value: T)
 
     /**
-     * Each element of this tensor is divided by each element of the [other] tensor.
+     * Each element of this tensor is divided by each element of the [arg] tensor.
      *
-     * @param other tensor to be divided by.
+     * @param arg tensor to be divided by.
      */
-    public operator fun Tensor<T>.divAssign(other: StructureND<T>)
+    public operator fun Tensor<T>.divAssign(arg: StructureND<T>)
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index 83d1f7b35..7353ecab1 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -74,8 +74,8 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         }
     }
 
-    override fun StructureND<Double>.div(other: StructureND<Double>): DoubleTensor {
-        val broadcast = broadcastTensors(tensor, other.tensor)
+    override fun StructureND<Double>.div(arg: StructureND<Double>): DoubleTensor {
+        val broadcast = broadcastTensors(tensor, arg.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
@@ -85,8 +85,8 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
-    override fun Tensor<Double>.divAssign(other: StructureND<Double>) {
-        val newOther = broadcastTo(other.tensor, tensor.shape)
+    override fun Tensor<Double>.divAssign(arg: StructureND<Double>) {
+        val newOther = broadcastTo(arg.tensor, tensor.shape)
         for (i in 0 until tensor.indices.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] /=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 8b6f6403f..d7aa18c3d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -314,11 +314,11 @@ public open class DoubleTensorAlgebra :
         return DoubleTensor(shape, resBuffer)
     }
 
-    override fun StructureND<Double>.div(other: StructureND<Double>): DoubleTensor {
-        checkShapesCompatible(tensor, other)
+    override fun StructureND<Double>.div(arg: StructureND<Double>): DoubleTensor {
+        checkShapesCompatible(tensor, arg)
         val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[other.tensor.bufferStart + i] /
-                    other.tensor.mutableBuffer.array()[other.tensor.bufferStart + i]
+            tensor.mutableBuffer.array()[arg.tensor.bufferStart + i] /
+                    arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i]
         }
         return DoubleTensor(tensor.shape, resBuffer)
     }
@@ -329,11 +329,11 @@ public open class DoubleTensorAlgebra :
         }
     }
 
-    override fun Tensor<Double>.divAssign(other: StructureND<Double>) {
-        checkShapesCompatible(tensor, other)
+    override fun Tensor<Double>.divAssign(arg: StructureND<Double>) {
+        checkShapesCompatible(tensor, arg)
         for (i in 0 until tensor.numElements) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] /=
-                other.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
         }
     }
 
-- 
2.34.1


From db06d10cc28a12bf7529375939878c53cdeb96c2 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Thu, 28 Oct 2021 19:25:10 +0100
Subject: [PATCH 368/713] dot fixed for tensorflow

---
 .../space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt      | 4 +++-
 .../kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index e73620d01..90485a9ad 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -180,7 +180,9 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A: Ring<T>> internal cons
     }
 
     override fun StructureND<T>.dot(other: StructureND<T>): TensorFlowOutput<T, TT> = biOp(other) { l, r ->
-        ops.linalg.matMul(l, r)
+        ops.linalg.matMul(
+            if (l.asTensor().shape().numDimensions() == 1) ops.expandDims(l,ops.constant(0)) else l,
+            if (r.asTensor().shape().numDimensions() == 1) ops.expandDims(r,ops.constant(-1)) else r)
     }
 
     override fun diagonalEmbedding(diagonalEntries: Tensor<T>, offset: Int, dim1: Int, dim2: Int): Tensor<T> = ops.run {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 8c445cf2d..672e37b98 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -208,7 +208,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      *
      * 3. If the first argument is 1-dimensional and the second argument is 2-dimensional,
      * a 1 is prepended to its dimension for the purpose of the matrix multiply.
-     * After the matrix multiply, the prepended dimension is removed.
+     * After the matrix multiply, depending on the implementation the prepended dimension might be removed.
      *
      * 4. If the first argument is 2-dimensional and the second argument is 1-dimensional,
      * the matrix-vector product is returned.
-- 
2.34.1


From b65197f577d0d0dbebd3d8dc1f8b14797bf346f9 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 1 Nov 2021 19:45:02 +0300
Subject: [PATCH 369/713] revert parts of tensor api to tensors

---
 .../kscience/kmath/benchmarks/DotBenchmark.kt |  11 ++
 .../space/kscience/kmath/nd/AlgebraND.kt      |   2 +-
 .../space/kscience/kmath/nd/BufferND.kt       |   6 -
 .../kscience/kmath/operations/Algebra.kt      |  10 ++
 .../kmath/multik/MultikDoubleAlgebra.kt       | 136 ++++++++++++++++++
 .../kmath/multik/MultikTensorAlgebra.kt       |  39 +++--
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |   4 +-
 .../tensors/api/AnalyticTensorAlgebra.kt      |   6 +-
 .../kmath/tensors/api/TensorAlgebra.kt        |   4 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |   4 +-
 10 files changed, 188 insertions(+), 34 deletions(-)
 create mode 100644 kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 64f9b5dff..9203c269e 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -13,6 +13,7 @@ import space.kscience.kmath.commons.linear.CMLinearSpace
 import space.kscience.kmath.ejml.EjmlLinearSpaceDDRM
 import space.kscience.kmath.linear.invoke
 import space.kscience.kmath.linear.linearSpace
+import space.kscience.kmath.multik.multikAlgebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.Buffer
 import kotlin.random.Random
@@ -58,6 +59,16 @@ internal class DotBenchmark {
         blackhole.consume(matrix1 dot matrix2)
     }
 
+//    @Benchmark
+//    fun tensorDot(blackhole: Blackhole) = with(Double.tensorAlgebra) {
+//        blackhole.consume(matrix1 dot matrix2)
+//    }
+
+    @Benchmark
+    fun multikDot(blackhole: Blackhole) = with(Double.multikAlgebra) {
+        blackhole.consume(matrix1 dot matrix2)
+    }
+
     @Benchmark
     fun bufferedDot(blackhole: Blackhole) = with(DoubleField.linearSpace(Buffer.Companion::auto)) {
         blackhole.consume(matrix1 dot matrix2)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index 4e52c8ba9..113bd4c52 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -35,7 +35,7 @@ public interface WithShape {
  * @param T the type of ND-structure element.
  * @param C the type of the element context.
  */
-public interface AlgebraND<T, out C : Algebra<T>> {
+public interface AlgebraND<T, out C : Algebra<T>>: Algebra<StructureND<T>> {
     /**
      * The algebra over elements of ND structure.
      */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 19924616d..515988159 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.MutableBuffer
@@ -27,11 +26,6 @@ public open class BufferND<out T>(
 
     override val shape: IntArray get() = indices.shape
 
-    @PerformancePitfall
-    override fun elements(): Sequence<Pair<IntArray, T>> = indices.asSequence().map {
-        it to this[it]
-    }
-
     override fun toString(): String = StructureND.toString(this)
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index 0e5c6de1f..992c0e015 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.operations
 
 import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.misc.UnstableKMathAPI
 
 /**
  * Stub for DSL the [Algebra] is.
@@ -99,6 +100,14 @@ public interface Algebra<T> {
      */
     public fun binaryOperation(operation: String, left: T, right: T): T =
         binaryOperationFunction(operation)(left, right)
+
+    /**
+     * Export an algebra element, so it could be accessed even after algebra scope is closed.
+     * This method must be used on algebras where data is stored externally or any local algebra state is used.
+     * By default (if not overridden), exports the object itself.
+     */
+    @UnstableKMathAPI
+    public fun export(arg: T): T = arg
 }
 
 public fun <T> Algebra<T>.bindSymbolOrNull(symbol: Symbol): T? = bindSymbolOrNull(symbol.identity)
@@ -162,6 +171,7 @@ public interface GroupOps<T> : Algebra<T> {
      * @return the difference.
      */
     public operator fun T.minus(arg: T): T = add(this, -arg)
+
     // Dynamic dispatch of operations
     override fun unaryOperationFunction(operation: String): (arg: T) -> T = when (operation) {
         PLUS_OPERATION -> { arg -> +arg }
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
new file mode 100644
index 000000000..e5fef6c1e
--- /dev/null
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
@@ -0,0 +1,136 @@
+package space.kscience.kmath.multik
+
+import org.jetbrains.kotlinx.multik.ndarray.data.DN
+import org.jetbrains.kotlinx.multik.ndarray.data.DataType
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
+import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
+import space.kscience.kmath.tensors.api.Tensor
+
+public object MultikDoubleAlgebra : MultikDivisionTensorAlgebra<Double, DoubleField>(),
+    AnalyticTensorAlgebra<Double, DoubleField>, LinearOpsTensorAlgebra<Double, DoubleField> {
+    override val elementAlgebra: DoubleField get() = DoubleField
+    override val type: DataType get() = DataType.DoubleDataType
+
+    override fun StructureND<Double>.mean(): Double = multikStat.mean(asMultik().array)
+
+    override fun StructureND<Double>.mean(dim: Int, keepDim: Boolean): Tensor<Double> =
+        multikStat.mean<Double,DN, DN>(asMultik().array, dim).wrap()
+
+    override fun StructureND<Double>.std(): Double {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.std(dim: Int, keepDim: Boolean): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.variance(): Double {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.variance(dim: Int, keepDim: Boolean): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.exp(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.ln(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.sqrt(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.cos(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.acos(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.cosh(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.acosh(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.sin(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.asin(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.sinh(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.asinh(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.tan(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.atan(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.tanh(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.atanh(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.ceil(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.floor(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.det(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.inv(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.cholesky(): Tensor<Double> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.qr(): Pair<Tensor<Double>, Tensor<Double>> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.lu(): Triple<Tensor<Double>, Tensor<Double>, Tensor<Double>> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.svd(): Triple<Tensor<Double>, Tensor<Double>, Tensor<Double>> {
+        TODO("Not yet implemented")
+    }
+
+    override fun StructureND<Double>.symEig(): Pair<Tensor<Double>, Tensor<Double>> {
+        TODO("Not yet implemented")
+    }
+}
+
+public val Double.Companion.multikAlgebra: MultikTensorAlgebra<Double, DoubleField> get() = MultikDoubleAlgebra
+public val DoubleField.multikAlgebra: MultikTensorAlgebra<Double, DoubleField> get() = MultikDoubleAlgebra
+
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index c8fc23a2c..e3b940e3c 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -7,11 +7,9 @@
 
 package space.kscience.kmath.multik
 
-import org.jetbrains.kotlinx.multik.api.Multik
-import org.jetbrains.kotlinx.multik.api.linalg.dot
-import org.jetbrains.kotlinx.multik.api.mk
-import org.jetbrains.kotlinx.multik.api.ndarrayOf
-import org.jetbrains.kotlinx.multik.api.zeros
+import org.jetbrains.kotlinx.multik.api.*
+import org.jetbrains.kotlinx.multik.api.linalg.LinAlg
+import org.jetbrains.kotlinx.multik.api.math.Math
 import org.jetbrains.kotlinx.multik.ndarray.data.*
 import org.jetbrains.kotlinx.multik.ndarray.operations.*
 import space.kscience.kmath.misc.PerformancePitfall
@@ -52,10 +50,16 @@ private fun <T, D : Dimension> MultiArray<T, D>.asD2Array(): D2Array<T> {
     else throw ClassCastException("Cannot cast MultiArray to NDArray.")
 }
 
-public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A> where T : Number, T : Comparable<T> {
+public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
+        where T : Number, T : Comparable<T> {
 
     public abstract val type: DataType
 
+    protected val multikMath: Math = mk.math
+    protected val multikLinAl: LinAlg = mk.linalg
+    protected val multikStat: Statistics = mk.stat
+
+
     override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): MultikTensor<T> {
         val strides = DefaultStrides(shape)
         val memoryView = initMemoryView<T>(strides.linearSize, type)
@@ -65,6 +69,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
         return MultikTensor(NDArray(memoryView, shape = shape, dim = DN(shape.size)))
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<T>.map(transform: A.(T) -> T): MultikTensor<T> = if (this is MultikTensor) {
         val data = initMemoryView<T>(array.size, type)
         var count = 0
@@ -76,6 +81,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
         }
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<T>.mapIndexed(transform: A.(index: IntArray, T) -> T): MultikTensor<T> =
         if (this is MultikTensor) {
             val array = asMultik().array
@@ -96,6 +102,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
             }
         }
 
+    @OptIn(PerformancePitfall::class)
     override fun zip(left: StructureND<T>, right: StructureND<T>, transform: A.(T, T) -> T): MultikTensor<T> {
         require(left.shape.contentEquals(right.shape)) { "ND array shape mismatch" } //TODO replace by ShapeMismatchException
         val leftArray = left.asMultik().array
@@ -208,9 +215,9 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
     override fun StructureND<T>.unaryMinus(): MultikTensor<T> =
         asMultik().array.unaryMinus().wrap()
 
-    override fun StructureND<T>.get(i: Int): MultikTensor<T> = asMultik().array.mutableView(i).wrap()
+    override fun Tensor<T>.get(i: Int): MultikTensor<T> = asMultik().array.mutableView(i).wrap()
 
-    override fun StructureND<T>.transpose(i: Int, j: Int): MultikTensor<T> = asMultik().array.transpose(i, j).wrap()
+    override fun Tensor<T>.transpose(i: Int, j: Int): MultikTensor<T> = asMultik().array.transpose(i, j).wrap()
 
     override fun Tensor<T>.view(shape: IntArray): MultikTensor<T> {
         require(shape.all { it > 0 })
@@ -236,12 +243,12 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
     override fun StructureND<T>.dot(other: StructureND<T>): MultikTensor<T> =
         if (this.shape.size == 1 && other.shape.size == 1) {
             Multik.ndarrayOf(
-                asMultik().array.asD1Array() dot other.asMultik().array.asD1Array()
-            ).asDNArray().wrap()
+                multikLinAl.linAlgEx.dotVV(asMultik().array.asD1Array(), other.asMultik().array.asD1Array())
+            ).wrap()
         } else if (this.shape.size == 2 && other.shape.size == 2) {
-            (asMultik().array.asD2Array() dot other.asMultik().array.asD2Array()).asDNArray().wrap()
+            multikLinAl.linAlgEx.dotMM(asMultik().array.asD2Array(), other.asMultik().array.asD2Array()).wrap()
         } else if (this.shape.size == 2 && other.shape.size == 1) {
-            (asMultik().array.asD2Array() dot other.asMultik().array.asD1Array()).asDNArray().wrap()
+            multikLinAl.linAlgEx.dotMV(asMultik().array.asD2Array(), other.asMultik().array.asD1Array()).wrap()
         } else {
             TODO("Not implemented for broadcasting")
         }
@@ -303,14 +310,6 @@ public abstract class MultikDivisionTensorAlgebra<T, A : Field<T>>
     }
 }
 
-public object MultikDoubleAlgebra : MultikDivisionTensorAlgebra<Double, DoubleField>() {
-    override val elementAlgebra: DoubleField get() = DoubleField
-    override val type: DataType get() = DataType.DoubleDataType
-}
-
-public val Double.Companion.multikAlgebra: MultikTensorAlgebra<Double, DoubleField> get() = MultikDoubleAlgebra
-public val DoubleField.multikAlgebra: MultikTensorAlgebra<Double, DoubleField> get() = MultikDoubleAlgebra
-
 public object MultikFloatAlgebra : MultikDivisionTensorAlgebra<Float, FloatField>() {
     override val elementAlgebra: FloatField get() = FloatField
     override val type: DataType get() = DataType.FloatDataType
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index a537c0629..58309736d 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -92,8 +92,8 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
     }
 
     override fun StructureND<T>.unaryMinus(): Nd4jArrayStructure<T> = ndArray.neg().wrap()
-    override fun StructureND<T>.get(i: Int): Nd4jArrayStructure<T> = ndArray.slice(i.toLong()).wrap()
-    override fun StructureND<T>.transpose(i: Int, j: Int): Nd4jArrayStructure<T> = ndArray.swapAxes(i, j).wrap()
+    override fun Tensor<T>.get(i: Int): Nd4jArrayStructure<T> = ndArray.slice(i.toLong()).wrap()
+    override fun Tensor<T>.transpose(i: Int, j: Int): Nd4jArrayStructure<T> = ndArray.swapAxes(i, j).wrap()
     override fun StructureND<T>.dot(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.mmul(other.ndArray).wrap()
 
     override fun StructureND<T>.min(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index debfb3ef0..c756584a4 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors.api
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.Field
 
@@ -121,4 +122,7 @@ public interface AnalyticTensorAlgebra<T, A : Field<T>> : TensorPartialDivisionA
     //For information: https://pytorch.org/docs/stable/generated/torch.floor.html#torch.floor
     public fun StructureND<T>.floor(): Tensor<T>
 
-}
\ No newline at end of file
+}
+
+@UnstableKMathAPI
+public fun <T, ATA : AnalyticTensorAlgebra<T, *>> ATA.exp(arg: StructureND<T>): Tensor<T> = arg.exp()
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 8c445cf2d..e12bce209 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -166,7 +166,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param i index of the extractable tensor
      * @return subtensor of the original tensor with index [i]
      */
-    public operator fun StructureND<T>.get(i: Int): Tensor<T>
+    public operator fun Tensor<T>.get(i: Int): Tensor<T>
 
     /**
      * Returns a tensor that is a transposed version of this tensor. The given dimensions [i] and [j] are swapped.
@@ -176,7 +176,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param j the second dimension to be transposed
      * @return transposed tensor
      */
-    public fun StructureND<T>.transpose(i: Int = -2, j: Int = -1): Tensor<T>
+    public fun Tensor<T>.transpose(i: Int = -2, j: Int = -1): Tensor<T>
 
     /**
      * Returns a new tensor with the same data as the self tensor but of a different shape.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index d7aa18c3d..35df2df8a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -115,7 +115,7 @@ public open class DoubleTensorAlgebra :
         TensorLinearStructure(shape).asSequence().map { DoubleField.initializer(it) }.toMutableList().toDoubleArray()
     )
 
-    override operator fun StructureND<Double>.get(i: Int): DoubleTensor {
+    override operator fun Tensor<Double>.get(i: Int): DoubleTensor {
         val lastShape = tensor.shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
         val newStart = newShape.reduce(Int::times) * i + tensor.bufferStart
@@ -344,7 +344,7 @@ public open class DoubleTensorAlgebra :
         return DoubleTensor(tensor.shape, resBuffer)
     }
 
-    override fun StructureND<Double>.transpose(i: Int, j: Int): DoubleTensor {
+    override fun Tensor<Double>.transpose(i: Int, j: Int): DoubleTensor {
         val ii = tensor.minusIndex(i)
         val jj = tensor.minusIndex(j)
         checkTranspose(tensor.dimension, ii, jj)
-- 
2.34.1


From a994b8a50c7ce737e4c95f8a2e136f233130e5f3 Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 1 Nov 2021 17:55:10 +0000
Subject: [PATCH 370/713] fix argmax

---
 .../kmath/multik/MultikTensorAlgebra.kt       |  2 +-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |  4 +-
 .../kmath/tensors/api/TensorAlgebra.kt        |  2 +-
 .../kmath/tensors/core/BufferedTensor.kt      |  1 -
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 33 +++++----
 .../kscience/kmath/tensors/core/IntTensor.kt  |  6 +-
 .../tensors/core/TensorLinearStructure.kt     | 74 +++++++++++++++++++
 .../core/internal/TensorLinearStructure.kt    | 71 ------------------
 .../tensors/core/internal/tensorCastsUtils.kt |  1 +
 9 files changed, 102 insertions(+), 92 deletions(-)
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
 delete mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt

diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index e3b940e3c..0c3cf6b14 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -277,7 +277,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
         TODO("Not yet implemented")
     }
 
-    override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T> {
+    override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<Int> {
         TODO("Not yet implemented")
     }
 }
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index 58309736d..d7dd6e71b 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -108,8 +108,8 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
     override fun Tensor<T>.view(shape: IntArray): Nd4jArrayStructure<T> = ndArray.reshape(shape).wrap()
     override fun Tensor<T>.viewAs(other: StructureND<T>): Nd4jArrayStructure<T> = view(other.shape)
 
-    override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
-        ndBase.get().argmax(ndArray, keepDim, dim).wrap()
+    override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<Int> =
+        ndBase.get().argmax(ndArray, keepDim, dim).asIntStructure()
 
     override fun StructureND<T>.mean(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         ndArray.mean(keepDim, dim).wrap()
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index e12bce209..60fc470fb 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -324,7 +324,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param keepDim whether the output tensor has [dim] retained or not.
      * @return the index of maximum value of each row of the input tensor in the given dimension [dim].
      */
-    public fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T>
+    public fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<Int>
 
     override fun add(left: StructureND<T>, right: StructureND<T>): Tensor<T> = left + right
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index eab4d3d5b..54d8f54dc 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -9,7 +9,6 @@ import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.Strides
 import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.tensors.api.Tensor
-import space.kscience.kmath.tensors.core.internal.TensorLinearStructure
 
 /**
  * Represents [Tensor] over a [MutableBuffer] intended to be used through [DoubleTensor] and [IntTensor]
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 35df2df8a..5e7ae262f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -10,6 +10,7 @@ import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.structures.indices
 import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
 import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
@@ -571,11 +572,11 @@ public open class DoubleTensorAlgebra :
     internal inline fun StructureND<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
         foldFunction(tensor.copyArray())
 
-    internal inline fun StructureND<Double>.foldDim(
-        foldFunction: (DoubleArray) -> Double,
+    internal inline fun <reified R: Any> StructureND<Double>.foldDim(
+        foldFunction: (DoubleArray) -> R,
         dim: Int,
         keepDim: Boolean,
-    ): DoubleTensor {
+    ): BufferedTensor<R> {
         check(dim < dimension) { "Dimension $dim out of range $dimension" }
         val resShape = if (keepDim) {
             shape.take(dim).toIntArray() + intArrayOf(1) + shape.takeLast(dimension - dim - 1).toIntArray()
@@ -583,37 +584,39 @@ public open class DoubleTensorAlgebra :
             shape.take(dim).toIntArray() + shape.takeLast(dimension - dim - 1).toIntArray()
         }
         val resNumElements = resShape.reduce(Int::times)
-        val resTensor = DoubleTensor(resShape, DoubleArray(resNumElements) { 0.0 }, 0)
-        for (index in resTensor.indices.asSequence()) {
+        val init = foldFunction(DoubleArray(1){0.0})
+        val resTensor = BufferedTensor(resShape,
+            MutableBuffer.auto(resNumElements) { init }, 0)
+        for (index in resTensor.indices) {
             val prefix = index.take(dim).toIntArray()
             val suffix = index.takeLast(dimension - dim - 1).toIntArray()
             resTensor[index] = foldFunction(DoubleArray(shape[dim]) { i ->
                 tensor[prefix + intArrayOf(i) + suffix]
             })
         }
-
         return resTensor
     }
 
     override fun StructureND<Double>.sum(): Double = tensor.fold { it.sum() }
 
     override fun StructureND<Double>.sum(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim({ x -> x.sum() }, dim, keepDim)
+        foldDim({ x -> x.sum() }, dim, keepDim).toDoubleTensor()
 
     override fun StructureND<Double>.min(): Double = this.fold { it.minOrNull()!! }
 
     override fun StructureND<Double>.min(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim({ x -> x.minOrNull()!! }, dim, keepDim)
+        foldDim({ x -> x.minOrNull()!! }, dim, keepDim).toDoubleTensor()
 
     override fun StructureND<Double>.max(): Double = this.fold { it.maxOrNull()!! }
 
     override fun StructureND<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim({ x -> x.maxOrNull()!! }, dim, keepDim)
+        foldDim({ x -> x.maxOrNull()!! }, dim, keepDim).toDoubleTensor()
 
-    override fun StructureND<Double>.argMax(dim: Int, keepDim: Boolean): DoubleTensor =
+
+    override fun StructureND<Double>.argMax(dim: Int, keepDim: Boolean): IntTensor =
         foldDim({ x ->
-            x.withIndex().maxByOrNull { it.value }?.index!!.toDouble()
-        }, dim, keepDim)
+            x.withIndex().maxByOrNull { it.value }?.index!!
+        }, dim, keepDim).toIntTensor()
 
 
     override fun StructureND<Double>.mean(): Double = this.fold { it.sum() / tensor.numElements }
@@ -626,7 +629,7 @@ public open class DoubleTensorAlgebra :
             },
             dim,
             keepDim
-        )
+        ).toDoubleTensor()
 
     override fun StructureND<Double>.std(): Double = this.fold { arr ->
         val mean = arr.sum() / tensor.numElements
@@ -641,7 +644,7 @@ public open class DoubleTensorAlgebra :
         },
         dim,
         keepDim
-    )
+    ).toDoubleTensor()
 
     override fun StructureND<Double>.variance(): Double = this.fold { arr ->
         val mean = arr.sum() / tensor.numElements
@@ -656,7 +659,7 @@ public open class DoubleTensorAlgebra :
         },
         dim,
         keepDim
-    )
+    ).toDoubleTensor()
 
     private fun cov(x: DoubleTensor, y: DoubleTensor): Double {
         val n = x.shape[0]
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
index dd9f9c0c1..715d9035f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.structures.IntBuffer
+import space.kscience.kmath.tensors.core.internal.array
 
 /**
  * Default [BufferedTensor] implementation for [Int] values
@@ -14,4 +15,7 @@ public class IntTensor internal constructor(
     shape: IntArray,
     buffer: IntArray,
     offset: Int = 0
-) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset)
+) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset){
+    public fun asDouble() : DoubleTensor =
+        DoubleTensor(shape, mutableBuffer.array().map{ it.toDouble()}.toDoubleArray(), bufferStart)
+}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
new file mode 100644
index 000000000..19eefc2f8
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.nd.Strides
+import kotlin.math.max
+
+/**
+ * This [Strides] implementation follows the last dimension first convention
+ * For more information: https://numpy.org/doc/stable/reference/generated/numpy.ndarray.strides.html
+ *
+ * @param shape the shape of the tensor.
+ */
+public class TensorLinearStructure(override val shape: IntArray) : Strides() {
+    override val strides: IntArray
+        get() = stridesFromShape(shape)
+
+    override fun index(offset: Int): IntArray =
+        indexFromOffset(offset, strides, shape.size)
+
+    override val linearSize: Int
+        get() = shape.reduce(Int::times)
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || this::class != other::class) return false
+
+        other as TensorLinearStructure
+
+        if (!shape.contentEquals(other.shape)) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return shape.contentHashCode()
+    }
+
+    public companion object {
+
+        public fun stridesFromShape(shape: IntArray): IntArray {
+            val nDim = shape.size
+            val res = IntArray(nDim)
+            if (nDim == 0)
+                return res
+
+            var current = nDim - 1
+            res[current] = 1
+
+            while (current > 0) {
+                res[current - 1] = max(1, shape[current]) * res[current]
+                current--
+            }
+            return res
+        }
+
+        public fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): IntArray {
+            val res = IntArray(nDim)
+            var current = offset
+            var strideIndex = 0
+
+            while (strideIndex < nDim) {
+                res[strideIndex] = (current / strides[strideIndex])
+                current %= strides[strideIndex]
+                strideIndex++
+            }
+            return res
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt
deleted file mode 100644
index 57668722a..000000000
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/TensorLinearStructure.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
-
-package space.kscience.kmath.tensors.core.internal
-
-import space.kscience.kmath.nd.Strides
-import kotlin.math.max
-
-
-internal fun stridesFromShape(shape: IntArray): IntArray {
-    val nDim = shape.size
-    val res = IntArray(nDim)
-    if (nDim == 0)
-        return res
-
-    var current = nDim - 1
-    res[current] = 1
-
-    while (current > 0) {
-        res[current - 1] = max(1, shape[current]) * res[current]
-        current--
-    }
-    return res
-}
-
-internal fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): IntArray {
-    val res = IntArray(nDim)
-    var current = offset
-    var strideIndex = 0
-
-    while (strideIndex < nDim) {
-        res[strideIndex] = (current / strides[strideIndex])
-        current %= strides[strideIndex]
-        strideIndex++
-    }
-    return res
-}
-
-/**
- * This [Strides] implementation follows the last dimension first convention
- * For more information: https://numpy.org/doc/stable/reference/generated/numpy.ndarray.strides.html
- *
- * @param shape the shape of the tensor.
- */
-internal class TensorLinearStructure(override val shape: IntArray) : Strides() {
-    override val strides: IntArray
-        get() = stridesFromShape(shape)
-
-    override fun index(offset: Int): IntArray =
-        indexFromOffset(offset, strides, shape.size)
-
-    override val linearSize: Int
-        get() = shape.reduce(Int::times)
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other == null || this::class != other::class) return false
-
-        other as TensorLinearStructure
-
-        if (!shape.contentEquals(other.shape)) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return shape.contentHashCode()
-    }
-}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index d3d327f66..602430b03 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -12,6 +12,7 @@ import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.BufferedTensor
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.IntTensor
+import space.kscience.kmath.tensors.core.TensorLinearStructure
 
 internal fun BufferedTensor<Int>.asTensor(): IntTensor =
     IntTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
-- 
2.34.1


From 62e7073ed2637d888e5f43075af8677d483dc55c Mon Sep 17 00:00:00 2001
From: Roland Grinis <roland.grinis@grinisrit.com>
Date: Mon, 1 Nov 2021 18:03:46 +0000
Subject: [PATCH 371/713] example fixed

---
 .../main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
index cdfc06922..1a2a94534 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
@@ -163,7 +163,7 @@ class NeuralNetwork(private val layers: List<Layer>) {
             for ((xBatch, yBatch) in iterBatch(xTrain, yTrain)) {
                 train(xBatch, yBatch)
             }
-            println("Accuracy:${accuracy(yTrain, predict(xTrain).argMax(1, true))}")
+            println("Accuracy:${accuracy(yTrain, predict(xTrain).argMax(1, true).asDouble())}")
         }
     }
 
@@ -230,7 +230,7 @@ fun main() = BroadcastDoubleTensorAlgebra {
     val prediction = model.predict(xTest)
 
     // process raw prediction via argMax
-    val predictionLabels = prediction.argMax(1, true)
+    val predictionLabels = prediction.argMax(1, true).asDouble()
 
     // find out accuracy
     val acc = accuracy(yTest, predictionLabels)
-- 
2.34.1


From 726864ed0ee53dc5210abca75f8b851a0d6a33c6 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 3 Nov 2021 12:55:29 +0300
Subject: [PATCH 372/713] Refactoring of power

---
 CHANGELOG.md                                  |   1 +
 .../kscience/kmath/complex/ComplexFieldND.kt  |  11 +-
 .../kmath/expressions/SimpleAutoDiff.kt       |   6 +-
 .../kscience/kmath/nd/BufferAlgebraND.kt      |  40 ++++--
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |  46 +++++--
 .../kscience/kmath/operations/Algebra.kt      |  55 ++++++++
 .../kmath/operations/BufferAlgebra.kt         |  14 +-
 .../kmath/operations/DoubleBufferField.kt     |  17 ++-
 .../kmath/operations/DoubleBufferOps.kt       | 124 ++++++------------
 .../kmath/operations/OptionalOperations.kt    |  12 +-
 .../kmath/operations/algebraExtensions.kt     |  43 ------
 .../kscience/kmath/operations/numbers.kt      |  25 ++--
 .../kscience/kmath/operations/isInteger.kt    |   6 +
 .../kscience/kmath/operations/isInteger.kt    |   6 +
 .../kscience/kmath/operations/isInteger.kt    |   6 +
 .../kmath/kotlingrad/AdaptingTests.kt         |   2 +-
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   |   2 +-
 .../tensors/api/AnalyticTensorAlgebra.kt      |  31 ++++-
 .../core/BroadcastDoubleTensorAlgebra.kt      |   4 +
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  13 ++
 .../tensors/core/tensorAlgebraExtensions.kt   |   3 +
 .../kscience/kmath/viktor/ViktorFieldOpsND.kt |  10 +-
 22 files changed, 296 insertions(+), 181 deletions(-)
 create mode 100644 kmath-core/src/jsMain/kotlin/space/kscience/kmath/operations/isInteger.kt
 create mode 100644 kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/isInteger.kt
 create mode 100644 kmath-core/src/nativeMain/kotlin/space/kscience/kmath/operations/isInteger.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6733c1211..857ed060b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - `BigInt` operation performance improvement and fixes by @zhelenskiy (#328)
 - Integration between `MST` and Symja `IExpr`
 - Complex power
+- Separate methods for UInt, Int and Number powers. NaN safety.
 
 ### Changed
 - Exponential operations merged with hyperbolic functions
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
index 9d5b1cddd..2eaa17ded 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
@@ -18,7 +18,7 @@ import kotlin.contracts.contract
  */
 @OptIn(UnstableKMathAPI::class)
 public sealed class ComplexFieldOpsND : BufferedFieldOpsND<Complex, ComplexField>(ComplexField.bufferAlgebra),
-    ScaleOperations<StructureND<Complex>>, ExtendedFieldOps<StructureND<Complex>> {
+    ScaleOperations<StructureND<Complex>>, ExtendedFieldOps<StructureND<Complex>>, PowerOperations<StructureND<Complex>> {
 
     override fun StructureND<Complex>.toBufferND(): BufferND<Complex> = when (this) {
         is BufferND -> this
@@ -33,9 +33,6 @@ public sealed class ComplexFieldOpsND : BufferedFieldOpsND<Complex, ComplexField
     override fun scale(a: StructureND<Complex>, value: Double): BufferND<Complex> =
         mapInline(a.toBufferND()) { it * value }
 
-    override fun power(arg: StructureND<Complex>, pow: Number): BufferND<Complex> =
-        mapInline(arg.toBufferND()) { power(it, pow) }
-
     override fun exp(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { exp(it) }
     override fun ln(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { ln(it) }
 
@@ -53,6 +50,9 @@ public sealed class ComplexFieldOpsND : BufferedFieldOpsND<Complex, ComplexField
     override fun acosh(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { acosh(it) }
     override fun atanh(arg: StructureND<Complex>): BufferND<Complex> = mapInline(arg.toBufferND()) { atanh(it) }
 
+    override fun power(arg: StructureND<Complex>, pow: Number): StructureND<Complex> =
+        mapInline(arg.toBufferND()) { power(it,pow) }
+
     public companion object : ComplexFieldOpsND()
 }
 
@@ -63,7 +63,8 @@ public val ComplexField.bufferAlgebra: BufferFieldOps<Complex, ComplexField>
 
 @OptIn(UnstableKMathAPI::class)
 public class ComplexFieldND(override val shape: Shape) :
-    ComplexFieldOpsND(), FieldND<Complex, ComplexField>, NumbersAddOps<StructureND<Complex>> {
+    ComplexFieldOpsND(), FieldND<Complex, ComplexField>,
+    NumbersAddOps<StructureND<Complex>> {
 
     override fun number(value: Number): BufferND<Complex> {
         val d = value.toDouble() // minimize conversions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
index 704c4edd8..aa9dd01ce 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
@@ -252,7 +252,7 @@ public class SimpleAutoDiffExpression<T : Any, F : Field<T>>(
  * Generate [AutoDiffProcessor] for [SimpleAutoDiffExpression]
  */
 public fun <T : Any, F : Field<T>> simpleAutoDiff(
-    field: F
+    field: F,
 ): AutoDiffProcessor<T, AutoDiffValue<T>, SimpleAutoDiffField<T, F>> =
     AutoDiffProcessor { function ->
         SimpleAutoDiffExpression(field, function)
@@ -272,8 +272,8 @@ public fun <T : Any, F : ExtendedField<T>> SimpleAutoDiffField<T, F>.sqrt(x: Aut
 public fun <T : Any, F : ExtendedField<T>> SimpleAutoDiffField<T, F>.pow(
     x: AutoDiffValue<T>,
     y: Double,
-): AutoDiffValue<T> = derive(const { power(x.value, y) }) { z ->
-    x.d += z.d * y * power(x.value, y - 1)
+): AutoDiffValue<T> = derive(const { x.value.pow(y)}) { z ->
+    x.d += z.d * y * x.value.pow(y - 1)
 }
 
 public fun <T : Any, F : ExtendedField<T>> SimpleAutoDiffField<T, F>.pow(
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index 0e094a8c7..d25b455f4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -53,21 +53,28 @@ public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
 
 public inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.mapInline(
     arg: BufferND<T>,
-    crossinline transform: A.(T) -> T
+    crossinline transform: A.(T) -> T,
 ): BufferND<T> {
     val indexes = arg.indices
-    return BufferND(indexes, bufferAlgebra.mapInline(arg.buffer, transform))
+    val buffer = arg.buffer
+    return BufferND(
+        indexes,
+        bufferAlgebra.run {
+            bufferFactory(buffer.size) { elementAlgebra.transform(buffer[it]) }
+        }
+    )
 }
 
 internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.mapIndexedInline(
     arg: BufferND<T>,
-    crossinline transform: A.(index: IntArray, arg: T) -> T
+    crossinline transform: A.(index: IntArray, arg: T) -> T,
 ): BufferND<T> {
     val indexes = arg.indices
+    val buffer = arg.buffer
     return BufferND(
         indexes,
-        bufferAlgebra.mapIndexedInline(arg.buffer) { offset, value ->
-            transform(indexes.index(offset), value)
+        bufferAlgebra.run {
+            bufferFactory(buffer.size) { elementAlgebra.transform(indexes.index(it), buffer[it]) }
         }
     )
 }
@@ -75,35 +82,42 @@ internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.mapIndexedInline(
 internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.zipInline(
     l: BufferND<T>,
     r: BufferND<T>,
-    crossinline block: A.(l: T, r: T) -> T
+    crossinline block: A.(l: T, r: T) -> T,
 ): BufferND<T> {
     require(l.indices == r.indices) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
     val indexes = l.indices
-    return BufferND(indexes, bufferAlgebra.zipInline(l.buffer, r.buffer, block))
+    val lbuffer = l.buffer
+    val rbuffer = r.buffer
+    return BufferND(
+        indexes,
+        bufferAlgebra.run {
+            bufferFactory(lbuffer.size) { elementAlgebra.block(lbuffer[it], rbuffer[it]) }
+        }
+    )
 }
 
 @OptIn(PerformancePitfall::class)
 public open class BufferedGroupNDOps<T, out A : Group<T>>(
     override val bufferAlgebra: BufferAlgebra<T, A>,
-    override val indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder
+    override val indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
 ) : GroupOpsND<T, A>, BufferAlgebraND<T, A> {
     override fun StructureND<T>.unaryMinus(): StructureND<T> = map { -it }
 }
 
 public open class BufferedRingOpsND<T, out A : Ring<T>>(
     bufferAlgebra: BufferAlgebra<T, A>,
-    indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder
+    indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
 ) : BufferedGroupNDOps<T, A>(bufferAlgebra, indexerBuilder), RingOpsND<T, A>
 
 public open class BufferedFieldOpsND<T, out A : Field<T>>(
     bufferAlgebra: BufferAlgebra<T, A>,
-    indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder
+    indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
 ) : BufferedRingOpsND<T, A>(bufferAlgebra, indexerBuilder), FieldOpsND<T, A> {
 
     public constructor(
         elementAlgebra: A,
         bufferFactory: BufferFactory<T>,
-        indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder
+        indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
     ) : this(BufferFieldOps(elementAlgebra, bufferFactory), indexerBuilder)
 
     @OptIn(PerformancePitfall::class)
@@ -117,11 +131,11 @@ public val <T, A : Field<T>> BufferAlgebra<T, A>.nd: BufferedFieldOpsND<T, A> ge
 
 public fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.structureND(
     vararg shape: Int,
-    initializer: A.(IntArray) -> T
+    initializer: A.(IntArray) -> T,
 ): BufferND<T> = structureND(shape, initializer)
 
 public fun <T, EA : Algebra<T>, A> A.structureND(
-    initializer: EA.(IntArray) -> T
+    initializer: EA.(IntArray) -> T,
 ): BufferND<T> where A : BufferAlgebraND<T, EA>, A : WithShape = structureND(shape, initializer)
 
 //// group factories
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 7285fdb24..8baeac21f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
-import kotlin.math.pow
+import kotlin.math.pow as kpow
 
 public class DoubleBufferND(
     indexes: ShapeIndexer,
@@ -30,9 +30,9 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
         }
     }
 
-    private inline fun mapInline(
+    protected inline fun mapInline(
         arg: DoubleBufferND,
-        transform: (Double) -> Double
+        transform: (Double) -> Double,
     ): DoubleBufferND {
         val indexes = arg.indices
         val array = arg.buffer.array
@@ -42,7 +42,7 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
     private inline fun zipInline(
         l: DoubleBufferND,
         r: DoubleBufferND,
-        block: (l: Double, r: Double) -> Double
+        block: (l: Double, r: Double) -> Double,
     ): DoubleBufferND {
         require(l.indices == r.indices) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
         val indexes = l.indices
@@ -60,7 +60,7 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
     override fun zip(
         left: StructureND<Double>,
         right: StructureND<Double>,
-        transform: DoubleField.(Double, Double) -> Double
+        transform: DoubleField.(Double, Double) -> Double,
     ): BufferND<Double> = zipInline(left.toBufferND(), right.toBufferND()) { l, r -> DoubleField.transform(l, r) }
 
     override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): DoubleBufferND {
@@ -123,9 +123,6 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
     override fun scale(a: StructureND<Double>, value: Double): DoubleBufferND =
         mapInline(a.toBufferND()) { it * value }
 
-    override fun power(arg: StructureND<Double>, pow: Number): DoubleBufferND =
-        mapInline(arg.toBufferND()) { it.pow(pow.toDouble()) }
-
     override fun exp(arg: StructureND<Double>): DoubleBufferND =
         mapInline(arg.toBufferND()) { kotlin.math.exp(it) }
 
@@ -173,7 +170,38 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
 
 @OptIn(UnstableKMathAPI::class)
 public class DoubleFieldND(override val shape: Shape) :
-    DoubleFieldOpsND(), FieldND<Double, DoubleField>, NumbersAddOps<StructureND<Double>> {
+    DoubleFieldOpsND(), FieldND<Double, DoubleField>, NumbersAddOps<StructureND<Double>>,
+    ExtendedField<StructureND<Double>> {
+
+    override fun power(arg: StructureND<Double>, pow: UInt): DoubleBufferND = mapInline(arg.toBufferND()) {
+        it.kpow(pow.toInt())
+    }
+
+    override fun power(arg: StructureND<Double>, pow: Int): DoubleBufferND = mapInline(arg.toBufferND()) {
+        it.kpow(pow)
+    }
+
+    override fun power(arg: StructureND<Double>, pow: Number): DoubleBufferND = if(pow.isInteger()){
+        power(arg, pow.toInt())
+    } else {
+        val dpow = pow.toDouble()
+        mapInline(arg.toBufferND()) {
+            if (it < 0) throw IllegalArgumentException("Can't raise negative $it to a fractional power")
+            else it.kpow(dpow)
+        }
+    }
+
+    override fun sinh(arg: StructureND<Double>): DoubleBufferND = super<DoubleFieldOpsND>.sinh(arg)
+
+    override fun cosh(arg: StructureND<Double>): DoubleBufferND = super<DoubleFieldOpsND>.cosh(arg)
+
+    override fun tanh(arg: StructureND<Double>): DoubleBufferND = super<DoubleFieldOpsND>.tan(arg)
+
+    override fun asinh(arg: StructureND<Double>): DoubleBufferND = super<DoubleFieldOpsND>.asinh(arg)
+
+    override fun acosh(arg: StructureND<Double>): DoubleBufferND = super<DoubleFieldOpsND>.acosh(arg)
+
+    override fun atanh(arg: StructureND<Double>): DoubleBufferND = super<DoubleFieldOpsND>.atanh(arg)
 
     override fun number(value: Number): DoubleBufferND {
         val d = value.toDouble() // minimize conversions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index 992c0e015..244b9fea7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.operations
 
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Ring.Companion.optimizedPower
 
 /**
  * Stub for DSL the [Algebra] is.
@@ -257,6 +258,40 @@ public interface Ring<T> : Group<T>, RingOps<T> {
      * The neutral element of multiplication
      */
     public val one: T
+
+    /**
+     * Raises [arg] to the integer power [pow].
+     */
+    public fun power(arg: T, pow: UInt): T = optimizedPower(arg, pow)
+
+    public companion object{
+        /**
+         * Raises [arg] to the non-negative integer power [exponent].
+         *
+         * Special case: 0 ^ 0 is 1.
+         *
+         * @receiver the algebra to provide multiplication.
+         * @param arg the base.
+         * @param exponent the exponent.
+         * @return the base raised to the power.
+         * @author Evgeniy Zhelenskiy
+         */
+        internal fun <T> Ring<T>.optimizedPower(arg: T, exponent: UInt): T = when {
+            arg == zero && exponent > 0U -> zero
+            arg == one -> arg
+            arg == -one -> powWithoutOptimization(arg, exponent % 2U)
+            else -> powWithoutOptimization(arg, exponent)
+        }
+
+        private fun <T> Ring<T>.powWithoutOptimization(base: T, exponent: UInt): T = when (exponent) {
+            0U -> one
+            1U -> base
+            else -> {
+                val pre = powWithoutOptimization(base, exponent shr 1).let { it * it }
+                if (exponent and 1U == 0U) pre else pre * base
+            }
+        }
+    }
 }
 
 /**
@@ -307,4 +342,24 @@ public interface FieldOps<T> : RingOps<T> {
  */
 public interface Field<T> : Ring<T>, FieldOps<T>, ScaleOperations<T>, NumericAlgebra<T> {
     override fun number(value: Number): T = scale(one, value.toDouble())
+
+    public fun power(arg: T, pow: Int): T = optimizedPower(arg, pow)
+
+    public companion object{
+        /**
+         * Raises [arg] to the integer power [exponent].
+         *
+         * Special case: 0 ^ 0 is 1.
+         *
+         * @receiver the algebra to provide multiplication and division.
+         * @param arg the base.
+         * @param exponent the exponent.
+         * @return the base raised to the power.
+         * @author Iaroslav Postovalov, Evgeniy Zhelenskiy
+         */
+        private fun <T> Field<T>.optimizedPower(arg: T, exponent: Int): T = when {
+            exponent < 0 -> one / (this as Ring<T>).optimizedPower(arg, if (exponent == Int.MIN_VALUE) Int.MAX_VALUE.toUInt().inc() else (-exponent).toUInt())
+            else -> (this as Ring<T>).optimizedPower(arg, exponent.toUInt())
+        }
+    }
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
index bc05f3904..634a115c7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.operations
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.DoubleBuffer
@@ -34,11 +35,13 @@ public interface BufferAlgebra<T, out A : Algebra<T>> : Algebra<Buffer<T>> {
     public fun Buffer<T>.zip(other: Buffer<T>, block: A.(left: T, right: T) -> T): Buffer<T> =
         zipInline(this, other, block)
 
+    @UnstableKMathAPI
     override fun unaryOperationFunction(operation: String): (arg: Buffer<T>) -> Buffer<T> {
         val operationFunction = elementAlgebra.unaryOperationFunction(operation)
         return { arg -> bufferFactory(arg.size) { operationFunction(arg[it]) } }
     }
 
+    @UnstableKMathAPI
     override fun binaryOperationFunction(operation: String): (left: Buffer<T>, right: Buffer<T>) -> Buffer<T> {
         val operationFunction = elementAlgebra.binaryOperationFunction(operation)
         return { left, right ->
@@ -50,7 +53,7 @@ public interface BufferAlgebra<T, out A : Algebra<T>> : Algebra<Buffer<T>> {
 /**
  * Inline map
  */
-public inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapInline(
+private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapInline(
     buffer: Buffer<T>,
     crossinline block: A.(T) -> T
 ): Buffer<T> = bufferFactory(buffer.size) { elementAlgebra.block(buffer[it]) }
@@ -58,7 +61,7 @@ public inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapInline(
 /**
  * Inline map
  */
-public inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapIndexedInline(
+private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapIndexedInline(
     buffer: Buffer<T>,
     crossinline block: A.(index: Int, arg: T) -> T
 ): Buffer<T> = bufferFactory(buffer.size) { elementAlgebra.block(it, buffer[it]) }
@@ -66,7 +69,7 @@ public inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapIndexedInline(
 /**
  * Inline zip
  */
-public inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.zipInline(
+private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.zipInline(
     l: Buffer<T>,
     r: Buffer<T>,
     crossinline block: A.(l: T, r: T) -> T
@@ -126,7 +129,7 @@ public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.atanh(arg: Buff
     mapInline(arg) { atanh(it) }
 
 public fun <T, A : PowerOperations<T>> BufferAlgebra<T, A>.pow(arg: Buffer<T>, pow: Number): Buffer<T> =
-    mapInline(arg) { power(it, pow) }
+    mapInline(arg) {it.pow(pow) }
 
 
 public open class BufferRingOps<T, A: Ring<T>>(
@@ -138,9 +141,11 @@ public open class BufferRingOps<T, A: Ring<T>>(
     override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l * r }
     override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
 
+    @UnstableKMathAPI
     override fun unaryOperationFunction(operation: String): (arg: Buffer<T>) -> Buffer<T> =
         super<BufferAlgebra>.unaryOperationFunction(operation)
 
+    @UnstableKMathAPI
     override fun binaryOperationFunction(operation: String): (left: Buffer<T>, right: Buffer<T>) -> Buffer<T> =
         super<BufferAlgebra>.binaryOperationFunction(operation)
 }
@@ -160,6 +165,7 @@ public open class BufferFieldOps<T, A : Field<T>>(
     override fun scale(a: Buffer<T>, value: Double): Buffer<T> = a.map { scale(it, value) }
     override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
 
+    @UnstableKMathAPI
     override fun binaryOperationFunction(operation: String): (left: Buffer<T>, right: Buffer<T>) -> Buffer<T> =
         super<BufferRingOps>.binaryOperationFunction(operation)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
index 060ea5a7e..0deb647a3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.operations
 
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField.pow
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 
@@ -27,7 +29,20 @@ public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Doub
 
     override fun acosh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOps>.acosh(arg)
 
-    override fun atanh(arg: Buffer<Double>): DoubleBuffer= super<DoubleBufferOps>.atanh(arg)
+    override fun atanh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOps>.atanh(arg)
+
+    override fun power(arg: Buffer<Double>, pow: Number): DoubleBuffer = if (pow.isInteger()) {
+        arg.mapInline { it.pow(pow.toInt()) }
+    } else {
+        arg.mapInline {
+            if(it<0) throw IllegalArgumentException("Negative argument $it could not be raised to the fractional power")
+            it.pow(pow.toDouble())
+        }
+    }
+
+    @UnstableKMathAPI
+    override fun unaryOperationFunction(operation: String): (arg: Buffer<Double>) -> Buffer<Double> =
+        super<ExtendedField>.unaryOperationFunction(operation)
 
     //    override fun number(value: Number): Buffer<Double> = DoubleBuffer(size) { value.toDouble() }
 //
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index 3d51b3d32..28238c466 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -6,21 +6,32 @@
 package space.kscience.kmath.operations
 
 import space.kscience.kmath.linear.Point
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.asBuffer
 
 import kotlin.math.*
 
 /**
  * [ExtendedFieldOps] over [DoubleBuffer].
  */
-public abstract class DoubleBufferOps : ExtendedFieldOps<Buffer<Double>>, Norm<Buffer<Double>, Double> {
+public abstract class DoubleBufferOps :
+    BufferAlgebra<Double, DoubleField>, ExtendedFieldOps<Buffer<Double>>, Norm<Buffer<Double>, Double> {
 
-    override fun Buffer<Double>.unaryMinus(): DoubleBuffer = if (this is DoubleBuffer) {
-        DoubleBuffer(size) { -array[it] }
-    } else {
-        DoubleBuffer(size) { -get(it) }
-    }
+    override val elementAlgebra: DoubleField get() = DoubleField
+    override val bufferFactory: BufferFactory<Double> get() = ::DoubleBuffer
+
+    @UnstableKMathAPI
+    override fun unaryOperationFunction(operation: String): (arg: Buffer<Double>) -> Buffer<Double> =
+        super<ExtendedFieldOps>.unaryOperationFunction(operation)
+
+    @UnstableKMathAPI
+    override fun binaryOperationFunction(operation: String): (left: Buffer<Double>, right: Buffer<Double>) -> Buffer<Double> =
+        super<ExtendedFieldOps>.binaryOperationFunction(operation)
+
+    override fun Buffer<Double>.unaryMinus(): DoubleBuffer = mapInline { -it }
 
     override fun add(left: Buffer<Double>, right: Buffer<Double>): DoubleBuffer {
         require(right.size == left.size) {
@@ -92,101 +103,46 @@ public abstract class DoubleBufferOps : ExtendedFieldOps<Buffer<Double>>, Norm<B
         } else DoubleBuffer(DoubleArray(left.size) { left[it] / right[it] })
     }
 
-    override fun sin(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { sin(array[it]) })
-    } else DoubleBuffer(DoubleArray(arg.size) { sin(arg[it]) })
+    override fun sin(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::sin)
 
-    override fun cos(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { cos(array[it]) })
-    } else DoubleBuffer(DoubleArray(arg.size) { cos(arg[it]) })
+    override fun cos(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::cos)
 
-    override fun tan(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { tan(array[it]) })
-    } else DoubleBuffer(DoubleArray(arg.size) { tan(arg[it]) })
+    override fun tan(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::tan)
 
-    override fun asin(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { asin(array[it]) })
-    } else
-        DoubleBuffer(DoubleArray(arg.size) { asin(arg[it]) })
+    override fun asin(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::asin)
 
-    override fun acos(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { acos(array[it]) })
-    } else
-        DoubleBuffer(DoubleArray(arg.size) { acos(arg[it]) })
+    override fun acos(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::acos)
 
-    override fun atan(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { atan(array[it]) })
-    } else
-        DoubleBuffer(DoubleArray(arg.size) { atan(arg[it]) })
+    override fun atan(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::atan)
 
-    override fun sinh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { sinh(array[it]) })
-    } else
-        DoubleBuffer(DoubleArray(arg.size) { sinh(arg[it]) })
+    override fun sinh(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::sinh)
 
-    override fun cosh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { cosh(array[it]) })
-    } else
-        DoubleBuffer(DoubleArray(arg.size) { cosh(arg[it]) })
+    override fun cosh(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::cosh)
 
-    override fun tanh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { tanh(array[it]) })
-    } else
-        DoubleBuffer(DoubleArray(arg.size) { tanh(arg[it]) })
+    override fun tanh(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::tanh)
 
-    override fun asinh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { asinh(array[it]) })
-    } else
-        DoubleBuffer(DoubleArray(arg.size) { asinh(arg[it]) })
+    override fun asinh(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::asinh)
 
-    override fun acosh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { acosh(array[it]) })
-    } else
-        DoubleBuffer(DoubleArray(arg.size) { acosh(arg[it]) })
+    override fun acosh(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::acosh)
 
-    override fun atanh(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { atanh(array[it]) })
-    } else
-        DoubleBuffer(DoubleArray(arg.size) { atanh(arg[it]) })
+    override fun atanh(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::atanh)
 
-    override fun power(arg: Buffer<Double>, pow: Number): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { array[it].pow(pow.toDouble()) })
-    } else
-        DoubleBuffer(DoubleArray(arg.size) { arg[it].pow(pow.toDouble()) })
+    override fun exp(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::exp)
 
-    override fun exp(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { exp(array[it]) })
-    } else DoubleBuffer(DoubleArray(arg.size) { exp(arg[it]) })
-
-    override fun ln(arg: Buffer<Double>): DoubleBuffer = if (arg is DoubleBuffer) {
-        val array = arg.array
-        DoubleBuffer(DoubleArray(arg.size) { ln(array[it]) })
-    } else {
-        DoubleBuffer(DoubleArray(arg.size) { ln(arg[it]) })
-    }
+    override fun ln(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::ln)
 
     override fun norm(arg: Buffer<Double>): Double = DoubleL2Norm.norm(arg)
 
-    override fun scale(a: Buffer<Double>, value: Double): DoubleBuffer = if (a is DoubleBuffer) {
-        val aArray = a.array
-        DoubleBuffer(DoubleArray(a.size) { aArray[it] * value })
-    } else DoubleBuffer(DoubleArray(a.size) { a[it] * value })
+    override fun scale(a: Buffer<Double>, value: Double): DoubleBuffer = a.mapInline { it * value }
 
-    public companion object : DoubleBufferOps()
+    public companion object : DoubleBufferOps() {
+        public inline fun Buffer<Double>.mapInline(block: (Double) -> Double): DoubleBuffer =
+            if (this is DoubleBuffer) {
+                DoubleArray(size) { block(array[it]) }.asBuffer()
+            } else {
+                DoubleArray(size) { block(get(it)) }.asBuffer()
+            }
+    }
 }
 
 public object DoubleL2Norm : Norm<Point<Double>, Double> {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
index d32e03533..332617158 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
@@ -74,14 +74,21 @@ public interface TrigonometricOperations<T> : Algebra<T> {
     }
 }
 
+/**
+ * Check if number is an integer from platform point of view
+ */
+public expect fun Number.isInteger(): Boolean
+
 /**
  * A context extension to include power operations based on exponentiation.
  *
  * @param T the type of element of this structure.
  */
-public interface PowerOperations<T> : Algebra<T> {
+public interface PowerOperations<T> : FieldOps<T> {
+
     /**
-     * Raises [arg] to the power [pow].
+     * Raises [arg] to a power if possible (negative number could not be raised to a fractional power).
+     * Throws [IllegalArgumentException] if not possible.
      */
     public fun power(arg: T, pow: Number): T
 
@@ -108,6 +115,7 @@ public interface PowerOperations<T> : Algebra<T> {
     }
 }
 
+
 /**
  * A container for operations related to `exp` and `ln` functions.
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index b26ebb2ea..493d90d2f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -96,46 +96,3 @@ public fun <T, S> Iterable<T>.averageWith(space: S): T where S : Ring<T>, S : Sc
 public fun <T, S> Sequence<T>.averageWith(space: S): T where S : Ring<T>, S : ScaleOperations<T> =
     space.average(this)
 
-/**
- * Raises [arg] to the non-negative integer power [exponent].
- *
- * Special case: 0 ^ 0 is 1.
- *
- * @receiver the algebra to provide multiplication.
- * @param arg the base.
- * @param exponent the exponent.
- * @return the base raised to the power.
- * @author Evgeniy Zhelenskiy
- */
-public fun <T> Ring<T>.power(arg: T, exponent: UInt): T = when {
-    arg == zero && exponent > 0U -> zero
-    arg == one -> arg
-    arg == -one -> powWithoutOptimization(arg, exponent % 2U)
-    else -> powWithoutOptimization(arg, exponent)
-}
-
-private fun <T> Ring<T>.powWithoutOptimization(base: T, exponent: UInt): T = when (exponent) {
-    0U -> one
-    1U -> base
-    else -> {
-        val pre = powWithoutOptimization(base, exponent shr 1).let { it * it }
-        if (exponent and 1U == 0U) pre else pre * base
-    }
-}
-
-
-/**
- * Raises [arg] to the integer power [exponent].
- *
- * Special case: 0 ^ 0 is 1.
- *
- * @receiver the algebra to provide multiplication and division.
- * @param arg the base.
- * @param exponent the exponent.
- * @return the base raised to the power.
- * @author Iaroslav Postovalov, Evgeniy Zhelenskiy
- */
-public fun <T> Field<T>.power(arg: T, exponent: Int): T = when {
-    exponent < 0 -> one / (this as Ring<T>).power(arg, if (exponent == Int.MIN_VALUE) Int.MAX_VALUE.toUInt().inc() else (-exponent).toUInt())
-    else -> (this as Ring<T>).power(arg, exponent.toUInt())
-}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index ceb85f3ab..7c8030168 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -13,9 +13,8 @@ import kotlin.math.pow as kpow
 public interface ExtendedFieldOps<T> :
     FieldOps<T>,
     TrigonometricOperations<T>,
-    PowerOperations<T>,
     ExponentialOperations<T>,
-    ScaleOperations<T>  {
+    ScaleOperations<T> {
     override fun tan(arg: T): T = sin(arg) / cos(arg)
     override fun tanh(arg: T): T = sinh(arg) / cosh(arg)
 
@@ -26,7 +25,6 @@ public interface ExtendedFieldOps<T> :
         TrigonometricOperations.ACOS_OPERATION -> ::acos
         TrigonometricOperations.ASIN_OPERATION -> ::asin
         TrigonometricOperations.ATAN_OPERATION -> ::atan
-        PowerOperations.SQRT_OPERATION -> ::sqrt
         ExponentialOperations.EXP_OPERATION -> ::exp
         ExponentialOperations.LN_OPERATION -> ::ln
         ExponentialOperations.COSH_OPERATION -> ::cosh
@@ -42,7 +40,7 @@ public interface ExtendedFieldOps<T> :
 /**
  * Advanced Number-like field that implements basic operations.
  */
-public interface ExtendedField<T> : ExtendedFieldOps<T>, Field<T>, NumericAlgebra<T>{
+public interface ExtendedField<T> : ExtendedFieldOps<T>, Field<T>, PowerOperations<T>, NumericAlgebra<T> {
     override fun sinh(arg: T): T = (exp(arg) - exp(-arg)) / 2.0
     override fun cosh(arg: T): T = (exp(arg) + exp(-arg)) / 2.0
     override fun tanh(arg: T): T = (exp(arg) - exp(-arg)) / (exp(-arg) + exp(arg))
@@ -50,6 +48,11 @@ public interface ExtendedField<T> : ExtendedFieldOps<T>, Field<T>, NumericAlgebr
     override fun acosh(arg: T): T = ln(arg + sqrt((arg - one) * (arg + one)))
     override fun atanh(arg: T): T = (ln(arg + one) - ln(one - arg)) / 2.0
 
+    override fun unaryOperationFunction(operation: String): (arg: T) -> T {
+        return if (operation == PowerOperations.SQRT_OPERATION) ::sqrt
+        else super<ExtendedFieldOps>.unaryOperationFunction(operation)
+    }
+
     override fun rightSideNumberOperationFunction(operation: String): (left: T, right: Number) -> T =
         when (operation) {
             PowerOperations.POW_OPERATION -> ::power
@@ -69,7 +72,7 @@ public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOp
 
     override fun binaryOperationFunction(operation: String): (left: Double, right: Double) -> Double =
         when (operation) {
-            PowerOperations.POW_OPERATION -> ::power
+            PowerOperations.POW_OPERATION -> { l, r -> l.kpow(r) }
             else -> super<ExtendedField>.binaryOperationFunction(operation)
         }
 
@@ -94,8 +97,13 @@ public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOp
     override inline fun acosh(arg: Double): Double = kotlin.math.acosh(arg)
     override inline fun atanh(arg: Double): Double = kotlin.math.atanh(arg)
 
-    override inline fun sqrt(arg: Double): Double = kotlin.math.sqrt(arg)
-    override inline fun power(arg: Double, pow: Number): Double = arg.kpow(pow.toDouble())
+    override fun sqrt(arg: Double): Double = kotlin.math.sqrt(arg)
+    override fun power(arg: Double, pow: Number): Double = when {
+        pow.isInteger() -> arg.kpow(pow.toInt())
+        arg < 0 -> throw IllegalArgumentException("Can't raise negative $arg to a fractional power $pow")
+        else -> arg.kpow(pow.toDouble())
+    }
+
     override inline fun exp(arg: Double): Double = kotlin.math.exp(arg)
     override inline fun ln(arg: Double): Double = kotlin.math.ln(arg)
 
@@ -122,7 +130,7 @@ public object FloatField : ExtendedField<Float>, Norm<Float, Float> {
 
     override fun binaryOperationFunction(operation: String): (left: Float, right: Float) -> Float =
         when (operation) {
-            PowerOperations.POW_OPERATION -> ::power
+            PowerOperations.POW_OPERATION -> { l, r -> l.kpow(r) }
             else -> super.binaryOperationFunction(operation)
         }
 
@@ -149,6 +157,7 @@ public object FloatField : ExtendedField<Float>, Norm<Float, Float> {
 
     override inline fun sqrt(arg: Float): Float = kotlin.math.sqrt(arg)
     override inline fun power(arg: Float, pow: Number): Float = arg.kpow(pow.toFloat())
+
     override inline fun exp(arg: Float): Float = kotlin.math.exp(arg)
     override inline fun ln(arg: Float): Float = kotlin.math.ln(arg)
 
diff --git a/kmath-core/src/jsMain/kotlin/space/kscience/kmath/operations/isInteger.kt b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/operations/isInteger.kt
new file mode 100644
index 000000000..c15669145
--- /dev/null
+++ b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/operations/isInteger.kt
@@ -0,0 +1,6 @@
+package space.kscience.kmath.operations
+
+/**
+ * Check if number is an integer
+ */
+public actual fun Number.isInteger(): Boolean = js("Number").isInteger(this) as Boolean
\ No newline at end of file
diff --git a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/isInteger.kt b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/isInteger.kt
new file mode 100644
index 000000000..746d1e530
--- /dev/null
+++ b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/isInteger.kt
@@ -0,0 +1,6 @@
+package space.kscience.kmath.operations
+
+/**
+ * Check if number is an integer
+ */
+public actual fun Number.isInteger(): Boolean = (this is Int) || (this is Long) || (this is Short) || (this.toDouble() % 1 == 0.0)
\ No newline at end of file
diff --git a/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/operations/isInteger.kt b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/operations/isInteger.kt
new file mode 100644
index 000000000..746d1e530
--- /dev/null
+++ b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/operations/isInteger.kt
@@ -0,0 +1,6 @@
+package space.kscience.kmath.operations
+
+/**
+ * Check if number is an integer
+ */
+public actual fun Number.isInteger(): Boolean = (this is Int) || (this is Long) || (this is Short) || (this.toDouble() % 1 == 0.0)
\ No newline at end of file
diff --git a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
index 67332a680..4047b9a67 100644
--- a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
+++ b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
@@ -62,6 +62,6 @@ internal class AdaptingTests {
             .parseMath()
             .compileToExpression(DoubleField)
 
-        assertEquals(actualDerivative(x to 0.1), expectedDerivative(x to 0.1))
+        assertEquals(actualDerivative(x to -0.1), expectedDerivative(x to -0.1))
     }
 }
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index b1cc1f834..dd27bc817 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -155,7 +155,7 @@ public sealed interface Nd4jArrayField<T, out F : Field<T>> : FieldOpsND<T, F>,
  * Represents intersection of [ExtendedField] and [Field] over [Nd4jArrayStructure].
  */
 public sealed interface Nd4jArrayExtendedFieldOps<T, out F : ExtendedField<T>> :
-    ExtendedFieldOps<StructureND<T>>, Nd4jArrayField<T, F> {
+    ExtendedFieldOps<StructureND<T>>, Nd4jArrayField<T, F>, PowerOperations<StructureND<T>> {
 
     override fun sin(arg: StructureND<T>): StructureND<T> = Transforms.sin(arg.ndArray).wrap()
     override fun cos(arg: StructureND<T>): StructureND<T> = Transforms.cos(arg.ndArray).wrap()
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index c756584a4..743105fdf 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.tensors.api
 
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.ExtendedFieldOps
 import space.kscience.kmath.operations.Field
 
 
@@ -15,7 +15,8 @@ import space.kscience.kmath.operations.Field
  *
  * @param T the type of items closed under analytic functions in the tensors.
  */
-public interface AnalyticTensorAlgebra<T, A : Field<T>> : TensorPartialDivisionAlgebra<T, A> {
+public interface AnalyticTensorAlgebra<T, A : Field<T>> :
+    TensorPartialDivisionAlgebra<T, A>, ExtendedFieldOps<StructureND<T>> {
 
     /**
      * @return the mean of all elements in the input tensor.
@@ -122,7 +123,27 @@ public interface AnalyticTensorAlgebra<T, A : Field<T>> : TensorPartialDivisionA
     //For information: https://pytorch.org/docs/stable/generated/torch.floor.html#torch.floor
     public fun StructureND<T>.floor(): Tensor<T>
 
-}
+    override fun sin(arg: StructureND<T>): StructureND<T> = arg.sin()
 
-@UnstableKMathAPI
-public fun <T, ATA : AnalyticTensorAlgebra<T, *>> ATA.exp(arg: StructureND<T>): Tensor<T> = arg.exp()
\ No newline at end of file
+    override fun cos(arg: StructureND<T>): StructureND<T> = arg.cos()
+
+    override fun asin(arg: StructureND<T>): StructureND<T> = arg.asin()
+
+    override fun acos(arg: StructureND<T>): StructureND<T> = arg.acos()
+
+    override fun atan(arg: StructureND<T>): StructureND<T> = arg.atan()
+
+    override fun exp(arg: StructureND<T>): StructureND<T> = arg.exp()
+
+    override fun ln(arg: StructureND<T>): StructureND<T> = arg.ln()
+
+    override fun sinh(arg: StructureND<T>): StructureND<T> = arg.sinh()
+
+    override fun cosh(arg: StructureND<T>): StructureND<T> = arg.cosh()
+
+    override fun asinh(arg: StructureND<T>): StructureND<T> = arg.asinh()
+
+    override fun acosh(arg: StructureND<T>): StructureND<T> = arg.acosh()
+
+    override fun atanh(arg: StructureND<T>): StructureND<T> = arg.atanh()
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index 7353ecab1..10c747777 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.tensors.api.Tensor
@@ -17,6 +18,8 @@ import space.kscience.kmath.tensors.core.internal.tensor
  * Basic linear algebra operations implemented with broadcasting.
  * For more information: https://pytorch.org/docs/stable/notes/broadcasting.html
  */
+
+@PerformancePitfall
 public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun StructureND<Double>.plus(arg: StructureND<Double>): DoubleTensor {
@@ -99,5 +102,6 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
  * Compute a value using broadcast double tensor algebra
  */
 @UnstableKMathAPI
+@PerformancePitfall
 public fun <R> DoubleTensorAlgebra.withBroadcast(block: BroadcastDoubleTensorAlgebra.() -> R): R =
     BroadcastDoubleTensorAlgebra.block()
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 5e7ae262f..bae49c037 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -3,8 +3,12 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
+
+@file:OptIn(PerformancePitfall::class)
+
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.as1D
@@ -39,6 +43,7 @@ public open class DoubleTensorAlgebra :
      * @param transform the function to be applied to each element of the tensor.
      * @return the resulting tensor after applying the function.
      */
+    @PerformancePitfall
     @Suppress("OVERRIDE_BY_INLINE")
     final override inline fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): DoubleTensor {
         val tensor = this.tensor
@@ -52,6 +57,7 @@ public open class DoubleTensorAlgebra :
         )
     }
 
+    @PerformancePitfall
     @Suppress("OVERRIDE_BY_INLINE")
     final override inline fun StructureND<Double>.mapIndexed(transform: DoubleField.(index: IntArray, Double) -> Double): DoubleTensor {
         val tensor = this.tensor
@@ -65,6 +71,7 @@ public open class DoubleTensorAlgebra :
         )
     }
 
+    @PerformancePitfall
     override fun zip(
         left: StructureND<Double>,
         right: StructureND<Double>,
@@ -377,6 +384,7 @@ public open class DoubleTensorAlgebra :
     override fun Tensor<Double>.viewAs(other: StructureND<Double>): DoubleTensor =
         tensor.view(other.shape)
 
+    @PerformancePitfall
     override infix fun StructureND<Double>.dot(other: StructureND<Double>): DoubleTensor {
         if (tensor.shape.size == 1 && other.shape.size == 1) {
             return DoubleTensor(intArrayOf(1), doubleArrayOf(tensor.times(other).tensor.mutableBuffer.array().sum()))
@@ -691,14 +699,19 @@ public open class DoubleTensorAlgebra :
         return resTensor
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.exp(): DoubleTensor = tensor.map { exp(it) }
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.ln(): DoubleTensor = tensor.map { ln(it) }
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.sqrt(): DoubleTensor = tensor.map { sqrt(it) }
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.cos(): DoubleTensor = tensor.map { cos(it) }
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.acos(): DoubleTensor = tensor.map { acos(it) }
 
     override fun StructureND<Double>.cosh(): DoubleTensor = tensor.map { cosh(it) }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
index 916388ba9..1e6dfd52e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
@@ -3,8 +3,11 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
+@file:OptIn(PerformancePitfall::class)
+
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.Shape
 import kotlin.jvm.JvmName
 
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
index c50404c9c..e43bbbc6f 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
@@ -6,17 +6,20 @@
 package space.kscience.kmath.viktor
 
 import org.jetbrains.bio.viktor.F64Array
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.ExtendedFieldOps
 import space.kscience.kmath.operations.NumbersAddOps
+import space.kscience.kmath.operations.PowerOperations
 
 @OptIn(UnstableKMathAPI::class)
 @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public open class ViktorFieldOpsND :
     FieldOpsND<Double, DoubleField>,
-    ExtendedFieldOps<StructureND<Double>> {
+    ExtendedFieldOps<StructureND<Double>>,
+    PowerOperations<StructureND<Double>> {
 
     public val StructureND<Double>.f64Buffer: F64Array
         get() = when (this) {
@@ -35,6 +38,7 @@ public open class ViktorFieldOpsND :
 
     override fun StructureND<Double>.unaryMinus(): StructureND<Double> = -1 * this
 
+    @PerformancePitfall
     override fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): ViktorStructureND =
         F64Array(*shape).apply {
             DefaultStrides(shape).asSequence().forEach { index ->
@@ -42,6 +46,7 @@ public open class ViktorFieldOpsND :
             }
         }.asStructure()
 
+    @PerformancePitfall
     override fun StructureND<Double>.mapIndexed(
         transform: DoubleField.(index: IntArray, Double) -> Double,
     ): ViktorStructureND = F64Array(*shape).apply {
@@ -50,6 +55,7 @@ public open class ViktorFieldOpsND :
         }
     }.asStructure()
 
+    @PerformancePitfall
     override fun zip(
         left: StructureND<Double>,
         right: StructureND<Double>,
@@ -110,7 +116,7 @@ public open class ViktorFieldOpsND :
 public val DoubleField.viktorAlgebra: ViktorFieldOpsND get() = ViktorFieldOpsND
 
 public open class ViktorFieldND(
-    override val shape: Shape
+    override val shape: Shape,
 ) : ViktorFieldOpsND(), FieldND<Double, DoubleField>, NumbersAddOps<StructureND<Double>> {
     override val zero: ViktorStructureND by lazy { F64Array.full(init = 0.0, shape = shape).asStructure() }
     override val one: ViktorStructureND by lazy { F64Array.full(init = 1.0, shape = shape).asStructure() }
-- 
2.34.1


From 0e1e97a3ffc766be5cad8b13b59c1b21a77a9f6e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 4 Nov 2021 10:58:27 +0300
Subject: [PATCH 373/713] Multik integration finished (for now)

---
 .../kmath/operations/DoubleBufferOps.kt       |  10 +-
 .../kmath/multik/MultikDoubleAlgebra.kt       | 143 ++++--------------
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  75 ++++-----
 .../kmath/tensors/core/internal/linUtils.kt   |   2 +-
 4 files changed, 65 insertions(+), 165 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index 28238c466..b0cce91d3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -17,12 +17,15 @@ import kotlin.math.*
 /**
  * [ExtendedFieldOps] over [DoubleBuffer].
  */
-public abstract class DoubleBufferOps :
-    BufferAlgebra<Double, DoubleField>, ExtendedFieldOps<Buffer<Double>>, Norm<Buffer<Double>, Double> {
+public abstract class DoubleBufferOps : BufferAlgebra<Double, DoubleField>, ExtendedFieldOps<Buffer<Double>>,
+    Norm<Buffer<Double>, Double> {
 
     override val elementAlgebra: DoubleField get() = DoubleField
     override val bufferFactory: BufferFactory<Double> get() = ::DoubleBuffer
 
+    override fun Buffer<Double>.map(block: DoubleField.(Double) -> Double): DoubleBuffer =
+        mapInline { DoubleField.block(it) }
+
     @UnstableKMathAPI
     override fun unaryOperationFunction(operation: String): (arg: Buffer<Double>) -> Buffer<Double> =
         super<ExtendedFieldOps>.unaryOperationFunction(operation)
@@ -87,8 +90,7 @@ public abstract class DoubleBufferOps :
             val aArray = left.array
             val bArray = right.array
             DoubleBuffer(DoubleArray(left.size) { aArray[it] * bArray[it] })
-        } else
-            DoubleBuffer(DoubleArray(left.size) { left[it] * right[it] })
+        } else DoubleBuffer(DoubleArray(left.size) { left[it] * right[it] })
     }
 
     override fun divide(left: Buffer<Double>, right: Buffer<Double>): DoubleBuffer {
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
index e5fef6c1e..4f18ee573 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
@@ -1,134 +1,47 @@
 package space.kscience.kmath.multik
 
-import org.jetbrains.kotlinx.multik.ndarray.data.DN
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
-import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
-import space.kscience.kmath.tensors.api.Tensor
+import space.kscience.kmath.operations.ExponentialOperations
+import space.kscience.kmath.operations.TrigonometricOperations
 
 public object MultikDoubleAlgebra : MultikDivisionTensorAlgebra<Double, DoubleField>(),
-    AnalyticTensorAlgebra<Double, DoubleField>, LinearOpsTensorAlgebra<Double, DoubleField> {
+    TrigonometricOperations<StructureND<Double>>, ExponentialOperations<StructureND<Double>> {
     override val elementAlgebra: DoubleField get() = DoubleField
     override val type: DataType get() = DataType.DoubleDataType
 
-    override fun StructureND<Double>.mean(): Double = multikStat.mean(asMultik().array)
+    override fun sin(arg: StructureND<Double>): MultikTensor<Double> = multikMath.mathEx.sin(arg.asMultik().array).wrap()
 
-    override fun StructureND<Double>.mean(dim: Int, keepDim: Boolean): Tensor<Double> =
-        multikStat.mean<Double,DN, DN>(asMultik().array, dim).wrap()
+    override fun cos(arg: StructureND<Double>): MultikTensor<Double> = multikMath.mathEx.cos(arg.asMultik().array).wrap()
 
-    override fun StructureND<Double>.std(): Double {
-        TODO("Not yet implemented")
+    override fun tan(arg: StructureND<Double>): MultikTensor<Double> = sin(arg) / cos(arg)
+
+    override fun asin(arg: StructureND<Double>): MultikTensor<Double>  = arg.map { asin(it) }
+
+    override fun acos(arg: StructureND<Double>): MultikTensor<Double> = arg.map { acos(it) }
+
+    override fun atan(arg: StructureND<Double>): MultikTensor<Double> = arg.map { atan(it) }
+
+    override fun exp(arg: StructureND<Double>): MultikTensor<Double> = multikMath.mathEx.exp(arg.asMultik().array).wrap()
+
+    override fun ln(arg: StructureND<Double>): MultikTensor<Double> = multikMath.mathEx.log(arg.asMultik().array).wrap()
+
+    override fun sinh(arg: StructureND<Double>): MultikTensor<Double> = (exp(arg) - exp(-arg)) / 2.0
+
+    override fun cosh(arg: StructureND<Double>): MultikTensor<Double> = (exp(arg) + exp(-arg)) / 2.0
+
+    override fun tanh(arg: StructureND<Double>): MultikTensor<Double> {
+        val expPlus = exp(arg)
+        val expMinus = exp(-arg)
+        return (expPlus - expMinus) / (expPlus + expMinus)
     }
 
-    override fun StructureND<Double>.std(dim: Int, keepDim: Boolean): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
+    override fun asinh(arg: StructureND<Double>): MultikTensor<Double> = arg.map { asinh(it) }
 
-    override fun StructureND<Double>.variance(): Double {
-        TODO("Not yet implemented")
-    }
+    override fun acosh(arg: StructureND<Double>): MultikTensor<Double> = arg.map { acosh(it) }
 
-    override fun StructureND<Double>.variance(dim: Int, keepDim: Boolean): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.exp(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.ln(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.sqrt(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.cos(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.acos(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.cosh(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.acosh(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.sin(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.asin(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.sinh(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.asinh(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.tan(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.atan(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.tanh(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.atanh(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.ceil(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.floor(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.det(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.inv(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.cholesky(): Tensor<Double> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.qr(): Pair<Tensor<Double>, Tensor<Double>> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.lu(): Triple<Tensor<Double>, Tensor<Double>, Tensor<Double>> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.svd(): Triple<Tensor<Double>, Tensor<Double>, Tensor<Double>> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<Double>.symEig(): Pair<Tensor<Double>, Tensor<Double>> {
-        TODO("Not yet implemented")
-    }
+    override fun atanh(arg: StructureND<Double>): MultikTensor<Double> = arg.map { atanh(it) }
 }
 
 public val Double.Companion.multikAlgebra: MultikTensorAlgebra<Double, DoubleField> get() = MultikDoubleAlgebra
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index bae49c037..864900adb 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -75,9 +75,9 @@ public open class DoubleTensorAlgebra :
     override fun zip(
         left: StructureND<Double>,
         right: StructureND<Double>,
-        transform: DoubleField.(Double, Double) -> Double
+        transform: DoubleField.(Double, Double) -> Double,
     ): DoubleTensor {
-        require(left.shape.contentEquals(right.shape)){
+        require(left.shape.contentEquals(right.shape)) {
             "The shapes in zip are not equal: left - ${left.shape}, right - ${right.shape}"
         }
         val leftTensor = left.tensor
@@ -422,14 +422,11 @@ public open class DoubleTensorAlgebra :
 
         for ((res, ab) in resTensor.matrixSequence().zip(newThis.matrixSequence().zip(newOther.matrixSequence()))) {
             val (a, b) = ab
-            dotHelper(a.as2D(), b.as2D(), res.as2D(), l, m1, n)
+            dotTo(a.as2D(), b.as2D(), res.as2D(), l, m1, n)
         }
 
         if (penultimateDim) {
-            return resTensor.view(
-                resTensor.shape.dropLast(2).toIntArray() +
-                        intArrayOf(resTensor.shape.last())
-            )
+            return resTensor.view(resTensor.shape.dropLast(2).toIntArray() + intArrayOf(resTensor.shape.last()))
         }
         if (lastDim) {
             return resTensor.view(resTensor.shape.dropLast(1).toIntArray())
@@ -441,7 +438,7 @@ public open class DoubleTensorAlgebra :
         diagonalEntries: Tensor<Double>,
         offset: Int,
         dim1: Int,
-        dim2: Int
+        dim2: Int,
     ): DoubleTensor {
         val n = diagonalEntries.shape.size
         val d1 = minusIndexFrom(n + 1, dim1)
@@ -577,13 +574,13 @@ public open class DoubleTensorAlgebra :
      */
     public fun Tensor<Double>.rowsByIndices(indices: IntArray): DoubleTensor = stack(indices.map { this[it] })
 
-    internal inline fun StructureND<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
+    private inline fun StructureND<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
         foldFunction(tensor.copyArray())
 
-    internal inline fun <reified R: Any> StructureND<Double>.foldDim(
-        foldFunction: (DoubleArray) -> R,
+    private inline fun <reified R : Any> StructureND<Double>.foldDim(
         dim: Int,
         keepDim: Boolean,
+        foldFunction: (DoubleArray) -> R,
     ): BufferedTensor<R> {
         check(dim < dimension) { "Dimension $dim out of range $dimension" }
         val resShape = if (keepDim) {
@@ -592,7 +589,7 @@ public open class DoubleTensorAlgebra :
             shape.take(dim).toIntArray() + shape.takeLast(dimension - dim - 1).toIntArray()
         }
         val resNumElements = resShape.reduce(Int::times)
-        val init = foldFunction(DoubleArray(1){0.0})
+        val init = foldFunction(DoubleArray(1) { 0.0 })
         val resTensor = BufferedTensor(resShape,
             MutableBuffer.auto(resNumElements) { init }, 0)
         for (index in resTensor.indices) {
@@ -608,66 +605,59 @@ public open class DoubleTensorAlgebra :
     override fun StructureND<Double>.sum(): Double = tensor.fold { it.sum() }
 
     override fun StructureND<Double>.sum(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim({ x -> x.sum() }, dim, keepDim).toDoubleTensor()
+        foldDim(dim, keepDim) { x -> x.sum() }.toDoubleTensor()
 
     override fun StructureND<Double>.min(): Double = this.fold { it.minOrNull()!! }
 
     override fun StructureND<Double>.min(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim({ x -> x.minOrNull()!! }, dim, keepDim).toDoubleTensor()
+        foldDim(dim, keepDim) { x -> x.minOrNull()!! }.toDoubleTensor()
 
     override fun StructureND<Double>.max(): Double = this.fold { it.maxOrNull()!! }
 
     override fun StructureND<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim({ x -> x.maxOrNull()!! }, dim, keepDim).toDoubleTensor()
+        foldDim(dim, keepDim) { x -> x.maxOrNull()!! }.toDoubleTensor()
 
 
     override fun StructureND<Double>.argMax(dim: Int, keepDim: Boolean): IntTensor =
-        foldDim({ x ->
+        foldDim(dim, keepDim) { x ->
             x.withIndex().maxByOrNull { it.value }?.index!!
-        }, dim, keepDim).toIntTensor()
+        }.toIntTensor()
 
 
     override fun StructureND<Double>.mean(): Double = this.fold { it.sum() / tensor.numElements }
 
-    override fun StructureND<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim(
-            { arr ->
-                check(dim < dimension) { "Dimension $dim out of range $dimension" }
-                arr.sum() / shape[dim]
-            },
-            dim,
-            keepDim
-        ).toDoubleTensor()
+    override fun StructureND<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(dim, keepDim) { arr ->
+        check(dim < dimension) { "Dimension $dim out of range $dimension" }
+        arr.sum() / shape[dim]
+    }.toDoubleTensor()
 
-    override fun StructureND<Double>.std(): Double = this.fold { arr ->
+    override fun StructureND<Double>.std(): Double = fold { arr ->
         val mean = arr.sum() / tensor.numElements
         sqrt(arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1))
     }
 
     override fun StructureND<Double>.std(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
-        { arr ->
-            check(dim < dimension) { "Dimension $dim out of range $dimension" }
-            val mean = arr.sum() / shape[dim]
-            sqrt(arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1))
-        },
         dim,
         keepDim
-    ).toDoubleTensor()
+    ) { arr ->
+        check(dim < dimension) { "Dimension $dim out of range $dimension" }
+        val mean = arr.sum() / shape[dim]
+        sqrt(arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1))
+    }.toDoubleTensor()
 
-    override fun StructureND<Double>.variance(): Double = this.fold { arr ->
+    override fun StructureND<Double>.variance(): Double = fold { arr ->
         val mean = arr.sum() / tensor.numElements
         arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1)
     }
 
     override fun StructureND<Double>.variance(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
-        { arr ->
-            check(dim < dimension) { "Dimension $dim out of range $dimension" }
-            val mean = arr.sum() / shape[dim]
-            arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1)
-        },
         dim,
         keepDim
-    ).toDoubleTensor()
+    ) { arr ->
+        check(dim < dimension) { "Dimension $dim out of range $dimension" }
+        val mean = arr.sum() / shape[dim]
+        arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1)
+    }.toDoubleTensor()
 
     private fun cov(x: DoubleTensor, y: DoubleTensor): Double {
         val n = x.shape[0]
@@ -699,19 +689,14 @@ public open class DoubleTensorAlgebra :
         return resTensor
     }
 
-    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.exp(): DoubleTensor = tensor.map { exp(it) }
 
-    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.ln(): DoubleTensor = tensor.map { ln(it) }
 
-    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.sqrt(): DoubleTensor = tensor.map { sqrt(it) }
 
-    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.cos(): DoubleTensor = tensor.map { cos(it) }
 
-    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.acos(): DoubleTensor = tensor.map { acos(it) }
 
     override fun StructureND<Double>.cosh(): DoubleTensor = tensor.map { cosh(it) }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index d31e02677..290809cfd 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -53,7 +53,7 @@ internal val <T> BufferedTensor<T>.matrices: VirtualBuffer<BufferedTensor<T>>
 
 internal fun <T> BufferedTensor<T>.matrixSequence(): Sequence<BufferedTensor<T>> = matrices.asSequence()
 
-internal fun dotHelper(
+internal fun dotTo(
     a: MutableStructure2D<Double>,
     b: MutableStructure2D<Double>,
     res: MutableStructure2D<Double>,
-- 
2.34.1


From bf504ae6c5b9bc25655ee543426325ba40529ed8 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 5 Nov 2021 16:58:13 +0300
Subject: [PATCH 374/713] Basic series

---
 build.gradle.kts                              |   3 +-
 .../space/kscience/kmath/series/analyzeDif.kt |  37 ++++
 .../kmath/structures/StreamDoubleFieldND.kt   |   2 +-
 kmath-core/build.gradle.kts                   |   7 -
 .../kmath/domains/HyperSquareDomain.kt        |   1 -
 .../kmath/expressions/specialExpressions.kt   |   1 -
 .../kmath/linear/BufferedLinearSpace.kt       |   3 +-
 .../space/kscience/kmath/nd/AlgebraND.kt      |   2 +-
 .../kscience/kmath/nd/BufferAlgebraND.kt      |  20 +--
 .../space/kscience/kmath/nd/BufferND.kt       |  16 +-
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |   8 +-
 .../nd/{ShapeIndexer.kt => ShapeIndices.kt}   |   4 +-
 .../space/kscience/kmath/nd/StructureND.kt    |   6 +-
 .../kmath/operations/bufferOperation.kt       |  11 +-
 .../space/kscience/kmath/structures/Buffer.kt |  11 +-
 .../space/kscience/kmath/real/RealVector.kt   |   1 -
 .../space/kscience/kmath/real/realND.kt       |   4 +-
 .../kmath/integration/GaussIntegrator.kt      |   1 -
 .../kscience/kmath/series/SeriesAlgebra.kt    | 170 ++++++++++++++++++
 .../kotlin/space/kscience/kmath/stat/Mean.kt  |   5 +-
 .../core/BroadcastDoubleTensorAlgebra.kt      |  16 +-
 .../kmath/tensors/core/BufferedTensor.kt      |  10 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  11 +-
 .../tensors/core/internal/broadcastUtils.kt   |  14 +-
 .../kmath/tensors/core/internal/linUtils.kt   |   3 +
 .../tensors/core/internal/tensorCastsUtils.kt |   2 +-
 .../kmath/tensors/core/internal/utils.kt      |   2 +-
 settings.gradle.kts                           |   4 +-
 28 files changed, 291 insertions(+), 84 deletions(-)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/{ShapeIndexer.kt => ShapeIndices.kt} (95%)
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index c2347f7be..7fb995aa1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,6 +2,7 @@ import java.net.URL
 
 plugins {
     id("ru.mipt.npm.gradle.project")
+    id("org.jetbrains.kotlinx.kover") version "0.4.1"
     kotlin("jupyter.api") apply false
 }
 
@@ -69,4 +70,4 @@ ksciencePublish {
     sonatype(publish = true)
 }
 
-apiValidation.nonPublicMarkers.add("space.kscience.kmath.misc.UnstableKMathAPI")
+apiValidation.nonPublicMarkers.add("space.kscience.kmath.misc.UnstableKMathAPI")
\ No newline at end of file
diff --git a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
new file mode 100644
index 000000000..466aa2039
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
@@ -0,0 +1,37 @@
+package space.kscience.kmath.series
+
+
+import net.jafama.StrictFastMath.abs
+import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.bufferAlgebra
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.operations.toList
+import space.kscience.kmath.structures.Buffer
+import space.kscience.plotly.Plotly
+import space.kscience.plotly.makeFile
+import space.kscience.plotly.scatter
+import kotlin.math.PI
+import kotlin.math.max
+
+fun main() = Double.algebra.bufferAlgebra.seriesAlgebra(0..100).invoke {
+    fun Buffer<Double>.plot() {
+        val ls = labels
+        Plotly.plot {
+            scatter {
+                x.numbers = ls
+                y.numbers = toList()
+            }
+        }.makeFile()
+    }
+
+
+    val s1 = series(100) { sin(2 * PI * it / 100) }
+    val s2 = series(100) { 1.0 }
+
+    (s1 - s2).plot()
+
+    // Kolmogorov-Smirnov test statistic
+    val kst = (s1 - s2).fold(0.0) { sup, arg -> max(sup, abs(arg))}
+
+
+}
\ No newline at end of file
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index 05a13f5d2..134c91e4a 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -36,7 +36,7 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
                 this@StreamDoubleFieldND.shape,
                 shape
             )
-            this is BufferND && this.indices == this@StreamDoubleFieldND.strides -> this.buffer as DoubleBuffer
+            this is BufferND && this.shapeIndices == this@StreamDoubleFieldND.strides -> this.buffer as DoubleBuffer
             else -> DoubleBuffer(strides.linearSize) { offset -> get(strides.index(offset)) }
         }
 
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index e4436c1df..564d06f49 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -2,7 +2,6 @@ plugins {
     kotlin("multiplatform")
     id("ru.mipt.npm.gradle.common")
     id("ru.mipt.npm.gradle.native")
-//    id("com.xcporter.metaview") version "0.0.5"
 }
 
 kotlin.sourceSets {
@@ -13,12 +12,6 @@ kotlin.sourceSets {
     }
 }
 
-//generateUml {
-//    classTree {
-//
-//    }
-//}
-
 readme {
     description = "Core classes, algebra definitions, basic linear algebra"
     maturity = ru.mipt.npm.gradle.Maturity.DEVELOPMENT
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
index 7ea3e22c4..2b288172a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
@@ -7,7 +7,6 @@ package space.kscience.kmath.domains
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.indices
 
 /**
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
index 907ce4004..d68869491 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
@@ -8,7 +8,6 @@ package space.kscience.kmath.expressions
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.indices
 import kotlin.jvm.JvmName
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 410fb8505..7674012e6 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -13,11 +13,10 @@ import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.VirtualBuffer
-import space.kscience.kmath.structures.indices
 
 
 public class BufferedLinearSpace<T, out A : Ring<T>>(
-    private val bufferAlgebra: BufferAlgebra<T, A>
+    private val bufferAlgebra: BufferAlgebra<T, A>,
 ) : LinearSpace<T, A> {
     override val elementAlgebra: A get() = bufferAlgebra.elementAlgebra
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index 113bd4c52..9022b886a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -26,7 +26,7 @@ public fun Shape(shapeFirst: Int, vararg shapeRest: Int): Shape = intArrayOf(sha
 public interface WithShape {
     public val shape: Shape
 
-    public val indices: ShapeIndexer get() = DefaultStrides(shape)
+    public val shapeIndices: ShapeIndices get() = DefaultStrides(shape)
 }
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index d25b455f4..447062886 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -13,7 +13,7 @@ import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.BufferFactory
 
 public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
-    public val indexerBuilder: (IntArray) -> ShapeIndexer
+    public val indexerBuilder: (IntArray) -> ShapeIndices
     public val bufferAlgebra: BufferAlgebra<T, A>
     override val elementAlgebra: A get() = bufferAlgebra.elementAlgebra
 
@@ -47,7 +47,7 @@ public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
         zipInline(left.toBufferND(), right.toBufferND(), transform)
 
     public companion object {
-        public val defaultIndexerBuilder: (IntArray) -> ShapeIndexer = DefaultStrides.Companion::invoke
+        public val defaultIndexerBuilder: (IntArray) -> ShapeIndices = DefaultStrides.Companion::invoke
     }
 }
 
@@ -55,7 +55,7 @@ public inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.mapInline(
     arg: BufferND<T>,
     crossinline transform: A.(T) -> T,
 ): BufferND<T> {
-    val indexes = arg.indices
+    val indexes = arg.shapeIndices
     val buffer = arg.buffer
     return BufferND(
         indexes,
@@ -69,7 +69,7 @@ internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.mapIndexedInline(
     arg: BufferND<T>,
     crossinline transform: A.(index: IntArray, arg: T) -> T,
 ): BufferND<T> {
-    val indexes = arg.indices
+    val indexes = arg.shapeIndices
     val buffer = arg.buffer
     return BufferND(
         indexes,
@@ -84,8 +84,8 @@ internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.zipInline(
     r: BufferND<T>,
     crossinline block: A.(l: T, r: T) -> T,
 ): BufferND<T> {
-    require(l.indices == r.indices) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
-    val indexes = l.indices
+    require(l.shapeIndices == r.shapeIndices) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
+    val indexes = l.shapeIndices
     val lbuffer = l.buffer
     val rbuffer = r.buffer
     return BufferND(
@@ -99,25 +99,25 @@ internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.zipInline(
 @OptIn(PerformancePitfall::class)
 public open class BufferedGroupNDOps<T, out A : Group<T>>(
     override val bufferAlgebra: BufferAlgebra<T, A>,
-    override val indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
+    override val indexerBuilder: (IntArray) -> ShapeIndices = BufferAlgebraND.defaultIndexerBuilder,
 ) : GroupOpsND<T, A>, BufferAlgebraND<T, A> {
     override fun StructureND<T>.unaryMinus(): StructureND<T> = map { -it }
 }
 
 public open class BufferedRingOpsND<T, out A : Ring<T>>(
     bufferAlgebra: BufferAlgebra<T, A>,
-    indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
+    indexerBuilder: (IntArray) -> ShapeIndices = BufferAlgebraND.defaultIndexerBuilder,
 ) : BufferedGroupNDOps<T, A>(bufferAlgebra, indexerBuilder), RingOpsND<T, A>
 
 public open class BufferedFieldOpsND<T, out A : Field<T>>(
     bufferAlgebra: BufferAlgebra<T, A>,
-    indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
+    indexerBuilder: (IntArray) -> ShapeIndices = BufferAlgebraND.defaultIndexerBuilder,
 ) : BufferedRingOpsND<T, A>(bufferAlgebra, indexerBuilder), FieldOpsND<T, A> {
 
     public constructor(
         elementAlgebra: A,
         bufferFactory: BufferFactory<T>,
-        indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
+        indexerBuilder: (IntArray) -> ShapeIndices = BufferAlgebraND.defaultIndexerBuilder,
     ) : this(BufferFieldOps(elementAlgebra, bufferFactory), indexerBuilder)
 
     @OptIn(PerformancePitfall::class)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 515988159..eea382492 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -14,17 +14,17 @@ import space.kscience.kmath.structures.MutableBufferFactory
  * Represents [StructureND] over [Buffer].
  *
  * @param T the type of items.
- * @param indices The strides to access elements of [Buffer] by linear indices.
+ * @param shapeIndices The strides to access elements of [Buffer] by linear indices.
  * @param buffer The underlying buffer.
  */
 public open class BufferND<out T>(
-    override val indices: ShapeIndexer,
+    override val shapeIndices: ShapeIndices,
     public open val buffer: Buffer<T>,
 ) : StructureND<T> {
 
-    override operator fun get(index: IntArray): T = buffer[indices.offset(index)]
+    override operator fun get(index: IntArray): T = buffer[shapeIndices.offset(index)]
 
-    override val shape: IntArray get() = indices.shape
+    override val shape: IntArray get() = shapeIndices.shape
 
     override fun toString(): String = StructureND.toString(this)
 }
@@ -37,7 +37,7 @@ public inline fun <T, reified R : Any> StructureND<T>.mapToBuffer(
     crossinline transform: (T) -> R,
 ): BufferND<R> {
     return if (this is BufferND<T>)
-        BufferND(this.indices, factory.invoke(indices.linearSize) { transform(buffer[it]) })
+        BufferND(this.shapeIndices, factory.invoke(shapeIndices.linearSize) { transform(buffer[it]) })
     else {
         val strides = DefaultStrides(shape)
         BufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
@@ -52,11 +52,11 @@ public inline fun <T, reified R : Any> StructureND<T>.mapToBuffer(
  * @param buffer The underlying buffer.
  */
 public class MutableBufferND<T>(
-    strides: ShapeIndexer,
+    strides: ShapeIndices,
     override val buffer: MutableBuffer<T>,
 ) : MutableStructureND<T>, BufferND<T>(strides, buffer) {
     override fun set(index: IntArray, value: T) {
-        buffer[indices.offset(index)] = value
+        buffer[shapeIndices.offset(index)] = value
     }
 }
 
@@ -68,7 +68,7 @@ public inline fun <T, reified R : Any> MutableStructureND<T>.mapToMutableBuffer(
     crossinline transform: (T) -> R,
 ): MutableBufferND<R> {
     return if (this is MutableBufferND<T>)
-        MutableBufferND(this.indices, factory.invoke(indices.linearSize) { transform(buffer[it]) })
+        MutableBufferND(this.shapeIndices, factory.invoke(shapeIndices.linearSize) { transform(buffer[it]) })
     else {
         val strides = DefaultStrides(shape)
         MutableBufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 8baeac21f..c51f80346 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -14,7 +14,7 @@ import kotlin.contracts.contract
 import kotlin.math.pow as kpow
 
 public class DoubleBufferND(
-    indexes: ShapeIndexer,
+    indexes: ShapeIndices,
     override val buffer: DoubleBuffer,
 ) : BufferND<Double>(indexes, buffer)
 
@@ -34,7 +34,7 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
         arg: DoubleBufferND,
         transform: (Double) -> Double,
     ): DoubleBufferND {
-        val indexes = arg.indices
+        val indexes = arg.shapeIndices
         val array = arg.buffer.array
         return DoubleBufferND(indexes, DoubleBuffer(indexes.linearSize) { transform(array[it]) })
     }
@@ -44,8 +44,8 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
         r: DoubleBufferND,
         block: (l: Double, r: Double) -> Double,
     ): DoubleBufferND {
-        require(l.indices == r.indices) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
-        val indexes = l.indices
+        require(l.shapeIndices == r.shapeIndices) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
+        val indexes = l.shapeIndices
         val lArray = l.buffer.array
         val rArray = r.buffer.array
         return DoubleBufferND(indexes, DoubleBuffer(indexes.linearSize) { block(lArray[it], rArray[it]) })
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
similarity index 95%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
index 20e180dd1..151899999 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
@@ -10,7 +10,7 @@ import kotlin.native.concurrent.ThreadLocal
 /**
  * A converter from linear index to multivariate index
  */
-public interface ShapeIndexer: Iterable<IntArray>{
+public interface ShapeIndices: Iterable<IntArray>{
     public val shape: Shape
 
     /**
@@ -44,7 +44,7 @@ public interface ShapeIndexer: Iterable<IntArray>{
 /**
  * Linear transformation of indexes
  */
-public abstract class Strides: ShapeIndexer {
+public abstract class Strides: ShapeIndices {
     /**
      * Array strides
      */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 614d97950..9256f0ba2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -54,7 +54,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
      * @return the lazy sequence of pairs of indices to values.
      */
     @PerformancePitfall
-    public fun elements(): Sequence<Pair<IntArray, T>> = indices.asSequence().map { it to get(it) }
+    public fun elements(): Sequence<Pair<IntArray, T>> = shapeIndices.asSequence().map { it to get(it) }
 
     /**
      * Feature is some additional structure information that allows to access it special properties or hints.
@@ -71,7 +71,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
             if (st1 === st2) return true
 
             // fast comparison of buffers if possible
-            if (st1 is BufferND && st2 is BufferND && st1.indices == st2.indices)
+            if (st1 is BufferND && st2 is BufferND && st1.shapeIndices == st2.shapeIndices)
                 return Buffer.contentEquals(st1.buffer, st2.buffer)
 
             //element by element comparison if it could not be avoided
@@ -87,7 +87,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
             if (st1 === st2) return true
 
             // fast comparison of buffers if possible
-            if (st1 is BufferND && st2 is BufferND && st1.indices == st2.indices)
+            if (st1 is BufferND && st2 is BufferND && st1.shapeIndices == st2.shapeIndices)
                 return Buffer.contentEquals(st1.buffer, st2.buffer)
 
             //element by element comparison if it could not be avoided
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
index 6bf3266e3..115f8c23a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
@@ -61,14 +61,14 @@ public inline fun <reified T> Buffer<T>.toTypedArray(): Array<T> = Array(size, :
 /**
  * Create a new buffer from this one with the given mapping function and using [Buffer.Companion.auto] buffer factory.
  */
-public inline fun <T : Any, reified R : Any> Buffer<T>.map(block: (T) -> R): Buffer<R> =
+public inline fun <T, reified R : Any> Buffer<T>.map(block: (T) -> R): Buffer<R> =
     Buffer.auto(size) { block(get(it)) }
 
 /**
  * Create a new buffer from this one with the given mapping function.
  * Provided [bufferFactory] is used to construct the new buffer.
  */
-public inline fun <T : Any, R : Any> Buffer<T>.map(
+public inline fun <T, R> Buffer<T>.map(
     bufferFactory: BufferFactory<R>,
     crossinline block: (T) -> R,
 ): Buffer<R> = bufferFactory(size) { block(get(it)) }
@@ -77,15 +77,16 @@ public inline fun <T : Any, R : Any> Buffer<T>.map(
  * Create a new buffer from this one with the given indexed mapping function.
  * Provided [BufferFactory] is used to construct the new buffer.
  */
-public inline fun <T : Any, reified R : Any> Buffer<T>.mapIndexed(
+public inline fun <T, reified R : Any> Buffer<T>.mapIndexed(
     bufferFactory: BufferFactory<R> = Buffer.Companion::auto,
     crossinline block: (index: Int, value: T) -> R,
 ): Buffer<R> = bufferFactory(size) { block(it, get(it)) }
 
 /**
  * Fold given buffer according to [operation]
+ * TODO add element algebra as fold receiver
  */
-public inline fun <T : Any, R> Buffer<T>.fold(initial: R, operation: (acc: R, T) -> R): R {
+public inline fun <T, R> Buffer<T>.fold(initial: R, operation: (acc: R, T) -> R): R {
     var accumulator = initial
     for (index in this.indices) accumulator = operation(accumulator, get(index))
     return accumulator
@@ -95,7 +96,7 @@ public inline fun <T : Any, R> Buffer<T>.fold(initial: R, operation: (acc: R, T)
  * Zip two buffers using given [transform].
  */
 @UnstableKMathAPI
-public inline fun <T1 : Any, T2 : Any, reified R : Any> Buffer<T1>.zip(
+public inline fun <T1, T2, reified R : Any> Buffer<T1>.zip(
     other: Buffer<T2>,
     bufferFactory: BufferFactory<R> = Buffer.Companion::auto,
     crossinline transform: (T1, T2) -> R,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index c68bca2d9..2c34327b5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -48,6 +48,11 @@ public interface Buffer<out T> {
 
     override fun toString(): String
 
+    /**
+     * Returns an [IntRange] of the valid indices for this [Buffer].
+     */
+    public val indices: IntRange get() = 0 until size
+
     public companion object {
 
         public fun toString(buffer: Buffer<*>): String =
@@ -100,10 +105,12 @@ public interface Buffer<out T> {
     }
 }
 
+public operator fun<T> Buffer<T>.get(index: UInt): T = get(index.toInt())
+
 /**
- * Returns an [IntRange] of the valid indices for this [Buffer].
+ * if index is in range of buffer, return the value. Otherwise, return null.
  */
-public val Buffer<*>.indices: IntRange get() = 0 until size
+public fun <T> Buffer<T>.getOrNull(index: Int): T? = if (index in indices) get(index) else null
 
 /**
  * Immutable wrapper for [MutableBuffer].
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
index cca1c3551..b108f696e 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
@@ -11,7 +11,6 @@ import space.kscience.kmath.operations.DoubleL2Norm
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer.Companion.double
 import space.kscience.kmath.structures.asBuffer
-import space.kscience.kmath.structures.indices
 import kotlin.math.pow
 
 public typealias DoubleVector = Point<Double>
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
index 56f50acbc..dc8f259bc 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
@@ -13,8 +13,8 @@ import space.kscience.kmath.structures.DoubleBuffer
  * Map one [BufferND] using function without indices.
  */
 public inline fun BufferND<Double>.mapInline(crossinline transform: DoubleField.(Double) -> Double): BufferND<Double> {
-    val array = DoubleArray(indices.linearSize) { offset -> DoubleField.transform(buffer[offset]) }
-    return BufferND(indices, DoubleBuffer(array))
+    val array = DoubleArray(shapeIndices.linearSize) { offset -> DoubleField.transform(buffer[offset]) }
+    return BufferND(shapeIndices, DoubleBuffer(array))
 }
 
 /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index 2b426d204..9ee292998 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -8,7 +8,6 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asBuffer
-import space.kscience.kmath.structures.indices
 
 /**
  * A simple one-pass integrator based on Gauss rule
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
new file mode 100644
index 000000000..3bf8c66b3
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -0,0 +1,170 @@
+package space.kscience.kmath.series
+
+import space.kscience.kmath.operations.*
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.BufferFactory
+import space.kscience.kmath.structures.getOrNull
+import kotlin.math.max
+import kotlin.math.min
+
+private fun IntRange.intersect(other: IntRange): IntRange =
+    max(first, other.first)..min(last, other.last)
+
+private val IntRange.size get() = last - first + 1
+
+private class BufferView<T>(val buffer: Buffer<T>, val offset: Int, override val size: Int) : Buffer<T> {
+    init {
+        require(offset >= 0) { " Range offset must be positive" }
+        require(offset < buffer.size) { "Range offset is beyond the buffer size" }
+        require(size > 0) { "Size must be positive" }
+        require(size < buffer.size) { "Slice size is larger than the buffer" }
+    }
+
+    override fun get(index: Int): T = buffer[index - offset]
+
+    override fun iterator(): Iterator<T> = buffer.asSequence().drop(offset).take(size).iterator()
+
+    override fun toString(): String = "$buffer[${offset}:${offset + size - 1}]"
+
+    override val indices: IntRange = offset until offset + size
+}
+
+/**
+ * A scope to operation on series
+ */
+public class SeriesAlgebra<T, A : Ring<T>, L>(
+    public val bufferAlgebra: BufferRingOps<T, A>,
+    private val labelResolver: (Int) -> L,
+) : RingOps<Buffer<T>> {
+
+    public val elementAlgebra: A get() = bufferAlgebra.elementAlgebra
+    public val bufferFactory: BufferFactory<T> get() = bufferAlgebra.bufferFactory
+
+    public val Buffer<T>.offset: UInt get() = indices.first.toUInt()
+
+    /**
+     * Build a new series
+     */
+    public fun series(size: Int, fromIndex: Int = 0, block: A.(label: L) -> T): Buffer<T> {
+        return bufferFactory(size) {
+            val index = it + fromIndex
+            elementAlgebra.block(labelResolver(index))
+        }.moveTo(fromIndex)
+    }
+
+    /**
+     * Move a series starting to start at a given index
+     */
+    public fun Buffer<T>.moveTo(index: Int): Buffer<T> = if (index == 0) {
+        this
+    } else if (this is BufferView) {
+        BufferView(buffer, index.toInt(), size)
+    } else {
+        BufferView(this, index.toInt(), size)
+    }
+
+    /**
+     * Create a buffer view using given range
+     */
+    public fun Buffer<T>.get(range: IntRange): Buffer<T> {
+        val size = range.size
+        return if (this is BufferView) {
+            BufferView(this, indices.first + range.first, size)
+        } else {
+            BufferView(this, range.first, size)
+        }
+    }
+
+    /**
+     * Get a label buffer for given buffer.
+     */
+    public val Buffer<T>.labels: List<L> get() = indices.map(labelResolver)
+
+
+    /**
+     * Try to resolve element by label and return null if element with a given label is not found
+     */
+    public operator fun Buffer<T>.get(label: L): T? {
+        val index = labels.indexOf(label)
+        if (index == -1) return null
+        return get(index + offset.toInt())
+    }
+
+    override fun add(left: Buffer<T>, right: Buffer<T>): Buffer<T> = elementAlgebra.invoke {
+        val newRange = left.indices.intersect(right.indices)
+        //TODO optimize copy at BufferAlgebra level
+        bufferFactory(newRange.size) {
+            val offset = it + newRange.first
+            left[offset] + right[offset]
+        }.moveTo(newRange.first)
+    }
+
+    override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
+
+    override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = elementAlgebra.invoke {
+        val newRange = left.indices.intersect(right.indices)
+        bufferFactory(newRange.size) {
+            val offset = it + newRange.first
+            left[offset] * right[offset]
+        }
+    }
+
+    /**
+     * Map a series to another series of the same size
+     */
+    public inline fun Buffer<T>.map(crossinline transform: A.(T) -> T): Buffer<T> {
+        val buf = bufferFactory(size) {
+            elementAlgebra.transform(get(it))
+        }
+        return buf.moveTo(indices.first)
+    }
+
+    /**
+     * Map series to another series of the same size with label
+     */
+    public inline fun Buffer<T>.mapWithLabel(crossinline transform: A.(arg: T, label: L) -> T): Buffer<T> {
+        val labels = labels
+        val buf = bufferFactory(size) {
+            elementAlgebra.transform(get(it), labels[it])
+        }
+        return buf.moveTo(indices.first)
+    }
+
+    public inline fun <R> Buffer<T>.fold(initial: R, operation: A.(acc: R, T) -> R): R {
+        var accumulator = initial
+        for (index in this.indices) accumulator = elementAlgebra.operation(accumulator, get(index))
+        return accumulator
+    }
+
+    public inline fun <R> Buffer<T>.foldWithLabel(initial: R, operation: A.(acc: R, arg: T, label: L) -> R): R {
+        val labels = labels
+        var accumulator = initial
+        for (index in this.indices) accumulator = elementAlgebra.operation(accumulator, get(index), labels[index])
+        return accumulator
+    }
+
+    /**
+     * Zip two buffers replacing missing values with [defaultValue]
+     */
+    public inline fun Buffer<T>.zip(
+        other: Buffer<T>,
+        defaultValue: T,
+        crossinline operation: A.(left: T?, right: T?) -> T?,
+    ): Buffer<T> {
+        val start = min(indices.first, other.indices.first)
+        val size = max(indices.last, other.indices.last) - start
+        return bufferFactory(size) {
+            elementAlgebra.operation(
+                getOrNull(it) ?: defaultValue,
+                other.getOrNull(it) ?: defaultValue
+            ) ?: defaultValue
+        }
+    }
+}
+
+public fun <T, A : Ring<T>, L> BufferRingOps<T, A>.seriesAlgebra(labels: Iterable<L>): SeriesAlgebra<T, A, L> {
+    val l = labels.toList()
+    return SeriesAlgebra(this) {
+        if (it in l.indices) l[it] else error("Index $it is outside of labels range ${l.indices}")
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
index 2a9bd3cd4..70da58171 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
@@ -7,7 +7,6 @@ package space.kscience.kmath.stat
 
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.indices
 
 /**
  * Arithmetic mean
@@ -45,8 +44,10 @@ public class Mean<T>(
     public companion object {
         @Deprecated("Use Double.mean instead")
         public val double: Mean<Double> = Mean(DoubleField) { sum, count -> sum / count }
+
         @Deprecated("Use Int.mean instead")
         public val int: Mean<Int> = Mean(IntRing) { sum, count -> sum / count }
+
         @Deprecated("Use Long.mean instead")
         public val long: Mean<Long> = Mean(LongRing) { sum, count -> sum / count }
 
@@ -60,6 +61,6 @@ public class Mean<T>(
 //TODO replace with optimized version which respects overflow
 public val Double.Companion.mean: Mean<Double> get() = Mean(DoubleField) { sum, count -> sum / count }
 public val Int.Companion.mean: Mean<Int> get() = Mean(IntRing) { sum, count -> sum / count }
-public val Long.Companion.mean: Mean<Long> get() =  Mean(LongRing) { sum, count -> sum / count }
+public val Long.Companion.mean: Mean<Long> get() = Mean(LongRing) { sum, count -> sum / count }
 
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index 10c747777..37c25e99f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -26,7 +26,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(tensor, arg.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
+        val resBuffer = DoubleArray(newThis.shapeIndices.linearSize) { i ->
             newThis.mutableBuffer.array()[i] + newOther.mutableBuffer.array()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
@@ -34,7 +34,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun Tensor<Double>.plusAssign(arg: StructureND<Double>) {
         val newOther = broadcastTo(arg.tensor, tensor.shape)
-        for (i in 0 until tensor.indices.linearSize) {
+        for (i in 0 until tensor.shapeIndices.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
@@ -44,7 +44,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(tensor, arg.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
+        val resBuffer = DoubleArray(newThis.shapeIndices.linearSize) { i ->
             newThis.mutableBuffer.array()[i] - newOther.mutableBuffer.array()[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
@@ -52,7 +52,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun Tensor<Double>.minusAssign(arg: StructureND<Double>) {
         val newOther = broadcastTo(arg.tensor, tensor.shape)
-        for (i in 0 until tensor.indices.linearSize) {
+        for (i in 0 until tensor.shapeIndices.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
@@ -62,7 +62,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(tensor, arg.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
+        val resBuffer = DoubleArray(newThis.shapeIndices.linearSize) { i ->
             newThis.mutableBuffer.array()[newThis.bufferStart + i] *
                     newOther.mutableBuffer.array()[newOther.bufferStart + i]
         }
@@ -71,7 +71,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun Tensor<Double>.timesAssign(arg: StructureND<Double>) {
         val newOther = broadcastTo(arg.tensor, tensor.shape)
-        for (i in 0 until tensor.indices.linearSize) {
+        for (i in 0 until tensor.shapeIndices.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
@@ -81,7 +81,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(tensor, arg.tensor)
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
+        val resBuffer = DoubleArray(newThis.shapeIndices.linearSize) { i ->
             newThis.mutableBuffer.array()[newOther.bufferStart + i] /
                     newOther.mutableBuffer.array()[newOther.bufferStart + i]
         }
@@ -90,7 +90,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun Tensor<Double>.divAssign(arg: StructureND<Double>) {
         val newOther = broadcastTo(arg.tensor, tensor.shape)
-        for (i in 0 until tensor.indices.linearSize) {
+        for (i in 0 until tensor.shapeIndices.linearSize) {
             tensor.mutableBuffer.array()[tensor.bufferStart + i] /=
                 newOther.mutableBuffer.array()[tensor.bufferStart + i]
         }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 54d8f54dc..0b1006b6c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -22,22 +22,22 @@ public open class BufferedTensor<T> internal constructor(
     /**
      * Buffer strides based on [TensorLinearStructure] implementation
      */
-    override val indices: Strides get() = TensorLinearStructure(shape)
+    override val shapeIndices: Strides get() = TensorLinearStructure(shape)
 
     /**
      * Number of elements in tensor
      */
     public val numElements: Int
-        get() = indices.linearSize
+        get() = shapeIndices.linearSize
 
-    override fun get(index: IntArray): T = mutableBuffer[bufferStart + indices.offset(index)]
+    override fun get(index: IntArray): T = mutableBuffer[bufferStart + shapeIndices.offset(index)]
 
     override fun set(index: IntArray, value: T) {
-        mutableBuffer[bufferStart + indices.offset(index)] = value
+        mutableBuffer[bufferStart + shapeIndices.offset(index)] = value
     }
 
     @PerformancePitfall
-    override fun elements(): Sequence<Pair<IntArray, T>> = indices.asSequence().map {
+    override fun elements(): Sequence<Pair<IntArray, T>> = shapeIndices.asSequence().map {
         it to get(it)
     }
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 864900adb..6c6264989 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -15,7 +15,6 @@ import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.MutableBuffer
-import space.kscience.kmath.structures.indices
 import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
 import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
 import space.kscience.kmath.tensors.api.Tensor
@@ -63,7 +62,7 @@ public open class DoubleTensorAlgebra :
         val tensor = this.tensor
         //TODO remove additional copy
         val sourceArray = tensor.copyArray()
-        val array = DoubleArray(tensor.numElements) { DoubleField.transform(tensor.indices.index(it), sourceArray[it]) }
+        val array = DoubleArray(tensor.numElements) { DoubleField.transform(tensor.shapeIndices.index(it), sourceArray[it]) }
         return DoubleTensor(
             tensor.shape,
             array,
@@ -365,11 +364,11 @@ public open class DoubleTensorAlgebra :
         val resTensor = DoubleTensor(resShape, resBuffer)
 
         for (offset in 0 until n) {
-            val oldMultiIndex = tensor.indices.index(offset)
+            val oldMultiIndex = tensor.shapeIndices.index(offset)
             val newMultiIndex = oldMultiIndex.copyOf()
             newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
 
-            val linearIndex = resTensor.indices.offset(newMultiIndex)
+            val linearIndex = resTensor.shapeIndices.offset(newMultiIndex)
             resTensor.mutableBuffer.array()[linearIndex] =
                 tensor.mutableBuffer.array()[tensor.bufferStart + offset]
         }
@@ -467,7 +466,7 @@ public open class DoubleTensorAlgebra :
         val resTensor = zeros(resShape)
 
         for (i in 0 until diagonalEntries.tensor.numElements) {
-            val multiIndex = diagonalEntries.tensor.indices.index(i)
+            val multiIndex = diagonalEntries.tensor.shapeIndices.index(i)
 
             var offset1 = 0
             var offset2 = abs(realOffset)
@@ -592,7 +591,7 @@ public open class DoubleTensorAlgebra :
         val init = foldFunction(DoubleArray(1) { 0.0 })
         val resTensor = BufferedTensor(resShape,
             MutableBuffer.auto(resNumElements) { init }, 0)
-        for (index in resTensor.indices) {
+        for (index in resTensor.shapeIndices) {
             val prefix = index.take(dim).toIntArray()
             val suffix = index.takeLast(dimension - dim - 1).toIntArray()
             resTensor[index] = foldFunction(DoubleArray(shape[dim]) { i ->
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
index 3787c0972..e0ea40b32 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
@@ -10,7 +10,7 @@ import kotlin.math.max
 
 internal fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: DoubleTensor, linearSize: Int) {
     for (linearIndex in 0 until linearSize) {
-        val totalMultiIndex = resTensor.indices.index(linearIndex)
+        val totalMultiIndex = resTensor.shapeIndices.index(linearIndex)
         val curMultiIndex = tensor.shape.copyOf()
 
         val offset = totalMultiIndex.size - curMultiIndex.size
@@ -23,7 +23,7 @@ internal fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: DoubleTenso
             }
         }
 
-        val curLinearIndex = tensor.indices.offset(curMultiIndex)
+        val curLinearIndex = tensor.shapeIndices.offset(curMultiIndex)
         resTensor.mutableBuffer.array()[linearIndex] =
             tensor.mutableBuffer.array()[tensor.bufferStart + curLinearIndex]
     }
@@ -112,7 +112,7 @@ internal fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTen
             val resTensor = DoubleTensor(totalShape + matrixShape, DoubleArray(n * matrixSize))
 
             for (linearIndex in 0 until n) {
-                val totalMultiIndex = outerTensor.indices.index(linearIndex)
+                val totalMultiIndex = outerTensor.shapeIndices.index(linearIndex)
                 var curMultiIndex = tensor.shape.sliceArray(0..tensor.shape.size - 3).copyOf()
                 curMultiIndex = IntArray(totalMultiIndex.size - curMultiIndex.size) { 1 } + curMultiIndex
 
@@ -127,13 +127,13 @@ internal fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTen
                 }
 
                 for (i in 0 until matrixSize) {
-                    val curLinearIndex = newTensor.indices.offset(
+                    val curLinearIndex = newTensor.shapeIndices.offset(
                         curMultiIndex +
-                                matrix.indices.index(i)
+                                matrix.shapeIndices.index(i)
                     )
-                    val newLinearIndex = resTensor.indices.offset(
+                    val newLinearIndex = resTensor.shapeIndices.offset(
                         totalMultiIndex +
-                                matrix.indices.index(i)
+                                matrix.shapeIndices.index(i)
                     )
 
                     resTensor.mutableBuffer.array()[resTensor.bufferStart + newLinearIndex] =
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index 290809cfd..5a2e69c87 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -3,8 +3,11 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
+@file:OptIn(PerformancePitfall::class)
+
 package space.kscience.kmath.tensors.core.internal
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.MutableStructure1D
 import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.as1D
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index 602430b03..6a674e15a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -28,7 +28,7 @@ internal fun <T> StructureND<T>.copyToBufferedTensor(): BufferedTensor<T> =
 
 internal fun <T> StructureND<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
     is BufferedTensor<T> -> this
-    is MutableBufferND<T> -> if (this.indices == TensorLinearStructure(this.shape)) {
+    is MutableBufferND<T> -> if (this.shapeIndices == TensorLinearStructure(this.shape)) {
         BufferedTensor(this.shape, this.buffer, 0)
     } else {
         this.copyToBufferedTensor()
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index 553ed6add..5a1fe9d57 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -85,7 +85,7 @@ internal fun format(value: Double, digits: Int = 4): String = buildString {
 internal fun DoubleTensor.toPrettyString(): String = buildString {
     var offset = 0
     val shape = this@toPrettyString.shape
-    val linearStructure = this@toPrettyString.indices
+    val linearStructure = this@toPrettyString.shapeIndices
     val vectorSize = shape.last()
     append("DoubleTensor(\n")
     var charOffset = 3
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e73381bf2..889855eef 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,8 +5,8 @@ pluginManagement {
         gradlePluginPortal()
     }
 
-    val kotlinVersion = "1.6.0-RC"
-    val toolsVersion = "0.10.5"
+    val kotlinVersion = "1.6.0-RC2"
+    val toolsVersion = "0.10.6"
 
     plugins {
         id("org.jetbrains.kotlinx.benchmark") version "0.3.1"
-- 
2.34.1


From a1351aa9428b44965bdcb811a96115dbaca9c8ab Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 8 Nov 2021 17:50:49 +0300
Subject: [PATCH 375/713] Buffer views

---
 .../space/kscience/kmath/fit/chiSquared.kt    |   4 +-
 .../kotlin/space/kscience/kmath/fit/qowFit.kt |   4 +-
 .../space/kscience/kmath/series/analyzeDif.kt |  44 ++--
 .../random/CMRandomGeneratorWrapper.kt        |   5 +-
 .../commons/transform/Transformations.kt      |   6 +-
 .../commons/optimization/OptimizeTest.kt      |   2 +-
 .../kmath/domains/HyperSquareDomain.kt        |   1 +
 .../kmath/expressions/specialExpressions.kt   |   3 +-
 .../kmath/linear/BufferedLinearSpace.kt       |   1 +
 .../space/kscience/kmath/nd/Structure1D.kt    |   2 +-
 .../kmath/operations/BufferAlgebra.kt         |   7 +-
 .../kmath/operations/DoubleBufferOps.kt       |   5 +-
 .../space/kscience/kmath/structures/Buffer.kt |  20 +-
 .../kscience/kmath/structures/BufferView.kt   | 140 ++++++++++++
 .../kscience/kmath/structures/DoubleBuffer.kt |   2 +-
 .../kscience/kmath/structures/FloatBuffer.kt  |   2 +-
 .../kscience/kmath/structures/IntBuffer.kt    |   2 +-
 .../kscience/kmath/structures/LongBuffer.kt   |   2 +-
 .../kmath/structures/MutableBuffer.kt         |   5 +-
 .../bufferExtensions.kt}                      |  39 +++-
 .../kmath/structures/BufferExpandedTest.kt    |  27 +++
 .../kmath/streaming/RingBufferTest.kt         |   2 +-
 .../space/kscience/kmath/real/RealMatrix.kt   |   2 +-
 .../space/kscience/kmath/real/RealVector.kt   |   1 +
 .../kmath/integration/GaussIntegrator.kt      |   1 +
 .../integration/GaussIntegratorRuleFactory.kt |   2 +-
 .../kmath/integration/SplineIntegrator.kt     |   6 +-
 .../kscience/kmath/geometry/Vector2DTest.kt   |   3 +-
 .../kscience/kmath/geometry/Vector3DTest.kt   |   2 +-
 .../kmath/histogram/UnivariateHistogram.kt    |   2 +-
 .../kscience/kmath/jupyter/KMathJupyter.kt    |   2 +-
 .../kmath/distributions/Distribution.kt       |   2 +-
 .../kmath/distributions/NormalDistribution.kt |   2 +-
 .../UniformDistribution.kt                    |   5 +-
 .../AhrensDieterExponentialSampler.kt         |   3 +-
 .../AhrensDieterMarsagliaTsangGammaSampler.kt |   2 -
 .../samplers/AliasMethodDiscreteSampler.kt    |   2 -
 .../{internal => samplers}/InternalErf.kt     |   2 +-
 .../{internal => samplers}/InternalGamma.kt   |   2 +-
 .../{internal => samplers}/InternalUtils.kt   |   2 +-
 .../samplers/KempSmallMeanPoissonSampler.kt   |   1 -
 .../samplers/NormalizedGaussianSampler.kt     |   1 -
 .../kscience/kmath/samplers/PoissonSampler.kt |   2 -
 .../kmath/{stat => samplers}/Sampler.kt       |   8 +-
 .../{stat => samplers}/SamplerAlgebra.kt      |   3 +-
 .../kscience/kmath/series/SeriesAlgebra.kt    | 210 +++++++++++-------
 .../kscience/kmath/series/seriesExtensions.kt |  97 ++++++++
 .../kotlin/space/kscience/kmath/stat/Mean.kt  |   1 +
 .../space/kscience/kmath/stat/Median.kt       |   2 +-
 .../kotlin/space/kscience/kmath/stat/Rank.kt  |  28 +++
 .../kscience/kmath/stat/StatisticalAlgebra.kt |  59 +++++
 .../space/kscience/kmath/stat/SamplerTest.kt  |   2 +
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |   1 +
 .../kmath/tensors/core/internal/linUtils.kt   |   2 +-
 .../kmath/tensors/core/internal/utils.kt      |   1 -
 55 files changed, 610 insertions(+), 176 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/{operations/bufferOperation.kt => structures/bufferExtensions.kt} (73%)
 create mode 100644 kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/BufferExpandedTest.kt
 rename kmath-stat/src/commonMain/kotlin/space/kscience/kmath/{stat => distributions}/UniformDistribution.kt (86%)
 rename kmath-stat/src/commonMain/kotlin/space/kscience/kmath/{internal => samplers}/InternalErf.kt (93%)
 rename kmath-stat/src/commonMain/kotlin/space/kscience/kmath/{internal => samplers}/InternalGamma.kt (99%)
 rename kmath-stat/src/commonMain/kotlin/space/kscience/kmath/{internal => samplers}/InternalUtils.kt (98%)
 rename kmath-stat/src/commonMain/kotlin/space/kscience/kmath/{stat => samplers}/Sampler.kt (86%)
 rename kmath-stat/src/commonMain/kotlin/space/kscience/kmath/{stat => samplers}/SamplerAlgebra.kt (95%)
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/seriesExtensions.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Rank.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
index dbe0b8454..45678c425 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
@@ -12,8 +12,6 @@ import space.kscience.kmath.commons.optimization.CMOptimizer
 import space.kscience.kmath.distributions.NormalDistribution
 import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.operations.asIterable
-import space.kscience.kmath.operations.toList
 import space.kscience.kmath.optimization.FunctionOptimizationTarget
 import space.kscience.kmath.optimization.optimizeWith
 import space.kscience.kmath.optimization.resultPoint
@@ -22,6 +20,8 @@ import space.kscience.kmath.real.DoubleVector
 import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
 import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.structures.asIterable
+import space.kscience.kmath.structures.toList
 import space.kscience.plotly.*
 import space.kscience.plotly.models.ScatterMode
 import space.kscience.plotly.models.TraceValues
diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
index d52976671..04764d763 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
@@ -13,8 +13,6 @@ import space.kscience.kmath.distributions.NormalDistribution
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.binding
 import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.operations.asIterable
-import space.kscience.kmath.operations.toList
 import space.kscience.kmath.optimization.QowOptimizer
 import space.kscience.kmath.optimization.chiSquaredOrNull
 import space.kscience.kmath.optimization.fitWith
@@ -22,6 +20,8 @@ import space.kscience.kmath.optimization.resultPoint
 import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
 import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.structures.asIterable
+import space.kscience.kmath.structures.toList
 import space.kscience.plotly.*
 import space.kscience.plotly.models.ScatterMode
 import kotlin.math.abs
diff --git a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
index 466aa2039..d67d59bfc 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
@@ -1,37 +1,43 @@
 package space.kscience.kmath.series
 
 
-import net.jafama.StrictFastMath.abs
+import kotlinx.html.FlowContent
+import kotlinx.html.h1
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.bufferAlgebra
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.operations.toList
 import space.kscience.kmath.structures.Buffer
-import space.kscience.plotly.Plotly
-import space.kscience.plotly.makeFile
-import space.kscience.plotly.scatter
+import space.kscience.kmath.structures.toList
+import space.kscience.plotly.*
 import kotlin.math.PI
-import kotlin.math.max
 
-fun main() = Double.algebra.bufferAlgebra.seriesAlgebra(0..100).invoke {
-    fun Buffer<Double>.plot() {
-        val ls = labels
-        Plotly.plot {
+fun main() = with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
+    fun FlowContent.plotSeries(buffer: Buffer<Double>) {
+        val ls = buffer.labels
+        plot {
             scatter {
                 x.numbers = ls
-                y.numbers = toList()
+                y.numbers = buffer.toList()
             }
-        }.makeFile()
+            layout {
+                xaxis {
+                    range(0.0..100.0)
+                }
+            }
+        }
     }
 
 
-    val s1 = series(100) { sin(2 * PI * it / 100) }
-    val s2 = series(100) { 1.0 }
+    val s1 = series(100) { sin(2 * PI * it / 100) + 1.0 }
+    val s2 = s1.slice(20..50).moveTo(40)
 
-    (s1 - s2).plot()
-
-    // Kolmogorov-Smirnov test statistic
-    val kst = (s1 - s2).fold(0.0) { sup, arg -> max(sup, abs(arg))}
+    val s3: Buffer<Double> = s1.zip(s2) { l, r -> l + r } //s1 + s2
+    val s4 = ln(s3)
 
+    Plotly.page {
+        h1 { +"This is my plot" }
+        plotSeries(s1)
+        plotSeries(s2)
+        plotSeries(s4)
+    }.makeFile()
 
 }
\ No newline at end of file
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
index 28294cf14..2183399ef 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
@@ -7,10 +7,11 @@ package space.kscience.kmath.commons.random
 
 import kotlinx.coroutines.runBlocking
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.misc.toIntExact
+import space.kscience.kmath.samplers.GaussianSampler
+import space.kscience.kmath.samplers.next
 import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.stat.next
+
 
 public class CMRandomGeneratorWrapper(
     public val factory: (IntArray) -> RandomGenerator,
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
index 73ab91542..3ac278ca0 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
@@ -10,13 +10,9 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import org.apache.commons.math3.transform.*
 import space.kscience.kmath.complex.Complex
-import space.kscience.kmath.operations.SuspendBufferTransform
 import space.kscience.kmath.streaming.chunked
 import space.kscience.kmath.streaming.spread
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.VirtualBuffer
-import space.kscience.kmath.structures.asBuffer
+import space.kscience.kmath.structures.*
 
 
 /**
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index c670ceead..681ec9ebc 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -13,11 +13,11 @@ import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.Symbol.Companion.y
 import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.operations.map
 import space.kscience.kmath.optimization.*
 import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
+import space.kscience.kmath.structures.map
 import kotlin.math.pow
 import kotlin.test.Test
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
index 2b288172a..7ea3e22c4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.domains
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.indices
 
 /**
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
index d68869491..6b17dfca5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
@@ -6,8 +6,9 @@
 package space.kscience.kmath.expressions
 
 import space.kscience.kmath.operations.ExtendedField
-import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.asIterable
+import space.kscience.kmath.structures.indices
 import kotlin.jvm.JvmName
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 7674012e6..bc736fc50 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -13,6 +13,7 @@ import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.VirtualBuffer
+import space.kscience.kmath.structures.indices
 
 
 public class BufferedLinearSpace<T, out A : Ring<T>>(
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index 3dcc77334..f2a4336eb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -6,10 +6,10 @@
 package space.kscience.kmath.nd
 
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.structures.asMutableBuffer
+import space.kscience.kmath.structures.asSequence
 import kotlin.jvm.JvmInline
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
index 634a115c7..17c26ad11 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
@@ -8,7 +8,6 @@ package space.kscience.kmath.operations
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
-import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.ShortBuffer
 
 public interface WithSize {
@@ -183,7 +182,7 @@ public class BufferField<T, A : Field<T>>(
 /**
  * Generate full buffer field from given buffer operations
  */
-public fun <T, A : Field<T>> BufferFieldOps<T, A>.withSize(size: Int): BufferField<T, A> =
+public fun <T, A : Field<T>> BufferAlgebra<T, A>.withSize(size: Int): BufferField<T, A> =
     BufferField(elementAlgebra, bufferFactory, size)
 
 //Double buffer specialization
@@ -196,6 +195,4 @@ public fun BufferField<Double, *>.buffer(vararg elements: Number): Buffer<Double
 public fun <T, A : Field<T>> A.bufferAlgebra(bufferFactory: BufferFactory<T>): BufferFieldOps<T, A> =
     BufferFieldOps(this, bufferFactory)
 
-public val DoubleField.bufferAlgebra: BufferFieldOps<Double, DoubleField>
-    get() = BufferFieldOps(DoubleField, ::DoubleBuffer)
-
+public val DoubleField.bufferAlgebra: DoubleBufferOps get() =  DoubleBufferOps
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index b0cce91d3..269823a10 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -7,10 +7,7 @@ package space.kscience.kmath.operations
 
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.BufferFactory
-import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.asBuffer
+import space.kscience.kmath.structures.*
 
 import kotlin.math.*
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index 2c34327b5..91b4ee71b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.structures
 
-import space.kscience.kmath.operations.asSequence
+import space.kscience.kmath.operations.WithSize
 import kotlin.jvm.JvmInline
 import kotlin.reflect.KClass
 
@@ -30,11 +30,11 @@ public typealias MutableBufferFactory<T> = (Int, (Int) -> T) -> MutableBuffer<T>
  *
  * @param T the type of elements contained in the buffer.
  */
-public interface Buffer<out T> {
+public interface Buffer<out T> : WithSize {
     /**
      * The size of this buffer.
      */
-    public val size: Int
+    override val size: Int
 
     /**
      * Gets element at given index.
@@ -44,15 +44,10 @@ public interface Buffer<out T> {
     /**
      * Iterates over all elements.
      */
-    public operator fun iterator(): Iterator<T>
+    public operator fun iterator(): Iterator<T> = indices.asSequence().map(::get).iterator()
 
     override fun toString(): String
 
-    /**
-     * Returns an [IntRange] of the valid indices for this [Buffer].
-     */
-    public val indices: IntRange get() = 0 until size
-
     public companion object {
 
         public fun toString(buffer: Buffer<*>): String =
@@ -105,7 +100,12 @@ public interface Buffer<out T> {
     }
 }
 
-public operator fun<T> Buffer<T>.get(index: UInt): T = get(index.toInt())
+/**
+ * Returns an [IntRange] of the valid indices for this [Buffer].
+ */
+public val <T> Buffer<T>.indices: IntRange get() = 0 until size
+
+public operator fun <T> Buffer<T>.get(index: UInt): T = get(index.toInt())
 
 /**
  * if index is in range of buffer, return the value. Otherwise, return null.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
new file mode 100644
index 000000000..d4e6a4a58
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
@@ -0,0 +1,140 @@
+package space.kscience.kmath.structures
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+
+/**
+ * A buffer that wraps an original buffer
+ */
+public interface BufferView<T> : Buffer<T> {
+    public val origin: Buffer<T>
+
+    /**
+     * Get the index in [origin] buffer from index in this buffer.
+     * Return -1 if element not present in the original buffer
+     * This method should be used internally to optimize non-boxing access.
+     */
+    @UnstableKMathAPI
+    public fun originIndex(index: Int): Int
+}
+
+/**
+ * A zero-copy buffer that "sees" only part of original buffer. Slice can't go beyond original buffer borders.
+ */
+public class BufferSlice<T>(
+    override val origin: Buffer<T>,
+    public val offset: UInt = 0U,
+    override val size: Int,
+) : BufferView<T> {
+
+    init {
+        require(size > 0) { "Size must be positive" }
+        require(offset + size.toUInt() <= origin.size.toUInt()) {
+            "End of buffer ${offset + size.toUInt()} is beyond the end of origin buffer size ${origin.size}"
+        }
+    }
+
+    override fun get(index: Int): T = if (index >= size) {
+        throw IndexOutOfBoundsException("$index is out of ${0 until size} rage")
+    } else {
+        origin[index.toUInt() + offset]
+    }
+
+    override fun iterator(): Iterator<T> =
+        (offset until (offset + size.toUInt())).asSequence().map { origin[it] }.iterator()
+
+    @UnstableKMathAPI
+    override fun originIndex(index: Int): Int = if (index >= size) -1 else index - offset.toInt()
+
+    override fun toString(): String = "$origin[$offset..${offset + size.toUInt()}"
+}
+
+/**
+ * An expanded buffer that could include the whole initial buffer ot its part and fills all space beyond it borders with [defaultValue].
+ *
+ * The [offset] parameter shows the shift of expanded buffer start relative to origin start and could be both positive and negative.
+ */
+public class BufferExpanded<T>(
+    override val origin: Buffer<T>,
+    public val defaultValue: T,
+    public val offset: Int = 0,
+    override val size: Int = origin.size,
+) : BufferView<T> {
+
+    init {
+        require(size > 0) { "Size must be positive" }
+    }
+
+    override fun get(index: Int): T = when (index) {
+        !in 0 until size -> throw IndexOutOfBoundsException("Index $index is not in $indices")
+        in -offset until origin.size - offset -> origin[index + offset]
+        else -> defaultValue
+    }
+
+    @UnstableKMathAPI
+    override fun originIndex(index: Int): Int = if (index in -offset until origin.size - offset) index + offset else -1
+
+    override fun toString(): String = "$origin[$offset..${offset + size}]"
+}
+
+/**
+ * Zero-copy select a slice inside the original buffer
+ */
+public fun <T> Buffer<T>.slice(range: UIntRange): BufferView<T> = BufferSlice(
+    this,
+    range.first,
+    (range.last - range.first).toInt() + 1
+)
+
+/**
+ * Resize original buffer to a given range using given [range], filling additional segments with [defaultValue].
+ * Range left border could be negative to designate adding new blank segment to the beginning of the buffer
+ */
+public fun <T> Buffer<T>.expand(
+    range: IntRange,
+    defaultValue: T,
+): BufferView<T> = if (range.first >= 0 && range.last < size) {
+    BufferSlice(
+        this,
+        range.first.toUInt(),
+        (range.last - range.first) + 1
+    )
+} else {
+    BufferExpanded(
+        this,
+        defaultValue,
+        range.first,
+        (range.last - range.first) + 1
+    )
+}
+
+/**
+ * A [BufferView] that overrides indexing of the original buffer
+ */
+public class PermutatedBuffer<T>(
+    override val origin: Buffer<T>,
+    private val permutations: IntArray,
+) : BufferView<T> {
+    init {
+        permutations.forEach { index ->
+            if (index !in origin.indices) {
+                throw IndexOutOfBoundsException("Index $index is not in ${origin.indices}")
+            }
+        }
+    }
+
+    override val size: Int get() = permutations.size
+
+    override fun get(index: Int): T = origin[permutations[index]]
+
+    override fun iterator(): Iterator<T> = permutations.asSequence().map { origin[it] }.iterator()
+
+    @UnstableKMathAPI
+    override fun originIndex(index: Int): Int = if (index in permutations.indices) permutations[index] else -1
+
+    override fun toString(): String = Buffer.toString(this)
+}
+
+/**
+ * Created a permuted view of given buffer using provided [indices]
+ */
+public fun <T> Buffer<T>.view(indices: IntArray): PermutatedBuffer<T> = PermutatedBuffer(this, indices)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
index 3b554ab07..087f81934 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
@@ -13,7 +13,7 @@ import kotlin.jvm.JvmInline
  * @property array the underlying array.
  */
 @JvmInline
-public value class DoubleBuffer(public val array: DoubleArray) : MutableBuffer<Double> {
+public value class DoubleBuffer(public val array: DoubleArray) : PrimitiveBuffer<Double> {
     override val size: Int get() = array.size
 
     override operator fun get(index: Int): Double = array[index]
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
index dc7903cbf..f99e73baa 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
@@ -14,7 +14,7 @@ import kotlin.jvm.JvmInline
  * @author Iaroslav Postovalov
  */
 @JvmInline
-public value class FloatBuffer(public val array: FloatArray) : MutableBuffer<Float> {
+public value class FloatBuffer(public val array: FloatArray) : PrimitiveBuffer<Float> {
     override val size: Int get() = array.size
 
     override operator fun get(index: Int): Float = array[index]
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
index ca078746c..1de36453f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
@@ -13,7 +13,7 @@ import kotlin.jvm.JvmInline
  * @property array the underlying array.
  */
 @JvmInline
-public value class IntBuffer(public val array: IntArray) : MutableBuffer<Int> {
+public value class IntBuffer(public val array: IntArray) : PrimitiveBuffer<Int> {
     override val size: Int get() = array.size
 
     override operator fun get(index: Int): Int = array[index]
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
index a0b5c78fa..0596729b4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
@@ -13,7 +13,7 @@ import kotlin.jvm.JvmInline
  * @property array the underlying array.
  */
 @JvmInline
-public value class LongBuffer(public val array: LongArray) : MutableBuffer<Long> {
+public value class LongBuffer(public val array: LongArray) : PrimitiveBuffer<Long> {
     override val size: Int get() = array.size
 
     override operator fun get(index: Int): Long = array[index]
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt
index 97185b918..396d51bc3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt
@@ -94,4 +94,7 @@ public interface MutableBuffer<T> : Buffer<T> {
         public inline fun <reified T : Any> auto(size: Int, initializer: (Int) -> T): MutableBuffer<T> =
             auto(T::class, size, initializer)
     }
-}
\ No newline at end of file
+}
+
+
+public sealed interface PrimitiveBuffer<T>: MutableBuffer<T>
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferExtensions.kt
similarity index 73%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferExtensions.kt
index 115f8c23a..f8b785724 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferExtensions.kt
@@ -3,10 +3,9 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
-package space.kscience.kmath.operations
+package space.kscience.kmath.structures
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.structures.*
 
 /**
  * Typealias for buffer transformations.
@@ -103,4 +102,40 @@ public inline fun <T1, T2, reified R : Any> Buffer<T1>.zip(
 ): Buffer<R> {
     require(size == other.size) { "Buffer size mismatch in zip: expected $size but found ${other.size}" }
     return bufferFactory(size) { transform(get(it), other[it]) }
+}
+
+/**
+ * Simular to https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/binary-search.html.
+ * The implementation is copied from Kotlin stdlib
+ */
+public fun <T : Comparable<T>> Buffer<T>.binarySearch(element: T, fromIndex: Int = 0, toIndex: Int = size): Int {
+    var low = fromIndex
+    var high = toIndex - 1
+
+    while (low <= high) {
+        val mid = (low + high).ushr(1) // safe from overflows
+        val midVal = get(mid)
+        val cmp = compareValues(midVal, element)
+
+        when {
+            cmp < 0 -> low = mid + 1
+            cmp > 0 -> high = mid - 1
+            else -> return mid // key found
+        }
+    }
+    return -(low + 1)  // key not found
+}
+
+/**
+ * Create a buffer containing sorted elements of this buffer.
+ */
+@Suppress("CAST_NEVER_SUCCEEDS")
+public fun <T : Comparable<T>> Buffer<T>.sorted(): Buffer<T> = when (this) {
+    is PrimitiveBuffer -> when (this) {
+        is LongBuffer -> toLongArray().apply { sort() }  as Buffer<T>
+        is FloatBuffer -> toFloatArray().apply { sort() }  as Buffer<T>
+        is IntBuffer -> toIntArray().apply { sort() }  as Buffer<T>
+        is DoubleBuffer -> toDoubleArray().apply { sort() }  as Buffer<T>
+    }
+    else -> asIterable().sorted().asBuffer()
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/BufferExpandedTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/BufferExpandedTest.kt
new file mode 100644
index 000000000..992080fb0
--- /dev/null
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/BufferExpandedTest.kt
@@ -0,0 +1,27 @@
+package space.kscience.kmath.structures
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFails
+
+internal class BufferExpandedTest {
+    private val buffer = (0..100).toList().asBuffer()
+
+    @Test
+    fun shrink(){
+        val view = buffer.slice(20U..30U)
+        assertEquals(20, view[0])
+        assertEquals(30, view[10])
+        assertFails { view[11] }
+    }
+
+    @Test
+    fun expandNegative(){
+        val view: BufferView<Int> = buffer.expand(-20..113,0)
+        assertEquals(0,view[4])
+        assertEquals(0,view[123])
+        assertEquals(100, view[120])
+        assertFails { view[-2] }
+        assertFails { view[134] }
+    }
+}
\ No newline at end of file
diff --git a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
index a3143a1ac..14081b0f5 100644
--- a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
+++ b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.streaming
 
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.runBlocking
-import space.kscience.kmath.operations.asSequence
+import space.kscience.kmath.structures.asSequence
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
index c1ee8b48f..88932d59b 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
@@ -13,9 +13,9 @@ import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.algebra
-import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.asIterable
 import kotlin.math.pow
 
 /*
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
index b108f696e..cca1c3551 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
@@ -11,6 +11,7 @@ import space.kscience.kmath.operations.DoubleL2Norm
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer.Companion.double
 import space.kscience.kmath.structures.asBuffer
+import space.kscience.kmath.structures.indices
 import kotlin.math.pow
 
 public typealias DoubleVector = Point<Double>
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index 9ee292998..2b426d204 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -8,6 +8,7 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asBuffer
+import space.kscience.kmath.structures.indices
 
 /**
  * A simple one-pass integrator based on Gauss rule
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
index 94c73832b..b09129626 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.integration
 
-import space.kscience.kmath.operations.map
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
+import space.kscience.kmath.structures.map
 import kotlin.jvm.Synchronized
 import kotlin.math.ulp
 import kotlin.native.concurrent.ThreadLocal
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index 6abe89aad..662cdf3d7 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -12,10 +12,14 @@ import space.kscience.kmath.interpolation.SplineInterpolator
 import space.kscience.kmath.interpolation.interpolatePolynomials
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.operations.sum
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.MutableBufferFactory
+import space.kscience.kmath.structures.map
 
 /**
  * Compute analytical indefinite integral of this [PiecewisePolynomial], keeping all intervals intact
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
index 89ee23354..6f4a9e2ed 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
@@ -1,6 +1,7 @@
 package space.kscience.kmath.geometry
 
-import space.kscience.kmath.operations.toList
+
+import space.kscience.kmath.structures.toList
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
index 70f8f4ebd..717e78871 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.geometry
 
-import space.kscience.kmath.operations.toList
+import space.kscience.kmath.structures.toList
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
index d5b74fb9b..018f47a7f 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
@@ -7,8 +7,8 @@ package space.kscience.kmath.histogram
 
 import space.kscience.kmath.domains.UnivariateDomain
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.asSequence
 
 
 @UnstableKMathAPI
diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
index 9731908b3..e646d2bd0 100644
--- a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -21,9 +21,9 @@ import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.MstRing
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.Structure2D
-import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.asSequence
 
 /**
  * A function for conversion of number to MST for pretty print
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
index 298bbc858..1cff271a7 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.distributions
 
 import space.kscience.kmath.chains.Chain
+import space.kscience.kmath.samplers.Sampler
 import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.stat.Sampler
 
 /**
  * A distribution of typed objects.
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
index 24429cf32..8f9250ee5 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.distributions
 
 import space.kscience.kmath.chains.Chain
-import space.kscience.kmath.internal.InternalErf
 import space.kscience.kmath.samplers.GaussianSampler
+import space.kscience.kmath.samplers.InternalErf
 import space.kscience.kmath.samplers.NormalizedGaussianSampler
 import space.kscience.kmath.samplers.ZigguratNormalizedGaussianSampler
 import space.kscience.kmath.stat.RandomGenerator
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/UniformDistribution.kt
similarity index 86%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
rename to kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/UniformDistribution.kt
index 4c0d08720..fd9fa0bdd 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/UniformDistribution.kt
@@ -3,12 +3,11 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
-package space.kscience.kmath.stat
+package space.kscience.kmath.distributions
 
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.chains.SimpleChain
-import space.kscience.kmath.distributions.Distribution
-import space.kscience.kmath.distributions.UnivariateDistribution
+import space.kscience.kmath.stat.RandomGenerator
 
 public class UniformDistribution(public val range: ClosedFloatingPointRange<Double>) : UnivariateDistribution<Double> {
     private val length: Double = range.endInclusive - range.start
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
index 5f923fe5f..fd8437191 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
@@ -7,7 +7,6 @@ package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingDoubleChain
 import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.stat.Sampler
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.math.ln
 import kotlin.math.pow
@@ -67,7 +66,7 @@ public class AhrensDieterExponentialSampler(public val mean: Double) : Sampler<D
             var qi = 0.0
 
             DoubleArray(16) { i ->
-                qi += ln2.pow(i + 1.0) / space.kscience.kmath.internal.InternalUtils.factorial(i + 1)
+                qi += ln2.pow(i + 1.0) / InternalUtils.factorial(i + 1)
                 qi
             }
         }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
index 063e055ce..fdba8ec90 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
@@ -7,9 +7,7 @@ package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.stat.Sampler
 import space.kscience.kmath.stat.chain
-import space.kscience.kmath.stat.next
 import kotlin.math.*
 
 /**
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
index b00db5b30..03ba142b7 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
@@ -6,9 +6,7 @@
 package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.Chain
-import space.kscience.kmath.internal.InternalUtils
 import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.stat.Sampler
 import space.kscience.kmath.stat.chain
 import kotlin.math.ceil
 import kotlin.math.max
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/InternalErf.kt
similarity index 93%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt
rename to kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/InternalErf.kt
index 5b3cb1859..b8f9fd25e 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/InternalErf.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
-package space.kscience.kmath.internal
+package space.kscience.kmath.samplers
 
 import kotlin.math.abs
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/InternalGamma.kt
similarity index 99%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
rename to kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/InternalGamma.kt
index 18abd669f..cdc40b44d 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/InternalGamma.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
-package space.kscience.kmath.internal
+package space.kscience.kmath.samplers
 
 import kotlin.math.*
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/InternalUtils.kt
similarity index 98%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
rename to kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/InternalUtils.kt
index 77ba02a25..b0c63ff15 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/InternalUtils.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
-package space.kscience.kmath.internal
+package space.kscience.kmath.samplers
 
 import kotlin.math.ln
 import kotlin.math.min
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
index 16f91570f..5146169a3 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
@@ -7,7 +7,6 @@ package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingIntChain
 import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.stat.Sampler
 import space.kscience.kmath.structures.IntBuffer
 import kotlin.math.exp
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
index ceb324e8d..d427d8e7a 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
@@ -7,7 +7,6 @@ package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingDoubleChain
 import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.stat.Sampler
 
 public interface BlockingDoubleSampler: Sampler<Double>{
     override fun sample(generator: RandomGenerator): BlockingDoubleChain
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
index d3ff05b06..3504a65bf 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
@@ -6,10 +6,8 @@
 package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingIntChain
-import space.kscience.kmath.internal.InternalUtils
 import space.kscience.kmath.misc.toIntExact
 import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.stat.Sampler
 import space.kscience.kmath.structures.IntBuffer
 import kotlin.math.*
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt
similarity index 86%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
rename to kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt
index 0b3b52cab..2c842ab65 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt
@@ -3,12 +3,16 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
-package space.kscience.kmath.stat
+package space.kscience.kmath.samplers
 
 import kotlinx.coroutines.flow.first
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.chains.collect
-import space.kscience.kmath.structures.*
+import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.BufferFactory
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.IntBuffer
 import kotlin.jvm.JvmName
 
 /**
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/SamplerAlgebra.kt
similarity index 95%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
rename to kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/SamplerAlgebra.kt
index e0be72d4b..c0b8e5b5c 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/SamplerAlgebra.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
-package space.kscience.kmath.stat
+package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.chains.ConstantChain
@@ -12,6 +12,7 @@ import space.kscience.kmath.chains.zip
 import space.kscience.kmath.operations.Group
 import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.stat.RandomGenerator
 
 /**
  * Implements [Sampler] by sampling only certain [value].
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index 3bf8c66b3..ae1bfe0e7 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -1,80 +1,125 @@
 package space.kscience.kmath.series
 
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.BufferAlgebra
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.RingOps
+import space.kscience.kmath.stat.StatisticalAlgebra
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.BufferFactory
-import space.kscience.kmath.structures.getOrNull
+import space.kscience.kmath.structures.BufferView
 import kotlin.math.max
 import kotlin.math.min
 
-private fun IntRange.intersect(other: IntRange): IntRange =
+@PublishedApi
+internal fun IntRange.intersect(other: IntRange): IntRange =
     max(first, other.first)..min(last, other.last)
 
-private val IntRange.size get() = last - first + 1
+@PublishedApi
+internal val IntRange.size
+    get() = last - first + 1
+
+@PublishedApi
+internal operator fun IntRange.contains(other: IntRange): Boolean = (other.first in this) && (other.last in this)
+
+//TODO add permutated buffer
+//TODO add rank function
+
+
+public interface Series<T> : Buffer<T> {
+    public val origin: Buffer<T>
+    /**
+     * Absolute position of start of this [Series] in [SeriesAlgebra]
+     */
+    public val position: Int
+}
+
+public val <T> Series<T>.absoluteIndices: IntRange get() = position until position + size
+
+/**
+ * A [BufferView] with index offset (both positive and negative) and possible size change
+ */
+private class OffsetBufer<T>(
+    override val origin: Buffer<T>,
+    override val position: Int,
+    override val size: Int = origin.size,
+) : Series<T>, Buffer<T> by origin {
 
-private class BufferView<T>(val buffer: Buffer<T>, val offset: Int, override val size: Int) : Buffer<T> {
     init {
-        require(offset >= 0) { " Range offset must be positive" }
-        require(offset < buffer.size) { "Range offset is beyond the buffer size" }
         require(size > 0) { "Size must be positive" }
-        require(size < buffer.size) { "Slice size is larger than the buffer" }
+        require(size <= origin.size) { "Slice size is larger than the original buffer" }
     }
 
-    override fun get(index: Int): T = buffer[index - offset]
-
-    override fun iterator(): Iterator<T> = buffer.asSequence().drop(offset).take(size).iterator()
-
-    override fun toString(): String = "$buffer[${offset}:${offset + size - 1}]"
-
-    override val indices: IntRange = offset until offset + size
+    override fun toString(): String = "$origin-->${position}"
 }
 
 /**
  * A scope to operation on series
  */
-public class SeriesAlgebra<T, A : Ring<T>, L>(
-    public val bufferAlgebra: BufferRingOps<T, A>,
+public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
+    override val bufferAlgebra: BA,
     private val labelResolver: (Int) -> L,
-) : RingOps<Buffer<T>> {
+) : RingOps<Buffer<T>>, StatisticalAlgebra<T, A, BA> {
 
-    public val elementAlgebra: A get() = bufferAlgebra.elementAlgebra
-    public val bufferFactory: BufferFactory<T> get() = bufferAlgebra.bufferFactory
+    public val Buffer<T>.indices: IntRange
+        get() = if (this is Series) {
+            absoluteIndices
+        } else {
+            0 until size
+        }
 
-    public val Buffer<T>.offset: UInt get() = indices.first.toUInt()
+    /**
+     * Get the value by absolute index in the series algebra or return null if index is out of range
+     */
+    public fun Buffer<T>.getAbsoluteOrNull(index: Int): T? = when {
+        index !in indices -> null
+        this is Series -> origin[index - position]
+        else -> get(index)
+    }
+
+    /**
+     * Get the value by absolute index in the series algebra or throw [IndexOutOfBoundsException] if index is out of range
+     */
+    public fun Buffer<T>.getAbsolute(index: Int): T =
+        getAbsoluteOrNull(index) ?: throw IndexOutOfBoundsException("Index $index is not in $indices")
+
+    /**
+     * Create an offset series with index starting point at [index]
+     */
+    public fun Buffer<T>.moveTo(index: Int): Series<T> = if (this is Series) {
+        OffsetBufer(origin, index, size)
+    } else {
+        OffsetBufer(this, index, size)
+    }
+
+    /**
+     * Create a buffer view using given absolute range
+     */
+    public fun Buffer<T>.slice(range: IntRange): Series<T> {
+        val size = range.size
+        return if (this is Series) {
+            OffsetBufer(this, indices.first + range.first, size)
+        } else {
+            OffsetBufer(this, range.first, size)
+        }
+    }
+
+    public fun Buffer<T>.expand(range: IntRange, defaultValue: T): Series<T> = if (range in indices) {
+        slice(range)
+    } else {
+        TODO()
+    }
+
+    public val Buffer<T>.offset: Int get() = if (this is Series) position else 0
 
     /**
      * Build a new series
      */
-    public fun series(size: Int, fromIndex: Int = 0, block: A.(label: L) -> T): Buffer<T> {
+    public fun series(size: Int, fromIndex: Int = 0, block: A.(label: L) -> T): Series<T> {
         return bufferFactory(size) {
             val index = it + fromIndex
             elementAlgebra.block(labelResolver(index))
         }.moveTo(fromIndex)
     }
 
-    /**
-     * Move a series starting to start at a given index
-     */
-    public fun Buffer<T>.moveTo(index: Int): Buffer<T> = if (index == 0) {
-        this
-    } else if (this is BufferView) {
-        BufferView(buffer, index.toInt(), size)
-    } else {
-        BufferView(this, index.toInt(), size)
-    }
-
-    /**
-     * Create a buffer view using given range
-     */
-    public fun Buffer<T>.get(range: IntRange): Buffer<T> {
-        val size = range.size
-        return if (this is BufferView) {
-            BufferView(this, indices.first + range.first, size)
-        } else {
-            BufferView(this, range.first, size)
-        }
-    }
-
     /**
      * Get a label buffer for given buffer.
      */
@@ -87,34 +132,15 @@ public class SeriesAlgebra<T, A : Ring<T>, L>(
     public operator fun Buffer<T>.get(label: L): T? {
         val index = labels.indexOf(label)
         if (index == -1) return null
-        return get(index + offset.toInt())
-    }
-
-    override fun add(left: Buffer<T>, right: Buffer<T>): Buffer<T> = elementAlgebra.invoke {
-        val newRange = left.indices.intersect(right.indices)
-        //TODO optimize copy at BufferAlgebra level
-        bufferFactory(newRange.size) {
-            val offset = it + newRange.first
-            left[offset] + right[offset]
-        }.moveTo(newRange.first)
-    }
-
-    override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
-
-    override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = elementAlgebra.invoke {
-        val newRange = left.indices.intersect(right.indices)
-        bufferFactory(newRange.size) {
-            val offset = it + newRange.first
-            left[offset] * right[offset]
-        }
+        return getAbsolute(index + offset.toInt())
     }
 
     /**
      * Map a series to another series of the same size
      */
-    public inline fun Buffer<T>.map(crossinline transform: A.(T) -> T): Buffer<T> {
+    public inline fun Buffer<T>.map(crossinline transform: A.(T) -> T): Series<T> {
         val buf = bufferFactory(size) {
-            elementAlgebra.transform(get(it))
+            elementAlgebra.transform(getAbsolute(it))
         }
         return buf.moveTo(indices.first)
     }
@@ -122,49 +148,63 @@ public class SeriesAlgebra<T, A : Ring<T>, L>(
     /**
      * Map series to another series of the same size with label
      */
-    public inline fun Buffer<T>.mapWithLabel(crossinline transform: A.(arg: T, label: L) -> T): Buffer<T> {
+    public inline fun Buffer<T>.mapWithLabel(crossinline transform: A.(arg: T, label: L) -> T): Series<T> {
         val labels = labels
         val buf = bufferFactory(size) {
-            elementAlgebra.transform(get(it), labels[it])
+            elementAlgebra.transform(getAbsolute(it), labels[it])
         }
         return buf.moveTo(indices.first)
     }
 
     public inline fun <R> Buffer<T>.fold(initial: R, operation: A.(acc: R, T) -> R): R {
         var accumulator = initial
-        for (index in this.indices) accumulator = elementAlgebra.operation(accumulator, get(index))
+        for (index in this.indices) accumulator = elementAlgebra.operation(accumulator, getAbsolute(index))
         return accumulator
     }
 
     public inline fun <R> Buffer<T>.foldWithLabel(initial: R, operation: A.(acc: R, arg: T, label: L) -> R): R {
         val labels = labels
         var accumulator = initial
-        for (index in this.indices) accumulator = elementAlgebra.operation(accumulator, get(index), labels[index])
+        for (index in this.indices) accumulator =
+            elementAlgebra.operation(accumulator, getAbsolute(index), labels[index])
         return accumulator
     }
 
     /**
-     * Zip two buffers replacing missing values with [defaultValue]
+     * Zip two buffers in the range whe they overlap
      */
     public inline fun Buffer<T>.zip(
         other: Buffer<T>,
-        defaultValue: T,
-        crossinline operation: A.(left: T?, right: T?) -> T?,
-    ): Buffer<T> {
-        val start = min(indices.first, other.indices.first)
-        val size = max(indices.last, other.indices.last) - start
-        return bufferFactory(size) {
+        crossinline operation: A.(left: T, right: T) -> T,
+    ): Series<T> {
+        val newRange = indices.intersect(other.indices)
+        return bufferFactory(newRange.size) {
             elementAlgebra.operation(
-                getOrNull(it) ?: defaultValue,
-                other.getOrNull(it) ?: defaultValue
-            ) ?: defaultValue
-        }
+                getAbsolute(it),
+                other.getAbsolute(it)
+            )
+        }.moveTo(newRange.first)
     }
+
+    override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
+
+    override fun add(left: Buffer<T>, right: Buffer<T>): Series<T> = left.zip(right) { l, r -> l + r }
+
+    override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = left.zip(right) { l, r -> l * r }
 }
 
-public fun <T, A : Ring<T>, L> BufferRingOps<T, A>.seriesAlgebra(labels: Iterable<L>): SeriesAlgebra<T, A, L> {
+public fun <T, A : Ring<T>, BA : BufferAlgebra<T, A>, L> BA.seriesAlgebra(labels: Iterable<L>): SeriesAlgebra<T, A, BA, L> {
     val l = labels.toList()
     return SeriesAlgebra(this) {
         if (it in l.indices) l[it] else error("Index $it is outside of labels range ${l.indices}")
     }
-}
\ No newline at end of file
+}
+
+public fun <T, A : Ring<T>, BA : BufferAlgebra<T, A>, L> BA.seriesAlgebra(labelGenerator: (Int) -> L): SeriesAlgebra<T, A, BA, L> =
+    SeriesAlgebra(this, labelGenerator)
+
+/**
+ * Create a series algebra using offset as a label
+ */
+public fun <T, A : Ring<T>, BA : BufferAlgebra<T, A>> BA.seriesAlgebra(): SeriesAlgebra<T, A, BA, Int> =
+    SeriesAlgebra(this) { it }
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/seriesExtensions.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/seriesExtensions.kt
new file mode 100644
index 000000000..882fa2c46
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/seriesExtensions.kt
@@ -0,0 +1,97 @@
+package space.kscience.kmath.series
+
+import space.kscience.kmath.operations.BufferAlgebra
+import space.kscience.kmath.operations.ExponentialOperations
+import space.kscience.kmath.operations.PowerOperations
+import space.kscience.kmath.operations.TrigonometricOperations
+import space.kscience.kmath.structures.Buffer
+
+
+//trigonometric
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.sin(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : TrigonometricOperations<Buffer<T>> =
+    bufferAlgebra.sin(arg).moveTo(arg.offset)
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.cos(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : TrigonometricOperations<Buffer<T>> =
+    bufferAlgebra.cos(arg).moveTo(arg.offset)
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.tan(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : TrigonometricOperations<Buffer<T>> =
+    bufferAlgebra.tan(arg).moveTo(arg.offset)
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.asin(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : TrigonometricOperations<Buffer<T>> =
+    bufferAlgebra.asin(arg).moveTo(arg.offset)
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.acos(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : TrigonometricOperations<Buffer<T>> =
+    bufferAlgebra.acos(arg).moveTo(arg.offset)
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.atan(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : TrigonometricOperations<Buffer<T>> =
+    bufferAlgebra.atan(arg).moveTo(arg.offset)
+
+
+//exponential
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.exp(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
+    bufferAlgebra.exp(arg).moveTo(arg.offset)
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.ln(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
+    bufferAlgebra.ln(arg).moveTo(arg.offset)
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.sinh(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
+    bufferAlgebra.sinh(arg).moveTo(arg.offset)
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.cosh(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
+    bufferAlgebra.cosh(arg).moveTo(arg.offset)
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.tanh(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
+    bufferAlgebra.tanh(arg).moveTo(arg.offset)
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.asinh(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
+    bufferAlgebra.asinh(arg).moveTo(arg.offset)
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.acosh(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
+    bufferAlgebra.acosh(arg).moveTo(arg.offset)
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.atanh(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
+    bufferAlgebra.atanh(arg).moveTo(arg.offset)
+
+
+//power
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.power(
+    arg: Buffer<T>,
+    pow: Number,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : PowerOperations<Buffer<T>> =
+    bufferAlgebra.power(arg, pow).moveTo(arg.offset)
+
+public fun <T, BA> SeriesAlgebra<T, *, BA, *>.sqrt(
+    arg: Buffer<T>,
+): Series<T> where BA : BufferAlgebra<T, *>, BA : PowerOperations<Buffer<T>> =
+    bufferAlgebra.sqrt(arg).moveTo(arg.offset)
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
index 70da58171..f2658549a 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.stat
 
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.indices
 
 /**
  * Arithmetic mean
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
index 664e4e8e7..54b2e42b3 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.stat
 
-import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.asSequence
 
 /**
  * Non-composable median
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Rank.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Rank.kt
new file mode 100644
index 000000000..92b7e1e7b
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Rank.kt
@@ -0,0 +1,28 @@
+package space.kscience.kmath.stat
+
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.asIterable
+
+public class Rank<T: Comparable<T>>: BlockingStatistic<T, IntArray> {
+    override fun evaluateBlocking(data: Buffer<T>): IntArray {
+        // https://www.geeksforgeeks.org/rank-elements-array/
+        val permutations = ArrayList<Pair<T, Int>>(data.size)
+        data.asIterable().mapIndexedTo(permutations) { i, v -> v to i }
+        permutations.sortBy { it.first }
+        var rank = 1
+        var i = 0
+        val r = IntArray(data.size) { 0 }
+        while (i < data.size) {
+            var j = i
+            while (j < data.size - 1 && permutations[j].first == permutations[j + 1]) ++j
+            val n = j - i + 1
+            (0 until n).map { k ->
+                val idx = permutations[i + k].second
+                r[idx] = rank + ((n - 1) * 0.5f).toInt()
+            }
+            rank += n
+            i += n
+        }
+        return r
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt
new file mode 100644
index 000000000..c8510a8eb
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt
@@ -0,0 +1,59 @@
+package space.kscience.kmath.stat
+
+import space.kscience.kmath.operations.*
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.BufferFactory
+import space.kscience.kmath.structures.asIterable
+import space.kscience.kmath.structures.sorted
+
+public interface StatisticalAlgebra<T, out A : Algebra<T>, out BA : BufferAlgebra<T, A>> : Algebra<Buffer<T>> {
+    public val bufferAlgebra: BA
+    public val elementAlgebra: A get() = bufferAlgebra.elementAlgebra
+    public val bufferFactory: BufferFactory<T> get() = bufferAlgebra.bufferFactory
+}
+
+/**
+ * Compute [empirical CDF function](https://en.wikipedia.org/wiki/Empirical_distribution_function)
+ */
+public fun <T : Comparable<T>> StatisticalAlgebra<T, *, *>.ecdf(buffer: Buffer<T>): (T) -> Double = { arg ->
+    buffer.asIterable().count { it < arg }.toDouble() / buffer.size
+}
+
+/**
+ * Implementation copied from https://commons.apache.org/proper/commons-math/javadocs/api-3.6.1/index.html?org/apache/commons/math3/stat/inference/KolmogorovSmirnovTest.html
+ */
+public fun <T : Comparable<T>, A, BA : BufferAlgebra<T, A>> StatisticalAlgebra<T, A, BA>.kolmogorovSmirnovTest(
+    x: Buffer<T>,
+    y: Buffer<T>,
+): T where A : Group<T>, A : NumericAlgebra<T> = elementAlgebra.invoke {
+    // Copy and sort the sample arrays
+    val sx = x.sorted()
+    val sy = y.sorted()
+    val n = sx.size
+    val m = sy.size
+
+    var rankX = 0
+    var rankY = 0
+    var curD: T = zero
+
+    // Find the max difference between cdf_x and cdf_y
+    var supD: T = zero
+    do {
+        val z = if (sx[rankX] <= sy[rankY]) sx[rankX] else sy[rankY]
+        while (rankX < n && sx[rankX].compareTo(z) == 0) {
+            rankX += 1;
+            curD += number(m);
+        }
+
+        while (rankY < m && sy[rankY].compareTo(z) == 0) {
+            rankY += 1;
+            curD -= number(n);
+        }
+
+        when {
+            curD > supD -> supD = curD
+            -curD > supD -> supD = -curD
+        }
+    } while (rankX < n && rankY < m);
+    return supD;
+}
\ No newline at end of file
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
index 4060c0505..8a5148f9e 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
@@ -6,6 +6,8 @@
 package space.kscience.kmath.stat
 
 import kotlinx.coroutines.runBlocking
+import space.kscience.kmath.samplers.Sampler
+import space.kscience.kmath.samplers.sampleBuffer
 import kotlin.test.Test
 
 class SamplerTest {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 6c6264989..6f10ad7ad 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -15,6 +15,7 @@ import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.MutableBuffer
+import space.kscience.kmath.structures.indices
 import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
 import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
 import space.kscience.kmath.tensors.api.Tensor
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index 5a2e69c87..dbfa09cdf 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -12,9 +12,9 @@ import space.kscience.kmath.nd.MutableStructure1D
 import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.VirtualBuffer
+import space.kscience.kmath.structures.asSequence
 import space.kscience.kmath.tensors.core.BufferedTensor
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index 5a1fe9d57..5ec2f240b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -6,7 +6,6 @@
 package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.nd.as1D
-import space.kscience.kmath.operations.toMutableList
 import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.*
-- 
2.34.1


From 1315a8cd34102e205d75af7af8fa7b06945772ee Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 8 Nov 2021 19:57:22 +0300
Subject: [PATCH 376/713] views cleanup

---
 .../space/kscience/kmath/series/analyzeDif.kt |  3 ++-
 .../kscience/kmath/structures/BufferView.kt   |  2 +-
 .../kscience/kmath/series/SeriesAlgebra.kt    | 24 +++----------------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
index d67d59bfc..9b7493438 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
@@ -6,6 +6,7 @@ import kotlinx.html.h1
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.bufferAlgebra
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.slice
 import space.kscience.kmath.structures.toList
 import space.kscience.plotly.*
 import kotlin.math.PI
@@ -28,7 +29,7 @@ fun main() = with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
 
 
     val s1 = series(100) { sin(2 * PI * it / 100) + 1.0 }
-    val s2 = s1.slice(20..50).moveTo(40)
+    val s2 = s1.slice(20U..50U).moveTo(40)
 
     val s3: Buffer<Double> = s1.zip(s2) { l, r -> l + r } //s1 + s2
     val s4 = ln(s3)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
index d4e6a4a58..d82efa865 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
@@ -137,4 +137,4 @@ public class PermutatedBuffer<T>(
 /**
  * Created a permuted view of given buffer using provided [indices]
  */
-public fun <T> Buffer<T>.view(indices: IntArray): PermutatedBuffer<T> = PermutatedBuffer(this, indices)
\ No newline at end of file
+public fun <T> Buffer<T>.permute(indices: IntArray): PermutatedBuffer<T> = PermutatedBuffer(this, indices)
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index ae1bfe0e7..de72c7346 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -14,14 +14,14 @@ internal fun IntRange.intersect(other: IntRange): IntRange =
     max(first, other.first)..min(last, other.last)
 
 @PublishedApi
-internal val IntRange.size
+internal val IntRange.size: Int
     get() = last - first + 1
 
 @PublishedApi
 internal operator fun IntRange.contains(other: IntRange): Boolean = (other.first in this) && (other.last in this)
 
-//TODO add permutated buffer
-//TODO add rank function
+//TODO add permutation sort
+//TODO check rank statistics
 
 
 public interface Series<T> : Buffer<T> {
@@ -90,24 +90,6 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
         OffsetBufer(this, index, size)
     }
 
-    /**
-     * Create a buffer view using given absolute range
-     */
-    public fun Buffer<T>.slice(range: IntRange): Series<T> {
-        val size = range.size
-        return if (this is Series) {
-            OffsetBufer(this, indices.first + range.first, size)
-        } else {
-            OffsetBufer(this, range.first, size)
-        }
-    }
-
-    public fun Buffer<T>.expand(range: IntRange, defaultValue: T): Series<T> = if (range in indices) {
-        slice(range)
-    } else {
-        TODO()
-    }
-
     public val Buffer<T>.offset: Int get() = if (this is Series) position else 0
 
     /**
-- 
2.34.1


From f6b576071dc2ef1c11d6b8ba1056f55065824d91 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 9 Nov 2021 12:25:17 +0300
Subject: [PATCH 377/713] Add non-boxing BufferView access

---
 .../kmath/structures/bufferPrimitiveAccess.kt | 37 +++++++++++++++
 .../kmath/{stat => random}/MCScope.kt         |  2 +-
 .../kmath/{stat => random}/RandomChain.kt     |  2 +-
 .../kmath/{stat => random}/RandomGenerator.kt |  2 +-
 .../kotlin/space/kscience/kmath/stat/Rank.kt  | 45 +++++++++++--------
 5 files changed, 66 insertions(+), 22 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
 rename kmath-stat/src/commonMain/kotlin/space/kscience/kmath/{stat => random}/MCScope.kt (98%)
 rename kmath-stat/src/commonMain/kotlin/space/kscience/kmath/{stat => random}/RandomChain.kt (97%)
 rename kmath-stat/src/commonMain/kotlin/space/kscience/kmath/{stat => random}/RandomGenerator.kt (99%)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
new file mode 100644
index 000000000..0e465c64b
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
@@ -0,0 +1,37 @@
+package space.kscience.kmath.structures
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+
+/**
+ * Non-boxing access to primitive [Double]
+ */
+@OptIn(UnstableKMathAPI::class)
+public fun Buffer<Double>.getDouble(index: Int): Double = if (this is BufferView) {
+    val originIndex = originIndex(index)
+    if( originIndex>=0) {
+        origin.getDouble(originIndex)
+    } else {
+        get(index)
+    }
+} else if (this is DoubleBuffer) {
+    array[index]
+} else {
+    get(index)
+}
+
+/**
+ * Non-boxing access to primitive [Int]
+ */
+@OptIn(UnstableKMathAPI::class)
+public fun Buffer<Int>.getInt(index: Int): Int = if (this is BufferView) {
+    val originIndex = originIndex(index)
+    if( originIndex>=0) {
+        origin.getInt(originIndex)
+    } else {
+        get(index)
+    }
+} else if (this is IntBuffer) {
+    array[index]
+} else {
+    get(index)
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/random/MCScope.kt
similarity index 98%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
rename to kmath-stat/src/commonMain/kotlin/space/kscience/kmath/random/MCScope.kt
index 5e1e577ba..4fb7cb2fb 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/random/MCScope.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
-package space.kscience.kmath.stat
+package space.kscience.kmath.random
 
 import kotlinx.coroutines.*
 import kotlin.contracts.InvocationKind
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/random/RandomChain.kt
similarity index 97%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
rename to kmath-stat/src/commonMain/kotlin/space/kscience/kmath/random/RandomChain.kt
index 61e472334..aec85d9d5 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/random/RandomChain.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
-package space.kscience.kmath.stat
+package space.kscience.kmath.random
 
 import space.kscience.kmath.chains.BlockingDoubleChain
 import space.kscience.kmath.chains.Chain
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/random/RandomGenerator.kt
similarity index 99%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
rename to kmath-stat/src/commonMain/kotlin/space/kscience/kmath/random/RandomGenerator.kt
index 98ee6402a..30b27e338 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/random/RandomGenerator.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
-package space.kscience.kmath.stat
+package space.kscience.kmath.random
 
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.random.Random
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Rank.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Rank.kt
index 92b7e1e7b..5a5b99177 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Rank.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Rank.kt
@@ -3,26 +3,33 @@ package space.kscience.kmath.stat
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asIterable
 
-public class Rank<T: Comparable<T>>: BlockingStatistic<T, IntArray> {
-    override fun evaluateBlocking(data: Buffer<T>): IntArray {
-        // https://www.geeksforgeeks.org/rank-elements-array/
-        val permutations = ArrayList<Pair<T, Int>>(data.size)
-        data.asIterable().mapIndexedTo(permutations) { i, v -> v to i }
-        permutations.sortBy { it.first }
-        var rank = 1
-        var i = 0
-        val r = IntArray(data.size) { 0 }
-        while (i < data.size) {
-            var j = i
-            while (j < data.size - 1 && permutations[j].first == permutations[j + 1]) ++j
-            val n = j - i + 1
-            (0 until n).map { k ->
-                val idx = permutations[i + k].second
-                r[idx] = rank + ((n - 1) * 0.5f).toInt()
+/**
+ * Rank statistics
+ */
+public class Rank<T : Comparable<T>> : BlockingStatistic<T, IntArray> {
+    override fun evaluateBlocking(data: Buffer<T>): IntArray = Companion.evaluate(data)
+
+    public companion object {
+        public fun <T : Comparable<T>> evaluate(data: Buffer<T>): IntArray {
+            // https://www.geeksforgeeks.org/rank-elements-array/
+            val permutations = ArrayList<Pair<T, Int>>(data.size)
+            data.asIterable().mapIndexedTo(permutations) { i, v -> v to i }
+            permutations.sortBy { it.first }
+            var rank = 1
+            var i = 0
+            val r = IntArray(data.size)
+            while (i < data.size) {
+                var j = i
+                while (j < data.size - 1 && permutations[j].first == permutations[j + 1]) ++j
+                val n = j - i + 1
+                (0 until n).map { k ->
+                    val idx = permutations[i + k].second
+                    r[idx] = rank + ((n - 1) * 0.5f).toInt()
+                }
+                rank += n
+                i += n
             }
-            rank += n
-            i += n
+            return r
         }
-        return r
     }
 }
\ No newline at end of file
-- 
2.34.1


From d62bc66d4ab24bdd240277a18c227f1adfee632d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 9 Nov 2021 13:42:22 +0300
Subject: [PATCH 378/713] Refactoring

---
 .../kmath/benchmarks/BufferBenchmark.kt       | 21 ++++++++++-----
 .../space/kscience/kmath/fit/chiSquared.kt    |  2 +-
 .../kotlin/space/kscience/kmath/fit/qowFit.kt |  2 +-
 .../kmath/stat/DistributionBenchmark.kt       |  1 +
 .../kscience/kmath/stat/DistributionDemo.kt   |  1 +
 .../random/CMRandomGeneratorWrapper.kt        |  2 +-
 .../commons/optimization/OptimizeTest.kt      |  2 +-
 .../kmath/operations/BufferAlgebra.kt         | 27 +++++++++----------
 .../kmath/operations/DoubleBufferOps.kt       |  9 +++++++
 .../kmath/distributions/Distribution.kt       |  2 +-
 .../distributions/FactorizedDistribution.kt   |  2 +-
 .../kmath/distributions/NormalDistribution.kt |  2 +-
 .../distributions/UniformDistribution.kt      |  2 +-
 .../space/kscience/kmath/random/MCScope.kt    |  4 +++
 .../AhrensDieterExponentialSampler.kt         |  2 +-
 .../AhrensDieterMarsagliaTsangGammaSampler.kt | 10 +++----
 .../samplers/AliasMethodDiscreteSampler.kt    |  4 +--
 .../kmath/samplers/BoxMullerSampler.kt        |  2 +-
 .../kmath/samplers/GaussianSampler.kt         |  4 +--
 .../samplers/KempSmallMeanPoissonSampler.kt   |  2 +-
 .../MarsagliaNormalizedGaussianSampler.kt     |  2 +-
 .../samplers/NormalizedGaussianSampler.kt     |  6 ++---
 .../kscience/kmath/samplers/PoissonSampler.kt |  2 +-
 .../space/kscience/kmath/samplers/Sampler.kt  |  2 +-
 .../kscience/kmath/samplers/SamplerAlgebra.kt |  2 +-
 .../ZigguratNormalizedGaussianSampler.kt      |  3 +--
 .../kmath/stat/RandomSourceGenerator.kt       |  6 ++++-
 .../kmath/stat/CommonsDistributionsTest.kt    |  1 +
 .../space/kscience/kmath/stat/MCScopeTest.kt  |  8 +++---
 .../space/kscience/kmath/stat/SamplerTest.kt  |  2 ++
 .../kscience/kmath/stat/StatisticTest.kt      |  2 ++
 .../kmath/tensors/core/internal/utils.kt      |  2 +-
 32 files changed, 86 insertions(+), 55 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
index 5cf194b67..f196e21c5 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
@@ -6,31 +6,38 @@
 package space.kscience.kmath.benchmarks
 
 import kotlinx.benchmark.Benchmark
+import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import space.kscience.kmath.complex.Complex
+import space.kscience.kmath.complex.ComplexField
 import space.kscience.kmath.complex.complex
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.MutableBuffer
 
 @State(Scope.Benchmark)
 internal class BufferBenchmark {
     @Benchmark
-    fun genericDoubleBufferReadWrite() {
+    fun genericDoubleBufferReadWrite(blackhole: Blackhole) {
         val buffer = DoubleBuffer(size) { it.toDouble() }
-
+        var res = 0.0
         (0 until size).forEach {
-            buffer[it]
+            res += buffer[it]
         }
+        blackhole.consume(res)
     }
 
     @Benchmark
-    fun complexBufferReadWrite() {
-        val buffer = MutableBuffer.complex(size / 2) { Complex(it.toDouble(), -it.toDouble()) }
+    fun complexBufferReadWrite(blackhole: Blackhole) = ComplexField {
+        val buffer = Buffer.complex(size / 2) { Complex(it.toDouble(), -it.toDouble()) }
 
+        var res = zero
         (0 until size / 2).forEach {
-            buffer[it]
+            res += buffer[it]
         }
+
+        blackhole.consume(res)
     }
 
     private companion object {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
index 45678c425..1325af0cd 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
@@ -16,10 +16,10 @@ import space.kscience.kmath.optimization.FunctionOptimizationTarget
 import space.kscience.kmath.optimization.optimizeWith
 import space.kscience.kmath.optimization.resultPoint
 import space.kscience.kmath.optimization.resultValue
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.real.DoubleVector
 import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
-import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.asIterable
 import space.kscience.kmath.structures.toList
 import space.kscience.plotly.*
diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
index 04764d763..afb901c66 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
@@ -17,9 +17,9 @@ import space.kscience.kmath.optimization.QowOptimizer
 import space.kscience.kmath.optimization.chiSquaredOrNull
 import space.kscience.kmath.optimization.fitWith
 import space.kscience.kmath.optimization.resultPoint
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
-import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.asIterable
 import space.kscience.kmath.structures.toList
 import space.kscience.plotly.*
diff --git a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
index 732c9a8e3..a61247ce7 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
@@ -10,6 +10,7 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.runBlocking
 import org.apache.commons.rng.sampling.distribution.BoxMullerNormalizedGaussianSampler
 import org.apache.commons.rng.simple.RandomSource
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.samplers.GaussianSampler
 import java.time.Duration
 import java.time.Instant
diff --git a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
index 685214c39..8e3983160 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.runBlocking
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.chains.collectWithState
 import space.kscience.kmath.distributions.NormalDistribution
+import space.kscience.kmath.random.RandomGenerator
 
 private data class AveragingChainState(var num: Int = 0, var value: Double = 0.0)
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
index 2183399ef..e5aefdee8 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
@@ -8,9 +8,9 @@ package space.kscience.kmath.commons.random
 import kotlinx.coroutines.runBlocking
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.toIntExact
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.samplers.next
-import space.kscience.kmath.stat.RandomGenerator
 
 
 public class CMRandomGeneratorWrapper(
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index 681ec9ebc..dddfc1063 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -14,7 +14,7 @@ import space.kscience.kmath.expressions.Symbol.Companion.y
 import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.optimization.*
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.structures.map
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
index 17c26ad11..1beff450b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
@@ -21,11 +21,6 @@ public interface BufferAlgebra<T, out A : Algebra<T>> : Algebra<Buffer<T>> {
     public val elementAlgebra: A
     public val bufferFactory: BufferFactory<T>
 
-    public fun buffer(size: Int, vararg elements: T): Buffer<T> {
-        require(elements.size == size) { "Expected $size elements but found ${elements.size}" }
-        return bufferFactory(size) { elements[it] }
-    }
-
     //TODO move to multi-receiver inline extension
     public fun Buffer<T>.map(block: A.(T) -> T): Buffer<T> = mapInline(this, block)
 
@@ -49,12 +44,15 @@ public interface BufferAlgebra<T, out A : Algebra<T>> : Algebra<Buffer<T>> {
     }
 }
 
+public fun <T, A : Algebra<T>> BufferAlgebra<T, A>.buffer(vararg elements: T): Buffer<T> =
+    bufferFactory(elements.size) { elements[it] }
+
 /**
  * Inline map
  */
 private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapInline(
     buffer: Buffer<T>,
-    crossinline block: A.(T) -> T
+    crossinline block: A.(T) -> T,
 ): Buffer<T> = bufferFactory(buffer.size) { elementAlgebra.block(buffer[it]) }
 
 /**
@@ -62,7 +60,7 @@ private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapInline(
  */
 private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapIndexedInline(
     buffer: Buffer<T>,
-    crossinline block: A.(index: Int, arg: T) -> T
+    crossinline block: A.(index: Int, arg: T) -> T,
 ): Buffer<T> = bufferFactory(buffer.size) { elementAlgebra.block(it, buffer[it]) }
 
 /**
@@ -71,7 +69,7 @@ private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapIndexedInline(
 private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.zipInline(
     l: Buffer<T>,
     r: Buffer<T>,
-    crossinline block: A.(l: T, r: T) -> T
+    crossinline block: A.(l: T, r: T) -> T,
 ): Buffer<T> {
     require(l.size == r.size) { "Incompatible buffer sizes. left: ${l.size}, right: ${r.size}" }
     return bufferFactory(l.size) { elementAlgebra.block(l[it], r[it]) }
@@ -128,13 +126,13 @@ public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.atanh(arg: Buff
     mapInline(arg) { atanh(it) }
 
 public fun <T, A : PowerOperations<T>> BufferAlgebra<T, A>.pow(arg: Buffer<T>, pow: Number): Buffer<T> =
-    mapInline(arg) {it.pow(pow) }
+    mapInline(arg) { it.pow(pow) }
 
 
-public open class BufferRingOps<T, A: Ring<T>>(
+public open class BufferRingOps<T, A : Ring<T>>(
     override val elementAlgebra: A,
     override val bufferFactory: BufferFactory<T>,
-) : BufferAlgebra<T, A>, RingOps<Buffer<T>>{
+) : BufferAlgebra<T, A>, RingOps<Buffer<T>> {
 
     override fun add(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l + r }
     override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l * r }
@@ -155,7 +153,8 @@ public val ShortRing.bufferAlgebra: BufferRingOps<Short, ShortRing>
 public open class BufferFieldOps<T, A : Field<T>>(
     elementAlgebra: A,
     bufferFactory: BufferFactory<T>,
-) : BufferRingOps<T, A>(elementAlgebra, bufferFactory), BufferAlgebra<T, A>, FieldOps<Buffer<T>>, ScaleOperations<Buffer<T>> {
+) : BufferRingOps<T, A>(elementAlgebra, bufferFactory), BufferAlgebra<T, A>, FieldOps<Buffer<T>>,
+    ScaleOperations<Buffer<T>> {
 
     override fun add(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l + r }
     override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l * r }
@@ -172,7 +171,7 @@ public open class BufferFieldOps<T, A : Field<T>>(
 public class BufferField<T, A : Field<T>>(
     elementAlgebra: A,
     bufferFactory: BufferFactory<T>,
-    override val size: Int
+    override val size: Int,
 ) : BufferFieldOps<T, A>(elementAlgebra, bufferFactory), Field<Buffer<T>>, WithSize {
 
     override val zero: Buffer<T> = bufferFactory(size) { elementAlgebra.zero }
@@ -195,4 +194,4 @@ public fun BufferField<Double, *>.buffer(vararg elements: Number): Buffer<Double
 public fun <T, A : Field<T>> A.bufferAlgebra(bufferFactory: BufferFactory<T>): BufferFieldOps<T, A> =
     BufferFieldOps(this, bufferFactory)
 
-public val DoubleField.bufferAlgebra: DoubleBufferOps get() =  DoubleBufferOps
+public val DoubleField.bufferAlgebra: DoubleBufferOps get() = DoubleBufferOps
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index 269823a10..e11dc20ba 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -135,6 +135,7 @@ public abstract class DoubleBufferOps : BufferAlgebra<Double, DoubleField>, Exte
     override fun scale(a: Buffer<Double>, value: Double): DoubleBuffer = a.mapInline { it * value }
 
     public companion object : DoubleBufferOps() {
+
         public inline fun Buffer<Double>.mapInline(block: (Double) -> Double): DoubleBuffer =
             if (this is DoubleBuffer) {
                 DoubleArray(size) { block(array[it]) }.asBuffer()
@@ -144,6 +145,14 @@ public abstract class DoubleBufferOps : BufferAlgebra<Double, DoubleField>, Exte
     }
 }
 
+public inline fun BufferAlgebra<Double, DoubleField>.buffer(size: Int, init: (Int) -> Double): DoubleBuffer {
+    val res = DoubleArray(size)
+    for (i in 0 until size) {
+        res[i] = init(i)
+    }
+    return res.asBuffer()
+}
+
 public object DoubleL2Norm : Norm<Point<Double>, Double> {
     override fun norm(arg: Point<Double>): Double = sqrt(arg.fold(0.0) { acc: Double, d: Double -> acc + d.pow(2) })
 }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
index 1cff271a7..13aab7b48 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.distributions
 
 import space.kscience.kmath.chains.Chain
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.samplers.Sampler
-import space.kscience.kmath.stat.RandomGenerator
 
 /**
  * A distribution of typed objects.
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
index 067b47796..af2d84ee5 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.distributions
 
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.chains.SimpleChain
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 
 /**
  * A multivariate distribution that takes a map of parameters.
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
index 8f9250ee5..0ef74ab87 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
@@ -6,11 +6,11 @@
 package space.kscience.kmath.distributions
 
 import space.kscience.kmath.chains.Chain
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.samplers.InternalErf
 import space.kscience.kmath.samplers.NormalizedGaussianSampler
 import space.kscience.kmath.samplers.ZigguratNormalizedGaussianSampler
-import space.kscience.kmath.stat.RandomGenerator
 import kotlin.math.*
 
 /**
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/UniformDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/UniformDistribution.kt
index fd9fa0bdd..38ad1378e 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/UniformDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/UniformDistribution.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.distributions
 
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.chains.SimpleChain
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 
 public class UniformDistribution(public val range: ClosedFloatingPointRange<Double>) : UnivariateDistribution<Double> {
     private val length: Double = range.endInclusive - range.start
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/random/MCScope.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/random/MCScope.kt
index 4fb7cb2fb..c7b1e69eb 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/random/MCScope.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/random/MCScope.kt
@@ -22,6 +22,10 @@ public class MCScope(
     public val random: RandomGenerator,
 )
 
+public fun MCScope.asCoroutineScope(): CoroutineScope = object : CoroutineScope {
+    override val coroutineContext: CoroutineContext get() = this@asCoroutineScope.coroutineContext
+}
+
 /**
  * Launches a supervised Monte-Carlo scope
  */
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
index fd8437191..04aaca232 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingDoubleChain
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.math.ln
 import kotlin.math.pow
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
index fdba8ec90..86e55985b 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.Chain
-import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.stat.chain
+import space.kscience.kmath.random.RandomGenerator
+import space.kscience.kmath.random.chain
 import kotlin.math.*
 
 /**
@@ -23,14 +23,14 @@ import kotlin.math.*
  */
 public class AhrensDieterMarsagliaTsangGammaSampler private constructor(
     alpha: Double,
-    theta: Double
+    theta: Double,
 ) : Sampler<Double> {
     private val delegate: BaseGammaSampler =
         if (alpha < 1) AhrensDieterGammaSampler(alpha, theta) else MarsagliaTsangGammaSampler(alpha, theta)
 
     private abstract class BaseGammaSampler internal constructor(
         protected val alpha: Double,
-        protected val theta: Double
+        protected val theta: Double,
     ) : Sampler<Double> {
         init {
             require(alpha > 0) { "alpha is not strictly positive: $alpha" }
@@ -117,7 +117,7 @@ public class AhrensDieterMarsagliaTsangGammaSampler private constructor(
     public companion object {
         public fun of(
             alpha: Double,
-            theta: Double
+            theta: Double,
         ): Sampler<Double> = AhrensDieterMarsagliaTsangGammaSampler(alpha, theta)
     }
 }
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
index 03ba142b7..b36b0a86c 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.Chain
-import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.stat.chain
+import space.kscience.kmath.random.RandomGenerator
+import space.kscience.kmath.random.chain
 import kotlin.math.ceil
 import kotlin.math.max
 import kotlin.math.min
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
index 14aa26275..e448c2388 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingDoubleChain
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.math.*
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
index e5d1ecb49..fbd71c40a 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingDoubleChain
 import space.kscience.kmath.chains.map
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 
 /**
  * Sampling from a Gaussian distribution with given mean and standard deviation.
@@ -21,7 +21,7 @@ import space.kscience.kmath.stat.RandomGenerator
 public class GaussianSampler(
     public val mean: Double,
     public val standardDeviation: Double,
-    private val normalized: NormalizedGaussianSampler = BoxMullerSampler
+    private val normalized: NormalizedGaussianSampler = BoxMullerSampler,
 ) : BlockingDoubleSampler {
 
     init {
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
index 5146169a3..8dbadae8d 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingIntChain
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.structures.IntBuffer
 import kotlin.math.exp
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
index 5e636f246..47ca81940 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingDoubleChain
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.math.ln
 import kotlin.math.sqrt
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
index d427d8e7a..1d2cc1633 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
@@ -6,9 +6,9 @@
 package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingDoubleChain
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 
-public interface BlockingDoubleSampler: Sampler<Double>{
+public interface BlockingDoubleSampler : Sampler<Double> {
     override fun sample(generator: RandomGenerator): BlockingDoubleChain
 }
 
@@ -17,6 +17,6 @@ public interface BlockingDoubleSampler: Sampler<Double>{
  * Marker interface for a sampler that generates values from an N(0,1)
  * [Gaussian distribution](https://en.wikipedia.org/wiki/Normal_distribution).
  */
-public fun interface NormalizedGaussianSampler : BlockingDoubleSampler{
+public fun interface NormalizedGaussianSampler : BlockingDoubleSampler {
     public companion object
 }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
index 3504a65bf..75ec3a132 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingIntChain
 import space.kscience.kmath.misc.toIntExact
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.structures.IntBuffer
 import kotlin.math.*
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt
index 2c842ab65..7fa9ce875 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.samplers
 import kotlinx.coroutines.flow.first
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.chains.collect
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.DoubleBuffer
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/SamplerAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/SamplerAlgebra.kt
index c0b8e5b5c..26ed72b06 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/SamplerAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/SamplerAlgebra.kt
@@ -12,7 +12,7 @@ import space.kscience.kmath.chains.zip
 import space.kscience.kmath.operations.Group
 import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 
 /**
  * Implements [Sampler] by sampling only certain [value].
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
index bda6f9819..5e5e7c49d 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
@@ -6,8 +6,7 @@
 package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingDoubleChain
-import space.kscience.kmath.misc.toIntExact
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.math.*
 
diff --git a/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt b/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
index a8e6a3362..0de9cff99 100644
--- a/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
+++ b/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
@@ -7,13 +7,17 @@ package space.kscience.kmath.stat
 
 import org.apache.commons.rng.UniformRandomProvider
 import org.apache.commons.rng.simple.RandomSource
+import space.kscience.kmath.random.RandomGenerator
 
 /**
  * Implements [RandomGenerator] by delegating all operations to [RandomSource].
  *
  * @property source the underlying [RandomSource] object.
  */
-public class RandomSourceGenerator internal constructor(public val source: RandomSource, seed: Long?) : RandomGenerator {
+public class RandomSourceGenerator internal constructor(
+    public val source: RandomSource,
+    seed: Long?,
+) : RandomGenerator {
     internal val random: UniformRandomProvider = seed?.let { RandomSource.create(source, seed) }
         ?: RandomSource.create(source)
 
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
index 2b6b1ca60..350409c6e 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.stat
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.samplers.GaussianSampler
 
 internal class CommonsDistributionsTest {
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
index 0c3d9cb0d..863bdf5ac 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
@@ -6,20 +6,22 @@
 package space.kscience.kmath.stat
 
 import kotlinx.coroutines.*
+import space.kscience.kmath.random.launch
+import space.kscience.kmath.random.mcScope
 import java.util.*
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 data class RandomResult(val branch: String, val order: Int, val value: Int)
 
-typealias ATest = suspend CoroutineScope.() -> Set<RandomResult>
+internal typealias ATest = suspend () -> Set<RandomResult>
 
-class MCScopeTest {
+internal class MCScopeTest {
     val simpleTest: ATest = {
         mcScope(1111) {
             val res = Collections.synchronizedSet(HashSet<RandomResult>())
 
-            launch {
+            launch{
                 //println(random)
                 repeat(10) {
                     delay(10)
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
index 8a5148f9e..931ec99cb 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
@@ -6,6 +6,8 @@
 package space.kscience.kmath.stat
 
 import kotlinx.coroutines.runBlocking
+import space.kscience.kmath.random.RandomGenerator
+import space.kscience.kmath.random.chain
 import space.kscience.kmath.samplers.Sampler
 import space.kscience.kmath.samplers.sampleBuffer
 import kotlin.test.Test
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
index 777b93c29..e3ebcf559 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
@@ -9,6 +9,8 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.last
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.runBlocking
+import space.kscience.kmath.random.RandomGenerator
+import space.kscience.kmath.random.chain
 import space.kscience.kmath.streaming.chunked
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index 5ec2f240b..c12374e88 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.nd.as1D
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.samplers.GaussianSampler
-import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.core.BufferedTensor
 import space.kscience.kmath.tensors.core.DoubleTensor
-- 
2.34.1


From fa9ff4c9787ef18cacbcb4ea38aa30bedf7de681 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 9 Nov 2021 17:56:53 +0300
Subject: [PATCH 379/713] Minor refactoring

---
 .../kmath/benchmarks/BufferBenchmark.kt       | 36 ++++++++++++++++++-
 .../space/kscience/kmath/series/analyzeDif.kt |  3 ++
 .../kscience/kmath/structures/BufferView.kt   | 18 +++++++---
 .../kmath/structures/bufferPrimitiveAccess.kt |  5 +--
 .../kscience/kmath/stat/StatisticalAlgebra.kt | 25 ++++++++-----
 5 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
index f196e21c5..6eb61e2fc 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
@@ -15,11 +15,24 @@ import space.kscience.kmath.complex.complex
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.getDouble
+import space.kscience.kmath.structures.permute
 
 @State(Scope.Benchmark)
 internal class BufferBenchmark {
+
     @Benchmark
-    fun genericDoubleBufferReadWrite(blackhole: Blackhole) {
+    fun doubleArrayReadWrite(blackhole: Blackhole) {
+        val buffer = DoubleArray(size) { it.toDouble() }
+        var res = 0.0
+        (0 until size).forEach {
+            res += buffer[it]
+        }
+        blackhole.consume(res)
+    }
+
+    @Benchmark
+    fun doubleBufferReadWrite(blackhole: Blackhole) {
         val buffer = DoubleBuffer(size) { it.toDouble() }
         var res = 0.0
         (0 until size).forEach {
@@ -28,6 +41,26 @@ internal class BufferBenchmark {
         blackhole.consume(res)
     }
 
+    @Benchmark
+    fun bufferViewReadWrite(blackhole: Blackhole) {
+        val buffer = DoubleBuffer(size) { it.toDouble() }.permute(reversedIndices)
+        var res = 0.0
+        (0 until size).forEach {
+            res += buffer[it]
+        }
+        blackhole.consume(res)
+    }
+
+    @Benchmark
+    fun bufferViewReadWriteSpecialized(blackhole: Blackhole) {
+        val buffer = DoubleBuffer(size) { it.toDouble() }.permute(reversedIndices)
+        var res = 0.0
+        (0 until size).forEach {
+            res += buffer.getDouble(it)
+        }
+        blackhole.consume(res)
+    }
+
     @Benchmark
     fun complexBufferReadWrite(blackhole: Blackhole) = ComplexField {
         val buffer = Buffer.complex(size / 2) { Complex(it.toDouble(), -it.toDouble()) }
@@ -42,5 +75,6 @@ internal class BufferBenchmark {
 
     private companion object {
         private const val size = 100
+        private val reversedIndices = IntArray(size){it}.apply { reverse() }
     }
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
index 9b7493438..b9c3141dd 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
@@ -5,6 +5,7 @@ import kotlinx.html.FlowContent
 import kotlinx.html.h1
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.bufferAlgebra
+import space.kscience.kmath.stat.ksComparisonStatistic
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.slice
 import space.kscience.kmath.structures.toList
@@ -34,6 +35,8 @@ fun main() = with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
     val s3: Buffer<Double> = s1.zip(s2) { l, r -> l + r } //s1 + s2
     val s4 = ln(s3)
 
+    val kmTest = ksComparisonStatistic(s1, s2)
+
     Plotly.page {
         h1 { +"This is my plot" }
         plotSeries(s1)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
index d82efa865..8dc0d63ef 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
@@ -79,11 +79,19 @@ public class BufferExpanded<T>(
 /**
  * Zero-copy select a slice inside the original buffer
  */
-public fun <T> Buffer<T>.slice(range: UIntRange): BufferView<T> = BufferSlice(
-    this,
-    range.first,
-    (range.last - range.first).toInt() + 1
-)
+public fun <T> Buffer<T>.slice(range: UIntRange): BufferView<T> = if (this is BufferSlice) {
+    BufferSlice(
+        origin,
+        this.offset + range.first,
+        (range.last - range.first).toInt() + 1
+    )
+} else {
+    BufferSlice(
+        this,
+        range.first,
+        (range.last - range.first).toInt() + 1
+    )
+}
 
 /**
  * Resize original buffer to a given range using given [range], filling additional segments with [defaultValue].
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
index 0e465c64b..d361cb013 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
@@ -5,7 +5,8 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 /**
  * Non-boxing access to primitive [Double]
  */
-@OptIn(UnstableKMathAPI::class)
+
+@UnstableKMathAPI
 public fun Buffer<Double>.getDouble(index: Int): Double = if (this is BufferView) {
     val originIndex = originIndex(index)
     if( originIndex>=0) {
@@ -22,7 +23,7 @@ public fun Buffer<Double>.getDouble(index: Int): Double = if (this is BufferView
 /**
  * Non-boxing access to primitive [Int]
  */
-@OptIn(UnstableKMathAPI::class)
+@UnstableKMathAPI
 public fun Buffer<Int>.getInt(index: Int): Int = if (this is BufferView) {
     val originIndex = originIndex(index)
     if( originIndex>=0) {
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt
index c8510a8eb..fcda58268 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt
@@ -1,5 +1,6 @@
 package space.kscience.kmath.stat
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
@@ -20,12 +21,20 @@ public fun <T : Comparable<T>> StatisticalAlgebra<T, *, *>.ecdf(buffer: Buffer<T
 }
 
 /**
+ * Resulting value of kolmogorov-smirnov two-sample statistic
+ */
+@UnstableKMathAPI
+public data class KMComparisonResult<T : Comparable<T>>(val n: Int, val m: Int, val value: T)
+
+/**
+ * Kolmogorov-Smirnov sample comparison test
  * Implementation copied from https://commons.apache.org/proper/commons-math/javadocs/api-3.6.1/index.html?org/apache/commons/math3/stat/inference/KolmogorovSmirnovTest.html
  */
-public fun <T : Comparable<T>, A, BA : BufferAlgebra<T, A>> StatisticalAlgebra<T, A, BA>.kolmogorovSmirnovTest(
+@UnstableKMathAPI
+public fun <T : Comparable<T>, A, BA : BufferAlgebra<T, A>> StatisticalAlgebra<T, A, BA>.ksComparisonStatistic(
     x: Buffer<T>,
     y: Buffer<T>,
-): T where A : Group<T>, A : NumericAlgebra<T> = elementAlgebra.invoke {
+): KMComparisonResult<T> where A : Group<T>, A : NumericAlgebra<T> = elementAlgebra.invoke {
     // Copy and sort the sample arrays
     val sx = x.sorted()
     val sy = y.sorted()
@@ -41,19 +50,19 @@ public fun <T : Comparable<T>, A, BA : BufferAlgebra<T, A>> StatisticalAlgebra<T
     do {
         val z = if (sx[rankX] <= sy[rankY]) sx[rankX] else sy[rankY]
         while (rankX < n && sx[rankX].compareTo(z) == 0) {
-            rankX += 1;
-            curD += number(m);
+            rankX += 1
+            curD += number(m)
         }
 
         while (rankY < m && sy[rankY].compareTo(z) == 0) {
-            rankY += 1;
-            curD -= number(n);
+            rankY += 1
+            curD -= number(n)
         }
 
         when {
             curD > supD -> supD = curD
             -curD > supD -> supD = -curD
         }
-    } while (rankX < n && rankY < m);
-    return supD;
+    } while (rankX < n && rankY < m)
+    return KMComparisonResult(n, m, supD)
 }
\ No newline at end of file
-- 
2.34.1


From 9a1f8a22661302e41a47e84dd52f2ea050d7b53c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 10 Nov 2021 11:51:20 +0300
Subject: [PATCH 380/713] remove unnecessary toInt

---
 .../kotlin/space/kscience/kmath/series/SeriesAlgebra.kt        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index de72c7346..79da3d98d 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -26,6 +26,7 @@ internal operator fun IntRange.contains(other: IntRange): Boolean = (other.first
 
 public interface Series<T> : Buffer<T> {
     public val origin: Buffer<T>
+
     /**
      * Absolute position of start of this [Series] in [SeriesAlgebra]
      */
@@ -114,7 +115,7 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
     public operator fun Buffer<T>.get(label: L): T? {
         val index = labels.indexOf(label)
         if (index == -1) return null
-        return getAbsolute(index + offset.toInt())
+        return getAbsolute(index + offset)
     }
 
     /**
-- 
2.34.1


From 6c2abdaab03de31084ece8b53f4e53c4c0e5c17a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 10 Nov 2021 20:04:29 +0300
Subject: [PATCH 381/713] First tensorflow test.

---
 kmath-tensorflow/build.gradle.kts             |   1 +
 .../tensorflow/DoubleTensorFlowAlgebra.kt     |  27 ++++-
 .../kmath/tensorflow/IntTensorFlowAlgebra.kt  |  21 ++++
 .../kmath/tensorflow/TensorFlowAlgebra.kt     | 104 ++++++++++--------
 .../kmath/tensorflow/DoubleTensorFlowOps.kt   |  19 ++++
 .../kscience/kmath/viktor/ViktorFieldOpsND.kt |   2 +
 6 files changed, 127 insertions(+), 47 deletions(-)
 create mode 100644 kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/IntTensorFlowAlgebra.kt
 create mode 100644 kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt

diff --git a/kmath-tensorflow/build.gradle.kts b/kmath-tensorflow/build.gradle.kts
index fa77a272a..c8307f01f 100644
--- a/kmath-tensorflow/build.gradle.kts
+++ b/kmath-tensorflow/build.gradle.kts
@@ -7,6 +7,7 @@ description = "Google tensorflow connector"
 dependencies {
     api(project(":kmath-tensors"))
     api("org.tensorflow:tensorflow-core-api:0.3.3")
+    testImplementation("org.tensorflow:tensorflow-core-platform:0.3.3")
 }
 
 readme {
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
index 44420cd76..eb8245944 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
@@ -5,6 +5,7 @@ import org.tensorflow.Output
 import org.tensorflow.ndarray.NdArray
 import org.tensorflow.op.core.Constant
 import org.tensorflow.types.TFloat64
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.DefaultStrides
 import space.kscience.kmath.nd.Shape
@@ -13,20 +14,22 @@ import space.kscience.kmath.operations.DoubleField
 
 public class DoubleTensorFlowOutput(
     graph: Graph,
-    output: Output<TFloat64>
+    output: Output<TFloat64>,
 ) : TensorFlowOutput<Double, TFloat64>(graph, output) {
-    override fun org.tensorflow.Tensor.actualizeTensor(): NdArray<Double> = output.asTensor()
+
+    override fun org.tensorflow.Tensor.actualizeTensor(): NdArray<Double> = this as TFloat64
+
 }
 
 public class DoubleTensorFlowAlgebra internal constructor(
-    graph: Graph
+    graph: Graph,
 ) : TensorFlowAlgebra<Double, TFloat64, DoubleField>(graph) {
 
     override val elementAlgebra: DoubleField get() = DoubleField
 
     override fun structureND(
         shape: Shape,
-        initializer: DoubleField.(IntArray) -> Double
+        initializer: DoubleField.(IntArray) -> Double,
     ): StructureND<Double> {
         val res = TFloat64.tensorOf(org.tensorflow.ndarray.Shape.of(*shape.toLongArray())) { array ->
             DefaultStrides(shape).forEach { index ->
@@ -53,4 +56,20 @@ public class DoubleTensorFlowAlgebra internal constructor(
     override fun Output<TFloat64>.wrap(): TensorFlowOutput<Double, TFloat64> = DoubleTensorFlowOutput(graph, this)
 
     override fun const(value: Double): Constant<TFloat64> = ops.constant(value)
+
+
+}
+
+public fun DoubleField.produceWithTF(
+    block: DoubleTensorFlowAlgebra.() -> StructureND<Double>,
+): StructureND<Double> = Graph().use { graph ->
+    val scope = DoubleTensorFlowAlgebra(graph)
+    scope.export(scope.block())
+}
+
+public fun DoubleField.produceMapWithTF(
+    block: DoubleTensorFlowAlgebra.() -> Map<Symbol, StructureND<Double>>,
+): Map<Symbol, StructureND<Double>> = Graph().use { graph ->
+    val scope = DoubleTensorFlowAlgebra(graph)
+    scope.block().mapValues { scope.export(it.value) }
 }
\ No newline at end of file
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/IntTensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/IntTensorFlowAlgebra.kt
new file mode 100644
index 000000000..084a445e0
--- /dev/null
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/IntTensorFlowAlgebra.kt
@@ -0,0 +1,21 @@
+package space.kscience.kmath.tensorflow
+
+import org.tensorflow.Graph
+import org.tensorflow.Output
+import org.tensorflow.ndarray.NdArray
+import org.tensorflow.types.TInt32
+import org.tensorflow.types.TInt64
+
+public class IntTensorFlowOutput(
+    graph: Graph,
+    output: Output<TInt32>,
+) : TensorFlowOutput<Int, TInt32>(graph, output) {
+    override fun org.tensorflow.Tensor.actualizeTensor(): NdArray<Int> = this as TInt32
+}
+
+public class LongTensorFlowOutput(
+    graph: Graph,
+    output: Output<TInt64>,
+) : TensorFlowOutput<Long, TInt64>(graph, output) {
+    override fun org.tensorflow.Tensor.actualizeTensor(): NdArray<Long> = this as TInt64
+}
\ No newline at end of file
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index e73620d01..1f978c0fc 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -8,8 +8,13 @@ import org.tensorflow.Session
 import org.tensorflow.ndarray.NdArray
 import org.tensorflow.op.Ops
 import org.tensorflow.op.core.Constant
+import org.tensorflow.op.core.Max
+import org.tensorflow.op.core.Min
+import org.tensorflow.op.core.Sum
+import org.tensorflow.types.TInt32
 import org.tensorflow.types.family.TType
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.Ring
@@ -38,8 +43,8 @@ public value class TensorFlowArray<T>(public val tensor: NdArray<T>) : Tensor<T>
 }
 
 public abstract class TensorFlowOutput<T, TT : TType>(
-    private val graph: Graph,
-    output: Output<TT>
+    protected val graph: Graph,
+    output: Output<TT>,
 ) : TensorFlowTensor<T> {
 
     public var output: Output<TT> = output
@@ -49,9 +54,10 @@ public abstract class TensorFlowOutput<T, TT : TType>(
 
     protected abstract fun org.tensorflow.Tensor.actualizeTensor(): NdArray<T>
 
-    private val actualTensor by lazy {
-        val session = Session(graph)
-        TensorFlowArray(session.runner().fetch(output).run().first().actualizeTensor())
+    internal val actualTensor by lazy {
+        Session(graph).use { session ->
+            TensorFlowArray(session.runner().fetch(output).run().first().actualizeTensor())
+        }
     }
 
     override fun get(index: IntArray): T = actualTensor[index]
@@ -66,9 +72,9 @@ public abstract class TensorFlowOutput<T, TT : TType>(
 }
 
 
-public abstract class TensorFlowAlgebra<T, TT : TType, A: Ring<T>> internal constructor(
-    protected val graph: Graph
-) : TensorAlgebra<T,A> {
+public abstract class TensorFlowAlgebra<T, TT : TType, A : Ring<T>> internal constructor(
+    protected val graph: Graph,
+) : TensorAlgebra<T, A> {
 
     protected val ops: Ops by lazy { Ops.create(graph) }
 
@@ -83,7 +89,7 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A: Ring<T>> internal cons
 
     private inline fun StructureND<T>.biOp(
         other: StructureND<T>,
-        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
+        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>,
     ): TensorFlowOutput<T, TT> {
         val left = asTensorFlow().output
         val right = other.asTensorFlow().output
@@ -92,7 +98,7 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A: Ring<T>> internal cons
 
     private inline fun T.biOp(
         other: StructureND<T>,
-        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
+        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>,
     ): TensorFlowOutput<T, TT> {
         val left = const(this)
         val right = other.asTensorFlow().output
@@ -101,7 +107,7 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A: Ring<T>> internal cons
 
     private inline fun StructureND<T>.biOp(
         value: T,
-        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
+        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>,
     ): TensorFlowOutput<T, TT> {
         val left = asTensorFlow().output
         val right = const(value)
@@ -110,7 +116,7 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A: Ring<T>> internal cons
 
     private inline fun Tensor<T>.inPlaceOp(
         other: StructureND<T>,
-        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
+        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>,
     ): Unit {
         val origin = asTensorFlow()
         val left = origin.output
@@ -120,7 +126,7 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A: Ring<T>> internal cons
 
     private inline fun Tensor<T>.inPlaceOp(
         value: T,
-        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>
+        operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>,
     ): Unit {
         val origin = asTensorFlow()
         val left = origin.output
@@ -128,8 +134,8 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A: Ring<T>> internal cons
         origin.output = operation(left, right).asOutput()
     }
 
-    private inline fun unOp(value: StructureND<T>, operation: (Operand<TT>) -> Operand<TT>): TensorFlowOutput<T, TT> =
-        operation(value.asTensorFlow().output).asOutput().wrap()
+    private inline fun StructureND<T>.unOp(operation: (Operand<TT>) -> Operand<TT>): TensorFlowOutput<T, TT> =
+        operation(asTensorFlow().output).asOutput().wrap()
 
     override fun T.plus(arg: StructureND<T>): TensorFlowOutput<T, TT> = biOp(arg, ops.math::add)
 
@@ -149,67 +155,79 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A: Ring<T>> internal cons
 
     override fun Tensor<T>.minusAssign(value: T): Unit = inPlaceOp(value, ops.math::sub)
 
-    override fun Tensor<T>.minusAssign(other: StructureND<T>): Unit = inPlaceOp(other, ops.math::sub)
+    override fun Tensor<T>.minusAssign(arg: StructureND<T>): Unit = inPlaceOp(arg, ops.math::sub)
 
     override fun T.times(arg: StructureND<T>): TensorFlowOutput<T, TT> = biOp(arg, ops.math::mul)
 
     override fun StructureND<T>.times(arg: T): TensorFlowOutput<T, TT> = biOp(arg, ops.math::mul)
 
-    override fun StructureND<T>.times(other: StructureND<T>): TensorFlowOutput<T, TT> = biOp(other, ops.math::mul)
+    override fun StructureND<T>.times(arg: StructureND<T>): TensorFlowOutput<T, TT> = biOp(arg, ops.math::mul)
 
     override fun Tensor<T>.timesAssign(value: T): Unit = inPlaceOp(value, ops.math::mul)
 
     override fun Tensor<T>.timesAssign(arg: StructureND<T>): Unit = inPlaceOp(arg, ops.math::mul)
 
-    override fun StructureND<T>.unaryMinus(): TensorFlowOutput<T, TT> = unOp(this, ops.math::neg)
+    override fun StructureND<T>.unaryMinus(): TensorFlowOutput<T, TT> = unOp(ops.math::neg)
 
-    override fun StructureND<T>.get(i: Int): Tensor<T> {
+    override fun Tensor<T>.get(i: Int): Tensor<T> = unOp {
         TODO("Not yet implemented")
     }
 
-    override fun StructureND<T>.transpose(i: Int, j: Int): Tensor<T> = unOp(this) {
+    override fun Tensor<T>.transpose(i: Int, j: Int): Tensor<T> = unOp {
         ops.linalg.transpose(it, ops.constant(intArrayOf(i, j)))
     }
 
-    override fun Tensor<T>.view(shape: IntArray): Tensor<T> {
-        TODO("Not yet implemented")
+    override fun Tensor<T>.view(shape: IntArray): Tensor<T> = unOp {
+        ops.reshape(it, ops.constant(shape))
     }
 
-    override fun Tensor<T>.viewAs(other: StructureND<T>): Tensor<T> {
-        TODO("Not yet implemented")
+    override fun Tensor<T>.viewAs(other: StructureND<T>): Tensor<T> = biOp(other) { l, r ->
+        ops.reshape(l, ops.shape(r))
     }
 
     override fun StructureND<T>.dot(other: StructureND<T>): TensorFlowOutput<T, TT> = biOp(other) { l, r ->
         ops.linalg.matMul(l, r)
     }
 
-    override fun diagonalEmbedding(diagonalEntries: Tensor<T>, offset: Int, dim1: Int, dim2: Int): Tensor<T> = ops.run {
-        TODO("Not yet implemented")
+    override fun diagonalEmbedding(
+        diagonalEntries: Tensor<T>,
+        offset: Int,
+        dim1: Int,
+        dim2: Int,
+    ): TensorFlowOutput<T, TT> = diagonalEntries.unOp {
+        TODO()
     }
 
-    override fun StructureND<T>.sum(): T = TODO("Not yet implemented")
+    override fun StructureND<T>.sum(): T = unOp {
+        ops.sum(it, ops.constant(intArrayOf()))
+    }.value()
 
-    override fun StructureND<T>.sum(dim: Int, keepDim: Boolean): Tensor<T> {
-        TODO("Not yet implemented")
+    override fun StructureND<T>.sum(dim: Int, keepDim: Boolean): TensorFlowOutput<T, TT> = unOp {
+        ops.sum(it, ops.constant(dim), Sum.keepDims(keepDim))
     }
 
-    override fun StructureND<T>.min(): T {
-        TODO("Not yet implemented")
+    override fun StructureND<T>.min(): T = unOp {
+        ops.min(it, ops.constant(intArrayOf()))
+    }.value()
+
+    override fun StructureND<T>.min(dim: Int, keepDim: Boolean): Tensor<T> = unOp {
+        ops.min(it, ops.constant(dim), Min.keepDims(keepDim))
     }
 
-    override fun StructureND<T>.min(dim: Int, keepDim: Boolean): Tensor<T> {
-        TODO("Not yet implemented")
+    override fun StructureND<T>.max(): T = unOp {
+        ops.max(it, ops.constant(intArrayOf()))
+    }.value()
+
+    override fun StructureND<T>.max(dim: Int, keepDim: Boolean): Tensor<T> = unOp {
+        ops.max(it, ops.constant(dim), Max.keepDims(keepDim))
     }
 
-    override fun StructureND<T>.max(): T {
-        TODO("Not yet implemented")
-    }
+    override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<Int> = IntTensorFlowOutput(
+        graph,
+        ops.math.argMax(asTensorFlow().output, ops.constant(dim), TInt32::class.java).output()
+    ).actualTensor
 
-    override fun StructureND<T>.max(dim: Int, keepDim: Boolean): Tensor<T> {
-        TODO("Not yet implemented")
-    }
-
-    override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<T> {
-        TODO("Not yet implemented")
-    }
+    @OptIn(UnstableKMathAPI::class)
+    override fun export(arg: StructureND<T>): StructureND<T> =
+        if (arg is TensorFlowOutput<T, *>) arg.actualTensor else arg
 }
\ No newline at end of file
diff --git a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
new file mode 100644
index 000000000..b7a4b94b4
--- /dev/null
+++ b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
@@ -0,0 +1,19 @@
+package space.kscience.kmath.tensorflow
+
+import org.junit.jupiter.api.Test
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.structureND
+import space.kscience.kmath.operations.DoubleField
+
+class DoubleTensorFlowOps {
+    @Test
+    fun basicOps() {
+        val res = DoubleField.produceWithTF {
+            val initial = structureND(2, 2) { 1.0 }
+
+            initial + (initial * 2.0)
+        }
+        println(StructureND.toString(res))
+    }
+
+}
\ No newline at end of file
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
index e43bbbc6f..a6ab55624 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
+@file:OptIn(PerformancePitfall::class)
+
 package space.kscience.kmath.viktor
 
 import org.jetbrains.bio.viktor.F64Array
-- 
2.34.1


From f231d722c6b3d7fb43c1640a16e4332c29333bf4 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Mon, 15 Nov 2021 22:42:00 +0700
Subject: [PATCH 382/713] Multiple performance improvements related to ASM 1.
 Argument values are cached in locals 2. Optimized Expression.invoke function
 3. lambda=indy is used in kmath-core

---
 benchmarks/build.gradle.kts                   |  6 +-
 .../ExpressionsInterpretersBenchmark.kt       |  4 +-
 .../benchmarks/addBenchmarkProperties.kt      |  2 +-
 examples/build.gradle.kts                     |  4 +-
 .../space/kscience/kmath/ast/expressions.kt   | 12 ++--
 .../kotlin/space/kscience/kmath/asm/asm.kt    | 46 +++++++++++-----
 .../kscience/kmath/asm/internal/AsmBuilder.kt | 55 +++++++++++++------
 kmath-core/build.gradle.kts                   | 19 +++++--
 .../kscience/kmath/expressions/Expression.kt  | 27 +++++++--
 9 files changed, 127 insertions(+), 48 deletions(-)

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index cca3d312d..130cc84a3 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -72,9 +72,9 @@ benchmark {
     }
 
     fun kotlinx.benchmark.gradle.BenchmarkConfiguration.commonConfiguration() {
-        warmups = 1
+        warmups = 2
         iterations = 5
-        iterationTime = 1000
+        iterationTime = 2000
         iterationTimeUnit = "ms"
     }
 
@@ -143,7 +143,7 @@ kotlin.sourceSets.all {
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions {
         jvmTarget = "11"
-        freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
+        freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" + "-Xlambdas=indy"
     }
 }
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
index 63e1511bd..b824a0d69 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
@@ -62,9 +62,11 @@ internal class ExpressionsInterpretersBenchmark {
     private fun invokeAndSum(expr: Expression<Double>, blackhole: Blackhole) {
         val random = Random(0)
         var sum = 0.0
+        val m = HashMap<Symbol, Double>()
 
         repeat(times) {
-            sum += expr(x to random.nextDouble())
+            m[x] = random.nextDouble()
+            sum += expr(m)
         }
 
         blackhole.consume(sum)
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
index 72c9ff0ad..568bfe535 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
@@ -54,7 +54,7 @@ fun Project.addBenchmarkProperties() {
                         LocalDateTime.parse(it.name, ISO_DATE_TIME).atZone(ZoneId.systemDefault()).toInstant()
                     }
 
-                    if (resDirectory == null) {
+                    if (resDirectory == null || !(resDirectory.resolve("jvm.json")).exists()) {
                         "> **Can't find appropriate benchmark data. Try generating readme files after running benchmarks**."
                     } else {
                         val reports =
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 7b1bce26a..05e562143 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -64,9 +64,9 @@ kotlin.sourceSets.all {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions{
+    kotlinOptions {
         jvmTarget = "11"
-        freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" + "-Xopt-in=kotlin.RequiresOptIn"
+        freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" + "-Xopt-in=kotlin.RequiresOptIn" + "-Xlambdas=indy"
     }
 }
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
index 887d76c42..b37d120fb 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
@@ -5,18 +5,22 @@
 
 package space.kscience.kmath.ast
 
+import space.kscience.kmath.asm.compileToExpression
 import space.kscience.kmath.expressions.MstField
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.Symbol.Companion.x
-import space.kscience.kmath.expressions.interpret
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 
 fun main() {
     val expr = MstField {
         x * 2.0 + number(2.0) / x - 16.0
-    }
+    }.compileToExpression(DoubleField)
+
+    val m = HashMap<Symbol, Double>()
 
     repeat(10000000) {
-        expr.interpret(DoubleField, x to 1.0)
+        m[x] = 1.0
+        expr(m)
     }
-}
\ No newline at end of file
+}
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
index 2426d6ee4..9a7c4b023 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
@@ -26,7 +26,19 @@ import space.kscience.kmath.operations.bindSymbolOrNull
  */
 @PublishedApi
 internal fun <T : Any> MST.compileWith(type: Class<T>, algebra: Algebra<T>): Expression<T> {
-    fun AsmBuilder<T>.visit(node: MST): Unit = when (node) {
+    fun AsmBuilder<T>.variablesVisitor(node: MST): Unit = when (node) {
+        is Symbol -> prepareVariable(node.identity)
+        is Unary -> variablesVisitor(node.value)
+
+        is Binary -> {
+            variablesVisitor(node.left)
+            variablesVisitor(node.right)
+        }
+
+        else -> Unit
+    }
+
+    fun AsmBuilder<T>.expressionVisitor(node: MST): Unit = when (node) {
         is Symbol -> {
             val symbol = algebra.bindSymbolOrNull(node)
 
@@ -40,39 +52,47 @@ internal fun <T : Any> MST.compileWith(type: Class<T>, algebra: Algebra<T>): Exp
 
         is Unary -> when {
             algebra is NumericAlgebra && node.value is Numeric -> loadObjectConstant(
-                algebra.unaryOperationFunction(node.operation)(algebra.number((node.value as Numeric).value)))
+                algebra.unaryOperationFunction(node.operation)(algebra.number((node.value as Numeric).value)),
+            )
 
-            else -> buildCall(algebra.unaryOperationFunction(node.operation)) { visit(node.value) }
+            else -> buildCall(algebra.unaryOperationFunction(node.operation)) { expressionVisitor(node.value) }
         }
 
         is Binary -> when {
             algebra is NumericAlgebra && node.left is Numeric && node.right is Numeric -> loadObjectConstant(
                 algebra.binaryOperationFunction(node.operation).invoke(
                     algebra.number((node.left as Numeric).value),
-                    algebra.number((node.right as Numeric).value)
+                    algebra.number((node.right as Numeric).value),
                 )
             )
 
             algebra is NumericAlgebra && node.left is Numeric -> buildCall(
-                algebra.leftSideNumberOperationFunction(node.operation)) {
-                visit(node.left)
-                visit(node.right)
+                algebra.leftSideNumberOperationFunction(node.operation),
+            ) {
+                expressionVisitor(node.left)
+                expressionVisitor(node.right)
             }
 
             algebra is NumericAlgebra && node.right is Numeric -> buildCall(
-                algebra.rightSideNumberOperationFunction(node.operation)) {
-                visit(node.left)
-                visit(node.right)
+                algebra.rightSideNumberOperationFunction(node.operation),
+            ) {
+                expressionVisitor(node.left)
+                expressionVisitor(node.right)
             }
 
             else -> buildCall(algebra.binaryOperationFunction(node.operation)) {
-                visit(node.left)
-                visit(node.right)
+                expressionVisitor(node.left)
+                expressionVisitor(node.right)
             }
         }
     }
 
-    return AsmBuilder<T>(type, buildName(this)) { visit(this@compileWith) }.instance
+    return AsmBuilder<T>(
+        type,
+        buildName(this),
+        { variablesVisitor(this@compileWith) },
+        { expressionVisitor(this@compileWith) },
+    ).instance
 }
 
 
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
index 418d6141b..4e29c77e0 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
@@ -10,8 +10,7 @@ import org.objectweb.asm.Opcodes.*
 import org.objectweb.asm.Type.*
 import org.objectweb.asm.commons.InstructionAdapter
 import space.kscience.kmath.asm.internal.AsmBuilder.ClassLoader
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.expressions.*
 import java.lang.invoke.MethodHandles
 import java.lang.invoke.MethodType
 import java.nio.file.Paths
@@ -26,13 +25,14 @@ import kotlin.io.path.writeBytes
  *
  * @property T the type of AsmExpression to unwrap.
  * @property className the unique class name of new loaded class.
- * @property callbackAtInvokeL0 the function to apply to this object when generating invoke method, label 0.
+ * @property expressionResultCallback the function to apply to this object when generating expression value.
  * @author Iaroslav Postovalov
  */
 internal class AsmBuilder<T>(
     classOfT: Class<*>,
     private val className: String,
-    private val callbackAtInvokeL0: AsmBuilder<T>.() -> Unit,
+    private val variablesPrepareCallback: AsmBuilder<T>.() -> Unit,
+    private val expressionResultCallback: AsmBuilder<T>.() -> Unit,
 ) {
     /**
      * Internal classloader of [AsmBuilder] with alias to define class from byte array.
@@ -66,12 +66,17 @@ internal class AsmBuilder<T>(
      */
     private lateinit var invokeMethodVisitor: InstructionAdapter
 
+    /**
+     * Local variables indices are indices of symbols in this list.
+     */
+    private val argumentsLocals = mutableListOf<String>()
+
     /**
      * Subclasses, loads and instantiates [Expression] for given parameters.
      *
      * The built instance is cached.
      */
-    @Suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST", "UNUSED_VARIABLE")
     val instance: Expression<T> by lazy {
         val hasConstants: Boolean
 
@@ -94,26 +99,28 @@ internal class AsmBuilder<T>(
             ).instructionAdapter {
                 invokeMethodVisitor = this
                 visitCode()
-                val l0 = label()
-                callbackAtInvokeL0()
+                val preparingVariables = label()
+                variablesPrepareCallback()
+                val expressionResult = label()
+                expressionResultCallback()
                 areturn(tType)
-                val l1 = label()
+                val end = label()
 
                 visitLocalVariable(
                     "this",
                     classType.descriptor,
                     null,
-                    l0,
-                    l1,
+                    preparingVariables,
+                    end,
                     0,
                 )
 
                 visitLocalVariable(
                     "arguments",
                     MAP_TYPE.descriptor,
-                    "L${MAP_TYPE.internalName}<${STRING_TYPE.descriptor}+${tType.descriptor}>;",
-                    l0,
-                    l1,
+                    "L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;",
+                    preparingVariables,
+                    end,
                     1,
                 )
 
@@ -199,7 +206,7 @@ internal class AsmBuilder<T>(
         val binary = classWriter.toByteArray()
         val cls = classLoader.defineClass(className, binary)
 
-        if (System.getProperty("space.kscience.communicator.prettyapi.dump.generated.classes") == "1")
+        if (System.getProperty("space.kscience.kmath.ast.dump.generated.classes") == "1")
             Paths.get("$className.class").writeBytes(binary)
 
         val l = MethodHandles.publicLookup()
@@ -256,9 +263,11 @@ internal class AsmBuilder<T>(
     }
 
     /**
-     * Loads a variable [name] from arguments [Map] parameter of [Expression.invoke].
+     * Stores value variable [name] into a local. Should be called within [variablesPrepareCallback] before using
+     * [loadVariable].
      */
-    fun loadVariable(name: String): Unit = invokeMethodVisitor.run {
+    fun prepareVariable(name: String): Unit = invokeMethodVisitor.run {
+        if (name in argumentsLocals) return@run
         load(1, MAP_TYPE)
         aconst(name)
 
@@ -270,8 +279,22 @@ internal class AsmBuilder<T>(
         )
 
         checkcast(tType)
+        var idx = argumentsLocals.indexOf(name)
+
+        if (idx == -1) {
+            argumentsLocals += name
+            idx = argumentsLocals.lastIndex
+        }
+
+        store(2 + idx, tType)
     }
 
+    /**
+     * Loads a variable [name] from arguments [Map] parameter of [Expression.invoke]. The variable should be stored
+     * with [prepareVariable] first.
+     */
+    fun loadVariable(name: String): Unit = invokeMethodVisitor.load(2 + argumentsLocals.indexOf(name), tType)
+
     inline fun buildCall(function: Function<T>, parameters: AsmBuilder<T>.() -> Unit) {
         contract { callsInPlace(parameters, InvocationKind.EXACTLY_ONCE) }
         val `interface` = function.javaClass.interfaces.first { Function::class.java in it.interfaces }
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index e4436c1df..143e576f7 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -5,10 +5,21 @@ plugins {
 //    id("com.xcporter.metaview") version "0.0.5"
 }
 
-kotlin.sourceSets {
-    commonMain {
-        dependencies {
-            api(project(":kmath-memory"))
+kotlin {
+    jvm {
+        compilations.all {
+            kotlinOptions {
+                freeCompilerArgs =
+                    freeCompilerArgs + "-Xjvm-default=all" + "-Xopt-in=kotlin.RequiresOptIn" + "-Xlambdas=indy"
+            }
+        }
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(project(":kmath-memory"))
+            }
         }
     }
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
index edd020c9a..bd3e6d0ba 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
@@ -29,7 +29,7 @@ public fun interface Expression<T> {
  *
  * @return a value.
  */
-public operator fun <T> Expression<T>.invoke(): T = invoke(emptyMap())
+public operator fun <T> Expression<T>.invoke(): T = this(emptyMap())
 
 /**
  * Calls this expression from arguments.
@@ -38,7 +38,13 @@ public operator fun <T> Expression<T>.invoke(): T = invoke(emptyMap())
  * @return a value.
  */
 @JvmName("callBySymbol")
-public operator fun <T> Expression<T>.invoke(vararg pairs: Pair<Symbol, T>): T = invoke(mapOf(*pairs))
+public operator fun <T> Expression<T>.invoke(vararg pairs: Pair<Symbol, T>): T = this(
+    when (pairs.size) {
+        0 -> emptyMap()
+        1 -> mapOf(pairs[0])
+        else -> hashMapOf(*pairs)
+    }
+)
 
 /**
  * Calls this expression from arguments.
@@ -47,8 +53,21 @@ public operator fun <T> Expression<T>.invoke(vararg pairs: Pair<Symbol, T>): T =
  * @return a value.
  */
 @JvmName("callByString")
-public operator fun <T> Expression<T>.invoke(vararg pairs: Pair<String, T>): T =
-    invoke(mapOf(*pairs).mapKeys { StringSymbol(it.key) })
+public operator fun <T> Expression<T>.invoke(vararg pairs: Pair<String, T>): T = this(
+    when (pairs.size) {
+        0 -> emptyMap()
+
+        1 -> {
+            val (k, v) = pairs[0]
+            mapOf(StringSymbol(k) to v)
+        }
+
+        else -> hashMapOf(*Array<Pair<Symbol, T>>(pairs.size) {
+            val (k, v) = pairs[it]
+            StringSymbol(k) to v
+        })
+    }
+)
 
 
 /**
-- 
2.34.1


From 7b50400de5ad44ee123da699e7b8136130942117 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 16 Nov 2021 14:03:12 +0700
Subject: [PATCH 383/713] Provide specializations of AsmBuilder for Double,
 Long, Int

---
 README.md                                     |  16 +-
 .../ExpressionsInterpretersBenchmark.kt       |  13 +-
 .../space/kscience/kmath/ast/expressions.kt   |   6 +-
 kmath-ast/README.md                           |   6 +-
 kmath-ast/build.gradle.kts                    |   4 +
 .../kmath/ast/TestCompilerOperations.kt       |  24 +
 .../kmath/wasm/internal/WasmBuilder.kt        |  36 +-
 .../kotlin/space/kscience/kmath/wasm/wasm.kt  |  18 -
 .../kotlin/space/kscience/kmath/asm/asm.kt    |  90 +++-
 .../kscience/kmath/asm/internal/AsmBuilder.kt | 356 +--------------
 .../asm/internal/ByteArrayClassLoader.kt      |   1 +
 .../kmath/asm/internal/GenericAsmBuilder.kt   | 325 ++++++++++++++
 .../kmath/asm/internal/PrimitiveAsmBuilder.kt | 411 ++++++++++++++++++
 .../kmath/asm/internal/mapIntrinsics.kt       |   1 +
 .../kotlin/space/kscience/kmath/ast/utils.kt  |  21 +-
 kmath-complex/README.md                       |   6 +-
 kmath-core/README.md                          |   6 +-
 .../kscience/kmath/expressions/Symbol.kt      |   4 +-
 kmath-ejml/README.md                          |   6 +-
 kmath-for-real/README.md                      |   6 +-
 kmath-functions/README.md                     |   6 +-
 kmath-jafama/README.md                        |   6 +-
 kmath-kotlingrad/README.md                    |   6 +-
 kmath-nd4j/README.md                          |   6 +-
 kmath-tensors/README.md                       |   6 +-
 25 files changed, 961 insertions(+), 425 deletions(-)
 create mode 100644 kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/ByteArrayClassLoader.kt
 create mode 100644 kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
 create mode 100644 kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt

diff --git a/README.md b/README.md
index db069d4e0..8604873ae 100644
--- a/README.md
+++ b/README.md
@@ -240,6 +240,12 @@ One can still use generic algebras though.
 > **Maturity**: DEVELOPMENT
 <hr/>
 
+* ### [kmath-multik](kmath-multik)
+> 
+>
+> **Maturity**: PROTOTYPE
+<hr/>
+
 * ### [kmath-nd4j](kmath-nd4j)
 > 
 >
@@ -252,6 +258,12 @@ One can still use generic algebras though.
 
 <hr/>
 
+* ### [kmath-optimization](kmath-optimization)
+> 
+>
+> **Maturity**: EXPERIMENTAL
+<hr/>
+
 * ### [kmath-stat](kmath-stat)
 > 
 >
@@ -319,8 +331,8 @@ repositories {
 }
 
 dependencies {
-    api("space.kscience:kmath-core:0.3.0-dev-14")
-    // api("space.kscience:kmath-core-jvm:0.3.0-dev-14") for jvm-specific version
+    api("space.kscience:kmath-core:0.3.0-dev-17")
+    // api("space.kscience:kmath-core-jvm:0.3.0-dev-17") for jvm-specific version
 }
 ```
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
index b824a0d69..4c6b92248 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
@@ -11,6 +11,7 @@ import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import space.kscience.kmath.asm.compileToExpression
 import space.kscience.kmath.expressions.*
+import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
@@ -35,7 +36,14 @@ internal class ExpressionsInterpretersBenchmark {
      * Benchmark case for [Expression] created with [compileToExpression].
      */
     @Benchmark
-    fun asmExpression(blackhole: Blackhole) = invokeAndSum(asm, blackhole)
+    fun asmGenericExpression(blackhole: Blackhole) = invokeAndSum(asmGeneric, blackhole)
+
+
+    /**
+     * Benchmark case for [Expression] created with [compileToExpression].
+     */
+    @Benchmark
+    fun asmPrimitiveExpression(blackhole: Blackhole) = invokeAndSum(asmPrimitive, blackhole)
 
     /**
      * Benchmark case for [Expression] implemented manually with `kotlin.math` functions.
@@ -87,7 +95,8 @@ internal class ExpressionsInterpretersBenchmark {
         }
 
         private val mst = node.toExpression(DoubleField)
-        private val asm = node.compileToExpression(DoubleField)
+        private val asmPrimitive = node.compileToExpression(DoubleField)
+        private val asmGeneric = node.compileToExpression(DoubleField as Algebra<Double>)
 
         private val raw = Expression<Double> { args ->
             val x = args[x]!!
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
index b37d120fb..3c68f9bb5 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
@@ -6,15 +6,15 @@
 package space.kscience.kmath.ast
 
 import space.kscience.kmath.asm.compileToExpression
-import space.kscience.kmath.expressions.MstField
+import space.kscience.kmath.expressions.MstExtendedField
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 
 fun main() {
-    val expr = MstField {
-        x * 2.0 + number(2.0) / x - 16.0
+    val expr = MstExtendedField {
+        x * 2.0 + number(2.0) / x - number(16.0) + asinh(x) / sin(x)
     }.compileToExpression(DoubleField)
 
     val m = HashMap<Symbol, Double>()
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index 686506f6f..5e3366881 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -10,7 +10,7 @@ Performance and visualization extensions to MST API.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-14`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-17`.
 
 **Gradle:**
 ```gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.0-dev-14'
+    implementation 'space.kscience:kmath-ast:0.3.0-dev-17'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.0-dev-14")
+    implementation("space.kscience:kmath-ast:0.3.0-dev-17")
 }
 ```
 
diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index 9de7e9980..586652349 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -55,6 +55,10 @@ tasks.dokkaHtml {
     dependsOn(tasks.build)
 }
 
+tasks.jvmTest {
+    jvmArgs = (jvmArgs ?: emptyList()) + listOf("-Dspace.kscience.kmath.ast.dump.generated.classes=1")
+}
+
 readme {
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
index f5b1e2842..00344410c 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
@@ -44,6 +44,30 @@ internal class TestCompilerOperations {
         assertEquals(1.0, expr(x to 0.0))
     }
 
+    @Test
+    fun testTangent() = runCompilerTest {
+        val expr = MstExtendedField { tan(x) }.compileToExpression(DoubleField)
+        assertEquals(0.0, expr(x to 0.0))
+    }
+
+    @Test
+    fun testArcSine() = runCompilerTest {
+        val expr = MstExtendedField { asin(x) }.compileToExpression(DoubleField)
+        assertEquals(0.0, expr(x to 0.0))
+    }
+
+    @Test
+    fun testArcCosine() = runCompilerTest {
+        val expr = MstExtendedField { acos(x) }.compileToExpression(DoubleField)
+        assertEquals(0.0, expr(x to 1.0))
+    }
+
+    @Test
+    fun testAreaHyperbolicSine() = runCompilerTest {
+        val expr = MstExtendedField { asinh(x) }.compileToExpression(DoubleField)
+        assertEquals(0.0, expr(x to 0.0))
+    }
+
     @Test
     fun testSubtract() = runCompilerTest {
         val expr = MstExtendedField { x - x }.compileToExpression(DoubleField)
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index b04c4d48f..6039d5c27 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -18,12 +18,12 @@ import space.kscience.kmath.internal.webassembly.Module as WasmModule
 private val spreader = eval("(obj, args) => obj(...args)")
 
 @Suppress("UnsafeCastFromDynamic")
-internal sealed class WasmBuilder<T>(
-    val binaryenType: Type,
-    val algebra: Algebra<T>,
-    val target: MST,
-) where T : Number {
-    val keys: MutableList<Symbol> = mutableListOf()
+internal sealed class WasmBuilder<T : Number>(
+    protected val binaryenType: Type,
+    protected val algebra: Algebra<T>,
+    protected val target: MST,
+) {
+    protected val keys: MutableList<Symbol> = mutableListOf()
     lateinit var ctx: BinaryenModule
 
     open fun visitSymbolic(mst: Symbol): ExpressionRef {
@@ -41,30 +41,36 @@ internal sealed class WasmBuilder<T>(
 
     abstract fun visitNumeric(mst: Numeric): ExpressionRef
 
-    open fun visitUnary(mst: Unary): ExpressionRef =
+    protected open fun visitUnary(mst: Unary): ExpressionRef =
         error("Unary operation ${mst.operation} not defined in $this")
 
-    open fun visitBinary(mst: Binary): ExpressionRef =
+    protected open fun visitBinary(mst: Binary): ExpressionRef =
         error("Binary operation ${mst.operation} not defined in $this")
 
-    open fun createModule(): BinaryenModule = js("new \$module\$binaryen.Module()")
+    protected open fun createModule(): BinaryenModule = js("new \$module\$binaryen.Module()")
 
-    fun visit(mst: MST): ExpressionRef = when (mst) {
+    protected fun visit(mst: MST): ExpressionRef = when (mst) {
         is Symbol -> visitSymbolic(mst)
         is Numeric -> visitNumeric(mst)
 
         is Unary -> when {
             algebra is NumericAlgebra && mst.value is Numeric -> visitNumeric(
-                Numeric(algebra.unaryOperationFunction(mst.operation)(algebra.number((mst.value as Numeric).value))))
+                Numeric(algebra.unaryOperationFunction(mst.operation)(algebra.number((mst.value as Numeric).value)))
+            )
 
             else -> visitUnary(mst)
         }
 
         is Binary -> when {
-            algebra is NumericAlgebra && mst.left is Numeric && mst.right is Numeric -> visitNumeric(Numeric(
-                algebra.binaryOperationFunction(mst.operation)
-                    .invoke(algebra.number((mst.left as Numeric).value), algebra.number((mst.right as Numeric).value))
-            ))
+            algebra is NumericAlgebra && mst.left is Numeric && mst.right is Numeric -> visitNumeric(
+                Numeric(
+                    algebra.binaryOperationFunction(mst.operation)
+                        .invoke(
+                            algebra.number((mst.left as Numeric).value),
+                            algebra.number((mst.right as Numeric).value)
+                        )
+                )
+            )
 
             else -> visitBinary(mst)
         }
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
index 5b28b8782..393a02e3d 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
@@ -16,24 +16,6 @@ import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.wasm.internal.DoubleWasmBuilder
 import space.kscience.kmath.wasm.internal.IntWasmBuilder
 
-/**
- * Compiles an [MST] to WASM in the context of reals.
- *
- * @author Iaroslav Postovalov
- */
-@UnstableKMathAPI
-public fun DoubleField.expression(mst: MST): Expression<Double> =
-    DoubleWasmBuilder(mst).instance
-
-/**
- * Compiles an [MST] to WASM in the context of integers.
- *
- * @author Iaroslav Postovalov
- */
-@UnstableKMathAPI
-public fun IntRing.expression(mst: MST): Expression<Int> =
-    IntWasmBuilder(mst).instance
-
 /**
  * Create a compiled expression with given [MST] and given [algebra].
  *
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
index 9a7c4b023..19b400cbd 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
@@ -3,18 +3,18 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
+@file:Suppress("UNUSED_PARAMETER")
+
 package space.kscience.kmath.asm
 
-import space.kscience.kmath.asm.internal.AsmBuilder
-import space.kscience.kmath.asm.internal.buildName
+import space.kscience.kmath.asm.internal.*
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.MST.*
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.invoke
-import space.kscience.kmath.operations.Algebra
-import space.kscience.kmath.operations.NumericAlgebra
-import space.kscience.kmath.operations.bindSymbolOrNull
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
 
 /**
  * Compiles given MST to an Expression using AST compiler.
@@ -26,7 +26,7 @@ import space.kscience.kmath.operations.bindSymbolOrNull
  */
 @PublishedApi
 internal fun <T : Any> MST.compileWith(type: Class<T>, algebra: Algebra<T>): Expression<T> {
-    fun AsmBuilder<T>.variablesVisitor(node: MST): Unit = when (node) {
+    fun GenericAsmBuilder<T>.variablesVisitor(node: MST): Unit = when (node) {
         is Symbol -> prepareVariable(node.identity)
         is Unary -> variablesVisitor(node.value)
 
@@ -38,7 +38,7 @@ internal fun <T : Any> MST.compileWith(type: Class<T>, algebra: Algebra<T>): Exp
         else -> Unit
     }
 
-    fun AsmBuilder<T>.expressionVisitor(node: MST): Unit = when (node) {
+    fun GenericAsmBuilder<T>.expressionVisitor(node: MST): Unit = when (node) {
         is Symbol -> {
             val symbol = algebra.bindSymbolOrNull(node)
 
@@ -87,7 +87,7 @@ internal fun <T : Any> MST.compileWith(type: Class<T>, algebra: Algebra<T>): Exp
         }
     }
 
-    return AsmBuilder<T>(
+    return GenericAsmBuilder<T>(
         type,
         buildName(this),
         { variablesVisitor(this@compileWith) },
@@ -114,3 +114,77 @@ public inline fun <reified T : Any> MST.compile(algebra: Algebra<T>, arguments:
  */
 public inline fun <reified T : Any> MST.compile(algebra: Algebra<T>, vararg arguments: Pair<Symbol, T>): T =
     compileToExpression(algebra).invoke(*arguments)
+
+
+/**
+ * Create a compiled expression with given [MST] and given [algebra].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compileToExpression(algebra: IntRing): Expression<Int> = IntAsmBuilder(this).instance
+
+/**
+ * Compile given MST to expression and evaluate it against [arguments].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int =
+    compileToExpression(algebra).invoke(arguments)
+
+/**
+ * Compile given MST to expression and evaluate it against [arguments].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compile(algebra: IntRing, vararg arguments: Pair<Symbol, Int>): Int =
+    compileToExpression(algebra)(*arguments)
+
+
+/**
+ * Create a compiled expression with given [MST] and given [algebra].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compileToExpression(algebra: LongRing): Expression<Long> = LongAsmBuilder(this).instance
+
+
+/**
+ * Compile given MST to expression and evaluate it against [arguments].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compile(algebra: LongRing, arguments: Map<Symbol, Long>): Long =
+    compileToExpression(algebra).invoke(arguments)
+
+
+/**
+ * Compile given MST to expression and evaluate it against [arguments].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compile(algebra: LongRing, vararg arguments: Pair<Symbol, Long>): Long =
+    compileToExpression(algebra)(*arguments)
+
+
+/**
+ * Create a compiled expression with given [MST] and given [algebra].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compileToExpression(algebra: DoubleField): Expression<Double> = DoubleAsmBuilder(this).instance
+
+/**
+ * Compile given MST to expression and evaluate it against [arguments].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Double =
+    compileToExpression(algebra).invoke(arguments)
+
+/**
+ * Compile given MST to expression and evaluate it against [arguments].
+ *
+ * @author Iaroslav Postovalov
+ */
+public fun MST.compile(algebra: DoubleField, vararg arguments: Pair<Symbol, Double>): Double =
+    compileToExpression(algebra).invoke(*arguments)
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
index 4e29c77e0..2a7b3dea9 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
@@ -1,377 +1,47 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
-
 package space.kscience.kmath.asm.internal
 
-import org.objectweb.asm.*
-import org.objectweb.asm.Opcodes.*
-import org.objectweb.asm.Type.*
-import org.objectweb.asm.commons.InstructionAdapter
-import space.kscience.kmath.asm.internal.AsmBuilder.ClassLoader
-import space.kscience.kmath.expressions.*
-import java.lang.invoke.MethodHandles
-import java.lang.invoke.MethodType
-import java.nio.file.Paths
-import java.util.stream.Collectors.toMap
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.io.path.writeBytes
+import org.objectweb.asm.Type
+import space.kscience.kmath.expressions.Expression
 
-/**
- * ASM Builder is a structure that abstracts building a class designated to unwrap [MST] to plain Java expression.
- * This class uses [ClassLoader] for loading the generated class, then it is able to instantiate the new class.
- *
- * @property T the type of AsmExpression to unwrap.
- * @property className the unique class name of new loaded class.
- * @property expressionResultCallback the function to apply to this object when generating expression value.
- * @author Iaroslav Postovalov
- */
-internal class AsmBuilder<T>(
-    classOfT: Class<*>,
-    private val className: String,
-    private val variablesPrepareCallback: AsmBuilder<T>.() -> Unit,
-    private val expressionResultCallback: AsmBuilder<T>.() -> Unit,
-) {
+internal abstract class AsmBuilder {
     /**
-     * Internal classloader of [AsmBuilder] with alias to define class from byte array.
+     * Internal classloader with alias to define class from byte array.
      */
-    private class ClassLoader(parent: java.lang.ClassLoader) : java.lang.ClassLoader(parent) {
+    class ByteArrayClassLoader(parent: ClassLoader) : ClassLoader(parent) {
         fun defineClass(name: String?, b: ByteArray): Class<*> = defineClass(name, b, 0, b.size)
     }
 
-    /**
-     * The instance of [ClassLoader] used by this builder.
-     */
-    private val classLoader: ClassLoader = ClassLoader(javaClass.classLoader)
-
-    /**
-     * ASM type for [T].
-     */
-    private val tType: Type = classOfT.asm
-
-    /**
-     * ASM type for new class.
-     */
-    private val classType: Type = getObjectType(className.replace(oldChar = '.', newChar = '/'))
-
-    /**
-     * List of constants to provide to the subclass.
-     */
-    private val constants: MutableList<Any> = mutableListOf()
-
-    /**
-     * Method visitor of `invoke` method of the subclass.
-     */
-    private lateinit var invokeMethodVisitor: InstructionAdapter
-
-    /**
-     * Local variables indices are indices of symbols in this list.
-     */
-    private val argumentsLocals = mutableListOf<String>()
-
-    /**
-     * Subclasses, loads and instantiates [Expression] for given parameters.
-     *
-     * The built instance is cached.
-     */
-    @Suppress("UNCHECKED_CAST", "UNUSED_VARIABLE")
-    val instance: Expression<T> by lazy {
-        val hasConstants: Boolean
-
-        val classWriter = ClassWriter(ClassWriter.COMPUTE_FRAMES) {
-            visit(
-                V1_8,
-                ACC_PUBLIC or ACC_FINAL or ACC_SUPER,
-                classType.internalName,
-                "${OBJECT_TYPE.descriptor}L${EXPRESSION_TYPE.internalName}<${tType.descriptor}>;",
-                OBJECT_TYPE.internalName,
-                arrayOf(EXPRESSION_TYPE.internalName),
-            )
-
-            visitMethod(
-                ACC_PUBLIC or ACC_FINAL,
-                "invoke",
-                getMethodDescriptor(tType, MAP_TYPE),
-                "(L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;)${tType.descriptor}",
-                null,
-            ).instructionAdapter {
-                invokeMethodVisitor = this
-                visitCode()
-                val preparingVariables = label()
-                variablesPrepareCallback()
-                val expressionResult = label()
-                expressionResultCallback()
-                areturn(tType)
-                val end = label()
-
-                visitLocalVariable(
-                    "this",
-                    classType.descriptor,
-                    null,
-                    preparingVariables,
-                    end,
-                    0,
-                )
-
-                visitLocalVariable(
-                    "arguments",
-                    MAP_TYPE.descriptor,
-                    "L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;",
-                    preparingVariables,
-                    end,
-                    1,
-                )
-
-                visitMaxs(0, 2)
-                visitEnd()
-            }
-
-            visitMethod(
-                ACC_PUBLIC or ACC_FINAL or ACC_BRIDGE or ACC_SYNTHETIC,
-                "invoke",
-                getMethodDescriptor(OBJECT_TYPE, MAP_TYPE),
-                null,
-                null,
-            ).instructionAdapter {
-                visitCode()
-                val l0 = label()
-                load(0, OBJECT_TYPE)
-                load(1, MAP_TYPE)
-                invokevirtual(classType.internalName, "invoke", getMethodDescriptor(tType, MAP_TYPE), false)
-                areturn(tType)
-                val l1 = label()
-
-                visitLocalVariable(
-                    "this",
-                    classType.descriptor,
-                    null,
-                    l0,
-                    l1,
-                    0,
-                )
-
-                visitMaxs(0, 2)
-                visitEnd()
-            }
-
-            hasConstants = constants.isNotEmpty()
-
-            if (hasConstants)
-                visitField(
-                    access = ACC_PRIVATE or ACC_FINAL,
-                    name = "constants",
-                    descriptor = OBJECT_ARRAY_TYPE.descriptor,
-                    signature = null,
-                    value = null,
-                    block = FieldVisitor::visitEnd,
-                )
-
-            visitMethod(
-                ACC_PUBLIC,
-                "<init>",
-                getMethodDescriptor(VOID_TYPE, *OBJECT_ARRAY_TYPE.wrapToArrayIf { hasConstants }),
-                null,
-                null,
-            ).instructionAdapter {
-                val l0 = label()
-                load(0, classType)
-                invokespecial(OBJECT_TYPE.internalName, "<init>", getMethodDescriptor(VOID_TYPE), false)
-                label()
-                load(0, classType)
-
-                if (hasConstants) {
-                    label()
-                    load(0, classType)
-                    load(1, OBJECT_ARRAY_TYPE)
-                    putfield(classType.internalName, "constants", OBJECT_ARRAY_TYPE.descriptor)
-                }
-
-                label()
-                visitInsn(RETURN)
-                val l4 = label()
-                visitLocalVariable("this", classType.descriptor, null, l0, l4, 0)
-
-                if (hasConstants)
-                    visitLocalVariable("constants", OBJECT_ARRAY_TYPE.descriptor, null, l0, l4, 1)
-
-                visitMaxs(0, 3)
-                visitEnd()
-            }
-
-            visitEnd()
-        }
-
-        val binary = classWriter.toByteArray()
-        val cls = classLoader.defineClass(className, binary)
-
-        if (System.getProperty("space.kscience.kmath.ast.dump.generated.classes") == "1")
-            Paths.get("$className.class").writeBytes(binary)
-
-        val l = MethodHandles.publicLookup()
-
-        (if (hasConstants)
-            l.findConstructor(cls, MethodType.methodType(Void.TYPE, Array<Any>::class.java))(constants.toTypedArray())
-        else
-            l.findConstructor(cls, MethodType.methodType(Void.TYPE))()) as Expression<T>
-    }
-
-    /**
-     * Loads [java.lang.Object] constant from constants.
-     */
-    fun loadObjectConstant(value: Any, type: Type = tType): Unit = invokeMethodVisitor.run {
-        val idx = if (value in constants) constants.indexOf(value) else constants.also { it += value }.lastIndex
-        invokeMethodVisitor.load(0, classType)
-        getfield(classType.internalName, "constants", OBJECT_ARRAY_TYPE.descriptor)
-        iconst(idx)
-        visitInsn(AALOAD)
-        if (type != OBJECT_TYPE) checkcast(type)
-    }
-
-    /**
-     * Either loads a numeric constant [value] from the class's constants field or boxes a primitive
-     * constant from the constant pool.
-     */
-    fun loadNumberConstant(value: Number) {
-        val boxed = value.javaClass.asm
-        val primitive = BOXED_TO_PRIMITIVES[boxed]
-
-        if (primitive != null) {
-            when (primitive) {
-                BYTE_TYPE -> invokeMethodVisitor.iconst(value.toInt())
-                DOUBLE_TYPE -> invokeMethodVisitor.dconst(value.toDouble())
-                FLOAT_TYPE -> invokeMethodVisitor.fconst(value.toFloat())
-                LONG_TYPE -> invokeMethodVisitor.lconst(value.toLong())
-                INT_TYPE -> invokeMethodVisitor.iconst(value.toInt())
-                SHORT_TYPE -> invokeMethodVisitor.iconst(value.toInt())
-            }
-
-            val r = PRIMITIVES_TO_BOXED.getValue(primitive)
-
-            invokeMethodVisitor.invokestatic(
-                r.internalName,
-                "valueOf",
-                getMethodDescriptor(r, primitive),
-                false,
-            )
-
-            return
-        }
-
-        loadObjectConstant(value, boxed)
-    }
-
-    /**
-     * Stores value variable [name] into a local. Should be called within [variablesPrepareCallback] before using
-     * [loadVariable].
-     */
-    fun prepareVariable(name: String): Unit = invokeMethodVisitor.run {
-        if (name in argumentsLocals) return@run
-        load(1, MAP_TYPE)
-        aconst(name)
-
-        invokestatic(
-            MAP_INTRINSICS_TYPE.internalName,
-            "getOrFail",
-            getMethodDescriptor(OBJECT_TYPE, MAP_TYPE, STRING_TYPE),
-            false,
-        )
-
-        checkcast(tType)
-        var idx = argumentsLocals.indexOf(name)
-
-        if (idx == -1) {
-            argumentsLocals += name
-            idx = argumentsLocals.lastIndex
-        }
-
-        store(2 + idx, tType)
-    }
-
-    /**
-     * Loads a variable [name] from arguments [Map] parameter of [Expression.invoke]. The variable should be stored
-     * with [prepareVariable] first.
-     */
-    fun loadVariable(name: String): Unit = invokeMethodVisitor.load(2 + argumentsLocals.indexOf(name), tType)
-
-    inline fun buildCall(function: Function<T>, parameters: AsmBuilder<T>.() -> Unit) {
-        contract { callsInPlace(parameters, InvocationKind.EXACTLY_ONCE) }
-        val `interface` = function.javaClass.interfaces.first { Function::class.java in it.interfaces }
-
-        val arity = `interface`.methods.find { it.name == "invoke" }?.parameterCount
-            ?: error("Provided function object doesn't contain invoke method")
-
-        val type = getType(`interface`)
-        loadObjectConstant(function, type)
-        parameters(this)
-
-        invokeMethodVisitor.invokeinterface(
-            type.internalName,
-            "invoke",
-            getMethodDescriptor(OBJECT_TYPE, *Array(arity) { OBJECT_TYPE }),
-        )
-
-        invokeMethodVisitor.checkcast(tType)
-    }
-
-    companion object {
-        /**
-         * Maps JVM primitive numbers boxed ASM types to their primitive ASM types.
-         */
-        private val BOXED_TO_PRIMITIVES: Map<Type, Type> by lazy {
-            hashMapOf(
-                Byte::class.java.asm to BYTE_TYPE,
-                Short::class.java.asm to SHORT_TYPE,
-                Integer::class.java.asm to INT_TYPE,
-                Long::class.java.asm to LONG_TYPE,
-                Float::class.java.asm to FLOAT_TYPE,
-                Double::class.java.asm to DOUBLE_TYPE,
-            )
-        }
-
-        /**
-         * Maps JVM primitive numbers boxed ASM types to their primitive ASM types.
-         */
-        private val PRIMITIVES_TO_BOXED: Map<Type, Type> by lazy {
-            BOXED_TO_PRIMITIVES.entries.stream().collect(
-                toMap(Map.Entry<Type, Type>::value, Map.Entry<Type, Type>::key),
-            )
-        }
+    protected val classLoader = ByteArrayClassLoader(javaClass.classLoader)
 
+    protected companion object {
         /**
          * ASM type for [Expression].
          */
-        val EXPRESSION_TYPE: Type by lazy { getObjectType("space/kscience/kmath/expressions/Expression") }
+        val EXPRESSION_TYPE: Type by lazy { Type.getObjectType("space/kscience/kmath/expressions/Expression") }
 
         /**
          * ASM type for [java.util.Map].
          */
-        val MAP_TYPE: Type by lazy { getObjectType("java/util/Map") }
+        val MAP_TYPE: Type by lazy { Type.getObjectType("java/util/Map") }
 
         /**
          * ASM type for [java.lang.Object].
          */
-        val OBJECT_TYPE: Type by lazy { getObjectType("java/lang/Object") }
-
-        /**
-         * ASM type for array of [java.lang.Object].
-         */
-        val OBJECT_ARRAY_TYPE: Type by lazy { getType("[Ljava/lang/Object;") }
+        val OBJECT_TYPE: Type by lazy { Type.getObjectType("java/lang/Object") }
 
         /**
          * ASM type for [java.lang.String].
          */
-        val STRING_TYPE: Type by lazy { getObjectType("java/lang/String") }
+        val STRING_TYPE: Type by lazy { Type.getObjectType("java/lang/String") }
 
         /**
          * ASM type for MapIntrinsics.
          */
-        val MAP_INTRINSICS_TYPE: Type by lazy { getObjectType("space/kscience/kmath/asm/internal/MapIntrinsics") }
+        val MAP_INTRINSICS_TYPE: Type by lazy { Type.getObjectType("space/kscience/kmath/asm/internal/MapIntrinsics") }
 
         /**
          * ASM Type for [space.kscience.kmath.expressions.Symbol].
          */
-        val SYMBOL_TYPE: Type by lazy { getObjectType("space/kscience/kmath/expressions/Symbol") }
+        val SYMBOL_TYPE: Type by lazy { Type.getObjectType("space/kscience/kmath/expressions/Symbol") }
     }
 }
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/ByteArrayClassLoader.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/ByteArrayClassLoader.kt
new file mode 100644
index 000000000..afff48ef6
--- /dev/null
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/ByteArrayClassLoader.kt
@@ -0,0 +1 @@
+package space.kscience.kmath.asm.internal
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
new file mode 100644
index 000000000..1b45b0625
--- /dev/null
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
@@ -0,0 +1,325 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.asm.internal
+
+import org.objectweb.asm.*
+import org.objectweb.asm.Opcodes.*
+import org.objectweb.asm.Type.*
+import org.objectweb.asm.commons.InstructionAdapter
+import space.kscience.kmath.expressions.*
+import java.lang.invoke.MethodHandles
+import java.lang.invoke.MethodType
+import java.nio.file.Paths
+import java.util.stream.Collectors.toMap
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.io.path.writeBytes
+
+/**
+ * ASM Builder is a structure that abstracts building a class designated to unwrap [MST] to plain Java expression.
+ * This class uses [ClassLoader] for loading the generated class, then it is able to instantiate the new class.
+ *
+ * @property T the type of AsmExpression to unwrap.
+ * @property className the unique class name of new loaded class.
+ * @property expressionResultCallback the function to apply to this object when generating expression value.
+ * @author Iaroslav Postovalov
+ */
+internal class GenericAsmBuilder<T>(
+    classOfT: Class<*>,
+    private val className: String,
+    private val variablesPrepareCallback: GenericAsmBuilder<T>.() -> Unit,
+    private val expressionResultCallback: GenericAsmBuilder<T>.() -> Unit,
+) : AsmBuilder() {
+    /**
+     * ASM type for [T].
+     */
+    private val tType: Type = classOfT.asm
+
+    /**
+     * ASM type for new class.
+     */
+    private val classType: Type = getObjectType(className.replace(oldChar = '.', newChar = '/'))
+
+    /**
+     * List of constants to provide to the subclass.
+     */
+    private val constants = mutableListOf<Any>()
+
+    /**
+     * Method visitor of `invoke` method of the subclass.
+     */
+    private lateinit var invokeMethodVisitor: InstructionAdapter
+
+    /**
+     * Local variables indices are indices of symbols in this list.
+     */
+    private val argumentsLocals = mutableListOf<String>()
+
+    /**
+     * Subclasses, loads and instantiates [Expression] for given parameters.
+     *
+     * The built instance is cached.
+     */
+    @Suppress("UNCHECKED_CAST", "UNUSED_VARIABLE")
+    val instance: Expression<T> by lazy {
+        val hasConstants: Boolean
+
+        val classWriter = ClassWriter(ClassWriter.COMPUTE_FRAMES) {
+            visit(
+                V1_8,
+                ACC_PUBLIC or ACC_FINAL or ACC_SUPER,
+                classType.internalName,
+                "${OBJECT_TYPE.descriptor}L${EXPRESSION_TYPE.internalName}<${tType.descriptor}>;",
+                OBJECT_TYPE.internalName,
+                arrayOf(EXPRESSION_TYPE.internalName),
+            )
+
+            visitMethod(
+                ACC_PUBLIC or ACC_FINAL,
+                "invoke",
+                getMethodDescriptor(tType, MAP_TYPE),
+                "(L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;)${tType.descriptor}",
+                null,
+            ).instructionAdapter {
+                invokeMethodVisitor = this
+                visitCode()
+                val preparingVariables = label()
+                variablesPrepareCallback()
+                val expressionResult = label()
+                expressionResultCallback()
+                areturn(tType)
+                val end = label()
+
+                visitLocalVariable(
+                    "this",
+                    classType.descriptor,
+                    null,
+                    preparingVariables,
+                    end,
+                    0,
+                )
+
+                visitLocalVariable(
+                    "arguments",
+                    MAP_TYPE.descriptor,
+                    "L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;",
+                    preparingVariables,
+                    end,
+                    1,
+                )
+
+                visitMaxs(0, 0)
+                visitEnd()
+            }
+
+            visitMethod(
+                ACC_PUBLIC or ACC_FINAL or ACC_BRIDGE or ACC_SYNTHETIC,
+                "invoke",
+                getMethodDescriptor(OBJECT_TYPE, MAP_TYPE),
+                null,
+                null,
+            ).instructionAdapter {
+                visitCode()
+                val start = label()
+                load(0, OBJECT_TYPE)
+                load(1, MAP_TYPE)
+                invokevirtual(classType.internalName, "invoke", getMethodDescriptor(tType, MAP_TYPE), false)
+                areturn(tType)
+                val end = label()
+
+                visitLocalVariable(
+                    "this",
+                    classType.descriptor,
+                    null,
+                    start,
+                    end,
+                    0,
+                )
+
+                visitMaxs(0, 0)
+                visitEnd()
+            }
+
+            hasConstants = constants.isNotEmpty()
+
+            if (hasConstants)
+                visitField(
+                    access = ACC_PRIVATE or ACC_FINAL,
+                    name = "constants",
+                    descriptor = OBJECT_ARRAY_TYPE.descriptor,
+                    signature = null,
+                    value = null,
+                    block = FieldVisitor::visitEnd,
+                )
+
+            visitMethod(
+                ACC_PUBLIC,
+                "<init>",
+                getMethodDescriptor(VOID_TYPE, *OBJECT_ARRAY_TYPE.wrapToArrayIf { hasConstants }),
+                null,
+                null,
+            ).instructionAdapter {
+                val l0 = label()
+                load(0, classType)
+                invokespecial(OBJECT_TYPE.internalName, "<init>", getMethodDescriptor(VOID_TYPE), false)
+                label()
+                load(0, classType)
+
+                if (hasConstants) {
+                    label()
+                    load(0, classType)
+                    load(1, OBJECT_ARRAY_TYPE)
+                    putfield(classType.internalName, "constants", OBJECT_ARRAY_TYPE.descriptor)
+                }
+
+                label()
+                visitInsn(RETURN)
+                val l4 = label()
+                visitLocalVariable("this", classType.descriptor, null, l0, l4, 0)
+
+                if (hasConstants)
+                    visitLocalVariable("constants", OBJECT_ARRAY_TYPE.descriptor, null, l0, l4, 1)
+
+                visitMaxs(0, 0)
+                visitEnd()
+            }
+
+            visitEnd()
+        }
+
+        val binary = classWriter.toByteArray()
+        val cls = classLoader.defineClass(className, binary)
+
+        if (System.getProperty("space.kscience.kmath.ast.dump.generated.classes") == "1")
+            Paths.get("${className.split('.').last()}.class").writeBytes(binary)
+
+        val l = MethodHandles.publicLookup()
+
+        (if (hasConstants)
+            l.findConstructor(cls, MethodType.methodType(Void.TYPE, Array<Any>::class.java))(constants.toTypedArray())
+        else
+            l.findConstructor(cls, MethodType.methodType(Void.TYPE))()) as Expression<T>
+    }
+
+    /**
+     * Loads [java.lang.Object] constant from constants.
+     */
+    fun loadObjectConstant(value: Any, type: Type = tType): Unit = invokeMethodVisitor.run {
+        val idx = if (value in constants) constants.indexOf(value) else constants.also { it += value }.lastIndex
+        invokeMethodVisitor.load(0, classType)
+        getfield(classType.internalName, "constants", OBJECT_ARRAY_TYPE.descriptor)
+        iconst(idx)
+        visitInsn(AALOAD)
+        if (type != OBJECT_TYPE) checkcast(type)
+    }
+
+    /**
+     * Either loads a numeric constant [value] from the class's constants field or boxes a primitive
+     * constant from the constant pool.
+     */
+    fun loadNumberConstant(value: Number) {
+        val boxed = value.javaClass.asm
+        val primitive = BOXED_TO_PRIMITIVES[boxed]
+
+        if (primitive != null) {
+            when (primitive) {
+                BYTE_TYPE -> invokeMethodVisitor.iconst(value.toInt())
+                DOUBLE_TYPE -> invokeMethodVisitor.dconst(value.toDouble())
+                FLOAT_TYPE -> invokeMethodVisitor.fconst(value.toFloat())
+                LONG_TYPE -> invokeMethodVisitor.lconst(value.toLong())
+                INT_TYPE -> invokeMethodVisitor.iconst(value.toInt())
+                SHORT_TYPE -> invokeMethodVisitor.iconst(value.toInt())
+            }
+
+            val r = boxed
+
+            invokeMethodVisitor.invokestatic(
+                r.internalName,
+                "valueOf",
+                getMethodDescriptor(r, primitive),
+                false,
+            )
+
+            return
+        }
+
+        loadObjectConstant(value, boxed)
+    }
+
+    /**
+     * Stores value variable [name] into a local. Should be called within [variablesPrepareCallback] before using
+     * [loadVariable].
+     */
+    fun prepareVariable(name: String): Unit = invokeMethodVisitor.run {
+        if (name in argumentsLocals) return@run
+        load(1, MAP_TYPE)
+        aconst(name)
+
+        invokestatic(
+            MAP_INTRINSICS_TYPE.internalName,
+            "getOrFail",
+            getMethodDescriptor(OBJECT_TYPE, MAP_TYPE, STRING_TYPE),
+            false,
+        )
+
+        checkcast(tType)
+        var idx = argumentsLocals.indexOf(name)
+
+        if (idx == -1) {
+            argumentsLocals += name
+            idx = argumentsLocals.lastIndex
+        }
+
+        store(2 + idx, tType)
+    }
+
+    /**
+     * Loads a variable [name] from arguments [Map] parameter of [Expression.invoke]. The variable should be stored
+     * with [prepareVariable] first.
+     */
+    fun loadVariable(name: String): Unit = invokeMethodVisitor.load(2 + argumentsLocals.indexOf(name), tType)
+
+    inline fun buildCall(function: Function<T>, parameters: GenericAsmBuilder<T>.() -> Unit) {
+        contract { callsInPlace(parameters, InvocationKind.EXACTLY_ONCE) }
+        val `interface` = function.javaClass.interfaces.first { Function::class.java in it.interfaces }
+
+        val arity = `interface`.methods.find { it.name == "invoke" }?.parameterCount
+            ?: error("Provided function object doesn't contain invoke method")
+
+        val type = getType(`interface`)
+        loadObjectConstant(function, type)
+        parameters(this)
+
+        invokeMethodVisitor.invokeinterface(
+            type.internalName,
+            "invoke",
+            getMethodDescriptor(OBJECT_TYPE, *Array(arity) { OBJECT_TYPE }),
+        )
+
+        invokeMethodVisitor.checkcast(tType)
+    }
+
+    private companion object {
+        /**
+         * Maps JVM primitive numbers boxed ASM types to their primitive ASM types.
+         */
+        private val BOXED_TO_PRIMITIVES: Map<Type, Type> by lazy {
+            hashMapOf(
+                Byte::class.java.asm to BYTE_TYPE,
+                Short::class.java.asm to SHORT_TYPE,
+                Integer::class.java.asm to INT_TYPE,
+                Long::class.java.asm to LONG_TYPE,
+                Float::class.java.asm to FLOAT_TYPE,
+                Double::class.java.asm to DOUBLE_TYPE,
+            )
+        }
+
+        /**
+         * ASM type for array of [java.lang.Object].
+         */
+        val OBJECT_ARRAY_TYPE: Type by lazy { getType("[Ljava/lang/Object;") }
+    }
+}
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
new file mode 100644
index 000000000..2819368ed
--- /dev/null
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
@@ -0,0 +1,411 @@
+package space.kscience.kmath.asm.internal
+
+import org.objectweb.asm.ClassWriter
+import org.objectweb.asm.Opcodes
+import org.objectweb.asm.Type
+import org.objectweb.asm.Type.*
+import org.objectweb.asm.commons.InstructionAdapter
+import space.kscience.kmath.expressions.Expression
+import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.operations.*
+import java.lang.invoke.MethodHandles
+import java.lang.invoke.MethodType
+import java.nio.file.Paths
+import kotlin.io.path.writeBytes
+
+internal sealed class PrimitiveAsmBuilder<T : Number>(
+    protected val algebra: Algebra<T>,
+    classOfT: Class<*>,
+    protected val classOfTPrimitive: Class<*>,
+    protected val target: MST,
+) : AsmBuilder() {
+    private val className: String = buildName(target)
+
+    /**
+     * ASM type for [T].
+     */
+    private val tType: Type = classOfT.asm
+
+    /**
+     * ASM type for [T].
+     */
+    protected val tTypePrimitive: Type = classOfTPrimitive.asm
+
+    /**
+     * ASM type for new class.
+     */
+    private val classType: Type = getObjectType(className.replace(oldChar = '.', newChar = '/'))
+
+    /**
+     * Method visitor of `invoke` method of the subclass.
+     */
+    protected lateinit var invokeMethodVisitor: InstructionAdapter
+
+    /**
+     * Local variables indices are indices of symbols in this list.
+     */
+    private val argumentsLocals = mutableListOf<String>()
+
+    /**
+     * Subclasses, loads and instantiates [Expression] for given parameters.
+     *
+     * The built instance is cached.
+     */
+    @Suppress("UNCHECKED_CAST", "UNUSED_VARIABLE")
+    val instance: Expression<T> by lazy {
+        val classWriter = ClassWriter(ClassWriter.COMPUTE_FRAMES) {
+            visit(
+                Opcodes.V1_8,
+                Opcodes.ACC_PUBLIC or Opcodes.ACC_FINAL or Opcodes.ACC_SUPER,
+                classType.internalName,
+                "${OBJECT_TYPE.descriptor}L${EXPRESSION_TYPE.internalName}<${tType.descriptor}>;",
+                OBJECT_TYPE.internalName,
+                arrayOf(EXPRESSION_TYPE.internalName),
+            )
+
+            visitMethod(
+                Opcodes.ACC_PUBLIC or Opcodes.ACC_FINAL,
+                "invoke",
+                getMethodDescriptor(tType, MAP_TYPE),
+                "(L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;)${tType.descriptor}",
+                null,
+            ).instructionAdapter {
+                invokeMethodVisitor = this
+                visitCode()
+                val preparingVariables = label()
+                visitVariables(target)
+                val expressionResult = label()
+                visitExpression(target)
+                box()
+                areturn(tType)
+                val end = label()
+
+                visitLocalVariable(
+                    "this",
+                    classType.descriptor,
+                    null,
+                    preparingVariables,
+                    end,
+                    0,
+                )
+
+                visitLocalVariable(
+                    "arguments",
+                    MAP_TYPE.descriptor,
+                    "L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;",
+                    preparingVariables,
+                    end,
+                    1,
+                )
+
+                visitMaxs(0, 0)
+                visitEnd()
+            }
+
+            visitMethod(
+                Opcodes.ACC_PUBLIC or Opcodes.ACC_FINAL or Opcodes.ACC_BRIDGE or Opcodes.ACC_SYNTHETIC,
+                "invoke",
+                getMethodDescriptor(OBJECT_TYPE, MAP_TYPE),
+                null,
+                null,
+            ).instructionAdapter {
+                visitCode()
+                val start = label()
+                load(0, OBJECT_TYPE)
+                load(1, MAP_TYPE)
+                invokevirtual(classType.internalName, "invoke", getMethodDescriptor(tType, MAP_TYPE), false)
+                areturn(tType)
+                val end = label()
+
+                visitLocalVariable(
+                    "this",
+                    classType.descriptor,
+                    null,
+                    start,
+                    end,
+                    0,
+                )
+
+                visitMaxs(0, 0)
+                visitEnd()
+            }
+
+            visitMethod(
+                Opcodes.ACC_PUBLIC,
+                "<init>",
+                getMethodDescriptor(VOID_TYPE),
+                null,
+                null,
+            ).instructionAdapter {
+                val start = label()
+                load(0, classType)
+                invokespecial(OBJECT_TYPE.internalName, "<init>", getMethodDescriptor(VOID_TYPE), false)
+                label()
+                load(0, classType)
+                label()
+                visitInsn(Opcodes.RETURN)
+                val end = label()
+                visitLocalVariable("this", classType.descriptor, null, start, end, 0)
+                visitMaxs(0, 0)
+                visitEnd()
+            }
+
+            visitEnd()
+        }
+
+        val binary = classWriter.toByteArray()
+        val cls = classLoader.defineClass(className, binary)
+
+        if (System.getProperty("space.kscience.kmath.ast.dump.generated.classes") == "1")
+            Paths.get("${className.split('.').last()}.class").writeBytes(binary)
+
+        MethodHandles.publicLookup().findConstructor(cls, MethodType.methodType(Void.TYPE))() as Expression<T>
+    }
+
+    /**
+     * Either loads a numeric constant [value] from the class's constants field or boxes a primitive
+     * constant from the constant pool.
+     */
+    fun loadNumberConstant(value: Number) {
+        when (tTypePrimitive) {
+            BYTE_TYPE -> invokeMethodVisitor.iconst(value.toInt())
+            DOUBLE_TYPE -> invokeMethodVisitor.dconst(value.toDouble())
+            FLOAT_TYPE -> invokeMethodVisitor.fconst(value.toFloat())
+            LONG_TYPE -> invokeMethodVisitor.lconst(value.toLong())
+            INT_TYPE -> invokeMethodVisitor.iconst(value.toInt())
+            SHORT_TYPE -> invokeMethodVisitor.iconst(value.toInt())
+        }
+    }
+
+    /**
+     * Stores value variable [name] into a local. Should be called within [variablesPrepareCallback] before using
+     * [loadVariable].
+     */
+    fun prepareVariable(name: String): Unit = invokeMethodVisitor.run {
+        if (name in argumentsLocals) return@run
+        load(1, MAP_TYPE)
+        aconst(name)
+
+        invokestatic(
+            MAP_INTRINSICS_TYPE.internalName,
+            "getOrFail",
+            getMethodDescriptor(OBJECT_TYPE, MAP_TYPE, STRING_TYPE),
+            false,
+        )
+
+        checkcast(tType)
+        var idx = argumentsLocals.indexOf(name)
+
+        if (idx == -1) {
+            argumentsLocals += name
+            idx = argumentsLocals.lastIndex
+        }
+
+        unbox()
+        store(2 + idx, tTypePrimitive)
+    }
+
+    /**
+     * Loads a variable [name] from arguments [Map] parameter of [Expression.invoke]. The variable should be stored
+     * with [prepareVariable] first.
+     */
+    fun loadVariable(name: String): Unit = invokeMethodVisitor.load(2 + argumentsLocals.indexOf(name), tTypePrimitive)
+
+    private fun unbox() = invokeMethodVisitor.run {
+        invokevirtual(
+            NUMBER_TYPE.internalName,
+            "${classOfTPrimitive.simpleName}Value",
+            getMethodDescriptor(tTypePrimitive),
+            false
+        )
+    }
+
+    private fun box() = invokeMethodVisitor.run {
+        invokestatic(tType.internalName, "valueOf", getMethodDescriptor(tType, tTypePrimitive), false)
+    }
+
+    protected fun visitVariables(node: MST): Unit = when (node) {
+        is Symbol -> prepareVariable(node.identity)
+        is MST.Unary -> visitVariables(node.value)
+
+        is MST.Binary -> {
+            visitVariables(node.left)
+            visitVariables(node.right)
+        }
+
+        else -> Unit
+    }
+
+    protected fun visitExpression(mst: MST): Unit = when (mst) {
+        is Symbol -> loadVariable(mst.identity)
+        is MST.Numeric -> loadNumberConstant(mst.value)
+
+        is MST.Unary -> when {
+            algebra is NumericAlgebra && mst.value is MST.Numeric -> {
+                loadNumberConstant(
+                    MST.Numeric(
+                        algebra.unaryOperationFunction(mst.operation)(algebra.number((mst.value as MST.Numeric).value)),
+                    ).value,
+                )
+            }
+
+            else -> visitUnary(mst)
+        }
+
+        is MST.Binary -> when {
+            algebra is NumericAlgebra && mst.left is MST.Numeric && mst.right is MST.Numeric -> {
+                loadNumberConstant(
+                    MST.Numeric(
+                        algebra.binaryOperationFunction(mst.operation)(
+                            algebra.number((mst.left as MST.Numeric).value),
+                            algebra.number((mst.right as MST.Numeric).value),
+                        ),
+                    ).value,
+                )
+            }
+
+            else -> visitBinary(mst)
+        }
+    }
+
+    protected open fun visitUnary(mst: MST.Unary) {
+        visitExpression(mst.value)
+    }
+
+    protected open fun visitBinary(mst: MST.Binary) {
+        visitExpression(mst.left)
+        visitExpression(mst.right)
+    }
+
+    protected companion object {
+        /**
+         * ASM type for [java.lang.Number].
+         */
+        val NUMBER_TYPE: Type by lazy { getObjectType("java/lang/Number") }
+    }
+}
+
+internal class DoubleAsmBuilder(target: MST) :
+    PrimitiveAsmBuilder<Double>(DoubleField, java.lang.Double::class.java, java.lang.Double.TYPE, target) {
+
+    private fun buildUnaryJavaMathCall(name: String) {
+        invokeMethodVisitor.invokestatic(
+            MATH_TYPE.internalName,
+            name,
+            getMethodDescriptor(tTypePrimitive, tTypePrimitive),
+            false,
+        )
+    }
+
+    private fun buildBinaryJavaMathCall(name: String) {
+        invokeMethodVisitor.invokestatic(
+            MATH_TYPE.internalName,
+            name,
+            getMethodDescriptor(tTypePrimitive, tTypePrimitive, tTypePrimitive),
+            false,
+        )
+    }
+
+    private fun buildUnaryKotlinMathCall(name: String) {
+        invokeMethodVisitor.invokestatic(
+            MATH_KT_TYPE.internalName,
+            name,
+            getMethodDescriptor(tTypePrimitive, tTypePrimitive),
+            false,
+        )
+    }
+
+    override fun visitUnary(mst: MST.Unary) {
+        super.visitUnary(mst)
+
+        when (mst.operation) {
+            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.DNEG)
+            GroupOps.PLUS_OPERATION -> Unit
+            PowerOperations.SQRT_OPERATION -> buildUnaryJavaMathCall("sqrt")
+            TrigonometricOperations.SIN_OPERATION -> buildUnaryJavaMathCall("sin")
+            TrigonometricOperations.COS_OPERATION -> buildUnaryJavaMathCall("cos")
+            TrigonometricOperations.TAN_OPERATION -> buildUnaryJavaMathCall("tan")
+            TrigonometricOperations.ASIN_OPERATION -> buildUnaryJavaMathCall("asin")
+            TrigonometricOperations.ACOS_OPERATION -> buildUnaryJavaMathCall("acos")
+            TrigonometricOperations.ATAN_OPERATION -> buildUnaryJavaMathCall("atan")
+            ExponentialOperations.SINH_OPERATION -> buildUnaryJavaMathCall("sqrt")
+            ExponentialOperations.COSH_OPERATION -> buildUnaryJavaMathCall("cosh")
+            ExponentialOperations.TANH_OPERATION -> buildUnaryJavaMathCall("tanh")
+            ExponentialOperations.ASINH_OPERATION -> buildUnaryKotlinMathCall("asinh")
+            ExponentialOperations.ACOSH_OPERATION -> buildUnaryKotlinMathCall("acosh")
+            ExponentialOperations.ATANH_OPERATION -> buildUnaryKotlinMathCall("atanh")
+            ExponentialOperations.EXP_OPERATION -> buildUnaryJavaMathCall("exp")
+            ExponentialOperations.LN_OPERATION -> buildUnaryJavaMathCall("log")
+            else -> super.visitUnary(mst)
+        }
+    }
+
+    override fun visitBinary(mst: MST.Binary) {
+        super.visitBinary(mst)
+
+        when (mst.operation) {
+            GroupOps.PLUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.DADD)
+            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.DSUB)
+            RingOps.TIMES_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.DMUL)
+            FieldOps.DIV_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.DDIV)
+            PowerOperations.POW_OPERATION -> buildBinaryJavaMathCall("pow")
+            else -> super.visitBinary(mst)
+        }
+    }
+
+    companion object {
+        val MATH_TYPE: Type by lazy { getObjectType("java/lang/Math") }
+        val MATH_KT_TYPE: Type by lazy { getObjectType("kotlin/math/MathKt") }
+    }
+}
+
+internal class IntAsmBuilder(target: MST) :
+    PrimitiveAsmBuilder<Int>(IntRing, Integer::class.java, Integer.TYPE, target) {
+    override fun visitUnary(mst: MST.Unary) {
+        super.visitUnary(mst)
+
+        when (mst.operation) {
+            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.INEG)
+            GroupOps.PLUS_OPERATION -> Unit
+            else -> super.visitUnary(mst)
+        }
+    }
+
+    override fun visitBinary(mst: MST.Binary) {
+        super.visitBinary(mst)
+
+        when (mst.operation) {
+            GroupOps.PLUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.IADD)
+            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.ISUB)
+            RingOps.TIMES_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.IMUL)
+            else -> super.visitBinary(mst)
+        }
+    }
+}
+
+internal class LongAsmBuilder(target: MST) :
+    PrimitiveAsmBuilder<Long>(LongRing, java.lang.Long::class.java, java.lang.Long.TYPE, target) {
+    override fun visitUnary(mst: MST.Unary) {
+        super.visitUnary(mst)
+
+        when (mst.operation) {
+            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.LNEG)
+            GroupOps.PLUS_OPERATION -> Unit
+            else -> super.visitUnary(mst)
+        }
+    }
+
+    override fun visitBinary(mst: MST.Binary) {
+        super.visitBinary(mst)
+
+        when (mst.operation) {
+            GroupOps.PLUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.LADD)
+            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.LSUB)
+            RingOps.TIMES_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.LMUL)
+            else -> super.visitBinary(mst)
+        }
+    }
+}
+
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
index 40d9d8fe6..b8a2a9669 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
@@ -14,4 +14,5 @@ import space.kscience.kmath.expressions.Symbol
  *
  * @author Iaroslav Postovalov
  */
+@Suppress("unused")
 internal fun <V> Map<Symbol, V>.getOrFail(key: String): V = getValue(Symbol(key))
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
index a0bdd68a0..1ea4cd0be 100644
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.ast
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
 import kotlin.contracts.InvocationKind
@@ -15,7 +16,21 @@ import kotlin.contracts.contract
 import space.kscience.kmath.asm.compile as asmCompile
 import space.kscience.kmath.asm.compileToExpression as asmCompileToExpression
 
-private object AsmCompilerTestContext : CompilerTestContext {
+private object GenericAsmCompilerTestContext : CompilerTestContext {
+    override fun MST.compileToExpression(algebra: IntRing): Expression<Int> =
+        asmCompileToExpression(algebra as Algebra<Int>)
+
+    override fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int =
+        asmCompile(algebra as Algebra<Int>, arguments)
+
+    override fun MST.compileToExpression(algebra: DoubleField): Expression<Double> =
+        asmCompileToExpression(algebra as Algebra<Double>)
+
+    override fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Double =
+        asmCompile(algebra as Algebra<Double>, arguments)
+}
+
+private object PrimitiveAsmCompilerTestContext : CompilerTestContext {
     override fun MST.compileToExpression(algebra: IntRing): Expression<Int> = asmCompileToExpression(algebra)
     override fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int = asmCompile(algebra, arguments)
     override fun MST.compileToExpression(algebra: DoubleField): Expression<Double> = asmCompileToExpression(algebra)
@@ -24,7 +39,9 @@ private object AsmCompilerTestContext : CompilerTestContext {
         asmCompile(algebra, arguments)
 }
 
+
 internal actual inline fun runCompilerTest(action: CompilerTestContext.() -> Unit) {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    action(AsmCompilerTestContext)
+    action(GenericAsmCompilerTestContext)
+    action(PrimitiveAsmCompilerTestContext)
 }
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index 110529b72..92f2435ba 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -8,7 +8,7 @@ Complex and hypercomplex number systems in KMath.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-14`.
+The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-17`.
 
 **Gradle:**
 ```gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-complex:0.3.0-dev-14'
+    implementation 'space.kscience:kmath-complex:0.3.0-dev-17'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-complex:0.3.0-dev-14")
+    implementation("space.kscience:kmath-complex:0.3.0-dev-17")
 }
 ```
diff --git a/kmath-core/README.md b/kmath-core/README.md
index 4ea493f44..e765ad50c 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -15,7 +15,7 @@ performance calculations to code generation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-14`.
+The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-17`.
 
 **Gradle:**
 ```gradle
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-core:0.3.0-dev-14'
+    implementation 'space.kscience:kmath-core:0.3.0-dev-17'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -36,6 +36,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-core:0.3.0-dev-14")
+    implementation("space.kscience:kmath-core:0.3.0-dev-17")
 }
 ```
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
index cd49e4519..fcfd57e82 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
@@ -9,8 +9,8 @@ import kotlin.jvm.JvmInline
 import kotlin.properties.ReadOnlyProperty
 
 /**
- * A marker interface for a symbol. A symbol must have an identity.
- * Ic
+ * A marker interface for a symbol. A symbol must have an identity with equality relation based on it.
+ * Other properties are to store additional, transient data only.
  */
 public interface Symbol : MST {
     /**
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index f88f53000..fcd092bf1 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -9,7 +9,7 @@ EJML based linear algebra implementation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-14`.
+The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-17`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ejml:0.3.0-dev-14'
+    implementation 'space.kscience:kmath-ejml:0.3.0-dev-17'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ejml:0.3.0-dev-14")
+    implementation("space.kscience:kmath-ejml:0.3.0-dev-17")
 }
 ```
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index d449b4540..938327612 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -9,7 +9,7 @@ Specialization of KMath APIs for Double numbers.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-14`.
+The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-17`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-for-real:0.3.0-dev-14'
+    implementation 'space.kscience:kmath-for-real:0.3.0-dev-17'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-for-real:0.3.0-dev-14")
+    implementation("space.kscience:kmath-for-real:0.3.0-dev-17")
 }
 ```
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index d0beae2c8..3d4beee47 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -11,7 +11,7 @@ Functions and interpolations.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-14`.
+The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-17`.
 
 **Gradle:**
 ```gradle
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-functions:0.3.0-dev-14'
+    implementation 'space.kscience:kmath-functions:0.3.0-dev-17'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-functions:0.3.0-dev-14")
+    implementation("space.kscience:kmath-functions:0.3.0-dev-17")
 }
 ```
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index 3c5d4e19d..760244751 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -7,7 +7,7 @@ Integration with [Jafama](https://github.com/jeffhain/jafama).
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0-dev-14`.
+The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0-dev-17`.
 
 **Gradle:**
 ```gradle
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-jafama:0.3.0-dev-14'
+    implementation 'space.kscience:kmath-jafama:0.3.0-dev-17'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-jafama:0.3.0-dev-14")
+    implementation("space.kscience:kmath-jafama:0.3.0-dev-17")
 }
 ```
 
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
index aeb44ea13..588ccb9b4 100644
--- a/kmath-kotlingrad/README.md
+++ b/kmath-kotlingrad/README.md
@@ -8,7 +8,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-14`.
+The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-17`.
 
 **Gradle:**
 ```gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-14'
+    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-17'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-14")
+    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-17")
 }
 ```
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index 5cbb31d5a..7ca9cd4fd 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -9,7 +9,7 @@ ND4J based implementations of KMath abstractions.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-14`.
+The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-17`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-14'
+    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-17'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-nd4j:0.3.0-dev-14")
+    implementation("space.kscience:kmath-nd4j:0.3.0-dev-17")
 }
 ```
 
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index b19a55381..42ce91336 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -9,7 +9,7 @@ Common linear algebra operations on tensors.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-14`.
+The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-17`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensors:0.3.0-dev-14'
+    implementation 'space.kscience:kmath-tensors:0.3.0-dev-17'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensors:0.3.0-dev-14")
+    implementation("space.kscience:kmath-tensors:0.3.0-dev-17")
 }
 ```
-- 
2.34.1


From 70ac232c15d37d049c4413f552e67057dc0e1d54 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 16 Nov 2021 14:27:20 +0700
Subject: [PATCH 384/713] Relax type requirements in algebraExtensions.kt from
 Ring to Group

---
 .../kmath/operations/algebraExtensions.kt     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index 493d90d2f..1ed0414de 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -6,55 +6,55 @@
 package space.kscience.kmath.operations
 
 /**
- * Returns the sum of all elements in the iterable in this [Ring].
+ * Returns the sum of all elements in the iterable in this [Group].
  *
  * @receiver the algebra that provides addition.
  * @param data the iterable to sum up.
  * @return the sum.
  */
-public fun <T> Ring<T>.sum(data: Iterable<T>): T = data.fold(zero) { left, right ->
+public fun <T> Group<T>.sum(data: Iterable<T>): T = data.fold(zero) { left, right ->
     add(left, right)
 }
 
 //TODO replace by sumOf with multi-receivers
 
 /**
- * Returns the sum of all elements in the sequence in this [Ring].
+ * Returns the sum of all elements in the sequence in this [Group].
  *
  * @receiver the algebra that provides addition.
  * @param data the sequence to sum up.
  * @return the sum.
  */
-public fun <T> Ring<T>.sum(data: Sequence<T>): T = data.fold(zero) { left, right ->
+public fun <T> Group<T>.sum(data: Sequence<T>): T = data.fold(zero) { left, right ->
     add(left, right)
 }
 
 /**
- * Returns an average value of elements in the iterable in this [Ring].
+ * Returns an average value of elements in the iterable in this [Group].
  *
  * @receiver the algebra that provides addition and division.
  * @param data the iterable to find average.
  * @return the average value.
  * @author Iaroslav Postovalov
  */
-public fun <T, S> S.average(data: Iterable<T>): T where S : Ring<T>, S : ScaleOperations<T> =
+public fun <T, S> S.average(data: Iterable<T>): T where S : Group<T>, S : ScaleOperations<T> =
     sum(data) / data.count()
 
 /**
- * Returns an average value of elements in the sequence in this [Ring].
+ * Returns an average value of elements in the sequence in this [Group].
  *
  * @receiver the algebra that provides addition and division.
  * @param data the sequence to find average.
  * @return the average value.
  * @author Iaroslav Postovalov
  */
-public fun <T, S> S.average(data: Sequence<T>): T where S : Ring<T>, S : ScaleOperations<T> =
+public fun <T, S> S.average(data: Sequence<T>): T where S : Group<T>, S : ScaleOperations<T> =
     sum(data) / data.count()
 
 /**
  * Absolute of the comparable [value]
  */
-public fun <T : Comparable<T>> Ring<T>.abs(value: T): T = if (value > zero) value else -value
+public fun <T : Comparable<T>> Group<T>.abs(value: T): T = if (value > zero) value else -value
 
 /**
  * Returns the sum of all elements in the iterable in provided space.
@@ -63,7 +63,7 @@ public fun <T : Comparable<T>> Ring<T>.abs(value: T): T = if (value > zero) valu
  * @param group the algebra that provides addition.
  * @return the sum.
  */
-public fun <T> Iterable<T>.sumWith(group: Ring<T>): T = group.sum(this)
+public fun <T> Iterable<T>.sumWith(group: Group<T>): T = group.sum(this)
 
 /**
  * Returns the sum of all elements in the sequence in provided space.
@@ -72,27 +72,27 @@ public fun <T> Iterable<T>.sumWith(group: Ring<T>): T = group.sum(this)
  * @param group the algebra that provides addition.
  * @return the sum.
  */
-public fun <T> Sequence<T>.sumWith(group: Ring<T>): T = group.sum(this)
+public fun <T> Sequence<T>.sumWith(group: Group<T>): T = group.sum(this)
 
 /**
- * Returns an average value of elements in the iterable in this [Ring].
+ * Returns an average value of elements in the iterable in this [Group].
  *
  * @receiver the iterable to find average.
  * @param space the algebra that provides addition and division.
  * @return the average value.
  * @author Iaroslav Postovalov
  */
-public fun <T, S> Iterable<T>.averageWith(space: S): T where S : Ring<T>, S : ScaleOperations<T> =
+public fun <T, S> Iterable<T>.averageWith(space: S): T where S : Group<T>, S : ScaleOperations<T> =
     space.average(this)
 
 /**
- * Returns an average value of elements in the sequence in this [Ring].
+ * Returns an average value of elements in the sequence in this [Group].
  *
  * @receiver the sequence to find average.
  * @param space the algebra that provides addition and division.
  * @return the average value.
  * @author Iaroslav Postovalov
  */
-public fun <T, S> Sequence<T>.averageWith(space: S): T where S : Ring<T>, S : ScaleOperations<T> =
+public fun <T, S> Sequence<T>.averageWith(space: S): T where S : Group<T>, S : ScaleOperations<T> =
     space.average(this)
 
-- 
2.34.1


From 7ceb0b69b8a4b95f3510b5281f1618b62524f1dd Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 16 Nov 2021 18:04:44 +0700
Subject: [PATCH 385/713] Revert license removal and update copyright

---
 .gitignore                                    |   5 +-
 .idea/copyright/kmath.xml                     |   6 +
 .idea/copyright/profiles_settings.xml         |  21 +
 .idea/scopes/Apply_copyright.xml              |   3 +
 .../kmath/benchmarks/ArrayBenchmark.kt        |   2 +-
 .../kmath/benchmarks/BigIntBenchmark.kt       |   2 +-
 .../kmath/benchmarks/BufferBenchmark.kt       |   2 +-
 .../kscience/kmath/benchmarks/DotBenchmark.kt |   2 +-
 .../ExpressionsInterpretersBenchmark.kt       |   2 +-
 .../kmath/benchmarks/JafamaBenchmark.kt       |   2 +-
 .../benchmarks/MatrixInverseBenchmark.kt      |   2 +-
 .../kmath/benchmarks/NDFieldBenchmark.kt      |   2 +-
 .../kmath/benchmarks/ViktorBenchmark.kt       |   2 +-
 .../kmath/benchmarks/ViktorLogBenchmark.kt    |   2 +-
 .../kscience/kmath/benchmarks/JmhReport.kt    |   2 +-
 .../benchmarks/addBenchmarkProperties.kt      |   2 +-
 .../kmath/ejml/codegen/ejmlCodegen.kt         |   2 +-
 docs/images/KM.svg                            |   2 +-
 docs/images/KM_mono.svg                       |   2 +-
 docs/images/KMath.svg                         |   2 +-
 docs/images/KMath_mono.svg                    |   2 +-
 .../space/kscience/kmath/ast/astRendering.kt  |   2 +-
 .../space/kscience/kmath/ast/expressions.kt   |   2 +-
 .../kscience/kmath/ast/kotlingradSupport.kt   |   2 +-
 .../space/kscience/kmath/ast/symjaSupport.kt  |   2 +-
 .../space/kscience/kmath/fit/chiSquared.kt    |   2 +-
 .../kscience/kmath/functions/integrate.kt     |   2 +-
 .../kscience/kmath/functions/interpolate.kt   |   2 +-
 .../kmath/functions/interpolateSquare.kt      |   2 +-
 .../kmath/functions/matrixIntegration.kt      |   2 +-
 .../space/kscience/kmath/jafama/JafamaDemo.kt |   2 +-
 .../kscience/kmath/linear/dotPerformance.kt   |   2 +-
 .../space/kscience/kmath/linear/gradient.kt   |   2 +-
 .../kscience/kmath/operations/BigIntDemo.kt   |   2 +-
 .../kscience/kmath/operations/complexDemo.kt  |   2 +-
 .../kmath/operations/mixedNDOperations.kt     |   5 +
 .../kmath/stat/DistributionBenchmark.kt       |   2 +-
 .../kscience/kmath/stat/DistributionDemo.kt   |   2 +-
 .../kscience/kmath/structures/ComplexND.kt    |   2 +-
 .../kscience/kmath/structures/NDField.kt      |   2 +-
 .../kmath/structures/StreamDoubleFieldND.kt   |   2 +-
 .../structures/StructureReadBenchmark.kt      |   2 +-
 .../structures/StructureWriteBenchmark.kt     |   2 +-
 .../kmath/structures/typeSafeDimensions.kt    |   2 +-
 .../kscience/kmath/tensors/OLSWithSVD.kt      |   2 +-
 .../space/kscience/kmath/tensors/PCA.kt       |   2 +-
 .../kmath/tensors/dataSetNormalization.kt     |   2 +-
 .../tensors/linearSystemSolvingWithLUP.kt     |   2 +-
 .../space/kscience/kmath/tensors/multik.kt    |   2 +-
 .../kscience/kmath/tensors/neuralNetwork.kt   |   2 +-
 gradlew                                       | 269 ++++++-----
 .../kotlin/space/kscience/kmath/ast/parser.kt |   2 +-
 .../ast/rendering/LatexSyntaxRenderer.kt      |   2 +-
 .../ast/rendering/MathMLSyntaxRenderer.kt     |   2 +-
 .../kmath/ast/rendering/MathRenderer.kt       |   2 +-
 .../kmath/ast/rendering/MathSyntax.kt         |   2 +-
 .../kmath/ast/rendering/SyntaxRenderer.kt     |   2 +-
 .../kscience/kmath/ast/rendering/features.kt  |   2 +-
 .../ast/rendering/multiplatformToString.kt    |   2 +-
 .../kscience/kmath/ast/rendering/phases.kt    |   2 +-
 .../TestCompilerConsistencyWithInterpreter.kt |   2 +-
 .../kmath/ast/TestCompilerOperations.kt       |   2 +-
 .../kmath/ast/TestCompilerVariables.kt        |   2 +-
 .../space/kscience/kmath/ast/TestParser.kt    |   2 +-
 .../kmath/ast/TestParserPrecedence.kt         |   2 +-
 .../kmath/ast/rendering/TestFeatures.kt       |   2 +-
 .../kscience/kmath/ast/rendering/TestLatex.kt |   2 +-
 .../kmath/ast/rendering/TestMathML.kt         |   2 +-
 .../kmath/ast/rendering/TestStages.kt         |   2 +-
 .../kscience/kmath/ast/rendering/TestUtils.kt |   2 +-
 .../kotlin/space/kscience/kmath/ast/utils.kt  |   2 +-
 .../ast/rendering/multiplatformToString.kt    |   2 +-
 .../space/kscience/kmath/estree/estree.kt     |   2 +-
 .../kmath/estree/internal/ESTreeBuilder.kt    |   2 +-
 .../internal/astring/astring.typealises.kt    |   2 +-
 .../kmath/internal/astring/astring.kt         |   2 +-
 .../internal/astring/astring.typealises.kt    |   2 +-
 .../kscience/kmath/internal/base64/base64.kt  |   2 +-
 .../kmath/internal/binaryen/index.binaryen.kt |   2 +-
 .../binaryen/index.binaryen.typealiases.kt    |   2 +-
 .../kmath/internal/emitter/emitter.kt         |   2 +-
 .../internal/estree/estree.extensions.kt      |   2 +-
 .../kscience/kmath/internal/estree/estree.kt  |   2 +-
 .../kscience/kmath/internal/stream/stream.kt  |   2 +-
 .../internal/tsstdlib/lib.es2015.iterable.kt  |   2 +-
 .../kmath/internal/tsstdlib/lib.es5.kt        |   2 +-
 .../lib.dom.WebAssembly.module_dukat.kt       |   2 +-
 .../nonDeclarations.WebAssembly.kt            |   2 +-
 .../kmath/wasm/internal/WasmBuilder.kt        |   2 +-
 .../wasm/internal/f64StandardFunctions.kt     |   2 +-
 .../kotlin/space/kscience/kmath/wasm/wasm.kt  |   2 +-
 .../kscience/kmath/ast/TestExecutionTime.kt   |   2 +-
 .../kotlin/space/kscience/kmath/ast/utils.kt  |   2 +-
 .../kscience/kmath/wasm/TestWasmSpecific.kt   |   2 +-
 .../kotlin/space/kscience/kmath/asm/asm.kt    |   2 +-
 .../kscience/kmath/asm/internal/AsmBuilder.kt |   5 +
 .../asm/internal/ByteArrayClassLoader.kt      |   5 +
 .../kmath/asm/internal/GenericAsmBuilder.kt   |   2 +-
 .../kmath/asm/internal/PrimitiveAsmBuilder.kt |   5 +
 .../kmath/asm/internal/codegenUtils.kt        |   2 +-
 .../kmath/asm/internal/mapIntrinsics.kt       |   2 +-
 .../ast/rendering/multiplatformToString.kt    |   2 +-
 .../kotlin/space/kscience/kmath/ast/utils.kt  |   2 +-
 .../DerivativeStructureExpression.kt          |   2 +-
 .../integration/CMGaussRuleIntegrator.kt      |   2 +-
 .../kmath/commons/integration/CMIntegrator.kt |   2 +-
 .../kscience/kmath/commons/linear/CMMatrix.kt |   2 +-
 .../kscience/kmath/commons/linear/CMSolver.kt |   2 +-
 .../random/CMRandomGeneratorWrapper.kt        |   2 +-
 .../commons/transform/Transformations.kt      |   2 +-
 .../DerivativeStructureExpressionTest.kt      |   2 +-
 .../commons/integration/IntegrationTest.kt    |   2 +-
 .../commons/optimization/OptimizeTest.kt      |   2 +-
 .../space/kscience/kmath/complex/Complex.kt   |   2 +-
 .../kscience/kmath/complex/ComplexFieldND.kt  |   2 +-
 .../kscience/kmath/complex/Quaternion.kt      |   2 +-
 .../kmath/complex/ComplexBufferSpecTest.kt    |   2 +-
 .../kmath/complex/ComplexFieldTest.kt         |   2 +-
 .../kscience/kmath/complex/ComplexTest.kt     |   2 +-
 .../complex/ExpressionFieldForComplexTest.kt  |   2 +-
 .../kmath/complex/QuaternionFieldTest.kt      |   2 +-
 .../space/kscience/kmath/data/ColumnarData.kt |   2 +-
 .../kscience/kmath/data/XYColumnarData.kt     |   2 +-
 .../kscience/kmath/data/XYZColumnarData.kt    |   2 +-
 .../space/kscience/kmath/domains/Domain.kt    |   2 +-
 .../kscience/kmath/domains/DoubleDomain.kt    |   2 +-
 .../kmath/domains/HyperSquareDomain.kt        |   2 +-
 .../kmath/domains/UnconstrainedDomain.kt      |   2 +-
 .../kmath/domains/UnivariateDomain.kt         |   2 +-
 .../expressions/DifferentiableExpression.kt   |   2 +-
 .../kscience/kmath/expressions/Expression.kt  |   2 +-
 .../FunctionalExpressionAlgebra.kt            |   2 +-
 .../space/kscience/kmath/expressions/MST.kt   |   2 +-
 .../kscience/kmath/expressions/MstAlgebra.kt  |   2 +-
 .../kmath/expressions/SimpleAutoDiff.kt       |   2 +-
 .../kscience/kmath/expressions/Symbol.kt      |   2 +-
 .../kmath/expressions/SymbolIndexer.kt        |   2 +-
 .../kmath/linear/BufferedLinearSpace.kt       |   2 +-
 .../kmath/linear/DoubleLinearSpace.kt         |   2 +-
 .../kscience/kmath/linear/LinearSolver.kt     |   2 +-
 .../kscience/kmath/linear/LinearSpace.kt      |   2 +-
 .../kscience/kmath/linear/LupDecomposition.kt |   2 +-
 .../kscience/kmath/linear/MatrixBuilder.kt    |   2 +-
 .../kscience/kmath/linear/MatrixFeatures.kt   |   2 +-
 .../kscience/kmath/linear/MatrixWrapper.kt    |   2 +-
 .../kscience/kmath/linear/VirtualMatrix.kt    |   2 +-
 .../space/kscience/kmath/misc/annotations.kt  |   2 +-
 .../space/kscience/kmath/misc/cumulative.kt   |   2 +-
 .../space/kscience/kmath/misc/numbers.kt      |   2 +-
 .../space/kscience/kmath/nd/AlgebraND.kt      |   2 +-
 .../kscience/kmath/nd/BufferAlgebraND.kt      |   2 +-
 .../space/kscience/kmath/nd/BufferND.kt       |   2 +-
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |   2 +-
 .../space/kscience/kmath/nd/ShapeIndexer.kt   |   2 +-
 .../space/kscience/kmath/nd/ShortRingND.kt    |   2 +-
 .../space/kscience/kmath/nd/Structure1D.kt    |   2 +-
 .../space/kscience/kmath/nd/Structure2D.kt    |   2 +-
 .../space/kscience/kmath/nd/StructureND.kt    |   2 +-
 .../kscience/kmath/nd/algebraNDExtentions.kt  |   2 +-
 .../kscience/kmath/operations/Algebra.kt      |   2 +-
 .../space/kscience/kmath/operations/BigInt.kt |   2 +-
 .../kmath/operations/DoubleBufferField.kt     |   2 +-
 .../kmath/operations/DoubleBufferOps.kt       |   2 +-
 .../kscience/kmath/operations/LogicAlgebra.kt |   2 +-
 .../kmath/operations/NumericAlgebra.kt        |   2 +-
 .../kmath/operations/OptionalOperations.kt    |   2 +-
 .../kmath/operations/algebraExtensions.kt     |   2 +-
 .../kmath/operations/bufferOperation.kt       |   2 +-
 .../kscience/kmath/operations/numbers.kt      |   2 +-
 .../kscience/kmath/structures/ArrayBuffer.kt  |   2 +-
 .../space/kscience/kmath/structures/Buffer.kt |   2 +-
 .../kmath/structures/BufferAccessor2D.kt      |   2 +-
 .../kscience/kmath/structures/DoubleBuffer.kt |   2 +-
 .../kmath/structures/FlaggedBuffer.kt         |   2 +-
 .../kscience/kmath/structures/FloatBuffer.kt  |   2 +-
 .../kscience/kmath/structures/IntBuffer.kt    |   2 +-
 .../kscience/kmath/structures/ListBuffer.kt   |   2 +-
 .../kscience/kmath/structures/LongBuffer.kt   |   2 +-
 .../kscience/kmath/structures/MemoryBuffer.kt |   2 +-
 .../kmath/structures/MutableBuffer.kt         |   2 +-
 .../kscience/kmath/structures/ShortBuffer.kt  |   2 +-
 .../kmath/expressions/ExpressionFieldTest.kt  |   2 +-
 .../kmath/expressions/InterpretTest.kt        |   2 +-
 .../kmath/expressions/SimpleAutoDiffTest.kt   |   2 +-
 .../kmath/linear/DoubleLUSolverTest.kt        |   2 +-
 .../space/kscience/kmath/linear/MatrixTest.kt |   2 +-
 .../kscience/kmath/misc/CumulativeKtTest.kt   |   2 +-
 .../kmath/operations/BigIntAlgebraTest.kt     |   2 +-
 .../kmath/operations/BigIntConstructorTest.kt |   2 +-
 .../kmath/operations/BigIntConversionsTest.kt |   2 +-
 .../kmath/operations/BigIntOperationsTest.kt  |   2 +-
 .../kmath/operations/DoubleFieldTest.kt       |   2 +-
 .../kscience/kmath/structures/NDFieldTest.kt  |   2 +-
 .../kmath/structures/NumberNDFieldTest.kt     |   2 +-
 .../kmath/testutils/AlgebraicVerifier.kt      |   2 +-
 .../kscience/kmath/testutils/FieldVerifier.kt |   2 +-
 .../kscience/kmath/testutils/RingVerifier.kt  |   2 +-
 .../kscience/kmath/testutils/SpaceVerifier.kt |   2 +-
 .../space/kscience/kmath/misc/numbers.kt      |   2 +-
 .../kscience/kmath/operations/isInteger.kt    |   5 +
 .../space/kscience/kmath/misc/numbersJVM.kt   |   2 +-
 .../kscience/kmath/operations/BigNumbers.kt   |   2 +-
 .../kscience/kmath/operations/isInteger.kt    |   5 +
 .../space/kscience/kmath/misc/numbers.kt      |   2 +-
 .../kscience/kmath/operations/isInteger.kt    |   5 +
 .../kscience/kmath/chains/BlockingChain.kt    |   2 +-
 .../kmath/chains/BlockingDoubleChain.kt       |   2 +-
 .../kscience/kmath/chains/BlockingIntChain.kt |   2 +-
 .../space/kscience/kmath/chains/Chain.kt      |   2 +-
 .../space/kscience/kmath/chains/flowExtra.kt  |   2 +-
 .../kmath/coroutines/coroutinesExtra.kt       |   2 +-
 .../kscience/kmath/streaming/BufferFlow.kt    |   2 +-
 .../kscience/kmath/streaming/RingBuffer.kt    |   2 +-
 .../space/kscience/kmath/chains/ChainExt.kt   |   2 +-
 .../kmath/structures/LazyStructureND.kt       |   2 +-
 .../kmath/streaming/BufferFlowTest.kt         |   2 +-
 .../kmath/streaming/RingBufferTest.kt         |   2 +-
 .../kscience/kmath/dimensions/Dimension.kt    |   2 +-
 .../kscience/kmath/dimensions/Wrappers.kt     |   2 +-
 .../kscience/dimensions/DMatrixContextTest.kt |   2 +-
 .../kscience/kmath/dimensions/Dimension.kt    |   2 +-
 .../kscience/kmath/dimensions/Dimension.kt    |   2 +-
 .../kscience/kmath/dimensions/Dimension.kt    |   2 +-
 .../kscience/kmath/ejml/EjmlLinearSpace.kt    |   2 +-
 .../space/kscience/kmath/ejml/EjmlMatrix.kt   |   2 +-
 .../space/kscience/kmath/ejml/EjmlVector.kt   |   2 +-
 .../kscience/kmath/ejml/EjmlMatrixTest.kt     |   2 +-
 .../kscience/kmath/ejml/EjmlVectorTest.kt     |   2 +-
 .../space/kscience/kmath/real/RealMatrix.kt   |   2 +-
 .../space/kscience/kmath/real/RealVector.kt   |   2 +-
 .../kotlin/space/kscience/kmath/real/dot.kt   |   2 +-
 .../kotlin/space/kscience/kmath/real/grids.kt |   2 +-
 .../space/kscience/kmath/real/realND.kt       |   2 +-
 .../kscience/kmath/real/DoubleMatrixTest.kt   |   2 +-
 .../kscience/kmath/real/DoubleVectorTest.kt   |   2 +-
 .../space/kscience/kmath/real/GridTest.kt     |   2 +-
 .../kscience/kmath/functions/Piecewise.kt     |   2 +-
 .../kscience/kmath/functions/Polynomial.kt    |   2 +-
 .../kscience/kmath/functions/functionTypes.kt |   2 +-
 .../kmath/integration/GaussIntegrator.kt      |   2 +-
 .../integration/GaussIntegratorRuleFactory.kt |   2 +-
 .../kscience/kmath/integration/Integrand.kt   |   2 +-
 .../kscience/kmath/integration/Integrator.kt  |   2 +-
 .../integration/MultivariateIntegrand.kt      |   2 +-
 .../kmath/integration/SimpsonIntegrator.kt    |   2 +-
 .../kmath/integration/SplineIntegrator.kt     |   2 +-
 .../kmath/integration/UnivariateIntegrand.kt  |   2 +-
 .../kmath/interpolation/Interpolator.kt       |   2 +-
 .../kmath/interpolation/LinearInterpolator.kt |   2 +-
 .../kmath/interpolation/SplineInterpolator.kt |   2 +-
 .../kmath/functions/PolynomialTest.kt         |   2 +-
 .../kmath/integration/GaussIntegralTest.kt    |   2 +-
 .../kmath/integration/SimpsonIntegralTest.kt  |   2 +-
 .../kmath/integration/SplineIntegralTest.kt   |   2 +-
 .../interpolation/LinearInterpolatorTest.kt   |   2 +-
 .../interpolation/SplineInterpolatorTest.kt   |   2 +-
 .../kmath/geometry/Euclidean2DSpace.kt        |   2 +-
 .../kmath/geometry/Euclidean3DSpace.kt        |   2 +-
 .../kscience/kmath/geometry/GeometrySpace.kt  |   2 +-
 .../space/kscience/kmath/geometry/Line.kt     |   2 +-
 .../kscience/kmath/geometry/Projections.kt    |   5 +
 .../kscience/kmath/geometry/ReferenceFrame.kt |   2 +-
 .../kmath/geometry/Euclidean2DSpaceTest.kt    |   5 +
 .../kmath/geometry/Euclidean3DSpaceTest.kt    |   5 +
 .../kmath/geometry/ProjectionAlongTest.kt     |   5 +
 .../kmath/geometry/ProjectionOntoLineTest.kt  |   5 +
 .../kscience/kmath/geometry/Vector2DTest.kt   |   5 +
 .../kscience/kmath/geometry/Vector3DTest.kt   |   5 +
 .../kscience/kmath/geometry/testUtils.kt      |   5 +
 .../space/kscience/kmath/histogram/Counter.kt |   2 +-
 .../kmath/histogram/DoubleHistogramSpace.kt   |   2 +-
 .../kscience/kmath/histogram/Histogram.kt     |   2 +-
 .../kmath/histogram/IndexedHistogramSpace.kt  |   2 +-
 .../histogram/MultivariateHistogramTest.kt    |   2 +-
 .../kmath/histogram/TreeHistogramSpace.kt     |   2 +-
 .../kmath/histogram/UnivariateHistogram.kt    |   2 +-
 .../kmath/histogram/TreeHistogramTest.kt      |   2 +-
 .../kscience/kmath/jafama/KMathJafama.kt      |   2 +-
 .../kscience/kmath/jupyter/KMathJupyter.kt    |   2 +-
 .../kscience/kmath/kotlingrad/KMathNumber.kt  |   2 +-
 .../kmath/kotlingrad/KotlingradExpression.kt  |   2 +-
 .../kmath/kotlingrad/scalarsAdapters.kt       |   2 +-
 .../kmath/kotlingrad/AdaptingTests.kt         |   2 +-
 .../space/kscience/kmath/memory/Memory.kt     |   2 +-
 .../space/kscience/kmath/memory/MemorySpec.kt |   2 +-
 .../kscience/kmath/memory/DataViewMemory.kt   |   2 +-
 .../kscience/kmath/memory/ByteBufferMemory.kt |   2 +-
 .../kscience/kmath/memory/NativeMemory.kt     |   2 +-
 .../kmath/multik/MultikDoubleAlgebra.kt       |   5 +
 .../kmath/multik/MultikTensorAlgebra.kt       |   2 +-
 .../kscience/kmath/multik/MultikNDTest.kt     |   5 +
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   |   2 +-
 .../kscience/kmath/nd4j/Nd4jArrayIterator.kt  |   2 +-
 .../kscience/kmath/nd4j/Nd4jArrayStructure.kt |   2 +-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |   2 +-
 .../space/kscience/kmath/nd4j/arrays.kt       |   2 +-
 .../kmath/nd4j/Nd4jArrayAlgebraTest.kt        |   2 +-
 .../kmath/nd4j/Nd4jArrayStructureTest.kt      |   2 +-
 .../kmath/distributions/Distribution.kt       |   2 +-
 .../distributions/FactorizedDistribution.kt   |   2 +-
 .../kmath/distributions/NormalDistribution.kt |   2 +-
 .../kscience/kmath/internal/InternalErf.kt    |   2 +-
 .../kscience/kmath/internal/InternalGamma.kt  |   2 +-
 .../kscience/kmath/internal/InternalUtils.kt  |   2 +-
 .../AhrensDieterExponentialSampler.kt         |   2 +-
 .../AhrensDieterMarsagliaTsangGammaSampler.kt |   2 +-
 .../samplers/AliasMethodDiscreteSampler.kt    |   2 +-
 .../kmath/samplers/BoxMullerSampler.kt        |   2 +-
 .../kmath/samplers/GaussianSampler.kt         |   2 +-
 .../samplers/KempSmallMeanPoissonSampler.kt   |   2 +-
 .../MarsagliaNormalizedGaussianSampler.kt     |   2 +-
 .../samplers/NormalizedGaussianSampler.kt     |   2 +-
 .../kscience/kmath/samplers/PoissonSampler.kt |   2 +-
 .../ZigguratNormalizedGaussianSampler.kt      |   2 +-
 .../space/kscience/kmath/stat/MCScope.kt      |   2 +-
 .../kotlin/space/kscience/kmath/stat/Mean.kt  |   2 +-
 .../space/kscience/kmath/stat/Median.kt       |   2 +-
 .../space/kscience/kmath/stat/RandomChain.kt  |   2 +-
 .../kscience/kmath/stat/RandomGenerator.kt    |   2 +-
 .../space/kscience/kmath/stat/Sampler.kt      |   2 +-
 .../kscience/kmath/stat/SamplerAlgebra.kt     |   2 +-
 .../space/kscience/kmath/stat/Statistic.kt    |   2 +-
 .../kmath/stat/UniformDistribution.kt         |   2 +-
 .../kmath/stat/RandomSourceGenerator.kt       |   2 +-
 .../kmath/stat/CommonsDistributionsTest.kt    |   2 +-
 .../space/kscience/kmath/stat/MCScopeTest.kt  |   2 +-
 .../space/kscience/kmath/stat/SamplerTest.kt  |   2 +-
 .../kscience/kmath/stat/StatisticTest.kt      |   2 +-
 .../kscience/kmath/symja/SymjaExpression.kt   |   2 +-
 .../space/kscience/kmath/symja/adapters.kt    |   2 +-
 .../tensors/api/AnalyticTensorAlgebra.kt      |   2 +-
 .../tensors/api/LinearOpsTensorAlgebra.kt     |   2 +-
 .../kscience/kmath/tensors/api/Tensor.kt      |   2 +-
 .../kmath/tensors/api/TensorAlgebra.kt        |   2 +-
 .../api/TensorPartialDivisionAlgebra.kt       |   2 +-
 .../core/BroadcastDoubleTensorAlgebra.kt      |   2 +-
 .../kmath/tensors/core/BufferedTensor.kt      |   2 +-
 .../kmath/tensors/core/DoubleTensor.kt        |   2 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |   2 +-
 .../kscience/kmath/tensors/core/IntTensor.kt  |   2 +-
 .../tensors/core/internal/broadcastUtils.kt   |   2 +-
 .../kmath/tensors/core/internal/checks.kt     |   2 +-
 .../kmath/tensors/core/internal/linUtils.kt   |   2 +-
 .../tensors/core/internal/tensorCastsUtils.kt |   2 +-
 .../kmath/tensors/core/internal/utils.kt      |   2 +-
 .../tensors/core/tensorAlgebraExtensions.kt   |   2 +-
 .../kmath/tensors/core/tensorCasts.kt         |   2 +-
 .../kmath/tensors/core/TestBroadcasting.kt    |   2 +-
 .../core/TestDoubleAnalyticTensorAlgebra.kt   |   2 +-
 .../core/TestDoubleLinearOpsAlgebra.kt        |   2 +-
 .../kmath/tensors/core/TestDoubleTensor.kt    |   2 +-
 .../tensors/core/TestDoubleTensorAlgebra.kt   |   2 +-
 .../kscience/kmath/viktor/ViktorBuffer.kt     |   2 +-
 .../kscience/kmath/viktor/ViktorFieldOpsND.kt |   2 +-
 .../kmath/viktor/ViktorStructureND.kt         |   2 +-
 license/COPYRIGHT.txt                         |  15 +
 license/COPYRIGHT_HEADER.txt                  |   4 +
 license/LICENSE.txt                           | 202 ++++++++
 license/README.md                             |  53 ++
 license/third_party/cm_license.txt            | 457 ++++++++++++++++++
 license/third_party/crng_license.txt          | 275 +++++++++++
 license/third_party/numky_license.txt         | 201 ++++++++
 362 files changed, 1817 insertions(+), 445 deletions(-)
 create mode 100644 .idea/copyright/kmath.xml
 create mode 100644 .idea/copyright/profiles_settings.xml
 create mode 100644 .idea/scopes/Apply_copyright.xml
 create mode 100644 license/COPYRIGHT.txt
 create mode 100644 license/COPYRIGHT_HEADER.txt
 create mode 100644 license/LICENSE.txt
 create mode 100644 license/README.md
 create mode 100644 license/third_party/cm_license.txt
 create mode 100644 license/third_party/crng_license.txt
 create mode 100644 license/third_party/numky_license.txt

diff --git a/.gitignore b/.gitignore
index d6c4af4e3..79f3238e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,6 @@ out/
 
 .idea/
 
-!.idea/copyright/
-!.idea/scopes/
 
 .vscode/
 
@@ -18,3 +16,6 @@ out/
 # Generated by javac -h and runtime
 *.class
 *.log
+
+!/.idea/copyright/
+!/.idea/scopes/
diff --git a/.idea/copyright/kmath.xml b/.idea/copyright/kmath.xml
new file mode 100644
index 000000000..17e44e4d0
--- /dev/null
+++ b/.idea/copyright/kmath.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+    <copyright>
+        <option name="notice" value="Copyright 2018-2021 KMath contributors.&#10;Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file." />
+        <option name="myName" value="kmath" />
+    </copyright>
+</component>
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 000000000..b538bdf41
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,21 @@
+<component name="CopyrightManager">
+  <settings default="kmath">
+    <module2copyright>
+      <element module="Apply copyright" copyright="kmath" />
+    </module2copyright>
+    <LanguageOptions name="Groovy">
+      <option name="fileTypeOverride" value="1" />
+    </LanguageOptions>
+    <LanguageOptions name="HTML">
+      <option name="fileTypeOverride" value="1" />
+      <option name="prefixLines" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="Properties">
+      <option name="fileTypeOverride" value="1" />
+    </LanguageOptions>
+    <LanguageOptions name="XML">
+      <option name="fileTypeOverride" value="1" />
+      <option name="prefixLines" value="false" />
+    </LanguageOptions>
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/scopes/Apply_copyright.xml b/.idea/scopes/Apply_copyright.xml
new file mode 100644
index 000000000..a2575f774
--- /dev/null
+++ b/.idea/scopes/Apply_copyright.xml
@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+    <scope name="Apply copyright" pattern="!file[*]:*//testData//*&amp;&amp;!file[*]:testData//*&amp;&amp;!file[*]:*.gradle.kts&amp;&amp;!file[*]:*.gradle&amp;&amp;!file[group:kotlin-ultimate]:*/&amp;&amp;!file[kotlin.libraries]:stdlib/api//*" />
+</component>
\ No newline at end of file
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt
index 17983e88c..ff933997f 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index f2b2d4d7a..188a48ca7 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
index 5cf194b67..39819d407 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 9203c269e..63165baaa 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
index 4c6b92248..f3a52ab5f 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
index 9c6551302..5d4eee7c0 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
index 5d331af9a..4ff687aac 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index b5af5aa19..e3b3dde05 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
index 6b4d5759b..de301678c 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
index a9d1e68fc..dfdd89d74 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
index 6859de845..eaa0f59d8 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
index 568bfe535..ca1c330a1 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.benchmarks
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
index cfebf61e7..7f8cb35b3 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:Suppress("KDocUnresolvedReference")
diff --git a/docs/images/KM.svg b/docs/images/KM.svg
index f5ec452c7..6f80e4d08 100644
--- a/docs/images/KM.svg
+++ b/docs/images/KM.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   - Copyright 2018-2021 KMath contributors.
-  - Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+  - Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
   -->
 
 <svg
diff --git a/docs/images/KM_mono.svg b/docs/images/KM_mono.svg
index e583324d7..8f8e470b2 100644
--- a/docs/images/KM_mono.svg
+++ b/docs/images/KM_mono.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   - Copyright 2018-2021 KMath contributors.
-  - Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+  - Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
   -->
 
 <svg
diff --git a/docs/images/KMath.svg b/docs/images/KMath.svg
index e99464a17..f751d8eb9 100644
--- a/docs/images/KMath.svg
+++ b/docs/images/KMath.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   - Copyright 2018-2021 KMath contributors.
-  - Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+  - Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
   -->
 
 <svg
diff --git a/docs/images/KMath_mono.svg b/docs/images/KMath_mono.svg
index 3ef61bbf1..8ca6c5e84 100644
--- a/docs/images/KMath_mono.svg
+++ b/docs/images/KMath_mono.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   - Copyright 2018-2021 KMath contributors.
-  - Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+  - Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
   -->
 
 <svg
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt
index 0c16d82d1..c4f263f97 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
index 3c68f9bb5..ffafdc99d 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
index 4e3528b3e..dec3bfb81 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
index 209523c89..7e09faeff 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
index dbe0b8454..63e57bd8c 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.fit
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
index c77d1d70c..f60b1ab45 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.functions
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
index a98467ced..8dbc7b7a4 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.functions
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
index 3f958b3b0..091242829 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.functions
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index 4b6ac475c..4f99aeb47 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.functions
diff --git a/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt
index 10ed30728..9c3d0fdbe 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.jafama
diff --git a/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt b/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
index 6e8767a5b..a2d7d7c27 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.linear
diff --git a/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt b/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt
index afc42ea26..a01ea7fe2 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.linear
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/BigIntDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/BigIntDemo.kt
index 2039953b5..51f439612 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/BigIntDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/BigIntDemo.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
index 3b9c32f4b..2e1801cc2 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
index f517046ee..62c9c8076 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.operations
 
 import space.kscience.kmath.commons.linear.CMLinearSpace
diff --git a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
index 732c9a8e3..8e3cdf86f 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
index 685214c39..bde83cea9 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
index 61df3d065..d55f3df09 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:Suppress("unused")
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
index cf0721ce7..b680e267d 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index 05a13f5d2..548fb16c1 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
index db77129a2..de36c664d 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
index 84644ddd9..dea7095a8 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt
index 853ebad32..c28b566b9 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index a266d4849..b42602988 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index d83d47805..aced0cf7d 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
index 9d5b8c2a5..a436ae1c3 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
index 846e338da..f465fc424 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
index fad68fa96..f2d1f0b41 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
index 1a2a94534..5c41ab0f1 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors
diff --git a/gradlew b/gradlew
index 744e882ed..1b6c78733 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
index 7f2780548..6ebd0eff6 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
index bf5916fa5..2df3d3cc7 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
index 5439c42fa..8b5819b84 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
index 24bac425a..fdef35ebd 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
index 81b7d2afb..ee23ab408 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
index 2f285c600..362c07d72 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index 8b76b6f19..90f78a152 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
index 3e33d6415..291399cee 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
index ecea2d104..c0271fbb5 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
index 802d4c10e..1edb5923e 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
index 00344410c..be8a92f3e 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
index 8d9a2301f..af1a2e338 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
index 4c834a9ca..b838245e1 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
index 9776da45c..bb6bb3ce1 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
index ae429d97e..a40c785b9 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
index aba713c43..43f31baba 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
index 658ecd47a..145055494 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
index 4485605a6..09ec127c7 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
index 6b418821b..bf87b6fd0 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
index ef9f3145a..ec7436188 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
index 2e69a536f..521907d2c 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
index 316fdeeff..0c15e994c 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.estree
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
index 850f20be7..4907d8225 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.estree.internal
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.typealises.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.typealises.kt
index c7faf73e0..eb5c1e3dd 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.typealises.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.typealises.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.estree.internal.astring
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt
index c36860654..cca2d83af 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:JsModule("astring")
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
index 0a5b059ba..93b4f6ce6 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.internal.astring
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
index 26186c453..86e0cede7 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:Suppress(
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
index 13e3a49e2..42b6ac7d8 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:Suppress(
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
index 8e449627c..523b13b40 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:Suppress("PackageDirectoryMismatch", "NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING", "KDocMissingDocumentation")
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt
index d85857de8..1f7b09af8 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.internal.emitter
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
index 122a3a397..3aa31f921 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.internal.estree
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
index ad079dbd0..b62b8c06c 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:Suppress("ClassName")
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
index caab91731..52be5530f 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.internal.stream
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt
index 5c091e3a1..9c012e3a3 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.internal.tsstdlib
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt
index bb7fd44ca..0cd395f2c 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:Suppress("UNUSED_TYPEALIAS_PARAMETER", "DEPRECATION")
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
index 52dd64a5e..3754c3eff 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:JsQualifier("WebAssembly")
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
index d59a52701..c5023c384 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:Suppress(
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index 6039d5c27..622e6e6ec 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.wasm.internal
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
index fe9c22c18..21a88b5d0 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.wasm.internal
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
index 393a02e3d..806091715 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.wasm
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
index f8c429d5a..8cfa3a87e 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
index 3c2a9bd13..0d896c6f6 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
index 6c91df866..8ae5fcb36 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.wasm
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
index 19b400cbd..c39345f3a 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:Suppress("UNUSED_PARAMETER")
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
index 2a7b3dea9..7d3d513de 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.asm.internal
 
 import org.objectweb.asm.Type
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/ByteArrayClassLoader.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/ByteArrayClassLoader.kt
index afff48ef6..10eee7c6b 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/ByteArrayClassLoader.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/ByteArrayClassLoader.kt
@@ -1 +1,6 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.asm.internal
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
index 1b45b0625..28f4a226f 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.asm.internal
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
index 2819368ed..3e019589a 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.asm.internal
 
 import org.objectweb.asm.ClassWriter
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
index 5e2e7d8c6..06e040e93 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.asm.internal
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
index b8a2a9669..3a5ef74f7 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:JvmName("MapIntrinsics")
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
index 3e5253084..556adbe7d 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast.rendering
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
index 1ea4cd0be..47f1cc476 100644
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ast
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
index 4d2bd6237..82694d95a 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.commons.expressions
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
index 5152b04f9..e0a2f4931 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 package space.kscience.kmath.commons.integration
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
index 76a2f297c..257429fa7 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.commons.integration
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
index 14e7fc365..aa7e0a638 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.commons.linear
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
index d1fb441b0..9bb5deffd 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.commons.linear
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
index 28294cf14..6aeebb68c 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.commons.random
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
index 73ab91542..40168971e 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.commons.transform
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
index eaebc84dc..56252ab34 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.commons.expressions
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
index bab3aecb6..c5573fef1 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.commons.integration
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index c670ceead..0977dc247 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.commons.optimization
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index 879cfe94e..d3c414838 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
index 2eaa17ded..46d4b7c5c 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index ff9a8302a..3ef3428c6 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexBufferSpecTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexBufferSpecTest.kt
index 87239654d..17a077ea7 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexBufferSpecTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexBufferSpecTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexFieldTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexFieldTest.kt
index 90e624343..cbaaa815b 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexFieldTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexFieldTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexTest.kt
index a37006f75..7ad7f883d 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt
index 00ae5ede1..4279471d4 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionFieldTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionFieldTest.kt
index 319460c74..6784f3516 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionFieldTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionFieldTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.complex
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
index 53c4b4d1e..e06b774fd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.data
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
index ffec339bf..2fce772cc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.data
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
index a4a08f626..e99ae0698 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.data
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt
index 0c4d2307b..b5a84cf6c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.domains
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt
index aee1d52c5..ee1bebde0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 package space.kscience.kmath.domains
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
index 7ea3e22c4..bd5514623 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 package space.kscience.kmath.domains
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
index 040bb80b0..32a5fc56c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 package space.kscience.kmath.domains
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt
index a5add6a0b..9020ef8cb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.domains
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
index 758b992a9..12b7df0ea 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
index bd3e6d0ba..33f53202c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
index 661680565..5f194f2ea 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
index fe50902b1..7533024a1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
index ca0671ccb..4bd2a6c53 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
index aa9dd01ce..96fc73249 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
index fcfd57e82..8ab2bec31 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
index e8005096c..bf37e9615 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 410fb8505..36cbd9064 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
index 91db33bce..4e6debc60 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
index 54d90baa8..fae9e7c91 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
index 5349ad864..715fad07b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
index 95dd6d45c..fb57f2343 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
index 727b644c3..029612bc5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
index 4c2b5c73c..b70e9d8a9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
index a40c0384c..b1812f49d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
index be1677ecd..fb2b1e547 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
index 2b3a4ab03..73ecd6492 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
index 413f44960..ee7f1d8be 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt
index e048eb746..f879a06d5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index 113bd4c52..a071c1eb3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index d25b455f4..b09344d12 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:OptIn(UnstableKMathAPI::class)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 515988159..539499794 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 8baeac21f..d01a8ee95 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
index 20e180dd1..c6ff79587 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
index 827f0e21e..8152adaa5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index 3dcc77334..4ccb15eef 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index e3552c02e..cf8559869 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 614d97950..d948cf36f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
index 0e694bcb3..53f946fbd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index 244b9fea7..45ba32c13 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 5a713049e..99268348b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
index 0deb647a3..8ec3c3aea 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index b0cce91d3..a5e1c42e2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
index d50f1e79e..9037525e1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
index 9d9fc0885..d0405c705 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
index 332617158..709506fc4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index 1ed0414de..539440de9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
index 6bf3266e3..31b0c2841 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index 7c8030168..07a137415 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt
index 393ee99d6..3528b0460 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index c68bca2d9..58c6d5ded 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
index d6a48f42d..4d04a5235 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
index 3b554ab07..f4388a477 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
index 700a4f17f..b3c537280 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
index dc7903cbf..e7e98fc71 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
index ca078746c..35b722e2b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt
index 666722177..65d9dc77d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
index a0b5c78fa..c69f4646d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
index 3e08dbbb1..1dadaf7d4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt
index 97185b918..429c1a64b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
index 1d2b0188a..20691511b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
index d0b3c7751..80c5943cf 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
index 8bf852653..156334b2e 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
index 7d8ff6202..201890933 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
index 79153d95d..70e010f2e 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
index 0e2369e35..25d187bf0 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.linear
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/CumulativeKtTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/CumulativeKtTest.kt
index aa7abd8ff..e5f3f337f 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/CumulativeKtTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/CumulativeKtTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
index 75100b116..0527f5252 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConstructorTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConstructorTest.kt
index c121c86ae..eec3dc3bf 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConstructorTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConstructorTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
index 78dcdfe19..85f368f3e 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
index 11b8b161c..26d6af224 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
index 9be75d68e..76171fedd 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
index 82172af62..b7b89d107 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index 61eb6acc8..d33eb5112 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/AlgebraicVerifier.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/AlgebraicVerifier.kt
index 544e05707..ddd8fc3ea 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/AlgebraicVerifier.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/AlgebraicVerifier.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.testutils
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt
index d0a312bb2..20a7b6a72 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.testutils
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt
index 3b0b49f31..daf18834a 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.testutils
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/SpaceVerifier.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/SpaceVerifier.kt
index 4afa97ce5..951197fc6 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/SpaceVerifier.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/SpaceVerifier.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.testutils
diff --git a/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt
index a24243cb4..68a3c995b 100644
--- a/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt
+++ b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/jsMain/kotlin/space/kscience/kmath/operations/isInteger.kt b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/operations/isInteger.kt
index c15669145..24b81322e 100644
--- a/kmath-core/src/jsMain/kotlin/space/kscience/kmath/operations/isInteger.kt
+++ b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/operations/isInteger.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.operations
 
 /**
diff --git a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt
index c50919e88..5ba0dbc9b 100644
--- a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt
+++ b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
index f63efbef2..6e22c2381 100644
--- a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
+++ b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.operations
diff --git a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/isInteger.kt b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/isInteger.kt
index 746d1e530..b2f9b957b 100644
--- a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/isInteger.kt
+++ b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/isInteger.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.operations
 
 /**
diff --git a/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt
index a24243cb4..68a3c995b 100644
--- a/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt
+++ b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/operations/isInteger.kt b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/operations/isInteger.kt
index 746d1e530..b2f9b957b 100644
--- a/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/operations/isInteger.kt
+++ b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/operations/isInteger.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.operations
 
 /**
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt
index a41a30f55..87aebff61 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.chains
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
index 7b4d1f2af..25e20291e 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.chains
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingIntChain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingIntChain.kt
index f13d9907c..ac0327d0b 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingIntChain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingIntChain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.chains
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
index 403472f28..f8d2549e5 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.chains
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt
index 1620f029c..7bf54d50f 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.chains
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
index 3b90222dd..1f17efe49 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.coroutines
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
index 914139a3e..4d4493aa4 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.streaming
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
index 573b406e2..abe1c9df9 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.streaming
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/chains/ChainExt.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/chains/ChainExt.kt
index 0e36706cf..dd6e39071 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/chains/ChainExt.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/chains/ChainExt.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.chains
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
index 1feb43f33..ac9eb773a 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.structures
diff --git a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/BufferFlowTest.kt b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/BufferFlowTest.kt
index 057ac5feb..9b67f7253 100644
--- a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/BufferFlowTest.kt
+++ b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/BufferFlowTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.streaming
diff --git a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
index a3143a1ac..305b97e5d 100644
--- a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
+++ b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.streaming
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index 53482f020..e57c22834 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.dimensions
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
index c47f43723..f04536f04 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.dimensions
diff --git a/kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt b/kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt
index efa3170a3..59260fe73 100644
--- a/kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt
+++ b/kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.dimensions
diff --git a/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt b/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index 324c78108..610e8b4c0 100644
--- a/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
+++ b/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.dimensions
diff --git a/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt b/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index 8fc683ed6..e6d8b3b35 100644
--- a/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
+++ b/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:JvmName("DimensionJVM")
diff --git a/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt b/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index 001d68935..64edbe935 100644
--- a/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
+++ b/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.dimensions
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
index 25333157a..32030dfe3 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ejml
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
index 9ad0f9c77..27fd3fc53 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ejml
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
index a6de1b657..37995c27e 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ejml
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
index 5b8b2af98..209bb5b27 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ejml
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
index c87a01436..9592bfa6c 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.ejml
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
index c1ee8b48f..671e272ab 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:OptIn(PerformancePitfall::class)
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
index cca1c3551..7b9740c35 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
index 883a63f46..dc5c58be0 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
index fba999e6c..1926ef02c 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
index 56f50acbc..52362f4b4 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
index 3277410c0..4a0e8de1d 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
index 771981772..e77b96c12 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
index ec1ed8f50..8fed8d10e 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.real
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index 4225a7572..16af7f555 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.functions
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index e862c0b9d..a36d36f52 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.functions
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt
index 52b7e50db..88b24c756 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.functions
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index 2b426d204..9785d7744 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 package space.kscience.kmath.integration
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
index 94c73832b..778d85e66 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
index ca96e80fe..05e2e5c55 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt
index 868ecd0fd..1cf15b42f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
index 1546894f5..96b81aaa6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
index f65cc8423..7815757aa 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index 6abe89aad..15d548641 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index bd2a20594..6fd75e6e6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
index 5f89a9619..b13adefa5 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:OptIn(UnstableKMathAPI::class)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
index eff9cd97d..edd0e6b0a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.interpolation
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
index ac9708d01..39c33ee69 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.interpolation
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
index 21e5473a0..05c16d17e 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.functions
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
index 533389a6e..9f48a15ea 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
index eaf7abbfd..9f2d71554 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
index 4dffb276f..afeba0be4 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
index c3388c265..bec678bae 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.interpolation
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
index 42f41ab80..3adaab2d1 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.interpolation
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
index 5e3cbff83..d00575bcc 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.geometry
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index 96f307ed6..e12563b46 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.geometry
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
index 3d3f8b653..d4245c744 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.geometry
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
index d9dc57ec2..8c6ccb55e 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.geometry
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt
index 205bc17e7..5e299f450 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.geometry
 
 /**
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/ReferenceFrame.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/ReferenceFrame.kt
index 7bb95c009..a7a28b596 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/ReferenceFrame.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/ReferenceFrame.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.geometry
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
index 5913b2fa9..6b5f474bc 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.geometry
 
 import kotlin.math.sqrt
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
index 2c74cbd27..0bc91e77e 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.geometry
 
 import kotlin.test.Test
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
index 55fc39aad..dfb65a57c 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.geometry
 
 import kotlin.test.Test
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
index ab6ef3628..076025110 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.geometry
 
 import kotlin.test.Test
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
index 89ee23354..5e45b4870 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.geometry
 
 import space.kscience.kmath.operations.toList
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
index 70f8f4ebd..55bab4775 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.geometry
 
 import space.kscience.kmath.operations.toList
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
index 1277c0130..0f957529d 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.geometry
 
 import kotlin.math.abs
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
index 4f5a1ceba..3e5d93768 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
index c452edc9c..28eade060 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
index 946aa814b..4e803fc63 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
index f36f45389..0c7dd81e1 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
index e07488741..923cc98de 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
index cc54d7e1a..f8a3a6a8b 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
index d5b74fb9b..723577cd9 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
index e71602c7b..28a1b03cb 100644
--- a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
+++ b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.histogram
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
index 64a935705..91d952a76 100644
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.jafama
diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
index 9731908b3..504ad693e 100644
--- a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.jupyter
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
index 0f10c6cdd..f4386f434 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.kotlingrad
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
index 84171101f..0d4e457af 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.kotlingrad
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
index 11e5853a8..4d01677af 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.kotlingrad
diff --git a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
index 4047b9a67..7f065490c 100644
--- a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
+++ b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.kotlingrad
diff --git a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
index 9f73ae2f3..e8e51e9e2 100644
--- a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
+++ b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.memory
diff --git a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/MemorySpec.kt b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/MemorySpec.kt
index 2f2af4d9c..1ee1cf4e2 100644
--- a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/MemorySpec.kt
+++ b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/MemorySpec.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.memory
diff --git a/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt b/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
index db5eb556e..6153743fc 100644
--- a/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
+++ b/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.memory
diff --git a/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt b/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
index 6e60514f8..aef68fd80 100644
--- a/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
+++ b/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.memory
diff --git a/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt b/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
index d13da1191..5146d9689 100644
--- a/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
+++ b/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.memory
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
index 4f18ee573..1dc318517 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.multik
 
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index 0c3cf6b14..250ef7e7f 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:Suppress("unused")
diff --git a/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt b/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
index 66ba7db2d..404541776 100644
--- a/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
+++ b/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.multik
 
 import org.junit.jupiter.api.Test
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index dd27bc817..e29a3f467 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
index 5ae6f6b01..d4cad8996 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
index 82f560fdb..2a0fdc86c 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index d7dd6e71b..ceb384f0d 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
index cc9211b20..3ca756600 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
index 103416120..9d30c2027 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
index ff55ad521..30d01338f 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.nd4j
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
index 298bbc858..3d3f95f8f 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.distributions
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
index 067b47796..1218f13c5 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.distributions
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
index 24429cf32..66e041f05 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.distributions
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt
index 5b3cb1859..25668446c 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.internal
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
index 18abd669f..6e7eb039d 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.internal
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
index 77ba02a25..3997a77b3 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.internal
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
index 5f923fe5f..77d29981f 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
index 063e055ce..993215d41 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
index b00db5b30..5390a2e09 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
index 14aa26275..b3c014553 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
index e5d1ecb49..9219df43e 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
index 16f91570f..0105731c4 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
index 5e636f246..0a68e5c88 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
index ceb324e8d..83f87e832 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
index d3ff05b06..f0f94900e 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
index bda6f9819..b534fdc14 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.samplers
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
index 5e1e577ba..0e06fa162 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
index 2a9bd3cd4..aff7d03d9 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
index 664e4e8e7..c587277f9 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
index 61e472334..d4bc36b5b 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
index 98ee6402a..f280a78aa 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
index 0b3b52cab..4c11fdd65 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
index e0be72d4b..1f442c09b 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
index 107161514..43cd5b402 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
index 4c0d08720..970a3aab5 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt b/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
index a8e6a3362..202a1c8dd 100644
--- a/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
+++ b/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
index 2b6b1ca60..19c01e099 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
index 0c3d9cb0d..075d7f3e5 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
index 4060c0505..1dbbf591b 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
index 777b93c29..9eb84899c 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.stat
diff --git a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
index a343256fa..3067b5efb 100644
--- a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
+++ b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.symja
diff --git a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
index a7ca298a9..30c37c799 100644
--- a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
+++ b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.symja
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index 743105fdf..3ed34ae5e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.api
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index e8fa7dacd..0bddc3f9c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.api
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt
index e0f296057..482bb5244 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.api
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 60fc470fb..33889c2f8 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.api
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
index 0a1e09081..9c492cda1 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.api
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index 10c747777..e412ab5bb 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 54d8f54dc..73a89502c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
index ad7831fb9..8e5116336 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 864900adb..ae1a053af 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
index 715d9035f..e3d7c3d35 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
index 3787c0972..9d37423e5 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core.internal
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index 3a3b30485..a2d445b45 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core.internal
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index 290809cfd..2fb5b949f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core.internal
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index 602430b03..a5cdb2f47 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core.internal
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index 553ed6add..85cc91b1d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core.internal
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
index 1e6dfd52e..d8e8df31e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:OptIn(PerformancePitfall::class)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
index feade56de..5dc8114dd 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 1171b5217..6788ae792 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index ba8182da2..1e21379b4 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index c50c99b54..e025d4b71 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 2686df19e..d808637c7 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 2aee03b82..03357f1e1 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.tensors.core
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
index 32fb65b8a..4eedcb5ee 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.viktor
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
index e43bbbc6f..ef7702014 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.viktor
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index 4926652ed..25ca3a10e 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.viktor
diff --git a/license/COPYRIGHT.txt b/license/COPYRIGHT.txt
new file mode 100644
index 000000000..7bf2faffd
--- /dev/null
+++ b/license/COPYRIGHT.txt
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
\ No newline at end of file
diff --git a/license/COPYRIGHT_HEADER.txt b/license/COPYRIGHT_HEADER.txt
new file mode 100644
index 000000000..3e7d28489
--- /dev/null
+++ b/license/COPYRIGHT_HEADER.txt
@@ -0,0 +1,4 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
\ No newline at end of file
diff --git a/license/LICENSE.txt b/license/LICENSE.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/license/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/license/README.md b/license/README.md
new file mode 100644
index 000000000..376321684
--- /dev/null
+++ b/license/README.md
@@ -0,0 +1,53 @@
+The Apache 2 license (given in full in LICENSE.txt) applies to all code in this repository, which is copyright by the
+contributors of KMath. The following sections of the repository contain third-party code, to which different licenses
+may apply:
+
+## KMath Libraries
+
+The following modules contain third-party code and are incorporated into the KMath Libraries:
+
+- Path: kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+    - License: Apache 2 ([cm](third_party/cm_license.txt))
+    - Origin: Derived from Apache Commons Math, (c) 2001-2020 The Apache Software Foundation
+- Path: kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
+    - License: Apache 2 ([cm](third_party/cm_license.txt))
+    - Origin: Derived from Apache Commons Math, (c) 2001-2020 The Apache Software Foundation
+- Path: kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LoessInterpolator.kt
+    - License: Apache 2 ([cm](third_party/cm_license.txt))
+    - Origin: Derived from Apache Commons Math, (c) 2001-2020 The Apache Software Foundation
+- Path: kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
+    - License: Apache 2 ([cm](third_party/cm_license.txt))
+    - Origin: Derived from Apache Commons Math, (c) 2001-2020 The Apache Software Foundation
+- Path: kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
+    - License: Apache 2 ([numky](third_party/numky_license.txt))
+    - Origin: Initial implementation was taken from Numky
+- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
+    - License: Apache 2 ([cm](third_party/crng_license.txt))
+    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
+- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
+    - License: Apache 2 ([cm](third_party/crng_license.txt))
+    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
+- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
+    - License: Apache 2 ([cm](third_party/crng_license.txt))
+    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
+- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
+    - License: Apache 2 ([cm](third_party/crng_license.txt))
+    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
+- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
+    - License: Apache 2 ([cm](third_party/crng_license.txt))
+    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
+- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
+    - License: Apache 2 ([cm](third_party/crng_license.txt))
+    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
+- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
+    - License: Apache 2 ([cm](third_party/crng_license.txt))
+    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
+- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
+    - License: Apache 2 ([cm](third_party/crng_license.txt))
+    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
+- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
+    - License: Apache 2 ([cm](third_party/crng_license.txt))
+    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
+- Path: kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
+    - License: Apache 2 ([cm](third_party/crng_license.txt))
+    - Origin: Derived from Apache Commons RNG, (c) 2001-2020 The Apache Software Foundation
diff --git a/license/third_party/cm_license.txt b/license/third_party/cm_license.txt
new file mode 100644
index 000000000..6172c3fb2
--- /dev/null
+++ b/license/third_party/cm_license.txt
@@ -0,0 +1,457 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+Apache Commons Math includes the following code provided to the ASF under the
+Apache License 2.0:
+
+ - The inverse error function implementation in the Erf class is based on CUDA
+   code developed by Mike Giles, Oxford-Man Institute of Quantitative Finance,
+   and published in GPU Computing Gems, volume 2, 2010 (grant received on
+   March 23th 2013)
+ - The LinearConstraint, LinearObjectiveFunction, LinearOptimizer,
+   RelationShip, SimplexSolver and SimplexTableau classes in package
+   org.apache.commons.math3.optimization.linear include software developed by
+   Benjamin McCann (http://www.benmccann.com) and distributed with
+   the following copyright: Copyright 2009 Google Inc. (grant received on
+   March 16th 2009)
+ - The class "org.apache.commons.math3.exception.util.LocalizedFormatsTest" which
+   is an adapted version of "OrekitMessagesTest" test class for the Orekit library
+ - The "org.apache.commons.math3.analysis.interpolation.HermiteInterpolator"
+   has been imported from the Orekit space flight dynamics library.
+
+===============================================================================
+
+
+
+APACHE COMMONS MATH DERIVATIVE WORKS:
+
+The Apache commons-math library includes a number of subcomponents
+whose implementation is derived from original sources written
+in C or Fortran.  License terms of the original sources
+are reproduced below.
+
+===============================================================================
+For the lmder, lmpar and qrsolv Fortran routine from minpack and translated in
+the LevenbergMarquardtOptimizer class in package
+org.apache.commons.math3.optimization.general
+Original source copyright and license statement:
+
+Minpack Copyright Notice (1999) University of Chicago.  All rights reserved
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the
+following conditions are met:
+
+1. Redistributions of source code must retain the above
+copyright notice, this list of conditions and the following
+disclaimer.
+
+2. Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following
+disclaimer in the documentation and/or other materials
+provided with the distribution.
+
+3. The end-user documentation included with the
+redistribution, if any, must include the following
+acknowledgment:
+
+   "This product includes software developed by the
+   University of Chicago, as Operator of Argonne National
+   Laboratory.
+
+Alternately, this acknowledgment may appear in the software
+itself, if and wherever such third-party acknowledgments
+normally appear.
+
+4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS"
+WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE
+UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND
+THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
+OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
+OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
+USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
+THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
+DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION
+UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL
+BE CORRECTED.
+
+5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT
+HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF
+ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT,
+INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
+ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
+PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
+SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
+(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
+EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE
+POSSIBILITY OF SUCH LOSS OR DAMAGES.
+===============================================================================
+
+Copyright and license statement for the odex Fortran routine developed by
+E. Hairer and G. Wanner and translated in GraggBulirschStoerIntegrator class
+in package org.apache.commons.math3.ode.nonstiff:
+
+
+Copyright (c) 2004, Ernst Hairer
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+===============================================================================
+
+Copyright and license statement for the original Mersenne twister C
+routines translated in MersenneTwister class in package
+org.apache.commons.math3.random:
+
+   Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+     1. Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+     3. The names of its contributors may not be used to endorse or promote
+        products derived from this software without specific prior written
+        permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+===============================================================================
+
+The initial code for shuffling an array (originally in class
+"org.apache.commons.math3.random.RandomDataGenerator", now replaced by
+a method in class "org.apache.commons.math3.util.MathArrays") was
+inspired from the algorithm description provided in
+"Algorithms", by Ian Craw and John Pulham (University of Aberdeen 1999).
+The textbook (containing a proof that the shuffle is uniformly random) is
+available here:
+  http://citeseerx.ist.psu.edu/viewdoc/download;?doi=10.1.1.173.1898&rep=rep1&type=pdf
+
+===============================================================================
+License statement for the direction numbers in the resource files for Sobol sequences.
+
+-----------------------------------------------------------------------------
+Licence pertaining to sobol.cc and the accompanying sets of direction numbers
+
+-----------------------------------------------------------------------------
+Copyright (c) 2008, Frances Y. Kuo and Stephen Joe
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of the copyright holders nor the names of the
+      University of New South Wales and the University of Waikato
+      and its contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+===============================================================================
+
+The initial commit of package "org.apache.commons.math3.ml.neuralnet" is
+an adapted version of code developed in the context of the Data Processing
+and Analysis Consortium (DPAC) of the "Gaia" project of the European Space
+Agency (ESA).
+===============================================================================
+
+The initial commit of the class "org.apache.commons.math3.special.BesselJ" is
+an adapted version of code translated from the netlib Fortran program, rjbesl
+http://www.netlib.org/specfun/rjbesl by R.J. Cody at Argonne National
+Laboratory (USA).  There is no license or copyright statement included with the
+original Fortran sources.
+===============================================================================
+
+
+The BracketFinder (package org.apache.commons.math3.optimization.univariate)
+and PowellOptimizer (package org.apache.commons.math3.optimization.general)
+classes are based on the Python code in module "optimize.py" (version 0.5)
+developed by Travis E. Oliphant for the SciPy library (http://www.scipy.org/)
+Copyright © 2003-2009 SciPy Developers.
+
+SciPy license
+Copyright © 2001, 2002 Enthought, Inc.
+All rights reserved.
+
+Copyright © 2003-2013 SciPy Developers.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of Enthought nor the names of the SciPy Developers may
+      be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+===============================================================================
diff --git a/license/third_party/crng_license.txt b/license/third_party/crng_license.txt
new file mode 100644
index 000000000..dec0e2a5c
--- /dev/null
+++ b/license/third_party/crng_license.txt
@@ -0,0 +1,275 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+================================================================================
+
+Class "org.apache.commons.rng.core.source64.MersenneTwister64" contains
+Java code partly ported from the reference implementation in C.
+That source file contained the following notice:
+
+   Copyright (C) 2004, Makoto Matsumoto and Takuji Nishimura,
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+     1. Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+     3. The names of its contributors may not be used to endorse or promote
+        products derived from this software without specific prior written
+        permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+================================================================================
+
+Class "org.apache.commons.rng.core.source32.MersenneTwister" contains
+Java code partly ported from the reference implementation in C.
+That source file contained the following notice:
+
+   Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+     1. Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+     3. The names of its contributors may not be used to endorse or promote
+        products derived from this software without specific prior written
+        permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+================================================================================
\ No newline at end of file
diff --git a/license/third_party/numky_license.txt b/license/third_party/numky_license.txt
new file mode 100644
index 000000000..f49a4e16e
--- /dev/null
+++ b/license/third_party/numky_license.txt
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
-- 
2.34.1


From e38b2e1c536b2d1f19cb6ae803b257d01368c196 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 17 Nov 2021 19:03:20 +0700
Subject: [PATCH 386/713] Only dump ASM classes during tests if according
 property is passed to Gradle

---
 kmath-ast/build.gradle.kts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index 586652349..331d8c614 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -55,9 +55,10 @@ tasks.dokkaHtml {
     dependsOn(tasks.build)
 }
 
-tasks.jvmTest {
-    jvmArgs = (jvmArgs ?: emptyList()) + listOf("-Dspace.kscience.kmath.ast.dump.generated.classes=1")
-}
+if (System.getProperty("space.kscience.kmath.ast.dump.generated.classes") == "1")
+    tasks.jvmTest {
+        jvmArgs = (jvmArgs ?: emptyList()) + listOf("-Dspace.kscience.kmath.ast.dump.generated.classes=1")
+    }
 
 readme {
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
-- 
2.34.1


From 0f7a25762e98b48f7b7331c1714342cffc32b798 Mon Sep 17 00:00:00 2001
From: Alexis Manin <alexis.manin@gmail.com>
Date: Sat, 13 Nov 2021 09:03:05 +0100
Subject: [PATCH 387/713] feat(Core): add a permutation sorting prototype for
 buffers

This is a Buffer extension function to create a list of permuted indices that represent the sequence of naturally sorted buffer elements
---
 .../space/kscience/kmath/misc/sorting.kt      | 40 +++++++++++
 .../space/kscience/kmath/misc/PermSortTest.kt | 72 +++++++++++++++++++
 2 files changed, 112 insertions(+)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
 create mode 100644 kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
new file mode 100644
index 000000000..a72ef19cc
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.misc
+
+import kotlin.comparisons.*
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.indices
+
+/**
+ * Return a new list filled with buffer indices. Indice order is defined by sorting associated buffer value.
+ * This feature allows to sort buffer values without reordering its content.
+ * 
+ * @param descending True to revert sort order from highest to lowest values. Default to ascending order.
+ * @return List of buffer indices, sorted by associated value.
+ */
+@PerformancePitfall
+@UnstableKMathAPI
+public fun <V: Comparable<V>> Buffer<V>.permSort(descending : Boolean = false) : IntArray {
+    if (size < 2) return IntArray(size)
+
+    val comparator = if (descending) compareByDescending<Int> { get(it) } else compareBy<Int> { get(it) }
+
+    /* TODO: optimisation : keep a constant big array of indices (Ex: from 0 to 4096), then create indice
+     * arrays more efficiently by copying subpart of cached one. For bigger needs, we could copy entire
+     * cached array, then fill remaining indices manually. Not done for now, because:
+     *  1. doing it right would require some statistics about common used buffer sizes.
+     *  2. Some benchmark would be needed to ensure it would really provide better performance
+     */
+    val packedIndices = IntArray(size) { idx -> idx }
+    
+    /* TODO: find an efficient way to sort in-place instead, and return directly the IntArray. 
+     * Not done for now, because no standard utility is provided yet. An open issue exists for this.
+     * See: https://youtrack.jetbrains.com/issue/KT-37860 
+     */
+    return packedIndices.sortedWith(comparator).toIntArray()
+}
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
new file mode 100644
index 000000000..cb47f2d4b
--- /dev/null
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.misc
+
+import kotlin.collections.mutableListOf
+import kotlin.random.Random
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+import kotlin.test.fail
+
+import space.kscience.kmath.structures.IntBuffer
+
+class PermSortTest {
+
+    /**
+     * Permutation on empty buffer should immediately return an empty array.
+     */
+    @Test
+    fun testOnEmptyBuffer() {
+        val emptyBuffer = IntBuffer(0) {it}
+        var permutations = emptyBuffer.permSort()
+        assertTrue(permutations.isEmpty(), "permutation on an empty buffer should return an empty result")
+        permutations = emptyBuffer.permSort(true)
+        assertTrue(permutations.isEmpty(), "permutation on an empty buffer should return an empty result")
+    }
+
+    @Test
+    fun testOnSingleValueBuffer() {
+        testPermutation(1)
+    }
+
+    @Test
+    public fun testOnSomeValues() {
+        testPermutation(10)
+    }
+
+    private fun testPermutation(bufferSize: Int) {   
+
+        val seed = Random.nextLong()
+        println("Test randomization seed: $seed")
+
+        val buffer = Random(seed).buffer(bufferSize)
+        val indices = buffer.permSort()
+
+        assertEquals(bufferSize, indices.size)
+        // Ensure no doublon is present in indices
+        assertEquals(indices.toSet().size, indices.size)
+
+        for (i in 0 until (bufferSize-1)) {
+            val current = buffer[indices[i]]
+            val next = buffer[indices[i+1]]
+            assertTrue(current <= next, "Permutation indices not properly sorted")
+        }
+
+        val descIndices = buffer.permSort(true)
+        assertEquals(bufferSize, descIndices.size) 
+        // Ensure no doublon is present in indices
+        assertEquals(descIndices.toSet().size, descIndices.size)
+
+        for (i in 0 until (bufferSize-1)) {
+            val current = buffer[descIndices[i]]
+            val next = buffer[descIndices[i+1]]
+            assertTrue(current >= next, "Permutation indices not properly sorted in descending order")
+        }
+    }
+
+    private fun Random.buffer(size : Int) = IntBuffer(size) { nextInt() }
+}
-- 
2.34.1


From 06a6a99ef0577ab13400de290f5fbfa9978f2717 Mon Sep 17 00:00:00 2001
From: Alexis Manin <alexis.manin@geomatys.com>
Date: Thu, 18 Nov 2021 17:44:53 +0100
Subject: [PATCH 388/713] feat(Core): add new flavors of permSort: allow user
 to specify a comparator (sort with) or a custom field to use in buffer values
 (sort by).

---
 .../space/kscience/kmath/misc/sorting.kt      | 35 +++++++++++-----
 .../space/kscience/kmath/misc/PermSortTest.kt | 41 ++++++++++++++++---
 2 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
index a72ef19cc..a144e49b4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
@@ -6,23 +6,38 @@
 package space.kscience.kmath.misc
 
 import kotlin.comparisons.*
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.indices
 
 /**
  * Return a new list filled with buffer indices. Indice order is defined by sorting associated buffer value.
  * This feature allows to sort buffer values without reordering its content.
- * 
- * @param descending True to revert sort order from highest to lowest values. Default to ascending order.
+ *
  * @return List of buffer indices, sorted by associated value.
  */
 @PerformancePitfall
 @UnstableKMathAPI
-public fun <V: Comparable<V>> Buffer<V>.permSort(descending : Boolean = false) : IntArray {
-    if (size < 2) return IntArray(size)
+public fun <V: Comparable<V>> Buffer<V>.permSort() : IntArray = _permSortWith(compareBy<Int> { get(it) })
 
-    val comparator = if (descending) compareByDescending<Int> { get(it) } else compareBy<Int> { get(it) }
+@PerformancePitfall
+@UnstableKMathAPI
+public fun <V: Comparable<V>> Buffer<V>.permSortDescending() : IntArray = _permSortWith(compareByDescending<Int> { get(it) })
+
+@PerformancePitfall
+@UnstableKMathAPI
+public fun <V, C: Comparable<C>> Buffer<V>.permSortBy(selector: (V) -> C) : IntArray = _permSortWith(compareBy<Int> { selector(get(it)) })
+
+@PerformancePitfall
+@UnstableKMathAPI
+public fun <V, C: Comparable<C>> Buffer<V>.permSortByDescending(selector: (V) -> C) : IntArray = _permSortWith(compareByDescending<Int> { selector(get(it)) })
+
+@PerformancePitfall
+@UnstableKMathAPI
+public fun <V> Buffer<V>.permSortWith(comparator : Comparator<V>) : IntArray = _permSortWith { i1, i2 -> comparator.compare(get(i1), get(i2)) }
+
+@PerformancePitfall
+@UnstableKMathAPI
+private fun <V> Buffer<V>._permSortWith(comparator : Comparator<Int>) : IntArray {
+    if (size < 2) return IntArray(size)
 
     /* TODO: optimisation : keep a constant big array of indices (Ex: from 0 to 4096), then create indice
      * arrays more efficiently by copying subpart of cached one. For bigger needs, we could copy entire
@@ -31,10 +46,10 @@ public fun <V: Comparable<V>> Buffer<V>.permSort(descending : Boolean = false) :
      *  2. Some benchmark would be needed to ensure it would really provide better performance
      */
     val packedIndices = IntArray(size) { idx -> idx }
-    
-    /* TODO: find an efficient way to sort in-place instead, and return directly the IntArray. 
+
+    /* TODO: find an efficient way to sort in-place instead, and return directly the IntArray.
      * Not done for now, because no standard utility is provided yet. An open issue exists for this.
-     * See: https://youtrack.jetbrains.com/issue/KT-37860 
+     * See: https://youtrack.jetbrains.com/issue/KT-37860
      */
     return packedIndices.sortedWith(comparator).toIntArray()
 }
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
index cb47f2d4b..0a2bb9138 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
@@ -5,17 +5,24 @@
 
 package space.kscience.kmath.misc
 
-import kotlin.collections.mutableListOf
+import space.kscience.kmath.misc.PermSortTest.Platform.*
 import kotlin.random.Random
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
-import kotlin.test.fail
 
 import space.kscience.kmath.structures.IntBuffer
+import space.kscience.kmath.structures.asBuffer
+import kotlin.test.assertContentEquals
 
 class PermSortTest {
 
+    private enum class Platform {
+        ANDROID, JVM, JS, NATIVE, WASM
+    }
+
+    private val platforms = Platform.values().asBuffer()
+
     /**
      * Permutation on empty buffer should immediately return an empty array.
      */
@@ -24,7 +31,7 @@ class PermSortTest {
         val emptyBuffer = IntBuffer(0) {it}
         var permutations = emptyBuffer.permSort()
         assertTrue(permutations.isEmpty(), "permutation on an empty buffer should return an empty result")
-        permutations = emptyBuffer.permSort(true)
+        permutations = emptyBuffer.permSortDescending()
         assertTrue(permutations.isEmpty(), "permutation on an empty buffer should return an empty result")
     }
 
@@ -34,10 +41,34 @@ class PermSortTest {
     }
 
     @Test
-    public fun testOnSomeValues() {
+    fun testOnSomeValues() {
         testPermutation(10)
     }
 
+    @Test
+    fun testPermSortBy() {
+        val permutations = platforms.permSortBy { it.name }
+        val expected = listOf(ANDROID, JS, JVM, NATIVE, WASM)
+        assertContentEquals(expected, permutations.map { platforms[it] }, "Ascending PermSort by name")
+    }
+
+    @Test
+    fun testPermSortByDescending() {
+        val permutations = platforms.permSortByDescending { it.name }
+        val expected = listOf(WASM, NATIVE, JVM, JS, ANDROID)
+        assertContentEquals(expected, permutations.map { platforms[it] }, "Descending PermSort by name")
+    }
+
+    @Test
+    fun testPermSortWith() {
+        var permutations = platforms.permSortWith { p1, p2 -> p1.name.length.compareTo(p2.name.length) }
+        val expected = listOf(JS, JVM, WASM, NATIVE, ANDROID)
+        assertContentEquals(expected, permutations.map { platforms[it] }, "PermSort using custom ascending comparator")
+
+        permutations = platforms.permSortWith(compareByDescending { it.name.length })
+        assertContentEquals(expected.reversed(), permutations.map { platforms[it] }, "PermSort using custom descending comparator")
+    }
+
     private fun testPermutation(bufferSize: Int) {   
 
         val seed = Random.nextLong()
@@ -56,7 +87,7 @@ class PermSortTest {
             assertTrue(current <= next, "Permutation indices not properly sorted")
         }
 
-        val descIndices = buffer.permSort(true)
+        val descIndices = buffer.permSortDescending()
         assertEquals(bufferSize, descIndices.size) 
         // Ensure no doublon is present in indices
         assertEquals(descIndices.toSet().size, descIndices.size)
-- 
2.34.1


From 24799a691f23805fba77342d31b9ced16617fc84 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 23 Nov 2021 10:32:51 +0300
Subject: [PATCH 389/713] Add inc/dec to counters

---
 .../space/kscience/kmath/histogram/Counter.kt | 26 ++++++++++++++++---
 .../kmath/histogram/DoubleHistogramSpace.kt   |  2 +-
 .../kmath/histogram/IndexedHistogramSpace.kt  |  1 -
 .../kmath/histogram/TreeHistogramSpace.kt     |  2 +-
 .../kmath/tensorflow/TensorFlowAlgebra.kt     |  4 ++-
 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
index 4f5a1ceba..5755e05f7 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.histogram
 import kotlinx.atomicfu.atomic
 import kotlinx.atomicfu.getAndUpdate
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.Group
 
 /**
  * Common representation for atomic counters
@@ -18,7 +18,7 @@ public interface Counter<T : Any> {
     public val value: T
 
     public companion object {
-        public fun real(): ObjectCounter<Double> = ObjectCounter(DoubleField)
+        public fun double(): ObjectCounter<Double> = ObjectCounter(DoubleField)
     }
 }
 
@@ -32,6 +32,16 @@ public class IntCounter : Counter<Int> {
     override val value: Int get() = innerValue.value
 }
 
+public operator fun IntCounter.inc(): IntCounter {
+    add(1)
+    return this
+}
+
+public operator fun IntCounter.dec(): IntCounter {
+    add(-1)
+    return this
+}
+
 public class LongCounter : Counter<Long> {
     private val innerValue = atomic(0L)
 
@@ -42,7 +52,17 @@ public class LongCounter : Counter<Long> {
     override val value: Long get() = innerValue.value
 }
 
-public class ObjectCounter<T : Any>(public val group: Ring<T>) : Counter<T> {
+public operator fun LongCounter.inc(): LongCounter {
+    add(1L)
+    return this
+}
+
+public operator fun LongCounter.dec(): LongCounter {
+    add(-1L)
+    return this
+}
+
+public class ObjectCounter<T : Any>(private val group: Group<T>) : Counter<T> {
     private val innerValue = atomic(group.zero)
 
     override fun add(delta: T) {
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
index c452edc9c..39121f301 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
@@ -74,7 +74,7 @@ public class DoubleHistogramSpace(
     }
 
     override fun produce(builder: HistogramBuilder<Double>.() -> Unit): IndexedHistogram<Double, Double> {
-        val ndCounter = StructureND.auto(shape) { Counter.real() }
+        val ndCounter = StructureND.auto(shape) { Counter.double() }
         val hBuilder = HistogramBuilder<Double> { point, value ->
             val index = getIndex(point)
             ndCounter[index].add(value.toDouble())
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
index f36f45389..cbf0bea1a 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
@@ -41,7 +41,6 @@ public class IndexedHistogram<T : Comparable<T>, V : Any>(
         get() = DefaultStrides(context.shape).asSequence().map {
             context.produceBin(it, values[it])
         }.asIterable()
-
 }
 
 /**
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
index cc54d7e1a..4103fa653 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
@@ -39,7 +39,7 @@ public class TreeHistogram(
 @PublishedApi
 internal class TreeHistogramBuilder(val binFactory: (Double) -> UnivariateDomain) : UnivariateHistogramBuilder {
 
-    internal class BinCounter(val domain: UnivariateDomain, val counter: Counter<Double> = Counter.real()) :
+    internal class BinCounter(val domain: UnivariateDomain, val counter: Counter<Double> = Counter.double()) :
         ClosedFloatingPointRange<Double> by domain.range
 
     private val bins: TreeMap<Double, BinCounter> = TreeMap()
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index 1f545d121..7ad91c267 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -232,4 +232,6 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A : Ring<T>> internal con
     @OptIn(UnstableKMathAPI::class)
     override fun export(arg: StructureND<T>): StructureND<T> =
         if (arg is TensorFlowOutput<T, *>) arg.actualTensor else arg
-}
\ No newline at end of file
+}
+
+//TODO add TensorFlow expressions
\ No newline at end of file
-- 
2.34.1


From d2e311048078c7d2f6279277f2c9f2a31c7bb0a7 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 24 Nov 2021 03:48:43 +0700
Subject: [PATCH 390/713] Update gradle-tools, do Kotlin 1.6.0 migrations

---
 benchmarks/build.gradle.kts                   |  8 +++----
 build.gradle.kts                              |  8 +++----
 buildSrc/build.gradle.kts                     |  6 +++---
 examples/build.gradle.kts                     |  8 +++----
 kmath-ast/build.gradle.kts                    |  2 +-
 .../random/CMRandomGeneratorWrapper.kt        |  3 ---
 kmath-core/build.gradle.kts                   | 21 +++++++------------
 .../space/kscience/kmath/misc/annotations.kt  |  6 +++---
 .../kmath/operations/BufferAlgebra.kt         |  5 -----
 .../kmath/operations/DoubleBufferField.kt     |  1 -
 .../kmath/operations/DoubleBufferOps.kt       |  2 --
 kmath-coroutines/build.gradle.kts             |  6 +++---
 kmath-jafama/build.gradle.kts                 |  2 +-
 kmath-jupyter/build.gradle.kts                |  4 ++--
 kmath-optimization/build.gradle.kts           |  4 ++++
 kmath-tensors/build.gradle.kts                |  6 +++++-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  1 -
 settings.gradle.kts                           |  9 +-------
 18 files changed, 42 insertions(+), 60 deletions(-)

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 130cc84a3..ea9934a52 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -48,7 +48,7 @@ kotlin {
                 implementation(project(":kmath-nd4j"))
                 implementation(project(":kmath-kotlingrad"))
                 implementation(project(":kmath-viktor"))
-                implementation(projects.kmathMultik)
+                implementation(project(":kmath-multik"))
                 implementation("org.nd4j:nd4j-native:1.0.0-M1")
                 //    uncomment if your system supports AVX2
                 //    val os = System.getProperty("os.name")
@@ -134,9 +134,9 @@ afterEvaluate {
 
 kotlin.sourceSets.all {
     with(languageSettings) {
-        useExperimentalAnnotation("kotlin.contracts.ExperimentalContracts")
-        useExperimentalAnnotation("kotlin.ExperimentalUnsignedTypes")
-        useExperimentalAnnotation("space.kscience.kmath.misc.UnstableKMathAPI")
+        optIn("kotlin.contracts.ExperimentalContracts")
+        optIn("kotlin.ExperimentalUnsignedTypes")
+        optIn("space.kscience.kmath.misc.UnstableKMathAPI")
     }
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index c2347f7be..919356c0f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -39,7 +39,7 @@ subprojects {
                     localDirectory.set(kotlinDir)
 
                     remoteUrl.set(
-                        URL("https://github.com/mipt-npm/${rootProject.name}/tree/master/${this@subprojects.name}/$kotlinDirPath")
+                        URL("https://github.com/mipt-npm/kmath/tree/master/${this@subprojects.name}/$kotlinDirPath")
                     )
                 }
 
@@ -64,9 +64,9 @@ subprojects {
 readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md")
 
 ksciencePublish {
-    vcs("https://github.com/mipt-npm/kmath")
-    space(publish = true)
-    sonatype(publish = true)
+    github("kmath", publish = false)
+    space()
+    sonatype()
 }
 
 apiValidation.nonPublicMarkers.add("space.kscience.kmath.misc.UnstableKMathAPI")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 36a1ffd9e..072309332 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     `kotlin-dsl`
-    kotlin("plugin.serialization") version "1.4.31"
+    kotlin("plugin.serialization") version "1.5.21"
 }
 
 repositories {
@@ -10,8 +10,8 @@ repositories {
 }
 
 dependencies {
-    api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
-    api("ru.mipt.npm:gradle-tools:0.10.2")
+    api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2")
+    api("ru.mipt.npm:gradle-tools:0.10.7")
     api("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.3.1")
 }
 
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 05e562143..990b564e1 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
     //jafama
     implementation(project(":kmath-jafama"))
     //multik
-    implementation(projects.kmathMultik)
+    implementation(project(":kmath-multik"))
 
 
     implementation("org.nd4j:nd4j-native:1.0.0-beta7")
@@ -57,9 +57,9 @@ dependencies {
 
 kotlin.sourceSets.all {
     with(languageSettings) {
-        useExperimentalAnnotation("kotlin.contracts.ExperimentalContracts")
-        useExperimentalAnnotation("kotlin.ExperimentalUnsignedTypes")
-        useExperimentalAnnotation("space.kscience.kmath.misc.UnstableKMathAPI")
+        optIn("kotlin.contracts.ExperimentalContracts")
+        optIn("kotlin.ExperimentalUnsignedTypes")
+        optIn("space.kscience.kmath.misc.UnstableKMathAPI")
     }
 }
 
diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index 331d8c614..15b1d0900 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -20,7 +20,7 @@ kotlin.js {
 kotlin.sourceSets {
     filter { it.name.contains("test", true) }
         .map(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::languageSettings)
-        .forEach { it.useExperimentalAnnotation("space.kscience.kmath.misc.UnstableKMathAPI") }
+        .forEach { it.optIn("space.kscience.kmath.misc.UnstableKMathAPI") }
 
     commonMain {
         dependencies {
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
index 6aeebb68c..194be6002 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
@@ -38,10 +38,7 @@ public class CMRandomGeneratorWrapper(
 
     override fun nextInt(): Int = generator.nextInt()
     override fun nextInt(n: Int): Int = generator.nextInt(n)
-
-    @PerformancePitfall
     override fun nextGaussian(): Double = runBlocking { GaussianSampler(0.0, 1.0).next(generator) }
-
     override fun nextDouble(): Double = generator.nextDouble()
     override fun nextLong(): Long = generator.nextLong()
 }
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index 143e576f7..490868a0b 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -5,21 +5,14 @@ plugins {
 //    id("com.xcporter.metaview") version "0.0.5"
 }
 
-kotlin {
-    jvm {
-        compilations.all {
-            kotlinOptions {
-                freeCompilerArgs =
-                    freeCompilerArgs + "-Xjvm-default=all" + "-Xopt-in=kotlin.RequiresOptIn" + "-Xlambdas=indy"
-            }
-        }
-    }
+kotlin.sourceSets {
+    filter { it.name.contains("test", true) }
+        .map(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::languageSettings)
+        .forEach { it.optIn("space.kscience.kmath.misc.PerformancePitfall") }
 
-    sourceSets {
-        commonMain {
-            dependencies {
-                api(project(":kmath-memory"))
-            }
+    commonMain {
+        dependencies {
+            api(project(":kmath-memory"))
         }
     }
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
index 73ecd6492..7c612b6a9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
@@ -12,7 +12,7 @@ package space.kscience.kmath.misc
  * in some way that may break some code.
  */
 @MustBeDocumented
-@Retention(value = AnnotationRetention.SOURCE)
+@Retention(value = AnnotationRetention.BINARY)
 @RequiresOptIn("This API is unstable and could change in future", RequiresOptIn.Level.WARNING)
 public annotation class UnstableKMathAPI
 
@@ -21,10 +21,10 @@ public annotation class UnstableKMathAPI
  * slow-down in some cases. Refer to the documentation and benchmark it to be sure.
  */
 @MustBeDocumented
-@Retention(value = AnnotationRetention.SOURCE)
+@Retention(value = AnnotationRetention.BINARY)
 @RequiresOptIn(
     "Refer to the documentation to use this API in performance-critical code",
-    RequiresOptIn.Level.WARNING
+    RequiresOptIn.Level.WARNING,
 )
 public annotation class PerformancePitfall(
     val message: String = "Potential performance problem"
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
index 634a115c7..653552044 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
@@ -35,13 +35,11 @@ public interface BufferAlgebra<T, out A : Algebra<T>> : Algebra<Buffer<T>> {
     public fun Buffer<T>.zip(other: Buffer<T>, block: A.(left: T, right: T) -> T): Buffer<T> =
         zipInline(this, other, block)
 
-    @UnstableKMathAPI
     override fun unaryOperationFunction(operation: String): (arg: Buffer<T>) -> Buffer<T> {
         val operationFunction = elementAlgebra.unaryOperationFunction(operation)
         return { arg -> bufferFactory(arg.size) { operationFunction(arg[it]) } }
     }
 
-    @UnstableKMathAPI
     override fun binaryOperationFunction(operation: String): (left: Buffer<T>, right: Buffer<T>) -> Buffer<T> {
         val operationFunction = elementAlgebra.binaryOperationFunction(operation)
         return { left, right ->
@@ -141,11 +139,9 @@ public open class BufferRingOps<T, A: Ring<T>>(
     override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l * r }
     override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
 
-    @UnstableKMathAPI
     override fun unaryOperationFunction(operation: String): (arg: Buffer<T>) -> Buffer<T> =
         super<BufferAlgebra>.unaryOperationFunction(operation)
 
-    @UnstableKMathAPI
     override fun binaryOperationFunction(operation: String): (left: Buffer<T>, right: Buffer<T>) -> Buffer<T> =
         super<BufferAlgebra>.binaryOperationFunction(operation)
 }
@@ -165,7 +161,6 @@ public open class BufferFieldOps<T, A : Field<T>>(
     override fun scale(a: Buffer<T>, value: Double): Buffer<T> = a.map { scale(it, value) }
     override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
 
-    @UnstableKMathAPI
     override fun binaryOperationFunction(operation: String): (left: Buffer<T>, right: Buffer<T>) -> Buffer<T> =
         super<BufferRingOps>.binaryOperationFunction(operation)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
index 8ec3c3aea..f2f7326aa 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
@@ -40,7 +40,6 @@ public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Doub
         }
     }
 
-    @UnstableKMathAPI
     override fun unaryOperationFunction(operation: String): (arg: Buffer<Double>) -> Buffer<Double> =
         super<ExtendedField>.unaryOperationFunction(operation)
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index a5e1c42e2..0ee591acc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -26,11 +26,9 @@ public abstract class DoubleBufferOps : BufferAlgebra<Double, DoubleField>, Exte
     override fun Buffer<Double>.map(block: DoubleField.(Double) -> Double): DoubleBuffer =
         mapInline { DoubleField.block(it) }
 
-    @UnstableKMathAPI
     override fun unaryOperationFunction(operation: String): (arg: Buffer<Double>) -> Buffer<Double> =
         super<ExtendedFieldOps>.unaryOperationFunction(operation)
 
-    @UnstableKMathAPI
     override fun binaryOperationFunction(operation: String): (left: Buffer<Double>, right: Buffer<Double>) -> Buffer<Double> =
         super<ExtendedFieldOps>.binaryOperationFunction(operation)
 
diff --git a/kmath-coroutines/build.gradle.kts b/kmath-coroutines/build.gradle.kts
index 317691ae5..aa30c412b 100644
--- a/kmath-coroutines/build.gradle.kts
+++ b/kmath-coroutines/build.gradle.kts
@@ -7,9 +7,9 @@ plugins {
 kotlin.sourceSets {
     all {
         with(languageSettings) {
-            useExperimentalAnnotation("kotlinx.coroutines.InternalCoroutinesApi")
-            useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
-            useExperimentalAnnotation("kotlinx.coroutines.FlowPreview")
+            optIn("kotlinx.coroutines.InternalCoroutinesApi")
+            optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
+            optIn("kotlinx.coroutines.FlowPreview")
         }
     }
 
diff --git a/kmath-jafama/build.gradle.kts b/kmath-jafama/build.gradle.kts
index 9cf328d0b..925a2bc60 100644
--- a/kmath-jafama/build.gradle.kts
+++ b/kmath-jafama/build.gradle.kts
@@ -23,5 +23,5 @@ readme {
 }
 
 kotlin.sourceSets.all {
-    languageSettings.useExperimentalAnnotation("space.kscience.kmath.misc.UnstableKMathAPI")
+    languageSettings.optIn("space.kscience.kmath.misc.UnstableKMathAPI")
 }
diff --git a/kmath-jupyter/build.gradle.kts b/kmath-jupyter/build.gradle.kts
index 5bd08c485..ca1a5485f 100644
--- a/kmath-jupyter/build.gradle.kts
+++ b/kmath-jupyter/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     api(project(":kmath-for-real"))
 }
 
-kscience{
+kscience {
     useHtml()
 }
 
@@ -18,7 +18,7 @@ readme {
 }
 
 kotlin.sourceSets.all {
-    languageSettings.useExperimentalAnnotation("space.kscience.kmath.misc.UnstableKMathAPI")
+    languageSettings.optIn("space.kscience.kmath.misc.UnstableKMathAPI")
 }
 
 tasks.processJupyterApiResources {
diff --git a/kmath-optimization/build.gradle.kts b/kmath-optimization/build.gradle.kts
index 68b82ad65..b920b9267 100644
--- a/kmath-optimization/build.gradle.kts
+++ b/kmath-optimization/build.gradle.kts
@@ -8,6 +8,10 @@ kscience {
 }
 
 kotlin.sourceSets {
+    all {
+        languageSettings.optIn("space.kscience.kmath.misc.UnstableKMathAPI")
+    }
+
     commonMain {
         dependencies {
             api(project(":kmath-coroutines"))
diff --git a/kmath-tensors/build.gradle.kts b/kmath-tensors/build.gradle.kts
index d084878ea..66316d21d 100644
--- a/kmath-tensors/build.gradle.kts
+++ b/kmath-tensors/build.gradle.kts
@@ -6,9 +6,13 @@ plugins {
 
 kotlin.sourceSets {
     all {
-        languageSettings.useExperimentalAnnotation("space.kscience.kmath.misc.UnstableKMathAPI")
+        languageSettings.optIn("space.kscience.kmath.misc.UnstableKMathAPI")
     }
 
+    filter { it.name.contains("test", true) }
+        .map(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::languageSettings)
+        .forEach { it.optIn("space.kscience.kmath.misc.PerformancePitfall") }
+
     commonMain {
         dependencies {
             api(project(":kmath-core"))
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index ae1a053af..dc3ec43e9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -384,7 +384,6 @@ public open class DoubleTensorAlgebra :
     override fun Tensor<Double>.viewAs(other: StructureND<Double>): DoubleTensor =
         tensor.view(other.shape)
 
-    @PerformancePitfall
     override infix fun StructureND<Double>.dot(other: StructureND<Double>): DoubleTensor {
         if (tensor.shape.size == 1 && other.shape.size == 1) {
             return DoubleTensor(intArrayOf(1), doubleArrayOf(tensor.times(other).tensor.mutableBuffer.array().sum()))
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e73381bf2..343e937e1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,14 +5,10 @@ pluginManagement {
         gradlePluginPortal()
     }
 
-    val kotlinVersion = "1.6.0-RC"
-    val toolsVersion = "0.10.5"
+    val kotlinVersion = "1.6.0"
 
     plugins {
         id("org.jetbrains.kotlinx.benchmark") version "0.3.1"
-        id("ru.mipt.npm.gradle.project") version toolsVersion
-        id("ru.mipt.npm.gradle.jvm") version toolsVersion
-        id("ru.mipt.npm.gradle.mpp") version toolsVersion
         kotlin("multiplatform") version kotlinVersion
         kotlin("plugin.allopen") version kotlinVersion
     }
@@ -20,9 +16,6 @@ pluginManagement {
 
 rootProject.name = "kmath"
 
-enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
-enableFeaturePreview("VERSION_CATALOGS")
-
 include(
     ":kmath-memory",
     ":kmath-complex",
-- 
2.34.1


From 5ba7d74bd249a02e742ad2e0bbcde83bf4bc0858 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Thu, 25 Nov 2021 23:26:08 +0700
Subject: [PATCH 391/713] Completely specialized expression types for Int,
 Long, Double and compilation of MST to it

---
 .../ExpressionsInterpretersBenchmark.kt       |  20 +-
 .../space/kscience/kmath/ast/expressions.kt   |   6 +-
 .../kmath/ast/TestCompilerVariables.kt        |  16 +-
 .../lib.dom.WebAssembly.module_dukat.kt       |   4 +-
 .../kmath/wasm/internal/WasmBuilder.kt        | 190 +++----
 .../kotlin/space/kscience/kmath/wasm/wasm.kt  |  11 +-
 .../kotlin/space/kscience/kmath/asm/asm.kt    |  28 +-
 .../kscience/kmath/asm/internal/AsmBuilder.kt |  13 +-
 .../asm/internal/ByteArrayClassLoader.kt      |   6 -
 .../kmath/asm/internal/GenericAsmBuilder.kt   |  14 +-
 .../kmath/asm/internal/PrimitiveAsmBuilder.kt | 464 +++++++++++-------
 kmath-core/build.gradle.kts                   |   5 +-
 .../kscience/kmath/expressions/Expression.kt  | 132 +++++
 kmath-kotlingrad/build.gradle.kts             |   5 +
 .../kscience/kmath/internal/InternalGamma.kt  |   2 +-
 15 files changed, 615 insertions(+), 301 deletions(-)
 delete mode 100644 kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/ByteArrayClassLoader.kt

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
index f3a52ab5f..db3524e67 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
@@ -38,6 +38,22 @@ internal class ExpressionsInterpretersBenchmark {
     @Benchmark
     fun asmGenericExpression(blackhole: Blackhole) = invokeAndSum(asmGeneric, blackhole)
 
+    /**
+     * Benchmark case for [Expression] created with [compileToExpression].
+     */
+    @Benchmark
+    fun asmPrimitiveExpressionArray(blackhole: Blackhole) {
+        val random = Random(0)
+        var sum = 0.0
+        val m = DoubleArray(1)
+
+        repeat(times) {
+            m[xIdx] = random.nextDouble()
+            sum += asmPrimitive(m)
+        }
+
+        blackhole.consume(sum)
+    }
 
     /**
      * Benchmark case for [Expression] created with [compileToExpression].
@@ -82,7 +98,6 @@ internal class ExpressionsInterpretersBenchmark {
 
     private companion object {
         private val x by symbol
-        private val algebra = DoubleField
         private const val times = 1_000_000
 
         private val functional = DoubleField.expression {
@@ -95,7 +110,10 @@ internal class ExpressionsInterpretersBenchmark {
         }
 
         private val mst = node.toExpression(DoubleField)
+
         private val asmPrimitive = node.compileToExpression(DoubleField)
+        private val xIdx = asmPrimitive.indexer.indexOf(x)
+
         private val asmGeneric = node.compileToExpression(DoubleField as Algebra<Double>)
 
         private val raw = Expression<Double> { args ->
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
index ffafdc99d..907f1bbe4 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
@@ -7,7 +7,6 @@ package space.kscience.kmath.ast
 
 import space.kscience.kmath.asm.compileToExpression
 import space.kscience.kmath.expressions.MstExtendedField
-import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
@@ -17,10 +16,11 @@ fun main() {
         x * 2.0 + number(2.0) / x - number(16.0) + asinh(x) / sin(x)
     }.compileToExpression(DoubleField)
 
-    val m = HashMap<Symbol, Double>()
+    val m = DoubleArray(expr.indexer.symbols.size)
+    val xIdx = expr.indexer.indexOf(x)
 
     repeat(10000000) {
-        m[x] = 1.0
+        m[xIdx] = 1.0
         expr(m)
     }
 }
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
index af1a2e338..859e56032 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
@@ -7,7 +7,9 @@ package space.kscience.kmath.ast
 
 import space.kscience.kmath.expressions.MstRing
 import space.kscience.kmath.expressions.Symbol.Companion.x
+import space.kscience.kmath.expressions.Symbol.Companion.y
 import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
@@ -16,11 +18,23 @@ import kotlin.test.assertFailsWith
 
 internal class TestCompilerVariables {
     @Test
-    fun testVariable() = runCompilerTest {
+    fun testNoVariables() = runCompilerTest {
+        val expr = "0".parseMath().compileToExpression(IntRing)
+        assertEquals(0, expr())
+    }
+
+    @Test
+    fun testOneVariable() = runCompilerTest {
         val expr = MstRing { x }.compileToExpression(IntRing)
         assertEquals(1, expr(x to 1))
     }
 
+    @Test
+    fun testTwoVariables() = runCompilerTest {
+        val expr = "y+x/y+x".parseMath().compileToExpression(DoubleField)
+        assertEquals(8.0, expr(x to 4.0, y to 2.0))
+    }
+
     @Test
     fun testUndefinedVariableFails() = runCompilerTest {
         val expr = MstRing { x }.compileToExpression(IntRing)
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
index 3754c3eff..90690abed 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
@@ -201,8 +201,8 @@ internal open external class Module {
 }
 
 @JsName("Instance")
-internal open external class Instance(module: Module, importObject: Any = definedExternally) {
-    open var exports: Any
+internal open external class Instance(module: Module, importObject: dynamic = definedExternally) {
+    open var exports: dynamic
 }
 
 @JsName("Memory")
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index 622e6e6ec..2d6619bba 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -5,12 +5,11 @@
 
 package space.kscience.kmath.wasm.internal
 
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.expressions.*
 import space.kscience.kmath.expressions.MST.*
-import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.internal.binaryen.*
 import space.kscience.kmath.internal.webassembly.Instance
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.internal.binaryen.Module as BinaryenModule
 import space.kscience.kmath.internal.webassembly.Module as WasmModule
@@ -18,65 +17,17 @@ import space.kscience.kmath.internal.webassembly.Module as WasmModule
 private val spreader = eval("(obj, args) => obj(...args)")
 
 @Suppress("UnsafeCastFromDynamic")
-internal sealed class WasmBuilder<T : Number>(
+internal sealed class WasmBuilder<T : Number, out E : Expression<T>>(
     protected val binaryenType: Type,
     protected val algebra: Algebra<T>,
     protected val target: MST,
 ) {
     protected val keys: MutableList<Symbol> = mutableListOf()
-    lateinit var ctx: BinaryenModule
+    protected lateinit var ctx: BinaryenModule
 
-    open fun visitSymbolic(mst: Symbol): ExpressionRef {
-        algebra.bindSymbolOrNull(mst)?.let { return visitNumeric(Numeric(it)) }
+    abstract val instance: E
 
-        var idx = keys.indexOf(mst)
-
-        if (idx == -1) {
-            keys += mst
-            idx = keys.lastIndex
-        }
-
-        return ctx.local.get(idx, binaryenType)
-    }
-
-    abstract fun visitNumeric(mst: Numeric): ExpressionRef
-
-    protected open fun visitUnary(mst: Unary): ExpressionRef =
-        error("Unary operation ${mst.operation} not defined in $this")
-
-    protected open fun visitBinary(mst: Binary): ExpressionRef =
-        error("Binary operation ${mst.operation} not defined in $this")
-
-    protected open fun createModule(): BinaryenModule = js("new \$module\$binaryen.Module()")
-
-    protected fun visit(mst: MST): ExpressionRef = when (mst) {
-        is Symbol -> visitSymbolic(mst)
-        is Numeric -> visitNumeric(mst)
-
-        is Unary -> when {
-            algebra is NumericAlgebra && mst.value is Numeric -> visitNumeric(
-                Numeric(algebra.unaryOperationFunction(mst.operation)(algebra.number((mst.value as Numeric).value)))
-            )
-
-            else -> visitUnary(mst)
-        }
-
-        is Binary -> when {
-            algebra is NumericAlgebra && mst.left is Numeric && mst.right is Numeric -> visitNumeric(
-                Numeric(
-                    algebra.binaryOperationFunction(mst.operation)
-                        .invoke(
-                            algebra.number((mst.left as Numeric).value),
-                            algebra.number((mst.right as Numeric).value)
-                        )
-                )
-            )
-
-            else -> visitBinary(mst)
-        }
-    }
-
-    val instance by lazy {
+    protected val executable = run {
         val c = WasmModule(with(createModule()) {
             ctx = this
             val expr = visit(target)
@@ -97,41 +48,93 @@ internal sealed class WasmBuilder<T : Number>(
             res
         })
 
-        val i = Instance(c, js("{}") as Any)
-        val symbols = keys
-        keys.clear()
+        Instance(c, js("{}")).exports.executable
+    }
 
-        Expression<T> { args ->
-            val params = symbols.map(args::getValue).toTypedArray()
-            spreader(i.exports.asDynamic().executable, params) as T
+    protected open fun visitSymbol(node: Symbol): ExpressionRef {
+        algebra.bindSymbolOrNull(node)?.let { return visitNumeric(Numeric(it)) }
+
+        var idx = keys.indexOf(node)
+
+        if (idx == -1) {
+            keys += node
+            idx = keys.lastIndex
+        }
+
+        return ctx.local.get(idx, binaryenType)
+    }
+
+    protected abstract fun visitNumeric(node: Numeric): ExpressionRef
+
+    protected open fun visitUnary(node: Unary): ExpressionRef =
+        error("Unary operation ${node.operation} not defined in $this")
+
+    protected open fun visitBinary(mst: Binary): ExpressionRef =
+        error("Binary operation ${mst.operation} not defined in $this")
+
+    protected open fun createModule(): BinaryenModule = js("new \$module\$binaryen.Module()")
+
+    protected fun visit(node: MST): ExpressionRef = when (node) {
+        is Symbol -> visitSymbol(node)
+        is Numeric -> visitNumeric(node)
+
+        is Unary -> when {
+            algebra is NumericAlgebra && node.value is Numeric -> visitNumeric(
+                Numeric(algebra.unaryOperationFunction(node.operation)(algebra.number((node.value as Numeric).value)))
+            )
+
+            else -> visitUnary(node)
+        }
+
+        is Binary -> when {
+            algebra is NumericAlgebra && node.left is Numeric && node.right is Numeric -> visitNumeric(
+                Numeric(
+                    algebra.binaryOperationFunction(node.operation)
+                        .invoke(
+                            algebra.number((node.left as Numeric).value),
+                            algebra.number((node.right as Numeric).value)
+                        )
+                )
+            )
+
+            else -> visitBinary(node)
         }
     }
 }
 
-internal class DoubleWasmBuilder(target: MST) : WasmBuilder<Double>(f64, DoubleField, target) {
-    override fun createModule(): BinaryenModule = readBinary(f64StandardFunctions)
+@UnstableKMathAPI
+internal class DoubleWasmBuilder(target: MST) : WasmBuilder<Double, DoubleExpression>(f64, DoubleField, target) {
+    override val instance by lazy {
+        object : DoubleExpression {
+            override val indexer = SimpleSymbolIndexer(keys)
 
-    override fun visitNumeric(mst: Numeric): ExpressionRef = ctx.f64.const(mst.value)
+            override fun invoke(arguments: DoubleArray) = spreader(executable, arguments).unsafeCast<Double>()
+        }
+    }
 
-    override fun visitUnary(mst: Unary): ExpressionRef = when (mst.operation) {
-        GroupOps.MINUS_OPERATION -> ctx.f64.neg(visit(mst.value))
-        GroupOps.PLUS_OPERATION -> visit(mst.value)
-        PowerOperations.SQRT_OPERATION -> ctx.f64.sqrt(visit(mst.value))
-        TrigonometricOperations.SIN_OPERATION -> ctx.call("sin", arrayOf(visit(mst.value)), f64)
-        TrigonometricOperations.COS_OPERATION -> ctx.call("cos", arrayOf(visit(mst.value)), f64)
-        TrigonometricOperations.TAN_OPERATION -> ctx.call("tan", arrayOf(visit(mst.value)), f64)
-        TrigonometricOperations.ASIN_OPERATION -> ctx.call("asin", arrayOf(visit(mst.value)), f64)
-        TrigonometricOperations.ACOS_OPERATION -> ctx.call("acos", arrayOf(visit(mst.value)), f64)
-        TrigonometricOperations.ATAN_OPERATION -> ctx.call("atan", arrayOf(visit(mst.value)), f64)
-        ExponentialOperations.SINH_OPERATION -> ctx.call("sinh", arrayOf(visit(mst.value)), f64)
-        ExponentialOperations.COSH_OPERATION -> ctx.call("cosh", arrayOf(visit(mst.value)), f64)
-        ExponentialOperations.TANH_OPERATION -> ctx.call("tanh", arrayOf(visit(mst.value)), f64)
-        ExponentialOperations.ASINH_OPERATION -> ctx.call("asinh", arrayOf(visit(mst.value)), f64)
-        ExponentialOperations.ACOSH_OPERATION -> ctx.call("acosh", arrayOf(visit(mst.value)), f64)
-        ExponentialOperations.ATANH_OPERATION -> ctx.call("atanh", arrayOf(visit(mst.value)), f64)
-        ExponentialOperations.EXP_OPERATION -> ctx.call("exp", arrayOf(visit(mst.value)), f64)
-        ExponentialOperations.LN_OPERATION -> ctx.call("log", arrayOf(visit(mst.value)), f64)
-        else -> super.visitUnary(mst)
+    override fun createModule() = readBinary(f64StandardFunctions)
+
+    override fun visitNumeric(node: Numeric) = ctx.f64.const(node.value)
+
+    override fun visitUnary(node: Unary): ExpressionRef = when (node.operation) {
+        GroupOps.MINUS_OPERATION -> ctx.f64.neg(visit(node.value))
+        GroupOps.PLUS_OPERATION -> visit(node.value)
+        PowerOperations.SQRT_OPERATION -> ctx.f64.sqrt(visit(node.value))
+        TrigonometricOperations.SIN_OPERATION -> ctx.call("sin", arrayOf(visit(node.value)), f64)
+        TrigonometricOperations.COS_OPERATION -> ctx.call("cos", arrayOf(visit(node.value)), f64)
+        TrigonometricOperations.TAN_OPERATION -> ctx.call("tan", arrayOf(visit(node.value)), f64)
+        TrigonometricOperations.ASIN_OPERATION -> ctx.call("asin", arrayOf(visit(node.value)), f64)
+        TrigonometricOperations.ACOS_OPERATION -> ctx.call("acos", arrayOf(visit(node.value)), f64)
+        TrigonometricOperations.ATAN_OPERATION -> ctx.call("atan", arrayOf(visit(node.value)), f64)
+        ExponentialOperations.SINH_OPERATION -> ctx.call("sinh", arrayOf(visit(node.value)), f64)
+        ExponentialOperations.COSH_OPERATION -> ctx.call("cosh", arrayOf(visit(node.value)), f64)
+        ExponentialOperations.TANH_OPERATION -> ctx.call("tanh", arrayOf(visit(node.value)), f64)
+        ExponentialOperations.ASINH_OPERATION -> ctx.call("asinh", arrayOf(visit(node.value)), f64)
+        ExponentialOperations.ACOSH_OPERATION -> ctx.call("acosh", arrayOf(visit(node.value)), f64)
+        ExponentialOperations.ATANH_OPERATION -> ctx.call("atanh", arrayOf(visit(node.value)), f64)
+        ExponentialOperations.EXP_OPERATION -> ctx.call("exp", arrayOf(visit(node.value)), f64)
+        ExponentialOperations.LN_OPERATION -> ctx.call("log", arrayOf(visit(node.value)), f64)
+        else -> super.visitUnary(node)
     }
 
     override fun visitBinary(mst: Binary): ExpressionRef = when (mst.operation) {
@@ -144,13 +147,22 @@ internal class DoubleWasmBuilder(target: MST) : WasmBuilder<Double>(f64, DoubleF
     }
 }
 
-internal class IntWasmBuilder(target: MST) : WasmBuilder<Int>(i32, IntRing, target) {
-    override fun visitNumeric(mst: Numeric): ExpressionRef = ctx.i32.const(mst.value)
+@UnstableKMathAPI
+internal class IntWasmBuilder(target: MST) : WasmBuilder<Int, IntExpression>(i32, IntRing, target) {
+    override val instance by lazy {
+        object : IntExpression {
+            override val indexer = SimpleSymbolIndexer(keys)
 
-    override fun visitUnary(mst: Unary): ExpressionRef = when (mst.operation) {
-        GroupOps.MINUS_OPERATION -> ctx.i32.sub(ctx.i32.const(0), visit(mst.value))
-        GroupOps.PLUS_OPERATION -> visit(mst.value)
-        else -> super.visitUnary(mst)
+            override fun invoke(arguments: IntArray) = spreader(executable, arguments).unsafeCast<Int>()
+        }
+    }
+
+    override fun visitNumeric(node: Numeric) = ctx.i32.const(node.value)
+
+    override fun visitUnary(node: Unary): ExpressionRef = when (node.operation) {
+        GroupOps.MINUS_OPERATION -> ctx.i32.sub(ctx.i32.const(0), visit(node.value))
+        GroupOps.PLUS_OPERATION -> visit(node.value)
+        else -> super.visitUnary(node)
     }
 
     override fun visitBinary(mst: Binary): ExpressionRef = when (mst.operation) {
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
index 806091715..12e6b41af 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
@@ -3,13 +3,12 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("UNUSED_PARAMETER")
+
 package space.kscience.kmath.wasm
 
 import space.kscience.kmath.estree.compileWith
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.expressions.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
@@ -22,7 +21,7 @@ import space.kscience.kmath.wasm.internal.IntWasmBuilder
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
-public fun MST.compileToExpression(algebra: IntRing): Expression<Int> = compileWith(algebra)
+public fun MST.compileToExpression(algebra: IntRing): IntExpression = IntWasmBuilder(this).instance
 
 
 /**
@@ -50,7 +49,7 @@ public fun MST.compile(algebra: IntRing, vararg arguments: Pair<Symbol, Int>): I
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
-public fun MST.compileToExpression(algebra: DoubleField): Expression<Double> = compileWith(algebra)
+public fun MST.compileToExpression(algebra: DoubleField): Expression<Double> = DoubleWasmBuilder(this).instance
 
 
 /**
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
index c39345f3a..8e426622d 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
@@ -8,11 +8,8 @@
 package space.kscience.kmath.asm
 
 import space.kscience.kmath.asm.internal.*
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.expressions.*
 import space.kscience.kmath.expressions.MST.*
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.expressions.invoke
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 
@@ -48,7 +45,13 @@ internal fun <T : Any> MST.compileWith(type: Class<T>, algebra: Algebra<T>): Exp
                 loadVariable(node.identity)
         }
 
-        is Numeric -> loadNumberConstant(node.value)
+        is Numeric -> if (algebra is NumericAlgebra) {
+            if (Number::class.java.isAssignableFrom(type))
+                loadNumberConstant(algebra.number(node.value) as Number)
+            else
+                loadObjectConstant(algebra.number(node.value))
+        } else
+            error("Numeric nodes are not supported by $this")
 
         is Unary -> when {
             algebra is NumericAlgebra && node.value is Numeric -> loadObjectConstant(
@@ -121,13 +124,15 @@ public inline fun <reified T : Any> MST.compile(algebra: Algebra<T>, vararg argu
  *
  * @author Iaroslav Postovalov
  */
-public fun MST.compileToExpression(algebra: IntRing): Expression<Int> = IntAsmBuilder(this).instance
+@UnstableKMathAPI
+public fun MST.compileToExpression(algebra: IntRing): IntExpression = IntAsmBuilder(this).instance
 
 /**
  * Compile given MST to expression and evaluate it against [arguments].
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int =
     compileToExpression(algebra).invoke(arguments)
 
@@ -136,6 +141,7 @@ public fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int =
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun MST.compile(algebra: IntRing, vararg arguments: Pair<Symbol, Int>): Int =
     compileToExpression(algebra)(*arguments)
 
@@ -145,7 +151,8 @@ public fun MST.compile(algebra: IntRing, vararg arguments: Pair<Symbol, Int>): I
  *
  * @author Iaroslav Postovalov
  */
-public fun MST.compileToExpression(algebra: LongRing): Expression<Long> = LongAsmBuilder(this).instance
+@UnstableKMathAPI
+public fun MST.compileToExpression(algebra: LongRing): LongExpression = LongAsmBuilder(this).instance
 
 
 /**
@@ -153,6 +160,7 @@ public fun MST.compileToExpression(algebra: LongRing): Expression<Long> = LongAs
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun MST.compile(algebra: LongRing, arguments: Map<Symbol, Long>): Long =
     compileToExpression(algebra).invoke(arguments)
 
@@ -162,6 +170,7 @@ public fun MST.compile(algebra: LongRing, arguments: Map<Symbol, Long>): Long =
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun MST.compile(algebra: LongRing, vararg arguments: Pair<Symbol, Long>): Long =
     compileToExpression(algebra)(*arguments)
 
@@ -171,13 +180,15 @@ public fun MST.compile(algebra: LongRing, vararg arguments: Pair<Symbol, Long>):
  *
  * @author Iaroslav Postovalov
  */
-public fun MST.compileToExpression(algebra: DoubleField): Expression<Double> = DoubleAsmBuilder(this).instance
+@UnstableKMathAPI
+public fun MST.compileToExpression(algebra: DoubleField): DoubleExpression = DoubleAsmBuilder(this).instance
 
 /**
  * Compile given MST to expression and evaluate it against [arguments].
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Double =
     compileToExpression(algebra).invoke(arguments)
 
@@ -186,5 +197,6 @@ public fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Do
  *
  * @author Iaroslav Postovalov
  */
+@UnstableKMathAPI
 public fun MST.compile(algebra: DoubleField, vararg arguments: Pair<Symbol, Double>): Double =
     compileToExpression(algebra).invoke(*arguments)
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
index 7d3d513de..a85079fc8 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.asm.internal
 
 import org.objectweb.asm.Type
+import org.objectweb.asm.Type.getObjectType
 import space.kscience.kmath.expressions.Expression
 
 internal abstract class AsmBuilder {
@@ -22,31 +23,31 @@ internal abstract class AsmBuilder {
         /**
          * ASM type for [Expression].
          */
-        val EXPRESSION_TYPE: Type by lazy { Type.getObjectType("space/kscience/kmath/expressions/Expression") }
+        val EXPRESSION_TYPE: Type = getObjectType("space/kscience/kmath/expressions/Expression")
 
         /**
          * ASM type for [java.util.Map].
          */
-        val MAP_TYPE: Type by lazy { Type.getObjectType("java/util/Map") }
+        val MAP_TYPE: Type = getObjectType("java/util/Map")
 
         /**
          * ASM type for [java.lang.Object].
          */
-        val OBJECT_TYPE: Type by lazy { Type.getObjectType("java/lang/Object") }
+        val OBJECT_TYPE: Type = getObjectType("java/lang/Object")
 
         /**
          * ASM type for [java.lang.String].
          */
-        val STRING_TYPE: Type by lazy { Type.getObjectType("java/lang/String") }
+        val STRING_TYPE: Type = getObjectType("java/lang/String")
 
         /**
          * ASM type for MapIntrinsics.
          */
-        val MAP_INTRINSICS_TYPE: Type by lazy { Type.getObjectType("space/kscience/kmath/asm/internal/MapIntrinsics") }
+        val MAP_INTRINSICS_TYPE: Type = getObjectType("space/kscience/kmath/asm/internal/MapIntrinsics")
 
         /**
          * ASM Type for [space.kscience.kmath.expressions.Symbol].
          */
-        val SYMBOL_TYPE: Type by lazy { Type.getObjectType("space/kscience/kmath/expressions/Symbol") }
+        val SYMBOL_TYPE: Type = getObjectType("space/kscience/kmath/expressions/Symbol")
     }
 }
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/ByteArrayClassLoader.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/ByteArrayClassLoader.kt
deleted file mode 100644
index 10eee7c6b..000000000
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/ByteArrayClassLoader.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.asm.internal
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
index 28f4a226f..5eb739956 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
@@ -78,7 +78,7 @@ internal class GenericAsmBuilder<T>(
             )
 
             visitMethod(
-                ACC_PUBLIC or ACC_FINAL,
+                ACC_PUBLIC,
                 "invoke",
                 getMethodDescriptor(tType, MAP_TYPE),
                 "(L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;)${tType.descriptor}",
@@ -116,7 +116,7 @@ internal class GenericAsmBuilder<T>(
             }
 
             visitMethod(
-                ACC_PUBLIC or ACC_FINAL or ACC_BRIDGE or ACC_SYNTHETIC,
+                ACC_PUBLIC or ACC_BRIDGE or ACC_SYNTHETIC,
                 "invoke",
                 getMethodDescriptor(OBJECT_TYPE, MAP_TYPE),
                 null,
@@ -156,7 +156,7 @@ internal class GenericAsmBuilder<T>(
                 )
 
             visitMethod(
-                ACC_PUBLIC,
+                ACC_PUBLIC or ACC_SYNTHETIC,
                 "<init>",
                 getMethodDescriptor(VOID_TYPE, *OBJECT_ARRAY_TYPE.wrapToArrayIf { hasConstants }),
                 null,
@@ -176,7 +176,7 @@ internal class GenericAsmBuilder<T>(
                 }
 
                 label()
-                visitInsn(RETURN)
+                areturn(VOID_TYPE)
                 val l4 = label()
                 visitLocalVariable("this", classType.descriptor, null, l0, l4, 0)
 
@@ -209,10 +209,10 @@ internal class GenericAsmBuilder<T>(
      */
     fun loadObjectConstant(value: Any, type: Type = tType): Unit = invokeMethodVisitor.run {
         val idx = if (value in constants) constants.indexOf(value) else constants.also { it += value }.lastIndex
-        invokeMethodVisitor.load(0, classType)
+        load(0, classType)
         getfield(classType.internalName, "constants", OBJECT_ARRAY_TYPE.descriptor)
         iconst(idx)
-        visitInsn(AALOAD)
+        aload(OBJECT_TYPE)
         if (type != OBJECT_TYPE) checkcast(type)
     }
 
@@ -320,6 +320,6 @@ internal class GenericAsmBuilder<T>(
         /**
          * ASM type for array of [java.lang.Object].
          */
-        val OBJECT_ARRAY_TYPE: Type by lazy { getType("[Ljava/lang/Object;") }
+        val OBJECT_ARRAY_TYPE: Type = getType("[Ljava/lang/Object;")
     }
 }
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
index 3e019589a..bf1f42395 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
@@ -6,38 +6,49 @@
 package space.kscience.kmath.asm.internal
 
 import org.objectweb.asm.ClassWriter
-import org.objectweb.asm.Opcodes
+import org.objectweb.asm.FieldVisitor
+import org.objectweb.asm.Opcodes.*
 import org.objectweb.asm.Type
 import org.objectweb.asm.Type.*
 import org.objectweb.asm.commons.InstructionAdapter
-import space.kscience.kmath.expressions.Expression
-import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.expressions.invoke
+import space.kscience.kmath.expressions.*
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import java.lang.invoke.MethodHandles
 import java.lang.invoke.MethodType
 import java.nio.file.Paths
 import kotlin.io.path.writeBytes
 
-internal sealed class PrimitiveAsmBuilder<T : Number>(
-    protected val algebra: Algebra<T>,
+@UnstableKMathAPI
+internal sealed class PrimitiveAsmBuilder<T : Number, out E : Expression<T>>(
+    protected val algebra: NumericAlgebra<T>,
     classOfT: Class<*>,
     protected val classOfTPrimitive: Class<*>,
+    expressionParent: Class<E>,
     protected val target: MST,
 ) : AsmBuilder() {
     private val className: String = buildName(target)
 
     /**
-     * ASM type for [T].
+     * ASM type for [tType].
      */
     private val tType: Type = classOfT.asm
 
     /**
-     * ASM type for [T].
+     * ASM type for [classOfTPrimitive].
      */
     protected val tTypePrimitive: Type = classOfTPrimitive.asm
 
+    /**
+     * ASM type for array of [classOfTPrimitive].
+     */
+    protected val tTypePrimitiveArray: Type = getType("[" + classOfTPrimitive.asm.descriptor)
+
+    /**
+     * ASM type for expression parent.
+     */
+    private val expressionParentType = expressionParent.asm
+
     /**
      * ASM type for new class.
      */
@@ -49,58 +60,91 @@ internal sealed class PrimitiveAsmBuilder<T : Number>(
     protected lateinit var invokeMethodVisitor: InstructionAdapter
 
     /**
-     * Local variables indices are indices of symbols in this list.
+     * Indexer for arguments in [target].
      */
-    private val argumentsLocals = mutableListOf<String>()
+    private val argumentsIndexer = mutableListOf<Symbol>()
 
     /**
      * Subclasses, loads and instantiates [Expression] for given parameters.
      *
      * The built instance is cached.
      */
-    @Suppress("UNCHECKED_CAST", "UNUSED_VARIABLE")
-    val instance: Expression<T> by lazy {
+    @Suppress("UNCHECKED_CAST")
+    val instance: E by lazy {
         val classWriter = ClassWriter(ClassWriter.COMPUTE_FRAMES) {
             visit(
-                Opcodes.V1_8,
-                Opcodes.ACC_PUBLIC or Opcodes.ACC_FINAL or Opcodes.ACC_SUPER,
+                V1_8,
+                ACC_PUBLIC or ACC_FINAL or ACC_SUPER,
                 classType.internalName,
-                "${OBJECT_TYPE.descriptor}L${EXPRESSION_TYPE.internalName}<${tType.descriptor}>;",
+                "${OBJECT_TYPE.descriptor}${expressionParentType.descriptor}",
                 OBJECT_TYPE.internalName,
-                arrayOf(EXPRESSION_TYPE.internalName),
+                arrayOf(expressionParentType.internalName),
             )
 
+            visitField(
+                access = ACC_PRIVATE or ACC_FINAL,
+                name = "indexer",
+                descriptor = SYMBOL_INDEXER_TYPE.descriptor,
+                signature = null,
+                value = null,
+                block = FieldVisitor::visitEnd,
+            )
             visitMethod(
-                Opcodes.ACC_PUBLIC or Opcodes.ACC_FINAL,
-                "invoke",
-                getMethodDescriptor(tType, MAP_TYPE),
-                "(L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;)${tType.descriptor}",
+                ACC_PUBLIC,
+                "getIndexer",
+                getMethodDescriptor(SYMBOL_INDEXER_TYPE),
+                null,
                 null,
             ).instructionAdapter {
-                invokeMethodVisitor = this
                 visitCode()
-                val preparingVariables = label()
-                visitVariables(target)
-                val expressionResult = label()
-                visitExpression(target)
-                box()
-                areturn(tType)
+                val start = label()
+                load(0, classType)
+                getfield(classType.internalName, "indexer", SYMBOL_INDEXER_TYPE.descriptor)
+                areturn(SYMBOL_INDEXER_TYPE)
                 val end = label()
 
                 visitLocalVariable(
                     "this",
                     classType.descriptor,
                     null,
-                    preparingVariables,
+                    start,
+                    end,
+                    0,
+                )
+
+                visitMaxs(0, 0)
+                visitEnd()
+            }
+
+            visitMethod(
+                ACC_PUBLIC,
+                "invoke",
+                getMethodDescriptor(tTypePrimitive, tTypePrimitiveArray),
+                null,
+                null,
+            ).instructionAdapter {
+                invokeMethodVisitor = this
+                visitCode()
+                val start = label()
+                visitVariables(target, arrayMode = true)
+                visitExpression(target)
+                areturn(tTypePrimitive)
+                val end = label()
+
+                visitLocalVariable(
+                    "this",
+                    classType.descriptor,
+                    null,
+                    start,
                     end,
                     0,
                 )
 
                 visitLocalVariable(
                     "arguments",
-                    MAP_TYPE.descriptor,
-                    "L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;",
-                    preparingVariables,
+                    tTypePrimitiveArray.descriptor,
+                    null,
+                    start,
                     end,
                     1,
                 )
@@ -110,7 +154,45 @@ internal sealed class PrimitiveAsmBuilder<T : Number>(
             }
 
             visitMethod(
-                Opcodes.ACC_PUBLIC or Opcodes.ACC_FINAL or Opcodes.ACC_BRIDGE or Opcodes.ACC_SYNTHETIC,
+                ACC_PUBLIC or ACC_FINAL,
+                "invoke",
+                getMethodDescriptor(tType, MAP_TYPE),
+                "(L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;)${tType.descriptor}",
+                null,
+            ).instructionAdapter {
+                invokeMethodVisitor = this
+                visitCode()
+                val start = label()
+                visitVariables(target, arrayMode = false)
+                visitExpression(target)
+                box()
+                areturn(tType)
+                val end = label()
+
+                visitLocalVariable(
+                    "this",
+                    classType.descriptor,
+                    null,
+                    start,
+                    end,
+                    0,
+                )
+
+                visitLocalVariable(
+                    "arguments",
+                    MAP_TYPE.descriptor,
+                    "L${MAP_TYPE.internalName}<${SYMBOL_TYPE.descriptor}+${tType.descriptor}>;",
+                    start,
+                    end,
+                    1,
+                )
+
+                visitMaxs(0, 0)
+                visitEnd()
+            }
+
+            visitMethod(
+                ACC_PUBLIC or ACC_FINAL or ACC_BRIDGE or ACC_SYNTHETIC,
                 "invoke",
                 getMethodDescriptor(OBJECT_TYPE, MAP_TYPE),
                 null,
@@ -138,21 +220,22 @@ internal sealed class PrimitiveAsmBuilder<T : Number>(
             }
 
             visitMethod(
-                Opcodes.ACC_PUBLIC,
+                ACC_PUBLIC or ACC_SYNTHETIC,
                 "<init>",
-                getMethodDescriptor(VOID_TYPE),
+                getMethodDescriptor(VOID_TYPE, SYMBOL_INDEXER_TYPE),
                 null,
                 null,
             ).instructionAdapter {
                 val start = label()
                 load(0, classType)
                 invokespecial(OBJECT_TYPE.internalName, "<init>", getMethodDescriptor(VOID_TYPE), false)
-                label()
                 load(0, classType)
-                label()
-                visitInsn(Opcodes.RETURN)
+                load(1, SYMBOL_INDEXER_TYPE)
+                putfield(classType.internalName, "indexer", SYMBOL_INDEXER_TYPE.descriptor)
+                areturn(VOID_TYPE)
                 val end = label()
                 visitLocalVariable("this", classType.descriptor, null, start, end, 0)
+                visitLocalVariable("indexer", SYMBOL_INDEXER_TYPE.descriptor, null, start, end, 1)
                 visitMaxs(0, 0)
                 visitEnd()
             }
@@ -166,14 +249,16 @@ internal sealed class PrimitiveAsmBuilder<T : Number>(
         if (System.getProperty("space.kscience.kmath.ast.dump.generated.classes") == "1")
             Paths.get("${className.split('.').last()}.class").writeBytes(binary)
 
-        MethodHandles.publicLookup().findConstructor(cls, MethodType.methodType(Void.TYPE))() as Expression<T>
+        MethodHandles
+            .publicLookup()
+            .findConstructor(cls, MethodType.methodType(Void.TYPE, SymbolIndexer::class.java))
+            .invoke(SimpleSymbolIndexer(argumentsIndexer)) as E
     }
 
     /**
-     * Either loads a numeric constant [value] from the class's constants field or boxes a primitive
-     * constant from the constant pool.
+     * Loads a numeric constant [value] from the class's constants.
      */
-    fun loadNumberConstant(value: Number) {
+    protected fun loadNumberConstant(value: Number) {
         when (tTypePrimitive) {
             BYTE_TYPE -> invokeMethodVisitor.iconst(value.toInt())
             DOUBLE_TYPE -> invokeMethodVisitor.dconst(value.toDouble())
@@ -185,38 +270,50 @@ internal sealed class PrimitiveAsmBuilder<T : Number>(
     }
 
     /**
-     * Stores value variable [name] into a local. Should be called within [variablesPrepareCallback] before using
-     * [loadVariable].
+     * Stores value variable [name] into a local. Should be called before using [loadVariable]. Should be called only
+     * once for a variable.
      */
-    fun prepareVariable(name: String): Unit = invokeMethodVisitor.run {
-        if (name in argumentsLocals) return@run
-        load(1, MAP_TYPE)
-        aconst(name)
+    protected fun prepareVariable(name: Symbol, arrayMode: Boolean): Unit = invokeMethodVisitor.run {
+        var argumentIndex = argumentsIndexer.indexOf(name)
 
-        invokestatic(
-            MAP_INTRINSICS_TYPE.internalName,
-            "getOrFail",
-            getMethodDescriptor(OBJECT_TYPE, MAP_TYPE, STRING_TYPE),
-            false,
-        )
-
-        checkcast(tType)
-        var idx = argumentsLocals.indexOf(name)
-
-        if (idx == -1) {
-            argumentsLocals += name
-            idx = argumentsLocals.lastIndex
+        if (argumentIndex == -1) {
+            argumentsIndexer += name
+            argumentIndex = argumentsIndexer.lastIndex
         }
 
-        unbox()
-        store(2 + idx, tTypePrimitive)
+        val localIndex = 2 + argumentIndex * tTypePrimitive.size
+
+        if (arrayMode) {
+            load(1, tTypePrimitiveArray)
+            iconst(argumentIndex)
+            aload(tTypePrimitive)
+            store(localIndex, tTypePrimitive)
+        } else {
+            load(1, MAP_TYPE)
+            aconst(name.identity)
+
+            invokestatic(
+                MAP_INTRINSICS_TYPE.internalName,
+                "getOrFail",
+                getMethodDescriptor(OBJECT_TYPE, MAP_TYPE, STRING_TYPE),
+                false,
+            )
+
+            checkcast(tType)
+            unbox()
+            store(localIndex, tTypePrimitive)
+        }
     }
 
     /**
      * Loads a variable [name] from arguments [Map] parameter of [Expression.invoke]. The variable should be stored
      * with [prepareVariable] first.
      */
-    fun loadVariable(name: String): Unit = invokeMethodVisitor.load(2 + argumentsLocals.indexOf(name), tTypePrimitive)
+    protected fun loadVariable(name: Symbol) {
+        val argumentIndex = argumentsIndexer.indexOf(name)
+        val localIndex = 2 + argumentIndex * tTypePrimitive.size
+        invokeMethodVisitor.load(localIndex, tTypePrimitive)
+    }
 
     private fun unbox() = invokeMethodVisitor.run {
         invokevirtual(
@@ -231,102 +328,117 @@ internal sealed class PrimitiveAsmBuilder<T : Number>(
         invokestatic(tType.internalName, "valueOf", getMethodDescriptor(tType, tTypePrimitive), false)
     }
 
-    protected fun visitVariables(node: MST): Unit = when (node) {
-        is Symbol -> prepareVariable(node.identity)
-        is MST.Unary -> visitVariables(node.value)
+    private fun visitVariables(
+        node: MST,
+        arrayMode: Boolean,
+        alreadyLoaded: MutableList<Symbol> = mutableListOf()
+    ): Unit = when (node) {
+        is Symbol -> when (node) {
+            !in alreadyLoaded -> {
+                alreadyLoaded += node
+                prepareVariable(node, arrayMode)
+            }
+            else -> {
+            }
+        }
+
+        is MST.Unary -> visitVariables(node.value, arrayMode, alreadyLoaded)
 
         is MST.Binary -> {
-            visitVariables(node.left)
-            visitVariables(node.right)
+            visitVariables(node.left, arrayMode, alreadyLoaded)
+            visitVariables(node.right, arrayMode, alreadyLoaded)
         }
 
         else -> Unit
     }
 
-    protected fun visitExpression(mst: MST): Unit = when (mst) {
-        is Symbol -> loadVariable(mst.identity)
-        is MST.Numeric -> loadNumberConstant(mst.value)
+    private fun visitExpression(node: MST): Unit = when (node) {
+        is Symbol -> {
+            val symbol = algebra.bindSymbolOrNull(node)
 
-        is MST.Unary -> when {
-            algebra is NumericAlgebra && mst.value is MST.Numeric -> {
-                loadNumberConstant(
-                    MST.Numeric(
-                        algebra.unaryOperationFunction(mst.operation)(algebra.number((mst.value as MST.Numeric).value)),
-                    ).value,
-                )
-            }
-
-            else -> visitUnary(mst)
+            if (symbol != null)
+                loadNumberConstant(symbol)
+            else
+                loadVariable(node)
         }
 
+        is MST.Numeric -> loadNumberConstant(algebra.number(node.value))
+
+        is MST.Unary -> if (node.value is MST.Numeric)
+            loadNumberConstant(
+                algebra.unaryOperationFunction(node.operation)(algebra.number((node.value as MST.Numeric).value)),
+            )
+        else
+            visitUnary(node)
+
         is MST.Binary -> when {
-            algebra is NumericAlgebra && mst.left is MST.Numeric && mst.right is MST.Numeric -> {
-                loadNumberConstant(
-                    MST.Numeric(
-                        algebra.binaryOperationFunction(mst.operation)(
-                            algebra.number((mst.left as MST.Numeric).value),
-                            algebra.number((mst.right as MST.Numeric).value),
-                        ),
-                    ).value,
-                )
-            }
+            node.left is MST.Numeric && node.right is MST.Numeric -> loadNumberConstant(
+                algebra.binaryOperationFunction(node.operation)(
+                    algebra.number((node.left as MST.Numeric).value),
+                    algebra.number((node.right as MST.Numeric).value),
+                ),
+            )
 
-            else -> visitBinary(mst)
+            else -> visitBinary(node)
         }
     }
 
-    protected open fun visitUnary(mst: MST.Unary) {
-        visitExpression(mst.value)
-    }
+    protected open fun visitUnary(node: MST.Unary) = visitExpression(node.value)
 
-    protected open fun visitBinary(mst: MST.Binary) {
-        visitExpression(mst.left)
-        visitExpression(mst.right)
+    protected open fun visitBinary(node: MST.Binary) {
+        visitExpression(node.left)
+        visitExpression(node.right)
     }
 
     protected companion object {
         /**
          * ASM type for [java.lang.Number].
          */
-        val NUMBER_TYPE: Type by lazy { getObjectType("java/lang/Number") }
+        val NUMBER_TYPE: Type = getObjectType("java/lang/Number")
+
+        /**
+         * ASM type for [SymbolIndexer].
+         */
+        val SYMBOL_INDEXER_TYPE: Type = getObjectType("space/kscience/kmath/expressions/SymbolIndexer")
     }
 }
 
-internal class DoubleAsmBuilder(target: MST) :
-    PrimitiveAsmBuilder<Double>(DoubleField, java.lang.Double::class.java, java.lang.Double.TYPE, target) {
+@UnstableKMathAPI
+internal class DoubleAsmBuilder(target: MST) : PrimitiveAsmBuilder<Double, DoubleExpression>(
+    DoubleField,
+    java.lang.Double::class.java,
+    java.lang.Double.TYPE,
+    DoubleExpression::class.java,
+    target,
+) {
 
-    private fun buildUnaryJavaMathCall(name: String) {
-        invokeMethodVisitor.invokestatic(
-            MATH_TYPE.internalName,
-            name,
-            getMethodDescriptor(tTypePrimitive, tTypePrimitive),
-            false,
-        )
-    }
+    private fun buildUnaryJavaMathCall(name: String) = invokeMethodVisitor.invokestatic(
+        MATH_TYPE.internalName,
+        name,
+        getMethodDescriptor(tTypePrimitive, tTypePrimitive),
+        false,
+    )
 
-    private fun buildBinaryJavaMathCall(name: String) {
-        invokeMethodVisitor.invokestatic(
-            MATH_TYPE.internalName,
-            name,
-            getMethodDescriptor(tTypePrimitive, tTypePrimitive, tTypePrimitive),
-            false,
-        )
-    }
+    @Suppress("SameParameterValue")
+    private fun buildBinaryJavaMathCall(name: String) = invokeMethodVisitor.invokestatic(
+        MATH_TYPE.internalName,
+        name,
+        getMethodDescriptor(tTypePrimitive, tTypePrimitive, tTypePrimitive),
+        false,
+    )
 
-    private fun buildUnaryKotlinMathCall(name: String) {
-        invokeMethodVisitor.invokestatic(
-            MATH_KT_TYPE.internalName,
-            name,
-            getMethodDescriptor(tTypePrimitive, tTypePrimitive),
-            false,
-        )
-    }
+    private fun buildUnaryKotlinMathCall(name: String) = invokeMethodVisitor.invokestatic(
+        MATH_KT_TYPE.internalName,
+        name,
+        getMethodDescriptor(tTypePrimitive, tTypePrimitive),
+        false,
+    )
 
-    override fun visitUnary(mst: MST.Unary) {
-        super.visitUnary(mst)
+    override fun visitUnary(node: MST.Unary) {
+        super.visitUnary(node)
 
-        when (mst.operation) {
-            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.DNEG)
+        when (node.operation) {
+            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(DNEG)
             GroupOps.PLUS_OPERATION -> Unit
             PowerOperations.SQRT_OPERATION -> buildUnaryJavaMathCall("sqrt")
             TrigonometricOperations.SIN_OPERATION -> buildUnaryJavaMathCall("sin")
@@ -343,74 +455,86 @@ internal class DoubleAsmBuilder(target: MST) :
             ExponentialOperations.ATANH_OPERATION -> buildUnaryKotlinMathCall("atanh")
             ExponentialOperations.EXP_OPERATION -> buildUnaryJavaMathCall("exp")
             ExponentialOperations.LN_OPERATION -> buildUnaryJavaMathCall("log")
-            else -> super.visitUnary(mst)
+            else -> super.visitUnary(node)
         }
     }
 
-    override fun visitBinary(mst: MST.Binary) {
-        super.visitBinary(mst)
+    override fun visitBinary(node: MST.Binary) {
+        super.visitBinary(node)
 
-        when (mst.operation) {
-            GroupOps.PLUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.DADD)
-            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.DSUB)
-            RingOps.TIMES_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.DMUL)
-            FieldOps.DIV_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.DDIV)
+        when (node.operation) {
+            GroupOps.PLUS_OPERATION -> invokeMethodVisitor.visitInsn(DADD)
+            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(DSUB)
+            RingOps.TIMES_OPERATION -> invokeMethodVisitor.visitInsn(DMUL)
+            FieldOps.DIV_OPERATION -> invokeMethodVisitor.visitInsn(DDIV)
             PowerOperations.POW_OPERATION -> buildBinaryJavaMathCall("pow")
-            else -> super.visitBinary(mst)
+            else -> super.visitBinary(node)
         }
     }
 
-    companion object {
-        val MATH_TYPE: Type by lazy { getObjectType("java/lang/Math") }
-        val MATH_KT_TYPE: Type by lazy { getObjectType("kotlin/math/MathKt") }
+    private companion object {
+        val MATH_TYPE: Type = getObjectType("java/lang/Math")
+        val MATH_KT_TYPE: Type = getObjectType("kotlin/math/MathKt")
     }
 }
 
+@UnstableKMathAPI
 internal class IntAsmBuilder(target: MST) :
-    PrimitiveAsmBuilder<Int>(IntRing, Integer::class.java, Integer.TYPE, target) {
-    override fun visitUnary(mst: MST.Unary) {
-        super.visitUnary(mst)
+    PrimitiveAsmBuilder<Int, IntExpression>(
+        IntRing,
+        Integer::class.java,
+        Integer.TYPE,
+        IntExpression::class.java,
+        target
+    ) {
+    override fun visitUnary(node: MST.Unary) {
+        super.visitUnary(node)
 
-        when (mst.operation) {
-            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.INEG)
+        when (node.operation) {
+            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(INEG)
             GroupOps.PLUS_OPERATION -> Unit
-            else -> super.visitUnary(mst)
+            else -> super.visitUnary(node)
         }
     }
 
-    override fun visitBinary(mst: MST.Binary) {
-        super.visitBinary(mst)
+    override fun visitBinary(node: MST.Binary) {
+        super.visitBinary(node)
 
-        when (mst.operation) {
-            GroupOps.PLUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.IADD)
-            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.ISUB)
-            RingOps.TIMES_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.IMUL)
-            else -> super.visitBinary(mst)
+        when (node.operation) {
+            GroupOps.PLUS_OPERATION -> invokeMethodVisitor.visitInsn(IADD)
+            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(ISUB)
+            RingOps.TIMES_OPERATION -> invokeMethodVisitor.visitInsn(IMUL)
+            else -> super.visitBinary(node)
         }
     }
 }
 
-internal class LongAsmBuilder(target: MST) :
-    PrimitiveAsmBuilder<Long>(LongRing, java.lang.Long::class.java, java.lang.Long.TYPE, target) {
-    override fun visitUnary(mst: MST.Unary) {
-        super.visitUnary(mst)
+@UnstableKMathAPI
+internal class LongAsmBuilder(target: MST) : PrimitiveAsmBuilder<Long, LongExpression>(
+    LongRing,
+    java.lang.Long::class.java,
+    java.lang.Long.TYPE,
+    LongExpression::class.java,
+    target,
+) {
+    override fun visitUnary(node: MST.Unary) {
+        super.visitUnary(node)
 
-        when (mst.operation) {
-            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.LNEG)
+        when (node.operation) {
+            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(LNEG)
             GroupOps.PLUS_OPERATION -> Unit
-            else -> super.visitUnary(mst)
+            else -> super.visitUnary(node)
         }
     }
 
-    override fun visitBinary(mst: MST.Binary) {
-        super.visitBinary(mst)
+    override fun visitBinary(node: MST.Binary) {
+        super.visitBinary(node)
 
-        when (mst.operation) {
-            GroupOps.PLUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.LADD)
-            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.LSUB)
-            RingOps.TIMES_OPERATION -> invokeMethodVisitor.visitInsn(Opcodes.LMUL)
-            else -> super.visitBinary(mst)
+        when (node.operation) {
+            GroupOps.PLUS_OPERATION -> invokeMethodVisitor.visitInsn(LADD)
+            GroupOps.MINUS_OPERATION -> invokeMethodVisitor.visitInsn(LSUB)
+            RingOps.TIMES_OPERATION -> invokeMethodVisitor.visitInsn(LMUL)
+            else -> super.visitBinary(node)
         }
     }
 }
-
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index 490868a0b..4a35a54fb 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -8,7 +8,10 @@ plugins {
 kotlin.sourceSets {
     filter { it.name.contains("test", true) }
         .map(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::languageSettings)
-        .forEach { it.optIn("space.kscience.kmath.misc.PerformancePitfall") }
+        .forEach {
+            it.optIn("space.kscience.kmath.misc.PerformancePitfall")
+            it.optIn("space.kscience.kmath.misc.UnstableKMathAPI")
+        }
 
     commonMain {
         dependencies {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
index 33f53202c..5ba32f190 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.expressions
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Algebra
 import kotlin.jvm.JvmName
 import kotlin.properties.ReadOnlyProperty
@@ -24,6 +25,81 @@ public fun interface Expression<T> {
     public operator fun invoke(arguments: Map<Symbol, T>): T
 }
 
+/**
+ * Specialization of [Expression] for [Double] allowing better performance because of using array.
+ */
+@UnstableKMathAPI
+public interface DoubleExpression : Expression<Double> {
+    /**
+     * The indexer of this expression's arguments that should be used to build array for [invoke].
+     *
+     * Implementations must fulfil the following requirement: for any argument symbol `x` and its value `y`,
+     * `indexer.indexOf(x) == arguments.indexOf(y)` if `arguments` is the array passed to [invoke].
+     */
+    public val indexer: SymbolIndexer
+
+    public override operator fun invoke(arguments: Map<Symbol, Double>): Double =
+        this(DoubleArray(indexer.symbols.size) { arguments.getValue(indexer.symbols[it]) })
+
+    /**
+     * Calls this expression from arguments.
+     *
+     * @param arguments the array of arguments.
+     * @return the value.
+     */
+    public operator fun invoke(arguments: DoubleArray): Double
+}
+
+/**
+ * Specialization of [Expression] for [Int] allowing better performance because of using array.
+ */
+@UnstableKMathAPI
+public interface IntExpression : Expression<Int> {
+    /**
+     * The indexer of this expression's arguments that should be used to build array for [invoke].
+     *
+     * Implementations must fulfil the following requirement: for any argument symbol `x` and its value `y`,
+     * `indexer.indexOf(x) == arguments.indexOf(y)` if `arguments` is the array passed to [invoke].
+     */
+    public val indexer: SymbolIndexer
+
+    public override operator fun invoke(arguments: Map<Symbol, Int>): Int =
+        this(IntArray(indexer.symbols.size) { arguments.getValue(indexer.symbols[it]) })
+
+    /**
+     * Calls this expression from arguments.
+     *
+     * @param arguments the array of arguments.
+     * @return the value.
+     */
+    public operator fun invoke(arguments: IntArray): Int
+}
+
+/**
+ * Specialization of [Expression] for [Long] allowing better performance because of using array.
+ */
+@UnstableKMathAPI
+public interface LongExpression : Expression<Long> {
+    /**
+     * The indexer of this expression's arguments that should be used to build array for [invoke].
+     *
+     * Implementations must fulfil the following requirement: for any argument symbol `x` and its value `y`,
+     * `indexer.indexOf(x) == arguments.indexOf(y)` if `arguments` is the array passed to [invoke].
+     */
+    public val indexer: SymbolIndexer
+
+    public override operator fun invoke(arguments: Map<Symbol, Long>): Long =
+        this(LongArray(indexer.symbols.size) { arguments.getValue(indexer.symbols[it]) })
+
+    /**
+     * Calls this expression from arguments.
+     *
+     * @param arguments the array of arguments.
+     * @return the value.
+     */
+    public operator fun invoke(arguments: LongArray): Long
+}
+
 /**
  * Calls this expression without providing any arguments.
  *
@@ -69,6 +145,62 @@ public operator fun <T> Expression<T>.invoke(vararg pairs: Pair<String, T>): T =
     }
 )
 
+private val EMPTY_DOUBLE_ARRAY = DoubleArray(0)
+
+/**
+ * Calls this expression without providing any arguments.
+ *
+ * @return a value.
+ */
+@UnstableKMathAPI
+public operator fun DoubleExpression.invoke(): Double = this(EMPTY_DOUBLE_ARRAY)
+
+/**
+ * Calls this expression from arguments.
+ *
+ * @param pairs the pairs of arguments to values.
+ * @return a value.
+ */
+@UnstableKMathAPI
+public operator fun DoubleExpression.invoke(vararg arguments: Double): Double = this(arguments)
+
+private val EMPTY_INT_ARRAY = IntArray(0)
+
+/**
+ * Calls this expression without providing any arguments.
+ *
+ * @return a value.
+ */
+@UnstableKMathAPI
+public operator fun IntExpression.invoke(): Int = this(EMPTY_INT_ARRAY)
+
+/**
+ * Calls this expression from arguments.
+ *
+ * @param pairs the pairs of arguments to values.
+ * @return a value.
+ */
+@UnstableKMathAPI
+public operator fun IntExpression.invoke(vararg arguments: Int): Int = this(arguments)
+
+private val EMPTY_LONG_ARRAY = LongArray(0)
+
+/**
+ * Calls this expression without providing any arguments.
+ *
+ * @return a value.
+ */
+@UnstableKMathAPI
+public operator fun LongExpression.invoke(): Long = this(EMPTY_LONG_ARRAY)
+
+/**
+ * Calls this expression from arguments.
+ *
+ * @param pairs the pairs of arguments to values.
+ * @return a value.
+ */
+@UnstableKMathAPI
+public operator fun LongExpression.invoke(vararg arguments: Long): Long = this(arguments)
 
 /**
  * A context for expression construction
diff --git a/kmath-kotlingrad/build.gradle.kts b/kmath-kotlingrad/build.gradle.kts
index d222ed7d6..da7380e41 100644
--- a/kmath-kotlingrad/build.gradle.kts
+++ b/kmath-kotlingrad/build.gradle.kts
@@ -3,6 +3,11 @@ plugins {
     id("ru.mipt.npm.gradle.common")
 }
 
+kotlin.sourceSets
+    .filter { it.name.contains("test", true) }
+    .map(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::languageSettings)
+    .forEach { it.optIn("space.kscience.kmath.misc.UnstableKMathAPI") }
+
 description = "Kotlin∇ integration module"
 
 dependencies {
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
index 6e7eb039d..63db1c56f 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
@@ -145,7 +145,7 @@ internal object InternalGamma {
             }
 
             when {
-                n >= maxIterations -> throw error("Maximal iterations is exceeded $maxIterations")
+                n >= maxIterations -> error("Maximal iterations is exceeded $maxIterations")
                 sum.isInfinite() -> 1.0
                 else -> exp(-x + a * ln(x) - logGamma(a)) * sum
             }
-- 
2.34.1


From cf5f886226a334897cd2ea04baee0861e4f08eca Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Mon, 29 Nov 2021 13:24:44 +0700
Subject: [PATCH 392/713] Rewrite the ArithmeticsEvaluator.number rule to
 handle well both floating-point numbers and integers

---
 .../kotlin/space/kscience/kmath/ast/parser.kt | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
index 6ebd0eff6..012a6e65f 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
@@ -22,6 +22,7 @@ import space.kscience.kmath.operations.FieldOps
 import space.kscience.kmath.operations.GroupOps
 import space.kscience.kmath.operations.PowerOperations
 import space.kscience.kmath.operations.RingOps
+import kotlin.math.floor
 
 /**
  * better-parse implementation of grammar defined in the ArithmeticsEvaluator.g4.
@@ -40,9 +41,22 @@ public object ArithmeticsEvaluator : Grammar<MST>() {
     private val div: Token by literalToken("/")
     private val minus: Token by literalToken("-")
     private val plus: Token by literalToken("+")
+
+    @Suppress("unused")
     private val ws: Token by regexToken("\\s+".toRegex(), ignore = true)
 
-    private val number: Parser<MST> by num use { MST.Numeric(text.toDouble()) }
+    // TODO Rewrite as custom parser to handle numbers with better precision. Currently, numbers like 1e10 are handled while they could be stored as longs without precision loss.
+    private val number: Parser<MST> by num use {
+        val d = text.toDoubleOrNull()
+
+        MST.Numeric(
+            if (d == null || d == floor(d) && !d.isInfinite()) {
+                text.toLongOrNull() ?: text.toDouble()
+            } else
+                d
+        )
+    }
+
     private val singular: Parser<MST> by id use { Symbol(text) }
 
     private val unaryFunction: Parser<MST> by (id and -lpar and parser(ArithmeticsEvaluator::subSumChain) and -rpar)
@@ -91,7 +105,8 @@ public object ArithmeticsEvaluator : Grammar<MST>() {
 }
 
 /**
- * Tries to parse the string into [MST] using [ArithmeticsEvaluator]. Returns [ParseResult] representing expression or error.
+ * Tries to parse the string into [MST] using [ArithmeticsEvaluator]. Returns [ParseResult] representing expression or
+ * error.
  *
  * @receiver the string to parse.
  * @return the [MST] node.
-- 
2.34.1


From a9779fe38bfbda750384fb9cea456864d8468ccc Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 7 Dec 2021 12:00:31 +0700
Subject: [PATCH 393/713] Do numeric type conversion in JS MST compilers

---
 .../jsMain/kotlin/space/kscience/kmath/estree/estree.kt    | 7 +++++--
 .../space/kscience/kmath/wasm/internal/WasmBuilder.kt      | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
index 0c15e994c..a6b6e022b 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
@@ -28,11 +28,14 @@ internal fun <T> MST.compileWith(algebra: Algebra<T>): Expression<T> {
                 variable(node.identity)
         }
 
-        is Numeric -> constant(node.value)
+        is Numeric -> constant(
+            (algebra as? NumericAlgebra<T>)?.number(node.value) ?: error("Numeric nodes are not supported by $this")
+        )
 
         is Unary -> when {
             algebra is NumericAlgebra && node.value is Numeric -> constant(
-                algebra.unaryOperationFunction(node.operation)(algebra.number((node.value as Numeric).value)))
+                algebra.unaryOperationFunction(node.operation)(algebra.number((node.value as Numeric).value))
+            )
 
             else -> call(algebra.unaryOperationFunction(node.operation), visit(node.value))
         }
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index 2d6619bba..96090a633 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -114,7 +114,7 @@ internal class DoubleWasmBuilder(target: MST) : WasmBuilder<Double, DoubleExpres
 
     override fun createModule() = readBinary(f64StandardFunctions)
 
-    override fun visitNumeric(node: Numeric) = ctx.f64.const(node.value)
+    override fun visitNumeric(node: Numeric) = ctx.f64.const(node.value.toDouble())
 
     override fun visitUnary(node: Unary): ExpressionRef = when (node.operation) {
         GroupOps.MINUS_OPERATION -> ctx.f64.neg(visit(node.value))
@@ -157,7 +157,7 @@ internal class IntWasmBuilder(target: MST) : WasmBuilder<Int, IntExpression>(i32
         }
     }
 
-    override fun visitNumeric(node: Numeric) = ctx.i32.const(node.value)
+    override fun visitNumeric(node: Numeric) = ctx.i32.const(node.value.toInt())
 
     override fun visitUnary(node: Unary): ExpressionRef = when (node.operation) {
         GroupOps.MINUS_OPERATION -> ctx.i32.sub(ctx.i32.const(0), visit(node.value))
-- 
2.34.1


From e11df4fdd5597e352eb558ea1aaa5071461e931a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 18 Dec 2021 21:57:06 +0300
Subject: [PATCH 394/713] Add inline to histogram builders

---
 .../space/kscience/kmath/histogram/UnivariateHistogram.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
index d5b74fb9b..91d0516c2 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
@@ -42,7 +42,7 @@ public interface UnivariateHistogram : Histogram<Double, UnivariateBin> {
         /**
          * Build and fill a [UnivariateHistogram]. Returns a read-only histogram.
          */
-        public fun uniform(
+        public inline fun uniform(
             binSize: Double,
             start: Double = 0.0,
             builder: UnivariateHistogramBuilder.() -> Unit,
@@ -51,7 +51,7 @@ public interface UnivariateHistogram : Histogram<Double, UnivariateBin> {
         /**
          * Build and fill a histogram with custom borders. Returns a read-only histogram.
          */
-        public fun custom(
+        public inline fun custom(
             borders: DoubleArray,
             builder: UnivariateHistogramBuilder.() -> Unit,
         ): UnivariateHistogram = TreeHistogramSpace.custom(borders).fill(builder)
-- 
2.34.1


From 6255a46004bc628598fc7c1fd2043d6ebc0a1129 Mon Sep 17 00:00:00 2001
From: breandan <bre@ndan.co>
Date: Sat, 25 Dec 2021 12:05:42 -0500
Subject: [PATCH 395/713] =?UTF-8?q?update=20Kotlin=E2=88=87=20and=20remove?=
 =?UTF-8?q?=20old=20maven=20repositories?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 benchmarks/build.gradle.kts                        |  6 ------
 build.gradle.kts                                   |  7 -------
 examples/build.gradle.kts                          |  5 -----
 kmath-kotlingrad/build.gradle.kts                  |  4 ++--
 .../space/kscience/kmath/kotlingrad/KMathNumber.kt |  2 +-
 .../kmath/kotlingrad/KotlingradExpression.kt       |  4 ++--
 .../kscience/kmath/kotlingrad/scalarsAdapters.kt   |  2 +-
 .../kscience/kmath/kotlingrad/AdaptingTests.kt     | 14 +++++++-------
 8 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index cca3d312d..a6355e425 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -14,12 +14,6 @@ sourceSets.register("benchmarks")
 repositories {
     mavenCentral()
     maven("https://repo.kotlin.link")
-    maven("https://clojars.org/repo")
-    maven("https://jitpack.io")
-
-    maven("http://logicrunch.research.it.uu.se/maven") {
-        isAllowInsecureProtocol = true
-    }
 }
 
 kotlin {
diff --git a/build.gradle.kts b/build.gradle.kts
index c2347f7be..cc5a5f5c1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,13 +7,6 @@ plugins {
 
 allprojects {
     repositories {
-        maven("https://clojars.org/repo")
-        maven("https://jitpack.io")
-
-        maven("http://logicrunch.research.it.uu.se/maven") {
-            isAllowInsecureProtocol = true
-        }
-
         maven("https://oss.sonatype.org/content/repositories/snapshots")
         mavenCentral()
     }
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 7b1bce26a..e0e38bad0 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -5,12 +5,7 @@ plugins {
 repositories {
     mavenCentral()
     maven("https://repo.kotlin.link")
-    maven("https://clojars.org/repo")
-    maven("https://jitpack.io")
     maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
-    maven("http://logicrunch.research.it.uu.se/maven") {
-        isAllowInsecureProtocol = true
-    }
 }
 
 dependencies {
diff --git a/kmath-kotlingrad/build.gradle.kts b/kmath-kotlingrad/build.gradle.kts
index d222ed7d6..c10a6af54 100644
--- a/kmath-kotlingrad/build.gradle.kts
+++ b/kmath-kotlingrad/build.gradle.kts
@@ -6,8 +6,8 @@ plugins {
 description = "Kotlin∇ integration module"
 
 dependencies {
-    api("com.github.breandan:kaliningraph:0.1.6")
-    api("com.github.breandan:kotlingrad:0.4.5")
+    api("ai.hypergraph:kaliningraph:0.1.9")
+    api("ai.hypergraph:kotlingrad:0.4.7")
     api(project(":kmath-core"))
     testImplementation(project(":kmath-ast"))
 }
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
index 0f10c6cdd..a61743a1b 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.kotlingrad
 
-import edu.umontreal.kotlingrad.api.SConst
+import ai.hypergraph.kotlingrad.api.SConst
 import space.kscience.kmath.operations.NumericAlgebra
 
 /**
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
index 84171101f..9187f35ae 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.kotlingrad
 
-import edu.umontreal.kotlingrad.api.SFun
-import edu.umontreal.kotlingrad.api.SVar
+import ai.hypergraph.kotlingrad.api.SFun
+import ai.hypergraph.kotlingrad.api.SVar
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.operations.NumericAlgebra
 
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
index 11e5853a8..a0622b6ff 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.kotlingrad
 
-import edu.umontreal.kotlingrad.api.*
+import ai.hypergraph.kotlingrad.api.*
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.MstExtendedField
 import space.kscience.kmath.expressions.MstExtendedField.unaryMinus
diff --git a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
index 67332a680..2937b5e9c 100644
--- a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
+++ b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.kotlingrad
 
-import edu.umontreal.kotlingrad.api.*
+import ai.hypergraph.kotlingrad.api.*
 import space.kscience.kmath.asm.compileToExpression
 import space.kscience.kmath.ast.parseMath
 import space.kscience.kmath.expressions.MstNumericAlgebra
@@ -22,7 +22,7 @@ internal class AdaptingTests {
     fun symbol() {
         assertEquals(x.identity, x.toSVar<KMathNumber<Double, DoubleField>>().name)
         val c2 = "kitten".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
-        if (c2 is SVar) assertTrue(c2.name == "kitten") else fail()
+        if (c2 is SVar<*>) assertTrue(c2.name == "kitten") else fail()
     }
 
     @Test
@@ -30,17 +30,17 @@ internal class AdaptingTests {
         val c1 = MstNumericAlgebra.number(12354324)
         assertTrue(c1.toSConst<DReal>().doubleValue == 12354324.0)
         val c2 = "0.234".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
-        if (c2 is SConst) assertTrue(c2.doubleValue == 0.234) else fail()
+        if (c2 is SConst<*>) assertTrue(c2.doubleValue == 0.234) else fail()
         val c3 = "1e-3".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
-        if (c3 is SConst) assertEquals(0.001, c3.value) else fail()
+        if (c3 is SConst<*>) assertEquals(0.001, c3.value) else fail()
     }
 
     @Test
     fun simpleFunctionShape() {
         val linear = "2*x+16".parseMath().toSFun<KMathNumber<Double, DoubleField>>()
-        if (linear !is Sum) fail()
-        if (linear.left !is Prod) fail()
-        if (linear.right !is SConst) fail()
+        if (linear !is Sum<*>) fail()
+        if (linear.left !is Prod<*>) fail()
+        if (linear.right !is SConst<*>) fail()
     }
 
     @Test
-- 
2.34.1


From 2f96d619fc0a19e222a21b8ef742a6b4e14c4176 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 29 Dec 2021 20:08:26 +0300
Subject: [PATCH 396/713] Fix AST JS test

---
 .../kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
index 859e56032..93ef97b0f 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
@@ -19,8 +19,8 @@ import kotlin.test.assertFailsWith
 internal class TestCompilerVariables {
     @Test
     fun testNoVariables() = runCompilerTest {
-        val expr = "0".parseMath().compileToExpression(IntRing)
-        assertEquals(0, expr())
+        val expr = "0".parseMath().compileToExpression(DoubleField)
+        assertEquals(0.0, expr(), 0.0001)
     }
 
     @Test
-- 
2.34.1


From 479d10616523af705219c899071810af4f921571 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 30 Dec 2021 18:50:47 +0300
Subject: [PATCH 397/713] install Kover plugin

---
 build.gradle.kts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 36bc3a73f..1da8f5d64 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,6 @@
-import java.net.URL
-
 plugins {
     id("ru.mipt.npm.gradle.project")
-    kotlin("jupyter.api") apply false
+    id("org.jetbrains.kotlinx.kover") version "0.5.0-RC"
 }
 
 allprojects {
@@ -32,7 +30,7 @@ subprojects {
                     localDirectory.set(kotlinDir)
 
                     remoteUrl.set(
-                        URL("https://github.com/mipt-npm/kmath/tree/master/${this@subprojects.name}/$kotlinDirPath")
+                        java.net.URL("https://github.com/mipt-npm/kmath/tree/master/${this@subprojects.name}/$kotlinDirPath")
                     )
                 }
 
-- 
2.34.1


From dd8a4796f6494dbe99ec180b722610dd7f309e2a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 4 Jan 2022 13:15:50 +0300
Subject: [PATCH 398/713] Update gradle plugin and build consistency

---
 build.gradle.kts                              |  2 +-
 buildSrc/build.gradle.kts                     | 20 ++++++++++++----
 buildSrc/gradle.properties                    | 14 +++++++++++
 buildSrc/settings.gradle.kts                  | 24 +++++++++++++++++++
 .../benchmarks/addBenchmarkProperties.kt      | 13 ++++++----
 .../kscience/kmath/stat/DistributionDemo.kt   |  6 ++---
 gradle.properties                             |  6 ++---
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../space/kscience/kmath/chains/Chain.kt      | 15 +++++++-----
 .../space/kscience/kmath/stat/Sampler.kt      |  9 ++++---
 .../kscience/kmath/viktor/ViktorFieldOpsND.kt |  2 +-
 settings.gradle.kts                           | 23 ++++++++++--------
 12 files changed, 97 insertions(+), 39 deletions(-)
 create mode 100644 buildSrc/gradle.properties
 create mode 100644 buildSrc/settings.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 1da8f5d64..b0797d397 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -55,7 +55,7 @@ subprojects {
 readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md")
 
 ksciencePublish {
-    github("kmath", publish = false)
+    github("kmath")
     space()
     sonatype()
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 072309332..a7bf5c326 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,20 +1,30 @@
 plugins {
     `kotlin-dsl`
-    kotlin("plugin.serialization") version "1.5.21"
+    `version-catalog`
+    alias(npmlibs.plugins.kotlin.plugin.serialization)
 }
 
+java.targetCompatibility = JavaVersion.VERSION_11
+
 repositories {
     maven("https://repo.kotlin.link")
     mavenCentral()
     gradlePluginPortal()
 }
 
+val toolsVersion: String by extra
+val kotlinVersion = npmlibs.versions.kotlin.asProvider().get()
+val benchmarksVersion = npmlibs.versions.kotlinx.benchmark.get()
+
 dependencies {
-    api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2")
-    api("ru.mipt.npm:gradle-tools:0.10.7")
-    api("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.3.1")
+    api("ru.mipt.npm:gradle-tools:$toolsVersion")
+    //plugins form benchmarks
+    api("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:$benchmarksVersion")
+    api("org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion")
+    //to be used inside build-script only
+    implementation(npmlibs.kotlinx.serialization.json)
 }
 
 kotlin.sourceSets.all {
-    languageSettings.useExperimentalAnnotation("kotlin.ExperimentalStdlibApi")
+    languageSettings.optIn("kotlin.OptIn")
 }
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
new file mode 100644
index 000000000..6678f24a8
--- /dev/null
+++ b/buildSrc/gradle.properties
@@ -0,0 +1,14 @@
+#
+# Copyright 2018-2021 KMath contributors.
+# Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+#
+
+kotlin.code.style=official
+kotlin.mpp.stability.nowarn=true
+
+kotlin.jupyter.add.scanner=false
+
+org.gradle.configureondemand=true
+org.gradle.parallel=true
+
+toolsVersion=0.10.9-kotlin-1.6.10
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
new file mode 100644
index 000000000..87ff205f6
--- /dev/null
+++ b/buildSrc/settings.gradle.kts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+enableFeaturePreview("VERSION_CATALOGS")
+
+dependencyResolutionManagement {
+
+    val toolsVersion: String by extra
+
+    repositories {
+        maven("https://repo.kotlin.link")
+        mavenCentral()
+    }
+
+    versionCatalogs {
+        create("npmlibs") {
+            from("ru.mipt.npm:version-catalog:$toolsVersion")
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
index ca1c330a1..dc9327348 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
@@ -6,12 +6,15 @@
 package space.kscience.kmath.benchmarks
 
 import kotlinx.benchmark.gradle.BenchmarksExtension
-import kotlinx.serialization.*
-import kotlinx.serialization.json.*
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
 import org.gradle.api.Project
 import ru.mipt.npm.gradle.KScienceReadmeExtension
-import java.time.*
-import java.time.format.*
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeFormatterBuilder
+import java.time.format.SignStyle
 import java.time.temporal.ChronoField.*
 
 private val ISO_DATE_TIME: DateTimeFormatter = DateTimeFormatterBuilder().run {
@@ -47,7 +50,7 @@ fun Project.addBenchmarkProperties() {
     rootProject.subprojects.forEach { p ->
         p.extensions.findByType(KScienceReadmeExtension::class.java)?.run {
             benchmarksProject.extensions.findByType(BenchmarksExtension::class.java)?.configurations?.forEach { cfg ->
-                property("benchmark${cfg.name.replaceFirstChar(Char::uppercase)}") {
+                property("benchmark${cfg.name.capitalize()}") {
                     val launches = benchmarksProject.buildDir.resolve("reports/benchmarks/${cfg.name}")
 
                     val resDirectory = launches.listFiles()?.maxByOrNull {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
index bde83cea9..15654971f 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.stat
 
 import kotlinx.coroutines.runBlocking
 import space.kscience.kmath.chains.Chain
-import space.kscience.kmath.chains.collectWithState
+import space.kscience.kmath.chains.combineWithState
 import space.kscience.kmath.distributions.NormalDistribution
 
 private data class AveragingChainState(var num: Int = 0, var value: Double = 0.0)
@@ -15,11 +15,11 @@ private data class AveragingChainState(var num: Int = 0, var value: Double = 0.0
 /**
  * Averaging.
  */
-private fun Chain<Double>.mean(): Chain<Double> = collectWithState(AveragingChainState(), { it.copy() }) { chain ->
+private fun Chain<Double>.mean(): Chain<Double> = combineWithState(AveragingChainState(), { it.copy() }) { chain ->
     val next = chain.next()
     num++
     value += next
-    return@collectWithState value / num
+    return@combineWithState value / num
 }
 
 
diff --git a/gradle.properties b/gradle.properties
index 959511c68..6678f24a8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,11 +6,9 @@
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
 
-#kotlin.mpp.enableGranularSourceSetsMetadata=true
-#kotlin.native.enableDependencyPropagation=false
-
 kotlin.jupyter.add.scanner=false
 
 org.gradle.configureondemand=true
-org.gradle.jvmargs=-XX:MaxMetaspaceSize=2G
 org.gradle.parallel=true
+
+toolsVersion=0.10.9-kotlin-1.6.10
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a254..2e6e5897b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
index f8d2549e5..994255e38 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import space.kscience.kmath.misc.UnstableKMathAPI
 
 /**
  * A not-necessary-Markov chain of some type
@@ -124,20 +125,22 @@ public fun <T> Chain<T>.filter(block: (T) -> Boolean): Chain<T> = object : Chain
 /**
  * Map the whole chain
  */
-public fun <T, R> Chain<T>.collect(mapper: suspend (Chain<T>) -> R): Chain<R> = object : Chain<R> {
-    override suspend fun next(): R = mapper(this@collect)
-    override suspend fun fork(): Chain<R> = this@collect.fork().collect(mapper)
+@UnstableKMathAPI
+public fun <T, R> Chain<T>.combine(mapper: suspend (Chain<T>) -> R): Chain<R> = object : Chain<R> {
+    override suspend fun next(): R = mapper(this@combine)
+    override suspend fun fork(): Chain<R> = this@combine.fork().combine(mapper)
 }
 
-public fun <T, S, R> Chain<T>.collectWithState(
+@UnstableKMathAPI
+public fun <T, S, R> Chain<T>.combineWithState(
     state: S,
     stateFork: (S) -> S,
     mapper: suspend S.(Chain<T>) -> R,
 ): Chain<R> = object : Chain<R> {
-    override suspend fun next(): R = state.mapper(this@collectWithState)
+    override suspend fun next(): R = state.mapper(this@combineWithState)
 
     override suspend fun fork(): Chain<R> =
-        this@collectWithState.fork().collectWithState(stateFork(state), stateFork, mapper)
+        this@combineWithState.fork().combineWithState(stateFork(state), stateFork, mapper)
 }
 
 /**
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
index 4c11fdd65..0dd121f3b 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
@@ -7,8 +7,11 @@ package space.kscience.kmath.stat
 
 import kotlinx.coroutines.flow.first
 import space.kscience.kmath.chains.Chain
-import space.kscience.kmath.chains.collect
-import space.kscience.kmath.structures.*
+import space.kscience.kmath.chains.combine
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.BufferFactory
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.IntBuffer
 import kotlin.jvm.JvmName
 
 /**
@@ -36,7 +39,7 @@ public fun <T : Any> Sampler<T>.sampleBuffer(
     //creating temporary storage once
     val tmp = ArrayList<T>(size)
 
-    return sample(generator).collect { chain ->
+    return sample(generator).combine { chain ->
         //clear list from previous run
         tmp.clear()
         //Fill list
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
index ef7702014..dc0f1f97c 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
@@ -14,7 +14,7 @@ import space.kscience.kmath.operations.ExtendedFieldOps
 import space.kscience.kmath.operations.NumbersAddOps
 import space.kscience.kmath.operations.PowerOperations
 
-@OptIn(UnstableKMathAPI::class)
+@OptIn(UnstableKMathAPI::class, PerformancePitfall::class)
 @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public open class ViktorFieldOpsND :
     FieldOpsND<Double, DoubleField>,
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 343e937e1..7108b0cb4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,21 +1,24 @@
-pluginManagement {
+rootProject.name = "kmath"
+
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+enableFeaturePreview("VERSION_CATALOGS")
+
+dependencyResolutionManagement {
+
+    val toolsVersion: String by extra
+
     repositories {
         maven("https://repo.kotlin.link")
         mavenCentral()
-        gradlePluginPortal()
     }
 
-    val kotlinVersion = "1.6.0"
-
-    plugins {
-        id("org.jetbrains.kotlinx.benchmark") version "0.3.1"
-        kotlin("multiplatform") version kotlinVersion
-        kotlin("plugin.allopen") version kotlinVersion
+    versionCatalogs {
+        create("npmlibs") {
+            from("ru.mipt.npm:version-catalog:$toolsVersion")
+        }
     }
 }
 
-rootProject.name = "kmath"
-
 include(
     ":kmath-memory",
     ":kmath-complex",
-- 
2.34.1


From 91d93b3bb2e319b66f1011ded39ad089bedf4fe5 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 4 Jan 2022 19:45:24 +0300
Subject: [PATCH 399/713] restore metaspace

---
 build.gradle.kts  | 2 +-
 gradle.properties | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b0797d397..1b2d9d7c0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ allprojects {
 subprojects {
     if (name.startsWith("kmath")) apply<MavenPublishPlugin>()
 
-    afterEvaluate {
+    plugins.withId("org.jetbrains.dokka"){
         tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial> {
             dependsOn(tasks["assemble"])
 
diff --git a/gradle.properties b/gradle.properties
index 6678f24a8..130d294a2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,5 +10,6 @@ kotlin.jupyter.add.scanner=false
 
 org.gradle.configureondemand=true
 org.gradle.parallel=true
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
 
 toolsVersion=0.10.9-kotlin-1.6.10
-- 
2.34.1


From d10815020da286b3400c8e9d19846e900423a759 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 25 Jan 2022 23:02:35 +0700
Subject: [PATCH 400/713] JS benchmarking

---
 benchmarks/build.gradle.kts                   |   24 +-
 .../ExpressionsInterpretersBenchmark.kt       |  105 +
 buildSrc/build.gradle.kts                     |    2 +-
 .../kscience/kmath/ast/TestExecutionTime.kt   |  114 -
 kotlin-js-store/yarn.lock                     | 2059 +++++++++++++++++
 5 files changed, 2183 insertions(+), 121 deletions(-)
 create mode 100644 benchmarks/src/jsMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
 delete mode 100644 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
 create mode 100644 kotlin-js-store/yarn.lock

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index aa3d31247..3dc221bae 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -13,13 +13,22 @@ sourceSets.register("benchmarks")
 
 repositories {
     mavenCentral()
-    maven("https://repo.kotlin.link")
 }
 
 kotlin {
     jvm()
 
+    js(IR) {
+        nodejs()
+    }
+
     sourceSets {
+        all {
+            languageSettings {
+                progressiveMode = true
+            }
+        }
+
         val commonMain by getting {
             dependencies {
                 implementation(project(":kmath-ast"))
@@ -29,9 +38,8 @@ kotlin {
                 implementation(project(":kmath-stat"))
                 implementation(project(":kmath-dimensions"))
                 implementation(project(":kmath-for-real"))
-                implementation(project(":kmath-jafama"))
                 implementation(project(":kmath-tensors"))
-                implementation("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:0.3.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:0.4.2")
             }
         }
 
@@ -42,6 +50,7 @@ kotlin {
                 implementation(project(":kmath-nd4j"))
                 implementation(project(":kmath-kotlingrad"))
                 implementation(project(":kmath-viktor"))
+                implementation(project(":kmath-jafama"))
                 implementation(project(":kmath-multik"))
                 implementation("org.nd4j:nd4j-native:1.0.0-M1")
                 //    uncomment if your system supports AVX2
@@ -63,6 +72,7 @@ benchmark {
     // Setup configurations
     targets {
         register("jvm")
+        register("js")
     }
 
     fun kotlinx.benchmark.gradle.BenchmarkConfiguration.commonConfiguration() {
@@ -88,7 +98,11 @@ benchmark {
     }
 
     configurations.register("expressions") {
-        commonConfiguration()
+        // Some extra precision
+        warmups = 2
+        iterations = 10
+        iterationTime = 2000
+        iterationTimeUnit = "ms"
         include("ExpressionsInterpretersBenchmark")
     }
 
@@ -125,7 +139,6 @@ afterEvaluate {
     }
 }
 
-
 kotlin.sourceSets.all {
     with(languageSettings) {
         optIn("kotlin.contracts.ExperimentalContracts")
@@ -141,7 +154,6 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     }
 }
 
-
 readme {
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
 }
diff --git a/benchmarks/src/jsMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jsMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
new file mode 100644
index 000000000..126a2e648
--- /dev/null
+++ b/benchmarks/src/jsMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.benchmarks
+
+import kotlinx.benchmark.Benchmark
+import kotlinx.benchmark.Blackhole
+import kotlinx.benchmark.Scope
+import kotlinx.benchmark.State
+import space.kscience.kmath.expressions.*
+import space.kscience.kmath.operations.Algebra
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.bindSymbol
+import space.kscience.kmath.operations.invoke
+import kotlin.math.sin
+import kotlin.random.Random
+import space.kscience.kmath.estree.compileToExpression as estreeCompileToExpression
+import space.kscience.kmath.wasm.compileToExpression as wasmCompileToExpression
+
+@State(Scope.Benchmark)
+class ExpressionsInterpretersBenchmark {
+    /**
+     * Benchmark case for [Expression] created with [expressionInExtendedField].
+     */
+    @Benchmark
+    fun functionalExpression(blackhole: Blackhole) = invokeAndSum(functional, blackhole)
+
+    /**
+     * Benchmark case for [Expression] created with [toExpression].
+     */
+    @Benchmark
+    fun mstExpression(blackhole: Blackhole) = invokeAndSum(mst, blackhole)
+
+    /**
+     * Benchmark case for [Expression] created with [compileToExpression].
+     */
+    @Benchmark
+    fun wasmExpression(blackhole: Blackhole) = invokeAndSum(wasm, blackhole)
+
+    /**
+     * Benchmark case for [Expression] created with [compileToExpression].
+     */
+    @Benchmark
+    fun estreeExpression(blackhole: Blackhole) = invokeAndSum(estree, blackhole)
+
+    /**
+     * Benchmark case for [Expression] implemented manually with `kotlin.math` functions.
+     */
+    @Benchmark
+    fun rawExpression(blackhole: Blackhole) = invokeAndSum(raw, blackhole)
+
+    /**
+     * Benchmark case for direct computation w/o [Expression].
+     */
+    @Benchmark
+    fun justCalculate(blackhole: Blackhole) {
+        val random = Random(0)
+        var sum = 0.0
+
+        repeat(times) {
+            val x = random.nextDouble()
+            sum += x * 2.0 + 2.0 / x - 16.0 / sin(x)
+        }
+
+        blackhole.consume(sum)
+    }
+
+    private fun invokeAndSum(expr: Expression<Double>, blackhole: Blackhole) {
+        val random = Random(0)
+        var sum = 0.0
+        val m = HashMap<Symbol, Double>()
+
+        repeat(times) {
+            m[x] = random.nextDouble()
+            sum += expr(m)
+        }
+
+        blackhole.consume(sum)
+    }
+
+    private companion object {
+        private val x by symbol
+        private const val times = 1_000_000
+
+        private val functional = DoubleField.expression {
+            val x = bindSymbol(Symbol.x)
+            x * number(2.0) + 2.0 / x - 16.0 / sin(x)
+        }
+
+        private val node = MstExtendedField {
+            x * 2.0 + number(2.0) / x - number(16.0) / sin(x)
+        }
+
+        private val mst = node.toExpression(DoubleField)
+        private val wasm = node.wasmCompileToExpression(DoubleField)
+        private val estree = node.estreeCompileToExpression(DoubleField)
+
+        private val raw = Expression<Double> { args ->
+            val x = args[x]!!
+            x * 2.0 + 2.0 / x - 16.0 / sin(x)
+        }
+    }
+}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index a7bf5c326..ceb220bd5 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -14,7 +14,7 @@ repositories {
 
 val toolsVersion: String by extra
 val kotlinVersion = npmlibs.versions.kotlin.asProvider().get()
-val benchmarksVersion = npmlibs.versions.kotlinx.benchmark.get()
+val benchmarksVersion = "0.4.2"
 
 dependencies {
     api("ru.mipt.npm:gradle-tools:$toolsVersion")
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
deleted file mode 100644
index 8cfa3a87e..000000000
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/TestExecutionTime.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.ast
-
-import space.kscience.kmath.expressions.*
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.bindSymbol
-import space.kscience.kmath.operations.invoke
-import kotlin.math.sin
-import kotlin.random.Random
-import kotlin.test.Ignore
-import kotlin.test.Test
-import kotlin.time.measureTime
-import space.kscience.kmath.estree.compileToExpression as estreeCompileToExpression
-import space.kscience.kmath.wasm.compileToExpression as wasmCompileToExpression
-
-// TODO move to benchmarks when https://github.com/Kotlin/kotlinx-benchmark/pull/38 or similar feature is merged
-@Ignore
-internal class TestExecutionTime {
-    private companion object {
-        private const val times = 1_000_000
-        private val x by symbol
-        private val algebra = DoubleField
-
-        private val functional = algebra.expressionInExtendedField {
-            bindSymbol(x) * const(2.0) + const(2.0) / bindSymbol(x) - const(16.0) / sin(bindSymbol(x))
-        }
-
-        private val node = MstExtendedField {
-            x * number(2.0) + number(2.0) / x - number(16.0) / sin(x)
-        }
-
-        private val mst = node.toExpression(algebra)
-        private val wasm = node.wasmCompileToExpression(algebra)
-        private val estree = node.estreeCompileToExpression(algebra)
-
-        // In JavaScript, the expression below is implemented like
-        //   _no_name_provided__125.prototype.invoke_178 = function (args) {
-        //    var tmp = getValue(args, raw$_get_x__3(this._$x$delegate_2)) * 2.0 + 2.0 / getValue(args, raw$_get_x__3(this._$x$delegate_2));
-        //    var tmp0_sin_0_5 = getValue(args, raw$_get_x__3(this._$x$delegate_2));
-        //    return tmp - 16.0 / Math.sin(tmp0_sin_0_5);
-        //  };
-
-        private val raw = Expression<Double> { args ->
-            val x = args[x]!!
-            algebra { x * 2.0 + 2.0 / x - 16.0 / sin(x) }
-        }
-
-        private val justCalculate = { args: dynamic ->
-            val x = args[x].unsafeCast<Double>()
-            x * 2.0 + 2.0 / x - 16.0 / sin(x)
-        }
-    }
-
-    private fun invokeAndSum(name: String, expr: Expression<Double>) {
-        println(name)
-        val rng = Random(0)
-        var sum = 0.0
-        measureTime {
-            repeat(times) { sum += expr(x to rng.nextDouble()) }
-        }.also(::println)
-    }
-
-    /**
-     * [Expression] created with [expressionInExtendedField].
-     */
-    @Test
-    fun functionalExpression() = invokeAndSum("functional", functional)
-
-    /**
-     * [Expression] created with [mstExpression].
-     */
-    @Test
-    fun mstExpression() = invokeAndSum("mst", mst)
-
-    /**
-     * [Expression] created with [wasmCompileToExpression].
-     */
-    @Test
-    fun wasmExpression() = invokeAndSum("wasm", wasm)
-
-    /**
-     * [Expression] created with [estreeCompileToExpression].
-     */
-    @Test
-    fun estreeExpression() = invokeAndSum("estree", wasm)
-
-    /**
-     * [Expression] implemented manually with `kotlin.math`.
-     */
-    @Test
-    fun rawExpression() = invokeAndSum("raw", raw)
-
-    /**
-     * Direct computation w/o [Expression].
-     */
-    @Test
-    fun justCalculateExpression() {
-        println("justCalculate")
-        val rng = Random(0)
-        var sum = 0.0
-        measureTime {
-            repeat(times) {
-                val arg = rng.nextDouble()
-                val o = js("{}")
-                o["x"] = arg
-                sum += justCalculate(o)
-            }
-        }.also(::println)
-    }
-}
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
new file mode 100644
index 000000000..e21abe604
--- /dev/null
+++ b/kotlin-js-store/yarn.lock
@@ -0,0 +1,2059 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@discoveryjs/json-ext@^0.5.0":
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f"
+  integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==
+
+"@types/component-emitter@^1.2.10":
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506"
+  integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==
+
+"@types/cookie@^0.4.0":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
+  integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
+
+"@types/cors@^2.8.8":
+  version "2.8.12"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
+  integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
+
+"@types/eslint-scope@^3.7.0":
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
+  integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==
+  dependencies:
+    "@types/eslint" "*"
+    "@types/estree" "*"
+
+"@types/eslint@*":
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304"
+  integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/estree@*", "@types/estree@^0.0.50":
+  version "0.0.50"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
+  integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
+
+"@types/json-schema@*", "@types/json-schema@^7.0.8":
+  version "7.0.9"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
+  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
+
+"@types/node@*", "@types/node@>=10.0.0":
+  version "17.0.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.12.tgz#f7aa331b27f08244888c47b7df126184bc2339c5"
+  integrity sha512-4YpbAsnJXWYK/fpTVFlMIcUIho2AYCi4wg5aNPrG1ng7fn/1/RZfCIpRCiBX+12RVa34RluilnvCqD+g3KiSiA==
+
+"@ungap/promise-all-settled@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
+  integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
+
+"@webassemblyjs/ast@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
+  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+  dependencies:
+    "@webassemblyjs/helper-numbers" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+
+"@webassemblyjs/floating-point-hex-parser@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
+  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
+
+"@webassemblyjs/helper-api-error@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
+  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
+
+"@webassemblyjs/helper-buffer@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
+  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
+
+"@webassemblyjs/helper-numbers@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
+  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
+  dependencies:
+    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
+    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/helper-wasm-bytecode@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
+  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
+
+"@webassemblyjs/helper-wasm-section@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
+  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+
+"@webassemblyjs/ieee754@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
+  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
+  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
+  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
+
+"@webassemblyjs/wasm-edit@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
+  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/helper-wasm-section" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/wasm-opt" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@webassemblyjs/wast-printer" "1.11.1"
+
+"@webassemblyjs/wasm-gen@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
+  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/ieee754" "1.11.1"
+    "@webassemblyjs/leb128" "1.11.1"
+    "@webassemblyjs/utf8" "1.11.1"
+
+"@webassemblyjs/wasm-opt@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
+  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+
+"@webassemblyjs/wasm-parser@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
+  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/ieee754" "1.11.1"
+    "@webassemblyjs/leb128" "1.11.1"
+    "@webassemblyjs/utf8" "1.11.1"
+
+"@webassemblyjs/wast-printer@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
+  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@xtuc/long" "4.2.2"
+
+"@webpack-cli/configtest@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356"
+  integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==
+
+"@webpack-cli/info@^1.4.0":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea"
+  integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==
+  dependencies:
+    envinfo "^7.7.3"
+
+"@webpack-cli/serve@^1.6.0":
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe"
+  integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
+abab@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+
+accepts@~1.3.4:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
+acorn-import-assertions@^1.7.6:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
+  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+
+acorn@^8.4.1:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
+  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+
+ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
+ajv@^6.12.5:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ansi-colors@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+astring@1.7.5:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/astring/-/astring-1.7.5.tgz#a7d47fceaf32b052d33a3d07c511efeec67447ca"
+  integrity sha512-lobf6RWXb8c4uZ7Mdq0U12efYmpD1UFnyOWVJPTa3ukqZrMopav+2hdNu0hgBF0JIBFK9QgrBDfwYvh3DFJDAA==
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+base64-arraybuffer@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
+  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
+
+base64id@2.0.0, base64id@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+  integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
+
+benchmark@*:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629"
+  integrity sha1-CfPeMckWQl1JjMLuVloOvzwqVik=
+  dependencies:
+    lodash "^4.17.4"
+    platform "^1.3.3"
+
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
+binaryen@101.0.0:
+  version "101.0.0"
+  resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-101.0.0.tgz#42a9e4cc7a22e2c1d75a31d28005a9b518b2c555"
+  integrity sha512-FRmVxvrR8jtcf0qcukNAPZDM3dZ2sc9GmA/hKxBI7k3fFzREKh1cAs+ruQi+ITTKz7u/AuFMuVnbJwTh0ef/HQ==
+
+body-parser@^1.19.0:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4"
+  integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==
+  dependencies:
+    bytes "3.1.1"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.8.1"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.9.6"
+    raw-body "2.4.2"
+    type-is "~1.6.18"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^3.0.2, braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
+
+browserslist@^4.14.5:
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
+  integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
+  dependencies:
+    caniuse-lite "^1.0.30001286"
+    electron-to-chromium "^1.4.17"
+    escalade "^3.1.1"
+    node-releases "^2.0.1"
+    picocolors "^1.0.0"
+
+buffer-from@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+
+bytes@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a"
+  integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==
+
+camelcase@^6.0.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
+
+caniuse-lite@^1.0.30001286:
+  version "1.0.30001301"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001301.tgz#ebc9086026534cab0dab99425d9c3b4425e5f450"
+  integrity sha512-csfD/GpHMqgEL3V3uIgosvh+SVIQvCh43SNu9HRbP1lnxkKm1kjDG4f32PP571JplkLjfS+mg2p1gxR7MYrrIA==
+
+chalk@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chokidar@3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
+  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+chokidar@^3.5.1:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+chrome-trace-event@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
+
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
+clone-deep@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
+  dependencies:
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.2"
+    shallow-clone "^3.0.0"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+colorette@^2.0.14:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
+  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
+
+colors@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
+commander@^2.20.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
+component-emitter@~1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+connect@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
+  dependencies:
+    debug "2.6.9"
+    finalhandler "1.1.2"
+    parseurl "~1.3.3"
+    utils-merge "1.0.1"
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+
+cookie@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
+  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
+
+cors@~2.8.5:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
+cross-spawn@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+css-loader@6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.3.0.tgz#334d3500ff0a0c14cfbd4b0670088dbb5b5c1530"
+  integrity sha512-9NGvHOR+L6ps13Ilw/b216++Q8q+5RpJcVufCdW9S/9iCzs4KBDNa8qnA/n3FK/sSfWmH35PAIK/cfPi7LOSUg==
+  dependencies:
+    icss-utils "^5.1.0"
+    postcss "^8.2.15"
+    postcss-modules-extract-imports "^3.0.0"
+    postcss-modules-local-by-default "^4.0.0"
+    postcss-modules-scope "^3.0.0"
+    postcss-modules-values "^4.0.0"
+    postcss-value-parser "^4.1.0"
+    semver "^7.3.5"
+
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
+custom-event@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
+  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
+
+date-format@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.3.tgz#f63de5dc08dc02efd8ef32bf2a6918e486f35873"
+  integrity sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==
+
+debug@2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
+debug@^4.1.1, debug@^4.3.3, debug@~4.3.1:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+  dependencies:
+    ms "2.1.2"
+
+decamelize@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
+  integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
+
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+di@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
+  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
+
+diff@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
+  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+
+dom-serialize@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
+  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
+  dependencies:
+    custom-event "~1.0.0"
+    ent "~2.2.0"
+    extend "^3.0.0"
+    void-elements "^2.0.0"
+
+dukat@0.5.8-rc.4:
+  version "0.5.8-rc.4"
+  resolved "https://registry.yarnpkg.com/dukat/-/dukat-0.5.8-rc.4.tgz#90384dcb50b14c26f0e99dae92b2dea44f5fce21"
+  integrity sha512-ZnMt6DGBjlVgK2uQamXfd7uP/AxH7RqI0BL9GLrrJb2gKdDxvJChWy+M9AQEaL+7/6TmxzJxFOsRiInY9oGWTA==
+  dependencies:
+    google-protobuf "3.12.2"
+    typescript "3.9.5"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+electron-to-chromium@^1.4.17:
+  version "1.4.52"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.52.tgz#ce44c6d6cc449e7688a4356b8c261cfeafa26833"
+  integrity sha512-JGkh8HEh5PnVrhU4HbpyyO0O791dVY6k7AdqfDeqbcRMeoGxtNHWT77deR2nhvbLe4dKpxjlDEvdEwrvRLGu2Q==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+engine.io-parser@~4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.3.tgz#83d3a17acfd4226f19e721bb22a1ee8f7662d2f6"
+  integrity sha512-xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA==
+  dependencies:
+    base64-arraybuffer "0.1.4"
+
+engine.io@~4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.1.2.tgz#f96ceb56d4b39cc7ca5bd29a20e9c99c1ad1a765"
+  integrity sha512-t5z6zjXuVLhXDMiFJPYsPOWEER8B0tIsD3ETgw19S1yg9zryvUfY3Vhtk3Gf4sihw/bQGIqQ//gjvVlu+Ca0bQ==
+  dependencies:
+    accepts "~1.3.4"
+    base64id "2.0.0"
+    cookie "~0.4.1"
+    cors "~2.8.5"
+    debug "~4.3.1"
+    engine.io-parser "~4.0.0"
+    ws "~7.4.2"
+
+enhanced-resolve@^5.8.3:
+  version "5.8.3"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0"
+  integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
+ent@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
+
+envinfo@^7.7.3:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
+  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
+
+es-module-lexer@^0.9.0:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
+  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+escape-string-regexp@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+eslint-scope@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+eventemitter3@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+
+events@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
+
+execa@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
+
+extend@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fastest-levenshtein@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
+  integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+finalhandler@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
+find-up@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+find-up@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
+
+flatted@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2"
+  integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==
+
+follow-redirects@^1.0.0:
+  version "1.14.7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
+  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+
+format-util@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271"
+  integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==
+
+fs-extra@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
+  integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-stream@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob-to-regexp@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
+  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
+
+glob@7.1.7:
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.1.3, glob@^7.1.7:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+google-protobuf@3.12.2:
+  version "3.12.2"
+  resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.12.2.tgz#50ce9f9b6281235724eb243d6a83e969a2176e53"
+  integrity sha512-4CZhpuRr1d6HjlyrxoXoocoGFnRYgKULgMtikMddA9ztRyYR59Aondv2FioyxWVamRo0rF2XpYawkTCBEQOSkA==
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
+  version "4.2.9"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
+  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
+
+growl@1.10.5:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+he@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
+http-errors@1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
+  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.1"
+
+http-proxy@^1.18.1:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+
+iconv-lite@0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+iconv-lite@^0.6.2:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
+icss-utils@^5.0.0, icss-utils@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
+  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
+
+import-local@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
+  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
+  dependencies:
+    pkg-dir "^4.2.0"
+    resolve-cwd "^3.0.0"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+interpret@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
+  integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
+
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-core-module@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
+  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
+  dependencies:
+    has "^1.0.3"
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-plain-obj@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
+is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
+isbinaryfile@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf"
+  integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+jest-worker@^27.4.1:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.6.tgz#5d2d93db419566cb680752ca0792780e71b3273e"
+  integrity sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
+js-base64@3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.6.1.tgz#555aae398b74694b4037af1f8a5a6209d170efbe"
+  integrity sha512-Frdq2+tRRGLQUIQOgsIGSCd1VePCS2fsddTG5dTCqR0JHgltXWfsxnY0gIXPoMeRmdom6Oyq+UMOFg5suduOjQ==
+
+js-yaml@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+json-parse-better-errors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+karma-chrome-launcher@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz#805a586799a4d05f4e54f72a204979f3f3066738"
+  integrity sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==
+  dependencies:
+    which "^1.2.1"
+
+karma-mocha@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/karma-mocha/-/karma-mocha-2.0.1.tgz#4b0254a18dfee71bdbe6188d9a6861bf86b0cd7d"
+  integrity sha512-Tzd5HBjm8his2OA4bouAsATYEpZrp9vC7z5E5j4C5Of5Rrs1jY67RAwXNcVmd/Bnk1wgvQRou0zGVLey44G4tQ==
+  dependencies:
+    minimist "^1.2.3"
+
+karma-sourcemap-loader@0.3.8:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz#d4bae72fb7a8397328a62b75013d2df937bdcf9c"
+  integrity sha512-zorxyAakYZuBcHRJE+vbrK2o2JXLFWK8VVjiT/6P+ltLBUGUvqTEkUiQ119MGdOrK7mrmxXHZF1/pfT6GgIZ6g==
+  dependencies:
+    graceful-fs "^4.1.2"
+
+karma-webpack@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-5.0.0.tgz#2a2c7b80163fe7ffd1010f83f5507f95ef39f840"
+  integrity sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA==
+  dependencies:
+    glob "^7.1.3"
+    minimatch "^3.0.4"
+    webpack-merge "^4.1.5"
+
+karma@6.3.4:
+  version "6.3.4"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.4.tgz#359899d3aab3d6b918ea0f57046fd2a6b68565e6"
+  integrity sha512-hbhRogUYIulfkBTZT7xoPrCYhRBnBoqbbL4fszWD0ReFGUxU+LYBr3dwKdAluaDQ/ynT9/7C+Lf7pPNW4gSx4Q==
+  dependencies:
+    body-parser "^1.19.0"
+    braces "^3.0.2"
+    chokidar "^3.5.1"
+    colors "^1.4.0"
+    connect "^3.7.0"
+    di "^0.0.1"
+    dom-serialize "^2.2.1"
+    glob "^7.1.7"
+    graceful-fs "^4.2.6"
+    http-proxy "^1.18.1"
+    isbinaryfile "^4.0.8"
+    lodash "^4.17.21"
+    log4js "^6.3.0"
+    mime "^2.5.2"
+    minimatch "^3.0.4"
+    qjobs "^1.2.0"
+    range-parser "^1.2.1"
+    rimraf "^3.0.2"
+    socket.io "^3.1.0"
+    source-map "^0.6.1"
+    tmp "^0.2.1"
+    ua-parser-js "^0.7.28"
+    yargs "^16.1.1"
+
+kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+loader-runner@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
+  integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
+lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+log-symbols@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+  dependencies:
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
+
+log4js@^6.3.0:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.4.1.tgz#9d3a8bf2c31c1e213fe3fc398a6053f7a2bc53e8"
+  integrity sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==
+  dependencies:
+    date-format "^4.0.3"
+    debug "^4.3.3"
+    flatted "^3.2.4"
+    rfdc "^1.3.0"
+    streamroller "^3.0.2"
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+mime-db@1.51.0:
+  version "1.51.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
+  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
+
+mime-types@^2.1.27, mime-types@~2.1.24:
+  version "2.1.34"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
+  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
+  dependencies:
+    mime-db "1.51.0"
+
+mime@^2.5.2:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
+  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
+
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+minimatch@3.0.4, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.2.3:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+mocha@9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.2.tgz#93f53175b0f0dc4014bd2d612218fccfcf3534d3"
+  integrity sha512-ta3LtJ+63RIBP03VBjMGtSqbe6cWXRejF9SyM9Zyli1CKZJZ+vfCTj3oW24V7wAphMJdpOFLoMI3hjJ1LWbs0w==
+  dependencies:
+    "@ungap/promise-all-settled" "1.1.2"
+    ansi-colors "4.1.1"
+    browser-stdout "1.3.1"
+    chokidar "3.5.2"
+    debug "4.3.2"
+    diff "5.0.0"
+    escape-string-regexp "4.0.0"
+    find-up "5.0.0"
+    glob "7.1.7"
+    growl "1.10.5"
+    he "1.2.0"
+    js-yaml "4.1.0"
+    log-symbols "4.1.0"
+    minimatch "3.0.4"
+    ms "2.1.3"
+    nanoid "3.1.25"
+    serialize-javascript "6.0.0"
+    strip-json-comments "3.1.1"
+    supports-color "8.1.1"
+    which "2.0.2"
+    workerpool "6.1.5"
+    yargs "16.2.0"
+    yargs-parser "20.2.4"
+    yargs-unparser "2.0.0"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+ms@2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+nanoid@3.1.25:
+  version "3.1.25"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
+  integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
+
+nanoid@^3.1.30:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
+  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
+
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
+neo-async@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
+node-releases@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
+  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
+
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+npm-run-path@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
+object-assign@^4:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-parse@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
+
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
+picomatch@^2.0.4, picomatch@^2.2.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
+pkg-dir@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
+platform@^1.3.3:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
+  integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
+
+postcss-modules-extract-imports@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
+  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
+
+postcss-modules-local-by-default@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
+  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+  dependencies:
+    icss-utils "^5.0.0"
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.1.0"
+
+postcss-modules-scope@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
+  integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
+  dependencies:
+    postcss-selector-parser "^6.0.4"
+
+postcss-modules-values@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
+  integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
+  dependencies:
+    icss-utils "^5.0.0"
+
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+  version "6.0.9"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f"
+  integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
+postcss-value-parser@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
+  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
+
+postcss@^8.2.15:
+  version "8.4.5"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95"
+  integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==
+  dependencies:
+    nanoid "^3.1.30"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.1"
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+qjobs@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
+  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
+
+qs@6.9.6:
+  version "6.9.6"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
+  integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
+
+randombytes@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+range-parser@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32"
+  integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==
+  dependencies:
+    bytes "3.1.1"
+    http-errors "1.8.1"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
+rechoir@^0.7.0:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
+  integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
+  dependencies:
+    resolve "^1.9.0"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+
+resolve-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
+  dependencies:
+    resolve-from "^5.0.0"
+
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
+resolve@^1.9.0:
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
+  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
+  dependencies:
+    is-core-module "^2.8.1"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+rfdc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
+  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
+
+rimraf@^3.0.0, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+safe-buffer@^5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+schema-utils@^3.1.0, schema-utils@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
+semver@^7.3.5:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
+serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
+  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+  dependencies:
+    randombytes "^2.1.0"
+
+setprototypeof@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
+
+shallow-clone@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
+  dependencies:
+    kind-of "^6.0.2"
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+signal-exit@^3.0.3:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
+  integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
+
+socket.io-adapter@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz#edc5dc36602f2985918d631c1399215e97a1b527"
+  integrity sha512-+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg==
+
+socket.io-parser@~4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0"
+  integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==
+  dependencies:
+    "@types/component-emitter" "^1.2.10"
+    component-emitter "~1.3.0"
+    debug "~4.3.1"
+
+socket.io@^3.1.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.2.tgz#06e27caa1c4fc9617547acfbb5da9bc1747da39a"
+  integrity sha512-JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw==
+  dependencies:
+    "@types/cookie" "^0.4.0"
+    "@types/cors" "^2.8.8"
+    "@types/node" ">=10.0.0"
+    accepts "~1.3.4"
+    base64id "~2.0.0"
+    debug "~4.3.1"
+    engine.io "~4.1.0"
+    socket.io-adapter "~2.1.0"
+    socket.io-parser "~4.0.3"
+
+source-map-js@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
+  integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
+
+source-map-js@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
+source-map-loader@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.0.tgz#f2a04ee2808ad01c774dea6b7d2639839f3b3049"
+  integrity sha512-GKGWqWvYr04M7tn8dryIWvb0s8YM41z82iQv01yBtIylgxax0CwvSy6gc2Y02iuXwEfGWRlMicH0nvms9UZphw==
+  dependencies:
+    abab "^2.0.5"
+    iconv-lite "^0.6.2"
+    source-map-js "^0.6.2"
+
+source-map-support@0.5.20:
+  version "0.5.20"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
+  integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-support@~0.5.20:
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map@^0.6.0, source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+source-map@~0.7.2:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
+"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+streamroller@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.0.2.tgz#30418d0eee3d6c93ec897f892ed098e3a81e68b7"
+  integrity sha512-ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA==
+  dependencies:
+    date-format "^4.0.3"
+    debug "^4.1.1"
+    fs-extra "^10.0.0"
+
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+strip-json-comments@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+style-loader@3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.0.tgz#d66ea95fc50b22f8b79b69a9e414760fcf58d8d8"
+  integrity sha512-szANub7ksJtQioJYtpbWwh1hUl99uK15n5HDlikeCRil/zYMZgSxucHddyF/4A3qJMUiAjPhFowrrQuNMA7jwQ==
+
+supports-color@8.1.1, supports-color@^8.0.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
+tapable@^2.1.1, tapable@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
+  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
+
+terser-webpack-plugin@^5.1.3:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz#21641326486ecf91d8054161c816e464435bae9f"
+  integrity sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==
+  dependencies:
+    jest-worker "^27.4.1"
+    schema-utils "^3.1.1"
+    serialize-javascript "^6.0.0"
+    source-map "^0.6.1"
+    terser "^5.7.2"
+
+terser@^5.7.2:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc"
+  integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.7.2"
+    source-map-support "~0.5.20"
+
+tmp@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+toidentifier@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
+
+type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
+typescript@3.9.5:
+  version "3.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
+  integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==
+
+ua-parser-js@^0.7.28:
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
+  integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==
+
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+util-deprecate@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+v8-compile-cache@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+
+vary@^1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
+void-elements@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
+
+watchpack@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25"
+  integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==
+  dependencies:
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.1.2"
+
+webpack-cli@4.9.0:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.0.tgz#dc43e6e0f80dd52e89cbf73d5294bcd7ad6eb343"
+  integrity sha512-n/jZZBMzVEl4PYIBs+auy2WI0WTQ74EnJDiyD98O2JZY6IVIHJNitkYp/uTXOviIOMfgzrNvC9foKv/8o8KSZw==
+  dependencies:
+    "@discoveryjs/json-ext" "^0.5.0"
+    "@webpack-cli/configtest" "^1.1.0"
+    "@webpack-cli/info" "^1.4.0"
+    "@webpack-cli/serve" "^1.6.0"
+    colorette "^2.0.14"
+    commander "^7.0.0"
+    execa "^5.0.0"
+    fastest-levenshtein "^1.0.12"
+    import-local "^3.0.2"
+    interpret "^2.2.0"
+    rechoir "^0.7.0"
+    v8-compile-cache "^2.2.0"
+    webpack-merge "^5.7.3"
+
+webpack-merge@^4.1.5:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
+  integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
+  dependencies:
+    lodash "^4.17.15"
+
+webpack-merge@^5.7.3:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
+  integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
+  dependencies:
+    clone-deep "^4.0.1"
+    wildcard "^2.0.0"
+
+webpack-sources@^3.2.0:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
+  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
+
+webpack@5.57.1:
+  version "5.57.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.57.1.tgz#ead5ace2c17ecef2ae8126f143bfeaa7f55eab44"
+  integrity sha512-kHszukYjTPVfCOEyrUthA3jqJwduY/P3eO8I0gMNOZGIQWKAwZftxmp5hq6paophvwo9NoUrcZOecs9ulOyyTg==
+  dependencies:
+    "@types/eslint-scope" "^3.7.0"
+    "@types/estree" "^0.0.50"
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/wasm-edit" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    acorn "^8.4.1"
+    acorn-import-assertions "^1.7.6"
+    browserslist "^4.14.5"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^5.8.3"
+    es-module-lexer "^0.9.0"
+    eslint-scope "5.1.1"
+    events "^3.2.0"
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.2.4"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^4.2.0"
+    mime-types "^2.1.27"
+    neo-async "^2.6.2"
+    schema-utils "^3.1.0"
+    tapable "^2.1.1"
+    terser-webpack-plugin "^5.1.3"
+    watchpack "^2.2.0"
+    webpack-sources "^3.2.0"
+
+which@2.0.2, which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^1.2.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+wildcard@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
+  integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
+
+workerpool@6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581"
+  integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==
+
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+ws@~7.4.2:
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yargs-parser@20.2.4:
+  version "20.2.4"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
+yargs-unparser@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
+  integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
+  dependencies:
+    camelcase "^6.0.0"
+    decamelize "^4.0.0"
+    flat "^5.0.2"
+    is-plain-obj "^2.1.0"
+
+yargs@16.2.0, yargs@^16.1.1:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
-- 
2.34.1


From 860763987666280bd5978c1f33ff27f3397a2652 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 26 Jan 2022 20:33:44 +0700
Subject: [PATCH 401/713] Change units

---
 benchmarks/build.gradle.kts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 3dc221bae..90ec5dfbe 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -101,8 +101,9 @@ benchmark {
         // Some extra precision
         warmups = 2
         iterations = 10
-        iterationTime = 2000
-        iterationTimeUnit = "ms"
+        iterationTime = 10
+        iterationTimeUnit = "s"
+        outputTimeUnit = "s"
         include("ExpressionsInterpretersBenchmark")
     }
 
-- 
2.34.1


From 7bb66f6a00c8fa045e60a333bc5aae3d9cf5dfbd Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 29 Jan 2022 15:02:46 +0300
Subject: [PATCH 402/713] Add TensorFlow prototype

---
 CHANGELOG.md                                  |  1 +
 README.md                                     | 29 ------
 docs/templates/README-TEMPLATE.md             | 29 ------
 gradle.properties                             |  2 +-
 kmath-tensorflow/build.gradle.kts             |  4 +-
 .../tensorflow/DoubleTensorFlowAlgebra.kt     | 21 ++++-
 .../kmath/tensorflow/TensorFlowAlgebra.kt     | 90 +++++++++++--------
 .../kscience/kmath/tensorflow/tfOperations.kt | 23 +++++
 .../kmath/tensorflow/DoubleTensorFlowOps.kt   | 18 +++-
 9 files changed, 114 insertions(+), 103 deletions(-)
 create mode 100644 kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/tfOperations.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 857ed060b..a19b1f467 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Integration between `MST` and Symja `IExpr`
 - Complex power
 - Separate methods for UInt, Int and Number powers. NaN safety.
+- Tensorflow prototype
 
 ### Changed
 - Exponential operations merged with hyperbolic functions
diff --git a/README.md b/README.md
index 8604873ae..92260716e 100644
--- a/README.md
+++ b/README.md
@@ -50,35 +50,6 @@ module definitions below. The module stability could have the following levels:
   with [binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) tool.
 * **STABLE**. The API stabilized. Breaking changes are allowed only in major releases.
 
-<!--Current feature list is [here](/docs/features.md)-->
-
-
-<!--* **Array-like structures** Full support of many-dimensional array-like structures -->
-<!--including mixed arithmetic operations and function operations over arrays and numbers (with the added benefit of static type checking).-->
-
-<!--* **Histograms** Fast multi-dimensional histograms.-->
-
-<!--* **Streaming** Streaming operations on mathematical objects and objects buffers.-->
-
-<!--* **Type-safe dimensions** Type-safe dimensions for matrix operations.-->
-
-<!--* **Commons-math wrapper** It is planned to gradually wrap most parts of -->
-<!--[Apache commons-math](http://commons.apache.org/proper/commons-math/) library in Kotlin code and maybe rewrite some -->
-<!--parts to better suit the Kotlin programming paradigm, however there is no established roadmap for that. Feel free to -->
-<!--submit a feature request if you want something to be implemented first.-->
-<!--                           -->
-<!--## Planned features-->
-
-<!--* **Messaging** A mathematical notation to support multi-language and multi-node communication for mathematical tasks.-->
-
-<!--* **Array statistics** -->
-
-<!--* **Integration** Univariate and multivariate integration framework.-->
-
-<!--* **Probability and distributions**-->
-
-<!--* **Fitting** Non-linear curve fitting facilities-->
-
 ## Modules
 
 <hr/>
diff --git a/docs/templates/README-TEMPLATE.md b/docs/templates/README-TEMPLATE.md
index e75d4c5ed..b0c418697 100644
--- a/docs/templates/README-TEMPLATE.md
+++ b/docs/templates/README-TEMPLATE.md
@@ -50,35 +50,6 @@ module definitions below. The module stability could have the following levels:
   with [binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) tool.
 * **STABLE**. The API stabilized. Breaking changes are allowed only in major releases.
 
-<!--Current feature list is [here](/docs/features.md)-->
-
-
-<!--* **Array-like structures** Full support of many-dimensional array-like structures -->
-<!--including mixed arithmetic operations and function operations over arrays and numbers (with the added benefit of static type checking).-->
-
-<!--* **Histograms** Fast multi-dimensional histograms.-->
-
-<!--* **Streaming** Streaming operations on mathematical objects and objects buffers.-->
-
-<!--* **Type-safe dimensions** Type-safe dimensions for matrix operations.-->
-
-<!--* **Commons-math wrapper** It is planned to gradually wrap most parts of -->
-<!--[Apache commons-math](http://commons.apache.org/proper/commons-math/) library in Kotlin code and maybe rewrite some -->
-<!--parts to better suit the Kotlin programming paradigm, however there is no established roadmap for that. Feel free to -->
-<!--submit a feature request if you want something to be implemented first.-->
-<!--                           -->
-<!--## Planned features-->
-
-<!--* **Messaging** A mathematical notation to support multi-language and multi-node communication for mathematical tasks.-->
-
-<!--* **Array statistics** -->
-
-<!--* **Integration** Univariate and multivariate integration framework.-->
-
-<!--* **Probability and distributions**-->
-
-<!--* **Fitting** Non-linear curve fitting facilities-->
-
 ## Modules
 
 $modules
diff --git a/gradle.properties b/gradle.properties
index 130d294a2..7dd9e6d61 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,4 +12,4 @@ org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
 
-toolsVersion=0.10.9-kotlin-1.6.10
+toolsVersion=0.11.1-kotlin-1.6.10
diff --git a/kmath-tensorflow/build.gradle.kts b/kmath-tensorflow/build.gradle.kts
index c8307f01f..9380a7308 100644
--- a/kmath-tensorflow/build.gradle.kts
+++ b/kmath-tensorflow/build.gradle.kts
@@ -6,8 +6,8 @@ description = "Google tensorflow connector"
 
 dependencies {
     api(project(":kmath-tensors"))
-    api("org.tensorflow:tensorflow-core-api:0.3.3")
-    testImplementation("org.tensorflow:tensorflow-core-platform:0.3.3")
+    api("org.tensorflow:tensorflow-core-api:0.4.0")
+    testImplementation("org.tensorflow:tensorflow-core-platform:0.4.0")
 }
 
 readme {
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
index eb8245944..ecfd8d098 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
@@ -11,6 +11,7 @@ import space.kscience.kmath.nd.DefaultStrides
 import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.PowerOperations
 
 public class DoubleTensorFlowOutput(
     graph: Graph,
@@ -23,7 +24,7 @@ public class DoubleTensorFlowOutput(
 
 public class DoubleTensorFlowAlgebra internal constructor(
     graph: Graph,
-) : TensorFlowAlgebra<Double, TFloat64, DoubleField>(graph) {
+) : TensorFlowAlgebra<Double, TFloat64, DoubleField>(graph), PowerOperations<StructureND<Double>> {
 
     override val elementAlgebra: DoubleField get() = DoubleField
 
@@ -57,9 +58,22 @@ public class DoubleTensorFlowAlgebra internal constructor(
 
     override fun const(value: Double): Constant<TFloat64> = ops.constant(value)
 
+    override fun divide(
+        left: StructureND<Double>,
+        right: StructureND<Double>,
+    ): TensorFlowOutput<Double, TFloat64> = left.operate(right) { l, r ->
+        ops.math.div(l, r)
+    }
 
+    override fun power(arg: StructureND<Double>, pow: Number): TensorFlowOutput<Double, TFloat64> =
+        arg.operate { ops.math.pow(it, const(pow.toDouble())) }
 }
 
+/**
+ * Compute a tensor with TensorFlow in a single run.
+ *
+ * The resulting tensor is available outside of scope
+ */
 public fun DoubleField.produceWithTF(
     block: DoubleTensorFlowAlgebra.() -> StructureND<Double>,
 ): StructureND<Double> = Graph().use { graph ->
@@ -67,6 +81,11 @@ public fun DoubleField.produceWithTF(
     scope.export(scope.block())
 }
 
+/**
+ * Compute several outputs with TensorFlow in a single run.
+ *
+ * The resulting tensors are available outside of scope
+ */
 public fun DoubleField.produceMapWithTF(
     block: DoubleTensorFlowAlgebra.() -> Map<Symbol, StructureND<Double>>,
 ): Map<Symbol, StructureND<Double>> = Graph().use { graph ->
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index 7ad91c267..e2541a73e 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -12,6 +12,7 @@ import org.tensorflow.op.core.Max
 import org.tensorflow.op.core.Min
 import org.tensorflow.op.core.Sum
 import org.tensorflow.types.TInt32
+import org.tensorflow.types.family.TNumber
 import org.tensorflow.types.family.TType
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
@@ -29,6 +30,9 @@ internal val <T> NdArray<T>.scalar: T get() = getObject()
 
 public sealed interface TensorFlowTensor<T> : Tensor<T>
 
+/**
+ * Static (eager) in-memory TensorFlow tensor
+ */
 @JvmInline
 public value class TensorFlowArray<T>(public val tensor: NdArray<T>) : Tensor<T> {
     override val shape: Shape get() = tensor.shape().asArray().toIntArray()
@@ -42,6 +46,11 @@ public value class TensorFlowArray<T>(public val tensor: NdArray<T>) : Tensor<T>
     }
 }
 
+/**
+ * Lazy graph-based TensorFlow tensor. The tensor is actualized on call.
+ *
+ * If the tensor is used for intermediate operations, actualizing it could impact performance.
+ */
 public abstract class TensorFlowOutput<T, TT : TType>(
     protected val graph: Graph,
     output: Output<TT>,
@@ -72,11 +81,11 @@ public abstract class TensorFlowOutput<T, TT : TType>(
 }
 
 
-public abstract class TensorFlowAlgebra<T, TT : TType, A : Ring<T>> internal constructor(
+public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal constructor(
     protected val graph: Graph,
 ) : TensorAlgebra<T, A> {
 
-    protected val ops: Ops by lazy { Ops.create(graph) }
+    public val ops: Ops by lazy { Ops.create(graph) }
 
     protected abstract fun StructureND<T>.asTensorFlow(): TensorFlowOutput<T, TT>
 
@@ -87,7 +96,10 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A : Ring<T>> internal con
     override fun StructureND<T>.valueOrNull(): T? = if (shape contentEquals intArrayOf(1))
         get(Shape(0)) else null
 
-    private inline fun StructureND<T>.biOp(
+    /**
+     * Perform binary lazy operation on tensor. Both arguments are implicitly converted
+     */
+    public fun StructureND<T>.operate(
         other: StructureND<T>,
         operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>,
     ): TensorFlowOutput<T, TT> {
@@ -96,7 +108,7 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A : Ring<T>> internal con
         return operation(left, right).asOutput().wrap()
     }
 
-    private inline fun T.biOp(
+    public fun T.operate(
         other: StructureND<T>,
         operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>,
     ): TensorFlowOutput<T, TT> {
@@ -105,7 +117,7 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A : Ring<T>> internal con
         return operation(left, right).asOutput().wrap()
     }
 
-    private inline fun StructureND<T>.biOp(
+    public fun StructureND<T>.operate(
         value: T,
         operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>,
     ): TensorFlowOutput<T, TT> {
@@ -114,7 +126,7 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A : Ring<T>> internal con
         return operation(left, right).asOutput().wrap()
     }
 
-    private inline fun Tensor<T>.inPlaceOp(
+    public fun Tensor<T>.operateInPlace(
         other: StructureND<T>,
         operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>,
     ): Unit {
@@ -124,7 +136,7 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A : Ring<T>> internal con
         origin.output = operation(left, right).asOutput()
     }
 
-    private inline fun Tensor<T>.inPlaceOp(
+    public fun Tensor<T>.operateInPlace(
         value: T,
         operation: (left: Operand<TT>, right: Operand<TT>) -> Operand<TT>,
     ): Unit {
@@ -134,61 +146,61 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A : Ring<T>> internal con
         origin.output = operation(left, right).asOutput()
     }
 
-    private inline fun StructureND<T>.unOp(operation: (Operand<TT>) -> Operand<TT>): TensorFlowOutput<T, TT> =
+    public fun StructureND<T>.operate(operation: (Operand<TT>) -> Operand<TT>): TensorFlowOutput<T, TT> =
         operation(asTensorFlow().output).asOutput().wrap()
 
-    override fun T.plus(arg: StructureND<T>): TensorFlowOutput<T, TT> = biOp(arg, ops.math::add)
+    override fun T.plus(arg: StructureND<T>): TensorFlowOutput<T, TT> = operate(arg, ops.math::add)
 
-    override fun StructureND<T>.plus(arg: T): TensorFlowOutput<T, TT> = biOp(arg, ops.math::add)
+    override fun StructureND<T>.plus(arg: T): TensorFlowOutput<T, TT> = operate(arg, ops.math::add)
 
-    override fun StructureND<T>.plus(arg: StructureND<T>): TensorFlowOutput<T, TT> = biOp(arg, ops.math::add)
+    override fun StructureND<T>.plus(arg: StructureND<T>): TensorFlowOutput<T, TT> = operate(arg, ops.math::add)
 
-    override fun Tensor<T>.plusAssign(value: T): Unit = inPlaceOp(value, ops.math::add)
+    override fun Tensor<T>.plusAssign(value: T): Unit = operateInPlace(value, ops.math::add)
 
-    override fun Tensor<T>.plusAssign(arg: StructureND<T>): Unit = inPlaceOp(arg, ops.math::add)
+    override fun Tensor<T>.plusAssign(arg: StructureND<T>): Unit = operateInPlace(arg, ops.math::add)
 
-    override fun StructureND<T>.minus(arg: T): TensorFlowOutput<T, TT> = biOp(arg, ops.math::sub)
+    override fun StructureND<T>.minus(arg: T): TensorFlowOutput<T, TT> = operate(arg, ops.math::sub)
 
-    override fun StructureND<T>.minus(arg: StructureND<T>): TensorFlowOutput<T, TT> = biOp(arg, ops.math::sub)
+    override fun StructureND<T>.minus(arg: StructureND<T>): TensorFlowOutput<T, TT> = operate(arg, ops.math::sub)
 
-    override fun T.minus(arg: StructureND<T>): Tensor<T> = biOp(arg, ops.math::sub)
+    override fun T.minus(arg: StructureND<T>): Tensor<T> = operate(arg, ops.math::sub)
 
-    override fun Tensor<T>.minusAssign(value: T): Unit = inPlaceOp(value, ops.math::sub)
+    override fun Tensor<T>.minusAssign(value: T): Unit = operateInPlace(value, ops.math::sub)
 
-    override fun Tensor<T>.minusAssign(arg: StructureND<T>): Unit = inPlaceOp(arg, ops.math::sub)
+    override fun Tensor<T>.minusAssign(arg: StructureND<T>): Unit = operateInPlace(arg, ops.math::sub)
 
-    override fun T.times(arg: StructureND<T>): TensorFlowOutput<T, TT> = biOp(arg, ops.math::mul)
+    override fun T.times(arg: StructureND<T>): TensorFlowOutput<T, TT> = operate(arg, ops.math::mul)
 
-    override fun StructureND<T>.times(arg: T): TensorFlowOutput<T, TT> = biOp(arg, ops.math::mul)
+    override fun StructureND<T>.times(arg: T): TensorFlowOutput<T, TT> = operate(arg, ops.math::mul)
 
-    override fun StructureND<T>.times(arg: StructureND<T>): TensorFlowOutput<T, TT> = biOp(arg, ops.math::mul)
+    override fun StructureND<T>.times(arg: StructureND<T>): TensorFlowOutput<T, TT> = operate(arg, ops.math::mul)
 
-    override fun Tensor<T>.timesAssign(value: T): Unit = inPlaceOp(value, ops.math::mul)
+    override fun Tensor<T>.timesAssign(value: T): Unit = operateInPlace(value, ops.math::mul)
 
-    override fun Tensor<T>.timesAssign(arg: StructureND<T>): Unit = inPlaceOp(arg, ops.math::mul)
+    override fun Tensor<T>.timesAssign(arg: StructureND<T>): Unit = operateInPlace(arg, ops.math::mul)
 
-    override fun StructureND<T>.unaryMinus(): TensorFlowOutput<T, TT> = unOp(ops.math::neg)
+    override fun StructureND<T>.unaryMinus(): TensorFlowOutput<T, TT> = operate(ops.math::neg)
 
-    override fun Tensor<T>.get(i: Int): Tensor<T> = unOp {
+    override fun Tensor<T>.get(i: Int): Tensor<T> = operate {
         TODO("Not yet implemented")
     }
 
-    override fun Tensor<T>.transpose(i: Int, j: Int): Tensor<T> = unOp {
+    override fun Tensor<T>.transpose(i: Int, j: Int): Tensor<T> = operate {
         ops.linalg.transpose(it, ops.constant(intArrayOf(i, j)))
     }
 
-    override fun Tensor<T>.view(shape: IntArray): Tensor<T> = unOp {
+    override fun Tensor<T>.view(shape: IntArray): Tensor<T> = operate {
         ops.reshape(it, ops.constant(shape))
     }
 
-    override fun Tensor<T>.viewAs(other: StructureND<T>): Tensor<T> = biOp(other) { l, r ->
+    override fun Tensor<T>.viewAs(other: StructureND<T>): Tensor<T> = operate(other) { l, r ->
         ops.reshape(l, ops.shape(r))
     }
 
-    override fun StructureND<T>.dot(other: StructureND<T>): TensorFlowOutput<T, TT> = biOp(other) { l, r ->
+    override fun StructureND<T>.dot(other: StructureND<T>): TensorFlowOutput<T, TT> = operate(other) { l, r ->
         ops.linalg.matMul(
-            if (l.asTensor().shape().numDimensions() == 1) ops.expandDims(l,ops.constant(0)) else l,
-            if (r.asTensor().shape().numDimensions() == 1) ops.expandDims(r,ops.constant(-1)) else r)
+            if (l.asTensor().shape().numDimensions() == 1) ops.expandDims(l, ops.constant(0)) else l,
+            if (r.asTensor().shape().numDimensions() == 1) ops.expandDims(r, ops.constant(-1)) else r)
     }
 
     override fun diagonalEmbedding(
@@ -196,31 +208,31 @@ public abstract class TensorFlowAlgebra<T, TT : TType, A : Ring<T>> internal con
         offset: Int,
         dim1: Int,
         dim2: Int,
-    ): TensorFlowOutput<T, TT> = diagonalEntries.unOp {
-        TODO()
+    ): TensorFlowOutput<T, TT> = diagonalEntries.operate {
+        TODO("Not yet implemented")
     }
 
-    override fun StructureND<T>.sum(): T = unOp {
+    override fun StructureND<T>.sum(): T = operate {
         ops.sum(it, ops.constant(intArrayOf()))
     }.value()
 
-    override fun StructureND<T>.sum(dim: Int, keepDim: Boolean): TensorFlowOutput<T, TT> = unOp {
+    override fun StructureND<T>.sum(dim: Int, keepDim: Boolean): TensorFlowOutput<T, TT> = operate {
         ops.sum(it, ops.constant(dim), Sum.keepDims(keepDim))
     }
 
-    override fun StructureND<T>.min(): T = unOp {
+    override fun StructureND<T>.min(): T = operate {
         ops.min(it, ops.constant(intArrayOf()))
     }.value()
 
-    override fun StructureND<T>.min(dim: Int, keepDim: Boolean): Tensor<T> = unOp {
+    override fun StructureND<T>.min(dim: Int, keepDim: Boolean): Tensor<T> = operate {
         ops.min(it, ops.constant(dim), Min.keepDims(keepDim))
     }
 
-    override fun StructureND<T>.max(): T = unOp {
+    override fun StructureND<T>.max(): T = operate {
         ops.max(it, ops.constant(intArrayOf()))
     }.value()
 
-    override fun StructureND<T>.max(dim: Int, keepDim: Boolean): Tensor<T> = unOp {
+    override fun StructureND<T>.max(dim: Int, keepDim: Boolean): Tensor<T> = operate {
         ops.max(it, ops.constant(dim), Max.keepDims(keepDim))
     }
 
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/tfOperations.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/tfOperations.kt
new file mode 100644
index 000000000..257d4d6ea
--- /dev/null
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/tfOperations.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensorflow
+
+import org.tensorflow.types.family.TNumber
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.TrigonometricOperations
+
+//
+
+// TODO add other operations
+
+public fun <T, TT : TNumber, A> TensorFlowAlgebra<T, TT, A>.sin(
+    arg: StructureND<T>,
+): TensorFlowOutput<T, TT> where A : TrigonometricOperations<T>, A : Ring<T> = arg.operate { ops.math.sin(it) }
+
+public fun <T, TT : TNumber, A> TensorFlowAlgebra<T, TT, A>.cos(
+    arg: StructureND<T>,
+): TensorFlowOutput<T, TT> where A : TrigonometricOperations<T>, A : Ring<T> = arg.operate { ops.math.cos(it) }
diff --git a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
index b7a4b94b4..805ad7c66 100644
--- a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
+++ b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
@@ -1,9 +1,10 @@
 package space.kscience.kmath.tensorflow
 
 import org.junit.jupiter.api.Test
-import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.get
 import space.kscience.kmath.nd.structureND
 import space.kscience.kmath.operations.DoubleField
+import kotlin.test.assertEquals
 
 class DoubleTensorFlowOps {
     @Test
@@ -13,7 +14,20 @@ class DoubleTensorFlowOps {
 
             initial + (initial * 2.0)
         }
-        println(StructureND.toString(res))
+        //println(StructureND.toString(res))
+        assertEquals(3.0, res[0, 0])
     }
 
+    @Test
+    fun extensionOps(){
+        val res = DoubleField.produceWithTF {
+            val i = structureND(2, 2) { 0.5 }
+
+            sin(i).pow(2) + cos(i).pow(2)
+        }
+
+        assertEquals(1.0, res[0,0],0.01)
+    }
+
+
 }
\ No newline at end of file
-- 
2.34.1


From d35516b9afc4bf7d213100b016920b8c92867083 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 2 Feb 2022 10:00:45 +0700
Subject: [PATCH 403/713] Fix theta

---
 .../commonMain/kotlin/space/kscience/kmath/complex/Complex.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index d3c414838..77fe782a9 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -41,7 +41,7 @@ public val Complex.r: Double
  * An angle between vector represented by complex number and X axis.
  */
 public val Complex.theta: Double
-    get() = atan(im / re)
+    get() = atan2(im, re)
 
 private val PI_DIV_2 = Complex(PI / 2, 0)
 
-- 
2.34.1


From e094f6e8ee9da6931eae1617d2276ce2329549b4 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 8 Feb 2022 11:43:50 +0700
Subject: [PATCH 404/713] Remove Algebra.evaluate(MST) by inlining in into
 interpret

---
 .../space/kscience/kmath/ast/TestParser.kt    |  10 +-
 .../kmath/ast/TestParserPrecedence.kt         |  18 +--
 .../space/kscience/kmath/expressions/MST.kt   | 113 ++++++++----------
 3 files changed, 65 insertions(+), 76 deletions(-)

diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
index b838245e1..d0c3a789e 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.ast
 
 import space.kscience.kmath.complex.Complex
 import space.kscience.kmath.complex.ComplexField
-import space.kscience.kmath.expressions.evaluate
+import space.kscience.kmath.expressions.interpret
 import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.DoubleField
 import kotlin.test.Test
@@ -17,14 +17,14 @@ internal class TestParser {
     @Test
     fun evaluateParsedMst() {
         val mst = "2+2*(2+2)".parseMath()
-        val res = ComplexField.evaluate(mst)
+        val res = mst.interpret(ComplexField)
         assertEquals(Complex(10.0, 0.0), res)
     }
 
     @Test
     fun evaluateMstSymbol() {
         val mst = "i".parseMath()
-        val res = ComplexField.evaluate(mst)
+        val res = mst.interpret(ComplexField)
         assertEquals(ComplexField.i, res)
     }
 
@@ -32,7 +32,7 @@ internal class TestParser {
     @Test
     fun evaluateMstUnary() {
         val mst = "sin(0)".parseMath()
-        val res = DoubleField.evaluate(mst)
+        val res = mst.interpret(DoubleField)
         assertEquals(0.0, res)
     }
 
@@ -53,7 +53,7 @@ internal class TestParser {
         }
 
         val mst = "magic(a, b)".parseMath()
-        val res = magicalAlgebra.evaluate(mst)
+        val res = mst.interpret(magicalAlgebra)
         assertEquals("a ★ b", res)
     }
 }
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
index bb6bb3ce1..42cf5ce58 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
@@ -5,35 +5,35 @@
 
 package space.kscience.kmath.ast
 
-import space.kscience.kmath.expressions.evaluate
+import space.kscience.kmath.expressions.interpret
 import space.kscience.kmath.operations.DoubleField
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 internal class TestParserPrecedence {
     @Test
-    fun test1(): Unit = assertEquals(6.0, f.evaluate("2*2+2".parseMath()))
+    fun test1(): Unit = assertEquals(6.0, "2*2+2".parseMath().interpret(f))
 
     @Test
-    fun test2(): Unit = assertEquals(6.0, f.evaluate("2+2*2".parseMath()))
+    fun test2(): Unit = assertEquals(6.0, "2+2*2".parseMath().interpret(f))
 
     @Test
-    fun test3(): Unit = assertEquals(10.0, f.evaluate("2^3+2".parseMath()))
+    fun test3(): Unit = assertEquals(10.0, "2^3+2".parseMath().interpret(f))
 
     @Test
-    fun test4(): Unit = assertEquals(10.0, f.evaluate("2+2^3".parseMath()))
+    fun test4(): Unit = assertEquals(10.0, "2+2^3".parseMath().interpret(f))
 
     @Test
-    fun test5(): Unit = assertEquals(16.0, f.evaluate("2^3*2".parseMath()))
+    fun test5(): Unit = assertEquals(16.0, "2^3*2".parseMath().interpret(f))
 
     @Test
-    fun test6(): Unit = assertEquals(16.0, f.evaluate("2*2^3".parseMath()))
+    fun test6(): Unit = assertEquals(16.0, "2*2^3".parseMath().interpret(f))
 
     @Test
-    fun test7(): Unit = assertEquals(18.0, f.evaluate("2+2^3*2".parseMath()))
+    fun test7(): Unit = assertEquals(18.0, "2+2^3*2".parseMath().interpret(f))
 
     @Test
-    fun test8(): Unit = assertEquals(18.0, f.evaluate("2*2^3+2".parseMath()))
+    fun test8(): Unit = assertEquals(18.0, "2*2^3+2".parseMath().interpret(f))
 
     private companion object {
         private val f = DoubleField
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
index 7533024a1..24e96e845 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.expressions
 
 import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.NumericAlgebra
-import space.kscience.kmath.operations.bindSymbol
+import space.kscience.kmath.operations.bindSymbolOrNull
 
 /**
  * A Mathematical Syntax Tree (MST) node for mathematical expressions.
@@ -43,66 +43,50 @@ public sealed interface MST {
 
 // TODO add a function with named arguments
 
-/**
- * Interprets the [MST] node with this [Algebra].
- *
- * @receiver the algebra that provides operations.
- * @param node the node to evaluate.
- * @return the value of expression.
- * @author Alexander Nozik
- */
-public fun <T> Algebra<T>.evaluate(node: MST): T = when (node) {
-    is MST.Numeric -> (this as? NumericAlgebra<T>)?.number(node.value)
-        ?: error("Numeric nodes are not supported by $this")
-
-    is Symbol -> bindSymbol(node)
-
-    is MST.Unary -> when {
-        this is NumericAlgebra && node.value is MST.Numeric -> unaryOperationFunction(node.operation)(number(node.value.value))
-        else -> unaryOperationFunction(node.operation)(evaluate(node.value))
-    }
-
-    is MST.Binary -> when {
-        this is NumericAlgebra && node.left is MST.Numeric && node.right is MST.Numeric ->
-            binaryOperationFunction(node.operation)(number(node.left.value), number(node.right.value))
-
-        this is NumericAlgebra && node.left is MST.Numeric ->
-            leftSideNumberOperationFunction(node.operation)(node.left.value, evaluate(node.right))
-
-        this is NumericAlgebra && node.right is MST.Numeric ->
-            rightSideNumberOperationFunction(node.operation)(evaluate(node.left), node.right.value)
-
-        else -> binaryOperationFunction(node.operation)(evaluate(node.left), evaluate(node.right))
-    }
-}
-
-internal class InnerAlgebra<T>(val algebra: Algebra<T>, val arguments: Map<Symbol, T>) : NumericAlgebra<T> {
-    override fun bindSymbolOrNull(value: String): T? = algebra.bindSymbolOrNull(value) ?: arguments[StringSymbol(value)]
-
-    override fun unaryOperation(operation: String, arg: T): T =
-        algebra.unaryOperation(operation, arg)
-
-    override fun binaryOperation(operation: String, left: T, right: T): T =
-        algebra.binaryOperation(operation, left, right)
-
-    override fun unaryOperationFunction(operation: String): (arg: T) -> T =
-        algebra.unaryOperationFunction(operation)
-
-    override fun binaryOperationFunction(operation: String): (left: T, right: T) -> T =
-        algebra.binaryOperationFunction(operation)
-
-    @Suppress("UNCHECKED_CAST")
-    override fun number(value: Number): T = if (algebra is NumericAlgebra<*>)
-        (algebra as NumericAlgebra<T>).number(value)
-    else
-        error("Numeric nodes are not supported by $this")
-}
 
 /**
  * Interprets the [MST] node with this [Algebra] and optional [arguments]
  */
-public fun <T> MST.interpret(algebra: Algebra<T>, arguments: Map<Symbol, T>): T =
-    InnerAlgebra(algebra, arguments).evaluate(this)
+public fun <T> MST.interpret(algebra: Algebra<T>, arguments: Map<Symbol, T>): T = when (this) {
+    is MST.Numeric -> (algebra as NumericAlgebra<T>?)?.number(value)
+        ?: error("Numeric nodes are not supported by $algebra")
+
+    is Symbol -> algebra.bindSymbolOrNull(this) ?: arguments.getValue(this)
+
+    is MST.Unary -> when {
+        algebra is NumericAlgebra && this.value is MST.Numeric -> algebra.unaryOperation(
+            this.operation,
+            algebra.number(this.value.value),
+        )
+        else -> algebra.unaryOperationFunction(this.operation)(this.value.interpret(algebra, arguments))
+    }
+
+    is MST.Binary -> when {
+        algebra is NumericAlgebra && this.left is MST.Numeric && this.right is MST.Numeric -> algebra.binaryOperation(
+            this.operation,
+            algebra.number(this.left.value),
+            algebra.number(this.right.value),
+        )
+
+        algebra is NumericAlgebra && this.left is MST.Numeric -> algebra.leftSideNumberOperation(
+            this.operation,
+            this.left.value,
+            this.right.interpret(algebra, arguments),
+        )
+
+        algebra is NumericAlgebra && this.right is MST.Numeric -> algebra.rightSideNumberOperation(
+            this.operation,
+            left.interpret(algebra, arguments),
+            right.value,
+        )
+
+        else -> algebra.binaryOperation(
+            this.operation,
+            this.left.interpret(algebra, arguments),
+            this.right.interpret(algebra, arguments),
+        )
+    }
+}
 
 /**
  * Interprets the [MST] node with this [Algebra] and optional [arguments]
@@ -111,12 +95,17 @@ public fun <T> MST.interpret(algebra: Algebra<T>, arguments: Map<Symbol, T>): T
  * @param algebra the algebra that provides operations.
  * @return the value of expression.
  */
-public fun <T> MST.interpret(algebra: Algebra<T>, vararg arguments: Pair<Symbol, T>): T =
-    interpret(algebra, mapOf(*arguments))
+public fun <T> MST.interpret(algebra: Algebra<T>, vararg arguments: Pair<Symbol, T>): T = interpret(
+    algebra,
+    when (arguments.size) {
+        0 -> emptyMap()
+        1 -> mapOf(arguments[0])
+        else -> hashMapOf(*arguments)
+    },
+)
 
 /**
  * Interpret this [MST] as expression.
  */
-public fun <T : Any> MST.toExpression(algebra: Algebra<T>): Expression<T> = Expression { arguments ->
-    interpret(algebra, arguments)
-}
+public fun <T : Any> MST.toExpression(algebra: Algebra<T>): Expression<T> =
+    Expression { arguments -> interpret(algebra, arguments) }
-- 
2.34.1


From 7b1bdc21a4ba5eb5d36d32afeffde7055c26f88b Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Thu, 12 Aug 2021 16:37:53 +0300
Subject: [PATCH 405/713] Copy DerivativeStructure to multiplatform

---
 README.md                                     |    2 +-
 docs/templates/README-TEMPLATE.md             |    2 +-
 .../kscience/kmath/expressions/DSCompiler.kt  | 1541 +++++++++++++++++
 .../kmath/expressions/DerivativeStructure.kt  |  186 ++
 .../DerivativeStructureExpression.kt          |  332 ++++
 .../DerivativeStructureExpressionTest.kt      |   59 +
 .../kscience/kmath/internal/InternalUtils.kt  |    3 +-
 7 files changed, 2122 insertions(+), 3 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructure.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpression.kt
 create mode 100644 kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt

diff --git a/README.md b/README.md
index 92260716e..aeedfefbb 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ module definitions below. The module stability could have the following levels:
 * **PROTOTYPE**. On this level there are no compatibility guarantees. All methods and classes form those modules could
   break any moment. You can still use it, but be sure to fix the specific version.
 * **EXPERIMENTAL**. The general API is decided, but some changes could be made. Volatile API is marked
-  with `@UnstableKmathAPI` or other stability warning annotations.
+  with `@UnstableKMathAPI` or other stability warning annotations.
 * **DEVELOPMENT**. API breaking generally follows semantic versioning ideology. There could be changes in minor
   versions, but not in patch versions. API is protected
   with [binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) tool.
diff --git a/docs/templates/README-TEMPLATE.md b/docs/templates/README-TEMPLATE.md
index b0c418697..2e64a3e09 100644
--- a/docs/templates/README-TEMPLATE.md
+++ b/docs/templates/README-TEMPLATE.md
@@ -44,7 +44,7 @@ module definitions below. The module stability could have the following levels:
 * **PROTOTYPE**. On this level there are no compatibility guarantees. All methods and classes form those modules could
   break any moment. You can still use it, but be sure to fix the specific version.
 * **EXPERIMENTAL**. The general API is decided, but some changes could be made. Volatile API is marked
-  with `@UnstableKmathAPI` or other stability warning annotations.
+  with `@UnstableKMathAPI` or other stability warning annotations.
 * **DEVELOPMENT**. API breaking generally follows semantic versioning ideology. There could be changes in minor
   versions, but not in patch versions. API is protected
   with [binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) tool.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
new file mode 100644
index 000000000..bb88ce52c
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
@@ -0,0 +1,1541 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.expressions
+
+import space.kscience.kmath.operations.*
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.MutableBuffer
+import space.kscience.kmath.structures.MutableBufferFactory
+import kotlin.math.max
+import kotlin.math.min
+
+internal fun <T> MutableBuffer<T>.fill(element: T, fromIndex: Int = 0, toIndex: Int = size) {
+    for (i in fromIndex until toIndex) this[i] = element
+}
+
+/**
+ * Class holding "compiled" computation rules for derivative structures.
+ *
+ * This class implements the computation rules described in Dan Kalman's paper
+ * [Doubly Recursive Multivariate Automatic Differentiation](http://www1.american.edu/cas/mathstat/People/kalman/pdffiles/mmgautodiff.pdf),
+ * Mathematics Magazine, vol. 75, no. 3, June 2002. However, to avoid performances bottlenecks, the recursive rules are
+ * "compiled" once in an unfolded form. This class does this recursion unrolling and stores the computation rules as
+ * simple loops with pre-computed indirection arrays.
+ *
+ * This class maps all derivative computation into single dimension arrays that hold the value and partial derivatives.
+ * The class does not hold these arrays, which remains under the responsibility of the caller. For each combination of
+ * number of free parameters and derivation order, only one compiler is necessary, and this compiler will be used to
+ * perform computations on all arrays provided to it, which can represent hundreds or thousands of different parameters
+ * kept together with all their partial derivatives.
+ *
+ * The arrays on which compilers operate contain only the partial derivatives together with the 0<sup>th</sup>
+ * derivative, i.e., the value. The partial derivatives are stored in a compiler-specific order, which can be retrieved
+ * using methods [getPartialDerivativeIndex] and [getPartialDerivativeOrders]. The value is guaranteed to be stored as
+ * the first element (i.e., the [getPartialDerivativeIndex] method returns 0 when called with 0 for all derivation
+ * orders and [getPartialDerivativeOrders] returns an array filled with 0 when called with 0 as the index).
+ *
+ * Note that the ordering changes with number of parameters and derivation order. For example given 2 parameters x and
+ * y, df/dy is stored at index 2 when derivation order is set to 1 (in this case the array has three elements: f,
+ * df/dx and df/dy). If derivation order is set to 2, then df/dy will be stored at index 3 (in this case the array has
+ * six elements: f, df/dx, df/dxdx, df/dy, df/dxdy and df/dydy).
+ *
+ * Given this structure, users can perform some simple operations like adding, subtracting or multiplying constants and
+ * negating the elements by themselves, knowing if they want to mutate their array or create a new array. These simple
+ * operations are not provided by the compiler. The compiler provides only the more complex operations between several
+ * arrays.
+ *
+ * Derived from
+ * [Commons Math's `DSCompiler`](https://github.com/apache/commons-math/blob/924f6c357465b39beb50e3c916d5eb6662194175/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/differentiation/DSCompiler.java).
+ *
+ * @property freeParameters Number of free parameters.
+ * @property order Derivation order.
+ * @see DerivativeStructure
+ */
+internal class DSCompiler<T, out A : Algebra<T>> internal constructor(
+    val algebra: A,
+    val bufferFactory: MutableBufferFactory<T>,
+    val freeParameters: Int,
+    val order: Int,
+    valueCompiler: DSCompiler<T, A>?,
+    derivativeCompiler: DSCompiler<T, A>?,
+) {
+    /**
+     * Number of partial derivatives (including the single 0 order derivative element).
+     */
+    val sizes: Array<IntArray> by lazy {
+        compileSizes(
+            freeParameters,
+            order,
+            valueCompiler,
+        )
+    }
+
+    /**
+     * Indirection array for partial derivatives.
+     */
+    val derivativesIndirection: Array<IntArray> by lazy {
+        compileDerivativesIndirection(
+            freeParameters, order,
+            valueCompiler, derivativeCompiler,
+        )
+    }
+
+    /**
+     * Indirection array of the lower derivative elements.
+     */
+    val lowerIndirection: IntArray by lazy {
+        compileLowerIndirection(
+            freeParameters, order,
+            valueCompiler, derivativeCompiler,
+        )
+    }
+
+    /**
+     * Indirection arrays for multiplication.
+     */
+    val multIndirection: Array<Array<IntArray>> by lazy {
+        compileMultiplicationIndirection(
+            freeParameters, order,
+            valueCompiler, derivativeCompiler, lowerIndirection,
+        )
+    }
+
+    /**
+     * Indirection arrays for function composition.
+     */
+    val compositionIndirection: Array<Array<IntArray>> by lazy {
+        compileCompositionIndirection(
+            freeParameters, order,
+            valueCompiler, derivativeCompiler,
+            sizes, derivativesIndirection,
+        )
+    }
+
+    /**
+     * Get the array size required for holding partial derivatives' data.
+     *
+     * This number includes the single 0 order derivative element, which is
+     * guaranteed to be stored in the first element of the array.
+     */
+    val size: Int
+        get() = sizes[freeParameters][order]
+
+    /**
+     * Get the index of a partial derivative in the array.
+     *
+     * If all orders are set to 0, then the 0<sup>th</sup> order derivative is returned, which is the value of the
+     * function.
+     *
+     * The indices of derivatives are between 0 and [size] &minus; 1. Their specific order is fixed for a given compiler, but
+     * otherwise not publicly specified. There are however some simple cases which have guaranteed indices:
+     *
+     *  * the index of 0<sup>th</sup> order derivative is always 0
+     *  * if there is only 1 [freeParameters], then the
+     * derivatives are sorted in increasing derivation order (i.e., f at index 0, df/dp
+     * at index 1, d<sup>2</sup>f/dp<sup>2</sup> at index 2 &hellip;
+     * d<sup>k</sup>f/dp<sup>k</sup> at index k),
+     *  * if the [order] is 1, then the derivatives
+     * are sorted in increasing free parameter order (i.e., f at index 0, df/dx<sub>1</sub>
+     * at index 1, df/dx<sub>2</sub> at index 2 &hellip; df/dx<sub>k</sub> at index k),
+     *  * all other cases are not publicly specified.
+     *
+     * This method is the inverse of method [getPartialDerivativeOrders].
+     *
+     * @param orders derivation orders with respect to each parameter.
+     * @return index of the partial derivative.
+     * @see getPartialDerivativeOrders
+     */
+    fun getPartialDerivativeIndex(vararg orders: Int): Int {
+        // safety check
+        require(orders.size == freeParameters) { "dimension mismatch: ${orders.size} and $freeParameters" }
+        return getPartialDerivativeIndex(freeParameters, order, sizes, *orders)
+    }
+
+    /**
+     * Get the derivation orders for a specific index in the array.
+     *
+     * This method is the inverse of [getPartialDerivativeIndex].
+     *
+     * @param index of the partial derivative
+     * @return orders derivation orders with respect to each parameter
+     * @see getPartialDerivativeIndex
+     */
+    fun getPartialDerivativeOrders(index: Int): IntArray = derivativesIndirection[index]
+}
+
+/**
+ * Compute natural logarithm of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for logarithm the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.ln(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Field<T>, A : ExponentialOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    function[0] = ln(operand[operandOffset])
+
+    if (order > 0) {
+        val inv = one / operand[operandOffset]
+        var xk = inv
+        for (i in 1..order) {
+            function[i] = xk
+            xk *= (-i * inv)
+        }
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute integer power of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param n power to apply.
+ * @param result array where result must be stored (for power the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.pow(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    n: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Field<T>, A : PowerOperations<T> = algebra {
+    if (n == 0) {
+        // special case, x^0 = 1 for all x
+        result[resultOffset] = one
+        result.fill(zero, resultOffset + 1, resultOffset + size)
+        return
+    }
+
+    // create the power function value and derivatives
+    // [x^n, nx^(n-1), n(n-1)x^(n-2), ... ]
+    val function = bufferFactory(1 + order) { zero }
+
+    if (n > 0) {
+        // strictly positive power
+        val maxOrder: Int = min(order, n)
+        var xk = operand[operandOffset] pow n - maxOrder
+        for (i in maxOrder downTo 1) {
+            function[i] = xk
+            xk *= operand[operandOffset]
+        }
+        function[0] = xk
+    } else {
+        // strictly negative power
+        val inv = one / operand[operandOffset]
+        var xk = inv pow -n
+
+        for (i in 0..order) {
+            function[i] = xk
+            xk *= inv
+        }
+    }
+
+    var coefficient = number(n)
+
+    for (i in 1..order) {
+        function[i] = function[i] * coefficient
+        coefficient *= (n - i).toDouble()
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute exponential of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for exponential the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.exp(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Ring<T>, A : ScaleOperations<T>, A : ExponentialOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    function.fill(exp(operand[operandOffset]))
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute square root of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for n<sup>th</sup> root the result array *cannot* be the input
+ * array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.sqrt(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Field<T>, A : PowerOperations<T> = algebra {
+    // create the function value and derivatives
+    // [x^(1/n), (1/n)x^((1/n)-1), (1-n)/n^2x^((1/n)-2), ... ]
+    val function = bufferFactory(1 + order) { zero }
+    function[0] = sqrt(operand[operandOffset])
+    var xk: T = 0.5 * one / function[0]
+    val xReciprocal = one / operand[operandOffset]
+
+    for (i in 1..order) {
+        function[i] = xk
+        xk *= xReciprocal * (0.5 - i)
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute cosine of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for cosine the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.cos(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int,
+) where A : Ring<T>, A : TrigonometricOperations<T>, A : ScaleOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    function[0] = cos(operand[operandOffset])
+
+    if (order > 0) {
+        function[1] = -sin(operand[operandOffset])
+        for (i in 2..order) {
+            function[i] = -function[i - 2]
+        }
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute power of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param p power to apply.
+ * @param result array where result must be stored (for power the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.pow(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    p: Double,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Ring<T>, A : NumericAlgebra<T>, A : PowerOperations<T>, A : ScaleOperations<T> = algebra {
+    // create the function value and derivatives
+    // [x^p, px^(p-1), p(p-1)x^(p-2), ... ]
+    val function = bufferFactory(1 + order) { zero }
+    var xk = operand[operandOffset] pow p - order
+
+    for (i in order downTo 1) {
+        function[i] = xk
+        xk *= operand[operandOffset]
+    }
+
+    function[0] = xk
+    var coefficient = p
+
+    for (i in 1..order) {
+        function[i] = function[i] * coefficient
+        coefficient *= p - i
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute tangent of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for tangent the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.tan(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Ring<T>, A : TrigonometricOperations<T>, A : ScaleOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    val t = tan(operand[operandOffset])
+    function[0] = t
+
+    if (order > 0) {
+
+        // the nth order derivative of tan has the form:
+        // dn(tan(x)/dxn = P_n(tan(x))
+        // where P_n(t) is a degree n+1 polynomial with same parity as n+1
+        // P_0(t) = t, P_1(t) = 1 + t^2, P_2(t) = 2 t (1 + t^2) ...
+        // the general recurrence relation for P_n is:
+        // P_n(x) = (1+t^2) P_(n-1)'(t)
+        // as per polynomial parity, we can store coefficients of both P_(n-1) and P_n in the same array
+        val p = bufferFactory(order + 2) { zero }
+        p[1] = one
+        val t2 = t * t
+        for (n in 1..order) {
+
+            // update and evaluate polynomial P_n(t)
+            var v = one
+            p[n + 1] = n * p[n]
+            var k = n + 1
+            while (k >= 0) {
+                v = v * t2 + p[k]
+                if (k > 2) {
+                    p[k - 2] = (k - 1) * p[k - 1] + (k - 3) * p[k - 3]
+                } else if (k == 2) {
+                    p[0] = p[1]
+                }
+                k -= 2
+            }
+            if (n and 0x1 == 0) {
+                v *= t
+            }
+            function[n] = v
+        }
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute power of a derivative structure.
+ *
+ * @param x array holding the base.
+ * @param xOffset offset of the base in its array.
+ * @param y array holding the exponent.
+ * @param yOffset offset of the exponent in its array.
+ * @param result array where result must be stored (for power the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.pow(
+    x: Buffer<T>,
+    xOffset: Int,
+    y: Buffer<T>,
+    yOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int,
+) where A : Field<T>, A : ExponentialOperations<T> = algebra {
+    val logX = bufferFactory(size) { zero }
+    ln(x, xOffset, logX, 0)
+    val yLogX = bufferFactory(size) { zero }
+    multiply(logX, 0, y, yOffset, yLogX, 0)
+    exp(yLogX, 0, result, resultOffset)
+}
+
+/**
+ * Compute sine of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for sine the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.sin(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Ring<T>, A : ScaleOperations<T>, A : TrigonometricOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    function[0] = sin(operand[operandOffset])
+    if (order > 0) {
+        function[1] = cos(operand[operandOffset])
+        for (i in 2..order) {
+            function[i] = -function[i - 2]
+        }
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute arc cosine of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for arc cosine the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.acos(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Field<T>, A : TrigonometricOperations<T>, A : PowerOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    val x = operand[operandOffset]
+    function[0] = acos(x)
+    if (order > 0) {
+        // the nth order derivative of acos has the form:
+        // dn(acos(x)/dxn = P_n(x) / [1 - x^2]^((2n-1)/2)
+        // where P_n(x) is a degree n-1 polynomial with same parity as n-1
+        // P_1(x) = -1, P_2(x) = -x, P_3(x) = -2x^2 - 1 ...
+        // the general recurrence relation for P_n is:
+        // P_n(x) = (1-x^2) P_(n-1)'(x) + (2n-3) x P_(n-1)(x)
+        // as per polynomial parity, we can store coefficients of both P_(n-1) and P_n in the same array
+        val p = bufferFactory(order) { zero }
+        p[0] = -one
+        val x2 = x * x
+        val f = one / (one - x2)
+        var coeff = sqrt(f)
+        function[1] = coeff * p[0]
+
+        for (n in 2..order) {
+            // update and evaluate polynomial P_n(x)
+            var v = zero
+            p[n - 1] = (n - 1) * p[n - 2]
+            var k = n - 1
+
+            while (k >= 0) {
+                v = v * x2 + p[k]
+                if (k > 2) {
+                    p[k - 2] = (k - 1) * p[k - 1] + (2 * n - k) * p[k - 3]
+                } else if (k == 2) {
+                    p[0] = p[1]
+                }
+                k -= 2
+            }
+
+            if (n and 0x1 == 0) {
+                v *= x
+            }
+
+            coeff *= f
+            function[n] = coeff * v
+        }
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute arc sine of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for arc sine the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.asin(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Field<T>, A : TrigonometricOperations<T>, A : PowerOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    val x = operand[operandOffset]
+    function[0] = asin(x)
+    if (order > 0) {
+        // the nth order derivative of asin has the form:
+        // dn(asin(x)/dxn = P_n(x) / [1 - x^2]^((2n-1)/2)
+        // where P_n(x) is a degree n-1 polynomial with same parity as n-1
+        // P_1(x) = 1, P_2(x) = x, P_3(x) = 2x^2 + 1 ...
+        // the general recurrence relation for P_n is:
+        // P_n(x) = (1-x^2) P_(n-1)'(x) + (2n-3) x P_(n-1)(x)
+        // as per polynomial parity, we can store coefficients of both P_(n-1) and P_n in the same array
+        val p = bufferFactory(order) { zero }
+        p[0] = one
+        val x2 = x * x
+        val f = one / (one - x2)
+        var coeff = sqrt(f)
+        function[1] = coeff * p[0]
+        for (n in 2..order) {
+
+            // update and evaluate polynomial P_n(x)
+            var v = zero
+            p[n - 1] = (n - 1) * p[n - 2]
+            var k = n - 1
+            while (k >= 0) {
+                v = v * x2 + p[k]
+                if (k > 2) {
+                    p[k - 2] = (k - 1) * p[k - 1] + (2 * n - k) * p[k - 3]
+                } else if (k == 2) {
+                    p[0] = p[1]
+                }
+                k -= 2
+            }
+            if (n and 0x1 == 0) {
+                v *= x
+            }
+            coeff *= f
+            function[n] = coeff * v
+        }
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute arc tangent of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for arc tangent the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.atan(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Field<T>, A : TrigonometricOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    val x = operand[operandOffset]
+    function[0] = atan(x)
+
+    if (order > 0) {
+        // the nth order derivative of atan has the form:
+        // dn(atan(x)/dxn = Q_n(x) / (1 + x^2)^n
+        // where Q_n(x) is a degree n-1 polynomial with same parity as n-1
+        // Q_1(x) = 1, Q_2(x) = -2x, Q_3(x) = 6x^2 - 2 ...
+        // the general recurrence relation for Q_n is:
+        // Q_n(x) = (1+x^2) Q_(n-1)'(x) - 2(n-1) x Q_(n-1)(x)
+        // as per polynomial parity, we can store coefficients of both Q_(n-1) and Q_n in the same array
+        val q = bufferFactory(order) { zero }
+        q[0] = one
+        val x2 = x * x
+        val f = one / (one + x2)
+        var coeff = f
+        function[1] = coeff * q[0]
+        for (n in 2..order) {
+
+            // update and evaluate polynomial Q_n(x)
+            var v = zero
+            q[n - 1] = -n * q[n - 2]
+            var k = n - 1
+            while (k >= 0) {
+                v = v * x2 + q[k]
+                if (k > 2) {
+                    q[k - 2] = (k - 1) * q[k - 1] + (k - 1 - 2 * n) * q[k - 3]
+                } else if (k == 2) {
+                    q[0] = q[1]
+                }
+                k -= 2
+            }
+            if (n and 0x1 == 0) {
+                v *= x
+            }
+            coeff *= f
+            function[n] = coeff * v
+        }
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute hyperbolic cosine of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for hyperbolic cosine the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.cosh(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Ring<T>, A : ScaleOperations<T>, A : ExponentialOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    function[0] = cosh(operand[operandOffset])
+
+    if (order > 0) {
+        function[1] = sinh(operand[operandOffset])
+        for (i in 2..order) {
+            function[i] = function[i - 2]
+        }
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute hyperbolic tangent of a derivative structure.
+ *
+ * @param operand array holding the operand
+ * @param operandOffset offset of the operand in its array
+ * @param result array where result must be stored (for hyperbolic tangent the result array *cannot* be the input
+ * array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.tanh(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Field<T>, A : ExponentialOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    val t = tanh(operand[operandOffset])
+    function[0] = t
+    if (order > 0) {
+
+        // the nth order derivative of tanh has the form:
+        // dn(tanh(x)/dxn = P_n(tanh(x))
+        // where P_n(t) is a degree n+1 polynomial with same parity as n+1
+        // P_0(t) = t, P_1(t) = 1 - t^2, P_2(t) = -2 t (1 - t^2) ...
+        // the general recurrence relation for P_n is:
+        // P_n(x) = (1-t^2) P_(n-1)'(t)
+        // as per polynomial parity, we can store coefficients of both P_(n-1) and P_n in the same array
+        val p = bufferFactory(order + 2) { zero }
+        p[1] = one
+        val t2 = t * t
+        for (n in 1..order) {
+
+            // update and evaluate polynomial P_n(t)
+            var v = zero
+            p[n + 1] = -n * p[n]
+            var k = n + 1
+            while (k >= 0) {
+                v = v * t2 + p[k]
+                if (k > 2) {
+                    p[k - 2] = (k - 1) * p[k - 1] - (k - 3) * p[k - 3]
+                } else if (k == 2) {
+                    p[0] = p[1]
+                }
+                k -= 2
+            }
+            if (n and 0x1 == 0) {
+                v *= t
+            }
+            function[n] = v
+        }
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute inverse hyperbolic cosine of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for inverse hyperbolic cosine the result array *cannot* be the input
+ * array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.acosh(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Field<T>, A : ExponentialOperations<T>, A : PowerOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    val x = operand[operandOffset]
+    function[0] = acosh(x)
+
+    if (order > 0) {
+        // the nth order derivative of acosh has the form:
+        // dn(acosh(x)/dxn = P_n(x) / [x^2 - 1]^((2n-1)/2)
+        // where P_n(x) is a degree n-1 polynomial with same parity as n-1
+        // P_1(x) = 1, P_2(x) = -x, P_3(x) = 2x^2 + 1 ...
+        // the general recurrence relation for P_n is:
+        // P_n(x) = (x^2-1) P_(n-1)'(x) - (2n-3) x P_(n-1)(x)
+        // as per polynomial parity, we can store coefficients of both P_(n-1) and P_n in the same array
+        val p = bufferFactory(order) { zero }
+        p[0] = one
+        val x2 = x * x
+        val f = one / (x2 - one)
+        var coeff = sqrt(f)
+        function[1] = coeff * p[0]
+        for (n in 2..order) {
+
+            // update and evaluate polynomial P_n(x)
+            var v = zero
+            p[n - 1] = (1 - n) * p[n - 2]
+            var k = n - 1
+            while (k >= 0) {
+                v = v * x2 + p[k]
+                if (k > 2) {
+                    p[k - 2] = (1 - k) * p[k - 1] + (k - 2 * n) * p[k - 3]
+                } else if (k == 2) {
+                    p[0] = -p[1]
+                }
+                k -= 2
+            }
+            if (n and 0x1 == 0) {
+                v *= x
+            }
+
+            coeff *= f
+            function[n] = coeff * v
+        }
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Compute composition of a derivative structure by a function.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param f array of value and derivatives of the function at the current point (i.e. at `operand[operandOffset]`).
+ * @param result array where result must be stored (for composition the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.compose(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    f: Buffer<T>,
+    result: MutableBuffer<T>,
+    resultOffset: Int,
+) where A : Ring<T>, A : ScaleOperations<T> = algebra {
+    for (i in compositionIndirection.indices) {
+        val mappingI = compositionIndirection[i]
+        var r = zero
+        for (j in mappingI.indices) {
+            val mappingIJ = mappingI[j]
+            var product = mappingIJ[0] * f[mappingIJ[1]]
+            for (k in 2 until mappingIJ.size) {
+                product *= operand[operandOffset + mappingIJ[k]]
+            }
+            r += product
+        }
+        result[resultOffset + i] = r
+    }
+}
+
+/**
+ * Compute hyperbolic sine of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for hyperbolic sine the result array *cannot* be the input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.sinh(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Field<T>, A : ExponentialOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    function[0] = sinh(operand[operandOffset])
+
+    if (order > 0) {
+        function[1] = cosh(operand[operandOffset])
+        for (i in 2..order) {
+            function[i] = function[i - 2]
+        }
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Perform division of two derivative structures.
+ *
+ * @param lhs array holding left-hand side of division.
+ * @param lhsOffset offset of the left-hand side in its array.
+ * @param rhs array right-hand side of division.
+ * @param rhsOffset offset of the right-hand side in its array.
+ * @param result array where result must be stored (for division the result array *cannot* be one of the input arrays).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.divide(
+    lhs: Buffer<T>,
+    lhsOffset: Int,
+    rhs: Buffer<T>,
+    rhsOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int,
+) where A : Field<T>, A : PowerOperations<T>, A : ScaleOperations<T> = algebra {
+    val reciprocal = bufferFactory(size) { zero }
+    pow(rhs, lhsOffset, -1, reciprocal, 0)
+    multiply(lhs, lhsOffset, reciprocal, rhsOffset, result, resultOffset)
+}
+
+/**
+ * Perform multiplication of two derivative structures.
+ *
+ * @param lhs array holding left-hand side of multiplication.
+ * @param lhsOffset offset of the left-hand side in its array.
+ * @param rhs array right-hand side of multiplication.
+ * @param rhsOffset offset of the right-hand side in its array.
+ * @param result array where result must be stored (for multiplication the result array *cannot* be one of the input
+ * arrays).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.multiply(
+    lhs: Buffer<T>,
+    lhsOffset: Int,
+    rhs: Buffer<T>,
+    rhsOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int,
+) where A : Ring<T>, A : ScaleOperations<T> = algebra {
+    for (i in multIndirection.indices) {
+        val mappingI = multIndirection[i]
+        var r = zero
+
+        for (j in mappingI.indices) {
+            r += mappingI[j][0] * lhs[lhsOffset + mappingI[j][1]] * rhs[rhsOffset + mappingI[j][2]]
+        }
+
+        result[resultOffset + i] = r
+    }
+}
+
+/**
+ * Perform subtraction of two derivative structures.
+ *
+ * @param lhs array holding left-hand side of subtraction.
+ * @param lhsOffset offset of the left-hand side in its array.
+ * @param rhs array right-hand side of subtraction.
+ * @param rhsOffset offset of the right-hand side in its array.
+ * @param result array where result must be stored (it may be one of the input arrays).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A : Group<T>> DSCompiler<T, A>.subtract(
+    lhs: Buffer<T>,
+    lhsOffset: Int,
+    rhs: Buffer<T>,
+    rhsOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int,
+) = algebra {
+    for (i in 0 until size) {
+        result[resultOffset + i] = lhs[lhsOffset + i] - rhs[rhsOffset + i]
+    }
+}
+
+/**
+ * Compute inverse hyperbolic sine of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for inverse hyperbolic sine the result array *cannot* be the input
+ * array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.asinh(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int
+) where A : Field<T>, A : ExponentialOperations<T>, A : PowerOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    val x = operand[operandOffset]
+    function[0] = asinh(x)
+    if (order > 0) {
+        // the nth order derivative of asinh has the form:
+        // dn(asinh(x)/dxn = P_n(x) / [x^2 + 1]^((2n-1)/2)
+        // where P_n(x) is a degree n-1 polynomial with same parity as n-1
+        // P_1(x) = 1, P_2(x) = -x, P_3(x) = 2x^2 - 1 ...
+        // the general recurrence relation for P_n is:
+        // P_n(x) = (x^2+1) P_(n-1)'(x) - (2n-3) x P_(n-1)(x)
+        // as per polynomial parity, we can store coefficients of both P_(n-1) and P_n in the same array
+        val p = bufferFactory(order) { zero }
+        p[0] = one
+        val x2 = x * x
+        val f = one / (one + x2)
+        var coeff = sqrt(f)
+        function[1] = coeff * p[0]
+        for (n in 2..order) {
+
+            // update and evaluate polynomial P_n(x)
+            var v = zero
+            p[n - 1] = (1 - n) * p[n - 2]
+            var k = n - 1
+            while (k >= 0) {
+                v = v * x2 + p[k]
+                if (k > 2) {
+                    p[k - 2] = (k - 1) * p[k - 1] + (k - 2 * n) * p[k - 3]
+                } else if (k == 2) {
+                    p[0] = p[1]
+                }
+                k -= 2
+            }
+            if (n and 0x1 == 0) {
+                v *= x
+            }
+            coeff *= f
+            function[n] = coeff * v
+        }
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Perform addition of two derivative structures.
+ *
+ * @param lhs array holding left-hand side of addition.
+ * @param lhsOffset offset of the left-hand side in its array.
+ * @param rhs array right-hand side of addition.
+ * @param rhsOffset offset of the right-hand side in its array.
+ * @param result array where result must be stored (it may be one of the input arrays).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.add(
+    lhs: Buffer<T>,
+    lhsOffset: Int,
+    rhs: Buffer<T>,
+    rhsOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int,
+) where A : Group<T> = algebra {
+    for (i in 0 until size) {
+        result[resultOffset + i] = lhs[lhsOffset + i] + rhs[rhsOffset + i]
+    }
+}
+
+/**
+ * Check rules set compatibility.
+ *
+ * @param compiler other compiler to check against instance.
+ */
+internal fun <T, A : Algebra<T>> DSCompiler<T, A>.checkCompatibility(compiler: DSCompiler<T, A>) {
+    require(freeParameters == compiler.freeParameters) {
+        "dimension mismatch: $freeParameters and ${compiler.freeParameters}"
+    }
+    require(order == compiler.order) {
+        "dimension mismatch: $order and ${compiler.order}"
+    }
+}
+
+/**
+ * Compute inverse hyperbolic tangent of a derivative structure.
+ *
+ * @param operand array holding the operand.
+ * @param operandOffset offset of the operand in its array.
+ * @param result array where result must be stored (for inverse hyperbolic tangent the result array *cannot* be the
+ * input array).
+ * @param resultOffset offset of the result in its array.
+ */
+internal fun <T, A> DSCompiler<T, A>.atanh(
+    operand: Buffer<T>,
+    operandOffset: Int,
+    result: MutableBuffer<T>,
+    resultOffset: Int,
+) where A : Field<T>, A : ExponentialOperations<T> = algebra {
+    // create the function value and derivatives
+    val function = bufferFactory(1 + order) { zero }
+    val x = operand[operandOffset]
+    function[0] = atanh(x)
+
+    if (order > 0) {
+        // the nth order derivative of atanh has the form:
+        // dn(atanh(x)/dxn = Q_n(x) / (1 - x^2)^n
+        // where Q_n(x) is a degree n-1 polynomial with same parity as n-1
+        // Q_1(x) = 1, Q_2(x) = 2x, Q_3(x) = 6x^2 + 2 ...
+        // the general recurrence relation for Q_n is:
+        // Q_n(x) = (1-x^2) Q_(n-1)'(x) + 2(n-1) x Q_(n-1)(x)
+        // as per polynomial parity, we can store coefficients of both Q_(n-1) and Q_n in the same array
+        val q = bufferFactory(order) { zero }
+        q[0] = one
+        val x2 = x * x
+        val f = one / (one - x2)
+        var coeff = f
+        function[1] = coeff * q[0]
+        for (n in 2..order) {
+
+            // update and evaluate polynomial Q_n(x)
+            var v = zero
+            q[n - 1] = n * q[n - 2]
+            var k = n - 1
+            while (k >= 0) {
+                v = v * x2 + q[k]
+                if (k > 2) {
+                    q[k - 2] = (k - 1) * q[k - 1] + (2 * n - k + 1) * q[k - 3]
+                } else if (k == 2) {
+                    q[0] = q[1]
+                }
+                k -= 2
+            }
+            if (n and 0x1 == 0) {
+                v *= x
+            }
+            coeff *= f
+            function[n] = coeff * v
+        }
+    }
+
+    // apply function composition
+    compose(operand, operandOffset, function, result, resultOffset)
+}
+
+/**
+ * Get the compiler for number of free parameters and order.
+ *
+ * @param parameters number of free parameters.
+ * @param order derivation order.
+ * @return cached rules set.
+ */
+internal fun <T, A : Algebra<T>> getCompiler(
+    algebra: A,
+    bufferFactory: MutableBufferFactory<T>,
+    parameters: Int,
+    order: Int
+): DSCompiler<T, A> {
+    // get the cached compilers
+    val cache: Array<Array<DSCompiler<T, A>?>>? = null
+
+    // we need to create more compilers
+    val maxParameters: Int = max(parameters, cache?.size ?: 0)
+    val maxOrder: Int = max(order, if (cache == null) 0 else cache[0].size)
+    val newCache: Array<Array<DSCompiler<T, A>?>> = Array(maxParameters + 1) { arrayOfNulls(maxOrder + 1) }
+
+    if (cache != null) {
+        // preserve the already created compilers
+        for (i in cache.indices) {
+            cache[i].copyInto(newCache[i], endIndex = cache[i].size)
+        }
+    }
+
+    // create the array in increasing diagonal order
+
+    // create the array in increasing diagonal order
+    for (diag in 0..parameters + order) {
+        for (o in max(0, diag - parameters)..min(order, diag)) {
+            val p: Int = diag - o
+            if (newCache[p][o] == null) {
+                val valueCompiler: DSCompiler<T, A>? = if (p == 0) null else newCache[p - 1][o]!!
+                val derivativeCompiler: DSCompiler<T, A>? = if (o == 0) null else newCache[p][o - 1]!!
+
+                newCache[p][o] = DSCompiler(
+                    algebra,
+                    bufferFactory,
+                    p,
+                    o,
+                    valueCompiler,
+                    derivativeCompiler,
+                )
+            }
+        }
+    }
+
+    return newCache[parameters][order]!!
+}
+
+/**
+ * Compile the sizes array.
+ *
+ * @param parameters number of free parameters.
+ * @param order derivation order.
+ * @param valueCompiler compiler for the value part.
+ * @return sizes array.
+ */
+private fun <T, A : Algebra<T>> compileSizes(
+    parameters: Int, order: Int,
+    valueCompiler: DSCompiler<T, A>?,
+): Array<IntArray> {
+    val sizes = Array(parameters + 1) {
+        IntArray(order + 1)
+    }
+
+    if (parameters == 0) {
+        sizes[0].fill(1)
+    } else {
+        checkNotNull(valueCompiler)
+        valueCompiler.sizes.copyInto(sizes, endIndex = parameters)
+        sizes[parameters][0] = 1
+        for (i in 0 until order) {
+            sizes[parameters][i + 1] = sizes[parameters][i] + sizes[parameters - 1][i + 1]
+        }
+    }
+    return sizes
+}
+
+/**
+ * Compile the derivatives' indirection array.
+ *
+ * @param parameters number of free parameters.
+ * @param order derivation order.
+ * @param valueCompiler compiler for the value part.
+ * @param derivativeCompiler compiler for the derivative part.
+ * @return derivatives indirection array.
+ */
+private fun <T, A : Algebra<T>> compileDerivativesIndirection(
+    parameters: Int,
+    order: Int,
+    valueCompiler: DSCompiler<T, A>?,
+    derivativeCompiler: DSCompiler<T, A>?,
+): Array<IntArray> {
+    if (parameters == 0 || order == 0) {
+        return Array(1) { IntArray(parameters) }
+    }
+
+    val vSize: Int = valueCompiler!!.derivativesIndirection.size
+    val dSize: Int = derivativeCompiler!!.derivativesIndirection.size
+    val derivativesIndirection = Array(vSize + dSize) { IntArray(parameters) }
+
+    // set up the indices for the value part
+    for (i in 0 until vSize) {
+        // copy the first indices, the last one remaining set to 0
+        valueCompiler.derivativesIndirection[i].copyInto(derivativesIndirection[i], endIndex = parameters - 1)
+    }
+
+    // set up the indices for the derivative part
+    for (i in 0 until dSize) {
+        // copy the indices
+        derivativeCompiler.derivativesIndirection[i].copyInto(derivativesIndirection[vSize], 0, 0, parameters)
+
+        // increment the derivation order for the last parameter
+        derivativesIndirection[vSize + i][parameters - 1]++
+    }
+
+    return derivativesIndirection
+}
+
+/**
+ * Compile the lower derivatives' indirection array.
+ *
+ * This indirection array contains the indices of all elements except derivatives for last derivation order.
+ *
+ * @param parameters number of free parameters.
+ * @param order derivation order.
+ * @param valueCompiler compiler for the value part.
+ * @param derivativeCompiler compiler for the derivative part.
+ * @return lower derivatives' indirection array.
+ */
+private fun <T, A : Algebra<T>> compileLowerIndirection(
+    parameters: Int,
+    order: Int,
+    valueCompiler: DSCompiler<T, A>?,
+    derivativeCompiler: DSCompiler<T, A>?,
+): IntArray {
+    if (parameters == 0 || order <= 1) return intArrayOf(0)
+    checkNotNull(valueCompiler)
+    checkNotNull(derivativeCompiler)
+
+    // this is an implementation of definition 6 in Dan Kalman's paper.
+    val vSize: Int = valueCompiler.lowerIndirection.size
+    val dSize: Int = derivativeCompiler.lowerIndirection.size
+    val lowerIndirection = IntArray(vSize + dSize)
+    valueCompiler.lowerIndirection.copyInto(lowerIndirection, endIndex = vSize)
+    for (i in 0 until dSize) {
+        lowerIndirection[vSize + i] = valueCompiler.size + derivativeCompiler.lowerIndirection[i]
+    }
+    return lowerIndirection
+}
+
+/**
+ * Compile the multiplication indirection array.
+ *
+ * This indirection array contains the indices of all pairs of elements involved when computing a multiplication. This
+ * allows a straightforward loop-based multiplication (see [multiply]).
+ *
+ * @param parameters number of free parameters.
+ * @param order derivation order.
+ * @param valueCompiler compiler for the value part.
+ * @param derivativeCompiler compiler for the derivative part.
+ * @param lowerIndirection lower derivatives' indirection array.
+ * @return multiplication indirection array.
+ */
+@Suppress("UNCHECKED_CAST")
+private fun <T, A : Algebra<T>> compileMultiplicationIndirection(
+    parameters: Int,
+    order: Int,
+    valueCompiler: DSCompiler<T, A>?,
+    derivativeCompiler: DSCompiler<T, A>?,
+    lowerIndirection: IntArray,
+): Array<Array<IntArray>> {
+    if (parameters == 0 || order == 0) return arrayOf(arrayOf(intArrayOf(1, 0, 0)))
+
+    // this is an implementation of definition 3 in Dan Kalman's paper.
+    val vSize = valueCompiler!!.multIndirection.size
+    val dSize = derivativeCompiler!!.multIndirection.size
+    val multIndirection: Array<Array<IntArray>?> = arrayOfNulls(vSize + dSize)
+    valueCompiler.multIndirection.copyInto(multIndirection, endIndex = vSize)
+
+    for (i in 0 until dSize) {
+        val dRow = derivativeCompiler.multIndirection[i]
+        val row: List<IntArray> = buildList(dRow.size * 2) {
+            for (j in dRow.indices) {
+                add(intArrayOf(dRow[j][0], lowerIndirection[dRow[j][1]], vSize + dRow[j][2]))
+                add(intArrayOf(dRow[j][0], vSize + dRow[j][1], lowerIndirection[dRow[j][2]]))
+            }
+        }
+
+        // combine terms with similar derivation orders
+        val combined: List<IntArray> = buildList(row.size) {
+            for (j in row.indices) {
+                val termJ = row[j]
+                if (termJ[0] > 0) {
+                    for (k in j + 1 until row.size) {
+                        val termK = row[k]
+
+                        if (termJ[1] == termK[1] && termJ[2] == termK[2]) {
+                            // combine termJ and termK
+                            termJ[0] += termK[0]
+                            // make sure we will skip termK later on in the outer loop
+                            termK[0] = 0
+                        }
+                    }
+
+                    add(termJ)
+                }
+            }
+        }
+
+        multIndirection[vSize + i] = combined.toTypedArray()
+    }
+
+    return multIndirection as Array<Array<IntArray>>
+}
+
+/**
+ * Compile the indirection array of function composition.
+ *
+ * This indirection array contains the indices of all sets of elements involved when computing a composition. This
+ * allows a straightforward loop-based composition (see [compose]).
+ *
+ * @param parameters number of free parameters.
+ * @param order derivation order.
+ * @param valueCompiler compiler for the value part.
+ * @param derivativeCompiler compiler for the derivative part.
+ * @param sizes sizes array.
+ * @param derivativesIndirection derivatives indirection array.
+ * @return multiplication indirection array.
+ */
+@Suppress("UNCHECKED_CAST")
+private fun <T, A : Algebra<T>> compileCompositionIndirection(
+    parameters: Int,
+    order: Int,
+    valueCompiler: DSCompiler<T, A>?,
+    derivativeCompiler: DSCompiler<T, A>?,
+    sizes: Array<IntArray>,
+    derivativesIndirection: Array<IntArray>,
+): Array<Array<IntArray>> {
+    if (parameters == 0 || order == 0) {
+        return arrayOf(arrayOf(intArrayOf(1, 0)))
+    }
+
+    val vSize = valueCompiler!!.compositionIndirection.size
+    val dSize = derivativeCompiler!!.compositionIndirection.size
+    val compIndirection: Array<Array<IntArray>?> = arrayOfNulls(vSize + dSize)
+
+    // the composition rules from the value part can be reused as is
+    valueCompiler.compositionIndirection.copyInto(compIndirection, endIndex = vSize)
+
+    // the composition rules for the derivative part are deduced by differentiation the rules from the
+    // underlying compiler once  with respect to the parameter this compiler handles and the  underlying one
+    // did not handle
+
+    // the composition rules for the derivative part are deduced by differentiation the rules from the
+    // underlying compiler once  with respect to the parameter this compiler handles and the underlying one did
+    // not handle
+    for (i in 0 until dSize) {
+        val row: List<IntArray> = buildList {
+            for (term in derivativeCompiler.compositionIndirection[i]) {
+
+                // handle term p * f_k(g(x)) * g_l1(x) * g_l2(x) * ... * g_lp(x)
+
+                // derive the first factor in the term: f_k with respect to new parameter
+                val derivedTermF = IntArray(term.size + 1)
+                derivedTermF[0] = term[0] // p
+                derivedTermF[1] = term[1] + 1 // f_(k+1)
+                val orders = IntArray(parameters)
+                orders[parameters - 1] = 1
+                derivedTermF[term.size] = getPartialDerivativeIndex(
+                    parameters,
+                    order,
+                    sizes,
+                    *orders
+                ) // g_1
+
+                for (j in 2 until term.size) {
+                    // convert the indices as the mapping for the current order is different from the mapping with one
+                    // less order
+                    derivedTermF[j] = convertIndex(
+                        term[j], parameters,
+                        derivativeCompiler.derivativesIndirection,
+                        parameters, order, sizes
+                    )
+                }
+
+                derivedTermF.sort(2, derivedTermF.size)
+                add(derivedTermF)
+
+                // derive the various g_l
+                for (l in 2 until term.size) {
+                    val derivedTermG = IntArray(term.size)
+                    derivedTermG[0] = term[0]
+                    derivedTermG[1] = term[1]
+
+                    for (j in 2 until term.size) {
+                        // convert the indices as the mapping for the current order
+                        // is different from the mapping with one less order
+                        derivedTermG[j] = convertIndex(
+                            term[j],
+                            parameters,
+                            derivativeCompiler.derivativesIndirection,
+                            parameters,
+                            order,
+                            sizes,
+                        )
+
+                        if (j == l) {
+                            // derive this term
+                            derivativesIndirection[derivedTermG[j]].copyInto(orders, endIndex = parameters)
+                            orders[parameters - 1]++
+
+                            derivedTermG[j] = getPartialDerivativeIndex(
+                                parameters,
+                                order,
+                                sizes,
+                                *orders,
+                            )
+                        }
+                    }
+
+                    derivedTermG.sort(2, derivedTermG.size)
+                    add(derivedTermG)
+                }
+            }
+        }
+
+        // combine terms with similar derivation orders
+        val combined: List<IntArray> = buildList(row.size) {
+            for (j in row.indices) {
+                val termJ = row[j]
+
+                if (termJ[0] > 0) {
+                    (j + 1 until row.size).map { k -> row[k] }.forEach { termK ->
+                        var equals = termJ.size == termK.size
+                        var l = 1
+
+                        while (equals && l < termJ.size) {
+                            equals = equals and (termJ[l] == termK[l])
+                            ++l
+                        }
+
+                        if (equals) {
+                            // combine termJ and termK
+                            termJ[0] += termK[0]
+                            // make sure we will skip termK later on in the outer loop
+                            termK[0] = 0
+                        }
+                    }
+
+                    add(termJ)
+                }
+            }
+        }
+
+        compIndirection[vSize + i] = combined.toTypedArray()
+    }
+
+    return compIndirection as Array<Array<IntArray>>
+}
+
+/**
+ * Get the index of a partial derivative in an array.
+ *
+ * @param parameters number of free parameters.
+ * @param order derivation order.
+ * @param sizes sizes array.
+ * @param orders derivation orders with respect to each parameter (the length of this array must match the number of
+ * parameters).
+ * @return index of the partial derivative.
+ */
+private fun getPartialDerivativeIndex(
+    parameters: Int,
+    order: Int,
+    sizes: Array<IntArray>,
+    vararg orders: Int,
+): Int {
+
+    // the value is obtained by diving into the recursive Dan Kalman's structure
+    // this is theorem 2 of his paper, with recursion replaced by iteration
+    var index = 0
+    var m = order
+    var ordersSum = 0
+
+    for (i in parameters - 1 downTo 0) {
+        // derivative order for current free parameter
+        var derivativeOrder = orders[i]
+
+        // safety check
+        ordersSum += derivativeOrder
+        require(ordersSum <= order) { "number is too large: $ordersSum > $order" }
+
+        while (derivativeOrder-- > 0) {
+            // as long as we differentiate according to current free parameter,
+            // we have to skip the value part and dive into the derivative part,
+            // so we add the size of the value part to the base index
+            index += sizes[i][m--]
+        }
+    }
+
+    return index
+}
+
+/**
+ * Convert an index from one (parameters, order) structure to another.
+ *
+ * @param index index of a partial derivative in source derivative structure.
+ * @param srcP number of free parameters in source derivative structure.
+ * @param srcDerivativesIndirection derivatives indirection array for the source derivative structure.
+ * @param destP number of free parameters in destination derivative structure.
+ * @param destO derivation order in destination derivative structure.
+ * @param destSizes sizes array for the destination derivative structure.
+ * @return index of the partial derivative with the *same* characteristics in destination derivative structure.
+ */
+private fun convertIndex(
+    index: Int,
+    srcP: Int,
+    srcDerivativesIndirection: Array<IntArray>,
+    destP: Int,
+    destO: Int,
+    destSizes: Array<IntArray>,
+): Int {
+    val orders = IntArray(destP)
+    srcDerivativesIndirection[index].copyInto(orders, endIndex = min(srcP, destP))
+    return getPartialDerivativeIndex(destP, destO, destSizes, *orders)
+}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructure.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructure.kt
new file mode 100644
index 000000000..a1a6354f0
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructure.kt
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.expressions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.NumericAlgebra
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.ScaleOperations
+import space.kscience.kmath.structures.MutableBuffer
+
+/**
+ * Class representing both the value and the differentials of a function.
+ *
+ * This class is the workhorse of the differentiation package.
+ *
+ * This class is an implementation of the extension to Rall's numbers described in Dan Kalman's paper [Doubly Recursive
+ * Multivariate Automatic Differentiation](http://www1.american.edu/cas/mathstat/People/kalman/pdffiles/mmgautodiff.pdf),
+ * Mathematics Magazine, vol. 75, no. 3, June 2002. Rall's numbers are an extension to the real numbers used
+ * throughout mathematical expressions; they hold the derivative together with the value of a function. Dan Kalman's
+ * derivative structures hold all partial derivatives up to any specified order, with respect to any number of free
+ * parameters. Rall's numbers therefore can be seen as derivative structures for order one derivative and one free
+ * parameter, and real numbers can be seen as derivative structures with zero order derivative and no free parameters.
+ *
+ * Derived from
+ * [Commons Math's `DerivativeStructure`](https://github.com/apache/commons-math/blob/924f6c357465b39beb50e3c916d5eb6662194175/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/differentiation/DerivativeStructure.java).
+ */
+@UnstableKMathAPI
+public open class DerivativeStructure<T, A> internal constructor(
+    internal val derivativeAlgebra: DerivativeStructureRing<T, A>,
+    internal val compiler: DSCompiler<T, A>,
+) where A : Ring<T>, A : NumericAlgebra<T>, A : ScaleOperations<T> {
+    /**
+     * Combined array holding all values.
+     */
+    internal var data: MutableBuffer<T> =
+        derivativeAlgebra.bufferFactory(compiler.size) { derivativeAlgebra.algebra.zero }
+
+    /**
+     * Build an instance with all values and derivatives set to 0.
+     *
+     * @param parameters number of free parameters.
+     * @param order derivation order.
+     */
+    public constructor (
+        derivativeAlgebra: DerivativeStructureRing<T, A>,
+        parameters: Int,
+        order: Int,
+    ) : this(
+        derivativeAlgebra,
+        getCompiler<T, A>(derivativeAlgebra.algebra, derivativeAlgebra.bufferFactory, parameters, order),
+    )
+
+    /**
+     * Build an instance representing a constant value.
+     *
+     * @param parameters number of free parameters.
+     * @param order derivation order.
+     * @param value value of the constant.
+     * @see DerivativeStructure
+     */
+    public constructor (
+        derivativeAlgebra: DerivativeStructureRing<T, A>,
+        parameters: Int,
+        order: Int,
+        value: T,
+    ) : this(
+        derivativeAlgebra,
+        parameters,
+        order,
+    ) {
+        data[0] = value
+    }
+
+    /**
+     * Build an instance representing a variable.
+     *
+     * Instances built using this constructor are considered to be the free variables with respect to which
+     * differentials are computed. As such, their differential with respect to themselves is +1.
+     *
+     * @param parameters number of free parameters.
+     * @param order derivation order.
+     * @param index index of the variable (from 0 to `parameters - 1`).
+     * @param value value of the variable.
+     */
+    public constructor (
+        derivativeAlgebra: DerivativeStructureRing<T, A>,
+        parameters: Int,
+        order: Int,
+        index: Int,
+        value: T,
+    ) : this(derivativeAlgebra, parameters, order, value) {
+        require(index < parameters) { "number is too large: $index >= $parameters" }
+
+        if (order > 0) {
+            // the derivative of the variable with respect to itself is 1.
+            data[getCompiler(derivativeAlgebra.algebra, derivativeAlgebra.bufferFactory, index, order).size] =
+                derivativeAlgebra.algebra.one
+        }
+    }
+
+    /**
+     * Build an instance from all its derivatives.
+     *
+     * @param parameters number of free parameters.
+     * @param order derivation order.
+     * @param derivatives derivatives sorted according to [DSCompiler.getPartialDerivativeIndex].
+     */
+    public constructor (
+        derivativeAlgebra: DerivativeStructureRing<T, A>,
+        parameters: Int,
+        order: Int,
+        vararg derivatives: T,
+    ) : this(
+        derivativeAlgebra,
+        parameters,
+        order,
+    ) {
+        require(derivatives.size == data.size) { "dimension mismatch: ${derivatives.size} and ${data.size}" }
+        data = derivativeAlgebra.bufferFactory(data.size) { derivatives[it] }
+    }
+
+    /**
+     * Copy constructor.
+     *
+     * @param ds instance to copy.
+     */
+    internal constructor(ds: DerivativeStructure<T, A>) : this(ds.derivativeAlgebra, ds.compiler) {
+        this.data = ds.data.copy()
+    }
+
+    /**
+     * The number of free parameters.
+     */
+    public val freeParameters: Int
+        get() = compiler.freeParameters
+
+    /**
+     * The derivation order.
+     */
+    public val order: Int
+        get() = compiler.order
+
+    /**
+     * The value part of the derivative structure.
+     *
+     * @see getPartialDerivative
+     */
+    public val value: T
+        get() = data[0]
+
+    /**
+     * Get a partial derivative.
+     *
+     * @param orders derivation orders with respect to each variable (if all orders are 0, the value is returned).
+     * @return partial derivative.
+     * @see value
+     */
+    public fun getPartialDerivative(vararg orders: Int): T = data[compiler.getPartialDerivativeIndex(*orders)]
+
+
+    /**
+     * Test for the equality of two derivative structures.
+     *
+     * Derivative structures are considered equal if they have the same number
+     * of free parameters, the same derivation order, and the same derivatives.
+     *
+     * @return `true` if two derivative structures are equal.
+     */
+    public override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+
+        if (other is DerivativeStructure<*, *>) {
+            return ((freeParameters == other.freeParameters) &&
+                    (order == other.order) &&
+                    data == other.data)
+        }
+
+        return false
+    }
+
+    public override fun hashCode(): Int =
+        227 + 229 * freeParameters + 233 * order + 239 * data.hashCode()
+}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpression.kt
new file mode 100644
index 000000000..f91fb55e8
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpression.kt
@@ -0,0 +1,332 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.expressions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
+import space.kscience.kmath.structures.MutableBufferFactory
+import space.kscience.kmath.structures.indices
+
+/**
+ * A class implementing both [DerivativeStructure] and [Symbol].
+ */
+@UnstableKMathAPI
+public class DerivativeStructureSymbol<T, A>(
+    derivativeAlgebra: DerivativeStructureRing<T, A>,
+    size: Int,
+    order: Int,
+    index: Int,
+    symbol: Symbol,
+    value: T,
+) : Symbol by symbol, DerivativeStructure<T, A>(
+    derivativeAlgebra,
+    size,
+    order,
+    index,
+    value
+) where A : Ring<T>, A : NumericAlgebra<T>, A : ScaleOperations<T> {
+    override fun toString(): String = symbol.toString()
+    override fun equals(other: Any?): Boolean = (other as? Symbol) == symbol
+    override fun hashCode(): Int = symbol.hashCode()
+}
+
+/**
+ * A ring over [DerivativeStructure].
+ *
+ * @property order The derivation order.
+ * @param bindings The map of bindings values. All bindings are considered free parameters.
+ */
+@UnstableKMathAPI
+public open class DerivativeStructureRing<T, A>(
+    public val algebra: A,
+    public val bufferFactory: MutableBufferFactory<T>,
+    public val order: Int,
+    bindings: Map<Symbol, T>,
+) : Ring<DerivativeStructure<T, A>>, ScaleOperations<DerivativeStructure<T, A>>,
+    NumericAlgebra<DerivativeStructure<T, A>>,
+    ExpressionAlgebra<T, DerivativeStructure<T, A>>,
+    NumbersAddOps<DerivativeStructure<T, A>> where A : Ring<T>, A : NumericAlgebra<T>, A : ScaleOperations<T> {
+    public val numberOfVariables: Int = bindings.size
+
+    override val zero: DerivativeStructure<T, A> by lazy {
+        DerivativeStructure(
+            this,
+            numberOfVariables,
+            order,
+        )
+    }
+
+    override val one: DerivativeStructure<T, A> by lazy {
+        DerivativeStructure(
+            this,
+            numberOfVariables,
+            order,
+            algebra.one,
+        )
+    }
+
+    override fun number(value: Number): DerivativeStructure<T, A> = const(algebra.number(value))
+
+    private val variables: Map<Symbol, DerivativeStructureSymbol<T, A>> =
+        bindings.entries.mapIndexed { index, (key, value) ->
+            key to DerivativeStructureSymbol(
+                this,
+                numberOfVariables,
+                order,
+                index,
+                key,
+                value,
+            )
+        }.toMap()
+
+    public override fun const(value: T): DerivativeStructure<T, A> =
+        DerivativeStructure(this, numberOfVariables, order, value)
+
+    override fun bindSymbolOrNull(value: String): DerivativeStructureSymbol<T, A>? = variables[StringSymbol(value)]
+
+    override fun bindSymbol(value: String): DerivativeStructureSymbol<T, A> =
+        bindSymbolOrNull(value) ?: error("Symbol '$value' is not supported in $this")
+
+    public fun bindSymbolOrNull(symbol: Symbol): DerivativeStructureSymbol<T, A>? = variables[symbol.identity]
+
+    public fun bindSymbol(symbol: Symbol): DerivativeStructureSymbol<T, A> =
+        bindSymbolOrNull(symbol.identity) ?: error("Symbol '${symbol}' is not supported in $this")
+
+    public fun DerivativeStructure<T, A>.derivative(symbols: List<Symbol>): T {
+        require(symbols.size <= order) { "The order of derivative ${symbols.size} exceeds computed order $order" }
+        val ordersCount = symbols.groupBy { it }.mapValues { it.value.size }
+        return getPartialDerivative(*variables.keys.map { ordersCount[it] ?: 0 }.toIntArray())
+    }
+
+    public fun DerivativeStructure<T, A>.derivative(vararg symbols: Symbol): T = derivative(symbols.toList())
+
+    override fun DerivativeStructure<T, A>.unaryMinus(): DerivativeStructure<T, A> {
+        val ds = DerivativeStructure(this@DerivativeStructureRing, compiler)
+        for (i in ds.data.indices) {
+            ds.data[i] = algebra { -data[i] }
+        }
+        return ds
+    }
+
+    override fun add(left: DerivativeStructure<T, A>, right: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        left.compiler.checkCompatibility(right.compiler)
+        val ds = DerivativeStructure(left)
+        left.compiler.add(left.data, 0, right.data, 0, ds.data, 0)
+        return ds
+    }
+
+    override fun scale(a: DerivativeStructure<T, A>, value: Double): DerivativeStructure<T, A> {
+        val ds = DerivativeStructure(a)
+        for (i in ds.data.indices) {
+            ds.data[i] = algebra { ds.data[i].times(value) }
+        }
+        return ds
+    }
+
+    override fun multiply(
+        left: DerivativeStructure<T, A>,
+        right: DerivativeStructure<T, A>
+    ): DerivativeStructure<T, A> {
+        left.compiler.checkCompatibility(right.compiler)
+        val result = DerivativeStructure(this, left.compiler)
+        left.compiler.multiply(left.data, 0, right.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun DerivativeStructure<T, A>.minus(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        compiler.checkCompatibility(arg.compiler)
+        val ds = DerivativeStructure(this)
+        compiler.subtract(data, 0, arg.data, 0, ds.data, 0)
+        return ds
+    }
+
+    override operator fun DerivativeStructure<T, A>.plus(other: Number): DerivativeStructure<T, A> {
+        val ds = DerivativeStructure(this)
+        ds.data[0] = algebra { ds.data[0] + number(other) }
+        return ds
+    }
+
+    override operator fun DerivativeStructure<T, A>.minus(other: Number): DerivativeStructure<T, A> =
+        this + -other.toDouble()
+
+    override operator fun Number.plus(other: DerivativeStructure<T, A>): DerivativeStructure<T, A> = other + this
+    override operator fun Number.minus(other: DerivativeStructure<T, A>): DerivativeStructure<T, A> = other - this
+}
+
+@UnstableKMathAPI
+public class DerivativeStructureRingExpression<T, A>(
+    public val algebra: A,
+    public val bufferFactory: MutableBufferFactory<T>,
+    public val function: DerivativeStructureRing<T, A>.() -> DerivativeStructure<T, A>,
+) : DifferentiableExpression<T> where A : Ring<T>, A : ScaleOperations<T>, A : NumericAlgebra<T> {
+    override operator fun invoke(arguments: Map<Symbol, T>): T =
+        DerivativeStructureRing(algebra, bufferFactory, 0, arguments).function().value
+
+    override fun derivativeOrNull(symbols: List<Symbol>): Expression<T> = Expression { arguments ->
+        with(
+            DerivativeStructureRing(
+                algebra,
+                bufferFactory,
+                symbols.size,
+                arguments
+            )
+        ) { function().derivative(symbols) }
+    }
+}
+
+/**
+ * A field over commons-math [DerivativeStructure].
+ *
+ * @property order The derivation order.
+ * @param bindings The map of bindings values. All bindings are considered free parameters.
+ */
+@UnstableKMathAPI
+public class DerivativeStructureField<T, A : ExtendedField<T>>(
+    algebra: A,
+    bufferFactory: MutableBufferFactory<T>,
+    order: Int,
+    bindings: Map<Symbol, T>,
+) : DerivativeStructureRing<T, A>(algebra, bufferFactory, order, bindings), ExtendedField<DerivativeStructure<T, A>> {
+    override fun number(value: Number): DerivativeStructure<T, A> = const(algebra.number(value))
+
+    override fun divide(left: DerivativeStructure<T, A>, right: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        left.compiler.checkCompatibility(right.compiler)
+        val result = DerivativeStructure(this, left.compiler)
+        left.compiler.divide(left.data, 0, right.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun sin(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.sin(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun cos(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.cos(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun tan(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.tan(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun asin(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.asin(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun acos(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.acos(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun atan(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.atan(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun sinh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.sinh(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun cosh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.cosh(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun tanh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.tanh(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun asinh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.asinh(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun acosh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.acosh(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun atanh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.atanh(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun power(arg: DerivativeStructure<T, A>, pow: Number): DerivativeStructure<T, A> = when (pow) {
+        is Int -> {
+            val result = DerivativeStructure(this, arg.compiler)
+            arg.compiler.pow(arg.data, 0, pow, result.data, 0)
+            result
+        }
+        else -> {
+            val result = DerivativeStructure(this, arg.compiler)
+            arg.compiler.pow(arg.data, 0, pow.toDouble(), result.data, 0)
+            result
+        }
+    }
+
+    override fun sqrt(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.sqrt(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    public fun power(arg: DerivativeStructure<T, A>, pow: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        arg.compiler.checkCompatibility(pow.compiler)
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.pow(arg.data, 0, pow.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun exp(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.exp(arg.data, 0, result.data, 0)
+        return result
+    }
+
+    override fun ln(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
+        val result = DerivativeStructure(this, arg.compiler)
+        arg.compiler.ln(arg.data, 0, result.data, 0)
+        return result
+    }
+}
+
+@UnstableKMathAPI
+public class DerivativeStructureFieldExpression<T, A : ExtendedField<T>>(
+    public val algebra: A,
+    public val bufferFactory: MutableBufferFactory<T>,
+    public val function: DerivativeStructureField<T, A>.() -> DerivativeStructure<T, A>,
+) : DifferentiableExpression<T> {
+    override operator fun invoke(arguments: Map<Symbol, T>): T =
+        DerivativeStructureField(algebra, bufferFactory, 0, arguments).function().value
+
+    override fun derivativeOrNull(symbols: List<Symbol>): Expression<T> = Expression { arguments ->
+        with(
+            DerivativeStructureField(
+                algebra,
+                bufferFactory,
+                symbols.size,
+                arguments,
+            )
+        ) { function().derivative(symbols) }
+    }
+}
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt
new file mode 100644
index 000000000..429fe310b
--- /dev/null
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+@file:OptIn(UnstableKMathAPI::class)
+
+package space.kscience.kmath.expressions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.structures.DoubleBuffer
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFails
+
+internal inline fun diff(
+    order: Int,
+    vararg parameters: Pair<Symbol, Double>,
+    block: DerivativeStructureField<Double, DoubleField>.() -> Unit,
+) {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    DerivativeStructureField(DoubleField, ::DoubleBuffer, order, mapOf(*parameters)).block()
+}
+
+internal class AutoDiffTest {
+    private val x by symbol
+    private val y by symbol
+
+    @Test
+    fun derivativeStructureFieldTest() {
+        diff(2, x to 1.0, y to 1.0) {
+            val x = bindSymbol(x)//by binding()
+            val y = bindSymbol("y")
+            val z = x * (-sin(x * y) + y) + 2.0
+            println(z.derivative(x))
+            println(z.derivative(y, x))
+            assertEquals(z.derivative(x, y), z.derivative(y, x))
+            // check improper order cause failure
+            assertFails { z.derivative(x, x, y) }
+        }
+    }
+
+    @Test
+    fun autoDifTest() {
+        val f = DerivativeStructureFieldExpression(DoubleField, ::DoubleBuffer) {
+            val x by binding
+            val y by binding
+            x.pow(2) + 2 * x * y + y.pow(2) + 1
+        }
+
+        assertEquals(10.0, f(x to 1.0, y to 2.0))
+        assertEquals(6.0, f.derivative(x)(x to 1.0, y to 2.0))
+        assertEquals(2.0, f.derivative(x, x)(x to 1.234, y to -2.0))
+        assertEquals(2.0, f.derivative(x, y)(x to 1.0, y to 2.0))
+    }
+}
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
index 3997a77b3..71fd15fe6 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
@@ -48,7 +48,8 @@ internal object InternalUtils {
                 cache.copyInto(
                     logFactorials,
                     BEGIN_LOG_FACTORIALS,
-                    BEGIN_LOG_FACTORIALS, endCopy
+                    BEGIN_LOG_FACTORIALS,
+                    endCopy,
                 )
             } else
             // All values to be computed
-- 
2.34.1


From 745a7ad66ef125d3f0b00de455109f8e62f2fa58 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Sat, 5 Feb 2022 04:27:10 +0700
Subject: [PATCH 406/713] Add complete constant folding in kmath-ast by
 introducing TypedMst, some minor changes

---
 README.md                                     |   6 +
 kmath-ast/README.md                           |  63 ++++---
 kmath-ast/docs/README-TEMPLATE.md             | 114 +++++++----
 .../space/kscience/kmath/ast/TypedMst.kt      | 177 ++++++++++++++++++
 .../kscience/kmath/ast/evaluateConstants.kt   |  93 +++++++++
 .../space/kscience/kmath/ast/TestFolding.kt   |  52 +++++
 .../space/kscience/kmath/estree/estree.kt     |  89 +++------
 .../kmath/estree/internal/ESTreeBuilder.kt    |   2 +-
 .../kmath/wasm/internal/WasmBuilder.kt        |  67 +++----
 .../kotlin/space/kscience/kmath/wasm/wasm.kt  |  30 ++-
 .../kotlin/space/kscience/kmath/asm/asm.kt    | 135 +++++++------
 .../kmath/asm/internal/GenericAsmBuilder.kt   |   8 +-
 .../kmath/asm/internal/PrimitiveAsmBuilder.kt |  82 +++-----
 .../kmath/asm/internal/codegenUtils.kt        |   8 +-
 .../FunctionalExpressionAlgebra.kt            |   4 +-
 .../space/kscience/kmath/expressions/MST.kt   |   4 +-
 16 files changed, 622 insertions(+), 312 deletions(-)
 create mode 100644 kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt
 create mode 100644 kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt
 create mode 100644 kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestFolding.kt

diff --git a/README.md b/README.md
index 92260716e..99dd6d00f 100644
--- a/README.md
+++ b/README.md
@@ -247,6 +247,12 @@ One can still use generic algebras though.
 > **Maturity**: PROTOTYPE
 <hr/>
 
+* ### [kmath-tensorflow](kmath-tensorflow)
+> 
+>
+> **Maturity**: PROTOTYPE
+<hr/>
+
 * ### [kmath-tensors](kmath-tensors)
 > 
 >
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index 5e3366881..bedf17486 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -1,6 +1,6 @@
 # Module kmath-ast
 
-Performance and visualization extensions to MST API.
+Extensions to MST API: transformations, dynamic compilation and visualization.
 
  - [expression-language](src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt) : Expression language and its parser
  - [mst-jvm-codegen](src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt) : Dynamic MST to JVM bytecode compiler
@@ -35,6 +35,26 @@ dependencies {
 }
 ```
 
+## Parsing expressions
+
+In this module there is a parser from human-readable strings like `"x^3-x+3"` (in the more specific [grammar](reference/ArithmeticsEvaluator.g4)) to MST instances.
+
+Supported literals:
+1. Constants and variables (consist of latin letters, digits and underscores, can't start with digit): `x`, `_Abc2`.
+2. Numbers: `123`, `1.02`, `1e10`, `1e-10`, `1.0e+3`&mdash;all parsed either as `kotlin.Long` or `kotlin.Double`.
+
+Supported binary operators (from the highest precedence to the lowest one):
+1. `^`
+2. `*`, `/`
+3. `+`, `-`
+
+Supported unary operator:
+1. `-`, e.&nbsp;g. `-x`
+
+Arbitrary unary and binary functions are also supported: names consist of latin letters, digits and underscores, can't start with digit. Examples:
+1. `sin(x)`
+2. `add(x, y)`
+
 ## Dynamic expression code generation
 
 ### On JVM
@@ -42,48 +62,41 @@ dependencies {
 `kmath-ast` JVM module supports runtime code generation to eliminate overhead of tree traversal. Code generator builds a
 special implementation of `Expression<T>` with implemented `invoke` function.
 
-For example, the following builder:
+For example, the following code:
 
 ```kotlin
-import space.kscience.kmath.expressions.Symbol.Companion.x
-import space.kscience.kmath.expressions.*
-import space.kscience.kmath.operations.*
-import space.kscience.kmath.asm.*
+import space.kscience.kmath.asm.compileToExpression
+import space.kscience.kmath.complex.ComplexField
 
-MstField { x + 2 }.compileToExpression(DoubleField)
-``` 
+"x+2".parseMath().compileToExpression(ComplexField)
+```
 
-... leads to generation of bytecode, which can be decompiled to the following Java class:
+&mldr; leads to generation of bytecode, which can be decompiled to the following Java class:
 
 ```java
-package space.kscience.kmath.asm.generated;
-
 import java.util.Map;
-
 import kotlin.jvm.functions.Function2;
 import space.kscience.kmath.asm.internal.MapIntrinsics;
+import space.kscience.kmath.complex.Complex;
 import space.kscience.kmath.expressions.Expression;
 import space.kscience.kmath.expressions.Symbol;
 
-public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
+public final class CompiledExpression_45045_0 implements Expression<Complex> {
     private final Object[] constants;
 
-    public final Double invoke(Map<Symbol, ? extends Double> arguments) {
-        return (Double) ((Function2) this.constants[0]).invoke((Double) MapIntrinsics.getOrFail(arguments, "x"), 2);
-    }
-
-    public AsmCompiledExpression_45045_0(Object[] constants) {
-        this.constants = constants;
+    public Complex invoke(Map<Symbol, ? extends Complex> arguments) {
+        Complex var2 = (Complex)MapIntrinsics.getOrFail(arguments, "x");
+        return (Complex)((Function2)this.constants[0]).invoke(var2, (Complex)this.constants[1]);
     }
 }
-
 ```
 
-#### Known issues
+Setting JVM system property `space.kscience.kmath.ast.dump.generated.classes` to `1` makes the translator dump class files to program's working directory, so they can be reviewed manually.
 
-- The same classes may be generated and loaded twice, so it is recommended to cache compiled expressions to avoid class
-  loading overhead.
-- This API is not supported by non-dynamic JVM implementations (like TeaVM and GraalVM) because of using class loaders.
+#### Limitations
+
+- The same classes may be generated and loaded twice, so it is recommended to cache compiled expressions to avoid class loading overhead.
+- This API is not supported by non-dynamic JVM implementations like TeaVM or GraalVM Native Image because they may not support class loaders.
 
 ### On JS
 
@@ -129,7 +142,7 @@ An example of emitted Wasm IR in the form of WAT:
 )
 ```
 
-#### Known issues
+#### Limitations
 
 - ESTree expression compilation uses `eval` which can be unavailable in several environments.
 - WebAssembly isn't supported by old versions of browsers (see https://webassembly.org/roadmap/).
diff --git a/kmath-ast/docs/README-TEMPLATE.md b/kmath-ast/docs/README-TEMPLATE.md
index 9494af63a..e9e22f4d4 100644
--- a/kmath-ast/docs/README-TEMPLATE.md
+++ b/kmath-ast/docs/README-TEMPLATE.md
@@ -1,11 +1,31 @@
 # Module kmath-ast
 
-Performance and visualization extensions to MST API.
+Extensions to MST API: transformations, dynamic compilation and visualization.
 
 ${features}
 
 ${artifact}
 
+## Parsing expressions
+
+In this module there is a parser from human-readable strings like `"x^3-x+3"` (in the more specific [grammar](reference/ArithmeticsEvaluator.g4)) to MST instances.
+
+Supported literals:
+1. Constants and variables (consist of latin letters, digits and underscores, can't start with digit): `x`, `_Abc2`.
+2. Numbers: `123`, `1.02`, `1e10`, `1e-10`, `1.0e+3`&mdash;all parsed either as `kotlin.Long` or `kotlin.Double`.
+
+Supported binary operators (from the highest precedence to the lowest one):
+1. `^`
+2. `*`, `/`
+3. `+`, `-`
+
+Supported unary operator:
+1. `-`, e.&nbsp;g. `-x`
+
+Arbitrary unary and binary functions are also supported: names consist of latin letters, digits and underscores, can't start with digit. Examples:
+1. `sin(x)`
+2. `add(x, y)`
+
 ## Dynamic expression code generation
 
 ### On JVM
@@ -13,48 +33,66 @@ ${artifact}
 `kmath-ast` JVM module supports runtime code generation to eliminate overhead of tree traversal. Code generator builds a
 special implementation of `Expression<T>` with implemented `invoke` function.
 
-For example, the following builder:
+For example, the following code:
 
 ```kotlin
-import space.kscience.kmath.expressions.Symbol.Companion.x
-import space.kscience.kmath.expressions.*
-import space.kscience.kmath.operations.*
-import space.kscience.kmath.asm.*
-
-MstField { x + 2 }.compileToExpression(DoubleField)
-``` 
-
-... leads to generation of bytecode, which can be decompiled to the following Java class:
-
-```java
-package space.kscience.kmath.asm.generated;
-
-import java.util.Map;
-
-import kotlin.jvm.functions.Function2;
-import space.kscience.kmath.asm.internal.MapIntrinsics;
-import space.kscience.kmath.expressions.Expression;
-import space.kscience.kmath.expressions.Symbol;
-
-public final class AsmCompiledExpression_45045_0 implements Expression<Double> {
-    private final Object[] constants;
-
-    public final Double invoke(Map<Symbol, ? extends Double> arguments) {
-        return (Double) ((Function2) this.constants[0]).invoke((Double) MapIntrinsics.getOrFail(arguments, "x"), 2);
-    }
-
-    public AsmCompiledExpression_45045_0(Object[] constants) {
-        this.constants = constants;
-    }
-}
+import space.kscience.kmath.asm.compileToExpression
+import space.kscience.kmath.operations.DoubleField
 
+"x^3-x+3".parseMath().compileToExpression(DoubleField)
 ```
 
-#### Known issues
+&mldr; leads to generation of bytecode, which can be decompiled to the following Java class:
 
-- The same classes may be generated and loaded twice, so it is recommended to cache compiled expressions to avoid class
-  loading overhead.
-- This API is not supported by non-dynamic JVM implementations (like TeaVM and GraalVM) because of using class loaders.
+```java
+import java.util.*;
+import kotlin.jvm.functions.*;
+import space.kscience.kmath.asm.internal.*;
+import space.kscience.kmath.complex.*;
+import space.kscience.kmath.expressions.*;
+
+public final class CompiledExpression_45045_0 implements Expression<Complex> {
+    private final Object[] constants;
+
+    public Complex invoke(Map<Symbol, ? extends Complex> arguments) {
+        Complex var2 = (Complex)MapIntrinsics.getOrFail(arguments, "x");
+        return (Complex)((Function2)this.constants[0]).invoke(var2, (Complex)this.constants[1]);
+    }
+}
+```
+
+For `LongRing`, `IntRing`, and `DoubleField` specialization is supported for better performance:
+
+```java
+import java.util.*;
+import space.kscience.kmath.asm.internal.*;
+import space.kscience.kmath.expressions.*;
+
+public final class CompiledExpression_-386104628_0 implements DoubleExpression {
+    private final SymbolIndexer indexer;
+
+    public SymbolIndexer getIndexer() {
+        return this.indexer;
+    }
+
+    public double invoke(double[] arguments) {
+        double var2 = arguments[0];
+        return Math.pow(var2, 3.0D) - var2 + 3.0D;
+    }
+
+    public final Double invoke(Map<Symbol, ? extends Double> arguments) {
+        double var2 = ((Double)MapIntrinsics.getOrFail(arguments, "x")).doubleValue();
+        return Math.pow(var2, 3.0D) - var2 + 3.0D;
+    }
+}
+```
+
+Setting JVM system property `space.kscience.kmath.ast.dump.generated.classes` to `1` makes the translator dump class files to program's working directory, so they can be reviewed manually.
+
+#### Limitations
+
+- The same classes may be generated and loaded twice, so it is recommended to cache compiled expressions to avoid class loading overhead.
+- This API is not supported by non-dynamic JVM implementations like TeaVM or GraalVM Native Image because they may not support class loaders.
 
 ### On JS
 
@@ -100,7 +138,7 @@ An example of emitted Wasm IR in the form of WAT:
 )
 ```
 
-#### Known issues
+#### Limitations
 
 - ESTree expression compilation uses `eval` which can be unavailable in several environments.
 - WebAssembly isn't supported by old versions of browsers (see https://webassembly.org/roadmap/).
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt
new file mode 100644
index 000000000..8a8b8797d
--- /dev/null
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast
+
+import space.kscience.kmath.expressions.Expression
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Algebra
+import space.kscience.kmath.operations.NumericAlgebra
+
+/**
+ * MST form where all values belong to the type [T]. It is optimal for constant folding, dynamic compilation, etc.
+ *
+ * @param T the type.
+ */
+@UnstableKMathAPI
+public sealed interface TypedMst<T> {
+    /**
+     * A node containing a unary operation.
+     *
+     * @param T the type.
+     * @property operation The identifier of operation.
+     * @property function The function implementing this operation.
+     * @property value The argument of this operation.
+     */
+    public class Unary<T>(public val operation: String, public val function: (T) -> T, public val value: TypedMst<T>) :
+        TypedMst<T> {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other == null || this::class != other::class) return false
+            other as Unary<*>
+            if (operation != other.operation) return false
+            if (value != other.value) return false
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = operation.hashCode()
+            result = 31 * result + value.hashCode()
+            return result
+        }
+
+        override fun toString(): String = "Unary(operation=$operation, value=$value)"
+    }
+
+    /**
+     * A node containing binary operation.
+     *
+     * @param T the type.
+     * @property operation The identifier of operation.
+     * @property function The binary function implementing this operation.
+     * @property left The left operand.
+     * @property right The right operand.
+     */
+    public class Binary<T>(
+        public val operation: String,
+        public val function: Function<T>,
+        public val left: TypedMst<T>,
+        public val right: TypedMst<T>,
+    ) : TypedMst<T> {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other == null || this::class != other::class) return false
+
+            other as Binary<*>
+
+            if (operation != other.operation) return false
+            if (left != other.left) return false
+            if (right != other.right) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = operation.hashCode()
+            result = 31 * result + left.hashCode()
+            result = 31 * result + right.hashCode()
+            return result
+        }
+
+        override fun toString(): String = "Binary(operation=$operation, left=$left, right=$right)"
+    }
+
+    /**
+     * The non-numeric constant value.
+     *
+     * @param T the type.
+     * @property value The held value.
+     * @property number The number this value corresponds.
+     */
+    public class Constant<T>(public val value: T, public val number: Number?) : TypedMst<T> {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other == null || this::class != other::class) return false
+            other as Constant<*>
+            if (value != other.value) return false
+            if (number != other.number) return false
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = value?.hashCode() ?: 0
+            result = 31 * result + (number?.hashCode() ?: 0)
+            return result
+        }
+
+        override fun toString(): String = "Constant(value=$value, number=$number)"
+    }
+
+    /**
+     * The node containing a variable
+     *
+     * @param T the type.
+     * @property symbol The symbol of the variable.
+     */
+    public class Variable<T>(public val symbol: Symbol) : TypedMst<T> {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other == null || this::class != other::class) return false
+            other as Variable<*>
+            if (symbol != other.symbol) return false
+            return true
+        }
+
+        override fun hashCode(): Int = symbol.hashCode()
+        override fun toString(): String = "Variable(symbol=$symbol)"
+    }
+}
+
+/**
+ * Interprets the [TypedMst] node with this [Algebra] and [arguments].
+ */
+@UnstableKMathAPI
+public fun <T> TypedMst<T>.interpret(algebra: Algebra<T>, arguments: Map<Symbol, T>): T = when (this) {
+    is TypedMst.Unary -> algebra.unaryOperation(operation, interpret(algebra, arguments))
+
+    is TypedMst.Binary -> when {
+        algebra is NumericAlgebra && left is TypedMst.Constant && left.number != null ->
+            algebra.leftSideNumberOperation(operation, left.number, right.interpret(algebra, arguments))
+
+        algebra is NumericAlgebra && right is TypedMst.Constant && right.number != null ->
+            algebra.rightSideNumberOperation(operation, left.interpret(algebra, arguments), right.number)
+
+        else -> algebra.binaryOperation(
+            operation,
+            left.interpret(algebra, arguments),
+            right.interpret(algebra, arguments),
+        )
+    }
+
+    is TypedMst.Constant -> value
+    is TypedMst.Variable -> arguments.getValue(symbol)
+}
+
+/**
+ * Interprets the [TypedMst] node with this [Algebra] and optional [arguments].
+ */
+@UnstableKMathAPI
+public fun <T> TypedMst<T>.interpret(algebra: Algebra<T>, vararg arguments: Pair<Symbol, T>): T = interpret(
+    algebra,
+    when (arguments.size) {
+        0 -> emptyMap()
+        1 -> mapOf(arguments[0])
+        else -> hashMapOf(*arguments)
+    },
+)
+
+/**
+ * Interpret this [TypedMst] node as expression.
+ */
+@UnstableKMathAPI
+public fun <T : Any> TypedMst<T>.toExpression(algebra: Algebra<T>): Expression<T> = Expression { arguments ->
+    interpret(algebra, arguments)
+}
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt
new file mode 100644
index 000000000..71fb154c9
--- /dev/null
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast
+
+import space.kscience.kmath.expressions.MST
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Algebra
+import space.kscience.kmath.operations.NumericAlgebra
+import space.kscience.kmath.operations.bindSymbolOrNull
+
+/**
+ * Evaluates constants in given [MST] for given [algebra] at the same time with converting to [TypedMst].
+ */
+@UnstableKMathAPI
+public fun <T> MST.evaluateConstants(algebra: Algebra<T>): TypedMst<T> = when (this) {
+    is MST.Numeric -> TypedMst.Constant(
+        (algebra as? NumericAlgebra<T>)?.number(value) ?: error("Numeric nodes are not supported by $algebra"),
+        value,
+    )
+
+    is MST.Unary -> when (val arg = value.evaluateConstants(algebra)) {
+        is TypedMst.Constant<T> -> {
+            val value = algebra.unaryOperation(
+                operation,
+                arg.value,
+            )
+
+            TypedMst.Constant(value, if (value is Number) value else null)
+        }
+
+        else -> TypedMst.Unary(operation, algebra.unaryOperationFunction(operation), arg)
+    }
+
+    is MST.Binary -> {
+        val left = left.evaluateConstants(algebra)
+        val right = right.evaluateConstants(algebra)
+
+        when {
+            left is TypedMst.Constant<T> && right is TypedMst.Constant<T> -> {
+                val value = when {
+                    algebra is NumericAlgebra && left.number != null -> algebra.leftSideNumberOperation(
+                        operation,
+                        left.number,
+                        right.value,
+                    )
+
+                    algebra is NumericAlgebra && right.number != null -> algebra.rightSideNumberOperation(
+                        operation,
+                        left.value,
+                        right.number,
+                    )
+
+                    else -> algebra.binaryOperation(
+                        operation,
+                        left.value,
+                        right.value,
+                    )
+                }
+
+                TypedMst.Constant(value, if (value is Number) value else null)
+            }
+
+            algebra is NumericAlgebra && left is TypedMst.Constant && left.number != null -> TypedMst.Binary(
+                operation,
+                algebra.leftSideNumberOperationFunction(operation),
+                left,
+                right,
+            )
+
+            algebra is NumericAlgebra && right is TypedMst.Constant && right.number != null -> TypedMst.Binary(
+                operation,
+                algebra.rightSideNumberOperationFunction(operation),
+                left,
+                right,
+            )
+
+            else -> TypedMst.Binary(operation, algebra.binaryOperationFunction(operation), left, right)
+        }
+    }
+
+    is Symbol -> {
+        val boundSymbol = algebra.bindSymbolOrNull(this)
+
+        if (boundSymbol != null)
+            TypedMst.Constant(boundSymbol, if (boundSymbol is Number) boundSymbol else null)
+        else
+            TypedMst.Variable(this)
+    }
+}
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestFolding.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestFolding.kt
new file mode 100644
index 000000000..954a0f330
--- /dev/null
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestFolding.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast
+
+import space.kscience.kmath.operations.ByteRing
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.IntRing
+import space.kscience.kmath.operations.pi
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.fail
+
+internal class TestFolding {
+    @Test
+    fun foldUnary() = assertEquals(
+        -1,
+        ("-(1)".parseMath().evaluateConstants(IntRing) as? TypedMst.Constant<Int> ?: fail()).value,
+    )
+
+    @Test
+    fun foldDeepUnary() = assertEquals(
+        1,
+        ("-(-(1))".parseMath().evaluateConstants(IntRing) as? TypedMst.Constant<Int> ?: fail()).value,
+    )
+
+    @Test
+    fun foldBinary() = assertEquals(
+        2,
+        ("1*2".parseMath().evaluateConstants(IntRing) as? TypedMst.Constant<Int> ?: fail()).value,
+    )
+
+    @Test
+    fun foldDeepBinary() = assertEquals(
+        10,
+        ("1*2*5".parseMath().evaluateConstants(IntRing) as? TypedMst.Constant<Int> ?: fail()).value,
+    )
+
+    @Test
+    fun foldSymbol() = assertEquals(
+        DoubleField.pi,
+        ("pi".parseMath().evaluateConstants(DoubleField) as? TypedMst.Constant<Double> ?: fail()).value,
+    )
+
+    @Test
+    fun foldNumeric() = assertEquals(
+        42.toByte(),
+        ("42".parseMath().evaluateConstants(ByteRing) as? TypedMst.Constant<Byte> ?: fail()).value,
+    )
+}
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
index a6b6e022b..a8b1aa2e1 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
@@ -5,87 +5,48 @@
 
 package space.kscience.kmath.estree
 
+import space.kscience.kmath.ast.TypedMst
+import space.kscience.kmath.ast.evaluateConstants
 import space.kscience.kmath.estree.internal.ESTreeBuilder
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.expressions.MST.*
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.invoke
 import space.kscience.kmath.internal.estree.BaseExpression
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Algebra
-import space.kscience.kmath.operations.NumericAlgebra
-import space.kscience.kmath.operations.bindSymbolOrNull
-
-@PublishedApi
-internal fun <T> MST.compileWith(algebra: Algebra<T>): Expression<T> {
-    fun ESTreeBuilder<T>.visit(node: MST): BaseExpression = when (node) {
-        is Symbol -> {
-            val symbol = algebra.bindSymbolOrNull(node)
-
-            if (symbol != null)
-                constant(symbol)
-            else
-                variable(node.identity)
-        }
-
-        is Numeric -> constant(
-            (algebra as? NumericAlgebra<T>)?.number(node.value) ?: error("Numeric nodes are not supported by $this")
-        )
-
-        is Unary -> when {
-            algebra is NumericAlgebra && node.value is Numeric -> constant(
-                algebra.unaryOperationFunction(node.operation)(algebra.number((node.value as Numeric).value))
-            )
-
-            else -> call(algebra.unaryOperationFunction(node.operation), visit(node.value))
-        }
-
-        is Binary -> when {
-            algebra is NumericAlgebra && node.left is Numeric && node.right is Numeric -> constant(
-                algebra.binaryOperationFunction(node.operation).invoke(
-                    algebra.number((node.left as Numeric).value),
-                    algebra.number((node.right as Numeric).value)
-                )
-            )
-
-            algebra is NumericAlgebra && node.left is Numeric -> call(
-                algebra.leftSideNumberOperationFunction(node.operation),
-                visit(node.left),
-                visit(node.right),
-            )
-
-            algebra is NumericAlgebra && node.right is Numeric -> call(
-                algebra.rightSideNumberOperationFunction(node.operation),
-                visit(node.left),
-                visit(node.right),
-            )
-
-            else -> call(
-                algebra.binaryOperationFunction(node.operation),
-                visit(node.left),
-                visit(node.right),
-            )
-        }
-    }
-
-    return ESTreeBuilder<T> { visit(this@compileWith) }.instance
-}
 
 /**
  * Create a compiled expression with given [MST] and given [algebra].
  */
-public fun <T : Any> MST.compileToExpression(algebra: Algebra<T>): Expression<T> = compileWith(algebra)
+@OptIn(UnstableKMathAPI::class)
+public fun <T : Any> MST.compileToExpression(algebra: Algebra<T>): Expression<T> {
+    val typed = evaluateConstants(algebra)
+    if (typed is TypedMst.Constant<T>) return Expression { typed.value }
 
+    fun ESTreeBuilder<T>.visit(node: TypedMst<T>): BaseExpression = when (node) {
+        is TypedMst.Constant -> constant(node.value)
+        is TypedMst.Variable -> variable(node.symbol)
+        is TypedMst.Unary -> call(node.function, visit(node.value))
+
+        is TypedMst.Binary -> call(
+            node.function,
+            visit(node.left),
+            visit(node.right),
+        )
+    }
+
+    return ESTreeBuilder<T> { visit(typed) }.instance
+}
 
 /**
  * Compile given MST to expression and evaluate it against [arguments]
  */
-public inline fun <reified T : Any> MST.compile(algebra: Algebra<T>, arguments: Map<Symbol, T>): T =
-    compileToExpression(algebra).invoke(arguments)
-
+public fun <T : Any> MST.compile(algebra: Algebra<T>, arguments: Map<Symbol, T>): T =
+    compileToExpression(algebra)(arguments)
 
 /**
  * Compile given MST to expression and evaluate it against [arguments]
  */
-public inline fun <reified T : Any> MST.compile(algebra: Algebra<T>, vararg arguments: Pair<Symbol, T>): T =
-    compileToExpression(algebra).invoke(*arguments)
+public fun <T : Any> MST.compile(algebra: Algebra<T>, vararg arguments: Pair<Symbol, T>): T =
+    compileToExpression(algebra)(*arguments)
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
index 4907d8225..10a6c4a16 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
@@ -61,7 +61,7 @@ internal class ESTreeBuilder<T>(val bodyCallback: ESTreeBuilder<T>.() -> BaseExp
         }
     }
 
-    fun variable(name: String): BaseExpression = call(getOrFail, Identifier("arguments"), SimpleLiteral(name))
+    fun variable(name: Symbol): BaseExpression = call(getOrFail, Identifier("arguments"), SimpleLiteral(name.identity))
 
     fun call(function: Function<T>, vararg args: BaseExpression): BaseExpression = SimpleCallExpression(
         optional = false,
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index 96090a633..aacb62f36 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.wasm.internal
 
+import space.kscience.kmath.ast.TypedMst
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.expressions.MST.*
 import space.kscience.kmath.internal.binaryen.*
 import space.kscience.kmath.internal.webassembly.Instance
 import space.kscience.kmath.misc.UnstableKMathAPI
@@ -16,11 +16,12 @@ import space.kscience.kmath.internal.webassembly.Module as WasmModule
 
 private val spreader = eval("(obj, args) => obj(...args)")
 
+@OptIn(UnstableKMathAPI::class)
 @Suppress("UnsafeCastFromDynamic")
 internal sealed class WasmBuilder<T : Number, out E : Expression<T>>(
     protected val binaryenType: Type,
     protected val algebra: Algebra<T>,
-    protected val target: MST,
+    protected val target: TypedMst<T>,
 ) {
     protected val keys: MutableList<Symbol> = mutableListOf()
     protected lateinit var ctx: BinaryenModule
@@ -51,59 +52,41 @@ internal sealed class WasmBuilder<T : Number, out E : Expression<T>>(
         Instance(c, js("{}")).exports.executable
     }
 
-    protected open fun visitSymbol(node: Symbol): ExpressionRef {
-        algebra.bindSymbolOrNull(node)?.let { return visitNumeric(Numeric(it)) }
+    protected abstract fun visitNumber(number: Number): ExpressionRef
 
-        var idx = keys.indexOf(node)
+    protected open fun visitVariable(node: TypedMst.Variable<T>): ExpressionRef {
+        var idx = keys.indexOf(node.symbol)
 
         if (idx == -1) {
-            keys += node
+            keys += node.symbol
             idx = keys.lastIndex
         }
 
         return ctx.local.get(idx, binaryenType)
     }
 
-    protected abstract fun visitNumeric(node: Numeric): ExpressionRef
-
-    protected open fun visitUnary(node: Unary): ExpressionRef =
+    protected open fun visitUnary(node: TypedMst.Unary<T>): ExpressionRef =
         error("Unary operation ${node.operation} not defined in $this")
 
-    protected open fun visitBinary(mst: Binary): ExpressionRef =
+    protected open fun visitBinary(mst: TypedMst.Binary<T>): ExpressionRef =
         error("Binary operation ${mst.operation} not defined in $this")
 
     protected open fun createModule(): BinaryenModule = js("new \$module\$binaryen.Module()")
 
-    protected fun visit(node: MST): ExpressionRef = when (node) {
-        is Symbol -> visitSymbol(node)
-        is Numeric -> visitNumeric(node)
+    protected fun visit(node: TypedMst<T>): ExpressionRef = when (node) {
+        is TypedMst.Constant -> visitNumber(
+            node.number ?: error("Object constants are not supported by pritimive ASM builder"),
+        )
 
-        is Unary -> when {
-            algebra is NumericAlgebra && node.value is Numeric -> visitNumeric(
-                Numeric(algebra.unaryOperationFunction(node.operation)(algebra.number((node.value as Numeric).value)))
-            )
-
-            else -> visitUnary(node)
-        }
-
-        is Binary -> when {
-            algebra is NumericAlgebra && node.left is Numeric && node.right is Numeric -> visitNumeric(
-                Numeric(
-                    algebra.binaryOperationFunction(node.operation)
-                        .invoke(
-                            algebra.number((node.left as Numeric).value),
-                            algebra.number((node.right as Numeric).value)
-                        )
-                )
-            )
-
-            else -> visitBinary(node)
-        }
+        is TypedMst.Variable -> visitVariable(node)
+        is TypedMst.Unary -> visitUnary(node)
+        is TypedMst.Binary -> visitBinary(node)
     }
 }
 
 @UnstableKMathAPI
-internal class DoubleWasmBuilder(target: MST) : WasmBuilder<Double, DoubleExpression>(f64, DoubleField, target) {
+internal class DoubleWasmBuilder(target: TypedMst<Double>) :
+    WasmBuilder<Double, DoubleExpression>(f64, DoubleField, target) {
     override val instance by lazy {
         object : DoubleExpression {
             override val indexer = SimpleSymbolIndexer(keys)
@@ -114,9 +97,9 @@ internal class DoubleWasmBuilder(target: MST) : WasmBuilder<Double, DoubleExpres
 
     override fun createModule() = readBinary(f64StandardFunctions)
 
-    override fun visitNumeric(node: Numeric) = ctx.f64.const(node.value.toDouble())
+    override fun visitNumber(number: Number) = ctx.f64.const(number.toDouble())
 
-    override fun visitUnary(node: Unary): ExpressionRef = when (node.operation) {
+    override fun visitUnary(node: TypedMst.Unary<Double>): ExpressionRef = when (node.operation) {
         GroupOps.MINUS_OPERATION -> ctx.f64.neg(visit(node.value))
         GroupOps.PLUS_OPERATION -> visit(node.value)
         PowerOperations.SQRT_OPERATION -> ctx.f64.sqrt(visit(node.value))
@@ -137,7 +120,7 @@ internal class DoubleWasmBuilder(target: MST) : WasmBuilder<Double, DoubleExpres
         else -> super.visitUnary(node)
     }
 
-    override fun visitBinary(mst: Binary): ExpressionRef = when (mst.operation) {
+    override fun visitBinary(mst: TypedMst.Binary<Double>): ExpressionRef = when (mst.operation) {
         GroupOps.PLUS_OPERATION -> ctx.f64.add(visit(mst.left), visit(mst.right))
         GroupOps.MINUS_OPERATION -> ctx.f64.sub(visit(mst.left), visit(mst.right))
         RingOps.TIMES_OPERATION -> ctx.f64.mul(visit(mst.left), visit(mst.right))
@@ -148,7 +131,7 @@ internal class DoubleWasmBuilder(target: MST) : WasmBuilder<Double, DoubleExpres
 }
 
 @UnstableKMathAPI
-internal class IntWasmBuilder(target: MST) : WasmBuilder<Int, IntExpression>(i32, IntRing, target) {
+internal class IntWasmBuilder(target: TypedMst<Int>) : WasmBuilder<Int, IntExpression>(i32, IntRing, target) {
     override val instance by lazy {
         object : IntExpression {
             override val indexer = SimpleSymbolIndexer(keys)
@@ -157,15 +140,15 @@ internal class IntWasmBuilder(target: MST) : WasmBuilder<Int, IntExpression>(i32
         }
     }
 
-    override fun visitNumeric(node: Numeric) = ctx.i32.const(node.value.toInt())
+    override fun visitNumber(number: Number) = ctx.i32.const(number.toInt())
 
-    override fun visitUnary(node: Unary): ExpressionRef = when (node.operation) {
+    override fun visitUnary(node: TypedMst.Unary<Int>): ExpressionRef = when (node.operation) {
         GroupOps.MINUS_OPERATION -> ctx.i32.sub(ctx.i32.const(0), visit(node.value))
         GroupOps.PLUS_OPERATION -> visit(node.value)
         else -> super.visitUnary(node)
     }
 
-    override fun visitBinary(mst: Binary): ExpressionRef = when (mst.operation) {
+    override fun visitBinary(mst: TypedMst.Binary<Int>): ExpressionRef = when (mst.operation) {
         GroupOps.PLUS_OPERATION -> ctx.i32.add(visit(mst.left), visit(mst.right))
         GroupOps.MINUS_OPERATION -> ctx.i32.sub(visit(mst.left), visit(mst.right))
         RingOps.TIMES_OPERATION -> ctx.i32.mul(visit(mst.left), visit(mst.right))
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
index 12e6b41af..f9540f9db 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
@@ -7,7 +7,8 @@
 
 package space.kscience.kmath.wasm
 
-import space.kscience.kmath.estree.compileWith
+import space.kscience.kmath.ast.TypedMst
+import space.kscience.kmath.ast.evaluateConstants
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
@@ -21,8 +22,16 @@ import space.kscience.kmath.wasm.internal.IntWasmBuilder
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
-public fun MST.compileToExpression(algebra: IntRing): IntExpression = IntWasmBuilder(this).instance
+public fun MST.compileToExpression(algebra: IntRing): IntExpression {
+    val typed = evaluateConstants(algebra)
 
+    return if (typed is TypedMst.Constant) object : IntExpression {
+        override val indexer = SimpleSymbolIndexer(emptyList())
+
+        override fun invoke(arguments: IntArray): Int = typed.value
+    } else
+        IntWasmBuilder(typed).instance
+}
 
 /**
  * Compile given MST to expression and evaluate it against [arguments].
@@ -31,7 +40,7 @@ public fun MST.compileToExpression(algebra: IntRing): IntExpression = IntWasmBui
  */
 @UnstableKMathAPI
 public fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int =
-    compileToExpression(algebra).invoke(arguments)
+    compileToExpression(algebra)(arguments)
 
 
 /**
@@ -49,7 +58,16 @@ public fun MST.compile(algebra: IntRing, vararg arguments: Pair<Symbol, Int>): I
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
-public fun MST.compileToExpression(algebra: DoubleField): Expression<Double> = DoubleWasmBuilder(this).instance
+public fun MST.compileToExpression(algebra: DoubleField): Expression<Double> {
+    val typed = evaluateConstants(algebra)
+
+    return if (typed is TypedMst.Constant) object : DoubleExpression {
+        override val indexer = SimpleSymbolIndexer(emptyList())
+
+        override fun invoke(arguments: DoubleArray): Double = typed.value
+    } else
+        DoubleWasmBuilder(typed).instance
+}
 
 
 /**
@@ -59,7 +77,7 @@ public fun MST.compileToExpression(algebra: DoubleField): Expression<Double> = D
  */
 @UnstableKMathAPI
 public fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Double =
-    compileToExpression(algebra).invoke(arguments)
+    compileToExpression(algebra)(arguments)
 
 
 /**
@@ -69,4 +87,4 @@ public fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Do
  */
 @UnstableKMathAPI
 public fun MST.compile(algebra: DoubleField, vararg arguments: Pair<Symbol, Double>): Double =
-    compileToExpression(algebra).invoke(*arguments)
+    compileToExpression(algebra)(*arguments)
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
index 8e426622d..73b9c97a7 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
@@ -8,10 +8,14 @@
 package space.kscience.kmath.asm
 
 import space.kscience.kmath.asm.internal.*
+import space.kscience.kmath.ast.TypedMst
+import space.kscience.kmath.ast.evaluateConstants
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.expressions.MST.*
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.Algebra
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.IntRing
+import space.kscience.kmath.operations.LongRing
 
 /**
  * Compiles given MST to an Expression using AST compiler.
@@ -21,102 +25,64 @@ import space.kscience.kmath.operations.*
  * @return the compiled expression.
  * @author Alexander Nozik
  */
+@OptIn(UnstableKMathAPI::class)
 @PublishedApi
 internal fun <T : Any> MST.compileWith(type: Class<T>, algebra: Algebra<T>): Expression<T> {
-    fun GenericAsmBuilder<T>.variablesVisitor(node: MST): Unit = when (node) {
-        is Symbol -> prepareVariable(node.identity)
-        is Unary -> variablesVisitor(node.value)
+    val typed = evaluateConstants(algebra)
+    if (typed is TypedMst.Constant<T>) return Expression { typed.value }
 
-        is Binary -> {
+    fun GenericAsmBuilder<T>.variablesVisitor(node: TypedMst<T>): Unit = when (node) {
+        is TypedMst.Unary -> variablesVisitor(node.value)
+
+        is TypedMst.Binary -> {
             variablesVisitor(node.left)
             variablesVisitor(node.right)
         }
 
-        else -> Unit
+        is TypedMst.Variable -> prepareVariable(node.symbol)
+        is TypedMst.Constant -> Unit
     }
 
-    fun GenericAsmBuilder<T>.expressionVisitor(node: MST): Unit = when (node) {
-        is Symbol -> {
-            val symbol = algebra.bindSymbolOrNull(node)
+    fun GenericAsmBuilder<T>.expressionVisitor(node: TypedMst<T>): Unit = when (node) {
+        is TypedMst.Constant -> if (node.number != null)
+            loadNumberConstant(node.number)
+        else
+            loadObjectConstant(node.value)
 
-            if (symbol != null)
-                loadObjectConstant(symbol as Any)
-            else
-                loadVariable(node.identity)
-        }
+        is TypedMst.Variable -> loadVariable(node.symbol)
+        is TypedMst.Unary -> buildCall(node.function) { expressionVisitor(node.value) }
 
-        is Numeric -> if (algebra is NumericAlgebra) {
-            if (Number::class.java.isAssignableFrom(type))
-                loadNumberConstant(algebra.number(node.value) as Number)
-            else
-                loadObjectConstant(algebra.number(node.value))
-        } else
-            error("Numeric nodes are not supported by $this")
-
-        is Unary -> when {
-            algebra is NumericAlgebra && node.value is Numeric -> loadObjectConstant(
-                algebra.unaryOperationFunction(node.operation)(algebra.number((node.value as Numeric).value)),
-            )
-
-            else -> buildCall(algebra.unaryOperationFunction(node.operation)) { expressionVisitor(node.value) }
-        }
-
-        is Binary -> when {
-            algebra is NumericAlgebra && node.left is Numeric && node.right is Numeric -> loadObjectConstant(
-                algebra.binaryOperationFunction(node.operation).invoke(
-                    algebra.number((node.left as Numeric).value),
-                    algebra.number((node.right as Numeric).value),
-                )
-            )
-
-            algebra is NumericAlgebra && node.left is Numeric -> buildCall(
-                algebra.leftSideNumberOperationFunction(node.operation),
-            ) {
-                expressionVisitor(node.left)
-                expressionVisitor(node.right)
-            }
-
-            algebra is NumericAlgebra && node.right is Numeric -> buildCall(
-                algebra.rightSideNumberOperationFunction(node.operation),
-            ) {
-                expressionVisitor(node.left)
-                expressionVisitor(node.right)
-            }
-
-            else -> buildCall(algebra.binaryOperationFunction(node.operation)) {
-                expressionVisitor(node.left)
-                expressionVisitor(node.right)
-            }
+        is TypedMst.Binary -> buildCall(node.function) {
+            expressionVisitor(node.left)
+            expressionVisitor(node.right)
         }
     }
 
     return GenericAsmBuilder<T>(
         type,
-        buildName(this),
-        { variablesVisitor(this@compileWith) },
-        { expressionVisitor(this@compileWith) },
+        buildName("${typed.hashCode()}_${type.simpleName}"),
+        { variablesVisitor(typed) },
+        { expressionVisitor(typed) },
     ).instance
 }
 
-
 /**
  * Create a compiled expression with given [MST] and given [algebra].
  */
 public inline fun <reified T : Any> MST.compileToExpression(algebra: Algebra<T>): Expression<T> =
     compileWith(T::class.java, algebra)
 
-
 /**
  * Compile given MST to expression and evaluate it against [arguments]
  */
 public inline fun <reified T : Any> MST.compile(algebra: Algebra<T>, arguments: Map<Symbol, T>): T =
-    compileToExpression(algebra).invoke(arguments)
+    compileToExpression(algebra)(arguments)
 
 /**
  * Compile given MST to expression and evaluate it against [arguments]
  */
 public inline fun <reified T : Any> MST.compile(algebra: Algebra<T>, vararg arguments: Pair<Symbol, T>): T =
-    compileToExpression(algebra).invoke(*arguments)
+    compileToExpression(algebra)(*arguments)
 
 
 /**
@@ -125,7 +91,16 @@ public inline fun <reified T : Any> MST.compile(algebra: Algebra<T>, vararg argu
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
-public fun MST.compileToExpression(algebra: IntRing): IntExpression = IntAsmBuilder(this).instance
+public fun MST.compileToExpression(algebra: IntRing): IntExpression  {
+    val typed = evaluateConstants(algebra)
+
+    return if (typed is TypedMst.Constant) object : IntExpression {
+        override val indexer = SimpleSymbolIndexer(emptyList())
+
+        override fun invoke(arguments: IntArray): Int = typed.value
+    } else
+        IntAsmBuilder(typed).instance
+}
 
 /**
  * Compile given MST to expression and evaluate it against [arguments].
@@ -134,7 +109,7 @@ public fun MST.compileToExpression(algebra: IntRing): IntExpression = IntAsmBuil
  */
 @UnstableKMathAPI
 public fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int =
-    compileToExpression(algebra).invoke(arguments)
+    compileToExpression(algebra)(arguments)
 
 /**
  * Compile given MST to expression and evaluate it against [arguments].
@@ -152,8 +127,16 @@ public fun MST.compile(algebra: IntRing, vararg arguments: Pair<Symbol, Int>): I
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
-public fun MST.compileToExpression(algebra: LongRing): LongExpression = LongAsmBuilder(this).instance
+public fun MST.compileToExpression(algebra: LongRing): LongExpression {
+    val typed = evaluateConstants(algebra)
 
+    return if (typed is TypedMst.Constant<Long>) object : LongExpression {
+        override val indexer = SimpleSymbolIndexer(emptyList())
+
+        override fun invoke(arguments: LongArray): Long = typed.value
+    } else
+        LongAsmBuilder(typed).instance
+}
 
 /**
  * Compile given MST to expression and evaluate it against [arguments].
@@ -162,7 +145,7 @@ public fun MST.compileToExpression(algebra: LongRing): LongExpression = LongAsmB
  */
 @UnstableKMathAPI
 public fun MST.compile(algebra: LongRing, arguments: Map<Symbol, Long>): Long =
-    compileToExpression(algebra).invoke(arguments)
+    compileToExpression(algebra)(arguments)
 
 
 /**
@@ -181,7 +164,17 @@ public fun MST.compile(algebra: LongRing, vararg arguments: Pair<Symbol, Long>):
  * @author Iaroslav Postovalov
  */
 @UnstableKMathAPI
-public fun MST.compileToExpression(algebra: DoubleField): DoubleExpression = DoubleAsmBuilder(this).instance
+public fun MST.compileToExpression(algebra: DoubleField): DoubleExpression {
+    val typed = evaluateConstants(algebra)
+
+    return if (typed is TypedMst.Constant) object : DoubleExpression {
+        override val indexer = SimpleSymbolIndexer(emptyList())
+
+        override fun invoke(arguments: DoubleArray): Double = typed.value
+    } else
+        DoubleAsmBuilder(typed).instance
+}
+
 
 /**
  * Compile given MST to expression and evaluate it against [arguments].
@@ -190,7 +183,7 @@ public fun MST.compileToExpression(algebra: DoubleField): DoubleExpression = Dou
  */
 @UnstableKMathAPI
 public fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Double =
-    compileToExpression(algebra).invoke(arguments)
+    compileToExpression(algebra)(arguments)
 
 /**
  * Compile given MST to expression and evaluate it against [arguments].
@@ -199,4 +192,4 @@ public fun MST.compile(algebra: DoubleField, arguments: Map<Symbol, Double>): Do
  */
 @UnstableKMathAPI
 public fun MST.compile(algebra: DoubleField, vararg arguments: Pair<Symbol, Double>): Double =
-    compileToExpression(algebra).invoke(*arguments)
+    compileToExpression(algebra)(*arguments)
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
index 5eb739956..6cf3d8721 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
@@ -56,7 +56,7 @@ internal class GenericAsmBuilder<T>(
     /**
      * Local variables indices are indices of symbols in this list.
      */
-    private val argumentsLocals = mutableListOf<String>()
+    private val argumentsLocals = mutableListOf<Symbol>()
 
     /**
      * Subclasses, loads and instantiates [Expression] for given parameters.
@@ -253,10 +253,10 @@ internal class GenericAsmBuilder<T>(
      * Stores value variable [name] into a local. Should be called within [variablesPrepareCallback] before using
      * [loadVariable].
      */
-    fun prepareVariable(name: String): Unit = invokeMethodVisitor.run {
+    fun prepareVariable(name: Symbol): Unit = invokeMethodVisitor.run {
         if (name in argumentsLocals) return@run
         load(1, MAP_TYPE)
-        aconst(name)
+        aconst(name.identity)
 
         invokestatic(
             MAP_INTRINSICS_TYPE.internalName,
@@ -280,7 +280,7 @@ internal class GenericAsmBuilder<T>(
      * Loads a variable [name] from arguments [Map] parameter of [Expression.invoke]. The variable should be stored
      * with [prepareVariable] first.
      */
-    fun loadVariable(name: String): Unit = invokeMethodVisitor.load(2 + argumentsLocals.indexOf(name), tType)
+    fun loadVariable(name: Symbol): Unit = invokeMethodVisitor.load(2 + argumentsLocals.indexOf(name), tType)
 
     inline fun buildCall(function: Function<T>, parameters: GenericAsmBuilder<T>.() -> Unit) {
         contract { callsInPlace(parameters, InvocationKind.EXACTLY_ONCE) }
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
index bf1f42395..01bad83e5 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
@@ -11,6 +11,7 @@ import org.objectweb.asm.Opcodes.*
 import org.objectweb.asm.Type
 import org.objectweb.asm.Type.*
 import org.objectweb.asm.commons.InstructionAdapter
+import space.kscience.kmath.ast.TypedMst
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
@@ -25,9 +26,9 @@ internal sealed class PrimitiveAsmBuilder<T : Number, out E : Expression<T>>(
     classOfT: Class<*>,
     protected val classOfTPrimitive: Class<*>,
     expressionParent: Class<E>,
-    protected val target: MST,
+    protected val target: TypedMst<T>,
 ) : AsmBuilder() {
-    private val className: String = buildName(target)
+    private val className: String = buildName("${target.hashCode()}_${classOfT.simpleName}")
 
     /**
      * ASM type for [tType].
@@ -329,63 +330,39 @@ internal sealed class PrimitiveAsmBuilder<T : Number, out E : Expression<T>>(
     }
 
     private fun visitVariables(
-        node: MST,
+        node: TypedMst<T>,
         arrayMode: Boolean,
         alreadyLoaded: MutableList<Symbol> = mutableListOf()
     ): Unit = when (node) {
-        is Symbol -> when (node) {
-            !in alreadyLoaded -> {
-                alreadyLoaded += node
-                prepareVariable(node, arrayMode)
-            }
-            else -> {
-            }
-        }
+        is TypedMst.Variable -> if (node.symbol !in alreadyLoaded) {
+            alreadyLoaded += node.symbol
+            prepareVariable(node.symbol, arrayMode)
+        } else Unit
 
-        is MST.Unary -> visitVariables(node.value, arrayMode, alreadyLoaded)
+        is TypedMst.Unary -> visitVariables(node.value, arrayMode, alreadyLoaded)
 
-        is MST.Binary -> {
+        is TypedMst.Binary -> {
             visitVariables(node.left, arrayMode, alreadyLoaded)
             visitVariables(node.right, arrayMode, alreadyLoaded)
         }
 
-        else -> Unit
+        is TypedMst.Constant -> Unit
     }
 
-    private fun visitExpression(node: MST): Unit = when (node) {
-        is Symbol -> {
-            val symbol = algebra.bindSymbolOrNull(node)
+    private fun visitExpression(node: TypedMst<T>): Unit = when (node) {
+        is TypedMst.Variable -> loadVariable(node.symbol)
 
-            if (symbol != null)
-                loadNumberConstant(symbol)
-            else
-                loadVariable(node)
-        }
+        is TypedMst.Constant -> loadNumberConstant(
+            node.number ?: error("Object constants are not supported by pritimive ASM builder"),
+        )
 
-        is MST.Numeric -> loadNumberConstant(algebra.number(node.value))
-
-        is MST.Unary -> if (node.value is MST.Numeric)
-            loadNumberConstant(
-                algebra.unaryOperationFunction(node.operation)(algebra.number((node.value as MST.Numeric).value)),
-            )
-        else
-            visitUnary(node)
-
-        is MST.Binary -> when {
-            node.left is MST.Numeric && node.right is MST.Numeric -> loadNumberConstant(
-                algebra.binaryOperationFunction(node.operation)(
-                    algebra.number((node.left as MST.Numeric).value),
-                    algebra.number((node.right as MST.Numeric).value),
-                ),
-            )
-
-            else -> visitBinary(node)
-        }
+        is TypedMst.Unary -> visitUnary(node)
+        is TypedMst.Binary -> visitBinary(node)
     }
 
-    protected open fun visitUnary(node: MST.Unary) = visitExpression(node.value)
+    protected open fun visitUnary(node: TypedMst.Unary<T>) = visitExpression(node.value)
 
-    protected open fun visitBinary(node: MST.Binary) {
+    protected open fun visitBinary(node: TypedMst.Binary<T>) {
         visitExpression(node.left)
         visitExpression(node.right)
     }
@@ -404,14 +381,13 @@ internal sealed class PrimitiveAsmBuilder<T : Number, out E : Expression<T>>(
 }
 
 @UnstableKMathAPI
-internal class DoubleAsmBuilder(target: MST) : PrimitiveAsmBuilder<Double, DoubleExpression>(
+internal class DoubleAsmBuilder(target: TypedMst<Double>) : PrimitiveAsmBuilder<Double, DoubleExpression>(
     DoubleField,
     java.lang.Double::class.java,
     java.lang.Double.TYPE,
     DoubleExpression::class.java,
     target,
 ) {
-
     private fun buildUnaryJavaMathCall(name: String) = invokeMethodVisitor.invokestatic(
         MATH_TYPE.internalName,
         name,
@@ -434,7 +410,7 @@ internal class DoubleAsmBuilder(target: MST) : PrimitiveAsmBuilder<Double, Doubl
         false,
     )
 
-    override fun visitUnary(node: MST.Unary) {
+    override fun visitUnary(node: TypedMst.Unary<Double>) {
         super.visitUnary(node)
 
         when (node.operation) {
@@ -459,7 +435,7 @@ internal class DoubleAsmBuilder(target: MST) : PrimitiveAsmBuilder<Double, Doubl
         }
     }
 
-    override fun visitBinary(node: MST.Binary) {
+    override fun visitBinary(node: TypedMst.Binary<Double>) {
         super.visitBinary(node)
 
         when (node.operation) {
@@ -479,7 +455,7 @@ internal class DoubleAsmBuilder(target: MST) : PrimitiveAsmBuilder<Double, Doubl
 }
 
 @UnstableKMathAPI
-internal class IntAsmBuilder(target: MST) :
+internal class IntAsmBuilder(target: TypedMst<Int>) :
     PrimitiveAsmBuilder<Int, IntExpression>(
         IntRing,
         Integer::class.java,
@@ -487,7 +463,7 @@ internal class IntAsmBuilder(target: MST) :
         IntExpression::class.java,
         target
     ) {
-    override fun visitUnary(node: MST.Unary) {
+    override fun visitUnary(node: TypedMst.Unary<Int>) {
         super.visitUnary(node)
 
         when (node.operation) {
@@ -497,7 +473,7 @@ internal class IntAsmBuilder(target: MST) :
         }
     }
 
-    override fun visitBinary(node: MST.Binary) {
+    override fun visitBinary(node: TypedMst.Binary<Int>) {
         super.visitBinary(node)
 
         when (node.operation) {
@@ -510,14 +486,14 @@ internal class IntAsmBuilder(target: MST) :
 }
 
 @UnstableKMathAPI
-internal class LongAsmBuilder(target: MST) : PrimitiveAsmBuilder<Long, LongExpression>(
+internal class LongAsmBuilder(target: TypedMst<Long>) : PrimitiveAsmBuilder<Long, LongExpression>(
     LongRing,
     java.lang.Long::class.java,
     java.lang.Long.TYPE,
     LongExpression::class.java,
     target,
 ) {
-    override fun visitUnary(node: MST.Unary) {
+    override fun visitUnary(node: TypedMst.Unary<Long>) {
         super.visitUnary(node)
 
         when (node.operation) {
@@ -527,7 +503,7 @@ internal class LongAsmBuilder(target: MST) : PrimitiveAsmBuilder<Long, LongExpre
         }
     }
 
-    override fun visitBinary(node: MST.Binary) {
+    override fun visitBinary(node: TypedMst.Binary<Long>) {
         super.visitBinary(node)
 
         when (node.operation) {
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
index 06e040e93..9e880f4fc 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
@@ -55,15 +55,15 @@ internal inline fun MethodVisitor.instructionAdapter(block: InstructionAdapter.(
 internal fun MethodVisitor.label(): Label = Label().also(::visitLabel)
 
 /**
- * Creates a class name for [Expression] subclassed to implement [mst] provided.
+ * Creates a class name for [Expression] based with appending [marker] to reduce collisions.
  *
  * These methods help to avoid collisions of class name to prevent loading several classes with the same name. If there
  * is a colliding class, change [collision] parameter or leave it `0` to check existing classes recursively.
  *
  * @author Iaroslav Postovalov
  */
-internal tailrec fun buildName(mst: MST, collision: Int = 0): String {
-    val name = "space.kscience.kmath.asm.generated.CompiledExpression_${mst.hashCode()}_$collision"
+internal tailrec fun buildName(marker: String, collision: Int = 0): String {
+    val name = "space.kscience.kmath.asm.generated.CompiledExpression_${marker}_$collision"
 
     try {
         Class.forName(name)
@@ -71,7 +71,7 @@ internal tailrec fun buildName(mst: MST, collision: Int = 0): String {
         return name
     }
 
-    return buildName(mst, collision + 1)
+    return buildName(marker, collision + 1)
 }
 
 @Suppress("FunctionName")
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
index 5f194f2ea..880cf8421 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
@@ -34,12 +34,12 @@ public abstract class FunctionalExpressionAlgebra<T, out A : Algebra<T>>(
     override fun binaryOperationFunction(operation: String): (left: Expression<T>, right: Expression<T>) -> Expression<T> =
         { left, right ->
             Expression { arguments ->
-                algebra.binaryOperationFunction(operation)(left.invoke(arguments), right.invoke(arguments))
+                algebra.binaryOperationFunction(operation)(left(arguments), right(arguments))
             }
         }
 
     override fun unaryOperationFunction(operation: String): (arg: Expression<T>) -> Expression<T> = { arg ->
-        Expression { arguments -> algebra.unaryOperationFunction(operation)(arg.invoke(arguments)) }
+        Expression { arguments -> algebra.unaryOperation(operation, arg(arguments)) }
     }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
index 24e96e845..18226119b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
@@ -24,7 +24,7 @@ public sealed interface MST {
     public data class Numeric(val value: Number) : MST
 
     /**
-     * A node containing an unary operation.
+     * A node containing a unary operation.
      *
      * @property operation the identifier of operation.
      * @property value the argument of this operation.
@@ -34,7 +34,7 @@ public sealed interface MST {
     /**
      * A node containing binary operation.
      *
-     * @property operation the identifier operation.
+     * @property operation the identifier of operation.
      * @property left the left operand.
      * @property right the right operand.
      */
-- 
2.34.1


From 408443989c5858d555926b2cd6ab3e9edbb057ff Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 13 Feb 2022 17:48:04 +0300
Subject: [PATCH 407/713] Up version

---
 build.gradle.kts                                       |  2 +-
 .../kmath/expressions/FunctionalExpressionAlgebra.kt   |  2 --
 .../space/kscience/kmath/expressions/SimpleAutoDiff.kt |  7 ++-----
 .../kscience/kmath/tensorflow/TensorFlowAlgebra.kt     | 10 ++++++++++
 .../space/kscience/kmath/tensorflow/tfOperations.kt    |  2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1b2d9d7c0..a07bcd2c5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-17"
+    version = "0.3.0-dev-18"
 }
 
 subprojects {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
index 880cf8421..68cc8e791 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
@@ -164,8 +164,6 @@ public open class FunctionalExpressionExtendedField<T, out A : ExtendedField<T>>
 
     override fun binaryOperationFunction(operation: String): (left: Expression<T>, right: Expression<T>) -> Expression<T> =
         super<FunctionalExpressionField>.binaryOperationFunction(operation)
-
-    override fun bindSymbol(value: String): Expression<T> = super<FunctionalExpressionField>.bindSymbol(value)
 }
 
 public inline fun <T, A : Group<T>> A.expressionInGroup(
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
index 96fc73249..ac8c44446 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
@@ -272,7 +272,7 @@ public fun <T : Any, F : ExtendedField<T>> SimpleAutoDiffField<T, F>.sqrt(x: Aut
 public fun <T : Any, F : ExtendedField<T>> SimpleAutoDiffField<T, F>.pow(
     x: AutoDiffValue<T>,
     y: Double,
-): AutoDiffValue<T> = derive(const { x.value.pow(y)}) { z ->
+): AutoDiffValue<T> = derive(const { x.value.pow(y) }) { z ->
     x.d += z.d * y * x.value.pow(y - 1)
 }
 
@@ -343,10 +343,7 @@ public fun <T : Any, F : ExtendedField<T>> SimpleAutoDiffField<T, F>.atanh(x: Au
 public class SimpleAutoDiffExtendedField<T : Any, F : ExtendedField<T>>(
     context: F,
     bindings: Map<Symbol, T>,
-) : ExtendedField<AutoDiffValue<T>>, ScaleOperations<AutoDiffValue<T>>,
-    SimpleAutoDiffField<T, F>(context, bindings) {
-
-    override fun bindSymbol(value: String): AutoDiffValue<T> = super<SimpleAutoDiffField>.bindSymbol(value)
+) : ExtendedField<AutoDiffValue<T>>, ScaleOperations<AutoDiffValue<T>>, SimpleAutoDiffField<T, F>(context, bindings) {
 
     override fun number(value: Number): AutoDiffValue<T> = const { number(value) }
 
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index e2541a73e..e9e75543d 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -241,6 +241,16 @@ public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal c
         ops.math.argMax(asTensorFlow().output, ops.constant(dim), TInt32::class.java).output()
     ).actualTensor
 
+//    private val symbolCache = HashMap<String, TensorFlowOutput<T, TT>>()
+//
+//    override fun bindSymbolOrNull(value: String): TensorFlowOutput<T, TT>? {
+//        return symbolCache.getOrPut(value){ops.var}
+//    }
+//
+//    public fun StructureND<T>.grad(
+//
+//    )= operate { ops.gradients() }
+
     @OptIn(UnstableKMathAPI::class)
     override fun export(arg: StructureND<T>): StructureND<T> =
         if (arg is TensorFlowOutput<T, *>) arg.actualTensor else arg
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/tfOperations.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/tfOperations.kt
index 257d4d6ea..f67c333ce 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/tfOperations.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/tfOperations.kt
@@ -20,4 +20,4 @@ public fun <T, TT : TNumber, A> TensorFlowAlgebra<T, TT, A>.sin(
 
 public fun <T, TT : TNumber, A> TensorFlowAlgebra<T, TT, A>.cos(
     arg: StructureND<T>,
-): TensorFlowOutput<T, TT> where A : TrigonometricOperations<T>, A : Ring<T> = arg.operate { ops.math.cos(it) }
+): TensorFlowOutput<T, TT> where A : TrigonometricOperations<T>, A : Ring<T> = arg.operate { ops.math.cos(it) }
\ No newline at end of file
-- 
2.34.1


From a78e361b178eca4a9b89a25dc5067e3e0732dc33 Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Sun, 13 Feb 2022 16:01:05 +0300
Subject: [PATCH 408/713] Implement much faster dot product algorithm for
 tensors

---
 .../kscience/kmath/benchmarks/DotBenchmark.kt  | 10 ++++++++++
 .../kmath/tensors/core/DoubleTensorAlgebra.kt  |  2 +-
 .../kmath/tensors/core/internal/linUtils.kt    | 18 +++++++++++++-----
 .../tensors/core/TestDoubleTensorAlgebra.kt    |  9 +++++++++
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 63165baaa..53d7ee9b6 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -15,7 +15,9 @@ import space.kscience.kmath.linear.invoke
 import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.multik.multikAlgebra
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import kotlin.random.Random
 
 @State(Scope.Benchmark)
@@ -32,6 +34,9 @@ internal class DotBenchmark {
             random.nextDouble()
         }
 
+        val tensor1 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12224)
+        val tensor2 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12225)
+
         val cmMatrix1 = CMLinearSpace { matrix1.toCM() }
         val cmMatrix2 = CMLinearSpace { matrix2.toCM() }
 
@@ -78,4 +83,9 @@ internal class DotBenchmark {
     fun doubleDot(blackhole: Blackhole) = with(DoubleField.linearSpace) {
         blackhole.consume(matrix1 dot matrix2)
     }
+
+    @Benchmark
+    fun doubleTensorDot(blackhole: Blackhole) = DoubleTensorAlgebra.invoke {
+        blackhole.consume(tensor1 dot tensor2)
+    }
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 50252ad31..a75e5a8e3 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -421,7 +421,7 @@ public open class DoubleTensorAlgebra :
 
         for ((res, ab) in resTensor.matrixSequence().zip(newThis.matrixSequence().zip(newOther.matrixSequence()))) {
             val (a, b) = ab
-            dotTo(a.as2D(), b.as2D(), res.as2D(), l, m1, n)
+            dotTo(a, b, res, l, m1, n)
         }
 
         return if (penultimateDim) {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index 2fb5b949f..aba6167ce 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -54,18 +54,26 @@ internal val <T> BufferedTensor<T>.matrices: VirtualBuffer<BufferedTensor<T>>
 internal fun <T> BufferedTensor<T>.matrixSequence(): Sequence<BufferedTensor<T>> = matrices.asSequence()
 
 internal fun dotTo(
-    a: MutableStructure2D<Double>,
-    b: MutableStructure2D<Double>,
-    res: MutableStructure2D<Double>,
+    a: BufferedTensor<Double>,
+    b: BufferedTensor<Double>,
+    res: BufferedTensor<Double>,
     l: Int, m: Int, n: Int,
 ) {
+    val aStart = a.bufferStart
+    val bStart = b.bufferStart
+    val resStart = res.bufferStart
+
+    val aBuffer = a.mutableBuffer
+    val bBuffer = b.mutableBuffer
+    val resBuffer = res.mutableBuffer
+
     for (i in 0 until l) {
         for (j in 0 until n) {
             var curr = 0.0
             for (k in 0 until m) {
-                curr += a[i, k] * b[k, j]
+                curr += aBuffer[aStart + i * m + k] * bBuffer[bStart + k * n + j]
             }
-            res[i, j] = curr
+            resBuffer[resStart + i * n + j] = curr
         }
     }
 }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 03357f1e1..205ae2fee 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -107,6 +107,8 @@ internal class TestDoubleTensorAlgebra {
         val tensor11 = fromArray(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor2 = fromArray(intArrayOf(3), doubleArrayOf(10.0, 20.0, 30.0))
         val tensor3 = fromArray(intArrayOf(1, 1, 3), doubleArrayOf(-1.0, -2.0, -3.0))
+        val tensor4 = fromArray(intArrayOf(2, 3, 3), (1..18).map { it.toDouble() }.toDoubleArray())
+        val tensor5 = fromArray(intArrayOf(2, 3, 3), (1..18).map { 1 + it.toDouble() }.toDoubleArray())
 
         val res12 = tensor1.dot(tensor2)
         assertTrue(res12.mutableBuffer.array() contentEquals doubleArrayOf(140.0, 320.0))
@@ -123,6 +125,13 @@ internal class TestDoubleTensorAlgebra {
         val res11 = tensor1.dot(tensor11)
         assertTrue(res11.mutableBuffer.array() contentEquals doubleArrayOf(22.0, 28.0, 49.0, 64.0))
         assertTrue(res11.shape contentEquals intArrayOf(2, 2))
+
+        val res45 = tensor4.dot(tensor5)
+        assertTrue(res45.mutableBuffer.array() contentEquals doubleArrayOf(
+            36.0, 42.0, 48.0, 81.0, 96.0, 111.0, 126.0, 150.0, 174.0,
+            468.0, 501.0, 534.0, 594.0, 636.0, 678.0, 720.0, 771.0, 822.0
+        ))
+        assertTrue(res45.shape contentEquals intArrayOf(2, 3, 3))
     }
 
     @Test
-- 
2.34.1


From ac3adfa644911b6def168c257cf8bee3a6018514 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 17 Feb 2022 22:46:17 +0300
Subject: [PATCH 409/713] Fix tf dot

---
 benchmarks/build.gradle.kts                   |  2 ++
 .../kscience/kmath/benchmarks/DotBenchmark.kt | 22 ++++++++++++++-----
 build.gradle.kts                              |  2 +-
 .../real/{RealVector.kt => DoubleVector.kt}   |  0
 .../kmath/tensorflow/TensorFlowAlgebra.kt     |  5 +++--
 .../kmath/tensorflow/DoubleTensorFlowOps.kt   | 16 ++++++++++++++
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  1 +
 7 files changed, 40 insertions(+), 8 deletions(-)
 rename kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/{RealVector.kt => DoubleVector.kt} (100%)

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 90ec5dfbe..e46f4a9b4 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -52,6 +52,8 @@ kotlin {
                 implementation(project(":kmath-viktor"))
                 implementation(project(":kmath-jafama"))
                 implementation(project(":kmath-multik"))
+                implementation(projects.kmath.kmathTensorflow)
+                implementation("org.tensorflow:tensorflow-core-platform:0.4.0")
                 implementation("org.nd4j:nd4j-native:1.0.0-M1")
                 //    uncomment if your system supports AVX2
                 //    val os = System.getProperty("os.name")
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 53d7ee9b6..4a5cd4aa2 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -17,7 +17,9 @@ import space.kscience.kmath.multik.multikAlgebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.tensorflow.produceWithTF
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.tensorAlgebra
 import kotlin.random.Random
 
 @State(Scope.Benchmark)
@@ -44,6 +46,16 @@ internal class DotBenchmark {
         val ejmlMatrix2 = EjmlLinearSpaceDDRM { matrix2.toEjml() }
     }
 
+
+    @Benchmark
+    fun tfDot(blackhole: Blackhole){
+        blackhole.consume(
+            DoubleField.produceWithTF {
+                tensor1 dot tensor2
+            }
+        )
+    }
+
     @Benchmark
     fun cmDotWithConversion(blackhole: Blackhole) = CMLinearSpace {
         blackhole.consume(matrix1 dot matrix2)
@@ -64,13 +76,13 @@ internal class DotBenchmark {
         blackhole.consume(matrix1 dot matrix2)
     }
 
-//    @Benchmark
-//    fun tensorDot(blackhole: Blackhole) = with(Double.tensorAlgebra) {
-//        blackhole.consume(matrix1 dot matrix2)
-//    }
+    @Benchmark
+    fun tensorDot(blackhole: Blackhole) = with(DoubleField.tensorAlgebra) {
+        blackhole.consume(matrix1 dot matrix2)
+    }
 
     @Benchmark
-    fun multikDot(blackhole: Blackhole) = with(Double.multikAlgebra) {
+    fun multikDot(blackhole: Blackhole) = with(DoubleField.multikAlgebra) {
         blackhole.consume(matrix1 dot matrix2)
     }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index a07bcd2c5..3b48c7328 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-18"
+    version = "0.3.0-dev-19"
 }
 
 subprojects {
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/DoubleVector.kt
similarity index 100%
rename from kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealVector.kt
rename to kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/DoubleVector.kt
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index e9e75543d..b40739ee0 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -199,8 +199,9 @@ public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal c
 
     override fun StructureND<T>.dot(other: StructureND<T>): TensorFlowOutput<T, TT> = operate(other) { l, r ->
         ops.linalg.matMul(
-            if (l.asTensor().shape().numDimensions() == 1) ops.expandDims(l, ops.constant(0)) else l,
-            if (r.asTensor().shape().numDimensions() == 1) ops.expandDims(r, ops.constant(-1)) else r)
+            if (l.shape().numDimensions() == 1) ops.expandDims(l, ops.constant(0)) else l,
+            if (r.shape().numDimensions() == 1) ops.expandDims(r, ops.constant(-1)) else r
+        )
     }
 
     override fun diagonalEmbedding(
diff --git a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
index 805ad7c66..3d118d980 100644
--- a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
+++ b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
@@ -4,6 +4,9 @@ import org.junit.jupiter.api.Test
 import space.kscience.kmath.nd.get
 import space.kscience.kmath.nd.structureND
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.DoubleTensorAlgebra.Companion.sum
+import kotlin.random.Random
 import kotlin.test.assertEquals
 
 class DoubleTensorFlowOps {
@@ -18,6 +21,19 @@ class DoubleTensorFlowOps {
         assertEquals(3.0, res[0, 0])
     }
 
+    @Test
+    fun dot(){
+        val random = Random(12224)
+        val dim = 1000
+
+        val tensor1 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12224)
+        val tensor2 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12225)
+
+        DoubleField.produceWithTF {
+            tensor1 dot tensor2
+        }.sum()
+    }
+
     @Test
     fun extensionOps(){
         val res = DoubleField.produceWithTF {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index a75e5a8e3..ebe7a10b6 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -997,5 +997,6 @@ public open class DoubleTensorAlgebra :
 }
 
 public val Double.Companion.tensorAlgebra: DoubleTensorAlgebra.Companion get() = DoubleTensorAlgebra
+public val DoubleField.tensorAlgebra: DoubleTensorAlgebra.Companion get() = DoubleTensorAlgebra
 
 
-- 
2.34.1


From 7a72a0b979e04ba928c31e01058ff561cebcc69f Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Sun, 13 Feb 2022 13:16:35 +0300
Subject: [PATCH 410/713] Implement Jacobi algorithm to find eigenvalues

---
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 98 ++++++++++++++++++-
 1 file changed, 97 insertions(+), 1 deletion(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index ebe7a10b6..418cf16b9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -895,7 +895,7 @@ public open class DoubleTensorAlgebra :
      * and when the cosine approaches 1 in the SVD algorithm.
      * @return a pair `eigenvalues to eigenvectors`.
      */
-    public fun StructureND<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
+    public fun StructureND<Double>.symEigSvd(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
         checkSymmetric(tensor, epsilon)
 
         fun MutableStructure2D<Double>.cleanSym(n: Int) {
@@ -922,6 +922,102 @@ public open class DoubleTensorAlgebra :
         return eig to v
     }
 
+    // TODO
+    // 1. Cyclic method
+    // 2. Sort eigenvalues
+    public fun StructureND<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
+        checkSymmetric(tensor, epsilon)
+
+        val ii = tensor.minusIndex(-2)
+        val jj = tensor.minusIndex(-1)
+        val n = tensor.numElements
+
+        val size = this.dimension
+        val commonShape = this.shape.sliceArray(0 until size - 2) + intArrayOf(1, 1)
+
+        var d = this.copy()
+        var s = diagonalEmbedding(ones(this.shape.sliceArray(0 until size - 1)))
+
+        do {
+            // 1. Find max element by abs value that is not on diagonal
+            val buffer = MutableBuffer.boxing(commonShape.reduce(Int::times)) { Triple(0.0, 0, 0) }
+            val maxOffDiagonalElements = BufferedTensor(commonShape, buffer, 0)
+            for (offset in 0 until n) {
+                val multiIndex = d.linearStructure.index(offset)
+                if (multiIndex[ii] != multiIndex[jj]) {
+                    val value = d.mutableBuffer.array()[offset]
+
+                    val commonIndex = multiIndex.sliceArray(0 until size - 2) + intArrayOf(0, 0)
+                    if (abs(value) > maxOffDiagonalElements[commonIndex].first) {
+                        maxOffDiagonalElements[commonIndex] = Triple(abs(value), multiIndex[ii], multiIndex[jj])
+                    }
+                }
+            }
+
+            // 2. Evaluate "rotation" angle
+            val angles = zeros(commonShape)
+            for (offset in 0 until maxOffDiagonalElements.numElements) {
+                val (_, i, j) = maxOffDiagonalElements.mutableBuffer[offset]
+                val multiIndex = maxOffDiagonalElements.linearStructure.index(offset)
+
+                val dIJ = d.mutableBuffer[d.linearStructure.offset(multiIndex.also { it[ii] = i; it[jj] = j })]
+                val dII = d.mutableBuffer[d.linearStructure.offset(multiIndex.also { it[ii] = i; it[jj] = i })]
+                val dJJ = d.mutableBuffer[d.linearStructure.offset(multiIndex.also { it[ii] = j; it[jj] = j })]
+
+                angles.mutableBuffer.array()[offset] = if (dII == dJJ) {
+                    if (dIJ > 0) PI / 4 else -PI / 4
+                } else {
+                    0.5 * atan(2 * dIJ / (dJJ - dII))
+                }
+            }
+
+            // 3. Build rotation tensor `s1`
+            val s1 = diagonalEmbedding(ones(this.shape.sliceArray(0 until size - 1)))
+            for (offset in 0 until n) {
+                val multiIndex = d.linearStructure.index(offset)
+
+                val commonIndex = multiIndex.sliceArray(0 until size - 2) + intArrayOf(0, 0)
+                val (_, i, j) = maxOffDiagonalElements[commonIndex]
+                val angleValue = angles[commonIndex]
+                s1.mutableBuffer.array()[offset] = when {
+                    multiIndex[ii] == i && multiIndex[jj] == i || multiIndex[ii] == j && multiIndex[jj] == j -> cos(angleValue)
+                    multiIndex[ii] == i && multiIndex[jj] == j -> sin(angleValue)
+                    multiIndex[ii] == j && multiIndex[jj] == i -> -sin(angleValue)
+                    else -> s1.mutableBuffer.array()[offset]
+                }
+            }
+
+            // 4. Evaluate new tensor
+            d = (s1.transpose() dot d) dot s1
+            s = s dot s1
+            if (d.isDiagonal(epsilon)) break
+        } while(true)
+
+        val eigenvalues = zeros(d.shape.sliceArray(0 until size - 1))
+        for (offset in 0 until n) {
+            val multiIndex = d.linearStructure.index(offset)
+            if (multiIndex[ii] == multiIndex[jj]) {
+                eigenvalues[multiIndex.sliceArray(0 until size - 1)] = d.mutableBuffer.array()[offset]
+            }
+        }
+
+        return eigenvalues to s
+    }
+
+    public fun StructureND<Double>.isDiagonal(epsilon: Double = 1e-9): Boolean {
+        val ii = tensor.minusIndex(-2)
+        val jj = tensor.minusIndex(-1)
+
+        for (offset in 0 until tensor.numElements) {
+            val multiIndex = tensor.linearStructure.index(offset)
+            if (multiIndex[ii] != multiIndex[jj] && abs(tensor.mutableBuffer.array()[offset]) > epsilon) {
+                return false
+            }
+        }
+
+        return true
+    }
+
     /**
      * Computes the determinant of a square matrix input, or of each square matrix in a batched input
      * using LU factorization algorithm.
-- 
2.34.1


From 7aff774bc166d537c40a7958418ac9a40403d74e Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Sun, 13 Feb 2022 21:49:06 +0300
Subject: [PATCH 411/713] Improve Jacobi algorithm readability by extracting
 some logic into helper fun

---
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 128 +++++++++---------
 1 file changed, 66 insertions(+), 62 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 418cf16b9..7fa6e885d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -10,6 +10,7 @@ package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.MutableStructure2D
+import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.nd.as2D
@@ -885,7 +886,7 @@ public open class DoubleTensorAlgebra :
         return Triple(uTensor.transpose(), sTensor, vTensor.transpose())
     }
 
-    override fun StructureND<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> = symEig(epsilon = 1e-15)
+    override fun StructureND<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> = symEigJacobi(epsilon = 1e-10)
 
     /**
      * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
@@ -922,96 +923,99 @@ public open class DoubleTensorAlgebra :
         return eig to v
     }
 
-    // TODO
-    // 1. Cyclic method
-    // 2. Sort eigenvalues
-    public fun StructureND<Double>.symEig(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
+    public fun StructureND<Double>.symEigJacobi(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
         checkSymmetric(tensor, epsilon)
 
-        val ii = tensor.minusIndex(-2)
-        val jj = tensor.minusIndex(-1)
-        val n = tensor.numElements
-
         val size = this.dimension
-        val commonShape = this.shape.sliceArray(0 until size - 2) + intArrayOf(1, 1)
+        val s = zeros(this.shape)
+        val eigenvalues = zeros(this.shape.sliceArray(0 until size - 1))
 
-        var d = this.copy()
-        var s = diagonalEmbedding(ones(this.shape.sliceArray(0 until size - 1)))
+        var eigenvalueStart = 0
+        var eigenvectorStart = 0
+        for (matrix in tensor.matrixSequence()) {
+            matrix.as2D().jacobiHelper(eigenvalues, s, eigenvalueStart, eigenvectorStart, epsilon)
+            eigenvalueStart += this.shape.last()
+            eigenvectorStart += this.shape.last() * this.shape.last()
+        }
 
+        // TODO sort eigenvalues
+        return eigenvalues to s
+    }
+
+    private fun MutableStructure2D<Double>.jacobiHelper(
+        eigenvalues: DoubleTensor,
+        eigenvectors: DoubleTensor,
+        eigenvalueStart: Int,
+        eigenvectorStart: Int,
+        epsilon: Double
+    ) {
+        var d = this
+        var s = eye(this.shape[0])
+
+        // TODO implement cyclic method
         do {
             // 1. Find max element by abs value that is not on diagonal
-            val buffer = MutableBuffer.boxing(commonShape.reduce(Int::times)) { Triple(0.0, 0, 0) }
-            val maxOffDiagonalElements = BufferedTensor(commonShape, buffer, 0)
-            for (offset in 0 until n) {
-                val multiIndex = d.linearStructure.index(offset)
-                if (multiIndex[ii] != multiIndex[jj]) {
-                    val value = d.mutableBuffer.array()[offset]
-
-                    val commonIndex = multiIndex.sliceArray(0 until size - 2) + intArrayOf(0, 0)
-                    if (abs(value) > maxOffDiagonalElements[commonIndex].first) {
-                        maxOffDiagonalElements[commonIndex] = Triple(abs(value), multiIndex[ii], multiIndex[jj])
+            var maxOffDiagonalElement = 0.0
+            var maxElementIndex = Pair(0, 0)
+            for (i in 0 until this.rowNum) {
+                for (j in 0 until this.colNum) {
+                    if (i == j) continue
+                    if (abs(d[i, j]) > maxOffDiagonalElement) {
+                        maxOffDiagonalElement = abs(d[i, j])
+                        maxElementIndex = i to j
                     }
                 }
             }
 
             // 2. Evaluate "rotation" angle
-            val angles = zeros(commonShape)
-            for (offset in 0 until maxOffDiagonalElements.numElements) {
-                val (_, i, j) = maxOffDiagonalElements.mutableBuffer[offset]
-                val multiIndex = maxOffDiagonalElements.linearStructure.index(offset)
+            val dIJ = d[maxElementIndex.first, maxElementIndex.second]
+            val dII = d[maxElementIndex.first, maxElementIndex.first]
+            val dJJ = d[maxElementIndex.second, maxElementIndex.second]
 
-                val dIJ = d.mutableBuffer[d.linearStructure.offset(multiIndex.also { it[ii] = i; it[jj] = j })]
-                val dII = d.mutableBuffer[d.linearStructure.offset(multiIndex.also { it[ii] = i; it[jj] = i })]
-                val dJJ = d.mutableBuffer[d.linearStructure.offset(multiIndex.also { it[ii] = j; it[jj] = j })]
-
-                angles.mutableBuffer.array()[offset] = if (dII == dJJ) {
-                    if (dIJ > 0) PI / 4 else -PI / 4
-                } else {
-                    0.5 * atan(2 * dIJ / (dJJ - dII))
-                }
+            val angle = if (dII == dJJ) {
+                if (dIJ > 0) PI / 4 else -PI / 4
+            } else {
+                0.5 * atan(2 * dIJ / (dJJ - dII))
             }
 
             // 3. Build rotation tensor `s1`
-            val s1 = diagonalEmbedding(ones(this.shape.sliceArray(0 until size - 1)))
-            for (offset in 0 until n) {
-                val multiIndex = d.linearStructure.index(offset)
-
-                val commonIndex = multiIndex.sliceArray(0 until size - 2) + intArrayOf(0, 0)
-                val (_, i, j) = maxOffDiagonalElements[commonIndex]
-                val angleValue = angles[commonIndex]
-                s1.mutableBuffer.array()[offset] = when {
-                    multiIndex[ii] == i && multiIndex[jj] == i || multiIndex[ii] == j && multiIndex[jj] == j -> cos(angleValue)
-                    multiIndex[ii] == i && multiIndex[jj] == j -> sin(angleValue)
-                    multiIndex[ii] == j && multiIndex[jj] == i -> -sin(angleValue)
-                    else -> s1.mutableBuffer.array()[offset]
+            val s1 = eye(this.rowNum)
+            for (i in 0 until this.rowNum) {
+                for (j in 0 until this.colNum) {
+                    s1.mutableBuffer.array()[i * this.rowNum + j] = when {
+                        maxElementIndex.first == i && maxElementIndex.first == j -> cos(angle)
+                        maxElementIndex.second == i && maxElementIndex.second == j -> cos(angle)
+                        maxElementIndex.first == i && maxElementIndex.second == j -> sin(angle)
+                        maxElementIndex.first == j && maxElementIndex.second == i -> -sin(angle)
+                        else -> s1.mutableBuffer.array()[i * this.rowNum + j]
+                    }
                 }
             }
 
             // 4. Evaluate new tensor
-            d = (s1.transpose() dot d) dot s1
+            d = ((s1.transpose() dot d) dot s1).as2D()
             s = s dot s1
             if (d.isDiagonal(epsilon)) break
         } while(true)
 
-        val eigenvalues = zeros(d.shape.sliceArray(0 until size - 1))
-        for (offset in 0 until n) {
-            val multiIndex = d.linearStructure.index(offset)
-            if (multiIndex[ii] == multiIndex[jj]) {
-                eigenvalues[multiIndex.sliceArray(0 until size - 1)] = d.mutableBuffer.array()[offset]
+        // 5. Copy result
+        for (i in 0 until this.rowNum) {
+            for (j in 0 until this.colNum) {
+                eigenvectors.mutableBuffer.array()[eigenvectorStart + i * this.rowNum + j] = s.mutableBuffer.array()[i * this.rowNum + j]
             }
         }
 
-        return eigenvalues to s
+        for (i in 0 until this.rowNum) {
+            eigenvalues.mutableBuffer.array()[eigenvalueStart + i] = d[i, i]
+        }
     }
 
-    public fun StructureND<Double>.isDiagonal(epsilon: Double = 1e-9): Boolean {
-        val ii = tensor.minusIndex(-2)
-        val jj = tensor.minusIndex(-1)
-
-        for (offset in 0 until tensor.numElements) {
-            val multiIndex = tensor.linearStructure.index(offset)
-            if (multiIndex[ii] != multiIndex[jj] && abs(tensor.mutableBuffer.array()[offset]) > epsilon) {
-                return false
+    public fun Structure2D<Double>.isDiagonal(epsilon: Double = 1e-9): Boolean {
+        for (i in 0 until this.rowNum) {
+            for (j in 0 until this.colNum) {
+                if (i != j && abs(this[i, j]) > epsilon) {
+                    return false
+                }
             }
         }
 
-- 
2.34.1


From b13765ec1928e0f2b2eb6165a8a5a0e1a057b08f Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Sun, 20 Feb 2022 02:21:52 +0300
Subject: [PATCH 412/713] Implement much faster Jacobi algorithm

---
 benchmarks/build.gradle.kts                   |   5 +
 .../benchmarks/TensorAlgebraBenchmark.kt      |  37 ++++
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 182 ++++++++++--------
 3 files changed, 149 insertions(+), 75 deletions(-)
 create mode 100644 benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/TensorAlgebraBenchmark.kt

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index e46f4a9b4..f8d39b9c5 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -124,6 +124,11 @@ benchmark {
         include("JafamaBenchmark")
     }
 
+    configurations.register("tensorAlgebra") {
+        commonConfiguration()
+        include("TensorAlgebraBenchmark")
+    }
+
     configurations.register("viktor") {
         commonConfiguration()
         include("ViktorBenchmark")
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/TensorAlgebraBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/TensorAlgebraBenchmark.kt
new file mode 100644
index 000000000..38e064e53
--- /dev/null
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/TensorAlgebraBenchmark.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.benchmarks
+
+import kotlinx.benchmark.Benchmark
+import kotlinx.benchmark.Blackhole
+import kotlinx.benchmark.Scope
+import kotlinx.benchmark.State
+import space.kscience.kmath.linear.linearSpace
+import space.kscience.kmath.linear.matrix
+import space.kscience.kmath.linear.symmetric
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.tensors.core.tensorAlgebra
+import kotlin.random.Random
+
+@State(Scope.Benchmark)
+internal class TensorAlgebraBenchmark {
+    companion object {
+        private val random = Random(12224)
+        private const val dim = 30
+
+        private val matrix = DoubleField.linearSpace.matrix(dim, dim).symmetric { _, _ -> random.nextDouble() }
+    }
+
+    @Benchmark
+    fun tensorSymEigSvd(blackhole: Blackhole) = with(Double.tensorAlgebra) {
+        blackhole.consume(matrix.symEigSvd(1e-10))
+    }
+
+    @Benchmark
+    fun tensorSymEigJacobi(blackhole: Blackhole) = with(Double.tensorAlgebra) {
+        blackhole.consume(matrix.symEigJacobi(50, 1e-10))
+    }
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 7fa6e885d..675ff4191 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -9,11 +9,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.MutableStructure2D
-import space.kscience.kmath.nd.Structure2D
-import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.as1D
-import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.structures.indices
@@ -886,7 +882,7 @@ public open class DoubleTensorAlgebra :
         return Triple(uTensor.transpose(), sTensor, vTensor.transpose())
     }
 
-    override fun StructureND<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> = symEigJacobi(epsilon = 1e-10)
+    override fun StructureND<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> = symEigJacobi(maxIteration = 50, epsilon = 1e-15)
 
     /**
      * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
@@ -923,103 +919,139 @@ public open class DoubleTensorAlgebra :
         return eig to v
     }
 
-    public fun StructureND<Double>.symEigJacobi(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
+    public fun StructureND<Double>.symEigJacobi(maxIteration: Int, epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
         checkSymmetric(tensor, epsilon)
 
         val size = this.dimension
-        val s = zeros(this.shape)
+        val eigenvectors = zeros(this.shape)
         val eigenvalues = zeros(this.shape.sliceArray(0 until size - 1))
 
         var eigenvalueStart = 0
         var eigenvectorStart = 0
         for (matrix in tensor.matrixSequence()) {
-            matrix.as2D().jacobiHelper(eigenvalues, s, eigenvalueStart, eigenvectorStart, epsilon)
+            val matrix2D = matrix.as2D()
+            val (d, v) = matrix2D.jacobiHelper(maxIteration, epsilon)
+
+            for (i in 0 until matrix2D.rowNum) {
+                for (j in 0 until matrix2D.colNum) {
+                    eigenvectors.mutableBuffer.array()[eigenvectorStart + i * matrix2D.rowNum + j] = v[i, j]
+                }
+            }
+
+            for (i in 0 until matrix2D.rowNum) {
+                eigenvalues.mutableBuffer.array()[eigenvalueStart + i] = d[i]
+            }
+
             eigenvalueStart += this.shape.last()
             eigenvectorStart += this.shape.last() * this.shape.last()
         }
 
-        // TODO sort eigenvalues
-        return eigenvalues to s
+        return eigenvalues to eigenvectors
     }
 
     private fun MutableStructure2D<Double>.jacobiHelper(
-        eigenvalues: DoubleTensor,
-        eigenvectors: DoubleTensor,
-        eigenvalueStart: Int,
-        eigenvectorStart: Int,
+        maxIteration: Int,
         epsilon: Double
-    ) {
-        var d = this
-        var s = eye(this.shape[0])
+    ): Pair<Structure1D<Double>, Structure2D<Double>> {
+        val A_ = this.copy().as2D()
+        val V = eye(this.shape[0]).as2D()
+        val D = DoubleTensor(intArrayOf(this.shape[0]), (0 until this.rowNum).map { this[it, it] }.toDoubleArray()).as1D()
+        val B = DoubleTensor(intArrayOf(this.shape[0]), (0 until this.rowNum).map { this[it, it] }.toDoubleArray()).as1D()
+        val Z = zeros(intArrayOf(this.shape[0])).as1D()
 
-        // TODO implement cyclic method
-        do {
-            // 1. Find max element by abs value that is not on diagonal
+        fun maxOffDiagonal(matrix: MutableStructure2D<Double>): Double {
             var maxOffDiagonalElement = 0.0
-            var maxElementIndex = Pair(0, 0)
-            for (i in 0 until this.rowNum) {
-                for (j in 0 until this.colNum) {
-                    if (i == j) continue
-                    if (abs(d[i, j]) > maxOffDiagonalElement) {
-                        maxOffDiagonalElement = abs(d[i, j])
-                        maxElementIndex = i to j
+            for (i in 0 until matrix.rowNum - 1) {
+                for (j in i + 1 until matrix.colNum) {
+                    maxOffDiagonalElement = max(maxOffDiagonalElement, abs(matrix[i, j]))
+                }
+            }
+            return maxOffDiagonalElement
+        }
+
+        fun rotate(a: MutableStructure2D<Double>, s: Double, tau: Double, i: Int, j: Int, k: Int, l: Int) {
+            val g = a[i, j]
+            val h = a[k, l]
+            a[i, j] = g - s * (h + g * tau)
+            a[k, l] = h + s * (g - h * tau)
+        }
+
+        fun jacobiIteration(
+            a: MutableStructure2D<Double>,
+            v: MutableStructure2D<Double>,
+            d: MutableStructure1D<Double>,
+            z: MutableStructure1D<Double>,
+        ) {
+            for (ip in 0 until a.rowNum - 1) {
+                for (iq in ip + 1 until a.colNum) {
+                    val g = 100.0 * abs(a[ip, iq])
+
+                    if (g <= epsilon * abs(d[ip]) && g <= epsilon * abs(d[iq])) {
+                        a[ip, iq] = 0.0
+                        continue
+                    }
+
+                    var h = d[iq] - d[ip]
+                    val t = when {
+                        g <= epsilon * abs(h) -> (a[ip, iq]) / h
+                        else -> {
+                            val theta = 0.5 * h / (a[ip, iq])
+                            val denominator = abs(theta) + sqrt(1.0 + theta * theta)
+                            if (theta < 0.0) -1.0 / denominator else 1.0 / denominator
+                        }
+                    }
+
+                    val c = 1.0 / sqrt(1 + t * t)
+                    val s = t * c
+                    val tau = s / (1.0 + c)
+                    h = t * a[ip, iq]
+                    z[ip] -= h
+                    z[iq] += h
+                    d[ip] -= h
+                    d[iq] += h
+                    a[ip, iq] = 0.0
+
+                    for (j in 0 until ip) {
+                        rotate(a, s, tau, j, ip, j, iq)
+                    }
+                    for (j in (ip + 1) until iq) {
+                        rotate(a, s, tau, ip, j, j, iq)
+                    }
+                    for (j in (iq + 1) until a.rowNum) {
+                        rotate(a, s, tau, ip, j, iq, j)
+                    }
+                    for (j in 0 until a.rowNum) {
+                        rotate(v, s, tau, j, ip, j, iq)
                     }
                 }
             }
+        }
 
-            // 2. Evaluate "rotation" angle
-            val dIJ = d[maxElementIndex.first, maxElementIndex.second]
-            val dII = d[maxElementIndex.first, maxElementIndex.first]
-            val dJJ = d[maxElementIndex.second, maxElementIndex.second]
-
-            val angle = if (dII == dJJ) {
-                if (dIJ > 0) PI / 4 else -PI / 4
-            } else {
-                0.5 * atan(2 * dIJ / (dJJ - dII))
-            }
-
-            // 3. Build rotation tensor `s1`
-            val s1 = eye(this.rowNum)
-            for (i in 0 until this.rowNum) {
-                for (j in 0 until this.colNum) {
-                    s1.mutableBuffer.array()[i * this.rowNum + j] = when {
-                        maxElementIndex.first == i && maxElementIndex.first == j -> cos(angle)
-                        maxElementIndex.second == i && maxElementIndex.second == j -> cos(angle)
-                        maxElementIndex.first == i && maxElementIndex.second == j -> sin(angle)
-                        maxElementIndex.first == j && maxElementIndex.second == i -> -sin(angle)
-                        else -> s1.mutableBuffer.array()[i * this.rowNum + j]
-                    }
-                }
-            }
-
-            // 4. Evaluate new tensor
-            d = ((s1.transpose() dot d) dot s1).as2D()
-            s = s dot s1
-            if (d.isDiagonal(epsilon)) break
-        } while(true)
-
-        // 5. Copy result
-        for (i in 0 until this.rowNum) {
-            for (j in 0 until this.colNum) {
-                eigenvectors.mutableBuffer.array()[eigenvectorStart + i * this.rowNum + j] = s.mutableBuffer.array()[i * this.rowNum + j]
+        fun updateDiagonal(
+            d: MutableStructure1D<Double>,
+            z: MutableStructure1D<Double>,
+            b: MutableStructure1D<Double>,
+        ) {
+            for (ip in 0 until d.size) {
+                b[ip] += z[ip]
+                d[ip] = b[ip]
+                z[ip] = 0.0
             }
         }
 
-        for (i in 0 until this.rowNum) {
-            eigenvalues.mutableBuffer.array()[eigenvalueStart + i] = d[i, i]
-        }
-    }
-
-    public fun Structure2D<Double>.isDiagonal(epsilon: Double = 1e-9): Boolean {
-        for (i in 0 until this.rowNum) {
-            for (j in 0 until this.colNum) {
-                if (i != j && abs(this[i, j]) > epsilon) {
-                    return false
-                }
+        var sm = maxOffDiagonal(A_)
+        for (iteration in 0 until maxIteration) {
+            if (sm < epsilon) {
+                break
             }
+
+            jacobiIteration(A_, V, D, Z)
+            updateDiagonal(D, Z, B)
+            sm = maxOffDiagonal(A_)
         }
 
-        return true
+        // TODO sort eigenvalues
+        return D to V
     }
 
     /**
-- 
2.34.1


From dda6602ed4c2b8b9d7eea017b2786697e6b02ec8 Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Sun, 20 Feb 2022 02:44:27 +0300
Subject: [PATCH 413/713] Replace complex access to tensor with faster access
 to buffer in Jacobi algorithm

---
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 675ff4191..e9dc34748 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -953,23 +953,33 @@ public open class DoubleTensorAlgebra :
         maxIteration: Int,
         epsilon: Double
     ): Pair<Structure1D<Double>, Structure2D<Double>> {
-        val A_ = this.copy().as2D()
-        val V = eye(this.shape[0]).as2D()
-        val D = DoubleTensor(intArrayOf(this.shape[0]), (0 until this.rowNum).map { this[it, it] }.toDoubleArray()).as1D()
-        val B = DoubleTensor(intArrayOf(this.shape[0]), (0 until this.rowNum).map { this[it, it] }.toDoubleArray()).as1D()
-        val Z = zeros(intArrayOf(this.shape[0])).as1D()
+        val n = this.shape[0]
+        val A_ = this.copy()
+        val V = eye(n)
+        val D = DoubleTensor(intArrayOf(n), (0 until this.rowNum).map { this[it, it] }.toDoubleArray()).as1D()
+        val B = DoubleTensor(intArrayOf(n), (0 until this.rowNum).map { this[it, it] }.toDoubleArray()).as1D()
+        val Z = zeros(intArrayOf(n)).as1D()
 
-        fun maxOffDiagonal(matrix: MutableStructure2D<Double>): Double {
+        // assume that buffered tensor is square matrix
+        operator fun BufferedTensor<Double>.get(i: Int, j: Int): Double {
+            return this.mutableBuffer.array()[bufferStart + i * this.shape[0] + j]
+        }
+
+        operator fun BufferedTensor<Double>.set(i: Int, j: Int, value: Double) {
+            this.mutableBuffer.array()[bufferStart + i * this.shape[0] + j] = value
+        }
+
+        fun maxOffDiagonal(matrix: BufferedTensor<Double>): Double {
             var maxOffDiagonalElement = 0.0
-            for (i in 0 until matrix.rowNum - 1) {
-                for (j in i + 1 until matrix.colNum) {
+            for (i in 0 until n - 1) {
+                for (j in i + 1 until n) {
                     maxOffDiagonalElement = max(maxOffDiagonalElement, abs(matrix[i, j]))
                 }
             }
             return maxOffDiagonalElement
         }
 
-        fun rotate(a: MutableStructure2D<Double>, s: Double, tau: Double, i: Int, j: Int, k: Int, l: Int) {
+        fun rotate(a: BufferedTensor<Double>, s: Double, tau: Double, i: Int, j: Int, k: Int, l: Int) {
             val g = a[i, j]
             val h = a[k, l]
             a[i, j] = g - s * (h + g * tau)
@@ -977,13 +987,13 @@ public open class DoubleTensorAlgebra :
         }
 
         fun jacobiIteration(
-            a: MutableStructure2D<Double>,
-            v: MutableStructure2D<Double>,
+            a: BufferedTensor<Double>,
+            v: BufferedTensor<Double>,
             d: MutableStructure1D<Double>,
             z: MutableStructure1D<Double>,
         ) {
-            for (ip in 0 until a.rowNum - 1) {
-                for (iq in ip + 1 until a.colNum) {
+            for (ip in 0 until n - 1) {
+                for (iq in ip + 1 until n) {
                     val g = 100.0 * abs(a[ip, iq])
 
                     if (g <= epsilon * abs(d[ip]) && g <= epsilon * abs(d[iq])) {
@@ -1017,10 +1027,10 @@ public open class DoubleTensorAlgebra :
                     for (j in (ip + 1) until iq) {
                         rotate(a, s, tau, ip, j, j, iq)
                     }
-                    for (j in (iq + 1) until a.rowNum) {
+                    for (j in (iq + 1) until n) {
                         rotate(a, s, tau, ip, j, iq, j)
                     }
-                    for (j in 0 until a.rowNum) {
+                    for (j in 0 until n) {
                         rotate(v, s, tau, j, ip, j, iq)
                     }
                 }
@@ -1051,7 +1061,7 @@ public open class DoubleTensorAlgebra :
         }
 
         // TODO sort eigenvalues
-        return D to V
+        return D to V.as2D()
     }
 
     /**
-- 
2.34.1


From a621dd7c5b97fa3753ec3fe7f55b238b914fd544 Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Sun, 20 Feb 2022 02:55:37 +0300
Subject: [PATCH 414/713] Drop duplicate test from `DorBenchmark`

---
 .../kscience/kmath/benchmarks/DotBenchmark.kt      | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 4a5cd4aa2..16fd544a8 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -15,10 +15,8 @@ import space.kscience.kmath.linear.invoke
 import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.multik.multikAlgebra
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.tensorflow.produceWithTF
-import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.tensorAlgebra
 import kotlin.random.Random
 
@@ -36,9 +34,6 @@ internal class DotBenchmark {
             random.nextDouble()
         }
 
-        val tensor1 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12224)
-        val tensor2 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12225)
-
         val cmMatrix1 = CMLinearSpace { matrix1.toCM() }
         val cmMatrix2 = CMLinearSpace { matrix2.toCM() }
 
@@ -48,10 +43,10 @@ internal class DotBenchmark {
 
 
     @Benchmark
-    fun tfDot(blackhole: Blackhole){
+    fun tfDot(blackhole: Blackhole) {
         blackhole.consume(
             DoubleField.produceWithTF {
-                tensor1 dot tensor2
+                matrix1 dot matrix1
             }
         )
     }
@@ -95,9 +90,4 @@ internal class DotBenchmark {
     fun doubleDot(blackhole: Blackhole) = with(DoubleField.linearSpace) {
         blackhole.consume(matrix1 dot matrix2)
     }
-
-    @Benchmark
-    fun doubleTensorDot(blackhole: Blackhole) = DoubleTensorAlgebra.invoke {
-        blackhole.consume(tensor1 dot tensor2)
-    }
 }
-- 
2.34.1


From 2483c56f1c95180e168bd564be6131122a6c8cfe Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Thu, 3 Mar 2022 20:45:35 +0300
Subject: [PATCH 415/713] Restructured Polynomial

---
 .../kmath/functions/AbstractPolynomial.kt     | 354 +++++++++++++++
 .../kscience/kmath/functions/Piecewise.kt     |   8 +-
 .../kscience/kmath/functions/Polynomial.kt    | 425 ++++++++++++++----
 .../kmath/functions/polynomialUtil.kt         | 139 ++++++
 .../kmath/integration/SplineIntegrator.kt     |   3 +-
 .../kmath/interpolation/Interpolator.kt       |   4 +-
 .../kmath/functions/PolynomialTest.kt         |  11 +-
 kotlin-js-store/yarn.lock                     |  56 +--
 8 files changed, 846 insertions(+), 154 deletions(-)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
new file mode 100644
index 000000000..f6a617656
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -0,0 +1,354 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.*
+import kotlin.js.JsName
+import kotlin.jvm.JvmName
+
+
+/**
+ * Abstraction of polynomials.
+ */
+public interface AbstractPolynomial<C>
+
+/**
+ * Abstraction of ring of polynomials of type [P] over ring of constants of type [C].
+ */
+@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P> {
+    // region Constant-integer relation
+    /**
+     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     */
+    @JvmName("constantIntPlus")
+    public operator fun C.plus(other: Int): C
+    /**
+     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    @JvmName("constantIntMinus")
+    public operator fun C.minus(other: Int): C
+    /**
+     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    @JvmName("constantIntTimes")
+    public operator fun C.times(other: Int): C
+    // endregion
+
+    // region Integer-constant relation
+    /**
+     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    @JvmName("intConstantPlus")
+    public operator fun Int.plus(other: C): C
+    /**
+     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    @JvmName("intConstantMinus")
+    public operator fun Int.minus(other: C): C
+    /**
+     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    @JvmName("intConstantTimes")
+    public operator fun Int.times(other: C): C
+    // endregion
+
+    // region Polynomial-integer relation
+    /**
+     * Returns sum of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public operator fun P.plus(other: Int): P = optimizedAddMultiplied(this, one, other)
+    /**
+     * Returns difference between the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public operator fun P.minus(other: Int): P = optimizedAddMultiplied(this, one, -other)
+    /**
+     * Returns product of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public operator fun P.times(other: Int): P = optimizedMultiply(this, other)
+    // endregion
+
+    // region Integer-polynomial relation
+    /**
+     * Returns sum of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public operator fun Int.plus(other: P): P = optimizedAddMultiplied(other, one, this)
+    /**
+     * Returns difference between the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public operator fun Int.minus(other: P): P = optimizedAddMultiplied(-other, one, this)
+    /**
+     * Returns product of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public operator fun Int.times(other: P): P = optimizedMultiply(other, this)
+    // endregion
+
+    // region Constant-constant relation
+    /**
+     * Returns the same constant.
+     */
+    @JvmName("constantUnaryPlus")
+    @JsName("constantUnaryPlus")
+    public operator fun C.unaryPlus(): C = this
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("constantUnaryMinus")
+    @JsName("constantUnaryMinus")
+    public operator fun C.unaryMinus(): C
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("constantPlus")
+    @JsName("constantPlus")
+    public operator fun C.plus(other: C): C
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("constantMinus")
+    @JsName("constantMinus")
+    public operator fun C.minus(other: C): C
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("constantTimes")
+    @JsName("constantTimes")
+    public operator fun C.times(other: C): C
+
+    /**
+     * Check if the instant is zero constant.
+     */
+    @JvmName("constantIsZero")
+    public fun C.isZero(): Boolean
+    /**
+     * Check if the instant is NOT zero constant.
+     */
+    @JvmName("constantIsNotZero")
+    public fun C.isNotZero(): Boolean
+    /**
+     * Check if the instant is unit constant.
+     */
+    @JvmName("constantIsOne")
+    public fun C.isOne(): Boolean
+    /**
+     * Check if the instant is NOT unit constant.
+     */
+    @JvmName("constantIsNotOne")
+    public fun C.isNotOne(): Boolean
+    /**
+     * Check if the instant is minus unit constant.
+     */
+    @JvmName("constantIsMinusOne")
+    public fun C.isMinusOne(): Boolean
+    /**
+     * Check if the instant is NOT minus unit constant.
+     */
+    @JvmName("constantIsNotMinusOne")
+    public fun C.isNotMinusOne(): Boolean
+    // endregion
+
+    // region Constant-polynomial relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.plus(other: P): P
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.minus(other: P): P
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.times(other: P): P
+    // endregion
+
+    // region Polynomial-constant relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.plus(other: C): P
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.minus(other: C): P
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.times(other: C): P
+    // endregion
+
+    // region Polynomial-polynomial relation
+    /**
+     * Returns the same polynomial.
+     */
+    public override operator fun P.unaryPlus(): P = this
+    /**
+     * Returns negation of the polynomial.
+     */
+    public override operator fun P.unaryMinus(): P
+    /**
+     * Returns sum of the polynomials.
+     */
+    public override operator fun P.plus(other: P): P
+    /**
+     * Returns difference of the polynomials.
+     */
+    public override operator fun P.minus(other: P): P
+    /**
+     * Returns product of the polynomials.
+     */
+    public override operator fun P.times(other: P): P
+
+    /**
+     * Check if the instant is zero polynomial.
+     */
+    public fun P.isZero(): Boolean = this == zero
+    /**
+     * Check if the instant is NOT zero polynomial.
+     */
+    public fun P.isNotZero(): Boolean = this != zero
+    /**
+     * Check if the instant is unit polynomial.
+     */
+    public fun P.isOne(): Boolean = this == one
+    /**
+     * Check if the instant is NOT unit polynomial.
+     */
+    public fun P.isNotOne(): Boolean = this != one
+    /**
+     * Check if the instant is minus unit polynomial.
+     */
+    public fun P.isMinusOne(): Boolean = this == -one
+    /**
+     * Check if the instant is NOT minus unit polynomial.
+     */
+    public fun P.isNotMinusOne(): Boolean = this != -one
+
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
+    override val zero: P
+    /**
+     * Instance of unit polynomial (unit of the polynomial ring).
+     */
+    override val one: P
+
+    /**
+     * Checks equality of the polynomials.
+     */
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    public fun P.equals(other: P): Boolean
+    // endregion
+
+    // Not sure is it necessary...
+    // region Polynomial properties
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    public val P.degree: Int
+
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isConstant(): Boolean = degree <= 0
+    /**
+     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNotConstant(): Boolean = !isConstant()
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNonZeroConstant(): Boolean = degree == 0
+    /**
+     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
+     */
+    public fun P.asConstantOrNull(): C?
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
+     */
+    public fun P.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
+    // endregion
+
+    // region Legacy of Ring interface
+    override fun add(left: P, right: P): P = left + right
+    override fun multiply(left: P, right: P): P = left * right
+    // endregion
+
+    public companion object {
+        // TODO: All of this should be moved to algebraic structures' place for utilities
+        // TODO: Move receiver to context receiver
+        /**
+         * Multiplication of element and integer.
+         *
+         * @receiver the multiplicand.
+         * @param other the multiplier.
+         * @return the difference.
+         */
+        internal tailrec fun <C> Group<C>.optimizedMultiply(arg: C, other: Int): C =
+            when {
+                other == 0 -> zero
+                other == 1 -> arg
+                other == -1 -> -arg
+                other % 2 == 0 -> optimizedMultiply(arg + arg, other / 2)
+                other % 2 == 1 -> optimizedAddMultiplied(arg, arg + arg, other / 2)
+                other % 2 == -1 -> optimizedAddMultiplied(-arg, arg + arg, other / 2)
+                else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
+            }
+
+        // TODO: Move receiver to context receiver
+        /**
+         * Adds product of [arg] and [multiplier] to [base].
+         *
+         * @receiver the algebra to provide multiplication.
+         * @param base the augend.
+         * @param arg the multiplicand.
+         * @param multiplier the multiplier.
+         * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
+         * @author Gleb Minaev
+         */
+        internal tailrec fun <C> Group<C>.optimizedAddMultiplied(base: C, arg: C, multiplier: Int): C =
+            when {
+                multiplier == 0 -> base
+                multiplier == 1 -> base + arg
+                multiplier == -1 -> base - arg
+                multiplier % 2 == 0 -> optimizedAddMultiplied(base, arg + arg, multiplier / 2)
+                multiplier % 2 == 1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
+                multiplier % 2 == -1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
+                else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
+            }
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index 16af7f555..cfd21d552 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -117,16 +117,16 @@ public fun <T : Comparable<T>> PiecewisePolynomial(
  * Return a value of polynomial function with given [ring] a given [arg] or null if argument is outside piecewise
  * definition.
  */
-public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.value(ring: C, arg: T): T? =
-    findPiece(arg)?.value(ring, arg)
+public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.substitute(ring: C, arg: T): T? =
+    findPiece(arg)?.substitute(ring, arg)
 
 /**
  * Convert this polynomial to a function returning nullable value (null if argument is outside piecewise range).
  */
-public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C): (T) -> T? = { value(ring, it) }
+public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C): (T) -> T? = { substitute(ring, it) }
 
 /**
  * Convert this polynomial to a function using [defaultValue] for arguments outside the piecewise range.
  */
 public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C, defaultValue: T): (T) -> T =
-    { value(ring, it) ?: defaultValue }
+    { substitute(ring, it) ?: defaultValue }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index a36d36f52..30280a396 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -5,128 +5,371 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedAddMultiplied
+import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedMultiply
 import space.kscience.kmath.operations.*
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
+import kotlin.jvm.JvmName
 import kotlin.math.max
-import kotlin.math.pow
+import kotlin.math.min
 
 /**
  * Polynomial coefficients model without fixation on specific context they are applied to.
  *
  * @param coefficients constant is the leftmost coefficient.
  */
-public class Polynomial<out T>(public val coefficients: List<T>) {
+public class Polynomial<T>(public val coefficients: List<T>) : AbstractPolynomial<T> {
     override fun toString(): String = "Polynomial$coefficients"
+
+//    public companion object {
+//        /**
+//         * Default name of variables used in string representations.
+//         *
+//         * @see Polynomial.toString
+//         */
+//        public var defaultVariableName: String = "x"
+//
+//        /**
+//         * Represents result of division with remainder.
+//         */
+//        public data class DividingResult<C>(
+//            val quotient: Polynomial<C>,
+//            val reminder: Polynomial<C>
+//        )
+//    }
 }
 
 /**
- * Returns a [Polynomial] instance with given [coefficients].
+ * Represents internal [Polynomial] errors.
+ */
+internal class PolynomialError(message: String): Error(message)
+
+// region Constructors and converters
+
+/**
+ * Returns a [Polynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
+ * [reverse] parameter is true.
  */
 @Suppress("FunctionName")
-public fun <T> Polynomial(vararg coefficients: T): Polynomial<T> = Polynomial(coefficients.toList())
+public fun <T> Polynomial(coefficients: List<T>, reverse: Boolean = false): Polynomial<T> =
+    Polynomial(with(coefficients) { if (reverse) reversed() else this })
 
 /**
- * Evaluates the value of the given double polynomial for given double argument.
+ * Returns a [Polynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
+ * [reverse] parameter is true.
  */
-public fun Polynomial<Double>.value(arg: Double): Double = coefficients.reduceIndexed { index, acc, c ->
-    acc + c * arg.pow(index)
-}
+@Suppress("FunctionName")
+public fun <T> Polynomial(vararg coefficients: T, reverse: Boolean = false): Polynomial<T> =
+    Polynomial(with(coefficients) { if (reverse) reversed() else toList() })
+
+public fun <T> T.asPolynomial() : Polynomial<T> = Polynomial(listOf(this))
+
+// endregion
 
 /**
- * Evaluates the value of the given polynomial for given argument.
- * https://en.wikipedia.org/wiki/Horner%27s_method
- */
-public fun <T, C : Ring<T>> Polynomial<T>.value(ring: C, arg: T): T = ring {
-    if (coefficients.isEmpty()) return@ring zero
-    var result: T = coefficients.last()
-    for (j in coefficients.size - 2 downTo 0) {
-        result = (arg * result) + coefficients[j]
-    }
-    return result
-}
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <T, C : Ring<T>> Polynomial<T>.asFunction(ring: C): (T) -> T = { value(ring, it) }
-
-/**
- * Create a polynomial witch represents differentiated version of this polynomial
- */
-@UnstableKMathAPI
-public fun <T, A> Polynomial<T>.differentiate(
-    algebra: A,
-): Polynomial<T> where  A : Ring<T>, A : NumericAlgebra<T> = algebra {
-    Polynomial(coefficients.drop(1).mapIndexed { index, t -> number(index) * t })
-}
-
-/**
- * Create a polynomial witch represents indefinite integral version of this polynomial
- */
-@UnstableKMathAPI
-public fun <T, A> Polynomial<T>.integrate(
-    algebra: A,
-): Polynomial<T> where  A : Field<T>, A : NumericAlgebra<T> = algebra {
-    val integratedCoefficients = buildList(coefficients.size + 1) {
-        add(zero)
-        coefficients.forEachIndexed{ index, t -> add(t / (number(index) + one)) }
-    }
-    Polynomial(integratedCoefficients)
-}
-
-/**
- * Compute a definite integral of a given polynomial in a [range]
- */
-@UnstableKMathAPI
-public fun <T : Comparable<T>> Polynomial<T>.integrate(
-    algebra: Field<T>,
-    range: ClosedRange<T>,
-): T = algebra {
-    val integral = integrate(algebra)
-    integral.value(algebra, range.endInclusive) - integral.value(algebra, range.start)
-}
-
-/**
- * Space of polynomials.
+ * Space of polynomials constructed over ring.
  *
- * @param T the type of operated polynomials.
- * @param C the intersection of [Ring] of [T] and [ScaleOperations] of [T].
- * @param ring the [C] instance.
+ * @param C the type of constants. Polynomials have them as a coefficients in their terms.
+ * @param A type of underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
  */
-public class PolynomialSpace<T, C>(
-    private val ring: C,
-) : Group<Polynomial<T>>, ScaleOperations<Polynomial<T>> where C : Ring<T>, C : ScaleOperations<T> {
-    override val zero: Polynomial<T> = Polynomial(emptyList())
+@Suppress("INAPPLICABLE_JVM_NAME") // KT-31420
+public open class PolynomialSpace<C, A : Ring<C>>(
+    public val ring: A,
+) : AbstractPolynomialSpace<C, Polynomial<C>>{
+    // region Constant-integer relation
+    @JvmName("constantIntPlus")
+    public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
+    @JvmName("constantIntMinus")
+    public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
+    @JvmName("constantIntTimes")
+    public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
+    // endregion
 
-    override fun Polynomial<T>.unaryMinus(): Polynomial<T> = ring {
+    // region Integer-constant relation
+    @JvmName("intConstantPlus")
+    public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
+    @JvmName("intConstantMinus")
+    public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
+    @JvmName("intConstantTimes")
+    public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
+    // endregion
+
+    // region Polynomial-integer relation
+    public override operator fun Polynomial<C>.plus(other: Int): Polynomial<C> =
+        if (other == 0) this
+        else
+            Polynomial(
+                coefficients
+                    .toMutableList()
+                    .apply {
+                        if (isEmpty()) this[0] = ring.zero + other
+                        else this[0] = this[0]!! + other
+                    }
+            )
+    public override operator fun Polynomial<C>.minus(other: Int): Polynomial<C> =
+        if (other == 0) this
+        else
+            Polynomial(
+                coefficients
+                    .toMutableList()
+                    .apply {
+                        if (isEmpty()) this[0] = ring.zero - other
+                        else this[0] = this[0]!! - other
+                    }
+            )
+    public override operator fun Polynomial<C>.times(other: Int): Polynomial<C> =
+        if (other == 0) zero
+        else Polynomial(
+            coefficients
+                .subList(0, degree + 1)
+                .map { it * other }
+        )
+    // endregion
+
+    // region Integer-polynomial relation
+    public override operator fun Int.plus(other: Polynomial<C>): Polynomial<C> =
+        if (this == 0) other
+        else
+            Polynomial(
+                other.coefficients
+                    .toMutableList()
+                    .apply {
+                        if (isEmpty()) this[0] = ring.zero + this@plus
+                        else this[0] = this[0]!! + this@plus
+                    }
+            )
+    public override operator fun Int.minus(other: Polynomial<C>): Polynomial<C> =
+        if (this == 0) other
+        else
+            Polynomial(
+                other.coefficients
+                    .toMutableList()
+                    .apply {
+                        if (isEmpty()) this[0] = ring.zero - this@minus
+                        else this[0] = this[0]!! - this@minus
+                    }
+            )
+    public override operator fun Int.times(other: Polynomial<C>): Polynomial<C> =
+        if (this == 0) zero
+        else Polynomial(
+            other.coefficients
+                .subList(0, other.degree + 1)
+                .map { it * this }
+        )
+    // endregion
+
+    // region Constant-constant relation
+    @JvmName("constantUnaryMinus")
+    public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
+    @JvmName("constantPlus")
+    public override operator fun C.plus(other: C): C = ring { this@plus + other }
+    @JvmName("constantMinus")
+    public override operator fun C.minus(other: C): C = ring { this@minus - other }
+    @JvmName("constantTimes")
+    public override operator fun C.times(other: C): C = ring { this@times * other }
+    @JvmName("constantIsZero")
+    public override fun C.isZero(): Boolean = ring { this == zero }
+    @JvmName("constantIsNotZero")
+    public override fun C.isNotZero(): Boolean = ring { this != zero }
+    @JvmName("constantIsOne")
+    public override fun C.isOne(): Boolean = ring { this == one }
+    @JvmName("constantIsNotOne")
+    public override fun C.isNotOne(): Boolean = ring { this != one }
+    @JvmName("constantIsMinusOne")
+    public override fun C.isMinusOne(): Boolean = ring { this == -one }
+    @JvmName("constantIsNotMinusOne")
+    public override fun C.isNotMinusOne(): Boolean = ring { this != -one }
+    // endregion
+
+    // region Constant-polynomial relation
+    public override operator fun C.plus(other: Polynomial<C>): Polynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) Polynomial(listOf(this@plus))
+            else Polynomial(
+                toMutableList()
+                    .apply {
+                        this[0] += this@plus
+                    }
+            )
+        }
+//        if (degree == -1) UnivariatePolynomial(other) else UnivariatePolynomial(
+//            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
+//        )
+    public override operator fun C.minus(other: Polynomial<C>): Polynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) Polynomial(listOf(-this@minus))
+            else Polynomial(
+                toMutableList()
+                    .apply {
+                        this[0] -= this@minus
+                    }
+            )
+        }
+//        if (degree == -1) UnivariatePolynomial(other) else UnivariatePolynomial(
+//            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
+//        )
+    public override operator fun C.times(other: Polynomial<C>): Polynomial<C> =
+        Polynomial(
+            other.coefficients
+//                .subList(0, other.degree + 1)
+                .map { it * this }
+        )
+    // endregion
+
+    // region Polynomial-constant relation
+    public override operator fun Polynomial<C>.plus(other: C): Polynomial<C> =
+        if (other.isZero()) this
+        else with(coefficients) {
+            if (isEmpty()) Polynomial(listOf(other))
+            else Polynomial(
+                toMutableList()
+                    .apply {
+                        this[0] += other
+                    }
+            )
+        }
+//        if (degree == -1) UnivariatePolynomial(other) else UnivariatePolynomial(
+//            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
+//        )
+    public override operator fun Polynomial<C>.minus(other: C): Polynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) Polynomial(listOf(other))
+            else Polynomial(
+                toMutableList()
+                    .apply {
+                        this[0] -= other
+                    }
+            )
+        }
+//        if (degree == -1) UnivariatePolynomial(-other) else UnivariatePolynomial(
+//            listOf(coefficients[0] - other) + coefficients.subList(1, degree + 1)
+//        )
+    public override operator fun Polynomial<C>.times(other: C): Polynomial<C> =
+        Polynomial(
+            coefficients
+//                .subList(0, degree + 1)
+                .map { it * other }
+        )
+    // endregion
+
+    // region Polynomial-polynomial relation
+    public override operator fun Polynomial<C>.unaryMinus(): Polynomial<C> =
         Polynomial(coefficients.map { -it })
-    }
-
-    override fun add(left: Polynomial<T>, right: Polynomial<T>): Polynomial<T> {
-        val dim = max(left.coefficients.size, right.coefficients.size)
-
-        return ring {
-            Polynomial(List(dim) { index ->
-                left.coefficients.getOrElse(index) { zero } + right.coefficients.getOrElse(index) { zero }
-            })
+    public override operator fun Polynomial<C>.plus(other: Polynomial<C>): Polynomial<C> =
+        Polynomial(
+            (0..max(degree, other.degree))
+                .map {
+                    when {
+                        it > degree -> other.coefficients[it]
+                        it > other.degree -> coefficients[it]
+                        else -> coefficients[it] + other.coefficients[it]
+                    }
+                }
+                .ifEmpty { listOf(ring.zero) }
+        )
+    public override operator fun Polynomial<C>.minus(other: Polynomial<C>): Polynomial<C> =
+        Polynomial(
+            (0..max(degree, other.degree))
+                .map {
+                    when {
+                        it > degree -> -other.coefficients[it]
+                        it > other.degree -> coefficients[it]
+                        else -> coefficients[it] - other.coefficients[it]
+                    }
+                }
+                .ifEmpty { listOf(ring.zero) }
+        )
+    public override operator fun Polynomial<C>.times(other: Polynomial<C>): Polynomial<C> {
+        val thisDegree = degree
+        val otherDegree = other.degree
+        return when {
+            thisDegree == -1 -> this
+            otherDegree == -1 -> other
+            else ->
+                Polynomial(
+                    (0..(thisDegree + otherDegree))
+                        .map { d ->
+                            (max(0, d - otherDegree)..(min(thisDegree, d)))
+                                .map { coefficients[it] * other.coefficients[d - it] }
+                                .reduce { acc, rational -> acc + rational }
+                        }
+                )
         }
     }
 
-    override fun scale(a: Polynomial<T>, value: Double): Polynomial<T> =
-        ring { Polynomial(List(a.coefficients.size) { index -> a.coefficients[index] * value }) }
+    public override fun Polynomial<C>.isZero(): Boolean = coefficients.all { it.isZero() }
+    public override fun Polynomial<C>.isNotZero(): Boolean = coefficients.any { it.isNotZero() }
+    public override fun Polynomial<C>.isOne(): Boolean =
+        with(coefficients) { isNotEmpty() && asSequence().withIndex().any { (index, c) -> if (index == 0) c.isOne() else c.isZero() } } // TODO: It's better to write new methods like `anyIndexed`. But what's better way to do it?
+    public override fun Polynomial<C>.isNotOne(): Boolean = !isOne()
+    public override fun Polynomial<C>.isMinusOne(): Boolean =
+        with(coefficients) { isNotEmpty() && asSequence().withIndex().any { (index, c) -> if (index == 0) c.isMinusOne() else c.isZero() } } // TODO: It's better to write new methods like `anyIndexed`. But what's better way to do it?
+    public override fun Polynomial<C>.isNotMinusOne(): Boolean = !isMinusOne()
+
+    override val zero: Polynomial<C> = Polynomial(emptyList())
+    override val one: Polynomial<C> = Polynomial(listOf(ring.one))
+
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    public override fun Polynomial<C>.equals(other: Polynomial<C>): Boolean =
+        when {
+            this === other -> true
+            else -> {
+                if (this.degree == other.degree)
+                    (0..degree).all { coefficients[it] == other.coefficients[it] }
+                else false
+            }
+        }
+    // endregion
+
+    // Not sure is it necessary...
+    // region Polynomial properties
+    public override val Polynomial<C>.degree: Int get() = coefficients.indexOfLast { it != ring.zero }
+
+    public override fun Polynomial<C>.asConstantOrNull(): C? =
+        with(coefficients) {
+            when {
+                isEmpty() -> ring.zero
+                degree > 0 -> null
+                else -> first()
+            }
+        }
+    public override fun Polynomial<C>.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
+
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun Polynomial<C>.substitute(argument: C): C = this.substitute(ring, argument)
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun Polynomial<C>.substitute(argument: Polynomial<C>): Polynomial<C> = this.substitute(ring, argument)
+
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun Polynomial<C>.asFunction(): (C) -> C = { this.substitute(ring, it) }
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun Polynomial<C>.asFunctionOnConstants(): (C) -> C = { this.substitute(ring, it) }
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun Polynomial<C>.asFunctionOnPolynomials(): (Polynomial<C>) -> Polynomial<C> = { this.substitute(ring, it) }
 
     /**
      * Evaluates the polynomial for the given value [arg].
      */
-    public operator fun Polynomial<T>.invoke(arg: T): T = value(ring, arg)
-
-    public fun Polynomial<T>.asFunction(): (T) -> T = asFunction(ring)
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun Polynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun Polynomial<C>.invoke(argument: Polynomial<C>): Polynomial<C> = this.substitute(ring, argument)
+    // endregion
 
 }
 
-public inline fun <T, C, R> C.polynomial(block: PolynomialSpace<T, C>.() -> R): R where C : Ring<T>, C : ScaleOperations<T> {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return PolynomialSpace(this).block()
+/**
+ * Space of polynomials constructed over ring.
+ *
+ * @param C the type of constants. Polynomials have them as a coefficients in their terms.
+ * @param A type of underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
+ */
+public class ScalablePolynomialSpace<C, A>(
+    ring: A,
+) : PolynomialSpace<C, A>(ring), ScaleOperations<Polynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
+
+    override fun scale(a: Polynomial<C>, value: Double): Polynomial<C> =
+        ring { Polynomial(List(a.coefficients.size) { index -> a.coefficients[index] * value }) }
+
 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
new file mode 100644
index 000000000..1a3eb7874
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.jvm.JvmName
+import kotlin.math.pow
+
+
+// region Utilities
+
+/**
+ * Removes zeros on the end of the coefficient list of polynomial.
+ */
+//context(PolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> Polynomial<C>.removeZeros() : Polynomial<C> =
+//    if (degree > -1) Polynomial(coefficients.subList(0, degree + 1)) else zero
+
+/**
+ * Crates a [PolynomialSpace] over received ring.
+ */
+public fun <C, A : Ring<C>> A.polynomial(): PolynomialSpace<C, A> =
+    PolynomialSpace(this)
+
+/**
+ * Crates a [PolynomialSpace]'s scope over received ring.
+ */
+public inline fun <C, A : Ring<C>, R> A.polynomial(block: PolynomialSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return PolynomialSpace(this).block()
+}
+
+/**
+ * Crates a [ScalablePolynomialSpace] over received scalable ring.
+ */
+public fun <C, A> A.scalablePolynomial(): ScalablePolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C> =
+    ScalablePolynomialSpace(this)
+
+/**
+ * Crates a [ScalablePolynomialSpace]'s scope over received scalable ring.
+ */
+public inline fun <C, A, R> A.scalablePolynomial(block: ScalablePolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return ScalablePolynomialSpace(this).block()
+}
+
+// endregion
+
+// region Polynomial substitution and functional representation
+
+// TODO: May be apply Horner's method too?
+/**
+ * Evaluates the value of the given double polynomial for given double argument.
+ */
+public fun Polynomial<Double>.substitute(arg: Double): Double =
+    coefficients.reduceIndexedOrNull { index, acc, c ->
+        acc + c * arg.pow(index)
+    } ?: .0
+
+/**
+ * Evaluates the value of the given polynomial for given argument.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */
+public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
+    if (coefficients.isEmpty()) return@ring zero
+    var result: C = coefficients.last()
+    for (j in coefficients.size - 2 downTo 0) {
+        result = (arg * result) + coefficients[j]
+    }
+    return result
+}
+
+// TODO: (Waiting for hero) Replace with optimisation: the [result] may be unboxed, and all operations may be performed
+//  as soon as possible on it
+public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: Polynomial<C>) : Polynomial<C> = ring.polynomial {
+    if (coefficients.isEmpty()) return zero
+    var result: Polynomial<C> = coefficients.last().asPolynomial()
+    for (j in coefficients.size - 2 downTo 0) {
+        result = (arg * result) + coefficients[j]
+    }
+    return result
+}
+
+/**
+ * Represent the polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> Polynomial<C>.asFunction(ring: A): (C) -> C = { substitute(ring, it) }
+
+/**
+ * Represent the polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> Polynomial<C>.asPolynomialFunctionOver(ring: A): (Polynomial<C>) -> Polynomial<C> = { substitute(ring, it) }
+
+// endregion
+
+// region Algebraic derivative and antiderivative
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> Polynomial<C>.derivative(
+    algebra: A,
+): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
+    Polynomial(coefficients.drop(1).mapIndexed { index, t -> number(index) * t })
+}
+
+/**
+ * Create a polynomial witch represents indefinite integral version of this polynomial
+ */
+@UnstableKMathAPI
+public fun <C, A> Polynomial<C>.antiderivative(
+    algebra: A,
+): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
+    val integratedCoefficients = buildList(coefficients.size + 1) {
+        add(zero)
+        coefficients.forEachIndexed{ index, t -> add(t / (number(index) + one)) }
+    }
+    Polynomial(integratedCoefficients)
+}
+
+/**
+ * Compute a definite integral of a given polynomial in a [range]
+ */
+@UnstableKMathAPI
+public fun <C : Comparable<C>> Polynomial<C>.integrate(
+    algebra: Field<C>,
+    range: ClosedRange<C>,
+): C = algebra {
+    val integral = antiderivative(algebra)
+    integral.substitute(algebra, range.endInclusive) - integral.substitute(algebra, range.start)
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index 15d548641..2e6873ece 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.integration
 
 import space.kscience.kmath.functions.PiecewisePolynomial
 import space.kscience.kmath.functions.integrate
+import space.kscience.kmath.functions.antiderivative
 import space.kscience.kmath.interpolation.PolynomialInterpolator
 import space.kscience.kmath.interpolation.SplineInterpolator
 import space.kscience.kmath.interpolation.interpolatePolynomials
@@ -23,7 +24,7 @@ import space.kscience.kmath.structures.MutableBufferFactory
 @OptIn(PerformancePitfall::class)
 @UnstableKMathAPI
 public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(algebra: Field<T>): PiecewisePolynomial<T> =
-    PiecewisePolynomial(pieces.map { it.first to it.second.integrate(algebra) })
+    PiecewisePolynomial(pieces.map { it.first to it.second.antiderivative(algebra) })
 
 /**
  * Compute definite integral of given [PiecewisePolynomial] piece by piece in a given [range]
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
index b13adefa5..bbd76c87e 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
@@ -9,7 +9,7 @@ package space.kscience.kmath.interpolation
 
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.value
+import space.kscience.kmath.functions.substitute
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.structures.Buffer
@@ -33,7 +33,7 @@ public interface PolynomialInterpolator<T : Comparable<T>> : Interpolator<T, T,
     public fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T>
 
     override fun interpolate(points: XYColumnarData<T, T, T>): (T) -> T = { x ->
-        interpolatePolynomials(points).value(algebra, x) ?: getDefaultValue()
+        interpolatePolynomials(points).substitute(algebra, x) ?: getDefaultValue()
     }
 }
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
index 05c16d17e..e0f0e32a4 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
@@ -5,13 +5,22 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.operations.algebra
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class PolynomialTest {
+    @Test
+    fun simple_polynomial_test() {
+        Double.algebra.scalablePolynomial {
+            val x = Polynomial(listOf(0.0, 1.0))
+            val polynomial = x * x - 2 * x + 1
+            assertEquals(0.0, polynomial.substitute(1.0), 0.001)
+        }
+    }
     @Test
     fun testIntegration() {
         val polynomial = Polynomial(1.0, -2.0, 1.0)
-        assertEquals(0.0, polynomial.value(1.0), 0.001)
+        assertEquals(0.0, polynomial.substitute(1.0), 0.001)
     }
 }
\ No newline at end of file
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
index e21abe604..9fc75720e 100644
--- a/kotlin-js-store/yarn.lock
+++ b/kotlin-js-store/yarn.lock
@@ -274,11 +274,6 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-astring@1.7.5:
-  version "1.7.5"
-  resolved "https://registry.yarnpkg.com/astring/-/astring-1.7.5.tgz#a7d47fceaf32b052d33a3d07c511efeec67447ca"
-  integrity sha512-lobf6RWXb8c4uZ7Mdq0U12efYmpD1UFnyOWVJPTa3ukqZrMopav+2hdNu0hgBF0JIBFK9QgrBDfwYvh3DFJDAA==
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -294,24 +289,11 @@ base64id@2.0.0, base64id@~2.0.0:
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
   integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
 
-benchmark@*:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629"
-  integrity sha1-CfPeMckWQl1JjMLuVloOvzwqVik=
-  dependencies:
-    lodash "^4.17.4"
-    platform "^1.3.3"
-
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-binaryen@101.0.0:
-  version "101.0.0"
-  resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-101.0.0.tgz#42a9e4cc7a22e2c1d75a31d28005a9b518b2c555"
-  integrity sha512-FRmVxvrR8jtcf0qcukNAPZDM3dZ2sc9GmA/hKxBI7k3fFzREKh1cAs+ruQi+ITTKz7u/AuFMuVnbJwTh0ef/HQ==
-
 body-parser@^1.19.0:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4"
@@ -599,14 +581,6 @@ dom-serialize@^2.2.1:
     extend "^3.0.0"
     void-elements "^2.0.0"
 
-dukat@0.5.8-rc.4:
-  version "0.5.8-rc.4"
-  resolved "https://registry.yarnpkg.com/dukat/-/dukat-0.5.8-rc.4.tgz#90384dcb50b14c26f0e99dae92b2dea44f5fce21"
-  integrity sha512-ZnMt6DGBjlVgK2uQamXfd7uP/AxH7RqI0BL9GLrrJb2gKdDxvJChWy+M9AQEaL+7/6TmxzJxFOsRiInY9oGWTA==
-  dependencies:
-    google-protobuf "3.12.2"
-    typescript "3.9.5"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -881,11 +855,6 @@ glob@^7.1.3, glob@^7.1.7:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-google-protobuf@3.12.2:
-  version "3.12.2"
-  resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.12.2.tgz#50ce9f9b6281235724eb243d6a83e969a2176e53"
-  integrity sha512-4CZhpuRr1d6HjlyrxoXoocoGFnRYgKULgMtikMddA9ztRyYR59Aondv2FioyxWVamRo0rF2XpYawkTCBEQOSkA==
-
 graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
   version "4.2.9"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
@@ -1065,11 +1034,6 @@ jest-worker@^27.4.1:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-js-base64@3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.6.1.tgz#555aae398b74694b4037af1f8a5a6209d170efbe"
-  integrity sha512-Frdq2+tRRGLQUIQOgsIGSCd1VePCS2fsddTG5dTCqR0JHgltXWfsxnY0gIXPoMeRmdom6Oyq+UMOFg5suduOjQ==
-
 js-yaml@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -1179,7 +1143,7 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4:
+lodash@^4.17.15, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -1437,11 +1401,6 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-platform@^1.3.3:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
-  integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
-
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
@@ -1696,14 +1655,6 @@ source-map-loader@3.0.0:
     iconv-lite "^0.6.2"
     source-map-js "^0.6.2"
 
-source-map-support@0.5.20:
-  version "0.5.20"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
-  integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
@@ -1838,11 +1789,6 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typescript@3.9.5:
-  version "3.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
-  integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==
-
 ua-parser-js@^0.7.28:
   version "0.7.31"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
-- 
2.34.1


From 4575ab2b797ff5dfea99ea72e0470b977eb9ee48 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 7 Mar 2022 10:39:59 +0300
Subject: [PATCH 416/713] Update interpolation API to agree with other
 conventions.

---
 .../kscience/kmath/benchmarks/DotBenchmark.kt |  7 +++++
 .../kmath/functions/interpolateSquare.kt      |  4 +--
 .../kmath/integration/SplineIntegrator.kt     |  3 ++
 .../kmath/interpolation/Interpolator.kt       | 31 +++++++++++++++++++
 .../kmath/interpolation/LinearInterpolator.kt |  4 +++
 .../kmath/interpolation/SplineInterpolator.kt | 16 ++++++----
 .../interpolation/LinearInterpolatorTest.kt   |  6 ++--
 .../interpolation/SplineInterpolatorTest.kt   |  7 ++---
 .../kscience/kmath/multik/MultikNDTest.kt     | 25 +++++++++++++++
 .../kmath/tensorflow/DoubleTensorFlowOps.kt   |  2 --
 10 files changed, 87 insertions(+), 18 deletions(-)

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 16fd544a8..7d5ae310b 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -15,8 +15,10 @@ import space.kscience.kmath.linear.invoke
 import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.multik.multikAlgebra
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.tensorflow.produceWithTF
+import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.tensorAlgebra
 import kotlin.random.Random
 
@@ -90,4 +92,9 @@ internal class DotBenchmark {
     fun doubleDot(blackhole: Blackhole) = with(DoubleField.linearSpace) {
         blackhole.consume(matrix1 dot matrix2)
     }
+
+    @Benchmark
+    fun doubleTensorDot(blackhole: Blackhole) = DoubleTensorAlgebra.invoke {
+        blackhole.consume(matrix1 dot matrix2)
+    }
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
index 091242829..feefedece 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.interpolation.SplineInterpolator
 import space.kscience.kmath.interpolation.interpolatePolynomials
+import space.kscience.kmath.interpolation.splineInterpolator
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
@@ -28,7 +28,7 @@ fun main() {
     val xs = 0.0..100.0 step 0.5
     val ys = xs.map(function)
 
-    val polynomial: PiecewisePolynomial<Double> = SplineInterpolator.double.interpolatePolynomials(xs, ys)
+    val polynomial: PiecewisePolynomial<Double> = DoubleField.splineInterpolator.interpolatePolynomials(xs, ys)
 
     val polyFunction = polynomial.asFunction(DoubleField, 0.0)
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index 15d548641..eb88d9ae0 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -28,6 +28,8 @@ public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(algebra: Field<T
 /**
  * Compute definite integral of given [PiecewisePolynomial] piece by piece in a given [range]
  * Requires [UnivariateIntegrationNodes] or [IntegrationRange] and [IntegrandMaxCalls]
+ *
+ * TODO use context receiver for algebra
  */
 @UnstableKMathAPI
 public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(
@@ -98,6 +100,7 @@ public object DoubleSplineIntegrator : UnivariateIntegrator<Double> {
     }
 }
 
+@Suppress("unused")
 @UnstableKMathAPI
 public inline val DoubleField.splineIntegrator: UnivariateIntegrator<Double>
     get() = DoubleSplineIntegrator
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
index b13adefa5..2266092a3 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
@@ -9,6 +9,7 @@ package space.kscience.kmath.interpolation
 
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.functions.PiecewisePolynomial
+import space.kscience.kmath.functions.asFunction
 import space.kscience.kmath.functions.value
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
@@ -59,3 +60,33 @@ public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolatePolynomials(
     val pointSet = XYColumnarData.of(data.map { it.first }.asBuffer(), data.map { it.second }.asBuffer())
     return interpolatePolynomials(pointSet)
 }
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
+    x: Buffer<T>,
+    y: Buffer<T>,
+): (T) -> T? = interpolatePolynomials(x, y).asFunction(algebra)
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
+    data: Map<T, T>,
+): (T) -> T? = interpolatePolynomials(data).asFunction(algebra)
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
+    data: List<Pair<T, T>>,
+): (T) -> T? = interpolatePolynomials(data).asFunction(algebra)
+
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
+    x: Buffer<T>,
+    y: Buffer<T>,
+    defaultValue: T,
+): (T) -> T = interpolatePolynomials(x, y).asFunction(algebra, defaultValue)
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
+    data: Map<T, T>,
+    defaultValue: T,
+): (T) -> T = interpolatePolynomials(data).asFunction(algebra, defaultValue)
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
+    data: List<Pair<T, T>>,
+    defaultValue: T,
+): (T) -> T = interpolatePolynomials(data).asFunction(algebra, defaultValue)
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
index edd0e6b0a..34d7bcf41 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
@@ -22,6 +22,7 @@ internal fun <T : Comparable<T>> insureSorted(points: XYColumnarData<*, T, *>) {
  * Reference JVM implementation: https://github.com/apache/commons-math/blob/master/src/main/java/org/apache/commons/math4/analysis/interpolation/LinearInterpolator.java
  */
 public class LinearInterpolator<T : Comparable<T>>(override val algebra: Field<T>) : PolynomialInterpolator<T> {
+
     @OptIn(UnstableKMathAPI::class)
     override fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T> = algebra {
         require(points.size > 0) { "Point array should not be empty" }
@@ -37,3 +38,6 @@ public class LinearInterpolator<T : Comparable<T>>(override val algebra: Field<T
         }
     }
 }
+
+public val <T : Comparable<T>> Field<T>.linearInterpolator: LinearInterpolator<T>
+    get() = LinearInterpolator(this)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
index 39c33ee69..afcb33bd4 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -63,8 +63,8 @@ public class SplineInterpolator<T : Comparable<T>>(
                 //Shift coefficients to represent absolute polynomial instead of one with an offset
                 val polynomial = Polynomial(
                     a - b * x0 + c * x02 - d * x03,
-                    b - 2*c*x0 + 3*d*x02,
-                    c - 3*d*x0,
+                    b - 2 * c * x0 + 3 * d * x02,
+                    c - 3 * d * x0,
                     d
                 )
                 cOld = c
@@ -72,8 +72,12 @@ public class SplineInterpolator<T : Comparable<T>>(
             }
         }
     }
-
-    public companion object {
-        public val double: SplineInterpolator<Double> = SplineInterpolator(DoubleField, ::DoubleBuffer)
-    }
 }
+
+
+public fun <T : Comparable<T>> Field<T>.splineInterpolator(
+    bufferFactory: MutableBufferFactory<T>,
+): SplineInterpolator<T> = SplineInterpolator(this, bufferFactory)
+
+public val DoubleField.splineInterpolator: SplineInterpolator<Double>
+    get() = SplineInterpolator(this, ::DoubleBuffer)
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
index bec678bae..1143036d4 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
@@ -5,8 +5,6 @@
 
 package space.kscience.kmath.interpolation
 
-import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.asFunction
 import space.kscience.kmath.operations.DoubleField
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -21,8 +19,8 @@ internal class LinearInterpolatorTest {
             3.0 to 4.0
         )
 
-        val polynomial: PiecewisePolynomial<Double> = LinearInterpolator(DoubleField).interpolatePolynomials(data)
-        val function = polynomial.asFunction(DoubleField)
+        //val polynomial: PiecewisePolynomial<Double> = DoubleField.linearInterpolator.interpolatePolynomials(data)
+        val function = DoubleField.linearInterpolator.interpolate(data)
         assertEquals(null, function(-1.0))
         assertEquals(0.5, function(0.5))
         assertEquals(2.0, function(1.5))
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
index 3adaab2d1..4c7d816d4 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
@@ -5,8 +5,6 @@
 
 package space.kscience.kmath.interpolation
 
-import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.asFunction
 import space.kscience.kmath.operations.DoubleField
 import kotlin.math.PI
 import kotlin.math.sin
@@ -21,9 +19,10 @@ internal class SplineInterpolatorTest {
             x to sin(x)
         }
 
-        val polynomial: PiecewisePolynomial<Double> = SplineInterpolator.double.interpolatePolynomials(data)
+        //val polynomial: PiecewisePolynomial<Double> = DoubleField.splineInterpolator.interpolatePolynomials(data)
+
+        val function = DoubleField.splineInterpolator.interpolate(data, Double.NaN)
 
-        val function = polynomial.asFunction(DoubleField, Double.NaN)
         assertEquals(Double.NaN, function(-1.0))
         assertEquals(sin(0.5), function(0.5), 0.1)
         assertEquals(sin(1.5), function(1.5), 0.1)
diff --git a/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt b/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
index 404541776..72c43d8e6 100644
--- a/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
+++ b/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
@@ -6,13 +6,38 @@
 package space.kscience.kmath.multik
 
 import org.junit.jupiter.api.Test
+import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.one
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.tensorAlgebra
+import kotlin.test.assertTrue
 
 internal class MultikNDTest {
     @Test
     fun basicAlgebra(): Unit = DoubleField.multikAlgebra{
         one(2,2) + 1.0
     }
+
+    @Test
+    fun dotResult(){
+        val dim = 100
+
+        val tensor1 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12224)
+        val tensor2 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12225)
+
+        val multikResult = with(DoubleField.multikAlgebra){
+            tensor1 dot tensor2
+        }
+
+        val defaultResult = with(DoubleField.tensorAlgebra){
+            tensor1 dot tensor2
+        }
+
+        assertTrue {
+            StructureND.contentEquals(multikResult, defaultResult)
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
index 3d118d980..308469eed 100644
--- a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
+++ b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
@@ -6,7 +6,6 @@ import space.kscience.kmath.nd.structureND
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra.Companion.sum
-import kotlin.random.Random
 import kotlin.test.assertEquals
 
 class DoubleTensorFlowOps {
@@ -23,7 +22,6 @@ class DoubleTensorFlowOps {
 
     @Test
     fun dot(){
-        val random = Random(12224)
         val dim = 1000
 
         val tensor1 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12224)
-- 
2.34.1


From 8518f333e3a1897af304b344062dbbd9328f44c7 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 8 Mar 2022 01:31:31 +0700
Subject: [PATCH 417/713] Delete yarn.lock

---
 .gitignore                |    1 +
 kotlin-js-store/yarn.lock | 2059 -------------------------------------
 2 files changed, 1 insertion(+), 2059 deletions(-)
 delete mode 100644 kotlin-js-store/yarn.lock

diff --git a/.gitignore b/.gitignore
index 79f3238e1..5ddd846a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ out/
 
 !/.idea/copyright/
 !/.idea/scopes/
+/kotlin-js-store/yarn.lock
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
deleted file mode 100644
index e21abe604..000000000
--- a/kotlin-js-store/yarn.lock
+++ /dev/null
@@ -1,2059 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@discoveryjs/json-ext@^0.5.0":
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f"
-  integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==
-
-"@types/component-emitter@^1.2.10":
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506"
-  integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==
-
-"@types/cookie@^0.4.0":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
-  integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
-
-"@types/cors@^2.8.8":
-  version "2.8.12"
-  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
-  integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
-
-"@types/eslint-scope@^3.7.0":
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
-  integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304"
-  integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*", "@types/estree@^0.0.50":
-  version "0.0.50"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
-  integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
-
-"@types/json-schema@*", "@types/json-schema@^7.0.8":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
-  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
-
-"@types/node@*", "@types/node@>=10.0.0":
-  version "17.0.12"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.12.tgz#f7aa331b27f08244888c47b7df126184bc2339c5"
-  integrity sha512-4YpbAsnJXWYK/fpTVFlMIcUIho2AYCi4wg5aNPrG1ng7fn/1/RZfCIpRCiBX+12RVa34RluilnvCqD+g3KiSiA==
-
-"@ungap/promise-all-settled@1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
-  integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
-
-"@webassemblyjs/ast@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
-  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
-  dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-
-"@webassemblyjs/floating-point-hex-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
-  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
-
-"@webassemblyjs/helper-api-error@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
-  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
-
-"@webassemblyjs/helper-buffer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
-  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
-
-"@webassemblyjs/helper-numbers@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
-  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/helper-wasm-bytecode@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
-  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
-
-"@webassemblyjs/helper-wasm-section@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
-  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-
-"@webassemblyjs/ieee754@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
-  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
-  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
-  dependencies:
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/utf8@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
-  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
-
-"@webassemblyjs/wasm-edit@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
-  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/helper-wasm-section" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-opt" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    "@webassemblyjs/wast-printer" "1.11.1"
-
-"@webassemblyjs/wasm-gen@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
-  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
-
-"@webassemblyjs/wasm-opt@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
-  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-
-"@webassemblyjs/wasm-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
-  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
-
-"@webassemblyjs/wast-printer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
-  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@xtuc/long" "4.2.2"
-
-"@webpack-cli/configtest@^1.1.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356"
-  integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==
-
-"@webpack-cli/info@^1.4.0":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea"
-  integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==
-  dependencies:
-    envinfo "^7.7.3"
-
-"@webpack-cli/serve@^1.6.0":
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe"
-  integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==
-
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
-
-"@xtuc/long@4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
-  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
-
-abab@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
-  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
-
-accepts@~1.3.4:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
-  dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
-
-acorn-import-assertions@^1.7.6:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
-  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
-
-acorn@^8.4.1:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
-
-ajv-keywords@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
-  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
-
-ajv@^6.12.5:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ansi-colors@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-anymatch@~3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-astring@1.7.5:
-  version "1.7.5"
-  resolved "https://registry.yarnpkg.com/astring/-/astring-1.7.5.tgz#a7d47fceaf32b052d33a3d07c511efeec67447ca"
-  integrity sha512-lobf6RWXb8c4uZ7Mdq0U12efYmpD1UFnyOWVJPTa3ukqZrMopav+2hdNu0hgBF0JIBFK9QgrBDfwYvh3DFJDAA==
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-base64-arraybuffer@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
-  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
-
-base64id@2.0.0, base64id@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
-  integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
-
-benchmark@*:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629"
-  integrity sha1-CfPeMckWQl1JjMLuVloOvzwqVik=
-  dependencies:
-    lodash "^4.17.4"
-    platform "^1.3.3"
-
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
-binaryen@101.0.0:
-  version "101.0.0"
-  resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-101.0.0.tgz#42a9e4cc7a22e2c1d75a31d28005a9b518b2c555"
-  integrity sha512-FRmVxvrR8jtcf0qcukNAPZDM3dZ2sc9GmA/hKxBI7k3fFzREKh1cAs+ruQi+ITTKz7u/AuFMuVnbJwTh0ef/HQ==
-
-body-parser@^1.19.0:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4"
-  integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==
-  dependencies:
-    bytes "3.1.1"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.8.1"
-    iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.9.6"
-    raw-body "2.4.2"
-    type-is "~1.6.18"
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
-browserslist@^4.14.5:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
-  integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
-  dependencies:
-    caniuse-lite "^1.0.30001286"
-    electron-to-chromium "^1.4.17"
-    escalade "^3.1.1"
-    node-releases "^2.0.1"
-    picocolors "^1.0.0"
-
-buffer-from@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
-  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
-
-bytes@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a"
-  integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==
-
-camelcase@^6.0.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
-  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
-
-caniuse-lite@^1.0.30001286:
-  version "1.0.30001301"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001301.tgz#ebc9086026534cab0dab99425d9c3b4425e5f450"
-  integrity sha512-csfD/GpHMqgEL3V3uIgosvh+SVIQvCh43SNu9HRbP1lnxkKm1kjDG4f32PP571JplkLjfS+mg2p1gxR7MYrrIA==
-
-chalk@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chokidar@3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
-  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-chokidar@^3.5.1:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-chrome-trace-event@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
-  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
-
-cliui@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
-  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^7.0.0"
-
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-colorette@^2.0.14:
-  version "2.0.16"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
-  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
-
-colors@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
-commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commander@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
-component-emitter@~1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-connect@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
-  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
-  dependencies:
-    debug "2.6.9"
-    finalhandler "1.1.2"
-    parseurl "~1.3.3"
-    utils-merge "1.0.1"
-
-content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
-cookie@~0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
-  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
-
-cors@~2.8.5:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
-  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
-  dependencies:
-    object-assign "^4"
-    vary "^1"
-
-cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-css-loader@6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.3.0.tgz#334d3500ff0a0c14cfbd4b0670088dbb5b5c1530"
-  integrity sha512-9NGvHOR+L6ps13Ilw/b216++Q8q+5RpJcVufCdW9S/9iCzs4KBDNa8qnA/n3FK/sSfWmH35PAIK/cfPi7LOSUg==
-  dependencies:
-    icss-utils "^5.1.0"
-    postcss "^8.2.15"
-    postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.0"
-    postcss-modules-scope "^3.0.0"
-    postcss-modules-values "^4.0.0"
-    postcss-value-parser "^4.1.0"
-    semver "^7.3.5"
-
-cssesc@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
-  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
-
-custom-event@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
-  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
-
-date-format@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.3.tgz#f63de5dc08dc02efd8ef32bf2a6918e486f35873"
-  integrity sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==
-
-debug@2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
-  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
-  dependencies:
-    ms "2.1.2"
-
-debug@^4.1.1, debug@^4.3.3, debug@~4.3.1:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
-  dependencies:
-    ms "2.1.2"
-
-decamelize@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
-  integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
-
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
-di@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
-  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
-
-diff@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
-  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
-
-dom-serialize@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
-  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
-  dependencies:
-    custom-event "~1.0.0"
-    ent "~2.2.0"
-    extend "^3.0.0"
-    void-elements "^2.0.0"
-
-dukat@0.5.8-rc.4:
-  version "0.5.8-rc.4"
-  resolved "https://registry.yarnpkg.com/dukat/-/dukat-0.5.8-rc.4.tgz#90384dcb50b14c26f0e99dae92b2dea44f5fce21"
-  integrity sha512-ZnMt6DGBjlVgK2uQamXfd7uP/AxH7RqI0BL9GLrrJb2gKdDxvJChWy+M9AQEaL+7/6TmxzJxFOsRiInY9oGWTA==
-  dependencies:
-    google-protobuf "3.12.2"
-    typescript "3.9.5"
-
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-
-electron-to-chromium@^1.4.17:
-  version "1.4.52"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.52.tgz#ce44c6d6cc449e7688a4356b8c261cfeafa26833"
-  integrity sha512-JGkh8HEh5PnVrhU4HbpyyO0O791dVY6k7AdqfDeqbcRMeoGxtNHWT77deR2nhvbLe4dKpxjlDEvdEwrvRLGu2Q==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-
-engine.io-parser@~4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.3.tgz#83d3a17acfd4226f19e721bb22a1ee8f7662d2f6"
-  integrity sha512-xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA==
-  dependencies:
-    base64-arraybuffer "0.1.4"
-
-engine.io@~4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.1.2.tgz#f96ceb56d4b39cc7ca5bd29a20e9c99c1ad1a765"
-  integrity sha512-t5z6zjXuVLhXDMiFJPYsPOWEER8B0tIsD3ETgw19S1yg9zryvUfY3Vhtk3Gf4sihw/bQGIqQ//gjvVlu+Ca0bQ==
-  dependencies:
-    accepts "~1.3.4"
-    base64id "2.0.0"
-    cookie "~0.4.1"
-    cors "~2.8.5"
-    debug "~4.3.1"
-    engine.io-parser "~4.0.0"
-    ws "~7.4.2"
-
-enhanced-resolve@^5.8.3:
-  version "5.8.3"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0"
-  integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-ent@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
-
-envinfo@^7.7.3:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
-  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
-
-es-module-lexer@^0.9.0:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
-  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
-
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
-
-escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
-
-escape-string-regexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-eslint-scope@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-esrecurse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
-  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
-
-eventemitter3@^4.0.0:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
-
-events@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-
-execa@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
-  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^6.0.0"
-    human-signals "^2.1.0"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.1"
-    onetime "^5.1.2"
-    signal-exit "^3.0.3"
-    strip-final-newline "^2.0.0"
-
-extend@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-fast-deep-equal@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fastest-levenshtein@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
-  integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-finalhandler@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    statuses "~1.5.0"
-    unpipe "~1.0.0"
-
-find-up@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
-find-up@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
-flat@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
-  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
-
-flatted@^3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2"
-  integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==
-
-follow-redirects@^1.0.0:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
-
-format-util@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271"
-  integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==
-
-fs-extra@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
-  integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-get-caller-file@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-stream@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
-  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
-
-glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-to-regexp@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
-  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
-
-glob@7.1.7:
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.3, glob@^7.1.7:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-google-protobuf@3.12.2:
-  version "3.12.2"
-  resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.12.2.tgz#50ce9f9b6281235724eb243d6a83e969a2176e53"
-  integrity sha512-4CZhpuRr1d6HjlyrxoXoocoGFnRYgKULgMtikMddA9ztRyYR59Aondv2FioyxWVamRo0rF2XpYawkTCBEQOSkA==
-
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
-  version "4.2.9"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
-  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
-
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-he@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
-http-errors@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
-  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.1"
-
-http-proxy@^1.18.1:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
-  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
-  dependencies:
-    eventemitter3 "^4.0.0"
-    follow-redirects "^1.0.0"
-    requires-port "^1.0.0"
-
-human-signals@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
-  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
-
-iconv-lite@0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-iconv-lite@^0.6.2:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
-  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
-icss-utils@^5.0.0, icss-utils@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
-  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
-
-import-local@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
-  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
-  dependencies:
-    pkg-dir "^4.2.0"
-    resolve-cwd "^3.0.0"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-interpret@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
-  integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-core-module@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
-  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
-  dependencies:
-    has "^1.0.3"
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-plain-obj@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
-  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
-
-is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-
-is-unicode-supported@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
-  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
-
-isbinaryfile@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf"
-  integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
-jest-worker@^27.4.1:
-  version "27.4.6"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.6.tgz#5d2d93db419566cb680752ca0792780e71b3273e"
-  integrity sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
-js-base64@3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.6.1.tgz#555aae398b74694b4037af1f8a5a6209d170efbe"
-  integrity sha512-Frdq2+tRRGLQUIQOgsIGSCd1VePCS2fsddTG5dTCqR0JHgltXWfsxnY0gIXPoMeRmdom6Oyq+UMOFg5suduOjQ==
-
-js-yaml@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-json-parse-better-errors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-karma-chrome-launcher@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz#805a586799a4d05f4e54f72a204979f3f3066738"
-  integrity sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==
-  dependencies:
-    which "^1.2.1"
-
-karma-mocha@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/karma-mocha/-/karma-mocha-2.0.1.tgz#4b0254a18dfee71bdbe6188d9a6861bf86b0cd7d"
-  integrity sha512-Tzd5HBjm8his2OA4bouAsATYEpZrp9vC7z5E5j4C5Of5Rrs1jY67RAwXNcVmd/Bnk1wgvQRou0zGVLey44G4tQ==
-  dependencies:
-    minimist "^1.2.3"
-
-karma-sourcemap-loader@0.3.8:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz#d4bae72fb7a8397328a62b75013d2df937bdcf9c"
-  integrity sha512-zorxyAakYZuBcHRJE+vbrK2o2JXLFWK8VVjiT/6P+ltLBUGUvqTEkUiQ119MGdOrK7mrmxXHZF1/pfT6GgIZ6g==
-  dependencies:
-    graceful-fs "^4.1.2"
-
-karma-webpack@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-5.0.0.tgz#2a2c7b80163fe7ffd1010f83f5507f95ef39f840"
-  integrity sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA==
-  dependencies:
-    glob "^7.1.3"
-    minimatch "^3.0.4"
-    webpack-merge "^4.1.5"
-
-karma@6.3.4:
-  version "6.3.4"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.4.tgz#359899d3aab3d6b918ea0f57046fd2a6b68565e6"
-  integrity sha512-hbhRogUYIulfkBTZT7xoPrCYhRBnBoqbbL4fszWD0ReFGUxU+LYBr3dwKdAluaDQ/ynT9/7C+Lf7pPNW4gSx4Q==
-  dependencies:
-    body-parser "^1.19.0"
-    braces "^3.0.2"
-    chokidar "^3.5.1"
-    colors "^1.4.0"
-    connect "^3.7.0"
-    di "^0.0.1"
-    dom-serialize "^2.2.1"
-    glob "^7.1.7"
-    graceful-fs "^4.2.6"
-    http-proxy "^1.18.1"
-    isbinaryfile "^4.0.8"
-    lodash "^4.17.21"
-    log4js "^6.3.0"
-    mime "^2.5.2"
-    minimatch "^3.0.4"
-    qjobs "^1.2.0"
-    range-parser "^1.2.1"
-    rimraf "^3.0.2"
-    socket.io "^3.1.0"
-    source-map "^0.6.1"
-    tmp "^0.2.1"
-    ua-parser-js "^0.7.28"
-    yargs "^16.1.1"
-
-kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-loader-runner@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
-  integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
-
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
-lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-log-symbols@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
-  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
-  dependencies:
-    chalk "^4.1.0"
-    is-unicode-supported "^0.1.0"
-
-log4js@^6.3.0:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.4.1.tgz#9d3a8bf2c31c1e213fe3fc398a6053f7a2bc53e8"
-  integrity sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==
-  dependencies:
-    date-format "^4.0.3"
-    debug "^4.3.3"
-    flatted "^3.2.4"
-    rfdc "^1.3.0"
-    streamroller "^3.0.2"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
-mime-db@1.51.0:
-  version "1.51.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
-  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
-
-mime-types@^2.1.27, mime-types@~2.1.24:
-  version "2.1.34"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
-  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
-  dependencies:
-    mime-db "1.51.0"
-
-mime@^2.5.2:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
-  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
-
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-minimatch@3.0.4, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.2.3:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-mocha@9.1.2:
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.2.tgz#93f53175b0f0dc4014bd2d612218fccfcf3534d3"
-  integrity sha512-ta3LtJ+63RIBP03VBjMGtSqbe6cWXRejF9SyM9Zyli1CKZJZ+vfCTj3oW24V7wAphMJdpOFLoMI3hjJ1LWbs0w==
-  dependencies:
-    "@ungap/promise-all-settled" "1.1.2"
-    ansi-colors "4.1.1"
-    browser-stdout "1.3.1"
-    chokidar "3.5.2"
-    debug "4.3.2"
-    diff "5.0.0"
-    escape-string-regexp "4.0.0"
-    find-up "5.0.0"
-    glob "7.1.7"
-    growl "1.10.5"
-    he "1.2.0"
-    js-yaml "4.1.0"
-    log-symbols "4.1.0"
-    minimatch "3.0.4"
-    ms "2.1.3"
-    nanoid "3.1.25"
-    serialize-javascript "6.0.0"
-    strip-json-comments "3.1.1"
-    supports-color "8.1.1"
-    which "2.0.2"
-    workerpool "6.1.5"
-    yargs "16.2.0"
-    yargs-parser "20.2.4"
-    yargs-unparser "2.0.0"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-nanoid@3.1.25:
-  version "3.1.25"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
-  integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
-
-nanoid@^3.1.30:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
-  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
-
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
-
-neo-async@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
-
-node-releases@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
-  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
-object-assign@^4:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
-  dependencies:
-    ee-first "1.1.1"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-onetime@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-p-limit@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-limit@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-key@^3.0.0, path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-parse@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-
-picomatch@^2.0.4, picomatch@^2.2.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-pkg-dir@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
-  dependencies:
-    find-up "^4.0.0"
-
-platform@^1.3.3:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
-  integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
-
-postcss-modules-extract-imports@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
-  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
-
-postcss-modules-local-by-default@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
-  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
-  dependencies:
-    icss-utils "^5.0.0"
-    postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.1.0"
-
-postcss-modules-scope@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
-  integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
-  dependencies:
-    postcss-selector-parser "^6.0.4"
-
-postcss-modules-values@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
-  integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
-  dependencies:
-    icss-utils "^5.0.0"
-
-postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
-  version "6.0.9"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f"
-  integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
-postcss-value-parser@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
-  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-
-postcss@^8.2.15:
-  version "8.4.5"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95"
-  integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==
-  dependencies:
-    nanoid "^3.1.30"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.1"
-
-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-qjobs@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
-  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
-
-qs@6.9.6:
-  version "6.9.6"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
-  integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
-
-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-range-parser@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-
-raw-body@2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32"
-  integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==
-  dependencies:
-    bytes "3.1.1"
-    http-errors "1.8.1"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
-
-rechoir@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
-  integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
-  dependencies:
-    resolve "^1.9.0"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-resolve-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
-  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
-  dependencies:
-    resolve-from "^5.0.0"
-
-resolve-from@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
-  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-
-resolve@^1.9.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
-  dependencies:
-    is-core-module "^2.8.1"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-rfdc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
-  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
-
-rimraf@^3.0.0, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-safe-buffer@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-schema-utils@^3.1.0, schema-utils@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
-  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
-  dependencies:
-    "@types/json-schema" "^7.0.8"
-    ajv "^6.12.5"
-    ajv-keywords "^3.5.2"
-
-semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
-serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
-  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
-  dependencies:
-    randombytes "^2.1.0"
-
-setprototypeof@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
-  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
-
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-signal-exit@^3.0.3:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
-  integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
-
-socket.io-adapter@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz#edc5dc36602f2985918d631c1399215e97a1b527"
-  integrity sha512-+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg==
-
-socket.io-parser@~4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0"
-  integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==
-  dependencies:
-    "@types/component-emitter" "^1.2.10"
-    component-emitter "~1.3.0"
-    debug "~4.3.1"
-
-socket.io@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.2.tgz#06e27caa1c4fc9617547acfbb5da9bc1747da39a"
-  integrity sha512-JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw==
-  dependencies:
-    "@types/cookie" "^0.4.0"
-    "@types/cors" "^2.8.8"
-    "@types/node" ">=10.0.0"
-    accepts "~1.3.4"
-    base64id "~2.0.0"
-    debug "~4.3.1"
-    engine.io "~4.1.0"
-    socket.io-adapter "~2.1.0"
-    socket.io-parser "~4.0.3"
-
-source-map-js@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
-  integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
-
-source-map-js@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-
-source-map-loader@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.0.tgz#f2a04ee2808ad01c774dea6b7d2639839f3b3049"
-  integrity sha512-GKGWqWvYr04M7tn8dryIWvb0s8YM41z82iQv01yBtIylgxax0CwvSy6gc2Y02iuXwEfGWRlMicH0nvms9UZphw==
-  dependencies:
-    abab "^2.0.5"
-    iconv-lite "^0.6.2"
-    source-map-js "^0.6.2"
-
-source-map-support@0.5.20:
-  version "0.5.20"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
-  integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.5.20:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.6.0, source-map@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-
-streamroller@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.0.2.tgz#30418d0eee3d6c93ec897f892ed098e3a81e68b7"
-  integrity sha512-ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA==
-  dependencies:
-    date-format "^4.0.3"
-    debug "^4.1.1"
-    fs-extra "^10.0.0"
-
-string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
-strip-json-comments@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
-style-loader@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.0.tgz#d66ea95fc50b22f8b79b69a9e414760fcf58d8d8"
-  integrity sha512-szANub7ksJtQioJYtpbWwh1hUl99uK15n5HDlikeCRil/zYMZgSxucHddyF/4A3qJMUiAjPhFowrrQuNMA7jwQ==
-
-supports-color@8.1.1, supports-color@^8.0.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-preserve-symlinks-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
-
-tapable@^2.1.1, tapable@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
-  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
-
-terser-webpack-plugin@^5.1.3:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz#21641326486ecf91d8054161c816e464435bae9f"
-  integrity sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==
-  dependencies:
-    jest-worker "^27.4.1"
-    schema-utils "^3.1.1"
-    serialize-javascript "^6.0.0"
-    source-map "^0.6.1"
-    terser "^5.7.2"
-
-terser@^5.7.2:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc"
-  integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.20"
-
-tmp@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
-  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
-  dependencies:
-    rimraf "^3.0.0"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-toidentifier@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
-  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
-
-type-is@~1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
-
-typescript@3.9.5:
-  version "3.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
-  integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==
-
-ua-parser-js@^0.7.28:
-  version "0.7.31"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
-  integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==
-
-universalify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
-  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
-
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-util-deprecate@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-
-v8-compile-cache@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
-
-vary@^1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-
-void-elements@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
-
-watchpack@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25"
-  integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==
-  dependencies:
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.1.2"
-
-webpack-cli@4.9.0:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.0.tgz#dc43e6e0f80dd52e89cbf73d5294bcd7ad6eb343"
-  integrity sha512-n/jZZBMzVEl4PYIBs+auy2WI0WTQ74EnJDiyD98O2JZY6IVIHJNitkYp/uTXOviIOMfgzrNvC9foKv/8o8KSZw==
-  dependencies:
-    "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.1.0"
-    "@webpack-cli/info" "^1.4.0"
-    "@webpack-cli/serve" "^1.6.0"
-    colorette "^2.0.14"
-    commander "^7.0.0"
-    execa "^5.0.0"
-    fastest-levenshtein "^1.0.12"
-    import-local "^3.0.2"
-    interpret "^2.2.0"
-    rechoir "^0.7.0"
-    v8-compile-cache "^2.2.0"
-    webpack-merge "^5.7.3"
-
-webpack-merge@^4.1.5:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
-  integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
-  dependencies:
-    lodash "^4.17.15"
-
-webpack-merge@^5.7.3:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
-  integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
-  dependencies:
-    clone-deep "^4.0.1"
-    wildcard "^2.0.0"
-
-webpack-sources@^3.2.0:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
-  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
-
-webpack@5.57.1:
-  version "5.57.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.57.1.tgz#ead5ace2c17ecef2ae8126f143bfeaa7f55eab44"
-  integrity sha512-kHszukYjTPVfCOEyrUthA3jqJwduY/P3eO8I0gMNOZGIQWKAwZftxmp5hq6paophvwo9NoUrcZOecs9ulOyyTg==
-  dependencies:
-    "@types/eslint-scope" "^3.7.0"
-    "@types/estree" "^0.0.50"
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/wasm-edit" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    acorn "^8.4.1"
-    acorn-import-assertions "^1.7.6"
-    browserslist "^4.14.5"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.8.3"
-    es-module-lexer "^0.9.0"
-    eslint-scope "5.1.1"
-    events "^3.2.0"
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.4"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^4.2.0"
-    mime-types "^2.1.27"
-    neo-async "^2.6.2"
-    schema-utils "^3.1.0"
-    tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.3"
-    watchpack "^2.2.0"
-    webpack-sources "^3.2.0"
-
-which@2.0.2, which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^1.2.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-wildcard@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
-  integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
-
-workerpool@6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581"
-  integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==
-
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-ws@~7.4.2:
-  version "7.4.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
-  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
-
-y18n@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
-  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yargs-parser@20.2.4:
-  version "20.2.4"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
-  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
-
-yargs-parser@^20.2.2:
-  version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
-
-yargs-unparser@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
-  integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
-  dependencies:
-    camelcase "^6.0.0"
-    decamelize "^4.0.0"
-    flat "^5.0.2"
-    is-plain-obj "^2.1.0"
-
-yargs@16.2.0, yargs@^16.1.1:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
-- 
2.34.1


From 0b2e8ff25ee572c5561d5d5aaa392a7e66332fa1 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 8 Mar 2022 23:15:48 +0300
Subject: [PATCH 418/713] Build fixes

---
 build.gradle.kts             |  5 +++--
 buildSrc/build.gradle.kts    |  3 ++-
 buildSrc/gradle.properties   |  8 +-------
 buildSrc/settings.gradle.kts |  5 +++--
 gradle.properties            |  3 +--
 settings.gradle.kts          | 16 ----------------
 6 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3b48c7328..3372d505d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,16 +1,17 @@
 plugins {
     id("ru.mipt.npm.gradle.project")
-    id("org.jetbrains.kotlinx.kover") version "0.5.0-RC"
+    id("org.jetbrains.kotlinx.kover") version "0.5.0"
 }
 
 allprojects {
     repositories {
+        maven("https://repo.kotlin.link")
         maven("https://oss.sonatype.org/content/repositories/snapshots")
         mavenCentral()
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-19"
+    version = "0.3.0-dev-20"
 }
 
 subprojects {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ceb220bd5..b69ebe6cd 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 java.targetCompatibility = JavaVersion.VERSION_11
 
 repositories {
+    mavenLocal()
     maven("https://repo.kotlin.link")
     mavenCentral()
     gradlePluginPortal()
@@ -14,7 +15,7 @@ repositories {
 
 val toolsVersion: String by extra
 val kotlinVersion = npmlibs.versions.kotlin.asProvider().get()
-val benchmarksVersion = "0.4.2"
+val benchmarksVersion = npmlibs.versions.kotlinx.benchmark.get()
 
 dependencies {
     api("ru.mipt.npm:gradle-tools:$toolsVersion")
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 6678f24a8..05486d4f6 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -4,11 +4,5 @@
 #
 
 kotlin.code.style=official
-kotlin.mpp.stability.nowarn=true
 
-kotlin.jupyter.add.scanner=false
-
-org.gradle.configureondemand=true
-org.gradle.parallel=true
-
-toolsVersion=0.10.9-kotlin-1.6.10
+toolsVersion=0.11.1-kotlin-1.6.10
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 87ff205f6..9c5550602 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -3,7 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 enableFeaturePreview("VERSION_CATALOGS")
 
@@ -12,8 +11,10 @@ dependencyResolutionManagement {
     val toolsVersion: String by extra
 
     repositories {
+        mavenLocal()
         maven("https://repo.kotlin.link")
         mavenCentral()
+        gradlePluginPortal()
     }
 
     versionCatalogs {
@@ -21,4 +22,4 @@ dependencyResolutionManagement {
             from("ru.mipt.npm:version-catalog:$toolsVersion")
         }
     }
-}
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 7dd9e6d61..7d9628621 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,11 +5,10 @@
 
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
+kotlin.native.ignoreDisabledTargets=true
 
 kotlin.jupyter.add.scanner=false
 
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
-
-toolsVersion=0.11.1-kotlin-1.6.10
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3001d000c..a8b473fee 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,22 +3,6 @@ rootProject.name = "kmath"
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 enableFeaturePreview("VERSION_CATALOGS")
 
-dependencyResolutionManagement {
-
-    val toolsVersion: String by extra
-
-    repositories {
-        maven("https://repo.kotlin.link")
-        mavenCentral()
-    }
-
-    versionCatalogs {
-        create("npmlibs") {
-            from("ru.mipt.npm:version-catalog:$toolsVersion")
-        }
-    }
-}
-
 include(
     ":kmath-memory",
     ":kmath-complex",
-- 
2.34.1


From ab9dcd83b90a468a325948a1c32257ae0a5d5875 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Thu, 10 Mar 2022 01:44:14 +0300
Subject: [PATCH 419/713] Added abstract rational functions

---
 .../kmath/functions/AbstractPolynomial.kt     |  16 +-
 .../functions/AbstractRationalFunction.kt     | 507 ++++++++++++++++++
 2 files changed, 515 insertions(+), 8 deletions(-)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
index f6a617656..237a72bcc 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -70,19 +70,19 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
 
     // region Polynomial-integer relation
     /**
-     * Returns sum of the constant and the integer represented as polynomial.
+     * Returns sum of the polynomial and the integer represented as polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public operator fun P.plus(other: Int): P = optimizedAddMultiplied(this, one, other)
     /**
-     * Returns difference between the constant and the integer represented as polynomial.
+     * Returns difference between the polynomial and the integer represented as polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public operator fun P.minus(other: Int): P = optimizedAddMultiplied(this, one, -other)
     /**
-     * Returns product of the constant and the integer represented as polynomial.
+     * Returns product of the polynomial and the integer represented as polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
@@ -91,19 +91,19 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
 
     // region Integer-polynomial relation
     /**
-     * Returns sum of the integer represented as polynomial and the constant.
+     * Returns sum of the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public operator fun Int.plus(other: P): P = optimizedAddMultiplied(other, one, this)
     /**
-     * Returns difference between the integer represented as polynomial and the constant.
+     * Returns difference between the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public operator fun Int.minus(other: P): P = optimizedAddMultiplied(-other, one, this)
     /**
-     * Returns product of the integer represented as polynomial and the constant.
+     * Returns product of the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -254,11 +254,11 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
      */
-    override val zero: P
+    public override val zero: P
     /**
      * Instance of unit polynomial (unit of the polynomial ring).
      */
-    override val one: P
+    public override val one: P
 
     /**
      * Checks equality of the polynomials.
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
new file mode 100644
index 000000000..5cb570c9f
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -0,0 +1,507 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedAddMultiplied
+import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedMultiply
+import space.kscience.kmath.operations.*
+import kotlin.js.JsName
+import kotlin.jvm.JvmName
+
+
+/**
+ * Abstraction of rational function.
+ */
+public interface AbstractRationalFunction<C, P: AbstractPolynomial<C>>
+
+@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R: AbstractRationalFunction<C, P>> : Ring<R> {
+    // region Constant-integer relation
+    /**
+     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     */
+    @JvmName("constantIntPlus")
+    public operator fun C.plus(other: Int): C
+    /**
+     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    @JvmName("constantIntMinus")
+    public operator fun C.minus(other: Int): C
+    /**
+     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    @JvmName("constantIntTimes")
+    public operator fun C.times(other: Int): C
+    // endregion
+
+    // region Integer-constant relation
+    /**
+     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    @JvmName("intConstantPlus")
+    public operator fun Int.plus(other: C): C
+    /**
+     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    @JvmName("intConstantMinus")
+    public operator fun Int.minus(other: C): C
+    /**
+     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    @JvmName("intConstantTimes")
+    public operator fun Int.times(other: C): C
+    // endregion
+
+    // region Polynomial-integer relation
+    /**
+     * Returns sum of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public operator fun P.plus(other: Int): P
+    /**
+     * Returns difference between the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public operator fun P.minus(other: Int): P
+    /**
+     * Returns product of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public operator fun P.times(other: Int): P
+    // endregion
+
+    // region Integer-polynomial relation
+    /**
+     * Returns sum of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public operator fun Int.plus(other: P): P
+    /**
+     * Returns difference between the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public operator fun Int.minus(other: P): P
+    /**
+     * Returns product of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public operator fun Int.times(other: P): P
+    // endregion
+
+    // region Rational-integer relation
+    /**
+     * Returns sum of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public operator fun R.plus(other: Int): R = optimizedAddMultiplied(this, one, other)
+    /**
+     * Returns difference between the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public operator fun R.minus(other: Int): R = optimizedAddMultiplied(this, one, -other)
+    /**
+     * Returns product of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public operator fun R.times(other: Int): R = optimizedMultiply(this, other)
+    // endregion
+
+    // region Integer-Rational relation
+    /**
+     * Returns sum of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public operator fun Int.plus(other: R): R = optimizedAddMultiplied(other, one, this)
+    /**
+     * Returns difference between the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public operator fun Int.minus(other: R): R = optimizedAddMultiplied(-other, one, this)
+    /**
+     * Returns product of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public operator fun Int.times(other: R): R = optimizedMultiply(other, this)
+    // endregion
+
+    // region Constant-constant relation
+    /**
+     * Returns the same constant.
+     */
+    @JvmName("constantUnaryPlus")
+    @JsName("constantUnaryPlus")
+    public operator fun C.unaryPlus(): C = this
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("constantUnaryMinus")
+    @JsName("constantUnaryMinus")
+    public operator fun C.unaryMinus(): C
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("constantPlus")
+    @JsName("constantPlus")
+    public operator fun C.plus(other: C): C
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("constantMinus")
+    @JsName("constantMinus")
+    public operator fun C.minus(other: C): C
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("constantTimes")
+    @JsName("constantTimes")
+    public operator fun C.times(other: C): C
+
+    /**
+     * Check if the instant is zero constant.
+     */
+    @JvmName("constantIsZero")
+    public fun C.isZero(): Boolean
+    /**
+     * Check if the instant is NOT zero constant.
+     */
+    @JvmName("constantIsNotZero")
+    public fun C.isNotZero(): Boolean
+    /**
+     * Check if the instant is unit constant.
+     */
+    @JvmName("constantIsOne")
+    public fun C.isOne(): Boolean
+    /**
+     * Check if the instant is NOT unit constant.
+     */
+    @JvmName("constantIsNotOne")
+    public fun C.isNotOne(): Boolean
+    /**
+     * Check if the instant is minus unit constant.
+     */
+    @JvmName("constantIsMinusOne")
+    public fun C.isMinusOne(): Boolean
+    /**
+     * Check if the instant is NOT minus unit constant.
+     */
+    @JvmName("constantIsNotMinusOne")
+    public fun C.isNotMinusOne(): Boolean
+    // endregion
+
+    // region Constant-polynomial relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.plus(other: P): P
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.minus(other: P): P
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.times(other: P): P
+    // endregion
+
+    // region Polynomial-constant relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.plus(other: C): P
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.minus(other: C): P
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.times(other: C): P
+    // endregion
+
+    // region Polynomial-polynomial relation
+    /**
+     * Returns the same polynomial.
+     */
+    public operator fun P.unaryPlus(): P = this
+    /**
+     * Returns negation of the polynomial.
+     */
+    public operator fun P.unaryMinus(): P
+    /**
+     * Returns sum of the polynomials.
+     */
+    public operator fun P.plus(other: P): P
+    /**
+     * Returns difference of the polynomials.
+     */
+    public operator fun P.minus(other: P): P
+    /**
+     * Returns product of the polynomials.
+     */
+    public operator fun P.times(other: P): P
+
+    /**
+     * Check if the instant is zero polynomial.
+     */
+    public fun P.isZero(): Boolean = this == zeroPolynomial
+    /**
+     * Check if the instant is NOT zero polynomial.
+     */
+    public fun P.isNotZero(): Boolean = this != zeroPolynomial
+    /**
+     * Check if the instant is unit polynomial.
+     */
+    public fun P.isOne(): Boolean = this == onePolynomial
+    /**
+     * Check if the instant is NOT unit polynomial.
+     */
+    public fun P.isNotOne(): Boolean = this != onePolynomial
+    /**
+     * Check if the instant is minus unit polynomial.
+     */
+    public fun P.isMinusOne(): Boolean = this == -onePolynomial
+    /**
+     * Check if the instant is NOT minus unit polynomial.
+     */
+    public fun P.isNotMinusOne(): Boolean = this != -onePolynomial
+
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
+    public val zeroPolynomial: P
+    /**
+     * Instance of unit polynomial (unit of the polynomial ring).
+     */
+    public val onePolynomial: P
+
+    /**
+     * Checks equality of the polynomials.
+     */
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    public fun P.equals(other: P): Boolean
+    // endregion
+
+    // region Constant-rational relation
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public operator fun C.plus(other: R): R
+    /**
+     * Returns difference between the constant represented as polynomial and the rational function.
+     */
+    public operator fun C.minus(other: R): R
+    /**
+     * Returns product of the constant represented as polynomial and the rational function.
+     */
+    public operator fun C.times(other: R): R
+    // endregion
+
+    // region Rational-constant relation
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public operator fun R.plus(other: C): R
+    /**
+     * Returns difference between the constant represented as rational function and the rational function.
+     */
+    public operator fun R.minus(other: C): R
+    /**
+     * Returns product of the constant represented as rational function and the rational function.
+     */
+    public operator fun R.times(other: C): R
+    // endregion
+
+    // region Polynomial-rational relation
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public operator fun P.plus(other: R): R
+    /**
+     * Returns difference between the polynomial represented as polynomial and the rational function.
+     */
+    public operator fun P.minus(other: R): R
+    /**
+     * Returns product of the polynomial represented as polynomial and the rational function.
+     */
+    public operator fun P.times(other: R): R
+    // endregion
+
+    // region Rational-polynomial relation
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public operator fun R.plus(other: P): R
+    /**
+     * Returns difference between the polynomial represented as rational function and the rational function.
+     */
+    public operator fun R.minus(other: P): R
+    /**
+     * Returns product of the polynomial represented as rational function and the rational function.
+     */
+    public operator fun R.times(other: P): R
+    // endregion
+
+    // region Rational-rational relation
+    /**
+     * Returns the same rational function.
+     */
+    public override operator fun R.unaryPlus(): R = this
+    /**
+     * Returns negation of the rational function.
+     */
+    public override operator fun R.unaryMinus(): R
+    /**
+     * Returns sum of the rational functions.
+     */
+    public override operator fun R.plus(other: R): R
+    /**
+     * Returns difference of the rational functions.
+     */
+    public override operator fun R.minus(other: R): R
+    /**
+     * Returns product of the rational functions.
+     */
+    public override operator fun R.times(other: R): R
+
+    /**
+     * Check if the instant is zero rational function.
+     */
+    public fun R.isZero(): Boolean = this == zero
+    /**
+     * Check if the instant is NOT zero rational function.
+     */
+    public fun R.isNotZero(): Boolean = this != zero
+    /**
+     * Check if the instant is unit rational function.
+     */
+    public fun R.isOne(): Boolean = this == one
+    /**
+     * Check if the instant is NOT unit rational function.
+     */
+    public fun R.isNotOne(): Boolean = this != one
+    /**
+     * Check if the instant is minus unit rational function.
+     */
+    public fun R.isMinusOne(): Boolean = this == -one
+    /**
+     * Check if the instant is NOT minus unit rational function.
+     */
+    public fun R.isNotMinusOne(): Boolean = this != -one
+
+    /**
+     * Instance of zero rational function (zero of the rational functions ring).
+     */
+    public override val zero: R
+    /**
+     * Instance of unit polynomial (unit of the rational functions ring).
+     */
+    public override val one: R
+
+    /**
+     * Checks equality of the rational functions.
+     */
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    public fun R.equals(other: R): Boolean
+    // endregion
+
+    // Not sure is it necessary...
+    // region Polynomial properties
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    public val P.degree: Int
+
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isConstant(): Boolean = degree <= 0
+    /**
+     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNotConstant(): Boolean = !isConstant()
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNonZeroConstant(): Boolean = degree == 0
+    /**
+     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
+
+    public fun P.asConstantOrNull(): C?
+
+    public fun P.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
+
+    // endregion
+
+    // Not sure is it necessary...
+    // region Polynomial properties
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun R.isConstant(): Boolean
+    /**
+     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun R.isNotConstant(): Boolean = !isConstant()
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun R.isNonZeroConstant(): Boolean
+    /**
+     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun R.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
+
+    public fun R.asConstantOrNull(): C?
+
+    public fun R.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
+
+    // TODO: Перенести в реализацию
+//    fun R.substitute(argument: C): C
+//    fun R.substitute(argument: P): R
+//    fun R.substitute(argument: R): R
+//
+//    fun R.asFunction(): (C) -> C = /*this::substitute*/ { this.substitute(it) }
+//    fun R.asFunctionOnConstants(): (C) -> C = /*this::substitute*/ { this.substitute(it) }
+//    fun P.asFunctionOnPolynomials(): (P) -> R = /*this::substitute*/ { this.substitute(it) }
+//    fun R.asFunctionOnRationalFunctions(): (R) -> R = /*this::substitute*/ { this.substitute(it) }
+//
+//    operator fun R.invoke(argument: C): C = this.substitute(argument)
+//    operator fun R.invoke(argument: P): R = this.substitute(argument)
+//    operator fun R.invoke(argument: R): R = this.substitute(argument)
+    // endregion
+
+    // region Legacy
+    override fun add(left: R, right: R): R = left + right
+    override fun multiply(left: R, right: R): R = left * right
+    // endregion
+}
\ No newline at end of file
-- 
2.34.1


From ffea8cc2234d869745fb0b99a8baedbf9cb51118 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 13 Mar 2022 03:25:25 +0300
Subject: [PATCH 420/713] Regenerated READMEs

---
 README.md                  |  4 ++--
 kmath-ast/README.md        | 47 +++++++++++++++++++++++++++++---------
 kmath-complex/README.md    |  6 ++---
 kmath-core/README.md       |  6 ++---
 kmath-ejml/README.md       |  6 ++---
 kmath-for-real/README.md   |  6 ++---
 kmath-functions/README.md  |  6 ++---
 kmath-jafama/README.md     |  6 ++---
 kmath-kotlingrad/README.md |  6 ++---
 kmath-nd4j/README.md       |  6 ++---
 kmath-tensors/README.md    |  6 ++---
 11 files changed, 65 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index 99dd6d00f..76b8ce2f7 100644
--- a/README.md
+++ b/README.md
@@ -308,8 +308,8 @@ repositories {
 }
 
 dependencies {
-    api("space.kscience:kmath-core:0.3.0-dev-17")
-    // api("space.kscience:kmath-core-jvm:0.3.0-dev-17") for jvm-specific version
+    api("space.kscience:kmath-core:0.3.0-dev-19")
+    // api("space.kscience:kmath-core-jvm:0.3.0-dev-19") for jvm-specific version
 }
 ```
 
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index bedf17486..9411befe3 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -10,7 +10,7 @@ Extensions to MST API: transformations, dynamic compilation and visualization.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-ast:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.0-dev-17")
+    implementation("space.kscience:kmath-ast:0.3.0-dev-19")
 }
 ```
 
@@ -66,20 +66,19 @@ For example, the following code:
 
 ```kotlin
 import space.kscience.kmath.asm.compileToExpression
-import space.kscience.kmath.complex.ComplexField
+import space.kscience.kmath.operations.DoubleField
 
-"x+2".parseMath().compileToExpression(ComplexField)
+"x^3-x+3".parseMath().compileToExpression(DoubleField)
 ```
 
 &mldr; leads to generation of bytecode, which can be decompiled to the following Java class:
 
 ```java
-import java.util.Map;
-import kotlin.jvm.functions.Function2;
-import space.kscience.kmath.asm.internal.MapIntrinsics;
-import space.kscience.kmath.complex.Complex;
-import space.kscience.kmath.expressions.Expression;
-import space.kscience.kmath.expressions.Symbol;
+import java.util.*;
+import kotlin.jvm.functions.*;
+import space.kscience.kmath.asm.internal.*;
+import space.kscience.kmath.complex.*;
+import space.kscience.kmath.expressions.*;
 
 public final class CompiledExpression_45045_0 implements Expression<Complex> {
     private final Object[] constants;
@@ -91,6 +90,32 @@ public final class CompiledExpression_45045_0 implements Expression<Complex> {
 }
 ```
 
+For `LongRing`, `IntRing`, and `DoubleField` specialization is supported for better performance:
+
+```java
+import java.util.*;
+import space.kscience.kmath.asm.internal.*;
+import space.kscience.kmath.expressions.*;
+
+public final class CompiledExpression_-386104628_0 implements DoubleExpression {
+    private final SymbolIndexer indexer;
+
+    public SymbolIndexer getIndexer() {
+        return this.indexer;
+    }
+
+    public double invoke(double[] arguments) {
+        double var2 = arguments[0];
+        return Math.pow(var2, 3.0D) - var2 + 3.0D;
+    }
+
+    public final Double invoke(Map<Symbol, ? extends Double> arguments) {
+        double var2 = ((Double)MapIntrinsics.getOrFail(arguments, "x")).doubleValue();
+        return Math.pow(var2, 3.0D) - var2 + 3.0D;
+    }
+}
+```
+
 Setting JVM system property `space.kscience.kmath.ast.dump.generated.classes` to `1` makes the translator dump class files to program's working directory, so they can be reviewed manually.
 
 #### Limitations
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index 92f2435ba..cfaf43aa1 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -8,7 +8,7 @@ Complex and hypercomplex number systems in KMath.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-complex:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-complex:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-complex:0.3.0-dev-17")
+    implementation("space.kscience:kmath-complex:0.3.0-dev-19")
 }
 ```
diff --git a/kmath-core/README.md b/kmath-core/README.md
index e765ad50c..4e980baf5 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -15,7 +15,7 @@ performance calculations to code generation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-core:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-core:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -36,6 +36,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-core:0.3.0-dev-17")
+    implementation("space.kscience:kmath-core:0.3.0-dev-19")
 }
 ```
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index fcd092bf1..24b36aa0d 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -9,7 +9,7 @@ EJML based linear algebra implementation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ejml:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-ejml:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ejml:0.3.0-dev-17")
+    implementation("space.kscience:kmath-ejml:0.3.0-dev-19")
 }
 ```
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index 938327612..f6b02e6ad 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -9,7 +9,7 @@ Specialization of KMath APIs for Double numbers.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-for-real:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-for-real:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-for-real:0.3.0-dev-17")
+    implementation("space.kscience:kmath-for-real:0.3.0-dev-19")
 }
 ```
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index 3d4beee47..a7f4f9b6f 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -11,7 +11,7 @@ Functions and interpolations.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-functions:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-functions:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-functions:0.3.0-dev-17")
+    implementation("space.kscience:kmath-functions:0.3.0-dev-19")
 }
 ```
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index 760244751..3e0d9c418 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -7,7 +7,7 @@ Integration with [Jafama](https://github.com/jeffhain/jafama).
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-jafama:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-jafama:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-jafama:0.3.0-dev-17")
+    implementation("space.kscience:kmath-jafama:0.3.0-dev-19")
 }
 ```
 
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
index 588ccb9b4..422ce4fb0 100644
--- a/kmath-kotlingrad/README.md
+++ b/kmath-kotlingrad/README.md
@@ -8,7 +8,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-17")
+    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-19")
 }
 ```
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index 7ca9cd4fd..23d529e72 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -9,7 +9,7 @@ ND4J based implementations of KMath abstractions.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-nd4j:0.3.0-dev-17")
+    implementation("space.kscience:kmath-nd4j:0.3.0-dev-19")
 }
 ```
 
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index 42ce91336..93f78e895 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -9,7 +9,7 @@ Common linear algebra operations on tensors.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensors:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-tensors:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensors:0.3.0-dev-17")
+    implementation("space.kscience:kmath-tensors:0.3.0-dev-19")
 }
 ```
-- 
2.34.1


From 843d63c76a46a55c683f4a8276663f5fecc6d6f5 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 13 Mar 2022 03:27:00 +0300
Subject: [PATCH 421/713] Added support for all polynomials. But standard
 utilities still are not fully implemented.

---
 .../kmath/functions/AbstractPolynomial.kt     |  47 +-
 .../functions/AbstractRationalFunction.kt     |   2 -
 .../kmath/functions/LabeledPolynomial.kt      | 927 ++++++++++++++++++
 .../kmath/functions/NumberedPolynomial.kt     | 689 +++++++++++++
 .../kscience/kmath/functions/Polynomial.kt    | 151 ++-
 .../kscience/kmath/functions/Variable.kt      |  38 +
 .../kscience/kmath/functions/algebraicStub.kt |  51 +
 .../kmath/functions/labeledPolynomialUtil.kt  | 490 +++++++++
 .../kmath/functions/numberedPolynomialUtil.kt | 605 ++++++++++++
 .../kmath/functions/polynomialUtil.kt         |   6 +-
 10 files changed, 2911 insertions(+), 95 deletions(-)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Variable.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
index 237a72bcc..b7b7116f0 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -17,6 +17,9 @@ public interface AbstractPolynomial<C>
 
 /**
  * Abstraction of ring of polynomials of type [P] over ring of constants of type [C].
+ *
+ * @param C the type of constants. Polynomials have them as a coefficients in their terms.
+ * @param P the type of polynomials.
  */
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
 public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P> {
@@ -307,48 +310,4 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
     override fun add(left: P, right: P): P = left + right
     override fun multiply(left: P, right: P): P = left * right
     // endregion
-
-    public companion object {
-        // TODO: All of this should be moved to algebraic structures' place for utilities
-        // TODO: Move receiver to context receiver
-        /**
-         * Multiplication of element and integer.
-         *
-         * @receiver the multiplicand.
-         * @param other the multiplier.
-         * @return the difference.
-         */
-        internal tailrec fun <C> Group<C>.optimizedMultiply(arg: C, other: Int): C =
-            when {
-                other == 0 -> zero
-                other == 1 -> arg
-                other == -1 -> -arg
-                other % 2 == 0 -> optimizedMultiply(arg + arg, other / 2)
-                other % 2 == 1 -> optimizedAddMultiplied(arg, arg + arg, other / 2)
-                other % 2 == -1 -> optimizedAddMultiplied(-arg, arg + arg, other / 2)
-                else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
-            }
-
-        // TODO: Move receiver to context receiver
-        /**
-         * Adds product of [arg] and [multiplier] to [base].
-         *
-         * @receiver the algebra to provide multiplication.
-         * @param base the augend.
-         * @param arg the multiplicand.
-         * @param multiplier the multiplier.
-         * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
-         * @author Gleb Minaev
-         */
-        internal tailrec fun <C> Group<C>.optimizedAddMultiplied(base: C, arg: C, multiplier: Int): C =
-            when {
-                multiplier == 0 -> base
-                multiplier == 1 -> base + arg
-                multiplier == -1 -> base - arg
-                multiplier % 2 == 0 -> optimizedAddMultiplied(base, arg + arg, multiplier / 2)
-                multiplier % 2 == 1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
-                multiplier % 2 == -1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
-                else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
-            }
-    }
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
index 5cb570c9f..34050aa0f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -5,8 +5,6 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedAddMultiplied
-import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedMultiply
 import space.kscience.kmath.operations.*
 import kotlin.js.JsName
 import kotlin.jvm.JvmName
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
new file mode 100644
index 000000000..48f6f57fa
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -0,0 +1,927 @@
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.experimental.ExperimentalTypeInference
+import kotlin.jvm.JvmName
+import kotlin.math.max
+
+
+/**
+ * Represents multivariate polynomials with labeled variables.
+ *
+ * @param C Ring in which the polynomial is considered.
+ */
+public class LabeledPolynomial<C>
+internal constructor(
+    /**
+     * Map that collects coefficients of the polynomial. Every non-zero monomial
+     * `a x_1^{d_1} ... x_n^{d_n}` is represented as pair "key-value" in the map, where value is coefficients `a` and
+     * key is map that associates variables in the monomial with multiplicity of them occurring in the monomial.
+     * For example polynomial
+     * ```
+     * 5 a^2 c^3 - 6 b + 0 b c
+     * ```
+     * has coefficients represented as
+     * ```
+     * mapOf(
+     *      mapOf(
+     *          a to 2,
+     *          c to 3
+     *      ) to 5,
+     *      mapOf(
+     *          b to 1
+     *      ) to (-6)
+     * )
+     * ```
+     * where `a`, `b` and `c` are corresponding [Variable] objects.
+     */
+    public val coefficients: Map<Map<Variable, UInt>, C>
+) : AbstractPolynomial<C> {
+    override fun toString(): String = "LabeledPolynomial$coefficients"
+}
+
+// region Internal utilities
+
+/**
+ * Represents internal [LabeledPolynomial] errors.
+ */
+internal class LabeledPolynomialError: Error {
+    constructor(): super()
+    constructor(message: String): super(message)
+    constructor(message: String?, cause: Throwable?): super(message, cause)
+    constructor(cause: Throwable?): super(cause)
+}
+
+/**
+ * Throws an [LabeledPolynomialError] with the given [message].
+ */
+internal fun labeledPolynomialError(message: Any): Nothing = throw LabeledPolynomialError(message.toString())
+
+/**
+ * Returns the same degrees description of the monomial, but without zero degrees.
+ */
+internal fun Map<Variable, UInt>.cleanUp() = filterValues { it > 0U }
+
+// endregion
+
+// region Constructors and converters
+
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//internal fun <C, A: Ring<C>> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>, toCheckInput: Boolean = true): LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial<C>(coefs)
+//
+//    // Map for cleaned coefficients.
+//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//
+//    // Cleaning the degrees, summing monomials of the same degrees.
+//    for (entry in coefs) {
+//        val key = entry.key.cleanUp()
+//        val value = entry.value
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    // Removing zero monomials.
+//    return LabeledPolynomial<C>(
+//        fixedCoefs
+//            .filter { it.value.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//internal fun <C, A: Ring<C>> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>, toCheckInput: Boolean): LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
+//
+//    // Map for cleaned coefficients.
+//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//
+//    // Cleaning the degrees, summing monomials of the same degrees.
+//    for (entry in pairs) {
+//        val key = entry.first.cleanUp()
+//        val value = entry.second
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    // Removing zero monomials.
+//    return LabeledPolynomial<C>(
+//        fixedCoefs.filterValues { it.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represents monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//internal fun <C, A: Ring<C>> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>, toCheckInput: Boolean): LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
+//
+//    // Map for cleaned coefficients.
+//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//
+//    // Cleaning the degrees, summing monomials of the same degrees.
+//    for (entry in pairs) {
+//        val key = entry.first.cleanUp()
+//        val value = entry.second
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    // Removing zero monomials.
+//    return LabeledPolynomial<C>(
+//        fixedCoefs.filterValues { it.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param coefs Coefficients of the instants.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//fun <C, A: Ring<C>> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>): LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represents monomials.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//fun <C, A: Ring<C>> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>): LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represents monomials.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//fun <C, A: Ring<C>> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>): LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//internal fun <C, A: Ring<C>> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>, toCheckInput: Boolean = true): LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial<C>(coefs)
+//
+//    // Map for cleaned coefficients.
+//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//
+//    // Cleaning the degrees, summing monomials of the same degrees.
+//    for (entry in coefs) {
+//        val key = entry.key.cleanUp()
+//        val value = entry.value
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    // Removing zero monomials.
+//    return LabeledPolynomial<C>(
+//        fixedCoefs
+//            .filter { it.value.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//internal fun <C, A: Ring<C>> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>, toCheckInput: Boolean): LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
+//
+//    // Map for cleaned coefficients.
+//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//
+//    // Cleaning the degrees, summing monomials of the same degrees.
+//    for (entry in pairs) {
+//        val key = entry.first.cleanUp()
+//        val value = entry.second
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    // Removing zero monomials.
+//    return LabeledPolynomial<C>(
+//        fixedCoefs.filterValues { it.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represents monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//internal fun <C, A: Ring<C>> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>, toCheckInput: Boolean): LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
+//
+//    // Map for cleaned coefficients.
+//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//
+//    // Cleaning the degrees, summing monomials of the same degrees.
+//    for (entry in pairs) {
+//        val key = entry.first.cleanUp()
+//        val value = entry.second
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    // Removing zero monomials.
+//    return LabeledPolynomial<C>(
+//        fixedCoefs.filterValues { it.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param coefs Coefficients of the instants.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>): LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represents monomials.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>): LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represents monomials.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>): LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
+//
+//fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to this))
+//
+//context(A)
+//fun <C, A: Ring<C>> Variable.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to one))
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> Variable.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to ring.one))
+//
+//context(A)
+//fun <C, A: Ring<C>> Variable.asLabeledPolynomial(c: C) : LabeledPolynomial<C> =
+//    if(c.isZero()) LabeledPolynomial<C>(emptyMap())
+//    else LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to c))
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> Variable.asLabeledPolynomial(c: C) : LabeledPolynomial<C> =
+//    if(c.isZero()) zero
+//    else LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to c))
+
+// endregion
+
+/**
+ * Space of polynomials.
+ *
+ * @param C the type of operated polynomials.
+ * @param A the intersection of [Ring] of [C] and [ScaleOperations] of [C].
+ * @param ring the [A] instance.
+ */
+@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE", "INAPPLICABLE_JVM_NAME")
+public class LabeledPolynomialSpace<C, A : Ring<C>>(
+    public val ring: A,
+) : AbstractPolynomialSpace<C, LabeledPolynomial<C>> {
+    // region Constant-integer relation
+    @JvmName("constantIntPlus")
+    public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
+    @JvmName("constantIntMinus")
+    public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
+    @JvmName("constantIntTimes")
+    public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
+    // endregion
+
+    // region Integer-constant relation
+    @JvmName("intConstantPlus")
+    public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
+    @JvmName("intConstantMinus")
+    public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
+    @JvmName("intConstantTimes")
+    public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
+    // endregion
+
+    // region Variable-integer relation
+    public operator fun Variable.plus(other: Int): LabeledPolynomial<C> =
+        if (other == 0) LabeledPolynomial<C>(mapOf(
+            mapOf(this@plus to 1U) to ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this@plus to 1U) to ring.one,
+            emptyMap<Variable, UInt>() to ring.one * other,
+        ))
+    public operator fun Variable.minus(other: Int): LabeledPolynomial<C> =
+        if (other == 0) LabeledPolynomial<C>(mapOf(
+            mapOf(this@minus to 1U) to -ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this@minus to 1U) to -ring.one,
+            emptyMap<Variable, UInt>() to ring.one * other,
+        ))
+    public operator fun Variable.times(other: Int): LabeledPolynomial<C> =
+        if (other == 0) zero
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this to 1U) to ring.one * other,
+        ))
+    // endregion
+
+    // region Integer-variable relation
+    public operator fun Int.plus(other: Variable): LabeledPolynomial<C> =
+        if (this == 0) LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to ring.one,
+            emptyMap<Variable, UInt>() to ring.one * this@plus,
+        ))
+    public operator fun Int.minus(other: Variable): LabeledPolynomial<C> =
+        if (this == 0) LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to -ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to -ring.one,
+            emptyMap<Variable, UInt>() to ring.one * this@minus,
+        ))
+    public operator fun Int.times(other: Variable): LabeledPolynomial<C> =
+        if (this == 0) zero
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to ring.one * this@times,
+        ))
+    // endregion
+
+    // region Polynomial-integer relation
+    public override operator fun LabeledPolynomial<C>.plus(other: Int): LabeledPolynomial<C> =
+        if (other == 0) this
+        else
+            LabeledPolynomial(
+                coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } + other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun LabeledPolynomial<C>.minus(other: Int): LabeledPolynomial<C> =
+        if (other == 0) this
+        else
+            LabeledPolynomial(
+                coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } - other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun LabeledPolynomial<C>.times(other: Int): LabeledPolynomial<C> =
+        if (other == 0) zero
+        else LabeledPolynomial(
+            coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> c * other }
+                }
+        )
+    // endregion
+
+    // region Integer-polynomial relation
+    public override operator fun Int.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this == 0) other
+        else
+            LabeledPolynomial(
+                other.coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = this@plus + getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun Int.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this == 0) other
+        else
+            LabeledPolynomial(
+                other.coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = this@minus - getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun Int.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this == 0) zero
+        else LabeledPolynomial(
+            other.coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> this@times * c }
+                }
+        )
+    // endregion
+
+    // region Constant-constant relation
+    @JvmName("constantUnaryMinus")
+    override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
+    @JvmName("constantPlus")
+    override operator fun C.plus(other: C): C = ring { this@plus + other }
+    @JvmName("constantMinus")
+    override operator fun C.minus(other: C): C = ring { this@minus - other }
+    @JvmName("constantTimes")
+    override operator fun C.times(other: C): C = ring { this@times * other }
+    @JvmName("constantIsZero")
+    public override fun C.isZero(): Boolean = ring { this == zero }
+    @JvmName("constantIsNotZero")
+    public override fun C.isNotZero(): Boolean = ring { this != zero }
+    @JvmName("constantIsOne")
+    public override fun C.isOne(): Boolean = ring { this == one }
+    @JvmName("constantIsNotOne")
+    public override fun C.isNotOne(): Boolean = ring { this != one }
+    @JvmName("constantIsMinusOne")
+    public override fun C.isMinusOne(): Boolean = ring { this == -one }
+    @JvmName("constantIsNotMinusOne")
+    public override fun C.isNotMinusOne(): Boolean = ring { this != -one }
+    // endregion
+
+    // region Constant-variable relation
+    public operator fun C.plus(other: Variable): LabeledPolynomial<C> =
+        if (isZero()) LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to ring.one,
+            emptyMap<Variable, UInt>() to this@plus,
+        ))
+    public operator fun C.minus(other: Variable): LabeledPolynomial<C> =
+        if (isZero()) LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to -ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to -ring.one,
+            emptyMap<Variable, UInt>() to this@minus,
+        ))
+    public operator fun C.times(other: Variable): LabeledPolynomial<C> =
+        if (isZero()) zero
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to this@times,
+        ))
+    // endregion
+
+    // region Variable-constant relation
+    public operator fun Variable.plus(other: C): LabeledPolynomial<C> =
+        if (other.isZero()) LabeledPolynomial<C>(mapOf(
+            mapOf(this@plus to 1U) to ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this@plus to 1U) to ring.one,
+            emptyMap<Variable, UInt>() to other,
+        ))
+    public operator fun Variable.minus(other: C): LabeledPolynomial<C> =
+        if (other.isZero()) LabeledPolynomial<C>(mapOf(
+            mapOf(this@minus to 1U) to -ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this@minus to 1U) to -ring.one,
+            emptyMap<Variable, UInt>() to other,
+        ))
+    public operator fun Variable.times(other: C): LabeledPolynomial<C> =
+        if (other.isZero()) zero
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this@times to 1U) to other,
+        ))
+    // endregion
+
+    // region Constant-polynomial relation
+    override operator fun C.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this.isZero()) other
+        else with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to this@plus))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = this@plus + getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    override operator fun C.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this.isZero()) other
+        else with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to this@minus))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
+
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = this@minus - getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    override operator fun C.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this.isZero()) zero
+        else LabeledPolynomial<C>(
+            other.coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> this@times * c }
+                }
+        )
+    // endregion
+
+    // region Polynomial-constant relation
+    /**
+     * Returns sum of the polynomials. [other] is interpreted as [UnivariatePolynomial].
+     */
+    override operator fun LabeledPolynomial<C>.plus(other: C): LabeledPolynomial<C> =
+        if (other.isZero()) this
+        else with(coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to other))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } + other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    /**
+     * Returns difference of the polynomials. [other] is interpreted as [UnivariatePolynomial].
+     */
+    override operator fun LabeledPolynomial<C>.minus(other: C): LabeledPolynomial<C> =
+        if (other.isZero()) this
+        else with(coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to other))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
+
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } - other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    /**
+     * Returns product of the polynomials. [other] is interpreted as [UnivariatePolynomial].
+     */
+    override operator fun LabeledPolynomial<C>.times(other: C): LabeledPolynomial<C> =
+        if (other.isZero()) zero
+        else LabeledPolynomial<C>(
+            coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> c * other }
+                }
+        )
+    // endregion
+
+    // region Variable-variable relation
+    public operator fun Variable.plus(other: Variable): LabeledPolynomial<C> =
+        if (this == other) LabeledPolynomial<C>(mapOf(
+            mapOf(this to 1U) to ring.one * 2
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this to 1U) to ring.one,
+            mapOf(other to 1U) to ring.one,
+        ))
+    public operator fun Variable.minus(other: Variable): LabeledPolynomial<C> =
+        if (this == other) zero
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this to 1U) to ring.one,
+            mapOf(other to 1U) to -ring.one,
+        ))
+    public operator fun Variable.times(other: Variable): LabeledPolynomial<C> =
+        if (this == other) LabeledPolynomial<C>(mapOf(
+            mapOf(this to 2U) to ring.one
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this to 1U, other to 1U) to ring.one,
+        ))
+    // endregion
+
+    // region Variable-polynomial relation
+    public operator fun Variable.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@plus to 1u) to ring.one))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = mapOf(this@plus to 1U)
+
+                        val result = ring.one + getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    public operator fun Variable.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@minus to 1u) to ring.one))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
+
+                        val degs = mapOf(this@minus to 1U)
+
+                        val result = ring.one - getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    public operator fun Variable.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        LabeledPolynomial<C>(
+            other.coefficients
+                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[this] = if (this in it) it[this]!! + 1U else 1U } }
+        )
+    // endregion
+
+    // region Polynomial-variable relation
+    public operator fun LabeledPolynomial<C>.plus(other: Variable): LabeledPolynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to ring.one))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = mapOf(other to 1U)
+
+                        val result = ring.one + getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    public operator fun LabeledPolynomial<C>.minus(other: Variable): LabeledPolynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to ring.one))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = mapOf(other to 1U)
+
+                        val result = ring.one - getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    public operator fun LabeledPolynomial<C>.times(other: Variable): LabeledPolynomial<C> =
+        LabeledPolynomial<C>(
+            coefficients
+                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[other] = if (other in it) it[other]!! + 1U else 1U } }
+        )
+    // endregion
+
+    // region Polynomial-polynomial relation
+    /**
+     * Returns negation of the polynomial.
+     */
+    override fun LabeledPolynomial<C>.unaryMinus(): LabeledPolynomial<C> =
+        LabeledPolynomial<C>(
+            coefficients.mapValues { -it.value }
+        )
+    /**
+     * Returns sum of the polynomials.
+     */
+    override operator fun LabeledPolynomial<C>.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        LabeledPolynomial<C>(
+            coefficients
+                .applyAndRemoveZeros {
+                    other.coefficients
+                        .mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
+                }
+        )
+    /**
+     * Returns difference of the polynomials.
+     */
+    override operator fun LabeledPolynomial<C>.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        LabeledPolynomial<C>(
+            coefficients
+                .applyAndRemoveZeros {
+                    other.coefficients
+                        .mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
+                }
+        )
+    /**
+     * Returns product of the polynomials.
+     */
+    override operator fun LabeledPolynomial<C>.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        when {
+            isZero() -> zero
+            other.isZero() -> zero
+            else -> LabeledPolynomial<C>(
+                buildCoefficients {
+                    for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
+                        val degs = degs1.toMutableMap()
+                        degs2.mapValuesTo(degs) { (variable, deg) -> degs.getOrElse(variable) { 0u } + deg }
+                        val c = c1 * c2
+                        this[degs] = if (degs in this) this[degs]!! + c else c
+                    }
+                }
+            )
+        }
+
+    override val zero: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to ring.zero))
+    override val one: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to ring.one))
+
+    // TODO: Docs
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    override fun LabeledPolynomial<C>.equals(other: LabeledPolynomial<C>): Boolean =
+        when {
+            this === other -> true
+            else -> coefficients.size == other.coefficients.size &&
+                    coefficients.all { (key, value) -> with(other.coefficients) { key in this && this[key] == value } }
+        }
+    // endregion
+
+    // Not sure is it necessary...
+    // region Polynomial properties
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    override val LabeledPolynomial<C>.degree: Int
+        get() = coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) -1 else degs.values.sum().toInt() } ?: -1
+    /**
+     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
+     * in which they are appeared in the polynomial.
+     *
+     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
+     * And keys of the map is the same as in [variables].
+     */
+    public val LabeledPolynomial<C>.degrees: Map<Variable, UInt>
+        get() =
+            buildMap {
+                coefficients.entries.forEach { (degs, c) ->
+                    if (c.isNotZero()) degs.mapValuesTo(this) { (variable, deg) ->
+                        max(getOrElse(variable) { 0u }, deg)
+                    }
+                }
+            }
+    /**
+     * Set of all variables that appear in the polynomial in positive exponents.
+     */
+    public val LabeledPolynomial<C>.variables: Set<Variable>
+        get() =
+            buildSet {
+                coefficients.entries.forEach { (degs, c) -> if (c.isNotZero()) addAll(degs.keys) }
+            }
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val LabeledPolynomial<C>.countOfVariables: Int get() = variables.size
+
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    override fun LabeledPolynomial<C>.isConstant(): Boolean =
+        coefficients.all { (degs, c) -> degs.isEmpty() || c.isZero() }
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    override fun LabeledPolynomial<C>.isNonZeroConstant(): Boolean =
+        with(coefficients) {
+            var foundAbsoluteTermAndItIsNotZero = false
+            for ((degs, c) in this) {
+                if (degs.isNotEmpty()) if (c.isNotZero()) return@with false
+                else {
+                    if (c.isZero()) return@with false
+                    else foundAbsoluteTermAndItIsNotZero = true
+                }
+            }
+            foundAbsoluteTermAndItIsNotZero
+        }
+
+    override fun LabeledPolynomial<C>.asConstantOrNull(): C? =
+        with(coefficients) {
+            if(isConstant()) getOrElse(emptyMap()) { ring.zero }
+            else null
+        }
+
+//    @Suppress("NOTHING_TO_INLINE")
+//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Variable, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
+//    @Suppress("NOTHING_TO_INLINE")
+//    @JvmName("substitutePolynomial")
+//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Variable, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
+//
+//    @Suppress("NOTHING_TO_INLINE")
+//    public inline fun LabeledPolynomial<C>.asFunction(): (Map<Variable, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
+//    @Suppress("NOTHING_TO_INLINE")
+//    public inline fun LabeledPolynomial<C>.asFunctionOnConstants(): (Map<Variable, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
+//    @Suppress("NOTHING_TO_INLINE")
+//    public inline fun LabeledPolynomial<C>.asFunctionOnPolynomials(): (Map<Variable, LabeledPolynomial<C>>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
+//
+//    @Suppress("NOTHING_TO_INLINE")
+//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Variable, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
+//    @Suppress("NOTHING_TO_INLINE")
+//    @JvmName("invokePolynomial")
+//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Variable, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
+    // endregion
+
+    // region Legacy
+    @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+    override inline fun add(left: LabeledPolynomial<C>, right: LabeledPolynomial<C>): LabeledPolynomial<C> = left + right
+    @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+    override inline fun multiply(left: LabeledPolynomial<C>, right: LabeledPolynomial<C>): LabeledPolynomial<C> = left * right
+    // endregion
+
+    // region Utilities
+    // TODO: Move to region internal utilities with context receiver
+    internal fun MutableMap<Map<Variable, UInt>, C>.applyAndRemoveZeros(block: MutableMap<Map<Variable, UInt>, C>.() -> Unit) : MutableMap<Map<Variable, UInt>, C> {
+        contract {
+            callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+        }
+        block()
+        for ((degs, c) in this) if (c.isZero()) this.remove(degs)
+        return this
+    }
+    internal fun Map<Map<Variable, UInt>, C>.applyAndRemoveZeros(block: MutableMap<Map<Variable, UInt>, C>.() -> Unit) : Map<Map<Variable, UInt>, C> =
+        toMutableMap().applyAndRemoveZeros(block)
+    @OptIn(ExperimentalTypeInference::class)
+    internal fun buildCoefficients(@BuilderInference builderAction: MutableMap<Map<Variable, UInt>, C>.() -> Unit): Map<Map<Variable, UInt>, C> {
+        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
+        return buildMap {
+            builderAction()
+            for ((degs, c) in this) if (c.isZero()) this.remove(degs)
+        }
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
new file mode 100644
index 000000000..f1ad9a74f
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -0,0 +1,689 @@
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.experimental.ExperimentalTypeInference
+import kotlin.jvm.JvmName
+import kotlin.math.max
+
+
+/**
+ * Polynomial model without fixation on specific context they are applied to.
+ *
+ * @param C the type of constants.
+ */
+public class NumberedPolynomial<C>
+internal constructor(
+    /**
+     * Map that collects coefficients of the polynomial. Every monomial `a x_1^{d_1} ... x_n^{d_n}` is represented as
+     * pair "key-value" in the map, where value is coefficients `a` and
+     * key is list that associates index of every variable in the monomial with multiplicity of the variable occurring
+     * in the monomial. For example coefficients of polynomial `5 x_1^2 x_3^3 - 6 x_2` can be represented as
+     * ```
+     * mapOf(
+     *      listOf(2, 0, 3) to 5,
+     *      listOf(0, 1) to (-6),
+     * )
+     * ```
+     * and also as
+     * ```
+     * mapOf(
+     *      listOf(2, 0, 3) to 5,
+     *      listOf(0, 1) to (-6),
+     *      listOf(0, 1, 1) to 0,
+     * )
+     * ```
+     * It is recommended not to put zero monomials into the map, but is not prohibited. Lists of degrees always do not
+     * contain any zeros on end, but can contain zeros on start or anywhere in middle.
+     */
+    public val coefficients: Map<List<UInt>, C>
+) : AbstractPolynomial<C> {
+    override fun toString(): String = "NumberedPolynomial$coefficients"
+}
+
+// region Internal utilities
+
+/**
+ * Represents internal [Polynomial] errors.
+ */
+internal class NumberedPolynomialError : Error {
+    constructor(): super()
+    constructor(message: String): super(message)
+    constructor(message: String?, cause: Throwable?): super(message, cause)
+    constructor(cause: Throwable?): super(cause)
+}
+
+/**
+ * Throws an [PolynomialError] with the given [message].
+ */
+internal fun numberedPolynomialError(message: Any): Nothing = throw PolynomialError(message.toString())
+
+/**
+ * Returns the same degrees description of the monomial, but without extra zero degrees on the end.
+ */
+internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
+
+// endregion
+
+// region Constructors and converters
+// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
+
+//context(A)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean): NumberedPolynomial<C> {
+//    if (!toCheckInput) return NumberedPolynomial<C>(coefs)
+//
+//    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+//
+//    for (entry in coefs) {
+//        val key = entry.key.cleanUp()
+//        val value = entry.value
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    return NumberedPolynomial<C>(
+//        fixedCoefs
+//            .filter { it.value.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean): NumberedPolynomial<C> {
+//    if (!toCheckInput) return NumberedPolynomial(pairs.toMap())
+//
+//    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+//
+//    for (entry in pairs) {
+//        val key = entry.first.cleanUp()
+//        val value = entry.second
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    return NumberedPolynomial<C>(
+//        fixedCoefs
+//            .filter { it.value.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean): NumberedPolynomial<C> =
+//    NumberedPolynomial(pairs.toMap(), toCheckInput)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param coefs Coefficients of the instants.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//public fun <C, A: Ring<C>> NumberedPolynomial(coefs: Map<List<UInt>, C>) = NumberedPolynomial(coefs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//public fun <C, A: Ring<C>> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) = NumberedPolynomial(pairs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//public fun <C, A: Ring<C>> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) = NumberedPolynomial(*pairs, toCheckInput = true)
+//
+//context(NumberedPolynomialSpace<C, A>)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean): NumberedPolynomial<C> {
+//    if (!toCheckInput) return NumberedPolynomial(coefs)
+//
+//    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+//
+//    for (entry in coefs) {
+//        val key = entry.key.cleanUp()
+//        val value = entry.value
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    return NumberedPolynomial<C>(
+//        fixedCoefs
+//            .filter { it.value.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean): NumberedPolynomial<C> {
+//    if (!toCheckInput) return NumberedPolynomial(pairs.toMap())
+//
+//    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+//
+//    for (entry in pairs) {
+//        val key = entry.first.cleanUp()
+//        val value = entry.second
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    return NumberedPolynomial<C>(
+//        fixedCoefs
+//            .filter { it.value.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean): NumberedPolynomial<C> =
+//    NumberedPolynomial(pairs.toList(), toCheckInput)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param coefs Coefficients of the instants.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial(coefs: Map<List<UInt>, C>) = NumberedPolynomial(coefs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) = NumberedPolynomial(pairs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) = NumberedPolynomial(*pairs, toCheckInput = true)
+
+public fun <C, A: Ring<C>> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
+
+// endregion
+
+/**
+ * Space of polynomials.
+ *
+ * @param C the type of operated polynomials.
+ * @param A the intersection of [Ring] of [C] and [ScaleOperations] of [C].
+ * @param ring the [A] instance.
+ */
+@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE", "INAPPLICABLE_JVM_NAME")
+public class NumberedPolynomialSpace<C, A : Ring<C>>(
+    public val ring: A,
+) : AbstractPolynomialSpace<C, NumberedPolynomial<C>> {
+    // region Constant-integer relation
+    @JvmName("constantIntPlus")
+    public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
+    @JvmName("constantIntMinus")
+    public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
+    @JvmName("constantIntTimes")
+    public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
+    // endregion
+
+    // region Integer-constant relation
+    @JvmName("intConstantPlus")
+    public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
+    @JvmName("intConstantMinus")
+    public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
+    @JvmName("intConstantTimes")
+    public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
+    // endregion
+
+    // region Polynomial-integer relation
+    public override operator fun NumberedPolynomial<C>.plus(other: Int): NumberedPolynomial<C> =
+        if (other == 0) this
+        else
+            NumberedPolynomial(
+                coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } + other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun NumberedPolynomial<C>.minus(other: Int): NumberedPolynomial<C> =
+        if (other == 0) this
+        else
+            NumberedPolynomial(
+                coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } - other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun NumberedPolynomial<C>.times(other: Int): NumberedPolynomial<C> =
+        if (other == 0) zero
+        else NumberedPolynomial(
+            coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> c * other }
+                }
+        )
+    // endregion
+
+    // region Integer-polynomial relation
+    public override operator fun Int.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this == 0) other
+        else
+            NumberedPolynomial(
+                other.coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = this@plus + getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun Int.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this == 0) other
+        else
+            NumberedPolynomial(
+                other.coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = this@minus - getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun Int.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this == 0) zero
+        else NumberedPolynomial(
+            other.coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> this@times * c }
+                }
+        )
+    // endregion
+
+    // region Constant-constant relation
+    @JvmName("constantUnaryMinus")
+    override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
+    @JvmName("constantPlus")
+    override operator fun C.plus(other: C): C = ring { this@plus + other }
+    @JvmName("constantMinus")
+    override operator fun C.minus(other: C): C = ring { this@minus - other }
+    @JvmName("constantTimes")
+    override operator fun C.times(other: C): C = ring { this@times * other }
+    @JvmName("constantIsZero")
+    public override fun C.isZero(): Boolean = ring { this == zero }
+    @JvmName("constantIsNotZero")
+    public override fun C.isNotZero(): Boolean = ring { this != zero }
+    @JvmName("constantIsOne")
+    public override fun C.isOne(): Boolean = ring { this == one }
+    @JvmName("constantIsNotOne")
+    public override fun C.isNotOne(): Boolean = ring { this != one }
+    @JvmName("constantIsMinusOne")
+    public override fun C.isMinusOne(): Boolean = ring { this == -one }
+    @JvmName("constantIsNotMinusOne")
+    public override fun C.isNotMinusOne(): Boolean = ring { this != -one }
+    // endregion
+
+    // region Constant-polynomial relation
+    override operator fun C.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this.isZero()) other
+        else with(other.coefficients) {
+            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this@plus))
+            else NumberedPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = this@plus + getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    override operator fun C.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this.isZero()) -other
+        else with(other.coefficients) {
+            if (isEmpty()) NumberedPolynomial<C>(mapOf(listOf<UInt>() to this@minus))
+            else NumberedPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
+
+                        val degs = emptyList<UInt>()
+
+                        val result = this@minus - getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    override operator fun C.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this.isZero()) zero
+        else NumberedPolynomial<C>(
+            other.coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> this@times * c }
+                }
+        )
+    // endregion
+
+    // region Polynomial-constant relation
+    /**
+     * Returns sum of the polynomials. [other] is interpreted as [NumberedPolynomial].
+     */
+    override operator fun NumberedPolynomial<C>.plus(other: C): NumberedPolynomial<C> =
+        if (other.isZero()) this
+        else with(coefficients) {
+            if (isEmpty()) NumberedPolynomial<C>(mapOf(listOf<UInt>() to other))
+            else NumberedPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } + other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    /**
+     * Returns difference of the polynomials. [other] is interpreted as [NumberedPolynomial].
+     */
+    override operator fun NumberedPolynomial<C>.minus(other: C): NumberedPolynomial<C> =
+        if (other.isZero()) this
+        else with(coefficients) {
+            if (isEmpty()) NumberedPolynomial<C>(mapOf(listOf<UInt>() to other))
+            else NumberedPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } - other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    /**
+     * Returns product of the polynomials. [other] is interpreted as [NumberedPolynomial].
+     */
+    override operator fun NumberedPolynomial<C>.times(other: C): NumberedPolynomial<C> =
+        if (other.isZero()) zero
+        else NumberedPolynomial<C>(
+            coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> c * other }
+                }
+        )
+    // endregion
+
+    // region Polynomial-polynomial relation
+    /**
+     * Returns negation of the polynomial.
+     */
+    override fun NumberedPolynomial<C>.unaryMinus(): NumberedPolynomial<C> =
+        NumberedPolynomial<C>(
+            coefficients.mapValues { -it.value }
+        )
+    /**
+     * Returns sum of the polynomials.
+     */
+    override operator fun NumberedPolynomial<C>.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        NumberedPolynomial<C>(
+            coefficients
+                .applyAndRemoveZeros {
+                    other.coefficients
+                        .mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
+                }
+        )
+    /**
+     * Returns difference of the polynomials.
+     */
+    override operator fun NumberedPolynomial<C>.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        NumberedPolynomial<C>(
+            coefficients
+                .applyAndRemoveZeros {
+                    other.coefficients
+                        .mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
+                }
+        )
+    /**
+     * Returns product of the polynomials.
+     */
+    override operator fun NumberedPolynomial<C>.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        when {
+            isZero() -> zero
+            other.isZero() -> zero
+            else ->
+                NumberedPolynomial<C>(
+                    buildCoefficients {
+                        for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
+                            val degs =
+                                (0..max(degs1.lastIndex, degs2.lastIndex))
+                                    .map { degs1.getOrElse(it) { 0U } + degs2.getOrElse(it) { 0U } }
+                            val c = c1 * c2
+                            this[degs] = if (degs in this) this[degs]!! + c else c
+                        }
+                    }
+                )
+        }
+
+    public override fun NumberedPolynomial<C>.isZero(): Boolean = coefficients.values.all { it.isZero() }
+    public override fun NumberedPolynomial<C>.isNotZero(): Boolean = coefficients.values.any { it.isNotZero() }
+    public override fun NumberedPolynomial<C>.isOne(): Boolean =
+        with(coefficients) {
+            var foundAbsoluteTermAndItIsOne = false
+            for ((degs, c) in this) {
+                if (degs.isNotEmpty()) if (c.isNotZero()) return@with false
+                else {
+                    if (c.isNotOne()) return@with false
+                    else foundAbsoluteTermAndItIsOne = true
+                }
+            }
+            foundAbsoluteTermAndItIsOne
+        }
+    public override fun NumberedPolynomial<C>.isNotOne(): Boolean = !isOne()
+    public override fun NumberedPolynomial<C>.isMinusOne(): Boolean =
+        with(coefficients) {
+            var foundAbsoluteTermAndItIsMinusOne = false
+            for ((degs, c) in this) {
+                if (degs.isNotEmpty()) if (c.isNotZero()) return@with false
+                else {
+                    if (c.isNotMinusOne()) return@with false
+                    else foundAbsoluteTermAndItIsMinusOne = true
+                }
+            }
+            foundAbsoluteTermAndItIsMinusOne
+        }
+    public override fun NumberedPolynomial<C>.isNotMinusOne(): Boolean = !isMinusOne()
+
+    override val zero: NumberedPolynomial<C> = NumberedPolynomial<C>(emptyMap())
+    override val one: NumberedPolynomial<C> =
+        NumberedPolynomial<C>(
+            mapOf(
+                listOf<UInt>() to ring.one // 1 * x_1^0 * x_2^0 * ...
+            )
+        )
+
+    // TODO: Docs
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    override fun NumberedPolynomial<C>.equals(other: NumberedPolynomial<C>): Boolean =
+        when {
+            this === other -> true
+            else -> coefficients.size == other.coefficients.size &&
+                    coefficients.all { (key, value) -> with(other.coefficients) { key in this && this[key] == value } }
+        }
+    // endregion
+
+    // Not sure is it necessary...
+    // region Polynomial properties
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val NumberedPolynomial<C>.countOfVariables: Int
+        get() = coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) 0 else degs.size } ?: 0
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    override val NumberedPolynomial<C>.degree: Int
+        get() = coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) -1 else degs.sum().toInt() } ?: -1
+    /**
+     * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
+     * exponents in which the variables are appeared in the polynomial.
+     *
+     * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
+     * And size of the list is [countOfVariables].
+     */
+    public val NumberedPolynomial<C>.degrees: List<UInt>
+        get() =
+            buildList(countOfVariables) {
+                repeat(countOfVariables) { add(0U) }
+                coefficients.entries.forEach { (degs, c) ->
+                    if (c.isNotZero()) degs.forEachIndexed { index, deg ->
+                        this[index] = max(this[index], deg)
+                    }
+                }
+            }
+
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    override fun NumberedPolynomial<C>.isConstant(): Boolean =
+        coefficients.all { (degs, c) -> degs.isEmpty() || c.isZero() }
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    override fun NumberedPolynomial<C>.isNonZeroConstant(): Boolean =
+        with(coefficients) {
+            var foundAbsoluteTermAndItIsNotZero = false
+            for ((degs, c) in this) {
+                if (degs.isNotEmpty()) if (c.isNotZero()) return@with false
+                else {
+                    if (c.isZero()) return@with false
+                    else foundAbsoluteTermAndItIsNotZero = true
+                }
+            }
+            foundAbsoluteTermAndItIsNotZero
+        }
+
+    override fun NumberedPolynomial<C>.asConstantOrNull(): C? =
+        with(coefficients) {
+            if(isConstant()) getOrElse(emptyList()) { ring.zero }
+            else null
+        }
+
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, C>): NumberedPolynomial<C> = this.substitute(ring, argument)
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substitutePolynomial")
+    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
+
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.asFunction(): (Map<Int, C>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.asFunctionOnConstants(): (Map<Int, C>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.asFunctionOnPolynomials(): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
+
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, C>): NumberedPolynomial<C> = this.substitute(ring, argument)
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("invokePolynomial")
+    public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
+    // endregion
+
+    // region Legacy
+    @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+    override inline fun add(left: NumberedPolynomial<C>, right: NumberedPolynomial<C>): NumberedPolynomial<C> = left + right
+    @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+    override inline fun multiply(left: NumberedPolynomial<C>, right: NumberedPolynomial<C>): NumberedPolynomial<C> = left * right
+    // endregion
+
+    // region Utilities
+    // TODO: Move to region internal utilities with context receiver
+    internal fun MutableMap<List<UInt>, C>.applyAndRemoveZeros(block: MutableMap<List<UInt>, C>.() -> Unit) : MutableMap<List<UInt>, C> {
+        contract {
+            callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+        }
+        block()
+        for ((degs, c) in this) if (c.isZero()) this.remove(degs)
+        return this
+    }
+    internal fun Map<List<UInt>, C>.applyAndRemoveZeros(block: MutableMap<List<UInt>, C>.() -> Unit) : Map<List<UInt>, C> =
+        toMutableMap().applyAndRemoveZeros(block)
+    @OptIn(ExperimentalTypeInference::class)
+    internal fun buildCoefficients(@BuilderInference builderAction: MutableMap<List<UInt>, C>.() -> Unit): Map<List<UInt>, C> {
+        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
+        return buildMap {
+            builderAction()
+            for ((degs, c) in this) if (c.isZero()) this.remove(degs)
+        }
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 30280a396..99d6b0659 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -5,43 +5,38 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedAddMultiplied
-import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedMultiply
 import space.kscience.kmath.operations.*
 import kotlin.jvm.JvmName
 import kotlin.math.max
 import kotlin.math.min
 
 /**
- * Polynomial coefficients model without fixation on specific context they are applied to.
+ * Polynomial model without fixation on specific context they are applied to.
  *
  * @param coefficients constant is the leftmost coefficient.
  */
 public class Polynomial<T>(public val coefficients: List<T>) : AbstractPolynomial<T> {
     override fun toString(): String = "Polynomial$coefficients"
-
-//    public companion object {
-//        /**
-//         * Default name of variables used in string representations.
-//         *
-//         * @see Polynomial.toString
-//         */
-//        public var defaultVariableName: String = "x"
-//
-//        /**
-//         * Represents result of division with remainder.
-//         */
-//        public data class DividingResult<C>(
-//            val quotient: Polynomial<C>,
-//            val reminder: Polynomial<C>
-//        )
-//    }
 }
 
+// region Internal utilities
+
 /**
  * Represents internal [Polynomial] errors.
  */
-internal class PolynomialError(message: String): Error(message)
+internal class PolynomialError : Error {
+    constructor(): super()
+    constructor(message: String): super(message)
+    constructor(message: String?, cause: Throwable?): super(message, cause)
+    constructor(cause: Throwable?): super(cause)
+}
+
+/**
+ * Throws an [PolynomialError] with the given [message].
+ */
+internal fun polynomialError(message: Any): Nothing = throw PolynomialError(message.toString())
+
+// endregion
 
 // region Constructors and converters
 
@@ -66,16 +61,16 @@ public fun <T> T.asPolynomial() : Polynomial<T> = Polynomial(listOf(this))
 // endregion
 
 /**
- * Space of polynomials constructed over ring.
+ * Space of univariate polynomials constructed over ring.
  *
  * @param C the type of constants. Polynomials have them as a coefficients in their terms.
  * @param A type of underlying ring of constants. It's [Ring] of [C].
  * @param ring underlying ring of constants of type [A].
  */
-@Suppress("INAPPLICABLE_JVM_NAME") // KT-31420
+@Suppress("INAPPLICABLE_JVM_NAME") // TODO: KT-31420
 public open class PolynomialSpace<C, A : Ring<C>>(
     public val ring: A,
-) : AbstractPolynomialSpace<C, Polynomial<C>>{
+) : AbstractPolynomialSpace<C, Polynomial<C>> {
     // region Constant-integer relation
     @JvmName("constantIntPlus")
     public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
@@ -102,8 +97,14 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 coefficients
                     .toMutableList()
                     .apply {
-                        if (isEmpty()) this[0] = ring.zero + other
-                        else this[0] = this[0]!! + other
+                        val result = getOrElse(0) { ring.zero } + other
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
     public override operator fun Polynomial<C>.minus(other: Int): Polynomial<C> =
@@ -113,8 +114,14 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 coefficients
                     .toMutableList()
                     .apply {
-                        if (isEmpty()) this[0] = ring.zero - other
-                        else this[0] = this[0]!! - other
+                        val result = getOrElse(0) { ring.zero } - other
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
     public override operator fun Polynomial<C>.times(other: Int): Polynomial<C> =
@@ -134,8 +141,14 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 other.coefficients
                     .toMutableList()
                     .apply {
-                        if (isEmpty()) this[0] = ring.zero + this@plus
-                        else this[0] = this[0]!! + this@plus
+                        val result = this@plus + getOrElse(0) { ring.zero }
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
     public override operator fun Int.minus(other: Polynomial<C>): Polynomial<C> =
@@ -145,8 +158,16 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 other.coefficients
                     .toMutableList()
                     .apply {
-                        if (isEmpty()) this[0] = ring.zero - this@minus
-                        else this[0] = this[0]!! - this@minus
+                        forEachIndexed { index, c -> if (index != 0) this[index] = -c }
+
+                        val result = this@minus - getOrElse(0) { ring.zero }
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
     public override operator fun Int.times(other: Polynomial<C>): Polynomial<C> =
@@ -183,12 +204,20 @@ public open class PolynomialSpace<C, A : Ring<C>>(
 
     // region Constant-polynomial relation
     public override operator fun C.plus(other: Polynomial<C>): Polynomial<C> =
-        with(other.coefficients) {
+        if (this.isZero()) other
+        else with(other.coefficients) {
             if (isEmpty()) Polynomial(listOf(this@plus))
             else Polynomial(
                 toMutableList()
                     .apply {
-                        this[0] += this@plus
+                        val result = if (size == 0) this@plus else this@plus + get(0)
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
         }
@@ -196,12 +225,22 @@ public open class PolynomialSpace<C, A : Ring<C>>(
 //            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
 //        )
     public override operator fun C.minus(other: Polynomial<C>): Polynomial<C> =
-        with(other.coefficients) {
+        if (this.isZero()) other
+        else with(other.coefficients) {
             if (isEmpty()) Polynomial(listOf(-this@minus))
             else Polynomial(
                 toMutableList()
                     .apply {
-                        this[0] -= this@minus
+                        forEachIndexed { index, c -> if (index != 0) this[index] = -c }
+
+                        val result = if (size == 0) this@minus else this@minus - get(0)
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
         }
@@ -209,9 +248,10 @@ public open class PolynomialSpace<C, A : Ring<C>>(
 //            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
 //        )
     public override operator fun C.times(other: Polynomial<C>): Polynomial<C> =
-        Polynomial(
+        if (this.isZero()) other
+        else Polynomial(
             other.coefficients
-//                .subList(0, other.degree + 1)
+                .subList(0, other.degree + 1)
                 .map { it * this }
         )
     // endregion
@@ -224,7 +264,14 @@ public open class PolynomialSpace<C, A : Ring<C>>(
             else Polynomial(
                 toMutableList()
                     .apply {
-                        this[0] += other
+                        val result = if (size == 0) other else get(0) + other
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
         }
@@ -232,12 +279,20 @@ public open class PolynomialSpace<C, A : Ring<C>>(
 //            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
 //        )
     public override operator fun Polynomial<C>.minus(other: C): Polynomial<C> =
-        with(coefficients) {
+        if (other.isZero()) this
+        else with(coefficients) {
             if (isEmpty()) Polynomial(listOf(other))
             else Polynomial(
                 toMutableList()
                     .apply {
-                        this[0] -= other
+                        val result = if (size == 0) other else get(0) - other
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
         }
@@ -245,9 +300,10 @@ public open class PolynomialSpace<C, A : Ring<C>>(
 //            listOf(coefficients[0] - other) + coefficients.subList(1, degree + 1)
 //        )
     public override operator fun Polynomial<C>.times(other: C): Polynomial<C> =
-        Polynomial(
+        if (other.isZero()) this
+        else Polynomial(
             coefficients
-//                .subList(0, degree + 1)
+                .subList(0, degree + 1)
                 .map { it * other }
         )
     // endregion
@@ -283,8 +339,8 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         val thisDegree = degree
         val otherDegree = other.degree
         return when {
-            thisDegree == -1 -> this
-            otherDegree == -1 -> other
+            thisDegree == -1 -> zero
+            otherDegree == -1 -> zero
             else ->
                 Polynomial(
                     (0..(thisDegree + otherDegree))
@@ -293,6 +349,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                                 .map { coefficients[it] * other.coefficients[d - it] }
                                 .reduce { acc, rational -> acc + rational }
                         }
+                        .run { subList(0, indexOfLast { it.isNotZero() } + 1) }
                 )
         }
     }
@@ -321,8 +378,8 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         }
     // endregion
 
-    // Not sure is it necessary...
     // region Polynomial properties
+
     public override val Polynomial<C>.degree: Int get() = coefficients.indexOfLast { it != ring.zero }
 
     public override fun Polynomial<C>.asConstantOrNull(): C? =
@@ -354,8 +411,8 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     public inline operator fun Polynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
     @Suppress("NOTHING_TO_INLINE")
     public inline operator fun Polynomial<C>.invoke(argument: Polynomial<C>): Polynomial<C> = this.substitute(ring, argument)
-    // endregion
 
+    // endregion
 }
 
 /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Variable.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Variable.kt
new file mode 100644
index 000000000..410604fd3
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Variable.kt
@@ -0,0 +1,38 @@
+package space.kscience.kmath.functions
+
+import kotlin.reflect.KProperty
+
+
+/**
+ * Represents class of labeled variables like usual
+ * `x`, `y`, `z`, `a`, `b`, `n`, `m`, etc.
+ *
+ * Variables does not contain any information about field (or ring, ets.) they are considered in
+ * and therefore about coefficient.
+ *
+ * @property name Is the label or name of variable. For `x` it is `"x"`, for `n` &ndash; `"n"`, etc.
+ */
+public data class Variable (val name: String) : Comparable<Variable> {
+    /**
+     * Represents the variable as a string.
+     *
+     * @return Only name of the variable.
+     */
+    override fun toString(): String = name
+    /**
+     * Compares two variables.
+     * Comparison is realised by comparison of variables' names.
+     *
+     * Used in [LabeledPolynomial] and [LabeledRationalFunction] to sort monomials in
+     * [LabeledPolynomial.toString] and [LabeledRationalFunction.toString] in lexicographic order.
+     *
+     * @see Comparable.compareTo
+     * @sample LabeledPolynomial.monomialComparator
+     * @return Only name of the variable.
+     */
+    override fun compareTo(other: Variable): Int = name.compareTo(other.name)
+
+    public companion object {
+        public operator fun getValue(thisRef: Any?, property: KProperty<*>) : Variable = Variable(property.name)
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
new file mode 100644
index 000000000..9e5043b8c
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.Group
+
+
+// TODO: All of this should be moved to algebraic structures' place for utilities
+// TODO: Move receiver to context receiver
+/**
+ * Multiplication of element and integer.
+ *
+ * @receiver the multiplicand.
+ * @param other the multiplier.
+ * @return the difference.
+ */
+internal tailrec fun <C> Group<C>.optimizedMultiply(arg: C, other: Int): C =
+    when {
+        other == 0 -> zero
+        other == 1 -> arg
+        other == -1 -> -arg
+        other % 2 == 0 -> optimizedMultiply(arg + arg, other / 2)
+        other % 2 == 1 -> optimizedAddMultiplied(arg, arg + arg, other / 2)
+        other % 2 == -1 -> optimizedAddMultiplied(-arg, arg + arg, other / 2)
+        else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
+    }
+
+// TODO: Move receiver to context receiver
+/**
+ * Adds product of [arg] and [multiplier] to [base].
+ *
+ * @receiver the algebra to provide multiplication.
+ * @param base the augend.
+ * @param arg the multiplicand.
+ * @param multiplier the multiplier.
+ * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
+ * @author Gleb Minaev
+ */
+internal tailrec fun <C> Group<C>.optimizedAddMultiplied(base: C, arg: C, multiplier: Int): C =
+    when {
+        multiplier == 0 -> base
+        multiplier == 1 -> base + arg
+        multiplier == -1 -> base - arg
+        multiplier % 2 == 0 -> optimizedAddMultiplied(base, arg + arg, multiplier / 2)
+        multiplier % 2 == 1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
+        multiplier % 2 == -1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
+        else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
+    }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
new file mode 100644
index 000000000..62ac31b64
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
@@ -0,0 +1,490 @@
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.*
+import kotlin.contracts.*
+
+
+// TODO: Docs
+
+// region Sort of legacy
+
+//// region Constants
+//
+//// TODO: Reuse underlying ring extensions
+//
+//context(LabeledPolynomialSpace<C, A>)
+//@Suppress("NOTHING_TO_INLINE")
+//fun <C, A: Ring<C>> numberConstant(value: Int): C = ring { number<C>(value) }
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> power(arg: C, pow: UInt): C = ring { power(arg, pow) }
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> multiplyWithPower(base: C, arg: C, pow: UInt): C = ring { multiplyWithPower<C>(base, arg, pow) }
+//
+//// endregion
+
+//// region Variables
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> power(arg: Variable, pow: UInt): LabeledPolynomial<C> =
+//    if (pow == 0U) one
+//    else LabeledPolynomial<C>(mapOf(
+//        mapOf(arg to pow) to ring.one
+//    ))
+//
+//// endregion
+
+//// region Polynomials
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> number(value: Int): LabeledPolynomial<C> = ring { LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to number<C>(value))) }
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> multiplyWithPower(base: LabeledPolynomial<C>, arg: LabeledPolynomial<C>, pow: UInt): LabeledPolynomial<C> =
+//    when {
+//        arg.isZero() && pow > 0U -> base
+//        arg.isOne() -> base
+//        arg.isMinusOne() -> if (pow % 2U == 0U) base else -base
+//        else -> multiplyWithPowerInternalLogic(base, arg, pow)
+//    }
+//
+//// Trivial but slow as duck
+//context(LabeledPolynomialSpace<C, A>)
+//internal tailrec fun <C, A: Ring<C>> multiplyWithPowerInternalLogic(base: LabeledPolynomial<C>, arg: LabeledPolynomial<C>, exponent: UInt): LabeledPolynomial<C> =
+//    when {
+//        exponent == 0U -> base
+//        exponent == 1U -> base * arg
+//        exponent % 2U == 0U -> multiplyWithPowerInternalLogic(base, arg * arg, exponent / 2U)
+//        exponent % 2U == 1U -> multiplyWithPowerInternalLogic(base * arg, arg * arg, exponent / 2U)
+//        else -> error("Error in raising ring instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
+//    }
+//
+//// endregion
+
+// endregion
+
+// region Utilities
+
+// TODO: Docs
+@OptIn(ExperimentalContracts::class)
+public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomialSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return LabeledPolynomialSpace(this).block()
+}
+
+// endregion
+
+//// region String representations
+//
+///**
+// * Represents the polynomial as a [String] with names of variables substituted with names from [names].
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(names: Map<Variable, String> = emptyMap()): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .toSortedMap()
+//                            .filter { it.value > 0U }
+//                            .map { (variable, deg) ->
+//                                val variableName = names.getOrDefault(variable, variable.toString())
+//                                when (deg) {
+//                                    1U -> variableName
+//                                    else -> "$variableName^$deg"
+//                                }
+//                            }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer].
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(namer: (Variable) -> String): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .toSortedMap()
+//                            .filter { it.value > 0U }
+//                            .map { (variable, deg) ->
+//                                when (deg) {
+//                                    1U -> namer(variable)
+//                                    else -> "${namer(variable)}^$deg"
+//                                }
+//                            }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] with names of variables substituted with names from [names] and with
+// * brackets around the string if needed (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(names: Map<Variable, String> = emptyMap()): String =
+//    with(represent(names)) { if (coefficients.count() == 1) this else "($this)" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
+// * (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(namer: (Variable) -> String): String =
+//    with(represent(namer)) { if (coefficients.count() == 1) this else "($this)" }
+//
+///**
+// * Represents the polynomial as a [String] with names of variables substituted with names from [names].
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(names: Map<Variable, String> = emptyMap()): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> -LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .toSortedMap()
+//                            .filter { it.value > 0U }
+//                            .map { (variable, deg) ->
+//                                val variableName = names.getOrDefault(variable, variable.toString())
+//                                when (deg) {
+//                                    1U -> variableName
+//                                    else -> "$variableName^$deg"
+//                                }
+//                            }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer].
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(namer: (Variable) -> String): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> -LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .toSortedMap()
+//                            .filter { it.value > 0U }
+//                            .map { (variable, deg) ->
+//                                when (deg) {
+//                                    1U -> namer(variable)
+//                                    else -> "${namer(variable)}^$deg"
+//                                }
+//                            }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] with names of variables substituted with names from [names] and with
+// * brackets around the string if needed (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(names: Map<Variable, String> = emptyMap()): String =
+//    with(representReversed(names)) { if (coefficients.count() == 1) this else "($this)" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
+// * (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(namer: (Variable) -> String): String =
+//    with(representReversed(namer)) { if (coefficients.count() == 1) this else "($this)" }
+//
+//// endregion
+
+// region Operator extensions
+
+//// region Field case
+//
+//operator fun <T: Field<T>> Polynomial<T>.div(other: Polynomial<T>): Polynomial<T> {
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    if (isZero()) return this
+//
+//    fun Map<List<Int>, T>.leadingTerm() =
+//        this
+//            .asSequence()
+//            .map { Pair(it.key, it.value) }
+//            .reduce { (accDegs, accC), (listDegs, listC) ->
+//                for (i in 0..accDegs.lastIndex) {
+//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
+//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
+//                }
+//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
+//            }
+//
+//    var thisCoefficients = coefficients.toMutableMap()
+//    val otherCoefficients = other.coefficients
+//    val quotientCoefficients = HashMap<List<Int>, T>()
+//
+//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
+//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
+//
+//    while (
+//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
+//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
+//    ) {
+//        val multiplierDegs =
+//            thisLeadingTermDegs
+//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
+//                .cleanUp()
+//        val multiplierC = thisLeadingTermC / otherLeadingTermC
+//
+//        quotientCoefficients[multiplierDegs] = multiplierC
+//
+//        for ((degs, t) in otherCoefficients) {
+//            val productDegs =
+//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
+//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
+//                    .cleanUp()
+//            val productC = t * multiplierC
+//            thisCoefficients[productDegs] =
+//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
+//        }
+//
+//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
+//
+//        if (thisCoefficients.isEmpty())
+//            return Polynomial(quotientCoefficients, toCheckInput = false)
+//
+//        val t = thisCoefficients.leadingTerm()
+//        thisLeadingTermDegs = t.first
+//        thisLeadingTermC = t.second
+//    }
+//
+//    return Polynomial(quotientCoefficients, toCheckInput = false)
+//}
+//
+//operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    else
+//        Polynomial(
+//            coefficients
+//                .mapValues { it.value / other },
+//            toCheckInput = false
+//        )
+//
+//operator fun <T: Field<T>> Polynomial<T>.rem(other: Polynomial<T>): Polynomial<T> {
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    if (isZero()) return this
+//
+//    fun Map<List<Int>, T>.leadingTerm() =
+//        this
+//            .asSequence()
+//            .map { Pair(it.key, it.value) }
+//            .reduce { (accDegs, accC), (listDegs, listC) ->
+//                for (i in 0..accDegs.lastIndex) {
+//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
+//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
+//                }
+//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
+//            }
+//
+//    var thisCoefficients = coefficients.toMutableMap()
+//    val otherCoefficients = other.coefficients
+//
+//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
+//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
+//
+//    while (
+//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
+//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
+//    ) {
+//        val multiplierDegs =
+//            thisLeadingTermDegs
+//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
+//                .cleanUp()
+//        val multiplierC = thisLeadingTermC / otherLeadingTermC
+//
+//        for ((degs, t) in otherCoefficients) {
+//            val productDegs =
+//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
+//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
+//                    .cleanUp()
+//            val productC = t * multiplierC
+//            thisCoefficients[productDegs] =
+//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
+//        }
+//
+//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
+//
+//        if (thisCoefficients.isEmpty())
+//            return Polynomial(thisCoefficients, toCheckInput = false)
+//
+//        val t = thisCoefficients.leadingTerm()
+//        thisLeadingTermDegs = t.first
+//        thisLeadingTermC = t.second
+//    }
+//
+//    return Polynomial(thisCoefficients, toCheckInput = false)
+//}
+//
+//infix fun <T: Field<T>> Polynomial<T>.divrem(other: Polynomial<T>): Polynomial.Companion.DividingResult<T> {
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    if (isZero()) return Polynomial.Companion.DividingResult(this, this)
+//
+//    fun Map<List<Int>, T>.leadingTerm() =
+//        this
+//            .asSequence()
+//            .map { Pair(it.key, it.value) }
+//            .reduce { (accDegs, accC), (listDegs, listC) ->
+//                for (i in 0..accDegs.lastIndex) {
+//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
+//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
+//                }
+//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
+//            }
+//
+//    var thisCoefficients = coefficients.toMutableMap()
+//    val otherCoefficients = other.coefficients
+//    val quotientCoefficients = HashMap<List<Int>, T>()
+//
+//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
+//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
+//
+//    while (
+//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
+//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
+//    ) {
+//        val multiplierDegs =
+//            thisLeadingTermDegs
+//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
+//                .cleanUp()
+//        val multiplierC = thisLeadingTermC / otherLeadingTermC
+//
+//        quotientCoefficients[multiplierDegs] = multiplierC
+//
+//        for ((degs, t) in otherCoefficients) {
+//            val productDegs =
+//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
+//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
+//                    .cleanUp()
+//            val productC = t * multiplierC
+//            thisCoefficients[productDegs] =
+//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
+//        }
+//
+//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
+//
+//        if (thisCoefficients.isEmpty())
+//            return Polynomial.Companion.DividingResult(
+//                Polynomial(quotientCoefficients, toCheckInput = false),
+//                Polynomial(thisCoefficients, toCheckInput = false)
+//            )
+//
+//        val t = thisCoefficients.leadingTerm()
+//        thisLeadingTermDegs = t.first
+//        thisLeadingTermC = t.second
+//    }
+//
+//    return Polynomial.Companion.DividingResult(
+//        Polynomial(quotientCoefficients, toCheckInput = false),
+//        Polynomial(thisCoefficients, toCheckInput = false)
+//    )
+//}
+//
+//// endregion
+
+// endregion
+
+//// region Polynomial substitution and functional representation
+//
+//public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Variable, C>): LabeledPolynomial<C> = ring {
+//    if (coefficients.isEmpty()) return this@substitute
+//    LabeledPolynomial<C>(
+//        buildMap {
+//            coefficients.forEach { (degs, c) ->
+//                val newDegs = degs.filterKeys { it !in args }
+//                val newC = degs.entries.asSequence().filter { it.key in args }.fold(c) { acc, (variable, deg) ->
+//                    multiplyWithPower(acc, args[variable]!!, deg)
+//                }
+//                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
+//            }
+//        }
+//    )
+//}
+//
+//// TODO: Replace with optimisation: the [result] may be unboxed, and all operations may be performed as soon as
+////  possible on it
+//@JvmName("substitutePolynomial")
+//fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, arg: Map<Variable, LabeledPolynomial<C>>) : LabeledPolynomial<C> =
+//    ring.labeledPolynomial {
+//        if (coefficients.isEmpty()) return zero
+//        coefficients
+//            .asSequence()
+//            .map { (degs, c) ->
+//                degs.entries
+//                    .asSequence()
+//                    .filter { it.key in arg }
+//                    .fold(LabeledPolynomial(mapOf(degs.filterKeys { it !in arg } to c))) { acc, (index, deg) ->
+//                        multiplyWithPower(acc, arg[index]!!, deg)
+//                    }
+//            }
+//            .reduce { acc, polynomial -> acc + polynomial } // TODO: Rewrite. Might be slow.
+//    }
+//
+//// TODO: Substitute rational function
+//
+//fun <C, A : Ring<C>> LabeledPolynomial<C>.asFunctionOver(ring: A): (Map<Variable, C>) -> LabeledPolynomial<C> =
+//    { substitute(ring, it) }
+//
+//fun <C, A : Ring<C>> LabeledPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Variable, LabeledPolynomial<C>>) -> LabeledPolynomial<C> =
+//    { substitute(ring, it) }
+//
+//// endregion
+
+//// region Algebraic derivative and antiderivative
+//// TODO
+//// endregion
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
new file mode 100644
index 000000000..d4053442d
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
@@ -0,0 +1,605 @@
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
+import kotlin.contracts.*
+import kotlin.jvm.JvmName
+
+
+// TODO: Docs
+
+// region Sort of legacy
+
+//// region Constants
+//
+//// TODO: Reuse underlying ring extensions
+//
+//context(NumberedPolynomialSpace<C, A>)
+//@Suppress("NOTHING_TO_INLINE")
+//public fun <C, A: Ring<C>> numberConstant(value: Int): C = ring { number<C>(value) }
+//
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> multiplyWithPower(base: C, arg: C, pow: UInt): C = ring { multiplyWithPower<C>(base, arg, pow) }
+//
+//// endregion
+
+//// region Polynomials
+//
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> number(value: Int): NumberedPolynomial<C> = ring { NumberedPolynomial<C>(mapOf(emptyList<UInt>() to number<C>(value))) }
+//
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> multiplyWithPower(base: NumberedPolynomial<C>, arg: NumberedPolynomial<C>, pow: UInt): NumberedPolynomial<C> =
+//    when {
+//        arg.isZero() && pow > 0U -> base
+//        arg.isOne() -> base
+//        arg.isMinusOne() -> if (pow % 2U == 0U) base else -base
+//        else -> multiplyWithPowerInternalLogic(base, arg, pow)
+//    }
+//
+//// Trivial but slow as duck
+//context(NumberedPolynomialSpace<C, A>)
+//internal tailrec fun <C, A: Ring<C>> multiplyWithPowerInternalLogic(base: NumberedPolynomial<C>, arg: NumberedPolynomial<C>, exponent: UInt): NumberedPolynomial<C> =
+//    when {
+//        exponent == 0U -> base
+//        exponent == 1U -> base * arg
+//        exponent % 2U == 0U -> multiplyWithPowerInternalLogic(base, arg * arg, exponent / 2U)
+//        exponent % 2U == 1U -> multiplyWithPowerInternalLogic(base * arg, arg * arg, exponent / 2U)
+//        else -> error("Error in raising ring instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
+//    }
+//
+//// endregion
+
+// endregion
+
+// region Utilities
+
+// TODO: Docs
+@OptIn(ExperimentalContracts::class)
+public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolynomialSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return NumberedPolynomialSpace(this).block()
+}
+
+// endregion
+
+//// region String representations
+//
+///**
+// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`.
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.represent(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .mapIndexed { index, deg ->
+//                                when (deg) {
+//                                    0U -> ""
+//                                    1U -> "${withVariableName}_${index+1}"
+//                                    else -> "${withVariableName}_${index+1}^$deg"
+//                                }
+//                            }
+//                            .filter { it.isNotEmpty() }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer].
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.represent(namer: (Int) -> String): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .mapIndexed { index, deg ->
+//                                when (deg) {
+//                                    0U -> ""
+//                                    1U -> namer(index)
+//                                    else -> "${namer(index)}^$deg"
+//                                }
+//                            }
+//                            .filter { it.isNotEmpty() }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`
+// * and with brackets around the string if needed (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representWithBrackets(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
+//    with(represent(withVariableName)) { if (coefficients.count() == 1) this else "($this)" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
+// * (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representWithBrackets(namer: (Int) -> String): String =
+//    with(represent(namer)) { if (coefficients.count() == 1) this else "($this)" }
+//
+///**
+// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`.
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversed(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> -NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .mapIndexed { index, deg ->
+//                                when (deg) {
+//                                    0U -> ""
+//                                    1U -> "${withVariableName}_${index+1}"
+//                                    else -> "${withVariableName}_${index+1}^$deg"
+//                                }
+//                            }
+//                            .filter { it.isNotEmpty() }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer].
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversed(namer: (Int) -> String): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> -NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .mapIndexed { index, deg ->
+//                                when (deg) {
+//                                    0U -> ""
+//                                    1U -> namer(index)
+//                                    else -> "${namer(index)}^$deg"
+//                                }
+//                            }
+//                            .filter { it.isNotEmpty() }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`
+// * and with brackets around the string if needed (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversedWithBrackets(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
+//    with(representReversed(withVariableName)) { if (coefficients.count() == 1) this else "($this)" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
+// * (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversedWithBrackets(namer: (Int) -> String): String =
+//    with(representReversed(namer)) { if (coefficients.count() == 1) this else "($this)" }
+//
+//// endregion
+
+//// region Polynomial substitution and functional representation
+//
+//public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
+//    if (coefficients.isEmpty()) return this@substitute
+//    NumberedPolynomial<C>(
+//        buildMap {
+//            coefficients.forEach { (degs, c) ->
+//                val newDegs = degs.mapIndexed { index, deg -> if (index in args) 0U else deg }.cleanUp()
+//                val newC = degs.foldIndexed(c) { index, acc, deg ->
+//                    if (index in args) multiplyWithPower(acc, args[index]!!, deg)
+//                    else acc
+//                }
+//                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
+//            }
+//        }
+//    )
+//}
+//
+//// TODO: Replace with optimisation: the [result] may be unboxed, and all operations may be performed as soon as
+////  possible on it
+//@JvmName("substitutePolynomial")
+//public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, arg: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> =
+//    ring.numberedPolynomialSpace {
+//        if (coefficients.isEmpty()) return zero
+//        coefficients
+//            .asSequence()
+//            .map { (degs, c) ->
+//                degs.foldIndexed(
+//                    NumberedPolynomial(
+//                        degs.mapIndexed { index, deg -> if (index in arg) 0U else deg } to c
+//                    )
+//                ) { index, acc, deg -> if (index in arg) multiplyWithPower(acc, arg[index]!!, deg) else acc }
+//            }
+//            .reduce { acc, polynomial -> acc + polynomial } // TODO: Rewrite. Might be slow.
+//    }
+//
+//// TODO: Substitute rational function
+//
+//public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunctionOver(ring: A): (Map<Int, C>) -> NumberedPolynomial<C> =
+//    { substitute(ring, it) }
+//
+//public fun <C, A : Ring<C>> NumberedPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> =
+//    { substitute(ring, it) }
+//
+//// endregion
+
+// region Operator extensions
+
+//// region Field case
+//
+//operator fun <T: Field<T>> Polynomial<T>.div(other: Polynomial<T>): Polynomial<T> {
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    if (isZero()) return this
+//
+//    fun Map<List<Int>, T>.leadingTerm() =
+//        this
+//            .asSequence()
+//            .map { Pair(it.key, it.value) }
+//            .reduce { (accDegs, accC), (listDegs, listC) ->
+//                for (i in 0..accDegs.lastIndex) {
+//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
+//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
+//                }
+//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
+//            }
+//
+//    var thisCoefficients = coefficients.toMutableMap()
+//    val otherCoefficients = other.coefficients
+//    val quotientCoefficients = HashMap<List<Int>, T>()
+//
+//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
+//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
+//
+//    while (
+//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
+//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
+//    ) {
+//        val multiplierDegs =
+//            thisLeadingTermDegs
+//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
+//                .cleanUp()
+//        val multiplierC = thisLeadingTermC / otherLeadingTermC
+//
+//        quotientCoefficients[multiplierDegs] = multiplierC
+//
+//        for ((degs, t) in otherCoefficients) {
+//            val productDegs =
+//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
+//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
+//                    .cleanUp()
+//            val productC = t * multiplierC
+//            thisCoefficients[productDegs] =
+//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
+//        }
+//
+//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
+//
+//        if (thisCoefficients.isEmpty())
+//            return Polynomial(quotientCoefficients, toCheckInput = false)
+//
+//        val t = thisCoefficients.leadingTerm()
+//        thisLeadingTermDegs = t.first
+//        thisLeadingTermC = t.second
+//    }
+//
+//    return Polynomial(quotientCoefficients, toCheckInput = false)
+//}
+//
+//operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    else
+//        Polynomial(
+//            coefficients
+//                .mapValues { it.value / other },
+//            toCheckInput = false
+//        )
+//
+//operator fun <T: Field<T>> Polynomial<T>.rem(other: Polynomial<T>): Polynomial<T> {
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    if (isZero()) return this
+//
+//    fun Map<List<Int>, T>.leadingTerm() =
+//        this
+//            .asSequence()
+//            .map { Pair(it.key, it.value) }
+//            .reduce { (accDegs, accC), (listDegs, listC) ->
+//                for (i in 0..accDegs.lastIndex) {
+//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
+//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
+//                }
+//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
+//            }
+//
+//    var thisCoefficients = coefficients.toMutableMap()
+//    val otherCoefficients = other.coefficients
+//
+//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
+//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
+//
+//    while (
+//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
+//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
+//    ) {
+//        val multiplierDegs =
+//            thisLeadingTermDegs
+//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
+//                .cleanUp()
+//        val multiplierC = thisLeadingTermC / otherLeadingTermC
+//
+//        for ((degs, t) in otherCoefficients) {
+//            val productDegs =
+//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
+//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
+//                    .cleanUp()
+//            val productC = t * multiplierC
+//            thisCoefficients[productDegs] =
+//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
+//        }
+//
+//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
+//
+//        if (thisCoefficients.isEmpty())
+//            return Polynomial(thisCoefficients, toCheckInput = false)
+//
+//        val t = thisCoefficients.leadingTerm()
+//        thisLeadingTermDegs = t.first
+//        thisLeadingTermC = t.second
+//    }
+//
+//    return Polynomial(thisCoefficients, toCheckInput = false)
+//}
+//
+//infix fun <T: Field<T>> Polynomial<T>.divrem(other: Polynomial<T>): Polynomial.Companion.DividingResult<T> {
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    if (isZero()) return Polynomial.Companion.DividingResult(this, this)
+//
+//    fun Map<List<Int>, T>.leadingTerm() =
+//        this
+//            .asSequence()
+//            .map { Pair(it.key, it.value) }
+//            .reduce { (accDegs, accC), (listDegs, listC) ->
+//                for (i in 0..accDegs.lastIndex) {
+//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
+//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
+//                }
+//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
+//            }
+//
+//    var thisCoefficients = coefficients.toMutableMap()
+//    val otherCoefficients = other.coefficients
+//    val quotientCoefficients = HashMap<List<Int>, T>()
+//
+//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
+//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
+//
+//    while (
+//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
+//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
+//    ) {
+//        val multiplierDegs =
+//            thisLeadingTermDegs
+//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
+//                .cleanUp()
+//        val multiplierC = thisLeadingTermC / otherLeadingTermC
+//
+//        quotientCoefficients[multiplierDegs] = multiplierC
+//
+//        for ((degs, t) in otherCoefficients) {
+//            val productDegs =
+//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
+//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
+//                    .cleanUp()
+//            val productC = t * multiplierC
+//            thisCoefficients[productDegs] =
+//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
+//        }
+//
+//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
+//
+//        if (thisCoefficients.isEmpty())
+//            return Polynomial.Companion.DividingResult(
+//                Polynomial(quotientCoefficients, toCheckInput = false),
+//                Polynomial(thisCoefficients, toCheckInput = false)
+//            )
+//
+//        val t = thisCoefficients.leadingTerm()
+//        thisLeadingTermDegs = t.first
+//        thisLeadingTermC = t.second
+//    }
+//
+//    return Polynomial.Companion.DividingResult(
+//        Polynomial(quotientCoefficients, toCheckInput = false),
+//        Polynomial(thisCoefficients, toCheckInput = false)
+//    )
+//}
+//
+//// endregion
+
+// endregion
+
+// region Polynomial substitution and functional representation
+
+// TODO: May be apply Horner's method too?
+/**
+ * Evaluates the value of the given double polynomial for given double argument.
+ */
+public fun NumberedPolynomial<Double>.substitute(args: Map<Int, Double>): NumberedPolynomial<Double> = Double.algebra {
+    val acc = LinkedHashMap<List<UInt>, Double>(coefficients.size)
+    for ((degs, c) in coefficients) {
+        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
+        val newC = args.entries.fold(c) { product, (variable, substitutor) ->
+            val deg = degs.getOrElse(variable) { 0u }
+            if (deg == 0u) product else product * substitutor.pow(deg.toInt())
+        }
+        if (newDegs !in acc) acc[newDegs] = c
+        else acc[newDegs] = acc[newDegs]!! + c
+    }
+    return NumberedPolynomial<Double>(acc)
+}
+
+/**
+ * Evaluates the value of the given polynomial for given argument.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */
+public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
+    val acc = LinkedHashMap<List<UInt>, C>(coefficients.size)
+    for ((degs, c) in coefficients) {
+        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
+        val newC = args.entries.fold(c) { product, (variable, substitutor) ->
+            val deg = degs.getOrElse(variable) { 0u }
+            if (deg == 0u) product else product * power(substitutor, deg)
+        }
+        if (newDegs !in acc) acc[newDegs] = c
+        else acc[newDegs] = acc[newDegs]!! + c
+    }
+    return NumberedPolynomial<C>(acc)
+}
+
+// TODO: (Waiting for hero) Replace with optimisation: the [result] may be unboxed, and all operations may be performed
+//  as soon as possible on it
+@JvmName("substitutePolynomial")
+public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> = TODO() /*ring.numberedPolynomial {
+    val acc = LinkedHashMap<List<UInt>, NumberedPolynomial<C>>(coefficients.size)
+    for ((degs, c) in coefficients) {
+        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
+        val newC = args.entries.fold(c.asNumberedPolynomial()) { product, (variable, substitutor) ->
+            val deg = degs.getOrElse(variable) { 0u }
+            if (deg == 0u) product else product * power(substitutor, deg)
+        }
+        if (newDegs !in acc) acc[newDegs] = c.asNumberedPolynomial()
+        else acc[newDegs] = acc[newDegs]!! + c
+    }
+}*/
+
+/**
+ * Represent the polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunction(ring: A): (Map<Int, C>) -> NumberedPolynomial<C> = { substitute(ring, it) }
+
+/**
+ * Represent the polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> = { substitute(ring, it) }
+
+// endregion
+
+// region Algebraic derivative and antiderivative
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> NumberedPolynomial<C>.derivativeBy(
+    algebra: A,
+    variable: Int,
+): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
+    TODO()
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> NumberedPolynomial<C>.derivativeBy(
+    algebra: A,
+    variables: IntArray,
+): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
+    TODO()
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> NumberedPolynomial<C>.derivativeBy(
+    algebra: A,
+    variables: Collection<Int>,
+): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = derivativeBy(algebra, variables.toIntArray())
+
+/**
+ * Create a polynomial witch represents indefinite integral version of this polynomial
+ */
+@UnstableKMathAPI
+public fun <C, A> NumberedPolynomial<C>.antiderivativeBy(
+    algebra: A,
+    variable: Int,
+): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
+    TODO()
+}
+
+/**
+ * Create a polynomial witch represents indefinite integral version of this polynomial
+ */
+@UnstableKMathAPI
+public fun <C, A> NumberedPolynomial<C>.antiderivativeBy(
+    algebra: A,
+    variables: IntArray,
+): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
+    TODO()
+}
+
+/**
+ * Create a polynomial witch represents indefinite integral version of this polynomial
+ */
+@UnstableKMathAPI
+public fun <C, A> NumberedPolynomial<C>.antiderivativeBy(
+    algebra: A,
+    variables: Collection<Int>,
+): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = antiderivativeBy(algebra, variables.toIntArray())
+
+// endregion
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index 1a3eb7874..4d99b3a45 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -121,7 +121,7 @@ public fun <C, A> Polynomial<C>.antiderivative(
 ): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
     val integratedCoefficients = buildList(coefficients.size + 1) {
         add(zero)
-        coefficients.forEachIndexed{ index, t -> add(t / (number(index) + one)) }
+        coefficients.forEachIndexed{ index, t -> add(t / number(index + 1)) }
     }
     Polynomial(integratedCoefficients)
 }
@@ -136,4 +136,6 @@ public fun <C : Comparable<C>> Polynomial<C>.integrate(
 ): C = algebra {
     val integral = antiderivative(algebra)
     integral.substitute(algebra, range.endInclusive) - integral.substitute(algebra, range.start)
-}
\ No newline at end of file
+}
+
+// endregion
\ No newline at end of file
-- 
2.34.1


From 191dd02e478787df7a50efb7b9568701ad243d01 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Thu, 3 Mar 2022 20:45:35 +0300
Subject: [PATCH 422/713] Restructured Polynomial

---
 .../kmath/functions/AbstractPolynomial.kt     | 354 +++++++++++++++
 .../kscience/kmath/functions/Piecewise.kt     |   8 +-
 .../kscience/kmath/functions/Polynomial.kt    | 425 ++++++++++++++----
 .../kmath/functions/polynomialUtil.kt         | 139 ++++++
 .../kmath/integration/SplineIntegrator.kt     |   3 +-
 .../kmath/interpolation/Interpolator.kt       |   4 +-
 .../kmath/functions/PolynomialTest.kt         |  11 +-
 7 files changed, 845 insertions(+), 99 deletions(-)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
new file mode 100644
index 000000000..f6a617656
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -0,0 +1,354 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.*
+import kotlin.js.JsName
+import kotlin.jvm.JvmName
+
+
+/**
+ * Abstraction of polynomials.
+ */
+public interface AbstractPolynomial<C>
+
+/**
+ * Abstraction of ring of polynomials of type [P] over ring of constants of type [C].
+ */
+@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P> {
+    // region Constant-integer relation
+    /**
+     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     */
+    @JvmName("constantIntPlus")
+    public operator fun C.plus(other: Int): C
+    /**
+     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    @JvmName("constantIntMinus")
+    public operator fun C.minus(other: Int): C
+    /**
+     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    @JvmName("constantIntTimes")
+    public operator fun C.times(other: Int): C
+    // endregion
+
+    // region Integer-constant relation
+    /**
+     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    @JvmName("intConstantPlus")
+    public operator fun Int.plus(other: C): C
+    /**
+     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    @JvmName("intConstantMinus")
+    public operator fun Int.minus(other: C): C
+    /**
+     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    @JvmName("intConstantTimes")
+    public operator fun Int.times(other: C): C
+    // endregion
+
+    // region Polynomial-integer relation
+    /**
+     * Returns sum of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public operator fun P.plus(other: Int): P = optimizedAddMultiplied(this, one, other)
+    /**
+     * Returns difference between the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public operator fun P.minus(other: Int): P = optimizedAddMultiplied(this, one, -other)
+    /**
+     * Returns product of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public operator fun P.times(other: Int): P = optimizedMultiply(this, other)
+    // endregion
+
+    // region Integer-polynomial relation
+    /**
+     * Returns sum of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public operator fun Int.plus(other: P): P = optimizedAddMultiplied(other, one, this)
+    /**
+     * Returns difference between the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public operator fun Int.minus(other: P): P = optimizedAddMultiplied(-other, one, this)
+    /**
+     * Returns product of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public operator fun Int.times(other: P): P = optimizedMultiply(other, this)
+    // endregion
+
+    // region Constant-constant relation
+    /**
+     * Returns the same constant.
+     */
+    @JvmName("constantUnaryPlus")
+    @JsName("constantUnaryPlus")
+    public operator fun C.unaryPlus(): C = this
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("constantUnaryMinus")
+    @JsName("constantUnaryMinus")
+    public operator fun C.unaryMinus(): C
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("constantPlus")
+    @JsName("constantPlus")
+    public operator fun C.plus(other: C): C
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("constantMinus")
+    @JsName("constantMinus")
+    public operator fun C.minus(other: C): C
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("constantTimes")
+    @JsName("constantTimes")
+    public operator fun C.times(other: C): C
+
+    /**
+     * Check if the instant is zero constant.
+     */
+    @JvmName("constantIsZero")
+    public fun C.isZero(): Boolean
+    /**
+     * Check if the instant is NOT zero constant.
+     */
+    @JvmName("constantIsNotZero")
+    public fun C.isNotZero(): Boolean
+    /**
+     * Check if the instant is unit constant.
+     */
+    @JvmName("constantIsOne")
+    public fun C.isOne(): Boolean
+    /**
+     * Check if the instant is NOT unit constant.
+     */
+    @JvmName("constantIsNotOne")
+    public fun C.isNotOne(): Boolean
+    /**
+     * Check if the instant is minus unit constant.
+     */
+    @JvmName("constantIsMinusOne")
+    public fun C.isMinusOne(): Boolean
+    /**
+     * Check if the instant is NOT minus unit constant.
+     */
+    @JvmName("constantIsNotMinusOne")
+    public fun C.isNotMinusOne(): Boolean
+    // endregion
+
+    // region Constant-polynomial relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.plus(other: P): P
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.minus(other: P): P
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.times(other: P): P
+    // endregion
+
+    // region Polynomial-constant relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.plus(other: C): P
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.minus(other: C): P
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.times(other: C): P
+    // endregion
+
+    // region Polynomial-polynomial relation
+    /**
+     * Returns the same polynomial.
+     */
+    public override operator fun P.unaryPlus(): P = this
+    /**
+     * Returns negation of the polynomial.
+     */
+    public override operator fun P.unaryMinus(): P
+    /**
+     * Returns sum of the polynomials.
+     */
+    public override operator fun P.plus(other: P): P
+    /**
+     * Returns difference of the polynomials.
+     */
+    public override operator fun P.minus(other: P): P
+    /**
+     * Returns product of the polynomials.
+     */
+    public override operator fun P.times(other: P): P
+
+    /**
+     * Check if the instant is zero polynomial.
+     */
+    public fun P.isZero(): Boolean = this == zero
+    /**
+     * Check if the instant is NOT zero polynomial.
+     */
+    public fun P.isNotZero(): Boolean = this != zero
+    /**
+     * Check if the instant is unit polynomial.
+     */
+    public fun P.isOne(): Boolean = this == one
+    /**
+     * Check if the instant is NOT unit polynomial.
+     */
+    public fun P.isNotOne(): Boolean = this != one
+    /**
+     * Check if the instant is minus unit polynomial.
+     */
+    public fun P.isMinusOne(): Boolean = this == -one
+    /**
+     * Check if the instant is NOT minus unit polynomial.
+     */
+    public fun P.isNotMinusOne(): Boolean = this != -one
+
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
+    override val zero: P
+    /**
+     * Instance of unit polynomial (unit of the polynomial ring).
+     */
+    override val one: P
+
+    /**
+     * Checks equality of the polynomials.
+     */
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    public fun P.equals(other: P): Boolean
+    // endregion
+
+    // Not sure is it necessary...
+    // region Polynomial properties
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    public val P.degree: Int
+
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isConstant(): Boolean = degree <= 0
+    /**
+     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNotConstant(): Boolean = !isConstant()
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNonZeroConstant(): Boolean = degree == 0
+    /**
+     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
+     */
+    public fun P.asConstantOrNull(): C?
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
+     */
+    public fun P.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
+    // endregion
+
+    // region Legacy of Ring interface
+    override fun add(left: P, right: P): P = left + right
+    override fun multiply(left: P, right: P): P = left * right
+    // endregion
+
+    public companion object {
+        // TODO: All of this should be moved to algebraic structures' place for utilities
+        // TODO: Move receiver to context receiver
+        /**
+         * Multiplication of element and integer.
+         *
+         * @receiver the multiplicand.
+         * @param other the multiplier.
+         * @return the difference.
+         */
+        internal tailrec fun <C> Group<C>.optimizedMultiply(arg: C, other: Int): C =
+            when {
+                other == 0 -> zero
+                other == 1 -> arg
+                other == -1 -> -arg
+                other % 2 == 0 -> optimizedMultiply(arg + arg, other / 2)
+                other % 2 == 1 -> optimizedAddMultiplied(arg, arg + arg, other / 2)
+                other % 2 == -1 -> optimizedAddMultiplied(-arg, arg + arg, other / 2)
+                else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
+            }
+
+        // TODO: Move receiver to context receiver
+        /**
+         * Adds product of [arg] and [multiplier] to [base].
+         *
+         * @receiver the algebra to provide multiplication.
+         * @param base the augend.
+         * @param arg the multiplicand.
+         * @param multiplier the multiplier.
+         * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
+         * @author Gleb Minaev
+         */
+        internal tailrec fun <C> Group<C>.optimizedAddMultiplied(base: C, arg: C, multiplier: Int): C =
+            when {
+                multiplier == 0 -> base
+                multiplier == 1 -> base + arg
+                multiplier == -1 -> base - arg
+                multiplier % 2 == 0 -> optimizedAddMultiplied(base, arg + arg, multiplier / 2)
+                multiplier % 2 == 1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
+                multiplier % 2 == -1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
+                else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
+            }
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index 16af7f555..cfd21d552 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -117,16 +117,16 @@ public fun <T : Comparable<T>> PiecewisePolynomial(
  * Return a value of polynomial function with given [ring] a given [arg] or null if argument is outside piecewise
  * definition.
  */
-public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.value(ring: C, arg: T): T? =
-    findPiece(arg)?.value(ring, arg)
+public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.substitute(ring: C, arg: T): T? =
+    findPiece(arg)?.substitute(ring, arg)
 
 /**
  * Convert this polynomial to a function returning nullable value (null if argument is outside piecewise range).
  */
-public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C): (T) -> T? = { value(ring, it) }
+public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C): (T) -> T? = { substitute(ring, it) }
 
 /**
  * Convert this polynomial to a function using [defaultValue] for arguments outside the piecewise range.
  */
 public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C, defaultValue: T): (T) -> T =
-    { value(ring, it) ?: defaultValue }
+    { substitute(ring, it) ?: defaultValue }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index a36d36f52..30280a396 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -5,128 +5,371 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedAddMultiplied
+import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedMultiply
 import space.kscience.kmath.operations.*
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
+import kotlin.jvm.JvmName
 import kotlin.math.max
-import kotlin.math.pow
+import kotlin.math.min
 
 /**
  * Polynomial coefficients model without fixation on specific context they are applied to.
  *
  * @param coefficients constant is the leftmost coefficient.
  */
-public class Polynomial<out T>(public val coefficients: List<T>) {
+public class Polynomial<T>(public val coefficients: List<T>) : AbstractPolynomial<T> {
     override fun toString(): String = "Polynomial$coefficients"
+
+//    public companion object {
+//        /**
+//         * Default name of variables used in string representations.
+//         *
+//         * @see Polynomial.toString
+//         */
+//        public var defaultVariableName: String = "x"
+//
+//        /**
+//         * Represents result of division with remainder.
+//         */
+//        public data class DividingResult<C>(
+//            val quotient: Polynomial<C>,
+//            val reminder: Polynomial<C>
+//        )
+//    }
 }
 
 /**
- * Returns a [Polynomial] instance with given [coefficients].
+ * Represents internal [Polynomial] errors.
+ */
+internal class PolynomialError(message: String): Error(message)
+
+// region Constructors and converters
+
+/**
+ * Returns a [Polynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
+ * [reverse] parameter is true.
  */
 @Suppress("FunctionName")
-public fun <T> Polynomial(vararg coefficients: T): Polynomial<T> = Polynomial(coefficients.toList())
+public fun <T> Polynomial(coefficients: List<T>, reverse: Boolean = false): Polynomial<T> =
+    Polynomial(with(coefficients) { if (reverse) reversed() else this })
 
 /**
- * Evaluates the value of the given double polynomial for given double argument.
+ * Returns a [Polynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
+ * [reverse] parameter is true.
  */
-public fun Polynomial<Double>.value(arg: Double): Double = coefficients.reduceIndexed { index, acc, c ->
-    acc + c * arg.pow(index)
-}
+@Suppress("FunctionName")
+public fun <T> Polynomial(vararg coefficients: T, reverse: Boolean = false): Polynomial<T> =
+    Polynomial(with(coefficients) { if (reverse) reversed() else toList() })
+
+public fun <T> T.asPolynomial() : Polynomial<T> = Polynomial(listOf(this))
+
+// endregion
 
 /**
- * Evaluates the value of the given polynomial for given argument.
- * https://en.wikipedia.org/wiki/Horner%27s_method
- */
-public fun <T, C : Ring<T>> Polynomial<T>.value(ring: C, arg: T): T = ring {
-    if (coefficients.isEmpty()) return@ring zero
-    var result: T = coefficients.last()
-    for (j in coefficients.size - 2 downTo 0) {
-        result = (arg * result) + coefficients[j]
-    }
-    return result
-}
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <T, C : Ring<T>> Polynomial<T>.asFunction(ring: C): (T) -> T = { value(ring, it) }
-
-/**
- * Create a polynomial witch represents differentiated version of this polynomial
- */
-@UnstableKMathAPI
-public fun <T, A> Polynomial<T>.differentiate(
-    algebra: A,
-): Polynomial<T> where  A : Ring<T>, A : NumericAlgebra<T> = algebra {
-    Polynomial(coefficients.drop(1).mapIndexed { index, t -> number(index) * t })
-}
-
-/**
- * Create a polynomial witch represents indefinite integral version of this polynomial
- */
-@UnstableKMathAPI
-public fun <T, A> Polynomial<T>.integrate(
-    algebra: A,
-): Polynomial<T> where  A : Field<T>, A : NumericAlgebra<T> = algebra {
-    val integratedCoefficients = buildList(coefficients.size + 1) {
-        add(zero)
-        coefficients.forEachIndexed{ index, t -> add(t / (number(index) + one)) }
-    }
-    Polynomial(integratedCoefficients)
-}
-
-/**
- * Compute a definite integral of a given polynomial in a [range]
- */
-@UnstableKMathAPI
-public fun <T : Comparable<T>> Polynomial<T>.integrate(
-    algebra: Field<T>,
-    range: ClosedRange<T>,
-): T = algebra {
-    val integral = integrate(algebra)
-    integral.value(algebra, range.endInclusive) - integral.value(algebra, range.start)
-}
-
-/**
- * Space of polynomials.
+ * Space of polynomials constructed over ring.
  *
- * @param T the type of operated polynomials.
- * @param C the intersection of [Ring] of [T] and [ScaleOperations] of [T].
- * @param ring the [C] instance.
+ * @param C the type of constants. Polynomials have them as a coefficients in their terms.
+ * @param A type of underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
  */
-public class PolynomialSpace<T, C>(
-    private val ring: C,
-) : Group<Polynomial<T>>, ScaleOperations<Polynomial<T>> where C : Ring<T>, C : ScaleOperations<T> {
-    override val zero: Polynomial<T> = Polynomial(emptyList())
+@Suppress("INAPPLICABLE_JVM_NAME") // KT-31420
+public open class PolynomialSpace<C, A : Ring<C>>(
+    public val ring: A,
+) : AbstractPolynomialSpace<C, Polynomial<C>>{
+    // region Constant-integer relation
+    @JvmName("constantIntPlus")
+    public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
+    @JvmName("constantIntMinus")
+    public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
+    @JvmName("constantIntTimes")
+    public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
+    // endregion
 
-    override fun Polynomial<T>.unaryMinus(): Polynomial<T> = ring {
+    // region Integer-constant relation
+    @JvmName("intConstantPlus")
+    public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
+    @JvmName("intConstantMinus")
+    public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
+    @JvmName("intConstantTimes")
+    public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
+    // endregion
+
+    // region Polynomial-integer relation
+    public override operator fun Polynomial<C>.plus(other: Int): Polynomial<C> =
+        if (other == 0) this
+        else
+            Polynomial(
+                coefficients
+                    .toMutableList()
+                    .apply {
+                        if (isEmpty()) this[0] = ring.zero + other
+                        else this[0] = this[0]!! + other
+                    }
+            )
+    public override operator fun Polynomial<C>.minus(other: Int): Polynomial<C> =
+        if (other == 0) this
+        else
+            Polynomial(
+                coefficients
+                    .toMutableList()
+                    .apply {
+                        if (isEmpty()) this[0] = ring.zero - other
+                        else this[0] = this[0]!! - other
+                    }
+            )
+    public override operator fun Polynomial<C>.times(other: Int): Polynomial<C> =
+        if (other == 0) zero
+        else Polynomial(
+            coefficients
+                .subList(0, degree + 1)
+                .map { it * other }
+        )
+    // endregion
+
+    // region Integer-polynomial relation
+    public override operator fun Int.plus(other: Polynomial<C>): Polynomial<C> =
+        if (this == 0) other
+        else
+            Polynomial(
+                other.coefficients
+                    .toMutableList()
+                    .apply {
+                        if (isEmpty()) this[0] = ring.zero + this@plus
+                        else this[0] = this[0]!! + this@plus
+                    }
+            )
+    public override operator fun Int.minus(other: Polynomial<C>): Polynomial<C> =
+        if (this == 0) other
+        else
+            Polynomial(
+                other.coefficients
+                    .toMutableList()
+                    .apply {
+                        if (isEmpty()) this[0] = ring.zero - this@minus
+                        else this[0] = this[0]!! - this@minus
+                    }
+            )
+    public override operator fun Int.times(other: Polynomial<C>): Polynomial<C> =
+        if (this == 0) zero
+        else Polynomial(
+            other.coefficients
+                .subList(0, other.degree + 1)
+                .map { it * this }
+        )
+    // endregion
+
+    // region Constant-constant relation
+    @JvmName("constantUnaryMinus")
+    public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
+    @JvmName("constantPlus")
+    public override operator fun C.plus(other: C): C = ring { this@plus + other }
+    @JvmName("constantMinus")
+    public override operator fun C.minus(other: C): C = ring { this@minus - other }
+    @JvmName("constantTimes")
+    public override operator fun C.times(other: C): C = ring { this@times * other }
+    @JvmName("constantIsZero")
+    public override fun C.isZero(): Boolean = ring { this == zero }
+    @JvmName("constantIsNotZero")
+    public override fun C.isNotZero(): Boolean = ring { this != zero }
+    @JvmName("constantIsOne")
+    public override fun C.isOne(): Boolean = ring { this == one }
+    @JvmName("constantIsNotOne")
+    public override fun C.isNotOne(): Boolean = ring { this != one }
+    @JvmName("constantIsMinusOne")
+    public override fun C.isMinusOne(): Boolean = ring { this == -one }
+    @JvmName("constantIsNotMinusOne")
+    public override fun C.isNotMinusOne(): Boolean = ring { this != -one }
+    // endregion
+
+    // region Constant-polynomial relation
+    public override operator fun C.plus(other: Polynomial<C>): Polynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) Polynomial(listOf(this@plus))
+            else Polynomial(
+                toMutableList()
+                    .apply {
+                        this[0] += this@plus
+                    }
+            )
+        }
+//        if (degree == -1) UnivariatePolynomial(other) else UnivariatePolynomial(
+//            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
+//        )
+    public override operator fun C.minus(other: Polynomial<C>): Polynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) Polynomial(listOf(-this@minus))
+            else Polynomial(
+                toMutableList()
+                    .apply {
+                        this[0] -= this@minus
+                    }
+            )
+        }
+//        if (degree == -1) UnivariatePolynomial(other) else UnivariatePolynomial(
+//            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
+//        )
+    public override operator fun C.times(other: Polynomial<C>): Polynomial<C> =
+        Polynomial(
+            other.coefficients
+//                .subList(0, other.degree + 1)
+                .map { it * this }
+        )
+    // endregion
+
+    // region Polynomial-constant relation
+    public override operator fun Polynomial<C>.plus(other: C): Polynomial<C> =
+        if (other.isZero()) this
+        else with(coefficients) {
+            if (isEmpty()) Polynomial(listOf(other))
+            else Polynomial(
+                toMutableList()
+                    .apply {
+                        this[0] += other
+                    }
+            )
+        }
+//        if (degree == -1) UnivariatePolynomial(other) else UnivariatePolynomial(
+//            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
+//        )
+    public override operator fun Polynomial<C>.minus(other: C): Polynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) Polynomial(listOf(other))
+            else Polynomial(
+                toMutableList()
+                    .apply {
+                        this[0] -= other
+                    }
+            )
+        }
+//        if (degree == -1) UnivariatePolynomial(-other) else UnivariatePolynomial(
+//            listOf(coefficients[0] - other) + coefficients.subList(1, degree + 1)
+//        )
+    public override operator fun Polynomial<C>.times(other: C): Polynomial<C> =
+        Polynomial(
+            coefficients
+//                .subList(0, degree + 1)
+                .map { it * other }
+        )
+    // endregion
+
+    // region Polynomial-polynomial relation
+    public override operator fun Polynomial<C>.unaryMinus(): Polynomial<C> =
         Polynomial(coefficients.map { -it })
-    }
-
-    override fun add(left: Polynomial<T>, right: Polynomial<T>): Polynomial<T> {
-        val dim = max(left.coefficients.size, right.coefficients.size)
-
-        return ring {
-            Polynomial(List(dim) { index ->
-                left.coefficients.getOrElse(index) { zero } + right.coefficients.getOrElse(index) { zero }
-            })
+    public override operator fun Polynomial<C>.plus(other: Polynomial<C>): Polynomial<C> =
+        Polynomial(
+            (0..max(degree, other.degree))
+                .map {
+                    when {
+                        it > degree -> other.coefficients[it]
+                        it > other.degree -> coefficients[it]
+                        else -> coefficients[it] + other.coefficients[it]
+                    }
+                }
+                .ifEmpty { listOf(ring.zero) }
+        )
+    public override operator fun Polynomial<C>.minus(other: Polynomial<C>): Polynomial<C> =
+        Polynomial(
+            (0..max(degree, other.degree))
+                .map {
+                    when {
+                        it > degree -> -other.coefficients[it]
+                        it > other.degree -> coefficients[it]
+                        else -> coefficients[it] - other.coefficients[it]
+                    }
+                }
+                .ifEmpty { listOf(ring.zero) }
+        )
+    public override operator fun Polynomial<C>.times(other: Polynomial<C>): Polynomial<C> {
+        val thisDegree = degree
+        val otherDegree = other.degree
+        return when {
+            thisDegree == -1 -> this
+            otherDegree == -1 -> other
+            else ->
+                Polynomial(
+                    (0..(thisDegree + otherDegree))
+                        .map { d ->
+                            (max(0, d - otherDegree)..(min(thisDegree, d)))
+                                .map { coefficients[it] * other.coefficients[d - it] }
+                                .reduce { acc, rational -> acc + rational }
+                        }
+                )
         }
     }
 
-    override fun scale(a: Polynomial<T>, value: Double): Polynomial<T> =
-        ring { Polynomial(List(a.coefficients.size) { index -> a.coefficients[index] * value }) }
+    public override fun Polynomial<C>.isZero(): Boolean = coefficients.all { it.isZero() }
+    public override fun Polynomial<C>.isNotZero(): Boolean = coefficients.any { it.isNotZero() }
+    public override fun Polynomial<C>.isOne(): Boolean =
+        with(coefficients) { isNotEmpty() && asSequence().withIndex().any { (index, c) -> if (index == 0) c.isOne() else c.isZero() } } // TODO: It's better to write new methods like `anyIndexed`. But what's better way to do it?
+    public override fun Polynomial<C>.isNotOne(): Boolean = !isOne()
+    public override fun Polynomial<C>.isMinusOne(): Boolean =
+        with(coefficients) { isNotEmpty() && asSequence().withIndex().any { (index, c) -> if (index == 0) c.isMinusOne() else c.isZero() } } // TODO: It's better to write new methods like `anyIndexed`. But what's better way to do it?
+    public override fun Polynomial<C>.isNotMinusOne(): Boolean = !isMinusOne()
+
+    override val zero: Polynomial<C> = Polynomial(emptyList())
+    override val one: Polynomial<C> = Polynomial(listOf(ring.one))
+
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    public override fun Polynomial<C>.equals(other: Polynomial<C>): Boolean =
+        when {
+            this === other -> true
+            else -> {
+                if (this.degree == other.degree)
+                    (0..degree).all { coefficients[it] == other.coefficients[it] }
+                else false
+            }
+        }
+    // endregion
+
+    // Not sure is it necessary...
+    // region Polynomial properties
+    public override val Polynomial<C>.degree: Int get() = coefficients.indexOfLast { it != ring.zero }
+
+    public override fun Polynomial<C>.asConstantOrNull(): C? =
+        with(coefficients) {
+            when {
+                isEmpty() -> ring.zero
+                degree > 0 -> null
+                else -> first()
+            }
+        }
+    public override fun Polynomial<C>.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
+
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun Polynomial<C>.substitute(argument: C): C = this.substitute(ring, argument)
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun Polynomial<C>.substitute(argument: Polynomial<C>): Polynomial<C> = this.substitute(ring, argument)
+
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun Polynomial<C>.asFunction(): (C) -> C = { this.substitute(ring, it) }
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun Polynomial<C>.asFunctionOnConstants(): (C) -> C = { this.substitute(ring, it) }
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun Polynomial<C>.asFunctionOnPolynomials(): (Polynomial<C>) -> Polynomial<C> = { this.substitute(ring, it) }
 
     /**
      * Evaluates the polynomial for the given value [arg].
      */
-    public operator fun Polynomial<T>.invoke(arg: T): T = value(ring, arg)
-
-    public fun Polynomial<T>.asFunction(): (T) -> T = asFunction(ring)
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun Polynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun Polynomial<C>.invoke(argument: Polynomial<C>): Polynomial<C> = this.substitute(ring, argument)
+    // endregion
 
 }
 
-public inline fun <T, C, R> C.polynomial(block: PolynomialSpace<T, C>.() -> R): R where C : Ring<T>, C : ScaleOperations<T> {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return PolynomialSpace(this).block()
+/**
+ * Space of polynomials constructed over ring.
+ *
+ * @param C the type of constants. Polynomials have them as a coefficients in their terms.
+ * @param A type of underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
+ */
+public class ScalablePolynomialSpace<C, A>(
+    ring: A,
+) : PolynomialSpace<C, A>(ring), ScaleOperations<Polynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
+
+    override fun scale(a: Polynomial<C>, value: Double): Polynomial<C> =
+        ring { Polynomial(List(a.coefficients.size) { index -> a.coefficients[index] * value }) }
+
 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
new file mode 100644
index 000000000..1a3eb7874
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.jvm.JvmName
+import kotlin.math.pow
+
+
+// region Utilities
+
+/**
+ * Removes zeros on the end of the coefficient list of polynomial.
+ */
+//context(PolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> Polynomial<C>.removeZeros() : Polynomial<C> =
+//    if (degree > -1) Polynomial(coefficients.subList(0, degree + 1)) else zero
+
+/**
+ * Crates a [PolynomialSpace] over received ring.
+ */
+public fun <C, A : Ring<C>> A.polynomial(): PolynomialSpace<C, A> =
+    PolynomialSpace(this)
+
+/**
+ * Crates a [PolynomialSpace]'s scope over received ring.
+ */
+public inline fun <C, A : Ring<C>, R> A.polynomial(block: PolynomialSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return PolynomialSpace(this).block()
+}
+
+/**
+ * Crates a [ScalablePolynomialSpace] over received scalable ring.
+ */
+public fun <C, A> A.scalablePolynomial(): ScalablePolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C> =
+    ScalablePolynomialSpace(this)
+
+/**
+ * Crates a [ScalablePolynomialSpace]'s scope over received scalable ring.
+ */
+public inline fun <C, A, R> A.scalablePolynomial(block: ScalablePolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return ScalablePolynomialSpace(this).block()
+}
+
+// endregion
+
+// region Polynomial substitution and functional representation
+
+// TODO: May be apply Horner's method too?
+/**
+ * Evaluates the value of the given double polynomial for given double argument.
+ */
+public fun Polynomial<Double>.substitute(arg: Double): Double =
+    coefficients.reduceIndexedOrNull { index, acc, c ->
+        acc + c * arg.pow(index)
+    } ?: .0
+
+/**
+ * Evaluates the value of the given polynomial for given argument.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */
+public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
+    if (coefficients.isEmpty()) return@ring zero
+    var result: C = coefficients.last()
+    for (j in coefficients.size - 2 downTo 0) {
+        result = (arg * result) + coefficients[j]
+    }
+    return result
+}
+
+// TODO: (Waiting for hero) Replace with optimisation: the [result] may be unboxed, and all operations may be performed
+//  as soon as possible on it
+public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: Polynomial<C>) : Polynomial<C> = ring.polynomial {
+    if (coefficients.isEmpty()) return zero
+    var result: Polynomial<C> = coefficients.last().asPolynomial()
+    for (j in coefficients.size - 2 downTo 0) {
+        result = (arg * result) + coefficients[j]
+    }
+    return result
+}
+
+/**
+ * Represent the polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> Polynomial<C>.asFunction(ring: A): (C) -> C = { substitute(ring, it) }
+
+/**
+ * Represent the polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> Polynomial<C>.asPolynomialFunctionOver(ring: A): (Polynomial<C>) -> Polynomial<C> = { substitute(ring, it) }
+
+// endregion
+
+// region Algebraic derivative and antiderivative
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> Polynomial<C>.derivative(
+    algebra: A,
+): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
+    Polynomial(coefficients.drop(1).mapIndexed { index, t -> number(index) * t })
+}
+
+/**
+ * Create a polynomial witch represents indefinite integral version of this polynomial
+ */
+@UnstableKMathAPI
+public fun <C, A> Polynomial<C>.antiderivative(
+    algebra: A,
+): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
+    val integratedCoefficients = buildList(coefficients.size + 1) {
+        add(zero)
+        coefficients.forEachIndexed{ index, t -> add(t / (number(index) + one)) }
+    }
+    Polynomial(integratedCoefficients)
+}
+
+/**
+ * Compute a definite integral of a given polynomial in a [range]
+ */
+@UnstableKMathAPI
+public fun <C : Comparable<C>> Polynomial<C>.integrate(
+    algebra: Field<C>,
+    range: ClosedRange<C>,
+): C = algebra {
+    val integral = antiderivative(algebra)
+    integral.substitute(algebra, range.endInclusive) - integral.substitute(algebra, range.start)
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index eb88d9ae0..0fcd4c6e5 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.integration
 
 import space.kscience.kmath.functions.PiecewisePolynomial
 import space.kscience.kmath.functions.integrate
+import space.kscience.kmath.functions.antiderivative
 import space.kscience.kmath.interpolation.PolynomialInterpolator
 import space.kscience.kmath.interpolation.SplineInterpolator
 import space.kscience.kmath.interpolation.interpolatePolynomials
@@ -23,7 +24,7 @@ import space.kscience.kmath.structures.MutableBufferFactory
 @OptIn(PerformancePitfall::class)
 @UnstableKMathAPI
 public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(algebra: Field<T>): PiecewisePolynomial<T> =
-    PiecewisePolynomial(pieces.map { it.first to it.second.integrate(algebra) })
+    PiecewisePolynomial(pieces.map { it.first to it.second.antiderivative(algebra) })
 
 /**
  * Compute definite integral of given [PiecewisePolynomial] piece by piece in a given [range]
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
index 2266092a3..62819be0c 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
@@ -10,7 +10,7 @@ package space.kscience.kmath.interpolation
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.functions.PiecewisePolynomial
 import space.kscience.kmath.functions.asFunction
-import space.kscience.kmath.functions.value
+import space.kscience.kmath.functions.substitute
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.structures.Buffer
@@ -34,7 +34,7 @@ public interface PolynomialInterpolator<T : Comparable<T>> : Interpolator<T, T,
     public fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T>
 
     override fun interpolate(points: XYColumnarData<T, T, T>): (T) -> T = { x ->
-        interpolatePolynomials(points).value(algebra, x) ?: getDefaultValue()
+        interpolatePolynomials(points).substitute(algebra, x) ?: getDefaultValue()
     }
 }
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
index 05c16d17e..e0f0e32a4 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
@@ -5,13 +5,22 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.operations.algebra
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class PolynomialTest {
+    @Test
+    fun simple_polynomial_test() {
+        Double.algebra.scalablePolynomial {
+            val x = Polynomial(listOf(0.0, 1.0))
+            val polynomial = x * x - 2 * x + 1
+            assertEquals(0.0, polynomial.substitute(1.0), 0.001)
+        }
+    }
     @Test
     fun testIntegration() {
         val polynomial = Polynomial(1.0, -2.0, 1.0)
-        assertEquals(0.0, polynomial.value(1.0), 0.001)
+        assertEquals(0.0, polynomial.substitute(1.0), 0.001)
     }
 }
\ No newline at end of file
-- 
2.34.1


From cab59581071d25e2a569ad3bb13eb799e42e046f Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Thu, 10 Mar 2022 01:44:14 +0300
Subject: [PATCH 423/713] Added abstract rational functions

---
 .../kmath/functions/AbstractPolynomial.kt     |  16 +-
 .../functions/AbstractRationalFunction.kt     | 507 ++++++++++++++++++
 2 files changed, 515 insertions(+), 8 deletions(-)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
index f6a617656..237a72bcc 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -70,19 +70,19 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
 
     // region Polynomial-integer relation
     /**
-     * Returns sum of the constant and the integer represented as polynomial.
+     * Returns sum of the polynomial and the integer represented as polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public operator fun P.plus(other: Int): P = optimizedAddMultiplied(this, one, other)
     /**
-     * Returns difference between the constant and the integer represented as polynomial.
+     * Returns difference between the polynomial and the integer represented as polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public operator fun P.minus(other: Int): P = optimizedAddMultiplied(this, one, -other)
     /**
-     * Returns product of the constant and the integer represented as polynomial.
+     * Returns product of the polynomial and the integer represented as polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
@@ -91,19 +91,19 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
 
     // region Integer-polynomial relation
     /**
-     * Returns sum of the integer represented as polynomial and the constant.
+     * Returns sum of the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public operator fun Int.plus(other: P): P = optimizedAddMultiplied(other, one, this)
     /**
-     * Returns difference between the integer represented as polynomial and the constant.
+     * Returns difference between the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public operator fun Int.minus(other: P): P = optimizedAddMultiplied(-other, one, this)
     /**
-     * Returns product of the integer represented as polynomial and the constant.
+     * Returns product of the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -254,11 +254,11 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
      */
-    override val zero: P
+    public override val zero: P
     /**
      * Instance of unit polynomial (unit of the polynomial ring).
      */
-    override val one: P
+    public override val one: P
 
     /**
      * Checks equality of the polynomials.
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
new file mode 100644
index 000000000..5cb570c9f
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -0,0 +1,507 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedAddMultiplied
+import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedMultiply
+import space.kscience.kmath.operations.*
+import kotlin.js.JsName
+import kotlin.jvm.JvmName
+
+
+/**
+ * Abstraction of rational function.
+ */
+public interface AbstractRationalFunction<C, P: AbstractPolynomial<C>>
+
+@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R: AbstractRationalFunction<C, P>> : Ring<R> {
+    // region Constant-integer relation
+    /**
+     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     */
+    @JvmName("constantIntPlus")
+    public operator fun C.plus(other: Int): C
+    /**
+     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    @JvmName("constantIntMinus")
+    public operator fun C.minus(other: Int): C
+    /**
+     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    @JvmName("constantIntTimes")
+    public operator fun C.times(other: Int): C
+    // endregion
+
+    // region Integer-constant relation
+    /**
+     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    @JvmName("intConstantPlus")
+    public operator fun Int.plus(other: C): C
+    /**
+     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    @JvmName("intConstantMinus")
+    public operator fun Int.minus(other: C): C
+    /**
+     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    @JvmName("intConstantTimes")
+    public operator fun Int.times(other: C): C
+    // endregion
+
+    // region Polynomial-integer relation
+    /**
+     * Returns sum of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public operator fun P.plus(other: Int): P
+    /**
+     * Returns difference between the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public operator fun P.minus(other: Int): P
+    /**
+     * Returns product of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public operator fun P.times(other: Int): P
+    // endregion
+
+    // region Integer-polynomial relation
+    /**
+     * Returns sum of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public operator fun Int.plus(other: P): P
+    /**
+     * Returns difference between the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public operator fun Int.minus(other: P): P
+    /**
+     * Returns product of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public operator fun Int.times(other: P): P
+    // endregion
+
+    // region Rational-integer relation
+    /**
+     * Returns sum of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public operator fun R.plus(other: Int): R = optimizedAddMultiplied(this, one, other)
+    /**
+     * Returns difference between the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public operator fun R.minus(other: Int): R = optimizedAddMultiplied(this, one, -other)
+    /**
+     * Returns product of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public operator fun R.times(other: Int): R = optimizedMultiply(this, other)
+    // endregion
+
+    // region Integer-Rational relation
+    /**
+     * Returns sum of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public operator fun Int.plus(other: R): R = optimizedAddMultiplied(other, one, this)
+    /**
+     * Returns difference between the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public operator fun Int.minus(other: R): R = optimizedAddMultiplied(-other, one, this)
+    /**
+     * Returns product of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public operator fun Int.times(other: R): R = optimizedMultiply(other, this)
+    // endregion
+
+    // region Constant-constant relation
+    /**
+     * Returns the same constant.
+     */
+    @JvmName("constantUnaryPlus")
+    @JsName("constantUnaryPlus")
+    public operator fun C.unaryPlus(): C = this
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("constantUnaryMinus")
+    @JsName("constantUnaryMinus")
+    public operator fun C.unaryMinus(): C
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("constantPlus")
+    @JsName("constantPlus")
+    public operator fun C.plus(other: C): C
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("constantMinus")
+    @JsName("constantMinus")
+    public operator fun C.minus(other: C): C
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("constantTimes")
+    @JsName("constantTimes")
+    public operator fun C.times(other: C): C
+
+    /**
+     * Check if the instant is zero constant.
+     */
+    @JvmName("constantIsZero")
+    public fun C.isZero(): Boolean
+    /**
+     * Check if the instant is NOT zero constant.
+     */
+    @JvmName("constantIsNotZero")
+    public fun C.isNotZero(): Boolean
+    /**
+     * Check if the instant is unit constant.
+     */
+    @JvmName("constantIsOne")
+    public fun C.isOne(): Boolean
+    /**
+     * Check if the instant is NOT unit constant.
+     */
+    @JvmName("constantIsNotOne")
+    public fun C.isNotOne(): Boolean
+    /**
+     * Check if the instant is minus unit constant.
+     */
+    @JvmName("constantIsMinusOne")
+    public fun C.isMinusOne(): Boolean
+    /**
+     * Check if the instant is NOT minus unit constant.
+     */
+    @JvmName("constantIsNotMinusOne")
+    public fun C.isNotMinusOne(): Boolean
+    // endregion
+
+    // region Constant-polynomial relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.plus(other: P): P
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.minus(other: P): P
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.times(other: P): P
+    // endregion
+
+    // region Polynomial-constant relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.plus(other: C): P
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.minus(other: C): P
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.times(other: C): P
+    // endregion
+
+    // region Polynomial-polynomial relation
+    /**
+     * Returns the same polynomial.
+     */
+    public operator fun P.unaryPlus(): P = this
+    /**
+     * Returns negation of the polynomial.
+     */
+    public operator fun P.unaryMinus(): P
+    /**
+     * Returns sum of the polynomials.
+     */
+    public operator fun P.plus(other: P): P
+    /**
+     * Returns difference of the polynomials.
+     */
+    public operator fun P.minus(other: P): P
+    /**
+     * Returns product of the polynomials.
+     */
+    public operator fun P.times(other: P): P
+
+    /**
+     * Check if the instant is zero polynomial.
+     */
+    public fun P.isZero(): Boolean = this == zeroPolynomial
+    /**
+     * Check if the instant is NOT zero polynomial.
+     */
+    public fun P.isNotZero(): Boolean = this != zeroPolynomial
+    /**
+     * Check if the instant is unit polynomial.
+     */
+    public fun P.isOne(): Boolean = this == onePolynomial
+    /**
+     * Check if the instant is NOT unit polynomial.
+     */
+    public fun P.isNotOne(): Boolean = this != onePolynomial
+    /**
+     * Check if the instant is minus unit polynomial.
+     */
+    public fun P.isMinusOne(): Boolean = this == -onePolynomial
+    /**
+     * Check if the instant is NOT minus unit polynomial.
+     */
+    public fun P.isNotMinusOne(): Boolean = this != -onePolynomial
+
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
+    public val zeroPolynomial: P
+    /**
+     * Instance of unit polynomial (unit of the polynomial ring).
+     */
+    public val onePolynomial: P
+
+    /**
+     * Checks equality of the polynomials.
+     */
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    public fun P.equals(other: P): Boolean
+    // endregion
+
+    // region Constant-rational relation
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public operator fun C.plus(other: R): R
+    /**
+     * Returns difference between the constant represented as polynomial and the rational function.
+     */
+    public operator fun C.minus(other: R): R
+    /**
+     * Returns product of the constant represented as polynomial and the rational function.
+     */
+    public operator fun C.times(other: R): R
+    // endregion
+
+    // region Rational-constant relation
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public operator fun R.plus(other: C): R
+    /**
+     * Returns difference between the constant represented as rational function and the rational function.
+     */
+    public operator fun R.minus(other: C): R
+    /**
+     * Returns product of the constant represented as rational function and the rational function.
+     */
+    public operator fun R.times(other: C): R
+    // endregion
+
+    // region Polynomial-rational relation
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public operator fun P.plus(other: R): R
+    /**
+     * Returns difference between the polynomial represented as polynomial and the rational function.
+     */
+    public operator fun P.minus(other: R): R
+    /**
+     * Returns product of the polynomial represented as polynomial and the rational function.
+     */
+    public operator fun P.times(other: R): R
+    // endregion
+
+    // region Rational-polynomial relation
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public operator fun R.plus(other: P): R
+    /**
+     * Returns difference between the polynomial represented as rational function and the rational function.
+     */
+    public operator fun R.minus(other: P): R
+    /**
+     * Returns product of the polynomial represented as rational function and the rational function.
+     */
+    public operator fun R.times(other: P): R
+    // endregion
+
+    // region Rational-rational relation
+    /**
+     * Returns the same rational function.
+     */
+    public override operator fun R.unaryPlus(): R = this
+    /**
+     * Returns negation of the rational function.
+     */
+    public override operator fun R.unaryMinus(): R
+    /**
+     * Returns sum of the rational functions.
+     */
+    public override operator fun R.plus(other: R): R
+    /**
+     * Returns difference of the rational functions.
+     */
+    public override operator fun R.minus(other: R): R
+    /**
+     * Returns product of the rational functions.
+     */
+    public override operator fun R.times(other: R): R
+
+    /**
+     * Check if the instant is zero rational function.
+     */
+    public fun R.isZero(): Boolean = this == zero
+    /**
+     * Check if the instant is NOT zero rational function.
+     */
+    public fun R.isNotZero(): Boolean = this != zero
+    /**
+     * Check if the instant is unit rational function.
+     */
+    public fun R.isOne(): Boolean = this == one
+    /**
+     * Check if the instant is NOT unit rational function.
+     */
+    public fun R.isNotOne(): Boolean = this != one
+    /**
+     * Check if the instant is minus unit rational function.
+     */
+    public fun R.isMinusOne(): Boolean = this == -one
+    /**
+     * Check if the instant is NOT minus unit rational function.
+     */
+    public fun R.isNotMinusOne(): Boolean = this != -one
+
+    /**
+     * Instance of zero rational function (zero of the rational functions ring).
+     */
+    public override val zero: R
+    /**
+     * Instance of unit polynomial (unit of the rational functions ring).
+     */
+    public override val one: R
+
+    /**
+     * Checks equality of the rational functions.
+     */
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    public fun R.equals(other: R): Boolean
+    // endregion
+
+    // Not sure is it necessary...
+    // region Polynomial properties
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    public val P.degree: Int
+
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isConstant(): Boolean = degree <= 0
+    /**
+     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNotConstant(): Boolean = !isConstant()
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNonZeroConstant(): Boolean = degree == 0
+    /**
+     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
+
+    public fun P.asConstantOrNull(): C?
+
+    public fun P.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
+
+    // endregion
+
+    // Not sure is it necessary...
+    // region Polynomial properties
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun R.isConstant(): Boolean
+    /**
+     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun R.isNotConstant(): Boolean = !isConstant()
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun R.isNonZeroConstant(): Boolean
+    /**
+     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun R.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
+
+    public fun R.asConstantOrNull(): C?
+
+    public fun R.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
+
+    // TODO: Перенести в реализацию
+//    fun R.substitute(argument: C): C
+//    fun R.substitute(argument: P): R
+//    fun R.substitute(argument: R): R
+//
+//    fun R.asFunction(): (C) -> C = /*this::substitute*/ { this.substitute(it) }
+//    fun R.asFunctionOnConstants(): (C) -> C = /*this::substitute*/ { this.substitute(it) }
+//    fun P.asFunctionOnPolynomials(): (P) -> R = /*this::substitute*/ { this.substitute(it) }
+//    fun R.asFunctionOnRationalFunctions(): (R) -> R = /*this::substitute*/ { this.substitute(it) }
+//
+//    operator fun R.invoke(argument: C): C = this.substitute(argument)
+//    operator fun R.invoke(argument: P): R = this.substitute(argument)
+//    operator fun R.invoke(argument: R): R = this.substitute(argument)
+    // endregion
+
+    // region Legacy
+    override fun add(left: R, right: R): R = left + right
+    override fun multiply(left: R, right: R): R = left * right
+    // endregion
+}
\ No newline at end of file
-- 
2.34.1


From 571c6342ddcead43bbcd99b1583e86366212f802 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 13 Mar 2022 03:25:25 +0300
Subject: [PATCH 424/713] Regenerated READMEs

---
 README.md                  |  4 ++--
 kmath-ast/README.md        | 47 +++++++++++++++++++++++++++++---------
 kmath-complex/README.md    |  6 ++---
 kmath-core/README.md       |  6 ++---
 kmath-ejml/README.md       |  6 ++---
 kmath-for-real/README.md   |  6 ++---
 kmath-functions/README.md  |  6 ++---
 kmath-jafama/README.md     |  6 ++---
 kmath-kotlingrad/README.md |  6 ++---
 kmath-nd4j/README.md       |  6 ++---
 kmath-tensors/README.md    |  6 ++---
 11 files changed, 65 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index 99dd6d00f..76b8ce2f7 100644
--- a/README.md
+++ b/README.md
@@ -308,8 +308,8 @@ repositories {
 }
 
 dependencies {
-    api("space.kscience:kmath-core:0.3.0-dev-17")
-    // api("space.kscience:kmath-core-jvm:0.3.0-dev-17") for jvm-specific version
+    api("space.kscience:kmath-core:0.3.0-dev-19")
+    // api("space.kscience:kmath-core-jvm:0.3.0-dev-19") for jvm-specific version
 }
 ```
 
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index bedf17486..9411befe3 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -10,7 +10,7 @@ Extensions to MST API: transformations, dynamic compilation and visualization.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-ast:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.0-dev-17")
+    implementation("space.kscience:kmath-ast:0.3.0-dev-19")
 }
 ```
 
@@ -66,20 +66,19 @@ For example, the following code:
 
 ```kotlin
 import space.kscience.kmath.asm.compileToExpression
-import space.kscience.kmath.complex.ComplexField
+import space.kscience.kmath.operations.DoubleField
 
-"x+2".parseMath().compileToExpression(ComplexField)
+"x^3-x+3".parseMath().compileToExpression(DoubleField)
 ```
 
 &mldr; leads to generation of bytecode, which can be decompiled to the following Java class:
 
 ```java
-import java.util.Map;
-import kotlin.jvm.functions.Function2;
-import space.kscience.kmath.asm.internal.MapIntrinsics;
-import space.kscience.kmath.complex.Complex;
-import space.kscience.kmath.expressions.Expression;
-import space.kscience.kmath.expressions.Symbol;
+import java.util.*;
+import kotlin.jvm.functions.*;
+import space.kscience.kmath.asm.internal.*;
+import space.kscience.kmath.complex.*;
+import space.kscience.kmath.expressions.*;
 
 public final class CompiledExpression_45045_0 implements Expression<Complex> {
     private final Object[] constants;
@@ -91,6 +90,32 @@ public final class CompiledExpression_45045_0 implements Expression<Complex> {
 }
 ```
 
+For `LongRing`, `IntRing`, and `DoubleField` specialization is supported for better performance:
+
+```java
+import java.util.*;
+import space.kscience.kmath.asm.internal.*;
+import space.kscience.kmath.expressions.*;
+
+public final class CompiledExpression_-386104628_0 implements DoubleExpression {
+    private final SymbolIndexer indexer;
+
+    public SymbolIndexer getIndexer() {
+        return this.indexer;
+    }
+
+    public double invoke(double[] arguments) {
+        double var2 = arguments[0];
+        return Math.pow(var2, 3.0D) - var2 + 3.0D;
+    }
+
+    public final Double invoke(Map<Symbol, ? extends Double> arguments) {
+        double var2 = ((Double)MapIntrinsics.getOrFail(arguments, "x")).doubleValue();
+        return Math.pow(var2, 3.0D) - var2 + 3.0D;
+    }
+}
+```
+
 Setting JVM system property `space.kscience.kmath.ast.dump.generated.classes` to `1` makes the translator dump class files to program's working directory, so they can be reviewed manually.
 
 #### Limitations
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index 92f2435ba..cfaf43aa1 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -8,7 +8,7 @@ Complex and hypercomplex number systems in KMath.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-complex:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-complex:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-complex:0.3.0-dev-17")
+    implementation("space.kscience:kmath-complex:0.3.0-dev-19")
 }
 ```
diff --git a/kmath-core/README.md b/kmath-core/README.md
index e765ad50c..4e980baf5 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -15,7 +15,7 @@ performance calculations to code generation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-core:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-core:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -36,6 +36,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-core:0.3.0-dev-17")
+    implementation("space.kscience:kmath-core:0.3.0-dev-19")
 }
 ```
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index fcd092bf1..24b36aa0d 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -9,7 +9,7 @@ EJML based linear algebra implementation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ejml:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-ejml:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ejml:0.3.0-dev-17")
+    implementation("space.kscience:kmath-ejml:0.3.0-dev-19")
 }
 ```
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index 938327612..f6b02e6ad 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -9,7 +9,7 @@ Specialization of KMath APIs for Double numbers.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-for-real:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-for-real:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-for-real:0.3.0-dev-17")
+    implementation("space.kscience:kmath-for-real:0.3.0-dev-19")
 }
 ```
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index 3d4beee47..a7f4f9b6f 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -11,7 +11,7 @@ Functions and interpolations.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-functions:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-functions:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-functions:0.3.0-dev-17")
+    implementation("space.kscience:kmath-functions:0.3.0-dev-19")
 }
 ```
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index 760244751..3e0d9c418 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -7,7 +7,7 @@ Integration with [Jafama](https://github.com/jeffhain/jafama).
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-jafama:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-jafama:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-jafama:0.3.0-dev-17")
+    implementation("space.kscience:kmath-jafama:0.3.0-dev-19")
 }
 ```
 
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
index 588ccb9b4..422ce4fb0 100644
--- a/kmath-kotlingrad/README.md
+++ b/kmath-kotlingrad/README.md
@@ -8,7 +8,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-17")
+    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-19")
 }
 ```
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index 7ca9cd4fd..23d529e72 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -9,7 +9,7 @@ ND4J based implementations of KMath abstractions.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-nd4j:0.3.0-dev-17")
+    implementation("space.kscience:kmath-nd4j:0.3.0-dev-19")
 }
 ```
 
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index 42ce91336..93f78e895 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -9,7 +9,7 @@ Common linear algebra operations on tensors.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-19`.
 
 **Gradle:**
 ```gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensors:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-tensors:0.3.0-dev-19'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensors:0.3.0-dev-17")
+    implementation("space.kscience:kmath-tensors:0.3.0-dev-19")
 }
 ```
-- 
2.34.1


From 93de1d53116b29391797f68972c0f6bf144857d6 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 13 Mar 2022 03:27:00 +0300
Subject: [PATCH 425/713] Added support for all polynomials. But standard
 utilities still are not fully implemented.

---
 .../kmath/functions/AbstractPolynomial.kt     |  47 +-
 .../functions/AbstractRationalFunction.kt     |   2 -
 .../kmath/functions/LabeledPolynomial.kt      | 927 ++++++++++++++++++
 .../kmath/functions/NumberedPolynomial.kt     | 689 +++++++++++++
 .../kscience/kmath/functions/Polynomial.kt    | 151 ++-
 .../kscience/kmath/functions/Variable.kt      |  38 +
 .../kscience/kmath/functions/algebraicStub.kt |  51 +
 .../kmath/functions/labeledPolynomialUtil.kt  | 490 +++++++++
 .../kmath/functions/numberedPolynomialUtil.kt | 605 ++++++++++++
 .../kmath/functions/polynomialUtil.kt         |   6 +-
 10 files changed, 2911 insertions(+), 95 deletions(-)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Variable.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
index 237a72bcc..b7b7116f0 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -17,6 +17,9 @@ public interface AbstractPolynomial<C>
 
 /**
  * Abstraction of ring of polynomials of type [P] over ring of constants of type [C].
+ *
+ * @param C the type of constants. Polynomials have them as a coefficients in their terms.
+ * @param P the type of polynomials.
  */
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
 public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P> {
@@ -307,48 +310,4 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
     override fun add(left: P, right: P): P = left + right
     override fun multiply(left: P, right: P): P = left * right
     // endregion
-
-    public companion object {
-        // TODO: All of this should be moved to algebraic structures' place for utilities
-        // TODO: Move receiver to context receiver
-        /**
-         * Multiplication of element and integer.
-         *
-         * @receiver the multiplicand.
-         * @param other the multiplier.
-         * @return the difference.
-         */
-        internal tailrec fun <C> Group<C>.optimizedMultiply(arg: C, other: Int): C =
-            when {
-                other == 0 -> zero
-                other == 1 -> arg
-                other == -1 -> -arg
-                other % 2 == 0 -> optimizedMultiply(arg + arg, other / 2)
-                other % 2 == 1 -> optimizedAddMultiplied(arg, arg + arg, other / 2)
-                other % 2 == -1 -> optimizedAddMultiplied(-arg, arg + arg, other / 2)
-                else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
-            }
-
-        // TODO: Move receiver to context receiver
-        /**
-         * Adds product of [arg] and [multiplier] to [base].
-         *
-         * @receiver the algebra to provide multiplication.
-         * @param base the augend.
-         * @param arg the multiplicand.
-         * @param multiplier the multiplier.
-         * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
-         * @author Gleb Minaev
-         */
-        internal tailrec fun <C> Group<C>.optimizedAddMultiplied(base: C, arg: C, multiplier: Int): C =
-            when {
-                multiplier == 0 -> base
-                multiplier == 1 -> base + arg
-                multiplier == -1 -> base - arg
-                multiplier % 2 == 0 -> optimizedAddMultiplied(base, arg + arg, multiplier / 2)
-                multiplier % 2 == 1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
-                multiplier % 2 == -1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
-                else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
-            }
-    }
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
index 5cb570c9f..34050aa0f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -5,8 +5,6 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedAddMultiplied
-import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedMultiply
 import space.kscience.kmath.operations.*
 import kotlin.js.JsName
 import kotlin.jvm.JvmName
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
new file mode 100644
index 000000000..48f6f57fa
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -0,0 +1,927 @@
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.experimental.ExperimentalTypeInference
+import kotlin.jvm.JvmName
+import kotlin.math.max
+
+
+/**
+ * Represents multivariate polynomials with labeled variables.
+ *
+ * @param C Ring in which the polynomial is considered.
+ */
+public class LabeledPolynomial<C>
+internal constructor(
+    /**
+     * Map that collects coefficients of the polynomial. Every non-zero monomial
+     * `a x_1^{d_1} ... x_n^{d_n}` is represented as pair "key-value" in the map, where value is coefficients `a` and
+     * key is map that associates variables in the monomial with multiplicity of them occurring in the monomial.
+     * For example polynomial
+     * ```
+     * 5 a^2 c^3 - 6 b + 0 b c
+     * ```
+     * has coefficients represented as
+     * ```
+     * mapOf(
+     *      mapOf(
+     *          a to 2,
+     *          c to 3
+     *      ) to 5,
+     *      mapOf(
+     *          b to 1
+     *      ) to (-6)
+     * )
+     * ```
+     * where `a`, `b` and `c` are corresponding [Variable] objects.
+     */
+    public val coefficients: Map<Map<Variable, UInt>, C>
+) : AbstractPolynomial<C> {
+    override fun toString(): String = "LabeledPolynomial$coefficients"
+}
+
+// region Internal utilities
+
+/**
+ * Represents internal [LabeledPolynomial] errors.
+ */
+internal class LabeledPolynomialError: Error {
+    constructor(): super()
+    constructor(message: String): super(message)
+    constructor(message: String?, cause: Throwable?): super(message, cause)
+    constructor(cause: Throwable?): super(cause)
+}
+
+/**
+ * Throws an [LabeledPolynomialError] with the given [message].
+ */
+internal fun labeledPolynomialError(message: Any): Nothing = throw LabeledPolynomialError(message.toString())
+
+/**
+ * Returns the same degrees description of the monomial, but without zero degrees.
+ */
+internal fun Map<Variable, UInt>.cleanUp() = filterValues { it > 0U }
+
+// endregion
+
+// region Constructors and converters
+
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//internal fun <C, A: Ring<C>> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>, toCheckInput: Boolean = true): LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial<C>(coefs)
+//
+//    // Map for cleaned coefficients.
+//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//
+//    // Cleaning the degrees, summing monomials of the same degrees.
+//    for (entry in coefs) {
+//        val key = entry.key.cleanUp()
+//        val value = entry.value
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    // Removing zero monomials.
+//    return LabeledPolynomial<C>(
+//        fixedCoefs
+//            .filter { it.value.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//internal fun <C, A: Ring<C>> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>, toCheckInput: Boolean): LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
+//
+//    // Map for cleaned coefficients.
+//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//
+//    // Cleaning the degrees, summing monomials of the same degrees.
+//    for (entry in pairs) {
+//        val key = entry.first.cleanUp()
+//        val value = entry.second
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    // Removing zero monomials.
+//    return LabeledPolynomial<C>(
+//        fixedCoefs.filterValues { it.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represents monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//internal fun <C, A: Ring<C>> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>, toCheckInput: Boolean): LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
+//
+//    // Map for cleaned coefficients.
+//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//
+//    // Cleaning the degrees, summing monomials of the same degrees.
+//    for (entry in pairs) {
+//        val key = entry.first.cleanUp()
+//        val value = entry.second
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    // Removing zero monomials.
+//    return LabeledPolynomial<C>(
+//        fixedCoefs.filterValues { it.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param coefs Coefficients of the instants.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//fun <C, A: Ring<C>> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>): LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represents monomials.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//fun <C, A: Ring<C>> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>): LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represents monomials.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//fun <C, A: Ring<C>> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>): LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//internal fun <C, A: Ring<C>> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>, toCheckInput: Boolean = true): LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial<C>(coefs)
+//
+//    // Map for cleaned coefficients.
+//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//
+//    // Cleaning the degrees, summing monomials of the same degrees.
+//    for (entry in coefs) {
+//        val key = entry.key.cleanUp()
+//        val value = entry.value
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    // Removing zero monomials.
+//    return LabeledPolynomial<C>(
+//        fixedCoefs
+//            .filter { it.value.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//internal fun <C, A: Ring<C>> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>, toCheckInput: Boolean): LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
+//
+//    // Map for cleaned coefficients.
+//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//
+//    // Cleaning the degrees, summing monomials of the same degrees.
+//    for (entry in pairs) {
+//        val key = entry.first.cleanUp()
+//        val value = entry.second
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    // Removing zero monomials.
+//    return LabeledPolynomial<C>(
+//        fixedCoefs.filterValues { it.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represents monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//internal fun <C, A: Ring<C>> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>, toCheckInput: Boolean): LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
+//
+//    // Map for cleaned coefficients.
+//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//
+//    // Cleaning the degrees, summing monomials of the same degrees.
+//    for (entry in pairs) {
+//        val key = entry.first.cleanUp()
+//        val value = entry.second
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    // Removing zero monomials.
+//    return LabeledPolynomial<C>(
+//        fixedCoefs.filterValues { it.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param coefs Coefficients of the instants.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>): LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represents monomials.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>): LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
+// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represents monomials.
+// *
+// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>): LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
+//
+//fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to this))
+//
+//context(A)
+//fun <C, A: Ring<C>> Variable.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to one))
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> Variable.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to ring.one))
+//
+//context(A)
+//fun <C, A: Ring<C>> Variable.asLabeledPolynomial(c: C) : LabeledPolynomial<C> =
+//    if(c.isZero()) LabeledPolynomial<C>(emptyMap())
+//    else LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to c))
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> Variable.asLabeledPolynomial(c: C) : LabeledPolynomial<C> =
+//    if(c.isZero()) zero
+//    else LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to c))
+
+// endregion
+
+/**
+ * Space of polynomials.
+ *
+ * @param C the type of operated polynomials.
+ * @param A the intersection of [Ring] of [C] and [ScaleOperations] of [C].
+ * @param ring the [A] instance.
+ */
+@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE", "INAPPLICABLE_JVM_NAME")
+public class LabeledPolynomialSpace<C, A : Ring<C>>(
+    public val ring: A,
+) : AbstractPolynomialSpace<C, LabeledPolynomial<C>> {
+    // region Constant-integer relation
+    @JvmName("constantIntPlus")
+    public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
+    @JvmName("constantIntMinus")
+    public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
+    @JvmName("constantIntTimes")
+    public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
+    // endregion
+
+    // region Integer-constant relation
+    @JvmName("intConstantPlus")
+    public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
+    @JvmName("intConstantMinus")
+    public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
+    @JvmName("intConstantTimes")
+    public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
+    // endregion
+
+    // region Variable-integer relation
+    public operator fun Variable.plus(other: Int): LabeledPolynomial<C> =
+        if (other == 0) LabeledPolynomial<C>(mapOf(
+            mapOf(this@plus to 1U) to ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this@plus to 1U) to ring.one,
+            emptyMap<Variable, UInt>() to ring.one * other,
+        ))
+    public operator fun Variable.minus(other: Int): LabeledPolynomial<C> =
+        if (other == 0) LabeledPolynomial<C>(mapOf(
+            mapOf(this@minus to 1U) to -ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this@minus to 1U) to -ring.one,
+            emptyMap<Variable, UInt>() to ring.one * other,
+        ))
+    public operator fun Variable.times(other: Int): LabeledPolynomial<C> =
+        if (other == 0) zero
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this to 1U) to ring.one * other,
+        ))
+    // endregion
+
+    // region Integer-variable relation
+    public operator fun Int.plus(other: Variable): LabeledPolynomial<C> =
+        if (this == 0) LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to ring.one,
+            emptyMap<Variable, UInt>() to ring.one * this@plus,
+        ))
+    public operator fun Int.minus(other: Variable): LabeledPolynomial<C> =
+        if (this == 0) LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to -ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to -ring.one,
+            emptyMap<Variable, UInt>() to ring.one * this@minus,
+        ))
+    public operator fun Int.times(other: Variable): LabeledPolynomial<C> =
+        if (this == 0) zero
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to ring.one * this@times,
+        ))
+    // endregion
+
+    // region Polynomial-integer relation
+    public override operator fun LabeledPolynomial<C>.plus(other: Int): LabeledPolynomial<C> =
+        if (other == 0) this
+        else
+            LabeledPolynomial(
+                coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } + other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun LabeledPolynomial<C>.minus(other: Int): LabeledPolynomial<C> =
+        if (other == 0) this
+        else
+            LabeledPolynomial(
+                coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } - other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun LabeledPolynomial<C>.times(other: Int): LabeledPolynomial<C> =
+        if (other == 0) zero
+        else LabeledPolynomial(
+            coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> c * other }
+                }
+        )
+    // endregion
+
+    // region Integer-polynomial relation
+    public override operator fun Int.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this == 0) other
+        else
+            LabeledPolynomial(
+                other.coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = this@plus + getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun Int.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this == 0) other
+        else
+            LabeledPolynomial(
+                other.coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = this@minus - getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun Int.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this == 0) zero
+        else LabeledPolynomial(
+            other.coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> this@times * c }
+                }
+        )
+    // endregion
+
+    // region Constant-constant relation
+    @JvmName("constantUnaryMinus")
+    override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
+    @JvmName("constantPlus")
+    override operator fun C.plus(other: C): C = ring { this@plus + other }
+    @JvmName("constantMinus")
+    override operator fun C.minus(other: C): C = ring { this@minus - other }
+    @JvmName("constantTimes")
+    override operator fun C.times(other: C): C = ring { this@times * other }
+    @JvmName("constantIsZero")
+    public override fun C.isZero(): Boolean = ring { this == zero }
+    @JvmName("constantIsNotZero")
+    public override fun C.isNotZero(): Boolean = ring { this != zero }
+    @JvmName("constantIsOne")
+    public override fun C.isOne(): Boolean = ring { this == one }
+    @JvmName("constantIsNotOne")
+    public override fun C.isNotOne(): Boolean = ring { this != one }
+    @JvmName("constantIsMinusOne")
+    public override fun C.isMinusOne(): Boolean = ring { this == -one }
+    @JvmName("constantIsNotMinusOne")
+    public override fun C.isNotMinusOne(): Boolean = ring { this != -one }
+    // endregion
+
+    // region Constant-variable relation
+    public operator fun C.plus(other: Variable): LabeledPolynomial<C> =
+        if (isZero()) LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to ring.one,
+            emptyMap<Variable, UInt>() to this@plus,
+        ))
+    public operator fun C.minus(other: Variable): LabeledPolynomial<C> =
+        if (isZero()) LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to -ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to -ring.one,
+            emptyMap<Variable, UInt>() to this@minus,
+        ))
+    public operator fun C.times(other: Variable): LabeledPolynomial<C> =
+        if (isZero()) zero
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(other to 1U) to this@times,
+        ))
+    // endregion
+
+    // region Variable-constant relation
+    public operator fun Variable.plus(other: C): LabeledPolynomial<C> =
+        if (other.isZero()) LabeledPolynomial<C>(mapOf(
+            mapOf(this@plus to 1U) to ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this@plus to 1U) to ring.one,
+            emptyMap<Variable, UInt>() to other,
+        ))
+    public operator fun Variable.minus(other: C): LabeledPolynomial<C> =
+        if (other.isZero()) LabeledPolynomial<C>(mapOf(
+            mapOf(this@minus to 1U) to -ring.one,
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this@minus to 1U) to -ring.one,
+            emptyMap<Variable, UInt>() to other,
+        ))
+    public operator fun Variable.times(other: C): LabeledPolynomial<C> =
+        if (other.isZero()) zero
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this@times to 1U) to other,
+        ))
+    // endregion
+
+    // region Constant-polynomial relation
+    override operator fun C.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this.isZero()) other
+        else with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to this@plus))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = this@plus + getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    override operator fun C.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this.isZero()) other
+        else with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to this@minus))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
+
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = this@minus - getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    override operator fun C.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this.isZero()) zero
+        else LabeledPolynomial<C>(
+            other.coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> this@times * c }
+                }
+        )
+    // endregion
+
+    // region Polynomial-constant relation
+    /**
+     * Returns sum of the polynomials. [other] is interpreted as [UnivariatePolynomial].
+     */
+    override operator fun LabeledPolynomial<C>.plus(other: C): LabeledPolynomial<C> =
+        if (other.isZero()) this
+        else with(coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to other))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } + other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    /**
+     * Returns difference of the polynomials. [other] is interpreted as [UnivariatePolynomial].
+     */
+    override operator fun LabeledPolynomial<C>.minus(other: C): LabeledPolynomial<C> =
+        if (other.isZero()) this
+        else with(coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to other))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
+
+                        val degs = emptyMap<Variable, UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } - other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    /**
+     * Returns product of the polynomials. [other] is interpreted as [UnivariatePolynomial].
+     */
+    override operator fun LabeledPolynomial<C>.times(other: C): LabeledPolynomial<C> =
+        if (other.isZero()) zero
+        else LabeledPolynomial<C>(
+            coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> c * other }
+                }
+        )
+    // endregion
+
+    // region Variable-variable relation
+    public operator fun Variable.plus(other: Variable): LabeledPolynomial<C> =
+        if (this == other) LabeledPolynomial<C>(mapOf(
+            mapOf(this to 1U) to ring.one * 2
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this to 1U) to ring.one,
+            mapOf(other to 1U) to ring.one,
+        ))
+    public operator fun Variable.minus(other: Variable): LabeledPolynomial<C> =
+        if (this == other) zero
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this to 1U) to ring.one,
+            mapOf(other to 1U) to -ring.one,
+        ))
+    public operator fun Variable.times(other: Variable): LabeledPolynomial<C> =
+        if (this == other) LabeledPolynomial<C>(mapOf(
+            mapOf(this to 2U) to ring.one
+        ))
+        else LabeledPolynomial<C>(mapOf(
+            mapOf(this to 1U, other to 1U) to ring.one,
+        ))
+    // endregion
+
+    // region Variable-polynomial relation
+    public operator fun Variable.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@plus to 1u) to ring.one))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = mapOf(this@plus to 1U)
+
+                        val result = ring.one + getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    public operator fun Variable.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@minus to 1u) to ring.one))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
+
+                        val degs = mapOf(this@minus to 1U)
+
+                        val result = ring.one - getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    public operator fun Variable.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        LabeledPolynomial<C>(
+            other.coefficients
+                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[this] = if (this in it) it[this]!! + 1U else 1U } }
+        )
+    // endregion
+
+    // region Polynomial-variable relation
+    public operator fun LabeledPolynomial<C>.plus(other: Variable): LabeledPolynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to ring.one))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = mapOf(other to 1U)
+
+                        val result = ring.one + getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    public operator fun LabeledPolynomial<C>.minus(other: Variable): LabeledPolynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to ring.one))
+            else LabeledPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = mapOf(other to 1U)
+
+                        val result = ring.one - getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    public operator fun LabeledPolynomial<C>.times(other: Variable): LabeledPolynomial<C> =
+        LabeledPolynomial<C>(
+            coefficients
+                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[other] = if (other in it) it[other]!! + 1U else 1U } }
+        )
+    // endregion
+
+    // region Polynomial-polynomial relation
+    /**
+     * Returns negation of the polynomial.
+     */
+    override fun LabeledPolynomial<C>.unaryMinus(): LabeledPolynomial<C> =
+        LabeledPolynomial<C>(
+            coefficients.mapValues { -it.value }
+        )
+    /**
+     * Returns sum of the polynomials.
+     */
+    override operator fun LabeledPolynomial<C>.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        LabeledPolynomial<C>(
+            coefficients
+                .applyAndRemoveZeros {
+                    other.coefficients
+                        .mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
+                }
+        )
+    /**
+     * Returns difference of the polynomials.
+     */
+    override operator fun LabeledPolynomial<C>.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        LabeledPolynomial<C>(
+            coefficients
+                .applyAndRemoveZeros {
+                    other.coefficients
+                        .mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
+                }
+        )
+    /**
+     * Returns product of the polynomials.
+     */
+    override operator fun LabeledPolynomial<C>.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        when {
+            isZero() -> zero
+            other.isZero() -> zero
+            else -> LabeledPolynomial<C>(
+                buildCoefficients {
+                    for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
+                        val degs = degs1.toMutableMap()
+                        degs2.mapValuesTo(degs) { (variable, deg) -> degs.getOrElse(variable) { 0u } + deg }
+                        val c = c1 * c2
+                        this[degs] = if (degs in this) this[degs]!! + c else c
+                    }
+                }
+            )
+        }
+
+    override val zero: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to ring.zero))
+    override val one: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to ring.one))
+
+    // TODO: Docs
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    override fun LabeledPolynomial<C>.equals(other: LabeledPolynomial<C>): Boolean =
+        when {
+            this === other -> true
+            else -> coefficients.size == other.coefficients.size &&
+                    coefficients.all { (key, value) -> with(other.coefficients) { key in this && this[key] == value } }
+        }
+    // endregion
+
+    // Not sure is it necessary...
+    // region Polynomial properties
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    override val LabeledPolynomial<C>.degree: Int
+        get() = coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) -1 else degs.values.sum().toInt() } ?: -1
+    /**
+     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
+     * in which they are appeared in the polynomial.
+     *
+     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
+     * And keys of the map is the same as in [variables].
+     */
+    public val LabeledPolynomial<C>.degrees: Map<Variable, UInt>
+        get() =
+            buildMap {
+                coefficients.entries.forEach { (degs, c) ->
+                    if (c.isNotZero()) degs.mapValuesTo(this) { (variable, deg) ->
+                        max(getOrElse(variable) { 0u }, deg)
+                    }
+                }
+            }
+    /**
+     * Set of all variables that appear in the polynomial in positive exponents.
+     */
+    public val LabeledPolynomial<C>.variables: Set<Variable>
+        get() =
+            buildSet {
+                coefficients.entries.forEach { (degs, c) -> if (c.isNotZero()) addAll(degs.keys) }
+            }
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val LabeledPolynomial<C>.countOfVariables: Int get() = variables.size
+
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    override fun LabeledPolynomial<C>.isConstant(): Boolean =
+        coefficients.all { (degs, c) -> degs.isEmpty() || c.isZero() }
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    override fun LabeledPolynomial<C>.isNonZeroConstant(): Boolean =
+        with(coefficients) {
+            var foundAbsoluteTermAndItIsNotZero = false
+            for ((degs, c) in this) {
+                if (degs.isNotEmpty()) if (c.isNotZero()) return@with false
+                else {
+                    if (c.isZero()) return@with false
+                    else foundAbsoluteTermAndItIsNotZero = true
+                }
+            }
+            foundAbsoluteTermAndItIsNotZero
+        }
+
+    override fun LabeledPolynomial<C>.asConstantOrNull(): C? =
+        with(coefficients) {
+            if(isConstant()) getOrElse(emptyMap()) { ring.zero }
+            else null
+        }
+
+//    @Suppress("NOTHING_TO_INLINE")
+//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Variable, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
+//    @Suppress("NOTHING_TO_INLINE")
+//    @JvmName("substitutePolynomial")
+//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Variable, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
+//
+//    @Suppress("NOTHING_TO_INLINE")
+//    public inline fun LabeledPolynomial<C>.asFunction(): (Map<Variable, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
+//    @Suppress("NOTHING_TO_INLINE")
+//    public inline fun LabeledPolynomial<C>.asFunctionOnConstants(): (Map<Variable, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
+//    @Suppress("NOTHING_TO_INLINE")
+//    public inline fun LabeledPolynomial<C>.asFunctionOnPolynomials(): (Map<Variable, LabeledPolynomial<C>>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
+//
+//    @Suppress("NOTHING_TO_INLINE")
+//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Variable, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
+//    @Suppress("NOTHING_TO_INLINE")
+//    @JvmName("invokePolynomial")
+//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Variable, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
+    // endregion
+
+    // region Legacy
+    @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+    override inline fun add(left: LabeledPolynomial<C>, right: LabeledPolynomial<C>): LabeledPolynomial<C> = left + right
+    @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+    override inline fun multiply(left: LabeledPolynomial<C>, right: LabeledPolynomial<C>): LabeledPolynomial<C> = left * right
+    // endregion
+
+    // region Utilities
+    // TODO: Move to region internal utilities with context receiver
+    internal fun MutableMap<Map<Variable, UInt>, C>.applyAndRemoveZeros(block: MutableMap<Map<Variable, UInt>, C>.() -> Unit) : MutableMap<Map<Variable, UInt>, C> {
+        contract {
+            callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+        }
+        block()
+        for ((degs, c) in this) if (c.isZero()) this.remove(degs)
+        return this
+    }
+    internal fun Map<Map<Variable, UInt>, C>.applyAndRemoveZeros(block: MutableMap<Map<Variable, UInt>, C>.() -> Unit) : Map<Map<Variable, UInt>, C> =
+        toMutableMap().applyAndRemoveZeros(block)
+    @OptIn(ExperimentalTypeInference::class)
+    internal fun buildCoefficients(@BuilderInference builderAction: MutableMap<Map<Variable, UInt>, C>.() -> Unit): Map<Map<Variable, UInt>, C> {
+        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
+        return buildMap {
+            builderAction()
+            for ((degs, c) in this) if (c.isZero()) this.remove(degs)
+        }
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
new file mode 100644
index 000000000..f1ad9a74f
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -0,0 +1,689 @@
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.experimental.ExperimentalTypeInference
+import kotlin.jvm.JvmName
+import kotlin.math.max
+
+
+/**
+ * Polynomial model without fixation on specific context they are applied to.
+ *
+ * @param C the type of constants.
+ */
+public class NumberedPolynomial<C>
+internal constructor(
+    /**
+     * Map that collects coefficients of the polynomial. Every monomial `a x_1^{d_1} ... x_n^{d_n}` is represented as
+     * pair "key-value" in the map, where value is coefficients `a` and
+     * key is list that associates index of every variable in the monomial with multiplicity of the variable occurring
+     * in the monomial. For example coefficients of polynomial `5 x_1^2 x_3^3 - 6 x_2` can be represented as
+     * ```
+     * mapOf(
+     *      listOf(2, 0, 3) to 5,
+     *      listOf(0, 1) to (-6),
+     * )
+     * ```
+     * and also as
+     * ```
+     * mapOf(
+     *      listOf(2, 0, 3) to 5,
+     *      listOf(0, 1) to (-6),
+     *      listOf(0, 1, 1) to 0,
+     * )
+     * ```
+     * It is recommended not to put zero monomials into the map, but is not prohibited. Lists of degrees always do not
+     * contain any zeros on end, but can contain zeros on start or anywhere in middle.
+     */
+    public val coefficients: Map<List<UInt>, C>
+) : AbstractPolynomial<C> {
+    override fun toString(): String = "NumberedPolynomial$coefficients"
+}
+
+// region Internal utilities
+
+/**
+ * Represents internal [Polynomial] errors.
+ */
+internal class NumberedPolynomialError : Error {
+    constructor(): super()
+    constructor(message: String): super(message)
+    constructor(message: String?, cause: Throwable?): super(message, cause)
+    constructor(cause: Throwable?): super(cause)
+}
+
+/**
+ * Throws an [PolynomialError] with the given [message].
+ */
+internal fun numberedPolynomialError(message: Any): Nothing = throw PolynomialError(message.toString())
+
+/**
+ * Returns the same degrees description of the monomial, but without extra zero degrees on the end.
+ */
+internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
+
+// endregion
+
+// region Constructors and converters
+// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
+
+//context(A)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean): NumberedPolynomial<C> {
+//    if (!toCheckInput) return NumberedPolynomial<C>(coefs)
+//
+//    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+//
+//    for (entry in coefs) {
+//        val key = entry.key.cleanUp()
+//        val value = entry.value
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    return NumberedPolynomial<C>(
+//        fixedCoefs
+//            .filter { it.value.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean): NumberedPolynomial<C> {
+//    if (!toCheckInput) return NumberedPolynomial(pairs.toMap())
+//
+//    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+//
+//    for (entry in pairs) {
+//        val key = entry.first.cleanUp()
+//        val value = entry.second
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    return NumberedPolynomial<C>(
+//        fixedCoefs
+//            .filter { it.value.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean): NumberedPolynomial<C> =
+//    NumberedPolynomial(pairs.toMap(), toCheckInput)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param coefs Coefficients of the instants.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//public fun <C, A: Ring<C>> NumberedPolynomial(coefs: Map<List<UInt>, C>) = NumberedPolynomial(coefs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//public fun <C, A: Ring<C>> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) = NumberedPolynomial(pairs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(A)
+//public fun <C, A: Ring<C>> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) = NumberedPolynomial(*pairs, toCheckInput = true)
+//
+//context(NumberedPolynomialSpace<C, A>)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean): NumberedPolynomial<C> {
+//    if (!toCheckInput) return NumberedPolynomial(coefs)
+//
+//    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+//
+//    for (entry in coefs) {
+//        val key = entry.key.cleanUp()
+//        val value = entry.value
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    return NumberedPolynomial<C>(
+//        fixedCoefs
+//            .filter { it.value.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean): NumberedPolynomial<C> {
+//    if (!toCheckInput) return NumberedPolynomial(pairs.toMap())
+//
+//    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+//
+//    for (entry in pairs) {
+//        val key = entry.first.cleanUp()
+//        val value = entry.second
+//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+//    }
+//
+//    return NumberedPolynomial<C>(
+//        fixedCoefs
+//            .filter { it.value.isNotZero() }
+//    )
+//}
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean): NumberedPolynomial<C> =
+//    NumberedPolynomial(pairs.toList(), toCheckInput)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param coefs Coefficients of the instants.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial(coefs: Map<List<UInt>, C>) = NumberedPolynomial(coefs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) = NumberedPolynomial(pairs, toCheckInput = true)
+///**
+// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
+// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
+// *
+// * @param pairs Collection of pairs that represent monomials.
+// *
+// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) = NumberedPolynomial(*pairs, toCheckInput = true)
+
+public fun <C, A: Ring<C>> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
+
+// endregion
+
+/**
+ * Space of polynomials.
+ *
+ * @param C the type of operated polynomials.
+ * @param A the intersection of [Ring] of [C] and [ScaleOperations] of [C].
+ * @param ring the [A] instance.
+ */
+@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE", "INAPPLICABLE_JVM_NAME")
+public class NumberedPolynomialSpace<C, A : Ring<C>>(
+    public val ring: A,
+) : AbstractPolynomialSpace<C, NumberedPolynomial<C>> {
+    // region Constant-integer relation
+    @JvmName("constantIntPlus")
+    public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
+    @JvmName("constantIntMinus")
+    public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
+    @JvmName("constantIntTimes")
+    public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
+    // endregion
+
+    // region Integer-constant relation
+    @JvmName("intConstantPlus")
+    public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
+    @JvmName("intConstantMinus")
+    public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
+    @JvmName("intConstantTimes")
+    public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
+    // endregion
+
+    // region Polynomial-integer relation
+    public override operator fun NumberedPolynomial<C>.plus(other: Int): NumberedPolynomial<C> =
+        if (other == 0) this
+        else
+            NumberedPolynomial(
+                coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } + other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun NumberedPolynomial<C>.minus(other: Int): NumberedPolynomial<C> =
+        if (other == 0) this
+        else
+            NumberedPolynomial(
+                coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } - other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun NumberedPolynomial<C>.times(other: Int): NumberedPolynomial<C> =
+        if (other == 0) zero
+        else NumberedPolynomial(
+            coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> c * other }
+                }
+        )
+    // endregion
+
+    // region Integer-polynomial relation
+    public override operator fun Int.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this == 0) other
+        else
+            NumberedPolynomial(
+                other.coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = this@plus + getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun Int.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this == 0) other
+        else
+            NumberedPolynomial(
+                other.coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = this@minus - getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+    public override operator fun Int.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this == 0) zero
+        else NumberedPolynomial(
+            other.coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> this@times * c }
+                }
+        )
+    // endregion
+
+    // region Constant-constant relation
+    @JvmName("constantUnaryMinus")
+    override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
+    @JvmName("constantPlus")
+    override operator fun C.plus(other: C): C = ring { this@plus + other }
+    @JvmName("constantMinus")
+    override operator fun C.minus(other: C): C = ring { this@minus - other }
+    @JvmName("constantTimes")
+    override operator fun C.times(other: C): C = ring { this@times * other }
+    @JvmName("constantIsZero")
+    public override fun C.isZero(): Boolean = ring { this == zero }
+    @JvmName("constantIsNotZero")
+    public override fun C.isNotZero(): Boolean = ring { this != zero }
+    @JvmName("constantIsOne")
+    public override fun C.isOne(): Boolean = ring { this == one }
+    @JvmName("constantIsNotOne")
+    public override fun C.isNotOne(): Boolean = ring { this != one }
+    @JvmName("constantIsMinusOne")
+    public override fun C.isMinusOne(): Boolean = ring { this == -one }
+    @JvmName("constantIsNotMinusOne")
+    public override fun C.isNotMinusOne(): Boolean = ring { this != -one }
+    // endregion
+
+    // region Constant-polynomial relation
+    override operator fun C.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this.isZero()) other
+        else with(other.coefficients) {
+            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this@plus))
+            else NumberedPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = this@plus + getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    override operator fun C.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this.isZero()) -other
+        else with(other.coefficients) {
+            if (isEmpty()) NumberedPolynomial<C>(mapOf(listOf<UInt>() to this@minus))
+            else NumberedPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
+
+                        val degs = emptyList<UInt>()
+
+                        val result = this@minus - getOrElse(degs) { ring.zero }
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    override operator fun C.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this.isZero()) zero
+        else NumberedPolynomial<C>(
+            other.coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> this@times * c }
+                }
+        )
+    // endregion
+
+    // region Polynomial-constant relation
+    /**
+     * Returns sum of the polynomials. [other] is interpreted as [NumberedPolynomial].
+     */
+    override operator fun NumberedPolynomial<C>.plus(other: C): NumberedPolynomial<C> =
+        if (other.isZero()) this
+        else with(coefficients) {
+            if (isEmpty()) NumberedPolynomial<C>(mapOf(listOf<UInt>() to other))
+            else NumberedPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } + other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    /**
+     * Returns difference of the polynomials. [other] is interpreted as [NumberedPolynomial].
+     */
+    override operator fun NumberedPolynomial<C>.minus(other: C): NumberedPolynomial<C> =
+        if (other.isZero()) this
+        else with(coefficients) {
+            if (isEmpty()) NumberedPolynomial<C>(mapOf(listOf<UInt>() to other))
+            else NumberedPolynomial<C>(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        val result = getOrElse(degs) { ring.zero } - other
+
+                        if (result.isZero()) remove(degs)
+                        else this[degs] = result
+                    }
+            )
+        }
+    /**
+     * Returns product of the polynomials. [other] is interpreted as [NumberedPolynomial].
+     */
+    override operator fun NumberedPolynomial<C>.times(other: C): NumberedPolynomial<C> =
+        if (other.isZero()) zero
+        else NumberedPolynomial<C>(
+            coefficients
+                .applyAndRemoveZeros {
+                    mapValues { (_, c) -> c * other }
+                }
+        )
+    // endregion
+
+    // region Polynomial-polynomial relation
+    /**
+     * Returns negation of the polynomial.
+     */
+    override fun NumberedPolynomial<C>.unaryMinus(): NumberedPolynomial<C> =
+        NumberedPolynomial<C>(
+            coefficients.mapValues { -it.value }
+        )
+    /**
+     * Returns sum of the polynomials.
+     */
+    override operator fun NumberedPolynomial<C>.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        NumberedPolynomial<C>(
+            coefficients
+                .applyAndRemoveZeros {
+                    other.coefficients
+                        .mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
+                }
+        )
+    /**
+     * Returns difference of the polynomials.
+     */
+    override operator fun NumberedPolynomial<C>.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        NumberedPolynomial<C>(
+            coefficients
+                .applyAndRemoveZeros {
+                    other.coefficients
+                        .mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
+                }
+        )
+    /**
+     * Returns product of the polynomials.
+     */
+    override operator fun NumberedPolynomial<C>.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        when {
+            isZero() -> zero
+            other.isZero() -> zero
+            else ->
+                NumberedPolynomial<C>(
+                    buildCoefficients {
+                        for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
+                            val degs =
+                                (0..max(degs1.lastIndex, degs2.lastIndex))
+                                    .map { degs1.getOrElse(it) { 0U } + degs2.getOrElse(it) { 0U } }
+                            val c = c1 * c2
+                            this[degs] = if (degs in this) this[degs]!! + c else c
+                        }
+                    }
+                )
+        }
+
+    public override fun NumberedPolynomial<C>.isZero(): Boolean = coefficients.values.all { it.isZero() }
+    public override fun NumberedPolynomial<C>.isNotZero(): Boolean = coefficients.values.any { it.isNotZero() }
+    public override fun NumberedPolynomial<C>.isOne(): Boolean =
+        with(coefficients) {
+            var foundAbsoluteTermAndItIsOne = false
+            for ((degs, c) in this) {
+                if (degs.isNotEmpty()) if (c.isNotZero()) return@with false
+                else {
+                    if (c.isNotOne()) return@with false
+                    else foundAbsoluteTermAndItIsOne = true
+                }
+            }
+            foundAbsoluteTermAndItIsOne
+        }
+    public override fun NumberedPolynomial<C>.isNotOne(): Boolean = !isOne()
+    public override fun NumberedPolynomial<C>.isMinusOne(): Boolean =
+        with(coefficients) {
+            var foundAbsoluteTermAndItIsMinusOne = false
+            for ((degs, c) in this) {
+                if (degs.isNotEmpty()) if (c.isNotZero()) return@with false
+                else {
+                    if (c.isNotMinusOne()) return@with false
+                    else foundAbsoluteTermAndItIsMinusOne = true
+                }
+            }
+            foundAbsoluteTermAndItIsMinusOne
+        }
+    public override fun NumberedPolynomial<C>.isNotMinusOne(): Boolean = !isMinusOne()
+
+    override val zero: NumberedPolynomial<C> = NumberedPolynomial<C>(emptyMap())
+    override val one: NumberedPolynomial<C> =
+        NumberedPolynomial<C>(
+            mapOf(
+                listOf<UInt>() to ring.one // 1 * x_1^0 * x_2^0 * ...
+            )
+        )
+
+    // TODO: Docs
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    override fun NumberedPolynomial<C>.equals(other: NumberedPolynomial<C>): Boolean =
+        when {
+            this === other -> true
+            else -> coefficients.size == other.coefficients.size &&
+                    coefficients.all { (key, value) -> with(other.coefficients) { key in this && this[key] == value } }
+        }
+    // endregion
+
+    // Not sure is it necessary...
+    // region Polynomial properties
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val NumberedPolynomial<C>.countOfVariables: Int
+        get() = coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) 0 else degs.size } ?: 0
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    override val NumberedPolynomial<C>.degree: Int
+        get() = coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) -1 else degs.sum().toInt() } ?: -1
+    /**
+     * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
+     * exponents in which the variables are appeared in the polynomial.
+     *
+     * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
+     * And size of the list is [countOfVariables].
+     */
+    public val NumberedPolynomial<C>.degrees: List<UInt>
+        get() =
+            buildList(countOfVariables) {
+                repeat(countOfVariables) { add(0U) }
+                coefficients.entries.forEach { (degs, c) ->
+                    if (c.isNotZero()) degs.forEachIndexed { index, deg ->
+                        this[index] = max(this[index], deg)
+                    }
+                }
+            }
+
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    override fun NumberedPolynomial<C>.isConstant(): Boolean =
+        coefficients.all { (degs, c) -> degs.isEmpty() || c.isZero() }
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    override fun NumberedPolynomial<C>.isNonZeroConstant(): Boolean =
+        with(coefficients) {
+            var foundAbsoluteTermAndItIsNotZero = false
+            for ((degs, c) in this) {
+                if (degs.isNotEmpty()) if (c.isNotZero()) return@with false
+                else {
+                    if (c.isZero()) return@with false
+                    else foundAbsoluteTermAndItIsNotZero = true
+                }
+            }
+            foundAbsoluteTermAndItIsNotZero
+        }
+
+    override fun NumberedPolynomial<C>.asConstantOrNull(): C? =
+        with(coefficients) {
+            if(isConstant()) getOrElse(emptyList()) { ring.zero }
+            else null
+        }
+
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, C>): NumberedPolynomial<C> = this.substitute(ring, argument)
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substitutePolynomial")
+    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
+
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.asFunction(): (Map<Int, C>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.asFunctionOnConstants(): (Map<Int, C>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.asFunctionOnPolynomials(): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
+
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, C>): NumberedPolynomial<C> = this.substitute(ring, argument)
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("invokePolynomial")
+    public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
+    // endregion
+
+    // region Legacy
+    @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+    override inline fun add(left: NumberedPolynomial<C>, right: NumberedPolynomial<C>): NumberedPolynomial<C> = left + right
+    @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+    override inline fun multiply(left: NumberedPolynomial<C>, right: NumberedPolynomial<C>): NumberedPolynomial<C> = left * right
+    // endregion
+
+    // region Utilities
+    // TODO: Move to region internal utilities with context receiver
+    internal fun MutableMap<List<UInt>, C>.applyAndRemoveZeros(block: MutableMap<List<UInt>, C>.() -> Unit) : MutableMap<List<UInt>, C> {
+        contract {
+            callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+        }
+        block()
+        for ((degs, c) in this) if (c.isZero()) this.remove(degs)
+        return this
+    }
+    internal fun Map<List<UInt>, C>.applyAndRemoveZeros(block: MutableMap<List<UInt>, C>.() -> Unit) : Map<List<UInt>, C> =
+        toMutableMap().applyAndRemoveZeros(block)
+    @OptIn(ExperimentalTypeInference::class)
+    internal fun buildCoefficients(@BuilderInference builderAction: MutableMap<List<UInt>, C>.() -> Unit): Map<List<UInt>, C> {
+        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
+        return buildMap {
+            builderAction()
+            for ((degs, c) in this) if (c.isZero()) this.remove(degs)
+        }
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 30280a396..99d6b0659 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -5,43 +5,38 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedAddMultiplied
-import space.kscience.kmath.functions.AbstractPolynomialSpace.Companion.optimizedMultiply
 import space.kscience.kmath.operations.*
 import kotlin.jvm.JvmName
 import kotlin.math.max
 import kotlin.math.min
 
 /**
- * Polynomial coefficients model without fixation on specific context they are applied to.
+ * Polynomial model without fixation on specific context they are applied to.
  *
  * @param coefficients constant is the leftmost coefficient.
  */
 public class Polynomial<T>(public val coefficients: List<T>) : AbstractPolynomial<T> {
     override fun toString(): String = "Polynomial$coefficients"
-
-//    public companion object {
-//        /**
-//         * Default name of variables used in string representations.
-//         *
-//         * @see Polynomial.toString
-//         */
-//        public var defaultVariableName: String = "x"
-//
-//        /**
-//         * Represents result of division with remainder.
-//         */
-//        public data class DividingResult<C>(
-//            val quotient: Polynomial<C>,
-//            val reminder: Polynomial<C>
-//        )
-//    }
 }
 
+// region Internal utilities
+
 /**
  * Represents internal [Polynomial] errors.
  */
-internal class PolynomialError(message: String): Error(message)
+internal class PolynomialError : Error {
+    constructor(): super()
+    constructor(message: String): super(message)
+    constructor(message: String?, cause: Throwable?): super(message, cause)
+    constructor(cause: Throwable?): super(cause)
+}
+
+/**
+ * Throws an [PolynomialError] with the given [message].
+ */
+internal fun polynomialError(message: Any): Nothing = throw PolynomialError(message.toString())
+
+// endregion
 
 // region Constructors and converters
 
@@ -66,16 +61,16 @@ public fun <T> T.asPolynomial() : Polynomial<T> = Polynomial(listOf(this))
 // endregion
 
 /**
- * Space of polynomials constructed over ring.
+ * Space of univariate polynomials constructed over ring.
  *
  * @param C the type of constants. Polynomials have them as a coefficients in their terms.
  * @param A type of underlying ring of constants. It's [Ring] of [C].
  * @param ring underlying ring of constants of type [A].
  */
-@Suppress("INAPPLICABLE_JVM_NAME") // KT-31420
+@Suppress("INAPPLICABLE_JVM_NAME") // TODO: KT-31420
 public open class PolynomialSpace<C, A : Ring<C>>(
     public val ring: A,
-) : AbstractPolynomialSpace<C, Polynomial<C>>{
+) : AbstractPolynomialSpace<C, Polynomial<C>> {
     // region Constant-integer relation
     @JvmName("constantIntPlus")
     public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
@@ -102,8 +97,14 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 coefficients
                     .toMutableList()
                     .apply {
-                        if (isEmpty()) this[0] = ring.zero + other
-                        else this[0] = this[0]!! + other
+                        val result = getOrElse(0) { ring.zero } + other
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
     public override operator fun Polynomial<C>.minus(other: Int): Polynomial<C> =
@@ -113,8 +114,14 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 coefficients
                     .toMutableList()
                     .apply {
-                        if (isEmpty()) this[0] = ring.zero - other
-                        else this[0] = this[0]!! - other
+                        val result = getOrElse(0) { ring.zero } - other
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
     public override operator fun Polynomial<C>.times(other: Int): Polynomial<C> =
@@ -134,8 +141,14 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 other.coefficients
                     .toMutableList()
                     .apply {
-                        if (isEmpty()) this[0] = ring.zero + this@plus
-                        else this[0] = this[0]!! + this@plus
+                        val result = this@plus + getOrElse(0) { ring.zero }
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
     public override operator fun Int.minus(other: Polynomial<C>): Polynomial<C> =
@@ -145,8 +158,16 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 other.coefficients
                     .toMutableList()
                     .apply {
-                        if (isEmpty()) this[0] = ring.zero - this@minus
-                        else this[0] = this[0]!! - this@minus
+                        forEachIndexed { index, c -> if (index != 0) this[index] = -c }
+
+                        val result = this@minus - getOrElse(0) { ring.zero }
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
     public override operator fun Int.times(other: Polynomial<C>): Polynomial<C> =
@@ -183,12 +204,20 @@ public open class PolynomialSpace<C, A : Ring<C>>(
 
     // region Constant-polynomial relation
     public override operator fun C.plus(other: Polynomial<C>): Polynomial<C> =
-        with(other.coefficients) {
+        if (this.isZero()) other
+        else with(other.coefficients) {
             if (isEmpty()) Polynomial(listOf(this@plus))
             else Polynomial(
                 toMutableList()
                     .apply {
-                        this[0] += this@plus
+                        val result = if (size == 0) this@plus else this@plus + get(0)
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
         }
@@ -196,12 +225,22 @@ public open class PolynomialSpace<C, A : Ring<C>>(
 //            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
 //        )
     public override operator fun C.minus(other: Polynomial<C>): Polynomial<C> =
-        with(other.coefficients) {
+        if (this.isZero()) other
+        else with(other.coefficients) {
             if (isEmpty()) Polynomial(listOf(-this@minus))
             else Polynomial(
                 toMutableList()
                     .apply {
-                        this[0] -= this@minus
+                        forEachIndexed { index, c -> if (index != 0) this[index] = -c }
+
+                        val result = if (size == 0) this@minus else this@minus - get(0)
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
         }
@@ -209,9 +248,10 @@ public open class PolynomialSpace<C, A : Ring<C>>(
 //            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
 //        )
     public override operator fun C.times(other: Polynomial<C>): Polynomial<C> =
-        Polynomial(
+        if (this.isZero()) other
+        else Polynomial(
             other.coefficients
-//                .subList(0, other.degree + 1)
+                .subList(0, other.degree + 1)
                 .map { it * this }
         )
     // endregion
@@ -224,7 +264,14 @@ public open class PolynomialSpace<C, A : Ring<C>>(
             else Polynomial(
                 toMutableList()
                     .apply {
-                        this[0] += other
+                        val result = if (size == 0) other else get(0) + other
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
         }
@@ -232,12 +279,20 @@ public open class PolynomialSpace<C, A : Ring<C>>(
 //            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
 //        )
     public override operator fun Polynomial<C>.minus(other: C): Polynomial<C> =
-        with(coefficients) {
+        if (other.isZero()) this
+        else with(coefficients) {
             if (isEmpty()) Polynomial(listOf(other))
             else Polynomial(
                 toMutableList()
                     .apply {
-                        this[0] -= other
+                        val result = if (size == 0) other else get(0) - other
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
                     }
             )
         }
@@ -245,9 +300,10 @@ public open class PolynomialSpace<C, A : Ring<C>>(
 //            listOf(coefficients[0] - other) + coefficients.subList(1, degree + 1)
 //        )
     public override operator fun Polynomial<C>.times(other: C): Polynomial<C> =
-        Polynomial(
+        if (other.isZero()) this
+        else Polynomial(
             coefficients
-//                .subList(0, degree + 1)
+                .subList(0, degree + 1)
                 .map { it * other }
         )
     // endregion
@@ -283,8 +339,8 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         val thisDegree = degree
         val otherDegree = other.degree
         return when {
-            thisDegree == -1 -> this
-            otherDegree == -1 -> other
+            thisDegree == -1 -> zero
+            otherDegree == -1 -> zero
             else ->
                 Polynomial(
                     (0..(thisDegree + otherDegree))
@@ -293,6 +349,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                                 .map { coefficients[it] * other.coefficients[d - it] }
                                 .reduce { acc, rational -> acc + rational }
                         }
+                        .run { subList(0, indexOfLast { it.isNotZero() } + 1) }
                 )
         }
     }
@@ -321,8 +378,8 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         }
     // endregion
 
-    // Not sure is it necessary...
     // region Polynomial properties
+
     public override val Polynomial<C>.degree: Int get() = coefficients.indexOfLast { it != ring.zero }
 
     public override fun Polynomial<C>.asConstantOrNull(): C? =
@@ -354,8 +411,8 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     public inline operator fun Polynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
     @Suppress("NOTHING_TO_INLINE")
     public inline operator fun Polynomial<C>.invoke(argument: Polynomial<C>): Polynomial<C> = this.substitute(ring, argument)
-    // endregion
 
+    // endregion
 }
 
 /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Variable.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Variable.kt
new file mode 100644
index 000000000..410604fd3
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Variable.kt
@@ -0,0 +1,38 @@
+package space.kscience.kmath.functions
+
+import kotlin.reflect.KProperty
+
+
+/**
+ * Represents class of labeled variables like usual
+ * `x`, `y`, `z`, `a`, `b`, `n`, `m`, etc.
+ *
+ * Variables does not contain any information about field (or ring, ets.) they are considered in
+ * and therefore about coefficient.
+ *
+ * @property name Is the label or name of variable. For `x` it is `"x"`, for `n` &ndash; `"n"`, etc.
+ */
+public data class Variable (val name: String) : Comparable<Variable> {
+    /**
+     * Represents the variable as a string.
+     *
+     * @return Only name of the variable.
+     */
+    override fun toString(): String = name
+    /**
+     * Compares two variables.
+     * Comparison is realised by comparison of variables' names.
+     *
+     * Used in [LabeledPolynomial] and [LabeledRationalFunction] to sort monomials in
+     * [LabeledPolynomial.toString] and [LabeledRationalFunction.toString] in lexicographic order.
+     *
+     * @see Comparable.compareTo
+     * @sample LabeledPolynomial.monomialComparator
+     * @return Only name of the variable.
+     */
+    override fun compareTo(other: Variable): Int = name.compareTo(other.name)
+
+    public companion object {
+        public operator fun getValue(thisRef: Any?, property: KProperty<*>) : Variable = Variable(property.name)
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
new file mode 100644
index 000000000..9e5043b8c
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.Group
+
+
+// TODO: All of this should be moved to algebraic structures' place for utilities
+// TODO: Move receiver to context receiver
+/**
+ * Multiplication of element and integer.
+ *
+ * @receiver the multiplicand.
+ * @param other the multiplier.
+ * @return the difference.
+ */
+internal tailrec fun <C> Group<C>.optimizedMultiply(arg: C, other: Int): C =
+    when {
+        other == 0 -> zero
+        other == 1 -> arg
+        other == -1 -> -arg
+        other % 2 == 0 -> optimizedMultiply(arg + arg, other / 2)
+        other % 2 == 1 -> optimizedAddMultiplied(arg, arg + arg, other / 2)
+        other % 2 == -1 -> optimizedAddMultiplied(-arg, arg + arg, other / 2)
+        else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
+    }
+
+// TODO: Move receiver to context receiver
+/**
+ * Adds product of [arg] and [multiplier] to [base].
+ *
+ * @receiver the algebra to provide multiplication.
+ * @param base the augend.
+ * @param arg the multiplicand.
+ * @param multiplier the multiplier.
+ * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
+ * @author Gleb Minaev
+ */
+internal tailrec fun <C> Group<C>.optimizedAddMultiplied(base: C, arg: C, multiplier: Int): C =
+    when {
+        multiplier == 0 -> base
+        multiplier == 1 -> base + arg
+        multiplier == -1 -> base - arg
+        multiplier % 2 == 0 -> optimizedAddMultiplied(base, arg + arg, multiplier / 2)
+        multiplier % 2 == 1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
+        multiplier % 2 == -1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
+        else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
+    }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
new file mode 100644
index 000000000..62ac31b64
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
@@ -0,0 +1,490 @@
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.*
+import kotlin.contracts.*
+
+
+// TODO: Docs
+
+// region Sort of legacy
+
+//// region Constants
+//
+//// TODO: Reuse underlying ring extensions
+//
+//context(LabeledPolynomialSpace<C, A>)
+//@Suppress("NOTHING_TO_INLINE")
+//fun <C, A: Ring<C>> numberConstant(value: Int): C = ring { number<C>(value) }
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> power(arg: C, pow: UInt): C = ring { power(arg, pow) }
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> multiplyWithPower(base: C, arg: C, pow: UInt): C = ring { multiplyWithPower<C>(base, arg, pow) }
+//
+//// endregion
+
+//// region Variables
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> power(arg: Variable, pow: UInt): LabeledPolynomial<C> =
+//    if (pow == 0U) one
+//    else LabeledPolynomial<C>(mapOf(
+//        mapOf(arg to pow) to ring.one
+//    ))
+//
+//// endregion
+
+//// region Polynomials
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> number(value: Int): LabeledPolynomial<C> = ring { LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to number<C>(value))) }
+//
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> multiplyWithPower(base: LabeledPolynomial<C>, arg: LabeledPolynomial<C>, pow: UInt): LabeledPolynomial<C> =
+//    when {
+//        arg.isZero() && pow > 0U -> base
+//        arg.isOne() -> base
+//        arg.isMinusOne() -> if (pow % 2U == 0U) base else -base
+//        else -> multiplyWithPowerInternalLogic(base, arg, pow)
+//    }
+//
+//// Trivial but slow as duck
+//context(LabeledPolynomialSpace<C, A>)
+//internal tailrec fun <C, A: Ring<C>> multiplyWithPowerInternalLogic(base: LabeledPolynomial<C>, arg: LabeledPolynomial<C>, exponent: UInt): LabeledPolynomial<C> =
+//    when {
+//        exponent == 0U -> base
+//        exponent == 1U -> base * arg
+//        exponent % 2U == 0U -> multiplyWithPowerInternalLogic(base, arg * arg, exponent / 2U)
+//        exponent % 2U == 1U -> multiplyWithPowerInternalLogic(base * arg, arg * arg, exponent / 2U)
+//        else -> error("Error in raising ring instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
+//    }
+//
+//// endregion
+
+// endregion
+
+// region Utilities
+
+// TODO: Docs
+@OptIn(ExperimentalContracts::class)
+public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomialSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return LabeledPolynomialSpace(this).block()
+}
+
+// endregion
+
+//// region String representations
+//
+///**
+// * Represents the polynomial as a [String] with names of variables substituted with names from [names].
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(names: Map<Variable, String> = emptyMap()): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .toSortedMap()
+//                            .filter { it.value > 0U }
+//                            .map { (variable, deg) ->
+//                                val variableName = names.getOrDefault(variable, variable.toString())
+//                                when (deg) {
+//                                    1U -> variableName
+//                                    else -> "$variableName^$deg"
+//                                }
+//                            }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer].
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(namer: (Variable) -> String): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .toSortedMap()
+//                            .filter { it.value > 0U }
+//                            .map { (variable, deg) ->
+//                                when (deg) {
+//                                    1U -> namer(variable)
+//                                    else -> "${namer(variable)}^$deg"
+//                                }
+//                            }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] with names of variables substituted with names from [names] and with
+// * brackets around the string if needed (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(names: Map<Variable, String> = emptyMap()): String =
+//    with(represent(names)) { if (coefficients.count() == 1) this else "($this)" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
+// * (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(namer: (Variable) -> String): String =
+//    with(represent(namer)) { if (coefficients.count() == 1) this else "($this)" }
+//
+///**
+// * Represents the polynomial as a [String] with names of variables substituted with names from [names].
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(names: Map<Variable, String> = emptyMap()): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> -LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .toSortedMap()
+//                            .filter { it.value > 0U }
+//                            .map { (variable, deg) ->
+//                                val variableName = names.getOrDefault(variable, variable.toString())
+//                                when (deg) {
+//                                    1U -> variableName
+//                                    else -> "$variableName^$deg"
+//                                }
+//                            }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer].
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(namer: (Variable) -> String): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> -LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .toSortedMap()
+//                            .filter { it.value > 0U }
+//                            .map { (variable, deg) ->
+//                                when (deg) {
+//                                    1U -> namer(variable)
+//                                    else -> "${namer(variable)}^$deg"
+//                                }
+//                            }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] with names of variables substituted with names from [names] and with
+// * brackets around the string if needed (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(names: Map<Variable, String> = emptyMap()): String =
+//    with(representReversed(names)) { if (coefficients.count() == 1) this else "($this)" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
+// * (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(namer: (Variable) -> String): String =
+//    with(representReversed(namer)) { if (coefficients.count() == 1) this else "($this)" }
+//
+//// endregion
+
+// region Operator extensions
+
+//// region Field case
+//
+//operator fun <T: Field<T>> Polynomial<T>.div(other: Polynomial<T>): Polynomial<T> {
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    if (isZero()) return this
+//
+//    fun Map<List<Int>, T>.leadingTerm() =
+//        this
+//            .asSequence()
+//            .map { Pair(it.key, it.value) }
+//            .reduce { (accDegs, accC), (listDegs, listC) ->
+//                for (i in 0..accDegs.lastIndex) {
+//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
+//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
+//                }
+//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
+//            }
+//
+//    var thisCoefficients = coefficients.toMutableMap()
+//    val otherCoefficients = other.coefficients
+//    val quotientCoefficients = HashMap<List<Int>, T>()
+//
+//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
+//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
+//
+//    while (
+//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
+//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
+//    ) {
+//        val multiplierDegs =
+//            thisLeadingTermDegs
+//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
+//                .cleanUp()
+//        val multiplierC = thisLeadingTermC / otherLeadingTermC
+//
+//        quotientCoefficients[multiplierDegs] = multiplierC
+//
+//        for ((degs, t) in otherCoefficients) {
+//            val productDegs =
+//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
+//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
+//                    .cleanUp()
+//            val productC = t * multiplierC
+//            thisCoefficients[productDegs] =
+//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
+//        }
+//
+//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
+//
+//        if (thisCoefficients.isEmpty())
+//            return Polynomial(quotientCoefficients, toCheckInput = false)
+//
+//        val t = thisCoefficients.leadingTerm()
+//        thisLeadingTermDegs = t.first
+//        thisLeadingTermC = t.second
+//    }
+//
+//    return Polynomial(quotientCoefficients, toCheckInput = false)
+//}
+//
+//operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    else
+//        Polynomial(
+//            coefficients
+//                .mapValues { it.value / other },
+//            toCheckInput = false
+//        )
+//
+//operator fun <T: Field<T>> Polynomial<T>.rem(other: Polynomial<T>): Polynomial<T> {
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    if (isZero()) return this
+//
+//    fun Map<List<Int>, T>.leadingTerm() =
+//        this
+//            .asSequence()
+//            .map { Pair(it.key, it.value) }
+//            .reduce { (accDegs, accC), (listDegs, listC) ->
+//                for (i in 0..accDegs.lastIndex) {
+//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
+//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
+//                }
+//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
+//            }
+//
+//    var thisCoefficients = coefficients.toMutableMap()
+//    val otherCoefficients = other.coefficients
+//
+//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
+//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
+//
+//    while (
+//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
+//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
+//    ) {
+//        val multiplierDegs =
+//            thisLeadingTermDegs
+//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
+//                .cleanUp()
+//        val multiplierC = thisLeadingTermC / otherLeadingTermC
+//
+//        for ((degs, t) in otherCoefficients) {
+//            val productDegs =
+//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
+//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
+//                    .cleanUp()
+//            val productC = t * multiplierC
+//            thisCoefficients[productDegs] =
+//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
+//        }
+//
+//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
+//
+//        if (thisCoefficients.isEmpty())
+//            return Polynomial(thisCoefficients, toCheckInput = false)
+//
+//        val t = thisCoefficients.leadingTerm()
+//        thisLeadingTermDegs = t.first
+//        thisLeadingTermC = t.second
+//    }
+//
+//    return Polynomial(thisCoefficients, toCheckInput = false)
+//}
+//
+//infix fun <T: Field<T>> Polynomial<T>.divrem(other: Polynomial<T>): Polynomial.Companion.DividingResult<T> {
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    if (isZero()) return Polynomial.Companion.DividingResult(this, this)
+//
+//    fun Map<List<Int>, T>.leadingTerm() =
+//        this
+//            .asSequence()
+//            .map { Pair(it.key, it.value) }
+//            .reduce { (accDegs, accC), (listDegs, listC) ->
+//                for (i in 0..accDegs.lastIndex) {
+//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
+//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
+//                }
+//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
+//            }
+//
+//    var thisCoefficients = coefficients.toMutableMap()
+//    val otherCoefficients = other.coefficients
+//    val quotientCoefficients = HashMap<List<Int>, T>()
+//
+//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
+//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
+//
+//    while (
+//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
+//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
+//    ) {
+//        val multiplierDegs =
+//            thisLeadingTermDegs
+//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
+//                .cleanUp()
+//        val multiplierC = thisLeadingTermC / otherLeadingTermC
+//
+//        quotientCoefficients[multiplierDegs] = multiplierC
+//
+//        for ((degs, t) in otherCoefficients) {
+//            val productDegs =
+//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
+//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
+//                    .cleanUp()
+//            val productC = t * multiplierC
+//            thisCoefficients[productDegs] =
+//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
+//        }
+//
+//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
+//
+//        if (thisCoefficients.isEmpty())
+//            return Polynomial.Companion.DividingResult(
+//                Polynomial(quotientCoefficients, toCheckInput = false),
+//                Polynomial(thisCoefficients, toCheckInput = false)
+//            )
+//
+//        val t = thisCoefficients.leadingTerm()
+//        thisLeadingTermDegs = t.first
+//        thisLeadingTermC = t.second
+//    }
+//
+//    return Polynomial.Companion.DividingResult(
+//        Polynomial(quotientCoefficients, toCheckInput = false),
+//        Polynomial(thisCoefficients, toCheckInput = false)
+//    )
+//}
+//
+//// endregion
+
+// endregion
+
+//// region Polynomial substitution and functional representation
+//
+//public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Variable, C>): LabeledPolynomial<C> = ring {
+//    if (coefficients.isEmpty()) return this@substitute
+//    LabeledPolynomial<C>(
+//        buildMap {
+//            coefficients.forEach { (degs, c) ->
+//                val newDegs = degs.filterKeys { it !in args }
+//                val newC = degs.entries.asSequence().filter { it.key in args }.fold(c) { acc, (variable, deg) ->
+//                    multiplyWithPower(acc, args[variable]!!, deg)
+//                }
+//                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
+//            }
+//        }
+//    )
+//}
+//
+//// TODO: Replace with optimisation: the [result] may be unboxed, and all operations may be performed as soon as
+////  possible on it
+//@JvmName("substitutePolynomial")
+//fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, arg: Map<Variable, LabeledPolynomial<C>>) : LabeledPolynomial<C> =
+//    ring.labeledPolynomial {
+//        if (coefficients.isEmpty()) return zero
+//        coefficients
+//            .asSequence()
+//            .map { (degs, c) ->
+//                degs.entries
+//                    .asSequence()
+//                    .filter { it.key in arg }
+//                    .fold(LabeledPolynomial(mapOf(degs.filterKeys { it !in arg } to c))) { acc, (index, deg) ->
+//                        multiplyWithPower(acc, arg[index]!!, deg)
+//                    }
+//            }
+//            .reduce { acc, polynomial -> acc + polynomial } // TODO: Rewrite. Might be slow.
+//    }
+//
+//// TODO: Substitute rational function
+//
+//fun <C, A : Ring<C>> LabeledPolynomial<C>.asFunctionOver(ring: A): (Map<Variable, C>) -> LabeledPolynomial<C> =
+//    { substitute(ring, it) }
+//
+//fun <C, A : Ring<C>> LabeledPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Variable, LabeledPolynomial<C>>) -> LabeledPolynomial<C> =
+//    { substitute(ring, it) }
+//
+//// endregion
+
+//// region Algebraic derivative and antiderivative
+//// TODO
+//// endregion
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
new file mode 100644
index 000000000..d4053442d
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
@@ -0,0 +1,605 @@
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
+import kotlin.contracts.*
+import kotlin.jvm.JvmName
+
+
+// TODO: Docs
+
+// region Sort of legacy
+
+//// region Constants
+//
+//// TODO: Reuse underlying ring extensions
+//
+//context(NumberedPolynomialSpace<C, A>)
+//@Suppress("NOTHING_TO_INLINE")
+//public fun <C, A: Ring<C>> numberConstant(value: Int): C = ring { number<C>(value) }
+//
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> multiplyWithPower(base: C, arg: C, pow: UInt): C = ring { multiplyWithPower<C>(base, arg, pow) }
+//
+//// endregion
+
+//// region Polynomials
+//
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> number(value: Int): NumberedPolynomial<C> = ring { NumberedPolynomial<C>(mapOf(emptyList<UInt>() to number<C>(value))) }
+//
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> multiplyWithPower(base: NumberedPolynomial<C>, arg: NumberedPolynomial<C>, pow: UInt): NumberedPolynomial<C> =
+//    when {
+//        arg.isZero() && pow > 0U -> base
+//        arg.isOne() -> base
+//        arg.isMinusOne() -> if (pow % 2U == 0U) base else -base
+//        else -> multiplyWithPowerInternalLogic(base, arg, pow)
+//    }
+//
+//// Trivial but slow as duck
+//context(NumberedPolynomialSpace<C, A>)
+//internal tailrec fun <C, A: Ring<C>> multiplyWithPowerInternalLogic(base: NumberedPolynomial<C>, arg: NumberedPolynomial<C>, exponent: UInt): NumberedPolynomial<C> =
+//    when {
+//        exponent == 0U -> base
+//        exponent == 1U -> base * arg
+//        exponent % 2U == 0U -> multiplyWithPowerInternalLogic(base, arg * arg, exponent / 2U)
+//        exponent % 2U == 1U -> multiplyWithPowerInternalLogic(base * arg, arg * arg, exponent / 2U)
+//        else -> error("Error in raising ring instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
+//    }
+//
+//// endregion
+
+// endregion
+
+// region Utilities
+
+// TODO: Docs
+@OptIn(ExperimentalContracts::class)
+public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolynomialSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return NumberedPolynomialSpace(this).block()
+}
+
+// endregion
+
+//// region String representations
+//
+///**
+// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`.
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.represent(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .mapIndexed { index, deg ->
+//                                when (deg) {
+//                                    0U -> ""
+//                                    1U -> "${withVariableName}_${index+1}"
+//                                    else -> "${withVariableName}_${index+1}^$deg"
+//                                }
+//                            }
+//                            .filter { it.isNotEmpty() }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer].
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.represent(namer: (Int) -> String): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .mapIndexed { index, deg ->
+//                                when (deg) {
+//                                    0U -> ""
+//                                    1U -> namer(index)
+//                                    else -> "${namer(index)}^$deg"
+//                                }
+//                            }
+//                            .filter { it.isNotEmpty() }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`
+// * and with brackets around the string if needed (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representWithBrackets(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
+//    with(represent(withVariableName)) { if (coefficients.count() == 1) this else "($this)" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
+// * (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representWithBrackets(namer: (Int) -> String): String =
+//    with(represent(namer)) { if (coefficients.count() == 1) this else "($this)" }
+//
+///**
+// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`.
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversed(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> -NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .mapIndexed { index, deg ->
+//                                when (deg) {
+//                                    0U -> ""
+//                                    1U -> "${withVariableName}_${index+1}"
+//                                    else -> "${withVariableName}_${index+1}^$deg"
+//                                }
+//                            }
+//                            .filter { it.isNotEmpty() }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer].
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversed(namer: (Int) -> String): String =
+//    coefficients.entries
+//        .sortedWith { o1, o2 -> -NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
+//        .asSequence()
+//        .map { (degs, t) ->
+//            if (degs.isEmpty()) "$t"
+//            else {
+//                when {
+//                    t.isOne() -> ""
+//                    t.isMinusOne() -> "-"
+//                    else -> "$t "
+//                } +
+//                        degs
+//                            .mapIndexed { index, deg ->
+//                                when (deg) {
+//                                    0U -> ""
+//                                    1U -> namer(index)
+//                                    else -> "${namer(index)}^$deg"
+//                                }
+//                            }
+//                            .filter { it.isNotEmpty() }
+//                            .joinToString(separator = " ") { it }
+//            }
+//        }
+//        .joinToString(separator = " + ") { it }
+//        .ifEmpty { "0" }
+//
+///**
+// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`
+// * and with brackets around the string if needed (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversedWithBrackets(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
+//    with(representReversed(withVariableName)) { if (coefficients.count() == 1) this else "($this)" }
+//
+///**
+// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
+// * (i.e. when there are at least two addends in the representation).
+// * Consider that monomials are sorted in **reversed** lexicographic order.
+// */
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversedWithBrackets(namer: (Int) -> String): String =
+//    with(representReversed(namer)) { if (coefficients.count() == 1) this else "($this)" }
+//
+//// endregion
+
+//// region Polynomial substitution and functional representation
+//
+//public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
+//    if (coefficients.isEmpty()) return this@substitute
+//    NumberedPolynomial<C>(
+//        buildMap {
+//            coefficients.forEach { (degs, c) ->
+//                val newDegs = degs.mapIndexed { index, deg -> if (index in args) 0U else deg }.cleanUp()
+//                val newC = degs.foldIndexed(c) { index, acc, deg ->
+//                    if (index in args) multiplyWithPower(acc, args[index]!!, deg)
+//                    else acc
+//                }
+//                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
+//            }
+//        }
+//    )
+//}
+//
+//// TODO: Replace with optimisation: the [result] may be unboxed, and all operations may be performed as soon as
+////  possible on it
+//@JvmName("substitutePolynomial")
+//public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, arg: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> =
+//    ring.numberedPolynomialSpace {
+//        if (coefficients.isEmpty()) return zero
+//        coefficients
+//            .asSequence()
+//            .map { (degs, c) ->
+//                degs.foldIndexed(
+//                    NumberedPolynomial(
+//                        degs.mapIndexed { index, deg -> if (index in arg) 0U else deg } to c
+//                    )
+//                ) { index, acc, deg -> if (index in arg) multiplyWithPower(acc, arg[index]!!, deg) else acc }
+//            }
+//            .reduce { acc, polynomial -> acc + polynomial } // TODO: Rewrite. Might be slow.
+//    }
+//
+//// TODO: Substitute rational function
+//
+//public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunctionOver(ring: A): (Map<Int, C>) -> NumberedPolynomial<C> =
+//    { substitute(ring, it) }
+//
+//public fun <C, A : Ring<C>> NumberedPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> =
+//    { substitute(ring, it) }
+//
+//// endregion
+
+// region Operator extensions
+
+//// region Field case
+//
+//operator fun <T: Field<T>> Polynomial<T>.div(other: Polynomial<T>): Polynomial<T> {
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    if (isZero()) return this
+//
+//    fun Map<List<Int>, T>.leadingTerm() =
+//        this
+//            .asSequence()
+//            .map { Pair(it.key, it.value) }
+//            .reduce { (accDegs, accC), (listDegs, listC) ->
+//                for (i in 0..accDegs.lastIndex) {
+//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
+//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
+//                }
+//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
+//            }
+//
+//    var thisCoefficients = coefficients.toMutableMap()
+//    val otherCoefficients = other.coefficients
+//    val quotientCoefficients = HashMap<List<Int>, T>()
+//
+//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
+//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
+//
+//    while (
+//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
+//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
+//    ) {
+//        val multiplierDegs =
+//            thisLeadingTermDegs
+//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
+//                .cleanUp()
+//        val multiplierC = thisLeadingTermC / otherLeadingTermC
+//
+//        quotientCoefficients[multiplierDegs] = multiplierC
+//
+//        for ((degs, t) in otherCoefficients) {
+//            val productDegs =
+//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
+//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
+//                    .cleanUp()
+//            val productC = t * multiplierC
+//            thisCoefficients[productDegs] =
+//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
+//        }
+//
+//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
+//
+//        if (thisCoefficients.isEmpty())
+//            return Polynomial(quotientCoefficients, toCheckInput = false)
+//
+//        val t = thisCoefficients.leadingTerm()
+//        thisLeadingTermDegs = t.first
+//        thisLeadingTermC = t.second
+//    }
+//
+//    return Polynomial(quotientCoefficients, toCheckInput = false)
+//}
+//
+//operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    else
+//        Polynomial(
+//            coefficients
+//                .mapValues { it.value / other },
+//            toCheckInput = false
+//        )
+//
+//operator fun <T: Field<T>> Polynomial<T>.rem(other: Polynomial<T>): Polynomial<T> {
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    if (isZero()) return this
+//
+//    fun Map<List<Int>, T>.leadingTerm() =
+//        this
+//            .asSequence()
+//            .map { Pair(it.key, it.value) }
+//            .reduce { (accDegs, accC), (listDegs, listC) ->
+//                for (i in 0..accDegs.lastIndex) {
+//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
+//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
+//                }
+//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
+//            }
+//
+//    var thisCoefficients = coefficients.toMutableMap()
+//    val otherCoefficients = other.coefficients
+//
+//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
+//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
+//
+//    while (
+//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
+//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
+//    ) {
+//        val multiplierDegs =
+//            thisLeadingTermDegs
+//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
+//                .cleanUp()
+//        val multiplierC = thisLeadingTermC / otherLeadingTermC
+//
+//        for ((degs, t) in otherCoefficients) {
+//            val productDegs =
+//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
+//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
+//                    .cleanUp()
+//            val productC = t * multiplierC
+//            thisCoefficients[productDegs] =
+//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
+//        }
+//
+//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
+//
+//        if (thisCoefficients.isEmpty())
+//            return Polynomial(thisCoefficients, toCheckInput = false)
+//
+//        val t = thisCoefficients.leadingTerm()
+//        thisLeadingTermDegs = t.first
+//        thisLeadingTermC = t.second
+//    }
+//
+//    return Polynomial(thisCoefficients, toCheckInput = false)
+//}
+//
+//infix fun <T: Field<T>> Polynomial<T>.divrem(other: Polynomial<T>): Polynomial.Companion.DividingResult<T> {
+//    if (other.isZero()) throw ArithmeticException("/ by zero")
+//    if (isZero()) return Polynomial.Companion.DividingResult(this, this)
+//
+//    fun Map<List<Int>, T>.leadingTerm() =
+//        this
+//            .asSequence()
+//            .map { Pair(it.key, it.value) }
+//            .reduce { (accDegs, accC), (listDegs, listC) ->
+//                for (i in 0..accDegs.lastIndex) {
+//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
+//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
+//                }
+//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
+//            }
+//
+//    var thisCoefficients = coefficients.toMutableMap()
+//    val otherCoefficients = other.coefficients
+//    val quotientCoefficients = HashMap<List<Int>, T>()
+//
+//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
+//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
+//
+//    while (
+//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
+//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
+//    ) {
+//        val multiplierDegs =
+//            thisLeadingTermDegs
+//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
+//                .cleanUp()
+//        val multiplierC = thisLeadingTermC / otherLeadingTermC
+//
+//        quotientCoefficients[multiplierDegs] = multiplierC
+//
+//        for ((degs, t) in otherCoefficients) {
+//            val productDegs =
+//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
+//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
+//                    .cleanUp()
+//            val productC = t * multiplierC
+//            thisCoefficients[productDegs] =
+//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
+//        }
+//
+//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
+//
+//        if (thisCoefficients.isEmpty())
+//            return Polynomial.Companion.DividingResult(
+//                Polynomial(quotientCoefficients, toCheckInput = false),
+//                Polynomial(thisCoefficients, toCheckInput = false)
+//            )
+//
+//        val t = thisCoefficients.leadingTerm()
+//        thisLeadingTermDegs = t.first
+//        thisLeadingTermC = t.second
+//    }
+//
+//    return Polynomial.Companion.DividingResult(
+//        Polynomial(quotientCoefficients, toCheckInput = false),
+//        Polynomial(thisCoefficients, toCheckInput = false)
+//    )
+//}
+//
+//// endregion
+
+// endregion
+
+// region Polynomial substitution and functional representation
+
+// TODO: May be apply Horner's method too?
+/**
+ * Evaluates the value of the given double polynomial for given double argument.
+ */
+public fun NumberedPolynomial<Double>.substitute(args: Map<Int, Double>): NumberedPolynomial<Double> = Double.algebra {
+    val acc = LinkedHashMap<List<UInt>, Double>(coefficients.size)
+    for ((degs, c) in coefficients) {
+        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
+        val newC = args.entries.fold(c) { product, (variable, substitutor) ->
+            val deg = degs.getOrElse(variable) { 0u }
+            if (deg == 0u) product else product * substitutor.pow(deg.toInt())
+        }
+        if (newDegs !in acc) acc[newDegs] = c
+        else acc[newDegs] = acc[newDegs]!! + c
+    }
+    return NumberedPolynomial<Double>(acc)
+}
+
+/**
+ * Evaluates the value of the given polynomial for given argument.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */
+public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
+    val acc = LinkedHashMap<List<UInt>, C>(coefficients.size)
+    for ((degs, c) in coefficients) {
+        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
+        val newC = args.entries.fold(c) { product, (variable, substitutor) ->
+            val deg = degs.getOrElse(variable) { 0u }
+            if (deg == 0u) product else product * power(substitutor, deg)
+        }
+        if (newDegs !in acc) acc[newDegs] = c
+        else acc[newDegs] = acc[newDegs]!! + c
+    }
+    return NumberedPolynomial<C>(acc)
+}
+
+// TODO: (Waiting for hero) Replace with optimisation: the [result] may be unboxed, and all operations may be performed
+//  as soon as possible on it
+@JvmName("substitutePolynomial")
+public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> = TODO() /*ring.numberedPolynomial {
+    val acc = LinkedHashMap<List<UInt>, NumberedPolynomial<C>>(coefficients.size)
+    for ((degs, c) in coefficients) {
+        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
+        val newC = args.entries.fold(c.asNumberedPolynomial()) { product, (variable, substitutor) ->
+            val deg = degs.getOrElse(variable) { 0u }
+            if (deg == 0u) product else product * power(substitutor, deg)
+        }
+        if (newDegs !in acc) acc[newDegs] = c.asNumberedPolynomial()
+        else acc[newDegs] = acc[newDegs]!! + c
+    }
+}*/
+
+/**
+ * Represent the polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunction(ring: A): (Map<Int, C>) -> NumberedPolynomial<C> = { substitute(ring, it) }
+
+/**
+ * Represent the polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> = { substitute(ring, it) }
+
+// endregion
+
+// region Algebraic derivative and antiderivative
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> NumberedPolynomial<C>.derivativeBy(
+    algebra: A,
+    variable: Int,
+): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
+    TODO()
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> NumberedPolynomial<C>.derivativeBy(
+    algebra: A,
+    variables: IntArray,
+): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
+    TODO()
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> NumberedPolynomial<C>.derivativeBy(
+    algebra: A,
+    variables: Collection<Int>,
+): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = derivativeBy(algebra, variables.toIntArray())
+
+/**
+ * Create a polynomial witch represents indefinite integral version of this polynomial
+ */
+@UnstableKMathAPI
+public fun <C, A> NumberedPolynomial<C>.antiderivativeBy(
+    algebra: A,
+    variable: Int,
+): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
+    TODO()
+}
+
+/**
+ * Create a polynomial witch represents indefinite integral version of this polynomial
+ */
+@UnstableKMathAPI
+public fun <C, A> NumberedPolynomial<C>.antiderivativeBy(
+    algebra: A,
+    variables: IntArray,
+): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
+    TODO()
+}
+
+/**
+ * Create a polynomial witch represents indefinite integral version of this polynomial
+ */
+@UnstableKMathAPI
+public fun <C, A> NumberedPolynomial<C>.antiderivativeBy(
+    algebra: A,
+    variables: Collection<Int>,
+): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = antiderivativeBy(algebra, variables.toIntArray())
+
+// endregion
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index 1a3eb7874..4d99b3a45 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -121,7 +121,7 @@ public fun <C, A> Polynomial<C>.antiderivative(
 ): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
     val integratedCoefficients = buildList(coefficients.size + 1) {
         add(zero)
-        coefficients.forEachIndexed{ index, t -> add(t / (number(index) + one)) }
+        coefficients.forEachIndexed{ index, t -> add(t / number(index + 1)) }
     }
     Polynomial(integratedCoefficients)
 }
@@ -136,4 +136,6 @@ public fun <C : Comparable<C>> Polynomial<C>.integrate(
 ): C = algebra {
     val integral = antiderivative(algebra)
     integral.substitute(algebra, range.endInclusive) - integral.substitute(algebra, range.start)
-}
\ No newline at end of file
+}
+
+// endregion
\ No newline at end of file
-- 
2.34.1


From 033edd3febfc36983a1fd6319941ba453531b6f5 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 13 Mar 2022 03:55:51 +0300
Subject: [PATCH 426/713] Removed kotlin-js-store

---
 kotlin-js-store/yarn.lock | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 kotlin-js-store/yarn.lock

diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
deleted file mode 100644
index e69de29bb..000000000
-- 
2.34.1


From de53d032afbe7da603b7bc7cc919718c0c193811 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 14 Mar 2022 14:14:24 +0300
Subject: [PATCH 427/713] 1. Prototyped Rational Functions 2. Added abstract
 interfaces for removing boilerplates 3. Changed or added default values in
 interfaces 4. Renamed non-operator `equals` to `equalsTo`, and made it infix

---
 .../kmath/functions/AbstractPolynomial.kt     | 128 ++++-
 .../functions/AbstractRationalFunction.kt     | 500 ++++++++++++++++--
 .../kmath/functions/LabeledPolynomial.kt      |  24 +-
 .../kmath/functions/NumberedPolynomial.kt     |  74 +--
 .../kscience/kmath/functions/Polynomial.kt    |  51 +-
 .../kmath/functions/RationalFunction.kt       | 355 +++++++++++++
 .../kmath/functions/rationalFunctionUtil.kt   |  34 ++
 7 files changed, 998 insertions(+), 168 deletions(-)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
index b7b7116f0..69c45798a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -154,7 +154,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * Check if the instant is NOT zero constant.
      */
     @JvmName("constantIsNotZero")
-    public fun C.isNotZero(): Boolean
+    public fun C.isNotZero(): Boolean = !isZero()
     /**
      * Check if the instant is unit constant.
      */
@@ -164,7 +164,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * Check if the instant is NOT unit constant.
      */
     @JvmName("constantIsNotOne")
-    public fun C.isNotOne(): Boolean
+    public fun C.isNotOne(): Boolean = !isOne()
     /**
      * Check if the instant is minus unit constant.
      */
@@ -174,7 +174,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * Check if the instant is NOT minus unit constant.
      */
     @JvmName("constantIsNotMinusOne")
-    public fun C.isNotMinusOne(): Boolean
+    public fun C.isNotMinusOne(): Boolean = !isMinusOne()
     // endregion
 
     // region Constant-polynomial relation
@@ -232,27 +232,27 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
     /**
      * Check if the instant is zero polynomial.
      */
-    public fun P.isZero(): Boolean = this == zero
+    public fun P.isZero(): Boolean = this equalsTo zero
     /**
      * Check if the instant is NOT zero polynomial.
      */
-    public fun P.isNotZero(): Boolean = this != zero
+    public fun P.isNotZero(): Boolean = !isZero()
     /**
      * Check if the instant is unit polynomial.
      */
-    public fun P.isOne(): Boolean = this == one
+    public fun P.isOne(): Boolean = this equalsTo one
     /**
      * Check if the instant is NOT unit polynomial.
      */
-    public fun P.isNotOne(): Boolean = this != one
+    public fun P.isNotOne(): Boolean = !isOne()
     /**
      * Check if the instant is minus unit polynomial.
      */
-    public fun P.isMinusOne(): Boolean = this == -one
+    public fun P.isMinusOne(): Boolean = this equalsTo -one
     /**
      * Check if the instant is NOT minus unit polynomial.
      */
-    public fun P.isNotMinusOne(): Boolean = this != -one
+    public fun P.isNotMinusOne(): Boolean = !isMinusOne()
 
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
@@ -266,8 +266,11 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
     /**
      * Checks equality of the polynomials.
      */
-    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
-    public fun P.equals(other: P): Boolean
+    public infix fun P.equalsTo(other: P): Boolean
+    /**
+     * Checks NOT equality of the polynomials.
+     */
+    public infix fun P.notEqualsTo(other: P): Boolean = !(this equalsTo other)
     // endregion
 
     // Not sure is it necessary...
@@ -310,4 +313,107 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
     override fun add(left: P, right: P): P = left + right
     override fun multiply(left: P, right: P): P = left * right
     // endregion
+}
+
+/**
+ * Abstraction of ring of polynomials of type [P] over ring of constants of type [C].
+ *
+ * @param C the type of constants. Polynomials have them as a coefficients in their terms.
+ * @param P the type of polynomials.
+ */
+@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A: Ring<C>> : AbstractPolynomialSpace<C, P> {
+
+    public val ring: A
+
+    // region Constant-integer relation
+    /**
+     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     */
+    @JvmName("constantIntPlus")
+    public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
+    /**
+     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    @JvmName("constantIntMinus")
+    public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
+    /**
+     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    @JvmName("constantIntTimes")
+    public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
+    // endregion
+
+    // region Integer-constant relation
+    /**
+     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    @JvmName("intConstantPlus")
+    public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
+    /**
+     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    @JvmName("intConstantMinus")
+    public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
+    /**
+     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    @JvmName("intConstantTimes")
+    public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
+    // endregion
+
+    // region Constant-constant relation
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("constantUnaryMinus")
+    @JsName("constantUnaryMinus")
+    public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("constantPlus")
+    @JsName("constantPlus")
+    public override operator fun C.plus(other: C): C = ring { this@plus + other }
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("constantMinus")
+    @JsName("constantMinus")
+    public override operator fun C.minus(other: C): C = ring { this@minus - other }
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("constantTimes")
+    @JsName("constantTimes")
+    public override operator fun C.times(other: C): C = ring { this@times * other }
+
+    /**
+     * Check if the instant is zero constant.
+     */
+    @JvmName("constantIsZero")
+    public override fun C.isZero(): Boolean = ring { this == zero }
+    /**
+     * Check if the instant is unit constant.
+     */
+    @JvmName("constantIsOne")
+    public override fun C.isOne(): Boolean = ring { this == one }
+    /**
+     * Check if the instant is minus unit constant.
+     */
+    @JvmName("constantIsMinusOne")
+    public override fun C.isMinusOne(): Boolean = ring { this == -one }
+    // endregion
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
index 34050aa0f..9725ea078 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -13,7 +13,12 @@ import kotlin.jvm.JvmName
 /**
  * Abstraction of rational function.
  */
-public interface AbstractRationalFunction<C, P: AbstractPolynomial<C>>
+public interface AbstractRationalFunction<C, P: AbstractPolynomial<C>> {
+    public val numerator: P
+    public val denominator: P
+    public operator fun component1(): P = numerator
+    public operator fun component2(): P = denominator
+}
 
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
 public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R: AbstractRationalFunction<C, P>> : Ring<R> {
@@ -190,7 +195,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Check if the instant is NOT zero constant.
      */
     @JvmName("constantIsNotZero")
-    public fun C.isNotZero(): Boolean
+    public fun C.isNotZero(): Boolean = !isZero()
     /**
      * Check if the instant is unit constant.
      */
@@ -200,7 +205,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Check if the instant is NOT unit constant.
      */
     @JvmName("constantIsNotOne")
-    public fun C.isNotOne(): Boolean
+    public fun C.isNotOne(): Boolean = !isOne()
     /**
      * Check if the instant is minus unit constant.
      */
@@ -210,7 +215,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Check if the instant is NOT minus unit constant.
      */
     @JvmName("constantIsNotMinusOne")
-    public fun C.isNotMinusOne(): Boolean
+    public fun C.isNotMinusOne(): Boolean = !isMinusOne()
     // endregion
 
     // region Constant-polynomial relation
@@ -268,42 +273,45 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
     /**
      * Check if the instant is zero polynomial.
      */
-    public fun P.isZero(): Boolean = this == zeroPolynomial
+    public fun P.isZero(): Boolean = this equalsTo polynomialZero
     /**
      * Check if the instant is NOT zero polynomial.
      */
-    public fun P.isNotZero(): Boolean = this != zeroPolynomial
+    public fun P.isNotZero(): Boolean = !isZero()
     /**
      * Check if the instant is unit polynomial.
      */
-    public fun P.isOne(): Boolean = this == onePolynomial
+    public fun P.isOne(): Boolean = this equalsTo polynomialOne
     /**
      * Check if the instant is NOT unit polynomial.
      */
-    public fun P.isNotOne(): Boolean = this != onePolynomial
+    public fun P.isNotOne(): Boolean = !isOne()
     /**
      * Check if the instant is minus unit polynomial.
      */
-    public fun P.isMinusOne(): Boolean = this == -onePolynomial
+    public fun P.isMinusOne(): Boolean = this equalsTo -polynomialOne
     /**
      * Check if the instant is NOT minus unit polynomial.
      */
-    public fun P.isNotMinusOne(): Boolean = this != -onePolynomial
+    public fun P.isNotMinusOne(): Boolean = !isMinusOne()
 
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
      */
-    public val zeroPolynomial: P
+    public val polynomialZero: P
     /**
      * Instance of unit polynomial (unit of the polynomial ring).
      */
-    public val onePolynomial: P
+    public val polynomialOne: P
 
     /**
      * Checks equality of the polynomials.
      */
-    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
-    public fun P.equals(other: P): Boolean
+    public infix fun P.equalsTo(other: P): Boolean
+    /**
+     * Checks NOT equality of the polynomials.
+     */
+    public infix fun P.notEqualsTo(other: P): Boolean = !(this equalsTo other)
     // endregion
 
     // region Constant-rational relation
@@ -391,27 +399,27 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
     /**
      * Check if the instant is zero rational function.
      */
-    public fun R.isZero(): Boolean = this == zero
+    public fun R.isZero(): Boolean = this equalsTo zero
     /**
      * Check if the instant is NOT zero rational function.
      */
-    public fun R.isNotZero(): Boolean = this != zero
+    public fun R.isNotZero(): Boolean = !isZero()
     /**
      * Check if the instant is unit rational function.
      */
-    public fun R.isOne(): Boolean = this == one
+    public fun R.isOne(): Boolean = this equalsTo one
     /**
      * Check if the instant is NOT unit rational function.
      */
-    public fun R.isNotOne(): Boolean = this != one
+    public fun R.isNotOne(): Boolean = !isOne()
     /**
      * Check if the instant is minus unit rational function.
      */
-    public fun R.isMinusOne(): Boolean = this == -one
+    public fun R.isMinusOne(): Boolean = this equalsTo -one
     /**
      * Check if the instant is NOT minus unit rational function.
      */
-    public fun R.isNotMinusOne(): Boolean = this != -one
+    public fun R.isNotMinusOne(): Boolean = !isMinusOne()
 
     /**
      * Instance of zero rational function (zero of the rational functions ring).
@@ -425,8 +433,11 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
     /**
      * Checks equality of the rational functions.
      */
-    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
-    public fun R.equals(other: R): Boolean
+    public infix fun R.equalsTo(other: R): Boolean
+    /**
+     * Checks NOT equality of the polynomials.
+     */
+    public infix fun R.notEqualsTo(other: R): Boolean = !(this equalsTo other)
     // endregion
 
     // Not sure is it necessary...
@@ -453,35 +464,31 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
      */
     public fun P.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
-
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
+     */
     public fun P.asConstantOrNull(): C?
-
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
+     */
     public fun P.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
 
     // endregion
 
     // Not sure is it necessary...
-    // region Polynomial properties
+    // region Rational properties
     /**
-     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
      */
-    public fun R.isConstant(): Boolean
+    public val R.numeratorDegree: Int get() = numerator.degree
     /**
-     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
      */
-    public fun R.isNotConstant(): Boolean = !isConstant()
-    /**
-     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun R.isNonZeroConstant(): Boolean
-    /**
-     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun R.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
-
-    public fun R.asConstantOrNull(): C?
-
-    public fun R.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
+    public val R.denominatorDegree: Int get() = denominator.degree
 
     // TODO: Перенести в реализацию
 //    fun R.substitute(argument: C): C
@@ -501,5 +508,416 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
     // region Legacy
     override fun add(left: R, right: R): R = left + right
     override fun multiply(left: R, right: R): R = left * right
+    // endregion
+}
+
+@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomial<C>, R: AbstractRationalFunction<C, P>, A: Ring<C>> : AbstractRationalFunctionalSpace<C, P, R> {
+
+    public val ring: A
+
+    // region Constant-integer relation
+    /**
+     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     */
+    @JvmName("constantIntPlus")
+    public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
+    /**
+     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    @JvmName("constantIntMinus")
+    public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
+    /**
+     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    @JvmName("constantIntTimes")
+    public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
+    // endregion
+
+    // region Integer-constant relation
+    /**
+     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    @JvmName("intConstantPlus")
+    public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
+    /**
+     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    @JvmName("intConstantMinus")
+    public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
+    /**
+     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    @JvmName("intConstantTimes")
+    public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
+    // endregion
+
+    // region Constant-constant relation
+    /**
+     * Returns the same constant.
+     */
+    @JvmName("constantUnaryPlus")
+    @JsName("constantUnaryPlus")
+    public override operator fun C.unaryPlus(): C = ring { +this@unaryPlus }
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("constantUnaryMinus")
+    @JsName("constantUnaryMinus")
+    public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("constantPlus")
+    @JsName("constantPlus")
+    public override operator fun C.plus(other: C): C = ring { this@plus + other }
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("constantMinus")
+    @JsName("constantMinus")
+    public override operator fun C.minus(other: C): C = ring { this@minus - other }
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("constantTimes")
+    @JsName("constantTimes")
+    public override operator fun C.times(other: C): C = ring { this@times * other }
+
+    /**
+     * Check if the instant is zero constant.
+     */
+    @JvmName("constantIsZero")
+    public override fun C.isZero(): Boolean = ring { this@isZero.isZero() }
+    /**
+     * Check if the instant is NOT zero constant.
+     */
+    @JvmName("constantIsNotZero")
+    public override fun C.isNotZero(): Boolean = ring { this@isNotZero.isNotZero() }
+    /**
+     * Check if the instant is unit constant.
+     */
+    @JvmName("constantIsOne")
+    public override fun C.isOne(): Boolean = ring { this@isOne.isOne() }
+    /**
+     * Check if the instant is NOT unit constant.
+     */
+    @JvmName("constantIsNotOne")
+    public override fun C.isNotOne(): Boolean = ring { this@isNotOne.isNotOne() }
+    /**
+     * Check if the instant is minus unit constant.
+     */
+    @JvmName("constantIsMinusOne")
+    public override fun C.isMinusOne(): Boolean = ring { this@isMinusOne.isMinusOne() }
+    /**
+     * Check if the instant is NOT minus unit constant.
+     */
+    @JvmName("constantIsNotMinusOne")
+    public override fun C.isNotMinusOne(): Boolean = ring { this@isNotMinusOne.isNotMinusOne() }
+    // endregion
+}
+
+@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<C, P: AbstractPolynomial<C>, R: AbstractRationalFunction<C, P>, A: Ring<C>> : AbstractRationalFunctionalSpace<C, P, R> {
+
+    public val polynomialRing: AbstractPolynomialSpace<C, P>
+
+    // region Constant-integer relation
+    /**
+     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     */
+    @JvmName("constantIntPlus")
+    public override operator fun C.plus(other: Int): C = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    @JvmName("constantIntMinus")
+    public override operator fun C.minus(other: Int): C = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    @JvmName("constantIntTimes")
+    public override operator fun C.times(other: Int): C = polynomialRing { this@times * other }
+    // endregion
+
+    // region Integer-constant relation
+    /**
+     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    @JvmName("intConstantPlus")
+    public override operator fun Int.plus(other: C): C = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    @JvmName("intConstantMinus")
+    public override operator fun Int.minus(other: C): C = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    @JvmName("intConstantTimes")
+    public override operator fun Int.times(other: C): C = polynomialRing { this@times * other }
+    // endregion
+
+    // region Polynomial-integer relation
+    /**
+     * Returns sum of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public override operator fun P.plus(other: Int): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public override operator fun P.minus(other: Int): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun P.times(other: Int): P = polynomialRing { this@times * other }
+    // endregion
+
+    // region Integer-polynomial relation
+    /**
+     * Returns sum of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public override operator fun Int.plus(other: P): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public override operator fun Int.minus(other: P): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: P): P = polynomialRing { this@times * other }
+    // endregion
+
+    // region Constant-constant relation
+    /**
+     * Returns the same constant.
+     */
+    @JvmName("constantUnaryPlus")
+    @JsName("constantUnaryPlus")
+    public override operator fun C.unaryPlus(): C = polynomialRing { +this@unaryPlus }
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("constantUnaryMinus")
+    @JsName("constantUnaryMinus")
+    public override operator fun C.unaryMinus(): C = polynomialRing { -this@unaryMinus }
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("constantPlus")
+    @JsName("constantPlus")
+    public override operator fun C.plus(other: C): C = polynomialRing { this@plus + other }
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("constantMinus")
+    @JsName("constantMinus")
+    public override operator fun C.minus(other: C): C = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("constantTimes")
+    @JsName("constantTimes")
+    public override operator fun C.times(other: C): C = polynomialRing { this@times * other }
+
+    /**
+     * Check if the instant is zero constant.
+     */
+    @JvmName("constantIsZero")
+    public override fun C.isZero(): Boolean = polynomialRing { this@isZero.isZero() }
+    /**
+     * Check if the instant is NOT zero constant.
+     */
+    @JvmName("constantIsNotZero")
+    public override fun C.isNotZero(): Boolean = polynomialRing { this@isNotZero.isNotZero() }
+    /**
+     * Check if the instant is unit constant.
+     */
+    @JvmName("constantIsOne")
+    public override fun C.isOne(): Boolean = polynomialRing { this@isOne.isOne() }
+    /**
+     * Check if the instant is NOT unit constant.
+     */
+    @JvmName("constantIsNotOne")
+    public override fun C.isNotOne(): Boolean = polynomialRing { this@isNotOne.isNotOne() }
+    /**
+     * Check if the instant is minus unit constant.
+     */
+    @JvmName("constantIsMinusOne")
+    public override fun C.isMinusOne(): Boolean = polynomialRing { this@isMinusOne.isMinusOne() }
+    /**
+     * Check if the instant is NOT minus unit constant.
+     */
+    @JvmName("constantIsNotMinusOne")
+    public override fun C.isNotMinusOne(): Boolean = polynomialRing { this@isNotMinusOne.isNotMinusOne() }
+    // endregion
+
+    // region Constant-polynomial relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun C.plus(other: P): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun C.minus(other: P): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun C.times(other: P): P = polynomialRing { this@times * other }
+    // endregion
+
+    // region Polynomial-constant relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun P.plus(other: C): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun P.minus(other: C): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun P.times(other: C): P = polynomialRing { this@times * other }
+    // endregion
+
+    // region Polynomial-polynomial relation
+    /**
+     * Returns the same polynomial.
+     */
+    public override operator fun P.unaryPlus(): P = polynomialRing { +this@unaryPlus }
+    /**
+     * Returns negation of the polynomial.
+     */
+    public override operator fun P.unaryMinus(): P = polynomialRing { -this@unaryMinus }
+    /**
+     * Returns sum of the polynomials.
+     */
+    public override operator fun P.plus(other: P): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference of the polynomials.
+     */
+    public override operator fun P.minus(other: P): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the polynomials.
+     */
+    public override operator fun P.times(other: P): P = polynomialRing { this@times * other }
+
+    /**
+     * Check if the instant is zero polynomial.
+     */
+    public override fun P.isZero(): Boolean = polynomialRing { this@isZero.isZero() }
+    /**
+     * Check if the instant is NOT zero polynomial.
+     */
+    public override fun P.isNotZero(): Boolean = polynomialRing { this@isNotZero.isNotZero() }
+    /**
+     * Check if the instant is unit polynomial.
+     */
+    public override fun P.isOne(): Boolean = polynomialRing { this@isOne.isOne() }
+    /**
+     * Check if the instant is NOT unit polynomial.
+     */
+    public override fun P.isNotOne(): Boolean = polynomialRing { this@isNotOne.isNotOne() }
+    /**
+     * Check if the instant is minus unit polynomial.
+     */
+    public override fun P.isMinusOne(): Boolean = polynomialRing { this@isMinusOne.isMinusOne() }
+    /**
+     * Check if the instant is NOT minus unit polynomial.
+     */
+    public override fun P.isNotMinusOne(): Boolean = polynomialRing { this@isNotMinusOne.isNotMinusOne() }
+
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
+    public override val polynomialZero: P get() = polynomialRing.zero
+    /**
+     * Instance of unit polynomial (unit of the polynomial ring).
+     */
+    public override val polynomialOne: P get() = polynomialRing.one
+
+    /**
+     * Checks equality of the polynomials.
+     */
+    public override infix fun P.equalsTo(other: P): Boolean = polynomialRing { this@equalsTo equalsTo other }
+    /**
+     * Checks NOT equality of the polynomials.
+     */
+    public override infix fun P.notEqualsTo(other: P): Boolean = polynomialRing { this@notEqualsTo notEqualsTo other }
+    // endregion
+
+    // Not sure is it necessary...
+    // region Polynomial properties
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    public override val P.degree: Int get() = polynomialRing { this@degree.degree }
+
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public override fun P.isConstant(): Boolean = polynomialRing { this@isConstant.isConstant() }
+    /**
+     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public override fun P.isNotConstant(): Boolean = polynomialRing { this@isNotConstant.isNotConstant() }
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public override fun P.isNonZeroConstant(): Boolean = polynomialRing { this@isNonZeroConstant.isNonZeroConstant() }
+    /**
+     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public override fun P.isNotNonZeroConstant(): Boolean = polynomialRing { this@isNotNonZeroConstant.isNotNonZeroConstant() }
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
+     */
+    public override fun P.asConstantOrNull(): C? = polynomialRing { this@asConstantOrNull.asConstantOrNull() }
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
+     */
+    public override fun P.asConstant(): C = polynomialRing { this@asConstant.asConstant() }
+
     // endregion
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 48f6f57fa..cbd713d27 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -13,7 +13,7 @@ import kotlin.math.max
  *
  * @param C Ring in which the polynomial is considered.
  */
-public class LabeledPolynomial<C>
+public data class LabeledPolynomial<C>
 internal constructor(
     /**
      * Map that collects coefficients of the polynomial. Every non-zero monomial
@@ -788,7 +788,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             isZero() -> zero
             other.isZero() -> zero
             else -> LabeledPolynomial<C>(
-                buildCoefficients {
+                buildCoefficients(coefficients.size * other.coefficients.size) {
                     for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
                         val degs = degs1.toMutableMap()
                         degs2.mapValuesTo(degs) { (variable, deg) -> degs.getOrElse(variable) { 0u } + deg }
@@ -804,7 +804,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
 
     // TODO: Docs
     @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
-    override fun LabeledPolynomial<C>.equals(other: LabeledPolynomial<C>): Boolean =
+    override infix fun LabeledPolynomial<C>.equalsTo(other: LabeledPolynomial<C>): Boolean =
         when {
             this === other -> true
             else -> coefficients.size == other.coefficients.size &&
@@ -896,15 +896,9 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
 //    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Variable, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
     // endregion
 
-    // region Legacy
-    @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-    override inline fun add(left: LabeledPolynomial<C>, right: LabeledPolynomial<C>): LabeledPolynomial<C> = left + right
-    @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-    override inline fun multiply(left: LabeledPolynomial<C>, right: LabeledPolynomial<C>): LabeledPolynomial<C> = left * right
-    // endregion
-
     // region Utilities
     // TODO: Move to region internal utilities with context receiver
+    @JvmName("applyAndRemoveZerosInternal")
     internal fun MutableMap<Map<Variable, UInt>, C>.applyAndRemoveZeros(block: MutableMap<Map<Variable, UInt>, C>.() -> Unit) : MutableMap<Map<Variable, UInt>, C> {
         contract {
             callsInPlace(block, InvocationKind.EXACTLY_ONCE)
@@ -916,12 +910,20 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     internal fun Map<Map<Variable, UInt>, C>.applyAndRemoveZeros(block: MutableMap<Map<Variable, UInt>, C>.() -> Unit) : Map<Map<Variable, UInt>, C> =
         toMutableMap().applyAndRemoveZeros(block)
     @OptIn(ExperimentalTypeInference::class)
-    internal fun buildCoefficients(@BuilderInference builderAction: MutableMap<Map<Variable, UInt>, C>.() -> Unit): Map<Map<Variable, UInt>, C> {
+    internal inline fun buildCoefficients(@BuilderInference builderAction: MutableMap<Map<Variable, UInt>, C>.() -> Unit): Map<Map<Variable, UInt>, C> {
         contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
         return buildMap {
             builderAction()
             for ((degs, c) in this) if (c.isZero()) this.remove(degs)
         }
     }
+    @OptIn(ExperimentalTypeInference::class)
+    internal inline fun buildCoefficients(capacity: Int, @BuilderInference builderAction: MutableMap<Map<Variable, UInt>, C>.() -> Unit): Map<Map<Variable, UInt>, C> {
+        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
+        return buildMap(capacity) {
+            builderAction()
+            for ((degs, c) in this) if (c.isZero()) this.remove(degs)
+        }
+    }
     // endregion
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index f1ad9a74f..f11338161 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -13,7 +13,7 @@ import kotlin.math.max
  *
  * @param C the type of constants.
  */
-public class NumberedPolynomial<C>
+public data class NumberedPolynomial<C>
 internal constructor(
     /**
      * Map that collects coefficients of the polynomial. Every monomial `a x_1^{d_1} ... x_n^{d_n}` is represented as
@@ -259,27 +259,9 @@ public fun <C, A: Ring<C>> C.asNumberedPolynomial() : NumberedPolynomial<C> = Nu
  * @param ring the [A] instance.
  */
 @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE", "INAPPLICABLE_JVM_NAME")
-public class NumberedPolynomialSpace<C, A : Ring<C>>(
-    public val ring: A,
-) : AbstractPolynomialSpace<C, NumberedPolynomial<C>> {
-    // region Constant-integer relation
-    @JvmName("constantIntPlus")
-    public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
-    @JvmName("constantIntMinus")
-    public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
-    @JvmName("constantIntTimes")
-    public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
-    // endregion
-
-    // region Integer-constant relation
-    @JvmName("intConstantPlus")
-    public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
-    @JvmName("intConstantMinus")
-    public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
-    @JvmName("intConstantTimes")
-    public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
-    // endregion
-
+public open class NumberedPolynomialSpace<C, A : Ring<C>>(
+    public final override val ring: A,
+) : AbstractPolynomialSpaceOverRing<C, NumberedPolynomial<C>, A> {
     // region Polynomial-integer relation
     public override operator fun NumberedPolynomial<C>.plus(other: Int): NumberedPolynomial<C> =
         if (other == 0) this
@@ -362,29 +344,6 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
         )
     // endregion
 
-    // region Constant-constant relation
-    @JvmName("constantUnaryMinus")
-    override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
-    @JvmName("constantPlus")
-    override operator fun C.plus(other: C): C = ring { this@plus + other }
-    @JvmName("constantMinus")
-    override operator fun C.minus(other: C): C = ring { this@minus - other }
-    @JvmName("constantTimes")
-    override operator fun C.times(other: C): C = ring { this@times * other }
-    @JvmName("constantIsZero")
-    public override fun C.isZero(): Boolean = ring { this == zero }
-    @JvmName("constantIsNotZero")
-    public override fun C.isNotZero(): Boolean = ring { this != zero }
-    @JvmName("constantIsOne")
-    public override fun C.isOne(): Boolean = ring { this == one }
-    @JvmName("constantIsNotOne")
-    public override fun C.isNotOne(): Boolean = ring { this != one }
-    @JvmName("constantIsMinusOne")
-    public override fun C.isMinusOne(): Boolean = ring { this == -one }
-    @JvmName("constantIsNotMinusOne")
-    public override fun C.isNotMinusOne(): Boolean = ring { this != -one }
-    // endregion
-
     // region Constant-polynomial relation
     override operator fun C.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         if (this.isZero()) other
@@ -521,7 +480,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
             other.isZero() -> zero
             else ->
                 NumberedPolynomial<C>(
-                    buildCoefficients {
+                    buildCoefficients(coefficients.size * other.coefficients.size) {
                         for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
                             val degs =
                                 (0..max(degs1.lastIndex, degs2.lastIndex))
@@ -534,7 +493,6 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
         }
 
     public override fun NumberedPolynomial<C>.isZero(): Boolean = coefficients.values.all { it.isZero() }
-    public override fun NumberedPolynomial<C>.isNotZero(): Boolean = coefficients.values.any { it.isNotZero() }
     public override fun NumberedPolynomial<C>.isOne(): Boolean =
         with(coefficients) {
             var foundAbsoluteTermAndItIsOne = false
@@ -547,7 +505,6 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
             }
             foundAbsoluteTermAndItIsOne
         }
-    public override fun NumberedPolynomial<C>.isNotOne(): Boolean = !isOne()
     public override fun NumberedPolynomial<C>.isMinusOne(): Boolean =
         with(coefficients) {
             var foundAbsoluteTermAndItIsMinusOne = false
@@ -560,7 +517,6 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
             }
             foundAbsoluteTermAndItIsMinusOne
         }
-    public override fun NumberedPolynomial<C>.isNotMinusOne(): Boolean = !isMinusOne()
 
     override val zero: NumberedPolynomial<C> = NumberedPolynomial<C>(emptyMap())
     override val one: NumberedPolynomial<C> =
@@ -572,7 +528,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
 
     // TODO: Docs
     @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
-    override fun NumberedPolynomial<C>.equals(other: NumberedPolynomial<C>): Boolean =
+    override infix fun NumberedPolynomial<C>.equalsTo(other: NumberedPolynomial<C>): Boolean =
         when {
             this === other -> true
             else -> coefficients.size == other.coefficients.size &&
@@ -658,15 +614,9 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
     public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
     // endregion
 
-    // region Legacy
-    @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-    override inline fun add(left: NumberedPolynomial<C>, right: NumberedPolynomial<C>): NumberedPolynomial<C> = left + right
-    @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-    override inline fun multiply(left: NumberedPolynomial<C>, right: NumberedPolynomial<C>): NumberedPolynomial<C> = left * right
-    // endregion
-
     // region Utilities
     // TODO: Move to region internal utilities with context receiver
+    @JvmName("applyAndRemoveZerosInternal")
     internal fun MutableMap<List<UInt>, C>.applyAndRemoveZeros(block: MutableMap<List<UInt>, C>.() -> Unit) : MutableMap<List<UInt>, C> {
         contract {
             callsInPlace(block, InvocationKind.EXACTLY_ONCE)
@@ -678,12 +628,20 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
     internal fun Map<List<UInt>, C>.applyAndRemoveZeros(block: MutableMap<List<UInt>, C>.() -> Unit) : Map<List<UInt>, C> =
         toMutableMap().applyAndRemoveZeros(block)
     @OptIn(ExperimentalTypeInference::class)
-    internal fun buildCoefficients(@BuilderInference builderAction: MutableMap<List<UInt>, C>.() -> Unit): Map<List<UInt>, C> {
+    internal inline fun buildCoefficients(@BuilderInference builderAction: MutableMap<List<UInt>, C>.() -> Unit): Map<List<UInt>, C> {
         contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
         return buildMap {
             builderAction()
             for ((degs, c) in this) if (c.isZero()) this.remove(degs)
         }
     }
+    @OptIn(ExperimentalTypeInference::class)
+    internal inline fun buildCoefficients(capacity: Int, @BuilderInference builderAction: MutableMap<List<UInt>, C>.() -> Unit): Map<List<UInt>, C> {
+        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
+        return buildMap(capacity) {
+            builderAction()
+            for ((degs, c) in this) if (c.isZero()) this.remove(degs)
+        }
+    }
     // endregion
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 99d6b0659..2c764f4f5 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -15,7 +15,7 @@ import kotlin.math.min
  *
  * @param coefficients constant is the leftmost coefficient.
  */
-public class Polynomial<T>(public val coefficients: List<T>) : AbstractPolynomial<T> {
+public data class Polynomial<T>(public val coefficients: List<T>) : AbstractPolynomial<T> {
     override fun toString(): String = "Polynomial$coefficients"
 }
 
@@ -69,25 +69,8 @@ public fun <T> T.asPolynomial() : Polynomial<T> = Polynomial(listOf(this))
  */
 @Suppress("INAPPLICABLE_JVM_NAME") // TODO: KT-31420
 public open class PolynomialSpace<C, A : Ring<C>>(
-    public val ring: A,
-) : AbstractPolynomialSpace<C, Polynomial<C>> {
-    // region Constant-integer relation
-    @JvmName("constantIntPlus")
-    public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
-    @JvmName("constantIntMinus")
-    public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
-    @JvmName("constantIntTimes")
-    public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
-    // endregion
-
-    // region Integer-constant relation
-    @JvmName("intConstantPlus")
-    public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
-    @JvmName("intConstantMinus")
-    public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
-    @JvmName("intConstantTimes")
-    public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
-    // endregion
+    public final override val ring: A,
+) : AbstractPolynomialSpaceOverRing<C, Polynomial<C>, A> {
 
     // region Polynomial-integer relation
     public override operator fun Polynomial<C>.plus(other: Int): Polynomial<C> =
@@ -179,29 +162,6 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         )
     // endregion
 
-    // region Constant-constant relation
-    @JvmName("constantUnaryMinus")
-    public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
-    @JvmName("constantPlus")
-    public override operator fun C.plus(other: C): C = ring { this@plus + other }
-    @JvmName("constantMinus")
-    public override operator fun C.minus(other: C): C = ring { this@minus - other }
-    @JvmName("constantTimes")
-    public override operator fun C.times(other: C): C = ring { this@times * other }
-    @JvmName("constantIsZero")
-    public override fun C.isZero(): Boolean = ring { this == zero }
-    @JvmName("constantIsNotZero")
-    public override fun C.isNotZero(): Boolean = ring { this != zero }
-    @JvmName("constantIsOne")
-    public override fun C.isOne(): Boolean = ring { this == one }
-    @JvmName("constantIsNotOne")
-    public override fun C.isNotOne(): Boolean = ring { this != one }
-    @JvmName("constantIsMinusOne")
-    public override fun C.isMinusOne(): Boolean = ring { this == -one }
-    @JvmName("constantIsNotMinusOne")
-    public override fun C.isNotMinusOne(): Boolean = ring { this != -one }
-    // endregion
-
     // region Constant-polynomial relation
     public override operator fun C.plus(other: Polynomial<C>): Polynomial<C> =
         if (this.isZero()) other
@@ -355,19 +315,16 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     }
 
     public override fun Polynomial<C>.isZero(): Boolean = coefficients.all { it.isZero() }
-    public override fun Polynomial<C>.isNotZero(): Boolean = coefficients.any { it.isNotZero() }
     public override fun Polynomial<C>.isOne(): Boolean =
         with(coefficients) { isNotEmpty() && asSequence().withIndex().any { (index, c) -> if (index == 0) c.isOne() else c.isZero() } } // TODO: It's better to write new methods like `anyIndexed`. But what's better way to do it?
-    public override fun Polynomial<C>.isNotOne(): Boolean = !isOne()
     public override fun Polynomial<C>.isMinusOne(): Boolean =
         with(coefficients) { isNotEmpty() && asSequence().withIndex().any { (index, c) -> if (index == 0) c.isMinusOne() else c.isZero() } } // TODO: It's better to write new methods like `anyIndexed`. But what's better way to do it?
-    public override fun Polynomial<C>.isNotMinusOne(): Boolean = !isMinusOne()
 
     override val zero: Polynomial<C> = Polynomial(emptyList())
     override val one: Polynomial<C> = Polynomial(listOf(ring.one))
 
     @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
-    public override fun Polynomial<C>.equals(other: Polynomial<C>): Boolean =
+    public override infix fun Polynomial<C>.equalsTo(other: Polynomial<C>): Boolean =
         when {
             this === other -> true
             else -> {
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
new file mode 100644
index 000000000..778ffb895
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -0,0 +1,355 @@
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.*
+import kotlin.jvm.JvmName
+import kotlin.math.max
+import kotlin.math.min
+
+
+public data class RationalFunction<C> internal constructor (
+    public override val numerator: Polynomial<C>,
+    public override val denominator: Polynomial<C>
+) : AbstractRationalFunction<C, Polynomial<C>> {
+    override fun toString(): String = "RationalFunction${numerator.coefficients}/${denominator.coefficients}"
+}
+
+// region Internal utilities
+
+/**
+ * Represents internal [RationalFunction] errors.
+ */
+internal class RationalFunctionError : Error {
+    constructor(): super()
+    constructor(message: String): super(message)
+    constructor(message: String?, cause: Throwable?): super(message, cause)
+    constructor(cause: Throwable?): super(cause)
+}
+
+/**
+ * Throws an [RationalFunction] with the given [message].
+ */
+internal fun rationalFunctionError(message: Any): Nothing = throw RationalFunctionError(message.toString())
+
+// endregion
+
+// region Constructors and converters
+// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
+
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>, denominator: Polynomial<C>): RationalFunction<C> =
+//    if (denominator.isZero()) throw ArithmeticException("/ by zero")
+//    else RationalFunction<C>(numerator, denominator)
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
+//    RationalFunction<C>(
+//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+//        Polynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } ).also { if (it.isZero()) }
+//    )
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//public fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>): RationalFunction<C> =
+//    RationalFunction(numerator, onePolynomial)
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
+//    RationalFunction(
+//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } )
+//    )
+
+// endregion
+
+public class RationalFunctionSpace<C, A : Ring<C>> (
+    public val ring: A,
+) : AbstractRationalFunctionalSpaceOverPolynomialSpace<C, Polynomial<C>, RationalFunction<C>, A> {
+
+    override val polynomialRing : PolynomialSpace<C, A> = PolynomialSpace(ring)
+
+    // region Rational-integer relation
+    /**
+     * Returns sum of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public override operator fun RationalFunction<C>.plus(other: Int): RationalFunction<C> =
+        RationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public override operator fun RationalFunction<C>.minus(other: Int): RationalFunction<C> =
+        RationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun RationalFunction<C>.times(other: Int): RationalFunction<C> =
+        RationalFunction(
+            numerator * other,
+            denominator
+        )
+    // endregion
+
+    // region Integer-Rational relation
+    /**
+     * Returns sum of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public override operator fun Int.plus(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    /**
+     * Returns difference between the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public override operator fun Int.minus(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    /**
+     * Returns product of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    // endregion
+
+    // region Constant-rational relation
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public override operator fun C.plus(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    /**
+     * Returns difference between the constant represented as polynomial and the rational function.
+     */
+    public override operator fun C.minus(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    /**
+     * Returns product of the constant represented as polynomial and the rational function.
+     */
+    public override operator fun C.times(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    // endregion
+
+    // region Rational-constant relation
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public override operator fun RationalFunction<C>.plus(other: C): RationalFunction<C> =
+        RationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the constant represented as rational function and the rational function.
+     */
+    public override operator fun RationalFunction<C>.minus(other: C): RationalFunction<C> =
+        RationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the constant represented as rational function and the rational function.
+     */
+    public override operator fun RationalFunction<C>.times(other: C): RationalFunction<C> =
+        RationalFunction(
+            numerator * other,
+            denominator
+        )
+    // endregion
+
+    // region Polynomial-rational relation
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun Polynomial<C>.plus(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    /**
+     * Returns difference between the polynomial represented as polynomial and the rational function.
+     */
+    public override operator fun Polynomial<C>.minus(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    /**
+     * Returns product of the polynomial represented as polynomial and the rational function.
+     */
+    public override operator fun Polynomial<C>.times(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    // endregion
+
+    // region Rational-polynomial relation
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun RationalFunction<C>.plus(other: Polynomial<C>): RationalFunction<C> =
+        RationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun RationalFunction<C>.minus(other: Polynomial<C>): RationalFunction<C> =
+        RationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun RationalFunction<C>.times(other: Polynomial<C>): RationalFunction<C> =
+        RationalFunction(
+            numerator * other,
+            denominator
+        )
+    // endregion
+
+    // region Rational-rational relation
+    /**
+     * Returns negation of the rational function.
+     */
+    public override operator fun RationalFunction<C>.unaryMinus(): RationalFunction<C> = RationalFunction(-numerator, denominator)
+    /**
+     * Returns sum of the rational functions.
+     */
+    public override operator fun RationalFunction<C>.plus(other: RationalFunction<C>): RationalFunction<C> =
+        RationalFunction(
+            numerator * other.denominator + denominator * other.numerator,
+            denominator * other.denominator
+        )
+    /**
+     * Returns difference of the rational functions.
+     */
+    public override operator fun RationalFunction<C>.minus(other: RationalFunction<C>): RationalFunction<C> =
+        RationalFunction(
+            numerator * other.denominator - denominator * other.numerator,
+            denominator * other.denominator
+        )
+    /**
+     * Returns product of the rational functions.
+     */
+    public override operator fun RationalFunction<C>.times(other: RationalFunction<C>): RationalFunction<C> =
+        RationalFunction(
+            numerator * other.numerator,
+            denominator * other.denominator
+        )
+
+    /**
+     * Check if the instant is zero rational function.
+     */
+    public override fun RationalFunction<C>.isZero(): Boolean = numerator.isZero()
+    /**
+     * Check if the instant is unit rational function.
+     */
+    public override fun RationalFunction<C>.isOne(): Boolean = numerator.equalsTo(denominator)
+    /**
+     * Check if the instant is minus unit rational function.
+     */
+    public override fun RationalFunction<C>.isMinusOne(): Boolean = (numerator + denominator).isZero()
+
+    /**
+     * Instance of zero rational function (zero of the rational functions ring).
+     */
+    public override val zero: RationalFunction<C> = RationalFunction(polynomialZero, polynomialOne)
+    /**
+     * Instance of unit polynomial (unit of the rational functions ring).
+     */
+    public override val one: RationalFunction<C> = RationalFunction(polynomialOne, polynomialOne)
+
+    /**
+     * Checks equality of the rational functions.
+     */
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    public override infix fun RationalFunction<C>.equalsTo(other: RationalFunction<C>): Boolean =
+        when {
+            this === other -> true
+            numeratorDegree - denominatorDegree != with(other) { numeratorDegree - denominatorDegree } -> false
+            else -> numerator * other.denominator equalsTo other.numerator * denominator
+        }
+    // endregion
+
+    // region REST TODO: Разобрать
+
+    public operator fun RationalFunction<C>.div(other: RationalFunction<C>): RationalFunction<C> =
+        RationalFunction(
+            numerator * other.denominator,
+            denominator * other.numerator
+        )
+
+    public operator fun RationalFunction<C>.div(other: Polynomial<C>): RationalFunction<C> =
+        RationalFunction(
+            numerator,
+            denominator * other
+        )
+
+    public operator fun RationalFunction<C>.div(other: C): RationalFunction<C> =
+        RationalFunction(
+            numerator,
+            denominator * other
+        )
+
+    public operator fun RationalFunction<C>.div(other: Int): RationalFunction<C> =
+        RationalFunction(
+            numerator,
+            denominator * other
+        )
+
+//    operator fun invoke(arg: UnivariatePolynomial<T>): RationalFunction<T> =
+//        RationalFunction(
+//            numerator(arg),
+//            denominator(arg)
+//        )
+//
+//    operator fun invoke(arg: RationalFunction<T>): RationalFunction<T> {
+//        val num = numerator invokeRFTakeNumerator arg
+//        val den = denominator invokeRFTakeNumerator arg
+//        val degreeDif = numeratorDegree - denominatorDegree
+//        return if (degreeDif > 0)
+//            RationalFunction(
+//                num,
+//                multiplyByPower(den, arg.denominator, degreeDif)
+//            )
+//        else
+//            RationalFunction(
+//                multiplyByPower(num, arg.denominator, -degreeDif),
+//                den
+//            )
+//    }
+//
+//    override fun toString(): String = toString(UnivariatePolynomial.variableName)
+//
+//    fun toString(withVariableName: String = UnivariatePolynomial.variableName): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toString(withVariableName)
+//            else -> "${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)}"
+//        }
+//
+//    fun toStringWithBrackets(withVariableName: String = UnivariatePolynomial.variableName): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toStringWithBrackets(withVariableName)
+//            else -> "(${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)})"
+//        }
+//
+//    fun toReversedString(withVariableName: String = UnivariatePolynomial.variableName): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toReversedString(withVariableName)
+//            else -> "${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)}"
+//        }
+//
+//    fun toReversedStringWithBrackets(withVariableName: String = UnivariatePolynomial.variableName): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toReversedStringWithBrackets(withVariableName)
+//            else -> "(${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)})"
+//        }
+//
+//    fun removeZeros() =
+//        RationalFunction(
+//            numerator.removeZeros(),
+//            denominator.removeZeros()
+//        )
+    // endregion
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
new file mode 100644
index 000000000..9147bc023
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
@@ -0,0 +1,34 @@
+package space.kscience.kmath.functions
+
+
+// region Operator extensions
+
+// region Field case
+
+//operator fun <T: Field<T>> RationalFunction<T>.invoke(arg: T): T = numerator(arg) / denominator(arg)
+//
+//fun <T: Field<T>> RationalFunction<T>.reduced(): RationalFunction<T> =
+//    polynomialGCD(numerator, denominator).let {
+//        RationalFunction(
+//            numerator / it,
+//            denominator / it
+//        )
+//    }
+
+// endregion
+
+// endregion
+
+// region Derivatives
+///**
+// * Returns result of applying formal derivative to the polynomial.
+// *
+// * @param T Field where we are working now.
+// * @return Result of the operator.
+// */
+//fun <T: Ring<T>> RationalFunction<T>.derivative() =
+//    RationalFunction(
+//        numerator.derivative() * denominator - denominator.derivative() * numerator,
+//        denominator * denominator
+//    )
+// endregion
\ No newline at end of file
-- 
2.34.1


From 07f4b83722e2b509f79a212612a952d8a0d64eba Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 14 Mar 2022 14:18:15 +0300
Subject: [PATCH 428/713] Fixed forgotten TODOs

---
 .../kmath/functions/RationalFunction.kt       | 54 +++++++++++++++----
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 778ffb895..78ca556db 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -105,34 +105,58 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
-    public override operator fun Int.plus(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    public override operator fun Int.plus(other: RationalFunction<C>): RationalFunction<C> =
+        RationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
     /**
      * Returns difference between the integer represented as rational function and the rational function.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
-    public override operator fun Int.minus(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    public override operator fun Int.minus(other: RationalFunction<C>): RationalFunction<C> =
+        RationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
     /**
      * Returns product of the integer represented as rational function and the rational function.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    public override operator fun Int.times(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    public override operator fun Int.times(other: RationalFunction<C>): RationalFunction<C> =
+        RationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
     // endregion
 
     // region Constant-rational relation
     /**
      * Returns sum of the constant represented as rational function and the rational function.
      */
-    public override operator fun C.plus(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    public override operator fun C.plus(other: RationalFunction<C>): RationalFunction<C> =
+        RationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
     /**
      * Returns difference between the constant represented as polynomial and the rational function.
      */
-    public override operator fun C.minus(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    public override operator fun C.minus(other: RationalFunction<C>): RationalFunction<C> =
+        RationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
     /**
      * Returns product of the constant represented as polynomial and the rational function.
      */
-    public override operator fun C.times(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    public override operator fun C.times(other: RationalFunction<C>): RationalFunction<C> =
+        RationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
     // endregion
 
     // region Rational-constant relation
@@ -166,15 +190,27 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
     /**
      * Returns sum of the polynomial represented as rational function and the rational function.
      */
-    public override operator fun Polynomial<C>.plus(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    public override operator fun Polynomial<C>.plus(other: RationalFunction<C>): RationalFunction<C> =
+        RationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
     /**
      * Returns difference between the polynomial represented as polynomial and the rational function.
      */
-    public override operator fun Polynomial<C>.minus(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    public override operator fun Polynomial<C>.minus(other: RationalFunction<C>): RationalFunction<C> =
+        RationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
     /**
      * Returns product of the polynomial represented as polynomial and the rational function.
      */
-    public override operator fun Polynomial<C>.times(other: RationalFunction<C>): RationalFunction<C> = TODO()
+    public override operator fun Polynomial<C>.times(other: RationalFunction<C>): RationalFunction<C> =
+        RationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
     // endregion
 
     // region Rational-polynomial relation
-- 
2.34.1


From dd820da76579f93e24dcf8cf4216890f04931515 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 14 Mar 2022 19:59:53 +0300
Subject: [PATCH 429/713] 1. Prototyped rest 2 algebraic structures of rational
 functions 2. Added `constantZero` and `constantOne` to abstract spaces and
 applied them instead of `ring.zero` and `ring.one` 3. Moved logic of
 `R.isZero` and 5 others to `AbstractRationalFunctionalSpace` 4. Deleted
 forgotten overridden functions of constants 5. Added KMath contributors'
 copyright notes 6. Added TODO :smile: The `NumberedPolynomial`'s
 `countOfVariables` is a confusing

---
 .../kmath/functions/AbstractPolynomial.kt     |  30 +-
 .../functions/AbstractRationalFunction.kt     |  60 ++-
 .../kmath/functions/LabeledPolynomial.kt      | 147 +++---
 .../functions/LabeledRationalFunction.kt      | 464 ++++++++++++++++++
 .../kmath/functions/NumberedPolynomial.kt     |  26 +-
 .../functions/NumberedRationalFunction.kt     | 453 +++++++++++++++++
 .../kscience/kmath/functions/Polynomial.kt    |  18 +-
 .../kmath/functions/RationalFunction.kt       |  18 +-
 .../kmath/functions/labeledPolynomialUtil.kt  |   7 +-
 .../functions/labeledRationalFunctionUtil.kt  | 130 +++++
 .../functions/numberedRationalFunctionUtil.kt |  23 +
 .../kmath/functions/rationalFunctionUtil.kt   |   5 +
 12 files changed, 1211 insertions(+), 170 deletions(-)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
index 69c45798a..0ca2d1409 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -149,7 +149,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * Check if the instant is zero constant.
      */
     @JvmName("constantIsZero")
-    public fun C.isZero(): Boolean
+    public fun C.isZero(): Boolean = this == constantZero
     /**
      * Check if the instant is NOT zero constant.
      */
@@ -159,7 +159,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * Check if the instant is unit constant.
      */
     @JvmName("constantIsOne")
-    public fun C.isOne(): Boolean
+    public fun C.isOne(): Boolean = this == constantOne
     /**
      * Check if the instant is NOT unit constant.
      */
@@ -169,12 +169,21 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * Check if the instant is minus unit constant.
      */
     @JvmName("constantIsMinusOne")
-    public fun C.isMinusOne(): Boolean
+    public fun C.isMinusOne(): Boolean = this == -constantOne
     /**
      * Check if the instant is NOT minus unit constant.
      */
     @JvmName("constantIsNotMinusOne")
     public fun C.isNotMinusOne(): Boolean = !isMinusOne()
+
+    /**
+     * Instance of zero constant (zero of the underlying ring).
+     */
+    public val constantZero: C
+    /**
+     * Instance of unit constant (unit of the underlying ring).
+     */
+    public val constantOne: C
     // endregion
 
     // region Constant-polynomial relation
@@ -401,19 +410,12 @@ public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A:
     public override operator fun C.times(other: C): C = ring { this@times * other }
 
     /**
-     * Check if the instant is zero constant.
+     * Instance of zero constant (zero of the underlying ring).
      */
-    @JvmName("constantIsZero")
-    public override fun C.isZero(): Boolean = ring { this == zero }
+    public override val constantZero: C get() = ring.zero
     /**
-     * Check if the instant is unit constant.
+     * Instance of unit constant (unit of the underlying ring).
      */
-    @JvmName("constantIsOne")
-    public override fun C.isOne(): Boolean = ring { this == one }
-    /**
-     * Check if the instant is minus unit constant.
-     */
-    @JvmName("constantIsMinusOne")
-    public override fun C.isMinusOne(): Boolean = ring { this == -one }
+    public override val constantOne: C get() = ring.one
     // endregion
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
index 9725ea078..df366f90f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -190,7 +190,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Check if the instant is zero constant.
      */
     @JvmName("constantIsZero")
-    public fun C.isZero(): Boolean
+    public fun C.isZero(): Boolean = this == constantZero
     /**
      * Check if the instant is NOT zero constant.
      */
@@ -200,7 +200,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Check if the instant is unit constant.
      */
     @JvmName("constantIsOne")
-    public fun C.isOne(): Boolean
+    public fun C.isOne(): Boolean =  this == constantOne
     /**
      * Check if the instant is NOT unit constant.
      */
@@ -210,12 +210,21 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Check if the instant is minus unit constant.
      */
     @JvmName("constantIsMinusOne")
-    public fun C.isMinusOne(): Boolean
+    public fun C.isMinusOne(): Boolean =  this == -constantOne
     /**
      * Check if the instant is NOT minus unit constant.
      */
     @JvmName("constantIsNotMinusOne")
     public fun C.isNotMinusOne(): Boolean = !isMinusOne()
+
+    /**
+     * Instance of zero constant (zero of the underlying ring).
+     */
+    public val constantZero: C
+    /**
+     * Instance of unit constant (unit of the underlying ring).
+     */
+    public val constantOne: C
     // endregion
 
     // region Constant-polynomial relation
@@ -399,7 +408,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
     /**
      * Check if the instant is zero rational function.
      */
-    public fun R.isZero(): Boolean = this equalsTo zero
+    public fun R.isZero(): Boolean = numerator equalsTo polynomialZero
     /**
      * Check if the instant is NOT zero rational function.
      */
@@ -407,7 +416,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
     /**
      * Check if the instant is unit rational function.
      */
-    public fun R.isOne(): Boolean = this equalsTo one
+    public fun R.isOne(): Boolean = numerator equalsTo denominator
     /**
      * Check if the instant is NOT unit rational function.
      */
@@ -415,7 +424,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
     /**
      * Check if the instant is minus unit rational function.
      */
-    public fun R.isMinusOne(): Boolean = this equalsTo -one
+    public fun R.isMinusOne(): Boolean = (numerator + denominator).isZero()
     /**
      * Check if the instant is NOT minus unit rational function.
      */
@@ -597,35 +606,13 @@ public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomia
     public override operator fun C.times(other: C): C = ring { this@times * other }
 
     /**
-     * Check if the instant is zero constant.
+     * Instance of zero constant (zero of the underlying ring).
      */
-    @JvmName("constantIsZero")
-    public override fun C.isZero(): Boolean = ring { this@isZero.isZero() }
+    public override val constantZero: C get() = ring.zero
     /**
-     * Check if the instant is NOT zero constant.
+     * Instance of unit constant (unit of the underlying ring).
      */
-    @JvmName("constantIsNotZero")
-    public override fun C.isNotZero(): Boolean = ring { this@isNotZero.isNotZero() }
-    /**
-     * Check if the instant is unit constant.
-     */
-    @JvmName("constantIsOne")
-    public override fun C.isOne(): Boolean = ring { this@isOne.isOne() }
-    /**
-     * Check if the instant is NOT unit constant.
-     */
-    @JvmName("constantIsNotOne")
-    public override fun C.isNotOne(): Boolean = ring { this@isNotOne.isNotOne() }
-    /**
-     * Check if the instant is minus unit constant.
-     */
-    @JvmName("constantIsMinusOne")
-    public override fun C.isMinusOne(): Boolean = ring { this@isMinusOne.isMinusOne() }
-    /**
-     * Check if the instant is NOT minus unit constant.
-     */
-    @JvmName("constantIsNotMinusOne")
-    public override fun C.isNotMinusOne(): Boolean = ring { this@isNotMinusOne.isNotMinusOne() }
+    public override val constantOne: C get() = ring.one
     // endregion
 }
 
@@ -786,6 +773,15 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<C, P: Abstra
      */
     @JvmName("constantIsNotMinusOne")
     public override fun C.isNotMinusOne(): Boolean = polynomialRing { this@isNotMinusOne.isNotMinusOne() }
+
+    /**
+     * Instance of zero constant (zero of the underlying ring).
+     */
+    public override val constantZero: C get() = polynomialRing.constantZero
+    /**
+     * Instance of unit constant (unit of the underlying ring).
+     */
+    public override val constantOne: C get() = polynomialRing.constantOne
     // endregion
 
     // region Constant-polynomial relation
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index cbd713d27..a5ffe4229 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.*
@@ -305,7 +310,7 @@ internal fun Map<Variable, UInt>.cleanUp() = filterValues { it > 0U }
 //fun <C, A: Ring<C>> Variable.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to one))
 //
 //context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> Variable.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to ring.one))
+//fun <C, A: Ring<C>> Variable.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to constantOne))
 //
 //context(A)
 //fun <C, A: Ring<C>> Variable.asLabeledPolynomial(c: C) : LabeledPolynomial<C> =
@@ -328,71 +333,54 @@ internal fun Map<Variable, UInt>.cleanUp() = filterValues { it > 0U }
  */
 @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE", "INAPPLICABLE_JVM_NAME")
 public class LabeledPolynomialSpace<C, A : Ring<C>>(
-    public val ring: A,
-) : AbstractPolynomialSpace<C, LabeledPolynomial<C>> {
-    // region Constant-integer relation
-    @JvmName("constantIntPlus")
-    public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
-    @JvmName("constantIntMinus")
-    public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
-    @JvmName("constantIntTimes")
-    public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
-    // endregion
-
-    // region Integer-constant relation
-    @JvmName("intConstantPlus")
-    public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
-    @JvmName("intConstantMinus")
-    public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
-    @JvmName("intConstantTimes")
-    public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
-    // endregion
+    public override val ring: A,
+) : AbstractPolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
 
     // region Variable-integer relation
     public operator fun Variable.plus(other: Int): LabeledPolynomial<C> =
         if (other == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to ring.one,
+            mapOf(this@plus to 1U) to constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to ring.one,
-            emptyMap<Variable, UInt>() to ring.one * other,
+            mapOf(this@plus to 1U) to constantOne,
+            emptyMap<Variable, UInt>() to constantOne * other,
         ))
     public operator fun Variable.minus(other: Int): LabeledPolynomial<C> =
         if (other == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -ring.one,
+            mapOf(this@minus to 1U) to -constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -ring.one,
-            emptyMap<Variable, UInt>() to ring.one * other,
+            mapOf(this@minus to 1U) to -constantOne,
+            emptyMap<Variable, UInt>() to constantOne * other,
         ))
     public operator fun Variable.times(other: Int): LabeledPolynomial<C> =
         if (other == 0) zero
         else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to ring.one * other,
+            mapOf(this to 1U) to constantOne * other,
         ))
     // endregion
 
     // region Integer-variable relation
     public operator fun Int.plus(other: Variable): LabeledPolynomial<C> =
         if (this == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to ring.one,
+            mapOf(other to 1U) to constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to ring.one,
-            emptyMap<Variable, UInt>() to ring.one * this@plus,
+            mapOf(other to 1U) to constantOne,
+            emptyMap<Variable, UInt>() to constantOne * this@plus,
         ))
     public operator fun Int.minus(other: Variable): LabeledPolynomial<C> =
         if (this == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -ring.one,
+            mapOf(other to 1U) to -constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -ring.one,
-            emptyMap<Variable, UInt>() to ring.one * this@minus,
+            mapOf(other to 1U) to -constantOne,
+            emptyMap<Variable, UInt>() to constantOne * this@minus,
         ))
     public operator fun Int.times(other: Variable): LabeledPolynomial<C> =
         if (this == 0) zero
         else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to ring.one * this@times,
+            mapOf(other to 1U) to constantOne * this@times,
         ))
     // endregion
 
@@ -406,7 +394,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyMap<Variable, UInt>()
 
-                        val result = getOrElse(degs) { ring.zero } + other
+                        val result = getOrElse(degs) { constantZero } + other
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -421,7 +409,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyMap<Variable, UInt>()
 
-                        val result = getOrElse(degs) { ring.zero } - other
+                        val result = getOrElse(degs) { constantZero } - other
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -447,7 +435,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyMap<Variable, UInt>()
 
-                        val result = this@plus + getOrElse(degs) { ring.zero }
+                        val result = this@plus + getOrElse(degs) { constantZero }
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -462,7 +450,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyMap<Variable, UInt>()
 
-                        val result = this@minus - getOrElse(degs) { ring.zero }
+                        val result = this@minus - getOrElse(degs) { constantZero }
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -478,44 +466,21 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         )
     // endregion
 
-    // region Constant-constant relation
-    @JvmName("constantUnaryMinus")
-    override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
-    @JvmName("constantPlus")
-    override operator fun C.plus(other: C): C = ring { this@plus + other }
-    @JvmName("constantMinus")
-    override operator fun C.minus(other: C): C = ring { this@minus - other }
-    @JvmName("constantTimes")
-    override operator fun C.times(other: C): C = ring { this@times * other }
-    @JvmName("constantIsZero")
-    public override fun C.isZero(): Boolean = ring { this == zero }
-    @JvmName("constantIsNotZero")
-    public override fun C.isNotZero(): Boolean = ring { this != zero }
-    @JvmName("constantIsOne")
-    public override fun C.isOne(): Boolean = ring { this == one }
-    @JvmName("constantIsNotOne")
-    public override fun C.isNotOne(): Boolean = ring { this != one }
-    @JvmName("constantIsMinusOne")
-    public override fun C.isMinusOne(): Boolean = ring { this == -one }
-    @JvmName("constantIsNotMinusOne")
-    public override fun C.isNotMinusOne(): Boolean = ring { this != -one }
-    // endregion
-
     // region Constant-variable relation
     public operator fun C.plus(other: Variable): LabeledPolynomial<C> =
         if (isZero()) LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to ring.one,
+            mapOf(other to 1U) to constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to ring.one,
+            mapOf(other to 1U) to constantOne,
             emptyMap<Variable, UInt>() to this@plus,
         ))
     public operator fun C.minus(other: Variable): LabeledPolynomial<C> =
         if (isZero()) LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -ring.one,
+            mapOf(other to 1U) to -constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -ring.one,
+            mapOf(other to 1U) to -constantOne,
             emptyMap<Variable, UInt>() to this@minus,
         ))
     public operator fun C.times(other: Variable): LabeledPolynomial<C> =
@@ -528,18 +493,18 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     // region Variable-constant relation
     public operator fun Variable.plus(other: C): LabeledPolynomial<C> =
         if (other.isZero()) LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to ring.one,
+            mapOf(this@plus to 1U) to constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to ring.one,
+            mapOf(this@plus to 1U) to constantOne,
             emptyMap<Variable, UInt>() to other,
         ))
     public operator fun Variable.minus(other: C): LabeledPolynomial<C> =
         if (other.isZero()) LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -ring.one,
+            mapOf(this@minus to 1U) to -constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -ring.one,
+            mapOf(this@minus to 1U) to -constantOne,
             emptyMap<Variable, UInt>() to other,
         ))
     public operator fun Variable.times(other: C): LabeledPolynomial<C> =
@@ -559,7 +524,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyMap<Variable, UInt>()
 
-                        val result = this@plus + getOrElse(degs) { ring.zero }
+                        val result = this@plus + getOrElse(degs) { constantZero }
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -577,7 +542,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
 
                         val degs = emptyMap<Variable, UInt>()
 
-                        val result = this@minus - getOrElse(degs) { ring.zero }
+                        val result = this@minus - getOrElse(degs) { constantZero }
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -607,7 +572,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyMap<Variable, UInt>()
 
-                        val result = getOrElse(degs) { ring.zero } + other
+                        val result = getOrElse(degs) { constantZero } + other
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -628,7 +593,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
 
                         val degs = emptyMap<Variable, UInt>()
 
-                        val result = getOrElse(degs) { ring.zero } - other
+                        val result = getOrElse(degs) { constantZero } - other
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -651,37 +616,37 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     // region Variable-variable relation
     public operator fun Variable.plus(other: Variable): LabeledPolynomial<C> =
         if (this == other) LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to ring.one * 2
+            mapOf(this to 1U) to constantOne * 2
         ))
         else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to ring.one,
-            mapOf(other to 1U) to ring.one,
+            mapOf(this to 1U) to constantOne,
+            mapOf(other to 1U) to constantOne,
         ))
     public operator fun Variable.minus(other: Variable): LabeledPolynomial<C> =
         if (this == other) zero
         else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to ring.one,
-            mapOf(other to 1U) to -ring.one,
+            mapOf(this to 1U) to constantOne,
+            mapOf(other to 1U) to -constantOne,
         ))
     public operator fun Variable.times(other: Variable): LabeledPolynomial<C> =
         if (this == other) LabeledPolynomial<C>(mapOf(
-            mapOf(this to 2U) to ring.one
+            mapOf(this to 2U) to constantOne
         ))
         else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U, other to 1U) to ring.one,
+            mapOf(this to 1U, other to 1U) to constantOne,
         ))
     // endregion
 
     // region Variable-polynomial relation
     public operator fun Variable.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@plus to 1u) to ring.one))
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@plus to 1u) to constantOne))
             else LabeledPolynomial<C>(
                 toMutableMap()
                     .apply {
                         val degs = mapOf(this@plus to 1U)
 
-                        val result = ring.one + getOrElse(degs) { ring.zero }
+                        val result = constantOne + getOrElse(degs) { constantZero }
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -690,7 +655,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         }
     public operator fun Variable.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@minus to 1u) to ring.one))
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@minus to 1u) to constantOne))
             else LabeledPolynomial<C>(
                 toMutableMap()
                     .apply {
@@ -698,7 +663,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
 
                         val degs = mapOf(this@minus to 1U)
 
-                        val result = ring.one - getOrElse(degs) { ring.zero }
+                        val result = constantOne - getOrElse(degs) { constantZero }
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -715,13 +680,13 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     // region Polynomial-variable relation
     public operator fun LabeledPolynomial<C>.plus(other: Variable): LabeledPolynomial<C> =
         with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to ring.one))
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to constantOne))
             else LabeledPolynomial<C>(
                 toMutableMap()
                     .apply {
                         val degs = mapOf(other to 1U)
 
-                        val result = ring.one + getOrElse(degs) { ring.zero }
+                        val result = constantOne + getOrElse(degs) { constantZero }
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -730,13 +695,13 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         }
     public operator fun LabeledPolynomial<C>.minus(other: Variable): LabeledPolynomial<C> =
         with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to ring.one))
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to constantOne))
             else LabeledPolynomial<C>(
                 toMutableMap()
                     .apply {
                         val degs = mapOf(other to 1U)
 
-                        val result = ring.one - getOrElse(degs) { ring.zero }
+                        val result = constantOne - getOrElse(degs) { constantZero }
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -799,8 +764,8 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             )
         }
 
-    override val zero: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to ring.zero))
-    override val one: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to ring.one))
+    override val zero: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to constantZero))
+    override val one: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to constantOne))
 
     // TODO: Docs
     @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
@@ -872,7 +837,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
 
     override fun LabeledPolynomial<C>.asConstantOrNull(): C? =
         with(coefficients) {
-            if(isConstant()) getOrElse(emptyMap()) { ring.zero }
+            if(isConstant()) getOrElse(emptyMap()) { constantZero }
             else null
         }
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
new file mode 100644
index 000000000..203c9e07c
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -0,0 +1,464 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.invoke
+
+
+public class LabeledRationalFunction<C>(
+    public override val numerator: LabeledPolynomial<C>,
+    public override val denominator: LabeledPolynomial<C>
+) : AbstractRationalFunction<C, LabeledPolynomial<C>> {
+    override fun toString(): String = "LabeledRationalFunction${numerator.coefficients}/${denominator.coefficients}"
+}
+
+// region Internal utilities
+
+/**
+ * Represents internal [LabeledRationalFunction] errors.
+ */
+internal class LabeledRationalFunctionError : Error {
+    constructor(): super()
+    constructor(message: String): super(message)
+    constructor(message: String?, cause: Throwable?): super(message, cause)
+    constructor(cause: Throwable?): super(cause)
+}
+
+/**
+ * Throws an [LabeledRationalFunctionError] with the given [message].
+ */
+internal fun labeledRationalFunctionError(message: Any): Nothing = throw LabeledRationalFunctionError(message.toString())
+
+// endregion
+
+// region Constructors and converters
+// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
+
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>, denominator: Polynomial<C>): RationalFunction<C> =
+//    if (denominator.isZero()) throw ArithmeticException("/ by zero")
+//    else RationalFunction<C>(numerator, denominator)
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
+//    RationalFunction<C>(
+//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+//        Polynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } ).also { if (it.isZero()) }
+//    )
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//public fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>): RationalFunction<C> =
+//    RationalFunction(numerator, onePolynomial)
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
+//    RationalFunction(
+//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } )
+//    )
+
+// TODO: Rewrite former constructors as fabrics
+//constructor(numeratorCoefficients: Map<Map<Variable, Int>, C>, denominatorCoefficients: Map<Map<Variable, Int>, C>) : this(
+//LabeledPolynomial(numeratorCoefficients),
+//LabeledPolynomial(denominatorCoefficients)
+//)
+//
+//constructor(numeratorCoefficients: Collection<Pair<Map<Variable, Int>, C>>, denominatorCoefficients: Collection<Pair<Map<Variable, Int>, C>>) : this(
+//LabeledPolynomial(numeratorCoefficients),
+//LabeledPolynomial(denominatorCoefficients)
+//)
+//
+//constructor(numerator: LabeledPolynomial<C>) : this(numerator, numerator.getOne())
+//constructor(numeratorCoefficients: Map<Map<Variable, Int>, C>) : this(
+//LabeledPolynomial(numeratorCoefficients)
+//)
+//
+//constructor(numeratorCoefficients: Collection<Pair<Map<Variable, Int>, C>>) : this(
+//LabeledPolynomial(numeratorCoefficients)
+//)
+
+// endregion
+
+public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
+    public val ring: A,
+) : AbstractRationalFunctionalSpaceOverPolynomialSpace<C, LabeledPolynomial<C>, LabeledRationalFunction<C>, A> {
+
+    override val polynomialRing : LabeledPolynomialSpace<C, A> = LabeledPolynomialSpace(ring)
+
+    // region Rational-integer relation
+    /**
+     * Returns sum of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public override operator fun LabeledRationalFunction<C>.plus(other: Int): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public override operator fun LabeledRationalFunction<C>.minus(other: Int): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun LabeledRationalFunction<C>.times(other: Int): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator * other,
+            denominator
+        )
+    // endregion
+
+    // region Integer-Rational relation
+    /**
+     * Returns sum of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public override operator fun Int.plus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns difference between the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public override operator fun Int.minus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns product of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
+    // endregion
+
+    // region Constant-rational relation
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public override operator fun C.plus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns difference between the constant represented as polynomial and the rational function.
+     */
+    public override operator fun C.minus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns product of the constant represented as polynomial and the rational function.
+     */
+    public override operator fun C.times(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
+    // endregion
+
+    // region Rational-constant relation
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public override operator fun LabeledRationalFunction<C>.plus(other: C): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the constant represented as rational function and the rational function.
+     */
+    public override operator fun LabeledRationalFunction<C>.minus(other: C): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the constant represented as rational function and the rational function.
+     */
+    public override operator fun LabeledRationalFunction<C>.times(other: C): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator * other,
+            denominator
+        )
+    // endregion
+
+    // region Polynomial-rational relation
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun LabeledPolynomial<C>.plus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns difference between the polynomial represented as polynomial and the rational function.
+     */
+    public override operator fun LabeledPolynomial<C>.minus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns product of the polynomial represented as polynomial and the rational function.
+     */
+    public override operator fun LabeledPolynomial<C>.times(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
+    // endregion
+
+    // region Rational-polynomial relation
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun LabeledRationalFunction<C>.plus(other: LabeledPolynomial<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun LabeledRationalFunction<C>.minus(other: LabeledPolynomial<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun LabeledRationalFunction<C>.times(other: LabeledPolynomial<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator * other,
+            denominator
+        )
+    // endregion
+
+    // region Rational-rational relation
+    /**
+     * Returns negation of the rational function.
+     */
+    public override operator fun LabeledRationalFunction<C>.unaryMinus(): LabeledRationalFunction<C> = LabeledRationalFunction(-numerator, denominator)
+    /**
+     * Returns sum of the rational functions.
+     */
+    public override operator fun LabeledRationalFunction<C>.plus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator * other.denominator + denominator * other.numerator,
+            denominator * other.denominator
+        )
+    /**
+     * Returns difference of the rational functions.
+     */
+    public override operator fun LabeledRationalFunction<C>.minus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator * other.denominator - denominator * other.numerator,
+            denominator * other.denominator
+        )
+    /**
+     * Returns product of the rational functions.
+     */
+    public override operator fun LabeledRationalFunction<C>.times(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator * other.numerator,
+            denominator * other.denominator
+        )
+
+    /**
+     * Instance of zero rational function (zero of the rational functions ring).
+     */
+    public override val zero: LabeledRationalFunction<C> = LabeledRationalFunction(polynomialZero, polynomialOne)
+    /**
+     * Instance of unit polynomial (unit of the rational functions ring).
+     */
+    public override val one: LabeledRationalFunction<C> = LabeledRationalFunction(polynomialOne, polynomialOne)
+
+    /**
+     * Checks equality of the rational functions.
+     */
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    public override infix fun LabeledRationalFunction<C>.equalsTo(other: LabeledRationalFunction<C>): Boolean {
+        if (this === other) return true
+
+        if ( !(numerator.isZero() xor other.numerator.isZero()) ) return false
+
+        val variables = this.variables union other.variables
+        val thisNumeratorDegrees = this.numerator.degrees
+        val thisDenominatorDegrees = this.denominator.degrees
+        val otherNumeratorDegrees = other.numerator.degrees
+        val otherDenominatorDegrees = other.denominator.degrees
+        for (variable in variables)
+            if (
+                thisNumeratorDegrees.getOrElse(variable) { 0u } + otherDenominatorDegrees.getOrElse(variable) { 0u }
+                != thisDenominatorDegrees.getOrElse(variable) { 0u } + otherNumeratorDegrees.getOrElse(variable) { 0u }
+            ) return false
+
+        return numerator * other.denominator equalsTo other.numerator * denominator
+    }
+    // endregion
+
+    // region Polynomial properties
+    /**
+     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
+     * in which they are appeared in the polynomial.
+     *
+     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
+     * And keys of the map is the same as in [variables].
+     */
+    public val LabeledPolynomial<C>.degrees: Map<Variable, UInt> get() = polynomialRing { degrees }
+    /**
+     * Set of all variables that appear in the polynomial in positive exponents.
+     */
+    public val LabeledPolynomial<C>.variables: Set<Variable> get() = polynomialRing { variables }
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val LabeledPolynomial<C>.countOfVariables: Int get() = polynomialRing { countOfVariables }
+    // endregion
+
+    // region Rational properties
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val LabeledRationalFunction<C>.variables: Set<Variable>
+        get() = numerator.variables union denominator.variables
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val LabeledRationalFunction<C>.countOfVariables: Int get() = variables.size
+    // endregion
+
+    // region REST TODO: Разобрать
+
+    public operator fun LabeledRationalFunction<C>.div(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator * other.denominator,
+            denominator * other.numerator
+        )
+
+    public operator fun LabeledRationalFunction<C>.div(other: LabeledPolynomial<C>): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator,
+            denominator * other
+        )
+
+    public operator fun LabeledRationalFunction<C>.div(other: C): LabeledRationalFunction<C> =
+        LabeledRationalFunction(
+            numerator,
+            denominator * other
+        )
+
+//    operator fun invoke(arg: Map<Variable, C>): LabeledRationalFunction<C> =
+//        LabeledRationalFunction(
+//            numerator(arg),
+//            denominator(arg)
+//        )
+//
+//    @JvmName("invokeLabeledPolynomial")
+//    operator fun invoke(arg: Map<Variable, LabeledPolynomial<C>>): LabeledRationalFunction<C> =
+//        LabeledRationalFunction(
+//            numerator(arg),
+//            denominator(arg)
+//        )
+//
+//    @JvmName("invokeLabeledRationalFunction")
+//    operator fun invoke(arg: Map<Variable, LabeledRationalFunction<C>>): LabeledRationalFunction<C> {
+//        var num = numerator invokeRFTakeNumerator arg
+//        var den = denominator invokeRFTakeNumerator arg
+//        for (variable in variables) if (variable in arg) {
+//            val degreeDif = degrees[variable]!!
+//            if (degreeDif > 0)
+//                den = multiplyByPower(den, arg[variable]!!.denominator, degreeDif)
+//            else
+//                num = multiplyByPower(num, arg[variable]!!.denominator, -degreeDif)
+//        }
+//        return LabeledRationalFunction(num, den)
+//    }
+//
+//    override fun toString(): String = toString(emptyMap())
+//
+//    fun toString(names: Map<Variable, String> = emptyMap()): String =
+//        when (true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toString(names)
+//            else -> "${numerator.toStringWithBrackets(names)}/${denominator.toStringWithBrackets(names)}"
+//        }
+//
+//    fun toString(namer: (Variable) -> String): String =
+//        when (true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toString(namer)
+//            else -> "${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)}"
+//        }
+//
+//    fun toStringWithBrackets(names: Map<Variable, String> = emptyMap()): String =
+//        when (true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toStringWithBrackets(names)
+//            else -> "(${numerator.toStringWithBrackets(names)}/${denominator.toStringWithBrackets(names)})"
+//        }
+//
+//    fun toStringWithBrackets(namer: (Variable) -> String): String =
+//        when (true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toStringWithBrackets(namer)
+//            else -> "(${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)})"
+//        }
+//
+//    fun toReversedString(names: Map<Variable, String> = emptyMap()): String =
+//        when (true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toReversedString(names)
+//            else -> "${numerator.toReversedStringWithBrackets(names)}/${denominator.toReversedStringWithBrackets(names)}"
+//        }
+//
+//    fun toReversedString(namer: (Variable) -> String): String =
+//        when (true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toReversedString(namer)
+//            else -> "${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)}"
+//        }
+//
+//    fun toReversedStringWithBrackets(names: Map<Variable, String> = emptyMap()): String =
+//        when (true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toReversedStringWithBrackets(names)
+//            else -> "(${numerator.toReversedStringWithBrackets(names)}/${denominator.toReversedStringWithBrackets(names)})"
+//        }
+//
+//    fun toReversedStringWithBrackets(namer: (Variable) -> String): String =
+//        when (true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toReversedStringWithBrackets(namer)
+//            else -> "(${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)})"
+//        }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index f11338161..39ca43945 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.*
@@ -272,7 +277,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = getOrElse(degs) { ring.zero } + other
+                        val result = getOrElse(degs) { constantZero } + other
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -287,7 +292,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = getOrElse(degs) { ring.zero } - other
+                        val result = getOrElse(degs) { constantZero } - other
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -313,7 +318,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = this@plus + getOrElse(degs) { ring.zero }
+                        val result = this@plus + getOrElse(degs) { constantZero }
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -328,7 +333,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = this@minus - getOrElse(degs) { ring.zero }
+                        val result = this@minus - getOrElse(degs) { constantZero }
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -354,7 +359,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = this@plus + getOrElse(degs) { ring.zero }
+                        val result = this@plus + getOrElse(degs) { constantZero }
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -372,7 +377,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
 
                         val degs = emptyList<UInt>()
 
-                        val result = this@minus - getOrElse(degs) { ring.zero }
+                        val result = this@minus - getOrElse(degs) { constantZero }
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -402,7 +407,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = getOrElse(degs) { ring.zero } + other
+                        val result = getOrElse(degs) { constantZero } + other
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -421,7 +426,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = getOrElse(degs) { ring.zero } - other
+                        val result = getOrElse(degs) { constantZero } - other
 
                         if (result.isZero()) remove(degs)
                         else this[degs] = result
@@ -522,7 +527,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     override val one: NumberedPolynomial<C> =
         NumberedPolynomial<C>(
             mapOf(
-                listOf<UInt>() to ring.one // 1 * x_1^0 * x_2^0 * ...
+                listOf<UInt>() to constantOne // 1 * x_1^0 * x_2^0 * ...
             )
         )
 
@@ -538,6 +543,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
 
     // Not sure is it necessary...
     // region Polynomial properties
+    // TODO: Replace `countOfVariables` with `lastVariable` and create new `countOfVariables`
     /**
      * Count of all variables that appear in the polynomial in positive exponents.
      */
@@ -590,7 +596,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
 
     override fun NumberedPolynomial<C>.asConstantOrNull(): C? =
         with(coefficients) {
-            if(isConstant()) getOrElse(emptyList()) { ring.zero }
+            if(isConstant()) getOrElse(emptyList()) { constantZero }
             else null
         }
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
new file mode 100644
index 000000000..aff18d1f4
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -0,0 +1,453 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.*
+import kotlin.math.max
+
+
+public class NumberedRationalFunction<C> internal constructor(
+    public override val numerator: NumberedPolynomial<C>,
+    public override val denominator: NumberedPolynomial<C>
+) : AbstractRationalFunction<C, NumberedPolynomial<C>> {
+    override fun toString(): String = "NumberedRationalFunction${numerator.coefficients}/${denominator.coefficients}"
+}
+
+// region Internal utilities
+
+/**
+ * Represents internal [NumberedRationalFunction] errors.
+ */
+internal class NumberedRationalFunctionError : Error {
+    constructor(): super()
+    constructor(message: String): super(message)
+    constructor(message: String?, cause: Throwable?): super(message, cause)
+    constructor(cause: Throwable?): super(cause)
+}
+
+/**
+ * Throws an [NumberedRationalFunctionError] with the given [message].
+ */
+internal fun numberedRationalFunctionError(message: Any): Nothing = throw NumberedRationalFunctionError(message.toString())
+
+// endregion
+
+// region Constructors and converters
+// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
+
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>, denominator: Polynomial<C>): RationalFunction<C> =
+//    if (denominator.isZero()) throw ArithmeticException("/ by zero")
+//    else RationalFunction<C>(numerator, denominator)
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
+//    RationalFunction<C>(
+//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+//        Polynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } ).also { if (it.isZero()) }
+//    )
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//public fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>): RationalFunction<C> =
+//    RationalFunction(numerator, onePolynomial)
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
+//    RationalFunction(
+//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } )
+//    )
+
+// TODO: Rewrite former constructors as fabrics
+//constructor(numeratorCoefficients: Map<List<Int>, C>, denominatorCoefficients: Map<List<Int>, C>) : this(
+//Polynomial(numeratorCoefficients),
+//Polynomial(denominatorCoefficients)
+//)
+//constructor(numeratorCoefficients: Collection<Pair<List<Int>, C>>, denominatorCoefficients: Collection<Pair<List<Int>, C>>) : this(
+//Polynomial(numeratorCoefficients),
+//Polynomial(denominatorCoefficients)
+//)
+//constructor(numerator: Polynomial<C>) : this(numerator, numerator.getOne())
+//constructor(numeratorCoefficients: Map<List<Int>, C>) : this(
+//Polynomial(numeratorCoefficients)
+//)
+//constructor(numeratorCoefficients: Collection<Pair<List<Int>, C>>) : this(
+//Polynomial(numeratorCoefficients)
+//)
+
+// endregion
+
+public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
+    public val ring: A,
+) : AbstractRationalFunctionalSpaceOverPolynomialSpace<C, NumberedPolynomial<C>, NumberedRationalFunction<C>, A> {
+
+    override val polynomialRing : NumberedPolynomialSpace<C, A> = NumberedPolynomialSpace(ring)
+
+    // region Rational-integer relation
+    /**
+     * Returns sum of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public override operator fun NumberedRationalFunction<C>.plus(other: Int): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public override operator fun NumberedRationalFunction<C>.minus(other: Int): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun NumberedRationalFunction<C>.times(other: Int): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator * other,
+            denominator
+        )
+    // endregion
+
+    // region Integer-Rational relation
+    /**
+     * Returns sum of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public override operator fun Int.plus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns difference between the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public override operator fun Int.minus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns product of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
+    // endregion
+
+    // region Constant-rational relation
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public override operator fun C.plus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns difference between the constant represented as polynomial and the rational function.
+     */
+    public override operator fun C.minus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns product of the constant represented as polynomial and the rational function.
+     */
+    public override operator fun C.times(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
+    // endregion
+
+    // region Rational-constant relation
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public override operator fun NumberedRationalFunction<C>.plus(other: C): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the constant represented as rational function and the rational function.
+     */
+    public override operator fun NumberedRationalFunction<C>.minus(other: C): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the constant represented as rational function and the rational function.
+     */
+    public override operator fun NumberedRationalFunction<C>.times(other: C): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator * other,
+            denominator
+        )
+    // endregion
+
+    // region Polynomial-rational relation
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun NumberedPolynomial<C>.plus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns difference between the polynomial represented as polynomial and the rational function.
+     */
+    public override operator fun NumberedPolynomial<C>.minus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns product of the polynomial represented as polynomial and the rational function.
+     */
+    public override operator fun NumberedPolynomial<C>.times(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
+    // endregion
+
+    // region Rational-polynomial relation
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun NumberedRationalFunction<C>.plus(other: NumberedPolynomial<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun NumberedRationalFunction<C>.minus(other: NumberedPolynomial<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun NumberedRationalFunction<C>.times(other: NumberedPolynomial<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator * other,
+            denominator
+        )
+    // endregion
+
+    // region Rational-rational relation
+    /**
+     * Returns negation of the rational function.
+     */
+    public override operator fun NumberedRationalFunction<C>.unaryMinus(): NumberedRationalFunction<C> = NumberedRationalFunction(-numerator, denominator)
+    /**
+     * Returns sum of the rational functions.
+     */
+    public override operator fun NumberedRationalFunction<C>.plus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator * other.denominator + denominator * other.numerator,
+            denominator * other.denominator
+        )
+    /**
+     * Returns difference of the rational functions.
+     */
+    public override operator fun NumberedRationalFunction<C>.minus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator * other.denominator - denominator * other.numerator,
+            denominator * other.denominator
+        )
+    /**
+     * Returns product of the rational functions.
+     */
+    public override operator fun NumberedRationalFunction<C>.times(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator * other.numerator,
+            denominator * other.denominator
+        )
+
+    /**
+     * Instance of zero rational function (zero of the rational functions ring).
+     */
+    public override val zero: NumberedRationalFunction<C> = NumberedRationalFunction(polynomialZero, polynomialOne)
+    /**
+     * Instance of unit polynomial (unit of the rational functions ring).
+     */
+    public override val one: NumberedRationalFunction<C> = NumberedRationalFunction(polynomialOne, polynomialOne)
+
+    /**
+     * Checks equality of the rational functions.
+     */
+    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
+    public override infix fun NumberedRationalFunction<C>.equalsTo(other: NumberedRationalFunction<C>): Boolean {
+        if (this === other) return true
+
+        if ( !(numerator.isZero() xor other.numerator.isZero()) ) return false
+
+        val countOfVariables = max(this.countOfVariables, other.countOfVariables)
+        val thisNumeratorDegrees = this.numerator.degrees
+        val thisDenominatorDegrees = this.denominator.degrees
+        val otherNumeratorDegrees = other.numerator.degrees
+        val otherDenominatorDegrees = other.denominator.degrees
+        for (variable in 0 until countOfVariables)
+            if (
+                thisNumeratorDegrees.getOrElse(variable) { 0u } + otherDenominatorDegrees.getOrElse(variable) { 0u }
+                != thisDenominatorDegrees.getOrElse(variable) { 0u } + otherNumeratorDegrees.getOrElse(variable) { 0u }
+            ) return false
+
+        return numerator * other.denominator equalsTo other.numerator * denominator
+    }
+    // endregion
+
+    // region Polynomial properties
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val NumberedPolynomial<C>.countOfVariables: Int get() = polynomialRing { countOfVariables }
+    /**
+     * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
+     * exponents in which the variables are appeared in the polynomial.
+     *
+     * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
+     * And size of the list is [countOfVariables].
+     */
+    public val NumberedPolynomial<C>.degrees: List<UInt> get() = polynomialRing { degrees }
+    // endregion
+
+    // region Rational properties
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val NumberedRationalFunction<C>.countOfVariables: Int
+        get() = polynomialRing { max(numerator.countOfVariables, denominator.countOfVariables) }
+    // endregion
+
+    // region REST TODO: Разобрать
+
+    public operator fun NumberedRationalFunction<C>.div(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator * other.denominator,
+            denominator * other.numerator
+        )
+
+    public operator fun NumberedRationalFunction<C>.div(other: NumberedPolynomial<C>): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator,
+            denominator * other
+        )
+
+    public operator fun NumberedRationalFunction<C>.div(other: C): NumberedRationalFunction<C> =
+        NumberedRationalFunction(
+            numerator,
+            denominator * other
+        )
+
+//    operator fun invoke(arg: Map<Int, C>): NumberedRationalFunction<C> =
+//        NumberedRationalFunction(
+//            numerator(arg),
+//            denominator(arg)
+//        )
+//
+//    @JvmName("invokePolynomial")
+//    operator fun invoke(arg: Map<Int, Polynomial<C>>): NumberedRationalFunction<C> =
+//        NumberedRationalFunction(
+//            numerator(arg),
+//            denominator(arg)
+//        )
+//
+//    @JvmName("invokeRationalFunction")
+//    operator fun invoke(arg: Map<Int, NumberedRationalFunction<C>>): NumberedRationalFunction<C> {
+//        var num = numerator invokeRFTakeNumerator arg
+//        var den = denominator invokeRFTakeNumerator arg
+//        for (variable in 0 until max(numerator.countOfVariables, denominator.countOfVariables)) if (variable in arg) {
+//            val degreeDif = numerator.degrees.getOrElse(variable) { 0 } - denominator.degrees.getOrElse(variable) { 0 }
+//            if (degreeDif > 0)
+//                den = multiplyByPower(den, arg[variable]!!.denominator, degreeDif)
+//            else
+//                num = multiplyByPower(num, arg[variable]!!.denominator, -degreeDif)
+//        }
+//        return NumberedRationalFunction(num, den)
+//    }
+//
+//    override fun toString(): String = toString(Polynomial.variableName)
+//
+//    fun toString(withVariableName: String = Polynomial.variableName): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toString(withVariableName)
+//            else -> "${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)}"
+//        }
+//
+//    fun toString(namer: (Int) -> String): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toString(namer)
+//            else -> "${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)}"
+//        }
+//
+//    fun toStringWithBrackets(withVariableName: String = Polynomial.variableName): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toStringWithBrackets(withVariableName)
+//            else -> "(${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)})"
+//        }
+//
+//    fun toStringWithBrackets(namer: (Int) -> String): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toStringWithBrackets(namer)
+//            else -> "(${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)})"
+//        }
+//
+//    fun toReversedString(withVariableName: String = Polynomial.variableName): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toReversedString(withVariableName)
+//            else -> "${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)}"
+//        }
+//
+//    fun toReversedString(namer: (Int) -> String): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toReversedString(namer)
+//            else -> "${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)}"
+//        }
+//
+//    fun toReversedStringWithBrackets(withVariableName: String = Polynomial.variableName): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toReversedStringWithBrackets(withVariableName)
+//            else -> "(${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)})"
+//        }
+//
+//    fun toReversedStringWithBrackets(namer: (Int) -> String): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toReversedStringWithBrackets(namer)
+//            else -> "(${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)})"
+//        }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 2c764f4f5..1a324f72c 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -80,7 +80,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 coefficients
                     .toMutableList()
                     .apply {
-                        val result = getOrElse(0) { ring.zero } + other
+                        val result = getOrElse(0) { constantZero } + other
                         val isResultZero = result.isZero()
 
                         when {
@@ -97,7 +97,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 coefficients
                     .toMutableList()
                     .apply {
-                        val result = getOrElse(0) { ring.zero } - other
+                        val result = getOrElse(0) { constantZero } - other
                         val isResultZero = result.isZero()
 
                         when {
@@ -124,7 +124,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 other.coefficients
                     .toMutableList()
                     .apply {
-                        val result = this@plus + getOrElse(0) { ring.zero }
+                        val result = this@plus + getOrElse(0) { constantZero }
                         val isResultZero = result.isZero()
 
                         when {
@@ -143,7 +143,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         forEachIndexed { index, c -> if (index != 0) this[index] = -c }
 
-                        val result = this@minus - getOrElse(0) { ring.zero }
+                        val result = this@minus - getOrElse(0) { constantZero }
                         val isResultZero = result.isZero()
 
                         when {
@@ -281,7 +281,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                         else -> coefficients[it] + other.coefficients[it]
                     }
                 }
-                .ifEmpty { listOf(ring.zero) }
+                .ifEmpty { listOf(constantZero) }
         )
     public override operator fun Polynomial<C>.minus(other: Polynomial<C>): Polynomial<C> =
         Polynomial(
@@ -293,7 +293,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                         else -> coefficients[it] - other.coefficients[it]
                     }
                 }
-                .ifEmpty { listOf(ring.zero) }
+                .ifEmpty { listOf(constantZero) }
         )
     public override operator fun Polynomial<C>.times(other: Polynomial<C>): Polynomial<C> {
         val thisDegree = degree
@@ -321,7 +321,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         with(coefficients) { isNotEmpty() && asSequence().withIndex().any { (index, c) -> if (index == 0) c.isMinusOne() else c.isZero() } } // TODO: It's better to write new methods like `anyIndexed`. But what's better way to do it?
 
     override val zero: Polynomial<C> = Polynomial(emptyList())
-    override val one: Polynomial<C> = Polynomial(listOf(ring.one))
+    override val one: Polynomial<C> = Polynomial(listOf(constantZero))
 
     @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
     public override infix fun Polynomial<C>.equalsTo(other: Polynomial<C>): Boolean =
@@ -337,12 +337,12 @@ public open class PolynomialSpace<C, A : Ring<C>>(
 
     // region Polynomial properties
 
-    public override val Polynomial<C>.degree: Int get() = coefficients.indexOfLast { it != ring.zero }
+    public override val Polynomial<C>.degree: Int get() = coefficients.indexOfLast { it != constantZero }
 
     public override fun Polynomial<C>.asConstantOrNull(): C? =
         with(coefficients) {
             when {
-                isEmpty() -> ring.zero
+                isEmpty() -> constantZero
                 degree > 0 -> null
                 else -> first()
             }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 78ca556db..e9916b634 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.*
@@ -270,19 +275,6 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
             denominator * other.denominator
         )
 
-    /**
-     * Check if the instant is zero rational function.
-     */
-    public override fun RationalFunction<C>.isZero(): Boolean = numerator.isZero()
-    /**
-     * Check if the instant is unit rational function.
-     */
-    public override fun RationalFunction<C>.isOne(): Boolean = numerator.equalsTo(denominator)
-    /**
-     * Check if the instant is minus unit rational function.
-     */
-    public override fun RationalFunction<C>.isMinusOne(): Boolean = (numerator + denominator).isZero()
-
     /**
      * Instance of zero rational function (zero of the rational functions ring).
      */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
index 62ac31b64..9cf4f2652 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.*
@@ -30,7 +35,7 @@ import kotlin.contracts.*
 //fun <C, A: Ring<C>> power(arg: Variable, pow: UInt): LabeledPolynomial<C> =
 //    if (pow == 0U) one
 //    else LabeledPolynomial<C>(mapOf(
-//        mapOf(arg to pow) to ring.one
+//        mapOf(arg to pow) to constantOne
 //    ))
 //
 //// endregion
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
new file mode 100644
index 000000000..26e8ab17a
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
@@ -0,0 +1,130 @@
+package math.polynomials
+
+import math.ringsAndFields.*
+import space.kscience.kmath.functions.LabeledRationalFunction
+
+
+fun <T: Ring<T>> T.toLabeledRationalFunction() = LabeledRationalFunction(this.toLabeledPolynomial())
+
+// region Operator extensions
+
+// region Field case
+
+fun <T: Field<T>> LabeledRationalFunction<T>.reduced(): LabeledRationalFunction<T> {
+    val greatestCommonDivider = polynomialGCD(numerator, denominator)
+    return LabeledRationalFunction(
+        numerator / greatestCommonDivider,
+        denominator / greatestCommonDivider
+    )
+}
+
+// endregion
+
+// region Constants
+
+operator fun <T: Ring<T>> T.plus(other: LabeledRationalFunction<T>) = other + this
+operator fun <T: Ring<T>> Integer.plus(other: LabeledRationalFunction<T>) = other + this
+operator fun <T: Ring<T>> Int.plus(other: LabeledRationalFunction<T>) = other + this
+operator fun <T: Ring<T>> Long.plus(other: LabeledRationalFunction<T>) = other + this
+
+operator fun <T: Ring<T>> T.minus(other: LabeledRationalFunction<T>) = -other + this
+operator fun <T: Ring<T>> Integer.minus(other: LabeledRationalFunction<T>) = -other + this
+operator fun <T: Ring<T>> Int.minus(other: LabeledRationalFunction<T>) = -other + this
+operator fun <T: Ring<T>> Long.minus(other: LabeledRationalFunction<T>) = -other + this
+
+operator fun <T: Ring<T>> T.times(other: LabeledRationalFunction<T>) = other * this
+operator fun <T: Ring<T>> Integer.times(other: LabeledRationalFunction<T>) = other * this
+operator fun <T: Ring<T>> Int.times(other: LabeledRationalFunction<T>) = other * this
+operator fun <T: Ring<T>> Long.times(other: LabeledRationalFunction<T>) = other * this
+
+// endregion
+
+// region Polynomials
+
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.plus(other: UnivariatePolynomial<T>) =
+    LabeledRationalFunction(
+        numerator + denominator * other.toLabeledPolynomial(),
+        denominator
+    )
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.plus(other: UnivariateRationalFunction<T>) =
+    LabeledRationalFunction(
+        numerator * other.denominator.toLabeledPolynomial() + denominator * other.numerator.toLabeledPolynomial(),
+        denominator * other.denominator.toLabeledPolynomial()
+    )
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.plus(other: Polynomial<T>) =
+    LabeledRationalFunction(
+        numerator + denominator * other.toLabeledPolynomial(),
+        denominator
+    )
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.plus(other: NumberedRationalFunction<T>) =
+    LabeledRationalFunction(
+        numerator * other.denominator.toLabeledPolynomial() + denominator * other.numerator.toLabeledPolynomial(),
+        denominator * other.denominator.toLabeledPolynomial()
+    )
+
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.minus(other: UnivariatePolynomial<T>) =
+    LabeledRationalFunction(
+        numerator - denominator * other.toLabeledPolynomial(),
+        denominator
+    )
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.minus(other: UnivariateRationalFunction<T>) =
+    LabeledRationalFunction(
+        numerator * other.denominator.toLabeledPolynomial() - denominator * other.numerator.toLabeledPolynomial(),
+        denominator * other.denominator.toLabeledPolynomial()
+    )
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.minus(other: Polynomial<T>) =
+    LabeledRationalFunction(
+        numerator - denominator * other.toLabeledPolynomial(),
+        denominator
+    )
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.minus(other: NumberedRationalFunction<T>) =
+    LabeledRationalFunction(
+        numerator * other.denominator.toLabeledPolynomial() - denominator * other.numerator.toLabeledPolynomial(),
+        denominator * other.denominator.toLabeledPolynomial()
+    )
+
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.times(other: UnivariatePolynomial<T>) =
+    LabeledRationalFunction(
+        numerator * other.toLabeledPolynomial(),
+        denominator
+    )
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.times(other: UnivariateRationalFunction<T>) =
+    LabeledRationalFunction(
+        numerator * other.numerator.toLabeledPolynomial(),
+        denominator * other.denominator.toLabeledPolynomial()
+    )
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.times(other: Polynomial<T>) =
+    LabeledRationalFunction(
+        numerator * other.toLabeledPolynomial(),
+        denominator
+    )
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.times(other: NumberedRationalFunction<T>) =
+    LabeledRationalFunction(
+        numerator * other.numerator.toLabeledPolynomial(),
+        denominator * other.denominator.toLabeledPolynomial()
+    )
+
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.div(other: UnivariatePolynomial<T>) =
+    LabeledRationalFunction(
+        numerator,
+        denominator * other.toLabeledPolynomial()
+    )
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.div(other: UnivariateRationalFunction<T>) =
+    LabeledRationalFunction(
+        numerator * other.denominator.toLabeledPolynomial(),
+        denominator * other.numerator.toLabeledPolynomial()
+    )
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.div(other: Polynomial<T>) =
+    LabeledRationalFunction(
+        numerator,
+        denominator * other.toLabeledPolynomial()
+    )
+operator fun <T: Ring<T>> LabeledRationalFunction<T>.div(other: NumberedRationalFunction<T>) =
+    LabeledRationalFunction(
+        numerator * other.denominator.toLabeledPolynomial(),
+        denominator * other.numerator.toLabeledPolynomial()
+    )
+
+// endregion
+
+// endregion
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
new file mode 100644
index 000000000..7c8120c68
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+
+//// region Operator extensions
+//
+//// region Field case
+//
+//fun <T: Field<T>> NumberedRationalFunction<T>.reduced(): NumberedRationalFunction<T> {
+//    val greatestCommonDivider = polynomialGCD(numerator, denominator)
+//    return NumberedRationalFunction(
+//        numerator / greatestCommonDivider,
+//        denominator / greatestCommonDivider
+//    )
+//}
+//
+//// endregion
+//
+//// endregion
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
index 9147bc023..d5bbc3b82 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.functions
 
 
-- 
2.34.1


From 44febbdd730451bb7a941f1bcc973b661bd5d63b Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 14 Mar 2022 20:19:42 +0300
Subject: [PATCH 430/713] Processed labeledRationalFunctionUtil.kt

---
 .../kscience/kmath/functions/Polynomial.kt    |   1 -
 .../functions/labeledRationalFunctionUtil.kt  | 147 +++---------------
 2 files changed, 20 insertions(+), 128 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 1a324f72c..49184468b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -6,7 +6,6 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.*
-import kotlin.jvm.JvmName
 import kotlin.math.max
 import kotlin.math.min
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
index 26e8ab17a..575dfed48 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
@@ -1,130 +1,23 @@
-package math.polynomials
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
 
-import math.ringsAndFields.*
-import space.kscience.kmath.functions.LabeledRationalFunction
+package space.kscience.kmath.functions
 
 
-fun <T: Ring<T>> T.toLabeledRationalFunction() = LabeledRationalFunction(this.toLabeledPolynomial())
-
-// region Operator extensions
-
-// region Field case
-
-fun <T: Field<T>> LabeledRationalFunction<T>.reduced(): LabeledRationalFunction<T> {
-    val greatestCommonDivider = polynomialGCD(numerator, denominator)
-    return LabeledRationalFunction(
-        numerator / greatestCommonDivider,
-        denominator / greatestCommonDivider
-    )
-}
-
-// endregion
-
-// region Constants
-
-operator fun <T: Ring<T>> T.plus(other: LabeledRationalFunction<T>) = other + this
-operator fun <T: Ring<T>> Integer.plus(other: LabeledRationalFunction<T>) = other + this
-operator fun <T: Ring<T>> Int.plus(other: LabeledRationalFunction<T>) = other + this
-operator fun <T: Ring<T>> Long.plus(other: LabeledRationalFunction<T>) = other + this
-
-operator fun <T: Ring<T>> T.minus(other: LabeledRationalFunction<T>) = -other + this
-operator fun <T: Ring<T>> Integer.minus(other: LabeledRationalFunction<T>) = -other + this
-operator fun <T: Ring<T>> Int.minus(other: LabeledRationalFunction<T>) = -other + this
-operator fun <T: Ring<T>> Long.minus(other: LabeledRationalFunction<T>) = -other + this
-
-operator fun <T: Ring<T>> T.times(other: LabeledRationalFunction<T>) = other * this
-operator fun <T: Ring<T>> Integer.times(other: LabeledRationalFunction<T>) = other * this
-operator fun <T: Ring<T>> Int.times(other: LabeledRationalFunction<T>) = other * this
-operator fun <T: Ring<T>> Long.times(other: LabeledRationalFunction<T>) = other * this
-
-// endregion
-
-// region Polynomials
-
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.plus(other: UnivariatePolynomial<T>) =
-    LabeledRationalFunction(
-        numerator + denominator * other.toLabeledPolynomial(),
-        denominator
-    )
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.plus(other: UnivariateRationalFunction<T>) =
-    LabeledRationalFunction(
-        numerator * other.denominator.toLabeledPolynomial() + denominator * other.numerator.toLabeledPolynomial(),
-        denominator * other.denominator.toLabeledPolynomial()
-    )
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.plus(other: Polynomial<T>) =
-    LabeledRationalFunction(
-        numerator + denominator * other.toLabeledPolynomial(),
-        denominator
-    )
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.plus(other: NumberedRationalFunction<T>) =
-    LabeledRationalFunction(
-        numerator * other.denominator.toLabeledPolynomial() + denominator * other.numerator.toLabeledPolynomial(),
-        denominator * other.denominator.toLabeledPolynomial()
-    )
-
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.minus(other: UnivariatePolynomial<T>) =
-    LabeledRationalFunction(
-        numerator - denominator * other.toLabeledPolynomial(),
-        denominator
-    )
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.minus(other: UnivariateRationalFunction<T>) =
-    LabeledRationalFunction(
-        numerator * other.denominator.toLabeledPolynomial() - denominator * other.numerator.toLabeledPolynomial(),
-        denominator * other.denominator.toLabeledPolynomial()
-    )
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.minus(other: Polynomial<T>) =
-    LabeledRationalFunction(
-        numerator - denominator * other.toLabeledPolynomial(),
-        denominator
-    )
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.minus(other: NumberedRationalFunction<T>) =
-    LabeledRationalFunction(
-        numerator * other.denominator.toLabeledPolynomial() - denominator * other.numerator.toLabeledPolynomial(),
-        denominator * other.denominator.toLabeledPolynomial()
-    )
-
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.times(other: UnivariatePolynomial<T>) =
-    LabeledRationalFunction(
-        numerator * other.toLabeledPolynomial(),
-        denominator
-    )
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.times(other: UnivariateRationalFunction<T>) =
-    LabeledRationalFunction(
-        numerator * other.numerator.toLabeledPolynomial(),
-        denominator * other.denominator.toLabeledPolynomial()
-    )
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.times(other: Polynomial<T>) =
-    LabeledRationalFunction(
-        numerator * other.toLabeledPolynomial(),
-        denominator
-    )
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.times(other: NumberedRationalFunction<T>) =
-    LabeledRationalFunction(
-        numerator * other.numerator.toLabeledPolynomial(),
-        denominator * other.denominator.toLabeledPolynomial()
-    )
-
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.div(other: UnivariatePolynomial<T>) =
-    LabeledRationalFunction(
-        numerator,
-        denominator * other.toLabeledPolynomial()
-    )
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.div(other: UnivariateRationalFunction<T>) =
-    LabeledRationalFunction(
-        numerator * other.denominator.toLabeledPolynomial(),
-        denominator * other.numerator.toLabeledPolynomial()
-    )
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.div(other: Polynomial<T>) =
-    LabeledRationalFunction(
-        numerator,
-        denominator * other.toLabeledPolynomial()
-    )
-operator fun <T: Ring<T>> LabeledRationalFunction<T>.div(other: NumberedRationalFunction<T>) =
-    LabeledRationalFunction(
-        numerator * other.denominator.toLabeledPolynomial(),
-        denominator * other.numerator.toLabeledPolynomial()
-    )
-
-// endregion
-
-// endregion
\ No newline at end of file
+//// region Operator extensions
+//
+//// region Field case
+//
+//fun <T: Field<T>> LabeledRationalFunction<T>.reduced(): LabeledRationalFunction<T> {
+//    val greatestCommonDivider = polynomialGCD(numerator, denominator)
+//    return LabeledRationalFunction(
+//        numerator / greatestCommonDivider,
+//        denominator / greatestCommonDivider
+//    )
+//}
+//
+//// endregion
+//
+//// endregion
\ No newline at end of file
-- 
2.34.1


From fb01d851975a1e681f00f6a530431a5dd326421a Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 14 Mar 2022 22:23:50 +0300
Subject: [PATCH 431/713] Removed extra `JSName` annotations. Now everything
 builds

---
 .../kscience/kmath/functions/AbstractPolynomial.kt     |  4 ----
 .../kmath/functions/AbstractRationalFunction.kt        | 10 ----------
 2 files changed, 14 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
index 0ca2d1409..0b16303af 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -388,25 +388,21 @@ public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A:
      * Returns negation of the constant.
      */
     @JvmName("constantUnaryMinus")
-    @JsName("constantUnaryMinus")
     public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
     /**
      * Returns sum of the constants.
      */
     @JvmName("constantPlus")
-    @JsName("constantPlus")
     public override operator fun C.plus(other: C): C = ring { this@plus + other }
     /**
      * Returns difference of the constants.
      */
     @JvmName("constantMinus")
-    @JsName("constantMinus")
     public override operator fun C.minus(other: C): C = ring { this@minus - other }
     /**
      * Returns product of the constants.
      */
     @JvmName("constantTimes")
-    @JsName("constantTimes")
     public override operator fun C.times(other: C): C = ring { this@times * other }
 
     /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
index df366f90f..cf8f3a6ef 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -578,31 +578,26 @@ public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomia
      * Returns the same constant.
      */
     @JvmName("constantUnaryPlus")
-    @JsName("constantUnaryPlus")
     public override operator fun C.unaryPlus(): C = ring { +this@unaryPlus }
     /**
      * Returns negation of the constant.
      */
     @JvmName("constantUnaryMinus")
-    @JsName("constantUnaryMinus")
     public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
     /**
      * Returns sum of the constants.
      */
     @JvmName("constantPlus")
-    @JsName("constantPlus")
     public override operator fun C.plus(other: C): C = ring { this@plus + other }
     /**
      * Returns difference of the constants.
      */
     @JvmName("constantMinus")
-    @JsName("constantMinus")
     public override operator fun C.minus(other: C): C = ring { this@minus - other }
     /**
      * Returns product of the constants.
      */
     @JvmName("constantTimes")
-    @JsName("constantTimes")
     public override operator fun C.times(other: C): C = ring { this@times * other }
 
     /**
@@ -716,31 +711,26 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<C, P: Abstra
      * Returns the same constant.
      */
     @JvmName("constantUnaryPlus")
-    @JsName("constantUnaryPlus")
     public override operator fun C.unaryPlus(): C = polynomialRing { +this@unaryPlus }
     /**
      * Returns negation of the constant.
      */
     @JvmName("constantUnaryMinus")
-    @JsName("constantUnaryMinus")
     public override operator fun C.unaryMinus(): C = polynomialRing { -this@unaryMinus }
     /**
      * Returns sum of the constants.
      */
     @JvmName("constantPlus")
-    @JsName("constantPlus")
     public override operator fun C.plus(other: C): C = polynomialRing { this@plus + other }
     /**
      * Returns difference of the constants.
      */
     @JvmName("constantMinus")
-    @JsName("constantMinus")
     public override operator fun C.minus(other: C): C = polynomialRing { this@minus - other }
     /**
      * Returns product of the constants.
      */
     @JvmName("constantTimes")
-    @JsName("constantTimes")
     public override operator fun C.times(other: C): C = polynomialRing { this@times * other }
 
     /**
-- 
2.34.1


From 31ccf744c527f59f19a9d90c9da9f73da3fa1ecf Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 14 Mar 2022 23:33:00 +0300
Subject: [PATCH 432/713] Deleted useless annotations `JvmName`, `JsName` and
 `Suppress`

---
 .../kmath/functions/AbstractPolynomial.kt     | 20 +----------
 .../functions/AbstractRationalFunction.kt     | 34 ++-----------------
 .../kmath/functions/LabeledPolynomial.kt      |  2 --
 .../functions/LabeledRationalFunction.kt      |  1 -
 .../kmath/functions/NumberedPolynomial.kt     |  2 --
 .../functions/NumberedRationalFunction.kt     |  1 -
 .../kscience/kmath/functions/Polynomial.kt    |  3 +-
 .../kmath/functions/RationalFunction.kt       |  1 -
 .../kmath/functions/numberedPolynomialUtil.kt |  9 ++---
 9 files changed, 9 insertions(+), 64 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
index 0b16303af..b053ffebd 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -29,21 +29,18 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
-    @JvmName("constantIntPlus")
     public operator fun C.plus(other: Int): C
     /**
      * Returns difference between the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
-    @JvmName("constantIntMinus")
     public operator fun C.minus(other: Int): C
     /**
      * Returns product of the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    @JvmName("constantIntTimes")
     public operator fun C.times(other: Int): C
     // endregion
 
@@ -53,21 +50,18 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
-    @JvmName("intConstantPlus")
     public operator fun Int.plus(other: C): C
     /**
      * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
-    @JvmName("intConstantMinus")
     public operator fun Int.minus(other: C): C
     /**
      * Returns product of the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    @JvmName("intConstantTimes")
     public operator fun Int.times(other: C): C
     // endregion
 
@@ -148,32 +142,26 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
     /**
      * Check if the instant is zero constant.
      */
-    @JvmName("constantIsZero")
     public fun C.isZero(): Boolean = this == constantZero
     /**
      * Check if the instant is NOT zero constant.
      */
-    @JvmName("constantIsNotZero")
     public fun C.isNotZero(): Boolean = !isZero()
     /**
      * Check if the instant is unit constant.
      */
-    @JvmName("constantIsOne")
     public fun C.isOne(): Boolean = this == constantOne
     /**
      * Check if the instant is NOT unit constant.
      */
-    @JvmName("constantIsNotOne")
     public fun C.isNotOne(): Boolean = !isOne()
     /**
      * Check if the instant is minus unit constant.
      */
-    @JvmName("constantIsMinusOne")
     public fun C.isMinusOne(): Boolean = this == -constantOne
     /**
      * Check if the instant is NOT minus unit constant.
      */
-    @JvmName("constantIsNotMinusOne")
     public fun C.isNotMinusOne(): Boolean = !isMinusOne()
 
     /**
@@ -330,7 +318,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
  * @param C the type of constants. Polynomials have them as a coefficients in their terms.
  * @param P the type of polynomials.
  */
-@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+@Suppress("INAPPLICABLE_JVM_NAME")
 public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A: Ring<C>> : AbstractPolynomialSpace<C, P> {
 
     public val ring: A
@@ -341,21 +329,18 @@ public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A:
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
-    @JvmName("constantIntPlus")
     public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
     /**
      * Returns difference between the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
-    @JvmName("constantIntMinus")
     public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
     /**
      * Returns product of the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    @JvmName("constantIntTimes")
     public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
     // endregion
 
@@ -365,21 +350,18 @@ public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A:
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
-    @JvmName("intConstantPlus")
     public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
     /**
      * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
-    @JvmName("intConstantMinus")
     public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
     /**
      * Returns product of the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    @JvmName("intConstantTimes")
     public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
     // endregion
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
index cf8f3a6ef..f8d3bb99b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -28,21 +28,18 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
-    @JvmName("constantIntPlus")
     public operator fun C.plus(other: Int): C
     /**
      * Returns difference between the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
-    @JvmName("constantIntMinus")
     public operator fun C.minus(other: Int): C
     /**
      * Returns product of the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    @JvmName("constantIntTimes")
     public operator fun C.times(other: Int): C
     // endregion
 
@@ -52,21 +49,18 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
-    @JvmName("intConstantPlus")
     public operator fun Int.plus(other: C): C
     /**
      * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
-    @JvmName("intConstantMinus")
     public operator fun Int.minus(other: C): C
     /**
      * Returns product of the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    @JvmName("intConstantTimes")
     public operator fun Int.times(other: C): C
     // endregion
 
@@ -189,32 +183,26 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
     /**
      * Check if the instant is zero constant.
      */
-    @JvmName("constantIsZero")
     public fun C.isZero(): Boolean = this == constantZero
     /**
      * Check if the instant is NOT zero constant.
      */
-    @JvmName("constantIsNotZero")
     public fun C.isNotZero(): Boolean = !isZero()
     /**
      * Check if the instant is unit constant.
      */
-    @JvmName("constantIsOne")
     public fun C.isOne(): Boolean =  this == constantOne
     /**
      * Check if the instant is NOT unit constant.
      */
-    @JvmName("constantIsNotOne")
     public fun C.isNotOne(): Boolean = !isOne()
     /**
      * Check if the instant is minus unit constant.
      */
-    @JvmName("constantIsMinusOne")
     public fun C.isMinusOne(): Boolean =  this == -constantOne
     /**
      * Check if the instant is NOT minus unit constant.
      */
-    @JvmName("constantIsNotMinusOne")
     public fun C.isNotMinusOne(): Boolean = !isMinusOne()
 
     /**
@@ -520,7 +508,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
     // endregion
 }
 
-@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+@Suppress("INAPPLICABLE_JVM_NAME")
 public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomial<C>, R: AbstractRationalFunction<C, P>, A: Ring<C>> : AbstractRationalFunctionalSpace<C, P, R> {
 
     public val ring: A
@@ -531,21 +519,18 @@ public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomia
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
-    @JvmName("constantIntPlus")
     public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
     /**
      * Returns difference between the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
-    @JvmName("constantIntMinus")
     public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
     /**
      * Returns product of the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    @JvmName("constantIntTimes")
     public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
     // endregion
 
@@ -555,21 +540,18 @@ public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomia
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
-    @JvmName("intConstantPlus")
     public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
     /**
      * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
-    @JvmName("intConstantMinus")
     public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
     /**
      * Returns product of the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    @JvmName("intConstantTimes")
     public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
     // endregion
 
@@ -611,7 +593,7 @@ public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomia
     // endregion
 }
 
-@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+@Suppress("INAPPLICABLE_JVM_NAME")
 public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<C, P: AbstractPolynomial<C>, R: AbstractRationalFunction<C, P>, A: Ring<C>> : AbstractRationalFunctionalSpace<C, P, R> {
 
     public val polynomialRing: AbstractPolynomialSpace<C, P>
@@ -622,21 +604,18 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<C, P: Abstra
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
-    @JvmName("constantIntPlus")
     public override operator fun C.plus(other: Int): C = polynomialRing { this@plus + other }
     /**
      * Returns difference between the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
-    @JvmName("constantIntMinus")
     public override operator fun C.minus(other: Int): C = polynomialRing { this@minus - other }
     /**
      * Returns product of the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    @JvmName("constantIntTimes")
     public override operator fun C.times(other: Int): C = polynomialRing { this@times * other }
     // endregion
 
@@ -646,21 +625,18 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<C, P: Abstra
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
-    @JvmName("intConstantPlus")
     public override operator fun Int.plus(other: C): C = polynomialRing { this@plus + other }
     /**
      * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
-    @JvmName("intConstantMinus")
     public override operator fun Int.minus(other: C): C = polynomialRing { this@minus - other }
     /**
      * Returns product of the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    @JvmName("intConstantTimes")
     public override operator fun Int.times(other: C): C = polynomialRing { this@times * other }
     // endregion
 
@@ -736,32 +712,26 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<C, P: Abstra
     /**
      * Check if the instant is zero constant.
      */
-    @JvmName("constantIsZero")
     public override fun C.isZero(): Boolean = polynomialRing { this@isZero.isZero() }
     /**
      * Check if the instant is NOT zero constant.
      */
-    @JvmName("constantIsNotZero")
     public override fun C.isNotZero(): Boolean = polynomialRing { this@isNotZero.isNotZero() }
     /**
      * Check if the instant is unit constant.
      */
-    @JvmName("constantIsOne")
     public override fun C.isOne(): Boolean = polynomialRing { this@isOne.isOne() }
     /**
      * Check if the instant is NOT unit constant.
      */
-    @JvmName("constantIsNotOne")
     public override fun C.isNotOne(): Boolean = polynomialRing { this@isNotOne.isNotOne() }
     /**
      * Check if the instant is minus unit constant.
      */
-    @JvmName("constantIsMinusOne")
     public override fun C.isMinusOne(): Boolean = polynomialRing { this@isMinusOne.isMinusOne() }
     /**
      * Check if the instant is NOT minus unit constant.
      */
-    @JvmName("constantIsNotMinusOne")
     public override fun C.isNotMinusOne(): Boolean = polynomialRing { this@isNotMinusOne.isNotMinusOne() }
 
     /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index a5ffe4229..81aabb4a4 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -331,7 +331,6 @@ internal fun Map<Variable, UInt>.cleanUp() = filterValues { it > 0U }
  * @param A the intersection of [Ring] of [C] and [ScaleOperations] of [C].
  * @param ring the [A] instance.
  */
-@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE", "INAPPLICABLE_JVM_NAME")
 public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override val ring: A,
 ) : AbstractPolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
@@ -768,7 +767,6 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     override val one: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to constantOne))
 
     // TODO: Docs
-    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
     override infix fun LabeledPolynomial<C>.equalsTo(other: LabeledPolynomial<C>): Boolean =
         when {
             this === other -> true
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index 203c9e07c..2bec1f3a4 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -305,7 +305,6 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
     /**
      * Checks equality of the rational functions.
      */
-    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
     public override infix fun LabeledRationalFunction<C>.equalsTo(other: LabeledRationalFunction<C>): Boolean {
         if (this === other) return true
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 39ca43945..de5cc5658 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -263,7 +263,6 @@ public fun <C, A: Ring<C>> C.asNumberedPolynomial() : NumberedPolynomial<C> = Nu
  * @param A the intersection of [Ring] of [C] and [ScaleOperations] of [C].
  * @param ring the [A] instance.
  */
-@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE", "INAPPLICABLE_JVM_NAME")
 public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     public final override val ring: A,
 ) : AbstractPolynomialSpaceOverRing<C, NumberedPolynomial<C>, A> {
@@ -532,7 +531,6 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
         )
 
     // TODO: Docs
-    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
     override infix fun NumberedPolynomial<C>.equalsTo(other: NumberedPolynomial<C>): Boolean =
         when {
             this === other -> true
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index aff18d1f4..2053cc7f9 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -302,7 +302,6 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
     /**
      * Checks equality of the rational functions.
      */
-    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
     public override infix fun NumberedRationalFunction<C>.equalsTo(other: NumberedRationalFunction<C>): Boolean {
         if (this === other) return true
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 49184468b..802ff7ea2 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -66,7 +66,7 @@ public fun <T> T.asPolynomial() : Polynomial<T> = Polynomial(listOf(this))
  * @param A type of underlying ring of constants. It's [Ring] of [C].
  * @param ring underlying ring of constants of type [A].
  */
-@Suppress("INAPPLICABLE_JVM_NAME") // TODO: KT-31420
+//@Suppress("INAPPLICABLE_JVM_NAME") // TODO: KT-31420
 public open class PolynomialSpace<C, A : Ring<C>>(
     public final override val ring: A,
 ) : AbstractPolynomialSpaceOverRing<C, Polynomial<C>, A> {
@@ -322,7 +322,6 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     override val zero: Polynomial<C> = Polynomial(emptyList())
     override val one: Polynomial<C> = Polynomial(listOf(constantZero))
 
-    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
     public override infix fun Polynomial<C>.equalsTo(other: Polynomial<C>): Boolean =
         when {
             this === other -> true
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index e9916b634..0842f0938 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -287,7 +287,6 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
     /**
      * Checks equality of the rational functions.
      */
-    @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "CovariantEquals")
     public override infix fun RationalFunction<C>.equalsTo(other: RationalFunction<C>): Boolean =
         when {
             this === other -> true
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
index d4053442d..558afa744 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
@@ -6,6 +6,7 @@ import kotlin.contracts.*
 import kotlin.jvm.JvmName
 
 
+
 // TODO: Docs
 
 // region Sort of legacy
@@ -485,8 +486,8 @@ public fun NumberedPolynomial<Double>.substitute(args: Map<Int, Double>): Number
             val deg = degs.getOrElse(variable) { 0u }
             if (deg == 0u) product else product * substitutor.pow(deg.toInt())
         }
-        if (newDegs !in acc) acc[newDegs] = c
-        else acc[newDegs] = acc[newDegs]!! + c
+        if (newDegs !in acc) acc[newDegs] = newC
+        else acc[newDegs] = acc[newDegs]!! + newC
     }
     return NumberedPolynomial<Double>(acc)
 }
@@ -504,8 +505,8 @@ public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>
             val deg = degs.getOrElse(variable) { 0u }
             if (deg == 0u) product else product * power(substitutor, deg)
         }
-        if (newDegs !in acc) acc[newDegs] = c
-        else acc[newDegs] = acc[newDegs]!! + c
+        if (newDegs !in acc) acc[newDegs] = newC
+        else acc[newDegs] = acc[newDegs]!! + newC
     }
     return NumberedPolynomial<C>(acc)
 }
-- 
2.34.1


From ebd7f799adae2047eb5acdfec6ef5345e2a7c3d6 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 15 Mar 2022 00:47:23 +0300
Subject: [PATCH 433/713] Attempts to implement derivatives and antiderivatives

---
 .../kmath/functions/numberedPolynomialUtil.kt | 175 ++++++++++++++----
 .../kmath/functions/polynomialUtil.kt         |  32 +++-
 2 files changed, 171 insertions(+), 36 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
index 558afa744..b7620e792 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
@@ -545,62 +545,169 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.asPolynomialFunctionOver(ring:
  * Returns algebraic derivative of received polynomial.
  */
 @UnstableKMathAPI
-public fun <C, A> NumberedPolynomial<C>.derivativeBy(
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
     algebra: A,
     variable: Int,
-): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    TODO()
+): NumberedPolynomial<C> = algebra {
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients.forEach { (degs, c) ->
+                put(
+                    degs.mapIndexed { index, deg ->
+                        when {
+                            index != variable -> deg
+                            deg > 0u -> deg - 1u
+                            else -> return@forEach
+                        }
+                    },
+                    optimizedMultiply(c, degs.getOrElse(variable) { 1u }.toInt())
+                )
+            }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */ // TODO: This one does not work!!!
+@UnstableKMathAPI
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
+    algebra: A,
+    variables: IntArray,
+): NumberedPolynomial<C> = algebra {
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients.forEach { (degs, c) ->
+                put(
+                    degs.mapIndexed { index, deg ->
+                        when {
+                            index !in variables -> deg
+                            deg > 0u -> deg - 1u
+                            else -> return@forEach
+                        }
+                    },
+                    optimizedMultiply(c, variables.fold(1u) { acc, variable -> acc * degs.getOrElse(variable) { 1u } }.toInt())
+                )
+            }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */ // TODO: This one does not work!!!
+@UnstableKMathAPI
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
+    algebra: A,
+    variables: Collection<Int>,
+): NumberedPolynomial<C> = algebra {
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients.forEach { (degs, c) ->
+                put(
+                    degs.mapIndexed { index, deg ->
+                        when {
+                            index !in variables -> deg
+                            deg > 0u -> deg - 1u
+                            else -> return@forEach
+                        }
+                    },
+                    optimizedMultiply(c, variables.fold(1u) { acc, variable -> acc * degs.getOrElse(variable) { 1u } }.toInt())
+                )
+            }
+        }
+    )
 }
 
 /**
  * Returns algebraic derivative of received polynomial.
  */
 @UnstableKMathAPI
-public fun <C, A> NumberedPolynomial<C>.derivativeBy(
-    algebra: A,
-    variables: IntArray,
-): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    TODO()
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> NumberedPolynomial<C>.derivativeBy(
-    algebra: A,
-    variables: Collection<Int>,
-): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = derivativeBy(algebra, variables.toIntArray())
-
-/**
- * Create a polynomial witch represents indefinite integral version of this polynomial
- */
-@UnstableKMathAPI
-public fun <C, A> NumberedPolynomial<C>.antiderivativeBy(
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
     algebra: A,
     variable: Int,
-): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
-    TODO()
+    order: UInt
+): NumberedPolynomial<C> = algebra {
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients.forEach { (degs, c) ->
+                put(
+                    degs.mapIndexed { index, deg ->
+                        when {
+                            index != variable -> deg
+                            deg >= order -> deg - order
+                            else -> return@forEach
+                        }
+                    },
+                    degs.getOrElse(variable) { 1u }.toInt().let {
+                        (0u until order).fold(c) { acc, ord ->
+                            optimizedMultiply(acc, ord.toInt())
+                        }
+                    }
+                )
+            }
+        }
+    )
 }
 
 /**
- * Create a polynomial witch represents indefinite integral version of this polynomial
+ * Returns algebraic antiderivative of received polynomial.
  */
 @UnstableKMathAPI
-public fun <C, A> NumberedPolynomial<C>.antiderivativeBy(
+public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
+    algebra: A,
+    variable: Int,
+): NumberedPolynomial<C> = algebra {
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients.forEach { (degs, c) ->
+                put(
+                    degs.mapIndexed { index, deg -> if(index != variable) deg else deg + 1u },
+                    c / optimizedMultiply(one, degs.getOrElse(variable) { 1u }.toInt())
+                )
+            }
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial.
+ */ // TODO: This one does not work!!!
+@UnstableKMathAPI
+public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
     algebra: A,
     variables: IntArray,
-): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
-    TODO()
+): NumberedPolynomial<C> = algebra {
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients.forEach { (degs, c) ->
+                put(
+                    degs.mapIndexed { index, deg -> if(index !in variables) deg else deg + 1u },
+                    c / optimizedMultiply(one, variables.fold(1u) { acc, variable -> acc * degs.getOrElse(variable) { 1u } }.toInt())
+                )
+            }
+        }
+    )
 }
 
 /**
- * Create a polynomial witch represents indefinite integral version of this polynomial
- */
+ * Returns algebraic antiderivative of received polynomial.
+ */ // TODO: This one does not work!!!
 @UnstableKMathAPI
-public fun <C, A> NumberedPolynomial<C>.antiderivativeBy(
+public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
     algebra: A,
     variables: Collection<Int>,
-): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = antiderivativeBy(algebra, variables.toIntArray())
+): NumberedPolynomial<C> = algebra {
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients.forEach { (degs, c) ->
+                put(
+                    degs.mapIndexed { index, deg -> if(index !in variables) deg else deg + 1u },
+                    c / optimizedMultiply(one, variables.fold(1u) { acc, variable -> acc * degs.getOrElse(variable) { 1u } }.toInt())
+                )
+            }
+        }
+    )
+}
 
 // endregion
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index 4d99b3a45..7e40b6246 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -109,11 +109,23 @@ public fun <C, A : Ring<C>> Polynomial<C>.asPolynomialFunctionOver(ring: A): (Po
 public fun <C, A> Polynomial<C>.derivative(
     algebra: A,
 ): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    Polynomial(coefficients.drop(1).mapIndexed { index, t -> number(index) * t })
+    Polynomial(coefficients.drop(1).mapIndexed { index, c -> number(index) * c })
 }
 
 /**
- * Create a polynomial witch represents indefinite integral version of this polynomial
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> Polynomial<C>.nthDerivative(
+    algebra: A,
+    order: UInt,
+): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
+    TODO()
+    Polynomial(coefficients.drop(order.toInt()).mapIndexed { index, c ->  number(index) * c })
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial.
  */
 @UnstableKMathAPI
 public fun <C, A> Polynomial<C>.antiderivative(
@@ -126,6 +138,22 @@ public fun <C, A> Polynomial<C>.antiderivative(
     Polynomial(integratedCoefficients)
 }
 
+/**
+ * Returns algebraic antiderivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> Polynomial<C>.nthAntiderivative(
+    algebra: A,
+    order: UInt,
+): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
+    TODO()
+    val integratedCoefficients = buildList(coefficients.size + 1) {
+        add(zero)
+        coefficients.forEachIndexed{ index, t -> add(t / number(index + 1)) }
+    }
+    Polynomial(integratedCoefficients)
+}
+
 /**
  * Compute a definite integral of a given polynomial in a [range]
  */
-- 
2.34.1


From f86529d65944016631efe09218c4828feed32f03 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 15 Mar 2022 15:35:17 +0300
Subject: [PATCH 434/713] Optimized `optimizedMultiply` and
 `optimizedAddMultiplied` for cases of negative value of `other` and
 `multiplier`

---
 .../kscience/kmath/functions/algebraicStub.kt | 59 +++++++++++++------
 1 file changed, 42 insertions(+), 17 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
index 9e5043b8c..3c37a01ec 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
@@ -16,17 +16,11 @@ import space.kscience.kmath.operations.Group
  * @receiver the multiplicand.
  * @param other the multiplier.
  * @return the difference.
+ * @author Gleb Minaev
  */
-internal tailrec fun <C> Group<C>.optimizedMultiply(arg: C, other: Int): C =
-    when {
-        other == 0 -> zero
-        other == 1 -> arg
-        other == -1 -> -arg
-        other % 2 == 0 -> optimizedMultiply(arg + arg, other / 2)
-        other % 2 == 1 -> optimizedAddMultiplied(arg, arg + arg, other / 2)
-        other % 2 == -1 -> optimizedAddMultiplied(-arg, arg + arg, other / 2)
-        else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
-    }
+internal fun <C> Group<C>.optimizedMultiply(arg: C, other: Int): C =
+    if (other >= 0) optimizedMultiply(arg, other.toUInt())
+    else optimizedMultiply(arg, (-other).toUInt())
 
 // TODO: Move receiver to context receiver
 /**
@@ -40,12 +34,43 @@ internal tailrec fun <C> Group<C>.optimizedMultiply(arg: C, other: Int): C =
  * @author Gleb Minaev
  */
 internal tailrec fun <C> Group<C>.optimizedAddMultiplied(base: C, arg: C, multiplier: Int): C =
+    if (multiplier >= 0) optimizedAddMultiplied(base, arg, multiplier.toUInt())
+    else optimizedAddMultiplied(base, arg, (-multiplier).toUInt())
+
+// TODO: Move receiver to context receiver
+/**
+ * Multiplication of element and integer.
+ *
+ * @receiver the multiplicand.
+ * @param other the multiplier.
+ * @return the difference.
+ * @author Gleb Minaev
+ */
+internal tailrec fun <C> Group<C>.optimizedMultiply(arg: C, other: UInt): C =
     when {
-        multiplier == 0 -> base
-        multiplier == 1 -> base + arg
-        multiplier == -1 -> base - arg
-        multiplier % 2 == 0 -> optimizedAddMultiplied(base, arg + arg, multiplier / 2)
-        multiplier % 2 == 1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
-        multiplier % 2 == -1 -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2)
-        else -> error("Error in multiplication group instant by integer: got reminder by division by 2 different from 0, 1 and -1")
+        other == 0u -> zero
+        other == 1u -> arg
+        other % 2u == 0u -> optimizedMultiply(arg + arg, other / 2u)
+        other % 2u == 1u -> optimizedAddMultiplied(arg, arg + arg, other / 2u)
+        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
+    }
+
+// TODO: Move receiver to context receiver
+/**
+ * Adds product of [arg] and [multiplier] to [base].
+ *
+ * @receiver the algebra to provide multiplication.
+ * @param base the augend.
+ * @param arg the multiplicand.
+ * @param multiplier the multiplier.
+ * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
+ * @author Gleb Minaev
+ */
+internal tailrec fun <C> Group<C>.optimizedAddMultiplied(base: C, arg: C, multiplier: UInt): C =
+    when {
+        multiplier == 0u -> base
+        multiplier == 1u -> base + arg
+        multiplier % 2u == 0u -> optimizedAddMultiplied(base, arg + arg, multiplier / 2u)
+        multiplier % 2u == 1u -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2u)
+        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
     }
\ No newline at end of file
-- 
2.34.1


From 79736a0a9b6450df9ae0a7d7209b8aa7603d36c4 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 15 Mar 2022 15:36:10 +0300
Subject: [PATCH 435/713] Forgot to remove unnecessary `tailrec`

---
 .../kotlin/space/kscience/kmath/functions/algebraicStub.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
index 3c37a01ec..537184ba3 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
@@ -33,7 +33,7 @@ internal fun <C> Group<C>.optimizedMultiply(arg: C, other: Int): C =
  * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
  * @author Gleb Minaev
  */
-internal tailrec fun <C> Group<C>.optimizedAddMultiplied(base: C, arg: C, multiplier: Int): C =
+internal fun <C> Group<C>.optimizedAddMultiplied(base: C, arg: C, multiplier: Int): C =
     if (multiplier >= 0) optimizedAddMultiplied(base, arg, multiplier.toUInt())
     else optimizedAddMultiplied(base, arg, (-multiplier).toUInt())
 
-- 
2.34.1


From 1754ae06951ff0964239cc7c822b869b31ab371e Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 15 Mar 2022 16:43:22 +0300
Subject: [PATCH 436/713] Added some docs

---
 .../kmath/functions/AbstractPolynomial.kt     |   8 +-
 .../functions/AbstractRationalFunction.kt     |  36 +++++-
 .../kmath/functions/LabeledPolynomial.kt      |  60 +++++++++-
 .../functions/LabeledRationalFunction.kt      |   7 +-
 .../kmath/functions/NumberedPolynomial.kt     |  69 ++++++++++-
 .../functions/NumberedRationalFunction.kt     |   7 +-
 .../kscience/kmath/functions/Polynomial.kt    | 112 +++++++++++++++---
 .../kmath/functions/RationalFunction.kt       |   7 +-
 8 files changed, 271 insertions(+), 35 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
index b053ffebd..8bd8697e3 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -18,7 +18,7 @@ public interface AbstractPolynomial<C>
 /**
  * Abstraction of ring of polynomials of type [P] over ring of constants of type [C].
  *
- * @param C the type of constants. Polynomials have them as a coefficients in their terms.
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
  * @param P the type of polynomials.
  */
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
@@ -313,10 +313,12 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
 }
 
 /**
- * Abstraction of ring of polynomials of type [P] over ring of constants of type [C].
+ * Abstraction of ring of polynomials of type [P] over ring of constants of type [C]. It also assumes that there is
+ * provided [ring] (of type [A]), that provides constant-wise operations.
  *
- * @param C the type of constants. Polynomials have them as a coefficients in their terms.
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
  * @param P the type of polynomials.
+ * @param A the type of algebraic structure (precisely, of ring) provided for constants.
  */
 @Suppress("INAPPLICABLE_JVM_NAME")
 public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A: Ring<C>> : AbstractPolynomialSpace<C, P> {
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
index f8d3bb99b..685cf4ca3 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -20,6 +20,14 @@ public interface AbstractRationalFunction<C, P: AbstractPolynomial<C>> {
     public operator fun component2(): P = denominator
 }
 
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
+ * [C].
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ */ // TODO: Add support of field
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
 public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R: AbstractRationalFunction<C, P>> : Ring<R> {
     // region Constant-integer relation
@@ -508,6 +516,15 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
     // endregion
 }
 
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
+ * [C]. It also assumes that there is provided [ring] (of type [A]), that provides constant-wise operations.
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ * @param A the type of algebraic structure (precisely, of ring) provided for constants.
+ */ // TODO: Add support of field
 @Suppress("INAPPLICABLE_JVM_NAME")
 public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomial<C>, R: AbstractRationalFunction<C, P>, A: Ring<C>> : AbstractRationalFunctionalSpace<C, P, R> {
 
@@ -593,10 +610,25 @@ public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomia
     // endregion
 }
 
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
+ * [C]. It also assumes that there is provided [polynomialRing] (of type [AP]), that provides constant- and
+ * polynomial-wise operations.
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
+ */ // TODO: Add support of field
 @Suppress("INAPPLICABLE_JVM_NAME")
-public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<C, P: AbstractPolynomial<C>, R: AbstractRationalFunction<C, P>, A: Ring<C>> : AbstractRationalFunctionalSpace<C, P, R> {
+public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
+        C,
+        P: AbstractPolynomial<C>,
+        R: AbstractRationalFunction<C, P>,
+        AP: AbstractPolynomialSpace<C, P>,
+        > : AbstractRationalFunctionalSpace<C, P, R> {
 
-    public val polynomialRing: AbstractPolynomialSpace<C, P>
+    public val polynomialRing: AP
 
     // region Constant-integer relation
     /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 81aabb4a4..ebdaa6e26 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -384,6 +384,11 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     // endregion
 
     // region Polynomial-integer relation
+    /**
+     * Returns sum of the polynomial and the integer represented as polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
     public override operator fun LabeledPolynomial<C>.plus(other: Int): LabeledPolynomial<C> =
         if (other == 0) this
         else
@@ -399,6 +404,11 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                         else this[degs] = result
                     }
             )
+    /**
+     * Returns difference between the polynomial and the integer represented as polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
     public override operator fun LabeledPolynomial<C>.minus(other: Int): LabeledPolynomial<C> =
         if (other == 0) this
         else
@@ -414,6 +424,11 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                         else this[degs] = result
                     }
             )
+    /**
+     * Returns product of the polynomial and the integer represented as polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
     public override operator fun LabeledPolynomial<C>.times(other: Int): LabeledPolynomial<C> =
         if (other == 0) zero
         else LabeledPolynomial(
@@ -425,6 +440,11 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     // endregion
 
     // region Integer-polynomial relation
+    /**
+     * Returns sum of the integer represented as polynomial and the polynomial.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
     public override operator fun Int.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         if (this == 0) other
         else
@@ -440,6 +460,11 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                         else this[degs] = result
                     }
             )
+    /**
+     * Returns difference between the integer represented as polynomial and the polynomial.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
     public override operator fun Int.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         if (this == 0) other
         else
@@ -455,6 +480,11 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                         else this[degs] = result
                     }
             )
+    /**
+     * Returns product of the integer represented as polynomial and the polynomial.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
     public override operator fun Int.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         if (this == 0) zero
         else LabeledPolynomial(
@@ -514,6 +544,9 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     // endregion
 
     // region Constant-polynomial relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
     override operator fun C.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         if (this.isZero()) other
         else with(other.coefficients) {
@@ -530,6 +563,9 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
     override operator fun C.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         if (this.isZero()) other
         else with(other.coefficients) {
@@ -548,6 +584,9 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
     override operator fun C.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         if (this.isZero()) zero
         else LabeledPolynomial<C>(
@@ -560,7 +599,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
 
     // region Polynomial-constant relation
     /**
-     * Returns sum of the polynomials. [other] is interpreted as [UnivariatePolynomial].
+     * Returns sum of the constant represented as polynomial and the polynomial.
      */
     override operator fun LabeledPolynomial<C>.plus(other: C): LabeledPolynomial<C> =
         if (other.isZero()) this
@@ -579,7 +618,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             )
         }
     /**
-     * Returns difference of the polynomials. [other] is interpreted as [UnivariatePolynomial].
+     * Returns difference between the constant represented as polynomial and the polynomial.
      */
     override operator fun LabeledPolynomial<C>.minus(other: C): LabeledPolynomial<C> =
         if (other.isZero()) this
@@ -600,7 +639,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             )
         }
     /**
-     * Returns product of the polynomials. [other] is interpreted as [UnivariatePolynomial].
+     * Returns product of the constant represented as polynomial and the polynomial.
      */
     override operator fun LabeledPolynomial<C>.times(other: C): LabeledPolynomial<C> =
         if (other.isZero()) zero
@@ -763,10 +802,18 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             )
         }
 
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
     override val zero: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to constantZero))
+    /**
+     * Instance of unit polynomial (unit of the polynomial ring).
+     */
     override val one: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to constantOne))
 
-    // TODO: Docs
+    /**
+     * Checks equality of the polynomials.
+     */
     override infix fun LabeledPolynomial<C>.equalsTo(other: LabeledPolynomial<C>): Boolean =
         when {
             this === other -> true
@@ -832,7 +879,10 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             }
             foundAbsoluteTermAndItIsNotZero
         }
-
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
+     */
     override fun LabeledPolynomial<C>.asConstantOrNull(): C? =
         with(coefficients) {
             if(isConstant()) getOrElse(emptyMap()) { constantZero }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index 2bec1f3a4..df4441127 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -85,7 +85,12 @@ internal fun labeledRationalFunctionError(message: Any): Nothing = throw Labeled
 
 public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
     public val ring: A,
-) : AbstractRationalFunctionalSpaceOverPolynomialSpace<C, LabeledPolynomial<C>, LabeledRationalFunction<C>, A> {
+) : AbstractRationalFunctionalSpaceOverPolynomialSpace<
+        C,
+        LabeledPolynomial<C>,
+        LabeledRationalFunction<C>,
+        LabeledPolynomialSpace<C, A>,
+        > {
 
     override val polynomialRing : LabeledPolynomialSpace<C, A> = LabeledPolynomialSpace(ring)
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index de5cc5658..86c76949b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -267,6 +267,11 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     public final override val ring: A,
 ) : AbstractPolynomialSpaceOverRing<C, NumberedPolynomial<C>, A> {
     // region Polynomial-integer relation
+    /**
+     * Returns sum of the polynomial and the integer represented as polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
     public override operator fun NumberedPolynomial<C>.plus(other: Int): NumberedPolynomial<C> =
         if (other == 0) this
         else
@@ -282,6 +287,11 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                         else this[degs] = result
                     }
             )
+    /**
+     * Returns difference between the polynomial and the integer represented as polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
     public override operator fun NumberedPolynomial<C>.minus(other: Int): NumberedPolynomial<C> =
         if (other == 0) this
         else
@@ -297,6 +307,11 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                         else this[degs] = result
                     }
             )
+    /**
+     * Returns product of the polynomial and the integer represented as polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
     public override operator fun NumberedPolynomial<C>.times(other: Int): NumberedPolynomial<C> =
         if (other == 0) zero
         else NumberedPolynomial(
@@ -308,6 +323,11 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     // endregion
 
     // region Integer-polynomial relation
+    /**
+     * Returns sum of the integer represented as polynomial and the polynomial.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
     public override operator fun Int.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         if (this == 0) other
         else
@@ -323,6 +343,11 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                         else this[degs] = result
                     }
             )
+    /**
+     * Returns difference between the integer represented as polynomial and the polynomial.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
     public override operator fun Int.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         if (this == 0) other
         else
@@ -338,6 +363,11 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                         else this[degs] = result
                     }
             )
+    /**
+     * Returns product of the integer represented as polynomial and the polynomial.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
     public override operator fun Int.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         if (this == 0) zero
         else NumberedPolynomial(
@@ -349,6 +379,9 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     // endregion
 
     // region Constant-polynomial relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
     override operator fun C.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         if (this.isZero()) other
         else with(other.coefficients) {
@@ -365,6 +398,9 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
     override operator fun C.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         if (this.isZero()) -other
         else with(other.coefficients) {
@@ -383,6 +419,9 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
     override operator fun C.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         if (this.isZero()) zero
         else NumberedPolynomial<C>(
@@ -395,7 +434,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
 
     // region Polynomial-constant relation
     /**
-     * Returns sum of the polynomials. [other] is interpreted as [NumberedPolynomial].
+     * Returns sum of the constant represented as polynomial and the polynomial.
      */
     override operator fun NumberedPolynomial<C>.plus(other: C): NumberedPolynomial<C> =
         if (other.isZero()) this
@@ -414,7 +453,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
             )
         }
     /**
-     * Returns difference of the polynomials. [other] is interpreted as [NumberedPolynomial].
+     * Returns difference between the constant represented as polynomial and the polynomial.
      */
     override operator fun NumberedPolynomial<C>.minus(other: C): NumberedPolynomial<C> =
         if (other.isZero()) this
@@ -433,7 +472,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
             )
         }
     /**
-     * Returns product of the polynomials. [other] is interpreted as [NumberedPolynomial].
+     * Returns product of the constant represented as polynomial and the polynomial.
      */
     override operator fun NumberedPolynomial<C>.times(other: C): NumberedPolynomial<C> =
         if (other.isZero()) zero
@@ -496,7 +535,13 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                 )
         }
 
+    /**
+     * Check if the instant is zero polynomial.
+     */
     public override fun NumberedPolynomial<C>.isZero(): Boolean = coefficients.values.all { it.isZero() }
+    /**
+     * Check if the instant is unit polynomial.
+     */
     public override fun NumberedPolynomial<C>.isOne(): Boolean =
         with(coefficients) {
             var foundAbsoluteTermAndItIsOne = false
@@ -509,6 +554,9 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
             }
             foundAbsoluteTermAndItIsOne
         }
+    /**
+     * Check if the instant is minus unit polynomial.
+     */
     public override fun NumberedPolynomial<C>.isMinusOne(): Boolean =
         with(coefficients) {
             var foundAbsoluteTermAndItIsMinusOne = false
@@ -522,7 +570,13 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
             foundAbsoluteTermAndItIsMinusOne
         }
 
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
     override val zero: NumberedPolynomial<C> = NumberedPolynomial<C>(emptyMap())
+    /**
+     * Instance of unit polynomial (unit of the polynomial ring).
+     */
     override val one: NumberedPolynomial<C> =
         NumberedPolynomial<C>(
             mapOf(
@@ -530,7 +584,9 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
             )
         )
 
-    // TODO: Docs
+    /**
+     * Checks equality of the polynomials.
+     */
     override infix fun NumberedPolynomial<C>.equalsTo(other: NumberedPolynomial<C>): Boolean =
         when {
             this === other -> true
@@ -591,7 +647,10 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
             }
             foundAbsoluteTermAndItIsNotZero
         }
-
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
+     */
     override fun NumberedPolynomial<C>.asConstantOrNull(): C? =
         with(coefficients) {
             if(isConstant()) getOrElse(emptyList()) { constantZero }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index 2053cc7f9..a81795c81 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -82,7 +82,12 @@ internal fun numberedRationalFunctionError(message: Any): Nothing = throw Number
 
 public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
     public val ring: A,
-) : AbstractRationalFunctionalSpaceOverPolynomialSpace<C, NumberedPolynomial<C>, NumberedRationalFunction<C>, A> {
+) : AbstractRationalFunctionalSpaceOverPolynomialSpace<
+        C,
+        NumberedPolynomial<C>,
+        NumberedRationalFunction<C>,
+        NumberedPolynomialSpace<C, A>,
+        > {
 
     override val polynomialRing : NumberedPolynomialSpace<C, A> = NumberedPolynomialSpace(ring)
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 802ff7ea2..bdc725e63 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -68,10 +68,15 @@ public fun <T> T.asPolynomial() : Polynomial<T> = Polynomial(listOf(this))
  */
 //@Suppress("INAPPLICABLE_JVM_NAME") // TODO: KT-31420
 public open class PolynomialSpace<C, A : Ring<C>>(
-    public final override val ring: A,
+    public override val ring: A,
 ) : AbstractPolynomialSpaceOverRing<C, Polynomial<C>, A> {
 
     // region Polynomial-integer relation
+    /**
+     * Returns sum of the polynomial and the integer represented as polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
     public override operator fun Polynomial<C>.plus(other: Int): Polynomial<C> =
         if (other == 0) this
         else
@@ -89,6 +94,11 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                         }
                     }
             )
+    /**
+     * Returns difference between the polynomial and the integer represented as polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
     public override operator fun Polynomial<C>.minus(other: Int): Polynomial<C> =
         if (other == 0) this
         else
@@ -106,6 +116,11 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                         }
                     }
             )
+    /**
+     * Returns product of the polynomial and the integer represented as polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
     public override operator fun Polynomial<C>.times(other: Int): Polynomial<C> =
         if (other == 0) zero
         else Polynomial(
@@ -116,6 +131,11 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     // endregion
 
     // region Integer-polynomial relation
+    /**
+     * Returns sum of the integer represented as polynomial and the polynomial.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
     public override operator fun Int.plus(other: Polynomial<C>): Polynomial<C> =
         if (this == 0) other
         else
@@ -133,6 +153,11 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                         }
                     }
             )
+    /**
+     * Returns difference between the integer represented as polynomial and the polynomial.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
     public override operator fun Int.minus(other: Polynomial<C>): Polynomial<C> =
         if (this == 0) other
         else
@@ -152,6 +177,11 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                         }
                     }
             )
+    /**
+     * Returns product of the integer represented as polynomial and the polynomial.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
     public override operator fun Int.times(other: Polynomial<C>): Polynomial<C> =
         if (this == 0) zero
         else Polynomial(
@@ -162,6 +192,9 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     // endregion
 
     // region Constant-polynomial relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
     public override operator fun C.plus(other: Polynomial<C>): Polynomial<C> =
         if (this.isZero()) other
         else with(other.coefficients) {
@@ -180,9 +213,9 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
-//        if (degree == -1) UnivariatePolynomial(other) else UnivariatePolynomial(
-//            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
-//        )
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
     public override operator fun C.minus(other: Polynomial<C>): Polynomial<C> =
         if (this.isZero()) other
         else with(other.coefficients) {
@@ -203,9 +236,9 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
-//        if (degree == -1) UnivariatePolynomial(other) else UnivariatePolynomial(
-//            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
-//        )
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
     public override operator fun C.times(other: Polynomial<C>): Polynomial<C> =
         if (this.isZero()) other
         else Polynomial(
@@ -216,6 +249,9 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     // endregion
 
     // region Polynomial-constant relation
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
     public override operator fun Polynomial<C>.plus(other: C): Polynomial<C> =
         if (other.isZero()) this
         else with(coefficients) {
@@ -234,9 +270,9 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
-//        if (degree == -1) UnivariatePolynomial(other) else UnivariatePolynomial(
-//            listOf(coefficients[0] + other) + coefficients.subList(1, degree + 1)
-//        )
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
     public override operator fun Polynomial<C>.minus(other: C): Polynomial<C> =
         if (other.isZero()) this
         else with(coefficients) {
@@ -255,9 +291,9 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
-//        if (degree == -1) UnivariatePolynomial(-other) else UnivariatePolynomial(
-//            listOf(coefficients[0] - other) + coefficients.subList(1, degree + 1)
-//        )
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
     public override operator fun Polynomial<C>.times(other: C): Polynomial<C> =
         if (other.isZero()) this
         else Polynomial(
@@ -268,8 +304,14 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     // endregion
 
     // region Polynomial-polynomial relation
+    /**
+     * Returns negation of the polynomial.
+     */
     public override operator fun Polynomial<C>.unaryMinus(): Polynomial<C> =
         Polynomial(coefficients.map { -it })
+    /**
+     * Returns sum of the polynomials.
+     */
     public override operator fun Polynomial<C>.plus(other: Polynomial<C>): Polynomial<C> =
         Polynomial(
             (0..max(degree, other.degree))
@@ -282,6 +324,9 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 }
                 .ifEmpty { listOf(constantZero) }
         )
+    /**
+     * Returns difference of the polynomials.
+     */
     public override operator fun Polynomial<C>.minus(other: Polynomial<C>): Polynomial<C> =
         Polynomial(
             (0..max(degree, other.degree))
@@ -294,6 +339,9 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 }
                 .ifEmpty { listOf(constantZero) }
         )
+    /**
+     * Returns product of the polynomials.
+     */
     public override operator fun Polynomial<C>.times(other: Polynomial<C>): Polynomial<C> {
         val thisDegree = degree
         val otherDegree = other.degree
@@ -313,15 +361,39 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         }
     }
 
+    /**
+     * Check if the instant is zero polynomial.
+     */
     public override fun Polynomial<C>.isZero(): Boolean = coefficients.all { it.isZero() }
+    /**
+     * Check if the instant is unit polynomial.
+     */
     public override fun Polynomial<C>.isOne(): Boolean =
-        with(coefficients) { isNotEmpty() && asSequence().withIndex().any { (index, c) -> if (index == 0) c.isOne() else c.isZero() } } // TODO: It's better to write new methods like `anyIndexed`. But what's better way to do it?
+        with(coefficients) {
+            isNotEmpty() &&
+                    asSequence().withIndex().any { (index, c) -> if (index == 0) c.isOne() else c.isZero() } // TODO: It's better to write new methods like `anyIndexed`. But what's better way to do it?
+        }
+    /**
+     * Check if the instant is minus unit polynomial.
+     */
     public override fun Polynomial<C>.isMinusOne(): Boolean =
-        with(coefficients) { isNotEmpty() && asSequence().withIndex().any { (index, c) -> if (index == 0) c.isMinusOne() else c.isZero() } } // TODO: It's better to write new methods like `anyIndexed`. But what's better way to do it?
+        with(coefficients) {
+            isNotEmpty() &&
+                    asSequence().withIndex().any { (index, c) -> if (index == 0) c.isMinusOne() else c.isZero() } // TODO: It's better to write new methods like `anyIndexed`. But what's better way to do it?
+        }
 
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
     override val zero: Polynomial<C> = Polynomial(emptyList())
+    /**
+     * Instance of unit constant (unit of the underlying ring).
+     */
     override val one: Polynomial<C> = Polynomial(listOf(constantZero))
 
+    /**
+     * Checks equality of the polynomials.
+     */
     public override infix fun Polynomial<C>.equalsTo(other: Polynomial<C>): Boolean =
         when {
             this === other -> true
@@ -334,9 +406,16 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     // endregion
 
     // region Polynomial properties
-
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
     public override val Polynomial<C>.degree: Int get() = coefficients.indexOfLast { it != constantZero }
 
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
+     */
     public override fun Polynomial<C>.asConstantOrNull(): C? =
         with(coefficients) {
             when {
@@ -345,7 +424,6 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 else -> first()
             }
         }
-    public override fun Polynomial<C>.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
 
     @Suppress("NOTHING_TO_INLINE")
     public inline fun Polynomial<C>.substitute(argument: C): C = this.substitute(ring, argument)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 0842f0938..441136a64 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -67,7 +67,12 @@ internal fun rationalFunctionError(message: Any): Nothing = throw RationalFuncti
 
 public class RationalFunctionSpace<C, A : Ring<C>> (
     public val ring: A,
-) : AbstractRationalFunctionalSpaceOverPolynomialSpace<C, Polynomial<C>, RationalFunction<C>, A> {
+) : AbstractRationalFunctionalSpaceOverPolynomialSpace<
+        C,
+        Polynomial<C>,
+        RationalFunction<C>,
+        PolynomialSpace<C, A>,
+        > {
 
     override val polynomialRing : PolynomialSpace<C, A> = PolynomialSpace(ring)
 
-- 
2.34.1


From 91c9ea61da4f9e3ec60003ce25a6448e9b699b85 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 15 Mar 2022 18:10:11 +0300
Subject: [PATCH 437/713] Added derivative-like functions to `Polynomial`

---
 .../kscience/kmath/functions/Polynomial.kt    | 16 +++----
 .../kmath/functions/polynomialUtil.kt         | 48 ++++++++++++-------
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index bdc725e63..1ac413818 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -14,7 +14,7 @@ import kotlin.math.min
  *
  * @param coefficients constant is the leftmost coefficient.
  */
-public data class Polynomial<T>(public val coefficients: List<T>) : AbstractPolynomial<T> {
+public data class Polynomial<C>(public val coefficients: List<C>) : AbstractPolynomial<C> {
     override fun toString(): String = "Polynomial$coefficients"
 }
 
@@ -44,7 +44,7 @@ internal fun polynomialError(message: Any): Nothing = throw PolynomialError(mess
  * [reverse] parameter is true.
  */
 @Suppress("FunctionName")
-public fun <T> Polynomial(coefficients: List<T>, reverse: Boolean = false): Polynomial<T> =
+public fun <C> Polynomial(coefficients: List<C>, reverse: Boolean = false): Polynomial<C> =
     Polynomial(with(coefficients) { if (reverse) reversed() else this })
 
 /**
@@ -52,10 +52,10 @@ public fun <T> Polynomial(coefficients: List<T>, reverse: Boolean = false): Poly
  * [reverse] parameter is true.
  */
 @Suppress("FunctionName")
-public fun <T> Polynomial(vararg coefficients: T, reverse: Boolean = false): Polynomial<T> =
+public fun <C> Polynomial(vararg coefficients: C, reverse: Boolean = false): Polynomial<C> =
     Polynomial(with(coefficients) { if (reverse) reversed() else toList() })
 
-public fun <T> T.asPolynomial() : Polynomial<T> = Polynomial(listOf(this))
+public fun <C> C.asPolynomial() : Polynomial<C> = Polynomial(listOf(this))
 
 // endregion
 
@@ -352,7 +352,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 Polynomial(
                     (0..(thisDegree + otherDegree))
                         .map { d ->
-                            (max(0, d - otherDegree)..(min(thisDegree, d)))
+                            (max(0, d - otherDegree)..min(thisDegree, d))
                                 .map { coefficients[it] * other.coefficients[d - it] }
                                 .reduce { acc, rational -> acc + rational }
                         }
@@ -370,16 +370,14 @@ public open class PolynomialSpace<C, A : Ring<C>>(
      */
     public override fun Polynomial<C>.isOne(): Boolean =
         with(coefficients) {
-            isNotEmpty() &&
-                    asSequence().withIndex().any { (index, c) -> if (index == 0) c.isOne() else c.isZero() } // TODO: It's better to write new methods like `anyIndexed`. But what's better way to do it?
+            isNotEmpty() && withIndex().any { (index, c) -> if (index == 0) c.isOne() else c.isZero() }
         }
     /**
      * Check if the instant is minus unit polynomial.
      */
     public override fun Polynomial<C>.isMinusOne(): Boolean =
         with(coefficients) {
-            isNotEmpty() &&
-                    asSequence().withIndex().any { (index, c) -> if (index == 0) c.isMinusOne() else c.isZero() } // TODO: It's better to write new methods like `anyIndexed`. But what's better way to do it?
+            isNotEmpty() && withIndex().any { (index, c) -> if (index == 0) c.isMinusOne() else c.isZero() }
         }
 
     /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index 7e40b6246..a41a6cbd6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -9,7 +9,8 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
-import kotlin.jvm.JvmName
+import kotlin.math.max
+import kotlin.math.min
 import kotlin.math.pow
 
 
@@ -77,15 +78,32 @@ public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
     return result
 }
 
-// TODO: (Waiting for hero) Replace with optimisation: the [result] may be unboxed, and all operations may be performed
-//  as soon as possible on it
 public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: Polynomial<C>) : Polynomial<C> = ring.polynomial {
     if (coefficients.isEmpty()) return zero
-    var result: Polynomial<C> = coefficients.last().asPolynomial()
-    for (j in coefficients.size - 2 downTo 0) {
-        result = (arg * result) + coefficients[j]
+
+    val thisDegree = degree
+    if (thisDegree == -1) return zero
+    val argDegree = arg.degree
+    if (argDegree == -1) return coefficients[0].asPolynomial()
+    val constantZero = constantZero
+    val resultCoefs: MutableList<C> = MutableList(thisDegree + argDegree + 1) { constantZero }
+    val resultCoefsUpdate: MutableList<C> = MutableList(thisDegree + argDegree + 1) { constantZero }
+    var resultDegree = 0
+    for (deg in thisDegree downTo 0) {
+        resultCoefsUpdate[0] = coefficients[deg]
+        for (updateDeg in 0 .. resultDegree + argDegree) {
+            var newC = resultCoefsUpdate[updateDeg]
+            for (deg1 in max(0, updateDeg - argDegree)..min(resultDegree, updateDeg))
+                newC += resultCoefs[deg1] * arg.coefficients[updateDeg - deg1]
+            resultCoefsUpdate[updateDeg] = newC
+        }
+        resultDegree += argDegree
+        for (updateDeg in 0 .. resultDegree + argDegree) {
+            resultCoefs[updateDeg] = resultCoefsUpdate[updateDeg]
+            resultCoefsUpdate[updateDeg] = constantZero
+        }
     }
-    return result
+    return Polynomial<C>(resultCoefs)
 }
 
 /**
@@ -109,7 +127,7 @@ public fun <C, A : Ring<C>> Polynomial<C>.asPolynomialFunctionOver(ring: A): (Po
 public fun <C, A> Polynomial<C>.derivative(
     algebra: A,
 ): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    Polynomial(coefficients.drop(1).mapIndexed { index, c -> number(index) * c })
+    Polynomial(coefficients.drop(1).mapIndexed { index, c -> number(index + 1) * c })
 }
 
 /**
@@ -120,8 +138,7 @@ public fun <C, A> Polynomial<C>.nthDerivative(
     algebra: A,
     order: UInt,
 ): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    TODO()
-    Polynomial(coefficients.drop(order.toInt()).mapIndexed { index, c ->  number(index) * c })
+    Polynomial(coefficients.drop(order.toInt()).mapIndexed { index, c -> (1..order.toInt()).fold(c) { acc, i -> acc * number(index + i) } })
 }
 
 /**
@@ -133,7 +150,7 @@ public fun <C, A> Polynomial<C>.antiderivative(
 ): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
     val integratedCoefficients = buildList(coefficients.size + 1) {
         add(zero)
-        coefficients.forEachIndexed{ index, t -> add(t / number(index + 1)) }
+        coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
     }
     Polynomial(integratedCoefficients)
 }
@@ -146,12 +163,11 @@ public fun <C, A> Polynomial<C>.nthAntiderivative(
     algebra: A,
     order: UInt,
 ): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
-    TODO()
-    val integratedCoefficients = buildList(coefficients.size + 1) {
-        add(zero)
-        coefficients.forEachIndexed{ index, t -> add(t / number(index + 1)) }
+    val newCoefficients = buildList(coefficients.size + order.toInt()) {
+        repeat(order.toInt()) { add(zero) }
+        coefficients.mapIndexedTo(this) { index, c -> (1..order.toInt()).fold(c) { acc, i -> acc / number(index + i) } }
     }
-    Polynomial(integratedCoefficients)
+    return Polynomial(newCoefficients)
 }
 
 /**
-- 
2.34.1


From 1f9d8d34f5f0476b4ea553bdd2c99a7406d30f61 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 15 Mar 2022 20:18:39 +0300
Subject: [PATCH 438/713] Tried to add constructors and/or fabrics for
 polynomials

---
 .../kmath/functions/LabeledPolynomial.kt      | 247 ++----------------
 .../kmath/functions/NumberedPolynomial.kt     | 223 +++++-----------
 .../kscience/kmath/functions/Polynomial.kt    |  27 +-
 3 files changed, 122 insertions(+), 375 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index ebdaa6e26..56dad975d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -73,254 +73,59 @@ internal fun Map<Variable, UInt>.cleanUp() = filterValues { it > 0U }
 
 // region Constructors and converters
 
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
-// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represent monomials.
-// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
-// *
-// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(A)
-//internal fun <C, A: Ring<C>> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>, toCheckInput: Boolean = true): LabeledPolynomial<C> {
-//    if (!toCheckInput) return LabeledPolynomial<C>(coefs)
+//context(LabeledPolynomialSpace<C, Ring<C>>)
+//@Suppress("FunctionName")
+//internal fun <C> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>, toCheckInput: Boolean = false) : LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial(coefs)
 //
-//    // Map for cleaned coefficients.
 //    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
 //
-//    // Cleaning the degrees, summing monomials of the same degrees.
 //    for (entry in coefs) {
 //        val key = entry.key.cleanUp()
 //        val value = entry.value
 //        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
 //    }
 //
-//    // Removing zero monomials.
-//    return LabeledPolynomial<C>(
-//        fixedCoefs
-//            .filter { it.value.isNotZero() }
+//    return LabeledPolynomial(
+//        fixedCoefs.filterValues { it.isNotZero() }
 //    )
 //}
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
-// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represent monomials.
-// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
-// *
-// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(A)
-//internal fun <C, A: Ring<C>> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>, toCheckInput: Boolean): LabeledPolynomial<C> {
-//    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
 //
-//    // Map for cleaned coefficients.
+//context(LabeledPolynomialSpace<C, Ring<C>>)
+//@Suppress("FunctionName")
+//internal fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>, toCheckInput: Boolean = false) : LabeledPolynomial<C> {
+//    if (!toCheckInput) return LabeledPolynomial(pairs.toMap())
+//
 //    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
 //
-//    // Cleaning the degrees, summing monomials of the same degrees.
 //    for (entry in pairs) {
 //        val key = entry.first.cleanUp()
 //        val value = entry.second
 //        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
 //    }
 //
-//    // Removing zero monomials.
-//    return LabeledPolynomial<C>(
+//    return LabeledPolynomial(
 //        fixedCoefs.filterValues { it.isNotZero() }
 //    )
 //}
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
-// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represents monomials.
-// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
-// *
-// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(A)
-//internal fun <C, A: Ring<C>> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>, toCheckInput: Boolean): LabeledPolynomial<C> {
-//    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
 //
-//    // Map for cleaned coefficients.
-//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//// TODO: Do not know how to make it without context receivers
+//context(LabeledPolynomialSpace<C, Ring<C>>)
+//@Suppress("FunctionName")
+//public fun <C> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
 //
-//    // Cleaning the degrees, summing monomials of the same degrees.
-//    for (entry in pairs) {
-//        val key = entry.first.cleanUp()
-//        val value = entry.second
-//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-//    }
+//context(LabeledPolynomialSpace<C, Ring<C>>)
+//@Suppress("FunctionName")
+//public fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
 //
-//    // Removing zero monomials.
-//    return LabeledPolynomial<C>(
-//        fixedCoefs.filterValues { it.isNotZero() }
-//    )
-//}
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
-// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
-// *
-// * @param coefs Coefficients of the instants.
-// *
-// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(A)
-//fun <C, A: Ring<C>> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>): LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
-// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represents monomials.
-// *
-// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(A)
-//fun <C, A: Ring<C>> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>): LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
-// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represents monomials.
-// *
-// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(A)
-//fun <C, A: Ring<C>> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>): LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
-// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represent monomials.
-// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
-// *
-// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//internal fun <C, A: Ring<C>> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>, toCheckInput: Boolean = true): LabeledPolynomial<C> {
-//    if (!toCheckInput) return LabeledPolynomial<C>(coefs)
+//context(LabeledPolynomialSpace<C, Ring<C>>)
+//@Suppress("FunctionName")
+//public fun <C> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(pairs.toList(), toCheckInput = true)
 //
-//    // Map for cleaned coefficients.
-//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
-//
-//    // Cleaning the degrees, summing monomials of the same degrees.
-//    for (entry in coefs) {
-//        val key = entry.key.cleanUp()
-//        val value = entry.value
-//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-//    }
-//
-//    // Removing zero monomials.
-//    return LabeledPolynomial<C>(
-//        fixedCoefs
-//            .filter { it.value.isNotZero() }
-//    )
-//}
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
-// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represent monomials.
-// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
-// *
-// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//internal fun <C, A: Ring<C>> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>, toCheckInput: Boolean): LabeledPolynomial<C> {
-//    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
-//
-//    // Map for cleaned coefficients.
-//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
-//
-//    // Cleaning the degrees, summing monomials of the same degrees.
-//    for (entry in pairs) {
-//        val key = entry.first.cleanUp()
-//        val value = entry.second
-//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-//    }
-//
-//    // Removing zero monomials.
-//    return LabeledPolynomial<C>(
-//        fixedCoefs.filterValues { it.isNotZero() }
-//    )
-//}
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
-// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represents monomials.
-// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
-// *
-// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//internal fun <C, A: Ring<C>> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>, toCheckInput: Boolean): LabeledPolynomial<C> {
-//    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
-//
-//    // Map for cleaned coefficients.
-//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
-//
-//    // Cleaning the degrees, summing monomials of the same degrees.
-//    for (entry in pairs) {
-//        val key = entry.first.cleanUp()
-//        val value = entry.second
-//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-//    }
-//
-//    // Removing zero monomials.
-//    return LabeledPolynomial<C>(
-//        fixedCoefs.filterValues { it.isNotZero() }
-//    )
-//}
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
-// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
-// *
-// * @param coefs Coefficients of the instants.
-// *
-// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>): LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
-// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represents monomials.
-// *
-// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>): LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from keys of received
-// * map, sums up proportional monomials, removes aero monomials, and if result is zero map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represents monomials.
-// *
-// * @throws LabeledPolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>): LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-//
-//fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to this))
-//
-//context(A)
-//fun <C, A: Ring<C>> Variable.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to one))
-//
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> Variable.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to constantOne))
-//
-//context(A)
-//fun <C, A: Ring<C>> Variable.asLabeledPolynomial(c: C) : LabeledPolynomial<C> =
-//    if(c.isZero()) LabeledPolynomial<C>(emptyMap())
-//    else LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to c))
-//
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> Variable.asLabeledPolynomial(c: C) : LabeledPolynomial<C> =
-//    if(c.isZero()) zero
-//    else LabeledPolynomial<C>(mapOf(mapOf<Variable, UInt>(this to 1U) to c))
+//context(LabeledPolynomialSpace<C, Ring<C>>)
+//public fun <C> Variable.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial(mapOf(mapOf(this to 1u) to constantOne))
+
+public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial(mapOf(emptyMap<Variable, UInt>() to this))
 
 // endregion
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 86c76949b..a1033fcc4 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -72,100 +72,10 @@ internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
 // endregion
 
 // region Constructors and converters
-// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
-//context(A)
+//context(NumberedPolynomialSpace<C, Ring<C>>)
 //@Suppress("FunctionName")
-//internal fun <C, A: Ring<C>> NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean): NumberedPolynomial<C> {
-//    if (!toCheckInput) return NumberedPolynomial<C>(coefs)
-//
-//    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-//
-//    for (entry in coefs) {
-//        val key = entry.key.cleanUp()
-//        val value = entry.value
-//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-//    }
-//
-//    return NumberedPolynomial<C>(
-//        fixedCoefs
-//            .filter { it.value.isNotZero() }
-//    )
-//}
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
-// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represent monomials.
-// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
-// *
-// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(A)
-//@Suppress("FunctionName")
-//internal fun <C, A: Ring<C>> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean): NumberedPolynomial<C> {
-//    if (!toCheckInput) return NumberedPolynomial(pairs.toMap())
-//
-//    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-//
-//    for (entry in pairs) {
-//        val key = entry.first.cleanUp()
-//        val value = entry.second
-//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-//    }
-//
-//    return NumberedPolynomial<C>(
-//        fixedCoefs
-//            .filter { it.value.isNotZero() }
-//    )
-//}
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
-// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represent monomials.
-// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
-// *
-// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(A)
-//@Suppress("FunctionName")
-//internal fun <C, A: Ring<C>> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean): NumberedPolynomial<C> =
-//    NumberedPolynomial(pairs.toMap(), toCheckInput)
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
-// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
-// *
-// * @param coefs Coefficients of the instants.
-// *
-// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(A)
-//public fun <C, A: Ring<C>> NumberedPolynomial(coefs: Map<List<UInt>, C>) = NumberedPolynomial(coefs, toCheckInput = true)
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
-// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represent monomials.
-// *
-// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(A)
-//public fun <C, A: Ring<C>> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) = NumberedPolynomial(pairs, toCheckInput = true)
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
-// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represent monomials.
-// *
-// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(A)
-//public fun <C, A: Ring<C>> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) = NumberedPolynomial(*pairs, toCheckInput = true)
-//
-//context(NumberedPolynomialSpace<C, A>)
-//@Suppress("FunctionName")
-//internal fun <C, A: Ring<C>> NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean): NumberedPolynomial<C> {
+//internal fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = false) : NumberedPolynomial<C> {
 //    if (!toCheckInput) return NumberedPolynomial(coefs)
 //
 //    val fixedCoefs = mutableMapOf<List<UInt>, C>()
@@ -176,23 +86,14 @@ internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
 //        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
 //    }
 //
-//    return NumberedPolynomial<C>(
-//        fixedCoefs
-//            .filter { it.value.isNotZero() }
+//    return NumberedPolynomial(
+//        fixedCoefs.filterValues { it.isNotZero() }
 //    )
 //}
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
-// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represent monomials.
-// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
-// *
-// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(NumberedPolynomialSpace<C, A>)
+//
+//context(NumberedPolynomialSpace<C, Ring<C>>)
 //@Suppress("FunctionName")
-//internal fun <C, A: Ring<C>> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean): NumberedPolynomial<C> {
+//internal fun <C> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = false) : NumberedPolynomial<C> {
 //    if (!toCheckInput) return NumberedPolynomial(pairs.toMap())
 //
 //    val fixedCoefs = mutableMapOf<List<UInt>, C>()
@@ -203,56 +104,25 @@ internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
 //        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
 //    }
 //
-//    return NumberedPolynomial<C>(
-//        fixedCoefs
-//            .filter { it.value.isNotZero() }
+//    return NumberedPolynomial(
+//        fixedCoefs.filterValues { it.isNotZero() }
 //    )
 //}
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
-// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represent monomials.
-// * @param toCheckInput If it's `true` cleaning of [coefficients] is executed otherwise it is not.
-// *
-// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(NumberedPolynomialSpace<C, A>)
+//
+//// TODO: Do not know how to make it without context receivers
+//context(NumberedPolynomialSpace<C, Ring<C>>)
 //@Suppress("FunctionName")
-//internal fun <C, A: Ring<C>> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean): NumberedPolynomial<C> =
-//    NumberedPolynomial(pairs.toList(), toCheckInput)
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
-// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
-// *
-// * @param coefs Coefficients of the instants.
-// *
-// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial(coefs: Map<List<UInt>, C>) = NumberedPolynomial(coefs, toCheckInput = true)
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
-// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represent monomials.
-// *
-// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) = NumberedPolynomial(pairs, toCheckInput = true)
-///**
-// * Gets the coefficients in format of [coefficients] field and cleans it: removes zero degrees from end of received
-// * lists, sums up proportional monomials, removes zero monomials, and if result is empty map adds only element in it.
-// *
-// * @param pairs Collection of pairs that represent monomials.
-// *
-// * @throws PolynomialError If no coefficient received or if any of degrees in any monomial is negative.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) = NumberedPolynomial(*pairs, toCheckInput = true)
+//public fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
+//
+//context(NumberedPolynomialSpace<C, Ring<C>>)
+//@Suppress("FunctionName")
+//public fun <C> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
+//
+//context(NumberedPolynomialSpace<C, Ring<C>>)
+//@Suppress("FunctionName")
+//public fun <C> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(pairs.toList(), toCheckInput = true)
 
-public fun <C, A: Ring<C>> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
+public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial(mapOf(emptyList<UInt>() to this))
 
 // endregion
 
@@ -314,7 +184,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      */
     public override operator fun NumberedPolynomial<C>.times(other: Int): NumberedPolynomial<C> =
         if (other == 0) zero
-        else NumberedPolynomial(
+        else NumberedPolynomial<C>(
             coefficients
                 .applyAndRemoveZeros {
                     mapValues { (_, c) -> c * other }
@@ -707,4 +577,51 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
         }
     }
     // endregion
+
+    // region Constructors and converters
+
+    @Suppress("FunctionName")
+    internal fun NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = false) : NumberedPolynomial<C> {
+        if (!toCheckInput) return NumberedPolynomial<C>(coefs)
+
+        val fixedCoefs = mutableMapOf<List<UInt>, C>()
+
+        for (entry in coefs) {
+            val key = entry.key.cleanUp()
+            val value = entry.value
+            fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+        }
+
+        return NumberedPolynomial(
+            fixedCoefs.filterValues { it.isNotZero() }
+        )
+    }
+
+    @Suppress("FunctionName")
+    internal fun NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = false) : NumberedPolynomial<C> {
+        if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
+
+        val fixedCoefs = mutableMapOf<List<UInt>, C>()
+
+        for (entry in pairs) {
+            val key = entry.first.cleanUp()
+            val value = entry.second
+            fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+        }
+
+        return NumberedPolynomial(
+            fixedCoefs.filterValues { it.isNotZero() }
+        )
+    }
+
+    @Suppress("FunctionName")
+    public fun NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
+
+    @Suppress("FunctionName")
+    public fun NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
+
+    @Suppress("FunctionName")
+    public fun NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(pairs.toList(), toCheckInput = true)
+
+    // endregion
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 1ac413818..2f7976da6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -14,7 +14,32 @@ import kotlin.math.min
  *
  * @param coefficients constant is the leftmost coefficient.
  */
-public data class Polynomial<C>(public val coefficients: List<C>) : AbstractPolynomial<C> {
+public data class Polynomial<C>(
+    /**
+     * List that collects coefficients of the polynomial. Every monomial `a x^d` is represented as a coefficients
+     * `a` placed into the list with index `d`. For example coefficients of polynomial `5 x^2 - 6` can be represented as
+     * ```
+     * listOf(
+     *     -6, // -6 +
+     *     0,  // 0 x +
+     *     5,  // 5 x^2
+     * )
+     * ```
+     * and also as
+     * ```
+     * listOf(
+     *     -6, // -6 +
+     *     0,  // 0 x +
+     *     5,  // 5 x^2
+     *     0,  // 0 x^3
+     *     0,  // 0 x^4
+     * )
+     * ```
+     * It is recommended not to put extra zeros at end of the list (as for `0x^3` and `0x^4` in the example), but is not
+     * prohibited.
+     */
+    public val coefficients: List<C>
+) : AbstractPolynomial<C> {
     override fun toString(): String = "Polynomial$coefficients"
 }
 
-- 
2.34.1


From bb5e638b31186607bf953bff3bd2f5275f13e0c1 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 15 Mar 2022 20:38:27 +0300
Subject: [PATCH 439/713] Added polynomial spaces and scopes fabrics

---
 .../kmath/functions/labeledPolynomialUtil.kt  | 189 +-----------------
 .../kmath/functions/numberedPolynomialUtil.kt | 189 +-----------------
 2 files changed, 20 insertions(+), 358 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
index 9cf4f2652..5689f6e1b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
@@ -54,7 +54,7 @@ import kotlin.contracts.*
 //        else -> multiplyWithPowerInternalLogic(base, arg, pow)
 //    }
 //
-//// Trivial but slow as duck
+//// Trivial but very slow
 //context(LabeledPolynomialSpace<C, A>)
 //internal tailrec fun <C, A: Ring<C>> multiplyWithPowerInternalLogic(base: LabeledPolynomial<C>, arg: LabeledPolynomial<C>, exponent: UInt): LabeledPolynomial<C> =
 //    when {
@@ -71,7 +71,15 @@ import kotlin.contracts.*
 
 // region Utilities
 
-// TODO: Docs
+/**
+ * Crates a [LabeledPolynomialSpace] over received ring.
+ */
+public fun <C, A : Ring<C>> A.labeledPolynomial(): LabeledPolynomialSpace<C, A> =
+    LabeledPolynomialSpace(this)
+
+/**
+ * Crates a [LabeledPolynomialSpace]'s scope over received ring.
+ */
 @OptIn(ExperimentalContracts::class)
 public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomialSpace<C, A>.() -> R): R {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
@@ -254,64 +262,6 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 
 //// region Field case
 //
-//operator fun <T: Field<T>> Polynomial<T>.div(other: Polynomial<T>): Polynomial<T> {
-//    if (other.isZero()) throw ArithmeticException("/ by zero")
-//    if (isZero()) return this
-//
-//    fun Map<List<Int>, T>.leadingTerm() =
-//        this
-//            .asSequence()
-//            .map { Pair(it.key, it.value) }
-//            .reduce { (accDegs, accC), (listDegs, listC) ->
-//                for (i in 0..accDegs.lastIndex) {
-//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
-//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
-//                }
-//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
-//            }
-//
-//    var thisCoefficients = coefficients.toMutableMap()
-//    val otherCoefficients = other.coefficients
-//    val quotientCoefficients = HashMap<List<Int>, T>()
-//
-//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
-//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
-//
-//    while (
-//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
-//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
-//    ) {
-//        val multiplierDegs =
-//            thisLeadingTermDegs
-//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
-//                .cleanUp()
-//        val multiplierC = thisLeadingTermC / otherLeadingTermC
-//
-//        quotientCoefficients[multiplierDegs] = multiplierC
-//
-//        for ((degs, t) in otherCoefficients) {
-//            val productDegs =
-//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
-//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
-//                    .cleanUp()
-//            val productC = t * multiplierC
-//            thisCoefficients[productDegs] =
-//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
-//        }
-//
-//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
-//
-//        if (thisCoefficients.isEmpty())
-//            return Polynomial(quotientCoefficients, toCheckInput = false)
-//
-//        val t = thisCoefficients.leadingTerm()
-//        thisLeadingTermDegs = t.first
-//        thisLeadingTermC = t.second
-//    }
-//
-//    return Polynomial(quotientCoefficients, toCheckInput = false)
-//}
-//
 //operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
 //    if (other.isZero()) throw ArithmeticException("/ by zero")
 //    else
@@ -321,125 +271,6 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 //            toCheckInput = false
 //        )
 //
-//operator fun <T: Field<T>> Polynomial<T>.rem(other: Polynomial<T>): Polynomial<T> {
-//    if (other.isZero()) throw ArithmeticException("/ by zero")
-//    if (isZero()) return this
-//
-//    fun Map<List<Int>, T>.leadingTerm() =
-//        this
-//            .asSequence()
-//            .map { Pair(it.key, it.value) }
-//            .reduce { (accDegs, accC), (listDegs, listC) ->
-//                for (i in 0..accDegs.lastIndex) {
-//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
-//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
-//                }
-//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
-//            }
-//
-//    var thisCoefficients = coefficients.toMutableMap()
-//    val otherCoefficients = other.coefficients
-//
-//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
-//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
-//
-//    while (
-//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
-//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
-//    ) {
-//        val multiplierDegs =
-//            thisLeadingTermDegs
-//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
-//                .cleanUp()
-//        val multiplierC = thisLeadingTermC / otherLeadingTermC
-//
-//        for ((degs, t) in otherCoefficients) {
-//            val productDegs =
-//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
-//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
-//                    .cleanUp()
-//            val productC = t * multiplierC
-//            thisCoefficients[productDegs] =
-//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
-//        }
-//
-//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
-//
-//        if (thisCoefficients.isEmpty())
-//            return Polynomial(thisCoefficients, toCheckInput = false)
-//
-//        val t = thisCoefficients.leadingTerm()
-//        thisLeadingTermDegs = t.first
-//        thisLeadingTermC = t.second
-//    }
-//
-//    return Polynomial(thisCoefficients, toCheckInput = false)
-//}
-//
-//infix fun <T: Field<T>> Polynomial<T>.divrem(other: Polynomial<T>): Polynomial.Companion.DividingResult<T> {
-//    if (other.isZero()) throw ArithmeticException("/ by zero")
-//    if (isZero()) return Polynomial.Companion.DividingResult(this, this)
-//
-//    fun Map<List<Int>, T>.leadingTerm() =
-//        this
-//            .asSequence()
-//            .map { Pair(it.key, it.value) }
-//            .reduce { (accDegs, accC), (listDegs, listC) ->
-//                for (i in 0..accDegs.lastIndex) {
-//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
-//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
-//                }
-//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
-//            }
-//
-//    var thisCoefficients = coefficients.toMutableMap()
-//    val otherCoefficients = other.coefficients
-//    val quotientCoefficients = HashMap<List<Int>, T>()
-//
-//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
-//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
-//
-//    while (
-//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
-//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
-//    ) {
-//        val multiplierDegs =
-//            thisLeadingTermDegs
-//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
-//                .cleanUp()
-//        val multiplierC = thisLeadingTermC / otherLeadingTermC
-//
-//        quotientCoefficients[multiplierDegs] = multiplierC
-//
-//        for ((degs, t) in otherCoefficients) {
-//            val productDegs =
-//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
-//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
-//                    .cleanUp()
-//            val productC = t * multiplierC
-//            thisCoefficients[productDegs] =
-//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
-//        }
-//
-//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
-//
-//        if (thisCoefficients.isEmpty())
-//            return Polynomial.Companion.DividingResult(
-//                Polynomial(quotientCoefficients, toCheckInput = false),
-//                Polynomial(thisCoefficients, toCheckInput = false)
-//            )
-//
-//        val t = thisCoefficients.leadingTerm()
-//        thisLeadingTermDegs = t.first
-//        thisLeadingTermC = t.second
-//    }
-//
-//    return Polynomial.Companion.DividingResult(
-//        Polynomial(quotientCoefficients, toCheckInput = false),
-//        Polynomial(thisCoefficients, toCheckInput = false)
-//    )
-//}
-//
 //// endregion
 
 // endregion
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
index b7620e792..de95d0151 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
@@ -38,7 +38,7 @@ import kotlin.jvm.JvmName
 //        else -> multiplyWithPowerInternalLogic(base, arg, pow)
 //    }
 //
-//// Trivial but slow as duck
+//// Trivial but very slow
 //context(NumberedPolynomialSpace<C, A>)
 //internal tailrec fun <C, A: Ring<C>> multiplyWithPowerInternalLogic(base: NumberedPolynomial<C>, arg: NumberedPolynomial<C>, exponent: UInt): NumberedPolynomial<C> =
 //    when {
@@ -55,7 +55,15 @@ import kotlin.jvm.JvmName
 
 // region Utilities
 
-// TODO: Docs
+/**
+ * Crates a [NumberedPolynomialSpace] over received ring.
+ */
+public fun <C, A : Ring<C>> A.numberedPolynomial(): NumberedPolynomialSpace<C, A> =
+    NumberedPolynomialSpace(this)
+
+/**
+ * Crates a [NumberedPolynomialSpace]'s scope over received ring.
+ */
 @OptIn(ExperimentalContracts::class)
 public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolynomialSpace<C, A>.() -> R): R {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
@@ -282,64 +290,6 @@ public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolyno
 
 //// region Field case
 //
-//operator fun <T: Field<T>> Polynomial<T>.div(other: Polynomial<T>): Polynomial<T> {
-//    if (other.isZero()) throw ArithmeticException("/ by zero")
-//    if (isZero()) return this
-//
-//    fun Map<List<Int>, T>.leadingTerm() =
-//        this
-//            .asSequence()
-//            .map { Pair(it.key, it.value) }
-//            .reduce { (accDegs, accC), (listDegs, listC) ->
-//                for (i in 0..accDegs.lastIndex) {
-//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
-//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
-//                }
-//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
-//            }
-//
-//    var thisCoefficients = coefficients.toMutableMap()
-//    val otherCoefficients = other.coefficients
-//    val quotientCoefficients = HashMap<List<Int>, T>()
-//
-//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
-//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
-//
-//    while (
-//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
-//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
-//    ) {
-//        val multiplierDegs =
-//            thisLeadingTermDegs
-//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
-//                .cleanUp()
-//        val multiplierC = thisLeadingTermC / otherLeadingTermC
-//
-//        quotientCoefficients[multiplierDegs] = multiplierC
-//
-//        for ((degs, t) in otherCoefficients) {
-//            val productDegs =
-//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
-//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
-//                    .cleanUp()
-//            val productC = t * multiplierC
-//            thisCoefficients[productDegs] =
-//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
-//        }
-//
-//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
-//
-//        if (thisCoefficients.isEmpty())
-//            return Polynomial(quotientCoefficients, toCheckInput = false)
-//
-//        val t = thisCoefficients.leadingTerm()
-//        thisLeadingTermDegs = t.first
-//        thisLeadingTermC = t.second
-//    }
-//
-//    return Polynomial(quotientCoefficients, toCheckInput = false)
-//}
-//
 //operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
 //    if (other.isZero()) throw ArithmeticException("/ by zero")
 //    else
@@ -349,125 +299,6 @@ public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolyno
 //            toCheckInput = false
 //        )
 //
-//operator fun <T: Field<T>> Polynomial<T>.rem(other: Polynomial<T>): Polynomial<T> {
-//    if (other.isZero()) throw ArithmeticException("/ by zero")
-//    if (isZero()) return this
-//
-//    fun Map<List<Int>, T>.leadingTerm() =
-//        this
-//            .asSequence()
-//            .map { Pair(it.key, it.value) }
-//            .reduce { (accDegs, accC), (listDegs, listC) ->
-//                for (i in 0..accDegs.lastIndex) {
-//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
-//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
-//                }
-//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
-//            }
-//
-//    var thisCoefficients = coefficients.toMutableMap()
-//    val otherCoefficients = other.coefficients
-//
-//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
-//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
-//
-//    while (
-//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
-//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
-//    ) {
-//        val multiplierDegs =
-//            thisLeadingTermDegs
-//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
-//                .cleanUp()
-//        val multiplierC = thisLeadingTermC / otherLeadingTermC
-//
-//        for ((degs, t) in otherCoefficients) {
-//            val productDegs =
-//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
-//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
-//                    .cleanUp()
-//            val productC = t * multiplierC
-//            thisCoefficients[productDegs] =
-//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
-//        }
-//
-//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
-//
-//        if (thisCoefficients.isEmpty())
-//            return Polynomial(thisCoefficients, toCheckInput = false)
-//
-//        val t = thisCoefficients.leadingTerm()
-//        thisLeadingTermDegs = t.first
-//        thisLeadingTermC = t.second
-//    }
-//
-//    return Polynomial(thisCoefficients, toCheckInput = false)
-//}
-//
-//infix fun <T: Field<T>> Polynomial<T>.divrem(other: Polynomial<T>): Polynomial.Companion.DividingResult<T> {
-//    if (other.isZero()) throw ArithmeticException("/ by zero")
-//    if (isZero()) return Polynomial.Companion.DividingResult(this, this)
-//
-//    fun Map<List<Int>, T>.leadingTerm() =
-//        this
-//            .asSequence()
-//            .map { Pair(it.key, it.value) }
-//            .reduce { (accDegs, accC), (listDegs, listC) ->
-//                for (i in 0..accDegs.lastIndex) {
-//                    if (accDegs[i] > listDegs.getOrElse(i) { 0 }) return@reduce accDegs to accC
-//                    if (accDegs[i] < listDegs.getOrElse(i) { 0 }) return@reduce listDegs to listC
-//                }
-//                if (accDegs.size < listDegs.size) listDegs to listC else accDegs to accC
-//            }
-//
-//    var thisCoefficients = coefficients.toMutableMap()
-//    val otherCoefficients = other.coefficients
-//    val quotientCoefficients = HashMap<List<Int>, T>()
-//
-//    var (thisLeadingTermDegs, thisLeadingTermC) = thisCoefficients.leadingTerm()
-//    val (otherLeadingTermDegs, otherLeadingTermC) = otherCoefficients.leadingTerm()
-//
-//    while (
-//        thisLeadingTermDegs.size >= otherLeadingTermDegs.size &&
-//        (0..otherLeadingTermDegs.lastIndex).all { thisLeadingTermDegs[it] >= otherLeadingTermDegs[it] }
-//    ) {
-//        val multiplierDegs =
-//            thisLeadingTermDegs
-//                .mapIndexed { index, deg -> deg - otherLeadingTermDegs.getOrElse(index) { 0 } }
-//                .cleanUp()
-//        val multiplierC = thisLeadingTermC / otherLeadingTermC
-//
-//        quotientCoefficients[multiplierDegs] = multiplierC
-//
-//        for ((degs, t) in otherCoefficients) {
-//            val productDegs =
-//                (0..max(degs.lastIndex, multiplierDegs.lastIndex))
-//                    .map { degs.getOrElse(it) { 0 } + multiplierDegs.getOrElse(it) { 0 } }
-//                    .cleanUp()
-//            val productC = t * multiplierC
-//            thisCoefficients[productDegs] =
-//                if (productDegs in thisCoefficients) thisCoefficients[productDegs]!! - productC else -productC
-//        }
-//
-//        thisCoefficients = thisCoefficients.filterValues { it.isNotZero() }.toMutableMap()
-//
-//        if (thisCoefficients.isEmpty())
-//            return Polynomial.Companion.DividingResult(
-//                Polynomial(quotientCoefficients, toCheckInput = false),
-//                Polynomial(thisCoefficients, toCheckInput = false)
-//            )
-//
-//        val t = thisCoefficients.leadingTerm()
-//        thisLeadingTermDegs = t.first
-//        thisLeadingTermC = t.second
-//    }
-//
-//    return Polynomial.Companion.DividingResult(
-//        Polynomial(quotientCoefficients, toCheckInput = false),
-//        Polynomial(thisCoefficients, toCheckInput = false)
-//    )
-//}
-//
 //// endregion
 
 // endregion
-- 
2.34.1


From 16cf1bc65e6cd1a2955c9ca3bf5e4200eae71c71 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 16 Mar 2022 00:47:07 +0300
Subject: [PATCH 440/713] Implemented all derivative-like functions

---
 .../kmath/functions/labeledPolynomialUtil.kt  | 253 ++++++++++++++++-
 .../kmath/functions/numberedPolynomialUtil.kt | 255 +++++++++++-------
 .../kmath/functions/polynomialUtil.kt         |   2 +-
 3 files changed, 407 insertions(+), 103 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
index 5689f6e1b..544cca410 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
@@ -5,8 +5,10 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import kotlin.contracts.*
+import kotlin.math.max
 
 
 // TODO: Docs
@@ -321,6 +323,251 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 //
 //// endregion
 
-//// region Algebraic derivative and antiderivative
-//// TODO
-//// endregion
\ No newline at end of file
+// region Algebraic derivative and antiderivative
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
+    algebra: A,
+    variable: Variable,
+): LabeledPolynomial<C> = algebra {
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    if (variable !in degs) return@forEach
+                    put(
+                        buildMap {
+                            degs.forEach { (vari, deg) ->
+                                when {
+                                    vari != variable -> put(vari, deg)
+                                    deg > 1u -> put(vari, deg - 1u)
+                                }
+                            }
+                        },
+                        optimizedMultiply(c, degs[variable]!!)
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
+    algebra: A,
+    variables: Collection<Variable>,
+): LabeledPolynomial<C> = algebra {
+    val cleanedVariables = variables.toSet()
+    if (cleanedVariables.isEmpty()) return this@derivativeWithRespectTo
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    if (!degs.keys.containsAll(cleanedVariables)) return@forEach
+                    put(
+                        buildMap {
+                            degs.forEach { (vari, deg) ->
+                                when {
+                                    vari !in cleanedVariables -> put(vari, deg)
+                                    deg > 1u -> put(vari, deg - 1u)
+                                }
+                            }
+                        },
+                        cleanedVariables.fold(c) { acc, variable -> optimizedMultiply(acc, degs[variable]!!) }
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
+    algebra: A,
+    variable: Variable,
+    order: UInt
+): LabeledPolynomial<C> = algebra {
+    if (order == 0u) return this@nthDerivativeWithRespectTo
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    if (degs.getOrElse(variable) { 0u } < order) return@forEach
+                    put(
+                        buildMap {
+                            degs.forEach { (vari, deg) ->
+                                when {
+                                    vari != variable -> put(vari, deg)
+                                    deg > order -> put(vari, deg - order)
+                                }
+                            }
+                        },
+                        degs[variable]!!.let { deg ->
+                            (deg downTo deg - order + 1u)
+                                .fold(c) { acc, ord -> optimizedMultiply(acc, ord) }
+                        }
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
+    algebra: A,
+    variablesAndOrders: Map<Variable, UInt>,
+): LabeledPolynomial<C> = algebra {
+    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
+    if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    if (filteredVariablesAndOrders.any { (variable, order) -> degs.getOrElse(variable) { 0u } < order }) return@forEach
+                    put(
+                        buildMap {
+                            degs.forEach { (vari, deg) ->
+                                if (vari !in filteredVariablesAndOrders) put(vari, deg)
+                                else {
+                                    val order = filteredVariablesAndOrders[vari]!!
+                                    if (deg > order) put(vari, deg - order)
+                                }
+                            }
+                        },
+                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
+                            degs[index]!!.let { deg ->
+                                (deg downTo deg - order + 1u)
+                                    .fold(acc1) { acc2, ord -> optimizedMultiply(acc2, ord) }
+                            }
+                        }
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
+    algebra: A,
+    variable: Variable,
+): LabeledPolynomial<C> = algebra {
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    val newDegs = buildMap<Variable, UInt>(degs.size + 1) {
+                        put(variable, 1u)
+                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
+                    }
+                    put(
+                        newDegs,
+                        c / optimizedMultiply(one, newDegs[variable]!!)
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
+    algebra: A,
+    variables: Collection<Variable>,
+): LabeledPolynomial<C> = algebra {
+    val cleanedVariables = variables.toSet()
+    if (cleanedVariables.isEmpty()) return this@antiderivativeWithRespectTo
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    val newDegs = buildMap<Variable, UInt>(degs.size + 1) {
+                        for (variable in cleanedVariables) put(variable, 1u)
+                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
+                    }
+                    put(
+                        newDegs,
+                        cleanedVariables.fold(c) { acc, variable -> acc / optimizedMultiply(one, newDegs[variable]!!) }
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
+    algebra: A,
+    variable: Variable,
+    order: UInt
+): LabeledPolynomial<C> = algebra {
+    if (order == 0u) return this@nthAntiderivativeWithRespectTo
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    val newDegs = buildMap<Variable, UInt>(degs.size + 1) {
+                        put(variable, order)
+                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
+                    }
+                    put(
+                        newDegs,
+                        newDegs[variable]!!.let { deg ->
+                            (deg downTo  deg - order + 1u)
+                                .fold(c) { acc, ord -> acc / optimizedMultiply(one, ord) }
+                        }
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
+    algebra: A,
+    variablesAndOrders: Map<Variable, UInt>,
+): LabeledPolynomial<C> = algebra {
+    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
+    if (filteredVariablesAndOrders.isEmpty()) return this@nthAntiderivativeWithRespectTo
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    val newDegs = buildMap<Variable, UInt>(degs.size + 1) {
+                        for ((variable, order) in filteredVariablesAndOrders) put(variable, order)
+                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
+                    }
+                    put(
+                        newDegs,
+                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
+                            newDegs[index]!!.let { deg ->
+                                (deg downTo deg - order + 1u)
+                                    .fold(acc1) { acc2, ord -> acc2 / optimizedMultiply(one, ord) }
+                            }
+                        }
+                    )
+                }
+        }
+    )
+}
+
+// endregion
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
index de95d0151..47644b26a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
@@ -4,7 +4,7 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import kotlin.contracts.*
 import kotlin.jvm.JvmName
-
+import kotlin.math.max
 
 
 // TODO: Docs
@@ -382,70 +382,51 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
 ): NumberedPolynomial<C> = algebra {
     NumberedPolynomial<C>(
         buildMap(coefficients.size) {
-            coefficients.forEach { (degs, c) ->
-                put(
-                    degs.mapIndexed { index, deg ->
-                        when {
-                            index != variable -> deg
-                            deg > 0u -> deg - 1u
-                            else -> return@forEach
-                        }
-                    },
-                    optimizedMultiply(c, degs.getOrElse(variable) { 1u }.toInt())
-                )
-            }
+            coefficients
+                .forEach { (degs, c) ->
+                    if (degs.size > variable) return@forEach
+                    put(
+                        degs.mapIndexed { index, deg ->
+                            when {
+                                index != variable -> deg
+                                deg > 0u -> deg - 1u
+                                else -> return@forEach
+                            }
+                        }.cleanUp(),
+                        optimizedMultiply(c, degs[variable])
+                    )
+                }
         }
     )
 }
 
 /**
  * Returns algebraic derivative of received polynomial.
- */ // TODO: This one does not work!!!
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variables: IntArray,
-): NumberedPolynomial<C> = algebra {
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients.forEach { (degs, c) ->
-                put(
-                    degs.mapIndexed { index, deg ->
-                        when {
-                            index !in variables -> deg
-                            deg > 0u -> deg - 1u
-                            else -> return@forEach
-                        }
-                    },
-                    optimizedMultiply(c, variables.fold(1u) { acc, variable -> acc * degs.getOrElse(variable) { 1u } }.toInt())
-                )
-            }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */ // TODO: This one does not work!!!
+ */
 @UnstableKMathAPI
 public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
     algebra: A,
     variables: Collection<Int>,
 ): NumberedPolynomial<C> = algebra {
+    val cleanedVariables = variables.toSet()
+    if (cleanedVariables.isEmpty()) return this@derivativeWithRespectTo
+    val maxRespectedVariable = cleanedVariables.maxOrNull()!!
     NumberedPolynomial<C>(
         buildMap(coefficients.size) {
-            coefficients.forEach { (degs, c) ->
-                put(
-                    degs.mapIndexed { index, deg ->
-                        when {
-                            index !in variables -> deg
-                            deg > 0u -> deg - 1u
-                            else -> return@forEach
-                        }
-                    },
-                    optimizedMultiply(c, variables.fold(1u) { acc, variable -> acc * degs.getOrElse(variable) { 1u } }.toInt())
-                )
-            }
+            coefficients
+                .forEach { (degs, c) ->
+                    if (degs.size > maxRespectedVariable) return@forEach
+                    put(
+                        degs.mapIndexed { index, deg ->
+                            when {
+                                index !in cleanedVariables -> deg
+                                deg > 0u -> deg - 1u
+                                else -> return@forEach
+                            }
+                        }.cleanUp(),
+                        cleanedVariables.fold(c) { acc, variable -> optimizedMultiply(acc, degs[variable]) }
+                    )
+                }
         }
     )
 }
@@ -459,24 +440,60 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
     variable: Int,
     order: UInt
 ): NumberedPolynomial<C> = algebra {
+    if (order == 0u) return this@nthDerivativeWithRespectTo
     NumberedPolynomial<C>(
         buildMap(coefficients.size) {
-            coefficients.forEach { (degs, c) ->
-                put(
-                    degs.mapIndexed { index, deg ->
-                        when {
-                            index != variable -> deg
-                            deg >= order -> deg - order
-                            else -> return@forEach
+            coefficients
+                .forEach { (degs, c) ->
+                    if (degs.size > variable) return@forEach
+                    put(
+                        degs.mapIndexed { index, deg ->
+                            when {
+                                index != variable -> deg
+                                deg >= order -> deg - order
+                                else -> return@forEach
+                            }
+                        }.cleanUp(),
+                        degs[variable].let { deg ->
+                            (deg downTo deg - order + 1u)
+                                .fold(c) { acc, ord -> optimizedMultiply(acc, ord) }
                         }
-                    },
-                    degs.getOrElse(variable) { 1u }.toInt().let {
-                        (0u until order).fold(c) { acc, ord ->
-                            optimizedMultiply(acc, ord.toInt())
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
+    algebra: A,
+    variablesAndOrders: Map<Int, UInt>,
+): NumberedPolynomial<C> = algebra {
+    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
+    if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
+    val maxRespectedVariable = filteredVariablesAndOrders.keys.maxOrNull()!!
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    if (degs.size > maxRespectedVariable) return@forEach
+                    put(
+                        degs.mapIndexed { index, deg ->
+                            if (index !in filteredVariablesAndOrders) return@mapIndexed deg
+                            val order = filteredVariablesAndOrders[index]!!
+                            if (deg >= order) deg - order else return@forEach
+                        }.cleanUp(),
+                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
+                            degs[index].let { deg ->
+                                (deg downTo deg - order + 1u)
+                                    .fold(acc1) { acc2, ord -> optimizedMultiply(acc2, ord) }
+                            }
                         }
-                    }
-                )
-            }
+                    )
+                }
         }
     )
 }
@@ -491,52 +508,92 @@ public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
 ): NumberedPolynomial<C> = algebra {
     NumberedPolynomial<C>(
         buildMap(coefficients.size) {
-            coefficients.forEach { (degs, c) ->
-                put(
-                    degs.mapIndexed { index, deg -> if(index != variable) deg else deg + 1u },
-                    c / optimizedMultiply(one, degs.getOrElse(variable) { 1u }.toInt())
-                )
-            }
+            coefficients
+                .forEach { (degs, c) ->
+                    put(
+                        List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + 1u },
+                        c / optimizedMultiply(one, degs[variable])
+                    )
+                }
         }
     )
 }
 
 /**
  * Returns algebraic antiderivative of received polynomial.
- */ // TODO: This one does not work!!!
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variables: IntArray,
-): NumberedPolynomial<C> = algebra {
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients.forEach { (degs, c) ->
-                put(
-                    degs.mapIndexed { index, deg -> if(index !in variables) deg else deg + 1u },
-                    c / optimizedMultiply(one, variables.fold(1u) { acc, variable -> acc * degs.getOrElse(variable) { 1u } }.toInt())
-                )
-            }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */ // TODO: This one does not work!!!
+ */
 @UnstableKMathAPI
 public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
     algebra: A,
     variables: Collection<Int>,
 ): NumberedPolynomial<C> = algebra {
+    val cleanedVariables = variables.toSet()
+    if (cleanedVariables.isEmpty()) return this@antiderivativeWithRespectTo
+    val maxRespectedVariable = cleanedVariables.maxOrNull()!!
     NumberedPolynomial<C>(
         buildMap(coefficients.size) {
-            coefficients.forEach { (degs, c) ->
-                put(
-                    degs.mapIndexed { index, deg -> if(index !in variables) deg else deg + 1u },
-                    c / optimizedMultiply(one, variables.fold(1u) { acc, variable -> acc * degs.getOrElse(variable) { 1u } }.toInt())
-                )
-            }
+            coefficients
+                .forEach { (degs, c) ->
+                    put(
+                        List(max(maxRespectedVariable + 1, degs.size)) { if (it !in variables) degs[it] else degs[it] + 1u },
+                        cleanedVariables.fold(c) { acc, variable -> acc / optimizedMultiply(one, degs[variable]) }
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectTo(
+    algebra: A,
+    variable: Int,
+    order: UInt
+): NumberedPolynomial<C> = algebra {
+    if (order == 0u) return this@nthAntiderivativeWithRespectTo
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    put(
+                        List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + order },
+                        degs[variable].let { deg ->
+                            (deg downTo deg - order + 1u)
+                                .fold(c) { acc, ord -> acc / optimizedMultiply(one, ord) }
+                        }
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectTo(
+    algebra: A,
+    variablesAndOrders: Map<Int, UInt>,
+): NumberedPolynomial<C> = algebra {
+    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
+    if (filteredVariablesAndOrders.isEmpty()) return this@nthAntiderivativeWithRespectTo
+    val maxRespectedVariable = filteredVariablesAndOrders.keys.maxOrNull()!!
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    put(
+                        List(max(maxRespectedVariable + 1, degs.size)) { degs[it] + filteredVariablesAndOrders.getOrElse(it) { 0u } },
+                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
+                            degs[index].let { deg ->
+                                (deg downTo deg - order + 1u)
+                                    .fold(acc1) { acc2, ord -> acc2 / optimizedMultiply(one, ord) }
+                            }
+                        }
+                    )
+                }
         }
     )
 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index a41a6cbd6..9c8cc0090 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -138,7 +138,7 @@ public fun <C, A> Polynomial<C>.nthDerivative(
     algebra: A,
     order: UInt,
 ): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    Polynomial(coefficients.drop(order.toInt()).mapIndexed { index, c -> (1..order.toInt()).fold(c) { acc, i -> acc * number(index + i) } })
+    Polynomial(coefficients.drop(order.toInt()).mapIndexed { index, c -> (index + 1..index + order.toInt()).fold(c) { acc, i -> acc * number(i) } })
 }
 
 /**
-- 
2.34.1


From 9aa131a9c6c69145761bc63fdae436da01916634 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 16 Mar 2022 01:06:39 +0300
Subject: [PATCH 441/713] Replaced `Variable` in `Labeled...` by `Symbol` and
 deleted it

---
 .../kmath/functions/LabeledPolynomial.kt      | 145 +++++++++---------
 .../functions/LabeledRationalFunction.kt      |  37 ++---
 .../kscience/kmath/functions/Variable.kt      |  38 -----
 .../kmath/functions/labeledPolynomialUtil.kt  |  64 ++++----
 4 files changed, 126 insertions(+), 158 deletions(-)
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Variable.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 56dad975d..4106371cc 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.*
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
@@ -40,9 +41,9 @@ internal constructor(
      *      ) to (-6)
      * )
      * ```
-     * where `a`, `b` and `c` are corresponding [Variable] objects.
+     * where `a`, `b` and `c` are corresponding [Symbol] objects.
      */
-    public val coefficients: Map<Map<Variable, UInt>, C>
+    public val coefficients: Map<Map<Symbol, UInt>, C>
 ) : AbstractPolynomial<C> {
     override fun toString(): String = "LabeledPolynomial$coefficients"
 }
@@ -67,7 +68,7 @@ internal fun labeledPolynomialError(message: Any): Nothing = throw LabeledPolyno
 /**
  * Returns the same degrees description of the monomial, but without zero degrees.
  */
-internal fun Map<Variable, UInt>.cleanUp() = filterValues { it > 0U }
+internal fun Map<Symbol, UInt>.cleanUp() = filterValues { it > 0U }
 
 // endregion
 
@@ -75,10 +76,10 @@ internal fun Map<Variable, UInt>.cleanUp() = filterValues { it > 0U }
 
 //context(LabeledPolynomialSpace<C, Ring<C>>)
 //@Suppress("FunctionName")
-//internal fun <C> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>, toCheckInput: Boolean = false) : LabeledPolynomial<C> {
+//internal fun <C> LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = false) : LabeledPolynomial<C> {
 //    if (!toCheckInput) return LabeledPolynomial(coefs)
 //
-//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
 //
 //    for (entry in coefs) {
 //        val key = entry.key.cleanUp()
@@ -93,10 +94,10 @@ internal fun Map<Variable, UInt>.cleanUp() = filterValues { it > 0U }
 //
 //context(LabeledPolynomialSpace<C, Ring<C>>)
 //@Suppress("FunctionName")
-//internal fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>, toCheckInput: Boolean = false) : LabeledPolynomial<C> {
+//internal fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = false) : LabeledPolynomial<C> {
 //    if (!toCheckInput) return LabeledPolynomial(pairs.toMap())
 //
-//    val fixedCoefs = mutableMapOf<Map<Variable, UInt>, C>()
+//    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
 //
 //    for (entry in pairs) {
 //        val key = entry.first.cleanUp()
@@ -112,20 +113,20 @@ internal fun Map<Variable, UInt>.cleanUp() = filterValues { it > 0U }
 //// TODO: Do not know how to make it without context receivers
 //context(LabeledPolynomialSpace<C, Ring<C>>)
 //@Suppress("FunctionName")
-//public fun <C> LabeledPolynomial(coefs: Map<Map<Variable, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
+//public fun <C> LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
 //
 //context(LabeledPolynomialSpace<C, Ring<C>>)
 //@Suppress("FunctionName")
-//public fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Variable, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
+//public fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
 //
 //context(LabeledPolynomialSpace<C, Ring<C>>)
 //@Suppress("FunctionName")
-//public fun <C> LabeledPolynomial(vararg pairs: Pair<Map<Variable, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(pairs.toList(), toCheckInput = true)
+//public fun <C> LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(pairs.toList(), toCheckInput = true)
 //
 //context(LabeledPolynomialSpace<C, Ring<C>>)
-//public fun <C> Variable.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial(mapOf(mapOf(this to 1u) to constantOne))
+//public fun <C> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial(mapOf(mapOf(this to 1u) to constantOne))
 
-public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial(mapOf(emptyMap<Variable, UInt>() to this))
+public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to this))
 
 // endregion
 
@@ -140,24 +141,24 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override val ring: A,
 ) : AbstractPolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
 
-    // region Variable-integer relation
-    public operator fun Variable.plus(other: Int): LabeledPolynomial<C> =
+    // region Symbol-integer relation
+    public operator fun Symbol.plus(other: Int): LabeledPolynomial<C> =
         if (other == 0) LabeledPolynomial<C>(mapOf(
             mapOf(this@plus to 1U) to constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
             mapOf(this@plus to 1U) to constantOne,
-            emptyMap<Variable, UInt>() to constantOne * other,
+            emptyMap<Symbol, UInt>() to constantOne * other,
         ))
-    public operator fun Variable.minus(other: Int): LabeledPolynomial<C> =
+    public operator fun Symbol.minus(other: Int): LabeledPolynomial<C> =
         if (other == 0) LabeledPolynomial<C>(mapOf(
             mapOf(this@minus to 1U) to -constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
             mapOf(this@minus to 1U) to -constantOne,
-            emptyMap<Variable, UInt>() to constantOne * other,
+            emptyMap<Symbol, UInt>() to constantOne * other,
         ))
-    public operator fun Variable.times(other: Int): LabeledPolynomial<C> =
+    public operator fun Symbol.times(other: Int): LabeledPolynomial<C> =
         if (other == 0) zero
         else LabeledPolynomial<C>(mapOf(
             mapOf(this to 1U) to constantOne * other,
@@ -165,23 +166,23 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     // endregion
 
     // region Integer-variable relation
-    public operator fun Int.plus(other: Variable): LabeledPolynomial<C> =
+    public operator fun Int.plus(other: Symbol): LabeledPolynomial<C> =
         if (this == 0) LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to constantOne,
-            emptyMap<Variable, UInt>() to constantOne * this@plus,
+            emptyMap<Symbol, UInt>() to constantOne * this@plus,
         ))
-    public operator fun Int.minus(other: Variable): LabeledPolynomial<C> =
+    public operator fun Int.minus(other: Symbol): LabeledPolynomial<C> =
         if (this == 0) LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to -constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to -constantOne,
-            emptyMap<Variable, UInt>() to constantOne * this@minus,
+            emptyMap<Symbol, UInt>() to constantOne * this@minus,
         ))
-    public operator fun Int.times(other: Variable): LabeledPolynomial<C> =
+    public operator fun Int.times(other: Symbol): LabeledPolynomial<C> =
         if (this == 0) zero
         else LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to constantOne * this@times,
@@ -201,7 +202,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                 coefficients
                     .toMutableMap()
                     .apply {
-                        val degs = emptyMap<Variable, UInt>()
+                        val degs = emptyMap<Symbol, UInt>()
 
                         val result = getOrElse(degs) { constantZero } + other
 
@@ -221,7 +222,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                 coefficients
                     .toMutableMap()
                     .apply {
-                        val degs = emptyMap<Variable, UInt>()
+                        val degs = emptyMap<Symbol, UInt>()
 
                         val result = getOrElse(degs) { constantZero } - other
 
@@ -257,7 +258,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                 other.coefficients
                     .toMutableMap()
                     .apply {
-                        val degs = emptyMap<Variable, UInt>()
+                        val degs = emptyMap<Symbol, UInt>()
 
                         val result = this@plus + getOrElse(degs) { constantZero }
 
@@ -277,7 +278,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                 other.coefficients
                     .toMutableMap()
                     .apply {
-                        val degs = emptyMap<Variable, UInt>()
+                        val degs = emptyMap<Symbol, UInt>()
 
                         val result = this@minus - getOrElse(degs) { constantZero }
 
@@ -301,47 +302,47 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     // endregion
 
     // region Constant-variable relation
-    public operator fun C.plus(other: Variable): LabeledPolynomial<C> =
+    public operator fun C.plus(other: Symbol): LabeledPolynomial<C> =
         if (isZero()) LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to constantOne,
-            emptyMap<Variable, UInt>() to this@plus,
+            emptyMap<Symbol, UInt>() to this@plus,
         ))
-    public operator fun C.minus(other: Variable): LabeledPolynomial<C> =
+    public operator fun C.minus(other: Symbol): LabeledPolynomial<C> =
         if (isZero()) LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to -constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to -constantOne,
-            emptyMap<Variable, UInt>() to this@minus,
+            emptyMap<Symbol, UInt>() to this@minus,
         ))
-    public operator fun C.times(other: Variable): LabeledPolynomial<C> =
+    public operator fun C.times(other: Symbol): LabeledPolynomial<C> =
         if (isZero()) zero
         else LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to this@times,
         ))
     // endregion
 
-    // region Variable-constant relation
-    public operator fun Variable.plus(other: C): LabeledPolynomial<C> =
+    // region Symbol-constant relation
+    public operator fun Symbol.plus(other: C): LabeledPolynomial<C> =
         if (other.isZero()) LabeledPolynomial<C>(mapOf(
             mapOf(this@plus to 1U) to constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
             mapOf(this@plus to 1U) to constantOne,
-            emptyMap<Variable, UInt>() to other,
+            emptyMap<Symbol, UInt>() to other,
         ))
-    public operator fun Variable.minus(other: C): LabeledPolynomial<C> =
+    public operator fun Symbol.minus(other: C): LabeledPolynomial<C> =
         if (other.isZero()) LabeledPolynomial<C>(mapOf(
             mapOf(this@minus to 1U) to -constantOne,
         ))
         else LabeledPolynomial<C>(mapOf(
             mapOf(this@minus to 1U) to -constantOne,
-            emptyMap<Variable, UInt>() to other,
+            emptyMap<Symbol, UInt>() to other,
         ))
-    public operator fun Variable.times(other: C): LabeledPolynomial<C> =
+    public operator fun Symbol.times(other: C): LabeledPolynomial<C> =
         if (other.isZero()) zero
         else LabeledPolynomial<C>(mapOf(
             mapOf(this@times to 1U) to other,
@@ -355,11 +356,11 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     override operator fun C.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         if (this.isZero()) other
         else with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to this@plus))
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@plus))
             else LabeledPolynomial<C>(
                 toMutableMap()
                     .apply {
-                        val degs = emptyMap<Variable, UInt>()
+                        val degs = emptyMap<Symbol, UInt>()
 
                         val result = this@plus + getOrElse(degs) { constantZero }
 
@@ -374,13 +375,13 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     override operator fun C.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         if (this.isZero()) other
         else with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to this@minus))
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@minus))
             else LabeledPolynomial<C>(
                 toMutableMap()
                     .apply {
                         forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
 
-                        val degs = emptyMap<Variable, UInt>()
+                        val degs = emptyMap<Symbol, UInt>()
 
                         val result = this@minus - getOrElse(degs) { constantZero }
 
@@ -409,11 +410,11 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     override operator fun LabeledPolynomial<C>.plus(other: C): LabeledPolynomial<C> =
         if (other.isZero()) this
         else with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to other))
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other))
             else LabeledPolynomial<C>(
                 toMutableMap()
                     .apply {
-                        val degs = emptyMap<Variable, UInt>()
+                        val degs = emptyMap<Symbol, UInt>()
 
                         val result = getOrElse(degs) { constantZero } + other
 
@@ -428,13 +429,13 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     override operator fun LabeledPolynomial<C>.minus(other: C): LabeledPolynomial<C> =
         if (other.isZero()) this
         else with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to other))
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other))
             else LabeledPolynomial<C>(
                 toMutableMap()
                     .apply {
                         forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
 
-                        val degs = emptyMap<Variable, UInt>()
+                        val degs = emptyMap<Symbol, UInt>()
 
                         val result = getOrElse(degs) { constantZero } - other
 
@@ -456,8 +457,8 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         )
     // endregion
 
-    // region Variable-variable relation
-    public operator fun Variable.plus(other: Variable): LabeledPolynomial<C> =
+    // region Symbol-variable relation
+    public operator fun Symbol.plus(other: Symbol): LabeledPolynomial<C> =
         if (this == other) LabeledPolynomial<C>(mapOf(
             mapOf(this to 1U) to constantOne * 2
         ))
@@ -465,13 +466,13 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             mapOf(this to 1U) to constantOne,
             mapOf(other to 1U) to constantOne,
         ))
-    public operator fun Variable.minus(other: Variable): LabeledPolynomial<C> =
+    public operator fun Symbol.minus(other: Symbol): LabeledPolynomial<C> =
         if (this == other) zero
         else LabeledPolynomial<C>(mapOf(
             mapOf(this to 1U) to constantOne,
             mapOf(other to 1U) to -constantOne,
         ))
-    public operator fun Variable.times(other: Variable): LabeledPolynomial<C> =
+    public operator fun Symbol.times(other: Symbol): LabeledPolynomial<C> =
         if (this == other) LabeledPolynomial<C>(mapOf(
             mapOf(this to 2U) to constantOne
         ))
@@ -480,8 +481,8 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         ))
     // endregion
 
-    // region Variable-polynomial relation
-    public operator fun Variable.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+    // region Symbol-polynomial relation
+    public operator fun Symbol.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         with(other.coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@plus to 1u) to constantOne))
             else LabeledPolynomial<C>(
@@ -496,7 +497,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
-    public operator fun Variable.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+    public operator fun Symbol.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         with(other.coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@minus to 1u) to constantOne))
             else LabeledPolynomial<C>(
@@ -513,7 +514,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
-    public operator fun Variable.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+    public operator fun Symbol.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         LabeledPolynomial<C>(
             other.coefficients
                 .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[this] = if (this in it) it[this]!! + 1U else 1U } }
@@ -521,7 +522,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     // endregion
 
     // region Polynomial-variable relation
-    public operator fun LabeledPolynomial<C>.plus(other: Variable): LabeledPolynomial<C> =
+    public operator fun LabeledPolynomial<C>.plus(other: Symbol): LabeledPolynomial<C> =
         with(coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to constantOne))
             else LabeledPolynomial<C>(
@@ -536,7 +537,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
-    public operator fun LabeledPolynomial<C>.minus(other: Variable): LabeledPolynomial<C> =
+    public operator fun LabeledPolynomial<C>.minus(other: Symbol): LabeledPolynomial<C> =
         with(coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to constantOne))
             else LabeledPolynomial<C>(
@@ -551,7 +552,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
-    public operator fun LabeledPolynomial<C>.times(other: Variable): LabeledPolynomial<C> =
+    public operator fun LabeledPolynomial<C>.times(other: Symbol): LabeledPolynomial<C> =
         LabeledPolynomial<C>(
             coefficients
                 .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[other] = if (other in it) it[other]!! + 1U else 1U } }
@@ -610,11 +611,11 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
      */
-    override val zero: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to constantZero))
+    override val zero: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to constantZero))
     /**
      * Instance of unit polynomial (unit of the polynomial ring).
      */
-    override val one: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to constantOne))
+    override val one: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to constantOne))
 
     /**
      * Checks equality of the polynomials.
@@ -642,7 +643,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
      * And keys of the map is the same as in [variables].
      */
-    public val LabeledPolynomial<C>.degrees: Map<Variable, UInt>
+    public val LabeledPolynomial<C>.degrees: Map<Symbol, UInt>
         get() =
             buildMap {
                 coefficients.entries.forEach { (degs, c) ->
@@ -654,7 +655,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     /**
      * Set of all variables that appear in the polynomial in positive exponents.
      */
-    public val LabeledPolynomial<C>.variables: Set<Variable>
+    public val LabeledPolynomial<C>.variables: Set<Symbol>
         get() =
             buildSet {
                 coefficients.entries.forEach { (degs, c) -> if (c.isNotZero()) addAll(degs.keys) }
@@ -695,29 +696,29 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         }
 
 //    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Variable, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
+//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
 //    @Suppress("NOTHING_TO_INLINE")
 //    @JvmName("substitutePolynomial")
-//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Variable, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
+//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
 //
 //    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.asFunction(): (Map<Variable, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
+//    public inline fun LabeledPolynomial<C>.asFunction(): (Map<Symbol, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
 //    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.asFunctionOnConstants(): (Map<Variable, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
+//    public inline fun LabeledPolynomial<C>.asFunctionOnConstants(): (Map<Symbol, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
 //    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.asFunctionOnPolynomials(): (Map<Variable, LabeledPolynomial<C>>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
+//    public inline fun LabeledPolynomial<C>.asFunctionOnPolynomials(): (Map<Symbol, LabeledPolynomial<C>>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
 //
 //    @Suppress("NOTHING_TO_INLINE")
-//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Variable, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
+//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Symbol, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
 //    @Suppress("NOTHING_TO_INLINE")
 //    @JvmName("invokePolynomial")
-//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Variable, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
+//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
     // endregion
 
     // region Utilities
     // TODO: Move to region internal utilities with context receiver
     @JvmName("applyAndRemoveZerosInternal")
-    internal fun MutableMap<Map<Variable, UInt>, C>.applyAndRemoveZeros(block: MutableMap<Map<Variable, UInt>, C>.() -> Unit) : MutableMap<Map<Variable, UInt>, C> {
+    internal fun MutableMap<Map<Symbol, UInt>, C>.applyAndRemoveZeros(block: MutableMap<Map<Symbol, UInt>, C>.() -> Unit) : MutableMap<Map<Symbol, UInt>, C> {
         contract {
             callsInPlace(block, InvocationKind.EXACTLY_ONCE)
         }
@@ -725,10 +726,10 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         for ((degs, c) in this) if (c.isZero()) this.remove(degs)
         return this
     }
-    internal fun Map<Map<Variable, UInt>, C>.applyAndRemoveZeros(block: MutableMap<Map<Variable, UInt>, C>.() -> Unit) : Map<Map<Variable, UInt>, C> =
+    internal fun Map<Map<Symbol, UInt>, C>.applyAndRemoveZeros(block: MutableMap<Map<Symbol, UInt>, C>.() -> Unit) : Map<Map<Symbol, UInt>, C> =
         toMutableMap().applyAndRemoveZeros(block)
     @OptIn(ExperimentalTypeInference::class)
-    internal inline fun buildCoefficients(@BuilderInference builderAction: MutableMap<Map<Variable, UInt>, C>.() -> Unit): Map<Map<Variable, UInt>, C> {
+    internal inline fun buildCoefficients(@BuilderInference builderAction: MutableMap<Map<Symbol, UInt>, C>.() -> Unit): Map<Map<Symbol, UInt>, C> {
         contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
         return buildMap {
             builderAction()
@@ -736,7 +737,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         }
     }
     @OptIn(ExperimentalTypeInference::class)
-    internal inline fun buildCoefficients(capacity: Int, @BuilderInference builderAction: MutableMap<Map<Variable, UInt>, C>.() -> Unit): Map<Map<Variable, UInt>, C> {
+    internal inline fun buildCoefficients(capacity: Int, @BuilderInference builderAction: MutableMap<Map<Symbol, UInt>, C>.() -> Unit): Map<Map<Symbol, UInt>, C> {
         contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
         return buildMap(capacity) {
             builderAction()
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index df4441127..3077a2b82 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.invoke
 
@@ -62,22 +63,22 @@ internal fun labeledRationalFunctionError(message: Any): Nothing = throw Labeled
 //    )
 
 // TODO: Rewrite former constructors as fabrics
-//constructor(numeratorCoefficients: Map<Map<Variable, Int>, C>, denominatorCoefficients: Map<Map<Variable, Int>, C>) : this(
+//constructor(numeratorCoefficients: Map<Map<Symbol, Int>, C>, denominatorCoefficients: Map<Map<Symbol, Int>, C>) : this(
 //LabeledPolynomial(numeratorCoefficients),
 //LabeledPolynomial(denominatorCoefficients)
 //)
 //
-//constructor(numeratorCoefficients: Collection<Pair<Map<Variable, Int>, C>>, denominatorCoefficients: Collection<Pair<Map<Variable, Int>, C>>) : this(
+//constructor(numeratorCoefficients: Collection<Pair<Map<Symbol, Int>, C>>, denominatorCoefficients: Collection<Pair<Map<Symbol, Int>, C>>) : this(
 //LabeledPolynomial(numeratorCoefficients),
 //LabeledPolynomial(denominatorCoefficients)
 //)
 //
 //constructor(numerator: LabeledPolynomial<C>) : this(numerator, numerator.getOne())
-//constructor(numeratorCoefficients: Map<Map<Variable, Int>, C>) : this(
+//constructor(numeratorCoefficients: Map<Map<Symbol, Int>, C>) : this(
 //LabeledPolynomial(numeratorCoefficients)
 //)
 //
-//constructor(numeratorCoefficients: Collection<Pair<Map<Variable, Int>, C>>) : this(
+//constructor(numeratorCoefficients: Collection<Pair<Map<Symbol, Int>, C>>) : this(
 //LabeledPolynomial(numeratorCoefficients)
 //)
 
@@ -338,11 +339,11 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
      * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
      * And keys of the map is the same as in [variables].
      */
-    public val LabeledPolynomial<C>.degrees: Map<Variable, UInt> get() = polynomialRing { degrees }
+    public val LabeledPolynomial<C>.degrees: Map<Symbol, UInt> get() = polynomialRing { degrees }
     /**
      * Set of all variables that appear in the polynomial in positive exponents.
      */
-    public val LabeledPolynomial<C>.variables: Set<Variable> get() = polynomialRing { variables }
+    public val LabeledPolynomial<C>.variables: Set<Symbol> get() = polynomialRing { variables }
     /**
      * Count of all variables that appear in the polynomial in positive exponents.
      */
@@ -353,7 +354,7 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
     /**
      * Count of all variables that appear in the polynomial in positive exponents.
      */
-    public val LabeledRationalFunction<C>.variables: Set<Variable>
+    public val LabeledRationalFunction<C>.variables: Set<Symbol>
         get() = numerator.variables union denominator.variables
     /**
      * Count of all variables that appear in the polynomial in positive exponents.
@@ -381,21 +382,21 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
             denominator * other
         )
 
-//    operator fun invoke(arg: Map<Variable, C>): LabeledRationalFunction<C> =
+//    operator fun invoke(arg: Map<Symbol, C>): LabeledRationalFunction<C> =
 //        LabeledRationalFunction(
 //            numerator(arg),
 //            denominator(arg)
 //        )
 //
 //    @JvmName("invokeLabeledPolynomial")
-//    operator fun invoke(arg: Map<Variable, LabeledPolynomial<C>>): LabeledRationalFunction<C> =
+//    operator fun invoke(arg: Map<Symbol, LabeledPolynomial<C>>): LabeledRationalFunction<C> =
 //        LabeledRationalFunction(
 //            numerator(arg),
 //            denominator(arg)
 //        )
 //
 //    @JvmName("invokeLabeledRationalFunction")
-//    operator fun invoke(arg: Map<Variable, LabeledRationalFunction<C>>): LabeledRationalFunction<C> {
+//    operator fun invoke(arg: Map<Symbol, LabeledRationalFunction<C>>): LabeledRationalFunction<C> {
 //        var num = numerator invokeRFTakeNumerator arg
 //        var den = denominator invokeRFTakeNumerator arg
 //        for (variable in variables) if (variable in arg) {
@@ -410,56 +411,56 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
 //
 //    override fun toString(): String = toString(emptyMap())
 //
-//    fun toString(names: Map<Variable, String> = emptyMap()): String =
+//    fun toString(names: Map<Symbol, String> = emptyMap()): String =
 //        when (true) {
 //            numerator.isZero() -> "0"
 //            denominator.isOne() -> numerator.toString(names)
 //            else -> "${numerator.toStringWithBrackets(names)}/${denominator.toStringWithBrackets(names)}"
 //        }
 //
-//    fun toString(namer: (Variable) -> String): String =
+//    fun toString(namer: (Symbol) -> String): String =
 //        when (true) {
 //            numerator.isZero() -> "0"
 //            denominator.isOne() -> numerator.toString(namer)
 //            else -> "${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)}"
 //        }
 //
-//    fun toStringWithBrackets(names: Map<Variable, String> = emptyMap()): String =
+//    fun toStringWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
 //        when (true) {
 //            numerator.isZero() -> "0"
 //            denominator.isOne() -> numerator.toStringWithBrackets(names)
 //            else -> "(${numerator.toStringWithBrackets(names)}/${denominator.toStringWithBrackets(names)})"
 //        }
 //
-//    fun toStringWithBrackets(namer: (Variable) -> String): String =
+//    fun toStringWithBrackets(namer: (Symbol) -> String): String =
 //        when (true) {
 //            numerator.isZero() -> "0"
 //            denominator.isOne() -> numerator.toStringWithBrackets(namer)
 //            else -> "(${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)})"
 //        }
 //
-//    fun toReversedString(names: Map<Variable, String> = emptyMap()): String =
+//    fun toReversedString(names: Map<Symbol, String> = emptyMap()): String =
 //        when (true) {
 //            numerator.isZero() -> "0"
 //            denominator.isOne() -> numerator.toReversedString(names)
 //            else -> "${numerator.toReversedStringWithBrackets(names)}/${denominator.toReversedStringWithBrackets(names)}"
 //        }
 //
-//    fun toReversedString(namer: (Variable) -> String): String =
+//    fun toReversedString(namer: (Symbol) -> String): String =
 //        when (true) {
 //            numerator.isZero() -> "0"
 //            denominator.isOne() -> numerator.toReversedString(namer)
 //            else -> "${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)}"
 //        }
 //
-//    fun toReversedStringWithBrackets(names: Map<Variable, String> = emptyMap()): String =
+//    fun toReversedStringWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
 //        when (true) {
 //            numerator.isZero() -> "0"
 //            denominator.isOne() -> numerator.toReversedStringWithBrackets(names)
 //            else -> "(${numerator.toReversedStringWithBrackets(names)}/${denominator.toReversedStringWithBrackets(names)})"
 //        }
 //
-//    fun toReversedStringWithBrackets(namer: (Variable) -> String): String =
+//    fun toReversedStringWithBrackets(namer: (Symbol) -> String): String =
 //        when (true) {
 //            numerator.isZero() -> "0"
 //            denominator.isOne() -> numerator.toReversedStringWithBrackets(namer)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Variable.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Variable.kt
deleted file mode 100644
index 410604fd3..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Variable.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package space.kscience.kmath.functions
-
-import kotlin.reflect.KProperty
-
-
-/**
- * Represents class of labeled variables like usual
- * `x`, `y`, `z`, `a`, `b`, `n`, `m`, etc.
- *
- * Variables does not contain any information about field (or ring, ets.) they are considered in
- * and therefore about coefficient.
- *
- * @property name Is the label or name of variable. For `x` it is `"x"`, for `n` &ndash; `"n"`, etc.
- */
-public data class Variable (val name: String) : Comparable<Variable> {
-    /**
-     * Represents the variable as a string.
-     *
-     * @return Only name of the variable.
-     */
-    override fun toString(): String = name
-    /**
-     * Compares two variables.
-     * Comparison is realised by comparison of variables' names.
-     *
-     * Used in [LabeledPolynomial] and [LabeledRationalFunction] to sort monomials in
-     * [LabeledPolynomial.toString] and [LabeledRationalFunction.toString] in lexicographic order.
-     *
-     * @see Comparable.compareTo
-     * @sample LabeledPolynomial.monomialComparator
-     * @return Only name of the variable.
-     */
-    override fun compareTo(other: Variable): Int = name.compareTo(other.name)
-
-    public companion object {
-        public operator fun getValue(thisRef: Any?, property: KProperty<*>) : Variable = Variable(property.name)
-    }
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
index 544cca410..9408a09f2 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
@@ -5,10 +5,14 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-import kotlin.contracts.*
-import kotlin.math.max
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.invoke
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
 
 
 // TODO: Docs
@@ -31,10 +35,10 @@ import kotlin.math.max
 //
 //// endregion
 
-//// region Variables
+//// region Symbols
 //
 //context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> power(arg: Variable, pow: UInt): LabeledPolynomial<C> =
+//fun <C, A: Ring<C>> power(arg: Symbol, pow: UInt): LabeledPolynomial<C> =
 //    if (pow == 0U) one
 //    else LabeledPolynomial<C>(mapOf(
 //        mapOf(arg to pow) to constantOne
@@ -45,7 +49,7 @@ import kotlin.math.max
 //// region Polynomials
 //
 //context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> number(value: Int): LabeledPolynomial<C> = ring { LabeledPolynomial<C>(mapOf(emptyMap<Variable, UInt>() to number<C>(value))) }
+//fun <C, A: Ring<C>> number(value: Int): LabeledPolynomial<C> = ring { LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to number<C>(value))) }
 //
 //context(LabeledPolynomialSpace<C, A>)
 //fun <C, A: Ring<C>> multiplyWithPower(base: LabeledPolynomial<C>, arg: LabeledPolynomial<C>, pow: UInt): LabeledPolynomial<C> =
@@ -97,7 +101,7 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 // * Consider that monomials are sorted in lexicographic order.
 // */
 //context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(names: Map<Variable, String> = emptyMap()): String =
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(names: Map<Symbol, String> = emptyMap()): String =
 //    coefficients.entries
 //        .sortedWith { o1, o2 -> LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
 //        .asSequence()
@@ -130,7 +134,7 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 // * Consider that monomials are sorted in lexicographic order.
 // */
 //context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(namer: (Variable) -> String): String =
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(namer: (Symbol) -> String): String =
 //    coefficients.entries
 //        .sortedWith { o1, o2 -> LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
 //        .asSequence()
@@ -163,7 +167,7 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 // * Consider that monomials are sorted in lexicographic order.
 // */
 //context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(names: Map<Variable, String> = emptyMap()): String =
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
 //    with(represent(names)) { if (coefficients.count() == 1) this else "($this)" }
 //
 ///**
@@ -172,7 +176,7 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 // * Consider that monomials are sorted in lexicographic order.
 // */
 //context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(namer: (Variable) -> String): String =
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(namer: (Symbol) -> String): String =
 //    with(represent(namer)) { if (coefficients.count() == 1) this else "($this)" }
 //
 ///**
@@ -180,7 +184,7 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 // * Consider that monomials are sorted in **reversed** lexicographic order.
 // */
 //context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(names: Map<Variable, String> = emptyMap()): String =
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(names: Map<Symbol, String> = emptyMap()): String =
 //    coefficients.entries
 //        .sortedWith { o1, o2 -> -LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
 //        .asSequence()
@@ -213,7 +217,7 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 // * Consider that monomials are sorted in **reversed** lexicographic order.
 // */
 //context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(namer: (Variable) -> String): String =
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(namer: (Symbol) -> String): String =
 //    coefficients.entries
 //        .sortedWith { o1, o2 -> -LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
 //        .asSequence()
@@ -246,7 +250,7 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 // * Consider that monomials are sorted in **reversed** lexicographic order.
 // */
 //context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(names: Map<Variable, String> = emptyMap()): String =
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
 //    with(representReversed(names)) { if (coefficients.count() == 1) this else "($this)" }
 //
 ///**
@@ -255,7 +259,7 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 // * Consider that monomials are sorted in **reversed** lexicographic order.
 // */
 //context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(namer: (Variable) -> String): String =
+//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(namer: (Symbol) -> String): String =
 //    with(representReversed(namer)) { if (coefficients.count() == 1) this else "($this)" }
 //
 //// endregion
@@ -279,7 +283,7 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 
 //// region Polynomial substitution and functional representation
 //
-//public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Variable, C>): LabeledPolynomial<C> = ring {
+//public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Symbol, C>): LabeledPolynomial<C> = ring {
 //    if (coefficients.isEmpty()) return this@substitute
 //    LabeledPolynomial<C>(
 //        buildMap {
@@ -297,7 +301,7 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 //// TODO: Replace with optimisation: the [result] may be unboxed, and all operations may be performed as soon as
 ////  possible on it
 //@JvmName("substitutePolynomial")
-//fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, arg: Map<Variable, LabeledPolynomial<C>>) : LabeledPolynomial<C> =
+//fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, arg: Map<Symbol, LabeledPolynomial<C>>) : LabeledPolynomial<C> =
 //    ring.labeledPolynomial {
 //        if (coefficients.isEmpty()) return zero
 //        coefficients
@@ -315,10 +319,10 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 //
 //// TODO: Substitute rational function
 //
-//fun <C, A : Ring<C>> LabeledPolynomial<C>.asFunctionOver(ring: A): (Map<Variable, C>) -> LabeledPolynomial<C> =
+//fun <C, A : Ring<C>> LabeledPolynomial<C>.asFunctionOver(ring: A): (Map<Symbol, C>) -> LabeledPolynomial<C> =
 //    { substitute(ring, it) }
 //
-//fun <C, A : Ring<C>> LabeledPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Variable, LabeledPolynomial<C>>) -> LabeledPolynomial<C> =
+//fun <C, A : Ring<C>> LabeledPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Symbol, LabeledPolynomial<C>>) -> LabeledPolynomial<C> =
 //    { substitute(ring, it) }
 //
 //// endregion
@@ -331,7 +335,7 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 @UnstableKMathAPI
 public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
     algebra: A,
-    variable: Variable,
+    variable: Symbol,
 ): LabeledPolynomial<C> = algebra {
     LabeledPolynomial<C>(
         buildMap(coefficients.size) {
@@ -360,7 +364,7 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
 @UnstableKMathAPI
 public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
     algebra: A,
-    variables: Collection<Variable>,
+    variables: Collection<Symbol>,
 ): LabeledPolynomial<C> = algebra {
     val cleanedVariables = variables.toSet()
     if (cleanedVariables.isEmpty()) return this@derivativeWithRespectTo
@@ -391,7 +395,7 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
 @UnstableKMathAPI
 public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
     algebra: A,
-    variable: Variable,
+    variable: Symbol,
     order: UInt
 ): LabeledPolynomial<C> = algebra {
     if (order == 0u) return this@nthDerivativeWithRespectTo
@@ -425,7 +429,7 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
 @UnstableKMathAPI
 public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
     algebra: A,
-    variablesAndOrders: Map<Variable, UInt>,
+    variablesAndOrders: Map<Symbol, UInt>,
 ): LabeledPolynomial<C> = algebra {
     val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
     if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
@@ -462,13 +466,13 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
 @UnstableKMathAPI
 public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
     algebra: A,
-    variable: Variable,
+    variable: Symbol,
 ): LabeledPolynomial<C> = algebra {
     LabeledPolynomial<C>(
         buildMap(coefficients.size) {
             coefficients
                 .forEach { (degs, c) ->
-                    val newDegs = buildMap<Variable, UInt>(degs.size + 1) {
+                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
                         put(variable, 1u)
                         for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
                     }
@@ -487,7 +491,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
 @UnstableKMathAPI
 public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
     algebra: A,
-    variables: Collection<Variable>,
+    variables: Collection<Symbol>,
 ): LabeledPolynomial<C> = algebra {
     val cleanedVariables = variables.toSet()
     if (cleanedVariables.isEmpty()) return this@antiderivativeWithRespectTo
@@ -495,7 +499,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
         buildMap(coefficients.size) {
             coefficients
                 .forEach { (degs, c) ->
-                    val newDegs = buildMap<Variable, UInt>(degs.size + 1) {
+                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
                         for (variable in cleanedVariables) put(variable, 1u)
                         for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
                     }
@@ -514,7 +518,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
 @UnstableKMathAPI
 public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
     algebra: A,
-    variable: Variable,
+    variable: Symbol,
     order: UInt
 ): LabeledPolynomial<C> = algebra {
     if (order == 0u) return this@nthAntiderivativeWithRespectTo
@@ -522,7 +526,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo
         buildMap(coefficients.size) {
             coefficients
                 .forEach { (degs, c) ->
-                    val newDegs = buildMap<Variable, UInt>(degs.size + 1) {
+                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
                         put(variable, order)
                         for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
                     }
@@ -544,7 +548,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo
 @UnstableKMathAPI
 public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
     algebra: A,
-    variablesAndOrders: Map<Variable, UInt>,
+    variablesAndOrders: Map<Symbol, UInt>,
 ): LabeledPolynomial<C> = algebra {
     val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
     if (filteredVariablesAndOrders.isEmpty()) return this@nthAntiderivativeWithRespectTo
@@ -552,7 +556,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo
         buildMap(coefficients.size) {
             coefficients
                 .forEach { (degs, c) ->
-                    val newDegs = buildMap<Variable, UInt>(degs.size + 1) {
+                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
                         for ((variable, order) in filteredVariablesAndOrders) put(variable, order)
                         for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
                     }
-- 
2.34.1


From 24944cdb1639bc6bec924510686052e979bb4561 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 16 Mar 2022 15:19:27 +0300
Subject: [PATCH 442/713] Added support of `power` function to abstract
 structures.

Implemented exponentiation by squaring as default implementation of `power`. Updated docs in algebraicStub.kt and updated realisations in it.
---
 .../kmath/functions/AbstractPolynomial.kt     |  39 ++++--
 .../functions/AbstractRationalFunction.kt     |  52 ++++++--
 .../kscience/kmath/functions/algebraicStub.kt | 124 ++++++++++++++----
 .../kmath/functions/labeledPolynomialUtil.kt  |  16 +--
 .../kmath/functions/numberedPolynomialUtil.kt |  16 +--
 .../kmath/functions/polynomialUtil.kt         |   2 +-
 6 files changed, 181 insertions(+), 68 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
index 8bd8697e3..2d2d22fd3 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -71,19 +71,19 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
-    public operator fun P.plus(other: Int): P = optimizedAddMultiplied(this, one, other)
+    public operator fun P.plus(other: Int): P = addMultipliedBySquaring(this, one, other)
     /**
      * Returns difference between the polynomial and the integer represented as polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
-    public operator fun P.minus(other: Int): P = optimizedAddMultiplied(this, one, -other)
+    public operator fun P.minus(other: Int): P = addMultipliedBySquaring(this, one, -other)
     /**
      * Returns product of the polynomial and the integer represented as polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    public operator fun P.times(other: Int): P = optimizedMultiply(this, other)
+    public operator fun P.times(other: Int): P = multiplyBySquaring(this, other)
     // endregion
 
     // region Integer-polynomial relation
@@ -92,19 +92,19 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
-    public operator fun Int.plus(other: P): P = optimizedAddMultiplied(other, one, this)
+    public operator fun Int.plus(other: P): P = addMultipliedBySquaring(other, one, this)
     /**
      * Returns difference between the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
-    public operator fun Int.minus(other: P): P = optimizedAddMultiplied(-other, one, this)
+    public operator fun Int.minus(other: P): P = addMultipliedBySquaring(-other, one, this)
     /**
      * Returns product of the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    public operator fun Int.times(other: P): P = optimizedMultiply(other, this)
+    public operator fun Int.times(other: P): P = multiplyBySquaring(other, this)
     // endregion
 
     // region Constant-constant relation
@@ -138,6 +138,12 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
     @JvmName("constantTimes")
     @JsName("constantTimes")
     public operator fun C.times(other: C): C
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    @JvmName("constantPower")
+    @JsName("constantPower")
+    public fun power(arg: C, exponent: UInt) : C
 
     /**
      * Check if the instant is zero constant.
@@ -225,6 +231,10 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * Returns product of the polynomials.
      */
     public override operator fun P.times(other: P): P
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    public override fun power(arg: P, exponent: UInt) : P = exponentiationBySquaring(arg, exponent)
 
     /**
      * Check if the instant is zero polynomial.
@@ -331,19 +341,19 @@ public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A:
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
-    public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
+    public override operator fun C.plus(other: Int): C = ring { addMultipliedBySquaring(this@plus, one, other) }
     /**
      * Returns difference between the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
-    public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
+    public override operator fun C.minus(other: Int): C = ring { addMultipliedBySquaring(this@minus, one, -other) }
     /**
      * Returns product of the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
+    public override operator fun C.times(other: Int): C = ring { multiplyBySquaring(this@times, other) }
     // endregion
 
     // region Integer-constant relation
@@ -352,19 +362,19 @@ public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A:
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
-    public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
+    public override operator fun Int.plus(other: C): C = ring { addMultipliedBySquaring(other, one, this@plus) }
     /**
      * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
-    public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
+    public override operator fun Int.minus(other: C): C = ring { addMultipliedBySquaring(-other, one, this@minus) }
     /**
      * Returns product of the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
+    public override operator fun Int.times(other: C): C = ring { multiplyBySquaring(other, this@times) }
     // endregion
 
     // region Constant-constant relation
@@ -388,6 +398,11 @@ public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A:
      */
     @JvmName("constantTimes")
     public override operator fun C.times(other: C): C = ring { this@times * other }
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    @JvmName("constantPower")
+    override fun power(arg: C, exponent: UInt): C = ring { power(arg, exponent) }
 
     /**
      * Instance of zero constant (zero of the underlying ring).
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
index 685cf4ca3..c6f1d7a7a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -120,19 +120,19 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
-    public operator fun R.plus(other: Int): R = optimizedAddMultiplied(this, one, other)
+    public operator fun R.plus(other: Int): R = addMultipliedBySquaring(this, one, other)
     /**
      * Returns difference between the rational function and the integer represented as rational function.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
-    public operator fun R.minus(other: Int): R = optimizedAddMultiplied(this, one, -other)
+    public operator fun R.minus(other: Int): R = addMultipliedBySquaring(this, one, -other)
     /**
      * Returns product of the rational function and the integer represented as rational function.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    public operator fun R.times(other: Int): R = optimizedMultiply(this, other)
+    public operator fun R.times(other: Int): R = multiplyBySquaring(this, other)
     // endregion
 
     // region Integer-Rational relation
@@ -141,19 +141,19 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
-    public operator fun Int.plus(other: R): R = optimizedAddMultiplied(other, one, this)
+    public operator fun Int.plus(other: R): R = addMultipliedBySquaring(other, one, this)
     /**
      * Returns difference between the integer represented as rational function and the rational function.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
-    public operator fun Int.minus(other: R): R = optimizedAddMultiplied(-other, one, this)
+    public operator fun Int.minus(other: R): R = addMultipliedBySquaring(-other, one, this)
     /**
      * Returns product of the integer represented as rational function and the rational function.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    public operator fun Int.times(other: R): R = optimizedMultiply(other, this)
+    public operator fun Int.times(other: R): R = multiplyBySquaring(other, this)
     // endregion
 
     // region Constant-constant relation
@@ -187,6 +187,12 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
     @JvmName("constantTimes")
     @JsName("constantTimes")
     public operator fun C.times(other: C): C
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    @JvmName("constantPower")
+    @JsName("constantPower")
+    public fun power(arg: C, exponent: UInt) : C
 
     /**
      * Check if the instant is zero constant.
@@ -274,6 +280,10 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Returns product of the polynomials.
      */
     public operator fun P.times(other: P): P
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    public fun power(arg: P, exponent: UInt) : P
 
     /**
      * Check if the instant is zero polynomial.
@@ -400,6 +410,10 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Returns product of the rational functions.
      */
     public override operator fun R.times(other: R): R
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    public override fun power(arg: R, exponent: UInt) : R = exponentiationBySquaring(arg, exponent)
 
     /**
      * Check if the instant is zero rational function.
@@ -536,19 +550,19 @@ public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomia
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
-    public override operator fun C.plus(other: Int): C = ring { optimizedAddMultiplied(this@plus, one, other) }
+    public override operator fun C.plus(other: Int): C = ring { addMultipliedBySquaring(this@plus, one, other) }
     /**
      * Returns difference between the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
-    public override operator fun C.minus(other: Int): C = ring { optimizedAddMultiplied(this@minus, one, -other) }
+    public override operator fun C.minus(other: Int): C = ring { addMultipliedBySquaring(this@minus, one, -other) }
     /**
      * Returns product of the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    public override operator fun C.times(other: Int): C = ring { optimizedMultiply(this@times, other) }
+    public override operator fun C.times(other: Int): C = ring { multiplyBySquaring(this@times, other) }
     // endregion
 
     // region Integer-constant relation
@@ -557,19 +571,19 @@ public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomia
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
-    public override operator fun Int.plus(other: C): C = ring { optimizedAddMultiplied(other, one, this@plus) }
+    public override operator fun Int.plus(other: C): C = ring { addMultipliedBySquaring(other, one, this@plus) }
     /**
      * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
-    public override operator fun Int.minus(other: C): C = ring { optimizedAddMultiplied(-other, one, this@minus) }
+    public override operator fun Int.minus(other: C): C = ring { addMultipliedBySquaring(-other, one, this@minus) }
     /**
      * Returns product of the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    public override operator fun Int.times(other: C): C = ring { optimizedMultiply(other, this@times) }
+    public override operator fun Int.times(other: C): C = ring { multiplyBySquaring(other, this@times) }
     // endregion
 
     // region Constant-constant relation
@@ -598,6 +612,11 @@ public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomia
      */
     @JvmName("constantTimes")
     public override operator fun C.times(other: C): C = ring { this@times * other }
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    @JvmName("constantPower")
+    public override fun power(arg: C, exponent: UInt) : C = ring { power(arg, exponent) }
 
     /**
      * Instance of zero constant (zero of the underlying ring).
@@ -740,6 +759,11 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
      */
     @JvmName("constantTimes")
     public override operator fun C.times(other: C): C = polynomialRing { this@times * other }
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    @JvmName("constantPower")
+    public override fun power(arg: C, exponent: UInt) : C = polynomialRing { power(arg, exponent) }
 
     /**
      * Check if the instant is zero constant.
@@ -827,6 +851,10 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
      * Returns product of the polynomials.
      */
     public override operator fun P.times(other: P): P = polynomialRing { this@times * other }
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    public override fun power(arg: P, exponent: UInt) : P = polynomialRing { power(arg, exponent) }
 
     /**
      * Check if the instant is zero polynomial.
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
index 537184ba3..ee81f3d79 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
@@ -5,53 +5,54 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.Group
+import space.kscience.kmath.operations.*
 
 
 // TODO: All of this should be moved to algebraic structures' place for utilities
 // TODO: Move receiver to context receiver
 /**
- * Multiplication of element and integer.
+ * Returns product of [arg] and integer [multiplier].
  *
- * @receiver the multiplicand.
- * @param other the multiplier.
- * @return the difference.
+ * @param arg the multiplicand.
+ * @param multiplier the integer multiplier.
+ * @return product of the multiplicand [arg] and the multiplier [multiplier].
  * @author Gleb Minaev
  */
-internal fun <C> Group<C>.optimizedMultiply(arg: C, other: Int): C =
-    if (other >= 0) optimizedMultiply(arg, other.toUInt())
-    else optimizedMultiply(arg, (-other).toUInt())
+internal fun <C> Group<C>.multiplyBySquaring(arg: C, multiplier: Int): C =
+    if (multiplier >= 0) multiplyBySquaring(arg, multiplier.toUInt())
+    else multiplyBySquaring(-arg, (-multiplier).toUInt())
 
 // TODO: Move receiver to context receiver
 /**
  * Adds product of [arg] and [multiplier] to [base].
  *
- * @receiver the algebra to provide multiplication.
  * @param base the augend.
  * @param arg the multiplicand.
- * @param multiplier the multiplier.
+ * @param multiplier the integer multiplier.
  * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
  * @author Gleb Minaev
  */
-internal fun <C> Group<C>.optimizedAddMultiplied(base: C, arg: C, multiplier: Int): C =
-    if (multiplier >= 0) optimizedAddMultiplied(base, arg, multiplier.toUInt())
-    else optimizedAddMultiplied(base, arg, (-multiplier).toUInt())
+internal fun <C> GroupOps<C>.addMultipliedBySquaring(base: C, arg: C, multiplier: Int): C =
+    if (multiplier >= 0) addMultipliedBySquaring(base, arg, multiplier.toUInt())
+    else addMultipliedBySquaring(base, -arg, (-multiplier).toUInt())
 
 // TODO: Move receiver to context receiver
 /**
- * Multiplication of element and integer.
+ * Returns product of [arg] and integer [multiplier].
  *
- * @receiver the multiplicand.
- * @param other the multiplier.
- * @return the difference.
+ * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
+ *
+ * @param arg the multiplicand.
+ * @param multiplier the integer multiplier.
+ * @return product of the multiplicand [arg] and the multiplier [multiplier].
  * @author Gleb Minaev
  */
-internal tailrec fun <C> Group<C>.optimizedMultiply(arg: C, other: UInt): C =
+internal tailrec fun <C> Group<C>.multiplyBySquaring(arg: C, multiplier: UInt): C =
     when {
-        other == 0u -> zero
-        other == 1u -> arg
-        other % 2u == 0u -> optimizedMultiply(arg + arg, other / 2u)
-        other % 2u == 1u -> optimizedAddMultiplied(arg, arg + arg, other / 2u)
+        multiplier == 0u -> zero
+        multiplier == 1u -> arg
+        multiplier and 1u == 0u -> multiplyBySquaring(arg + arg, multiplier shr 1)
+        multiplier and 1u == 1u -> addMultipliedBySquaring(arg, arg + arg, multiplier shr 1)
         else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
     }
 
@@ -59,18 +60,87 @@ internal tailrec fun <C> Group<C>.optimizedMultiply(arg: C, other: UInt): C =
 /**
  * Adds product of [arg] and [multiplier] to [base].
  *
- * @receiver the algebra to provide multiplication.
+ * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
+ *
  * @param base the augend.
  * @param arg the multiplicand.
- * @param multiplier the multiplier.
+ * @param multiplier the integer multiplier.
  * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
  * @author Gleb Minaev
  */
-internal tailrec fun <C> Group<C>.optimizedAddMultiplied(base: C, arg: C, multiplier: UInt): C =
+internal tailrec fun <C> GroupOps<C>.addMultipliedBySquaring(base: C, arg: C, multiplier: UInt): C =
     when {
         multiplier == 0u -> base
         multiplier == 1u -> base + arg
-        multiplier % 2u == 0u -> optimizedAddMultiplied(base, arg + arg, multiplier / 2u)
-        multiplier % 2u == 1u -> optimizedAddMultiplied(base + arg, arg + arg, multiplier / 2u)
+        multiplier and 1u == 0u -> addMultipliedBySquaring(base, arg + arg, multiplier shr 1)
+        multiplier and 1u == 1u -> addMultipliedBySquaring(base + arg, arg + arg, multiplier shr 1)
+        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
+    }
+
+// TODO: Move receiver to context receiver
+/**
+ * Raises [arg] to the integer power [exponent].
+ *
+ * @param arg the base of the power.
+ * @param exponent the exponent of the power.
+ * @return [arg] raised to the power [exponent].
+ * @author Gleb Minaev
+ */
+internal fun <C> Field<C>.exponentiationBySquaring(arg: C, exponent: Int): C =
+    if (exponent >= 0) exponentiationBySquaring(arg, exponent.toUInt())
+    else exponentiationBySquaring(one / arg, (-exponent).toUInt())
+
+// TODO: Move receiver to context receiver
+/**
+ * Multiplies [base] and [arg] raised to the integer power [exponent].
+ *
+ * @param base the multiplicand.
+ * @param arg the base of the power.
+ * @param exponent the exponent of the power.
+ * @return product of [base] and [arg] raised to the power [exponent].
+ * @author Gleb Minaev
+ */
+internal fun <C> Field<C>.multiplyExponentiationBySquaring(base: C, arg: C, exponent: Int): C =
+    if (exponent >= 0) multiplyExponentiationBySquaring(base, arg, exponent.toUInt())
+    else multiplyExponentiationBySquaring(base, one / arg, (-exponent).toUInt())
+
+// TODO: Move receiver to context receiver
+/**
+ * Raises [arg] to the integer power [exponent].
+ *
+ * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
+ *
+ * @param arg the base of the power.
+ * @param exponent the exponent of the power.
+ * @return [arg] raised to the power [exponent].
+ * @author Gleb Minaev
+ */
+internal tailrec fun <C> Ring<C>.exponentiationBySquaring(arg: C, exponent: UInt): C =
+    when {
+        exponent == 0u -> zero
+        exponent == 1u -> arg
+        exponent and 1u == 0u -> exponentiationBySquaring(arg * arg, exponent shr 1)
+        exponent and 1u == 1u -> multiplyExponentiationBySquaring(arg, arg * arg, exponent shr 1)
+        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
+    }
+
+// TODO: Move receiver to context receiver
+/**
+ * Multiplies [base] and [arg] raised to the integer power [exponent].
+ *
+ * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
+ *
+ * @param base the multiplicand.
+ * @param arg the base of the power.
+ * @param exponent the exponent of the power.
+ * @return product of [base] and [arg] raised to the power [exponent].
+ * @author Gleb Minaev
+ */
+internal tailrec fun <C> RingOps<C>.multiplyExponentiationBySquaring(base: C, arg: C, exponent: UInt): C =
+    when {
+        exponent == 0u -> base
+        exponent == 1u -> base + arg
+        exponent and 1u == 0u -> multiplyExponentiationBySquaring(base, arg * arg, exponent shr 1)
+        exponent and 1u == 1u -> multiplyExponentiationBySquaring(base * arg, arg * arg, exponent shr 1)
         else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
     }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
index 9408a09f2..516e76b8f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
@@ -351,7 +351,7 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
                                 }
                             }
                         },
-                        optimizedMultiply(c, degs[variable]!!)
+                        multiplyBySquaring(c, degs[variable]!!)
                     )
                 }
         }
@@ -382,7 +382,7 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
                                 }
                             }
                         },
-                        cleanedVariables.fold(c) { acc, variable -> optimizedMultiply(acc, degs[variable]!!) }
+                        cleanedVariables.fold(c) { acc, variable -> multiplyBySquaring(acc, degs[variable]!!) }
                     )
                 }
         }
@@ -415,7 +415,7 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
                         },
                         degs[variable]!!.let { deg ->
                             (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> optimizedMultiply(acc, ord) }
+                                .fold(c) { acc, ord -> multiplyBySquaring(acc, ord) }
                         }
                     )
                 }
@@ -451,7 +451,7 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
                         filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
                             degs[index]!!.let { deg ->
                                 (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> optimizedMultiply(acc2, ord) }
+                                    .fold(acc1) { acc2, ord -> multiplyBySquaring(acc2, ord) }
                             }
                         }
                     )
@@ -478,7 +478,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
                     }
                     put(
                         newDegs,
-                        c / optimizedMultiply(one, newDegs[variable]!!)
+                        c / multiplyBySquaring(one, newDegs[variable]!!)
                     )
                 }
         }
@@ -505,7 +505,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
                     }
                     put(
                         newDegs,
-                        cleanedVariables.fold(c) { acc, variable -> acc / optimizedMultiply(one, newDegs[variable]!!) }
+                        cleanedVariables.fold(c) { acc, variable -> acc / multiplyBySquaring(one, newDegs[variable]!!) }
                     )
                 }
         }
@@ -534,7 +534,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo
                         newDegs,
                         newDegs[variable]!!.let { deg ->
                             (deg downTo  deg - order + 1u)
-                                .fold(c) { acc, ord -> acc / optimizedMultiply(one, ord) }
+                                .fold(c) { acc, ord -> acc / multiplyBySquaring(one, ord) }
                         }
                     )
                 }
@@ -565,7 +565,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo
                         filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
                             newDegs[index]!!.let { deg ->
                                 (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> acc2 / optimizedMultiply(one, ord) }
+                                    .fold(acc1) { acc2, ord -> acc2 / multiplyBySquaring(one, ord) }
                             }
                         }
                     )
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
index 47644b26a..ac411fc28 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
@@ -393,7 +393,7 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
                                 else -> return@forEach
                             }
                         }.cleanUp(),
-                        optimizedMultiply(c, degs[variable])
+                        multiplyBySquaring(c, degs[variable])
                     )
                 }
         }
@@ -424,7 +424,7 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
                                 else -> return@forEach
                             }
                         }.cleanUp(),
-                        cleanedVariables.fold(c) { acc, variable -> optimizedMultiply(acc, degs[variable]) }
+                        cleanedVariables.fold(c) { acc, variable -> multiplyBySquaring(acc, degs[variable]) }
                     )
                 }
         }
@@ -456,7 +456,7 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
                         }.cleanUp(),
                         degs[variable].let { deg ->
                             (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> optimizedMultiply(acc, ord) }
+                                .fold(c) { acc, ord -> multiplyBySquaring(acc, ord) }
                         }
                     )
                 }
@@ -489,7 +489,7 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
                         filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
                             degs[index].let { deg ->
                                 (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> optimizedMultiply(acc2, ord) }
+                                    .fold(acc1) { acc2, ord -> multiplyBySquaring(acc2, ord) }
                             }
                         }
                     )
@@ -512,7 +512,7 @@ public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
                 .forEach { (degs, c) ->
                     put(
                         List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + 1u },
-                        c / optimizedMultiply(one, degs[variable])
+                        c / multiplyBySquaring(one, degs[variable])
                     )
                 }
         }
@@ -536,7 +536,7 @@ public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
                 .forEach { (degs, c) ->
                     put(
                         List(max(maxRespectedVariable + 1, degs.size)) { if (it !in variables) degs[it] else degs[it] + 1u },
-                        cleanedVariables.fold(c) { acc, variable -> acc / optimizedMultiply(one, degs[variable]) }
+                        cleanedVariables.fold(c) { acc, variable -> acc / multiplyBySquaring(one, degs[variable]) }
                     )
                 }
         }
@@ -561,7 +561,7 @@ public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectT
                         List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + order },
                         degs[variable].let { deg ->
                             (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> acc / optimizedMultiply(one, ord) }
+                                .fold(c) { acc, ord -> acc / multiplyBySquaring(one, ord) }
                         }
                     )
                 }
@@ -589,7 +589,7 @@ public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectT
                         filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
                             degs[index].let { deg ->
                                 (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> acc2 / optimizedMultiply(one, ord) }
+                                    .fold(acc1) { acc2, ord -> acc2 / multiplyBySquaring(one, ord) }
                             }
                         }
                     )
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index 9c8cc0090..2d0377d2c 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -137,7 +137,7 @@ public fun <C, A> Polynomial<C>.derivative(
 public fun <C, A> Polynomial<C>.nthDerivative(
     algebra: A,
     order: UInt,
-): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
+): Polynomial<C> where A : Ring<C>, A : NumericAlgebra<C> = algebra {
     Polynomial(coefficients.drop(order.toInt()).mapIndexed { index, c -> (index + 1..index + order.toInt()).fold(c) { acc, i -> acc * number(i) } })
 }
 
-- 
2.34.1


From 3c9d8a4eee586962ba59a3790c3d7ddb18572637 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 16 Mar 2022 22:44:55 +0300
Subject: [PATCH 443/713] Deleted all region marks

---
 .../kmath/functions/AbstractPolynomial.kt     | 27 -------
 .../functions/AbstractRationalFunction.kt     | 79 -------------------
 .../kmath/functions/LabeledPolynomial.kt      | 40 +---------
 .../functions/LabeledRationalFunction.kt      | 27 +------
 .../kmath/functions/NumberedPolynomial.kt     | 29 +------
 .../functions/NumberedRationalFunction.kt     | 27 +------
 .../kscience/kmath/functions/Polynomial.kt    |  1 -
 .../kmath/functions/RationalFunction.kt       | 24 +-----
 .../kmath/functions/labeledPolynomialUtil.kt  | 37 +--------
 .../functions/labeledRationalFunctionUtil.kt  | 10 +--
 .../kmath/functions/numberedPolynomialUtil.kt | 42 +---------
 .../functions/numberedRationalFunctionUtil.kt | 10 +--
 .../kmath/functions/polynomialUtil.kt         | 14 +---
 .../kmath/functions/rationalFunctionUtil.kt   | 12 +--
 14 files changed, 11 insertions(+), 368 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
index 2d2d22fd3..aacf055fa 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -23,7 +23,6 @@ public interface AbstractPolynomial<C>
  */
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
 public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P> {
-    // region Constant-integer relation
     /**
      * Returns sum of the constant and the integer represented as constant (member of underlying ring).
      *
@@ -42,9 +41,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun C.times(other: Int): C
-    // endregion
 
-    // region Integer-constant relation
     /**
      * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
      *
@@ -63,9 +60,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public operator fun Int.times(other: C): C
-    // endregion
 
-    // region Polynomial-integer relation
     /**
      * Returns sum of the polynomial and the integer represented as polynomial.
      *
@@ -84,9 +79,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun P.times(other: Int): P = multiplyBySquaring(this, other)
-    // endregion
 
-    // region Integer-polynomial relation
     /**
      * Returns sum of the integer represented as polynomial and the polynomial.
      *
@@ -105,9 +98,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public operator fun Int.times(other: P): P = multiplyBySquaring(other, this)
-    // endregion
 
-    // region Constant-constant relation
     /**
      * Returns the same constant.
      */
@@ -178,9 +169,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * Instance of unit constant (unit of the underlying ring).
      */
     public val constantOne: C
-    // endregion
 
-    // region Constant-polynomial relation
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
@@ -193,9 +182,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * Returns product of the constant represented as polynomial and the polynomial.
      */
     public operator fun C.times(other: P): P
-    // endregion
 
-    // region Polynomial-constant relation
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
@@ -208,9 +195,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * Returns product of the constant represented as polynomial and the polynomial.
      */
     public operator fun P.times(other: C): P
-    // endregion
 
-    // region Polynomial-polynomial relation
     /**
      * Returns the same polynomial.
      */
@@ -278,10 +263,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * Checks NOT equality of the polynomials.
      */
     public infix fun P.notEqualsTo(other: P): Boolean = !(this equalsTo other)
-    // endregion
 
-    // Not sure is it necessary...
-    // region Polynomial properties
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
@@ -314,12 +296,9 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
      */
     public fun P.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
-    // endregion
 
-    // region Legacy of Ring interface
     override fun add(left: P, right: P): P = left + right
     override fun multiply(left: P, right: P): P = left * right
-    // endregion
 }
 
 /**
@@ -335,7 +314,6 @@ public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A:
 
     public val ring: A
 
-    // region Constant-integer relation
     /**
      * Returns sum of the constant and the integer represented as constant (member of underlying ring).
      *
@@ -354,9 +332,7 @@ public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A:
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun C.times(other: Int): C = ring { multiplyBySquaring(this@times, other) }
-    // endregion
 
-    // region Integer-constant relation
     /**
      * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
      *
@@ -375,9 +351,7 @@ public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A:
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public override operator fun Int.times(other: C): C = ring { multiplyBySquaring(other, this@times) }
-    // endregion
 
-    // region Constant-constant relation
     /**
      * Returns negation of the constant.
      */
@@ -412,5 +386,4 @@ public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A:
      * Instance of unit constant (unit of the underlying ring).
      */
     public override val constantOne: C get() = ring.one
-    // endregion
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
index c6f1d7a7a..b9ca01da4 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -30,7 +30,6 @@ public interface AbstractRationalFunction<C, P: AbstractPolynomial<C>> {
  */ // TODO: Add support of field
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
 public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R: AbstractRationalFunction<C, P>> : Ring<R> {
-    // region Constant-integer relation
     /**
      * Returns sum of the constant and the integer represented as constant (member of underlying ring).
      *
@@ -49,9 +48,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun C.times(other: Int): C
-    // endregion
 
-    // region Integer-constant relation
     /**
      * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
      *
@@ -70,9 +67,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public operator fun Int.times(other: C): C
-    // endregion
 
-    // region Polynomial-integer relation
     /**
      * Returns sum of the constant and the integer represented as polynomial.
      *
@@ -91,9 +86,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun P.times(other: Int): P
-    // endregion
 
-    // region Integer-polynomial relation
     /**
      * Returns sum of the integer represented as polynomial and the constant.
      *
@@ -112,9 +105,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public operator fun Int.times(other: P): P
-    // endregion
 
-    // region Rational-integer relation
     /**
      * Returns sum of the rational function and the integer represented as rational function.
      *
@@ -133,9 +124,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun R.times(other: Int): R = multiplyBySquaring(this, other)
-    // endregion
 
-    // region Integer-Rational relation
     /**
      * Returns sum of the integer represented as rational function and the rational function.
      *
@@ -154,9 +143,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public operator fun Int.times(other: R): R = multiplyBySquaring(other, this)
-    // endregion
 
-    // region Constant-constant relation
     /**
      * Returns the same constant.
      */
@@ -227,9 +214,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Instance of unit constant (unit of the underlying ring).
      */
     public val constantOne: C
-    // endregion
 
-    // region Constant-polynomial relation
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
@@ -242,9 +227,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Returns product of the constant represented as polynomial and the polynomial.
      */
     public operator fun C.times(other: P): P
-    // endregion
 
-    // region Polynomial-constant relation
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
@@ -257,9 +240,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Returns product of the constant represented as polynomial and the polynomial.
      */
     public operator fun P.times(other: C): P
-    // endregion
 
-    // region Polynomial-polynomial relation
     /**
      * Returns the same polynomial.
      */
@@ -327,9 +308,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Checks NOT equality of the polynomials.
      */
     public infix fun P.notEqualsTo(other: P): Boolean = !(this equalsTo other)
-    // endregion
 
-    // region Constant-rational relation
     /**
      * Returns sum of the constant represented as rational function and the rational function.
      */
@@ -342,9 +321,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Returns product of the constant represented as polynomial and the rational function.
      */
     public operator fun C.times(other: R): R
-    // endregion
 
-    // region Rational-constant relation
     /**
      * Returns sum of the constant represented as rational function and the rational function.
      */
@@ -357,9 +334,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Returns product of the constant represented as rational function and the rational function.
      */
     public operator fun R.times(other: C): R
-    // endregion
 
-    // region Polynomial-rational relation
     /**
      * Returns sum of the polynomial represented as rational function and the rational function.
      */
@@ -372,9 +347,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Returns product of the polynomial represented as polynomial and the rational function.
      */
     public operator fun P.times(other: R): R
-    // endregion
 
-    // region Rational-polynomial relation
     /**
      * Returns sum of the polynomial represented as rational function and the rational function.
      */
@@ -387,9 +360,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Returns product of the polynomial represented as rational function and the rational function.
      */
     public operator fun R.times(other: P): R
-    // endregion
 
-    // region Rational-rational relation
     /**
      * Returns the same rational function.
      */
@@ -457,10 +428,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * Checks NOT equality of the polynomials.
      */
     public infix fun R.notEqualsTo(other: R): Boolean = !(this equalsTo other)
-    // endregion
 
-    // Not sure is it necessary...
-    // region Polynomial properties
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
@@ -494,10 +462,6 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      */
     public fun P.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
 
-    // endregion
-
-    // Not sure is it necessary...
-    // region Rational properties
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
@@ -509,25 +473,8 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      */
     public val R.denominatorDegree: Int get() = denominator.degree
 
-    // TODO: Перенести в реализацию
-//    fun R.substitute(argument: C): C
-//    fun R.substitute(argument: P): R
-//    fun R.substitute(argument: R): R
-//
-//    fun R.asFunction(): (C) -> C = /*this::substitute*/ { this.substitute(it) }
-//    fun R.asFunctionOnConstants(): (C) -> C = /*this::substitute*/ { this.substitute(it) }
-//    fun P.asFunctionOnPolynomials(): (P) -> R = /*this::substitute*/ { this.substitute(it) }
-//    fun R.asFunctionOnRationalFunctions(): (R) -> R = /*this::substitute*/ { this.substitute(it) }
-//
-//    operator fun R.invoke(argument: C): C = this.substitute(argument)
-//    operator fun R.invoke(argument: P): R = this.substitute(argument)
-//    operator fun R.invoke(argument: R): R = this.substitute(argument)
-    // endregion
-
-    // region Legacy
     override fun add(left: R, right: R): R = left + right
     override fun multiply(left: R, right: R): R = left * right
-    // endregion
 }
 
 /**
@@ -544,7 +491,6 @@ public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomia
 
     public val ring: A
 
-    // region Constant-integer relation
     /**
      * Returns sum of the constant and the integer represented as constant (member of underlying ring).
      *
@@ -563,9 +509,7 @@ public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomia
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun C.times(other: Int): C = ring { multiplyBySquaring(this@times, other) }
-    // endregion
 
-    // region Integer-constant relation
     /**
      * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
      *
@@ -584,9 +528,7 @@ public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomia
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public override operator fun Int.times(other: C): C = ring { multiplyBySquaring(other, this@times) }
-    // endregion
 
-    // region Constant-constant relation
     /**
      * Returns the same constant.
      */
@@ -626,7 +568,6 @@ public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomia
      * Instance of unit constant (unit of the underlying ring).
      */
     public override val constantOne: C get() = ring.one
-    // endregion
 }
 
 /**
@@ -649,7 +590,6 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
 
     public val polynomialRing: AP
 
-    // region Constant-integer relation
     /**
      * Returns sum of the constant and the integer represented as constant (member of underlying ring).
      *
@@ -668,9 +608,7 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun C.times(other: Int): C = polynomialRing { this@times * other }
-    // endregion
 
-    // region Integer-constant relation
     /**
      * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
      *
@@ -689,9 +627,7 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public override operator fun Int.times(other: C): C = polynomialRing { this@times * other }
-    // endregion
 
-    // region Polynomial-integer relation
     /**
      * Returns sum of the constant and the integer represented as polynomial.
      *
@@ -710,9 +646,7 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun P.times(other: Int): P = polynomialRing { this@times * other }
-    // endregion
 
-    // region Integer-polynomial relation
     /**
      * Returns sum of the integer represented as polynomial and the constant.
      *
@@ -731,9 +665,7 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public override operator fun Int.times(other: P): P = polynomialRing { this@times * other }
-    // endregion
 
-    // region Constant-constant relation
     /**
      * Returns the same constant.
      */
@@ -798,9 +730,7 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
      * Instance of unit constant (unit of the underlying ring).
      */
     public override val constantOne: C get() = polynomialRing.constantOne
-    // endregion
 
-    // region Constant-polynomial relation
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
@@ -813,9 +743,7 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
      * Returns product of the constant represented as polynomial and the polynomial.
      */
     public override operator fun C.times(other: P): P = polynomialRing { this@times * other }
-    // endregion
 
-    // region Polynomial-constant relation
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
@@ -828,9 +756,7 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
      * Returns product of the constant represented as polynomial and the polynomial.
      */
     public override operator fun P.times(other: C): P = polynomialRing { this@times * other }
-    // endregion
 
-    // region Polynomial-polynomial relation
     /**
      * Returns the same polynomial.
      */
@@ -898,10 +824,7 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
      * Checks NOT equality of the polynomials.
      */
     public override infix fun P.notEqualsTo(other: P): Boolean = polynomialRing { this@notEqualsTo notEqualsTo other }
-    // endregion
 
-    // Not sure is it necessary...
-    // region Polynomial properties
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
@@ -934,6 +857,4 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
      * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
      */
     public override fun P.asConstant(): C = polynomialRing { this@asConstant.asConstant() }
-
-    // endregion
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 4106371cc..f4dd74b94 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -48,8 +48,6 @@ internal constructor(
     override fun toString(): String = "LabeledPolynomial$coefficients"
 }
 
-// region Internal utilities
-
 /**
  * Represents internal [LabeledPolynomial] errors.
  */
@@ -70,10 +68,6 @@ internal fun labeledPolynomialError(message: Any): Nothing = throw LabeledPolyno
  */
 internal fun Map<Symbol, UInt>.cleanUp() = filterValues { it > 0U }
 
-// endregion
-
-// region Constructors and converters
-
 //context(LabeledPolynomialSpace<C, Ring<C>>)
 //@Suppress("FunctionName")
 //internal fun <C> LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = false) : LabeledPolynomial<C> {
@@ -128,8 +122,6 @@ internal fun Map<Symbol, UInt>.cleanUp() = filterValues { it > 0U }
 
 public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to this))
 
-// endregion
-
 /**
  * Space of polynomials.
  *
@@ -140,8 +132,6 @@ public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomia
 public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override val ring: A,
 ) : AbstractPolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
-
-    // region Symbol-integer relation
     public operator fun Symbol.plus(other: Int): LabeledPolynomial<C> =
         if (other == 0) LabeledPolynomial<C>(mapOf(
             mapOf(this@plus to 1U) to constantOne,
@@ -163,9 +153,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         else LabeledPolynomial<C>(mapOf(
             mapOf(this to 1U) to constantOne * other,
         ))
-    // endregion
 
-    // region Integer-variable relation
     public operator fun Int.plus(other: Symbol): LabeledPolynomial<C> =
         if (this == 0) LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to constantOne,
@@ -187,9 +175,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         else LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to constantOne * this@times,
         ))
-    // endregion
 
-    // region Polynomial-integer relation
     /**
      * Returns sum of the polynomial and the integer represented as polynomial.
      *
@@ -243,9 +229,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     mapValues { (_, c) -> c * other }
                 }
         )
-    // endregion
 
-    // region Integer-polynomial relation
     /**
      * Returns sum of the integer represented as polynomial and the polynomial.
      *
@@ -299,9 +283,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     mapValues { (_, c) -> this@times * c }
                 }
         )
-    // endregion
 
-    // region Constant-variable relation
     public operator fun C.plus(other: Symbol): LabeledPolynomial<C> =
         if (isZero()) LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to constantOne,
@@ -323,9 +305,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         else LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to this@times,
         ))
-    // endregion
 
-    // region Symbol-constant relation
     public operator fun Symbol.plus(other: C): LabeledPolynomial<C> =
         if (other.isZero()) LabeledPolynomial<C>(mapOf(
             mapOf(this@plus to 1U) to constantOne,
@@ -347,9 +327,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         else LabeledPolynomial<C>(mapOf(
             mapOf(this@times to 1U) to other,
         ))
-    // endregion
 
-    // region Constant-polynomial relation
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
@@ -401,9 +379,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     mapValues { (_, c) -> this@times * c }
                 }
         )
-    // endregion
 
-    // region Polynomial-constant relation
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
@@ -455,9 +431,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     mapValues { (_, c) -> c * other }
                 }
         )
-    // endregion
 
-    // region Symbol-variable relation
     public operator fun Symbol.plus(other: Symbol): LabeledPolynomial<C> =
         if (this == other) LabeledPolynomial<C>(mapOf(
             mapOf(this to 1U) to constantOne * 2
@@ -479,9 +453,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         else LabeledPolynomial<C>(mapOf(
             mapOf(this to 1U, other to 1U) to constantOne,
         ))
-    // endregion
 
-    // region Symbol-polynomial relation
     public operator fun Symbol.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         with(other.coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@plus to 1u) to constantOne))
@@ -519,9 +491,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             other.coefficients
                 .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[this] = if (this in it) it[this]!! + 1U else 1U } }
         )
-    // endregion
 
-    // region Polynomial-variable relation
     public operator fun LabeledPolynomial<C>.plus(other: Symbol): LabeledPolynomial<C> =
         with(coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to constantOne))
@@ -557,9 +527,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             coefficients
                 .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[other] = if (other in it) it[other]!! + 1U else 1U } }
         )
-    // endregion
 
-    // region Polynomial-polynomial relation
     /**
      * Returns negation of the polynomial.
      */
@@ -626,10 +594,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             else -> coefficients.size == other.coefficients.size &&
                     coefficients.all { (key, value) -> with(other.coefficients) { key in this && this[key] == value } }
         }
-    // endregion
 
-    // Not sure is it necessary...
-    // region Polynomial properties
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
@@ -713,10 +678,8 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
 //    @Suppress("NOTHING_TO_INLINE")
 //    @JvmName("invokePolynomial")
 //    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
-    // endregion
 
-    // region Utilities
-    // TODO: Move to region internal utilities with context receiver
+    // TODO: Move to other internal utilities with context receiver
     @JvmName("applyAndRemoveZerosInternal")
     internal fun MutableMap<Map<Symbol, UInt>, C>.applyAndRemoveZeros(block: MutableMap<Map<Symbol, UInt>, C>.() -> Unit) : MutableMap<Map<Symbol, UInt>, C> {
         contract {
@@ -744,5 +707,4 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             for ((degs, c) in this) if (c.isZero()) this.remove(degs)
         }
     }
-    // endregion
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index 3077a2b82..3908933e6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -17,8 +17,6 @@ public class LabeledRationalFunction<C>(
     override fun toString(): String = "LabeledRationalFunction${numerator.coefficients}/${denominator.coefficients}"
 }
 
-// region Internal utilities
-
 /**
  * Represents internal [LabeledRationalFunction] errors.
  */
@@ -34,9 +32,6 @@ internal class LabeledRationalFunctionError : Error {
  */
 internal fun labeledRationalFunctionError(message: Any): Nothing = throw LabeledRationalFunctionError(message.toString())
 
-// endregion
-
-// region Constructors and converters
 // Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
 //context(RationalFunctionSpace<C, A>)
@@ -82,8 +77,6 @@ internal fun labeledRationalFunctionError(message: Any): Nothing = throw Labeled
 //LabeledPolynomial(numeratorCoefficients)
 //)
 
-// endregion
-
 public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
     public val ring: A,
 ) : AbstractRationalFunctionalSpaceOverPolynomialSpace<
@@ -95,7 +88,6 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
 
     override val polynomialRing : LabeledPolynomialSpace<C, A> = LabeledPolynomialSpace(ring)
 
-    // region Rational-integer relation
     /**
      * Returns sum of the rational function and the integer represented as rational function.
      *
@@ -126,9 +118,7 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
             numerator * other,
             denominator
         )
-    // endregion
 
-    // region Integer-Rational relation
     /**
      * Returns sum of the integer represented as rational function and the rational function.
      *
@@ -159,9 +149,7 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
             this * other.numerator,
             other.denominator
         )
-    // endregion
 
-    // region Constant-rational relation
     /**
      * Returns sum of the constant represented as rational function and the rational function.
      */
@@ -186,9 +174,7 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
             this * other.numerator,
             other.denominator
         )
-    // endregion
 
-    // region Rational-constant relation
     /**
      * Returns sum of the constant represented as rational function and the rational function.
      */
@@ -213,9 +199,7 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
             numerator * other,
             denominator
         )
-    // endregion
 
-    // region Polynomial-rational relation
     /**
      * Returns sum of the polynomial represented as rational function and the rational function.
      */
@@ -240,9 +224,7 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
             this * other.numerator,
             other.denominator
         )
-    // endregion
 
-    // region Rational-polynomial relation
     /**
      * Returns sum of the polynomial represented as rational function and the rational function.
      */
@@ -267,9 +249,7 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
             numerator * other,
             denominator
         )
-    // endregion
 
-    // region Rational-rational relation
     /**
      * Returns negation of the rational function.
      */
@@ -329,9 +309,7 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
 
         return numerator * other.denominator equalsTo other.numerator * denominator
     }
-    // endregion
 
-    // region Polynomial properties
     /**
      * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
      * in which they are appeared in the polynomial.
@@ -348,9 +326,7 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
      * Count of all variables that appear in the polynomial in positive exponents.
      */
     public val LabeledPolynomial<C>.countOfVariables: Int get() = polynomialRing { countOfVariables }
-    // endregion
 
-    // region Rational properties
     /**
      * Count of all variables that appear in the polynomial in positive exponents.
      */
@@ -360,9 +336,8 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
      * Count of all variables that appear in the polynomial in positive exponents.
      */
     public val LabeledRationalFunction<C>.countOfVariables: Int get() = variables.size
-    // endregion
 
-    // region REST TODO: Разобрать
+    // TODO: Разобрать
 
     public operator fun LabeledRationalFunction<C>.div(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
         LabeledRationalFunction(
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index a1033fcc4..fe6bb597d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -47,8 +47,6 @@ internal constructor(
     override fun toString(): String = "NumberedPolynomial$coefficients"
 }
 
-// region Internal utilities
-
 /**
  * Represents internal [Polynomial] errors.
  */
@@ -69,10 +67,6 @@ internal fun numberedPolynomialError(message: Any): Nothing = throw PolynomialEr
  */
 internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
 
-// endregion
-
-// region Constructors and converters
-
 //context(NumberedPolynomialSpace<C, Ring<C>>)
 //@Suppress("FunctionName")
 //internal fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = false) : NumberedPolynomial<C> {
@@ -124,8 +118,6 @@ internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
 
 public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial(mapOf(emptyList<UInt>() to this))
 
-// endregion
-
 /**
  * Space of polynomials.
  *
@@ -136,7 +128,6 @@ public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolyno
 public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     public final override val ring: A,
 ) : AbstractPolynomialSpaceOverRing<C, NumberedPolynomial<C>, A> {
-    // region Polynomial-integer relation
     /**
      * Returns sum of the polynomial and the integer represented as polynomial.
      *
@@ -190,9 +181,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     mapValues { (_, c) -> c * other }
                 }
         )
-    // endregion
 
-    // region Integer-polynomial relation
     /**
      * Returns sum of the integer represented as polynomial and the polynomial.
      *
@@ -246,9 +235,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     mapValues { (_, c) -> this@times * c }
                 }
         )
-    // endregion
 
-    // region Constant-polynomial relation
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
@@ -300,9 +287,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     mapValues { (_, c) -> this@times * c }
                 }
         )
-    // endregion
 
-    // region Polynomial-constant relation
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
@@ -352,9 +337,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     mapValues { (_, c) -> c * other }
                 }
         )
-    // endregion
 
-    // region Polynomial-polynomial relation
     /**
      * Returns negation of the polynomial.
      */
@@ -463,10 +446,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
             else -> coefficients.size == other.coefficients.size &&
                     coefficients.all { (key, value) -> with(other.coefficients) { key in this && this[key] == value } }
         }
-    // endregion
 
-    // Not sure is it necessary...
-    // region Polynomial properties
     // TODO: Replace `countOfVariables` with `lastVariable` and create new `countOfVariables`
     /**
      * Count of all variables that appear in the polynomial in positive exponents.
@@ -545,10 +525,8 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     @Suppress("NOTHING_TO_INLINE")
     @JvmName("invokePolynomial")
     public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
-    // endregion
 
-    // region Utilities
-    // TODO: Move to region internal utilities with context receiver
+    // TODO: Move to other internal utilities with context receiver
     @JvmName("applyAndRemoveZerosInternal")
     internal fun MutableMap<List<UInt>, C>.applyAndRemoveZeros(block: MutableMap<List<UInt>, C>.() -> Unit) : MutableMap<List<UInt>, C> {
         contract {
@@ -576,9 +554,6 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
             for ((degs, c) in this) if (c.isZero()) this.remove(degs)
         }
     }
-    // endregion
-
-    // region Constructors and converters
 
     @Suppress("FunctionName")
     internal fun NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = false) : NumberedPolynomial<C> {
@@ -622,6 +597,4 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
 
     @Suppress("FunctionName")
     public fun NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(pairs.toList(), toCheckInput = true)
-
-    // endregion
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index a81795c81..745df10e8 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -16,8 +16,6 @@ public class NumberedRationalFunction<C> internal constructor(
     override fun toString(): String = "NumberedRationalFunction${numerator.coefficients}/${denominator.coefficients}"
 }
 
-// region Internal utilities
-
 /**
  * Represents internal [NumberedRationalFunction] errors.
  */
@@ -33,9 +31,6 @@ internal class NumberedRationalFunctionError : Error {
  */
 internal fun numberedRationalFunctionError(message: Any): Nothing = throw NumberedRationalFunctionError(message.toString())
 
-// endregion
-
-// region Constructors and converters
 // Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
 //context(RationalFunctionSpace<C, A>)
@@ -78,8 +73,6 @@ internal fun numberedRationalFunctionError(message: Any): Nothing = throw Number
 //Polynomial(numeratorCoefficients)
 //)
 
-// endregion
-
 public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
     public val ring: A,
 ) : AbstractRationalFunctionalSpaceOverPolynomialSpace<
@@ -91,7 +84,6 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
 
     override val polynomialRing : NumberedPolynomialSpace<C, A> = NumberedPolynomialSpace(ring)
 
-    // region Rational-integer relation
     /**
      * Returns sum of the rational function and the integer represented as rational function.
      *
@@ -122,9 +114,7 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
             numerator * other,
             denominator
         )
-    // endregion
 
-    // region Integer-Rational relation
     /**
      * Returns sum of the integer represented as rational function and the rational function.
      *
@@ -155,9 +145,7 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
             this * other.numerator,
             other.denominator
         )
-    // endregion
 
-    // region Constant-rational relation
     /**
      * Returns sum of the constant represented as rational function and the rational function.
      */
@@ -182,9 +170,7 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
             this * other.numerator,
             other.denominator
         )
-    // endregion
 
-    // region Rational-constant relation
     /**
      * Returns sum of the constant represented as rational function and the rational function.
      */
@@ -209,9 +195,7 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
             numerator * other,
             denominator
         )
-    // endregion
 
-    // region Polynomial-rational relation
     /**
      * Returns sum of the polynomial represented as rational function and the rational function.
      */
@@ -236,9 +220,7 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
             this * other.numerator,
             other.denominator
         )
-    // endregion
 
-    // region Rational-polynomial relation
     /**
      * Returns sum of the polynomial represented as rational function and the rational function.
      */
@@ -263,9 +245,7 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
             numerator * other,
             denominator
         )
-    // endregion
 
-    // region Rational-rational relation
     /**
      * Returns negation of the rational function.
      */
@@ -325,9 +305,7 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
 
         return numerator * other.denominator equalsTo other.numerator * denominator
     }
-    // endregion
 
-    // region Polynomial properties
     /**
      * Count of all variables that appear in the polynomial in positive exponents.
      */
@@ -340,17 +318,14 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
      * And size of the list is [countOfVariables].
      */
     public val NumberedPolynomial<C>.degrees: List<UInt> get() = polynomialRing { degrees }
-    // endregion
 
-    // region Rational properties
     /**
      * Count of all variables that appear in the polynomial in positive exponents.
      */
     public val NumberedRationalFunction<C>.countOfVariables: Int
         get() = polynomialRing { max(numerator.countOfVariables, denominator.countOfVariables) }
-    // endregion
 
-    // region REST TODO: Разобрать
+    // TODO: Разобрать
 
     public operator fun NumberedRationalFunction<C>.div(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
         NumberedRationalFunction(
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 2f7976da6..3f3838f53 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -91,7 +91,6 @@ public fun <C> C.asPolynomial() : Polynomial<C> = Polynomial(listOf(this))
  * @param A type of underlying ring of constants. It's [Ring] of [C].
  * @param ring underlying ring of constants of type [A].
  */
-//@Suppress("INAPPLICABLE_JVM_NAME") // TODO: KT-31420
 public open class PolynomialSpace<C, A : Ring<C>>(
     public override val ring: A,
 ) : AbstractPolynomialSpaceOverRing<C, Polynomial<C>, A> {
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 441136a64..5ff3edd2e 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -18,8 +18,6 @@ public data class RationalFunction<C> internal constructor (
     override fun toString(): String = "RationalFunction${numerator.coefficients}/${denominator.coefficients}"
 }
 
-// region Internal utilities
-
 /**
  * Represents internal [RationalFunction] errors.
  */
@@ -35,9 +33,6 @@ internal class RationalFunctionError : Error {
  */
 internal fun rationalFunctionError(message: Any): Nothing = throw RationalFunctionError(message.toString())
 
-// endregion
-
-// region Constructors and converters
 // Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
 //context(RationalFunctionSpace<C, A>)
@@ -63,8 +58,6 @@ internal fun rationalFunctionError(message: Any): Nothing = throw RationalFuncti
 //        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } )
 //    )
 
-// endregion
-
 public class RationalFunctionSpace<C, A : Ring<C>> (
     public val ring: A,
 ) : AbstractRationalFunctionalSpaceOverPolynomialSpace<
@@ -76,7 +69,6 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
 
     override val polynomialRing : PolynomialSpace<C, A> = PolynomialSpace(ring)
 
-    // region Rational-integer relation
     /**
      * Returns sum of the rational function and the integer represented as rational function.
      *
@@ -107,9 +99,7 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
             numerator * other,
             denominator
         )
-    // endregion
 
-    // region Integer-Rational relation
     /**
      * Returns sum of the integer represented as rational function and the rational function.
      *
@@ -140,9 +130,7 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
             this * other.numerator,
             other.denominator
         )
-    // endregion
 
-    // region Constant-rational relation
     /**
      * Returns sum of the constant represented as rational function and the rational function.
      */
@@ -167,9 +155,7 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
             this * other.numerator,
             other.denominator
         )
-    // endregion
 
-    // region Rational-constant relation
     /**
      * Returns sum of the constant represented as rational function and the rational function.
      */
@@ -194,9 +180,7 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
             numerator * other,
             denominator
         )
-    // endregion
 
-    // region Polynomial-rational relation
     /**
      * Returns sum of the polynomial represented as rational function and the rational function.
      */
@@ -221,9 +205,7 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
             this * other.numerator,
             other.denominator
         )
-    // endregion
 
-    // region Rational-polynomial relation
     /**
      * Returns sum of the polynomial represented as rational function and the rational function.
      */
@@ -248,9 +230,7 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
             numerator * other,
             denominator
         )
-    // endregion
 
-    // region Rational-rational relation
     /**
      * Returns negation of the rational function.
      */
@@ -298,9 +278,8 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
             numeratorDegree - denominatorDegree != with(other) { numeratorDegree - denominatorDegree } -> false
             else -> numerator * other.denominator equalsTo other.numerator * denominator
         }
-    // endregion
 
-    // region REST TODO: Разобрать
+    // TODO: Разобрать
 
     public operator fun RationalFunction<C>.div(other: RationalFunction<C>): RationalFunction<C> =
         RationalFunction(
@@ -383,5 +362,4 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
 //            numerator.removeZeros(),
 //            denominator.removeZeros()
 //        )
-    // endregion
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
index 516e76b8f..19417d767 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
@@ -17,10 +17,6 @@ import kotlin.contracts.contract
 
 // TODO: Docs
 
-// region Sort of legacy
-
-//// region Constants
-//
 //// TODO: Reuse underlying ring extensions
 //
 //context(LabeledPolynomialSpace<C, A>)
@@ -33,9 +29,7 @@ import kotlin.contracts.contract
 //context(LabeledPolynomialSpace<C, A>)
 //fun <C, A: Ring<C>> multiplyWithPower(base: C, arg: C, pow: UInt): C = ring { multiplyWithPower<C>(base, arg, pow) }
 //
-//// endregion
 
-//// region Symbols
 //
 //context(LabeledPolynomialSpace<C, A>)
 //fun <C, A: Ring<C>> power(arg: Symbol, pow: UInt): LabeledPolynomial<C> =
@@ -44,9 +38,7 @@ import kotlin.contracts.contract
 //        mapOf(arg to pow) to constantOne
 //    ))
 //
-//// endregion
 
-//// region Polynomials
 //
 //context(LabeledPolynomialSpace<C, A>)
 //fun <C, A: Ring<C>> number(value: Int): LabeledPolynomial<C> = ring { LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to number<C>(value))) }
@@ -71,11 +63,6 @@ import kotlin.contracts.contract
 //        else -> error("Error in raising ring instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
 //    }
 //
-//// endregion
-
-// endregion
-
-// region Utilities
 
 /**
  * Crates a [LabeledPolynomialSpace] over received ring.
@@ -92,10 +79,6 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
     return LabeledPolynomialSpace(this).block()
 }
 
-// endregion
-
-//// region String representations
-//
 ///**
 // * Represents the polynomial as a [String] with names of variables substituted with names from [names].
 // * Consider that monomials are sorted in lexicographic order.
@@ -261,13 +244,7 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 //context(LabeledPolynomialSpace<C, A>)
 //fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(namer: (Symbol) -> String): String =
 //    with(representReversed(namer)) { if (coefficients.count() == 1) this else "($this)" }
-//
-//// endregion
 
-// region Operator extensions
-
-//// region Field case
-//
 //operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
 //    if (other.isZero()) throw ArithmeticException("/ by zero")
 //    else
@@ -276,13 +253,7 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 //                .mapValues { it.value / other },
 //            toCheckInput = false
 //        )
-//
-//// endregion
 
-// endregion
-
-//// region Polynomial substitution and functional representation
-//
 //public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Symbol, C>): LabeledPolynomial<C> = ring {
 //    if (coefficients.isEmpty()) return this@substitute
 //    LabeledPolynomial<C>(
@@ -324,10 +295,6 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomi
 //
 //fun <C, A : Ring<C>> LabeledPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Symbol, LabeledPolynomial<C>>) -> LabeledPolynomial<C> =
 //    { substitute(ring, it) }
-//
-//// endregion
-
-// region Algebraic derivative and antiderivative
 
 /**
  * Returns algebraic derivative of received polynomial.
@@ -572,6 +539,4 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo
                 }
         }
     )
-}
-
-// endregion
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
index 575dfed48..61f443871 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
@@ -6,18 +6,10 @@
 package space.kscience.kmath.functions
 
 
-//// region Operator extensions
-//
-//// region Field case
-//
 //fun <T: Field<T>> LabeledRationalFunction<T>.reduced(): LabeledRationalFunction<T> {
 //    val greatestCommonDivider = polynomialGCD(numerator, denominator)
 //    return LabeledRationalFunction(
 //        numerator / greatestCommonDivider,
 //        denominator / greatestCommonDivider
 //    )
-//}
-//
-//// endregion
-//
-//// endregion
\ No newline at end of file
+//}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
index ac411fc28..b2778343d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
@@ -9,10 +9,6 @@ import kotlin.math.max
 
 // TODO: Docs
 
-// region Sort of legacy
-
-//// region Constants
-//
 //// TODO: Reuse underlying ring extensions
 //
 //context(NumberedPolynomialSpace<C, A>)
@@ -21,11 +17,7 @@ import kotlin.math.max
 //
 //context(NumberedPolynomialSpace<C, A>)
 //public fun <C, A: Ring<C>> multiplyWithPower(base: C, arg: C, pow: UInt): C = ring { multiplyWithPower<C>(base, arg, pow) }
-//
-//// endregion
 
-//// region Polynomials
-//
 //context(NumberedPolynomialSpace<C, A>)
 //public fun <C, A: Ring<C>> number(value: Int): NumberedPolynomial<C> = ring { NumberedPolynomial<C>(mapOf(emptyList<UInt>() to number<C>(value))) }
 //
@@ -48,12 +40,6 @@ import kotlin.math.max
 //        exponent % 2U == 1U -> multiplyWithPowerInternalLogic(base * arg, arg * arg, exponent / 2U)
 //        else -> error("Error in raising ring instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
 //    }
-//
-//// endregion
-
-// endregion
-
-// region Utilities
 
 /**
  * Crates a [NumberedPolynomialSpace] over received ring.
@@ -70,10 +56,6 @@ public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolyno
     return NumberedPolynomialSpace(this).block()
 }
 
-// endregion
-
-//// region String representations
-//
 ///**
 // * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`.
 // * Consider that monomials are sorted in lexicographic order.
@@ -237,11 +219,7 @@ public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolyno
 //context(NumberedPolynomialSpace<C, A>)
 //public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversedWithBrackets(namer: (Int) -> String): String =
 //    with(representReversed(namer)) { if (coefficients.count() == 1) this else "($this)" }
-//
-//// endregion
 
-//// region Polynomial substitution and functional representation
-//
 //public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
 //    if (coefficients.isEmpty()) return this@substitute
 //    NumberedPolynomial<C>(
@@ -283,13 +261,7 @@ public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolyno
 //
 //public fun <C, A : Ring<C>> NumberedPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> =
 //    { substitute(ring, it) }
-//
-//// endregion
 
-// region Operator extensions
-
-//// region Field case
-//
 //operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
 //    if (other.isZero()) throw ArithmeticException("/ by zero")
 //    else
@@ -298,12 +270,6 @@ public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolyno
 //                .mapValues { it.value / other },
 //            toCheckInput = false
 //        )
-//
-//// endregion
-
-// endregion
-
-// region Polynomial substitution and functional representation
 
 // TODO: May be apply Horner's method too?
 /**
@@ -368,10 +334,6 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunction(ring: A): (Map<Int,
  */
 public fun <C, A : Ring<C>> NumberedPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> = { substitute(ring, it) }
 
-// endregion
-
-// region Algebraic derivative and antiderivative
-
 /**
  * Returns algebraic derivative of received polynomial.
  */
@@ -596,6 +558,4 @@ public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectT
                 }
         }
     )
-}
-
-// endregion
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
index 7c8120c68..035e201f7 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
@@ -6,18 +6,10 @@
 package space.kscience.kmath.functions
 
 
-//// region Operator extensions
-//
-//// region Field case
-//
 //fun <T: Field<T>> NumberedRationalFunction<T>.reduced(): NumberedRationalFunction<T> {
 //    val greatestCommonDivider = polynomialGCD(numerator, denominator)
 //    return NumberedRationalFunction(
 //        numerator / greatestCommonDivider,
 //        denominator / greatestCommonDivider
 //    )
-//}
-//
-//// endregion
-//
-//// endregion
\ No newline at end of file
+//}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index 2d0377d2c..e6d6b1ae6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -14,8 +14,6 @@ import kotlin.math.min
 import kotlin.math.pow
 
 
-// region Utilities
-
 /**
  * Removes zeros on the end of the coefficient list of polynomial.
  */
@@ -51,10 +49,6 @@ public inline fun <C, A, R> A.scalablePolynomial(block: ScalablePolynomialSpace<
     return ScalablePolynomialSpace(this).block()
 }
 
-// endregion
-
-// region Polynomial substitution and functional representation
-
 // TODO: May be apply Horner's method too?
 /**
  * Evaluates the value of the given double polynomial for given double argument.
@@ -116,10 +110,6 @@ public fun <C, A : Ring<C>> Polynomial<C>.asFunction(ring: A): (C) -> C = { subs
  */
 public fun <C, A : Ring<C>> Polynomial<C>.asPolynomialFunctionOver(ring: A): (Polynomial<C>) -> Polynomial<C> = { substitute(ring, it) }
 
-// endregion
-
-// region Algebraic derivative and antiderivative
-
 /**
  * Returns algebraic derivative of received polynomial.
  */
@@ -180,6 +170,4 @@ public fun <C : Comparable<C>> Polynomial<C>.integrate(
 ): C = algebra {
     val integral = antiderivative(algebra)
     integral.substitute(algebra, range.endInclusive) - integral.substitute(algebra, range.start)
-}
-
-// endregion
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
index d5bbc3b82..359c781b5 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
@@ -6,10 +6,6 @@
 package space.kscience.kmath.functions
 
 
-// region Operator extensions
-
-// region Field case
-
 //operator fun <T: Field<T>> RationalFunction<T>.invoke(arg: T): T = numerator(arg) / denominator(arg)
 //
 //fun <T: Field<T>> RationalFunction<T>.reduced(): RationalFunction<T> =
@@ -20,11 +16,6 @@ package space.kscience.kmath.functions
 //        )
 //    }
 
-// endregion
-
-// endregion
-
-// region Derivatives
 ///**
 // * Returns result of applying formal derivative to the polynomial.
 // *
@@ -35,5 +26,4 @@ package space.kscience.kmath.functions
 //    RationalFunction(
 //        numerator.derivative() * denominator - denominator.derivative() * numerator,
 //        denominator * denominator
-//    )
-// endregion
\ No newline at end of file
+//    )
\ No newline at end of file
-- 
2.34.1


From 75fd9207352c2cdbd4ad4de1275a0f8639f83f76 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 16 Mar 2022 23:22:51 +0300
Subject: [PATCH 444/713] Deleted suddenly missed region marks and unused error
 classes

---
 .../kmath/functions/LabeledPolynomial.kt      | 15 --------
 .../functions/LabeledRationalFunction.kt      | 15 --------
 .../kmath/functions/NumberedPolynomial.kt     | 17 +--------
 .../functions/NumberedRationalFunction.kt     | 15 --------
 .../kscience/kmath/functions/Polynomial.kt    | 37 -------------------
 .../kmath/functions/RationalFunction.kt       | 15 --------
 6 files changed, 1 insertion(+), 113 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index f4dd74b94..d263b7102 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -48,21 +48,6 @@ internal constructor(
     override fun toString(): String = "LabeledPolynomial$coefficients"
 }
 
-/**
- * Represents internal [LabeledPolynomial] errors.
- */
-internal class LabeledPolynomialError: Error {
-    constructor(): super()
-    constructor(message: String): super(message)
-    constructor(message: String?, cause: Throwable?): super(message, cause)
-    constructor(cause: Throwable?): super(cause)
-}
-
-/**
- * Throws an [LabeledPolynomialError] with the given [message].
- */
-internal fun labeledPolynomialError(message: Any): Nothing = throw LabeledPolynomialError(message.toString())
-
 /**
  * Returns the same degrees description of the monomial, but without zero degrees.
  */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index 3908933e6..9b5022f85 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -17,21 +17,6 @@ public class LabeledRationalFunction<C>(
     override fun toString(): String = "LabeledRationalFunction${numerator.coefficients}/${denominator.coefficients}"
 }
 
-/**
- * Represents internal [LabeledRationalFunction] errors.
- */
-internal class LabeledRationalFunctionError : Error {
-    constructor(): super()
-    constructor(message: String): super(message)
-    constructor(message: String?, cause: Throwable?): super(message, cause)
-    constructor(cause: Throwable?): super(cause)
-}
-
-/**
- * Throws an [LabeledRationalFunctionError] with the given [message].
- */
-internal fun labeledRationalFunctionError(message: Any): Nothing = throw LabeledRationalFunctionError(message.toString())
-
 // Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
 //context(RationalFunctionSpace<C, A>)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index fe6bb597d..307b78f29 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -48,22 +48,7 @@ internal constructor(
 }
 
 /**
- * Represents internal [Polynomial] errors.
- */
-internal class NumberedPolynomialError : Error {
-    constructor(): super()
-    constructor(message: String): super(message)
-    constructor(message: String?, cause: Throwable?): super(message, cause)
-    constructor(cause: Throwable?): super(cause)
-}
-
-/**
- * Throws an [PolynomialError] with the given [message].
- */
-internal fun numberedPolynomialError(message: Any): Nothing = throw PolynomialError(message.toString())
-
-/**
- * Returns the same degrees description of the monomial, but without extra zero degrees on the end.
+ * Returns the same degrees' description of the monomial, but without extra zero degrees on the end.
  */
 internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index 745df10e8..8e3b3b1c5 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -16,21 +16,6 @@ public class NumberedRationalFunction<C> internal constructor(
     override fun toString(): String = "NumberedRationalFunction${numerator.coefficients}/${denominator.coefficients}"
 }
 
-/**
- * Represents internal [NumberedRationalFunction] errors.
- */
-internal class NumberedRationalFunctionError : Error {
-    constructor(): super()
-    constructor(message: String): super(message)
-    constructor(message: String?, cause: Throwable?): super(message, cause)
-    constructor(cause: Throwable?): super(cause)
-}
-
-/**
- * Throws an [NumberedRationalFunctionError] with the given [message].
- */
-internal fun numberedRationalFunctionError(message: Any): Nothing = throw NumberedRationalFunctionError(message.toString())
-
 // Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
 //context(RationalFunctionSpace<C, A>)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 3f3838f53..c6f649fe8 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -43,27 +43,6 @@ public data class Polynomial<C>(
     override fun toString(): String = "Polynomial$coefficients"
 }
 
-// region Internal utilities
-
-/**
- * Represents internal [Polynomial] errors.
- */
-internal class PolynomialError : Error {
-    constructor(): super()
-    constructor(message: String): super(message)
-    constructor(message: String?, cause: Throwable?): super(message, cause)
-    constructor(cause: Throwable?): super(cause)
-}
-
-/**
- * Throws an [PolynomialError] with the given [message].
- */
-internal fun polynomialError(message: Any): Nothing = throw PolynomialError(message.toString())
-
-// endregion
-
-// region Constructors and converters
-
 /**
  * Returns a [Polynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
  * [reverse] parameter is true.
@@ -82,8 +61,6 @@ public fun <C> Polynomial(vararg coefficients: C, reverse: Boolean = false): Pol
 
 public fun <C> C.asPolynomial() : Polynomial<C> = Polynomial(listOf(this))
 
-// endregion
-
 /**
  * Space of univariate polynomials constructed over ring.
  *
@@ -94,8 +71,6 @@ public fun <C> C.asPolynomial() : Polynomial<C> = Polynomial(listOf(this))
 public open class PolynomialSpace<C, A : Ring<C>>(
     public override val ring: A,
 ) : AbstractPolynomialSpaceOverRing<C, Polynomial<C>, A> {
-
-    // region Polynomial-integer relation
     /**
      * Returns sum of the polynomial and the integer represented as polynomial.
      *
@@ -152,9 +127,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 .subList(0, degree + 1)
                 .map { it * other }
         )
-    // endregion
 
-    // region Integer-polynomial relation
     /**
      * Returns sum of the integer represented as polynomial and the polynomial.
      *
@@ -213,9 +186,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 .subList(0, other.degree + 1)
                 .map { it * this }
         )
-    // endregion
 
-    // region Constant-polynomial relation
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
@@ -270,9 +241,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 .subList(0, other.degree + 1)
                 .map { it * this }
         )
-    // endregion
 
-    // region Polynomial-constant relation
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
@@ -325,9 +294,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 .subList(0, degree + 1)
                 .map { it * other }
         )
-    // endregion
 
-    // region Polynomial-polynomial relation
     /**
      * Returns negation of the polynomial.
      */
@@ -425,9 +392,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
                 else false
             }
         }
-    // endregion
 
-    // region Polynomial properties
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
@@ -466,8 +431,6 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     public inline operator fun Polynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
     @Suppress("NOTHING_TO_INLINE")
     public inline operator fun Polynomial<C>.invoke(argument: Polynomial<C>): Polynomial<C> = this.substitute(ring, argument)
-
-    // endregion
 }
 
 /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 5ff3edd2e..f4ae64e81 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -18,21 +18,6 @@ public data class RationalFunction<C> internal constructor (
     override fun toString(): String = "RationalFunction${numerator.coefficients}/${denominator.coefficients}"
 }
 
-/**
- * Represents internal [RationalFunction] errors.
- */
-internal class RationalFunctionError : Error {
-    constructor(): super()
-    constructor(message: String): super(message)
-    constructor(message: String?, cause: Throwable?): super(message, cause)
-    constructor(cause: Throwable?): super(cause)
-}
-
-/**
- * Throws an [RationalFunction] with the given [message].
- */
-internal fun rationalFunctionError(message: Any): Nothing = throw RationalFunctionError(message.toString())
-
 // Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
 //context(RationalFunctionSpace<C, A>)
-- 
2.34.1


From 2082175af5e9e811d3a6dfa3079a7dcb2d25a2fe Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 16 Mar 2022 23:31:07 +0300
Subject: [PATCH 445/713] Fixed typos.

---
 .../kmath/functions/LabeledPolynomial.kt         |  2 +-
 .../space/kscience/kmath/functions/Polynomial.kt |  2 +-
 .../kscience/kmath/functions/RationalFunction.kt |  5 +----
 .../kmath/functions/labeledPolynomialUtil.kt     |  4 ++--
 .../kmath/functions/numberedPolynomialUtil.kt    | 16 ++++++++--------
 .../kscience/kmath/functions/polynomialUtil.kt   |  8 ++++----
 6 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index d263b7102..369c7078a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -49,7 +49,7 @@ internal constructor(
 }
 
 /**
- * Returns the same degrees description of the monomial, but without zero degrees.
+ * Returns the same degrees' description of the monomial, but without zero degrees.
  */
 internal fun Map<Symbol, UInt>.cleanUp() = filterValues { it > 0U }
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index c6f649fe8..220bde8ff 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -425,7 +425,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     public inline fun Polynomial<C>.asFunctionOnPolynomials(): (Polynomial<C>) -> Polynomial<C> = { this.substitute(ring, it) }
 
     /**
-     * Evaluates the polynomial for the given value [arg].
+     * Evaluates the polynomial for the given value [argument].
      */
     @Suppress("NOTHING_TO_INLINE")
     public inline operator fun Polynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index f4ae64e81..226eddce9 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -5,10 +5,7 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.*
-import kotlin.jvm.JvmName
-import kotlin.math.max
-import kotlin.math.min
+import space.kscience.kmath.operations.Ring
 
 
 public data class RationalFunction<C> internal constructor (
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
index 19417d767..27fdd7d7b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
@@ -65,13 +65,13 @@ import kotlin.contracts.contract
 //
 
 /**
- * Crates a [LabeledPolynomialSpace] over received ring.
+ * Creates a [LabeledPolynomialSpace] over a received ring.
  */
 public fun <C, A : Ring<C>> A.labeledPolynomial(): LabeledPolynomialSpace<C, A> =
     LabeledPolynomialSpace(this)
 
 /**
- * Crates a [LabeledPolynomialSpace]'s scope over received ring.
+ * Creates a [LabeledPolynomialSpace]'s scope over a received ring.
  */
 @OptIn(ExperimentalContracts::class)
 public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomialSpace<C, A>.() -> R): R {
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
index b2778343d..d544ca93c 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
@@ -42,13 +42,13 @@ import kotlin.math.max
 //    }
 
 /**
- * Crates a [NumberedPolynomialSpace] over received ring.
+ * Creates a [NumberedPolynomialSpace] over a received ring.
  */
 public fun <C, A : Ring<C>> A.numberedPolynomial(): NumberedPolynomialSpace<C, A> =
     NumberedPolynomialSpace(this)
 
 /**
- * Crates a [NumberedPolynomialSpace]'s scope over received ring.
+ * Creates a [NumberedPolynomialSpace]'s scope over a received ring.
  */
 @OptIn(ExperimentalContracts::class)
 public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolynomialSpace<C, A>.() -> R): R {
@@ -279,9 +279,9 @@ public fun NumberedPolynomial<Double>.substitute(args: Map<Int, Double>): Number
     val acc = LinkedHashMap<List<UInt>, Double>(coefficients.size)
     for ((degs, c) in coefficients) {
         val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-        val newC = args.entries.fold(c) { product, (variable, substitutor) ->
+        val newC = args.entries.fold(c) { product, (variable, substitution) ->
             val deg = degs.getOrElse(variable) { 0u }
-            if (deg == 0u) product else product * substitutor.pow(deg.toInt())
+            if (deg == 0u) product else product * substitution.pow(deg.toInt())
         }
         if (newDegs !in acc) acc[newDegs] = newC
         else acc[newDegs] = acc[newDegs]!! + newC
@@ -298,9 +298,9 @@ public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>
     val acc = LinkedHashMap<List<UInt>, C>(coefficients.size)
     for ((degs, c) in coefficients) {
         val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-        val newC = args.entries.fold(c) { product, (variable, substitutor) ->
+        val newC = args.entries.fold(c) { product, (variable, substitution) ->
             val deg = degs.getOrElse(variable) { 0u }
-            if (deg == 0u) product else product * power(substitutor, deg)
+            if (deg == 0u) product else product * power(substitution, deg)
         }
         if (newDegs !in acc) acc[newDegs] = newC
         else acc[newDegs] = acc[newDegs]!! + newC
@@ -315,9 +315,9 @@ public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, Nu
     val acc = LinkedHashMap<List<UInt>, NumberedPolynomial<C>>(coefficients.size)
     for ((degs, c) in coefficients) {
         val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-        val newC = args.entries.fold(c.asNumberedPolynomial()) { product, (variable, substitutor) ->
+        val newC = args.entries.fold(c.asNumberedPolynomial()) { product, (variable, substitution) ->
             val deg = degs.getOrElse(variable) { 0u }
-            if (deg == 0u) product else product * power(substitutor, deg)
+            if (deg == 0u) product else product * power(substitution, deg)
         }
         if (newDegs !in acc) acc[newDegs] = c.asNumberedPolynomial()
         else acc[newDegs] = acc[newDegs]!! + c
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index e6d6b1ae6..a0c11b0a8 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -22,13 +22,13 @@ import kotlin.math.pow
 //    if (degree > -1) Polynomial(coefficients.subList(0, degree + 1)) else zero
 
 /**
- * Crates a [PolynomialSpace] over received ring.
+ * Creates a [PolynomialSpace] over a received ring.
  */
 public fun <C, A : Ring<C>> A.polynomial(): PolynomialSpace<C, A> =
     PolynomialSpace(this)
 
 /**
- * Crates a [PolynomialSpace]'s scope over received ring.
+ * Creates a [PolynomialSpace]'s scope over a received ring.
  */
 public inline fun <C, A : Ring<C>, R> A.polynomial(block: PolynomialSpace<C, A>.() -> R): R {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
@@ -36,13 +36,13 @@ public inline fun <C, A : Ring<C>, R> A.polynomial(block: PolynomialSpace<C, A>.
 }
 
 /**
- * Crates a [ScalablePolynomialSpace] over received scalable ring.
+ * Creates a [ScalablePolynomialSpace] over a received scalable ring.
  */
 public fun <C, A> A.scalablePolynomial(): ScalablePolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C> =
     ScalablePolynomialSpace(this)
 
 /**
- * Crates a [ScalablePolynomialSpace]'s scope over received scalable ring.
+ * Creates a [ScalablePolynomialSpace]'s scope over a received scalable ring.
  */
 public inline fun <C, A, R> A.scalablePolynomial(block: ScalablePolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-- 
2.34.1


From e5186d469a68cf6284e7e1151cad184b33e25821 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Thu, 17 Mar 2022 02:12:40 +0300
Subject: [PATCH 446/713] Fixed issue with confusing `countOfVariables` in
 `Numbered...`

---
 .../kmath/functions/NumberedPolynomial.kt     | 26 ++++++++++----
 .../functions/NumberedRationalFunction.kt     | 34 ++++++++++++++++---
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 307b78f29..37c0c96f0 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -432,12 +432,12 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     coefficients.all { (key, value) -> with(other.coefficients) { key in this && this[key] == value } }
         }
 
-    // TODO: Replace `countOfVariables` with `lastVariable` and create new `countOfVariables`
     /**
-     * Count of all variables that appear in the polynomial in positive exponents.
+     * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
+     * the result is `-1`.
      */
-    public val NumberedPolynomial<C>.countOfVariables: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) 0 else degs.size } ?: 0
+    public val NumberedPolynomial<C>.lastVariable: Int
+        get() = coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) -1 else degs.lastIndex } ?: -1
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
@@ -449,18 +449,30 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      * exponents in which the variables are appeared in the polynomial.
      *
      * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
-     * And size of the list is [countOfVariables].
+     * And last index of the list is [lastVariable].
      */
     public val NumberedPolynomial<C>.degrees: List<UInt>
         get() =
-            buildList(countOfVariables) {
-                repeat(countOfVariables) { add(0U) }
+            MutableList(lastVariable + 1) { 0u }.apply {
                 coefficients.entries.forEach { (degs, c) ->
                     if (c.isNotZero()) degs.forEachIndexed { index, deg ->
                         this[index] = max(this[index], deg)
                     }
                 }
             }
+    /**
+     * Count of variables occurring in the polynomial with positive power. If there is no such variable,
+     * the result is `0`.
+     */
+    public val NumberedPolynomial<C>.countOfVariables: Int
+        get() =
+            MutableList(lastVariable + 1) { false }.apply {
+                coefficients.entries.forEach { (degs, c) ->
+                    if (c.isNotZero()) degs.forEachIndexed { index, deg ->
+                        if (deg != 0u) this[index] = true
+                    }
+                }
+            }.count { it }
 
     /**
      * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index 8e3b3b1c5..6542bc89b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -277,12 +277,12 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
 
         if ( !(numerator.isZero() xor other.numerator.isZero()) ) return false
 
-        val countOfVariables = max(this.countOfVariables, other.countOfVariables)
+        val countOfVariables = max(this.lastVariable, other.lastVariable)
         val thisNumeratorDegrees = this.numerator.degrees
         val thisDenominatorDegrees = this.denominator.degrees
         val otherNumeratorDegrees = other.numerator.degrees
         val otherDenominatorDegrees = other.denominator.degrees
-        for (variable in 0 until countOfVariables)
+        for (variable in 0 .. countOfVariables)
             if (
                 thisNumeratorDegrees.getOrElse(variable) { 0u } + otherDenominatorDegrees.getOrElse(variable) { 0u }
                 != thisDenominatorDegrees.getOrElse(variable) { 0u } + otherNumeratorDegrees.getOrElse(variable) { 0u }
@@ -292,9 +292,10 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
     }
 
     /**
-     * Count of all variables that appear in the polynomial in positive exponents.
+     * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
+     * the result is `-1`.
      */
-    public val NumberedPolynomial<C>.countOfVariables: Int get() = polynomialRing { countOfVariables }
+    public val NumberedPolynomial<C>.lastVariable: Int get() = polynomialRing { lastVariable }
     /**
      * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
      * exponents in which the variables are appeared in the polynomial.
@@ -303,12 +304,35 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
      * And size of the list is [countOfVariables].
      */
     public val NumberedPolynomial<C>.degrees: List<UInt> get() = polynomialRing { degrees }
+    /**
+     * Count of variables occurring in the polynomial with positive power. If there is no such variable,
+     * the result is `0`.
+     */
+    public val NumberedPolynomial<C>.countOfVariables: Int get() = polynomialRing { countOfVariables }
 
     /**
      * Count of all variables that appear in the polynomial in positive exponents.
      */
+    public val NumberedRationalFunction<C>.lastVariable: Int
+        get() = polynomialRing { max(numerator.lastVariable, denominator.lastVariable) }
+    /**
+     * Count of variables occurring in the rational function with positive power. If there is no such variable,
+     * the result is `0`.
+     */
     public val NumberedRationalFunction<C>.countOfVariables: Int
-        get() = polynomialRing { max(numerator.countOfVariables, denominator.countOfVariables) }
+        get() =
+            MutableList(lastVariable + 1) { false }.apply {
+                numerator.coefficients.entries.forEach { (degs, c) ->
+                    if (c.isNotZero()) degs.forEachIndexed { index, deg ->
+                        if (deg != 0u) this[index] = true
+                    }
+                }
+                denominator.coefficients.entries.forEach { (degs, c) ->
+                    if (c.isNotZero()) degs.forEachIndexed { index, deg ->
+                        if (deg != 0u) this[index] = true
+                    }
+                }
+            }.count { it }
 
     // TODO: Разобрать
 
-- 
2.34.1


From a8a95c9df7727f0a2b4bada88c122a912e8b1796 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Thu, 17 Mar 2022 02:15:48 +0300
Subject: [PATCH 447/713] Fixed typo

---
 .../space/kscience/kmath/functions/NumberedRationalFunction.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index 6542bc89b..78ba233f5 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -301,7 +301,7 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
      * exponents in which the variables are appeared in the polynomial.
      *
      * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
-     * And size of the list is [countOfVariables].
+     * And last index of the list is [lastVariable].
      */
     public val NumberedPolynomial<C>.degrees: List<UInt> get() = polynomialRing { degrees }
     /**
-- 
2.34.1


From ffd3ae76844499ca9a6ac46ce23eaa7fc87f06e3 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:02:41 +0300
Subject: [PATCH 448/713] Optimized allocation during coefficients generation
 in `Polynomial`

---
 .../kscience/kmath/functions/Polynomial.kt    | 114 ++++++++++++------
 1 file changed, 79 insertions(+), 35 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 220bde8ff..862ee6a60 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -6,6 +6,10 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.experimental.ExperimentalTypeInference
+import kotlin.jvm.JvmName
 import kotlin.math.max
 import kotlin.math.min
 
@@ -124,8 +128,9 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         if (other == 0) zero
         else Polynomial(
             coefficients
-                .subList(0, degree + 1)
-                .map { it * other }
+                .applyAndRemoveZeros {
+                    map { it * other }
+                }
         )
 
     /**
@@ -183,8 +188,9 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         if (this == 0) zero
         else Polynomial(
             other.coefficients
-                .subList(0, other.degree + 1)
-                .map { it * this }
+                .applyAndRemoveZeros {
+                    map { it * this@times }
+                }
         )
 
     /**
@@ -238,8 +244,9 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         if (this.isZero()) other
         else Polynomial(
             other.coefficients
-                .subList(0, other.degree + 1)
-                .map { it * this }
+                .applyAndRemoveZeros {
+                    map { it * this@times }
+                }
         )
 
     /**
@@ -291,8 +298,9 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         if (other.isZero()) this
         else Polynomial(
             coefficients
-                .subList(0, degree + 1)
-                .map { it * other }
+                .applyAndRemoveZeros {
+                    map { it * other }
+                }
         )
 
     /**
@@ -303,33 +311,35 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     /**
      * Returns sum of the polynomials.
      */
-    public override operator fun Polynomial<C>.plus(other: Polynomial<C>): Polynomial<C> =
-        Polynomial(
-            (0..max(degree, other.degree))
-                .map {
-                    when {
-                        it > degree -> other.coefficients[it]
-                        it > other.degree -> coefficients[it]
-                        else -> coefficients[it] + other.coefficients[it]
-                    }
+    public override operator fun Polynomial<C>.plus(other: Polynomial<C>): Polynomial<C> {
+        val thisDegree = degree
+        val otherDegree = other.degree
+        return Polynomial(
+            Coefficients(max(thisDegree, otherDegree) + 1) {
+                when {
+                    it > thisDegree -> other.coefficients[it]
+                    it > otherDegree -> coefficients[it]
+                    else -> coefficients[it] + other.coefficients[it]
                 }
-                .ifEmpty { listOf(constantZero) }
+            }
         )
+    }
     /**
      * Returns difference of the polynomials.
      */
-    public override operator fun Polynomial<C>.minus(other: Polynomial<C>): Polynomial<C> =
-        Polynomial(
-            (0..max(degree, other.degree))
-                .map {
-                    when {
-                        it > degree -> -other.coefficients[it]
-                        it > other.degree -> coefficients[it]
-                        else -> coefficients[it] - other.coefficients[it]
-                    }
+    public override operator fun Polynomial<C>.minus(other: Polynomial<C>): Polynomial<C> {
+        val thisDegree = degree
+        val otherDegree = other.degree
+        return Polynomial(
+            Coefficients(max(thisDegree, otherDegree) + 1) {
+                when {
+                    it > thisDegree -> -other.coefficients[it]
+                    it > otherDegree -> coefficients[it]
+                    else -> coefficients[it] - other.coefficients[it]
                 }
-                .ifEmpty { listOf(constantZero) }
+            }
         )
+    }
     /**
      * Returns product of the polynomials.
      */
@@ -341,13 +351,11 @@ public open class PolynomialSpace<C, A : Ring<C>>(
             otherDegree == -1 -> zero
             else ->
                 Polynomial(
-                    (0..(thisDegree + otherDegree))
-                        .map { d ->
-                            (max(0, d - otherDegree)..min(thisDegree, d))
-                                .map { coefficients[it] * other.coefficients[d - it] }
-                                .reduce { acc, rational -> acc + rational }
-                        }
-                        .run { subList(0, indexOfLast { it.isNotZero() } + 1) }
+                    Coefficients(thisDegree + otherDegree + 1) { d ->
+                        (max(0, d - otherDegree)..min(thisDegree, d))
+                            .map { coefficients[it] * other.coefficients[d - it] }
+                            .reduce { acc, rational -> acc + rational }
+                    }
                 )
         }
     }
@@ -431,6 +439,42 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     public inline operator fun Polynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
     @Suppress("NOTHING_TO_INLINE")
     public inline operator fun Polynomial<C>.invoke(argument: Polynomial<C>): Polynomial<C> = this.substitute(ring, argument)
+
+    // TODO: Move to other internal utilities with context receiver
+    @JvmName("applyAndRemoveZerosInternal")
+    internal inline fun MutableList<C>.applyAndRemoveZeros(block: MutableList<C>.() -> Unit) : MutableList<C> {
+        contract {
+            callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+        }
+        block()
+        while (elementAt(lastIndex).isZero()) removeAt(lastIndex)
+        return this
+    }
+    internal inline fun List<C>.applyAndRemoveZeros(block: MutableList<C>.() -> Unit) : List<C> =
+        toMutableList().applyAndRemoveZeros(block)
+    internal inline fun MutableCoefficients(size: Int, init: (index: Int) -> C): MutableList<C> {
+        val list = ArrayList<C>(size)
+        repeat(size) { index -> list.add(init(index)) }
+        with(list) { while (elementAt(lastIndex).isZero()) removeAt(lastIndex) }
+        return list
+    }
+    internal inline fun Coefficients(size: Int, init: (index: Int) -> C): List<C> = MutableCoefficients(size, init)
+    @OptIn(ExperimentalTypeInference::class)
+    internal inline fun buildCoefficients(@BuilderInference builderAction: MutableList<C>.() -> Unit): List<C> {
+        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
+        return buildList {
+            builderAction()
+            while (elementAt(lastIndex).isZero()) removeAt(lastIndex)
+        }
+    }
+    @OptIn(ExperimentalTypeInference::class)
+    internal inline fun buildCoefficients(capacity: Int, @BuilderInference builderAction: MutableList<C>.() -> Unit): List<C> {
+        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
+        return buildList(capacity) {
+            builderAction()
+            while (elementAt(lastIndex).isZero()) removeAt(lastIndex)
+        }
+    }
 }
 
 /**
-- 
2.34.1


From d63c4acf101849c0bbe2242d841bf7faaf6047e3 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:27:02 +0300
Subject: [PATCH 449/713] Added space and scope fabrics for RFs

---
 .../functions/labeledRationalFunctionUtil.kt   | 18 ++++++++++++++++++
 .../functions/numberedRationalFunctionUtil.kt  | 18 ++++++++++++++++++
 .../kmath/functions/rationalFunctionUtil.kt    | 18 ++++++++++++++++++
 3 files changed, 54 insertions(+)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
index 61f443871..d79e8eda3 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
@@ -5,6 +5,24 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.operations.Ring
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+
+
+/**
+ * Creates a [LabeledRationalFunctionSpace] over a received ring.
+ */
+public fun <C, A : Ring<C>> A.labeledRationalFunction(): LabeledRationalFunctionSpace<C, A> =
+    LabeledRationalFunctionSpace(this)
+
+/**
+ * Creates a [RationalFunctionSpace]'s scope over a received ring.
+ */
+public inline fun <C, A : Ring<C>, R> A.labeledRationalFunction(block: LabeledRationalFunctionSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return LabeledRationalFunctionSpace(this).block()
+}
 
 //fun <T: Field<T>> LabeledRationalFunction<T>.reduced(): LabeledRationalFunction<T> {
 //    val greatestCommonDivider = polynomialGCD(numerator, denominator)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
index 035e201f7..cc725f981 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
@@ -5,6 +5,24 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.operations.Ring
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+
+
+/**
+ * Creates a [NumberedRationalFunctionSpace] over a received ring.
+ */
+public fun <C, A : Ring<C>> A.numberedRationalFunction(): NumberedRationalFunctionSpace<C, A> =
+    NumberedRationalFunctionSpace(this)
+
+/**
+ * Creates a [RationalFunctionSpace]'s scope over a received ring.
+ */
+public inline fun <C, A : Ring<C>, R> A.numberedRationalFunction(block: NumberedRationalFunctionSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return NumberedRationalFunctionSpace(this).block()
+}
 
 //fun <T: Field<T>> NumberedRationalFunction<T>.reduced(): NumberedRationalFunction<T> {
 //    val greatestCommonDivider = polynomialGCD(numerator, denominator)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
index 359c781b5..456a1fa2b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
@@ -5,6 +5,24 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.operations.Ring
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+
+
+/**
+ * Creates a [RationalFunctionSpace] over a received ring.
+ */
+public fun <C, A : Ring<C>> A.rationalFunction(): RationalFunctionSpace<C, A> =
+    RationalFunctionSpace(this)
+
+/**
+ * Creates a [RationalFunctionSpace]'s scope over a received ring.
+ */
+public inline fun <C, A : Ring<C>, R> A.rationalFunction(block: RationalFunctionSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return RationalFunctionSpace(this).block()
+}
 
 //operator fun <T: Field<T>> RationalFunction<T>.invoke(arg: T): T = numerator(arg) / denominator(arg)
 //
-- 
2.34.1


From 86553e9f35aa5891b89bdcd187ff348dcc9955fb Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:28:41 +0300
Subject: [PATCH 450/713] Added utilities. Rewrote polynomial-in-polynomial
 substitution

---
 .../kmath/functions/polynomialUtil.kt         | 55 ++++++++++++++++---
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index a0c11b0a8..c624380be 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -49,6 +49,41 @@ public inline fun <C, A, R> A.scalablePolynomial(block: ScalablePolynomialSpace<
     return ScalablePolynomialSpace(this).block()
 }
 
+@Suppress("NOTHING_TO_INLINE")
+internal inline fun <C> iadd(
+    ring: Ring<C>,
+    augend: MutableList<C>,
+    addend: List<C>,
+    degree: Int
+) = ring {
+    for (deg in 0 .. degree) augend[deg] += addend[deg]
+}
+
+@Suppress("NOTHING_TO_INLINE")
+internal inline fun <C> addTo(
+    ring: Ring<C>,
+    augend: List<C>,
+    addend: List<C>,
+    degree: Int,
+    target: MutableList<C>
+) = ring {
+    for (deg in 0 .. degree) target[deg] = augend[deg] + addend[deg]
+}
+
+@Suppress("NOTHING_TO_INLINE")
+internal inline fun <C> multiplyAddingTo(
+    ring: Ring<C>,
+    multiplicand: List<C>,
+    multiplicandDegree: Int,
+    multiplier: List<C>,
+    multiplierDegree: Int,
+    target: MutableList<C>
+) = ring {
+    for (d in 0 .. multiplicandDegree + multiplierDegree)
+        for (k in max(0, d - multiplierDegree)..min(multiplicandDegree, d))
+            target[d] += multiplicand[k] * multiplier[d - k]
+}
+
 // TODO: May be apply Horner's method too?
 /**
  * Evaluates the value of the given double polynomial for given double argument.
@@ -80,19 +115,21 @@ public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: Polynomial<C>) : Pol
     val argDegree = arg.degree
     if (argDegree == -1) return coefficients[0].asPolynomial()
     val constantZero = constantZero
-    val resultCoefs: MutableList<C> = MutableList(thisDegree + argDegree + 1) { constantZero }
-    val resultCoefsUpdate: MutableList<C> = MutableList(thisDegree + argDegree + 1) { constantZero }
+    val resultCoefs: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
+    val resultCoefsUpdate: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
     var resultDegree = 0
     for (deg in thisDegree downTo 0) {
         resultCoefsUpdate[0] = coefficients[deg]
-        for (updateDeg in 0 .. resultDegree + argDegree) {
-            var newC = resultCoefsUpdate[updateDeg]
-            for (deg1 in max(0, updateDeg - argDegree)..min(resultDegree, updateDeg))
-                newC += resultCoefs[deg1] * arg.coefficients[updateDeg - deg1]
-            resultCoefsUpdate[updateDeg] = newC
-        }
+        multiplyAddingTo(
+            ring=ring,
+            multiplicand = resultCoefs,
+            multiplicandDegree = resultDegree,
+            multiplier = arg.coefficients,
+            multiplierDegree = argDegree,
+            target = resultCoefsUpdate
+        )
         resultDegree += argDegree
-        for (updateDeg in 0 .. resultDegree + argDegree) {
+        for (updateDeg in 0 .. resultDegree) {
             resultCoefs[updateDeg] = resultCoefsUpdate[updateDeg]
             resultCoefsUpdate[updateDeg] = constantZero
         }
-- 
2.34.1


From ed2f14b68e7f799fcbe370bf744256a278cfcf74 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 18 Mar 2022 01:47:03 +0300
Subject: [PATCH 451/713] Optimised existing substitution function. Prototyped
 substitution for RFs.

---
 .../kmath/functions/polynomialUtil.kt         |  63 ++++---
 .../kmath/functions/rationalFunctionUtil.kt   | 174 ++++++++++++++++++
 2 files changed, 210 insertions(+), 27 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index c624380be..1a7245b9f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -50,24 +50,36 @@ public inline fun <C, A, R> A.scalablePolynomial(block: ScalablePolynomialSpace<
 }
 
 @Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> iadd(
-    ring: Ring<C>,
-    augend: MutableList<C>,
-    addend: List<C>,
-    degree: Int
-) = ring {
-    for (deg in 0 .. degree) augend[deg] += addend[deg]
+internal inline fun <C> copyTo(
+    origin: List<C>,
+    originDegree: Int,
+    target: MutableList<C>,
+) {
+    for (deg in 0 .. originDegree) target[deg] = origin[deg]
 }
 
 @Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> addTo(
+internal inline fun <C> multiplyAddingToUpdater(
     ring: Ring<C>,
-    augend: List<C>,
-    addend: List<C>,
-    degree: Int,
-    target: MutableList<C>
-) = ring {
-    for (deg in 0 .. degree) target[deg] = augend[deg] + addend[deg]
+    multiplicand: MutableList<C>,
+    multiplicandDegree: Int,
+    multiplier: List<C>,
+    multiplierDegree: Int,
+    updater: MutableList<C>,
+    zero: C,
+) {
+    multiplyAddingTo(
+        ring = ring,
+        multiplicand = multiplicand,
+        multiplicandDegree = multiplicandDegree,
+        multiplier = multiplier,
+        multiplierDegree = multiplierDegree,
+        target = updater
+    )
+    for (updateDeg in 0 .. multiplicandDegree + multiplierDegree) {
+        multiplicand[updateDeg] = updater[updateDeg]
+        updater[updateDeg] = zero
+    }
 }
 
 @Suppress("NOTHING_TO_INLINE")
@@ -107,32 +119,29 @@ public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
     return result
 }
 
-public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: Polynomial<C>) : Polynomial<C> = ring.polynomial {
-    if (coefficients.isEmpty()) return zero
+public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: Polynomial<C>) : Polynomial<C> = ring {
+    if (coefficients.isEmpty()) return Polynomial(emptyList())
 
-    val thisDegree = degree
-    if (thisDegree == -1) return zero
-    val argDegree = arg.degree
+    val thisDegree = coefficients.indexOfLast { it != zero }
+    if (thisDegree == -1) return Polynomial(emptyList())
+    val argDegree = arg.coefficients.indexOfLast { it != zero }
     if (argDegree == -1) return coefficients[0].asPolynomial()
-    val constantZero = constantZero
+    val constantZero = zero
     val resultCoefs: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
     val resultCoefsUpdate: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
     var resultDegree = 0
     for (deg in thisDegree downTo 0) {
         resultCoefsUpdate[0] = coefficients[deg]
-        multiplyAddingTo(
-            ring=ring,
+        multiplyAddingToUpdater(
+            ring = ring,
             multiplicand = resultCoefs,
             multiplicandDegree = resultDegree,
             multiplier = arg.coefficients,
             multiplierDegree = argDegree,
-            target = resultCoefsUpdate
+            updater = resultCoefsUpdate,
+            zero = constantZero
         )
         resultDegree += argDegree
-        for (updateDeg in 0 .. resultDegree) {
-            resultCoefs[updateDeg] = resultCoefsUpdate[updateDeg]
-            resultCoefsUpdate[updateDeg] = constantZero
-        }
     }
     return Polynomial<C>(resultCoefs)
 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
index 456a1fa2b..8d2073834 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
@@ -5,9 +5,12 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.invoke
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
+import kotlin.math.max
 
 
 /**
@@ -24,6 +27,177 @@ public inline fun <C, A : Ring<C>, R> A.rationalFunction(block: RationalFunction
     return RationalFunctionSpace(this).block()
 }
 
+/**
+ * Evaluates the value of the given double polynomial for given double argument.
+ */
+public fun RationalFunction<Double>.substitute(arg: Double): Double =
+    numerator.substitute(arg) / denominator.substitute(arg)
+
+/**
+ * Evaluates the value of the given polynomial for given argument.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */
+public fun <C> RationalFunction<C>.substitute(ring: Field<C>, arg: C): C = ring {
+    numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
+}
+
+/**
+ * Returns numerator (polynomial) of rational function gotten by substitution rational function [arg] to the polynomial instance.
+ * More concrete, if [arg] is a fraction `f(x)/g(x)` and the receiving instance is `p(x)`, then
+ * ```
+ * p(f/g) * g^deg(p)
+ * ```
+ * is returned.
+ *
+ * Used in [Polynomial.substitute] and [RationalFunction.substitute] for performance optimisation.
+ */ // TODO: Дописать
+internal fun <C> Polynomial<C>.substituteRationalFunctionTakeNumerator(ring: Ring<C>, arg: RationalFunction<C>): Polynomial<C> = ring {
+    if (coefficients.isEmpty()) return Polynomial(emptyList())
+
+    val thisDegree = coefficients.indexOfLast { it != zero }
+    if (thisDegree == -1) return Polynomial(emptyList())
+    val thisDegreeLog2 = 31 - thisDegree.countLeadingZeroBits()
+    val numeratorDegree = arg.numerator.coefficients.indexOfLast { it != zero }
+    val denominatorDegree = arg.denominator.coefficients.indexOfLast { it != zero }
+    val argDegree = max(numeratorDegree, denominatorDegree)
+    val constantZero = zero
+    val powersOf2 = buildList<Int>(thisDegreeLog2 + 1) {
+        var result = 1
+        for (exp in 0 .. thisDegreeLog2) {
+            add(result)
+            result = result shl 1
+        }
+    }
+    val hashes = powersOf2.runningReduce { acc, i -> acc + i }
+    val numeratorPowers = buildList<List<C>>(thisDegreeLog2 + 1) {
+        add(arg.numerator.coefficients)
+        repeat(thisDegreeLog2) {
+            val next = MutableList<C>(powersOf2[it + 1] * numeratorDegree + 1) { constantZero }
+            add(next)
+            val last = last()
+            multiplyAddingTo(
+                ring = ring,
+                multiplicand = last,
+                multiplicandDegree = powersOf2[it] * numeratorDegree + 1,
+                multiplier = last,
+                multiplierDegree = powersOf2[it] * numeratorDegree + 1,
+                target = next,
+            )
+        }
+    }
+    val denominatorPowers = buildList<List<C>>(thisDegreeLog2 + 1) {
+        add(arg.denominator.coefficients)
+        repeat(thisDegreeLog2) {
+            val next = MutableList<C>(powersOf2[it + 1] * denominatorDegree + 1) { constantZero }
+            add(next)
+            val last = last()
+            multiplyAddingTo(
+                ring = ring,
+                multiplicand = last,
+                multiplicandDegree = powersOf2[it] * denominatorDegree + 1,
+                multiplier = last,
+                multiplierDegree = powersOf2[it] * denominatorDegree + 1,
+                target = next,
+            )
+        }
+    }
+    val levelResultCoefsPool = buildList<MutableList<C>>(thisDegreeLog2 + 1) {
+        repeat(thisDegreeLog2 + 1) {
+            add(MutableList(hashes[it] * argDegree) { constantZero })
+        }
+    }
+    val edgedMultiplier = MutableList<C>(0) { TODO() }
+    val edgedMultiplierUpdater = MutableList<C>(0) { TODO() }
+
+    fun MutableList<C>.reset() {
+        for (i in indices) set(i, constantZero)
+    }
+
+    fun processLevel(level: Int, start: Int, end: Int) : List<C> {
+        val levelResultCoefs = levelResultCoefsPool[level + 1]
+
+        if (level == -1) {
+            levelResultCoefs[0] = coefficients[start]
+        } else {
+            levelResultCoefs.reset()
+            multiplyAddingTo(
+                ring = ring,
+                multiplicand = processLevel(level = level - 1, start = start, end = (start + end) / 2),
+                multiplicandDegree =  hashes[level] * argDegree,
+                multiplier = denominatorPowers[level],
+                multiplierDegree = powersOf2[level] * denominatorDegree,
+                target = levelResultCoefs
+            )
+            multiplyAddingTo(
+                ring = ring,
+                multiplicand = processLevel(level = level - 1, start = (start + end) / 2, end = end),
+                multiplicandDegree = hashes[level] * argDegree,
+                multiplier = numeratorPowers[level],
+                multiplierDegree = powersOf2[level] * numeratorDegree,
+                target = levelResultCoefs
+            )
+        }
+
+        return levelResultCoefs
+    }
+
+    fun processLevelEdged(level: Int, start: Int, end: Int) : List<C> {
+        val levelResultCoefs = levelResultCoefsPool[level + 1]
+
+        if (level == -1) {
+            levelResultCoefs[0] = coefficients[start]
+        } else {
+            val levelsPowerOf2 = powersOf2[level]
+            if (end - start >= levelsPowerOf2) {
+                multiplyAddingTo(
+                    ring = ring,
+                    multiplicand = processLevelEdged(level = level - 1, start = start + levelsPowerOf2, end = end),
+                    multiplicandDegree = hashes[level] * argDegree, // TODO: Ввести переменную
+                    multiplier = numeratorPowers[level],
+                    multiplierDegree = powersOf2[level] * numeratorDegree,
+                    target = levelResultCoefs
+                )
+                multiplyAddingTo(
+                    ring = ring,
+                    multiplicand = processLevel(level = level - 1, start = start, end = start + levelsPowerOf2),
+                    multiplicandDegree = hashes[level] * argDegree,
+                    multiplier = edgedMultiplier,
+                    multiplierDegree = max((hashes[level] and thisDegree) - powersOf2[level] + 1, 0) * denominatorDegree, // TODO: Ввести переменную
+                    target = levelResultCoefs
+                )
+                if (level != thisDegreeLog2) {
+                    multiplyAddingToUpdater(
+                        ring = ring,
+                        multiplicand = edgedMultiplier,
+                        multiplicandDegree = max((hashes[level] and thisDegree) - powersOf2[level] + 1, 0) * denominatorDegree, // TODO: Ввести переменную
+                        multiplier = denominatorPowers[level],
+                        multiplierDegree = powersOf2[level] * denominatorDegree,
+                        updater = edgedMultiplierUpdater,
+                        zero = constantZero
+                    )
+                }
+            } else {
+                copyTo(
+                    origin = processLevelEdged(level = level - 1, start = start + levelsPowerOf2, end = end),
+                    originDegree = hashes[level] * argDegree, // TODO: Ввести переменную
+                    target = levelResultCoefs
+                )
+            }
+        }
+
+        return levelResultCoefs
+    }
+
+    return Polynomial(
+        processLevelEdged(
+            level = thisDegreeLog2,
+            start = 0,
+            end = thisDegree + 1
+        )
+    )
+}
+
 //operator fun <T: Field<T>> RationalFunction<T>.invoke(arg: T): T = numerator(arg) / denominator(arg)
 //
 //fun <T: Field<T>> RationalFunction<T>.reduced(): RationalFunction<T> =
-- 
2.34.1


From cdc85291bc5d5c9313e25c5d11649415155087d0 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 18 Mar 2022 20:04:21 +0300
Subject: [PATCH 452/713] Fixed bug in implementations of polynomial operations

---
 .../kmath/functions/LabeledPolynomial.kt      | 26 +++++++++----------
 .../kmath/functions/NumberedPolynomial.kt     | 26 +++++++++----------
 .../kscience/kmath/functions/Polynomial.kt    | 10 ++++---
 .../kmath/functions/polynomialUtil.kt         |  1 -
 4 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 369c7078a..76f5fc29c 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -211,7 +211,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         else LabeledPolynomial(
             coefficients
                 .applyAndRemoveZeros {
-                    mapValues { (_, c) -> c * other }
+                    for (degs in keys) this[degs] = this[degs]!! * other
                 }
         )
 
@@ -265,7 +265,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         else LabeledPolynomial(
             other.coefficients
                 .applyAndRemoveZeros {
-                    mapValues { (_, c) -> this@times * c }
+                    for (degs in keys) this[degs] = this@times * this[degs]!!
                 }
         )
 
@@ -361,7 +361,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         else LabeledPolynomial<C>(
             other.coefficients
                 .applyAndRemoveZeros {
-                    mapValues { (_, c) -> this@times * c }
+                    for (degs in keys) this[degs] = this@times * this[degs]!!
                 }
         )
 
@@ -413,7 +413,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         else LabeledPolynomial<C>(
             coefficients
                 .applyAndRemoveZeros {
-                    mapValues { (_, c) -> c * other }
+                    for (degs in keys) this[degs] = this[degs]!! * other
                 }
         )
 
@@ -525,22 +525,20 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun LabeledPolynomial<C>.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         LabeledPolynomial<C>(
-            coefficients
-                .applyAndRemoveZeros {
-                    other.coefficients
-                        .mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
-                }
+            buildCoefficients(coefficients.size + other.coefficients.size) {
+                other.coefficients.mapValuesTo(this) { it.value }
+                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
+            }
         )
     /**
      * Returns difference of the polynomials.
      */
     override operator fun LabeledPolynomial<C>.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         LabeledPolynomial<C>(
-            coefficients
-                .applyAndRemoveZeros {
-                    other.coefficients
-                        .mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
-                }
+            buildCoefficients(coefficients.size + other.coefficients.size) {
+                other.coefficients.mapValuesTo(this) { it.value }
+                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
+            }
         )
     /**
      * Returns product of the polynomials.
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 37c0c96f0..88349f003 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -163,7 +163,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
         else NumberedPolynomial<C>(
             coefficients
                 .applyAndRemoveZeros {
-                    mapValues { (_, c) -> c * other }
+                    for (degs in keys) this[degs] = this[degs]!! * other
                 }
         )
 
@@ -217,7 +217,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
         else NumberedPolynomial(
             other.coefficients
                 .applyAndRemoveZeros {
-                    mapValues { (_, c) -> this@times * c }
+                    for (degs in keys) this[degs] = this@times * this[degs]!!
                 }
         )
 
@@ -269,7 +269,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
         else NumberedPolynomial<C>(
             other.coefficients
                 .applyAndRemoveZeros {
-                    mapValues { (_, c) -> this@times * c }
+                    for (degs in keys) this[degs] = this@times * this[degs]!!
                 }
         )
 
@@ -319,7 +319,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
         else NumberedPolynomial<C>(
             coefficients
                 .applyAndRemoveZeros {
-                    mapValues { (_, c) -> c * other }
+                    for (degs in keys) this[degs] = this[degs]!! * other
                 }
         )
 
@@ -335,22 +335,20 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun NumberedPolynomial<C>.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         NumberedPolynomial<C>(
-            coefficients
-                .applyAndRemoveZeros {
-                    other.coefficients
-                        .mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
-                }
+            buildCoefficients(coefficients.size + other.coefficients.size) {
+                other.coefficients.mapValuesTo(this) { it.value }
+                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
+            }
         )
     /**
      * Returns difference of the polynomials.
      */
     override operator fun NumberedPolynomial<C>.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         NumberedPolynomial<C>(
-            coefficients
-                .applyAndRemoveZeros {
-                    other.coefficients
-                        .mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
-                }
+            buildCoefficients(coefficients.size + other.coefficients.size) {
+                other.coefficients.mapValuesTo(this) { it.value }
+                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
+            }
         )
     /**
      * Returns product of the polynomials.
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 862ee6a60..a60ca563a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -129,7 +129,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         else Polynomial(
             coefficients
                 .applyAndRemoveZeros {
-                    map { it * other }
+                    for (deg in indices) this[deg] = this[deg] * other
                 }
         )
 
@@ -189,7 +189,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         else Polynomial(
             other.coefficients
                 .applyAndRemoveZeros {
-                    map { it * this@times }
+                    for (deg in indices) this[deg] = this@times * this[deg]
                 }
         )
 
@@ -245,7 +245,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         else Polynomial(
             other.coefficients
                 .applyAndRemoveZeros {
-                    map { it * this@times }
+                    for (deg in indices) this[deg] = this@times * this[deg]
                 }
         )
 
@@ -299,7 +299,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         else Polynomial(
             coefficients
                 .applyAndRemoveZeros {
-                    map { it * other }
+                    for (deg in indices) this[deg] = this[deg] * other
                 }
         )
 
@@ -452,12 +452,14 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     }
     internal inline fun List<C>.applyAndRemoveZeros(block: MutableList<C>.() -> Unit) : List<C> =
         toMutableList().applyAndRemoveZeros(block)
+    @Suppress("FunctionName")
     internal inline fun MutableCoefficients(size: Int, init: (index: Int) -> C): MutableList<C> {
         val list = ArrayList<C>(size)
         repeat(size) { index -> list.add(init(index)) }
         with(list) { while (elementAt(lastIndex).isZero()) removeAt(lastIndex) }
         return list
     }
+    @Suppress("FunctionName")
     internal inline fun Coefficients(size: Int, init: (index: Int) -> C): List<C> = MutableCoefficients(size, init)
     @OptIn(ExperimentalTypeInference::class)
     internal inline fun buildCoefficients(@BuilderInference builderAction: MutableList<C>.() -> Unit): List<C> {
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index 1a7245b9f..84c8d2e88 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -96,7 +96,6 @@ internal inline fun <C> multiplyAddingTo(
             target[d] += multiplicand[k] * multiplier[d - k]
 }
 
-// TODO: May be apply Horner's method too?
 /**
  * Evaluates the value of the given double polynomial for given double argument.
  */
-- 
2.34.1


From 85cd3b4de64b35718d603033dba4aec97879578d Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 18 Mar 2022 20:39:01 +0300
Subject: [PATCH 453/713] Added some test. Fixed bug in algebraicStub.kt

---
 .../kscience/kmath/functions/algebraicStub.kt |   2 +-
 .../kmath/functions/AlgebraicStubTest.kt      | 589 ++++++++++++++++++
 .../kmath/functions/PolynomialTest.kt         |   5 +-
 3 files changed, 593 insertions(+), 3 deletions(-)
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
index ee81f3d79..ca93e4259 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
@@ -139,7 +139,7 @@ internal tailrec fun <C> Ring<C>.exponentiationBySquaring(arg: C, exponent: UInt
 internal tailrec fun <C> RingOps<C>.multiplyExponentiationBySquaring(base: C, arg: C, exponent: UInt): C =
     when {
         exponent == 0u -> base
-        exponent == 1u -> base + arg
+        exponent == 1u -> base * arg
         exponent and 1u == 0u -> multiplyExponentiationBySquaring(base, arg * arg, exponent shr 1)
         exponent and 1u == 1u -> multiplyExponentiationBySquaring(base * arg, arg * arg, exponent shr 1)
         else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
new file mode 100644
index 000000000..fe4a82f11
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
@@ -0,0 +1,589 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.operations.Field
+import kotlin.jvm.JvmInline
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+@JvmInline
+value class Expr(val expr: String)
+
+object ExprRing : Field<Expr> {
+    override fun Expr.unaryMinus(): Expr = Expr("-${expr}")
+    override fun add(left: Expr, right: Expr): Expr = Expr("(${left.expr} + ${right.expr})")
+    override fun multiply(left: Expr, right: Expr): Expr = Expr("(${left.expr} * ${right.expr})")
+    override val zero: Expr = Expr("0")
+    override val one: Expr = Expr("1")
+    override fun divide(left: Expr, right: Expr): Expr = Expr("(${left.expr} / ${right.expr})")
+    override fun scale(a: Expr, value: Double): Expr = Expr("(${a.expr} / $value)")
+}
+
+class AlgebraicStubTest {
+    @Test
+    fun test_addMultipliedBySquaring_for_UInt() {
+        ExprRing {
+            assertEquals(
+                "57",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 0u).expr,
+                "tried addMultipliedBySquaring(57, 179, 0u)"
+            )
+            assertEquals(
+                "(57 + 179)",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 1u).expr,
+                "tried addMultipliedBySquaring(57, 179, 1u)"
+            )
+            assertEquals(
+                "(57 + (179 + 179))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 2u).expr,
+                "tried addMultipliedBySquaring(57, 179, 2u)"
+            )
+            assertEquals(
+                "((57 + 179) + (179 + 179))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 3u).expr,
+                "tried addMultipliedBySquaring(57, 179, 3u)"
+            )
+            assertEquals(
+                "(57 + ((179 + 179) + (179 + 179)))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 4u).expr,
+                "tried addMultipliedBySquaring(57, 179, 4u)"
+            )
+            assertEquals(
+                "((57 + 179) + ((179 + 179) + (179 + 179)))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 5u).expr,
+                "tried addMultipliedBySquaring(57, 179, 5u)"
+            )
+            assertEquals(
+                "((57 + (179 + 179)) + ((179 + 179) + (179 + 179)))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 6u).expr,
+                "tried addMultipliedBySquaring(57, 179, 6u)"
+            )
+            assertEquals(
+                "(((57 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179)))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 7u).expr,
+                "tried addMultipliedBySquaring(57, 179, 7u)"
+            )
+            assertEquals(
+                "(57 + (((179 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179))))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 8u).expr,
+                "tried addMultipliedBySquaring(57, 179, 8u)"
+            )
+        }
+    }
+    @Test
+    fun test_multiplyBySquaring_for_UInt() {
+        ExprRing {
+            assertEquals(
+                "0",
+                multiplyBySquaring(Expr("57"), 0u).expr,
+                "tried multiplyBySquaring(57, 0u)"
+            )
+            assertEquals(
+                "57",
+                multiplyBySquaring(Expr("57"), 1u).expr,
+                "tried multiplyBySquaring(57, 1u)"
+            )
+            assertEquals(
+                "(57 + 57)",
+                multiplyBySquaring(Expr("57"), 2u).expr,
+                "tried multiplyBySquaring(57, 2u)"
+            )
+            assertEquals(
+                "(57 + (57 + 57))",
+                multiplyBySquaring(Expr("57"), 3u).expr,
+                "tried multiplyBySquaring(57, 3u)"
+            )
+            assertEquals(
+                "((57 + 57) + (57 + 57))",
+                multiplyBySquaring(Expr("57"), 4u).expr,
+                "tried multiplyBySquaring(57, 4u)"
+            )
+            assertEquals(
+                "(57 + ((57 + 57) + (57 + 57)))",
+                multiplyBySquaring(Expr("57"), 5u).expr,
+                "tried multiplyBySquaring(57, 5u)"
+            )
+            assertEquals(
+                "((57 + 57) + ((57 + 57) + (57 + 57)))",
+                multiplyBySquaring(Expr("57"), 6u).expr,
+                "tried multiplyBySquaring(57, 6u)"
+            )
+            assertEquals(
+                "((57 + (57 + 57)) + ((57 + 57) + (57 + 57)))",
+                multiplyBySquaring(Expr("57"), 7u).expr,
+                "tried multiplyBySquaring(57, 7u)"
+            )
+            assertEquals(
+                "(((57 + 57) + (57 + 57)) + ((57 + 57) + (57 + 57)))",
+                multiplyBySquaring(Expr("57"), 8u).expr,
+                "tried multiplyBySquaring(57, 8u)"
+            )
+        }
+    }
+    @Test
+    fun test_addMultipliedBySquaring_for_Int() {
+        ExprRing {
+            assertEquals(
+                "57",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 0).expr,
+                "tried addMultipliedBySquaring(57, 179, 0)"
+            )
+            assertEquals(
+                "(57 + 179)",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 1).expr,
+                "tried addMultipliedBySquaring(57, 179, 1)"
+            )
+            assertEquals(
+                "(57 + -179)",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), -1).expr,
+                "tried addMultipliedBySquaring(57, 179, -1)"
+            )
+            assertEquals(
+                "(57 + (179 + 179))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 2).expr,
+                "tried addMultipliedBySquaring(57, 179, 2)"
+            )
+            assertEquals(
+                "(57 + (-179 + -179))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), -2).expr,
+                "tried addMultipliedBySquaring(57, 179, -2)"
+            )
+            assertEquals(
+                "((57 + 179) + (179 + 179))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 3).expr,
+                "tried addMultipliedBySquaring(57, 179, 3)"
+            )
+            assertEquals(
+                "((57 + -179) + (-179 + -179))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), -3).expr,
+                "tried addMultipliedBySquaring(57, 179, -3)"
+            )
+            assertEquals(
+                "(57 + ((179 + 179) + (179 + 179)))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 4).expr,
+                "tried addMultipliedBySquaring(57, 179, 4)"
+            )
+            assertEquals(
+                "(57 + ((-179 + -179) + (-179 + -179)))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), -4).expr,
+                "tried addMultipliedBySquaring(57, 179, -4)"
+            )
+            assertEquals(
+                "((57 + 179) + ((179 + 179) + (179 + 179)))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 5).expr,
+                "tried addMultipliedBySquaring(57, 179, 5)"
+            )
+            assertEquals(
+                "((57 + -179) + ((-179 + -179) + (-179 + -179)))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), -5).expr,
+                "tried addMultipliedBySquaring(57, 179, -5)"
+            )
+            assertEquals(
+                "((57 + (179 + 179)) + ((179 + 179) + (179 + 179)))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 6).expr,
+                "tried addMultipliedBySquaring(57, 179, 6)"
+            )
+            assertEquals(
+                "((57 + (-179 + -179)) + ((-179 + -179) + (-179 + -179)))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), -6).expr,
+                "tried addMultipliedBySquaring(57, 179, -6)"
+            )
+            assertEquals(
+                "(((57 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179)))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 7).expr,
+                "tried addMultipliedBySquaring(57, 179, 7)"
+            )
+            assertEquals(
+                "(((57 + -179) + (-179 + -179)) + ((-179 + -179) + (-179 + -179)))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), -7).expr,
+                "tried addMultipliedBySquaring(57, 179, -7)"
+            )
+            assertEquals(
+                "(57 + (((179 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179))))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), 8).expr,
+                "tried addMultipliedBySquaring(57, 179, 8)"
+            )
+            assertEquals(
+                "(57 + (((-179 + -179) + (-179 + -179)) + ((-179 + -179) + (-179 + -179))))",
+                addMultipliedBySquaring(Expr("57"), Expr("179"), -8).expr,
+                "tried addMultipliedBySquaring(57, 179, -8)"
+            )
+        }
+    }
+    @Test
+    fun test_multiplyBySquaring_for_Int() {
+        ExprRing {
+            assertEquals(
+                "0",
+                multiplyBySquaring(Expr("57"), 0).expr,
+                "tried multiplyBySquaring(57, 0)"
+            )
+            assertEquals(
+                "57",
+                multiplyBySquaring(Expr("57"), 1).expr,
+                "tried multiplyBySquaring(57, 1)"
+            )
+            assertEquals(
+                "-57",
+                multiplyBySquaring(Expr("57"), -1).expr,
+                "tried multiplyBySquaring(57, -1)"
+            )
+            assertEquals(
+                "(57 + 57)",
+                multiplyBySquaring(Expr("57"), 2).expr,
+                "tried multiplyBySquaring(57, 2)"
+            )
+            assertEquals(
+                "(-57 + -57)",
+                multiplyBySquaring(Expr("57"), -2).expr,
+                "tried multiplyBySquaring(57, -2)"
+            )
+            assertEquals(
+                "(57 + (57 + 57))",
+                multiplyBySquaring(Expr("57"), 3).expr,
+                "tried multiplyBySquaring(57, 3)"
+            )
+            assertEquals(
+                "(-57 + (-57 + -57))",
+                multiplyBySquaring(Expr("57"), -3).expr,
+                "tried multiplyBySquaring(57, -3)"
+            )
+            assertEquals(
+                "((57 + 57) + (57 + 57))",
+                multiplyBySquaring(Expr("57"), 4).expr,
+                "tried multiplyBySquaring(57, 4)"
+            )
+            assertEquals(
+                "((-57 + -57) + (-57 + -57))",
+                multiplyBySquaring(Expr("57"), -4).expr,
+                "tried multiplyBySquaring(57, -4)"
+            )
+            assertEquals(
+                "(57 + ((57 + 57) + (57 + 57)))",
+                multiplyBySquaring(Expr("57"), 5).expr,
+                "tried multiplyBySquaring(57, 5)"
+            )
+            assertEquals(
+                "(-57 + ((-57 + -57) + (-57 + -57)))",
+                multiplyBySquaring(Expr("57"), -5).expr,
+                "tried multiplyBySquaring(57, -5)"
+            )
+            assertEquals(
+                "((57 + 57) + ((57 + 57) + (57 + 57)))",
+                multiplyBySquaring(Expr("57"), 6).expr,
+                "tried multiplyBySquaring(57, 6)"
+            )
+            assertEquals(
+                "((-57 + -57) + ((-57 + -57) + (-57 + -57)))",
+                multiplyBySquaring(Expr("57"), -6).expr,
+                "tried multiplyBySquaring(57, -6)"
+            )
+            assertEquals(
+                "((57 + (57 + 57)) + ((57 + 57) + (57 + 57)))",
+                multiplyBySquaring(Expr("57"), 7).expr,
+                "tried multiplyBySquaring(57, 7)"
+            )
+            assertEquals(
+                "((-57 + (-57 + -57)) + ((-57 + -57) + (-57 + -57)))",
+                multiplyBySquaring(Expr("57"), -7).expr,
+                "tried multiplyBySquaring(57, -7)"
+            )
+            assertEquals(
+                "(((57 + 57) + (57 + 57)) + ((57 + 57) + (57 + 57)))",
+                multiplyBySquaring(Expr("57"), 8).expr,
+                "tried multiplyBySquaring(57, 8)"
+            )
+            assertEquals(
+                "(((-57 + -57) + (-57 + -57)) + ((-57 + -57) + (-57 + -57)))",
+                multiplyBySquaring(Expr("57"), -8).expr,
+                "tried multiplyBySquaring(57, -8)"
+            )
+        }
+    }
+    @Test
+    fun test_multiplyExponentiationBySquaring_for_UInt() {
+        ExprRing {
+            assertEquals(
+                "57",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 0u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 0u)"
+            )
+            assertEquals(
+                "(57 * 179)",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 1u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 1u)"
+            )
+            assertEquals(
+                "(57 * (179 * 179))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 2u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 2u)"
+            )
+            assertEquals(
+                "((57 * 179) * (179 * 179))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 3u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 3u)"
+            )
+            assertEquals(
+                "(57 * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 4u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 4u)"
+            )
+            assertEquals(
+                "((57 * 179) * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 5u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 5u)"
+            )
+            assertEquals(
+                "((57 * (179 * 179)) * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 6u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 6u)"
+            )
+            assertEquals(
+                "(((57 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 7u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 7u)"
+            )
+            assertEquals(
+                "(57 * (((179 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179))))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 8u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 8u)"
+            )
+        }
+    }
+    @Test
+    fun test_exponentiationBySquaring_for_UInt() {
+        ExprRing {
+            assertEquals(
+                "0",
+                exponentiationBySquaring(Expr("57"), 0u).expr,
+                "tried exponentiationBySquaring(57, 0u)"
+            )
+            assertEquals(
+                "57",
+                exponentiationBySquaring(Expr("57"), 1u).expr,
+                "tried exponentiationBySquaring(57, 1u)"
+            )
+            assertEquals(
+                "(57 * 57)",
+                exponentiationBySquaring(Expr("57"), 2u).expr,
+                "tried exponentiationBySquaring(57, 2u)"
+            )
+            assertEquals(
+                "(57 * (57 * 57))",
+                exponentiationBySquaring(Expr("57"), 3u).expr,
+                "tried exponentiationBySquaring(57, 3u)"
+            )
+            assertEquals(
+                "((57 * 57) * (57 * 57))",
+                exponentiationBySquaring(Expr("57"), 4u).expr,
+                "tried exponentiationBySquaring(57, 4u)"
+            )
+            assertEquals(
+                "(57 * ((57 * 57) * (57 * 57)))",
+                exponentiationBySquaring(Expr("57"), 5u).expr,
+                "tried exponentiationBySquaring(57, 5u)"
+            )
+            assertEquals(
+                "((57 * 57) * ((57 * 57) * (57 * 57)))",
+                exponentiationBySquaring(Expr("57"), 6u).expr,
+                "tried exponentiationBySquaring(57, 6u)"
+            )
+            assertEquals(
+                "((57 * (57 * 57)) * ((57 * 57) * (57 * 57)))",
+                exponentiationBySquaring(Expr("57"), 7u).expr,
+                "tried exponentiationBySquaring(57, 7u)"
+            )
+            assertEquals(
+                "(((57 * 57) * (57 * 57)) * ((57 * 57) * (57 * 57)))",
+                exponentiationBySquaring(Expr("57"), 8u).expr,
+                "tried exponentiationBySquaring(57, 8u)"
+            )
+        }
+    }
+    @Test
+    fun test_multiplyExponentiationBySquaring_for_Int() {
+        ExprRing {
+            assertEquals(
+                "57",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 0).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 0)"
+            )
+            assertEquals(
+                "(57 * 179)",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 1).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 1)"
+            )
+            assertEquals(
+                "(57 * (1 / 179))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -1).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -1)"
+            )
+            assertEquals(
+                "(57 * (179 * 179))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 2).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 2)"
+            )
+            assertEquals(
+                "(57 * ((1 / 179) * (1 / 179)))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -2).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -2)"
+            )
+            assertEquals(
+                "((57 * 179) * (179 * 179))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 3).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 3)"
+            )
+            assertEquals(
+                "((57 * (1 / 179)) * ((1 / 179) * (1 / 179)))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -3).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -3)"
+            )
+            assertEquals(
+                "(57 * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 4).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 4)"
+            )
+            assertEquals(
+                "(57 * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -4).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -4)"
+            )
+            assertEquals(
+                "((57 * 179) * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 5).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 5)"
+            )
+            assertEquals(
+                "((57 * (1 / 179)) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -5).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -5)"
+            )
+            assertEquals(
+                "((57 * (179 * 179)) * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 6).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 6)"
+            )
+            assertEquals(
+                "((57 * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -6).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -6)"
+            )
+            assertEquals(
+                "(((57 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 7).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 7)"
+            )
+            assertEquals(
+                "(((57 * (1 / 179)) * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -7).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -7)"
+            )
+            assertEquals(
+                "(57 * (((179 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179))))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 8).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 8)"
+            )
+            assertEquals(
+                "(57 * ((((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179)))))",
+                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -8).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -8)"
+            )
+        }
+    }
+    @Test
+    fun test_exponentiationBySquaring_for_Int() {
+        ExprRing {
+            assertEquals(
+                "0",
+                exponentiationBySquaring(Expr("57"), 0).expr,
+                "tried exponentiationBySquaring(57, 0)"
+            )
+            assertEquals(
+                "57",
+                exponentiationBySquaring(Expr("57"), 1).expr,
+                "tried exponentiationBySquaring(57, 1)"
+            )
+            assertEquals(
+                "(1 / 57)",
+                exponentiationBySquaring(Expr("57"), -1).expr,
+                "tried exponentiationBySquaring(57, -1)"
+            )
+            assertEquals(
+                "(57 * 57)",
+                exponentiationBySquaring(Expr("57"), 2).expr,
+                "tried exponentiationBySquaring(57, 2)"
+            )
+            assertEquals(
+                "((1 / 57) * (1 / 57))",
+                exponentiationBySquaring(Expr("57"), -2).expr,
+                "tried exponentiationBySquaring(57, -2)"
+            )
+            assertEquals(
+                "(57 * (57 * 57))",
+                exponentiationBySquaring(Expr("57"), 3).expr,
+                "tried exponentiationBySquaring(57, 3)"
+            )
+            assertEquals(
+                "((1 / 57) * ((1 / 57) * (1 / 57)))",
+                exponentiationBySquaring(Expr("57"), -3).expr,
+                "tried exponentiationBySquaring(57, -3)"
+            )
+            assertEquals(
+                "((57 * 57) * (57 * 57))",
+                exponentiationBySquaring(Expr("57"), 4).expr,
+                "tried exponentiationBySquaring(57, 4)"
+            )
+            assertEquals(
+                "(((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57)))",
+                exponentiationBySquaring(Expr("57"), -4).expr,
+                "tried exponentiationBySquaring(57, -4)"
+            )
+            assertEquals(
+                "(57 * ((57 * 57) * (57 * 57)))",
+                exponentiationBySquaring(Expr("57"), 5).expr,
+                "tried exponentiationBySquaring(57, 5)"
+            )
+            assertEquals(
+                "((1 / 57) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
+                exponentiationBySquaring(Expr("57"), -5).expr,
+                "tried exponentiationBySquaring(57, -5)"
+            )
+            assertEquals(
+                "((57 * 57) * ((57 * 57) * (57 * 57)))",
+                exponentiationBySquaring(Expr("57"), 6).expr,
+                "tried exponentiationBySquaring(57, 6)"
+            )
+            assertEquals(
+                "(((1 / 57) * (1 / 57)) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
+                exponentiationBySquaring(Expr("57"), -6).expr,
+                "tried exponentiationBySquaring(57, -6)"
+            )
+            assertEquals(
+                "((57 * (57 * 57)) * ((57 * 57) * (57 * 57)))",
+                exponentiationBySquaring(Expr("57"), 7).expr,
+                "tried exponentiationBySquaring(57, 7)"
+            )
+            assertEquals(
+                "(((1 / 57) * ((1 / 57) * (1 / 57))) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
+                exponentiationBySquaring(Expr("57"), -7).expr,
+                "tried exponentiationBySquaring(57, -7)"
+            )
+            assertEquals(
+                "(((57 * 57) * (57 * 57)) * ((57 * 57) * (57 * 57)))",
+                exponentiationBySquaring(Expr("57"), 8).expr,
+                "tried exponentiationBySquaring(57, 8)"
+            )
+            assertEquals(
+                "((((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
+                exponentiationBySquaring(Expr("57"), -8).expr,
+                "tried exponentiationBySquaring(57, -8)"
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
index e0f0e32a4..a11242b2a 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
@@ -12,11 +12,12 @@ import kotlin.test.assertEquals
 class PolynomialTest {
     @Test
     fun simple_polynomial_test() {
+        val polynomial : Polynomial<Double>
         Double.algebra.scalablePolynomial {
             val x = Polynomial(listOf(0.0, 1.0))
-            val polynomial = x * x - 2 * x + 1
-            assertEquals(0.0, polynomial.substitute(1.0), 0.001)
+            polynomial = x * x - 2 * x + 1
         }
+        assertEquals(0.0, polynomial.substitute(1.0), 0.001)
     }
     @Test
     fun testIntegration() {
-- 
2.34.1


From 39640498fc93f4ca5adc4c439c641d5aeb4510cb Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 19 Mar 2022 09:20:32 +0300
Subject: [PATCH 454/713] Another histogram refactor

---
 build.gradle.kts                              |  2 +-
 buildSrc/gradle.properties                    |  2 +-
 .../kmath/domains/HyperSquareDomain.kt        | 11 ++++-
 .../kmath/histogram/DoubleHistogramSpace.kt   | 46 +++++++++++--------
 .../kmath/histogram/IndexedHistogramSpace.kt  | 20 ++++----
 .../kmath/histogram/UnivariateHistogram.kt    | 20 --------
 .../kmath/histogram/TreeHistogramSpace.kt     | 22 ++++++++-
 .../kmath/histogram/TreeHistogramTest.kt      |  2 +-
 8 files changed, 71 insertions(+), 54 deletions(-)
 rename kmath-histograms/src/{jvmMain => commonMain}/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt (71%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3372d505d..ee77f32df 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-20"
+    version = "0.3.0-dev-21"
 }
 
 subprojects {
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 05486d4f6..713f9bcd9 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -5,4 +5,4 @@
 
 kotlin.code.style=official
 
-toolsVersion=0.11.1-kotlin-1.6.10
+toolsVersion=0.11.2-kotlin-1.6.10
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
index bd5514623..2fac442e7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.domains
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.indices
 
 /**
@@ -16,9 +17,17 @@ import space.kscience.kmath.structures.indices
  * @author Alexander Nozik
  */
 @UnstableKMathAPI
-public class HyperSquareDomain(private val lower: Buffer<Double>, private val upper: Buffer<Double>) : DoubleDomain {
+public class HyperSquareDomain(public val lower: Buffer<Double>, public val upper: Buffer<Double>) : DoubleDomain {
+    init {
+        require(lower.size == upper.size) {
+            "Domain borders size mismatch. Lower borders size is ${lower.size}, but upper borders size is ${upper.size}"
+        }
+    }
+
     override val dimension: Int get() = lower.size
 
+    public val center: DoubleBuffer get() = DoubleBuffer(dimension) { (lower[it] + upper[it]) / 2.0 }
+
     override operator fun contains(point: Point<Double>): Boolean = point.indices.all { i ->
         point[i] in lower[i]..upper[i]
     }
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
index 61d0b9f33..27f04d60b 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.histogram
 
-import space.kscience.kmath.domains.Domain
 import space.kscience.kmath.domains.HyperSquareDomain
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
@@ -13,6 +12,9 @@ import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.*
 import kotlin.math.floor
 
+/**
+ * Multivariate histogram space for hyper-square real-field bins.
+ */
 public class DoubleHistogramSpace(
     private val lower: Buffer<Double>,
     private val upper: Buffer<Double>,
@@ -47,7 +49,7 @@ public class DoubleHistogramSpace(
     }
 
     @OptIn(UnstableKMathAPI::class)
-    override fun getDomain(index: IntArray): Domain<Double> {
+    override fun getDomain(index: IntArray): HyperSquareDomain {
         val lowerBoundary = index.mapIndexed { axis, i ->
             when (i) {
                 0 -> Double.NEGATIVE_INFINITY
@@ -67,8 +69,13 @@ public class DoubleHistogramSpace(
         return HyperSquareDomain(lowerBoundary, upperBoundary)
     }
 
+    @OptIn(UnstableKMathAPI::class)
+    public val Bin<Double>.domain: HyperSquareDomain
+        get() = (this as? DomainBin<Double>)?.domain as? HyperSquareDomain
+            ?: error("Im a teapot. This is not my bin")
 
-    override fun produceBin(index: IntArray, value: Double): Bin<Double> {
+    @OptIn(UnstableKMathAPI::class)
+    override fun produceBin(index: IntArray, value: Double): DomainBin<Double> {
         val domain = getDomain(index)
         return DomainBin(domain, value)
     }
@@ -96,7 +103,9 @@ public class DoubleHistogramSpace(
          *)
          *```
          */
-        public fun fromRanges(vararg ranges: ClosedFloatingPointRange<Double>): DoubleHistogramSpace = DoubleHistogramSpace(
+        public fun fromRanges(
+            vararg ranges: ClosedFloatingPointRange<Double>,
+        ): DoubleHistogramSpace = DoubleHistogramSpace(
             ranges.map(ClosedFloatingPointRange<Double>::start).asBuffer(),
             ranges.map(ClosedFloatingPointRange<Double>::endInclusive).asBuffer()
         )
@@ -110,21 +119,22 @@ public class DoubleHistogramSpace(
          *)
          *```
          */
-        public fun fromRanges(vararg ranges: Pair<ClosedFloatingPointRange<Double>, Int>): DoubleHistogramSpace =
-            DoubleHistogramSpace(
-                ListBuffer(
-                    ranges
-                        .map(Pair<ClosedFloatingPointRange<Double>, Int>::first)
-                        .map(ClosedFloatingPointRange<Double>::start)
-                ),
+        public fun fromRanges(
+            vararg ranges: Pair<ClosedFloatingPointRange<Double>, Int>,
+        ): DoubleHistogramSpace = DoubleHistogramSpace(
+            ListBuffer(
+                ranges
+                    .map(Pair<ClosedFloatingPointRange<Double>, Int>::first)
+                    .map(ClosedFloatingPointRange<Double>::start)
+            ),
 
-                ListBuffer(
-                    ranges
-                        .map(Pair<ClosedFloatingPointRange<Double>, Int>::first)
-                        .map(ClosedFloatingPointRange<Double>::endInclusive)
-                ),
+            ListBuffer(
+                ranges
+                    .map(Pair<ClosedFloatingPointRange<Double>, Int>::first)
+                    .map(ClosedFloatingPointRange<Double>::endInclusive)
+            ),
 
-                ranges.map(Pair<ClosedFloatingPointRange<Double>, Int>::second).toIntArray()
-            )
+            ranges.map(Pair<ClosedFloatingPointRange<Double>, Int>::second).toIntArray()
+        )
     }
 }
\ No newline at end of file
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
index 9275c1c5e..bfacebb43 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
@@ -7,7 +7,6 @@ package space.kscience.kmath.histogram
 
 import space.kscience.kmath.domains.Domain
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.DefaultStrides
 import space.kscience.kmath.nd.FieldND
 import space.kscience.kmath.nd.Shape
@@ -24,22 +23,21 @@ public data class DomainBin<in T : Comparable<T>>(
     override val value: Number,
 ) : Bin<T>, Domain<T> by domain
 
-@OptIn(UnstableKMathAPI::class)
 public class IndexedHistogram<T : Comparable<T>, V : Any>(
-    public val context: IndexedHistogramSpace<T, V>,
+    public val histogramSpace: IndexedHistogramSpace<T, V>,
     public val values: StructureND<V>,
 ) : Histogram<T, Bin<T>> {
 
     override fun get(point: Point<T>): Bin<T>? {
-        val index = context.getIndex(point) ?: return null
-        return context.produceBin(index, values[index])
+        val index = histogramSpace.getIndex(point) ?: return null
+        return histogramSpace.produceBin(index, values[index])
     }
 
-    override val dimension: Int get() = context.shape.size
+    override val dimension: Int get() = histogramSpace.shape.size
 
     override val bins: Iterable<Bin<T>>
-        get() = DefaultStrides(context.shape).asSequence().map {
-            context.produceBin(it, values[it])
+        get() = DefaultStrides(histogramSpace.shape).asSequence().map {
+            histogramSpace.produceBin(it, values[it])
         }.asIterable()
 }
 
@@ -67,13 +65,13 @@ public interface IndexedHistogramSpace<T : Comparable<T>, V : Any>
     public fun produce(builder: HistogramBuilder<T>.() -> Unit): IndexedHistogram<T, V>
 
     override fun add(left: IndexedHistogram<T, V>, right: IndexedHistogram<T, V>): IndexedHistogram<T, V> {
-        require(left.context == this) { "Can't operate on a histogram produced by external space" }
-        require(right.context == this) { "Can't operate on a histogram produced by external space" }
+        require(left.histogramSpace == this) { "Can't operate on a histogram produced by external space" }
+        require(right.histogramSpace == this) { "Can't operate on a histogram produced by external space" }
         return IndexedHistogram(this, histogramValueSpace { left.values + right.values })
     }
 
     override fun scale(a: IndexedHistogram<T, V>, value: Double): IndexedHistogram<T, V> {
-        require(a.context == this) { "Can't operate on a histogram produced by external space" }
+        require(a.histogramSpace == this) { "Can't operate on a histogram produced by external space" }
         return IndexedHistogram(this, histogramValueSpace { a.values * value })
     }
 
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
similarity index 71%
rename from kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
rename to kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
index ac0576a8e..69ea83ae3 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
@@ -37,26 +37,6 @@ public class UnivariateBin(
 public interface UnivariateHistogram : Histogram<Double, UnivariateBin> {
     public operator fun get(value: Double): UnivariateBin?
     override operator fun get(point: Buffer<Double>): UnivariateBin? = get(point[0])
-
-    public companion object {
-        /**
-         * Build and fill a [UnivariateHistogram]. Returns a read-only histogram.
-         */
-        public inline fun uniform(
-            binSize: Double,
-            start: Double = 0.0,
-            builder: UnivariateHistogramBuilder.() -> Unit,
-        ): UnivariateHistogram = TreeHistogramSpace.uniform(binSize, start).fill(builder)
-
-        /**
-         * Build and fill a histogram with custom borders. Returns a read-only histogram.
-         */
-        public inline fun custom(
-            borders: DoubleArray,
-            builder: UnivariateHistogramBuilder.() -> Unit,
-        ): UnivariateHistogram = TreeHistogramSpace.custom(borders).fill(builder)
-
-    }
 }
 
 @UnstableKMathAPI
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
index 0853615e6..1ab49003c 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
@@ -49,7 +49,9 @@ internal class TreeHistogramBuilder(val binFactory: (Double) -> UnivariateDomain
     fun createBin(value: Double): BinCounter {
         val binDefinition = binFactory(value)
         val newBin = BinCounter(binDefinition)
-        synchronized(this) { bins[binDefinition.center] = newBin }
+        synchronized(this) {
+            bins[binDefinition.center] = newBin
+        }
         return newBin
     }
 
@@ -131,6 +133,24 @@ public class TreeHistogramSpace(
     override val zero: UnivariateHistogram by lazy { fill { } }
 
     public companion object {
+        /**
+         * Build and fill a [UnivariateHistogram]. Returns a read-only histogram.
+         */
+        public inline fun uniform(
+            binSize: Double,
+            start: Double = 0.0,
+            builder: UnivariateHistogramBuilder.() -> Unit,
+        ): UnivariateHistogram = uniform(binSize, start).fill(builder)
+
+        /**
+         * Build and fill a histogram with custom borders. Returns a read-only histogram.
+         */
+        public inline fun custom(
+            borders: DoubleArray,
+            builder: UnivariateHistogramBuilder.() -> Unit,
+        ): UnivariateHistogram = custom(borders).fill(builder)
+
+
         /**
          * Build and fill a [UnivariateHistogram]. Returns a read-only histogram.
          */
diff --git a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
index 28a1b03cb..f1a8f953b 100644
--- a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
+++ b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
@@ -13,7 +13,7 @@ class TreeHistogramTest {
 
     @Test
     fun normalFill() {
-        val histogram = UnivariateHistogram.uniform(0.1) {
+        val histogram = TreeHistogramSpace.uniform(0.1) {
             repeat(100_000) {
                 putValue(Random.nextDouble())
             }
-- 
2.34.1


From a965f5683f055daf20058f81e62fc8cc16e48141 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 19 Mar 2022 16:54:30 +0300
Subject: [PATCH 455/713] Added some tests and some utilities for tests. Fixed
 bug in utility of PolynomialSpace.

---
 .../kscience/kmath/functions/Polynomial.kt    |   8 +-
 .../kmath/functions/PolynomialTest.kt         |  67 +++
 .../kscience/kmath/test/misc/Rational.kt      | 387 ++++++++++++++++++
 .../test/misc/RationalWithMemorization.kt     | 113 +++++
 .../kscience/kmath/test/misc/memorization.kt  |  51 +++
 .../space/kscience/kmath/test/misc/misc.kt    |  25 ++
 6 files changed, 647 insertions(+), 4 deletions(-)
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index a60ca563a..3f0d073b3 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -447,7 +447,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
             callsInPlace(block, InvocationKind.EXACTLY_ONCE)
         }
         block()
-        while (elementAt(lastIndex).isZero()) removeAt(lastIndex)
+        while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex)
         return this
     }
     internal inline fun List<C>.applyAndRemoveZeros(block: MutableList<C>.() -> Unit) : List<C> =
@@ -456,7 +456,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     internal inline fun MutableCoefficients(size: Int, init: (index: Int) -> C): MutableList<C> {
         val list = ArrayList<C>(size)
         repeat(size) { index -> list.add(init(index)) }
-        with(list) { while (elementAt(lastIndex).isZero()) removeAt(lastIndex) }
+        with(list) { while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex) }
         return list
     }
     @Suppress("FunctionName")
@@ -466,7 +466,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
         return buildList {
             builderAction()
-            while (elementAt(lastIndex).isZero()) removeAt(lastIndex)
+            while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex)
         }
     }
     @OptIn(ExperimentalTypeInference::class)
@@ -474,7 +474,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
         return buildList(capacity) {
             builderAction()
-            while (elementAt(lastIndex).isZero()) removeAt(lastIndex)
+            while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex)
         }
     }
 }
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
index a11242b2a..9e3dea615 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
@@ -5,11 +5,78 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.operations.BigInt
 import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.toBigInt
+import space.kscience.kmath.test.misc.Rational
+import space.kscience.kmath.test.misc.RationalField
+import space.kscience.kmath.test.misc.gcd
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class PolynomialTest {
+    @Test
+    fun test_Polynomial_Polynomial_plus() {
+        RationalField.polynomial {
+            // (5/9 - 8/9 x - 8/7 x^2) + (-5/7 + 5/1 x + 5/8 x^2) ?= -10/63 + 37/9 x - 29/56 x^2
+            assertEquals(
+                Polynomial(Rational(-10, 63), Rational(37, 9), Rational(-29, 56)),
+                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) +
+                        Polynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
+                "test 1"
+            )
+            // (-2/9 - 8/3 x) + (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 5/12 x + 2/4 x^2
+            assertEquals(
+                Polynomial(Rational(-2, 9), Rational(-5, 12), Rational(2, 4)),
+                Polynomial(Rational(-2, 9), Rational(-8, 3)) +
+                        Polynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
+                "test 2"
+            )
+            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) + (-6/3 - 7/2 x + 2/3 x^2) ?= -18/7 - 23/6 x + 2/3 x^2
+            assertEquals(
+                Polynomial(Rational(-18, 7), Rational(-23, 6), Rational(2, 3)),
+                Polynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) +
+                        Polynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
+                "test 3"
+            )
+            // (-2/4 - 6/9 x - 4/9 x^2) + (2/4 + 6/9 x + 4/9 x^2) ?= 0
+            assertEquals(
+                Polynomial(),
+                Polynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) +
+                        Polynomial(Rational(2, 4), Rational(6, 9), Rational(4, 9)),
+                "test 4"
+            )
+        }
+    }
+//    @Test
+//    fun test_Polynomial_Polynomial_minus() {
+//        RationalField.polynomial {
+//            assertEquals(
+//                Polynomial(Rational(1, 2), Rational(3, 5), Rational(-2)) +
+//                        Polynomial(Rational(3), Rational(7, 8), Rational(1, 9)),
+//                Polynomial(Rational(7, 2), Rational(59, 40), Rational(-17, 9)),
+//                "test 1"
+//            )
+//            assertEquals(
+//                Polynomial(Rational(1, 2), Rational(3, 5)) +
+//                        Polynomial(Rational(3), Rational(7, 8), Rational(1, 9)),
+//                Polynomial(Rational(7, 2), Rational(59, 40), Rational(1, 9)),
+//                "test 2"
+//            )
+//            assertEquals(
+//                Polynomial(Rational(1, 2), Rational(3, 5), Rational(0), Rational(0)) +
+//                        Polynomial(Rational(3), Rational(7, 8), Rational(1, 9)),
+//                Polynomial(Rational(7, 2), Rational(59, 40), Rational(1, 9)),
+//                "test 3"
+//            )
+//            assertEquals(
+//                Polynomial(Rational(1, 2), Rational(-3, 5), Rational(7, 3)) +
+//                        Polynomial(Rational(3), Rational(3, 5), Rational(-7, 3)),
+//                Polynomial(Rational(7, 2)),
+//                "test 4"
+//            )
+//        }
+//    }
     @Test
     fun simple_polynomial_test() {
         val polynomial : Polynomial<Double>
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
new file mode 100644
index 000000000..fad13f88a
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
@@ -0,0 +1,387 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.test.misc
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.BigInt
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.NumbersAddOps
+import space.kscience.kmath.operations.toBigInt
+import space.kscience.kmath.operations.BigInt.Companion.ZERO as I0
+import space.kscience.kmath.operations.BigInt.Companion.ONE as I1
+
+/**
+ * The class represents rational numbers.
+ *
+ * Instances contain [numerator] and [denominator] represented as [Long].
+ *
+ * Also [numerator] and [denominator] are coprime and [denominator] is positive.
+ *
+ * @author [Gleb Minaev](https://github.com/lounres)
+ */
+public class Rational: Comparable<Rational> {
+    public companion object {
+        /**
+         * Constant containing the zero (the additive identity) of the [Rational] field.
+         */
+        public val ZERO: Rational = Rational(I0)
+        /**
+         * Constant containing the one (the multiplicative identity) of the [Rational] field.
+         */
+        public val ONE: Rational = Rational(I1)
+    }
+
+    /**
+     * Numerator of the fraction. It's stored as non-negative coprime with [denominator] integer.
+     */
+    public val numerator: BigInt
+    /**
+     * Denominator of the fraction. It's stored as non-zero coprime with [numerator] integer.
+     */
+    public val denominator: BigInt
+
+    /**
+     * If [toCheckInput] is `true` before assigning values to [Rational.numerator] and [Rational.denominator] makes them coprime and makes
+     * denominator positive. Otherwise, just assigns the values.
+     *
+     * @throws ArithmeticException If denominator is zero.
+     */
+    internal constructor(numerator: BigInt, denominator: BigInt, toCheckInput: Boolean = true) {
+        if (toCheckInput) {
+            if (denominator == I0) throw ArithmeticException("/ by zero")
+
+            val greatestCommonDivider = gcd(numerator, denominator).let { if (denominator < I0) -it else it }
+
+            this.numerator = numerator / greatestCommonDivider
+            this.denominator = denominator / greatestCommonDivider
+        } else {
+            this.numerator = numerator
+            this.denominator = denominator
+        }
+    }
+
+    /**
+     * Before assigning values to [Rational.numerator] and [Rational.denominator] makes them coprime and makes
+     * denominator positive.
+     *
+     * @throws ArithmeticException If denominator is zero.
+     */
+    public constructor(numerator: BigInt, denominator: BigInt) : this(numerator, denominator, true)
+    public constructor(numerator: Int, denominator: BigInt) : this(numerator.toBigInt(), denominator, true)
+    public constructor(numerator: Long, denominator: BigInt) : this(numerator.toBigInt(), denominator, true)
+    public constructor(numerator: BigInt, denominator: Int) : this(numerator, denominator.toBigInt(), true)
+    public constructor(numerator: BigInt, denominator: Long) : this(numerator, denominator.toBigInt(), true)
+    public constructor(numerator: Int, denominator: Int) : this(numerator.toBigInt(), denominator.toBigInt(), true)
+    public constructor(numerator: Int, denominator: Long) : this(numerator.toBigInt(), denominator.toBigInt(), true)
+    public constructor(numerator: Long, denominator: Int) : this(numerator.toBigInt(), denominator.toBigInt(), true)
+    public constructor(numerator: Long, denominator: Long) : this(numerator.toBigInt(), denominator.toBigInt(), true)
+    public constructor(numerator: BigInt) : this(numerator, I1, false)
+    public constructor(numerator: Int) : this(numerator.toBigInt(), I1, false)
+    public constructor(numerator: Long) : this(numerator.toBigInt(), I1, false)
+
+    /**
+     * Returns the same instant.
+     */
+    public operator fun unaryPlus(): Rational = this
+
+    /**
+     * Returns negation of the instant of [Rational] field.
+     */
+    public operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
+
+    /**
+     * Returns sum of the instants of [Rational] field.
+     */
+    public operator fun plus(other: Rational): Rational =
+        Rational(
+            numerator * other.denominator + denominator * other.numerator,
+            denominator * other.denominator
+        )
+
+    /**
+     * Returns sum of the instants of [Rational] field. [other] is represented as [Rational].
+     */
+    public operator fun plus(other: BigInt): Rational =
+        Rational(
+            numerator + denominator * other,
+            denominator
+        )
+
+    /**
+     * Returns sum of the instants of [Rational] field. [other] is represented as [Rational].
+     */
+    public operator fun plus(other: Int): Rational =
+        Rational(
+            numerator + denominator * other.toBigInt(),
+            denominator
+        )
+
+    /**
+     * Returns sum of the instants of [Rational] field. [other] is represented as [Rational].
+     */
+    public operator fun plus(other: Long): Rational =
+        Rational(
+            numerator + denominator * other.toBigInt(),
+            denominator
+        )
+
+    /**
+     * Returns difference of the instants of [Rational] field.
+     */
+    public operator fun minus(other: Rational): Rational =
+        Rational(
+            numerator * other.denominator - denominator * other.numerator,
+            denominator * other.denominator
+        )
+
+    /**
+     * Returns difference of the instants of [Rational] field. [other] is represented as [Rational].
+     */
+    public operator fun minus(other: BigInt): Rational =
+        Rational(
+            numerator - denominator * other,
+            denominator
+        )
+
+    /**
+     * Returns difference of the instants of [Rational] field. [other] is represented as [Rational].
+     */
+    public operator fun minus(other: Int): Rational =
+        Rational(
+            numerator - denominator * other.toBigInt(),
+            denominator
+        )
+
+    /**
+     * Returns difference of the instants of [Rational] field. [other] is represented as [Rational].
+     */
+    public operator fun minus(other: Long): Rational =
+        Rational(
+            numerator - denominator * other.toBigInt(),
+            denominator
+        )
+
+    /**
+     * Returns product of the instants of [Rational] field.
+     */
+    public operator fun times(other: Rational): Rational =
+        Rational(
+            numerator * other.numerator,
+            denominator * other.denominator
+        )
+
+    /**
+     * Returns product of the instants of [Rational] field. [other] is represented as [Rational].
+     */
+    public operator fun times(other: BigInt): Rational =
+        Rational(
+            numerator * other,
+            denominator
+        )
+
+    /**
+     * Returns product of the instants of [Rational] field. [other] is represented as [Rational].
+     */
+    public operator fun times(other: Int): Rational =
+        Rational(
+            numerator * other.toBigInt(),
+            denominator
+        )
+
+    /**
+     * Returns product of the instants of [Rational] field. [other] is represented as [Rational].
+     */
+    public operator fun times(other: Long): Rational =
+        Rational(
+            numerator * other.toBigInt(),
+            denominator
+        )
+
+    /**
+     * Returns quotient of the instants of [Rational] field.
+     *
+     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
+     */
+    public operator fun div(other: Rational): Rational =
+        Rational(
+            numerator * other.denominator,
+            denominator * other.numerator
+        )
+
+    /**
+     * Returns quotient of the instants of [Rational] field. [other] is represented as [Rational].
+     *
+     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
+     */
+    public operator fun div(other: BigInt): Rational =
+        Rational(
+            numerator,
+            denominator * other
+        )
+
+    /**
+     * Returns quotient of the instants of [Rational] field. [other] is represented as [Rational].
+     *
+     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
+     */
+    public operator fun div(other: Int): Rational =
+        Rational(
+            numerator,
+            denominator * other.toBigInt()
+        )
+
+    /**
+     * Returns quotient of the instants of [Rational] field. [other] is represented as [Rational].
+     *
+     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
+     */
+    public operator fun div(other: Long): Rational =
+        Rational(
+            numerator,
+            denominator * other.toBigInt()
+        )
+
+    /**
+     * Returns reminder from integral division.
+     *
+     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
+     */
+    public operator fun rem(other: Rational): Rational =
+        Rational(
+            (numerator * other.denominator) % (denominator * other.numerator),
+            denominator * other.denominator
+        )
+
+    /**
+     * Returns reminder from integral division.
+     *
+     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
+     */
+    public operator fun rem(other: BigInt): Rational =
+        Rational(
+            numerator % denominator * other,
+            denominator * other
+        )
+
+    /**
+     * Returns reminder from integral division.
+     *
+     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
+     */
+    public operator fun rem(other: Int): Rational =
+        Rational(
+            numerator % denominator * other.toBigInt(),
+            denominator * other.toBigInt()
+        )
+
+    /**
+     * Returns reminder from integral division.
+     *
+     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
+     */
+    public operator fun rem(other: Long): Rational =
+        Rational(
+            numerator % denominator * other.toBigInt(),
+            denominator * other.toBigInt()
+        )
+
+    /**
+     * Checks equality of the instance to [other].
+     *
+     * [BigInt], [Int] and [Long] values are also checked as Rational ones.
+     */
+    override fun equals(other: Any?): Boolean =
+        when (other) {
+            is Rational -> numerator == other.numerator && denominator == other.denominator
+            is BigInt -> numerator == other && denominator == I1
+            is Int -> numerator == other && denominator == I1
+            is Long -> numerator == other && denominator == I1
+            else -> false
+        }
+
+    /**
+     * Compares the instance to [other] as [Comparable.compareTo].
+     *
+     * @see Comparable.compareTo
+     */
+    override operator fun compareTo(other: Rational): Int = (numerator * other.denominator).compareTo(other.numerator * denominator)
+
+    /**
+     * Compares the instance to [other] as [Comparable.compareTo].
+     *
+     * [Integer] values are also checked as Rational ones.
+     *
+     * @see Comparable.compareTo
+     */
+    public operator fun compareTo(other: BigInt): Int = (numerator).compareTo(denominator * other)
+
+    /**
+     * Compares the instance to [other] as [Comparable.compareTo].
+     *
+     * [Int] values are also checked as Rational ones.
+     *
+     * @see Comparable.compareTo
+     */
+    public operator fun compareTo(other: Int): Int = (numerator).compareTo(denominator * other.toBigInt())
+
+    /**
+     * Compares the instance to [other] as [Comparable.compareTo].
+     *
+     * [Long] values are also checked as Rational ones.
+     *
+     * @see Comparable.compareTo
+     */
+    public operator fun compareTo(other: Long): Int = (numerator).compareTo(denominator * other.toBigInt())
+
+    public override fun hashCode(): Int = 31 * numerator.hashCode() + denominator.hashCode()
+
+//    /** Creates a range from this value to the specified [other] value. */
+//    operator fun rangeTo(other: JBInt) = ClosedRationalRange(this, other.toRational())
+//    /** Creates a range from this value to the specified [other] value. */
+//    operator fun rangeTo(other: Rational) = ClosedRationalRange(this, other)
+//    /** Creates a range from this value to the specified [other] value. */
+//    operator fun rangeTo(other: Int) = ClosedRationalRange(this, other.toRational())
+//    /** Creates a range from this value to the specified [other] value. */
+//    operator fun rangeTo(other: Long) = ClosedRationalRange(this, other.toRational())
+
+    public fun toRational(): Rational = this
+
+    public fun toBigInt(): BigInt = numerator / denominator
+
+//    public fun toInt(): Int = (numerator / denominator).toInt()
+//
+//    public fun toLong(): Long = (numerator / denominator).toLong()
+//
+//    public fun toDouble(): Double = (numerator.toDouble() / denominator.toDouble())
+//
+//    public fun toFloat(): Float = (numerator.toFloat() / denominator.toFloat())
+
+    public override fun toString(): String = if (denominator == I1) "$numerator" else "$numerator/$denominator"
+}
+
+
+/**
+ * Algebraic structure for rational numbers.
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@OptIn(UnstableKMathAPI::class)
+public object RationalField : Field<Rational>, NumbersAddOps<Rational> {
+    override inline val zero: Rational get() = Rational.ZERO
+    override inline val one: Rational get() = Rational.ONE
+
+    override inline fun number(value: Number): Rational = Rational(value.toLong())
+
+    override inline fun add(left: Rational, right: Rational): Rational = left + right
+    override inline fun multiply(left: Rational, right: Rational): Rational = left * right
+    override inline fun divide(left: Rational, right: Rational): Rational = left / right
+    override inline fun scale(a: Rational, value: Double): Rational = a * number(value)
+
+    override inline fun Rational.unaryMinus(): Rational = -this
+    override inline fun Rational.plus(arg: Rational): Rational = this + arg
+    override inline fun Rational.minus(arg: Rational): Rational = this - arg
+    override inline fun Rational.times(arg: Rational): Rational = this * arg
+    override inline fun Rational.div(arg: Rational): Rational = this / arg
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
new file mode 100644
index 000000000..6aa5ecc09
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.test.misc
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
+
+class RationalWithMemorization private constructor(
+    val value: Rational,
+    override val memory : OperationsMemory
+): WithMemorization {
+    public companion object {
+        /**
+         * Constant containing the zero (the additive identity) of the [Rational] field.
+         */
+        public val ZERO: RationalWithMemorization = RationalWithMemorization(Rational.ZERO, object : Endpoint {})
+        /**
+         * Constant containing the one (the multiplicative identity) of the [Rational] field.
+         */
+        public val ONE: RationalWithMemorization = RationalWithMemorization(Rational.ONE, object : Endpoint {})
+    }
+    public constructor(numerator: BigInt, denominator: BigInt) : this(Rational(numerator, denominator), object : Endpoint {})
+    public constructor(numerator: Int, denominator: BigInt) : this(Rational(numerator, denominator), object : Endpoint {})
+    public constructor(numerator: Long, denominator: BigInt) : this(Rational(numerator, denominator), object : Endpoint {})
+    public constructor(numerator: BigInt, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
+    public constructor(numerator: BigInt, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
+    public constructor(numerator: Int, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
+    public constructor(numerator: Int, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
+    public constructor(numerator: Long, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
+    public constructor(numerator: Long, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
+    public constructor(numerator: BigInt) : this(Rational(numerator), object : Endpoint {})
+    public constructor(numerator: Int) : this(Rational(numerator), object : Endpoint {})
+    public constructor(numerator: Long) : this(Rational(numerator), object : Endpoint {})
+
+    public operator fun unaryPlus(): RationalWithMemorization = this
+    public operator fun unaryMinus(): RationalWithMemorization = RationalWithMemorization(
+        -value,
+        object : Negation {
+            override val negated: OperationsMemory = memory
+        }
+    )
+    public operator fun plus(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
+        value + other.value,
+        object : Sum {
+            override val augend: OperationsMemory = memory
+            override val addend: OperationsMemory = other.memory
+        }
+    )
+    public operator fun minus(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
+        value - other.value,
+        object : Difference {
+            override val minuend: OperationsMemory = memory
+            override val subtrahend: OperationsMemory = other.memory
+        }
+    )
+    public operator fun times(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
+        value * other.value,
+        object : Product {
+            override val multiplicand: OperationsMemory = memory
+            override val multiplier: OperationsMemory = other.memory
+        }
+    )
+    public operator fun div(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
+        value / other.value,
+        object : Quotient {
+            override val dividend: OperationsMemory = memory
+            override val divisor: OperationsMemory = other.memory
+        }
+    )
+
+    public override fun equals(other: Any?): Boolean =
+        other is RationalWithMemorization && value == other.value
+
+    public override fun hashCode(): Int = value.hashCode()
+
+    public override fun toString(): String = value.toString()
+}
+
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+public object RationalWithMemorizationRing : Ring<RationalWithMemorization> {
+    override inline val zero: RationalWithMemorization get() = RationalWithMemorization.ZERO
+    override inline val one: RationalWithMemorization get() = RationalWithMemorization.ONE
+
+    override inline fun add(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left + right
+    override inline fun multiply(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left * right
+
+    override inline fun RationalWithMemorization.unaryMinus(): RationalWithMemorization = -this
+    override inline fun RationalWithMemorization.plus(arg: RationalWithMemorization): RationalWithMemorization = this + arg
+    override inline fun RationalWithMemorization.minus(arg: RationalWithMemorization): RationalWithMemorization = this - arg
+    override inline fun RationalWithMemorization.times(arg: RationalWithMemorization): RationalWithMemorization = this * arg
+}
+
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+public object RationalWithMemorizationField : Field<RationalWithMemorization> {
+    override inline val zero: RationalWithMemorization get() = RationalWithMemorization.ZERO
+    override inline val one: RationalWithMemorization get() = RationalWithMemorization.ONE
+
+    override inline fun number(value: Number): RationalWithMemorization = RationalWithMemorization(value.toLong())
+
+    override inline fun add(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left + right
+    override inline fun multiply(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left * right
+    override inline fun divide(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left / right
+    override inline fun scale(a: RationalWithMemorization, value: Double): RationalWithMemorization = a * number(value)
+
+    override inline fun RationalWithMemorization.unaryMinus(): RationalWithMemorization = -this
+    override inline fun RationalWithMemorization.plus(arg: RationalWithMemorization): RationalWithMemorization = this + arg
+    override inline fun RationalWithMemorization.minus(arg: RationalWithMemorization): RationalWithMemorization = this - arg
+    override inline fun RationalWithMemorization.times(arg: RationalWithMemorization): RationalWithMemorization = this * arg
+    override inline fun RationalWithMemorization.div(arg: RationalWithMemorization): RationalWithMemorization = this / arg
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt
new file mode 100644
index 000000000..a4fb81274
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.test.misc
+
+sealed interface OperationsMemory
+
+interface Endpoint: OperationsMemory
+
+interface Negation: OperationsMemory {
+    val negated: OperationsMemory
+}
+
+interface Sum: OperationsMemory {
+    val augend: OperationsMemory
+    val addend: OperationsMemory
+}
+
+interface Difference: OperationsMemory {
+    val minuend: OperationsMemory
+    val subtrahend: OperationsMemory
+}
+
+interface Product: OperationsMemory {
+    val multiplicand: OperationsMemory
+    val multiplier: OperationsMemory
+}
+
+interface Quotient: OperationsMemory {
+    val dividend: OperationsMemory
+    val divisor: OperationsMemory
+}
+
+
+fun equalMemories(one: OperationsMemory, other: OperationsMemory) : Boolean =
+    when(one) {
+        is Negation -> other is Negation && equalMemories(one.negated, other.negated)
+        is Sum -> other is Sum && equalMemories(one.augend, other.augend) && equalMemories(one.addend, other.addend)
+        is Difference -> other is Difference && equalMemories(one.minuend, other.minuend) && equalMemories(one.subtrahend, other.subtrahend)
+        is Product -> other is Product && equalMemories(one.multiplicand, other.multiplicand) && equalMemories(one.multiplier, other.multiplier)
+        is Quotient -> other is Quotient && equalMemories(one.dividend, other.dividend) && equalMemories(one.divisor, other.divisor)
+        is Endpoint -> one === other
+    }
+
+interface WithMemorization {
+    val memory: OperationsMemory
+}
+
+fun equalMemories(one: WithMemorization, other: WithMemorization) : Boolean = equalMemories(one.memory, other.memory)
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
new file mode 100644
index 000000000..eab29842c
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.test.misc
+
+import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.BigInt.Companion.ZERO as I0
+
+// TODO: Move to corresponding module "kmath-number-theory"
+
+/**
+ * Computes [Greatest Common Divisor](https://en.wikipedia.org/wiki/Greatest_common_divisor) of [a] and [b].
+ *
+ * It's computed by [Euclidean algorithm](https://en.wikipedia.org/wiki/Greatest_common_divisor#Euclidean_algorithm).
+ * Hence, its time complexity is $$O(\log(a+b))$$ (see [Wolfram MathWorld](https://mathworld.wolfram.com/EuclideanAlgorithm.html)).
+ */
+public tailrec fun gcd(a: BigInt, b: BigInt): BigInt = if (a == I0) abs(b) else gcd(b % a, a)
+
+/**
+ * Computes [Greatest Common Divisor](https://en.wikipedia.org/wiki/Greatest_common_divisor) of the [values].
+ */
+public fun gcd(vararg values: BigInt): BigInt = values.reduce(::gcd)
+public fun gcd(values: Iterable<BigInt>): BigInt = values.reduce(::gcd)
\ No newline at end of file
-- 
2.34.1


From 90a7c4d901d6383b2de5326b0fa852f27bc47320 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 19 Mar 2022 18:08:43 +0300
Subject: [PATCH 456/713] Simplified use of Rational (current BigInt are hard
 to use and actually useless). Added tests, fixed bug.

---
 .../kmath/functions/NumberedPolynomial.kt     |   8 +-
 .../kscience/kmath/functions/Polynomial.kt    |   2 +-
 .../kmath/functions/PolynomialTest.kt         | 225 +++++++++--
 .../kscience/kmath/test/misc/Rational.kt      | 348 +++---------------
 .../test/misc/RationalWithMemorization.kt     |  42 +--
 .../space/kscience/kmath/test/misc/misc.kt    |  17 +-
 6 files changed, 268 insertions(+), 374 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 88349f003..c05bc30ec 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -246,7 +246,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     override operator fun C.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         if (this.isZero()) -other
         else with(other.coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(listOf<UInt>() to this@minus))
+            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this@minus))
             else NumberedPolynomial<C>(
                 toMutableMap()
                     .apply {
@@ -279,7 +279,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     override operator fun NumberedPolynomial<C>.plus(other: C): NumberedPolynomial<C> =
         if (other.isZero()) this
         else with(coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(listOf<UInt>() to other))
+            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to other))
             else NumberedPolynomial<C>(
                 toMutableMap()
                     .apply {
@@ -298,7 +298,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     override operator fun NumberedPolynomial<C>.minus(other: C): NumberedPolynomial<C> =
         if (other.isZero()) this
         else with(coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(listOf<UInt>() to other))
+            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to other))
             else NumberedPolynomial<C>(
                 toMutableMap()
                     .apply {
@@ -416,7 +416,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     override val one: NumberedPolynomial<C> =
         NumberedPolynomial<C>(
             mapOf(
-                listOf<UInt>() to constantOne // 1 * x_1^0 * x_2^0 * ...
+                emptyList<UInt>() to constantOne // 1 * x_1^0 * x_2^0 * ...
             )
         )
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 3f0d073b3..722566f5d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -276,7 +276,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     public override operator fun Polynomial<C>.minus(other: C): Polynomial<C> =
         if (other.isZero()) this
         else with(coefficients) {
-            if (isEmpty()) Polynomial(listOf(other))
+            if (isEmpty()) Polynomial(listOf(-other))
             else Polynomial(
                 toMutableList()
                     .apply {
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
index 9e3dea615..e2970d953 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
@@ -5,16 +5,173 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.BigInt
 import space.kscience.kmath.operations.algebra
-import space.kscience.kmath.operations.toBigInt
 import space.kscience.kmath.test.misc.Rational
 import space.kscience.kmath.test.misc.RationalField
-import space.kscience.kmath.test.misc.gcd
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class PolynomialTest {
+    @Test
+    fun test_Polynomial_Int_plus() {
+        RationalField.polynomial {
+            assertEquals(
+                Polynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + -3,
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 2,
+                "test 2"
+            )
+            assertEquals(
+                Polynomial(),
+                Polynomial(Rational(-2)) + 2,
+                "test 3"
+            )
+            assertEquals(
+                Polynomial(),
+                Polynomial<Rational>() + 0,
+                "test 4"
+            )
+            assertEquals(
+                Polynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 1,
+                "test 5"
+            )
+            assertEquals(
+                Polynomial(Rational(-1)),
+                Polynomial(Rational(-2)) + 1,
+                "test 6"
+            )
+            assertEquals(
+                Polynomial(Rational(2)),
+                Polynomial<Rational>() + 2,
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Int_minus() {
+        RationalField.polynomial {
+            assertEquals(
+                Polynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - -3,
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 2,
+                "test 2"
+            )
+            assertEquals(
+                Polynomial(),
+                Polynomial(Rational(2)) - 2,
+                "test 3"
+            )
+            assertEquals(
+                Polynomial(),
+                Polynomial<Rational>() - 0,
+                "test 4"
+            )
+            assertEquals(
+                Polynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 1,
+                "test 5"
+            )
+            assertEquals(
+                Polynomial(Rational(1)),
+                Polynomial(Rational(2)) - 1,
+                "test 6"
+            )
+            assertEquals(
+                Polynomial(Rational(-2)),
+                Polynomial<Rational>() - 2,
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_plus() {
+        RationalField.polynomial {
+            assertEquals(
+                Polynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + Rational(-3),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(2),
+                "test 2"
+            )
+            assertEquals(
+                Polynomial(),
+                Polynomial(Rational(-2)) + Rational(2),
+                "test 3"
+            )
+            assertEquals(
+                Polynomial(),
+                Polynomial<Rational>() + Rational(0),
+                "test 4"
+            )
+            assertEquals(
+                Polynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(1),
+                "test 5"
+            )
+            assertEquals(
+                Polynomial(Rational(-1)),
+                Polynomial(Rational(-2)) + Rational(1),
+                "test 6"
+            )
+            assertEquals(
+                Polynomial(Rational(2)),
+                Polynomial<Rational>() + Rational(2),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_minus() {
+        RationalField.polynomial {
+            assertEquals(
+                Polynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - Rational(-3),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(2),
+                "test 2"
+            )
+            assertEquals(
+                Polynomial(),
+                Polynomial(Rational(2)) - Rational(2),
+                "test 3"
+            )
+            assertEquals(
+                Polynomial(),
+                Polynomial<Rational>() - Rational(0),
+                "test 4"
+            )
+            assertEquals(
+                Polynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(1),
+                "test 5"
+            )
+            assertEquals(
+                Polynomial(Rational(1)),
+                Polynomial(Rational(2)) - Rational(1),
+                "test 6"
+            )
+            assertEquals(
+                Polynomial(Rational(-2)),
+                Polynomial<Rational>() - Rational(2),
+                "test 7"
+            )
+        }
+    }
     @Test
     fun test_Polynomial_Polynomial_plus() {
         RationalField.polynomial {
@@ -48,35 +205,39 @@ class PolynomialTest {
             )
         }
     }
-//    @Test
-//    fun test_Polynomial_Polynomial_minus() {
-//        RationalField.polynomial {
-//            assertEquals(
-//                Polynomial(Rational(1, 2), Rational(3, 5), Rational(-2)) +
-//                        Polynomial(Rational(3), Rational(7, 8), Rational(1, 9)),
-//                Polynomial(Rational(7, 2), Rational(59, 40), Rational(-17, 9)),
-//                "test 1"
-//            )
-//            assertEquals(
-//                Polynomial(Rational(1, 2), Rational(3, 5)) +
-//                        Polynomial(Rational(3), Rational(7, 8), Rational(1, 9)),
-//                Polynomial(Rational(7, 2), Rational(59, 40), Rational(1, 9)),
-//                "test 2"
-//            )
-//            assertEquals(
-//                Polynomial(Rational(1, 2), Rational(3, 5), Rational(0), Rational(0)) +
-//                        Polynomial(Rational(3), Rational(7, 8), Rational(1, 9)),
-//                Polynomial(Rational(7, 2), Rational(59, 40), Rational(1, 9)),
-//                "test 3"
-//            )
-//            assertEquals(
-//                Polynomial(Rational(1, 2), Rational(-3, 5), Rational(7, 3)) +
-//                        Polynomial(Rational(3), Rational(3, 5), Rational(-7, 3)),
-//                Polynomial(Rational(7, 2)),
-//                "test 4"
-//            )
-//        }
-//    }
+    @Test
+    fun test_Polynomial_Polynomial_minus() {
+        RationalField.polynomial {
+            // (5/9 - 8/9 x - 8/7 x^2) - (-5/7 + 5/1 x + 5/8 x^2) ?= 80/63 - 53/9 x - 99/56 x^2
+            assertEquals(
+                Polynomial(Rational(80, 63), Rational(-53, 9), Rational(-99, 56)),
+                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) -
+                        Polynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
+                "test 1"
+            )
+            // (-2/9 - 8/3 x) - (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 59/12 x - 2/4 x^2
+            assertEquals(
+                Polynomial(Rational(-2, 9), Rational(-59, 12), Rational(-2, 4)),
+                Polynomial(Rational(-2, 9), Rational(-8, 3)) -
+                        Polynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
+                "test 2"
+            )
+            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) - (-6/3 - 7/2 x + 2/3 x^2) ?= 10/7 + 19/6 x - 2/3 x^2
+            assertEquals(
+                Polynomial(Rational(10, 7), Rational(19, 6), Rational(-2, 3)),
+                Polynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) -
+                        Polynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
+                "test 3"
+            )
+            // (-2/4 - 6/9 x - 4/9 x^2) - (-2/4 - 6/9 x - 4/9 x^2) ?= 0
+            assertEquals(
+                Polynomial(),
+                Polynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) -
+                        Polynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)),
+                "test 4"
+            )
+        }
+    }
     @Test
     fun simple_polynomial_test() {
         val polynomial : Polynomial<Double>
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
index fad13f88a..842e354db 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
@@ -6,54 +6,23 @@
 package space.kscience.kmath.test.misc
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.BigInt
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.NumbersAddOps
-import space.kscience.kmath.operations.toBigInt
-import space.kscience.kmath.operations.BigInt.Companion.ZERO as I0
-import space.kscience.kmath.operations.BigInt.Companion.ONE as I1
 
-/**
- * The class represents rational numbers.
- *
- * Instances contain [numerator] and [denominator] represented as [Long].
- *
- * Also [numerator] and [denominator] are coprime and [denominator] is positive.
- *
- * @author [Gleb Minaev](https://github.com/lounres)
- */
-public class Rational: Comparable<Rational> {
-    public companion object {
-        /**
-         * Constant containing the zero (the additive identity) of the [Rational] field.
-         */
-        public val ZERO: Rational = Rational(I0)
-        /**
-         * Constant containing the one (the multiplicative identity) of the [Rational] field.
-         */
-        public val ONE: Rational = Rational(I1)
+class Rational {
+    companion object {
+        val ZERO: Rational = Rational(0L)
+        val ONE: Rational = Rational(1L)
     }
 
-    /**
-     * Numerator of the fraction. It's stored as non-negative coprime with [denominator] integer.
-     */
-    public val numerator: BigInt
-    /**
-     * Denominator of the fraction. It's stored as non-zero coprime with [numerator] integer.
-     */
-    public val denominator: BigInt
+    val numerator: Long
+    val denominator: Long
 
-    /**
-     * If [toCheckInput] is `true` before assigning values to [Rational.numerator] and [Rational.denominator] makes them coprime and makes
-     * denominator positive. Otherwise, just assigns the values.
-     *
-     * @throws ArithmeticException If denominator is zero.
-     */
-    internal constructor(numerator: BigInt, denominator: BigInt, toCheckInput: Boolean = true) {
+    internal constructor(numerator: Long, denominator: Long, toCheckInput: Boolean = true) {
         if (toCheckInput) {
-            if (denominator == I0) throw ArithmeticException("/ by zero")
+            if (denominator == 0L) throw ArithmeticException("/ by zero")
 
-            val greatestCommonDivider = gcd(numerator, denominator).let { if (denominator < I0) -it else it }
+            val greatestCommonDivider = gcd(numerator, denominator).let { if (denominator < 0L) -it else it }
 
             this.numerator = numerator / greatestCommonDivider
             this.denominator = denominator / greatestCommonDivider
@@ -63,303 +32,86 @@ public class Rational: Comparable<Rational> {
         }
     }
 
-    /**
-     * Before assigning values to [Rational.numerator] and [Rational.denominator] makes them coprime and makes
-     * denominator positive.
-     *
-     * @throws ArithmeticException If denominator is zero.
-     */
-    public constructor(numerator: BigInt, denominator: BigInt) : this(numerator, denominator, true)
-    public constructor(numerator: Int, denominator: BigInt) : this(numerator.toBigInt(), denominator, true)
-    public constructor(numerator: Long, denominator: BigInt) : this(numerator.toBigInt(), denominator, true)
-    public constructor(numerator: BigInt, denominator: Int) : this(numerator, denominator.toBigInt(), true)
-    public constructor(numerator: BigInt, denominator: Long) : this(numerator, denominator.toBigInt(), true)
-    public constructor(numerator: Int, denominator: Int) : this(numerator.toBigInt(), denominator.toBigInt(), true)
-    public constructor(numerator: Int, denominator: Long) : this(numerator.toBigInt(), denominator.toBigInt(), true)
-    public constructor(numerator: Long, denominator: Int) : this(numerator.toBigInt(), denominator.toBigInt(), true)
-    public constructor(numerator: Long, denominator: Long) : this(numerator.toBigInt(), denominator.toBigInt(), true)
-    public constructor(numerator: BigInt) : this(numerator, I1, false)
-    public constructor(numerator: Int) : this(numerator.toBigInt(), I1, false)
-    public constructor(numerator: Long) : this(numerator.toBigInt(), I1, false)
+    constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
+    constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
+    constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
+    constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
+    constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
+    constructor(numerator: Long) : this(numerator, 1L, false)
 
-    /**
-     * Returns the same instant.
-     */
-    public operator fun unaryPlus(): Rational = this
-
-    /**
-     * Returns negation of the instant of [Rational] field.
-     */
-    public operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
-
-    /**
-     * Returns sum of the instants of [Rational] field.
-     */
-    public operator fun plus(other: Rational): Rational =
+    operator fun unaryPlus(): Rational = this
+    operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
+    operator fun plus(other: Rational): Rational =
         Rational(
             numerator * other.denominator + denominator * other.numerator,
             denominator * other.denominator
         )
-
-    /**
-     * Returns sum of the instants of [Rational] field. [other] is represented as [Rational].
-     */
-    public operator fun plus(other: BigInt): Rational =
+    operator fun plus(other: Int): Rational =
+        Rational(
+            numerator + denominator * other.toLong(),
+            denominator
+        )
+    operator fun plus(other: Long): Rational =
         Rational(
             numerator + denominator * other,
             denominator
         )
-
-    /**
-     * Returns sum of the instants of [Rational] field. [other] is represented as [Rational].
-     */
-    public operator fun plus(other: Int): Rational =
-        Rational(
-            numerator + denominator * other.toBigInt(),
-            denominator
-        )
-
-    /**
-     * Returns sum of the instants of [Rational] field. [other] is represented as [Rational].
-     */
-    public operator fun plus(other: Long): Rational =
-        Rational(
-            numerator + denominator * other.toBigInt(),
-            denominator
-        )
-
-    /**
-     * Returns difference of the instants of [Rational] field.
-     */
-    public operator fun minus(other: Rational): Rational =
+    operator fun minus(other: Rational): Rational =
         Rational(
             numerator * other.denominator - denominator * other.numerator,
             denominator * other.denominator
         )
-
-    /**
-     * Returns difference of the instants of [Rational] field. [other] is represented as [Rational].
-     */
-    public operator fun minus(other: BigInt): Rational =
+    operator fun minus(other: Int): Rational =
+        Rational(
+            numerator - denominator * other.toLong(),
+            denominator
+        )
+    operator fun minus(other: Long): Rational =
         Rational(
             numerator - denominator * other,
             denominator
         )
-
-    /**
-     * Returns difference of the instants of [Rational] field. [other] is represented as [Rational].
-     */
-    public operator fun minus(other: Int): Rational =
-        Rational(
-            numerator - denominator * other.toBigInt(),
-            denominator
-        )
-
-    /**
-     * Returns difference of the instants of [Rational] field. [other] is represented as [Rational].
-     */
-    public operator fun minus(other: Long): Rational =
-        Rational(
-            numerator - denominator * other.toBigInt(),
-            denominator
-        )
-
-    /**
-     * Returns product of the instants of [Rational] field.
-     */
-    public operator fun times(other: Rational): Rational =
+    operator fun times(other: Rational): Rational =
         Rational(
             numerator * other.numerator,
             denominator * other.denominator
         )
-
-    /**
-     * Returns product of the instants of [Rational] field. [other] is represented as [Rational].
-     */
-    public operator fun times(other: BigInt): Rational =
+    operator fun times(other: Int): Rational =
+        Rational(
+            numerator * other.toLong(),
+            denominator
+        )
+    operator fun times(other: Long): Rational =
         Rational(
             numerator * other,
             denominator
         )
-
-    /**
-     * Returns product of the instants of [Rational] field. [other] is represented as [Rational].
-     */
-    public operator fun times(other: Int): Rational =
-        Rational(
-            numerator * other.toBigInt(),
-            denominator
-        )
-
-    /**
-     * Returns product of the instants of [Rational] field. [other] is represented as [Rational].
-     */
-    public operator fun times(other: Long): Rational =
-        Rational(
-            numerator * other.toBigInt(),
-            denominator
-        )
-
-    /**
-     * Returns quotient of the instants of [Rational] field.
-     *
-     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
-     */
-    public operator fun div(other: Rational): Rational =
+    operator fun div(other: Rational): Rational =
         Rational(
             numerator * other.denominator,
             denominator * other.numerator
         )
-
-    /**
-     * Returns quotient of the instants of [Rational] field. [other] is represented as [Rational].
-     *
-     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
-     */
-    public operator fun div(other: BigInt): Rational =
+    operator fun div(other: Int): Rational =
+        Rational(
+            numerator,
+            denominator * other.toLong()
+        )
+    operator fun div(other: Long): Rational =
         Rational(
             numerator,
             denominator * other
         )
-
-    /**
-     * Returns quotient of the instants of [Rational] field. [other] is represented as [Rational].
-     *
-     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
-     */
-    public operator fun div(other: Int): Rational =
-        Rational(
-            numerator,
-            denominator * other.toBigInt()
-        )
-
-    /**
-     * Returns quotient of the instants of [Rational] field. [other] is represented as [Rational].
-     *
-     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
-     */
-    public operator fun div(other: Long): Rational =
-        Rational(
-            numerator,
-            denominator * other.toBigInt()
-        )
-
-    /**
-     * Returns reminder from integral division.
-     *
-     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
-     */
-    public operator fun rem(other: Rational): Rational =
-        Rational(
-            (numerator * other.denominator) % (denominator * other.numerator),
-            denominator * other.denominator
-        )
-
-    /**
-     * Returns reminder from integral division.
-     *
-     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
-     */
-    public operator fun rem(other: BigInt): Rational =
-        Rational(
-            numerator % denominator * other,
-            denominator * other
-        )
-
-    /**
-     * Returns reminder from integral division.
-     *
-     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
-     */
-    public operator fun rem(other: Int): Rational =
-        Rational(
-            numerator % denominator * other.toBigInt(),
-            denominator * other.toBigInt()
-        )
-
-    /**
-     * Returns reminder from integral division.
-     *
-     * @throws ArithmeticException if [other] is the zero of the field it can't be a divisor.
-     */
-    public operator fun rem(other: Long): Rational =
-        Rational(
-            numerator % denominator * other.toBigInt(),
-            denominator * other.toBigInt()
-        )
-
-    /**
-     * Checks equality of the instance to [other].
-     *
-     * [BigInt], [Int] and [Long] values are also checked as Rational ones.
-     */
     override fun equals(other: Any?): Boolean =
         when (other) {
             is Rational -> numerator == other.numerator && denominator == other.denominator
-            is BigInt -> numerator == other && denominator == I1
-            is Int -> numerator == other && denominator == I1
-            is Long -> numerator == other && denominator == I1
+            is Int -> numerator == other && denominator == 1L
+            is Long -> numerator == other && denominator == 1L
             else -> false
         }
 
-    /**
-     * Compares the instance to [other] as [Comparable.compareTo].
-     *
-     * @see Comparable.compareTo
-     */
-    override operator fun compareTo(other: Rational): Int = (numerator * other.denominator).compareTo(other.numerator * denominator)
+    override fun hashCode(): Int = 31 * numerator.hashCode() + denominator.hashCode()
 
-    /**
-     * Compares the instance to [other] as [Comparable.compareTo].
-     *
-     * [Integer] values are also checked as Rational ones.
-     *
-     * @see Comparable.compareTo
-     */
-    public operator fun compareTo(other: BigInt): Int = (numerator).compareTo(denominator * other)
-
-    /**
-     * Compares the instance to [other] as [Comparable.compareTo].
-     *
-     * [Int] values are also checked as Rational ones.
-     *
-     * @see Comparable.compareTo
-     */
-    public operator fun compareTo(other: Int): Int = (numerator).compareTo(denominator * other.toBigInt())
-
-    /**
-     * Compares the instance to [other] as [Comparable.compareTo].
-     *
-     * [Long] values are also checked as Rational ones.
-     *
-     * @see Comparable.compareTo
-     */
-    public operator fun compareTo(other: Long): Int = (numerator).compareTo(denominator * other.toBigInt())
-
-    public override fun hashCode(): Int = 31 * numerator.hashCode() + denominator.hashCode()
-
-//    /** Creates a range from this value to the specified [other] value. */
-//    operator fun rangeTo(other: JBInt) = ClosedRationalRange(this, other.toRational())
-//    /** Creates a range from this value to the specified [other] value. */
-//    operator fun rangeTo(other: Rational) = ClosedRationalRange(this, other)
-//    /** Creates a range from this value to the specified [other] value. */
-//    operator fun rangeTo(other: Int) = ClosedRationalRange(this, other.toRational())
-//    /** Creates a range from this value to the specified [other] value. */
-//    operator fun rangeTo(other: Long) = ClosedRationalRange(this, other.toRational())
-
-    public fun toRational(): Rational = this
-
-    public fun toBigInt(): BigInt = numerator / denominator
-
-//    public fun toInt(): Int = (numerator / denominator).toInt()
-//
-//    public fun toLong(): Long = (numerator / denominator).toLong()
-//
-//    public fun toDouble(): Double = (numerator.toDouble() / denominator.toDouble())
-//
-//    public fun toFloat(): Float = (numerator.toFloat() / denominator.toFloat())
-
-    public override fun toString(): String = if (denominator == I1) "$numerator" else "$numerator/$denominator"
+    override fun toString(): String = if (denominator == 1L) "$numerator" else "$numerator/$denominator"
 }
 
 
@@ -368,7 +120,7 @@ public class Rational: Comparable<Rational> {
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 @OptIn(UnstableKMathAPI::class)
-public object RationalField : Field<Rational>, NumbersAddOps<Rational> {
+object RationalField : Field<Rational>, NumbersAddOps<Rational> {
     override inline val zero: Rational get() = Rational.ZERO
     override inline val one: Rational get() = Rational.ONE
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
index 6aa5ecc09..05d9115fa 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
@@ -12,7 +12,7 @@ class RationalWithMemorization private constructor(
     val value: Rational,
     override val memory : OperationsMemory
 ): WithMemorization {
-    public companion object {
+    companion object {
         /**
          * Constant containing the zero (the additive identity) of the [Rational] field.
          */
@@ -22,48 +22,42 @@ class RationalWithMemorization private constructor(
          */
         public val ONE: RationalWithMemorization = RationalWithMemorization(Rational.ONE, object : Endpoint {})
     }
-    public constructor(numerator: BigInt, denominator: BigInt) : this(Rational(numerator, denominator), object : Endpoint {})
-    public constructor(numerator: Int, denominator: BigInt) : this(Rational(numerator, denominator), object : Endpoint {})
-    public constructor(numerator: Long, denominator: BigInt) : this(Rational(numerator, denominator), object : Endpoint {})
-    public constructor(numerator: BigInt, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
-    public constructor(numerator: BigInt, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
-    public constructor(numerator: Int, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
-    public constructor(numerator: Int, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
-    public constructor(numerator: Long, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
-    public constructor(numerator: Long, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
-    public constructor(numerator: BigInt) : this(Rational(numerator), object : Endpoint {})
-    public constructor(numerator: Int) : this(Rational(numerator), object : Endpoint {})
-    public constructor(numerator: Long) : this(Rational(numerator), object : Endpoint {})
+    constructor(numerator: Int, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
+    constructor(numerator: Int, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
+    constructor(numerator: Long, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
+    constructor(numerator: Long, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
+    constructor(numerator: Int) : this(Rational(numerator), object : Endpoint {})
+    constructor(numerator: Long) : this(Rational(numerator), object : Endpoint {})
 
-    public operator fun unaryPlus(): RationalWithMemorization = this
-    public operator fun unaryMinus(): RationalWithMemorization = RationalWithMemorization(
+    operator fun unaryPlus(): RationalWithMemorization = this
+    operator fun unaryMinus(): RationalWithMemorization = RationalWithMemorization(
         -value,
         object : Negation {
             override val negated: OperationsMemory = memory
         }
     )
-    public operator fun plus(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
+    operator fun plus(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
         value + other.value,
         object : Sum {
             override val augend: OperationsMemory = memory
             override val addend: OperationsMemory = other.memory
         }
     )
-    public operator fun minus(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
+    operator fun minus(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
         value - other.value,
         object : Difference {
             override val minuend: OperationsMemory = memory
             override val subtrahend: OperationsMemory = other.memory
         }
     )
-    public operator fun times(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
+    operator fun times(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
         value * other.value,
         object : Product {
             override val multiplicand: OperationsMemory = memory
             override val multiplier: OperationsMemory = other.memory
         }
     )
-    public operator fun div(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
+    operator fun div(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
         value / other.value,
         object : Quotient {
             override val dividend: OperationsMemory = memory
@@ -71,16 +65,16 @@ class RationalWithMemorization private constructor(
         }
     )
 
-    public override fun equals(other: Any?): Boolean =
+    override fun equals(other: Any?): Boolean =
         other is RationalWithMemorization && value == other.value
 
-    public override fun hashCode(): Int = value.hashCode()
+    override fun hashCode(): Int = value.hashCode()
 
-    public override fun toString(): String = value.toString()
+    override fun toString(): String = value.toString()
 }
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-public object RationalWithMemorizationRing : Ring<RationalWithMemorization> {
+object RationalWithMemorizationRing : Ring<RationalWithMemorization> {
     override inline val zero: RationalWithMemorization get() = RationalWithMemorization.ZERO
     override inline val one: RationalWithMemorization get() = RationalWithMemorization.ONE
 
@@ -94,7 +88,7 @@ public object RationalWithMemorizationRing : Ring<RationalWithMemorization> {
 }
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-public object RationalWithMemorizationField : Field<RationalWithMemorization> {
+object RationalWithMemorizationField : Field<RationalWithMemorization> {
     override inline val zero: RationalWithMemorization get() = RationalWithMemorization.ZERO
     override inline val one: RationalWithMemorization get() = RationalWithMemorization.ONE
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
index eab29842c..2eb421024 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
@@ -5,21 +5,8 @@
 
 package space.kscience.kmath.test.misc
 
-import space.kscience.kmath.operations.*
-import space.kscience.kmath.operations.BigInt.Companion.ZERO as I0
+import kotlin.math.abs
 
 // TODO: Move to corresponding module "kmath-number-theory"
 
-/**
- * Computes [Greatest Common Divisor](https://en.wikipedia.org/wiki/Greatest_common_divisor) of [a] and [b].
- *
- * It's computed by [Euclidean algorithm](https://en.wikipedia.org/wiki/Greatest_common_divisor#Euclidean_algorithm).
- * Hence, its time complexity is $$O(\log(a+b))$$ (see [Wolfram MathWorld](https://mathworld.wolfram.com/EuclideanAlgorithm.html)).
- */
-public tailrec fun gcd(a: BigInt, b: BigInt): BigInt = if (a == I0) abs(b) else gcd(b % a, a)
-
-/**
- * Computes [Greatest Common Divisor](https://en.wikipedia.org/wiki/Greatest_common_divisor) of the [values].
- */
-public fun gcd(vararg values: BigInt): BigInt = values.reduce(::gcd)
-public fun gcd(values: Iterable<BigInt>): BigInt = values.reduce(::gcd)
\ No newline at end of file
+tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
\ No newline at end of file
-- 
2.34.1


From 5d4514a742d0c36dabf2b0e03243f61381453313 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 19 Mar 2022 19:35:41 +0300
Subject: [PATCH 457/713] More test tools! More tests!! More fixes of stupid
 bugs!!! :sob:

---
 .../kscience/kmath/functions/Polynomial.kt    |   2 +-
 .../kmath/functions/PolynomialTest.kt         | 224 +++++++++++++++++-
 .../kscience/kmath/test/misc/IntModulo.kt     | 142 +++++++++++
 .../kscience/kmath/test/misc/Rational.kt      |   4 -
 .../space/kscience/kmath/test/misc/misc.kt    |  25 +-
 5 files changed, 387 insertions(+), 10 deletions(-)
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 722566f5d..9c1f9efae 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -220,7 +220,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     public override operator fun C.minus(other: Polynomial<C>): Polynomial<C> =
         if (this.isZero()) other
         else with(other.coefficients) {
-            if (isEmpty()) Polynomial(listOf(-this@minus))
+            if (isEmpty()) Polynomial(listOf(this@minus))
             else Polynomial(
                 toMutableList()
                     .apply {
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
index e2970d953..0bf34f198 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
@@ -6,11 +6,11 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.algebra
-import space.kscience.kmath.test.misc.Rational
-import space.kscience.kmath.test.misc.RationalField
+import space.kscience.kmath.test.misc.*
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
+
 class PolynomialTest {
     @Test
     fun test_Polynomial_Int_plus() {
@@ -93,6 +93,116 @@ class PolynomialTest {
         }
     }
     @Test
+    fun test_Polynomial_Int_times() {
+        IntModuloRing(35).polynomial {
+            assertEquals(
+                Polynomial(34, 2, 1, 20, 2),
+                Polynomial(22, 26, 13, 15, 26) * 27,
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(),
+                Polynomial(7, 0, 49, 21, 14) * 15,
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_plus() {
+        RationalField.polynomial {
+            assertEquals(
+                Polynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                -3 + Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                2 + Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                Polynomial(),
+                2 + Polynomial(Rational(-2)),
+                "test 3"
+            )
+            assertEquals(
+                Polynomial(),
+                0 + Polynomial(),
+                "test 4"
+            )
+            assertEquals(
+                Polynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                1 + Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 5"
+            )
+            assertEquals(
+                Polynomial(Rational(-1)),
+                1 + Polynomial(Rational(-2)),
+                "test 6"
+            )
+            assertEquals(
+                Polynomial(Rational(2)),
+                2 + Polynomial(),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_minus() {
+        RationalField.polynomial {
+            assertEquals(
+                Polynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                3 - Polynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                -2 - Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                Polynomial(),
+                -2 - Polynomial(Rational(-2)),
+                "test 3"
+            )
+            assertEquals(
+                Polynomial(),
+                0 - Polynomial(),
+                "test 4"
+            )
+            assertEquals(
+                Polynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                -1 - Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 5"
+            )
+            assertEquals(
+                Polynomial(Rational(1)),
+                -1 - Polynomial(Rational(-2)),
+                "test 6"
+            )
+            assertEquals(
+                Polynomial(Rational(-2)),
+                -2 - Polynomial(),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_times() {
+        IntModuloRing(35).polynomial {
+            assertEquals(
+                Polynomial(34, 2, 1, 20, 2),
+                27 * Polynomial(22, 26, 13, 15, 26),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(),
+                15 * Polynomial(7, 0, 49, 21, 14),
+                "test 2"
+            )
+        }
+    }
+    @Test
     fun test_Polynomial_Constant_plus() {
         RationalField.polynomial {
             assertEquals(
@@ -173,6 +283,116 @@ class PolynomialTest {
         }
     }
     @Test
+    fun test_Polynomial_Constant_times() {
+        IntModuloRing(35).polynomial {
+            assertEquals(
+                Polynomial(34, 2, 1, 20, 2),
+                Polynomial(22, 26, 13, 15, 26) * number(27),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(),
+                Polynomial(7, 0, 49, 21, 14) * number(15),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_plus() {
+        RationalField.polynomial {
+            assertEquals(
+                Polynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                Rational(-3) + Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Rational(2) + Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                Polynomial(),
+                Rational(2) + Polynomial(Rational(-2)),
+                "test 3"
+            )
+            assertEquals(
+                Polynomial(),
+                Rational(0) + Polynomial(),
+                "test 4"
+            )
+            assertEquals(
+                Polynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                Rational(1) + Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 5"
+            )
+            assertEquals(
+                Polynomial(Rational(-1)),
+                Rational(1) + Polynomial(Rational(-2)),
+                "test 6"
+            )
+            assertEquals(
+                Polynomial(Rational(2)),
+                Rational(2) + Polynomial(),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_minus() {
+        RationalField.polynomial {
+            assertEquals(
+                Polynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                Rational(3) - Polynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Rational(-2) - Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                Polynomial(),
+                Rational(-2) - Polynomial(Rational(-2)),
+                "test 3"
+            )
+            assertEquals(
+                Polynomial(),
+                Rational(0) - Polynomial(),
+                "test 4"
+            )
+            assertEquals(
+                Polynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                Rational(-1) - Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 5"
+            )
+            assertEquals(
+                Polynomial(Rational(1)),
+                Rational(-1) - Polynomial(Rational(-2)),
+                "test 6"
+            )
+            assertEquals(
+                Polynomial(Rational(-2)),
+                Rational(-2) - Polynomial(),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_times() {
+        IntModuloRing(35).polynomial {
+            assertEquals(
+                Polynomial(34, 2, 1, 20, 2),
+                27 * Polynomial(22, 26, 13, 15, 26),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(),
+                15 * Polynomial(7, 0, 49, 21, 14),
+                "test 2"
+            )
+        }
+    }
+    @Test
     fun test_Polynomial_Polynomial_plus() {
         RationalField.polynomial {
             // (5/9 - 8/9 x - 8/7 x^2) + (-5/7 + 5/1 x + 5/8 x^2) ?= -10/63 + 37/9 x - 29/56 x^2
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
new file mode 100644
index 000000000..a8a8a09bc
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.test.misc
+
+import space.kscience.kmath.functions.Polynomial
+import space.kscience.kmath.functions.PolynomialSpace
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Ring
+
+
+class IntModulo {
+    val residue: Int
+    val modulus: Int
+
+    @PublishedApi
+    internal constructor(residue: Int, modulus: Int, toCheckInput: Boolean = true) {
+        if (toCheckInput) {
+            require(modulus != 0) { "modulus can not be zero" }
+            this.modulus = if (modulus < 0) -modulus else modulus
+            this.residue = residue.mod(modulus)
+        } else {
+            this.residue = residue
+            this.modulus = modulus
+        }
+    }
+
+    constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
+
+    operator fun unaryPlus(): IntModulo = this
+    operator fun unaryMinus(): IntModulo =
+        IntModulo(
+            if (residue == 0) 0 else modulus - residue,
+            modulus,
+            toCheckInput = false
+        )
+    operator fun plus(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not add two residue different modulo" }
+        return IntModulo(
+            (residue + other.residue) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    operator fun plus(other: Int): IntModulo =
+        IntModulo(
+            (residue + other) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    operator fun minus(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not subtract two residue different modulo" }
+        return IntModulo(
+            (residue - other.residue) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    operator fun minus(other: Int): IntModulo =
+        IntModulo(
+            (residue - other) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    operator fun times(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not multiply two residue different modulo" }
+        return IntModulo(
+            (residue * other.residue) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    operator fun times(other: Int): IntModulo =
+        IntModulo(
+            (residue * other) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    operator fun div(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not divide two residue different modulo" }
+        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other.residue, modulus)
+        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
+        return IntModulo(
+            (residue * reciprocalCandidate) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    operator fun div(other: Int): IntModulo {
+        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other, modulus)
+        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
+        return IntModulo(
+            (residue * reciprocalCandidate) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    override fun equals(other: Any?): Boolean =
+        when (other) {
+            is IntModulo -> residue == other.residue && modulus == other.modulus
+            else -> false
+        }
+
+    override fun hashCode(): Int = residue.hashCode()
+
+    override fun toString(): String = "$residue mod $modulus"
+}
+
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@OptIn(UnstableKMathAPI::class)
+class IntModuloRing : Ring<IntModulo> {
+
+    val modulus: Int
+
+    constructor(modulus: Int) {
+        require(modulus != 0) { "modulus can not be zero" }
+        this.modulus = if (modulus < 0) -modulus else modulus
+    }
+
+    override inline val zero: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
+    override inline val one: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
+
+    fun number(arg: Int) = IntModulo(arg, modulus, toCheckInput = false)
+
+    override inline fun add(left: IntModulo, right: IntModulo): IntModulo = left + right
+    override inline fun multiply(left: IntModulo, right: IntModulo): IntModulo = left * right
+
+    override inline fun IntModulo.unaryMinus(): IntModulo = -this
+    override inline fun IntModulo.plus(arg: IntModulo): IntModulo = this + arg
+    override inline fun IntModulo.minus(arg: IntModulo): IntModulo = this - arg
+    override inline fun IntModulo.times(arg: IntModulo): IntModulo = this * arg
+    inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
+}
+
+fun PolynomialSpace<IntModulo, IntModuloRing>.number(arg: Int) = IntModulo(arg, ring.modulus, toCheckInput = false)
+
+fun PolynomialSpace<IntModulo, IntModuloRing>.Polynomial(vararg coefs: Int): Polynomial<IntModulo> =
+    Polynomial(coefs.map { IntModulo(it, ring.modulus) })
+fun IntModuloRing.Polynomial(vararg coefs: Int): Polynomial<IntModulo> =
+    Polynomial(coefs.map { IntModulo(it, modulus) })
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
index 842e354db..72bb5942c 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
@@ -114,10 +114,6 @@ class Rational {
     override fun toString(): String = if (denominator == 1L) "$numerator" else "$numerator/$denominator"
 }
 
-
-/**
- * Algebraic structure for rational numbers.
- */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 @OptIn(UnstableKMathAPI::class)
 object RationalField : Field<Rational>, NumbersAddOps<Rational> {
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
index 2eb421024..cc647fa2c 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
@@ -5,8 +5,27 @@
 
 package space.kscience.kmath.test.misc
 
-import kotlin.math.abs
-
 // TODO: Move to corresponding module "kmath-number-theory"
 
-tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
\ No newline at end of file
+import kotlin.math.abs
+
+
+data class BezoutIdentityWithGCD<T>(val first: T, val second: T, val gcd: T)
+
+tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
+
+fun bezoutIdentityWithGCD(a: Int, b: Int): BezoutIdentityWithGCD<Int> =
+    when {
+        a < 0 && b < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, -second, gcd) }
+        a < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, second, gcd) }
+        b < 0 -> with(bezoutIdentityWithGCDInternalLogic(a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(first, -second, gcd) }
+        else -> bezoutIdentityWithGCDInternalLogic(a, b, 1, 0, 0, 1)
+    }
+
+internal tailrec fun bezoutIdentityWithGCDInternalLogic(a: Int, b: Int, m1: Int, m2: Int, m3: Int, m4: Int): BezoutIdentityWithGCD<Int> =
+    if (b == 0) BezoutIdentityWithGCD(m1, m3, a)
+    else {
+        val quotient = a / b
+        val reminder = a % b
+        bezoutIdentityWithGCDInternalLogic(b, reminder, m2, m1 - quotient * m2, m4, m3 - quotient * m4)
+    }
\ No newline at end of file
-- 
2.34.1


From fbc21101bbcb2cbc9a383fa2c18d635cba72c25e Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 20 Mar 2022 06:26:52 +0300
Subject: [PATCH 458/713] Added test. Fixed isOne and isMinusOne for
 Polynomial.

---
 .../kscience/kmath/functions/Polynomial.kt    |  6 +-
 .../kmath/functions/PolynomialTest.kt         | 86 ++++++++++++++++---
 .../kmath/functions/PolynomialUtilTest.kt     | 27 ++++++
 3 files changed, 104 insertions(+), 15 deletions(-)
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 9c1f9efae..7e0f6f62d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -369,14 +369,14 @@ public open class PolynomialSpace<C, A : Ring<C>>(
      */
     public override fun Polynomial<C>.isOne(): Boolean =
         with(coefficients) {
-            isNotEmpty() && withIndex().any { (index, c) -> if (index == 0) c.isOne() else c.isZero() }
+            isNotEmpty() && withIndex().all { (index, c) -> if (index == 0) c.isOne() else c.isZero() }
         }
     /**
      * Check if the instant is minus unit polynomial.
      */
     public override fun Polynomial<C>.isMinusOne(): Boolean =
         with(coefficients) {
-            isNotEmpty() && withIndex().any { (index, c) -> if (index == 0) c.isMinusOne() else c.isZero() }
+            isNotEmpty() && withIndex().all { (index, c) -> if (index == 0) c.isMinusOne() else c.isZero() }
         }
 
     /**
@@ -415,7 +415,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         with(coefficients) {
             when {
                 isEmpty() -> constantZero
-                degree > 0 -> null
+                withIndex().any { (index, c) -> index == 0 || c.isZero() } -> null
                 else -> first()
             }
         }
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
index 0bf34f198..85b309467 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
@@ -5,10 +5,8 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.test.misc.*
-import kotlin.test.Test
-import kotlin.test.assertEquals
+import kotlin.test.*
 
 
 class PolynomialTest {
@@ -393,6 +391,21 @@ class PolynomialTest {
         }
     }
     @Test
+    fun test_Polynomial_unaryMinus() {
+        RationalField.polynomial {
+            assertEquals(
+                Polynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
+                -Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7), Rational(0), Rational(0)),
+                -Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7), Rational(0), Rational(0)),
+                "test 2"
+            )
+        }
+    }
+    @Test
     fun test_Polynomial_Polynomial_plus() {
         RationalField.polynomial {
             // (5/9 - 8/9 x - 8/7 x^2) + (-5/7 + 5/1 x + 5/8 x^2) ?= -10/63 + 37/9 x - 29/56 x^2
@@ -459,17 +472,66 @@ class PolynomialTest {
         }
     }
     @Test
-    fun simple_polynomial_test() {
-        val polynomial : Polynomial<Double>
-        Double.algebra.scalablePolynomial {
-            val x = Polynomial(listOf(0.0, 1.0))
-            polynomial = x * x - 2 * x + 1
+    fun test_Polynomial_Polynomial_times() {
+        IntModuloRing(35).polynomial {
+            // (1 + x + x^2) * (1 - x + x^2) ?= 1 + x^2 + x^4
+            assertEquals(
+                Polynomial(1, 0, 1, 0, 1),
+                Polynomial(1, -1, 1) * Polynomial(1, 1, 1),
+                "test 1"
+            )
+            // Spoiler: 5 * 7 = 0
+            assertEquals(
+                Polynomial(),
+                Polynomial(5, -25, 10) * Polynomial(21, 14, -7),
+                "test 2"
+            )
         }
-        assertEquals(0.0, polynomial.substitute(1.0), 0.001)
     }
     @Test
-    fun testIntegration() {
-        val polynomial = Polynomial(1.0, -2.0, 1.0)
-        assertEquals(0.0, polynomial.substitute(1.0), 0.001)
+    fun test_Polynomial_isZero() {
+        RationalField.polynomial {
+            assertTrue("test 1") { Polynomial<Rational>().isZero() }
+            assertTrue("test 2") { Polynomial<Rational>(Rational(0)).isZero() }
+            assertTrue("test 3") { Polynomial<Rational>(Rational(0), Rational(0)).isZero() }
+            assertTrue("test 4") { Polynomial<Rational>(Rational(0), Rational(0), Rational(0)).isZero() }
+            assertFalse("test 5") { Polynomial<Rational>(Rational(3, 5)).isZero() }
+            assertFalse("test 6") { Polynomial<Rational>(Rational(3, 5), Rational(0)).isZero() }
+            assertFalse("test 7") { Polynomial<Rational>(Rational(0), Rational(3, 5), Rational(0)).isZero() }
+        }
+    }
+    @Test
+    fun test_Polynomial_isOne() {
+        RationalField.polynomial {
+            assertFalse("test 1") { Polynomial<Rational>().isOne() }
+            assertFalse("test 2") { Polynomial(Rational(0)).isOne() }
+            assertFalse("test 3") { Polynomial(Rational(0), Rational(0)).isOne() }
+            assertFalse("test 4") { Polynomial(Rational(0), Rational(0), Rational(0)).isOne() }
+            assertFalse("test 5") { Polynomial(Rational(3, 5)).isOne() }
+            assertTrue("test 6") { Polynomial(Rational(5, 5)).isOne() }
+            assertFalse("test 7") { Polynomial(Rational(3, 5), Rational(0)).isOne() }
+            assertTrue("test 8") { Polynomial(Rational(3, 3), Rational(0)).isOne() }
+            assertFalse("test 9") { Polynomial(Rational(0), Rational(3, 5), Rational(0)).isOne() }
+            assertFalse("test 10") { Polynomial(Rational(0), Rational(5, 5), Rational(0)).isOne() }
+            assertFalse("test 11") { Polynomial(Rational(1), Rational(3, 5), Rational(0)).isOne() }
+            assertFalse("test 12") { Polynomial(Rational(1), Rational(5, 5), Rational(0)).isOne() }
+        }
+    }
+    @Test
+    fun test_Polynomial_isMinusOne() {
+        RationalField.polynomial {
+            assertFalse("test 1") { Polynomial<Rational>().isMinusOne() }
+            assertFalse("test 2") { Polynomial(Rational(0)).isMinusOne() }
+            assertFalse("test 3") { Polynomial(Rational(0), Rational(0)).isMinusOne() }
+            assertFalse("test 4") { Polynomial(Rational(0), Rational(0), Rational(0)).isMinusOne() }
+            assertFalse("test 5") { Polynomial(Rational(3, 5)).isMinusOne() }
+            assertTrue("test 6") { Polynomial(Rational(-5, 5)).isMinusOne() }
+            assertFalse("test 7") { Polynomial(Rational(3, 5), Rational(0)).isMinusOne() }
+            assertTrue("test 8") { Polynomial(Rational(-3, 3), Rational(0)).isMinusOne() }
+            assertFalse("test 9") { Polynomial(Rational(0), Rational(3, 5), Rational(0)).isMinusOne() }
+            assertFalse("test 10") { Polynomial(Rational(0), Rational(5, -5), Rational(0)).isMinusOne() }
+            assertFalse("test 11") { Polynomial(Rational(-1), Rational(3, 5), Rational(0)).isMinusOne() }
+            assertFalse("test 12") { Polynomial(Rational(-1), Rational(5, -5), Rational(0)).isMinusOne() }
+        }
     }
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
new file mode 100644
index 000000000..b9dd74800
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.algebra
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class PolynomialUtilTest {
+    @Test
+    fun simple_polynomial_test() {
+        val polynomial : Polynomial<Double>
+        Double.algebra.scalablePolynomial {
+            val x = Polynomial(listOf(0.0, 1.0))
+            polynomial = x * x - 2 * x + 1
+        }
+        assertEquals(0.0, polynomial.substitute(1.0), 0.001)
+    }
+    @Test
+    fun testIntegration() {
+        val polynomial = Polynomial(1.0, -2.0, 1.0)
+        assertEquals(0.0, polynomial.substitute(1.0), 0.001)
+    }
+}
\ No newline at end of file
-- 
2.34.1


From 25ec59b9851e71e3a652e043002a50902e8479b4 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 20 Mar 2022 23:22:39 +0300
Subject: [PATCH 459/713] Finished with tests for Polynomial.

---
 .../kscience/kmath/functions/Polynomial.kt    |  17 +-
 .../kmath/functions/polynomialUtil.kt         |  50 ++--
 .../kmath/functions/PolynomialTest.kt         | 154 ++++++++++++
 .../kmath/functions/PolynomialUtilTest.kt     | 223 +++++++++++++++++-
 4 files changed, 407 insertions(+), 37 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 7e0f6f62d..d6c959fd1 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -386,7 +386,7 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     /**
      * Instance of unit constant (unit of the underlying ring).
      */
-    override val one: Polynomial<C> = Polynomial(listOf(constantZero))
+    override val one: Polynomial<C> = Polynomial(listOf(constantOne))
 
     /**
      * Checks equality of the polynomials.
@@ -394,11 +394,8 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     public override infix fun Polynomial<C>.equalsTo(other: Polynomial<C>): Boolean =
         when {
             this === other -> true
-            else -> {
-                if (this.degree == other.degree)
-                    (0..degree).all { coefficients[it] == other.coefficients[it] }
-                else false
-            }
+            this.degree == other.degree -> (0..degree).all { coefficients[it] == other.coefficients[it] }
+            else -> false
         }
 
     /**
@@ -415,8 +412,8 @@ public open class PolynomialSpace<C, A : Ring<C>>(
         with(coefficients) {
             when {
                 isEmpty() -> constantZero
-                withIndex().any { (index, c) -> index == 0 || c.isZero() } -> null
-                else -> first()
+                withIndex().all { (index, c) -> index == 0 || c.isZero() } -> first()
+                else -> null
             }
         }
 
@@ -489,8 +486,6 @@ public open class PolynomialSpace<C, A : Ring<C>>(
 public class ScalablePolynomialSpace<C, A>(
     ring: A,
 ) : PolynomialSpace<C, A>(ring), ScaleOperations<Polynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
-
     override fun scale(a: Polynomial<C>, value: Double): Polynomial<C> =
-        ring { Polynomial(List(a.coefficients.size) { index -> a.coefficients[index] * value }) }
-
+        ring { Polynomial(a.coefficients.map { scale(it, value) }) }
 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index 84c8d2e88..afaf27a52 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -127,9 +127,10 @@ public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: Polynomial<C>) : Pol
     if (argDegree == -1) return coefficients[0].asPolynomial()
     val constantZero = zero
     val resultCoefs: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
+    resultCoefs[0] = coefficients[thisDegree]
     val resultCoefsUpdate: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
     var resultDegree = 0
-    for (deg in thisDegree downTo 0) {
+    for (deg in thisDegree - 1 downTo 0) {
         resultCoefsUpdate[0] = coefficients[deg]
         multiplyAddingToUpdater(
             ring = ring,
@@ -142,6 +143,8 @@ public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: Polynomial<C>) : Pol
         )
         resultDegree += argDegree
     }
+
+    with(resultCoefs) { while (isNotEmpty() && elementAt(lastIndex) == constantZero) removeAt(lastIndex) }
     return Polynomial<C>(resultCoefs)
 }
 
@@ -162,7 +165,12 @@ public fun <C, A : Ring<C>> Polynomial<C>.asPolynomialFunctionOver(ring: A): (Po
 public fun <C, A> Polynomial<C>.derivative(
     algebra: A,
 ): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    Polynomial(coefficients.drop(1).mapIndexed { index, c -> number(index + 1) * c })
+    Polynomial(
+        buildList(max(0, coefficients.size - 1)) {
+            for (deg in 1 .. coefficients.lastIndex) add(number(deg) * coefficients[deg])
+            while (isNotEmpty() && elementAt(lastIndex) == algebra.zero) removeAt(lastIndex)
+        }
+    )
 }
 
 /**
@@ -171,9 +179,16 @@ public fun <C, A> Polynomial<C>.derivative(
 @UnstableKMathAPI
 public fun <C, A> Polynomial<C>.nthDerivative(
     algebra: A,
-    order: UInt,
+    order: Int,
 ): Polynomial<C> where A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    Polynomial(coefficients.drop(order.toInt()).mapIndexed { index, c -> (index + 1..index + order.toInt()).fold(c) { acc, i -> acc * number(i) } })
+    require(order >= 0) { "Order of derivative must be non-negative" }
+    Polynomial(
+        buildList(max(0, coefficients.size - order)) {
+            for (deg in order.. coefficients.lastIndex)
+                add((deg - order + 1 .. deg).fold(coefficients[deg]) { acc, d -> acc * number(d) })
+            while (isNotEmpty() && elementAt(lastIndex) == algebra.zero) removeAt(lastIndex)
+        }
+    )
 }
 
 /**
@@ -183,11 +198,13 @@ public fun <C, A> Polynomial<C>.nthDerivative(
 public fun <C, A> Polynomial<C>.antiderivative(
     algebra: A,
 ): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
-    val integratedCoefficients = buildList(coefficients.size + 1) {
-        add(zero)
-        coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
-    }
-    Polynomial(integratedCoefficients)
+    Polynomial(
+        buildList(coefficients.size + 1) {
+            add(zero)
+            coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
+            while (isNotEmpty() && elementAt(lastIndex) == algebra.zero) removeAt(lastIndex)
+        }
+    )
 }
 
 /**
@@ -196,13 +213,16 @@ public fun <C, A> Polynomial<C>.antiderivative(
 @UnstableKMathAPI
 public fun <C, A> Polynomial<C>.nthAntiderivative(
     algebra: A,
-    order: UInt,
+    order: Int,
 ): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
-    val newCoefficients = buildList(coefficients.size + order.toInt()) {
-        repeat(order.toInt()) { add(zero) }
-        coefficients.mapIndexedTo(this) { index, c -> (1..order.toInt()).fold(c) { acc, i -> acc / number(index + i) } }
-    }
-    return Polynomial(newCoefficients)
+    require(order >= 0) { "Order of antiderivative must be non-negative" }
+    Polynomial(
+        buildList(coefficients.size + order) {
+            repeat(order) { add(zero) }
+            coefficients.mapIndexedTo(this) { index, c -> (1..order).fold(c) { acc, i -> acc / number(index + i) } }
+            while (isNotEmpty() && elementAt(lastIndex) == algebra.zero) removeAt(lastIndex)
+        }
+    )
 }
 
 /**
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
index 85b309467..141bdd436 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
@@ -534,4 +534,158 @@ class PolynomialTest {
             assertFalse("test 12") { Polynomial(Rational(-1), Rational(5, -5), Rational(0)).isMinusOne() }
         }
     }
+    @Test
+    fun test_Polynomial_equalsTo() {
+        RationalField.polynomial {
+            assertTrue("test 1") {
+                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) equalsTo
+                        Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7))
+            }
+            assertTrue("test 2") {
+                Polynomial(Rational(5, 9), Rational(0), Rational(-8, 7)) equalsTo
+                        Polynomial(Rational(5, 9), Rational(0), Rational(-8, 7))
+            }
+            assertTrue("test 3") {
+                Polynomial(Rational(0), Rational(0), Rational(-8, 7), Rational(0), Rational(0)) equalsTo
+                        Polynomial(Rational(0), Rational(0), Rational(-8, 7))
+            }
+            assertFalse("test 4") {
+                Polynomial(Rational(5, 9), Rational(5, 7), Rational(-8, 7)) equalsTo
+                        Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7))
+            }
+            assertFalse("test 5") {
+                Polynomial(Rational(8, 3), Rational(0), Rational(-8, 7)) equalsTo
+                        Polynomial(Rational(5, 9), Rational(0), Rational(-8, 7))
+            }
+            assertFalse("test 6") {
+                Polynomial(Rational(0), Rational(0), Rational(-8, 7), Rational(0), Rational(0)) equalsTo
+                        Polynomial(Rational(0), Rational(0), Rational(8, 7))
+            }
+        }
+    }
+    @Test
+    fun test_Polynomial_degree() {
+        RationalField.polynomial {
+            assertEquals(
+                2,
+                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)).degree,
+                "test 1"
+            )
+            assertEquals(
+                -1,
+                Polynomial<Rational>().degree,
+                "test 2"
+            )
+            assertEquals(
+                -1,
+                Polynomial(Rational(0)).degree,
+                "test 3"
+            )
+            assertEquals(
+                -1,
+                Polynomial(Rational(0), Rational(0)).degree,
+                "test 4"
+            )
+            assertEquals(
+                -1,
+                Polynomial(Rational(0), Rational(0), Rational(0)).degree,
+                "test 5"
+            )
+            assertEquals(
+                0,
+                Polynomial(Rational(5, 9)).degree,
+                "test 6"
+            )
+            assertEquals(
+                0,
+                Polynomial(Rational(5, 9), Rational(0)).degree,
+                "test 7"
+            )
+            assertEquals(
+                0,
+                Polynomial(Rational(5, 9), Rational(0), Rational(0)).degree,
+                "test 8"
+            )
+            assertEquals(
+                2,
+                Polynomial(Rational(0), Rational(0), Rational(-8, 7)).degree,
+                "test 9"
+            )
+            assertEquals(
+                2,
+                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7), Rational(0), Rational(0)).degree,
+                "test 10"
+            )
+            assertEquals(
+                2,
+                Polynomial(Rational(0), Rational(0), Rational(-8, 7), Rational(0), Rational(0)).degree,
+                "test 11"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_asConstantOrNull() {
+        RationalField.polynomial {
+            assertEquals(
+                Rational(0),
+                Polynomial<Rational>().asConstantOrNull(),
+                "test 1"
+            )
+            assertEquals(
+                Rational(0),
+                Polynomial(Rational(0)).asConstantOrNull(),
+                "test 2"
+            )
+            assertEquals(
+                Rational(0),
+                Polynomial(Rational(0), Rational(0)).asConstantOrNull(),
+                "test 3"
+            )
+            assertEquals(
+                Rational(0),
+                Polynomial(Rational(0), Rational(0), Rational(0)).asConstantOrNull(),
+                "test 4"
+            )
+            assertEquals(
+                Rational(-7, 9),
+                Polynomial(Rational(-7, 9)).asConstantOrNull(),
+                "test 5"
+            )
+            assertEquals(
+                Rational(-7, 9),
+                Polynomial(Rational(-7, 9), Rational(0)).asConstantOrNull(),
+                "test 6"
+            )
+            assertEquals(
+                Rational(-7, 9),
+                Polynomial(Rational(-7, 9), Rational(0), Rational(0)).asConstantOrNull(),
+                "test 7"
+            )
+            assertEquals(
+                null,
+                Polynomial(Rational(0), Rational(-7, 9)).asConstantOrNull(),
+                "test 8"
+            )
+            assertEquals(
+                null,
+                Polynomial(Rational(0), Rational(-7, 9), Rational(0)).asConstantOrNull(),
+                "test 9"
+            )
+            assertEquals(
+                null,
+                Polynomial(Rational(0), Rational(0), Rational(-7, 9)).asConstantOrNull(),
+                "test 10"
+            )
+            assertEquals(
+                null,
+                Polynomial(Rational(4, 15), Rational(0), Rational(-7, 9)).asConstantOrNull(),
+                "test 11"
+            )
+            assertEquals(
+                null,
+                Polynomial(Rational(4, 15), Rational(0), Rational(-7, 9), Rational(0)).asConstantOrNull(),
+                "test 12"
+            )
+        }
+    }
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
index b9dd74800..fbae61ed1 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
@@ -5,23 +5,224 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.test.misc.Rational
+import space.kscience.kmath.test.misc.RationalField
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 
 class PolynomialUtilTest {
     @Test
-    fun simple_polynomial_test() {
-        val polynomial : Polynomial<Double>
-        Double.algebra.scalablePolynomial {
-            val x = Polynomial(listOf(0.0, 1.0))
-            polynomial = x * x - 2 * x + 1
-        }
-        assertEquals(0.0, polynomial.substitute(1.0), 0.001)
-    }
-    @Test
-    fun testIntegration() {
+    fun test_substitute_Double() {
         val polynomial = Polynomial(1.0, -2.0, 1.0)
         assertEquals(0.0, polynomial.substitute(1.0), 0.001)
     }
+    @Test
+    fun test_substitute_Constant() {
+        assertEquals(
+            Rational(0),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, Rational(1)),
+            "test 1"
+        )
+        assertEquals(
+            Rational(25057, 21000),
+            Polynomial(Rational(5,8), Rational(8, 3), Rational(4, 7), Rational(3, 2))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 2"
+        )
+        assertEquals(
+            Rational(2983, 5250),
+            Polynomial(Rational(0), Rational(8, 3), Rational(4, 7), Rational(3, 2))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 3"
+        )
+        assertEquals(
+            Rational(4961, 4200),
+            Polynomial(Rational(5,8), Rational(8, 3), Rational(4, 7), Rational(0))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 4"
+        )
+        assertEquals(
+            Rational(3511, 3000),
+            Polynomial(Rational(5,8), Rational(8, 3), Rational(0), Rational(3, 2))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 5"
+        )
+    }
+    @Test
+    fun test_substitute_Polynomial() {
+        assertEquals(
+            Polynomial(),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, Polynomial(Rational(1))),
+            "test 1"
+        )
+        assertEquals(
+            Polynomial(Rational(709, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
+            Polynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(2, 7))
+                .substitute(RationalField, Polynomial(Rational(6, 9), Rational(1, 5))),
+            "test 2"
+        )
+        assertEquals(
+            Polynomial(Rational(655, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
+            Polynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(2, 7))
+                .substitute(RationalField, Polynomial(Rational(6, 9), Rational(1, 5))),
+            "test 3"
+        )
+        assertEquals(
+            Polynomial(Rational(677, 378), Rational(97, 180), Rational(1, 75)),
+            Polynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(0))
+                .substitute(RationalField, Polynomial(Rational(6, 9), Rational(1, 5))),
+            "test 4"
+        )
+        assertEquals(
+            Polynomial(Rational(653, 378), Rational(221, 420), Rational(4, 175), Rational(2, 875)),
+            Polynomial(Rational(1, 7), Rational(9, 4), Rational(0), Rational(2, 7))
+                .substitute(RationalField, Polynomial(Rational(6, 9), Rational(1, 5))),
+            "test 5"
+        )
+        assertEquals(
+            Polynomial(Rational(89, 54)),
+            Polynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(0))
+                .substitute(RationalField, Polynomial(Rational(6, 9), Rational(0))),
+            "test 6"
+        )
+    }
+    @Test
+    fun test_derivative() {
+        assertEquals(
+            Polynomial(Rational(-2), Rational(2)),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).derivative(RationalField),
+            "test 1"
+        )
+        assertEquals(
+            Polynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
+            "test 2"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
+            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
+            "test 3"
+        )
+        assertEquals(
+            Polynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7)),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).derivative(RationalField),
+            "test 4"
+        )
+    }
+    @Test
+    fun test_nthDerivative() {
+        assertEquals(
+            Polynomial(Rational(-2), Rational(2)),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 1),
+            "test 1"
+        )
+        assertFailsWith<IllegalArgumentException>("test2") {
+            Polynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, -1)
+        }
+        assertEquals(
+            Polynomial(Rational(1), Rational(-2), Rational(1)),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 0),
+            "test 3"
+        )
+        assertEquals(
+            Polynomial(Rational(2)),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 2),
+            "test 4"
+        )
+        assertEquals(
+            Polynomial(),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 3),
+            "test 5"
+        )
+        assertEquals(
+            Polynomial(),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 4),
+            "test 6"
+        )
+        assertEquals(
+            Polynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
+            "test 7"
+        )
+        assertEquals(
+            Polynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
+            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
+            "test 8"
+        )
+        assertEquals(
+            Polynomial(Rational(8, 9), Rational(30, 7)),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthDerivative(RationalField, 2),
+            "test 9"
+        )
+    }
+    @Test
+    fun test_antiderivative() {
+        assertEquals(
+            Polynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).antiderivative(RationalField),
+            "test 1"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
+            "test 2"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(0), Rational(0), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
+            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
+            "test 3"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28)),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).antiderivative(RationalField),
+            "test 4"
+        )
+    }
+    @Test
+    fun test_nthAntiderivative() {
+        assertEquals(
+            Polynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 1),
+            "test 1"
+        )
+        assertFailsWith<IllegalArgumentException>("test2") {
+            Polynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, -1)
+        }
+        assertEquals(
+            Polynomial(Rational(1), Rational(-2), Rational(1)),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 0),
+            "test 3"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(0), Rational(1, 2), Rational(-1, 3), Rational(1, 12)),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 2),
+            "test 4"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(0), Rational(0), Rational(1, 6), Rational(-1, 12), Rational(1, 60)),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 3),
+            "test 5"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 24), Rational(-1, 60), Rational(1, 360)),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 4),
+            "test 6"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
+            "test 7"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
+            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
+            "test 8"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28)),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthAntiderivative(RationalField, 2),
+            "test 9"
+        )
+    }
 }
\ No newline at end of file
-- 
2.34.1


From 88e0dcf413d518e571118eb5d1bf3310110bad5c Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 21 Mar 2022 18:26:09 +0300
Subject: [PATCH 460/713] Added usage of more correct exceptions.

---
 .../kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt | 2 +-
 .../space/kscience/kmath/functions/AbstractRationalFunction.kt  | 2 +-
 .../kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
index aacf055fa..fd1b51fae 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
@@ -295,7 +295,7 @@ public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P>
      * If polynomial is a constant polynomial represents and returns it as constant.
      * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
      */
-    public fun P.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
+    public fun P.asConstant(): C = requireNotNull(asConstantOrNull()) { "Can not represent non-constant polynomial as a constant" }
 
     override fun add(left: P, right: P): P = left + right
     override fun multiply(left: P, right: P): P = left * right
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
index b9ca01da4..cdc4bf530 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -460,7 +460,7 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
      * If polynomial is a constant polynomial represents and returns it as constant.
      * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
      */
-    public fun P.asConstant(): C = asConstantOrNull() ?: error("Can not represent non-constant polynomial as a constant")
+    public fun P.asConstant(): C = requireNotNull(asConstantOrNull()) { "Can not represent non-constant polynomial as a constant" }
 
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
index fbae61ed1..21c5436d3 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
@@ -11,6 +11,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
+
 class PolynomialUtilTest {
     @Test
     fun test_substitute_Double() {
-- 
2.34.1


From 83d57c7295a7b79a9991417c8ede01efc935a54d Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 21 Mar 2022 21:22:25 +0300
Subject: [PATCH 461/713] Added RFs' interface to remove another boilerplate.
 Fixed bug in RFs' equalsTo.

---
 .../functions/AbstractRationalFunction.kt     | 228 +++++++++++++++++-
 .../functions/LabeledRationalFunction.kt      | 216 ++---------------
 .../functions/NumberedRationalFunction.kt     | 216 ++---------------
 .../kmath/functions/RationalFunction.kt       | 221 ++---------------
 4 files changed, 277 insertions(+), 604 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
index cdc4bf530..7feab3dfb 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -423,7 +423,13 @@ public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R:
     /**
      * Checks equality of the rational functions.
      */
-    public infix fun R.equalsTo(other: R): Boolean
+    public infix fun R.equalsTo(other: R): Boolean =
+        when {
+            this === other -> true
+            numerator.isZero() != other.numerator.isZero() -> false
+            numeratorDegree - denominatorDegree != with(other) { numeratorDegree - denominatorDegree } -> false
+            else -> numerator * other.denominator equalsTo other.numerator * denominator
+        }
     /**
      * Checks NOT equality of the polynomials.
      */
@@ -857,4 +863,224 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
      * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
      */
     public override fun P.asConstant(): C = polynomialRing { this@asConstant.asConstant() }
+}
+
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
+ * [C]. It also assumes that there is provided [polynomialRing] (of type [AP]), that provides constant- and
+ * polynomial-wise operations.
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
+ */ // TODO: Add support of field
+@Suppress("INAPPLICABLE_JVM_NAME")
+public abstract class AbstractPolynomialFractionsSpace<
+        C,
+        P: AbstractPolynomial<C>,
+        R: AbstractRationalFunction<C, P>,
+        > : AbstractRationalFunctionalSpace<C, P, R> {
+    protected abstract fun constructRationalFunction(numerator: P, denominator: P) : R
+
+    /**
+     * Returns sum of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public override operator fun R.plus(other: Int): R =
+        constructRationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public override operator fun R.minus(other: Int): R =
+        constructRationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun R.times(other: Int): R =
+        constructRationalFunction(
+            numerator * other,
+            denominator
+        )
+
+    /**
+     * Returns sum of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public override operator fun Int.plus(other: R): R =
+        constructRationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns difference between the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public override operator fun Int.minus(other: R): R =
+        constructRationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns product of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: R): R =
+        constructRationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
+
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public override operator fun C.plus(other: R): R =
+        constructRationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns difference between the constant represented as polynomial and the rational function.
+     */
+    public override operator fun C.minus(other: R): R =
+        constructRationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns product of the constant represented as polynomial and the rational function.
+     */
+    public override operator fun C.times(other: R): R =
+        constructRationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
+
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public override operator fun R.plus(other: C): R =
+        constructRationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the constant represented as rational function and the rational function.
+     */
+    public override operator fun R.minus(other: C): R =
+        constructRationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the constant represented as rational function and the rational function.
+     */
+    public override operator fun R.times(other: C): R =
+        constructRationalFunction(
+            numerator * other,
+            denominator
+        )
+
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun P.plus(other: R): R =
+        constructRationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns difference between the polynomial represented as polynomial and the rational function.
+     */
+    public override operator fun P.minus(other: R): R =
+        constructRationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns product of the polynomial represented as polynomial and the rational function.
+     */
+    public override operator fun P.times(other: R): R =
+        constructRationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
+
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun R.plus(other: P): R =
+        constructRationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun R.minus(other: P): R =
+        constructRationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun R.times(other: P): R =
+        constructRationalFunction(
+            numerator * other,
+            denominator
+        )
+
+    /**
+     * Returns negation of the rational function.
+     */
+    public override operator fun R.unaryMinus(): R = constructRationalFunction(-numerator, denominator)
+    /**
+     * Returns sum of the rational functions.
+     */
+    public override operator fun R.plus(other: R): R =
+        constructRationalFunction(
+            numerator * other.denominator + denominator * other.numerator,
+            denominator * other.denominator
+        )
+    /**
+     * Returns difference of the rational functions.
+     */
+    public override operator fun R.minus(other: R): R =
+        constructRationalFunction(
+            numerator * other.denominator - denominator * other.numerator,
+            denominator * other.denominator
+        )
+    /**
+     * Returns product of the rational functions.
+     */
+    public override operator fun R.times(other: R): R =
+        constructRationalFunction(
+            numerator * other.numerator,
+            denominator * other.denominator
+        )
+
+    /**
+     * Instance of zero rational function (zero of the rational functions ring).
+     */
+    public override val zero: R get() = constructRationalFunction(polynomialZero, polynomialOne)
+
+    /**
+     * Instance of unit polynomial (unit of the rational functions ring).
+     */
+    public override val one: R get() = constructRationalFunction(polynomialOne, polynomialOne)
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index 9b5022f85..09b0b25ae 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -64,205 +64,25 @@ public class LabeledRationalFunction<C>(
 
 public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
     public val ring: A,
-) : AbstractRationalFunctionalSpaceOverPolynomialSpace<
-        C,
-        LabeledPolynomial<C>,
-        LabeledRationalFunction<C>,
-        LabeledPolynomialSpace<C, A>,
-        > {
+) :
+    AbstractRationalFunctionalSpaceOverPolynomialSpace<
+            C,
+            LabeledPolynomial<C>,
+            LabeledRationalFunction<C>,
+            LabeledPolynomialSpace<C, A>,
+            >,
+    AbstractPolynomialFractionsSpace<
+            C,
+            LabeledPolynomial<C>,
+            LabeledRationalFunction<C>,
+            >() {
 
     override val polynomialRing : LabeledPolynomialSpace<C, A> = LabeledPolynomialSpace(ring)
-
-    /**
-     * Returns sum of the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun LabeledRationalFunction<C>.plus(other: Int): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun LabeledRationalFunction<C>.minus(other: Int): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun LabeledRationalFunction<C>.times(other: Int): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator * other,
-            denominator
-        )
-
-    /**
-     * Returns sum of the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-
-    /**
-     * Returns sum of the constant represented as rational function and the rational function.
-     */
-    public override operator fun C.plus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the constant represented as polynomial and the rational function.
-     */
-    public override operator fun C.minus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the constant represented as polynomial and the rational function.
-     */
-    public override operator fun C.times(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-
-    /**
-     * Returns sum of the constant represented as rational function and the rational function.
-     */
-    public override operator fun LabeledRationalFunction<C>.plus(other: C): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the constant represented as rational function and the rational function.
-     */
-    public override operator fun LabeledRationalFunction<C>.minus(other: C): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the constant represented as rational function and the rational function.
-     */
-    public override operator fun LabeledRationalFunction<C>.times(other: C): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator * other,
-            denominator
-        )
-
-    /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun LabeledPolynomial<C>.plus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the polynomial represented as polynomial and the rational function.
-     */
-    public override operator fun LabeledPolynomial<C>.minus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the polynomial represented as polynomial and the rational function.
-     */
-    public override operator fun LabeledPolynomial<C>.times(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-
-    /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun LabeledRationalFunction<C>.plus(other: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun LabeledRationalFunction<C>.minus(other: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun LabeledRationalFunction<C>.times(other: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator * other,
-            denominator
-        )
-
-    /**
-     * Returns negation of the rational function.
-     */
-    public override operator fun LabeledRationalFunction<C>.unaryMinus(): LabeledRationalFunction<C> = LabeledRationalFunction(-numerator, denominator)
-    /**
-     * Returns sum of the rational functions.
-     */
-    public override operator fun LabeledRationalFunction<C>.plus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator * other.denominator + denominator * other.numerator,
-            denominator * other.denominator
-        )
-    /**
-     * Returns difference of the rational functions.
-     */
-    public override operator fun LabeledRationalFunction<C>.minus(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator * other.denominator - denominator * other.numerator,
-            denominator * other.denominator
-        )
-    /**
-     * Returns product of the rational functions.
-     */
-    public override operator fun LabeledRationalFunction<C>.times(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator * other.numerator,
-            denominator * other.denominator
-        )
+    override fun constructRationalFunction(
+        numerator: LabeledPolynomial<C>,
+        denominator: LabeledPolynomial<C>
+    ): LabeledRationalFunction<C> =
+        LabeledRationalFunction(numerator, denominator)
 
     /**
      * Instance of zero rational function (zero of the rational functions ring).
@@ -279,7 +99,7 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
     public override infix fun LabeledRationalFunction<C>.equalsTo(other: LabeledRationalFunction<C>): Boolean {
         if (this === other) return true
 
-        if ( !(numerator.isZero() xor other.numerator.isZero()) ) return false
+        if (numerator.isZero() != other.numerator.isZero()) return false
 
         val variables = this.variables union other.variables
         val thisNumeratorDegrees = this.numerator.degrees
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index 78ba233f5..4927460fb 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -60,205 +60,25 @@ public class NumberedRationalFunction<C> internal constructor(
 
 public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
     public val ring: A,
-) : AbstractRationalFunctionalSpaceOverPolynomialSpace<
-        C,
-        NumberedPolynomial<C>,
-        NumberedRationalFunction<C>,
-        NumberedPolynomialSpace<C, A>,
-        > {
+) :
+    AbstractRationalFunctionalSpaceOverPolynomialSpace<
+            C,
+            NumberedPolynomial<C>,
+            NumberedRationalFunction<C>,
+            NumberedPolynomialSpace<C, A>,
+            >,
+    AbstractPolynomialFractionsSpace<
+            C,
+            NumberedPolynomial<C>,
+            NumberedRationalFunction<C>,
+            >() {
 
     override val polynomialRing : NumberedPolynomialSpace<C, A> = NumberedPolynomialSpace(ring)
-
-    /**
-     * Returns sum of the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun NumberedRationalFunction<C>.plus(other: Int): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun NumberedRationalFunction<C>.minus(other: Int): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun NumberedRationalFunction<C>.times(other: Int): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator * other,
-            denominator
-        )
-
-    /**
-     * Returns sum of the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-
-    /**
-     * Returns sum of the constant represented as rational function and the rational function.
-     */
-    public override operator fun C.plus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the constant represented as polynomial and the rational function.
-     */
-    public override operator fun C.minus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the constant represented as polynomial and the rational function.
-     */
-    public override operator fun C.times(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-
-    /**
-     * Returns sum of the constant represented as rational function and the rational function.
-     */
-    public override operator fun NumberedRationalFunction<C>.plus(other: C): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the constant represented as rational function and the rational function.
-     */
-    public override operator fun NumberedRationalFunction<C>.minus(other: C): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the constant represented as rational function and the rational function.
-     */
-    public override operator fun NumberedRationalFunction<C>.times(other: C): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator * other,
-            denominator
-        )
-
-    /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun NumberedPolynomial<C>.plus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the polynomial represented as polynomial and the rational function.
-     */
-    public override operator fun NumberedPolynomial<C>.minus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the polynomial represented as polynomial and the rational function.
-     */
-    public override operator fun NumberedPolynomial<C>.times(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-
-    /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun NumberedRationalFunction<C>.plus(other: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun NumberedRationalFunction<C>.minus(other: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun NumberedRationalFunction<C>.times(other: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator * other,
-            denominator
-        )
-
-    /**
-     * Returns negation of the rational function.
-     */
-    public override operator fun NumberedRationalFunction<C>.unaryMinus(): NumberedRationalFunction<C> = NumberedRationalFunction(-numerator, denominator)
-    /**
-     * Returns sum of the rational functions.
-     */
-    public override operator fun NumberedRationalFunction<C>.plus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator * other.denominator + denominator * other.numerator,
-            denominator * other.denominator
-        )
-    /**
-     * Returns difference of the rational functions.
-     */
-    public override operator fun NumberedRationalFunction<C>.minus(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator * other.denominator - denominator * other.numerator,
-            denominator * other.denominator
-        )
-    /**
-     * Returns product of the rational functions.
-     */
-    public override operator fun NumberedRationalFunction<C>.times(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator * other.numerator,
-            denominator * other.denominator
-        )
+    override fun constructRationalFunction(
+        numerator: NumberedPolynomial<C>,
+        denominator: NumberedPolynomial<C>
+    ): NumberedRationalFunction<C> =
+        NumberedRationalFunction(numerator, denominator)
 
     /**
      * Instance of zero rational function (zero of the rational functions ring).
@@ -275,7 +95,7 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
     public override infix fun NumberedRationalFunction<C>.equalsTo(other: NumberedRationalFunction<C>): Boolean {
         if (this === other) return true
 
-        if ( !(numerator.isZero() xor other.numerator.isZero()) ) return false
+        if (numerator.isZero() != other.numerator.isZero()) return false
 
         val countOfVariables = max(this.lastVariable, other.lastVariable)
         val thisNumeratorDegrees = this.numerator.degrees
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 226eddce9..506aa4004 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -42,205 +42,22 @@ public data class RationalFunction<C> internal constructor (
 
 public class RationalFunctionSpace<C, A : Ring<C>> (
     public val ring: A,
-) : AbstractRationalFunctionalSpaceOverPolynomialSpace<
-        C,
-        Polynomial<C>,
-        RationalFunction<C>,
-        PolynomialSpace<C, A>,
-        > {
+) :
+    AbstractRationalFunctionalSpaceOverPolynomialSpace<
+            C,
+            Polynomial<C>,
+            RationalFunction<C>,
+            PolynomialSpace<C, A>,
+            >,
+    AbstractPolynomialFractionsSpace<
+            C,
+            Polynomial<C>,
+            RationalFunction<C>,
+            >() {
 
     override val polynomialRing : PolynomialSpace<C, A> = PolynomialSpace(ring)
-
-    /**
-     * Returns sum of the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun RationalFunction<C>.plus(other: Int): RationalFunction<C> =
-        RationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun RationalFunction<C>.minus(other: Int): RationalFunction<C> =
-        RationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun RationalFunction<C>.times(other: Int): RationalFunction<C> =
-        RationalFunction(
-            numerator * other,
-            denominator
-        )
-
-    /**
-     * Returns sum of the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: RationalFunction<C>): RationalFunction<C> =
-        RationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: RationalFunction<C>): RationalFunction<C> =
-        RationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: RationalFunction<C>): RationalFunction<C> =
-        RationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-
-    /**
-     * Returns sum of the constant represented as rational function and the rational function.
-     */
-    public override operator fun C.plus(other: RationalFunction<C>): RationalFunction<C> =
-        RationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the constant represented as polynomial and the rational function.
-     */
-    public override operator fun C.minus(other: RationalFunction<C>): RationalFunction<C> =
-        RationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the constant represented as polynomial and the rational function.
-     */
-    public override operator fun C.times(other: RationalFunction<C>): RationalFunction<C> =
-        RationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-
-    /**
-     * Returns sum of the constant represented as rational function and the rational function.
-     */
-    public override operator fun RationalFunction<C>.plus(other: C): RationalFunction<C> =
-        RationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the constant represented as rational function and the rational function.
-     */
-    public override operator fun RationalFunction<C>.minus(other: C): RationalFunction<C> =
-        RationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the constant represented as rational function and the rational function.
-     */
-    public override operator fun RationalFunction<C>.times(other: C): RationalFunction<C> =
-        RationalFunction(
-            numerator * other,
-            denominator
-        )
-
-    /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun Polynomial<C>.plus(other: RationalFunction<C>): RationalFunction<C> =
-        RationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the polynomial represented as polynomial and the rational function.
-     */
-    public override operator fun Polynomial<C>.minus(other: RationalFunction<C>): RationalFunction<C> =
-        RationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the polynomial represented as polynomial and the rational function.
-     */
-    public override operator fun Polynomial<C>.times(other: RationalFunction<C>): RationalFunction<C> =
-        RationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-
-    /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun RationalFunction<C>.plus(other: Polynomial<C>): RationalFunction<C> =
-        RationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun RationalFunction<C>.minus(other: Polynomial<C>): RationalFunction<C> =
-        RationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun RationalFunction<C>.times(other: Polynomial<C>): RationalFunction<C> =
-        RationalFunction(
-            numerator * other,
-            denominator
-        )
-
-    /**
-     * Returns negation of the rational function.
-     */
-    public override operator fun RationalFunction<C>.unaryMinus(): RationalFunction<C> = RationalFunction(-numerator, denominator)
-    /**
-     * Returns sum of the rational functions.
-     */
-    public override operator fun RationalFunction<C>.plus(other: RationalFunction<C>): RationalFunction<C> =
-        RationalFunction(
-            numerator * other.denominator + denominator * other.numerator,
-            denominator * other.denominator
-        )
-    /**
-     * Returns difference of the rational functions.
-     */
-    public override operator fun RationalFunction<C>.minus(other: RationalFunction<C>): RationalFunction<C> =
-        RationalFunction(
-            numerator * other.denominator - denominator * other.numerator,
-            denominator * other.denominator
-        )
-    /**
-     * Returns product of the rational functions.
-     */
-    public override operator fun RationalFunction<C>.times(other: RationalFunction<C>): RationalFunction<C> =
-        RationalFunction(
-            numerator * other.numerator,
-            denominator * other.denominator
-        )
+    override fun constructRationalFunction(numerator: Polynomial<C>, denominator: Polynomial<C>): RationalFunction<C> =
+        RationalFunction(numerator, denominator)
 
     /**
      * Instance of zero rational function (zero of the rational functions ring).
@@ -251,16 +68,6 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
      */
     public override val one: RationalFunction<C> = RationalFunction(polynomialOne, polynomialOne)
 
-    /**
-     * Checks equality of the rational functions.
-     */
-    public override infix fun RationalFunction<C>.equalsTo(other: RationalFunction<C>): Boolean =
-        when {
-            this === other -> true
-            numeratorDegree - denominatorDegree != with(other) { numeratorDegree - denominatorDegree } -> false
-            else -> numerator * other.denominator equalsTo other.numerator * denominator
-        }
-
     // TODO: Разобрать
 
     public operator fun RationalFunction<C>.div(other: RationalFunction<C>): RationalFunction<C> =
-- 
2.34.1


From 51b0d232b561ecc57fe6d6660c9a9d104a447dd2 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 21 Mar 2022 23:21:55 +0300
Subject: [PATCH 462/713] Renamed `AbstractPolynomialFractionsSpace` to
 `PolynomialSpaceOfFractions`

---
 .../kscience/kmath/functions/AbstractRationalFunction.kt     | 5 ++---
 .../kscience/kmath/functions/LabeledRationalFunction.kt      | 2 +-
 .../kscience/kmath/functions/NumberedRationalFunction.kt     | 2 +-
 .../space/kscience/kmath/functions/RationalFunction.kt       | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
index 7feab3dfb..c9c0b3920 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
@@ -867,8 +867,7 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
 
 /**
  * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
- * [C]. It also assumes that there is provided [polynomialRing] (of type [AP]), that provides constant- and
- * polynomial-wise operations.
+ * [C]. It also assumes that there is provided constructor
  *
  * @param C the type of constants. Polynomials have them as coefficients in their terms.
  * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
@@ -876,7 +875,7 @@ public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
  * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
  */ // TODO: Add support of field
 @Suppress("INAPPLICABLE_JVM_NAME")
-public abstract class AbstractPolynomialFractionsSpace<
+public abstract class PolynomialSpaceOfFractions<
         C,
         P: AbstractPolynomial<C>,
         R: AbstractRationalFunction<C, P>,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index 09b0b25ae..92bd344ac 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -71,7 +71,7 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
             LabeledRationalFunction<C>,
             LabeledPolynomialSpace<C, A>,
             >,
-    AbstractPolynomialFractionsSpace<
+    PolynomialSpaceOfFractions<
             C,
             LabeledPolynomial<C>,
             LabeledRationalFunction<C>,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index 4927460fb..4da715e3f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -67,7 +67,7 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
             NumberedRationalFunction<C>,
             NumberedPolynomialSpace<C, A>,
             >,
-    AbstractPolynomialFractionsSpace<
+    PolynomialSpaceOfFractions<
             C,
             NumberedPolynomial<C>,
             NumberedRationalFunction<C>,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 506aa4004..51c1e2f80 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -49,7 +49,7 @@ public class RationalFunctionSpace<C, A : Ring<C>> (
             RationalFunction<C>,
             PolynomialSpace<C, A>,
             >,
-    AbstractPolynomialFractionsSpace<
+    PolynomialSpaceOfFractions<
             C,
             Polynomial<C>,
             RationalFunction<C>,
-- 
2.34.1


From c6d1068df465dca4374dde7cb1395cb9dbcff8f9 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 21 Mar 2022 23:47:10 +0300
Subject: [PATCH 463/713] Renamed `Polynomial`, etc. to `ListPolynomial`, etc.
 and `AbstractPolynomial` to `Polynomial`.

As it was advised by @CommanderTvis.
---
 .../kmath/functions/AbstractPolynomial.kt     |  389 ------
 .../functions/AbstractRationalFunction.kt     | 1085 ---------------
 .../kmath/functions/LabeledPolynomial.kt      |    4 +-
 .../functions/LabeledRationalFunction.kt      |    4 +-
 .../kmath/functions/ListPolynomial.kt         |  491 +++++++
 .../kmath/functions/ListRationalFunction.kt   |  154 +++
 .../kmath/functions/NumberedPolynomial.kt     |    4 +-
 .../functions/NumberedRationalFunction.kt     |    4 +-
 .../kscience/kmath/functions/Piecewise.kt     |   22 +-
 .../kscience/kmath/functions/Polynomial.kt    |  644 ++++-----
 .../kmath/functions/RationalFunction.kt       | 1175 +++++++++++++++--
 .../functions/labeledRationalFunctionUtil.kt  |    2 +-
 ...olynomialUtil.kt => listPolynomialUtil.kt} |   66 +-
 ...ionUtil.kt => listRationalFunctionUtil.kt} |   26 +-
 .../functions/numberedRationalFunctionUtil.kt |    2 +-
 .../kmath/interpolation/LinearInterpolator.kt |    4 +-
 .../kmath/interpolation/SplineInterpolator.kt |    4 +-
 .../kmath/functions/ListPolynomialTest.kt     |  705 ++++++++++
 .../kmath/functions/ListPolynomialUtilTest.kt |  229 ++++
 .../kmath/functions/PolynomialTest.kt         |  691 ----------
 .../kmath/functions/PolynomialUtilTest.kt     |  229 ----
 .../kmath/integration/SplineIntegralTest.kt   |    4 +-
 .../kscience/kmath/test/misc/IntModulo.kt     |   14 +-
 23 files changed, 2983 insertions(+), 2969 deletions(-)
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
 rename kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/{polynomialUtil.kt => listPolynomialUtil.kt} (72%)
 rename kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/{rationalFunctionUtil.kt => listRationalFunctionUtil.kt} (88%)
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
deleted file mode 100644
index fd1b51fae..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractPolynomial.kt
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.*
-import kotlin.js.JsName
-import kotlin.jvm.JvmName
-
-
-/**
- * Abstraction of polynomials.
- */
-public interface AbstractPolynomial<C>
-
-/**
- * Abstraction of ring of polynomials of type [P] over ring of constants of type [C].
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials.
- */
-@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
-public interface AbstractPolynomialSpace<C, P: AbstractPolynomial<C>> : Ring<P> {
-    /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
-     */
-    public operator fun C.plus(other: Int): C
-    /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
-     */
-    public operator fun C.minus(other: Int): C
-    /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public operator fun C.times(other: Int): C
-
-    /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
-     */
-    public operator fun Int.plus(other: C): C
-    /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
-     */
-    public operator fun Int.minus(other: C): C
-    /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public operator fun Int.times(other: C): C
-
-    /**
-     * Returns sum of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public operator fun P.plus(other: Int): P = addMultipliedBySquaring(this, one, other)
-    /**
-     * Returns difference between the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public operator fun P.minus(other: Int): P = addMultipliedBySquaring(this, one, -other)
-    /**
-     * Returns product of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public operator fun P.times(other: Int): P = multiplyBySquaring(this, other)
-
-    /**
-     * Returns sum of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public operator fun Int.plus(other: P): P = addMultipliedBySquaring(other, one, this)
-    /**
-     * Returns difference between the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public operator fun Int.minus(other: P): P = addMultipliedBySquaring(-other, one, this)
-    /**
-     * Returns product of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public operator fun Int.times(other: P): P = multiplyBySquaring(other, this)
-
-    /**
-     * Returns the same constant.
-     */
-    @JvmName("constantUnaryPlus")
-    @JsName("constantUnaryPlus")
-    public operator fun C.unaryPlus(): C = this
-    /**
-     * Returns negation of the constant.
-     */
-    @JvmName("constantUnaryMinus")
-    @JsName("constantUnaryMinus")
-    public operator fun C.unaryMinus(): C
-    /**
-     * Returns sum of the constants.
-     */
-    @JvmName("constantPlus")
-    @JsName("constantPlus")
-    public operator fun C.plus(other: C): C
-    /**
-     * Returns difference of the constants.
-     */
-    @JvmName("constantMinus")
-    @JsName("constantMinus")
-    public operator fun C.minus(other: C): C
-    /**
-     * Returns product of the constants.
-     */
-    @JvmName("constantTimes")
-    @JsName("constantTimes")
-    public operator fun C.times(other: C): C
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("constantPower")
-    @JsName("constantPower")
-    public fun power(arg: C, exponent: UInt) : C
-
-    /**
-     * Check if the instant is zero constant.
-     */
-    public fun C.isZero(): Boolean = this == constantZero
-    /**
-     * Check if the instant is NOT zero constant.
-     */
-    public fun C.isNotZero(): Boolean = !isZero()
-    /**
-     * Check if the instant is unit constant.
-     */
-    public fun C.isOne(): Boolean = this == constantOne
-    /**
-     * Check if the instant is NOT unit constant.
-     */
-    public fun C.isNotOne(): Boolean = !isOne()
-    /**
-     * Check if the instant is minus unit constant.
-     */
-    public fun C.isMinusOne(): Boolean = this == -constantOne
-    /**
-     * Check if the instant is NOT minus unit constant.
-     */
-    public fun C.isNotMinusOne(): Boolean = !isMinusOne()
-
-    /**
-     * Instance of zero constant (zero of the underlying ring).
-     */
-    public val constantZero: C
-    /**
-     * Instance of unit constant (unit of the underlying ring).
-     */
-    public val constantOne: C
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    public operator fun C.plus(other: P): P
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    public operator fun C.minus(other: P): P
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    public operator fun C.times(other: P): P
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    public operator fun P.plus(other: C): P
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    public operator fun P.minus(other: C): P
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    public operator fun P.times(other: C): P
-
-    /**
-     * Returns the same polynomial.
-     */
-    public override operator fun P.unaryPlus(): P = this
-    /**
-     * Returns negation of the polynomial.
-     */
-    public override operator fun P.unaryMinus(): P
-    /**
-     * Returns sum of the polynomials.
-     */
-    public override operator fun P.plus(other: P): P
-    /**
-     * Returns difference of the polynomials.
-     */
-    public override operator fun P.minus(other: P): P
-    /**
-     * Returns product of the polynomials.
-     */
-    public override operator fun P.times(other: P): P
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    public override fun power(arg: P, exponent: UInt) : P = exponentiationBySquaring(arg, exponent)
-
-    /**
-     * Check if the instant is zero polynomial.
-     */
-    public fun P.isZero(): Boolean = this equalsTo zero
-    /**
-     * Check if the instant is NOT zero polynomial.
-     */
-    public fun P.isNotZero(): Boolean = !isZero()
-    /**
-     * Check if the instant is unit polynomial.
-     */
-    public fun P.isOne(): Boolean = this equalsTo one
-    /**
-     * Check if the instant is NOT unit polynomial.
-     */
-    public fun P.isNotOne(): Boolean = !isOne()
-    /**
-     * Check if the instant is minus unit polynomial.
-     */
-    public fun P.isMinusOne(): Boolean = this equalsTo -one
-    /**
-     * Check if the instant is NOT minus unit polynomial.
-     */
-    public fun P.isNotMinusOne(): Boolean = !isMinusOne()
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    public override val zero: P
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    public override val one: P
-
-    /**
-     * Checks equality of the polynomials.
-     */
-    public infix fun P.equalsTo(other: P): Boolean
-    /**
-     * Checks NOT equality of the polynomials.
-     */
-    public infix fun P.notEqualsTo(other: P): Boolean = !(this equalsTo other)
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    public val P.degree: Int
-
-    /**
-     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isConstant(): Boolean = degree <= 0
-    /**
-     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isNotConstant(): Boolean = !isConstant()
-    /**
-     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isNonZeroConstant(): Boolean = degree == 0
-    /**
-     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
-     */
-    public fun P.asConstantOrNull(): C?
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
-     */
-    public fun P.asConstant(): C = requireNotNull(asConstantOrNull()) { "Can not represent non-constant polynomial as a constant" }
-
-    override fun add(left: P, right: P): P = left + right
-    override fun multiply(left: P, right: P): P = left * right
-}
-
-/**
- * Abstraction of ring of polynomials of type [P] over ring of constants of type [C]. It also assumes that there is
- * provided [ring] (of type [A]), that provides constant-wise operations.
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials.
- * @param A the type of algebraic structure (precisely, of ring) provided for constants.
- */
-@Suppress("INAPPLICABLE_JVM_NAME")
-public interface AbstractPolynomialSpaceOverRing<C, P: AbstractPolynomial<C>, A: Ring<C>> : AbstractPolynomialSpace<C, P> {
-
-    public val ring: A
-
-    /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
-     */
-    public override operator fun C.plus(other: Int): C = ring { addMultipliedBySquaring(this@plus, one, other) }
-    /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
-     */
-    public override operator fun C.minus(other: Int): C = ring { addMultipliedBySquaring(this@minus, one, -other) }
-    /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun C.times(other: Int): C = ring { multiplyBySquaring(this@times, other) }
-
-    /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
-     */
-    public override operator fun Int.plus(other: C): C = ring { addMultipliedBySquaring(other, one, this@plus) }
-    /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
-     */
-    public override operator fun Int.minus(other: C): C = ring { addMultipliedBySquaring(-other, one, this@minus) }
-    /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: C): C = ring { multiplyBySquaring(other, this@times) }
-
-    /**
-     * Returns negation of the constant.
-     */
-    @JvmName("constantUnaryMinus")
-    public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
-    /**
-     * Returns sum of the constants.
-     */
-    @JvmName("constantPlus")
-    public override operator fun C.plus(other: C): C = ring { this@plus + other }
-    /**
-     * Returns difference of the constants.
-     */
-    @JvmName("constantMinus")
-    public override operator fun C.minus(other: C): C = ring { this@minus - other }
-    /**
-     * Returns product of the constants.
-     */
-    @JvmName("constantTimes")
-    public override operator fun C.times(other: C): C = ring { this@times * other }
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("constantPower")
-    override fun power(arg: C, exponent: UInt): C = ring { power(arg, exponent) }
-
-    /**
-     * Instance of zero constant (zero of the underlying ring).
-     */
-    public override val constantZero: C get() = ring.zero
-    /**
-     * Instance of unit constant (unit of the underlying ring).
-     */
-    public override val constantOne: C get() = ring.one
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
deleted file mode 100644
index c9c0b3920..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/AbstractRationalFunction.kt
+++ /dev/null
@@ -1,1085 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.*
-import kotlin.js.JsName
-import kotlin.jvm.JvmName
-
-
-/**
- * Abstraction of rational function.
- */
-public interface AbstractRationalFunction<C, P: AbstractPolynomial<C>> {
-    public val numerator: P
-    public val denominator: P
-    public operator fun component1(): P = numerator
-    public operator fun component2(): P = denominator
-}
-
-/**
- * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
- * [C].
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
- * @param R the type of rational functions.
- */ // TODO: Add support of field
-@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
-public interface AbstractRationalFunctionalSpace<C, P: AbstractPolynomial<C>, R: AbstractRationalFunction<C, P>> : Ring<R> {
-    /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
-     */
-    public operator fun C.plus(other: Int): C
-    /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
-     */
-    public operator fun C.minus(other: Int): C
-    /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public operator fun C.times(other: Int): C
-
-    /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
-     */
-    public operator fun Int.plus(other: C): C
-    /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
-     */
-    public operator fun Int.minus(other: C): C
-    /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public operator fun Int.times(other: C): C
-
-    /**
-     * Returns sum of the constant and the integer represented as polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public operator fun P.plus(other: Int): P
-    /**
-     * Returns difference between the constant and the integer represented as polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public operator fun P.minus(other: Int): P
-    /**
-     * Returns product of the constant and the integer represented as polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public operator fun P.times(other: Int): P
-
-    /**
-     * Returns sum of the integer represented as polynomial and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public operator fun Int.plus(other: P): P
-    /**
-     * Returns difference between the integer represented as polynomial and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public operator fun Int.minus(other: P): P
-    /**
-     * Returns product of the integer represented as polynomial and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public operator fun Int.times(other: P): P
-
-    /**
-     * Returns sum of the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public operator fun R.plus(other: Int): R = addMultipliedBySquaring(this, one, other)
-    /**
-     * Returns difference between the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public operator fun R.minus(other: Int): R = addMultipliedBySquaring(this, one, -other)
-    /**
-     * Returns product of the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public operator fun R.times(other: Int): R = multiplyBySquaring(this, other)
-
-    /**
-     * Returns sum of the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public operator fun Int.plus(other: R): R = addMultipliedBySquaring(other, one, this)
-    /**
-     * Returns difference between the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public operator fun Int.minus(other: R): R = addMultipliedBySquaring(-other, one, this)
-    /**
-     * Returns product of the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public operator fun Int.times(other: R): R = multiplyBySquaring(other, this)
-
-    /**
-     * Returns the same constant.
-     */
-    @JvmName("constantUnaryPlus")
-    @JsName("constantUnaryPlus")
-    public operator fun C.unaryPlus(): C = this
-    /**
-     * Returns negation of the constant.
-     */
-    @JvmName("constantUnaryMinus")
-    @JsName("constantUnaryMinus")
-    public operator fun C.unaryMinus(): C
-    /**
-     * Returns sum of the constants.
-     */
-    @JvmName("constantPlus")
-    @JsName("constantPlus")
-    public operator fun C.plus(other: C): C
-    /**
-     * Returns difference of the constants.
-     */
-    @JvmName("constantMinus")
-    @JsName("constantMinus")
-    public operator fun C.minus(other: C): C
-    /**
-     * Returns product of the constants.
-     */
-    @JvmName("constantTimes")
-    @JsName("constantTimes")
-    public operator fun C.times(other: C): C
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("constantPower")
-    @JsName("constantPower")
-    public fun power(arg: C, exponent: UInt) : C
-
-    /**
-     * Check if the instant is zero constant.
-     */
-    public fun C.isZero(): Boolean = this == constantZero
-    /**
-     * Check if the instant is NOT zero constant.
-     */
-    public fun C.isNotZero(): Boolean = !isZero()
-    /**
-     * Check if the instant is unit constant.
-     */
-    public fun C.isOne(): Boolean =  this == constantOne
-    /**
-     * Check if the instant is NOT unit constant.
-     */
-    public fun C.isNotOne(): Boolean = !isOne()
-    /**
-     * Check if the instant is minus unit constant.
-     */
-    public fun C.isMinusOne(): Boolean =  this == -constantOne
-    /**
-     * Check if the instant is NOT minus unit constant.
-     */
-    public fun C.isNotMinusOne(): Boolean = !isMinusOne()
-
-    /**
-     * Instance of zero constant (zero of the underlying ring).
-     */
-    public val constantZero: C
-    /**
-     * Instance of unit constant (unit of the underlying ring).
-     */
-    public val constantOne: C
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    public operator fun C.plus(other: P): P
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    public operator fun C.minus(other: P): P
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    public operator fun C.times(other: P): P
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    public operator fun P.plus(other: C): P
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    public operator fun P.minus(other: C): P
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    public operator fun P.times(other: C): P
-
-    /**
-     * Returns the same polynomial.
-     */
-    public operator fun P.unaryPlus(): P = this
-    /**
-     * Returns negation of the polynomial.
-     */
-    public operator fun P.unaryMinus(): P
-    /**
-     * Returns sum of the polynomials.
-     */
-    public operator fun P.plus(other: P): P
-    /**
-     * Returns difference of the polynomials.
-     */
-    public operator fun P.minus(other: P): P
-    /**
-     * Returns product of the polynomials.
-     */
-    public operator fun P.times(other: P): P
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    public fun power(arg: P, exponent: UInt) : P
-
-    /**
-     * Check if the instant is zero polynomial.
-     */
-    public fun P.isZero(): Boolean = this equalsTo polynomialZero
-    /**
-     * Check if the instant is NOT zero polynomial.
-     */
-    public fun P.isNotZero(): Boolean = !isZero()
-    /**
-     * Check if the instant is unit polynomial.
-     */
-    public fun P.isOne(): Boolean = this equalsTo polynomialOne
-    /**
-     * Check if the instant is NOT unit polynomial.
-     */
-    public fun P.isNotOne(): Boolean = !isOne()
-    /**
-     * Check if the instant is minus unit polynomial.
-     */
-    public fun P.isMinusOne(): Boolean = this equalsTo -polynomialOne
-    /**
-     * Check if the instant is NOT minus unit polynomial.
-     */
-    public fun P.isNotMinusOne(): Boolean = !isMinusOne()
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    public val polynomialZero: P
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    public val polynomialOne: P
-
-    /**
-     * Checks equality of the polynomials.
-     */
-    public infix fun P.equalsTo(other: P): Boolean
-    /**
-     * Checks NOT equality of the polynomials.
-     */
-    public infix fun P.notEqualsTo(other: P): Boolean = !(this equalsTo other)
-
-    /**
-     * Returns sum of the constant represented as rational function and the rational function.
-     */
-    public operator fun C.plus(other: R): R
-    /**
-     * Returns difference between the constant represented as polynomial and the rational function.
-     */
-    public operator fun C.minus(other: R): R
-    /**
-     * Returns product of the constant represented as polynomial and the rational function.
-     */
-    public operator fun C.times(other: R): R
-
-    /**
-     * Returns sum of the constant represented as rational function and the rational function.
-     */
-    public operator fun R.plus(other: C): R
-    /**
-     * Returns difference between the constant represented as rational function and the rational function.
-     */
-    public operator fun R.minus(other: C): R
-    /**
-     * Returns product of the constant represented as rational function and the rational function.
-     */
-    public operator fun R.times(other: C): R
-
-    /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
-     */
-    public operator fun P.plus(other: R): R
-    /**
-     * Returns difference between the polynomial represented as polynomial and the rational function.
-     */
-    public operator fun P.minus(other: R): R
-    /**
-     * Returns product of the polynomial represented as polynomial and the rational function.
-     */
-    public operator fun P.times(other: R): R
-
-    /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
-     */
-    public operator fun R.plus(other: P): R
-    /**
-     * Returns difference between the polynomial represented as rational function and the rational function.
-     */
-    public operator fun R.minus(other: P): R
-    /**
-     * Returns product of the polynomial represented as rational function and the rational function.
-     */
-    public operator fun R.times(other: P): R
-
-    /**
-     * Returns the same rational function.
-     */
-    public override operator fun R.unaryPlus(): R = this
-    /**
-     * Returns negation of the rational function.
-     */
-    public override operator fun R.unaryMinus(): R
-    /**
-     * Returns sum of the rational functions.
-     */
-    public override operator fun R.plus(other: R): R
-    /**
-     * Returns difference of the rational functions.
-     */
-    public override operator fun R.minus(other: R): R
-    /**
-     * Returns product of the rational functions.
-     */
-    public override operator fun R.times(other: R): R
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    public override fun power(arg: R, exponent: UInt) : R = exponentiationBySquaring(arg, exponent)
-
-    /**
-     * Check if the instant is zero rational function.
-     */
-    public fun R.isZero(): Boolean = numerator equalsTo polynomialZero
-    /**
-     * Check if the instant is NOT zero rational function.
-     */
-    public fun R.isNotZero(): Boolean = !isZero()
-    /**
-     * Check if the instant is unit rational function.
-     */
-    public fun R.isOne(): Boolean = numerator equalsTo denominator
-    /**
-     * Check if the instant is NOT unit rational function.
-     */
-    public fun R.isNotOne(): Boolean = !isOne()
-    /**
-     * Check if the instant is minus unit rational function.
-     */
-    public fun R.isMinusOne(): Boolean = (numerator + denominator).isZero()
-    /**
-     * Check if the instant is NOT minus unit rational function.
-     */
-    public fun R.isNotMinusOne(): Boolean = !isMinusOne()
-
-    /**
-     * Instance of zero rational function (zero of the rational functions ring).
-     */
-    public override val zero: R
-    /**
-     * Instance of unit polynomial (unit of the rational functions ring).
-     */
-    public override val one: R
-
-    /**
-     * Checks equality of the rational functions.
-     */
-    public infix fun R.equalsTo(other: R): Boolean =
-        when {
-            this === other -> true
-            numerator.isZero() != other.numerator.isZero() -> false
-            numeratorDegree - denominatorDegree != with(other) { numeratorDegree - denominatorDegree } -> false
-            else -> numerator * other.denominator equalsTo other.numerator * denominator
-        }
-    /**
-     * Checks NOT equality of the polynomials.
-     */
-    public infix fun R.notEqualsTo(other: R): Boolean = !(this equalsTo other)
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    public val P.degree: Int
-
-    /**
-     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isConstant(): Boolean = degree <= 0
-    /**
-     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isNotConstant(): Boolean = !isConstant()
-    /**
-     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isNonZeroConstant(): Boolean = degree == 0
-    /**
-     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
-     */
-    public fun P.asConstantOrNull(): C?
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
-     */
-    public fun P.asConstant(): C = requireNotNull(asConstantOrNull()) { "Can not represent non-constant polynomial as a constant" }
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    public val R.numeratorDegree: Int get() = numerator.degree
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    public val R.denominatorDegree: Int get() = denominator.degree
-
-    override fun add(left: R, right: R): R = left + right
-    override fun multiply(left: R, right: R): R = left * right
-}
-
-/**
- * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
- * [C]. It also assumes that there is provided [ring] (of type [A]), that provides constant-wise operations.
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
- * @param R the type of rational functions.
- * @param A the type of algebraic structure (precisely, of ring) provided for constants.
- */ // TODO: Add support of field
-@Suppress("INAPPLICABLE_JVM_NAME")
-public interface AbstractRationalFunctionalSpaceOverRing<C, P: AbstractPolynomial<C>, R: AbstractRationalFunction<C, P>, A: Ring<C>> : AbstractRationalFunctionalSpace<C, P, R> {
-
-    public val ring: A
-
-    /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
-     */
-    public override operator fun C.plus(other: Int): C = ring { addMultipliedBySquaring(this@plus, one, other) }
-    /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
-     */
-    public override operator fun C.minus(other: Int): C = ring { addMultipliedBySquaring(this@minus, one, -other) }
-    /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun C.times(other: Int): C = ring { multiplyBySquaring(this@times, other) }
-
-    /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
-     */
-    public override operator fun Int.plus(other: C): C = ring { addMultipliedBySquaring(other, one, this@plus) }
-    /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
-     */
-    public override operator fun Int.minus(other: C): C = ring { addMultipliedBySquaring(-other, one, this@minus) }
-    /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: C): C = ring { multiplyBySquaring(other, this@times) }
-
-    /**
-     * Returns the same constant.
-     */
-    @JvmName("constantUnaryPlus")
-    public override operator fun C.unaryPlus(): C = ring { +this@unaryPlus }
-    /**
-     * Returns negation of the constant.
-     */
-    @JvmName("constantUnaryMinus")
-    public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
-    /**
-     * Returns sum of the constants.
-     */
-    @JvmName("constantPlus")
-    public override operator fun C.plus(other: C): C = ring { this@plus + other }
-    /**
-     * Returns difference of the constants.
-     */
-    @JvmName("constantMinus")
-    public override operator fun C.minus(other: C): C = ring { this@minus - other }
-    /**
-     * Returns product of the constants.
-     */
-    @JvmName("constantTimes")
-    public override operator fun C.times(other: C): C = ring { this@times * other }
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("constantPower")
-    public override fun power(arg: C, exponent: UInt) : C = ring { power(arg, exponent) }
-
-    /**
-     * Instance of zero constant (zero of the underlying ring).
-     */
-    public override val constantZero: C get() = ring.zero
-    /**
-     * Instance of unit constant (unit of the underlying ring).
-     */
-    public override val constantOne: C get() = ring.one
-}
-
-/**
- * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
- * [C]. It also assumes that there is provided [polynomialRing] (of type [AP]), that provides constant- and
- * polynomial-wise operations.
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
- * @param R the type of rational functions.
- * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
- */ // TODO: Add support of field
-@Suppress("INAPPLICABLE_JVM_NAME")
-public interface AbstractRationalFunctionalSpaceOverPolynomialSpace<
-        C,
-        P: AbstractPolynomial<C>,
-        R: AbstractRationalFunction<C, P>,
-        AP: AbstractPolynomialSpace<C, P>,
-        > : AbstractRationalFunctionalSpace<C, P, R> {
-
-    public val polynomialRing: AP
-
-    /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
-     */
-    public override operator fun C.plus(other: Int): C = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
-     */
-    public override operator fun C.minus(other: Int): C = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun C.times(other: Int): C = polynomialRing { this@times * other }
-
-    /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
-     */
-    public override operator fun Int.plus(other: C): C = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
-     */
-    public override operator fun Int.minus(other: C): C = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: C): C = polynomialRing { this@times * other }
-
-    /**
-     * Returns sum of the constant and the integer represented as polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun P.plus(other: Int): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the constant and the integer represented as polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun P.minus(other: Int): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the constant and the integer represented as polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun P.times(other: Int): P = polynomialRing { this@times * other }
-
-    /**
-     * Returns sum of the integer represented as polynomial and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: P): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the integer represented as polynomial and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: P): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the integer represented as polynomial and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: P): P = polynomialRing { this@times * other }
-
-    /**
-     * Returns the same constant.
-     */
-    @JvmName("constantUnaryPlus")
-    public override operator fun C.unaryPlus(): C = polynomialRing { +this@unaryPlus }
-    /**
-     * Returns negation of the constant.
-     */
-    @JvmName("constantUnaryMinus")
-    public override operator fun C.unaryMinus(): C = polynomialRing { -this@unaryMinus }
-    /**
-     * Returns sum of the constants.
-     */
-    @JvmName("constantPlus")
-    public override operator fun C.plus(other: C): C = polynomialRing { this@plus + other }
-    /**
-     * Returns difference of the constants.
-     */
-    @JvmName("constantMinus")
-    public override operator fun C.minus(other: C): C = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the constants.
-     */
-    @JvmName("constantTimes")
-    public override operator fun C.times(other: C): C = polynomialRing { this@times * other }
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("constantPower")
-    public override fun power(arg: C, exponent: UInt) : C = polynomialRing { power(arg, exponent) }
-
-    /**
-     * Check if the instant is zero constant.
-     */
-    public override fun C.isZero(): Boolean = polynomialRing { this@isZero.isZero() }
-    /**
-     * Check if the instant is NOT zero constant.
-     */
-    public override fun C.isNotZero(): Boolean = polynomialRing { this@isNotZero.isNotZero() }
-    /**
-     * Check if the instant is unit constant.
-     */
-    public override fun C.isOne(): Boolean = polynomialRing { this@isOne.isOne() }
-    /**
-     * Check if the instant is NOT unit constant.
-     */
-    public override fun C.isNotOne(): Boolean = polynomialRing { this@isNotOne.isNotOne() }
-    /**
-     * Check if the instant is minus unit constant.
-     */
-    public override fun C.isMinusOne(): Boolean = polynomialRing { this@isMinusOne.isMinusOne() }
-    /**
-     * Check if the instant is NOT minus unit constant.
-     */
-    public override fun C.isNotMinusOne(): Boolean = polynomialRing { this@isNotMinusOne.isNotMinusOne() }
-
-    /**
-     * Instance of zero constant (zero of the underlying ring).
-     */
-    public override val constantZero: C get() = polynomialRing.constantZero
-    /**
-     * Instance of unit constant (unit of the underlying ring).
-     */
-    public override val constantOne: C get() = polynomialRing.constantOne
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    public override operator fun C.plus(other: P): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    public override operator fun C.minus(other: P): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    public override operator fun C.times(other: P): P = polynomialRing { this@times * other }
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    public override operator fun P.plus(other: C): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    public override operator fun P.minus(other: C): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    public override operator fun P.times(other: C): P = polynomialRing { this@times * other }
-
-    /**
-     * Returns the same polynomial.
-     */
-    public override operator fun P.unaryPlus(): P = polynomialRing { +this@unaryPlus }
-    /**
-     * Returns negation of the polynomial.
-     */
-    public override operator fun P.unaryMinus(): P = polynomialRing { -this@unaryMinus }
-    /**
-     * Returns sum of the polynomials.
-     */
-    public override operator fun P.plus(other: P): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference of the polynomials.
-     */
-    public override operator fun P.minus(other: P): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the polynomials.
-     */
-    public override operator fun P.times(other: P): P = polynomialRing { this@times * other }
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    public override fun power(arg: P, exponent: UInt) : P = polynomialRing { power(arg, exponent) }
-
-    /**
-     * Check if the instant is zero polynomial.
-     */
-    public override fun P.isZero(): Boolean = polynomialRing { this@isZero.isZero() }
-    /**
-     * Check if the instant is NOT zero polynomial.
-     */
-    public override fun P.isNotZero(): Boolean = polynomialRing { this@isNotZero.isNotZero() }
-    /**
-     * Check if the instant is unit polynomial.
-     */
-    public override fun P.isOne(): Boolean = polynomialRing { this@isOne.isOne() }
-    /**
-     * Check if the instant is NOT unit polynomial.
-     */
-    public override fun P.isNotOne(): Boolean = polynomialRing { this@isNotOne.isNotOne() }
-    /**
-     * Check if the instant is minus unit polynomial.
-     */
-    public override fun P.isMinusOne(): Boolean = polynomialRing { this@isMinusOne.isMinusOne() }
-    /**
-     * Check if the instant is NOT minus unit polynomial.
-     */
-    public override fun P.isNotMinusOne(): Boolean = polynomialRing { this@isNotMinusOne.isNotMinusOne() }
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    public override val polynomialZero: P get() = polynomialRing.zero
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    public override val polynomialOne: P get() = polynomialRing.one
-
-    /**
-     * Checks equality of the polynomials.
-     */
-    public override infix fun P.equalsTo(other: P): Boolean = polynomialRing { this@equalsTo equalsTo other }
-    /**
-     * Checks NOT equality of the polynomials.
-     */
-    public override infix fun P.notEqualsTo(other: P): Boolean = polynomialRing { this@notEqualsTo notEqualsTo other }
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    public override val P.degree: Int get() = polynomialRing { this@degree.degree }
-
-    /**
-     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
-     */
-    public override fun P.isConstant(): Boolean = polynomialRing { this@isConstant.isConstant() }
-    /**
-     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
-     */
-    public override fun P.isNotConstant(): Boolean = polynomialRing { this@isNotConstant.isNotConstant() }
-    /**
-     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public override fun P.isNonZeroConstant(): Boolean = polynomialRing { this@isNonZeroConstant.isNonZeroConstant() }
-    /**
-     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public override fun P.isNotNonZeroConstant(): Boolean = polynomialRing { this@isNotNonZeroConstant.isNotNonZeroConstant() }
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
-     */
-    public override fun P.asConstantOrNull(): C? = polynomialRing { this@asConstantOrNull.asConstantOrNull() }
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
-     */
-    public override fun P.asConstant(): C = polynomialRing { this@asConstant.asConstant() }
-}
-
-/**
- * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
- * [C]. It also assumes that there is provided constructor
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
- * @param R the type of rational functions.
- * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
- */ // TODO: Add support of field
-@Suppress("INAPPLICABLE_JVM_NAME")
-public abstract class PolynomialSpaceOfFractions<
-        C,
-        P: AbstractPolynomial<C>,
-        R: AbstractRationalFunction<C, P>,
-        > : AbstractRationalFunctionalSpace<C, P, R> {
-    protected abstract fun constructRationalFunction(numerator: P, denominator: P) : R
-
-    /**
-     * Returns sum of the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun R.plus(other: Int): R =
-        constructRationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun R.minus(other: Int): R =
-        constructRationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the rational function and the integer represented as rational function.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun R.times(other: Int): R =
-        constructRationalFunction(
-            numerator * other,
-            denominator
-        )
-
-    /**
-     * Returns sum of the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: R): R =
-        constructRationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: R): R =
-        constructRationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the integer represented as rational function and the rational function.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: R): R =
-        constructRationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-
-    /**
-     * Returns sum of the constant represented as rational function and the rational function.
-     */
-    public override operator fun C.plus(other: R): R =
-        constructRationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the constant represented as polynomial and the rational function.
-     */
-    public override operator fun C.minus(other: R): R =
-        constructRationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the constant represented as polynomial and the rational function.
-     */
-    public override operator fun C.times(other: R): R =
-        constructRationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-
-    /**
-     * Returns sum of the constant represented as rational function and the rational function.
-     */
-    public override operator fun R.plus(other: C): R =
-        constructRationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the constant represented as rational function and the rational function.
-     */
-    public override operator fun R.minus(other: C): R =
-        constructRationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the constant represented as rational function and the rational function.
-     */
-    public override operator fun R.times(other: C): R =
-        constructRationalFunction(
-            numerator * other,
-            denominator
-        )
-
-    /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun P.plus(other: R): R =
-        constructRationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the polynomial represented as polynomial and the rational function.
-     */
-    public override operator fun P.minus(other: R): R =
-        constructRationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the polynomial represented as polynomial and the rational function.
-     */
-    public override operator fun P.times(other: R): R =
-        constructRationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-
-    /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun R.plus(other: P): R =
-        constructRationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun R.minus(other: P): R =
-        constructRationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the polynomial represented as rational function and the rational function.
-     */
-    public override operator fun R.times(other: P): R =
-        constructRationalFunction(
-            numerator * other,
-            denominator
-        )
-
-    /**
-     * Returns negation of the rational function.
-     */
-    public override operator fun R.unaryMinus(): R = constructRationalFunction(-numerator, denominator)
-    /**
-     * Returns sum of the rational functions.
-     */
-    public override operator fun R.plus(other: R): R =
-        constructRationalFunction(
-            numerator * other.denominator + denominator * other.numerator,
-            denominator * other.denominator
-        )
-    /**
-     * Returns difference of the rational functions.
-     */
-    public override operator fun R.minus(other: R): R =
-        constructRationalFunction(
-            numerator * other.denominator - denominator * other.numerator,
-            denominator * other.denominator
-        )
-    /**
-     * Returns product of the rational functions.
-     */
-    public override operator fun R.times(other: R): R =
-        constructRationalFunction(
-            numerator * other.numerator,
-            denominator * other.denominator
-        )
-
-    /**
-     * Instance of zero rational function (zero of the rational functions ring).
-     */
-    public override val zero: R get() = constructRationalFunction(polynomialZero, polynomialOne)
-
-    /**
-     * Instance of unit polynomial (unit of the rational functions ring).
-     */
-    public override val one: R get() = constructRationalFunction(polynomialOne, polynomialOne)
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 76f5fc29c..968f77b20 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -44,7 +44,7 @@ internal constructor(
      * where `a`, `b` and `c` are corresponding [Symbol] objects.
      */
     public val coefficients: Map<Map<Symbol, UInt>, C>
-) : AbstractPolynomial<C> {
+) : Polynomial<C> {
     override fun toString(): String = "LabeledPolynomial$coefficients"
 }
 
@@ -116,7 +116,7 @@ public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomia
  */
 public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override val ring: A,
-) : AbstractPolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
+) : PolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
     public operator fun Symbol.plus(other: Int): LabeledPolynomial<C> =
         if (other == 0) LabeledPolynomial<C>(mapOf(
             mapOf(this@plus to 1U) to constantOne,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index 92bd344ac..f347f9191 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -13,7 +13,7 @@ import space.kscience.kmath.operations.invoke
 public class LabeledRationalFunction<C>(
     public override val numerator: LabeledPolynomial<C>,
     public override val denominator: LabeledPolynomial<C>
-) : AbstractRationalFunction<C, LabeledPolynomial<C>> {
+) : RationalFunction<C, LabeledPolynomial<C>> {
     override fun toString(): String = "LabeledRationalFunction${numerator.coefficients}/${denominator.coefficients}"
 }
 
@@ -65,7 +65,7 @@ public class LabeledRationalFunction<C>(
 public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
     public val ring: A,
 ) :
-    AbstractRationalFunctionalSpaceOverPolynomialSpace<
+    RationalFunctionalSpaceOverPolynomialSpace<
             C,
             LabeledPolynomial<C>,
             LabeledRationalFunction<C>,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
new file mode 100644
index 000000000..b97c1e0b4
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -0,0 +1,491 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.experimental.ExperimentalTypeInference
+import kotlin.jvm.JvmName
+import kotlin.math.max
+import kotlin.math.min
+
+/**
+ * Polynomial model without fixation on specific context they are applied to.
+ *
+ * @param coefficients constant is the leftmost coefficient.
+ */
+public data class ListPolynomial<C>(
+    /**
+     * List that collects coefficients of the polynomial. Every monomial `a x^d` is represented as a coefficients
+     * `a` placed into the list with index `d`. For example coefficients of polynomial `5 x^2 - 6` can be represented as
+     * ```
+     * listOf(
+     *     -6, // -6 +
+     *     0,  // 0 x +
+     *     5,  // 5 x^2
+     * )
+     * ```
+     * and also as
+     * ```
+     * listOf(
+     *     -6, // -6 +
+     *     0,  // 0 x +
+     *     5,  // 5 x^2
+     *     0,  // 0 x^3
+     *     0,  // 0 x^4
+     * )
+     * ```
+     * It is recommended not to put extra zeros at end of the list (as for `0x^3` and `0x^4` in the example), but is not
+     * prohibited.
+     */
+    public val coefficients: List<C>
+) : Polynomial<C> {
+    override fun toString(): String = "Polynomial$coefficients"
+}
+
+/**
+ * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
+ * [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false): ListPolynomial<C> =
+    ListPolynomial(with(coefficients) { if (reverse) reversed() else this })
+
+/**
+ * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
+ * [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C> ListPolynomial(vararg coefficients: C, reverse: Boolean = false): ListPolynomial<C> =
+    ListPolynomial(with(coefficients) { if (reverse) reversed() else toList() })
+
+public fun <C> C.asPolynomial() : ListPolynomial<C> = ListPolynomial(listOf(this))
+
+/**
+ * Space of univariate polynomials constructed over ring.
+ *
+ * @param C the type of constants. Polynomials have them as a coefficients in their terms.
+ * @param A type of underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
+ */
+public open class ListPolynomialSpace<C, A : Ring<C>>(
+    public override val ring: A,
+) : PolynomialSpaceOverRing<C, ListPolynomial<C>, A> {
+    /**
+     * Returns sum of the polynomial and the integer represented as polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public override operator fun ListPolynomial<C>.plus(other: Int): ListPolynomial<C> =
+        if (other == 0) this
+        else
+            ListPolynomial(
+                coefficients
+                    .toMutableList()
+                    .apply {
+                        val result = getOrElse(0) { constantZero } + other
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
+                    }
+            )
+    /**
+     * Returns difference between the polynomial and the integer represented as polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public override operator fun ListPolynomial<C>.minus(other: Int): ListPolynomial<C> =
+        if (other == 0) this
+        else
+            ListPolynomial(
+                coefficients
+                    .toMutableList()
+                    .apply {
+                        val result = getOrElse(0) { constantZero } - other
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
+                    }
+            )
+    /**
+     * Returns product of the polynomial and the integer represented as polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun ListPolynomial<C>.times(other: Int): ListPolynomial<C> =
+        if (other == 0) zero
+        else ListPolynomial(
+            coefficients
+                .applyAndRemoveZeros {
+                    for (deg in indices) this[deg] = this[deg] * other
+                }
+        )
+
+    /**
+     * Returns sum of the integer represented as polynomial and the polynomial.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public override operator fun Int.plus(other: ListPolynomial<C>): ListPolynomial<C> =
+        if (this == 0) other
+        else
+            ListPolynomial(
+                other.coefficients
+                    .toMutableList()
+                    .apply {
+                        val result = this@plus + getOrElse(0) { constantZero }
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
+                    }
+            )
+    /**
+     * Returns difference between the integer represented as polynomial and the polynomial.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public override operator fun Int.minus(other: ListPolynomial<C>): ListPolynomial<C> =
+        if (this == 0) other
+        else
+            ListPolynomial(
+                other.coefficients
+                    .toMutableList()
+                    .apply {
+                        forEachIndexed { index, c -> if (index != 0) this[index] = -c }
+
+                        val result = this@minus - getOrElse(0) { constantZero }
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
+                    }
+            )
+    /**
+     * Returns product of the integer represented as polynomial and the polynomial.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: ListPolynomial<C>): ListPolynomial<C> =
+        if (this == 0) zero
+        else ListPolynomial(
+            other.coefficients
+                .applyAndRemoveZeros {
+                    for (deg in indices) this[deg] = this@times * this[deg]
+                }
+        )
+
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun C.plus(other: ListPolynomial<C>): ListPolynomial<C> =
+        if (this.isZero()) other
+        else with(other.coefficients) {
+            if (isEmpty()) ListPolynomial(listOf(this@plus))
+            else ListPolynomial(
+                toMutableList()
+                    .apply {
+                        val result = if (size == 0) this@plus else this@plus + get(0)
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
+                    }
+            )
+        }
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun C.minus(other: ListPolynomial<C>): ListPolynomial<C> =
+        if (this.isZero()) other
+        else with(other.coefficients) {
+            if (isEmpty()) ListPolynomial(listOf(this@minus))
+            else ListPolynomial(
+                toMutableList()
+                    .apply {
+                        forEachIndexed { index, c -> if (index != 0) this[index] = -c }
+
+                        val result = if (size == 0) this@minus else this@minus - get(0)
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
+                    }
+            )
+        }
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun C.times(other: ListPolynomial<C>): ListPolynomial<C> =
+        if (this.isZero()) other
+        else ListPolynomial(
+            other.coefficients
+                .applyAndRemoveZeros {
+                    for (deg in indices) this[deg] = this@times * this[deg]
+                }
+        )
+
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun ListPolynomial<C>.plus(other: C): ListPolynomial<C> =
+        if (other.isZero()) this
+        else with(coefficients) {
+            if (isEmpty()) ListPolynomial(listOf(other))
+            else ListPolynomial(
+                toMutableList()
+                    .apply {
+                        val result = if (size == 0) other else get(0) + other
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
+                    }
+            )
+        }
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun ListPolynomial<C>.minus(other: C): ListPolynomial<C> =
+        if (other.isZero()) this
+        else with(coefficients) {
+            if (isEmpty()) ListPolynomial(listOf(-other))
+            else ListPolynomial(
+                toMutableList()
+                    .apply {
+                        val result = if (size == 0) other else get(0) - other
+                        val isResultZero = result.isZero()
+
+                        when {
+                            size == 0 && !isResultZero -> add(result)
+                            size > 1 || !isResultZero -> this[0] = result
+                            else -> clear()
+                        }
+                    }
+            )
+        }
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun ListPolynomial<C>.times(other: C): ListPolynomial<C> =
+        if (other.isZero()) this
+        else ListPolynomial(
+            coefficients
+                .applyAndRemoveZeros {
+                    for (deg in indices) this[deg] = this[deg] * other
+                }
+        )
+
+    /**
+     * Returns negation of the polynomial.
+     */
+    public override operator fun ListPolynomial<C>.unaryMinus(): ListPolynomial<C> =
+        ListPolynomial(coefficients.map { -it })
+    /**
+     * Returns sum of the polynomials.
+     */
+    public override operator fun ListPolynomial<C>.plus(other: ListPolynomial<C>): ListPolynomial<C> {
+        val thisDegree = degree
+        val otherDegree = other.degree
+        return ListPolynomial(
+            Coefficients(max(thisDegree, otherDegree) + 1) {
+                when {
+                    it > thisDegree -> other.coefficients[it]
+                    it > otherDegree -> coefficients[it]
+                    else -> coefficients[it] + other.coefficients[it]
+                }
+            }
+        )
+    }
+    /**
+     * Returns difference of the polynomials.
+     */
+    public override operator fun ListPolynomial<C>.minus(other: ListPolynomial<C>): ListPolynomial<C> {
+        val thisDegree = degree
+        val otherDegree = other.degree
+        return ListPolynomial(
+            Coefficients(max(thisDegree, otherDegree) + 1) {
+                when {
+                    it > thisDegree -> -other.coefficients[it]
+                    it > otherDegree -> coefficients[it]
+                    else -> coefficients[it] - other.coefficients[it]
+                }
+            }
+        )
+    }
+    /**
+     * Returns product of the polynomials.
+     */
+    public override operator fun ListPolynomial<C>.times(other: ListPolynomial<C>): ListPolynomial<C> {
+        val thisDegree = degree
+        val otherDegree = other.degree
+        return when {
+            thisDegree == -1 -> zero
+            otherDegree == -1 -> zero
+            else ->
+                ListPolynomial(
+                    Coefficients(thisDegree + otherDegree + 1) { d ->
+                        (max(0, d - otherDegree)..min(thisDegree, d))
+                            .map { coefficients[it] * other.coefficients[d - it] }
+                            .reduce { acc, rational -> acc + rational }
+                    }
+                )
+        }
+    }
+
+    /**
+     * Check if the instant is zero polynomial.
+     */
+    public override fun ListPolynomial<C>.isZero(): Boolean = coefficients.all { it.isZero() }
+    /**
+     * Check if the instant is unit polynomial.
+     */
+    public override fun ListPolynomial<C>.isOne(): Boolean =
+        with(coefficients) {
+            isNotEmpty() && withIndex().all { (index, c) -> if (index == 0) c.isOne() else c.isZero() }
+        }
+    /**
+     * Check if the instant is minus unit polynomial.
+     */
+    public override fun ListPolynomial<C>.isMinusOne(): Boolean =
+        with(coefficients) {
+            isNotEmpty() && withIndex().all { (index, c) -> if (index == 0) c.isMinusOne() else c.isZero() }
+        }
+
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
+    override val zero: ListPolynomial<C> = ListPolynomial(emptyList())
+    /**
+     * Instance of unit constant (unit of the underlying ring).
+     */
+    override val one: ListPolynomial<C> = ListPolynomial(listOf(constantOne))
+
+    /**
+     * Checks equality of the polynomials.
+     */
+    public override infix fun ListPolynomial<C>.equalsTo(other: ListPolynomial<C>): Boolean =
+        when {
+            this === other -> true
+            this.degree == other.degree -> (0..degree).all { coefficients[it] == other.coefficients[it] }
+            else -> false
+        }
+
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    public override val ListPolynomial<C>.degree: Int get() = coefficients.indexOfLast { it != constantZero }
+
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
+     */
+    public override fun ListPolynomial<C>.asConstantOrNull(): C? =
+        with(coefficients) {
+            when {
+                isEmpty() -> constantZero
+                withIndex().all { (index, c) -> index == 0 || c.isZero() } -> first()
+                else -> null
+            }
+        }
+
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.substitute(argument: C): C = this.substitute(ring, argument)
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
+
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.asFunction(): (C) -> C = { this.substitute(ring, it) }
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.asFunctionOnConstants(): (C) -> C = { this.substitute(ring, it) }
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.asFunctionOnPolynomials(): (ListPolynomial<C>) -> ListPolynomial<C> = { this.substitute(ring, it) }
+
+    /**
+     * Evaluates the polynomial for the given value [argument].
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun ListPolynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
+
+    // TODO: Move to other internal utilities with context receiver
+    @JvmName("applyAndRemoveZerosInternal")
+    internal inline fun MutableList<C>.applyAndRemoveZeros(block: MutableList<C>.() -> Unit) : MutableList<C> {
+        contract {
+            callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+        }
+        block()
+        while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex)
+        return this
+    }
+    internal inline fun List<C>.applyAndRemoveZeros(block: MutableList<C>.() -> Unit) : List<C> =
+        toMutableList().applyAndRemoveZeros(block)
+    @Suppress("FunctionName")
+    internal inline fun MutableCoefficients(size: Int, init: (index: Int) -> C): MutableList<C> {
+        val list = ArrayList<C>(size)
+        repeat(size) { index -> list.add(init(index)) }
+        with(list) { while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex) }
+        return list
+    }
+    @Suppress("FunctionName")
+    internal inline fun Coefficients(size: Int, init: (index: Int) -> C): List<C> = MutableCoefficients(size, init)
+    @OptIn(ExperimentalTypeInference::class)
+    internal inline fun buildCoefficients(@BuilderInference builderAction: MutableList<C>.() -> Unit): List<C> {
+        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
+        return buildList {
+            builderAction()
+            while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex)
+        }
+    }
+    @OptIn(ExperimentalTypeInference::class)
+    internal inline fun buildCoefficients(capacity: Int, @BuilderInference builderAction: MutableList<C>.() -> Unit): List<C> {
+        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
+        return buildList(capacity) {
+            builderAction()
+            while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex)
+        }
+    }
+}
+
+/**
+ * Space of polynomials constructed over ring.
+ *
+ * @param C the type of constants. Polynomials have them as a coefficients in their terms.
+ * @param A type of underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
+ */
+public class ScalableListPolynomialSpace<C, A>(
+    ring: A,
+) : ListPolynomialSpace<C, A>(ring), ScaleOperations<ListPolynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
+    override fun scale(a: ListPolynomial<C>, value: Double): ListPolynomial<C> =
+        ring { ListPolynomial(a.coefficients.map { scale(it, value) }) }
+}
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
new file mode 100644
index 000000000..50ddd3118
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.Ring
+
+
+public data class ListRationalFunction<C> internal constructor (
+    public override val numerator: ListPolynomial<C>,
+    public override val denominator: ListPolynomial<C>
+) : RationalFunction<C, ListPolynomial<C>> {
+    override fun toString(): String = "RationalFunction${numerator.coefficients}/${denominator.coefficients}"
+}
+
+// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
+
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//internal fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>, denominator: Polynomial<C>): RationalFunction<C> =
+//    if (denominator.isZero()) throw ArithmeticException("/ by zero")
+//    else RationalFunction<C>(numerator, denominator)
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
+//    RationalFunction<C>(
+//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+//        Polynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } ).also { if (it.isZero()) }
+//    )
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//public fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>): RationalFunction<C> =
+//    RationalFunction(numerator, onePolynomial)
+//context(RationalFunctionSpace<C, A>)
+//@Suppress("FunctionName")
+//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
+//    RationalFunction(
+//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } )
+//    )
+
+public class ListRationalFunctionSpace<C, A : Ring<C>> (
+    public val ring: A,
+) :
+    RationalFunctionalSpaceOverPolynomialSpace<
+            C,
+            ListPolynomial<C>,
+            ListRationalFunction<C>,
+            ListPolynomialSpace<C, A>,
+            >,
+    PolynomialSpaceOfFractions<
+            C,
+            ListPolynomial<C>,
+            ListRationalFunction<C>,
+            >() {
+
+    override val polynomialRing : ListPolynomialSpace<C, A> = ListPolynomialSpace(ring)
+    override fun constructRationalFunction(numerator: ListPolynomial<C>, denominator: ListPolynomial<C>): ListRationalFunction<C> =
+        ListRationalFunction(numerator, denominator)
+
+    /**
+     * Instance of zero rational function (zero of the rational functions ring).
+     */
+    public override val zero: ListRationalFunction<C> = ListRationalFunction(polynomialZero, polynomialOne)
+    /**
+     * Instance of unit polynomial (unit of the rational functions ring).
+     */
+    public override val one: ListRationalFunction<C> = ListRationalFunction(polynomialOne, polynomialOne)
+
+    // TODO: Разобрать
+
+    public operator fun ListRationalFunction<C>.div(other: ListRationalFunction<C>): ListRationalFunction<C> =
+        ListRationalFunction(
+            numerator * other.denominator,
+            denominator * other.numerator
+        )
+
+    public operator fun ListRationalFunction<C>.div(other: ListPolynomial<C>): ListRationalFunction<C> =
+        ListRationalFunction(
+            numerator,
+            denominator * other
+        )
+
+    public operator fun ListRationalFunction<C>.div(other: C): ListRationalFunction<C> =
+        ListRationalFunction(
+            numerator,
+            denominator * other
+        )
+
+    public operator fun ListRationalFunction<C>.div(other: Int): ListRationalFunction<C> =
+        ListRationalFunction(
+            numerator,
+            denominator * other
+        )
+
+//    operator fun invoke(arg: UnivariatePolynomial<T>): RationalFunction<T> =
+//        RationalFunction(
+//            numerator(arg),
+//            denominator(arg)
+//        )
+//
+//    operator fun invoke(arg: RationalFunction<T>): RationalFunction<T> {
+//        val num = numerator invokeRFTakeNumerator arg
+//        val den = denominator invokeRFTakeNumerator arg
+//        val degreeDif = numeratorDegree - denominatorDegree
+//        return if (degreeDif > 0)
+//            RationalFunction(
+//                num,
+//                multiplyByPower(den, arg.denominator, degreeDif)
+//            )
+//        else
+//            RationalFunction(
+//                multiplyByPower(num, arg.denominator, -degreeDif),
+//                den
+//            )
+//    }
+//
+//    override fun toString(): String = toString(UnivariatePolynomial.variableName)
+//
+//    fun toString(withVariableName: String = UnivariatePolynomial.variableName): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toString(withVariableName)
+//            else -> "${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)}"
+//        }
+//
+//    fun toStringWithBrackets(withVariableName: String = UnivariatePolynomial.variableName): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toStringWithBrackets(withVariableName)
+//            else -> "(${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)})"
+//        }
+//
+//    fun toReversedString(withVariableName: String = UnivariatePolynomial.variableName): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toReversedString(withVariableName)
+//            else -> "${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)}"
+//        }
+//
+//    fun toReversedStringWithBrackets(withVariableName: String = UnivariatePolynomial.variableName): String =
+//        when(true) {
+//            numerator.isZero() -> "0"
+//            denominator.isOne() -> numerator.toReversedStringWithBrackets(withVariableName)
+//            else -> "(${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)})"
+//        }
+//
+//    fun removeZeros() =
+//        RationalFunction(
+//            numerator.removeZeros(),
+//            denominator.removeZeros()
+//        )
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index c05bc30ec..3b9b907b7 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -43,7 +43,7 @@ internal constructor(
      * contain any zeros on end, but can contain zeros on start or anywhere in middle.
      */
     public val coefficients: Map<List<UInt>, C>
-) : AbstractPolynomial<C> {
+) : Polynomial<C> {
     override fun toString(): String = "NumberedPolynomial$coefficients"
 }
 
@@ -112,7 +112,7 @@ public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolyno
  */
 public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     public final override val ring: A,
-) : AbstractPolynomialSpaceOverRing<C, NumberedPolynomial<C>, A> {
+) : PolynomialSpaceOverRing<C, NumberedPolynomial<C>, A> {
     /**
      * Returns sum of the polynomial and the integer represented as polynomial.
      *
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index 4da715e3f..f3b90b5c5 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -12,7 +12,7 @@ import kotlin.math.max
 public class NumberedRationalFunction<C> internal constructor(
     public override val numerator: NumberedPolynomial<C>,
     public override val denominator: NumberedPolynomial<C>
-) : AbstractRationalFunction<C, NumberedPolynomial<C>> {
+) : RationalFunction<C, NumberedPolynomial<C>> {
     override fun toString(): String = "NumberedRationalFunction${numerator.coefficients}/${denominator.coefficients}"
 }
 
@@ -61,7 +61,7 @@ public class NumberedRationalFunction<C> internal constructor(
 public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
     public val ring: A,
 ) :
-    AbstractRationalFunctionalSpaceOverPolynomialSpace<
+    RationalFunctionalSpaceOverPolynomialSpace<
             C,
             NumberedPolynomial<C>,
             NumberedRationalFunction<C>,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index cfd21d552..612b00535 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -27,10 +27,10 @@ public fun interface Piecewise<in T, out R> {
  * @property pieces An ordered list of range-polynomial pairs. The list does not in general guarantee that there are no
  * "holes" in it.
  */
-public interface PiecewisePolynomial<T : Comparable<T>> : Piecewise<T, Polynomial<T>> {
-    public val pieces: Collection<Pair<ClosedRange<T>, Polynomial<T>>>
+public interface PiecewisePolynomial<T : Comparable<T>> : Piecewise<T, ListPolynomial<T>> {
+    public val pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>>
 
-    override fun findPiece(arg: T): Polynomial<T>?
+    override fun findPiece(arg: T): ListPolynomial<T>?
 }
 
 /**
@@ -38,11 +38,11 @@ public interface PiecewisePolynomial<T : Comparable<T>> : Piecewise<T, Polynomia
  */
 @PerformancePitfall("findPiece method of resulting piecewise is slow")
 public fun <T : Comparable<T>> PiecewisePolynomial(
-    pieces: Collection<Pair<ClosedRange<T>, Polynomial<T>>>,
+    pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>>,
 ): PiecewisePolynomial<T> = object : PiecewisePolynomial<T> {
-    override val pieces: Collection<Pair<ClosedRange<T>, Polynomial<T>>> = pieces
+    override val pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>> = pieces
 
-    override fun findPiece(arg: T): Polynomial<T>? = pieces.firstOrNull { arg in it.first }?.second
+    override fun findPiece(arg: T): ListPolynomial<T>? = pieces.firstOrNull { arg in it.first }?.second
 }
 
 /**
@@ -50,10 +50,10 @@ public fun <T : Comparable<T>> PiecewisePolynomial(
  * The pieces search is logarithmic.
  */
 private class OrderedPiecewisePolynomial<T : Comparable<T>>(
-    override val pieces: List<Pair<ClosedRange<T>, Polynomial<T>>>,
+    override val pieces: List<Pair<ClosedRange<T>, ListPolynomial<T>>>,
 ) : PiecewisePolynomial<T> {
 
-    override fun findPiece(arg: T): Polynomial<T>? {
+    override fun findPiece(arg: T): ListPolynomial<T>? {
         val index = pieces.binarySearch { (range, _) ->
             when {
                 arg >= range.endInclusive -> -1
@@ -74,7 +74,7 @@ private class OrderedPiecewisePolynomial<T : Comparable<T>>(
  */
 public class PiecewiseBuilder<T : Comparable<T>>(delimiter: T) {
     private val delimiters: MutableList<T> = arrayListOf(delimiter)
-    private val pieces: MutableList<Polynomial<T>> = arrayListOf()
+    private val pieces: MutableList<ListPolynomial<T>> = arrayListOf()
 
     /**
      * Dynamically adds a piece to the right side (beyond maximum argument value of previous piece)
@@ -82,7 +82,7 @@ public class PiecewiseBuilder<T : Comparable<T>>(delimiter: T) {
      * @param right new rightmost position. If is less than current rightmost position, an error is thrown.
      * @param piece the sub-function.
      */
-    public fun putRight(right: T, piece: Polynomial<T>) {
+    public fun putRight(right: T, piece: ListPolynomial<T>) {
         require(right > delimiters.last()) { "New delimiter should be to the right of old one" }
         delimiters += right
         pieces += piece
@@ -94,7 +94,7 @@ public class PiecewiseBuilder<T : Comparable<T>>(delimiter: T) {
      * @param left the new leftmost position. If is less than current rightmost position, an error is thrown.
      * @param piece the sub-function.
      */
-    public fun putLeft(left: T, piece: Polynomial<T>) {
+    public fun putLeft(left: T, piece: ListPolynomial<T>) {
         require(left < delimiters.first()) { "New delimiter should be to the left of old one" }
         delimiters.add(0, left)
         pieces.add(0, piece)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index d6c959fd1..b26a57a34 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -6,486 +6,384 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.*
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.experimental.ExperimentalTypeInference
+import kotlin.js.JsName
 import kotlin.jvm.JvmName
-import kotlin.math.max
-import kotlin.math.min
+
 
 /**
- * Polynomial model without fixation on specific context they are applied to.
- *
- * @param coefficients constant is the leftmost coefficient.
+ * Abstraction of polynomials.
  */
-public data class Polynomial<C>(
+public interface Polynomial<C>
+
+/**
+ * Abstraction of ring of polynomials of type [P] over ring of constants of type [C].
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param P the type of polynomials.
+ */
+@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     /**
-     * List that collects coefficients of the polynomial. Every monomial `a x^d` is represented as a coefficients
-     * `a` placed into the list with index `d`. For example coefficients of polynomial `5 x^2 - 6` can be represented as
-     * ```
-     * listOf(
-     *     -6, // -6 +
-     *     0,  // 0 x +
-     *     5,  // 5 x^2
-     * )
-     * ```
-     * and also as
-     * ```
-     * listOf(
-     *     -6, // -6 +
-     *     0,  // 0 x +
-     *     5,  // 5 x^2
-     *     0,  // 0 x^3
-     *     0,  // 0 x^4
-     * )
-     * ```
-     * It is recommended not to put extra zeros at end of the list (as for `0x^3` and `0x^4` in the example), but is not
-     * prohibited.
+     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
-    public val coefficients: List<C>
-) : AbstractPolynomial<C> {
-    override fun toString(): String = "Polynomial$coefficients"
-}
+    public operator fun C.plus(other: Int): C
+    /**
+     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    public operator fun C.minus(other: Int): C
+    /**
+     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public operator fun C.times(other: Int): C
 
-/**
- * Returns a [Polynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
- * [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C> Polynomial(coefficients: List<C>, reverse: Boolean = false): Polynomial<C> =
-    Polynomial(with(coefficients) { if (reverse) reversed() else this })
+    /**
+     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    public operator fun Int.plus(other: C): C
+    /**
+     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    public operator fun Int.minus(other: C): C
+    /**
+     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public operator fun Int.times(other: C): C
 
-/**
- * Returns a [Polynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
- * [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C> Polynomial(vararg coefficients: C, reverse: Boolean = false): Polynomial<C> =
-    Polynomial(with(coefficients) { if (reverse) reversed() else toList() })
-
-public fun <C> C.asPolynomial() : Polynomial<C> = Polynomial(listOf(this))
-
-/**
- * Space of univariate polynomials constructed over ring.
- *
- * @param C the type of constants. Polynomials have them as a coefficients in their terms.
- * @param A type of underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
- */
-public open class PolynomialSpace<C, A : Ring<C>>(
-    public override val ring: A,
-) : AbstractPolynomialSpaceOverRing<C, Polynomial<C>, A> {
     /**
      * Returns sum of the polynomial and the integer represented as polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
-    public override operator fun Polynomial<C>.plus(other: Int): Polynomial<C> =
-        if (other == 0) this
-        else
-            Polynomial(
-                coefficients
-                    .toMutableList()
-                    .apply {
-                        val result = getOrElse(0) { constantZero } + other
-                        val isResultZero = result.isZero()
-
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
-                    }
-            )
+    public operator fun P.plus(other: Int): P = addMultipliedBySquaring(this, one, other)
     /**
      * Returns difference between the polynomial and the integer represented as polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
-    public override operator fun Polynomial<C>.minus(other: Int): Polynomial<C> =
-        if (other == 0) this
-        else
-            Polynomial(
-                coefficients
-                    .toMutableList()
-                    .apply {
-                        val result = getOrElse(0) { constantZero } - other
-                        val isResultZero = result.isZero()
-
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
-                    }
-            )
+    public operator fun P.minus(other: Int): P = addMultipliedBySquaring(this, one, -other)
     /**
      * Returns product of the polynomial and the integer represented as polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    public override operator fun Polynomial<C>.times(other: Int): Polynomial<C> =
-        if (other == 0) zero
-        else Polynomial(
-            coefficients
-                .applyAndRemoveZeros {
-                    for (deg in indices) this[deg] = this[deg] * other
-                }
-        )
+    public operator fun P.times(other: Int): P = multiplyBySquaring(this, other)
 
     /**
      * Returns sum of the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
-    public override operator fun Int.plus(other: Polynomial<C>): Polynomial<C> =
-        if (this == 0) other
-        else
-            Polynomial(
-                other.coefficients
-                    .toMutableList()
-                    .apply {
-                        val result = this@plus + getOrElse(0) { constantZero }
-                        val isResultZero = result.isZero()
-
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
-                    }
-            )
+    public operator fun Int.plus(other: P): P = addMultipliedBySquaring(other, one, this)
     /**
      * Returns difference between the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
-    public override operator fun Int.minus(other: Polynomial<C>): Polynomial<C> =
-        if (this == 0) other
-        else
-            Polynomial(
-                other.coefficients
-                    .toMutableList()
-                    .apply {
-                        forEachIndexed { index, c -> if (index != 0) this[index] = -c }
-
-                        val result = this@minus - getOrElse(0) { constantZero }
-                        val isResultZero = result.isZero()
-
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
-                    }
-            )
+    public operator fun Int.minus(other: P): P = addMultipliedBySquaring(-other, one, this)
     /**
      * Returns product of the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    public override operator fun Int.times(other: Polynomial<C>): Polynomial<C> =
-        if (this == 0) zero
-        else Polynomial(
-            other.coefficients
-                .applyAndRemoveZeros {
-                    for (deg in indices) this[deg] = this@times * this[deg]
-                }
-        )
+    public operator fun Int.times(other: P): P = multiplyBySquaring(other, this)
+
+    /**
+     * Returns the same constant.
+     */
+    @JvmName("constantUnaryPlus")
+    @JsName("constantUnaryPlus")
+    public operator fun C.unaryPlus(): C = this
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("constantUnaryMinus")
+    @JsName("constantUnaryMinus")
+    public operator fun C.unaryMinus(): C
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("constantPlus")
+    @JsName("constantPlus")
+    public operator fun C.plus(other: C): C
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("constantMinus")
+    @JsName("constantMinus")
+    public operator fun C.minus(other: C): C
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("constantTimes")
+    @JsName("constantTimes")
+    public operator fun C.times(other: C): C
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    @JvmName("constantPower")
+    @JsName("constantPower")
+    public fun power(arg: C, exponent: UInt) : C
+
+    /**
+     * Check if the instant is zero constant.
+     */
+    public fun C.isZero(): Boolean = this == constantZero
+    /**
+     * Check if the instant is NOT zero constant.
+     */
+    public fun C.isNotZero(): Boolean = !isZero()
+    /**
+     * Check if the instant is unit constant.
+     */
+    public fun C.isOne(): Boolean = this == constantOne
+    /**
+     * Check if the instant is NOT unit constant.
+     */
+    public fun C.isNotOne(): Boolean = !isOne()
+    /**
+     * Check if the instant is minus unit constant.
+     */
+    public fun C.isMinusOne(): Boolean = this == -constantOne
+    /**
+     * Check if the instant is NOT minus unit constant.
+     */
+    public fun C.isNotMinusOne(): Boolean = !isMinusOne()
+
+    /**
+     * Instance of zero constant (zero of the underlying ring).
+     */
+    public val constantZero: C
+    /**
+     * Instance of unit constant (unit of the underlying ring).
+     */
+    public val constantOne: C
 
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
-    public override operator fun C.plus(other: Polynomial<C>): Polynomial<C> =
-        if (this.isZero()) other
-        else with(other.coefficients) {
-            if (isEmpty()) Polynomial(listOf(this@plus))
-            else Polynomial(
-                toMutableList()
-                    .apply {
-                        val result = if (size == 0) this@plus else this@plus + get(0)
-                        val isResultZero = result.isZero()
-
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
-                    }
-            )
-        }
+    public operator fun C.plus(other: P): P
     /**
      * Returns difference between the constant represented as polynomial and the polynomial.
      */
-    public override operator fun C.minus(other: Polynomial<C>): Polynomial<C> =
-        if (this.isZero()) other
-        else with(other.coefficients) {
-            if (isEmpty()) Polynomial(listOf(this@minus))
-            else Polynomial(
-                toMutableList()
-                    .apply {
-                        forEachIndexed { index, c -> if (index != 0) this[index] = -c }
-
-                        val result = if (size == 0) this@minus else this@minus - get(0)
-                        val isResultZero = result.isZero()
-
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
-                    }
-            )
-        }
+    public operator fun C.minus(other: P): P
     /**
      * Returns product of the constant represented as polynomial and the polynomial.
      */
-    public override operator fun C.times(other: Polynomial<C>): Polynomial<C> =
-        if (this.isZero()) other
-        else Polynomial(
-            other.coefficients
-                .applyAndRemoveZeros {
-                    for (deg in indices) this[deg] = this@times * this[deg]
-                }
-        )
+    public operator fun C.times(other: P): P
 
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
-    public override operator fun Polynomial<C>.plus(other: C): Polynomial<C> =
-        if (other.isZero()) this
-        else with(coefficients) {
-            if (isEmpty()) Polynomial(listOf(other))
-            else Polynomial(
-                toMutableList()
-                    .apply {
-                        val result = if (size == 0) other else get(0) + other
-                        val isResultZero = result.isZero()
-
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
-                    }
-            )
-        }
+    public operator fun P.plus(other: C): P
     /**
      * Returns difference between the constant represented as polynomial and the polynomial.
      */
-    public override operator fun Polynomial<C>.minus(other: C): Polynomial<C> =
-        if (other.isZero()) this
-        else with(coefficients) {
-            if (isEmpty()) Polynomial(listOf(-other))
-            else Polynomial(
-                toMutableList()
-                    .apply {
-                        val result = if (size == 0) other else get(0) - other
-                        val isResultZero = result.isZero()
-
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
-                    }
-            )
-        }
+    public operator fun P.minus(other: C): P
     /**
      * Returns product of the constant represented as polynomial and the polynomial.
      */
-    public override operator fun Polynomial<C>.times(other: C): Polynomial<C> =
-        if (other.isZero()) this
-        else Polynomial(
-            coefficients
-                .applyAndRemoveZeros {
-                    for (deg in indices) this[deg] = this[deg] * other
-                }
-        )
+    public operator fun P.times(other: C): P
 
+    /**
+     * Returns the same polynomial.
+     */
+    public override operator fun P.unaryPlus(): P = this
     /**
      * Returns negation of the polynomial.
      */
-    public override operator fun Polynomial<C>.unaryMinus(): Polynomial<C> =
-        Polynomial(coefficients.map { -it })
+    public override operator fun P.unaryMinus(): P
     /**
      * Returns sum of the polynomials.
      */
-    public override operator fun Polynomial<C>.plus(other: Polynomial<C>): Polynomial<C> {
-        val thisDegree = degree
-        val otherDegree = other.degree
-        return Polynomial(
-            Coefficients(max(thisDegree, otherDegree) + 1) {
-                when {
-                    it > thisDegree -> other.coefficients[it]
-                    it > otherDegree -> coefficients[it]
-                    else -> coefficients[it] + other.coefficients[it]
-                }
-            }
-        )
-    }
+    public override operator fun P.plus(other: P): P
     /**
      * Returns difference of the polynomials.
      */
-    public override operator fun Polynomial<C>.minus(other: Polynomial<C>): Polynomial<C> {
-        val thisDegree = degree
-        val otherDegree = other.degree
-        return Polynomial(
-            Coefficients(max(thisDegree, otherDegree) + 1) {
-                when {
-                    it > thisDegree -> -other.coefficients[it]
-                    it > otherDegree -> coefficients[it]
-                    else -> coefficients[it] - other.coefficients[it]
-                }
-            }
-        )
-    }
+    public override operator fun P.minus(other: P): P
     /**
      * Returns product of the polynomials.
      */
-    public override operator fun Polynomial<C>.times(other: Polynomial<C>): Polynomial<C> {
-        val thisDegree = degree
-        val otherDegree = other.degree
-        return when {
-            thisDegree == -1 -> zero
-            otherDegree == -1 -> zero
-            else ->
-                Polynomial(
-                    Coefficients(thisDegree + otherDegree + 1) { d ->
-                        (max(0, d - otherDegree)..min(thisDegree, d))
-                            .map { coefficients[it] * other.coefficients[d - it] }
-                            .reduce { acc, rational -> acc + rational }
-                    }
-                )
-        }
-    }
+    public override operator fun P.times(other: P): P
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    public override fun power(arg: P, exponent: UInt) : P = exponentiationBySquaring(arg, exponent)
 
     /**
      * Check if the instant is zero polynomial.
      */
-    public override fun Polynomial<C>.isZero(): Boolean = coefficients.all { it.isZero() }
+    public fun P.isZero(): Boolean = this equalsTo zero
+    /**
+     * Check if the instant is NOT zero polynomial.
+     */
+    public fun P.isNotZero(): Boolean = !isZero()
     /**
      * Check if the instant is unit polynomial.
      */
-    public override fun Polynomial<C>.isOne(): Boolean =
-        with(coefficients) {
-            isNotEmpty() && withIndex().all { (index, c) -> if (index == 0) c.isOne() else c.isZero() }
-        }
+    public fun P.isOne(): Boolean = this equalsTo one
+    /**
+     * Check if the instant is NOT unit polynomial.
+     */
+    public fun P.isNotOne(): Boolean = !isOne()
     /**
      * Check if the instant is minus unit polynomial.
      */
-    public override fun Polynomial<C>.isMinusOne(): Boolean =
-        with(coefficients) {
-            isNotEmpty() && withIndex().all { (index, c) -> if (index == 0) c.isMinusOne() else c.isZero() }
-        }
+    public fun P.isMinusOne(): Boolean = this equalsTo -one
+    /**
+     * Check if the instant is NOT minus unit polynomial.
+     */
+    public fun P.isNotMinusOne(): Boolean = !isMinusOne()
 
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
      */
-    override val zero: Polynomial<C> = Polynomial(emptyList())
+    public override val zero: P
     /**
-     * Instance of unit constant (unit of the underlying ring).
+     * Instance of unit polynomial (unit of the polynomial ring).
      */
-    override val one: Polynomial<C> = Polynomial(listOf(constantOne))
+    public override val one: P
 
     /**
      * Checks equality of the polynomials.
      */
-    public override infix fun Polynomial<C>.equalsTo(other: Polynomial<C>): Boolean =
-        when {
-            this === other -> true
-            this.degree == other.degree -> (0..degree).all { coefficients[it] == other.coefficients[it] }
-            else -> false
-        }
+    public infix fun P.equalsTo(other: P): Boolean
+    /**
+     * Checks NOT equality of the polynomials.
+     */
+    public infix fun P.notEqualsTo(other: P): Boolean = !(this equalsTo other)
 
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
      */
-    public override val Polynomial<C>.degree: Int get() = coefficients.indexOfLast { it != constantZero }
+    public val P.degree: Int
 
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isConstant(): Boolean = degree <= 0
+    /**
+     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNotConstant(): Boolean = !isConstant()
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNonZeroConstant(): Boolean = degree == 0
+    /**
+     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
     /**
      * If polynomial is a constant polynomial represents and returns it as constant.
      * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
      */
-    public override fun Polynomial<C>.asConstantOrNull(): C? =
-        with(coefficients) {
-            when {
-                isEmpty() -> constantZero
-                withIndex().all { (index, c) -> index == 0 || c.isZero() } -> first()
-                else -> null
-            }
-        }
-
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun Polynomial<C>.substitute(argument: C): C = this.substitute(ring, argument)
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun Polynomial<C>.substitute(argument: Polynomial<C>): Polynomial<C> = this.substitute(ring, argument)
-
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun Polynomial<C>.asFunction(): (C) -> C = { this.substitute(ring, it) }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun Polynomial<C>.asFunctionOnConstants(): (C) -> C = { this.substitute(ring, it) }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun Polynomial<C>.asFunctionOnPolynomials(): (Polynomial<C>) -> Polynomial<C> = { this.substitute(ring, it) }
-
+    public fun P.asConstantOrNull(): C?
     /**
-     * Evaluates the polynomial for the given value [argument].
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
      */
-    @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun Polynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
-    @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun Polynomial<C>.invoke(argument: Polynomial<C>): Polynomial<C> = this.substitute(ring, argument)
+    public fun P.asConstant(): C = requireNotNull(asConstantOrNull()) { "Can not represent non-constant polynomial as a constant" }
 
-    // TODO: Move to other internal utilities with context receiver
-    @JvmName("applyAndRemoveZerosInternal")
-    internal inline fun MutableList<C>.applyAndRemoveZeros(block: MutableList<C>.() -> Unit) : MutableList<C> {
-        contract {
-            callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-        }
-        block()
-        while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex)
-        return this
-    }
-    internal inline fun List<C>.applyAndRemoveZeros(block: MutableList<C>.() -> Unit) : List<C> =
-        toMutableList().applyAndRemoveZeros(block)
-    @Suppress("FunctionName")
-    internal inline fun MutableCoefficients(size: Int, init: (index: Int) -> C): MutableList<C> {
-        val list = ArrayList<C>(size)
-        repeat(size) { index -> list.add(init(index)) }
-        with(list) { while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex) }
-        return list
-    }
-    @Suppress("FunctionName")
-    internal inline fun Coefficients(size: Int, init: (index: Int) -> C): List<C> = MutableCoefficients(size, init)
-    @OptIn(ExperimentalTypeInference::class)
-    internal inline fun buildCoefficients(@BuilderInference builderAction: MutableList<C>.() -> Unit): List<C> {
-        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
-        return buildList {
-            builderAction()
-            while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex)
-        }
-    }
-    @OptIn(ExperimentalTypeInference::class)
-    internal inline fun buildCoefficients(capacity: Int, @BuilderInference builderAction: MutableList<C>.() -> Unit): List<C> {
-        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
-        return buildList(capacity) {
-            builderAction()
-            while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex)
-        }
-    }
+    override fun add(left: P, right: P): P = left + right
+    override fun multiply(left: P, right: P): P = left * right
 }
 
 /**
- * Space of polynomials constructed over ring.
+ * Abstraction of ring of polynomials of type [P] over ring of constants of type [C]. It also assumes that there is
+ * provided [ring] (of type [A]), that provides constant-wise operations.
  *
- * @param C the type of constants. Polynomials have them as a coefficients in their terms.
- * @param A type of underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param P the type of polynomials.
+ * @param A the type of algebraic structure (precisely, of ring) provided for constants.
  */
-public class ScalablePolynomialSpace<C, A>(
-    ring: A,
-) : PolynomialSpace<C, A>(ring), ScaleOperations<Polynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
-    override fun scale(a: Polynomial<C>, value: Double): Polynomial<C> =
-        ring { Polynomial(a.coefficients.map { scale(it, value) }) }
-}
+@Suppress("INAPPLICABLE_JVM_NAME")
+public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : PolynomialSpace<C, P> {
+
+    public val ring: A
+
+    /**
+     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     */
+    public override operator fun C.plus(other: Int): C = ring { addMultipliedBySquaring(this@plus, one, other) }
+    /**
+     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    public override operator fun C.minus(other: Int): C = ring { addMultipliedBySquaring(this@minus, one, -other) }
+    /**
+     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun C.times(other: Int): C = ring { multiplyBySquaring(this@times, other) }
+
+    /**
+     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    public override operator fun Int.plus(other: C): C = ring { addMultipliedBySquaring(other, one, this@plus) }
+    /**
+     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    public override operator fun Int.minus(other: C): C = ring { addMultipliedBySquaring(-other, one, this@minus) }
+    /**
+     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: C): C = ring { multiplyBySquaring(other, this@times) }
+
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("constantUnaryMinus")
+    public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("constantPlus")
+    public override operator fun C.plus(other: C): C = ring { this@plus + other }
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("constantMinus")
+    public override operator fun C.minus(other: C): C = ring { this@minus - other }
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("constantTimes")
+    public override operator fun C.times(other: C): C = ring { this@times * other }
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    @JvmName("constantPower")
+    override fun power(arg: C, exponent: UInt): C = ring { power(arg, exponent) }
+
+    /**
+     * Instance of zero constant (zero of the underlying ring).
+     */
+    public override val constantZero: C get() = ring.zero
+    /**
+     * Instance of unit constant (unit of the underlying ring).
+     */
+    public override val constantOne: C get() = ring.one
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 51c1e2f80..635661b8a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -5,150 +5,1081 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.*
+import kotlin.js.JsName
+import kotlin.jvm.JvmName
 
 
-public data class RationalFunction<C> internal constructor (
-    public override val numerator: Polynomial<C>,
-    public override val denominator: Polynomial<C>
-) : AbstractRationalFunction<C, Polynomial<C>> {
-    override fun toString(): String = "RationalFunction${numerator.coefficients}/${denominator.coefficients}"
+/**
+ * Abstraction of rational function.
+ */
+public interface RationalFunction<C, P: Polynomial<C>> {
+    public val numerator: P
+    public val denominator: P
+    public operator fun component1(): P = numerator
+    public operator fun component2(): P = denominator
 }
 
-// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
+ * [C].
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ */ // TODO: Add support of field
+@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunction<C, P>> : Ring<R> {
+    /**
+     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     */
+    public operator fun C.plus(other: Int): C
+    /**
+     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    public operator fun C.minus(other: Int): C
+    /**
+     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public operator fun C.times(other: Int): C
 
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//internal fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>, denominator: Polynomial<C>): RationalFunction<C> =
-//    if (denominator.isZero()) throw ArithmeticException("/ by zero")
-//    else RationalFunction<C>(numerator, denominator)
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
-//    RationalFunction<C>(
-//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-//        Polynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } ).also { if (it.isZero()) }
-//    )
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//public fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>): RationalFunction<C> =
-//    RationalFunction(numerator, onePolynomial)
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
-//    RationalFunction(
-//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } )
-//    )
+    /**
+     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    public operator fun Int.plus(other: C): C
+    /**
+     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    public operator fun Int.minus(other: C): C
+    /**
+     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public operator fun Int.times(other: C): C
 
-public class RationalFunctionSpace<C, A : Ring<C>> (
-    public val ring: A,
-) :
-    AbstractRationalFunctionalSpaceOverPolynomialSpace<
-            C,
-            Polynomial<C>,
-            RationalFunction<C>,
-            PolynomialSpace<C, A>,
-            >,
-    PolynomialSpaceOfFractions<
-            C,
-            Polynomial<C>,
-            RationalFunction<C>,
-            >() {
+    /**
+     * Returns sum of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public operator fun P.plus(other: Int): P
+    /**
+     * Returns difference between the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public operator fun P.minus(other: Int): P
+    /**
+     * Returns product of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public operator fun P.times(other: Int): P
 
-    override val polynomialRing : PolynomialSpace<C, A> = PolynomialSpace(ring)
-    override fun constructRationalFunction(numerator: Polynomial<C>, denominator: Polynomial<C>): RationalFunction<C> =
-        RationalFunction(numerator, denominator)
+    /**
+     * Returns sum of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public operator fun Int.plus(other: P): P
+    /**
+     * Returns difference between the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public operator fun Int.minus(other: P): P
+    /**
+     * Returns product of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public operator fun Int.times(other: P): P
+
+    /**
+     * Returns sum of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public operator fun R.plus(other: Int): R = addMultipliedBySquaring(this, one, other)
+    /**
+     * Returns difference between the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public operator fun R.minus(other: Int): R = addMultipliedBySquaring(this, one, -other)
+    /**
+     * Returns product of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public operator fun R.times(other: Int): R = multiplyBySquaring(this, other)
+
+    /**
+     * Returns sum of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public operator fun Int.plus(other: R): R = addMultipliedBySquaring(other, one, this)
+    /**
+     * Returns difference between the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public operator fun Int.minus(other: R): R = addMultipliedBySquaring(-other, one, this)
+    /**
+     * Returns product of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public operator fun Int.times(other: R): R = multiplyBySquaring(other, this)
+
+    /**
+     * Returns the same constant.
+     */
+    @JvmName("constantUnaryPlus")
+    @JsName("constantUnaryPlus")
+    public operator fun C.unaryPlus(): C = this
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("constantUnaryMinus")
+    @JsName("constantUnaryMinus")
+    public operator fun C.unaryMinus(): C
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("constantPlus")
+    @JsName("constantPlus")
+    public operator fun C.plus(other: C): C
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("constantMinus")
+    @JsName("constantMinus")
+    public operator fun C.minus(other: C): C
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("constantTimes")
+    @JsName("constantTimes")
+    public operator fun C.times(other: C): C
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    @JvmName("constantPower")
+    @JsName("constantPower")
+    public fun power(arg: C, exponent: UInt) : C
+
+    /**
+     * Check if the instant is zero constant.
+     */
+    public fun C.isZero(): Boolean = this == constantZero
+    /**
+     * Check if the instant is NOT zero constant.
+     */
+    public fun C.isNotZero(): Boolean = !isZero()
+    /**
+     * Check if the instant is unit constant.
+     */
+    public fun C.isOne(): Boolean =  this == constantOne
+    /**
+     * Check if the instant is NOT unit constant.
+     */
+    public fun C.isNotOne(): Boolean = !isOne()
+    /**
+     * Check if the instant is minus unit constant.
+     */
+    public fun C.isMinusOne(): Boolean =  this == -constantOne
+    /**
+     * Check if the instant is NOT minus unit constant.
+     */
+    public fun C.isNotMinusOne(): Boolean = !isMinusOne()
+
+    /**
+     * Instance of zero constant (zero of the underlying ring).
+     */
+    public val constantZero: C
+    /**
+     * Instance of unit constant (unit of the underlying ring).
+     */
+    public val constantOne: C
+
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.plus(other: P): P
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.minus(other: P): P
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun C.times(other: P): P
+
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.plus(other: C): P
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.minus(other: C): P
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public operator fun P.times(other: C): P
+
+    /**
+     * Returns the same polynomial.
+     */
+    public operator fun P.unaryPlus(): P = this
+    /**
+     * Returns negation of the polynomial.
+     */
+    public operator fun P.unaryMinus(): P
+    /**
+     * Returns sum of the polynomials.
+     */
+    public operator fun P.plus(other: P): P
+    /**
+     * Returns difference of the polynomials.
+     */
+    public operator fun P.minus(other: P): P
+    /**
+     * Returns product of the polynomials.
+     */
+    public operator fun P.times(other: P): P
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    public fun power(arg: P, exponent: UInt) : P
+
+    /**
+     * Check if the instant is zero polynomial.
+     */
+    public fun P.isZero(): Boolean = this equalsTo polynomialZero
+    /**
+     * Check if the instant is NOT zero polynomial.
+     */
+    public fun P.isNotZero(): Boolean = !isZero()
+    /**
+     * Check if the instant is unit polynomial.
+     */
+    public fun P.isOne(): Boolean = this equalsTo polynomialOne
+    /**
+     * Check if the instant is NOT unit polynomial.
+     */
+    public fun P.isNotOne(): Boolean = !isOne()
+    /**
+     * Check if the instant is minus unit polynomial.
+     */
+    public fun P.isMinusOne(): Boolean = this equalsTo -polynomialOne
+    /**
+     * Check if the instant is NOT minus unit polynomial.
+     */
+    public fun P.isNotMinusOne(): Boolean = !isMinusOne()
+
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
+    public val polynomialZero: P
+    /**
+     * Instance of unit polynomial (unit of the polynomial ring).
+     */
+    public val polynomialOne: P
+
+    /**
+     * Checks equality of the polynomials.
+     */
+    public infix fun P.equalsTo(other: P): Boolean
+    /**
+     * Checks NOT equality of the polynomials.
+     */
+    public infix fun P.notEqualsTo(other: P): Boolean = !(this equalsTo other)
+
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public operator fun C.plus(other: R): R
+    /**
+     * Returns difference between the constant represented as polynomial and the rational function.
+     */
+    public operator fun C.minus(other: R): R
+    /**
+     * Returns product of the constant represented as polynomial and the rational function.
+     */
+    public operator fun C.times(other: R): R
+
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public operator fun R.plus(other: C): R
+    /**
+     * Returns difference between the constant represented as rational function and the rational function.
+     */
+    public operator fun R.minus(other: C): R
+    /**
+     * Returns product of the constant represented as rational function and the rational function.
+     */
+    public operator fun R.times(other: C): R
+
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public operator fun P.plus(other: R): R
+    /**
+     * Returns difference between the polynomial represented as polynomial and the rational function.
+     */
+    public operator fun P.minus(other: R): R
+    /**
+     * Returns product of the polynomial represented as polynomial and the rational function.
+     */
+    public operator fun P.times(other: R): R
+
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public operator fun R.plus(other: P): R
+    /**
+     * Returns difference between the polynomial represented as rational function and the rational function.
+     */
+    public operator fun R.minus(other: P): R
+    /**
+     * Returns product of the polynomial represented as rational function and the rational function.
+     */
+    public operator fun R.times(other: P): R
+
+    /**
+     * Returns the same rational function.
+     */
+    public override operator fun R.unaryPlus(): R = this
+    /**
+     * Returns negation of the rational function.
+     */
+    public override operator fun R.unaryMinus(): R
+    /**
+     * Returns sum of the rational functions.
+     */
+    public override operator fun R.plus(other: R): R
+    /**
+     * Returns difference of the rational functions.
+     */
+    public override operator fun R.minus(other: R): R
+    /**
+     * Returns product of the rational functions.
+     */
+    public override operator fun R.times(other: R): R
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    public override fun power(arg: R, exponent: UInt) : R = exponentiationBySquaring(arg, exponent)
+
+    /**
+     * Check if the instant is zero rational function.
+     */
+    public fun R.isZero(): Boolean = numerator equalsTo polynomialZero
+    /**
+     * Check if the instant is NOT zero rational function.
+     */
+    public fun R.isNotZero(): Boolean = !isZero()
+    /**
+     * Check if the instant is unit rational function.
+     */
+    public fun R.isOne(): Boolean = numerator equalsTo denominator
+    /**
+     * Check if the instant is NOT unit rational function.
+     */
+    public fun R.isNotOne(): Boolean = !isOne()
+    /**
+     * Check if the instant is minus unit rational function.
+     */
+    public fun R.isMinusOne(): Boolean = (numerator + denominator).isZero()
+    /**
+     * Check if the instant is NOT minus unit rational function.
+     */
+    public fun R.isNotMinusOne(): Boolean = !isMinusOne()
 
     /**
      * Instance of zero rational function (zero of the rational functions ring).
      */
-    public override val zero: RationalFunction<C> = RationalFunction(polynomialZero, polynomialOne)
+    public override val zero: R
     /**
      * Instance of unit polynomial (unit of the rational functions ring).
      */
-    public override val one: RationalFunction<C> = RationalFunction(polynomialOne, polynomialOne)
+    public override val one: R
 
-    // TODO: Разобрать
+    /**
+     * Checks equality of the rational functions.
+     */
+    public infix fun R.equalsTo(other: R): Boolean =
+        when {
+            this === other -> true
+            numerator.isZero() != other.numerator.isZero() -> false
+            numeratorDegree - denominatorDegree != with(other) { numeratorDegree - denominatorDegree } -> false
+            else -> numerator * other.denominator equalsTo other.numerator * denominator
+        }
+    /**
+     * Checks NOT equality of the polynomials.
+     */
+    public infix fun R.notEqualsTo(other: R): Boolean = !(this equalsTo other)
 
-    public operator fun RationalFunction<C>.div(other: RationalFunction<C>): RationalFunction<C> =
-        RationalFunction(
-            numerator * other.denominator,
-            denominator * other.numerator
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    public val P.degree: Int
+
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isConstant(): Boolean = degree <= 0
+    /**
+     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNotConstant(): Boolean = !isConstant()
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNonZeroConstant(): Boolean = degree == 0
+    /**
+     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public fun P.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
+     */
+    public fun P.asConstantOrNull(): C?
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
+     */
+    public fun P.asConstant(): C = requireNotNull(asConstantOrNull()) { "Can not represent non-constant polynomial as a constant" }
+
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    public val R.numeratorDegree: Int get() = numerator.degree
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    public val R.denominatorDegree: Int get() = denominator.degree
+
+    override fun add(left: R, right: R): R = left + right
+    override fun multiply(left: R, right: R): R = left * right
+}
+
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
+ * [C]. It also assumes that there is provided [ring] (of type [A]), that provides constant-wise operations.
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ * @param A the type of algebraic structure (precisely, of ring) provided for constants.
+ */ // TODO: Add support of field
+@Suppress("INAPPLICABLE_JVM_NAME")
+public interface RationalFunctionalSpaceOverRing<C, P: Polynomial<C>, R: RationalFunction<C, P>, A: Ring<C>> : RationalFunctionalSpace<C, P, R> {
+
+    public val ring: A
+
+    /**
+     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     */
+    public override operator fun C.plus(other: Int): C = ring { addMultipliedBySquaring(this@plus, one, other) }
+    /**
+     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    public override operator fun C.minus(other: Int): C = ring { addMultipliedBySquaring(this@minus, one, -other) }
+    /**
+     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun C.times(other: Int): C = ring { multiplyBySquaring(this@times, other) }
+
+    /**
+     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    public override operator fun Int.plus(other: C): C = ring { addMultipliedBySquaring(other, one, this@plus) }
+    /**
+     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    public override operator fun Int.minus(other: C): C = ring { addMultipliedBySquaring(-other, one, this@minus) }
+    /**
+     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: C): C = ring { multiplyBySquaring(other, this@times) }
+
+    /**
+     * Returns the same constant.
+     */
+    @JvmName("constantUnaryPlus")
+    public override operator fun C.unaryPlus(): C = ring { +this@unaryPlus }
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("constantUnaryMinus")
+    public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("constantPlus")
+    public override operator fun C.plus(other: C): C = ring { this@plus + other }
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("constantMinus")
+    public override operator fun C.minus(other: C): C = ring { this@minus - other }
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("constantTimes")
+    public override operator fun C.times(other: C): C = ring { this@times * other }
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    @JvmName("constantPower")
+    public override fun power(arg: C, exponent: UInt) : C = ring { power(arg, exponent) }
+
+    /**
+     * Instance of zero constant (zero of the underlying ring).
+     */
+    public override val constantZero: C get() = ring.zero
+    /**
+     * Instance of unit constant (unit of the underlying ring).
+     */
+    public override val constantOne: C get() = ring.one
+}
+
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
+ * [C]. It also assumes that there is provided [polynomialRing] (of type [AP]), that provides constant- and
+ * polynomial-wise operations.
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
+ */ // TODO: Add support of field
+@Suppress("INAPPLICABLE_JVM_NAME")
+public interface RationalFunctionalSpaceOverPolynomialSpace<
+        C,
+        P: Polynomial<C>,
+        R: RationalFunction<C, P>,
+        AP: PolynomialSpace<C, P>,
+        > : RationalFunctionalSpace<C, P, R> {
+
+    public val polynomialRing: AP
+
+    /**
+     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     */
+    public override operator fun C.plus(other: Int): C = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    public override operator fun C.minus(other: Int): C = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun C.times(other: Int): C = polynomialRing { this@times * other }
+
+    /**
+     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    public override operator fun Int.plus(other: C): C = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    public override operator fun Int.minus(other: C): C = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: C): C = polynomialRing { this@times * other }
+
+    /**
+     * Returns sum of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public override operator fun P.plus(other: Int): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public override operator fun P.minus(other: Int): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the constant and the integer represented as polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun P.times(other: Int): P = polynomialRing { this@times * other }
+
+    /**
+     * Returns sum of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public override operator fun Int.plus(other: P): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public override operator fun Int.minus(other: P): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the integer represented as polynomial and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: P): P = polynomialRing { this@times * other }
+
+    /**
+     * Returns the same constant.
+     */
+    @JvmName("constantUnaryPlus")
+    public override operator fun C.unaryPlus(): C = polynomialRing { +this@unaryPlus }
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("constantUnaryMinus")
+    public override operator fun C.unaryMinus(): C = polynomialRing { -this@unaryMinus }
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("constantPlus")
+    public override operator fun C.plus(other: C): C = polynomialRing { this@plus + other }
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("constantMinus")
+    public override operator fun C.minus(other: C): C = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("constantTimes")
+    public override operator fun C.times(other: C): C = polynomialRing { this@times * other }
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    @JvmName("constantPower")
+    public override fun power(arg: C, exponent: UInt) : C = polynomialRing { power(arg, exponent) }
+
+    /**
+     * Check if the instant is zero constant.
+     */
+    public override fun C.isZero(): Boolean = polynomialRing { this@isZero.isZero() }
+    /**
+     * Check if the instant is NOT zero constant.
+     */
+    public override fun C.isNotZero(): Boolean = polynomialRing { this@isNotZero.isNotZero() }
+    /**
+     * Check if the instant is unit constant.
+     */
+    public override fun C.isOne(): Boolean = polynomialRing { this@isOne.isOne() }
+    /**
+     * Check if the instant is NOT unit constant.
+     */
+    public override fun C.isNotOne(): Boolean = polynomialRing { this@isNotOne.isNotOne() }
+    /**
+     * Check if the instant is minus unit constant.
+     */
+    public override fun C.isMinusOne(): Boolean = polynomialRing { this@isMinusOne.isMinusOne() }
+    /**
+     * Check if the instant is NOT minus unit constant.
+     */
+    public override fun C.isNotMinusOne(): Boolean = polynomialRing { this@isNotMinusOne.isNotMinusOne() }
+
+    /**
+     * Instance of zero constant (zero of the underlying ring).
+     */
+    public override val constantZero: C get() = polynomialRing.constantZero
+    /**
+     * Instance of unit constant (unit of the underlying ring).
+     */
+    public override val constantOne: C get() = polynomialRing.constantOne
+
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun C.plus(other: P): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun C.minus(other: P): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun C.times(other: P): P = polynomialRing { this@times * other }
+
+    /**
+     * Returns sum of the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun P.plus(other: C): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun P.minus(other: C): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the constant represented as polynomial and the polynomial.
+     */
+    public override operator fun P.times(other: C): P = polynomialRing { this@times * other }
+
+    /**
+     * Returns the same polynomial.
+     */
+    public override operator fun P.unaryPlus(): P = polynomialRing { +this@unaryPlus }
+    /**
+     * Returns negation of the polynomial.
+     */
+    public override operator fun P.unaryMinus(): P = polynomialRing { -this@unaryMinus }
+    /**
+     * Returns sum of the polynomials.
+     */
+    public override operator fun P.plus(other: P): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference of the polynomials.
+     */
+    public override operator fun P.minus(other: P): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the polynomials.
+     */
+    public override operator fun P.times(other: P): P = polynomialRing { this@times * other }
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    public override fun power(arg: P, exponent: UInt) : P = polynomialRing { power(arg, exponent) }
+
+    /**
+     * Check if the instant is zero polynomial.
+     */
+    public override fun P.isZero(): Boolean = polynomialRing { this@isZero.isZero() }
+    /**
+     * Check if the instant is NOT zero polynomial.
+     */
+    public override fun P.isNotZero(): Boolean = polynomialRing { this@isNotZero.isNotZero() }
+    /**
+     * Check if the instant is unit polynomial.
+     */
+    public override fun P.isOne(): Boolean = polynomialRing { this@isOne.isOne() }
+    /**
+     * Check if the instant is NOT unit polynomial.
+     */
+    public override fun P.isNotOne(): Boolean = polynomialRing { this@isNotOne.isNotOne() }
+    /**
+     * Check if the instant is minus unit polynomial.
+     */
+    public override fun P.isMinusOne(): Boolean = polynomialRing { this@isMinusOne.isMinusOne() }
+    /**
+     * Check if the instant is NOT minus unit polynomial.
+     */
+    public override fun P.isNotMinusOne(): Boolean = polynomialRing { this@isNotMinusOne.isNotMinusOne() }
+
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
+    public override val polynomialZero: P get() = polynomialRing.zero
+    /**
+     * Instance of unit polynomial (unit of the polynomial ring).
+     */
+    public override val polynomialOne: P get() = polynomialRing.one
+
+    /**
+     * Checks equality of the polynomials.
+     */
+    public override infix fun P.equalsTo(other: P): Boolean = polynomialRing { this@equalsTo equalsTo other }
+    /**
+     * Checks NOT equality of the polynomials.
+     */
+    public override infix fun P.notEqualsTo(other: P): Boolean = polynomialRing { this@notEqualsTo notEqualsTo other }
+
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    public override val P.degree: Int get() = polynomialRing { this@degree.degree }
+
+    /**
+     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public override fun P.isConstant(): Boolean = polynomialRing { this@isConstant.isConstant() }
+    /**
+     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
+     */
+    public override fun P.isNotConstant(): Boolean = polynomialRing { this@isNotConstant.isNotConstant() }
+    /**
+     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public override fun P.isNonZeroConstant(): Boolean = polynomialRing { this@isNonZeroConstant.isNonZeroConstant() }
+    /**
+     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
+     */
+    public override fun P.isNotNonZeroConstant(): Boolean = polynomialRing { this@isNotNonZeroConstant.isNotNonZeroConstant() }
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
+     */
+    public override fun P.asConstantOrNull(): C? = polynomialRing { this@asConstantOrNull.asConstantOrNull() }
+    /**
+     * If polynomial is a constant polynomial represents and returns it as constant.
+     * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
+     */
+    public override fun P.asConstant(): C = polynomialRing { this@asConstant.asConstant() }
+}
+
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
+ * [C]. It also assumes that there is provided constructor
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
+ */ // TODO: Add support of field
+@Suppress("INAPPLICABLE_JVM_NAME")
+public abstract class PolynomialSpaceOfFractions<
+        C,
+        P: Polynomial<C>,
+        R: RationalFunction<C, P>,
+        > : RationalFunctionalSpace<C, P, R> {
+    protected abstract fun constructRationalFunction(numerator: P, denominator: P) : R
+
+    /**
+     * Returns sum of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public override operator fun R.plus(other: Int): R =
+        constructRationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public override operator fun R.minus(other: Int): R =
+        constructRationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun R.times(other: Int): R =
+        constructRationalFunction(
+            numerator * other,
+            denominator
         )
 
-    public operator fun RationalFunction<C>.div(other: Polynomial<C>): RationalFunction<C> =
-        RationalFunction(
-            numerator,
-            denominator * other
+    /**
+     * Returns sum of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public override operator fun Int.plus(other: R): R =
+        constructRationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns difference between the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public override operator fun Int.minus(other: R): R =
+        constructRationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns product of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: R): R =
+        constructRationalFunction(
+            this * other.numerator,
+            other.denominator
         )
 
-    public operator fun RationalFunction<C>.div(other: C): RationalFunction<C> =
-        RationalFunction(
-            numerator,
-            denominator * other
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public override operator fun C.plus(other: R): R =
+        constructRationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns difference between the constant represented as polynomial and the rational function.
+     */
+    public override operator fun C.minus(other: R): R =
+        constructRationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns product of the constant represented as polynomial and the rational function.
+     */
+    public override operator fun C.times(other: R): R =
+        constructRationalFunction(
+            this * other.numerator,
+            other.denominator
         )
 
-    public operator fun RationalFunction<C>.div(other: Int): RationalFunction<C> =
-        RationalFunction(
-            numerator,
-            denominator * other
+    /**
+     * Returns sum of the constant represented as rational function and the rational function.
+     */
+    public override operator fun R.plus(other: C): R =
+        constructRationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the constant represented as rational function and the rational function.
+     */
+    public override operator fun R.minus(other: C): R =
+        constructRationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the constant represented as rational function and the rational function.
+     */
+    public override operator fun R.times(other: C): R =
+        constructRationalFunction(
+            numerator * other,
+            denominator
         )
 
-//    operator fun invoke(arg: UnivariatePolynomial<T>): RationalFunction<T> =
-//        RationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    operator fun invoke(arg: RationalFunction<T>): RationalFunction<T> {
-//        val num = numerator invokeRFTakeNumerator arg
-//        val den = denominator invokeRFTakeNumerator arg
-//        val degreeDif = numeratorDegree - denominatorDegree
-//        return if (degreeDif > 0)
-//            RationalFunction(
-//                num,
-//                multiplyByPower(den, arg.denominator, degreeDif)
-//            )
-//        else
-//            RationalFunction(
-//                multiplyByPower(num, arg.denominator, -degreeDif),
-//                den
-//            )
-//    }
-//
-//    override fun toString(): String = toString(UnivariatePolynomial.variableName)
-//
-//    fun toString(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(withVariableName)
-//            else -> "${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toStringWithBrackets(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun toReversedString(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(withVariableName)
-//            else -> "${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toReversedStringWithBrackets(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun removeZeros() =
-//        RationalFunction(
-//            numerator.removeZeros(),
-//            denominator.removeZeros()
-//        )
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun P.plus(other: R): R =
+        constructRationalFunction(
+            other.denominator * this + other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns difference between the polynomial represented as polynomial and the rational function.
+     */
+    public override operator fun P.minus(other: R): R =
+        constructRationalFunction(
+            other.denominator * this - other.numerator,
+            other.denominator
+        )
+    /**
+     * Returns product of the polynomial represented as polynomial and the rational function.
+     */
+    public override operator fun P.times(other: R): R =
+        constructRationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
+
+    /**
+     * Returns sum of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun R.plus(other: P): R =
+        constructRationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    /**
+     * Returns difference between the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun R.minus(other: P): R =
+        constructRationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    /**
+     * Returns product of the polynomial represented as rational function and the rational function.
+     */
+    public override operator fun R.times(other: P): R =
+        constructRationalFunction(
+            numerator * other,
+            denominator
+        )
+
+    /**
+     * Returns negation of the rational function.
+     */
+    public override operator fun R.unaryMinus(): R = constructRationalFunction(-numerator, denominator)
+    /**
+     * Returns sum of the rational functions.
+     */
+    public override operator fun R.plus(other: R): R =
+        constructRationalFunction(
+            numerator * other.denominator + denominator * other.numerator,
+            denominator * other.denominator
+        )
+    /**
+     * Returns difference of the rational functions.
+     */
+    public override operator fun R.minus(other: R): R =
+        constructRationalFunction(
+            numerator * other.denominator - denominator * other.numerator,
+            denominator * other.denominator
+        )
+    /**
+     * Returns product of the rational functions.
+     */
+    public override operator fun R.times(other: R): R =
+        constructRationalFunction(
+            numerator * other.numerator,
+            denominator * other.denominator
+        )
+
+    /**
+     * Instance of zero rational function (zero of the rational functions ring).
+     */
+    public override val zero: R get() = constructRationalFunction(polynomialZero, polynomialOne)
+
+    /**
+     * Instance of unit polynomial (unit of the rational functions ring).
+     */
+    public override val one: R get() = constructRationalFunction(polynomialOne, polynomialOne)
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
index d79e8eda3..583160cf4 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
@@ -17,7 +17,7 @@ public fun <C, A : Ring<C>> A.labeledRationalFunction(): LabeledRationalFunction
     LabeledRationalFunctionSpace(this)
 
 /**
- * Creates a [RationalFunctionSpace]'s scope over a received ring.
+ * Creates a [LabeledRationalFunctionSpace]'s scope over a received ring.
  */
 public inline fun <C, A : Ring<C>, R> A.labeledRationalFunction(block: LabeledRationalFunctionSpace<C, A>.() -> R): R {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
similarity index 72%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
rename to kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
index afaf27a52..df5ba593a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
@@ -22,31 +22,31 @@ import kotlin.math.pow
 //    if (degree > -1) Polynomial(coefficients.subList(0, degree + 1)) else zero
 
 /**
- * Creates a [PolynomialSpace] over a received ring.
+ * Creates a [ListPolynomialSpace] over a received ring.
  */
-public fun <C, A : Ring<C>> A.polynomial(): PolynomialSpace<C, A> =
-    PolynomialSpace(this)
+public fun <C, A : Ring<C>> A.listPolynomial(): ListPolynomialSpace<C, A> =
+    ListPolynomialSpace(this)
 
 /**
- * Creates a [PolynomialSpace]'s scope over a received ring.
+ * Creates a [ListPolynomialSpace]'s scope over a received ring.
  */
-public inline fun <C, A : Ring<C>, R> A.polynomial(block: PolynomialSpace<C, A>.() -> R): R {
+public inline fun <C, A : Ring<C>, R> A.listPolynomial(block: ListPolynomialSpace<C, A>.() -> R): R {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return PolynomialSpace(this).block()
+    return ListPolynomialSpace(this).block()
 }
 
 /**
- * Creates a [ScalablePolynomialSpace] over a received scalable ring.
+ * Creates a [ScalableListPolynomialSpace] over a received scalable ring.
  */
-public fun <C, A> A.scalablePolynomial(): ScalablePolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C> =
-    ScalablePolynomialSpace(this)
+public fun <C, A> A.scalableListPolynomial(): ScalableListPolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C> =
+    ScalableListPolynomialSpace(this)
 
 /**
- * Creates a [ScalablePolynomialSpace]'s scope over a received scalable ring.
+ * Creates a [ScalableListPolynomialSpace]'s scope over a received scalable ring.
  */
-public inline fun <C, A, R> A.scalablePolynomial(block: ScalablePolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
+public inline fun <C, A, R> A.scalableListPolynomial(block: ScalableListPolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ScalablePolynomialSpace(this).block()
+    return ScalableListPolynomialSpace(this).block()
 }
 
 @Suppress("NOTHING_TO_INLINE")
@@ -99,7 +99,7 @@ internal inline fun <C> multiplyAddingTo(
 /**
  * Evaluates the value of the given double polynomial for given double argument.
  */
-public fun Polynomial<Double>.substitute(arg: Double): Double =
+public fun ListPolynomial<Double>.substitute(arg: Double): Double =
     coefficients.reduceIndexedOrNull { index, acc, c ->
         acc + c * arg.pow(index)
     } ?: .0
@@ -109,7 +109,7 @@ public fun Polynomial<Double>.substitute(arg: Double): Double =
  *
  * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
  */
-public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
+public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
     if (coefficients.isEmpty()) return@ring zero
     var result: C = coefficients.last()
     for (j in coefficients.size - 2 downTo 0) {
@@ -118,11 +118,11 @@ public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
     return result
 }
 
-public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: Polynomial<C>) : Polynomial<C> = ring {
-    if (coefficients.isEmpty()) return Polynomial(emptyList())
+public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListPolynomial<C> = ring {
+    if (coefficients.isEmpty()) return ListPolynomial(emptyList())
 
     val thisDegree = coefficients.indexOfLast { it != zero }
-    if (thisDegree == -1) return Polynomial(emptyList())
+    if (thisDegree == -1) return ListPolynomial(emptyList())
     val argDegree = arg.coefficients.indexOfLast { it != zero }
     if (argDegree == -1) return coefficients[0].asPolynomial()
     val constantZero = zero
@@ -145,27 +145,27 @@ public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: Polynomial<C>) : Pol
     }
 
     with(resultCoefs) { while (isNotEmpty() && elementAt(lastIndex) == constantZero) removeAt(lastIndex) }
-    return Polynomial<C>(resultCoefs)
+    return ListPolynomial<C>(resultCoefs)
 }
 
 /**
  * Represent the polynomial as a regular context-less function.
  */
-public fun <C, A : Ring<C>> Polynomial<C>.asFunction(ring: A): (C) -> C = { substitute(ring, it) }
+public fun <C, A : Ring<C>> ListPolynomial<C>.asFunction(ring: A): (C) -> C = { substitute(ring, it) }
 
 /**
  * Represent the polynomial as a regular context-less function.
  */
-public fun <C, A : Ring<C>> Polynomial<C>.asPolynomialFunctionOver(ring: A): (Polynomial<C>) -> Polynomial<C> = { substitute(ring, it) }
+public fun <C, A : Ring<C>> ListPolynomial<C>.asPolynomialFunctionOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
 
 /**
  * Returns algebraic derivative of received polynomial.
  */
 @UnstableKMathAPI
-public fun <C, A> Polynomial<C>.derivative(
+public fun <C, A> ListPolynomial<C>.derivative(
     algebra: A,
-): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    Polynomial(
+): ListPolynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
+    ListPolynomial(
         buildList(max(0, coefficients.size - 1)) {
             for (deg in 1 .. coefficients.lastIndex) add(number(deg) * coefficients[deg])
             while (isNotEmpty() && elementAt(lastIndex) == algebra.zero) removeAt(lastIndex)
@@ -177,12 +177,12 @@ public fun <C, A> Polynomial<C>.derivative(
  * Returns algebraic derivative of received polynomial.
  */
 @UnstableKMathAPI
-public fun <C, A> Polynomial<C>.nthDerivative(
+public fun <C, A> ListPolynomial<C>.nthDerivative(
     algebra: A,
     order: Int,
-): Polynomial<C> where A : Ring<C>, A : NumericAlgebra<C> = algebra {
+): ListPolynomial<C> where A : Ring<C>, A : NumericAlgebra<C> = algebra {
     require(order >= 0) { "Order of derivative must be non-negative" }
-    Polynomial(
+    ListPolynomial(
         buildList(max(0, coefficients.size - order)) {
             for (deg in order.. coefficients.lastIndex)
                 add((deg - order + 1 .. deg).fold(coefficients[deg]) { acc, d -> acc * number(d) })
@@ -195,10 +195,10 @@ public fun <C, A> Polynomial<C>.nthDerivative(
  * Returns algebraic antiderivative of received polynomial.
  */
 @UnstableKMathAPI
-public fun <C, A> Polynomial<C>.antiderivative(
+public fun <C, A> ListPolynomial<C>.antiderivative(
     algebra: A,
-): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
-    Polynomial(
+): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
+    ListPolynomial(
         buildList(coefficients.size + 1) {
             add(zero)
             coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
@@ -211,12 +211,12 @@ public fun <C, A> Polynomial<C>.antiderivative(
  * Returns algebraic antiderivative of received polynomial.
  */
 @UnstableKMathAPI
-public fun <C, A> Polynomial<C>.nthAntiderivative(
+public fun <C, A> ListPolynomial<C>.nthAntiderivative(
     algebra: A,
     order: Int,
-): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
+): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
     require(order >= 0) { "Order of antiderivative must be non-negative" }
-    Polynomial(
+    ListPolynomial(
         buildList(coefficients.size + order) {
             repeat(order) { add(zero) }
             coefficients.mapIndexedTo(this) { index, c -> (1..order).fold(c) { acc, i -> acc / number(index + i) } }
@@ -229,7 +229,7 @@ public fun <C, A> Polynomial<C>.nthAntiderivative(
  * Compute a definite integral of a given polynomial in a [range]
  */
 @UnstableKMathAPI
-public fun <C : Comparable<C>> Polynomial<C>.integrate(
+public fun <C : Comparable<C>> ListPolynomial<C>.integrate(
     algebra: Field<C>,
     range: ClosedRange<C>,
 ): C = algebra {
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt
similarity index 88%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
rename to kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt
index 8d2073834..151c7bb8d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/rationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt
@@ -14,23 +14,23 @@ import kotlin.math.max
 
 
 /**
- * Creates a [RationalFunctionSpace] over a received ring.
+ * Creates a [ListRationalFunctionSpace] over a received ring.
  */
-public fun <C, A : Ring<C>> A.rationalFunction(): RationalFunctionSpace<C, A> =
-    RationalFunctionSpace(this)
+public fun <C, A : Ring<C>> A.listRationalFunction(): ListRationalFunctionSpace<C, A> =
+    ListRationalFunctionSpace(this)
 
 /**
- * Creates a [RationalFunctionSpace]'s scope over a received ring.
+ * Creates a [ListRationalFunctionSpace]'s scope over a received ring.
  */
-public inline fun <C, A : Ring<C>, R> A.rationalFunction(block: RationalFunctionSpace<C, A>.() -> R): R {
+public inline fun <C, A : Ring<C>, R> A.listRationalFunction(block: ListRationalFunctionSpace<C, A>.() -> R): R {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return RationalFunctionSpace(this).block()
+    return ListRationalFunctionSpace(this).block()
 }
 
 /**
  * Evaluates the value of the given double polynomial for given double argument.
  */
-public fun RationalFunction<Double>.substitute(arg: Double): Double =
+public fun ListRationalFunction<Double>.substitute(arg: Double): Double =
     numerator.substitute(arg) / denominator.substitute(arg)
 
 /**
@@ -38,7 +38,7 @@ public fun RationalFunction<Double>.substitute(arg: Double): Double =
  *
  * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
  */
-public fun <C> RationalFunction<C>.substitute(ring: Field<C>, arg: C): C = ring {
+public fun <C> ListRationalFunction<C>.substitute(ring: Field<C>, arg: C): C = ring {
     numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
 }
 
@@ -50,13 +50,13 @@ public fun <C> RationalFunction<C>.substitute(ring: Field<C>, arg: C): C = ring
  * ```
  * is returned.
  *
- * Used in [Polynomial.substitute] and [RationalFunction.substitute] for performance optimisation.
+ * Used in [ListPolynomial.substitute] and [ListRationalFunction.substitute] for performance optimisation.
  */ // TODO: Дописать
-internal fun <C> Polynomial<C>.substituteRationalFunctionTakeNumerator(ring: Ring<C>, arg: RationalFunction<C>): Polynomial<C> = ring {
-    if (coefficients.isEmpty()) return Polynomial(emptyList())
+internal fun <C> ListPolynomial<C>.substituteRationalFunctionTakeNumerator(ring: Ring<C>, arg: ListRationalFunction<C>): ListPolynomial<C> = ring {
+    if (coefficients.isEmpty()) return ListPolynomial(emptyList())
 
     val thisDegree = coefficients.indexOfLast { it != zero }
-    if (thisDegree == -1) return Polynomial(emptyList())
+    if (thisDegree == -1) return ListPolynomial(emptyList())
     val thisDegreeLog2 = 31 - thisDegree.countLeadingZeroBits()
     val numeratorDegree = arg.numerator.coefficients.indexOfLast { it != zero }
     val denominatorDegree = arg.denominator.coefficients.indexOfLast { it != zero }
@@ -189,7 +189,7 @@ internal fun <C> Polynomial<C>.substituteRationalFunctionTakeNumerator(ring: Rin
         return levelResultCoefs
     }
 
-    return Polynomial(
+    return ListPolynomial(
         processLevelEdged(
             level = thisDegreeLog2,
             start = 0,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
index cc725f981..5cd0679ab 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
@@ -17,7 +17,7 @@ public fun <C, A : Ring<C>> A.numberedRationalFunction(): NumberedRationalFuncti
     NumberedRationalFunctionSpace(this)
 
 /**
- * Creates a [RationalFunctionSpace]'s scope over a received ring.
+ * Creates a [NumberedRationalFunctionSpace]'s scope over a received ring.
  */
 public inline fun <C, A : Ring<C>, R> A.numberedRationalFunction(block: NumberedRationalFunctionSpace<C, A>.() -> R): R {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
index 34d7bcf41..b55f16cf2 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.interpolation
 
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.Polynomial
+import space.kscience.kmath.functions.ListPolynomial
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.invoke
@@ -32,7 +32,7 @@ public class LinearInterpolator<T : Comparable<T>>(override val algebra: Field<T
             for (i in 0 until points.size - 1) {
                 val slope = (points.y[i + 1] - points.y[i]) / (points.x[i + 1] - points.x[i])
                 val const = points.y[i] - slope * points.x[i]
-                val polynomial = Polynomial(const, slope)
+                val polynomial = ListPolynomial(const, slope)
                 putRight(points.x[i + 1], polynomial)
             }
         }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
index afcb33bd4..48c90ff23 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.interpolation
 
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.Polynomial
+import space.kscience.kmath.functions.ListPolynomial
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Field
@@ -61,7 +61,7 @@ public class SplineInterpolator<T : Comparable<T>>(
                 val x02 = x0 * x0
                 val x03 = x02 * x0
                 //Shift coefficients to represent absolute polynomial instead of one with an offset
-                val polynomial = Polynomial(
+                val polynomial = ListPolynomial(
                     a - b * x0 + c * x02 - d * x03,
                     b - 2 * c * x0 + 3 * d * x02,
                     c - 3 * d * x0,
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
new file mode 100644
index 000000000..0d2c4b5fc
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
@@ -0,0 +1,705 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.test.misc.*
+import kotlin.test.*
+
+
+class ListPolynomialTest {
+    @Test
+    fun test_Polynomial_Int_plus() {
+        RationalField.listPolynomial {
+            assertEquals(
+                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + -3,
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 2,
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(),
+                ListPolynomial(Rational(-2)) + 2,
+                "test 3"
+            )
+            assertEquals(
+                ListPolynomial(),
+                ListPolynomial<Rational>() + 0,
+                "test 4"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 1,
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1)),
+                ListPolynomial(Rational(-2)) + 1,
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(2)),
+                ListPolynomial<Rational>() + 2,
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Int_minus() {
+        RationalField.listPolynomial {
+            assertEquals(
+                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - -3,
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 2,
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(),
+                ListPolynomial(Rational(2)) - 2,
+                "test 3"
+            )
+            assertEquals(
+                ListPolynomial(),
+                ListPolynomial<Rational>() - 0,
+                "test 4"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 1,
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1)),
+                ListPolynomial(Rational(2)) - 1,
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-2)),
+                ListPolynomial<Rational>() - 2,
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Int_times() {
+        IntModuloRing(35).listPolynomial {
+            assertEquals(
+                ListPolynomial(34, 2, 1, 20, 2),
+                ListPolynomial(22, 26, 13, 15, 26) * 27,
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(),
+                ListPolynomial(7, 0, 49, 21, 14) * 15,
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_plus() {
+        RationalField.listPolynomial {
+            assertEquals(
+                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                -3 + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                2 + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(),
+                2 + ListPolynomial(Rational(-2)),
+                "test 3"
+            )
+            assertEquals(
+                ListPolynomial(),
+                0 + ListPolynomial(),
+                "test 4"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                1 + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1)),
+                1 + ListPolynomial(Rational(-2)),
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(2)),
+                2 + ListPolynomial(),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_minus() {
+        RationalField.listPolynomial {
+            assertEquals(
+                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                3 - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                -2 - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(),
+                -2 - ListPolynomial(Rational(-2)),
+                "test 3"
+            )
+            assertEquals(
+                ListPolynomial(),
+                0 - ListPolynomial(),
+                "test 4"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                -1 - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1)),
+                -1 - ListPolynomial(Rational(-2)),
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-2)),
+                -2 - ListPolynomial(),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_times() {
+        IntModuloRing(35).listPolynomial {
+            assertEquals(
+                ListPolynomial(34, 2, 1, 20, 2),
+                27 * ListPolynomial(22, 26, 13, 15, 26),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(),
+                15 * ListPolynomial(7, 0, 49, 21, 14),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_plus() {
+        RationalField.listPolynomial {
+            assertEquals(
+                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + Rational(-3),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(2),
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(),
+                ListPolynomial(Rational(-2)) + Rational(2),
+                "test 3"
+            )
+            assertEquals(
+                ListPolynomial(),
+                ListPolynomial<Rational>() + Rational(0),
+                "test 4"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(1),
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1)),
+                ListPolynomial(Rational(-2)) + Rational(1),
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(2)),
+                ListPolynomial<Rational>() + Rational(2),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_minus() {
+        RationalField.listPolynomial {
+            assertEquals(
+                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - Rational(-3),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(2),
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(),
+                ListPolynomial(Rational(2)) - Rational(2),
+                "test 3"
+            )
+            assertEquals(
+                ListPolynomial(),
+                ListPolynomial<Rational>() - Rational(0),
+                "test 4"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(1),
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1)),
+                ListPolynomial(Rational(2)) - Rational(1),
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-2)),
+                ListPolynomial<Rational>() - Rational(2),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_times() {
+        IntModuloRing(35).listPolynomial {
+            assertEquals(
+                ListPolynomial(34, 2, 1, 20, 2),
+                ListPolynomial(22, 26, 13, 15, 26) * number(27),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(),
+                ListPolynomial(7, 0, 49, 21, 14) * number(15),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_plus() {
+        RationalField.listPolynomial {
+            assertEquals(
+                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                Rational(-3) + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Rational(2) + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(),
+                Rational(2) + ListPolynomial(Rational(-2)),
+                "test 3"
+            )
+            assertEquals(
+                ListPolynomial(),
+                Rational(0) + ListPolynomial(),
+                "test 4"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                Rational(1) + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1)),
+                Rational(1) + ListPolynomial(Rational(-2)),
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(2)),
+                Rational(2) + ListPolynomial(),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_minus() {
+        RationalField.listPolynomial {
+            assertEquals(
+                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                Rational(3) - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Rational(-2) - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(),
+                Rational(-2) - ListPolynomial(Rational(-2)),
+                "test 3"
+            )
+            assertEquals(
+                ListPolynomial(),
+                Rational(0) - ListPolynomial(),
+                "test 4"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                Rational(-1) - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1)),
+                Rational(-1) - ListPolynomial(Rational(-2)),
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-2)),
+                Rational(-2) - ListPolynomial(),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_times() {
+        IntModuloRing(35).listPolynomial {
+            assertEquals(
+                ListPolynomial(34, 2, 1, 20, 2),
+                27 * ListPolynomial(22, 26, 13, 15, 26),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(),
+                15 * ListPolynomial(7, 0, 49, 21, 14),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_unaryMinus() {
+        RationalField.listPolynomial {
+            assertEquals(
+                ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
+                -ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7), Rational(0), Rational(0)),
+                -ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7), Rational(0), Rational(0)),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_plus() {
+        RationalField.listPolynomial {
+            // (5/9 - 8/9 x - 8/7 x^2) + (-5/7 + 5/1 x + 5/8 x^2) ?= -10/63 + 37/9 x - 29/56 x^2
+            assertEquals(
+                ListPolynomial(Rational(-10, 63), Rational(37, 9), Rational(-29, 56)),
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) +
+                        ListPolynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
+                "test 1"
+            )
+            // (-2/9 - 8/3 x) + (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 5/12 x + 2/4 x^2
+            assertEquals(
+                ListPolynomial(Rational(-2, 9), Rational(-5, 12), Rational(2, 4)),
+                ListPolynomial(Rational(-2, 9), Rational(-8, 3)) +
+                        ListPolynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
+                "test 2"
+            )
+            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) + (-6/3 - 7/2 x + 2/3 x^2) ?= -18/7 - 23/6 x + 2/3 x^2
+            assertEquals(
+                ListPolynomial(Rational(-18, 7), Rational(-23, 6), Rational(2, 3)),
+                ListPolynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) +
+                        ListPolynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
+                "test 3"
+            )
+            // (-2/4 - 6/9 x - 4/9 x^2) + (2/4 + 6/9 x + 4/9 x^2) ?= 0
+            assertEquals(
+                ListPolynomial(),
+                ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) +
+                        ListPolynomial(Rational(2, 4), Rational(6, 9), Rational(4, 9)),
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_minus() {
+        RationalField.listPolynomial {
+            // (5/9 - 8/9 x - 8/7 x^2) - (-5/7 + 5/1 x + 5/8 x^2) ?= 80/63 - 53/9 x - 99/56 x^2
+            assertEquals(
+                ListPolynomial(Rational(80, 63), Rational(-53, 9), Rational(-99, 56)),
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) -
+                        ListPolynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
+                "test 1"
+            )
+            // (-2/9 - 8/3 x) - (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 59/12 x - 2/4 x^2
+            assertEquals(
+                ListPolynomial(Rational(-2, 9), Rational(-59, 12), Rational(-2, 4)),
+                ListPolynomial(Rational(-2, 9), Rational(-8, 3)) -
+                        ListPolynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
+                "test 2"
+            )
+            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) - (-6/3 - 7/2 x + 2/3 x^2) ?= 10/7 + 19/6 x - 2/3 x^2
+            assertEquals(
+                ListPolynomial(Rational(10, 7), Rational(19, 6), Rational(-2, 3)),
+                ListPolynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) -
+                        ListPolynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
+                "test 3"
+            )
+            // (-2/4 - 6/9 x - 4/9 x^2) - (-2/4 - 6/9 x - 4/9 x^2) ?= 0
+            assertEquals(
+                ListPolynomial(),
+                ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) -
+                        ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)),
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_times() {
+        IntModuloRing(35).listPolynomial {
+            // (1 + x + x^2) * (1 - x + x^2) ?= 1 + x^2 + x^4
+            assertEquals(
+                ListPolynomial(1, 0, 1, 0, 1),
+                ListPolynomial(1, -1, 1) * ListPolynomial(1, 1, 1),
+                "test 1"
+            )
+            // Spoiler: 5 * 7 = 0
+            assertEquals(
+                ListPolynomial(),
+                ListPolynomial(5, -25, 10) * ListPolynomial(21, 14, -7),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_isZero() {
+        RationalField.listPolynomial {
+            assertTrue("test 1") { ListPolynomial<Rational>().isZero() }
+            assertTrue("test 2") { ListPolynomial<Rational>(Rational(0)).isZero() }
+            assertTrue("test 3") { ListPolynomial<Rational>(Rational(0), Rational(0)).isZero() }
+            assertTrue("test 4") { ListPolynomial<Rational>(Rational(0), Rational(0), Rational(0))
+                .isZero() }
+            assertFalse("test 5") { ListPolynomial<Rational>(Rational(3, 5)).isZero() }
+            assertFalse("test 6") { ListPolynomial<Rational>(Rational(3, 5), Rational(0))
+                .isZero() }
+            assertFalse("test 7") { ListPolynomial<Rational>(Rational(0), Rational(3, 5), Rational(0))
+                .isZero() }
+        }
+    }
+    @Test
+    fun test_Polynomial_isOne() {
+        RationalField.listPolynomial {
+            assertFalse("test 1") { ListPolynomial<Rational>().isOne() }
+            assertFalse("test 2") { ListPolynomial(Rational(0)).isOne() }
+            assertFalse("test 3") { ListPolynomial(Rational(0), Rational(0)).isOne() }
+            assertFalse("test 4") { ListPolynomial(Rational(0), Rational(0), Rational(0))
+                .isOne() }
+            assertFalse("test 5") { ListPolynomial(Rational(3, 5)).isOne() }
+            assertTrue("test 6") { ListPolynomial(Rational(5, 5)).isOne() }
+            assertFalse("test 7") { ListPolynomial(Rational(3, 5), Rational(0)).isOne() }
+            assertTrue("test 8") { ListPolynomial(Rational(3, 3), Rational(0)).isOne() }
+            assertFalse("test 9") { ListPolynomial(Rational(0), Rational(3, 5), Rational(0))
+                .isOne() }
+            assertFalse("test 10") { ListPolynomial(Rational(0), Rational(5, 5), Rational(0))
+                .isOne() }
+            assertFalse("test 11") { ListPolynomial(Rational(1), Rational(3, 5), Rational(0))
+                .isOne() }
+            assertFalse("test 12") { ListPolynomial(Rational(1), Rational(5, 5), Rational(0))
+                .isOne() }
+        }
+    }
+    @Test
+    fun test_Polynomial_isMinusOne() {
+        RationalField.listPolynomial {
+            assertFalse("test 1") { ListPolynomial<Rational>().isMinusOne() }
+            assertFalse("test 2") { ListPolynomial(Rational(0)).isMinusOne() }
+            assertFalse("test 3") { ListPolynomial(Rational(0), Rational(0)).isMinusOne() }
+            assertFalse("test 4") { ListPolynomial(Rational(0), Rational(0), Rational(0))
+                .isMinusOne() }
+            assertFalse("test 5") { ListPolynomial(Rational(3, 5)).isMinusOne() }
+            assertTrue("test 6") { ListPolynomial(Rational(-5, 5)).isMinusOne() }
+            assertFalse("test 7") { ListPolynomial(Rational(3, 5), Rational(0)).isMinusOne() }
+            assertTrue("test 8") { ListPolynomial(Rational(-3, 3), Rational(0)).isMinusOne() }
+            assertFalse("test 9") { ListPolynomial(Rational(0), Rational(3, 5), Rational(0))
+                .isMinusOne() }
+            assertFalse("test 10") { ListPolynomial(Rational(0), Rational(5, -5), Rational(0))
+                .isMinusOne() }
+            assertFalse("test 11") { ListPolynomial(Rational(-1), Rational(3, 5), Rational(0))
+                .isMinusOne() }
+            assertFalse("test 12") { ListPolynomial(Rational(-1), Rational(5, -5), Rational(0))
+                .isMinusOne() }
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_equalsTo() {
+        RationalField.listPolynomial {
+            assertTrue("test 1") {
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) equalsTo
+                        ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7))
+            }
+            assertTrue("test 2") {
+                ListPolynomial(Rational(5, 9), Rational(0), Rational(-8, 7)) equalsTo
+                        ListPolynomial(Rational(5, 9), Rational(0), Rational(-8, 7))
+            }
+            assertTrue("test 3") {
+                ListPolynomial(Rational(0), Rational(0), Rational(-8, 7), Rational(0), Rational(0)) equalsTo
+                        ListPolynomial(Rational(0), Rational(0), Rational(-8, 7))
+            }
+            assertFalse("test 4") {
+                ListPolynomial(Rational(5, 9), Rational(5, 7), Rational(-8, 7)) equalsTo
+                        ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7))
+            }
+            assertFalse("test 5") {
+                ListPolynomial(Rational(8, 3), Rational(0), Rational(-8, 7)) equalsTo
+                        ListPolynomial(Rational(5, 9), Rational(0), Rational(-8, 7))
+            }
+            assertFalse("test 6") {
+                ListPolynomial(Rational(0), Rational(0), Rational(-8, 7), Rational(0), Rational(0)) equalsTo
+                        ListPolynomial(Rational(0), Rational(0), Rational(8, 7))
+            }
+        }
+    }
+    @Test
+    fun test_Polynomial_degree() {
+        RationalField.listPolynomial {
+            assertEquals(
+                2,
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)).degree,
+                "test 1"
+            )
+            assertEquals(
+                -1,
+                ListPolynomial<Rational>().degree,
+                "test 2"
+            )
+            assertEquals(
+                -1,
+                ListPolynomial(Rational(0)).degree,
+                "test 3"
+            )
+            assertEquals(
+                -1,
+                ListPolynomial(Rational(0), Rational(0)).degree,
+                "test 4"
+            )
+            assertEquals(
+                -1,
+                ListPolynomial(Rational(0), Rational(0), Rational(0)).degree,
+                "test 5"
+            )
+            assertEquals(
+                0,
+                ListPolynomial(Rational(5, 9)).degree,
+                "test 6"
+            )
+            assertEquals(
+                0,
+                ListPolynomial(Rational(5, 9), Rational(0)).degree,
+                "test 7"
+            )
+            assertEquals(
+                0,
+                ListPolynomial(Rational(5, 9), Rational(0), Rational(0)).degree,
+                "test 8"
+            )
+            assertEquals(
+                2,
+                ListPolynomial(Rational(0), Rational(0), Rational(-8, 7)).degree,
+                "test 9"
+            )
+            assertEquals(
+                2,
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7), Rational(0), Rational(0)).degree,
+                "test 10"
+            )
+            assertEquals(
+                2,
+                ListPolynomial(Rational(0), Rational(0), Rational(-8, 7), Rational(0), Rational(0)).degree,
+                "test 11"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_asConstantOrNull() {
+        RationalField.listPolynomial {
+            assertEquals(
+                Rational(0),
+                ListPolynomial<Rational>().asConstantOrNull(),
+                "test 1"
+            )
+            assertEquals(
+                Rational(0),
+                ListPolynomial(Rational(0)).asConstantOrNull(),
+                "test 2"
+            )
+            assertEquals(
+                Rational(0),
+                ListPolynomial(Rational(0), Rational(0)).asConstantOrNull(),
+                "test 3"
+            )
+            assertEquals(
+                Rational(0),
+                ListPolynomial(Rational(0), Rational(0), Rational(0)).asConstantOrNull(),
+                "test 4"
+            )
+            assertEquals(
+                Rational(-7, 9),
+                ListPolynomial(Rational(-7, 9)).asConstantOrNull(),
+                "test 5"
+            )
+            assertEquals(
+                Rational(-7, 9),
+                ListPolynomial(Rational(-7, 9), Rational(0)).asConstantOrNull(),
+                "test 6"
+            )
+            assertEquals(
+                Rational(-7, 9),
+                ListPolynomial(Rational(-7, 9), Rational(0), Rational(0)).asConstantOrNull(),
+                "test 7"
+            )
+            assertEquals(
+                null,
+                ListPolynomial(Rational(0), Rational(-7, 9)).asConstantOrNull(),
+                "test 8"
+            )
+            assertEquals(
+                null,
+                ListPolynomial(Rational(0), Rational(-7, 9), Rational(0)).asConstantOrNull(),
+                "test 9"
+            )
+            assertEquals(
+                null,
+                ListPolynomial(Rational(0), Rational(0), Rational(-7, 9)).asConstantOrNull(),
+                "test 10"
+            )
+            assertEquals(
+                null,
+                ListPolynomial(Rational(4, 15), Rational(0), Rational(-7, 9)).asConstantOrNull(),
+                "test 11"
+            )
+            assertEquals(
+                null,
+                ListPolynomial(Rational(4, 15), Rational(0), Rational(-7, 9), Rational(0))
+                    .asConstantOrNull(),
+                "test 12"
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
new file mode 100644
index 000000000..bec46c034
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.test.misc.Rational
+import space.kscience.kmath.test.misc.RationalField
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+
+
+class ListPolynomialUtilTest {
+    @Test
+    fun test_substitute_Double() {
+        val polynomial = ListPolynomial(1.0, -2.0, 1.0)
+        assertEquals(0.0, polynomial.substitute(1.0), 0.001)
+    }
+    @Test
+    fun test_substitute_Constant() {
+        assertEquals(
+            Rational(0),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, Rational(1)),
+            "test 1"
+        )
+        assertEquals(
+            Rational(25057, 21000),
+            ListPolynomial(Rational(5,8), Rational(8, 3), Rational(4, 7), Rational(3, 2))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 2"
+        )
+        assertEquals(
+            Rational(2983, 5250),
+            ListPolynomial(Rational(0), Rational(8, 3), Rational(4, 7), Rational(3, 2))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 3"
+        )
+        assertEquals(
+            Rational(4961, 4200),
+            ListPolynomial(Rational(5,8), Rational(8, 3), Rational(4, 7), Rational(0))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 4"
+        )
+        assertEquals(
+            Rational(3511, 3000),
+            ListPolynomial(Rational(5,8), Rational(8, 3), Rational(0), Rational(3, 2))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 5"
+        )
+    }
+    @Test
+    fun test_substitute_Polynomial() {
+        assertEquals(
+            ListPolynomial(),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, ListPolynomial(Rational(1))),
+            "test 1"
+        )
+        assertEquals(
+            ListPolynomial(Rational(709, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
+            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(2, 7))
+                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
+            "test 2"
+        )
+        assertEquals(
+            ListPolynomial(Rational(655, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
+            ListPolynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(2, 7))
+                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
+            "test 3"
+        )
+        assertEquals(
+            ListPolynomial(Rational(677, 378), Rational(97, 180), Rational(1, 75)),
+            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(0))
+                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
+            "test 4"
+        )
+        assertEquals(
+            ListPolynomial(Rational(653, 378), Rational(221, 420), Rational(4, 175), Rational(2, 875)),
+            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(0), Rational(2, 7))
+                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
+            "test 5"
+        )
+        assertEquals(
+            ListPolynomial(Rational(89, 54)),
+            ListPolynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(0))
+                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(0))),
+            "test 6"
+        )
+    }
+    @Test
+    fun test_derivative() {
+        assertEquals(
+            ListPolynomial(Rational(-2), Rational(2)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).derivative(RationalField),
+            "test 1"
+        )
+        assertEquals(
+            ListPolynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
+            "test 2"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
+            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
+            "test 3"
+        )
+        assertEquals(
+            ListPolynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).derivative(RationalField),
+            "test 4"
+        )
+    }
+    @Test
+    fun test_nthDerivative() {
+        assertEquals(
+            ListPolynomial(Rational(-2), Rational(2)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 1),
+            "test 1"
+        )
+        assertFailsWith<IllegalArgumentException>("test2") {
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, -1)
+        }
+        assertEquals(
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 0),
+            "test 3"
+        )
+        assertEquals(
+            ListPolynomial(Rational(2)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 2),
+            "test 4"
+        )
+        assertEquals(
+            ListPolynomial(),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 3),
+            "test 5"
+        )
+        assertEquals(
+            ListPolynomial(),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 4),
+            "test 6"
+        )
+        assertEquals(
+            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
+            "test 7"
+        )
+        assertEquals(
+            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
+            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
+            "test 8"
+        )
+        assertEquals(
+            ListPolynomial(Rational(8, 9), Rational(30, 7)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthDerivative(RationalField, 2),
+            "test 9"
+        )
+    }
+    @Test
+    fun test_antiderivative() {
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).antiderivative(RationalField),
+            "test 1"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
+            "test 2"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
+            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
+            "test 3"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).antiderivative(RationalField),
+            "test 4"
+        )
+    }
+    @Test
+    fun test_nthAntiderivative() {
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 1),
+            "test 1"
+        )
+        assertFailsWith<IllegalArgumentException>("test2") {
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, -1)
+        }
+        assertEquals(
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 0),
+            "test 3"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(1, 2), Rational(-1, 3), Rational(1, 12)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 2),
+            "test 4"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(1, 6), Rational(-1, 12), Rational(1, 60)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 3),
+            "test 5"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 24), Rational(-1, 60), Rational(1, 360)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 4),
+            "test 6"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
+            "test 7"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
+            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
+            "test 8"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthAntiderivative(RationalField, 2),
+            "test 9"
+        )
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
deleted file mode 100644
index 141bdd436..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
+++ /dev/null
@@ -1,691 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.test.misc.*
-import kotlin.test.*
-
-
-class PolynomialTest {
-    @Test
-    fun test_Polynomial_Int_plus() {
-        RationalField.polynomial {
-            assertEquals(
-                Polynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + -3,
-                "test 1"
-            )
-            assertEquals(
-                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 2,
-                "test 2"
-            )
-            assertEquals(
-                Polynomial(),
-                Polynomial(Rational(-2)) + 2,
-                "test 3"
-            )
-            assertEquals(
-                Polynomial(),
-                Polynomial<Rational>() + 0,
-                "test 4"
-            )
-            assertEquals(
-                Polynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 1,
-                "test 5"
-            )
-            assertEquals(
-                Polynomial(Rational(-1)),
-                Polynomial(Rational(-2)) + 1,
-                "test 6"
-            )
-            assertEquals(
-                Polynomial(Rational(2)),
-                Polynomial<Rational>() + 2,
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Int_minus() {
-        RationalField.polynomial {
-            assertEquals(
-                Polynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - -3,
-                "test 1"
-            )
-            assertEquals(
-                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                Polynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 2,
-                "test 2"
-            )
-            assertEquals(
-                Polynomial(),
-                Polynomial(Rational(2)) - 2,
-                "test 3"
-            )
-            assertEquals(
-                Polynomial(),
-                Polynomial<Rational>() - 0,
-                "test 4"
-            )
-            assertEquals(
-                Polynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                Polynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 1,
-                "test 5"
-            )
-            assertEquals(
-                Polynomial(Rational(1)),
-                Polynomial(Rational(2)) - 1,
-                "test 6"
-            )
-            assertEquals(
-                Polynomial(Rational(-2)),
-                Polynomial<Rational>() - 2,
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Int_times() {
-        IntModuloRing(35).polynomial {
-            assertEquals(
-                Polynomial(34, 2, 1, 20, 2),
-                Polynomial(22, 26, 13, 15, 26) * 27,
-                "test 1"
-            )
-            assertEquals(
-                Polynomial(),
-                Polynomial(7, 0, 49, 21, 14) * 15,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_plus() {
-        RationalField.polynomial {
-            assertEquals(
-                Polynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                -3 + Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                2 + Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                Polynomial(),
-                2 + Polynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                Polynomial(),
-                0 + Polynomial(),
-                "test 4"
-            )
-            assertEquals(
-                Polynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                1 + Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
-            )
-            assertEquals(
-                Polynomial(Rational(-1)),
-                1 + Polynomial(Rational(-2)),
-                "test 6"
-            )
-            assertEquals(
-                Polynomial(Rational(2)),
-                2 + Polynomial(),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_minus() {
-        RationalField.polynomial {
-            assertEquals(
-                Polynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                3 - Polynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                -2 - Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                Polynomial(),
-                -2 - Polynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                Polynomial(),
-                0 - Polynomial(),
-                "test 4"
-            )
-            assertEquals(
-                Polynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                -1 - Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
-            )
-            assertEquals(
-                Polynomial(Rational(1)),
-                -1 - Polynomial(Rational(-2)),
-                "test 6"
-            )
-            assertEquals(
-                Polynomial(Rational(-2)),
-                -2 - Polynomial(),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_times() {
-        IntModuloRing(35).polynomial {
-            assertEquals(
-                Polynomial(34, 2, 1, 20, 2),
-                27 * Polynomial(22, 26, 13, 15, 26),
-                "test 1"
-            )
-            assertEquals(
-                Polynomial(),
-                15 * Polynomial(7, 0, 49, 21, 14),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_plus() {
-        RationalField.polynomial {
-            assertEquals(
-                Polynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + Rational(-3),
-                "test 1"
-            )
-            assertEquals(
-                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(2),
-                "test 2"
-            )
-            assertEquals(
-                Polynomial(),
-                Polynomial(Rational(-2)) + Rational(2),
-                "test 3"
-            )
-            assertEquals(
-                Polynomial(),
-                Polynomial<Rational>() + Rational(0),
-                "test 4"
-            )
-            assertEquals(
-                Polynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(1),
-                "test 5"
-            )
-            assertEquals(
-                Polynomial(Rational(-1)),
-                Polynomial(Rational(-2)) + Rational(1),
-                "test 6"
-            )
-            assertEquals(
-                Polynomial(Rational(2)),
-                Polynomial<Rational>() + Rational(2),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_minus() {
-        RationalField.polynomial {
-            assertEquals(
-                Polynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - Rational(-3),
-                "test 1"
-            )
-            assertEquals(
-                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                Polynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(2),
-                "test 2"
-            )
-            assertEquals(
-                Polynomial(),
-                Polynomial(Rational(2)) - Rational(2),
-                "test 3"
-            )
-            assertEquals(
-                Polynomial(),
-                Polynomial<Rational>() - Rational(0),
-                "test 4"
-            )
-            assertEquals(
-                Polynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                Polynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(1),
-                "test 5"
-            )
-            assertEquals(
-                Polynomial(Rational(1)),
-                Polynomial(Rational(2)) - Rational(1),
-                "test 6"
-            )
-            assertEquals(
-                Polynomial(Rational(-2)),
-                Polynomial<Rational>() - Rational(2),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_times() {
-        IntModuloRing(35).polynomial {
-            assertEquals(
-                Polynomial(34, 2, 1, 20, 2),
-                Polynomial(22, 26, 13, 15, 26) * number(27),
-                "test 1"
-            )
-            assertEquals(
-                Polynomial(),
-                Polynomial(7, 0, 49, 21, 14) * number(15),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_plus() {
-        RationalField.polynomial {
-            assertEquals(
-                Polynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                Rational(-3) + Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                Rational(2) + Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                Polynomial(),
-                Rational(2) + Polynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                Polynomial(),
-                Rational(0) + Polynomial(),
-                "test 4"
-            )
-            assertEquals(
-                Polynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                Rational(1) + Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
-            )
-            assertEquals(
-                Polynomial(Rational(-1)),
-                Rational(1) + Polynomial(Rational(-2)),
-                "test 6"
-            )
-            assertEquals(
-                Polynomial(Rational(2)),
-                Rational(2) + Polynomial(),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_minus() {
-        RationalField.polynomial {
-            assertEquals(
-                Polynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                Rational(3) - Polynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                Rational(-2) - Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                Polynomial(),
-                Rational(-2) - Polynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                Polynomial(),
-                Rational(0) - Polynomial(),
-                "test 4"
-            )
-            assertEquals(
-                Polynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                Rational(-1) - Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
-            )
-            assertEquals(
-                Polynomial(Rational(1)),
-                Rational(-1) - Polynomial(Rational(-2)),
-                "test 6"
-            )
-            assertEquals(
-                Polynomial(Rational(-2)),
-                Rational(-2) - Polynomial(),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_times() {
-        IntModuloRing(35).polynomial {
-            assertEquals(
-                Polynomial(34, 2, 1, 20, 2),
-                27 * Polynomial(22, 26, 13, 15, 26),
-                "test 1"
-            )
-            assertEquals(
-                Polynomial(),
-                15 * Polynomial(7, 0, 49, 21, 14),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_unaryMinus() {
-        RationalField.polynomial {
-            assertEquals(
-                Polynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
-                -Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                Polynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7), Rational(0), Rational(0)),
-                -Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7), Rational(0), Rational(0)),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_plus() {
-        RationalField.polynomial {
-            // (5/9 - 8/9 x - 8/7 x^2) + (-5/7 + 5/1 x + 5/8 x^2) ?= -10/63 + 37/9 x - 29/56 x^2
-            assertEquals(
-                Polynomial(Rational(-10, 63), Rational(37, 9), Rational(-29, 56)),
-                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) +
-                        Polynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
-                "test 1"
-            )
-            // (-2/9 - 8/3 x) + (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 5/12 x + 2/4 x^2
-            assertEquals(
-                Polynomial(Rational(-2, 9), Rational(-5, 12), Rational(2, 4)),
-                Polynomial(Rational(-2, 9), Rational(-8, 3)) +
-                        Polynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
-                "test 2"
-            )
-            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) + (-6/3 - 7/2 x + 2/3 x^2) ?= -18/7 - 23/6 x + 2/3 x^2
-            assertEquals(
-                Polynomial(Rational(-18, 7), Rational(-23, 6), Rational(2, 3)),
-                Polynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) +
-                        Polynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
-                "test 3"
-            )
-            // (-2/4 - 6/9 x - 4/9 x^2) + (2/4 + 6/9 x + 4/9 x^2) ?= 0
-            assertEquals(
-                Polynomial(),
-                Polynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) +
-                        Polynomial(Rational(2, 4), Rational(6, 9), Rational(4, 9)),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_minus() {
-        RationalField.polynomial {
-            // (5/9 - 8/9 x - 8/7 x^2) - (-5/7 + 5/1 x + 5/8 x^2) ?= 80/63 - 53/9 x - 99/56 x^2
-            assertEquals(
-                Polynomial(Rational(80, 63), Rational(-53, 9), Rational(-99, 56)),
-                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) -
-                        Polynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
-                "test 1"
-            )
-            // (-2/9 - 8/3 x) - (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 59/12 x - 2/4 x^2
-            assertEquals(
-                Polynomial(Rational(-2, 9), Rational(-59, 12), Rational(-2, 4)),
-                Polynomial(Rational(-2, 9), Rational(-8, 3)) -
-                        Polynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
-                "test 2"
-            )
-            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) - (-6/3 - 7/2 x + 2/3 x^2) ?= 10/7 + 19/6 x - 2/3 x^2
-            assertEquals(
-                Polynomial(Rational(10, 7), Rational(19, 6), Rational(-2, 3)),
-                Polynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) -
-                        Polynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
-                "test 3"
-            )
-            // (-2/4 - 6/9 x - 4/9 x^2) - (-2/4 - 6/9 x - 4/9 x^2) ?= 0
-            assertEquals(
-                Polynomial(),
-                Polynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) -
-                        Polynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_times() {
-        IntModuloRing(35).polynomial {
-            // (1 + x + x^2) * (1 - x + x^2) ?= 1 + x^2 + x^4
-            assertEquals(
-                Polynomial(1, 0, 1, 0, 1),
-                Polynomial(1, -1, 1) * Polynomial(1, 1, 1),
-                "test 1"
-            )
-            // Spoiler: 5 * 7 = 0
-            assertEquals(
-                Polynomial(),
-                Polynomial(5, -25, 10) * Polynomial(21, 14, -7),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_isZero() {
-        RationalField.polynomial {
-            assertTrue("test 1") { Polynomial<Rational>().isZero() }
-            assertTrue("test 2") { Polynomial<Rational>(Rational(0)).isZero() }
-            assertTrue("test 3") { Polynomial<Rational>(Rational(0), Rational(0)).isZero() }
-            assertTrue("test 4") { Polynomial<Rational>(Rational(0), Rational(0), Rational(0)).isZero() }
-            assertFalse("test 5") { Polynomial<Rational>(Rational(3, 5)).isZero() }
-            assertFalse("test 6") { Polynomial<Rational>(Rational(3, 5), Rational(0)).isZero() }
-            assertFalse("test 7") { Polynomial<Rational>(Rational(0), Rational(3, 5), Rational(0)).isZero() }
-        }
-    }
-    @Test
-    fun test_Polynomial_isOne() {
-        RationalField.polynomial {
-            assertFalse("test 1") { Polynomial<Rational>().isOne() }
-            assertFalse("test 2") { Polynomial(Rational(0)).isOne() }
-            assertFalse("test 3") { Polynomial(Rational(0), Rational(0)).isOne() }
-            assertFalse("test 4") { Polynomial(Rational(0), Rational(0), Rational(0)).isOne() }
-            assertFalse("test 5") { Polynomial(Rational(3, 5)).isOne() }
-            assertTrue("test 6") { Polynomial(Rational(5, 5)).isOne() }
-            assertFalse("test 7") { Polynomial(Rational(3, 5), Rational(0)).isOne() }
-            assertTrue("test 8") { Polynomial(Rational(3, 3), Rational(0)).isOne() }
-            assertFalse("test 9") { Polynomial(Rational(0), Rational(3, 5), Rational(0)).isOne() }
-            assertFalse("test 10") { Polynomial(Rational(0), Rational(5, 5), Rational(0)).isOne() }
-            assertFalse("test 11") { Polynomial(Rational(1), Rational(3, 5), Rational(0)).isOne() }
-            assertFalse("test 12") { Polynomial(Rational(1), Rational(5, 5), Rational(0)).isOne() }
-        }
-    }
-    @Test
-    fun test_Polynomial_isMinusOne() {
-        RationalField.polynomial {
-            assertFalse("test 1") { Polynomial<Rational>().isMinusOne() }
-            assertFalse("test 2") { Polynomial(Rational(0)).isMinusOne() }
-            assertFalse("test 3") { Polynomial(Rational(0), Rational(0)).isMinusOne() }
-            assertFalse("test 4") { Polynomial(Rational(0), Rational(0), Rational(0)).isMinusOne() }
-            assertFalse("test 5") { Polynomial(Rational(3, 5)).isMinusOne() }
-            assertTrue("test 6") { Polynomial(Rational(-5, 5)).isMinusOne() }
-            assertFalse("test 7") { Polynomial(Rational(3, 5), Rational(0)).isMinusOne() }
-            assertTrue("test 8") { Polynomial(Rational(-3, 3), Rational(0)).isMinusOne() }
-            assertFalse("test 9") { Polynomial(Rational(0), Rational(3, 5), Rational(0)).isMinusOne() }
-            assertFalse("test 10") { Polynomial(Rational(0), Rational(5, -5), Rational(0)).isMinusOne() }
-            assertFalse("test 11") { Polynomial(Rational(-1), Rational(3, 5), Rational(0)).isMinusOne() }
-            assertFalse("test 12") { Polynomial(Rational(-1), Rational(5, -5), Rational(0)).isMinusOne() }
-        }
-    }
-    @Test
-    fun test_Polynomial_equalsTo() {
-        RationalField.polynomial {
-            assertTrue("test 1") {
-                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) equalsTo
-                        Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7))
-            }
-            assertTrue("test 2") {
-                Polynomial(Rational(5, 9), Rational(0), Rational(-8, 7)) equalsTo
-                        Polynomial(Rational(5, 9), Rational(0), Rational(-8, 7))
-            }
-            assertTrue("test 3") {
-                Polynomial(Rational(0), Rational(0), Rational(-8, 7), Rational(0), Rational(0)) equalsTo
-                        Polynomial(Rational(0), Rational(0), Rational(-8, 7))
-            }
-            assertFalse("test 4") {
-                Polynomial(Rational(5, 9), Rational(5, 7), Rational(-8, 7)) equalsTo
-                        Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7))
-            }
-            assertFalse("test 5") {
-                Polynomial(Rational(8, 3), Rational(0), Rational(-8, 7)) equalsTo
-                        Polynomial(Rational(5, 9), Rational(0), Rational(-8, 7))
-            }
-            assertFalse("test 6") {
-                Polynomial(Rational(0), Rational(0), Rational(-8, 7), Rational(0), Rational(0)) equalsTo
-                        Polynomial(Rational(0), Rational(0), Rational(8, 7))
-            }
-        }
-    }
-    @Test
-    fun test_Polynomial_degree() {
-        RationalField.polynomial {
-            assertEquals(
-                2,
-                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)).degree,
-                "test 1"
-            )
-            assertEquals(
-                -1,
-                Polynomial<Rational>().degree,
-                "test 2"
-            )
-            assertEquals(
-                -1,
-                Polynomial(Rational(0)).degree,
-                "test 3"
-            )
-            assertEquals(
-                -1,
-                Polynomial(Rational(0), Rational(0)).degree,
-                "test 4"
-            )
-            assertEquals(
-                -1,
-                Polynomial(Rational(0), Rational(0), Rational(0)).degree,
-                "test 5"
-            )
-            assertEquals(
-                0,
-                Polynomial(Rational(5, 9)).degree,
-                "test 6"
-            )
-            assertEquals(
-                0,
-                Polynomial(Rational(5, 9), Rational(0)).degree,
-                "test 7"
-            )
-            assertEquals(
-                0,
-                Polynomial(Rational(5, 9), Rational(0), Rational(0)).degree,
-                "test 8"
-            )
-            assertEquals(
-                2,
-                Polynomial(Rational(0), Rational(0), Rational(-8, 7)).degree,
-                "test 9"
-            )
-            assertEquals(
-                2,
-                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7), Rational(0), Rational(0)).degree,
-                "test 10"
-            )
-            assertEquals(
-                2,
-                Polynomial(Rational(0), Rational(0), Rational(-8, 7), Rational(0), Rational(0)).degree,
-                "test 11"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_asConstantOrNull() {
-        RationalField.polynomial {
-            assertEquals(
-                Rational(0),
-                Polynomial<Rational>().asConstantOrNull(),
-                "test 1"
-            )
-            assertEquals(
-                Rational(0),
-                Polynomial(Rational(0)).asConstantOrNull(),
-                "test 2"
-            )
-            assertEquals(
-                Rational(0),
-                Polynomial(Rational(0), Rational(0)).asConstantOrNull(),
-                "test 3"
-            )
-            assertEquals(
-                Rational(0),
-                Polynomial(Rational(0), Rational(0), Rational(0)).asConstantOrNull(),
-                "test 4"
-            )
-            assertEquals(
-                Rational(-7, 9),
-                Polynomial(Rational(-7, 9)).asConstantOrNull(),
-                "test 5"
-            )
-            assertEquals(
-                Rational(-7, 9),
-                Polynomial(Rational(-7, 9), Rational(0)).asConstantOrNull(),
-                "test 6"
-            )
-            assertEquals(
-                Rational(-7, 9),
-                Polynomial(Rational(-7, 9), Rational(0), Rational(0)).asConstantOrNull(),
-                "test 7"
-            )
-            assertEquals(
-                null,
-                Polynomial(Rational(0), Rational(-7, 9)).asConstantOrNull(),
-                "test 8"
-            )
-            assertEquals(
-                null,
-                Polynomial(Rational(0), Rational(-7, 9), Rational(0)).asConstantOrNull(),
-                "test 9"
-            )
-            assertEquals(
-                null,
-                Polynomial(Rational(0), Rational(0), Rational(-7, 9)).asConstantOrNull(),
-                "test 10"
-            )
-            assertEquals(
-                null,
-                Polynomial(Rational(4, 15), Rational(0), Rational(-7, 9)).asConstantOrNull(),
-                "test 11"
-            )
-            assertEquals(
-                null,
-                Polynomial(Rational(4, 15), Rational(0), Rational(-7, 9), Rational(0)).asConstantOrNull(),
-                "test 12"
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
deleted file mode 100644
index 21c5436d3..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.test.misc.Rational
-import space.kscience.kmath.test.misc.RationalField
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
-
-
-class PolynomialUtilTest {
-    @Test
-    fun test_substitute_Double() {
-        val polynomial = Polynomial(1.0, -2.0, 1.0)
-        assertEquals(0.0, polynomial.substitute(1.0), 0.001)
-    }
-    @Test
-    fun test_substitute_Constant() {
-        assertEquals(
-            Rational(0),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, Rational(1)),
-            "test 1"
-        )
-        assertEquals(
-            Rational(25057, 21000),
-            Polynomial(Rational(5,8), Rational(8, 3), Rational(4, 7), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 2"
-        )
-        assertEquals(
-            Rational(2983, 5250),
-            Polynomial(Rational(0), Rational(8, 3), Rational(4, 7), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 3"
-        )
-        assertEquals(
-            Rational(4961, 4200),
-            Polynomial(Rational(5,8), Rational(8, 3), Rational(4, 7), Rational(0))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 4"
-        )
-        assertEquals(
-            Rational(3511, 3000),
-            Polynomial(Rational(5,8), Rational(8, 3), Rational(0), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 5"
-        )
-    }
-    @Test
-    fun test_substitute_Polynomial() {
-        assertEquals(
-            Polynomial(),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, Polynomial(Rational(1))),
-            "test 1"
-        )
-        assertEquals(
-            Polynomial(Rational(709, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
-            Polynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(2, 7))
-                .substitute(RationalField, Polynomial(Rational(6, 9), Rational(1, 5))),
-            "test 2"
-        )
-        assertEquals(
-            Polynomial(Rational(655, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
-            Polynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(2, 7))
-                .substitute(RationalField, Polynomial(Rational(6, 9), Rational(1, 5))),
-            "test 3"
-        )
-        assertEquals(
-            Polynomial(Rational(677, 378), Rational(97, 180), Rational(1, 75)),
-            Polynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(0))
-                .substitute(RationalField, Polynomial(Rational(6, 9), Rational(1, 5))),
-            "test 4"
-        )
-        assertEquals(
-            Polynomial(Rational(653, 378), Rational(221, 420), Rational(4, 175), Rational(2, 875)),
-            Polynomial(Rational(1, 7), Rational(9, 4), Rational(0), Rational(2, 7))
-                .substitute(RationalField, Polynomial(Rational(6, 9), Rational(1, 5))),
-            "test 5"
-        )
-        assertEquals(
-            Polynomial(Rational(89, 54)),
-            Polynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(0))
-                .substitute(RationalField, Polynomial(Rational(6, 9), Rational(0))),
-            "test 6"
-        )
-    }
-    @Test
-    fun test_derivative() {
-        assertEquals(
-            Polynomial(Rational(-2), Rational(2)),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).derivative(RationalField),
-            "test 1"
-        )
-        assertEquals(
-            Polynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
-            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
-            "test 2"
-        )
-        assertEquals(
-            Polynomial(Rational(0), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
-            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
-            "test 3"
-        )
-        assertEquals(
-            Polynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7)),
-            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).derivative(RationalField),
-            "test 4"
-        )
-    }
-    @Test
-    fun test_nthDerivative() {
-        assertEquals(
-            Polynomial(Rational(-2), Rational(2)),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 1),
-            "test 1"
-        )
-        assertFailsWith<IllegalArgumentException>("test2") {
-            Polynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, -1)
-        }
-        assertEquals(
-            Polynomial(Rational(1), Rational(-2), Rational(1)),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 0),
-            "test 3"
-        )
-        assertEquals(
-            Polynomial(Rational(2)),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 2),
-            "test 4"
-        )
-        assertEquals(
-            Polynomial(),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 3),
-            "test 5"
-        )
-        assertEquals(
-            Polynomial(),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 4),
-            "test 6"
-        )
-        assertEquals(
-            Polynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
-            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
-            "test 7"
-        )
-        assertEquals(
-            Polynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
-            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
-            "test 8"
-        )
-        assertEquals(
-            Polynomial(Rational(8, 9), Rational(30, 7)),
-            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthDerivative(RationalField, 2),
-            "test 9"
-        )
-    }
-    @Test
-    fun test_antiderivative() {
-        assertEquals(
-            Polynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).antiderivative(RationalField),
-            "test 1"
-        )
-        assertEquals(
-            Polynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
-            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
-            "test 2"
-        )
-        assertEquals(
-            Polynomial(Rational(0), Rational(0), Rational(0), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
-            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
-            "test 3"
-        )
-        assertEquals(
-            Polynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28)),
-            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).antiderivative(RationalField),
-            "test 4"
-        )
-    }
-    @Test
-    fun test_nthAntiderivative() {
-        assertEquals(
-            Polynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 1),
-            "test 1"
-        )
-        assertFailsWith<IllegalArgumentException>("test2") {
-            Polynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, -1)
-        }
-        assertEquals(
-            Polynomial(Rational(1), Rational(-2), Rational(1)),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 0),
-            "test 3"
-        )
-        assertEquals(
-            Polynomial(Rational(0), Rational(0), Rational(1, 2), Rational(-1, 3), Rational(1, 12)),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 2),
-            "test 4"
-        )
-        assertEquals(
-            Polynomial(Rational(0), Rational(0), Rational(0), Rational(1, 6), Rational(-1, 12), Rational(1, 60)),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 3),
-            "test 5"
-        )
-        assertEquals(
-            Polynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 24), Rational(-1, 60), Rational(1, 360)),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 4),
-            "test 6"
-        )
-        assertEquals(
-            Polynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
-            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
-            "test 7"
-        )
-        assertEquals(
-            Polynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
-            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
-            "test 8"
-        )
-        assertEquals(
-            Polynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28)),
-            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthAntiderivative(RationalField, 2),
-            "test 9"
-        )
-    }
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
index afeba0be4..aae0ad017 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.integration
 
-import space.kscience.kmath.functions.Polynomial
+import space.kscience.kmath.functions.ListPolynomial
 import space.kscience.kmath.functions.integrate
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
@@ -19,7 +19,7 @@ class SplineIntegralTest {
 
     @Test
     fun integratePolynomial(){
-        val polynomial = Polynomial(1.0, 2.0, 3.0)
+        val polynomial = ListPolynomial(1.0, 2.0, 3.0)
         val integral = polynomial.integrate(DoubleField,1.0..2.0)
         assertEquals(11.0, integral, 0.001)
     }
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
index a8a8a09bc..535a42846 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.test.misc
 
-import space.kscience.kmath.functions.Polynomial
-import space.kscience.kmath.functions.PolynomialSpace
+import space.kscience.kmath.functions.ListPolynomial
+import space.kscience.kmath.functions.ListPolynomialSpace
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
 
@@ -134,9 +134,9 @@ class IntModuloRing : Ring<IntModulo> {
     inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
 }
 
-fun PolynomialSpace<IntModulo, IntModuloRing>.number(arg: Int) = IntModulo(arg, ring.modulus, toCheckInput = false)
+fun ListPolynomialSpace<IntModulo, IntModuloRing>.number(arg: Int) = IntModulo(arg, ring.modulus, toCheckInput = false)
 
-fun PolynomialSpace<IntModulo, IntModuloRing>.Polynomial(vararg coefs: Int): Polynomial<IntModulo> =
-    Polynomial(coefs.map { IntModulo(it, ring.modulus) })
-fun IntModuloRing.Polynomial(vararg coefs: Int): Polynomial<IntModulo> =
-    Polynomial(coefs.map { IntModulo(it, modulus) })
\ No newline at end of file
+fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
+    ListPolynomial(coefs.map { IntModulo(it, ring.modulus) })
+fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
+    ListPolynomial(coefs.map { IntModulo(it, modulus) })
\ No newline at end of file
-- 
2.34.1


From 98b9a708937213eda5160805638e9d851869c7cc Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 22 Mar 2022 02:37:26 +0300
Subject: [PATCH 464/713] Enhanced tests of Double substitution.

---
 .../kmath/functions/ListPolynomialUtilTest.kt | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
index bec46c034..50ae18260 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -15,8 +15,36 @@ import kotlin.test.assertFailsWith
 class ListPolynomialUtilTest {
     @Test
     fun test_substitute_Double() {
-        val polynomial = ListPolynomial(1.0, -2.0, 1.0)
-        assertEquals(0.0, polynomial.substitute(1.0), 0.001)
+        assertEquals(
+            0.0,
+            ListPolynomial(1.0, -2.0, 1.0).substitute(1.0),
+            0.001,
+            "test 1"
+        )
+        assertEquals(
+            1.1931904761904761,
+            ListPolynomial(0.625, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
+            0.001,
+            "test 2"
+        )
+        assertEquals(
+            0.5681904761904762,
+            ListPolynomial(0.0, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
+            0.001,
+            "test 3"
+        )
+        assertEquals(
+            1.1811904761904761,
+            ListPolynomial(0.625, 2.6666666666666665, 0.5714285714285714, 0.0).substitute(0.2),
+            0.001,
+            "test 4"
+        )
+        assertEquals(
+            1.1703333333333332,
+            ListPolynomial(0.625, 2.6666666666666665, 0.0, 1.5).substitute(0.2),
+            0.001,
+            "test 5"
+        )
     }
     @Test
     fun test_substitute_Constant() {
-- 
2.34.1


From 09868f090b7507ae9ecb8ad17cc5dad75899c5b3 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 22 Mar 2022 02:39:43 +0300
Subject: [PATCH 465/713] Enhanced tests of Double substitution.

---
 .../kmath/functions/LabeledPolynomial.kt      | 10 +++++-
 .../kmath/functions/ListPolynomial.kt         | 12 ++++++-
 .../kmath/functions/NumberedPolynomial.kt     | 10 +++++-
 .../kscience/kmath/functions/Polynomial.kt    | 10 ++++++
 .../kmath/functions/RationalFunction.kt       | 31 +++++++++++++++++--
 5 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 968f77b20..3b4971d9c 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -6,7 +6,8 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.ScaleOperations
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.experimental.ExperimentalTypeInference
@@ -269,6 +270,13 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                 }
         )
 
+    /**
+     * Converts the integer [value] to polynomial.
+     */
+    public override fun number(value: Int): LabeledPolynomial<C> =
+        if (value == 0) zero
+        else LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to constantNumber(value)))
+
     public operator fun C.plus(other: Symbol): LabeledPolynomial<C> =
         if (isZero()) LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to constantOne,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index b97c1e0b4..f886ca19f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -5,7 +5,9 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.ScaleOperations
+import space.kscience.kmath.operations.invoke
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.experimental.ExperimentalTypeInference
@@ -13,6 +15,7 @@ import kotlin.jvm.JvmName
 import kotlin.math.max
 import kotlin.math.min
 
+
 /**
  * Polynomial model without fixation on specific context they are applied to.
  *
@@ -193,6 +196,13 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                 }
         )
 
+    /**
+     * Converts the integer [value] to polynomial.
+     */
+    public override fun number(value: Int): ListPolynomial<C> =
+        if (value == 0) zero
+        else ListPolynomial(constantNumber(value))
+
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 3b9b907b7..387b6841d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -5,7 +5,8 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.ScaleOperations
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.experimental.ExperimentalTypeInference
@@ -221,6 +222,13 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                 }
         )
 
+    /**
+     * Converts the integer [value] to polynomial.
+     */
+    public override fun number(value: Int): NumberedPolynomial<C> =
+        if (value == 0) zero
+        else NumberedPolynomial(mapOf(emptyList<UInt>() to constantNumber(value)))
+
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index b26a57a34..dc46c868a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -61,6 +61,11 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
      */
     public operator fun Int.times(other: C): C
 
+    /**
+     * Converts the integer [value] to constant.
+     */
+    public fun constantNumber(value: Int): C = constantOne * value
+
     /**
      * Returns sum of the polynomial and the integer represented as polynomial.
      *
@@ -99,6 +104,11 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
      */
     public operator fun Int.times(other: P): P = multiplyBySquaring(other, this)
 
+    /**
+     * Converts the integer [value] to polynomial.
+     */
+    public fun number(value: Int): P = one * value
+
     /**
      * Returns the same constant.
      */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 635661b8a..724d88963 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -68,6 +68,11 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      */
     public operator fun Int.times(other: C): C
 
+    /**
+     * Converts the integer [value] to constant.
+     */
+    public fun constantNumber(value: Int): C = constantOne * value
+
     /**
      * Returns sum of the constant and the integer represented as polynomial.
      *
@@ -106,6 +111,11 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      */
     public operator fun Int.times(other: P): P
 
+    /**
+     * Converts the integer [value] to polynomial.
+     */
+    public fun polynomialNumber(value: Int): P = polynomialOne * value
+
     /**
      * Returns sum of the rational function and the integer represented as rational function.
      *
@@ -144,6 +154,11 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      */
     public operator fun Int.times(other: R): R = multiplyBySquaring(other, this)
 
+    /**
+     * Converts the integer [value] to rational function.
+     */
+    public fun number(value: Int): R = one * value
+
     /**
      * Returns the same constant.
      */
@@ -672,6 +687,11 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
      */
     public override operator fun Int.times(other: P): P = polynomialRing { this@times * other }
 
+    /**
+     * Converts the integer [value] to polynomial.
+     */
+    public override fun polynomialNumber(value: Int): P = polynomialRing { number(value) }
+
     /**
      * Returns the same constant.
      */
@@ -880,7 +900,7 @@ public abstract class PolynomialSpaceOfFractions<
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         > : RationalFunctionalSpace<C, P, R> {
-    protected abstract fun constructRationalFunction(numerator: P, denominator: P) : R
+    protected abstract fun constructRationalFunction(numerator: P, denominator: P = polynomialOne) : R
 
     /**
      * Returns sum of the rational function and the integer represented as rational function.
@@ -944,6 +964,11 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
 
+    /**
+     * Converts the integer [value] to rational function.
+     */
+    public override fun number(value: Int): R = constructRationalFunction(polynomialNumber(value))
+
     /**
      * Returns sum of the constant represented as rational function and the rational function.
      */
@@ -1076,10 +1101,10 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Instance of zero rational function (zero of the rational functions ring).
      */
-    public override val zero: R get() = constructRationalFunction(polynomialZero, polynomialOne)
+    public override val zero: R get() = constructRationalFunction(polynomialZero)
 
     /**
      * Instance of unit polynomial (unit of the rational functions ring).
      */
-    public override val one: R get() = constructRationalFunction(polynomialOne, polynomialOne)
+    public override val one: R get() = constructRationalFunction(polynomialOne)
 }
\ No newline at end of file
-- 
2.34.1


From 2f9e5043577d798f1330c20da497bb44eb66c617 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 22 Mar 2022 13:58:29 +0300
Subject: [PATCH 466/713] Added division to RFs' Spaces. Added conversion to
 polynomial and RFs' spaces. Added requirements for RFs' denominators' changes
 for case of non-integral domain. Added requirements for non-zero divisor to
 RFs' divisions.

---
 .../kmath/functions/LabeledPolynomial.kt      |  11 +-
 .../functions/LabeledRationalFunction.kt      |  18 --
 .../kmath/functions/ListPolynomial.kt         |  13 +-
 .../kmath/functions/ListRationalFunction.kt   |  24 --
 .../kmath/functions/NumberedPolynomial.kt     |  11 +-
 .../kscience/kmath/functions/Polynomial.kt    |  17 ++
 .../kmath/functions/RationalFunction.kt       | 217 +++++++++++++++++-
 7 files changed, 250 insertions(+), 61 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 3b4971d9c..e0b92a712 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -273,9 +273,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     /**
      * Converts the integer [value] to polynomial.
      */
-    public override fun number(value: Int): LabeledPolynomial<C> =
-        if (value == 0) zero
-        else LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to constantNumber(value)))
+    public override fun number(value: Int): LabeledPolynomial<C> = number(constantNumber(value))
 
     public operator fun C.plus(other: Symbol): LabeledPolynomial<C> =
         if (isZero()) LabeledPolynomial<C>(mapOf(
@@ -425,6 +423,13 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                 }
         )
 
+    /**
+     * Converts the constant [value] to polynomial.
+     */
+    public override fun number(value: C): LabeledPolynomial<C> =
+        if (value == 0) zero
+        else LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to value))
+
     public operator fun Symbol.plus(other: Symbol): LabeledPolynomial<C> =
         if (this == other) LabeledPolynomial<C>(mapOf(
             mapOf(this to 1U) to constantOne * 2
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index f347f9191..735e04a48 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -144,24 +144,6 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
 
     // TODO: Разобрать
 
-    public operator fun LabeledRationalFunction<C>.div(other: LabeledRationalFunction<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator * other.denominator,
-            denominator * other.numerator
-        )
-
-    public operator fun LabeledRationalFunction<C>.div(other: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator,
-            denominator * other
-        )
-
-    public operator fun LabeledRationalFunction<C>.div(other: C): LabeledRationalFunction<C> =
-        LabeledRationalFunction(
-            numerator,
-            denominator * other
-        )
-
 //    operator fun invoke(arg: Map<Symbol, C>): LabeledRationalFunction<C> =
 //        LabeledRationalFunction(
 //            numerator(arg),
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index f886ca19f..90e9cde69 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -66,7 +66,7 @@ public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false):
 public fun <C> ListPolynomial(vararg coefficients: C, reverse: Boolean = false): ListPolynomial<C> =
     ListPolynomial(with(coefficients) { if (reverse) reversed() else toList() })
 
-public fun <C> C.asPolynomial() : ListPolynomial<C> = ListPolynomial(listOf(this))
+public fun <C> C.asListPolynomial() : ListPolynomial<C> = ListPolynomial(listOf(this))
 
 /**
  * Space of univariate polynomials constructed over ring.
@@ -199,9 +199,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
     /**
      * Converts the integer [value] to polynomial.
      */
-    public override fun number(value: Int): ListPolynomial<C> =
-        if (value == 0) zero
-        else ListPolynomial(constantNumber(value))
+    public override fun number(value: Int): ListPolynomial<C> = number(constantNumber(value))
 
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
@@ -313,6 +311,13 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                 }
         )
 
+    /**
+     * Converts the constant [value] to polynomial.
+     */
+    public override fun number(value: C): ListPolynomial<C> =
+        if (value.isZero()) zero
+        else ListPolynomial(value)
+
     /**
      * Returns negation of the polynomial.
      */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
index 50ddd3118..8bd925c46 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
@@ -70,30 +70,6 @@ public class ListRationalFunctionSpace<C, A : Ring<C>> (
 
     // TODO: Разобрать
 
-    public operator fun ListRationalFunction<C>.div(other: ListRationalFunction<C>): ListRationalFunction<C> =
-        ListRationalFunction(
-            numerator * other.denominator,
-            denominator * other.numerator
-        )
-
-    public operator fun ListRationalFunction<C>.div(other: ListPolynomial<C>): ListRationalFunction<C> =
-        ListRationalFunction(
-            numerator,
-            denominator * other
-        )
-
-    public operator fun ListRationalFunction<C>.div(other: C): ListRationalFunction<C> =
-        ListRationalFunction(
-            numerator,
-            denominator * other
-        )
-
-    public operator fun ListRationalFunction<C>.div(other: Int): ListRationalFunction<C> =
-        ListRationalFunction(
-            numerator,
-            denominator * other
-        )
-
 //    operator fun invoke(arg: UnivariatePolynomial<T>): RationalFunction<T> =
 //        RationalFunction(
 //            numerator(arg),
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 387b6841d..1f37a1c2b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -225,9 +225,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     /**
      * Converts the integer [value] to polynomial.
      */
-    public override fun number(value: Int): NumberedPolynomial<C> =
-        if (value == 0) zero
-        else NumberedPolynomial(mapOf(emptyList<UInt>() to constantNumber(value)))
+    public override fun number(value: Int): NumberedPolynomial<C> = number(constantNumber(value))
 
     /**
      * Returns sum of the constant represented as polynomial and the polynomial.
@@ -331,6 +329,13 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                 }
         )
 
+    /**
+     * Converts the constant [value] to polynomial.
+     */
+    public override fun number(value: C): NumberedPolynomial<C> =
+        if (value == 0) zero
+        else NumberedPolynomial(mapOf(emptyList<UInt>() to value))
+
     /**
      * Returns negation of the polynomial.
      */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index dc46c868a..f8d7d5a36 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -65,6 +65,10 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
      * Converts the integer [value] to constant.
      */
     public fun constantNumber(value: Int): C = constantOne * value
+    /**
+     * Converts the integer to constant.
+     */
+    public fun Int.asConstant(): C = constantNumber(this)
 
     /**
      * Returns sum of the polynomial and the integer represented as polynomial.
@@ -108,6 +112,10 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
      * Converts the integer [value] to polynomial.
      */
     public fun number(value: Int): P = one * value
+    /**
+     * Converts the integer to polynomial.
+     */
+    public fun Int.asPolynomial(): P = number(this)
 
     /**
      * Returns the same constant.
@@ -206,6 +214,15 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
      */
     public operator fun P.times(other: C): P
 
+    /**
+     * Converts the constant [value] to polynomial.
+     */
+    public fun number(value: C): P = one * value
+    /**
+     * Converts the constant to polynomial.
+     */
+    public fun C.asPolynomial(): P = number(this)
+
     /**
      * Returns the same polynomial.
      */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 724d88963..90e3bdbb1 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -72,6 +72,10 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      * Converts the integer [value] to constant.
      */
     public fun constantNumber(value: Int): C = constantOne * value
+    /**
+     * Converts the integer to constant.
+     */
+    public fun Int.asConstant(): C = constantNumber(this)
 
     /**
      * Returns sum of the constant and the integer represented as polynomial.
@@ -115,6 +119,10 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      * Converts the integer [value] to polynomial.
      */
     public fun polynomialNumber(value: Int): P = polynomialOne * value
+    /**
+     * Converts the integer to polynomial.
+     */
+    public fun Int.asPolynomial(): P = polynomialNumber(this)
 
     /**
      * Returns sum of the rational function and the integer represented as rational function.
@@ -134,6 +142,13 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun R.times(other: Int): R = multiplyBySquaring(this, other)
+    /**
+     * Returns quotient of the rational function and the integer represented as rational function.
+     *
+     * The operation is equivalent to creating a new rational function by preserving numerator of [this] and
+     * multiplication denominator of [this] to [other].
+     */
+    public operator fun R.div(other: Int): R = this / multiplyBySquaring(one, other)
 
     /**
      * Returns sum of the integer represented as rational function and the rational function.
@@ -153,11 +168,22 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public operator fun Int.times(other: R): R = multiplyBySquaring(other, this)
+    /**
+     * Returns quotient of the integer represented as rational function and the rational function.
+     *
+     * The operation is equivalent to creating a new rational function which numerator is [this] times denominator of
+     * [other] and which denominator is [other]'s numerator.
+     */
+    public operator fun Int.div(other: R): R = multiplyBySquaring(one / other, this)
 
     /**
      * Converts the integer [value] to rational function.
      */
     public fun number(value: Int): R = one * value
+    /**
+     * Converts the integer to rational function.
+     */
+    public fun Int.asRationalFunction(): R = number(this)
 
     /**
      * Returns the same constant.
@@ -256,6 +282,15 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      */
     public operator fun P.times(other: C): P
 
+    /**
+     * Converts the constant [value] to polynomial.
+     */
+    public fun polynomialNumber(value: C): P = polynomialOne * value
+    /**
+     * Converts the constant to polynomial.
+     */
+    public fun C.asPolynomial(): P = polynomialNumber(this)
+
     /**
      * Returns the same polynomial.
      */
@@ -276,6 +311,10 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      * Returns product of the polynomials.
      */
     public operator fun P.times(other: P): P
+    /**
+     * Returns quotient of the polynomials as rational function.
+     */
+    public operator fun P.div(other: P): R
     /**
      * Raises [arg] to the integer power [exponent].
      */
@@ -336,19 +375,36 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      * Returns product of the constant represented as polynomial and the rational function.
      */
     public operator fun C.times(other: R): R
+    /**
+     * Returns quotient of the constant represented as polynomial and the rational function.
+     */
+    public operator fun C.div(other: R): R
 
     /**
-     * Returns sum of the constant represented as rational function and the rational function.
+     * Returns sum of the rational function and the constant represented as rational function.
      */
     public operator fun R.plus(other: C): R
     /**
-     * Returns difference between the constant represented as rational function and the rational function.
+     * Returns difference between the rational function and the constant represented as rational function.
      */
     public operator fun R.minus(other: C): R
     /**
-     * Returns product of the constant represented as rational function and the rational function.
+     * Returns product of the rational function and the constant represented as rational function.
      */
     public operator fun R.times(other: C): R
+    /**
+     * Returns quotient of the rational function and the constant represented as rational function.
+     */
+    public operator fun R.div(other: C): R
+
+    /**
+     * Converts the constant [value] to rational function.
+     */
+    public fun number(value: C): R = one * value
+    /**
+     * Converts the constant to rational function.
+     */
+    public fun C.asRationalFunction(): R = number(this)
 
     /**
      * Returns sum of the polynomial represented as rational function and the rational function.
@@ -362,19 +418,36 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      * Returns product of the polynomial represented as polynomial and the rational function.
      */
     public operator fun P.times(other: R): R
+    /**
+     * Returns quotient of the polynomial represented as polynomial and the rational function.
+     */
+    public operator fun P.div(other: R): R
 
     /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
+     * Returns sum of the rational function and the polynomial represented as rational function.
      */
     public operator fun R.plus(other: P): R
     /**
-     * Returns difference between the polynomial represented as rational function and the rational function.
+     * Returns difference between the rational function and the polynomial represented as rational function.
      */
     public operator fun R.minus(other: P): R
     /**
-     * Returns product of the polynomial represented as rational function and the rational function.
+     * Returns product of the rational function and the polynomial represented as rational function.
      */
     public operator fun R.times(other: P): R
+    /**
+     * Returns quotient of the rational function and the polynomial represented as rational function.
+     */
+    public operator fun R.div(other: P): R
+
+    /**
+     * Converts the polynomial [value] to rational function.
+     */
+    public fun number(value: P): R = one * value
+    /**
+     * Converts the polynomial to rational function.
+     */
+    public fun P.asRationalFunction(): R = number(this)
 
     /**
      * Returns the same rational function.
@@ -396,6 +469,10 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      * Returns product of the rational functions.
      */
     public override operator fun R.times(other: R): R
+    /**
+     * Returns quotient of the rational functions.
+     */
+    public operator fun R.div(other: R): R
     /**
      * Raises [arg] to the integer power [exponent].
      */
@@ -649,6 +726,15 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
      */
     public override operator fun Int.times(other: C): C = polynomialRing { this@times * other }
 
+    /**
+     * Converts the integer [value] to constant.
+     */
+    public override fun constantNumber(value: Int): C = polynomialRing { constantNumber(value) }
+    /**
+     * Converts the integer to constant.
+     */
+    override fun Int.asConstant(): C = polynomialRing { asConstant() }
+
     /**
      * Returns sum of the constant and the integer represented as polynomial.
      *
@@ -691,6 +777,10 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
      * Converts the integer [value] to polynomial.
      */
     public override fun polynomialNumber(value: Int): P = polynomialRing { number(value) }
+    /**
+     * Converts the integer to polynomial.
+     */
+    public override fun Int.asPolynomial(): P = polynomialRing { asPolynomial() }
 
     /**
      * Returns the same constant.
@@ -783,6 +873,15 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
      */
     public override operator fun P.times(other: C): P = polynomialRing { this@times * other }
 
+    /**
+     * Converts the constant [value] to polynomial.
+     */
+    public override fun polynomialNumber(value: C): P = polynomialRing { number(value) }
+    /**
+     * Converts the constant to polynomial.
+     */
+    public override fun C.asPolynomial(): P = polynomialRing { asPolynomial() }
+
     /**
      * Returns the same polynomial.
      */
@@ -933,6 +1032,19 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
 
+    public override operator fun R.div(other: Int): R {
+        val otherAsConstant = constantNumber(other)
+        require(otherAsConstant.isNotZero()) { "/ by zero." }
+        return constructRationalFunction(
+            numerator,
+            (denominator * other).also {
+                check(it.isNotZero()) {
+                    "Got zero denominator during division of rational functions to constant. It means underlying ring of polynomials is not integral domain."
+                }
+            }
+        )
+    }
+
     /**
      * Returns sum of the integer represented as rational function and the rational function.
      *
@@ -964,11 +1076,24 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
 
+    public override operator fun Int.div(other: R): R {
+        require(other.numerator.isNotZero()) { "/ by zero." }
+        return constructRationalFunction(
+            this * other.denominator,
+            other.numerator
+        )
+    }
+
     /**
      * Converts the integer [value] to rational function.
      */
     public override fun number(value: Int): R = constructRationalFunction(polynomialNumber(value))
 
+    /**
+     * Returns quotient of the polynomials as rational function.
+     */
+    public override operator fun P.div(other: P): R = constructRationalFunction(this, other)
+
     /**
      * Returns sum of the constant represented as rational function and the rational function.
      */
@@ -994,6 +1119,14 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
 
+    public override operator fun C.div(other: R): R {
+        require(other.numerator.isNotZero()) { "/ by zero." }
+        return constructRationalFunction(
+            this * other.denominator,
+            other.numerator
+        )
+    }
+
     /**
      * Returns sum of the constant represented as rational function and the rational function.
      */
@@ -1019,6 +1152,23 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
 
+    public override operator fun R.div(other: C): R {
+        require(other.isNotZero()) { "/ by zero." }
+        return constructRationalFunction(
+            numerator,
+            (denominator * other).also {
+                check(it.isNotZero()) {
+                    "Got zero denominator during division of rational functions to constant. It means underlying ring of polynomials is not integral domain."
+                }
+            }
+        )
+    }
+
+    /**
+     * Converts the constant [value] to rational function.
+     */
+    public override fun number(value: C): R = constructRationalFunction(polynomialNumber(value))
+
     /**
      * Returns sum of the polynomial represented as rational function and the rational function.
      */
@@ -1044,6 +1194,14 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
 
+    public override operator fun P.div(other: R): R {
+        require(other.numerator.isNotZero()) { "/ by zero." }
+        return constructRationalFunction(
+            this * other.denominator,
+            other.numerator
+        )
+    }
+
     /**
      * Returns sum of the polynomial represented as rational function and the rational function.
      */
@@ -1069,6 +1227,23 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
 
+    public override operator fun R.div(other: P): R {
+        require(other.isNotZero()) { "/ by zero." }
+        return constructRationalFunction(
+            numerator,
+            (denominator * other).also {
+                require(it.isNotZero()) {
+                    "Got zero denominator during division of rational functions to polynomial. It means underlying ring of polynomials is not integral domain."
+                }
+            }
+        )
+    }
+
+    /**
+     * Converts the polynomial [value] to rational function.
+     */
+    public override fun number(value: P): R = constructRationalFunction(value)
+
     /**
      * Returns negation of the rational function.
      */
@@ -1079,7 +1254,11 @@ public abstract class PolynomialSpaceOfFractions<
     public override operator fun R.plus(other: R): R =
         constructRationalFunction(
             numerator * other.denominator + denominator * other.numerator,
-            denominator * other.denominator
+            (denominator * other.denominator).also {
+                check(it.isNotZero()) {
+                    "Got zero denominator during addition of rational functions. It means underlying ring of polynomials is not integral domain."
+                }
+            }
         )
     /**
      * Returns difference of the rational functions.
@@ -1087,7 +1266,11 @@ public abstract class PolynomialSpaceOfFractions<
     public override operator fun R.minus(other: R): R =
         constructRationalFunction(
             numerator * other.denominator - denominator * other.numerator,
-            denominator * other.denominator
+            (denominator * other.denominator).also {
+                check(it.isNotZero()) {
+                    "Got zero denominator during subtraction of rational functions. It means underlying ring of polynomials is not integral domain."
+                }
+            }
         )
     /**
      * Returns product of the rational functions.
@@ -1095,9 +1278,25 @@ public abstract class PolynomialSpaceOfFractions<
     public override operator fun R.times(other: R): R =
         constructRationalFunction(
             numerator * other.numerator,
-            denominator * other.denominator
+            (denominator * other.denominator).also {
+                check(it.isNotZero()) {
+                    "Got zero denominator during multiplication of rational functions. It means underlying ring of polynomials is not integral domain."
+                }
+            }
         )
 
+    public override operator fun R.div(other: R): R {
+        require(other.isNotZero()) { "/ by zero." }
+        return constructRationalFunction(
+            numerator * other.denominator,
+            (denominator * other.numerator).also {
+                check(it.isNotZero()) {
+                    "Got zero denominator during division of rational functions. It means underlying ring of polynomials is not integral domain."
+                }
+            }
+        )
+    }
+
     /**
      * Instance of zero rational function (zero of the rational functions ring).
      */
-- 
2.34.1


From 39ce855075662461892ff70f2c52c630d9e70d66 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 22 Mar 2022 14:25:09 +0300
Subject: [PATCH 467/713] Added constructors for RFs' spaces

---
 .../functions/LabeledRationalFunction.kt      |  82 +++++++-------
 .../kmath/functions/ListRationalFunction.kt   |  62 +++++++----
 .../functions/NumberedRationalFunction.kt     | 100 ++++++++----------
 3 files changed, 122 insertions(+), 122 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index 735e04a48..599660b52 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -19,48 +19,46 @@ public class LabeledRationalFunction<C>(
 
 // Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//internal fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>, denominator: Polynomial<C>): RationalFunction<C> =
-//    if (denominator.isZero()) throw ArithmeticException("/ by zero")
-//    else RationalFunction<C>(numerator, denominator)
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
-//    RationalFunction<C>(
-//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-//        Polynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } ).also { if (it.isZero()) }
-//    )
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//public fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>): RationalFunction<C> =
-//    RationalFunction(numerator, onePolynomial)
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
-//    RationalFunction(
-//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } )
-//    )
-
-// TODO: Rewrite former constructors as fabrics
-//constructor(numeratorCoefficients: Map<Map<Symbol, Int>, C>, denominatorCoefficients: Map<Map<Symbol, Int>, C>) : this(
-//LabeledPolynomial(numeratorCoefficients),
-//LabeledPolynomial(denominatorCoefficients)
-//)
-//
-//constructor(numeratorCoefficients: Collection<Pair<Map<Symbol, Int>, C>>, denominatorCoefficients: Collection<Pair<Map<Symbol, Int>, C>>) : this(
-//LabeledPolynomial(numeratorCoefficients),
-//LabeledPolynomial(denominatorCoefficients)
-//)
-//
-//constructor(numerator: LabeledPolynomial<C>) : this(numerator, numerator.getOne())
-//constructor(numeratorCoefficients: Map<Map<Symbol, Int>, C>) : this(
-//LabeledPolynomial(numeratorCoefficients)
-//)
-//
-//constructor(numeratorCoefficients: Collection<Pair<Map<Symbol, Int>, C>>) : this(
-//LabeledPolynomial(numeratorCoefficients)
-//)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numerator: LabeledPolynomial<C>, denominator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
+    if (denominator.isZero()) throw ArithmeticException("/ by zero")
+    else LabeledRationalFunction<C>(numerator, denominator)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.LabeledRationalFunction(numerator: LabeledPolynomial<C>, denominator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
+    if (denominator.coefficients.values.all { it == zero }) throw ArithmeticException("/ by zero")
+    else LabeledRationalFunction<C>(numerator, denominator)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
+    if (denominatorCoefficients.values.all { it == zero }) throw ArithmeticException("/ by zero")
+    else LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients),
+        LabeledPolynomial(denominatorCoefficients)
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
+    if (denominatorCoefficients.values.all { it == zero }) throw ArithmeticException("/ by zero")
+    else LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients),
+        LabeledPolynomial(denominatorCoefficients)
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(numerator, polynomialOne)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(numerator, LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one)))
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients),
+        polynomialOne
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients),
+        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one))
+    )
 
 public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
     public val ring: A,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
index 8bd925c46..67c7e9fa2 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
@@ -17,28 +17,46 @@ public data class ListRationalFunction<C> internal constructor (
 
 // Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//internal fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>, denominator: Polynomial<C>): RationalFunction<C> =
-//    if (denominator.isZero()) throw ArithmeticException("/ by zero")
-//    else RationalFunction<C>(numerator, denominator)
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
-//    RationalFunction<C>(
-//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-//        Polynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } ).also { if (it.isZero()) }
-//    )
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//public fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>): RationalFunction<C> =
-//    RationalFunction(numerator, onePolynomial)
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
-//    RationalFunction(
-//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } )
-//    )
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>, denominator: ListPolynomial<C>): ListRationalFunction<C> =
+    if (denominator.isZero()) throw ArithmeticException("/ by zero")
+    else ListRationalFunction<C>(numerator, denominator)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.ListRationalFunction(numerator: ListPolynomial<C>, denominator: ListPolynomial<C>): ListRationalFunction<C> =
+    if (denominator.coefficients.all { it == zero }) throw ArithmeticException("/ by zero")
+    else ListRationalFunction<C>(numerator, denominator)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    if (denominatorCoefficients.all { it == zero }) throw ArithmeticException("/ by zero")
+    else ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    if (denominatorCoefficients.all { it == zero }) throw ArithmeticException("/ by zero")
+    else ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
+    ListRationalFunction<C>(numerator, polynomialOne)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
+    ListRationalFunction<C>(numerator, ListPolynomial(listOf(one)))
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        polynomialOne
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        ListPolynomial(listOf(one))
+    )
 
 public class ListRationalFunctionSpace<C, A : Ring<C>> (
     public val ring: A,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index f3b90b5c5..b32f01f2a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -5,7 +5,8 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.invoke
 import kotlin.math.max
 
 
@@ -18,45 +19,46 @@ public class NumberedRationalFunction<C> internal constructor(
 
 // Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//internal fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>, denominator: Polynomial<C>): RationalFunction<C> =
-//    if (denominator.isZero()) throw ArithmeticException("/ by zero")
-//    else RationalFunction<C>(numerator, denominator)
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
-//    RationalFunction<C>(
-//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-//        Polynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } ).also { if (it.isZero()) }
-//    )
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//public fun <C, A: Ring<C>> RationalFunction(numerator: Polynomial<C>): RationalFunction<C> =
-//    RationalFunction(numerator, onePolynomial)
-//context(RationalFunctionSpace<C, A>)
-//@Suppress("FunctionName")
-//public fun <C, A: Ring<C>> RationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): RationalFunction<C> =
-//    RationalFunction(
-//        Polynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } )
-//    )
-
-// TODO: Rewrite former constructors as fabrics
-//constructor(numeratorCoefficients: Map<List<Int>, C>, denominatorCoefficients: Map<List<Int>, C>) : this(
-//Polynomial(numeratorCoefficients),
-//Polynomial(denominatorCoefficients)
-//)
-//constructor(numeratorCoefficients: Collection<Pair<List<Int>, C>>, denominatorCoefficients: Collection<Pair<List<Int>, C>>) : this(
-//Polynomial(numeratorCoefficients),
-//Polynomial(denominatorCoefficients)
-//)
-//constructor(numerator: Polynomial<C>) : this(numerator, numerator.getOne())
-//constructor(numeratorCoefficients: Map<List<Int>, C>) : this(
-//Polynomial(numeratorCoefficients)
-//)
-//constructor(numeratorCoefficients: Collection<Pair<List<Int>, C>>) : this(
-//Polynomial(numeratorCoefficients)
-//)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numerator: NumberedPolynomial<C>, denominator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
+    if (denominator.isZero()) throw ArithmeticException("/ by zero")
+    else NumberedRationalFunction<C>(numerator, denominator)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.NumberedRationalFunction(numerator: NumberedPolynomial<C>, denominator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
+    if (denominator.coefficients.values.all { it == zero }) throw ArithmeticException("/ by zero")
+    else NumberedRationalFunction<C>(numerator, denominator)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
+    if (denominatorCoefficients.values.all { it == zero }) throw ArithmeticException("/ by zero")
+    else NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients),
+        NumberedPolynomial(denominatorCoefficients)
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
+    if (denominatorCoefficients.values.all { it == zero }) throw ArithmeticException("/ by zero")
+    else NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients),
+        NumberedPolynomial(denominatorCoefficients)
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(numerator, polynomialOne)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(numerator, NumberedPolynomial(mapOf(emptyList<UInt>() to one)))
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients),
+        polynomialOne
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients),
+        NumberedPolynomial(mapOf(emptyList<UInt>() to one))
+    )
 
 public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
     public val ring: A,
@@ -156,24 +158,6 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
 
     // TODO: Разобрать
 
-    public operator fun NumberedRationalFunction<C>.div(other: NumberedRationalFunction<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator * other.denominator,
-            denominator * other.numerator
-        )
-
-    public operator fun NumberedRationalFunction<C>.div(other: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator,
-            denominator * other
-        )
-
-    public operator fun NumberedRationalFunction<C>.div(other: C): NumberedRationalFunction<C> =
-        NumberedRationalFunction(
-            numerator,
-            denominator * other
-        )
-
 //    operator fun invoke(arg: Map<Int, C>): NumberedRationalFunction<C> =
 //        NumberedRationalFunction(
 //            numerator(arg),
-- 
2.34.1


From b44c99c265d0d8a43679c694135585047a489813 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 22 Mar 2022 15:28:34 +0300
Subject: [PATCH 468/713] Added multivariate abstractions.

---
 .../kmath/functions/LabeledPolynomial.kt      |  68 +++---
 .../functions/LabeledRationalFunction.kt      |  33 +--
 .../kscience/kmath/functions/Polynomial.kt    |  60 +++++-
 .../kmath/functions/RationalFunction.kt       | 197 ++++++++++++++++++
 4 files changed, 303 insertions(+), 55 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index e0b92a712..29aeb6bb0 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -117,8 +117,8 @@ public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomia
  */
 public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override val ring: A,
-) : PolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
-    public operator fun Symbol.plus(other: Int): LabeledPolynomial<C> =
+) : MultivariatePolynomialSpace<C, Symbol, LabeledPolynomial<C>>, PolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
+    public override operator fun Symbol.plus(other: Int): LabeledPolynomial<C> =
         if (other == 0) LabeledPolynomial<C>(mapOf(
             mapOf(this@plus to 1U) to constantOne,
         ))
@@ -126,7 +126,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             mapOf(this@plus to 1U) to constantOne,
             emptyMap<Symbol, UInt>() to constantOne * other,
         ))
-    public operator fun Symbol.minus(other: Int): LabeledPolynomial<C> =
+    public override operator fun Symbol.minus(other: Int): LabeledPolynomial<C> =
         if (other == 0) LabeledPolynomial<C>(mapOf(
             mapOf(this@minus to 1U) to -constantOne,
         ))
@@ -134,13 +134,13 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             mapOf(this@minus to 1U) to -constantOne,
             emptyMap<Symbol, UInt>() to constantOne * other,
         ))
-    public operator fun Symbol.times(other: Int): LabeledPolynomial<C> =
+    public override operator fun Symbol.times(other: Int): LabeledPolynomial<C> =
         if (other == 0) zero
         else LabeledPolynomial<C>(mapOf(
             mapOf(this to 1U) to constantOne * other,
         ))
 
-    public operator fun Int.plus(other: Symbol): LabeledPolynomial<C> =
+    public override operator fun Int.plus(other: Symbol): LabeledPolynomial<C> =
         if (this == 0) LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to constantOne,
         ))
@@ -148,7 +148,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             mapOf(other to 1U) to constantOne,
             emptyMap<Symbol, UInt>() to constantOne * this@plus,
         ))
-    public operator fun Int.minus(other: Symbol): LabeledPolynomial<C> =
+    public override operator fun Int.minus(other: Symbol): LabeledPolynomial<C> =
         if (this == 0) LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to -constantOne,
         ))
@@ -156,7 +156,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             mapOf(other to 1U) to -constantOne,
             emptyMap<Symbol, UInt>() to constantOne * this@minus,
         ))
-    public operator fun Int.times(other: Symbol): LabeledPolynomial<C> =
+    public override operator fun Int.times(other: Symbol): LabeledPolynomial<C> =
         if (this == 0) zero
         else LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to constantOne * this@times,
@@ -275,7 +275,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     public override fun number(value: Int): LabeledPolynomial<C> = number(constantNumber(value))
 
-    public operator fun C.plus(other: Symbol): LabeledPolynomial<C> =
+    public override operator fun C.plus(other: Symbol): LabeledPolynomial<C> =
         if (isZero()) LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to constantOne,
         ))
@@ -283,7 +283,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             mapOf(other to 1U) to constantOne,
             emptyMap<Symbol, UInt>() to this@plus,
         ))
-    public operator fun C.minus(other: Symbol): LabeledPolynomial<C> =
+    public override operator fun C.minus(other: Symbol): LabeledPolynomial<C> =
         if (isZero()) LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to -constantOne,
         ))
@@ -291,13 +291,13 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             mapOf(other to 1U) to -constantOne,
             emptyMap<Symbol, UInt>() to this@minus,
         ))
-    public operator fun C.times(other: Symbol): LabeledPolynomial<C> =
+    public override operator fun C.times(other: Symbol): LabeledPolynomial<C> =
         if (isZero()) zero
         else LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to this@times,
         ))
 
-    public operator fun Symbol.plus(other: C): LabeledPolynomial<C> =
+    public override operator fun Symbol.plus(other: C): LabeledPolynomial<C> =
         if (other.isZero()) LabeledPolynomial<C>(mapOf(
             mapOf(this@plus to 1U) to constantOne,
         ))
@@ -305,7 +305,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             mapOf(this@plus to 1U) to constantOne,
             emptyMap<Symbol, UInt>() to other,
         ))
-    public operator fun Symbol.minus(other: C): LabeledPolynomial<C> =
+    public override operator fun Symbol.minus(other: C): LabeledPolynomial<C> =
         if (other.isZero()) LabeledPolynomial<C>(mapOf(
             mapOf(this@minus to 1U) to -constantOne,
         ))
@@ -313,7 +313,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             mapOf(this@minus to 1U) to -constantOne,
             emptyMap<Symbol, UInt>() to other,
         ))
-    public operator fun Symbol.times(other: C): LabeledPolynomial<C> =
+    public override operator fun Symbol.times(other: C): LabeledPolynomial<C> =
         if (other.isZero()) zero
         else LabeledPolynomial<C>(mapOf(
             mapOf(this@times to 1U) to other,
@@ -430,7 +430,15 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         if (value == 0) zero
         else LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to value))
 
-    public operator fun Symbol.plus(other: Symbol): LabeledPolynomial<C> =
+    public override operator fun Symbol.unaryPlus(): LabeledPolynomial<C> =
+        LabeledPolynomial<C>(mapOf(
+            mapOf(this to 1U) to constantOne,
+        ))
+    public override operator fun Symbol.unaryMinus(): LabeledPolynomial<C> =
+        LabeledPolynomial<C>(mapOf(
+            mapOf(this to 1U) to -constantOne,
+        ))
+    public override operator fun Symbol.plus(other: Symbol): LabeledPolynomial<C> =
         if (this == other) LabeledPolynomial<C>(mapOf(
             mapOf(this to 1U) to constantOne * 2
         ))
@@ -438,13 +446,13 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             mapOf(this to 1U) to constantOne,
             mapOf(other to 1U) to constantOne,
         ))
-    public operator fun Symbol.minus(other: Symbol): LabeledPolynomial<C> =
+    public override operator fun Symbol.minus(other: Symbol): LabeledPolynomial<C> =
         if (this == other) zero
         else LabeledPolynomial<C>(mapOf(
             mapOf(this to 1U) to constantOne,
             mapOf(other to 1U) to -constantOne,
         ))
-    public operator fun Symbol.times(other: Symbol): LabeledPolynomial<C> =
+    public override operator fun Symbol.times(other: Symbol): LabeledPolynomial<C> =
         if (this == other) LabeledPolynomial<C>(mapOf(
             mapOf(this to 2U) to constantOne
         ))
@@ -452,7 +460,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             mapOf(this to 1U, other to 1U) to constantOne,
         ))
 
-    public operator fun Symbol.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+    public override operator fun Symbol.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         with(other.coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@plus to 1u) to constantOne))
             else LabeledPolynomial<C>(
@@ -467,7 +475,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
-    public operator fun Symbol.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+    public override operator fun Symbol.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         with(other.coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@minus to 1u) to constantOne))
             else LabeledPolynomial<C>(
@@ -484,13 +492,13 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
-    public operator fun Symbol.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+    public override operator fun Symbol.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         LabeledPolynomial<C>(
             other.coefficients
                 .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[this] = if (this in it) it[this]!! + 1U else 1U } }
         )
 
-    public operator fun LabeledPolynomial<C>.plus(other: Symbol): LabeledPolynomial<C> =
+    public override operator fun LabeledPolynomial<C>.plus(other: Symbol): LabeledPolynomial<C> =
         with(coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to constantOne))
             else LabeledPolynomial<C>(
@@ -505,7 +513,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
-    public operator fun LabeledPolynomial<C>.minus(other: Symbol): LabeledPolynomial<C> =
+    public override operator fun LabeledPolynomial<C>.minus(other: Symbol): LabeledPolynomial<C> =
         with(coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to constantOne))
             else LabeledPolynomial<C>(
@@ -520,7 +528,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     }
             )
         }
-    public operator fun LabeledPolynomial<C>.times(other: Symbol): LabeledPolynomial<C> =
+    public override operator fun LabeledPolynomial<C>.times(other: Symbol): LabeledPolynomial<C> =
         LabeledPolynomial<C>(
             coefficients
                 .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[other] = if (other in it) it[other]!! + 1U else 1U } }
@@ -604,7 +612,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
      * And keys of the map is the same as in [variables].
      */
-    public val LabeledPolynomial<C>.degrees: Map<Symbol, UInt>
+    public override val LabeledPolynomial<C>.degrees: Map<Symbol, UInt>
         get() =
             buildMap {
                 coefficients.entries.forEach { (degs, c) ->
@@ -613,10 +621,20 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     }
                 }
             }
+    /**
+     * Counts degree of the polynomial by the specified [variable].
+     */
+    public override fun LabeledPolynomial<C>.degreeBy(variable: Symbol): UInt =
+        coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) 0u else degs.getOrElse(variable) { 0u } } ?: 0u
+    /**
+     * Counts degree of the polynomial by the specified [variables].
+     */
+    public override fun LabeledPolynomial<C>.degreeBy(variables: Collection<Symbol>): UInt =
+        coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) 0u else degs.filterKeys { it in variables }.values.sum() } ?: 0u
     /**
      * Set of all variables that appear in the polynomial in positive exponents.
      */
-    public val LabeledPolynomial<C>.variables: Set<Symbol>
+    public override val LabeledPolynomial<C>.variables: Set<Symbol>
         get() =
             buildSet {
                 coefficients.entries.forEach { (degs, c) -> if (c.isNotZero()) addAll(degs.keys) }
@@ -624,7 +642,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     /**
      * Count of all variables that appear in the polynomial in positive exponents.
      */
-    public val LabeledPolynomial<C>.countOfVariables: Int get() = variables.size
+    public override val LabeledPolynomial<C>.countOfVariables: Int get() = variables.size
 
     /**
      * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index 599660b52..00dd3bb47 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -63,14 +63,16 @@ public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<
 public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
     public val ring: A,
 ) :
-    RationalFunctionalSpaceOverPolynomialSpace<
+    MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSpace<
             C,
+            Symbol,
             LabeledPolynomial<C>,
             LabeledRationalFunction<C>,
             LabeledPolynomialSpace<C, A>,
             >,
-    PolynomialSpaceOfFractions<
+    MultivariatePolynomialSpaceOfFractions<
             C,
+            Symbol,
             LabeledPolynomial<C>,
             LabeledRationalFunction<C>,
             >() {
@@ -113,33 +115,6 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
         return numerator * other.denominator equalsTo other.numerator * denominator
     }
 
-    /**
-     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
-     * in which they are appeared in the polynomial.
-     *
-     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
-     * And keys of the map is the same as in [variables].
-     */
-    public val LabeledPolynomial<C>.degrees: Map<Symbol, UInt> get() = polynomialRing { degrees }
-    /**
-     * Set of all variables that appear in the polynomial in positive exponents.
-     */
-    public val LabeledPolynomial<C>.variables: Set<Symbol> get() = polynomialRing { variables }
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public val LabeledPolynomial<C>.countOfVariables: Int get() = polynomialRing { countOfVariables }
-
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public val LabeledRationalFunction<C>.variables: Set<Symbol>
-        get() = numerator.variables union denominator.variables
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public val LabeledRationalFunction<C>.countOfVariables: Int get() = variables.size
-
     // TODO: Разобрать
 
 //    operator fun invoke(arg: Map<Symbol, C>): LabeledRationalFunction<C> =
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index f8d7d5a36..224e18832 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -5,7 +5,8 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.invoke
 import kotlin.js.JsName
 import kotlin.jvm.JvmName
 
@@ -413,4 +414,61 @@ public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : Poly
      * Instance of unit constant (unit of the underlying ring).
      */
     public override val constantOne: C get() = ring.one
+}
+
+public interface MultivariatePolynomialSpace<C, V, P: Polynomial<C>>: PolynomialSpace<C, P> {
+    public operator fun V.plus(other: Int): P
+    public operator fun V.minus(other: Int): P
+    public operator fun V.times(other: Int): P
+
+    public operator fun Int.plus(other: V): P
+    public operator fun Int.minus(other: V): P
+    public operator fun Int.times(other: V): P
+
+    public operator fun C.plus(other: V): P
+    public operator fun C.minus(other: V): P
+    public operator fun C.times(other: V): P
+
+    public operator fun V.plus(other: C): P
+    public operator fun V.minus(other: C): P
+    public operator fun V.times(other: C): P
+
+    public operator fun V.unaryPlus(): P
+    public operator fun V.unaryMinus(): P
+    public operator fun V.plus(other: V): P
+    public operator fun V.minus(other: V): P
+    public operator fun V.times(other: V): P
+
+    public operator fun V.plus(other: P): P
+    public operator fun V.minus(other: P): P
+    public operator fun V.times(other: P): P
+
+    public operator fun P.plus(other: V): P
+    public operator fun P.minus(other: V): P
+    public operator fun P.times(other: V): P
+
+    /**
+     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
+     * in which they are appeared in the polynomial.
+     *
+     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
+     * And keys of the map is the same as in [variables].
+     */
+    public val P.degrees: Map<V, UInt>
+    /**
+     * Counts degree of the polynomial by the specified [variable].
+     */
+    public fun P.degreeBy(variable: V): UInt = degrees.getOrElse(variable) { 0u }
+    /**
+     * Counts degree of the polynomial by the specified [variables].
+     */
+    public fun P.degreeBy(variables: Collection<V>): UInt
+    /**
+     * Set of all variables that appear in the polynomial in positive exponents.
+     */
+    public val P.variables: Set<V> get() = degrees.keys
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val P.countOfVariables: Int get() = variables.size
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 90e3bdbb1..c5fcde8ed 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -1306,4 +1306,201 @@ public abstract class PolynomialSpaceOfFractions<
      * Instance of unit polynomial (unit of the rational functions ring).
      */
     public override val one: R get() = constructRationalFunction(polynomialOne)
+}
+
+public interface MultivariateRationalFunctionalSpace<
+        C,
+        V,
+        P: Polynomial<C>,
+        R: RationalFunction<C, P>
+        >: RationalFunctionalSpace<C, P, R> {
+    public operator fun V.plus(other: Int): P
+    public operator fun V.minus(other: Int): P
+    public operator fun V.times(other: Int): P
+
+    public operator fun Int.plus(other: V): P
+    public operator fun Int.minus(other: V): P
+    public operator fun Int.times(other: V): P
+
+    public operator fun C.plus(other: V): P
+    public operator fun C.minus(other: V): P
+    public operator fun C.times(other: V): P
+
+    public operator fun V.plus(other: C): P
+    public operator fun V.minus(other: C): P
+    public operator fun V.times(other: C): P
+
+    public operator fun V.unaryPlus(): P
+    public operator fun V.unaryMinus(): P
+    public operator fun V.plus(other: V): P
+    public operator fun V.minus(other: V): P
+    public operator fun V.times(other: V): P
+
+    public operator fun V.plus(other: P): P
+    public operator fun V.minus(other: P): P
+    public operator fun V.times(other: P): P
+
+    public operator fun P.plus(other: V): P
+    public operator fun P.minus(other: V): P
+    public operator fun P.times(other: V): P
+
+    public operator fun V.plus(other: R): R
+    public operator fun V.minus(other: R): R
+    public operator fun V.times(other: R): R
+
+    public operator fun R.plus(other: V): R
+    public operator fun R.minus(other: V): R
+    public operator fun R.times(other: V): R
+
+    /**
+     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
+     * in which they are appeared in the polynomial.
+     *
+     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
+     * And keys of the map is the same as in [variables].
+     */
+    public val P.degrees: Map<V, UInt>
+    /**
+     * Counts degree of the polynomial by the specified [variable].
+     */
+    public fun P.degreeBy(variable: V): UInt = degrees.getOrElse(variable) { 0u }
+    /**
+     * Counts degree of the polynomial by the specified [variables].
+     */
+    public fun P.degreeBy(variables: Collection<V>): UInt
+    /**
+     * Set of all variables that appear in the polynomial in positive exponents.
+     */
+    public val P.variables: Set<V> get() = degrees.keys
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val P.countOfVariables: Int get() = variables.size
+
+    /**
+     * Set of all variables that appear in the polynomial in positive exponents.
+     */
+    public val R.variables: Set<V> get() = numerator.variables union denominator.variables
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val R.countOfVariables: Int get() = variables.size
+}
+
+public interface MultivariateRationalFunctionalSpaceOverRing<
+        C,
+        V,
+        P: Polynomial<C>,
+        R: RationalFunction<C, P>,
+        A: Ring<C>
+        > : RationalFunctionalSpaceOverRing<C, P, R, A>, MultivariateRationalFunctionalSpace<C, V, P, R>
+
+public interface MultivariateRationalFunctionalSpaceOverPolynomialSpace<
+        C,
+        V,
+        P: Polynomial<C>,
+        R: RationalFunction<C, P>,
+        AP: PolynomialSpace<C, P>,
+        > : RationalFunctionalSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionalSpace<C, V, P, R>
+
+public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSpace<
+        C,
+        V,
+        P: Polynomial<C>,
+        R: RationalFunction<C, P>,
+        AP: MultivariatePolynomialSpace<C, V, P>,
+        > : MultivariateRationalFunctionalSpaceOverPolynomialSpace<C, V, P, R, AP> {
+    public override operator fun V.plus(other: Int): P = polynomialRing { this@plus + other }
+    public override operator fun V.minus(other: Int): P = polynomialRing { this@minus - other }
+    public override operator fun V.times(other: Int): P = polynomialRing { this@times * other }
+
+    public override operator fun Int.plus(other: V): P = polynomialRing { this@plus + other }
+    public override operator fun Int.minus(other: V): P = polynomialRing { this@minus - other }
+    public override operator fun Int.times(other: V): P = polynomialRing { this@times * other }
+
+    public override operator fun C.plus(other: V): P = polynomialRing { this@plus + other }
+    public override operator fun C.minus(other: V): P = polynomialRing { this@minus - other }
+    public override operator fun C.times(other: V): P = polynomialRing { this@times * other }
+
+    public override operator fun V.plus(other: C): P = polynomialRing { this@plus + other }
+    public override operator fun V.minus(other: C): P = polynomialRing { this@minus - other }
+    public override operator fun V.times(other: C): P = polynomialRing { this@times * other }
+
+    public override operator fun V.unaryPlus(): P = polynomialRing { +this@unaryPlus }
+    public override operator fun V.unaryMinus(): P = polynomialRing { -this@unaryMinus }
+    public override operator fun V.plus(other: V): P = polynomialRing { this@plus + other }
+    public override operator fun V.minus(other: V): P = polynomialRing { this@minus - other }
+    public override operator fun V.times(other: V): P = polynomialRing { this@times * other }
+
+    public override operator fun V.plus(other: P): P = polynomialRing { this@plus + other }
+    public override operator fun V.minus(other: P): P = polynomialRing { this@minus - other }
+    public override operator fun V.times(other: P): P = polynomialRing { this@times * other }
+
+    public override operator fun P.plus(other: V): P = polynomialRing { this@plus + other }
+    public override operator fun P.minus(other: V): P = polynomialRing { this@minus - other }
+    public override operator fun P.times(other: V): P = polynomialRing { this@times * other }
+
+    /**
+     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
+     * in which they are appeared in the polynomial.
+     *
+     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
+     * And keys of the map is the same as in [variables].
+     */
+    public override val P.degrees: Map<V, UInt> get() = polynomialRing { degrees }
+    /**
+     * Counts degree of the polynomial by the specified [variable].
+     */
+    public override fun P.degreeBy(variable: V): UInt = polynomialRing { degreeBy(variable) }
+    /**
+     * Counts degree of the polynomial by the specified [variables].
+     */
+    public override fun P.degreeBy(variables: Collection<V>): UInt = polynomialRing { degreeBy(variables) }
+    /**
+     * Set of all variables that appear in the polynomial in positive exponents.
+     */
+    public override val P.variables: Set<V> get() = polynomialRing { variables }
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public override val P.countOfVariables: Int get() = polynomialRing { countOfVariables }
+}
+
+public abstract class MultivariatePolynomialSpaceOfFractions<
+        C,
+        V,
+        P: Polynomial<C>,
+        R: RationalFunction<C, P>,
+        > : MultivariateRationalFunctionalSpace<C, V, P, R>,  PolynomialSpaceOfFractions<C, P, R>() {
+    public override operator fun V.plus(other: R): R =
+        constructRationalFunction(
+            this * other.denominator + other.numerator,
+            other.denominator
+        )
+    public override operator fun V.minus(other: R): R =
+        constructRationalFunction(
+            this * other.denominator - other.numerator,
+            other.denominator
+        )
+    public override operator fun V.times(other: R): R =
+        constructRationalFunction(
+            this * other.numerator,
+            other.denominator
+        )
+
+    public override operator fun R.plus(other: V): R =
+        constructRationalFunction(
+            numerator + denominator * other,
+            denominator
+        )
+    public override operator fun R.minus(other: V): R =
+        constructRationalFunction(
+            numerator - denominator * other,
+            denominator
+        )
+    public override operator fun R.times(other: V): R =
+        constructRationalFunction(
+            numerator * other,
+            denominator
+        )
 }
\ No newline at end of file
-- 
2.34.1


From 5b8d6b601e54526c0148bd391e380d305ad4496a Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 22 Mar 2022 15:37:19 +0300
Subject: [PATCH 469/713] Added `degreeBy` to `Numbered...`.

---
 .../kscience/kmath/functions/NumberedPolynomial.kt   | 12 ++++++++++++
 .../kmath/functions/NumberedRationalFunction.kt      |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 1f37a1c2b..570ccce8e 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -471,6 +471,18 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     }
                 }
             }
+    /**
+     * Counts degree of the polynomial by the specified [variable].
+     */
+    public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt =
+        coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) 0u else degs.getOrElse(variable) { 0u } } ?: 0u
+    /**
+     * Counts degree of the polynomial by the specified [variables].
+     */
+    public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt =
+        coefficients.entries.maxOfOrNull { (degs, c) ->
+            if (c.isZero()) 0u else degs.withIndex().filter { (index, _) -> index in variables }.sumOf { it.value }
+        } ?: 0u
     /**
      * Count of variables occurring in the polynomial with positive power. If there is no such variable,
      * the result is `0`.
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index b32f01f2a..2a4d942a6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -126,6 +126,14 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
      * And last index of the list is [lastVariable].
      */
     public val NumberedPolynomial<C>.degrees: List<UInt> get() = polynomialRing { degrees }
+    /**
+     * Counts degree of the polynomial by the specified [variable].
+     */
+    public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt = polynomialRing { degreeBy(variable) }
+    /**
+     * Counts degree of the polynomial by the specified [variables].
+     */
+    public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt = polynomialRing { degreeBy(variables) }
     /**
      * Count of variables occurring in the polynomial with positive power. If there is no such variable,
      * the result is `0`.
-- 
2.34.1


From d75a41482d09a7b97c049924df60b370ee14497c Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 22 Mar 2022 17:09:33 +0300
Subject: [PATCH 470/713] Added fabrics for `LabeledPolynomial` and
 `NumberedPolynomial`.

---
 .../kmath/functions/LabeledPolynomial.kt      | 131 ++++++++------
 .../kmath/functions/NumberedPolynomial.kt     | 171 ++++++++----------
 2 files changed, 158 insertions(+), 144 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 29aeb6bb0..3d1b91f7b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -54,59 +54,86 @@ internal constructor(
  */
 internal fun Map<Symbol, UInt>.cleanUp() = filterValues { it > 0U }
 
-//context(LabeledPolynomialSpace<C, Ring<C>>)
-//@Suppress("FunctionName")
-//internal fun <C> LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = false) : LabeledPolynomial<C> {
-//    if (!toCheckInput) return LabeledPolynomial(coefs)
-//
-//    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
-//
-//    for (entry in coefs) {
-//        val key = entry.key.cleanUp()
-//        val value = entry.value
-//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-//    }
-//
-//    return LabeledPolynomial(
-//        fixedCoefs.filterValues { it.isNotZero() }
-//    )
-//}
-//
-//context(LabeledPolynomialSpace<C, Ring<C>>)
-//@Suppress("FunctionName")
-//internal fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = false) : LabeledPolynomial<C> {
-//    if (!toCheckInput) return LabeledPolynomial(pairs.toMap())
-//
-//    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
-//
-//    for (entry in pairs) {
-//        val key = entry.first.cleanUp()
-//        val value = entry.second
-//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-//    }
-//
-//    return LabeledPolynomial(
-//        fixedCoefs.filterValues { it.isNotZero() }
-//    )
-//}
-//
-//// TODO: Do not know how to make it without context receivers
-//context(LabeledPolynomialSpace<C, Ring<C>>)
-//@Suppress("FunctionName")
-//public fun <C> LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-//
-//context(LabeledPolynomialSpace<C, Ring<C>>)
-//@Suppress("FunctionName")
-//public fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-//
-//context(LabeledPolynomialSpace<C, Ring<C>>)
-//@Suppress("FunctionName")
-//public fun <C> LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(pairs.toList(), toCheckInput = true)
-//
-//context(LabeledPolynomialSpace<C, Ring<C>>)
-//public fun <C> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial(mapOf(mapOf(this to 1u) to constantOne))
+// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
-public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to this))
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(coefs, toCheckInput)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
+    if (!toCheckInput) return LabeledPolynomial<C>(coefs)
+
+    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
+
+    for (entry in coefs) {
+        val key = entry.key.cleanUp()
+        val value = entry.value
+        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+    }
+
+    return LabeledPolynomial<C>(
+        fixedCoefs.filterValues { it != zero }
+    )
+}
+
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs, toCheckInput)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
+    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
+
+    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
+
+    for (entry in pairs) {
+        val key = entry.first.cleanUp()
+        val value = entry.second
+        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+    }
+
+    return LabeledPolynomial<C>(
+        fixedCoefs.filterValues { it != zero }
+    )
+}
+
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs = pairs, toCheckInput = toCheckInput)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
+    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
+
+    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
+
+    for (entry in pairs) {
+        val key = entry.first.cleanUp()
+        val value = entry.second
+        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+    }
+
+    return LabeledPolynomial<C>(
+        fixedCoefs.filterValues { it != zero }
+    )
+}
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
+
+//context(A)
+//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to one))
+//context(LabeledPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
+
+public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this))
 
 /**
  * Space of polynomials.
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 570ccce8e..411409e39 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -53,56 +53,86 @@ internal constructor(
  */
 internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
 
-//context(NumberedPolynomialSpace<C, Ring<C>>)
-//@Suppress("FunctionName")
-//internal fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = false) : NumberedPolynomial<C> {
-//    if (!toCheckInput) return NumberedPolynomial(coefs)
-//
-//    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-//
-//    for (entry in coefs) {
-//        val key = entry.key.cleanUp()
-//        val value = entry.value
-//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-//    }
-//
-//    return NumberedPolynomial(
-//        fixedCoefs.filterValues { it.isNotZero() }
-//    )
-//}
-//
-//context(NumberedPolynomialSpace<C, Ring<C>>)
-//@Suppress("FunctionName")
-//internal fun <C> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = false) : NumberedPolynomial<C> {
-//    if (!toCheckInput) return NumberedPolynomial(pairs.toMap())
-//
-//    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-//
-//    for (entry in pairs) {
-//        val key = entry.first.cleanUp()
-//        val value = entry.second
-//        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-//    }
-//
-//    return NumberedPolynomial(
-//        fixedCoefs.filterValues { it.isNotZero() }
-//    )
-//}
-//
-//// TODO: Do not know how to make it without context receivers
-//context(NumberedPolynomialSpace<C, Ring<C>>)
-//@Suppress("FunctionName")
-//public fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-//
-//context(NumberedPolynomialSpace<C, Ring<C>>)
-//@Suppress("FunctionName")
-//public fun <C> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-//
-//context(NumberedPolynomialSpace<C, Ring<C>>)
-//@Suppress("FunctionName")
-//public fun <C> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(pairs.toList(), toCheckInput = true)
+// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
-public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial(mapOf(emptyList<UInt>() to this))
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(coefs, toCheckInput)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
+    if (!toCheckInput) return NumberedPolynomial<C>(coefs)
+
+    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+
+    for (entry in coefs) {
+        val key = entry.key.cleanUp()
+        val value = entry.value
+        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+    }
+
+    return NumberedPolynomial<C>(
+        fixedCoefs.filterValues { it != zero }
+    )
+}
+
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs, toCheckInput)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
+    if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
+
+    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+
+    for (entry in pairs) {
+        val key = entry.first.cleanUp()
+        val value = entry.second
+        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+    }
+
+    return NumberedPolynomial<C>(
+        fixedCoefs.filterValues { it != zero }
+    )
+}
+
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs = pairs, toCheckInput = toCheckInput)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
+    if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
+
+    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+
+    for (entry in pairs) {
+        val key = entry.first.cleanUp()
+        val value = entry.second
+        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+    }
+
+    return NumberedPolynomial<C>(
+        fixedCoefs.filterValues { it != zero }
+    )
+}
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
+
+//context(A)
+//public fun <C, A: Ring<C>> Symbol.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(mapOf(this to 1u) to one))
+//context(NumberedPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> Symbol.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
+
+public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
 
 /**
  * Space of polynomials.
@@ -574,47 +604,4 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
             for ((degs, c) in this) if (c.isZero()) this.remove(degs)
         }
     }
-
-    @Suppress("FunctionName")
-    internal fun NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = false) : NumberedPolynomial<C> {
-        if (!toCheckInput) return NumberedPolynomial<C>(coefs)
-
-        val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-        for (entry in coefs) {
-            val key = entry.key.cleanUp()
-            val value = entry.value
-            fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-        }
-
-        return NumberedPolynomial(
-            fixedCoefs.filterValues { it.isNotZero() }
-        )
-    }
-
-    @Suppress("FunctionName")
-    internal fun NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = false) : NumberedPolynomial<C> {
-        if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
-
-        val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-        for (entry in pairs) {
-            val key = entry.first.cleanUp()
-            val value = entry.second
-            fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-        }
-
-        return NumberedPolynomial(
-            fixedCoefs.filterValues { it.isNotZero() }
-        )
-    }
-
-    @Suppress("FunctionName")
-    public fun NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-
-    @Suppress("FunctionName")
-    public fun NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-
-    @Suppress("FunctionName")
-    public fun NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(pairs.toList(), toCheckInput = true)
 }
\ No newline at end of file
-- 
2.34.1


From 0a5122a974b1e6a6d888115e36bbe3118db931f3 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:40:55 +0300
Subject: [PATCH 471/713] Prototyped DSL-like constructor for
 `NumberedPolynomial`.

---
 .../kmath/functions/NumberedPolynomial.kt     | 58 ++++++++++++++++++-
 .../kmath/functions/labeledPolynomialUtil.kt  | 47 ---------------
 .../kmath/functions/listPolynomialUtil.kt     |  2 +-
 3 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 411409e39..80998d6bf 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.ScaleOperations
 import kotlin.contracts.InvocationKind
@@ -132,7 +133,59 @@ public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vara
 //context(NumberedPolynomialSpace<C, A>)
 //public fun <C, A: Ring<C>> Symbol.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
 
-public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
+//context(A)
+//public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
+
+@DslMarker
+internal annotation class NumberedPolynomialConstructorDSL
+
+@NumberedPolynomialConstructorDSL
+public class NumberedPolynomialTermSignatureBuilder {
+    private val signature: MutableList<UInt> = ArrayList()
+    public fun build(): List<UInt> = signature
+    public infix fun Int.inPowerOf(deg: UInt) {
+        if (this > signature.lastIndex) {
+            signature.addAll(List(this - signature.lastIndex - 1) { 0u })
+            signature.add(deg)
+        } else {
+            signature[this] = deg
+        }
+    }
+    public infix fun Int.to(deg: UInt): Unit = this inPowerOf deg
+}
+
+@NumberedPolynomialConstructorDSL
+public class NumberedPolynomialBuilderOverRing<C> internal constructor(internal val context: Ring<C>, capacity: Int = 0) {
+    private val coefficients: MutableMap<List<UInt>, C> = LinkedHashMap(capacity)
+    public fun build(): NumberedPolynomial<C> = NumberedPolynomial<C>(coefficients)
+    public operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit) {
+        val signature = NumberedPolynomialTermSignatureBuilder().apply(block).build()
+        coefficients[signature] = context { coefficients.getOrElse(signature) { zero } + this@invoke }
+    }
+}
+
+@NumberedPolynomialConstructorDSL
+public class NumberedPolynomialBuilderOverPolynomialSpace<C> internal constructor(internal val context: NumberedPolynomialSpace<C, *>, capacity: Int = 0) {
+    private val coefficients: MutableMap<List<UInt>, C> = LinkedHashMap(capacity)
+    public fun build(): NumberedPolynomial<C> = NumberedPolynomial<C>(coefficients)
+    public operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit) {
+        val signature = NumberedPolynomialTermSignatureBuilder().apply(block).build()
+        coefficients[signature] = context { coefficients.getOrElse(signature) { constantZero } + this@invoke }
+    }
+}
+
+@NumberedPolynomialConstructorDSL
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedPolynomial(block: NumberedPolynomialBuilderOverRing<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverRing(this).apply(block).build()
+@NumberedPolynomialConstructorDSL
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilderOverRing<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverRing(this, capacity).apply(block).build()
+@NumberedPolynomialConstructorDSL
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(block: NumberedPolynomialBuilderOverPolynomialSpace<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverPolynomialSpace(this).apply(block).build()
+@NumberedPolynomialConstructorDSL
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilderOverPolynomialSpace<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverPolynomialSpace(this, capacity).apply(block).build()
 
 /**
  * Space of polynomials.
@@ -604,4 +657,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
             for ((degs, c) in this) if (c.isZero()) this.remove(degs)
         }
     }
+
+    // TODO: Move to other constructors with context receiver
+    public fun C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
index 27fdd7d7b..88d357413 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
@@ -17,53 +17,6 @@ import kotlin.contracts.contract
 
 // TODO: Docs
 
-//// TODO: Reuse underlying ring extensions
-//
-//context(LabeledPolynomialSpace<C, A>)
-//@Suppress("NOTHING_TO_INLINE")
-//fun <C, A: Ring<C>> numberConstant(value: Int): C = ring { number<C>(value) }
-//
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> power(arg: C, pow: UInt): C = ring { power(arg, pow) }
-//
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> multiplyWithPower(base: C, arg: C, pow: UInt): C = ring { multiplyWithPower<C>(base, arg, pow) }
-//
-
-//
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> power(arg: Symbol, pow: UInt): LabeledPolynomial<C> =
-//    if (pow == 0U) one
-//    else LabeledPolynomial<C>(mapOf(
-//        mapOf(arg to pow) to constantOne
-//    ))
-//
-
-//
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> number(value: Int): LabeledPolynomial<C> = ring { LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to number<C>(value))) }
-//
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> multiplyWithPower(base: LabeledPolynomial<C>, arg: LabeledPolynomial<C>, pow: UInt): LabeledPolynomial<C> =
-//    when {
-//        arg.isZero() && pow > 0U -> base
-//        arg.isOne() -> base
-//        arg.isMinusOne() -> if (pow % 2U == 0U) base else -base
-//        else -> multiplyWithPowerInternalLogic(base, arg, pow)
-//    }
-//
-//// Trivial but very slow
-//context(LabeledPolynomialSpace<C, A>)
-//internal tailrec fun <C, A: Ring<C>> multiplyWithPowerInternalLogic(base: LabeledPolynomial<C>, arg: LabeledPolynomial<C>, exponent: UInt): LabeledPolynomial<C> =
-//    when {
-//        exponent == 0U -> base
-//        exponent == 1U -> base * arg
-//        exponent % 2U == 0U -> multiplyWithPowerInternalLogic(base, arg * arg, exponent / 2U)
-//        exponent % 2U == 1U -> multiplyWithPowerInternalLogic(base * arg, arg * arg, exponent / 2U)
-//        else -> error("Error in raising ring instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
-//    }
-//
-
 /**
  * Creates a [LabeledPolynomialSpace] over a received ring.
  */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
index df5ba593a..35155d09d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
@@ -124,7 +124,7 @@ public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C
     val thisDegree = coefficients.indexOfLast { it != zero }
     if (thisDegree == -1) return ListPolynomial(emptyList())
     val argDegree = arg.coefficients.indexOfLast { it != zero }
-    if (argDegree == -1) return coefficients[0].asPolynomial()
+    if (argDegree == -1) return coefficients[0].asListPolynomial()
     val constantZero = zero
     val resultCoefs: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
     resultCoefs[0] = coefficients[thisDegree]
-- 
2.34.1


From 420bf05b22fa107ad33cf2bb5b05795c8b22b96e Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:42:59 +0300
Subject: [PATCH 472/713] Fixed annoying JVM clashes :expressionless:

---
 .../kscience/kmath/functions/Polynomial.kt    | 24 ++++++++
 .../kmath/functions/RationalFunction.kt       | 61 +++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 224e18832..d44c47dd6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -416,35 +416,59 @@ public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : Poly
     public override val constantOne: C get() = ring.one
 }
 
+@Suppress("INAPPLICABLE_JVM_NAME")
 public interface MultivariatePolynomialSpace<C, V, P: Polynomial<C>>: PolynomialSpace<C, P> {
+    @JvmName("VariableIntPlus")
     public operator fun V.plus(other: Int): P
+    @JvmName("VariableIntMinus")
     public operator fun V.minus(other: Int): P
+    @JvmName("VariableIntMinusTimes")
     public operator fun V.times(other: Int): P
 
+    @JvmName("IntVariablePlus")
     public operator fun Int.plus(other: V): P
+    @JvmName("IntVariableMinus")
     public operator fun Int.minus(other: V): P
+    @JvmName("IntVariableTimes")
     public operator fun Int.times(other: V): P
 
+    @JvmName("ConstantVariablePlus")
     public operator fun C.plus(other: V): P
+    @JvmName("ConstantVariableMinus")
     public operator fun C.minus(other: V): P
+    @JvmName("ConstantVariableTimes")
     public operator fun C.times(other: V): P
 
+    @JvmName("VariableConstantPlus")
     public operator fun V.plus(other: C): P
+    @JvmName("VariableConstantMinus")
     public operator fun V.minus(other: C): P
+    @JvmName("VariableConstantTimes")
     public operator fun V.times(other: C): P
 
+    @JvmName("VariableUnaryPlus")
     public operator fun V.unaryPlus(): P
+    @JvmName("VariableUnaryMinus")
     public operator fun V.unaryMinus(): P
+    @JvmName("VariablePlus")
     public operator fun V.plus(other: V): P
+    @JvmName("VariableMinus")
     public operator fun V.minus(other: V): P
+    @JvmName("VariableTimes")
     public operator fun V.times(other: V): P
 
+    @JvmName("VariablePolynomialPlus")
     public operator fun V.plus(other: P): P
+    @JvmName("VariablePolynomialMinus")
     public operator fun V.minus(other: P): P
+    @JvmName("VariablePolynomialTimes")
     public operator fun V.times(other: P): P
 
+    @JvmName("PolynomialVariablePlus")
     public operator fun P.plus(other: V): P
+    @JvmName("PolynomialVariableMinus")
     public operator fun P.minus(other: V): P
+    @JvmName("PolynomialVariableTimes")
     public operator fun P.times(other: V): P
 
     /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index c5fcde8ed..9c0263c4c 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -1308,48 +1308,78 @@ public abstract class PolynomialSpaceOfFractions<
     public override val one: R get() = constructRationalFunction(polynomialOne)
 }
 
+@Suppress("INAPPLICABLE_JVM_NAME")
 public interface MultivariateRationalFunctionalSpace<
         C,
         V,
         P: Polynomial<C>,
         R: RationalFunction<C, P>
         >: RationalFunctionalSpace<C, P, R> {
+    @JvmName("VariableIntPlus")
     public operator fun V.plus(other: Int): P
+    @JvmName("VariableIntMinus")
     public operator fun V.minus(other: Int): P
+    @JvmName("VariableIntMinusTimes")
     public operator fun V.times(other: Int): P
 
+    @JvmName("IntVariablePlus")
     public operator fun Int.plus(other: V): P
+    @JvmName("IntVariableMinus")
     public operator fun Int.minus(other: V): P
+    @JvmName("IntVariableTimes")
     public operator fun Int.times(other: V): P
 
+    @JvmName("ConstantVariablePlus")
     public operator fun C.plus(other: V): P
+    @JvmName("ConstantVariableMinus")
     public operator fun C.minus(other: V): P
+    @JvmName("ConstantVariableTimes")
     public operator fun C.times(other: V): P
 
+    @JvmName("VariableConstantPlus")
     public operator fun V.plus(other: C): P
+    @JvmName("VariableConstantMinus")
     public operator fun V.minus(other: C): P
+    @JvmName("VariableConstantTimes")
     public operator fun V.times(other: C): P
 
+    @JvmName("VariableUnaryPlus")
     public operator fun V.unaryPlus(): P
+    @JvmName("VariableUnaryMinus")
     public operator fun V.unaryMinus(): P
+    @JvmName("VariablePlus")
     public operator fun V.plus(other: V): P
+    @JvmName("VariableMinus")
     public operator fun V.minus(other: V): P
+    @JvmName("VariableTimes")
     public operator fun V.times(other: V): P
 
+    @JvmName("VariablePolynomialPlus")
     public operator fun V.plus(other: P): P
+    @JvmName("VariablePolynomialMinus")
     public operator fun V.minus(other: P): P
+    @JvmName("VariablePolynomialTimes")
     public operator fun V.times(other: P): P
 
+    @JvmName("PolynomialVariablePlus")
     public operator fun P.plus(other: V): P
+    @JvmName("PolynomialVariableMinus")
     public operator fun P.minus(other: V): P
+    @JvmName("PolynomialVariableTimes")
     public operator fun P.times(other: V): P
 
+    @JvmName("VariableRationalFunctionPlus")
     public operator fun V.plus(other: R): R
+    @JvmName("VariableRationalFunctionMinus")
     public operator fun V.minus(other: R): R
+    @JvmName("VariableRationalFunctionTimes")
     public operator fun V.times(other: R): R
 
+    @JvmName("RationalFunctionVariablePlus")
     public operator fun R.plus(other: V): R
+    @JvmName("RationalFunctionVariableMinus")
     public operator fun R.minus(other: V): R
+    @JvmName("RationalFunctionVariableTimes")
     public operator fun R.times(other: V): R
 
     /**
@@ -1403,6 +1433,7 @@ public interface MultivariateRationalFunctionalSpaceOverPolynomialSpace<
         AP: PolynomialSpace<C, P>,
         > : RationalFunctionalSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionalSpace<C, V, P, R>
 
+@Suppress("INAPPLICABLE_JVM_NAME")
 public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSpace<
         C,
         V,
@@ -1410,34 +1441,57 @@ public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSp
         R: RationalFunction<C, P>,
         AP: MultivariatePolynomialSpace<C, V, P>,
         > : MultivariateRationalFunctionalSpaceOverPolynomialSpace<C, V, P, R, AP> {
+    @JvmName("VariableIntPlus")
     public override operator fun V.plus(other: Int): P = polynomialRing { this@plus + other }
+    @JvmName("VariableIntMinus")
     public override operator fun V.minus(other: Int): P = polynomialRing { this@minus - other }
+    @JvmName("VariableIntMinusTimes")
     public override operator fun V.times(other: Int): P = polynomialRing { this@times * other }
 
+    @JvmName("IntVariablePlus")
     public override operator fun Int.plus(other: V): P = polynomialRing { this@plus + other }
+    @JvmName("IntVariableMinus")
     public override operator fun Int.minus(other: V): P = polynomialRing { this@minus - other }
+    @JvmName("IntVariableTimes")
     public override operator fun Int.times(other: V): P = polynomialRing { this@times * other }
 
+    @JvmName("ConstantVariablePlus")
     public override operator fun C.plus(other: V): P = polynomialRing { this@plus + other }
+    @JvmName("ConstantVariableMinus")
     public override operator fun C.minus(other: V): P = polynomialRing { this@minus - other }
+    @JvmName("ConstantVariableTimes")
     public override operator fun C.times(other: V): P = polynomialRing { this@times * other }
 
+    @JvmName("VariableConstantPlus")
     public override operator fun V.plus(other: C): P = polynomialRing { this@plus + other }
+    @JvmName("VariableConstantMinus")
     public override operator fun V.minus(other: C): P = polynomialRing { this@minus - other }
+    @JvmName("VariableConstantTimes")
     public override operator fun V.times(other: C): P = polynomialRing { this@times * other }
 
+    @JvmName("VariableUnaryPlus")
     public override operator fun V.unaryPlus(): P = polynomialRing { +this@unaryPlus }
+    @JvmName("VariableUnaryMinus")
     public override operator fun V.unaryMinus(): P = polynomialRing { -this@unaryMinus }
+    @JvmName("VariablePlus")
     public override operator fun V.plus(other: V): P = polynomialRing { this@plus + other }
+    @JvmName("VariableMinus")
     public override operator fun V.minus(other: V): P = polynomialRing { this@minus - other }
+    @JvmName("VariableTimes")
     public override operator fun V.times(other: V): P = polynomialRing { this@times * other }
 
+    @JvmName("VariablePolynomialPlus")
     public override operator fun V.plus(other: P): P = polynomialRing { this@plus + other }
+    @JvmName("VariablePolynomialMinus")
     public override operator fun V.minus(other: P): P = polynomialRing { this@minus - other }
+    @JvmName("VariablePolynomialTimes")
     public override operator fun V.times(other: P): P = polynomialRing { this@times * other }
 
+    @JvmName("PolynomialVariablePlus")
     public override operator fun P.plus(other: V): P = polynomialRing { this@plus + other }
+    @JvmName("PolynomialVariableMinus")
     public override operator fun P.minus(other: V): P = polynomialRing { this@minus - other }
+    @JvmName("PolynomialVariableTimes")
     public override operator fun P.times(other: V): P = polynomialRing { this@times * other }
 
     /**
@@ -1466,38 +1520,45 @@ public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSp
     public override val P.countOfVariables: Int get() = polynomialRing { countOfVariables }
 }
 
+@Suppress("INAPPLICABLE_JVM_NAME")
 public abstract class MultivariatePolynomialSpaceOfFractions<
         C,
         V,
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         > : MultivariateRationalFunctionalSpace<C, V, P, R>,  PolynomialSpaceOfFractions<C, P, R>() {
+    @JvmName("VariableRationalFunctionPlus")
     public override operator fun V.plus(other: R): R =
         constructRationalFunction(
             this * other.denominator + other.numerator,
             other.denominator
         )
+    @JvmName("VariableRationalFunctionMinus")
     public override operator fun V.minus(other: R): R =
         constructRationalFunction(
             this * other.denominator - other.numerator,
             other.denominator
         )
+    @JvmName("VariableRationalFunctionTimes")
     public override operator fun V.times(other: R): R =
         constructRationalFunction(
             this * other.numerator,
             other.denominator
         )
 
+    @JvmName("RationalFunctionVariablePlus")
     public override operator fun R.plus(other: V): R =
         constructRationalFunction(
             numerator + denominator * other,
             denominator
         )
+    @JvmName("RationalFunctionVariableMinus")
     public override operator fun R.minus(other: V): R =
         constructRationalFunction(
             numerator - denominator * other,
             denominator
         )
+    @JvmName("RationalFunctionVariableTimes")
     public override operator fun R.times(other: V): R =
         constructRationalFunction(
             numerator * other,
-- 
2.34.1


From 29369cd6d7ef4a0b127df5551953e0b7239ffdec Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 22 Mar 2022 22:17:20 +0300
Subject: [PATCH 473/713] [WIP] Another histogram refactor

---
 .../{UnivariateDomain.kt => Domain1D.kt}      | 15 +++-
 .../kmath/histogram/DoubleHistogramSpace.kt   | 22 +++---
 .../kscience/kmath/histogram/Histogram.kt     | 33 +++++----
 .../kscience/kmath/histogram/Histogram1D.kt   | 56 +++++++++++++++
 .../kmath/histogram/IndexedHistogramSpace.kt  | 27 +++----
 .../histogram/UniformDoubleHistogram1D.kt     |  9 +++
 .../kmath/histogram/UnivariateHistogram.kt    | 59 ---------------
 .../kmath/histogram/TreeHistogramSpace.kt     | 71 +++++++++----------
 8 files changed, 159 insertions(+), 133 deletions(-)
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/{UnivariateDomain.kt => Domain1D.kt} (57%)
 create mode 100644 kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
 create mode 100644 kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformDoubleHistogram1D.kt
 delete mode 100644 kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
similarity index 57%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt
rename to kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
index 9020ef8cb..f50f16c11 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnivariateDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
@@ -9,16 +9,21 @@ import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
 
 @UnstableKMathAPI
-public class UnivariateDomain(public val range: ClosedFloatingPointRange<Double>) : DoubleDomain {
+public abstract class Domain1D<T : Comparable<T>>(public val range: ClosedRange<T>) : Domain<T> {
     override val dimension: Int get() = 1
 
-    public operator fun contains(d: Double): Boolean = range.contains(d)
+    public operator fun contains(value: T): Boolean = range.contains(value)
 
-    override operator fun contains(point: Point<Double>): Boolean {
+    override operator fun contains(point: Point<T>): Boolean {
         require(point.size == 0)
         return contains(point[0])
     }
+}
 
+@UnstableKMathAPI
+public class DoubleDomain1D(
+    @Suppress("CanBeParameter") public val doubleRange: ClosedFloatingPointRange<Double>,
+) : Domain1D<Double>(doubleRange), DoubleDomain {
     override fun getLowerBound(num: Int): Double {
         require(num == 0)
         return range.start
@@ -31,3 +36,7 @@ public class UnivariateDomain(public val range: ClosedFloatingPointRange<Double>
 
     override fun volume(): Double = range.endInclusive - range.start
 }
+
+@UnstableKMathAPI
+public val DoubleDomain1D.center: Double
+    get() = (range.endInclusive + range.start) / 2
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
index 27f04d60b..c0df8c2cc 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.histogram
 
 import space.kscience.kmath.domains.HyperSquareDomain
+import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
@@ -31,7 +32,7 @@ public class DoubleHistogramSpace(
     public val dimension: Int get() = lower.size
 
     override val shape: IntArray = IntArray(binNums.size) { binNums[it] + 2 }
-    override val histogramValueSpace: DoubleFieldND = DoubleField.ndAlgebra(*shape)
+    override val histogramValueAlgebra: DoubleFieldND = DoubleField.ndAlgebra(*shape)
 
     private val binSize = DoubleBuffer(dimension) { (upper[it] - lower[it]) / binNums[it] }
 
@@ -70,21 +71,20 @@ public class DoubleHistogramSpace(
     }
 
     @OptIn(UnstableKMathAPI::class)
-    public val Bin<Double>.domain: HyperSquareDomain
-        get() = (this as? DomainBin<Double>)?.domain as? HyperSquareDomain
-            ?: error("Im a teapot. This is not my bin")
-
-    @OptIn(UnstableKMathAPI::class)
-    override fun produceBin(index: IntArray, value: Double): DomainBin<Double> {
+    override fun produceBin(index: IntArray, value: Double): DomainBin<Double, Double> {
         val domain = getDomain(index)
         return DomainBin(domain, value)
     }
 
-    override fun produce(builder: HistogramBuilder<Double>.() -> Unit): IndexedHistogram<Double, Double> {
+    override fun produce(builder: HistogramBuilder<Double, Double>.() -> Unit): IndexedHistogram<Double, Double> {
         val ndCounter = StructureND.auto(shape) { Counter.double() }
-        val hBuilder = HistogramBuilder<Double> { point, value ->
-            val index = getIndex(point)
-            ndCounter[index].add(value.toDouble())
+        val hBuilder = object : HistogramBuilder<Double, Double> {
+            override val defaultValue: Double get() = 1.0
+
+            override fun putValue(point: Point<out Double>, value: Double) {
+                val index = getIndex(point)
+                ndCounter[index].add(value)
+            }
         }
         hBuilder.apply(builder)
         val values: BufferND<Double> = ndCounter.mapToBuffer { it.value }
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
index 4e803fc63..64c031c7a 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
@@ -13,14 +13,14 @@ import space.kscience.kmath.structures.asBuffer
 /**
  * The binned data element. Could be a histogram bin with a number of counts or an artificial construct.
  */
-public interface Bin<in T : Any> : Domain<T> {
+public interface Bin<in T : Any, out V> : Domain<T> {
     /**
      * The value of this bin.
      */
-    public val value: Number
+    public val value: V
 }
 
-public interface Histogram<in T : Any, out B : Bin<T>> {
+public interface Histogram<in T : Any, out V, out B : Bin<T, V>> {
     /**
      * Find existing bin, corresponding to given coordinates
      */
@@ -32,29 +32,38 @@ public interface Histogram<in T : Any, out B : Bin<T>> {
     public val dimension: Int
 
     public val bins: Iterable<B>
+
+    public companion object {
+        //A discoverability root
+    }
 }
 
-public fun interface HistogramBuilder<in T : Any> {
+public interface HistogramBuilder<in T : Any, V : Any> {
 
     /**
-     * Increment appropriate bin
+     * The default value increment for a bin
      */
-    public fun putValue(point: Point<out T>, value: Number)
+    public val defaultValue: V
+
+    /**
+     * Increment appropriate bin with given value
+     */
+    public fun putValue(point: Point<out T>, value: V = defaultValue)
 
 }
 
-public fun <T : Any, B : Bin<T>> HistogramBuilder<T>.put(point: Point<out T>): Unit = putValue(point, 1.0)
+public fun <T : Any> HistogramBuilder<T, *>.put(point: Point<out T>): Unit = putValue(point)
 
-public fun <T : Any> HistogramBuilder<T>.put(vararg point: T): Unit = put(point.asBuffer())
+public fun <T : Any> HistogramBuilder<T, *>.put(vararg point: T): Unit = put(point.asBuffer())
 
-public fun HistogramBuilder<Double>.put(vararg point: Number): Unit =
+public fun HistogramBuilder<Double, *>.put(vararg point: Number): Unit =
     put(DoubleBuffer(point.map { it.toDouble() }.toDoubleArray()))
 
-public fun HistogramBuilder<Double>.put(vararg point: Double): Unit = put(DoubleBuffer(point))
-public fun <T : Any> HistogramBuilder<T>.fill(sequence: Iterable<Point<T>>): Unit = sequence.forEach { put(it) }
+public fun HistogramBuilder<Double, *>.put(vararg point: Double): Unit = put(DoubleBuffer(point))
+public fun <T : Any> HistogramBuilder<T, *>.fill(sequence: Iterable<Point<T>>): Unit = sequence.forEach { put(it) }
 
 /**
  * Pass a sequence builder into histogram
  */
-public fun <T : Any> HistogramBuilder<T>.fill(block: suspend SequenceScope<Point<T>>.() -> Unit): Unit =
+public fun <T : Any> HistogramBuilder<T, *>.fill(block: suspend SequenceScope<Point<T>>.() -> Unit): Unit =
     fill(sequence(block).asIterable())
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
new file mode 100644
index 000000000..e9c62b141
--- /dev/null
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.histogram
+
+import space.kscience.kmath.domains.Domain1D
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.asSequence
+import space.kscience.kmath.structures.Buffer
+
+
+/**
+ * A univariate bin based on a range
+ *
+ * @property value The value of histogram including weighting
+ * @property standardDeviation Standard deviation of the bin value. Zero or negative if not applicable
+ */
+@UnstableKMathAPI
+public class Bin1D<T : Comparable<T>, out V>(
+    public val domain: Domain1D<T>,
+    override val value: V,
+) : Bin<T, V>, ClosedRange<T> by domain.range {
+
+    override val dimension: Int get() = 1
+
+    override fun contains(point: Buffer<T>): Boolean = point.size == 1 && contains(point[0])
+}
+
+@OptIn(UnstableKMathAPI::class)
+public interface Histogram1D<T : Comparable<T>, V> : Histogram<T, V, Bin1D<T, V>> {
+    override val dimension: Int get() = 1
+    public operator fun get(value: T): Bin1D<T, V>?
+    override operator fun get(point: Buffer<T>): Bin1D<T, V>? = get(point[0])
+}
+
+@UnstableKMathAPI
+public interface Histogram1DBuilder<in T : Any, V : Any> : HistogramBuilder<T, V> {
+    /**
+     * Thread safe put operation
+     */
+    public fun putValue(at: T, value: V = defaultValue)
+}
+
+@UnstableKMathAPI
+public fun Histogram1DBuilder<Double, *>.fill(items: Iterable<Double>): Unit =
+    items.forEach(this::putValue)
+
+@UnstableKMathAPI
+public fun Histogram1DBuilder<Double, *>.fill(array: DoubleArray): Unit =
+    array.forEach(this::putValue)
+
+@UnstableKMathAPI
+public fun Histogram1DBuilder<Double, *>.fill(buffer: Buffer<Double>): Unit =
+    buffer.asSequence().forEach(this::putValue)
\ No newline at end of file
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
index bfacebb43..a2623b1a1 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
@@ -18,24 +18,28 @@ import space.kscience.kmath.operations.invoke
 /**
  * A simple histogram bin based on domain
  */
-public data class DomainBin<in T : Comparable<T>>(
+public data class DomainBin<in T : Comparable<T>, out V>(
     public val domain: Domain<T>,
-    override val value: Number,
-) : Bin<T>, Domain<T> by domain
+    override val value: V,
+) : Bin<T, V>, Domain<T> by domain
 
+/**
+ * @param T the type of the argument space
+ * @param V the type of bin value
+ */
 public class IndexedHistogram<T : Comparable<T>, V : Any>(
     public val histogramSpace: IndexedHistogramSpace<T, V>,
     public val values: StructureND<V>,
-) : Histogram<T, Bin<T>> {
+) : Histogram<T, V, DomainBin<T, V>> {
 
-    override fun get(point: Point<T>): Bin<T>? {
+    override fun get(point: Point<T>): DomainBin<T, V>? {
         val index = histogramSpace.getIndex(point) ?: return null
         return histogramSpace.produceBin(index, values[index])
     }
 
     override val dimension: Int get() = histogramSpace.shape.size
 
-    override val bins: Iterable<Bin<T>>
+    override val bins: Iterable<DomainBin<T, V>>
         get() = DefaultStrides(histogramSpace.shape).asSequence().map {
             histogramSpace.produceBin(it, values[it])
         }.asIterable()
@@ -46,9 +50,8 @@ public class IndexedHistogram<T : Comparable<T>, V : Any>(
  */
 public interface IndexedHistogramSpace<T : Comparable<T>, V : Any>
     : Group<IndexedHistogram<T, V>>, ScaleOperations<IndexedHistogram<T, V>> {
-    //public val valueSpace: Space<V>
     public val shape: Shape
-    public val histogramValueSpace: FieldND<V, *> //= NDAlgebra.space(valueSpace, Buffer.Companion::boxing, *shape),
+    public val histogramValueAlgebra: FieldND<V, *> //= NDAlgebra.space(valueSpace, Buffer.Companion::boxing, *shape),
 
     /**
      * Resolve index of the bin including given [point]
@@ -60,19 +63,19 @@ public interface IndexedHistogramSpace<T : Comparable<T>, V : Any>
      */
     public fun getDomain(index: IntArray): Domain<T>?
 
-    public fun produceBin(index: IntArray, value: V): Bin<T>
+    public fun produceBin(index: IntArray, value: V): DomainBin<T, V>
 
-    public fun produce(builder: HistogramBuilder<T>.() -> Unit): IndexedHistogram<T, V>
+    public fun produce(builder: HistogramBuilder<T, V>.() -> Unit): IndexedHistogram<T, V>
 
     override fun add(left: IndexedHistogram<T, V>, right: IndexedHistogram<T, V>): IndexedHistogram<T, V> {
         require(left.histogramSpace == this) { "Can't operate on a histogram produced by external space" }
         require(right.histogramSpace == this) { "Can't operate on a histogram produced by external space" }
-        return IndexedHistogram(this, histogramValueSpace { left.values + right.values })
+        return IndexedHistogram(this, histogramValueAlgebra { left.values + right.values })
     }
 
     override fun scale(a: IndexedHistogram<T, V>, value: Double): IndexedHistogram<T, V> {
         require(a.histogramSpace == this) { "Can't operate on a histogram produced by external space" }
-        return IndexedHistogram(this, histogramValueSpace { a.values * value })
+        return IndexedHistogram(this, histogramValueAlgebra { a.values * value })
     }
 
     override val zero: IndexedHistogram<T, V> get() = produce { }
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformDoubleHistogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformDoubleHistogram1D.kt
new file mode 100644
index 000000000..856cd8592
--- /dev/null
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformDoubleHistogram1D.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.histogram
+
+//class UniformDoubleHistogram1D: DoubleHistogram1D {
+//}
\ No newline at end of file
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
deleted file mode 100644
index 69ea83ae3..000000000
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UnivariateHistogram.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.histogram
-
-import space.kscience.kmath.domains.UnivariateDomain
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.asSequence
-import space.kscience.kmath.structures.Buffer
-
-
-@UnstableKMathAPI
-public val UnivariateDomain.center: Double
-    get() = (range.endInclusive + range.start) / 2
-
-/**
- * A univariate bin based on a range
- *
- * @property value The value of histogram including weighting
- * @property standardDeviation Standard deviation of the bin value. Zero or negative if not applicable
- */
-@UnstableKMathAPI
-public class UnivariateBin(
-    public val domain: UnivariateDomain,
-    override val value: Double,
-    public val standardDeviation: Double,
-) : Bin<Double>, ClosedFloatingPointRange<Double> by domain.range {
-
-    override val dimension: Int get() = 1
-
-    override fun contains(point: Buffer<Double>): Boolean = point.size == 1 && contains(point[0])
-}
-
-@OptIn(UnstableKMathAPI::class)
-public interface UnivariateHistogram : Histogram<Double, UnivariateBin> {
-    public operator fun get(value: Double): UnivariateBin?
-    override operator fun get(point: Buffer<Double>): UnivariateBin? = get(point[0])
-}
-
-@UnstableKMathAPI
-public interface UnivariateHistogramBuilder : HistogramBuilder<Double> {
-    /**
-     * Thread safe put operation
-     */
-    public fun putValue(at: Double, value: Double = 1.0)
-
-    override fun putValue(point: Buffer<Double>, value: Number)
-}
-
-@UnstableKMathAPI
-public fun UnivariateHistogramBuilder.fill(items: Iterable<Double>): Unit = items.forEach(this::putValue)
-
-@UnstableKMathAPI
-public fun UnivariateHistogramBuilder.fill(array: DoubleArray): Unit = array.forEach(this::putValue)
-
-@UnstableKMathAPI
-public fun UnivariateHistogramBuilder.fill(buffer: Buffer<Double>): Unit = buffer.asSequence().forEach(this::putValue)
\ No newline at end of file
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
index 1ab49003c..9d07d5014 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.histogram
 
-import space.kscience.kmath.domains.UnivariateDomain
+import space.kscience.kmath.domains.DoubleDomain1D
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Group
 import space.kscience.kmath.operations.ScaleOperations
@@ -15,7 +15,7 @@ import kotlin.math.abs
 import kotlin.math.floor
 import kotlin.math.sqrt
 
-private fun <B : ClosedFloatingPointRange<Double>> TreeMap<Double, B>.getBin(value: Double): B? {
+private fun <B : ClosedRange<Double>> TreeMap<Double, B>.getBin(value: Double): B? {
     // check ceiling entry and return it if it is what needed
     val ceil = ceilingEntry(value)?.value
     if (ceil != null && value in ceil) return ceil
@@ -28,19 +28,18 @@ private fun <B : ClosedFloatingPointRange<Double>> TreeMap<Double, B>.getBin(val
 
 @UnstableKMathAPI
 public class TreeHistogram(
-    private val binMap: TreeMap<Double, out UnivariateBin>,
-) : UnivariateHistogram {
-    override fun get(value: Double): UnivariateBin? = binMap.getBin(value)
-    override val dimension: Int get() = 1
-    override val bins: Collection<UnivariateBin> get() = binMap.values
+    private val binMap: TreeMap<Double, out Bin1D<Double, Double>>,
+) : Histogram1D<Double, Double> {
+    override fun get(value: Double): Bin1D<Double, Double>? = binMap.getBin(value)
+    override val bins: Collection<Bin1D<Double, Double>> get() = binMap.values
 }
 
 @OptIn(UnstableKMathAPI::class)
 @PublishedApi
-internal class TreeHistogramBuilder(val binFactory: (Double) -> UnivariateDomain) : UnivariateHistogramBuilder {
+internal class TreeHistogramBuilder(val binFactory: (Double) -> DoubleDomain1D) : Histogram1DBuilder<Double, Double> {
 
-    internal class BinCounter(val domain: UnivariateDomain, val counter: Counter<Double> = Counter.double()) :
-        ClosedFloatingPointRange<Double> by domain.range
+    internal class BinCounter(val domain: DoubleDomain1D, val counter: Counter<Double> = Counter.double()) :
+        ClosedRange<Double> by domain.range
 
     private val bins: TreeMap<Double, BinCounter> = TreeMap()
 
@@ -64,15 +63,15 @@ internal class TreeHistogramBuilder(val binFactory: (Double) -> UnivariateDomain
         }
     }
 
-    override fun putValue(point: Buffer<Double>, value: Number) {
+    override fun putValue(point: Buffer<Double>, value: Double) {
         require(point.size == 1) { "Only points with single value could be used in univariate histogram" }
         putValue(point[0], value.toDouble())
     }
 
     fun build(): TreeHistogram {
-        val map = bins.mapValuesTo(TreeMap<Double, UnivariateBin>()) { (_, binCounter) ->
+        val map = bins.mapValuesTo(TreeMap<Double, Bin1D<Double,Double>>()) { (_, binCounter) ->
             val count = binCounter.counter.value
-            UnivariateBin(binCounter.domain, count, sqrt(count))
+            Bin1D(binCounter.domain, count, sqrt(count))
         }
         return TreeHistogram(map)
     }
@@ -83,23 +82,23 @@ internal class TreeHistogramBuilder(val binFactory: (Double) -> UnivariateDomain
  */
 @UnstableKMathAPI
 public class TreeHistogramSpace(
-    @PublishedApi internal val binFactory: (Double) -> UnivariateDomain,
-) : Group<UnivariateHistogram>, ScaleOperations<UnivariateHistogram> {
+    @PublishedApi internal val binFactory: (Double) -> DoubleDomain1D,
+) : Group<Histogram1D<Double,Double>>, ScaleOperations<Histogram1D<Double,Double>> {
 
-    public inline fun fill(block: UnivariateHistogramBuilder.() -> Unit): UnivariateHistogram =
+    public inline fun fill(block: Histogram1DBuilder<Double,Double>.() -> Unit): Histogram1D<Double,Double> =
         TreeHistogramBuilder(binFactory).apply(block).build()
 
     override fun add(
-        left: UnivariateHistogram,
-        right: UnivariateHistogram,
-    ): UnivariateHistogram {
+        left: Histogram1D<Double,Double>,
+        right: Histogram1D<Double,Double>,
+    ): Histogram1D<Double,Double> {
 //        require(a.context == this) { "Histogram $a does not belong to this context" }
 //        require(b.context == this) { "Histogram $b does not belong to this context" }
-        val bins = TreeMap<Double, UnivariateBin>().apply {
+        val bins = TreeMap<Double, Bin1D<Double,Double>>().apply {
             (left.bins.map { it.domain } union right.bins.map { it.domain }).forEach { def ->
                 put(
                     def.center,
-                    UnivariateBin(
+                    Bin1D(
                         def,
                         value = (left[def.center]?.value ?: 0.0) + (right[def.center]?.value ?: 0.0),
                         standardDeviation = (left[def.center]?.standardDeviation
@@ -111,12 +110,12 @@ public class TreeHistogramSpace(
         return TreeHistogram(bins)
     }
 
-    override fun scale(a: UnivariateHistogram, value: Double): UnivariateHistogram {
-        val bins = TreeMap<Double, UnivariateBin>().apply {
+    override fun scale(a: Histogram1D<Double,Double>, value: Double): Histogram1D<Double,Double> {
+        val bins = TreeMap<Double, Bin1D<Double,Double>>().apply {
             a.bins.forEach { bin ->
                 put(
                     bin.domain.center,
-                    UnivariateBin(
+                    Bin1D(
                         bin.domain,
                         value = bin.value * value,
                         standardDeviation = abs(bin.standardDeviation * value)
@@ -128,38 +127,38 @@ public class TreeHistogramSpace(
         return TreeHistogram(bins)
     }
 
-    override fun UnivariateHistogram.unaryMinus(): UnivariateHistogram = this * (-1)
+    override fun Histogram1D<Double,Double>.unaryMinus(): Histogram1D<Double,Double> = this * (-1)
 
-    override val zero: UnivariateHistogram by lazy { fill { } }
+    override val zero: Histogram1D<Double,Double> by lazy { fill { } }
 
     public companion object {
         /**
-         * Build and fill a [UnivariateHistogram]. Returns a read-only histogram.
+         * Build and fill a [DoubleHistogram1D]. Returns a read-only histogram.
          */
         public inline fun uniform(
             binSize: Double,
             start: Double = 0.0,
-            builder: UnivariateHistogramBuilder.() -> Unit,
-        ): UnivariateHistogram = uniform(binSize, start).fill(builder)
+            builder: Histogram1DBuilder<Double,Double>.() -> Unit,
+        ): Histogram1D<Double,Double> = uniform(binSize, start).fill(builder)
 
         /**
          * Build and fill a histogram with custom borders. Returns a read-only histogram.
          */
         public inline fun custom(
             borders: DoubleArray,
-            builder: UnivariateHistogramBuilder.() -> Unit,
-        ): UnivariateHistogram = custom(borders).fill(builder)
+            builder: Histogram1DBuilder<Double,Double>.() -> Unit,
+        ): Histogram1D<Double,Double> = custom(borders).fill(builder)
 
 
         /**
-         * Build and fill a [UnivariateHistogram]. Returns a read-only histogram.
+         * Build and fill a [DoubleHistogram1D]. Returns a read-only histogram.
          */
         public fun uniform(
             binSize: Double,
             start: Double = 0.0,
         ): TreeHistogramSpace = TreeHistogramSpace { value ->
             val center = start + binSize * floor((value - start) / binSize + 0.5)
-            UnivariateDomain((center - binSize / 2)..(center + binSize / 2))
+            DoubleDomain1D((center - binSize / 2)..(center + binSize / 2))
         }
 
         /**
@@ -170,11 +169,11 @@ public class TreeHistogramSpace(
 
             return TreeHistogramSpace { value ->
                 when {
-                    value < sorted.first() -> UnivariateDomain(
+                    value < sorted.first() -> DoubleDomain1D(
                         Double.NEGATIVE_INFINITY..sorted.first()
                     )
 
-                    value > sorted.last() -> UnivariateDomain(
+                    value > sorted.last() -> DoubleDomain1D(
                         sorted.last()..Double.POSITIVE_INFINITY
                     )
 
@@ -182,7 +181,7 @@ public class TreeHistogramSpace(
                         val index = sorted.indices.first { value > sorted[it] }
                         val left = sorted[index]
                         val right = sorted[index + 1]
-                        UnivariateDomain(left..right)
+                        DoubleDomain1D(left..right)
                     }
                 }
             }
-- 
2.34.1


From 3a3a5bd77f02b8a1fc43c399c53a5086a7891d5c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 23 Mar 2022 14:07:24 +0300
Subject: [PATCH 474/713] Histogram API refactor

---
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../space/kscience/kmath/domains/Domain1D.kt  |  2 +-
 .../kscience/kmath/histogram/Histogram.kt     |  2 +-
 .../kscience/kmath/histogram/Histogram1D.kt   |  4 +-
 .../kmath/histogram/IndexedHistogramSpace.kt  |  2 +-
 .../histogram/MultivariateHistogramTest.kt    |  6 +-
 .../kmath/histogram/TreeHistogramSpace.kt     | 70 +++++++++++--------
 7 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e6e5897b..00e33edef 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
index f50f16c11..ccd1c3edb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
@@ -38,5 +38,5 @@ public class DoubleDomain1D(
 }
 
 @UnstableKMathAPI
-public val DoubleDomain1D.center: Double
+public val Domain1D<Double>.center: Double
     get() = (range.endInclusive + range.start) / 2
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
index 64c031c7a..f9550df17 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
@@ -17,7 +17,7 @@ public interface Bin<in T : Any, out V> : Domain<T> {
     /**
      * The value of this bin.
      */
-    public val value: V
+    public val binValue: V
 }
 
 public interface Histogram<in T : Any, out V, out B : Bin<T, V>> {
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
index e9c62b141..4f193f943 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
@@ -14,13 +14,13 @@ import space.kscience.kmath.structures.Buffer
 /**
  * A univariate bin based on a range
  *
- * @property value The value of histogram including weighting
+ * @property binValue The value of histogram including weighting
  * @property standardDeviation Standard deviation of the bin value. Zero or negative if not applicable
  */
 @UnstableKMathAPI
 public class Bin1D<T : Comparable<T>, out V>(
     public val domain: Domain1D<T>,
-    override val value: V,
+    override val binValue: V,
 ) : Bin<T, V>, ClosedRange<T> by domain.range {
 
     override val dimension: Int get() = 1
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
index a2623b1a1..3e4b07984 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
@@ -20,7 +20,7 @@ import space.kscience.kmath.operations.invoke
  */
 public data class DomainBin<in T : Comparable<T>, out V>(
     public val domain: Domain<T>,
-    override val value: V,
+    override val binValue: V,
 ) : Bin<T, V>, Domain<T> by domain
 
 /**
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
index 923cc98de..31a29676c 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
@@ -21,7 +21,7 @@ internal class MultivariateHistogramTest {
         val histogram = hSpace.produce {
             put(0.55, 0.55)
         }
-        val bin = histogram.bins.find { it.value.toInt() > 0 } ?: fail()
+        val bin = histogram.bins.find { it.binValue.toInt() > 0 } ?: fail()
         assertTrue { bin.contains(DoubleVector(0.55, 0.55)) }
         assertTrue { bin.contains(DoubleVector(0.6, 0.5)) }
         assertFalse { bin.contains(DoubleVector(-0.55, 0.55)) }
@@ -44,7 +44,7 @@ internal class MultivariateHistogramTest {
                 put(nextDouble(), nextDouble(), nextDouble())
             }
         }
-        assertEquals(n, histogram.bins.sumOf { it.value.toInt() })
+        assertEquals(n, histogram.bins.sumOf { it.binValue.toInt() })
     }
 
     @Test
@@ -77,7 +77,7 @@ internal class MultivariateHistogramTest {
             assertTrue {
                 res.bins.count() >= histogram1.bins.count()
             }
-            assertEquals(0.0, res.bins.sumOf { it.value.toDouble() })
+            assertEquals(0.0, res.bins.sumOf { it.binValue.toDouble() })
         }
     }
 }
\ No newline at end of file
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
index 9d07d5014..38e533db0 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.histogram
 
 import space.kscience.kmath.domains.DoubleDomain1D
+import space.kscience.kmath.domains.center
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Group
 import space.kscience.kmath.operations.ScaleOperations
@@ -26,18 +27,24 @@ private fun <B : ClosedRange<Double>> TreeMap<Double, B>.getBin(value: Double):
     return null
 }
 
+public data class ValueAndError(val value: Double, val error: Double)
+
+public typealias WeightedBin1D = Bin1D<Double, ValueAndError>
+
 @UnstableKMathAPI
 public class TreeHistogram(
-    private val binMap: TreeMap<Double, out Bin1D<Double, Double>>,
-) : Histogram1D<Double, Double> {
-    override fun get(value: Double): Bin1D<Double, Double>? = binMap.getBin(value)
-    override val bins: Collection<Bin1D<Double, Double>> get() = binMap.values
+    private val binMap: TreeMap<Double, WeightedBin1D>,
+) : Histogram1D<Double, ValueAndError> {
+    override fun get(value: Double): WeightedBin1D? = binMap.getBin(value)
+    override val bins: Collection<WeightedBin1D> get() = binMap.values
 }
 
 @OptIn(UnstableKMathAPI::class)
 @PublishedApi
 internal class TreeHistogramBuilder(val binFactory: (Double) -> DoubleDomain1D) : Histogram1DBuilder<Double, Double> {
 
+    override val defaultValue: Double get() = 1.0
+
     internal class BinCounter(val domain: DoubleDomain1D, val counter: Counter<Double> = Counter.double()) :
         ClosedRange<Double> by domain.range
 
@@ -46,7 +53,7 @@ internal class TreeHistogramBuilder(val binFactory: (Double) -> DoubleDomain1D)
     fun get(value: Double): BinCounter? = bins.getBin(value)
 
     fun createBin(value: Double): BinCounter {
-        val binDefinition = binFactory(value)
+        val binDefinition: DoubleDomain1D = binFactory(value)
         val newBin = BinCounter(binDefinition)
         synchronized(this) {
             bins[binDefinition.center] = newBin
@@ -69,9 +76,9 @@ internal class TreeHistogramBuilder(val binFactory: (Double) -> DoubleDomain1D)
     }
 
     fun build(): TreeHistogram {
-        val map = bins.mapValuesTo(TreeMap<Double, Bin1D<Double,Double>>()) { (_, binCounter) ->
-            val count = binCounter.counter.value
-            Bin1D(binCounter.domain, count, sqrt(count))
+        val map = bins.mapValuesTo(TreeMap<Double, WeightedBin1D>()) { (_, binCounter) ->
+            val count: Double = binCounter.counter.value
+            WeightedBin1D(binCounter.domain, ValueAndError(count, sqrt(count)))
         }
         return TreeHistogram(map)
     }
@@ -83,26 +90,27 @@ internal class TreeHistogramBuilder(val binFactory: (Double) -> DoubleDomain1D)
 @UnstableKMathAPI
 public class TreeHistogramSpace(
     @PublishedApi internal val binFactory: (Double) -> DoubleDomain1D,
-) : Group<Histogram1D<Double,Double>>, ScaleOperations<Histogram1D<Double,Double>> {
+) : Group<TreeHistogram>, ScaleOperations<TreeHistogram> {
 
-    public inline fun fill(block: Histogram1DBuilder<Double,Double>.() -> Unit): Histogram1D<Double,Double> =
+    public inline fun fill(block: Histogram1DBuilder<Double, Double>.() -> Unit): TreeHistogram =
         TreeHistogramBuilder(binFactory).apply(block).build()
 
     override fun add(
-        left: Histogram1D<Double,Double>,
-        right: Histogram1D<Double,Double>,
-    ): Histogram1D<Double,Double> {
+        left: TreeHistogram,
+        right: TreeHistogram,
+    ): TreeHistogram {
 //        require(a.context == this) { "Histogram $a does not belong to this context" }
 //        require(b.context == this) { "Histogram $b does not belong to this context" }
-        val bins = TreeMap<Double, Bin1D<Double,Double>>().apply {
+        val bins = TreeMap<Double, WeightedBin1D>().apply {
             (left.bins.map { it.domain } union right.bins.map { it.domain }).forEach { def ->
                 put(
                     def.center,
-                    Bin1D(
+                    WeightedBin1D(
                         def,
-                        value = (left[def.center]?.value ?: 0.0) + (right[def.center]?.value ?: 0.0),
-                        standardDeviation = (left[def.center]?.standardDeviation
-                            ?: 0.0) + (right[def.center]?.standardDeviation ?: 0.0)
+                        ValueAndError(
+                            (left[def.center]?.binValue?.value ?: 0.0) + (right[def.center]?.binValue?.value ?: 0.0),
+                            (left[def.center]?.binValue?.error ?: 0.0) + (right[def.center]?.binValue?.error ?: 0.0)
+                        )
                     )
                 )
             }
@@ -110,15 +118,17 @@ public class TreeHistogramSpace(
         return TreeHistogram(bins)
     }
 
-    override fun scale(a: Histogram1D<Double,Double>, value: Double): Histogram1D<Double,Double> {
-        val bins = TreeMap<Double, Bin1D<Double,Double>>().apply {
+    override fun scale(a: TreeHistogram, value: Double): TreeHistogram {
+        val bins = TreeMap<Double, WeightedBin1D>().apply {
             a.bins.forEach { bin ->
                 put(
                     bin.domain.center,
-                    Bin1D(
+                    WeightedBin1D(
                         bin.domain,
-                        value = bin.value * value,
-                        standardDeviation = abs(bin.standardDeviation * value)
+                        ValueAndError(
+                            bin.binValue.value * value,
+                            abs(bin.binValue.error * value)
+                        )
                     )
                 )
             }
@@ -127,27 +137,27 @@ public class TreeHistogramSpace(
         return TreeHistogram(bins)
     }
 
-    override fun Histogram1D<Double,Double>.unaryMinus(): Histogram1D<Double,Double> = this * (-1)
+    override fun TreeHistogram.unaryMinus(): TreeHistogram = this * (-1)
 
-    override val zero: Histogram1D<Double,Double> by lazy { fill { } }
+    override val zero: TreeHistogram by lazy { fill { } }
 
     public companion object {
         /**
-         * Build and fill a [DoubleHistogram1D]. Returns a read-only histogram.
+         * Build and fill a [TreeHistogram]. Returns a read-only histogram.
          */
         public inline fun uniform(
             binSize: Double,
             start: Double = 0.0,
-            builder: Histogram1DBuilder<Double,Double>.() -> Unit,
-        ): Histogram1D<Double,Double> = uniform(binSize, start).fill(builder)
+            builder: Histogram1DBuilder<Double, Double>.() -> Unit,
+        ): TreeHistogram = uniform(binSize, start).fill(builder)
 
         /**
          * Build and fill a histogram with custom borders. Returns a read-only histogram.
          */
         public inline fun custom(
             borders: DoubleArray,
-            builder: Histogram1DBuilder<Double,Double>.() -> Unit,
-        ): Histogram1D<Double,Double> = custom(borders).fill(builder)
+            builder: Histogram1DBuilder<Double, Double>.() -> Unit,
+        ): TreeHistogram = custom(borders).fill(builder)
 
 
         /**
-- 
2.34.1


From ce82d2d07633240f8df932fb9b8ac185e0e8c9d6 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 23 Mar 2022 15:51:08 +0300
Subject: [PATCH 475/713] Histogram API refactor

---
 .../{UniformDoubleHistogram1D.kt => UniformHistogram1D.kt}   | 5 ++++-
 .../space/kscience/kmath/histogram/TreeHistogramSpace.kt     | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)
 rename kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/{UniformDoubleHistogram1D.kt => UniformHistogram1D.kt} (58%)

diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformDoubleHistogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
similarity index 58%
rename from kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformDoubleHistogram1D.kt
rename to kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
index 856cd8592..ed8b2e29d 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformDoubleHistogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
@@ -5,5 +5,8 @@
 
 package space.kscience.kmath.histogram
 
-//class UniformDoubleHistogram1D: DoubleHistogram1D {
+//class UniformHistogram1D(
+//    public val borders: Buffer<Double>,
+//    public val values: Buffer<Long>,
+//) : Histogram1D<Double, Long> {
 //}
\ No newline at end of file
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
index 38e533db0..e85bb0a3c 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:OptIn(UnstableKMathAPI::class)
+
 package space.kscience.kmath.histogram
 
 import space.kscience.kmath.domains.DoubleDomain1D
@@ -31,7 +33,6 @@ public data class ValueAndError(val value: Double, val error: Double)
 
 public typealias WeightedBin1D = Bin1D<Double, ValueAndError>
 
-@UnstableKMathAPI
 public class TreeHistogram(
     private val binMap: TreeMap<Double, WeightedBin1D>,
 ) : Histogram1D<Double, ValueAndError> {
@@ -39,7 +40,6 @@ public class TreeHistogram(
     override val bins: Collection<WeightedBin1D> get() = binMap.values
 }
 
-@OptIn(UnstableKMathAPI::class)
 @PublishedApi
 internal class TreeHistogramBuilder(val binFactory: (Double) -> DoubleDomain1D) : Histogram1DBuilder<Double, Double> {
 
@@ -87,7 +87,6 @@ internal class TreeHistogramBuilder(val binFactory: (Double) -> DoubleDomain1D)
 /**
  * A space for univariate histograms with variable bin borders based on a tree map
  */
-@UnstableKMathAPI
 public class TreeHistogramSpace(
     @PublishedApi internal val binFactory: (Double) -> DoubleDomain1D,
 ) : Group<TreeHistogram>, ScaleOperations<TreeHistogram> {
-- 
2.34.1


From 060f0ee35dfdfe510b70c55550a379f47d6106d7 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 25 Mar 2022 00:57:32 +0300
Subject: [PATCH 476/713] Removed comparability feature.

---
 .../kmath/functions/LabeledPolynomial.kt      | 286 +++++------------
 .../functions/LabeledRationalFunction.kt      |  58 +---
 .../kmath/functions/ListPolynomial.kt         | 203 +++---------
 .../kmath/functions/ListRationalFunction.kt   |  16 +-
 .../kmath/functions/NumberedPolynomial.kt     | 246 ++++-----------
 .../functions/NumberedRationalFunction.kt     |  60 +---
 .../kscience/kmath/functions/Polynomial.kt    |  86 -----
 .../kmath/functions/RationalFunction.kt       | 297 ++----------------
 .../kmath/functions/listPolynomialUtil.kt     |   9 +-
 .../functions/listRationalFunctionUtil.kt     |   6 +-
 .../kmath/functions/ListPolynomialTest.kt     | 156 +--------
 .../kmath/functions/ListPolynomialUtilTest.kt |   2 +-
 12 files changed, 242 insertions(+), 1183 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 3d1b91f7b..908e89534 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -58,6 +58,8 @@ internal fun Map<Symbol, UInt>.cleanUp() = filterValues { it > 0U }
 
 @Suppress("FunctionName", "NOTHING_TO_INLINE")
 internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(coefs, toCheckInput)
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(coefs, toCheckInput)
 @Suppress("FunctionName")
 internal fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
     if (!toCheckInput) return LabeledPolynomial<C>(coefs)
@@ -70,13 +72,13 @@ internal fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C
         fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
     }
 
-    return LabeledPolynomial<C>(
-        fixedCoefs.filterValues { it != zero }
-    )
+    return LabeledPolynomial<C>(fixedCoefs)
 }
 
 @Suppress("FunctionName", "NOTHING_TO_INLINE")
 internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs, toCheckInput)
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs, toCheckInput)
 @Suppress("FunctionName")
 internal fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
     if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
@@ -89,13 +91,13 @@ internal fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symb
         fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
     }
 
-    return LabeledPolynomial<C>(
-        fixedCoefs.filterValues { it != zero }
-    )
+    return LabeledPolynomial<C>(fixedCoefs)
 }
 
 @Suppress("FunctionName", "NOTHING_TO_INLINE")
 internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs = pairs, toCheckInput = toCheckInput)
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs = pairs, toCheckInput = toCheckInput)
 @Suppress("FunctionName")
 internal fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
     if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
@@ -108,25 +110,29 @@ internal fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol,
         fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
     }
 
-    return LabeledPolynomial<C>(
-        fixedCoefs.filterValues { it != zero }
-    )
+    return LabeledPolynomial<C>(fixedCoefs)
 }
 
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
 
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
 
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
 
 //context(A)
 //public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to one))
@@ -196,19 +202,17 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     public override operator fun LabeledPolynomial<C>.plus(other: Int): LabeledPolynomial<C> =
         if (other == 0) this
-        else
-            LabeledPolynomial(
-                coefficients
-                    .toMutableMap()
+        else with(coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other.asConstant()))
+            else LabeledPolynomial<C>(
+                toMutableMap()
                     .apply {
                         val degs = emptyMap<Symbol, UInt>()
 
-                        val result = getOrElse(degs) { constantZero } + other
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = getOrElse(degs) { constantZero } + other
                     }
             )
+        }
     /**
      * Returns difference between the polynomial and the integer represented as polynomial.
      *
@@ -216,19 +220,17 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     public override operator fun LabeledPolynomial<C>.minus(other: Int): LabeledPolynomial<C> =
         if (other == 0) this
-        else
-            LabeledPolynomial(
-                coefficients
-                    .toMutableMap()
+        else with(coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to (-other).asConstant()))
+            else LabeledPolynomial<C>(
+                toMutableMap()
                     .apply {
                         val degs = emptyMap<Symbol, UInt>()
 
-                        val result = getOrElse(degs) { constantZero } - other
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = getOrElse(degs) { constantZero } - other
                     }
             )
+        }
     /**
      * Returns product of the polynomial and the integer represented as polynomial.
      *
@@ -238,7 +240,8 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         if (other == 0) zero
         else LabeledPolynomial(
             coefficients
-                .applyAndRemoveZeros {
+                .toMutableMap()
+                .apply {
                     for (degs in keys) this[degs] = this[degs]!! * other
                 }
         )
@@ -250,19 +253,17 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     public override operator fun Int.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         if (this == 0) other
-        else
-            LabeledPolynomial(
-                other.coefficients
-                    .toMutableMap()
+        else with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@plus.asConstant()))
+            else LabeledPolynomial<C>(
+                toMutableMap()
                     .apply {
                         val degs = emptyMap<Symbol, UInt>()
 
-                        val result = this@plus + getOrElse(degs) { constantZero }
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = this@plus + getOrElse(degs) { constantZero }
                     }
             )
+        }
     /**
      * Returns difference between the integer represented as polynomial and the polynomial.
      *
@@ -270,19 +271,17 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     public override operator fun Int.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         if (this == 0) other
-        else
-            LabeledPolynomial(
-                other.coefficients
-                    .toMutableMap()
+        else with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@minus.asConstant()))
+            else LabeledPolynomial<C>(
+                toMutableMap()
                     .apply {
                         val degs = emptyMap<Symbol, UInt>()
 
-                        val result = this@minus - getOrElse(degs) { constantZero }
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = this@minus - getOrElse(degs) { constantZero }
                     }
             )
+        }
     /**
      * Returns product of the integer represented as polynomial and the polynomial.
      *
@@ -292,7 +291,8 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         if (this == 0) zero
         else LabeledPolynomial(
             other.coefficients
-                .applyAndRemoveZeros {
+                .toMutableMap()
+                .apply {
                     for (degs in keys) this[degs] = this@times * this[degs]!!
                 }
         )
@@ -303,46 +303,32 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override fun number(value: Int): LabeledPolynomial<C> = number(constantNumber(value))
 
     public override operator fun C.plus(other: Symbol): LabeledPolynomial<C> =
-        if (isZero()) LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
+        LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to constantOne,
             emptyMap<Symbol, UInt>() to this@plus,
         ))
     public override operator fun C.minus(other: Symbol): LabeledPolynomial<C> =
-        if (isZero()) LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
+        LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to -constantOne,
             emptyMap<Symbol, UInt>() to this@minus,
         ))
     public override operator fun C.times(other: Symbol): LabeledPolynomial<C> =
-        if (isZero()) zero
-        else LabeledPolynomial<C>(mapOf(
+        LabeledPolynomial<C>(mapOf(
             mapOf(other to 1U) to this@times,
         ))
 
     public override operator fun Symbol.plus(other: C): LabeledPolynomial<C> =
-        if (other.isZero()) LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
+        LabeledPolynomial<C>(mapOf(
             mapOf(this@plus to 1U) to constantOne,
             emptyMap<Symbol, UInt>() to other,
         ))
     public override operator fun Symbol.minus(other: C): LabeledPolynomial<C> =
-        if (other.isZero()) LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
+        LabeledPolynomial<C>(mapOf(
             mapOf(this@minus to 1U) to -constantOne,
             emptyMap<Symbol, UInt>() to other,
         ))
     public override operator fun Symbol.times(other: C): LabeledPolynomial<C> =
-        if (other.isZero()) zero
-        else LabeledPolynomial<C>(mapOf(
+        LabeledPolynomial<C>(mapOf(
             mapOf(this@times to 1U) to other,
         ))
 
@@ -350,18 +336,14 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
     override operator fun C.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this.isZero()) other
-        else with(other.coefficients) {
+        with(other.coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@plus))
             else LabeledPolynomial<C>(
                 toMutableMap()
                     .apply {
                         val degs = emptyMap<Symbol, UInt>()
 
-                        val result = this@plus + getOrElse(degs) { constantZero }
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = this@plus + getOrElse(degs) { constantZero }
                     }
             )
         }
@@ -369,8 +351,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Returns difference between the constant represented as polynomial and the polynomial.
      */
     override operator fun C.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this.isZero()) other
-        else with(other.coefficients) {
+        with(other.coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@minus))
             else LabeledPolynomial<C>(
                 toMutableMap()
@@ -379,10 +360,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
 
                         val degs = emptyMap<Symbol, UInt>()
 
-                        val result = this@minus - getOrElse(degs) { constantZero }
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = this@minus - getOrElse(degs) { constantZero }
                     }
             )
         }
@@ -390,10 +368,10 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Returns product of the constant represented as polynomial and the polynomial.
      */
     override operator fun C.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this.isZero()) zero
-        else LabeledPolynomial<C>(
+        LabeledPolynomial<C>(
             other.coefficients
-                .applyAndRemoveZeros {
+                .toMutableMap()
+                .apply {
                     for (degs in keys) this[degs] = this@times * this[degs]!!
                 }
         )
@@ -402,18 +380,14 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
     override operator fun LabeledPolynomial<C>.plus(other: C): LabeledPolynomial<C> =
-        if (other.isZero()) this
-        else with(coefficients) {
+        with(coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other))
             else LabeledPolynomial<C>(
                 toMutableMap()
                     .apply {
                         val degs = emptyMap<Symbol, UInt>()
 
-                        val result = getOrElse(degs) { constantZero } + other
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = getOrElse(degs) { constantZero } + other
                     }
             )
         }
@@ -421,8 +395,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Returns difference between the constant represented as polynomial and the polynomial.
      */
     override operator fun LabeledPolynomial<C>.minus(other: C): LabeledPolynomial<C> =
-        if (other.isZero()) this
-        else with(coefficients) {
+        with(coefficients) {
             if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other))
             else LabeledPolynomial<C>(
                 toMutableMap()
@@ -431,10 +404,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
 
                         val degs = emptyMap<Symbol, UInt>()
 
-                        val result = getOrElse(degs) { constantZero } - other
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = getOrElse(degs) { constantZero } - other
                     }
             )
         }
@@ -442,10 +412,10 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Returns product of the constant represented as polynomial and the polynomial.
      */
     override operator fun LabeledPolynomial<C>.times(other: C): LabeledPolynomial<C> =
-        if (other.isZero()) zero
-        else LabeledPolynomial<C>(
+        LabeledPolynomial<C>(
             coefficients
-                .applyAndRemoveZeros {
+                .toMutableMap()
+                .apply {
                     for (degs in keys) this[degs] = this[degs]!! * other
                 }
         )
@@ -454,8 +424,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Converts the constant [value] to polynomial.
      */
     public override fun number(value: C): LabeledPolynomial<C> =
-        if (value == 0) zero
-        else LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to value))
+        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to value))
 
     public override operator fun Symbol.unaryPlus(): LabeledPolynomial<C> =
         LabeledPolynomial<C>(mapOf(
@@ -495,10 +464,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = mapOf(this@plus to 1U)
 
-                        val result = constantOne + getOrElse(degs) { constantZero }
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = constantOne + getOrElse(degs) { constantZero }
                     }
             )
         }
@@ -512,10 +478,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
 
                         val degs = mapOf(this@minus to 1U)
 
-                        val result = constantOne - getOrElse(degs) { constantZero }
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = constantOne - getOrElse(degs) { constantZero }
                     }
             )
         }
@@ -533,10 +496,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = mapOf(other to 1U)
 
-                        val result = constantOne + getOrElse(degs) { constantZero }
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = constantOne + getOrElse(degs) { constantZero }
                     }
             )
         }
@@ -548,10 +508,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = mapOf(other to 1U)
 
-                        val result = constantOne - getOrElse(degs) { constantZero }
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = constantOne - getOrElse(degs) { constantZero }
                     }
             )
         }
@@ -573,7 +530,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun LabeledPolynomial<C>.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         LabeledPolynomial<C>(
-            buildCoefficients(coefficients.size + other.coefficients.size) {
+            buildMap(coefficients.size + other.coefficients.size) {
                 other.coefficients.mapValuesTo(this) { it.value }
                 other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
             }
@@ -583,7 +540,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun LabeledPolynomial<C>.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         LabeledPolynomial<C>(
-            buildCoefficients(coefficients.size + other.coefficients.size) {
+            buildMap(coefficients.size + other.coefficients.size) {
                 other.coefficients.mapValuesTo(this) { it.value }
                 other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
             }
@@ -592,20 +549,16 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Returns product of the polynomials.
      */
     override operator fun LabeledPolynomial<C>.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        when {
-            isZero() -> zero
-            other.isZero() -> zero
-            else -> LabeledPolynomial<C>(
-                buildCoefficients(coefficients.size * other.coefficients.size) {
-                    for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
-                        val degs = degs1.toMutableMap()
-                        degs2.mapValuesTo(degs) { (variable, deg) -> degs.getOrElse(variable) { 0u } + deg }
-                        val c = c1 * c2
-                        this[degs] = if (degs in this) this[degs]!! + c else c
-                    }
+        LabeledPolynomial<C>(
+            buildMap(coefficients.size * other.coefficients.size) {
+                for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
+                    val degs = degs1.toMutableMap()
+                    degs2.mapValuesTo(degs) { (variable, deg) -> degs.getOrElse(variable) { 0u } + deg }
+                    val c = c1 * c2
+                    this[degs] = if (degs in this) this[degs]!! + c else c
                 }
-            )
-        }
+            }
+        )
 
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
@@ -616,22 +569,12 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     override val one: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to constantOne))
 
-    /**
-     * Checks equality of the polynomials.
-     */
-    override infix fun LabeledPolynomial<C>.equalsTo(other: LabeledPolynomial<C>): Boolean =
-        when {
-            this === other -> true
-            else -> coefficients.size == other.coefficients.size &&
-                    coefficients.all { (key, value) -> with(other.coefficients) { key in this && this[key] == value } }
-        }
-
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
      */
     override val LabeledPolynomial<C>.degree: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) -1 else degs.values.sum().toInt() } ?: -1
+        get() = coefficients.entries.maxOfOrNull { (degs, c) -> degs.values.sum().toInt() } ?: -1
     /**
      * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
      * in which they are appeared in the polynomial.
@@ -642,8 +585,8 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override val LabeledPolynomial<C>.degrees: Map<Symbol, UInt>
         get() =
             buildMap {
-                coefficients.entries.forEach { (degs, c) ->
-                    if (c.isNotZero()) degs.mapValuesTo(this) { (variable, deg) ->
+                coefficients.entries.forEach { (degs, _) ->
+                    degs.mapValuesTo(this) { (variable, deg) ->
                         max(getOrElse(variable) { 0u }, deg)
                     }
                 }
@@ -652,55 +595,25 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Counts degree of the polynomial by the specified [variable].
      */
     public override fun LabeledPolynomial<C>.degreeBy(variable: Symbol): UInt =
-        coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) 0u else degs.getOrElse(variable) { 0u } } ?: 0u
+        coefficients.entries.maxOfOrNull { (degs, _) -> degs.getOrElse(variable) { 0u } } ?: 0u
     /**
      * Counts degree of the polynomial by the specified [variables].
      */
     public override fun LabeledPolynomial<C>.degreeBy(variables: Collection<Symbol>): UInt =
-        coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) 0u else degs.filterKeys { it in variables }.values.sum() } ?: 0u
+        coefficients.entries.maxOfOrNull { (degs, _) -> degs.filterKeys { it in variables }.values.sum() } ?: 0u
     /**
      * Set of all variables that appear in the polynomial in positive exponents.
      */
     public override val LabeledPolynomial<C>.variables: Set<Symbol>
         get() =
             buildSet {
-                coefficients.entries.forEach { (degs, c) -> if (c.isNotZero()) addAll(degs.keys) }
+                coefficients.entries.forEach { (degs, _) -> addAll(degs.keys) }
             }
     /**
      * Count of all variables that appear in the polynomial in positive exponents.
      */
     public override val LabeledPolynomial<C>.countOfVariables: Int get() = variables.size
 
-    /**
-     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
-     */
-    override fun LabeledPolynomial<C>.isConstant(): Boolean =
-        coefficients.all { (degs, c) -> degs.isEmpty() || c.isZero() }
-    /**
-     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    override fun LabeledPolynomial<C>.isNonZeroConstant(): Boolean =
-        with(coefficients) {
-            var foundAbsoluteTermAndItIsNotZero = false
-            for ((degs, c) in this) {
-                if (degs.isNotEmpty()) if (c.isNotZero()) return@with false
-                else {
-                    if (c.isZero()) return@with false
-                    else foundAbsoluteTermAndItIsNotZero = true
-                }
-            }
-            foundAbsoluteTermAndItIsNotZero
-        }
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
-     */
-    override fun LabeledPolynomial<C>.asConstantOrNull(): C? =
-        with(coefficients) {
-            if(isConstant()) getOrElse(emptyMap()) { constantZero }
-            else null
-        }
-
 //    @Suppress("NOTHING_TO_INLINE")
 //    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
 //    @Suppress("NOTHING_TO_INLINE")
@@ -719,33 +632,4 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
 //    @Suppress("NOTHING_TO_INLINE")
 //    @JvmName("invokePolynomial")
 //    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
-
-    // TODO: Move to other internal utilities with context receiver
-    @JvmName("applyAndRemoveZerosInternal")
-    internal fun MutableMap<Map<Symbol, UInt>, C>.applyAndRemoveZeros(block: MutableMap<Map<Symbol, UInt>, C>.() -> Unit) : MutableMap<Map<Symbol, UInt>, C> {
-        contract {
-            callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-        }
-        block()
-        for ((degs, c) in this) if (c.isZero()) this.remove(degs)
-        return this
-    }
-    internal fun Map<Map<Symbol, UInt>, C>.applyAndRemoveZeros(block: MutableMap<Map<Symbol, UInt>, C>.() -> Unit) : Map<Map<Symbol, UInt>, C> =
-        toMutableMap().applyAndRemoveZeros(block)
-    @OptIn(ExperimentalTypeInference::class)
-    internal inline fun buildCoefficients(@BuilderInference builderAction: MutableMap<Map<Symbol, UInt>, C>.() -> Unit): Map<Map<Symbol, UInt>, C> {
-        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
-        return buildMap {
-            builderAction()
-            for ((degs, c) in this) if (c.isZero()) this.remove(degs)
-        }
-    }
-    @OptIn(ExperimentalTypeInference::class)
-    internal inline fun buildCoefficients(capacity: Int, @BuilderInference builderAction: MutableMap<Map<Symbol, UInt>, C>.() -> Unit): Map<Map<Symbol, UInt>, C> {
-        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
-        return buildMap(capacity) {
-            builderAction()
-            for ((degs, c) in this) if (c.isZero()) this.remove(degs)
-        }
-    }
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index 00dd3bb47..0f46520dc 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -19,45 +19,35 @@ public class LabeledRationalFunction<C>(
 
 // Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numerator: LabeledPolynomial<C>, denominator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-    if (denominator.isZero()) throw ArithmeticException("/ by zero")
-    else LabeledRationalFunction<C>(numerator, denominator)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.LabeledRationalFunction(numerator: LabeledPolynomial<C>, denominator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-    if (denominator.coefficients.values.all { it == zero }) throw ArithmeticException("/ by zero")
-    else LabeledRationalFunction<C>(numerator, denominator)
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    if (denominatorCoefficients.values.all { it == zero }) throw ArithmeticException("/ by zero")
-    else LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients),
-        LabeledPolynomial(denominatorCoefficients)
+    LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
+        LabeledPolynomial(denominatorCoefficients, toCheckInput = true)
     )
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    if (denominatorCoefficients.values.all { it == zero }) throw ArithmeticException("/ by zero")
-    else LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients),
-        LabeledPolynomial(denominatorCoefficients)
+    LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
+        LabeledPolynomial(denominatorCoefficients, toCheckInput = true)
     )
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
     LabeledRationalFunction<C>(numerator, polynomialOne)
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(numerator, LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one)))
+    LabeledRationalFunction<C>(numerator, LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one), toCheckInput = false))
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
     LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients),
+        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
         polynomialOne
     )
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
     LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients),
-        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one))
+        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
+        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one), toCheckInput = false)
     )
 
 public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
@@ -82,38 +72,16 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
         numerator: LabeledPolynomial<C>,
         denominator: LabeledPolynomial<C>
     ): LabeledRationalFunction<C> =
-        LabeledRationalFunction(numerator, denominator)
+        LabeledRationalFunction<C>(numerator, denominator)
 
     /**
      * Instance of zero rational function (zero of the rational functions ring).
      */
-    public override val zero: LabeledRationalFunction<C> = LabeledRationalFunction(polynomialZero, polynomialOne)
+    public override val zero: LabeledRationalFunction<C> = LabeledRationalFunction<C>(polynomialZero, polynomialOne)
     /**
      * Instance of unit polynomial (unit of the rational functions ring).
      */
-    public override val one: LabeledRationalFunction<C> = LabeledRationalFunction(polynomialOne, polynomialOne)
-
-    /**
-     * Checks equality of the rational functions.
-     */
-    public override infix fun LabeledRationalFunction<C>.equalsTo(other: LabeledRationalFunction<C>): Boolean {
-        if (this === other) return true
-
-        if (numerator.isZero() != other.numerator.isZero()) return false
-
-        val variables = this.variables union other.variables
-        val thisNumeratorDegrees = this.numerator.degrees
-        val thisDenominatorDegrees = this.denominator.degrees
-        val otherNumeratorDegrees = other.numerator.degrees
-        val otherDenominatorDegrees = other.denominator.degrees
-        for (variable in variables)
-            if (
-                thisNumeratorDegrees.getOrElse(variable) { 0u } + otherDenominatorDegrees.getOrElse(variable) { 0u }
-                != thisDenominatorDegrees.getOrElse(variable) { 0u } + otherNumeratorDegrees.getOrElse(variable) { 0u }
-            ) return false
-
-        return numerator * other.denominator equalsTo other.numerator * denominator
-    }
+    public override val one: LabeledRationalFunction<C> = LabeledRationalFunction<C>(polynomialOne, polynomialOne)
 
     // TODO: Разобрать
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index 90e9cde69..711d2bb49 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -91,13 +91,9 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                     .toMutableList()
                     .apply {
                         val result = getOrElse(0) { constantZero } + other
-                        val isResultZero = result.isZero()
 
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
+                        if(size == 0) add(result)
+                        else this[0] = result
                     }
             )
     /**
@@ -113,13 +109,9 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                     .toMutableList()
                     .apply {
                         val result = getOrElse(0) { constantZero } - other
-                        val isResultZero = result.isZero()
 
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
+                        if(size == 0) add(result)
+                        else this[0] = result
                     }
             )
     /**
@@ -131,7 +123,8 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
         if (other == 0) zero
         else ListPolynomial(
             coefficients
-                .applyAndRemoveZeros {
+                .toMutableList()
+                .apply {
                     for (deg in indices) this[deg] = this[deg] * other
                 }
         )
@@ -149,13 +142,9 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                     .toMutableList()
                     .apply {
                         val result = this@plus + getOrElse(0) { constantZero }
-                        val isResultZero = result.isZero()
 
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
+                        if(size == 0) add(result)
+                        else this[0] = result
                     }
             )
     /**
@@ -173,13 +162,9 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                         forEachIndexed { index, c -> if (index != 0) this[index] = -c }
 
                         val result = this@minus - getOrElse(0) { constantZero }
-                        val isResultZero = result.isZero()
 
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
+                        if(size == 0) add(result)
+                        else this[0] = result
                     }
             )
     /**
@@ -191,7 +176,8 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
         if (this == 0) zero
         else ListPolynomial(
             other.coefficients
-                .applyAndRemoveZeros {
+                .toMutableList()
+                .apply {
                     for (deg in indices) this[deg] = this@times * this[deg]
                 }
         )
@@ -205,20 +191,15 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
     public override operator fun C.plus(other: ListPolynomial<C>): ListPolynomial<C> =
-        if (this.isZero()) other
-        else with(other.coefficients) {
+        with(other.coefficients) {
             if (isEmpty()) ListPolynomial(listOf(this@plus))
             else ListPolynomial(
                 toMutableList()
                     .apply {
                         val result = if (size == 0) this@plus else this@plus + get(0)
-                        val isResultZero = result.isZero()
 
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
+                        if(size == 0) add(result)
+                        else this[0] = result
                     }
             )
         }
@@ -226,8 +207,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      * Returns difference between the constant represented as polynomial and the polynomial.
      */
     public override operator fun C.minus(other: ListPolynomial<C>): ListPolynomial<C> =
-        if (this.isZero()) other
-        else with(other.coefficients) {
+        with(other.coefficients) {
             if (isEmpty()) ListPolynomial(listOf(this@minus))
             else ListPolynomial(
                 toMutableList()
@@ -235,13 +215,9 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                         forEachIndexed { index, c -> if (index != 0) this[index] = -c }
 
                         val result = if (size == 0) this@minus else this@minus - get(0)
-                        val isResultZero = result.isZero()
 
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
+                        if(size == 0) add(result)
+                        else this[0] = result
                     }
             )
         }
@@ -249,10 +225,10 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      * Returns product of the constant represented as polynomial and the polynomial.
      */
     public override operator fun C.times(other: ListPolynomial<C>): ListPolynomial<C> =
-        if (this.isZero()) other
-        else ListPolynomial(
+        ListPolynomial(
             other.coefficients
-                .applyAndRemoveZeros {
+                .toMutableList()
+                .apply {
                     for (deg in indices) this[deg] = this@times * this[deg]
                 }
         )
@@ -261,20 +237,15 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
     public override operator fun ListPolynomial<C>.plus(other: C): ListPolynomial<C> =
-        if (other.isZero()) this
-        else with(coefficients) {
+        with(coefficients) {
             if (isEmpty()) ListPolynomial(listOf(other))
             else ListPolynomial(
                 toMutableList()
                     .apply {
                         val result = if (size == 0) other else get(0) + other
-                        val isResultZero = result.isZero()
 
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
+                        if(size == 0) add(result)
+                        else this[0] = result
                     }
             )
         }
@@ -282,20 +253,15 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      * Returns difference between the constant represented as polynomial and the polynomial.
      */
     public override operator fun ListPolynomial<C>.minus(other: C): ListPolynomial<C> =
-        if (other.isZero()) this
-        else with(coefficients) {
+        with(coefficients) {
             if (isEmpty()) ListPolynomial(listOf(-other))
             else ListPolynomial(
                 toMutableList()
                     .apply {
                         val result = if (size == 0) other else get(0) - other
-                        val isResultZero = result.isZero()
 
-                        when {
-                            size == 0 && !isResultZero -> add(result)
-                            size > 1 || !isResultZero -> this[0] = result
-                            else -> clear()
-                        }
+                        if(size == 0) add(result)
+                        else this[0] = result
                     }
             )
         }
@@ -303,10 +269,10 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      * Returns product of the constant represented as polynomial and the polynomial.
      */
     public override operator fun ListPolynomial<C>.times(other: C): ListPolynomial<C> =
-        if (other.isZero()) this
-        else ListPolynomial(
+        ListPolynomial(
             coefficients
-                .applyAndRemoveZeros {
+                .toMutableList()
+                .apply {
                     for (deg in indices) this[deg] = this[deg] * other
                 }
         )
@@ -314,9 +280,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
     /**
      * Converts the constant [value] to polynomial.
      */
-    public override fun number(value: C): ListPolynomial<C> =
-        if (value.isZero()) zero
-        else ListPolynomial(value)
+    public override fun number(value: C): ListPolynomial<C> = ListPolynomial(value)
 
     /**
      * Returns negation of the polynomial.
@@ -330,7 +294,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
         val thisDegree = degree
         val otherDegree = other.degree
         return ListPolynomial(
-            Coefficients(max(thisDegree, otherDegree) + 1) {
+            List(max(thisDegree, otherDegree) + 1) {
                 when {
                     it > thisDegree -> other.coefficients[it]
                     it > otherDegree -> coefficients[it]
@@ -346,7 +310,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
         val thisDegree = degree
         val otherDegree = other.degree
         return ListPolynomial(
-            Coefficients(max(thisDegree, otherDegree) + 1) {
+            List(max(thisDegree, otherDegree) + 1) {
                 when {
                     it > thisDegree -> -other.coefficients[it]
                     it > otherDegree -> coefficients[it]
@@ -361,39 +325,15 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
     public override operator fun ListPolynomial<C>.times(other: ListPolynomial<C>): ListPolynomial<C> {
         val thisDegree = degree
         val otherDegree = other.degree
-        return when {
-            thisDegree == -1 -> zero
-            otherDegree == -1 -> zero
-            else ->
-                ListPolynomial(
-                    Coefficients(thisDegree + otherDegree + 1) { d ->
-                        (max(0, d - otherDegree)..min(thisDegree, d))
-                            .map { coefficients[it] * other.coefficients[d - it] }
-                            .reduce { acc, rational -> acc + rational }
-                    }
-                )
-        }
+        return ListPolynomial(
+            List(thisDegree + otherDegree + 1) { d ->
+                (max(0, d - otherDegree)..min(thisDegree, d))
+                    .map { coefficients[it] * other.coefficients[d - it] }
+                    .reduce { acc, rational -> acc + rational }
+            }
+        )
     }
 
-    /**
-     * Check if the instant is zero polynomial.
-     */
-    public override fun ListPolynomial<C>.isZero(): Boolean = coefficients.all { it.isZero() }
-    /**
-     * Check if the instant is unit polynomial.
-     */
-    public override fun ListPolynomial<C>.isOne(): Boolean =
-        with(coefficients) {
-            isNotEmpty() && withIndex().all { (index, c) -> if (index == 0) c.isOne() else c.isZero() }
-        }
-    /**
-     * Check if the instant is minus unit polynomial.
-     */
-    public override fun ListPolynomial<C>.isMinusOne(): Boolean =
-        with(coefficients) {
-            isNotEmpty() && withIndex().all { (index, c) -> if (index == 0) c.isMinusOne() else c.isZero() }
-        }
-
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
      */
@@ -403,34 +343,11 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      */
     override val one: ListPolynomial<C> = ListPolynomial(listOf(constantOne))
 
-    /**
-     * Checks equality of the polynomials.
-     */
-    public override infix fun ListPolynomial<C>.equalsTo(other: ListPolynomial<C>): Boolean =
-        when {
-            this === other -> true
-            this.degree == other.degree -> (0..degree).all { coefficients[it] == other.coefficients[it] }
-            else -> false
-        }
-
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
      */
-    public override val ListPolynomial<C>.degree: Int get() = coefficients.indexOfLast { it != constantZero }
-
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
-     */
-    public override fun ListPolynomial<C>.asConstantOrNull(): C? =
-        with(coefficients) {
-            when {
-                isEmpty() -> constantZero
-                withIndex().all { (index, c) -> index == 0 || c.isZero() } -> first()
-                else -> null
-            }
-        }
+    public override val ListPolynomial<C>.degree: Int get() = coefficients.lastIndex
 
     @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.substitute(argument: C): C = this.substitute(ring, argument)
@@ -451,44 +368,6 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
     public inline operator fun ListPolynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
     @Suppress("NOTHING_TO_INLINE")
     public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
-
-    // TODO: Move to other internal utilities with context receiver
-    @JvmName("applyAndRemoveZerosInternal")
-    internal inline fun MutableList<C>.applyAndRemoveZeros(block: MutableList<C>.() -> Unit) : MutableList<C> {
-        contract {
-            callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-        }
-        block()
-        while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex)
-        return this
-    }
-    internal inline fun List<C>.applyAndRemoveZeros(block: MutableList<C>.() -> Unit) : List<C> =
-        toMutableList().applyAndRemoveZeros(block)
-    @Suppress("FunctionName")
-    internal inline fun MutableCoefficients(size: Int, init: (index: Int) -> C): MutableList<C> {
-        val list = ArrayList<C>(size)
-        repeat(size) { index -> list.add(init(index)) }
-        with(list) { while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex) }
-        return list
-    }
-    @Suppress("FunctionName")
-    internal inline fun Coefficients(size: Int, init: (index: Int) -> C): List<C> = MutableCoefficients(size, init)
-    @OptIn(ExperimentalTypeInference::class)
-    internal inline fun buildCoefficients(@BuilderInference builderAction: MutableList<C>.() -> Unit): List<C> {
-        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
-        return buildList {
-            builderAction()
-            while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex)
-        }
-    }
-    @OptIn(ExperimentalTypeInference::class)
-    internal inline fun buildCoefficients(capacity: Int, @BuilderInference builderAction: MutableList<C>.() -> Unit): List<C> {
-        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
-        return buildList(capacity) {
-            builderAction()
-            while (isNotEmpty() && elementAt(lastIndex).isZero()) removeAt(lastIndex)
-        }
-    }
 }
 
 /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
index 67c7e9fa2..f62d1857f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.operations.Ring
 
 
-public data class ListRationalFunction<C> internal constructor (
+public data class ListRationalFunction<C>(
     public override val numerator: ListPolynomial<C>,
     public override val denominator: ListPolynomial<C>
 ) : RationalFunction<C, ListPolynomial<C>> {
@@ -17,25 +17,15 @@ public data class ListRationalFunction<C> internal constructor (
 
 // Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>, denominator: ListPolynomial<C>): ListRationalFunction<C> =
-    if (denominator.isZero()) throw ArithmeticException("/ by zero")
-    else ListRationalFunction<C>(numerator, denominator)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.ListRationalFunction(numerator: ListPolynomial<C>, denominator: ListPolynomial<C>): ListRationalFunction<C> =
-    if (denominator.coefficients.all { it == zero }) throw ArithmeticException("/ by zero")
-    else ListRationalFunction<C>(numerator, denominator)
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    if (denominatorCoefficients.all { it == zero }) throw ArithmeticException("/ by zero")
-    else ListRationalFunction<C>(
+    ListRationalFunction<C>(
         ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
         ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
     )
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    if (denominatorCoefficients.all { it == zero }) throw ArithmeticException("/ by zero")
-    else ListRationalFunction<C>(
+    ListRationalFunction<C>(
         ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
         ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
     )
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 80998d6bf..51f316c5d 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -58,6 +58,8 @@ internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
 
 @Suppress("FunctionName", "NOTHING_TO_INLINE")
 internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(coefs, toCheckInput)
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(coefs, toCheckInput)
 @Suppress("FunctionName")
 internal fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
     if (!toCheckInput) return NumberedPolynomial<C>(coefs)
@@ -70,13 +72,13 @@ internal fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>, toC
         fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
     }
 
-    return NumberedPolynomial<C>(
-        fixedCoefs.filterValues { it != zero }
-    )
+    return NumberedPolynomial<C>(fixedCoefs)
 }
 
 @Suppress("FunctionName", "NOTHING_TO_INLINE")
 internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs, toCheckInput)
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs, toCheckInput)
 @Suppress("FunctionName")
 internal fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
     if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
@@ -89,13 +91,13 @@ internal fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UI
         fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
     }
 
-    return NumberedPolynomial<C>(
-        fixedCoefs.filterValues { it != zero }
-    )
+    return NumberedPolynomial<C>(fixedCoefs)
 }
 
 @Suppress("FunctionName", "NOTHING_TO_INLINE")
 internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs = pairs, toCheckInput = toCheckInput)
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs = pairs, toCheckInput = toCheckInput)
 @Suppress("FunctionName")
 internal fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
     if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
@@ -108,25 +110,29 @@ internal fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>,
         fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
     }
 
-    return NumberedPolynomial<C>(
-        fixedCoefs.filterValues { it != zero }
-    )
+    return NumberedPolynomial<C>(fixedCoefs)
 }
 
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
 
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
 
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
 
 //context(A)
 //public fun <C, A: Ring<C>> Symbol.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(mapOf(this to 1u) to one))
@@ -211,10 +217,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = getOrElse(degs) { constantZero } + other
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = getOrElse(degs) { constantZero } + other
                     }
             )
     /**
@@ -231,10 +234,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = getOrElse(degs) { constantZero } - other
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = getOrElse(degs) { constantZero } - other
                     }
             )
     /**
@@ -246,7 +246,8 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
         if (other == 0) zero
         else NumberedPolynomial<C>(
             coefficients
-                .applyAndRemoveZeros {
+                .toMutableMap()
+                .apply {
                     for (degs in keys) this[degs] = this[degs]!! * other
                 }
         )
@@ -265,10 +266,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = this@plus + getOrElse(degs) { constantZero }
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = this@plus + getOrElse(degs) { constantZero }
                     }
             )
     /**
@@ -285,10 +283,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = this@minus - getOrElse(degs) { constantZero }
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = this@minus - getOrElse(degs) { constantZero }
                     }
             )
     /**
@@ -300,7 +295,8 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
         if (this == 0) zero
         else NumberedPolynomial(
             other.coefficients
-                .applyAndRemoveZeros {
+                .toMutableMap()
+                .apply {
                     for (degs in keys) this[degs] = this@times * this[degs]!!
                 }
         )
@@ -314,18 +310,14 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
     override operator fun C.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this.isZero()) other
-        else with(other.coefficients) {
+        with(other.coefficients) {
             if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this@plus))
             else NumberedPolynomial<C>(
                 toMutableMap()
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = this@plus + getOrElse(degs) { constantZero }
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = this@plus + getOrElse(degs) { constantZero }
                     }
             )
         }
@@ -333,8 +325,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      * Returns difference between the constant represented as polynomial and the polynomial.
      */
     override operator fun C.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this.isZero()) -other
-        else with(other.coefficients) {
+        with(other.coefficients) {
             if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this@minus))
             else NumberedPolynomial<C>(
                 toMutableMap()
@@ -343,10 +334,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
 
                         val degs = emptyList<UInt>()
 
-                        val result = this@minus - getOrElse(degs) { constantZero }
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = this@minus - getOrElse(degs) { constantZero }
                     }
             )
         }
@@ -354,10 +342,10 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      * Returns product of the constant represented as polynomial and the polynomial.
      */
     override operator fun C.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this.isZero()) zero
-        else NumberedPolynomial<C>(
+        NumberedPolynomial<C>(
             other.coefficients
-                .applyAndRemoveZeros {
+                .toMutableMap()
+                .apply {
                     for (degs in keys) this[degs] = this@times * this[degs]!!
                 }
         )
@@ -366,18 +354,14 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      * Returns sum of the constant represented as polynomial and the polynomial.
      */
     override operator fun NumberedPolynomial<C>.plus(other: C): NumberedPolynomial<C> =
-        if (other.isZero()) this
-        else with(coefficients) {
+        with(coefficients) {
             if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to other))
             else NumberedPolynomial<C>(
                 toMutableMap()
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = getOrElse(degs) { constantZero } + other
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = getOrElse(degs) { constantZero } + other
                     }
             )
         }
@@ -385,18 +369,14 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      * Returns difference between the constant represented as polynomial and the polynomial.
      */
     override operator fun NumberedPolynomial<C>.minus(other: C): NumberedPolynomial<C> =
-        if (other.isZero()) this
-        else with(coefficients) {
+        with(coefficients) {
             if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to other))
             else NumberedPolynomial<C>(
                 toMutableMap()
                     .apply {
                         val degs = emptyList<UInt>()
 
-                        val result = getOrElse(degs) { constantZero } - other
-
-                        if (result.isZero()) remove(degs)
-                        else this[degs] = result
+                        this[degs] = getOrElse(degs) { constantZero } - other
                     }
             )
         }
@@ -404,10 +384,10 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      * Returns product of the constant represented as polynomial and the polynomial.
      */
     override operator fun NumberedPolynomial<C>.times(other: C): NumberedPolynomial<C> =
-        if (other.isZero()) zero
-        else NumberedPolynomial<C>(
+        NumberedPolynomial<C>(
             coefficients
-                .applyAndRemoveZeros {
+                .toMutableMap()
+                .apply {
                     for (degs in keys) this[degs] = this[degs]!! * other
                 }
         )
@@ -416,8 +396,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      * Converts the constant [value] to polynomial.
      */
     public override fun number(value: C): NumberedPolynomial<C> =
-        if (value == 0) zero
-        else NumberedPolynomial(mapOf(emptyList<UInt>() to value))
+        NumberedPolynomial(mapOf(emptyList<UInt>() to value))
 
     /**
      * Returns negation of the polynomial.
@@ -431,7 +410,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun NumberedPolynomial<C>.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         NumberedPolynomial<C>(
-            buildCoefficients(coefficients.size + other.coefficients.size) {
+            buildMap(coefficients.size + other.coefficients.size) {
                 other.coefficients.mapValuesTo(this) { it.value }
                 other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
             }
@@ -441,7 +420,7 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun NumberedPolynomial<C>.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         NumberedPolynomial<C>(
-            buildCoefficients(coefficients.size + other.coefficients.size) {
+            buildMap(coefficients.size + other.coefficients.size) {
                 other.coefficients.mapValuesTo(this) { it.value }
                 other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
             }
@@ -450,57 +429,17 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      * Returns product of the polynomials.
      */
     override operator fun NumberedPolynomial<C>.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        when {
-            isZero() -> zero
-            other.isZero() -> zero
-            else ->
-                NumberedPolynomial<C>(
-                    buildCoefficients(coefficients.size * other.coefficients.size) {
-                        for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
-                            val degs =
-                                (0..max(degs1.lastIndex, degs2.lastIndex))
-                                    .map { degs1.getOrElse(it) { 0U } + degs2.getOrElse(it) { 0U } }
-                            val c = c1 * c2
-                            this[degs] = if (degs in this) this[degs]!! + c else c
-                        }
-                    }
-                )
-        }
-
-    /**
-     * Check if the instant is zero polynomial.
-     */
-    public override fun NumberedPolynomial<C>.isZero(): Boolean = coefficients.values.all { it.isZero() }
-    /**
-     * Check if the instant is unit polynomial.
-     */
-    public override fun NumberedPolynomial<C>.isOne(): Boolean =
-        with(coefficients) {
-            var foundAbsoluteTermAndItIsOne = false
-            for ((degs, c) in this) {
-                if (degs.isNotEmpty()) if (c.isNotZero()) return@with false
-                else {
-                    if (c.isNotOne()) return@with false
-                    else foundAbsoluteTermAndItIsOne = true
+        NumberedPolynomial<C>(
+            buildMap(coefficients.size * other.coefficients.size) {
+                for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
+                    val degs =
+                        (0..max(degs1.lastIndex, degs2.lastIndex))
+                            .map { degs1.getOrElse(it) { 0U } + degs2.getOrElse(it) { 0U } }
+                    val c = c1 * c2
+                    this[degs] = if (degs in this) this[degs]!! + c else c
                 }
             }
-            foundAbsoluteTermAndItIsOne
-        }
-    /**
-     * Check if the instant is minus unit polynomial.
-     */
-    public override fun NumberedPolynomial<C>.isMinusOne(): Boolean =
-        with(coefficients) {
-            var foundAbsoluteTermAndItIsMinusOne = false
-            for ((degs, c) in this) {
-                if (degs.isNotEmpty()) if (c.isNotZero()) return@with false
-                else {
-                    if (c.isNotMinusOne()) return@with false
-                    else foundAbsoluteTermAndItIsMinusOne = true
-                }
-            }
-            foundAbsoluteTermAndItIsMinusOne
-        }
+        )
 
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
@@ -516,28 +455,18 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
             )
         )
 
-    /**
-     * Checks equality of the polynomials.
-     */
-    override infix fun NumberedPolynomial<C>.equalsTo(other: NumberedPolynomial<C>): Boolean =
-        when {
-            this === other -> true
-            else -> coefficients.size == other.coefficients.size &&
-                    coefficients.all { (key, value) -> with(other.coefficients) { key in this && this[key] == value } }
-        }
-
     /**
      * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
      * the result is `-1`.
      */
     public val NumberedPolynomial<C>.lastVariable: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) -1 else degs.lastIndex } ?: -1
+        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.lastIndex } ?: -1
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
      */
     override val NumberedPolynomial<C>.degree: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) -1 else degs.sum().toInt() } ?: -1
+        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.sum().toInt() } ?: -1
     /**
      * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
      * exponents in which the variables are appeared in the polynomial.
@@ -548,8 +477,8 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     public val NumberedPolynomial<C>.degrees: List<UInt>
         get() =
             MutableList(lastVariable + 1) { 0u }.apply {
-                coefficients.entries.forEach { (degs, c) ->
-                    if (c.isNotZero()) degs.forEachIndexed { index, deg ->
+                coefficients.entries.forEach { (degs, _) ->
+                    degs.forEachIndexed { index, deg ->
                         this[index] = max(this[index], deg)
                     }
                 }
@@ -558,13 +487,13 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
      * Counts degree of the polynomial by the specified [variable].
      */
     public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt =
-        coefficients.entries.maxOfOrNull { (degs, c) -> if (c.isZero()) 0u else degs.getOrElse(variable) { 0u } } ?: 0u
+        coefficients.entries.maxOfOrNull { (degs, _) -> degs.getOrElse(variable) { 0u } } ?: 0u
     /**
      * Counts degree of the polynomial by the specified [variables].
      */
     public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt =
-        coefficients.entries.maxOfOrNull { (degs, c) ->
-            if (c.isZero()) 0u else degs.withIndex().filter { (index, _) -> index in variables }.sumOf { it.value }
+        coefficients.entries.maxOfOrNull { (degs, _) ->
+            degs.withIndex().filter { (index, _) -> index in variables }.sumOf { it.value }
         } ?: 0u
     /**
      * Count of variables occurring in the polynomial with positive power. If there is no such variable,
@@ -573,43 +502,13 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     public val NumberedPolynomial<C>.countOfVariables: Int
         get() =
             MutableList(lastVariable + 1) { false }.apply {
-                coefficients.entries.forEach { (degs, c) ->
-                    if (c.isNotZero()) degs.forEachIndexed { index, deg ->
+                coefficients.entries.forEach { (degs, _) ->
+                    degs.forEachIndexed { index, deg ->
                         if (deg != 0u) this[index] = true
                     }
                 }
             }.count { it }
 
-    /**
-     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
-     */
-    override fun NumberedPolynomial<C>.isConstant(): Boolean =
-        coefficients.all { (degs, c) -> degs.isEmpty() || c.isZero() }
-    /**
-     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    override fun NumberedPolynomial<C>.isNonZeroConstant(): Boolean =
-        with(coefficients) {
-            var foundAbsoluteTermAndItIsNotZero = false
-            for ((degs, c) in this) {
-                if (degs.isNotEmpty()) if (c.isNotZero()) return@with false
-                else {
-                    if (c.isZero()) return@with false
-                    else foundAbsoluteTermAndItIsNotZero = true
-                }
-            }
-            foundAbsoluteTermAndItIsNotZero
-        }
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
-     */
-    override fun NumberedPolynomial<C>.asConstantOrNull(): C? =
-        with(coefficients) {
-            if(isConstant()) getOrElse(emptyList()) { constantZero }
-            else null
-        }
-
     @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, C>): NumberedPolynomial<C> = this.substitute(ring, argument)
     @Suppress("NOTHING_TO_INLINE")
@@ -629,35 +528,6 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     @JvmName("invokePolynomial")
     public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
 
-    // TODO: Move to other internal utilities with context receiver
-    @JvmName("applyAndRemoveZerosInternal")
-    internal fun MutableMap<List<UInt>, C>.applyAndRemoveZeros(block: MutableMap<List<UInt>, C>.() -> Unit) : MutableMap<List<UInt>, C> {
-        contract {
-            callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-        }
-        block()
-        for ((degs, c) in this) if (c.isZero()) this.remove(degs)
-        return this
-    }
-    internal fun Map<List<UInt>, C>.applyAndRemoveZeros(block: MutableMap<List<UInt>, C>.() -> Unit) : Map<List<UInt>, C> =
-        toMutableMap().applyAndRemoveZeros(block)
-    @OptIn(ExperimentalTypeInference::class)
-    internal inline fun buildCoefficients(@BuilderInference builderAction: MutableMap<List<UInt>, C>.() -> Unit): Map<List<UInt>, C> {
-        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
-        return buildMap {
-            builderAction()
-            for ((degs, c) in this) if (c.isZero()) this.remove(degs)
-        }
-    }
-    @OptIn(ExperimentalTypeInference::class)
-    internal inline fun buildCoefficients(capacity: Int, @BuilderInference builderAction: MutableMap<List<UInt>, C>.() -> Unit): Map<List<UInt>, C> {
-        contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
-        return buildMap(capacity) {
-            builderAction()
-            for ((degs, c) in this) if (c.isZero()) this.remove(degs)
-        }
-    }
-
     // TODO: Move to other constructors with context receiver
     public fun C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index 2a4d942a6..b4d9f1d91 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -19,45 +19,35 @@ public class NumberedRationalFunction<C> internal constructor(
 
 // Waiting for context receivers :( TODO: Replace with context receivers when they will be available
 
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numerator: NumberedPolynomial<C>, denominator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-    if (denominator.isZero()) throw ArithmeticException("/ by zero")
-    else NumberedRationalFunction<C>(numerator, denominator)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.NumberedRationalFunction(numerator: NumberedPolynomial<C>, denominator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-    if (denominator.coefficients.values.all { it == zero }) throw ArithmeticException("/ by zero")
-    else NumberedRationalFunction<C>(numerator, denominator)
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    if (denominatorCoefficients.values.all { it == zero }) throw ArithmeticException("/ by zero")
-    else NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients),
-        NumberedPolynomial(denominatorCoefficients)
+    NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
+        NumberedPolynomial(denominatorCoefficients, toCheckInput = true)
     )
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    if (denominatorCoefficients.values.all { it == zero }) throw ArithmeticException("/ by zero")
-    else NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients),
-        NumberedPolynomial(denominatorCoefficients)
+    NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
+        NumberedPolynomial(denominatorCoefficients, toCheckInput = true)
     )
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
     NumberedRationalFunction<C>(numerator, polynomialOne)
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(numerator, NumberedPolynomial(mapOf(emptyList<UInt>() to one)))
+    NumberedRationalFunction<C>(numerator, NumberedPolynomial(mapOf(emptyList<UInt>() to one), toCheckInput = false))
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
     NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients),
+        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
         polynomialOne
     )
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
     NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients),
-        NumberedPolynomial(mapOf(emptyList<UInt>() to one))
+        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
+        NumberedPolynomial(mapOf(emptyList<UInt>() to one), toCheckInput = false)
     )
 
 public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
@@ -91,28 +81,6 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
      */
     public override val one: NumberedRationalFunction<C> = NumberedRationalFunction(polynomialOne, polynomialOne)
 
-    /**
-     * Checks equality of the rational functions.
-     */
-    public override infix fun NumberedRationalFunction<C>.equalsTo(other: NumberedRationalFunction<C>): Boolean {
-        if (this === other) return true
-
-        if (numerator.isZero() != other.numerator.isZero()) return false
-
-        val countOfVariables = max(this.lastVariable, other.lastVariable)
-        val thisNumeratorDegrees = this.numerator.degrees
-        val thisDenominatorDegrees = this.denominator.degrees
-        val otherNumeratorDegrees = other.numerator.degrees
-        val otherDenominatorDegrees = other.denominator.degrees
-        for (variable in 0 .. countOfVariables)
-            if (
-                thisNumeratorDegrees.getOrElse(variable) { 0u } + otherDenominatorDegrees.getOrElse(variable) { 0u }
-                != thisDenominatorDegrees.getOrElse(variable) { 0u } + otherNumeratorDegrees.getOrElse(variable) { 0u }
-            ) return false
-
-        return numerator * other.denominator equalsTo other.numerator * denominator
-    }
-
     /**
      * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
      * the result is `-1`.
@@ -152,13 +120,13 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
     public val NumberedRationalFunction<C>.countOfVariables: Int
         get() =
             MutableList(lastVariable + 1) { false }.apply {
-                numerator.coefficients.entries.forEach { (degs, c) ->
-                    if (c.isNotZero()) degs.forEachIndexed { index, deg ->
+                numerator.coefficients.entries.forEach { (degs, _) ->
+                    degs.forEachIndexed { index, deg ->
                         if (deg != 0u) this[index] = true
                     }
                 }
-                denominator.coefficients.entries.forEach { (degs, c) ->
-                    if (c.isNotZero()) degs.forEachIndexed { index, deg ->
+                denominator.coefficients.entries.forEach { (degs, _) ->
+                    degs.forEachIndexed { index, deg ->
                         if (deg != 0u) this[index] = true
                     }
                 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index d44c47dd6..96e860550 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -155,31 +155,6 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     @JsName("constantPower")
     public fun power(arg: C, exponent: UInt) : C
 
-    /**
-     * Check if the instant is zero constant.
-     */
-    public fun C.isZero(): Boolean = this == constantZero
-    /**
-     * Check if the instant is NOT zero constant.
-     */
-    public fun C.isNotZero(): Boolean = !isZero()
-    /**
-     * Check if the instant is unit constant.
-     */
-    public fun C.isOne(): Boolean = this == constantOne
-    /**
-     * Check if the instant is NOT unit constant.
-     */
-    public fun C.isNotOne(): Boolean = !isOne()
-    /**
-     * Check if the instant is minus unit constant.
-     */
-    public fun C.isMinusOne(): Boolean = this == -constantOne
-    /**
-     * Check if the instant is NOT minus unit constant.
-     */
-    public fun C.isNotMinusOne(): Boolean = !isMinusOne()
-
     /**
      * Instance of zero constant (zero of the underlying ring).
      */
@@ -249,31 +224,6 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
      */
     public override fun power(arg: P, exponent: UInt) : P = exponentiationBySquaring(arg, exponent)
 
-    /**
-     * Check if the instant is zero polynomial.
-     */
-    public fun P.isZero(): Boolean = this equalsTo zero
-    /**
-     * Check if the instant is NOT zero polynomial.
-     */
-    public fun P.isNotZero(): Boolean = !isZero()
-    /**
-     * Check if the instant is unit polynomial.
-     */
-    public fun P.isOne(): Boolean = this equalsTo one
-    /**
-     * Check if the instant is NOT unit polynomial.
-     */
-    public fun P.isNotOne(): Boolean = !isOne()
-    /**
-     * Check if the instant is minus unit polynomial.
-     */
-    public fun P.isMinusOne(): Boolean = this equalsTo -one
-    /**
-     * Check if the instant is NOT minus unit polynomial.
-     */
-    public fun P.isNotMinusOne(): Boolean = !isMinusOne()
-
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
      */
@@ -283,48 +233,12 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
      */
     public override val one: P
 
-    /**
-     * Checks equality of the polynomials.
-     */
-    public infix fun P.equalsTo(other: P): Boolean
-    /**
-     * Checks NOT equality of the polynomials.
-     */
-    public infix fun P.notEqualsTo(other: P): Boolean = !(this equalsTo other)
-
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
      */
     public val P.degree: Int
 
-    /**
-     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isConstant(): Boolean = degree <= 0
-    /**
-     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isNotConstant(): Boolean = !isConstant()
-    /**
-     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isNonZeroConstant(): Boolean = degree == 0
-    /**
-     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
-     */
-    public fun P.asConstantOrNull(): C?
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
-     */
-    public fun P.asConstant(): C = requireNotNull(asConstantOrNull()) { "Can not represent non-constant polynomial as a constant" }
-
     override fun add(left: P, right: P): P = left + right
     override fun multiply(left: P, right: P): P = left * right
 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 9c0263c4c..374f4a936 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -222,31 +222,6 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     @JsName("constantPower")
     public fun power(arg: C, exponent: UInt) : C
 
-    /**
-     * Check if the instant is zero constant.
-     */
-    public fun C.isZero(): Boolean = this == constantZero
-    /**
-     * Check if the instant is NOT zero constant.
-     */
-    public fun C.isNotZero(): Boolean = !isZero()
-    /**
-     * Check if the instant is unit constant.
-     */
-    public fun C.isOne(): Boolean =  this == constantOne
-    /**
-     * Check if the instant is NOT unit constant.
-     */
-    public fun C.isNotOne(): Boolean = !isOne()
-    /**
-     * Check if the instant is minus unit constant.
-     */
-    public fun C.isMinusOne(): Boolean =  this == -constantOne
-    /**
-     * Check if the instant is NOT minus unit constant.
-     */
-    public fun C.isNotMinusOne(): Boolean = !isMinusOne()
-
     /**
      * Instance of zero constant (zero of the underlying ring).
      */
@@ -320,31 +295,6 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      */
     public fun power(arg: P, exponent: UInt) : P
 
-    /**
-     * Check if the instant is zero polynomial.
-     */
-    public fun P.isZero(): Boolean = this equalsTo polynomialZero
-    /**
-     * Check if the instant is NOT zero polynomial.
-     */
-    public fun P.isNotZero(): Boolean = !isZero()
-    /**
-     * Check if the instant is unit polynomial.
-     */
-    public fun P.isOne(): Boolean = this equalsTo polynomialOne
-    /**
-     * Check if the instant is NOT unit polynomial.
-     */
-    public fun P.isNotOne(): Boolean = !isOne()
-    /**
-     * Check if the instant is minus unit polynomial.
-     */
-    public fun P.isMinusOne(): Boolean = this equalsTo -polynomialOne
-    /**
-     * Check if the instant is NOT minus unit polynomial.
-     */
-    public fun P.isNotMinusOne(): Boolean = !isMinusOne()
-
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
      */
@@ -354,15 +304,6 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      */
     public val polynomialOne: P
 
-    /**
-     * Checks equality of the polynomials.
-     */
-    public infix fun P.equalsTo(other: P): Boolean
-    /**
-     * Checks NOT equality of the polynomials.
-     */
-    public infix fun P.notEqualsTo(other: P): Boolean = !(this equalsTo other)
-
     /**
      * Returns sum of the constant represented as rational function and the rational function.
      */
@@ -478,31 +419,6 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      */
     public override fun power(arg: R, exponent: UInt) : R = exponentiationBySquaring(arg, exponent)
 
-    /**
-     * Check if the instant is zero rational function.
-     */
-    public fun R.isZero(): Boolean = numerator equalsTo polynomialZero
-    /**
-     * Check if the instant is NOT zero rational function.
-     */
-    public fun R.isNotZero(): Boolean = !isZero()
-    /**
-     * Check if the instant is unit rational function.
-     */
-    public fun R.isOne(): Boolean = numerator equalsTo denominator
-    /**
-     * Check if the instant is NOT unit rational function.
-     */
-    public fun R.isNotOne(): Boolean = !isOne()
-    /**
-     * Check if the instant is minus unit rational function.
-     */
-    public fun R.isMinusOne(): Boolean = (numerator + denominator).isZero()
-    /**
-     * Check if the instant is NOT minus unit rational function.
-     */
-    public fun R.isNotMinusOne(): Boolean = !isMinusOne()
-
     /**
      * Instance of zero rational function (zero of the rational functions ring).
      */
@@ -512,54 +428,12 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      */
     public override val one: R
 
-    /**
-     * Checks equality of the rational functions.
-     */
-    public infix fun R.equalsTo(other: R): Boolean =
-        when {
-            this === other -> true
-            numerator.isZero() != other.numerator.isZero() -> false
-            numeratorDegree - denominatorDegree != with(other) { numeratorDegree - denominatorDegree } -> false
-            else -> numerator * other.denominator equalsTo other.numerator * denominator
-        }
-    /**
-     * Checks NOT equality of the polynomials.
-     */
-    public infix fun R.notEqualsTo(other: R): Boolean = !(this equalsTo other)
-
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
      */
     public val P.degree: Int
 
-    /**
-     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isConstant(): Boolean = degree <= 0
-    /**
-     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isNotConstant(): Boolean = !isConstant()
-    /**
-     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isNonZeroConstant(): Boolean = degree == 0
-    /**
-     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public fun P.isNotNonZeroConstant(): Boolean = !isNonZeroConstant()
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
-     */
-    public fun P.asConstantOrNull(): C?
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
-     */
-    public fun P.asConstant(): C = requireNotNull(asConstantOrNull()) { "Can not represent non-constant polynomial as a constant" }
-
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
@@ -813,31 +687,6 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
     @JvmName("constantPower")
     public override fun power(arg: C, exponent: UInt) : C = polynomialRing { power(arg, exponent) }
 
-    /**
-     * Check if the instant is zero constant.
-     */
-    public override fun C.isZero(): Boolean = polynomialRing { this@isZero.isZero() }
-    /**
-     * Check if the instant is NOT zero constant.
-     */
-    public override fun C.isNotZero(): Boolean = polynomialRing { this@isNotZero.isNotZero() }
-    /**
-     * Check if the instant is unit constant.
-     */
-    public override fun C.isOne(): Boolean = polynomialRing { this@isOne.isOne() }
-    /**
-     * Check if the instant is NOT unit constant.
-     */
-    public override fun C.isNotOne(): Boolean = polynomialRing { this@isNotOne.isNotOne() }
-    /**
-     * Check if the instant is minus unit constant.
-     */
-    public override fun C.isMinusOne(): Boolean = polynomialRing { this@isMinusOne.isMinusOne() }
-    /**
-     * Check if the instant is NOT minus unit constant.
-     */
-    public override fun C.isNotMinusOne(): Boolean = polynomialRing { this@isNotMinusOne.isNotMinusOne() }
-
     /**
      * Instance of zero constant (zero of the underlying ring).
      */
@@ -907,31 +756,6 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
      */
     public override fun power(arg: P, exponent: UInt) : P = polynomialRing { power(arg, exponent) }
 
-    /**
-     * Check if the instant is zero polynomial.
-     */
-    public override fun P.isZero(): Boolean = polynomialRing { this@isZero.isZero() }
-    /**
-     * Check if the instant is NOT zero polynomial.
-     */
-    public override fun P.isNotZero(): Boolean = polynomialRing { this@isNotZero.isNotZero() }
-    /**
-     * Check if the instant is unit polynomial.
-     */
-    public override fun P.isOne(): Boolean = polynomialRing { this@isOne.isOne() }
-    /**
-     * Check if the instant is NOT unit polynomial.
-     */
-    public override fun P.isNotOne(): Boolean = polynomialRing { this@isNotOne.isNotOne() }
-    /**
-     * Check if the instant is minus unit polynomial.
-     */
-    public override fun P.isMinusOne(): Boolean = polynomialRing { this@isMinusOne.isMinusOne() }
-    /**
-     * Check if the instant is NOT minus unit polynomial.
-     */
-    public override fun P.isNotMinusOne(): Boolean = polynomialRing { this@isNotMinusOne.isNotMinusOne() }
-
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
      */
@@ -941,47 +765,11 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
      */
     public override val polynomialOne: P get() = polynomialRing.one
 
-    /**
-     * Checks equality of the polynomials.
-     */
-    public override infix fun P.equalsTo(other: P): Boolean = polynomialRing { this@equalsTo equalsTo other }
-    /**
-     * Checks NOT equality of the polynomials.
-     */
-    public override infix fun P.notEqualsTo(other: P): Boolean = polynomialRing { this@notEqualsTo notEqualsTo other }
-
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
      */
     public override val P.degree: Int get() = polynomialRing { this@degree.degree }
-
-    /**
-     * Checks if the instant is constant polynomial (of degree no more than 0) over considered ring.
-     */
-    public override fun P.isConstant(): Boolean = polynomialRing { this@isConstant.isConstant() }
-    /**
-     * Checks if the instant is **not** constant polynomial (of degree no more than 0) over considered ring.
-     */
-    public override fun P.isNotConstant(): Boolean = polynomialRing { this@isNotConstant.isNotConstant() }
-    /**
-     * Checks if the instant is constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public override fun P.isNonZeroConstant(): Boolean = polynomialRing { this@isNonZeroConstant.isNonZeroConstant() }
-    /**
-     * Checks if the instant is **not** constant non-zero polynomial (of degree no more than 0) over considered ring.
-     */
-    public override fun P.isNotNonZeroConstant(): Boolean = polynomialRing { this@isNotNonZeroConstant.isNotNonZeroConstant() }
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) returns `null`.
-     */
-    public override fun P.asConstantOrNull(): C? = polynomialRing { this@asConstantOrNull.asConstantOrNull() }
-    /**
-     * If polynomial is a constant polynomial represents and returns it as constant.
-     * Otherwise, (when the polynomial is not constant polynomial) raises corresponding exception.
-     */
-    public override fun P.asConstant(): C = polynomialRing { this@asConstant.asConstant() }
 }
 
 /**
@@ -1032,18 +820,11 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
 
-    public override operator fun R.div(other: Int): R {
-        val otherAsConstant = constantNumber(other)
-        require(otherAsConstant.isNotZero()) { "/ by zero." }
-        return constructRationalFunction(
+    public override operator fun R.div(other: Int): R =
+        constructRationalFunction(
             numerator,
-            (denominator * other).also {
-                check(it.isNotZero()) {
-                    "Got zero denominator during division of rational functions to constant. It means underlying ring of polynomials is not integral domain."
-                }
-            }
+            denominator * other
         )
-    }
 
     /**
      * Returns sum of the integer represented as rational function and the rational function.
@@ -1076,13 +857,11 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
 
-    public override operator fun Int.div(other: R): R {
-        require(other.numerator.isNotZero()) { "/ by zero." }
-        return constructRationalFunction(
+    public override operator fun Int.div(other: R): R =
+        constructRationalFunction(
             this * other.denominator,
             other.numerator
         )
-    }
 
     /**
      * Converts the integer [value] to rational function.
@@ -1119,13 +898,11 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
 
-    public override operator fun C.div(other: R): R {
-        require(other.numerator.isNotZero()) { "/ by zero." }
-        return constructRationalFunction(
+    public override operator fun C.div(other: R): R =
+        constructRationalFunction(
             this * other.denominator,
             other.numerator
         )
-    }
 
     /**
      * Returns sum of the constant represented as rational function and the rational function.
@@ -1152,17 +929,11 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
 
-    public override operator fun R.div(other: C): R {
-        require(other.isNotZero()) { "/ by zero." }
-        return constructRationalFunction(
+    public override operator fun R.div(other: C): R =
+        constructRationalFunction(
             numerator,
-            (denominator * other).also {
-                check(it.isNotZero()) {
-                    "Got zero denominator during division of rational functions to constant. It means underlying ring of polynomials is not integral domain."
-                }
-            }
+            denominator * other
         )
-    }
 
     /**
      * Converts the constant [value] to rational function.
@@ -1194,13 +965,11 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
 
-    public override operator fun P.div(other: R): R {
-        require(other.numerator.isNotZero()) { "/ by zero." }
-        return constructRationalFunction(
+    public override operator fun P.div(other: R): R =
+        constructRationalFunction(
             this * other.denominator,
             other.numerator
         )
-    }
 
     /**
      * Returns sum of the polynomial represented as rational function and the rational function.
@@ -1227,17 +996,11 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
 
-    public override operator fun R.div(other: P): R {
-        require(other.isNotZero()) { "/ by zero." }
-        return constructRationalFunction(
+    public override operator fun R.div(other: P): R =
+        constructRationalFunction(
             numerator,
-            (denominator * other).also {
-                require(it.isNotZero()) {
-                    "Got zero denominator during division of rational functions to polynomial. It means underlying ring of polynomials is not integral domain."
-                }
-            }
+            denominator * other
         )
-    }
 
     /**
      * Converts the polynomial [value] to rational function.
@@ -1254,11 +1017,7 @@ public abstract class PolynomialSpaceOfFractions<
     public override operator fun R.plus(other: R): R =
         constructRationalFunction(
             numerator * other.denominator + denominator * other.numerator,
-            (denominator * other.denominator).also {
-                check(it.isNotZero()) {
-                    "Got zero denominator during addition of rational functions. It means underlying ring of polynomials is not integral domain."
-                }
-            }
+            denominator * other.denominator
         )
     /**
      * Returns difference of the rational functions.
@@ -1266,11 +1025,7 @@ public abstract class PolynomialSpaceOfFractions<
     public override operator fun R.minus(other: R): R =
         constructRationalFunction(
             numerator * other.denominator - denominator * other.numerator,
-            (denominator * other.denominator).also {
-                check(it.isNotZero()) {
-                    "Got zero denominator during subtraction of rational functions. It means underlying ring of polynomials is not integral domain."
-                }
-            }
+            denominator * other.denominator
         )
     /**
      * Returns product of the rational functions.
@@ -1278,24 +1033,14 @@ public abstract class PolynomialSpaceOfFractions<
     public override operator fun R.times(other: R): R =
         constructRationalFunction(
             numerator * other.numerator,
-            (denominator * other.denominator).also {
-                check(it.isNotZero()) {
-                    "Got zero denominator during multiplication of rational functions. It means underlying ring of polynomials is not integral domain."
-                }
-            }
+            denominator * other.denominator
         )
 
-    public override operator fun R.div(other: R): R {
-        require(other.isNotZero()) { "/ by zero." }
-        return constructRationalFunction(
+    public override operator fun R.div(other: R): R =
+        constructRationalFunction(
             numerator * other.denominator,
-            (denominator * other.numerator).also {
-                check(it.isNotZero()) {
-                    "Got zero denominator during division of rational functions. It means underlying ring of polynomials is not integral domain."
-                }
-            }
+            denominator * other.numerator
         )
-    }
 
     /**
      * Instance of zero rational function (zero of the rational functions ring).
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
index 35155d09d..50313cab9 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
@@ -121,9 +121,9 @@ public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
 public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListPolynomial<C> = ring {
     if (coefficients.isEmpty()) return ListPolynomial(emptyList())
 
-    val thisDegree = coefficients.indexOfLast { it != zero }
+    val thisDegree = coefficients.lastIndex
     if (thisDegree == -1) return ListPolynomial(emptyList())
-    val argDegree = arg.coefficients.indexOfLast { it != zero }
+    val argDegree = arg.coefficients.lastIndex
     if (argDegree == -1) return coefficients[0].asListPolynomial()
     val constantZero = zero
     val resultCoefs: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
@@ -144,7 +144,6 @@ public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C
         resultDegree += argDegree
     }
 
-    with(resultCoefs) { while (isNotEmpty() && elementAt(lastIndex) == constantZero) removeAt(lastIndex) }
     return ListPolynomial<C>(resultCoefs)
 }
 
@@ -168,7 +167,6 @@ public fun <C, A> ListPolynomial<C>.derivative(
     ListPolynomial(
         buildList(max(0, coefficients.size - 1)) {
             for (deg in 1 .. coefficients.lastIndex) add(number(deg) * coefficients[deg])
-            while (isNotEmpty() && elementAt(lastIndex) == algebra.zero) removeAt(lastIndex)
         }
     )
 }
@@ -186,7 +184,6 @@ public fun <C, A> ListPolynomial<C>.nthDerivative(
         buildList(max(0, coefficients.size - order)) {
             for (deg in order.. coefficients.lastIndex)
                 add((deg - order + 1 .. deg).fold(coefficients[deg]) { acc, d -> acc * number(d) })
-            while (isNotEmpty() && elementAt(lastIndex) == algebra.zero) removeAt(lastIndex)
         }
     )
 }
@@ -202,7 +199,6 @@ public fun <C, A> ListPolynomial<C>.antiderivative(
         buildList(coefficients.size + 1) {
             add(zero)
             coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
-            while (isNotEmpty() && elementAt(lastIndex) == algebra.zero) removeAt(lastIndex)
         }
     )
 }
@@ -220,7 +216,6 @@ public fun <C, A> ListPolynomial<C>.nthAntiderivative(
         buildList(coefficients.size + order) {
             repeat(order) { add(zero) }
             coefficients.mapIndexedTo(this) { index, c -> (1..order).fold(c) { acc, i -> acc / number(index + i) } }
-            while (isNotEmpty() && elementAt(lastIndex) == algebra.zero) removeAt(lastIndex)
         }
     )
 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt
index 151c7bb8d..367212588 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt
@@ -55,11 +55,11 @@ public fun <C> ListRationalFunction<C>.substitute(ring: Field<C>, arg: C): C = r
 internal fun <C> ListPolynomial<C>.substituteRationalFunctionTakeNumerator(ring: Ring<C>, arg: ListRationalFunction<C>): ListPolynomial<C> = ring {
     if (coefficients.isEmpty()) return ListPolynomial(emptyList())
 
-    val thisDegree = coefficients.indexOfLast { it != zero }
+    val thisDegree = coefficients.lastIndex
     if (thisDegree == -1) return ListPolynomial(emptyList())
     val thisDegreeLog2 = 31 - thisDegree.countLeadingZeroBits()
-    val numeratorDegree = arg.numerator.coefficients.indexOfLast { it != zero }
-    val denominatorDegree = arg.denominator.coefficients.indexOfLast { it != zero }
+    val numeratorDegree = arg.numerator.coefficients.lastIndex
+    val denominatorDegree = arg.denominator.coefficients.lastIndex
     val argDegree = max(numeratorDegree, denominatorDegree)
     val constantZero = zero
     val powersOf2 = buildList<Int>(thisDegreeLog2 + 1) {
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
index 0d2c4b5fc..ac2647592 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
@@ -9,7 +9,7 @@ import space.kscience.kmath.test.misc.*
 import kotlin.test.*
 
 
-class ListPolynomialTest {
+class ListPolynomialTest { // TODO: Adapt tests to changes
     @Test
     fun test_Polynomial_Int_plus() {
         RationalField.listPolynomial {
@@ -489,94 +489,6 @@ class ListPolynomialTest {
         }
     }
     @Test
-    fun test_Polynomial_isZero() {
-        RationalField.listPolynomial {
-            assertTrue("test 1") { ListPolynomial<Rational>().isZero() }
-            assertTrue("test 2") { ListPolynomial<Rational>(Rational(0)).isZero() }
-            assertTrue("test 3") { ListPolynomial<Rational>(Rational(0), Rational(0)).isZero() }
-            assertTrue("test 4") { ListPolynomial<Rational>(Rational(0), Rational(0), Rational(0))
-                .isZero() }
-            assertFalse("test 5") { ListPolynomial<Rational>(Rational(3, 5)).isZero() }
-            assertFalse("test 6") { ListPolynomial<Rational>(Rational(3, 5), Rational(0))
-                .isZero() }
-            assertFalse("test 7") { ListPolynomial<Rational>(Rational(0), Rational(3, 5), Rational(0))
-                .isZero() }
-        }
-    }
-    @Test
-    fun test_Polynomial_isOne() {
-        RationalField.listPolynomial {
-            assertFalse("test 1") { ListPolynomial<Rational>().isOne() }
-            assertFalse("test 2") { ListPolynomial(Rational(0)).isOne() }
-            assertFalse("test 3") { ListPolynomial(Rational(0), Rational(0)).isOne() }
-            assertFalse("test 4") { ListPolynomial(Rational(0), Rational(0), Rational(0))
-                .isOne() }
-            assertFalse("test 5") { ListPolynomial(Rational(3, 5)).isOne() }
-            assertTrue("test 6") { ListPolynomial(Rational(5, 5)).isOne() }
-            assertFalse("test 7") { ListPolynomial(Rational(3, 5), Rational(0)).isOne() }
-            assertTrue("test 8") { ListPolynomial(Rational(3, 3), Rational(0)).isOne() }
-            assertFalse("test 9") { ListPolynomial(Rational(0), Rational(3, 5), Rational(0))
-                .isOne() }
-            assertFalse("test 10") { ListPolynomial(Rational(0), Rational(5, 5), Rational(0))
-                .isOne() }
-            assertFalse("test 11") { ListPolynomial(Rational(1), Rational(3, 5), Rational(0))
-                .isOne() }
-            assertFalse("test 12") { ListPolynomial(Rational(1), Rational(5, 5), Rational(0))
-                .isOne() }
-        }
-    }
-    @Test
-    fun test_Polynomial_isMinusOne() {
-        RationalField.listPolynomial {
-            assertFalse("test 1") { ListPolynomial<Rational>().isMinusOne() }
-            assertFalse("test 2") { ListPolynomial(Rational(0)).isMinusOne() }
-            assertFalse("test 3") { ListPolynomial(Rational(0), Rational(0)).isMinusOne() }
-            assertFalse("test 4") { ListPolynomial(Rational(0), Rational(0), Rational(0))
-                .isMinusOne() }
-            assertFalse("test 5") { ListPolynomial(Rational(3, 5)).isMinusOne() }
-            assertTrue("test 6") { ListPolynomial(Rational(-5, 5)).isMinusOne() }
-            assertFalse("test 7") { ListPolynomial(Rational(3, 5), Rational(0)).isMinusOne() }
-            assertTrue("test 8") { ListPolynomial(Rational(-3, 3), Rational(0)).isMinusOne() }
-            assertFalse("test 9") { ListPolynomial(Rational(0), Rational(3, 5), Rational(0))
-                .isMinusOne() }
-            assertFalse("test 10") { ListPolynomial(Rational(0), Rational(5, -5), Rational(0))
-                .isMinusOne() }
-            assertFalse("test 11") { ListPolynomial(Rational(-1), Rational(3, 5), Rational(0))
-                .isMinusOne() }
-            assertFalse("test 12") { ListPolynomial(Rational(-1), Rational(5, -5), Rational(0))
-                .isMinusOne() }
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_equalsTo() {
-        RationalField.listPolynomial {
-            assertTrue("test 1") {
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) equalsTo
-                        ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7))
-            }
-            assertTrue("test 2") {
-                ListPolynomial(Rational(5, 9), Rational(0), Rational(-8, 7)) equalsTo
-                        ListPolynomial(Rational(5, 9), Rational(0), Rational(-8, 7))
-            }
-            assertTrue("test 3") {
-                ListPolynomial(Rational(0), Rational(0), Rational(-8, 7), Rational(0), Rational(0)) equalsTo
-                        ListPolynomial(Rational(0), Rational(0), Rational(-8, 7))
-            }
-            assertFalse("test 4") {
-                ListPolynomial(Rational(5, 9), Rational(5, 7), Rational(-8, 7)) equalsTo
-                        ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7))
-            }
-            assertFalse("test 5") {
-                ListPolynomial(Rational(8, 3), Rational(0), Rational(-8, 7)) equalsTo
-                        ListPolynomial(Rational(5, 9), Rational(0), Rational(-8, 7))
-            }
-            assertFalse("test 6") {
-                ListPolynomial(Rational(0), Rational(0), Rational(-8, 7), Rational(0), Rational(0)) equalsTo
-                        ListPolynomial(Rational(0), Rational(0), Rational(8, 7))
-            }
-        }
-    }
-    @Test
     fun test_Polynomial_degree() {
         RationalField.listPolynomial {
             assertEquals(
@@ -636,70 +548,4 @@ class ListPolynomialTest {
             )
         }
     }
-    @Test
-    fun test_Polynomial_asConstantOrNull() {
-        RationalField.listPolynomial {
-            assertEquals(
-                Rational(0),
-                ListPolynomial<Rational>().asConstantOrNull(),
-                "test 1"
-            )
-            assertEquals(
-                Rational(0),
-                ListPolynomial(Rational(0)).asConstantOrNull(),
-                "test 2"
-            )
-            assertEquals(
-                Rational(0),
-                ListPolynomial(Rational(0), Rational(0)).asConstantOrNull(),
-                "test 3"
-            )
-            assertEquals(
-                Rational(0),
-                ListPolynomial(Rational(0), Rational(0), Rational(0)).asConstantOrNull(),
-                "test 4"
-            )
-            assertEquals(
-                Rational(-7, 9),
-                ListPolynomial(Rational(-7, 9)).asConstantOrNull(),
-                "test 5"
-            )
-            assertEquals(
-                Rational(-7, 9),
-                ListPolynomial(Rational(-7, 9), Rational(0)).asConstantOrNull(),
-                "test 6"
-            )
-            assertEquals(
-                Rational(-7, 9),
-                ListPolynomial(Rational(-7, 9), Rational(0), Rational(0)).asConstantOrNull(),
-                "test 7"
-            )
-            assertEquals(
-                null,
-                ListPolynomial(Rational(0), Rational(-7, 9)).asConstantOrNull(),
-                "test 8"
-            )
-            assertEquals(
-                null,
-                ListPolynomial(Rational(0), Rational(-7, 9), Rational(0)).asConstantOrNull(),
-                "test 9"
-            )
-            assertEquals(
-                null,
-                ListPolynomial(Rational(0), Rational(0), Rational(-7, 9)).asConstantOrNull(),
-                "test 10"
-            )
-            assertEquals(
-                null,
-                ListPolynomial(Rational(4, 15), Rational(0), Rational(-7, 9)).asConstantOrNull(),
-                "test 11"
-            )
-            assertEquals(
-                null,
-                ListPolynomial(Rational(4, 15), Rational(0), Rational(-7, 9), Rational(0))
-                    .asConstantOrNull(),
-                "test 12"
-            )
-        }
-    }
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
index 50ae18260..c4f07d957 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -12,7 +12,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
 
-class ListPolynomialUtilTest {
+class ListPolynomialUtilTest { // TODO: Adapt tests to changes
     @Test
     fun test_substitute_Double() {
         assertEquals(
-- 
2.34.1


From 7e328a5dbf936256a4612f582b5802b3d8e5a9aa Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 25 Mar 2022 00:59:48 +0300
Subject: [PATCH 477/713] Enhanced DSL constructor a bit.

---
 .../space/kscience/kmath/functions/NumberedPolynomial.kt      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 51f316c5d..f931e8e7e 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -157,7 +157,8 @@ public class NumberedPolynomialTermSignatureBuilder {
             signature[this] = deg
         }
     }
-    public infix fun Int.to(deg: UInt): Unit = this inPowerOf deg
+    public infix fun Int.pow(deg: UInt): Unit = this inPowerOf deg
+    public infix fun Int.of(deg: UInt): Unit = this inPowerOf deg
 }
 
 @NumberedPolynomialConstructorDSL
@@ -168,6 +169,7 @@ public class NumberedPolynomialBuilderOverRing<C> internal constructor(internal
         val signature = NumberedPolynomialTermSignatureBuilder().apply(block).build()
         coefficients[signature] = context { coefficients.getOrElse(signature) { zero } + this@invoke }
     }
+    public infix fun C.with(block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
 }
 
 @NumberedPolynomialConstructorDSL
-- 
2.34.1


From f7286d33d27f9312f163106ef7f137cf594f1ff0 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 25 Mar 2022 17:18:56 +0300
Subject: [PATCH 478/713] Moved constructors to separate files. Replaced some
 TODOs with FIXMEs.

---
 .../kmath/functions/LabeledPolynomial.kt      |  96 ---------
 .../functions/LabeledRationalFunction.kt      |  33 ---
 .../kmath/functions/ListPolynomial.kt         |  18 --
 .../kmath/functions/ListRationalFunction.kt   |  33 ---
 .../kmath/functions/NumberedPolynomial.kt     | 148 +-------------
 .../functions/NumberedRationalFunction.kt     |  33 ---
 .../kmath/functions/RationalFunction.kt       |   9 +-
 .../kscience/kmath/functions/algebraicStub.kt |  16 +-
 .../kmath/functions/labeledConstructors.kt    | 147 ++++++++++++++
 .../kmath/functions/listConstructors.kt       |  60 ++++++
 .../kmath/functions/numberedConstructors.kt   | 188 ++++++++++++++++++
 .../kmath/functions/numberedPolynomialUtil.kt |  33 ---
 12 files changed, 408 insertions(+), 406 deletions(-)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 908e89534..b904f7331 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -8,10 +8,6 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.ScaleOperations
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.experimental.ExperimentalTypeInference
-import kotlin.jvm.JvmName
 import kotlin.math.max
 
 
@@ -49,98 +45,6 @@ internal constructor(
     override fun toString(): String = "LabeledPolynomial$coefficients"
 }
 
-/**
- * Returns the same degrees' description of the monomial, but without zero degrees.
- */
-internal fun Map<Symbol, UInt>.cleanUp() = filterValues { it > 0U }
-
-// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
-    if (!toCheckInput) return LabeledPolynomial<C>(coefs)
-
-    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
-
-    for (entry in coefs) {
-        val key = entry.key.cleanUp()
-        val value = entry.value
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
-    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
-    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-
-//context(A)
-//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to one))
-//context(LabeledPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
-
-public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this))
-
 /**
  * Space of polynomials.
  *
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index 0f46520dc..76c6874f5 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -17,39 +17,6 @@ public class LabeledRationalFunction<C>(
     override fun toString(): String = "LabeledRationalFunction${numerator.coefficients}/${denominator.coefficients}"
 }
 
-// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        LabeledPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        LabeledPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(numerator, polynomialOne)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(numerator, LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one), toCheckInput = false))
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        polynomialOne
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one), toCheckInput = false)
-    )
-
 public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
     public val ring: A,
 ) :
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index 711d2bb49..585da95ea 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -50,24 +50,6 @@ public data class ListPolynomial<C>(
     override fun toString(): String = "Polynomial$coefficients"
 }
 
-/**
- * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
- * [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false): ListPolynomial<C> =
-    ListPolynomial(with(coefficients) { if (reverse) reversed() else this })
-
-/**
- * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
- * [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C> ListPolynomial(vararg coefficients: C, reverse: Boolean = false): ListPolynomial<C> =
-    ListPolynomial(with(coefficients) { if (reverse) reversed() else toList() })
-
-public fun <C> C.asListPolynomial() : ListPolynomial<C> = ListPolynomial(listOf(this))
-
 /**
  * Space of univariate polynomials constructed over ring.
  *
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
index f62d1857f..7b6c23ac3 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
@@ -15,39 +15,6 @@ public data class ListRationalFunction<C>(
     override fun toString(): String = "RationalFunction${numerator.coefficients}/${denominator.coefficients}"
 }
 
-// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
-    ListRationalFunction<C>(numerator, polynomialOne)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
-    ListRationalFunction<C>(numerator, ListPolynomial(listOf(one)))
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        polynomialOne
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        ListPolynomial(listOf(one))
-    )
-
 public class ListRationalFunctionSpace<C, A : Ring<C>> (
     public val ring: A,
 ) :
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index f931e8e7e..e75373819 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -49,152 +49,6 @@ internal constructor(
     override fun toString(): String = "NumberedPolynomial$coefficients"
 }
 
-/**
- * Returns the same degrees' description of the monomial, but without extra zero degrees on the end.
- */
-internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
-
-// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
-    if (!toCheckInput) return NumberedPolynomial<C>(coefs)
-
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in coefs) {
-        val key = entry.key.cleanUp()
-        val value = entry.value
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
-    if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
-    if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
-
-//context(A)
-//public fun <C, A: Ring<C>> Symbol.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(mapOf(this to 1u) to one))
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> Symbol.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
-
-//context(A)
-//public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
-
-@DslMarker
-internal annotation class NumberedPolynomialConstructorDSL
-
-@NumberedPolynomialConstructorDSL
-public class NumberedPolynomialTermSignatureBuilder {
-    private val signature: MutableList<UInt> = ArrayList()
-    public fun build(): List<UInt> = signature
-    public infix fun Int.inPowerOf(deg: UInt) {
-        if (this > signature.lastIndex) {
-            signature.addAll(List(this - signature.lastIndex - 1) { 0u })
-            signature.add(deg)
-        } else {
-            signature[this] = deg
-        }
-    }
-    public infix fun Int.pow(deg: UInt): Unit = this inPowerOf deg
-    public infix fun Int.of(deg: UInt): Unit = this inPowerOf deg
-}
-
-@NumberedPolynomialConstructorDSL
-public class NumberedPolynomialBuilderOverRing<C> internal constructor(internal val context: Ring<C>, capacity: Int = 0) {
-    private val coefficients: MutableMap<List<UInt>, C> = LinkedHashMap(capacity)
-    public fun build(): NumberedPolynomial<C> = NumberedPolynomial<C>(coefficients)
-    public operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit) {
-        val signature = NumberedPolynomialTermSignatureBuilder().apply(block).build()
-        coefficients[signature] = context { coefficients.getOrElse(signature) { zero } + this@invoke }
-    }
-    public infix fun C.with(block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
-}
-
-@NumberedPolynomialConstructorDSL
-public class NumberedPolynomialBuilderOverPolynomialSpace<C> internal constructor(internal val context: NumberedPolynomialSpace<C, *>, capacity: Int = 0) {
-    private val coefficients: MutableMap<List<UInt>, C> = LinkedHashMap(capacity)
-    public fun build(): NumberedPolynomial<C> = NumberedPolynomial<C>(coefficients)
-    public operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit) {
-        val signature = NumberedPolynomialTermSignatureBuilder().apply(block).build()
-        coefficients[signature] = context { coefficients.getOrElse(signature) { constantZero } + this@invoke }
-    }
-}
-
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(block: NumberedPolynomialBuilderOverRing<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverRing(this).apply(block).build()
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilderOverRing<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverRing(this, capacity).apply(block).build()
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(block: NumberedPolynomialBuilderOverPolynomialSpace<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverPolynomialSpace(this).apply(block).build()
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilderOverPolynomialSpace<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverPolynomialSpace(this, capacity).apply(block).build()
-
 /**
  * Space of polynomials.
  *
@@ -530,6 +384,6 @@ public open class NumberedPolynomialSpace<C, A : Ring<C>>(
     @JvmName("invokePolynomial")
     public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
 
-    // TODO: Move to other constructors with context receiver
+    // FIXME: Move to other constructors with context receiver
     public fun C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index b4d9f1d91..30c7f0188 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -17,39 +17,6 @@ public class NumberedRationalFunction<C> internal constructor(
     override fun toString(): String = "NumberedRationalFunction${numerator.coefficients}/${denominator.coefficients}"
 }
 
-// Waiting for context receivers :( TODO: Replace with context receivers when they will be available
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        NumberedPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        NumberedPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(numerator, polynomialOne)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(numerator, NumberedPolynomial(mapOf(emptyList<UInt>() to one), toCheckInput = false))
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        polynomialOne
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        NumberedPolynomial(mapOf(emptyList<UInt>() to one), toCheckInput = false)
-    )
-
 public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
     public val ring: A,
 ) :
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 374f4a936..eede543ee 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -27,7 +27,7 @@ public interface RationalFunction<C, P: Polynomial<C>> {
  * @param C the type of constants. Polynomials have them as coefficients in their terms.
  * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
  * @param R the type of rational functions.
- */ // TODO: Add support of field
+ */
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
 public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunction<C, P>> : Ring<R> {
     /**
@@ -457,7 +457,7 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
  * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
  * @param R the type of rational functions.
  * @param A the type of algebraic structure (precisely, of ring) provided for constants.
- */ // TODO: Add support of field
+ */
 @Suppress("INAPPLICABLE_JVM_NAME")
 public interface RationalFunctionalSpaceOverRing<C, P: Polynomial<C>, R: RationalFunction<C, P>, A: Ring<C>> : RationalFunctionalSpace<C, P, R> {
 
@@ -551,7 +551,7 @@ public interface RationalFunctionalSpaceOverRing<C, P: Polynomial<C>, R: Rationa
  * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
  * @param R the type of rational functions.
  * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
- */ // TODO: Add support of field
+ */
 @Suppress("INAPPLICABLE_JVM_NAME")
 public interface RationalFunctionalSpaceOverPolynomialSpace<
         C,
@@ -779,8 +779,7 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
  * @param C the type of constants. Polynomials have them as coefficients in their terms.
  * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
  * @param R the type of rational functions.
- * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
- */ // TODO: Add support of field
+ */
 @Suppress("INAPPLICABLE_JVM_NAME")
 public abstract class PolynomialSpaceOfFractions<
         C,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
index ca93e4259..fa97d6a6c 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
@@ -9,7 +9,7 @@ import space.kscience.kmath.operations.*
 
 
 // TODO: All of this should be moved to algebraic structures' place for utilities
-// TODO: Move receiver to context receiver
+// FIXME: Move receiver to context receiver
 /**
  * Returns product of [arg] and integer [multiplier].
  *
@@ -22,7 +22,7 @@ internal fun <C> Group<C>.multiplyBySquaring(arg: C, multiplier: Int): C =
     if (multiplier >= 0) multiplyBySquaring(arg, multiplier.toUInt())
     else multiplyBySquaring(-arg, (-multiplier).toUInt())
 
-// TODO: Move receiver to context receiver
+// FIXME: Move receiver to context receiver
 /**
  * Adds product of [arg] and [multiplier] to [base].
  *
@@ -36,7 +36,7 @@ internal fun <C> GroupOps<C>.addMultipliedBySquaring(base: C, arg: C, multiplier
     if (multiplier >= 0) addMultipliedBySquaring(base, arg, multiplier.toUInt())
     else addMultipliedBySquaring(base, -arg, (-multiplier).toUInt())
 
-// TODO: Move receiver to context receiver
+// FIXME: Move receiver to context receiver
 /**
  * Returns product of [arg] and integer [multiplier].
  *
@@ -56,7 +56,7 @@ internal tailrec fun <C> Group<C>.multiplyBySquaring(arg: C, multiplier: UInt):
         else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
     }
 
-// TODO: Move receiver to context receiver
+// FIXME: Move receiver to context receiver
 /**
  * Adds product of [arg] and [multiplier] to [base].
  *
@@ -77,7 +77,7 @@ internal tailrec fun <C> GroupOps<C>.addMultipliedBySquaring(base: C, arg: C, mu
         else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
     }
 
-// TODO: Move receiver to context receiver
+// FIXME: Move receiver to context receiver
 /**
  * Raises [arg] to the integer power [exponent].
  *
@@ -90,7 +90,7 @@ internal fun <C> Field<C>.exponentiationBySquaring(arg: C, exponent: Int): C =
     if (exponent >= 0) exponentiationBySquaring(arg, exponent.toUInt())
     else exponentiationBySquaring(one / arg, (-exponent).toUInt())
 
-// TODO: Move receiver to context receiver
+// FIXME: Move receiver to context receiver
 /**
  * Multiplies [base] and [arg] raised to the integer power [exponent].
  *
@@ -104,7 +104,7 @@ internal fun <C> Field<C>.multiplyExponentiationBySquaring(base: C, arg: C, expo
     if (exponent >= 0) multiplyExponentiationBySquaring(base, arg, exponent.toUInt())
     else multiplyExponentiationBySquaring(base, one / arg, (-exponent).toUInt())
 
-// TODO: Move receiver to context receiver
+// FIXME: Move receiver to context receiver
 /**
  * Raises [arg] to the integer power [exponent].
  *
@@ -124,7 +124,7 @@ internal tailrec fun <C> Ring<C>.exponentiationBySquaring(arg: C, exponent: UInt
         else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
     }
 
-// TODO: Move receiver to context receiver
+// FIXME: Move receiver to context receiver
 /**
  * Multiplies [base] and [arg] raised to the integer power [exponent].
  *
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
new file mode 100644
index 000000000..12688a865
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.operations.Ring
+
+
+/**
+ * Returns the same degrees' description of the monomial, but without zero degrees.
+ */
+internal fun Map<Symbol, UInt>.cleanUp() = filterValues { it > 0U }
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(coefs, toCheckInput)
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(coefs, toCheckInput)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
+    if (!toCheckInput) return LabeledPolynomial<C>(coefs)
+
+    val fixedCoefs = LinkedHashMap<Map<Symbol, UInt>, C>(coefs.size)
+
+    for (entry in coefs) {
+        val key = entry.key.cleanUp()
+        val value = entry.value
+        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+    }
+
+    return LabeledPolynomial<C>(fixedCoefs)
+}
+
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs, toCheckInput)
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs, toCheckInput)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
+    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
+
+    val fixedCoefs = LinkedHashMap<Map<Symbol, UInt>, C>(pairs.size)
+
+    for (entry in pairs) {
+        val key = entry.first.cleanUp()
+        val value = entry.second
+        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+    }
+
+    return LabeledPolynomial<C>(fixedCoefs)
+}
+
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs = pairs, toCheckInput = toCheckInput)
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs = pairs, toCheckInput = toCheckInput)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
+    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
+
+    val fixedCoefs = LinkedHashMap<Map<Symbol, UInt>, C>(pairs.size)
+
+    for (entry in pairs) {
+        val key = entry.first.cleanUp()
+        val value = entry.second
+        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+    }
+
+    return LabeledPolynomial<C>(fixedCoefs)
+}
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
+
+//context(A)
+//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to one))
+//context(LabeledPolynomialSpace<C, A>)
+//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
+//context(LabeledRationalFunctionSpace<C, A>)
+//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
+
+public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this))
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
+        LabeledPolynomial(denominatorCoefficients, toCheckInput = true)
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
+        LabeledPolynomial(denominatorCoefficients, toCheckInput = true)
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(numerator, polynomialOne)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(numerator, LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one), toCheckInput = false))
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
+        polynomialOne
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
+        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one), toCheckInput = false)
+    )
+
+//context(A)
+//public fun <C, A: Ring<C>> Symbol.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
+//context(LabeledRationalFunctionSpace<C, A>)
+//public fun <C, A: Ring<C>> Symbol.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
+
+//context(A)
+//public fun <C, A: Ring<C>> C.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
+//context(LabeledRationalFunctionSpace<C, A>)
+//public fun <C, A: Ring<C>> C.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
new file mode 100644
index 000000000..9498c77ca
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.Ring
+
+
+/**
+ * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
+ * [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false): ListPolynomial<C> =
+    ListPolynomial(with(coefficients) { if (reverse) reversed() else this })
+
+/**
+ * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
+ * [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C> ListPolynomial(vararg coefficients: C, reverse: Boolean = false): ListPolynomial<C> =
+    ListPolynomial(with(coefficients) { if (reverse) reversed() else toList() })
+
+public fun <C> C.asListPolynomial() : ListPolynomial<C> = ListPolynomial(listOf(this))
+
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+@Suppress("FunctionName")
+public fun <C> ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
+    ListRationalFunction<C>(numerator, polynomialOne)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
+    ListRationalFunction<C>(numerator, ListPolynomial(listOf(one)))
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        polynomialOne
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        ListPolynomial(listOf(one))
+    )
+
+//context(A)
+//public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
+//context(ListRationalFunctionSpace<C, A>)
+//public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
new file mode 100644
index 000000000..e4b79b0b2
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.invoke
+
+
+/**
+ * Returns the same degrees' description of the monomial, but without extra zero degrees on the end.
+ */
+internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(coefs, toCheckInput)
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(coefs, toCheckInput)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
+    if (!toCheckInput) return NumberedPolynomial<C>(coefs)
+
+    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+
+    for (entry in coefs) {
+        val key = entry.key.cleanUp()
+        val value = entry.value
+        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+    }
+
+    return NumberedPolynomial<C>(fixedCoefs)
+}
+
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs, toCheckInput)
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs, toCheckInput)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
+    if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
+
+    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+
+    for (entry in pairs) {
+        val key = entry.first.cleanUp()
+        val value = entry.second
+        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+    }
+
+    return NumberedPolynomial<C>(fixedCoefs)
+}
+
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs = pairs, toCheckInput = toCheckInput)
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs = pairs, toCheckInput = toCheckInput)
+@Suppress("FunctionName")
+internal fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
+    if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
+
+    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+
+    for (entry in pairs) {
+        val key = entry.first.cleanUp()
+        val value = entry.second
+        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
+    }
+
+    return NumberedPolynomial<C>(fixedCoefs)
+}
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
+
+public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
+
+@DslMarker
+internal annotation class NumberedPolynomialConstructorDSL
+
+@NumberedPolynomialConstructorDSL
+public class NumberedPolynomialTermSignatureBuilder {
+    private val signature: MutableList<UInt> = ArrayList()
+    public fun build(): List<UInt> = signature
+    public infix fun Int.inPowerOf(deg: UInt) {
+        if (this > signature.lastIndex) {
+            signature.addAll(List(this - signature.lastIndex - 1) { 0u })
+            signature.add(deg)
+        } else {
+            signature[this] = deg
+        }
+    }
+    public infix fun Int.pow(deg: UInt): Unit = this inPowerOf deg
+    public infix fun Int.of(deg: UInt): Unit = this inPowerOf deg
+}
+
+@NumberedPolynomialConstructorDSL
+public class NumberedPolynomialBuilderOverRing<C> internal constructor(internal val context: Ring<C>, capacity: Int = 0) {
+    private val coefficients: MutableMap<List<UInt>, C> = LinkedHashMap(capacity)
+    public fun build(): NumberedPolynomial<C> = NumberedPolynomial<C>(coefficients)
+    public operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit) {
+        val signature = NumberedPolynomialTermSignatureBuilder().apply(block).build()
+        coefficients[signature] = context { coefficients.getOrElse(signature) { zero } + this@invoke }
+    }
+    public infix fun C.with(block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
+}
+
+@NumberedPolynomialConstructorDSL
+public class NumberedPolynomialBuilderOverPolynomialSpace<C> internal constructor(internal val context: NumberedPolynomialSpace<C, *>, capacity: Int = 0) {
+    private val coefficients: MutableMap<List<UInt>, C> = LinkedHashMap(capacity)
+    public fun build(): NumberedPolynomial<C> = NumberedPolynomial<C>(coefficients)
+    public operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit) {
+        val signature = NumberedPolynomialTermSignatureBuilder().apply(block).build()
+        coefficients[signature] = context { coefficients.getOrElse(signature) { constantZero } + this@invoke }
+    }
+}
+
+@NumberedPolynomialConstructorDSL
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedPolynomial(block: NumberedPolynomialBuilderOverRing<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverRing(this).apply(block).build()
+@NumberedPolynomialConstructorDSL
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilderOverRing<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverRing(this, capacity).apply(block).build()
+@NumberedPolynomialConstructorDSL
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(block: NumberedPolynomialBuilderOverPolynomialSpace<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverPolynomialSpace(this).apply(block).build()
+@NumberedPolynomialConstructorDSL
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilderOverPolynomialSpace<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverPolynomialSpace(this, capacity).apply(block).build()
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
+        NumberedPolynomial(denominatorCoefficients, toCheckInput = true)
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
+        NumberedPolynomial(denominatorCoefficients, toCheckInput = true)
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(numerator, polynomialOne)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(numerator, NumberedPolynomial(mapOf(emptyList<UInt>() to one), toCheckInput = false))
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
+        polynomialOne
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
+        NumberedPolynomial(mapOf(emptyList<UInt>() to one), toCheckInput = false)
+    )
+
+//context(A)
+//public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> = NumberedRationalFunction(asLabeledPolynomial())
+//context(NumberedRationalFunctionSpace<C, A>)
+//public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> = NumberedRationalFunction(asLabeledPolynomial())
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
index d544ca93c..ee85b0f56 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
@@ -9,38 +9,6 @@ import kotlin.math.max
 
 // TODO: Docs
 
-//// TODO: Reuse underlying ring extensions
-//
-//context(NumberedPolynomialSpace<C, A>)
-//@Suppress("NOTHING_TO_INLINE")
-//public fun <C, A: Ring<C>> numberConstant(value: Int): C = ring { number<C>(value) }
-//
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> multiplyWithPower(base: C, arg: C, pow: UInt): C = ring { multiplyWithPower<C>(base, arg, pow) }
-
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> number(value: Int): NumberedPolynomial<C> = ring { NumberedPolynomial<C>(mapOf(emptyList<UInt>() to number<C>(value))) }
-//
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> multiplyWithPower(base: NumberedPolynomial<C>, arg: NumberedPolynomial<C>, pow: UInt): NumberedPolynomial<C> =
-//    when {
-//        arg.isZero() && pow > 0U -> base
-//        arg.isOne() -> base
-//        arg.isMinusOne() -> if (pow % 2U == 0U) base else -base
-//        else -> multiplyWithPowerInternalLogic(base, arg, pow)
-//    }
-//
-//// Trivial but very slow
-//context(NumberedPolynomialSpace<C, A>)
-//internal tailrec fun <C, A: Ring<C>> multiplyWithPowerInternalLogic(base: NumberedPolynomial<C>, arg: NumberedPolynomial<C>, exponent: UInt): NumberedPolynomial<C> =
-//    when {
-//        exponent == 0U -> base
-//        exponent == 1U -> base * arg
-//        exponent % 2U == 0U -> multiplyWithPowerInternalLogic(base, arg * arg, exponent / 2U)
-//        exponent % 2U == 1U -> multiplyWithPowerInternalLogic(base * arg, arg * arg, exponent / 2U)
-//        else -> error("Error in raising ring instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
-//    }
-
 /**
  * Creates a [NumberedPolynomialSpace] over a received ring.
  */
@@ -271,7 +239,6 @@ public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolyno
 //            toCheckInput = false
 //        )
 
-// TODO: May be apply Horner's method too?
 /**
  * Evaluates the value of the given double polynomial for given double argument.
  */
-- 
2.34.1


From b3087c245fc0da2631e9e53211e97dd47e1d1983 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 25 Mar 2022 17:46:13 +0300
Subject: [PATCH 479/713] Fixed tests.

---
 .../kmath/functions/ListPolynomialTest.kt     | 108 ++++--------------
 .../kmath/functions/ListPolynomialUtilTest.kt |  16 +--
 .../kscience/kmath/test/misc/IntModulo.kt     |   2 +-
 3 files changed, 33 insertions(+), 93 deletions(-)

diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
index ac2647592..5401be707 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
@@ -9,7 +9,7 @@ import space.kscience.kmath.test.misc.*
 import kotlin.test.*
 
 
-class ListPolynomialTest { // TODO: Adapt tests to changes
+class ListPolynomialTest {
     @Test
     fun test_Polynomial_Int_plus() {
         RationalField.listPolynomial {
@@ -24,7 +24,7 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
                 "test 2"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0)),
                 ListPolynomial(Rational(-2)) + 2,
                 "test 3"
             )
@@ -64,7 +64,7 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
                 "test 2"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0)),
                 ListPolynomial(Rational(2)) - 2,
                 "test 3"
             )
@@ -99,7 +99,7 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
                 "test 1"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(0, 0, 0, 0, 0),
                 ListPolynomial(7, 0, 49, 21, 14) * 15,
                 "test 2"
             )
@@ -119,7 +119,7 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
                 "test 2"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0)),
                 2 + ListPolynomial(Rational(-2)),
                 "test 3"
             )
@@ -159,7 +159,7 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
                 "test 2"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0)),
                 -2 - ListPolynomial(Rational(-2)),
                 "test 3"
             )
@@ -194,7 +194,7 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
                 "test 1"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(0, 0, 0, 0, 0),
                 15 * ListPolynomial(7, 0, 49, 21, 14),
                 "test 2"
             )
@@ -214,12 +214,12 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
                 "test 2"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0)),
                 ListPolynomial(Rational(-2)) + Rational(2),
                 "test 3"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0)),
                 ListPolynomial<Rational>() + Rational(0),
                 "test 4"
             )
@@ -254,12 +254,12 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
                 "test 2"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0)),
                 ListPolynomial(Rational(2)) - Rational(2),
                 "test 3"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0)),
                 ListPolynomial<Rational>() - Rational(0),
                 "test 4"
             )
@@ -285,12 +285,12 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
         IntModuloRing(35).listPolynomial {
             assertEquals(
                 ListPolynomial(34, 2, 1, 20, 2),
-                ListPolynomial(22, 26, 13, 15, 26) * number(27),
+                ListPolynomial(22, 26, 13, 15, 26) * 27.asConstant(),
                 "test 1"
             )
             assertEquals(
-                ListPolynomial(),
-                ListPolynomial(7, 0, 49, 21, 14) * number(15),
+                ListPolynomial(0, 0, 0, 0, 0),
+                ListPolynomial(7, 0, 49, 21, 14) * 15.asConstant(),
                 "test 2"
             )
         }
@@ -309,12 +309,12 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
                 "test 2"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0)),
                 Rational(2) + ListPolynomial(Rational(-2)),
                 "test 3"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0)),
                 Rational(0) + ListPolynomial(),
                 "test 4"
             )
@@ -349,12 +349,12 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
                 "test 2"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0)),
                 Rational(-2) - ListPolynomial(Rational(-2)),
                 "test 3"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0)),
                 Rational(0) - ListPolynomial(),
                 "test 4"
             )
@@ -384,7 +384,7 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
                 "test 1"
             )
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(0, 0, 0, 0, 0),
                 15 * ListPolynomial(7, 0, 49, 21, 14),
                 "test 2"
             )
@@ -424,14 +424,14 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
             )
             // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) + (-6/3 - 7/2 x + 2/3 x^2) ?= -18/7 - 23/6 x + 2/3 x^2
             assertEquals(
-                ListPolynomial(Rational(-18, 7), Rational(-23, 6), Rational(2, 3)),
+                ListPolynomial(Rational(-18, 7), Rational(-23, 6), Rational(2, 3), Rational(0)),
                 ListPolynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) +
                         ListPolynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
                 "test 3"
             )
             // (-2/4 - 6/9 x - 4/9 x^2) + (2/4 + 6/9 x + 4/9 x^2) ?= 0
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0), Rational(0), Rational(0)),
                 ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) +
                         ListPolynomial(Rational(2, 4), Rational(6, 9), Rational(4, 9)),
                 "test 4"
@@ -457,14 +457,14 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
             )
             // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) - (-6/3 - 7/2 x + 2/3 x^2) ?= 10/7 + 19/6 x - 2/3 x^2
             assertEquals(
-                ListPolynomial(Rational(10, 7), Rational(19, 6), Rational(-2, 3)),
+                ListPolynomial(Rational(10, 7), Rational(19, 6), Rational(-2, 3), Rational(0)),
                 ListPolynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) -
                         ListPolynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
                 "test 3"
             )
             // (-2/4 - 6/9 x - 4/9 x^2) - (-2/4 - 6/9 x - 4/9 x^2) ?= 0
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(Rational(0), Rational(0), Rational(0)),
                 ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) -
                         ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)),
                 "test 4"
@@ -482,70 +482,10 @@ class ListPolynomialTest { // TODO: Adapt tests to changes
             )
             // Spoiler: 5 * 7 = 0
             assertEquals(
-                ListPolynomial(),
+                ListPolynomial(0, 0, 0, 0, 0),
                 ListPolynomial(5, -25, 10) * ListPolynomial(21, 14, -7),
                 "test 2"
             )
         }
     }
-    @Test
-    fun test_Polynomial_degree() {
-        RationalField.listPolynomial {
-            assertEquals(
-                2,
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)).degree,
-                "test 1"
-            )
-            assertEquals(
-                -1,
-                ListPolynomial<Rational>().degree,
-                "test 2"
-            )
-            assertEquals(
-                -1,
-                ListPolynomial(Rational(0)).degree,
-                "test 3"
-            )
-            assertEquals(
-                -1,
-                ListPolynomial(Rational(0), Rational(0)).degree,
-                "test 4"
-            )
-            assertEquals(
-                -1,
-                ListPolynomial(Rational(0), Rational(0), Rational(0)).degree,
-                "test 5"
-            )
-            assertEquals(
-                0,
-                ListPolynomial(Rational(5, 9)).degree,
-                "test 6"
-            )
-            assertEquals(
-                0,
-                ListPolynomial(Rational(5, 9), Rational(0)).degree,
-                "test 7"
-            )
-            assertEquals(
-                0,
-                ListPolynomial(Rational(5, 9), Rational(0), Rational(0)).degree,
-                "test 8"
-            )
-            assertEquals(
-                2,
-                ListPolynomial(Rational(0), Rational(0), Rational(-8, 7)).degree,
-                "test 9"
-            )
-            assertEquals(
-                2,
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7), Rational(0), Rational(0)).degree,
-                "test 10"
-            )
-            assertEquals(
-                2,
-                ListPolynomial(Rational(0), Rational(0), Rational(-8, 7), Rational(0), Rational(0)).degree,
-                "test 11"
-            )
-        }
-    }
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
index c4f07d957..c5eb8fb81 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -12,7 +12,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
 
-class ListPolynomialUtilTest { // TODO: Adapt tests to changes
+class ListPolynomialUtilTest {
     @Test
     fun test_substitute_Double() {
         assertEquals(
@@ -81,7 +81,7 @@ class ListPolynomialUtilTest { // TODO: Adapt tests to changes
     @Test
     fun test_substitute_Polynomial() {
         assertEquals(
-            ListPolynomial(),
+            ListPolynomial(Rational(0)),
             ListPolynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, ListPolynomial(Rational(1))),
             "test 1"
         )
@@ -98,7 +98,7 @@ class ListPolynomialUtilTest { // TODO: Adapt tests to changes
             "test 3"
         )
         assertEquals(
-            ListPolynomial(Rational(677, 378), Rational(97, 180), Rational(1, 75)),
+            ListPolynomial(Rational(677, 378), Rational(97, 180), Rational(1, 75), Rational(0)),
             ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(0))
                 .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
             "test 4"
@@ -110,7 +110,7 @@ class ListPolynomialUtilTest { // TODO: Adapt tests to changes
             "test 5"
         )
         assertEquals(
-            ListPolynomial(Rational(89, 54)),
+            ListPolynomial(Rational(89, 54), Rational(0), Rational(0), Rational(0)),
             ListPolynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(0))
                 .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(0))),
             "test 6"
@@ -134,7 +134,7 @@ class ListPolynomialUtilTest { // TODO: Adapt tests to changes
             "test 3"
         )
         assertEquals(
-            ListPolynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7)),
+            ListPolynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(0)),
             ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).derivative(RationalField),
             "test 4"
         )
@@ -180,7 +180,7 @@ class ListPolynomialUtilTest { // TODO: Adapt tests to changes
             "test 8"
         )
         assertEquals(
-            ListPolynomial(Rational(8, 9), Rational(30, 7)),
+            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(0)),
             ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthDerivative(RationalField, 2),
             "test 9"
         )
@@ -203,7 +203,7 @@ class ListPolynomialUtilTest { // TODO: Adapt tests to changes
             "test 3"
         )
         assertEquals(
-            ListPolynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28)),
+            ListPolynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(0)),
             ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).antiderivative(RationalField),
             "test 4"
         )
@@ -249,7 +249,7 @@ class ListPolynomialUtilTest { // TODO: Adapt tests to changes
             "test 8"
         )
         assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28)),
+            ListPolynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28), Rational(0)),
             ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthAntiderivative(RationalField, 2),
             "test 9"
         )
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
index 535a42846..2353beee6 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
@@ -120,7 +120,7 @@ class IntModuloRing : Ring<IntModulo> {
     }
 
     override inline val zero: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
-    override inline val one: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
+    override inline val one: IntModulo get() = IntModulo(1, modulus, toCheckInput = false)
 
     fun number(arg: Int) = IntModulo(arg, modulus, toCheckInput = false)
 
-- 
2.34.1


From 92cffd78d935e8d834ec14887680ccffdaf89586 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Fri, 1 Apr 2022 02:23:34 +0700
Subject: [PATCH 480/713] Upgrade gradle tools

---
 .github/workflows/build.yml              |  11 ++--
 .github/workflows/pages.yml              |   7 +-
 .github/workflows/publish.yml            |  17 ++---
 README.md                                |  80 ++++++++---------------
 benchmarks/README.md                     |   4 ++
 buildSrc/gradle.properties               |   3 +-
 buildSrc/settings.gradle.kts             |   3 +-
 docs/templates/README-TEMPLATE.md        |   2 +-
 examples/README.md                       |   4 ++
 gradle.properties                        |   7 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 59536 -> 59821 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 kmath-ast/README.md                      |  55 +++++++++++-----
 kmath-commons/README.md                  |  32 +++++++++
 kmath-complex/README.md                  |  10 +--
 kmath-core/README.md                     |  10 +--
 kmath-coroutines/README.md               |  32 +++++++++
 kmath-dimensions/README.md               |  32 +++++++++
 kmath-ejml/README.md                     |  10 +--
 kmath-for-real/README.md                 |  10 +--
 kmath-functions/README.md                |  10 +--
 kmath-geometry/README.md                 |  32 +++++++++
 kmath-histograms/README.md               |  32 +++++++++
 kmath-jafama/README.md                   |  10 +--
 kmath-jupyter/README.md                  |  32 +++++++++
 kmath-kotlingrad/README.md               |  10 +--
 kmath-memory/README.md                   |  32 +++++++++
 kmath-multik/README.md                   |  32 +++++++++
 kmath-nd4j/README.md                     |  10 +--
 kmath-optimization/README.md             |  32 +++++++++
 kmath-stat/README.md                     |  32 +++++++++
 kmath-symja/README.md                    |  32 +++++++++
 kmath-tensorflow/README.md               |  32 +++++++++
 kmath-tensors/README.md                  |  10 +--
 kmath-viktor/README.md                   |  32 +++++++++
 settings.gradle.kts                      |   2 -
 36 files changed, 556 insertions(+), 147 deletions(-)
 create mode 100644 benchmarks/README.md
 create mode 100644 examples/README.md
 create mode 100644 kmath-commons/README.md
 create mode 100644 kmath-coroutines/README.md
 create mode 100644 kmath-dimensions/README.md
 create mode 100644 kmath-geometry/README.md
 create mode 100644 kmath-histograms/README.md
 create mode 100644 kmath-jupyter/README.md
 create mode 100644 kmath-memory/README.md
 create mode 100644 kmath-multik/README.md
 create mode 100644 kmath-optimization/README.md
 create mode 100644 kmath-stat/README.md
 create mode 100644 kmath-symja/README.md
 create mode 100644 kmath-tensorflow/README.md
 create mode 100644 kmath-viktor/README.md

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f2c76a354..455e0dd2d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,14 +13,11 @@ jobs:
     runs-on: ${{matrix.os}}
     timeout-minutes: 40
     steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: DeLaGuardo/setup-graalvm@4.0
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2.5.0
         with:
-          graalvm: 21.2.0
-          java: java11
-          arch: amd64
+          java-version: 11
+          distribution: liberica
       - name: Cache gradle
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 23ed54357..e7f5300c7 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -10,11 +10,10 @@ jobs:
     timeout-minutes: 40
     steps:
       - uses: actions/checkout@v2
-      - uses: DeLaGuardo/setup-graalvm@4.0
+      - uses: actions/setup-java@v2.5.0
         with:
-          graalvm: 21.2.0
-          java: java11
-          arch: amd64
+          java-version: 11
+          distribution: liberica
       - uses: actions/cache@v2
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index fa3cb700c..17adc5655 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -14,14 +14,11 @@ jobs:
         os: [ macOS-latest, windows-latest ]
     runs-on: ${{matrix.os}}
     steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: DeLaGuardo/setup-graalvm@4.0
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2.5.0
         with:
-          graalvm: 21.2.0
-          java: java11
-          arch: amd64
+          java-version: 11
+          distribution: liberica
       - name: Cache gradle
         uses: actions/cache@v2
         with:
@@ -44,12 +41,12 @@ jobs:
         if: matrix.os == 'windows-latest'
         shell: cmd
         run: >
-          ./gradlew release --no-daemon --build-cache -Ppublishing.enabled=true
+          ./gradlew releaseAll --no-daemon --build-cache -Ppublishing.enabled=true
           -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
           -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
       - name: Publish Mac Artifacts
         if: matrix.os == 'macOS-latest'
         run: >
-          ./gradlew release --no-daemon --build-cache -Ppublishing.enabled=true -Ppublishing.platform=macosX64
-          -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
+          ./gradlew releaseMacosX64 releaseIosArm64 releaseIosX64 release --no-daemon --build-cache
+          -Ppublishing.enabled=true -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
           -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
diff --git a/README.md b/README.md
index 99dd6d00f..aea94f529 100644
--- a/README.md
+++ b/README.md
@@ -52,21 +52,18 @@ module definitions below. The module stability could have the following levels:
 
 ## Modules
 
-<hr/>
 
-* ### [benchmarks](benchmarks)
+### [benchmarks](benchmarks)
 > 
 >
 > **Maturity**: EXPERIMENTAL
-<hr/>
 
-* ### [examples](examples)
+### [examples](examples)
 > 
 >
 > **Maturity**: EXPERIMENTAL
-<hr/>
 
-* ### [kmath-ast](kmath-ast)
+### [kmath-ast](kmath-ast)
 > 
 >
 > **Maturity**: EXPERIMENTAL
@@ -77,15 +74,13 @@ module definitions below. The module stability could have the following levels:
 > - [mst-js-codegen](kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt) : Dynamic MST to JS compiler
 > - [rendering](kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt) : Extendable MST rendering
 
-<hr/>
 
-* ### [kmath-commons](kmath-commons)
+### [kmath-commons](kmath-commons)
 > 
 >
 > **Maturity**: EXPERIMENTAL
-<hr/>
 
-* ### [kmath-complex](kmath-complex)
+### [kmath-complex](kmath-complex)
 > Complex numbers and quaternions.
 >
 > **Maturity**: PROTOTYPE
@@ -94,9 +89,8 @@ module definitions below. The module stability could have the following levels:
 > - [complex](kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt) : Complex Numbers
 > - [quaternion](kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt) : Quaternions
 
-<hr/>
 
-* ### [kmath-core](kmath-core)
+### [kmath-core](kmath-core)
 > Core classes, algebra definitions, basic linear algebra
 >
 > **Maturity**: DEVELOPMENT
@@ -112,21 +106,18 @@ performance calculations to code generation.
 > - [domains](kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains) : Domains
 > - [autodiff](kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt) : Automatic differentiation
 
-<hr/>
 
-* ### [kmath-coroutines](kmath-coroutines)
+### [kmath-coroutines](kmath-coroutines)
 > 
 >
 > **Maturity**: EXPERIMENTAL
-<hr/>
 
-* ### [kmath-dimensions](kmath-dimensions)
+### [kmath-dimensions](kmath-dimensions)
 > 
 >
 > **Maturity**: PROTOTYPE
-<hr/>
 
-* ### [kmath-ejml](kmath-ejml)
+### [kmath-ejml](kmath-ejml)
 > 
 >
 > **Maturity**: PROTOTYPE
@@ -136,9 +127,8 @@ performance calculations to code generation.
 > - [ejml-matrix](kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt) : Matrix implementation.
 > - [ejml-linear-space](kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt) : LinearSpace implementations.
 
-<hr/>
 
-* ### [kmath-for-real](kmath-for-real)
+### [kmath-for-real](kmath-for-real)
 > Extension module that should be used to achieve numpy-like behavior.
 All operations are specialized to work with `Double` numbers without declaring algebraic contexts.
 One can still use generic algebras though.
@@ -150,9 +140,8 @@ One can still use generic algebras though.
 > - [DoubleMatrix](kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/DoubleMatrix.kt) : Numpy-like operations for 2d real structures
 > - [grids](kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/structures/grids.kt) : Uniform grid generators
 
-<hr/>
 
-* ### [kmath-functions](kmath-functions)
+### [kmath-functions](kmath-functions)
 > 
 >
 > **Maturity**: EXPERIMENTAL
@@ -164,21 +153,18 @@ One can still use generic algebras though.
 > - [spline interpolation](kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt) : Cubic spline XY interpolator.
 > - [integration](kmath-functions/#) : Univariate and multivariate quadratures
 
-<hr/>
 
-* ### [kmath-geometry](kmath-geometry)
+### [kmath-geometry](kmath-geometry)
 > 
 >
 > **Maturity**: PROTOTYPE
-<hr/>
 
-* ### [kmath-histograms](kmath-histograms)
+### [kmath-histograms](kmath-histograms)
 > 
 >
 > **Maturity**: PROTOTYPE
-<hr/>
 
-* ### [kmath-jafama](kmath-jafama)
+### [kmath-jafama](kmath-jafama)
 > 
 >
 > **Maturity**: PROTOTYPE
@@ -186,15 +172,13 @@ One can still use generic algebras though.
 > **Features:**
 > - [jafama-double](kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/) : Double ExtendedField implementations based on Jafama
 
-<hr/>
 
-* ### [kmath-jupyter](kmath-jupyter)
+### [kmath-jupyter](kmath-jupyter)
 > 
 >
 > **Maturity**: PROTOTYPE
-<hr/>
 
-* ### [kmath-kotlingrad](kmath-kotlingrad)
+### [kmath-kotlingrad](kmath-kotlingrad)
 > 
 >
 > **Maturity**: EXPERIMENTAL
@@ -203,21 +187,18 @@ One can still use generic algebras though.
 > - [differentiable-mst-expression](kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt) : MST based DifferentiableExpression.
 > - [scalars-adapters](kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt) : Conversions between Kotlin∇'s SFun and MST
 
-<hr/>
 
-* ### [kmath-memory](kmath-memory)
+### [kmath-memory](kmath-memory)
 > An API and basic implementation for arranging objects in a continuous memory block.
 >
 > **Maturity**: DEVELOPMENT
-<hr/>
 
-* ### [kmath-multik](kmath-multik)
+### [kmath-multik](kmath-multik)
 > 
 >
 > **Maturity**: PROTOTYPE
-<hr/>
 
-* ### [kmath-nd4j](kmath-nd4j)
+### [kmath-nd4j](kmath-nd4j)
 > 
 >
 > **Maturity**: EXPERIMENTAL
@@ -227,33 +208,28 @@ One can still use generic algebras though.
 > - [nd4jarrayrings](kmath-nd4j/#) : Rings over Nd4jArrayStructure of Int and Long
 > - [nd4jarrayfields](kmath-nd4j/#) : Fields over Nd4jArrayStructure of Float and Double
 
-<hr/>
 
-* ### [kmath-optimization](kmath-optimization)
+### [kmath-optimization](kmath-optimization)
 > 
 >
 > **Maturity**: EXPERIMENTAL
-<hr/>
 
-* ### [kmath-stat](kmath-stat)
+### [kmath-stat](kmath-stat)
 > 
 >
 > **Maturity**: EXPERIMENTAL
-<hr/>
 
-* ### [kmath-symja](kmath-symja)
+### [kmath-symja](kmath-symja)
 > 
 >
 > **Maturity**: PROTOTYPE
-<hr/>
 
-* ### [kmath-tensorflow](kmath-tensorflow)
+### [kmath-tensorflow](kmath-tensorflow)
 > 
 >
 > **Maturity**: PROTOTYPE
-<hr/>
 
-* ### [kmath-tensors](kmath-tensors)
+### [kmath-tensors](kmath-tensors)
 > 
 >
 > **Maturity**: PROTOTYPE
@@ -263,13 +239,11 @@ One can still use generic algebras though.
 > - [tensor algebra with broadcasting](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt) : Basic linear algebra operations implemented with broadcasting.
 > - [linear algebra operations](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Advanced linear algebra operations like LU decomposition, SVD, etc.
 
-<hr/>
 
-* ### [kmath-viktor](kmath-viktor)
+### [kmath-viktor](kmath-viktor)
 > 
 >
 > **Maturity**: DEVELOPMENT
-<hr/>
 
 
 ## Multi-platform support
@@ -308,8 +282,8 @@ repositories {
 }
 
 dependencies {
-    api("space.kscience:kmath-core:0.3.0-dev-17")
-    // api("space.kscience:kmath-core-jvm:0.3.0-dev-17") for jvm-specific version
+    api("space.kscience:kmath-core:$version")
+    // api("space.kscience:kmath-core-jvm:$version") for jvm-specific version
 }
 ```
 
diff --git a/benchmarks/README.md b/benchmarks/README.md
new file mode 100644
index 000000000..cd8fbafd3
--- /dev/null
+++ b/benchmarks/README.md
@@ -0,0 +1,4 @@
+# Module benchmarks
+
+
+
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 05486d4f6..a0b05e812 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -4,5 +4,4 @@
 #
 
 kotlin.code.style=official
-
-toolsVersion=0.11.1-kotlin-1.6.10
+toolsVersion=0.11.2-kotlin-1.6.10
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 9c5550602..bc530ac03 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -7,7 +7,6 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 enableFeaturePreview("VERSION_CATALOGS")
 
 dependencyResolutionManagement {
-
     val toolsVersion: String by extra
 
     repositories {
@@ -22,4 +21,4 @@ dependencyResolutionManagement {
             from("ru.mipt.npm:version-catalog:$toolsVersion")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/docs/templates/README-TEMPLATE.md b/docs/templates/README-TEMPLATE.md
index b0c418697..4ffa9e75f 100644
--- a/docs/templates/README-TEMPLATE.md
+++ b/docs/templates/README-TEMPLATE.md
@@ -52,7 +52,7 @@ module definitions below. The module stability could have the following levels:
 
 ## Modules
 
-$modules
+${modules}
 
 ## Multi-platform support
 
diff --git a/examples/README.md b/examples/README.md
new file mode 100644
index 000000000..d4e1c5289
--- /dev/null
+++ b/examples/README.md
@@ -0,0 +1,4 @@
+# Module examples
+
+
+
diff --git a/gradle.properties b/gradle.properties
index 7d9628621..a7cd2f876 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,13 +2,10 @@
 # Copyright 2018-2021 KMath contributors.
 # Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
 #
-
 kotlin.code.style=official
+kotlin.jupyter.add.scanner=false
 kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
-
-kotlin.jupyter.add.scanner=false
-
 org.gradle.configureondemand=true
-org.gradle.parallel=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
+org.gradle.parallel=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644
GIT binary patch
delta 8958
zcmY+KWl$VIlZIh&f(Hri?gR<$?iyT!TL`X;1^2~W7YVSq1qtqM!JWlDxLm%}UESUM
zndj}Uny%^UnjhVhFb!8V3s(a#fIy>`VW15{5nuy;_V&a5O#0S&!a4dSkUMz_VHu3S
zGA@p9Q$T|Sj}tYGWdjH;Mpp8m&yu&YURcrt{K;R|kM~(*{v%QwrBJIUF+K1kX5ZmF
zty3i{d`y0;DgE+d<pEk7Pr|u=*zNE>e>vN@yYqFPe1Ud{!&G*Q?iUc^V=|H%4~2|N
zW+DM)W!`b&V2mQ0Y4u<ea&fhP8Zl}9enFLMGA78rwN)ZSva{tuDBrFm!)H9vOM3m4
z-niSubJ&a4xSs}+dP%fO+GC$_<4)P0YuO<_KzvEJ?(Ir@)@_h}QPu8eKx^*hOS|ob
zglR#!I=XV6e96{sFaTqa*yroz1qr?Te(?&#62a<0lDtodq4P_}6zQ3XQ@k&Wac@zj
z!xW|4+QCtgyAKtcH=EZr)8(8$Sk&Y@4x_8dchwcHlyPSsIYtMhD7{~tRr%@kj%5Vm
z;7_r0klH%P3r<%Wk32g(qX3Vlvsh(>_)uB=P@-2`v|Wm{>CxE<!zXQ=*HWl2>R1P^
z>c}ZPZ)xxdOCDu59{X^~2id7+6l6x)U}C4Em?H~F`uOxS1?}xMxTV|5@}PlN%Cg$(
z<u@mW976lW8Jb6)e1=uV8`_*8fnDQKnsWpmN8p7Nc?_FdC-=Z>wY6c}r60=z5ZA1L
zTMe;84rLtYvcm?M(H~ZqU;6F7Evo{P7!<V=+h%r|+GH1ai~D70{AN;wJ6scs_bdsL
zk~o&+!QijE(H{-r{aJH0mTO&C64O&h_H<P$ZX>LGcdwO|qf1w+)MsnvK5^c@Uzj<{
zUoej1>95tuSvDJ|5K6k%&UF*uE6kBn47QJw^yE&#G;u^Z9oYWrK(+oL97hBsUMc_^
z;-lmxebwlB`Er_kXp2$`&o+rPJAN<`WX3ws2K{q@qUp}XTfV{t%KrsZ5vM!Q#4{V&
zq>iO$MCiLq#%wXj%`W$_%FRg_WR*quv65TdHhdpV&jlq<=K^K`&!Kl5mA6p4n~p3u
zWE{20^hYpn1M}}VmSHBXl1*-)2MP=0_k)EPr#>EoZukiXFDz?Di1I>2@Z^P$pvaF+
zN+qUy63jek2m59;YG)`r^F3-O)0RDIXPhf)XOOdkmu`3SMMSW(g+`Ajt{=h1dt~ks
ztrhhP|L4G%5x79N#kwAHh5N){@{fzE7n&%dnisCm65Za<8r_hKvfx4Bg*`%-*-Mvn
zFvn~)VP@}1sAyD+B{{8l{EjD10Av&Mz9^Xff*t`lU=q=S#(|>ls520;n3<}X#pyh&
z*{CJf7$*&~!9jMnw_D~ikUKJ2+UnXmN6qak{xx%W;BKuXt7@ky!LPI1qk?gDwG@@o
zkY+BkIie>{{q==5)kXw(*t#I?__Kwi>`=+s?Gq6X+vtSsaAO&Tf+Bl$vKnzc&%BHM
z=loWOQq~n}>l=EL(5&6((ESsQC3^@4jlO5Od{qN#sWV)vqXw}aA>*uvwZopNN(|-T
zRTF%5Y_k1R$;(d-)n;hWex{;7b6KgdAVE@&0pd(*qDzBO#YZV%kh%pYt1`hnQ(Fa&
zYiDrOTDqk5M7hzp9kI2h!PxNnuJ<B`^Mhe3ly%$^w$3*WOd4DLEzfG@J3$}Y)fnX)
zH;<m_AN0yr_leAC%G$CR3<-^>&xl*zF8sx6!67bA49R1bmUF5bpK&&{eI0U~cH}PM
z3aW1$lRb|ItkG<M4<w%Yk)iJvsJ=qk(wBabc9wCBgqqQUl?_J0j@dtLNgo0oTIBMw
zFmxG2{&>5~_eBNu$|I|vYIdAA9a!pVq<+UTx*M}f<Cydl3cV>G`23zxXp&E=FfnY-
zEzKj;Cu_s4v>leO7M2-mE(UzKHL4c$c`3dS*19OpLV^4NI*hWWnJQ9lvzP4c;c?do
zqrcsKT*i~eIHl0D3r4N{)+RsB6XhrC^;sp2cf_Eq#6*CV;t8v=V!ISe>>9kPgh}NI
z=1UZutslxcT$Ad;_P^;Oouoa(cs!Ctpvi>%aQ+Zp=1d|h{W9Wmf7JWxa(~<#<N|-x
z+wB5>tSZ?C%wu4_5F!fc!<@PIBeJ)Nr^$bB6!_Gic_7}c3J{<c?hHY$$whr&k?{Y6
znNJn%ZB2QXBU93>QI~Gg5g5jTp9}V6KYgrgaX>pJt}7$!wOht&KO|+z{Iw@YL|@~D
zMww}+lG}rm2^peNx>58ME||ZQxFQeVSX8iogHLq_vXb`>RnoEKaTWBF-$JD#Q4BMv
zt2(2Qb*x-?ur1Y(NsW8AdtX0#rDB?O(Vs4_xA(u-o!-tBG03OI!pQD+2UytbL5>lG
z*(F)KacHqMa4?dxa(Vcrw>IIAeB$3cx#;;5r2X;HE8|}eYdAgCw#tpXNy7C3w1q`9
zGxZ6;@1G%8shz9e+!K2MO*{_RjO}Jo6eL3{TSZ>nY7)Qs`Dhi5><@oh0r)gT7H-?3
zLDsd^@m<xQVzcNd`(P7s86P>%JvrS8sta5`QiZNs^*GT}Hiy^zjK2^Ni%`Z|ma)D2
zuyumbvw$M8$haCTI~6M%d4+P)uX%u{Sfg4Al+F7c6;O-*)DKI7E8izSOKB#FcV{M+
zEvY0FBkq!$J0EW$Cxl}3{JwV^ki-T?q6C30Y5e&p@8Rd?$ST-Ghn*-`tB{k54W<>F
z5I)TFpUC!E9298=sk>m#FI4sUDy_!8?51F<M%uN*Ajyq*bGIeIeUdXoo%Xd3XTV_s
zo>qqW!9LN1(zuDnB3$!<jN%eFzQRV+_R;j^$*k0bf`MjlUD&itHhuf_;vw1w4BRM?
z6D;>pEUjL>N>RNgAG~-9Xm|1lqHseW(%v&6K(DZ3Pano(1-Qe?3%J&>0`~w^Q-p&@
zg@HjvhJk?*hpF7$9P|gkzz`zBz_5Z!C4_-%fCcAgiSilzFQef!@amHDrW!YZS@?7C
zs2Y9~>yqO<a2K5*Q;s{+>+rkih?kXztzvnB^6W=f52*iyuZPv$<OX>c42$WK7>PHb
z6%MYIr5D32KPdwL1hJf{_#jn?`k(taW?mwmZVvrr=y~fNcV$`}v(8};o9AjOJumS4
z`889O91^pkF+|@$d9wVoZ3<bnIfu#o3!UfMc5V%(mOg>;^j;^sUs&Ubo_qD&MTL%O
z&*SE0ujG~<CGD(ok$`?}t)%pTf{IbQ(>zm;?<jNixA~e@gZ*6U>x)8TLC&ft))nyI
zcg44@*Q{cYT+qGrA=In_X{NNCD+B0w#;@g)jvBU;_8od6U>;7HIo@F*=g8CQUo(u^
z3r4FJ7#<@)MXO&5+DgKE&^>^`r!loe7CWE*1k0*0wLFzSOV8jvlX~<chY>WOQ?$1v
zk$Or}!;ix0g78^6W;+<=J>z@CBs!<<)HvF(Ls-&`mat<kA@dLCUcQ=31Rg+;+4kFq
zMtMu68RC?D0`}krH?jJL21$$HZ{Lsv3X)mHiwI4hrTnt?y2RfqwFnpo_DGwe6uJ3A
zv|B1aggMlaQ%*i&<>pesJ5kkjC)6nGB@b{ii6-Uoho$BT%iJgugTOeZ$5Xo4D7Pd<
zC*LJh5V@2#5%aBZCgzlQi3@<_!VfiL0<l-dOmBG0&Iil%Hq+E?Sf^KQ(|bI4!OpXy
zVRBc5#N^$i6+{=62?W$DwMDtPX+J-4uBMRSZ1m0%a%LR*o4)iDuAWoJVbBFktzX97
z3sONNH5G)`)=!)`1yxB-Ty^?M2IkLZ>7ywc)ZbwKPfcR|ElQoS(8x|a7#IR}7#Io=
zwg4$8S{egr-NffD)Fg&X9bJSoM25pF&%hf>(T&9bI}=#dPQyNYz;ZZ7EZ<P2*spI-
zU~l_wK|f7_K)-tdJ_gn9c)@?Z$)mZdsj<<w(WdjQ)!B+m9x>=u1n701<vS^S$MWWS
z*2<^a_4=z<N^2*xa+XX)H4|Y5SH4~?Q`*}ms)P}km{%f@@-<^%&uN>SWKkZ9n(-qU
ztN`sdWL1uxQ1mKS@x11;O|@^AD9!NeoPx}?EKIr!2>1Qq4gjfGU)tr6?Z5l7JAS3j
zZeq{vG{rb%DFE4%$szK}d2UzB{4>L?Tv+NAlE*&Nq6g+XauaSI+N2Y8PJLw+aNg1p
zbxr|hI8wcMP&&+(Cu|%+Jq|r>+BHk@{AvfBXKiVldN)@}TBS0LdIpnANCVE26WL-}
zV}HJ^?m&$Rkq;Zf*i-hoasnpJVyTH__dbGWrB_R55d*>pTyl6(?$EO@>RCmTX1Hzr
zT2)rOng?D4FfZ_C49hjMV*UonG2DlG$^+k=Y%|?Dqae4}JOU=8=fgY4Uh!pa9eEqf
zFX&WLPu!jArN*^(>|H>dj~g`ONZhaaD%h_HHrHkk%d~TR_RrX{&eM#P@3x=S^%_6h
zh=A)A{id16$zEFq@-D7La;kTuE!oopx^9{uA3y<}<CA$fk1IT{4FjGWgv!&Qj=->9
z^bQ@U<&pJV6kq7LRF47&!UAvgkBx=)KS_<sRR+!6RZC5cwwj}~S;x)Q)+5fHbM32@
zs9Dpw6*_`sQMYrP%1#j|U1c3>X!NY28^gQr27P=gKh0+E>$aCx&^vj2uc}ycsfSEP
zedhTgUwPx%?;+dESs!g1z}5q9EC+fol}tAH9#fhZQ?q1GjyIaR@}lGCSpM-014T~l
zEwriqt~ftwz=@2tn$xP&-rJt?nn5sy8sJ5Roy;pavj@O+tm}d_qmAlvhG(&k>(arz
z;e|SiTr+0<&6(-An0*4{7akwUk~Yf4<JX9Tq5J!*OP4&wi-J3;wg&c+D8MXROBM9x
zY%+{fj6XCxVA3e*V+E4ZaC2?*_b$@bw?dl3w)Md>M!!YKj^swp9WOa%al`%R>V7mi
z+5+UodFAaPdi4(8_FO&O!Ymb#@yxk<HZ;C?aw~lw1!ng28dO31y6a^%A?mrZiLhlq
z*)r9D-qc@_^Yo)QL>uVMrog(7gkj$G@FLA#ENMxG)4f<}S%Fn?Up$+C%{02AgMKa^
z4SFGWp6U>{Q6VRJV}yjxXT*e`1XaX}(dW1F&RNhpTzvC<hla}alUMpFiPxiUEJDg)
z5T@OEnNE}Jw;&G3crL{}5pCqBws~Gb_7$63#%$YX!r1fagPH-PbSt2dQ@`XI+!FpO
zPBg3@LF}wg;SB#}QqN)V$tpZHYJGRjf`Z$Cq<>tzuu;LMhMfJ2LBEy?{^GHG!OF!!
zDvs64TG)?MX&9NCE#H3(M0K>O>`ca0WT2YR>PTe&tn?~0FV!MRtdb@v?MAUG&Ef7v
zW%7>H<yyBb4^02^=S~lp(==aV^=yU&QsYS{R$Z#_MPQ}KX>(;Mm)RJkt18GXv!&np
z?RUxOrCfs;m{fBz5MVlq59idhov21di5>WXWD-594L-X5;|@kyWi@N+(jLuh=o+5l
zGGTi~)nflP_G}Yg5Pi%pl88U4+^*ihDoMP&zA*^xJE_X*Ah!jODrijCqQ^{=&hD7&
z^)qv3;cu?olaT3pc{)Kcy9jA2E8I)#Kn8qO>70SQ5P8YSCN<o_4{q)RX(xgDwNlZH
zzebPidQyv5yfB^u)f8#wF9D2~qZ>=_+_&)qg)OYBg|-k^d3*@jRAeB?;yd-O1A0wJ
z?K*RDm|wE<(PBz~+C%2CTtzCTUohxP2*1kE8Of~{KRAvMrO_}NN&@P7SUO{;zx0iK
z@or9<q8_W=jB;CG$!3sa>R8ydYOFZ<QmE(^V7$Xl0ZTLH#4LQ49$*&tdo06GSY2B5
zWAbnOoFOm;0r9<^opq%%1#>f(cHASCAatL%;62IL27~SmASr(7F&NMr+#gNw@z1VM
z_ALFwo3)SoANEwRerBdRV`>y`t72#aF2ConmWQp(Xy|msN9$yxhZ1jAQ67lq{vbC5
zujj|MlGo`6Bfn0TfKgi(k=gq0`K~W+X(@GzYlPI4g0M;owH3yG14rhK>lG8lS{`!K
z+Nc@glT-DGz?Ym?v#Hq|_mEdPAlHH5jZuh*6glq!+>Lk$S%ED2@+ea6CE@&1-9a?s
znglt|fmIK}fg<9@XgHe4*q!aO<-;Xj$T?IzB-{&2`<ytxLqDCA^PWKz2Ct4sO5e`N
z#3V>#eA6rdtCi80mpP&vw(Uytxu$#YzNI_<LOg^VxHp(U<w~GJ1f1W5T<#!>cB>LS
z<BGD5FQUI9ZdhON9ZG|Z2$;M>mim>ys;ir;*Dzbr22ZDxO2s;671&J0U<9(n1yj)J
zHFNz=ufPcQVEG+ePjB<5C;=H0{>Mi*xD>hQq8`Vi7TjJ$V04$`h3EZGL|}a07oQdR
z?{cR(z+d>arn^AUug&voOzzi$ZqaS)blz-z3zr;10x;oP2)|Cyb^WtN2*wNn`YX!Y
z+$Pji<7|!XyMCEw4so}xXLU)p)BA~2fl>y2Tt}o9*BPm?AXA8UE8a;>rOgyCwZBFa
zyl42y`bc3}+hiZL_|L_LY29vVerM+BVE@YxK>TGm@dHi@Uw*7AIq?QA9?THL603J%
zIBJ4y3n8OFzsOI;NH%DZ!MDwMl<#$)d9eVVeqVl(5ZX$PPbt*p_(_9VSXhaUPa9Qu
z7)q4vqYKX7ieVSjOmVEbLj4VYtnDpe*0Y&+>0dS^bJ<8s*eHq3tjRAw^+Mu4W^-E=
z4;&namG4G;3pVDyPkUw#0kWEO1;HI6M51(1<0|*pa(I!sj}F^)avrE`ShVMKBz}nE
zzKgOPMSEp6M>h<xzBqqC2r<F^H92Aw&4uudWPKvL8@MToS|loeJ@cW2tFfXRh#&3M
zmy2Twln2FD@uLUm4efWiER|oHpuZBo0oOKxa%U{r=@uGv42}`By+%ym)Y7RDXH&du
zoEx|?JqEWM#fL@T=I%`p-wa5K`f*Y;?romQLrl!#2OvbxCL(4R_Rj)fPeHt@ZfZ6z
z!;^0XxFdQkgf|tVjx9o8i${;IN?3&o^gkMA7K`xtqNSPm346BF^Tw77TU$f7fhUZg
zx>JzyTHHcjV%W*;Tdb}1xJjCP#=iQuBk_Eho6yCRVp<B-D5qnXH^$;Z)Q%;=b)~TV
zma>&e!}4IBJ&?ksVc&u#g3+G$oNlJ?mWfADjeBS-Ph3`DKk-~Z70XugH8sq2eba@4
zIC1H_J$`9b$K`J)sGX3d!&>OmC@@rx1TL~NinQOYy72Q_+^&Mg>Ku(fTgaXdr$p_V
z#gav1o{k~c>#)u3r@~6v^o)Lf=C{rAlL@!s457pq)pO;Cojx7U{urO4cvXP|E>+dV
zmr2?!-5)tk-&*ap^D^2x7NG6nOop2zNFQ9v8-EZ{WCz-h36C)<<!{n3lmWRTJS2LL
zKqeb1k2ia;BW>^|f{V#R_WE^@(T0+d-at5hXX{U?zak*ac-XnyINo+yBD~~3O1I=a
z99|CI>502&s-Qi5bv>^2#cQ%ut<4d7KgQ^kE|=%6#VlGiY8$rdJUH{sra;P~cyb_i
zeX(kS%w0C?mjhJl9TZp8RS;N~y3(EXEz13oPhOSE4WaTljGkVXWd~|#)<uV3j}5Te
zkV*EdY9egzhtn*nao`21CzD^I)5+{Z18Rw4lVU`8%2$p*UCl1`TX(>vsG6_76I)Kb
z8ro?;{j^lxNsaxE-cfP;g(e;mhh3)&ba}li?woV2#7ByioiD>s%L_D;?#;C#z;a(N
z-_WY<=SH42m9bFQ>Nb<j)a&Ob18H&7^vzH?H5JL2Of;-n4as~D=@sj@(xGD?Q&6)o
zNw<auASS+8#i*1R!&uI-tFKh%KIr6NC(#SxD@3iP2k4DgV7OG2_i^y2M9g#zlD(U-
z$!Uj{C~~=*h*XIwivlGPRURp*;)QB+YqgJIj&37B54@$-sI~y;X3Dihu4r?k)$3U*
zk9uj6ma79_U1P?O&-Dm+nDF-X=2Qho8(&-!Lg<We!MbaT@J&@W=LLZ<CT{ON!^Ca>
z@4K$@4l8pD7AKxCR>t0%`Qoy9=hA?<<^Vcj8;-E+oBe3ReW1`el8np8E$k{LgFQ}2
z2t8a`wOXFdJ9!5$&mEfD1CnJ)TB+R<n2vZS8t~mtTC`K4pZCx&&(3zcvRA9eh$H8M
z_(FD=Q{%@E%kevl^P8LEUHNViR|?_s&XalEIk_ZMI{}%7`W~XTC3|-uNW*qO<~QBb
z3zP=yM9fq3N?>Jih88-Zos9@<!L<$JX|GawFX(o*O6o}Qi}@c~jn=uep}m0v`a|BB
z2yR(9di0m0I`Pal?D2-w8ORi_pAzH`yiiE8$#II4Ocmx12(HsCbIF+K0-=4+5>HZ#
zL#{qfbF0ARTXkR@G{lwlOH~nnL)1jcyu!qv2`57S&%oKz0}r{~l9U_UHaJ5!8#nrs
z<AG(3w&=4UE7yD|>?2FrL`mxnzu&{bweD&62)ilz*?pYIvt`T!XFVVA78})p1YEy7
z8fK#s?b~Yo$n7&_a?E<s;#As-2YXI2Zgj?Y;b*tIcNMs31ValY{ovhcp0H0&QM5o$
z4!co%1r!(fx$se``<7Cmbm7?ejQIjV2y;U|x^!0Vm*%Fy)fu&$Qx*Oc;-S!FsjbE@
zLB~r9R-1QTmStt90_5Z$9#S2eFR((hQF{$xVA=D1=6|LvHNnwH@y;m(oAc$*ViI6Z
zEx94E7BZJ-uSdFn?oC)Uou8kJ2oUZF*FO-jg9CC19{3y;-I@2Jr?+Cmtid${#WLE7
z>BdXH-_W)Z44?!;DFx6pZ?~RArtBI*Qm4~6nX6Z_T*i$bQPE;Qz?DAPstpGSqr-AJ
zo%m9cA`oDDm?&dTaoh_>@F>a?!y4qt_;NGN9Z<%SS;fX-cSu|>+Pba22`CRb#|HZa
z;{)yHE>M-pc1C0mrnT~80!u&dvVTYFV8xTQ#g;6{c<9d!FDqU%TK5T6h*w*p980D~
zUyCb`y3{-?(mJFP)0*-Nt;mI$-gc4VQumh|rs&j_^R{sgTPF`1Xja2YWstsKFuQ(d
zmZMxV$p$|qQUXchu&8%J(9|)B?`~rIx&)LqDS>ob5%gTeTP#Sbny#y*rnJ&?(l=!(
zoV~}LJ1DPLnF8oyM(2ScrQ0{Q4m4-BWnS4wilgCW-~~;}pw=&<+HggRD_3c@3RQIr
z9+-%!%}u_{`YS=&>h%kPO3ce}>y!d-zqiniNR-b5r97u;+K6HA2tS>Z#cV{+eFI`*
zd8RMGAUtX1KWfPV;q<-5JAykS+2sY$2~UX+4461a(%{P#{rwFPu0xpIuYlbgD{C7C
z=U{FUarVTYX6ZUq3wE@G^QT4H2Re;n$Fz9cJ>hABl)9T8pozqbA1)H-%1=WKm^QMu
zjnUZ&Pu>q+X&6Co*y#@pxc-4waKMInEPGmE_>3@Ym3S*dedSradmc5mlJn`i0vMW6
zhBnGQD^Z;&S0lnS0curqDO@({J7kTtRE+Ra?nl^HP9<)W&C>~`!258f$XDbyQOQXG
zP8hhy<b(LFnif-XZwyRLGhe;etnjh`>SnarOpgu8xv8@WlXnm(Uk~)_3$Sg0vTbU3
z{W!5B(L3{Yy3K5PN<@jEarAtja`}@KYva&<mg(_$O@VX5`i${0FdG$4{}rEJ0`R&Z
zZs#begZtjukzdS}v}xrs@_Gxo!#!cy(lp$QA>zFRF*s+_%jI<i@$eKN=@#NPOmQlJ
z=7^e*>Xh$T(S=an8?=Ry3H*NRqWgsM`<yWowt)b~MiHh~U(61jVh*wRB$%EpguObr
z{C3K9^9C*d4~t4O^w;Si@@(EOQBj0^AR@&Z$?J2;l@0mka+vG&V0u~tGhp2HcU9Vc
z(3Q+dYiLv8D}k6It5K+SSFp1a{3+y+@59Qw$=A%>&!#|@kf1>=4q%bFw7^Rhz!z5I
z<ebaYnWhT}|MWO3GSGz>yI^zU8_R1WN9`88Z=n>pIZQ`Ixr~_9G%Q}@A7rd#*%y7G
zXl^Id=^ZL?Rx}}gWXCqzj9C6;x(~mAH|$JteXa1MH<6UQig@!Hf~t}B%tP0I|H&;y
zO6N0}svOa1a^PyP9N5?4W6VF%=Bj{qHUgc8@siw4bafT=UPFSoQqKgyUX>sXTBZ=x
zOh^Ad!{kOM9v{%5y}`-8u*T&C7Vq6mD%GR}UeU(*epO&qgC-CkD;%=l)ZuinSzHM`
z{@`j&_vC6dDe{Yb9k@1zeV_K6!l(@=6ucoI=R^cH=6{i71%4W3$J-?<8Qn#$-DMtA
z6Qqi)t?4ifrt%3jSA#6ji#{f(($KBL-iQh-xrC||3U3lq`9>r)>X%oLvtimuHW-)}
zy}>9~|M>w4eES`g7;iBM%Se5-OP%1U6gNWp3AZqT8C6OlFFfQ$|7LL;tBV)(qlp4K
z<dPx#CSC1=4n%oyXOigA4XSj3{aKc{){yJp5b`oNF2J2BrG6uS^Wrd-BJ{m_yWEZS
zk$9>ruar^K8FnJN3@_}B;G`a~H`t|3+6d>q3#`ctTkE-D^1#d9NalQ04lH*qUW2!V
zhk7#z8OwHhSl8w14;KctfO8ubZJ4$dEdpXE78wABz<AT^6SV|+Ync#@d!bkI5#JQU
z3b`Q?>=n5*=q9ex3S}`e7x~~V-jmHOhtX2*n+pBslo3uosdE7xABK=V#-t{1Hd~?i
z{i~%Bw6NYF+F$aK$M`r#xe=NxhA5=p%i7!$);sd>Q}#`G<UXGdHa#qs#Rtzk+he;v
z4Ks`bftVt<iTnIwWOp`bWnAf#a4QJhA<;EY5}#bKSqFZX;m+%6+z%P;2Yl?&Agk1r
z-FB=A3bmYe`>?Q~fygrMXmZw?0#5#17W}6Tj+&kFexG{!mYl5FoA99}3G9l;3lVQ^
z48^~gsVppE*x91WheqI(A%F0Z#$#1UJP1R12Mj9r)y(A?a+iquX+d8WD4WAQJ_!oq
z9rTISr7bPd(GTP57xm$}C}&kjMivi;zi^Y9g3&<wLZq73hQe~~EfZyl=aX?g0t?D2
zuuy~aVnthj6OZffoHY=Ney162uSvLAYB#m|BM1I?^kCc74K{CyWT=18^#bi7yWdqK
z!tys-h@#h{nW16VYPjpSZ)_p2X!N3=_}w$e7u=7yM8();wZR{HMXtR9?DA?=-1gS@
zV{;f*zEJNvVC-`tLihb~EGUE~uzf@bO1mi5Vws1@4E@|vc=oz}2Hi}mt-rzkrwa@c
zTP3Pj(}xZE?_Uu*D~crlZ$|NVYVkj-I4D{I<idgn>X0A;ovdJ?{%_wHgt%%9P&N4H
z^<Cu!JQ@8%Oe0#*=_(Uo!{omudXfnuD0~$Q^uY=X?SIduxBllBv?2xNtuX=k96+2-
zBp~RTFo4VXFEWAD)|mjYULe19RluniXnb88!0Qd7*$@O+dV|b1i~twDe>XzV(uNA4
zAP`hgP6BEN5`YXh|DF~6Pud?~gWfhUKoP<JH*Q+UKj+gXFJLY5FH(cvB9K5vTTFnV
zsDH9@OA6o+_YdP@aX|FjOaPO_f6`-H8qk>X4>z|}0aocC&K+AoV%|SX*N!wGq3|y<
zg4lP(04XIPmt6}$N!dTk+pZv>u;MTB{L4hp9uXk7>aS!6jqM2lVr%{)H3$O127TSZ
z0x9hi0k-P?nWFdQ0K`pykqUIT&jD~B0tHP{ffS(}fZ(aW$oBWTSfHO!A^><6v<S5V
R_{@Vu|29OF7ypyz{{qB}Ob!45

delta 8722
zcmY*;Wn2_c*XJ;R(j_4+E#1=H-QC^YIm8gsFf@+D&?(ZAlF}t5odeR+{krb6yU*TF
z|2X&D{M`@d*32TNOe20l5=0ho#^2I~pbD~q^aFzN{Rm#3zYeiL5N6aRiR|+XoxRvM
znZSLLlAJDh@2J2?#n2<HJgNrn!y}gPKy{ZIxz59kz<hm~l0|39>A?qar%tzN-5NQO
zL&|F{nGiQyzNJ+bM$Y`n=Lx^3wTG^o2bGB@cwr1eb+6c-1tN=U+Db<XX<i;aUs3{y
zu$Yc46}LAQ4CAsc4)9EnYl%6dJ~10(X5ZW^Ss{b(VG*NtD9iGhPK-k@+=)!T!`f{+
z@ainn^hW(LPf$0Tl<&Xcm`;9Od$*nF|E8{^jqGNNRryx;b5{+SMn@+ZXGdh-G|tKP
zuHT41(Hg5&N{#%6$V!J^?}Ma22!#@avKdJgEHC>;bc~eJ!hwM{SbI=#g?$!PjDB+)
zPgU_2EIxocr*EOJG52-~!gml&|D|C2OQ3Y(zAhL}iae4-Ut0F*!z!VEdfw8#`LAi#
zhJ_EM*~;S|FMV6y%-SduHjPOI3cFM(GpH|HES<}*=vqY+64%dJYc|k?n6Br7)D#~#
zEqO(xepfaf2F{>{E2`xb=AO%A<7RtUq6kU_Iu0m?@0K(+<}u3gVw5fy=Y4CC*{IE3
zLP3YBJ7x+U(os5=&NT%gKi23bbaZ`@;%ln)wp4GpDUT$J8NtFDHJzIe_-t}{!HAsh
zJ4<^WovY};)9IKAskSebdQiXv$y5}THuJZ}ouoElIZRui=6l<y)fv;;3oP9g(<=Mo
z4KtG6Sz-`Lzy`Dwm;GGDNaoU(-j1TqQOr9h2X|FC)NAMQT9Rav&<rB<8Y+quHxXE=
zcvM@*_)2r5BzxbYsR<sFreYP*eb<Sq70MiItNRw~t5qn}jC1-(A(w~+@~c$HlIbm@
z{gieFFc7i{RP1#KAN88>rupV|_Jz=9^&;@HwL;J#@23k?A;k`0Bgf;ioO>W`IQ+4?
z7A)eKoY4%+g%=w;=Vm8}H>@U*=*AWNtPqgWRqib#5RT<UUiN@Qs4P~Sqw`JnC89N3
z=0)f>GA@Q=43FrQn3J`GkTUV5yp0U`EOTqjfp+-9;0F8!dMEwwcK%(6`8sDD^aR04
zd6O5vh|Xk?&3dy4f|1QK&Ulf{h6Iq;d-&*ti#Ck>wZFG;GHwc?b;X~eBITx49>2d8
z4HcK&1&DvEGT6kXdzAm4oO8%<TLI2zycGy7+z<|}*wFJ={=R(+YKmC@^1M#1n(Z))
zF>c}8OBt~8H956_;Y<j%Tkq`kqsDj0EhIv0n_b!%m<=x1Wp?SWR2i*M&1*Rvc2q2I
z94b=fK?Q%~<+aISrM;>P-ss*uMf==a+%w~F>Qkm7r)IAuxuoX}h92$gHqbFUun#8m
zWHdy`Zrm#=Pa98x8cO0vd@Tgkr*lm0{dky+Gocr0P8y%HGEI#c3qLqIRc`Oq_C%*;
zG+QTr(#Q|yHKv6R@!DmLlwJQ3FAB)Yor-I4zyDyqM4yp5n2TrQH>gRt*Z<a&#Z6)3
zSFWZ_cWY?YVMR09l(AQZEAmyk9bEFO*P;0c*Gy8gl27yx5T_$gWyyY#p@N=H@PwZF
zCg+}dPJ?5fflHsWBf7vHkHDJFn2}&+NkF_+PR!9~D@Hk3)k@it?=y0Jyz1W69S?7+
z-Ie2fN5DibI#qo+7)w$!&F<A^fCpo-dRQbU+k5;m8@iur>w0+WI-Sj`EgmYHh=t9!
zF6lz^xpqGGpo6!5`sc0a^FVhy_Uxq|@~(1@IIzV)nTpY9sY`CV!?8e&bB8=M&sYEb
z2i}fvKdhp9Hs68Y-!QJ<=wE(iQ5+49tqt;Rh|jhYrI5VW-mIz|UY{h8E=rC5sh#DU
z?wGgk-Tn!I?+Zer7pHlF_Z^!Kd1qkS3&lv#%s6-<5Y%jQL${cge5=G5Ab?D&|9$Y~
zf%rJC2+=2vg;y0-SJb3<@3%}BO$T$C66q$L_H33a`VUbgW~N(4B=v5(<=My|#|J7q
z*Ox4wL4kbJd_~EjLTABSu4U7Jk#`y(6O*U6(k6XxM}CtGZB(H@3~kh*zaGRXM}Iwp
zQ%xFk2>@wiZrVCV_G4G~v;NebCQ%T7{SDyPpSv&dT@Cn)Mx@IK*IdNrj{*4pkV4wv
z)y0J538h>cpB7iPSzA~x24T`{dzNkpvGIqvt1Dvdq@o-`B=$hkczX8$yFMhsWNK-X
zxr$kR$tMD0@W)Vxe1^t9qVmsg&K^F@u84)(n2dttIEAZFN6VD$&tskpG%SI7whGL3
z)DeRiwe&?8m7U{G`oW8!SCi*dM>oYL%UKQnKxV_0RXAEBQg1kStExGEUVwLJ0o<mX
zPQSP~IvpJ8tvs1qUF7Z#Yzkp`7Rt#W`%%Ca88|N|_RIN)YkGhqsoF+!rg-W;%EwC<
z>rGGwb7uv+kPDl7_E2*iD|J*=8A@;XCvwq0aw5oJY<RSFg%fLH75$g!t@`Fk=qJH=
zpC{pOmSlX&lChE0RB4x-r+%D1e6=1gF&dF`;8R|3S<`+Y_Cp8{DQ(9P>N*Yh&o=l}
z2z8YKb-fIAH5spql4eXqp*)o2*b>#1@DSt?zZi{GPj0gH&Nm+EI<3^z0w%YTEV4xw
zI6$+=Faa|Y4o5i0zm5lOg|&tmnJ806DBovU@Ll6XsA;NRrTK~t*AAJIAS=v-UZ%Pr
z$oddI@NRir&erzCwq|)ciJemr-E061j{0Vc@Ys7K(mW|JYj*$+i1<Y}*RC{b<)FqH
zj62}90*b<Z=qvQSb$MR_$=(fQmQ0)soS;`VF?2jn=&zp>Q8XlIK8T?TYS(AXu$`2U
zQ@fHxc=AVHl_}cRZQ)w0anMEoqRKKIvS^`<-aMf*FM`NsG&Uowneo+Ji$7DUD<LAG
z0RSi{002M&5NT(h5ex(Xh+hE!kP=Bz3TO0rY<&DUZARp!KZU3o390?|nwP*?q|?&n
zLKc=ZDSXg_0;Wsu=bQ$iQ?IoK?sm}g^DVMDc``<SYL<n7goRA>Yc7*Hjg;-&aHM%3
zXO6cz$$G};Uqh+iY7Wpme>PHG4cu(q;xyskNLs$^uRRMfEg?8Cj~aE-ajM%CXkx0F
z>C?g3tIA#9sBQOpe`J+04{q7^TqhFk^F1jFtk4JDRO*`d-fx`GYHb=&(JiaM1b?Y^
zO3Kj3sj76ieol|N$;>j@t#tKj=@*gP+mv}KwlTcPYgR$+)2(gk)2JNE=jSauPq!$<
z<|?Sb%W)wS)b>b6i{8!x!^!xIdU3{CJFVnTcw0j{M%DUCF=_>eYYEUWnA-|B(+KYL
z_W_`JI&&u^@t0})@DH^1LDuT0s3dMpCHIbYBgOT4Zh_4yHbSqRbtIKndeT4Q*Jg91
z@>rO!^t-G~*AIW;FQ$3J=b;oGg8?CTa~qNCb>&cgp@e;?0AqA&paz~(%PYO+QBo4(
zp?}ZdSMWx0iJm7HVNk9A#^9Osa#GPJ!_pYEW}($8>&2}fbr@&ygZ?${A7_9?X$(&5
z#~-hxdPQwCNEpf=^+WH-3`2LxrrBMTa}~qJC9S;VzhG!On^JLyW6WkF{8aAE$sM+(
zxr8xLW(KIjI<m$<QP-s3u2Bsy6WFBNJ8auK=%vnBo~&XM#H=7z*|184NwfgYujE3;
zhlc{I10O9+J>`Rm(24r3OJBk<3GF=G!uSP0-G&AY32mLm8q=#Xom&Pqv=1C{d3>1^
zAjsmV@XZ%BKq^eUfBpa8KvO8ob|F3hAjJv*yo2Bhl0)KUus{qA9m8jf)KnOGG<ZK0
z7qi6c6;SXn!tpX+8D7x^D9GAgjFUp9WQ+*1n&;<d;!K=tGMbABGLTecYUT`E=3RZ~
zeud1snh_Zp-izIgE7K24^{fxEuRN@E!aoOPz6jiO2&p~Ye7BNr%zhy$?lh(yH<(dQ
zE!EGhh_Y8K&H>Ta6~4>3@J_VzkL|vYPl*uL+Ot*Q7W!f5rJw5+AsjP_IfL+-S*2p|
zB7!FhjvkUTxQkGWGSg{X;h~dK>gAJivW?88Nu!3o>ySDaABn$rAYt086#27fbjPQS
zhq>55ASvm*60qRdVOY9=bU^+{Pi#!OaZwENN;zy5?EztOHK-Q5;rCuiFl}BSc1YaQ
zC-S{=KsGDz@Ji9O5W;XxE0xI|@3o6(2~i4b8Ii9VT;^G$*dRw(V?=br)D&q^XkeBX
z+gl~+R@rVD-Hwv@7RHV?Bip5KMI)aV^&snt?H<$Nt=OPx#Vx<wrnG(X?#5j@S1F=V
zOZFPcfe)mH?XG>F&BGi?2A2+lNOYywNUGMeGL;|(=UjGDtLG0sN&LpGx;|U;xa13s
z;W_<zYa$VMZtJkd3eIv0jv72gO`~hf`V(aHJ)`JIN8-M{wNNg%`(lpdboQ2nzLW9u
z*F^iq!l9!@nCW)u91gE0BliHl;X-SdYtTh={5*)a$#wacc6W%;>|SPk^G}!M9_^pO
zA3bt3-tca%^42sHeDtfcC0S3w3H1ny!Bxpa=*k?XRPpx9Bb-gx1J9Yvx)4J(8cG+q
z(iCPZ9dsf3#QVyZgD_MW#G#qgV)olu$59&3(PzQfw@%4uZ~<5J=ABvdY43(Qnp{;G
zHg3>@T#>DbTuhFl3)fb3TFqdh)V2aq7!;&JOHseTWukvA7}(iGUq;v-{2J0iHSNHq
z;+)h!p6Ok^+Sp8-jgL($n6Qu47xyE`cFO5SdZR6;R!FET`tm#0D37z339Suxjpv+s
z*=%2-N$N?X&0?x_uut3erF@aBGj;9$k9?3FlbDO{RQa1_qtxrh4!4#f<u_#49<#Me
zT}`O819!AFB7<8tqeiowrNbH;Atr0Zg9{d|0hb)JGg^iLC)qlS1`z0iO!X)AKEXrB
z3zO91j=s#Ek2&c!jEQwIMjT72NxdBbz)42Z;gS{Bz!cQjys(;UZ@sLZujYOtkTTHF
zQJ+6j*RdukVLuLS1KBIa1{xQcqvu=|afX66wi%aF=d(ZFs2Fix?H>jp4x~akvdTp@
zos?^Q&XE;3N93s4rHQGPrV7+au1$$aB6$hLy*Yz_kN$~dweb9PcB!eYVQTGjFuJP>
zZCEwBtb>TIgI<TVyC9z!p9DB9m;+SJtwpX&dvLqBOk7`ZOdBJ%2jd;bwTUk13zVXM
z)u%#E%<(krJO!3xHRjelYO3Pxvd|w_zGbS{+*+}*u_6#E*@|^$-Q&kp<q$k-#MMz}
zRHmEJji~@yep<@n5pr(O8b>O^qAzq@Bv-qud_ZD-2W<_at&ml-gv`tPt$@DF5`HlA
zM>DmmMkpv&Zm-8)Y#0bLQf4MpD4_-7M8eu6rh(tL8dq8onHs#R9J~dGd2IaXXMC~h
z91pKhnQa%Fsn29nAA1;<lB7S|jj`%V&Ul6h;`#7<q#ab(BXL<Jp~Q^0m772>x(%oC
zhca~qQDJaMf?wFrl-Pj;e$bZMYmMF!Y3Lv&Sb?Sjn#!NVx&NDyc^$b4uYyo2OmERa
zRz;yDGd@JTykzFLe|Wk-y7#3x`6$wt$zR8r48mdUvfbeL+4D|Z``~7$PrE@qc7rZe
zVsIoIbCwzjLZ@_M1*bD{HaYn();Z1-q*-I{tEnTZ(}Zmk&%MXSN<hBJc%#b>BX>o|
z<E0~M_3d_^zb*ZAotV_<>-u*RNkAyKC-Srp7c-=@5f)xMWg>o2WWl}j6j9=8+D8;T
z>0*0q#;qw8%U8i;6s0fu#I*%(g*@@a2Er@@nyI}{=@W{Z-;`=wN4N~>6Xrh&z#g}l
zN1g5}0-#(nHUTv_rl2{yUZ;h#t&Fd?tY!7L%ClY)>uH-Ny2ET$lW$S)IQiN79H)D^
zb&0AXYkupy0~w8)*>Sj_p9}4L?lGTq%VG|2p`nWGhnM^!g|j-|O{%9Q%swOq63|*W
zw$(N_laI}`ilB+o!a-wl?er~;;3+)$_akSQ!8YO_&-e*SI7n^(QQ;X0ZE`{4f!gAl
z5$d+9CKVNonM!NO_frREICIAxOv)wm>}-k?iRisM`R7;=lyo|E_YR~FpS&PS`Lg0f
zl-ON<0S%Uix8J%#yZdkCz4YNhcec<|7*P(JsM#>-L>+tYg_71q9~70FAc^6KW5jql
zw!crdgVLH1G_eET=|SEc977;)ezVC|{PJZfra|}@rD;0s&@61mTEBJtILllg{%{vN
zfhb&lq0yChaLhnJ-Qb62MB7`>M;|_ceHKZAeeh@#8tbrK!ArP6oXIhMK;dhEJTY`@
z0Tq>MIe0`7tGv)N*F0IGYSJv0vN?Az8g+4K9S!pW2~9F4W(_U_T=jCZrzuZ3*|__T
zONp_UWmy<Aq+0nbZ&=<ZR;i&e6E+87kR}p;KE40WA@->ePv8C~rckc?Xji;Z5OEqg
zC*Um)i;Wh4TEwqReQdVVbUKT^2>Tpi6z_^-uF*adUFug4i@JhzpWT^Sk&E>CyP2?H
z<yDwjpi;%{B``^5ns(`@%}?w?Tmv>Wf6x}ehuTs6wvzCnTU&gYzT029Nz19(In1WC
z`(1IGmi!O%2AR|BjQa4Q0~u)kM%}?<v2X}ER&l<(GSV{5xiT4gWSP3)r|Kh;@ROr5
za2<>xQyjWuQ16^Gp++;`vr7!k--UZWM*~7Zl|ceO@I3`OpaRhD;YoCuo5IC0uHx>9
z478hu@H|e0Zlo)Zj@01#;8BDs@991xe~^9uG2}UXLM(m7fa}AMwX*tjioBeV&Q8Gx
zSq$6wZFkRBK`cMI>R(@W@+lo2t)L+4q-negWRLWZBz*|%=W4v62JrmzNuOtA*x)QE
z5L%=OH#@KMdB%Jp^r?0tE}5-*6oP`-lO7Sf)0)n*e<{HA=&qhLR)oD8-+V}Z4=md)
z+k9lKf64DB2hAT)UaCP~di?-V3~JBH7itYyk~L6hrnxM%?RKntqd`=!b|e7eFnAcu
z3*V;g{xr7TSTm$}DY%~SMpl>m{Sj!We+WfxSEor?YeiAxYUy25pn(?T()E>ByP^c@
zipwvWrhIK((R((VU+;@LmOnDu)ZXB3YArzzin!Z^0;PyJWnlfflo|q8(QY;o1*5CO
z##hnkO{uy<F1stt^4+O-)m2_k;##de2WT8yPLs6`VeY_M+!iU-HURRFgaoKWq63kH
z&9lwxz1RRWh3Neue(-TEdzMqF_t)7kCD*-ShyrGEJgL30-P~_**S>nTMdk`~DOC#1
zdiYxQoy}=@7(ke#A8$YZZVtk4wo$8x28&I;cY3Ro-|kW=*yiiHgCLZeAr)UtVx>Tu
z|LvL0hq|1-jC0I4x#>&QZCfrVB=zT!n<v5HW%p@E#Sc^c1w^%^di{w>R|~Uz`9%~2
znl{uZ{VEszW`Fad^q_HB!K9*|U-stK%?~;g?&&+12A}Rq$z($Bzuk^2X(Y=hF?-dQ
ztc3DsQK<S>I;qhWIV`99Q#R3xnU0AvY!i*BECj-z9l74|%O=V@nlv|qqC^r^-~C?E
zGW%c|uYgnfJ(gjsTm_cIqcv*mYM{+i+&@F@+69ZQOK&u#v4oxUSQJ=tvqQ3W=*m;|
z>SkBi8LYb-qRY7Sthh*0%3XAC%$z1rhOJzuX=PkTOa=DlocZUpE#KxVNH5)_4n=T(
zGi3YrH7e~sPNYVBd~Grcq#CF~rN{p9Zza-Ntnwfma@TB)=3g36*0lSZg#ixEjFe%+
zX=&LDZ5zqculZ`=RYc^ln(~;nN|Qh6gN=!6f9-N2h+3NWbIxYud&;4SX*tWf5slk4
z{q@@l71UAZgj~*6<a!P^*XyO6h3V&EIvmVB&lB>edXb57fBUxvAS<?R$3H&g9z(ud
zC=Y=i9ogPk$0eTBe>7s(RI=X868JM0+^DCn2yC>;v%S;qPOjB>YVsz(Zx9a>>BK&M
zIQK>7_n)4ud0X5YM}^i*keH{ehLsiy9@NvOpsFeQjdI6anLGvVbBw_*fU1TzdVS$i
z*4j7z!I5RF#rSz|8ibi$;qE{4`aqWYik7QB5U&F5C*;TO_x+gtzPGpzNt!7<mrl&D
z?YHQ8AcjmQWvKqy#)p^zuglBl8CDINLKBj)?_%r~jbwgM{?XCV#nwCrsDywOPl)O4
z1iY&OaHb!ID%|!6v}WZyD;r0d5HHqMY07YEQA3%B1K0*$F{tE{b8#WEiNKpXge-SF
z>~nsBT7)Ckc(K~%uv&{{6A`mmBJVAk-{s~52Vu|HbCH7_W1~ZCX^RflOakGg=jo2Z
z<*s;5-J+2@^LRDZ-7EV&Pq+FTErw@pf<FOqg*(-e451n#;tkkoriWQEDKDFq2!ieN
zLeiVf5`ty(aFD?X`*lpmkSi<-av=S~=*aBP35=&q7u^BTyY^<5hixaX(LHSM1mn)S
z+#9YFD(b%_u;jWXg5ybDQ+)AmBS5<>Fqvx^i%E7Fx#^n(E`m2(c>K-O5`M`Yek9el
zzTGs5qD6*G;y#~xu3>qWuO?-amKYtvRA}I9z#UspEeM;wOERYeot_n_EUMJf$4_<k
zNVbZgMSmWQ6FqNF#0s0V(lu@ogXcb7BEKcEh)QLjfht~yc*mYZjInx)u41y89(84Q
zN#BI!hxsr%F!apVO`9ev@_f^SJ?O(8KAOUo4tWLfZrN1^+hr|8RWEoP{Syb1-FE?)
zwgmw|kZ=e!2w8aFsUkFNkDI)JQO0I1ro3ZZYc4RIDM@ozB)dX#uZ=)!4pt_NJrw~2
zN+XZURqQ#vGvtqxrzc#6S>u?E!6X~?q)tPoZb^_<d;nWljU)~5zM?#f<ak_3zV{&+
zV1Yaz#_X?wf@sTxVWR_=01=ctDE26}#k>;8Y_Ox2h1m<+Le-fsRd|T8db<8#$bqez
zua^Z|>h%zdnuU^ww$#-dZ9NTM`FN+!IlLkz*FqWb!x^Z|C{KyGjZ+>G;;7Mb@LY|H
zc+Gp`L((Dw7pnDlHNm&;SfHedhx*kad$I^uGz{`0BYelq0yEUHpNKSk<tbO&BJ#-~
zNioWDy(zsj+JiDGyO>vj$|dpvY3{7*YGyhXA^LP0&wOw9oNoC=QoVx1<2Dne8qqZL
zm>nFh5DX(-RnQwvHCZQwn^#Z=E!SPVlaRJ78Bo@}!!9dRt^qZy?-*`Pt4WSmgucJv
zV1yFkcjlEM^uz-;b#Q7ZCP@Lk)m}uPX={R4B=56k7WNh11BN~0T*vr@!!ow^B0hOR
zQ)4)&(e%>bNNL%bm<d)SA><&8H{*l_L7s0$2GUgX2Vd;=4d9Dm2v3TaL+;L>{K7h7
zV#<qazV44lYPWneiZ1UOf5G8x42YZmekhZ8CScs%<&!eu_viN2j>k?xDPm(NDE31$
z<}|X)pEY6myjK+^gaIMk&Yj2~F0rSKemNqlsVm4c|N7mp_<l-IyhbRMa-e_N5Nk#`
z<`_$OtC(NWjlAFk@gf}s+IIC+v^^hxSIz!0qIY2r&MLr!N1TW<`ojRq7bl1I-)@q4
z9_Fp_r9~k)^Ar(J6urX%82HJ62vD*ntGO<={xMPl+biAc9@4DYh5F~bjY}TjCGqV}
z-o`ac*dy6QqT7bCKSj?Ip>C*L01s;GNx#D-*&gk!qQr}^?_r@q!8fuXw!)fA7xkd}
zb>vHvdx~H$5qq<OQ!8gN;RoQ8c=%I2*((Yyi^K@RxA%p>AWrow7}+8zBM65-JOt5z
za=T6f7MK`XJuQog8kIEboPdhcaVJeHy)5z7EBLK5NRr()E|#K0L0N^JD@pUA^Czb`
zbUZ_558y+vqAGeyHCbrvOvLD67Ph}06959VzQ_|>RrXQAqE+AQ(-AaKdxoWaF8hdt
z{O3W@b^*o#-f1VuU>YMV03ELF7zkCN4Q&b#prz<E5F(~V?qtBO2>%3Nne0lSbRo@@
z^ihv%oIl~Qyl6Q;a#<eQoefN;+JeGiCpL!4-J>$*jOC%x0_;eis*)J7=f@Ct*)xF5
zo}u~@-I}2|$b%5L7>@+Z?4o+1r&v6ceIy+vroK&jCQ<4q&45HP2wCol4hVm3pZtjf
zHz1D7oyaSKJ~T{Gx}7ONLA)D5k(%%`WswrDyzX*rn}i}}TB4^y#@mAwPzoC)`?rYv
zHgx|trUN#mu*VzUV~8TnJM2Qh*ZM5B{x&y>5An`(M7=Z*Q>TdiH@j*2=moNuOtvpz
z+G`@~-`%~+AgPKgke@XiRPgndh@bp*-HRsh;HTtz@-y_uhb%7ylVOTqG0#u?Vn5c5
zEp*XRo|8hcgG^$#{$O9CJ&NE;TrfRpSnLmes&MO{m=N%zc`}gb!eQ7odl$oy1%PI}
z#AIxx%oRVy&{O~9xnK4$EY>(eQj}!HKIV$Fz*H=-=Kn)N0D6u`(;iO|VraI4fu_W`
z;b5{7;Lyx4za}DU#+U7}=H0dAS#YJJ&g2!P@Htu-AL&w=-)*%P9h2{wR|@?Ff9~)b
z^+e_3Hetq7W%ls{!?<6&Y$Z;NNB41pvrv)|MET6AZXFXJeFqbFW5@i5WGzl?bP+~?
z*&_puH;wKv2)9T_d+P`bLvJFqX#j&xa*-;0nGBbQf0DC>o~=J_Wmtf*2SZQr?{i~X
z9-IbRH8{iy?<0v9Ir1?$66+igy|yD<u*FL=BXByYf`Ydv9d`X1fs~1euE8BK6Dev`
z#=o-z(5q=uFnh*sRnN(McXxt$kv%^FH+Irl5lWRMm+%16v=F$FG5oytgvEV*?`rjK
zSlAE9ER3M<&H1YRLi8hNIl%svh}z&nnE6^Hdt~RO>Q5J~A9sFX@Pe<*kCY8+MwH?I
z`P}zfQ6l^AO8ehZ=l^ZR;R%uu4;BK*=?W9t|0{+<XjV;uT!#OgFe40z-YO0R)f5Ng
z|MV*kUo-w^;+SJX1WeyT(AJoMy{7+>-at(MQZ(CtG=EJFNaFMlKCMXu30(gJUqj5+
z`GM|!keqcj;FKTa_qq;{*dHRXAq157hlB@kL#8%yAm2AgfU|*rDKX@FLlp=HL8ddv
zAWLCHe@DcDeB2}fl7#=0+#<05c3=VqM*O3bkr@9X4nO|)q<dojnluovElyz7$A55m
zOB$$__zzYk;r&~u_BIJnGUcE2Ih7PryUhg5PX9~gA$NN?5bx~&PN<OeFRmn;43fCR
z1oZy=k51*2LJZ(Ikk`8;K(9hbeF-B(c~>0hU;Gye{L8ZN*NH8Id@mP-u<kJdqbmLd
zMeKb5hFAZC+k4_b_qu=C#=hYGO^yR`fRh0G>;Fmb8YuorjLrW&ndip8CN%_qp982r
w1WEnz9^$&s1hkp_3#lPJQ~!HI7WYYjA7>z!`?f%npAh2%rB@vD|Lau$2O)#1n*aa+

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e6e5897b..aa991fcea 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index bedf17486..4872a3a26 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -10,17 +10,17 @@ Extensions to MST API: transformations, dynamic compilation and visualization.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-20`.
 
-**Gradle:**
-```gradle
+**Gradle Groovy:**
+```groovy
 repositories {
     maven { url 'https://repo.kotlin.link' }
     mavenCentral()
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-ast:0.3.0-dev-20'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.0-dev-17")
+    implementation("space.kscience:kmath-ast:0.3.0-dev-20")
 }
 ```
 
@@ -66,20 +66,19 @@ For example, the following code:
 
 ```kotlin
 import space.kscience.kmath.asm.compileToExpression
-import space.kscience.kmath.complex.ComplexField
+import space.kscience.kmath.operations.DoubleField
 
-"x+2".parseMath().compileToExpression(ComplexField)
+"x^3-x+3".parseMath().compileToExpression(DoubleField)
 ```
 
 &mldr; leads to generation of bytecode, which can be decompiled to the following Java class:
 
 ```java
-import java.util.Map;
-import kotlin.jvm.functions.Function2;
-import space.kscience.kmath.asm.internal.MapIntrinsics;
-import space.kscience.kmath.complex.Complex;
-import space.kscience.kmath.expressions.Expression;
-import space.kscience.kmath.expressions.Symbol;
+import java.util.*;
+import kotlin.jvm.functions.*;
+import space.kscience.kmath.asm.internal.*;
+import space.kscience.kmath.complex.*;
+import space.kscience.kmath.expressions.*;
 
 public final class CompiledExpression_45045_0 implements Expression<Complex> {
     private final Object[] constants;
@@ -91,6 +90,32 @@ public final class CompiledExpression_45045_0 implements Expression<Complex> {
 }
 ```
 
+For `LongRing`, `IntRing`, and `DoubleField` specialization is supported for better performance:
+
+```java
+import java.util.*;
+import space.kscience.kmath.asm.internal.*;
+import space.kscience.kmath.expressions.*;
+
+public final class CompiledExpression_-386104628_0 implements DoubleExpression {
+    private final SymbolIndexer indexer;
+
+    public SymbolIndexer getIndexer() {
+        return this.indexer;
+    }
+
+    public double invoke(double[] arguments) {
+        double var2 = arguments[0];
+        return Math.pow(var2, 3.0D) - var2 + 3.0D;
+    }
+
+    public final Double invoke(Map<Symbol, ? extends Double> arguments) {
+        double var2 = ((Double)MapIntrinsics.getOrFail(arguments, "x")).doubleValue();
+        return Math.pow(var2, 3.0D) - var2 + 3.0D;
+    }
+}
+```
+
 Setting JVM system property `space.kscience.kmath.ast.dump.generated.classes` to `1` makes the translator dump class files to program's working directory, so they can be reviewed manually.
 
 #### Limitations
@@ -134,9 +159,9 @@ MstField { x + 2 }.compileToExpression(DoubleField)
 An example of emitted Wasm IR in the form of WAT:
 
 ```lisp
-(func $executable (param $0 f64) (result f64)
+(func \$executable (param \$0 f64) (result f64)
   (f64.add
-    (local.get $0)
+    (local.get \$0)
     (f64.const 2)
   )
 )
diff --git a/kmath-commons/README.md b/kmath-commons/README.md
new file mode 100644
index 000000000..a17a39205
--- /dev/null
+++ b/kmath-commons/README.md
@@ -0,0 +1,32 @@
+# Module kmath-commons
+
+Commons math binding for kmath
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-commons:0.3.0-dev-20`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-commons:0.3.0-dev-20'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-commons:0.3.0-dev-20")
+}
+```
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index 92f2435ba..b55ce0fea 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -8,17 +8,17 @@ Complex and hypercomplex number systems in KMath.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-20`.
 
-**Gradle:**
-```gradle
+**Gradle Groovy:**
+```groovy
 repositories {
     maven { url 'https://repo.kotlin.link' }
     mavenCentral()
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-complex:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-complex:0.3.0-dev-20'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-complex:0.3.0-dev-17")
+    implementation("space.kscience:kmath-complex:0.3.0-dev-20")
 }
 ```
diff --git a/kmath-core/README.md b/kmath-core/README.md
index e765ad50c..31965ef92 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -15,17 +15,17 @@ performance calculations to code generation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-20`.
 
-**Gradle:**
-```gradle
+**Gradle Groovy:**
+```groovy
 repositories {
     maven { url 'https://repo.kotlin.link' }
     mavenCentral()
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-core:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-core:0.3.0-dev-20'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -36,6 +36,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-core:0.3.0-dev-17")
+    implementation("space.kscience:kmath-core:0.3.0-dev-20")
 }
 ```
diff --git a/kmath-coroutines/README.md b/kmath-coroutines/README.md
new file mode 100644
index 000000000..0d83a6c60
--- /dev/null
+++ b/kmath-coroutines/README.md
@@ -0,0 +1,32 @@
+# Module kmath-coroutines
+
+
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-coroutines:0.3.0-dev-20`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-coroutines:0.3.0-dev-20'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-coroutines:0.3.0-dev-20")
+}
+```
diff --git a/kmath-dimensions/README.md b/kmath-dimensions/README.md
new file mode 100644
index 000000000..52097cf40
--- /dev/null
+++ b/kmath-dimensions/README.md
@@ -0,0 +1,32 @@
+# Module kmath-dimensions
+
+A proof of concept module for adding type-safe dimensions to structures
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-dimensions:0.3.0-dev-20`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-dimensions:0.3.0-dev-20'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-dimensions:0.3.0-dev-20")
+}
+```
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index fcd092bf1..3fe6d9e1a 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -9,17 +9,17 @@ EJML based linear algebra implementation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-20`.
 
-**Gradle:**
-```gradle
+**Gradle Groovy:**
+```groovy
 repositories {
     maven { url 'https://repo.kotlin.link' }
     mavenCentral()
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ejml:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-ejml:0.3.0-dev-20'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ejml:0.3.0-dev-17")
+    implementation("space.kscience:kmath-ejml:0.3.0-dev-20")
 }
 ```
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index 938327612..197190dcd 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -9,17 +9,17 @@ Specialization of KMath APIs for Double numbers.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-20`.
 
-**Gradle:**
-```gradle
+**Gradle Groovy:**
+```groovy
 repositories {
     maven { url 'https://repo.kotlin.link' }
     mavenCentral()
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-for-real:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-for-real:0.3.0-dev-20'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-for-real:0.3.0-dev-17")
+    implementation("space.kscience:kmath-for-real:0.3.0-dev-20")
 }
 ```
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index 3d4beee47..6379ad0b5 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -11,17 +11,17 @@ Functions and interpolations.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-20`.
 
-**Gradle:**
-```gradle
+**Gradle Groovy:**
+```groovy
 repositories {
     maven { url 'https://repo.kotlin.link' }
     mavenCentral()
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-functions:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-functions:0.3.0-dev-20'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-functions:0.3.0-dev-17")
+    implementation("space.kscience:kmath-functions:0.3.0-dev-20")
 }
 ```
diff --git a/kmath-geometry/README.md b/kmath-geometry/README.md
new file mode 100644
index 000000000..6b8fb25a0
--- /dev/null
+++ b/kmath-geometry/README.md
@@ -0,0 +1,32 @@
+# Module kmath-geometry
+
+
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-geometry:0.3.0-dev-20`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-geometry:0.3.0-dev-20'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-geometry:0.3.0-dev-20")
+}
+```
diff --git a/kmath-histograms/README.md b/kmath-histograms/README.md
new file mode 100644
index 000000000..0b8a632d6
--- /dev/null
+++ b/kmath-histograms/README.md
@@ -0,0 +1,32 @@
+# Module kmath-histograms
+
+
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-histograms:0.3.0-dev-20`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-histograms:0.3.0-dev-20'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-histograms:0.3.0-dev-20")
+}
+```
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index 760244751..a274b3d88 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -7,17 +7,17 @@ Integration with [Jafama](https://github.com/jeffhain/jafama).
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0-dev-20`.
 
-**Gradle:**
-```gradle
+**Gradle Groovy:**
+```groovy
 repositories {
     maven { url 'https://repo.kotlin.link' }
     mavenCentral()
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-jafama:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-jafama:0.3.0-dev-20'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-jafama:0.3.0-dev-17")
+    implementation("space.kscience:kmath-jafama:0.3.0-dev-20")
 }
 ```
 
diff --git a/kmath-jupyter/README.md b/kmath-jupyter/README.md
new file mode 100644
index 000000000..8014b969d
--- /dev/null
+++ b/kmath-jupyter/README.md
@@ -0,0 +1,32 @@
+# Module kmath-jupyter
+
+
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-jupyter:0.3.0-dev-20`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-jupyter:0.3.0-dev-20'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-jupyter:0.3.0-dev-20")
+}
+```
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
index 588ccb9b4..08c913090 100644
--- a/kmath-kotlingrad/README.md
+++ b/kmath-kotlingrad/README.md
@@ -8,17 +8,17 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-20`.
 
-**Gradle:**
-```gradle
+**Gradle Groovy:**
+```groovy
 repositories {
     maven { url 'https://repo.kotlin.link' }
     mavenCentral()
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-20'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-17")
+    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-20")
 }
 ```
diff --git a/kmath-memory/README.md b/kmath-memory/README.md
new file mode 100644
index 000000000..d37087a66
--- /dev/null
+++ b/kmath-memory/README.md
@@ -0,0 +1,32 @@
+# Module kmath-memory
+
+
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-memory:0.3.0-dev-20`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-memory:0.3.0-dev-20'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-memory:0.3.0-dev-20")
+}
+```
diff --git a/kmath-multik/README.md b/kmath-multik/README.md
new file mode 100644
index 000000000..167445f52
--- /dev/null
+++ b/kmath-multik/README.md
@@ -0,0 +1,32 @@
+# Module kmath-multik
+
+JetBrains Multik connector
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-multik:0.3.0-dev-20`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-multik:0.3.0-dev-20'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-multik:0.3.0-dev-20")
+}
+```
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index 7ca9cd4fd..225de18e9 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -9,17 +9,17 @@ ND4J based implementations of KMath abstractions.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-20`.
 
-**Gradle:**
-```gradle
+**Gradle Groovy:**
+```groovy
 repositories {
     maven { url 'https://repo.kotlin.link' }
     mavenCentral()
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-20'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-nd4j:0.3.0-dev-17")
+    implementation("space.kscience:kmath-nd4j:0.3.0-dev-20")
 }
 ```
 
diff --git a/kmath-optimization/README.md b/kmath-optimization/README.md
new file mode 100644
index 000000000..137975c90
--- /dev/null
+++ b/kmath-optimization/README.md
@@ -0,0 +1,32 @@
+# Module kmath-optimization
+
+
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-optimization:0.3.0-dev-20`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-optimization:0.3.0-dev-20'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-optimization:0.3.0-dev-20")
+}
+```
diff --git a/kmath-stat/README.md b/kmath-stat/README.md
new file mode 100644
index 000000000..762e61237
--- /dev/null
+++ b/kmath-stat/README.md
@@ -0,0 +1,32 @@
+# Module kmath-stat
+
+
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-stat:0.3.0-dev-20`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-stat:0.3.0-dev-20'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-stat:0.3.0-dev-20")
+}
+```
diff --git a/kmath-symja/README.md b/kmath-symja/README.md
new file mode 100644
index 000000000..e3c717cff
--- /dev/null
+++ b/kmath-symja/README.md
@@ -0,0 +1,32 @@
+# Module kmath-symja
+
+Symja integration module
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-symja:0.3.0-dev-20`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-symja:0.3.0-dev-20'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-symja:0.3.0-dev-20")
+}
+```
diff --git a/kmath-tensorflow/README.md b/kmath-tensorflow/README.md
new file mode 100644
index 000000000..f1dfa0202
--- /dev/null
+++ b/kmath-tensorflow/README.md
@@ -0,0 +1,32 @@
+# Module kmath-tensorflow
+
+Google tensorflow connector
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-tensorflow:0.3.0-dev-20`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-tensorflow:0.3.0-dev-20'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-tensorflow:0.3.0-dev-20")
+}
+```
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index 42ce91336..3d7dfd1fb 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -9,17 +9,17 @@ Common linear algebra operations on tensors.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-17`.
+The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-20`.
 
-**Gradle:**
-```gradle
+**Gradle Groovy:**
+```groovy
 repositories {
     maven { url 'https://repo.kotlin.link' }
     mavenCentral()
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensors:0.3.0-dev-17'
+    implementation 'space.kscience:kmath-tensors:0.3.0-dev-20'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensors:0.3.0-dev-17")
+    implementation("space.kscience:kmath-tensors:0.3.0-dev-20")
 }
 ```
diff --git a/kmath-viktor/README.md b/kmath-viktor/README.md
new file mode 100644
index 000000000..229d4dcd4
--- /dev/null
+++ b/kmath-viktor/README.md
@@ -0,0 +1,32 @@
+# Module kmath-viktor
+
+Binding for https://github.com/JetBrains-Research/viktor
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-viktor:0.3.0-dev-20`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-viktor:0.3.0-dev-20'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-viktor:0.3.0-dev-20")
+}
+```
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a8b473fee..b3c275810 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,8 +1,6 @@
 rootProject.name = "kmath"
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
-enableFeaturePreview("VERSION_CATALOGS")
-
 include(
     ":kmath-memory",
     ":kmath-complex",
-- 
2.34.1


From 13fb49e48c84217dd07b7f3343ba2c0f08962081 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Fri, 1 Apr 2022 02:27:50 +0700
Subject: [PATCH 481/713] Rename version catalog

---
 buildSrc/build.gradle.kts    | 8 ++++----
 buildSrc/settings.gradle.kts | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index b69ebe6cd..fa5142538 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     `kotlin-dsl`
     `version-catalog`
-    alias(npmlibs.plugins.kotlin.plugin.serialization)
+    alias(miptNpmLibs.plugins.kotlin.plugin.serialization)
 }
 
 java.targetCompatibility = JavaVersion.VERSION_11
@@ -14,8 +14,8 @@ repositories {
 }
 
 val toolsVersion: String by extra
-val kotlinVersion = npmlibs.versions.kotlin.asProvider().get()
-val benchmarksVersion = npmlibs.versions.kotlinx.benchmark.get()
+val kotlinVersion = miptNpmLibs.versions.kotlin.asProvider().get()
+val benchmarksVersion = miptNpmLibs.versions.kotlinx.benchmark.get()
 
 dependencies {
     api("ru.mipt.npm:gradle-tools:$toolsVersion")
@@ -23,7 +23,7 @@ dependencies {
     api("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:$benchmarksVersion")
     api("org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion")
     //to be used inside build-script only
-    implementation(npmlibs.kotlinx.serialization.json)
+    implementation(miptNpmLibs.kotlinx.serialization.json)
 }
 
 kotlin.sourceSets.all {
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index bc530ac03..7c1df133d 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -4,7 +4,6 @@
  */
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
-enableFeaturePreview("VERSION_CATALOGS")
 
 dependencyResolutionManagement {
     val toolsVersion: String by extra
@@ -17,7 +16,7 @@ dependencyResolutionManagement {
     }
 
     versionCatalogs {
-        create("npmlibs") {
+        create("miptNpmLibs") {
             from("ru.mipt.npm:version-catalog:$toolsVersion")
         }
     }
-- 
2.34.1


From 38fd3e24c8261eb4da302d499c13d0d063d93712 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Fri, 1 Apr 2022 02:37:14 +0700
Subject: [PATCH 482/713] Use correct class name for kotlin JVM compilation

---
 benchmarks/build.gradle.kts | 2 +-
 examples/build.gradle.kts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index f8d39b9c5..22712816d 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -155,7 +155,7 @@ kotlin.sourceSets.all {
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
     kotlinOptions {
         jvmTarget = "11"
         freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" + "-Xlambdas=indy"
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 36715cd78..60f8f5aed 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -58,7 +58,7 @@ kotlin.sourceSets.all {
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
     kotlinOptions {
         jvmTarget = "11"
         freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" + "-Xopt-in=kotlin.RequiresOptIn" + "-Xlambdas=indy"
-- 
2.34.1


From 3277a99ed3bb3668160de14d3e4e23ad9b587600 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Fri, 1 Apr 2022 02:58:12 +0700
Subject: [PATCH 483/713] Never use GitHub Packages to publish project with

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3372d505d..445976853 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -56,7 +56,7 @@ subprojects {
 readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md")
 
 ksciencePublish {
-    github("kmath")
+    github("kmath", addToRelease = false)
     space()
     sonatype()
 }
-- 
2.34.1


From bae465fe865b0b8288861b78b62c04f4b5eef8c3 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Fri, 1 Apr 2022 03:06:07 +0700
Subject: [PATCH 484/713] Update GitHub actions

---
 .github/workflows/build.yml   |  8 ++++----
 .github/workflows/pages.yml   | 20 +++++++++++++++-----
 .github/workflows/publish.yml | 11 +++++------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 455e0dd2d..0834c2656 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,13 +13,13 @@ jobs:
     runs-on: ${{matrix.os}}
     timeout-minutes: 40
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.5.0
+      - uses: actions/checkout@v3.0.0
+      - uses: actions/setup-java@v3.0.0
         with:
           java-version: 11
           distribution: liberica
       - name: Cache gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v3.0.1
         with:
           path: |
             ~/.gradle/caches
@@ -28,7 +28,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Cache konan
-        uses: actions/cache@v2
+        uses: actions/cache@v3.0.1
         with:
           path: ~/.konan
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index e7f5300c7..0158c82ac 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -9,19 +9,29 @@ jobs:
     runs-on: ubuntu-20.04
     timeout-minutes: 40
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.5.0
+      - uses: actions/checkout@v3.0.0
+      - uses: actions/setup-java@v3.0.0
         with:
           java-version: 11
           distribution: liberica
-      - uses: actions/cache@v2
+      - name: Cache gradle
+        uses: actions/cache@v3.0.1
         with:
-          path: ~/.gradle/caches
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Cache konan
+        uses: actions/cache@v3.0.1
+        with:
+          path: ~/.konan
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
       - run: ./gradlew dokkaHtmlMultiModule --build-cache --no-daemon --no-parallel --stacktrace
-      - uses: JamesIves/github-pages-deploy-action@4.1.0
+      - uses: JamesIves/github-pages-deploy-action@4.2.5
         with:
           branch: gh-pages
           folder: build/dokka/htmlMultiModule
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 17adc5655..83755793a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -14,13 +14,13 @@ jobs:
         os: [ macOS-latest, windows-latest ]
     runs-on: ${{matrix.os}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.5.0
+      - uses: actions/checkout@v3.0.0
+      - uses: actions/setup-java@v3.0.0
         with:
           java-version: 11
           distribution: liberica
       - name: Cache gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v3.0.1
         with:
           path: |
             ~/.gradle/caches
@@ -29,14 +29,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Cache konan
-        uses: actions/cache@v2
+        uses: actions/cache@v3.0.1
         with:
           path: ~/.konan
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v1.0.4
+      - uses: gradle/wrapper-validation-action@v1.0.4
       - name: Publish Windows Artifacts
         if: matrix.os == 'windows-latest'
         shell: cmd
-- 
2.34.1


From 97a320c9ef8cd3cdbb73256499200a23be51b84d Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Fri, 1 Apr 2022 14:02:03 +0700
Subject: [PATCH 485/713] Use gradle-build-action

---
 .github/workflows/build.yml   | 14 +++-----------
 .github/workflows/pages.yml   | 13 +++----------
 .github/workflows/publish.yml | 34 ++++++++++++++++------------------
 3 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0834c2656..cffef64b0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,15 +18,6 @@ jobs:
         with:
           java-version: 11
           distribution: liberica
-      - name: Cache gradle
-        uses: actions/cache@v3.0.1
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
       - name: Cache konan
         uses: actions/cache@v3.0.1
         with:
@@ -36,5 +27,6 @@ jobs:
             ${{ runner.os }}-gradle-
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1.0.4
-      - name: Build
-        run: ./gradlew build --build-cache --no-daemon --stacktrace
+      - uses: gradle/gradle-build-action@v2.1.5
+        with:
+          arguments: build
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 0158c82ac..9b76fd16e 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -14,15 +14,6 @@ jobs:
         with:
           java-version: 11
           distribution: liberica
-      - name: Cache gradle
-        uses: actions/cache@v3.0.1
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
       - name: Cache konan
         uses: actions/cache@v3.0.1
         with:
@@ -30,7 +21,9 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - run: ./gradlew dokkaHtmlMultiModule --build-cache --no-daemon --no-parallel --stacktrace
+      - uses: gradle/gradle-build-action@v2.1.5
+        with:
+          arguments: dokkaHtmlMultiModule --no-parallel
       - uses: JamesIves/github-pages-deploy-action@4.2.5
         with:
           branch: gh-pages
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 83755793a..8e9b98dcb 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -19,15 +19,6 @@ jobs:
         with:
           java-version: 11
           distribution: liberica
-      - name: Cache gradle
-        uses: actions/cache@v3.0.1
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
       - name: Cache konan
         uses: actions/cache@v3.0.1
         with:
@@ -38,14 +29,21 @@ jobs:
       - uses: gradle/wrapper-validation-action@v1.0.4
       - name: Publish Windows Artifacts
         if: matrix.os == 'windows-latest'
-        shell: cmd
-        run: >
-          ./gradlew releaseAll --no-daemon --build-cache -Ppublishing.enabled=true
-          -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
-          -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
+        uses: gradle/gradle-build-action@v2.1.5
+        with:
+          arguments: |
+            releaseAll
+            -Ppublishing.enabled=true
+            -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
+            -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
       - name: Publish Mac Artifacts
         if: matrix.os == 'macOS-latest'
-        run: >
-          ./gradlew releaseMacosX64 releaseIosArm64 releaseIosX64 release --no-daemon --build-cache
-          -Ppublishing.enabled=true -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
-          -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
+        uses: gradle/gradle-build-action@v2.1.5
+        with:
+          arguments: |
+            releaseMacosX64
+            releaseIosArm64
+            releaseIosX64
+            -Ppublishing.enabled=true
+            -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
+            -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
-- 
2.34.1


From 7f7b55067422589bc9266f2d7ebc0e8af5b8e402 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 3 Apr 2022 11:44:42 +0300
Subject: [PATCH 486/713] Simplified polynomial builders.

---
 .../kmath/functions/labeledConstructors.kt    | 56 +++++++++++++++++++
 .../kmath/functions/numberedConstructors.kt   | 47 +++++++++-------
 2 files changed, 83 insertions(+), 20 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
index 12688a865..e81a9388e 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
 
 
@@ -103,6 +104,61 @@ public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(
 
 public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this))
 
+@DslMarker
+@UnstableKMathAPI
+internal annotation class LabeledPolynomialConstructorDSL
+
+@UnstableKMathAPI
+@LabeledPolynomialConstructorDSL
+public class LabeledPolynomialTermSignatureBuilder {
+    private val signature: MutableMap<Symbol, UInt> = LinkedHashMap()
+    public fun build(): Map<Symbol, UInt> = signature
+    public infix fun Symbol.inPowerOf(deg: UInt) {
+        signature[this] = deg
+    }
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun Symbol.pow(deg: UInt): Unit = this inPowerOf deg
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun Symbol.`in`(deg: UInt): Unit = this inPowerOf deg
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun Symbol.of(deg: UInt): Unit = this inPowerOf deg
+}
+
+@UnstableKMathAPI
+public class LabeledPolynomialBuilder<C>(private val zero: C, private val add: (C, C) -> C, capacity: Int = 0) {
+    private val coefficients: MutableMap<Map<Symbol, UInt>, C> = LinkedHashMap(capacity)
+    public fun build(): LabeledPolynomial<C> = LabeledPolynomial<C>(coefficients)
+    public operator fun C.invoke(block: LabeledPolynomialTermSignatureBuilder.() -> Unit) {
+        val signature = LabeledPolynomialTermSignatureBuilder().apply(block).build()
+        coefficients[signature] = add(coefficients.getOrElse(signature) { zero }, this@invoke)
+    }
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun C.with(noinline block: LabeledPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun (LabeledPolynomialTermSignatureBuilder.() -> Unit).with(coef: C): Unit = coef.invoke(this)
+    @Suppress("NOTHING_TO_INLINE")
+    public infix fun sig(block: LabeledPolynomialTermSignatureBuilder.() -> Unit): LabeledPolynomialTermSignatureBuilder.() -> Unit = block
+}
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+@UnstableKMathAPI
+@LabeledPolynomialConstructorDSL
+@Suppress("FunctionName")
+public inline fun <C, A: Ring<C>> A.LabeledPolynomial(block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(zero, ::add).apply(block).build()
+@UnstableKMathAPI
+@LabeledPolynomialConstructorDSL
+@Suppress("FunctionName")
+public inline fun <C, A: Ring<C>> A.LabeledPolynomial(capacity: Int, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(zero, ::add, capacity).apply(block).build()
+@UnstableKMathAPI
+@LabeledPolynomialConstructorDSL
+@Suppress("FunctionName")
+public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(constantZero, { left: C, right: C -> left + right}).apply(block).build()
+@UnstableKMathAPI
+@LabeledPolynomialConstructorDSL
+@Suppress("FunctionName")
+public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(capacity: Int, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(constantZero, { left: C, right: C -> left + right}, capacity).apply(block).build()
+
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
 @Suppress("FunctionName")
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
index e4b79b0b2..dca8a0cff 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
 
 
 /**
@@ -97,8 +97,10 @@ public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomia
 public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
 
 @DslMarker
+@UnstableKMathAPI
 internal annotation class NumberedPolynomialConstructorDSL
 
+@UnstableKMathAPI
 @NumberedPolynomialConstructorDSL
 public class NumberedPolynomialTermSignatureBuilder {
     private val signature: MutableList<UInt> = ArrayList()
@@ -111,43 +113,48 @@ public class NumberedPolynomialTermSignatureBuilder {
             signature[this] = deg
         }
     }
-    public infix fun Int.pow(deg: UInt): Unit = this inPowerOf deg
-    public infix fun Int.of(deg: UInt): Unit = this inPowerOf deg
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun Int.pow(deg: UInt): Unit = this inPowerOf deg
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun Int.`in`(deg: UInt): Unit = this inPowerOf deg
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun Int.of(deg: UInt): Unit = this inPowerOf deg
 }
 
-@NumberedPolynomialConstructorDSL
-public class NumberedPolynomialBuilderOverRing<C> internal constructor(internal val context: Ring<C>, capacity: Int = 0) {
+@UnstableKMathAPI
+public class NumberedPolynomialBuilder<C>(private val zero: C, private val add: (C, C) -> C, capacity: Int = 0) {
     private val coefficients: MutableMap<List<UInt>, C> = LinkedHashMap(capacity)
     public fun build(): NumberedPolynomial<C> = NumberedPolynomial<C>(coefficients)
     public operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit) {
         val signature = NumberedPolynomialTermSignatureBuilder().apply(block).build()
-        coefficients[signature] = context { coefficients.getOrElse(signature) { zero } + this@invoke }
+        coefficients[signature] = add(coefficients.getOrElse(signature) { zero }, this@invoke)
     }
-    public infix fun C.with(block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun C.with(noinline block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun (NumberedPolynomialTermSignatureBuilder.() -> Unit).with(coef: C): Unit = coef.invoke(this)
+    @Suppress("NOTHING_TO_INLINE")
+    public infix fun sig(block: NumberedPolynomialTermSignatureBuilder.() -> Unit): NumberedPolynomialTermSignatureBuilder.() -> Unit = block
 }
 
-@NumberedPolynomialConstructorDSL
-public class NumberedPolynomialBuilderOverPolynomialSpace<C> internal constructor(internal val context: NumberedPolynomialSpace<C, *>, capacity: Int = 0) {
-    private val coefficients: MutableMap<List<UInt>, C> = LinkedHashMap(capacity)
-    public fun build(): NumberedPolynomial<C> = NumberedPolynomial<C>(coefficients)
-    public operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit) {
-        val signature = NumberedPolynomialTermSignatureBuilder().apply(block).build()
-        coefficients[signature] = context { coefficients.getOrElse(signature) { constantZero } + this@invoke }
-    }
-}
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
+@UnstableKMathAPI
 @NumberedPolynomialConstructorDSL
 @Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(block: NumberedPolynomialBuilderOverRing<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverRing(this).apply(block).build()
+public inline fun <C, A: Ring<C>> A.NumberedPolynomial(block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(zero, ::add).apply(block).build()
+@UnstableKMathAPI
 @NumberedPolynomialConstructorDSL
 @Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilderOverRing<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverRing(this, capacity).apply(block).build()
+public inline fun <C, A: Ring<C>> A.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(zero, ::add, capacity).apply(block).build()
+@UnstableKMathAPI
 @NumberedPolynomialConstructorDSL
 @Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(block: NumberedPolynomialBuilderOverPolynomialSpace<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverPolynomialSpace(this).apply(block).build()
+public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(constantZero, { left: C, right: C -> left + right}).apply(block).build()
+@UnstableKMathAPI
 @NumberedPolynomialConstructorDSL
 @Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilderOverPolynomialSpace<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilderOverPolynomialSpace(this, capacity).apply(block).build()
+public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(constantZero, { left: C, right: C -> left + right}, capacity).apply(block).build()
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
-- 
2.34.1


From 73f72f12bca21554764e2b24dcb5fd4e22a64983 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 5 Apr 2022 23:23:29 +0300
Subject: [PATCH 487/713] [WIP] Another histogram refactor

---
 CHANGELOG.md                                  |  1 +
 .../space/kscience/kmath/domains/Domain1D.kt  | 17 ++++
 .../space/kscience/kmath/misc/sorting.kt      | 75 +++++++++++----
 .../space/kscience/kmath/misc/PermSortTest.kt | 25 +++--
 kmath-for-real/build.gradle.kts               | 15 +--
 kmath-histograms/build.gradle.kts             |  2 +
 ...togramSpace.kt => DoubleHistogramGroup.kt} |  8 +-
 .../kscience/kmath/histogram/Histogram1D.kt   | 10 +-
 ...ogramSpace.kt => IndexedHistogramGroup.kt} |  6 +-
 .../kmath/histogram/UniformHistogram1D.kt     | 94 ++++++++++++++++++-
 .../histogram/MultivariateHistogramTest.kt    |  6 +-
 .../kmath/histogram/UniformHistogram1DTest.kt | 34 +++++++
 .../kmath/distributions/Distribution.kt       |  4 +-
 .../kmath/distributions/NormalDistribution.kt | 15 +--
 .../space/kscience/kmath/stat/Sampler.kt      |  9 ++
 .../kmath/stat/UniformDistribution.kt         |  4 +-
 16 files changed, 258 insertions(+), 67 deletions(-)
 rename kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/{DoubleHistogramSpace.kt => DoubleHistogramGroup.kt} (96%)
 rename kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/{IndexedHistogramSpace.kt => IndexedHistogramGroup.kt} (93%)
 create mode 100644 kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a19b1f467..d710c330b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@
 - Operations -> Ops
 - Default Buffer and ND algebras are now Ops and lack neutral elements (0, 1) as well as algebra-level shapes.
 - Tensor algebra takes read-only structures as input and inherits AlgebraND
+- `UnivariateDistribution` renamed to `Distribution1D`
 
 ### Deprecated
 - Specialized `DoubleBufferAlgebra`
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
index ccd1c3edb..3d531349c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
@@ -35,6 +35,23 @@ public class DoubleDomain1D(
     }
 
     override fun volume(): Double = range.endInclusive - range.start
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || this::class != other::class) return false
+
+        other as DoubleDomain1D
+
+        if (doubleRange != other.doubleRange) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int = doubleRange.hashCode()
+
+    override fun toString(): String = doubleRange.toString()
+
+
 }
 
 @UnstableKMathAPI
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
index a144e49b4..dc5421136 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
@@ -3,43 +3,71 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
+
 package space.kscience.kmath.misc
 
-import kotlin.comparisons.*
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.VirtualBuffer
 
 /**
- * Return a new list filled with buffer indices. Indice order is defined by sorting associated buffer value.
- * This feature allows to sort buffer values without reordering its content.
+ * Return a new array filled with buffer indices. Indices order is defined by sorting associated buffer value.
+ * This feature allows sorting buffer values without reordering its content.
  *
- * @return List of buffer indices, sorted by associated value.
+ * @return Buffer indices, sorted by associated value.
  */
-@PerformancePitfall
 @UnstableKMathAPI
-public fun <V: Comparable<V>> Buffer<V>.permSort() : IntArray = _permSortWith(compareBy<Int> { get(it) })
+public fun <V : Comparable<V>> Buffer<V>.indicesSorted(): IntArray = permSortIndicesWith(compareBy { get(it) })
+
+/**
+ * Create a zero-copy virtual buffer that contains the same elements but in ascending order
+ */
+@OptIn(UnstableKMathAPI::class)
+public fun <V : Comparable<V>> Buffer<V>.sorted(): Buffer<V> {
+    val permutations = indicesSorted()
+    return VirtualBuffer(size) { this[permutations[it]] }
+}
 
-@PerformancePitfall
 @UnstableKMathAPI
-public fun <V: Comparable<V>> Buffer<V>.permSortDescending() : IntArray = _permSortWith(compareByDescending<Int> { get(it) })
+public fun <V : Comparable<V>> Buffer<V>.indicesSortedDescending(): IntArray =
+    permSortIndicesWith(compareByDescending { get(it) })
+
+/**
+ * Create a zero-copy virtual buffer that contains the same elements but in descending order
+ */
+@OptIn(UnstableKMathAPI::class)
+public fun <V : Comparable<V>> Buffer<V>.sortedDescending(): Buffer<V> {
+    val permutations = indicesSortedDescending()
+    return VirtualBuffer(size) { this[permutations[it]] }
+}
 
-@PerformancePitfall
 @UnstableKMathAPI
-public fun <V, C: Comparable<C>> Buffer<V>.permSortBy(selector: (V) -> C) : IntArray = _permSortWith(compareBy<Int> { selector(get(it)) })
+public fun <V, C : Comparable<C>> Buffer<V>.indicesSortedBy(selector: (V) -> C): IntArray =
+    permSortIndicesWith(compareBy { selector(get(it)) })
+
+@OptIn(UnstableKMathAPI::class)
+public fun <V, C : Comparable<C>> Buffer<V>.sortedBy(selector: (V) -> C): Buffer<V> {
+    val permutations = indicesSortedBy(selector)
+    return VirtualBuffer(size) { this[permutations[it]] }
+}
 
-@PerformancePitfall
 @UnstableKMathAPI
-public fun <V, C: Comparable<C>> Buffer<V>.permSortByDescending(selector: (V) -> C) : IntArray = _permSortWith(compareByDescending<Int> { selector(get(it)) })
+public fun <V, C : Comparable<C>> Buffer<V>.indicesSortedByDescending(selector: (V) -> C): IntArray =
+    permSortIndicesWith(compareByDescending { selector(get(it)) })
+
+@OptIn(UnstableKMathAPI::class)
+public fun <V, C : Comparable<C>> Buffer<V>.sortedByDescending(selector: (V) -> C): Buffer<V> {
+    val permutations = indicesSortedByDescending(selector)
+    return VirtualBuffer(size) { this[permutations[it]] }
+}
 
-@PerformancePitfall
 @UnstableKMathAPI
-public fun <V> Buffer<V>.permSortWith(comparator : Comparator<V>) : IntArray = _permSortWith { i1, i2 -> comparator.compare(get(i1), get(i2)) }
+public fun <V> Buffer<V>.indicesSortedWith(comparator: Comparator<V>): IntArray =
+    permSortIndicesWith { i1, i2 -> comparator.compare(get(i1), get(i2)) }
 
-@PerformancePitfall
-@UnstableKMathAPI
-private fun <V> Buffer<V>._permSortWith(comparator : Comparator<Int>) : IntArray {
-    if (size < 2) return IntArray(size)
+private fun <V> Buffer<V>.permSortIndicesWith(comparator: Comparator<Int>): IntArray {
+    if (size < 2) return IntArray(size) { 0 }
 
-    /* TODO: optimisation : keep a constant big array of indices (Ex: from 0 to 4096), then create indice
+    /* TODO: optimisation : keep a constant big array of indices (Ex: from 0 to 4096), then create indices
      * arrays more efficiently by copying subpart of cached one. For bigger needs, we could copy entire
      * cached array, then fill remaining indices manually. Not done for now, because:
      *  1. doing it right would require some statistics about common used buffer sizes.
@@ -53,3 +81,12 @@ private fun <V> Buffer<V>._permSortWith(comparator : Comparator<Int>) : IntArray
      */
     return packedIndices.sortedWith(comparator).toIntArray()
 }
+
+/**
+ * Checks that the [Buffer] is sorted (ascending) and throws [IllegalArgumentException] if it is not.
+ */
+public fun <T : Comparable<T>> Buffer<T>.requireSorted() {
+    for (i in 0..(size - 2)) {
+        require(get(i + 1) >= get(i)) { "The buffer is not sorted at index $i" }
+    }
+}
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
index 0a2bb9138..4a724ac5f 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
@@ -6,14 +6,13 @@
 package space.kscience.kmath.misc
 
 import space.kscience.kmath.misc.PermSortTest.Platform.*
-import kotlin.random.Random
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
 import space.kscience.kmath.structures.IntBuffer
 import space.kscience.kmath.structures.asBuffer
+import kotlin.random.Random
+import kotlin.test.Test
 import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 
 class PermSortTest {
 
@@ -29,9 +28,9 @@ class PermSortTest {
     @Test
     fun testOnEmptyBuffer() {
         val emptyBuffer = IntBuffer(0) {it}
-        var permutations = emptyBuffer.permSort()
+        var permutations = emptyBuffer.indicesSorted()
         assertTrue(permutations.isEmpty(), "permutation on an empty buffer should return an empty result")
-        permutations = emptyBuffer.permSortDescending()
+        permutations = emptyBuffer.indicesSortedDescending()
         assertTrue(permutations.isEmpty(), "permutation on an empty buffer should return an empty result")
     }
 
@@ -47,25 +46,25 @@ class PermSortTest {
 
     @Test
     fun testPermSortBy() {
-        val permutations = platforms.permSortBy { it.name }
+        val permutations = platforms.indicesSortedBy { it.name }
         val expected = listOf(ANDROID, JS, JVM, NATIVE, WASM)
         assertContentEquals(expected, permutations.map { platforms[it] }, "Ascending PermSort by name")
     }
 
     @Test
     fun testPermSortByDescending() {
-        val permutations = platforms.permSortByDescending { it.name }
+        val permutations = platforms.indicesSortedByDescending { it.name }
         val expected = listOf(WASM, NATIVE, JVM, JS, ANDROID)
         assertContentEquals(expected, permutations.map { platforms[it] }, "Descending PermSort by name")
     }
 
     @Test
     fun testPermSortWith() {
-        var permutations = platforms.permSortWith { p1, p2 -> p1.name.length.compareTo(p2.name.length) }
+        var permutations = platforms.indicesSortedWith { p1, p2 -> p1.name.length.compareTo(p2.name.length) }
         val expected = listOf(JS, JVM, WASM, NATIVE, ANDROID)
         assertContentEquals(expected, permutations.map { platforms[it] }, "PermSort using custom ascending comparator")
 
-        permutations = platforms.permSortWith(compareByDescending { it.name.length })
+        permutations = platforms.indicesSortedWith(compareByDescending { it.name.length })
         assertContentEquals(expected.reversed(), permutations.map { platforms[it] }, "PermSort using custom descending comparator")
     }
 
@@ -75,7 +74,7 @@ class PermSortTest {
         println("Test randomization seed: $seed")
 
         val buffer = Random(seed).buffer(bufferSize)
-        val indices = buffer.permSort()
+        val indices = buffer.indicesSorted()
 
         assertEquals(bufferSize, indices.size)
         // Ensure no doublon is present in indices
@@ -87,7 +86,7 @@ class PermSortTest {
             assertTrue(current <= next, "Permutation indices not properly sorted")
         }
 
-        val descIndices = buffer.permSortDescending()
+        val descIndices = buffer.indicesSortedDescending()
         assertEquals(bufferSize, descIndices.size) 
         // Ensure no doublon is present in indices
         assertEquals(descIndices.toSet().size, descIndices.size)
diff --git a/kmath-for-real/build.gradle.kts b/kmath-for-real/build.gradle.kts
index 4cccaef5c..18c2c50ad 100644
--- a/kmath-for-real/build.gradle.kts
+++ b/kmath-for-real/build.gradle.kts
@@ -21,19 +21,22 @@ readme {
 
     feature(
         id = "DoubleVector",
-        description = "Numpy-like operations for Buffers/Points",
         ref = "src/commonMain/kotlin/space/kscience/kmath/real/DoubleVector.kt"
-    )
+    ){
+        "Numpy-like operations for Buffers/Points"
+    }
 
     feature(
         id = "DoubleMatrix",
-        description = "Numpy-like operations for 2d real structures",
         ref = "src/commonMain/kotlin/space/kscience/kmath/real/DoubleMatrix.kt"
-    )
+    ){
+        "Numpy-like operations for 2d real structures"
+    }
 
     feature(
         id = "grids",
-        description = "Uniform grid generators",
         ref = "src/commonMain/kotlin/space/kscience/kmath/structures/grids.kt"
-    )
+    ){
+        "Uniform grid generators"
+    }
 }
diff --git a/kmath-histograms/build.gradle.kts b/kmath-histograms/build.gradle.kts
index 7e511faa0..51271bb0a 100644
--- a/kmath-histograms/build.gradle.kts
+++ b/kmath-histograms/build.gradle.kts
@@ -17,6 +17,8 @@ kotlin.sourceSets {
     commonTest {
         dependencies {
             implementation(project(":kmath-for-real"))
+            implementation(projects.kmath.kmathStat)
+            implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0")
         }
     }
 }
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramGroup.kt
similarity index 96%
rename from kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
rename to kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramGroup.kt
index c0df8c2cc..a80ed119c 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramGroup.kt
@@ -16,11 +16,11 @@ import kotlin.math.floor
 /**
  * Multivariate histogram space for hyper-square real-field bins.
  */
-public class DoubleHistogramSpace(
+public class DoubleHistogramGroup(
     private val lower: Buffer<Double>,
     private val upper: Buffer<Double>,
     private val binNums: IntArray = IntArray(lower.size) { 20 },
-) : IndexedHistogramSpace<Double, Double> {
+) : IndexedHistogramGroup<Double, Double> {
 
     init {
         // argument checks
@@ -105,7 +105,7 @@ public class DoubleHistogramSpace(
          */
         public fun fromRanges(
             vararg ranges: ClosedFloatingPointRange<Double>,
-        ): DoubleHistogramSpace = DoubleHistogramSpace(
+        ): DoubleHistogramGroup = DoubleHistogramGroup(
             ranges.map(ClosedFloatingPointRange<Double>::start).asBuffer(),
             ranges.map(ClosedFloatingPointRange<Double>::endInclusive).asBuffer()
         )
@@ -121,7 +121,7 @@ public class DoubleHistogramSpace(
          */
         public fun fromRanges(
             vararg ranges: Pair<ClosedFloatingPointRange<Double>, Int>,
-        ): DoubleHistogramSpace = DoubleHistogramSpace(
+        ): DoubleHistogramGroup = DoubleHistogramGroup(
             ListBuffer(
                 ranges
                     .map(Pair<ClosedFloatingPointRange<Double>, Int>::first)
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
index 4f193f943..237bd87b9 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.histogram
 
 import space.kscience.kmath.domains.Domain1D
+import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.Buffer
@@ -18,7 +19,7 @@ import space.kscience.kmath.structures.Buffer
  * @property standardDeviation Standard deviation of the bin value. Zero or negative if not applicable
  */
 @UnstableKMathAPI
-public class Bin1D<T : Comparable<T>, out V>(
+public data class Bin1D<T : Comparable<T>, out V>(
     public val domain: Domain1D<T>,
     override val binValue: V,
 ) : Bin<T, V>, ClosedRange<T> by domain.range {
@@ -35,12 +36,15 @@ public interface Histogram1D<T : Comparable<T>, V> : Histogram<T, V, Bin1D<T, V>
     override operator fun get(point: Buffer<T>): Bin1D<T, V>? = get(point[0])
 }
 
-@UnstableKMathAPI
 public interface Histogram1DBuilder<in T : Any, V : Any> : HistogramBuilder<T, V> {
     /**
      * Thread safe put operation
      */
     public fun putValue(at: T, value: V = defaultValue)
+
+    override fun putValue(point: Point<out T>, value: V) {
+        putValue(point[0], value)
+    }
 }
 
 @UnstableKMathAPI
@@ -52,5 +56,5 @@ public fun Histogram1DBuilder<Double, *>.fill(array: DoubleArray): Unit =
     array.forEach(this::putValue)
 
 @UnstableKMathAPI
-public fun Histogram1DBuilder<Double, *>.fill(buffer: Buffer<Double>): Unit =
+public fun <T: Any> Histogram1DBuilder<T, *>.fill(buffer: Buffer<T>): Unit =
     buffer.asSequence().forEach(this::putValue)
\ No newline at end of file
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
similarity index 93%
rename from kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
rename to kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
index 3e4b07984..9749f8403 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramSpace.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
@@ -28,7 +28,7 @@ public data class DomainBin<in T : Comparable<T>, out V>(
  * @param V the type of bin value
  */
 public class IndexedHistogram<T : Comparable<T>, V : Any>(
-    public val histogramSpace: IndexedHistogramSpace<T, V>,
+    public val histogramSpace: IndexedHistogramGroup<T, V>,
     public val values: StructureND<V>,
 ) : Histogram<T, V, DomainBin<T, V>> {
 
@@ -48,8 +48,8 @@ public class IndexedHistogram<T : Comparable<T>, V : Any>(
 /**
  * A space for producing histograms with values in a NDStructure
  */
-public interface IndexedHistogramSpace<T : Comparable<T>, V : Any>
-    : Group<IndexedHistogram<T, V>>, ScaleOperations<IndexedHistogram<T, V>> {
+public interface IndexedHistogramGroup<T : Comparable<T>, V : Any> : Group<IndexedHistogram<T, V>>,
+    ScaleOperations<IndexedHistogram<T, V>> {
     public val shape: Shape
     public val histogramValueAlgebra: FieldND<V, *> //= NDAlgebra.space(valueSpace, Buffer.Companion::boxing, *shape),
 
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
index ed8b2e29d..44638c29b 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
@@ -5,8 +5,92 @@
 
 package space.kscience.kmath.histogram
 
-//class UniformHistogram1D(
-//    public val borders: Buffer<Double>,
-//    public val values: Buffer<Long>,
-//) : Histogram1D<Double, Long> {
-//}
\ No newline at end of file
+import space.kscience.kmath.domains.DoubleDomain1D
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Group
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.ScaleOperations
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.Buffer
+import kotlin.math.floor
+
+@OptIn(UnstableKMathAPI::class)
+public class UniformHistogram1D<V : Any>(
+    public val group: UniformHistogram1DGroup<V, *>,
+    public val values: Map<Int, V>,
+) : Histogram1D<Double, V> {
+
+    private val startPoint get() = group.startPoint
+    private val binSize get() = group.binSize
+
+    private fun produceBin(index: Int, value: V): Bin1D<Double, V> {
+        val domain = DoubleDomain1D((startPoint + index * binSize)..(startPoint + (index + 1) * binSize))
+        return Bin1D(domain, value)
+    }
+
+    override val bins: Iterable<Bin1D<Double, V>> get() = values.map { produceBin(it.key, it.value) }
+
+    override fun get(value: Double): Bin1D<Double, V>? {
+        val index: Int = group.getIndex(value)
+        val v = values[index]
+        return v?.let { produceBin(index, it) }
+    }
+}
+
+public class UniformHistogram1DGroup<V : Any, A>(
+    public val valueAlgebra: A,
+    public val binSize: Double,
+    public val startPoint: Double = 0.0,
+) : Group<UniformHistogram1D<V>>, ScaleOperations<UniformHistogram1D<V>> where A : Ring<V>, A : ScaleOperations<V> {
+    override val zero: UniformHistogram1D<V> by lazy { UniformHistogram1D(this, emptyMap()) }
+
+    public fun getIndex(at: Double): Int = floor((at - startPoint) / binSize).toInt()
+
+    override fun add(left: UniformHistogram1D<V>, right: UniformHistogram1D<V>): UniformHistogram1D<V> = valueAlgebra {
+        require(left.group == this@UniformHistogram1DGroup)
+        require(right.group == this@UniformHistogram1DGroup)
+        val keys = left.values.keys + right.values.keys
+        UniformHistogram1D(
+            this@UniformHistogram1DGroup,
+            keys.associateWith { (left.values[it] ?: valueAlgebra.zero) + (right.values[it] ?: valueAlgebra.zero) }
+        )
+    }
+
+    override fun UniformHistogram1D<V>.unaryMinus(): UniformHistogram1D<V> = valueAlgebra {
+        UniformHistogram1D(this@UniformHistogram1DGroup, values.mapValues { -it.value })
+    }
+
+    override fun scale(
+        a: UniformHistogram1D<V>,
+        value: Double,
+    ): UniformHistogram1D<V> = UniformHistogram1D(
+        this@UniformHistogram1DGroup,
+        a.values.mapValues { valueAlgebra.scale(it.value, value) }
+    )
+
+    public inline fun produce(block: Histogram1DBuilder<Double, V>.() -> Unit): UniformHistogram1D<V> {
+        val map = HashMap<Int, V>()
+        val builder = object : Histogram1DBuilder<Double, V> {
+            override val defaultValue: V get() = valueAlgebra.zero
+
+            override fun putValue(at: Double, value: V) {
+                val index = getIndex(at)
+                map[index] = with(valueAlgebra) { (map[index] ?: zero) + one }
+            }
+        }
+        builder.block()
+        return UniformHistogram1D(this, map)
+    }
+}
+
+public fun <V : Any, A> Histogram.Companion.uniform1D(
+    algebra: A,
+    binSize: Double,
+    startPoint: Double = 0.0,
+): UniformHistogram1DGroup<V, A> where A : Ring<V>, A : ScaleOperations<V> =
+    UniformHistogram1DGroup(algebra, binSize, startPoint)
+
+@UnstableKMathAPI
+public fun <V : Any> UniformHistogram1DGroup<V, *>.produce(
+    buffer: Buffer<Double>,
+): UniformHistogram1D<V> = produce { fill(buffer) }
\ No newline at end of file
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
index 31a29676c..1426b35fa 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
@@ -14,7 +14,7 @@ import kotlin.test.*
 internal class MultivariateHistogramTest {
     @Test
     fun testSinglePutHistogram() {
-        val hSpace = DoubleHistogramSpace.fromRanges(
+        val hSpace = DoubleHistogramGroup.fromRanges(
             (-1.0..1.0),
             (-1.0..1.0)
         )
@@ -29,7 +29,7 @@ internal class MultivariateHistogramTest {
 
     @Test
     fun testSequentialPut() {
-        val hSpace = DoubleHistogramSpace.fromRanges(
+        val hSpace = DoubleHistogramGroup.fromRanges(
             (-1.0..1.0),
             (-1.0..1.0),
             (-1.0..1.0)
@@ -49,7 +49,7 @@ internal class MultivariateHistogramTest {
 
     @Test
     fun testHistogramAlgebra() {
-        DoubleHistogramSpace.fromRanges(
+        DoubleHistogramGroup.fromRanges(
             (-1.0..1.0),
             (-1.0..1.0),
             (-1.0..1.0)
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
new file mode 100644
index 000000000..d23afdb8b
--- /dev/null
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.histogram
+
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import space.kscience.kmath.distributions.NormalDistribution
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.stat.nextBuffer
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+@OptIn(ExperimentalCoroutinesApi::class, UnstableKMathAPI::class)
+internal class UniformHistogram1DTest {
+    @Test
+    fun normal() = runTest {
+        val generator = RandomGenerator.default(123)
+        val distribution = NormalDistribution(0.0, 1.0)
+        with(Histogram.uniform1D(DoubleField, 0.1)) {
+            val h1 = produce(distribution.nextBuffer(generator, 10000))
+
+            val h2 = produce(distribution.nextBuffer(generator, 50000))
+
+            val h3 = h1 + h2
+
+            assertEquals(60000, h3.bins.sumOf { it.binValue }.toInt())
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
index 3d3f95f8f..8dbcb3367 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
@@ -27,7 +27,7 @@ public interface Distribution<T : Any> : Sampler<T> {
     public companion object
 }
 
-public interface UnivariateDistribution<T : Comparable<T>> : Distribution<T> {
+public interface Distribution1D<T : Comparable<T>> : Distribution<T> {
     /**
      * Cumulative distribution for ordered parameter (CDF)
      */
@@ -37,7 +37,7 @@ public interface UnivariateDistribution<T : Comparable<T>> : Distribution<T> {
 /**
  * Compute probability integral in an interval
  */
-public fun <T : Comparable<T>> UnivariateDistribution<T>.integral(from: T, to: T): Double {
+public fun <T : Comparable<T>> Distribution1D<T>.integral(from: T, to: T): Double {
     require(to > from)
     return cumulative(to) - cumulative(from)
 }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
index 66e041f05..cfc6eba04 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
@@ -14,14 +14,9 @@ import space.kscience.kmath.stat.RandomGenerator
 import kotlin.math.*
 
 /**
- * Implements [UnivariateDistribution] for the normal (gaussian) distribution.
+ * Implements [Distribution1D] for the normal (gaussian) distribution.
  */
-public class NormalDistribution(public val sampler: GaussianSampler) : UnivariateDistribution<Double> {
-    public constructor(
-        mean: Double,
-        standardDeviation: Double,
-        normalized: NormalizedGaussianSampler = ZigguratNormalizedGaussianSampler,
-    ) : this(GaussianSampler(mean, standardDeviation, normalized))
+public class NormalDistribution(public val sampler: GaussianSampler) : Distribution1D<Double> {
 
     override fun probability(arg: Double): Double {
         val x1 = (arg - sampler.mean) / sampler.standardDeviation
@@ -43,3 +38,9 @@ public class NormalDistribution(public val sampler: GaussianSampler) : Univariat
         private val SQRT2 = sqrt(2.0)
     }
 }
+
+public fun NormalDistribution(
+    mean: Double,
+    standardDeviation: Double,
+    normalized: NormalizedGaussianSampler = ZigguratNormalizedGaussianSampler,
+): NormalDistribution = NormalDistribution(GaussianSampler(mean, standardDeviation, normalized))
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
index 0dd121f3b..c96ecdc8c 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
@@ -67,3 +67,12 @@ public fun Sampler<Double>.sampleBuffer(generator: RandomGenerator, size: Int):
 @JvmName("sampleIntBuffer")
 public fun Sampler<Int>.sampleBuffer(generator: RandomGenerator, size: Int): Chain<Buffer<Int>> =
     sampleBuffer(generator, size, ::IntBuffer)
+
+
+/**
+ * Samples a [Buffer] of values from this [Sampler].
+ */
+public suspend fun Sampler<Double>.nextBuffer(generator: RandomGenerator, size: Int): Buffer<Double> =
+    sampleBuffer(generator, size).first()
+
+//TODO add `context(RandomGenerator) Sampler.nextBuffer
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
index 970a3aab5..20cc0e802 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
@@ -8,9 +8,9 @@ package space.kscience.kmath.stat
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.chains.SimpleChain
 import space.kscience.kmath.distributions.Distribution
-import space.kscience.kmath.distributions.UnivariateDistribution
+import space.kscience.kmath.distributions.Distribution1D
 
-public class UniformDistribution(public val range: ClosedFloatingPointRange<Double>) : UnivariateDistribution<Double> {
+public class UniformDistribution(public val range: ClosedFloatingPointRange<Double>) : Distribution1D<Double> {
     private val length: Double = range.endInclusive - range.start
 
     override fun probability(arg: Double): Double = if (arg in range) 1.0 / length else 0.0
-- 
2.34.1


From a2c0bc8a1012b437b1e91edd09e00327467e01f0 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 8 Apr 2022 19:41:41 +0300
Subject: [PATCH 488/713] Another histogram refactor

---
 .../kmath/histogram/UniformHistogram1D.kt     | 24 +++++++++++++++++++
 .../kmath/histogram/UniformHistogram1DTest.kt | 16 ++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
index 44638c29b..e2811602c 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
@@ -81,6 +81,30 @@ public class UniformHistogram1DGroup<V : Any, A>(
         builder.block()
         return UniformHistogram1D(this, map)
     }
+
+    /**
+     * Re-bin given histogram to be compatible if exiting bin fully falls inside existing bin, this bin value
+     * is increased by one. If not, all bins including values from this bin are increased by fraction
+     * (conserving the norming).
+     */
+    @UnstableKMathAPI
+    public fun produceFrom(histogram: Histogram1D<Double, V>): UniformHistogram1D<V> =
+        if ((histogram as? UniformHistogram1D)?.group == this) histogram
+        else {
+            val map = HashMap<Int, V>()
+            histogram.bins.forEach { bin ->
+                val range = bin.domain.range
+                val indexOfLeft = getIndex(range.start)
+                val indexOfRight = getIndex(range.endInclusive)
+                val numBins = indexOfRight - indexOfLeft + 1
+                for (i in indexOfLeft..indexOfRight) {
+                    map[indexOfLeft] = with(valueAlgebra) {
+                        (map[indexOfLeft] ?: zero) + bin.binValue / numBins
+                    }
+                }
+            }
+            UniformHistogram1D(this, map)
+        }
 }
 
 public fun <V : Any, A> Histogram.Companion.uniform1D(
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
index d23afdb8b..8d5cb8fb1 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
@@ -12,14 +12,15 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.stat.nextBuffer
+import kotlin.native.concurrent.ThreadLocal
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 @OptIn(ExperimentalCoroutinesApi::class, UnstableKMathAPI::class)
 internal class UniformHistogram1DTest {
+
     @Test
     fun normal() = runTest {
-        val generator = RandomGenerator.default(123)
         val distribution = NormalDistribution(0.0, 1.0)
         with(Histogram.uniform1D(DoubleField, 0.1)) {
             val h1 = produce(distribution.nextBuffer(generator, 10000))
@@ -31,4 +32,17 @@ internal class UniformHistogram1DTest {
             assertEquals(60000, h3.bins.sumOf { it.binValue }.toInt())
         }
     }
+
+    @Test
+    fun rebin() = runTest {
+        val h1 = Histogram.uniform1D(DoubleField, 0.1).produce(generator.nextDoubleBuffer(10000))
+        val h2 = Histogram.uniform1D(DoubleField,0.3).produceFrom(h1)
+
+        assertEquals(10000, h2.bins.sumOf { it.binValue }.toInt())
+    }
+
+    @ThreadLocal
+    companion object{
+        private val generator = RandomGenerator.default(123)
+    }
 }
\ No newline at end of file
-- 
2.34.1


From 3a2faa7da480cee97d2ddb682721ee85f4a57366 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 9 Apr 2022 10:18:18 +0300
Subject: [PATCH 489/713] Generalize UniformHistogram1D

---
 .../kmath/histogram/UniformHistogram1D.kt     | 40 +++++++++++++------
 .../kmath/histogram/UniformHistogram1DTest.kt | 14 +++++--
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
index e2811602c..758e7969a 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
@@ -37,37 +37,53 @@ public class UniformHistogram1D<V : Any>(
     }
 }
 
+/**
+ * An algebra for uniform histograms in 1D real space
+ */
 public class UniformHistogram1DGroup<V : Any, A>(
     public val valueAlgebra: A,
     public val binSize: Double,
     public val startPoint: Double = 0.0,
-) : Group<UniformHistogram1D<V>>, ScaleOperations<UniformHistogram1D<V>> where A : Ring<V>, A : ScaleOperations<V> {
+) : Group<Histogram1D<Double, V>>, ScaleOperations<Histogram1D<Double, V>> where A : Ring<V>, A : ScaleOperations<V> {
+
     override val zero: UniformHistogram1D<V> by lazy { UniformHistogram1D(this, emptyMap()) }
 
-    public fun getIndex(at: Double): Int = floor((at - startPoint) / binSize).toInt()
+    /**
+     * Get index of a bin
+     */
+    @PublishedApi
+    internal fun getIndex(at: Double): Int = floor((at - startPoint) / binSize).toInt()
 
-    override fun add(left: UniformHistogram1D<V>, right: UniformHistogram1D<V>): UniformHistogram1D<V> = valueAlgebra {
-        require(left.group == this@UniformHistogram1DGroup)
-        require(right.group == this@UniformHistogram1DGroup)
-        val keys = left.values.keys + right.values.keys
+    override fun add(
+        left: Histogram1D<Double, V>,
+        right: Histogram1D<Double, V>,
+    ): UniformHistogram1D<V> = valueAlgebra {
+        val leftUniform = produceFrom(left)
+        val rightUniform = produceFrom(right)
+        val keys = leftUniform.values.keys + rightUniform.values.keys
         UniformHistogram1D(
             this@UniformHistogram1DGroup,
-            keys.associateWith { (left.values[it] ?: valueAlgebra.zero) + (right.values[it] ?: valueAlgebra.zero) }
+            keys.associateWith {
+                (leftUniform.values[it] ?: valueAlgebra.zero) + (rightUniform.values[it] ?: valueAlgebra.zero)
+            }
         )
     }
 
-    override fun UniformHistogram1D<V>.unaryMinus(): UniformHistogram1D<V> = valueAlgebra {
-        UniformHistogram1D(this@UniformHistogram1DGroup, values.mapValues { -it.value })
+    override fun Histogram1D<Double, V>.unaryMinus(): UniformHistogram1D<V> = valueAlgebra {
+        UniformHistogram1D(this@UniformHistogram1DGroup, produceFrom(this@unaryMinus).values.mapValues { -it.value })
     }
 
     override fun scale(
-        a: UniformHistogram1D<V>,
+        a: Histogram1D<Double, V>,
         value: Double,
     ): UniformHistogram1D<V> = UniformHistogram1D(
         this@UniformHistogram1DGroup,
-        a.values.mapValues { valueAlgebra.scale(it.value, value) }
+        produceFrom(a).values.mapValues { valueAlgebra.scale(it.value, value) }
     )
 
+    /**
+     *
+     */
     public inline fun produce(block: Histogram1DBuilder<Double, V>.() -> Unit): UniformHistogram1D<V> {
         val map = HashMap<Int, V>()
         val builder = object : Histogram1DBuilder<Double, V> {
@@ -87,7 +103,7 @@ public class UniformHistogram1DGroup<V : Any, A>(
      * is increased by one. If not, all bins including values from this bin are increased by fraction
      * (conserving the norming).
      */
-    @UnstableKMathAPI
+    @OptIn(UnstableKMathAPI::class)
     public fun produceFrom(histogram: Histogram1D<Double, V>): UniformHistogram1D<V> =
         if ((histogram as? UniformHistogram1D)?.group == this) histogram
         else {
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
index 8d5cb8fb1..09bf3939d 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
@@ -34,9 +34,17 @@ internal class UniformHistogram1DTest {
     }
 
     @Test
-    fun rebin() = runTest {
-        val h1 = Histogram.uniform1D(DoubleField, 0.1).produce(generator.nextDoubleBuffer(10000))
-        val h2 = Histogram.uniform1D(DoubleField,0.3).produceFrom(h1)
+    fun rebinDown() = runTest {
+        val h1 = Histogram.uniform1D(DoubleField, 0.01).produce(generator.nextDoubleBuffer(10000))
+        val h2 = Histogram.uniform1D(DoubleField,0.03).produceFrom(h1)
+
+        assertEquals(10000, h2.bins.sumOf { it.binValue }.toInt())
+    }
+
+    @Test
+    fun rebinUp() = runTest {
+        val h1 = Histogram.uniform1D(DoubleField, 0.03).produce(generator.nextDoubleBuffer(10000))
+        val h2 = Histogram.uniform1D(DoubleField,0.01).produceFrom(h1)
 
         assertEquals(10000, h2.bins.sumOf { it.binValue }.toInt())
     }
-- 
2.34.1


From eba3a2526e0ca604947e71b5125565f57497623a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 10 Apr 2022 09:48:55 +0300
Subject: [PATCH 490/713] [final] Generalize UniformHistogram1D

---
 .../kscience/kmath/histogram/Histogram1D.kt   |  9 ++--
 .../kmath/histogram/UniformHistogram1D.kt     | 54 +++++++++++++------
 2 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
index 237bd87b9..0c9352e76 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.histogram
 
 import space.kscience.kmath.domains.Domain1D
+import space.kscience.kmath.domains.center
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.asSequence
@@ -16,7 +17,6 @@ import space.kscience.kmath.structures.Buffer
  * A univariate bin based on a range
  *
  * @property binValue The value of histogram including weighting
- * @property standardDeviation Standard deviation of the bin value. Zero or negative if not applicable
  */
 @UnstableKMathAPI
 public data class Bin1D<T : Comparable<T>, out V>(
@@ -56,5 +56,8 @@ public fun Histogram1DBuilder<Double, *>.fill(array: DoubleArray): Unit =
     array.forEach(this::putValue)
 
 @UnstableKMathAPI
-public fun <T: Any> Histogram1DBuilder<T, *>.fill(buffer: Buffer<T>): Unit =
-    buffer.asSequence().forEach(this::putValue)
\ No newline at end of file
+public fun <T : Any> Histogram1DBuilder<T, *>.fill(buffer: Buffer<T>): Unit =
+    buffer.asSequence().forEach(this::putValue)
+
+@OptIn(UnstableKMathAPI::class)
+public val Bin1D<Double, *>.center: Double get() = domain.center
\ No newline at end of file
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
index 758e7969a..93eca192f 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
@@ -17,7 +17,7 @@ import kotlin.math.floor
 @OptIn(UnstableKMathAPI::class)
 public class UniformHistogram1D<V : Any>(
     public val group: UniformHistogram1DGroup<V, *>,
-    public val values: Map<Int, V>,
+    internal val values: Map<Int, V>,
 ) : Histogram1D<Double, V> {
 
     private val startPoint get() = group.startPoint
@@ -82,7 +82,7 @@ public class UniformHistogram1DGroup<V : Any, A>(
     )
 
     /**
-     *
+     * Fill histogram.
      */
     public inline fun produce(block: Histogram1DBuilder<Double, V>.() -> Unit): UniformHistogram1D<V> {
         val map = HashMap<Int, V>()
@@ -104,23 +104,25 @@ public class UniformHistogram1DGroup<V : Any, A>(
      * (conserving the norming).
      */
     @OptIn(UnstableKMathAPI::class)
-    public fun produceFrom(histogram: Histogram1D<Double, V>): UniformHistogram1D<V> =
-        if ((histogram as? UniformHistogram1D)?.group == this) histogram
-        else {
-            val map = HashMap<Int, V>()
-            histogram.bins.forEach { bin ->
-                val range = bin.domain.range
-                val indexOfLeft = getIndex(range.start)
-                val indexOfRight = getIndex(range.endInclusive)
-                val numBins = indexOfRight - indexOfLeft + 1
-                for (i in indexOfLeft..indexOfRight) {
-                    map[indexOfLeft] = with(valueAlgebra) {
-                        (map[indexOfLeft] ?: zero) + bin.binValue / numBins
-                    }
+    public fun produceFrom(
+        histogram: Histogram1D<Double, V>,
+    ): UniformHistogram1D<V> = if ((histogram as? UniformHistogram1D)?.group == this) {
+        histogram
+    } else {
+        val map = HashMap<Int, V>()
+        histogram.bins.forEach { bin ->
+            val range = bin.domain.range
+            val indexOfLeft = getIndex(range.start)
+            val indexOfRight = getIndex(range.endInclusive)
+            val numBins = indexOfRight - indexOfLeft + 1
+            for (i in indexOfLeft..indexOfRight) {
+                map[indexOfLeft] = with(valueAlgebra) {
+                    (map[indexOfLeft] ?: zero) + bin.binValue / numBins
                 }
             }
-            UniformHistogram1D(this, map)
         }
+        UniformHistogram1D(this, map)
+    }
 }
 
 public fun <V : Any, A> Histogram.Companion.uniform1D(
@@ -133,4 +135,22 @@ public fun <V : Any, A> Histogram.Companion.uniform1D(
 @UnstableKMathAPI
 public fun <V : Any> UniformHistogram1DGroup<V, *>.produce(
     buffer: Buffer<Double>,
-): UniformHistogram1D<V> = produce { fill(buffer) }
\ No newline at end of file
+): UniformHistogram1D<V> = produce { fill(buffer) }
+
+/**
+ * Map of bin centers to bin values
+ */
+@OptIn(UnstableKMathAPI::class)
+public val <V : Any> UniformHistogram1D<V>.binValues: Map<Double, V>
+    get() = bins.associate { it.center to it.binValue }
+
+
+//TODO add normalized values inside Field-based histogram spaces with context receivers
+///**
+// * Map of bin centers to normalized bin values (bin size as normalization)
+// */
+//@OptIn(UnstableKMathAPI::class)
+//public val <V : Any> UniformHistogram1D<V>.binValuesNormalized: Map<Double, V>
+//    get() = group.valueAlgebra {
+//        bins.associate { it.center to it.binValue / group.binSize }
+//    }
\ No newline at end of file
-- 
2.34.1


From 86d89f89f904c8dd7bd70f5f596c78d63560a82f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Sun, 10 Apr 2022 10:29:44 +0300
Subject: [PATCH 491/713] Update
 kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt

Co-authored-by: Iaroslav Postovalov <38042667+CommanderTvis@users.noreply.github.com>
---
 .../space/kscience/kmath/histogram/IndexedHistogramGroup.kt  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
index 9749f8403..b1d317a15 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
@@ -68,8 +68,9 @@ public interface IndexedHistogramGroup<T : Comparable<T>, V : Any> : Group<Index
     public fun produce(builder: HistogramBuilder<T, V>.() -> Unit): IndexedHistogram<T, V>
 
     override fun add(left: IndexedHistogram<T, V>, right: IndexedHistogram<T, V>): IndexedHistogram<T, V> {
-        require(left.histogramSpace == this) { "Can't operate on a histogram produced by external space" }
-        require(right.histogramSpace == this) { "Can't operate on a histogram produced by external space" }
+        require(left.histogramSpace == this && right.histogramSpace == this) {
+            "A histogram belonging to a different group cannot be operated."
+        }
         return IndexedHistogram(this, histogramValueAlgebra { left.values + right.values })
     }
 
-- 
2.34.1


From 40b088149bece382affa6016954e0f28fb0e35b5 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Sun, 10 Apr 2022 10:29:59 +0300
Subject: [PATCH 492/713] Update
 kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt

Co-authored-by: Iaroslav Postovalov <38042667+CommanderTvis@users.noreply.github.com>
---
 .../space/kscience/kmath/histogram/IndexedHistogramGroup.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
index b1d317a15..22306049c 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
@@ -75,7 +75,7 @@ public interface IndexedHistogramGroup<T : Comparable<T>, V : Any> : Group<Index
     }
 
     override fun scale(a: IndexedHistogram<T, V>, value: Double): IndexedHistogram<T, V> {
-        require(a.histogramSpace == this) { "Can't operate on a histogram produced by external space" }
+        require(a.histogramSpace == this) { "A histogram belonging to a different group cannot be operated." }
         return IndexedHistogram(this, histogramValueAlgebra { a.values * value })
     }
 
-- 
2.34.1


From 229c36b6616f1a24b85e327673c6283f3d2f9279 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 10 Apr 2022 10:32:36 +0300
Subject: [PATCH 493/713] Accept changes

---
 .../kmath/histogram/IndexedHistogramGroup.kt     | 16 ++++++++--------
 .../kmath/histogram/UniformHistogram1D.kt        |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
index 22306049c..6c04f01bf 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
@@ -28,20 +28,20 @@ public data class DomainBin<in T : Comparable<T>, out V>(
  * @param V the type of bin value
  */
 public class IndexedHistogram<T : Comparable<T>, V : Any>(
-    public val histogramSpace: IndexedHistogramGroup<T, V>,
+    public val histogramGroup: IndexedHistogramGroup<T, V>,
     public val values: StructureND<V>,
 ) : Histogram<T, V, DomainBin<T, V>> {
 
     override fun get(point: Point<T>): DomainBin<T, V>? {
-        val index = histogramSpace.getIndex(point) ?: return null
-        return histogramSpace.produceBin(index, values[index])
+        val index = histogramGroup.getIndex(point) ?: return null
+        return histogramGroup.produceBin(index, values[index])
     }
 
-    override val dimension: Int get() = histogramSpace.shape.size
+    override val dimension: Int get() = histogramGroup.shape.size
 
     override val bins: Iterable<DomainBin<T, V>>
-        get() = DefaultStrides(histogramSpace.shape).asSequence().map {
-            histogramSpace.produceBin(it, values[it])
+        get() = DefaultStrides(histogramGroup.shape).asSequence().map {
+            histogramGroup.produceBin(it, values[it])
         }.asIterable()
 }
 
@@ -68,14 +68,14 @@ public interface IndexedHistogramGroup<T : Comparable<T>, V : Any> : Group<Index
     public fun produce(builder: HistogramBuilder<T, V>.() -> Unit): IndexedHistogram<T, V>
 
     override fun add(left: IndexedHistogram<T, V>, right: IndexedHistogram<T, V>): IndexedHistogram<T, V> {
-        require(left.histogramSpace == this && right.histogramSpace == this) {
+        require(left.histogramGroup == this && right.histogramGroup == this) {
             "A histogram belonging to a different group cannot be operated."
         }
         return IndexedHistogram(this, histogramValueAlgebra { left.values + right.values })
     }
 
     override fun scale(a: IndexedHistogram<T, V>, value: Double): IndexedHistogram<T, V> {
-        require(a.histogramSpace == this) { "A histogram belonging to a different group cannot be operated." }
+        require(a.histogramGroup == this) { "A histogram belonging to a different group cannot be operated." }
         return IndexedHistogram(this, histogramValueAlgebra { a.values * value })
     }
 
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
index 93eca192f..cb6572af9 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
@@ -46,7 +46,7 @@ public class UniformHistogram1DGroup<V : Any, A>(
     public val startPoint: Double = 0.0,
 ) : Group<Histogram1D<Double, V>>, ScaleOperations<Histogram1D<Double, V>> where A : Ring<V>, A : ScaleOperations<V> {
 
-    override val zero: UniformHistogram1D<V> by lazy { UniformHistogram1D(this, emptyMap()) }
+    override val zero: UniformHistogram1D<V> = UniformHistogram1D(this, emptyMap())
 
     /**
      * Get index of a bin
-- 
2.34.1


From 27a252b63700782b5005ac987686641a9f151031 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 10 Apr 2022 11:31:52 +0300
Subject: [PATCH 494/713] Accept changes, Update documentation

---
 .../space/kscience/kmath/domains/HyperSquareDomain.kt | 11 ++++++-----
 .../kscience/kmath/histogram/DoubleHistogramGroup.kt  |  4 ++--
 .../kscience/kmath/histogram/IndexedHistogramGroup.kt |  6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
index 2fac442e7..485416a69 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
@@ -11,16 +11,17 @@ import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.indices
 
 /**
- *
- * HyperSquareDomain class.
- *
- * @author Alexander Nozik
+ * A hyper-square (or hyper-cube) real-space domain. It is formed by a [Buffer] of [lower] boundaries
+ * and a [Buffer] of upper boundaries. Upper should be greater or equals than lower.
  */
 @UnstableKMathAPI
 public class HyperSquareDomain(public val lower: Buffer<Double>, public val upper: Buffer<Double>) : DoubleDomain {
     init {
         require(lower.size == upper.size) {
-            "Domain borders size mismatch. Lower borders size is ${lower.size}, but upper borders size is ${upper.size}"
+            "Domain borders size mismatch. Lower borders size is ${lower.size}, but upper borders size is ${upper.size}."
+        }
+        require(lower.indices.all { lower[it] <= upper[it] }) {
+            "Domain borders order mismatch. Lower borders must be less or equals than upper borders."
         }
     }
 
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramGroup.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramGroup.kt
index a80ed119c..bb66b5dc5 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramGroup.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramGroup.kt
@@ -45,7 +45,7 @@ public class DoubleHistogramGroup(
         else -> floor((value - lower[axis]) / binSize[axis]).toInt()
     }
 
-    override fun getIndex(point: Buffer<Double>): IntArray = IntArray(dimension) {
+    override fun getIndexOrNull(point: Buffer<Double>): IntArray = IntArray(dimension) {
         getIndex(it, point[it])
     }
 
@@ -82,7 +82,7 @@ public class DoubleHistogramGroup(
             override val defaultValue: Double get() = 1.0
 
             override fun putValue(point: Point<out Double>, value: Double) {
-                val index = getIndex(point)
+                val index = getIndexOrNull(point)
                 ndCounter[index].add(value)
             }
         }
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
index 6c04f01bf..70913ecfb 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
@@ -33,7 +33,7 @@ public class IndexedHistogram<T : Comparable<T>, V : Any>(
 ) : Histogram<T, V, DomainBin<T, V>> {
 
     override fun get(point: Point<T>): DomainBin<T, V>? {
-        val index = histogramGroup.getIndex(point) ?: return null
+        val index = histogramGroup.getIndexOrNull(point) ?: return null
         return histogramGroup.produceBin(index, values[index])
     }
 
@@ -54,9 +54,9 @@ public interface IndexedHistogramGroup<T : Comparable<T>, V : Any> : Group<Index
     public val histogramValueAlgebra: FieldND<V, *> //= NDAlgebra.space(valueSpace, Buffer.Companion::boxing, *shape),
 
     /**
-     * Resolve index of the bin including given [point]
+     * Resolve index of the bin including given [point]. Return null if point is outside histogram area
      */
-    public fun getIndex(point: Point<T>): IntArray?
+    public fun getIndexOrNull(point: Point<T>): IntArray?
 
     /**
      * Get a bin domain represented by given index
-- 
2.34.1


From 6247e79884069853f2c523013744826147b06354 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 10 Apr 2022 13:41:41 +0300
Subject: [PATCH 495/713] Refactor multivariate histograms

---
 CHANGELOG.md                                  |   1 +
 gradle.properties                             |   2 +
 .../space/kscience/kmath/nd/AlgebraND.kt      |   2 +-
 .../space/kscience/kmath/nd/BufferND.kt       |  23 ++-
 .../space/kscience/kmath/histogram/Counter.kt |   3 +-
 .../kmath/histogram/DoubleHistogramGroup.kt   | 140 ---------------
 .../kscience/kmath/histogram/Histogram.kt     |   9 +
 .../kscience/kmath/histogram/HistogramND.kt   |  76 ++++++++
 .../kmath/histogram/IndexedHistogramGroup.kt  |  84 ---------
 .../histogram/UniformHistogramGroupND.kt      | 163 ++++++++++++++++++
 .../histogram/MultivariateHistogramTest.kt    |   9 +-
 .../kmath/histogram/TreeHistogramSpace.kt     |   2 +-
 12 files changed, 275 insertions(+), 239 deletions(-)
 delete mode 100644 kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramGroup.kt
 create mode 100644 kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
 delete mode 100644 kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
 create mode 100644 kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d710c330b..bc5447449 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
 - Default Buffer and ND algebras are now Ops and lack neutral elements (0, 1) as well as algebra-level shapes.
 - Tensor algebra takes read-only structures as input and inherits AlgebraND
 - `UnivariateDistribution` renamed to `Distribution1D`
+- Rework of histograms.
 
 ### Deprecated
 - Specialized `DoubleBufferAlgebra`
diff --git a/gradle.properties b/gradle.properties
index a7cd2f876..847c3dda6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,8 @@ kotlin.code.style=official
 kotlin.jupyter.add.scanner=false
 kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
+kotlin.incremental.js.ir=true
+
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
 org.gradle.parallel=true
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index a071c1eb3..a9712e870 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -194,7 +194,7 @@ public interface RingOpsND<T, out A : RingOps<T>> : RingOps<StructureND<T>>, Gro
     override fun multiply(left: StructureND<T>, right: StructureND<T>): StructureND<T> =
         zip(left, right) { aValue, bValue -> multiply(aValue, bValue) }
 
-    //TODO move to extensions after KEEP-176
+    //TODO move to extensions with context receivers
 
     /**
      * Multiplies an ND structure by an element of it.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 539499794..2401f6319 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -32,18 +32,23 @@ public open class BufferND<out T>(
 /**
  * Transform structure to a new structure using provided [BufferFactory] and optimizing if argument is [BufferND]
  */
-public inline fun <T, reified R : Any> StructureND<T>.mapToBuffer(
-    factory: BufferFactory<R> = Buffer.Companion::auto,
+public inline fun <T, R : Any> StructureND<T>.mapToBuffer(
+    factory: BufferFactory<R>,
     crossinline transform: (T) -> R,
-): BufferND<R> {
-    return if (this is BufferND<T>)
-        BufferND(this.indices, factory.invoke(indices.linearSize) { transform(buffer[it]) })
-    else {
-        val strides = DefaultStrides(shape)
-        BufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
-    }
+): BufferND<R> = if (this is BufferND<T>)
+    BufferND(this.indices, factory.invoke(indices.linearSize) { transform(buffer[it]) })
+else {
+    val strides = DefaultStrides(shape)
+    BufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
 }
 
+/**
+ * Transform structure to a new structure using inferred [BufferFactory]
+ */
+public inline fun <T, reified R : Any> StructureND<T>.mapToBuffer(
+    crossinline transform: (T) -> R,
+): BufferND<R> = mapToBuffer(Buffer.Companion::auto, transform)
+
 /**
  * Represents [MutableStructureND] over [MutableBuffer].
  *
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
index 291284444..fe3278026 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
@@ -18,7 +18,8 @@ public interface Counter<T : Any> {
     public val value: T
 
     public companion object {
-        public fun double(): ObjectCounter<Double> = ObjectCounter(DoubleField)
+        public fun ofDouble(): ObjectCounter<Double> = ObjectCounter(DoubleField)
+        public fun <T: Any> of(group: Group<T>): ObjectCounter<T> = ObjectCounter(group)
     }
 }
 
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramGroup.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramGroup.kt
deleted file mode 100644
index bb66b5dc5..000000000
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/DoubleHistogramGroup.kt
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.histogram
-
-import space.kscience.kmath.domains.HyperSquareDomain
-import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.*
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.structures.*
-import kotlin.math.floor
-
-/**
- * Multivariate histogram space for hyper-square real-field bins.
- */
-public class DoubleHistogramGroup(
-    private val lower: Buffer<Double>,
-    private val upper: Buffer<Double>,
-    private val binNums: IntArray = IntArray(lower.size) { 20 },
-) : IndexedHistogramGroup<Double, Double> {
-
-    init {
-        // argument checks
-        require(lower.size == upper.size) { "Dimension mismatch in histogram lower and upper limits." }
-        require(lower.size == binNums.size) { "Dimension mismatch in bin count." }
-        require(!lower.indices.any { upper[it] - lower[it] < 0 }) { "Range for one of axis is not strictly positive" }
-    }
-
-    public val dimension: Int get() = lower.size
-
-    override val shape: IntArray = IntArray(binNums.size) { binNums[it] + 2 }
-    override val histogramValueAlgebra: DoubleFieldND = DoubleField.ndAlgebra(*shape)
-
-    private val binSize = DoubleBuffer(dimension) { (upper[it] - lower[it]) / binNums[it] }
-
-    /**
-     * Get internal [StructureND] bin index for given axis
-     */
-    private fun getIndex(axis: Int, value: Double): Int = when {
-        value >= upper[axis] -> binNums[axis] + 1 // overflow
-        value < lower[axis] -> 0 // underflow
-        else -> floor((value - lower[axis]) / binSize[axis]).toInt()
-    }
-
-    override fun getIndexOrNull(point: Buffer<Double>): IntArray = IntArray(dimension) {
-        getIndex(it, point[it])
-    }
-
-    @OptIn(UnstableKMathAPI::class)
-    override fun getDomain(index: IntArray): HyperSquareDomain {
-        val lowerBoundary = index.mapIndexed { axis, i ->
-            when (i) {
-                0 -> Double.NEGATIVE_INFINITY
-                shape[axis] - 1 -> upper[axis]
-                else -> lower[axis] + (i.toDouble()) * binSize[axis]
-            }
-        }.asBuffer()
-
-        val upperBoundary = index.mapIndexed { axis, i ->
-            when (i) {
-                0 -> lower[axis]
-                shape[axis] - 1 -> Double.POSITIVE_INFINITY
-                else -> lower[axis] + (i.toDouble() + 1) * binSize[axis]
-            }
-        }.asBuffer()
-
-        return HyperSquareDomain(lowerBoundary, upperBoundary)
-    }
-
-    @OptIn(UnstableKMathAPI::class)
-    override fun produceBin(index: IntArray, value: Double): DomainBin<Double, Double> {
-        val domain = getDomain(index)
-        return DomainBin(domain, value)
-    }
-
-    override fun produce(builder: HistogramBuilder<Double, Double>.() -> Unit): IndexedHistogram<Double, Double> {
-        val ndCounter = StructureND.auto(shape) { Counter.double() }
-        val hBuilder = object : HistogramBuilder<Double, Double> {
-            override val defaultValue: Double get() = 1.0
-
-            override fun putValue(point: Point<out Double>, value: Double) {
-                val index = getIndexOrNull(point)
-                ndCounter[index].add(value)
-            }
-        }
-        hBuilder.apply(builder)
-        val values: BufferND<Double> = ndCounter.mapToBuffer { it.value }
-        return IndexedHistogram(this, values)
-    }
-
-    override fun IndexedHistogram<Double, Double>.unaryMinus(): IndexedHistogram<Double, Double> = this * (-1)
-
-    public companion object {
-        /**
-         * Use it like
-         * ```
-         *FastHistogram.fromRanges(
-         *  (-1.0..1.0),
-         *  (-1.0..1.0)
-         *)
-         *```
-         */
-        public fun fromRanges(
-            vararg ranges: ClosedFloatingPointRange<Double>,
-        ): DoubleHistogramGroup = DoubleHistogramGroup(
-            ranges.map(ClosedFloatingPointRange<Double>::start).asBuffer(),
-            ranges.map(ClosedFloatingPointRange<Double>::endInclusive).asBuffer()
-        )
-
-        /**
-         * Use it like
-         * ```
-         *FastHistogram.fromRanges(
-         *  (-1.0..1.0) to 50,
-         *  (-1.0..1.0) to 32
-         *)
-         *```
-         */
-        public fun fromRanges(
-            vararg ranges: Pair<ClosedFloatingPointRange<Double>, Int>,
-        ): DoubleHistogramGroup = DoubleHistogramGroup(
-            ListBuffer(
-                ranges
-                    .map(Pair<ClosedFloatingPointRange<Double>, Int>::first)
-                    .map(ClosedFloatingPointRange<Double>::start)
-            ),
-
-            ListBuffer(
-                ranges
-                    .map(Pair<ClosedFloatingPointRange<Double>, Int>::first)
-                    .map(ClosedFloatingPointRange<Double>::endInclusive)
-            ),
-
-            ranges.map(Pair<ClosedFloatingPointRange<Double>, Int>::second).toIntArray()
-        )
-    }
-}
\ No newline at end of file
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
index f9550df17..12edafd81 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
@@ -20,6 +20,15 @@ public interface Bin<in T : Any, out V> : Domain<T> {
     public val binValue: V
 }
 
+/**
+ * A simple histogram bin based on domain
+ */
+public data class DomainBin<in T : Comparable<T>, D : Domain<T>, out V>(
+    public val domain: D,
+    override val binValue: V,
+) : Bin<T, V>, Domain<T> by domain
+
+
 public interface Histogram<in T : Any, out V, out B : Bin<T, V>> {
     /**
      * Find existing bin, corresponding to given coordinates
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
new file mode 100644
index 000000000..2af03abd4
--- /dev/null
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.histogram
+
+import space.kscience.kmath.domains.Domain
+import space.kscience.kmath.linear.Point
+import space.kscience.kmath.nd.DefaultStrides
+import space.kscience.kmath.nd.FieldOpsND
+import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.operations.Group
+import space.kscience.kmath.operations.ScaleOperations
+import space.kscience.kmath.operations.invoke
+
+/**
+ * @param T the type of the argument space
+ * @param V the type of bin value
+ */
+public class HistogramND<T : Comparable<T>, D : Domain<T>, V : Any>(
+    public val group: HistogramGroupND<T, D, V>,
+    internal val values: StructureND<V>,
+) : Histogram<T, V, DomainBin<T, D, V>> {
+
+    override fun get(point: Point<T>): DomainBin<T, D, V>? {
+        val index = group.getIndexOrNull(point) ?: return null
+        return group.produceBin(index, values[index])
+    }
+
+    override val dimension: Int get() = group.shape.size
+
+    override val bins: Iterable<DomainBin<T, D, V>>
+        get() = DefaultStrides(group.shape).asSequence().map {
+            group.produceBin(it, values[it])
+        }.asIterable()
+}
+
+/**
+ * A space for producing histograms with values in a NDStructure
+ */
+public interface HistogramGroupND<T : Comparable<T>, D : Domain<T>, V : Any> :
+    Group<HistogramND<T, D, V>>, ScaleOperations<HistogramND<T, D, V>> {
+    public val shape: Shape
+    public val valueAlgebra: FieldOpsND<V, *> //= NDAlgebra.space(valueSpace, Buffer.Companion::boxing, *shape),
+
+    /**
+     * Resolve index of the bin including given [point]. Return null if point is outside histogram area
+     */
+    public fun getIndexOrNull(point: Point<T>): IntArray?
+
+    /**
+     * Get a bin domain represented by given index
+     */
+    public fun getDomain(index: IntArray): Domain<T>?
+
+    public fun produceBin(index: IntArray, value: V): DomainBin<T, D, V>
+
+    public fun produce(builder: HistogramBuilder<T, V>.() -> Unit): HistogramND<T, D, V>
+
+    override fun add(left: HistogramND<T, D, V>, right: HistogramND<T, D, V>): HistogramND<T, D, V> {
+        require(left.group == this && right.group == this) {
+            "A histogram belonging to a different group cannot be operated."
+        }
+        return HistogramND(this, valueAlgebra { left.values + right.values })
+    }
+
+    override fun scale(a: HistogramND<T, D, V>, value: Double): HistogramND<T, D, V> {
+        require(a.group == this) { "A histogram belonging to a different group cannot be operated." }
+        return HistogramND(this, valueAlgebra { a.values * value })
+    }
+
+    override val zero: HistogramND<T, D, V> get() = produce { }
+}
+
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
deleted file mode 100644
index 70913ecfb..000000000
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/IndexedHistogramGroup.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.histogram
-
-import space.kscience.kmath.domains.Domain
-import space.kscience.kmath.linear.Point
-import space.kscience.kmath.nd.DefaultStrides
-import space.kscience.kmath.nd.FieldND
-import space.kscience.kmath.nd.Shape
-import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.operations.Group
-import space.kscience.kmath.operations.ScaleOperations
-import space.kscience.kmath.operations.invoke
-
-/**
- * A simple histogram bin based on domain
- */
-public data class DomainBin<in T : Comparable<T>, out V>(
-    public val domain: Domain<T>,
-    override val binValue: V,
-) : Bin<T, V>, Domain<T> by domain
-
-/**
- * @param T the type of the argument space
- * @param V the type of bin value
- */
-public class IndexedHistogram<T : Comparable<T>, V : Any>(
-    public val histogramGroup: IndexedHistogramGroup<T, V>,
-    public val values: StructureND<V>,
-) : Histogram<T, V, DomainBin<T, V>> {
-
-    override fun get(point: Point<T>): DomainBin<T, V>? {
-        val index = histogramGroup.getIndexOrNull(point) ?: return null
-        return histogramGroup.produceBin(index, values[index])
-    }
-
-    override val dimension: Int get() = histogramGroup.shape.size
-
-    override val bins: Iterable<DomainBin<T, V>>
-        get() = DefaultStrides(histogramGroup.shape).asSequence().map {
-            histogramGroup.produceBin(it, values[it])
-        }.asIterable()
-}
-
-/**
- * A space for producing histograms with values in a NDStructure
- */
-public interface IndexedHistogramGroup<T : Comparable<T>, V : Any> : Group<IndexedHistogram<T, V>>,
-    ScaleOperations<IndexedHistogram<T, V>> {
-    public val shape: Shape
-    public val histogramValueAlgebra: FieldND<V, *> //= NDAlgebra.space(valueSpace, Buffer.Companion::boxing, *shape),
-
-    /**
-     * Resolve index of the bin including given [point]. Return null if point is outside histogram area
-     */
-    public fun getIndexOrNull(point: Point<T>): IntArray?
-
-    /**
-     * Get a bin domain represented by given index
-     */
-    public fun getDomain(index: IntArray): Domain<T>?
-
-    public fun produceBin(index: IntArray, value: V): DomainBin<T, V>
-
-    public fun produce(builder: HistogramBuilder<T, V>.() -> Unit): IndexedHistogram<T, V>
-
-    override fun add(left: IndexedHistogram<T, V>, right: IndexedHistogram<T, V>): IndexedHistogram<T, V> {
-        require(left.histogramGroup == this && right.histogramGroup == this) {
-            "A histogram belonging to a different group cannot be operated."
-        }
-        return IndexedHistogram(this, histogramValueAlgebra { left.values + right.values })
-    }
-
-    override fun scale(a: IndexedHistogram<T, V>, value: Double): IndexedHistogram<T, V> {
-        require(a.histogramGroup == this) { "A histogram belonging to a different group cannot be operated." }
-        return IndexedHistogram(this, histogramValueAlgebra { a.values * value })
-    }
-
-    override val zero: IndexedHistogram<T, V> get() = produce { }
-}
-
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
new file mode 100644
index 000000000..b93da10b2
--- /dev/null
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:OptIn(UnstableKMathAPI::class)
+
+package space.kscience.kmath.histogram
+
+import space.kscience.kmath.domains.HyperSquareDomain
+import space.kscience.kmath.linear.Point
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.nd.*
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.*
+import kotlin.math.floor
+
+public typealias HyperSquareBin<V> = DomainBin<Double, HyperSquareDomain, V>
+
+/**
+ * Multivariate histogram space for hyper-square real-field bins.
+ * @param bufferFactory is an optional parameter used to optimize buffer production.
+ */
+public class UniformHistogramGroupND<V : Any, A : Field<V>>(
+    override val valueAlgebra: FieldOpsND<V, A>,
+    private val lower: Buffer<Double>,
+    private val upper: Buffer<Double>,
+    private val binNums: IntArray = IntArray(lower.size) { 20 },
+    private val bufferFactory: BufferFactory<V> = Buffer.Companion::boxing,
+) : HistogramGroupND<Double, HyperSquareDomain, V> {
+
+    init {
+        // argument checks
+        require(lower.size == upper.size) { "Dimension mismatch in histogram lower and upper limits." }
+        require(lower.size == binNums.size) { "Dimension mismatch in bin count." }
+        require(!lower.indices.any { upper[it] - lower[it] < 0 }) { "Range for one of axis is not strictly positive" }
+    }
+
+    public val dimension: Int get() = lower.size
+
+    override val shape: IntArray = IntArray(binNums.size) { binNums[it] + 2 }
+
+    private val binSize = DoubleBuffer(dimension) { (upper[it] - lower[it]) / binNums[it] }
+
+    /**
+     * Get internal [StructureND] bin index for given axis
+     */
+    private fun getIndex(axis: Int, value: Double): Int = when {
+        value >= upper[axis] -> binNums[axis] + 1 // overflow
+        value < lower[axis] -> 0 // underflow
+        else -> floor((value - lower[axis]) / binSize[axis]).toInt()
+    }
+
+    override fun getIndexOrNull(point: Buffer<Double>): IntArray = IntArray(dimension) {
+        getIndex(it, point[it])
+    }
+
+    override fun getDomain(index: IntArray): HyperSquareDomain {
+        val lowerBoundary = index.mapIndexed { axis, i ->
+            when (i) {
+                0 -> Double.NEGATIVE_INFINITY
+                shape[axis] - 1 -> upper[axis]
+                else -> lower[axis] + (i.toDouble()) * binSize[axis]
+            }
+        }.asBuffer()
+
+        val upperBoundary = index.mapIndexed { axis, i ->
+            when (i) {
+                0 -> lower[axis]
+                shape[axis] - 1 -> Double.POSITIVE_INFINITY
+                else -> lower[axis] + (i.toDouble() + 1) * binSize[axis]
+            }
+        }.asBuffer()
+
+        return HyperSquareDomain(lowerBoundary, upperBoundary)
+    }
+
+    override fun produceBin(index: IntArray, value: V): HyperSquareBin<V> {
+        val domain = getDomain(index)
+        return DomainBin(domain, value)
+    }
+
+
+    override fun produce(builder: HistogramBuilder<Double, V>.() -> Unit): HistogramND<Double, HyperSquareDomain, V> {
+        val ndCounter = StructureND.buffered(shape) { Counter.of(valueAlgebra.elementAlgebra) }
+        val hBuilder = object : HistogramBuilder<Double, V> {
+            override val defaultValue: V get() = valueAlgebra.elementAlgebra.one
+
+            override fun putValue(point: Point<out Double>, value: V) = with(valueAlgebra.elementAlgebra) {
+                val index = getIndexOrNull(point)
+                ndCounter[index].add(value)
+            }
+        }
+        hBuilder.apply(builder)
+        val values: BufferND<V> = ndCounter.mapToBuffer(bufferFactory) { it.value }
+        return HistogramND(this, values)
+    }
+
+    override fun HistogramND<Double, HyperSquareDomain, V>.unaryMinus(): HistogramND<Double, HyperSquareDomain, V> =
+        this * (-1)
+}
+
+/**
+ * Use it like
+ * ```
+ *FastHistogram.fromRanges(
+ *  (-1.0..1.0),
+ *  (-1.0..1.0)
+ *)
+ *```
+ */
+public fun <V : Any, A : Field<V>> Histogram.Companion.uniformNDFromRanges(
+    valueAlgebra: FieldOpsND<V, A>,
+    vararg ranges: ClosedFloatingPointRange<Double>,
+    bufferFactory: BufferFactory<V> = Buffer.Companion::boxing,
+): UniformHistogramGroupND<V, A> = UniformHistogramGroupND(
+    valueAlgebra,
+    ranges.map(ClosedFloatingPointRange<Double>::start).asBuffer(),
+    ranges.map(ClosedFloatingPointRange<Double>::endInclusive).asBuffer(),
+    bufferFactory = bufferFactory
+)
+
+public fun Histogram.Companion.uniformDoubleNDFromRanges(
+    vararg ranges: ClosedFloatingPointRange<Double>,
+): UniformHistogramGroupND<Double, DoubleField> =
+    uniformNDFromRanges(DoubleFieldOpsND, *ranges, bufferFactory = ::DoubleBuffer)
+
+
+/**
+ * Use it like
+ * ```
+ *FastHistogram.fromRanges(
+ *  (-1.0..1.0) to 50,
+ *  (-1.0..1.0) to 32
+ *)
+ *```
+ */
+public fun <V : Any, A : Field<V>> Histogram.Companion.uniformNDFromRanges(
+    valueAlgebra: FieldOpsND<V, A>,
+    vararg ranges: Pair<ClosedFloatingPointRange<Double>, Int>,
+    bufferFactory: BufferFactory<V> = Buffer.Companion::boxing,
+): UniformHistogramGroupND<V, A> = UniformHistogramGroupND(
+    valueAlgebra,
+    ListBuffer(
+        ranges
+            .map(Pair<ClosedFloatingPointRange<Double>, Int>::first)
+            .map(ClosedFloatingPointRange<Double>::start)
+    ),
+    ListBuffer(
+        ranges
+            .map(Pair<ClosedFloatingPointRange<Double>, Int>::first)
+            .map(ClosedFloatingPointRange<Double>::endInclusive)
+    ),
+    ranges.map(Pair<ClosedFloatingPointRange<Double>, Int>::second).toIntArray(),
+    bufferFactory = bufferFactory
+)
+
+public fun Histogram.Companion.uniformDoubleNDFromRanges(
+    vararg ranges: Pair<ClosedFloatingPointRange<Double>, Int>,
+): UniformHistogramGroupND<Double, DoubleField> =
+    uniformNDFromRanges(DoubleFieldOpsND, *ranges, bufferFactory = ::DoubleBuffer)
\ No newline at end of file
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
index 1426b35fa..ca7c2f324 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
@@ -3,8 +3,11 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:OptIn(UnstableKMathAPI::class)
+
 package space.kscience.kmath.histogram
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.DefaultStrides
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.real.DoubleVector
@@ -14,7 +17,7 @@ import kotlin.test.*
 internal class MultivariateHistogramTest {
     @Test
     fun testSinglePutHistogram() {
-        val hSpace = DoubleHistogramGroup.fromRanges(
+        val hSpace = Histogram.uniformDoubleNDFromRanges(
             (-1.0..1.0),
             (-1.0..1.0)
         )
@@ -29,7 +32,7 @@ internal class MultivariateHistogramTest {
 
     @Test
     fun testSequentialPut() {
-        val hSpace = DoubleHistogramGroup.fromRanges(
+        val hSpace = Histogram.uniformDoubleNDFromRanges(
             (-1.0..1.0),
             (-1.0..1.0),
             (-1.0..1.0)
@@ -49,7 +52,7 @@ internal class MultivariateHistogramTest {
 
     @Test
     fun testHistogramAlgebra() {
-        DoubleHistogramGroup.fromRanges(
+        Histogram.uniformDoubleNDFromRanges(
             (-1.0..1.0),
             (-1.0..1.0),
             (-1.0..1.0)
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
index e85bb0a3c..bff20c22c 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
@@ -45,7 +45,7 @@ internal class TreeHistogramBuilder(val binFactory: (Double) -> DoubleDomain1D)
 
     override val defaultValue: Double get() = 1.0
 
-    internal class BinCounter(val domain: DoubleDomain1D, val counter: Counter<Double> = Counter.double()) :
+    internal class BinCounter(val domain: DoubleDomain1D, val counter: Counter<Double> = Counter.ofDouble()) :
         ClosedRange<Double> by domain.range
 
     private val bins: TreeMap<Double, BinCounter> = TreeMap()
-- 
2.34.1


From 1295a407c37db40c0fa993c7b7c45068e623c079 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 10 Apr 2022 15:29:46 +0300
Subject: [PATCH 496/713] Refactor tree histogram

---
 gradle.properties                             |   2 +-
 .../space/kscience/kmath/structures/Buffer.kt |  10 +
 .../kscience/kmath/histogram/Histogram1D.kt   |   1 +
 .../kscience/kmath/histogram/HistogramND.kt   |   6 +-
 .../kmath/histogram/UniformHistogram1D.kt     |   4 +-
 .../histogram/UniformHistogramGroupND.kt      |  16 +-
 .../kmath/histogram/TreeHistogramGroup.kt     | 179 ++++++++++++++++
 .../kmath/histogram/TreeHistogramSpace.kt     | 199 ------------------
 .../kmath/histogram/TreeHistogramTest.kt      |  11 +-
 9 files changed, 212 insertions(+), 216 deletions(-)
 create mode 100644 kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramGroup.kt
 delete mode 100644 kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt

diff --git a/gradle.properties b/gradle.properties
index 847c3dda6..80108737e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ kotlin.code.style=official
 kotlin.jupyter.add.scanner=false
 kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
-kotlin.incremental.js.ir=true
+#kotlin.incremental.js.ir=true
 
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index 58c6d5ded..a1b0307c4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -105,6 +105,16 @@ public interface Buffer<out T> {
  */
 public val Buffer<*>.indices: IntRange get() = 0 until size
 
+public fun <T> Buffer<T>.first(): T {
+    require(size > 0) { "Can't get the first element of empty buffer" }
+    return get(0)
+}
+
+public fun <T> Buffer<T>.last(): T {
+    require(size > 0) { "Can't get the last element of empty buffer" }
+    return get(size - 1)
+}
+
 /**
  * Immutable wrapper for [MutableBuffer].
  *
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
index 0c9352e76..710e4478b 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
@@ -43,6 +43,7 @@ public interface Histogram1DBuilder<in T : Any, V : Any> : HistogramBuilder<T, V
     public fun putValue(at: T, value: V = defaultValue)
 
     override fun putValue(point: Point<out T>, value: V) {
+        require(point.size == 1) { "Only points with single value could be used in Histogram1D" }
         putValue(point[0], value)
     }
 }
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
index 2af03abd4..68b24db5d 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
@@ -43,7 +43,7 @@ public class HistogramND<T : Comparable<T>, D : Domain<T>, V : Any>(
 public interface HistogramGroupND<T : Comparable<T>, D : Domain<T>, V : Any> :
     Group<HistogramND<T, D, V>>, ScaleOperations<HistogramND<T, D, V>> {
     public val shape: Shape
-    public val valueAlgebra: FieldOpsND<V, *> //= NDAlgebra.space(valueSpace, Buffer.Companion::boxing, *shape),
+    public val valueAlgebraND: FieldOpsND<V, *> //= NDAlgebra.space(valueSpace, Buffer.Companion::boxing, *shape),
 
     /**
      * Resolve index of the bin including given [point]. Return null if point is outside histogram area
@@ -63,12 +63,12 @@ public interface HistogramGroupND<T : Comparable<T>, D : Domain<T>, V : Any> :
         require(left.group == this && right.group == this) {
             "A histogram belonging to a different group cannot be operated."
         }
-        return HistogramND(this, valueAlgebra { left.values + right.values })
+        return HistogramND(this, valueAlgebraND { left.values + right.values })
     }
 
     override fun scale(a: HistogramND<T, D, V>, value: Double): HistogramND<T, D, V> {
         require(a.group == this) { "A histogram belonging to a different group cannot be operated." }
-        return HistogramND(this, valueAlgebra { a.values * value })
+        return HistogramND(this, valueAlgebraND { a.values * value })
     }
 
     override val zero: HistogramND<T, D, V> get() = produce { }
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
index cb6572af9..e13928394 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
@@ -126,11 +126,11 @@ public class UniformHistogram1DGroup<V : Any, A>(
 }
 
 public fun <V : Any, A> Histogram.Companion.uniform1D(
-    algebra: A,
+    valueAlgebra: A,
     binSize: Double,
     startPoint: Double = 0.0,
 ): UniformHistogram1DGroup<V, A> where A : Ring<V>, A : ScaleOperations<V> =
-    UniformHistogram1DGroup(algebra, binSize, startPoint)
+    UniformHistogram1DGroup(valueAlgebra, binSize, startPoint)
 
 @UnstableKMathAPI
 public fun <V : Any> UniformHistogram1DGroup<V, *>.produce(
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
index b93da10b2..90ec29ce3 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
@@ -24,7 +24,7 @@ public typealias HyperSquareBin<V> = DomainBin<Double, HyperSquareDomain, V>
  * @param bufferFactory is an optional parameter used to optimize buffer production.
  */
 public class UniformHistogramGroupND<V : Any, A : Field<V>>(
-    override val valueAlgebra: FieldOpsND<V, A>,
+    override val valueAlgebraND: FieldOpsND<V, A>,
     private val lower: Buffer<Double>,
     private val upper: Buffer<Double>,
     private val binNums: IntArray = IntArray(lower.size) { 20 },
@@ -84,11 +84,11 @@ public class UniformHistogramGroupND<V : Any, A : Field<V>>(
 
 
     override fun produce(builder: HistogramBuilder<Double, V>.() -> Unit): HistogramND<Double, HyperSquareDomain, V> {
-        val ndCounter = StructureND.buffered(shape) { Counter.of(valueAlgebra.elementAlgebra) }
+        val ndCounter = StructureND.buffered(shape) { Counter.of(valueAlgebraND.elementAlgebra) }
         val hBuilder = object : HistogramBuilder<Double, V> {
-            override val defaultValue: V get() = valueAlgebra.elementAlgebra.one
+            override val defaultValue: V get() = valueAlgebraND.elementAlgebra.one
 
-            override fun putValue(point: Point<out Double>, value: V) = with(valueAlgebra.elementAlgebra) {
+            override fun putValue(point: Point<out Double>, value: V) = with(valueAlgebraND.elementAlgebra) {
                 val index = getIndexOrNull(point)
                 ndCounter[index].add(value)
             }
@@ -112,11 +112,11 @@ public class UniformHistogramGroupND<V : Any, A : Field<V>>(
  *```
  */
 public fun <V : Any, A : Field<V>> Histogram.Companion.uniformNDFromRanges(
-    valueAlgebra: FieldOpsND<V, A>,
+    valueAlgebraND: FieldOpsND<V, A>,
     vararg ranges: ClosedFloatingPointRange<Double>,
     bufferFactory: BufferFactory<V> = Buffer.Companion::boxing,
 ): UniformHistogramGroupND<V, A> = UniformHistogramGroupND(
-    valueAlgebra,
+    valueAlgebraND,
     ranges.map(ClosedFloatingPointRange<Double>::start).asBuffer(),
     ranges.map(ClosedFloatingPointRange<Double>::endInclusive).asBuffer(),
     bufferFactory = bufferFactory
@@ -138,11 +138,11 @@ public fun Histogram.Companion.uniformDoubleNDFromRanges(
  *```
  */
 public fun <V : Any, A : Field<V>> Histogram.Companion.uniformNDFromRanges(
-    valueAlgebra: FieldOpsND<V, A>,
+    valueAlgebraND: FieldOpsND<V, A>,
     vararg ranges: Pair<ClosedFloatingPointRange<Double>, Int>,
     bufferFactory: BufferFactory<V> = Buffer.Companion::boxing,
 ): UniformHistogramGroupND<V, A> = UniformHistogramGroupND(
-    valueAlgebra,
+    valueAlgebraND,
     ListBuffer(
         ranges
             .map(Pair<ClosedFloatingPointRange<Double>, Int>::first)
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramGroup.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramGroup.kt
new file mode 100644
index 000000000..6bec01f9b
--- /dev/null
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramGroup.kt
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:OptIn(UnstableKMathAPI::class)
+
+package space.kscience.kmath.histogram
+
+import space.kscience.kmath.domains.DoubleDomain1D
+import space.kscience.kmath.domains.center
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.misc.sorted
+import space.kscience.kmath.operations.Group
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.ScaleOperations
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.first
+import space.kscience.kmath.structures.indices
+import space.kscience.kmath.structures.last
+import java.util.*
+
+private fun <B : ClosedRange<Double>> TreeMap<Double, B>.getBin(value: Double): B? {
+    // check ceiling entry and return it if it is what needed
+    val ceil = ceilingEntry(value)?.value
+    if (ceil != null && value in ceil) return ceil
+    //check floor entry
+    val floor = floorEntry(value)?.value
+    if (floor != null && value in floor) return floor
+    //neither is valid, not found
+    return null
+}
+
+//public data class ValueAndError(val value: Double, val error: Double)
+//
+//public typealias WeightedBin1D = Bin1D<Double, ValueAndError>
+
+/**
+ * A histogram based on a tree map of values
+ */
+public class TreeHistogram<V : Any>(
+    private val binMap: TreeMap<Double, Bin1D<Double, V>>,
+) : Histogram1D<Double, V> {
+    override fun get(value: Double): Bin1D<Double, V>? = binMap.getBin(value)
+    override val bins: Collection<Bin1D<Double, V>> get() = binMap.values
+}
+
+/**
+ * A space for univariate histograms with variable bin borders based on a tree map
+ */
+public class TreeHistogramGroup<V : Any, A>(
+    public val valueAlgebra: A,
+    @PublishedApi internal val binFactory: (Double) -> DoubleDomain1D,
+) : Group<TreeHistogram<V>>, ScaleOperations<TreeHistogram<V>> where A : Ring<V>, A : ScaleOperations<V> {
+
+    internal inner class DomainCounter(val domain: DoubleDomain1D, val counter: Counter<V> = Counter.of(valueAlgebra)) :
+        ClosedRange<Double> by domain.range
+
+    @PublishedApi
+    internal inner class TreeHistogramBuilder : Histogram1DBuilder<Double, V> {
+
+        override val defaultValue: V get() = valueAlgebra.one
+
+        private val bins: TreeMap<Double, DomainCounter> = TreeMap()
+
+        private fun createBin(value: Double): DomainCounter {
+            val binDefinition: DoubleDomain1D = binFactory(value)
+            val newBin = DomainCounter(binDefinition)
+            synchronized(this) {
+                bins[binDefinition.center] = newBin
+            }
+            return newBin
+        }
+
+        /**
+         * Thread safe put operation
+         */
+        override fun putValue(at: Double, value: V) {
+            (bins.getBin(at) ?: createBin(at)).counter.add(value)
+        }
+
+        fun build(): TreeHistogram<V> {
+            val map = bins.mapValuesTo(TreeMap<Double, Bin1D<Double, V>>()) { (_, binCounter) ->
+                Bin1D(binCounter.domain, binCounter.counter.value)
+            }
+            return TreeHistogram(map)
+        }
+    }
+
+    public inline fun produce(block: Histogram1DBuilder<Double, V>.() -> Unit): TreeHistogram<V> =
+        TreeHistogramBuilder().apply(block).build()
+
+    override fun add(
+        left: TreeHistogram<V>,
+        right: TreeHistogram<V>,
+    ): TreeHistogram<V> {
+        val bins = TreeMap<Double, Bin1D<Double, V>>().apply {
+            (left.bins.map { it.domain } union right.bins.map { it.domain }).forEach { def ->
+                put(
+                    def.center,
+                    Bin1D(
+                        def,
+                        with(valueAlgebra) {
+                            (left[def.center]?.binValue ?: zero) + (right[def.center]?.binValue ?: zero)
+                        }
+                    )
+                )
+            }
+        }
+        return TreeHistogram(bins)
+    }
+
+    override fun scale(a: TreeHistogram<V>, value: Double): TreeHistogram<V> {
+        val bins = TreeMap<Double, Bin1D<Double, V>>().apply {
+            a.bins.forEach { bin ->
+                put(
+                    bin.domain.center,
+                    Bin1D(bin.domain, valueAlgebra.scale(bin.binValue, value))
+                )
+            }
+        }
+
+        return TreeHistogram(bins)
+    }
+
+    override fun TreeHistogram<V>.unaryMinus(): TreeHistogram<V> = this * (-1)
+
+    override val zero: TreeHistogram<V> = produce { }
+}
+
+
+///**
+// * Build and fill a histogram with custom borders. Returns a read-only histogram.
+// */
+//public inline fun Histogram.custom(
+//    borders: DoubleArray,
+//    builder: Histogram1DBuilder<Double, Double>.() -> Unit,
+//): TreeHistogram = custom(borders).fill(builder)
+//
+//
+///**
+// * Build and fill a [DoubleHistogram1D]. Returns a read-only histogram.
+// */
+//public fun uniform(
+//    binSize: Double,
+//    start: Double = 0.0,
+//): TreeHistogramSpace = TreeHistogramSpace { value ->
+//    val center = start + binSize * floor((value - start) / binSize + 0.5)
+//    DoubleDomain1D((center - binSize / 2)..(center + binSize / 2))
+//}
+
+/**
+ * Create a histogram group with custom cell borders
+ */
+public fun <V : Any, A> Histogram.Companion.custom1D(
+    valueAlgebra: A,
+    borders: Buffer<Double>,
+): TreeHistogramGroup<V, A> where A : Ring<V>, A : ScaleOperations<V> {
+    val sorted = borders.sorted()
+
+    return TreeHistogramGroup(valueAlgebra) { value ->
+        when {
+            value <= sorted.first() -> DoubleDomain1D(
+                Double.NEGATIVE_INFINITY..sorted.first()
+            )
+
+            value > sorted.last() -> DoubleDomain1D(
+                sorted.last()..Double.POSITIVE_INFINITY
+            )
+
+            else -> {
+                val index = sorted.indices.first { value <= sorted[it] }
+                val left = sorted[index - 1]
+                val right = sorted[index]
+                DoubleDomain1D(left..right)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
deleted file mode 100644
index bff20c22c..000000000
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramSpace.kt
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:OptIn(UnstableKMathAPI::class)
-
-package space.kscience.kmath.histogram
-
-import space.kscience.kmath.domains.DoubleDomain1D
-import space.kscience.kmath.domains.center
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Group
-import space.kscience.kmath.operations.ScaleOperations
-import space.kscience.kmath.structures.Buffer
-import java.util.*
-import kotlin.math.abs
-import kotlin.math.floor
-import kotlin.math.sqrt
-
-private fun <B : ClosedRange<Double>> TreeMap<Double, B>.getBin(value: Double): B? {
-    // check ceiling entry and return it if it is what needed
-    val ceil = ceilingEntry(value)?.value
-    if (ceil != null && value in ceil) return ceil
-    //check floor entry
-    val floor = floorEntry(value)?.value
-    if (floor != null && value in floor) return floor
-    //neither is valid, not found
-    return null
-}
-
-public data class ValueAndError(val value: Double, val error: Double)
-
-public typealias WeightedBin1D = Bin1D<Double, ValueAndError>
-
-public class TreeHistogram(
-    private val binMap: TreeMap<Double, WeightedBin1D>,
-) : Histogram1D<Double, ValueAndError> {
-    override fun get(value: Double): WeightedBin1D? = binMap.getBin(value)
-    override val bins: Collection<WeightedBin1D> get() = binMap.values
-}
-
-@PublishedApi
-internal class TreeHistogramBuilder(val binFactory: (Double) -> DoubleDomain1D) : Histogram1DBuilder<Double, Double> {
-
-    override val defaultValue: Double get() = 1.0
-
-    internal class BinCounter(val domain: DoubleDomain1D, val counter: Counter<Double> = Counter.ofDouble()) :
-        ClosedRange<Double> by domain.range
-
-    private val bins: TreeMap<Double, BinCounter> = TreeMap()
-
-    fun get(value: Double): BinCounter? = bins.getBin(value)
-
-    fun createBin(value: Double): BinCounter {
-        val binDefinition: DoubleDomain1D = binFactory(value)
-        val newBin = BinCounter(binDefinition)
-        synchronized(this) {
-            bins[binDefinition.center] = newBin
-        }
-        return newBin
-    }
-
-    /**
-     * Thread safe put operation
-     */
-    override fun putValue(at: Double, value: Double) {
-        (get(at) ?: createBin(at)).apply {
-            counter.add(value)
-        }
-    }
-
-    override fun putValue(point: Buffer<Double>, value: Double) {
-        require(point.size == 1) { "Only points with single value could be used in univariate histogram" }
-        putValue(point[0], value.toDouble())
-    }
-
-    fun build(): TreeHistogram {
-        val map = bins.mapValuesTo(TreeMap<Double, WeightedBin1D>()) { (_, binCounter) ->
-            val count: Double = binCounter.counter.value
-            WeightedBin1D(binCounter.domain, ValueAndError(count, sqrt(count)))
-        }
-        return TreeHistogram(map)
-    }
-}
-
-/**
- * A space for univariate histograms with variable bin borders based on a tree map
- */
-public class TreeHistogramSpace(
-    @PublishedApi internal val binFactory: (Double) -> DoubleDomain1D,
-) : Group<TreeHistogram>, ScaleOperations<TreeHistogram> {
-
-    public inline fun fill(block: Histogram1DBuilder<Double, Double>.() -> Unit): TreeHistogram =
-        TreeHistogramBuilder(binFactory).apply(block).build()
-
-    override fun add(
-        left: TreeHistogram,
-        right: TreeHistogram,
-    ): TreeHistogram {
-//        require(a.context == this) { "Histogram $a does not belong to this context" }
-//        require(b.context == this) { "Histogram $b does not belong to this context" }
-        val bins = TreeMap<Double, WeightedBin1D>().apply {
-            (left.bins.map { it.domain } union right.bins.map { it.domain }).forEach { def ->
-                put(
-                    def.center,
-                    WeightedBin1D(
-                        def,
-                        ValueAndError(
-                            (left[def.center]?.binValue?.value ?: 0.0) + (right[def.center]?.binValue?.value ?: 0.0),
-                            (left[def.center]?.binValue?.error ?: 0.0) + (right[def.center]?.binValue?.error ?: 0.0)
-                        )
-                    )
-                )
-            }
-        }
-        return TreeHistogram(bins)
-    }
-
-    override fun scale(a: TreeHistogram, value: Double): TreeHistogram {
-        val bins = TreeMap<Double, WeightedBin1D>().apply {
-            a.bins.forEach { bin ->
-                put(
-                    bin.domain.center,
-                    WeightedBin1D(
-                        bin.domain,
-                        ValueAndError(
-                            bin.binValue.value * value,
-                            abs(bin.binValue.error * value)
-                        )
-                    )
-                )
-            }
-        }
-
-        return TreeHistogram(bins)
-    }
-
-    override fun TreeHistogram.unaryMinus(): TreeHistogram = this * (-1)
-
-    override val zero: TreeHistogram by lazy { fill { } }
-
-    public companion object {
-        /**
-         * Build and fill a [TreeHistogram]. Returns a read-only histogram.
-         */
-        public inline fun uniform(
-            binSize: Double,
-            start: Double = 0.0,
-            builder: Histogram1DBuilder<Double, Double>.() -> Unit,
-        ): TreeHistogram = uniform(binSize, start).fill(builder)
-
-        /**
-         * Build and fill a histogram with custom borders. Returns a read-only histogram.
-         */
-        public inline fun custom(
-            borders: DoubleArray,
-            builder: Histogram1DBuilder<Double, Double>.() -> Unit,
-        ): TreeHistogram = custom(borders).fill(builder)
-
-
-        /**
-         * Build and fill a [DoubleHistogram1D]. Returns a read-only histogram.
-         */
-        public fun uniform(
-            binSize: Double,
-            start: Double = 0.0,
-        ): TreeHistogramSpace = TreeHistogramSpace { value ->
-            val center = start + binSize * floor((value - start) / binSize + 0.5)
-            DoubleDomain1D((center - binSize / 2)..(center + binSize / 2))
-        }
-
-        /**
-         * Create a histogram with custom cell borders
-         */
-        public fun custom(borders: DoubleArray): TreeHistogramSpace {
-            val sorted = borders.sortedArray()
-
-            return TreeHistogramSpace { value ->
-                when {
-                    value < sorted.first() -> DoubleDomain1D(
-                        Double.NEGATIVE_INFINITY..sorted.first()
-                    )
-
-                    value > sorted.last() -> DoubleDomain1D(
-                        sorted.last()..Double.POSITIVE_INFINITY
-                    )
-
-                    else -> {
-                        val index = sorted.indices.first { value > sorted[it] }
-                        val left = sorted[index]
-                        val right = sorted[index + 1]
-                        DoubleDomain1D(left..right)
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
index f1a8f953b..c4eeb53cc 100644
--- a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
+++ b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
@@ -6,19 +6,24 @@
 package space.kscience.kmath.histogram
 
 import org.junit.jupiter.api.Test
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.real.step
 import kotlin.random.Random
+import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
 class TreeHistogramTest {
 
     @Test
     fun normalFill() {
-        val histogram = TreeHistogramSpace.uniform(0.1) {
+        val random  = Random(123)
+        val histogram = Histogram.custom1D(DoubleField, 0.0..1.0 step 0.1).produce {
             repeat(100_000) {
-                putValue(Random.nextDouble())
+                putValue(random.nextDouble())
             }
         }
 
-        assertTrue { histogram.bins.count() > 10 }
+        assertTrue { histogram.bins.count() > 8}
+        assertEquals(100_000, histogram.bins.sumOf { it.binValue }.toInt())
     }
 }
\ No newline at end of file
-- 
2.34.1


From b509dc917d1836c4b37e4129138d85e1736ad7ef Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 10 Apr 2022 23:00:55 +0300
Subject: [PATCH 497/713] ValueAndErrorField

---
 CHANGELOG.md                                  |  2 +
 .../kscience/kmath/functions/integrate.kt     |  2 +-
 .../kmath/functions/interpolateSquare.kt      |  2 +-
 .../kmath/operations/BufferAlgebra.kt         | 22 ++++----
 .../kscience/kmath/functions/functionTypes.kt |  4 +-
 .../kscience/kmath/stat/ValueAndErrorField.kt | 56 +++++++++++++++++++
 6 files changed, 73 insertions(+), 15 deletions(-)
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/ValueAndErrorField.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc5447449..b3c9b7b6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - Complex power
 - Separate methods for UInt, Int and Number powers. NaN safety.
 - Tensorflow prototype
+- `ValueAndErrorField`
 
 ### Changed
 - Exponential operations merged with hyperbolic functions
@@ -50,6 +51,7 @@
 - Tensor algebra takes read-only structures as input and inherits AlgebraND
 - `UnivariateDistribution` renamed to `Distribution1D`
 - Rework of histograms.
+- `UnivariateFunction` -> `Function1D`, `MultivariateFunction` -> `FunctionND`
 
 ### Deprecated
 - Specialized `DoubleBufferAlgebra`
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
index f60b1ab45..59eaba5bd 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
@@ -13,7 +13,7 @@ import kotlin.math.pow
 
 fun main() {
     //Define a function
-    val function: UnivariateFunction<Double> = { x -> 3 * x.pow(2) + 2 * x + 1 }
+    val function: Function1D<Double> = { x -> 3 * x.pow(2) + 2 * x + 1 }
 
     //get the result of the integration
     val result = DoubleField.gaussIntegrator.integrate(0.0..10.0, function = function)
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
index feefedece..a50df0931 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
@@ -18,7 +18,7 @@ import space.kscience.plotly.scatter
 
 @OptIn(UnstablePlotlyAPI::class)
 fun main() {
-    val function: UnivariateFunction<Double> = { x ->
+    val function: Function1D<Double> = { x ->
         if (x in 30.0..50.0) {
             1.0
         } else {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
index 653552044..51fff8b69 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.operations
 
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.DoubleBuffer
@@ -53,7 +52,7 @@ public interface BufferAlgebra<T, out A : Algebra<T>> : Algebra<Buffer<T>> {
  */
 private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapInline(
     buffer: Buffer<T>,
-    crossinline block: A.(T) -> T
+    crossinline block: A.(T) -> T,
 ): Buffer<T> = bufferFactory(buffer.size) { elementAlgebra.block(buffer[it]) }
 
 /**
@@ -61,7 +60,7 @@ private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapInline(
  */
 private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapIndexedInline(
     buffer: Buffer<T>,
-    crossinline block: A.(index: Int, arg: T) -> T
+    crossinline block: A.(index: Int, arg: T) -> T,
 ): Buffer<T> = bufferFactory(buffer.size) { elementAlgebra.block(it, buffer[it]) }
 
 /**
@@ -70,7 +69,7 @@ private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapIndexedInline(
 private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.zipInline(
     l: Buffer<T>,
     r: Buffer<T>,
-    crossinline block: A.(l: T, r: T) -> T
+    crossinline block: A.(l: T, r: T) -> T,
 ): Buffer<T> {
     require(l.size == r.size) { "Incompatible buffer sizes. left: ${l.size}, right: ${r.size}" }
     return bufferFactory(l.size) { elementAlgebra.block(l[it], r[it]) }
@@ -127,13 +126,13 @@ public fun <T, A : ExponentialOperations<T>> BufferAlgebra<T, A>.atanh(arg: Buff
     mapInline(arg) { atanh(it) }
 
 public fun <T, A : PowerOperations<T>> BufferAlgebra<T, A>.pow(arg: Buffer<T>, pow: Number): Buffer<T> =
-    mapInline(arg) {it.pow(pow) }
+    mapInline(arg) { it.pow(pow) }
 
 
-public open class BufferRingOps<T, A: Ring<T>>(
+public open class BufferRingOps<T, A : Ring<T>>(
     override val elementAlgebra: A,
     override val bufferFactory: BufferFactory<T>,
-) : BufferAlgebra<T, A>, RingOps<Buffer<T>>{
+) : BufferAlgebra<T, A>, RingOps<Buffer<T>> {
 
     override fun add(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l + r }
     override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l * r }
@@ -152,10 +151,11 @@ public val ShortRing.bufferAlgebra: BufferRingOps<Short, ShortRing>
 public open class BufferFieldOps<T, A : Field<T>>(
     elementAlgebra: A,
     bufferFactory: BufferFactory<T>,
-) : BufferRingOps<T, A>(elementAlgebra, bufferFactory), BufferAlgebra<T, A>, FieldOps<Buffer<T>>, ScaleOperations<Buffer<T>> {
+) : BufferRingOps<T, A>(elementAlgebra, bufferFactory), BufferAlgebra<T, A>, FieldOps<Buffer<T>>,
+    ScaleOperations<Buffer<T>> {
 
-    override fun add(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l + r }
-    override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l * r }
+//    override fun add(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l + r }
+//    override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l * r }
     override fun divide(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l / r }
 
     override fun scale(a: Buffer<T>, value: Double): Buffer<T> = a.map { scale(it, value) }
@@ -168,7 +168,7 @@ public open class BufferFieldOps<T, A : Field<T>>(
 public class BufferField<T, A : Field<T>>(
     elementAlgebra: A,
     bufferFactory: BufferFactory<T>,
-    override val size: Int
+    override val size: Int,
 ) : BufferFieldOps<T, A>(elementAlgebra, bufferFactory), Field<Buffer<T>>, WithSize {
 
     override val zero: Buffer<T> = bufferFactory(size) { elementAlgebra.zero }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt
index 88b24c756..0e814993c 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt
@@ -7,6 +7,6 @@ package space.kscience.kmath.functions
 
 import space.kscience.kmath.structures.Buffer
 
-public typealias UnivariateFunction<T> = (T) -> T
+public typealias Function1D<T> = (T) -> T
 
-public typealias MultivariateFunction<T> = (Buffer<T>) -> T
\ No newline at end of file
+public typealias FunctionND<T> = (Buffer<T>) -> T
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/ValueAndErrorField.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/ValueAndErrorField.kt
new file mode 100644
index 000000000..5949213e7
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/ValueAndErrorField.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.stat
+
+import space.kscience.kmath.operations.Field
+import kotlin.math.pow
+import kotlin.math.sqrt
+
+/**
+ * A combination of a random [value] and its [dispersion].
+ *
+ * [dispersion] must be positive.
+ */
+public data class ValueAndError(val value: Double, val dispersion: Double) {
+    init {
+        require(dispersion >= 0) { "Dispersion must be non-negative" }
+    }
+
+    val error: Double get() = sqrt(dispersion)
+}
+
+/**
+ * An algebra for double value + its error combination. The multiplication assumes linear error propagation
+ */
+public object ValueAndErrorField : Field<ValueAndError> {
+
+    override val zero: ValueAndError = ValueAndError(0.0, 0.0)
+
+    override val one: ValueAndError = ValueAndError(1.0, 0.0)
+
+    override fun add(left: ValueAndError, right: ValueAndError): ValueAndError =
+        ValueAndError(left.value + right.value, left.dispersion + right.dispersion)
+
+    override fun ValueAndError.unaryMinus(): ValueAndError =
+        ValueAndError(-value, dispersion)
+
+    //TODO study performance impact of pow(2). On JVM it does not exist: https://stackoverflow.com/questions/29144275/xx-vs-math-powx-2-java-performance
+
+    override fun multiply(left: ValueAndError, right: ValueAndError): ValueAndError {
+        val value = left.value * right.value
+        val dispersion = (left.dispersion / left.value.pow(2) + right.dispersion / right.value.pow(2)) * value.pow(2)
+        return ValueAndError(value, dispersion)
+    }
+
+    override fun divide(left: ValueAndError, right: ValueAndError): ValueAndError {
+        val value = left.value / right.value
+        val dispersion = (left.dispersion / left.value.pow(2) + right.dispersion / right.value.pow(2)) * value.pow(2)
+        return ValueAndError(value, dispersion)
+    }
+
+    override fun scale(a: ValueAndError, value: Double): ValueAndError =
+        ValueAndError(a.value * value, a.dispersion * value.pow(2))
+}
\ No newline at end of file
-- 
2.34.1


From 7e4d2230444ff8902ef50c667bbeb75c7b1eb900 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 11 Apr 2022 14:56:48 +0300
Subject: [PATCH 498/713] Fixed missing TF basic operations

---
 .../kmath/tensorflow/TensorFlowAlgebra.kt     | 16 ++++++++-----
 .../tensors/api/AnalyticTensorAlgebra.kt      | 24 +++++++++----------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index b40739ee0..7185b84d6 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -6,11 +6,9 @@ import org.tensorflow.Operand
 import org.tensorflow.Output
 import org.tensorflow.Session
 import org.tensorflow.ndarray.NdArray
+import org.tensorflow.ndarray.index.Indices
 import org.tensorflow.op.Ops
-import org.tensorflow.op.core.Constant
-import org.tensorflow.op.core.Max
-import org.tensorflow.op.core.Min
-import org.tensorflow.op.core.Sum
+import org.tensorflow.op.core.*
 import org.tensorflow.types.TInt32
 import org.tensorflow.types.family.TNumber
 import org.tensorflow.types.family.TType
@@ -182,7 +180,7 @@ public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal c
     override fun StructureND<T>.unaryMinus(): TensorFlowOutput<T, TT> = operate(ops.math::neg)
 
     override fun Tensor<T>.get(i: Int): Tensor<T> = operate {
-        TODO("Not yet implemented")
+        StridedSliceHelper.stridedSlice(ops.scope(), it, Indices.at(i.toLong()))
     }
 
     override fun Tensor<T>.transpose(i: Int, j: Int): Tensor<T> = operate {
@@ -210,7 +208,13 @@ public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal c
         dim1: Int,
         dim2: Int,
     ): TensorFlowOutput<T, TT> = diagonalEntries.operate {
-        TODO("Not yet implemented")
+        ops.linalg.matrixDiagV3(
+            /* diagonal = */ it,
+            /* k = */ ops.constant(offset),
+            /* numRows = */ ops.constant(dim1),
+            /* numCols = */ ops.constant(dim2),
+            /* paddingValue = */ const(elementAlgebra.zero)
+        )
     }
 
     override fun StructureND<T>.sum(): T = operate {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index 3ed34ae5e..b32fcf608 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -123,27 +123,27 @@ public interface AnalyticTensorAlgebra<T, A : Field<T>> :
     //For information: https://pytorch.org/docs/stable/generated/torch.floor.html#torch.floor
     public fun StructureND<T>.floor(): Tensor<T>
 
-    override fun sin(arg: StructureND<T>): StructureND<T> = arg.sin()
+    override fun sin(arg: StructureND<T>): Tensor<T> = arg.sin()
 
-    override fun cos(arg: StructureND<T>): StructureND<T> = arg.cos()
+    override fun cos(arg: StructureND<T>): Tensor<T> = arg.cos()
 
-    override fun asin(arg: StructureND<T>): StructureND<T> = arg.asin()
+    override fun asin(arg: StructureND<T>): Tensor<T> = arg.asin()
 
-    override fun acos(arg: StructureND<T>): StructureND<T> = arg.acos()
+    override fun acos(arg: StructureND<T>): Tensor<T> = arg.acos()
 
-    override fun atan(arg: StructureND<T>): StructureND<T> = arg.atan()
+    override fun atan(arg: StructureND<T>): Tensor<T> = arg.atan()
 
-    override fun exp(arg: StructureND<T>): StructureND<T> = arg.exp()
+    override fun exp(arg: StructureND<T>): Tensor<T> = arg.exp()
 
-    override fun ln(arg: StructureND<T>): StructureND<T> = arg.ln()
+    override fun ln(arg: StructureND<T>): Tensor<T> = arg.ln()
 
-    override fun sinh(arg: StructureND<T>): StructureND<T> = arg.sinh()
+    override fun sinh(arg: StructureND<T>): Tensor<T> = arg.sinh()
 
-    override fun cosh(arg: StructureND<T>): StructureND<T> = arg.cosh()
+    override fun cosh(arg: StructureND<T>): Tensor<T> = arg.cosh()
 
-    override fun asinh(arg: StructureND<T>): StructureND<T> = arg.asinh()
+    override fun asinh(arg: StructureND<T>): Tensor<T> = arg.asinh()
 
-    override fun acosh(arg: StructureND<T>): StructureND<T> = arg.acosh()
+    override fun acosh(arg: StructureND<T>): Tensor<T> = arg.acosh()
 
-    override fun atanh(arg: StructureND<T>): StructureND<T> = arg.atanh()
+    override fun atanh(arg: StructureND<T>): Tensor<T> = arg.atanh()
 }
\ No newline at end of file
-- 
2.34.1


From 916bc69e4b6ff002126c3457ddcb3ea8f5701e0f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 11 Apr 2022 17:32:16 +0300
Subject: [PATCH 499/713] Revert changes in tensor algebra to remove name
 conflicts

---
 .../tensors/api/AnalyticTensorAlgebra.kt      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index b32fcf608..3ed34ae5e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -123,27 +123,27 @@ public interface AnalyticTensorAlgebra<T, A : Field<T>> :
     //For information: https://pytorch.org/docs/stable/generated/torch.floor.html#torch.floor
     public fun StructureND<T>.floor(): Tensor<T>
 
-    override fun sin(arg: StructureND<T>): Tensor<T> = arg.sin()
+    override fun sin(arg: StructureND<T>): StructureND<T> = arg.sin()
 
-    override fun cos(arg: StructureND<T>): Tensor<T> = arg.cos()
+    override fun cos(arg: StructureND<T>): StructureND<T> = arg.cos()
 
-    override fun asin(arg: StructureND<T>): Tensor<T> = arg.asin()
+    override fun asin(arg: StructureND<T>): StructureND<T> = arg.asin()
 
-    override fun acos(arg: StructureND<T>): Tensor<T> = arg.acos()
+    override fun acos(arg: StructureND<T>): StructureND<T> = arg.acos()
 
-    override fun atan(arg: StructureND<T>): Tensor<T> = arg.atan()
+    override fun atan(arg: StructureND<T>): StructureND<T> = arg.atan()
 
-    override fun exp(arg: StructureND<T>): Tensor<T> = arg.exp()
+    override fun exp(arg: StructureND<T>): StructureND<T> = arg.exp()
 
-    override fun ln(arg: StructureND<T>): Tensor<T> = arg.ln()
+    override fun ln(arg: StructureND<T>): StructureND<T> = arg.ln()
 
-    override fun sinh(arg: StructureND<T>): Tensor<T> = arg.sinh()
+    override fun sinh(arg: StructureND<T>): StructureND<T> = arg.sinh()
 
-    override fun cosh(arg: StructureND<T>): Tensor<T> = arg.cosh()
+    override fun cosh(arg: StructureND<T>): StructureND<T> = arg.cosh()
 
-    override fun asinh(arg: StructureND<T>): Tensor<T> = arg.asinh()
+    override fun asinh(arg: StructureND<T>): StructureND<T> = arg.asinh()
 
-    override fun acosh(arg: StructureND<T>): Tensor<T> = arg.acosh()
+    override fun acosh(arg: StructureND<T>): StructureND<T> = arg.acosh()
 
-    override fun atanh(arg: StructureND<T>): Tensor<T> = arg.atanh()
+    override fun atanh(arg: StructureND<T>): StructureND<T> = arg.atanh()
 }
\ No newline at end of file
-- 
2.34.1


From 74e6bc65a315dbc0623ac8b1bfbc9fe1bcfd62df Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 11 Apr 2022 20:07:40 +0300
Subject: [PATCH 500/713] 0.3.0 release

---
 CHANGELOG.md                      |  28 +-
 build.gradle.kts                  |   2 +-
 kmath-ast/README.md               |   6 +-
 kmath-commons/README.md           |   6 +-
 kmath-complex/README.md           |   6 +-
 kmath-core/README.md              |   6 +-
 kmath-core/api/kmath-core.api     | 926 +++++++++++++++++++++---------
 kmath-coroutines/README.md        |   6 +-
 kmath-dimensions/README.md        |   6 +-
 kmath-ejml/README.md              |   6 +-
 kmath-for-real/README.md          |   6 +-
 kmath-functions/README.md         |   6 +-
 kmath-geometry/README.md          |   6 +-
 kmath-histograms/README.md        |   6 +-
 kmath-jafama/README.md            |   6 +-
 kmath-jupyter/README.md           |   6 +-
 kmath-kotlingrad/README.md        |   6 +-
 kmath-memory/README.md            |   6 +-
 kmath-multik/README.md            |   6 +-
 kmath-nd4j/README.md              |   6 +-
 kmath-optimization/README.md      |   6 +-
 kmath-stat/README.md              |   6 +-
 kmath-symja/README.md             |   6 +-
 kmath-tensorflow/README.md        |   6 +-
 kmath-tensors/README.md           |   6 +-
 kmath-viktor/README.md            |   6 +-
 kmath-viktor/api/kmath-viktor.api |  72 ++-
 27 files changed, 793 insertions(+), 373 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3c9b7b6d..28240dc68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 ## [Unreleased]
 ### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [0.3.0]
+### Added
 - `ScaleOperations` interface
 - `Field` extends `ScaleOperations`
 - Basic integration API
@@ -21,6 +34,7 @@
 - Tensorflow prototype
 - `ValueAndErrorField`
 
+
 ### Changed
 - Exponential operations merged with hyperbolic functions
 - Space is replaced by Group. Space is reserved for vector spaces.
@@ -53,9 +67,11 @@
 - Rework of histograms.
 - `UnivariateFunction` -> `Function1D`, `MultivariateFunction` -> `FunctionND`
 
+
 ### Deprecated
 - Specialized `DoubleBufferAlgebra`
 
+
 ### Removed
 - Nearest in Domain. To be implemented in geometry package.
 - Number multiplication and division in main Algebra chain
@@ -66,10 +82,12 @@
 - Second generic from DifferentiableExpression
 - Algebra elements are completely removed. Use algebra contexts instead.
 
+
 ### Fixed
 - Ring inherits RingOperations, not GroupOperations
 - Univariate histogram filling
 
+
 ### Security
 
 ## [0.2.0]
@@ -92,6 +110,7 @@
 - New `MatrixFeature` interfaces for matrix decompositions
 - Basic Quaternion vector support in `kmath-complex`.
 
+
 ### Changed
 - Package changed from `scientifik` to `space.kscience`
 - Gradle version: 6.6 -> 6.8.2
@@ -116,7 +135,6 @@
 - `symbol` method in `Algebra` renamed to `bindSymbol` to avoid ambiguity
 - Add `out` projection to `Buffer` generic
 
-### Deprecated
 
 ### Removed
 - `kmath-koma` module because it doesn't support Kotlin 1.4.
@@ -126,13 +144,11 @@
 - `Real` class
 - StructureND identity and equals
 
+
 ### Fixed
 - `symbol` method in `MstExtendedField` (https://github.com/mipt-npm/kmath/pull/140)
 
-### Security
-
 ## [0.1.4]
-
 ### Added
 - Functional Expressions API
 - Mathematical Syntax Tree, its interpreter and API
@@ -150,6 +166,7 @@
 - Full hyperbolic functions support and default implementations within `ExtendedField`
 - Norm support for `Complex`
 
+
 ### Changed
 - `readAsMemory` now has `throws IOException` in JVM signature.
 - Several functions taking functional types were made `inline`.
@@ -161,9 +178,10 @@
 - Gradle version: 6.3 -> 6.6
 - Moved probability distributions to commons-rng and to `kmath-prob`
 
+
 ### Fixed
 - Missing copy method in Memory implementation on JS (https://github.com/mipt-npm/kmath/pull/106)
 - D3.dim value in `kmath-dimensions`
 - Multiplication in integer rings in `kmath-core` (https://github.com/mipt-npm/kmath/pull/101)
 - Commons RNG compatibility (https://github.com/mipt-npm/kmath/issues/93)
-- Multiplication of BigInt by scalar
+- Multiplication of BigInt by scalar
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 1e703c5e1..10f2385f5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-21"
+    version = "0.3.0"
 }
 
 subprojects {
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index 4872a3a26..5d5630f46 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -10,7 +10,7 @@ Extensions to MST API: transformations, dynamic compilation and visualization.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-ast:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.0-dev-20")
+    implementation("space.kscience:kmath-ast:0.3.0")
 }
 ```
 
diff --git a/kmath-commons/README.md b/kmath-commons/README.md
index a17a39205..7195e6fb1 100644
--- a/kmath-commons/README.md
+++ b/kmath-commons/README.md
@@ -6,7 +6,7 @@ Commons math binding for kmath
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-commons:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-commons:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-commons:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-commons:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-commons:0.3.0-dev-20")
+    implementation("space.kscience:kmath-commons:0.3.0")
 }
 ```
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index b55ce0fea..4646c6a80 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -8,7 +8,7 @@ Complex and hypercomplex number systems in KMath.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-complex:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-complex:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-complex:0.3.0-dev-20")
+    implementation("space.kscience:kmath-complex:0.3.0")
 }
 ```
diff --git a/kmath-core/README.md b/kmath-core/README.md
index 31965ef92..4fddd327c 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -15,7 +15,7 @@ performance calculations to code generation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-core:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-core:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -36,6 +36,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-core:0.3.0-dev-20")
+    implementation("space.kscience:kmath-core:0.3.0")
 }
 ```
diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index b424b59ff..737d33f1c 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -1,17 +1,29 @@
 public final class space/kscience/kmath/data/ColumnarDataKt {
+	public static final fun getIndices (Lspace/kscience/kmath/data/ColumnarData;)Lkotlin/ranges/IntRange;
+}
+
+public final class space/kscience/kmath/data/XYColumnarData$Companion {
 }
 
 public final class space/kscience/kmath/data/XYColumnarDataKt {
 	public static synthetic fun asXYData$default (Lspace/kscience/kmath/nd/Structure2D;IIILjava/lang/Object;)Lspace/kscience/kmath/data/XYColumnarData;
 }
 
+public final class space/kscience/kmath/data/XYErrorColumnarData$Companion {
+	public final fun of (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/data/XYErrorColumnarData;
+}
+
 public abstract interface class space/kscience/kmath/domains/Domain {
 	public abstract fun contains (Lspace/kscience/kmath/structures/Buffer;)Z
 	public abstract fun getDimension ()I
 }
 
+public final class space/kscience/kmath/domains/Domain1DKt {
+	public static final fun getCenter (Lspace/kscience/kmath/domains/Domain1D;)D
+}
+
 public abstract interface class space/kscience/kmath/expressions/AutoDiffProcessor {
-	public abstract fun process (Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/DifferentiableExpression;
+	public abstract fun differentiate (Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/DifferentiableExpression;
 }
 
 public class space/kscience/kmath/expressions/AutoDiffValue {
@@ -35,6 +47,9 @@ public final class space/kscience/kmath/expressions/DifferentiableExpressionKt {
 	public static final fun derivative (Lspace/kscience/kmath/expressions/DifferentiableExpression;Ljava/lang/String;)Lspace/kscience/kmath/expressions/Expression;
 	public static final fun derivative (Lspace/kscience/kmath/expressions/DifferentiableExpression;Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
 	public static final fun derivative (Lspace/kscience/kmath/expressions/DifferentiableExpression;[Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/expressions/Expression;
+	public static final fun derivative (Lspace/kscience/kmath/expressions/SpecialDifferentiableExpression;Ljava/lang/String;)Lspace/kscience/kmath/expressions/Expression;
+	public static final fun derivative (Lspace/kscience/kmath/expressions/SpecialDifferentiableExpression;Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
+	public static final fun derivative (Lspace/kscience/kmath/expressions/SpecialDifferentiableExpression;[Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/expressions/Expression;
 }
 
 public abstract interface class space/kscience/kmath/expressions/Expression {
@@ -46,9 +61,9 @@ public abstract interface class space/kscience/kmath/expressions/ExpressionAlgeb
 }
 
 public final class space/kscience/kmath/expressions/ExpressionKt {
-	public static final fun binding (Lspace/kscience/kmath/expressions/ExpressionAlgebra;)Lkotlin/properties/ReadOnlyProperty;
 	public static final fun callByString (Lspace/kscience/kmath/expressions/Expression;[Lkotlin/Pair;)Ljava/lang/Object;
 	public static final fun callBySymbol (Lspace/kscience/kmath/expressions/Expression;[Lkotlin/Pair;)Ljava/lang/Object;
+	public static final fun getBinding (Lspace/kscience/kmath/expressions/ExpressionAlgebra;)Lkotlin/properties/ReadOnlyProperty;
 	public static final fun invoke (Lspace/kscience/kmath/expressions/Expression;)Ljava/lang/Object;
 }
 
@@ -70,10 +85,11 @@ public abstract class space/kscience/kmath/expressions/FunctionalExpressionAlgeb
 }
 
 public final class space/kscience/kmath/expressions/FunctionalExpressionAlgebraKt {
+	public static final fun expression (Lspace/kscience/kmath/operations/DoubleField;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/Expression;
 	public static final fun expressionInExtendedField (Lspace/kscience/kmath/operations/ExtendedField;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/Expression;
 	public static final fun expressionInField (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/Expression;
+	public static final fun expressionInGroup (Lspace/kscience/kmath/operations/Group;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/Expression;
 	public static final fun expressionInRing (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/Expression;
-	public static final fun expressionInSpace (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/Expression;
 }
 
 public class space/kscience/kmath/expressions/FunctionalExpressionExtendedField : space/kscience/kmath/expressions/FunctionalExpressionField, space/kscience/kmath/operations/ExtendedField {
@@ -85,8 +101,6 @@ public class space/kscience/kmath/expressions/FunctionalExpressionExtendedField
 	public synthetic fun atan (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun atan (Lspace/kscience/kmath/expressions/Expression;)Lspace/kscience/kmath/expressions/Expression;
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
-	public synthetic fun bindSymbol (Ljava/lang/String;)Ljava/lang/Object;
-	public fun bindSymbol (Ljava/lang/String;)Lspace/kscience/kmath/expressions/Expression;
 	public synthetic fun cos (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun cos (Lspace/kscience/kmath/expressions/Expression;)Lspace/kscience/kmath/expressions/Expression;
 	public synthetic fun exp (Ljava/lang/Object;)Ljava/lang/Object;
@@ -189,7 +203,6 @@ public final class space/kscience/kmath/expressions/MST$Unary : space/kscience/k
 }
 
 public final class space/kscience/kmath/expressions/MSTKt {
-	public static final fun evaluate (Lspace/kscience/kmath/operations/Algebra;Lspace/kscience/kmath/expressions/MST;)Ljava/lang/Object;
 	public static final fun interpret (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/operations/Algebra;Ljava/util/Map;)Ljava/lang/Object;
 	public static final fun interpret (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/operations/Algebra;[Lkotlin/Pair;)Ljava/lang/Object;
 	public static final fun toExpression (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/operations/Algebra;)Lspace/kscience/kmath/expressions/Expression;
@@ -255,7 +268,7 @@ public final class space/kscience/kmath/expressions/MstExtendedField : space/ksc
 	public fun unaryPlus (Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Unary;
 }
 
-public final class space/kscience/kmath/expressions/MstField : space/kscience/kmath/operations/Field, space/kscience/kmath/operations/NumbersAddOperations, space/kscience/kmath/operations/ScaleOperations {
+public final class space/kscience/kmath/expressions/MstField : space/kscience/kmath/operations/Field, space/kscience/kmath/operations/NumbersAddOps, space/kscience/kmath/operations/ScaleOperations {
 	public static final field INSTANCE Lspace/kscience/kmath/expressions/MstField;
 	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun add (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Binary;
@@ -317,7 +330,7 @@ public final class space/kscience/kmath/expressions/MstNumericAlgebra : space/ks
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
 }
 
-public final class space/kscience/kmath/expressions/MstRing : space/kscience/kmath/operations/NumbersAddOperations, space/kscience/kmath/operations/Ring, space/kscience/kmath/operations/ScaleOperations {
+public final class space/kscience/kmath/expressions/MstRing : space/kscience/kmath/operations/NumbersAddOps, space/kscience/kmath/operations/Ring, space/kscience/kmath/operations/ScaleOperations {
 	public static final field INSTANCE Lspace/kscience/kmath/expressions/MstRing;
 	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun add (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Binary;
@@ -365,8 +378,6 @@ public final class space/kscience/kmath/expressions/SimpleAutoDiffExtendedField
 	public fun atan (Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public synthetic fun atanh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun atanh (Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
-	public synthetic fun bindSymbol (Ljava/lang/String;)Ljava/lang/Object;
-	public fun bindSymbol (Ljava/lang/String;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public synthetic fun cos (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun cos (Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public synthetic fun cosh (Ljava/lang/Object;)Ljava/lang/Object;
@@ -395,7 +406,7 @@ public final class space/kscience/kmath/expressions/SimpleAutoDiffExtendedField
 	public fun tanh (Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 }
 
-public class space/kscience/kmath/expressions/SimpleAutoDiffField : space/kscience/kmath/expressions/ExpressionAlgebra, space/kscience/kmath/operations/Field, space/kscience/kmath/operations/NumbersAddOperations {
+public class space/kscience/kmath/expressions/SimpleAutoDiffField : space/kscience/kmath/expressions/ExpressionAlgebra, space/kscience/kmath/operations/Field, space/kscience/kmath/operations/NumbersAddOps {
 	public fun <init> (Lspace/kscience/kmath/operations/Field;Ljava/util/Map;)V
 	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun add (Lspace/kscience/kmath/expressions/AutoDiffValue;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
@@ -403,7 +414,6 @@ public class space/kscience/kmath/expressions/SimpleAutoDiffField : space/kscien
 	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public synthetic fun const (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun const (Ljava/lang/Object;)Lspace/kscience/kmath/expressions/AutoDiffValue;
-	public final fun const (Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public final fun derive (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 	public synthetic fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun divide (Lspace/kscience/kmath/expressions/AutoDiffValue;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
@@ -431,6 +441,7 @@ public final class space/kscience/kmath/expressions/SimpleAutoDiffKt {
 	public static final fun asinh (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public static final fun atan (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public static final fun atanh (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
+	public static final fun const (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public static final fun cos (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public static final fun cosh (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 	public static final fun exp (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
@@ -450,18 +461,13 @@ public final class space/kscience/kmath/expressions/SimpleAutoDiffKt {
 	public static final fun tanh (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 }
 
-public final class space/kscience/kmath/expressions/StringSymbol : space/kscience/kmath/expressions/Symbol {
-	public static final synthetic fun box-impl (Ljava/lang/String;)Lspace/kscience/kmath/expressions/StringSymbol;
-	public static fun constructor-impl (Ljava/lang/String;)Ljava/lang/String;
-	public fun equals (Ljava/lang/Object;)Z
-	public static fun equals-impl (Ljava/lang/String;Ljava/lang/Object;)Z
-	public static final fun equals-impl0 (Ljava/lang/String;Ljava/lang/String;)Z
-	public fun getIdentity ()Ljava/lang/String;
-	public fun hashCode ()I
-	public static fun hashCode-impl (Ljava/lang/String;)I
-	public fun toString ()Ljava/lang/String;
-	public static fun toString-impl (Ljava/lang/String;)Ljava/lang/String;
-	public final synthetic fun unbox-impl ()Ljava/lang/String;
+public abstract interface class space/kscience/kmath/expressions/SpecialDifferentiableExpression : space/kscience/kmath/expressions/DifferentiableExpression {
+	public abstract fun derivativeOrNull (Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
+}
+
+public final class space/kscience/kmath/expressions/SpecialExpressionsKt {
+	public static final fun chiSquaredExpression (Lspace/kscience/kmath/expressions/AutoDiffProcessor;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/expressions/DifferentiableExpression;
+	public static final fun genericChiSquaredExpression (Lspace/kscience/kmath/expressions/AutoDiffProcessor;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/expressions/DifferentiableExpression;
 }
 
 public abstract interface class space/kscience/kmath/expressions/Symbol : space/kscience/kmath/expressions/MST {
@@ -470,15 +476,19 @@ public abstract interface class space/kscience/kmath/expressions/Symbol : space/
 }
 
 public final class space/kscience/kmath/expressions/Symbol$Companion {
-	public final fun getX-uKgCeAI ()Ljava/lang/String;
-	public final fun getY-uKgCeAI ()Ljava/lang/String;
-	public final fun getZ-uKgCeAI ()Ljava/lang/String;
+	public final fun getX ()Lspace/kscience/kmath/expressions/Symbol;
+	public final fun getXError ()Lspace/kscience/kmath/expressions/Symbol;
+	public final fun getY ()Lspace/kscience/kmath/expressions/Symbol;
+	public final fun getYError ()Lspace/kscience/kmath/expressions/Symbol;
+	public final fun getZ ()Lspace/kscience/kmath/expressions/Symbol;
+	public final fun getZError ()Lspace/kscience/kmath/expressions/Symbol;
 }
 
 public final class space/kscience/kmath/expressions/SymbolIndexerKt {
 }
 
 public final class space/kscience/kmath/expressions/SymbolKt {
+	public static final fun Symbol (Ljava/lang/String;)Lspace/kscience/kmath/expressions/Symbol;
 	public static final fun get (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Object;
 	public static final fun get (Ljava/util/Map;Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
 	public static final fun getSymbol ()Lkotlin/properties/ReadOnlyProperty;
@@ -487,7 +497,7 @@ public final class space/kscience/kmath/expressions/SymbolKt {
 }
 
 public final class space/kscience/kmath/linear/BufferedLinearSpace : space/kscience/kmath/linear/LinearSpace {
-	public fun <init> (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;)V
+	public fun <init> (Lspace/kscience/kmath/operations/BufferAlgebra;)V
 	public fun buildMatrix (IILkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/Structure2D;
 	public fun buildVector (ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/structures/Buffer;
 	public fun dot (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
@@ -499,6 +509,10 @@ public final class space/kscience/kmath/linear/BufferedLinearSpace : space/kscie
 	public fun unaryMinus (Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
 }
 
+public final class space/kscience/kmath/linear/BufferedLinearSpaceKt {
+	public static final fun linearSpace (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/linear/BufferedLinearSpace;
+}
+
 public abstract interface class space/kscience/kmath/linear/CholeskyDecompositionFeature : space/kscience/kmath/linear/MatrixFeature {
 	public abstract fun getL ()Lspace/kscience/kmath/nd/Structure2D;
 }
@@ -514,6 +528,36 @@ public abstract interface class space/kscience/kmath/linear/DiagonalFeature : sp
 public final class space/kscience/kmath/linear/DiagonalFeature$Companion : space/kscience/kmath/linear/DiagonalFeature {
 }
 
+public final class space/kscience/kmath/linear/DoubleLinearSpace : space/kscience/kmath/linear/LinearSpace {
+	public static final field INSTANCE Lspace/kscience/kmath/linear/DoubleLinearSpace;
+	public fun buildMatrix (IILkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/Structure2D;
+	public synthetic fun buildVector (ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/structures/Buffer;
+	public fun buildVector-CZ9oacQ (ILkotlin/jvm/functions/Function2;)[D
+	public final fun div-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;D)[D
+	public fun dot (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
+	public synthetic fun dot (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public fun dot-CZ9oacQ (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/structures/Buffer;)[D
+	public fun getElementAlgebra ()Lspace/kscience/kmath/operations/DoubleField;
+	public synthetic fun getElementAlgebra ()Lspace/kscience/kmath/operations/Ring;
+	public fun minus (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
+	public synthetic fun minus (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public fun minus-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
+	public fun plus (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
+	public synthetic fun plus (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public fun plus-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun times (Ljava/lang/Object;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public fun times (Lspace/kscience/kmath/nd/Structure2D;D)Lspace/kscience/kmath/nd/Structure2D;
+	public synthetic fun times (Lspace/kscience/kmath/nd/Structure2D;Ljava/lang/Object;)Lspace/kscience/kmath/nd/Structure2D;
+	public synthetic fun times (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Object;)Lspace/kscience/kmath/structures/Buffer;
+	public fun times-CZ9oacQ (DLspace/kscience/kmath/structures/Buffer;)[D
+	public fun times-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;D)[D
+	public fun unaryMinus (Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
+}
+
+public final class space/kscience/kmath/linear/DoubleLinearSpaceKt {
+	public static final fun getLinearSpace (Lspace/kscience/kmath/operations/DoubleField;)Lspace/kscience/kmath/linear/DoubleLinearSpace;
+}
+
 public abstract interface class space/kscience/kmath/linear/InverseMatrixFeature : space/kscience/kmath/linear/MatrixFeature {
 	public abstract fun getInverse ()Lspace/kscience/kmath/nd/Structure2D;
 }
@@ -533,11 +577,6 @@ public abstract interface class space/kscience/kmath/linear/LinearSolver {
 	public fun solve (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
 }
 
-public final class space/kscience/kmath/linear/LinearSolverKt {
-	public static final fun asMatrix (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/linear/VirtualMatrix;
-	public static final fun asVector (Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/structures/Buffer;
-}
-
 public abstract interface class space/kscience/kmath/linear/LinearSpace {
 	public static final field Companion Lspace/kscience/kmath/linear/LinearSpace$Companion;
 	public abstract fun buildMatrix (IILkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/Structure2D;
@@ -560,10 +599,12 @@ public abstract interface class space/kscience/kmath/linear/LinearSpace {
 public final class space/kscience/kmath/linear/LinearSpace$Companion {
 	public final fun buffered (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/linear/LinearSpace;
 	public static synthetic fun buffered$default (Lspace/kscience/kmath/linear/LinearSpace$Companion;Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lspace/kscience/kmath/linear/LinearSpace;
-	public final fun getReal ()Lspace/kscience/kmath/linear/LinearSpace;
+	public final fun getDouble ()Lspace/kscience/kmath/linear/LinearSpace;
 }
 
 public final class space/kscience/kmath/linear/LinearSpaceKt {
+	public static final fun asMatrix (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/linear/VirtualMatrix;
+	public static final fun asVector (Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun invoke (Lspace/kscience/kmath/linear/LinearSpace;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
@@ -587,11 +628,12 @@ public abstract interface class space/kscience/kmath/linear/LupDecompositionFeat
 
 public final class space/kscience/kmath/linear/LupDecompositionKt {
 	public static final fun abs (Lspace/kscience/kmath/linear/LinearSpace;Ljava/lang/Comparable;)Ljava/lang/Comparable;
-	public static final fun inverseWithLup (Lspace/kscience/kmath/linear/LinearSpace;Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
 	public static final fun lup (Lspace/kscience/kmath/linear/LinearSpace;Lkotlin/jvm/functions/Function2;Lspace/kscience/kmath/nd/Structure2D;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/linear/LupDecomposition;
-	public static final fun lup (Lspace/kscience/kmath/linear/LinearSpace;Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/linear/LupDecomposition;
-	public static final fun solveWithLup (Lspace/kscience/kmath/linear/LinearSpace;Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
-	public static final fun solveWithLup (Lspace/kscience/kmath/linear/LupDecomposition;Lkotlin/jvm/functions/Function2;Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
+	public static final fun lup (Lspace/kscience/kmath/linear/LinearSpace;Lspace/kscience/kmath/nd/Structure2D;D)Lspace/kscience/kmath/linear/LupDecomposition;
+	public static synthetic fun lup$default (Lspace/kscience/kmath/linear/LinearSpace;Lspace/kscience/kmath/nd/Structure2D;DILjava/lang/Object;)Lspace/kscience/kmath/linear/LupDecomposition;
+	public static final fun lupSolver (Lspace/kscience/kmath/linear/LinearSpace;D)Lspace/kscience/kmath/linear/LinearSolver;
+	public static final fun lupSolver (Lspace/kscience/kmath/linear/LinearSpace;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/linear/LinearSolver;
+	public static synthetic fun lupSolver$default (Lspace/kscience/kmath/linear/LinearSpace;DILjava/lang/Object;)Lspace/kscience/kmath/linear/LinearSolver;
 }
 
 public final class space/kscience/kmath/linear/MatrixBuilder {
@@ -607,6 +649,7 @@ public final class space/kscience/kmath/linear/MatrixBuilderKt {
 	public static final fun column (Lspace/kscience/kmath/linear/LinearSpace;[Ljava/lang/Object;)Lspace/kscience/kmath/nd/Structure2D;
 	public static final fun row (Lspace/kscience/kmath/linear/LinearSpace;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/Structure2D;
 	public static final fun row (Lspace/kscience/kmath/linear/LinearSpace;[Ljava/lang/Object;)Lspace/kscience/kmath/nd/Structure2D;
+	public static final fun symmetric (Lspace/kscience/kmath/linear/MatrixBuilder;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/Structure2D;
 }
 
 public abstract interface class space/kscience/kmath/linear/MatrixFeature : space/kscience/kmath/nd/StructureFeature {
@@ -623,7 +666,10 @@ public final class space/kscience/kmath/linear/MatrixWrapper : space/kscience/km
 	public fun getColNum ()I
 	public fun getColumns ()Ljava/util/List;
 	public fun getDimension ()I
-	public final fun getFeatures ()Ljava/util/Set;
+	public synthetic fun getFeature (Lkotlin/reflect/KClass;)Ljava/lang/Object;
+	public fun getFeature (Lkotlin/reflect/KClass;)Lspace/kscience/kmath/nd/StructureFeature;
+	public final fun getFeatures-En6fw3w ()Ljava/util/Map;
+	public fun getIndices ()Lspace/kscience/kmath/nd/ShapeIndexer;
 	public final fun getOrigin ()Lspace/kscience/kmath/nd/Structure2D;
 	public fun getRowNum ()I
 	public fun getRows ()Ljava/util/List;
@@ -634,9 +680,10 @@ public final class space/kscience/kmath/linear/MatrixWrapper : space/kscience/km
 public final class space/kscience/kmath/linear/MatrixWrapperKt {
 	public static final fun getOrigin (Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
 	public static final fun one (Lspace/kscience/kmath/linear/LinearSpace;II)Lspace/kscience/kmath/nd/Structure2D;
-	public static final fun plus (Lspace/kscience/kmath/nd/Structure2D;Ljava/util/Collection;)Lspace/kscience/kmath/linear/MatrixWrapper;
 	public static final fun plus (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/linear/MatrixFeature;)Lspace/kscience/kmath/linear/MatrixWrapper;
 	public static final fun transpose (Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
+	public static final fun withFeature (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/linear/MatrixFeature;)Lspace/kscience/kmath/linear/MatrixWrapper;
+	public static final fun withFeatures (Lspace/kscience/kmath/nd/Structure2D;Ljava/lang/Iterable;)Lspace/kscience/kmath/linear/MatrixWrapper;
 	public static final fun zero (Lspace/kscience/kmath/linear/LinearSpace;II)Lspace/kscience/kmath/nd/Structure2D;
 }
 
@@ -656,6 +703,10 @@ public abstract interface class space/kscience/kmath/linear/SingularValueDecompo
 	public abstract fun getV ()Lspace/kscience/kmath/nd/Structure2D;
 }
 
+public final class space/kscience/kmath/linear/SymmetricMatrixFeature : space/kscience/kmath/linear/MatrixFeature {
+	public static final field INSTANCE Lspace/kscience/kmath/linear/SymmetricMatrixFeature;
+}
+
 public final class space/kscience/kmath/linear/TransposedFeature : space/kscience/kmath/linear/MatrixFeature {
 	public fun <init> (Lspace/kscience/kmath/nd/Structure2D;)V
 	public final fun getOriginal ()Lspace/kscience/kmath/nd/Structure2D;
@@ -678,6 +729,10 @@ public final class space/kscience/kmath/linear/VirtualMatrix : space/kscience/km
 	public fun getShape ()[I
 }
 
+public final class space/kscience/kmath/linear/VirtualMatrixKt {
+	public static final fun virtual (Lspace/kscience/kmath/linear/MatrixBuilder;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/linear/VirtualMatrix;
+}
+
 public final class space/kscience/kmath/linear/ZeroFeature : space/kscience/kmath/linear/DiagonalFeature {
 	public static final field INSTANCE Lspace/kscience/kmath/linear/ZeroFeature;
 }
@@ -701,82 +756,164 @@ public final class space/kscience/kmath/misc/CumulativeKt {
 	public static final fun cumulativeSumOfLong (Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
 }
 
+public abstract interface class space/kscience/kmath/misc/Feature {
+	public fun getKey ()Lkotlin/reflect/KClass;
+}
+
+public final class space/kscience/kmath/misc/FeatureSet : space/kscience/kmath/misc/Featured {
+	public static final field Companion Lspace/kscience/kmath/misc/FeatureSet$Companion;
+	public static final synthetic fun box-impl (Ljava/util/Map;)Lspace/kscience/kmath/misc/FeatureSet;
+	public fun equals (Ljava/lang/Object;)Z
+	public static fun equals-impl (Ljava/util/Map;Ljava/lang/Object;)Z
+	public static final fun equals-impl0 (Ljava/util/Map;Ljava/util/Map;)Z
+	public synthetic fun getFeature (Lkotlin/reflect/KClass;)Ljava/lang/Object;
+	public fun getFeature (Lkotlin/reflect/KClass;)Lspace/kscience/kmath/misc/Feature;
+	public static fun getFeature-impl (Ljava/util/Map;Lkotlin/reflect/KClass;)Lspace/kscience/kmath/misc/Feature;
+	public final fun getFeatures ()Ljava/util/Map;
+	public fun hashCode ()I
+	public static fun hashCode-impl (Ljava/util/Map;)I
+	public static final fun iterator-impl (Ljava/util/Map;)Ljava/util/Iterator;
+	public fun toString ()Ljava/lang/String;
+	public static fun toString-impl (Ljava/util/Map;)Ljava/lang/String;
+	public final synthetic fun unbox-impl ()Ljava/util/Map;
+	public static final fun with-JVE9-Rk (Ljava/util/Map;Ljava/lang/Iterable;)Ljava/util/Map;
+	public static final fun with-JVE9-Rk (Ljava/util/Map;[Lspace/kscience/kmath/misc/Feature;)Ljava/util/Map;
+	public static final fun with-YU1a0hQ (Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
+	public static final fun with-h58Sd8I (Ljava/util/Map;Lspace/kscience/kmath/misc/Feature;Lkotlin/reflect/KClass;)Ljava/util/Map;
+	public static synthetic fun with-h58Sd8I$default (Ljava/util/Map;Lspace/kscience/kmath/misc/Feature;Lkotlin/reflect/KClass;ILjava/lang/Object;)Ljava/util/Map;
+}
+
+public final class space/kscience/kmath/misc/FeatureSet$Companion {
+	public final fun of-JVE9-Rk (Ljava/lang/Iterable;)Ljava/util/Map;
+	public final fun of-JVE9-Rk ([Lspace/kscience/kmath/misc/Feature;)Ljava/util/Map;
+}
+
+public abstract interface class space/kscience/kmath/misc/Featured {
+	public abstract fun getFeature (Lkotlin/reflect/KClass;)Ljava/lang/Object;
+}
+
+public abstract interface class space/kscience/kmath/misc/Loggable {
+	public static final field Companion Lspace/kscience/kmath/misc/Loggable$Companion;
+	public static final field INFO Ljava/lang/String;
+	public abstract fun log (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+}
+
+public final class space/kscience/kmath/misc/Loggable$Companion {
+	public static final field INFO Ljava/lang/String;
+	public final fun getConsole ()Lspace/kscience/kmath/misc/Loggable;
+}
+
+public final class space/kscience/kmath/misc/LoggingKt {
+	public static final fun log (Lspace/kscience/kmath/misc/Loggable;Lkotlin/jvm/functions/Function0;)V
+}
+
+public final class space/kscience/kmath/misc/NumbersJVMKt {
+	public static final fun toIntExact (J)I
+}
+
 public abstract interface annotation class space/kscience/kmath/misc/PerformancePitfall : java/lang/annotation/Annotation {
+	public abstract fun message ()Ljava/lang/String;
+}
+
+public final class space/kscience/kmath/misc/SortingKt {
+	public static final fun requireSorted (Lspace/kscience/kmath/structures/Buffer;)V
+	public static final fun sorted (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun sortedBy (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun sortedByDescending (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun sortedDescending (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
 }
 
 public abstract interface annotation class space/kscience/kmath/misc/UnstableKMathAPI : java/lang/annotation/Annotation {
 }
 
-public abstract interface class space/kscience/kmath/nd/AlgebraND {
+public abstract interface class space/kscience/kmath/nd/AlgebraND : space/kscience/kmath/operations/Algebra {
 	public static final field Companion Lspace/kscience/kmath/nd/AlgebraND$Companion;
-	public abstract fun combine (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
-	public abstract fun getElementContext ()Lspace/kscience/kmath/operations/Algebra;
-	public abstract fun getShape ()[I
+	public abstract fun getElementAlgebra ()Lspace/kscience/kmath/operations/Algebra;
 	public fun invoke (Lkotlin/jvm/functions/Function1;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
-	public abstract fun map (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
-	public abstract fun mapIndexed (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
-	public abstract fun produce (Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+	public fun map (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+	public fun mapIndexed (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
+	public abstract fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+	public fun zip (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
 }
 
 public final class space/kscience/kmath/nd/AlgebraND$Companion {
 }
 
+public final class space/kscience/kmath/nd/AlgebraNDExtentionsKt {
+	public static final fun one (Lspace/kscience/kmath/nd/AlgebraND;[I)Lspace/kscience/kmath/nd/StructureND;
+	public static final fun oneVarArg (Lspace/kscience/kmath/nd/AlgebraND;I[I)Lspace/kscience/kmath/nd/StructureND;
+	public static final fun structureND (Lspace/kscience/kmath/nd/AlgebraND;I[ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+	public static final fun zero (Lspace/kscience/kmath/nd/AlgebraND;[I)Lspace/kscience/kmath/nd/StructureND;
+	public static final fun zeroVarArg (Lspace/kscience/kmath/nd/AlgebraND;I[I)Lspace/kscience/kmath/nd/StructureND;
+}
+
+public final class space/kscience/kmath/nd/AlgebraNDKt {
+	public static final fun Shape (I[I)[I
+}
+
 public abstract interface class space/kscience/kmath/nd/BufferAlgebraND : space/kscience/kmath/nd/AlgebraND {
-	public fun combine (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun combine (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
-	public fun getBuffer (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/structures/Buffer;
-	public abstract fun getBufferFactory ()Lkotlin/jvm/functions/Function2;
-	public abstract fun getStrides ()Lspace/kscience/kmath/nd/Strides;
+	public static final field Companion Lspace/kscience/kmath/nd/BufferAlgebraND$Companion;
+	public abstract fun getBufferAlgebra ()Lspace/kscience/kmath/operations/BufferAlgebra;
+	public fun getElementAlgebra ()Lspace/kscience/kmath/operations/Algebra;
+	public abstract fun getIndexerBuilder ()Lkotlin/jvm/functions/Function1;
 	public fun map (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
 	public synthetic fun map (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
 	public fun mapIndexed (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/BufferND;
 	public synthetic fun mapIndexed (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
-	public fun produce (Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun produce (Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+	public fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
+	public synthetic fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+	public fun toBufferND (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
+	public fun zip (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/BufferND;
+	public synthetic fun zip (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
+}
+
+public final class space/kscience/kmath/nd/BufferAlgebraND$Companion {
+	public final fun getDefaultIndexerBuilder ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class space/kscience/kmath/nd/BufferAlgebraNDKt {
-	public static final fun field (Lspace/kscience/kmath/nd/AlgebraND$Companion;Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function2;[I)Lspace/kscience/kmath/nd/BufferedFieldND;
-	public static final fun group (Lspace/kscience/kmath/nd/AlgebraND$Companion;Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;[I)Lspace/kscience/kmath/nd/BufferedGroupND;
-	public static final fun ndField (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function2;[ILkotlin/jvm/functions/Function1;)Ljava/lang/Object;
-	public static final fun ndGroup (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;[ILkotlin/jvm/functions/Function1;)Ljava/lang/Object;
-	public static final fun ndRing (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;[ILkotlin/jvm/functions/Function1;)Ljava/lang/Object;
-	public static final fun ring (Lspace/kscience/kmath/nd/AlgebraND$Companion;Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;[I)Lspace/kscience/kmath/nd/BufferedRingND;
+	public static final fun getNd (Lspace/kscience/kmath/operations/BufferAlgebra;)Lspace/kscience/kmath/nd/BufferedFieldOpsND;
+	public static final fun getNd (Lspace/kscience/kmath/operations/BufferAlgebra;)Lspace/kscience/kmath/nd/BufferedGroupNDOps;
+	public static final fun getNd (Lspace/kscience/kmath/operations/BufferAlgebra;)Lspace/kscience/kmath/nd/BufferedRingOpsND;
+	public static final fun mapInline (Lspace/kscience/kmath/nd/BufferAlgebraND;Lspace/kscience/kmath/nd/BufferND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
+	public static final fun structureND (Lspace/kscience/kmath/nd/BufferAlgebraND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
+	public static final fun structureND (Lspace/kscience/kmath/nd/BufferAlgebraND;[ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
 }
 
 public class space/kscience/kmath/nd/BufferND : space/kscience/kmath/nd/StructureND {
-	public fun <init> (Lspace/kscience/kmath/nd/Strides;Lspace/kscience/kmath/structures/Buffer;)V
-	public fun elements ()Lkotlin/sequences/Sequence;
+	public fun <init> (Lspace/kscience/kmath/nd/ShapeIndexer;Lspace/kscience/kmath/structures/Buffer;)V
 	public fun get ([I)Ljava/lang/Object;
-	public final fun getBuffer ()Lspace/kscience/kmath/structures/Buffer;
+	public fun getBuffer ()Lspace/kscience/kmath/structures/Buffer;
+	public fun getIndices ()Lspace/kscience/kmath/nd/ShapeIndexer;
 	public fun getShape ()[I
-	public final fun getStrides ()Lspace/kscience/kmath/nd/Strides;
 	public fun toString ()Ljava/lang/String;
 }
 
-public class space/kscience/kmath/nd/BufferedFieldND : space/kscience/kmath/nd/BufferedRingND, space/kscience/kmath/nd/FieldND {
-	public fun <init> ([ILspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function2;)V
+public final class space/kscience/kmath/nd/BufferNDKt {
+	public static final fun mapToBuffer (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/BufferND;
+}
+
+public class space/kscience/kmath/nd/BufferedFieldOpsND : space/kscience/kmath/nd/BufferedRingOpsND, space/kscience/kmath/nd/FieldOpsND {
+	public fun <init> (Lspace/kscience/kmath/operations/BufferAlgebra;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Lspace/kscience/kmath/operations/BufferAlgebra;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object;
 	public fun scale (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/nd/StructureND;
 }
 
-public class space/kscience/kmath/nd/BufferedGroupND : space/kscience/kmath/nd/BufferAlgebraND, space/kscience/kmath/nd/GroupND {
-	public fun <init> ([ILspace/kscience/kmath/operations/Group;Lkotlin/jvm/functions/Function2;)V
-	public final fun getBufferFactory ()Lkotlin/jvm/functions/Function2;
-	public synthetic fun getElementContext ()Lspace/kscience/kmath/operations/Algebra;
-	public final fun getElementContext ()Lspace/kscience/kmath/operations/Group;
-	public final fun getShape ()[I
-	public fun getStrides ()Lspace/kscience/kmath/nd/Strides;
-	public synthetic fun getZero ()Ljava/lang/Object;
-	public fun getZero ()Lspace/kscience/kmath/nd/BufferND;
+public class space/kscience/kmath/nd/BufferedGroupNDOps : space/kscience/kmath/nd/BufferAlgebraND, space/kscience/kmath/nd/GroupOpsND {
+	public fun <init> (Lspace/kscience/kmath/operations/BufferAlgebra;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Lspace/kscience/kmath/operations/BufferAlgebra;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getBufferAlgebra ()Lspace/kscience/kmath/operations/BufferAlgebra;
+	public fun getIndexerBuilder ()Lkotlin/jvm/functions/Function1;
 	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun unaryMinus (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
 }
 
-public class space/kscience/kmath/nd/BufferedRingND : space/kscience/kmath/nd/BufferedGroupND, space/kscience/kmath/nd/RingND {
-	public fun <init> ([ILspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;)V
-	public synthetic fun getOne ()Ljava/lang/Object;
-	public fun getOne ()Lspace/kscience/kmath/nd/BufferND;
+public class space/kscience/kmath/nd/BufferedRingOpsND : space/kscience/kmath/nd/BufferedGroupNDOps, space/kscience/kmath/nd/RingOpsND {
+	public fun <init> (Lspace/kscience/kmath/operations/BufferAlgebra;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Lspace/kscience/kmath/operations/BufferAlgebra;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public final class space/kscience/kmath/nd/DefaultStrides : space/kscience/kmath/nd/Strides {
@@ -794,72 +931,151 @@ public final class space/kscience/kmath/nd/DefaultStrides$Companion {
 	public final fun invoke ([I)Lspace/kscience/kmath/nd/Strides;
 }
 
-public final class space/kscience/kmath/nd/DoubleFieldND : space/kscience/kmath/nd/BufferedFieldND, space/kscience/kmath/operations/ExtendedField, space/kscience/kmath/operations/NumbersAddOperations, space/kscience/kmath/operations/ScaleOperations {
+public final class space/kscience/kmath/nd/DoubleBufferND : space/kscience/kmath/nd/BufferND {
+	public synthetic fun <init> (Lspace/kscience/kmath/nd/ShapeIndexer;[DLkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun getBuffer ()Lspace/kscience/kmath/structures/Buffer;
+	public fun getBuffer-Dv3HvWU ()[D
+}
+
+public final class space/kscience/kmath/nd/DoubleFieldND : space/kscience/kmath/nd/DoubleFieldOpsND, space/kscience/kmath/nd/FieldND, space/kscience/kmath/operations/ExtendedField, space/kscience/kmath/operations/NumbersAddOps {
 	public fun <init> ([I)V
-	public synthetic fun acos (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun acos (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
 	public synthetic fun acosh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun acosh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun asin (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun asin (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
+	public fun acosh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public synthetic fun asinh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun asinh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun atan (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun atan (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
+	public fun asinh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public synthetic fun atanh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun atanh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
-	public fun combine (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun combine (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
-	public synthetic fun cos (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun cos (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
+	public fun atanh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public synthetic fun cosh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun cosh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun exp (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun exp (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun getBuffer (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/structures/Buffer;
-	public fun getBuffer-Udx-57Q (Lspace/kscience/kmath/nd/StructureND;)[D
-	public synthetic fun getOne ()Ljava/lang/Object;
-	public fun getOne ()Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun getZero ()Ljava/lang/Object;
-	public fun getZero ()Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun ln (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun ln (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
-	public fun map (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun map (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
-	public fun mapIndexed (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun mapIndexed (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
+	public fun cosh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public fun getShape ()[I
 	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
-	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/nd/BufferND;
+	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun power (Ljava/lang/Object;I)Ljava/lang/Object;
 	public synthetic fun power (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
-	public fun power (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Number;)Lspace/kscience/kmath/nd/BufferND;
-	public fun produce (Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun produce (Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
-	public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object;
-	public fun scale (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/nd/StructureND;
-	public synthetic fun sin (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun sin (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
+	public fun power (Lspace/kscience/kmath/nd/StructureND;I)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public fun power (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Number;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun power-Qn1smSk (Ljava/lang/Object;I)Ljava/lang/Object;
+	public fun power-Qn1smSk (Lspace/kscience/kmath/nd/StructureND;I)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun sinh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun tan (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun tan (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
+	public fun sinh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public synthetic fun tanh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun tanh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
+	public fun tanh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
 }
 
 public final class space/kscience/kmath/nd/DoubleFieldNDKt {
-	public static final fun nd (Lspace/kscience/kmath/operations/DoubleField;[ILkotlin/jvm/functions/Function1;)Ljava/lang/Object;
-	public static final fun real (Lspace/kscience/kmath/nd/AlgebraND$Companion;[I)Lspace/kscience/kmath/nd/DoubleFieldND;
+	public static final fun getNdAlgebra (Lspace/kscience/kmath/operations/DoubleField;)Lspace/kscience/kmath/nd/DoubleFieldOpsND;
+	public static final fun ndAlgebra (Lspace/kscience/kmath/operations/DoubleField;[I)Lspace/kscience/kmath/nd/DoubleFieldND;
 }
 
-public abstract interface class space/kscience/kmath/nd/FieldND : space/kscience/kmath/nd/RingND, space/kscience/kmath/operations/Field, space/kscience/kmath/operations/ScaleOperations {
+public abstract class space/kscience/kmath/nd/DoubleFieldOpsND : space/kscience/kmath/nd/BufferedFieldOpsND, space/kscience/kmath/operations/ExtendedFieldOps, space/kscience/kmath/operations/ScaleOperations {
+	public static final field Companion Lspace/kscience/kmath/nd/DoubleFieldOpsND$Companion;
+	public synthetic fun acos (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun acos (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun acosh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun acosh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun add (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun add (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
+	public synthetic fun asin (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun asin (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun asinh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun asinh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun atan (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun atan (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun atanh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun atanh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun cos (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun cos (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun cosh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun cosh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public fun div (DLspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun div (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
+	public synthetic fun div (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public synthetic fun div (Ljava/lang/Object;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
+	public fun div (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public fun div (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Number;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun div (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/StructureND;
+	public fun div (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun divide (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun divide (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
+	public synthetic fun exp (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun exp (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun ln (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun ln (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public fun map (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
+	public synthetic fun map (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+	protected final fun mapInline (Lspace/kscience/kmath/nd/DoubleBufferND;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public fun minus (DLspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
+	public synthetic fun minus (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public synthetic fun minus (Ljava/lang/Object;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
+	public fun minus (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/nd/StructureND;
+	public synthetic fun minus (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/StructureND;
+	public fun minus (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun multiply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun multiply (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun multiply (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
+	public fun plus (DLspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
+	public synthetic fun plus (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public synthetic fun plus (Ljava/lang/Object;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
+	public fun plus (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun plus (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/StructureND;
+	public fun plus (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object;
+	public fun scale (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun scale (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/nd/StructureND;
+	public synthetic fun sin (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun sin (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun sinh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
+	public fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+	public synthetic fun tan (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun tan (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun tanh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun tanh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun times (Ljava/lang/Number;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun times (Ljava/lang/Number;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun times (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
+	public synthetic fun times (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun times (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Number;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public fun times (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun toBufferND (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
+	public fun toBufferND (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun unaryMinus (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun unaryMinus (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
+	public synthetic fun unaryPlus (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun unaryPlus (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public fun zip (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/BufferND;
+	public synthetic fun zip (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
+}
+
+public final class space/kscience/kmath/nd/DoubleFieldOpsND$Companion : space/kscience/kmath/nd/DoubleFieldOpsND {
+}
+
+public abstract interface class space/kscience/kmath/nd/FieldND : space/kscience/kmath/nd/FieldOpsND, space/kscience/kmath/nd/RingND, space/kscience/kmath/nd/WithShape, space/kscience/kmath/operations/Field {
+	public synthetic fun getOne ()Ljava/lang/Object;
+	public fun getOne ()Lspace/kscience/kmath/nd/StructureND;
+}
+
+public abstract interface class space/kscience/kmath/nd/FieldOpsND : space/kscience/kmath/nd/RingOpsND, space/kscience/kmath/operations/FieldOps, space/kscience/kmath/operations/ScaleOperations {
 	public fun div (Ljava/lang/Object;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
 	public fun div (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/StructureND;
 	public synthetic fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun divide (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
+	public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object;
+	public fun scale (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/nd/StructureND;
 }
 
-public abstract interface class space/kscience/kmath/nd/GroupND : space/kscience/kmath/nd/AlgebraND, space/kscience/kmath/operations/Group {
-	public static final field Companion Lspace/kscience/kmath/nd/GroupND$Companion;
+public abstract interface class space/kscience/kmath/nd/GroupND : space/kscience/kmath/nd/GroupOpsND, space/kscience/kmath/nd/WithShape, space/kscience/kmath/operations/Group {
+	public synthetic fun getZero ()Ljava/lang/Object;
+	public fun getZero ()Lspace/kscience/kmath/nd/StructureND;
+}
+
+public abstract interface class space/kscience/kmath/nd/GroupOpsND : space/kscience/kmath/nd/AlgebraND, space/kscience/kmath/operations/GroupOps {
+	public static final field Companion Lspace/kscience/kmath/nd/GroupOpsND$Companion;
 	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun add (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
 	public fun minus (Ljava/lang/Object;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
@@ -868,12 +1084,13 @@ public abstract interface class space/kscience/kmath/nd/GroupND : space/kscience
 	public fun plus (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/StructureND;
 }
 
-public final class space/kscience/kmath/nd/GroupND$Companion {
+public final class space/kscience/kmath/nd/GroupOpsND$Companion {
 }
 
 public final class space/kscience/kmath/nd/MutableBufferND : space/kscience/kmath/nd/BufferND, space/kscience/kmath/nd/MutableStructureND {
-	public fun <init> (Lspace/kscience/kmath/nd/Strides;Lspace/kscience/kmath/structures/MutableBuffer;)V
-	public final fun getMutableBuffer ()Lspace/kscience/kmath/structures/MutableBuffer;
+	public fun <init> (Lspace/kscience/kmath/nd/ShapeIndexer;Lspace/kscience/kmath/structures/MutableBuffer;)V
+	public synthetic fun getBuffer ()Lspace/kscience/kmath/structures/Buffer;
+	public fun getBuffer ()Lspace/kscience/kmath/structures/MutableBuffer;
 	public fun set ([ILjava/lang/Object;)V
 }
 
@@ -891,15 +1108,31 @@ public abstract interface class space/kscience/kmath/nd/MutableStructureND : spa
 	public abstract fun set ([ILjava/lang/Object;)V
 }
 
-public abstract interface class space/kscience/kmath/nd/RingND : space/kscience/kmath/nd/GroupND, space/kscience/kmath/operations/Ring {
-	public static final field Companion Lspace/kscience/kmath/nd/RingND$Companion;
+public abstract interface class space/kscience/kmath/nd/RingND : space/kscience/kmath/nd/GroupND, space/kscience/kmath/nd/RingOpsND, space/kscience/kmath/nd/WithShape, space/kscience/kmath/operations/Ring {
+	public synthetic fun getOne ()Ljava/lang/Object;
+	public fun getOne ()Lspace/kscience/kmath/nd/StructureND;
+}
+
+public abstract interface class space/kscience/kmath/nd/RingOpsND : space/kscience/kmath/nd/GroupOpsND, space/kscience/kmath/operations/RingOps {
+	public static final field Companion Lspace/kscience/kmath/nd/RingOpsND$Companion;
 	public synthetic fun multiply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun multiply (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
 	public fun times (Ljava/lang/Object;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
 	public fun times (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/StructureND;
 }
 
-public final class space/kscience/kmath/nd/RingND$Companion {
+public final class space/kscience/kmath/nd/RingOpsND$Companion {
+}
+
+public abstract interface class space/kscience/kmath/nd/ShapeIndexer : java/lang/Iterable, kotlin/jvm/internal/markers/KMappedMarker {
+	public abstract fun asSequence ()Lkotlin/sequences/Sequence;
+	public abstract fun equals (Ljava/lang/Object;)Z
+	public abstract fun getLinearSize ()I
+	public abstract fun getShape ()[I
+	public abstract fun hashCode ()I
+	public abstract fun index (I)[I
+	public fun iterator ()Ljava/util/Iterator;
+	public abstract fun offset ([I)I
 }
 
 public final class space/kscience/kmath/nd/ShapeMismatchException : java/lang/RuntimeException {
@@ -908,27 +1141,28 @@ public final class space/kscience/kmath/nd/ShapeMismatchException : java/lang/Ru
 	public final fun getExpected ()[I
 }
 
-public final class space/kscience/kmath/nd/ShortRingND : space/kscience/kmath/nd/BufferedRingND, space/kscience/kmath/operations/NumbersAddOperations {
+public final class space/kscience/kmath/nd/ShortRingND : space/kscience/kmath/nd/ShortRingOpsND, space/kscience/kmath/nd/RingND, space/kscience/kmath/operations/NumbersAddOps {
 	public fun <init> ([I)V
-	public synthetic fun getOne ()Ljava/lang/Object;
-	public fun getOne ()Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun getZero ()Ljava/lang/Object;
-	public fun getZero ()Lspace/kscience/kmath/nd/BufferND;
+	public fun getShape ()[I
 	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
 	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/nd/BufferND;
 }
 
 public final class space/kscience/kmath/nd/ShortRingNDKt {
-	public static final fun nd (Lspace/kscience/kmath/operations/ShortRing;[ILkotlin/jvm/functions/Function1;)Ljava/lang/Object;
-	public static final fun produceInline (Lspace/kscience/kmath/nd/BufferedRingND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
+	public static final fun withNdAlgebra (Lspace/kscience/kmath/operations/ShortRing;[ILkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
-public abstract interface class space/kscience/kmath/nd/Strides {
-	public abstract fun getLinearSize ()I
-	public abstract fun getShape ()[I
+public abstract class space/kscience/kmath/nd/ShortRingOpsND : space/kscience/kmath/nd/BufferedRingOpsND {
+	public static final field Companion Lspace/kscience/kmath/nd/ShortRingOpsND$Companion;
+}
+
+public final class space/kscience/kmath/nd/ShortRingOpsND$Companion : space/kscience/kmath/nd/ShortRingOpsND {
+}
+
+public abstract class space/kscience/kmath/nd/Strides : space/kscience/kmath/nd/ShapeIndexer {
+	public fun <init> ()V
+	public fun asSequence ()Lkotlin/sequences/Sequence;
 	public abstract fun getStrides ()[I
-	public abstract fun index (I)[I
-	public fun indices ()Lkotlin/sequences/Sequence;
 	public fun offset ([I)I
 }
 
@@ -968,14 +1202,16 @@ public final class space/kscience/kmath/nd/Structure2DKt {
 	public static final fun as2D (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/Structure2D;
 }
 
-public abstract interface class space/kscience/kmath/nd/StructureFeature {
+public abstract interface class space/kscience/kmath/nd/StructureFeature : space/kscience/kmath/misc/Feature {
 }
 
-public abstract interface class space/kscience/kmath/nd/StructureND {
+public abstract interface class space/kscience/kmath/nd/StructureND : space/kscience/kmath/misc/Featured, space/kscience/kmath/nd/WithShape {
 	public static final field Companion Lspace/kscience/kmath/nd/StructureND$Companion;
-	public abstract fun elements ()Lkotlin/sequences/Sequence;
+	public fun elements ()Lkotlin/sequences/Sequence;
 	public abstract fun get ([I)Ljava/lang/Object;
 	public fun getDimension ()I
+	public synthetic fun getFeature (Lkotlin/reflect/KClass;)Ljava/lang/Object;
+	public fun getFeature (Lkotlin/reflect/KClass;)Lspace/kscience/kmath/nd/StructureFeature;
 	public abstract fun getShape ()[I
 }
 
@@ -987,14 +1223,25 @@ public final class space/kscience/kmath/nd/StructureND$Companion {
 	public static synthetic fun buffered$default (Lspace/kscience/kmath/nd/StructureND$Companion;Lspace/kscience/kmath/nd/Strides;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/kmath/nd/BufferND;
 	public static synthetic fun buffered$default (Lspace/kscience/kmath/nd/StructureND$Companion;[ILkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/kmath/nd/BufferND;
 	public final fun contentEquals (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Z
+	public final fun contentEquals (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;D)Z
+	public static synthetic fun contentEquals$default (Lspace/kscience/kmath/nd/StructureND$Companion;Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;DILjava/lang/Object;)Z
 	public final fun toString (Lspace/kscience/kmath/nd/StructureND;)Ljava/lang/String;
 }
 
 public final class space/kscience/kmath/nd/StructureNDKt {
+	public static final fun contentEquals (Lspace/kscience/kmath/linear/LinearSpace;Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Z
+	public static final fun contentEquals (Lspace/kscience/kmath/linear/LinearSpace;Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Comparable;)Z
+	public static final fun contentEquals (Lspace/kscience/kmath/nd/AlgebraND;Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Z
+	public static final fun contentEquals (Lspace/kscience/kmath/nd/GroupOpsND;Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Comparable;)Z
 	public static final fun get (Lspace/kscience/kmath/nd/StructureND;[I)Ljava/lang/Object;
 	public static final fun mapInPlace (Lspace/kscience/kmath/nd/MutableStructureND;Lkotlin/jvm/functions/Function2;)V
 }
 
+public abstract interface class space/kscience/kmath/nd/WithShape {
+	public fun getIndices ()Lspace/kscience/kmath/nd/ShapeIndexer;
+	public abstract fun getShape ()[I
+}
+
 public abstract interface class space/kscience/kmath/operations/Algebra {
 	public fun binaryOperation (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
@@ -1004,21 +1251,16 @@ public abstract interface class space/kscience/kmath/operations/Algebra {
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
 }
 
-public final class space/kscience/kmath/operations/AlgebraElementsKt {
-}
-
 public final class space/kscience/kmath/operations/AlgebraExtensionsKt {
-	public static final fun abs (Lspace/kscience/kmath/operations/Ring;Ljava/lang/Comparable;)Ljava/lang/Comparable;
-	public static final fun average (Lspace/kscience/kmath/operations/Ring;Ljava/lang/Iterable;)Ljava/lang/Object;
-	public static final fun average (Lspace/kscience/kmath/operations/Ring;Lkotlin/sequences/Sequence;)Ljava/lang/Object;
-	public static final fun averageWith (Ljava/lang/Iterable;Lspace/kscience/kmath/operations/Ring;)Ljava/lang/Object;
-	public static final fun averageWith (Lkotlin/sequences/Sequence;Lspace/kscience/kmath/operations/Ring;)Ljava/lang/Object;
-	public static final fun power (Lspace/kscience/kmath/operations/Field;Ljava/lang/Object;I)Ljava/lang/Object;
-	public static final fun power-jXDDuk8 (Lspace/kscience/kmath/operations/Ring;Ljava/lang/Object;I)Ljava/lang/Object;
-	public static final fun sum (Lspace/kscience/kmath/operations/Ring;Ljava/lang/Iterable;)Ljava/lang/Object;
-	public static final fun sum (Lspace/kscience/kmath/operations/Ring;Lkotlin/sequences/Sequence;)Ljava/lang/Object;
-	public static final fun sumWith (Ljava/lang/Iterable;Lspace/kscience/kmath/operations/Ring;)Ljava/lang/Object;
-	public static final fun sumWith (Lkotlin/sequences/Sequence;Lspace/kscience/kmath/operations/Ring;)Ljava/lang/Object;
+	public static final fun abs (Lspace/kscience/kmath/operations/Group;Ljava/lang/Comparable;)Ljava/lang/Comparable;
+	public static final fun average (Lspace/kscience/kmath/operations/Group;Ljava/lang/Iterable;)Ljava/lang/Object;
+	public static final fun average (Lspace/kscience/kmath/operations/Group;Lkotlin/sequences/Sequence;)Ljava/lang/Object;
+	public static final fun averageWith (Ljava/lang/Iterable;Lspace/kscience/kmath/operations/Group;)Ljava/lang/Object;
+	public static final fun averageWith (Lkotlin/sequences/Sequence;Lspace/kscience/kmath/operations/Group;)Ljava/lang/Object;
+	public static final fun sum (Lspace/kscience/kmath/operations/Group;Ljava/lang/Iterable;)Ljava/lang/Object;
+	public static final fun sum (Lspace/kscience/kmath/operations/Group;Lkotlin/sequences/Sequence;)Ljava/lang/Object;
+	public static final fun sumWith (Ljava/lang/Iterable;Lspace/kscience/kmath/operations/Group;)Ljava/lang/Object;
+	public static final fun sumWith (Lkotlin/sequences/Sequence;Lspace/kscience/kmath/operations/Group;)Ljava/lang/Object;
 }
 
 public final class space/kscience/kmath/operations/AlgebraKt {
@@ -1061,7 +1303,7 @@ public final class space/kscience/kmath/operations/BigInt$Companion {
 	public final fun getZERO ()Lspace/kscience/kmath/operations/BigInt;
 }
 
-public final class space/kscience/kmath/operations/BigIntField : space/kscience/kmath/operations/Field, space/kscience/kmath/operations/NumbersAddOperations, space/kscience/kmath/operations/ScaleOperations {
+public final class space/kscience/kmath/operations/BigIntField : space/kscience/kmath/operations/Field, space/kscience/kmath/operations/NumbersAddOps, space/kscience/kmath/operations/ScaleOperations {
 	public static final field INSTANCE Lspace/kscience/kmath/operations/BigIntField;
 	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun add (Lspace/kscience/kmath/operations/BigInt;Lspace/kscience/kmath/operations/BigInt;)Lspace/kscience/kmath/operations/BigInt;
@@ -1085,9 +1327,12 @@ public final class space/kscience/kmath/operations/BigIntField : space/kscience/
 
 public final class space/kscience/kmath/operations/BigIntKt {
 	public static final fun abs (Lspace/kscience/kmath/operations/BigInt;)Lspace/kscience/kmath/operations/BigInt;
-	public static final fun bigInt (Lspace/kscience/kmath/nd/AlgebraND$Companion;[I)Lspace/kscience/kmath/nd/BufferedRingND;
 	public static final fun bigInt (Lspace/kscience/kmath/structures/Buffer$Companion;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun bigInt (Lspace/kscience/kmath/structures/MutableBuffer$Companion;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/MutableBuffer;
+	public static final fun buffer (Lspace/kscience/kmath/operations/BigInt$Companion;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun getAlgebra (Lspace/kscience/kmath/operations/BigInt;)Lspace/kscience/kmath/operations/BigIntField;
+	public static final fun getNd (Lspace/kscience/kmath/operations/BigIntField;)Lspace/kscience/kmath/nd/BufferedRingOpsND;
+	public static final fun mutableBuffer (Lspace/kscience/kmath/operations/BigInt;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun parseBigInteger (Ljava/lang/String;)Lspace/kscience/kmath/operations/BigInt;
 	public static final fun toBigInt (I)Lspace/kscience/kmath/operations/BigInt;
 	public static final fun toBigInt (J)Lspace/kscience/kmath/operations/BigInt;
@@ -1096,6 +1341,85 @@ public final class space/kscience/kmath/operations/BigIntKt {
 	public static final fun toBigInt-WZ4Q5Ns (I)Lspace/kscience/kmath/operations/BigInt;
 }
 
+public abstract interface class space/kscience/kmath/operations/BufferAlgebra : space/kscience/kmath/operations/Algebra {
+	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
+	public fun buffer (I[Ljava/lang/Object;)Lspace/kscience/kmath/structures/Buffer;
+	public abstract fun getBufferFactory ()Lkotlin/jvm/functions/Function2;
+	public abstract fun getElementAlgebra ()Lspace/kscience/kmath/operations/Algebra;
+	public fun map (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/structures/Buffer;
+	public fun mapIndexed (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/structures/Buffer;
+	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+	public fun zip (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/structures/Buffer;
+}
+
+public final class space/kscience/kmath/operations/BufferAlgebraKt {
+	public static final fun acos (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun acosh (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun asin (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun asinh (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun atan (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun atanh (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun buffer (Lspace/kscience/kmath/operations/BufferAlgebra;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun buffer (Lspace/kscience/kmath/operations/BufferAlgebra;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun buffer (Lspace/kscience/kmath/operations/BufferField;[Ljava/lang/Number;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun bufferAlgebra (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/operations/BufferFieldOps;
+	public static final fun cos (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun cosh (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun exp (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun getBufferAlgebra (Lspace/kscience/kmath/operations/DoubleField;)Lspace/kscience/kmath/operations/BufferFieldOps;
+	public static final fun getBufferAlgebra (Lspace/kscience/kmath/operations/ShortRing;)Lspace/kscience/kmath/operations/BufferRingOps;
+	public static final fun ln (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun pow (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Number;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun sin (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun sinh (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun tan (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun tanh (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun withSize (Lspace/kscience/kmath/operations/BufferFieldOps;I)Lspace/kscience/kmath/operations/BufferField;
+}
+
+public final class space/kscience/kmath/operations/BufferField : space/kscience/kmath/operations/BufferFieldOps, space/kscience/kmath/operations/Field, space/kscience/kmath/operations/WithSize {
+	public fun <init> (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function2;I)V
+	public synthetic fun getOne ()Ljava/lang/Object;
+	public fun getOne ()Lspace/kscience/kmath/structures/Buffer;
+	public fun getSize ()I
+	public synthetic fun getZero ()Ljava/lang/Object;
+	public fun getZero ()Lspace/kscience/kmath/structures/Buffer;
+}
+
+public class space/kscience/kmath/operations/BufferFieldOps : space/kscience/kmath/operations/BufferRingOps, space/kscience/kmath/operations/BufferAlgebra, space/kscience/kmath/operations/FieldOps, space/kscience/kmath/operations/ScaleOperations {
+	public fun <init> (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function2;)V
+	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
+	public synthetic fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun divide (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object;
+	public fun scale (Lspace/kscience/kmath/structures/Buffer;D)Lspace/kscience/kmath/structures/Buffer;
+	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun unaryMinus (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+}
+
+public final class space/kscience/kmath/operations/BufferOperationKt {
+	public static final fun asIterable (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Iterable;
+	public static final fun asSequence (Lspace/kscience/kmath/structures/Buffer;)Lkotlin/sequences/Sequence;
+	public static final fun fold (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+	public static final fun map (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun toList (Lspace/kscience/kmath/structures/Buffer;)Ljava/util/List;
+}
+
+public class space/kscience/kmath/operations/BufferRingOps : space/kscience/kmath/operations/BufferAlgebra, space/kscience/kmath/operations/RingOps {
+	public fun <init> (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;)V
+	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun add (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
+	public fun getBufferFactory ()Lkotlin/jvm/functions/Function2;
+	public synthetic fun getElementAlgebra ()Lspace/kscience/kmath/operations/Algebra;
+	public fun getElementAlgebra ()Lspace/kscience/kmath/operations/Ring;
+	public synthetic fun multiply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun multiply (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun unaryMinus (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+}
+
 public final class space/kscience/kmath/operations/ByteRing : space/kscience/kmath/operations/Norm, space/kscience/kmath/operations/NumericAlgebra, space/kscience/kmath/operations/Ring {
 	public static final field INSTANCE Lspace/kscience/kmath/operations/ByteRing;
 	public fun add (BB)Ljava/lang/Byte;
@@ -1120,6 +1444,90 @@ public final class space/kscience/kmath/operations/ByteRing : space/kscience/kma
 	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
 }
 
+public final class space/kscience/kmath/operations/DoubleBufferField : space/kscience/kmath/operations/DoubleBufferOps, space/kscience/kmath/operations/ExtendedField {
+	public fun <init> (I)V
+	public synthetic fun acosh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun acosh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun asinh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun asinh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun atanh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun atanh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun cosh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun cosh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun getOne ()Ljava/lang/Object;
+	public fun getOne ()Lspace/kscience/kmath/structures/Buffer;
+	public final fun getSize ()I
+	public synthetic fun getZero ()Ljava/lang/Object;
+	public fun getZero ()Lspace/kscience/kmath/structures/Buffer;
+	public synthetic fun power (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
+	public fun power-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Number;)[D
+	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun sinh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun tanh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun tanh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+}
+
+public abstract class space/kscience/kmath/operations/DoubleBufferOps : space/kscience/kmath/operations/BufferAlgebra, space/kscience/kmath/operations/ExtendedFieldOps, space/kscience/kmath/operations/Norm {
+	public static final field Companion Lspace/kscience/kmath/operations/DoubleBufferOps$Companion;
+	public fun <init> ()V
+	public synthetic fun acos (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun acos-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun acosh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun acosh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun add-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun asin (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun asin-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun asinh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun asinh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun atan (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun atan-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun atanh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun atanh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
+	public synthetic fun cos (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun cos-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun cosh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun cosh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun divide-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun exp (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun exp-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public fun getBufferFactory ()Lkotlin/jvm/functions/Function2;
+	public synthetic fun getElementAlgebra ()Lspace/kscience/kmath/operations/Algebra;
+	public fun getElementAlgebra ()Lspace/kscience/kmath/operations/DoubleField;
+	public synthetic fun ln (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun ln-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun map (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/structures/Buffer;
+	public fun map-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;)[D
+	public synthetic fun minus (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun minus-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun multiply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun multiply-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun norm (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun norm (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Double;
+	public synthetic fun plus (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun plus-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object;
+	public fun scale-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;D)[D
+	public synthetic fun sin (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun sin-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun sinh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun tan (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun tan-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun tanh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun tanh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun unaryMinus-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+}
+
+public final class space/kscience/kmath/operations/DoubleBufferOps$Companion : space/kscience/kmath/operations/DoubleBufferOps {
+	public final fun mapInline-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function1;)[D
+}
+
 public final class space/kscience/kmath/operations/DoubleField : space/kscience/kmath/operations/ExtendedField, space/kscience/kmath/operations/Norm, space/kscience/kmath/operations/ScaleOperations {
 	public static final field INSTANCE Lspace/kscience/kmath/operations/DoubleField;
 	public fun acos (D)Ljava/lang/Double;
@@ -1171,6 +1579,8 @@ public final class space/kscience/kmath/operations/DoubleField : space/kscience/
 	public synthetic fun sin (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun sinh (D)Ljava/lang/Double;
 	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun sqrt (D)Ljava/lang/Double;
+	public synthetic fun sqrt (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun tan (D)Ljava/lang/Double;
 	public synthetic fun tan (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun tanh (D)Ljava/lang/Double;
@@ -1181,6 +1591,12 @@ public final class space/kscience/kmath/operations/DoubleField : space/kscience/
 	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
 }
 
+public final class space/kscience/kmath/operations/DoubleL2Norm : space/kscience/kmath/operations/Norm {
+	public static final field INSTANCE Lspace/kscience/kmath/operations/DoubleL2Norm;
+	public synthetic fun norm (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun norm (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Double;
+}
+
 public abstract interface class space/kscience/kmath/operations/ExponentialOperations : space/kscience/kmath/operations/Algebra {
 	public static final field ACOSH_OPERATION Ljava/lang/String;
 	public static final field ASINH_OPERATION Ljava/lang/String;
@@ -1212,7 +1628,7 @@ public final class space/kscience/kmath/operations/ExponentialOperations$Compani
 	public static final field TANH_OPERATION Ljava/lang/String;
 }
 
-public abstract interface class space/kscience/kmath/operations/ExtendedField : space/kscience/kmath/operations/ExtendedFieldOperations, space/kscience/kmath/operations/Field, space/kscience/kmath/operations/NumericAlgebra, space/kscience/kmath/operations/ScaleOperations {
+public abstract interface class space/kscience/kmath/operations/ExtendedField : space/kscience/kmath/operations/ExtendedFieldOps, space/kscience/kmath/operations/Field, space/kscience/kmath/operations/NumericAlgebra, space/kscience/kmath/operations/PowerOperations {
 	public fun acosh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun asinh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun atanh (Ljava/lang/Object;)Ljava/lang/Object;
@@ -1220,27 +1636,33 @@ public abstract interface class space/kscience/kmath/operations/ExtendedField :
 	public fun rightSideNumberOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
 	public fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun tanh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
 }
 
-public abstract interface class space/kscience/kmath/operations/ExtendedFieldOperations : space/kscience/kmath/operations/ExponentialOperations, space/kscience/kmath/operations/FieldOperations, space/kscience/kmath/operations/PowerOperations, space/kscience/kmath/operations/TrigonometricOperations {
+public abstract interface class space/kscience/kmath/operations/ExtendedFieldOps : space/kscience/kmath/operations/ExponentialOperations, space/kscience/kmath/operations/FieldOps, space/kscience/kmath/operations/ScaleOperations, space/kscience/kmath/operations/TrigonometricOperations {
 	public fun tan (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun tanh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
 }
 
-public abstract interface class space/kscience/kmath/operations/Field : space/kscience/kmath/operations/FieldOperations, space/kscience/kmath/operations/NumericAlgebra, space/kscience/kmath/operations/Ring, space/kscience/kmath/operations/ScaleOperations {
+public abstract interface class space/kscience/kmath/operations/Field : space/kscience/kmath/operations/FieldOps, space/kscience/kmath/operations/NumericAlgebra, space/kscience/kmath/operations/Ring, space/kscience/kmath/operations/ScaleOperations {
+	public static final field Companion Lspace/kscience/kmath/operations/Field$Companion;
 	public fun number (Ljava/lang/Number;)Ljava/lang/Object;
+	public fun power (Ljava/lang/Object;I)Ljava/lang/Object;
 }
 
-public abstract interface class space/kscience/kmath/operations/FieldOperations : space/kscience/kmath/operations/RingOperations {
-	public static final field Companion Lspace/kscience/kmath/operations/FieldOperations$Companion;
+public final class space/kscience/kmath/operations/Field$Companion {
+}
+
+public abstract interface class space/kscience/kmath/operations/FieldOps : space/kscience/kmath/operations/RingOps {
+	public static final field Companion Lspace/kscience/kmath/operations/FieldOps$Companion;
 	public static final field DIV_OPERATION Ljava/lang/String;
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
 	public fun div (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public abstract fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 }
 
-public final class space/kscience/kmath/operations/FieldOperations$Companion {
+public final class space/kscience/kmath/operations/FieldOps$Companion {
 	public static final field DIV_OPERATION Ljava/lang/String;
 }
 
@@ -1295,6 +1717,8 @@ public final class space/kscience/kmath/operations/FloatField : space/kscience/k
 	public synthetic fun sin (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun sinh (F)Ljava/lang/Float;
 	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun sqrt (F)Ljava/lang/Float;
+	public synthetic fun sqrt (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun tan (F)Ljava/lang/Float;
 	public synthetic fun tan (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun tanh (F)Ljava/lang/Float;
@@ -1305,12 +1729,12 @@ public final class space/kscience/kmath/operations/FloatField : space/kscience/k
 	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
 }
 
-public abstract interface class space/kscience/kmath/operations/Group : space/kscience/kmath/operations/GroupOperations {
+public abstract interface class space/kscience/kmath/operations/Group : space/kscience/kmath/operations/GroupOps {
 	public abstract fun getZero ()Ljava/lang/Object;
 }
 
-public abstract interface class space/kscience/kmath/operations/GroupOperations : space/kscience/kmath/operations/Algebra {
-	public static final field Companion Lspace/kscience/kmath/operations/GroupOperations$Companion;
+public abstract interface class space/kscience/kmath/operations/GroupOps : space/kscience/kmath/operations/Algebra {
+	public static final field Companion Lspace/kscience/kmath/operations/GroupOps$Companion;
 	public static final field MINUS_OPERATION Ljava/lang/String;
 	public static final field PLUS_OPERATION Ljava/lang/String;
 	public abstract fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -1322,7 +1746,7 @@ public abstract interface class space/kscience/kmath/operations/GroupOperations
 	public fun unaryPlus (Ljava/lang/Object;)Ljava/lang/Object;
 }
 
-public final class space/kscience/kmath/operations/GroupOperations$Companion {
+public final class space/kscience/kmath/operations/GroupOps$Companion {
 	public static final field MINUS_OPERATION Ljava/lang/String;
 	public static final field PLUS_OPERATION Ljava/lang/String;
 }
@@ -1351,6 +1775,10 @@ public final class space/kscience/kmath/operations/IntRing : space/kscience/kmat
 	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
 }
 
+public final class space/kscience/kmath/operations/IsIntegerKt {
+	public static final fun isInteger (Ljava/lang/Number;)Z
+}
+
 public final class space/kscience/kmath/operations/JBigDecimalField : space/kscience/kmath/operations/JBigDecimalFieldBase {
 	public static final field Companion Lspace/kscience/kmath/operations/JBigDecimalField$Companion;
 	public fun <init> ()V
@@ -1441,6 +1869,15 @@ public abstract interface class space/kscience/kmath/operations/Norm {
 	public abstract fun norm (Ljava/lang/Object;)Ljava/lang/Object;
 }
 
+public final class space/kscience/kmath/operations/NumbersKt {
+	public static final fun getAlgebra (Lkotlin/jvm/internal/ByteCompanionObject;)Lspace/kscience/kmath/operations/ByteRing;
+	public static final fun getAlgebra (Lkotlin/jvm/internal/DoubleCompanionObject;)Lspace/kscience/kmath/operations/DoubleField;
+	public static final fun getAlgebra (Lkotlin/jvm/internal/FloatCompanionObject;)Lspace/kscience/kmath/operations/FloatField;
+	public static final fun getAlgebra (Lkotlin/jvm/internal/IntCompanionObject;)Lspace/kscience/kmath/operations/IntRing;
+	public static final fun getAlgebra (Lkotlin/jvm/internal/LongCompanionObject;)Lspace/kscience/kmath/operations/LongRing;
+	public static final fun getAlgebra (Lkotlin/jvm/internal/ShortCompanionObject;)Lspace/kscience/kmath/operations/ShortRing;
+}
+
 public abstract interface class space/kscience/kmath/operations/NumericAlgebra : space/kscience/kmath/operations/Algebra {
 	public fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
 	public fun leftSideNumberOperation (Ljava/lang/String;Ljava/lang/Number;Ljava/lang/Object;)Ljava/lang/Object;
@@ -1455,10 +1892,7 @@ public final class space/kscience/kmath/operations/NumericAlgebraKt {
 	public static final fun getPi (Lspace/kscience/kmath/operations/NumericAlgebra;)Ljava/lang/Object;
 }
 
-public final class space/kscience/kmath/operations/OptionalOperationsKt {
-}
-
-public abstract interface class space/kscience/kmath/operations/PowerOperations : space/kscience/kmath/operations/Algebra {
+public abstract interface class space/kscience/kmath/operations/PowerOperations : space/kscience/kmath/operations/FieldOps {
 	public static final field Companion Lspace/kscience/kmath/operations/PowerOperations$Companion;
 	public static final field POW_OPERATION Ljava/lang/String;
 	public static final field SQRT_OPERATION Ljava/lang/String;
@@ -1472,19 +1906,24 @@ public final class space/kscience/kmath/operations/PowerOperations$Companion {
 	public static final field SQRT_OPERATION Ljava/lang/String;
 }
 
-public abstract interface class space/kscience/kmath/operations/Ring : space/kscience/kmath/operations/Group, space/kscience/kmath/operations/RingOperations {
+public abstract interface class space/kscience/kmath/operations/Ring : space/kscience/kmath/operations/Group, space/kscience/kmath/operations/RingOps {
+	public static final field Companion Lspace/kscience/kmath/operations/Ring$Companion;
 	public abstract fun getOne ()Ljava/lang/Object;
+	public fun power-Qn1smSk (Ljava/lang/Object;I)Ljava/lang/Object;
 }
 
-public abstract interface class space/kscience/kmath/operations/RingOperations : space/kscience/kmath/operations/GroupOperations {
-	public static final field Companion Lspace/kscience/kmath/operations/RingOperations$Companion;
+public final class space/kscience/kmath/operations/Ring$Companion {
+}
+
+public abstract interface class space/kscience/kmath/operations/RingOps : space/kscience/kmath/operations/GroupOps {
+	public static final field Companion Lspace/kscience/kmath/operations/RingOps$Companion;
 	public static final field TIMES_OPERATION Ljava/lang/String;
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
 	public abstract fun multiply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun times (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 }
 
-public final class space/kscience/kmath/operations/RingOperations$Companion {
+public final class space/kscience/kmath/operations/RingOps$Companion {
 	public static final field TIMES_OPERATION Ljava/lang/String;
 }
 
@@ -1544,6 +1983,10 @@ public final class space/kscience/kmath/operations/TrigonometricOperations$Compa
 	public static final field TAN_OPERATION Ljava/lang/String;
 }
 
+public abstract interface class space/kscience/kmath/operations/WithSize {
+	public abstract fun getSize ()I
+}
+
 public final class space/kscience/kmath/structures/ArrayBuffer : space/kscience/kmath/structures/MutableBuffer {
 	public fun <init> ([Ljava/lang/Object;)V
 	public fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
@@ -1551,6 +1994,11 @@ public final class space/kscience/kmath/structures/ArrayBuffer : space/kscience/
 	public fun getSize ()I
 	public fun iterator ()Ljava/util/Iterator;
 	public fun set (ILjava/lang/Object;)V
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class space/kscience/kmath/structures/ArrayBufferKt {
+	public static final fun asBuffer ([Ljava/lang/Object;)Lspace/kscience/kmath/structures/ArrayBuffer;
 }
 
 public abstract interface class space/kscience/kmath/structures/Buffer {
@@ -1558,31 +2006,25 @@ public abstract interface class space/kscience/kmath/structures/Buffer {
 	public abstract fun get (I)Ljava/lang/Object;
 	public abstract fun getSize ()I
 	public abstract fun iterator ()Ljava/util/Iterator;
+	public abstract fun toString ()Ljava/lang/String;
 }
 
 public final class space/kscience/kmath/structures/Buffer$Companion {
 	public final fun auto (Lkotlin/reflect/KClass;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
 	public final fun boxing (ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
 	public final fun contentEquals (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)Z
+	public final fun toString (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/String;
 }
 
 public final class space/kscience/kmath/structures/BufferKt {
-	public static final fun asBuffer (Ljava/util/List;)Lspace/kscience/kmath/structures/ListBuffer;
-	public static final fun asBuffer ([Ljava/lang/Object;)Lspace/kscience/kmath/structures/ArrayBuffer;
-	public static final fun asMutableBuffer (Ljava/util/List;)Ljava/util/List;
 	public static final fun asReadOnly (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun first (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Object;
 	public static final fun getIndices (Lspace/kscience/kmath/structures/Buffer;)Lkotlin/ranges/IntRange;
-}
-
-public final class space/kscience/kmath/structures/BufferOperationKt {
-	public static final fun asIterable (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Iterable;
-	public static final fun asSequence (Lspace/kscience/kmath/structures/Buffer;)Lkotlin/sequences/Sequence;
-	public static final fun fold (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-	public static final fun map (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
-	public static final fun toList (Lspace/kscience/kmath/structures/Buffer;)Ljava/util/List;
+	public static final fun last (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Object;
 }
 
 public final class space/kscience/kmath/structures/DoubleBuffer : space/kscience/kmath/structures/MutableBuffer {
+	public static final field Companion Lspace/kscience/kmath/structures/DoubleBuffer$Companion;
 	public static final synthetic fun box-impl ([D)Lspace/kscience/kmath/structures/DoubleBuffer;
 	public static fun constructor-impl ([D)[D
 	public synthetic fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
@@ -1610,97 +2052,8 @@ public final class space/kscience/kmath/structures/DoubleBuffer : space/kscience
 	public final synthetic fun unbox-impl ()[D
 }
 
-public final class space/kscience/kmath/structures/DoubleBufferField : space/kscience/kmath/operations/ExtendedField {
-	public fun <init> (I)V
-	public synthetic fun acos (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun acos-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun acosh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun acosh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun add-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun asin (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun asin-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun asinh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun asinh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun atan (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun atan-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun atanh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun atanh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun cos (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun cos-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun cosh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun cosh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun divide-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun exp (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun exp-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun getOne ()Ljava/lang/Object;
-	public fun getOne ()Lspace/kscience/kmath/structures/Buffer;
-	public final fun getSize ()I
-	public synthetic fun getZero ()Ljava/lang/Object;
-	public fun getZero ()Lspace/kscience/kmath/structures/Buffer;
-	public synthetic fun ln (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun ln-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun multiply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun multiply-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
-	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/structures/Buffer;
-	public synthetic fun power (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
-	public fun power-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Number;)[D
-	public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object;
-	public fun scale-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;D)[D
-	public synthetic fun sin (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun sin-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun sinh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun tan (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun tan-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun tanh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun tanh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun unaryMinus (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
-}
-
-public final class space/kscience/kmath/structures/DoubleBufferFieldOperations : space/kscience/kmath/operations/ExtendedFieldOperations {
-	public static final field INSTANCE Lspace/kscience/kmath/structures/DoubleBufferFieldOperations;
-	public synthetic fun acos (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun acos-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun acosh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun acosh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun add-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun asin (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun asin-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun asinh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun asinh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun atan (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun atan-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun atanh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun atanh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun cos (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun cos-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun cosh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun cosh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun divide-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun exp (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun exp-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun ln (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun ln-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun multiply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun multiply-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun power (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
-	public fun power-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Number;)[D
-	public synthetic fun sin (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun sin-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun sinh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun tan (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun tan-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun tanh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun tanh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun unaryMinus-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
+public final class space/kscience/kmath/structures/DoubleBuffer$Companion {
+	public final fun zero-Udx-57Q (I)[D
 }
 
 public final class space/kscience/kmath/structures/DoubleBufferKt {
@@ -1731,6 +2084,7 @@ public final class space/kscience/kmath/structures/FlaggedDoubleBuffer : space/k
 	public fun getSize ()I
 	public final fun getValues ()[D
 	public fun iterator ()Ljava/util/Iterator;
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class space/kscience/kmath/structures/FloatBuffer : space/kscience/kmath/structures/MutableBuffer {
@@ -1808,6 +2162,12 @@ public final class space/kscience/kmath/structures/ListBuffer : space/kscience/k
 	public final fun getList ()Ljava/util/List;
 	public fun getSize ()I
 	public fun iterator ()Ljava/util/Iterator;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class space/kscience/kmath/structures/ListBufferKt {
+	public static final fun asBuffer (Ljava/util/List;)Lspace/kscience/kmath/structures/ListBuffer;
+	public static final fun asMutableBuffer (Ljava/util/List;)Ljava/util/List;
 }
 
 public final class space/kscience/kmath/structures/LongBuffer : space/kscience/kmath/structures/MutableBuffer {
@@ -1852,6 +2212,7 @@ public class space/kscience/kmath/structures/MemoryBuffer : space/kscience/kmath
 	public fun getSize ()I
 	protected final fun getSpec ()Lspace/kscience/kmath/memory/MemorySpec;
 	public fun iterator ()Ljava/util/Iterator;
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class space/kscience/kmath/structures/MemoryBuffer$Companion {
@@ -1981,5 +2342,6 @@ public final class space/kscience/kmath/structures/VirtualBuffer : space/kscienc
 	public fun get (I)Ljava/lang/Object;
 	public fun getSize ()I
 	public fun iterator ()Ljava/util/Iterator;
+	public fun toString ()Ljava/lang/String;
 }
 
diff --git a/kmath-coroutines/README.md b/kmath-coroutines/README.md
index 0d83a6c60..d0fef6e0f 100644
--- a/kmath-coroutines/README.md
+++ b/kmath-coroutines/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-coroutines:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-coroutines:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-coroutines:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-coroutines:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-coroutines:0.3.0-dev-20")
+    implementation("space.kscience:kmath-coroutines:0.3.0")
 }
 ```
diff --git a/kmath-dimensions/README.md b/kmath-dimensions/README.md
index 52097cf40..650bcafde 100644
--- a/kmath-dimensions/README.md
+++ b/kmath-dimensions/README.md
@@ -6,7 +6,7 @@ A proof of concept module for adding type-safe dimensions to structures
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-dimensions:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-dimensions:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-dimensions:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-dimensions:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-dimensions:0.3.0-dev-20")
+    implementation("space.kscience:kmath-dimensions:0.3.0")
 }
 ```
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index 3fe6d9e1a..eaa90120f 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -9,7 +9,7 @@ EJML based linear algebra implementation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ejml:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-ejml:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ejml:0.3.0-dev-20")
+    implementation("space.kscience:kmath-ejml:0.3.0")
 }
 ```
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index 197190dcd..9e8f95a16 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -9,7 +9,7 @@ Specialization of KMath APIs for Double numbers.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-for-real:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-for-real:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-for-real:0.3.0-dev-20")
+    implementation("space.kscience:kmath-for-real:0.3.0")
 }
 ```
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index 6379ad0b5..3f44bd3f9 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -11,7 +11,7 @@ Functions and interpolations.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-functions:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-functions:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-functions:0.3.0-dev-20")
+    implementation("space.kscience:kmath-functions:0.3.0")
 }
 ```
diff --git a/kmath-geometry/README.md b/kmath-geometry/README.md
index 6b8fb25a0..6602f5510 100644
--- a/kmath-geometry/README.md
+++ b/kmath-geometry/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-geometry:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-geometry:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-geometry:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-geometry:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-geometry:0.3.0-dev-20")
+    implementation("space.kscience:kmath-geometry:0.3.0")
 }
 ```
diff --git a/kmath-histograms/README.md b/kmath-histograms/README.md
index 0b8a632d6..27f1b43ec 100644
--- a/kmath-histograms/README.md
+++ b/kmath-histograms/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-histograms:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-histograms:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-histograms:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-histograms:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-histograms:0.3.0-dev-20")
+    implementation("space.kscience:kmath-histograms:0.3.0")
 }
 ```
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index a274b3d88..fe6afb835 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -7,7 +7,7 @@ Integration with [Jafama](https://github.com/jeffhain/jafama).
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-jafama:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-jafama:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-jafama:0.3.0-dev-20")
+    implementation("space.kscience:kmath-jafama:0.3.0")
 }
 ```
 
diff --git a/kmath-jupyter/README.md b/kmath-jupyter/README.md
index 8014b969d..db58ad840 100644
--- a/kmath-jupyter/README.md
+++ b/kmath-jupyter/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-jupyter:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-jupyter:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-jupyter:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-jupyter:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-jupyter:0.3.0-dev-20")
+    implementation("space.kscience:kmath-jupyter:0.3.0")
 }
 ```
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
index 08c913090..52e8b3116 100644
--- a/kmath-kotlingrad/README.md
+++ b/kmath-kotlingrad/README.md
@@ -8,7 +8,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-kotlingrad:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-kotlingrad:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-kotlingrad:0.3.0-dev-20")
+    implementation("space.kscience:kmath-kotlingrad:0.3.0")
 }
 ```
diff --git a/kmath-memory/README.md b/kmath-memory/README.md
index d37087a66..9f4520bd8 100644
--- a/kmath-memory/README.md
+++ b/kmath-memory/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-memory:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-memory:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-memory:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-memory:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-memory:0.3.0-dev-20")
+    implementation("space.kscience:kmath-memory:0.3.0")
 }
 ```
diff --git a/kmath-multik/README.md b/kmath-multik/README.md
index 167445f52..edfce6f79 100644
--- a/kmath-multik/README.md
+++ b/kmath-multik/README.md
@@ -6,7 +6,7 @@ JetBrains Multik connector
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-multik:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-multik:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-multik:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-multik:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-multik:0.3.0-dev-20")
+    implementation("space.kscience:kmath-multik:0.3.0")
 }
 ```
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index 225de18e9..0bcae138e 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -9,7 +9,7 @@ ND4J based implementations of KMath abstractions.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-nd4j:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-nd4j:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-nd4j:0.3.0-dev-20")
+    implementation("space.kscience:kmath-nd4j:0.3.0")
 }
 ```
 
diff --git a/kmath-optimization/README.md b/kmath-optimization/README.md
index 137975c90..63e0f43e3 100644
--- a/kmath-optimization/README.md
+++ b/kmath-optimization/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-optimization:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-optimization:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-optimization:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-optimization:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-optimization:0.3.0-dev-20")
+    implementation("space.kscience:kmath-optimization:0.3.0")
 }
 ```
diff --git a/kmath-stat/README.md b/kmath-stat/README.md
index 762e61237..80c6e0fcd 100644
--- a/kmath-stat/README.md
+++ b/kmath-stat/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-stat:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-stat:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-stat:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-stat:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-stat:0.3.0-dev-20")
+    implementation("space.kscience:kmath-stat:0.3.0")
 }
 ```
diff --git a/kmath-symja/README.md b/kmath-symja/README.md
index e3c717cff..ea2d5d68f 100644
--- a/kmath-symja/README.md
+++ b/kmath-symja/README.md
@@ -6,7 +6,7 @@ Symja integration module
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-symja:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-symja:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-symja:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-symja:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-symja:0.3.0-dev-20")
+    implementation("space.kscience:kmath-symja:0.3.0")
 }
 ```
diff --git a/kmath-tensorflow/README.md b/kmath-tensorflow/README.md
index f1dfa0202..7852c07be 100644
--- a/kmath-tensorflow/README.md
+++ b/kmath-tensorflow/README.md
@@ -6,7 +6,7 @@ Google tensorflow connector
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensorflow:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-tensorflow:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensorflow:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-tensorflow:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensorflow:0.3.0-dev-20")
+    implementation("space.kscience:kmath-tensorflow:0.3.0")
 }
 ```
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index 3d7dfd1fb..44ee47675 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -9,7 +9,7 @@ Common linear algebra operations on tensors.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensors:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-tensors:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensors:0.3.0-dev-20")
+    implementation("space.kscience:kmath-tensors:0.3.0")
 }
 ```
diff --git a/kmath-viktor/README.md b/kmath-viktor/README.md
index 229d4dcd4..5d7c2dea1 100644
--- a/kmath-viktor/README.md
+++ b/kmath-viktor/README.md
@@ -6,7 +6,7 @@ Binding for https://github.com/JetBrains-Research/viktor
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-viktor:0.3.0-dev-20`.
+The Maven coordinates of this project are `space.kscience:kmath-viktor:0.3.0`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-viktor:0.3.0-dev-20'
+    implementation 'space.kscience:kmath-viktor:0.3.0'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-viktor:0.3.0-dev-20")
+    implementation("space.kscience:kmath-viktor:0.3.0")
 }
 ```
diff --git a/kmath-viktor/api/kmath-viktor.api b/kmath-viktor/api/kmath-viktor.api
index 59882627b..3bb7c3b21 100644
--- a/kmath-viktor/api/kmath-viktor.api
+++ b/kmath-viktor/api/kmath-viktor.api
@@ -1,40 +1,69 @@
 public final class space/kscience/kmath/viktor/ViktorBuffer : space/kscience/kmath/structures/MutableBuffer {
-	public fun <init> (Lorg/jetbrains/bio/viktor/F64FlatArray;)V
+	public static final synthetic fun box-impl (Lorg/jetbrains/bio/viktor/F64FlatArray;)Lspace/kscience/kmath/viktor/ViktorBuffer;
+	public static fun constructor-impl (Lorg/jetbrains/bio/viktor/F64FlatArray;)Lorg/jetbrains/bio/viktor/F64FlatArray;
 	public fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
+	public static fun copy-impl (Lorg/jetbrains/bio/viktor/F64FlatArray;)Lspace/kscience/kmath/structures/MutableBuffer;
+	public fun equals (Ljava/lang/Object;)Z
+	public static fun equals-impl (Lorg/jetbrains/bio/viktor/F64FlatArray;Ljava/lang/Object;)Z
+	public static final fun equals-impl0 (Lorg/jetbrains/bio/viktor/F64FlatArray;Lorg/jetbrains/bio/viktor/F64FlatArray;)Z
 	public fun get (I)Ljava/lang/Double;
 	public synthetic fun get (I)Ljava/lang/Object;
+	public static fun get-impl (Lorg/jetbrains/bio/viktor/F64FlatArray;I)Ljava/lang/Double;
 	public final fun getFlatArray ()Lorg/jetbrains/bio/viktor/F64FlatArray;
 	public fun getSize ()I
+	public static fun getSize-impl (Lorg/jetbrains/bio/viktor/F64FlatArray;)I
+	public fun hashCode ()I
+	public static fun hashCode-impl (Lorg/jetbrains/bio/viktor/F64FlatArray;)I
 	public fun iterator ()Ljava/util/Iterator;
+	public static fun iterator-impl (Lorg/jetbrains/bio/viktor/F64FlatArray;)Ljava/util/Iterator;
 	public fun set (ID)V
 	public synthetic fun set (ILjava/lang/Object;)V
+	public static fun set-impl (Lorg/jetbrains/bio/viktor/F64FlatArray;ID)V
+	public fun toString ()Ljava/lang/String;
+	public static fun toString-impl (Lorg/jetbrains/bio/viktor/F64FlatArray;)Ljava/lang/String;
+	public final synthetic fun unbox-impl ()Lorg/jetbrains/bio/viktor/F64FlatArray;
 }
 
-public final class space/kscience/kmath/viktor/ViktorFieldND : space/kscience/kmath/nd/FieldND, space/kscience/kmath/operations/ExtendedField, space/kscience/kmath/operations/NumbersAddOperations, space/kscience/kmath/operations/ScaleOperations {
+public class space/kscience/kmath/viktor/ViktorFieldND : space/kscience/kmath/viktor/ViktorFieldOpsND, space/kscience/kmath/nd/FieldND, space/kscience/kmath/operations/NumbersAddOps {
 	public fun <init> ([I)V
+	public synthetic fun getOne ()Ljava/lang/Object;
+	public synthetic fun getOne ()Lspace/kscience/kmath/nd/StructureND;
+	public fun getOne ()Lspace/kscience/kmath/viktor/ViktorStructureND;
+	public fun getShape ()[I
+	public synthetic fun getZero ()Ljava/lang/Object;
+	public synthetic fun getZero ()Lspace/kscience/kmath/nd/StructureND;
+	public fun getZero ()Lspace/kscience/kmath/viktor/ViktorStructureND;
+	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
+	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/viktor/ViktorStructureND;
+}
+
+public class space/kscience/kmath/viktor/ViktorFieldOpsND : space/kscience/kmath/nd/FieldOpsND, space/kscience/kmath/operations/ExtendedFieldOps, space/kscience/kmath/operations/PowerOperations {
+	public static final field Companion Lspace/kscience/kmath/viktor/ViktorFieldOpsND$Companion;
+	public fun <init> ()V
 	public synthetic fun acos (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun acos (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
+	public synthetic fun acosh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun acosh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public synthetic fun add (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
 	public fun add (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun asin (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun asin (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
+	public synthetic fun asinh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun asinh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun atan (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun atan (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
-	public synthetic fun combine (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
-	public fun combine (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/viktor/ViktorStructureND;
+	public synthetic fun atanh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun atanh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun cos (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun cos (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
+	public synthetic fun cosh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun cosh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun exp (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun exp (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
-	public synthetic fun getElementContext ()Lspace/kscience/kmath/operations/Algebra;
-	public fun getElementContext ()Lspace/kscience/kmath/operations/DoubleField;
+	public synthetic fun getElementAlgebra ()Lspace/kscience/kmath/operations/Algebra;
+	public fun getElementAlgebra ()Lspace/kscience/kmath/operations/DoubleField;
 	public final fun getF64Buffer (Lspace/kscience/kmath/nd/StructureND;)Lorg/jetbrains/bio/viktor/F64Array;
-	public synthetic fun getOne ()Ljava/lang/Object;
-	public fun getOne ()Lspace/kscience/kmath/viktor/ViktorStructureND;
-	public fun getShape ()[I
-	public synthetic fun getZero ()Ljava/lang/Object;
-	public fun getZero ()Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun ln (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun ln (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun map (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
@@ -43,26 +72,38 @@ public final class space/kscience/kmath/viktor/ViktorFieldND : space/kscience/km
 	public fun mapIndexed (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun minus (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun minus (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
-	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
-	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun plus (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun plus (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun plus (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/StructureND;
 	public fun plus (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun power (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
 	public fun power (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Number;)Lspace/kscience/kmath/viktor/ViktorStructureND;
-	public synthetic fun produce (Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
-	public fun produce (Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object;
+	public synthetic fun scale (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/nd/StructureND;
 	public fun scale (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun sin (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun sin (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
+	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun sinh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
+	public synthetic fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+	public fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun tan (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun tan (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun times (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
 	public fun times (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Number;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun unaryMinus (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
+	public synthetic fun zip (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
+	public fun zip (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/viktor/ViktorStructureND;
+}
+
+public final class space/kscience/kmath/viktor/ViktorFieldOpsND$Companion : space/kscience/kmath/viktor/ViktorFieldOpsND {
+}
+
+public final class space/kscience/kmath/viktor/ViktorFieldOpsNDKt {
+	public static final fun ViktorFieldND ([I)Lspace/kscience/kmath/viktor/ViktorFieldND;
+	public static final fun getViktorAlgebra (Lspace/kscience/kmath/operations/DoubleField;)Lspace/kscience/kmath/viktor/ViktorFieldOpsND;
+	public static final fun viktorAlgebra (Lspace/kscience/kmath/operations/DoubleField;[I)Lspace/kscience/kmath/viktor/ViktorFieldND;
 }
 
 public final class space/kscience/kmath/viktor/ViktorStructureND : space/kscience/kmath/nd/MutableStructureND {
@@ -77,7 +118,6 @@ public final class space/kscience/kmath/viktor/ViktorStructureND : space/kscienc
 }
 
 public final class space/kscience/kmath/viktor/ViktorStructureNDKt {
-	public static final fun ViktorNDField ([I)Lspace/kscience/kmath/viktor/ViktorFieldND;
 	public static final fun asStructure (Lorg/jetbrains/bio/viktor/F64Array;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 }
 
-- 
2.34.1


From d862a0a8960703f25a4fbd050ea5890fa3c9b150 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 11 Apr 2022 20:08:13 +0300
Subject: [PATCH 501/713] 0.3.0 release

---
 kmath-jupyter/api/kmath-jupyter.api | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 kmath-jupyter/api/kmath-jupyter.api

diff --git a/kmath-jupyter/api/kmath-jupyter.api b/kmath-jupyter/api/kmath-jupyter.api
new file mode 100644
index 000000000..e625e22f7
--- /dev/null
+++ b/kmath-jupyter/api/kmath-jupyter.api
@@ -0,0 +1,4 @@
+public final class space/kscience/kmath/jupyter/KMathJupyterKt {
+	public static final fun toMst (Ljava/lang/Number;)Lspace/kscience/kmath/expressions/MST$Numeric;
+}
+
-- 
2.34.1


From 358d750226881956b8c8ce4de3f08d24ae2dca4f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 12 Apr 2022 09:49:35 +0300
Subject: [PATCH 502/713] Add missing @CommanderTvis contributions to changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28240dc68..75833602c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,10 @@
 - Separate methods for UInt, Int and Number powers. NaN safety.
 - Tensorflow prototype
 - `ValueAndErrorField`
+- MST compilation to WASM: #286
+- Jafama integration: #176
+- `contentEquals` with tolerance: #364
+- Compilation to TeX for MST: #254
 
 
 ### Changed
-- 
2.34.1


From 19cd74013b1ab0f38332292d32f36e45101baee3 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Tue, 12 Apr 2022 11:06:18 +0300
Subject: [PATCH 503/713] Update pages.yml

---
 .github/workflows/pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 9b76fd16e..2308d00fc 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: gradle/gradle-build-action@v2.1.5
         with:
           arguments: dokkaHtmlMultiModule --no-parallel
-      - uses: JamesIves/github-pages-deploy-action@4.2.5
+      - uses: JamesIves/github-pages-deploy-action@4.3.0
         with:
           branch: gh-pages
           folder: build/dokka/htmlMultiModule
-- 
2.34.1


From b698f2d613cdf20cdfb03cb7185ca7c04318b786 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Tue, 12 Apr 2022 11:10:14 +0300
Subject: [PATCH 504/713] Update pages.yml

---
 .github/workflows/pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 2308d00fc..1ac0bbdfe 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: gradle/gradle-build-action@v2.1.5
         with:
           arguments: dokkaHtmlMultiModule --no-parallel
-      - uses: JamesIves/github-pages-deploy-action@4.3.0
+      - uses: JamesIves/github-pages-deploy-action@v4.3.0
         with:
           branch: gh-pages
           folder: build/dokka/htmlMultiModule
-- 
2.34.1


From 7e4ece8dbc6e49cb8f224a3793301047de20f83f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Tue, 12 Apr 2022 11:56:12 +0300
Subject: [PATCH 505/713] Update publish.yml

---
 .github/workflows/publish.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8e9b98dcb..794881b09 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -34,6 +34,7 @@ jobs:
           arguments: |
             releaseAll
             -Ppublishing.enabled=true
+            -Ppublishing.sonatype=false
             -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
             -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
       - name: Publish Mac Artifacts
@@ -45,5 +46,6 @@ jobs:
             releaseIosArm64
             releaseIosX64
             -Ppublishing.enabled=true
+            -Ppublishing.sonatype=false            
             -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
             -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
-- 
2.34.1


From 2144c6382cce2eae27c4cd55bab693cfeda7e54d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@users.noreply.github.com>
Date: Tue, 12 Apr 2022 12:02:11 +0300
Subject: [PATCH 506/713] Update pages.yml

---
 .github/workflows/pages.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 1ac0bbdfe..2abaf0b9f 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -1,8 +1,9 @@
 name: Dokka publication
 
 on:
-  push:
-    branches: [ master ]
+  workflow_dispatch:
+  release:
+    types: [ created ]
 
 jobs:
   build:
-- 
2.34.1


From 5a36c3e03c60ffe02b7e7ea5609843b6f3a4155d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 13 Apr 2022 11:20:11 +0300
Subject: [PATCH 507/713] Remove metaspace memory allocation key

---
 gradle.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 80108737e..4923364d8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,5 +9,4 @@ kotlin.native.ignoreDisabledTargets=true
 #kotlin.incremental.js.ir=true
 
 org.gradle.configureondemand=true
-org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
 org.gradle.parallel=true
-- 
2.34.1


From c28be8322697c72237544522d8a8c143f688979d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 8 Jun 2022 09:00:37 +0300
Subject: [PATCH 508/713] LazyStructire::deferred -> async

---
 CHANGELOG.md                                     |  2 ++
 build.gradle.kts                                 |  2 +-
 buildSrc/build.gradle.kts                        |  1 +
 buildSrc/gradle.properties                       |  2 +-
 .../kscience/kmath/nd/VirtualStructureND.kt      | 16 ++++++++++++++++
 .../kscience/kmath/structures/LazyStructureND.kt | 10 +++++-----
 6 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75833602c..c4b8c06cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 ### Added
 
 ### Changed
+- Kotlin 1.7
+- `LazyStructure` `deffered` -> `async` to comply with coroutines code style
 
 ### Deprecated
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 10f2385f5..9fa012fb2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.0"
+    version = "0.3.1"
 }
 
 subprojects {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index fa5142538..dcb39d448 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+    kotlin("jvm") version "1.7.0-RC"
     `kotlin-dsl`
     `version-catalog`
     alias(miptNpmLibs.plugins.kotlin.plugin.serialization)
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index a0b05e812..751caec36 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -4,4 +4,4 @@
 #
 
 kotlin.code.style=official
-toolsVersion=0.11.2-kotlin-1.6.10
+toolsVersion=0.11.5-kotlin-1.7.0-RC
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
new file mode 100644
index 000000000..799d14b3d
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.nd
+
+public open class VirtualStructureND<T>(
+    override val shape: Shape,
+    public val producer: (IntArray) -> T,
+) : StructureND<T> {
+    override fun get(index: IntArray): T {
+        require(check that index is in the shape boundaries)
+        return producer(index)
+    }
+}
\ No newline at end of file
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
index ac9eb773a..2b9265843 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
@@ -18,12 +18,12 @@ public class LazyStructureND<out T>(
 ) : StructureND<T> {
     private val cache: MutableMap<IntArray, Deferred<T>> = HashMap()
 
-    public fun deferred(index: IntArray): Deferred<T> = cache.getOrPut(index) {
+    public fun async(index: IntArray): Deferred<T> = cache.getOrPut(index) {
         scope.async(context = Dispatchers.Math) { function(index) }
     }
 
-    public suspend fun await(index: IntArray): T = deferred(index).await()
-    override operator fun get(index: IntArray): T = runBlocking { deferred(index).await() }
+    public suspend fun await(index: IntArray): T = async(index).await()
+    override operator fun get(index: IntArray): T = runBlocking { async(index).await() }
 
     @OptIn(PerformancePitfall::class)
     override fun elements(): Sequence<Pair<IntArray, T>> {
@@ -33,8 +33,8 @@ public class LazyStructureND<out T>(
     }
 }
 
-public fun <T> StructureND<T>.deferred(index: IntArray): Deferred<T> =
-    if (this is LazyStructureND<T>) deferred(index) else CompletableDeferred(get(index))
+public fun <T> StructureND<T>.async(index: IntArray): Deferred<T> =
+    if (this is LazyStructureND<T>) this@async.async(index) else CompletableDeferred(get(index))
 
 public suspend fun <T> StructureND<T>.await(index: IntArray): T =
     if (this is LazyStructureND<T>) await(index) else get(index)
-- 
2.34.1


From de9f3cc8df4ebb0c05ee81d6a77922174e8d532c Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 10 Jun 2022 23:37:50 +0300
Subject: [PATCH 509/713] Inlined LaTeX formula. Now GitHub supports MathJax!

---
 kmath-ast/README.md               | 5 +----
 kmath-ast/docs/README-TEMPLATE.md | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index 5d5630f46..cc5f5b764 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -199,10 +199,7 @@ public fun main() {
 
 Result LaTeX:
 
-<div style="background-color:white;">
-
-![](https://latex.codecogs.com/gif.latex?%5Coperatorname{exp}%5C,%5Cleft(%5Csqrt{x}%5Cright)-%5Cfrac{%5Cfrac{%5Coperatorname{arcsin}%5C,%5Cleft(2%5C,x%5Cright)}{2%5Ctimes10^{10}%2Bx^{3}}}{12}+x^{2/3})
-</div>
+$$\operatorname{exp}\\,\left(\sqrt{x}\right)-\frac{\frac{\operatorname{arcsin}\\,\left(2\,x\right)}{2\times10^{10}%2Bx^{3}}}{12}+x^{2/3}$$
 
 Result MathML (can be used with MathJax or other renderers):
 
diff --git a/kmath-ast/docs/README-TEMPLATE.md b/kmath-ast/docs/README-TEMPLATE.md
index e9e22f4d4..1f14deaba 100644
--- a/kmath-ast/docs/README-TEMPLATE.md
+++ b/kmath-ast/docs/README-TEMPLATE.md
@@ -170,10 +170,7 @@ public fun main() {
 
 Result LaTeX:
 
-<div style="background-color:white;">
-
-![](https://latex.codecogs.com/gif.latex?%5Coperatorname{exp}%5C,%5Cleft(%5Csqrt{x}%5Cright)-%5Cfrac{%5Cfrac{%5Coperatorname{arcsin}%5C,%5Cleft(2%5C,x%5Cright)}{2%5Ctimes10^{10}%2Bx^{3}}}{12}+x^{2/3})
-</div>
+$$\operatorname{exp}\\,\left(\sqrt{x}\right)-\frac{\frac{\operatorname{arcsin}\\,\left(2\,x\right)}{2\times10^{10}%2Bx^{3}}}{12}+x^{2/3}$$
 
 Result MathML (can be used with MathJax or other renderers):
 
-- 
2.34.1


From b92ef23f5d3ec2c2578abc6f8734a12cd837bbf9 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 11 Jun 2022 00:06:45 +0300
Subject: [PATCH 510/713] Some fixes

---
 kmath-ast/README.md               | 2 +-
 kmath-ast/docs/README-TEMPLATE.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index cc5f5b764..553c60bb3 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -199,7 +199,7 @@ public fun main() {
 
 Result LaTeX:
 
-$$\operatorname{exp}\\,\left(\sqrt{x}\right)-\frac{\frac{\operatorname{arcsin}\\,\left(2\,x\right)}{2\times10^{10}%2Bx^{3}}}{12}+x^{2/3}$$
+$$\operatorname{exp}\\,\left(\sqrt{x}\right)-\frac{\frac{\operatorname{arcsin}\\,\left(2\\,x\right)}{2\times10^{10}+x^{3}}}{12}+x^{2/3}$$
 
 Result MathML (can be used with MathJax or other renderers):
 
diff --git a/kmath-ast/docs/README-TEMPLATE.md b/kmath-ast/docs/README-TEMPLATE.md
index 1f14deaba..96bbfbf5a 100644
--- a/kmath-ast/docs/README-TEMPLATE.md
+++ b/kmath-ast/docs/README-TEMPLATE.md
@@ -170,7 +170,7 @@ public fun main() {
 
 Result LaTeX:
 
-$$\operatorname{exp}\\,\left(\sqrt{x}\right)-\frac{\frac{\operatorname{arcsin}\\,\left(2\,x\right)}{2\times10^{10}%2Bx^{3}}}{12}+x^{2/3}$$
+$$\operatorname{exp}\\,\left(\sqrt{x}\right)-\frac{\frac{\operatorname{arcsin}\\,\left(2\\,x\right)}{2\times10^{10}+x^{3}}}{12}+x^{2/3}$$
 
 Result MathML (can be used with MathJax or other renderers):
 
-- 
2.34.1


From 89cdbf4d71f188105f12bb9029dc3c0f40a87360 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 11 Jun 2022 15:58:25 +0300
Subject: [PATCH 511/713] Changed names of algebraic stub. Added FIXMEs about
 KT-31420. Changed JVM/JS names style.

---
 .../kscience/kmath/functions/Polynomial.kt    | 112 +++++-----
 .../kmath/functions/RationalFunction.kt       | 208 +++++++++---------
 .../kscience/kmath/functions/algebraicStub.kt |  48 ++--
 .../kmath/functions/labeledPolynomialUtil.kt  |  16 +-
 .../kmath/functions/numberedPolynomialUtil.kt |  16 +-
 .../kmath/functions/AlgebraicStubTest.kt      | 208 +++++++++---------
 6 files changed, 304 insertions(+), 304 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 96e860550..e201f1f6e 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -22,7 +22,7 @@ public interface Polynomial<C>
  * @param C the type of constants. Polynomials have them as coefficients in their terms.
  * @param P the type of polynomials.
  */
-@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
 public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     /**
      * Returns sum of the constant and the integer represented as constant (member of underlying ring).
@@ -76,38 +76,38 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
-    public operator fun P.plus(other: Int): P = addMultipliedBySquaring(this, one, other)
+    public operator fun P.plus(other: Int): P = addMultipliedByDoubling(this, one, other)
     /**
      * Returns difference between the polynomial and the integer represented as polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
-    public operator fun P.minus(other: Int): P = addMultipliedBySquaring(this, one, -other)
+    public operator fun P.minus(other: Int): P = addMultipliedByDoubling(this, one, -other)
     /**
      * Returns product of the polynomial and the integer represented as polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    public operator fun P.times(other: Int): P = multiplyBySquaring(this, other)
+    public operator fun P.times(other: Int): P = multiplyByDoubling(this, other)
 
     /**
      * Returns sum of the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
-    public operator fun Int.plus(other: P): P = addMultipliedBySquaring(other, one, this)
+    public operator fun Int.plus(other: P): P = addMultipliedByDoubling(other, one, this)
     /**
      * Returns difference between the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
-    public operator fun Int.minus(other: P): P = addMultipliedBySquaring(-other, one, this)
+    public operator fun Int.minus(other: P): P = addMultipliedByDoubling(-other, one, this)
     /**
      * Returns product of the integer represented as polynomial and the polynomial.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    public operator fun Int.times(other: P): P = multiplyBySquaring(other, this)
+    public operator fun Int.times(other: P): P = multiplyByDoubling(other, this)
 
     /**
      * Converts the integer [value] to polynomial.
@@ -121,38 +121,38 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     /**
      * Returns the same constant.
      */
-    @JvmName("constantUnaryPlus")
-    @JsName("constantUnaryPlus")
+    @JvmName("unaryPlusConstant")
+    @JsName("unaryPlusConstant")
     public operator fun C.unaryPlus(): C = this
     /**
      * Returns negation of the constant.
      */
-    @JvmName("constantUnaryMinus")
-    @JsName("constantUnaryMinus")
+    @JvmName("unaryMinusConstant")
+    @JsName("unaryMinusConstant")
     public operator fun C.unaryMinus(): C
     /**
      * Returns sum of the constants.
      */
-    @JvmName("constantPlus")
-    @JsName("constantPlus")
+    @JvmName("plusConstantConstant")
+    @JsName("plusConstantConstant")
     public operator fun C.plus(other: C): C
     /**
      * Returns difference of the constants.
      */
-    @JvmName("constantMinus")
-    @JsName("constantMinus")
+    @JvmName("minusConstantConstant")
+    @JsName("minusConstantConstant")
     public operator fun C.minus(other: C): C
     /**
      * Returns product of the constants.
      */
-    @JvmName("constantTimes")
-    @JsName("constantTimes")
+    @JvmName("timesConstantConstant")
+    @JsName("timesConstantConstant")
     public operator fun C.times(other: C): C
     /**
      * Raises [arg] to the integer power [exponent].
      */
-    @JvmName("constantPower")
-    @JsName("constantPower")
+    @JvmName("powerConstant")
+    @JsName("powerConstant")
     public fun power(arg: C, exponent: UInt) : C
 
     /**
@@ -222,7 +222,7 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     /**
      * Raises [arg] to the integer power [exponent].
      */
-    public override fun power(arg: P, exponent: UInt) : P = exponentiationBySquaring(arg, exponent)
+    public override fun power(arg: P, exponent: UInt) : P = exponentiateBySquaring(arg, exponent)
 
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
@@ -251,7 +251,7 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
  * @param P the type of polynomials.
  * @param A the type of algebraic structure (precisely, of ring) provided for constants.
  */
-@Suppress("INAPPLICABLE_JVM_NAME")
+@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : PolynomialSpace<C, P> {
 
     public val ring: A
@@ -261,63 +261,63 @@ public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : Poly
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
-    public override operator fun C.plus(other: Int): C = ring { addMultipliedBySquaring(this@plus, one, other) }
+    public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
     /**
      * Returns difference between the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
-    public override operator fun C.minus(other: Int): C = ring { addMultipliedBySquaring(this@minus, one, -other) }
+    public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
     /**
      * Returns product of the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    public override operator fun C.times(other: Int): C = ring { multiplyBySquaring(this@times, other) }
+    public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
 
     /**
      * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
-    public override operator fun Int.plus(other: C): C = ring { addMultipliedBySquaring(other, one, this@plus) }
+    public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
     /**
      * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
-    public override operator fun Int.minus(other: C): C = ring { addMultipliedBySquaring(-other, one, this@minus) }
+    public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
     /**
      * Returns product of the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    public override operator fun Int.times(other: C): C = ring { multiplyBySquaring(other, this@times) }
+    public override operator fun Int.times(other: C): C = ring { multiplyByDoubling(other, this@times) }
 
     /**
      * Returns negation of the constant.
      */
-    @JvmName("constantUnaryMinus")
+    @JvmName("unaryMinusConstant")
     public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
     /**
      * Returns sum of the constants.
      */
-    @JvmName("constantPlus")
+    @JvmName("plusConstantConstant")
     public override operator fun C.plus(other: C): C = ring { this@plus + other }
     /**
      * Returns difference of the constants.
      */
-    @JvmName("constantMinus")
+    @JvmName("minusConstantConstant")
     public override operator fun C.minus(other: C): C = ring { this@minus - other }
     /**
      * Returns product of the constants.
      */
-    @JvmName("constantTimes")
+    @JvmName("timesConstantConstant")
     public override operator fun C.times(other: C): C = ring { this@times * other }
     /**
      * Raises [arg] to the integer power [exponent].
      */
-    @JvmName("constantPower")
+    @JvmName("powerConstant")
     override fun power(arg: C, exponent: UInt): C = ring { power(arg, exponent) }
 
     /**
@@ -330,59 +330,59 @@ public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : Poly
     public override val constantOne: C get() = ring.one
 }
 
-@Suppress("INAPPLICABLE_JVM_NAME")
+@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface MultivariatePolynomialSpace<C, V, P: Polynomial<C>>: PolynomialSpace<C, P> {
-    @JvmName("VariableIntPlus")
+    @JvmName("plusVariableInt")
     public operator fun V.plus(other: Int): P
-    @JvmName("VariableIntMinus")
+    @JvmName("minusVariableInt")
     public operator fun V.minus(other: Int): P
-    @JvmName("VariableIntMinusTimes")
+    @JvmName("timesVariableInt")
     public operator fun V.times(other: Int): P
 
-    @JvmName("IntVariablePlus")
+    @JvmName("plusIntVariable")
     public operator fun Int.plus(other: V): P
-    @JvmName("IntVariableMinus")
+    @JvmName("minusIntVariable")
     public operator fun Int.minus(other: V): P
-    @JvmName("IntVariableTimes")
+    @JvmName("timesIntVariable")
     public operator fun Int.times(other: V): P
 
-    @JvmName("ConstantVariablePlus")
+    @JvmName("plusConstantVariable")
     public operator fun C.plus(other: V): P
-    @JvmName("ConstantVariableMinus")
+    @JvmName("minusConstantVariable")
     public operator fun C.minus(other: V): P
-    @JvmName("ConstantVariableTimes")
+    @JvmName("timesConstantVariable")
     public operator fun C.times(other: V): P
 
-    @JvmName("VariableConstantPlus")
+    @JvmName("plusVariableConstant")
     public operator fun V.plus(other: C): P
-    @JvmName("VariableConstantMinus")
+    @JvmName("minusVariableConstant")
     public operator fun V.minus(other: C): P
-    @JvmName("VariableConstantTimes")
+    @JvmName("timesVariableConstant")
     public operator fun V.times(other: C): P
 
-    @JvmName("VariableUnaryPlus")
+    @JvmName("unaryPlusVariable")
     public operator fun V.unaryPlus(): P
-    @JvmName("VariableUnaryMinus")
+    @JvmName("unaryMinusVariable")
     public operator fun V.unaryMinus(): P
-    @JvmName("VariablePlus")
+    @JvmName("plusVariableVariable")
     public operator fun V.plus(other: V): P
-    @JvmName("VariableMinus")
+    @JvmName("minusVariableVariable")
     public operator fun V.minus(other: V): P
-    @JvmName("VariableTimes")
+    @JvmName("timesVariableVariable")
     public operator fun V.times(other: V): P
 
-    @JvmName("VariablePolynomialPlus")
+    @JvmName("plusVariablePolynomial")
     public operator fun V.plus(other: P): P
-    @JvmName("VariablePolynomialMinus")
+    @JvmName("minusVariablePolynomial")
     public operator fun V.minus(other: P): P
-    @JvmName("VariablePolynomialTimes")
+    @JvmName("timesVariablePolynomial")
     public operator fun V.times(other: P): P
 
-    @JvmName("PolynomialVariablePlus")
+    @JvmName("plusPolynomialVariable")
     public operator fun P.plus(other: V): P
-    @JvmName("PolynomialVariableMinus")
+    @JvmName("minusPolynomialVariable")
     public operator fun P.minus(other: V): P
-    @JvmName("PolynomialVariableTimes")
+    @JvmName("timesPolynomialVariable")
     public operator fun P.times(other: V): P
 
     /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index eede543ee..dfec126f3 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -28,7 +28,7 @@ public interface RationalFunction<C, P: Polynomial<C>> {
  * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
  * @param R the type of rational functions.
  */
-@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
 public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunction<C, P>> : Ring<R> {
     /**
      * Returns sum of the constant and the integer represented as constant (member of underlying ring).
@@ -129,52 +129,52 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
-    public operator fun R.plus(other: Int): R = addMultipliedBySquaring(this, one, other)
+    public operator fun R.plus(other: Int): R = addMultipliedByDoubling(this, one, other)
     /**
      * Returns difference between the rational function and the integer represented as rational function.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
-    public operator fun R.minus(other: Int): R = addMultipliedBySquaring(this, one, -other)
+    public operator fun R.minus(other: Int): R = addMultipliedByDoubling(this, one, -other)
     /**
      * Returns product of the rational function and the integer represented as rational function.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    public operator fun R.times(other: Int): R = multiplyBySquaring(this, other)
+    public operator fun R.times(other: Int): R = multiplyByDoubling(this, other)
     /**
      * Returns quotient of the rational function and the integer represented as rational function.
      *
      * The operation is equivalent to creating a new rational function by preserving numerator of [this] and
      * multiplication denominator of [this] to [other].
      */
-    public operator fun R.div(other: Int): R = this / multiplyBySquaring(one, other)
+    public operator fun R.div(other: Int): R = this / multiplyByDoubling(one, other)
 
     /**
      * Returns sum of the integer represented as rational function and the rational function.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
-    public operator fun Int.plus(other: R): R = addMultipliedBySquaring(other, one, this)
+    public operator fun Int.plus(other: R): R = addMultipliedByDoubling(other, one, this)
     /**
      * Returns difference between the integer represented as rational function and the rational function.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
-    public operator fun Int.minus(other: R): R = addMultipliedBySquaring(-other, one, this)
+    public operator fun Int.minus(other: R): R = addMultipliedByDoubling(-other, one, this)
     /**
      * Returns product of the integer represented as rational function and the rational function.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    public operator fun Int.times(other: R): R = multiplyBySquaring(other, this)
+    public operator fun Int.times(other: R): R = multiplyByDoubling(other, this)
     /**
      * Returns quotient of the integer represented as rational function and the rational function.
      *
      * The operation is equivalent to creating a new rational function which numerator is [this] times denominator of
      * [other] and which denominator is [other]'s numerator.
      */
-    public operator fun Int.div(other: R): R = multiplyBySquaring(one / other, this)
+    public operator fun Int.div(other: R): R = multiplyByDoubling(one / other, this)
 
     /**
      * Converts the integer [value] to rational function.
@@ -188,38 +188,38 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     /**
      * Returns the same constant.
      */
-    @JvmName("constantUnaryPlus")
-    @JsName("constantUnaryPlus")
+    @JvmName("unaryPlusConstant")
+    @JsName("unaryPlusConstant")
     public operator fun C.unaryPlus(): C = this
     /**
      * Returns negation of the constant.
      */
-    @JvmName("constantUnaryMinus")
-    @JsName("constantUnaryMinus")
+    @JvmName("unaryMinusConstant")
+    @JsName("unaryMinusConstant")
     public operator fun C.unaryMinus(): C
     /**
      * Returns sum of the constants.
      */
-    @JvmName("constantPlus")
-    @JsName("constantPlus")
+    @JvmName("plusConstantConstant")
+    @JsName("plusConstantConstant")
     public operator fun C.plus(other: C): C
     /**
      * Returns difference of the constants.
      */
-    @JvmName("constantMinus")
-    @JsName("constantMinus")
+    @JvmName("minusConstantConstant")
+    @JsName("minusConstantConstant")
     public operator fun C.minus(other: C): C
     /**
      * Returns product of the constants.
      */
-    @JvmName("constantTimes")
-    @JsName("constantTimes")
+    @JvmName("timesConstantConstant")
+    @JsName("timesConstantConstant")
     public operator fun C.times(other: C): C
     /**
      * Raises [arg] to the integer power [exponent].
      */
-    @JvmName("constantPower")
-    @JsName("constantPower")
+    @JvmName("powerConstant")
+    @JsName("powerConstant")
     public fun power(arg: C, exponent: UInt) : C
 
     /**
@@ -417,7 +417,7 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     /**
      * Raises [arg] to the integer power [exponent].
      */
-    public override fun power(arg: R, exponent: UInt) : R = exponentiationBySquaring(arg, exponent)
+    public override fun power(arg: R, exponent: UInt) : R = exponentiateBySquaring(arg, exponent)
 
     /**
      * Instance of zero rational function (zero of the rational functions ring).
@@ -458,7 +458,7 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
  * @param R the type of rational functions.
  * @param A the type of algebraic structure (precisely, of ring) provided for constants.
  */
-@Suppress("INAPPLICABLE_JVM_NAME")
+@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface RationalFunctionalSpaceOverRing<C, P: Polynomial<C>, R: RationalFunction<C, P>, A: Ring<C>> : RationalFunctionalSpace<C, P, R> {
 
     public val ring: A
@@ -468,68 +468,68 @@ public interface RationalFunctionalSpaceOverRing<C, P: Polynomial<C>, R: Rationa
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
-    public override operator fun C.plus(other: Int): C = ring { addMultipliedBySquaring(this@plus, one, other) }
+    public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
     /**
      * Returns difference between the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
-    public override operator fun C.minus(other: Int): C = ring { addMultipliedBySquaring(this@minus, one, -other) }
+    public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
     /**
      * Returns product of the constant and the integer represented as constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
-    public override operator fun C.times(other: Int): C = ring { multiplyBySquaring(this@times, other) }
+    public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
 
     /**
      * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
-    public override operator fun Int.plus(other: C): C = ring { addMultipliedBySquaring(other, one, this@plus) }
+    public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
     /**
      * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
-    public override operator fun Int.minus(other: C): C = ring { addMultipliedBySquaring(-other, one, this@minus) }
+    public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
     /**
      * Returns product of the integer represented as constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
-    public override operator fun Int.times(other: C): C = ring { multiplyBySquaring(other, this@times) }
+    public override operator fun Int.times(other: C): C = ring { multiplyByDoubling(other, this@times) }
 
     /**
      * Returns the same constant.
      */
-    @JvmName("constantUnaryPlus")
+    @JvmName("unaryPlusConstant")
     public override operator fun C.unaryPlus(): C = ring { +this@unaryPlus }
     /**
      * Returns negation of the constant.
      */
-    @JvmName("constantUnaryMinus")
+    @JvmName("unaryMinusConstant")
     public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
     /**
      * Returns sum of the constants.
      */
-    @JvmName("constantPlus")
+    @JvmName("plusConstantConstant")
     public override operator fun C.plus(other: C): C = ring { this@plus + other }
     /**
      * Returns difference of the constants.
      */
-    @JvmName("constantMinus")
+    @JvmName("minusConstantConstant")
     public override operator fun C.minus(other: C): C = ring { this@minus - other }
     /**
      * Returns product of the constants.
      */
-    @JvmName("constantTimes")
+    @JvmName("timesConstantConstant")
     public override operator fun C.times(other: C): C = ring { this@times * other }
     /**
      * Raises [arg] to the integer power [exponent].
      */
-    @JvmName("constantPower")
+    @JvmName("powerConstant")
     public override fun power(arg: C, exponent: UInt) : C = ring { power(arg, exponent) }
 
     /**
@@ -552,7 +552,7 @@ public interface RationalFunctionalSpaceOverRing<C, P: Polynomial<C>, R: Rationa
  * @param R the type of rational functions.
  * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
  */
-@Suppress("INAPPLICABLE_JVM_NAME")
+@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface RationalFunctionalSpaceOverPolynomialSpace<
         C,
         P: Polynomial<C>,
@@ -659,32 +659,32 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
     /**
      * Returns the same constant.
      */
-    @JvmName("constantUnaryPlus")
+    @JvmName("unaryPlusConstant")
     public override operator fun C.unaryPlus(): C = polynomialRing { +this@unaryPlus }
     /**
      * Returns negation of the constant.
      */
-    @JvmName("constantUnaryMinus")
+    @JvmName("unaryMinusConstant")
     public override operator fun C.unaryMinus(): C = polynomialRing { -this@unaryMinus }
     /**
      * Returns sum of the constants.
      */
-    @JvmName("constantPlus")
+    @JvmName("plusConstantConstant")
     public override operator fun C.plus(other: C): C = polynomialRing { this@plus + other }
     /**
      * Returns difference of the constants.
      */
-    @JvmName("constantMinus")
+    @JvmName("minusConstantConstant")
     public override operator fun C.minus(other: C): C = polynomialRing { this@minus - other }
     /**
      * Returns product of the constants.
      */
-    @JvmName("constantTimes")
+    @JvmName("timesConstantConstant")
     public override operator fun C.times(other: C): C = polynomialRing { this@times * other }
     /**
      * Raises [arg] to the integer power [exponent].
      */
-    @JvmName("constantPower")
+    @JvmName("powerConstant")
     public override fun power(arg: C, exponent: UInt) : C = polynomialRing { power(arg, exponent) }
 
     /**
@@ -780,7 +780,7 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
  * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
  * @param R the type of rational functions.
  */
-@Suppress("INAPPLICABLE_JVM_NAME")
+@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public abstract class PolynomialSpaceOfFractions<
         C,
         P: Polynomial<C>,
@@ -1052,78 +1052,78 @@ public abstract class PolynomialSpaceOfFractions<
     public override val one: R get() = constructRationalFunction(polynomialOne)
 }
 
-@Suppress("INAPPLICABLE_JVM_NAME")
+@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface MultivariateRationalFunctionalSpace<
         C,
         V,
         P: Polynomial<C>,
         R: RationalFunction<C, P>
         >: RationalFunctionalSpace<C, P, R> {
-    @JvmName("VariableIntPlus")
+    @JvmName("plusVariableInt")
     public operator fun V.plus(other: Int): P
-    @JvmName("VariableIntMinus")
+    @JvmName("minusVariableInt")
     public operator fun V.minus(other: Int): P
-    @JvmName("VariableIntMinusTimes")
+    @JvmName("timesVariableInt")
     public operator fun V.times(other: Int): P
 
-    @JvmName("IntVariablePlus")
+    @JvmName("plusIntVariable")
     public operator fun Int.plus(other: V): P
-    @JvmName("IntVariableMinus")
+    @JvmName("minusIntVariable")
     public operator fun Int.minus(other: V): P
-    @JvmName("IntVariableTimes")
+    @JvmName("timesIntVariable")
     public operator fun Int.times(other: V): P
 
-    @JvmName("ConstantVariablePlus")
+    @JvmName("plusConstantVariable")
     public operator fun C.plus(other: V): P
-    @JvmName("ConstantVariableMinus")
+    @JvmName("minusConstantVariable")
     public operator fun C.minus(other: V): P
-    @JvmName("ConstantVariableTimes")
+    @JvmName("timesConstantVariable")
     public operator fun C.times(other: V): P
 
-    @JvmName("VariableConstantPlus")
+    @JvmName("plusVariableConstant")
     public operator fun V.plus(other: C): P
-    @JvmName("VariableConstantMinus")
+    @JvmName("minusVariableConstant")
     public operator fun V.minus(other: C): P
-    @JvmName("VariableConstantTimes")
+    @JvmName("timesVariableConstant")
     public operator fun V.times(other: C): P
 
-    @JvmName("VariableUnaryPlus")
+    @JvmName("unaryPlusVariable")
     public operator fun V.unaryPlus(): P
-    @JvmName("VariableUnaryMinus")
+    @JvmName("unaryMinusVariable")
     public operator fun V.unaryMinus(): P
-    @JvmName("VariablePlus")
+    @JvmName("plusVariableVariable")
     public operator fun V.plus(other: V): P
-    @JvmName("VariableMinus")
+    @JvmName("minusVariableVariable")
     public operator fun V.minus(other: V): P
-    @JvmName("VariableTimes")
+    @JvmName("timesVariableVariable")
     public operator fun V.times(other: V): P
 
-    @JvmName("VariablePolynomialPlus")
+    @JvmName("plusVariablePolynomial")
     public operator fun V.plus(other: P): P
-    @JvmName("VariablePolynomialMinus")
+    @JvmName("minusVariablePolynomial")
     public operator fun V.minus(other: P): P
-    @JvmName("VariablePolynomialTimes")
+    @JvmName("timesVariablePolynomial")
     public operator fun V.times(other: P): P
 
-    @JvmName("PolynomialVariablePlus")
+    @JvmName("plusPolynomialVariable")
     public operator fun P.plus(other: V): P
-    @JvmName("PolynomialVariableMinus")
+    @JvmName("minusPolynomialVariable")
     public operator fun P.minus(other: V): P
-    @JvmName("PolynomialVariableTimes")
+    @JvmName("timesPolynomialVariable")
     public operator fun P.times(other: V): P
 
-    @JvmName("VariableRationalFunctionPlus")
+    @JvmName("plusVariableRational")
     public operator fun V.plus(other: R): R
-    @JvmName("VariableRationalFunctionMinus")
+    @JvmName("minusVariableRational")
     public operator fun V.minus(other: R): R
-    @JvmName("VariableRationalFunctionTimes")
+    @JvmName("timesVariableRational")
     public operator fun V.times(other: R): R
 
-    @JvmName("RationalFunctionVariablePlus")
+    @JvmName("plusRationalVariable")
     public operator fun R.plus(other: V): R
-    @JvmName("RationalFunctionVariableMinus")
+    @JvmName("minusRationalVariable")
     public operator fun R.minus(other: V): R
-    @JvmName("RationalFunctionVariableTimes")
+    @JvmName("timesRationalVariable")
     public operator fun R.times(other: V): R
 
     /**
@@ -1177,7 +1177,7 @@ public interface MultivariateRationalFunctionalSpaceOverPolynomialSpace<
         AP: PolynomialSpace<C, P>,
         > : RationalFunctionalSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionalSpace<C, V, P, R>
 
-@Suppress("INAPPLICABLE_JVM_NAME")
+@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSpace<
         C,
         V,
@@ -1185,57 +1185,57 @@ public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSp
         R: RationalFunction<C, P>,
         AP: MultivariatePolynomialSpace<C, V, P>,
         > : MultivariateRationalFunctionalSpaceOverPolynomialSpace<C, V, P, R, AP> {
-    @JvmName("VariableIntPlus")
+    @JvmName("plusVariableInt")
     public override operator fun V.plus(other: Int): P = polynomialRing { this@plus + other }
-    @JvmName("VariableIntMinus")
+    @JvmName("minusVariableInt")
     public override operator fun V.minus(other: Int): P = polynomialRing { this@minus - other }
-    @JvmName("VariableIntMinusTimes")
+    @JvmName("timesVariableInt")
     public override operator fun V.times(other: Int): P = polynomialRing { this@times * other }
 
-    @JvmName("IntVariablePlus")
+    @JvmName("plusIntVariable")
     public override operator fun Int.plus(other: V): P = polynomialRing { this@plus + other }
-    @JvmName("IntVariableMinus")
+    @JvmName("minusIntVariable")
     public override operator fun Int.minus(other: V): P = polynomialRing { this@minus - other }
-    @JvmName("IntVariableTimes")
+    @JvmName("timesIntVariable")
     public override operator fun Int.times(other: V): P = polynomialRing { this@times * other }
 
-    @JvmName("ConstantVariablePlus")
+    @JvmName("plusConstantVariable")
     public override operator fun C.plus(other: V): P = polynomialRing { this@plus + other }
-    @JvmName("ConstantVariableMinus")
+    @JvmName("minusConstantVariable")
     public override operator fun C.minus(other: V): P = polynomialRing { this@minus - other }
-    @JvmName("ConstantVariableTimes")
+    @JvmName("timesConstantVariable")
     public override operator fun C.times(other: V): P = polynomialRing { this@times * other }
 
-    @JvmName("VariableConstantPlus")
+    @JvmName("plusVariableConstant")
     public override operator fun V.plus(other: C): P = polynomialRing { this@plus + other }
-    @JvmName("VariableConstantMinus")
+    @JvmName("minusVariableConstant")
     public override operator fun V.minus(other: C): P = polynomialRing { this@minus - other }
-    @JvmName("VariableConstantTimes")
+    @JvmName("timesVariableConstant")
     public override operator fun V.times(other: C): P = polynomialRing { this@times * other }
 
-    @JvmName("VariableUnaryPlus")
+    @JvmName("unaryPlusVariable")
     public override operator fun V.unaryPlus(): P = polynomialRing { +this@unaryPlus }
-    @JvmName("VariableUnaryMinus")
+    @JvmName("unaryMinusVariable")
     public override operator fun V.unaryMinus(): P = polynomialRing { -this@unaryMinus }
-    @JvmName("VariablePlus")
+    @JvmName("plusVariableVariable")
     public override operator fun V.plus(other: V): P = polynomialRing { this@plus + other }
-    @JvmName("VariableMinus")
+    @JvmName("minusVariableVariable")
     public override operator fun V.minus(other: V): P = polynomialRing { this@minus - other }
-    @JvmName("VariableTimes")
+    @JvmName("timesVariableVariable")
     public override operator fun V.times(other: V): P = polynomialRing { this@times * other }
 
-    @JvmName("VariablePolynomialPlus")
+    @JvmName("plusVariablePolynomial")
     public override operator fun V.plus(other: P): P = polynomialRing { this@plus + other }
-    @JvmName("VariablePolynomialMinus")
+    @JvmName("minusVariablePolynomial")
     public override operator fun V.minus(other: P): P = polynomialRing { this@minus - other }
-    @JvmName("VariablePolynomialTimes")
+    @JvmName("timesVariablePolynomial")
     public override operator fun V.times(other: P): P = polynomialRing { this@times * other }
 
-    @JvmName("PolynomialVariablePlus")
+    @JvmName("plusPolynomialVariable")
     public override operator fun P.plus(other: V): P = polynomialRing { this@plus + other }
-    @JvmName("PolynomialVariableMinus")
+    @JvmName("minusPolynomialVariable")
     public override operator fun P.minus(other: V): P = polynomialRing { this@minus - other }
-    @JvmName("PolynomialVariableTimes")
+    @JvmName("timesPolynomialVariable")
     public override operator fun P.times(other: V): P = polynomialRing { this@times * other }
 
     /**
@@ -1264,45 +1264,45 @@ public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSp
     public override val P.countOfVariables: Int get() = polynomialRing { countOfVariables }
 }
 
-@Suppress("INAPPLICABLE_JVM_NAME")
+@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public abstract class MultivariatePolynomialSpaceOfFractions<
         C,
         V,
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         > : MultivariateRationalFunctionalSpace<C, V, P, R>,  PolynomialSpaceOfFractions<C, P, R>() {
-    @JvmName("VariableRationalFunctionPlus")
+    @JvmName("plusVariableRational")
     public override operator fun V.plus(other: R): R =
         constructRationalFunction(
             this * other.denominator + other.numerator,
             other.denominator
         )
-    @JvmName("VariableRationalFunctionMinus")
+    @JvmName("minusVariableRational")
     public override operator fun V.minus(other: R): R =
         constructRationalFunction(
             this * other.denominator - other.numerator,
             other.denominator
         )
-    @JvmName("VariableRationalFunctionTimes")
+    @JvmName("timesVariableRational")
     public override operator fun V.times(other: R): R =
         constructRationalFunction(
             this * other.numerator,
             other.denominator
         )
 
-    @JvmName("RationalFunctionVariablePlus")
+    @JvmName("plusRationalVariable")
     public override operator fun R.plus(other: V): R =
         constructRationalFunction(
             numerator + denominator * other,
             denominator
         )
-    @JvmName("RationalFunctionVariableMinus")
+    @JvmName("minusRationalVariable")
     public override operator fun R.minus(other: V): R =
         constructRationalFunction(
             numerator - denominator * other,
             denominator
         )
-    @JvmName("RationalFunctionVariableTimes")
+    @JvmName("timesRationalVariable")
     public override operator fun R.times(other: V): R =
         constructRationalFunction(
             numerator * other,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
index fa97d6a6c..b40aa4775 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
@@ -18,9 +18,9 @@ import space.kscience.kmath.operations.*
  * @return product of the multiplicand [arg] and the multiplier [multiplier].
  * @author Gleb Minaev
  */
-internal fun <C> Group<C>.multiplyBySquaring(arg: C, multiplier: Int): C =
-    if (multiplier >= 0) multiplyBySquaring(arg, multiplier.toUInt())
-    else multiplyBySquaring(-arg, (-multiplier).toUInt())
+internal fun <C> Group<C>.multiplyByDoubling(arg: C, multiplier: Int): C =
+    if (multiplier >= 0) multiplyByDoubling(arg, multiplier.toUInt())
+    else multiplyByDoubling(-arg, (-multiplier).toUInt())
 
 // FIXME: Move receiver to context receiver
 /**
@@ -32,9 +32,9 @@ internal fun <C> Group<C>.multiplyBySquaring(arg: C, multiplier: Int): C =
  * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
  * @author Gleb Minaev
  */
-internal fun <C> GroupOps<C>.addMultipliedBySquaring(base: C, arg: C, multiplier: Int): C =
-    if (multiplier >= 0) addMultipliedBySquaring(base, arg, multiplier.toUInt())
-    else addMultipliedBySquaring(base, -arg, (-multiplier).toUInt())
+internal fun <C> GroupOps<C>.addMultipliedByDoubling(base: C, arg: C, multiplier: Int): C =
+    if (multiplier >= 0) addMultipliedByDoubling(base, arg, multiplier.toUInt())
+    else addMultipliedByDoubling(base, -arg, (-multiplier).toUInt())
 
 // FIXME: Move receiver to context receiver
 /**
@@ -47,12 +47,12 @@ internal fun <C> GroupOps<C>.addMultipliedBySquaring(base: C, arg: C, multiplier
  * @return product of the multiplicand [arg] and the multiplier [multiplier].
  * @author Gleb Minaev
  */
-internal tailrec fun <C> Group<C>.multiplyBySquaring(arg: C, multiplier: UInt): C =
+internal tailrec fun <C> Group<C>.multiplyByDoubling(arg: C, multiplier: UInt): C =
     when {
         multiplier == 0u -> zero
         multiplier == 1u -> arg
-        multiplier and 1u == 0u -> multiplyBySquaring(arg + arg, multiplier shr 1)
-        multiplier and 1u == 1u -> addMultipliedBySquaring(arg, arg + arg, multiplier shr 1)
+        multiplier and 1u == 0u -> multiplyByDoubling(arg + arg, multiplier shr 1)
+        multiplier and 1u == 1u -> addMultipliedByDoubling(arg, arg + arg, multiplier shr 1)
         else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
     }
 
@@ -68,12 +68,12 @@ internal tailrec fun <C> Group<C>.multiplyBySquaring(arg: C, multiplier: UInt):
  * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
  * @author Gleb Minaev
  */
-internal tailrec fun <C> GroupOps<C>.addMultipliedBySquaring(base: C, arg: C, multiplier: UInt): C =
+internal tailrec fun <C> GroupOps<C>.addMultipliedByDoubling(base: C, arg: C, multiplier: UInt): C =
     when {
         multiplier == 0u -> base
         multiplier == 1u -> base + arg
-        multiplier and 1u == 0u -> addMultipliedBySquaring(base, arg + arg, multiplier shr 1)
-        multiplier and 1u == 1u -> addMultipliedBySquaring(base + arg, arg + arg, multiplier shr 1)
+        multiplier and 1u == 0u -> addMultipliedByDoubling(base, arg + arg, multiplier shr 1)
+        multiplier and 1u == 1u -> addMultipliedByDoubling(base + arg, arg + arg, multiplier shr 1)
         else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
     }
 
@@ -86,9 +86,9 @@ internal tailrec fun <C> GroupOps<C>.addMultipliedBySquaring(base: C, arg: C, mu
  * @return [arg] raised to the power [exponent].
  * @author Gleb Minaev
  */
-internal fun <C> Field<C>.exponentiationBySquaring(arg: C, exponent: Int): C =
-    if (exponent >= 0) exponentiationBySquaring(arg, exponent.toUInt())
-    else exponentiationBySquaring(one / arg, (-exponent).toUInt())
+internal fun <C> Field<C>.exponentiateBySquaring(arg: C, exponent: Int): C =
+    if (exponent >= 0) exponentiateBySquaring(arg, exponent.toUInt())
+    else exponentiateBySquaring(one / arg, (-exponent).toUInt())
 
 // FIXME: Move receiver to context receiver
 /**
@@ -100,9 +100,9 @@ internal fun <C> Field<C>.exponentiationBySquaring(arg: C, exponent: Int): C =
  * @return product of [base] and [arg] raised to the power [exponent].
  * @author Gleb Minaev
  */
-internal fun <C> Field<C>.multiplyExponentiationBySquaring(base: C, arg: C, exponent: Int): C =
-    if (exponent >= 0) multiplyExponentiationBySquaring(base, arg, exponent.toUInt())
-    else multiplyExponentiationBySquaring(base, one / arg, (-exponent).toUInt())
+internal fun <C> Field<C>.multiplyExponentiatedBySquaring(base: C, arg: C, exponent: Int): C =
+    if (exponent >= 0) multiplyExponentiatedBySquaring(base, arg, exponent.toUInt())
+    else multiplyExponentiatedBySquaring(base, one / arg, (-exponent).toUInt())
 
 // FIXME: Move receiver to context receiver
 /**
@@ -115,12 +115,12 @@ internal fun <C> Field<C>.multiplyExponentiationBySquaring(base: C, arg: C, expo
  * @return [arg] raised to the power [exponent].
  * @author Gleb Minaev
  */
-internal tailrec fun <C> Ring<C>.exponentiationBySquaring(arg: C, exponent: UInt): C =
+internal tailrec fun <C> Ring<C>.exponentiateBySquaring(arg: C, exponent: UInt): C =
     when {
         exponent == 0u -> zero
         exponent == 1u -> arg
-        exponent and 1u == 0u -> exponentiationBySquaring(arg * arg, exponent shr 1)
-        exponent and 1u == 1u -> multiplyExponentiationBySquaring(arg, arg * arg, exponent shr 1)
+        exponent and 1u == 0u -> exponentiateBySquaring(arg * arg, exponent shr 1)
+        exponent and 1u == 1u -> multiplyExponentiatedBySquaring(arg, arg * arg, exponent shr 1)
         else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
     }
 
@@ -136,11 +136,11 @@ internal tailrec fun <C> Ring<C>.exponentiationBySquaring(arg: C, exponent: UInt
  * @return product of [base] and [arg] raised to the power [exponent].
  * @author Gleb Minaev
  */
-internal tailrec fun <C> RingOps<C>.multiplyExponentiationBySquaring(base: C, arg: C, exponent: UInt): C =
+internal tailrec fun <C> RingOps<C>.multiplyExponentiatedBySquaring(base: C, arg: C, exponent: UInt): C =
     when {
         exponent == 0u -> base
         exponent == 1u -> base * arg
-        exponent and 1u == 0u -> multiplyExponentiationBySquaring(base, arg * arg, exponent shr 1)
-        exponent and 1u == 1u -> multiplyExponentiationBySquaring(base * arg, arg * arg, exponent shr 1)
+        exponent and 1u == 0u -> multiplyExponentiatedBySquaring(base, arg * arg, exponent shr 1)
+        exponent and 1u == 1u -> multiplyExponentiatedBySquaring(base * arg, arg * arg, exponent shr 1)
         else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
     }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
index 88d357413..af918b9ae 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
@@ -271,7 +271,7 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
                                 }
                             }
                         },
-                        multiplyBySquaring(c, degs[variable]!!)
+                        multiplyByDoubling(c, degs[variable]!!)
                     )
                 }
         }
@@ -302,7 +302,7 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
                                 }
                             }
                         },
-                        cleanedVariables.fold(c) { acc, variable -> multiplyBySquaring(acc, degs[variable]!!) }
+                        cleanedVariables.fold(c) { acc, variable -> multiplyByDoubling(acc, degs[variable]!!) }
                     )
                 }
         }
@@ -335,7 +335,7 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
                         },
                         degs[variable]!!.let { deg ->
                             (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> multiplyBySquaring(acc, ord) }
+                                .fold(c) { acc, ord -> multiplyByDoubling(acc, ord) }
                         }
                     )
                 }
@@ -371,7 +371,7 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
                         filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
                             degs[index]!!.let { deg ->
                                 (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> multiplyBySquaring(acc2, ord) }
+                                    .fold(acc1) { acc2, ord -> multiplyByDoubling(acc2, ord) }
                             }
                         }
                     )
@@ -398,7 +398,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
                     }
                     put(
                         newDegs,
-                        c / multiplyBySquaring(one, newDegs[variable]!!)
+                        c / multiplyByDoubling(one, newDegs[variable]!!)
                     )
                 }
         }
@@ -425,7 +425,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
                     }
                     put(
                         newDegs,
-                        cleanedVariables.fold(c) { acc, variable -> acc / multiplyBySquaring(one, newDegs[variable]!!) }
+                        cleanedVariables.fold(c) { acc, variable -> acc / multiplyByDoubling(one, newDegs[variable]!!) }
                     )
                 }
         }
@@ -454,7 +454,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo
                         newDegs,
                         newDegs[variable]!!.let { deg ->
                             (deg downTo  deg - order + 1u)
-                                .fold(c) { acc, ord -> acc / multiplyBySquaring(one, ord) }
+                                .fold(c) { acc, ord -> acc / multiplyByDoubling(one, ord) }
                         }
                     )
                 }
@@ -485,7 +485,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo
                         filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
                             newDegs[index]!!.let { deg ->
                                 (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> acc2 / multiplyBySquaring(one, ord) }
+                                    .fold(acc1) { acc2, ord -> acc2 / multiplyByDoubling(one, ord) }
                             }
                         }
                     )
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
index ee85b0f56..ad817c7ba 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
@@ -322,7 +322,7 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
                                 else -> return@forEach
                             }
                         }.cleanUp(),
-                        multiplyBySquaring(c, degs[variable])
+                        multiplyByDoubling(c, degs[variable])
                     )
                 }
         }
@@ -353,7 +353,7 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
                                 else -> return@forEach
                             }
                         }.cleanUp(),
-                        cleanedVariables.fold(c) { acc, variable -> multiplyBySquaring(acc, degs[variable]) }
+                        cleanedVariables.fold(c) { acc, variable -> multiplyByDoubling(acc, degs[variable]) }
                     )
                 }
         }
@@ -385,7 +385,7 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
                         }.cleanUp(),
                         degs[variable].let { deg ->
                             (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> multiplyBySquaring(acc, ord) }
+                                .fold(c) { acc, ord -> multiplyByDoubling(acc, ord) }
                         }
                     )
                 }
@@ -418,7 +418,7 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
                         filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
                             degs[index].let { deg ->
                                 (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> multiplyBySquaring(acc2, ord) }
+                                    .fold(acc1) { acc2, ord -> multiplyByDoubling(acc2, ord) }
                             }
                         }
                     )
@@ -441,7 +441,7 @@ public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
                 .forEach { (degs, c) ->
                     put(
                         List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + 1u },
-                        c / multiplyBySquaring(one, degs[variable])
+                        c / multiplyByDoubling(one, degs[variable])
                     )
                 }
         }
@@ -465,7 +465,7 @@ public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
                 .forEach { (degs, c) ->
                     put(
                         List(max(maxRespectedVariable + 1, degs.size)) { if (it !in variables) degs[it] else degs[it] + 1u },
-                        cleanedVariables.fold(c) { acc, variable -> acc / multiplyBySquaring(one, degs[variable]) }
+                        cleanedVariables.fold(c) { acc, variable -> acc / multiplyByDoubling(one, degs[variable]) }
                     )
                 }
         }
@@ -490,7 +490,7 @@ public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectT
                         List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + order },
                         degs[variable].let { deg ->
                             (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> acc / multiplyBySquaring(one, ord) }
+                                .fold(c) { acc, ord -> acc / multiplyByDoubling(one, ord) }
                         }
                     )
                 }
@@ -518,7 +518,7 @@ public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectT
                         filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
                             degs[index].let { deg ->
                                 (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> acc2 / multiplyBySquaring(one, ord) }
+                                    .fold(acc1) { acc2, ord -> acc2 / multiplyByDoubling(one, ord) }
                             }
                         }
                     )
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
index fe4a82f11..487cd9ee1 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
@@ -31,47 +31,47 @@ class AlgebraicStubTest {
         ExprRing {
             assertEquals(
                 "57",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 0u).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 0u).expr,
                 "tried addMultipliedBySquaring(57, 179, 0u)"
             )
             assertEquals(
                 "(57 + 179)",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 1u).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 1u).expr,
                 "tried addMultipliedBySquaring(57, 179, 1u)"
             )
             assertEquals(
                 "(57 + (179 + 179))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 2u).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 2u).expr,
                 "tried addMultipliedBySquaring(57, 179, 2u)"
             )
             assertEquals(
                 "((57 + 179) + (179 + 179))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 3u).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 3u).expr,
                 "tried addMultipliedBySquaring(57, 179, 3u)"
             )
             assertEquals(
                 "(57 + ((179 + 179) + (179 + 179)))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 4u).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 4u).expr,
                 "tried addMultipliedBySquaring(57, 179, 4u)"
             )
             assertEquals(
                 "((57 + 179) + ((179 + 179) + (179 + 179)))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 5u).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 5u).expr,
                 "tried addMultipliedBySquaring(57, 179, 5u)"
             )
             assertEquals(
                 "((57 + (179 + 179)) + ((179 + 179) + (179 + 179)))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 6u).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 6u).expr,
                 "tried addMultipliedBySquaring(57, 179, 6u)"
             )
             assertEquals(
                 "(((57 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179)))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 7u).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 7u).expr,
                 "tried addMultipliedBySquaring(57, 179, 7u)"
             )
             assertEquals(
                 "(57 + (((179 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179))))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 8u).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 8u).expr,
                 "tried addMultipliedBySquaring(57, 179, 8u)"
             )
         }
@@ -81,47 +81,47 @@ class AlgebraicStubTest {
         ExprRing {
             assertEquals(
                 "0",
-                multiplyBySquaring(Expr("57"), 0u).expr,
+                multiplyByDoubling(Expr("57"), 0u).expr,
                 "tried multiplyBySquaring(57, 0u)"
             )
             assertEquals(
                 "57",
-                multiplyBySquaring(Expr("57"), 1u).expr,
+                multiplyByDoubling(Expr("57"), 1u).expr,
                 "tried multiplyBySquaring(57, 1u)"
             )
             assertEquals(
                 "(57 + 57)",
-                multiplyBySquaring(Expr("57"), 2u).expr,
+                multiplyByDoubling(Expr("57"), 2u).expr,
                 "tried multiplyBySquaring(57, 2u)"
             )
             assertEquals(
                 "(57 + (57 + 57))",
-                multiplyBySquaring(Expr("57"), 3u).expr,
+                multiplyByDoubling(Expr("57"), 3u).expr,
                 "tried multiplyBySquaring(57, 3u)"
             )
             assertEquals(
                 "((57 + 57) + (57 + 57))",
-                multiplyBySquaring(Expr("57"), 4u).expr,
+                multiplyByDoubling(Expr("57"), 4u).expr,
                 "tried multiplyBySquaring(57, 4u)"
             )
             assertEquals(
                 "(57 + ((57 + 57) + (57 + 57)))",
-                multiplyBySquaring(Expr("57"), 5u).expr,
+                multiplyByDoubling(Expr("57"), 5u).expr,
                 "tried multiplyBySquaring(57, 5u)"
             )
             assertEquals(
                 "((57 + 57) + ((57 + 57) + (57 + 57)))",
-                multiplyBySquaring(Expr("57"), 6u).expr,
+                multiplyByDoubling(Expr("57"), 6u).expr,
                 "tried multiplyBySquaring(57, 6u)"
             )
             assertEquals(
                 "((57 + (57 + 57)) + ((57 + 57) + (57 + 57)))",
-                multiplyBySquaring(Expr("57"), 7u).expr,
+                multiplyByDoubling(Expr("57"), 7u).expr,
                 "tried multiplyBySquaring(57, 7u)"
             )
             assertEquals(
                 "(((57 + 57) + (57 + 57)) + ((57 + 57) + (57 + 57)))",
-                multiplyBySquaring(Expr("57"), 8u).expr,
+                multiplyByDoubling(Expr("57"), 8u).expr,
                 "tried multiplyBySquaring(57, 8u)"
             )
         }
@@ -131,87 +131,87 @@ class AlgebraicStubTest {
         ExprRing {
             assertEquals(
                 "57",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 0).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 0).expr,
                 "tried addMultipliedBySquaring(57, 179, 0)"
             )
             assertEquals(
                 "(57 + 179)",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 1).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 1).expr,
                 "tried addMultipliedBySquaring(57, 179, 1)"
             )
             assertEquals(
                 "(57 + -179)",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), -1).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -1).expr,
                 "tried addMultipliedBySquaring(57, 179, -1)"
             )
             assertEquals(
                 "(57 + (179 + 179))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 2).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 2).expr,
                 "tried addMultipliedBySquaring(57, 179, 2)"
             )
             assertEquals(
                 "(57 + (-179 + -179))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), -2).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -2).expr,
                 "tried addMultipliedBySquaring(57, 179, -2)"
             )
             assertEquals(
                 "((57 + 179) + (179 + 179))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 3).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 3).expr,
                 "tried addMultipliedBySquaring(57, 179, 3)"
             )
             assertEquals(
                 "((57 + -179) + (-179 + -179))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), -3).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -3).expr,
                 "tried addMultipliedBySquaring(57, 179, -3)"
             )
             assertEquals(
                 "(57 + ((179 + 179) + (179 + 179)))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 4).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 4).expr,
                 "tried addMultipliedBySquaring(57, 179, 4)"
             )
             assertEquals(
                 "(57 + ((-179 + -179) + (-179 + -179)))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), -4).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -4).expr,
                 "tried addMultipliedBySquaring(57, 179, -4)"
             )
             assertEquals(
                 "((57 + 179) + ((179 + 179) + (179 + 179)))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 5).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 5).expr,
                 "tried addMultipliedBySquaring(57, 179, 5)"
             )
             assertEquals(
                 "((57 + -179) + ((-179 + -179) + (-179 + -179)))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), -5).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -5).expr,
                 "tried addMultipliedBySquaring(57, 179, -5)"
             )
             assertEquals(
                 "((57 + (179 + 179)) + ((179 + 179) + (179 + 179)))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 6).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 6).expr,
                 "tried addMultipliedBySquaring(57, 179, 6)"
             )
             assertEquals(
                 "((57 + (-179 + -179)) + ((-179 + -179) + (-179 + -179)))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), -6).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -6).expr,
                 "tried addMultipliedBySquaring(57, 179, -6)"
             )
             assertEquals(
                 "(((57 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179)))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 7).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 7).expr,
                 "tried addMultipliedBySquaring(57, 179, 7)"
             )
             assertEquals(
                 "(((57 + -179) + (-179 + -179)) + ((-179 + -179) + (-179 + -179)))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), -7).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -7).expr,
                 "tried addMultipliedBySquaring(57, 179, -7)"
             )
             assertEquals(
                 "(57 + (((179 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179))))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), 8).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 8).expr,
                 "tried addMultipliedBySquaring(57, 179, 8)"
             )
             assertEquals(
                 "(57 + (((-179 + -179) + (-179 + -179)) + ((-179 + -179) + (-179 + -179))))",
-                addMultipliedBySquaring(Expr("57"), Expr("179"), -8).expr,
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -8).expr,
                 "tried addMultipliedBySquaring(57, 179, -8)"
             )
         }
@@ -221,87 +221,87 @@ class AlgebraicStubTest {
         ExprRing {
             assertEquals(
                 "0",
-                multiplyBySquaring(Expr("57"), 0).expr,
+                multiplyByDoubling(Expr("57"), 0).expr,
                 "tried multiplyBySquaring(57, 0)"
             )
             assertEquals(
                 "57",
-                multiplyBySquaring(Expr("57"), 1).expr,
+                multiplyByDoubling(Expr("57"), 1).expr,
                 "tried multiplyBySquaring(57, 1)"
             )
             assertEquals(
                 "-57",
-                multiplyBySquaring(Expr("57"), -1).expr,
+                multiplyByDoubling(Expr("57"), -1).expr,
                 "tried multiplyBySquaring(57, -1)"
             )
             assertEquals(
                 "(57 + 57)",
-                multiplyBySquaring(Expr("57"), 2).expr,
+                multiplyByDoubling(Expr("57"), 2).expr,
                 "tried multiplyBySquaring(57, 2)"
             )
             assertEquals(
                 "(-57 + -57)",
-                multiplyBySquaring(Expr("57"), -2).expr,
+                multiplyByDoubling(Expr("57"), -2).expr,
                 "tried multiplyBySquaring(57, -2)"
             )
             assertEquals(
                 "(57 + (57 + 57))",
-                multiplyBySquaring(Expr("57"), 3).expr,
+                multiplyByDoubling(Expr("57"), 3).expr,
                 "tried multiplyBySquaring(57, 3)"
             )
             assertEquals(
                 "(-57 + (-57 + -57))",
-                multiplyBySquaring(Expr("57"), -3).expr,
+                multiplyByDoubling(Expr("57"), -3).expr,
                 "tried multiplyBySquaring(57, -3)"
             )
             assertEquals(
                 "((57 + 57) + (57 + 57))",
-                multiplyBySquaring(Expr("57"), 4).expr,
+                multiplyByDoubling(Expr("57"), 4).expr,
                 "tried multiplyBySquaring(57, 4)"
             )
             assertEquals(
                 "((-57 + -57) + (-57 + -57))",
-                multiplyBySquaring(Expr("57"), -4).expr,
+                multiplyByDoubling(Expr("57"), -4).expr,
                 "tried multiplyBySquaring(57, -4)"
             )
             assertEquals(
                 "(57 + ((57 + 57) + (57 + 57)))",
-                multiplyBySquaring(Expr("57"), 5).expr,
+                multiplyByDoubling(Expr("57"), 5).expr,
                 "tried multiplyBySquaring(57, 5)"
             )
             assertEquals(
                 "(-57 + ((-57 + -57) + (-57 + -57)))",
-                multiplyBySquaring(Expr("57"), -5).expr,
+                multiplyByDoubling(Expr("57"), -5).expr,
                 "tried multiplyBySquaring(57, -5)"
             )
             assertEquals(
                 "((57 + 57) + ((57 + 57) + (57 + 57)))",
-                multiplyBySquaring(Expr("57"), 6).expr,
+                multiplyByDoubling(Expr("57"), 6).expr,
                 "tried multiplyBySquaring(57, 6)"
             )
             assertEquals(
                 "((-57 + -57) + ((-57 + -57) + (-57 + -57)))",
-                multiplyBySquaring(Expr("57"), -6).expr,
+                multiplyByDoubling(Expr("57"), -6).expr,
                 "tried multiplyBySquaring(57, -6)"
             )
             assertEquals(
                 "((57 + (57 + 57)) + ((57 + 57) + (57 + 57)))",
-                multiplyBySquaring(Expr("57"), 7).expr,
+                multiplyByDoubling(Expr("57"), 7).expr,
                 "tried multiplyBySquaring(57, 7)"
             )
             assertEquals(
                 "((-57 + (-57 + -57)) + ((-57 + -57) + (-57 + -57)))",
-                multiplyBySquaring(Expr("57"), -7).expr,
+                multiplyByDoubling(Expr("57"), -7).expr,
                 "tried multiplyBySquaring(57, -7)"
             )
             assertEquals(
                 "(((57 + 57) + (57 + 57)) + ((57 + 57) + (57 + 57)))",
-                multiplyBySquaring(Expr("57"), 8).expr,
+                multiplyByDoubling(Expr("57"), 8).expr,
                 "tried multiplyBySquaring(57, 8)"
             )
             assertEquals(
                 "(((-57 + -57) + (-57 + -57)) + ((-57 + -57) + (-57 + -57)))",
-                multiplyBySquaring(Expr("57"), -8).expr,
+                multiplyByDoubling(Expr("57"), -8).expr,
                 "tried multiplyBySquaring(57, -8)"
             )
         }
@@ -311,47 +311,47 @@ class AlgebraicStubTest {
         ExprRing {
             assertEquals(
                 "57",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 0u).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 0u).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 0u)"
             )
             assertEquals(
                 "(57 * 179)",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 1u).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 1u).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 1u)"
             )
             assertEquals(
                 "(57 * (179 * 179))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 2u).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 2u).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 2u)"
             )
             assertEquals(
                 "((57 * 179) * (179 * 179))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 3u).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 3u).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 3u)"
             )
             assertEquals(
                 "(57 * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 4u).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 4u).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 4u)"
             )
             assertEquals(
                 "((57 * 179) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 5u).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 5u).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 5u)"
             )
             assertEquals(
                 "((57 * (179 * 179)) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 6u).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 6u).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 6u)"
             )
             assertEquals(
                 "(((57 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 7u).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 7u).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 7u)"
             )
             assertEquals(
                 "(57 * (((179 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179))))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 8u).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 8u).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 8u)"
             )
         }
@@ -361,47 +361,47 @@ class AlgebraicStubTest {
         ExprRing {
             assertEquals(
                 "0",
-                exponentiationBySquaring(Expr("57"), 0u).expr,
+                exponentiateBySquaring(Expr("57"), 0u).expr,
                 "tried exponentiationBySquaring(57, 0u)"
             )
             assertEquals(
                 "57",
-                exponentiationBySquaring(Expr("57"), 1u).expr,
+                exponentiateBySquaring(Expr("57"), 1u).expr,
                 "tried exponentiationBySquaring(57, 1u)"
             )
             assertEquals(
                 "(57 * 57)",
-                exponentiationBySquaring(Expr("57"), 2u).expr,
+                exponentiateBySquaring(Expr("57"), 2u).expr,
                 "tried exponentiationBySquaring(57, 2u)"
             )
             assertEquals(
                 "(57 * (57 * 57))",
-                exponentiationBySquaring(Expr("57"), 3u).expr,
+                exponentiateBySquaring(Expr("57"), 3u).expr,
                 "tried exponentiationBySquaring(57, 3u)"
             )
             assertEquals(
                 "((57 * 57) * (57 * 57))",
-                exponentiationBySquaring(Expr("57"), 4u).expr,
+                exponentiateBySquaring(Expr("57"), 4u).expr,
                 "tried exponentiationBySquaring(57, 4u)"
             )
             assertEquals(
                 "(57 * ((57 * 57) * (57 * 57)))",
-                exponentiationBySquaring(Expr("57"), 5u).expr,
+                exponentiateBySquaring(Expr("57"), 5u).expr,
                 "tried exponentiationBySquaring(57, 5u)"
             )
             assertEquals(
                 "((57 * 57) * ((57 * 57) * (57 * 57)))",
-                exponentiationBySquaring(Expr("57"), 6u).expr,
+                exponentiateBySquaring(Expr("57"), 6u).expr,
                 "tried exponentiationBySquaring(57, 6u)"
             )
             assertEquals(
                 "((57 * (57 * 57)) * ((57 * 57) * (57 * 57)))",
-                exponentiationBySquaring(Expr("57"), 7u).expr,
+                exponentiateBySquaring(Expr("57"), 7u).expr,
                 "tried exponentiationBySquaring(57, 7u)"
             )
             assertEquals(
                 "(((57 * 57) * (57 * 57)) * ((57 * 57) * (57 * 57)))",
-                exponentiationBySquaring(Expr("57"), 8u).expr,
+                exponentiateBySquaring(Expr("57"), 8u).expr,
                 "tried exponentiationBySquaring(57, 8u)"
             )
         }
@@ -411,87 +411,87 @@ class AlgebraicStubTest {
         ExprRing {
             assertEquals(
                 "57",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 0).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 0).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 0)"
             )
             assertEquals(
                 "(57 * 179)",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 1).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 1).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 1)"
             )
             assertEquals(
                 "(57 * (1 / 179))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -1).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -1).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, -1)"
             )
             assertEquals(
                 "(57 * (179 * 179))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 2).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 2).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 2)"
             )
             assertEquals(
                 "(57 * ((1 / 179) * (1 / 179)))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -2).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -2).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, -2)"
             )
             assertEquals(
                 "((57 * 179) * (179 * 179))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 3).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 3).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 3)"
             )
             assertEquals(
                 "((57 * (1 / 179)) * ((1 / 179) * (1 / 179)))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -3).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -3).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, -3)"
             )
             assertEquals(
                 "(57 * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 4).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 4).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 4)"
             )
             assertEquals(
                 "(57 * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -4).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -4).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, -4)"
             )
             assertEquals(
                 "((57 * 179) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 5).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 5).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 5)"
             )
             assertEquals(
                 "((57 * (1 / 179)) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -5).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -5).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, -5)"
             )
             assertEquals(
                 "((57 * (179 * 179)) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 6).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 6).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 6)"
             )
             assertEquals(
                 "((57 * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -6).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -6).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, -6)"
             )
             assertEquals(
                 "(((57 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 7).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 7).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 7)"
             )
             assertEquals(
                 "(((57 * (1 / 179)) * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -7).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -7).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, -7)"
             )
             assertEquals(
                 "(57 * (((179 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179))))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), 8).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 8).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, 8)"
             )
             assertEquals(
                 "(57 * ((((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179)))))",
-                multiplyExponentiationBySquaring(Expr("57"), Expr("179"), -8).expr,
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -8).expr,
                 "tried multiplyExponentiationBySquaring(57, 179, -8)"
             )
         }
@@ -501,87 +501,87 @@ class AlgebraicStubTest {
         ExprRing {
             assertEquals(
                 "0",
-                exponentiationBySquaring(Expr("57"), 0).expr,
+                exponentiateBySquaring(Expr("57"), 0).expr,
                 "tried exponentiationBySquaring(57, 0)"
             )
             assertEquals(
                 "57",
-                exponentiationBySquaring(Expr("57"), 1).expr,
+                exponentiateBySquaring(Expr("57"), 1).expr,
                 "tried exponentiationBySquaring(57, 1)"
             )
             assertEquals(
                 "(1 / 57)",
-                exponentiationBySquaring(Expr("57"), -1).expr,
+                exponentiateBySquaring(Expr("57"), -1).expr,
                 "tried exponentiationBySquaring(57, -1)"
             )
             assertEquals(
                 "(57 * 57)",
-                exponentiationBySquaring(Expr("57"), 2).expr,
+                exponentiateBySquaring(Expr("57"), 2).expr,
                 "tried exponentiationBySquaring(57, 2)"
             )
             assertEquals(
                 "((1 / 57) * (1 / 57))",
-                exponentiationBySquaring(Expr("57"), -2).expr,
+                exponentiateBySquaring(Expr("57"), -2).expr,
                 "tried exponentiationBySquaring(57, -2)"
             )
             assertEquals(
                 "(57 * (57 * 57))",
-                exponentiationBySquaring(Expr("57"), 3).expr,
+                exponentiateBySquaring(Expr("57"), 3).expr,
                 "tried exponentiationBySquaring(57, 3)"
             )
             assertEquals(
                 "((1 / 57) * ((1 / 57) * (1 / 57)))",
-                exponentiationBySquaring(Expr("57"), -3).expr,
+                exponentiateBySquaring(Expr("57"), -3).expr,
                 "tried exponentiationBySquaring(57, -3)"
             )
             assertEquals(
                 "((57 * 57) * (57 * 57))",
-                exponentiationBySquaring(Expr("57"), 4).expr,
+                exponentiateBySquaring(Expr("57"), 4).expr,
                 "tried exponentiationBySquaring(57, 4)"
             )
             assertEquals(
                 "(((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57)))",
-                exponentiationBySquaring(Expr("57"), -4).expr,
+                exponentiateBySquaring(Expr("57"), -4).expr,
                 "tried exponentiationBySquaring(57, -4)"
             )
             assertEquals(
                 "(57 * ((57 * 57) * (57 * 57)))",
-                exponentiationBySquaring(Expr("57"), 5).expr,
+                exponentiateBySquaring(Expr("57"), 5).expr,
                 "tried exponentiationBySquaring(57, 5)"
             )
             assertEquals(
                 "((1 / 57) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
-                exponentiationBySquaring(Expr("57"), -5).expr,
+                exponentiateBySquaring(Expr("57"), -5).expr,
                 "tried exponentiationBySquaring(57, -5)"
             )
             assertEquals(
                 "((57 * 57) * ((57 * 57) * (57 * 57)))",
-                exponentiationBySquaring(Expr("57"), 6).expr,
+                exponentiateBySquaring(Expr("57"), 6).expr,
                 "tried exponentiationBySquaring(57, 6)"
             )
             assertEquals(
                 "(((1 / 57) * (1 / 57)) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
-                exponentiationBySquaring(Expr("57"), -6).expr,
+                exponentiateBySquaring(Expr("57"), -6).expr,
                 "tried exponentiationBySquaring(57, -6)"
             )
             assertEquals(
                 "((57 * (57 * 57)) * ((57 * 57) * (57 * 57)))",
-                exponentiationBySquaring(Expr("57"), 7).expr,
+                exponentiateBySquaring(Expr("57"), 7).expr,
                 "tried exponentiationBySquaring(57, 7)"
             )
             assertEquals(
                 "(((1 / 57) * ((1 / 57) * (1 / 57))) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
-                exponentiationBySquaring(Expr("57"), -7).expr,
+                exponentiateBySquaring(Expr("57"), -7).expr,
                 "tried exponentiationBySquaring(57, -7)"
             )
             assertEquals(
                 "(((57 * 57) * (57 * 57)) * ((57 * 57) * (57 * 57)))",
-                exponentiationBySquaring(Expr("57"), 8).expr,
+                exponentiateBySquaring(Expr("57"), 8).expr,
                 "tried exponentiationBySquaring(57, 8)"
             )
             assertEquals(
                 "((((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
-                exponentiationBySquaring(Expr("57"), -8).expr,
+                exponentiateBySquaring(Expr("57"), -8).expr,
                 "tried exponentiationBySquaring(57, -8)"
             )
         }
-- 
2.34.1


From 9b51062bf7c8b7d65f93120ac36a87bc6731742e Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 11 Jun 2022 16:09:24 +0300
Subject: [PATCH 512/713] Sift.

---
 .../kmath/functions/LabeledPolynomial.kt      | 539 ------------------
 .../functions/LabeledRationalFunction.kt      | 139 -----
 .../kmath/functions/ListPolynomial.kt         | 367 ------------
 .../kmath/functions/ListRationalFunction.kt   | 105 ----
 .../kmath/functions/NumberedPolynomial.kt     | 389 -------------
 .../functions/NumberedRationalFunction.kt     | 188 ------
 .../kscience/kmath/functions/Piecewise.kt     | 132 -----
 .../kmath/functions/labeledConstructors.kt    | 203 -------
 .../kmath/functions/labeledPolynomialUtil.kt  | 495 ----------------
 .../functions/labeledRationalFunctionUtil.kt  |  33 --
 .../kmath/functions/listConstructors.kt       |  60 --
 .../kmath/functions/listPolynomialUtil.kt     | 233 --------
 .../functions/listRationalFunctionUtil.kt     | 221 -------
 .../kmath/functions/numberedConstructors.kt   | 195 -------
 .../kmath/functions/numberedPolynomialUtil.kt | 528 -----------------
 .../functions/numberedRationalFunctionUtil.kt |  33 --
 .../kmath/integration/SplineIntegrator.kt     | 107 ----
 .../kmath/functions/ListPolynomialTest.kt     | 491 ----------------
 .../kmath/functions/ListPolynomialUtilTest.kt | 257 ---------
 19 files changed, 4715 deletions(-)
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
deleted file mode 100644
index b904f7331..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.ScaleOperations
-import kotlin.math.max
-
-
-/**
- * Represents multivariate polynomials with labeled variables.
- *
- * @param C Ring in which the polynomial is considered.
- */
-public data class LabeledPolynomial<C>
-internal constructor(
-    /**
-     * Map that collects coefficients of the polynomial. Every non-zero monomial
-     * `a x_1^{d_1} ... x_n^{d_n}` is represented as pair "key-value" in the map, where value is coefficients `a` and
-     * key is map that associates variables in the monomial with multiplicity of them occurring in the monomial.
-     * For example polynomial
-     * ```
-     * 5 a^2 c^3 - 6 b + 0 b c
-     * ```
-     * has coefficients represented as
-     * ```
-     * mapOf(
-     *      mapOf(
-     *          a to 2,
-     *          c to 3
-     *      ) to 5,
-     *      mapOf(
-     *          b to 1
-     *      ) to (-6)
-     * )
-     * ```
-     * where `a`, `b` and `c` are corresponding [Symbol] objects.
-     */
-    public val coefficients: Map<Map<Symbol, UInt>, C>
-) : Polynomial<C> {
-    override fun toString(): String = "LabeledPolynomial$coefficients"
-}
-
-/**
- * Space of polynomials.
- *
- * @param C the type of operated polynomials.
- * @param A the intersection of [Ring] of [C] and [ScaleOperations] of [C].
- * @param ring the [A] instance.
- */
-public class LabeledPolynomialSpace<C, A : Ring<C>>(
-    public override val ring: A,
-) : MultivariatePolynomialSpace<C, Symbol, LabeledPolynomial<C>>, PolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
-    public override operator fun Symbol.plus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * other,
-        ))
-    public override operator fun Symbol.minus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * other,
-        ))
-    public override operator fun Symbol.times(other: Int): LabeledPolynomial<C> =
-        if (other == 0) zero
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne * other,
-        ))
-
-    public override operator fun Int.plus(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * this@plus,
-        ))
-    public override operator fun Int.minus(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * this@minus,
-        ))
-    public override operator fun Int.times(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) zero
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to constantOne * this@times,
-        ))
-
-    /**
-     * Returns sum of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun LabeledPolynomial<C>.plus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) this
-        else with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other.asConstant()))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
-            )
-        }
-    /**
-     * Returns difference between the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun LabeledPolynomial<C>.minus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) this
-        else with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to (-other).asConstant()))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
-            )
-        }
-    /**
-     * Returns product of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun LabeledPolynomial<C>.times(other: Int): LabeledPolynomial<C> =
-        if (other == 0) zero
-        else LabeledPolynomial(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
-
-    /**
-     * Returns sum of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this == 0) other
-        else with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@plus.asConstant()))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns difference between the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this == 0) other
-        else with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@minus.asConstant()))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns product of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this == 0) zero
-        else LabeledPolynomial(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
-
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public override fun number(value: Int): LabeledPolynomial<C> = number(constantNumber(value))
-
-    public override operator fun C.plus(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to this@plus,
-        ))
-    public override operator fun C.minus(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to this@minus,
-        ))
-    public override operator fun C.times(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to this@times,
-        ))
-
-    public override operator fun Symbol.plus(other: C): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to other,
-        ))
-    public override operator fun Symbol.minus(other: C): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to other,
-        ))
-    public override operator fun Symbol.times(other: C): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this@times to 1U) to other,
-        ))
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@plus))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@minus))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun LabeledPolynomial<C>.plus(other: C): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    override operator fun LabeledPolynomial<C>.minus(other: C): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun LabeledPolynomial<C>.times(other: C): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public override fun number(value: C): LabeledPolynomial<C> =
-        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to value))
-
-    public override operator fun Symbol.unaryPlus(): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne,
-        ))
-    public override operator fun Symbol.unaryMinus(): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to -constantOne,
-        ))
-    public override operator fun Symbol.plus(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne * 2
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne,
-            mapOf(other to 1U) to constantOne,
-        ))
-    public override operator fun Symbol.minus(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) zero
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne,
-            mapOf(other to 1U) to -constantOne,
-        ))
-    public override operator fun Symbol.times(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) LabeledPolynomial<C>(mapOf(
-            mapOf(this to 2U) to constantOne
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U, other to 1U) to constantOne,
-        ))
-
-    public override operator fun Symbol.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@plus to 1u) to constantOne))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = mapOf(this@plus to 1U)
-
-                        this[degs] = constantOne + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    public override operator fun Symbol.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@minus to 1u) to constantOne))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = mapOf(this@minus to 1U)
-
-                        this[degs] = constantOne - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    public override operator fun Symbol.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            other.coefficients
-                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[this] = if (this in it) it[this]!! + 1U else 1U } }
-        )
-
-    public override operator fun LabeledPolynomial<C>.plus(other: Symbol): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to constantOne))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = mapOf(other to 1U)
-
-                        this[degs] = constantOne + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    public override operator fun LabeledPolynomial<C>.minus(other: Symbol): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to constantOne))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = mapOf(other to 1U)
-
-                        this[degs] = constantOne - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    public override operator fun LabeledPolynomial<C>.times(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            coefficients
-                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[other] = if (other in it) it[other]!! + 1U else 1U } }
-        )
-
-    /**
-     * Returns negation of the polynomial.
-     */
-    override fun LabeledPolynomial<C>.unaryMinus(): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            coefficients.mapValues { -it.value }
-        )
-    /**
-     * Returns sum of the polynomials.
-     */
-    override operator fun LabeledPolynomial<C>.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
-            }
-        )
-    /**
-     * Returns difference of the polynomials.
-     */
-    override operator fun LabeledPolynomial<C>.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
-            }
-        )
-    /**
-     * Returns product of the polynomials.
-     */
-    override operator fun LabeledPolynomial<C>.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            buildMap(coefficients.size * other.coefficients.size) {
-                for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
-                    val degs = degs1.toMutableMap()
-                    degs2.mapValuesTo(degs) { (variable, deg) -> degs.getOrElse(variable) { 0u } + deg }
-                    val c = c1 * c2
-                    this[degs] = if (degs in this) this[degs]!! + c else c
-                }
-            }
-        )
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    override val zero: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to constantZero))
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    override val one: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to constantOne))
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    override val LabeledPolynomial<C>.degree: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, c) -> degs.values.sum().toInt() } ?: -1
-    /**
-     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
-     * in which they are appeared in the polynomial.
-     *
-     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
-     * And keys of the map is the same as in [variables].
-     */
-    public override val LabeledPolynomial<C>.degrees: Map<Symbol, UInt>
-        get() =
-            buildMap {
-                coefficients.entries.forEach { (degs, _) ->
-                    degs.mapValuesTo(this) { (variable, deg) ->
-                        max(getOrElse(variable) { 0u }, deg)
-                    }
-                }
-            }
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public override fun LabeledPolynomial<C>.degreeBy(variable: Symbol): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) -> degs.getOrElse(variable) { 0u } } ?: 0u
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public override fun LabeledPolynomial<C>.degreeBy(variables: Collection<Symbol>): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) -> degs.filterKeys { it in variables }.values.sum() } ?: 0u
-    /**
-     * Set of all variables that appear in the polynomial in positive exponents.
-     */
-    public override val LabeledPolynomial<C>.variables: Set<Symbol>
-        get() =
-            buildSet {
-                coefficients.entries.forEach { (degs, _) -> addAll(degs.keys) }
-            }
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public override val LabeledPolynomial<C>.countOfVariables: Int get() = variables.size
-
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
-//    @Suppress("NOTHING_TO_INLINE")
-//    @JvmName("substitutePolynomial")
-//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
-//
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.asFunction(): (Map<Symbol, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.asFunctionOnConstants(): (Map<Symbol, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.asFunctionOnPolynomials(): (Map<Symbol, LabeledPolynomial<C>>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
-//
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Symbol, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
-//    @Suppress("NOTHING_TO_INLINE")
-//    @JvmName("invokePolynomial")
-//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
deleted file mode 100644
index 76c6874f5..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-
-
-public class LabeledRationalFunction<C>(
-    public override val numerator: LabeledPolynomial<C>,
-    public override val denominator: LabeledPolynomial<C>
-) : RationalFunction<C, LabeledPolynomial<C>> {
-    override fun toString(): String = "LabeledRationalFunction${numerator.coefficients}/${denominator.coefficients}"
-}
-
-public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
-    public val ring: A,
-) :
-    MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSpace<
-            C,
-            Symbol,
-            LabeledPolynomial<C>,
-            LabeledRationalFunction<C>,
-            LabeledPolynomialSpace<C, A>,
-            >,
-    MultivariatePolynomialSpaceOfFractions<
-            C,
-            Symbol,
-            LabeledPolynomial<C>,
-            LabeledRationalFunction<C>,
-            >() {
-
-    override val polynomialRing : LabeledPolynomialSpace<C, A> = LabeledPolynomialSpace(ring)
-    override fun constructRationalFunction(
-        numerator: LabeledPolynomial<C>,
-        denominator: LabeledPolynomial<C>
-    ): LabeledRationalFunction<C> =
-        LabeledRationalFunction<C>(numerator, denominator)
-
-    /**
-     * Instance of zero rational function (zero of the rational functions ring).
-     */
-    public override val zero: LabeledRationalFunction<C> = LabeledRationalFunction<C>(polynomialZero, polynomialOne)
-    /**
-     * Instance of unit polynomial (unit of the rational functions ring).
-     */
-    public override val one: LabeledRationalFunction<C> = LabeledRationalFunction<C>(polynomialOne, polynomialOne)
-
-    // TODO: Разобрать
-
-//    operator fun invoke(arg: Map<Symbol, C>): LabeledRationalFunction<C> =
-//        LabeledRationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    @JvmName("invokeLabeledPolynomial")
-//    operator fun invoke(arg: Map<Symbol, LabeledPolynomial<C>>): LabeledRationalFunction<C> =
-//        LabeledRationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    @JvmName("invokeLabeledRationalFunction")
-//    operator fun invoke(arg: Map<Symbol, LabeledRationalFunction<C>>): LabeledRationalFunction<C> {
-//        var num = numerator invokeRFTakeNumerator arg
-//        var den = denominator invokeRFTakeNumerator arg
-//        for (variable in variables) if (variable in arg) {
-//            val degreeDif = degrees[variable]!!
-//            if (degreeDif > 0)
-//                den = multiplyByPower(den, arg[variable]!!.denominator, degreeDif)
-//            else
-//                num = multiplyByPower(num, arg[variable]!!.denominator, -degreeDif)
-//        }
-//        return LabeledRationalFunction(num, den)
-//    }
-//
-//    override fun toString(): String = toString(emptyMap())
-//
-//    fun toString(names: Map<Symbol, String> = emptyMap()): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(names)
-//            else -> "${numerator.toStringWithBrackets(names)}/${denominator.toStringWithBrackets(names)}"
-//        }
-//
-//    fun toString(namer: (Symbol) -> String): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(namer)
-//            else -> "${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)}"
-//        }
-//
-//    fun toStringWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(names)
-//            else -> "(${numerator.toStringWithBrackets(names)}/${denominator.toStringWithBrackets(names)})"
-//        }
-//
-//    fun toStringWithBrackets(namer: (Symbol) -> String): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(namer)
-//            else -> "(${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)})"
-//        }
-//
-//    fun toReversedString(names: Map<Symbol, String> = emptyMap()): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(names)
-//            else -> "${numerator.toReversedStringWithBrackets(names)}/${denominator.toReversedStringWithBrackets(names)}"
-//        }
-//
-//    fun toReversedString(namer: (Symbol) -> String): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(namer)
-//            else -> "${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)}"
-//        }
-//
-//    fun toReversedStringWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(names)
-//            else -> "(${numerator.toReversedStringWithBrackets(names)}/${denominator.toReversedStringWithBrackets(names)})"
-//        }
-//
-//    fun toReversedStringWithBrackets(namer: (Symbol) -> String): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(namer)
-//            else -> "(${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)})"
-//        }
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
deleted file mode 100644
index 585da95ea..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.ScaleOperations
-import space.kscience.kmath.operations.invoke
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.experimental.ExperimentalTypeInference
-import kotlin.jvm.JvmName
-import kotlin.math.max
-import kotlin.math.min
-
-
-/**
- * Polynomial model without fixation on specific context they are applied to.
- *
- * @param coefficients constant is the leftmost coefficient.
- */
-public data class ListPolynomial<C>(
-    /**
-     * List that collects coefficients of the polynomial. Every monomial `a x^d` is represented as a coefficients
-     * `a` placed into the list with index `d`. For example coefficients of polynomial `5 x^2 - 6` can be represented as
-     * ```
-     * listOf(
-     *     -6, // -6 +
-     *     0,  // 0 x +
-     *     5,  // 5 x^2
-     * )
-     * ```
-     * and also as
-     * ```
-     * listOf(
-     *     -6, // -6 +
-     *     0,  // 0 x +
-     *     5,  // 5 x^2
-     *     0,  // 0 x^3
-     *     0,  // 0 x^4
-     * )
-     * ```
-     * It is recommended not to put extra zeros at end of the list (as for `0x^3` and `0x^4` in the example), but is not
-     * prohibited.
-     */
-    public val coefficients: List<C>
-) : Polynomial<C> {
-    override fun toString(): String = "Polynomial$coefficients"
-}
-
-/**
- * Space of univariate polynomials constructed over ring.
- *
- * @param C the type of constants. Polynomials have them as a coefficients in their terms.
- * @param A type of underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
- */
-public open class ListPolynomialSpace<C, A : Ring<C>>(
-    public override val ring: A,
-) : PolynomialSpaceOverRing<C, ListPolynomial<C>, A> {
-    /**
-     * Returns sum of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun ListPolynomial<C>.plus(other: Int): ListPolynomial<C> =
-        if (other == 0) this
-        else
-            ListPolynomial(
-                coefficients
-                    .toMutableList()
-                    .apply {
-                        val result = getOrElse(0) { constantZero } + other
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-    /**
-     * Returns difference between the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun ListPolynomial<C>.minus(other: Int): ListPolynomial<C> =
-        if (other == 0) this
-        else
-            ListPolynomial(
-                coefficients
-                    .toMutableList()
-                    .apply {
-                        val result = getOrElse(0) { constantZero } - other
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-    /**
-     * Returns product of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun ListPolynomial<C>.times(other: Int): ListPolynomial<C> =
-        if (other == 0) zero
-        else ListPolynomial(
-            coefficients
-                .toMutableList()
-                .apply {
-                    for (deg in indices) this[deg] = this[deg] * other
-                }
-        )
-
-    /**
-     * Returns sum of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: ListPolynomial<C>): ListPolynomial<C> =
-        if (this == 0) other
-        else
-            ListPolynomial(
-                other.coefficients
-                    .toMutableList()
-                    .apply {
-                        val result = this@plus + getOrElse(0) { constantZero }
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-    /**
-     * Returns difference between the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: ListPolynomial<C>): ListPolynomial<C> =
-        if (this == 0) other
-        else
-            ListPolynomial(
-                other.coefficients
-                    .toMutableList()
-                    .apply {
-                        forEachIndexed { index, c -> if (index != 0) this[index] = -c }
-
-                        val result = this@minus - getOrElse(0) { constantZero }
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-    /**
-     * Returns product of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: ListPolynomial<C>): ListPolynomial<C> =
-        if (this == 0) zero
-        else ListPolynomial(
-            other.coefficients
-                .toMutableList()
-                .apply {
-                    for (deg in indices) this[deg] = this@times * this[deg]
-                }
-        )
-
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public override fun number(value: Int): ListPolynomial<C> = number(constantNumber(value))
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    public override operator fun C.plus(other: ListPolynomial<C>): ListPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) ListPolynomial(listOf(this@plus))
-            else ListPolynomial(
-                toMutableList()
-                    .apply {
-                        val result = if (size == 0) this@plus else this@plus + get(0)
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    public override operator fun C.minus(other: ListPolynomial<C>): ListPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) ListPolynomial(listOf(this@minus))
-            else ListPolynomial(
-                toMutableList()
-                    .apply {
-                        forEachIndexed { index, c -> if (index != 0) this[index] = -c }
-
-                        val result = if (size == 0) this@minus else this@minus - get(0)
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    public override operator fun C.times(other: ListPolynomial<C>): ListPolynomial<C> =
-        ListPolynomial(
-            other.coefficients
-                .toMutableList()
-                .apply {
-                    for (deg in indices) this[deg] = this@times * this[deg]
-                }
-        )
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    public override operator fun ListPolynomial<C>.plus(other: C): ListPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) ListPolynomial(listOf(other))
-            else ListPolynomial(
-                toMutableList()
-                    .apply {
-                        val result = if (size == 0) other else get(0) + other
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    public override operator fun ListPolynomial<C>.minus(other: C): ListPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) ListPolynomial(listOf(-other))
-            else ListPolynomial(
-                toMutableList()
-                    .apply {
-                        val result = if (size == 0) other else get(0) - other
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    public override operator fun ListPolynomial<C>.times(other: C): ListPolynomial<C> =
-        ListPolynomial(
-            coefficients
-                .toMutableList()
-                .apply {
-                    for (deg in indices) this[deg] = this[deg] * other
-                }
-        )
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public override fun number(value: C): ListPolynomial<C> = ListPolynomial(value)
-
-    /**
-     * Returns negation of the polynomial.
-     */
-    public override operator fun ListPolynomial<C>.unaryMinus(): ListPolynomial<C> =
-        ListPolynomial(coefficients.map { -it })
-    /**
-     * Returns sum of the polynomials.
-     */
-    public override operator fun ListPolynomial<C>.plus(other: ListPolynomial<C>): ListPolynomial<C> {
-        val thisDegree = degree
-        val otherDegree = other.degree
-        return ListPolynomial(
-            List(max(thisDegree, otherDegree) + 1) {
-                when {
-                    it > thisDegree -> other.coefficients[it]
-                    it > otherDegree -> coefficients[it]
-                    else -> coefficients[it] + other.coefficients[it]
-                }
-            }
-        )
-    }
-    /**
-     * Returns difference of the polynomials.
-     */
-    public override operator fun ListPolynomial<C>.minus(other: ListPolynomial<C>): ListPolynomial<C> {
-        val thisDegree = degree
-        val otherDegree = other.degree
-        return ListPolynomial(
-            List(max(thisDegree, otherDegree) + 1) {
-                when {
-                    it > thisDegree -> -other.coefficients[it]
-                    it > otherDegree -> coefficients[it]
-                    else -> coefficients[it] - other.coefficients[it]
-                }
-            }
-        )
-    }
-    /**
-     * Returns product of the polynomials.
-     */
-    public override operator fun ListPolynomial<C>.times(other: ListPolynomial<C>): ListPolynomial<C> {
-        val thisDegree = degree
-        val otherDegree = other.degree
-        return ListPolynomial(
-            List(thisDegree + otherDegree + 1) { d ->
-                (max(0, d - otherDegree)..min(thisDegree, d))
-                    .map { coefficients[it] * other.coefficients[d - it] }
-                    .reduce { acc, rational -> acc + rational }
-            }
-        )
-    }
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    override val zero: ListPolynomial<C> = ListPolynomial(emptyList())
-    /**
-     * Instance of unit constant (unit of the underlying ring).
-     */
-    override val one: ListPolynomial<C> = ListPolynomial(listOf(constantOne))
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    public override val ListPolynomial<C>.degree: Int get() = coefficients.lastIndex
-
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.substitute(argument: C): C = this.substitute(ring, argument)
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
-
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunction(): (C) -> C = { this.substitute(ring, it) }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunctionOnConstants(): (C) -> C = { this.substitute(ring, it) }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunctionOnPolynomials(): (ListPolynomial<C>) -> ListPolynomial<C> = { this.substitute(ring, it) }
-
-    /**
-     * Evaluates the polynomial for the given value [argument].
-     */
-    @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun ListPolynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
-    @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
-}
-
-/**
- * Space of polynomials constructed over ring.
- *
- * @param C the type of constants. Polynomials have them as a coefficients in their terms.
- * @param A type of underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
- */
-public class ScalableListPolynomialSpace<C, A>(
-    ring: A,
-) : ListPolynomialSpace<C, A>(ring), ScaleOperations<ListPolynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
-    override fun scale(a: ListPolynomial<C>, value: Double): ListPolynomial<C> =
-        ring { ListPolynomial(a.coefficients.map { scale(it, value) }) }
-}
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
deleted file mode 100644
index 7b6c23ac3..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-
-
-public data class ListRationalFunction<C>(
-    public override val numerator: ListPolynomial<C>,
-    public override val denominator: ListPolynomial<C>
-) : RationalFunction<C, ListPolynomial<C>> {
-    override fun toString(): String = "RationalFunction${numerator.coefficients}/${denominator.coefficients}"
-}
-
-public class ListRationalFunctionSpace<C, A : Ring<C>> (
-    public val ring: A,
-) :
-    RationalFunctionalSpaceOverPolynomialSpace<
-            C,
-            ListPolynomial<C>,
-            ListRationalFunction<C>,
-            ListPolynomialSpace<C, A>,
-            >,
-    PolynomialSpaceOfFractions<
-            C,
-            ListPolynomial<C>,
-            ListRationalFunction<C>,
-            >() {
-
-    override val polynomialRing : ListPolynomialSpace<C, A> = ListPolynomialSpace(ring)
-    override fun constructRationalFunction(numerator: ListPolynomial<C>, denominator: ListPolynomial<C>): ListRationalFunction<C> =
-        ListRationalFunction(numerator, denominator)
-
-    /**
-     * Instance of zero rational function (zero of the rational functions ring).
-     */
-    public override val zero: ListRationalFunction<C> = ListRationalFunction(polynomialZero, polynomialOne)
-    /**
-     * Instance of unit polynomial (unit of the rational functions ring).
-     */
-    public override val one: ListRationalFunction<C> = ListRationalFunction(polynomialOne, polynomialOne)
-
-    // TODO: Разобрать
-
-//    operator fun invoke(arg: UnivariatePolynomial<T>): RationalFunction<T> =
-//        RationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    operator fun invoke(arg: RationalFunction<T>): RationalFunction<T> {
-//        val num = numerator invokeRFTakeNumerator arg
-//        val den = denominator invokeRFTakeNumerator arg
-//        val degreeDif = numeratorDegree - denominatorDegree
-//        return if (degreeDif > 0)
-//            RationalFunction(
-//                num,
-//                multiplyByPower(den, arg.denominator, degreeDif)
-//            )
-//        else
-//            RationalFunction(
-//                multiplyByPower(num, arg.denominator, -degreeDif),
-//                den
-//            )
-//    }
-//
-//    override fun toString(): String = toString(UnivariatePolynomial.variableName)
-//
-//    fun toString(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(withVariableName)
-//            else -> "${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toStringWithBrackets(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun toReversedString(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(withVariableName)
-//            else -> "${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toReversedStringWithBrackets(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun removeZeros() =
-//        RationalFunction(
-//            numerator.removeZeros(),
-//            denominator.removeZeros()
-//        )
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
deleted file mode 100644
index e75373819..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.ScaleOperations
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.experimental.ExperimentalTypeInference
-import kotlin.jvm.JvmName
-import kotlin.math.max
-
-
-/**
- * Polynomial model without fixation on specific context they are applied to.
- *
- * @param C the type of constants.
- */
-public data class NumberedPolynomial<C>
-internal constructor(
-    /**
-     * Map that collects coefficients of the polynomial. Every monomial `a x_1^{d_1} ... x_n^{d_n}` is represented as
-     * pair "key-value" in the map, where value is coefficients `a` and
-     * key is list that associates index of every variable in the monomial with multiplicity of the variable occurring
-     * in the monomial. For example coefficients of polynomial `5 x_1^2 x_3^3 - 6 x_2` can be represented as
-     * ```
-     * mapOf(
-     *      listOf(2, 0, 3) to 5,
-     *      listOf(0, 1) to (-6),
-     * )
-     * ```
-     * and also as
-     * ```
-     * mapOf(
-     *      listOf(2, 0, 3) to 5,
-     *      listOf(0, 1) to (-6),
-     *      listOf(0, 1, 1) to 0,
-     * )
-     * ```
-     * It is recommended not to put zero monomials into the map, but is not prohibited. Lists of degrees always do not
-     * contain any zeros on end, but can contain zeros on start or anywhere in middle.
-     */
-    public val coefficients: Map<List<UInt>, C>
-) : Polynomial<C> {
-    override fun toString(): String = "NumberedPolynomial$coefficients"
-}
-
-/**
- * Space of polynomials.
- *
- * @param C the type of operated polynomials.
- * @param A the intersection of [Ring] of [C] and [ScaleOperations] of [C].
- * @param ring the [A] instance.
- */
-public open class NumberedPolynomialSpace<C, A : Ring<C>>(
-    public final override val ring: A,
-) : PolynomialSpaceOverRing<C, NumberedPolynomial<C>, A> {
-    /**
-     * Returns sum of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun NumberedPolynomial<C>.plus(other: Int): NumberedPolynomial<C> =
-        if (other == 0) this
-        else
-            NumberedPolynomial(
-                coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
-            )
-    /**
-     * Returns difference between the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun NumberedPolynomial<C>.minus(other: Int): NumberedPolynomial<C> =
-        if (other == 0) this
-        else
-            NumberedPolynomial(
-                coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
-            )
-    /**
-     * Returns product of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun NumberedPolynomial<C>.times(other: Int): NumberedPolynomial<C> =
-        if (other == 0) zero
-        else NumberedPolynomial<C>(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
-
-    /**
-     * Returns sum of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this == 0) other
-        else
-            NumberedPolynomial(
-                other.coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
-            )
-    /**
-     * Returns difference between the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this == 0) other
-        else
-            NumberedPolynomial(
-                other.coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-    /**
-     * Returns product of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this == 0) zero
-        else NumberedPolynomial(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
-
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public override fun number(value: Int): NumberedPolynomial<C> = number(constantNumber(value))
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this@plus))
-            else NumberedPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this@minus))
-            else NumberedPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun NumberedPolynomial<C>.plus(other: C): NumberedPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to other))
-            else NumberedPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    override operator fun NumberedPolynomial<C>.minus(other: C): NumberedPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to other))
-            else NumberedPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun NumberedPolynomial<C>.times(other: C): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public override fun number(value: C): NumberedPolynomial<C> =
-        NumberedPolynomial(mapOf(emptyList<UInt>() to value))
-
-    /**
-     * Returns negation of the polynomial.
-     */
-    override fun NumberedPolynomial<C>.unaryMinus(): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            coefficients.mapValues { -it.value }
-        )
-    /**
-     * Returns sum of the polynomials.
-     */
-    override operator fun NumberedPolynomial<C>.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
-            }
-        )
-    /**
-     * Returns difference of the polynomials.
-     */
-    override operator fun NumberedPolynomial<C>.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
-            }
-        )
-    /**
-     * Returns product of the polynomials.
-     */
-    override operator fun NumberedPolynomial<C>.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            buildMap(coefficients.size * other.coefficients.size) {
-                for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
-                    val degs =
-                        (0..max(degs1.lastIndex, degs2.lastIndex))
-                            .map { degs1.getOrElse(it) { 0U } + degs2.getOrElse(it) { 0U } }
-                    val c = c1 * c2
-                    this[degs] = if (degs in this) this[degs]!! + c else c
-                }
-            }
-        )
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    override val zero: NumberedPolynomial<C> = NumberedPolynomial<C>(emptyMap())
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    override val one: NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            mapOf(
-                emptyList<UInt>() to constantOne // 1 * x_1^0 * x_2^0 * ...
-            )
-        )
-
-    /**
-     * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `-1`.
-     */
-    public val NumberedPolynomial<C>.lastVariable: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.lastIndex } ?: -1
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    override val NumberedPolynomial<C>.degree: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.sum().toInt() } ?: -1
-    /**
-     * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
-     * exponents in which the variables are appeared in the polynomial.
-     *
-     * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
-     * And last index of the list is [lastVariable].
-     */
-    public val NumberedPolynomial<C>.degrees: List<UInt>
-        get() =
-            MutableList(lastVariable + 1) { 0u }.apply {
-                coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        this[index] = max(this[index], deg)
-                    }
-                }
-            }
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) -> degs.getOrElse(variable) { 0u } } ?: 0u
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) ->
-            degs.withIndex().filter { (index, _) -> index in variables }.sumOf { it.value }
-        } ?: 0u
-    /**
-     * Count of variables occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `0`.
-     */
-    public val NumberedPolynomial<C>.countOfVariables: Int
-        get() =
-            MutableList(lastVariable + 1) { false }.apply {
-                coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        if (deg != 0u) this[index] = true
-                    }
-                }
-            }.count { it }
-
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, C>): NumberedPolynomial<C> = this.substitute(ring, argument)
-    @Suppress("NOTHING_TO_INLINE")
-    @JvmName("substitutePolynomial")
-    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
-
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun NumberedPolynomial<C>.asFunction(): (Map<Int, C>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun NumberedPolynomial<C>.asFunctionOnConstants(): (Map<Int, C>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun NumberedPolynomial<C>.asFunctionOnPolynomials(): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
-
-    @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, C>): NumberedPolynomial<C> = this.substitute(ring, argument)
-    @Suppress("NOTHING_TO_INLINE")
-    @JvmName("invokePolynomial")
-    public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
-
-    // FIXME: Move to other constructors with context receiver
-    public fun C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
deleted file mode 100644
index 30c7f0188..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-import kotlin.math.max
-
-
-public class NumberedRationalFunction<C> internal constructor(
-    public override val numerator: NumberedPolynomial<C>,
-    public override val denominator: NumberedPolynomial<C>
-) : RationalFunction<C, NumberedPolynomial<C>> {
-    override fun toString(): String = "NumberedRationalFunction${numerator.coefficients}/${denominator.coefficients}"
-}
-
-public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
-    public val ring: A,
-) :
-    RationalFunctionalSpaceOverPolynomialSpace<
-            C,
-            NumberedPolynomial<C>,
-            NumberedRationalFunction<C>,
-            NumberedPolynomialSpace<C, A>,
-            >,
-    PolynomialSpaceOfFractions<
-            C,
-            NumberedPolynomial<C>,
-            NumberedRationalFunction<C>,
-            >() {
-
-    override val polynomialRing : NumberedPolynomialSpace<C, A> = NumberedPolynomialSpace(ring)
-    override fun constructRationalFunction(
-        numerator: NumberedPolynomial<C>,
-        denominator: NumberedPolynomial<C>
-    ): NumberedRationalFunction<C> =
-        NumberedRationalFunction(numerator, denominator)
-
-    /**
-     * Instance of zero rational function (zero of the rational functions ring).
-     */
-    public override val zero: NumberedRationalFunction<C> = NumberedRationalFunction(polynomialZero, polynomialOne)
-    /**
-     * Instance of unit polynomial (unit of the rational functions ring).
-     */
-    public override val one: NumberedRationalFunction<C> = NumberedRationalFunction(polynomialOne, polynomialOne)
-
-    /**
-     * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `-1`.
-     */
-    public val NumberedPolynomial<C>.lastVariable: Int get() = polynomialRing { lastVariable }
-    /**
-     * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
-     * exponents in which the variables are appeared in the polynomial.
-     *
-     * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
-     * And last index of the list is [lastVariable].
-     */
-    public val NumberedPolynomial<C>.degrees: List<UInt> get() = polynomialRing { degrees }
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt = polynomialRing { degreeBy(variable) }
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt = polynomialRing { degreeBy(variables) }
-    /**
-     * Count of variables occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `0`.
-     */
-    public val NumberedPolynomial<C>.countOfVariables: Int get() = polynomialRing { countOfVariables }
-
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public val NumberedRationalFunction<C>.lastVariable: Int
-        get() = polynomialRing { max(numerator.lastVariable, denominator.lastVariable) }
-    /**
-     * Count of variables occurring in the rational function with positive power. If there is no such variable,
-     * the result is `0`.
-     */
-    public val NumberedRationalFunction<C>.countOfVariables: Int
-        get() =
-            MutableList(lastVariable + 1) { false }.apply {
-                numerator.coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        if (deg != 0u) this[index] = true
-                    }
-                }
-                denominator.coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        if (deg != 0u) this[index] = true
-                    }
-                }
-            }.count { it }
-
-    // TODO: Разобрать
-
-//    operator fun invoke(arg: Map<Int, C>): NumberedRationalFunction<C> =
-//        NumberedRationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    @JvmName("invokePolynomial")
-//    operator fun invoke(arg: Map<Int, Polynomial<C>>): NumberedRationalFunction<C> =
-//        NumberedRationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    @JvmName("invokeRationalFunction")
-//    operator fun invoke(arg: Map<Int, NumberedRationalFunction<C>>): NumberedRationalFunction<C> {
-//        var num = numerator invokeRFTakeNumerator arg
-//        var den = denominator invokeRFTakeNumerator arg
-//        for (variable in 0 until max(numerator.countOfVariables, denominator.countOfVariables)) if (variable in arg) {
-//            val degreeDif = numerator.degrees.getOrElse(variable) { 0 } - denominator.degrees.getOrElse(variable) { 0 }
-//            if (degreeDif > 0)
-//                den = multiplyByPower(den, arg[variable]!!.denominator, degreeDif)
-//            else
-//                num = multiplyByPower(num, arg[variable]!!.denominator, -degreeDif)
-//        }
-//        return NumberedRationalFunction(num, den)
-//    }
-//
-//    override fun toString(): String = toString(Polynomial.variableName)
-//
-//    fun toString(withVariableName: String = Polynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(withVariableName)
-//            else -> "${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toString(namer: (Int) -> String): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(namer)
-//            else -> "${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)}"
-//        }
-//
-//    fun toStringWithBrackets(withVariableName: String = Polynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun toStringWithBrackets(namer: (Int) -> String): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(namer)
-//            else -> "(${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)})"
-//        }
-//
-//    fun toReversedString(withVariableName: String = Polynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(withVariableName)
-//            else -> "${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toReversedString(namer: (Int) -> String): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(namer)
-//            else -> "${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)}"
-//        }
-//
-//    fun toReversedStringWithBrackets(withVariableName: String = Polynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun toReversedStringWithBrackets(namer: (Int) -> String): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(namer)
-//            else -> "(${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)})"
-//        }
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
deleted file mode 100644
index 612b00535..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.operations.Ring
-
-/**
- * Represents piecewise-defined function.
- *
- * @param T the piece key type.
- * @param R the sub-function type.
- */
-public fun interface Piecewise<in T, out R> {
-    /**
-     * Returns the appropriate sub-function for given piece key.
-     */
-    public fun findPiece(arg: T): R?
-}
-
-/**
- * Represents piecewise-defined function where all the sub-functions are polynomials.
- *
- * @property pieces An ordered list of range-polynomial pairs. The list does not in general guarantee that there are no
- * "holes" in it.
- */
-public interface PiecewisePolynomial<T : Comparable<T>> : Piecewise<T, ListPolynomial<T>> {
-    public val pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>>
-
-    override fun findPiece(arg: T): ListPolynomial<T>?
-}
-
-/**
- * A generic piecewise without constraints on how pieces are placed
- */
-@PerformancePitfall("findPiece method of resulting piecewise is slow")
-public fun <T : Comparable<T>> PiecewisePolynomial(
-    pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>>,
-): PiecewisePolynomial<T> = object : PiecewisePolynomial<T> {
-    override val pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>> = pieces
-
-    override fun findPiece(arg: T): ListPolynomial<T>? = pieces.firstOrNull { arg in it.first }?.second
-}
-
-/**
- * An optimized piecewise that uses not separate pieces, but a range separated by delimiters.
- * The pieces search is logarithmic.
- */
-private class OrderedPiecewisePolynomial<T : Comparable<T>>(
-    override val pieces: List<Pair<ClosedRange<T>, ListPolynomial<T>>>,
-) : PiecewisePolynomial<T> {
-
-    override fun findPiece(arg: T): ListPolynomial<T>? {
-        val index = pieces.binarySearch { (range, _) ->
-            when {
-                arg >= range.endInclusive -> -1
-                arg < range.start -> +1
-                else -> 0
-            }
-        }
-        return if (index < 0) null else pieces[index].second
-    }
-
-}
-
-/**
- * A [Piecewise]  builder where all the pieces are ordered by the [Comparable] type instances.
- *
- * @param T the comparable piece key type.
- * @param delimiter the initial piecewise separator
- */
-public class PiecewiseBuilder<T : Comparable<T>>(delimiter: T) {
-    private val delimiters: MutableList<T> = arrayListOf(delimiter)
-    private val pieces: MutableList<ListPolynomial<T>> = arrayListOf()
-
-    /**
-     * Dynamically adds a piece to the right side (beyond maximum argument value of previous piece)
-     *
-     * @param right new rightmost position. If is less than current rightmost position, an error is thrown.
-     * @param piece the sub-function.
-     */
-    public fun putRight(right: T, piece: ListPolynomial<T>) {
-        require(right > delimiters.last()) { "New delimiter should be to the right of old one" }
-        delimiters += right
-        pieces += piece
-    }
-
-    /**
-     * Dynamically adds a piece to the left side (beyond maximum argument value of previous piece)
-     *
-     * @param left the new leftmost position. If is less than current rightmost position, an error is thrown.
-     * @param piece the sub-function.
-     */
-    public fun putLeft(left: T, piece: ListPolynomial<T>) {
-        require(left < delimiters.first()) { "New delimiter should be to the left of old one" }
-        delimiters.add(0, left)
-        pieces.add(0, piece)
-    }
-
-    public fun build(): PiecewisePolynomial<T> = OrderedPiecewisePolynomial(delimiters.zipWithNext { l, r ->
-        l..r
-    }.zip(pieces))
-}
-
-/**
- * A builder for [PiecewisePolynomial]
- */
-public fun <T : Comparable<T>> PiecewisePolynomial(
-    startingPoint: T,
-    builder: PiecewiseBuilder<T>.() -> Unit,
-): PiecewisePolynomial<T> = PiecewiseBuilder(startingPoint).apply(builder).build()
-
-/**
- * Return a value of polynomial function with given [ring] a given [arg] or null if argument is outside piecewise
- * definition.
- */
-public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.substitute(ring: C, arg: T): T? =
-    findPiece(arg)?.substitute(ring, arg)
-
-/**
- * Convert this polynomial to a function returning nullable value (null if argument is outside piecewise range).
- */
-public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C): (T) -> T? = { substitute(ring, it) }
-
-/**
- * Convert this polynomial to a function using [defaultValue] for arguments outside the piecewise range.
- */
-public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C, defaultValue: T): (T) -> T =
-    { substitute(ring, it) ?: defaultValue }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
deleted file mode 100644
index e81a9388e..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-
-
-/**
- * Returns the same degrees' description of the monomial, but without zero degrees.
- */
-internal fun Map<Symbol, UInt>.cleanUp() = filterValues { it > 0U }
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
-    if (!toCheckInput) return LabeledPolynomial<C>(coefs)
-
-    val fixedCoefs = LinkedHashMap<Map<Symbol, UInt>, C>(coefs.size)
-
-    for (entry in coefs) {
-        val key = entry.key.cleanUp()
-        val value = entry.value
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
-    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = LinkedHashMap<Map<Symbol, UInt>, C>(pairs.size)
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
-    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = LinkedHashMap<Map<Symbol, UInt>, C>(pairs.size)
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-
-//context(A)
-//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to one))
-//context(LabeledPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
-//context(LabeledRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
-
-public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this))
-
-@DslMarker
-@UnstableKMathAPI
-internal annotation class LabeledPolynomialConstructorDSL
-
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-public class LabeledPolynomialTermSignatureBuilder {
-    private val signature: MutableMap<Symbol, UInt> = LinkedHashMap()
-    public fun build(): Map<Symbol, UInt> = signature
-    public infix fun Symbol.inPowerOf(deg: UInt) {
-        signature[this] = deg
-    }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Symbol.pow(deg: UInt): Unit = this inPowerOf deg
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Symbol.`in`(deg: UInt): Unit = this inPowerOf deg
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Symbol.of(deg: UInt): Unit = this inPowerOf deg
-}
-
-@UnstableKMathAPI
-public class LabeledPolynomialBuilder<C>(private val zero: C, private val add: (C, C) -> C, capacity: Int = 0) {
-    private val coefficients: MutableMap<Map<Symbol, UInt>, C> = LinkedHashMap(capacity)
-    public fun build(): LabeledPolynomial<C> = LabeledPolynomial<C>(coefficients)
-    public operator fun C.invoke(block: LabeledPolynomialTermSignatureBuilder.() -> Unit) {
-        val signature = LabeledPolynomialTermSignatureBuilder().apply(block).build()
-        coefficients[signature] = add(coefficients.getOrElse(signature) { zero }, this@invoke)
-    }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun C.with(noinline block: LabeledPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun (LabeledPolynomialTermSignatureBuilder.() -> Unit).with(coef: C): Unit = coef.invoke(this)
-    @Suppress("NOTHING_TO_INLINE")
-    public infix fun sig(block: LabeledPolynomialTermSignatureBuilder.() -> Unit): LabeledPolynomialTermSignatureBuilder.() -> Unit = block
-}
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> A.LabeledPolynomial(block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(zero, ::add).apply(block).build()
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> A.LabeledPolynomial(capacity: Int, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(zero, ::add, capacity).apply(block).build()
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(constantZero, { left: C, right: C -> left + right}).apply(block).build()
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(capacity: Int, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(constantZero, { left: C, right: C -> left + right}, capacity).apply(block).build()
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        LabeledPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        LabeledPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(numerator, polynomialOne)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(numerator, LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one), toCheckInput = false))
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        polynomialOne
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one), toCheckInput = false)
-    )
-
-//context(A)
-//public fun <C, A: Ring<C>> Symbol.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
-//context(LabeledRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> Symbol.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
-
-//context(A)
-//public fun <C, A: Ring<C>> C.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
-//context(LabeledRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> C.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
deleted file mode 100644
index af918b9ae..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-
-
-// TODO: Docs
-
-/**
- * Creates a [LabeledPolynomialSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.labeledPolynomial(): LabeledPolynomialSpace<C, A> =
-    LabeledPolynomialSpace(this)
-
-/**
- * Creates a [LabeledPolynomialSpace]'s scope over a received ring.
- */
-@OptIn(ExperimentalContracts::class)
-public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomialSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return LabeledPolynomialSpace(this).block()
-}
-
-///**
-// * Represents the polynomial as a [String] with names of variables substituted with names from [names].
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(names: Map<Symbol, String> = emptyMap()): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .toSortedMap()
-//                            .filter { it.value > 0U }
-//                            .map { (variable, deg) ->
-//                                val variableName = names.getOrDefault(variable, variable.toString())
-//                                when (deg) {
-//                                    1U -> variableName
-//                                    else -> "$variableName^$deg"
-//                                }
-//                            }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer].
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(namer: (Symbol) -> String): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .toSortedMap()
-//                            .filter { it.value > 0U }
-//                            .map { (variable, deg) ->
-//                                when (deg) {
-//                                    1U -> namer(variable)
-//                                    else -> "${namer(variable)}^$deg"
-//                                }
-//                            }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] with names of variables substituted with names from [names] and with
-// * brackets around the string if needed (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
-//    with(represent(names)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
-// * (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(namer: (Symbol) -> String): String =
-//    with(represent(namer)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] with names of variables substituted with names from [names].
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(names: Map<Symbol, String> = emptyMap()): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> -LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .toSortedMap()
-//                            .filter { it.value > 0U }
-//                            .map { (variable, deg) ->
-//                                val variableName = names.getOrDefault(variable, variable.toString())
-//                                when (deg) {
-//                                    1U -> variableName
-//                                    else -> "$variableName^$deg"
-//                                }
-//                            }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer].
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(namer: (Symbol) -> String): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> -LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .toSortedMap()
-//                            .filter { it.value > 0U }
-//                            .map { (variable, deg) ->
-//                                when (deg) {
-//                                    1U -> namer(variable)
-//                                    else -> "${namer(variable)}^$deg"
-//                                }
-//                            }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] with names of variables substituted with names from [names] and with
-// * brackets around the string if needed (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
-//    with(representReversed(names)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
-// * (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(namer: (Symbol) -> String): String =
-//    with(representReversed(namer)) { if (coefficients.count() == 1) this else "($this)" }
-
-//operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
-//    if (other.isZero()) throw ArithmeticException("/ by zero")
-//    else
-//        Polynomial(
-//            coefficients
-//                .mapValues { it.value / other },
-//            toCheckInput = false
-//        )
-
-//public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Symbol, C>): LabeledPolynomial<C> = ring {
-//    if (coefficients.isEmpty()) return this@substitute
-//    LabeledPolynomial<C>(
-//        buildMap {
-//            coefficients.forEach { (degs, c) ->
-//                val newDegs = degs.filterKeys { it !in args }
-//                val newC = degs.entries.asSequence().filter { it.key in args }.fold(c) { acc, (variable, deg) ->
-//                    multiplyWithPower(acc, args[variable]!!, deg)
-//                }
-//                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
-//            }
-//        }
-//    )
-//}
-//
-//// TODO: Replace with optimisation: the [result] may be unboxed, and all operations may be performed as soon as
-////  possible on it
-//@JvmName("substitutePolynomial")
-//fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, arg: Map<Symbol, LabeledPolynomial<C>>) : LabeledPolynomial<C> =
-//    ring.labeledPolynomial {
-//        if (coefficients.isEmpty()) return zero
-//        coefficients
-//            .asSequence()
-//            .map { (degs, c) ->
-//                degs.entries
-//                    .asSequence()
-//                    .filter { it.key in arg }
-//                    .fold(LabeledPolynomial(mapOf(degs.filterKeys { it !in arg } to c))) { acc, (index, deg) ->
-//                        multiplyWithPower(acc, arg[index]!!, deg)
-//                    }
-//            }
-//            .reduce { acc, polynomial -> acc + polynomial } // TODO: Rewrite. Might be slow.
-//    }
-//
-//// TODO: Substitute rational function
-//
-//fun <C, A : Ring<C>> LabeledPolynomial<C>.asFunctionOver(ring: A): (Map<Symbol, C>) -> LabeledPolynomial<C> =
-//    { substitute(ring, it) }
-//
-//fun <C, A : Ring<C>> LabeledPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Symbol, LabeledPolynomial<C>>) -> LabeledPolynomial<C> =
-//    { substitute(ring, it) }
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-): LabeledPolynomial<C> = algebra {
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (variable !in degs) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                when {
-                                    vari != variable -> put(vari, deg)
-                                    deg > 1u -> put(vari, deg - 1u)
-                                }
-                            }
-                        },
-                        multiplyByDoubling(c, degs[variable]!!)
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variables: Collection<Symbol>,
-): LabeledPolynomial<C> = algebra {
-    val cleanedVariables = variables.toSet()
-    if (cleanedVariables.isEmpty()) return this@derivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (!degs.keys.containsAll(cleanedVariables)) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                when {
-                                    vari !in cleanedVariables -> put(vari, deg)
-                                    deg > 1u -> put(vari, deg - 1u)
-                                }
-                            }
-                        },
-                        cleanedVariables.fold(c) { acc, variable -> multiplyByDoubling(acc, degs[variable]!!) }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-    order: UInt
-): LabeledPolynomial<C> = algebra {
-    if (order == 0u) return this@nthDerivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.getOrElse(variable) { 0u } < order) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                when {
-                                    vari != variable -> put(vari, deg)
-                                    deg > order -> put(vari, deg - order)
-                                }
-                            }
-                        },
-                        degs[variable]!!.let { deg ->
-                            (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> multiplyByDoubling(acc, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Symbol, UInt>,
-): LabeledPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (filteredVariablesAndOrders.any { (variable, order) -> degs.getOrElse(variable) { 0u } < order }) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                if (vari !in filteredVariablesAndOrders) put(vari, deg)
-                                else {
-                                    val order = filteredVariablesAndOrders[vari]!!
-                                    if (deg > order) put(vari, deg - order)
-                                }
-                            }
-                        },
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            degs[index]!!.let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> multiplyByDoubling(acc2, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-): LabeledPolynomial<C> = algebra {
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        put(variable, 1u)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
-                    put(
-                        newDegs,
-                        c / multiplyByDoubling(one, newDegs[variable]!!)
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variables: Collection<Symbol>,
-): LabeledPolynomial<C> = algebra {
-    val cleanedVariables = variables.toSet()
-    if (cleanedVariables.isEmpty()) return this@antiderivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        for (variable in cleanedVariables) put(variable, 1u)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
-                    put(
-                        newDegs,
-                        cleanedVariables.fold(c) { acc, variable -> acc / multiplyByDoubling(one, newDegs[variable]!!) }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-    order: UInt
-): LabeledPolynomial<C> = algebra {
-    if (order == 0u) return this@nthAntiderivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        put(variable, order)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
-                    put(
-                        newDegs,
-                        newDegs[variable]!!.let { deg ->
-                            (deg downTo  deg - order + 1u)
-                                .fold(c) { acc, ord -> acc / multiplyByDoubling(one, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Symbol, UInt>,
-): LabeledPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthAntiderivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        for ((variable, order) in filteredVariablesAndOrders) put(variable, order)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
-                    put(
-                        newDegs,
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            newDegs[index]!!.let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> acc2 / multiplyByDoubling(one, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
deleted file mode 100644
index 583160cf4..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-
-
-/**
- * Creates a [LabeledRationalFunctionSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.labeledRationalFunction(): LabeledRationalFunctionSpace<C, A> =
-    LabeledRationalFunctionSpace(this)
-
-/**
- * Creates a [LabeledRationalFunctionSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.labeledRationalFunction(block: LabeledRationalFunctionSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return LabeledRationalFunctionSpace(this).block()
-}
-
-//fun <T: Field<T>> LabeledRationalFunction<T>.reduced(): LabeledRationalFunction<T> {
-//    val greatestCommonDivider = polynomialGCD(numerator, denominator)
-//    return LabeledRationalFunction(
-//        numerator / greatestCommonDivider,
-//        denominator / greatestCommonDivider
-//    )
-//}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
deleted file mode 100644
index 9498c77ca..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-
-
-/**
- * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
- * [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false): ListPolynomial<C> =
-    ListPolynomial(with(coefficients) { if (reverse) reversed() else this })
-
-/**
- * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
- * [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C> ListPolynomial(vararg coefficients: C, reverse: Boolean = false): ListPolynomial<C> =
-    ListPolynomial(with(coefficients) { if (reverse) reversed() else toList() })
-
-public fun <C> C.asListPolynomial() : ListPolynomial<C> = ListPolynomial(listOf(this))
-
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@Suppress("FunctionName")
-public fun <C> ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
-    ListRationalFunction<C>(numerator, polynomialOne)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
-    ListRationalFunction<C>(numerator, ListPolynomial(listOf(one)))
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        polynomialOne
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        ListPolynomial(listOf(one))
-    )
-
-//context(A)
-//public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
-//context(ListRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
deleted file mode 100644
index 50313cab9..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.pow
-
-
-/**
- * Removes zeros on the end of the coefficient list of polynomial.
- */
-//context(PolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> Polynomial<C>.removeZeros() : Polynomial<C> =
-//    if (degree > -1) Polynomial(coefficients.subList(0, degree + 1)) else zero
-
-/**
- * Creates a [ListPolynomialSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.listPolynomial(): ListPolynomialSpace<C, A> =
-    ListPolynomialSpace(this)
-
-/**
- * Creates a [ListPolynomialSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.listPolynomial(block: ListPolynomialSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ListPolynomialSpace(this).block()
-}
-
-/**
- * Creates a [ScalableListPolynomialSpace] over a received scalable ring.
- */
-public fun <C, A> A.scalableListPolynomial(): ScalableListPolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C> =
-    ScalableListPolynomialSpace(this)
-
-/**
- * Creates a [ScalableListPolynomialSpace]'s scope over a received scalable ring.
- */
-public inline fun <C, A, R> A.scalableListPolynomial(block: ScalableListPolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ScalableListPolynomialSpace(this).block()
-}
-
-@Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> copyTo(
-    origin: List<C>,
-    originDegree: Int,
-    target: MutableList<C>,
-) {
-    for (deg in 0 .. originDegree) target[deg] = origin[deg]
-}
-
-@Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> multiplyAddingToUpdater(
-    ring: Ring<C>,
-    multiplicand: MutableList<C>,
-    multiplicandDegree: Int,
-    multiplier: List<C>,
-    multiplierDegree: Int,
-    updater: MutableList<C>,
-    zero: C,
-) {
-    multiplyAddingTo(
-        ring = ring,
-        multiplicand = multiplicand,
-        multiplicandDegree = multiplicandDegree,
-        multiplier = multiplier,
-        multiplierDegree = multiplierDegree,
-        target = updater
-    )
-    for (updateDeg in 0 .. multiplicandDegree + multiplierDegree) {
-        multiplicand[updateDeg] = updater[updateDeg]
-        updater[updateDeg] = zero
-    }
-}
-
-@Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> multiplyAddingTo(
-    ring: Ring<C>,
-    multiplicand: List<C>,
-    multiplicandDegree: Int,
-    multiplier: List<C>,
-    multiplierDegree: Int,
-    target: MutableList<C>
-) = ring {
-    for (d in 0 .. multiplicandDegree + multiplierDegree)
-        for (k in max(0, d - multiplierDegree)..min(multiplicandDegree, d))
-            target[d] += multiplicand[k] * multiplier[d - k]
-}
-
-/**
- * Evaluates the value of the given double polynomial for given double argument.
- */
-public fun ListPolynomial<Double>.substitute(arg: Double): Double =
-    coefficients.reduceIndexedOrNull { index, acc, c ->
-        acc + c * arg.pow(index)
-    } ?: .0
-
-/**
- * Evaluates the value of the given polynomial for given argument.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */
-public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
-    if (coefficients.isEmpty()) return@ring zero
-    var result: C = coefficients.last()
-    for (j in coefficients.size - 2 downTo 0) {
-        result = (arg * result) + coefficients[j]
-    }
-    return result
-}
-
-public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListPolynomial<C> = ring {
-    if (coefficients.isEmpty()) return ListPolynomial(emptyList())
-
-    val thisDegree = coefficients.lastIndex
-    if (thisDegree == -1) return ListPolynomial(emptyList())
-    val argDegree = arg.coefficients.lastIndex
-    if (argDegree == -1) return coefficients[0].asListPolynomial()
-    val constantZero = zero
-    val resultCoefs: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
-    resultCoefs[0] = coefficients[thisDegree]
-    val resultCoefsUpdate: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
-    var resultDegree = 0
-    for (deg in thisDegree - 1 downTo 0) {
-        resultCoefsUpdate[0] = coefficients[deg]
-        multiplyAddingToUpdater(
-            ring = ring,
-            multiplicand = resultCoefs,
-            multiplicandDegree = resultDegree,
-            multiplier = arg.coefficients,
-            multiplierDegree = argDegree,
-            updater = resultCoefsUpdate,
-            zero = constantZero
-        )
-        resultDegree += argDegree
-    }
-
-    return ListPolynomial<C>(resultCoefs)
-}
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asFunction(ring: A): (C) -> C = { substitute(ring, it) }
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asPolynomialFunctionOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.derivative(
-    algebra: A,
-): ListPolynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    ListPolynomial(
-        buildList(max(0, coefficients.size - 1)) {
-            for (deg in 1 .. coefficients.lastIndex) add(number(deg) * coefficients[deg])
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.nthDerivative(
-    algebra: A,
-    order: Int,
-): ListPolynomial<C> where A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    require(order >= 0) { "Order of derivative must be non-negative" }
-    ListPolynomial(
-        buildList(max(0, coefficients.size - order)) {
-            for (deg in order.. coefficients.lastIndex)
-                add((deg - order + 1 .. deg).fold(coefficients[deg]) { acc, d -> acc * number(d) })
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.antiderivative(
-    algebra: A,
-): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
-    ListPolynomial(
-        buildList(coefficients.size + 1) {
-            add(zero)
-            coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.nthAntiderivative(
-    algebra: A,
-    order: Int,
-): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
-    require(order >= 0) { "Order of antiderivative must be non-negative" }
-    ListPolynomial(
-        buildList(coefficients.size + order) {
-            repeat(order) { add(zero) }
-            coefficients.mapIndexedTo(this) { index, c -> (1..order).fold(c) { acc, i -> acc / number(index + i) } }
-        }
-    )
-}
-
-/**
- * Compute a definite integral of a given polynomial in a [range]
- */
-@UnstableKMathAPI
-public fun <C : Comparable<C>> ListPolynomial<C>.integrate(
-    algebra: Field<C>,
-    range: ClosedRange<C>,
-): C = algebra {
-    val integral = antiderivative(algebra)
-    integral.substitute(algebra, range.endInclusive) - integral.substitute(algebra, range.start)
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt
deleted file mode 100644
index 367212588..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.math.max
-
-
-/**
- * Creates a [ListRationalFunctionSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.listRationalFunction(): ListRationalFunctionSpace<C, A> =
-    ListRationalFunctionSpace(this)
-
-/**
- * Creates a [ListRationalFunctionSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.listRationalFunction(block: ListRationalFunctionSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ListRationalFunctionSpace(this).block()
-}
-
-/**
- * Evaluates the value of the given double polynomial for given double argument.
- */
-public fun ListRationalFunction<Double>.substitute(arg: Double): Double =
-    numerator.substitute(arg) / denominator.substitute(arg)
-
-/**
- * Evaluates the value of the given polynomial for given argument.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */
-public fun <C> ListRationalFunction<C>.substitute(ring: Field<C>, arg: C): C = ring {
-    numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
-}
-
-/**
- * Returns numerator (polynomial) of rational function gotten by substitution rational function [arg] to the polynomial instance.
- * More concrete, if [arg] is a fraction `f(x)/g(x)` and the receiving instance is `p(x)`, then
- * ```
- * p(f/g) * g^deg(p)
- * ```
- * is returned.
- *
- * Used in [ListPolynomial.substitute] and [ListRationalFunction.substitute] for performance optimisation.
- */ // TODO: Дописать
-internal fun <C> ListPolynomial<C>.substituteRationalFunctionTakeNumerator(ring: Ring<C>, arg: ListRationalFunction<C>): ListPolynomial<C> = ring {
-    if (coefficients.isEmpty()) return ListPolynomial(emptyList())
-
-    val thisDegree = coefficients.lastIndex
-    if (thisDegree == -1) return ListPolynomial(emptyList())
-    val thisDegreeLog2 = 31 - thisDegree.countLeadingZeroBits()
-    val numeratorDegree = arg.numerator.coefficients.lastIndex
-    val denominatorDegree = arg.denominator.coefficients.lastIndex
-    val argDegree = max(numeratorDegree, denominatorDegree)
-    val constantZero = zero
-    val powersOf2 = buildList<Int>(thisDegreeLog2 + 1) {
-        var result = 1
-        for (exp in 0 .. thisDegreeLog2) {
-            add(result)
-            result = result shl 1
-        }
-    }
-    val hashes = powersOf2.runningReduce { acc, i -> acc + i }
-    val numeratorPowers = buildList<List<C>>(thisDegreeLog2 + 1) {
-        add(arg.numerator.coefficients)
-        repeat(thisDegreeLog2) {
-            val next = MutableList<C>(powersOf2[it + 1] * numeratorDegree + 1) { constantZero }
-            add(next)
-            val last = last()
-            multiplyAddingTo(
-                ring = ring,
-                multiplicand = last,
-                multiplicandDegree = powersOf2[it] * numeratorDegree + 1,
-                multiplier = last,
-                multiplierDegree = powersOf2[it] * numeratorDegree + 1,
-                target = next,
-            )
-        }
-    }
-    val denominatorPowers = buildList<List<C>>(thisDegreeLog2 + 1) {
-        add(arg.denominator.coefficients)
-        repeat(thisDegreeLog2) {
-            val next = MutableList<C>(powersOf2[it + 1] * denominatorDegree + 1) { constantZero }
-            add(next)
-            val last = last()
-            multiplyAddingTo(
-                ring = ring,
-                multiplicand = last,
-                multiplicandDegree = powersOf2[it] * denominatorDegree + 1,
-                multiplier = last,
-                multiplierDegree = powersOf2[it] * denominatorDegree + 1,
-                target = next,
-            )
-        }
-    }
-    val levelResultCoefsPool = buildList<MutableList<C>>(thisDegreeLog2 + 1) {
-        repeat(thisDegreeLog2 + 1) {
-            add(MutableList(hashes[it] * argDegree) { constantZero })
-        }
-    }
-    val edgedMultiplier = MutableList<C>(0) { TODO() }
-    val edgedMultiplierUpdater = MutableList<C>(0) { TODO() }
-
-    fun MutableList<C>.reset() {
-        for (i in indices) set(i, constantZero)
-    }
-
-    fun processLevel(level: Int, start: Int, end: Int) : List<C> {
-        val levelResultCoefs = levelResultCoefsPool[level + 1]
-
-        if (level == -1) {
-            levelResultCoefs[0] = coefficients[start]
-        } else {
-            levelResultCoefs.reset()
-            multiplyAddingTo(
-                ring = ring,
-                multiplicand = processLevel(level = level - 1, start = start, end = (start + end) / 2),
-                multiplicandDegree =  hashes[level] * argDegree,
-                multiplier = denominatorPowers[level],
-                multiplierDegree = powersOf2[level] * denominatorDegree,
-                target = levelResultCoefs
-            )
-            multiplyAddingTo(
-                ring = ring,
-                multiplicand = processLevel(level = level - 1, start = (start + end) / 2, end = end),
-                multiplicandDegree = hashes[level] * argDegree,
-                multiplier = numeratorPowers[level],
-                multiplierDegree = powersOf2[level] * numeratorDegree,
-                target = levelResultCoefs
-            )
-        }
-
-        return levelResultCoefs
-    }
-
-    fun processLevelEdged(level: Int, start: Int, end: Int) : List<C> {
-        val levelResultCoefs = levelResultCoefsPool[level + 1]
-
-        if (level == -1) {
-            levelResultCoefs[0] = coefficients[start]
-        } else {
-            val levelsPowerOf2 = powersOf2[level]
-            if (end - start >= levelsPowerOf2) {
-                multiplyAddingTo(
-                    ring = ring,
-                    multiplicand = processLevelEdged(level = level - 1, start = start + levelsPowerOf2, end = end),
-                    multiplicandDegree = hashes[level] * argDegree, // TODO: Ввести переменную
-                    multiplier = numeratorPowers[level],
-                    multiplierDegree = powersOf2[level] * numeratorDegree,
-                    target = levelResultCoefs
-                )
-                multiplyAddingTo(
-                    ring = ring,
-                    multiplicand = processLevel(level = level - 1, start = start, end = start + levelsPowerOf2),
-                    multiplicandDegree = hashes[level] * argDegree,
-                    multiplier = edgedMultiplier,
-                    multiplierDegree = max((hashes[level] and thisDegree) - powersOf2[level] + 1, 0) * denominatorDegree, // TODO: Ввести переменную
-                    target = levelResultCoefs
-                )
-                if (level != thisDegreeLog2) {
-                    multiplyAddingToUpdater(
-                        ring = ring,
-                        multiplicand = edgedMultiplier,
-                        multiplicandDegree = max((hashes[level] and thisDegree) - powersOf2[level] + 1, 0) * denominatorDegree, // TODO: Ввести переменную
-                        multiplier = denominatorPowers[level],
-                        multiplierDegree = powersOf2[level] * denominatorDegree,
-                        updater = edgedMultiplierUpdater,
-                        zero = constantZero
-                    )
-                }
-            } else {
-                copyTo(
-                    origin = processLevelEdged(level = level - 1, start = start + levelsPowerOf2, end = end),
-                    originDegree = hashes[level] * argDegree, // TODO: Ввести переменную
-                    target = levelResultCoefs
-                )
-            }
-        }
-
-        return levelResultCoefs
-    }
-
-    return ListPolynomial(
-        processLevelEdged(
-            level = thisDegreeLog2,
-            start = 0,
-            end = thisDegree + 1
-        )
-    )
-}
-
-//operator fun <T: Field<T>> RationalFunction<T>.invoke(arg: T): T = numerator(arg) / denominator(arg)
-//
-//fun <T: Field<T>> RationalFunction<T>.reduced(): RationalFunction<T> =
-//    polynomialGCD(numerator, denominator).let {
-//        RationalFunction(
-//            numerator / it,
-//            denominator / it
-//        )
-//    }
-
-///**
-// * Returns result of applying formal derivative to the polynomial.
-// *
-// * @param T Field where we are working now.
-// * @return Result of the operator.
-// */
-//fun <T: Ring<T>> RationalFunction<T>.derivative() =
-//    RationalFunction(
-//        numerator.derivative() * denominator - denominator.derivative() * numerator,
-//        denominator * denominator
-//    )
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
deleted file mode 100644
index dca8a0cff..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-
-
-/**
- * Returns the same degrees' description of the monomial, but without extra zero degrees on the end.
- */
-internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
-    if (!toCheckInput) return NumberedPolynomial<C>(coefs)
-
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in coefs) {
-        val key = entry.key.cleanUp()
-        val value = entry.value
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
-    if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
-    if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
-
-public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
-
-@DslMarker
-@UnstableKMathAPI
-internal annotation class NumberedPolynomialConstructorDSL
-
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-public class NumberedPolynomialTermSignatureBuilder {
-    private val signature: MutableList<UInt> = ArrayList()
-    public fun build(): List<UInt> = signature
-    public infix fun Int.inPowerOf(deg: UInt) {
-        if (this > signature.lastIndex) {
-            signature.addAll(List(this - signature.lastIndex - 1) { 0u })
-            signature.add(deg)
-        } else {
-            signature[this] = deg
-        }
-    }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Int.pow(deg: UInt): Unit = this inPowerOf deg
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Int.`in`(deg: UInt): Unit = this inPowerOf deg
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Int.of(deg: UInt): Unit = this inPowerOf deg
-}
-
-@UnstableKMathAPI
-public class NumberedPolynomialBuilder<C>(private val zero: C, private val add: (C, C) -> C, capacity: Int = 0) {
-    private val coefficients: MutableMap<List<UInt>, C> = LinkedHashMap(capacity)
-    public fun build(): NumberedPolynomial<C> = NumberedPolynomial<C>(coefficients)
-    public operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit) {
-        val signature = NumberedPolynomialTermSignatureBuilder().apply(block).build()
-        coefficients[signature] = add(coefficients.getOrElse(signature) { zero }, this@invoke)
-    }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun C.with(noinline block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun (NumberedPolynomialTermSignatureBuilder.() -> Unit).with(coef: C): Unit = coef.invoke(this)
-    @Suppress("NOTHING_TO_INLINE")
-    public infix fun sig(block: NumberedPolynomialTermSignatureBuilder.() -> Unit): NumberedPolynomialTermSignatureBuilder.() -> Unit = block
-}
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> A.NumberedPolynomial(block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(zero, ::add).apply(block).build()
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> A.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(zero, ::add, capacity).apply(block).build()
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(constantZero, { left: C, right: C -> left + right}).apply(block).build()
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(constantZero, { left: C, right: C -> left + right}, capacity).apply(block).build()
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        NumberedPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        NumberedPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(numerator, polynomialOne)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(numerator, NumberedPolynomial(mapOf(emptyList<UInt>() to one), toCheckInput = false))
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        polynomialOne
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        NumberedPolynomial(mapOf(emptyList<UInt>() to one), toCheckInput = false)
-    )
-
-//context(A)
-//public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> = NumberedRationalFunction(asLabeledPolynomial())
-//context(NumberedRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> = NumberedRationalFunction(asLabeledPolynomial())
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
deleted file mode 100644
index ad817c7ba..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
+++ /dev/null
@@ -1,528 +0,0 @@
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-import kotlin.contracts.*
-import kotlin.jvm.JvmName
-import kotlin.math.max
-
-
-// TODO: Docs
-
-/**
- * Creates a [NumberedPolynomialSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.numberedPolynomial(): NumberedPolynomialSpace<C, A> =
-    NumberedPolynomialSpace(this)
-
-/**
- * Creates a [NumberedPolynomialSpace]'s scope over a received ring.
- */
-@OptIn(ExperimentalContracts::class)
-public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolynomialSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return NumberedPolynomialSpace(this).block()
-}
-
-///**
-// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`.
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.represent(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .mapIndexed { index, deg ->
-//                                when (deg) {
-//                                    0U -> ""
-//                                    1U -> "${withVariableName}_${index+1}"
-//                                    else -> "${withVariableName}_${index+1}^$deg"
-//                                }
-//                            }
-//                            .filter { it.isNotEmpty() }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer].
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.represent(namer: (Int) -> String): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .mapIndexed { index, deg ->
-//                                when (deg) {
-//                                    0U -> ""
-//                                    1U -> namer(index)
-//                                    else -> "${namer(index)}^$deg"
-//                                }
-//                            }
-//                            .filter { it.isNotEmpty() }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`
-// * and with brackets around the string if needed (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representWithBrackets(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
-//    with(represent(withVariableName)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
-// * (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representWithBrackets(namer: (Int) -> String): String =
-//    with(represent(namer)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`.
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversed(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> -NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .mapIndexed { index, deg ->
-//                                when (deg) {
-//                                    0U -> ""
-//                                    1U -> "${withVariableName}_${index+1}"
-//                                    else -> "${withVariableName}_${index+1}^$deg"
-//                                }
-//                            }
-//                            .filter { it.isNotEmpty() }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer].
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversed(namer: (Int) -> String): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> -NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .mapIndexed { index, deg ->
-//                                when (deg) {
-//                                    0U -> ""
-//                                    1U -> namer(index)
-//                                    else -> "${namer(index)}^$deg"
-//                                }
-//                            }
-//                            .filter { it.isNotEmpty() }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`
-// * and with brackets around the string if needed (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversedWithBrackets(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
-//    with(representReversed(withVariableName)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
-// * (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversedWithBrackets(namer: (Int) -> String): String =
-//    with(representReversed(namer)) { if (coefficients.count() == 1) this else "($this)" }
-
-//public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
-//    if (coefficients.isEmpty()) return this@substitute
-//    NumberedPolynomial<C>(
-//        buildMap {
-//            coefficients.forEach { (degs, c) ->
-//                val newDegs = degs.mapIndexed { index, deg -> if (index in args) 0U else deg }.cleanUp()
-//                val newC = degs.foldIndexed(c) { index, acc, deg ->
-//                    if (index in args) multiplyWithPower(acc, args[index]!!, deg)
-//                    else acc
-//                }
-//                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
-//            }
-//        }
-//    )
-//}
-//
-//// TODO: Replace with optimisation: the [result] may be unboxed, and all operations may be performed as soon as
-////  possible on it
-//@JvmName("substitutePolynomial")
-//public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, arg: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> =
-//    ring.numberedPolynomialSpace {
-//        if (coefficients.isEmpty()) return zero
-//        coefficients
-//            .asSequence()
-//            .map { (degs, c) ->
-//                degs.foldIndexed(
-//                    NumberedPolynomial(
-//                        degs.mapIndexed { index, deg -> if (index in arg) 0U else deg } to c
-//                    )
-//                ) { index, acc, deg -> if (index in arg) multiplyWithPower(acc, arg[index]!!, deg) else acc }
-//            }
-//            .reduce { acc, polynomial -> acc + polynomial } // TODO: Rewrite. Might be slow.
-//    }
-//
-//// TODO: Substitute rational function
-//
-//public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunctionOver(ring: A): (Map<Int, C>) -> NumberedPolynomial<C> =
-//    { substitute(ring, it) }
-//
-//public fun <C, A : Ring<C>> NumberedPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> =
-//    { substitute(ring, it) }
-
-//operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
-//    if (other.isZero()) throw ArithmeticException("/ by zero")
-//    else
-//        Polynomial(
-//            coefficients
-//                .mapValues { it.value / other },
-//            toCheckInput = false
-//        )
-
-/**
- * Evaluates the value of the given double polynomial for given double argument.
- */
-public fun NumberedPolynomial<Double>.substitute(args: Map<Int, Double>): NumberedPolynomial<Double> = Double.algebra {
-    val acc = LinkedHashMap<List<UInt>, Double>(coefficients.size)
-    for ((degs, c) in coefficients) {
-        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-        val newC = args.entries.fold(c) { product, (variable, substitution) ->
-            val deg = degs.getOrElse(variable) { 0u }
-            if (deg == 0u) product else product * substitution.pow(deg.toInt())
-        }
-        if (newDegs !in acc) acc[newDegs] = newC
-        else acc[newDegs] = acc[newDegs]!! + newC
-    }
-    return NumberedPolynomial<Double>(acc)
-}
-
-/**
- * Evaluates the value of the given polynomial for given argument.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */
-public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
-    val acc = LinkedHashMap<List<UInt>, C>(coefficients.size)
-    for ((degs, c) in coefficients) {
-        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-        val newC = args.entries.fold(c) { product, (variable, substitution) ->
-            val deg = degs.getOrElse(variable) { 0u }
-            if (deg == 0u) product else product * power(substitution, deg)
-        }
-        if (newDegs !in acc) acc[newDegs] = newC
-        else acc[newDegs] = acc[newDegs]!! + newC
-    }
-    return NumberedPolynomial<C>(acc)
-}
-
-// TODO: (Waiting for hero) Replace with optimisation: the [result] may be unboxed, and all operations may be performed
-//  as soon as possible on it
-@JvmName("substitutePolynomial")
-public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> = TODO() /*ring.numberedPolynomial {
-    val acc = LinkedHashMap<List<UInt>, NumberedPolynomial<C>>(coefficients.size)
-    for ((degs, c) in coefficients) {
-        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-        val newC = args.entries.fold(c.asNumberedPolynomial()) { product, (variable, substitution) ->
-            val deg = degs.getOrElse(variable) { 0u }
-            if (deg == 0u) product else product * power(substitution, deg)
-        }
-        if (newDegs !in acc) acc[newDegs] = c.asNumberedPolynomial()
-        else acc[newDegs] = acc[newDegs]!! + c
-    }
-}*/
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunction(ring: A): (Map<Int, C>) -> NumberedPolynomial<C> = { substitute(ring, it) }
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> = { substitute(ring, it) }
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variable: Int,
-): NumberedPolynomial<C> = algebra {
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.size > variable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            when {
-                                index != variable -> deg
-                                deg > 0u -> deg - 1u
-                                else -> return@forEach
-                            }
-                        }.cleanUp(),
-                        multiplyByDoubling(c, degs[variable])
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variables: Collection<Int>,
-): NumberedPolynomial<C> = algebra {
-    val cleanedVariables = variables.toSet()
-    if (cleanedVariables.isEmpty()) return this@derivativeWithRespectTo
-    val maxRespectedVariable = cleanedVariables.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.size > maxRespectedVariable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            when {
-                                index !in cleanedVariables -> deg
-                                deg > 0u -> deg - 1u
-                                else -> return@forEach
-                            }
-                        }.cleanUp(),
-                        cleanedVariables.fold(c) { acc, variable -> multiplyByDoubling(acc, degs[variable]) }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variable: Int,
-    order: UInt
-): NumberedPolynomial<C> = algebra {
-    if (order == 0u) return this@nthDerivativeWithRespectTo
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.size > variable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            when {
-                                index != variable -> deg
-                                deg >= order -> deg - order
-                                else -> return@forEach
-                            }
-                        }.cleanUp(),
-                        degs[variable].let { deg ->
-                            (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> multiplyByDoubling(acc, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Int, UInt>,
-): NumberedPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
-    val maxRespectedVariable = filteredVariablesAndOrders.keys.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.size > maxRespectedVariable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            if (index !in filteredVariablesAndOrders) return@mapIndexed deg
-                            val order = filteredVariablesAndOrders[index]!!
-                            if (deg >= order) deg - order else return@forEach
-                        }.cleanUp(),
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            degs[index].let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> multiplyByDoubling(acc2, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variable: Int,
-): NumberedPolynomial<C> = algebra {
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + 1u },
-                        c / multiplyByDoubling(one, degs[variable])
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variables: Collection<Int>,
-): NumberedPolynomial<C> = algebra {
-    val cleanedVariables = variables.toSet()
-    if (cleanedVariables.isEmpty()) return this@antiderivativeWithRespectTo
-    val maxRespectedVariable = cleanedVariables.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(maxRespectedVariable + 1, degs.size)) { if (it !in variables) degs[it] else degs[it] + 1u },
-                        cleanedVariables.fold(c) { acc, variable -> acc / multiplyByDoubling(one, degs[variable]) }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variable: Int,
-    order: UInt
-): NumberedPolynomial<C> = algebra {
-    if (order == 0u) return this@nthAntiderivativeWithRespectTo
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + order },
-                        degs[variable].let { deg ->
-                            (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> acc / multiplyByDoubling(one, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Int, UInt>,
-): NumberedPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthAntiderivativeWithRespectTo
-    val maxRespectedVariable = filteredVariablesAndOrders.keys.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(maxRespectedVariable + 1, degs.size)) { degs[it] + filteredVariablesAndOrders.getOrElse(it) { 0u } },
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            degs[index].let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> acc2 / multiplyByDoubling(one, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
deleted file mode 100644
index 5cd0679ab..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-
-
-/**
- * Creates a [NumberedRationalFunctionSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.numberedRationalFunction(): NumberedRationalFunctionSpace<C, A> =
-    NumberedRationalFunctionSpace(this)
-
-/**
- * Creates a [NumberedRationalFunctionSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.numberedRationalFunction(block: NumberedRationalFunctionSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return NumberedRationalFunctionSpace(this).block()
-}
-
-//fun <T: Field<T>> NumberedRationalFunction<T>.reduced(): NumberedRationalFunction<T> {
-//    val greatestCommonDivider = polynomialGCD(numerator, denominator)
-//    return NumberedRationalFunction(
-//        numerator / greatestCommonDivider,
-//        denominator / greatestCommonDivider
-//    )
-//}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
deleted file mode 100644
index 0fcd4c6e5..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.integration
-
-import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.integrate
-import space.kscience.kmath.functions.antiderivative
-import space.kscience.kmath.interpolation.PolynomialInterpolator
-import space.kscience.kmath.interpolation.SplineInterpolator
-import space.kscience.kmath.interpolation.interpolatePolynomials
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.MutableBufferFactory
-
-/**
- * Compute analytical indefinite integral of this [PiecewisePolynomial], keeping all intervals intact
- */
-@OptIn(PerformancePitfall::class)
-@UnstableKMathAPI
-public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(algebra: Field<T>): PiecewisePolynomial<T> =
-    PiecewisePolynomial(pieces.map { it.first to it.second.antiderivative(algebra) })
-
-/**
- * Compute definite integral of given [PiecewisePolynomial] piece by piece in a given [range]
- * Requires [UnivariateIntegrationNodes] or [IntegrationRange] and [IntegrandMaxCalls]
- *
- * TODO use context receiver for algebra
- */
-@UnstableKMathAPI
-public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(
-    algebra: Field<T>, range: ClosedRange<T>,
-): T = algebra.sum(
-    pieces.map { (region, poly) ->
-        val intersectedRange = maxOf(range.start, region.start)..minOf(range.endInclusive, region.endInclusive)
-        //Check if polynomial range is not used
-        if (intersectedRange.start == intersectedRange.endInclusive) algebra.zero
-        else poly.integrate(algebra, intersectedRange)
-    }
-)
-
-/**
- * A generic spline-interpolation-based analytic integration
- * * [IntegrationRange]&mdash;the univariate range of integration. By default, uses `0..1` interval.
- * * [IntegrandMaxCalls]&mdash;the maximum number of function calls during integration. For non-iterative rules, always uses
- * the maximum number of points. By default, uses 10 points.
- */
-@UnstableKMathAPI
-public class SplineIntegrator<T : Comparable<T>>(
-    public val algebra: Field<T>,
-    public val bufferFactory: MutableBufferFactory<T>,
-) : UnivariateIntegrator<T> {
-    override fun process(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> = algebra {
-        val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
-
-        val interpolator: PolynomialInterpolator<T> = SplineInterpolator(algebra, bufferFactory)
-
-        val nodes: Buffer<Double> = integrand.getFeature<UnivariateIntegrationNodes>()?.nodes ?: run {
-            val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
-            val step = (range.endInclusive - range.start) / (numPoints - 1)
-            DoubleBuffer(numPoints) { i -> range.start + i * step }
-        }
-
-        val values = nodes.map(bufferFactory) { integrand.function(it) }
-        val polynomials = interpolator.interpolatePolynomials(
-            nodes.map(bufferFactory) { number(it) },
-            values
-        )
-        val res = polynomials.integrate(algebra, number(range.start)..number(range.endInclusive))
-        integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + nodes.size)
-    }
-}
-
-/**
- * A simplified double-based spline-interpolation-based analytic integration
- * * [IntegrationRange]&mdash;the univariate range of integration. By default, uses `0.0..1.0` interval.
- * * [IntegrandMaxCalls]&mdash;the maximum number of function calls during integration. For non-iterative rules, always
- * uses the maximum number of points. By default, uses 10 points.
- */
-@UnstableKMathAPI
-public object DoubleSplineIntegrator : UnivariateIntegrator<Double> {
-    override fun process(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
-        val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
-        val interpolator: PolynomialInterpolator<Double> = SplineInterpolator(DoubleField, ::DoubleBuffer)
-
-        val nodes: Buffer<Double> = integrand.getFeature<UnivariateIntegrationNodes>()?.nodes ?: run {
-            val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
-            val step = (range.endInclusive - range.start) / (numPoints - 1)
-            DoubleBuffer(numPoints) { i -> range.start + i * step }
-        }
-
-        val values = nodes.map { integrand.function(it) }
-        val polynomials = interpolator.interpolatePolynomials(nodes, values)
-        val res = polynomials.integrate(DoubleField, range)
-        return integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + nodes.size)
-    }
-}
-
-@Suppress("unused")
-@UnstableKMathAPI
-public inline val DoubleField.splineIntegrator: UnivariateIntegrator<Double>
-    get() = DoubleSplineIntegrator
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
deleted file mode 100644
index 5401be707..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.test.misc.*
-import kotlin.test.*
-
-
-class ListPolynomialTest {
-    @Test
-    fun test_Polynomial_Int_plus() {
-        RationalField.listPolynomial {
-            assertEquals(
-                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + -3,
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 2,
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(-2)) + 2,
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(),
-                ListPolynomial<Rational>() + 0,
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 1,
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1)),
-                ListPolynomial(Rational(-2)) + 1,
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(2)),
-                ListPolynomial<Rational>() + 2,
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Int_minus() {
-        RationalField.listPolynomial {
-            assertEquals(
-                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - -3,
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 2,
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(2)) - 2,
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(),
-                ListPolynomial<Rational>() - 0,
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 1,
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1)),
-                ListPolynomial(Rational(2)) - 1,
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-2)),
-                ListPolynomial<Rational>() - 2,
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Int_times() {
-        IntModuloRing(35).listPolynomial {
-            assertEquals(
-                ListPolynomial(34, 2, 1, 20, 2),
-                ListPolynomial(22, 26, 13, 15, 26) * 27,
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                ListPolynomial(7, 0, 49, 21, 14) * 15,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_plus() {
-        RationalField.listPolynomial {
-            assertEquals(
-                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                -3 + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                2 + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                2 + ListPolynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(),
-                0 + ListPolynomial(),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                1 + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1)),
-                1 + ListPolynomial(Rational(-2)),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(2)),
-                2 + ListPolynomial(),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_minus() {
-        RationalField.listPolynomial {
-            assertEquals(
-                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                3 - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                -2 - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                -2 - ListPolynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(),
-                0 - ListPolynomial(),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                -1 - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1)),
-                -1 - ListPolynomial(Rational(-2)),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-2)),
-                -2 - ListPolynomial(),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_times() {
-        IntModuloRing(35).listPolynomial {
-            assertEquals(
-                ListPolynomial(34, 2, 1, 20, 2),
-                27 * ListPolynomial(22, 26, 13, 15, 26),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                15 * ListPolynomial(7, 0, 49, 21, 14),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_plus() {
-        RationalField.listPolynomial {
-            assertEquals(
-                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + Rational(-3),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(2),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(-2)) + Rational(2),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial<Rational>() + Rational(0),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(1),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1)),
-                ListPolynomial(Rational(-2)) + Rational(1),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(2)),
-                ListPolynomial<Rational>() + Rational(2),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_minus() {
-        RationalField.listPolynomial {
-            assertEquals(
-                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - Rational(-3),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(2),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(2)) - Rational(2),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial<Rational>() - Rational(0),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(1),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1)),
-                ListPolynomial(Rational(2)) - Rational(1),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-2)),
-                ListPolynomial<Rational>() - Rational(2),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_times() {
-        IntModuloRing(35).listPolynomial {
-            assertEquals(
-                ListPolynomial(34, 2, 1, 20, 2),
-                ListPolynomial(22, 26, 13, 15, 26) * 27.asConstant(),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                ListPolynomial(7, 0, 49, 21, 14) * 15.asConstant(),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_plus() {
-        RationalField.listPolynomial {
-            assertEquals(
-                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                Rational(-3) + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                Rational(2) + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                Rational(2) + ListPolynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                Rational(0) + ListPolynomial(),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                Rational(1) + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1)),
-                Rational(1) + ListPolynomial(Rational(-2)),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(2)),
-                Rational(2) + ListPolynomial(),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_minus() {
-        RationalField.listPolynomial {
-            assertEquals(
-                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                Rational(3) - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                Rational(-2) - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                Rational(-2) - ListPolynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                Rational(0) - ListPolynomial(),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                Rational(-1) - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1)),
-                Rational(-1) - ListPolynomial(Rational(-2)),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-2)),
-                Rational(-2) - ListPolynomial(),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_times() {
-        IntModuloRing(35).listPolynomial {
-            assertEquals(
-                ListPolynomial(34, 2, 1, 20, 2),
-                27 * ListPolynomial(22, 26, 13, 15, 26),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                15 * ListPolynomial(7, 0, 49, 21, 14),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_unaryMinus() {
-        RationalField.listPolynomial {
-            assertEquals(
-                ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
-                -ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7), Rational(0), Rational(0)),
-                -ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7), Rational(0), Rational(0)),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_plus() {
-        RationalField.listPolynomial {
-            // (5/9 - 8/9 x - 8/7 x^2) + (-5/7 + 5/1 x + 5/8 x^2) ?= -10/63 + 37/9 x - 29/56 x^2
-            assertEquals(
-                ListPolynomial(Rational(-10, 63), Rational(37, 9), Rational(-29, 56)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) +
-                        ListPolynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
-                "test 1"
-            )
-            // (-2/9 - 8/3 x) + (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 5/12 x + 2/4 x^2
-            assertEquals(
-                ListPolynomial(Rational(-2, 9), Rational(-5, 12), Rational(2, 4)),
-                ListPolynomial(Rational(-2, 9), Rational(-8, 3)) +
-                        ListPolynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
-                "test 2"
-            )
-            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) + (-6/3 - 7/2 x + 2/3 x^2) ?= -18/7 - 23/6 x + 2/3 x^2
-            assertEquals(
-                ListPolynomial(Rational(-18, 7), Rational(-23, 6), Rational(2, 3), Rational(0)),
-                ListPolynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) +
-                        ListPolynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
-                "test 3"
-            )
-            // (-2/4 - 6/9 x - 4/9 x^2) + (2/4 + 6/9 x + 4/9 x^2) ?= 0
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) +
-                        ListPolynomial(Rational(2, 4), Rational(6, 9), Rational(4, 9)),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_minus() {
-        RationalField.listPolynomial {
-            // (5/9 - 8/9 x - 8/7 x^2) - (-5/7 + 5/1 x + 5/8 x^2) ?= 80/63 - 53/9 x - 99/56 x^2
-            assertEquals(
-                ListPolynomial(Rational(80, 63), Rational(-53, 9), Rational(-99, 56)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) -
-                        ListPolynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
-                "test 1"
-            )
-            // (-2/9 - 8/3 x) - (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 59/12 x - 2/4 x^2
-            assertEquals(
-                ListPolynomial(Rational(-2, 9), Rational(-59, 12), Rational(-2, 4)),
-                ListPolynomial(Rational(-2, 9), Rational(-8, 3)) -
-                        ListPolynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
-                "test 2"
-            )
-            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) - (-6/3 - 7/2 x + 2/3 x^2) ?= 10/7 + 19/6 x - 2/3 x^2
-            assertEquals(
-                ListPolynomial(Rational(10, 7), Rational(19, 6), Rational(-2, 3), Rational(0)),
-                ListPolynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) -
-                        ListPolynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
-                "test 3"
-            )
-            // (-2/4 - 6/9 x - 4/9 x^2) - (-2/4 - 6/9 x - 4/9 x^2) ?= 0
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) -
-                        ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_times() {
-        IntModuloRing(35).listPolynomial {
-            // (1 + x + x^2) * (1 - x + x^2) ?= 1 + x^2 + x^4
-            assertEquals(
-                ListPolynomial(1, 0, 1, 0, 1),
-                ListPolynomial(1, -1, 1) * ListPolynomial(1, 1, 1),
-                "test 1"
-            )
-            // Spoiler: 5 * 7 = 0
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                ListPolynomial(5, -25, 10) * ListPolynomial(21, 14, -7),
-                "test 2"
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
deleted file mode 100644
index c5eb8fb81..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.test.misc.Rational
-import space.kscience.kmath.test.misc.RationalField
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
-
-
-class ListPolynomialUtilTest {
-    @Test
-    fun test_substitute_Double() {
-        assertEquals(
-            0.0,
-            ListPolynomial(1.0, -2.0, 1.0).substitute(1.0),
-            0.001,
-            "test 1"
-        )
-        assertEquals(
-            1.1931904761904761,
-            ListPolynomial(0.625, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
-            0.001,
-            "test 2"
-        )
-        assertEquals(
-            0.5681904761904762,
-            ListPolynomial(0.0, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
-            0.001,
-            "test 3"
-        )
-        assertEquals(
-            1.1811904761904761,
-            ListPolynomial(0.625, 2.6666666666666665, 0.5714285714285714, 0.0).substitute(0.2),
-            0.001,
-            "test 4"
-        )
-        assertEquals(
-            1.1703333333333332,
-            ListPolynomial(0.625, 2.6666666666666665, 0.0, 1.5).substitute(0.2),
-            0.001,
-            "test 5"
-        )
-    }
-    @Test
-    fun test_substitute_Constant() {
-        assertEquals(
-            Rational(0),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, Rational(1)),
-            "test 1"
-        )
-        assertEquals(
-            Rational(25057, 21000),
-            ListPolynomial(Rational(5,8), Rational(8, 3), Rational(4, 7), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 2"
-        )
-        assertEquals(
-            Rational(2983, 5250),
-            ListPolynomial(Rational(0), Rational(8, 3), Rational(4, 7), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 3"
-        )
-        assertEquals(
-            Rational(4961, 4200),
-            ListPolynomial(Rational(5,8), Rational(8, 3), Rational(4, 7), Rational(0))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 4"
-        )
-        assertEquals(
-            Rational(3511, 3000),
-            ListPolynomial(Rational(5,8), Rational(8, 3), Rational(0), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 5"
-        )
-    }
-    @Test
-    fun test_substitute_Polynomial() {
-        assertEquals(
-            ListPolynomial(Rational(0)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, ListPolynomial(Rational(1))),
-            "test 1"
-        )
-        assertEquals(
-            ListPolynomial(Rational(709, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
-            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(2, 7))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
-            "test 2"
-        )
-        assertEquals(
-            ListPolynomial(Rational(655, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
-            ListPolynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(2, 7))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(677, 378), Rational(97, 180), Rational(1, 75), Rational(0)),
-            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(0))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
-            "test 4"
-        )
-        assertEquals(
-            ListPolynomial(Rational(653, 378), Rational(221, 420), Rational(4, 175), Rational(2, 875)),
-            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(0), Rational(2, 7))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
-            "test 5"
-        )
-        assertEquals(
-            ListPolynomial(Rational(89, 54), Rational(0), Rational(0), Rational(0)),
-            ListPolynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(0))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(0))),
-            "test 6"
-        )
-    }
-    @Test
-    fun test_derivative() {
-        assertEquals(
-            ListPolynomial(Rational(-2), Rational(2)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).derivative(RationalField),
-            "test 1"
-        )
-        assertEquals(
-            ListPolynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
-            "test 2"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
-            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(0)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).derivative(RationalField),
-            "test 4"
-        )
-    }
-    @Test
-    fun test_nthDerivative() {
-        assertEquals(
-            ListPolynomial(Rational(-2), Rational(2)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 1),
-            "test 1"
-        )
-        assertFailsWith<IllegalArgumentException>("test2") {
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, -1)
-        }
-        assertEquals(
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 0),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(2)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 2),
-            "test 4"
-        )
-        assertEquals(
-            ListPolynomial(),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 3),
-            "test 5"
-        )
-        assertEquals(
-            ListPolynomial(),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 4),
-            "test 6"
-        )
-        assertEquals(
-            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
-            "test 7"
-        )
-        assertEquals(
-            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
-            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
-            "test 8"
-        )
-        assertEquals(
-            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(0)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthDerivative(RationalField, 2),
-            "test 9"
-        )
-    }
-    @Test
-    fun test_antiderivative() {
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).antiderivative(RationalField),
-            "test 1"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
-            "test 2"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
-            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(0)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).antiderivative(RationalField),
-            "test 4"
-        )
-    }
-    @Test
-    fun test_nthAntiderivative() {
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 1),
-            "test 1"
-        )
-        assertFailsWith<IllegalArgumentException>("test2") {
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, -1)
-        }
-        assertEquals(
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 0),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(1, 2), Rational(-1, 3), Rational(1, 12)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 2),
-            "test 4"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(1, 6), Rational(-1, 12), Rational(1, 60)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 3),
-            "test 5"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 24), Rational(-1, 60), Rational(1, 360)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 4),
-            "test 6"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
-            "test 7"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
-            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
-            "test 8"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28), Rational(0)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthAntiderivative(RationalField, 2),
-            "test 9"
-        )
-    }
-}
\ No newline at end of file
-- 
2.34.1


From a2b02ef09e3b077b11db7023eb82882738ff5aca Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 11 Jun 2022 16:15:59 +0300
Subject: [PATCH 513/713] Sifted rest usage of non-basic polynomial things.

---
 .../kmath/interpolation/Interpolator.kt       |  92 ------------
 .../kmath/interpolation/LinearInterpolator.kt |  43 ------
 .../kmath/interpolation/SplineInterpolator.kt |  83 ----------
 .../kmath/integration/SplineIntegralTest.kt   |  48 ------
 .../interpolation/LinearInterpolatorTest.kt   |  29 ----
 .../interpolation/SplineInterpolatorTest.kt   |  31 ----
 .../kscience/kmath/test/misc/IntModulo.kt     | 142 ------------------
 .../kscience/kmath/test/misc/Rational.kt      | 135 -----------------
 .../test/misc/RationalWithMemorization.kt     | 107 -------------
 .../kscience/kmath/test/misc/memorization.kt  |  51 -------
 .../space/kscience/kmath/test/misc/misc.kt    |  31 ----
 11 files changed, 792 deletions(-)
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
deleted file mode 100644
index 62819be0c..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:OptIn(UnstableKMathAPI::class)
-
-package space.kscience.kmath.interpolation
-
-import space.kscience.kmath.data.XYColumnarData
-import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.asFunction
-import space.kscience.kmath.functions.substitute
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asBuffer
-
-/**
- * And interpolator for data with x column type [X], y column type [Y].
- */
-public fun interface Interpolator<T, in X : T, Y : T> {
-    public fun interpolate(points: XYColumnarData<T, X, Y>): (X) -> Y
-}
-
-/**
- * And interpolator returning [PiecewisePolynomial] function
- */
-public interface PolynomialInterpolator<T : Comparable<T>> : Interpolator<T, T, T> {
-    public val algebra: Ring<T>
-
-    public fun getDefaultValue(): T = error("Out of bounds")
-
-    public fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T>
-
-    override fun interpolate(points: XYColumnarData<T, T, T>): (T) -> T = { x ->
-        interpolatePolynomials(points).substitute(algebra, x) ?: getDefaultValue()
-    }
-}
-
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolatePolynomials(
-    x: Buffer<T>,
-    y: Buffer<T>,
-): PiecewisePolynomial<T> {
-    val pointSet = XYColumnarData.of(x, y)
-    return interpolatePolynomials(pointSet)
-}
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolatePolynomials(
-    data: Map<T, T>,
-): PiecewisePolynomial<T> {
-    val pointSet = XYColumnarData.of(data.keys.toList().asBuffer(), data.values.toList().asBuffer())
-    return interpolatePolynomials(pointSet)
-}
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolatePolynomials(
-    data: List<Pair<T, T>>,
-): PiecewisePolynomial<T> {
-    val pointSet = XYColumnarData.of(data.map { it.first }.asBuffer(), data.map { it.second }.asBuffer())
-    return interpolatePolynomials(pointSet)
-}
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
-    x: Buffer<T>,
-    y: Buffer<T>,
-): (T) -> T? = interpolatePolynomials(x, y).asFunction(algebra)
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
-    data: Map<T, T>,
-): (T) -> T? = interpolatePolynomials(data).asFunction(algebra)
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
-    data: List<Pair<T, T>>,
-): (T) -> T? = interpolatePolynomials(data).asFunction(algebra)
-
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
-    x: Buffer<T>,
-    y: Buffer<T>,
-    defaultValue: T,
-): (T) -> T = interpolatePolynomials(x, y).asFunction(algebra, defaultValue)
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
-    data: Map<T, T>,
-    defaultValue: T,
-): (T) -> T = interpolatePolynomials(data).asFunction(algebra, defaultValue)
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
-    data: List<Pair<T, T>>,
-    defaultValue: T,
-): (T) -> T = interpolatePolynomials(data).asFunction(algebra, defaultValue)
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
deleted file mode 100644
index b55f16cf2..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.interpolation
-
-import space.kscience.kmath.data.XYColumnarData
-import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.ListPolynomial
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.invoke
-
-@OptIn(UnstableKMathAPI::class)
-internal fun <T : Comparable<T>> insureSorted(points: XYColumnarData<*, T, *>) {
-    for (i in 0 until points.size - 1)
-        require(points.x[i + 1] > points.x[i]) { "Input data is not sorted at index $i" }
-}
-
-/**
- * Reference JVM implementation: https://github.com/apache/commons-math/blob/master/src/main/java/org/apache/commons/math4/analysis/interpolation/LinearInterpolator.java
- */
-public class LinearInterpolator<T : Comparable<T>>(override val algebra: Field<T>) : PolynomialInterpolator<T> {
-
-    @OptIn(UnstableKMathAPI::class)
-    override fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T> = algebra {
-        require(points.size > 0) { "Point array should not be empty" }
-        insureSorted(points)
-
-        PiecewisePolynomial(points.x[0]) {
-            for (i in 0 until points.size - 1) {
-                val slope = (points.y[i + 1] - points.y[i]) / (points.x[i + 1] - points.x[i])
-                val const = points.y[i] - slope * points.x[i]
-                val polynomial = ListPolynomial(const, slope)
-                putRight(points.x[i + 1], polynomial)
-            }
-        }
-    }
-}
-
-public val <T : Comparable<T>> Field<T>.linearInterpolator: LinearInterpolator<T>
-    get() = LinearInterpolator(this)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
deleted file mode 100644
index 48c90ff23..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.interpolation
-
-import space.kscience.kmath.data.XYColumnarData
-import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.ListPolynomial
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.MutableBufferFactory
-
-/**
- * Generic spline interpolator. Not recommended for performance critical places, use platform-specific and type
- * specific ones.
- *
- * Based on
- * https://github.com/apache/commons-math/blob/eb57d6d457002a0bb5336d789a3381a24599affe/src/main/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolator.java
- */
-public class SplineInterpolator<T : Comparable<T>>(
-    override val algebra: Field<T>,
-    public val bufferFactory: MutableBufferFactory<T>,
-) : PolynomialInterpolator<T> {
-    //TODO possibly optimize zeroed buffers
-
-    @OptIn(UnstableKMathAPI::class)
-    override fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T> = algebra {
-        require(points.size >= 3) { "Can't use spline interpolator with less than 3 points" }
-        insureSorted(points)
-        // Number of intervals.  The number of data points is n + 1.
-        val n = points.size - 1
-        // Differences between knot points
-        val h = bufferFactory(n) { i -> points.x[i + 1] - points.x[i] }
-        val mu = bufferFactory(n) { zero }
-        val z = bufferFactory(n + 1) { zero }
-
-        for (i in 1 until n) {
-            val g = 2.0 * (points.x[i + 1] - points.x[i - 1]) - h[i - 1] * mu[i - 1]
-            mu[i] = h[i] / g
-            z[i] =
-                ((points.y[i + 1] * h[i - 1] - points.y[i] * (points.x[i + 1] - points.x[i - 1]) + points.y[i - 1] * h[i]) * 3.0 /
-                        (h[i - 1] * h[i]) - h[i - 1] * z[i - 1]) / g
-        }
-
-        // cubic spline coefficients --  b is linear, c quadratic, d is cubic (original y's are constants)
-
-        PiecewisePolynomial(points.x[points.size - 1]) {
-            var cOld = zero
-
-            for (j in n - 1 downTo 0) {
-                val c = z[j] - mu[j] * cOld
-                val a = points.y[j]
-                val b = (points.y[j + 1] - points.y[j]) / h[j] - h[j] * (cOld + 2.0 * c) / 3.0
-                val d = (cOld - c) / (3.0 * h[j])
-                val x0 = points.x[j]
-                val x02 = x0 * x0
-                val x03 = x02 * x0
-                //Shift coefficients to represent absolute polynomial instead of one with an offset
-                val polynomial = ListPolynomial(
-                    a - b * x0 + c * x02 - d * x03,
-                    b - 2 * c * x0 + 3 * d * x02,
-                    c - 3 * d * x0,
-                    d
-                )
-                cOld = c
-                putLeft(x0, polynomial)
-            }
-        }
-    }
-}
-
-
-public fun <T : Comparable<T>> Field<T>.splineInterpolator(
-    bufferFactory: MutableBufferFactory<T>,
-): SplineInterpolator<T> = SplineInterpolator(this, bufferFactory)
-
-public val DoubleField.splineInterpolator: SplineInterpolator<Double>
-    get() = SplineInterpolator(this, ::DoubleBuffer)
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
deleted file mode 100644
index aae0ad017..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.integration
-
-import space.kscience.kmath.functions.ListPolynomial
-import space.kscience.kmath.functions.integrate
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.DoubleField
-import kotlin.math.PI
-import kotlin.math.sin
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-@OptIn(UnstableKMathAPI::class)
-class SplineIntegralTest {
-
-    @Test
-    fun integratePolynomial(){
-        val polynomial = ListPolynomial(1.0, 2.0, 3.0)
-        val integral = polynomial.integrate(DoubleField,1.0..2.0)
-        assertEquals(11.0, integral, 0.001)
-    }
-
-    @Test
-    fun gaussSin() {
-        val res = DoubleField.splineIntegrator.integrate(0.0..2 * PI, IntegrandMaxCalls(5)) { x ->
-            sin(x)
-        }
-        assertEquals(0.0, res.value, 1e-2)
-    }
-
-    @Test
-    fun gaussUniform() {
-        val res = DoubleField.splineIntegrator.integrate(35.0..100.0, IntegrandMaxCalls(20)) { x ->
-            if(x in 30.0..50.0){
-                1.0
-            } else {
-                0.0
-            }
-        }
-        assertEquals(15.0, res.value, 0.5)
-    }
-
-
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
deleted file mode 100644
index 1143036d4..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.interpolation
-
-import space.kscience.kmath.operations.DoubleField
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-internal class LinearInterpolatorTest {
-    @Test
-    fun testInterpolation() {
-        val data = listOf(
-            0.0 to 0.0,
-            1.0 to 1.0,
-            2.0 to 3.0,
-            3.0 to 4.0
-        )
-
-        //val polynomial: PiecewisePolynomial<Double> = DoubleField.linearInterpolator.interpolatePolynomials(data)
-        val function = DoubleField.linearInterpolator.interpolate(data)
-        assertEquals(null, function(-1.0))
-        assertEquals(0.5, function(0.5))
-        assertEquals(2.0, function(1.5))
-        assertEquals(3.0, function(2.0))
-    }
-}
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
deleted file mode 100644
index 4c7d816d4..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.interpolation
-
-import space.kscience.kmath.operations.DoubleField
-import kotlin.math.PI
-import kotlin.math.sin
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-internal class SplineInterpolatorTest {
-    @Test
-    fun testInterpolation() {
-        val data = (0..10).map {
-            val x = it.toDouble() / 5 * PI
-            x to sin(x)
-        }
-
-        //val polynomial: PiecewisePolynomial<Double> = DoubleField.splineInterpolator.interpolatePolynomials(data)
-
-        val function = DoubleField.splineInterpolator.interpolate(data, Double.NaN)
-
-        assertEquals(Double.NaN, function(-1.0))
-        assertEquals(sin(0.5), function(0.5), 0.1)
-        assertEquals(sin(1.5), function(1.5), 0.1)
-        assertEquals(sin(2.0), function(2.0), 0.1)
-    }
-}
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
deleted file mode 100644
index 2353beee6..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-import space.kscience.kmath.functions.ListPolynomial
-import space.kscience.kmath.functions.ListPolynomialSpace
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-
-
-class IntModulo {
-    val residue: Int
-    val modulus: Int
-
-    @PublishedApi
-    internal constructor(residue: Int, modulus: Int, toCheckInput: Boolean = true) {
-        if (toCheckInput) {
-            require(modulus != 0) { "modulus can not be zero" }
-            this.modulus = if (modulus < 0) -modulus else modulus
-            this.residue = residue.mod(modulus)
-        } else {
-            this.residue = residue
-            this.modulus = modulus
-        }
-    }
-
-    constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
-
-    operator fun unaryPlus(): IntModulo = this
-    operator fun unaryMinus(): IntModulo =
-        IntModulo(
-            if (residue == 0) 0 else modulus - residue,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun plus(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not add two residue different modulo" }
-        return IntModulo(
-            (residue + other.residue) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun plus(other: Int): IntModulo =
-        IntModulo(
-            (residue + other) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun minus(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not subtract two residue different modulo" }
-        return IntModulo(
-            (residue - other.residue) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun minus(other: Int): IntModulo =
-        IntModulo(
-            (residue - other) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun times(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not multiply two residue different modulo" }
-        return IntModulo(
-            (residue * other.residue) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun times(other: Int): IntModulo =
-        IntModulo(
-            (residue * other) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun div(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not divide two residue different modulo" }
-        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other.residue, modulus)
-        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
-        return IntModulo(
-            (residue * reciprocalCandidate) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun div(other: Int): IntModulo {
-        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other, modulus)
-        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
-        return IntModulo(
-            (residue * reciprocalCandidate) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    override fun equals(other: Any?): Boolean =
-        when (other) {
-            is IntModulo -> residue == other.residue && modulus == other.modulus
-            else -> false
-        }
-
-    override fun hashCode(): Int = residue.hashCode()
-
-    override fun toString(): String = "$residue mod $modulus"
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-@OptIn(UnstableKMathAPI::class)
-class IntModuloRing : Ring<IntModulo> {
-
-    val modulus: Int
-
-    constructor(modulus: Int) {
-        require(modulus != 0) { "modulus can not be zero" }
-        this.modulus = if (modulus < 0) -modulus else modulus
-    }
-
-    override inline val zero: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
-    override inline val one: IntModulo get() = IntModulo(1, modulus, toCheckInput = false)
-
-    fun number(arg: Int) = IntModulo(arg, modulus, toCheckInput = false)
-
-    override inline fun add(left: IntModulo, right: IntModulo): IntModulo = left + right
-    override inline fun multiply(left: IntModulo, right: IntModulo): IntModulo = left * right
-
-    override inline fun IntModulo.unaryMinus(): IntModulo = -this
-    override inline fun IntModulo.plus(arg: IntModulo): IntModulo = this + arg
-    override inline fun IntModulo.minus(arg: IntModulo): IntModulo = this - arg
-    override inline fun IntModulo.times(arg: IntModulo): IntModulo = this * arg
-    inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
-}
-
-fun ListPolynomialSpace<IntModulo, IntModuloRing>.number(arg: Int) = IntModulo(arg, ring.modulus, toCheckInput = false)
-
-fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
-    ListPolynomial(coefs.map { IntModulo(it, ring.modulus) })
-fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
-    ListPolynomial(coefs.map { IntModulo(it, modulus) })
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
deleted file mode 100644
index 72bb5942c..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.NumbersAddOps
-
-class Rational {
-    companion object {
-        val ZERO: Rational = Rational(0L)
-        val ONE: Rational = Rational(1L)
-    }
-
-    val numerator: Long
-    val denominator: Long
-
-    internal constructor(numerator: Long, denominator: Long, toCheckInput: Boolean = true) {
-        if (toCheckInput) {
-            if (denominator == 0L) throw ArithmeticException("/ by zero")
-
-            val greatestCommonDivider = gcd(numerator, denominator).let { if (denominator < 0L) -it else it }
-
-            this.numerator = numerator / greatestCommonDivider
-            this.denominator = denominator / greatestCommonDivider
-        } else {
-            this.numerator = numerator
-            this.denominator = denominator
-        }
-    }
-
-    constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
-    constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
-    constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
-    constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
-    constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
-    constructor(numerator: Long) : this(numerator, 1L, false)
-
-    operator fun unaryPlus(): Rational = this
-    operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
-    operator fun plus(other: Rational): Rational =
-        Rational(
-            numerator * other.denominator + denominator * other.numerator,
-            denominator * other.denominator
-        )
-    operator fun plus(other: Int): Rational =
-        Rational(
-            numerator + denominator * other.toLong(),
-            denominator
-        )
-    operator fun plus(other: Long): Rational =
-        Rational(
-            numerator + denominator * other,
-            denominator
-        )
-    operator fun minus(other: Rational): Rational =
-        Rational(
-            numerator * other.denominator - denominator * other.numerator,
-            denominator * other.denominator
-        )
-    operator fun minus(other: Int): Rational =
-        Rational(
-            numerator - denominator * other.toLong(),
-            denominator
-        )
-    operator fun minus(other: Long): Rational =
-        Rational(
-            numerator - denominator * other,
-            denominator
-        )
-    operator fun times(other: Rational): Rational =
-        Rational(
-            numerator * other.numerator,
-            denominator * other.denominator
-        )
-    operator fun times(other: Int): Rational =
-        Rational(
-            numerator * other.toLong(),
-            denominator
-        )
-    operator fun times(other: Long): Rational =
-        Rational(
-            numerator * other,
-            denominator
-        )
-    operator fun div(other: Rational): Rational =
-        Rational(
-            numerator * other.denominator,
-            denominator * other.numerator
-        )
-    operator fun div(other: Int): Rational =
-        Rational(
-            numerator,
-            denominator * other.toLong()
-        )
-    operator fun div(other: Long): Rational =
-        Rational(
-            numerator,
-            denominator * other
-        )
-    override fun equals(other: Any?): Boolean =
-        when (other) {
-            is Rational -> numerator == other.numerator && denominator == other.denominator
-            is Int -> numerator == other && denominator == 1L
-            is Long -> numerator == other && denominator == 1L
-            else -> false
-        }
-
-    override fun hashCode(): Int = 31 * numerator.hashCode() + denominator.hashCode()
-
-    override fun toString(): String = if (denominator == 1L) "$numerator" else "$numerator/$denominator"
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-@OptIn(UnstableKMathAPI::class)
-object RationalField : Field<Rational>, NumbersAddOps<Rational> {
-    override inline val zero: Rational get() = Rational.ZERO
-    override inline val one: Rational get() = Rational.ONE
-
-    override inline fun number(value: Number): Rational = Rational(value.toLong())
-
-    override inline fun add(left: Rational, right: Rational): Rational = left + right
-    override inline fun multiply(left: Rational, right: Rational): Rational = left * right
-    override inline fun divide(left: Rational, right: Rational): Rational = left / right
-    override inline fun scale(a: Rational, value: Double): Rational = a * number(value)
-
-    override inline fun Rational.unaryMinus(): Rational = -this
-    override inline fun Rational.plus(arg: Rational): Rational = this + arg
-    override inline fun Rational.minus(arg: Rational): Rational = this - arg
-    override inline fun Rational.times(arg: Rational): Rational = this * arg
-    override inline fun Rational.div(arg: Rational): Rational = this / arg
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
deleted file mode 100644
index 05d9115fa..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-
-class RationalWithMemorization private constructor(
-    val value: Rational,
-    override val memory : OperationsMemory
-): WithMemorization {
-    companion object {
-        /**
-         * Constant containing the zero (the additive identity) of the [Rational] field.
-         */
-        public val ZERO: RationalWithMemorization = RationalWithMemorization(Rational.ZERO, object : Endpoint {})
-        /**
-         * Constant containing the one (the multiplicative identity) of the [Rational] field.
-         */
-        public val ONE: RationalWithMemorization = RationalWithMemorization(Rational.ONE, object : Endpoint {})
-    }
-    constructor(numerator: Int, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
-    constructor(numerator: Int, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
-    constructor(numerator: Long, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
-    constructor(numerator: Long, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
-    constructor(numerator: Int) : this(Rational(numerator), object : Endpoint {})
-    constructor(numerator: Long) : this(Rational(numerator), object : Endpoint {})
-
-    operator fun unaryPlus(): RationalWithMemorization = this
-    operator fun unaryMinus(): RationalWithMemorization = RationalWithMemorization(
-        -value,
-        object : Negation {
-            override val negated: OperationsMemory = memory
-        }
-    )
-    operator fun plus(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
-        value + other.value,
-        object : Sum {
-            override val augend: OperationsMemory = memory
-            override val addend: OperationsMemory = other.memory
-        }
-    )
-    operator fun minus(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
-        value - other.value,
-        object : Difference {
-            override val minuend: OperationsMemory = memory
-            override val subtrahend: OperationsMemory = other.memory
-        }
-    )
-    operator fun times(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
-        value * other.value,
-        object : Product {
-            override val multiplicand: OperationsMemory = memory
-            override val multiplier: OperationsMemory = other.memory
-        }
-    )
-    operator fun div(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
-        value / other.value,
-        object : Quotient {
-            override val dividend: OperationsMemory = memory
-            override val divisor: OperationsMemory = other.memory
-        }
-    )
-
-    override fun equals(other: Any?): Boolean =
-        other is RationalWithMemorization && value == other.value
-
-    override fun hashCode(): Int = value.hashCode()
-
-    override fun toString(): String = value.toString()
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-object RationalWithMemorizationRing : Ring<RationalWithMemorization> {
-    override inline val zero: RationalWithMemorization get() = RationalWithMemorization.ZERO
-    override inline val one: RationalWithMemorization get() = RationalWithMemorization.ONE
-
-    override inline fun add(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left + right
-    override inline fun multiply(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left * right
-
-    override inline fun RationalWithMemorization.unaryMinus(): RationalWithMemorization = -this
-    override inline fun RationalWithMemorization.plus(arg: RationalWithMemorization): RationalWithMemorization = this + arg
-    override inline fun RationalWithMemorization.minus(arg: RationalWithMemorization): RationalWithMemorization = this - arg
-    override inline fun RationalWithMemorization.times(arg: RationalWithMemorization): RationalWithMemorization = this * arg
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-object RationalWithMemorizationField : Field<RationalWithMemorization> {
-    override inline val zero: RationalWithMemorization get() = RationalWithMemorization.ZERO
-    override inline val one: RationalWithMemorization get() = RationalWithMemorization.ONE
-
-    override inline fun number(value: Number): RationalWithMemorization = RationalWithMemorization(value.toLong())
-
-    override inline fun add(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left + right
-    override inline fun multiply(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left * right
-    override inline fun divide(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left / right
-    override inline fun scale(a: RationalWithMemorization, value: Double): RationalWithMemorization = a * number(value)
-
-    override inline fun RationalWithMemorization.unaryMinus(): RationalWithMemorization = -this
-    override inline fun RationalWithMemorization.plus(arg: RationalWithMemorization): RationalWithMemorization = this + arg
-    override inline fun RationalWithMemorization.minus(arg: RationalWithMemorization): RationalWithMemorization = this - arg
-    override inline fun RationalWithMemorization.times(arg: RationalWithMemorization): RationalWithMemorization = this * arg
-    override inline fun RationalWithMemorization.div(arg: RationalWithMemorization): RationalWithMemorization = this / arg
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt
deleted file mode 100644
index a4fb81274..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-sealed interface OperationsMemory
-
-interface Endpoint: OperationsMemory
-
-interface Negation: OperationsMemory {
-    val negated: OperationsMemory
-}
-
-interface Sum: OperationsMemory {
-    val augend: OperationsMemory
-    val addend: OperationsMemory
-}
-
-interface Difference: OperationsMemory {
-    val minuend: OperationsMemory
-    val subtrahend: OperationsMemory
-}
-
-interface Product: OperationsMemory {
-    val multiplicand: OperationsMemory
-    val multiplier: OperationsMemory
-}
-
-interface Quotient: OperationsMemory {
-    val dividend: OperationsMemory
-    val divisor: OperationsMemory
-}
-
-
-fun equalMemories(one: OperationsMemory, other: OperationsMemory) : Boolean =
-    when(one) {
-        is Negation -> other is Negation && equalMemories(one.negated, other.negated)
-        is Sum -> other is Sum && equalMemories(one.augend, other.augend) && equalMemories(one.addend, other.addend)
-        is Difference -> other is Difference && equalMemories(one.minuend, other.minuend) && equalMemories(one.subtrahend, other.subtrahend)
-        is Product -> other is Product && equalMemories(one.multiplicand, other.multiplicand) && equalMemories(one.multiplier, other.multiplier)
-        is Quotient -> other is Quotient && equalMemories(one.dividend, other.dividend) && equalMemories(one.divisor, other.divisor)
-        is Endpoint -> one === other
-    }
-
-interface WithMemorization {
-    val memory: OperationsMemory
-}
-
-fun equalMemories(one: WithMemorization, other: WithMemorization) : Boolean = equalMemories(one.memory, other.memory)
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
deleted file mode 100644
index cc647fa2c..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-// TODO: Move to corresponding module "kmath-number-theory"
-
-import kotlin.math.abs
-
-
-data class BezoutIdentityWithGCD<T>(val first: T, val second: T, val gcd: T)
-
-tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
-
-fun bezoutIdentityWithGCD(a: Int, b: Int): BezoutIdentityWithGCD<Int> =
-    when {
-        a < 0 && b < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, -second, gcd) }
-        a < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, second, gcd) }
-        b < 0 -> with(bezoutIdentityWithGCDInternalLogic(a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(first, -second, gcd) }
-        else -> bezoutIdentityWithGCDInternalLogic(a, b, 1, 0, 0, 1)
-    }
-
-internal tailrec fun bezoutIdentityWithGCDInternalLogic(a: Int, b: Int, m1: Int, m2: Int, m3: Int, m4: Int): BezoutIdentityWithGCD<Int> =
-    if (b == 0) BezoutIdentityWithGCD(m1, m3, a)
-    else {
-        val quotient = a / b
-        val reminder = a % b
-        bezoutIdentityWithGCDInternalLogic(b, reminder, m2, m1 - quotient * m2, m4, m3 - quotient * m4)
-    }
\ No newline at end of file
-- 
2.34.1


From 8af183a969e2099cea5d3c293be319e7aa1b0080 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 11 Jun 2022 19:22:57 +0300
Subject: [PATCH 514/713] Fixed typos. Added docstrings. Added variable
 convertional methods.

---
 .../kscience/kmath/functions/Polynomial.kt    | 150 ++++--
 .../kmath/functions/RationalFunction.kt       | 467 +++++++++++++-----
 2 files changed, 468 insertions(+), 149 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index e201f1f6e..f2eba10d5 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -25,38 +25,38 @@ public interface Polynomial<C>
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
 public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public operator fun C.plus(other: Int): C
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public operator fun C.minus(other: Int): C
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun C.times(other: Int): C
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public operator fun Int.plus(other: C): C
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public operator fun Int.minus(other: C): C
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -72,38 +72,38 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     public fun Int.asConstant(): C = constantNumber(this)
 
     /**
-     * Returns sum of the polynomial and the integer represented as polynomial.
+     * Returns sum of the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public operator fun P.plus(other: Int): P = addMultipliedByDoubling(this, one, other)
     /**
-     * Returns difference between the polynomial and the integer represented as polynomial.
+     * Returns difference between the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public operator fun P.minus(other: Int): P = addMultipliedByDoubling(this, one, -other)
     /**
-     * Returns product of the polynomial and the integer represented as polynomial.
+     * Returns product of the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun P.times(other: Int): P = multiplyByDoubling(this, other)
 
     /**
-     * Returns sum of the integer represented as polynomial and the polynomial.
+     * Returns sum of the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public operator fun Int.plus(other: P): P = addMultipliedByDoubling(other, one, this)
     /**
-     * Returns difference between the integer represented as polynomial and the polynomial.
+     * Returns difference between the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public operator fun Int.minus(other: P): P = addMultipliedByDoubling(-other, one, this)
     /**
-     * Returns product of the integer represented as polynomial and the polynomial.
+     * Returns product of the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -165,28 +165,28 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     public val constantOne: C
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.plus(other: P): P
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.minus(other: P): P
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.times(other: P): P
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.plus(other: C): P
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.minus(other: C): P
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.times(other: C): P
 
@@ -254,41 +254,44 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : PolynomialSpace<C, P> {
 
+    /**
+     * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
+     */
     public val ring: A
 
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -330,58 +333,143 @@ public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : Poly
     public override val constantOne: C get() = ring.one
 }
 
+/**
+ * Abstraction of ring of polynomials of type [P] of variables of type [V] and over ring of constants of type [C].
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param V the type of variables. Polynomials have them in representations of terms.
+ * @param P the type of polynomials.
+ */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface MultivariatePolynomialSpace<C, V, P: Polynomial<C>>: PolynomialSpace<C, P> {
+    /**
+     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("plusVariableInt")
     public operator fun V.plus(other: Int): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("minusVariableInt")
     public operator fun V.minus(other: Int): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("timesVariableInt")
     public operator fun V.times(other: Int): P
 
+    /**
+     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusIntVariable")
     public operator fun Int.plus(other: V): P
+    /**
+     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusIntVariable")
     public operator fun Int.minus(other: V): P
+    /**
+     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesIntVariable")
     public operator fun Int.times(other: V): P
 
-    @JvmName("plusConstantVariable")
-    public operator fun C.plus(other: V): P
-    @JvmName("minusConstantVariable")
-    public operator fun C.minus(other: V): P
-    @JvmName("timesConstantVariable")
-    public operator fun C.times(other: V): P
-
+    /**
+     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("plusVariableConstant")
     public operator fun V.plus(other: C): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("minusVariableConstant")
     public operator fun V.minus(other: C): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("timesVariableConstant")
     public operator fun V.times(other: C): P
 
+    /**
+     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("plusConstantVariable")
+    public operator fun C.plus(other: V): P
+    /**
+     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("minusConstantVariable")
+    public operator fun C.minus(other: V): P
+    /**
+     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("timesConstantVariable")
+    public operator fun C.times(other: V): P
+
+    /**
+     * Represents the variable as a monic monomial.
+     */
     @JvmName("unaryPlusVariable")
     public operator fun V.unaryPlus(): P
+    /**
+     * Returns negation of representation of the variable as a monic monomial.
+     */
     @JvmName("unaryMinusVariable")
     public operator fun V.unaryMinus(): P
+    /**
+     * Returns sum of the variables represented as monic monomials.
+     */
     @JvmName("plusVariableVariable")
     public operator fun V.plus(other: V): P
+    /**
+     * Returns difference between the variables represented as monic monomials.
+     */
     @JvmName("minusVariableVariable")
     public operator fun V.minus(other: V): P
+    /**
+     * Returns product of the variables represented as monic monomials.
+     */
     @JvmName("timesVariableVariable")
     public operator fun V.times(other: V): P
 
+    /**
+     * Represents the [variable] as a monic monomial.
+     */
+    public fun number(variable: V): P = +variable
+    /**
+     * Represents the variable as a monic monomial.
+     */
+    public fun V.asPolynomial(): P = number(this)
+
+    /**
+     * Returns sum of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("plusVariablePolynomial")
     public operator fun V.plus(other: P): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("minusVariablePolynomial")
     public operator fun V.minus(other: P): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("timesVariablePolynomial")
     public operator fun V.times(other: P): P
 
+    /**
+     * Returns sum of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusPolynomialVariable")
     public operator fun P.plus(other: V): P
+    /**
+     * Returns difference between the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusPolynomialVariable")
     public operator fun P.minus(other: V): P
+    /**
+     * Returns product of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesPolynomialVariable")
     public operator fun P.times(other: V): P
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index dfec126f3..edc9dfa5c 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -25,44 +25,44 @@ public interface RationalFunction<C, P: Polynomial<C>> {
  * [C].
  *
  * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators.
  * @param R the type of rational functions.
  */
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
 public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunction<C, P>> : Ring<R> {
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public operator fun C.plus(other: Int): C
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public operator fun C.minus(other: Int): C
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun C.times(other: Int): C
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public operator fun Int.plus(other: C): C
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public operator fun Int.minus(other: C): C
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -78,38 +78,38 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public fun Int.asConstant(): C = constantNumber(this)
 
     /**
-     * Returns sum of the constant and the integer represented as polynomial.
+     * Returns sum of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public operator fun P.plus(other: Int): P
     /**
-     * Returns difference between the constant and the integer represented as polynomial.
+     * Returns difference between the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public operator fun P.minus(other: Int): P
     /**
-     * Returns product of the constant and the integer represented as polynomial.
+     * Returns product of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun P.times(other: Int): P
 
     /**
-     * Returns sum of the integer represented as polynomial and the constant.
+     * Returns sum of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public operator fun Int.plus(other: P): P
     /**
-     * Returns difference between the integer represented as polynomial and the constant.
+     * Returns difference between the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public operator fun Int.minus(other: P): P
     /**
-     * Returns product of the integer represented as polynomial and the constant.
+     * Returns product of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -125,25 +125,25 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public fun Int.asPolynomial(): P = polynomialNumber(this)
 
     /**
-     * Returns sum of the rational function and the integer represented as rational function.
+     * Returns sum of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public operator fun R.plus(other: Int): R = addMultipliedByDoubling(this, one, other)
     /**
-     * Returns difference between the rational function and the integer represented as rational function.
+     * Returns difference between the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public operator fun R.minus(other: Int): R = addMultipliedByDoubling(this, one, -other)
     /**
-     * Returns product of the rational function and the integer represented as rational function.
+     * Returns product of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun R.times(other: Int): R = multiplyByDoubling(this, other)
     /**
-     * Returns quotient of the rational function and the integer represented as rational function.
+     * Returns quotient of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to creating a new rational function by preserving numerator of [this] and
      * multiplication denominator of [this] to [other].
@@ -151,25 +151,25 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public operator fun R.div(other: Int): R = this / multiplyByDoubling(one, other)
 
     /**
-     * Returns sum of the integer represented as rational function and the rational function.
+     * Returns sum of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public operator fun Int.plus(other: R): R = addMultipliedByDoubling(other, one, this)
     /**
-     * Returns difference between the integer represented as rational function and the rational function.
+     * Returns difference between the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public operator fun Int.minus(other: R): R = addMultipliedByDoubling(-other, one, this)
     /**
-     * Returns product of the integer represented as rational function and the rational function.
+     * Returns product of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public operator fun Int.times(other: R): R = multiplyByDoubling(other, this)
     /**
-     * Returns quotient of the integer represented as rational function and the rational function.
+     * Returns quotient of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to creating a new rational function which numerator is [this] times denominator of
      * [other] and which denominator is [other]'s numerator.
@@ -232,28 +232,28 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public val constantOne: C
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.plus(other: P): P
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.minus(other: P): P
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.times(other: P): P
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.plus(other: C): P
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.minus(other: C): P
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.times(other: C): P
 
@@ -305,36 +305,36 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public val polynomialOne: P
 
     /**
-     * Returns sum of the constant represented as rational function and the rational function.
+     * Returns sum of the constant represented as a rational function and the rational function.
      */
     public operator fun C.plus(other: R): R
     /**
-     * Returns difference between the constant represented as polynomial and the rational function.
+     * Returns difference between the constant represented as a polynomial and the rational function.
      */
     public operator fun C.minus(other: R): R
     /**
-     * Returns product of the constant represented as polynomial and the rational function.
+     * Returns product of the constant represented as a polynomial and the rational function.
      */
     public operator fun C.times(other: R): R
     /**
-     * Returns quotient of the constant represented as polynomial and the rational function.
+     * Returns quotient of the constant represented as a polynomial and the rational function.
      */
     public operator fun C.div(other: R): R
 
     /**
-     * Returns sum of the rational function and the constant represented as rational function.
+     * Returns sum of the rational function and the constant represented as a rational function.
      */
     public operator fun R.plus(other: C): R
     /**
-     * Returns difference between the rational function and the constant represented as rational function.
+     * Returns difference between the rational function and the constant represented as a rational function.
      */
     public operator fun R.minus(other: C): R
     /**
-     * Returns product of the rational function and the constant represented as rational function.
+     * Returns product of the rational function and the constant represented as a rational function.
      */
     public operator fun R.times(other: C): R
     /**
-     * Returns quotient of the rational function and the constant represented as rational function.
+     * Returns quotient of the rational function and the constant represented as a rational function.
      */
     public operator fun R.div(other: C): R
 
@@ -348,36 +348,36 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public fun C.asRationalFunction(): R = number(this)
 
     /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
+     * Returns sum of the polynomial represented as a rational function and the rational function.
      */
     public operator fun P.plus(other: R): R
     /**
-     * Returns difference between the polynomial represented as polynomial and the rational function.
+     * Returns difference between the polynomial represented as a polynomial and the rational function.
      */
     public operator fun P.minus(other: R): R
     /**
-     * Returns product of the polynomial represented as polynomial and the rational function.
+     * Returns product of the polynomial represented as a polynomial and the rational function.
      */
     public operator fun P.times(other: R): R
     /**
-     * Returns quotient of the polynomial represented as polynomial and the rational function.
+     * Returns quotient of the polynomial represented as a polynomial and the rational function.
      */
     public operator fun P.div(other: R): R
 
     /**
-     * Returns sum of the rational function and the polynomial represented as rational function.
+     * Returns sum of the rational function and the polynomial represented as a rational function.
      */
     public operator fun R.plus(other: P): R
     /**
-     * Returns difference between the rational function and the polynomial represented as rational function.
+     * Returns difference between the rational function and the polynomial represented as a rational function.
      */
     public operator fun R.minus(other: P): R
     /**
-     * Returns product of the rational function and the polynomial represented as rational function.
+     * Returns product of the rational function and the polynomial represented as a rational function.
      */
     public operator fun R.times(other: P): R
     /**
-     * Returns quotient of the rational function and the polynomial represented as rational function.
+     * Returns quotient of the rational function and the polynomial represented as a rational function.
      */
     public operator fun R.div(other: P): R
 
@@ -459,43 +459,51 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
  * @param A the type of algebraic structure (precisely, of ring) provided for constants.
  */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface RationalFunctionalSpaceOverRing<C, P: Polynomial<C>, R: RationalFunction<C, P>, A: Ring<C>> : RationalFunctionalSpace<C, P, R> {
+public interface RationalFunctionalSpaceOverRing<
+        C,
+        P: Polynomial<C>,
+        R: RationalFunction<C, P>,
+        A: Ring<C>
+        > : RationalFunctionalSpace<C, P, R> {
 
+    /**
+     * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
+     */
     public val ring: A
 
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -560,41 +568,44 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
         AP: PolynomialSpace<C, P>,
         > : RationalFunctionalSpace<C, P, R> {
 
+    /**
+     * Underlying polynomial ring. Its polynomial operations are inherited by local polynomial operations.
+     */
     public val polynomialRing: AP
 
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public override operator fun C.plus(other: Int): C = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public override operator fun C.minus(other: Int): C = polynomialRing { this@minus - other }
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun C.times(other: Int): C = polynomialRing { this@times * other }
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public override operator fun Int.plus(other: C): C = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public override operator fun Int.minus(other: C): C = polynomialRing { this@minus - other }
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -610,38 +621,38 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
     override fun Int.asConstant(): C = polynomialRing { asConstant() }
 
     /**
-     * Returns sum of the constant and the integer represented as polynomial.
+     * Returns sum of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public override operator fun P.plus(other: Int): P = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the constant and the integer represented as polynomial.
+     * Returns difference between the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public override operator fun P.minus(other: Int): P = polynomialRing { this@minus - other }
     /**
-     * Returns product of the constant and the integer represented as polynomial.
+     * Returns product of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun P.times(other: Int): P = polynomialRing { this@times * other }
 
     /**
-     * Returns sum of the integer represented as polynomial and the constant.
+     * Returns sum of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public override operator fun Int.plus(other: P): P = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the integer represented as polynomial and the constant.
+     * Returns difference between the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public override operator fun Int.minus(other: P): P = polynomialRing { this@minus - other }
     /**
-     * Returns product of the integer represented as polynomial and the constant.
+     * Returns product of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -697,28 +708,28 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
     public override val constantOne: C get() = polynomialRing.constantOne
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.plus(other: P): P = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.minus(other: P): P = polynomialRing { this@minus - other }
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.times(other: P): P = polynomialRing { this@times * other }
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun P.plus(other: C): P = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public override operator fun P.minus(other: C): P = polynomialRing { this@minus - other }
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun P.times(other: C): P = polynomialRing { this@times * other }
 
@@ -774,7 +785,8 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
 
 /**
  * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
- * [C]. It also assumes that there is provided constructor
+ * [C]. It also assumes that there is provided constructor [constructRationalFunction] of rational functions from
+ * polynomial numerator and denominator.
  *
  * @param C the type of constants. Polynomials have them as coefficients in their terms.
  * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
@@ -786,10 +798,14 @@ public abstract class PolynomialSpaceOfFractions<
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         > : RationalFunctionalSpace<C, P, R> {
+
+    /**
+     * Constructor of rational functions (of type [R]) from numerator and denominator (of type [P]).
+     */
     protected abstract fun constructRationalFunction(numerator: P, denominator: P = polynomialOne) : R
 
     /**
-     * Returns sum of the rational function and the integer represented as rational function.
+     * Returns sum of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
@@ -799,7 +815,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns difference between the rational function and the integer represented as rational function.
+     * Returns difference between the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
@@ -809,7 +825,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns product of the rational function and the integer represented as rational function.
+     * Returns product of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
@@ -826,7 +842,7 @@ public abstract class PolynomialSpaceOfFractions<
         )
 
     /**
-     * Returns sum of the integer represented as rational function and the rational function.
+     * Returns sum of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
@@ -836,7 +852,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns difference between the integer represented as rational function and the rational function.
+     * Returns difference between the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
@@ -846,7 +862,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns product of the integer represented as rational function and the rational function.
+     * Returns product of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -873,7 +889,7 @@ public abstract class PolynomialSpaceOfFractions<
     public override operator fun P.div(other: P): R = constructRationalFunction(this, other)
 
     /**
-     * Returns sum of the constant represented as rational function and the rational function.
+     * Returns sum of the constant represented as a rational function and the rational function.
      */
     public override operator fun C.plus(other: R): R =
         constructRationalFunction(
@@ -881,7 +897,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns difference between the constant represented as polynomial and the rational function.
+     * Returns difference between the constant represented as a polynomial and the rational function.
      */
     public override operator fun C.minus(other: R): R =
         constructRationalFunction(
@@ -889,7 +905,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns product of the constant represented as polynomial and the rational function.
+     * Returns product of the constant represented as a polynomial and the rational function.
      */
     public override operator fun C.times(other: R): R =
         constructRationalFunction(
@@ -904,7 +920,7 @@ public abstract class PolynomialSpaceOfFractions<
         )
 
     /**
-     * Returns sum of the constant represented as rational function and the rational function.
+     * Returns sum of the constant represented as a rational function and the rational function.
      */
     public override operator fun R.plus(other: C): R =
         constructRationalFunction(
@@ -912,7 +928,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns difference between the constant represented as rational function and the rational function.
+     * Returns difference between the constant represented as a rational function and the rational function.
      */
     public override operator fun R.minus(other: C): R =
         constructRationalFunction(
@@ -920,7 +936,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns product of the constant represented as rational function and the rational function.
+     * Returns product of the constant represented as a rational function and the rational function.
      */
     public override operator fun R.times(other: C): R =
         constructRationalFunction(
@@ -940,7 +956,7 @@ public abstract class PolynomialSpaceOfFractions<
     public override fun number(value: C): R = constructRationalFunction(polynomialNumber(value))
 
     /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
+     * Returns sum of the polynomial represented as a rational function and the rational function.
      */
     public override operator fun P.plus(other: R): R =
         constructRationalFunction(
@@ -948,7 +964,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns difference between the polynomial represented as polynomial and the rational function.
+     * Returns difference between the polynomial represented as a polynomial and the rational function.
      */
     public override operator fun P.minus(other: R): R =
         constructRationalFunction(
@@ -956,7 +972,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns product of the polynomial represented as polynomial and the rational function.
+     * Returns product of the polynomial represented as a polynomial and the rational function.
      */
     public override operator fun P.times(other: R): R =
         constructRationalFunction(
@@ -971,7 +987,7 @@ public abstract class PolynomialSpaceOfFractions<
         )
 
     /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
+     * Returns sum of the polynomial represented as a rational function and the rational function.
      */
     public override operator fun R.plus(other: P): R =
         constructRationalFunction(
@@ -979,7 +995,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns difference between the polynomial represented as rational function and the rational function.
+     * Returns difference between the polynomial represented as a rational function and the rational function.
      */
     public override operator fun R.minus(other: P): R =
         constructRationalFunction(
@@ -987,7 +1003,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns product of the polynomial represented as rational function and the rational function.
+     * Returns product of the polynomial represented as a rational function and the rational function.
      */
     public override operator fun R.times(other: P): R =
         constructRationalFunction(
@@ -1052,6 +1068,15 @@ public abstract class PolynomialSpaceOfFractions<
     public override val one: R get() = constructRationalFunction(polynomialOne)
 }
 
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] of variables of type
+ * [V] and over ring of constants of type [C].
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param V the type of variables. Polynomials have them in representations of terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface MultivariateRationalFunctionalSpace<
         C,
@@ -1059,70 +1084,175 @@ public interface MultivariateRationalFunctionalSpace<
         P: Polynomial<C>,
         R: RationalFunction<C, P>
         >: RationalFunctionalSpace<C, P, R> {
+    /**
+     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("plusVariableInt")
     public operator fun V.plus(other: Int): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("minusVariableInt")
     public operator fun V.minus(other: Int): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("timesVariableInt")
     public operator fun V.times(other: Int): P
 
+    /**
+     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusIntVariable")
     public operator fun Int.plus(other: V): P
+    /**
+     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusIntVariable")
     public operator fun Int.minus(other: V): P
+    /**
+     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesIntVariable")
     public operator fun Int.times(other: V): P
 
-    @JvmName("plusConstantVariable")
-    public operator fun C.plus(other: V): P
-    @JvmName("minusConstantVariable")
-    public operator fun C.minus(other: V): P
-    @JvmName("timesConstantVariable")
-    public operator fun C.times(other: V): P
-
+    /**
+     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("plusVariableConstant")
     public operator fun V.plus(other: C): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("minusVariableConstant")
     public operator fun V.minus(other: C): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("timesVariableConstant")
     public operator fun V.times(other: C): P
 
+    /**
+     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("plusConstantVariable")
+    public operator fun C.plus(other: V): P
+    /**
+     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("minusConstantVariable")
+    public operator fun C.minus(other: V): P
+    /**
+     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("timesConstantVariable")
+    public operator fun C.times(other: V): P
+
+    /**
+     * Represents the variable as a monic monomial.
+     */
     @JvmName("unaryPlusVariable")
     public operator fun V.unaryPlus(): P
+    /**
+     * Returns negation of representation of the variable as a monic monomial.
+     */
     @JvmName("unaryMinusVariable")
     public operator fun V.unaryMinus(): P
+    /**
+     * Returns sum of the variables represented as monic monomials.
+     */
     @JvmName("plusVariableVariable")
     public operator fun V.plus(other: V): P
+    /**
+     * Returns difference between the variables represented as monic monomials.
+     */
     @JvmName("minusVariableVariable")
     public operator fun V.minus(other: V): P
+    /**
+     * Returns product of the variables represented as monic monomials.
+     */
     @JvmName("timesVariableVariable")
     public operator fun V.times(other: V): P
 
+    /**
+     * Represents the [variable] as a monic monomial.
+     */
+    public fun polynomialNumber(variable: V): P = +variable
+    /**
+     * Represents the variable as a monic monomial.
+     */
+    public fun V.asPolynomial(): P = polynomialNumber(this)
+
+    /**
+     * Represents the [variable] as a rational function.
+     */
+    public fun number(variable: V): R = number(polynomialNumber(variable))
+    /**
+     * Represents the variable as a rational function.
+     */
+    public fun V.asRationalFunction(): R = number(this)
+
+    /**
+     * Returns sum of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("plusVariablePolynomial")
     public operator fun V.plus(other: P): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("minusVariablePolynomial")
     public operator fun V.minus(other: P): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("timesVariablePolynomial")
     public operator fun V.times(other: P): P
 
+    /**
+     * Returns sum of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusPolynomialVariable")
     public operator fun P.plus(other: V): P
+    /**
+     * Returns difference between the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusPolynomialVariable")
     public operator fun P.minus(other: V): P
+    /**
+     * Returns product of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesPolynomialVariable")
     public operator fun P.times(other: V): P
 
+    /**
+     * Returns sum of the variable represented as a rational function and the rational function.
+     */
     @JvmName("plusVariableRational")
     public operator fun V.plus(other: R): R
+    /**
+     * Returns difference between the variable represented as a rational function and the rational function.
+     */
     @JvmName("minusVariableRational")
     public operator fun V.minus(other: R): R
+    /**
+     * Returns product of the variable represented as a rational function and the rational function.
+     */
     @JvmName("timesVariableRational")
     public operator fun V.times(other: R): R
 
+    /**
+     * Returns sum of the rational function and the variable represented as a rational function.
+     */
     @JvmName("plusRationalVariable")
     public operator fun R.plus(other: V): R
+    /**
+     * Returns difference between the rational function and the variable represented as a rational function.
+     */
     @JvmName("minusRationalVariable")
     public operator fun R.minus(other: V): R
+    /**
+     * Returns product of the rational function and the variable represented as a rational function.
+     */
     @JvmName("timesRationalVariable")
     public operator fun R.times(other: V): R
 
@@ -1161,22 +1291,17 @@ public interface MultivariateRationalFunctionalSpace<
     public val R.countOfVariables: Int get() = variables.size
 }
 
-public interface MultivariateRationalFunctionalSpaceOverRing<
-        C,
-        V,
-        P: Polynomial<C>,
-        R: RationalFunction<C, P>,
-        A: Ring<C>
-        > : RationalFunctionalSpaceOverRing<C, P, R, A>, MultivariateRationalFunctionalSpace<C, V, P, R>
-
-public interface MultivariateRationalFunctionalSpaceOverPolynomialSpace<
-        C,
-        V,
-        P: Polynomial<C>,
-        R: RationalFunction<C, P>,
-        AP: PolynomialSpace<C, P>,
-        > : RationalFunctionalSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionalSpace<C, V, P, R>
-
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] of variables of type
+ * [V] and over ring of constants of type [C]. It also assumes that there is provided [polynomialRing] (of type [AP]),
+ * that provides constant-, variable- and polynomial-wise operations.
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param V the type of variables. Polynomials have them in representations of terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
+ */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSpace<
         C,
@@ -1184,57 +1309,135 @@ public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSp
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         AP: MultivariatePolynomialSpace<C, V, P>,
-        > : MultivariateRationalFunctionalSpaceOverPolynomialSpace<C, V, P, R, AP> {
+        > : RationalFunctionalSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionalSpace<C, V, P, R> {
+    /**
+     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("plusVariableInt")
     public override operator fun V.plus(other: Int): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("minusVariableInt")
     public override operator fun V.minus(other: Int): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("timesVariableInt")
     public override operator fun V.times(other: Int): P = polynomialRing { this@times * other }
 
+    /**
+     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusIntVariable")
     public override operator fun Int.plus(other: V): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusIntVariable")
     public override operator fun Int.minus(other: V): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesIntVariable")
     public override operator fun Int.times(other: V): P = polynomialRing { this@times * other }
 
-    @JvmName("plusConstantVariable")
-    public override operator fun C.plus(other: V): P = polynomialRing { this@plus + other }
-    @JvmName("minusConstantVariable")
-    public override operator fun C.minus(other: V): P = polynomialRing { this@minus - other }
-    @JvmName("timesConstantVariable")
-    public override operator fun C.times(other: V): P = polynomialRing { this@times * other }
-
+    /**
+     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("plusVariableConstant")
     public override operator fun V.plus(other: C): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("minusVariableConstant")
     public override operator fun V.minus(other: C): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("timesVariableConstant")
     public override operator fun V.times(other: C): P = polynomialRing { this@times * other }
 
+    /**
+     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("plusConstantVariable")
+    public override operator fun C.plus(other: V): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("minusConstantVariable")
+    public override operator fun C.minus(other: V): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("timesConstantVariable")
+    public override operator fun C.times(other: V): P = polynomialRing { this@times * other }
+
+    /**
+     * Represents the variable as a monic monomial.
+     */
     @JvmName("unaryPlusVariable")
     public override operator fun V.unaryPlus(): P = polynomialRing { +this@unaryPlus }
+    /**
+     * Returns negation of representation of the variable as a monic monomial.
+     */
     @JvmName("unaryMinusVariable")
     public override operator fun V.unaryMinus(): P = polynomialRing { -this@unaryMinus }
+    /**
+     * Returns sum of the variables represented as monic monomials.
+     */
     @JvmName("plusVariableVariable")
     public override operator fun V.plus(other: V): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the variables represented as monic monomials.
+     */
     @JvmName("minusVariableVariable")
     public override operator fun V.minus(other: V): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the variables represented as monic monomials.
+     */
     @JvmName("timesVariableVariable")
     public override operator fun V.times(other: V): P = polynomialRing { this@times * other }
 
+    /**
+     * Represents the [variable] as a monic monomial.
+     */
+    public override fun polynomialNumber(variable: V): P = polynomialRing { number(variable) }
+    /**
+     * Represents the variable as a monic monomial.
+     */
+    public override fun V.asPolynomial(): P = polynomialRing { this@asPolynomial.asPolynomial() }
+
+    /**
+     * Returns sum of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("plusVariablePolynomial")
     public override operator fun V.plus(other: P): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("minusVariablePolynomial")
     public override operator fun V.minus(other: P): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("timesVariablePolynomial")
     public override operator fun V.times(other: P): P = polynomialRing { this@times * other }
 
+    /**
+     * Returns sum of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusPolynomialVariable")
     public override operator fun P.plus(other: V): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusPolynomialVariable")
     public override operator fun P.minus(other: V): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesPolynomialVariable")
     public override operator fun P.times(other: V): P = polynomialRing { this@times * other }
 
@@ -1264,6 +1467,16 @@ public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSp
     public override val P.countOfVariables: Int get() = polynomialRing { countOfVariables }
 }
 
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] of variables of type
+ * [V] and over ring of constants of type [C]. It also assumes that there is provided constructor
+ * [constructRationalFunction] of rational functions from polynomial numerator and denominator.
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param V the type of variables. Polynomials have them in representations of terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public abstract class MultivariatePolynomialSpaceOfFractions<
         C,
@@ -1271,18 +1484,27 @@ public abstract class MultivariatePolynomialSpaceOfFractions<
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         > : MultivariateRationalFunctionalSpace<C, V, P, R>,  PolynomialSpaceOfFractions<C, P, R>() {
+    /**
+     * Returns sum of the variable represented as a rational function and the rational function.
+     */
     @JvmName("plusVariableRational")
     public override operator fun V.plus(other: R): R =
         constructRationalFunction(
             this * other.denominator + other.numerator,
             other.denominator
         )
+    /**
+     * Returns difference between the variable represented as a rational function and the rational function.
+     */
     @JvmName("minusVariableRational")
     public override operator fun V.minus(other: R): R =
         constructRationalFunction(
             this * other.denominator - other.numerator,
             other.denominator
         )
+    /**
+     * Returns product of the variable represented as a rational function and the rational function.
+     */
     @JvmName("timesVariableRational")
     public override operator fun V.times(other: R): R =
         constructRationalFunction(
@@ -1290,18 +1512,27 @@ public abstract class MultivariatePolynomialSpaceOfFractions<
             other.denominator
         )
 
+    /**
+     * Returns sum of the rational function and the variable represented as a rational function.
+     */
     @JvmName("plusRationalVariable")
     public override operator fun R.plus(other: V): R =
         constructRationalFunction(
             numerator + denominator * other,
             denominator
         )
+    /**
+     * Returns difference between the rational function and the variable represented as a rational function.
+     */
     @JvmName("minusRationalVariable")
     public override operator fun R.minus(other: V): R =
         constructRationalFunction(
             numerator - denominator * other,
             denominator
         )
+    /**
+     * Returns product of the rational function and the variable represented as a rational function.
+     */
     @JvmName("timesRationalVariable")
     public override operator fun R.times(other: V): R =
         constructRationalFunction(
-- 
2.34.1


From 03b92de6e0803c0813bf53469cf9d195699f016a Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 11 Jun 2022 19:29:14 +0300
Subject: [PATCH 515/713] Sifted ListPolynomial's basics.

---
 .../kmath/functions/LabeledPolynomial.kt      | 539 ------------------
 .../functions/LabeledRationalFunction.kt      | 139 -----
 .../kmath/functions/NumberedPolynomial.kt     | 389 -------------
 .../functions/NumberedRationalFunction.kt     | 188 ------
 .../kscience/kmath/functions/Piecewise.kt     | 132 -----
 .../kmath/functions/labeledConstructors.kt    | 203 -------
 .../kmath/functions/labeledPolynomialUtil.kt  | 495 ----------------
 .../functions/labeledRationalFunctionUtil.kt  |  33 --
 .../kmath/functions/numberedConstructors.kt   | 195 -------
 .../kmath/functions/numberedPolynomialUtil.kt | 528 -----------------
 .../functions/numberedRationalFunctionUtil.kt |  33 --
 .../kmath/integration/SplineIntegrator.kt     | 107 ----
 .../kmath/interpolation/Interpolator.kt       |  92 ---
 .../kmath/interpolation/LinearInterpolator.kt |  43 --
 .../kmath/interpolation/SplineInterpolator.kt |  83 ---
 .../kmath/integration/SplineIntegralTest.kt   |  48 --
 .../interpolation/LinearInterpolatorTest.kt   |  29 -
 .../interpolation/SplineInterpolatorTest.kt   |  31 -
 .../kscience/kmath/test/misc/IntModulo.kt     | 142 -----
 .../kscience/kmath/test/misc/Rational.kt      | 135 -----
 .../test/misc/RationalWithMemorization.kt     | 107 ----
 .../kscience/kmath/test/misc/memorization.kt  |  51 --
 .../space/kscience/kmath/test/misc/misc.kt    |  31 -
 23 files changed, 3773 deletions(-)
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
deleted file mode 100644
index b904f7331..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.ScaleOperations
-import kotlin.math.max
-
-
-/**
- * Represents multivariate polynomials with labeled variables.
- *
- * @param C Ring in which the polynomial is considered.
- */
-public data class LabeledPolynomial<C>
-internal constructor(
-    /**
-     * Map that collects coefficients of the polynomial. Every non-zero monomial
-     * `a x_1^{d_1} ... x_n^{d_n}` is represented as pair "key-value" in the map, where value is coefficients `a` and
-     * key is map that associates variables in the monomial with multiplicity of them occurring in the monomial.
-     * For example polynomial
-     * ```
-     * 5 a^2 c^3 - 6 b + 0 b c
-     * ```
-     * has coefficients represented as
-     * ```
-     * mapOf(
-     *      mapOf(
-     *          a to 2,
-     *          c to 3
-     *      ) to 5,
-     *      mapOf(
-     *          b to 1
-     *      ) to (-6)
-     * )
-     * ```
-     * where `a`, `b` and `c` are corresponding [Symbol] objects.
-     */
-    public val coefficients: Map<Map<Symbol, UInt>, C>
-) : Polynomial<C> {
-    override fun toString(): String = "LabeledPolynomial$coefficients"
-}
-
-/**
- * Space of polynomials.
- *
- * @param C the type of operated polynomials.
- * @param A the intersection of [Ring] of [C] and [ScaleOperations] of [C].
- * @param ring the [A] instance.
- */
-public class LabeledPolynomialSpace<C, A : Ring<C>>(
-    public override val ring: A,
-) : MultivariatePolynomialSpace<C, Symbol, LabeledPolynomial<C>>, PolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
-    public override operator fun Symbol.plus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * other,
-        ))
-    public override operator fun Symbol.minus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * other,
-        ))
-    public override operator fun Symbol.times(other: Int): LabeledPolynomial<C> =
-        if (other == 0) zero
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne * other,
-        ))
-
-    public override operator fun Int.plus(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * this@plus,
-        ))
-    public override operator fun Int.minus(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * this@minus,
-        ))
-    public override operator fun Int.times(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) zero
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to constantOne * this@times,
-        ))
-
-    /**
-     * Returns sum of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun LabeledPolynomial<C>.plus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) this
-        else with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other.asConstant()))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
-            )
-        }
-    /**
-     * Returns difference between the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun LabeledPolynomial<C>.minus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) this
-        else with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to (-other).asConstant()))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
-            )
-        }
-    /**
-     * Returns product of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun LabeledPolynomial<C>.times(other: Int): LabeledPolynomial<C> =
-        if (other == 0) zero
-        else LabeledPolynomial(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
-
-    /**
-     * Returns sum of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this == 0) other
-        else with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@plus.asConstant()))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns difference between the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this == 0) other
-        else with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@minus.asConstant()))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns product of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this == 0) zero
-        else LabeledPolynomial(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
-
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public override fun number(value: Int): LabeledPolynomial<C> = number(constantNumber(value))
-
-    public override operator fun C.plus(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to this@plus,
-        ))
-    public override operator fun C.minus(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to this@minus,
-        ))
-    public override operator fun C.times(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to this@times,
-        ))
-
-    public override operator fun Symbol.plus(other: C): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to other,
-        ))
-    public override operator fun Symbol.minus(other: C): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to other,
-        ))
-    public override operator fun Symbol.times(other: C): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this@times to 1U) to other,
-        ))
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@plus))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@minus))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun LabeledPolynomial<C>.plus(other: C): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    override operator fun LabeledPolynomial<C>.minus(other: C): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun LabeledPolynomial<C>.times(other: C): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public override fun number(value: C): LabeledPolynomial<C> =
-        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to value))
-
-    public override operator fun Symbol.unaryPlus(): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne,
-        ))
-    public override operator fun Symbol.unaryMinus(): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to -constantOne,
-        ))
-    public override operator fun Symbol.plus(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne * 2
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne,
-            mapOf(other to 1U) to constantOne,
-        ))
-    public override operator fun Symbol.minus(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) zero
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne,
-            mapOf(other to 1U) to -constantOne,
-        ))
-    public override operator fun Symbol.times(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) LabeledPolynomial<C>(mapOf(
-            mapOf(this to 2U) to constantOne
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U, other to 1U) to constantOne,
-        ))
-
-    public override operator fun Symbol.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@plus to 1u) to constantOne))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = mapOf(this@plus to 1U)
-
-                        this[degs] = constantOne + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    public override operator fun Symbol.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@minus to 1u) to constantOne))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = mapOf(this@minus to 1U)
-
-                        this[degs] = constantOne - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    public override operator fun Symbol.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            other.coefficients
-                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[this] = if (this in it) it[this]!! + 1U else 1U } }
-        )
-
-    public override operator fun LabeledPolynomial<C>.plus(other: Symbol): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to constantOne))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = mapOf(other to 1U)
-
-                        this[degs] = constantOne + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    public override operator fun LabeledPolynomial<C>.minus(other: Symbol): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to constantOne))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = mapOf(other to 1U)
-
-                        this[degs] = constantOne - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    public override operator fun LabeledPolynomial<C>.times(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            coefficients
-                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[other] = if (other in it) it[other]!! + 1U else 1U } }
-        )
-
-    /**
-     * Returns negation of the polynomial.
-     */
-    override fun LabeledPolynomial<C>.unaryMinus(): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            coefficients.mapValues { -it.value }
-        )
-    /**
-     * Returns sum of the polynomials.
-     */
-    override operator fun LabeledPolynomial<C>.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
-            }
-        )
-    /**
-     * Returns difference of the polynomials.
-     */
-    override operator fun LabeledPolynomial<C>.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
-            }
-        )
-    /**
-     * Returns product of the polynomials.
-     */
-    override operator fun LabeledPolynomial<C>.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            buildMap(coefficients.size * other.coefficients.size) {
-                for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
-                    val degs = degs1.toMutableMap()
-                    degs2.mapValuesTo(degs) { (variable, deg) -> degs.getOrElse(variable) { 0u } + deg }
-                    val c = c1 * c2
-                    this[degs] = if (degs in this) this[degs]!! + c else c
-                }
-            }
-        )
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    override val zero: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to constantZero))
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    override val one: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to constantOne))
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    override val LabeledPolynomial<C>.degree: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, c) -> degs.values.sum().toInt() } ?: -1
-    /**
-     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
-     * in which they are appeared in the polynomial.
-     *
-     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
-     * And keys of the map is the same as in [variables].
-     */
-    public override val LabeledPolynomial<C>.degrees: Map<Symbol, UInt>
-        get() =
-            buildMap {
-                coefficients.entries.forEach { (degs, _) ->
-                    degs.mapValuesTo(this) { (variable, deg) ->
-                        max(getOrElse(variable) { 0u }, deg)
-                    }
-                }
-            }
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public override fun LabeledPolynomial<C>.degreeBy(variable: Symbol): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) -> degs.getOrElse(variable) { 0u } } ?: 0u
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public override fun LabeledPolynomial<C>.degreeBy(variables: Collection<Symbol>): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) -> degs.filterKeys { it in variables }.values.sum() } ?: 0u
-    /**
-     * Set of all variables that appear in the polynomial in positive exponents.
-     */
-    public override val LabeledPolynomial<C>.variables: Set<Symbol>
-        get() =
-            buildSet {
-                coefficients.entries.forEach { (degs, _) -> addAll(degs.keys) }
-            }
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public override val LabeledPolynomial<C>.countOfVariables: Int get() = variables.size
-
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
-//    @Suppress("NOTHING_TO_INLINE")
-//    @JvmName("substitutePolynomial")
-//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
-//
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.asFunction(): (Map<Symbol, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.asFunctionOnConstants(): (Map<Symbol, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.asFunctionOnPolynomials(): (Map<Symbol, LabeledPolynomial<C>>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
-//
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Symbol, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
-//    @Suppress("NOTHING_TO_INLINE")
-//    @JvmName("invokePolynomial")
-//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
deleted file mode 100644
index 76c6874f5..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-
-
-public class LabeledRationalFunction<C>(
-    public override val numerator: LabeledPolynomial<C>,
-    public override val denominator: LabeledPolynomial<C>
-) : RationalFunction<C, LabeledPolynomial<C>> {
-    override fun toString(): String = "LabeledRationalFunction${numerator.coefficients}/${denominator.coefficients}"
-}
-
-public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
-    public val ring: A,
-) :
-    MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSpace<
-            C,
-            Symbol,
-            LabeledPolynomial<C>,
-            LabeledRationalFunction<C>,
-            LabeledPolynomialSpace<C, A>,
-            >,
-    MultivariatePolynomialSpaceOfFractions<
-            C,
-            Symbol,
-            LabeledPolynomial<C>,
-            LabeledRationalFunction<C>,
-            >() {
-
-    override val polynomialRing : LabeledPolynomialSpace<C, A> = LabeledPolynomialSpace(ring)
-    override fun constructRationalFunction(
-        numerator: LabeledPolynomial<C>,
-        denominator: LabeledPolynomial<C>
-    ): LabeledRationalFunction<C> =
-        LabeledRationalFunction<C>(numerator, denominator)
-
-    /**
-     * Instance of zero rational function (zero of the rational functions ring).
-     */
-    public override val zero: LabeledRationalFunction<C> = LabeledRationalFunction<C>(polynomialZero, polynomialOne)
-    /**
-     * Instance of unit polynomial (unit of the rational functions ring).
-     */
-    public override val one: LabeledRationalFunction<C> = LabeledRationalFunction<C>(polynomialOne, polynomialOne)
-
-    // TODO: Разобрать
-
-//    operator fun invoke(arg: Map<Symbol, C>): LabeledRationalFunction<C> =
-//        LabeledRationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    @JvmName("invokeLabeledPolynomial")
-//    operator fun invoke(arg: Map<Symbol, LabeledPolynomial<C>>): LabeledRationalFunction<C> =
-//        LabeledRationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    @JvmName("invokeLabeledRationalFunction")
-//    operator fun invoke(arg: Map<Symbol, LabeledRationalFunction<C>>): LabeledRationalFunction<C> {
-//        var num = numerator invokeRFTakeNumerator arg
-//        var den = denominator invokeRFTakeNumerator arg
-//        for (variable in variables) if (variable in arg) {
-//            val degreeDif = degrees[variable]!!
-//            if (degreeDif > 0)
-//                den = multiplyByPower(den, arg[variable]!!.denominator, degreeDif)
-//            else
-//                num = multiplyByPower(num, arg[variable]!!.denominator, -degreeDif)
-//        }
-//        return LabeledRationalFunction(num, den)
-//    }
-//
-//    override fun toString(): String = toString(emptyMap())
-//
-//    fun toString(names: Map<Symbol, String> = emptyMap()): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(names)
-//            else -> "${numerator.toStringWithBrackets(names)}/${denominator.toStringWithBrackets(names)}"
-//        }
-//
-//    fun toString(namer: (Symbol) -> String): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(namer)
-//            else -> "${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)}"
-//        }
-//
-//    fun toStringWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(names)
-//            else -> "(${numerator.toStringWithBrackets(names)}/${denominator.toStringWithBrackets(names)})"
-//        }
-//
-//    fun toStringWithBrackets(namer: (Symbol) -> String): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(namer)
-//            else -> "(${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)})"
-//        }
-//
-//    fun toReversedString(names: Map<Symbol, String> = emptyMap()): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(names)
-//            else -> "${numerator.toReversedStringWithBrackets(names)}/${denominator.toReversedStringWithBrackets(names)}"
-//        }
-//
-//    fun toReversedString(namer: (Symbol) -> String): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(namer)
-//            else -> "${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)}"
-//        }
-//
-//    fun toReversedStringWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(names)
-//            else -> "(${numerator.toReversedStringWithBrackets(names)}/${denominator.toReversedStringWithBrackets(names)})"
-//        }
-//
-//    fun toReversedStringWithBrackets(namer: (Symbol) -> String): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(namer)
-//            else -> "(${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)})"
-//        }
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
deleted file mode 100644
index e75373819..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.ScaleOperations
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.experimental.ExperimentalTypeInference
-import kotlin.jvm.JvmName
-import kotlin.math.max
-
-
-/**
- * Polynomial model without fixation on specific context they are applied to.
- *
- * @param C the type of constants.
- */
-public data class NumberedPolynomial<C>
-internal constructor(
-    /**
-     * Map that collects coefficients of the polynomial. Every monomial `a x_1^{d_1} ... x_n^{d_n}` is represented as
-     * pair "key-value" in the map, where value is coefficients `a` and
-     * key is list that associates index of every variable in the monomial with multiplicity of the variable occurring
-     * in the monomial. For example coefficients of polynomial `5 x_1^2 x_3^3 - 6 x_2` can be represented as
-     * ```
-     * mapOf(
-     *      listOf(2, 0, 3) to 5,
-     *      listOf(0, 1) to (-6),
-     * )
-     * ```
-     * and also as
-     * ```
-     * mapOf(
-     *      listOf(2, 0, 3) to 5,
-     *      listOf(0, 1) to (-6),
-     *      listOf(0, 1, 1) to 0,
-     * )
-     * ```
-     * It is recommended not to put zero monomials into the map, but is not prohibited. Lists of degrees always do not
-     * contain any zeros on end, but can contain zeros on start or anywhere in middle.
-     */
-    public val coefficients: Map<List<UInt>, C>
-) : Polynomial<C> {
-    override fun toString(): String = "NumberedPolynomial$coefficients"
-}
-
-/**
- * Space of polynomials.
- *
- * @param C the type of operated polynomials.
- * @param A the intersection of [Ring] of [C] and [ScaleOperations] of [C].
- * @param ring the [A] instance.
- */
-public open class NumberedPolynomialSpace<C, A : Ring<C>>(
-    public final override val ring: A,
-) : PolynomialSpaceOverRing<C, NumberedPolynomial<C>, A> {
-    /**
-     * Returns sum of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun NumberedPolynomial<C>.plus(other: Int): NumberedPolynomial<C> =
-        if (other == 0) this
-        else
-            NumberedPolynomial(
-                coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
-            )
-    /**
-     * Returns difference between the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun NumberedPolynomial<C>.minus(other: Int): NumberedPolynomial<C> =
-        if (other == 0) this
-        else
-            NumberedPolynomial(
-                coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
-            )
-    /**
-     * Returns product of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun NumberedPolynomial<C>.times(other: Int): NumberedPolynomial<C> =
-        if (other == 0) zero
-        else NumberedPolynomial<C>(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
-
-    /**
-     * Returns sum of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this == 0) other
-        else
-            NumberedPolynomial(
-                other.coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
-            )
-    /**
-     * Returns difference between the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this == 0) other
-        else
-            NumberedPolynomial(
-                other.coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-    /**
-     * Returns product of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this == 0) zero
-        else NumberedPolynomial(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
-
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public override fun number(value: Int): NumberedPolynomial<C> = number(constantNumber(value))
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this@plus))
-            else NumberedPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this@minus))
-            else NumberedPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun NumberedPolynomial<C>.plus(other: C): NumberedPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to other))
-            else NumberedPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    override operator fun NumberedPolynomial<C>.minus(other: C): NumberedPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to other))
-            else NumberedPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun NumberedPolynomial<C>.times(other: C): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public override fun number(value: C): NumberedPolynomial<C> =
-        NumberedPolynomial(mapOf(emptyList<UInt>() to value))
-
-    /**
-     * Returns negation of the polynomial.
-     */
-    override fun NumberedPolynomial<C>.unaryMinus(): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            coefficients.mapValues { -it.value }
-        )
-    /**
-     * Returns sum of the polynomials.
-     */
-    override operator fun NumberedPolynomial<C>.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
-            }
-        )
-    /**
-     * Returns difference of the polynomials.
-     */
-    override operator fun NumberedPolynomial<C>.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
-            }
-        )
-    /**
-     * Returns product of the polynomials.
-     */
-    override operator fun NumberedPolynomial<C>.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            buildMap(coefficients.size * other.coefficients.size) {
-                for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
-                    val degs =
-                        (0..max(degs1.lastIndex, degs2.lastIndex))
-                            .map { degs1.getOrElse(it) { 0U } + degs2.getOrElse(it) { 0U } }
-                    val c = c1 * c2
-                    this[degs] = if (degs in this) this[degs]!! + c else c
-                }
-            }
-        )
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    override val zero: NumberedPolynomial<C> = NumberedPolynomial<C>(emptyMap())
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    override val one: NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            mapOf(
-                emptyList<UInt>() to constantOne // 1 * x_1^0 * x_2^0 * ...
-            )
-        )
-
-    /**
-     * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `-1`.
-     */
-    public val NumberedPolynomial<C>.lastVariable: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.lastIndex } ?: -1
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    override val NumberedPolynomial<C>.degree: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.sum().toInt() } ?: -1
-    /**
-     * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
-     * exponents in which the variables are appeared in the polynomial.
-     *
-     * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
-     * And last index of the list is [lastVariable].
-     */
-    public val NumberedPolynomial<C>.degrees: List<UInt>
-        get() =
-            MutableList(lastVariable + 1) { 0u }.apply {
-                coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        this[index] = max(this[index], deg)
-                    }
-                }
-            }
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) -> degs.getOrElse(variable) { 0u } } ?: 0u
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) ->
-            degs.withIndex().filter { (index, _) -> index in variables }.sumOf { it.value }
-        } ?: 0u
-    /**
-     * Count of variables occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `0`.
-     */
-    public val NumberedPolynomial<C>.countOfVariables: Int
-        get() =
-            MutableList(lastVariable + 1) { false }.apply {
-                coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        if (deg != 0u) this[index] = true
-                    }
-                }
-            }.count { it }
-
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, C>): NumberedPolynomial<C> = this.substitute(ring, argument)
-    @Suppress("NOTHING_TO_INLINE")
-    @JvmName("substitutePolynomial")
-    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
-
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun NumberedPolynomial<C>.asFunction(): (Map<Int, C>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun NumberedPolynomial<C>.asFunctionOnConstants(): (Map<Int, C>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun NumberedPolynomial<C>.asFunctionOnPolynomials(): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
-
-    @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, C>): NumberedPolynomial<C> = this.substitute(ring, argument)
-    @Suppress("NOTHING_TO_INLINE")
-    @JvmName("invokePolynomial")
-    public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
-
-    // FIXME: Move to other constructors with context receiver
-    public fun C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
deleted file mode 100644
index 30c7f0188..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-import kotlin.math.max
-
-
-public class NumberedRationalFunction<C> internal constructor(
-    public override val numerator: NumberedPolynomial<C>,
-    public override val denominator: NumberedPolynomial<C>
-) : RationalFunction<C, NumberedPolynomial<C>> {
-    override fun toString(): String = "NumberedRationalFunction${numerator.coefficients}/${denominator.coefficients}"
-}
-
-public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
-    public val ring: A,
-) :
-    RationalFunctionalSpaceOverPolynomialSpace<
-            C,
-            NumberedPolynomial<C>,
-            NumberedRationalFunction<C>,
-            NumberedPolynomialSpace<C, A>,
-            >,
-    PolynomialSpaceOfFractions<
-            C,
-            NumberedPolynomial<C>,
-            NumberedRationalFunction<C>,
-            >() {
-
-    override val polynomialRing : NumberedPolynomialSpace<C, A> = NumberedPolynomialSpace(ring)
-    override fun constructRationalFunction(
-        numerator: NumberedPolynomial<C>,
-        denominator: NumberedPolynomial<C>
-    ): NumberedRationalFunction<C> =
-        NumberedRationalFunction(numerator, denominator)
-
-    /**
-     * Instance of zero rational function (zero of the rational functions ring).
-     */
-    public override val zero: NumberedRationalFunction<C> = NumberedRationalFunction(polynomialZero, polynomialOne)
-    /**
-     * Instance of unit polynomial (unit of the rational functions ring).
-     */
-    public override val one: NumberedRationalFunction<C> = NumberedRationalFunction(polynomialOne, polynomialOne)
-
-    /**
-     * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `-1`.
-     */
-    public val NumberedPolynomial<C>.lastVariable: Int get() = polynomialRing { lastVariable }
-    /**
-     * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
-     * exponents in which the variables are appeared in the polynomial.
-     *
-     * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
-     * And last index of the list is [lastVariable].
-     */
-    public val NumberedPolynomial<C>.degrees: List<UInt> get() = polynomialRing { degrees }
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt = polynomialRing { degreeBy(variable) }
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt = polynomialRing { degreeBy(variables) }
-    /**
-     * Count of variables occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `0`.
-     */
-    public val NumberedPolynomial<C>.countOfVariables: Int get() = polynomialRing { countOfVariables }
-
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public val NumberedRationalFunction<C>.lastVariable: Int
-        get() = polynomialRing { max(numerator.lastVariable, denominator.lastVariable) }
-    /**
-     * Count of variables occurring in the rational function with positive power. If there is no such variable,
-     * the result is `0`.
-     */
-    public val NumberedRationalFunction<C>.countOfVariables: Int
-        get() =
-            MutableList(lastVariable + 1) { false }.apply {
-                numerator.coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        if (deg != 0u) this[index] = true
-                    }
-                }
-                denominator.coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        if (deg != 0u) this[index] = true
-                    }
-                }
-            }.count { it }
-
-    // TODO: Разобрать
-
-//    operator fun invoke(arg: Map<Int, C>): NumberedRationalFunction<C> =
-//        NumberedRationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    @JvmName("invokePolynomial")
-//    operator fun invoke(arg: Map<Int, Polynomial<C>>): NumberedRationalFunction<C> =
-//        NumberedRationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    @JvmName("invokeRationalFunction")
-//    operator fun invoke(arg: Map<Int, NumberedRationalFunction<C>>): NumberedRationalFunction<C> {
-//        var num = numerator invokeRFTakeNumerator arg
-//        var den = denominator invokeRFTakeNumerator arg
-//        for (variable in 0 until max(numerator.countOfVariables, denominator.countOfVariables)) if (variable in arg) {
-//            val degreeDif = numerator.degrees.getOrElse(variable) { 0 } - denominator.degrees.getOrElse(variable) { 0 }
-//            if (degreeDif > 0)
-//                den = multiplyByPower(den, arg[variable]!!.denominator, degreeDif)
-//            else
-//                num = multiplyByPower(num, arg[variable]!!.denominator, -degreeDif)
-//        }
-//        return NumberedRationalFunction(num, den)
-//    }
-//
-//    override fun toString(): String = toString(Polynomial.variableName)
-//
-//    fun toString(withVariableName: String = Polynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(withVariableName)
-//            else -> "${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toString(namer: (Int) -> String): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(namer)
-//            else -> "${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)}"
-//        }
-//
-//    fun toStringWithBrackets(withVariableName: String = Polynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun toStringWithBrackets(namer: (Int) -> String): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(namer)
-//            else -> "(${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)})"
-//        }
-//
-//    fun toReversedString(withVariableName: String = Polynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(withVariableName)
-//            else -> "${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toReversedString(namer: (Int) -> String): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(namer)
-//            else -> "${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)}"
-//        }
-//
-//    fun toReversedStringWithBrackets(withVariableName: String = Polynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun toReversedStringWithBrackets(namer: (Int) -> String): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(namer)
-//            else -> "(${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)})"
-//        }
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
deleted file mode 100644
index 612b00535..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.operations.Ring
-
-/**
- * Represents piecewise-defined function.
- *
- * @param T the piece key type.
- * @param R the sub-function type.
- */
-public fun interface Piecewise<in T, out R> {
-    /**
-     * Returns the appropriate sub-function for given piece key.
-     */
-    public fun findPiece(arg: T): R?
-}
-
-/**
- * Represents piecewise-defined function where all the sub-functions are polynomials.
- *
- * @property pieces An ordered list of range-polynomial pairs. The list does not in general guarantee that there are no
- * "holes" in it.
- */
-public interface PiecewisePolynomial<T : Comparable<T>> : Piecewise<T, ListPolynomial<T>> {
-    public val pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>>
-
-    override fun findPiece(arg: T): ListPolynomial<T>?
-}
-
-/**
- * A generic piecewise without constraints on how pieces are placed
- */
-@PerformancePitfall("findPiece method of resulting piecewise is slow")
-public fun <T : Comparable<T>> PiecewisePolynomial(
-    pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>>,
-): PiecewisePolynomial<T> = object : PiecewisePolynomial<T> {
-    override val pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>> = pieces
-
-    override fun findPiece(arg: T): ListPolynomial<T>? = pieces.firstOrNull { arg in it.first }?.second
-}
-
-/**
- * An optimized piecewise that uses not separate pieces, but a range separated by delimiters.
- * The pieces search is logarithmic.
- */
-private class OrderedPiecewisePolynomial<T : Comparable<T>>(
-    override val pieces: List<Pair<ClosedRange<T>, ListPolynomial<T>>>,
-) : PiecewisePolynomial<T> {
-
-    override fun findPiece(arg: T): ListPolynomial<T>? {
-        val index = pieces.binarySearch { (range, _) ->
-            when {
-                arg >= range.endInclusive -> -1
-                arg < range.start -> +1
-                else -> 0
-            }
-        }
-        return if (index < 0) null else pieces[index].second
-    }
-
-}
-
-/**
- * A [Piecewise]  builder where all the pieces are ordered by the [Comparable] type instances.
- *
- * @param T the comparable piece key type.
- * @param delimiter the initial piecewise separator
- */
-public class PiecewiseBuilder<T : Comparable<T>>(delimiter: T) {
-    private val delimiters: MutableList<T> = arrayListOf(delimiter)
-    private val pieces: MutableList<ListPolynomial<T>> = arrayListOf()
-
-    /**
-     * Dynamically adds a piece to the right side (beyond maximum argument value of previous piece)
-     *
-     * @param right new rightmost position. If is less than current rightmost position, an error is thrown.
-     * @param piece the sub-function.
-     */
-    public fun putRight(right: T, piece: ListPolynomial<T>) {
-        require(right > delimiters.last()) { "New delimiter should be to the right of old one" }
-        delimiters += right
-        pieces += piece
-    }
-
-    /**
-     * Dynamically adds a piece to the left side (beyond maximum argument value of previous piece)
-     *
-     * @param left the new leftmost position. If is less than current rightmost position, an error is thrown.
-     * @param piece the sub-function.
-     */
-    public fun putLeft(left: T, piece: ListPolynomial<T>) {
-        require(left < delimiters.first()) { "New delimiter should be to the left of old one" }
-        delimiters.add(0, left)
-        pieces.add(0, piece)
-    }
-
-    public fun build(): PiecewisePolynomial<T> = OrderedPiecewisePolynomial(delimiters.zipWithNext { l, r ->
-        l..r
-    }.zip(pieces))
-}
-
-/**
- * A builder for [PiecewisePolynomial]
- */
-public fun <T : Comparable<T>> PiecewisePolynomial(
-    startingPoint: T,
-    builder: PiecewiseBuilder<T>.() -> Unit,
-): PiecewisePolynomial<T> = PiecewiseBuilder(startingPoint).apply(builder).build()
-
-/**
- * Return a value of polynomial function with given [ring] a given [arg] or null if argument is outside piecewise
- * definition.
- */
-public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.substitute(ring: C, arg: T): T? =
-    findPiece(arg)?.substitute(ring, arg)
-
-/**
- * Convert this polynomial to a function returning nullable value (null if argument is outside piecewise range).
- */
-public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C): (T) -> T? = { substitute(ring, it) }
-
-/**
- * Convert this polynomial to a function using [defaultValue] for arguments outside the piecewise range.
- */
-public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C, defaultValue: T): (T) -> T =
-    { substitute(ring, it) ?: defaultValue }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
deleted file mode 100644
index e81a9388e..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-
-
-/**
- * Returns the same degrees' description of the monomial, but without zero degrees.
- */
-internal fun Map<Symbol, UInt>.cleanUp() = filterValues { it > 0U }
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
-    if (!toCheckInput) return LabeledPolynomial<C>(coefs)
-
-    val fixedCoefs = LinkedHashMap<Map<Symbol, UInt>, C>(coefs.size)
-
-    for (entry in coefs) {
-        val key = entry.key.cleanUp()
-        val value = entry.value
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
-    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = LinkedHashMap<Map<Symbol, UInt>, C>(pairs.size)
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
-    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = LinkedHashMap<Map<Symbol, UInt>, C>(pairs.size)
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-
-//context(A)
-//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to one))
-//context(LabeledPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
-//context(LabeledRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
-
-public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this))
-
-@DslMarker
-@UnstableKMathAPI
-internal annotation class LabeledPolynomialConstructorDSL
-
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-public class LabeledPolynomialTermSignatureBuilder {
-    private val signature: MutableMap<Symbol, UInt> = LinkedHashMap()
-    public fun build(): Map<Symbol, UInt> = signature
-    public infix fun Symbol.inPowerOf(deg: UInt) {
-        signature[this] = deg
-    }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Symbol.pow(deg: UInt): Unit = this inPowerOf deg
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Symbol.`in`(deg: UInt): Unit = this inPowerOf deg
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Symbol.of(deg: UInt): Unit = this inPowerOf deg
-}
-
-@UnstableKMathAPI
-public class LabeledPolynomialBuilder<C>(private val zero: C, private val add: (C, C) -> C, capacity: Int = 0) {
-    private val coefficients: MutableMap<Map<Symbol, UInt>, C> = LinkedHashMap(capacity)
-    public fun build(): LabeledPolynomial<C> = LabeledPolynomial<C>(coefficients)
-    public operator fun C.invoke(block: LabeledPolynomialTermSignatureBuilder.() -> Unit) {
-        val signature = LabeledPolynomialTermSignatureBuilder().apply(block).build()
-        coefficients[signature] = add(coefficients.getOrElse(signature) { zero }, this@invoke)
-    }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun C.with(noinline block: LabeledPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun (LabeledPolynomialTermSignatureBuilder.() -> Unit).with(coef: C): Unit = coef.invoke(this)
-    @Suppress("NOTHING_TO_INLINE")
-    public infix fun sig(block: LabeledPolynomialTermSignatureBuilder.() -> Unit): LabeledPolynomialTermSignatureBuilder.() -> Unit = block
-}
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> A.LabeledPolynomial(block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(zero, ::add).apply(block).build()
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> A.LabeledPolynomial(capacity: Int, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(zero, ::add, capacity).apply(block).build()
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(constantZero, { left: C, right: C -> left + right}).apply(block).build()
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(capacity: Int, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(constantZero, { left: C, right: C -> left + right}, capacity).apply(block).build()
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        LabeledPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        LabeledPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(numerator, polynomialOne)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(numerator, LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one), toCheckInput = false))
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        polynomialOne
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one), toCheckInput = false)
-    )
-
-//context(A)
-//public fun <C, A: Ring<C>> Symbol.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
-//context(LabeledRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> Symbol.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
-
-//context(A)
-//public fun <C, A: Ring<C>> C.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
-//context(LabeledRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> C.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
deleted file mode 100644
index af918b9ae..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-
-
-// TODO: Docs
-
-/**
- * Creates a [LabeledPolynomialSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.labeledPolynomial(): LabeledPolynomialSpace<C, A> =
-    LabeledPolynomialSpace(this)
-
-/**
- * Creates a [LabeledPolynomialSpace]'s scope over a received ring.
- */
-@OptIn(ExperimentalContracts::class)
-public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomialSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return LabeledPolynomialSpace(this).block()
-}
-
-///**
-// * Represents the polynomial as a [String] with names of variables substituted with names from [names].
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(names: Map<Symbol, String> = emptyMap()): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .toSortedMap()
-//                            .filter { it.value > 0U }
-//                            .map { (variable, deg) ->
-//                                val variableName = names.getOrDefault(variable, variable.toString())
-//                                when (deg) {
-//                                    1U -> variableName
-//                                    else -> "$variableName^$deg"
-//                                }
-//                            }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer].
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(namer: (Symbol) -> String): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .toSortedMap()
-//                            .filter { it.value > 0U }
-//                            .map { (variable, deg) ->
-//                                when (deg) {
-//                                    1U -> namer(variable)
-//                                    else -> "${namer(variable)}^$deg"
-//                                }
-//                            }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] with names of variables substituted with names from [names] and with
-// * brackets around the string if needed (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
-//    with(represent(names)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
-// * (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(namer: (Symbol) -> String): String =
-//    with(represent(namer)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] with names of variables substituted with names from [names].
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(names: Map<Symbol, String> = emptyMap()): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> -LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .toSortedMap()
-//                            .filter { it.value > 0U }
-//                            .map { (variable, deg) ->
-//                                val variableName = names.getOrDefault(variable, variable.toString())
-//                                when (deg) {
-//                                    1U -> variableName
-//                                    else -> "$variableName^$deg"
-//                                }
-//                            }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer].
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(namer: (Symbol) -> String): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> -LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .toSortedMap()
-//                            .filter { it.value > 0U }
-//                            .map { (variable, deg) ->
-//                                when (deg) {
-//                                    1U -> namer(variable)
-//                                    else -> "${namer(variable)}^$deg"
-//                                }
-//                            }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] with names of variables substituted with names from [names] and with
-// * brackets around the string if needed (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
-//    with(representReversed(names)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
-// * (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(namer: (Symbol) -> String): String =
-//    with(representReversed(namer)) { if (coefficients.count() == 1) this else "($this)" }
-
-//operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
-//    if (other.isZero()) throw ArithmeticException("/ by zero")
-//    else
-//        Polynomial(
-//            coefficients
-//                .mapValues { it.value / other },
-//            toCheckInput = false
-//        )
-
-//public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Symbol, C>): LabeledPolynomial<C> = ring {
-//    if (coefficients.isEmpty()) return this@substitute
-//    LabeledPolynomial<C>(
-//        buildMap {
-//            coefficients.forEach { (degs, c) ->
-//                val newDegs = degs.filterKeys { it !in args }
-//                val newC = degs.entries.asSequence().filter { it.key in args }.fold(c) { acc, (variable, deg) ->
-//                    multiplyWithPower(acc, args[variable]!!, deg)
-//                }
-//                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
-//            }
-//        }
-//    )
-//}
-//
-//// TODO: Replace with optimisation: the [result] may be unboxed, and all operations may be performed as soon as
-////  possible on it
-//@JvmName("substitutePolynomial")
-//fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, arg: Map<Symbol, LabeledPolynomial<C>>) : LabeledPolynomial<C> =
-//    ring.labeledPolynomial {
-//        if (coefficients.isEmpty()) return zero
-//        coefficients
-//            .asSequence()
-//            .map { (degs, c) ->
-//                degs.entries
-//                    .asSequence()
-//                    .filter { it.key in arg }
-//                    .fold(LabeledPolynomial(mapOf(degs.filterKeys { it !in arg } to c))) { acc, (index, deg) ->
-//                        multiplyWithPower(acc, arg[index]!!, deg)
-//                    }
-//            }
-//            .reduce { acc, polynomial -> acc + polynomial } // TODO: Rewrite. Might be slow.
-//    }
-//
-//// TODO: Substitute rational function
-//
-//fun <C, A : Ring<C>> LabeledPolynomial<C>.asFunctionOver(ring: A): (Map<Symbol, C>) -> LabeledPolynomial<C> =
-//    { substitute(ring, it) }
-//
-//fun <C, A : Ring<C>> LabeledPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Symbol, LabeledPolynomial<C>>) -> LabeledPolynomial<C> =
-//    { substitute(ring, it) }
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-): LabeledPolynomial<C> = algebra {
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (variable !in degs) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                when {
-                                    vari != variable -> put(vari, deg)
-                                    deg > 1u -> put(vari, deg - 1u)
-                                }
-                            }
-                        },
-                        multiplyByDoubling(c, degs[variable]!!)
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variables: Collection<Symbol>,
-): LabeledPolynomial<C> = algebra {
-    val cleanedVariables = variables.toSet()
-    if (cleanedVariables.isEmpty()) return this@derivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (!degs.keys.containsAll(cleanedVariables)) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                when {
-                                    vari !in cleanedVariables -> put(vari, deg)
-                                    deg > 1u -> put(vari, deg - 1u)
-                                }
-                            }
-                        },
-                        cleanedVariables.fold(c) { acc, variable -> multiplyByDoubling(acc, degs[variable]!!) }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-    order: UInt
-): LabeledPolynomial<C> = algebra {
-    if (order == 0u) return this@nthDerivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.getOrElse(variable) { 0u } < order) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                when {
-                                    vari != variable -> put(vari, deg)
-                                    deg > order -> put(vari, deg - order)
-                                }
-                            }
-                        },
-                        degs[variable]!!.let { deg ->
-                            (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> multiplyByDoubling(acc, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Symbol, UInt>,
-): LabeledPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (filteredVariablesAndOrders.any { (variable, order) -> degs.getOrElse(variable) { 0u } < order }) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                if (vari !in filteredVariablesAndOrders) put(vari, deg)
-                                else {
-                                    val order = filteredVariablesAndOrders[vari]!!
-                                    if (deg > order) put(vari, deg - order)
-                                }
-                            }
-                        },
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            degs[index]!!.let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> multiplyByDoubling(acc2, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-): LabeledPolynomial<C> = algebra {
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        put(variable, 1u)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
-                    put(
-                        newDegs,
-                        c / multiplyByDoubling(one, newDegs[variable]!!)
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variables: Collection<Symbol>,
-): LabeledPolynomial<C> = algebra {
-    val cleanedVariables = variables.toSet()
-    if (cleanedVariables.isEmpty()) return this@antiderivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        for (variable in cleanedVariables) put(variable, 1u)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
-                    put(
-                        newDegs,
-                        cleanedVariables.fold(c) { acc, variable -> acc / multiplyByDoubling(one, newDegs[variable]!!) }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-    order: UInt
-): LabeledPolynomial<C> = algebra {
-    if (order == 0u) return this@nthAntiderivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        put(variable, order)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
-                    put(
-                        newDegs,
-                        newDegs[variable]!!.let { deg ->
-                            (deg downTo  deg - order + 1u)
-                                .fold(c) { acc, ord -> acc / multiplyByDoubling(one, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Symbol, UInt>,
-): LabeledPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthAntiderivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        for ((variable, order) in filteredVariablesAndOrders) put(variable, order)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
-                    put(
-                        newDegs,
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            newDegs[index]!!.let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> acc2 / multiplyByDoubling(one, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
deleted file mode 100644
index 583160cf4..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-
-
-/**
- * Creates a [LabeledRationalFunctionSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.labeledRationalFunction(): LabeledRationalFunctionSpace<C, A> =
-    LabeledRationalFunctionSpace(this)
-
-/**
- * Creates a [LabeledRationalFunctionSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.labeledRationalFunction(block: LabeledRationalFunctionSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return LabeledRationalFunctionSpace(this).block()
-}
-
-//fun <T: Field<T>> LabeledRationalFunction<T>.reduced(): LabeledRationalFunction<T> {
-//    val greatestCommonDivider = polynomialGCD(numerator, denominator)
-//    return LabeledRationalFunction(
-//        numerator / greatestCommonDivider,
-//        denominator / greatestCommonDivider
-//    )
-//}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
deleted file mode 100644
index dca8a0cff..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-
-
-/**
- * Returns the same degrees' description of the monomial, but without extra zero degrees on the end.
- */
-internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
-    if (!toCheckInput) return NumberedPolynomial<C>(coefs)
-
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in coefs) {
-        val key = entry.key.cleanUp()
-        val value = entry.value
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
-    if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
-    if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
-
-public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
-
-@DslMarker
-@UnstableKMathAPI
-internal annotation class NumberedPolynomialConstructorDSL
-
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-public class NumberedPolynomialTermSignatureBuilder {
-    private val signature: MutableList<UInt> = ArrayList()
-    public fun build(): List<UInt> = signature
-    public infix fun Int.inPowerOf(deg: UInt) {
-        if (this > signature.lastIndex) {
-            signature.addAll(List(this - signature.lastIndex - 1) { 0u })
-            signature.add(deg)
-        } else {
-            signature[this] = deg
-        }
-    }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Int.pow(deg: UInt): Unit = this inPowerOf deg
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Int.`in`(deg: UInt): Unit = this inPowerOf deg
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Int.of(deg: UInt): Unit = this inPowerOf deg
-}
-
-@UnstableKMathAPI
-public class NumberedPolynomialBuilder<C>(private val zero: C, private val add: (C, C) -> C, capacity: Int = 0) {
-    private val coefficients: MutableMap<List<UInt>, C> = LinkedHashMap(capacity)
-    public fun build(): NumberedPolynomial<C> = NumberedPolynomial<C>(coefficients)
-    public operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit) {
-        val signature = NumberedPolynomialTermSignatureBuilder().apply(block).build()
-        coefficients[signature] = add(coefficients.getOrElse(signature) { zero }, this@invoke)
-    }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun C.with(noinline block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun (NumberedPolynomialTermSignatureBuilder.() -> Unit).with(coef: C): Unit = coef.invoke(this)
-    @Suppress("NOTHING_TO_INLINE")
-    public infix fun sig(block: NumberedPolynomialTermSignatureBuilder.() -> Unit): NumberedPolynomialTermSignatureBuilder.() -> Unit = block
-}
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> A.NumberedPolynomial(block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(zero, ::add).apply(block).build()
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> A.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(zero, ::add, capacity).apply(block).build()
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(constantZero, { left: C, right: C -> left + right}).apply(block).build()
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(constantZero, { left: C, right: C -> left + right}, capacity).apply(block).build()
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        NumberedPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        NumberedPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(numerator, polynomialOne)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(numerator, NumberedPolynomial(mapOf(emptyList<UInt>() to one), toCheckInput = false))
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        polynomialOne
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        NumberedPolynomial(mapOf(emptyList<UInt>() to one), toCheckInput = false)
-    )
-
-//context(A)
-//public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> = NumberedRationalFunction(asLabeledPolynomial())
-//context(NumberedRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> = NumberedRationalFunction(asLabeledPolynomial())
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
deleted file mode 100644
index ad817c7ba..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
+++ /dev/null
@@ -1,528 +0,0 @@
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-import kotlin.contracts.*
-import kotlin.jvm.JvmName
-import kotlin.math.max
-
-
-// TODO: Docs
-
-/**
- * Creates a [NumberedPolynomialSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.numberedPolynomial(): NumberedPolynomialSpace<C, A> =
-    NumberedPolynomialSpace(this)
-
-/**
- * Creates a [NumberedPolynomialSpace]'s scope over a received ring.
- */
-@OptIn(ExperimentalContracts::class)
-public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolynomialSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return NumberedPolynomialSpace(this).block()
-}
-
-///**
-// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`.
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.represent(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .mapIndexed { index, deg ->
-//                                when (deg) {
-//                                    0U -> ""
-//                                    1U -> "${withVariableName}_${index+1}"
-//                                    else -> "${withVariableName}_${index+1}^$deg"
-//                                }
-//                            }
-//                            .filter { it.isNotEmpty() }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer].
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.represent(namer: (Int) -> String): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .mapIndexed { index, deg ->
-//                                when (deg) {
-//                                    0U -> ""
-//                                    1U -> namer(index)
-//                                    else -> "${namer(index)}^$deg"
-//                                }
-//                            }
-//                            .filter { it.isNotEmpty() }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`
-// * and with brackets around the string if needed (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representWithBrackets(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
-//    with(represent(withVariableName)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
-// * (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representWithBrackets(namer: (Int) -> String): String =
-//    with(represent(namer)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`.
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversed(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> -NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .mapIndexed { index, deg ->
-//                                when (deg) {
-//                                    0U -> ""
-//                                    1U -> "${withVariableName}_${index+1}"
-//                                    else -> "${withVariableName}_${index+1}^$deg"
-//                                }
-//                            }
-//                            .filter { it.isNotEmpty() }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer].
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversed(namer: (Int) -> String): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> -NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .mapIndexed { index, deg ->
-//                                when (deg) {
-//                                    0U -> ""
-//                                    1U -> namer(index)
-//                                    else -> "${namer(index)}^$deg"
-//                                }
-//                            }
-//                            .filter { it.isNotEmpty() }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`
-// * and with brackets around the string if needed (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversedWithBrackets(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
-//    with(representReversed(withVariableName)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
-// * (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversedWithBrackets(namer: (Int) -> String): String =
-//    with(representReversed(namer)) { if (coefficients.count() == 1) this else "($this)" }
-
-//public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
-//    if (coefficients.isEmpty()) return this@substitute
-//    NumberedPolynomial<C>(
-//        buildMap {
-//            coefficients.forEach { (degs, c) ->
-//                val newDegs = degs.mapIndexed { index, deg -> if (index in args) 0U else deg }.cleanUp()
-//                val newC = degs.foldIndexed(c) { index, acc, deg ->
-//                    if (index in args) multiplyWithPower(acc, args[index]!!, deg)
-//                    else acc
-//                }
-//                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
-//            }
-//        }
-//    )
-//}
-//
-//// TODO: Replace with optimisation: the [result] may be unboxed, and all operations may be performed as soon as
-////  possible on it
-//@JvmName("substitutePolynomial")
-//public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, arg: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> =
-//    ring.numberedPolynomialSpace {
-//        if (coefficients.isEmpty()) return zero
-//        coefficients
-//            .asSequence()
-//            .map { (degs, c) ->
-//                degs.foldIndexed(
-//                    NumberedPolynomial(
-//                        degs.mapIndexed { index, deg -> if (index in arg) 0U else deg } to c
-//                    )
-//                ) { index, acc, deg -> if (index in arg) multiplyWithPower(acc, arg[index]!!, deg) else acc }
-//            }
-//            .reduce { acc, polynomial -> acc + polynomial } // TODO: Rewrite. Might be slow.
-//    }
-//
-//// TODO: Substitute rational function
-//
-//public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunctionOver(ring: A): (Map<Int, C>) -> NumberedPolynomial<C> =
-//    { substitute(ring, it) }
-//
-//public fun <C, A : Ring<C>> NumberedPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> =
-//    { substitute(ring, it) }
-
-//operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
-//    if (other.isZero()) throw ArithmeticException("/ by zero")
-//    else
-//        Polynomial(
-//            coefficients
-//                .mapValues { it.value / other },
-//            toCheckInput = false
-//        )
-
-/**
- * Evaluates the value of the given double polynomial for given double argument.
- */
-public fun NumberedPolynomial<Double>.substitute(args: Map<Int, Double>): NumberedPolynomial<Double> = Double.algebra {
-    val acc = LinkedHashMap<List<UInt>, Double>(coefficients.size)
-    for ((degs, c) in coefficients) {
-        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-        val newC = args.entries.fold(c) { product, (variable, substitution) ->
-            val deg = degs.getOrElse(variable) { 0u }
-            if (deg == 0u) product else product * substitution.pow(deg.toInt())
-        }
-        if (newDegs !in acc) acc[newDegs] = newC
-        else acc[newDegs] = acc[newDegs]!! + newC
-    }
-    return NumberedPolynomial<Double>(acc)
-}
-
-/**
- * Evaluates the value of the given polynomial for given argument.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */
-public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
-    val acc = LinkedHashMap<List<UInt>, C>(coefficients.size)
-    for ((degs, c) in coefficients) {
-        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-        val newC = args.entries.fold(c) { product, (variable, substitution) ->
-            val deg = degs.getOrElse(variable) { 0u }
-            if (deg == 0u) product else product * power(substitution, deg)
-        }
-        if (newDegs !in acc) acc[newDegs] = newC
-        else acc[newDegs] = acc[newDegs]!! + newC
-    }
-    return NumberedPolynomial<C>(acc)
-}
-
-// TODO: (Waiting for hero) Replace with optimisation: the [result] may be unboxed, and all operations may be performed
-//  as soon as possible on it
-@JvmName("substitutePolynomial")
-public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> = TODO() /*ring.numberedPolynomial {
-    val acc = LinkedHashMap<List<UInt>, NumberedPolynomial<C>>(coefficients.size)
-    for ((degs, c) in coefficients) {
-        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-        val newC = args.entries.fold(c.asNumberedPolynomial()) { product, (variable, substitution) ->
-            val deg = degs.getOrElse(variable) { 0u }
-            if (deg == 0u) product else product * power(substitution, deg)
-        }
-        if (newDegs !in acc) acc[newDegs] = c.asNumberedPolynomial()
-        else acc[newDegs] = acc[newDegs]!! + c
-    }
-}*/
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunction(ring: A): (Map<Int, C>) -> NumberedPolynomial<C> = { substitute(ring, it) }
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> = { substitute(ring, it) }
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variable: Int,
-): NumberedPolynomial<C> = algebra {
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.size > variable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            when {
-                                index != variable -> deg
-                                deg > 0u -> deg - 1u
-                                else -> return@forEach
-                            }
-                        }.cleanUp(),
-                        multiplyByDoubling(c, degs[variable])
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variables: Collection<Int>,
-): NumberedPolynomial<C> = algebra {
-    val cleanedVariables = variables.toSet()
-    if (cleanedVariables.isEmpty()) return this@derivativeWithRespectTo
-    val maxRespectedVariable = cleanedVariables.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.size > maxRespectedVariable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            when {
-                                index !in cleanedVariables -> deg
-                                deg > 0u -> deg - 1u
-                                else -> return@forEach
-                            }
-                        }.cleanUp(),
-                        cleanedVariables.fold(c) { acc, variable -> multiplyByDoubling(acc, degs[variable]) }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variable: Int,
-    order: UInt
-): NumberedPolynomial<C> = algebra {
-    if (order == 0u) return this@nthDerivativeWithRespectTo
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.size > variable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            when {
-                                index != variable -> deg
-                                deg >= order -> deg - order
-                                else -> return@forEach
-                            }
-                        }.cleanUp(),
-                        degs[variable].let { deg ->
-                            (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> multiplyByDoubling(acc, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Int, UInt>,
-): NumberedPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
-    val maxRespectedVariable = filteredVariablesAndOrders.keys.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.size > maxRespectedVariable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            if (index !in filteredVariablesAndOrders) return@mapIndexed deg
-                            val order = filteredVariablesAndOrders[index]!!
-                            if (deg >= order) deg - order else return@forEach
-                        }.cleanUp(),
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            degs[index].let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> multiplyByDoubling(acc2, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variable: Int,
-): NumberedPolynomial<C> = algebra {
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + 1u },
-                        c / multiplyByDoubling(one, degs[variable])
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variables: Collection<Int>,
-): NumberedPolynomial<C> = algebra {
-    val cleanedVariables = variables.toSet()
-    if (cleanedVariables.isEmpty()) return this@antiderivativeWithRespectTo
-    val maxRespectedVariable = cleanedVariables.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(maxRespectedVariable + 1, degs.size)) { if (it !in variables) degs[it] else degs[it] + 1u },
-                        cleanedVariables.fold(c) { acc, variable -> acc / multiplyByDoubling(one, degs[variable]) }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variable: Int,
-    order: UInt
-): NumberedPolynomial<C> = algebra {
-    if (order == 0u) return this@nthAntiderivativeWithRespectTo
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + order },
-                        degs[variable].let { deg ->
-                            (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> acc / multiplyByDoubling(one, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Int, UInt>,
-): NumberedPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthAntiderivativeWithRespectTo
-    val maxRespectedVariable = filteredVariablesAndOrders.keys.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(maxRespectedVariable + 1, degs.size)) { degs[it] + filteredVariablesAndOrders.getOrElse(it) { 0u } },
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            degs[index].let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> acc2 / multiplyByDoubling(one, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
deleted file mode 100644
index 5cd0679ab..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-
-
-/**
- * Creates a [NumberedRationalFunctionSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.numberedRationalFunction(): NumberedRationalFunctionSpace<C, A> =
-    NumberedRationalFunctionSpace(this)
-
-/**
- * Creates a [NumberedRationalFunctionSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.numberedRationalFunction(block: NumberedRationalFunctionSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return NumberedRationalFunctionSpace(this).block()
-}
-
-//fun <T: Field<T>> NumberedRationalFunction<T>.reduced(): NumberedRationalFunction<T> {
-//    val greatestCommonDivider = polynomialGCD(numerator, denominator)
-//    return NumberedRationalFunction(
-//        numerator / greatestCommonDivider,
-//        denominator / greatestCommonDivider
-//    )
-//}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
deleted file mode 100644
index 0fcd4c6e5..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.integration
-
-import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.integrate
-import space.kscience.kmath.functions.antiderivative
-import space.kscience.kmath.interpolation.PolynomialInterpolator
-import space.kscience.kmath.interpolation.SplineInterpolator
-import space.kscience.kmath.interpolation.interpolatePolynomials
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.MutableBufferFactory
-
-/**
- * Compute analytical indefinite integral of this [PiecewisePolynomial], keeping all intervals intact
- */
-@OptIn(PerformancePitfall::class)
-@UnstableKMathAPI
-public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(algebra: Field<T>): PiecewisePolynomial<T> =
-    PiecewisePolynomial(pieces.map { it.first to it.second.antiderivative(algebra) })
-
-/**
- * Compute definite integral of given [PiecewisePolynomial] piece by piece in a given [range]
- * Requires [UnivariateIntegrationNodes] or [IntegrationRange] and [IntegrandMaxCalls]
- *
- * TODO use context receiver for algebra
- */
-@UnstableKMathAPI
-public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(
-    algebra: Field<T>, range: ClosedRange<T>,
-): T = algebra.sum(
-    pieces.map { (region, poly) ->
-        val intersectedRange = maxOf(range.start, region.start)..minOf(range.endInclusive, region.endInclusive)
-        //Check if polynomial range is not used
-        if (intersectedRange.start == intersectedRange.endInclusive) algebra.zero
-        else poly.integrate(algebra, intersectedRange)
-    }
-)
-
-/**
- * A generic spline-interpolation-based analytic integration
- * * [IntegrationRange]&mdash;the univariate range of integration. By default, uses `0..1` interval.
- * * [IntegrandMaxCalls]&mdash;the maximum number of function calls during integration. For non-iterative rules, always uses
- * the maximum number of points. By default, uses 10 points.
- */
-@UnstableKMathAPI
-public class SplineIntegrator<T : Comparable<T>>(
-    public val algebra: Field<T>,
-    public val bufferFactory: MutableBufferFactory<T>,
-) : UnivariateIntegrator<T> {
-    override fun process(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> = algebra {
-        val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
-
-        val interpolator: PolynomialInterpolator<T> = SplineInterpolator(algebra, bufferFactory)
-
-        val nodes: Buffer<Double> = integrand.getFeature<UnivariateIntegrationNodes>()?.nodes ?: run {
-            val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
-            val step = (range.endInclusive - range.start) / (numPoints - 1)
-            DoubleBuffer(numPoints) { i -> range.start + i * step }
-        }
-
-        val values = nodes.map(bufferFactory) { integrand.function(it) }
-        val polynomials = interpolator.interpolatePolynomials(
-            nodes.map(bufferFactory) { number(it) },
-            values
-        )
-        val res = polynomials.integrate(algebra, number(range.start)..number(range.endInclusive))
-        integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + nodes.size)
-    }
-}
-
-/**
- * A simplified double-based spline-interpolation-based analytic integration
- * * [IntegrationRange]&mdash;the univariate range of integration. By default, uses `0.0..1.0` interval.
- * * [IntegrandMaxCalls]&mdash;the maximum number of function calls during integration. For non-iterative rules, always
- * uses the maximum number of points. By default, uses 10 points.
- */
-@UnstableKMathAPI
-public object DoubleSplineIntegrator : UnivariateIntegrator<Double> {
-    override fun process(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
-        val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
-        val interpolator: PolynomialInterpolator<Double> = SplineInterpolator(DoubleField, ::DoubleBuffer)
-
-        val nodes: Buffer<Double> = integrand.getFeature<UnivariateIntegrationNodes>()?.nodes ?: run {
-            val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
-            val step = (range.endInclusive - range.start) / (numPoints - 1)
-            DoubleBuffer(numPoints) { i -> range.start + i * step }
-        }
-
-        val values = nodes.map { integrand.function(it) }
-        val polynomials = interpolator.interpolatePolynomials(nodes, values)
-        val res = polynomials.integrate(DoubleField, range)
-        return integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + nodes.size)
-    }
-}
-
-@Suppress("unused")
-@UnstableKMathAPI
-public inline val DoubleField.splineIntegrator: UnivariateIntegrator<Double>
-    get() = DoubleSplineIntegrator
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
deleted file mode 100644
index 62819be0c..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:OptIn(UnstableKMathAPI::class)
-
-package space.kscience.kmath.interpolation
-
-import space.kscience.kmath.data.XYColumnarData
-import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.asFunction
-import space.kscience.kmath.functions.substitute
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asBuffer
-
-/**
- * And interpolator for data with x column type [X], y column type [Y].
- */
-public fun interface Interpolator<T, in X : T, Y : T> {
-    public fun interpolate(points: XYColumnarData<T, X, Y>): (X) -> Y
-}
-
-/**
- * And interpolator returning [PiecewisePolynomial] function
- */
-public interface PolynomialInterpolator<T : Comparable<T>> : Interpolator<T, T, T> {
-    public val algebra: Ring<T>
-
-    public fun getDefaultValue(): T = error("Out of bounds")
-
-    public fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T>
-
-    override fun interpolate(points: XYColumnarData<T, T, T>): (T) -> T = { x ->
-        interpolatePolynomials(points).substitute(algebra, x) ?: getDefaultValue()
-    }
-}
-
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolatePolynomials(
-    x: Buffer<T>,
-    y: Buffer<T>,
-): PiecewisePolynomial<T> {
-    val pointSet = XYColumnarData.of(x, y)
-    return interpolatePolynomials(pointSet)
-}
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolatePolynomials(
-    data: Map<T, T>,
-): PiecewisePolynomial<T> {
-    val pointSet = XYColumnarData.of(data.keys.toList().asBuffer(), data.values.toList().asBuffer())
-    return interpolatePolynomials(pointSet)
-}
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolatePolynomials(
-    data: List<Pair<T, T>>,
-): PiecewisePolynomial<T> {
-    val pointSet = XYColumnarData.of(data.map { it.first }.asBuffer(), data.map { it.second }.asBuffer())
-    return interpolatePolynomials(pointSet)
-}
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
-    x: Buffer<T>,
-    y: Buffer<T>,
-): (T) -> T? = interpolatePolynomials(x, y).asFunction(algebra)
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
-    data: Map<T, T>,
-): (T) -> T? = interpolatePolynomials(data).asFunction(algebra)
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
-    data: List<Pair<T, T>>,
-): (T) -> T? = interpolatePolynomials(data).asFunction(algebra)
-
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
-    x: Buffer<T>,
-    y: Buffer<T>,
-    defaultValue: T,
-): (T) -> T = interpolatePolynomials(x, y).asFunction(algebra, defaultValue)
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
-    data: Map<T, T>,
-    defaultValue: T,
-): (T) -> T = interpolatePolynomials(data).asFunction(algebra, defaultValue)
-
-public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
-    data: List<Pair<T, T>>,
-    defaultValue: T,
-): (T) -> T = interpolatePolynomials(data).asFunction(algebra, defaultValue)
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
deleted file mode 100644
index b55f16cf2..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.interpolation
-
-import space.kscience.kmath.data.XYColumnarData
-import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.ListPolynomial
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.invoke
-
-@OptIn(UnstableKMathAPI::class)
-internal fun <T : Comparable<T>> insureSorted(points: XYColumnarData<*, T, *>) {
-    for (i in 0 until points.size - 1)
-        require(points.x[i + 1] > points.x[i]) { "Input data is not sorted at index $i" }
-}
-
-/**
- * Reference JVM implementation: https://github.com/apache/commons-math/blob/master/src/main/java/org/apache/commons/math4/analysis/interpolation/LinearInterpolator.java
- */
-public class LinearInterpolator<T : Comparable<T>>(override val algebra: Field<T>) : PolynomialInterpolator<T> {
-
-    @OptIn(UnstableKMathAPI::class)
-    override fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T> = algebra {
-        require(points.size > 0) { "Point array should not be empty" }
-        insureSorted(points)
-
-        PiecewisePolynomial(points.x[0]) {
-            for (i in 0 until points.size - 1) {
-                val slope = (points.y[i + 1] - points.y[i]) / (points.x[i + 1] - points.x[i])
-                val const = points.y[i] - slope * points.x[i]
-                val polynomial = ListPolynomial(const, slope)
-                putRight(points.x[i + 1], polynomial)
-            }
-        }
-    }
-}
-
-public val <T : Comparable<T>> Field<T>.linearInterpolator: LinearInterpolator<T>
-    get() = LinearInterpolator(this)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
deleted file mode 100644
index 48c90ff23..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.interpolation
-
-import space.kscience.kmath.data.XYColumnarData
-import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.ListPolynomial
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.MutableBufferFactory
-
-/**
- * Generic spline interpolator. Not recommended for performance critical places, use platform-specific and type
- * specific ones.
- *
- * Based on
- * https://github.com/apache/commons-math/blob/eb57d6d457002a0bb5336d789a3381a24599affe/src/main/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolator.java
- */
-public class SplineInterpolator<T : Comparable<T>>(
-    override val algebra: Field<T>,
-    public val bufferFactory: MutableBufferFactory<T>,
-) : PolynomialInterpolator<T> {
-    //TODO possibly optimize zeroed buffers
-
-    @OptIn(UnstableKMathAPI::class)
-    override fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T> = algebra {
-        require(points.size >= 3) { "Can't use spline interpolator with less than 3 points" }
-        insureSorted(points)
-        // Number of intervals.  The number of data points is n + 1.
-        val n = points.size - 1
-        // Differences between knot points
-        val h = bufferFactory(n) { i -> points.x[i + 1] - points.x[i] }
-        val mu = bufferFactory(n) { zero }
-        val z = bufferFactory(n + 1) { zero }
-
-        for (i in 1 until n) {
-            val g = 2.0 * (points.x[i + 1] - points.x[i - 1]) - h[i - 1] * mu[i - 1]
-            mu[i] = h[i] / g
-            z[i] =
-                ((points.y[i + 1] * h[i - 1] - points.y[i] * (points.x[i + 1] - points.x[i - 1]) + points.y[i - 1] * h[i]) * 3.0 /
-                        (h[i - 1] * h[i]) - h[i - 1] * z[i - 1]) / g
-        }
-
-        // cubic spline coefficients --  b is linear, c quadratic, d is cubic (original y's are constants)
-
-        PiecewisePolynomial(points.x[points.size - 1]) {
-            var cOld = zero
-
-            for (j in n - 1 downTo 0) {
-                val c = z[j] - mu[j] * cOld
-                val a = points.y[j]
-                val b = (points.y[j + 1] - points.y[j]) / h[j] - h[j] * (cOld + 2.0 * c) / 3.0
-                val d = (cOld - c) / (3.0 * h[j])
-                val x0 = points.x[j]
-                val x02 = x0 * x0
-                val x03 = x02 * x0
-                //Shift coefficients to represent absolute polynomial instead of one with an offset
-                val polynomial = ListPolynomial(
-                    a - b * x0 + c * x02 - d * x03,
-                    b - 2 * c * x0 + 3 * d * x02,
-                    c - 3 * d * x0,
-                    d
-                )
-                cOld = c
-                putLeft(x0, polynomial)
-            }
-        }
-    }
-}
-
-
-public fun <T : Comparable<T>> Field<T>.splineInterpolator(
-    bufferFactory: MutableBufferFactory<T>,
-): SplineInterpolator<T> = SplineInterpolator(this, bufferFactory)
-
-public val DoubleField.splineInterpolator: SplineInterpolator<Double>
-    get() = SplineInterpolator(this, ::DoubleBuffer)
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
deleted file mode 100644
index aae0ad017..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.integration
-
-import space.kscience.kmath.functions.ListPolynomial
-import space.kscience.kmath.functions.integrate
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.DoubleField
-import kotlin.math.PI
-import kotlin.math.sin
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-@OptIn(UnstableKMathAPI::class)
-class SplineIntegralTest {
-
-    @Test
-    fun integratePolynomial(){
-        val polynomial = ListPolynomial(1.0, 2.0, 3.0)
-        val integral = polynomial.integrate(DoubleField,1.0..2.0)
-        assertEquals(11.0, integral, 0.001)
-    }
-
-    @Test
-    fun gaussSin() {
-        val res = DoubleField.splineIntegrator.integrate(0.0..2 * PI, IntegrandMaxCalls(5)) { x ->
-            sin(x)
-        }
-        assertEquals(0.0, res.value, 1e-2)
-    }
-
-    @Test
-    fun gaussUniform() {
-        val res = DoubleField.splineIntegrator.integrate(35.0..100.0, IntegrandMaxCalls(20)) { x ->
-            if(x in 30.0..50.0){
-                1.0
-            } else {
-                0.0
-            }
-        }
-        assertEquals(15.0, res.value, 0.5)
-    }
-
-
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
deleted file mode 100644
index 1143036d4..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.interpolation
-
-import space.kscience.kmath.operations.DoubleField
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-internal class LinearInterpolatorTest {
-    @Test
-    fun testInterpolation() {
-        val data = listOf(
-            0.0 to 0.0,
-            1.0 to 1.0,
-            2.0 to 3.0,
-            3.0 to 4.0
-        )
-
-        //val polynomial: PiecewisePolynomial<Double> = DoubleField.linearInterpolator.interpolatePolynomials(data)
-        val function = DoubleField.linearInterpolator.interpolate(data)
-        assertEquals(null, function(-1.0))
-        assertEquals(0.5, function(0.5))
-        assertEquals(2.0, function(1.5))
-        assertEquals(3.0, function(2.0))
-    }
-}
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
deleted file mode 100644
index 4c7d816d4..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.interpolation
-
-import space.kscience.kmath.operations.DoubleField
-import kotlin.math.PI
-import kotlin.math.sin
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-internal class SplineInterpolatorTest {
-    @Test
-    fun testInterpolation() {
-        val data = (0..10).map {
-            val x = it.toDouble() / 5 * PI
-            x to sin(x)
-        }
-
-        //val polynomial: PiecewisePolynomial<Double> = DoubleField.splineInterpolator.interpolatePolynomials(data)
-
-        val function = DoubleField.splineInterpolator.interpolate(data, Double.NaN)
-
-        assertEquals(Double.NaN, function(-1.0))
-        assertEquals(sin(0.5), function(0.5), 0.1)
-        assertEquals(sin(1.5), function(1.5), 0.1)
-        assertEquals(sin(2.0), function(2.0), 0.1)
-    }
-}
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
deleted file mode 100644
index 2353beee6..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-import space.kscience.kmath.functions.ListPolynomial
-import space.kscience.kmath.functions.ListPolynomialSpace
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-
-
-class IntModulo {
-    val residue: Int
-    val modulus: Int
-
-    @PublishedApi
-    internal constructor(residue: Int, modulus: Int, toCheckInput: Boolean = true) {
-        if (toCheckInput) {
-            require(modulus != 0) { "modulus can not be zero" }
-            this.modulus = if (modulus < 0) -modulus else modulus
-            this.residue = residue.mod(modulus)
-        } else {
-            this.residue = residue
-            this.modulus = modulus
-        }
-    }
-
-    constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
-
-    operator fun unaryPlus(): IntModulo = this
-    operator fun unaryMinus(): IntModulo =
-        IntModulo(
-            if (residue == 0) 0 else modulus - residue,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun plus(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not add two residue different modulo" }
-        return IntModulo(
-            (residue + other.residue) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun plus(other: Int): IntModulo =
-        IntModulo(
-            (residue + other) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun minus(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not subtract two residue different modulo" }
-        return IntModulo(
-            (residue - other.residue) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun minus(other: Int): IntModulo =
-        IntModulo(
-            (residue - other) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun times(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not multiply two residue different modulo" }
-        return IntModulo(
-            (residue * other.residue) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun times(other: Int): IntModulo =
-        IntModulo(
-            (residue * other) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun div(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not divide two residue different modulo" }
-        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other.residue, modulus)
-        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
-        return IntModulo(
-            (residue * reciprocalCandidate) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun div(other: Int): IntModulo {
-        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other, modulus)
-        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
-        return IntModulo(
-            (residue * reciprocalCandidate) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    override fun equals(other: Any?): Boolean =
-        when (other) {
-            is IntModulo -> residue == other.residue && modulus == other.modulus
-            else -> false
-        }
-
-    override fun hashCode(): Int = residue.hashCode()
-
-    override fun toString(): String = "$residue mod $modulus"
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-@OptIn(UnstableKMathAPI::class)
-class IntModuloRing : Ring<IntModulo> {
-
-    val modulus: Int
-
-    constructor(modulus: Int) {
-        require(modulus != 0) { "modulus can not be zero" }
-        this.modulus = if (modulus < 0) -modulus else modulus
-    }
-
-    override inline val zero: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
-    override inline val one: IntModulo get() = IntModulo(1, modulus, toCheckInput = false)
-
-    fun number(arg: Int) = IntModulo(arg, modulus, toCheckInput = false)
-
-    override inline fun add(left: IntModulo, right: IntModulo): IntModulo = left + right
-    override inline fun multiply(left: IntModulo, right: IntModulo): IntModulo = left * right
-
-    override inline fun IntModulo.unaryMinus(): IntModulo = -this
-    override inline fun IntModulo.plus(arg: IntModulo): IntModulo = this + arg
-    override inline fun IntModulo.minus(arg: IntModulo): IntModulo = this - arg
-    override inline fun IntModulo.times(arg: IntModulo): IntModulo = this * arg
-    inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
-}
-
-fun ListPolynomialSpace<IntModulo, IntModuloRing>.number(arg: Int) = IntModulo(arg, ring.modulus, toCheckInput = false)
-
-fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
-    ListPolynomial(coefs.map { IntModulo(it, ring.modulus) })
-fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
-    ListPolynomial(coefs.map { IntModulo(it, modulus) })
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
deleted file mode 100644
index 72bb5942c..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.NumbersAddOps
-
-class Rational {
-    companion object {
-        val ZERO: Rational = Rational(0L)
-        val ONE: Rational = Rational(1L)
-    }
-
-    val numerator: Long
-    val denominator: Long
-
-    internal constructor(numerator: Long, denominator: Long, toCheckInput: Boolean = true) {
-        if (toCheckInput) {
-            if (denominator == 0L) throw ArithmeticException("/ by zero")
-
-            val greatestCommonDivider = gcd(numerator, denominator).let { if (denominator < 0L) -it else it }
-
-            this.numerator = numerator / greatestCommonDivider
-            this.denominator = denominator / greatestCommonDivider
-        } else {
-            this.numerator = numerator
-            this.denominator = denominator
-        }
-    }
-
-    constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
-    constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
-    constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
-    constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
-    constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
-    constructor(numerator: Long) : this(numerator, 1L, false)
-
-    operator fun unaryPlus(): Rational = this
-    operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
-    operator fun plus(other: Rational): Rational =
-        Rational(
-            numerator * other.denominator + denominator * other.numerator,
-            denominator * other.denominator
-        )
-    operator fun plus(other: Int): Rational =
-        Rational(
-            numerator + denominator * other.toLong(),
-            denominator
-        )
-    operator fun plus(other: Long): Rational =
-        Rational(
-            numerator + denominator * other,
-            denominator
-        )
-    operator fun minus(other: Rational): Rational =
-        Rational(
-            numerator * other.denominator - denominator * other.numerator,
-            denominator * other.denominator
-        )
-    operator fun minus(other: Int): Rational =
-        Rational(
-            numerator - denominator * other.toLong(),
-            denominator
-        )
-    operator fun minus(other: Long): Rational =
-        Rational(
-            numerator - denominator * other,
-            denominator
-        )
-    operator fun times(other: Rational): Rational =
-        Rational(
-            numerator * other.numerator,
-            denominator * other.denominator
-        )
-    operator fun times(other: Int): Rational =
-        Rational(
-            numerator * other.toLong(),
-            denominator
-        )
-    operator fun times(other: Long): Rational =
-        Rational(
-            numerator * other,
-            denominator
-        )
-    operator fun div(other: Rational): Rational =
-        Rational(
-            numerator * other.denominator,
-            denominator * other.numerator
-        )
-    operator fun div(other: Int): Rational =
-        Rational(
-            numerator,
-            denominator * other.toLong()
-        )
-    operator fun div(other: Long): Rational =
-        Rational(
-            numerator,
-            denominator * other
-        )
-    override fun equals(other: Any?): Boolean =
-        when (other) {
-            is Rational -> numerator == other.numerator && denominator == other.denominator
-            is Int -> numerator == other && denominator == 1L
-            is Long -> numerator == other && denominator == 1L
-            else -> false
-        }
-
-    override fun hashCode(): Int = 31 * numerator.hashCode() + denominator.hashCode()
-
-    override fun toString(): String = if (denominator == 1L) "$numerator" else "$numerator/$denominator"
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-@OptIn(UnstableKMathAPI::class)
-object RationalField : Field<Rational>, NumbersAddOps<Rational> {
-    override inline val zero: Rational get() = Rational.ZERO
-    override inline val one: Rational get() = Rational.ONE
-
-    override inline fun number(value: Number): Rational = Rational(value.toLong())
-
-    override inline fun add(left: Rational, right: Rational): Rational = left + right
-    override inline fun multiply(left: Rational, right: Rational): Rational = left * right
-    override inline fun divide(left: Rational, right: Rational): Rational = left / right
-    override inline fun scale(a: Rational, value: Double): Rational = a * number(value)
-
-    override inline fun Rational.unaryMinus(): Rational = -this
-    override inline fun Rational.plus(arg: Rational): Rational = this + arg
-    override inline fun Rational.minus(arg: Rational): Rational = this - arg
-    override inline fun Rational.times(arg: Rational): Rational = this * arg
-    override inline fun Rational.div(arg: Rational): Rational = this / arg
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
deleted file mode 100644
index 05d9115fa..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-
-class RationalWithMemorization private constructor(
-    val value: Rational,
-    override val memory : OperationsMemory
-): WithMemorization {
-    companion object {
-        /**
-         * Constant containing the zero (the additive identity) of the [Rational] field.
-         */
-        public val ZERO: RationalWithMemorization = RationalWithMemorization(Rational.ZERO, object : Endpoint {})
-        /**
-         * Constant containing the one (the multiplicative identity) of the [Rational] field.
-         */
-        public val ONE: RationalWithMemorization = RationalWithMemorization(Rational.ONE, object : Endpoint {})
-    }
-    constructor(numerator: Int, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
-    constructor(numerator: Int, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
-    constructor(numerator: Long, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
-    constructor(numerator: Long, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
-    constructor(numerator: Int) : this(Rational(numerator), object : Endpoint {})
-    constructor(numerator: Long) : this(Rational(numerator), object : Endpoint {})
-
-    operator fun unaryPlus(): RationalWithMemorization = this
-    operator fun unaryMinus(): RationalWithMemorization = RationalWithMemorization(
-        -value,
-        object : Negation {
-            override val negated: OperationsMemory = memory
-        }
-    )
-    operator fun plus(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
-        value + other.value,
-        object : Sum {
-            override val augend: OperationsMemory = memory
-            override val addend: OperationsMemory = other.memory
-        }
-    )
-    operator fun minus(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
-        value - other.value,
-        object : Difference {
-            override val minuend: OperationsMemory = memory
-            override val subtrahend: OperationsMemory = other.memory
-        }
-    )
-    operator fun times(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
-        value * other.value,
-        object : Product {
-            override val multiplicand: OperationsMemory = memory
-            override val multiplier: OperationsMemory = other.memory
-        }
-    )
-    operator fun div(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
-        value / other.value,
-        object : Quotient {
-            override val dividend: OperationsMemory = memory
-            override val divisor: OperationsMemory = other.memory
-        }
-    )
-
-    override fun equals(other: Any?): Boolean =
-        other is RationalWithMemorization && value == other.value
-
-    override fun hashCode(): Int = value.hashCode()
-
-    override fun toString(): String = value.toString()
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-object RationalWithMemorizationRing : Ring<RationalWithMemorization> {
-    override inline val zero: RationalWithMemorization get() = RationalWithMemorization.ZERO
-    override inline val one: RationalWithMemorization get() = RationalWithMemorization.ONE
-
-    override inline fun add(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left + right
-    override inline fun multiply(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left * right
-
-    override inline fun RationalWithMemorization.unaryMinus(): RationalWithMemorization = -this
-    override inline fun RationalWithMemorization.plus(arg: RationalWithMemorization): RationalWithMemorization = this + arg
-    override inline fun RationalWithMemorization.minus(arg: RationalWithMemorization): RationalWithMemorization = this - arg
-    override inline fun RationalWithMemorization.times(arg: RationalWithMemorization): RationalWithMemorization = this * arg
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-object RationalWithMemorizationField : Field<RationalWithMemorization> {
-    override inline val zero: RationalWithMemorization get() = RationalWithMemorization.ZERO
-    override inline val one: RationalWithMemorization get() = RationalWithMemorization.ONE
-
-    override inline fun number(value: Number): RationalWithMemorization = RationalWithMemorization(value.toLong())
-
-    override inline fun add(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left + right
-    override inline fun multiply(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left * right
-    override inline fun divide(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left / right
-    override inline fun scale(a: RationalWithMemorization, value: Double): RationalWithMemorization = a * number(value)
-
-    override inline fun RationalWithMemorization.unaryMinus(): RationalWithMemorization = -this
-    override inline fun RationalWithMemorization.plus(arg: RationalWithMemorization): RationalWithMemorization = this + arg
-    override inline fun RationalWithMemorization.minus(arg: RationalWithMemorization): RationalWithMemorization = this - arg
-    override inline fun RationalWithMemorization.times(arg: RationalWithMemorization): RationalWithMemorization = this * arg
-    override inline fun RationalWithMemorization.div(arg: RationalWithMemorization): RationalWithMemorization = this / arg
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt
deleted file mode 100644
index a4fb81274..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-sealed interface OperationsMemory
-
-interface Endpoint: OperationsMemory
-
-interface Negation: OperationsMemory {
-    val negated: OperationsMemory
-}
-
-interface Sum: OperationsMemory {
-    val augend: OperationsMemory
-    val addend: OperationsMemory
-}
-
-interface Difference: OperationsMemory {
-    val minuend: OperationsMemory
-    val subtrahend: OperationsMemory
-}
-
-interface Product: OperationsMemory {
-    val multiplicand: OperationsMemory
-    val multiplier: OperationsMemory
-}
-
-interface Quotient: OperationsMemory {
-    val dividend: OperationsMemory
-    val divisor: OperationsMemory
-}
-
-
-fun equalMemories(one: OperationsMemory, other: OperationsMemory) : Boolean =
-    when(one) {
-        is Negation -> other is Negation && equalMemories(one.negated, other.negated)
-        is Sum -> other is Sum && equalMemories(one.augend, other.augend) && equalMemories(one.addend, other.addend)
-        is Difference -> other is Difference && equalMemories(one.minuend, other.minuend) && equalMemories(one.subtrahend, other.subtrahend)
-        is Product -> other is Product && equalMemories(one.multiplicand, other.multiplicand) && equalMemories(one.multiplier, other.multiplier)
-        is Quotient -> other is Quotient && equalMemories(one.dividend, other.dividend) && equalMemories(one.divisor, other.divisor)
-        is Endpoint -> one === other
-    }
-
-interface WithMemorization {
-    val memory: OperationsMemory
-}
-
-fun equalMemories(one: WithMemorization, other: WithMemorization) : Boolean = equalMemories(one.memory, other.memory)
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
deleted file mode 100644
index cc647fa2c..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-// TODO: Move to corresponding module "kmath-number-theory"
-
-import kotlin.math.abs
-
-
-data class BezoutIdentityWithGCD<T>(val first: T, val second: T, val gcd: T)
-
-tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
-
-fun bezoutIdentityWithGCD(a: Int, b: Int): BezoutIdentityWithGCD<Int> =
-    when {
-        a < 0 && b < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, -second, gcd) }
-        a < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, second, gcd) }
-        b < 0 -> with(bezoutIdentityWithGCDInternalLogic(a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(first, -second, gcd) }
-        else -> bezoutIdentityWithGCDInternalLogic(a, b, 1, 0, 0, 1)
-    }
-
-internal tailrec fun bezoutIdentityWithGCDInternalLogic(a: Int, b: Int, m1: Int, m2: Int, m3: Int, m4: Int): BezoutIdentityWithGCD<Int> =
-    if (b == 0) BezoutIdentityWithGCD(m1, m3, a)
-    else {
-        val quotient = a / b
-        val reminder = a % b
-        bezoutIdentityWithGCDInternalLogic(b, reminder, m2, m1 - quotient * m2, m4, m3 - quotient * m4)
-    }
\ No newline at end of file
-- 
2.34.1


From a6b86eeee122ce42229ccef2fb3372828e36b3bc Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 11 Jun 2022 19:31:01 +0300
Subject: [PATCH 516/713] Cleaned out useless code.

---
 .../kscience/kmath/test/misc/IntModulo.kt     | 142 ------------------
 .../kscience/kmath/test/misc/Rational.kt      | 135 -----------------
 .../test/misc/RationalWithMemorization.kt     | 107 -------------
 .../kscience/kmath/test/misc/memorization.kt  |  51 -------
 .../space/kscience/kmath/test/misc/misc.kt    |  31 ----
 5 files changed, 466 deletions(-)
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt

diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
deleted file mode 100644
index 2353beee6..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-import space.kscience.kmath.functions.ListPolynomial
-import space.kscience.kmath.functions.ListPolynomialSpace
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-
-
-class IntModulo {
-    val residue: Int
-    val modulus: Int
-
-    @PublishedApi
-    internal constructor(residue: Int, modulus: Int, toCheckInput: Boolean = true) {
-        if (toCheckInput) {
-            require(modulus != 0) { "modulus can not be zero" }
-            this.modulus = if (modulus < 0) -modulus else modulus
-            this.residue = residue.mod(modulus)
-        } else {
-            this.residue = residue
-            this.modulus = modulus
-        }
-    }
-
-    constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
-
-    operator fun unaryPlus(): IntModulo = this
-    operator fun unaryMinus(): IntModulo =
-        IntModulo(
-            if (residue == 0) 0 else modulus - residue,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun plus(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not add two residue different modulo" }
-        return IntModulo(
-            (residue + other.residue) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun plus(other: Int): IntModulo =
-        IntModulo(
-            (residue + other) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun minus(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not subtract two residue different modulo" }
-        return IntModulo(
-            (residue - other.residue) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun minus(other: Int): IntModulo =
-        IntModulo(
-            (residue - other) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun times(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not multiply two residue different modulo" }
-        return IntModulo(
-            (residue * other.residue) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun times(other: Int): IntModulo =
-        IntModulo(
-            (residue * other) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun div(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not divide two residue different modulo" }
-        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other.residue, modulus)
-        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
-        return IntModulo(
-            (residue * reciprocalCandidate) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun div(other: Int): IntModulo {
-        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other, modulus)
-        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
-        return IntModulo(
-            (residue * reciprocalCandidate) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    override fun equals(other: Any?): Boolean =
-        when (other) {
-            is IntModulo -> residue == other.residue && modulus == other.modulus
-            else -> false
-        }
-
-    override fun hashCode(): Int = residue.hashCode()
-
-    override fun toString(): String = "$residue mod $modulus"
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-@OptIn(UnstableKMathAPI::class)
-class IntModuloRing : Ring<IntModulo> {
-
-    val modulus: Int
-
-    constructor(modulus: Int) {
-        require(modulus != 0) { "modulus can not be zero" }
-        this.modulus = if (modulus < 0) -modulus else modulus
-    }
-
-    override inline val zero: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
-    override inline val one: IntModulo get() = IntModulo(1, modulus, toCheckInput = false)
-
-    fun number(arg: Int) = IntModulo(arg, modulus, toCheckInput = false)
-
-    override inline fun add(left: IntModulo, right: IntModulo): IntModulo = left + right
-    override inline fun multiply(left: IntModulo, right: IntModulo): IntModulo = left * right
-
-    override inline fun IntModulo.unaryMinus(): IntModulo = -this
-    override inline fun IntModulo.plus(arg: IntModulo): IntModulo = this + arg
-    override inline fun IntModulo.minus(arg: IntModulo): IntModulo = this - arg
-    override inline fun IntModulo.times(arg: IntModulo): IntModulo = this * arg
-    inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
-}
-
-fun ListPolynomialSpace<IntModulo, IntModuloRing>.number(arg: Int) = IntModulo(arg, ring.modulus, toCheckInput = false)
-
-fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
-    ListPolynomial(coefs.map { IntModulo(it, ring.modulus) })
-fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
-    ListPolynomial(coefs.map { IntModulo(it, modulus) })
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
deleted file mode 100644
index 72bb5942c..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.NumbersAddOps
-
-class Rational {
-    companion object {
-        val ZERO: Rational = Rational(0L)
-        val ONE: Rational = Rational(1L)
-    }
-
-    val numerator: Long
-    val denominator: Long
-
-    internal constructor(numerator: Long, denominator: Long, toCheckInput: Boolean = true) {
-        if (toCheckInput) {
-            if (denominator == 0L) throw ArithmeticException("/ by zero")
-
-            val greatestCommonDivider = gcd(numerator, denominator).let { if (denominator < 0L) -it else it }
-
-            this.numerator = numerator / greatestCommonDivider
-            this.denominator = denominator / greatestCommonDivider
-        } else {
-            this.numerator = numerator
-            this.denominator = denominator
-        }
-    }
-
-    constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
-    constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
-    constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
-    constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
-    constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
-    constructor(numerator: Long) : this(numerator, 1L, false)
-
-    operator fun unaryPlus(): Rational = this
-    operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
-    operator fun plus(other: Rational): Rational =
-        Rational(
-            numerator * other.denominator + denominator * other.numerator,
-            denominator * other.denominator
-        )
-    operator fun plus(other: Int): Rational =
-        Rational(
-            numerator + denominator * other.toLong(),
-            denominator
-        )
-    operator fun plus(other: Long): Rational =
-        Rational(
-            numerator + denominator * other,
-            denominator
-        )
-    operator fun minus(other: Rational): Rational =
-        Rational(
-            numerator * other.denominator - denominator * other.numerator,
-            denominator * other.denominator
-        )
-    operator fun minus(other: Int): Rational =
-        Rational(
-            numerator - denominator * other.toLong(),
-            denominator
-        )
-    operator fun minus(other: Long): Rational =
-        Rational(
-            numerator - denominator * other,
-            denominator
-        )
-    operator fun times(other: Rational): Rational =
-        Rational(
-            numerator * other.numerator,
-            denominator * other.denominator
-        )
-    operator fun times(other: Int): Rational =
-        Rational(
-            numerator * other.toLong(),
-            denominator
-        )
-    operator fun times(other: Long): Rational =
-        Rational(
-            numerator * other,
-            denominator
-        )
-    operator fun div(other: Rational): Rational =
-        Rational(
-            numerator * other.denominator,
-            denominator * other.numerator
-        )
-    operator fun div(other: Int): Rational =
-        Rational(
-            numerator,
-            denominator * other.toLong()
-        )
-    operator fun div(other: Long): Rational =
-        Rational(
-            numerator,
-            denominator * other
-        )
-    override fun equals(other: Any?): Boolean =
-        when (other) {
-            is Rational -> numerator == other.numerator && denominator == other.denominator
-            is Int -> numerator == other && denominator == 1L
-            is Long -> numerator == other && denominator == 1L
-            else -> false
-        }
-
-    override fun hashCode(): Int = 31 * numerator.hashCode() + denominator.hashCode()
-
-    override fun toString(): String = if (denominator == 1L) "$numerator" else "$numerator/$denominator"
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-@OptIn(UnstableKMathAPI::class)
-object RationalField : Field<Rational>, NumbersAddOps<Rational> {
-    override inline val zero: Rational get() = Rational.ZERO
-    override inline val one: Rational get() = Rational.ONE
-
-    override inline fun number(value: Number): Rational = Rational(value.toLong())
-
-    override inline fun add(left: Rational, right: Rational): Rational = left + right
-    override inline fun multiply(left: Rational, right: Rational): Rational = left * right
-    override inline fun divide(left: Rational, right: Rational): Rational = left / right
-    override inline fun scale(a: Rational, value: Double): Rational = a * number(value)
-
-    override inline fun Rational.unaryMinus(): Rational = -this
-    override inline fun Rational.plus(arg: Rational): Rational = this + arg
-    override inline fun Rational.minus(arg: Rational): Rational = this - arg
-    override inline fun Rational.times(arg: Rational): Rational = this * arg
-    override inline fun Rational.div(arg: Rational): Rational = this / arg
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
deleted file mode 100644
index 05d9115fa..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/RationalWithMemorization.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-
-class RationalWithMemorization private constructor(
-    val value: Rational,
-    override val memory : OperationsMemory
-): WithMemorization {
-    companion object {
-        /**
-         * Constant containing the zero (the additive identity) of the [Rational] field.
-         */
-        public val ZERO: RationalWithMemorization = RationalWithMemorization(Rational.ZERO, object : Endpoint {})
-        /**
-         * Constant containing the one (the multiplicative identity) of the [Rational] field.
-         */
-        public val ONE: RationalWithMemorization = RationalWithMemorization(Rational.ONE, object : Endpoint {})
-    }
-    constructor(numerator: Int, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
-    constructor(numerator: Int, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
-    constructor(numerator: Long, denominator: Int) : this(Rational(numerator, denominator), object : Endpoint {})
-    constructor(numerator: Long, denominator: Long) : this(Rational(numerator, denominator), object : Endpoint {})
-    constructor(numerator: Int) : this(Rational(numerator), object : Endpoint {})
-    constructor(numerator: Long) : this(Rational(numerator), object : Endpoint {})
-
-    operator fun unaryPlus(): RationalWithMemorization = this
-    operator fun unaryMinus(): RationalWithMemorization = RationalWithMemorization(
-        -value,
-        object : Negation {
-            override val negated: OperationsMemory = memory
-        }
-    )
-    operator fun plus(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
-        value + other.value,
-        object : Sum {
-            override val augend: OperationsMemory = memory
-            override val addend: OperationsMemory = other.memory
-        }
-    )
-    operator fun minus(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
-        value - other.value,
-        object : Difference {
-            override val minuend: OperationsMemory = memory
-            override val subtrahend: OperationsMemory = other.memory
-        }
-    )
-    operator fun times(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
-        value * other.value,
-        object : Product {
-            override val multiplicand: OperationsMemory = memory
-            override val multiplier: OperationsMemory = other.memory
-        }
-    )
-    operator fun div(other: RationalWithMemorization): RationalWithMemorization = RationalWithMemorization(
-        value / other.value,
-        object : Quotient {
-            override val dividend: OperationsMemory = memory
-            override val divisor: OperationsMemory = other.memory
-        }
-    )
-
-    override fun equals(other: Any?): Boolean =
-        other is RationalWithMemorization && value == other.value
-
-    override fun hashCode(): Int = value.hashCode()
-
-    override fun toString(): String = value.toString()
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-object RationalWithMemorizationRing : Ring<RationalWithMemorization> {
-    override inline val zero: RationalWithMemorization get() = RationalWithMemorization.ZERO
-    override inline val one: RationalWithMemorization get() = RationalWithMemorization.ONE
-
-    override inline fun add(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left + right
-    override inline fun multiply(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left * right
-
-    override inline fun RationalWithMemorization.unaryMinus(): RationalWithMemorization = -this
-    override inline fun RationalWithMemorization.plus(arg: RationalWithMemorization): RationalWithMemorization = this + arg
-    override inline fun RationalWithMemorization.minus(arg: RationalWithMemorization): RationalWithMemorization = this - arg
-    override inline fun RationalWithMemorization.times(arg: RationalWithMemorization): RationalWithMemorization = this * arg
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-object RationalWithMemorizationField : Field<RationalWithMemorization> {
-    override inline val zero: RationalWithMemorization get() = RationalWithMemorization.ZERO
-    override inline val one: RationalWithMemorization get() = RationalWithMemorization.ONE
-
-    override inline fun number(value: Number): RationalWithMemorization = RationalWithMemorization(value.toLong())
-
-    override inline fun add(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left + right
-    override inline fun multiply(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left * right
-    override inline fun divide(left: RationalWithMemorization, right: RationalWithMemorization): RationalWithMemorization = left / right
-    override inline fun scale(a: RationalWithMemorization, value: Double): RationalWithMemorization = a * number(value)
-
-    override inline fun RationalWithMemorization.unaryMinus(): RationalWithMemorization = -this
-    override inline fun RationalWithMemorization.plus(arg: RationalWithMemorization): RationalWithMemorization = this + arg
-    override inline fun RationalWithMemorization.minus(arg: RationalWithMemorization): RationalWithMemorization = this - arg
-    override inline fun RationalWithMemorization.times(arg: RationalWithMemorization): RationalWithMemorization = this * arg
-    override inline fun RationalWithMemorization.div(arg: RationalWithMemorization): RationalWithMemorization = this / arg
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt
deleted file mode 100644
index a4fb81274..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/memorization.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-sealed interface OperationsMemory
-
-interface Endpoint: OperationsMemory
-
-interface Negation: OperationsMemory {
-    val negated: OperationsMemory
-}
-
-interface Sum: OperationsMemory {
-    val augend: OperationsMemory
-    val addend: OperationsMemory
-}
-
-interface Difference: OperationsMemory {
-    val minuend: OperationsMemory
-    val subtrahend: OperationsMemory
-}
-
-interface Product: OperationsMemory {
-    val multiplicand: OperationsMemory
-    val multiplier: OperationsMemory
-}
-
-interface Quotient: OperationsMemory {
-    val dividend: OperationsMemory
-    val divisor: OperationsMemory
-}
-
-
-fun equalMemories(one: OperationsMemory, other: OperationsMemory) : Boolean =
-    when(one) {
-        is Negation -> other is Negation && equalMemories(one.negated, other.negated)
-        is Sum -> other is Sum && equalMemories(one.augend, other.augend) && equalMemories(one.addend, other.addend)
-        is Difference -> other is Difference && equalMemories(one.minuend, other.minuend) && equalMemories(one.subtrahend, other.subtrahend)
-        is Product -> other is Product && equalMemories(one.multiplicand, other.multiplicand) && equalMemories(one.multiplier, other.multiplier)
-        is Quotient -> other is Quotient && equalMemories(one.dividend, other.dividend) && equalMemories(one.divisor, other.divisor)
-        is Endpoint -> one === other
-    }
-
-interface WithMemorization {
-    val memory: OperationsMemory
-}
-
-fun equalMemories(one: WithMemorization, other: WithMemorization) : Boolean = equalMemories(one.memory, other.memory)
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
deleted file mode 100644
index cc647fa2c..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.test.misc
-
-// TODO: Move to corresponding module "kmath-number-theory"
-
-import kotlin.math.abs
-
-
-data class BezoutIdentityWithGCD<T>(val first: T, val second: T, val gcd: T)
-
-tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
-
-fun bezoutIdentityWithGCD(a: Int, b: Int): BezoutIdentityWithGCD<Int> =
-    when {
-        a < 0 && b < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, -second, gcd) }
-        a < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, second, gcd) }
-        b < 0 -> with(bezoutIdentityWithGCDInternalLogic(a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(first, -second, gcd) }
-        else -> bezoutIdentityWithGCDInternalLogic(a, b, 1, 0, 0, 1)
-    }
-
-internal tailrec fun bezoutIdentityWithGCDInternalLogic(a: Int, b: Int, m1: Int, m2: Int, m3: Int, m4: Int): BezoutIdentityWithGCD<Int> =
-    if (b == 0) BezoutIdentityWithGCD(m1, m3, a)
-    else {
-        val quotient = a / b
-        val reminder = a % b
-        bezoutIdentityWithGCDInternalLogic(b, reminder, m2, m1 - quotient * m2, m4, m3 - quotient * m4)
-    }
\ No newline at end of file
-- 
2.34.1


From 17703e407dd33dcddff3608c9a8fa06c052af8d7 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 12 Jun 2022 00:24:23 +0300
Subject: [PATCH 517/713] Applied changes from previous sift.

---
 .../kscience/kmath/functions/Polynomial.kt    | 150 ++++--
 .../kmath/functions/RationalFunction.kt       | 467 +++++++++++++-----
 2 files changed, 468 insertions(+), 149 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index e201f1f6e..f2eba10d5 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -25,38 +25,38 @@ public interface Polynomial<C>
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
 public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public operator fun C.plus(other: Int): C
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public operator fun C.minus(other: Int): C
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun C.times(other: Int): C
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public operator fun Int.plus(other: C): C
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public operator fun Int.minus(other: C): C
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -72,38 +72,38 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     public fun Int.asConstant(): C = constantNumber(this)
 
     /**
-     * Returns sum of the polynomial and the integer represented as polynomial.
+     * Returns sum of the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public operator fun P.plus(other: Int): P = addMultipliedByDoubling(this, one, other)
     /**
-     * Returns difference between the polynomial and the integer represented as polynomial.
+     * Returns difference between the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public operator fun P.minus(other: Int): P = addMultipliedByDoubling(this, one, -other)
     /**
-     * Returns product of the polynomial and the integer represented as polynomial.
+     * Returns product of the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun P.times(other: Int): P = multiplyByDoubling(this, other)
 
     /**
-     * Returns sum of the integer represented as polynomial and the polynomial.
+     * Returns sum of the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public operator fun Int.plus(other: P): P = addMultipliedByDoubling(other, one, this)
     /**
-     * Returns difference between the integer represented as polynomial and the polynomial.
+     * Returns difference between the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public operator fun Int.minus(other: P): P = addMultipliedByDoubling(-other, one, this)
     /**
-     * Returns product of the integer represented as polynomial and the polynomial.
+     * Returns product of the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -165,28 +165,28 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     public val constantOne: C
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.plus(other: P): P
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.minus(other: P): P
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.times(other: P): P
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.plus(other: C): P
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.minus(other: C): P
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.times(other: C): P
 
@@ -254,41 +254,44 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : PolynomialSpace<C, P> {
 
+    /**
+     * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
+     */
     public val ring: A
 
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -330,58 +333,143 @@ public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : Poly
     public override val constantOne: C get() = ring.one
 }
 
+/**
+ * Abstraction of ring of polynomials of type [P] of variables of type [V] and over ring of constants of type [C].
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param V the type of variables. Polynomials have them in representations of terms.
+ * @param P the type of polynomials.
+ */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface MultivariatePolynomialSpace<C, V, P: Polynomial<C>>: PolynomialSpace<C, P> {
+    /**
+     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("plusVariableInt")
     public operator fun V.plus(other: Int): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("minusVariableInt")
     public operator fun V.minus(other: Int): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("timesVariableInt")
     public operator fun V.times(other: Int): P
 
+    /**
+     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusIntVariable")
     public operator fun Int.plus(other: V): P
+    /**
+     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusIntVariable")
     public operator fun Int.minus(other: V): P
+    /**
+     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesIntVariable")
     public operator fun Int.times(other: V): P
 
-    @JvmName("plusConstantVariable")
-    public operator fun C.plus(other: V): P
-    @JvmName("minusConstantVariable")
-    public operator fun C.minus(other: V): P
-    @JvmName("timesConstantVariable")
-    public operator fun C.times(other: V): P
-
+    /**
+     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("plusVariableConstant")
     public operator fun V.plus(other: C): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("minusVariableConstant")
     public operator fun V.minus(other: C): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("timesVariableConstant")
     public operator fun V.times(other: C): P
 
+    /**
+     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("plusConstantVariable")
+    public operator fun C.plus(other: V): P
+    /**
+     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("minusConstantVariable")
+    public operator fun C.minus(other: V): P
+    /**
+     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("timesConstantVariable")
+    public operator fun C.times(other: V): P
+
+    /**
+     * Represents the variable as a monic monomial.
+     */
     @JvmName("unaryPlusVariable")
     public operator fun V.unaryPlus(): P
+    /**
+     * Returns negation of representation of the variable as a monic monomial.
+     */
     @JvmName("unaryMinusVariable")
     public operator fun V.unaryMinus(): P
+    /**
+     * Returns sum of the variables represented as monic monomials.
+     */
     @JvmName("plusVariableVariable")
     public operator fun V.plus(other: V): P
+    /**
+     * Returns difference between the variables represented as monic monomials.
+     */
     @JvmName("minusVariableVariable")
     public operator fun V.minus(other: V): P
+    /**
+     * Returns product of the variables represented as monic monomials.
+     */
     @JvmName("timesVariableVariable")
     public operator fun V.times(other: V): P
 
+    /**
+     * Represents the [variable] as a monic monomial.
+     */
+    public fun number(variable: V): P = +variable
+    /**
+     * Represents the variable as a monic monomial.
+     */
+    public fun V.asPolynomial(): P = number(this)
+
+    /**
+     * Returns sum of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("plusVariablePolynomial")
     public operator fun V.plus(other: P): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("minusVariablePolynomial")
     public operator fun V.minus(other: P): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("timesVariablePolynomial")
     public operator fun V.times(other: P): P
 
+    /**
+     * Returns sum of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusPolynomialVariable")
     public operator fun P.plus(other: V): P
+    /**
+     * Returns difference between the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusPolynomialVariable")
     public operator fun P.minus(other: V): P
+    /**
+     * Returns product of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesPolynomialVariable")
     public operator fun P.times(other: V): P
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index dfec126f3..edc9dfa5c 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -25,44 +25,44 @@ public interface RationalFunction<C, P: Polynomial<C>> {
  * [C].
  *
  * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators.
  * @param R the type of rational functions.
  */
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
 public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunction<C, P>> : Ring<R> {
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public operator fun C.plus(other: Int): C
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public operator fun C.minus(other: Int): C
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun C.times(other: Int): C
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public operator fun Int.plus(other: C): C
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public operator fun Int.minus(other: C): C
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -78,38 +78,38 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public fun Int.asConstant(): C = constantNumber(this)
 
     /**
-     * Returns sum of the constant and the integer represented as polynomial.
+     * Returns sum of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public operator fun P.plus(other: Int): P
     /**
-     * Returns difference between the constant and the integer represented as polynomial.
+     * Returns difference between the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public operator fun P.minus(other: Int): P
     /**
-     * Returns product of the constant and the integer represented as polynomial.
+     * Returns product of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun P.times(other: Int): P
 
     /**
-     * Returns sum of the integer represented as polynomial and the constant.
+     * Returns sum of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public operator fun Int.plus(other: P): P
     /**
-     * Returns difference between the integer represented as polynomial and the constant.
+     * Returns difference between the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public operator fun Int.minus(other: P): P
     /**
-     * Returns product of the integer represented as polynomial and the constant.
+     * Returns product of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -125,25 +125,25 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public fun Int.asPolynomial(): P = polynomialNumber(this)
 
     /**
-     * Returns sum of the rational function and the integer represented as rational function.
+     * Returns sum of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public operator fun R.plus(other: Int): R = addMultipliedByDoubling(this, one, other)
     /**
-     * Returns difference between the rational function and the integer represented as rational function.
+     * Returns difference between the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public operator fun R.minus(other: Int): R = addMultipliedByDoubling(this, one, -other)
     /**
-     * Returns product of the rational function and the integer represented as rational function.
+     * Returns product of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun R.times(other: Int): R = multiplyByDoubling(this, other)
     /**
-     * Returns quotient of the rational function and the integer represented as rational function.
+     * Returns quotient of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to creating a new rational function by preserving numerator of [this] and
      * multiplication denominator of [this] to [other].
@@ -151,25 +151,25 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public operator fun R.div(other: Int): R = this / multiplyByDoubling(one, other)
 
     /**
-     * Returns sum of the integer represented as rational function and the rational function.
+     * Returns sum of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public operator fun Int.plus(other: R): R = addMultipliedByDoubling(other, one, this)
     /**
-     * Returns difference between the integer represented as rational function and the rational function.
+     * Returns difference between the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public operator fun Int.minus(other: R): R = addMultipliedByDoubling(-other, one, this)
     /**
-     * Returns product of the integer represented as rational function and the rational function.
+     * Returns product of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public operator fun Int.times(other: R): R = multiplyByDoubling(other, this)
     /**
-     * Returns quotient of the integer represented as rational function and the rational function.
+     * Returns quotient of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to creating a new rational function which numerator is [this] times denominator of
      * [other] and which denominator is [other]'s numerator.
@@ -232,28 +232,28 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public val constantOne: C
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.plus(other: P): P
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.minus(other: P): P
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.times(other: P): P
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.plus(other: C): P
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.minus(other: C): P
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.times(other: C): P
 
@@ -305,36 +305,36 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public val polynomialOne: P
 
     /**
-     * Returns sum of the constant represented as rational function and the rational function.
+     * Returns sum of the constant represented as a rational function and the rational function.
      */
     public operator fun C.plus(other: R): R
     /**
-     * Returns difference between the constant represented as polynomial and the rational function.
+     * Returns difference between the constant represented as a polynomial and the rational function.
      */
     public operator fun C.minus(other: R): R
     /**
-     * Returns product of the constant represented as polynomial and the rational function.
+     * Returns product of the constant represented as a polynomial and the rational function.
      */
     public operator fun C.times(other: R): R
     /**
-     * Returns quotient of the constant represented as polynomial and the rational function.
+     * Returns quotient of the constant represented as a polynomial and the rational function.
      */
     public operator fun C.div(other: R): R
 
     /**
-     * Returns sum of the rational function and the constant represented as rational function.
+     * Returns sum of the rational function and the constant represented as a rational function.
      */
     public operator fun R.plus(other: C): R
     /**
-     * Returns difference between the rational function and the constant represented as rational function.
+     * Returns difference between the rational function and the constant represented as a rational function.
      */
     public operator fun R.minus(other: C): R
     /**
-     * Returns product of the rational function and the constant represented as rational function.
+     * Returns product of the rational function and the constant represented as a rational function.
      */
     public operator fun R.times(other: C): R
     /**
-     * Returns quotient of the rational function and the constant represented as rational function.
+     * Returns quotient of the rational function and the constant represented as a rational function.
      */
     public operator fun R.div(other: C): R
 
@@ -348,36 +348,36 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public fun C.asRationalFunction(): R = number(this)
 
     /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
+     * Returns sum of the polynomial represented as a rational function and the rational function.
      */
     public operator fun P.plus(other: R): R
     /**
-     * Returns difference between the polynomial represented as polynomial and the rational function.
+     * Returns difference between the polynomial represented as a polynomial and the rational function.
      */
     public operator fun P.minus(other: R): R
     /**
-     * Returns product of the polynomial represented as polynomial and the rational function.
+     * Returns product of the polynomial represented as a polynomial and the rational function.
      */
     public operator fun P.times(other: R): R
     /**
-     * Returns quotient of the polynomial represented as polynomial and the rational function.
+     * Returns quotient of the polynomial represented as a polynomial and the rational function.
      */
     public operator fun P.div(other: R): R
 
     /**
-     * Returns sum of the rational function and the polynomial represented as rational function.
+     * Returns sum of the rational function and the polynomial represented as a rational function.
      */
     public operator fun R.plus(other: P): R
     /**
-     * Returns difference between the rational function and the polynomial represented as rational function.
+     * Returns difference between the rational function and the polynomial represented as a rational function.
      */
     public operator fun R.minus(other: P): R
     /**
-     * Returns product of the rational function and the polynomial represented as rational function.
+     * Returns product of the rational function and the polynomial represented as a rational function.
      */
     public operator fun R.times(other: P): R
     /**
-     * Returns quotient of the rational function and the polynomial represented as rational function.
+     * Returns quotient of the rational function and the polynomial represented as a rational function.
      */
     public operator fun R.div(other: P): R
 
@@ -459,43 +459,51 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
  * @param A the type of algebraic structure (precisely, of ring) provided for constants.
  */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface RationalFunctionalSpaceOverRing<C, P: Polynomial<C>, R: RationalFunction<C, P>, A: Ring<C>> : RationalFunctionalSpace<C, P, R> {
+public interface RationalFunctionalSpaceOverRing<
+        C,
+        P: Polynomial<C>,
+        R: RationalFunction<C, P>,
+        A: Ring<C>
+        > : RationalFunctionalSpace<C, P, R> {
 
+    /**
+     * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
+     */
     public val ring: A
 
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -560,41 +568,44 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
         AP: PolynomialSpace<C, P>,
         > : RationalFunctionalSpace<C, P, R> {
 
+    /**
+     * Underlying polynomial ring. Its polynomial operations are inherited by local polynomial operations.
+     */
     public val polynomialRing: AP
 
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public override operator fun C.plus(other: Int): C = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public override operator fun C.minus(other: Int): C = polynomialRing { this@minus - other }
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun C.times(other: Int): C = polynomialRing { this@times * other }
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public override operator fun Int.plus(other: C): C = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public override operator fun Int.minus(other: C): C = polynomialRing { this@minus - other }
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -610,38 +621,38 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
     override fun Int.asConstant(): C = polynomialRing { asConstant() }
 
     /**
-     * Returns sum of the constant and the integer represented as polynomial.
+     * Returns sum of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public override operator fun P.plus(other: Int): P = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the constant and the integer represented as polynomial.
+     * Returns difference between the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public override operator fun P.minus(other: Int): P = polynomialRing { this@minus - other }
     /**
-     * Returns product of the constant and the integer represented as polynomial.
+     * Returns product of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun P.times(other: Int): P = polynomialRing { this@times * other }
 
     /**
-     * Returns sum of the integer represented as polynomial and the constant.
+     * Returns sum of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public override operator fun Int.plus(other: P): P = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the integer represented as polynomial and the constant.
+     * Returns difference between the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public override operator fun Int.minus(other: P): P = polynomialRing { this@minus - other }
     /**
-     * Returns product of the integer represented as polynomial and the constant.
+     * Returns product of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -697,28 +708,28 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
     public override val constantOne: C get() = polynomialRing.constantOne
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.plus(other: P): P = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.minus(other: P): P = polynomialRing { this@minus - other }
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.times(other: P): P = polynomialRing { this@times * other }
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun P.plus(other: C): P = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public override operator fun P.minus(other: C): P = polynomialRing { this@minus - other }
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun P.times(other: C): P = polynomialRing { this@times * other }
 
@@ -774,7 +785,8 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
 
 /**
  * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
- * [C]. It also assumes that there is provided constructor
+ * [C]. It also assumes that there is provided constructor [constructRationalFunction] of rational functions from
+ * polynomial numerator and denominator.
  *
  * @param C the type of constants. Polynomials have them as coefficients in their terms.
  * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
@@ -786,10 +798,14 @@ public abstract class PolynomialSpaceOfFractions<
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         > : RationalFunctionalSpace<C, P, R> {
+
+    /**
+     * Constructor of rational functions (of type [R]) from numerator and denominator (of type [P]).
+     */
     protected abstract fun constructRationalFunction(numerator: P, denominator: P = polynomialOne) : R
 
     /**
-     * Returns sum of the rational function and the integer represented as rational function.
+     * Returns sum of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
@@ -799,7 +815,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns difference between the rational function and the integer represented as rational function.
+     * Returns difference between the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
@@ -809,7 +825,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns product of the rational function and the integer represented as rational function.
+     * Returns product of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
@@ -826,7 +842,7 @@ public abstract class PolynomialSpaceOfFractions<
         )
 
     /**
-     * Returns sum of the integer represented as rational function and the rational function.
+     * Returns sum of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
@@ -836,7 +852,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns difference between the integer represented as rational function and the rational function.
+     * Returns difference between the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
@@ -846,7 +862,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns product of the integer represented as rational function and the rational function.
+     * Returns product of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -873,7 +889,7 @@ public abstract class PolynomialSpaceOfFractions<
     public override operator fun P.div(other: P): R = constructRationalFunction(this, other)
 
     /**
-     * Returns sum of the constant represented as rational function and the rational function.
+     * Returns sum of the constant represented as a rational function and the rational function.
      */
     public override operator fun C.plus(other: R): R =
         constructRationalFunction(
@@ -881,7 +897,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns difference between the constant represented as polynomial and the rational function.
+     * Returns difference between the constant represented as a polynomial and the rational function.
      */
     public override operator fun C.minus(other: R): R =
         constructRationalFunction(
@@ -889,7 +905,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns product of the constant represented as polynomial and the rational function.
+     * Returns product of the constant represented as a polynomial and the rational function.
      */
     public override operator fun C.times(other: R): R =
         constructRationalFunction(
@@ -904,7 +920,7 @@ public abstract class PolynomialSpaceOfFractions<
         )
 
     /**
-     * Returns sum of the constant represented as rational function and the rational function.
+     * Returns sum of the constant represented as a rational function and the rational function.
      */
     public override operator fun R.plus(other: C): R =
         constructRationalFunction(
@@ -912,7 +928,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns difference between the constant represented as rational function and the rational function.
+     * Returns difference between the constant represented as a rational function and the rational function.
      */
     public override operator fun R.minus(other: C): R =
         constructRationalFunction(
@@ -920,7 +936,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns product of the constant represented as rational function and the rational function.
+     * Returns product of the constant represented as a rational function and the rational function.
      */
     public override operator fun R.times(other: C): R =
         constructRationalFunction(
@@ -940,7 +956,7 @@ public abstract class PolynomialSpaceOfFractions<
     public override fun number(value: C): R = constructRationalFunction(polynomialNumber(value))
 
     /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
+     * Returns sum of the polynomial represented as a rational function and the rational function.
      */
     public override operator fun P.plus(other: R): R =
         constructRationalFunction(
@@ -948,7 +964,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns difference between the polynomial represented as polynomial and the rational function.
+     * Returns difference between the polynomial represented as a polynomial and the rational function.
      */
     public override operator fun P.minus(other: R): R =
         constructRationalFunction(
@@ -956,7 +972,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns product of the polynomial represented as polynomial and the rational function.
+     * Returns product of the polynomial represented as a polynomial and the rational function.
      */
     public override operator fun P.times(other: R): R =
         constructRationalFunction(
@@ -971,7 +987,7 @@ public abstract class PolynomialSpaceOfFractions<
         )
 
     /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
+     * Returns sum of the polynomial represented as a rational function and the rational function.
      */
     public override operator fun R.plus(other: P): R =
         constructRationalFunction(
@@ -979,7 +995,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns difference between the polynomial represented as rational function and the rational function.
+     * Returns difference between the polynomial represented as a rational function and the rational function.
      */
     public override operator fun R.minus(other: P): R =
         constructRationalFunction(
@@ -987,7 +1003,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns product of the polynomial represented as rational function and the rational function.
+     * Returns product of the polynomial represented as a rational function and the rational function.
      */
     public override operator fun R.times(other: P): R =
         constructRationalFunction(
@@ -1052,6 +1068,15 @@ public abstract class PolynomialSpaceOfFractions<
     public override val one: R get() = constructRationalFunction(polynomialOne)
 }
 
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] of variables of type
+ * [V] and over ring of constants of type [C].
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param V the type of variables. Polynomials have them in representations of terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface MultivariateRationalFunctionalSpace<
         C,
@@ -1059,70 +1084,175 @@ public interface MultivariateRationalFunctionalSpace<
         P: Polynomial<C>,
         R: RationalFunction<C, P>
         >: RationalFunctionalSpace<C, P, R> {
+    /**
+     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("plusVariableInt")
     public operator fun V.plus(other: Int): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("minusVariableInt")
     public operator fun V.minus(other: Int): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("timesVariableInt")
     public operator fun V.times(other: Int): P
 
+    /**
+     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusIntVariable")
     public operator fun Int.plus(other: V): P
+    /**
+     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusIntVariable")
     public operator fun Int.minus(other: V): P
+    /**
+     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesIntVariable")
     public operator fun Int.times(other: V): P
 
-    @JvmName("plusConstantVariable")
-    public operator fun C.plus(other: V): P
-    @JvmName("minusConstantVariable")
-    public operator fun C.minus(other: V): P
-    @JvmName("timesConstantVariable")
-    public operator fun C.times(other: V): P
-
+    /**
+     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("plusVariableConstant")
     public operator fun V.plus(other: C): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("minusVariableConstant")
     public operator fun V.minus(other: C): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("timesVariableConstant")
     public operator fun V.times(other: C): P
 
+    /**
+     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("plusConstantVariable")
+    public operator fun C.plus(other: V): P
+    /**
+     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("minusConstantVariable")
+    public operator fun C.minus(other: V): P
+    /**
+     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("timesConstantVariable")
+    public operator fun C.times(other: V): P
+
+    /**
+     * Represents the variable as a monic monomial.
+     */
     @JvmName("unaryPlusVariable")
     public operator fun V.unaryPlus(): P
+    /**
+     * Returns negation of representation of the variable as a monic monomial.
+     */
     @JvmName("unaryMinusVariable")
     public operator fun V.unaryMinus(): P
+    /**
+     * Returns sum of the variables represented as monic monomials.
+     */
     @JvmName("plusVariableVariable")
     public operator fun V.plus(other: V): P
+    /**
+     * Returns difference between the variables represented as monic monomials.
+     */
     @JvmName("minusVariableVariable")
     public operator fun V.minus(other: V): P
+    /**
+     * Returns product of the variables represented as monic monomials.
+     */
     @JvmName("timesVariableVariable")
     public operator fun V.times(other: V): P
 
+    /**
+     * Represents the [variable] as a monic monomial.
+     */
+    public fun polynomialNumber(variable: V): P = +variable
+    /**
+     * Represents the variable as a monic monomial.
+     */
+    public fun V.asPolynomial(): P = polynomialNumber(this)
+
+    /**
+     * Represents the [variable] as a rational function.
+     */
+    public fun number(variable: V): R = number(polynomialNumber(variable))
+    /**
+     * Represents the variable as a rational function.
+     */
+    public fun V.asRationalFunction(): R = number(this)
+
+    /**
+     * Returns sum of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("plusVariablePolynomial")
     public operator fun V.plus(other: P): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("minusVariablePolynomial")
     public operator fun V.minus(other: P): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("timesVariablePolynomial")
     public operator fun V.times(other: P): P
 
+    /**
+     * Returns sum of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusPolynomialVariable")
     public operator fun P.plus(other: V): P
+    /**
+     * Returns difference between the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusPolynomialVariable")
     public operator fun P.minus(other: V): P
+    /**
+     * Returns product of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesPolynomialVariable")
     public operator fun P.times(other: V): P
 
+    /**
+     * Returns sum of the variable represented as a rational function and the rational function.
+     */
     @JvmName("plusVariableRational")
     public operator fun V.plus(other: R): R
+    /**
+     * Returns difference between the variable represented as a rational function and the rational function.
+     */
     @JvmName("minusVariableRational")
     public operator fun V.minus(other: R): R
+    /**
+     * Returns product of the variable represented as a rational function and the rational function.
+     */
     @JvmName("timesVariableRational")
     public operator fun V.times(other: R): R
 
+    /**
+     * Returns sum of the rational function and the variable represented as a rational function.
+     */
     @JvmName("plusRationalVariable")
     public operator fun R.plus(other: V): R
+    /**
+     * Returns difference between the rational function and the variable represented as a rational function.
+     */
     @JvmName("minusRationalVariable")
     public operator fun R.minus(other: V): R
+    /**
+     * Returns product of the rational function and the variable represented as a rational function.
+     */
     @JvmName("timesRationalVariable")
     public operator fun R.times(other: V): R
 
@@ -1161,22 +1291,17 @@ public interface MultivariateRationalFunctionalSpace<
     public val R.countOfVariables: Int get() = variables.size
 }
 
-public interface MultivariateRationalFunctionalSpaceOverRing<
-        C,
-        V,
-        P: Polynomial<C>,
-        R: RationalFunction<C, P>,
-        A: Ring<C>
-        > : RationalFunctionalSpaceOverRing<C, P, R, A>, MultivariateRationalFunctionalSpace<C, V, P, R>
-
-public interface MultivariateRationalFunctionalSpaceOverPolynomialSpace<
-        C,
-        V,
-        P: Polynomial<C>,
-        R: RationalFunction<C, P>,
-        AP: PolynomialSpace<C, P>,
-        > : RationalFunctionalSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionalSpace<C, V, P, R>
-
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] of variables of type
+ * [V] and over ring of constants of type [C]. It also assumes that there is provided [polynomialRing] (of type [AP]),
+ * that provides constant-, variable- and polynomial-wise operations.
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param V the type of variables. Polynomials have them in representations of terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
+ */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSpace<
         C,
@@ -1184,57 +1309,135 @@ public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSp
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         AP: MultivariatePolynomialSpace<C, V, P>,
-        > : MultivariateRationalFunctionalSpaceOverPolynomialSpace<C, V, P, R, AP> {
+        > : RationalFunctionalSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionalSpace<C, V, P, R> {
+    /**
+     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("plusVariableInt")
     public override operator fun V.plus(other: Int): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("minusVariableInt")
     public override operator fun V.minus(other: Int): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("timesVariableInt")
     public override operator fun V.times(other: Int): P = polynomialRing { this@times * other }
 
+    /**
+     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusIntVariable")
     public override operator fun Int.plus(other: V): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusIntVariable")
     public override operator fun Int.minus(other: V): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesIntVariable")
     public override operator fun Int.times(other: V): P = polynomialRing { this@times * other }
 
-    @JvmName("plusConstantVariable")
-    public override operator fun C.plus(other: V): P = polynomialRing { this@plus + other }
-    @JvmName("minusConstantVariable")
-    public override operator fun C.minus(other: V): P = polynomialRing { this@minus - other }
-    @JvmName("timesConstantVariable")
-    public override operator fun C.times(other: V): P = polynomialRing { this@times * other }
-
+    /**
+     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("plusVariableConstant")
     public override operator fun V.plus(other: C): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("minusVariableConstant")
     public override operator fun V.minus(other: C): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("timesVariableConstant")
     public override operator fun V.times(other: C): P = polynomialRing { this@times * other }
 
+    /**
+     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("plusConstantVariable")
+    public override operator fun C.plus(other: V): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("minusConstantVariable")
+    public override operator fun C.minus(other: V): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("timesConstantVariable")
+    public override operator fun C.times(other: V): P = polynomialRing { this@times * other }
+
+    /**
+     * Represents the variable as a monic monomial.
+     */
     @JvmName("unaryPlusVariable")
     public override operator fun V.unaryPlus(): P = polynomialRing { +this@unaryPlus }
+    /**
+     * Returns negation of representation of the variable as a monic monomial.
+     */
     @JvmName("unaryMinusVariable")
     public override operator fun V.unaryMinus(): P = polynomialRing { -this@unaryMinus }
+    /**
+     * Returns sum of the variables represented as monic monomials.
+     */
     @JvmName("plusVariableVariable")
     public override operator fun V.plus(other: V): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the variables represented as monic monomials.
+     */
     @JvmName("minusVariableVariable")
     public override operator fun V.minus(other: V): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the variables represented as monic monomials.
+     */
     @JvmName("timesVariableVariable")
     public override operator fun V.times(other: V): P = polynomialRing { this@times * other }
 
+    /**
+     * Represents the [variable] as a monic monomial.
+     */
+    public override fun polynomialNumber(variable: V): P = polynomialRing { number(variable) }
+    /**
+     * Represents the variable as a monic monomial.
+     */
+    public override fun V.asPolynomial(): P = polynomialRing { this@asPolynomial.asPolynomial() }
+
+    /**
+     * Returns sum of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("plusVariablePolynomial")
     public override operator fun V.plus(other: P): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("minusVariablePolynomial")
     public override operator fun V.minus(other: P): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("timesVariablePolynomial")
     public override operator fun V.times(other: P): P = polynomialRing { this@times * other }
 
+    /**
+     * Returns sum of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusPolynomialVariable")
     public override operator fun P.plus(other: V): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusPolynomialVariable")
     public override operator fun P.minus(other: V): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesPolynomialVariable")
     public override operator fun P.times(other: V): P = polynomialRing { this@times * other }
 
@@ -1264,6 +1467,16 @@ public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSp
     public override val P.countOfVariables: Int get() = polynomialRing { countOfVariables }
 }
 
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] of variables of type
+ * [V] and over ring of constants of type [C]. It also assumes that there is provided constructor
+ * [constructRationalFunction] of rational functions from polynomial numerator and denominator.
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param V the type of variables. Polynomials have them in representations of terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public abstract class MultivariatePolynomialSpaceOfFractions<
         C,
@@ -1271,18 +1484,27 @@ public abstract class MultivariatePolynomialSpaceOfFractions<
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         > : MultivariateRationalFunctionalSpace<C, V, P, R>,  PolynomialSpaceOfFractions<C, P, R>() {
+    /**
+     * Returns sum of the variable represented as a rational function and the rational function.
+     */
     @JvmName("plusVariableRational")
     public override operator fun V.plus(other: R): R =
         constructRationalFunction(
             this * other.denominator + other.numerator,
             other.denominator
         )
+    /**
+     * Returns difference between the variable represented as a rational function and the rational function.
+     */
     @JvmName("minusVariableRational")
     public override operator fun V.minus(other: R): R =
         constructRationalFunction(
             this * other.denominator - other.numerator,
             other.denominator
         )
+    /**
+     * Returns product of the variable represented as a rational function and the rational function.
+     */
     @JvmName("timesVariableRational")
     public override operator fun V.times(other: R): R =
         constructRationalFunction(
@@ -1290,18 +1512,27 @@ public abstract class MultivariatePolynomialSpaceOfFractions<
             other.denominator
         )
 
+    /**
+     * Returns sum of the rational function and the variable represented as a rational function.
+     */
     @JvmName("plusRationalVariable")
     public override operator fun R.plus(other: V): R =
         constructRationalFunction(
             numerator + denominator * other,
             denominator
         )
+    /**
+     * Returns difference between the rational function and the variable represented as a rational function.
+     */
     @JvmName("minusRationalVariable")
     public override operator fun R.minus(other: V): R =
         constructRationalFunction(
             numerator - denominator * other,
             denominator
         )
+    /**
+     * Returns product of the rational function and the variable represented as a rational function.
+     */
     @JvmName("timesRationalVariable")
     public override operator fun R.times(other: V): R =
         constructRationalFunction(
-- 
2.34.1


From 569e01fce13f890e8c938d90ac4285e99f3b3e93 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 12 Jun 2022 15:16:40 +0300
Subject: [PATCH 518/713] Migration to kotlin 1.7

---
 build.gradle.kts                              |  2 +-
 buildSrc/build.gradle.kts                     | 13 +++----
 buildSrc/gradle.properties                    |  7 ----
 buildSrc/settings.gradle.kts                  | 14 ++++++--
 .../kmath/ejml/codegen/ejmlCodegen.kt         |  4 ++-
 gradle.properties                             |  5 ++-
 kmath-ast/build.gradle.kts                    |  2 +-
 kmath-core/build.gradle.kts                   |  4 +--
 .../space/kscience/kmath/nd/AlgebraND.kt      | 19 ----------
 .../kscience/kmath/nd/BufferAlgebraND.kt      |  2 +-
 .../kotlin/space/kscience/kmath/nd/Shape.kt   | 35 +++++++++++++++++++
 .../space/kscience/kmath/nd/ShapeIndexer.kt   | 14 +++++---
 .../space/kscience/kmath/nd/StructureND.kt    |  4 +--
 .../kscience/kmath/nd/VirtualStructureND.kt   | 18 ++++++++--
 .../space/kscience/kmath/nd/operationsND.kt   | 32 +++++++++++++++++
 .../kscience/kmath/nd/NdOperationsTest.kt     | 28 +++++++++++++++
 .../space/kscience/kmath/ejml/_generated.kt   | 16 ++++++---
 .../kscience/kmath/ejml/EjmlMatrixTest.kt     |  6 ++--
 kmath-histograms/build.gradle.kts             |  8 ++---
 .../kmath/histogram/TreeHistogramTest.kt      |  2 ++
 kmath-memory/build.gradle.kts                 |  3 +-
 kmath-optimization/build.gradle.kts           |  5 +--
 kmath-stat/build.gradle.kts                   |  5 +--
 .../space/kscience/kmath/stat/Sampler.kt      |  2 ++
 .../space/kscience/kmath/stat/MCScopeTest.kt  |  2 +-
 .../kscience/kmath/viktor/ViktorFieldOpsND.kt |  1 +
 settings.gradle.kts                           | 20 ++++++++++-
 27 files changed, 200 insertions(+), 73 deletions(-)
 delete mode 100644 buildSrc/gradle.properties
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt
 create mode 100644 kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/NdOperationsTest.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 9fa012fb2..ab136bfbc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.1"
+    version = "0.3.1-dev-1"
 }
 
 subprojects {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index dcb39d448..20611e92d 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-    kotlin("jvm") version "1.7.0-RC"
+    kotlin("jvm") version "1.7.0"
     `kotlin-dsl`
     `version-catalog`
-    alias(miptNpmLibs.plugins.kotlin.plugin.serialization)
+    alias(npmlibs.plugins.kotlin.plugin.serialization)
 }
 
 java.targetCompatibility = JavaVersion.VERSION_11
@@ -14,17 +14,18 @@ repositories {
     gradlePluginPortal()
 }
 
-val toolsVersion: String by extra
-val kotlinVersion = miptNpmLibs.versions.kotlin.asProvider().get()
-val benchmarksVersion = miptNpmLibs.versions.kotlinx.benchmark.get()
+val toolsVersion = npmlibs.versions.tools.get()
+val kotlinVersion = npmlibs.versions.kotlin.asProvider().get()
+val benchmarksVersion = npmlibs.versions.kotlinx.benchmark.get()
 
 dependencies {
     api("ru.mipt.npm:gradle-tools:$toolsVersion")
+    api(npmlibs.atomicfu.gradle)
     //plugins form benchmarks
     api("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:$benchmarksVersion")
     api("org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion")
     //to be used inside build-script only
-    implementation(miptNpmLibs.kotlinx.serialization.json)
+    implementation(npmlibs.kotlinx.serialization.json)
 }
 
 kotlin.sourceSets.all {
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
deleted file mode 100644
index 751caec36..000000000
--- a/buildSrc/gradle.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright 2018-2021 KMath contributors.
-# Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
-#
-
-kotlin.code.style=official
-toolsVersion=0.11.5-kotlin-1.7.0-RC
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 7c1df133d..bce265510 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -6,7 +6,17 @@
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 dependencyResolutionManagement {
-    val toolsVersion: String by extra
+    val projectProperties = java.util.Properties()
+    file("../gradle.properties").inputStream().use {
+        projectProperties.load(it)
+    }
+
+    projectProperties.forEach { key, value ->
+        extra.set(key.toString(), value)
+    }
+
+
+    val toolsVersion: String = projectProperties["toolsVersion"].toString()
 
     repositories {
         mavenLocal()
@@ -16,7 +26,7 @@ dependencyResolutionManagement {
     }
 
     versionCatalogs {
-        create("miptNpmLibs") {
+        create("npmlibs") {
             from("ru.mipt.npm:version-catalog:$toolsVersion")
         }
     }
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
index 7f8cb35b3..7c23d8ea0 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
@@ -319,7 +319,9 @@ public object EjmlLinearSpace${ops} : EjmlLinearSpace<${type}, ${kmathAlgebra},
     }
 
             else -> null
-        }?.let(type::cast)
+        }?.let{
+            type.cast(it)
+        }
     }
 
     /**
diff --git a/gradle.properties b/gradle.properties
index 4923364d8..9cdd7801c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,10 @@ kotlin.code.style=official
 kotlin.jupyter.add.scanner=false
 kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
-#kotlin.incremental.js.ir=true
+//kotlin.incremental.js.ir=true
 
 org.gradle.configureondemand=true
 org.gradle.parallel=true
+org.gradle.jvmargs=-Xmx4096m
+
+toolsVersion=0.11.6-kotlin-1.7.0
diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index 15b1d0900..0dd625ef1 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -57,7 +57,7 @@ tasks.dokkaHtml {
 
 if (System.getProperty("space.kscience.kmath.ast.dump.generated.classes") == "1")
     tasks.jvmTest {
-        jvmArgs = (jvmArgs ?: emptyList()) + listOf("-Dspace.kscience.kmath.ast.dump.generated.classes=1")
+        jvmArgs("-Dspace.kscience.kmath.ast.dump.generated.classes=1")
     }
 
 readme {
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index 4a35a54fb..052924ce8 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -1,8 +1,6 @@
 plugins {
-    kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.mpp")
     id("ru.mipt.npm.gradle.native")
-//    id("com.xcporter.metaview") version "0.0.5"
 }
 
 kotlin.sourceSets {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index a9712e870..ad291cf7f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -10,25 +10,6 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import kotlin.reflect.KClass
 
-/**
- * An exception is thrown when the expected and actual shape of NDArray differ.
- *
- * @property expected the expected shape.
- * @property actual the actual shape.
- */
-public class ShapeMismatchException(public val expected: IntArray, public val actual: IntArray) :
-    RuntimeException("Shape ${actual.contentToString()} doesn't fit in expected shape ${expected.contentToString()}.")
-
-public typealias Shape = IntArray
-
-public fun Shape(shapeFirst: Int, vararg shapeRest: Int): Shape = intArrayOf(shapeFirst, *shapeRest)
-
-public interface WithShape {
-    public val shape: Shape
-
-    public val indices: ShapeIndexer get() = DefaultStrides(shape)
-}
-
 /**
  * The base interface for all ND-algebra implementations.
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index b09344d12..68e8ebe90 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -47,7 +47,7 @@ public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
         zipInline(left.toBufferND(), right.toBufferND(), transform)
 
     public companion object {
-        public val defaultIndexerBuilder: (IntArray) -> ShapeIndexer = DefaultStrides.Companion::invoke
+        public val defaultIndexerBuilder: (IntArray) -> ShapeIndexer = ::Strides
     }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
new file mode 100644
index 000000000..d682d5e69
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.nd
+
+/**
+ * An exception is thrown when the expected and actual shape of NDArray differ.
+ *
+ * @property expected the expected shape.
+ * @property actual the actual shape.
+ */
+public class ShapeMismatchException(public val expected: IntArray, public val actual: IntArray) :
+    RuntimeException("Shape ${actual.contentToString()} doesn't fit in expected shape ${expected.contentToString()}.")
+
+public class IndexOutOfShapeException(public val shape: Shape, public val index: IntArray) :
+    RuntimeException("Index ${index.contentToString()} is out of shape ${shape.contentToString()}")
+
+public typealias Shape = IntArray
+
+public fun Shape(shapeFirst: Int, vararg shapeRest: Int): Shape = intArrayOf(shapeFirst, *shapeRest)
+
+public interface WithShape {
+    public val shape: Shape
+
+    public val indices: ShapeIndexer get() = DefaultStrides(shape)
+}
+
+internal fun requireIndexInShape(index: IntArray, shape: Shape) {
+    if (index.size != shape.size) throw IndexOutOfShapeException(index, shape)
+    shape.forEachIndexed { axis, axisShape ->
+        if (index[axis] !in 0 until axisShape) throw IndexOutOfShapeException(index, shape)
+    }
+}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
index c6ff79587..29701425f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
@@ -10,7 +10,7 @@ import kotlin.native.concurrent.ThreadLocal
 /**
  * A converter from linear index to multivariate index
  */
-public interface ShapeIndexer: Iterable<IntArray>{
+public interface ShapeIndexer : Iterable<IntArray> {
     public val shape: Shape
 
     /**
@@ -44,7 +44,7 @@ public interface ShapeIndexer: Iterable<IntArray>{
 /**
  * Linear transformation of indexes
  */
-public abstract class Strides: ShapeIndexer {
+public abstract class Strides : ShapeIndexer {
     /**
      * Array strides
      */
@@ -66,7 +66,7 @@ public abstract class Strides: ShapeIndexer {
 /**
  * Simple implementation of [Strides].
  */
-public class DefaultStrides private constructor(override val shape: IntArray) : Strides() {
+public class DefaultStrides(override val shape: IntArray) : Strides() {
     override val linearSize: Int get() = strides[shape.size]
 
     /**
@@ -112,10 +112,16 @@ public class DefaultStrides private constructor(override val shape: IntArray) :
         /**
          * Cached builder for default strides
          */
+        @Deprecated("Replace by Strides(shape)")
         public operator fun invoke(shape: IntArray): Strides =
             defaultStridesCache.getOrPut(shape) { DefaultStrides(shape) }
     }
 }
 
 @ThreadLocal
-private val defaultStridesCache = HashMap<IntArray, Strides>()
\ No newline at end of file
+private val defaultStridesCache = HashMap<IntArray, Strides>()
+
+/**
+ * Cached builder for default strides
+ */
+public fun Strides(shape: IntArray): Strides = defaultStridesCache.getOrPut(shape) { DefaultStrides(shape) }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index d948cf36f..e934c6370 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -101,8 +101,8 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
             val bufferRepr: String = when (structure.shape.size) {
                 1 -> (0 until structure.shape[0]).map { structure[it] }
                     .joinToString(prefix = "[", postfix = "]", separator = ", ")
-                2 -> (0 until structure.shape[0]).joinToString(prefix = "[", postfix = "]", separator = ", ") { i ->
-                    (0 until structure.shape[1]).joinToString(prefix = "[", postfix = "]", separator = ", ") { j ->
+                2 -> (0 until structure.shape[0]).joinToString(prefix = "[\n", postfix = "\n]", separator = ",\n") { i ->
+                    (0 until structure.shape[1]).joinToString(prefix = "  [", postfix = "]", separator = ", ") { j ->
                         structure[i, j].toString()
                     }
                 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
index 799d14b3d..7e86ea73d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
@@ -5,12 +5,26 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.UnstableKMathAPI
+
 public open class VirtualStructureND<T>(
     override val shape: Shape,
     public val producer: (IntArray) -> T,
 ) : StructureND<T> {
     override fun get(index: IntArray): T {
-        require(check that index is in the shape boundaries)
+        requireIndexInShape(index, shape)
         return producer(index)
     }
-}
\ No newline at end of file
+}
+
+@UnstableKMathAPI
+public class VirtualDoubleStructureND(
+    shape: Shape,
+    producer: (IntArray) -> Double,
+) : VirtualStructureND<Double>(shape, producer)
+
+@UnstableKMathAPI
+public class VirtualIntStructureND(
+    shape: Shape,
+    producer: (IntArray) -> Int,
+) : VirtualStructureND<Int>(shape, producer)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt
new file mode 100644
index 000000000..c9624dc4e
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.nd
+
+public fun <T> StructureND<T>.roll(axis: Int, step: Int = 1): StructureND<T> {
+    require(axis in shape.indices) { "Axis $axis is outside of shape dimensions: [0, ${shape.size})" }
+    return VirtualStructureND(shape) { index ->
+        val newIndex: IntArray = IntArray(index.size) { indexAxis ->
+            if (indexAxis == axis) {
+                (index[indexAxis] + step).mod(shape[indexAxis])
+            } else {
+                index[indexAxis]
+            }
+        }
+        get(newIndex)
+    }
+}
+
+public fun <T> StructureND<T>.roll(pair: Pair<Int, Int>, vararg others: Pair<Int, Int>): StructureND<T> {
+    val axisMap: Map<Int, Int> = mapOf(pair, *others)
+    require(axisMap.keys.all { it in shape.indices }) { "Some of axes ${axisMap.keys} is outside of shape dimensions: [0, ${shape.size})" }
+    return VirtualStructureND(shape) { index ->
+        val newIndex: IntArray = IntArray(index.size) { indexAxis ->
+            val offset = axisMap[indexAxis] ?: 0
+            (index[indexAxis] + offset).mod(shape[indexAxis])
+        }
+        get(newIndex)
+    }
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/NdOperationsTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/NdOperationsTest.kt
new file mode 100644
index 000000000..25b062b44
--- /dev/null
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/NdOperationsTest.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.nd
+
+import space.kscience.kmath.operations.DoubleField
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class NdOperationsTest {
+    @Test
+    fun roll() {
+        val structure = DoubleField.ndAlgebra.structureND(5, 5) { index ->
+            index.sumOf { it.toDouble() }
+        }
+
+        println(StructureND.toString(structure))
+
+        val rolled = structure.roll(0,-1)
+
+        println(StructureND.toString(rolled))
+
+        assertEquals(4.0, rolled[0, 0])
+    }
+
+}
\ No newline at end of file
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
index dce739dc2..aac327a84 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
@@ -271,7 +271,9 @@ public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrix
             }
 
             else -> null
-        }?.let(type::cast)
+        }?.let{
+            type.cast(it)
+        }
     }
 
     /**
@@ -505,7 +507,9 @@ public object EjmlLinearSpaceFDRM : EjmlLinearSpace<Float, FloatField, FMatrixRM
             }
 
             else -> null
-        }?.let(type::cast)
+        }?.let{
+            type.cast(it)
+        }
     }
 
     /**
@@ -734,7 +738,9 @@ public object EjmlLinearSpaceDSCC : EjmlLinearSpace<Double, DoubleField, DMatrix
             }
 
             else -> null
-        }?.let(type::cast)
+        }?.let{
+            type.cast(it)
+        }
     }
 
     /**
@@ -963,7 +969,9 @@ public object EjmlLinearSpaceFSCC : EjmlLinearSpace<Float, FloatField, FMatrixSp
             }
 
             else -> null
-        }?.let(type::cast)
+        }?.let{
+            type.cast(it)
+        }
     }
 
     /**
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
index 209bb5b27..af6284e5e 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:OptIn(PerformancePitfall::class)
+
 package space.kscience.kmath.ejml
 
 import org.ejml.data.DMatrixRMaj
@@ -18,11 +20,11 @@ import kotlin.random.Random
 import kotlin.random.asJavaRandom
 import kotlin.test.*
 
-@OptIn(PerformancePitfall::class)
-fun <T : Any> assertMatrixEquals(expected: StructureND<T>, actual: StructureND<T>) {
+internal fun <T : Any> assertMatrixEquals(expected: StructureND<T>, actual: StructureND<T>) {
     assertTrue { StructureND.contentEquals(expected, actual) }
 }
 
+@OptIn(UnstableKMathAPI::class)
 internal class EjmlMatrixTest {
     private val random = Random(0)
 
diff --git a/kmath-histograms/build.gradle.kts b/kmath-histograms/build.gradle.kts
index 51271bb0a..786086c9f 100644
--- a/kmath-histograms/build.gradle.kts
+++ b/kmath-histograms/build.gradle.kts
@@ -1,17 +1,15 @@
 plugins {
-    kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.mpp")
     id("ru.mipt.npm.gradle.native")
 }
 
-kscience {
-    useAtomic()
-}
+//apply(plugin = "kotlinx-atomicfu")
 
 kotlin.sourceSets {
     commonMain {
         dependencies {
             api(project(":kmath-core"))
+            api(npmlibs.atomicfu)
         }
     }
     commonTest {
diff --git a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
index c4eeb53cc..2c56a88a7 100644
--- a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
+++ b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
@@ -6,12 +6,14 @@
 package space.kscience.kmath.histogram
 
 import org.junit.jupiter.api.Test
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.real.step
 import kotlin.random.Random
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
+@OptIn(UnstableKMathAPI::class)
 class TreeHistogramTest {
 
     @Test
diff --git a/kmath-memory/build.gradle.kts b/kmath-memory/build.gradle.kts
index 4478e5b80..2bd6dd723 100644
--- a/kmath-memory/build.gradle.kts
+++ b/kmath-memory/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-    kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.mpp")
     id("ru.mipt.npm.gradle.native")
 }
 
diff --git a/kmath-optimization/build.gradle.kts b/kmath-optimization/build.gradle.kts
index b920b9267..2e5bf6005 100644
--- a/kmath-optimization/build.gradle.kts
+++ b/kmath-optimization/build.gradle.kts
@@ -3,10 +3,6 @@ plugins {
     id("ru.mipt.npm.gradle.native")
 }
 
-kscience {
-    useAtomic()
-}
-
 kotlin.sourceSets {
     all {
         languageSettings.optIn("space.kscience.kmath.misc.UnstableKMathAPI")
@@ -15,6 +11,7 @@ kotlin.sourceSets {
     commonMain {
         dependencies {
             api(project(":kmath-coroutines"))
+            api(npmlibs.atomicfu)
         }
     }
 }
diff --git a/kmath-stat/build.gradle.kts b/kmath-stat/build.gradle.kts
index 41a1666f8..b458135b3 100644
--- a/kmath-stat/build.gradle.kts
+++ b/kmath-stat/build.gradle.kts
@@ -3,14 +3,11 @@ plugins {
     id("ru.mipt.npm.gradle.native")
 }
 
-kscience {
-    useAtomic()
-}
-
 kotlin.sourceSets {
     commonMain {
         dependencies {
             api(project(":kmath-coroutines"))
+            implementation(npmlibs.atomicfu)
         }
     }
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
index c96ecdc8c..a88f3e437 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.stat
 import kotlinx.coroutines.flow.first
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.chains.combine
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.DoubleBuffer
@@ -30,6 +31,7 @@ public fun interface Sampler<out T : Any> {
 /**
  * Sample a bunch of values
  */
+@OptIn(UnstableKMathAPI::class)
 public fun <T : Any> Sampler<T>.sampleBuffer(
     generator: RandomGenerator,
     size: Int,
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
index 075d7f3e5..cca645809 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
@@ -66,7 +66,7 @@ class MCScopeTest {
     }
 
 
-    @OptIn(ObsoleteCoroutinesApi::class)
+    @OptIn(DelicateCoroutinesApi::class)
     fun compareResult(test: ATest) {
         val res1 = runBlocking(Dispatchers.Default) { test() }
         val res2 = runBlocking(newSingleThreadContext("test")) { test() }
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
index 1d4d6cebd..cecbc35b8 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
@@ -117,6 +117,7 @@ public open class ViktorFieldOpsND :
 
 public val DoubleField.viktorAlgebra: ViktorFieldOpsND get() = ViktorFieldOpsND
 
+@OptIn(UnstableKMathAPI::class)
 public open class ViktorFieldND(
     override val shape: Shape,
 ) : ViktorFieldOpsND(), FieldND<Double, DoubleField>, NumbersAddOps<StructureND<Double>> {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b3c275810..b14c594b4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,24 @@
 rootProject.name = "kmath"
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+dependencyResolutionManagement {
+    val toolsVersion: String by extra
+
+    repositories {
+        mavenLocal()
+        maven("https://repo.kotlin.link")
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    versionCatalogs {
+        create("npmlibs") {
+            from("ru.mipt.npm:version-catalog:$toolsVersion")
+        }
+    }
+}
+
 include(
     ":kmath-memory",
     ":kmath-complex",
@@ -27,4 +45,4 @@ include(
     ":kmath-jafama",
     ":examples",
     ":benchmarks",
-)
+)
\ No newline at end of file
-- 
2.34.1


From e1276b684f5b4220b01842f325a0407d14a1415f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 12 Jun 2022 15:19:59 +0300
Subject: [PATCH 519/713] Update better-parse

---
 kmath-ast/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index 0dd625ef1..f49c2767a 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -24,7 +24,7 @@ kotlin.sourceSets {
 
     commonMain {
         dependencies {
-            api("com.github.h0tk3y.betterParse:better-parse:0.4.2")
+            api("com.github.h0tk3y.betterParse:better-parse:0.4.4")
             api(project(":kmath-core"))
         }
     }
-- 
2.34.1


From fabad733f4cb9436fd3dd34ea0dbb3871e0348ea Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 12 Jun 2022 15:30:10 +0300
Subject: [PATCH 520/713] Fix binaryen module creation

---
 .../kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index aacb62f36..878919d8d 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -71,7 +71,7 @@ internal sealed class WasmBuilder<T : Number, out E : Expression<T>>(
     protected open fun visitBinary(mst: TypedMst.Binary<T>): ExpressionRef =
         error("Binary operation ${mst.operation} not defined in $this")
 
-    protected open fun createModule(): BinaryenModule = js("new \$module\$binaryen.Module()")
+    protected open fun createModule(): BinaryenModule = space.kscience.kmath.internal.binaryen.Module()
 
     protected fun visit(node: TypedMst<T>): ExpressionRef = when (node) {
         is TypedMst.Constant -> visitNumber(
-- 
2.34.1


From 3a6aa1432094c6803ac026593e3035c14a51111d Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 12 Jun 2022 22:52:08 +0300
Subject: [PATCH 521/713] Cleaned up ListPolynomials and ListRationalFunctions:
 - Added/updated docs. - Fully (but in a simple way) implemented invocation,
 substitution, functional representation, derivatives and antiderivatives.
 Optimized reimplementation is in progress. - Upgraded
 `PolynomialSpaceOfFractions` by adding a bit of laziness. - Other little
 things...

---
 .../kmath/functions/ListPolynomial.kt         |  80 ++++--
 .../kmath/functions/ListRationalFunction.kt   | 159 +++++++----
 .../kscience/kmath/functions/Polynomial.kt    |   2 +
 .../kmath/functions/RationalFunction.kt       |  10 +-
 .../kmath/functions/listPolynomialUtil.kt     | 233 ---------------
 .../kscience/kmath/functions/listUtil.kt      | 268 ++++++++++++++++++
 ...alFunctionUtil.kt => listUtilOptimized.kt} | 129 +++++----
 .../space/kscience/kmath/functions/misc.kt    |  13 +
 .../kmath/functions/ListPolynomialUtilTest.kt |   2 +
 .../kscience/kmath/test/misc/Rational.kt      | 135 +++++++++
 .../space/kscience/kmath/test/misc/misc.kt    |  11 +
 11 files changed, 667 insertions(+), 375 deletions(-)
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
 rename kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/{listRationalFunctionUtil.kt => listUtilOptimized.kt} (72%)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index 585da95ea..fce179fc8 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -8,23 +8,19 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.experimental.ExperimentalTypeInference
-import kotlin.jvm.JvmName
 import kotlin.math.max
 import kotlin.math.min
 
 
 /**
- * Polynomial model without fixation on specific context they are applied to.
+ * Represents univariate polynomial that stores its coefficients in a [List].
  *
  * @param coefficients constant is the leftmost coefficient.
  */
 public data class ListPolynomial<C>(
     /**
-     * List that collects coefficients of the polynomial. Every monomial `a x^d` is represented as a coefficients
-     * `a` placed into the list with index `d`. For example coefficients of polynomial `5 x^2 - 6` can be represented as
+     * List that contains coefficients of the polynomial. Every monomial `a x^d` is stored as a coefficient `a` placed
+     * into the list at index `d`. For example, coefficients of a polynomial `5 x^2 - 6` can be represented as
      * ```
      * listOf(
      *     -6, // -6 +
@@ -42,26 +38,28 @@ public data class ListPolynomial<C>(
      *     0,  // 0 x^4
      * )
      * ```
-     * It is recommended not to put extra zeros at end of the list (as for `0x^3` and `0x^4` in the example), but is not
-     * prohibited.
+     * It is not prohibited to put extra zeros at end of the list (as for `0x^3` and `0x^4` in the example). But the
+     * longer the coefficients list the worse performance of arithmetical operations performed on it. Thus, it is
+     * recommended not to put (or even to remove) extra (or useless) coefficients at the end of the coefficients list.
      */
     public val coefficients: List<C>
 ) : Polynomial<C> {
-    override fun toString(): String = "Polynomial$coefficients"
+    override fun toString(): String = "ListPolynomial$coefficients"
 }
 
 /**
- * Space of univariate polynomials constructed over ring.
+ * Arithmetic context for univariate polynomials with coefficients stored as a [List] constructed with the given [ring]
+ * of constants.
  *
- * @param C the type of constants. Polynomials have them as a coefficients in their terms.
- * @param A type of underlying ring of constants. It's [Ring] of [C].
+ * @param C the type of constants. Polynomials have them a coefficients in their terms.
+ * @param A type of provided underlying ring of constants. It's [Ring] of [C].
  * @param ring underlying ring of constants of type [A].
  */
 public open class ListPolynomialSpace<C, A : Ring<C>>(
     public override val ring: A,
 ) : PolynomialSpaceOverRing<C, ListPolynomial<C>, A> {
     /**
-     * Returns sum of the polynomial and the integer represented as polynomial.
+     * Returns sum of the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
@@ -79,7 +77,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                     }
             )
     /**
-     * Returns difference between the polynomial and the integer represented as polynomial.
+     * Returns difference between the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
@@ -97,7 +95,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                     }
             )
     /**
-     * Returns product of the polynomial and the integer represented as polynomial.
+     * Returns product of the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
@@ -112,7 +110,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
         )
 
     /**
-     * Returns sum of the integer represented as polynomial and the polynomial.
+     * Returns sum of the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
@@ -130,7 +128,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                     }
             )
     /**
-     * Returns difference between the integer represented as polynomial and the polynomial.
+     * Returns difference between the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
@@ -150,7 +148,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                     }
             )
     /**
-     * Returns product of the integer represented as polynomial and the polynomial.
+     * Returns product of the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -170,7 +168,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
     public override fun number(value: Int): ListPolynomial<C> = number(constantNumber(value))
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.plus(other: ListPolynomial<C>): ListPolynomial<C> =
         with(other.coefficients) {
@@ -186,7 +184,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
             )
         }
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.minus(other: ListPolynomial<C>): ListPolynomial<C> =
         with(other.coefficients) {
@@ -204,7 +202,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
             )
         }
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.times(other: ListPolynomial<C>): ListPolynomial<C> =
         ListPolynomial(
@@ -216,7 +214,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
         )
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun ListPolynomial<C>.plus(other: C): ListPolynomial<C> =
         with(coefficients) {
@@ -232,7 +230,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
             )
         }
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public override operator fun ListPolynomial<C>.minus(other: C): ListPolynomial<C> =
         with(coefficients) {
@@ -248,7 +246,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
             )
         }
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun ListPolynomial<C>.times(other: C): ListPolynomial<C> =
         ListPolynomial(
@@ -262,7 +260,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
     /**
      * Converts the constant [value] to polynomial.
      */
-    public override fun number(value: C): ListPolynomial<C> = ListPolynomial(value)
+    public override fun number(value: C): ListPolynomial<C> = ListPolynomial(listOf(value))
 
     /**
      * Returns negation of the polynomial.
@@ -321,9 +319,9 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      */
     override val zero: ListPolynomial<C> = ListPolynomial(emptyList())
     /**
-     * Instance of unit constant (unit of the underlying ring).
+     * Instance of unit polynomial (unit of the polynomial ring).
      */
-    override val one: ListPolynomial<C> = ListPolynomial(listOf(constantOne))
+    override val one: ListPolynomial<C> by lazy { ListPolynomial(listOf(constantOne)) }
 
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
@@ -331,23 +329,43 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      */
     public override val ListPolynomial<C>.degree: Int get() = coefficients.lastIndex
 
+    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
+    //  [ListPolynomialSpace] as a context receiver
+    /**
+     * Evaluates value of [this] polynomial on provided argument.
+     */
     @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.substitute(argument: C): C = this.substitute(ring, argument)
+    /**
+     * Substitutes provided polynomial [argument] into [this] polynomial.
+     */
     @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
 
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
     @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.asFunction(): (C) -> C = { this.substitute(ring, it) }
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunctionOnConstants(): (C) -> C = { this.substitute(ring, it) }
+    public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = { this.substitute(ring, it) }
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunctionOnPolynomials(): (ListPolynomial<C>) -> ListPolynomial<C> = { this.substitute(ring, it) }
+    public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = { this.substitute(ring, it) }
 
     /**
-     * Evaluates the polynomial for the given value [argument].
+     * Evaluates value of [this] polynomial on provided [argument].
      */
     @Suppress("NOTHING_TO_INLINE")
     public inline operator fun ListPolynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
+    /**
+     * Evaluates value of [this] polynomial on provided [argument].
+     */
     @Suppress("NOTHING_TO_INLINE")
     public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
index 7b6c23ac3..45ea99fb0 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
@@ -8,13 +8,23 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.operations.Ring
 
 
+/**
+ * Represents rational function that stores its numerator and denominator as [ListPolynomial]s.
+ */
 public data class ListRationalFunction<C>(
     public override val numerator: ListPolynomial<C>,
     public override val denominator: ListPolynomial<C>
 ) : RationalFunction<C, ListPolynomial<C>> {
-    override fun toString(): String = "RationalFunction${numerator.coefficients}/${denominator.coefficients}"
+    override fun toString(): String = "ListRationalFunction${numerator.coefficients}/${denominator.coefficients}"
 }
 
+/**
+ * Arithmetic context for univariate rational functions with numerator and denominator represented as [ListPolynomial]s.
+ *
+ * @param C the type of constants. Polynomials have them a coefficients in their terms.
+ * @param A type of provided underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
+ */
 public class ListRationalFunctionSpace<C, A : Ring<C>> (
     public val ring: A,
 ) :
@@ -30,7 +40,13 @@ public class ListRationalFunctionSpace<C, A : Ring<C>> (
             ListRationalFunction<C>,
             >() {
 
+    /**
+     * Underlying polynomial ring. Its polynomial operations are inherited by local polynomial operations.
+     */
     override val polynomialRing : ListPolynomialSpace<C, A> = ListPolynomialSpace(ring)
+    /**
+     * Constructor of [ListRationalFunction] from numerator and denominator [ListPolynomial].
+     */
     override fun constructRationalFunction(numerator: ListPolynomial<C>, denominator: ListPolynomial<C>): ListRationalFunction<C> =
         ListRationalFunction(numerator, denominator)
 
@@ -43,63 +59,88 @@ public class ListRationalFunctionSpace<C, A : Ring<C>> (
      */
     public override val one: ListRationalFunction<C> = ListRationalFunction(polynomialOne, polynomialOne)
 
-    // TODO: Разобрать
+    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
+    //  [ListPolynomialSpace] as a context receiver
+    /**
+     * Evaluates value of [this] polynomial on provided argument.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.substitute(argument: C): C = this.substitute(ring, argument)
+    /**
+     * Substitutes provided polynomial [argument] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
+    /**
+     * Substitutes provided rational function [argument] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.substitute(argument: ListRationalFunction<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    /**
+     * Substitutes provided polynomial [argument] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListRationalFunction<C>.substitute(argument: ListPolynomial<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    /**
+     * Substitutes provided rational function [argument] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListRationalFunction<C>.substitute(argument: ListRationalFunction<C>): ListRationalFunction<C> = this.substitute(ring, argument)
 
-//    operator fun invoke(arg: UnivariatePolynomial<T>): RationalFunction<T> =
-//        RationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    operator fun invoke(arg: RationalFunction<T>): RationalFunction<T> {
-//        val num = numerator invokeRFTakeNumerator arg
-//        val den = denominator invokeRFTakeNumerator arg
-//        val degreeDif = numeratorDegree - denominatorDegree
-//        return if (degreeDif > 0)
-//            RationalFunction(
-//                num,
-//                multiplyByPower(den, arg.denominator, degreeDif)
-//            )
-//        else
-//            RationalFunction(
-//                multiplyByPower(num, arg.denominator, -degreeDif),
-//                den
-//            )
-//    }
-//
-//    override fun toString(): String = toString(UnivariatePolynomial.variableName)
-//
-//    fun toString(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(withVariableName)
-//            else -> "${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toStringWithBrackets(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun toReversedString(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(withVariableName)
-//            else -> "${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toReversedStringWithBrackets(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun removeZeros() =
-//        RationalFunction(
-//            numerator.removeZeros(),
-//            denominator.removeZeros()
-//        )
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.asFunction(): (C) -> C = { this.substitute(ring, it) }
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = { this.substitute(ring, it) }
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = { this.substitute(ring, it) }
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.asFunctionOfRationalFunction(): (ListRationalFunction<C>) -> ListRationalFunction<C> = { this.substitute(ring, it) }
+    /**
+     * Represent [this] rational function as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListRationalFunction<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListRationalFunction<C> = { this.substitute(ring, it) }
+    /**
+     * Represent [this] rational function as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListRationalFunction<C>.asFunctionOfRationalFunction(): (ListRationalFunction<C>) -> ListRationalFunction<C> = { this.substitute(ring, it) }
+
+    /**
+     * Evaluates value of [this] polynomial on provided argument.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun ListPolynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
+    /**
+     * Evaluates value of [this] polynomial on provided argument.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
+    /**
+     * Evaluates value of [this] polynomial on provided argument.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun ListPolynomial<C>.invoke(argument: ListRationalFunction<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    /**
+     * Evaluates value of [this] rational function on provided argument.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun ListRationalFunction<C>.invoke(argument: ListPolynomial<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    /**
+     * Evaluates value of [this] rational function on provided argument.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun ListRationalFunction<C>.invoke(argument: ListRationalFunction<C>): ListRationalFunction<C> = this.substitute(ring, argument)
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index f2eba10d5..12490d133 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -435,10 +435,12 @@ public interface MultivariatePolynomialSpace<C, V, P: Polynomial<C>>: Polynomial
     /**
      * Represents the [variable] as a monic monomial.
      */
+    @JvmName("numberVariable")
     public fun number(variable: V): P = +variable
     /**
      * Represents the variable as a monic monomial.
      */
+    @JvmName("asPolynomialVariable")
     public fun V.asPolynomial(): P = number(this)
 
     /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index edc9dfa5c..4ce6c7c26 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -1060,12 +1060,12 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Instance of zero rational function (zero of the rational functions ring).
      */
-    public override val zero: R get() = constructRationalFunction(polynomialZero)
+    public override val zero: R by lazy { constructRationalFunction(polynomialZero) }
 
     /**
      * Instance of unit polynomial (unit of the rational functions ring).
      */
-    public override val one: R get() = constructRationalFunction(polynomialOne)
+    public override val one: R by lazy { constructRationalFunction(polynomialOne) }
 }
 
 /**
@@ -1177,19 +1177,23 @@ public interface MultivariateRationalFunctionalSpace<
     /**
      * Represents the [variable] as a monic monomial.
      */
+    @JvmName("polynomialNumberVariable")
     public fun polynomialNumber(variable: V): P = +variable
     /**
      * Represents the variable as a monic monomial.
      */
+    @JvmName("asPolynomialVariable")
     public fun V.asPolynomial(): P = polynomialNumber(this)
 
     /**
      * Represents the [variable] as a rational function.
      */
+    @JvmName("numberVariable")
     public fun number(variable: V): R = number(polynomialNumber(variable))
     /**
      * Represents the variable as a rational function.
      */
+    @JvmName("asRationalFunctionVariable")
     public fun V.asRationalFunction(): R = number(this)
 
     /**
@@ -1403,10 +1407,12 @@ public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSp
     /**
      * Represents the [variable] as a monic monomial.
      */
+    @JvmName("polynomialNumberVariable")
     public override fun polynomialNumber(variable: V): P = polynomialRing { number(variable) }
     /**
      * Represents the variable as a monic monomial.
      */
+    @JvmName("asPolynomialVariable")
     public override fun V.asPolynomial(): P = polynomialRing { this@asPolynomial.asPolynomial() }
 
     /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
deleted file mode 100644
index 50313cab9..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.pow
-
-
-/**
- * Removes zeros on the end of the coefficient list of polynomial.
- */
-//context(PolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> Polynomial<C>.removeZeros() : Polynomial<C> =
-//    if (degree > -1) Polynomial(coefficients.subList(0, degree + 1)) else zero
-
-/**
- * Creates a [ListPolynomialSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.listPolynomial(): ListPolynomialSpace<C, A> =
-    ListPolynomialSpace(this)
-
-/**
- * Creates a [ListPolynomialSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.listPolynomial(block: ListPolynomialSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ListPolynomialSpace(this).block()
-}
-
-/**
- * Creates a [ScalableListPolynomialSpace] over a received scalable ring.
- */
-public fun <C, A> A.scalableListPolynomial(): ScalableListPolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C> =
-    ScalableListPolynomialSpace(this)
-
-/**
- * Creates a [ScalableListPolynomialSpace]'s scope over a received scalable ring.
- */
-public inline fun <C, A, R> A.scalableListPolynomial(block: ScalableListPolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ScalableListPolynomialSpace(this).block()
-}
-
-@Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> copyTo(
-    origin: List<C>,
-    originDegree: Int,
-    target: MutableList<C>,
-) {
-    for (deg in 0 .. originDegree) target[deg] = origin[deg]
-}
-
-@Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> multiplyAddingToUpdater(
-    ring: Ring<C>,
-    multiplicand: MutableList<C>,
-    multiplicandDegree: Int,
-    multiplier: List<C>,
-    multiplierDegree: Int,
-    updater: MutableList<C>,
-    zero: C,
-) {
-    multiplyAddingTo(
-        ring = ring,
-        multiplicand = multiplicand,
-        multiplicandDegree = multiplicandDegree,
-        multiplier = multiplier,
-        multiplierDegree = multiplierDegree,
-        target = updater
-    )
-    for (updateDeg in 0 .. multiplicandDegree + multiplierDegree) {
-        multiplicand[updateDeg] = updater[updateDeg]
-        updater[updateDeg] = zero
-    }
-}
-
-@Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> multiplyAddingTo(
-    ring: Ring<C>,
-    multiplicand: List<C>,
-    multiplicandDegree: Int,
-    multiplier: List<C>,
-    multiplierDegree: Int,
-    target: MutableList<C>
-) = ring {
-    for (d in 0 .. multiplicandDegree + multiplierDegree)
-        for (k in max(0, d - multiplierDegree)..min(multiplicandDegree, d))
-            target[d] += multiplicand[k] * multiplier[d - k]
-}
-
-/**
- * Evaluates the value of the given double polynomial for given double argument.
- */
-public fun ListPolynomial<Double>.substitute(arg: Double): Double =
-    coefficients.reduceIndexedOrNull { index, acc, c ->
-        acc + c * arg.pow(index)
-    } ?: .0
-
-/**
- * Evaluates the value of the given polynomial for given argument.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */
-public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
-    if (coefficients.isEmpty()) return@ring zero
-    var result: C = coefficients.last()
-    for (j in coefficients.size - 2 downTo 0) {
-        result = (arg * result) + coefficients[j]
-    }
-    return result
-}
-
-public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListPolynomial<C> = ring {
-    if (coefficients.isEmpty()) return ListPolynomial(emptyList())
-
-    val thisDegree = coefficients.lastIndex
-    if (thisDegree == -1) return ListPolynomial(emptyList())
-    val argDegree = arg.coefficients.lastIndex
-    if (argDegree == -1) return coefficients[0].asListPolynomial()
-    val constantZero = zero
-    val resultCoefs: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
-    resultCoefs[0] = coefficients[thisDegree]
-    val resultCoefsUpdate: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
-    var resultDegree = 0
-    for (deg in thisDegree - 1 downTo 0) {
-        resultCoefsUpdate[0] = coefficients[deg]
-        multiplyAddingToUpdater(
-            ring = ring,
-            multiplicand = resultCoefs,
-            multiplicandDegree = resultDegree,
-            multiplier = arg.coefficients,
-            multiplierDegree = argDegree,
-            updater = resultCoefsUpdate,
-            zero = constantZero
-        )
-        resultDegree += argDegree
-    }
-
-    return ListPolynomial<C>(resultCoefs)
-}
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asFunction(ring: A): (C) -> C = { substitute(ring, it) }
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asPolynomialFunctionOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.derivative(
-    algebra: A,
-): ListPolynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    ListPolynomial(
-        buildList(max(0, coefficients.size - 1)) {
-            for (deg in 1 .. coefficients.lastIndex) add(number(deg) * coefficients[deg])
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.nthDerivative(
-    algebra: A,
-    order: Int,
-): ListPolynomial<C> where A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    require(order >= 0) { "Order of derivative must be non-negative" }
-    ListPolynomial(
-        buildList(max(0, coefficients.size - order)) {
-            for (deg in order.. coefficients.lastIndex)
-                add((deg - order + 1 .. deg).fold(coefficients[deg]) { acc, d -> acc * number(d) })
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.antiderivative(
-    algebra: A,
-): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
-    ListPolynomial(
-        buildList(coefficients.size + 1) {
-            add(zero)
-            coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.nthAntiderivative(
-    algebra: A,
-    order: Int,
-): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
-    require(order >= 0) { "Order of antiderivative must be non-negative" }
-    ListPolynomial(
-        buildList(coefficients.size + order) {
-            repeat(order) { add(zero) }
-            coefficients.mapIndexedTo(this) { index, c -> (1..order).fold(c) { acc, i -> acc / number(index + i) } }
-        }
-    )
-}
-
-/**
- * Compute a definite integral of a given polynomial in a [range]
- */
-@UnstableKMathAPI
-public fun <C : Comparable<C>> ListPolynomial<C>.integrate(
-    algebra: Field<C>,
-    range: ClosedRange<C>,
-): C = algebra {
-    val integral = antiderivative(algebra)
-    integral.substitute(algebra, range.endInclusive) - integral.substitute(algebra, range.start)
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
new file mode 100644
index 000000000..127dd8c7a
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.math.max
+import kotlin.math.pow
+
+
+/**
+ * Creates a [ListPolynomialSpace] over a received ring.
+ */
+public fun <C, A : Ring<C>> A.listPolynomialSpace(): ListPolynomialSpace<C, A> =
+    ListPolynomialSpace(this)
+
+/**
+ * Creates a [ListPolynomialSpace]'s scope over a received ring.
+ */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
+public inline fun <C, A : Ring<C>, R> A.listPolynomialSpace(block: ListPolynomialSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return ListPolynomialSpace(this).block()
+}
+
+/**
+ * Creates a [ScalableListPolynomialSpace] over a received scalable ring.
+ */
+public fun <C, A> A.scalableListPolynomialSpace(): ScalableListPolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C> =
+    ScalableListPolynomialSpace(this)
+
+/**
+ * Creates a [ScalableListPolynomialSpace]'s scope over a received scalable ring.
+ */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
+public inline fun <C, A, R> A.scalableListPolynomialSpace(block: ScalableListPolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return ScalableListPolynomialSpace(this).block()
+}
+
+/**
+ * Creates a [ListRationalFunctionSpace] over a received ring.
+ */
+public fun <C, A : Ring<C>> A.listRationalFunctionSpace(): ListRationalFunctionSpace<C, A> =
+    ListRationalFunctionSpace(this)
+
+/**
+ * Creates a [ListRationalFunctionSpace]'s scope over a received ring.
+ */ // TODO: When context will be ready move [ListRationalFunctionSpace] and add [A] to context receivers of [block]
+public inline fun <C, A : Ring<C>, R> A.listRationalFunctionSpace(block: ListRationalFunctionSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return ListRationalFunctionSpace(this).block()
+}
+
+
+/**
+ * Evaluates value of [this] Double polynomial on provided Double argument.
+ */
+public fun ListPolynomial<Double>.substitute(arg: Double): Double =
+    coefficients.reduceIndexedOrNull { index, acc, c ->
+        acc + c * arg.pow(index)
+    } ?: .0
+
+/**
+ * Evaluates value of [this] polynomial on provided argument.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */
+public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
+    if (coefficients.isEmpty()) return zero
+    var result: C = coefficients.last()
+    for (j in coefficients.size - 2 downTo 0) {
+        result = (arg * result) + coefficients[j]
+    }
+    return result
+}
+
+/**
+ * Substitutes provided polynomial [arg] into [this] polynomial.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */ // TODO: To optimize boxing
+public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListPolynomial<C> =
+    ring.listPolynomialSpace {
+        if (coefficients.isEmpty()) return zero
+        var result: ListPolynomial<C> = coefficients.last().asPolynomial()
+        for (j in coefficients.size - 2 downTo 0) {
+            result = (arg * result) + coefficients[j]
+        }
+        return result
+    }
+
+/**
+ * Substitutes provided rational function [arg] into [this] polynomial.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */ // TODO: To optimize boxing
+public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListRationalFunction<C>) : ListRationalFunction<C> =
+    ring.listRationalFunctionSpace {
+        if (coefficients.isEmpty()) return zero
+        var result: ListRationalFunction<C> = coefficients.last().asRationalFunction()
+        for (j in coefficients.size - 2 downTo 0) {
+            result = (arg * result) + coefficients[j]
+        }
+        return result
+    }
+
+/**
+ * Evaluates value of [this] Double rational function in provided Double argument.
+ */
+public fun ListRationalFunction<Double>.substitute(arg: Double): Double =
+    numerator.substitute(arg) / denominator.substitute(arg)
+
+/**
+ * Evaluates value of [this] polynomial for provided argument.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */
+public fun <C> ListRationalFunction<C>.substitute(ring: Field<C>, arg: C): C = ring {
+    numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
+}
+
+/**
+ * Substitutes provided polynomial [arg] into [this] rational function.
+ */ // TODO: To optimize boxing
+public fun <C> ListRationalFunction<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListRationalFunction<C> =
+    ring.listRationalFunctionSpace {
+        numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
+    }
+
+/**
+ * Substitutes provided rational function [arg] into [this] rational function.
+ */ // TODO: To optimize boxing
+public fun <C> ListRationalFunction<C>.substitute(ring: Ring<C>, arg: ListRationalFunction<C>) : ListRationalFunction<C> =
+    ring.listRationalFunctionSpace {
+        numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
+    }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOver(ring: A): (C) -> C = { substitute(ring, it) }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListPolynomial<C>.asPolynomialFunctionOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfRationalFunctionOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Field<C>> ListRationalFunction<C>.asFunctionOver(ring: A): (C) -> C = { substitute(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListRationalFunction<C>.asPolynomialFunctionOver(ring: A): (ListPolynomial<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListRationalFunction<C>.asFunctionOfRationalFunctionOver(ring: A): (ListPolynomial<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListPolynomial<C>.derivative(
+    ring: A,
+): ListPolynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = ring {
+    ListPolynomial(
+        buildList(max(0, coefficients.size - 1)) {
+            for (deg in 1 .. coefficients.lastIndex) add(number(deg) * coefficients[deg])
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial of specified [order]. The [order] should be non-negative integer.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListPolynomial<C>.nthDerivative(
+    ring: A,
+    order: Int,
+): ListPolynomial<C> where A : Ring<C>, A : NumericAlgebra<C> = ring {
+    require(order >= 0) { "Order of derivative must be non-negative" }
+    ListPolynomial(
+        buildList(max(0, coefficients.size - order)) {
+            for (deg in order.. coefficients.lastIndex)
+                add((deg - order + 1 .. deg).fold(coefficients[deg]) { acc, d -> acc * number(d) })
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListPolynomial<C>.antiderivative(
+    ring: A,
+): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = ring {
+    ListPolynomial(
+        buildList(coefficients.size + 1) {
+            add(zero)
+            coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial of specified [order]. The [order] should be non-negative integer.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListPolynomial<C>.nthAntiderivative(
+    ring: A,
+    order: Int,
+): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = ring {
+    require(order >= 0) { "Order of antiderivative must be non-negative" }
+    ListPolynomial(
+        buildList(coefficients.size + order) {
+            repeat(order) { add(zero) }
+            coefficients.mapIndexedTo(this) { index, c -> (1..order).fold(c) { acc, i -> acc / number(index + i) } }
+        }
+    )
+}
+
+/**
+ * Computes a definite integral of [this] polynomial in the specified [range].
+ */
+@UnstableKMathAPI
+public fun <C : Comparable<C>> ListPolynomial<C>.integrate(
+    ring: Field<C>,
+    range: ClosedRange<C>,
+): C = ring {
+    val antiderivative = antiderivative(ring)
+    antiderivative.substitute(ring, range.endInclusive) - antiderivative.substitute(ring, range.start)
+}
+
+/**
+ * Returns algebraic derivative of received rational function.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListRationalFunction<C>.derivative(
+    ring: A,
+): ListRationalFunction<C> where  A : Ring<C>, A : NumericAlgebra<C> = ring.listRationalFunctionSpace {
+    ListRationalFunction(
+        numerator.derivative(ring) * denominator - numerator * denominator.derivative(ring),
+        denominator * denominator
+    )
+}
+
+/**
+ * Returns algebraic derivative of received rational function of specified [order]. The [order] should be non-negative integer.
+ */
+@UnstableKMathAPI
+public tailrec fun <C, A> ListRationalFunction<C>.nthDerivative(
+    ring: A,
+    order: Int,
+): ListRationalFunction<C> where A : Ring<C>, A : NumericAlgebra<C> =
+    if (order == 0) this else derivative(ring).nthDerivative(ring, order - 1)
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtilOptimized.kt
similarity index 72%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt
rename to kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtilOptimized.kt
index 367212588..6eb3a1dc7 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtilOptimized.kt
@@ -5,41 +5,91 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.invoke
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
 import kotlin.math.max
+import kotlin.math.min
 
 
-/**
- * Creates a [ListRationalFunctionSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.listRationalFunction(): ListRationalFunctionSpace<C, A> =
-    ListRationalFunctionSpace(this)
-
-/**
- * Creates a [ListRationalFunctionSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.listRationalFunction(block: ListRationalFunctionSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ListRationalFunctionSpace(this).block()
+// TODO: Optimized copies of substitution and invocation
+@UnstablePolynomialBoxingOptimization
+@Suppress("NOTHING_TO_INLINE")
+internal inline fun <C> copyTo(
+    origin: List<C>,
+    originDegree: Int,
+    target: MutableList<C>,
+) {
+    for (deg in 0 .. originDegree) target[deg] = origin[deg]
 }
 
-/**
- * Evaluates the value of the given double polynomial for given double argument.
- */
-public fun ListRationalFunction<Double>.substitute(arg: Double): Double =
-    numerator.substitute(arg) / denominator.substitute(arg)
+@UnstablePolynomialBoxingOptimization
+@Suppress("NOTHING_TO_INLINE")
+internal inline fun <C> multiplyAddingToUpdater(
+    ring: Ring<C>,
+    multiplicand: MutableList<C>,
+    multiplicandDegree: Int,
+    multiplier: List<C>,
+    multiplierDegree: Int,
+    updater: MutableList<C>,
+    zero: C,
+) {
+    multiplyAddingTo(
+        ring = ring,
+        multiplicand = multiplicand,
+        multiplicandDegree = multiplicandDegree,
+        multiplier = multiplier,
+        multiplierDegree = multiplierDegree,
+        target = updater
+    )
+    for (updateDeg in 0 .. multiplicandDegree + multiplierDegree) {
+        multiplicand[updateDeg] = updater[updateDeg]
+        updater[updateDeg] = zero
+    }
+}
 
-/**
- * Evaluates the value of the given polynomial for given argument.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */
-public fun <C> ListRationalFunction<C>.substitute(ring: Field<C>, arg: C): C = ring {
-    numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
+@UnstablePolynomialBoxingOptimization
+@Suppress("NOTHING_TO_INLINE")
+internal inline fun <C> multiplyAddingTo(
+    ring: Ring<C>,
+    multiplicand: List<C>,
+    multiplicandDegree: Int,
+    multiplier: List<C>,
+    multiplierDegree: Int,
+    target: MutableList<C>
+) = ring {
+    for (d in 0 .. multiplicandDegree + multiplierDegree)
+        for (k in max(0, d - multiplierDegree)..min(multiplicandDegree, d))
+            target[d] += multiplicand[k] * multiplier[d - k]
+}
+
+@UnstablePolynomialBoxingOptimization
+public fun <C> ListPolynomial<C>.substitute2(ring: Ring<C>, arg: ListPolynomial<C>) : ListPolynomial<C> = ring {
+    if (coefficients.isEmpty()) return ListPolynomial(emptyList())
+
+    val thisDegree = coefficients.lastIndex
+    if (thisDegree == -1) return ListPolynomial(emptyList())
+    val argDegree = arg.coefficients.lastIndex
+    if (argDegree == -1) return coefficients[0].asListPolynomial()
+    val constantZero = zero
+    val resultCoefs: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
+    resultCoefs[0] = coefficients[thisDegree]
+    val resultCoefsUpdate: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
+    var resultDegree = 0
+    for (deg in thisDegree - 1 downTo 0) {
+        resultCoefsUpdate[0] = coefficients[deg]
+        multiplyAddingToUpdater(
+            ring = ring,
+            multiplicand = resultCoefs,
+            multiplicandDegree = resultDegree,
+            multiplier = arg.coefficients,
+            multiplierDegree = argDegree,
+            updater = resultCoefsUpdate,
+            zero = constantZero
+        )
+        resultDegree += argDegree
+    }
+
+    return ListPolynomial<C>(resultCoefs)
 }
 
 /**
@@ -52,6 +102,7 @@ public fun <C> ListRationalFunction<C>.substitute(ring: Field<C>, arg: C): C = r
  *
  * Used in [ListPolynomial.substitute] and [ListRationalFunction.substitute] for performance optimisation.
  */ // TODO: Дописать
+@UnstablePolynomialBoxingOptimization
 internal fun <C> ListPolynomial<C>.substituteRationalFunctionTakeNumerator(ring: Ring<C>, arg: ListRationalFunction<C>): ListPolynomial<C> = ring {
     if (coefficients.isEmpty()) return ListPolynomial(emptyList())
 
@@ -196,26 +247,4 @@ internal fun <C> ListPolynomial<C>.substituteRationalFunctionTakeNumerator(ring:
             end = thisDegree + 1
         )
     )
-}
-
-//operator fun <T: Field<T>> RationalFunction<T>.invoke(arg: T): T = numerator(arg) / denominator(arg)
-//
-//fun <T: Field<T>> RationalFunction<T>.reduced(): RationalFunction<T> =
-//    polynomialGCD(numerator, denominator).let {
-//        RationalFunction(
-//            numerator / it,
-//            denominator / it
-//        )
-//    }
-
-///**
-// * Returns result of applying formal derivative to the polynomial.
-// *
-// * @param T Field where we are working now.
-// * @return Result of the operator.
-// */
-//fun <T: Ring<T>> RationalFunction<T>.derivative() =
-//    RationalFunction(
-//        numerator.derivative() * denominator - denominator.derivative() * numerator,
-//        denominator * denominator
-//    )
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
new file mode 100644
index 000000000..8b6fac39e
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+
+@RequiresOptIn(
+    message = "It's copy of operation with optimized boxing. It's currently unstable.",
+    level = RequiresOptIn.Level.ERROR
+)
+internal annotation class UnstablePolynomialBoxingOptimization
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
index c5eb8fb81..69c1611f3 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.test.misc.Rational
 import space.kscience.kmath.test.misc.RationalField
 import kotlin.test.Test
@@ -12,6 +13,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
 
+@OptIn(UnstableKMathAPI::class)
 class ListPolynomialUtilTest {
     @Test
     fun test_substitute_Double() {
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
new file mode 100644
index 000000000..72bb5942c
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.test.misc
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.NumbersAddOps
+
+class Rational {
+    companion object {
+        val ZERO: Rational = Rational(0L)
+        val ONE: Rational = Rational(1L)
+    }
+
+    val numerator: Long
+    val denominator: Long
+
+    internal constructor(numerator: Long, denominator: Long, toCheckInput: Boolean = true) {
+        if (toCheckInput) {
+            if (denominator == 0L) throw ArithmeticException("/ by zero")
+
+            val greatestCommonDivider = gcd(numerator, denominator).let { if (denominator < 0L) -it else it }
+
+            this.numerator = numerator / greatestCommonDivider
+            this.denominator = denominator / greatestCommonDivider
+        } else {
+            this.numerator = numerator
+            this.denominator = denominator
+        }
+    }
+
+    constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
+    constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
+    constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
+    constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
+    constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
+    constructor(numerator: Long) : this(numerator, 1L, false)
+
+    operator fun unaryPlus(): Rational = this
+    operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
+    operator fun plus(other: Rational): Rational =
+        Rational(
+            numerator * other.denominator + denominator * other.numerator,
+            denominator * other.denominator
+        )
+    operator fun plus(other: Int): Rational =
+        Rational(
+            numerator + denominator * other.toLong(),
+            denominator
+        )
+    operator fun plus(other: Long): Rational =
+        Rational(
+            numerator + denominator * other,
+            denominator
+        )
+    operator fun minus(other: Rational): Rational =
+        Rational(
+            numerator * other.denominator - denominator * other.numerator,
+            denominator * other.denominator
+        )
+    operator fun minus(other: Int): Rational =
+        Rational(
+            numerator - denominator * other.toLong(),
+            denominator
+        )
+    operator fun minus(other: Long): Rational =
+        Rational(
+            numerator - denominator * other,
+            denominator
+        )
+    operator fun times(other: Rational): Rational =
+        Rational(
+            numerator * other.numerator,
+            denominator * other.denominator
+        )
+    operator fun times(other: Int): Rational =
+        Rational(
+            numerator * other.toLong(),
+            denominator
+        )
+    operator fun times(other: Long): Rational =
+        Rational(
+            numerator * other,
+            denominator
+        )
+    operator fun div(other: Rational): Rational =
+        Rational(
+            numerator * other.denominator,
+            denominator * other.numerator
+        )
+    operator fun div(other: Int): Rational =
+        Rational(
+            numerator,
+            denominator * other.toLong()
+        )
+    operator fun div(other: Long): Rational =
+        Rational(
+            numerator,
+            denominator * other
+        )
+    override fun equals(other: Any?): Boolean =
+        when (other) {
+            is Rational -> numerator == other.numerator && denominator == other.denominator
+            is Int -> numerator == other && denominator == 1L
+            is Long -> numerator == other && denominator == 1L
+            else -> false
+        }
+
+    override fun hashCode(): Int = 31 * numerator.hashCode() + denominator.hashCode()
+
+    override fun toString(): String = if (denominator == 1L) "$numerator" else "$numerator/$denominator"
+}
+
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@OptIn(UnstableKMathAPI::class)
+object RationalField : Field<Rational>, NumbersAddOps<Rational> {
+    override inline val zero: Rational get() = Rational.ZERO
+    override inline val one: Rational get() = Rational.ONE
+
+    override inline fun number(value: Number): Rational = Rational(value.toLong())
+
+    override inline fun add(left: Rational, right: Rational): Rational = left + right
+    override inline fun multiply(left: Rational, right: Rational): Rational = left * right
+    override inline fun divide(left: Rational, right: Rational): Rational = left / right
+    override inline fun scale(a: Rational, value: Double): Rational = a * number(value)
+
+    override inline fun Rational.unaryMinus(): Rational = -this
+    override inline fun Rational.plus(arg: Rational): Rational = this + arg
+    override inline fun Rational.minus(arg: Rational): Rational = this - arg
+    override inline fun Rational.times(arg: Rational): Rational = this * arg
+    override inline fun Rational.div(arg: Rational): Rational = this / arg
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
new file mode 100644
index 000000000..873162a1b
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.test.misc
+
+import kotlin.math.abs
+
+
+tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
\ No newline at end of file
-- 
2.34.1


From e7100138006c0b7f91ee40135a40498b09ddeebe Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 12 Jun 2022 23:02:26 +0300
Subject: [PATCH 522/713] Fixed tests.

---
 .../kmath/functions/ListPolynomialTest.kt     |  32 ++--
 .../kscience/kmath/test/misc/IntModulo.kt     | 140 ++++++++++++++++++
 .../space/kscience/kmath/test/misc/misc.kt    |  20 ++-
 3 files changed, 175 insertions(+), 17 deletions(-)
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt

diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
index 5401be707..c9950fac5 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
@@ -12,7 +12,7 @@ import kotlin.test.*
 class ListPolynomialTest {
     @Test
     fun test_Polynomial_Int_plus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
                 ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + -3,
@@ -52,7 +52,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Int_minus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
                 ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - -3,
@@ -92,7 +92,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Int_times() {
-        IntModuloRing(35).listPolynomial {
+        IntModuloRing(35).listPolynomialSpace {
             assertEquals(
                 ListPolynomial(34, 2, 1, 20, 2),
                 ListPolynomial(22, 26, 13, 15, 26) * 27,
@@ -107,7 +107,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Int_Polynomial_plus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
                 -3 + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
@@ -147,7 +147,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Int_Polynomial_minus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
                 3 - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
@@ -187,7 +187,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Int_Polynomial_times() {
-        IntModuloRing(35).listPolynomial {
+        IntModuloRing(35).listPolynomialSpace {
             assertEquals(
                 ListPolynomial(34, 2, 1, 20, 2),
                 27 * ListPolynomial(22, 26, 13, 15, 26),
@@ -202,7 +202,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Constant_plus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
                 ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + Rational(-3),
@@ -242,7 +242,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Constant_minus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
                 ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - Rational(-3),
@@ -282,7 +282,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Constant_times() {
-        IntModuloRing(35).listPolynomial {
+        IntModuloRing(35).listPolynomialSpace {
             assertEquals(
                 ListPolynomial(34, 2, 1, 20, 2),
                 ListPolynomial(22, 26, 13, 15, 26) * 27.asConstant(),
@@ -297,7 +297,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Constant_Polynomial_plus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
                 Rational(-3) + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
@@ -337,7 +337,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Constant_Polynomial_minus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
                 Rational(3) - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
@@ -377,7 +377,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Constant_Polynomial_times() {
-        IntModuloRing(35).listPolynomial {
+        IntModuloRing(35).listPolynomialSpace {
             assertEquals(
                 ListPolynomial(34, 2, 1, 20, 2),
                 27 * ListPolynomial(22, 26, 13, 15, 26),
@@ -392,7 +392,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_unaryMinus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
                 -ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
@@ -407,7 +407,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Polynomial_plus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             // (5/9 - 8/9 x - 8/7 x^2) + (-5/7 + 5/1 x + 5/8 x^2) ?= -10/63 + 37/9 x - 29/56 x^2
             assertEquals(
                 ListPolynomial(Rational(-10, 63), Rational(37, 9), Rational(-29, 56)),
@@ -440,7 +440,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Polynomial_minus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             // (5/9 - 8/9 x - 8/7 x^2) - (-5/7 + 5/1 x + 5/8 x^2) ?= 80/63 - 53/9 x - 99/56 x^2
             assertEquals(
                 ListPolynomial(Rational(80, 63), Rational(-53, 9), Rational(-99, 56)),
@@ -473,7 +473,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Polynomial_times() {
-        IntModuloRing(35).listPolynomial {
+        IntModuloRing(35).listPolynomialSpace {
             // (1 + x + x^2) * (1 - x + x^2) ?= 1 + x^2 + x^4
             assertEquals(
                 ListPolynomial(1, 0, 1, 0, 1),
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
new file mode 100644
index 000000000..36a0d8be5
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.test.misc
+
+import space.kscience.kmath.functions.ListPolynomial
+import space.kscience.kmath.functions.ListPolynomialSpace
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Ring
+
+
+class IntModulo {
+    val residue: Int
+    val modulus: Int
+
+    @PublishedApi
+    internal constructor(residue: Int, modulus: Int, toCheckInput: Boolean = true) {
+        if (toCheckInput) {
+            require(modulus != 0) { "modulus can not be zero" }
+            this.modulus = if (modulus < 0) -modulus else modulus
+            this.residue = residue.mod(modulus)
+        } else {
+            this.residue = residue
+            this.modulus = modulus
+        }
+    }
+
+    constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
+
+    operator fun unaryPlus(): IntModulo = this
+    operator fun unaryMinus(): IntModulo =
+        IntModulo(
+            if (residue == 0) 0 else modulus - residue,
+            modulus,
+            toCheckInput = false
+        )
+    operator fun plus(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not add two residue different modulo" }
+        return IntModulo(
+            (residue + other.residue) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    operator fun plus(other: Int): IntModulo =
+        IntModulo(
+            (residue + other) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    operator fun minus(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not subtract two residue different modulo" }
+        return IntModulo(
+            (residue - other.residue) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    operator fun minus(other: Int): IntModulo =
+        IntModulo(
+            (residue - other) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    operator fun times(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not multiply two residue different modulo" }
+        return IntModulo(
+            (residue * other.residue) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    operator fun times(other: Int): IntModulo =
+        IntModulo(
+            (residue * other) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    operator fun div(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not divide two residue different modulo" }
+        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other.residue, modulus)
+        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
+        return IntModulo(
+            (residue * reciprocalCandidate) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    operator fun div(other: Int): IntModulo {
+        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other, modulus)
+        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
+        return IntModulo(
+            (residue * reciprocalCandidate) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    override fun equals(other: Any?): Boolean =
+        when (other) {
+            is IntModulo -> residue == other.residue && modulus == other.modulus
+            else -> false
+        }
+
+    override fun hashCode(): Int = residue.hashCode()
+
+    override fun toString(): String = "$residue mod $modulus"
+}
+
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@OptIn(UnstableKMathAPI::class)
+class IntModuloRing : Ring<IntModulo> {
+
+    val modulus: Int
+
+    constructor(modulus: Int) {
+        require(modulus != 0) { "modulus can not be zero" }
+        this.modulus = if (modulus < 0) -modulus else modulus
+    }
+
+    override inline val zero: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
+    override inline val one: IntModulo get() = IntModulo(1, modulus, toCheckInput = false)
+
+    fun number(arg: Int) = IntModulo(arg, modulus, toCheckInput = false)
+
+    override inline fun add(left: IntModulo, right: IntModulo): IntModulo = left + right
+    override inline fun multiply(left: IntModulo, right: IntModulo): IntModulo = left * right
+
+    override inline fun IntModulo.unaryMinus(): IntModulo = -this
+    override inline fun IntModulo.plus(arg: IntModulo): IntModulo = this + arg
+    override inline fun IntModulo.minus(arg: IntModulo): IntModulo = this - arg
+    override inline fun IntModulo.times(arg: IntModulo): IntModulo = this * arg
+    inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
+}
+
+fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
+    ListPolynomial(coefs.map { IntModulo(it, ring.modulus) })
+fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
+    ListPolynomial(coefs.map { IntModulo(it, modulus) })
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
index 873162a1b..ed41b9245 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
@@ -8,4 +8,22 @@ package space.kscience.kmath.test.misc
 import kotlin.math.abs
 
 
-tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
\ No newline at end of file
+data class BezoutIdentityWithGCD<T>(val first: T, val second: T, val gcd: T)
+
+tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
+
+fun bezoutIdentityWithGCD(a: Int, b: Int): BezoutIdentityWithGCD<Int> =
+    when {
+        a < 0 && b < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, -second, gcd) }
+        a < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, second, gcd) }
+        b < 0 -> with(bezoutIdentityWithGCDInternalLogic(a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(first, -second, gcd) }
+        else -> bezoutIdentityWithGCDInternalLogic(a, b, 1, 0, 0, 1)
+    }
+
+internal tailrec fun bezoutIdentityWithGCDInternalLogic(a: Int, b: Int, m1: Int, m2: Int, m3: Int, m4: Int): BezoutIdentityWithGCD<Int> =
+    if (b == 0) BezoutIdentityWithGCD(m1, m3, a)
+    else {
+        val quotient = a / b
+        val reminder = a % b
+        bezoutIdentityWithGCDInternalLogic(b, reminder, m2, m1 - quotient * m2, m4, m3 - quotient * m4)
+    }
\ No newline at end of file
-- 
2.34.1


From 94fd24d8524140c945412b980df8e5252a10e811 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 12 Jun 2022 23:49:44 +0300
Subject: [PATCH 523/713] Fixed some tests and docstrings. Removed `zero` and
 `one` overridings because overrided fields are already lazily initialized.

---
 .../kmath/functions/ListRationalFunction.kt   |  9 -----
 .../kmath/functions/RationalFunction.kt       | 34 +++++++++++++++----
 .../kscience/kmath/test/misc/IntModulo.kt     |  2 --
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
index 45ea99fb0..f3e352bcd 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
@@ -50,15 +50,6 @@ public class ListRationalFunctionSpace<C, A : Ring<C>> (
     override fun constructRationalFunction(numerator: ListPolynomial<C>, denominator: ListPolynomial<C>): ListRationalFunction<C> =
         ListRationalFunction(numerator, denominator)
 
-    /**
-     * Instance of zero rational function (zero of the rational functions ring).
-     */
-    public override val zero: ListRationalFunction<C> = ListRationalFunction(polynomialZero, polynomialOne)
-    /**
-     * Instance of unit polynomial (unit of the rational functions ring).
-     */
-    public override val one: ListRationalFunction<C> = ListRationalFunction(polynomialOne, polynomialOne)
-
     // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
     //  [ListPolynomialSpace] as a context receiver
     /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 4ce6c7c26..01911f980 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -834,7 +834,12 @@ public abstract class PolynomialSpaceOfFractions<
             numerator * other,
             denominator
         )
-
+    /**
+     * Returns quotient of the rational function and the integer represented as a rational function.
+     *
+     * The operation is equivalent to creating a new rational function by preserving numerator of [this] and
+     * multiplication denominator of [this] to [other].
+     */
     public override operator fun R.div(other: Int): R =
         constructRationalFunction(
             numerator,
@@ -871,7 +876,12 @@ public abstract class PolynomialSpaceOfFractions<
             this * other.numerator,
             other.denominator
         )
-
+    /**
+     * Returns quotient of the integer represented as a rational function and the rational function.
+     *
+     * The operation is equivalent to creating a new rational function which numerator is [this] times denominator of
+     * [other] and which denominator is [other]'s numerator.
+     */
     public override operator fun Int.div(other: R): R =
         constructRationalFunction(
             this * other.denominator,
@@ -912,7 +922,9 @@ public abstract class PolynomialSpaceOfFractions<
             this * other.numerator,
             other.denominator
         )
-
+    /**
+     * Returns quotient of the constant represented as a polynomial and the rational function.
+     */
     public override operator fun C.div(other: R): R =
         constructRationalFunction(
             this * other.denominator,
@@ -943,7 +955,9 @@ public abstract class PolynomialSpaceOfFractions<
             numerator * other,
             denominator
         )
-
+    /**
+     * Returns quotient of the rational function and the constant represented as a rational function.
+     */
     public override operator fun R.div(other: C): R =
         constructRationalFunction(
             numerator,
@@ -979,7 +993,9 @@ public abstract class PolynomialSpaceOfFractions<
             this * other.numerator,
             other.denominator
         )
-
+    /**
+     * Returns quotient of the polynomial represented as a polynomial and the rational function.
+     */
     public override operator fun P.div(other: R): R =
         constructRationalFunction(
             this * other.denominator,
@@ -1010,7 +1026,9 @@ public abstract class PolynomialSpaceOfFractions<
             numerator * other,
             denominator
         )
-
+    /**
+     * Returns quotient of the rational function and the polynomial represented as a rational function.
+     */
     public override operator fun R.div(other: P): R =
         constructRationalFunction(
             numerator,
@@ -1050,7 +1068,9 @@ public abstract class PolynomialSpaceOfFractions<
             numerator * other.numerator,
             denominator * other.denominator
         )
-
+    /**
+     * Returns quotient of the rational functions.
+     */
     public override operator fun R.div(other: R): R =
         constructRationalFunction(
             numerator * other.denominator,
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
index 36a0d8be5..89764db46 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
@@ -7,7 +7,6 @@ package space.kscience.kmath.test.misc
 
 import space.kscience.kmath.functions.ListPolynomial
 import space.kscience.kmath.functions.ListPolynomialSpace
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
 
 
@@ -109,7 +108,6 @@ class IntModulo {
 }
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
-@OptIn(UnstableKMathAPI::class)
 class IntModuloRing : Ring<IntModulo> {
 
     val modulus: Int
-- 
2.34.1


From ab9bba22022187b0437e9fc085b16cd8cbf232fe Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 13 Jun 2022 00:16:22 +0300
Subject: [PATCH 524/713] Put suddenly disappeared files back.

---
 .../kmath/functions/listConstructors.kt       |  65 +++++++++
 .../kscience/kmath/test/misc/Rational.kt      | 135 ++++++++++++++++++
 2 files changed, 200 insertions(+)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
new file mode 100644
index 000000000..fc55ba310
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.Ring
+
+
+/**
+ * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
+ * [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false): ListPolynomial<C> =
+    ListPolynomial(with(coefficients) { if (reverse) reversed() else this })
+
+/**
+ * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
+ * [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C> ListPolynomial(vararg coefficients: C, reverse: Boolean = false): ListPolynomial<C> =
+    ListPolynomial(with(coefficients) { if (reverse) reversed() else toList() })
+
+public fun <C> C.asListPolynomial() : ListPolynomial<C> = ListPolynomial(listOf(this))
+
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+@Suppress("FunctionName")
+public fun <C> ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
+    ListRationalFunction<C>(numerator, polynomialOne)
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
+    ListRationalFunction<C>(numerator, ListPolynomial(listOf(one)))
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        polynomialOne
+    )
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        ListPolynomial(listOf(one))
+    )
+
+//context(A)
+//public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
+//context(ListRationalFunctionSpace<C, A>)
+//public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
new file mode 100644
index 000000000..72bb5942c
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.test.misc
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.NumbersAddOps
+
+class Rational {
+    companion object {
+        val ZERO: Rational = Rational(0L)
+        val ONE: Rational = Rational(1L)
+    }
+
+    val numerator: Long
+    val denominator: Long
+
+    internal constructor(numerator: Long, denominator: Long, toCheckInput: Boolean = true) {
+        if (toCheckInput) {
+            if (denominator == 0L) throw ArithmeticException("/ by zero")
+
+            val greatestCommonDivider = gcd(numerator, denominator).let { if (denominator < 0L) -it else it }
+
+            this.numerator = numerator / greatestCommonDivider
+            this.denominator = denominator / greatestCommonDivider
+        } else {
+            this.numerator = numerator
+            this.denominator = denominator
+        }
+    }
+
+    constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
+    constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
+    constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
+    constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
+    constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
+    constructor(numerator: Long) : this(numerator, 1L, false)
+
+    operator fun unaryPlus(): Rational = this
+    operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
+    operator fun plus(other: Rational): Rational =
+        Rational(
+            numerator * other.denominator + denominator * other.numerator,
+            denominator * other.denominator
+        )
+    operator fun plus(other: Int): Rational =
+        Rational(
+            numerator + denominator * other.toLong(),
+            denominator
+        )
+    operator fun plus(other: Long): Rational =
+        Rational(
+            numerator + denominator * other,
+            denominator
+        )
+    operator fun minus(other: Rational): Rational =
+        Rational(
+            numerator * other.denominator - denominator * other.numerator,
+            denominator * other.denominator
+        )
+    operator fun minus(other: Int): Rational =
+        Rational(
+            numerator - denominator * other.toLong(),
+            denominator
+        )
+    operator fun minus(other: Long): Rational =
+        Rational(
+            numerator - denominator * other,
+            denominator
+        )
+    operator fun times(other: Rational): Rational =
+        Rational(
+            numerator * other.numerator,
+            denominator * other.denominator
+        )
+    operator fun times(other: Int): Rational =
+        Rational(
+            numerator * other.toLong(),
+            denominator
+        )
+    operator fun times(other: Long): Rational =
+        Rational(
+            numerator * other,
+            denominator
+        )
+    operator fun div(other: Rational): Rational =
+        Rational(
+            numerator * other.denominator,
+            denominator * other.numerator
+        )
+    operator fun div(other: Int): Rational =
+        Rational(
+            numerator,
+            denominator * other.toLong()
+        )
+    operator fun div(other: Long): Rational =
+        Rational(
+            numerator,
+            denominator * other
+        )
+    override fun equals(other: Any?): Boolean =
+        when (other) {
+            is Rational -> numerator == other.numerator && denominator == other.denominator
+            is Int -> numerator == other && denominator == 1L
+            is Long -> numerator == other && denominator == 1L
+            else -> false
+        }
+
+    override fun hashCode(): Int = 31 * numerator.hashCode() + denominator.hashCode()
+
+    override fun toString(): String = if (denominator == 1L) "$numerator" else "$numerator/$denominator"
+}
+
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@OptIn(UnstableKMathAPI::class)
+object RationalField : Field<Rational>, NumbersAddOps<Rational> {
+    override inline val zero: Rational get() = Rational.ZERO
+    override inline val one: Rational get() = Rational.ONE
+
+    override inline fun number(value: Number): Rational = Rational(value.toLong())
+
+    override inline fun add(left: Rational, right: Rational): Rational = left + right
+    override inline fun multiply(left: Rational, right: Rational): Rational = left * right
+    override inline fun divide(left: Rational, right: Rational): Rational = left / right
+    override inline fun scale(a: Rational, value: Double): Rational = a * number(value)
+
+    override inline fun Rational.unaryMinus(): Rational = -this
+    override inline fun Rational.plus(arg: Rational): Rational = this + arg
+    override inline fun Rational.minus(arg: Rational): Rational = this - arg
+    override inline fun Rational.times(arg: Rational): Rational = this * arg
+    override inline fun Rational.div(arg: Rational): Rational = this / arg
+}
\ No newline at end of file
-- 
2.34.1


From dbb48a2a9f3ecabc0eb0aeb7e7c72d589aba0c4f Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 13 Jun 2022 01:41:04 +0300
Subject: [PATCH 525/713] Added docstrings to ListPolynomial and
 ListRationalFunction fabric functions.

---
 .../kmath/functions/listConstructors.kt       | 56 +++++++++++++++----
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
index fc55ba310..35c736914 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
@@ -14,52 +14,84 @@ import space.kscience.kmath.operations.Ring
 
 
 /**
- * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
- * [reverse] parameter is true.
+ * Constructs a [ListPolynomial] instance with provided [coefficients]. The collection of coefficients will be reversed
+ * if [reverse] parameter is true.
  */
 @Suppress("FunctionName")
 public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false): ListPolynomial<C> =
     ListPolynomial(with(coefficients) { if (reverse) reversed() else this })
 
 /**
- * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
- * [reverse] parameter is true.
+ * Constructs a [ListPolynomial] instance with provided [coefficients]. The collection of coefficients will be reversed
+ * if [reverse] parameter is true.
  */
 @Suppress("FunctionName")
 public fun <C> ListPolynomial(vararg coefficients: C, reverse: Boolean = false): ListPolynomial<C> =
     ListPolynomial(with(coefficients) { if (reverse) reversed() else toList() })
 
+/**
+ * Represents [this] constant as a [ListPolynomial].
+ */
 public fun <C> C.asListPolynomial() : ListPolynomial<C> = ListPolynomial(listOf(this))
 
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
+/**
+ * Constructs [ListRationalFunction] instance with numerator and denominator constructed with provided
+ * [numeratorCoefficients] and [denominatorCoefficients]. The both collections of coefficients will be reversed if
+ * [reverse] parameter is true.
+ */
 @Suppress("FunctionName")
 public fun <C> ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
     ListRationalFunction<C>(
         ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
         ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
     )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
-    ListRationalFunction<C>(numerator, polynomialOne)
+/**
+ * Constructs [ListRationalFunction] instance with provided [numerator] and unit denominator.
+ */
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
     ListRationalFunction<C>(numerator, ListPolynomial(listOf(one)))
+/**
+ * Constructs [ListRationalFunction] instance with provided [numerator] and unit denominator.
+ */
 @Suppress("FunctionName")
-public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        polynomialOne
-    )
+public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
+    ListRationalFunction<C>(numerator, polynomialOne)
+/**
+ * Constructs [ListRationalFunction] instance with numerator constructed with provided [numeratorCoefficients] and unit
+ * denominator. The collection of numerator coefficients will be reversed if [reverse] parameter is true.
+ */
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
     ListRationalFunction<C>(
         ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
         ListPolynomial(listOf(one))
     )
+/**
+ * Constructs [ListRationalFunction] instance with numerator constructed with provided [numeratorCoefficients] and unit
+ * denominator. The collection of numerator coefficients will be reversed if [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        polynomialOne
+    )
 
+/**
+ * Represents [this] constant as a rational function.
+ */ // FIXME: When context receivers will be ready, delete this function and uncomment the following two
+public fun <C, A: Ring<C>> C.asListRationalFunction(ring: A) : ListRationalFunction<C> = ring.ListRationalFunction(asListPolynomial())
+///**
+// * Represents [this] constant as a rational function.
+// */
 //context(A)
 //public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
+///**
+// * Represents [this] constant as a rational function.
+// */
 //context(ListRationalFunctionSpace<C, A>)
 //public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
\ No newline at end of file
-- 
2.34.1


From 37ad48e820cde271ba93d1249b84b0abfd033f21 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 13 Jun 2022 02:06:15 +0300
Subject: [PATCH 526/713] Sift # 3. Filtered last sift and usages of
 [ListPolynomial]s.

---
 .../kmath/functions/LabeledPolynomial.kt      | 539 ------------------
 .../functions/LabeledRationalFunction.kt      | 139 -----
 .../kmath/functions/ListPolynomial.kt         |  80 ++-
 .../kmath/functions/ListRationalFunction.kt   | 158 +++--
 .../kmath/functions/NumberedPolynomial.kt     | 389 -------------
 .../functions/NumberedRationalFunction.kt     | 188 ------
 .../kscience/kmath/functions/Polynomial.kt    | 152 ++++-
 .../kmath/functions/RationalFunction.kt       | 511 ++++++++++++-----
 .../kmath/functions/labeledConstructors.kt    | 203 -------
 .../kmath/functions/labeledPolynomialUtil.kt  | 495 ----------------
 .../functions/labeledRationalFunctionUtil.kt  |  33 --
 .../kmath/functions/listConstructors.kt       |  61 +-
 .../kmath/functions/listPolynomialUtil.kt     | 233 --------
 .../kscience/kmath/functions/listUtil.kt      | 268 +++++++++
 ...alFunctionUtil.kt => listUtilOptimized.kt} | 129 +++--
 .../space/kscience/kmath/functions/misc.kt    |  13 +
 .../kmath/functions/numberedConstructors.kt   | 195 -------
 .../kmath/functions/numberedPolynomialUtil.kt | 528 -----------------
 .../functions/numberedRationalFunctionUtil.kt |  33 --
 .../kmath/functions/ListPolynomialTest.kt     |  32 +-
 .../kmath/functions/ListPolynomialUtilTest.kt |   2 +
 .../kscience/kmath/test/misc/IntModulo.kt     | 138 +++++
 .../kscience/kmath/test/misc/Rational.kt      | 135 +++++
 .../space/kscience/kmath/test/misc/misc.kt    |  29 +
 24 files changed, 1378 insertions(+), 3305 deletions(-)
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
 rename kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/{listRationalFunctionUtil.kt => listUtilOptimized.kt} (72%)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
deleted file mode 100644
index b904f7331..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.ScaleOperations
-import kotlin.math.max
-
-
-/**
- * Represents multivariate polynomials with labeled variables.
- *
- * @param C Ring in which the polynomial is considered.
- */
-public data class LabeledPolynomial<C>
-internal constructor(
-    /**
-     * Map that collects coefficients of the polynomial. Every non-zero monomial
-     * `a x_1^{d_1} ... x_n^{d_n}` is represented as pair "key-value" in the map, where value is coefficients `a` and
-     * key is map that associates variables in the monomial with multiplicity of them occurring in the monomial.
-     * For example polynomial
-     * ```
-     * 5 a^2 c^3 - 6 b + 0 b c
-     * ```
-     * has coefficients represented as
-     * ```
-     * mapOf(
-     *      mapOf(
-     *          a to 2,
-     *          c to 3
-     *      ) to 5,
-     *      mapOf(
-     *          b to 1
-     *      ) to (-6)
-     * )
-     * ```
-     * where `a`, `b` and `c` are corresponding [Symbol] objects.
-     */
-    public val coefficients: Map<Map<Symbol, UInt>, C>
-) : Polynomial<C> {
-    override fun toString(): String = "LabeledPolynomial$coefficients"
-}
-
-/**
- * Space of polynomials.
- *
- * @param C the type of operated polynomials.
- * @param A the intersection of [Ring] of [C] and [ScaleOperations] of [C].
- * @param ring the [A] instance.
- */
-public class LabeledPolynomialSpace<C, A : Ring<C>>(
-    public override val ring: A,
-) : MultivariatePolynomialSpace<C, Symbol, LabeledPolynomial<C>>, PolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
-    public override operator fun Symbol.plus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * other,
-        ))
-    public override operator fun Symbol.minus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * other,
-        ))
-    public override operator fun Symbol.times(other: Int): LabeledPolynomial<C> =
-        if (other == 0) zero
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne * other,
-        ))
-
-    public override operator fun Int.plus(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * this@plus,
-        ))
-    public override operator fun Int.minus(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -constantOne,
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * this@minus,
-        ))
-    public override operator fun Int.times(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) zero
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to constantOne * this@times,
-        ))
-
-    /**
-     * Returns sum of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun LabeledPolynomial<C>.plus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) this
-        else with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other.asConstant()))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
-            )
-        }
-    /**
-     * Returns difference between the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun LabeledPolynomial<C>.minus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) this
-        else with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to (-other).asConstant()))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
-            )
-        }
-    /**
-     * Returns product of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun LabeledPolynomial<C>.times(other: Int): LabeledPolynomial<C> =
-        if (other == 0) zero
-        else LabeledPolynomial(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
-
-    /**
-     * Returns sum of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this == 0) other
-        else with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@plus.asConstant()))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns difference between the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this == 0) other
-        else with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@minus.asConstant()))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns product of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this == 0) zero
-        else LabeledPolynomial(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
-
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public override fun number(value: Int): LabeledPolynomial<C> = number(constantNumber(value))
-
-    public override operator fun C.plus(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to this@plus,
-        ))
-    public override operator fun C.minus(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to this@minus,
-        ))
-    public override operator fun C.times(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(other to 1U) to this@times,
-        ))
-
-    public override operator fun Symbol.plus(other: C): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this@plus to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to other,
-        ))
-    public override operator fun Symbol.minus(other: C): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this@minus to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to other,
-        ))
-    public override operator fun Symbol.times(other: C): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this@times to 1U) to other,
-        ))
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@plus))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this@minus))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun LabeledPolynomial<C>.plus(other: C): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    override operator fun LabeledPolynomial<C>.minus(other: C): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to other))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun LabeledPolynomial<C>.times(other: C): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public override fun number(value: C): LabeledPolynomial<C> =
-        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to value))
-
-    public override operator fun Symbol.unaryPlus(): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne,
-        ))
-    public override operator fun Symbol.unaryMinus(): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to -constantOne,
-        ))
-    public override operator fun Symbol.plus(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne * 2
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne,
-            mapOf(other to 1U) to constantOne,
-        ))
-    public override operator fun Symbol.minus(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) zero
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U) to constantOne,
-            mapOf(other to 1U) to -constantOne,
-        ))
-    public override operator fun Symbol.times(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) LabeledPolynomial<C>(mapOf(
-            mapOf(this to 2U) to constantOne
-        ))
-        else LabeledPolynomial<C>(mapOf(
-            mapOf(this to 1U, other to 1U) to constantOne,
-        ))
-
-    public override operator fun Symbol.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@plus to 1u) to constantOne))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = mapOf(this@plus to 1U)
-
-                        this[degs] = constantOne + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    public override operator fun Symbol.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(this@minus to 1u) to constantOne))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = mapOf(this@minus to 1U)
-
-                        this[degs] = constantOne - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    public override operator fun Symbol.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            other.coefficients
-                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[this] = if (this in it) it[this]!! + 1U else 1U } }
-        )
-
-    public override operator fun LabeledPolynomial<C>.plus(other: Symbol): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to constantOne))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = mapOf(other to 1U)
-
-                        this[degs] = constantOne + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    public override operator fun LabeledPolynomial<C>.minus(other: Symbol): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) LabeledPolynomial<C>(mapOf(mapOf(other to 1u) to constantOne))
-            else LabeledPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = mapOf(other to 1U)
-
-                        this[degs] = constantOne - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    public override operator fun LabeledPolynomial<C>.times(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            coefficients
-                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[other] = if (other in it) it[other]!! + 1U else 1U } }
-        )
-
-    /**
-     * Returns negation of the polynomial.
-     */
-    override fun LabeledPolynomial<C>.unaryMinus(): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            coefficients.mapValues { -it.value }
-        )
-    /**
-     * Returns sum of the polynomials.
-     */
-    override operator fun LabeledPolynomial<C>.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
-            }
-        )
-    /**
-     * Returns difference of the polynomials.
-     */
-    override operator fun LabeledPolynomial<C>.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
-            }
-        )
-    /**
-     * Returns product of the polynomials.
-     */
-    override operator fun LabeledPolynomial<C>.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomial<C>(
-            buildMap(coefficients.size * other.coefficients.size) {
-                for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
-                    val degs = degs1.toMutableMap()
-                    degs2.mapValuesTo(degs) { (variable, deg) -> degs.getOrElse(variable) { 0u } + deg }
-                    val c = c1 * c2
-                    this[degs] = if (degs in this) this[degs]!! + c else c
-                }
-            }
-        )
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    override val zero: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to constantZero))
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    override val one: LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to constantOne))
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    override val LabeledPolynomial<C>.degree: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, c) -> degs.values.sum().toInt() } ?: -1
-    /**
-     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
-     * in which they are appeared in the polynomial.
-     *
-     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
-     * And keys of the map is the same as in [variables].
-     */
-    public override val LabeledPolynomial<C>.degrees: Map<Symbol, UInt>
-        get() =
-            buildMap {
-                coefficients.entries.forEach { (degs, _) ->
-                    degs.mapValuesTo(this) { (variable, deg) ->
-                        max(getOrElse(variable) { 0u }, deg)
-                    }
-                }
-            }
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public override fun LabeledPolynomial<C>.degreeBy(variable: Symbol): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) -> degs.getOrElse(variable) { 0u } } ?: 0u
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public override fun LabeledPolynomial<C>.degreeBy(variables: Collection<Symbol>): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) -> degs.filterKeys { it in variables }.values.sum() } ?: 0u
-    /**
-     * Set of all variables that appear in the polynomial in positive exponents.
-     */
-    public override val LabeledPolynomial<C>.variables: Set<Symbol>
-        get() =
-            buildSet {
-                coefficients.entries.forEach { (degs, _) -> addAll(degs.keys) }
-            }
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public override val LabeledPolynomial<C>.countOfVariables: Int get() = variables.size
-
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
-//    @Suppress("NOTHING_TO_INLINE")
-//    @JvmName("substitutePolynomial")
-//    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
-//
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.asFunction(): (Map<Symbol, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.asFunctionOnConstants(): (Map<Symbol, C>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline fun LabeledPolynomial<C>.asFunctionOnPolynomials(): (Map<Symbol, LabeledPolynomial<C>>) -> LabeledPolynomial<C> = { this.substitute(ring, it) }
-//
-//    @Suppress("NOTHING_TO_INLINE")
-//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Symbol, C>): LabeledPolynomial<C> = this.substitute(ring, argument)
-//    @Suppress("NOTHING_TO_INLINE")
-//    @JvmName("invokePolynomial")
-//    public inline operator fun LabeledPolynomial<C>.invoke(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledPolynomial<C> = this.substitute(ring, argument)
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
deleted file mode 100644
index 76c6874f5..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-
-
-public class LabeledRationalFunction<C>(
-    public override val numerator: LabeledPolynomial<C>,
-    public override val denominator: LabeledPolynomial<C>
-) : RationalFunction<C, LabeledPolynomial<C>> {
-    override fun toString(): String = "LabeledRationalFunction${numerator.coefficients}/${denominator.coefficients}"
-}
-
-public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
-    public val ring: A,
-) :
-    MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSpace<
-            C,
-            Symbol,
-            LabeledPolynomial<C>,
-            LabeledRationalFunction<C>,
-            LabeledPolynomialSpace<C, A>,
-            >,
-    MultivariatePolynomialSpaceOfFractions<
-            C,
-            Symbol,
-            LabeledPolynomial<C>,
-            LabeledRationalFunction<C>,
-            >() {
-
-    override val polynomialRing : LabeledPolynomialSpace<C, A> = LabeledPolynomialSpace(ring)
-    override fun constructRationalFunction(
-        numerator: LabeledPolynomial<C>,
-        denominator: LabeledPolynomial<C>
-    ): LabeledRationalFunction<C> =
-        LabeledRationalFunction<C>(numerator, denominator)
-
-    /**
-     * Instance of zero rational function (zero of the rational functions ring).
-     */
-    public override val zero: LabeledRationalFunction<C> = LabeledRationalFunction<C>(polynomialZero, polynomialOne)
-    /**
-     * Instance of unit polynomial (unit of the rational functions ring).
-     */
-    public override val one: LabeledRationalFunction<C> = LabeledRationalFunction<C>(polynomialOne, polynomialOne)
-
-    // TODO: Разобрать
-
-//    operator fun invoke(arg: Map<Symbol, C>): LabeledRationalFunction<C> =
-//        LabeledRationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    @JvmName("invokeLabeledPolynomial")
-//    operator fun invoke(arg: Map<Symbol, LabeledPolynomial<C>>): LabeledRationalFunction<C> =
-//        LabeledRationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    @JvmName("invokeLabeledRationalFunction")
-//    operator fun invoke(arg: Map<Symbol, LabeledRationalFunction<C>>): LabeledRationalFunction<C> {
-//        var num = numerator invokeRFTakeNumerator arg
-//        var den = denominator invokeRFTakeNumerator arg
-//        for (variable in variables) if (variable in arg) {
-//            val degreeDif = degrees[variable]!!
-//            if (degreeDif > 0)
-//                den = multiplyByPower(den, arg[variable]!!.denominator, degreeDif)
-//            else
-//                num = multiplyByPower(num, arg[variable]!!.denominator, -degreeDif)
-//        }
-//        return LabeledRationalFunction(num, den)
-//    }
-//
-//    override fun toString(): String = toString(emptyMap())
-//
-//    fun toString(names: Map<Symbol, String> = emptyMap()): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(names)
-//            else -> "${numerator.toStringWithBrackets(names)}/${denominator.toStringWithBrackets(names)}"
-//        }
-//
-//    fun toString(namer: (Symbol) -> String): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(namer)
-//            else -> "${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)}"
-//        }
-//
-//    fun toStringWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(names)
-//            else -> "(${numerator.toStringWithBrackets(names)}/${denominator.toStringWithBrackets(names)})"
-//        }
-//
-//    fun toStringWithBrackets(namer: (Symbol) -> String): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(namer)
-//            else -> "(${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)})"
-//        }
-//
-//    fun toReversedString(names: Map<Symbol, String> = emptyMap()): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(names)
-//            else -> "${numerator.toReversedStringWithBrackets(names)}/${denominator.toReversedStringWithBrackets(names)}"
-//        }
-//
-//    fun toReversedString(namer: (Symbol) -> String): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(namer)
-//            else -> "${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)}"
-//        }
-//
-//    fun toReversedStringWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(names)
-//            else -> "(${numerator.toReversedStringWithBrackets(names)}/${denominator.toReversedStringWithBrackets(names)})"
-//        }
-//
-//    fun toReversedStringWithBrackets(namer: (Symbol) -> String): String =
-//        when (true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(namer)
-//            else -> "(${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)})"
-//        }
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index 585da95ea..fce179fc8 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -8,23 +8,19 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.experimental.ExperimentalTypeInference
-import kotlin.jvm.JvmName
 import kotlin.math.max
 import kotlin.math.min
 
 
 /**
- * Polynomial model without fixation on specific context they are applied to.
+ * Represents univariate polynomial that stores its coefficients in a [List].
  *
  * @param coefficients constant is the leftmost coefficient.
  */
 public data class ListPolynomial<C>(
     /**
-     * List that collects coefficients of the polynomial. Every monomial `a x^d` is represented as a coefficients
-     * `a` placed into the list with index `d`. For example coefficients of polynomial `5 x^2 - 6` can be represented as
+     * List that contains coefficients of the polynomial. Every monomial `a x^d` is stored as a coefficient `a` placed
+     * into the list at index `d`. For example, coefficients of a polynomial `5 x^2 - 6` can be represented as
      * ```
      * listOf(
      *     -6, // -6 +
@@ -42,26 +38,28 @@ public data class ListPolynomial<C>(
      *     0,  // 0 x^4
      * )
      * ```
-     * It is recommended not to put extra zeros at end of the list (as for `0x^3` and `0x^4` in the example), but is not
-     * prohibited.
+     * It is not prohibited to put extra zeros at end of the list (as for `0x^3` and `0x^4` in the example). But the
+     * longer the coefficients list the worse performance of arithmetical operations performed on it. Thus, it is
+     * recommended not to put (or even to remove) extra (or useless) coefficients at the end of the coefficients list.
      */
     public val coefficients: List<C>
 ) : Polynomial<C> {
-    override fun toString(): String = "Polynomial$coefficients"
+    override fun toString(): String = "ListPolynomial$coefficients"
 }
 
 /**
- * Space of univariate polynomials constructed over ring.
+ * Arithmetic context for univariate polynomials with coefficients stored as a [List] constructed with the given [ring]
+ * of constants.
  *
- * @param C the type of constants. Polynomials have them as a coefficients in their terms.
- * @param A type of underlying ring of constants. It's [Ring] of [C].
+ * @param C the type of constants. Polynomials have them a coefficients in their terms.
+ * @param A type of provided underlying ring of constants. It's [Ring] of [C].
  * @param ring underlying ring of constants of type [A].
  */
 public open class ListPolynomialSpace<C, A : Ring<C>>(
     public override val ring: A,
 ) : PolynomialSpaceOverRing<C, ListPolynomial<C>, A> {
     /**
-     * Returns sum of the polynomial and the integer represented as polynomial.
+     * Returns sum of the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
@@ -79,7 +77,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                     }
             )
     /**
-     * Returns difference between the polynomial and the integer represented as polynomial.
+     * Returns difference between the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
@@ -97,7 +95,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                     }
             )
     /**
-     * Returns product of the polynomial and the integer represented as polynomial.
+     * Returns product of the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
@@ -112,7 +110,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
         )
 
     /**
-     * Returns sum of the integer represented as polynomial and the polynomial.
+     * Returns sum of the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
@@ -130,7 +128,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                     }
             )
     /**
-     * Returns difference between the integer represented as polynomial and the polynomial.
+     * Returns difference between the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
@@ -150,7 +148,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
                     }
             )
     /**
-     * Returns product of the integer represented as polynomial and the polynomial.
+     * Returns product of the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -170,7 +168,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
     public override fun number(value: Int): ListPolynomial<C> = number(constantNumber(value))
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.plus(other: ListPolynomial<C>): ListPolynomial<C> =
         with(other.coefficients) {
@@ -186,7 +184,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
             )
         }
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.minus(other: ListPolynomial<C>): ListPolynomial<C> =
         with(other.coefficients) {
@@ -204,7 +202,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
             )
         }
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.times(other: ListPolynomial<C>): ListPolynomial<C> =
         ListPolynomial(
@@ -216,7 +214,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
         )
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun ListPolynomial<C>.plus(other: C): ListPolynomial<C> =
         with(coefficients) {
@@ -232,7 +230,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
             )
         }
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public override operator fun ListPolynomial<C>.minus(other: C): ListPolynomial<C> =
         with(coefficients) {
@@ -248,7 +246,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
             )
         }
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun ListPolynomial<C>.times(other: C): ListPolynomial<C> =
         ListPolynomial(
@@ -262,7 +260,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
     /**
      * Converts the constant [value] to polynomial.
      */
-    public override fun number(value: C): ListPolynomial<C> = ListPolynomial(value)
+    public override fun number(value: C): ListPolynomial<C> = ListPolynomial(listOf(value))
 
     /**
      * Returns negation of the polynomial.
@@ -321,9 +319,9 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      */
     override val zero: ListPolynomial<C> = ListPolynomial(emptyList())
     /**
-     * Instance of unit constant (unit of the underlying ring).
+     * Instance of unit polynomial (unit of the polynomial ring).
      */
-    override val one: ListPolynomial<C> = ListPolynomial(listOf(constantOne))
+    override val one: ListPolynomial<C> by lazy { ListPolynomial(listOf(constantOne)) }
 
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
@@ -331,23 +329,43 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      */
     public override val ListPolynomial<C>.degree: Int get() = coefficients.lastIndex
 
+    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
+    //  [ListPolynomialSpace] as a context receiver
+    /**
+     * Evaluates value of [this] polynomial on provided argument.
+     */
     @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.substitute(argument: C): C = this.substitute(ring, argument)
+    /**
+     * Substitutes provided polynomial [argument] into [this] polynomial.
+     */
     @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
 
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
     @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.asFunction(): (C) -> C = { this.substitute(ring, it) }
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunctionOnConstants(): (C) -> C = { this.substitute(ring, it) }
+    public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = { this.substitute(ring, it) }
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunctionOnPolynomials(): (ListPolynomial<C>) -> ListPolynomial<C> = { this.substitute(ring, it) }
+    public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = { this.substitute(ring, it) }
 
     /**
-     * Evaluates the polynomial for the given value [argument].
+     * Evaluates value of [this] polynomial on provided [argument].
      */
     @Suppress("NOTHING_TO_INLINE")
     public inline operator fun ListPolynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
+    /**
+     * Evaluates value of [this] polynomial on provided [argument].
+     */
     @Suppress("NOTHING_TO_INLINE")
     public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
index 7b6c23ac3..f3e352bcd 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
@@ -8,13 +8,23 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.operations.Ring
 
 
+/**
+ * Represents rational function that stores its numerator and denominator as [ListPolynomial]s.
+ */
 public data class ListRationalFunction<C>(
     public override val numerator: ListPolynomial<C>,
     public override val denominator: ListPolynomial<C>
 ) : RationalFunction<C, ListPolynomial<C>> {
-    override fun toString(): String = "RationalFunction${numerator.coefficients}/${denominator.coefficients}"
+    override fun toString(): String = "ListRationalFunction${numerator.coefficients}/${denominator.coefficients}"
 }
 
+/**
+ * Arithmetic context for univariate rational functions with numerator and denominator represented as [ListPolynomial]s.
+ *
+ * @param C the type of constants. Polynomials have them a coefficients in their terms.
+ * @param A type of provided underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
+ */
 public class ListRationalFunctionSpace<C, A : Ring<C>> (
     public val ring: A,
 ) :
@@ -30,76 +40,98 @@ public class ListRationalFunctionSpace<C, A : Ring<C>> (
             ListRationalFunction<C>,
             >() {
 
+    /**
+     * Underlying polynomial ring. Its polynomial operations are inherited by local polynomial operations.
+     */
     override val polynomialRing : ListPolynomialSpace<C, A> = ListPolynomialSpace(ring)
+    /**
+     * Constructor of [ListRationalFunction] from numerator and denominator [ListPolynomial].
+     */
     override fun constructRationalFunction(numerator: ListPolynomial<C>, denominator: ListPolynomial<C>): ListRationalFunction<C> =
         ListRationalFunction(numerator, denominator)
 
+    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
+    //  [ListPolynomialSpace] as a context receiver
     /**
-     * Instance of zero rational function (zero of the rational functions ring).
+     * Evaluates value of [this] polynomial on provided argument.
      */
-    public override val zero: ListRationalFunction<C> = ListRationalFunction(polynomialZero, polynomialOne)
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.substitute(argument: C): C = this.substitute(ring, argument)
     /**
-     * Instance of unit polynomial (unit of the rational functions ring).
+     * Substitutes provided polynomial [argument] into [this] polynomial.
      */
-    public override val one: ListRationalFunction<C> = ListRationalFunction(polynomialOne, polynomialOne)
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
+    /**
+     * Substitutes provided rational function [argument] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.substitute(argument: ListRationalFunction<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    /**
+     * Substitutes provided polynomial [argument] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListRationalFunction<C>.substitute(argument: ListPolynomial<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    /**
+     * Substitutes provided rational function [argument] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListRationalFunction<C>.substitute(argument: ListRationalFunction<C>): ListRationalFunction<C> = this.substitute(ring, argument)
 
-    // TODO: Разобрать
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.asFunction(): (C) -> C = { this.substitute(ring, it) }
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = { this.substitute(ring, it) }
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = { this.substitute(ring, it) }
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListPolynomial<C>.asFunctionOfRationalFunction(): (ListRationalFunction<C>) -> ListRationalFunction<C> = { this.substitute(ring, it) }
+    /**
+     * Represent [this] rational function as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListRationalFunction<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListRationalFunction<C> = { this.substitute(ring, it) }
+    /**
+     * Represent [this] rational function as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun ListRationalFunction<C>.asFunctionOfRationalFunction(): (ListRationalFunction<C>) -> ListRationalFunction<C> = { this.substitute(ring, it) }
 
-//    operator fun invoke(arg: UnivariatePolynomial<T>): RationalFunction<T> =
-//        RationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    operator fun invoke(arg: RationalFunction<T>): RationalFunction<T> {
-//        val num = numerator invokeRFTakeNumerator arg
-//        val den = denominator invokeRFTakeNumerator arg
-//        val degreeDif = numeratorDegree - denominatorDegree
-//        return if (degreeDif > 0)
-//            RationalFunction(
-//                num,
-//                multiplyByPower(den, arg.denominator, degreeDif)
-//            )
-//        else
-//            RationalFunction(
-//                multiplyByPower(num, arg.denominator, -degreeDif),
-//                den
-//            )
-//    }
-//
-//    override fun toString(): String = toString(UnivariatePolynomial.variableName)
-//
-//    fun toString(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(withVariableName)
-//            else -> "${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toStringWithBrackets(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun toReversedString(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(withVariableName)
-//            else -> "${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toReversedStringWithBrackets(withVariableName: String = UnivariatePolynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun removeZeros() =
-//        RationalFunction(
-//            numerator.removeZeros(),
-//            denominator.removeZeros()
-//        )
+    /**
+     * Evaluates value of [this] polynomial on provided argument.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun ListPolynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
+    /**
+     * Evaluates value of [this] polynomial on provided argument.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
+    /**
+     * Evaluates value of [this] polynomial on provided argument.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun ListPolynomial<C>.invoke(argument: ListRationalFunction<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    /**
+     * Evaluates value of [this] rational function on provided argument.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun ListRationalFunction<C>.invoke(argument: ListPolynomial<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    /**
+     * Evaluates value of [this] rational function on provided argument.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun ListRationalFunction<C>.invoke(argument: ListRationalFunction<C>): ListRationalFunction<C> = this.substitute(ring, argument)
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
deleted file mode 100644
index e75373819..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.ScaleOperations
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.experimental.ExperimentalTypeInference
-import kotlin.jvm.JvmName
-import kotlin.math.max
-
-
-/**
- * Polynomial model without fixation on specific context they are applied to.
- *
- * @param C the type of constants.
- */
-public data class NumberedPolynomial<C>
-internal constructor(
-    /**
-     * Map that collects coefficients of the polynomial. Every monomial `a x_1^{d_1} ... x_n^{d_n}` is represented as
-     * pair "key-value" in the map, where value is coefficients `a` and
-     * key is list that associates index of every variable in the monomial with multiplicity of the variable occurring
-     * in the monomial. For example coefficients of polynomial `5 x_1^2 x_3^3 - 6 x_2` can be represented as
-     * ```
-     * mapOf(
-     *      listOf(2, 0, 3) to 5,
-     *      listOf(0, 1) to (-6),
-     * )
-     * ```
-     * and also as
-     * ```
-     * mapOf(
-     *      listOf(2, 0, 3) to 5,
-     *      listOf(0, 1) to (-6),
-     *      listOf(0, 1, 1) to 0,
-     * )
-     * ```
-     * It is recommended not to put zero monomials into the map, but is not prohibited. Lists of degrees always do not
-     * contain any zeros on end, but can contain zeros on start or anywhere in middle.
-     */
-    public val coefficients: Map<List<UInt>, C>
-) : Polynomial<C> {
-    override fun toString(): String = "NumberedPolynomial$coefficients"
-}
-
-/**
- * Space of polynomials.
- *
- * @param C the type of operated polynomials.
- * @param A the intersection of [Ring] of [C] and [ScaleOperations] of [C].
- * @param ring the [A] instance.
- */
-public open class NumberedPolynomialSpace<C, A : Ring<C>>(
-    public final override val ring: A,
-) : PolynomialSpaceOverRing<C, NumberedPolynomial<C>, A> {
-    /**
-     * Returns sum of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun NumberedPolynomial<C>.plus(other: Int): NumberedPolynomial<C> =
-        if (other == 0) this
-        else
-            NumberedPolynomial(
-                coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
-            )
-    /**
-     * Returns difference between the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun NumberedPolynomial<C>.minus(other: Int): NumberedPolynomial<C> =
-        if (other == 0) this
-        else
-            NumberedPolynomial(
-                coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
-            )
-    /**
-     * Returns product of the polynomial and the integer represented as polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun NumberedPolynomial<C>.times(other: Int): NumberedPolynomial<C> =
-        if (other == 0) zero
-        else NumberedPolynomial<C>(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
-
-    /**
-     * Returns sum of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this == 0) other
-        else
-            NumberedPolynomial(
-                other.coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
-            )
-    /**
-     * Returns difference between the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this == 0) other
-        else
-            NumberedPolynomial(
-                other.coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-    /**
-     * Returns product of the integer represented as polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this == 0) zero
-        else NumberedPolynomial(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
-
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public override fun number(value: Int): NumberedPolynomial<C> = number(constantNumber(value))
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this@plus))
-            else NumberedPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this@minus))
-            else NumberedPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun C.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
-
-    /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun NumberedPolynomial<C>.plus(other: C): NumberedPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to other))
-            else NumberedPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
-     */
-    override operator fun NumberedPolynomial<C>.minus(other: C): NumberedPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) NumberedPolynomial<C>(mapOf(emptyList<UInt>() to other))
-            else NumberedPolynomial<C>(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as polynomial and the polynomial.
-     */
-    override operator fun NumberedPolynomial<C>.times(other: C): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public override fun number(value: C): NumberedPolynomial<C> =
-        NumberedPolynomial(mapOf(emptyList<UInt>() to value))
-
-    /**
-     * Returns negation of the polynomial.
-     */
-    override fun NumberedPolynomial<C>.unaryMinus(): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            coefficients.mapValues { -it.value }
-        )
-    /**
-     * Returns sum of the polynomials.
-     */
-    override operator fun NumberedPolynomial<C>.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
-            }
-        )
-    /**
-     * Returns difference of the polynomials.
-     */
-    override operator fun NumberedPolynomial<C>.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
-            }
-        )
-    /**
-     * Returns product of the polynomials.
-     */
-    override operator fun NumberedPolynomial<C>.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            buildMap(coefficients.size * other.coefficients.size) {
-                for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
-                    val degs =
-                        (0..max(degs1.lastIndex, degs2.lastIndex))
-                            .map { degs1.getOrElse(it) { 0U } + degs2.getOrElse(it) { 0U } }
-                    val c = c1 * c2
-                    this[degs] = if (degs in this) this[degs]!! + c else c
-                }
-            }
-        )
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    override val zero: NumberedPolynomial<C> = NumberedPolynomial<C>(emptyMap())
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    override val one: NumberedPolynomial<C> =
-        NumberedPolynomial<C>(
-            mapOf(
-                emptyList<UInt>() to constantOne // 1 * x_1^0 * x_2^0 * ...
-            )
-        )
-
-    /**
-     * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `-1`.
-     */
-    public val NumberedPolynomial<C>.lastVariable: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.lastIndex } ?: -1
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    override val NumberedPolynomial<C>.degree: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.sum().toInt() } ?: -1
-    /**
-     * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
-     * exponents in which the variables are appeared in the polynomial.
-     *
-     * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
-     * And last index of the list is [lastVariable].
-     */
-    public val NumberedPolynomial<C>.degrees: List<UInt>
-        get() =
-            MutableList(lastVariable + 1) { 0u }.apply {
-                coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        this[index] = max(this[index], deg)
-                    }
-                }
-            }
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) -> degs.getOrElse(variable) { 0u } } ?: 0u
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) ->
-            degs.withIndex().filter { (index, _) -> index in variables }.sumOf { it.value }
-        } ?: 0u
-    /**
-     * Count of variables occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `0`.
-     */
-    public val NumberedPolynomial<C>.countOfVariables: Int
-        get() =
-            MutableList(lastVariable + 1) { false }.apply {
-                coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        if (deg != 0u) this[index] = true
-                    }
-                }
-            }.count { it }
-
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, C>): NumberedPolynomial<C> = this.substitute(ring, argument)
-    @Suppress("NOTHING_TO_INLINE")
-    @JvmName("substitutePolynomial")
-    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
-
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun NumberedPolynomial<C>.asFunction(): (Map<Int, C>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun NumberedPolynomial<C>.asFunctionOnConstants(): (Map<Int, C>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline fun NumberedPolynomial<C>.asFunctionOnPolynomials(): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> = { this.substitute(ring, it) }
-
-    @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, C>): NumberedPolynomial<C> = this.substitute(ring, argument)
-    @Suppress("NOTHING_TO_INLINE")
-    @JvmName("invokePolynomial")
-    public inline operator fun NumberedPolynomial<C>.invoke(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = this.substitute(ring, argument)
-
-    // FIXME: Move to other constructors with context receiver
-    public fun C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
deleted file mode 100644
index 30c7f0188..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-import kotlin.math.max
-
-
-public class NumberedRationalFunction<C> internal constructor(
-    public override val numerator: NumberedPolynomial<C>,
-    public override val denominator: NumberedPolynomial<C>
-) : RationalFunction<C, NumberedPolynomial<C>> {
-    override fun toString(): String = "NumberedRationalFunction${numerator.coefficients}/${denominator.coefficients}"
-}
-
-public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
-    public val ring: A,
-) :
-    RationalFunctionalSpaceOverPolynomialSpace<
-            C,
-            NumberedPolynomial<C>,
-            NumberedRationalFunction<C>,
-            NumberedPolynomialSpace<C, A>,
-            >,
-    PolynomialSpaceOfFractions<
-            C,
-            NumberedPolynomial<C>,
-            NumberedRationalFunction<C>,
-            >() {
-
-    override val polynomialRing : NumberedPolynomialSpace<C, A> = NumberedPolynomialSpace(ring)
-    override fun constructRationalFunction(
-        numerator: NumberedPolynomial<C>,
-        denominator: NumberedPolynomial<C>
-    ): NumberedRationalFunction<C> =
-        NumberedRationalFunction(numerator, denominator)
-
-    /**
-     * Instance of zero rational function (zero of the rational functions ring).
-     */
-    public override val zero: NumberedRationalFunction<C> = NumberedRationalFunction(polynomialZero, polynomialOne)
-    /**
-     * Instance of unit polynomial (unit of the rational functions ring).
-     */
-    public override val one: NumberedRationalFunction<C> = NumberedRationalFunction(polynomialOne, polynomialOne)
-
-    /**
-     * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `-1`.
-     */
-    public val NumberedPolynomial<C>.lastVariable: Int get() = polynomialRing { lastVariable }
-    /**
-     * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
-     * exponents in which the variables are appeared in the polynomial.
-     *
-     * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
-     * And last index of the list is [lastVariable].
-     */
-    public val NumberedPolynomial<C>.degrees: List<UInt> get() = polynomialRing { degrees }
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt = polynomialRing { degreeBy(variable) }
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt = polynomialRing { degreeBy(variables) }
-    /**
-     * Count of variables occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `0`.
-     */
-    public val NumberedPolynomial<C>.countOfVariables: Int get() = polynomialRing { countOfVariables }
-
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public val NumberedRationalFunction<C>.lastVariable: Int
-        get() = polynomialRing { max(numerator.lastVariable, denominator.lastVariable) }
-    /**
-     * Count of variables occurring in the rational function with positive power. If there is no such variable,
-     * the result is `0`.
-     */
-    public val NumberedRationalFunction<C>.countOfVariables: Int
-        get() =
-            MutableList(lastVariable + 1) { false }.apply {
-                numerator.coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        if (deg != 0u) this[index] = true
-                    }
-                }
-                denominator.coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        if (deg != 0u) this[index] = true
-                    }
-                }
-            }.count { it }
-
-    // TODO: Разобрать
-
-//    operator fun invoke(arg: Map<Int, C>): NumberedRationalFunction<C> =
-//        NumberedRationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    @JvmName("invokePolynomial")
-//    operator fun invoke(arg: Map<Int, Polynomial<C>>): NumberedRationalFunction<C> =
-//        NumberedRationalFunction(
-//            numerator(arg),
-//            denominator(arg)
-//        )
-//
-//    @JvmName("invokeRationalFunction")
-//    operator fun invoke(arg: Map<Int, NumberedRationalFunction<C>>): NumberedRationalFunction<C> {
-//        var num = numerator invokeRFTakeNumerator arg
-//        var den = denominator invokeRFTakeNumerator arg
-//        for (variable in 0 until max(numerator.countOfVariables, denominator.countOfVariables)) if (variable in arg) {
-//            val degreeDif = numerator.degrees.getOrElse(variable) { 0 } - denominator.degrees.getOrElse(variable) { 0 }
-//            if (degreeDif > 0)
-//                den = multiplyByPower(den, arg[variable]!!.denominator, degreeDif)
-//            else
-//                num = multiplyByPower(num, arg[variable]!!.denominator, -degreeDif)
-//        }
-//        return NumberedRationalFunction(num, den)
-//    }
-//
-//    override fun toString(): String = toString(Polynomial.variableName)
-//
-//    fun toString(withVariableName: String = Polynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(withVariableName)
-//            else -> "${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toString(namer: (Int) -> String): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toString(namer)
-//            else -> "${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)}"
-//        }
-//
-//    fun toStringWithBrackets(withVariableName: String = Polynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toStringWithBrackets(withVariableName)}/${denominator.toStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun toStringWithBrackets(namer: (Int) -> String): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toStringWithBrackets(namer)
-//            else -> "(${numerator.toStringWithBrackets(namer)}/${denominator.toStringWithBrackets(namer)})"
-//        }
-//
-//    fun toReversedString(withVariableName: String = Polynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(withVariableName)
-//            else -> "${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)}"
-//        }
-//
-//    fun toReversedString(namer: (Int) -> String): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedString(namer)
-//            else -> "${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)}"
-//        }
-//
-//    fun toReversedStringWithBrackets(withVariableName: String = Polynomial.variableName): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(withVariableName)
-//            else -> "(${numerator.toReversedStringWithBrackets(withVariableName)}/${denominator.toReversedStringWithBrackets(withVariableName)})"
-//        }
-//
-//    fun toReversedStringWithBrackets(namer: (Int) -> String): String =
-//        when(true) {
-//            numerator.isZero() -> "0"
-//            denominator.isOne() -> numerator.toReversedStringWithBrackets(namer)
-//            else -> "(${numerator.toReversedStringWithBrackets(namer)}/${denominator.toReversedStringWithBrackets(namer)})"
-//        }
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index e201f1f6e..12490d133 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -25,38 +25,38 @@ public interface Polynomial<C>
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
 public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public operator fun C.plus(other: Int): C
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public operator fun C.minus(other: Int): C
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun C.times(other: Int): C
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public operator fun Int.plus(other: C): C
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public operator fun Int.minus(other: C): C
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -72,38 +72,38 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     public fun Int.asConstant(): C = constantNumber(this)
 
     /**
-     * Returns sum of the polynomial and the integer represented as polynomial.
+     * Returns sum of the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public operator fun P.plus(other: Int): P = addMultipliedByDoubling(this, one, other)
     /**
-     * Returns difference between the polynomial and the integer represented as polynomial.
+     * Returns difference between the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public operator fun P.minus(other: Int): P = addMultipliedByDoubling(this, one, -other)
     /**
-     * Returns product of the polynomial and the integer represented as polynomial.
+     * Returns product of the polynomial and the integer represented as a polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun P.times(other: Int): P = multiplyByDoubling(this, other)
 
     /**
-     * Returns sum of the integer represented as polynomial and the polynomial.
+     * Returns sum of the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public operator fun Int.plus(other: P): P = addMultipliedByDoubling(other, one, this)
     /**
-     * Returns difference between the integer represented as polynomial and the polynomial.
+     * Returns difference between the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public operator fun Int.minus(other: P): P = addMultipliedByDoubling(-other, one, this)
     /**
-     * Returns product of the integer represented as polynomial and the polynomial.
+     * Returns product of the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -165,28 +165,28 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     public val constantOne: C
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.plus(other: P): P
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.minus(other: P): P
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.times(other: P): P
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.plus(other: C): P
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.minus(other: C): P
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.times(other: C): P
 
@@ -254,41 +254,44 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : PolynomialSpace<C, P> {
 
+    /**
+     * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
+     */
     public val ring: A
 
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -330,58 +333,145 @@ public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : Poly
     public override val constantOne: C get() = ring.one
 }
 
+/**
+ * Abstraction of ring of polynomials of type [P] of variables of type [V] and over ring of constants of type [C].
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param V the type of variables. Polynomials have them in representations of terms.
+ * @param P the type of polynomials.
+ */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface MultivariatePolynomialSpace<C, V, P: Polynomial<C>>: PolynomialSpace<C, P> {
+    /**
+     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("plusVariableInt")
     public operator fun V.plus(other: Int): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("minusVariableInt")
     public operator fun V.minus(other: Int): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("timesVariableInt")
     public operator fun V.times(other: Int): P
 
+    /**
+     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusIntVariable")
     public operator fun Int.plus(other: V): P
+    /**
+     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusIntVariable")
     public operator fun Int.minus(other: V): P
+    /**
+     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesIntVariable")
     public operator fun Int.times(other: V): P
 
-    @JvmName("plusConstantVariable")
-    public operator fun C.plus(other: V): P
-    @JvmName("minusConstantVariable")
-    public operator fun C.minus(other: V): P
-    @JvmName("timesConstantVariable")
-    public operator fun C.times(other: V): P
-
+    /**
+     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("plusVariableConstant")
     public operator fun V.plus(other: C): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("minusVariableConstant")
     public operator fun V.minus(other: C): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("timesVariableConstant")
     public operator fun V.times(other: C): P
 
+    /**
+     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("plusConstantVariable")
+    public operator fun C.plus(other: V): P
+    /**
+     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("minusConstantVariable")
+    public operator fun C.minus(other: V): P
+    /**
+     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("timesConstantVariable")
+    public operator fun C.times(other: V): P
+
+    /**
+     * Represents the variable as a monic monomial.
+     */
     @JvmName("unaryPlusVariable")
     public operator fun V.unaryPlus(): P
+    /**
+     * Returns negation of representation of the variable as a monic monomial.
+     */
     @JvmName("unaryMinusVariable")
     public operator fun V.unaryMinus(): P
+    /**
+     * Returns sum of the variables represented as monic monomials.
+     */
     @JvmName("plusVariableVariable")
     public operator fun V.plus(other: V): P
+    /**
+     * Returns difference between the variables represented as monic monomials.
+     */
     @JvmName("minusVariableVariable")
     public operator fun V.minus(other: V): P
+    /**
+     * Returns product of the variables represented as monic monomials.
+     */
     @JvmName("timesVariableVariable")
     public operator fun V.times(other: V): P
 
+    /**
+     * Represents the [variable] as a monic monomial.
+     */
+    @JvmName("numberVariable")
+    public fun number(variable: V): P = +variable
+    /**
+     * Represents the variable as a monic monomial.
+     */
+    @JvmName("asPolynomialVariable")
+    public fun V.asPolynomial(): P = number(this)
+
+    /**
+     * Returns sum of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("plusVariablePolynomial")
     public operator fun V.plus(other: P): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("minusVariablePolynomial")
     public operator fun V.minus(other: P): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("timesVariablePolynomial")
     public operator fun V.times(other: P): P
 
+    /**
+     * Returns sum of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusPolynomialVariable")
     public operator fun P.plus(other: V): P
+    /**
+     * Returns difference between the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusPolynomialVariable")
     public operator fun P.minus(other: V): P
+    /**
+     * Returns product of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesPolynomialVariable")
     public operator fun P.times(other: V): P
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index dfec126f3..01911f980 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -25,44 +25,44 @@ public interface RationalFunction<C, P: Polynomial<C>> {
  * [C].
  *
  * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators.
  * @param R the type of rational functions.
  */
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
 public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunction<C, P>> : Ring<R> {
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public operator fun C.plus(other: Int): C
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public operator fun C.minus(other: Int): C
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun C.times(other: Int): C
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public operator fun Int.plus(other: C): C
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public operator fun Int.minus(other: C): C
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -78,38 +78,38 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public fun Int.asConstant(): C = constantNumber(this)
 
     /**
-     * Returns sum of the constant and the integer represented as polynomial.
+     * Returns sum of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public operator fun P.plus(other: Int): P
     /**
-     * Returns difference between the constant and the integer represented as polynomial.
+     * Returns difference between the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public operator fun P.minus(other: Int): P
     /**
-     * Returns product of the constant and the integer represented as polynomial.
+     * Returns product of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun P.times(other: Int): P
 
     /**
-     * Returns sum of the integer represented as polynomial and the constant.
+     * Returns sum of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public operator fun Int.plus(other: P): P
     /**
-     * Returns difference between the integer represented as polynomial and the constant.
+     * Returns difference between the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public operator fun Int.minus(other: P): P
     /**
-     * Returns product of the integer represented as polynomial and the constant.
+     * Returns product of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -125,25 +125,25 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public fun Int.asPolynomial(): P = polynomialNumber(this)
 
     /**
-     * Returns sum of the rational function and the integer represented as rational function.
+     * Returns sum of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public operator fun R.plus(other: Int): R = addMultipliedByDoubling(this, one, other)
     /**
-     * Returns difference between the rational function and the integer represented as rational function.
+     * Returns difference between the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public operator fun R.minus(other: Int): R = addMultipliedByDoubling(this, one, -other)
     /**
-     * Returns product of the rational function and the integer represented as rational function.
+     * Returns product of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public operator fun R.times(other: Int): R = multiplyByDoubling(this, other)
     /**
-     * Returns quotient of the rational function and the integer represented as rational function.
+     * Returns quotient of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to creating a new rational function by preserving numerator of [this] and
      * multiplication denominator of [this] to [other].
@@ -151,25 +151,25 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public operator fun R.div(other: Int): R = this / multiplyByDoubling(one, other)
 
     /**
-     * Returns sum of the integer represented as rational function and the rational function.
+     * Returns sum of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public operator fun Int.plus(other: R): R = addMultipliedByDoubling(other, one, this)
     /**
-     * Returns difference between the integer represented as rational function and the rational function.
+     * Returns difference between the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public operator fun Int.minus(other: R): R = addMultipliedByDoubling(-other, one, this)
     /**
-     * Returns product of the integer represented as rational function and the rational function.
+     * Returns product of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public operator fun Int.times(other: R): R = multiplyByDoubling(other, this)
     /**
-     * Returns quotient of the integer represented as rational function and the rational function.
+     * Returns quotient of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to creating a new rational function which numerator is [this] times denominator of
      * [other] and which denominator is [other]'s numerator.
@@ -232,28 +232,28 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public val constantOne: C
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.plus(other: P): P
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.minus(other: P): P
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public operator fun C.times(other: P): P
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.plus(other: C): P
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.minus(other: C): P
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public operator fun P.times(other: C): P
 
@@ -305,36 +305,36 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public val polynomialOne: P
 
     /**
-     * Returns sum of the constant represented as rational function and the rational function.
+     * Returns sum of the constant represented as a rational function and the rational function.
      */
     public operator fun C.plus(other: R): R
     /**
-     * Returns difference between the constant represented as polynomial and the rational function.
+     * Returns difference between the constant represented as a polynomial and the rational function.
      */
     public operator fun C.minus(other: R): R
     /**
-     * Returns product of the constant represented as polynomial and the rational function.
+     * Returns product of the constant represented as a polynomial and the rational function.
      */
     public operator fun C.times(other: R): R
     /**
-     * Returns quotient of the constant represented as polynomial and the rational function.
+     * Returns quotient of the constant represented as a polynomial and the rational function.
      */
     public operator fun C.div(other: R): R
 
     /**
-     * Returns sum of the rational function and the constant represented as rational function.
+     * Returns sum of the rational function and the constant represented as a rational function.
      */
     public operator fun R.plus(other: C): R
     /**
-     * Returns difference between the rational function and the constant represented as rational function.
+     * Returns difference between the rational function and the constant represented as a rational function.
      */
     public operator fun R.minus(other: C): R
     /**
-     * Returns product of the rational function and the constant represented as rational function.
+     * Returns product of the rational function and the constant represented as a rational function.
      */
     public operator fun R.times(other: C): R
     /**
-     * Returns quotient of the rational function and the constant represented as rational function.
+     * Returns quotient of the rational function and the constant represented as a rational function.
      */
     public operator fun R.div(other: C): R
 
@@ -348,36 +348,36 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
     public fun C.asRationalFunction(): R = number(this)
 
     /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
+     * Returns sum of the polynomial represented as a rational function and the rational function.
      */
     public operator fun P.plus(other: R): R
     /**
-     * Returns difference between the polynomial represented as polynomial and the rational function.
+     * Returns difference between the polynomial represented as a polynomial and the rational function.
      */
     public operator fun P.minus(other: R): R
     /**
-     * Returns product of the polynomial represented as polynomial and the rational function.
+     * Returns product of the polynomial represented as a polynomial and the rational function.
      */
     public operator fun P.times(other: R): R
     /**
-     * Returns quotient of the polynomial represented as polynomial and the rational function.
+     * Returns quotient of the polynomial represented as a polynomial and the rational function.
      */
     public operator fun P.div(other: R): R
 
     /**
-     * Returns sum of the rational function and the polynomial represented as rational function.
+     * Returns sum of the rational function and the polynomial represented as a rational function.
      */
     public operator fun R.plus(other: P): R
     /**
-     * Returns difference between the rational function and the polynomial represented as rational function.
+     * Returns difference between the rational function and the polynomial represented as a rational function.
      */
     public operator fun R.minus(other: P): R
     /**
-     * Returns product of the rational function and the polynomial represented as rational function.
+     * Returns product of the rational function and the polynomial represented as a rational function.
      */
     public operator fun R.times(other: P): R
     /**
-     * Returns quotient of the rational function and the polynomial represented as rational function.
+     * Returns quotient of the rational function and the polynomial represented as a rational function.
      */
     public operator fun R.div(other: P): R
 
@@ -459,43 +459,51 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
  * @param A the type of algebraic structure (precisely, of ring) provided for constants.
  */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface RationalFunctionalSpaceOverRing<C, P: Polynomial<C>, R: RationalFunction<C, P>, A: Ring<C>> : RationalFunctionalSpace<C, P, R> {
+public interface RationalFunctionalSpaceOverRing<
+        C,
+        P: Polynomial<C>,
+        R: RationalFunction<C, P>,
+        A: Ring<C>
+        > : RationalFunctionalSpace<C, P, R> {
 
+    /**
+     * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
+     */
     public val ring: A
 
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -560,41 +568,44 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
         AP: PolynomialSpace<C, P>,
         > : RationalFunctionalSpace<C, P, R> {
 
+    /**
+     * Underlying polynomial ring. Its polynomial operations are inherited by local polynomial operations.
+     */
     public val polynomialRing: AP
 
     /**
-     * Returns sum of the constant and the integer represented as constant (member of underlying ring).
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
     public override operator fun C.plus(other: Int): C = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the constant and the integer represented as constant (member of underlying ring).
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
     public override operator fun C.minus(other: Int): C = polynomialRing { this@minus - other }
     /**
-     * Returns product of the constant and the integer represented as constant (member of underlying ring).
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun C.times(other: Int): C = polynomialRing { this@times * other }
 
     /**
-     * Returns sum of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
     public override operator fun Int.plus(other: C): C = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the integer represented as constant (member of underlying ring) and the constant.
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
     public override operator fun Int.minus(other: C): C = polynomialRing { this@minus - other }
     /**
-     * Returns product of the integer represented as constant (member of underlying ring) and the constant.
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -610,38 +621,38 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
     override fun Int.asConstant(): C = polynomialRing { asConstant() }
 
     /**
-     * Returns sum of the constant and the integer represented as polynomial.
+     * Returns sum of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public override operator fun P.plus(other: Int): P = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the constant and the integer represented as polynomial.
+     * Returns difference between the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public override operator fun P.minus(other: Int): P = polynomialRing { this@minus - other }
     /**
-     * Returns product of the constant and the integer represented as polynomial.
+     * Returns product of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun P.times(other: Int): P = polynomialRing { this@times * other }
 
     /**
-     * Returns sum of the integer represented as polynomial and the constant.
+     * Returns sum of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public override operator fun Int.plus(other: P): P = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the integer represented as polynomial and the constant.
+     * Returns difference between the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public override operator fun Int.minus(other: P): P = polynomialRing { this@minus - other }
     /**
-     * Returns product of the integer represented as polynomial and the constant.
+     * Returns product of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -697,28 +708,28 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
     public override val constantOne: C get() = polynomialRing.constantOne
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.plus(other: P): P = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.minus(other: P): P = polynomialRing { this@minus - other }
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun C.times(other: P): P = polynomialRing { this@times * other }
 
     /**
-     * Returns sum of the constant represented as polynomial and the polynomial.
+     * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun P.plus(other: C): P = polynomialRing { this@plus + other }
     /**
-     * Returns difference between the constant represented as polynomial and the polynomial.
+     * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     public override operator fun P.minus(other: C): P = polynomialRing { this@minus - other }
     /**
-     * Returns product of the constant represented as polynomial and the polynomial.
+     * Returns product of the constant represented as a polynomial and the polynomial.
      */
     public override operator fun P.times(other: C): P = polynomialRing { this@times * other }
 
@@ -774,7 +785,8 @@ public interface RationalFunctionalSpaceOverPolynomialSpace<
 
 /**
  * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
- * [C]. It also assumes that there is provided constructor
+ * [C]. It also assumes that there is provided constructor [constructRationalFunction] of rational functions from
+ * polynomial numerator and denominator.
  *
  * @param C the type of constants. Polynomials have them as coefficients in their terms.
  * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
@@ -786,10 +798,14 @@ public abstract class PolynomialSpaceOfFractions<
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         > : RationalFunctionalSpace<C, P, R> {
+
+    /**
+     * Constructor of rational functions (of type [R]) from numerator and denominator (of type [P]).
+     */
     protected abstract fun constructRationalFunction(numerator: P, denominator: P = polynomialOne) : R
 
     /**
-     * Returns sum of the rational function and the integer represented as rational function.
+     * Returns sum of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
@@ -799,7 +815,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns difference between the rational function and the integer represented as rational function.
+     * Returns difference between the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
@@ -809,7 +825,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns product of the rational function and the integer represented as rational function.
+     * Returns product of the rational function and the integer represented as a rational function.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
@@ -818,7 +834,12 @@ public abstract class PolynomialSpaceOfFractions<
             numerator * other,
             denominator
         )
-
+    /**
+     * Returns quotient of the rational function and the integer represented as a rational function.
+     *
+     * The operation is equivalent to creating a new rational function by preserving numerator of [this] and
+     * multiplication denominator of [this] to [other].
+     */
     public override operator fun R.div(other: Int): R =
         constructRationalFunction(
             numerator,
@@ -826,7 +847,7 @@ public abstract class PolynomialSpaceOfFractions<
         )
 
     /**
-     * Returns sum of the integer represented as rational function and the rational function.
+     * Returns sum of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
@@ -836,7 +857,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns difference between the integer represented as rational function and the rational function.
+     * Returns difference between the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
@@ -846,7 +867,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns product of the integer represented as rational function and the rational function.
+     * Returns product of the integer represented as a rational function and the rational function.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
@@ -855,7 +876,12 @@ public abstract class PolynomialSpaceOfFractions<
             this * other.numerator,
             other.denominator
         )
-
+    /**
+     * Returns quotient of the integer represented as a rational function and the rational function.
+     *
+     * The operation is equivalent to creating a new rational function which numerator is [this] times denominator of
+     * [other] and which denominator is [other]'s numerator.
+     */
     public override operator fun Int.div(other: R): R =
         constructRationalFunction(
             this * other.denominator,
@@ -873,7 +899,7 @@ public abstract class PolynomialSpaceOfFractions<
     public override operator fun P.div(other: P): R = constructRationalFunction(this, other)
 
     /**
-     * Returns sum of the constant represented as rational function and the rational function.
+     * Returns sum of the constant represented as a rational function and the rational function.
      */
     public override operator fun C.plus(other: R): R =
         constructRationalFunction(
@@ -881,7 +907,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns difference between the constant represented as polynomial and the rational function.
+     * Returns difference between the constant represented as a polynomial and the rational function.
      */
     public override operator fun C.minus(other: R): R =
         constructRationalFunction(
@@ -889,14 +915,16 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns product of the constant represented as polynomial and the rational function.
+     * Returns product of the constant represented as a polynomial and the rational function.
      */
     public override operator fun C.times(other: R): R =
         constructRationalFunction(
             this * other.numerator,
             other.denominator
         )
-
+    /**
+     * Returns quotient of the constant represented as a polynomial and the rational function.
+     */
     public override operator fun C.div(other: R): R =
         constructRationalFunction(
             this * other.denominator,
@@ -904,7 +932,7 @@ public abstract class PolynomialSpaceOfFractions<
         )
 
     /**
-     * Returns sum of the constant represented as rational function and the rational function.
+     * Returns sum of the constant represented as a rational function and the rational function.
      */
     public override operator fun R.plus(other: C): R =
         constructRationalFunction(
@@ -912,7 +940,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns difference between the constant represented as rational function and the rational function.
+     * Returns difference between the constant represented as a rational function and the rational function.
      */
     public override operator fun R.minus(other: C): R =
         constructRationalFunction(
@@ -920,14 +948,16 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns product of the constant represented as rational function and the rational function.
+     * Returns product of the constant represented as a rational function and the rational function.
      */
     public override operator fun R.times(other: C): R =
         constructRationalFunction(
             numerator * other,
             denominator
         )
-
+    /**
+     * Returns quotient of the rational function and the constant represented as a rational function.
+     */
     public override operator fun R.div(other: C): R =
         constructRationalFunction(
             numerator,
@@ -940,7 +970,7 @@ public abstract class PolynomialSpaceOfFractions<
     public override fun number(value: C): R = constructRationalFunction(polynomialNumber(value))
 
     /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
+     * Returns sum of the polynomial represented as a rational function and the rational function.
      */
     public override operator fun P.plus(other: R): R =
         constructRationalFunction(
@@ -948,7 +978,7 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns difference between the polynomial represented as polynomial and the rational function.
+     * Returns difference between the polynomial represented as a polynomial and the rational function.
      */
     public override operator fun P.minus(other: R): R =
         constructRationalFunction(
@@ -956,14 +986,16 @@ public abstract class PolynomialSpaceOfFractions<
             other.denominator
         )
     /**
-     * Returns product of the polynomial represented as polynomial and the rational function.
+     * Returns product of the polynomial represented as a polynomial and the rational function.
      */
     public override operator fun P.times(other: R): R =
         constructRationalFunction(
             this * other.numerator,
             other.denominator
         )
-
+    /**
+     * Returns quotient of the polynomial represented as a polynomial and the rational function.
+     */
     public override operator fun P.div(other: R): R =
         constructRationalFunction(
             this * other.denominator,
@@ -971,7 +1003,7 @@ public abstract class PolynomialSpaceOfFractions<
         )
 
     /**
-     * Returns sum of the polynomial represented as rational function and the rational function.
+     * Returns sum of the polynomial represented as a rational function and the rational function.
      */
     public override operator fun R.plus(other: P): R =
         constructRationalFunction(
@@ -979,7 +1011,7 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns difference between the polynomial represented as rational function and the rational function.
+     * Returns difference between the polynomial represented as a rational function and the rational function.
      */
     public override operator fun R.minus(other: P): R =
         constructRationalFunction(
@@ -987,14 +1019,16 @@ public abstract class PolynomialSpaceOfFractions<
             denominator
         )
     /**
-     * Returns product of the polynomial represented as rational function and the rational function.
+     * Returns product of the polynomial represented as a rational function and the rational function.
      */
     public override operator fun R.times(other: P): R =
         constructRationalFunction(
             numerator * other,
             denominator
         )
-
+    /**
+     * Returns quotient of the rational function and the polynomial represented as a rational function.
+     */
     public override operator fun R.div(other: P): R =
         constructRationalFunction(
             numerator,
@@ -1034,7 +1068,9 @@ public abstract class PolynomialSpaceOfFractions<
             numerator * other.numerator,
             denominator * other.denominator
         )
-
+    /**
+     * Returns quotient of the rational functions.
+     */
     public override operator fun R.div(other: R): R =
         constructRationalFunction(
             numerator * other.denominator,
@@ -1044,14 +1080,23 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Instance of zero rational function (zero of the rational functions ring).
      */
-    public override val zero: R get() = constructRationalFunction(polynomialZero)
+    public override val zero: R by lazy { constructRationalFunction(polynomialZero) }
 
     /**
      * Instance of unit polynomial (unit of the rational functions ring).
      */
-    public override val one: R get() = constructRationalFunction(polynomialOne)
+    public override val one: R by lazy { constructRationalFunction(polynomialOne) }
 }
 
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] of variables of type
+ * [V] and over ring of constants of type [C].
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param V the type of variables. Polynomials have them in representations of terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface MultivariateRationalFunctionalSpace<
         C,
@@ -1059,70 +1104,179 @@ public interface MultivariateRationalFunctionalSpace<
         P: Polynomial<C>,
         R: RationalFunction<C, P>
         >: RationalFunctionalSpace<C, P, R> {
+    /**
+     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("plusVariableInt")
     public operator fun V.plus(other: Int): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("minusVariableInt")
     public operator fun V.minus(other: Int): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("timesVariableInt")
     public operator fun V.times(other: Int): P
 
+    /**
+     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusIntVariable")
     public operator fun Int.plus(other: V): P
+    /**
+     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusIntVariable")
     public operator fun Int.minus(other: V): P
+    /**
+     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesIntVariable")
     public operator fun Int.times(other: V): P
 
-    @JvmName("plusConstantVariable")
-    public operator fun C.plus(other: V): P
-    @JvmName("minusConstantVariable")
-    public operator fun C.minus(other: V): P
-    @JvmName("timesConstantVariable")
-    public operator fun C.times(other: V): P
-
+    /**
+     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("plusVariableConstant")
     public operator fun V.plus(other: C): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("minusVariableConstant")
     public operator fun V.minus(other: C): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("timesVariableConstant")
     public operator fun V.times(other: C): P
 
+    /**
+     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("plusConstantVariable")
+    public operator fun C.plus(other: V): P
+    /**
+     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("minusConstantVariable")
+    public operator fun C.minus(other: V): P
+    /**
+     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("timesConstantVariable")
+    public operator fun C.times(other: V): P
+
+    /**
+     * Represents the variable as a monic monomial.
+     */
     @JvmName("unaryPlusVariable")
     public operator fun V.unaryPlus(): P
+    /**
+     * Returns negation of representation of the variable as a monic monomial.
+     */
     @JvmName("unaryMinusVariable")
     public operator fun V.unaryMinus(): P
+    /**
+     * Returns sum of the variables represented as monic monomials.
+     */
     @JvmName("plusVariableVariable")
     public operator fun V.plus(other: V): P
+    /**
+     * Returns difference between the variables represented as monic monomials.
+     */
     @JvmName("minusVariableVariable")
     public operator fun V.minus(other: V): P
+    /**
+     * Returns product of the variables represented as monic monomials.
+     */
     @JvmName("timesVariableVariable")
     public operator fun V.times(other: V): P
 
+    /**
+     * Represents the [variable] as a monic monomial.
+     */
+    @JvmName("polynomialNumberVariable")
+    public fun polynomialNumber(variable: V): P = +variable
+    /**
+     * Represents the variable as a monic monomial.
+     */
+    @JvmName("asPolynomialVariable")
+    public fun V.asPolynomial(): P = polynomialNumber(this)
+
+    /**
+     * Represents the [variable] as a rational function.
+     */
+    @JvmName("numberVariable")
+    public fun number(variable: V): R = number(polynomialNumber(variable))
+    /**
+     * Represents the variable as a rational function.
+     */
+    @JvmName("asRationalFunctionVariable")
+    public fun V.asRationalFunction(): R = number(this)
+
+    /**
+     * Returns sum of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("plusVariablePolynomial")
     public operator fun V.plus(other: P): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("minusVariablePolynomial")
     public operator fun V.minus(other: P): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("timesVariablePolynomial")
     public operator fun V.times(other: P): P
 
+    /**
+     * Returns sum of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusPolynomialVariable")
     public operator fun P.plus(other: V): P
+    /**
+     * Returns difference between the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusPolynomialVariable")
     public operator fun P.minus(other: V): P
+    /**
+     * Returns product of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesPolynomialVariable")
     public operator fun P.times(other: V): P
 
+    /**
+     * Returns sum of the variable represented as a rational function and the rational function.
+     */
     @JvmName("plusVariableRational")
     public operator fun V.plus(other: R): R
+    /**
+     * Returns difference between the variable represented as a rational function and the rational function.
+     */
     @JvmName("minusVariableRational")
     public operator fun V.minus(other: R): R
+    /**
+     * Returns product of the variable represented as a rational function and the rational function.
+     */
     @JvmName("timesVariableRational")
     public operator fun V.times(other: R): R
 
+    /**
+     * Returns sum of the rational function and the variable represented as a rational function.
+     */
     @JvmName("plusRationalVariable")
     public operator fun R.plus(other: V): R
+    /**
+     * Returns difference between the rational function and the variable represented as a rational function.
+     */
     @JvmName("minusRationalVariable")
     public operator fun R.minus(other: V): R
+    /**
+     * Returns product of the rational function and the variable represented as a rational function.
+     */
     @JvmName("timesRationalVariable")
     public operator fun R.times(other: V): R
 
@@ -1161,22 +1315,17 @@ public interface MultivariateRationalFunctionalSpace<
     public val R.countOfVariables: Int get() = variables.size
 }
 
-public interface MultivariateRationalFunctionalSpaceOverRing<
-        C,
-        V,
-        P: Polynomial<C>,
-        R: RationalFunction<C, P>,
-        A: Ring<C>
-        > : RationalFunctionalSpaceOverRing<C, P, R, A>, MultivariateRationalFunctionalSpace<C, V, P, R>
-
-public interface MultivariateRationalFunctionalSpaceOverPolynomialSpace<
-        C,
-        V,
-        P: Polynomial<C>,
-        R: RationalFunction<C, P>,
-        AP: PolynomialSpace<C, P>,
-        > : RationalFunctionalSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionalSpace<C, V, P, R>
-
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] of variables of type
+ * [V] and over ring of constants of type [C]. It also assumes that there is provided [polynomialRing] (of type [AP]),
+ * that provides constant-, variable- and polynomial-wise operations.
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param V the type of variables. Polynomials have them in representations of terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
+ */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSpace<
         C,
@@ -1184,57 +1333,137 @@ public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSp
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         AP: MultivariatePolynomialSpace<C, V, P>,
-        > : MultivariateRationalFunctionalSpaceOverPolynomialSpace<C, V, P, R, AP> {
+        > : RationalFunctionalSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionalSpace<C, V, P, R> {
+    /**
+     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("plusVariableInt")
     public override operator fun V.plus(other: Int): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("minusVariableInt")
     public override operator fun V.minus(other: Int): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
     @JvmName("timesVariableInt")
     public override operator fun V.times(other: Int): P = polynomialRing { this@times * other }
 
+    /**
+     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusIntVariable")
     public override operator fun Int.plus(other: V): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusIntVariable")
     public override operator fun Int.minus(other: V): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesIntVariable")
     public override operator fun Int.times(other: V): P = polynomialRing { this@times * other }
 
-    @JvmName("plusConstantVariable")
-    public override operator fun C.plus(other: V): P = polynomialRing { this@plus + other }
-    @JvmName("minusConstantVariable")
-    public override operator fun C.minus(other: V): P = polynomialRing { this@minus - other }
-    @JvmName("timesConstantVariable")
-    public override operator fun C.times(other: V): P = polynomialRing { this@times * other }
-
+    /**
+     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("plusVariableConstant")
     public override operator fun V.plus(other: C): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("minusVariableConstant")
     public override operator fun V.minus(other: C): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
     @JvmName("timesVariableConstant")
     public override operator fun V.times(other: C): P = polynomialRing { this@times * other }
 
+    /**
+     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("plusConstantVariable")
+    public override operator fun C.plus(other: V): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("minusConstantVariable")
+    public override operator fun C.minus(other: V): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("timesConstantVariable")
+    public override operator fun C.times(other: V): P = polynomialRing { this@times * other }
+
+    /**
+     * Represents the variable as a monic monomial.
+     */
     @JvmName("unaryPlusVariable")
     public override operator fun V.unaryPlus(): P = polynomialRing { +this@unaryPlus }
+    /**
+     * Returns negation of representation of the variable as a monic monomial.
+     */
     @JvmName("unaryMinusVariable")
     public override operator fun V.unaryMinus(): P = polynomialRing { -this@unaryMinus }
+    /**
+     * Returns sum of the variables represented as monic monomials.
+     */
     @JvmName("plusVariableVariable")
     public override operator fun V.plus(other: V): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the variables represented as monic monomials.
+     */
     @JvmName("minusVariableVariable")
     public override operator fun V.minus(other: V): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the variables represented as monic monomials.
+     */
     @JvmName("timesVariableVariable")
     public override operator fun V.times(other: V): P = polynomialRing { this@times * other }
 
+    /**
+     * Represents the [variable] as a monic monomial.
+     */
+    @JvmName("polynomialNumberVariable")
+    public override fun polynomialNumber(variable: V): P = polynomialRing { number(variable) }
+    /**
+     * Represents the variable as a monic monomial.
+     */
+    @JvmName("asPolynomialVariable")
+    public override fun V.asPolynomial(): P = polynomialRing { this@asPolynomial.asPolynomial() }
+
+    /**
+     * Returns sum of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("plusVariablePolynomial")
     public override operator fun V.plus(other: P): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("minusVariablePolynomial")
     public override operator fun V.minus(other: P): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the variable represented as a monic monomial and the polynomial.
+     */
     @JvmName("timesVariablePolynomial")
     public override operator fun V.times(other: P): P = polynomialRing { this@times * other }
 
+    /**
+     * Returns sum of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("plusPolynomialVariable")
     public override operator fun P.plus(other: V): P = polynomialRing { this@plus + other }
+    /**
+     * Returns difference between the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("minusPolynomialVariable")
     public override operator fun P.minus(other: V): P = polynomialRing { this@minus - other }
+    /**
+     * Returns product of the polynomial and the variable represented as a monic monomial.
+     */
     @JvmName("timesPolynomialVariable")
     public override operator fun P.times(other: V): P = polynomialRing { this@times * other }
 
@@ -1264,6 +1493,16 @@ public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSp
     public override val P.countOfVariables: Int get() = polynomialRing { countOfVariables }
 }
 
+/**
+ * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] of variables of type
+ * [V] and over ring of constants of type [C]. It also assumes that there is provided constructor
+ * [constructRationalFunction] of rational functions from polynomial numerator and denominator.
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param V the type of variables. Polynomials have them in representations of terms.
+ * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
+ * @param R the type of rational functions.
+ */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public abstract class MultivariatePolynomialSpaceOfFractions<
         C,
@@ -1271,18 +1510,27 @@ public abstract class MultivariatePolynomialSpaceOfFractions<
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         > : MultivariateRationalFunctionalSpace<C, V, P, R>,  PolynomialSpaceOfFractions<C, P, R>() {
+    /**
+     * Returns sum of the variable represented as a rational function and the rational function.
+     */
     @JvmName("plusVariableRational")
     public override operator fun V.plus(other: R): R =
         constructRationalFunction(
             this * other.denominator + other.numerator,
             other.denominator
         )
+    /**
+     * Returns difference between the variable represented as a rational function and the rational function.
+     */
     @JvmName("minusVariableRational")
     public override operator fun V.minus(other: R): R =
         constructRationalFunction(
             this * other.denominator - other.numerator,
             other.denominator
         )
+    /**
+     * Returns product of the variable represented as a rational function and the rational function.
+     */
     @JvmName("timesVariableRational")
     public override operator fun V.times(other: R): R =
         constructRationalFunction(
@@ -1290,18 +1538,27 @@ public abstract class MultivariatePolynomialSpaceOfFractions<
             other.denominator
         )
 
+    /**
+     * Returns sum of the rational function and the variable represented as a rational function.
+     */
     @JvmName("plusRationalVariable")
     public override operator fun R.plus(other: V): R =
         constructRationalFunction(
             numerator + denominator * other,
             denominator
         )
+    /**
+     * Returns difference between the rational function and the variable represented as a rational function.
+     */
     @JvmName("minusRationalVariable")
     public override operator fun R.minus(other: V): R =
         constructRationalFunction(
             numerator - denominator * other,
             denominator
         )
+    /**
+     * Returns product of the rational function and the variable represented as a rational function.
+     */
     @JvmName("timesRationalVariable")
     public override operator fun R.times(other: V): R =
         constructRationalFunction(
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
deleted file mode 100644
index e81a9388e..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-
-
-/**
- * Returns the same degrees' description of the monomial, but without zero degrees.
- */
-internal fun Map<Symbol, UInt>.cleanUp() = filterValues { it > 0U }
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
-    if (!toCheckInput) return LabeledPolynomial<C>(coefs)
-
-    val fixedCoefs = LinkedHashMap<Map<Symbol, UInt>, C>(coefs.size)
-
-    for (entry in coefs) {
-        val key = entry.key.cleanUp()
-        val value = entry.value
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
-    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = LinkedHashMap<Map<Symbol, UInt>, C>(pairs.size)
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> = ring.LabeledPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, toCheckInput: Boolean = true) : LabeledPolynomial<C> {
-    if (!toCheckInput) return LabeledPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = LinkedHashMap<Map<Symbol, UInt>, C>(pairs.size)
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs, toCheckInput = true)
-
-//context(A)
-//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to one))
-//context(LabeledPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
-//context(LabeledRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
-
-public fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(emptyMap<Symbol, UInt>() to this))
-
-@DslMarker
-@UnstableKMathAPI
-internal annotation class LabeledPolynomialConstructorDSL
-
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-public class LabeledPolynomialTermSignatureBuilder {
-    private val signature: MutableMap<Symbol, UInt> = LinkedHashMap()
-    public fun build(): Map<Symbol, UInt> = signature
-    public infix fun Symbol.inPowerOf(deg: UInt) {
-        signature[this] = deg
-    }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Symbol.pow(deg: UInt): Unit = this inPowerOf deg
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Symbol.`in`(deg: UInt): Unit = this inPowerOf deg
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Symbol.of(deg: UInt): Unit = this inPowerOf deg
-}
-
-@UnstableKMathAPI
-public class LabeledPolynomialBuilder<C>(private val zero: C, private val add: (C, C) -> C, capacity: Int = 0) {
-    private val coefficients: MutableMap<Map<Symbol, UInt>, C> = LinkedHashMap(capacity)
-    public fun build(): LabeledPolynomial<C> = LabeledPolynomial<C>(coefficients)
-    public operator fun C.invoke(block: LabeledPolynomialTermSignatureBuilder.() -> Unit) {
-        val signature = LabeledPolynomialTermSignatureBuilder().apply(block).build()
-        coefficients[signature] = add(coefficients.getOrElse(signature) { zero }, this@invoke)
-    }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun C.with(noinline block: LabeledPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun (LabeledPolynomialTermSignatureBuilder.() -> Unit).with(coef: C): Unit = coef.invoke(this)
-    @Suppress("NOTHING_TO_INLINE")
-    public infix fun sig(block: LabeledPolynomialTermSignatureBuilder.() -> Unit): LabeledPolynomialTermSignatureBuilder.() -> Unit = block
-}
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> A.LabeledPolynomial(block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(zero, ::add).apply(block).build()
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> A.LabeledPolynomial(capacity: Int, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(zero, ::add, capacity).apply(block).build()
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(constantZero, { left: C, right: C -> left + right}).apply(block).build()
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(capacity: Int, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(constantZero, { left: C, right: C -> left + right}, capacity).apply(block).build()
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        LabeledPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        LabeledPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(numerator, polynomialOne)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(numerator, LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one), toCheckInput = false))
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        polynomialOne
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients, toCheckInput = true),
-        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one), toCheckInput = false)
-    )
-
-//context(A)
-//public fun <C, A: Ring<C>> Symbol.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
-//context(LabeledRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> Symbol.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
-
-//context(A)
-//public fun <C, A: Ring<C>> C.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
-//context(LabeledRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> C.asLabeledRationalFunction() : LabeledRationalFunction<C> = LabeledRationalFunction(asLabeledPolynomial())
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
deleted file mode 100644
index af918b9ae..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledPolynomialUtil.kt
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-
-
-// TODO: Docs
-
-/**
- * Creates a [LabeledPolynomialSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.labeledPolynomial(): LabeledPolynomialSpace<C, A> =
-    LabeledPolynomialSpace(this)
-
-/**
- * Creates a [LabeledPolynomialSpace]'s scope over a received ring.
- */
-@OptIn(ExperimentalContracts::class)
-public inline fun <C, A : Ring<C>, R> A.labeledPolynomial(block: LabeledPolynomialSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return LabeledPolynomialSpace(this).block()
-}
-
-///**
-// * Represents the polynomial as a [String] with names of variables substituted with names from [names].
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(names: Map<Symbol, String> = emptyMap()): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .toSortedMap()
-//                            .filter { it.value > 0U }
-//                            .map { (variable, deg) ->
-//                                val variableName = names.getOrDefault(variable, variable.toString())
-//                                when (deg) {
-//                                    1U -> variableName
-//                                    else -> "$variableName^$deg"
-//                                }
-//                            }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer].
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.represent(namer: (Symbol) -> String): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .toSortedMap()
-//                            .filter { it.value > 0U }
-//                            .map { (variable, deg) ->
-//                                when (deg) {
-//                                    1U -> namer(variable)
-//                                    else -> "${namer(variable)}^$deg"
-//                                }
-//                            }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] with names of variables substituted with names from [names] and with
-// * brackets around the string if needed (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
-//    with(represent(names)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
-// * (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representWithBrackets(namer: (Symbol) -> String): String =
-//    with(represent(namer)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] with names of variables substituted with names from [names].
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(names: Map<Symbol, String> = emptyMap()): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> -LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .toSortedMap()
-//                            .filter { it.value > 0U }
-//                            .map { (variable, deg) ->
-//                                val variableName = names.getOrDefault(variable, variable.toString())
-//                                when (deg) {
-//                                    1U -> variableName
-//                                    else -> "$variableName^$deg"
-//                                }
-//                            }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer].
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversed(namer: (Symbol) -> String): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> -LabeledPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .toSortedMap()
-//                            .filter { it.value > 0U }
-//                            .map { (variable, deg) ->
-//                                when (deg) {
-//                                    1U -> namer(variable)
-//                                    else -> "${namer(variable)}^$deg"
-//                                }
-//                            }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] with names of variables substituted with names from [names] and with
-// * brackets around the string if needed (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(names: Map<Symbol, String> = emptyMap()): String =
-//    with(representReversed(names)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
-// * (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> LabeledPolynomial<C>.representReversedWithBrackets(namer: (Symbol) -> String): String =
-//    with(representReversed(namer)) { if (coefficients.count() == 1) this else "($this)" }
-
-//operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
-//    if (other.isZero()) throw ArithmeticException("/ by zero")
-//    else
-//        Polynomial(
-//            coefficients
-//                .mapValues { it.value / other },
-//            toCheckInput = false
-//        )
-
-//public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Symbol, C>): LabeledPolynomial<C> = ring {
-//    if (coefficients.isEmpty()) return this@substitute
-//    LabeledPolynomial<C>(
-//        buildMap {
-//            coefficients.forEach { (degs, c) ->
-//                val newDegs = degs.filterKeys { it !in args }
-//                val newC = degs.entries.asSequence().filter { it.key in args }.fold(c) { acc, (variable, deg) ->
-//                    multiplyWithPower(acc, args[variable]!!, deg)
-//                }
-//                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
-//            }
-//        }
-//    )
-//}
-//
-//// TODO: Replace with optimisation: the [result] may be unboxed, and all operations may be performed as soon as
-////  possible on it
-//@JvmName("substitutePolynomial")
-//fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, arg: Map<Symbol, LabeledPolynomial<C>>) : LabeledPolynomial<C> =
-//    ring.labeledPolynomial {
-//        if (coefficients.isEmpty()) return zero
-//        coefficients
-//            .asSequence()
-//            .map { (degs, c) ->
-//                degs.entries
-//                    .asSequence()
-//                    .filter { it.key in arg }
-//                    .fold(LabeledPolynomial(mapOf(degs.filterKeys { it !in arg } to c))) { acc, (index, deg) ->
-//                        multiplyWithPower(acc, arg[index]!!, deg)
-//                    }
-//            }
-//            .reduce { acc, polynomial -> acc + polynomial } // TODO: Rewrite. Might be slow.
-//    }
-//
-//// TODO: Substitute rational function
-//
-//fun <C, A : Ring<C>> LabeledPolynomial<C>.asFunctionOver(ring: A): (Map<Symbol, C>) -> LabeledPolynomial<C> =
-//    { substitute(ring, it) }
-//
-//fun <C, A : Ring<C>> LabeledPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Symbol, LabeledPolynomial<C>>) -> LabeledPolynomial<C> =
-//    { substitute(ring, it) }
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-): LabeledPolynomial<C> = algebra {
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (variable !in degs) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                when {
-                                    vari != variable -> put(vari, deg)
-                                    deg > 1u -> put(vari, deg - 1u)
-                                }
-                            }
-                        },
-                        multiplyByDoubling(c, degs[variable]!!)
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variables: Collection<Symbol>,
-): LabeledPolynomial<C> = algebra {
-    val cleanedVariables = variables.toSet()
-    if (cleanedVariables.isEmpty()) return this@derivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (!degs.keys.containsAll(cleanedVariables)) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                when {
-                                    vari !in cleanedVariables -> put(vari, deg)
-                                    deg > 1u -> put(vari, deg - 1u)
-                                }
-                            }
-                        },
-                        cleanedVariables.fold(c) { acc, variable -> multiplyByDoubling(acc, degs[variable]!!) }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-    order: UInt
-): LabeledPolynomial<C> = algebra {
-    if (order == 0u) return this@nthDerivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.getOrElse(variable) { 0u } < order) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                when {
-                                    vari != variable -> put(vari, deg)
-                                    deg > order -> put(vari, deg - order)
-                                }
-                            }
-                        },
-                        degs[variable]!!.let { deg ->
-                            (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> multiplyByDoubling(acc, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Symbol, UInt>,
-): LabeledPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (filteredVariablesAndOrders.any { (variable, order) -> degs.getOrElse(variable) { 0u } < order }) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                if (vari !in filteredVariablesAndOrders) put(vari, deg)
-                                else {
-                                    val order = filteredVariablesAndOrders[vari]!!
-                                    if (deg > order) put(vari, deg - order)
-                                }
-                            }
-                        },
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            degs[index]!!.let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> multiplyByDoubling(acc2, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-): LabeledPolynomial<C> = algebra {
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        put(variable, 1u)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
-                    put(
-                        newDegs,
-                        c / multiplyByDoubling(one, newDegs[variable]!!)
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variables: Collection<Symbol>,
-): LabeledPolynomial<C> = algebra {
-    val cleanedVariables = variables.toSet()
-    if (cleanedVariables.isEmpty()) return this@antiderivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        for (variable in cleanedVariables) put(variable, 1u)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
-                    put(
-                        newDegs,
-                        cleanedVariables.fold(c) { acc, variable -> acc / multiplyByDoubling(one, newDegs[variable]!!) }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-    order: UInt
-): LabeledPolynomial<C> = algebra {
-    if (order == 0u) return this@nthAntiderivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        put(variable, order)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
-                    put(
-                        newDegs,
-                        newDegs[variable]!!.let { deg ->
-                            (deg downTo  deg - order + 1u)
-                                .fold(c) { acc, ord -> acc / multiplyByDoubling(one, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Symbol, UInt>,
-): LabeledPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthAntiderivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        for ((variable, order) in filteredVariablesAndOrders) put(variable, order)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
-                    put(
-                        newDegs,
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            newDegs[index]!!.let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> acc2 / multiplyByDoubling(one, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
deleted file mode 100644
index 583160cf4..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledRationalFunctionUtil.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-
-
-/**
- * Creates a [LabeledRationalFunctionSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.labeledRationalFunction(): LabeledRationalFunctionSpace<C, A> =
-    LabeledRationalFunctionSpace(this)
-
-/**
- * Creates a [LabeledRationalFunctionSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.labeledRationalFunction(block: LabeledRationalFunctionSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return LabeledRationalFunctionSpace(this).block()
-}
-
-//fun <T: Field<T>> LabeledRationalFunction<T>.reduced(): LabeledRationalFunction<T> {
-//    val greatestCommonDivider = polynomialGCD(numerator, denominator)
-//    return LabeledRationalFunction(
-//        numerator / greatestCommonDivider,
-//        denominator / greatestCommonDivider
-//    )
-//}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
index 9498c77ca..35c736914 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
@@ -3,58 +3,95 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.Ring
 
 
 /**
- * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
- * [reverse] parameter is true.
+ * Constructs a [ListPolynomial] instance with provided [coefficients]. The collection of coefficients will be reversed
+ * if [reverse] parameter is true.
  */
 @Suppress("FunctionName")
 public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false): ListPolynomial<C> =
     ListPolynomial(with(coefficients) { if (reverse) reversed() else this })
 
 /**
- * Returns a [ListPolynomial] instance with given [coefficients]. The collection of coefficients will be reversed if
- * [reverse] parameter is true.
+ * Constructs a [ListPolynomial] instance with provided [coefficients]. The collection of coefficients will be reversed
+ * if [reverse] parameter is true.
  */
 @Suppress("FunctionName")
 public fun <C> ListPolynomial(vararg coefficients: C, reverse: Boolean = false): ListPolynomial<C> =
     ListPolynomial(with(coefficients) { if (reverse) reversed() else toList() })
 
+/**
+ * Represents [this] constant as a [ListPolynomial].
+ */
 public fun <C> C.asListPolynomial() : ListPolynomial<C> = ListPolynomial(listOf(this))
 
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
+/**
+ * Constructs [ListRationalFunction] instance with numerator and denominator constructed with provided
+ * [numeratorCoefficients] and [denominatorCoefficients]. The both collections of coefficients will be reversed if
+ * [reverse] parameter is true.
+ */
 @Suppress("FunctionName")
 public fun <C> ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
     ListRationalFunction<C>(
         ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
         ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
     )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
-    ListRationalFunction<C>(numerator, polynomialOne)
+/**
+ * Constructs [ListRationalFunction] instance with provided [numerator] and unit denominator.
+ */
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
     ListRationalFunction<C>(numerator, ListPolynomial(listOf(one)))
+/**
+ * Constructs [ListRationalFunction] instance with provided [numerator] and unit denominator.
+ */
 @Suppress("FunctionName")
-public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        polynomialOne
-    )
+public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
+    ListRationalFunction<C>(numerator, polynomialOne)
+/**
+ * Constructs [ListRationalFunction] instance with numerator constructed with provided [numeratorCoefficients] and unit
+ * denominator. The collection of numerator coefficients will be reversed if [reverse] parameter is true.
+ */
 @Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
     ListRationalFunction<C>(
         ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
         ListPolynomial(listOf(one))
     )
+/**
+ * Constructs [ListRationalFunction] instance with numerator constructed with provided [numeratorCoefficients] and unit
+ * denominator. The collection of numerator coefficients will be reversed if [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        polynomialOne
+    )
 
+/**
+ * Represents [this] constant as a rational function.
+ */ // FIXME: When context receivers will be ready, delete this function and uncomment the following two
+public fun <C, A: Ring<C>> C.asListRationalFunction(ring: A) : ListRationalFunction<C> = ring.ListRationalFunction(asListPolynomial())
+///**
+// * Represents [this] constant as a rational function.
+// */
 //context(A)
 //public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
+///**
+// * Represents [this] constant as a rational function.
+// */
 //context(ListRationalFunctionSpace<C, A>)
 //public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
deleted file mode 100644
index 50313cab9..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listPolynomialUtil.kt
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.pow
-
-
-/**
- * Removes zeros on the end of the coefficient list of polynomial.
- */
-//context(PolynomialSpace<C, A>)
-//fun <C, A: Ring<C>> Polynomial<C>.removeZeros() : Polynomial<C> =
-//    if (degree > -1) Polynomial(coefficients.subList(0, degree + 1)) else zero
-
-/**
- * Creates a [ListPolynomialSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.listPolynomial(): ListPolynomialSpace<C, A> =
-    ListPolynomialSpace(this)
-
-/**
- * Creates a [ListPolynomialSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.listPolynomial(block: ListPolynomialSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ListPolynomialSpace(this).block()
-}
-
-/**
- * Creates a [ScalableListPolynomialSpace] over a received scalable ring.
- */
-public fun <C, A> A.scalableListPolynomial(): ScalableListPolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C> =
-    ScalableListPolynomialSpace(this)
-
-/**
- * Creates a [ScalableListPolynomialSpace]'s scope over a received scalable ring.
- */
-public inline fun <C, A, R> A.scalableListPolynomial(block: ScalableListPolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ScalableListPolynomialSpace(this).block()
-}
-
-@Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> copyTo(
-    origin: List<C>,
-    originDegree: Int,
-    target: MutableList<C>,
-) {
-    for (deg in 0 .. originDegree) target[deg] = origin[deg]
-}
-
-@Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> multiplyAddingToUpdater(
-    ring: Ring<C>,
-    multiplicand: MutableList<C>,
-    multiplicandDegree: Int,
-    multiplier: List<C>,
-    multiplierDegree: Int,
-    updater: MutableList<C>,
-    zero: C,
-) {
-    multiplyAddingTo(
-        ring = ring,
-        multiplicand = multiplicand,
-        multiplicandDegree = multiplicandDegree,
-        multiplier = multiplier,
-        multiplierDegree = multiplierDegree,
-        target = updater
-    )
-    for (updateDeg in 0 .. multiplicandDegree + multiplierDegree) {
-        multiplicand[updateDeg] = updater[updateDeg]
-        updater[updateDeg] = zero
-    }
-}
-
-@Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> multiplyAddingTo(
-    ring: Ring<C>,
-    multiplicand: List<C>,
-    multiplicandDegree: Int,
-    multiplier: List<C>,
-    multiplierDegree: Int,
-    target: MutableList<C>
-) = ring {
-    for (d in 0 .. multiplicandDegree + multiplierDegree)
-        for (k in max(0, d - multiplierDegree)..min(multiplicandDegree, d))
-            target[d] += multiplicand[k] * multiplier[d - k]
-}
-
-/**
- * Evaluates the value of the given double polynomial for given double argument.
- */
-public fun ListPolynomial<Double>.substitute(arg: Double): Double =
-    coefficients.reduceIndexedOrNull { index, acc, c ->
-        acc + c * arg.pow(index)
-    } ?: .0
-
-/**
- * Evaluates the value of the given polynomial for given argument.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */
-public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
-    if (coefficients.isEmpty()) return@ring zero
-    var result: C = coefficients.last()
-    for (j in coefficients.size - 2 downTo 0) {
-        result = (arg * result) + coefficients[j]
-    }
-    return result
-}
-
-public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListPolynomial<C> = ring {
-    if (coefficients.isEmpty()) return ListPolynomial(emptyList())
-
-    val thisDegree = coefficients.lastIndex
-    if (thisDegree == -1) return ListPolynomial(emptyList())
-    val argDegree = arg.coefficients.lastIndex
-    if (argDegree == -1) return coefficients[0].asListPolynomial()
-    val constantZero = zero
-    val resultCoefs: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
-    resultCoefs[0] = coefficients[thisDegree]
-    val resultCoefsUpdate: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
-    var resultDegree = 0
-    for (deg in thisDegree - 1 downTo 0) {
-        resultCoefsUpdate[0] = coefficients[deg]
-        multiplyAddingToUpdater(
-            ring = ring,
-            multiplicand = resultCoefs,
-            multiplicandDegree = resultDegree,
-            multiplier = arg.coefficients,
-            multiplierDegree = argDegree,
-            updater = resultCoefsUpdate,
-            zero = constantZero
-        )
-        resultDegree += argDegree
-    }
-
-    return ListPolynomial<C>(resultCoefs)
-}
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asFunction(ring: A): (C) -> C = { substitute(ring, it) }
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asPolynomialFunctionOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.derivative(
-    algebra: A,
-): ListPolynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    ListPolynomial(
-        buildList(max(0, coefficients.size - 1)) {
-            for (deg in 1 .. coefficients.lastIndex) add(number(deg) * coefficients[deg])
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.nthDerivative(
-    algebra: A,
-    order: Int,
-): ListPolynomial<C> where A : Ring<C>, A : NumericAlgebra<C> = algebra {
-    require(order >= 0) { "Order of derivative must be non-negative" }
-    ListPolynomial(
-        buildList(max(0, coefficients.size - order)) {
-            for (deg in order.. coefficients.lastIndex)
-                add((deg - order + 1 .. deg).fold(coefficients[deg]) { acc, d -> acc * number(d) })
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.antiderivative(
-    algebra: A,
-): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
-    ListPolynomial(
-        buildList(coefficients.size + 1) {
-            add(zero)
-            coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.nthAntiderivative(
-    algebra: A,
-    order: Int,
-): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = algebra {
-    require(order >= 0) { "Order of antiderivative must be non-negative" }
-    ListPolynomial(
-        buildList(coefficients.size + order) {
-            repeat(order) { add(zero) }
-            coefficients.mapIndexedTo(this) { index, c -> (1..order).fold(c) { acc, i -> acc / number(index + i) } }
-        }
-    )
-}
-
-/**
- * Compute a definite integral of a given polynomial in a [range]
- */
-@UnstableKMathAPI
-public fun <C : Comparable<C>> ListPolynomial<C>.integrate(
-    algebra: Field<C>,
-    range: ClosedRange<C>,
-): C = algebra {
-    val integral = antiderivative(algebra)
-    integral.substitute(algebra, range.endInclusive) - integral.substitute(algebra, range.start)
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
new file mode 100644
index 000000000..127dd8c7a
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.math.max
+import kotlin.math.pow
+
+
+/**
+ * Creates a [ListPolynomialSpace] over a received ring.
+ */
+public fun <C, A : Ring<C>> A.listPolynomialSpace(): ListPolynomialSpace<C, A> =
+    ListPolynomialSpace(this)
+
+/**
+ * Creates a [ListPolynomialSpace]'s scope over a received ring.
+ */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
+public inline fun <C, A : Ring<C>, R> A.listPolynomialSpace(block: ListPolynomialSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return ListPolynomialSpace(this).block()
+}
+
+/**
+ * Creates a [ScalableListPolynomialSpace] over a received scalable ring.
+ */
+public fun <C, A> A.scalableListPolynomialSpace(): ScalableListPolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C> =
+    ScalableListPolynomialSpace(this)
+
+/**
+ * Creates a [ScalableListPolynomialSpace]'s scope over a received scalable ring.
+ */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
+public inline fun <C, A, R> A.scalableListPolynomialSpace(block: ScalableListPolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return ScalableListPolynomialSpace(this).block()
+}
+
+/**
+ * Creates a [ListRationalFunctionSpace] over a received ring.
+ */
+public fun <C, A : Ring<C>> A.listRationalFunctionSpace(): ListRationalFunctionSpace<C, A> =
+    ListRationalFunctionSpace(this)
+
+/**
+ * Creates a [ListRationalFunctionSpace]'s scope over a received ring.
+ */ // TODO: When context will be ready move [ListRationalFunctionSpace] and add [A] to context receivers of [block]
+public inline fun <C, A : Ring<C>, R> A.listRationalFunctionSpace(block: ListRationalFunctionSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return ListRationalFunctionSpace(this).block()
+}
+
+
+/**
+ * Evaluates value of [this] Double polynomial on provided Double argument.
+ */
+public fun ListPolynomial<Double>.substitute(arg: Double): Double =
+    coefficients.reduceIndexedOrNull { index, acc, c ->
+        acc + c * arg.pow(index)
+    } ?: .0
+
+/**
+ * Evaluates value of [this] polynomial on provided argument.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */
+public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
+    if (coefficients.isEmpty()) return zero
+    var result: C = coefficients.last()
+    for (j in coefficients.size - 2 downTo 0) {
+        result = (arg * result) + coefficients[j]
+    }
+    return result
+}
+
+/**
+ * Substitutes provided polynomial [arg] into [this] polynomial.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */ // TODO: To optimize boxing
+public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListPolynomial<C> =
+    ring.listPolynomialSpace {
+        if (coefficients.isEmpty()) return zero
+        var result: ListPolynomial<C> = coefficients.last().asPolynomial()
+        for (j in coefficients.size - 2 downTo 0) {
+            result = (arg * result) + coefficients[j]
+        }
+        return result
+    }
+
+/**
+ * Substitutes provided rational function [arg] into [this] polynomial.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */ // TODO: To optimize boxing
+public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListRationalFunction<C>) : ListRationalFunction<C> =
+    ring.listRationalFunctionSpace {
+        if (coefficients.isEmpty()) return zero
+        var result: ListRationalFunction<C> = coefficients.last().asRationalFunction()
+        for (j in coefficients.size - 2 downTo 0) {
+            result = (arg * result) + coefficients[j]
+        }
+        return result
+    }
+
+/**
+ * Evaluates value of [this] Double rational function in provided Double argument.
+ */
+public fun ListRationalFunction<Double>.substitute(arg: Double): Double =
+    numerator.substitute(arg) / denominator.substitute(arg)
+
+/**
+ * Evaluates value of [this] polynomial for provided argument.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */
+public fun <C> ListRationalFunction<C>.substitute(ring: Field<C>, arg: C): C = ring {
+    numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
+}
+
+/**
+ * Substitutes provided polynomial [arg] into [this] rational function.
+ */ // TODO: To optimize boxing
+public fun <C> ListRationalFunction<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListRationalFunction<C> =
+    ring.listRationalFunctionSpace {
+        numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
+    }
+
+/**
+ * Substitutes provided rational function [arg] into [this] rational function.
+ */ // TODO: To optimize boxing
+public fun <C> ListRationalFunction<C>.substitute(ring: Ring<C>, arg: ListRationalFunction<C>) : ListRationalFunction<C> =
+    ring.listRationalFunctionSpace {
+        numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
+    }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOver(ring: A): (C) -> C = { substitute(ring, it) }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListPolynomial<C>.asPolynomialFunctionOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfRationalFunctionOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Field<C>> ListRationalFunction<C>.asFunctionOver(ring: A): (C) -> C = { substitute(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListRationalFunction<C>.asPolynomialFunctionOver(ring: A): (ListPolynomial<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListRationalFunction<C>.asFunctionOfRationalFunctionOver(ring: A): (ListPolynomial<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListPolynomial<C>.derivative(
+    ring: A,
+): ListPolynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = ring {
+    ListPolynomial(
+        buildList(max(0, coefficients.size - 1)) {
+            for (deg in 1 .. coefficients.lastIndex) add(number(deg) * coefficients[deg])
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial of specified [order]. The [order] should be non-negative integer.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListPolynomial<C>.nthDerivative(
+    ring: A,
+    order: Int,
+): ListPolynomial<C> where A : Ring<C>, A : NumericAlgebra<C> = ring {
+    require(order >= 0) { "Order of derivative must be non-negative" }
+    ListPolynomial(
+        buildList(max(0, coefficients.size - order)) {
+            for (deg in order.. coefficients.lastIndex)
+                add((deg - order + 1 .. deg).fold(coefficients[deg]) { acc, d -> acc * number(d) })
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListPolynomial<C>.antiderivative(
+    ring: A,
+): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = ring {
+    ListPolynomial(
+        buildList(coefficients.size + 1) {
+            add(zero)
+            coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial of specified [order]. The [order] should be non-negative integer.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListPolynomial<C>.nthAntiderivative(
+    ring: A,
+    order: Int,
+): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = ring {
+    require(order >= 0) { "Order of antiderivative must be non-negative" }
+    ListPolynomial(
+        buildList(coefficients.size + order) {
+            repeat(order) { add(zero) }
+            coefficients.mapIndexedTo(this) { index, c -> (1..order).fold(c) { acc, i -> acc / number(index + i) } }
+        }
+    )
+}
+
+/**
+ * Computes a definite integral of [this] polynomial in the specified [range].
+ */
+@UnstableKMathAPI
+public fun <C : Comparable<C>> ListPolynomial<C>.integrate(
+    ring: Field<C>,
+    range: ClosedRange<C>,
+): C = ring {
+    val antiderivative = antiderivative(ring)
+    antiderivative.substitute(ring, range.endInclusive) - antiderivative.substitute(ring, range.start)
+}
+
+/**
+ * Returns algebraic derivative of received rational function.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListRationalFunction<C>.derivative(
+    ring: A,
+): ListRationalFunction<C> where  A : Ring<C>, A : NumericAlgebra<C> = ring.listRationalFunctionSpace {
+    ListRationalFunction(
+        numerator.derivative(ring) * denominator - numerator * denominator.derivative(ring),
+        denominator * denominator
+    )
+}
+
+/**
+ * Returns algebraic derivative of received rational function of specified [order]. The [order] should be non-negative integer.
+ */
+@UnstableKMathAPI
+public tailrec fun <C, A> ListRationalFunction<C>.nthDerivative(
+    ring: A,
+    order: Int,
+): ListRationalFunction<C> where A : Ring<C>, A : NumericAlgebra<C> =
+    if (order == 0) this else derivative(ring).nthDerivative(ring, order - 1)
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtilOptimized.kt
similarity index 72%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt
rename to kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtilOptimized.kt
index 367212588..6eb3a1dc7 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listRationalFunctionUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtilOptimized.kt
@@ -5,41 +5,91 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.invoke
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
 import kotlin.math.max
+import kotlin.math.min
 
 
-/**
- * Creates a [ListRationalFunctionSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.listRationalFunction(): ListRationalFunctionSpace<C, A> =
-    ListRationalFunctionSpace(this)
-
-/**
- * Creates a [ListRationalFunctionSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.listRationalFunction(block: ListRationalFunctionSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ListRationalFunctionSpace(this).block()
+// TODO: Optimized copies of substitution and invocation
+@UnstablePolynomialBoxingOptimization
+@Suppress("NOTHING_TO_INLINE")
+internal inline fun <C> copyTo(
+    origin: List<C>,
+    originDegree: Int,
+    target: MutableList<C>,
+) {
+    for (deg in 0 .. originDegree) target[deg] = origin[deg]
 }
 
-/**
- * Evaluates the value of the given double polynomial for given double argument.
- */
-public fun ListRationalFunction<Double>.substitute(arg: Double): Double =
-    numerator.substitute(arg) / denominator.substitute(arg)
+@UnstablePolynomialBoxingOptimization
+@Suppress("NOTHING_TO_INLINE")
+internal inline fun <C> multiplyAddingToUpdater(
+    ring: Ring<C>,
+    multiplicand: MutableList<C>,
+    multiplicandDegree: Int,
+    multiplier: List<C>,
+    multiplierDegree: Int,
+    updater: MutableList<C>,
+    zero: C,
+) {
+    multiplyAddingTo(
+        ring = ring,
+        multiplicand = multiplicand,
+        multiplicandDegree = multiplicandDegree,
+        multiplier = multiplier,
+        multiplierDegree = multiplierDegree,
+        target = updater
+    )
+    for (updateDeg in 0 .. multiplicandDegree + multiplierDegree) {
+        multiplicand[updateDeg] = updater[updateDeg]
+        updater[updateDeg] = zero
+    }
+}
 
-/**
- * Evaluates the value of the given polynomial for given argument.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */
-public fun <C> ListRationalFunction<C>.substitute(ring: Field<C>, arg: C): C = ring {
-    numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
+@UnstablePolynomialBoxingOptimization
+@Suppress("NOTHING_TO_INLINE")
+internal inline fun <C> multiplyAddingTo(
+    ring: Ring<C>,
+    multiplicand: List<C>,
+    multiplicandDegree: Int,
+    multiplier: List<C>,
+    multiplierDegree: Int,
+    target: MutableList<C>
+) = ring {
+    for (d in 0 .. multiplicandDegree + multiplierDegree)
+        for (k in max(0, d - multiplierDegree)..min(multiplicandDegree, d))
+            target[d] += multiplicand[k] * multiplier[d - k]
+}
+
+@UnstablePolynomialBoxingOptimization
+public fun <C> ListPolynomial<C>.substitute2(ring: Ring<C>, arg: ListPolynomial<C>) : ListPolynomial<C> = ring {
+    if (coefficients.isEmpty()) return ListPolynomial(emptyList())
+
+    val thisDegree = coefficients.lastIndex
+    if (thisDegree == -1) return ListPolynomial(emptyList())
+    val argDegree = arg.coefficients.lastIndex
+    if (argDegree == -1) return coefficients[0].asListPolynomial()
+    val constantZero = zero
+    val resultCoefs: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
+    resultCoefs[0] = coefficients[thisDegree]
+    val resultCoefsUpdate: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
+    var resultDegree = 0
+    for (deg in thisDegree - 1 downTo 0) {
+        resultCoefsUpdate[0] = coefficients[deg]
+        multiplyAddingToUpdater(
+            ring = ring,
+            multiplicand = resultCoefs,
+            multiplicandDegree = resultDegree,
+            multiplier = arg.coefficients,
+            multiplierDegree = argDegree,
+            updater = resultCoefsUpdate,
+            zero = constantZero
+        )
+        resultDegree += argDegree
+    }
+
+    return ListPolynomial<C>(resultCoefs)
 }
 
 /**
@@ -52,6 +102,7 @@ public fun <C> ListRationalFunction<C>.substitute(ring: Field<C>, arg: C): C = r
  *
  * Used in [ListPolynomial.substitute] and [ListRationalFunction.substitute] for performance optimisation.
  */ // TODO: Дописать
+@UnstablePolynomialBoxingOptimization
 internal fun <C> ListPolynomial<C>.substituteRationalFunctionTakeNumerator(ring: Ring<C>, arg: ListRationalFunction<C>): ListPolynomial<C> = ring {
     if (coefficients.isEmpty()) return ListPolynomial(emptyList())
 
@@ -196,26 +247,4 @@ internal fun <C> ListPolynomial<C>.substituteRationalFunctionTakeNumerator(ring:
             end = thisDegree + 1
         )
     )
-}
-
-//operator fun <T: Field<T>> RationalFunction<T>.invoke(arg: T): T = numerator(arg) / denominator(arg)
-//
-//fun <T: Field<T>> RationalFunction<T>.reduced(): RationalFunction<T> =
-//    polynomialGCD(numerator, denominator).let {
-//        RationalFunction(
-//            numerator / it,
-//            denominator / it
-//        )
-//    }
-
-///**
-// * Returns result of applying formal derivative to the polynomial.
-// *
-// * @param T Field where we are working now.
-// * @return Result of the operator.
-// */
-//fun <T: Ring<T>> RationalFunction<T>.derivative() =
-//    RationalFunction(
-//        numerator.derivative() * denominator - denominator.derivative() * numerator,
-//        denominator * denominator
-//    )
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
new file mode 100644
index 000000000..8b6fac39e
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+
+@RequiresOptIn(
+    message = "It's copy of operation with optimized boxing. It's currently unstable.",
+    level = RequiresOptIn.Level.ERROR
+)
+internal annotation class UnstablePolynomialBoxingOptimization
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
deleted file mode 100644
index dca8a0cff..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-
-
-/**
- * Returns the same degrees' description of the monomial, but without extra zero degrees on the end.
- */
-internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(coefs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
-    if (!toCheckInput) return NumberedPolynomial<C>(coefs)
-
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in coefs) {
-        val key = entry.key.cleanUp()
-        val value = entry.value
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs, toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
-    if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
-internal inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> = ring.NumberedPolynomial(pairs = pairs, toCheckInput = toCheckInput)
-@Suppress("FunctionName")
-internal fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, toCheckInput: Boolean = true) : NumberedPolynomial<C> {
-    if (!toCheckInput) return NumberedPolynomial<C>(pairs.toMap())
-
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) fixedCoefs[key]!! + value else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, toCheckInput = true)
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs, toCheckInput = true)
-
-public fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomial<C>(mapOf(emptyList<UInt>() to this))
-
-@DslMarker
-@UnstableKMathAPI
-internal annotation class NumberedPolynomialConstructorDSL
-
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-public class NumberedPolynomialTermSignatureBuilder {
-    private val signature: MutableList<UInt> = ArrayList()
-    public fun build(): List<UInt> = signature
-    public infix fun Int.inPowerOf(deg: UInt) {
-        if (this > signature.lastIndex) {
-            signature.addAll(List(this - signature.lastIndex - 1) { 0u })
-            signature.add(deg)
-        } else {
-            signature[this] = deg
-        }
-    }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Int.pow(deg: UInt): Unit = this inPowerOf deg
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Int.`in`(deg: UInt): Unit = this inPowerOf deg
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun Int.of(deg: UInt): Unit = this inPowerOf deg
-}
-
-@UnstableKMathAPI
-public class NumberedPolynomialBuilder<C>(private val zero: C, private val add: (C, C) -> C, capacity: Int = 0) {
-    private val coefficients: MutableMap<List<UInt>, C> = LinkedHashMap(capacity)
-    public fun build(): NumberedPolynomial<C> = NumberedPolynomial<C>(coefficients)
-    public operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit) {
-        val signature = NumberedPolynomialTermSignatureBuilder().apply(block).build()
-        coefficients[signature] = add(coefficients.getOrElse(signature) { zero }, this@invoke)
-    }
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun C.with(noinline block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
-    @Suppress("NOTHING_TO_INLINE")
-    public inline infix fun (NumberedPolynomialTermSignatureBuilder.() -> Unit).with(coef: C): Unit = coef.invoke(this)
-    @Suppress("NOTHING_TO_INLINE")
-    public infix fun sig(block: NumberedPolynomialTermSignatureBuilder.() -> Unit): NumberedPolynomialTermSignatureBuilder.() -> Unit = block
-}
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> A.NumberedPolynomial(block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(zero, ::add).apply(block).build()
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> A.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(zero, ::add, capacity).apply(block).build()
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(constantZero, { left: C, right: C -> left + right}).apply(block).build()
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(capacity: Int, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(constantZero, { left: C, right: C -> left + right}, capacity).apply(block).build()
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        NumberedPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        NumberedPolynomial(denominatorCoefficients, toCheckInput = true)
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(numerator, polynomialOne)
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(numerator, NumberedPolynomial(mapOf(emptyList<UInt>() to one), toCheckInput = false))
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        polynomialOne
-    )
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients, toCheckInput = true),
-        NumberedPolynomial(mapOf(emptyList<UInt>() to one), toCheckInput = false)
-    )
-
-//context(A)
-//public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> = NumberedRationalFunction(asLabeledPolynomial())
-//context(NumberedRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> = NumberedRationalFunction(asLabeledPolynomial())
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
deleted file mode 100644
index ad817c7ba..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedPolynomialUtil.kt
+++ /dev/null
@@ -1,528 +0,0 @@
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-import kotlin.contracts.*
-import kotlin.jvm.JvmName
-import kotlin.math.max
-
-
-// TODO: Docs
-
-/**
- * Creates a [NumberedPolynomialSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.numberedPolynomial(): NumberedPolynomialSpace<C, A> =
-    NumberedPolynomialSpace(this)
-
-/**
- * Creates a [NumberedPolynomialSpace]'s scope over a received ring.
- */
-@OptIn(ExperimentalContracts::class)
-public inline fun <C, A : Ring<C>, R> A.numberedPolynomial(block: NumberedPolynomialSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return NumberedPolynomialSpace(this).block()
-}
-
-///**
-// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`.
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.represent(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .mapIndexed { index, deg ->
-//                                when (deg) {
-//                                    0U -> ""
-//                                    1U -> "${withVariableName}_${index+1}"
-//                                    else -> "${withVariableName}_${index+1}^$deg"
-//                                }
-//                            }
-//                            .filter { it.isNotEmpty() }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer].
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.represent(namer: (Int) -> String): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .mapIndexed { index, deg ->
-//                                when (deg) {
-//                                    0U -> ""
-//                                    1U -> namer(index)
-//                                    else -> "${namer(index)}^$deg"
-//                                }
-//                            }
-//                            .filter { it.isNotEmpty() }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`
-// * and with brackets around the string if needed (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representWithBrackets(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
-//    with(represent(withVariableName)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
-// * (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representWithBrackets(namer: (Int) -> String): String =
-//    with(represent(namer)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`.
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversed(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> -NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .mapIndexed { index, deg ->
-//                                when (deg) {
-//                                    0U -> ""
-//                                    1U -> "${withVariableName}_${index+1}"
-//                                    else -> "${withVariableName}_${index+1}^$deg"
-//                                }
-//                            }
-//                            .filter { it.isNotEmpty() }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer].
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversed(namer: (Int) -> String): String =
-//    coefficients.entries
-//        .sortedWith { o1, o2 -> -NumberedPolynomial.monomialComparator.compare(o1.key, o2.key) }
-//        .asSequence()
-//        .map { (degs, t) ->
-//            if (degs.isEmpty()) "$t"
-//            else {
-//                when {
-//                    t.isOne() -> ""
-//                    t.isMinusOne() -> "-"
-//                    else -> "$t "
-//                } +
-//                        degs
-//                            .mapIndexed { index, deg ->
-//                                when (deg) {
-//                                    0U -> ""
-//                                    1U -> namer(index)
-//                                    else -> "${namer(index)}^$deg"
-//                                }
-//                            }
-//                            .filter { it.isNotEmpty() }
-//                            .joinToString(separator = " ") { it }
-//            }
-//        }
-//        .joinToString(separator = " + ") { it }
-//        .ifEmpty { "0" }
-//
-///**
-// * Represents the polynomial as a [String] where name of variable with index `i` is [withVariableName] + `"_${i+1}"`
-// * and with brackets around the string if needed (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversedWithBrackets(withVariableName: String = NumberedPolynomial.defaultVariableName): String =
-//    with(representReversed(withVariableName)) { if (coefficients.count() == 1) this else "($this)" }
-//
-///**
-// * Represents the polynomial as a [String] naming variables by [namer] and with brackets around the string if needed
-// * (i.e. when there are at least two addends in the representation).
-// * Consider that monomials are sorted in **reversed** lexicographic order.
-// */
-//context(NumberedPolynomialSpace<C, A>)
-//public fun <C, A: Ring<C>> NumberedPolynomial<C>.representReversedWithBrackets(namer: (Int) -> String): String =
-//    with(representReversed(namer)) { if (coefficients.count() == 1) this else "($this)" }
-
-//public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
-//    if (coefficients.isEmpty()) return this@substitute
-//    NumberedPolynomial<C>(
-//        buildMap {
-//            coefficients.forEach { (degs, c) ->
-//                val newDegs = degs.mapIndexed { index, deg -> if (index in args) 0U else deg }.cleanUp()
-//                val newC = degs.foldIndexed(c) { index, acc, deg ->
-//                    if (index in args) multiplyWithPower(acc, args[index]!!, deg)
-//                    else acc
-//                }
-//                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
-//            }
-//        }
-//    )
-//}
-//
-//// TODO: Replace with optimisation: the [result] may be unboxed, and all operations may be performed as soon as
-////  possible on it
-//@JvmName("substitutePolynomial")
-//public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, arg: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> =
-//    ring.numberedPolynomialSpace {
-//        if (coefficients.isEmpty()) return zero
-//        coefficients
-//            .asSequence()
-//            .map { (degs, c) ->
-//                degs.foldIndexed(
-//                    NumberedPolynomial(
-//                        degs.mapIndexed { index, deg -> if (index in arg) 0U else deg } to c
-//                    )
-//                ) { index, acc, deg -> if (index in arg) multiplyWithPower(acc, arg[index]!!, deg) else acc }
-//            }
-//            .reduce { acc, polynomial -> acc + polynomial } // TODO: Rewrite. Might be slow.
-//    }
-//
-//// TODO: Substitute rational function
-//
-//public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunctionOver(ring: A): (Map<Int, C>) -> NumberedPolynomial<C> =
-//    { substitute(ring, it) }
-//
-//public fun <C, A : Ring<C>> NumberedPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> =
-//    { substitute(ring, it) }
-
-//operator fun <T: Field<T>> Polynomial<T>.div(other: T): Polynomial<T> =
-//    if (other.isZero()) throw ArithmeticException("/ by zero")
-//    else
-//        Polynomial(
-//            coefficients
-//                .mapValues { it.value / other },
-//            toCheckInput = false
-//        )
-
-/**
- * Evaluates the value of the given double polynomial for given double argument.
- */
-public fun NumberedPolynomial<Double>.substitute(args: Map<Int, Double>): NumberedPolynomial<Double> = Double.algebra {
-    val acc = LinkedHashMap<List<UInt>, Double>(coefficients.size)
-    for ((degs, c) in coefficients) {
-        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-        val newC = args.entries.fold(c) { product, (variable, substitution) ->
-            val deg = degs.getOrElse(variable) { 0u }
-            if (deg == 0u) product else product * substitution.pow(deg.toInt())
-        }
-        if (newDegs !in acc) acc[newDegs] = newC
-        else acc[newDegs] = acc[newDegs]!! + newC
-    }
-    return NumberedPolynomial<Double>(acc)
-}
-
-/**
- * Evaluates the value of the given polynomial for given argument.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */
-public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
-    val acc = LinkedHashMap<List<UInt>, C>(coefficients.size)
-    for ((degs, c) in coefficients) {
-        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-        val newC = args.entries.fold(c) { product, (variable, substitution) ->
-            val deg = degs.getOrElse(variable) { 0u }
-            if (deg == 0u) product else product * power(substitution, deg)
-        }
-        if (newDegs !in acc) acc[newDegs] = newC
-        else acc[newDegs] = acc[newDegs]!! + newC
-    }
-    return NumberedPolynomial<C>(acc)
-}
-
-// TODO: (Waiting for hero) Replace with optimisation: the [result] may be unboxed, and all operations may be performed
-//  as soon as possible on it
-@JvmName("substitutePolynomial")
-public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> = TODO() /*ring.numberedPolynomial {
-    val acc = LinkedHashMap<List<UInt>, NumberedPolynomial<C>>(coefficients.size)
-    for ((degs, c) in coefficients) {
-        val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-        val newC = args.entries.fold(c.asNumberedPolynomial()) { product, (variable, substitution) ->
-            val deg = degs.getOrElse(variable) { 0u }
-            if (deg == 0u) product else product * power(substitution, deg)
-        }
-        if (newDegs !in acc) acc[newDegs] = c.asNumberedPolynomial()
-        else acc[newDegs] = acc[newDegs]!! + c
-    }
-}*/
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunction(ring: A): (Map<Int, C>) -> NumberedPolynomial<C> = { substitute(ring, it) }
-
-/**
- * Represent the polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.asPolynomialFunctionOver(ring: A): (Map<Int, NumberedPolynomial<C>>) -> NumberedPolynomial<C> = { substitute(ring, it) }
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variable: Int,
-): NumberedPolynomial<C> = algebra {
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.size > variable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            when {
-                                index != variable -> deg
-                                deg > 0u -> deg - 1u
-                                else -> return@forEach
-                            }
-                        }.cleanUp(),
-                        multiplyByDoubling(c, degs[variable])
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variables: Collection<Int>,
-): NumberedPolynomial<C> = algebra {
-    val cleanedVariables = variables.toSet()
-    if (cleanedVariables.isEmpty()) return this@derivativeWithRespectTo
-    val maxRespectedVariable = cleanedVariables.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.size > maxRespectedVariable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            when {
-                                index !in cleanedVariables -> deg
-                                deg > 0u -> deg - 1u
-                                else -> return@forEach
-                            }
-                        }.cleanUp(),
-                        cleanedVariables.fold(c) { acc, variable -> multiplyByDoubling(acc, degs[variable]) }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variable: Int,
-    order: UInt
-): NumberedPolynomial<C> = algebra {
-    if (order == 0u) return this@nthDerivativeWithRespectTo
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.size > variable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            when {
-                                index != variable -> deg
-                                deg >= order -> deg - order
-                                else -> return@forEach
-                            }
-                        }.cleanUp(),
-                        degs[variable].let { deg ->
-                            (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> multiplyByDoubling(acc, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Int, UInt>,
-): NumberedPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
-    val maxRespectedVariable = filteredVariablesAndOrders.keys.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.size > maxRespectedVariable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            if (index !in filteredVariablesAndOrders) return@mapIndexed deg
-                            val order = filteredVariablesAndOrders[index]!!
-                            if (deg >= order) deg - order else return@forEach
-                        }.cleanUp(),
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            degs[index].let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> multiplyByDoubling(acc2, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variable: Int,
-): NumberedPolynomial<C> = algebra {
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + 1u },
-                        c / multiplyByDoubling(one, degs[variable])
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variables: Collection<Int>,
-): NumberedPolynomial<C> = algebra {
-    val cleanedVariables = variables.toSet()
-    if (cleanedVariables.isEmpty()) return this@antiderivativeWithRespectTo
-    val maxRespectedVariable = cleanedVariables.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(maxRespectedVariable + 1, degs.size)) { if (it !in variables) degs[it] else degs[it] + 1u },
-                        cleanedVariables.fold(c) { acc, variable -> acc / multiplyByDoubling(one, degs[variable]) }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variable: Int,
-    order: UInt
-): NumberedPolynomial<C> = algebra {
-    if (order == 0u) return this@nthAntiderivativeWithRespectTo
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + order },
-                        degs[variable].let { deg ->
-                            (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> acc / multiplyByDoubling(one, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Int, UInt>,
-): NumberedPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthAntiderivativeWithRespectTo
-    val maxRespectedVariable = filteredVariablesAndOrders.keys.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(maxRespectedVariable + 1, degs.size)) { degs[it] + filteredVariablesAndOrders.getOrElse(it) { 0u } },
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            degs[index].let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> acc2 / multiplyByDoubling(one, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
deleted file mode 100644
index 5cd0679ab..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedRationalFunctionUtil.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-
-
-/**
- * Creates a [NumberedRationalFunctionSpace] over a received ring.
- */
-public fun <C, A : Ring<C>> A.numberedRationalFunction(): NumberedRationalFunctionSpace<C, A> =
-    NumberedRationalFunctionSpace(this)
-
-/**
- * Creates a [NumberedRationalFunctionSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.numberedRationalFunction(block: NumberedRationalFunctionSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return NumberedRationalFunctionSpace(this).block()
-}
-
-//fun <T: Field<T>> NumberedRationalFunction<T>.reduced(): NumberedRationalFunction<T> {
-//    val greatestCommonDivider = polynomialGCD(numerator, denominator)
-//    return NumberedRationalFunction(
-//        numerator / greatestCommonDivider,
-//        denominator / greatestCommonDivider
-//    )
-//}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
index 5401be707..c9950fac5 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
@@ -12,7 +12,7 @@ import kotlin.test.*
 class ListPolynomialTest {
     @Test
     fun test_Polynomial_Int_plus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
                 ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + -3,
@@ -52,7 +52,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Int_minus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
                 ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - -3,
@@ -92,7 +92,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Int_times() {
-        IntModuloRing(35).listPolynomial {
+        IntModuloRing(35).listPolynomialSpace {
             assertEquals(
                 ListPolynomial(34, 2, 1, 20, 2),
                 ListPolynomial(22, 26, 13, 15, 26) * 27,
@@ -107,7 +107,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Int_Polynomial_plus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
                 -3 + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
@@ -147,7 +147,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Int_Polynomial_minus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
                 3 - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
@@ -187,7 +187,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Int_Polynomial_times() {
-        IntModuloRing(35).listPolynomial {
+        IntModuloRing(35).listPolynomialSpace {
             assertEquals(
                 ListPolynomial(34, 2, 1, 20, 2),
                 27 * ListPolynomial(22, 26, 13, 15, 26),
@@ -202,7 +202,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Constant_plus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
                 ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + Rational(-3),
@@ -242,7 +242,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Constant_minus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
                 ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - Rational(-3),
@@ -282,7 +282,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Constant_times() {
-        IntModuloRing(35).listPolynomial {
+        IntModuloRing(35).listPolynomialSpace {
             assertEquals(
                 ListPolynomial(34, 2, 1, 20, 2),
                 ListPolynomial(22, 26, 13, 15, 26) * 27.asConstant(),
@@ -297,7 +297,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Constant_Polynomial_plus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
                 Rational(-3) + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
@@ -337,7 +337,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Constant_Polynomial_minus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
                 Rational(3) - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
@@ -377,7 +377,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Constant_Polynomial_times() {
-        IntModuloRing(35).listPolynomial {
+        IntModuloRing(35).listPolynomialSpace {
             assertEquals(
                 ListPolynomial(34, 2, 1, 20, 2),
                 27 * ListPolynomial(22, 26, 13, 15, 26),
@@ -392,7 +392,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_unaryMinus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             assertEquals(
                 ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
                 -ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
@@ -407,7 +407,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Polynomial_plus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             // (5/9 - 8/9 x - 8/7 x^2) + (-5/7 + 5/1 x + 5/8 x^2) ?= -10/63 + 37/9 x - 29/56 x^2
             assertEquals(
                 ListPolynomial(Rational(-10, 63), Rational(37, 9), Rational(-29, 56)),
@@ -440,7 +440,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Polynomial_minus() {
-        RationalField.listPolynomial {
+        RationalField.listPolynomialSpace {
             // (5/9 - 8/9 x - 8/7 x^2) - (-5/7 + 5/1 x + 5/8 x^2) ?= 80/63 - 53/9 x - 99/56 x^2
             assertEquals(
                 ListPolynomial(Rational(80, 63), Rational(-53, 9), Rational(-99, 56)),
@@ -473,7 +473,7 @@ class ListPolynomialTest {
     }
     @Test
     fun test_Polynomial_Polynomial_times() {
-        IntModuloRing(35).listPolynomial {
+        IntModuloRing(35).listPolynomialSpace {
             // (1 + x + x^2) * (1 - x + x^2) ?= 1 + x^2 + x^4
             assertEquals(
                 ListPolynomial(1, 0, 1, 0, 1),
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
index c5eb8fb81..69c1611f3 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.test.misc.Rational
 import space.kscience.kmath.test.misc.RationalField
 import kotlin.test.Test
@@ -12,6 +13,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
 
+@OptIn(UnstableKMathAPI::class)
 class ListPolynomialUtilTest {
     @Test
     fun test_substitute_Double() {
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
new file mode 100644
index 000000000..89764db46
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.test.misc
+
+import space.kscience.kmath.functions.ListPolynomial
+import space.kscience.kmath.functions.ListPolynomialSpace
+import space.kscience.kmath.operations.Ring
+
+
+class IntModulo {
+    val residue: Int
+    val modulus: Int
+
+    @PublishedApi
+    internal constructor(residue: Int, modulus: Int, toCheckInput: Boolean = true) {
+        if (toCheckInput) {
+            require(modulus != 0) { "modulus can not be zero" }
+            this.modulus = if (modulus < 0) -modulus else modulus
+            this.residue = residue.mod(modulus)
+        } else {
+            this.residue = residue
+            this.modulus = modulus
+        }
+    }
+
+    constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
+
+    operator fun unaryPlus(): IntModulo = this
+    operator fun unaryMinus(): IntModulo =
+        IntModulo(
+            if (residue == 0) 0 else modulus - residue,
+            modulus,
+            toCheckInput = false
+        )
+    operator fun plus(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not add two residue different modulo" }
+        return IntModulo(
+            (residue + other.residue) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    operator fun plus(other: Int): IntModulo =
+        IntModulo(
+            (residue + other) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    operator fun minus(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not subtract two residue different modulo" }
+        return IntModulo(
+            (residue - other.residue) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    operator fun minus(other: Int): IntModulo =
+        IntModulo(
+            (residue - other) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    operator fun times(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not multiply two residue different modulo" }
+        return IntModulo(
+            (residue * other.residue) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    operator fun times(other: Int): IntModulo =
+        IntModulo(
+            (residue * other) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    operator fun div(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not divide two residue different modulo" }
+        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other.residue, modulus)
+        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
+        return IntModulo(
+            (residue * reciprocalCandidate) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    operator fun div(other: Int): IntModulo {
+        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other, modulus)
+        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
+        return IntModulo(
+            (residue * reciprocalCandidate) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    override fun equals(other: Any?): Boolean =
+        when (other) {
+            is IntModulo -> residue == other.residue && modulus == other.modulus
+            else -> false
+        }
+
+    override fun hashCode(): Int = residue.hashCode()
+
+    override fun toString(): String = "$residue mod $modulus"
+}
+
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+class IntModuloRing : Ring<IntModulo> {
+
+    val modulus: Int
+
+    constructor(modulus: Int) {
+        require(modulus != 0) { "modulus can not be zero" }
+        this.modulus = if (modulus < 0) -modulus else modulus
+    }
+
+    override inline val zero: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
+    override inline val one: IntModulo get() = IntModulo(1, modulus, toCheckInput = false)
+
+    fun number(arg: Int) = IntModulo(arg, modulus, toCheckInput = false)
+
+    override inline fun add(left: IntModulo, right: IntModulo): IntModulo = left + right
+    override inline fun multiply(left: IntModulo, right: IntModulo): IntModulo = left * right
+
+    override inline fun IntModulo.unaryMinus(): IntModulo = -this
+    override inline fun IntModulo.plus(arg: IntModulo): IntModulo = this + arg
+    override inline fun IntModulo.minus(arg: IntModulo): IntModulo = this - arg
+    override inline fun IntModulo.times(arg: IntModulo): IntModulo = this * arg
+    inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
+}
+
+fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
+    ListPolynomial(coefs.map { IntModulo(it, ring.modulus) })
+fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
+    ListPolynomial(coefs.map { IntModulo(it, modulus) })
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
new file mode 100644
index 000000000..72bb5942c
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.test.misc
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.NumbersAddOps
+
+class Rational {
+    companion object {
+        val ZERO: Rational = Rational(0L)
+        val ONE: Rational = Rational(1L)
+    }
+
+    val numerator: Long
+    val denominator: Long
+
+    internal constructor(numerator: Long, denominator: Long, toCheckInput: Boolean = true) {
+        if (toCheckInput) {
+            if (denominator == 0L) throw ArithmeticException("/ by zero")
+
+            val greatestCommonDivider = gcd(numerator, denominator).let { if (denominator < 0L) -it else it }
+
+            this.numerator = numerator / greatestCommonDivider
+            this.denominator = denominator / greatestCommonDivider
+        } else {
+            this.numerator = numerator
+            this.denominator = denominator
+        }
+    }
+
+    constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
+    constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
+    constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
+    constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
+    constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
+    constructor(numerator: Long) : this(numerator, 1L, false)
+
+    operator fun unaryPlus(): Rational = this
+    operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
+    operator fun plus(other: Rational): Rational =
+        Rational(
+            numerator * other.denominator + denominator * other.numerator,
+            denominator * other.denominator
+        )
+    operator fun plus(other: Int): Rational =
+        Rational(
+            numerator + denominator * other.toLong(),
+            denominator
+        )
+    operator fun plus(other: Long): Rational =
+        Rational(
+            numerator + denominator * other,
+            denominator
+        )
+    operator fun minus(other: Rational): Rational =
+        Rational(
+            numerator * other.denominator - denominator * other.numerator,
+            denominator * other.denominator
+        )
+    operator fun minus(other: Int): Rational =
+        Rational(
+            numerator - denominator * other.toLong(),
+            denominator
+        )
+    operator fun minus(other: Long): Rational =
+        Rational(
+            numerator - denominator * other,
+            denominator
+        )
+    operator fun times(other: Rational): Rational =
+        Rational(
+            numerator * other.numerator,
+            denominator * other.denominator
+        )
+    operator fun times(other: Int): Rational =
+        Rational(
+            numerator * other.toLong(),
+            denominator
+        )
+    operator fun times(other: Long): Rational =
+        Rational(
+            numerator * other,
+            denominator
+        )
+    operator fun div(other: Rational): Rational =
+        Rational(
+            numerator * other.denominator,
+            denominator * other.numerator
+        )
+    operator fun div(other: Int): Rational =
+        Rational(
+            numerator,
+            denominator * other.toLong()
+        )
+    operator fun div(other: Long): Rational =
+        Rational(
+            numerator,
+            denominator * other
+        )
+    override fun equals(other: Any?): Boolean =
+        when (other) {
+            is Rational -> numerator == other.numerator && denominator == other.denominator
+            is Int -> numerator == other && denominator == 1L
+            is Long -> numerator == other && denominator == 1L
+            else -> false
+        }
+
+    override fun hashCode(): Int = 31 * numerator.hashCode() + denominator.hashCode()
+
+    override fun toString(): String = if (denominator == 1L) "$numerator" else "$numerator/$denominator"
+}
+
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@OptIn(UnstableKMathAPI::class)
+object RationalField : Field<Rational>, NumbersAddOps<Rational> {
+    override inline val zero: Rational get() = Rational.ZERO
+    override inline val one: Rational get() = Rational.ONE
+
+    override inline fun number(value: Number): Rational = Rational(value.toLong())
+
+    override inline fun add(left: Rational, right: Rational): Rational = left + right
+    override inline fun multiply(left: Rational, right: Rational): Rational = left * right
+    override inline fun divide(left: Rational, right: Rational): Rational = left / right
+    override inline fun scale(a: Rational, value: Double): Rational = a * number(value)
+
+    override inline fun Rational.unaryMinus(): Rational = -this
+    override inline fun Rational.plus(arg: Rational): Rational = this + arg
+    override inline fun Rational.minus(arg: Rational): Rational = this - arg
+    override inline fun Rational.times(arg: Rational): Rational = this * arg
+    override inline fun Rational.div(arg: Rational): Rational = this / arg
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
new file mode 100644
index 000000000..ed41b9245
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.test.misc
+
+import kotlin.math.abs
+
+
+data class BezoutIdentityWithGCD<T>(val first: T, val second: T, val gcd: T)
+
+tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
+
+fun bezoutIdentityWithGCD(a: Int, b: Int): BezoutIdentityWithGCD<Int> =
+    when {
+        a < 0 && b < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, -second, gcd) }
+        a < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, second, gcd) }
+        b < 0 -> with(bezoutIdentityWithGCDInternalLogic(a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(first, -second, gcd) }
+        else -> bezoutIdentityWithGCDInternalLogic(a, b, 1, 0, 0, 1)
+    }
+
+internal tailrec fun bezoutIdentityWithGCDInternalLogic(a: Int, b: Int, m1: Int, m2: Int, m3: Int, m4: Int): BezoutIdentityWithGCD<Int> =
+    if (b == 0) BezoutIdentityWithGCD(m1, m3, a)
+    else {
+        val quotient = a / b
+        val reminder = a % b
+        bezoutIdentityWithGCDInternalLogic(b, reminder, m2, m1 - quotient * m2, m4, m3 - quotient * m4)
+    }
\ No newline at end of file
-- 
2.34.1


From 1fd8dfd7b826718df16017dc7e2960ac85dbc98d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 13 Jun 2022 11:17:41 +0300
Subject: [PATCH 527/713] refactor Quaternions

---
 .../kmath/estree/internal/ESTreeBuilder.kt    |   7 +-
 .../kscience/kmath/asm/internal/AsmBuilder.kt |   2 +
 kmath-complex/build.gradle.kts                |  10 +-
 .../kscience/kmath/complex/Quaternion.kt      | 133 ++++++++----------
 kmath-geometry/build.gradle.kts               |   2 +-
 .../kmath/geometry/Euclidean2DSpace.kt        |   3 -
 .../kmath/geometry/Euclidean3DSpace.kt        |   2 -
 7 files changed, 68 insertions(+), 91 deletions(-)

diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
index 10a6c4a16..40c446da0 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
@@ -14,11 +14,12 @@ internal class ESTreeBuilder<T>(val bodyCallback: ESTreeBuilder<T>.() -> BaseExp
     private class GeneratedExpression<T>(val executable: dynamic, val constants: Array<dynamic>) : Expression<T> {
         @Suppress("UNUSED_VARIABLE")
         override fun invoke(arguments: Map<Symbol, T>): T {
-            val e = executable
-            val c = constants
+            //val e = executable
+            //val c = constants
             val a = js("{}")
             arguments.forEach { (key, value) -> a[key.identity] = value }
-            return js("e(c, a)").unsafeCast<T>()
+            return executable.call(constants, a).unsafeCast<T>()
+            //return js("e(c, a)").unsafeCast<T>()
         }
     }
 
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
index a85079fc8..a76b47ecc 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
@@ -49,5 +49,7 @@ internal abstract class AsmBuilder {
          * ASM Type for [space.kscience.kmath.expressions.Symbol].
          */
         val SYMBOL_TYPE: Type = getObjectType("space/kscience/kmath/expressions/Symbol")
+
+        const val ARGUMENTS_NAME = "args"
     }
 }
diff --git a/kmath-complex/build.gradle.kts b/kmath-complex/build.gradle.kts
index ea74df646..f0ce631a5 100644
--- a/kmath-complex/build.gradle.kts
+++ b/kmath-complex/build.gradle.kts
@@ -19,13 +19,15 @@ readme {
 
     feature(
         id = "complex",
-        description = "Complex Numbers",
         ref = "src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt"
-    )
+    ){
+        "Complex numbers operations"
+    }
 
     feature(
         id = "quaternion",
-        description = "Quaternions",
         ref = "src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt"
-    )
+    ){
+        "Quaternions and their composition"
+    }
 }
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index 3ef3428c6..85c945faf 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -16,6 +16,52 @@ import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.structures.MutableMemoryBuffer
 import kotlin.math.*
 
+/**
+ * Represents `double`-based quaternion.
+ *
+ * @property w The first component.
+ * @property x The second component.
+ * @property y The third component.
+ * @property z The fourth component.
+ */
+public data class Quaternion(
+    val w: Double, val x: Double, val y: Double, val z: Double,
+) {
+    init {
+        require(!w.isNaN()) { "w-component of quaternion is not-a-number" }
+        require(!x.isNaN()) { "x-component of quaternion is not-a-number" }
+        require(!y.isNaN()) { "y-component of quaternion is not-a-number" }
+        require(!z.isNaN()) { "z-component of quaternion is not-a-number" }
+    }
+
+    /**
+     * Returns a string representation of this quaternion.
+     */
+    override fun toString(): String = "($w + $x * i + $y * j + $z * k)"
+
+    public companion object : MemorySpec<Quaternion> {
+        override val objectSize: Int
+            get() = 32
+
+        override fun MemoryReader.read(offset: Int): Quaternion =
+            Quaternion(readDouble(offset), readDouble(offset + 8), readDouble(offset + 16), readDouble(offset + 24))
+
+        override fun MemoryWriter.write(offset: Int, value: Quaternion) {
+            writeDouble(offset, value.w)
+            writeDouble(offset + 8, value.x)
+            writeDouble(offset + 16, value.y)
+            writeDouble(offset + 24, value.z)
+        }
+    }
+}
+
+public fun Quaternion(w: Number, x: Number = 0.0, y: Number = 0.0, z: Number = 0.0): Quaternion = Quaternion(
+    w.toDouble(),
+    x.toDouble(),
+    y.toDouble(),
+    z.toDouble(),
+)
+
 /**
  * This quaternion's conjugate.
  */
@@ -45,23 +91,23 @@ public val Quaternion.r: Double
 @OptIn(UnstableKMathAPI::class)
 public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>, PowerOperations<Quaternion>,
     ExponentialOperations<Quaternion>, NumbersAddOps<Quaternion>, ScaleOperations<Quaternion> {
-    override val zero: Quaternion = 0.toQuaternion()
-    override val one: Quaternion = 1.toQuaternion()
+    override val zero: Quaternion = Quaternion(0.0)
+    override val one: Quaternion = Quaternion(1.0)
 
     /**
      * The `i` quaternion unit.
      */
-    public val i: Quaternion = Quaternion(0, 1)
+    public val i: Quaternion = Quaternion(0.0, 1.0, 0.0, 0.0)
 
     /**
      * The `j` quaternion unit.
      */
-    public val j: Quaternion = Quaternion(0, 0, 1)
+    public val j: Quaternion = Quaternion(0.0, 0.0, 1.0, 0.0)
 
     /**
      * The `k` quaternion unit.
      */
-    public val k: Quaternion = Quaternion(0, 0, 0, 1)
+    public val k: Quaternion = Quaternion(0.0, 0.0, 0.0, 1.0)
 
     override fun add(left: Quaternion, right: Quaternion): Quaternion =
         Quaternion(left.w + right.w, left.x + right.x, left.y + right.y, left.z + right.z)
@@ -133,7 +179,7 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
 
     override fun exp(arg: Quaternion): Quaternion {
         val un = arg.x * arg.x + arg.y * arg.y + arg.z * arg.z
-        if (un == 0.0) return exp(arg.w).toQuaternion()
+        if (un == 0.0) return Quaternion(exp(arg.w))
         val n1 = sqrt(un)
         val ea = exp(arg.w)
         val n2 = ea * sin(n1) / n1
@@ -158,7 +204,8 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
         return Quaternion(ln(n), th * arg.x, th * arg.y, th * arg.z)
     }
 
-    override operator fun Number.plus(other: Quaternion): Quaternion = Quaternion(toDouble() + other.w, other.x, other.y, other.z)
+    override operator fun Number.plus(other: Quaternion): Quaternion =
+        Quaternion(toDouble() + other.w, other.x, other.y, other.z)
 
     override operator fun Number.minus(other: Quaternion): Quaternion =
         Quaternion(toDouble() - other.w, -other.x, -other.y, -other.z)
@@ -179,7 +226,7 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
         else -> null
     }
 
-    override fun number(value: Number): Quaternion = value.toQuaternion()
+    override fun number(value: Number): Quaternion = Quaternion(value)
 
     override fun sinh(arg: Quaternion): Quaternion = (exp(arg) - exp(-arg)) / 2.0
     override fun cosh(arg: Quaternion): Quaternion = (exp(arg) + exp(-arg)) / 2.0
@@ -189,76 +236,6 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
     override fun atanh(arg: Quaternion): Quaternion = (ln(arg + one) - ln(one - arg)) / 2.0
 }
 
-/**
- * Represents `double`-based quaternion.
- *
- * @property w The first component.
- * @property x The second component.
- * @property y The third component.
- * @property z The fourth component.
- */
-@OptIn(UnstableKMathAPI::class)
-public data class Quaternion(
-    val w: Double, val x: Double, val y: Double, val z: Double,
-) {
-    public constructor(w: Number, x: Number, y: Number, z: Number) : this(
-        w.toDouble(),
-        x.toDouble(),
-        y.toDouble(),
-        z.toDouble(),
-    )
-
-    public constructor(w: Number, x: Number, y: Number) : this(w.toDouble(), x.toDouble(), y.toDouble(), 0.0)
-    public constructor(w: Number, x: Number) : this(w.toDouble(), x.toDouble(), 0.0, 0.0)
-    public constructor(w: Number) : this(w.toDouble(), 0.0, 0.0, 0.0)
-    public constructor(wx: Complex, yz: Complex) : this(wx.re, wx.im, yz.re, yz.im)
-    public constructor(wx: Complex) : this(wx.re, wx.im, 0, 0)
-
-    init {
-        require(!w.isNaN()) { "w-component of quaternion is not-a-number" }
-        require(!x.isNaN()) { "x-component of quaternion is not-a-number" }
-        require(!y.isNaN()) { "x-component of quaternion is not-a-number" }
-        require(!z.isNaN()) { "x-component of quaternion is not-a-number" }
-    }
-
-    /**
-     * Returns a string representation of this quaternion.
-     */
-    override fun toString(): String = "($w + $x * i + $y * j + $z * k)"
-
-    public companion object : MemorySpec<Quaternion> {
-        override val objectSize: Int
-            get() = 32
-
-        override fun MemoryReader.read(offset: Int): Quaternion =
-            Quaternion(readDouble(offset), readDouble(offset + 8), readDouble(offset + 16), readDouble(offset + 24))
-
-        override fun MemoryWriter.write(offset: Int, value: Quaternion) {
-            writeDouble(offset, value.w)
-            writeDouble(offset + 8, value.x)
-            writeDouble(offset + 16, value.y)
-            writeDouble(offset + 24, value.z)
-        }
-    }
-}
-
-/**
- * Creates a quaternion with real part equal to this real.
- *
- * @receiver the real part.
- * @return a new quaternion.
- */
-public fun Number.toQuaternion(): Quaternion = Quaternion(this)
-
-/**
- * Creates a quaternion with `w`-component equal to `re`-component of given complex and `x`-component equal to
- * `im`-component of given complex.
- *
- * @receiver the complex number.
- * @return a new quaternion.
- */
-public fun Complex.toQuaternion(): Quaternion = Quaternion(this)
-
 /**
  * Creates a new buffer of quaternions with the specified [size], where each element is calculated by calling the
  * specified [init] function.
diff --git a/kmath-geometry/build.gradle.kts b/kmath-geometry/build.gradle.kts
index 7eb814683..bfe2e32a2 100644
--- a/kmath-geometry/build.gradle.kts
+++ b/kmath-geometry/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 kotlin.sourceSets.commonMain {
     dependencies {
-        api(project(":kmath-core"))
+        api(projects.kmath.kmathComplex)
     }
 }
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
index d00575bcc..a83cb3ac7 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
@@ -6,12 +6,10 @@
 package space.kscience.kmath.geometry
 
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
 import kotlin.math.sqrt
 
-@OptIn(UnstableKMathAPI::class)
 public interface Vector2D : Point<Double>, Vector {
     public val x: Double
     public val y: Double
@@ -29,7 +27,6 @@ public interface Vector2D : Point<Double>, Vector {
 public val Vector2D.r: Double
     get() = Euclidean2DSpace { norm() }
 
-@Suppress("FunctionName")
 public fun Vector2D(x: Double, y: Double): Vector2D = Vector2DImpl(x, y)
 
 private data class Vector2DImpl(
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index e12563b46..d3b3fb15e 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -6,12 +6,10 @@
 package space.kscience.kmath.geometry
 
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
 import kotlin.math.sqrt
 
-@OptIn(UnstableKMathAPI::class)
 public interface Vector3D : Point<Double>, Vector {
     public val x: Double
     public val y: Double
-- 
2.34.1


From 5928adfe45fc4b1d608e94fb5b2c12c447377c24 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 13 Jun 2022 12:08:58 +0300
Subject: [PATCH 528/713] Fixed merging accidents.

---
 .../kscience/kmath/functions/Piecewise.kt     | 132 ++++++++++++++++++
 .../kmath/integration/SplineIntegrator.kt     | 112 +++++++++++++++
 .../kmath/interpolation/Interpolator.kt       |  92 ++++++++++++
 .../kmath/interpolation/LinearInterpolator.kt |  43 ++++++
 .../kmath/interpolation/SplineInterpolator.kt |  88 ++++++++++++
 .../kmath/integration/SplineIntegralTest.kt   |  48 +++++++
 .../interpolation/LinearInterpolatorTest.kt   |  29 ++++
 .../interpolation/SplineInterpolatorTest.kt   |  36 +++++
 8 files changed, 580 insertions(+)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
new file mode 100644
index 000000000..612b00535
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.operations.Ring
+
+/**
+ * Represents piecewise-defined function.
+ *
+ * @param T the piece key type.
+ * @param R the sub-function type.
+ */
+public fun interface Piecewise<in T, out R> {
+    /**
+     * Returns the appropriate sub-function for given piece key.
+     */
+    public fun findPiece(arg: T): R?
+}
+
+/**
+ * Represents piecewise-defined function where all the sub-functions are polynomials.
+ *
+ * @property pieces An ordered list of range-polynomial pairs. The list does not in general guarantee that there are no
+ * "holes" in it.
+ */
+public interface PiecewisePolynomial<T : Comparable<T>> : Piecewise<T, ListPolynomial<T>> {
+    public val pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>>
+
+    override fun findPiece(arg: T): ListPolynomial<T>?
+}
+
+/**
+ * A generic piecewise without constraints on how pieces are placed
+ */
+@PerformancePitfall("findPiece method of resulting piecewise is slow")
+public fun <T : Comparable<T>> PiecewisePolynomial(
+    pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>>,
+): PiecewisePolynomial<T> = object : PiecewisePolynomial<T> {
+    override val pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>> = pieces
+
+    override fun findPiece(arg: T): ListPolynomial<T>? = pieces.firstOrNull { arg in it.first }?.second
+}
+
+/**
+ * An optimized piecewise that uses not separate pieces, but a range separated by delimiters.
+ * The pieces search is logarithmic.
+ */
+private class OrderedPiecewisePolynomial<T : Comparable<T>>(
+    override val pieces: List<Pair<ClosedRange<T>, ListPolynomial<T>>>,
+) : PiecewisePolynomial<T> {
+
+    override fun findPiece(arg: T): ListPolynomial<T>? {
+        val index = pieces.binarySearch { (range, _) ->
+            when {
+                arg >= range.endInclusive -> -1
+                arg < range.start -> +1
+                else -> 0
+            }
+        }
+        return if (index < 0) null else pieces[index].second
+    }
+
+}
+
+/**
+ * A [Piecewise]  builder where all the pieces are ordered by the [Comparable] type instances.
+ *
+ * @param T the comparable piece key type.
+ * @param delimiter the initial piecewise separator
+ */
+public class PiecewiseBuilder<T : Comparable<T>>(delimiter: T) {
+    private val delimiters: MutableList<T> = arrayListOf(delimiter)
+    private val pieces: MutableList<ListPolynomial<T>> = arrayListOf()
+
+    /**
+     * Dynamically adds a piece to the right side (beyond maximum argument value of previous piece)
+     *
+     * @param right new rightmost position. If is less than current rightmost position, an error is thrown.
+     * @param piece the sub-function.
+     */
+    public fun putRight(right: T, piece: ListPolynomial<T>) {
+        require(right > delimiters.last()) { "New delimiter should be to the right of old one" }
+        delimiters += right
+        pieces += piece
+    }
+
+    /**
+     * Dynamically adds a piece to the left side (beyond maximum argument value of previous piece)
+     *
+     * @param left the new leftmost position. If is less than current rightmost position, an error is thrown.
+     * @param piece the sub-function.
+     */
+    public fun putLeft(left: T, piece: ListPolynomial<T>) {
+        require(left < delimiters.first()) { "New delimiter should be to the left of old one" }
+        delimiters.add(0, left)
+        pieces.add(0, piece)
+    }
+
+    public fun build(): PiecewisePolynomial<T> = OrderedPiecewisePolynomial(delimiters.zipWithNext { l, r ->
+        l..r
+    }.zip(pieces))
+}
+
+/**
+ * A builder for [PiecewisePolynomial]
+ */
+public fun <T : Comparable<T>> PiecewisePolynomial(
+    startingPoint: T,
+    builder: PiecewiseBuilder<T>.() -> Unit,
+): PiecewisePolynomial<T> = PiecewiseBuilder(startingPoint).apply(builder).build()
+
+/**
+ * Return a value of polynomial function with given [ring] a given [arg] or null if argument is outside piecewise
+ * definition.
+ */
+public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.substitute(ring: C, arg: T): T? =
+    findPiece(arg)?.substitute(ring, arg)
+
+/**
+ * Convert this polynomial to a function returning nullable value (null if argument is outside piecewise range).
+ */
+public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C): (T) -> T? = { substitute(ring, it) }
+
+/**
+ * Convert this polynomial to a function using [defaultValue] for arguments outside the piecewise range.
+ */
+public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C, defaultValue: T): (T) -> T =
+    { substitute(ring, it) ?: defaultValue }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
new file mode 100644
index 000000000..80006c2de
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.integration
+
+import space.kscience.kmath.functions.PiecewisePolynomial
+import space.kscience.kmath.functions.integrate
+import space.kscience.kmath.functions.antiderivative
+import space.kscience.kmath.interpolation.PolynomialInterpolator
+import space.kscience.kmath.interpolation.SplineInterpolator
+import space.kscience.kmath.interpolation.interpolatePolynomials
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.MutableBufferFactory
+
+/**
+ * Compute analytical indefinite integral of this [PiecewisePolynomial], keeping all intervals intact
+ */
+@OptIn(PerformancePitfall::class)
+@UnstableKMathAPI
+public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(algebra: Field<T>): PiecewisePolynomial<T> =
+    PiecewisePolynomial(pieces.map { it.first to it.second.antiderivative(algebra) })
+
+/**
+ * Compute definite integral of given [PiecewisePolynomial] piece by piece in a given [range]
+ * Requires [UnivariateIntegrationNodes] or [IntegrationRange] and [IntegrandMaxCalls]
+ *
+ * TODO use context receiver for algebra
+ */
+@UnstableKMathAPI
+public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(
+    algebra: Field<T>, range: ClosedRange<T>,
+): T = algebra.sum(
+    pieces.map { (region, poly) ->
+        val intersectedRange = maxOf(range.start, region.start)..minOf(range.endInclusive, region.endInclusive)
+        //Check if polynomial range is not used
+        if (intersectedRange.start == intersectedRange.endInclusive) algebra.zero
+        else poly.integrate(algebra, intersectedRange)
+    }
+)
+
+/**
+ * A generic spline-interpolation-based analytic integration
+ * * [IntegrationRange]&mdash;the univariate range of integration. By default, uses `0..1` interval.
+ * * [IntegrandMaxCalls]&mdash;the maximum number of function calls during integration. For non-iterative rules, always uses
+ * the maximum number of points. By default, uses 10 points.
+ */
+@UnstableKMathAPI
+public class SplineIntegrator<T : Comparable<T>>(
+    public val algebra: Field<T>,
+    public val bufferFactory: MutableBufferFactory<T>,
+) : UnivariateIntegrator<T> {
+    override fun process(integrand: UnivariateIntegrand<T>): UnivariateIntegrand<T> = algebra {
+        val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
+
+        val interpolator: PolynomialInterpolator<T> = SplineInterpolator(algebra, bufferFactory)
+
+        val nodes: Buffer<Double> = integrand.getFeature<UnivariateIntegrationNodes>()?.nodes ?: run {
+            val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
+            val step = (range.endInclusive - range.start) / (numPoints - 1)
+            DoubleBuffer(numPoints) { i -> range.start + i * step }
+        }
+
+        val values = nodes.map(bufferFactory) { integrand.function(it) }
+        val polynomials = interpolator.interpolatePolynomials(
+            nodes.map(bufferFactory) { number(it) },
+            values
+        )
+        val res = polynomials.integrate(algebra, number(range.start)..number(range.endInclusive))
+        integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + nodes.size)
+    }
+}
+
+/**
+ * A simplified double-based spline-interpolation-based analytic integration
+ * * [IntegrationRange]&mdash;the univariate range of integration. By default, uses `0.0..1.0` interval.
+ * * [IntegrandMaxCalls]&mdash;the maximum number of function calls during integration. For non-iterative rules, always
+ * uses the maximum number of points. By default, uses 10 points.
+ */
+@UnstableKMathAPI
+public object DoubleSplineIntegrator : UnivariateIntegrator<Double> {
+    override fun process(integrand: UnivariateIntegrand<Double>): UnivariateIntegrand<Double> {
+        val range = integrand.getFeature<IntegrationRange>()?.range ?: 0.0..1.0
+        val interpolator: PolynomialInterpolator<Double> = SplineInterpolator(DoubleField, ::DoubleBuffer)
+
+        val nodes: Buffer<Double> = integrand.getFeature<UnivariateIntegrationNodes>()?.nodes ?: run {
+            val numPoints = integrand.getFeature<IntegrandMaxCalls>()?.maxCalls ?: 100
+            val step = (range.endInclusive - range.start) / (numPoints - 1)
+            DoubleBuffer(numPoints) { i -> range.start + i * step }
+        }
+
+        val values = nodes.map { integrand.function(it) }
+        val polynomials = interpolator.interpolatePolynomials(nodes, values)
+        val res = polynomials.integrate(DoubleField, range)
+        return integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + nodes.size)
+    }
+}
+
+@Suppress("unused")
+@UnstableKMathAPI
+public inline val DoubleField.splineIntegrator: UnivariateIntegrator<Double>
+    get() = DoubleSplineIntegrator
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
new file mode 100644
index 000000000..62819be0c
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:OptIn(UnstableKMathAPI::class)
+
+package space.kscience.kmath.interpolation
+
+import space.kscience.kmath.data.XYColumnarData
+import space.kscience.kmath.functions.PiecewisePolynomial
+import space.kscience.kmath.functions.asFunction
+import space.kscience.kmath.functions.substitute
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.asBuffer
+
+/**
+ * And interpolator for data with x column type [X], y column type [Y].
+ */
+public fun interface Interpolator<T, in X : T, Y : T> {
+    public fun interpolate(points: XYColumnarData<T, X, Y>): (X) -> Y
+}
+
+/**
+ * And interpolator returning [PiecewisePolynomial] function
+ */
+public interface PolynomialInterpolator<T : Comparable<T>> : Interpolator<T, T, T> {
+    public val algebra: Ring<T>
+
+    public fun getDefaultValue(): T = error("Out of bounds")
+
+    public fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T>
+
+    override fun interpolate(points: XYColumnarData<T, T, T>): (T) -> T = { x ->
+        interpolatePolynomials(points).substitute(algebra, x) ?: getDefaultValue()
+    }
+}
+
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolatePolynomials(
+    x: Buffer<T>,
+    y: Buffer<T>,
+): PiecewisePolynomial<T> {
+    val pointSet = XYColumnarData.of(x, y)
+    return interpolatePolynomials(pointSet)
+}
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolatePolynomials(
+    data: Map<T, T>,
+): PiecewisePolynomial<T> {
+    val pointSet = XYColumnarData.of(data.keys.toList().asBuffer(), data.values.toList().asBuffer())
+    return interpolatePolynomials(pointSet)
+}
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolatePolynomials(
+    data: List<Pair<T, T>>,
+): PiecewisePolynomial<T> {
+    val pointSet = XYColumnarData.of(data.map { it.first }.asBuffer(), data.map { it.second }.asBuffer())
+    return interpolatePolynomials(pointSet)
+}
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
+    x: Buffer<T>,
+    y: Buffer<T>,
+): (T) -> T? = interpolatePolynomials(x, y).asFunction(algebra)
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
+    data: Map<T, T>,
+): (T) -> T? = interpolatePolynomials(data).asFunction(algebra)
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
+    data: List<Pair<T, T>>,
+): (T) -> T? = interpolatePolynomials(data).asFunction(algebra)
+
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
+    x: Buffer<T>,
+    y: Buffer<T>,
+    defaultValue: T,
+): (T) -> T = interpolatePolynomials(x, y).asFunction(algebra, defaultValue)
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
+    data: Map<T, T>,
+    defaultValue: T,
+): (T) -> T = interpolatePolynomials(data).asFunction(algebra, defaultValue)
+
+public fun <T : Comparable<T>> PolynomialInterpolator<T>.interpolate(
+    data: List<Pair<T, T>>,
+    defaultValue: T,
+): (T) -> T = interpolatePolynomials(data).asFunction(algebra, defaultValue)
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
new file mode 100644
index 000000000..b55f16cf2
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.interpolation
+
+import space.kscience.kmath.data.XYColumnarData
+import space.kscience.kmath.functions.PiecewisePolynomial
+import space.kscience.kmath.functions.ListPolynomial
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.invoke
+
+@OptIn(UnstableKMathAPI::class)
+internal fun <T : Comparable<T>> insureSorted(points: XYColumnarData<*, T, *>) {
+    for (i in 0 until points.size - 1)
+        require(points.x[i + 1] > points.x[i]) { "Input data is not sorted at index $i" }
+}
+
+/**
+ * Reference JVM implementation: https://github.com/apache/commons-math/blob/master/src/main/java/org/apache/commons/math4/analysis/interpolation/LinearInterpolator.java
+ */
+public class LinearInterpolator<T : Comparable<T>>(override val algebra: Field<T>) : PolynomialInterpolator<T> {
+
+    @OptIn(UnstableKMathAPI::class)
+    override fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T> = algebra {
+        require(points.size > 0) { "Point array should not be empty" }
+        insureSorted(points)
+
+        PiecewisePolynomial(points.x[0]) {
+            for (i in 0 until points.size - 1) {
+                val slope = (points.y[i + 1] - points.y[i]) / (points.x[i + 1] - points.x[i])
+                val const = points.y[i] - slope * points.x[i]
+                val polynomial = ListPolynomial(const, slope)
+                putRight(points.x[i + 1], polynomial)
+            }
+        }
+    }
+}
+
+public val <T : Comparable<T>> Field<T>.linearInterpolator: LinearInterpolator<T>
+    get() = LinearInterpolator(this)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
new file mode 100644
index 000000000..0bcbfd0c6
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.interpolation
+
+import space.kscience.kmath.data.XYColumnarData
+import space.kscience.kmath.functions.PiecewisePolynomial
+import space.kscience.kmath.functions.ListPolynomial
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.MutableBufferFactory
+
+/**
+ * Generic spline interpolator. Not recommended for performance critical places, use platform-specific and type
+ * specific ones.
+ *
+ * Based on
+ * https://github.com/apache/commons-math/blob/eb57d6d457002a0bb5336d789a3381a24599affe/src/main/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolator.java
+ */
+public class SplineInterpolator<T : Comparable<T>>(
+    override val algebra: Field<T>,
+    public val bufferFactory: MutableBufferFactory<T>,
+) : PolynomialInterpolator<T> {
+    //TODO possibly optimize zeroed buffers
+
+    @OptIn(UnstableKMathAPI::class)
+    override fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T> = algebra {
+        require(points.size >= 3) { "Can't use spline interpolator with less than 3 points" }
+        insureSorted(points)
+        // Number of intervals.  The number of data points is n + 1.
+        val n = points.size - 1
+        // Differences between knot points
+        val h = bufferFactory(n) { i -> points.x[i + 1] - points.x[i] }
+        val mu = bufferFactory(n) { zero }
+        val z = bufferFactory(n + 1) { zero }
+
+        for (i in 1 until n) {
+            val g = 2.0 * (points.x[i + 1] - points.x[i - 1]) - h[i - 1] * mu[i - 1]
+            mu[i] = h[i] / g
+            z[i] =
+                ((points.y[i + 1] * h[i - 1] - points.y[i] * (points.x[i + 1] - points.x[i - 1]) + points.y[i - 1] * h[i]) * 3.0 /
+                        (h[i - 1] * h[i]) - h[i - 1] * z[i - 1]) / g
+        }
+
+        // cubic spline coefficients --  b is linear, c quadratic, d is cubic (original y's are constants)
+
+        PiecewisePolynomial(points.x[points.size - 1]) {
+            var cOld = zero
+
+            for (j in n - 1 downTo 0) {
+                val c = z[j] - mu[j] * cOld
+                val a = points.y[j]
+                val b = (points.y[j + 1] - points.y[j]) / h[j] - h[j] * (cOld + 2.0 * c) / 3.0
+                val d = (cOld - c) / (3.0 * h[j])
+                val x0 = points.x[j]
+                val x02 = x0 * x0
+                val x03 = x02 * x0
+                //Shift coefficients to represent absolute polynomial instead of one with an offset
+                val polynomial = ListPolynomial(
+                    a - b * x0 + c * x02 - d * x03,
+                    b - 2 * c * x0 + 3 * d * x02,
+                    c - 3 * d * x0,
+                    d
+                )
+                cOld = c
+                putLeft(x0, polynomial)
+            }
+        }
+    }
+}
+
+
+public fun <T : Comparable<T>> Field<T>.splineInterpolator(
+    bufferFactory: MutableBufferFactory<T>,
+): SplineInterpolator<T> = SplineInterpolator(this, bufferFactory)
+
+public val DoubleField.splineInterpolator: SplineInterpolator<Double>
+    get() = SplineInterpolator(this, ::DoubleBuffer)
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
new file mode 100644
index 000000000..aae0ad017
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.integration
+
+import space.kscience.kmath.functions.ListPolynomial
+import space.kscience.kmath.functions.integrate
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField
+import kotlin.math.PI
+import kotlin.math.sin
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+@OptIn(UnstableKMathAPI::class)
+class SplineIntegralTest {
+
+    @Test
+    fun integratePolynomial(){
+        val polynomial = ListPolynomial(1.0, 2.0, 3.0)
+        val integral = polynomial.integrate(DoubleField,1.0..2.0)
+        assertEquals(11.0, integral, 0.001)
+    }
+
+    @Test
+    fun gaussSin() {
+        val res = DoubleField.splineIntegrator.integrate(0.0..2 * PI, IntegrandMaxCalls(5)) { x ->
+            sin(x)
+        }
+        assertEquals(0.0, res.value, 1e-2)
+    }
+
+    @Test
+    fun gaussUniform() {
+        val res = DoubleField.splineIntegrator.integrate(35.0..100.0, IntegrandMaxCalls(20)) { x ->
+            if(x in 30.0..50.0){
+                1.0
+            } else {
+                0.0
+            }
+        }
+        assertEquals(15.0, res.value, 0.5)
+    }
+
+
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
new file mode 100644
index 000000000..1143036d4
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.interpolation
+
+import space.kscience.kmath.operations.DoubleField
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+internal class LinearInterpolatorTest {
+    @Test
+    fun testInterpolation() {
+        val data = listOf(
+            0.0 to 0.0,
+            1.0 to 1.0,
+            2.0 to 3.0,
+            3.0 to 4.0
+        )
+
+        //val polynomial: PiecewisePolynomial<Double> = DoubleField.linearInterpolator.interpolatePolynomials(data)
+        val function = DoubleField.linearInterpolator.interpolate(data)
+        assertEquals(null, function(-1.0))
+        assertEquals(0.5, function(0.5))
+        assertEquals(2.0, function(1.5))
+        assertEquals(3.0, function(2.0))
+    }
+}
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
new file mode 100644
index 000000000..f748535e2
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.interpolation
+
+import space.kscience.kmath.operations.DoubleField
+import kotlin.math.PI
+import kotlin.math.sin
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+internal class SplineInterpolatorTest {
+    @Test
+    fun testInterpolation() {
+        val data = (0..10).map {
+            val x = it.toDouble() / 5 * PI
+            x to sin(x)
+        }
+
+        //val polynomial: PiecewisePolynomial<Double> = DoubleField.splineInterpolator.interpolatePolynomials(data)
+
+        val function = DoubleField.splineInterpolator.interpolate(data, Double.NaN)
+
+        assertEquals(Double.NaN, function(-1.0))
+        assertEquals(sin(0.5), function(0.5), 0.1)
+        assertEquals(sin(1.5), function(1.5), 0.1)
+        assertEquals(sin(2.0), function(2.0), 0.1)
+    }
+}
-- 
2.34.1


From 58e0715714487323a46f5b86e121a46782d356c5 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 13 Jun 2022 12:15:14 +0300
Subject: [PATCH 529/713] Removed duplicates of copyright comments.

---
 .../space/kscience/kmath/integration/SplineIntegrator.kt     | 5 -----
 .../space/kscience/kmath/interpolation/SplineInterpolator.kt | 5 -----
 .../kscience/kmath/interpolation/SplineInterpolatorTest.kt   | 5 -----
 3 files changed, 15 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index 80006c2de..0fcd4c6e5 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -3,11 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 package space.kscience.kmath.integration
 
 import space.kscience.kmath.functions.PiecewisePolynomial
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
index 0bcbfd0c6..48c90ff23 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -3,11 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 package space.kscience.kmath.interpolation
 
 import space.kscience.kmath.data.XYColumnarData
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
index f748535e2..4c7d816d4 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
@@ -3,11 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 package space.kscience.kmath.interpolation
 
 import space.kscience.kmath.operations.DoubleField
-- 
2.34.1


From 85a1e8b33f3ed3683d1e68e722ef0cf89fc43cc5 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 14 Jun 2022 16:27:32 +0300
Subject: [PATCH 530/713] New common test infrastructure

---
 build.gradle.kts                              |  14 ++-
 .../kscience/kmath/complex/Quaternion.kt      |  79 ++++++++++----
 ...aternionFieldTest.kt => QuaternionTest.kt} |  15 ++-
 .../kmath/geometry/Euclidean3DSpace.kt        |  14 +++
 .../{Projections.kt => projections.kt}        |   2 +
 .../kscience/kmath/geometry/rotations3D.kt    | 100 ++++++++++++++++++
 .../kscience/kmath/geometry/RotationTest.kt   |  35 ++++++
 .../tensorflow/DoubleTensorFlowAlgebra.kt     |   2 +
 settings.gradle.kts                           |   1 +
 test-utils/build.gradle.kts                   |  13 +++
 .../commonMain/kotlin}/AlgebraicVerifier.kt   |   0
 .../src/commonMain/kotlin}/FieldVerifier.kt   |   2 +-
 .../src/commonMain/kotlin}/RingVerifier.kt    |   2 +-
 .../src/commonMain/kotlin}/SpaceVerifier.kt   |  10 +-
 test-utils/src/commonMain/kotlin/asserts.kt   |  20 ++++
 15 files changed, 279 insertions(+), 30 deletions(-)
 rename kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/{QuaternionFieldTest.kt => QuaternionTest.kt} (84%)
 rename kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/{Projections.kt => projections.kt} (97%)
 create mode 100644 kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
 create mode 100644 kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
 create mode 100644 test-utils/build.gradle.kts
 rename {kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils => test-utils/src/commonMain/kotlin}/AlgebraicVerifier.kt (100%)
 rename {kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils => test-utils/src/commonMain/kotlin}/FieldVerifier.kt (96%)
 rename {kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils => test-utils/src/commonMain/kotlin}/RingVerifier.kt (95%)
 rename {kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils => test-utils/src/commonMain/kotlin}/SpaceVerifier.kt (93%)
 create mode 100644 test-utils/src/commonMain/kotlin/asserts.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index ab136bfbc..d8c591799 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,7 @@ allprojects {
 subprojects {
     if (name.startsWith("kmath")) apply<MavenPublishPlugin>()
 
-    plugins.withId("org.jetbrains.dokka"){
+    plugins.withId("org.jetbrains.dokka") {
         tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial> {
             dependsOn(tasks["assemble"])
 
@@ -51,6 +51,18 @@ subprojects {
             }
         }
     }
+
+    plugins.withId("org.jetbrains.kotlin.multiplatform") {
+        configure<org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension> {
+            sourceSets {
+                val commonTest by getting {
+                    dependencies {
+                        implementation(projects.testUtils)
+                    }
+                }
+            }
+        }
+    }
 }
 
 readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md")
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index 85c945faf..359b66b20 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -24,9 +24,12 @@ import kotlin.math.*
  * @property y The third component.
  * @property z The fourth component.
  */
-public data class Quaternion(
-    val w: Double, val x: Double, val y: Double, val z: Double,
-) {
+public class Quaternion(
+    public val w: Double,
+    public val x: Double,
+    public val y: Double,
+    public val z: Double,
+) : Buffer<Double> {
     init {
         require(!w.isNaN()) { "w-component of quaternion is not-a-number" }
         require(!x.isNaN()) { "x-component of quaternion is not-a-number" }
@@ -39,12 +42,49 @@ public data class Quaternion(
      */
     override fun toString(): String = "($w + $x * i + $y * j + $z * k)"
 
-    public companion object : MemorySpec<Quaternion> {
-        override val objectSize: Int
-            get() = 32
+    override val size: Int get() = 4
 
-        override fun MemoryReader.read(offset: Int): Quaternion =
-            Quaternion(readDouble(offset), readDouble(offset + 8), readDouble(offset + 16), readDouble(offset + 24))
+    override fun get(index: Int): Double = when (index) {
+        0 -> w
+        1 -> x
+        2 -> y
+        3 -> z
+        else -> error("Index $index out of bounds [0,3]")
+    }
+
+    override fun iterator(): Iterator<Double> = listOf(w, x, y, z).iterator()
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || this::class != other::class) return false
+
+        other as Quaternion
+
+        if (w != other.w) return false
+        if (x != other.x) return false
+        if (y != other.y) return false
+        if (z != other.z) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = w.hashCode()
+        result = 31 * result + x.hashCode()
+        result = 31 * result + y.hashCode()
+        result = 31 * result + z.hashCode()
+        return result
+    }
+
+    public companion object : MemorySpec<Quaternion> {
+        override val objectSize: Int get() = 32
+
+        override fun MemoryReader.read(offset: Int): Quaternion = Quaternion(
+            readDouble(offset),
+            readDouble(offset + 8),
+            readDouble(offset + 16),
+            readDouble(offset + 24)
+        )
 
         override fun MemoryWriter.write(offset: Int, value: Quaternion) {
             writeDouble(offset, value.w)
@@ -66,30 +106,22 @@ public fun Quaternion(w: Number, x: Number = 0.0, y: Number = 0.0, z: Number = 0
  * This quaternion's conjugate.
  */
 public val Quaternion.conjugate: Quaternion
-    get() = QuaternionField { z - x * i - y * j - z * k }
+    get() = Quaternion(w, -x, -y, -z)
 
 /**
  * This quaternion's reciprocal.
  */
 public val Quaternion.reciprocal: Quaternion
     get() {
-        QuaternionField {
-            val n = norm(this@reciprocal)
-            return conjugate / (n * n)
-        }
+        val norm2 = (w * w + x * x + y * y + z * z)
+        return Quaternion(w / norm2, -x / norm2, -y / norm2, -z / norm2)
     }
 
-/**
- * Absolute value of the quaternion.
- */
-public val Quaternion.r: Double
-    get() = sqrt(w * w + x * x + y * y + z * z)
-
 /**
  * A field of [Quaternion].
  */
 @OptIn(UnstableKMathAPI::class)
-public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>, PowerOperations<Quaternion>,
+public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Double>, PowerOperations<Quaternion>,
     ExponentialOperations<Quaternion>, NumbersAddOps<Quaternion>, ScaleOperations<Quaternion> {
     override val zero: Quaternion = Quaternion(0.0)
     override val one: Quaternion = Quaternion(1.0)
@@ -217,7 +249,12 @@ public object QuaternionField : Field<Quaternion>, Norm<Quaternion, Quaternion>,
         Quaternion(toDouble() * arg.w, toDouble() * arg.x, toDouble() * arg.y, toDouble() * arg.z)
 
     override fun Quaternion.unaryMinus(): Quaternion = Quaternion(-w, -x, -y, -z)
-    override fun norm(arg: Quaternion): Quaternion = sqrt(arg.conjugate * arg)
+    override fun norm(arg: Quaternion): Double = sqrt(
+        arg.w.pow(2) +
+                arg.x.pow(2) +
+                arg.y.pow(2) +
+                arg.z.pow(2)
+    )
 
     override fun bindSymbolOrNull(value: String): Quaternion? = when (value) {
         "i" -> i
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionFieldTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionTest.kt
similarity index 84%
rename from kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionFieldTest.kt
rename to kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionTest.kt
index 6784f3516..fd4df736c 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionFieldTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionTest.kt
@@ -6,10 +6,23 @@
 package space.kscience.kmath.complex
 
 import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.testutils.assertBufferEquals
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-internal class QuaternionFieldTest {
+internal class QuaternionTest {
+
+    @Test
+    fun testNorm() {
+        assertEquals(2.0, QuaternionField.norm(Quaternion(1.0, 1.0, 1.0, 1.0)))
+    }
+
+    @Test
+    fun testInverse() = QuaternionField {
+        val q = Quaternion(1.0, 2.0, -3.0, 4.0)
+        assertBufferEquals(one, q * q.reciprocal, 1e-4)
+    }
+
     @Test
     fun testAddition() {
         assertEquals(Quaternion(42, 42), QuaternionField { Quaternion(16, 16) + Quaternion(26, 26) })
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index d3b3fb15e..c1fc74bf1 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.geometry
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.Buffer
 import kotlin.math.sqrt
 
 public interface Vector3D : Point<Double>, Vector {
@@ -29,6 +30,19 @@ public interface Vector3D : Point<Double>, Vector {
 @Suppress("FunctionName")
 public fun Vector3D(x: Double, y: Double, z: Double): Vector3D = Vector3DImpl(x, y, z)
 
+public fun Buffer<Double>.asVector3D(): Vector3D = object : Vector3D {
+    init {
+        require(this@asVector3D.size == 3) { "Buffer of size 3 is required for Vector3D" }
+    }
+
+    override val x: Double get() = this@asVector3D[0]
+    override val y: Double get() = this@asVector3D[1]
+    override val z: Double get() = this@asVector3D[2]
+
+    override fun toString(): String = this@asVector3D.toString()
+
+}
+
 public val Vector3D.r: Double get() = Euclidean3DSpace { norm() }
 
 private data class Vector3DImpl(
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/projections.kt
similarity index 97%
rename from kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt
rename to kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/projections.kt
index 5e299f450..6ffc43739 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Projections.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/projections.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.geometry
 
+//TODO move vector to receiver
+
 /**
  * Project vector onto a line.
  * @param vector to project
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
new file mode 100644
index 000000000..374315610
--- /dev/null
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.geometry
+
+import space.kscience.kmath.complex.Quaternion
+import space.kscience.kmath.complex.QuaternionField
+import space.kscience.kmath.complex.reciprocal
+import space.kscience.kmath.linear.LinearSpace
+import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.linear.linearSpace
+import space.kscience.kmath.linear.matrix
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.invoke
+import kotlin.math.pow
+import kotlin.math.sqrt
+
+internal fun Vector3D.toQuaternion(): Quaternion = Quaternion(0.0, x, y, z)
+
+/**
+ * Angle in radians denoted by this quaternion rotation
+ */
+public val Quaternion.theta: Double get() = kotlin.math.acos(w) * 2
+
+/**
+ * An axis of quaternion rotation
+ */
+public val Quaternion.vector: Vector3D
+    get() {
+        val sint2 = sqrt(1 - w * w)
+
+        return object : Vector3D {
+            override val x: Double get() = this@vector.x/sint2
+            override val y: Double get() = this@vector.y/sint2
+            override val z: Double get() = this@vector.z/sint2
+            override fun toString(): String = listOf(x, y, z).toString()
+        }
+    }
+
+/**
+ * Rotate a vector in a [Euclidean3DSpace]
+ */
+public fun Euclidean3DSpace.rotate(vector: Vector3D, q: Quaternion): Vector3D = with(QuaternionField) {
+    val p = vector.toQuaternion()
+    (q * p * q.reciprocal).vector
+}
+
+/**
+ * Use a composition of quaternions to create a rotation
+ */
+public fun Euclidean3DSpace.rotate(vector: Vector3D, composition: QuaternionField.() -> Quaternion): Vector3D =
+    rotate(vector, QuaternionField.composition())
+
+public fun Euclidean3DSpace.rotate(vector: Vector3D, matrix: Matrix<Double>): Vector3D {
+    require(matrix.colNum == 3 && matrix.rowNum == 3) { "Square 3x3 rotation matrix is required" }
+    return with(DoubleField.linearSpace) { matrix.dot(vector).asVector3D() }
+}
+
+/**
+ * Convert a [Quaternion] to a rotation matrix
+ */
+@OptIn(UnstableKMathAPI::class)
+public fun Quaternion.toRotationMatrix(
+    linearSpace: LinearSpace<Double, *> = DoubleField.linearSpace,
+): Matrix<Double> {
+    val s = QuaternionField.norm(this).pow(-2)
+    return linearSpace.matrix(3, 3)(
+        1.0 - 2 * s * (y * y + z * z), 2 * s * (x * y - z * w), 2 * s * (x * z + y * w),
+        2 * s * (x * y + z * w), 1.0 - 2 * s * (x * x + z * z), 2 * s * (y * z - x * w),
+        2 * s * (x * z - y * w), 2 * s * (y * z + x * w), 1.0 - 2 * s * (x * x + y * y)
+    )
+}
+
+/**
+ * taken from https://d3cw3dd2w32x2b.cloudfront.net/wp-content/uploads/2015/01/matrix-to-quat.pdf
+ */
+public fun Quaternion.Companion.fromRotationMatrix(matrix: Matrix<Double>): Quaternion {
+    val t: Double
+    val q = if (matrix[2, 2] < 0) {
+        if (matrix[0, 0] > matrix[1, 1]) {
+            t = 1 + matrix[0, 0] - matrix[1, 1] - matrix[2, 2]
+            Quaternion(t, matrix[0, 1] + matrix[1, 0], matrix[2, 0] + matrix[0, 2], matrix[1, 2] - matrix[2, 1])
+        } else {
+            t = 1 - matrix[0, 0] + matrix[1, 1] - matrix[2, 2]
+            Quaternion(matrix[0, 1] + matrix[1, 0], t, matrix[1, 2] + matrix[2, 1], matrix[2, 0] - matrix[0, 2])
+        }
+    } else {
+        if (matrix[0, 0] < -matrix[1, 1]) {
+            t = 1 - matrix[0, 0] - matrix[1, 1] + matrix[2, 2]
+            Quaternion(matrix[2, 0] + matrix[0, 2], matrix[1, 2] + matrix[2, 1], t, matrix[0, 1] - matrix[1, 0])
+        } else {
+            t = 1 + matrix[0, 0] + matrix[1, 1] + matrix[2, 2]
+            Quaternion(matrix[1, 2] - matrix[2, 1], matrix[2, 0] - matrix[0, 2], matrix[0, 1] - matrix[1, 0], t)
+        }
+    }
+    return QuaternionField.invoke { q * (0.5 / sqrt(t)) }
+}
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
new file mode 100644
index 000000000..ca7226fb6
--- /dev/null
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.geometry
+
+import space.kscience.kmath.complex.Quaternion
+import space.kscience.kmath.testutils.assertBufferEquals
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class RotationTest {
+
+    @Test
+    fun rotations() = with(Euclidean3DSpace) {
+        val vector = Vector3D(1.0, 1.0, 1.0)
+        val q = Quaternion(1.0, 2.0, -3.0, 4.0)
+        val rotatedByQ = rotate(vector, q)
+        val matrix = q.toRotationMatrix()
+        val rotatedByM = rotate(vector,matrix)
+
+        assertBufferEquals(rotatedByQ, rotatedByM, 1e-4)
+    }
+
+    @Test
+    fun rotationConversion() {
+
+        val q = Quaternion(1.0, 2.0, -3.0, 4.0)
+
+        val matrix = q.toRotationMatrix()
+
+        assertEquals(q, Quaternion.fromRotationMatrix(matrix))
+    }
+}
\ No newline at end of file
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
index ecfd8d098..ad7a978a0 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
@@ -7,6 +7,7 @@ import org.tensorflow.op.core.Constant
 import org.tensorflow.types.TFloat64
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.DefaultStrides
 import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
@@ -74,6 +75,7 @@ public class DoubleTensorFlowAlgebra internal constructor(
  *
  * The resulting tensor is available outside of scope
  */
+@UnstableKMathAPI
 public fun DoubleField.produceWithTF(
     block: DoubleTensorFlowAlgebra.() -> StructureND<Double>,
 ): StructureND<Double> = Graph().use { graph ->
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b14c594b4..e3c621e9a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -20,6 +20,7 @@ dependencyResolutionManagement {
 }
 
 include(
+    ":test-utils",
     ":kmath-memory",
     ":kmath-complex",
     ":kmath-core",
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
new file mode 100644
index 000000000..88c7ea9d0
--- /dev/null
+++ b/test-utils/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    id("ru.mipt.npm.gradle.mpp")
+    id("ru.mipt.npm.gradle.native")
+}
+
+kotlin.sourceSets {
+    commonMain {
+        dependencies {
+            api(projects.kmath.kmathCore)
+            api(kotlin("test"))
+        }
+    }
+}
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/AlgebraicVerifier.kt b/test-utils/src/commonMain/kotlin/AlgebraicVerifier.kt
similarity index 100%
rename from kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/AlgebraicVerifier.kt
rename to test-utils/src/commonMain/kotlin/AlgebraicVerifier.kt
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt b/test-utils/src/commonMain/kotlin/FieldVerifier.kt
similarity index 96%
rename from kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt
rename to test-utils/src/commonMain/kotlin/FieldVerifier.kt
index 20a7b6a72..f4ca7506b 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/FieldVerifier.kt
+++ b/test-utils/src/commonMain/kotlin/FieldVerifier.kt
@@ -10,7 +10,7 @@ import space.kscience.kmath.operations.invoke
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
 
-internal class FieldVerifier<T, out A : Field<T>>(
+public class FieldVerifier<T, out A : Field<T>>(
     algebra: A, a: T, b: T, c: T, x: Number,
 ) : RingVerifier<T, A>(algebra, a, b, c, x) {
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt b/test-utils/src/commonMain/kotlin/RingVerifier.kt
similarity index 95%
rename from kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt
rename to test-utils/src/commonMain/kotlin/RingVerifier.kt
index daf18834a..14606cb2c 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/RingVerifier.kt
+++ b/test-utils/src/commonMain/kotlin/RingVerifier.kt
@@ -10,7 +10,7 @@ import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
 import kotlin.test.assertEquals
 
-internal open class RingVerifier<T, out A>(algebra: A, a: T, b: T, c: T, x: Number) :
+public open class RingVerifier<T, out A>(algebra: A, a: T, b: T, c: T, x: Number) :
     SpaceVerifier<T, A>(algebra, a, b, c, x) where A : Ring<T>, A : ScaleOperations<T> {
 
     override fun verify() {
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/SpaceVerifier.kt b/test-utils/src/commonMain/kotlin/SpaceVerifier.kt
similarity index 93%
rename from kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/SpaceVerifier.kt
rename to test-utils/src/commonMain/kotlin/SpaceVerifier.kt
index 951197fc6..d761a3775 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/testutils/SpaceVerifier.kt
+++ b/test-utils/src/commonMain/kotlin/SpaceVerifier.kt
@@ -11,12 +11,12 @@ import space.kscience.kmath.operations.invoke
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
 
-internal open class SpaceVerifier<T, out S>(
+public open class SpaceVerifier<T, out S>(
     override val algebra: S,
-    val a: T,
-    val b: T,
-    val c: T,
-    val x: Number,
+    public val a: T,
+    public val b: T,
+    public val c: T,
+    public val x: Number,
 ) : AlgebraicVerifier<T, Ring<T>> where S : Ring<T>, S : ScaleOperations<T> {
     override fun verify() {
         algebra {
diff --git a/test-utils/src/commonMain/kotlin/asserts.kt b/test-utils/src/commonMain/kotlin/asserts.kt
new file mode 100644
index 000000000..8e7d1ae23
--- /dev/null
+++ b/test-utils/src/commonMain/kotlin/asserts.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.testutils
+
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.indices
+import kotlin.test.assertEquals
+import kotlin.test.fail
+
+public fun assertBufferEquals(expected: Buffer<Double>, result: Buffer<Double>, tolerance: Double = 1e-4) {
+    if (expected.size != result.size) {
+        fail("Expected size is ${expected.size}, but the result size is ${result.size}")
+    }
+    expected.indices.forEach {
+        assertEquals(expected[it], result[it], tolerance)
+    }
+}
\ No newline at end of file
-- 
2.34.1


From b09127f090c2b9df283eae2bbf689a38bae9b8f0 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Tue, 14 Jun 2022 22:52:47 +0700
Subject: [PATCH 531/713] Fix name clash in strict mode; replace eval with new
 Function

---
 .../space/kscience/kmath/estree/estree.kt     |  2 +-
 .../kmath/estree/internal/ESTreeBuilder.kt    | 28 +++++++------------
 .../internal/estree/estree.extensions.kt      |  5 +++-
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
index a8b1aa2e1..240acf1d7 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
@@ -36,7 +36,7 @@ public fun <T : Any> MST.compileToExpression(algebra: Algebra<T>): Expression<T>
         )
     }
 
-    return ESTreeBuilder<T> { visit(typed) }.instance
+    return ESTreeBuilder { visit(typed) }.instance
 }
 
 /**
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
index 40c446da0..16a59d273 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
@@ -14,37 +14,28 @@ internal class ESTreeBuilder<T>(val bodyCallback: ESTreeBuilder<T>.() -> BaseExp
     private class GeneratedExpression<T>(val executable: dynamic, val constants: Array<dynamic>) : Expression<T> {
         @Suppress("UNUSED_VARIABLE")
         override fun invoke(arguments: Map<Symbol, T>): T {
-            //val e = executable
-            //val c = constants
+            val e = executable
+            val c = constants
             val a = js("{}")
             arguments.forEach { (key, value) -> a[key.identity] = value }
-            return executable.call(constants, a).unsafeCast<T>()
-            //return js("e(c, a)").unsafeCast<T>()
+            return js("e(c, a)").unsafeCast<T>()
         }
     }
 
+    @Suppress("UNUSED_VARIABLE")
     val instance: Expression<T> by lazy {
         val node = Program(
             sourceType = "script",
-            VariableDeclaration(
-                kind = "var",
-                VariableDeclarator(
-                    id = Identifier("executable"),
-                    init = FunctionExpression(
-                        params = arrayOf(Identifier("constants"), Identifier("arguments")),
-                        body = BlockStatement(ReturnStatement(bodyCallback())),
-                    ),
-                ),
-            ),
+            ReturnStatement(bodyCallback())
         )
 
-        eval(generate(node))
-        GeneratedExpression(js("executable"), constants.toTypedArray())
+        val code = generate(node)
+        GeneratedExpression(js("new Function('constants', 'arguments_0', code)"), constants.toTypedArray())
     }
 
     private val constants = mutableListOf<Any>()
 
-    fun constant(value: Any?) = when {
+    fun constant(value: Any?): BaseExpression = when {
         value == null || jsTypeOf(value) == "number" || jsTypeOf(value) == "string" || jsTypeOf(value) == "boolean" ->
             SimpleLiteral(value)
 
@@ -62,7 +53,8 @@ internal class ESTreeBuilder<T>(val bodyCallback: ESTreeBuilder<T>.() -> BaseExp
         }
     }
 
-    fun variable(name: Symbol): BaseExpression = call(getOrFail, Identifier("arguments"), SimpleLiteral(name.identity))
+    fun variable(name: Symbol): BaseExpression =
+        call(getOrFail, Identifier("arguments_0"), SimpleLiteral(name.identity))
 
     fun call(function: Function<T>, vararg args: BaseExpression): BaseExpression = SimpleCallExpression(
         optional = false,
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
index 3aa31f921..5b1ce914e 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("unused")
+
 package space.kscience.kmath.internal.estree
 
 internal fun Program(sourceType: String, vararg body: dynamic) = object : Program {
@@ -28,9 +30,10 @@ internal fun Identifier(name: String) = object : Identifier {
     override var name = name
 }
 
-internal fun FunctionExpression(params: Array<dynamic>, body: BlockStatement) = object : FunctionExpression {
+internal fun FunctionExpression(id: Identifier?, params: Array<dynamic>, body: BlockStatement) = object : FunctionExpression {
     override var params = params
     override var type = "FunctionExpression"
+    override var id: Identifier? = id
     override var body = body
 }
 
-- 
2.34.1


From d0134bdbe9eb65b45f3764c775e657ee0186d163 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 14 Jun 2022 19:15:36 +0300
Subject: [PATCH 532/713] Sift 4. Cleaned up "numbered" case. Tests are in
 progress.

---
 .../kmath/operations/bufferOperation.kt       |   9 +
 .../kmath/functions/ListPolynomial.kt         |  24 +-
 .../kmath/functions/ListRationalFunction.kt   |  34 +-
 .../kmath/functions/NumberedPolynomial.kt     | 429 +++++++++++++++
 .../functions/NumberedRationalFunction.kt     | 239 ++++++++
 .../kmath/functions/RationalFunction.kt       |   8 +
 .../kscience/kmath/functions/listUtil.kt      |  43 +-
 .../kmath/functions/numberedConstructors.kt   | 478 ++++++++++++++++
 .../kscience/kmath/functions/numberedUtil.kt  | 515 ++++++++++++++++++
 9 files changed, 1724 insertions(+), 55 deletions(-)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
index 31b0c2841..762f08be1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
@@ -91,6 +91,15 @@ public inline fun <T : Any, R> Buffer<T>.fold(initial: R, operation: (acc: R, T)
     return accumulator
 }
 
+/**
+ * Fold given buffer according to indexed [operation]
+ */
+public inline fun <T : Any, R> Buffer<T>.foldIndexed(initial: R, operation: (index: Int, acc: R, T) -> R): R {
+    var accumulator = initial
+    for (index in this.indices) accumulator = operation(index, accumulator, get(index))
+    return accumulator
+}
+
 /**
  * Zip two buffers using given [transform].
  */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index fce179fc8..42e3f7301 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -48,8 +48,8 @@ public data class ListPolynomial<C>(
 }
 
 /**
- * Arithmetic context for univariate polynomials with coefficients stored as a [List] constructed with the given [ring]
- * of constants.
+ * Arithmetic context for univariate polynomials with coefficients stored as a [List] constructed with the provided
+ * [ring] of constants.
  *
  * @param C the type of constants. Polynomials have them a coefficients in their terms.
  * @param A type of provided underlying ring of constants. It's [Ring] of [C].
@@ -313,6 +313,10 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
             }
         )
     }
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */ // TODO: To optimize boxing
+    override fun power(arg: ListPolynomial<C>, exponent: UInt): ListPolynomial<C> = super.power(arg, exponent)
 
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
@@ -332,42 +336,42 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
     // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
     //  [ListPolynomialSpace] as a context receiver
     /**
-     * Evaluates value of [this] polynomial on provided argument.
+     * Evaluates value of [this] polynomial on provided [argument].
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.substitute(argument: C): C = this.substitute(ring, argument)
+    public inline fun ListPolynomial<C>.substitute(argument: C): C = substitute(ring, argument)
     /**
      * Substitutes provided polynomial [argument] into [this] polynomial.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
+    public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
 
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunction(): (C) -> C = { this.substitute(ring, it) }
+    public inline fun ListPolynomial<C>.asFunction(): (C) -> C = asFunctionOver(ring)
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = { this.substitute(ring, it) }
+    public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = asFunctionOfConstantOver(ring)
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = { this.substitute(ring, it) }
+    public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = asFunctionOfPolynomialOver(ring)
 
     /**
      * Evaluates value of [this] polynomial on provided [argument].
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun ListPolynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
+    public inline operator fun ListPolynomial<C>.invoke(argument: C): C = substitute(ring, argument)
     /**
      * Evaluates value of [this] polynomial on provided [argument].
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
+    public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
 }
 
 /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
index f3e352bcd..e23baa548 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
@@ -9,7 +9,7 @@ import space.kscience.kmath.operations.Ring
 
 
 /**
- * Represents rational function that stores its numerator and denominator as [ListPolynomial]s.
+ * Represents univariate rational function that stores its numerator and denominator as [ListPolynomial]s.
  */
 public data class ListRationalFunction<C>(
     public override val numerator: ListPolynomial<C>,
@@ -56,82 +56,82 @@ public class ListRationalFunctionSpace<C, A : Ring<C>> (
      * Evaluates value of [this] polynomial on provided argument.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.substitute(argument: C): C = this.substitute(ring, argument)
+    public inline fun ListPolynomial<C>.substitute(argument: C): C = substitute(ring, argument)
     /**
      * Substitutes provided polynomial [argument] into [this] polynomial.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
+    public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
     /**
      * Substitutes provided rational function [argument] into [this] polynomial.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.substitute(argument: ListRationalFunction<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    public inline fun ListPolynomial<C>.substitute(argument: ListRationalFunction<C>): ListRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided polynomial [argument] into [this] rational function.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListRationalFunction<C>.substitute(argument: ListPolynomial<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    public inline fun ListRationalFunction<C>.substitute(argument: ListPolynomial<C>): ListRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided rational function [argument] into [this] rational function.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListRationalFunction<C>.substitute(argument: ListRationalFunction<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    public inline fun ListRationalFunction<C>.substitute(argument: ListRationalFunction<C>): ListRationalFunction<C> = substitute(ring, argument)
 
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunction(): (C) -> C = { this.substitute(ring, it) }
+    public inline fun ListPolynomial<C>.asFunction(): (C) -> C = { substitute(ring, it) }
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = { this.substitute(ring, it) }
+    public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = { substitute(ring, it) }
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = { this.substitute(ring, it) }
+    public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListPolynomial<C>.asFunctionOfRationalFunction(): (ListRationalFunction<C>) -> ListRationalFunction<C> = { this.substitute(ring, it) }
+    public inline fun ListPolynomial<C>.asFunctionOfRationalFunction(): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
     /**
      * Represent [this] rational function as a regular context-less function.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListRationalFunction<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListRationalFunction<C> = { this.substitute(ring, it) }
+    public inline fun ListRationalFunction<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
     /**
      * Represent [this] rational function as a regular context-less function.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline fun ListRationalFunction<C>.asFunctionOfRationalFunction(): (ListRationalFunction<C>) -> ListRationalFunction<C> = { this.substitute(ring, it) }
+    public inline fun ListRationalFunction<C>.asFunctionOfRationalFunction(): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
 
     /**
      * Evaluates value of [this] polynomial on provided argument.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun ListPolynomial<C>.invoke(argument: C): C = this.substitute(ring, argument)
+    public inline operator fun ListPolynomial<C>.invoke(argument: C): C = substitute(ring, argument)
     /**
      * Evaluates value of [this] polynomial on provided argument.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = this.substitute(ring, argument)
+    public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
     /**
      * Evaluates value of [this] polynomial on provided argument.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun ListPolynomial<C>.invoke(argument: ListRationalFunction<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    public inline operator fun ListPolynomial<C>.invoke(argument: ListRationalFunction<C>): ListRationalFunction<C> = substitute(ring, argument)
     /**
      * Evaluates value of [this] rational function on provided argument.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun ListRationalFunction<C>.invoke(argument: ListPolynomial<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    public inline operator fun ListRationalFunction<C>.invoke(argument: ListPolynomial<C>): ListRationalFunction<C> = substitute(ring, argument)
     /**
      * Evaluates value of [this] rational function on provided argument.
      */
     @Suppress("NOTHING_TO_INLINE")
-    public inline operator fun ListRationalFunction<C>.invoke(argument: ListRationalFunction<C>): ListRationalFunction<C> = this.substitute(ring, argument)
+    public inline operator fun ListRationalFunction<C>.invoke(argument: ListRationalFunction<C>): ListRationalFunction<C> = substitute(ring, argument)
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
new file mode 100644
index 000000000..9304e66da
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -0,0 +1,429 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.structures.Buffer
+import kotlin.jvm.JvmName
+import kotlin.math.max
+
+
+/**
+ * Represents univariate polynomial that stores its coefficients in a [Map] and terms' signatures in a [List].
+ *
+ * @param C the type of constants.
+ */
+public data class NumberedPolynomial<C>
+@PublishedApi
+internal constructor(
+    /**
+     * Map that contains coefficients of the polynomial. Every monomial `a x_1^{d_1} ... x_n^{d_n}` is stored as pair
+     * "key-value" in the map, where the value is the coefficients `a` and the key is a list that associates index of
+     * every variable in the monomial with multiplicity of the variable occurring in the monomial. For example
+     * coefficients of a polynomial `5 x_1^2 x_3^3 - 6 x_2` can be represented as
+     * ```
+     * mapOf(
+     *      listOf(2, 0, 3) to 5, // 5 x_1^2 x_3^3 +
+     *      listOf(0, 1) to (-6), // (-6) x_2^1
+     * )
+     * ```
+     * and also as
+     * ```
+     * mapOf(
+     *      listOf(2, 0, 3) to 5, // 5 x_1^2 x_3^3 +
+     *      listOf(0, 1) to (-6), // (-6) x_2^1
+     *      listOf(0, 1, 1) to 0, // 0 x_2^1 x_3^1
+     * )
+     * ```
+     * It is not prohibited to put extra zero monomials into the map (as for `0 x_2 x_3` in the example). But the
+     * bigger the coefficients map the worse performance of arithmetical operations performed on it. Thus, it is
+     * recommended not to put (or even to remove) extra (or useless) monomials in the coefficients map.
+     */
+    public val coefficients: Map<List<UInt>, C>
+) : Polynomial<C> {
+    override fun toString(): String = "NumberedPolynomial$coefficients"
+}
+
+/**
+ * Arithmetic context for multivariate polynomials with coefficients stored as a [Map] and terms' signatures stored as a
+ * [List] constructed with the provided [ring] of constants.
+ *
+ * @param C the type of constants. Polynomials have them a coefficients in their terms.
+ * @param A type of provided underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
+ */
+public class NumberedPolynomialSpace<C, A : Ring<C>>(
+    public override val ring: A,
+) : PolynomialSpaceOverRing<C, NumberedPolynomial<C>, A> {
+    /**
+     * Returns sum of the polynomial and the integer represented as a polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public override operator fun NumberedPolynomial<C>.plus(other: Int): NumberedPolynomial<C> =
+        if (other == 0) this
+        else
+            NumberedPolynomialAsIs(
+                coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        this[degs] = getOrElse(degs) { constantZero } + other
+                    }
+            )
+    /**
+     * Returns difference between the polynomial and the integer represented as a polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public override operator fun NumberedPolynomial<C>.minus(other: Int): NumberedPolynomial<C> =
+        if (other == 0) this
+        else
+            NumberedPolynomialAsIs(
+                coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        this[degs] = getOrElse(degs) { constantZero } - other
+                    }
+            )
+    /**
+     * Returns product of the polynomial and the integer represented as a polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun NumberedPolynomial<C>.times(other: Int): NumberedPolynomial<C> =
+        if (other == 0) zero
+        else NumberedPolynomialAsIs(
+            coefficients
+                .toMutableMap()
+                .apply {
+                    for (degs in keys) this[degs] = this[degs]!! * other
+                }
+        )
+
+    /**
+     * Returns sum of the integer represented as a polynomial and the polynomial.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public override operator fun Int.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this == 0) other
+        else
+            NumberedPolynomialAsIs(
+                other.coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        this[degs] = this@plus + getOrElse(degs) { constantZero }
+                    }
+            )
+    /**
+     * Returns difference between the integer represented as a polynomial and the polynomial.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public override operator fun Int.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this == 0) other
+        else
+            NumberedPolynomialAsIs(
+                other.coefficients
+                    .toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        this[degs] = this@minus - getOrElse(degs) { constantZero }
+                    }
+            )
+    /**
+     * Returns product of the integer represented as a polynomial and the polynomial.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        if (this == 0) zero
+        else NumberedPolynomialAsIs(
+            other.coefficients
+                .toMutableMap()
+                .apply {
+                    for (degs in keys) this[degs] = this@times * this[degs]!!
+                }
+        )
+
+    /**
+     * Converts the integer [value] to polynomial.
+     */
+    public override fun number(value: Int): NumberedPolynomial<C> = number(constantNumber(value))
+
+    /**
+     * Returns sum of the constant represented as a polynomial and the polynomial.
+     */
+    override operator fun C.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to this@plus))
+            else NumberedPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        this[degs] = this@plus + getOrElse(degs) { constantZero }
+                    }
+            )
+        }
+    /**
+     * Returns difference between the constant represented as a polynomial and the polynomial.
+     */
+    override operator fun C.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to this@minus))
+            else NumberedPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
+
+                        val degs = emptyList<UInt>()
+
+                        this[degs] = this@minus - getOrElse(degs) { constantZero }
+                    }
+            )
+        }
+    /**
+     * Returns product of the constant represented as a polynomial and the polynomial.
+     */
+    override operator fun C.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        NumberedPolynomialAsIs(
+            other.coefficients
+                .toMutableMap()
+                .apply {
+                    for (degs in keys) this[degs] = this@times * this[degs]!!
+                }
+        )
+
+    /**
+     * Returns sum of the constant represented as a polynomial and the polynomial.
+     */
+    override operator fun NumberedPolynomial<C>.plus(other: C): NumberedPolynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to other))
+            else NumberedPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        this[degs] = getOrElse(degs) { constantZero } + other
+                    }
+            )
+        }
+    /**
+     * Returns difference between the constant represented as a polynomial and the polynomial.
+     */
+    override operator fun NumberedPolynomial<C>.minus(other: C): NumberedPolynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to other))
+            else NumberedPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyList<UInt>()
+
+                        this[degs] = getOrElse(degs) { constantZero } - other
+                    }
+            )
+        }
+    /**
+     * Returns product of the constant represented as a polynomial and the polynomial.
+     */
+    override operator fun NumberedPolynomial<C>.times(other: C): NumberedPolynomial<C> =
+        NumberedPolynomialAsIs(
+            coefficients
+                .toMutableMap()
+                .apply {
+                    for (degs in keys) this[degs] = this[degs]!! * other
+                }
+        )
+
+    /**
+     * Converts the constant [value] to polynomial.
+     */
+    public override fun number(value: C): NumberedPolynomial<C> =
+        NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to value))
+
+    /**
+     * Returns negation of the polynomial.
+     */
+    override fun NumberedPolynomial<C>.unaryMinus(): NumberedPolynomial<C> =
+        NumberedPolynomialAsIs(
+            coefficients.mapValues { -it.value }
+        )
+    /**
+     * Returns sum of the polynomials.
+     */
+    override operator fun NumberedPolynomial<C>.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        NumberedPolynomialAsIs(
+            buildMap(coefficients.size + other.coefficients.size) {
+                other.coefficients.mapValuesTo(this) { it.value }
+                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
+            }
+        )
+    /**
+     * Returns difference of the polynomials.
+     */
+    override operator fun NumberedPolynomial<C>.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        NumberedPolynomialAsIs(
+            buildMap(coefficients.size + other.coefficients.size) {
+                other.coefficients.mapValuesTo(this) { it.value }
+                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
+            }
+        )
+    /**
+     * Returns product of the polynomials.
+     */
+    override operator fun NumberedPolynomial<C>.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
+        NumberedPolynomialAsIs(
+            buildMap(coefficients.size * other.coefficients.size) {
+                for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
+                    val degs =
+                        (0..max(degs1.lastIndex, degs2.lastIndex))
+                            .map { degs1.getOrElse(it) { 0U } + degs2.getOrElse(it) { 0U } }
+                    val c = c1 * c2
+                    this[degs] = if (degs in this) this[degs]!! + c else c
+                }
+            }
+        )
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */ // TODO: To optimize boxing
+    override fun power(arg: NumberedPolynomial<C>, exponent: UInt): NumberedPolynomial<C> = super.power(arg, exponent)
+
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
+    override val zero: NumberedPolynomial<C> = NumberedPolynomialAsIs(emptyMap())
+    /**
+     * Instance of unit polynomial (unit of the polynomial ring).
+     */
+    override val one: NumberedPolynomial<C> by lazy {
+        NumberedPolynomialAsIs(
+            mapOf(
+                emptyList<UInt>() to constantOne // 1 * x_1^0 * x_2^0 * ...
+            )
+        )
+    }
+
+    /**
+     * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
+     * the result is `-1`.
+     */
+    public val NumberedPolynomial<C>.lastVariable: Int
+        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.lastIndex } ?: -1
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    override val NumberedPolynomial<C>.degree: Int
+        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.sum().toInt() } ?: -1
+    /**
+     * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
+     * exponents in which the variables are appeared in the polynomial.
+     *
+     * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
+     * And last index of the list is [lastVariable].
+     */
+    public val NumberedPolynomial<C>.degrees: List<UInt>
+        get() =
+            MutableList(lastVariable + 1) { 0u }.apply {
+                coefficients.entries.forEach { (degs, _) ->
+                    degs.forEachIndexed { index, deg ->
+                        this[index] = max(this[index], deg)
+                    }
+                }
+            }
+    /**
+     * Counts degree of the polynomial by the specified [variable].
+     */
+    public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt =
+        coefficients.entries.maxOfOrNull { (degs, _) -> degs.getOrElse(variable) { 0u } } ?: 0u
+    /**
+     * Counts degree of the polynomial by the specified [variables].
+     */
+    public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt =
+        coefficients.entries.maxOfOrNull { (degs, _) ->
+            degs.withIndex().filter { (index, _) -> index in variables }.sumOf { it.value }
+        } ?: 0u
+    /**
+     * Count of variables occurring in the polynomial with positive power. If there is no such variable,
+     * the result is `0`.
+     */
+    public val NumberedPolynomial<C>.countOfVariables: Int
+        get() =
+            MutableList(lastVariable + 1) { false }.apply {
+                coefficients.entries.forEach { (degs, _) ->
+                    degs.forEachIndexed { index, deg ->
+                        if (deg != 0u) this[index] = true
+                    }
+                }
+            }.count { it }
+
+    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
+    //  [ListPolynomialSpace] as a context receiver
+    /**
+     * Substitutes provided arguments [arguments] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.substitute(arguments: Map<Int, C>): NumberedPolynomial<C> = substitute(ring, arguments)
+    /**
+     * Substitutes provided arguments [arguments] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substitutePolynomial")
+    public inline fun NumberedPolynomial<C>.substitute(arguments: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> = substitute(ring, arguments)
+    /**
+     * Substitutes provided arguments [arguments] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.substitute(arguments: Buffer<C>): NumberedPolynomial<C> = substitute(ring, arguments)
+    /**
+     * Substitutes provided arguments [arguments] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substitutePolynomial")
+    public inline fun NumberedPolynomial<C>.substitute(arguments: Buffer<NumberedPolynomial<C>>) : NumberedPolynomial<C> = substitute(ring, arguments)
+    /**
+     * Substitutes provided arguments [arguments] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.substituteFully(arguments: Buffer<C>): C = this.substituteFully(ring, arguments)
+
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.asFunction(): (Buffer<C>) -> C = asFunctionOver(ring)
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.asFunctionOfConstant(): (Buffer<C>) -> C = asFunctionOfConstantOver(ring)
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.asFunctionOfPolynomial(): (Buffer<NumberedPolynomial<C>>) -> NumberedPolynomial<C> = asFunctionOfPolynomialOver(ring)
+
+    /**
+     * Evaluates value of [this] polynomial on provided [arguments].
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<C>): C = substituteFully(ring, arguments)
+    /**
+     * Substitutes provided [arguments] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("invokePolynomial")
+    public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, arguments)
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
new file mode 100644
index 000000000..a2986879d
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.Buffer
+import kotlin.jvm.JvmName
+import kotlin.math.max
+
+
+/**
+ * Represents multivariate rational function that stores its numerator and denominator as [NumberedPolynomial]s.
+ */
+public class NumberedRationalFunction<C> internal constructor(
+    public override val numerator: NumberedPolynomial<C>,
+    public override val denominator: NumberedPolynomial<C>
+) : RationalFunction<C, NumberedPolynomial<C>> {
+    override fun toString(): String = "NumberedRationalFunction${numerator.coefficients}/${denominator.coefficients}"
+}
+
+/**
+ * Arithmetic context for univariate rational functions with numerator and denominator represented as [NumberedPolynomial]s.
+ *
+ * @param C the type of constants. Polynomials have them a coefficients in their terms.
+ * @param A type of provided underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
+ */
+public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
+    public val ring: A,
+) :
+    RationalFunctionalSpaceOverPolynomialSpace<
+            C,
+            NumberedPolynomial<C>,
+            NumberedRationalFunction<C>,
+            NumberedPolynomialSpace<C, A>,
+            >,
+    PolynomialSpaceOfFractions<
+            C,
+            NumberedPolynomial<C>,
+            NumberedRationalFunction<C>,
+            >() {
+
+    /**
+     * Underlying polynomial ring. Its polynomial operations are inherited by local polynomial operations.
+     */
+    public override val polynomialRing : NumberedPolynomialSpace<C, A> = NumberedPolynomialSpace(ring)
+    /**
+     * Constructor of rational functions (of type [NumberedRationalFunction]) from numerator and denominator (of type [NumberedPolynomial]).
+     */
+    protected override fun constructRationalFunction(
+        numerator: NumberedPolynomial<C>,
+        denominator: NumberedPolynomial<C>
+    ): NumberedRationalFunction<C> =
+        NumberedRationalFunction(numerator, denominator)
+
+    /**
+     * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
+     * the result is `-1`.
+     */
+    public val NumberedPolynomial<C>.lastVariable: Int get() = polynomialRing { lastVariable }
+    /**
+     * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
+     * exponents in which the variables are appeared in the polynomial.
+     *
+     * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
+     * And last index of the list is [lastVariable].
+     */
+    public val NumberedPolynomial<C>.degrees: List<UInt> get() = polynomialRing { degrees }
+    /**
+     * Counts degree of the polynomial by the specified [variable].
+     */
+    public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt = polynomialRing { degreeBy(variable) }
+    /**
+     * Counts degree of the polynomial by the specified [variables].
+     */
+    public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt = polynomialRing { degreeBy(variables) }
+    /**
+     * Count of variables occurring in the polynomial with positive power. If there is no such variable,
+     * the result is `0`.
+     */
+    public val NumberedPolynomial<C>.countOfVariables: Int get() = polynomialRing { countOfVariables }
+
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val NumberedRationalFunction<C>.lastVariable: Int
+        get() = polynomialRing { max(numerator.lastVariable, denominator.lastVariable) }
+    /**
+     * Count of variables occurring in the rational function with positive power. If there is no such variable,
+     * the result is `0`.
+     */
+    public val NumberedRationalFunction<C>.countOfVariables: Int
+        get() =
+            MutableList(lastVariable + 1) { false }.apply {
+                numerator.coefficients.entries.forEach { (degs, _) ->
+                    degs.forEachIndexed { index, deg ->
+                        if (deg != 0u) this[index] = true
+                    }
+                }
+                denominator.coefficients.entries.forEach { (degs, _) ->
+                    degs.forEachIndexed { index, deg ->
+                        if (deg != 0u) this[index] = true
+                    }
+                }
+            }.count { it }
+
+    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
+    //  [ListPolynomialSpace] as a context receiver
+    /**
+     * Substitutes provided constant [argument] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, C>): NumberedPolynomial<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided polynomial [argument] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided rational function [argument] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided constant [argument] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedRationalFunction<C>.substitute(argument: Map<Int, C>): NumberedRationalFunction<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided polynomial [argument] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedRationalFunction<C>.substitute(argument: Map<Int, NumberedPolynomial<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided rational function [argument] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedRationalFunction<C>.substitute(argument: Map<Int, NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided constant [argument] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.substitute(argument: Buffer<C>): NumberedPolynomial<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided polynomial [argument] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.substitute(argument: Buffer<NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided rational function [argument] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.substitute(argument: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided constant [argument] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedRationalFunction<C>.substitute(argument: Buffer<C>): NumberedRationalFunction<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided polynomial [arguments] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedRationalFunction<C>.substitute(arguments: Buffer<NumberedPolynomial<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
+    /**
+     * Substitutes provided rational function [arguments] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedRationalFunction<C>.substitute(arguments: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
+    /**
+     * Substitutes provided constant [arguments] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.substituteFully(arguments: Buffer<C>): C = substituteFully(ring, arguments)
+
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.asFunction(): (Buffer<C>) -> C = asFunctionOver(ring)
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.asFunctionOfConstant(): (Buffer<C>) -> C = asFunctionOfConstantOver(ring)
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.asFunctionOfPolynomial(): (Buffer<NumberedPolynomial<C>>) -> NumberedPolynomial<C> = asFunctionOfPolynomialOver(ring)
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedPolynomial<C>.asFunctionOfRationalFunction(): (Buffer<NumberedRationalFunction<C>>) -> NumberedRationalFunction<C> = asFunctionOfRationalFunctionOver(ring)
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedRationalFunction<C>.asFunctionOfPolynomial(): (Buffer<NumberedPolynomial<C>>) -> NumberedRationalFunction<C> = asFunctionOfPolynomialOver(ring)
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun NumberedRationalFunction<C>.asFunctionOfRationalFunction(): (Buffer<NumberedRationalFunction<C>>) -> NumberedRationalFunction<C> = asFunctionOfRationalFunctionOver(ring)
+
+    /**
+     * Evaluates value of [this] polynomial on provided [arguments].
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<C>): C = substituteFully(ring, arguments)
+    /**
+     * Substitutes provided [arguments] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("invokePolynomial")
+    public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, arguments)
+    /**
+     * Substitutes provided [arguments] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("invokePolynomial")
+    public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
+    /**
+     * Substitutes provided [arguments] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("invokePolynomial")
+    public inline operator fun NumberedRationalFunction<C>.invoke(arguments: Buffer<NumberedPolynomial<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
+    /**
+     * Substitutes provided [arguments] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("invokePolynomial")
+    public inline operator fun NumberedRationalFunction<C>.invoke(arguments: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 01911f980..338ae9935 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -1076,6 +1076,14 @@ public abstract class PolynomialSpaceOfFractions<
             numerator * other.denominator,
             denominator * other.numerator
         )
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    public override fun power(arg: R, exponent: UInt): R =
+        constructRationalFunction(
+            power(arg.numerator, exponent),
+            power(arg.denominator, exponent),
+        )
 
     /**
      * Instance of zero rational function (zero of the rational functions ring).
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
index 127dd8c7a..649fc48bd 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
@@ -147,12 +147,17 @@ public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOver(ring: A): (C) -> C
 /**
  * Represent [this] polynomial as a regular context-less function.
  */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asPolynomialFunctionOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
+public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfConstantOver(ring: A): (C) -> C = { substitute(ring, it) }
 
 /**
  * Represent [this] polynomial as a regular context-less function.
  */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfRationalFunctionOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
+public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfPolynomialOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfRationalFunctionOver(ring: A): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
 
 /**
  * Represent [this] rational function as a regular context-less function.
@@ -162,12 +167,17 @@ public fun <C, A : Field<C>> ListRationalFunction<C>.asFunctionOver(ring: A): (C
 /**
  * Represent [this] rational function as a regular context-less function.
  */
-public fun <C, A : Ring<C>> ListRationalFunction<C>.asPolynomialFunctionOver(ring: A): (ListPolynomial<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
+public fun <C, A : Field<C>> ListRationalFunction<C>.asFunctionOfConstantOver(ring: A): (C) -> C = { substitute(ring, it) }
 
 /**
  * Represent [this] rational function as a regular context-less function.
  */
-public fun <C, A : Ring<C>> ListRationalFunction<C>.asFunctionOfRationalFunctionOver(ring: A): (ListPolynomial<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
+public fun <C, A : Ring<C>> ListRationalFunction<C>.asFunctionOfPolynomialOver(ring: A): (ListPolynomial<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListRationalFunction<C>.asFunctionOfRationalFunctionOver(ring: A): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
 
 /**
  * Returns algebraic derivative of received polynomial.
@@ -242,27 +252,4 @@ public fun <C : Comparable<C>> ListPolynomial<C>.integrate(
 ): C = ring {
     val antiderivative = antiderivative(ring)
     antiderivative.substitute(ring, range.endInclusive) - antiderivative.substitute(ring, range.start)
-}
-
-/**
- * Returns algebraic derivative of received rational function.
- */
-@UnstableKMathAPI
-public fun <C, A> ListRationalFunction<C>.derivative(
-    ring: A,
-): ListRationalFunction<C> where  A : Ring<C>, A : NumericAlgebra<C> = ring.listRationalFunctionSpace {
-    ListRationalFunction(
-        numerator.derivative(ring) * denominator - numerator * denominator.derivative(ring),
-        denominator * denominator
-    )
-}
-
-/**
- * Returns algebraic derivative of received rational function of specified [order]. The [order] should be non-negative integer.
- */
-@UnstableKMathAPI
-public tailrec fun <C, A> ListRationalFunction<C>.nthDerivative(
-    ring: A,
-    order: Int,
-): ListRationalFunction<C> where A : Ring<C>, A : NumericAlgebra<C> =
-    if (order == 0) this else derivative(ring).nthDerivative(ring, order - 1)
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
new file mode 100644
index 000000000..05fff3472
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
@@ -0,0 +1,478 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Ring
+
+
+/**
+ * Returns the same degrees' description of the monomial, but without extra zero degrees on the end.
+ */
+internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
+
+/**
+ * Constructs [NumberedPolynomial] with provided coefficients map [coefs]. The map is used as is.
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+@PublishedApi
+internal inline fun <C> NumberedPolynomialAsIs(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial<C>(coefs)
+
+/**
+ * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ * The collections will be transformed to map with [toMap] and then will be used as is.
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+@PublishedApi
+internal inline fun <C> NumberedPolynomialAsIs(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial<C>(pairs.toMap())
+
+/**
+ * Constructs [NumberedPolynomial] with provided array of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ * The array will be transformed to map with [toMap] and then will be used as is.
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+@PublishedApi
+internal inline fun <C> NumberedPolynomialAsIs(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial<C>(pairs.toMap())
+
+/**
+ * Constructs [NumberedPolynomial] with provided coefficients map [coefs].
+ *
+ * [coefs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName")
+public fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>, add: (C, C) -> C) : NumberedPolynomial<C> {
+    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+
+    for (entry in coefs) {
+        val key = entry.key.cleanUp()
+        val value = entry.value
+        fixedCoefs[key] = if (key in fixedCoefs) add(fixedCoefs[key]!!, value) else value
+    }
+
+    return NumberedPolynomial<C>(fixedCoefs)
+}
+
+/**
+ * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName")
+public fun <C> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, add: (C, C) -> C) : NumberedPolynomial<C> {
+    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+
+    for (entry in pairs) {
+        val key = entry.first.cleanUp()
+        val value = entry.second
+        fixedCoefs[key] = if (key in fixedCoefs) add(fixedCoefs[key]!!, value) else value
+    }
+
+    return NumberedPolynomial<C>(fixedCoefs)
+}
+
+/**
+ * Constructs [NumberedPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName")
+public fun <C> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, add: (C, C) -> C) : NumberedPolynomial<C> {
+    val fixedCoefs = mutableMapOf<List<UInt>, C>()
+
+    for (entry in pairs) {
+        val key = entry.first.cleanUp()
+        val value = entry.second
+        fixedCoefs[key] = if (key in fixedCoefs) add(fixedCoefs[key]!!, value) else value
+    }
+
+    return NumberedPolynomial<C>(fixedCoefs)
+}
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+/**
+ * Constructs [NumberedPolynomial] with provided coefficients map [coefs].
+ *
+ * [coefs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+public inline fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, ::add)
+/**
+ * Constructs [NumberedPolynomial] with provided coefficients map [coefs].
+ *
+ * [coefs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs) { left: C, right: C -> left + right }
+
+/**
+ * Constructs [NumberedPolynomial] with provided coefficients map [coefs].
+ *
+ * [coefs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs) { left: C, right: C -> left + right }
+
+/**
+ * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+public inline fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, ::add)
+
+/**
+ * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs) { left: C, right: C -> left + right }
+/**
+ * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs) { left: C, right: C -> left + right }
+
+/**
+ * Constructs [NumberedPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+public inline fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs) { left: C, right: C -> left + right }
+/**
+ * Constructs [NumberedPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs) { left: C, right: C -> left + right }
+/**
+ * Constructs [NumberedPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs) { left: C, right: C -> left + right }
+
+/**
+ * Converts [this] constant to [NumberedPolynomial].
+ */
+@Suppress("NOTHING_TO_INLINE")
+public inline fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to this))
+
+/**
+ * Marks DSL that allows to more simply create [NumberedPolynomial]s with good performance.
+ *
+ * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+ * ```
+ * Int.algebra {
+ *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
+ *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
+ *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+ *     }
+ * }
+ * ```
+ */
+@DslMarker
+@UnstableKMathAPI
+internal annotation class NumberedPolynomialConstructorDSL
+
+/**
+ * Builder of [NumberedPolynomial] signature. It should be used as an implicit context for lambdas that describe term signature.
+ */
+@UnstableKMathAPI
+@NumberedPolynomialConstructorDSL
+public class NumberedPolynomialTermSignatureBuilder {
+    /**
+     * Signature storage. Any declaration of any variable's power updates the storage by increasing corresponding value.
+     * Afterward the storage will be used as a resulting signature.
+     */
+    private val signature: MutableList<UInt> = ArrayList()
+
+    /**
+     * Builds the resulting signature.
+     *
+     * In fact, it just returns [signature] as regular signature of type `List<UInt>`.
+     */
+    internal fun build(): List<UInt> = signature
+
+    /**
+     * Declares power of variable #[this] of degree [deg].
+     *
+     * Declaring another power of the same variable will increase its degree by received degree.
+     */
+    public infix fun Int.inPowerOf(deg: UInt) {
+        if (this > signature.lastIndex) {
+            signature.addAll(List(this - signature.lastIndex - 1) { 0u })
+            signature.add(deg)
+        } else {
+            signature[this] += deg
+        }
+    }
+    /**
+     * Declares power of variable #[this] of degree [deg].
+     *
+     * Declaring another power of the same variable will increase its degree by received degree.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun Int.pow(deg: UInt): Unit = this inPowerOf deg
+    /**
+     * Declares power of variable #[this] of degree [deg].
+     *
+     * Declaring another power of the same variable will increase its degree by received degree.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun Int.`in`(deg: UInt): Unit = this inPowerOf deg
+    /**
+     * Declares power of variable #[this] of degree [deg].
+     *
+     * Declaring another power of the same variable will increase its degree by received degree.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun Int.of(deg: UInt): Unit = this inPowerOf deg
+}
+
+/**
+ * Builder of [NumberedPolynomial]. It should be used as an implicit context for lambdas that describe [NumberedPolynomial].
+ */
+@UnstableKMathAPI
+@NumberedPolynomialConstructorDSL
+public class NumberedPolynomialBuilder<C>(
+    /**
+     * Summation operation that will be used to sum coefficients of monomials of same signatures.
+     */
+    private val add: (C, C) -> C,
+    /**
+     * Initial capacity of coefficients map.
+     */
+    initialCapacity: Int = 0
+) {
+    /**
+     * Coefficients storage. Any declaration of any monomial updates the storage.
+     * Afterward the storage will be used as a resulting coefficients map.
+     */
+    private val coefficients: MutableMap<List<UInt>, C> = LinkedHashMap(initialCapacity)
+
+    /**
+     * Builds the resulting coefficients map.
+     *
+     * In fact, it just returns [coefficients] as regular coefficients map of type `Map<List<UInt>, C>`.
+     */
+    @PublishedApi
+    internal fun build(): NumberedPolynomial<C> = NumberedPolynomial<C>(coefficients)
+
+    /**
+     * Declares monomial with [this] coefficient and provided [signature].
+     *
+     * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
+     * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
+     */
+    public infix fun C.with(signature: List<UInt>) {
+        if (signature in coefficients) coefficients[signature] = add(coefficients[signature]!!, this@with)
+        else coefficients[signature] = this@with
+    }
+    /**
+     * Declares monomial with [this] coefficient and signature constructed by [block].
+     *
+     * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
+     * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun C.with(noinline block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
+    /**
+     * Declares monomial with [this] coefficient and signature constructed by [block].
+     *
+     * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
+     * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
+     */
+    public operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit =
+        this with NumberedPolynomialTermSignatureBuilder().apply(block).build()
+}
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+/**
+ * Creates [NumberedPolynomial] with lambda [block] in context of [this] ring of constants.
+ *
+ * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+ * ```
+ * Int.algebra {
+ *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
+ *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
+ *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+ *     }
+ * }
+ * ```
+ */
+@UnstableKMathAPI
+@Suppress("FunctionName")
+public inline fun <C, A: Ring<C>> A.NumberedPolynomial(initialCapacity: Int = 0, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(::add, initialCapacity).apply(block).build()
+/**
+ * Creates [NumberedPolynomial] with lambda [block] in context of [this] ring of [NumberedPolynomial]s.
+ *
+ * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+ * ```
+ * Int.algebra {
+ *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
+ *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
+ *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+ *     }
+ * }
+ * ```
+ */
+@UnstableKMathAPI
+@Suppress("FunctionName")
+public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(initialCapacity: Int, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+/**
+ * Creates [NumberedPolynomial] with lambda [block] in context of [this] field of [NumberedRationalFunction]s.
+ *
+ * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+ * ```
+ * Int.algebra {
+ *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
+ *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
+ *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+ *     }
+ * }
+ * ```
+ */
+@UnstableKMathAPI
+@Suppress("FunctionName")
+public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(initialCapacity: Int, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+/**
+ * Constructs [NumberedRationalFunction] with provided coefficients maps [numeratorCoefficients] and [denominatorCoefficients].
+ *
+ * The maps will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. the maps' keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients),
+        NumberedPolynomial(denominatorCoefficients)
+    )
+/**
+ * Constructs [NumberedRationalFunction] with provided coefficients maps [numeratorCoefficients] and [denominatorCoefficients].
+ *
+ * The maps will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. the maps' keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients),
+        NumberedPolynomial(denominatorCoefficients)
+    )
+
+/**
+ * Constructs [NumberedRationalFunction] with provided [numerator] and unit denominator.
+ */
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(numerator, NumberedPolynomial(mapOf(emptyList<UInt>() to one)))
+/**
+ * Constructs [NumberedRationalFunction] with provided [numerator] and unit denominator.
+ */
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(numerator, polynomialOne)
+
+/**
+ * Constructs [NumberedRationalFunction] with provided coefficients map [numeratorCoefficients] for numerator and unit
+ * denominator.
+ *
+ * [numeratorCoefficients] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [numeratorCoefficients]'s keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients),
+        polynomialOne
+    )
+/**
+ * Constructs [NumberedRationalFunction] with provided coefficients map [numeratorCoefficients] for numerator and unit
+ * denominator.
+ *
+ * [numeratorCoefficients] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [numeratorCoefficients]'s keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction<C>(
+        NumberedPolynomial(numeratorCoefficients),
+        NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to one))
+    )
+
+///**
+// * Converts [this] coefficient to [NumberedRationalFunction].
+// */
+//context(A)
+//public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> =
+//    NumberedRationalFunction(
+//        NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to this)),
+//        NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to one))
+//    )
+///**
+// * Converts [this] coefficient to [NumberedRationalFunction].
+// */
+//context(NumberedRationalFunctionSpace<C, A>)
+//public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> =
+//    NumberedRationalFunction(
+//        NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to this)),
+//        NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to constantOne))
+//    )
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
new file mode 100644
index 000000000..484cd11e3
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
@@ -0,0 +1,515 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.Buffer
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.jvm.JvmName
+import kotlin.math.max
+import kotlin.math.min
+
+
+/**
+ * Creates a [NumberedPolynomialSpace] over a received ring.
+ */
+public fun <C, A : Ring<C>> A.numberedPolynomialSpace(): NumberedPolynomialSpace<C, A> =
+    NumberedPolynomialSpace(this)
+
+/**
+ * Creates a [NumberedPolynomialSpace]'s scope over a received ring.
+ */
+public inline fun <C, A : Ring<C>, R> A.numberedPolynomialSpace(block: NumberedPolynomialSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return NumberedPolynomialSpace(this).block()
+}
+
+/**
+ * Creates a [NumberedRationalFunctionSpace] over a received ring.
+ */
+public fun <C, A : Ring<C>> A.numberedRationalFunctionSpace(): NumberedRationalFunctionSpace<C, A> =
+    NumberedRationalFunctionSpace(this)
+
+/**
+ * Creates a [NumberedRationalFunctionSpace]'s scope over a received ring.
+ */
+public inline fun <C, A : Ring<C>, R> A.numberedRationalFunctionSpace(block: NumberedRationalFunctionSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return NumberedRationalFunctionSpace(this).block()
+}
+
+/**
+ * Substitutes provided Double arguments [args] into [this] Double polynomial.
+ */
+public fun NumberedPolynomial<Double>.substitute(args: Map<Int, Double>): NumberedPolynomial<Double> = Double.algebra {
+    NumberedPolynomial<Double>(
+        buildMap<List<UInt>, Double>(coefficients.size) {
+            for ((degs, c) in coefficients) {
+                val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
+                val newC = args.entries.fold(c) { product, (variable, substitution) ->
+                    val deg = degs.getOrElse(variable) { 0u }
+                    if (deg == 0u) product else product * substitution.pow(deg.toInt())
+                }
+                if (newDegs !in this) this[newDegs] = newC
+                else this[newDegs] = this[newDegs]!! + newC
+            }
+        }
+    )
+}
+
+/**
+ * Substitutes provided arguments [args] into [this] polynomial.
+ */
+public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
+    NumberedPolynomial<C>(
+        buildMap<List<UInt>, C>(coefficients.size) {
+            for ((degs, c) in coefficients) {
+                val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
+                val newC = args.entries.fold(c) { product, (variable, substitution) ->
+                    val deg = degs.getOrElse(variable) { 0u }
+                    if (deg == 0u) product else product * power(substitution, deg)
+                }
+                if (newDegs !in this) this[newDegs] = newC
+                else this[newDegs] = this[newDegs]!! + newC
+            }
+        }
+    )
+}
+
+/**
+ * Substitutes provided arguments [args] into [this] polynomial.
+     */ // TODO: To optimize boxing
+@JvmName("substitutePolynomial")
+public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> =
+    ring.numberedPolynomialSpace {
+        coefficients.entries.fold(zero) { acc, (degs, c) ->
+            val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
+            acc + args.entries.fold(NumberedPolynomial<C>(mapOf(newDegs to c))) { product, (variable, substitution) ->
+                val deg = degs.getOrElse(variable) { 0u }
+                if (deg == 0u) product else product * power(substitution, deg)
+            }
+        }
+    }
+
+/**
+ * Substitutes provided arguments [args] into [this] polynomial.
+ */ // TODO: To optimize boxing
+@JvmName("substituteRationalFunction")
+public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedRationalFunction<C>>) : NumberedRationalFunction<C> =
+    ring.numberedRationalFunctionSpace {
+        coefficients.entries.fold(zero) { acc, (degs, c) ->
+            val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
+            acc + args.entries.fold(NumberedRationalFunction(NumberedPolynomial<C>(mapOf(newDegs to c)))) { product, (variable, substitution) ->
+                val deg = degs.getOrElse(variable) { 0u }
+                if (deg == 0u) product else product * power(substitution, deg)
+            }
+        }
+    }
+
+/**
+ * Substitutes provided Double arguments [args] into [this] Double rational function.
+ */
+public fun NumberedRationalFunction<Double>.substitute(args: Map<Int, Double>): NumberedRationalFunction<Double> =
+    NumberedRationalFunction(numerator.substitute(args), denominator.substitute(args))
+
+/**
+ * Substitutes provided arguments [args] into [this] rational function.
+ */
+public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
+
+/**
+ * Substitutes provided arguments [args] into [this] rational function.
+ */ // TODO: To optimize boxing
+@JvmName("substitutePolynomial")
+public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedPolynomial<C>>) : NumberedRationalFunction<C> =
+    NumberedRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
+
+/**
+ * Substitutes provided arguments [args] into [this] rational function.
+ */ // TODO: To optimize boxing
+@JvmName("substituteRationalFunction")
+public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedRationalFunction<C>>) : NumberedRationalFunction<C> =
+    ring.numberedRationalFunctionSpace {
+        numerator.substitute(ring, args) / denominator.substitute(ring, args)
+    }
+
+/**
+ * Substitutes provided Double arguments [args] into [this] Double polynomial.
+ */
+public fun NumberedPolynomial<Double>.substitute(args: Buffer<Double>): NumberedPolynomial<Double> = Double.algebra {
+    val lastSubstitutionVariable = args.size - 1
+    NumberedPolynomial<Double>(
+        buildMap(coefficients.size) {
+            for ((degs, c) in coefficients) {
+                val lastDegsIndex = degs.lastIndex
+                val newDegs =
+                    if (lastDegsIndex <= lastSubstitutionVariable) emptyList()
+                    else degs.toMutableList().apply {
+                        for (i in 0..lastSubstitutionVariable) this[i] = 0u
+                    }
+                val newC = (0..min(lastDegsIndex, lastSubstitutionVariable)).fold(c) { product, variable ->
+                    val deg = degs[variable]
+                    if (deg == 0u) product else product * args[variable].pow(deg.toInt())
+                }
+                if (newDegs !in this) this[newDegs] = newC
+                else this[newDegs] = this[newDegs]!! + newC
+            }
+        }
+    )
+}
+
+/**
+ * Substitutes provided arguments [args] into [this] polynomial.
+ */
+public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Buffer<C>): NumberedPolynomial<C> = ring {
+    val lastSubstitutionVariable = args.size - 1
+    NumberedPolynomial<C>(
+        buildMap<List<UInt>, C>(coefficients.size) {
+            for ((degs, c) in coefficients) {
+                val lastDegsIndex = degs.lastIndex
+                val newDegs =
+                    if (lastDegsIndex <= lastSubstitutionVariable) emptyList()
+                    else degs.toMutableList().apply {
+                        for (i in 0..lastSubstitutionVariable) this[i] = 0u
+                    }
+                val newC = (0..min(lastDegsIndex, lastSubstitutionVariable)).fold(c) { product, variable ->
+                    val deg = degs[variable]
+                    if (deg == 0u) product else product * power(args[variable], deg)
+                }
+                if (newDegs !in this) this[newDegs] = newC
+                else this[newDegs] = this[newDegs]!! + newC
+            }
+        }
+    )
+}
+
+/**
+ * Substitutes provided arguments [args] into [this] polynomial.
+ */ // TODO: To optimize boxing
+@JvmName("substitutePolynomial")
+public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Buffer<NumberedPolynomial<C>>) : NumberedPolynomial<C> =
+    ring.numberedPolynomialSpace {
+        val lastSubstitutionVariable = args.size - 1
+        coefficients.entries.fold(zero) { acc, (degs, c) ->
+            val lastDegsIndex = degs.lastIndex
+            val newDegs =
+                if (lastDegsIndex <= lastSubstitutionVariable) emptyList()
+                else degs.toMutableList().apply {
+                    for (i in 0..lastSubstitutionVariable) this[i] = 0u
+                }
+            acc + (0..min(lastDegsIndex, lastSubstitutionVariable))
+                .fold(NumberedPolynomial<C>(mapOf(newDegs to c))) { product, variable ->
+                    val deg = degs[variable]
+                    if (deg == 0u) product else product * power(args[variable], deg)
+                }
+        }
+    }
+
+/**
+ * Substitutes provided arguments [args] into [this] polynomial.
+ */ // TODO: To optimize boxing
+@JvmName("substituteRationalFunction")
+public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Buffer<NumberedRationalFunction<C>>) : NumberedRationalFunction<C> =
+    ring.numberedRationalFunctionSpace {
+        val lastSubstitutionVariable = args.size - 1
+        coefficients.entries.fold(zero) { acc, (degs, c) ->
+            val lastDegsIndex = degs.lastIndex
+            val newDegs =
+                if (lastDegsIndex <= lastSubstitutionVariable) emptyList()
+                else degs.toMutableList().apply {
+                    for (i in 0..lastSubstitutionVariable) this[i] = 0u
+                }
+            acc + (0..min(lastDegsIndex, lastSubstitutionVariable))
+                .fold(NumberedRationalFunction(NumberedPolynomial<C>(mapOf(newDegs to c)))) { product, variable ->
+                    val deg = degs[variable]
+                    if (deg == 0u) product else product * power(args[variable], deg)
+                }
+        }
+    }
+
+/**
+ * Substitutes provided Double arguments [args] into [this] Double rational function.
+ */
+public fun NumberedRationalFunction<Double>.substitute(args: Buffer<Double>): NumberedRationalFunction<Double> =
+    NumberedRationalFunction(numerator.substitute(args), denominator.substitute(args))
+
+/**
+ * Substitutes provided arguments [args] into [this] rational function.
+ */
+public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Buffer<C>): NumberedRationalFunction<C> =
+    NumberedRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
+
+/**
+ * Substitutes provided arguments [args] into [this] rational function.
+ */ // TODO: To optimize boxing
+@JvmName("substitutePolynomial")
+public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Buffer<NumberedPolynomial<C>>) : NumberedRationalFunction<C> =
+    NumberedRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
+
+/**
+ * Substitutes provided arguments [args] into [this] rational function.
+ */ // TODO: To optimize boxing
+@JvmName("substituteRationalFunction")
+public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Buffer<NumberedRationalFunction<C>>) : NumberedRationalFunction<C> =
+    ring.numberedRationalFunctionSpace {
+        numerator.substitute(ring, args) / denominator.substitute(ring, args)
+    }
+
+/**
+ * Substitutes provided Double arguments [args] into [this] Double polynomial.
+ */
+public fun NumberedPolynomial<Double>.substituteFully(args: Buffer<Double>): Double = Double.algebra {
+    val lastSubstitutionVariable = args.size - 1
+    require(coefficients.keys.all { it.lastIndex <= lastSubstitutionVariable }) { "Fully substituting buffer should cover all variables of the polynomial." }
+    coefficients.entries.fold(.0) { acc, (degs, c) ->
+        acc + degs.foldIndexed(c) { variable, product, deg ->
+            if (deg == 0u) product else product * args[variable].pow(deg.toInt())
+        }
+    }
+}
+
+/**
+ * Substitutes provided arguments [args] into [this] polynomial.
+ */
+public fun <C> NumberedPolynomial<C>.substituteFully(ring: Ring<C>, args: Buffer<C>): C = ring {
+    val lastSubstitutionVariable = args.size - 1
+    require(coefficients.keys.all { it.lastIndex <= lastSubstitutionVariable }) { "Fully substituting buffer should cover all variables of the polynomial." }
+    coefficients.entries.fold(zero) { acc, (degs, c) ->
+        acc + degs.foldIndexed(c) { variable, product, deg ->
+            if (deg == 0u) product else product * power(args[variable], deg)
+        }
+    }
+}
+
+/**
+ * Substitutes provided Double arguments [args] into [this] Double rational function.
+ */
+public fun NumberedRationalFunction<Double>.substituteFully(args: Buffer<Double>): Double =
+    numerator.substituteFully(args) / denominator.substituteFully(args)
+
+/**
+ * Substitutes provided arguments [args] into [this] rational function.
+ */
+public fun <C> NumberedRationalFunction<C>.substituteFully(ring: Field<C>, args: Buffer<C>): C = ring {
+    numerator.substituteFully(ring, args) / denominator.substituteFully(ring, args)
+}
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunctionOver(ring: A): (Buffer<C>) -> C = { substituteFully(ring, it) }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunctionOfConstantOver(ring: A): (Buffer<C>) -> C = { substituteFully(ring, it) }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunctionOfPolynomialOver(ring: A): (Buffer<NumberedPolynomial<C>>) -> NumberedPolynomial<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunctionOfRationalFunctionOver(ring: A): (Buffer<NumberedRationalFunction<C>>) -> NumberedRationalFunction<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Field<C>> NumberedRationalFunction<C>.asFunctionOver(ring: A): (Buffer<C>) -> C = { substituteFully(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Field<C>> NumberedRationalFunction<C>.asFunctionOfConstantOver(ring: A): (Buffer<C>) -> C = { substituteFully(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> NumberedRationalFunction<C>.asFunctionOfPolynomialOver(ring: A): (Buffer<NumberedPolynomial<C>>) -> NumberedRationalFunction<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> NumberedRationalFunction<C>.asFunctionOfRationalFunctionOver(ring: A): (Buffer<NumberedRationalFunction<C>>) -> NumberedRationalFunction<C> = { substitute(ring, it) }
+
+/**
+ * Returns algebraic derivative of received polynomial with respect to provided variable.
+ */
+@UnstableKMathAPI
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
+    ring: A,
+    variable: Int,
+): NumberedPolynomial<C> = ring {
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    if (degs.size > variable) return@forEach
+                    put(
+                        degs.mapIndexed { index, deg ->
+                            when {
+                                index != variable -> deg
+                                deg > 0u -> deg - 1u
+                                else -> return@forEach
+                            }
+                        }.cleanUp(),
+                        multiplyByDoubling(c, degs[variable])
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial with respect to provided variable of specified order.
+ */
+@UnstableKMathAPI
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
+    ring: A,
+    variable: Int,
+    order: UInt
+): NumberedPolynomial<C> = ring {
+    if (order == 0u) return this@nthDerivativeWithRespectTo
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    if (degs.size > variable) return@forEach
+                    put(
+                        degs.mapIndexed { index, deg ->
+                            when {
+                                index != variable -> deg
+                                deg >= order -> deg - order
+                                else -> return@forEach
+                            }
+                        }.cleanUp(),
+                        degs[variable].let { deg ->
+                            (deg downTo deg - order + 1u)
+                                .fold(c) { acc, ord -> multiplyByDoubling(acc, ord) }
+                        }
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial with respect to provided variables of specified orders.
+ */
+@UnstableKMathAPI
+public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
+    ring: A,
+    variablesAndOrders: Map<Int, UInt>,
+): NumberedPolynomial<C> = ring {
+    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
+    if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
+    val maxRespectedVariable = filteredVariablesAndOrders.keys.maxOrNull()!!
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    if (degs.size > maxRespectedVariable) return@forEach
+                    put(
+                        degs.mapIndexed { index, deg ->
+                            if (index !in filteredVariablesAndOrders) return@mapIndexed deg
+                            val order = filteredVariablesAndOrders[index]!!
+                            if (deg >= order) deg - order else return@forEach
+                        }.cleanUp(),
+                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
+                            degs[index].let { deg ->
+                                (deg downTo deg - order + 1u)
+                                    .fold(acc1) { acc2, ord -> multiplyByDoubling(acc2, ord) }
+                            }
+                        }
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial with respect to provided variable.
+ */
+@UnstableKMathAPI
+public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
+    ring: A,
+    variable: Int,
+): NumberedPolynomial<C> = ring {
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    put(
+                        List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + 1u },
+                        c / multiplyByDoubling(one, degs[variable])
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial with respect to provided variable of specified order.
+ */
+@UnstableKMathAPI
+public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectTo(
+    ring: A,
+    variable: Int,
+    order: UInt
+): NumberedPolynomial<C> = ring {
+    if (order == 0u) return this@nthAntiderivativeWithRespectTo
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    put(
+                        List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + order },
+                        degs[variable].let { deg ->
+                            (deg downTo deg - order + 1u)
+                                .fold(c) { acc, ord -> acc / multiplyByDoubling(one, ord) }
+                        }
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial with respect to provided variables of specified orders.
+ */
+@UnstableKMathAPI
+public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectTo(
+    ring: A,
+    variablesAndOrders: Map<Int, UInt>,
+): NumberedPolynomial<C> = ring {
+    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
+    if (filteredVariablesAndOrders.isEmpty()) return this@nthAntiderivativeWithRespectTo
+    val maxRespectedVariable = filteredVariablesAndOrders.keys.maxOrNull()!!
+    NumberedPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    put(
+                        List(max(maxRespectedVariable + 1, degs.size)) { degs[it] + filteredVariablesAndOrders.getOrElse(it) { 0u } },
+                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
+                            degs[index].let { deg ->
+                                (deg downTo deg - order + 1u)
+                                    .fold(acc1) { acc2, ord -> acc2 / multiplyByDoubling(one, ord) }
+                            }
+                        }
+                    )
+                }
+        }
+    )
+}
\ No newline at end of file
-- 
2.34.1


From b5031121ce9ef7ea0c0aae3796da8e736074a083 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 14 Jun 2022 19:31:13 +0300
Subject: [PATCH 533/713] up build tools

---
 gradle.properties                                               | 2 +-
 .../kotlin/space/kscience/kmath/geometry/RotationTest.kt        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 9cdd7801c..5202289fa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,4 +12,4 @@ org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.11.6-kotlin-1.7.0
+toolsVersion=0.11.7-kotlin-1.7.0
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
index ca7226fb6..abe26d398 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.geometry
 
 import space.kscience.kmath.complex.Quaternion
 import space.kscience.kmath.testutils.assertBufferEquals
+import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -24,6 +25,7 @@ class RotationTest {
     }
 
     @Test
+    @Ignore
     fun rotationConversion() {
 
         val q = Quaternion(1.0, 2.0, -3.0, 4.0)
-- 
2.34.1


From a1267d84ac43ca18d543c44c81514a73f990d50c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 14 Jun 2022 20:58:13 +0300
Subject: [PATCH 534/713] Fix quaternion rotation tests

---
 .../kscience/kmath/complex/Quaternion.kt      |  2 +
 .../space/kscience/kmath/nd/Structure2D.kt    |  4 ++
 .../kscience/kmath/geometry/rotations3D.kt    | 60 ++++++++++++-------
 .../kscience/kmath/geometry/RotationTest.kt   | 10 ++--
 4 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index 359b66b20..0305bfc88 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -117,6 +117,8 @@ public val Quaternion.reciprocal: Quaternion
         return Quaternion(w / norm2, -x / norm2, -y / norm2, -z / norm2)
     }
 
+public fun Quaternion.normalized(): Quaternion = with(QuaternionField){ this@normalized / norm(this@normalized) }
+
 /**
  * A field of [Quaternion].
  */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index cf8559869..a2fd83474 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -138,6 +138,10 @@ private class MutableStructure2DWrapper<T>(val structure: MutableStructureND<T>)
     override fun equals(other: Any?): Boolean = false
 
     override fun hashCode(): Int = 0
+
+    override fun toString(): String {
+        return StructureND.toString(structure)
+    }
 }
 
 /**
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
index 374315610..67c3666ed 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
@@ -14,7 +14,6 @@ import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.linear.matrix
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.invoke
 import kotlin.math.pow
 import kotlin.math.sqrt
 
@@ -33,9 +32,9 @@ public val Quaternion.vector: Vector3D
         val sint2 = sqrt(1 - w * w)
 
         return object : Vector3D {
-            override val x: Double get() = this@vector.x/sint2
-            override val y: Double get() = this@vector.y/sint2
-            override val z: Double get() = this@vector.z/sint2
+            override val x: Double get() = this@vector.x / sint2
+            override val y: Double get() = this@vector.y / sint2
+            override val z: Double get() = this@vector.z / sint2
             override fun toString(): String = listOf(x, y, z).toString()
         }
     }
@@ -75,26 +74,43 @@ public fun Quaternion.toRotationMatrix(
 }
 
 /**
- * taken from https://d3cw3dd2w32x2b.cloudfront.net/wp-content/uploads/2015/01/matrix-to-quat.pdf
+ * taken from https://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToQuaternion/
  */
 public fun Quaternion.Companion.fromRotationMatrix(matrix: Matrix<Double>): Quaternion {
-    val t: Double
-    val q = if (matrix[2, 2] < 0) {
-        if (matrix[0, 0] > matrix[1, 1]) {
-            t = 1 + matrix[0, 0] - matrix[1, 1] - matrix[2, 2]
-            Quaternion(t, matrix[0, 1] + matrix[1, 0], matrix[2, 0] + matrix[0, 2], matrix[1, 2] - matrix[2, 1])
-        } else {
-            t = 1 - matrix[0, 0] + matrix[1, 1] - matrix[2, 2]
-            Quaternion(matrix[0, 1] + matrix[1, 0], t, matrix[1, 2] + matrix[2, 1], matrix[2, 0] - matrix[0, 2])
-        }
+    require(matrix.colNum == 3 && matrix.rowNum == 3) { "Rotation matrix should be 3x3 but is ${matrix.rowNum}x${matrix.colNum}" }
+    val trace = matrix[0, 0] + matrix[1, 1] + matrix[2, 2]
+
+    return if (trace > 0) {
+        val s = sqrt(trace + 1.0) * 2 // S=4*qw
+        Quaternion(
+            w = 0.25 * s,
+            x = (matrix[2, 1] - matrix[1, 2]) / s,
+            y = (matrix[0, 2] - matrix[2, 0]) / s,
+            z = (matrix[1, 0] - matrix[0, 1]) / s,
+        )
+    } else if ((matrix[0, 0] > matrix[1, 1]) && (matrix[0, 0] > matrix[2, 2])) {
+        val s = sqrt(1.0 + matrix[0, 0] - matrix[1, 1] - matrix[2, 2]) * 2 // S=4*qx
+        Quaternion(
+            w = (matrix[2, 1] - matrix[1, 2]) / s,
+            x = 0.25 * s,
+            y = (matrix[0, 1] + matrix[1, 0]) / s,
+            z = (matrix[0, 2] + matrix[2, 0]) / s,
+        )
+    } else if (matrix[1, 1] > matrix[2, 2]) {
+        val s = sqrt(1.0 + matrix[1, 1] - matrix[0, 0] - matrix[2, 2]) * 2 // S=4*qy
+        Quaternion(
+            w = (matrix[0, 2] - matrix[2, 0]) / s,
+            x = (matrix[0, 1] + matrix[1, 0]) / s,
+            y = 0.25 * s,
+            z = (matrix[1, 2] + matrix[2, 1]) / s,
+        )
     } else {
-        if (matrix[0, 0] < -matrix[1, 1]) {
-            t = 1 - matrix[0, 0] - matrix[1, 1] + matrix[2, 2]
-            Quaternion(matrix[2, 0] + matrix[0, 2], matrix[1, 2] + matrix[2, 1], t, matrix[0, 1] - matrix[1, 0])
-        } else {
-            t = 1 + matrix[0, 0] + matrix[1, 1] + matrix[2, 2]
-            Quaternion(matrix[1, 2] - matrix[2, 1], matrix[2, 0] - matrix[0, 2], matrix[0, 1] - matrix[1, 0], t)
-        }
+        val s = sqrt(1.0 + matrix[2, 2] - matrix[0, 0] - matrix[1, 1]) * 2 // S=4*qz
+        Quaternion(
+            w = (matrix[1, 0] - matrix[0, 1]) / s,
+            x = (matrix[0, 2] + matrix[2, 0]) / s,
+            y = (matrix[1, 2] + matrix[2, 1]) / s,
+            z = 0.25 * s,
+        )
     }
-    return QuaternionField.invoke { q * (0.5 / sqrt(t)) }
 }
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
index abe26d398..89b69d0f2 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
@@ -6,17 +6,16 @@
 package space.kscience.kmath.geometry
 
 import space.kscience.kmath.complex.Quaternion
+import space.kscience.kmath.complex.normalized
 import space.kscience.kmath.testutils.assertBufferEquals
-import kotlin.test.Ignore
 import kotlin.test.Test
-import kotlin.test.assertEquals
 
 class RotationTest {
 
     @Test
     fun rotations() = with(Euclidean3DSpace) {
         val vector = Vector3D(1.0, 1.0, 1.0)
-        val q = Quaternion(1.0, 2.0, -3.0, 4.0)
+        val q = Quaternion(1.0, 2.0, -3.0, 4.0).normalized()
         val rotatedByQ = rotate(vector, q)
         val matrix = q.toRotationMatrix()
         val rotatedByM = rotate(vector,matrix)
@@ -25,13 +24,12 @@ class RotationTest {
     }
 
     @Test
-    @Ignore
     fun rotationConversion() {
 
-        val q = Quaternion(1.0, 2.0, -3.0, 4.0)
+        val q = Quaternion(1.0, 2.0, -3.0, 4.0).normalized()
 
         val matrix = q.toRotationMatrix()
 
-        assertEquals(q, Quaternion.fromRotationMatrix(matrix))
+        assertBufferEquals(q, Quaternion.fromRotationMatrix(matrix))
     }
 }
\ No newline at end of file
-- 
2.34.1


From b5a94923b574bb840214fde3e1af1875c64777ef Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 17 Jun 2022 01:53:40 +0300
Subject: [PATCH 535/713] Fixed problems with JVM names. Exposed internal
 NumberedPolynomial constructor with opt-in condition. Added and upgraded
 tests. Fixed small bugs (mistakes). Upgraded arithmetic operations a bit.

---
 .../kmath/functions/ListPolynomial.kt         |   60 +-
 .../kmath/functions/NumberedPolynomial.kt     |   60 +-
 .../functions/NumberedRationalFunction.kt     |   12 +-
 .../space/kscience/kmath/functions/misc.kt    |   21 +-
 .../kmath/functions/numberedConstructors.kt   |   79 +-
 .../kscience/kmath/functions/numberedUtil.kt  |    2 +-
 .../kmath/functions/ListPolynomialTest.kt     |   94 +-
 .../functions/NumberedConstructorsTest.kt     |  111 ++
 .../kmath/functions/NumberedPolynomialTest.kt | 1368 +++++++++++++++++
 .../kscience/kmath/test/misc/IntModulo.kt     |    6 +-
 10 files changed, 1714 insertions(+), 99 deletions(-)
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index 42e3f7301..b3f1eb8f7 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -100,14 +100,17 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun ListPolynomial<C>.times(other: Int): ListPolynomial<C> =
-        if (other == 0) zero
-        else ListPolynomial(
-            coefficients
-                .toMutableList()
-                .apply {
-                    for (deg in indices) this[deg] = this[deg] * other
-                }
-        )
+        when (other) {
+            0 -> zero
+            1 -> this
+            else -> ListPolynomial(
+                coefficients
+                    .toMutableList()
+                    .apply {
+                        for (deg in indices) this[deg] = this[deg] * other
+                    }
+            )
+        }
 
     /**
      * Returns sum of the integer represented as a polynomial and the polynomial.
@@ -133,34 +136,39 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public override operator fun Int.minus(other: ListPolynomial<C>): ListPolynomial<C> =
-        if (this == 0) other
-        else
-            ListPolynomial(
-                other.coefficients
-                    .toMutableList()
-                    .apply {
-                        forEachIndexed { index, c -> if (index != 0) this[index] = -c }
+        ListPolynomial(
+            other.coefficients
+                .toMutableList()
+                .apply {
+                    if (this@minus == 0) {
+                        indices.forEach { this[it] = -this[it] }
+                    } else {
+                        (1..lastIndex).forEach { this[it] = -this[it] }
 
                         val result = this@minus - getOrElse(0) { constantZero }
 
-                        if(size == 0) add(result)
+                        if (size == 0) add(result)
                         else this[0] = result
                     }
-            )
+                }
+        )
     /**
      * Returns product of the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public override operator fun Int.times(other: ListPolynomial<C>): ListPolynomial<C> =
-        if (this == 0) zero
-        else ListPolynomial(
-            other.coefficients
-                .toMutableList()
-                .apply {
-                    for (deg in indices) this[deg] = this@times * this[deg]
-                }
-        )
+        when (this) {
+            0 -> zero
+            1 -> other
+            else -> ListPolynomial(
+                other.coefficients
+                    .toMutableList()
+                    .apply {
+                        for (deg in indices) this[deg] = this@times * this[deg]
+                    }
+            )
+        }
 
     /**
      * Converts the integer [value] to polynomial.
@@ -192,7 +200,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
             else ListPolynomial(
                 toMutableList()
                     .apply {
-                        forEachIndexed { index, c -> if (index != 0) this[index] = -c }
+                        (1 .. lastIndex).forEach { this[it] = -this[it] }
 
                         val result = if (size == 0) this@minus else this@minus - get(0)
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 9304e66da..02a3af683 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -98,14 +98,17 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun NumberedPolynomial<C>.times(other: Int): NumberedPolynomial<C> =
-        if (other == 0) zero
-        else NumberedPolynomialAsIs(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
+        when (other) {
+            0 -> zero
+            1 -> this
+            else -> NumberedPolynomialAsIs(
+                coefficients
+                    .toMutableMap()
+                    .apply {
+                        for (degs in keys) this[degs] = this[degs]!! * other
+                    }
+            )
+        }
 
     /**
      * Returns sum of the integer represented as a polynomial and the polynomial.
@@ -130,16 +133,20 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public override operator fun Int.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this == 0) other
-        else
-            NumberedPolynomialAsIs(
-                other.coefficients
-                    .toMutableMap()
-                    .apply {
+        NumberedPolynomialAsIs(
+            other.coefficients
+                .toMutableMap()
+                .apply {
+                    if (this@minus == 0) {
+                        forEach { (key, value) -> this[key] = -value }
+                    } else {
+                        forEach { (key, value) -> if (key.isNotEmpty()) this[key] = -value }
+
                         val degs = emptyList<UInt>()
 
                         this[degs] = this@minus - getOrElse(degs) { constantZero }
                     }
+                }
             )
     /**
      * Returns product of the integer represented as a polynomial and the polynomial.
@@ -147,14 +154,17 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public override operator fun Int.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this == 0) zero
-        else NumberedPolynomialAsIs(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
+        when (this) {
+            0 -> zero
+            1 -> other
+            else -> NumberedPolynomialAsIs(
+                other.coefficients
+                    .toMutableMap()
+                    .apply {
+                        for (degs in keys) this[degs] = this@times * this[degs]!!
+                    }
+            )
+        }
 
     /**
      * Converts the integer [value] to polynomial.
@@ -185,7 +195,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
             else NumberedPolynomialAsIs(
                 toMutableMap()
                     .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
+                        forEach { (degs, c) -> if (degs.isNotEmpty()) this[degs] = -c }
 
                         val degs = emptyList<UInt>()
 
@@ -266,7 +276,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
     override operator fun NumberedPolynomial<C>.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         NumberedPolynomialAsIs(
             buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
+                coefficients.mapValuesTo(this) { it.value }
                 other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
             }
         )
@@ -276,7 +286,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
     override operator fun NumberedPolynomial<C>.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         NumberedPolynomialAsIs(
             buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
+                coefficients.mapValuesTo(this) { it.value }
                 other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
             }
         )
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index a2986879d..92f507735 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -119,11 +119,13 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
      * Substitutes provided polynomial [argument] into [this] polynomial.
      */
     @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substitutePolynomial")
     public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, argument)
     /**
      * Substitutes provided rational function [argument] into [this] polynomial.
      */
     @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substituteRationalFunction")
     public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided constant [argument] into [this] rational function.
@@ -134,11 +136,13 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
      * Substitutes provided polynomial [argument] into [this] rational function.
      */
     @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substitutePolynomial")
     public inline fun NumberedRationalFunction<C>.substitute(argument: Map<Int, NumberedPolynomial<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided rational function [argument] into [this] rational function.
      */
     @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substituteRationalFunction")
     public inline fun NumberedRationalFunction<C>.substitute(argument: Map<Int, NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided constant [argument] into [this] polynomial.
@@ -149,11 +153,13 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
      * Substitutes provided polynomial [argument] into [this] polynomial.
      */
     @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substitutePolynomial")
     public inline fun NumberedPolynomial<C>.substitute(argument: Buffer<NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, argument)
     /**
      * Substitutes provided rational function [argument] into [this] polynomial.
      */
     @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substituteRationalFunction")
     public inline fun NumberedPolynomial<C>.substitute(argument: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided constant [argument] into [this] rational function.
@@ -164,11 +170,13 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
      * Substitutes provided polynomial [arguments] into [this] rational function.
      */
     @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substitutePolynomial")
     public inline fun NumberedRationalFunction<C>.substitute(arguments: Buffer<NumberedPolynomial<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
     /**
      * Substitutes provided rational function [arguments] into [this] rational function.
      */
     @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substituteRationalFunction")
     public inline fun NumberedRationalFunction<C>.substitute(arguments: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
     /**
      * Substitutes provided constant [arguments] into [this] polynomial.
@@ -222,7 +230,7 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
      * Substitutes provided [arguments] into [this] polynomial.
      */
     @Suppress("NOTHING_TO_INLINE")
-    @JvmName("invokePolynomial")
+    @JvmName("invokeRationalFunction")
     public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
     /**
      * Substitutes provided [arguments] into [this] rational function.
@@ -234,6 +242,6 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
      * Substitutes provided [arguments] into [this] rational function.
      */
     @Suppress("NOTHING_TO_INLINE")
-    @JvmName("invokePolynomial")
+    @JvmName("invokeRationalFunction")
     public inline operator fun NumberedRationalFunction<C>.invoke(arguments: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
index 8b6fac39e..7d6fc84fa 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
@@ -6,8 +6,27 @@
 package space.kscience.kmath.functions
 
 
+/**
+ * Marks operations that are going to be optimized reimplementations by reducing number of boxings but currently is
+ * under development and is not stable (or even ready to use).
+ */
 @RequiresOptIn(
     message = "It's copy of operation with optimized boxing. It's currently unstable.",
     level = RequiresOptIn.Level.ERROR
 )
-internal annotation class UnstablePolynomialBoxingOptimization
\ No newline at end of file
+internal annotation class UnstablePolynomialBoxingOptimization
+
+/**
+ * Marks declarations that give access to internal entities of polynomials delicate structure. Thus, it allows to
+ * optimize performance a bit by skipping standard steps, but such skips may cause critical errors if something is
+ * implemented badly. Make sure you fully read and understand documentation and don't break internal contracts.
+ */
+@RequiresOptIn(
+    message = "This declaration gives access to delicate internal structure of polynomials. " +
+            "It allows to optimize performance by skipping unnecessary arguments check. " +
+            "But at the same time makes it easy to make a mistake " +
+            "that will cause wrong computation result or even runtime error. " +
+            "Make sure you fully read and understand documentation.",
+    level = RequiresOptIn.Level.WARNING
+)
+internal annotation class DelicatePolynomialAPI
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
index 05fff3472..37d5d7fb6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
@@ -37,6 +37,38 @@ internal inline fun <C> NumberedPolynomialAsIs(pairs: Collection<Pair<List<UInt>
 @PublishedApi
 internal inline fun <C> NumberedPolynomialAsIs(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial<C>(pairs.toMap())
 
+/**
+ * Constructs [NumberedPolynomial] with provided coefficients map [coefs]. The map is used as is.
+ *
+ * **Be sure you read description of [NumberedPolynomial.coefficients]. Otherwise, you may make a mistake that will
+ * cause wrong computation result or even runtime error.**
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+@DelicatePolynomialAPI
+public inline fun <C> NumberedPolynomialWithoutCheck(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial<C>(coefs)
+
+/**
+ * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ * The collections will be transformed to map with [toMap] and then will be used as is.
+ *
+ * **Be sure you read description of [NumberedPolynomial.coefficients]. Otherwise, you may make a mistake that will
+ * cause wrong computation result or even runtime error.**
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+@DelicatePolynomialAPI
+public inline fun <C> NumberedPolynomialWithoutCheck(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial<C>(pairs.toMap())
+
+/**
+ * Constructs [NumberedPolynomial] with provided array of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ * The array will be transformed to map with [toMap] and then will be used as is.
+ *
+ * **Be sure you read description of [NumberedPolynomial.coefficients]. Otherwise, you may make a mistake that will
+ * cause wrong computation result or even runtime error.**
+ */
+@Suppress("FunctionName", "NOTHING_TO_INLINE")
+@DelicatePolynomialAPI
+public inline fun <C> NumberedPolynomialWithoutCheck(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial<C>(pairs.toMap())
+
 /**
  * Constructs [NumberedPolynomial] with provided coefficients map [coefs].
  *
@@ -245,11 +277,12 @@ public class NumberedPolynomialTermSignatureBuilder {
      * Declaring another power of the same variable will increase its degree by received degree.
      */
     public infix fun Int.inPowerOf(deg: UInt) {
-        if (this > signature.lastIndex) {
-            signature.addAll(List(this - signature.lastIndex - 1) { 0u })
+        val index = this - 1
+        if (index > signature.lastIndex) {
+            signature.addAll(List(index - signature.lastIndex - 1) { 0u })
             signature.add(deg)
         } else {
-            signature[this] += deg
+            signature[index] += deg
         }
     }
     /**
@@ -334,22 +367,26 @@ public class NumberedPolynomialBuilder<C>(
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
-/**
- * Creates [NumberedPolynomial] with lambda [block] in context of [this] ring of constants.
- *
- * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
- * ```
- * Int.algebra {
- *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
- *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
- *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
- *     }
- * }
- * ```
- */
-@UnstableKMathAPI
-@Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> A.NumberedPolynomial(initialCapacity: Int = 0, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(::add, initialCapacity).apply(block).build()
+///**
+// * Creates [NumberedPolynomial] with lambda [block] in context of [this] ring of constants.
+// *
+// * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+// * ```
+// * Int.algebra {
+// *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
+// *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
+// *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+// *     }
+// * }
+// * ```
+// */
+// FIXME: For now this fabric does not let next two fabrics work. (See KT-52803.) Possible feature solutions:
+//  1. `LowPriorityInOverloadResolution` becomes public. Then it should be applied to this function.
+//  2. Union types are implemented. Then all three functions should be rewritten
+//     as one with single union type as a (context) receiver.
+//@UnstableKMathAPI
+//@Suppress("FunctionName")
+//public inline fun <C, A: Ring<C>> A.NumberedPolynomial(initialCapacity: Int = 0, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(::add, initialCapacity).apply(block).build()
 /**
  * Creates [NumberedPolynomial] with lambda [block] in context of [this] ring of [NumberedPolynomial]s.
  *
@@ -365,7 +402,7 @@ public inline fun <C, A: Ring<C>> A.NumberedPolynomial(initialCapacity: Int = 0,
  */
 @UnstableKMathAPI
 @Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(initialCapacity: Int, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(initialCapacity: Int = 0, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 /**
  * Creates [NumberedPolynomial] with lambda [block] in context of [this] field of [NumberedRationalFunction]s.
  *
@@ -381,7 +418,7 @@ public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomi
  */
 @UnstableKMathAPI
 @Suppress("FunctionName")
-public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(initialCapacity: Int, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(initialCapacity: Int = 0, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
index 484cd11e3..fca9a8ab8 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
@@ -86,7 +86,7 @@ public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>
 
 /**
  * Substitutes provided arguments [args] into [this] polynomial.
-     */ // TODO: To optimize boxing
+ */ // TODO: To optimize boxing
 @JvmName("substitutePolynomial")
 public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> =
     ring.numberedPolynomialSpace {
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
index c9950fac5..c4a7cc564 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("LocalVariableName")
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.test.misc.*
@@ -28,25 +30,32 @@ class ListPolynomialTest {
                 ListPolynomial(Rational(-2)) + 2,
                 "test 3"
             )
-            assertEquals(
-                ListPolynomial(),
-                ListPolynomial<Rational>() + 0,
+            val polynomial_4 = ListPolynomial<Rational>()
+            assertSame(
+                polynomial_4,
+                polynomial_4 + 0,
                 "test 4"
             )
+            val polynomial_5 = ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7))
+            assertSame(
+                polynomial_5,
+                polynomial_5 + 0,
+                "test 5"
+            )
             assertEquals(
                 ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
                 ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 1,
-                "test 5"
+                "test 6"
             )
             assertEquals(
                 ListPolynomial(Rational(-1)),
                 ListPolynomial(Rational(-2)) + 1,
-                "test 6"
+                "test 7"
             )
             assertEquals(
                 ListPolynomial(Rational(2)),
                 ListPolynomial<Rational>() + 2,
-                "test 7"
+                "test 8"
             )
         }
     }
@@ -68,25 +77,32 @@ class ListPolynomialTest {
                 ListPolynomial(Rational(2)) - 2,
                 "test 3"
             )
-            assertEquals(
-                ListPolynomial(),
-                ListPolynomial<Rational>() - 0,
+            val polynomial_4 = ListPolynomial<Rational>()
+            assertSame(
+                polynomial_4,
+                polynomial_4 - 0,
                 "test 4"
             )
+            val polynomial_5 = ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7))
+            assertEquals(
+                polynomial_5,
+                polynomial_5 - 0,
+                "test 5"
+            )
             assertEquals(
                 ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
                 ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 1,
-                "test 5"
+                "test 6"
             )
             assertEquals(
                 ListPolynomial(Rational(1)),
                 ListPolynomial(Rational(2)) - 1,
-                "test 6"
+                "test 7"
             )
             assertEquals(
                 ListPolynomial(Rational(-2)),
                 ListPolynomial<Rational>() - 2,
-                "test 7"
+                "test 8"
             )
         }
     }
@@ -103,6 +119,17 @@ class ListPolynomialTest {
                 ListPolynomial(7, 0, 49, 21, 14) * 15,
                 "test 2"
             )
+            val polynomial = ListPolynomial(22, 26, 13, 15, 26)
+            assertSame(
+                zero,
+                polynomial * 0,
+                "test 3"
+            )
+            assertSame(
+                polynomial,
+                polynomial * 1,
+                "test 4"
+            )
         }
     }
     @Test
@@ -123,25 +150,32 @@ class ListPolynomialTest {
                 2 + ListPolynomial(Rational(-2)),
                 "test 3"
             )
-            assertEquals(
-                ListPolynomial(),
-                0 + ListPolynomial(),
+            val polynomial_4 = ListPolynomial<Rational>()
+            assertSame(
+                polynomial_4,
+                0 + polynomial_4,
                 "test 4"
             )
+            val polynomial_5 = ListPolynomial<Rational>(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7))
+            assertSame(
+                polynomial_5,
+                0 + polynomial_5,
+                "test 5"
+            )
             assertEquals(
                 ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
                 1 + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
+                "test 6"
             )
             assertEquals(
                 ListPolynomial(Rational(-1)),
                 1 + ListPolynomial(Rational(-2)),
-                "test 6"
+                "test 7"
             )
             assertEquals(
                 ListPolynomial(Rational(2)),
                 2 + ListPolynomial(),
-                "test 7"
+                "test 8"
             )
         }
     }
@@ -163,25 +197,30 @@ class ListPolynomialTest {
                 -2 - ListPolynomial(Rational(-2)),
                 "test 3"
             )
+            assertEquals(
+                ListPolynomial(Rational(-32, 9), Rational(-8, -9), Rational(8, 7)),
+                0 - ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                "test 4"
+            )
             assertEquals(
                 ListPolynomial(),
                 0 - ListPolynomial(),
-                "test 4"
+                "test 5"
             )
             assertEquals(
                 ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
                 -1 - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
+                "test 6"
             )
             assertEquals(
                 ListPolynomial(Rational(1)),
                 -1 - ListPolynomial(Rational(-2)),
-                "test 6"
+                "test 7"
             )
             assertEquals(
                 ListPolynomial(Rational(-2)),
                 -2 - ListPolynomial(),
-                "test 7"
+                "test 8"
             )
         }
     }
@@ -198,6 +237,17 @@ class ListPolynomialTest {
                 15 * ListPolynomial(7, 0, 49, 21, 14),
                 "test 2"
             )
+            val polynomial = ListPolynomial(22, 26, 13, 15, 26)
+            assertSame(
+                zero,
+                0 * polynomial,
+                "test 3"
+            )
+            assertSame(
+                polynomial,
+                1 * polynomial,
+                "test 4"
+            )
         }
     }
     @Test
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
new file mode 100644
index 000000000..14493aaae
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.invoke
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+
+class NumberedConstructorsTest {
+    @Test
+    @UnstableKMathAPI
+    fun testBuilder() {
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(2u, 0u, 3u) to 5,
+                listOf(0u, 1u) to -6,
+            ),
+            Int.algebra.numberedPolynomialSpace {
+                NumberedPolynomial {
+                    5 { 1 inPowerOf 2u; 3 inPowerOf 3u }
+                    (-6) { 2 inPowerOf 1u }
+                }
+            },
+            "test 1"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to -1,
+            ),
+            Int.algebra.numberedPolynomialSpace {
+                NumberedPolynomial {
+                    5 { }
+                    (-6) { }
+                }
+            },
+            "test 2"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(2u) to -1,
+            ),
+            Int.algebra.numberedPolynomialSpace {
+                NumberedPolynomial {
+                    5 { 1 inPowerOf 1u; 1 inPowerOf 1u }
+                    (-6) { 1 inPowerOf 2u }
+                }
+            },
+            "test 3"
+        )
+    }
+    @Test
+    @UnstableKMathAPI
+    fun testFabric() {
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(2u, 0u, 3u) to 5,
+                listOf(0u, 1u) to -6,
+            ),
+            Int.algebra {
+                NumberedPolynomial(
+                    listOf(2u, 0u, 3u) to 5,
+                    listOf(0u, 1u) to -6,
+                )
+            },
+            "test 1"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(2u, 0u, 3u) to 5,
+                listOf(0u, 1u) to -6,
+            ),
+            Int.algebra {
+                NumberedPolynomial(
+                    listOf(2u, 0u, 3u, 0u) to 5,
+                    listOf(0u, 1u, 0u, 0u) to -6,
+                )
+            },
+            "test 2"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to -1,
+            ),
+            Int.algebra {
+                NumberedPolynomial(
+                    listOf(0u) to 5,
+                    listOf(0u, 0u) to -6,
+                )
+            },
+            "test 3"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0,
+            ),
+            Int.algebra {
+                NumberedPolynomial(
+                    listOf(0u) to 5,
+                    listOf(0u, 0u) to -5,
+                )
+            },
+            "test 4"
+        )
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
new file mode 100644
index 000000000..537e3b85d
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
@@ -0,0 +1,1368 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("LocalVariableName")
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.test.misc.*
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertSame
+
+
+@UnstableKMathAPI
+class NumberedPolynomialTest {
+    @Test
+    fun test_Polynomial_Int_plus() {
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(5, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } + -3,
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-3, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } + -3,
+                "test 2"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } + -3,
+                "test 3"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } + -3,
+                "test 4"
+            )
+            val polynomial_5 = NumberedPolynomial {
+                Rational(-22, 9) with {}
+                Rational(-8, 9) with { 1 pow 3u }
+                Rational(-8, 7) with { 2 pow 4u }
+            }
+            assertSame(
+                polynomial_5,
+                polynomial_5 + 0,
+                "test 5"
+            )
+            val polynomial_6 = NumberedPolynomial {
+                Rational(0, 9) with {}
+                Rational(-8, 9) with { 1 pow 3u }
+                Rational(-8, 7) with { 2 pow 4u }
+            }
+            assertSame(
+                polynomial_6,
+                polynomial_6 + 0,
+                "test 6"
+            )
+            val polynomial_7 = NumberedPolynomial {
+                Rational(-8, 9) with { 1 pow 3u }
+                Rational(-8, 7) with { 2 pow 4u }
+            }
+            assertSame(
+                polynomial_7,
+                polynomial_7 + 0,
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Int_minus() {
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(5, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } - 3,
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-3, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } - 3,
+                "test 2"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } - 3,
+                "test 3"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } - 3,
+                "test 4"
+            )
+            val polynomial_5 = NumberedPolynomial {
+                Rational(-22, 9) with {}
+                Rational(-8, 9) with { 1 pow 3u }
+                Rational(-8, 7) with { 2 pow 4u }
+            }
+            assertSame(
+                polynomial_5,
+                polynomial_5 - 0,
+                "test 5"
+            )
+            val polynomial_6 = NumberedPolynomial {
+                Rational(0, 9) with {}
+                Rational(-8, 9) with { 1 pow 3u }
+                Rational(-8, 7) with { 2 pow 4u }
+            }
+            assertSame(
+                polynomial_6,
+                polynomial_6 - 0,
+                "test 6"
+            )
+            val polynomial_7 = NumberedPolynomial {
+                Rational(-8, 9) with { 1 pow 3u }
+                Rational(-8, 7) with { 2 pow 4u }
+            }
+            assertSame(
+                polynomial_7,
+                polynomial_7 - 0,
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Int_times() {
+        IntModuloRing(35).numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    m(34) with {}
+                    m(2) with { 1 pow 3u }
+                    m(1) with { 2 pow 1u }
+                    m(20) with { 1 pow 1u }
+                    m(2) with { 3 pow 2u }
+               },
+                NumberedPolynomial {
+                    m(22) with {}
+                    m(26) with { 1 pow 3u }
+                    m(13) with { 2 pow 1u }
+                    m(15) with { 1 pow 1u }
+                    m(26) with { 3 pow 2u }
+                } * 27,
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    m(0) with {}
+                    m(0) with { 1 pow 3u }
+                    m(0) with { 2 pow 1u }
+                    m(0) with { 1 pow 1u }
+                    m(0) with { 3 pow 2u }
+                },
+                NumberedPolynomial {
+                    m(7) with {}
+                    m(0) with { 1 pow 3u }
+                    m(49) with { 2 pow 1u }
+                    m(21) with { 1 pow 1u }
+                    m(14) with { 3 pow 2u }
+                } * 15,
+                "test 2"
+            )
+            val polynomial = NumberedPolynomial {
+                m(22) with {}
+                m(26) with { 1 pow 3u }
+                m(13) with { 2 pow 1u }
+                m(15) with { 1 pow 1u }
+                m(26) with { 3 pow 2u }
+            }
+            assertSame(
+                zero,
+                polynomial * 0,
+                "test 3"
+            )
+            assertSame(
+                polynomial,
+                polynomial * 1,
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_plus() {
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                -3 + NumberedPolynomial {
+                    Rational(5, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-3, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                -3 + NumberedPolynomial {
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 2"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                -3 + NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 3"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                -3 + NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 4"
+            )
+            val polynomial_5 = NumberedPolynomial {
+                Rational(-22, 9) with {}
+                Rational(-8, 9) with { 1 pow 3u }
+                Rational(-8, 7) with { 2 pow 4u }
+            }
+            assertSame(
+                polynomial_5,
+                0 + polynomial_5,
+                "test 5"
+            )
+            val polynomial_6 = NumberedPolynomial {
+                Rational(0, 9) with {}
+                Rational(-8, 9) with { 1 pow 3u }
+                Rational(-8, 7) with { 2 pow 4u }
+            }
+            assertSame(
+                polynomial_6,
+                0 + polynomial_6,
+                "test 6"
+            )
+            val polynomial_7 = NumberedPolynomial {
+                Rational(-8, 9) with { 1 pow 3u }
+                Rational(-8, 7) with { 2 pow 4u }
+            }
+            assertSame(
+                polynomial_7,
+                0 + polynomial_7,
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_minus() {
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(22, 9) with {}
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                3 - NumberedPolynomial {
+                    Rational(5, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(3, 1) with {}
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                3 - NumberedPolynomial {
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 2"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                3 - NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 3"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                3 - NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 4"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(22, 9) with {}
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                0 - NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 5"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 9) with {}
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                0 - NumberedPolynomial {
+                    Rational(0, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 6"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                0 - NumberedPolynomial {
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_times() {
+        IntModuloRing(35).numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    m(34) with {}
+                    m(2) with { 1 pow 3u }
+                    m(1) with { 2 pow 1u }
+                    m(20) with { 1 pow 1u }
+                    m(2) with { 3 pow 2u }
+                },
+                27 * NumberedPolynomial {
+                    m(22) with {}
+                    m(26) with { 1 pow 3u }
+                    m(13) with { 2 pow 1u }
+                    m(15) with { 1 pow 1u }
+                    m(26) with { 3 pow 2u }
+                },
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    m(0) with {}
+                    m(0) with { 1 pow 3u }
+                    m(0) with { 2 pow 1u }
+                    m(0) with { 1 pow 1u }
+                    m(0) with { 3 pow 2u }
+                },
+                15 * NumberedPolynomial {
+                    m(7) with {}
+                    m(0) with { 1 pow 3u }
+                    m(49) with { 2 pow 1u }
+                    m(21) with { 1 pow 1u }
+                    m(14) with { 3 pow 2u }
+                },
+                "test 2"
+            )
+            val polynomial = NumberedPolynomial {
+                m(22) with {}
+                m(26) with { 1 pow 3u }
+                m(13) with { 2 pow 1u }
+                m(15) with { 1 pow 1u }
+                m(26) with { 3 pow 2u }
+            }
+            assertSame(
+                zero,
+                0 * polynomial,
+                "test 3"
+            )
+            assertSame(
+                polynomial,
+                1 * polynomial,
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_plus() {
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(5, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } + Rational(-3),
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-3, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } + Rational(-3),
+                "test 2"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } + Rational(-3),
+                "test 3"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } + Rational(-3),
+                "test 4"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } + Rational(0),
+                "test 5"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(0, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } + Rational(0),
+                "test 6"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } + Rational(0),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_minus() {
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(5, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } - Rational(3),
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-3, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } - Rational(3),
+                "test 2"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } - Rational(3),
+                "test 3"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } - Rational(3),
+                "test 4"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } - Rational(0),
+                "test 5"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(0, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } - Rational(0),
+                "test 6"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                NumberedPolynomial {
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                } - Rational(0),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_times() {
+        IntModuloRing(35).numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    m(34) with {}
+                    m(2) with { 1 pow 3u }
+                    m(1) with { 2 pow 1u }
+                    m(20) with { 1 pow 1u }
+                    m(2) with { 3 pow 2u }
+                },
+                NumberedPolynomial {
+                    m(22) with {}
+                    m(26) with { 1 pow 3u }
+                    m(13) with { 2 pow 1u }
+                    m(15) with { 1 pow 1u }
+                    m(26) with { 3 pow 2u }
+                } * m(27),
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    m(0) with {}
+                    m(0) with { 1 pow 3u }
+                    m(0) with { 2 pow 1u }
+                    m(0) with { 1 pow 1u }
+                    m(0) with { 3 pow 2u }
+                },
+                NumberedPolynomial {
+                    m(7) with {}
+                    m(0) with { 1 pow 3u }
+                    m(49) with { 2 pow 1u }
+                    m(21) with { 1 pow 1u }
+                    m(14) with { 3 pow 2u }
+                } * m(15),
+                "test 2"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    m(0) with {}
+                    m(0) with { 1 pow 3u }
+                    m(0) with { 2 pow 1u }
+                    m(0) with { 1 pow 1u }
+                    m(0) with { 3 pow 2u }
+                },
+                NumberedPolynomial {
+                    m(22) with {}
+                    m(26) with { 1 pow 3u }
+                    m(13) with { 2 pow 1u }
+                    m(15) with { 1 pow 1u }
+                    m(26) with { 3 pow 2u }
+                } * m(0),
+                "test 3"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    m(22) with {}
+                    m(26) with { 1 pow 3u }
+                    m(13) with { 2 pow 1u }
+                    m(15) with { 1 pow 1u }
+                    m(26) with { 3 pow 2u }
+                },
+                NumberedPolynomial {
+                    m(22) with {}
+                    m(26) with { 1 pow 3u }
+                    m(13) with { 2 pow 1u }
+                    m(15) with { 1 pow 1u }
+                    m(26) with { 3 pow 2u }
+                } * m(1),
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_plus() {
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                Rational(-3) + NumberedPolynomial {
+                    Rational(5, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-3, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                Rational(-3) + NumberedPolynomial {
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 2"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                Rational(-3) + NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 3"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                Rational(-3) + NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 4"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                Rational(0) + NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 5"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                Rational(0) + NumberedPolynomial {
+                    Rational(0, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 6"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                Rational(0) + NumberedPolynomial {
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_minus() {
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(22, 9) with {}
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                Rational(3) - NumberedPolynomial {
+                    Rational(5, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(3, 1) with {}
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                Rational(3) - NumberedPolynomial {
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 2"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                Rational(3) - NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 3"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 1) with {}
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                Rational(3) - NumberedPolynomial {
+                    Rational(27, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 4"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(22, 9) with {}
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                Rational(0) - NumberedPolynomial {
+                    Rational(-22, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 5"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0, 9) with {}
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                Rational(0) - NumberedPolynomial {
+                    Rational(0, 9) with {}
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 6"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0) with {}
+                    Rational(8, 9) with { 1 pow 3u }
+                    Rational(8, 7) with { 2 pow 4u }
+                },
+                Rational(0) - NumberedPolynomial {
+                    Rational(-8, 9) with { 1 pow 3u }
+                    Rational(-8, 7) with { 2 pow 4u }
+                },
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_times() {
+        IntModuloRing(35).numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    m(34) with {}
+                    m(2) with { 1 pow 3u }
+                    m(1) with { 2 pow 1u }
+                    m(20) with { 1 pow 1u }
+                    m(2) with { 3 pow 2u }
+                },
+                m(27) * NumberedPolynomial {
+                    m(22) with {}
+                    m(26) with { 1 pow 3u }
+                    m(13) with { 2 pow 1u }
+                    m(15) with { 1 pow 1u }
+                    m(26) with { 3 pow 2u }
+                },
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    m(0) with {}
+                    m(0) with { 1 pow 3u }
+                    m(0) with { 2 pow 1u }
+                    m(0) with { 1 pow 1u }
+                    m(0) with { 3 pow 2u }
+                },
+                m(15) * NumberedPolynomial {
+                    m(7) with {}
+                    m(0) with { 1 pow 3u }
+                    m(49) with { 2 pow 1u }
+                    m(21) with { 1 pow 1u }
+                    m(14) with { 3 pow 2u }
+                },
+                "test 2"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    m(0) with {}
+                    m(0) with { 1 pow 3u }
+                    m(0) with { 2 pow 1u }
+                    m(0) with { 1 pow 1u }
+                    m(0) with { 3 pow 2u }
+                },
+                m(0) * NumberedPolynomial {
+                    m(22) with {}
+                    m(26) with { 1 pow 3u }
+                    m(13) with { 2 pow 1u }
+                    m(15) with { 1 pow 1u }
+                    m(26) with { 3 pow 2u }
+                },
+                "test 3"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    m(22) with {}
+                    m(26) with { 1 pow 3u }
+                    m(13) with { 2 pow 1u }
+                    m(15) with { 1 pow 1u }
+                    m(26) with { 3 pow 2u }
+                },
+                m(1) * NumberedPolynomial {
+                    m(22) with {}
+                    m(26) with { 1 pow 3u }
+                    m(13) with { 2 pow 1u }
+                    m(15) with { 1 pow 1u }
+                    m(26) with { 3 pow 2u }
+                },
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_unaryMinus() {
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-5, 9) with { 1 pow 5u }
+                    Rational(8, 9) with {}
+                    Rational(8, 7) with { 7 pow 13u }
+                },
+                -NumberedPolynomial {
+                    Rational(5, 9) with { 1 pow 5u }
+                    Rational(-8, 9) with {}
+                    Rational(-8, 7) with { 7 pow 13u }
+                },
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-5, 9) with { 3 pow 7u }
+                    Rational(8, 9) with {}
+                    Rational(8, 7) with { 1 pow 3u }
+                    Rational(0) with { 2 pow 4u }
+                    Rational(0) with { 1 pow 5u }
+                },
+                -NumberedPolynomial {
+                    Rational(5, 9) with { 3 pow 7u }
+                    Rational(-8, 9) with {}
+                    Rational(-8, 7) with { 1 pow 3u }
+                    Rational(0) with { 2 pow 4u }
+                    Rational(0) with { 1 pow 5u }
+                },
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_plus() {
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-17, 2) with {}
+                    Rational(-1, 3) with { 1 pow 1u }
+                    Rational(-25, 21) with { 1 pow 2u }
+                    Rational(146, 63) with { 2 pow 1u }
+                    Rational(-3, 5) with { 1 pow 1u; 2 pow 1u }
+                    Rational(61, 15) with { 1 pow 2u; 2 pow 1u }
+                    Rational(157, 63) with { 2 pow 2u }
+                    Rational(-55, 21) with { 1 pow 1u; 2 pow 2u }
+                    Rational(11, 24) with { 1 pow 2u; 2 pow 2u }
+                },
+                NumberedPolynomial {
+                    Rational(6, 4) with {}
+                    Rational(-2, 6) with { 1 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u }
+                    Rational(17, 7) with { 2 pow 1u }
+                    Rational(-7, 7) with { 1 pow 1u; 2 pow 1u }
+                    Rational(12, 5) with { 1 pow 2u; 2 pow 1u }
+                    Rational(12, 7) with { 2 pow 2u }
+                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
+                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
+                } + NumberedPolynomial {
+                    Rational(-20, 2) with {}
+                    Rational(0, 9) with { 1 pow 1u }
+                    Rational(-20, 7) with { 1 pow 2u }
+                    Rational(-1, 9) with { 2 pow 1u }
+                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
+                    Rational(7, 9) with { 2 pow 2u }
+                    Rational(5, 7) with { 1 pow 1u; 2 pow 2u }
+                    Rational(-2, 3) with { 1 pow 2u; 2 pow 2u }
+                },
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-17, 2) with {}
+                    Rational(-1, 3) with { 1 pow 1u }
+                    Rational(-25, 21) with { 1 pow 2u }
+                    Rational(-1, 9) with { 2 pow 1u }
+                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
+                    Rational(157, 63) with { 2 pow 2u }
+                    Rational(-55, 21) with { 1 pow 1u; 2 pow 2u }
+                    Rational(11, 24) with { 1 pow 2u; 2 pow 2u }
+                },
+                NumberedPolynomial {
+                    Rational(6, 4) with {}
+                    Rational(-2, 6) with { 1 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u }
+                    Rational(12, 7) with { 2 pow 2u }
+                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
+                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
+                } + NumberedPolynomial {
+                    Rational(-20, 2) with {}
+                    Rational(0, 9) with { 1 pow 1u }
+                    Rational(-20, 7) with { 1 pow 2u }
+                    Rational(-1, 9) with { 2 pow 1u }
+                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
+                    Rational(7, 9) with { 2 pow 2u }
+                    Rational(5, 7) with { 1 pow 1u; 2 pow 2u }
+                    Rational(-2, 3) with { 1 pow 2u; 2 pow 2u }
+                },
+                "test 2"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-17, 2) with {}
+                    Rational(-1, 3) with { 1 pow 1u }
+                    Rational(-25, 21) with { 1 pow 2u }
+                    Rational(-1, 9) with { 2 pow 1u }
+                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
+                    Rational(12, 7) with { 2 pow 2u }
+                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
+                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
+                },
+                NumberedPolynomial {
+                    Rational(6, 4) with {}
+                    Rational(-2, 6) with { 1 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u }
+                    Rational(12, 7) with { 2 pow 2u }
+                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
+                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
+                } + NumberedPolynomial {
+                    Rational(-20, 2) with {}
+                    Rational(0, 9) with { 1 pow 1u }
+                    Rational(-20, 7) with { 1 pow 2u }
+                    Rational(-1, 9) with { 2 pow 1u }
+                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
+                    Rational(0) with { 2 pow 2u }
+                    Rational(0) with { 1 pow 1u; 2 pow 2u }
+                    Rational(0) with { 1 pow 2u; 2 pow 2u }
+                },
+                "test 3"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0) with {}
+                    Rational(0) with { 1 pow 1u }
+                    Rational(0) with { 1 pow 2u }
+                    Rational(0) with { 2 pow 1u }
+                    Rational(0) with { 1 pow 1u; 2 pow 1u }
+                    Rational(0) with { 1 pow 2u; 2 pow 1u }
+                    Rational(0) with { 2 pow 2u }
+                    Rational(0) with { 1 pow 1u; 2 pow 2u }
+                    Rational(0) with { 1 pow 2u; 2 pow 2u }
+                },
+                NumberedPolynomial {
+                    Rational(6, 4) with {}
+                    Rational(-2, 6) with { 1 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u }
+                    Rational(17, 7) with { 2 pow 1u }
+                    Rational(-7, 7) with { 1 pow 1u; 2 pow 1u }
+                    Rational(12, 5) with { 1 pow 2u; 2 pow 1u }
+                    Rational(12, 7) with { 2 pow 2u }
+                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
+                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
+                } + NumberedPolynomial {
+                    Rational(-6, 4) with {}
+                    Rational(2, 6) with { 1 pow 1u }
+                    Rational(-10, 6) with { 1 pow 2u }
+                    Rational(-17, 7) with { 2 pow 1u }
+                    Rational(7, 7) with { 1 pow 1u; 2 pow 1u }
+                    Rational(-12, 5) with { 1 pow 2u; 2 pow 1u }
+                    Rational(-12, 7) with { 2 pow 2u }
+                    Rational(10, 3) with { 1 pow 1u; 2 pow 2u }
+                    Rational(-9, 8) with { 1 pow 2u; 2 pow 2u }
+                },
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_minus() {
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-17, 2) with {}
+                    Rational(-1, 3) with { 1 pow 1u }
+                    Rational(-25, 21) with { 1 pow 2u }
+                    Rational(146, 63) with { 2 pow 1u }
+                    Rational(-3, 5) with { 1 pow 1u; 2 pow 1u }
+                    Rational(61, 15) with { 1 pow 2u; 2 pow 1u }
+                    Rational(157, 63) with { 2 pow 2u }
+                    Rational(-55, 21) with { 1 pow 1u; 2 pow 2u }
+                    Rational(11, 24) with { 1 pow 2u; 2 pow 2u }
+                },
+                NumberedPolynomial {
+                    Rational(6, 4) with {}
+                    Rational(-2, 6) with { 1 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u }
+                    Rational(17, 7) with { 2 pow 1u }
+                    Rational(-7, 7) with { 1 pow 1u; 2 pow 1u }
+                    Rational(12, 5) with { 1 pow 2u; 2 pow 1u }
+                    Rational(12, 7) with { 2 pow 2u }
+                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
+                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
+                } - NumberedPolynomial {
+                    Rational(20, 2) with {}
+                    Rational(0, 9) with { 1 pow 1u }
+                    Rational(20, 7) with { 1 pow 2u }
+                    Rational(1, 9) with { 2 pow 1u }
+                    Rational(-2, 5) with { 1 pow 1u; 2 pow 1u }
+                    Rational(-10, 6) with { 1 pow 2u; 2 pow 1u }
+                    Rational(-7, 9) with { 2 pow 2u }
+                    Rational(-5, 7) with { 1 pow 1u; 2 pow 2u }
+                    Rational(2, 3) with { 1 pow 2u; 2 pow 2u }
+                },
+                "test 1"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-17, 2) with {}
+                    Rational(-1, 3) with { 1 pow 1u }
+                    Rational(-25, 21) with { 1 pow 2u }
+                    Rational(-1, 9) with { 2 pow 1u }
+                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
+                    Rational(157, 63) with { 2 pow 2u }
+                    Rational(-55, 21) with { 1 pow 1u; 2 pow 2u }
+                    Rational(11, 24) with { 1 pow 2u; 2 pow 2u }
+                },
+                NumberedPolynomial {
+                    Rational(6, 4) with {}
+                    Rational(-2, 6) with { 1 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u }
+                    Rational(12, 7) with { 2 pow 2u }
+                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
+                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
+                } - NumberedPolynomial {
+                    Rational(20, 2) with {}
+                    Rational(0, 9) with { 1 pow 1u }
+                    Rational(20, 7) with { 1 pow 2u }
+                    Rational(1, 9) with { 2 pow 1u }
+                    Rational(-2, 5) with { 1 pow 1u; 2 pow 1u }
+                    Rational(-10, 6) with { 1 pow 2u; 2 pow 1u }
+                    Rational(-7, 9) with { 2 pow 2u }
+                    Rational(-5, 7) with { 1 pow 1u; 2 pow 2u }
+                    Rational(2, 3) with { 1 pow 2u; 2 pow 2u }
+                },
+                "test 2"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(-17, 2) with {}
+                    Rational(-1, 3) with { 1 pow 1u }
+                    Rational(-25, 21) with { 1 pow 2u }
+                    Rational(-1, 9) with { 2 pow 1u }
+                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
+                    Rational(12, 7) with { 2 pow 2u }
+                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
+                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
+                },
+                NumberedPolynomial {
+                    Rational(6, 4) with {}
+                    Rational(-2, 6) with { 1 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u }
+                    Rational(12, 7) with { 2 pow 2u }
+                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
+                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
+                } - NumberedPolynomial {
+                    Rational(20, 2) with {}
+                    Rational(0, 9) with { 1 pow 1u }
+                    Rational(20, 7) with { 1 pow 2u }
+                    Rational(1, 9) with { 2 pow 1u }
+                    Rational(-2, 5) with { 1 pow 1u; 2 pow 1u }
+                    Rational(-10, 6) with { 1 pow 2u; 2 pow 1u }
+                    Rational(0) with { 2 pow 2u }
+                    Rational(0) with { 1 pow 1u; 2 pow 2u }
+                    Rational(0) with { 1 pow 2u; 2 pow 2u }
+                },
+                "test 3"
+            )
+            assertEquals(
+                NumberedPolynomial {
+                    Rational(0) with {}
+                    Rational(0) with { 1 pow 1u }
+                    Rational(0) with { 1 pow 2u }
+                    Rational(0) with { 2 pow 1u }
+                    Rational(0) with { 1 pow 1u; 2 pow 1u }
+                    Rational(0) with { 1 pow 2u; 2 pow 1u }
+                    Rational(0) with { 2 pow 2u }
+                    Rational(0) with { 1 pow 1u; 2 pow 2u }
+                    Rational(0) with { 1 pow 2u; 2 pow 2u }
+                },
+                NumberedPolynomial {
+                    Rational(6, 4) with {}
+                    Rational(-2, 6) with { 1 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u }
+                    Rational(17, 7) with { 2 pow 1u }
+                    Rational(-7, 7) with { 1 pow 1u; 2 pow 1u }
+                    Rational(12, 5) with { 1 pow 2u; 2 pow 1u }
+                    Rational(12, 7) with { 2 pow 2u }
+                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
+                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
+                } - NumberedPolynomial {
+                    Rational(6, 4) with {}
+                    Rational(-2, 6) with { 1 pow 1u }
+                    Rational(10, 6) with { 1 pow 2u }
+                    Rational(17, 7) with { 2 pow 1u }
+                    Rational(-7, 7) with { 1 pow 1u; 2 pow 1u }
+                    Rational(12, 5) with { 1 pow 2u; 2 pow 1u }
+                    Rational(12, 7) with { 2 pow 2u }
+                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
+                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
+                },
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_times() {
+        IntModuloRing(35).numberedPolynomialSpace {
+            // (p + q + r) * (p^2 + q^2 + r^2 - pq - pr - qr) = p^3 + q^3 + r^3 - 3pqr
+            assertEquals(
+                NumberedPolynomial {
+                    m(1) with { 1 pow 3u }
+                    m(1) with { 2 pow 3u }
+                    m(1) with { 3 pow 3u }
+                    m(0) with { 1 pow 1u; 2 pow 2u }
+                    m(0) with { 2 pow 1u; 3 pow 2u }
+                    m(0) with { 3 pow 1u; 1 pow 2u }
+                    m(0) with { 1 pow 1u; 3 pow 2u }
+                    m(0) with { 2 pow 1u; 1 pow 2u }
+                    m(0) with { 3 pow 1u; 2 pow 2u }
+                    m(-3) with { 1 pow 1u; 2 pow 1u; 3 pow 1u }
+                },
+                NumberedPolynomial {
+                    m(1) with { 1 pow 1u }
+                    m(1) with { 2 pow 1u }
+                    m(1) with { 3 pow 1u }
+                } * NumberedPolynomial {
+                    m(1) with { 1 pow 2u }
+                    m(1) with { 2 pow 2u }
+                    m(1) with { 3 pow 2u }
+                    m(-1) with { 1 pow 1u; 2 pow 1u }
+                    m(-1) with { 2 pow 1u; 3 pow 1u }
+                    m(-1) with { 3 pow 1u; 1 pow 1u }
+                },
+                "test 1"
+            )
+            // Spoiler: 5 * 7 = 0
+            assertEquals(
+                NumberedPolynomial {
+                    m(0) with { 1 pow 2u }
+                    m(0) with { 2 pow 2u }
+                    m(0) with { 3 pow 2u }
+                    m(0) with { 1 pow 1u; 2 pow 1u }
+                    m(0) with { 2 pow 1u; 3 pow 1u }
+                    m(0) with { 3 pow 1u; 1 pow 1u }
+                },
+                NumberedPolynomial {
+                    m(5) with { 1 pow 1u }
+                    m(-25) with { 2 pow 1u }
+                    m(10) with { 3 pow 1u }
+                } * NumberedPolynomial {
+                    m(21) with { 1 pow 1u }
+                    m(14) with { 2 pow 1u }
+                    m(-7) with { 3 pow 1u }
+                },
+                "test 2"
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
index 89764db46..afd2b5add 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.test.misc
 
 import space.kscience.kmath.functions.ListPolynomial
 import space.kscience.kmath.functions.ListPolynomialSpace
+import space.kscience.kmath.functions.PolynomialSpaceOverRing
 import space.kscience.kmath.operations.Ring
 
 
@@ -135,4 +136,7 @@ class IntModuloRing : Ring<IntModulo> {
 fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
     ListPolynomial(coefs.map { IntModulo(it, ring.modulus) })
 fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
-    ListPolynomial(coefs.map { IntModulo(it, modulus) })
\ No newline at end of file
+    ListPolynomial(coefs.map { IntModulo(it, modulus) })
+
+fun IntModuloRing.m(arg: Int) = IntModulo(arg, modulus)
+fun PolynomialSpaceOverRing<IntModulo, *, IntModuloRing>.m(arg: Int) = IntModulo(arg, ring.modulus)
\ No newline at end of file
-- 
2.34.1


From 1ea336b70ea5a0f44722071b29193215c1460b14 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 17 Jun 2022 22:07:54 +0300
Subject: [PATCH 536/713] Added some test of NumberedPolynomial utilities.

---
 .../functions/NumberedPolynomialUtilTest.kt   | 293 ++++++++++++++++++
 .../kscience/kmath/test/misc/assertion.kt     |  14 +
 2 files changed, 307 insertions(+)
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt

diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
new file mode 100644
index 000000000..ecad6198e
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
@@ -0,0 +1,293 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.test.misc.Rational
+import space.kscience.kmath.test.misc.RationalField
+import space.kscience.kmath.test.misc.assertContentEquals
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+
+class NumberedPolynomialUtilTest {
+    @Test
+    fun test_substitute_Double_Map() {
+        assertContentEquals(
+            mapOf(emptyList<UInt>() to 0.0),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 1.0,
+                listOf(1u) to -2.0,
+                listOf(2u) to 1.0,
+            ).substitute(mapOf(
+                0 to 1.0
+            )).coefficients,
+            0.001,
+            "test 1"
+        )
+        assertContentEquals(
+            mapOf(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(mapOf()).coefficients,
+            0.001,
+            "test 2"
+        )
+        assertContentEquals(
+            mapOf(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(0u, 2u) to 0.2700930201481795,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                0 to 0.0
+            )).coefficients,
+            0.001,
+            "test 3"
+        )
+        assertContentEquals(
+            mapOf(
+                listOf<UInt>() to 1.433510890645169,
+                listOf(1u) to 0.6264844682514724,
+                listOf(2u) to 0.8405727903771333,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                1 to 0.8400458576651112
+            )).coefficients,
+            0.001,
+            "test 4"
+        )
+        assertContentEquals(
+            mapOf(
+                listOf<UInt>() to 1.934530767358133,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                0 to 0.4846192734143442,
+                1 to 0.8400458576651112,
+            )).coefficients,
+            0.001,
+            "test 5"
+        )
+        assertContentEquals(
+            mapOf(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                5 to 0.9211194782050933
+            )).coefficients,
+            0.001,
+            "test 6"
+        )
+    }
+    @Test
+    fun test_substitute_Constant() {
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0)
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1)
+            ).substitute(RationalField, mapOf(
+                0 to Rational(1)
+            )),
+            "test 1"
+        )
+        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5%2C+y+%3D+12%2F9
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(143, 150)
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                0 to Rational(-2, 5),
+                1 to Rational(12, 9),
+            )),
+            "test 2"
+        )
+        // https://www.wolframalpha.com/input?i=%28%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2%29+p%5E8+where+x+%3D+q%2Fp%2C+y+%3D+x%5E3%2C+p+%3D+-2%2F5%2C+q+%3D+12%2F9
+        assertEquals(
+            NumberedPolynomialAsIs(
+            listOf<UInt>() to Rational(47639065216, 2562890625)
+            ),
+            NumberedPolynomialAsIs(
+                listOf(8u) to Rational(-3, 2),
+                listOf(7u, 1u) to Rational(8, 6),
+                listOf(6u, 2u) to Rational(14, 6),
+                listOf(5u, 3u) to Rational(-3, 1),
+                listOf(4u, 4u) to Rational(-19, 2),
+                listOf(3u, 5u) to Rational(9, 4),
+                listOf(2u, 6u) to Rational(5, 5),
+                listOf(1u, 7u) to Rational(18, 9),
+                listOf(0u, 8u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                0 to Rational(-2, 5),
+                1 to Rational(12, 9),
+            )),
+            "test 3"
+        )
+        // https://www.wolframalpha.com/input?i=%28%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2%29+p%5E8+where+x+%3D+q%2Fp%2C+y+%3D+x%5E3%2C+p+%3D+-2%2F5%2C+q+%3D+12%2F9
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(8u) to Rational(-3, 2),
+                listOf(7u, 1u) to Rational(8, 6),
+                listOf(6u, 2u) to Rational(14, 6),
+                listOf(5u, 3u) to Rational(-3, 1),
+                listOf(4u, 4u) to Rational(-19, 2),
+                listOf(3u, 5u) to Rational(9, 4),
+                listOf(2u, 6u) to Rational(5, 5),
+                listOf(1u, 7u) to Rational(18, 9),
+                listOf(0u, 8u) to Rational(5, 2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf(8u) to Rational(-3, 2),
+                listOf(7u, 1u) to Rational(8, 6),
+                listOf(6u, 2u) to Rational(14, 6),
+                listOf(5u, 3u) to Rational(-3, 1),
+                listOf(4u, 4u) to Rational(-19, 2),
+                listOf(3u, 5u) to Rational(9, 4),
+                listOf(2u, 6u) to Rational(5, 5),
+                listOf(1u, 7u) to Rational(18, 9),
+                listOf(0u, 8u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf<Int, Rational>()),
+            "test 4"
+        )
+    }
+    @Test
+    fun test_substitute_Polynomial() {
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0)
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1)
+            ).substitute(RationalField, mapOf(
+                0 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            )),
+            "test 1"
+        )
+        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5%2C+y+%3D+12%2F9
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(0u, 1u) to Rational(-92, 21),
+                listOf(0u, 2u) to Rational(-2627, 2352),
+                listOf(0u, 3u) to Rational(4565, 3136),
+                listOf(0u, 4u) to Rational(605, 1568),
+                listOf(1u) to Rational(-20, 3),
+                listOf(1u, 1u) to Rational(1445, 21),
+                listOf(1u, 2u) to Rational(-13145, 392),
+                listOf(1u, 3u) to Rational(-3025, 196),
+                listOf(2u) to Rational(175, 3),
+                listOf(2u, 1u) to Rational(2475, 28),
+                listOf(2u, 2u) to Rational(15125, 98),
+                listOf(3u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                0 to NumberedPolynomialAsIs(
+                    listOf(1u) to Rational(-5, 1),
+                    listOf(0u, 1u) to Rational(2, 8),
+                ),
+                1 to NumberedPolynomialAsIs(
+                    listOf(1u) to Rational(0, 5),
+                    listOf(0u, 1u) to Rational(11, 7),
+                ),
+            )),
+            "test 2"
+        )
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt
new file mode 100644
index 000000000..52ecf416a
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.test.misc
+
+import kotlin.test.assertEquals
+
+
+fun <T> assertContentEquals(expected: Map<T, Double>, actual: Map<T, Double>, absoluteTolerance: Double, message: String? = null) {
+    assertEquals(expected.keys, actual.keys, message)
+    for ((key, expectedValue) in expected) assertEquals(expectedValue, actual[key]!!, absoluteTolerance, message)
+}
\ No newline at end of file
-- 
2.34.1


From 680d23ddcb0c3e11ea779146f3d2ced2d8c741be Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 18 Jun 2022 01:25:14 +0300
Subject: [PATCH 537/713] Last sift. Cleaned up labeled structures.

---
 .../kmath/functions/LabeledPolynomial.kt      | 621 ++++++++++++++++++
 .../functions/LabeledRationalFunction.kt      |  96 +++
 .../kmath/functions/ListPolynomial.kt         |   2 +-
 .../kmath/functions/NumberedPolynomial.kt     |  11 +-
 .../kmath/functions/labeledConstructors.kt    | 518 +++++++++++++++
 .../kscience/kmath/functions/labeledUtil.kt   | 327 +++++++++
 .../kmath/functions/numberedConstructors.kt   |  40 +-
 .../kscience/kmath/functions/numberedUtil.kt  |  18 +-
 8 files changed, 1584 insertions(+), 49 deletions(-)
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
new file mode 100644
index 000000000..b0c54502d
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -0,0 +1,621 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.operations.Ring
+import kotlin.jvm.JvmName
+import kotlin.math.max
+
+
+/**
+ * Represents multivariate polynomial that stores its coefficients in a [Map] and terms' signatures in a [Map] that
+ * associates variables (of type [Symbol]) with their degree.
+ *
+ * @param C the type of constants.
+ */
+public data class LabeledPolynomial<C>
+@PublishedApi
+internal constructor(
+    /**
+     * Map that contains coefficients of the polynomial.
+     *
+     * Every monomial `a x_1^{d_1} ... x_n^{d_n}` is stored as a pair "key-value" in the map, where the value is the
+     * coefficient `a` and the key is a map that associates variables in the monomial with their degree in the monomial.
+     * For example, coefficients of a polynomial `5 a^2 c^3 - 6 b` can be represented as
+     * ```
+     * mapOf(
+     *      mapOf(
+     *          a to 2,
+     *          c to 3
+     *      ) to 5,
+     *      mapOf(
+     *          b to 1
+     *      ) to (-6)
+     * )
+     * ```
+     * and also as
+     * ```
+     * mapOf(
+     *      mapOf(
+     *          a to 2,
+     *          c to 3
+     *      ) to 5,
+     *      mapOf(
+     *          b to 1
+     *      ) to (-6),
+     *      mapOf(
+     *          b to 1,
+     *          c to 1
+     *      ) to 0
+     * )
+     * ```
+     * where `a`, `b` and `c` are corresponding [Symbol] objects.
+     */
+    public val coefficients: Map<Map<Symbol, UInt>, C>
+) : Polynomial<C> {
+    override fun toString(): String = "LabeledPolynomial$coefficients"
+}
+
+/**
+ * Arithmetic context for multivariate polynomials with coefficients stored as a [Map] and terms' signatures stored as a
+ * [Map] constructed with the provided [ring] of constants.
+ *
+ * @param C the type of constants. Polynomials have them a coefficients in their terms.
+ * @param A type of provided underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
+ */
+public class LabeledPolynomialSpace<C, A : Ring<C>>(
+    public override val ring: A,
+) : MultivariatePolynomialSpace<C, Symbol, LabeledPolynomial<C>>, PolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
+    /**
+     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
+    public override operator fun Symbol.plus(other: Int): LabeledPolynomial<C> =
+        if (other == 0) LabeledPolynomialAsIs(mapOf(
+            mapOf(this@plus to 1U) to constantOne,
+        ))
+        else LabeledPolynomialAsIs(mapOf(
+            mapOf(this@plus to 1U) to constantOne,
+            emptyMap<Symbol, UInt>() to constantOne * other,
+        ))
+    /**
+     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
+    public override operator fun Symbol.minus(other: Int): LabeledPolynomial<C> =
+        if (other == 0) LabeledPolynomialAsIs(mapOf(
+            mapOf(this@minus to 1U) to -constantOne,
+        ))
+        else LabeledPolynomialAsIs(mapOf(
+            mapOf(this@minus to 1U) to -constantOne,
+            emptyMap<Symbol, UInt>() to constantOne * other,
+        ))
+    /**
+     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
+    public override operator fun Symbol.times(other: Int): LabeledPolynomial<C> =
+        if (other == 0) zero
+        else LabeledPolynomialAsIs(mapOf(
+            mapOf(this to 1U) to constantOne * other,
+        ))
+
+    /**
+     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    public override operator fun Int.plus(other: Symbol): LabeledPolynomial<C> =
+        if (this == 0) LabeledPolynomialAsIs(mapOf(
+            mapOf(other to 1U) to constantOne,
+        ))
+        else LabeledPolynomialAsIs(mapOf(
+            mapOf(other to 1U) to constantOne,
+            emptyMap<Symbol, UInt>() to constantOne * this@plus,
+        ))
+    /**
+     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    public override operator fun Int.minus(other: Symbol): LabeledPolynomial<C> =
+        if (this == 0) LabeledPolynomialAsIs(mapOf(
+            mapOf(other to 1U) to -constantOne,
+        ))
+        else LabeledPolynomialAsIs(mapOf(
+            mapOf(other to 1U) to -constantOne,
+            emptyMap<Symbol, UInt>() to constantOne * this@minus,
+        ))
+    /**
+     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    public override operator fun Int.times(other: Symbol): LabeledPolynomial<C> =
+        if (this == 0) zero
+        else LabeledPolynomialAsIs(mapOf(
+            mapOf(other to 1U) to constantOne * this@times,
+        ))
+
+    /**
+     * Returns sum of the polynomial and the integer represented as a polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public override operator fun LabeledPolynomial<C>.plus(other: Int): LabeledPolynomial<C> =
+        if (other == 0) this
+        else with(coefficients) {
+            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to other.asConstant()))
+            else LabeledPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Symbol, UInt>()
+
+                        this[degs] = getOrElse(degs) { constantZero } + other
+                    }
+            )
+        }
+    /**
+     * Returns difference between the polynomial and the integer represented as a polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public override operator fun LabeledPolynomial<C>.minus(other: Int): LabeledPolynomial<C> =
+        if (other == 0) this
+        else with(coefficients) {
+            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to (-other).asConstant()))
+            else LabeledPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Symbol, UInt>()
+
+                        this[degs] = getOrElse(degs) { constantZero } - other
+                    }
+            )
+        }
+    /**
+     * Returns product of the polynomial and the integer represented as a polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun LabeledPolynomial<C>.times(other: Int): LabeledPolynomial<C> =
+        if (other == 0) zero
+        else LabeledPolynomial(
+            coefficients
+                .toMutableMap()
+                .apply {
+                    for (degs in keys) this[degs] = this[degs]!! * other
+                }
+        )
+
+    /**
+     * Returns sum of the integer represented as a polynomial and the polynomial.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public override operator fun Int.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this == 0) other
+        else with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this@plus.asConstant()))
+            else LabeledPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Symbol, UInt>()
+
+                        this[degs] = this@plus + getOrElse(degs) { constantZero }
+                    }
+            )
+        }
+    /**
+     * Returns difference between the integer represented as a polynomial and the polynomial.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public override operator fun Int.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this == 0) other
+        else with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this@minus.asConstant()))
+            else LabeledPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        forEach { (key, value) -> if (key.isNotEmpty()) this[key] = -value }
+
+                        val degs = emptyMap<Symbol, UInt>()
+
+                        this[degs] = this@minus - getOrElse(degs) { constantZero }
+                    }
+            )
+        }
+    /**
+     * Returns product of the integer represented as a polynomial and the polynomial.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        if (this == 0) zero
+        else LabeledPolynomial(
+            other.coefficients
+                .toMutableMap()
+                .apply {
+                    for (degs in keys) this[degs] = this@times * this[degs]!!
+                }
+        )
+
+    /**
+     * Converts the integer [value] to polynomial.
+     */
+    public override fun number(value: Int): LabeledPolynomial<C> = number(constantNumber(value))
+
+    /**
+     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
+    public override operator fun Symbol.plus(other: C): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(mapOf(
+            mapOf(this@plus to 1U) to constantOne,
+            emptyMap<Symbol, UInt>() to other,
+        ))
+    /**
+     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
+    public override operator fun Symbol.minus(other: C): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(mapOf(
+            mapOf(this@minus to 1U) to -constantOne,
+            emptyMap<Symbol, UInt>() to other,
+        ))
+    /**
+     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
+    public override operator fun Symbol.times(other: C): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(mapOf(
+            mapOf(this@times to 1U) to other,
+        ))
+
+    /**
+     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    public override operator fun C.plus(other: Symbol): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(mapOf(
+            mapOf(other to 1U) to constantOne,
+            emptyMap<Symbol, UInt>() to this@plus,
+        ))
+    /**
+     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    public override operator fun C.minus(other: Symbol): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(mapOf(
+            mapOf(other to 1U) to -constantOne,
+            emptyMap<Symbol, UInt>() to this@minus,
+        ))
+    /**
+     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    public override operator fun C.times(other: Symbol): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(mapOf(
+            mapOf(other to 1U) to this@times,
+        ))
+
+    /**
+     * Returns sum of the constant represented as a polynomial and the polynomial.
+     */
+    override operator fun C.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this@plus))
+            else LabeledPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Symbol, UInt>()
+
+                        this[degs] = this@plus + getOrElse(degs) { constantZero }
+                    }
+            )
+        }
+    /**
+     * Returns difference between the constant represented as a polynomial and the polynomial.
+     */
+    override operator fun C.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this@minus))
+            else LabeledPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
+
+                        val degs = emptyMap<Symbol, UInt>()
+
+                        this[degs] = this@minus - getOrElse(degs) { constantZero }
+                    }
+            )
+        }
+    /**
+     * Returns product of the constant represented as a polynomial and the polynomial.
+     */
+    override operator fun C.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(
+            other.coefficients
+                .toMutableMap()
+                .apply {
+                    for (degs in keys) this[degs] = this@times * this[degs]!!
+                }
+        )
+
+    /**
+     * Returns sum of the constant represented as a polynomial and the polynomial.
+     */
+    override operator fun LabeledPolynomial<C>.plus(other: C): LabeledPolynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to other))
+            else LabeledPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        val degs = emptyMap<Symbol, UInt>()
+
+                        this[degs] = getOrElse(degs) { constantZero } + other
+                    }
+            )
+        }
+    /**
+     * Returns difference between the constant represented as a polynomial and the polynomial.
+     */
+    override operator fun LabeledPolynomial<C>.minus(other: C): LabeledPolynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to other))
+            else LabeledPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
+
+                        val degs = emptyMap<Symbol, UInt>()
+
+                        this[degs] = getOrElse(degs) { constantZero } - other
+                    }
+            )
+        }
+    /**
+     * Returns product of the constant represented as a polynomial and the polynomial.
+     */
+    override operator fun LabeledPolynomial<C>.times(other: C): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(
+            coefficients
+                .toMutableMap()
+                .apply {
+                    for (degs in keys) this[degs] = this[degs]!! * other
+                }
+        )
+
+    /**
+     * Converts the constant [value] to polynomial.
+     */
+    public override fun number(value: C): LabeledPolynomial<C> =
+        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to value))
+
+    /**
+     * Represents the variable as a monic monomial.
+     */
+    public override operator fun Symbol.unaryPlus(): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(mapOf(
+            mapOf(this to 1U) to constantOne,
+        ))
+    /**
+     * Returns negation of representation of the variable as a monic monomial.
+     */
+    public override operator fun Symbol.unaryMinus(): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(mapOf(
+            mapOf(this to 1U) to -constantOne,
+        ))
+    /**
+     * Returns sum of the variables represented as monic monomials.
+     */
+    public override operator fun Symbol.plus(other: Symbol): LabeledPolynomial<C> =
+        if (this == other) LabeledPolynomialAsIs(mapOf(
+            mapOf(this to 1U) to constantOne * 2
+        ))
+        else LabeledPolynomialAsIs(mapOf(
+            mapOf(this to 1U) to constantOne,
+            mapOf(other to 1U) to constantOne,
+        ))
+    /**
+     * Returns difference between the variables represented as monic monomials.
+     */
+    public override operator fun Symbol.minus(other: Symbol): LabeledPolynomial<C> =
+        if (this == other) zero
+        else LabeledPolynomialAsIs(mapOf(
+            mapOf(this to 1U) to constantOne,
+            mapOf(other to 1U) to -constantOne,
+        ))
+    /**
+     * Returns product of the variables represented as monic monomials.
+     */
+    public override operator fun Symbol.times(other: Symbol): LabeledPolynomial<C> =
+        if (this == other) LabeledPolynomialAsIs(mapOf(
+            mapOf(this to 2U) to constantOne
+        ))
+        else LabeledPolynomialAsIs(mapOf(
+            mapOf(this to 1U, other to 1U) to constantOne,
+        ))
+
+    /**
+     * Returns sum of the variable represented as a monic monomial and the polynomial.
+     */
+    public override operator fun Symbol.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomialAsIs(mapOf(mapOf(this@plus to 1u) to constantOne))
+            else LabeledPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        val degs = mapOf(this@plus to 1U)
+
+                        this[degs] = constantOne + getOrElse(degs) { constantZero }
+                    }
+            )
+        }
+    /**
+     * Returns difference between the variable represented as a monic monomial and the polynomial.
+     */
+    public override operator fun Symbol.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) LabeledPolynomialAsIs(mapOf(mapOf(this@minus to 1u) to constantOne))
+            else LabeledPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        val degs = mapOf(this@minus to 1U)
+
+                        forEach { (degs, c) -> if(degs != degs) this[degs] = -c }
+
+                        this[degs] = constantOne - getOrElse(degs) { constantZero }
+                    }
+            )
+        }
+    /**
+     * Returns product of the variable represented as a monic monomial and the polynomial.
+     */
+    public override operator fun Symbol.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(
+            other.coefficients
+                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[this] = if (this in it) it[this]!! + 1U else 1U } }
+        )
+
+    /**
+     * Returns sum of the polynomial and the variable represented as a monic monomial.
+     */
+    public override operator fun LabeledPolynomial<C>.plus(other: Symbol): LabeledPolynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) LabeledPolynomialAsIs(mapOf(mapOf(other to 1u) to constantOne))
+            else LabeledPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        val degs = mapOf(other to 1U)
+
+                        this[degs] = constantOne + getOrElse(degs) { constantZero }
+                    }
+            )
+        }
+    /**
+     * Returns difference between the polynomial and the variable represented as a monic monomial.
+     */
+    public override operator fun LabeledPolynomial<C>.minus(other: Symbol): LabeledPolynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) LabeledPolynomialAsIs(mapOf(mapOf(other to 1u) to constantOne))
+            else LabeledPolynomialAsIs(
+                toMutableMap()
+                    .apply {
+                        val degs = mapOf(other to 1U)
+
+                        this[degs] = constantOne - getOrElse(degs) { constantZero }
+                    }
+            )
+        }
+    /**
+     * Returns product of the polynomial and the variable represented as a monic monomial.
+     */
+    public override operator fun LabeledPolynomial<C>.times(other: Symbol): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(
+            coefficients
+                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[other] = if (other in it) it[other]!! + 1U else 1U } }
+        )
+
+    /**
+     * Returns negation of the polynomial.
+     */
+    override fun LabeledPolynomial<C>.unaryMinus(): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(
+            coefficients.mapValues { -it.value }
+        )
+    /**
+     * Returns sum of the polynomials.
+     */
+    override operator fun LabeledPolynomial<C>.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(
+            buildMap(coefficients.size + other.coefficients.size) {
+                other.coefficients.mapValuesTo(this) { it.value }
+                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
+            }
+        )
+    /**
+     * Returns difference of the polynomials.
+     */
+    override operator fun LabeledPolynomial<C>.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(
+            buildMap(coefficients.size + other.coefficients.size) {
+                other.coefficients.mapValuesTo(this) { it.value }
+                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
+            }
+        )
+    /**
+     * Returns product of the polynomials.
+     */
+    override operator fun LabeledPolynomial<C>.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
+        LabeledPolynomialAsIs(
+            buildMap(coefficients.size * other.coefficients.size) {
+                for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
+                    val degs = degs1.toMutableMap()
+                    degs2.mapValuesTo(degs) { (variable, deg) -> degs.getOrElse(variable) { 0u } + deg }
+                    val c = c1 * c2
+                    this[degs] = if (degs in this) this[degs]!! + c else c
+                }
+            }
+        )
+
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
+    override val zero: LabeledPolynomial<C> = LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to constantZero))
+    /**
+     * Instance of unit polynomial (unit of the polynomial ring).
+     */
+    override val one: LabeledPolynomial<C> = LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to constantOne))
+
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    override val LabeledPolynomial<C>.degree: Int
+        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.values.sum().toInt() } ?: -1
+    /**
+     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
+     * in which they are appeared in the polynomial.
+     *
+     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
+     * And keys of the map is the same as in [variables].
+     */
+    public override val LabeledPolynomial<C>.degrees: Map<Symbol, UInt>
+        get() =
+            buildMap {
+                coefficients.entries.forEach { (degs, _) ->
+                    degs.mapValuesTo(this) { (variable, deg) ->
+                        max(getOrElse(variable) { 0u }, deg)
+                    }
+                }
+            }
+    /**
+     * Counts degree of the polynomial by the specified [variable].
+     */
+    public override fun LabeledPolynomial<C>.degreeBy(variable: Symbol): UInt =
+        coefficients.entries.maxOfOrNull { (degs, _) -> degs.getOrElse(variable) { 0u } } ?: 0u
+    /**
+     * Counts degree of the polynomial by the specified [variables].
+     */
+    public override fun LabeledPolynomial<C>.degreeBy(variables: Collection<Symbol>): UInt =
+        coefficients.entries.maxOfOrNull { (degs, _) -> degs.filterKeys { it in variables }.values.sum() } ?: 0u
+    /**
+     * Set of all variables that appear in the polynomial in positive exponents.
+     */
+    public override val LabeledPolynomial<C>.variables: Set<Symbol>
+        get() =
+            buildSet {
+                coefficients.entries.forEach { (degs, _) -> addAll(degs.keys) }
+            }
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public override val LabeledPolynomial<C>.countOfVariables: Int get() = variables.size
+
+    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
+    //  [ListPolynomialSpace] as a context receiver
+    /**
+     * Substitutes provided arguments [arguments] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun LabeledPolynomial<C>.substitute(arguments: Map<Symbol, C>): LabeledPolynomial<C> = substitute(ring, arguments)
+    /**
+     * Substitutes provided arguments [arguments] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substitutePolynomial")
+    public inline fun LabeledPolynomial<C>.substitute(arguments: Map<Symbol, LabeledPolynomial<C>>) : LabeledPolynomial<C> = substitute(ring, arguments)
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
new file mode 100644
index 000000000..03f323813
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.operations.Ring
+import kotlin.jvm.JvmName
+
+
+/**
+ * Represents multivariate rational function that stores its numerator and denominator as [LabeledPolynomial]s.
+ */
+public class LabeledRationalFunction<C>(
+    public override val numerator: LabeledPolynomial<C>,
+    public override val denominator: LabeledPolynomial<C>
+) : RationalFunction<C, LabeledPolynomial<C>> {
+    override fun toString(): String = "LabeledRationalFunction${numerator.coefficients}/${denominator.coefficients}"
+}
+
+/**
+ * Arithmetic context for univariate rational functions with numerator and denominator represented as [LabeledPolynomial]s.
+ *
+ * @param C the type of constants. Polynomials have them a coefficients in their terms.
+ * @param A type of provided underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
+ */
+public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
+    public val ring: A,
+) :
+    MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSpace<
+            C,
+            Symbol,
+            LabeledPolynomial<C>,
+            LabeledRationalFunction<C>,
+            LabeledPolynomialSpace<C, A>,
+            >,
+    MultivariatePolynomialSpaceOfFractions<
+            C,
+            Symbol,
+            LabeledPolynomial<C>,
+            LabeledRationalFunction<C>,
+            >() {
+
+    /**
+     * Underlying polynomial ring. Its polynomial operations are inherited by local polynomial operations.
+     */
+    override val polynomialRing : LabeledPolynomialSpace<C, A> = LabeledPolynomialSpace(ring)
+    /**
+     * Constructor of rational functions (of type [LabeledRationalFunction]) from numerator and denominator (of type [LabeledPolynomial]).
+     */
+    override fun constructRationalFunction(
+        numerator: LabeledPolynomial<C>,
+        denominator: LabeledPolynomial<C>
+    ): LabeledRationalFunction<C> =
+        LabeledRationalFunction<C>(numerator, denominator)
+
+    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
+    //  [ListPolynomialSpace] as a context receiver
+    /**
+     * Substitutes provided constant [argument] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, C>): LabeledPolynomial<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided polynomial [argument] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substitutePolynomial")
+    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledPolynomial<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided rational function [argument] into [this] polynomial.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substituteRationalFunction")
+    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, LabeledRationalFunction<C>>): LabeledRationalFunction<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided constant [argument] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline fun LabeledRationalFunction<C>.substitute(argument: Map<Symbol, C>): LabeledRationalFunction<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided polynomial [argument] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substitutePolynomial")
+    public inline fun LabeledRationalFunction<C>.substitute(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledRationalFunction<C> = substitute(ring, argument)
+    /**
+     * Substitutes provided rational function [argument] into [this] rational function.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    @JvmName("substituteRationalFunction")
+    public inline fun LabeledRationalFunction<C>.substitute(argument: Map<Symbol, LabeledRationalFunction<C>>): LabeledRationalFunction<C> = substitute(ring, argument)
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index b3f1eb8f7..8db93cbb1 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -15,7 +15,7 @@ import kotlin.math.min
 /**
  * Represents univariate polynomial that stores its coefficients in a [List].
  *
- * @param coefficients constant is the leftmost coefficient.
+ * @param C the type of constants.
  */
 public data class ListPolynomial<C>(
     /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 02a3af683..eadeb68ab 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -12,7 +12,7 @@ import kotlin.math.max
 
 
 /**
- * Represents univariate polynomial that stores its coefficients in a [Map] and terms' signatures in a [List].
+ * Represents multivariate polynomial that stores its coefficients in a [Map] and terms' signatures in a [List].
  *
  * @param C the type of constants.
  */
@@ -20,10 +20,11 @@ public data class NumberedPolynomial<C>
 @PublishedApi
 internal constructor(
     /**
-     * Map that contains coefficients of the polynomial. Every monomial `a x_1^{d_1} ... x_n^{d_n}` is stored as pair
-     * "key-value" in the map, where the value is the coefficients `a` and the key is a list that associates index of
-     * every variable in the monomial with multiplicity of the variable occurring in the monomial. For example
-     * coefficients of a polynomial `5 x_1^2 x_3^3 - 6 x_2` can be represented as
+     * Map that contains coefficients of the polynomial.
+     *
+     * Every monomial `a x_1^{d_1} ... x_n^{d_n}` is stored as a pair "key-value" in the map, where the value is the
+     * coefficient `a` and the key is a list that associates index of every variable in the monomial with their degree
+     * in the monomial. For example, coefficients of a polynomial `5 x_1^2 x_3^3 - 6 x_2` can be represented as
      * ```
      * mapOf(
      *      listOf(2, 0, 3) to 5, // 5 x_1^2 x_3^3 +
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
new file mode 100644
index 000000000..47325c4bb
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
@@ -0,0 +1,518 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("FunctionName", "NOTHING_TO_INLINE")
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Ring
+
+
+/**
+ * Returns the same degrees' description of the monomial, but without zero degrees.
+ */
+internal fun Map<Symbol, UInt>.cleanUp() = filterValues { it > 0U }
+
+/**
+ * Constructs [LabeledPolynomial] with provided coefficients map [coefs]. The map is used as is.
+ */
+@PublishedApi
+internal inline fun <C> LabeledPolynomialAsIs(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial<C>(coefs)
+
+/**
+ * Constructs [LabeledPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ * The collections will be transformed to map with [toMap] and then will be used as is.
+ */
+@PublishedApi
+internal inline fun <C> LabeledPolynomialAsIs(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial<C>(pairs.toMap())
+
+/**
+ * Constructs [LabeledPolynomial] with provided array of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ * The array will be transformed to map with [toMap] and then will be used as is.
+ */
+@PublishedApi
+internal inline fun <C> LabeledPolynomialAsIs(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial<C>(pairs.toMap())
+
+/**
+ * Constructs [LabeledPolynomial] with provided coefficients map [coefs]. The map is used as is.
+ *
+ * **Be sure you read description of [LabeledPolynomial.coefficients]. Otherwise, you may make a mistake that will
+ * cause wrong computation result or even runtime error.**
+ */
+@DelicatePolynomialAPI
+public inline fun <C> LabeledPolynomialWithoutCheck(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial<C>(coefs)
+
+/**
+ * Constructs [LabeledPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ * The collections will be transformed to map with [toMap] and then will be used as is.
+ *
+ * **Be sure you read description of [LabeledPolynomial.coefficients]. Otherwise, you may make a mistake that will
+ * cause wrong computation result or even runtime error.**
+ */
+@DelicatePolynomialAPI
+public inline fun <C> LabeledPolynomialWithoutCheck(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial<C>(pairs.toMap())
+
+/**
+ * Constructs [LabeledPolynomial] with provided array of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ * The array will be transformed to map with [toMap] and then will be used as is.
+ *
+ * **Be sure you read description of [LabeledPolynomial.coefficients]. Otherwise, you may make a mistake that will
+ * cause wrong computation result or even runtime error.**
+ */
+@DelicatePolynomialAPI
+public inline fun <C> LabeledPolynomialWithoutCheck(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial<C>(pairs.toMap())
+
+/**
+ * Constructs [LabeledPolynomial] with provided coefficients map [coefs].
+ *
+ * [coefs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public fun <C> LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, add: (C, C) -> C) : LabeledPolynomial<C> {
+    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
+
+    for (entry in coefs) {
+        val key = entry.key.cleanUp()
+        val value = entry.value
+        fixedCoefs[key] = if (key in fixedCoefs) add(fixedCoefs[key]!!, value) else value
+    }
+
+    return LabeledPolynomial<C>(fixedCoefs)
+}
+
+/**
+ * Constructs [LabeledPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, add: (C, C) -> C) : LabeledPolynomial<C> {
+    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
+
+    for (entry in pairs) {
+        val key = entry.first.cleanUp()
+        val value = entry.second
+        fixedCoefs[key] = if (key in fixedCoefs) add(fixedCoefs[key]!!, value) else value
+    }
+
+    return LabeledPolynomial<C>(fixedCoefs)
+}
+
+/**
+ * Constructs [LabeledPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public fun <C> LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, add: (C, C) -> C) : LabeledPolynomial<C> {
+    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
+
+    for (entry in pairs) {
+        val key = entry.first.cleanUp()
+        val value = entry.second
+        fixedCoefs[key] = if (key in fixedCoefs) add(fixedCoefs[key]!!, value) else value
+    }
+
+    return LabeledPolynomial<C>(fixedCoefs)
+}
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+/**
+ * Constructs [LabeledPolynomial] with provided coefficients map [coefs].
+ *
+ * [coefs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public inline fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, ::add)
+/**
+ * Constructs [LabeledPolynomial] with provided coefficients map [coefs].
+ *
+ * [coefs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs) { left: C, right: C -> left + right }
+
+/**
+ * Constructs [LabeledPolynomial] with provided coefficients map [coefs].
+ *
+ * [coefs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs) { left: C, right: C -> left + right }
+
+/**
+ * Constructs [LabeledPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public inline fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, ::add)
+
+/**
+ * Constructs [LabeledPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs) { left: C, right: C -> left + right }
+/**
+ * Constructs [LabeledPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs) { left: C, right: C -> left + right }
+
+/**
+ * Constructs [LabeledPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public inline fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs) { left: C, right: C -> left + right }
+/**
+ * Constructs [LabeledPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs) { left: C, right: C -> left + right }
+/**
+ * Constructs [LabeledPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
+ *
+ * [pairs] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs) { left: C, right: C -> left + right }
+
+/**
+ * Converts [this] constant to [LabeledPolynomial].
+ */
+public inline fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this))
+
+///**
+//// * Converts [this] variable to [LabeledPolynomial].
+//// */
+//context(A)
+//public inline fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to one))
+///**
+// * Converts [this] variable to [LabeledPolynomial].
+// */
+//context(LabeledPolynomialSpace<C, A>)
+//public inline fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
+///**
+// * Converts [this] variable to [LabeledPolynomial].
+// */
+//context(LabeledRationalFunctionSpace<C, A>)
+//public inline fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
+
+/**
+ * Marks DSL that allows to more simply create [LabeledPolynomial]s with good performance.
+ *
+ * For example, polynomial `5 a^2 c^3 - 6 b` can be described as
+ * ```
+ * Int.algebra {
+ *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
+ *         5 { a inPowerOf 2u; c inPowerOf 3u } // 5 a^2 c^3 +
+ *         (-6) { b inPowerOf 1u }              // (-6) b^1
+ *     }
+ * }
+ * ```
+ */
+@DslMarker
+@UnstableKMathAPI
+internal annotation class LabeledPolynomialConstructorDSL
+
+/**
+ * Builder of [LabeledPolynomial] signature. It should be used as an implicit context for lambdas that describe term signature.
+ */
+@UnstableKMathAPI
+@LabeledPolynomialConstructorDSL
+public class LabeledPolynomialTermSignatureBuilder {
+    /**
+     * Signature storage. Any declaration of any variable's power updates the storage by increasing corresponding value.
+     * Afterward the storage will be used as a resulting signature.
+     */
+    private val signature: MutableMap<Symbol, UInt> = LinkedHashMap()
+
+    /**
+     * Builds the resulting signature.
+     *
+     * In fact, it just returns [signature] as regular signature of type `List<UInt>`.
+     */
+    @PublishedApi
+    internal fun build(): Map<Symbol, UInt> = signature
+
+    /**
+     * Declares power of [this] variable of degree [deg].
+     *
+     * Declaring another power of the same variable will increase its degree by received degree.
+     */
+    public infix fun Symbol.inPowerOf(deg: UInt) {
+        signature[this] = deg
+    }
+    /**
+     * Declares power of [this] variable of degree [deg].
+     *
+     * Declaring another power of the same variable will increase its degree by received degree.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun Symbol.pow(deg: UInt): Unit = this inPowerOf deg
+    /**
+     * Declares power of [this] variable of degree [deg].
+     *
+     * Declaring another power of the same variable will increase its degree by received degree.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun Symbol.`in`(deg: UInt): Unit = this inPowerOf deg
+    /**
+     * Declares power of [this] variable of degree [deg].
+     *
+     * Declaring another power of the same variable will increase its degree by received degree.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun Symbol.of(deg: UInt): Unit = this inPowerOf deg
+}
+
+/**
+ * Builder of [LabeledPolynomial]. It should be used as an implicit context for lambdas that describe [LabeledPolynomial].
+ */
+@UnstableKMathAPI
+public class LabeledPolynomialBuilder<C>(
+    /**
+     * Summation operation that will be used to sum coefficients of monomials of same signatures.
+     */
+    private val add: (C, C) -> C,
+    /**
+     * Initial capacity of coefficients map.
+     */
+    initialCapacity: Int = 0
+) {
+    /**
+     * Coefficients storage. Any declaration of any monomial updates the storage.
+     * Afterward the storage will be used as a resulting coefficients map.
+     */
+    private val coefficients: MutableMap<Map<Symbol, UInt>, C> = LinkedHashMap(initialCapacity)
+
+    /**
+     * Builds the resulting coefficients map.
+     *
+     * In fact, it just returns [coefficients] as regular coefficients map of type `Map<List<UInt>, C>`.
+     */
+    @PublishedApi
+    internal fun build(): LabeledPolynomial<C> = LabeledPolynomial<C>(coefficients)
+
+    /**
+     * Declares monomial with [this] coefficient and provided [signature].
+     *
+     * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
+     * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
+     */
+    public infix fun C.with(signature: Map<Symbol, UInt>) {
+        coefficients[signature] = if (signature in coefficients) add(coefficients[signature]!!, this@with) else this@with
+    }
+    /**
+     * Declares monomial with [this] coefficient and signature constructed by [block].
+     *
+     * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
+     * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    public inline infix fun C.with(noinline block: LabeledPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
+    /**
+     * Declares monomial with [this] coefficient and signature constructed by [block].
+     *
+     * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
+     * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
+     */
+    public inline operator fun C.invoke(block: LabeledPolynomialTermSignatureBuilder.() -> Unit): Unit =
+        this with LabeledPolynomialTermSignatureBuilder().apply(block).build()
+}
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+///**
+// * Creates [LabeledPolynomial] with lambda [block] in context of [this] ring of constants.
+// *
+// * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+// * ```
+// * Int.algebra {
+// *     val LabeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomial {
+// *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
+// *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+// *     }
+// * }
+// * ```
+// */
+// FIXME: For now this fabric does not let next two fabrics work. (See KT-52803.) Possible feature solutions:
+//  1. `LowPriorityInOverloadResolution` becomes public. Then it should be applied to this function.
+//  2. Union types are implemented. Then all three functions should be rewritten
+//     as one with single union type as a (context) receiver.
+//@UnstableKMathAPI
+//public inline fun <C, A: Ring<C>> A.LabeledPolynomial(initialCapacity: Int = 0, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(::add, initialCapacity).apply(block).build()
+/**
+ * Creates [LabeledPolynomial] with lambda [block] in context of [this] ring of [LabeledPolynomial]s.
+ *
+ * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+ * ```
+ * Int.algebra {
+ *     val LabeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomial {
+ *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
+ *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+ *     }
+ * }
+ * ```
+ */
+@UnstableKMathAPI
+public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(initialCapacity: Int = 0, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+/**
+ * Creates [LabeledPolynomial] with lambda [block] in context of [this] field of [LabeledRationalFunction]s.
+ *
+ * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+ * ```
+ * Int.algebra {
+ *     val LabeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomial {
+ *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
+ *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+ *     }
+ * }
+ * ```
+ */
+@UnstableKMathAPI
+public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(initialCapacity: Int = 0, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+/**
+ * Constructs [LabeledRationalFunction] with provided coefficients maps [numeratorCoefficients] and [denominatorCoefficients].
+ *
+ * The maps will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. the maps' keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients),
+        LabeledPolynomial(denominatorCoefficients)
+    )
+/**
+ * Constructs [LabeledRationalFunction] with provided coefficients maps [numeratorCoefficients] and [denominatorCoefficients].
+ *
+ * The maps will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. the maps' keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients),
+        LabeledPolynomial(denominatorCoefficients)
+    )
+
+/**
+ * Constructs [LabeledRationalFunction] with provided [numerator] and unit denominator.
+ */
+public fun <C, A: Ring<C>> A.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(numerator, LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one)))
+/**
+ * Constructs [LabeledRationalFunction] with provided [numerator] and unit denominator.
+ */
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(numerator, polynomialOne)
+
+/**
+ * Constructs [LabeledRationalFunction] with provided coefficients map [numeratorCoefficients] for numerator and unit
+ * denominator.
+ *
+ * [numeratorCoefficients] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [numeratorCoefficients]'s keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients),
+        polynomialOne
+    )
+/**
+ * Constructs [LabeledRationalFunction] with provided coefficients map [numeratorCoefficients] for numerator and unit
+ * denominator.
+ *
+ * [numeratorCoefficients] will be "cleaned up":
+ * 1. Zeros at the ends of terms' signatures (e.g. [numeratorCoefficients]'s keys) will be removed. (See [cleanUp].)
+ * 1. Terms that happen to have the same signature will be summed up.
+ * 1. New map will be formed of resulting terms.
+ */
+public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction<C>(
+        LabeledPolynomial(numeratorCoefficients),
+        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to one))
+    )
+
+///**
+// * Converts [this] constant to [LabeledRationalFunction].
+// */
+//context(A)
+//public fun <C, A: Ring<C>> C.asLabeledRationalFunction() : LabeledRationalFunction<C> =
+//    LabeledRationalFunction(
+//        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this)),
+//        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to one))
+//    )
+///**
+// * Converts [this] constant to [LabeledRationalFunction].
+// */
+//context(LabeledRationalFunctionSpace<C, A>)
+//public fun <C, A: Ring<C>> C.asLabeledRationalFunction() : LabeledRationalFunction<C> =
+//    LabeledRationalFunction(
+//        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this)),
+//        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to constantOne))
+//    )
+
+///**
+// * Converts [this] variable to [LabeledRationalFunction].
+// */
+//context(A)
+//public fun <C, A: Ring<C>> Symbol.asLabeledRationalFunction() : LabeledRationalFunction<C> =
+//    LabeledRationalFunction(
+//        LabeledPolynomialAsIs(mapOf(mapOf(this to 1u) to one)),
+//        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to one))
+//    )
+///**
+// * Converts [this] variable to [LabeledRationalFunction].
+// */
+//context(LabeledRationalFunctionSpace<C, A>)
+//public fun <C, A: Ring<C>> Symbol.asLabeledRationalFunction() : LabeledRationalFunction<C> =
+//    LabeledRationalFunction(
+//        LabeledPolynomialAsIs(mapOf(mapOf(this to 1u) to constantOne)),
+//        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to constantOne))
+//    )
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
new file mode 100644
index 000000000..39c781a14
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
@@ -0,0 +1,327 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.algebra
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.jvm.JvmName
+
+
+/**
+ * Creates a [LabeledPolynomialSpace] over a received ring.
+ */
+public fun <C, A : Ring<C>> A.labeledPolynomialSpace(): LabeledPolynomialSpace<C, A> =
+    LabeledPolynomialSpace(this)
+
+/**
+ * Creates a [LabeledPolynomialSpace]'s scope over a received ring.
+ */
+public inline fun <C, A : Ring<C>, R> A.labeledPolynomialSpace(block: LabeledPolynomialSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return LabeledPolynomialSpace(this).block()
+}
+/**
+ * Creates a [LabeledRationalFunctionSpace] over a received ring.
+ */
+public fun <C, A : Ring<C>> A.labeledRationalFunctionSpace(): LabeledRationalFunctionSpace<C, A> =
+    LabeledRationalFunctionSpace(this)
+
+/**
+ * Creates a [LabeledRationalFunctionSpace]'s scope over a received ring.
+ */
+public inline fun <C, A : Ring<C>, R> A.labeledRationalFunctionSpace(block: LabeledRationalFunctionSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return LabeledRationalFunctionSpace(this).block()
+}
+
+/**
+ * Substitutes provided Double arguments [args] into [this] Double polynomial.
+ */
+public fun LabeledPolynomial<Double>.substitute(args: Map<Symbol, Double>): LabeledPolynomial<Double> = Double.algebra {
+    if (coefficients.isEmpty()) return this@substitute
+    LabeledPolynomial<Double>(
+        buildMap {
+            coefficients.forEach { (degs, c) ->
+                val newDegs = degs.filterKeys { it !in args }
+                val newC = args.entries.fold(c) { product, (variable, substitution) ->
+                    val deg = degs.getOrElse(variable) { 0u }
+                    if (deg == 0u) product else product * power(substitution, deg)
+                }
+                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
+            }
+        }
+    )
+}
+
+/**
+ * Substitutes provided arguments [args] into [this] polynomial.
+ */
+public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Symbol, C>): LabeledPolynomial<C> = ring {
+    if (coefficients.isEmpty()) return this@substitute
+    LabeledPolynomial<C>(
+        buildMap {
+            coefficients.forEach { (degs, c) ->
+                val newDegs = degs.filterKeys { it !in args }
+                val newC = args.entries.fold(c) { product, (variable, substitution) ->
+                    val deg = degs.getOrElse(variable) { 0u }
+                    if (deg == 0u) product else product * power(substitution, deg)
+                }
+                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
+            }
+        }
+    )
+}
+
+/**
+ * Substitutes provided arguments [args] into [this] polynomial.
+ */ // TODO: To optimize boxing
+@JvmName("substitutePolynomial")
+public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Symbol, LabeledPolynomial<C>>) : LabeledPolynomial<C> =
+    ring.labeledPolynomialSpace {
+        coefficients.entries.fold(zero) { acc, (degs, c) ->
+            val newDegs = degs.filterKeys { it !in args }
+            acc + args.entries.fold(LabeledPolynomial<C>(mapOf(newDegs to c))) { product, (variable, substitution) ->
+                val deg = degs.getOrElse(variable) { 0u }
+                if (deg == 0u) product else product * power(substitution, deg)
+            }
+        }
+    }
+
+/**
+ * Substitutes provided arguments [args] into [this] polynomial.
+ */ // TODO: To optimize boxing
+@JvmName("substituteRationalFunction")
+public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Symbol, LabeledRationalFunction<C>>) : LabeledRationalFunction<C> =
+    ring.labeledRationalFunctionSpace {
+        coefficients.entries.fold(zero) { acc, (degs, c) ->
+            val newDegs = degs.filterKeys { it !in args }
+            acc + args.entries.fold(LabeledRationalFunction(LabeledPolynomial<C>(mapOf(newDegs to c)))) { product, (variable, substitution) ->
+                val deg = degs.getOrElse(variable) { 0u }
+                if (deg == 0u) product else product * power(substitution, deg)
+            }
+        }
+    }
+
+/**
+ * Substitutes provided Double arguments [args] into [this] Double rational function.
+ */
+public fun LabeledRationalFunction<Double>.substitute(args: Map<Symbol, Double>): LabeledRationalFunction<Double> =
+    LabeledRationalFunction(numerator.substitute(args), denominator.substitute(args))
+
+/**
+ * Substitutes provided arguments [args] into [this] rational function.
+ */
+public fun <C> LabeledRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Symbol, C>): LabeledRationalFunction<C> =
+    LabeledRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
+
+/**
+ * Substitutes provided arguments [args] into [this] rational function.
+ */ // TODO: To optimize calculation
+@JvmName("substitutePolynomial")
+public fun <C> LabeledRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Symbol, LabeledPolynomial<C>>) : LabeledRationalFunction<C> =
+    LabeledRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
+
+/**
+ * Substitutes provided arguments [args] into [this] rational function.
+ */ // TODO: To optimize calculation
+@JvmName("substituteRationalFunction")
+public fun <C> LabeledRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Symbol, LabeledRationalFunction<C>>) : LabeledRationalFunction<C> =
+    ring.labeledRationalFunctionSpace {
+        numerator.substitute(ring, args) / denominator.substitute(ring, args)
+    }
+
+/**
+ * Returns algebraic derivative of received polynomial with respect to provided variable.
+ */
+@UnstableKMathAPI
+public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
+    algebra: A,
+    variable: Symbol,
+): LabeledPolynomial<C> = algebra {
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    if (variable !in degs) return@forEach
+                    put(
+                        buildMap {
+                            degs.forEach { (vari, deg) ->
+                                when {
+                                    vari != variable -> put(vari, deg)
+                                    deg > 1u -> put(vari, deg - 1u)
+                                }
+                            }
+                        },
+                        multiplyByDoubling(c, degs[variable]!!)
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial with respect to provided variable of specified order.
+ */
+@UnstableKMathAPI
+public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
+    algebra: A,
+    variable: Symbol,
+    order: UInt
+): LabeledPolynomial<C> = algebra {
+    if (order == 0u) return this@nthDerivativeWithRespectTo
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    if (degs.getOrElse(variable) { 0u } < order) return@forEach
+                    put(
+                        buildMap {
+                            degs.forEach { (vari, deg) ->
+                                when {
+                                    vari != variable -> put(vari, deg)
+                                    deg > order -> put(vari, deg - order)
+                                }
+                            }
+                        },
+                        degs[variable]!!.let { deg ->
+                            (deg downTo deg - order + 1u)
+                                .fold(c) { acc, ord -> multiplyByDoubling(acc, ord) }
+                        }
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial with respect to provided variables of specified orders.
+ */
+@UnstableKMathAPI
+public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
+    algebra: A,
+    variablesAndOrders: Map<Symbol, UInt>,
+): LabeledPolynomial<C> = algebra {
+    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
+    if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    if (filteredVariablesAndOrders.any { (variable, order) -> degs.getOrElse(variable) { 0u } < order }) return@forEach
+                    put(
+                        buildMap {
+                            degs.forEach { (vari, deg) ->
+                                if (vari !in filteredVariablesAndOrders) put(vari, deg)
+                                else {
+                                    val order = filteredVariablesAndOrders[vari]!!
+                                    if (deg > order) put(vari, deg - order)
+                                }
+                            }
+                        },
+                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
+                            degs[index]!!.let { deg ->
+                                (deg downTo deg - order + 1u)
+                                    .fold(acc1) { acc2, ord -> multiplyByDoubling(acc2, ord) }
+                            }
+                        }
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial with respect to provided variable.
+ */
+@UnstableKMathAPI
+public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
+    algebra: A,
+    variable: Symbol,
+): LabeledPolynomial<C> = algebra {
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
+                        put(variable, 1u)
+                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
+                    }
+                    put(
+                        newDegs,
+                        c / multiplyByDoubling(one, newDegs[variable]!!)
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial with respect to provided variable of specified order.
+ */
+@UnstableKMathAPI
+public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
+    algebra: A,
+    variable: Symbol,
+    order: UInt
+): LabeledPolynomial<C> = algebra {
+    if (order == 0u) return this@nthAntiderivativeWithRespectTo
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
+                        put(variable, order)
+                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
+                    }
+                    put(
+                        newDegs,
+                        newDegs[variable]!!.let { deg ->
+                            (deg downTo  deg - order + 1u)
+                                .fold(c) { acc, ord -> acc / multiplyByDoubling(one, ord) }
+                        }
+                    )
+                }
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial with respect to provided variables of specified orders.
+ */
+@UnstableKMathAPI
+public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
+    algebra: A,
+    variablesAndOrders: Map<Symbol, UInt>,
+): LabeledPolynomial<C> = algebra {
+    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
+    if (filteredVariablesAndOrders.isEmpty()) return this@nthAntiderivativeWithRespectTo
+    LabeledPolynomial<C>(
+        buildMap(coefficients.size) {
+            coefficients
+                .forEach { (degs, c) ->
+                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
+                        for ((variable, order) in filteredVariablesAndOrders) put(variable, order)
+                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
+                    }
+                    put(
+                        newDegs,
+                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
+                            newDegs[index]!!.let { deg ->
+                                (deg downTo deg - order + 1u)
+                                    .fold(acc1) { acc2, ord -> acc2 / multiplyByDoubling(one, ord) }
+                            }
+                        }
+                    )
+                }
+        }
+    )
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
index 37d5d7fb6..4850e6cec 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("FunctionName", "NOTHING_TO_INLINE")
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.misc.UnstableKMathAPI
@@ -17,7 +19,6 @@ internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
 /**
  * Constructs [NumberedPolynomial] with provided coefficients map [coefs]. The map is used as is.
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 @PublishedApi
 internal inline fun <C> NumberedPolynomialAsIs(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial<C>(coefs)
 
@@ -25,7 +26,6 @@ internal inline fun <C> NumberedPolynomialAsIs(coefs: Map<List<UInt>, C>) : Numb
  * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
  * The collections will be transformed to map with [toMap] and then will be used as is.
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 @PublishedApi
 internal inline fun <C> NumberedPolynomialAsIs(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial<C>(pairs.toMap())
 
@@ -33,7 +33,6 @@ internal inline fun <C> NumberedPolynomialAsIs(pairs: Collection<Pair<List<UInt>
  * Constructs [NumberedPolynomial] with provided array of [pairs] of pairs "term's signature &mdash; term's coefficient".
  * The array will be transformed to map with [toMap] and then will be used as is.
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 @PublishedApi
 internal inline fun <C> NumberedPolynomialAsIs(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial<C>(pairs.toMap())
 
@@ -43,7 +42,6 @@ internal inline fun <C> NumberedPolynomialAsIs(vararg pairs: Pair<List<UInt>, C>
  * **Be sure you read description of [NumberedPolynomial.coefficients]. Otherwise, you may make a mistake that will
  * cause wrong computation result or even runtime error.**
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 @DelicatePolynomialAPI
 public inline fun <C> NumberedPolynomialWithoutCheck(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial<C>(coefs)
 
@@ -54,7 +52,6 @@ public inline fun <C> NumberedPolynomialWithoutCheck(coefs: Map<List<UInt>, C>)
  * **Be sure you read description of [NumberedPolynomial.coefficients]. Otherwise, you may make a mistake that will
  * cause wrong computation result or even runtime error.**
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 @DelicatePolynomialAPI
 public inline fun <C> NumberedPolynomialWithoutCheck(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial<C>(pairs.toMap())
 
@@ -65,7 +62,6 @@ public inline fun <C> NumberedPolynomialWithoutCheck(pairs: Collection<Pair<List
  * **Be sure you read description of [NumberedPolynomial.coefficients]. Otherwise, you may make a mistake that will
  * cause wrong computation result or even runtime error.**
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 @DelicatePolynomialAPI
 public inline fun <C> NumberedPolynomialWithoutCheck(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial<C>(pairs.toMap())
 
@@ -77,7 +73,6 @@ public inline fun <C> NumberedPolynomialWithoutCheck(vararg pairs: Pair<List<UIn
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName")
 public fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>, add: (C, C) -> C) : NumberedPolynomial<C> {
     val fixedCoefs = mutableMapOf<List<UInt>, C>()
 
@@ -98,7 +93,6 @@ public fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>, add: (C, C) -> C) :
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName")
 public fun <C> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, add: (C, C) -> C) : NumberedPolynomial<C> {
     val fixedCoefs = mutableMapOf<List<UInt>, C>()
 
@@ -119,7 +113,6 @@ public fun <C> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, add: (
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName")
 public fun <C> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, add: (C, C) -> C) : NumberedPolynomial<C> {
     val fixedCoefs = mutableMapOf<List<UInt>, C>()
 
@@ -142,7 +135,6 @@ public fun <C> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, add: (C, C)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 public inline fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, ::add)
 /**
  * Constructs [NumberedPolynomial] with provided coefficients map [coefs].
@@ -152,7 +144,6 @@ public inline fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs) { left: C, right: C -> left + right }
 
 /**
@@ -163,7 +154,6 @@ public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomi
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs) { left: C, right: C -> left + right }
 
 /**
@@ -174,7 +164,6 @@ public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPo
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 public inline fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, ::add)
 
 /**
@@ -185,7 +174,6 @@ public inline fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<Li
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs) { left: C, right: C -> left + right }
 /**
  * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
@@ -195,7 +183,6 @@ public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomi
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs) { left: C, right: C -> left + right }
 
 /**
@@ -206,7 +193,6 @@ public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPo
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 public inline fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs) { left: C, right: C -> left + right }
 /**
  * Constructs [NumberedPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
@@ -216,7 +202,6 @@ public inline fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<U
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs) { left: C, right: C -> left + right }
 /**
  * Constructs [NumberedPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
@@ -226,13 +211,11 @@ public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomi
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName", "NOTHING_TO_INLINE")
 public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs) { left: C, right: C -> left + right }
 
 /**
  * Converts [this] constant to [NumberedPolynomial].
  */
-@Suppress("NOTHING_TO_INLINE")
 public inline fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to this))
 
 /**
@@ -269,6 +252,7 @@ public class NumberedPolynomialTermSignatureBuilder {
      *
      * In fact, it just returns [signature] as regular signature of type `List<UInt>`.
      */
+    @PublishedApi
     internal fun build(): List<UInt> = signature
 
     /**
@@ -344,8 +328,7 @@ public class NumberedPolynomialBuilder<C>(
      * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
      */
     public infix fun C.with(signature: List<UInt>) {
-        if (signature in coefficients) coefficients[signature] = add(coefficients[signature]!!, this@with)
-        else coefficients[signature] = this@with
+        coefficients[signature] = if (signature in coefficients) add(coefficients[signature]!!, this@with) else this@with
     }
     /**
      * Declares monomial with [this] coefficient and signature constructed by [block].
@@ -361,7 +344,7 @@ public class NumberedPolynomialBuilder<C>(
      * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
      * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
      */
-    public operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit =
+    public inline operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit =
         this with NumberedPolynomialTermSignatureBuilder().apply(block).build()
 }
 
@@ -385,7 +368,6 @@ public class NumberedPolynomialBuilder<C>(
 //  2. Union types are implemented. Then all three functions should be rewritten
 //     as one with single union type as a (context) receiver.
 //@UnstableKMathAPI
-//@Suppress("FunctionName")
 //public inline fun <C, A: Ring<C>> A.NumberedPolynomial(initialCapacity: Int = 0, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(::add, initialCapacity).apply(block).build()
 /**
  * Creates [NumberedPolynomial] with lambda [block] in context of [this] ring of [NumberedPolynomial]s.
@@ -401,7 +383,6 @@ public class NumberedPolynomialBuilder<C>(
  * ```
  */
 @UnstableKMathAPI
-@Suppress("FunctionName")
 public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(initialCapacity: Int = 0, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 /**
  * Creates [NumberedPolynomial] with lambda [block] in context of [this] field of [NumberedRationalFunction]s.
@@ -417,7 +398,6 @@ public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomi
  * ```
  */
 @UnstableKMathAPI
-@Suppress("FunctionName")
 public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(initialCapacity: Int = 0, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
@@ -430,7 +410,6 @@ public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPo
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
     NumberedRationalFunction<C>(
         NumberedPolynomial(numeratorCoefficients),
@@ -444,7 +423,6 @@ public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName")
 public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
     NumberedRationalFunction<C>(
         NumberedPolynomial(numeratorCoefficients),
@@ -454,13 +432,11 @@ public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalF
 /**
  * Constructs [NumberedRationalFunction] with provided [numerator] and unit denominator.
  */
-@Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
     NumberedRationalFunction<C>(numerator, NumberedPolynomial(mapOf(emptyList<UInt>() to one)))
 /**
  * Constructs [NumberedRationalFunction] with provided [numerator] and unit denominator.
  */
-@Suppress("FunctionName")
 public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
     NumberedRationalFunction<C>(numerator, polynomialOne)
 
@@ -473,7 +449,6 @@ public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalF
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName")
 public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
     NumberedRationalFunction<C>(
         NumberedPolynomial(numeratorCoefficients),
@@ -488,7 +463,6 @@ public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalF
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
  */
-@Suppress("FunctionName")
 public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
     NumberedRationalFunction<C>(
         NumberedPolynomial(numeratorCoefficients),
@@ -496,7 +470,7 @@ public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map
     )
 
 ///**
-// * Converts [this] coefficient to [NumberedRationalFunction].
+// * Converts [this] constant to [NumberedRationalFunction].
 // */
 //context(A)
 //public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> =
@@ -505,7 +479,7 @@ public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map
 //        NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to one))
 //    )
 ///**
-// * Converts [this] coefficient to [NumberedRationalFunction].
+// * Converts [this] constant to [NumberedRationalFunction].
 // */
 //context(NumberedRationalFunctionSpace<C, A>)
 //public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> =
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
index fca9a8ab8..06911feca 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
@@ -51,15 +51,14 @@ public inline fun <C, A : Ring<C>, R> A.numberedRationalFunctionSpace(block: Num
  */
 public fun NumberedPolynomial<Double>.substitute(args: Map<Int, Double>): NumberedPolynomial<Double> = Double.algebra {
     NumberedPolynomial<Double>(
-        buildMap<List<UInt>, Double>(coefficients.size) {
+        buildMap(coefficients.size) {
             for ((degs, c) in coefficients) {
                 val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
                 val newC = args.entries.fold(c) { product, (variable, substitution) ->
                     val deg = degs.getOrElse(variable) { 0u }
                     if (deg == 0u) product else product * substitution.pow(deg.toInt())
                 }
-                if (newDegs !in this) this[newDegs] = newC
-                else this[newDegs] = this[newDegs]!! + newC
+                this[newDegs] = if (newDegs !in this) newC else this[newDegs]!! + newC
             }
         }
     )
@@ -70,15 +69,14 @@ public fun NumberedPolynomial<Double>.substitute(args: Map<Int, Double>): Number
  */
 public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
     NumberedPolynomial<C>(
-        buildMap<List<UInt>, C>(coefficients.size) {
+        buildMap(coefficients.size) {
             for ((degs, c) in coefficients) {
                 val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
                 val newC = args.entries.fold(c) { product, (variable, substitution) ->
                     val deg = degs.getOrElse(variable) { 0u }
                     if (deg == 0u) product else product * power(substitution, deg)
                 }
-                if (newDegs !in this) this[newDegs] = newC
-                else this[newDegs] = this[newDegs]!! + newC
+                this[newDegs] = if (newDegs !in this) newC else this[newDegs]!! + newC
             }
         }
     )
@@ -128,14 +126,14 @@ public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Map<I
 
 /**
  * Substitutes provided arguments [args] into [this] rational function.
- */ // TODO: To optimize boxing
+ */ // TODO: To optimize calculation
 @JvmName("substitutePolynomial")
 public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedPolynomial<C>>) : NumberedRationalFunction<C> =
     NumberedRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
 
 /**
  * Substitutes provided arguments [args] into [this] rational function.
- */ // TODO: To optimize boxing
+ */ // TODO: To optimize calculation
 @JvmName("substituteRationalFunction")
 public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedRationalFunction<C>>) : NumberedRationalFunction<C> =
     ring.numberedRationalFunctionSpace {
@@ -250,14 +248,14 @@ public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Buffe
 
 /**
  * Substitutes provided arguments [args] into [this] rational function.
- */ // TODO: To optimize boxing
+ */ // TODO: To optimize calculation
 @JvmName("substitutePolynomial")
 public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Buffer<NumberedPolynomial<C>>) : NumberedRationalFunction<C> =
     NumberedRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
 
 /**
  * Substitutes provided arguments [args] into [this] rational function.
- */ // TODO: To optimize boxing
+ */ // TODO: To optimize calculation
 @JvmName("substituteRationalFunction")
 public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Buffer<NumberedRationalFunction<C>>) : NumberedRationalFunction<C> =
     ring.numberedRationalFunctionSpace {
-- 
2.34.1


From 9fc99a4c727eb6ca5870a36a38832bddd8415aea Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 25 Jun 2022 15:45:10 +0300
Subject: [PATCH 538/713] Removed extra copyright comment.

---
 .../space/kscience/kmath/functions/listConstructors.kt       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
index 35c736914..e95361724 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
@@ -3,11 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.Ring
-- 
2.34.1


From 403ff93f4af2960facb25696ae5fc1f50e428711 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 25 Jun 2022 16:01:18 +0300
Subject: [PATCH 539/713] Moved optimizations to branch refactor/polynomials

---
 .../kmath/functions/listUtilOptimized.kt      | 250 ------------------
 .../space/kscience/kmath/functions/misc.kt    |  10 -
 2 files changed, 260 deletions(-)
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtilOptimized.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtilOptimized.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtilOptimized.kt
deleted file mode 100644
index 6eb3a1dc7..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtilOptimized.kt
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-import kotlin.math.max
-import kotlin.math.min
-
-
-// TODO: Optimized copies of substitution and invocation
-@UnstablePolynomialBoxingOptimization
-@Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> copyTo(
-    origin: List<C>,
-    originDegree: Int,
-    target: MutableList<C>,
-) {
-    for (deg in 0 .. originDegree) target[deg] = origin[deg]
-}
-
-@UnstablePolynomialBoxingOptimization
-@Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> multiplyAddingToUpdater(
-    ring: Ring<C>,
-    multiplicand: MutableList<C>,
-    multiplicandDegree: Int,
-    multiplier: List<C>,
-    multiplierDegree: Int,
-    updater: MutableList<C>,
-    zero: C,
-) {
-    multiplyAddingTo(
-        ring = ring,
-        multiplicand = multiplicand,
-        multiplicandDegree = multiplicandDegree,
-        multiplier = multiplier,
-        multiplierDegree = multiplierDegree,
-        target = updater
-    )
-    for (updateDeg in 0 .. multiplicandDegree + multiplierDegree) {
-        multiplicand[updateDeg] = updater[updateDeg]
-        updater[updateDeg] = zero
-    }
-}
-
-@UnstablePolynomialBoxingOptimization
-@Suppress("NOTHING_TO_INLINE")
-internal inline fun <C> multiplyAddingTo(
-    ring: Ring<C>,
-    multiplicand: List<C>,
-    multiplicandDegree: Int,
-    multiplier: List<C>,
-    multiplierDegree: Int,
-    target: MutableList<C>
-) = ring {
-    for (d in 0 .. multiplicandDegree + multiplierDegree)
-        for (k in max(0, d - multiplierDegree)..min(multiplicandDegree, d))
-            target[d] += multiplicand[k] * multiplier[d - k]
-}
-
-@UnstablePolynomialBoxingOptimization
-public fun <C> ListPolynomial<C>.substitute2(ring: Ring<C>, arg: ListPolynomial<C>) : ListPolynomial<C> = ring {
-    if (coefficients.isEmpty()) return ListPolynomial(emptyList())
-
-    val thisDegree = coefficients.lastIndex
-    if (thisDegree == -1) return ListPolynomial(emptyList())
-    val argDegree = arg.coefficients.lastIndex
-    if (argDegree == -1) return coefficients[0].asListPolynomial()
-    val constantZero = zero
-    val resultCoefs: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
-    resultCoefs[0] = coefficients[thisDegree]
-    val resultCoefsUpdate: MutableList<C> = MutableList(thisDegree * argDegree + 1) { constantZero }
-    var resultDegree = 0
-    for (deg in thisDegree - 1 downTo 0) {
-        resultCoefsUpdate[0] = coefficients[deg]
-        multiplyAddingToUpdater(
-            ring = ring,
-            multiplicand = resultCoefs,
-            multiplicandDegree = resultDegree,
-            multiplier = arg.coefficients,
-            multiplierDegree = argDegree,
-            updater = resultCoefsUpdate,
-            zero = constantZero
-        )
-        resultDegree += argDegree
-    }
-
-    return ListPolynomial<C>(resultCoefs)
-}
-
-/**
- * Returns numerator (polynomial) of rational function gotten by substitution rational function [arg] to the polynomial instance.
- * More concrete, if [arg] is a fraction `f(x)/g(x)` and the receiving instance is `p(x)`, then
- * ```
- * p(f/g) * g^deg(p)
- * ```
- * is returned.
- *
- * Used in [ListPolynomial.substitute] and [ListRationalFunction.substitute] for performance optimisation.
- */ // TODO: Дописать
-@UnstablePolynomialBoxingOptimization
-internal fun <C> ListPolynomial<C>.substituteRationalFunctionTakeNumerator(ring: Ring<C>, arg: ListRationalFunction<C>): ListPolynomial<C> = ring {
-    if (coefficients.isEmpty()) return ListPolynomial(emptyList())
-
-    val thisDegree = coefficients.lastIndex
-    if (thisDegree == -1) return ListPolynomial(emptyList())
-    val thisDegreeLog2 = 31 - thisDegree.countLeadingZeroBits()
-    val numeratorDegree = arg.numerator.coefficients.lastIndex
-    val denominatorDegree = arg.denominator.coefficients.lastIndex
-    val argDegree = max(numeratorDegree, denominatorDegree)
-    val constantZero = zero
-    val powersOf2 = buildList<Int>(thisDegreeLog2 + 1) {
-        var result = 1
-        for (exp in 0 .. thisDegreeLog2) {
-            add(result)
-            result = result shl 1
-        }
-    }
-    val hashes = powersOf2.runningReduce { acc, i -> acc + i }
-    val numeratorPowers = buildList<List<C>>(thisDegreeLog2 + 1) {
-        add(arg.numerator.coefficients)
-        repeat(thisDegreeLog2) {
-            val next = MutableList<C>(powersOf2[it + 1] * numeratorDegree + 1) { constantZero }
-            add(next)
-            val last = last()
-            multiplyAddingTo(
-                ring = ring,
-                multiplicand = last,
-                multiplicandDegree = powersOf2[it] * numeratorDegree + 1,
-                multiplier = last,
-                multiplierDegree = powersOf2[it] * numeratorDegree + 1,
-                target = next,
-            )
-        }
-    }
-    val denominatorPowers = buildList<List<C>>(thisDegreeLog2 + 1) {
-        add(arg.denominator.coefficients)
-        repeat(thisDegreeLog2) {
-            val next = MutableList<C>(powersOf2[it + 1] * denominatorDegree + 1) { constantZero }
-            add(next)
-            val last = last()
-            multiplyAddingTo(
-                ring = ring,
-                multiplicand = last,
-                multiplicandDegree = powersOf2[it] * denominatorDegree + 1,
-                multiplier = last,
-                multiplierDegree = powersOf2[it] * denominatorDegree + 1,
-                target = next,
-            )
-        }
-    }
-    val levelResultCoefsPool = buildList<MutableList<C>>(thisDegreeLog2 + 1) {
-        repeat(thisDegreeLog2 + 1) {
-            add(MutableList(hashes[it] * argDegree) { constantZero })
-        }
-    }
-    val edgedMultiplier = MutableList<C>(0) { TODO() }
-    val edgedMultiplierUpdater = MutableList<C>(0) { TODO() }
-
-    fun MutableList<C>.reset() {
-        for (i in indices) set(i, constantZero)
-    }
-
-    fun processLevel(level: Int, start: Int, end: Int) : List<C> {
-        val levelResultCoefs = levelResultCoefsPool[level + 1]
-
-        if (level == -1) {
-            levelResultCoefs[0] = coefficients[start]
-        } else {
-            levelResultCoefs.reset()
-            multiplyAddingTo(
-                ring = ring,
-                multiplicand = processLevel(level = level - 1, start = start, end = (start + end) / 2),
-                multiplicandDegree =  hashes[level] * argDegree,
-                multiplier = denominatorPowers[level],
-                multiplierDegree = powersOf2[level] * denominatorDegree,
-                target = levelResultCoefs
-            )
-            multiplyAddingTo(
-                ring = ring,
-                multiplicand = processLevel(level = level - 1, start = (start + end) / 2, end = end),
-                multiplicandDegree = hashes[level] * argDegree,
-                multiplier = numeratorPowers[level],
-                multiplierDegree = powersOf2[level] * numeratorDegree,
-                target = levelResultCoefs
-            )
-        }
-
-        return levelResultCoefs
-    }
-
-    fun processLevelEdged(level: Int, start: Int, end: Int) : List<C> {
-        val levelResultCoefs = levelResultCoefsPool[level + 1]
-
-        if (level == -1) {
-            levelResultCoefs[0] = coefficients[start]
-        } else {
-            val levelsPowerOf2 = powersOf2[level]
-            if (end - start >= levelsPowerOf2) {
-                multiplyAddingTo(
-                    ring = ring,
-                    multiplicand = processLevelEdged(level = level - 1, start = start + levelsPowerOf2, end = end),
-                    multiplicandDegree = hashes[level] * argDegree, // TODO: Ввести переменную
-                    multiplier = numeratorPowers[level],
-                    multiplierDegree = powersOf2[level] * numeratorDegree,
-                    target = levelResultCoefs
-                )
-                multiplyAddingTo(
-                    ring = ring,
-                    multiplicand = processLevel(level = level - 1, start = start, end = start + levelsPowerOf2),
-                    multiplicandDegree = hashes[level] * argDegree,
-                    multiplier = edgedMultiplier,
-                    multiplierDegree = max((hashes[level] and thisDegree) - powersOf2[level] + 1, 0) * denominatorDegree, // TODO: Ввести переменную
-                    target = levelResultCoefs
-                )
-                if (level != thisDegreeLog2) {
-                    multiplyAddingToUpdater(
-                        ring = ring,
-                        multiplicand = edgedMultiplier,
-                        multiplicandDegree = max((hashes[level] and thisDegree) - powersOf2[level] + 1, 0) * denominatorDegree, // TODO: Ввести переменную
-                        multiplier = denominatorPowers[level],
-                        multiplierDegree = powersOf2[level] * denominatorDegree,
-                        updater = edgedMultiplierUpdater,
-                        zero = constantZero
-                    )
-                }
-            } else {
-                copyTo(
-                    origin = processLevelEdged(level = level - 1, start = start + levelsPowerOf2, end = end),
-                    originDegree = hashes[level] * argDegree, // TODO: Ввести переменную
-                    target = levelResultCoefs
-                )
-            }
-        }
-
-        return levelResultCoefs
-    }
-
-    return ListPolynomial(
-        processLevelEdged(
-            level = thisDegreeLog2,
-            start = 0,
-            end = thisDegree + 1
-        )
-    )
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
index 7d6fc84fa..aba246519 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
@@ -6,16 +6,6 @@
 package space.kscience.kmath.functions
 
 
-/**
- * Marks operations that are going to be optimized reimplementations by reducing number of boxings but currently is
- * under development and is not stable (or even ready to use).
- */
-@RequiresOptIn(
-    message = "It's copy of operation with optimized boxing. It's currently unstable.",
-    level = RequiresOptIn.Level.ERROR
-)
-internal annotation class UnstablePolynomialBoxingOptimization
-
 /**
  * Marks declarations that give access to internal entities of polynomials delicate structure. Thus, it allows to
  * optimize performance a bit by skipping standard steps, but such skips may cause critical errors if something is
-- 
2.34.1


From 3e917baaaf86ae8a7c73eda36c20dafbe418bda0 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 25 Jun 2022 21:23:32 +0300
Subject: [PATCH 540/713] Added examples for polynomials. Also: - Fixed bug in
 differentiation of NumberedPolynomials. - Fixed bug in addition and
 subtraction of LabeledPolynomials. - Added references to
 NumberedPolynomialWithoutCheck and LabeledPolynomialWithoutCheck. - Made
 NumberedRationalFunction and LabeledRationalFunction classes data. Made their
 constructor public.

---
 .../kscience/kmath/functions/polynomials.kt   | 396 ++++++++++++++++++
 .../kmath/functions/LabeledPolynomial.kt      |   4 +-
 .../functions/LabeledRationalFunction.kt      |   2 +-
 .../functions/NumberedRationalFunction.kt     |   2 +-
 .../kmath/functions/labeledConstructors.kt    |  24 ++
 .../kmath/functions/numberedConstructors.kt   |  22 +
 .../kscience/kmath/functions/numberedUtil.kt  |   6 +-
 7 files changed, 449 insertions(+), 7 deletions(-)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
new file mode 100644
index 000000000..273fe5cb9
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
@@ -0,0 +1,396 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.symbol
+import space.kscience.kmath.operations.algebra
+
+
+/**
+ * Shows [ListPolynomial]s' and [ListRationalFunction]s' capabilities.
+ */
+fun listPolynomialsExample() {
+    // [ListPolynomial] is a representation of a univariate polynomial as a list of coefficients from the least term to
+    // the greatest term. For example,
+    val polynomial1: ListPolynomial<Int> = ListPolynomial(listOf(2, -3, 1))
+    // represents polynomial 2 + (-3) x + x^2
+
+    // There are also shortcut fabrics:
+    val polynomial2: ListPolynomial<Int> = ListPolynomial(2, -3, 1)
+    println(polynomial1 == polynomial2) // true
+    // and even
+    val polynomial3: ListPolynomial<Int> = 57.asListPolynomial()
+    val polynomial4: ListPolynomial<Int> = ListPolynomial(listOf(57))
+    println(polynomial3 == polynomial4) // true
+
+    val polynomial5: ListPolynomial<Int> = ListPolynomial(3, -1)
+    // For every ring there can be provided a polynomial ring:
+    Int.algebra.listPolynomialSpace {
+        println(-polynomial5 == ListPolynomial(-3, 1)) // true
+        println(polynomial1 + polynomial5 == ListPolynomial(5, -4, 1)) // true
+        println(polynomial1 - polynomial5 == ListPolynomial(-1, -2, 1)) // true
+        println(polynomial1 * polynomial5 == ListPolynomial(6, -11, 6, -1)) // true
+    }
+    // You can even write
+    val x: ListPolynomial<Double> = ListPolynomial(0.0, 1.0)
+    val polynomial6: ListPolynomial<Double> = ListPolynomial(2.0, -3.0, 1.0)
+    Double.algebra.listPolynomialSpace {
+        println(2 - 3 * x + x * x == polynomial6)
+        println(2.0 - 3.0 * x + x * x == polynomial6)
+    }
+
+    // Also there are some utilities for polynomials:
+    println(polynomial1.substitute(Int.algebra, 1) == 0) // true, because 2 + (-3) * 1 + 1^2 = 0
+    println(polynomial1.substitute(Int.algebra, polynomial5) == polynomial1) // true, because 2 + (-3) * (3-x) + (3-x)^2 = 2 - 3x + x^2
+    println(polynomial1.derivative(Int.algebra) == ListPolynomial(-3, 2)) // true, (2 - 3x + x^2)' = -3 + 2x
+    println(polynomial1.nthDerivative(Int.algebra, 2) == 2.asListPolynomial()) // true, (2 - 3x + x^2)'' = 2
+
+    // Lastly, there are rational functions and some other utilities:
+    Double.algebra.listRationalFunctionSpace {
+        val rationalFunction1: ListRationalFunction<Double> = ListRationalFunction(listOf(2.0, -3.0, 1.0), listOf(3.0, -1.0))
+        // It's just (2 - 3x + x^2)/(3 - x)
+
+        val rationalFunction2 : ListRationalFunction<Double> = ListRationalFunction(listOf(5.0, -4.0, 1.0), listOf(3.0, -1.0))
+        // It's just (5 - 4x + x^2)/(3 - x)
+
+        println(rationalFunction1 + 1 == rationalFunction2)
+    }
+}
+
+/**
+ * Shows [NumberedPolynomial]s' and [NumberedRationalFunction]s' capabilities.
+ */
+fun numberedPolynomialsExample() {
+    // Consider polynomial
+    // 3 + 5 x_2 - 7 x_1^2 x_3
+    // Consider, for example, its term -7 x_1^2 x_3. -7 is a coefficient of the term, whereas (2, 0, 1, 0, 0, ...) is
+    // description of degrees of variables x_1, x_2, ... in the term. Such description with removed leading zeros
+    // [2, 0, 1] is called "signature" of the term -7 x_1^2 x_3.
+
+    val polynomial1: NumberedPolynomial<Int>
+    with(Int.algebra) {
+        // [NumberedPolynomial] is a representation of a multivariate polynomial, that stores terms in a map with terms'
+        // signatures as the map's keys and terms' coefficients as corresponding values. For example,
+        polynomial1 = NumberedPolynomial(
+            mapOf(
+                listOf<UInt>() to 3,
+                listOf(0u, 1u) to 5,
+                listOf(2u, 0u, 1u) to -7,
+            )
+        )
+        // represents polynomial 3 + 5 x_2 - 7 x_1^2 x_3
+
+        // This `NumberedPolynomial` function needs context of either ring of constant (as `Int.algebra` in this example)
+        // or space of NumberedPolynomials over it. To understand why it is like this see documentations of functions
+        // NumberedPolynomial and NumberedPolynomialWithoutCheck
+
+        // There are also shortcut fabrics:
+        val polynomial2: NumberedPolynomial<Int> = NumberedPolynomial(
+            listOf<UInt>() to 3,
+            listOf(0u, 1u) to 5,
+            listOf(2u, 0u, 1u) to -7,
+        )
+        println(polynomial1 == polynomial2) // true
+        // and even
+        val polynomial3: NumberedPolynomial<Int> = 57.asNumberedPolynomial() // This one actually does not algebraic context!
+        val polynomial4: NumberedPolynomial<Int> = NumberedPolynomial(listOf<UInt>() to 57)
+        println(polynomial3 == polynomial4) // true
+
+        numberedPolynomialSpace {
+            // Also there is DSL for constructing NumberedPolynomials:
+            val polynomial5: NumberedPolynomial<Int> = NumberedPolynomial {
+                3 {}
+                5 { 2 inPowerOf 1u }
+                -7 with { 1 pow 2u; 3 pow 1u }
+                // `pow` and `inPowerOf` are the same
+                // `with` is omittable
+            }
+            println(polynomial1 == polynomial5) // true
+
+            // Unfortunately the DSL does not work good in bare context of constants' ring, so for now it's disabled and
+            // works only in NumberedPolynomialSpace and NumberedRationalFunctionSpace
+        }
+    }
+
+    val polynomial6: NumberedPolynomial<Int> = with(Int.algebra) {
+        NumberedPolynomial(
+            listOf<UInt>() to 7,
+            listOf(0u, 1u) to -5,
+            listOf(2u, 0u, 1u) to 0,
+            listOf(0u, 0u, 0u, 4u) to 4,
+        )
+    }
+    // For every ring there can be provided a polynomial ring:
+    Int.algebra.numberedPolynomialSpace {
+        println(
+            -polynomial6 == NumberedPolynomial {
+                (-7) {}
+                5 { 2 pow 1u }
+                0 { 1 pow 2u; 3 pow 1u }
+                (-4) { 4 pow 4u }
+            }
+        ) // true
+        println(
+            polynomial1 + polynomial6 == NumberedPolynomial {
+                10 {}
+                0 { 2 pow 1u }
+                (-7) { 1 pow 2u; 3 pow 1u }
+                4 { 4 pow 4u }
+            }
+        ) // true
+        println(
+            polynomial1 - polynomial6 == NumberedPolynomial {
+                (-4) {}
+                10 { 2 pow 1u }
+                (-7) { 1 pow 2u; 3 pow 1u }
+                (-4) { 4 pow 4u }
+            }
+        ) // true
+
+        polynomial1 * polynomial6 // Multiplication works too
+    }
+
+    Double.algebra.numberedPolynomialSpace {
+        // You can even write
+        val x_1: NumberedPolynomial<Double> = NumberedPolynomial { 1.0 { 1 pow 1u } }
+        val x_2: NumberedPolynomial<Double> = NumberedPolynomial { 1.0 { 2 pow 1u } }
+        val x_3: NumberedPolynomial<Double> = NumberedPolynomial { 1.0 { 3 pow 1u } }
+        val polynomial7: NumberedPolynomial<Double> = NumberedPolynomial {
+            3.0 {}
+            5.0 { 2 pow 1u }
+            (-7.0) { 1 pow 2u; 3 pow 1u }
+        }
+        Double.algebra.listPolynomialSpace {
+            println(3 + 5 * x_2 - 7 * x_1 * x_1 * x_3 == polynomial7)
+            println(3.0 + 5.0 * x_2 - 7.0 * x_1 * x_1 * x_3 == polynomial7)
+        }
+    }
+
+    Int.algebra.numberedPolynomialSpace {
+        val x_4: NumberedPolynomial<Int> = NumberedPolynomial { 1 { 4 pow 1u } }
+        // Also there are some utilities for polynomials:
+        println(polynomial1.substitute(mapOf(0 to 1, 1 to -2, 2 to -1)) == 0.asNumberedPolynomial()) // true,
+            // because it's substitution x_1 -> 1, x_2 -> -2, x_3 -> -1,
+            // so 3 + 5 x_2 - 7 x_1^2 x_3 = 3 + 5 * (-2) - 7 * 1^2 * (-1) = 3 - 10 + 7 = 0
+        println(
+            polynomial1.substitute(mapOf(1 to x_4)) == NumberedPolynomial {
+                3 {}
+                5 { 4 pow 1u }
+                (-7) { 1 pow 2u; 3 pow 1u }
+            }
+        ) // true, because it's substitution x_2 -> x_4, so result is 3 + 5 x_4 - 7 x_1^2 x_3
+        println(
+            polynomial1.derivativeWithRespectTo(Int.algebra, 1) ==
+                    NumberedPolynomial { 5 {} }
+        ) // true, d/dx_2 (3 + 5 x_2 - 7 x_1^2 x_3) = 5
+    }
+
+    // Lastly, there are rational functions and some other utilities:
+    Double.algebra.numberedRationalFunctionSpace {
+        val rationalFunction1: NumberedRationalFunction<Double> = NumberedRationalFunction(
+            NumberedPolynomial {
+                2.0 {}
+                (-3.0) { 1 pow 1u }
+                1.0 { 1 pow 2u }
+            },
+            NumberedPolynomial {
+                3.0 {}
+                (-1.0) { 1 pow 1u }
+            }
+        )
+        // It's just (2 - 3x + x^2)/(3 - x) where x = x_1
+
+        val rationalFunction2: NumberedRationalFunction<Double> = NumberedRationalFunction(
+            NumberedPolynomial {
+                5.0 {}
+                (-4.0) { 1 pow 1u }
+                1.0 { 1 pow 2u }
+            },
+            NumberedPolynomial {
+                3.0 {}
+                (-1.0) { 1 pow 1u }
+            }
+        )
+        // It's just (5 - 4x + x^2)/(3 - x) where x = x_1
+
+        println(rationalFunction1 + 1 == rationalFunction2)
+    }
+}
+
+/**
+ * Shows [LabeledPolynomial]s' and [LabeledRationalFunction]s' capabilities.
+ */
+fun labeledPolynomialsExample() {
+    val x by symbol
+    val y by symbol
+    val z by symbol
+    val t by symbol
+
+    // Consider polynomial
+    // 3 + 5 y - 7 x^2 z
+    // Consider, for example, its term -7 x^2 z. -7 is a coefficient of the term, whereas matching (x -> 2, z -> 3) is
+    // description of degrees of variables x_1, x_2, ... in the term. Such description is called "signature" of the
+    // term -7 x_1^2 x_3.
+
+    val polynomial1: LabeledPolynomial<Int>
+    with(Int.algebra) {
+        // [LabeledPolynomial] is a representation of a multivariate polynomial, that stores terms in a map with terms'
+        // signatures as the map's keys and terms' coefficients as corresponding values. For example,
+        polynomial1 = LabeledPolynomial(
+            mapOf(
+                mapOf<Symbol, UInt>() to 3,
+                mapOf(y to 1u) to 5,
+                mapOf(x to 2u, z to 1u) to -7,
+            )
+        )
+        // represents polynomial 3 + 5 y - 7 x^2 z
+
+        // This `LabeledPolynomial` function needs context of either ring of constant (as `Int.algebra` in this example)
+        // or space of LabeledPolynomials over it. To understand why it is like this see documentations of functions
+        // LabeledPolynomial and LabeledPolynomialWithoutCheck
+
+        // There are also shortcut fabrics:
+        val polynomial2: LabeledPolynomial<Int> = LabeledPolynomial(
+            mapOf<Symbol, UInt>() to 3,
+            mapOf(y to 1u) to 5,
+            mapOf(x to 2u, z to 1u) to -7,
+        )
+        println(polynomial1 == polynomial2) // true
+        // and even
+        val polynomial3: LabeledPolynomial<Int> = 57.asLabeledPolynomial() // This one actually does not algebraic context!
+        val polynomial4: LabeledPolynomial<Int> = LabeledPolynomial(mapOf<Symbol, UInt>() to 57)
+        println(polynomial3 == polynomial4) // true
+
+        labeledPolynomialSpace {
+            // Also there is DSL for constructing NumberedPolynomials:
+            val polynomial5: LabeledPolynomial<Int> = LabeledPolynomial {
+                3 {}
+                5 { y inPowerOf 1u }
+                -7 with { x pow 2u; z pow 1u }
+                // `pow` and `inPowerOf` are the same
+                // `with` is omittable
+            }
+            println(polynomial1 == polynomial5) // true
+
+            // Unfortunately the DSL does not work good in bare context of constants' ring, so for now it's disabled and
+            // works only in NumberedPolynomialSpace and NumberedRationalFunctionSpace
+        }
+    }
+
+    val polynomial6: LabeledPolynomial<Int> = with(Int.algebra) {
+        LabeledPolynomial(
+            mapOf<Symbol, UInt>() to 7,
+            mapOf(y to 1u) to -5,
+            mapOf(x to 2u, z to 1u) to 0,
+            mapOf(t to 4u) to 4,
+        )
+    }
+    // For every ring there can be provided a polynomial ring:
+    Int.algebra.labeledPolynomialSpace {
+        println(
+            -polynomial6 == LabeledPolynomial {
+                (-7) {}
+                5 { y pow 1u }
+                0 { x pow 2u; z pow 1u }
+                (-4) { t pow 4u }
+            }
+        ) // true
+        println(
+            polynomial1 + polynomial6 == LabeledPolynomial {
+                10 {}
+                0 { y pow 1u }
+                (-7) { x pow 2u; z pow 1u }
+                4 { t pow 4u }
+            }
+        ) // true
+        println(
+            polynomial1 - polynomial6 == LabeledPolynomial {
+                (-4) {}
+                10 { y pow 1u }
+                (-7) { x pow 2u; z pow 1u }
+                (-4) { t pow 4u }
+            }
+        ) // true
+
+        polynomial1 * polynomial6 // Multiplication works too
+    }
+
+    Double.algebra.labeledPolynomialSpace {
+        // You can even write
+        val polynomial7: LabeledPolynomial<Double> = LabeledPolynomial {
+            3.0 {}
+            5.0 { y pow 1u }
+            (-7.0) { x pow 2u; z pow 1u }
+        }
+        Double.algebra.listPolynomialSpace {
+            println(3 + 5 * y - 7 * x * x * z == polynomial7)
+            println(3.0 + 5.0 * y - 7.0 * x * x * z == polynomial7)
+        }
+    }
+
+    Int.algebra.labeledPolynomialSpace {
+        // Also there are some utilities for polynomials:
+        println(polynomial1.substitute(mapOf(x to 1, y to -2, z to -1)) == 0.asLabeledPolynomial()) // true,
+        // because it's substitution x -> 1, y -> -2, z -> -1,
+        // so 3 + 5 y - 7 x^2 z = 3 + 5 * (-2) - 7 * 1^2 * (-1) = 3 - 10 + 7 = 0
+        println(
+            polynomial1.substitute(mapOf(y to t.asPolynomial())) == LabeledPolynomial {
+                3 {}
+                5 { t pow 1u }
+                (-7) { x pow 2u; z pow 1u }
+            }
+        ) // true, because it's substitution y -> t, so result is 3 + 5 t - 7 x^2 z
+        println(
+            polynomial1.derivativeWithRespectTo(Int.algebra, y) == LabeledPolynomial { 5 {} }
+        ) // true, d/dy (3 + 5 y - 7 x^2 z) = 5
+    }
+
+    // Lastly, there are rational functions and some other utilities:
+    Double.algebra.labeledRationalFunctionSpace {
+        val rationalFunction1: LabeledRationalFunction<Double> = LabeledRationalFunction(
+            LabeledPolynomial {
+                2.0 {}
+                (-3.0) { x pow 1u }
+                1.0 { x pow 2u }
+            },
+            LabeledPolynomial {
+                3.0 {}
+                (-1.0) { x pow 1u }
+            }
+        )
+        // It's just (2 - 3x + x^2)/(3 - x)
+
+        val rationalFunction2: LabeledRationalFunction<Double> = LabeledRationalFunction(
+            LabeledPolynomial {
+                5.0 {}
+                (-4.0) { x pow 1u }
+                1.0 { x pow 2u }
+            },
+            LabeledPolynomial {
+                3.0 {}
+                (-1.0) { x pow 1u }
+            }
+        )
+        // It's just (5 - 4x + x^2)/(3 - x)
+
+        println(rationalFunction1 + 1 == rationalFunction2)
+    }
+}
+
+fun main() {
+    println("ListPolynomials:")
+    listPolynomialsExample()
+    println()
+
+    println("NumberedPolynomials:")
+    numberedPolynomialsExample()
+    println()
+
+    println("ListPolynomials:")
+    labeledPolynomialsExample()
+    println()
+}
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index b0c54502d..061325b60 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -522,7 +522,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     override operator fun LabeledPolynomial<C>.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         LabeledPolynomialAsIs(
             buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
+                coefficients.mapValuesTo(this) { it.value }
                 other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
             }
         )
@@ -532,7 +532,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     override operator fun LabeledPolynomial<C>.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         LabeledPolynomialAsIs(
             buildMap(coefficients.size + other.coefficients.size) {
-                other.coefficients.mapValuesTo(this) { it.value }
+                coefficients.mapValuesTo(this) { it.value }
                 other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
             }
         )
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index 03f323813..1b0bbbec8 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -13,7 +13,7 @@ import kotlin.jvm.JvmName
 /**
  * Represents multivariate rational function that stores its numerator and denominator as [LabeledPolynomial]s.
  */
-public class LabeledRationalFunction<C>(
+public data class LabeledRationalFunction<C>(
     public override val numerator: LabeledPolynomial<C>,
     public override val denominator: LabeledPolynomial<C>
 ) : RationalFunction<C, LabeledPolynomial<C>> {
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index 92f507735..497755126 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -15,7 +15,7 @@ import kotlin.math.max
 /**
  * Represents multivariate rational function that stores its numerator and denominator as [NumberedPolynomial]s.
  */
-public class NumberedRationalFunction<C> internal constructor(
+public data class NumberedRationalFunction<C>(
     public override val numerator: NumberedPolynomial<C>,
     public override val denominator: NumberedPolynomial<C>
 ) : RationalFunction<C, NumberedPolynomial<C>> {
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
index 47325c4bb..7586b7012 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
@@ -73,6 +73,8 @@ public inline fun <C> LabeledPolynomialWithoutCheck(vararg pairs: Pair<Map<Symbo
  * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see LabeledPolynomialWithoutCheck
  */
 public fun <C> LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, add: (C, C) -> C) : LabeledPolynomial<C> {
     val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
@@ -93,6 +95,8 @@ public fun <C> LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, add: (C, C) -
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see LabeledPolynomialWithoutCheck
  */
 public fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, add: (C, C) -> C) : LabeledPolynomial<C> {
     val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
@@ -113,6 +117,8 @@ public fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>,
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see LabeledPolynomialWithoutCheck
  */
 public fun <C> LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, add: (C, C) -> C) : LabeledPolynomial<C> {
     val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
@@ -135,6 +141,8 @@ public fun <C> LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, add:
  * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see LabeledPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, ::add)
 /**
@@ -144,6 +152,8 @@ public inline fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UIn
  * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see LabeledPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs) { left: C, right: C -> left + right }
 
@@ -154,6 +164,8 @@ public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial
  * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see LabeledPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs) { left: C, right: C -> left + right }
 
@@ -164,6 +176,8 @@ public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPoly
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see LabeledPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, ::add)
 
@@ -174,6 +188,8 @@ public inline fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see LabeledPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs) { left: C, right: C -> left + right }
 /**
@@ -183,6 +199,8 @@ public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see LabeledPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs) { left: C, right: C -> left + right }
 
@@ -193,6 +211,8 @@ public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPoly
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see LabeledPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs) { left: C, right: C -> left + right }
 /**
@@ -202,6 +222,8 @@ public inline fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Sym
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see LabeledPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs) { left: C, right: C -> left + right }
 /**
@@ -211,6 +233,8 @@ public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see LabeledPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs) { left: C, right: C -> left + right }
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
index 4850e6cec..3cd398623 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
@@ -72,6 +72,8 @@ public inline fun <C> NumberedPolynomialWithoutCheck(vararg pairs: Pair<List<UIn
  * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see NumberedPolynomialWithoutCheck
  */
 public fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>, add: (C, C) -> C) : NumberedPolynomial<C> {
     val fixedCoefs = mutableMapOf<List<UInt>, C>()
@@ -92,6 +94,8 @@ public fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>, add: (C, C) -> C) :
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see NumberedPolynomialWithoutCheck
  */
 public fun <C> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, add: (C, C) -> C) : NumberedPolynomial<C> {
     val fixedCoefs = mutableMapOf<List<UInt>, C>()
@@ -112,6 +116,8 @@ public fun <C> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, add: (
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see NumberedPolynomialWithoutCheck
  */
 public fun <C> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, add: (C, C) -> C) : NumberedPolynomial<C> {
     val fixedCoefs = mutableMapOf<List<UInt>, C>()
@@ -134,6 +140,8 @@ public fun <C> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, add: (C, C)
  * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see NumberedPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, ::add)
 /**
@@ -143,6 +151,8 @@ public inline fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>
  * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see NumberedPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs) { left: C, right: C -> left + right }
 
@@ -153,6 +163,8 @@ public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomi
  * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see NumberedPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs) { left: C, right: C -> left + right }
 
@@ -163,6 +175,8 @@ public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPo
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see NumberedPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, ::add)
 
@@ -173,6 +187,8 @@ public inline fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<Li
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see NumberedPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs) { left: C, right: C -> left + right }
 /**
@@ -192,6 +208,8 @@ public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPo
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see NumberedPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs) { left: C, right: C -> left + right }
 /**
@@ -201,6 +219,8 @@ public inline fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<U
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see NumberedPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs) { left: C, right: C -> left + right }
 /**
@@ -210,6 +230,8 @@ public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomi
  * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
  * 1. Terms that happen to have the same signature will be summed up.
  * 1. New map will be formed of resulting terms.
+ *
+ * @see NumberedPolynomialWithoutCheck
  */
 public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs) { left: C, right: C -> left + right }
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
index 06911feca..96f5f480b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
@@ -353,7 +353,7 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
         buildMap(coefficients.size) {
             coefficients
                 .forEach { (degs, c) ->
-                    if (degs.size > variable) return@forEach
+                    if (degs.lastIndex < variable) return@forEach
                     put(
                         degs.mapIndexed { index, deg ->
                             when {
@@ -383,7 +383,7 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
         buildMap(coefficients.size) {
             coefficients
                 .forEach { (degs, c) ->
-                    if (degs.size > variable) return@forEach
+                    if (degs.lastIndex < variable) return@forEach
                     put(
                         degs.mapIndexed { index, deg ->
                             when {
@@ -417,7 +417,7 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
         buildMap(coefficients.size) {
             coefficients
                 .forEach { (degs, c) ->
-                    if (degs.size > maxRespectedVariable) return@forEach
+                    if (degs.lastIndex < maxRespectedVariable) return@forEach
                     put(
                         degs.mapIndexed { index, deg ->
                             if (index !in filteredVariablesAndOrders) return@mapIndexed deg
-- 
2.34.1


From 630d16bbeefbd8d402732dd8410ea950c26a6ca6 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 26 Jun 2022 12:16:51 +0300
Subject: [PATCH 541/713] Added design notes. Also: - Changed
 `xxxPolynomialSpace()` and `xxxPolynomialSpace()` functions to
 `xxxPolynomialSpace` value properties. - Changed inconsistency of names
 `XxxRationalFunctionalSpaceYyy` and `XxxRationalFunctionSpaceYyy` in favor of
 second one.

---
 docs/polynomials.md                           | 172 ++++++++++++++++++
 .../functions/LabeledRationalFunction.kt      |   2 +-
 .../kmath/functions/ListRationalFunction.kt   |   2 +-
 .../functions/NumberedRationalFunction.kt     |   2 +-
 .../kmath/functions/RationalFunction.kt       |  22 +--
 .../kscience/kmath/functions/labeledUtil.kt   |   8 +-
 .../kscience/kmath/functions/listUtil.kt      |  12 +-
 .../kscience/kmath/functions/numberedUtil.kt  |   8 +-
 8 files changed, 200 insertions(+), 28 deletions(-)
 create mode 100644 docs/polynomials.md

diff --git a/docs/polynomials.md b/docs/polynomials.md
new file mode 100644
index 000000000..fe69948e5
--- /dev/null
+++ b/docs/polynomials.md
@@ -0,0 +1,172 @@
+# Polynomials and Rational Functions
+
+KMath provides a way to work with uni- and multivariate polynomials and rational functions. It includes full support of arithmetic operations of integers, **constants** (elements of ring polynomials are build over), variables (for certain multivariate implementations), polynomials and rational functions encapsulated in so-called **polynomial space** and **rational function space** and some other utilities such as algebraic differentiation and substitution.
+
+## Concrete realizations
+
+There are 3 approaches to represent polynomials:
+1. For univariate polynomials one can represent and store polynomial as a list of coefficients for each power of the variable. I.e. polynomial  $a_0 + \dots + a_n x^n $ can be represented as a finite sequence $(a_0; \dots; a_n)$. (Compare to sequential definition of polynomials.)
+2. For multivariate polynomials one can represent and store polynomial as a matching (in programming it is called "map" or "dictionary", in math it is called [functional relation](https://en.wikipedia.org/wiki/Binary_relation#Special_types_of_binary_relations)) of each "**term signature**" (that describes what variables and in what powers appear in the term) with corresponding coefficient of the term. But there are 2 possible approaches of term signature representation:
+   1. One can number all the variables, so term signature can be represented as a sequence describing powers of the variables. I.e. signature of term  $c \\; x_0^{d_0} \dots x_n^{d_n} $ (for natural or zero  $d_i $) can be represented as a finite sequence  $(d_0; \dots; d_n)$.
+   2. One can represent variables as objects ("**labels**"), so term signature can be also represented as a matching of each appeared variable with its power in the term.
+
+All that three approaches are implemented by "list", "numbered", and "labeled" versions of polynomials and polynomial spaces respectively. Whereas all rational functions are represented as fractions with corresponding polynomial numerator and denominator, and rational functions' spaces are implemented in the same way as usual field of rational numbers (or more precisely, as any field of fractions over integral domain) should be implemented.
+
+So here are a bit of details. Let `C` by type of constants. Then:
+1. `ListPolynomial`, `ListPolynomialSpace`, `ListRationalFunction` and `ListRationalFunctionSpace` implement the first scenario. `ListPolynomial` stores polynomial  $a_0 + \dots + a_n x^n $ as a coefficients list `listOf(a_0, ..., a_n)` (of type `List<C>`).
+  
+   They also have variation `ScalableListPolynomialSpace` that replaces former polynomials and implements `ScaleOperations`.
+2. `NumberedPolynomial`, `NumberedPolynomialSpace`, `NumberedRationalFunction` and `NumberedRationalFunctionSpace` implement second scenario. `NumberedPolynomial` stores polynomials as structures of type `Map<List<UInt>, C>`. Signatures are stored as `List<UInt>`. To prevent ambiguity signatures should not end with zeros.
+3. `LabeledPolynomial`, `LabeledPolynomialSpace`, `LabeledRationalFunction` and `LabeledRationalFunctionSpace` implement third scenario using common `Symbol` as variable type. `LabeledPolynomial` stores polynomials as structures of type `Map<Map<Symbol, UInt>, C>`. Signatures are stored as `Map<Symbol, UInt>`. To prevent ambiguity each signature should not map any variable to zero.
+
+### Example: `ListPolynomial`
+
+For example, polynomial  $2 - 3x + x^2 $ (with `Int` coefficients) is represented
+```kotlin
+val polynomial: ListPolynomial<Int> = ListPolynomial(listOf(2, -3, 1))
+// or
+val polynomial: ListPolynomial<Int> = ListPolynomial(2, -3, 1)
+```
+
+All algebraic operations can be used in corresponding space:
+```kotlin
+val computationResult = Int.algebra.listPolynomialSpace {
+   ListPolynomial(2, -3, 1) + ListPolynomial(0, 6) == ListPolynomial(2, 3, 1)
+}
+
+println(computationResult) // true
+```
+
+For more see [examples](../examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt).
+
+### Example: `NumberedPolynomial`
+
+For example, polynomial  $3 + 5 x_1 - 7 x_0^2 x_2 $ (with `Int` coefficients) is represented
+```kotlin
+val polynomial: NumberedPolynomial<Int> = NumberedPolynomial(
+   mapOf(
+      listOf<UInt>() to 3,
+      listOf(0u, 1u) to 5,
+      listOf(2u, 0u, 1u) to -7,
+   )
+)
+// or
+val polynomial: NumberedPolynomial<Int> = NumberedPolynomial(
+   listOf<UInt>() to 3,
+   listOf(0u, 1u) to 5,
+   listOf(2u, 0u, 1u) to -7,
+)
+```
+
+All algebraic operations can be used in corresponding space:
+```kotlin
+val computationResult = Int.algebra.numberedPolynomialSpace {
+   NumberedPolynomial(
+      listOf<UInt>() to 3,
+      listOf(0u, 1u) to 5,
+      listOf(2u, 0u, 1u) to -7,
+   ) + NumberedPolynomial(
+      listOf(0u, 1u) to -5,
+      listOf(0u, 0u, 0u, 4u) to 4,
+   ) == NumberedPolynomial(
+      listOf<UInt>() to 3,
+      listOf(0u, 1u) to 0,
+      listOf(2u, 0u, 1u) to -7,
+      listOf(0u, 0u, 0u, 4u) to 4,
+   )
+}
+
+println(computationResult) // true
+```
+
+For more see [examples](../examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt).
+
+### Example: `LabeledPolynomial`
+
+For example, polynomial  $3 + 5 y - 7 x^2 z $ (with `Int` coefficients) is represented
+```kotlin
+val polynomial: LabeledPolynomial<Int> = LabeledPolynomial(
+   mapOf(
+      mapOf<Symbol, UInt>() to 3,
+      mapOf(y to 1u) to 5,
+      mapOf(x to 2u, z to 1u) to -7,
+   )
+)
+// or
+val polynomial: LabeledPolynomial<Int> = LabeledPolynomial(
+   mapOf<Symbol, UInt>() to 3,
+   mapOf(y to 1u) to 5,
+   mapOf(x to 2u, z to 1u) to -7,
+)
+```
+
+All algebraic operations can be used in corresponding space:
+```kotlin
+val computationResult = Int.algebra.labeledPolynomialSpace {
+   LabeledPolynomial(
+      listOf<UInt>() to 3,
+      listOf(0u, 1u) to 5,
+      listOf(2u, 0u, 1u) to -7,
+   ) + LabeledPolynomial(
+      listOf(0u, 1u) to -5,
+      listOf(0u, 0u, 0u, 4u) to 4,
+   ) == LabeledPolynomial(
+      listOf<UInt>() to 3,
+      listOf(0u, 1u) to 0,
+      listOf(2u, 0u, 1u) to -7,
+      listOf(0u, 0u, 0u, 4u) to 4,
+   )
+}
+
+println(computationResult) // true
+```
+
+For more see [examples](../examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt).
+
+## Abstract entities (interfaces and abstract classes)
+
+```mermaid
+classDiagram
+   Polynomial <|-- ListPolynomial
+   Polynomial <|-- NumberedPolynomial
+   Polynomial <|-- LabeledPolynomial
+   
+   RationalFunction <|-- ListRationalFunction
+   RationalFunction <|-- NumberedRationalFunction
+   RationalFunction <|-- LabeledRationalFunction
+   
+   Ring <|-- PolynomialSpace
+   PolynomialSpace <|-- MultivariatePolynomialSpace
+   PolynomialSpace <|-- PolynomialSpaceOverRing
+   
+   Ring <|-- RationalFunctionSpace
+   RationalFunctionSpace <|-- MultivariateRationalFunctionSpace
+   RationalFunctionSpace <|-- RationalFunctionSpaceOverRing
+   RationalFunctionSpace <|-- RationalFunctionSpaceOverPolynomialSpace
+   RationalFunctionSpace <|-- PolynomialSpaceOfFractions
+   RationalFunctionSpaceOverPolynomialSpace <|-- MultivariateRationalFunctionSpaceOverMultivariatePolynomialSpace
+   MultivariateRationalFunctionSpace <|-- MultivariateRationalFunctionSpaceOverMultivariatePolynomialSpace
+   MultivariateRationalFunctionSpace <|-- MultivariatePolynomialSpaceOfFractions
+   PolynomialSpaceOfFractions <|-- MultivariatePolynomialSpaceOfFractions
+```
+
+There are implemented `Polynomial` and `RationalFunction` interfaces as abstractions of polynomials and rational functions respectively (although, there is not a lot of logic in them) and `PolynomialSpace` and `RationalFunctionSpace` (that implement `Ring` interface) as abstractions of polynomials' and rational functions' spaces respectively. More precisely, that means they allow to declare common logic of interaction with such objects and spaces:
+- `Polynomial` does not provide any logic. It is marker interface.
+- `RationalFunction` provides numerator and denominator of rational function and destructuring declaration for them.
+- `PolynomialSpace` provides all possible arithmetic interactions of integers, constants (of type `C`), and polynomials (of type `P`) like addition, subtraction, multiplication, and some others and common properties like degree of polynomial.
+- `RationalFunctionSpace` provides the same as `PolynomialSpace` but also for rational functions: all possible arithmetic interactions of integers, constants (of type `C`), polynomials (of type `P`), and rational functions (of type `R`) like addition, subtraction, multiplication, division (in some cases), and some others and common properties like degree of polynomial.
+
+Then to add abstraction of similar behaviour with variables (in multivariate case) there are implemented `MultivariatePolynomialSpace` and `MultivariateRationalFunctionSpace`. They just include variables (of type `V`) in the interactions of the entities.
+
+Also, to remove boilerplates there were provided helping subinterfaces and abstract subclasses:
+- `PolynomialSpaceOverRing` allows to replace implementation of interactions of integers and constants with implementations from provided ring over constants (of type `A: Ring<C>`).
+- `RationalFunctionSpaceOverRing` &mdash; the same but for `RationalFunctionSpace`.
+- `RationalFunctionSpaceOverPolynomialSpace` &mdash; the same but "the inheritance" includes interactions with polynomials from provided `PolynomialSpace`.
+- `PolynomialSpaceOfFractions` is actually abstract subclass of `RationalFunctionSpace` that implements all fractions boilerplates with provided (`protected`) constructor of rational functions by polynomial numerator and denominator.
+- `MultivariateRationalFunctionSpaceOverMultivariatePolynomialSpace` and `MultivariatePolynomialSpaceOfFractions` &mdash; the same stories of operators inheritance and fractions boilerplates respectively but in multivariate case.
+
+## Utilities
+
+For all kinds of polynomials there are provided (implementation details depend on kind of polynomials) such common utilities as:
+1. differentiation and anti-differentiation,
+2. substitution, invocation and functional representation.
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index 1b0bbbec8..b1d0dd4d9 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -30,7 +30,7 @@ public data class LabeledRationalFunction<C>(
 public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
     public val ring: A,
 ) :
-    MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSpace<
+    MultivariateRationalFunctionSpaceOverMultivariatePolynomialSpace<
             C,
             Symbol,
             LabeledPolynomial<C>,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
index e23baa548..7434063f2 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
@@ -28,7 +28,7 @@ public data class ListRationalFunction<C>(
 public class ListRationalFunctionSpace<C, A : Ring<C>> (
     public val ring: A,
 ) :
-    RationalFunctionalSpaceOverPolynomialSpace<
+    RationalFunctionSpaceOverPolynomialSpace<
             C,
             ListPolynomial<C>,
             ListRationalFunction<C>,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index 497755126..e61d6c55e 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -32,7 +32,7 @@ public data class NumberedRationalFunction<C>(
 public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
     public val ring: A,
 ) :
-    RationalFunctionalSpaceOverPolynomialSpace<
+    RationalFunctionSpaceOverPolynomialSpace<
             C,
             NumberedPolynomial<C>,
             NumberedRationalFunction<C>,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 338ae9935..1782dba74 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -29,7 +29,7 @@ public interface RationalFunction<C, P: Polynomial<C>> {
  * @param R the type of rational functions.
  */
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
-public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunction<C, P>> : Ring<R> {
+public interface RationalFunctionSpace<C, P: Polynomial<C>, R: RationalFunction<C, P>> : Ring<R> {
     /**
      * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
@@ -459,12 +459,12 @@ public interface RationalFunctionalSpace<C, P: Polynomial<C>, R: RationalFunctio
  * @param A the type of algebraic structure (precisely, of ring) provided for constants.
  */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface RationalFunctionalSpaceOverRing<
+public interface RationalFunctionSpaceOverRing<
         C,
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         A: Ring<C>
-        > : RationalFunctionalSpace<C, P, R> {
+        > : RationalFunctionSpace<C, P, R> {
 
     /**
      * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
@@ -561,12 +561,12 @@ public interface RationalFunctionalSpaceOverRing<
  * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
  */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface RationalFunctionalSpaceOverPolynomialSpace<
+public interface RationalFunctionSpaceOverPolynomialSpace<
         C,
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         AP: PolynomialSpace<C, P>,
-        > : RationalFunctionalSpace<C, P, R> {
+        > : RationalFunctionSpace<C, P, R> {
 
     /**
      * Underlying polynomial ring. Its polynomial operations are inherited by local polynomial operations.
@@ -797,7 +797,7 @@ public abstract class PolynomialSpaceOfFractions<
         C,
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
-        > : RationalFunctionalSpace<C, P, R> {
+        > : RationalFunctionSpace<C, P, R> {
 
     /**
      * Constructor of rational functions (of type [R]) from numerator and denominator (of type [P]).
@@ -1106,12 +1106,12 @@ public abstract class PolynomialSpaceOfFractions<
  * @param R the type of rational functions.
  */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface MultivariateRationalFunctionalSpace<
+public interface MultivariateRationalFunctionSpace<
         C,
         V,
         P: Polynomial<C>,
         R: RationalFunction<C, P>
-        >: RationalFunctionalSpace<C, P, R> {
+        >: RationalFunctionSpace<C, P, R> {
     /**
      * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
      */
@@ -1335,13 +1335,13 @@ public interface MultivariateRationalFunctionalSpace<
  * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
  */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface MultivariateRationalFunctionalSpaceOverMultivariatePolynomialSpace<
+public interface MultivariateRationalFunctionSpaceOverMultivariatePolynomialSpace<
         C,
         V,
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
         AP: MultivariatePolynomialSpace<C, V, P>,
-        > : RationalFunctionalSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionalSpace<C, V, P, R> {
+        > : RationalFunctionSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionSpace<C, V, P, R> {
     /**
      * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
      */
@@ -1517,7 +1517,7 @@ public abstract class MultivariatePolynomialSpaceOfFractions<
         V,
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
-        > : MultivariateRationalFunctionalSpace<C, V, P, R>,  PolynomialSpaceOfFractions<C, P, R>() {
+        > : MultivariateRationalFunctionSpace<C, V, P, R>,  PolynomialSpaceOfFractions<C, P, R>() {
     /**
      * Returns sum of the variable represented as a rational function and the rational function.
      */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
index 39c781a14..4002eb25a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
@@ -19,8 +19,8 @@ import kotlin.jvm.JvmName
 /**
  * Creates a [LabeledPolynomialSpace] over a received ring.
  */
-public fun <C, A : Ring<C>> A.labeledPolynomialSpace(): LabeledPolynomialSpace<C, A> =
-    LabeledPolynomialSpace(this)
+public inline val <C, A : Ring<C>> A.labeledPolynomialSpace: LabeledPolynomialSpace<C, A>
+    get() = LabeledPolynomialSpace(this)
 
 /**
  * Creates a [LabeledPolynomialSpace]'s scope over a received ring.
@@ -32,8 +32,8 @@ public inline fun <C, A : Ring<C>, R> A.labeledPolynomialSpace(block: LabeledPol
 /**
  * Creates a [LabeledRationalFunctionSpace] over a received ring.
  */
-public fun <C, A : Ring<C>> A.labeledRationalFunctionSpace(): LabeledRationalFunctionSpace<C, A> =
-    LabeledRationalFunctionSpace(this)
+public inline val <C, A : Ring<C>> A.labeledRationalFunctionSpace: LabeledRationalFunctionSpace<C, A>
+    get() = LabeledRationalFunctionSpace(this)
 
 /**
  * Creates a [LabeledRationalFunctionSpace]'s scope over a received ring.
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
index 649fc48bd..4f3f6d88e 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
@@ -16,8 +16,8 @@ import kotlin.math.pow
 /**
  * Creates a [ListPolynomialSpace] over a received ring.
  */
-public fun <C, A : Ring<C>> A.listPolynomialSpace(): ListPolynomialSpace<C, A> =
-    ListPolynomialSpace(this)
+public inline val <C, A : Ring<C>> A.listPolynomialSpace: ListPolynomialSpace<C, A>
+    get() = ListPolynomialSpace(this)
 
 /**
  * Creates a [ListPolynomialSpace]'s scope over a received ring.
@@ -30,8 +30,8 @@ public inline fun <C, A : Ring<C>, R> A.listPolynomialSpace(block: ListPolynomia
 /**
  * Creates a [ScalableListPolynomialSpace] over a received scalable ring.
  */
-public fun <C, A> A.scalableListPolynomialSpace(): ScalableListPolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C> =
-    ScalableListPolynomialSpace(this)
+public inline val <C, A> A.scalableListPolynomialSpace: ScalableListPolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C>
+    get() = ScalableListPolynomialSpace(this)
 
 /**
  * Creates a [ScalableListPolynomialSpace]'s scope over a received scalable ring.
@@ -44,8 +44,8 @@ public inline fun <C, A, R> A.scalableListPolynomialSpace(block: ScalableListPol
 /**
  * Creates a [ListRationalFunctionSpace] over a received ring.
  */
-public fun <C, A : Ring<C>> A.listRationalFunctionSpace(): ListRationalFunctionSpace<C, A> =
-    ListRationalFunctionSpace(this)
+public inline val <C, A : Ring<C>> A.listRationalFunctionSpace: ListRationalFunctionSpace<C, A>
+    get() = ListRationalFunctionSpace(this)
 
 /**
  * Creates a [ListRationalFunctionSpace]'s scope over a received ring.
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
index 96f5f480b..e485652f4 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
@@ -21,8 +21,8 @@ import kotlin.math.min
 /**
  * Creates a [NumberedPolynomialSpace] over a received ring.
  */
-public fun <C, A : Ring<C>> A.numberedPolynomialSpace(): NumberedPolynomialSpace<C, A> =
-    NumberedPolynomialSpace(this)
+public inline val <C, A : Ring<C>> A.numberedPolynomialSpace: NumberedPolynomialSpace<C, A>
+    get() = NumberedPolynomialSpace(this)
 
 /**
  * Creates a [NumberedPolynomialSpace]'s scope over a received ring.
@@ -35,8 +35,8 @@ public inline fun <C, A : Ring<C>, R> A.numberedPolynomialSpace(block: NumberedP
 /**
  * Creates a [NumberedRationalFunctionSpace] over a received ring.
  */
-public fun <C, A : Ring<C>> A.numberedRationalFunctionSpace(): NumberedRationalFunctionSpace<C, A> =
-    NumberedRationalFunctionSpace(this)
+public inline val <C, A : Ring<C>> A.numberedRationalFunctionSpace: NumberedRationalFunctionSpace<C, A>
+    get() = NumberedRationalFunctionSpace(this)
 
 /**
  * Creates a [NumberedRationalFunctionSpace]'s scope over a received ring.
-- 
2.34.1


From cb7291ccb00e5b167b69928360ae4fadafcaf0cd Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 26 Jun 2022 12:58:30 +0300
Subject: [PATCH 542/713] Little addition to polynomials design note.

---
 docs/polynomials.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/polynomials.md b/docs/polynomials.md
index fe69948e5..b255acda1 100644
--- a/docs/polynomials.md
+++ b/docs/polynomials.md
@@ -8,7 +8,7 @@ There are 3 approaches to represent polynomials:
 1. For univariate polynomials one can represent and store polynomial as a list of coefficients for each power of the variable. I.e. polynomial  $a_0 + \dots + a_n x^n $ can be represented as a finite sequence $(a_0; \dots; a_n)$. (Compare to sequential definition of polynomials.)
 2. For multivariate polynomials one can represent and store polynomial as a matching (in programming it is called "map" or "dictionary", in math it is called [functional relation](https://en.wikipedia.org/wiki/Binary_relation#Special_types_of_binary_relations)) of each "**term signature**" (that describes what variables and in what powers appear in the term) with corresponding coefficient of the term. But there are 2 possible approaches of term signature representation:
    1. One can number all the variables, so term signature can be represented as a sequence describing powers of the variables. I.e. signature of term  $c \\; x_0^{d_0} \dots x_n^{d_n} $ (for natural or zero  $d_i $) can be represented as a finite sequence  $(d_0; \dots; d_n)$.
-   2. One can represent variables as objects ("**labels**"), so term signature can be also represented as a matching of each appeared variable with its power in the term.
+   2. One can represent variables as objects ("**labels**"), so term signature can be also represented as a matching of each appeared variable with its power in the term. I.e. signature of term  $c \\; x_0^{d_0} \dots x_n^{d_n} $ (for natural non-zero  $d_i $) can be represented as a finite matching  $(x_0 \to d_1; \dots; x_n \to d_n)$.
 
 All that three approaches are implemented by "list", "numbered", and "labeled" versions of polynomials and polynomial spaces respectively. Whereas all rational functions are represented as fractions with corresponding polynomial numerator and denominator, and rational functions' spaces are implemented in the same way as usual field of rational numbers (or more precisely, as any field of fractions over integral domain) should be implemented.
 
-- 
2.34.1


From ed634013f67b71002919ef43a75555f1623d1945 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 27 Jun 2022 17:07:33 +0300
Subject: [PATCH 543/713] Removed extra suppresses.

---
 .../kmath/functions/LabeledPolynomial.kt      |  2 --
 .../functions/LabeledRationalFunction.kt      |  6 -----
 .../kmath/functions/ListPolynomial.kt         |  7 ------
 .../kmath/functions/ListRationalFunction.kt   | 16 -------------
 .../functions/NumberedRationalFunction.kt     | 24 -------------------
 .../kmath/functions/labeledConstructors.kt    |  6 +----
 .../kmath/functions/numberedConstructors.kt   |  6 +----
 7 files changed, 2 insertions(+), 65 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 061325b60..f1859ac4b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -610,12 +610,10 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     /**
      * Substitutes provided arguments [arguments] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun LabeledPolynomial<C>.substitute(arguments: Map<Symbol, C>): LabeledPolynomial<C> = substitute(ring, arguments)
     /**
      * Substitutes provided arguments [arguments] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substitutePolynomial")
     public inline fun LabeledPolynomial<C>.substitute(arguments: Map<Symbol, LabeledPolynomial<C>>) : LabeledPolynomial<C> = substitute(ring, arguments)
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index b1d0dd4d9..c34d1e46f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -62,35 +62,29 @@ public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
     /**
      * Substitutes provided constant [argument] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, C>): LabeledPolynomial<C> = substitute(ring, argument)
     /**
      * Substitutes provided polynomial [argument] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substitutePolynomial")
     public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledPolynomial<C> = substitute(ring, argument)
     /**
      * Substitutes provided rational function [argument] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substituteRationalFunction")
     public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, LabeledRationalFunction<C>>): LabeledRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided constant [argument] into [this] rational function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun LabeledRationalFunction<C>.substitute(argument: Map<Symbol, C>): LabeledRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided polynomial [argument] into [this] rational function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substitutePolynomial")
     public inline fun LabeledRationalFunction<C>.substitute(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided rational function [argument] into [this] rational function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substituteRationalFunction")
     public inline fun LabeledRationalFunction<C>.substitute(argument: Map<Symbol, LabeledRationalFunction<C>>): LabeledRationalFunction<C> = substitute(ring, argument)
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index 8db93cbb1..3f470d5e7 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -346,39 +346,32 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
     /**
      * Evaluates value of [this] polynomial on provided [argument].
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.substitute(argument: C): C = substitute(ring, argument)
     /**
      * Substitutes provided polynomial [argument] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
 
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.asFunction(): (C) -> C = asFunctionOver(ring)
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = asFunctionOfConstantOver(ring)
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = asFunctionOfPolynomialOver(ring)
 
     /**
      * Evaluates value of [this] polynomial on provided [argument].
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline operator fun ListPolynomial<C>.invoke(argument: C): C = substitute(ring, argument)
     /**
      * Evaluates value of [this] polynomial on provided [argument].
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
 }
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
index 7434063f2..40c6745d9 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
@@ -55,83 +55,67 @@ public class ListRationalFunctionSpace<C, A : Ring<C>> (
     /**
      * Evaluates value of [this] polynomial on provided argument.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.substitute(argument: C): C = substitute(ring, argument)
     /**
      * Substitutes provided polynomial [argument] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
     /**
      * Substitutes provided rational function [argument] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.substitute(argument: ListRationalFunction<C>): ListRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided polynomial [argument] into [this] rational function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListRationalFunction<C>.substitute(argument: ListPolynomial<C>): ListRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided rational function [argument] into [this] rational function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListRationalFunction<C>.substitute(argument: ListRationalFunction<C>): ListRationalFunction<C> = substitute(ring, argument)
 
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.asFunction(): (C) -> C = { substitute(ring, it) }
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = { substitute(ring, it) }
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListPolynomial<C>.asFunctionOfRationalFunction(): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
     /**
      * Represent [this] rational function as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListRationalFunction<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
     /**
      * Represent [this] rational function as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun ListRationalFunction<C>.asFunctionOfRationalFunction(): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
 
     /**
      * Evaluates value of [this] polynomial on provided argument.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline operator fun ListPolynomial<C>.invoke(argument: C): C = substitute(ring, argument)
     /**
      * Evaluates value of [this] polynomial on provided argument.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
     /**
      * Evaluates value of [this] polynomial on provided argument.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline operator fun ListPolynomial<C>.invoke(argument: ListRationalFunction<C>): ListRationalFunction<C> = substitute(ring, argument)
     /**
      * Evaluates value of [this] rational function on provided argument.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline operator fun ListRationalFunction<C>.invoke(argument: ListPolynomial<C>): ListRationalFunction<C> = substitute(ring, argument)
     /**
      * Evaluates value of [this] rational function on provided argument.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline operator fun ListRationalFunction<C>.invoke(argument: ListRationalFunction<C>): ListRationalFunction<C> = substitute(ring, argument)
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index e61d6c55e..97dffebe1 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -113,135 +113,111 @@ public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
     /**
      * Substitutes provided constant [argument] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, C>): NumberedPolynomial<C> = substitute(ring, argument)
     /**
      * Substitutes provided polynomial [argument] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substitutePolynomial")
     public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, argument)
     /**
      * Substitutes provided rational function [argument] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substituteRationalFunction")
     public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided constant [argument] into [this] rational function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedRationalFunction<C>.substitute(argument: Map<Int, C>): NumberedRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided polynomial [argument] into [this] rational function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substitutePolynomial")
     public inline fun NumberedRationalFunction<C>.substitute(argument: Map<Int, NumberedPolynomial<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided rational function [argument] into [this] rational function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substituteRationalFunction")
     public inline fun NumberedRationalFunction<C>.substitute(argument: Map<Int, NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided constant [argument] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.substitute(argument: Buffer<C>): NumberedPolynomial<C> = substitute(ring, argument)
     /**
      * Substitutes provided polynomial [argument] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substitutePolynomial")
     public inline fun NumberedPolynomial<C>.substitute(argument: Buffer<NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, argument)
     /**
      * Substitutes provided rational function [argument] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substituteRationalFunction")
     public inline fun NumberedPolynomial<C>.substitute(argument: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided constant [argument] into [this] rational function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedRationalFunction<C>.substitute(argument: Buffer<C>): NumberedRationalFunction<C> = substitute(ring, argument)
     /**
      * Substitutes provided polynomial [arguments] into [this] rational function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substitutePolynomial")
     public inline fun NumberedRationalFunction<C>.substitute(arguments: Buffer<NumberedPolynomial<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
     /**
      * Substitutes provided rational function [arguments] into [this] rational function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substituteRationalFunction")
     public inline fun NumberedRationalFunction<C>.substitute(arguments: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
     /**
      * Substitutes provided constant [arguments] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.substituteFully(arguments: Buffer<C>): C = substituteFully(ring, arguments)
 
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.asFunction(): (Buffer<C>) -> C = asFunctionOver(ring)
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.asFunctionOfConstant(): (Buffer<C>) -> C = asFunctionOfConstantOver(ring)
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.asFunctionOfPolynomial(): (Buffer<NumberedPolynomial<C>>) -> NumberedPolynomial<C> = asFunctionOfPolynomialOver(ring)
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.asFunctionOfRationalFunction(): (Buffer<NumberedRationalFunction<C>>) -> NumberedRationalFunction<C> = asFunctionOfRationalFunctionOver(ring)
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedRationalFunction<C>.asFunctionOfPolynomial(): (Buffer<NumberedPolynomial<C>>) -> NumberedRationalFunction<C> = asFunctionOfPolynomialOver(ring)
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedRationalFunction<C>.asFunctionOfRationalFunction(): (Buffer<NumberedRationalFunction<C>>) -> NumberedRationalFunction<C> = asFunctionOfRationalFunctionOver(ring)
 
     /**
      * Evaluates value of [this] polynomial on provided [arguments].
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<C>): C = substituteFully(ring, arguments)
     /**
      * Substitutes provided [arguments] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("invokePolynomial")
     public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, arguments)
     /**
      * Substitutes provided [arguments] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("invokeRationalFunction")
     public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
     /**
      * Substitutes provided [arguments] into [this] rational function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("invokePolynomial")
     public inline operator fun NumberedRationalFunction<C>.invoke(arguments: Buffer<NumberedPolynomial<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
     /**
      * Substitutes provided [arguments] into [this] rational function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("invokeRationalFunction")
     public inline operator fun NumberedRationalFunction<C>.invoke(arguments: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
index 7586b7012..f3fa32334 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:Suppress("FunctionName", "NOTHING_TO_INLINE")
+@file:Suppress("FunctionName")
 
 package space.kscience.kmath.functions
 
@@ -309,21 +309,18 @@ public class LabeledPolynomialTermSignatureBuilder {
      *
      * Declaring another power of the same variable will increase its degree by received degree.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline infix fun Symbol.pow(deg: UInt): Unit = this inPowerOf deg
     /**
      * Declares power of [this] variable of degree [deg].
      *
      * Declaring another power of the same variable will increase its degree by received degree.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline infix fun Symbol.`in`(deg: UInt): Unit = this inPowerOf deg
     /**
      * Declares power of [this] variable of degree [deg].
      *
      * Declaring another power of the same variable will increase its degree by received degree.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline infix fun Symbol.of(deg: UInt): Unit = this inPowerOf deg
 }
 
@@ -370,7 +367,6 @@ public class LabeledPolynomialBuilder<C>(
      * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
      * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline infix fun C.with(noinline block: LabeledPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
     /**
      * Declares monomial with [this] coefficient and signature constructed by [block].
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
index 3cd398623..0a0e6d902 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:Suppress("FunctionName", "NOTHING_TO_INLINE")
+@file:Suppress("FunctionName")
 
 package space.kscience.kmath.functions
 
@@ -296,21 +296,18 @@ public class NumberedPolynomialTermSignatureBuilder {
      *
      * Declaring another power of the same variable will increase its degree by received degree.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline infix fun Int.pow(deg: UInt): Unit = this inPowerOf deg
     /**
      * Declares power of variable #[this] of degree [deg].
      *
      * Declaring another power of the same variable will increase its degree by received degree.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline infix fun Int.`in`(deg: UInt): Unit = this inPowerOf deg
     /**
      * Declares power of variable #[this] of degree [deg].
      *
      * Declaring another power of the same variable will increase its degree by received degree.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline infix fun Int.of(deg: UInt): Unit = this inPowerOf deg
 }
 
@@ -358,7 +355,6 @@ public class NumberedPolynomialBuilder<C>(
      * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
      * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline infix fun C.with(noinline block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
     /**
      * Declares monomial with [this] coefficient and signature constructed by [block].
-- 
2.34.1


From 0ef2258665d3571b67a48933b43f0896b0ca80df Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 27 Jun 2022 17:11:39 +0300
Subject: [PATCH 544/713] Removed extra suppresses.

---
 .../kscience/kmath/functions/NumberedPolynomial.kt     | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index eadeb68ab..8bcfbae5b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -385,56 +385,46 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
     /**
      * Substitutes provided arguments [arguments] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.substitute(arguments: Map<Int, C>): NumberedPolynomial<C> = substitute(ring, arguments)
     /**
      * Substitutes provided arguments [arguments] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substitutePolynomial")
     public inline fun NumberedPolynomial<C>.substitute(arguments: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> = substitute(ring, arguments)
     /**
      * Substitutes provided arguments [arguments] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.substitute(arguments: Buffer<C>): NumberedPolynomial<C> = substitute(ring, arguments)
     /**
      * Substitutes provided arguments [arguments] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("substitutePolynomial")
     public inline fun NumberedPolynomial<C>.substitute(arguments: Buffer<NumberedPolynomial<C>>) : NumberedPolynomial<C> = substitute(ring, arguments)
     /**
      * Substitutes provided arguments [arguments] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.substituteFully(arguments: Buffer<C>): C = this.substituteFully(ring, arguments)
 
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.asFunction(): (Buffer<C>) -> C = asFunctionOver(ring)
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.asFunctionOfConstant(): (Buffer<C>) -> C = asFunctionOfConstantOver(ring)
     /**
      * Represent [this] polynomial as a regular context-less function.
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline fun NumberedPolynomial<C>.asFunctionOfPolynomial(): (Buffer<NumberedPolynomial<C>>) -> NumberedPolynomial<C> = asFunctionOfPolynomialOver(ring)
 
     /**
      * Evaluates value of [this] polynomial on provided [arguments].
      */
-    @Suppress("NOTHING_TO_INLINE")
     public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<C>): C = substituteFully(ring, arguments)
     /**
      * Substitutes provided [arguments] into [this] polynomial.
      */
-    @Suppress("NOTHING_TO_INLINE")
     @JvmName("invokePolynomial")
     public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, arguments)
 }
\ No newline at end of file
-- 
2.34.1


From 043d292eca11f5ffea1ceb0f507a0bd101dbb399 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 27 Jun 2022 17:14:03 +0300
Subject: [PATCH 545/713] Added test. Fixed bug in NumberedPolynomial's DSL.

---
 .../kmath/functions/NumberedPolynomial.kt     |  12 +-
 .../kmath/functions/numberedConstructors.kt   |   1 +
 .../functions/NumberedConstructorsTest.kt     |  20 +-
 .../kmath/functions/NumberedPolynomialTest.kt | 304 +++++++++++++++++-
 4 files changed, 324 insertions(+), 13 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 8bcfbae5b..35d0c7448 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -331,13 +331,13 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
      * the result is `-1`.
      */
     public val NumberedPolynomial<C>.lastVariable: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.lastIndex } ?: -1
+        get() = coefficients.keys.maxOfOrNull { degs -> degs.lastIndex } ?: -1
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
      */
     override val NumberedPolynomial<C>.degree: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.sum().toInt() } ?: -1
+        get() = coefficients.keys.maxOfOrNull { degs -> degs.sum().toInt() } ?: -1
     /**
      * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
      * exponents in which the variables are appeared in the polynomial.
@@ -348,7 +348,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
     public val NumberedPolynomial<C>.degrees: List<UInt>
         get() =
             MutableList(lastVariable + 1) { 0u }.apply {
-                coefficients.entries.forEach { (degs, _) ->
+                coefficients.keys.forEach { degs ->
                     degs.forEachIndexed { index, deg ->
                         this[index] = max(this[index], deg)
                     }
@@ -358,13 +358,13 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
      * Counts degree of the polynomial by the specified [variable].
      */
     public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) -> degs.getOrElse(variable) { 0u } } ?: 0u
+        coefficients.keys.maxOfOrNull { degs -> degs.getOrElse(variable) { 0u } } ?: 0u
     /**
      * Counts degree of the polynomial by the specified [variables].
      */
     public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) ->
-            degs.withIndex().filter { (index, _) -> index in variables }.sumOf { it.value }
+        coefficients.keys.maxOfOrNull { degs ->
+            degs.withIndex().fold(0u) { acc, (index, value) -> if (index in variables) acc + value else acc }
         } ?: 0u
     /**
      * Count of variables occurring in the polynomial with positive power. If there is no such variable,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
index 0a0e6d902..d561e06ba 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
@@ -283,6 +283,7 @@ public class NumberedPolynomialTermSignatureBuilder {
      * Declaring another power of the same variable will increase its degree by received degree.
      */
     public infix fun Int.inPowerOf(deg: UInt) {
+        if (deg == 0u) return
         val index = this - 1
         if (index > signature.lastIndex) {
             signature.addAll(List(index - signature.lastIndex - 1) { 0u })
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
index 14493aaae..8d1b128cf 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
@@ -23,8 +23,8 @@ class NumberedConstructorsTest {
             ),
             Int.algebra.numberedPolynomialSpace {
                 NumberedPolynomial {
-                    5 { 1 inPowerOf 2u; 3 inPowerOf 3u }
-                    (-6) { 2 inPowerOf 1u }
+                    5 { 1 pow 2u; 3 pow 3u }
+                    (-6) { 2 pow 1u }
                 }
             },
             "test 1"
@@ -47,8 +47,20 @@ class NumberedConstructorsTest {
             ),
             Int.algebra.numberedPolynomialSpace {
                 NumberedPolynomial {
-                    5 { 1 inPowerOf 1u; 1 inPowerOf 1u }
-                    (-6) { 1 inPowerOf 2u }
+                    5 { 1 pow 1u; 1 pow 1u }
+                    (-6) { 1 pow 2u }
+                }
+            },
+            "test 3"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(2u) to -1,
+            ),
+            Int.algebra.numberedPolynomialSpace {
+                NumberedPolynomial {
+                    5 { 1 pow 1u; 1 pow 1u }
+                    (-6) { 1 pow 2u; 3 pow 0u }
                 }
             },
             "test 3"
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
index 537e3b85d..223ff5d92 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
@@ -9,9 +9,7 @@ package space.kscience.kmath.functions
 
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.test.misc.*
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertSame
+import kotlin.test.*
 
 
 @UnstableKMathAPI
@@ -1365,4 +1363,304 @@ class NumberedPolynomialTest {
             )
         }
     }
+    @Test
+    fun test_lastVariable() {
+        val o = Rational(0)
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                -1,
+                NumberedPolynomial {}.lastVariable,
+                "test 1"
+            )
+            assertEquals(
+                -1,
+                NumberedPolynomial {
+                    o {}
+                }.lastVariable,
+                "test 2"
+            )
+            assertEquals(
+                2,
+                NumberedPolynomial {
+                    o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
+                }.lastVariable,
+                "test 3"
+            )
+            assertEquals(
+                3,
+                NumberedPolynomial {
+                    o { 1 pow 0u; 2 pow 1u; 3 pow 2u; 4 pow 1u; 5 pow 0u }
+                }.also { println(it) }.lastVariable,
+                "test 4"
+            )
+            assertEquals(
+                2,
+                NumberedPolynomial {
+                    o {}
+                    o { 2 pow 1u }
+                    o { 1 pow 2u; 3 pow 1u }
+                }.lastVariable,
+                "test 5"
+            )
+        }
+    }
+    @Test
+    fun test_degree() {
+        val o = Rational(0)
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                -1,
+                NumberedPolynomial {}.degree,
+                "test 1"
+            )
+            assertEquals(
+                0,
+                NumberedPolynomial {
+                    o {}
+                }.degree,
+                "test 2"
+            )
+            assertEquals(
+                6,
+                NumberedPolynomial {
+                    o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
+                }.degree,
+                "test 3"
+            )
+            assertEquals(
+                4,
+                NumberedPolynomial {
+                    o { 1 pow 0u; 2 pow 1u; 3 pow 2u; 4 pow 1u; 5 pow 0u }
+                }.degree,
+                "test 4"
+            )
+            assertEquals(
+                3,
+                NumberedPolynomial {
+                    o {}
+                    o { 2 pow 1u }
+                    o { 1 pow 2u; 3 pow 1u }
+                }.degree,
+                "test 5"
+            )
+            assertEquals(
+                4,
+                NumberedPolynomial {
+                    o {}
+                    o { 2 pow 1u }
+                    o { 1 pow 2u; 3 pow 1u }
+                    o { 4 pow 4u }
+                }.degree,
+                "test 6"
+            )
+        }
+    }
+    @Test
+    fun test_countOfVariables() {
+        val o = Rational(0)
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                listOf(),
+                NumberedPolynomial {}.degrees,
+                "test 1"
+            )
+            assertEquals(
+                listOf(),
+                NumberedPolynomial {
+                    o {}
+                }.degrees,
+                "test 2"
+            )
+            assertEquals(
+                listOf(1u, 2u, 3u),
+                NumberedPolynomial {
+                    o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
+                }.degrees,
+                "test 3"
+            )
+            assertEquals(
+                listOf(0u, 1u, 2u, 1u),
+                NumberedPolynomial {
+                    o { 1 pow 0u; 2 pow 1u; 3 pow 2u; 4 pow 1u; 5 pow 0u }
+                }.degrees,
+                "test 4"
+            )
+            assertEquals(
+                listOf(2u, 1u, 1u),
+                NumberedPolynomial {
+                    o {}
+                    o { 2 pow 1u }
+                    o { 1 pow 2u; 3 pow 1u }
+                }.degrees,
+                "test 5"
+            )
+            assertEquals(
+                listOf(2u, 2u, 2u, 4u),
+                NumberedPolynomial {
+                    o {}
+                    o { 1 pow 1u; 2 pow 2u }
+                    o { 2 pow 1u; 3 pow 2u }
+                    o { 1 pow 2u; 3 pow 1u }
+                    o { 4 pow 4u }
+                }.degrees,
+                "test 6"
+            )
+        }
+    }
+    @Test
+    fun test_degreeBy() {
+        val o = Rational(0)
+        RationalField.numberedPolynomialSpace {
+            fun NumberedPolynomial<Rational>.collectDegrees(limit: Int = lastVariable + 2): List<UInt> = List(limit) { degreeBy(it) }
+            assertEquals(
+                listOf(0u),
+                NumberedPolynomial {}.collectDegrees(),
+                "test 1"
+            )
+            assertEquals(
+                listOf(0u),
+                NumberedPolynomial {
+                    o {}
+                }.collectDegrees(),
+                "test 2"
+            )
+            assertEquals(
+                listOf(1u, 2u, 3u, 0u),
+                NumberedPolynomial {
+                    o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
+                }.collectDegrees(),
+                "test 3"
+            )
+            assertEquals(
+                listOf(0u, 1u, 2u, 1u, 0u),
+                NumberedPolynomial {
+                    o { 1 pow 0u; 2 pow 1u; 3 pow 2u; 4 pow 1u; 5 pow 0u }
+                }.collectDegrees(),
+                "test 4"
+            )
+            assertEquals(
+                listOf(2u, 1u, 1u, 0u),
+                NumberedPolynomial {
+                    o {}
+                    o { 2 pow 1u }
+                    o { 1 pow 2u; 3 pow 1u }
+                }.collectDegrees(),
+                "test 5"
+            )
+            assertEquals(
+                listOf(2u, 2u, 2u, 4u, 0u),
+                NumberedPolynomial {
+                    o {}
+                    o { 1 pow 1u; 2 pow 2u }
+                    o { 2 pow 1u; 3 pow 2u }
+                    o { 1 pow 2u; 3 pow 1u }
+                    o { 4 pow 4u }
+                }.collectDegrees(),
+                "test 6"
+            )
+        }
+    }
+    @Test
+    fun test_degreeBy_Collection() {
+        val o = Rational(0)
+        RationalField.numberedPolynomialSpace {
+            fun NumberedPolynomial<Rational>.checkDegreeBy(message: String? = null) {
+                val lastVariable = lastVariable
+                val indexCollectionSequence: Sequence<List<Int>> = sequence {
+                    val appearances = MutableList(lastVariable + 2) { 0 }
+                    while (true) {
+                        yield(
+                            buildList {
+                                for ((variable, count) in appearances.withIndex()) repeat(count) { add(variable) }
+                            }
+                        )
+                        val indexChange = appearances.indexOfFirst { it < 4 }
+                        if (indexChange == -1) break
+                        appearances[indexChange] += 1
+                        for (index in 0 until indexChange) appearances[index] = 0
+                    }
+                }
+                for (indexCollection in indexCollectionSequence) {
+                    val expected = coefficients.keys.maxOfOrNull { degs -> degs.slice(indexCollection.distinct().filter { it in degs.indices }).sum() } ?: 0u
+                    val actual = degreeBy(indexCollection)
+                    if (actual != expected)
+                        fail("${message ?: ""} Incorrect answer for variable collection $indexCollection: expected $expected, actual $actual")
+                }
+            }
+            NumberedPolynomial {}.checkDegreeBy("test 1")
+            NumberedPolynomial {
+                o {}
+            }.checkDegreeBy("test 2")
+            NumberedPolynomial {
+                o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
+            }.checkDegreeBy("test 3")
+            NumberedPolynomial {
+                o { 1 pow 0u; 2 pow 1u; 3 pow 2u; 4 pow 1u; 5 pow 0u }
+            }.checkDegreeBy("test 4")
+            NumberedPolynomial {
+                o {}
+                o { 2 pow 1u }
+                o { 1 pow 2u; 3 pow 1u }
+            }.checkDegreeBy("test 5")
+            NumberedPolynomial {
+                o {}
+                o { 1 pow 1u; 2 pow 2u }
+                o { 2 pow 1u; 3 pow 2u }
+                o { 1 pow 2u; 3 pow 1u }
+                o { 4 pow 4u }
+            }.checkDegreeBy("test 6")
+        }
+    }
+    @Test
+    fun test_degrees() {
+        val o = Rational(0)
+        RationalField.numberedPolynomialSpace {
+            assertEquals(
+                0,
+                NumberedPolynomial {}.countOfVariables,
+                "test 1"
+            )
+            assertEquals(
+                0,
+                NumberedPolynomial {
+                    o {}
+                }.countOfVariables,
+                "test 2"
+            )
+            assertEquals(
+                3,
+                NumberedPolynomial {
+                    o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
+                }.countOfVariables,
+                "test 3"
+            )
+            assertEquals(
+                3,
+                NumberedPolynomial {
+                    o { 1 pow 0u; 2 pow 1u; 3 pow 2u; 4 pow 1u; 5 pow 0u }
+                }.countOfVariables,
+                "test 4"
+            )
+            assertEquals(
+                3,
+                NumberedPolynomial {
+                    o {}
+                    o { 2 pow 1u }
+                    o { 1 pow 2u; 3 pow 1u }
+                }.countOfVariables,
+                "test 5"
+            )
+            assertEquals(
+                4,
+                NumberedPolynomial {
+                    o {}
+                    o { 1 pow 1u; 2 pow 2u }
+                    o { 2 pow 1u; 3 pow 2u }
+                    o { 1 pow 2u; 3 pow 1u }
+                    o { 4 pow 4u }
+                }.countOfVariables,
+                "test 6"
+            )
+        }
+    }
 }
\ No newline at end of file
-- 
2.34.1


From da46ea923c52c586cb9351d922281df6f1f36bf4 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 28 Jun 2022 15:07:09 +0300
Subject: [PATCH 546/713] Extended test for NumberedPolynomial

---
 .../kmath/functions/NumberedPolynomialTest.kt | 80 ++++++++++++++++++-
 1 file changed, 78 insertions(+), 2 deletions(-)

diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
index 223ff5d92..dac7c1a62 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
@@ -1456,7 +1456,7 @@ class NumberedPolynomialTest {
         }
     }
     @Test
-    fun test_countOfVariables() {
+    fun test_degrees() {
         val o = Rational(0)
         RationalField.numberedPolynomialSpace {
             assertEquals(
@@ -1612,7 +1612,7 @@ class NumberedPolynomialTest {
         }
     }
     @Test
-    fun test_degrees() {
+    fun test_countOfVariables() {
         val o = Rational(0)
         RationalField.numberedPolynomialSpace {
             assertEquals(
@@ -1663,4 +1663,80 @@ class NumberedPolynomialTest {
             )
         }
     }
+    @Test
+    fun test_RF_countOfVariables() {
+        val o = Rational(0)
+        RationalField.numberedRationalFunctionSpace {
+            assertEquals(
+                0,
+                NumberedRationalFunction(
+                    NumberedPolynomial {}
+                ).countOfVariables,
+                "test 1"
+            )
+            assertEquals(
+                0,
+                NumberedRationalFunction(
+                    NumberedPolynomial {},
+                    NumberedPolynomial {}
+                ).countOfVariables,
+                "test 2"
+            )
+            assertEquals(
+                0,
+                NumberedRationalFunction(
+                    NumberedPolynomial {
+                        o {}
+                    }
+                ).countOfVariables,
+                "test 3"
+            )
+            assertEquals(
+                3,
+                NumberedRationalFunction(
+                    NumberedPolynomial {
+                        o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
+                    }
+                ).countOfVariables,
+                "test 4"
+            )
+            assertEquals(
+                3,
+                NumberedRationalFunction(
+                    NumberedPolynomial {
+                        o { 2 pow 1u; 4 pow 1u }
+                    },
+                    NumberedPolynomial {
+                        o { 1 pow 0u; 3 pow 2u; 5 pow 0u }
+                    }
+                ).countOfVariables,
+                "test 5"
+            )
+            assertEquals(
+                3,
+                NumberedRationalFunction(
+                    NumberedPolynomial {
+                        o {}
+                        o { 2 pow 1u }
+                        o { 1 pow 2u; 3 pow 1u }
+                    }
+                ).countOfVariables,
+                "test 6"
+            )
+            assertEquals(
+                4,
+                NumberedRationalFunction(
+                    NumberedPolynomial {
+                        o {}
+                        o { 1 pow 1u; 2 pow 2u }
+                        o { 1 pow 2u; 3 pow 1u }
+                    }, NumberedPolynomial {
+                        o { 2 pow 1u; 3 pow 2u }
+                        o { 4 pow 4u }
+                    }
+                ).countOfVariables,
+                "test 7"
+            )
+        }
+    }
 }
\ No newline at end of file
-- 
2.34.1


From 64b33aed184e0f52a4f2938022cf6e0eae0e8591 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 29 Jun 2022 14:53:12 +0300
Subject: [PATCH 547/713] Remove extra suppresses.

---
 .../kotlin/space/kscience/kmath/test/misc/IntModulo.kt          | 2 +-
 .../kotlin/space/kscience/kmath/test/misc/Rational.kt           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
index afd2b5add..b3bb4faf7 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
@@ -108,7 +108,7 @@ class IntModulo {
     override fun toString(): String = "$residue mod $modulus"
 }
 
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
 class IntModuloRing : Ring<IntModulo> {
 
     val modulus: Int
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
index 72bb5942c..4bdd60704 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
@@ -114,7 +114,7 @@ class Rational {
     override fun toString(): String = if (denominator == 1L) "$numerator" else "$numerator/$denominator"
 }
 
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
 @OptIn(UnstableKMathAPI::class)
 object RationalField : Field<Rational>, NumbersAddOps<Rational> {
     override inline val zero: Rational get() = Rational.ZERO
-- 
2.34.1


From c8b9951f46c27f7af85f43188af9eb9d6e3cb48d Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 29 Jun 2022 14:54:49 +0300
Subject: [PATCH 548/713] Added for list utilities for rational functions.

---
 .../kmath/functions/ListPolynomialUtilTest.kt | 725 +++++++++++++++++-
 1 file changed, 718 insertions(+), 7 deletions(-)

diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
index 69c1611f3..314044ba8 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.test.misc.Rational
 import space.kscience.kmath.test.misc.RationalField
+import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
@@ -16,7 +17,7 @@ import kotlin.test.assertFailsWith
 @OptIn(UnstableKMathAPI::class)
 class ListPolynomialUtilTest {
     @Test
-    fun test_substitute_Double() {
+    fun test_Polynomial_substitute_Double() {
         assertEquals(
             0.0,
             ListPolynomial(1.0, -2.0, 1.0).substitute(1.0),
@@ -49,7 +50,7 @@ class ListPolynomialUtilTest {
         )
     }
     @Test
-    fun test_substitute_Constant() {
+    fun test_Polynomial_substitute_Constant() {
         assertEquals(
             Rational(0),
             ListPolynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, Rational(1)),
@@ -81,7 +82,7 @@ class ListPolynomialUtilTest {
         )
     }
     @Test
-    fun test_substitute_Polynomial() {
+    fun test_Polynomial_substitute_Polynomial() {
         assertEquals(
             ListPolynomial(Rational(0)),
             ListPolynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, ListPolynomial(Rational(1))),
@@ -119,7 +120,717 @@ class ListPolynomialUtilTest {
         )
     }
     @Test
-    fun test_derivative() {
+    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should make denominator r^deg(p),
+            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
+    fun test_Polynomial_substitute_RationalFunction() {
+        assertEquals(
+            ListRationalFunction(ListPolynomial(Rational(0)), ListPolynomial(Rational(1))),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1))
+                .substitute(RationalField, ListRationalFunction(ListPolynomial(Rational(1)), ListPolynomial(Rational(1)))),
+            "test 1"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(66349, 243),
+                    Rational(-17873, 405),
+                    Rational(173533, 3780),
+                    Rational(-91141, 567),
+                    Rational(5773909, 105840),
+                    Rational(-23243, 630),
+                    Rational(1573, 27)
+                ),
+                ListPolynomial(
+                    Rational(169, 81),
+                    Rational(-130, 27),
+                    Rational(115, 18),
+                    Rational(-797, 54),
+                    Rational(1985, 144),
+                    Rational(-55, 6),
+                    Rational(121, 9)
+                )
+            ),
+            ListPolynomial(
+                Rational(13, 3),
+                Rational(-9, 5),
+                Rational(5, 5)
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(15, 1),
+                        Rational(6, 9),
+                        Rational(-3, 7)
+                    ),
+                    ListPolynomial(
+                        Rational(-13, 9),
+                        Rational(10, 6),
+                        Rational(-10, 8),
+                        Rational(11, 3)
+                    )
+                )
+            ),
+            "test 2"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(-14, 9),
+                    Rational(31, 14),
+                    Rational(-5077, 980),
+                    Rational(99, 35)
+                ),
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(25, 9),
+                    Rational(-25, 6),
+                    Rational(1985, 144),
+                    Rational(-55, 6),
+                    Rational(121, 9)
+                )
+            ),
+            ListPolynomial(
+                Rational(0),
+                Rational(-9, 5),
+                Rational(5, 5)
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(0),
+                        Rational(6, 9),
+                        Rational(-3, 7)
+                    ),
+                    ListPolynomial(
+                        Rational(0),
+                        Rational(10, 6),
+                        Rational(-10, 8),
+                        Rational(11, 3)
+                    )
+                )
+            ),
+            "test 3"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(-898, 27),
+                    Rational(271, 45),
+                    Rational(-65, 12) ,
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0)
+                ),
+                ListPolynomial(
+                    Rational(-13, 9),
+                    Rational(5, 3),
+                    Rational(-5, 4) ,
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0)
+                )
+            ),
+            ListPolynomial(
+                Rational(13, 3),
+                Rational(-9, 5),
+                Rational(0)
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(15, 1),
+                        Rational(6, 9),
+                        Rational(0)
+                    ),
+                    ListPolynomial(
+                        Rational(-13, 9),
+                        Rational(10, 6),
+                        Rational(-10, 8),
+                        Rational(0)
+                    )
+                )
+            ),
+            "test 4"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(56872, 243),
+                    Rational(0, 1),
+                    Rational(-90, 7),
+                    Rational(-3718, 81),
+                    Rational(9, 49),
+                    Rational(0, 1),
+                    Rational(1573, 27)
+                ),
+                ListPolynomial(
+                    Rational(169, 81),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(-286, 27),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(121, 9)
+                )
+            ),
+            ListPolynomial(
+                Rational(13, 3),
+                Rational(0),
+                Rational(5, 5)
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(15, 1),
+                        Rational(0),
+                        Rational(-3, 7)
+                    ),
+                    ListPolynomial(
+                        Rational(-13, 9),
+                        Rational(0),
+                        Rational(0),
+                        Rational(11, 3)
+                    )
+                )
+            ),
+            "test 5"
+        )
+    }
+    @Test
+    fun test_RationalFunction_substitute_Double() {
+        assertEquals(
+            0.0,
+            ListRationalFunction(
+                ListPolynomial(1.0, -2.0, 1.0),
+                ListPolynomial(-6.302012278484357, 5.831971885376948, -9.271604788393432, 5.494387848015814, -3.7187384450880785)
+            ).substitute(1.0),
+            0.001,
+            "test 1"
+        )
+        assertEquals(
+            2.693702616649797,
+            ListRationalFunction(
+                ListPolynomial(-5.848840571263625, -1.660411278951134, -3.793740946372443, -9.624569269490076),
+                ListPolynomial(-2.9680680215311073, -1.862973627119981, 4.776550592888336, -2.7320154512368466)
+            ).substitute(-7.53452770353279),
+            0.001,
+            "test 2"
+        )
+        assertEquals(
+            2.692226268901378,
+            ListRationalFunction(
+                ListPolynomial(0.0, -1.660411278951134, -3.793740946372443, -9.624569269490076),
+                ListPolynomial(0.0, -1.862973627119981, 4.776550592888336, -2.7320154512368466)
+            ).substitute(-7.53452770353279),
+            0.001,
+            "test 3"
+        )
+        assertEquals(
+            -0.7394904842099175,
+            ListRationalFunction(
+                ListPolynomial(-5.848840571263625, -1.660411278951134, -3.793740946372443, 0.0),
+                ListPolynomial(-2.9680680215311073, -1.862973627119981, 4.776550592888336, 0.0)
+            ).substitute(-7.53452770353279),
+            0.001,
+            "test 4"
+        )
+        assertEquals(
+            3.526835209398159,
+            ListRationalFunction(
+                ListPolynomial(-5.848840571263625, 0.0, 0.0, -9.624569269490076),
+                ListPolynomial(-2.9680680215311073, 0.0, 0.0, -2.7320154512368466)
+            ).substitute(-7.53452770353279),
+            0.001,
+            "test 5"
+        )
+    }
+    @Test
+    fun test_RationalFunction_substitute_Constant() {
+        assertEquals(
+            Rational(0),
+            ListRationalFunction(
+                ListPolynomial(Rational(1), Rational(-2), Rational(1)),
+                ListPolynomial(Rational(1)),
+            ).substitute(RationalField, Rational(1)),
+            "test 1"
+        )
+        assertEquals(
+            Rational(1149615, 61306),
+            ListRationalFunction(
+                ListPolynomial(Rational(17, 7), Rational(18, 3), Rational(18, 8), Rational(9, 1)),
+                ListPolynomial(Rational(11, 9), Rational(-6, 5), Rational(-12, 7), Rational(2, 1)),
+            ).substitute(RationalField, Rational(-7, 8)),
+            "test 2"
+        )
+        assertEquals(
+            Rational(3495, 586),
+            ListRationalFunction(
+                ListPolynomial(Rational(0), Rational(18, 3), Rational(18, 8), Rational(9, 1)),
+                ListPolynomial(Rational(0), Rational(-6, 5), Rational(-12, 7), Rational(2, 1)),
+            ).substitute(RationalField, Rational(-7, 8)),
+            "test 3"
+        )
+        assertEquals(
+            Rational(-88605, 77392),
+            ListRationalFunction(
+                ListPolynomial(Rational(17, 7), Rational(18, 3), Rational(18, 8), Rational(0)),
+                ListPolynomial(Rational(11, 9), Rational(-6, 5), Rational(-12, 7), Rational(0)),
+            ).substitute(RationalField, Rational(-7, 8)),
+            "test 4"
+        )
+        assertEquals(
+            Rational(116145, 3794),
+            ListRationalFunction(
+                ListPolynomial(Rational(17, 7), Rational(0), Rational(0), Rational(9, 1)),
+                ListPolynomial(Rational(11, 9), Rational(0), Rational(0), Rational(2, 1)),
+            ).substitute(RationalField, Rational(-7, 8)),
+            "test 5"
+        )
+    }
+    @Test
+    fun test_RationalFunction_substitute_Polynomial() {
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(Rational(0)),
+                ListPolynomial(Rational(1))
+            ),
+            ListRationalFunction(
+                ListPolynomial(Rational(1), Rational(-2), Rational(1)),
+                ListPolynomial(Rational(1)),
+            ).substitute(RationalField, ListPolynomial(Rational(1))),
+            "test 1"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(-283303, 36),
+                    Rational(-23593, 24),
+                    Rational(368713, 192),
+                    Rational(1455, 8),
+                    Rational(-272171, 1536),
+                    Rational(-2149, 192),
+                    Rational(469, 64),
+                    Rational(11, 48),
+                    Rational(-11, 96)
+                ),
+                ListPolynomial(
+                    Rational(5797, 12),
+                    Rational(595, 16),
+                    Rational(-5285, 72),
+                    Rational(-745, 192),
+                    Rational(1105, 288),
+                    Rational(5, 48),
+                    Rational(-5, 72)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(2, 9),
+                    Rational(11, 3),
+                    Rational(-9, 4),
+                    Rational(-6, 1),
+                    Rational(-11, 6)
+                ),
+                ListPolynomial(
+                    Rational(-2, 3),
+                    Rational(-15, 4),
+                    Rational(5, 9),
+                    Rational(-5, 9)
+                )
+            ).substitute(RationalField,
+                ListPolynomial(
+                    Rational(-9, 1),
+                    Rational(-1, 4),
+                    Rational(2, 4)
+                )
+            ),
+            "test 2"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(-11, 12),
+                    Rational(325, 192),
+                    Rational(21, 32),
+                    Rational(-1739, 1536),
+                    Rational(227, 192),
+                    Rational(-59, 64),
+                    Rational(11, 48),
+                    Rational(-11, 96)
+                ),
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(15, 16),
+                    Rational(-265, 144),
+                    Rational(-25, 192),
+                    Rational(25, 288),
+                    Rational(5, 48),
+                    Rational(-5, 72)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(0, 9),
+                    Rational(11, 3),
+                    Rational(-9, 4),
+                    Rational(-6, 1),
+                    Rational(-11, 6)
+                ),
+                ListPolynomial(
+                    Rational(0, 3),
+                    Rational(-15, 4),
+                    Rational(5, 9),
+                    Rational(-5, 9)
+                )
+            ).substitute(RationalField,
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(-1, 4),
+                    Rational(2, 4)
+                )
+            ),
+            "test 3"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(149723, 36),
+                    Rational(8483, 24),
+                    Rational(639, 64),
+                    Rational(3, 32),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0)
+                ),
+                ListPolynomial(
+                    Rational(937, 12),
+                    Rational(55, 16),
+                    Rational(5, 144),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(2, 9),
+                    Rational(11, 3),
+                    Rational(-9, 4),
+                    Rational(-6, 1),
+                    Rational(0)
+                ),
+                ListPolynomial(
+                    Rational(-2, 3),
+                    Rational(-15, 4),
+                    Rational(5, 9),
+                    Rational(0)
+                )
+            ).substitute(RationalField,
+                ListPolynomial(
+                    Rational(-9, 1),
+                    Rational(-1, 4),
+                    Rational(0)
+                )
+            ),
+            "test 4"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(-216509, 18),
+                    Rational(0, 1),
+                    Rational(2673, 1),
+                    Rational(0, 1),
+                    Rational(-891, 4),
+                    Rational(0, 1),
+                    Rational(33, 4),
+                    Rational(0, 1),
+                    Rational(-11, 96)
+                ),
+                ListPolynomial(
+                    Rational(1213, 3),
+                    Rational(0, 1),
+                    Rational(-135, 2),
+                    Rational(0, 1),
+                    Rational(15, 4),
+                    Rational(0, 1),
+                    Rational(-5, 72)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(2, 9),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(-11, 6)
+                ),
+                ListPolynomial(
+                    Rational(-2, 3),
+                    Rational(0),
+                    Rational(0),
+                    Rational(-5, 9)
+                )
+            ).substitute(RationalField,
+                ListPolynomial(
+                    Rational(-9, 1),
+                    Rational(0),
+                    Rational(2, 4)
+                )
+            ),
+            "test 5"
+        )
+    }
+    @Test
+    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should make denominator r^deg(p),
+            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
+    fun test_RationalFunction_substitute_RationalFunction() {
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(Rational(0)),
+                ListPolynomial(Rational(1))
+            ),
+            ListRationalFunction(
+                ListPolynomial(Rational(1), Rational(-2), Rational(1)),
+                ListPolynomial(Rational(1))
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(Rational(1)),
+                    ListPolynomial(Rational(1))
+                )
+            ),
+            "test 1"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(130087, 3888),
+                    Rational(-2866333, 65610),
+                    Rational(-5076229, 97200),
+                    Rational(222136997, 3280500),
+                    Rational(754719329, 20995200),
+                    Rational(-12010283, 324000),
+                    Rational(-2011967, 172800),
+                    Rational(18607, 2880),
+                    Rational(4705, 4096)
+                ),
+                ListPolynomial(
+                    Rational(-143820355, 3779136),
+                    Rational(73886869, 1574640),
+                    Rational(1440175193, 15746400),
+                    Rational(-5308968857, 52488000),
+                    Rational(-186910083731, 2099520000),
+                    Rational(125043463, 1555200),
+                    Rational(5299123, 388800),
+                    Rational(-213757, 15360),
+                    Rational(1380785, 147456)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(1, 1),
+                    Rational(-10, 5),
+                    Rational(18, 8),
+                    Rational(-8, 8)
+                ),
+                ListPolynomial(
+                    Rational(-14, 8),
+                    Rational(-14, 8),
+                    Rational(-19, 6),
+                    Rational(14, 3),
+                    Rational(8, 9)
+                )
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(14, 9),
+                        Rational(-2, 5),
+                        Rational(-14, 7)
+                    ),
+                    ListPolynomial(
+                        Rational(-6, 4),
+                        Rational(5, 9),
+                        Rational(1, 8)
+                    )
+                )
+            ),
+            "test 2"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(5173, 18225),
+                    Rational(904291, 364500),
+                    Rational(283127, 43200),
+                    Rational(37189, 5760),
+                    Rational(147, 128)
+                ),
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(-163589, 911250),
+                    Rational(-881831, 291600),
+                    Rational(-10722229, 777600),
+                    Rational(-640921, 46080),
+                    Rational(86303, 9216)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(0),
+                    Rational(-10, 5),
+                    Rational(18, 8),
+                    Rational(-8, 8)
+                ),
+                ListPolynomial(
+                    Rational(0),
+                    Rational(-14, 8),
+                    Rational(-19, 6),
+                    Rational(14, 3),
+                    Rational(8, 9)
+                )
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(0),
+                        Rational(-2, 5),
+                        Rational(-14, 7)
+                    ),
+                    ListPolynomial(
+                        Rational(0),
+                        Rational(5, 9),
+                        Rational(1, 8)
+                    )
+                )
+            ),
+            "test 3"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(445, 16),
+                    Rational(-2011, 54),
+                    Rational(1359199, 72900),
+                    Rational(-135733, 32805),
+                    Rational(2254, 6561),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1)
+                ),
+                ListPolynomial(
+                    Rational(-2018387, 46656),
+                    Rational(82316437, 1574640),
+                    Rational(-9335047, 393660),
+                    Rational(15765889, 3280500),
+                    Rational(-242089, 656100),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(1, 1),
+                    Rational(-10, 5),
+                    Rational(18, 8),
+                    Rational(0)
+                ),
+                ListPolynomial(
+                    Rational(-14, 8),
+                    Rational(-14, 8),
+                    Rational(-19, 6),
+                    Rational(14, 3),
+                    Rational(0)
+                )
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(14, 9),
+                        Rational(-2, 5),
+                        Rational(0)
+                    ),
+                    ListPolynomial(
+                        Rational(-6, 4),
+                        Rational(5, 9),
+                        Rational(0)
+                    )
+                )
+            ),
+            "test 4"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(41635, 3888),
+                    Rational(0, 1),
+                    Rational(-279187, 11664),
+                    Rational(0, 1),
+                    Rational(103769, 3456),
+                    Rational(0, 1),
+                    Rational(-11017, 768),
+                    Rational(0, 1),
+                    Rational(4097, 4096)
+                ),
+                ListPolynomial(
+                    Rational(-13811791, 3779136),
+                    Rational(0, 1),
+                    Rational(-9999395, 419904),
+                    Rational(0, 1),
+                    Rational(6376601, 124416),
+                    Rational(0, 1),
+                    Rational(-3668315, 82944),
+                    Rational(0, 1),
+                    Rational(2097089, 147456)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(1, 1),
+                    Rational(0),
+                    Rational(0),
+                    Rational(-8, 8)
+                ),
+                ListPolynomial(
+                    Rational(-14, 8),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(8, 9)
+                )
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(14, 9),
+                        Rational(0),
+                        Rational(-14, 7)
+                    ),
+                    ListPolynomial(
+                        Rational(-6, 4),
+                        Rational(0),
+                        Rational(1, 8)
+                    )
+                )
+            ),
+            "test 5"
+        )
+    }
+    @Test
+    fun test_Polynomial_derivative() {
         assertEquals(
             ListPolynomial(Rational(-2), Rational(2)),
             ListPolynomial(Rational(1), Rational(-2), Rational(1)).derivative(RationalField),
@@ -142,7 +853,7 @@ class ListPolynomialUtilTest {
         )
     }
     @Test
-    fun test_nthDerivative() {
+    fun test_Polynomial_nthDerivative() {
         assertEquals(
             ListPolynomial(Rational(-2), Rational(2)),
             ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 1),
@@ -188,7 +899,7 @@ class ListPolynomialUtilTest {
         )
     }
     @Test
-    fun test_antiderivative() {
+    fun test_Polynomial_antiderivative() {
         assertEquals(
             ListPolynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
             ListPolynomial(Rational(1), Rational(-2), Rational(1)).antiderivative(RationalField),
@@ -211,7 +922,7 @@ class ListPolynomialUtilTest {
         )
     }
     @Test
-    fun test_nthAntiderivative() {
+    fun test_Polynomial_nthAntiderivative() {
         assertEquals(
             ListPolynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
             ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 1),
-- 
2.34.1


From f147636e9d0402dd4c4d3b4c0e73e8a0c12a4d57 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 1 Jul 2022 14:46:05 +0300
Subject: [PATCH 549/713] Tests generation for numbered utilities in progress.

---
 .../space/kscience/kmath/functions/misc.kt    |    4 +-
 .../functions/NumberedPolynomialUtilTest.kt   | 2113 ++++++++++++++++-
 2 files changed, 2074 insertions(+), 43 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
index aba246519..76f1c294e 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
@@ -17,6 +17,6 @@ package space.kscience.kmath.functions
             "But at the same time makes it easy to make a mistake " +
             "that will cause wrong computation result or even runtime error. " +
             "Make sure you fully read and understand documentation.",
-    level = RequiresOptIn.Level.WARNING
+    level = RequiresOptIn.Level.ERROR
 )
-internal annotation class DelicatePolynomialAPI
\ No newline at end of file
+public annotation class DelicatePolynomialAPI
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
index ecad6198e..8ece66145 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
@@ -8,13 +8,14 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.test.misc.Rational
 import space.kscience.kmath.test.misc.RationalField
 import space.kscience.kmath.test.misc.assertContentEquals
+import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 
 class NumberedPolynomialUtilTest {
     @Test
-    fun test_substitute_Double_Map() {
+    fun test_Polynomial_substitute_Double_Map() {
         assertContentEquals(
             mapOf(emptyList<UInt>() to 0.0),
             NumberedPolynomialAsIs(
@@ -53,6 +54,34 @@ class NumberedPolynomialUtilTest {
             0.001,
             "test 2"
         )
+        assertContentEquals(
+            mapOf(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                5 to 0.9211194782050933
+            )).coefficients,
+            0.001,
+            "test 2'"
+        )
         assertContentEquals(
             mapOf(
                 listOf<UInt>() to 0.8597048543814783,
@@ -75,6 +104,29 @@ class NumberedPolynomialUtilTest {
             0.001,
             "test 3"
         )
+        assertContentEquals(
+            mapOf(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(0u, 2u) to 0.2700930201481795,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                0 to 0.0,
+                5 to 0.9211194782050933
+            )).coefficients,
+            0.001,
+            "test 3'"
+        )
         assertContentEquals(
             mapOf(
                 listOf<UInt>() to 1.433510890645169,
@@ -97,6 +149,29 @@ class NumberedPolynomialUtilTest {
             0.001,
             "test 4"
         )
+        assertContentEquals(
+            mapOf(
+                listOf<UInt>() to 1.433510890645169,
+                listOf(1u) to 0.6264844682514724,
+                listOf(2u) to 0.8405727903771333,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                1 to 0.8400458576651112,
+                5 to 0.9211194782050933
+            )).coefficients,
+            0.001,
+            "test 4'"
+        )
         assertContentEquals(
             mapOf(
                 listOf<UInt>() to 1.934530767358133,
@@ -120,15 +195,7 @@ class NumberedPolynomialUtilTest {
         )
         assertContentEquals(
             mapOf(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
+                listOf<UInt>() to 1.934530767358133,
             ),
             NumberedPolynomialAsIs(
                 listOf<UInt>() to 0.8597048543814783,
@@ -141,14 +208,16 @@ class NumberedPolynomialUtilTest {
                 listOf(1u, 2u) to -0.06962351375204712,
                 listOf(2u, 2u) to -0.015206988092131501,
             ).substitute(mapOf(
+                0 to 0.4846192734143442,
+                1 to 0.8400458576651112,
                 5 to 0.9211194782050933
             )).coefficients,
             0.001,
-            "test 6"
+            "test 5'"
         )
     }
     @Test
-    fun test_substitute_Constant() {
+    fun test_Polynomial_substitute_Constant_Map() {
         assertEquals(
             NumberedPolynomialAsIs(
                 listOf<UInt>() to Rational(0)
@@ -183,6 +252,167 @@ class NumberedPolynomialUtilTest {
             )),
             "test 2"
         )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(143, 150)
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                0 to Rational(-2, 5),
+                1 to Rational(12, 9),
+                5 to Rational(57, 179),
+            )),
+            "test 2'"
+        )
+        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+y+%3D+12%2F9
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-67, 18),
+                listOf(1u) to Rational(-70, 9),
+                listOf(2u) to Rational(88, 9),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                1 to Rational(12, 9),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-67, 18),
+                listOf(1u) to Rational(-70, 9),
+                listOf(2u) to Rational(88, 9),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                1 to Rational(12, 9),
+                5 to Rational(57, 179),
+            )),
+            "test 3'"
+        )
+        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-83, 50),
+                listOf(0u, 1u) to Rational(29, 25),
+                listOf(0u, 2u) to Rational(3, 5),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                0 to Rational(-2, 5),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-83, 50),
+                listOf(0u, 1u) to Rational(29, 25),
+                listOf(0u, 2u) to Rational(3, 5),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                0 to Rational(-2, 5),
+                5 to Rational(57, 179),
+            )),
+            "test 4'"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf<Int, Rational>()),
+            "test 5"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                5 to Rational(57, 179),
+            )),
+            "test 5'"
+        )
         // https://www.wolframalpha.com/input?i=%28%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2%29+p%5E8+where+x+%3D+q%2Fp%2C+y+%3D+x%5E3%2C+p+%3D+-2%2F5%2C+q+%3D+12%2F9
         assertEquals(
             NumberedPolynomialAsIs(
@@ -202,37 +432,11 @@ class NumberedPolynomialUtilTest {
                 0 to Rational(-2, 5),
                 1 to Rational(12, 9),
             )),
-            "test 3"
-        )
-        // https://www.wolframalpha.com/input?i=%28%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2%29+p%5E8+where+x+%3D+q%2Fp%2C+y+%3D+x%5E3%2C+p+%3D+-2%2F5%2C+q+%3D+12%2F9
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(8u) to Rational(-3, 2),
-                listOf(7u, 1u) to Rational(8, 6),
-                listOf(6u, 2u) to Rational(14, 6),
-                listOf(5u, 3u) to Rational(-3, 1),
-                listOf(4u, 4u) to Rational(-19, 2),
-                listOf(3u, 5u) to Rational(9, 4),
-                listOf(2u, 6u) to Rational(5, 5),
-                listOf(1u, 7u) to Rational(18, 9),
-                listOf(0u, 8u) to Rational(5, 2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf(8u) to Rational(-3, 2),
-                listOf(7u, 1u) to Rational(8, 6),
-                listOf(6u, 2u) to Rational(14, 6),
-                listOf(5u, 3u) to Rational(-3, 1),
-                listOf(4u, 4u) to Rational(-19, 2),
-                listOf(3u, 5u) to Rational(9, 4),
-                listOf(2u, 6u) to Rational(5, 5),
-                listOf(1u, 7u) to Rational(18, 9),
-                listOf(0u, 8u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf<Int, Rational>()),
-            "test 4"
+            "test 6"
         )
     }
     @Test
-    fun test_substitute_Polynomial() {
+    fun test_Polynomial_substitute_Polynomial_Map() {
         assertEquals(
             NumberedPolynomialAsIs(
                 listOf<UInt>() to Rational(0)
@@ -248,7 +452,7 @@ class NumberedPolynomialUtilTest {
             )),
             "test 1"
         )
-        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5%2C+y+%3D+12%2F9
+        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-5%2F1+s+%2B+2%2F8+t%2C+y+%3D+11%2F7+t
         assertEquals(
             NumberedPolynomialAsIs(
                 listOf<UInt>() to Rational(-3, 2),
@@ -289,5 +493,1832 @@ class NumberedPolynomialUtilTest {
             )),
             "test 2"
         )
+        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = (0/6 + 14/8 s + -14/2 s^2) + (-3/5 + 11/1 s + 3/7 s^2) t + (-3/7 + -18/5 s + -9/1 s^2) t^2, y = (-9/2 + 2/7 s + 9/1 s^2) + (13/1 + -1/8 s + 2/8 s^2) t + (19/4 + 15/7 s + -19/4 s^2) t^2
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(129, 4),
+                listOf(1u) to Rational(48583, 336),
+                listOf(2u) to Rational(-913477, 1568),
+                listOf(3u) to Rational(-967567, 672),
+                listOf(4u) to Rational(4722043, 1344),
+                listOf(5u) to Rational(8855, 2),
+                listOf(6u) to Rational(-311971, 32),
+                listOf(7u) to Rational(-17325, 4),
+                listOf(8u) to Rational(19845, 2),
+                listOf(0u, 1u) to Rational(-827, 4),
+                listOf(1u, 1u) to Rational(191927, 840),
+                listOf(2u, 1u) to Rational(9592627, 2352),
+                listOf(3u, 1u) to Rational(-105400711, 53760),
+                listOf(4u, 1u) to Rational(-10054101459, 439040),
+                listOf(5u, 1u) to Rational(2127351, 128),
+                listOf(6u, 1u) to Rational(116680973, 3136),
+                listOf(7u, 1u) to Rational(-220445, 7),
+                listOf(8u, 1u) to Rational(-2655, 4),
+                listOf(0u, 2u) to Rational(30567, 100),
+                listOf(1u, 2u) to Rational(-156284953, 39200),
+                listOf(2u, 2u) to Rational(-57661541711, 6585600),
+                listOf(3u, 2u) to Rational(131931579, 3136),
+                listOf(4u, 2u) to Rational(98818124791, 3512320),
+                listOf(5u, 2u) to Rational(-94458855053, 878080),
+                listOf(6u, 2u) to Rational(13937705305, 1229312),
+                listOf(7u, 2u) to Rational(335706887, 21952),
+                listOf(8u, 2u) to Rational(23549165, 1568),
+                listOf(0u, 3u) to Rational(111367, 1400),
+                listOf(1u, 3u) to Rational(4937369, 700),
+                listOf(2u, 3u) to Rational(-4449423711, 274400),
+                listOf(3u, 3u) to Rational(-351873325703, 4390400),
+                listOf(4u, 3u) to Rational(23495875029, 307328),
+                listOf(5u, 3u) to Rational(17576300919, 878080),
+                listOf(6u, 3u) to Rational(230316993, 12544),
+                listOf(7u, 3u) to Rational(-191130515, 21952),
+                listOf(8u, 3u) to Rational(332435, 392),
+                listOf(0u, 4u) to Rational(-275084, 1225),
+                listOf(1u, 4u) to Rational(-266774603, 137200),
+                listOf(2u, 4u) to Rational(2176279167121, 30732800),
+                listOf(3u, 4u) to Rational(10904913303, 2195200),
+                listOf(4u, 4u) to Rational(-10769286147, 2195200),
+                listOf(5u, 4u) to Rational(-26277119793, 439040),
+                listOf(6u, 4u) to Rational(25859735869, 6146560),
+                listOf(7u, 4u) to Rational(38906289, 2744),
+                listOf(8u, 4u) to Rational(-3072025, 392),
+                listOf(0u, 5u) to Rational(9573, 98),
+                listOf(1u, 5u) to Rational(-4154651399, 548800),
+                listOf(2u, 5u) to Rational(3446069019, 548800),
+                listOf(3u, 5u) to Rational(-7851500623, 137200),
+                listOf(4u, 5u) to Rational(-53205142903, 1920800),
+                listOf(5u, 5u) to Rational(-31953611, 3430),
+                listOf(6u, 5u) to Rational(1447380313, 109760),
+                listOf(7u, 5u) to Rational(764158625, 21952),
+                listOf(8u, 5u) to Rational(1153515, 784),
+                listOf(0u, 6u) to Rational(1722351, 7840),
+                listOf(1u, 6u) to Rational(-164554821, 109760),
+                listOf(2u, 6u) to Rational(-79096147243, 7683200),
+                listOf(3u, 6u) to Rational(-624721089, 15680),
+                listOf(4u, 6u) to Rational(11147305567, 548800),
+                listOf(5u, 6u) to Rational(8318333679, 109760),
+                listOf(6u, 6u) to Rational(32981871553, 1536640),
+                listOf(7u, 6u) to Rational(-225359619, 21952),
+                listOf(8u, 6u) to Rational(-3973995, 392),
+                listOf(0u, 7u) to Rational(67203, 784),
+                listOf(1u, 7u) to Rational(39281469, 54880),
+                listOf(2u, 7u) to Rational(70162551, 27440),
+                listOf(3u, 7u) to Rational(413630709, 54880),
+                listOf(4u, 7u) to Rational(4640410269, 192080),
+                listOf(5u, 7u) to Rational(802712247, 54880),
+                listOf(6u, 7u) to Rational(-473517603, 27440),
+                listOf(7u, 7u) to Rational(-17055459, 1568),
+                listOf(8u, 7u) to Rational(-12825, 14),
+                listOf(0u, 8u) to Rational(16245, 1568),
+                listOf(1u, 8u) to Rational(503253, 2744),
+                listOf(2u, 8u) to Rational(125292591, 96040),
+                listOf(3u, 8u) to Rational(12033171, 2744),
+                listOf(4u, 8u) to Rational(154352673, 27440),
+                listOf(5u, 8u) to Rational(-1302291, 392),
+                listOf(6u, 8u) to Rational(-20265741, 1960),
+                listOf(7u, 8u) to Rational(-26163, 56),
+                listOf(8u, 8u) to Rational(146205, 32),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                0 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0, 6),
+                    listOf(1u) to Rational(14, 8),
+                    listOf(2u) to Rational(-14, 2),
+                    listOf(0u, 1u) to Rational(-3, 5),
+                    listOf(1u, 1u) to Rational(11, 1),
+                    listOf(2u, 1u) to Rational(3, 7),
+                    listOf(0u, 2u) to Rational(-3, 7),
+                    listOf(1u, 2u) to Rational(-18, 5),
+                    listOf(2u, 2u) to Rational(-9, 1),
+                ),
+                1 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-9, 2),
+                    listOf(1u) to Rational(2, 7),
+                    listOf(2u) to Rational(9, 1),
+                    listOf(0u, 1u) to Rational(13, 1),
+                    listOf(1u, 1u) to Rational(-1, 8),
+                    listOf(2u, 1u) to Rational(2, 8),
+                    listOf(0u, 2u) to Rational(19, 4),
+                    listOf(1u, 2u) to Rational(15, 7),
+                    listOf(2u, 2u) to Rational(-19, 4),
+                ),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(129, 4),
+                listOf(1u) to Rational(48583, 336),
+                listOf(2u) to Rational(-913477, 1568),
+                listOf(3u) to Rational(-967567, 672),
+                listOf(4u) to Rational(4722043, 1344),
+                listOf(5u) to Rational(8855, 2),
+                listOf(6u) to Rational(-311971, 32),
+                listOf(7u) to Rational(-17325, 4),
+                listOf(8u) to Rational(19845, 2),
+                listOf(0u, 1u) to Rational(-827, 4),
+                listOf(1u, 1u) to Rational(191927, 840),
+                listOf(2u, 1u) to Rational(9592627, 2352),
+                listOf(3u, 1u) to Rational(-105400711, 53760),
+                listOf(4u, 1u) to Rational(-10054101459, 439040),
+                listOf(5u, 1u) to Rational(2127351, 128),
+                listOf(6u, 1u) to Rational(116680973, 3136),
+                listOf(7u, 1u) to Rational(-220445, 7),
+                listOf(8u, 1u) to Rational(-2655, 4),
+                listOf(0u, 2u) to Rational(30567, 100),
+                listOf(1u, 2u) to Rational(-156284953, 39200),
+                listOf(2u, 2u) to Rational(-57661541711, 6585600),
+                listOf(3u, 2u) to Rational(131931579, 3136),
+                listOf(4u, 2u) to Rational(98818124791, 3512320),
+                listOf(5u, 2u) to Rational(-94458855053, 878080),
+                listOf(6u, 2u) to Rational(13937705305, 1229312),
+                listOf(7u, 2u) to Rational(335706887, 21952),
+                listOf(8u, 2u) to Rational(23549165, 1568),
+                listOf(0u, 3u) to Rational(111367, 1400),
+                listOf(1u, 3u) to Rational(4937369, 700),
+                listOf(2u, 3u) to Rational(-4449423711, 274400),
+                listOf(3u, 3u) to Rational(-351873325703, 4390400),
+                listOf(4u, 3u) to Rational(23495875029, 307328),
+                listOf(5u, 3u) to Rational(17576300919, 878080),
+                listOf(6u, 3u) to Rational(230316993, 12544),
+                listOf(7u, 3u) to Rational(-191130515, 21952),
+                listOf(8u, 3u) to Rational(332435, 392),
+                listOf(0u, 4u) to Rational(-275084, 1225),
+                listOf(1u, 4u) to Rational(-266774603, 137200),
+                listOf(2u, 4u) to Rational(2176279167121, 30732800),
+                listOf(3u, 4u) to Rational(10904913303, 2195200),
+                listOf(4u, 4u) to Rational(-10769286147, 2195200),
+                listOf(5u, 4u) to Rational(-26277119793, 439040),
+                listOf(6u, 4u) to Rational(25859735869, 6146560),
+                listOf(7u, 4u) to Rational(38906289, 2744),
+                listOf(8u, 4u) to Rational(-3072025, 392),
+                listOf(0u, 5u) to Rational(9573, 98),
+                listOf(1u, 5u) to Rational(-4154651399, 548800),
+                listOf(2u, 5u) to Rational(3446069019, 548800),
+                listOf(3u, 5u) to Rational(-7851500623, 137200),
+                listOf(4u, 5u) to Rational(-53205142903, 1920800),
+                listOf(5u, 5u) to Rational(-31953611, 3430),
+                listOf(6u, 5u) to Rational(1447380313, 109760),
+                listOf(7u, 5u) to Rational(764158625, 21952),
+                listOf(8u, 5u) to Rational(1153515, 784),
+                listOf(0u, 6u) to Rational(1722351, 7840),
+                listOf(1u, 6u) to Rational(-164554821, 109760),
+                listOf(2u, 6u) to Rational(-79096147243, 7683200),
+                listOf(3u, 6u) to Rational(-624721089, 15680),
+                listOf(4u, 6u) to Rational(11147305567, 548800),
+                listOf(5u, 6u) to Rational(8318333679, 109760),
+                listOf(6u, 6u) to Rational(32981871553, 1536640),
+                listOf(7u, 6u) to Rational(-225359619, 21952),
+                listOf(8u, 6u) to Rational(-3973995, 392),
+                listOf(0u, 7u) to Rational(67203, 784),
+                listOf(1u, 7u) to Rational(39281469, 54880),
+                listOf(2u, 7u) to Rational(70162551, 27440),
+                listOf(3u, 7u) to Rational(413630709, 54880),
+                listOf(4u, 7u) to Rational(4640410269, 192080),
+                listOf(5u, 7u) to Rational(802712247, 54880),
+                listOf(6u, 7u) to Rational(-473517603, 27440),
+                listOf(7u, 7u) to Rational(-17055459, 1568),
+                listOf(8u, 7u) to Rational(-12825, 14),
+                listOf(0u, 8u) to Rational(16245, 1568),
+                listOf(1u, 8u) to Rational(503253, 2744),
+                listOf(2u, 8u) to Rational(125292591, 96040),
+                listOf(3u, 8u) to Rational(12033171, 2744),
+                listOf(4u, 8u) to Rational(154352673, 27440),
+                listOf(5u, 8u) to Rational(-1302291, 392),
+                listOf(6u, 8u) to Rational(-20265741, 1960),
+                listOf(7u, 8u) to Rational(-26163, 56),
+                listOf(8u, 8u) to Rational(146205, 32),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                0 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0, 6),
+                    listOf(1u) to Rational(14, 8),
+                    listOf(2u) to Rational(-14, 2),
+                    listOf(0u, 1u) to Rational(-3, 5),
+                    listOf(1u, 1u) to Rational(11, 1),
+                    listOf(2u, 1u) to Rational(3, 7),
+                    listOf(0u, 2u) to Rational(-3, 7),
+                    listOf(1u, 2u) to Rational(-18, 5),
+                    listOf(2u, 2u) to Rational(-9, 1),
+                ),
+                1 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-9, 2),
+                    listOf(1u) to Rational(2, 7),
+                    listOf(2u) to Rational(9, 1),
+                    listOf(0u, 1u) to Rational(13, 1),
+                    listOf(1u, 1u) to Rational(-1, 8),
+                    listOf(2u, 1u) to Rational(2, 8),
+                    listOf(0u, 2u) to Rational(19, 4),
+                    listOf(1u, 2u) to Rational(15, 7),
+                    listOf(2u, 2u) to Rational(-19, 4),
+                ),
+                5 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 3),
+                    listOf(1u) to Rational(5, 2),
+                    listOf(2u) to Rational(13, 7),
+                    listOf(0u, 1u) to Rational(16, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(6, 1),
+                    listOf(0u, 2u) to Rational(-14, 3),
+                    listOf(1u, 2u) to Rational(-2, 7),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            )),
+            "test 3'"
+        )
+        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = s, y = (-9/2 + 2/7 s + 9/1 s^2) + (13/1 + -1/8 s + 2/8 s^2) t + (19/4 + 15/7 s + -19/4 s^2) t^2
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(129, 4),
+                listOf(1u) to Rational(6817, 84),
+                listOf(2u) to Rational(-21445, 294),
+                listOf(3u) to Rational(-12151, 49),
+                listOf(4u) to Rational(-17789, 196),
+                listOf(5u) to Rational(1224, 7),
+                listOf(6u) to Rational(405, 2),
+                listOf(0u, 1u) to Rational(-156),
+                listOf(1u, 1u) to Rational(-2440, 7),
+                listOf(2u, 1u) to Rational(-1571, 112),
+                listOf(3u, 1u) to Rational(107515, 224),
+                listOf(4u, 1u) to Rational(64965, 112),
+                listOf(5u, 1u) to Rational(209, 56),
+                listOf(6u, 1u) to Rational(45, 4),
+                listOf(0u, 2u) to Rational(112),
+                listOf(1u, 2u) to Rational(1449, 8),
+                listOf(2u, 2u) to Rational(1306309, 3136),
+                listOf(3u, 2u) to Rational(483207, 1568),
+                listOf(4u, 2u) to Rational(1978437, 6272),
+                listOf(5u, 2u) to Rational(-18231, 224),
+                listOf(6u, 2u) to Rational(-6835, 32),
+                listOf(0u, 3u) to Rational(247, 2),
+                listOf(1u, 3u) to Rational(33771, 112),
+                listOf(2u, 3u) to Rational(2073, 7),
+                listOf(3u, 3u) to Rational(-23463, 224),
+                listOf(4u, 3u) to Rational(-33825, 112),
+                listOf(5u, 3u) to Rational(201, 224),
+                listOf(6u, 3u) to Rational(-95, 16),
+                listOf(0u, 4u) to Rational(361, 16),
+                listOf(1u, 4u) to Rational(3667, 56),
+                listOf(2u, 4u) to Rational(88729, 1568),
+                listOf(3u, 4u) to Rational(-2476, 49),
+                listOf(4u, 4u) to Rational(-23419, 196),
+                listOf(5u, 4u) to Rational(-323, 56),
+                listOf(6u, 4u) to Rational(1805, 32),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                1 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-9, 2),
+                    listOf(1u) to Rational(2, 7),
+                    listOf(2u) to Rational(9, 1),
+                    listOf(0u, 1u) to Rational(13, 1),
+                    listOf(1u, 1u) to Rational(-1, 8),
+                    listOf(2u, 1u) to Rational(2, 8),
+                    listOf(0u, 2u) to Rational(19, 4),
+                    listOf(1u, 2u) to Rational(15, 7),
+                    listOf(2u, 2u) to Rational(-19, 4),
+                ),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(129, 4),
+                listOf(1u) to Rational(6817, 84),
+                listOf(2u) to Rational(-21445, 294),
+                listOf(3u) to Rational(-12151, 49),
+                listOf(4u) to Rational(-17789, 196),
+                listOf(5u) to Rational(1224, 7),
+                listOf(6u) to Rational(405, 2),
+                listOf(0u, 1u) to Rational(-156),
+                listOf(1u, 1u) to Rational(-2440, 7),
+                listOf(2u, 1u) to Rational(-1571, 112),
+                listOf(3u, 1u) to Rational(107515, 224),
+                listOf(4u, 1u) to Rational(64965, 112),
+                listOf(5u, 1u) to Rational(209, 56),
+                listOf(6u, 1u) to Rational(45, 4),
+                listOf(0u, 2u) to Rational(112),
+                listOf(1u, 2u) to Rational(1449, 8),
+                listOf(2u, 2u) to Rational(1306309, 3136),
+                listOf(3u, 2u) to Rational(483207, 1568),
+                listOf(4u, 2u) to Rational(1978437, 6272),
+                listOf(5u, 2u) to Rational(-18231, 224),
+                listOf(6u, 2u) to Rational(-6835, 32),
+                listOf(0u, 3u) to Rational(247, 2),
+                listOf(1u, 3u) to Rational(33771, 112),
+                listOf(2u, 3u) to Rational(2073, 7),
+                listOf(3u, 3u) to Rational(-23463, 224),
+                listOf(4u, 3u) to Rational(-33825, 112),
+                listOf(5u, 3u) to Rational(201, 224),
+                listOf(6u, 3u) to Rational(-95, 16),
+                listOf(0u, 4u) to Rational(361, 16),
+                listOf(1u, 4u) to Rational(3667, 56),
+                listOf(2u, 4u) to Rational(88729, 1568),
+                listOf(3u, 4u) to Rational(-2476, 49),
+                listOf(4u, 4u) to Rational(-23419, 196),
+                listOf(5u, 4u) to Rational(-323, 56),
+                listOf(6u, 4u) to Rational(1805, 32),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                1 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-9, 2),
+                    listOf(1u) to Rational(2, 7),
+                    listOf(2u) to Rational(9, 1),
+                    listOf(0u, 1u) to Rational(13, 1),
+                    listOf(1u, 1u) to Rational(-1, 8),
+                    listOf(2u, 1u) to Rational(2, 8),
+                    listOf(0u, 2u) to Rational(19, 4),
+                    listOf(1u, 2u) to Rational(15, 7),
+                    listOf(2u, 2u) to Rational(-19, 4),
+                ),
+                5 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 3),
+                    listOf(1u) to Rational(5, 2),
+                    listOf(2u) to Rational(13, 7),
+                    listOf(0u, 1u) to Rational(16, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(6, 1),
+                    listOf(0u, 2u) to Rational(-14, 3),
+                    listOf(1u, 2u) to Rational(-2, 7),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            )),
+            "test 4'"
+        )
+        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = (0/6 + 14/8 s + -14/2 s^2) + (-3/5 + 11/1 s + 3/7 s^2) t + (-3/7 + -18/5 s + -9/1 s^2) t^2, y = t
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(7, 3),
+                listOf(2u) to Rational(-35, 16),
+                listOf(3u) to Rational(-343, 6),
+                listOf(4u) to Rational(343, 3),
+                listOf(0u, 1u) to Rational(-19, 5),
+                listOf(1u, 1u) to Rational(-823, 120),
+                listOf(2u, 1u) to Rational(1232417, 6720),
+                listOf(3u, 1u) to Rational(-9863, 24),
+                listOf(4u, 1u) to Rational(385, 4),
+                listOf(0u, 2u) to Rational(2439, 350),
+                listOf(1u, 2u) to Rational(-5793, 40),
+                listOf(2u, 2u) to Rational(1172113, 3360),
+                listOf(3u, 2u) to Rational(-13531, 40),
+                listOf(4u, 2u) to Rational(2824, 7),
+                listOf(0u, 3u) to Rational(3417, 700),
+                listOf(1u, 3u) to Rational(1191, 200),
+                listOf(2u, 3u) to Rational(8383, 28),
+                listOf(3u, 3u) to Rational(-220279, 280),
+                listOf(4u, 3u) to Rational(49179, 196),
+                listOf(0u, 4u) to Rational(57, 35),
+                listOf(1u, 4u) to Rational(-33771, 700),
+                listOf(2u, 4u) to Rational(196279, 1225),
+                listOf(3u, 4u) to Rational(-32259, 140),
+                listOf(4u, 4u) to Rational(23868, 49),
+                listOf(0u, 5u) to Rational(333, 196),
+                listOf(1u, 5u) to Rational(-204, 35),
+                listOf(2u, 5u) to Rational(-307233, 2450),
+                listOf(3u, 5u) to Rational(-12492, 35),
+                listOf(4u, 5u) to Rational(4563, 28),
+                listOf(0u, 6u) to Rational(45, 98),
+                listOf(1u, 6u) to Rational(54, 7),
+                listOf(2u, 6u) to Rational(1809, 35),
+                listOf(3u, 6u) to Rational(162),
+                listOf(4u, 6u) to Rational(405, 2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                0 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0, 6),
+                    listOf(1u) to Rational(14, 8),
+                    listOf(2u) to Rational(-14, 2),
+                    listOf(0u, 1u) to Rational(-3, 5),
+                    listOf(1u, 1u) to Rational(11, 1),
+                    listOf(2u, 1u) to Rational(3, 7),
+                    listOf(0u, 2u) to Rational(-3, 7),
+                    listOf(1u, 2u) to Rational(-18, 5),
+                    listOf(2u, 2u) to Rational(-9, 1),
+                ),
+            )),
+            "test 5"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(7, 3),
+                listOf(2u) to Rational(-35, 16),
+                listOf(3u) to Rational(-343, 6),
+                listOf(4u) to Rational(343, 3),
+                listOf(0u, 1u) to Rational(-19, 5),
+                listOf(1u, 1u) to Rational(-823, 120),
+                listOf(2u, 1u) to Rational(1232417, 6720),
+                listOf(3u, 1u) to Rational(-9863, 24),
+                listOf(4u, 1u) to Rational(385, 4),
+                listOf(0u, 2u) to Rational(2439, 350),
+                listOf(1u, 2u) to Rational(-5793, 40),
+                listOf(2u, 2u) to Rational(1172113, 3360),
+                listOf(3u, 2u) to Rational(-13531, 40),
+                listOf(4u, 2u) to Rational(2824, 7),
+                listOf(0u, 3u) to Rational(3417, 700),
+                listOf(1u, 3u) to Rational(1191, 200),
+                listOf(2u, 3u) to Rational(8383, 28),
+                listOf(3u, 3u) to Rational(-220279, 280),
+                listOf(4u, 3u) to Rational(49179, 196),
+                listOf(0u, 4u) to Rational(57, 35),
+                listOf(1u, 4u) to Rational(-33771, 700),
+                listOf(2u, 4u) to Rational(196279, 1225),
+                listOf(3u, 4u) to Rational(-32259, 140),
+                listOf(4u, 4u) to Rational(23868, 49),
+                listOf(0u, 5u) to Rational(333, 196),
+                listOf(1u, 5u) to Rational(-204, 35),
+                listOf(2u, 5u) to Rational(-307233, 2450),
+                listOf(3u, 5u) to Rational(-12492, 35),
+                listOf(4u, 5u) to Rational(4563, 28),
+                listOf(0u, 6u) to Rational(45, 98),
+                listOf(1u, 6u) to Rational(54, 7),
+                listOf(2u, 6u) to Rational(1809, 35),
+                listOf(3u, 6u) to Rational(162),
+                listOf(4u, 6u) to Rational(405, 2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                0 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0, 6),
+                    listOf(1u) to Rational(14, 8),
+                    listOf(2u) to Rational(-14, 2),
+                    listOf(0u, 1u) to Rational(-3, 5),
+                    listOf(1u, 1u) to Rational(11, 1),
+                    listOf(2u, 1u) to Rational(3, 7),
+                    listOf(0u, 2u) to Rational(-3, 7),
+                    listOf(1u, 2u) to Rational(-18, 5),
+                    listOf(2u, 2u) to Rational(-9, 1),
+                ),
+                5 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 3),
+                    listOf(1u) to Rational(5, 2),
+                    listOf(2u) to Rational(13, 7),
+                    listOf(0u, 1u) to Rational(16, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(6, 1),
+                    listOf(0u, 2u) to Rational(-14, 3),
+                    listOf(1u, 2u) to Rational(-2, 7),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            )),
+            "test 5'"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf<Int, NumberedPolynomial<Rational>>()),
+            "test 6"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                5 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 3),
+                    listOf(1u) to Rational(5, 2),
+                    listOf(2u) to Rational(13, 7),
+                    listOf(0u, 1u) to Rational(16, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(6, 1),
+                    listOf(0u, 2u) to Rational(-14, 3),
+                    listOf(1u, 2u) to Rational(-2, 7),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            )),
+            "test 6'"
+        )
+    }
+    @Test
+    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should make denominator r^deg(p),
+            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
+    fun test_Polynomial_substitute_RationalFunction_Map() {
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1)
+            ).substitute(RationalField, mapOf(
+                0 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(1)
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(1)
+                    )
+                )
+            )),
+            "test 1"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf(4u) to Rational(-194071, 4900),
+                    listOf(3u, 1u) to Rational(394811, 225),
+                    listOf(2u, 2u) to Rational(-444183161, 66150),
+                    listOf(1u, 3u) to Rational(70537618, 59535),
+                    listOf(0u, 4u) to Rational(9655504, 2835),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf(4u) to Rational(9, 1),
+                    listOf(3u, 1u) to Rational(61, 1),
+                    listOf(2u, 2u) to Rational(2137, 36),
+                    listOf(1u, 3u) to Rational(-1342, 9),
+                    listOf(0u, 4u) to Rational(484, 9),
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                0 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(17, 7),
+                        listOf(0u, 1u) to Rational(-13, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(-18, 6),
+                        listOf(0u, 1u) to Rational(11, 6),
+                    )
+                ),
+                1 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(18, 5),
+                        listOf(0u, 1u) to Rational(-16, 3),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(-1, 1),
+                        listOf(0u, 1u) to Rational(-4, 1),
+                    )
+                ),
+            )),
+            "test 2"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-6443599, 10000),
+                    listOf(1u) to Rational(166251223, 210000),
+                    listOf(2u) to Rational(-4606805099, 3528000),
+                    listOf(3u) to Rational(51204379, 19600),
+                    listOf(4u) to Rational(-529045460659, 277830000),
+                    listOf(5u) to Rational(2630836709, 1488375),
+                    listOf(6u) to Rational(-42675691369, 25004700),
+                    listOf(7u) to Rational(495825223, 1250235),
+                    listOf(8u) to Rational(-22531756, 1750329),
+                    listOf(0u, 1u) to Rational(-2526552797, 420000),
+                    listOf(1u, 1u) to Rational(31108840471, 2520000),
+                    listOf(2u, 1u) to Rational(-4789740847, 1102500),
+                    listOf(3u, 1u) to Rational(186594307807, 11340000),
+                    listOf(4u, 1u) to Rational(-11677815943, 1488375),
+                    listOf(5u, 1u) to Rational(-181118486447, 27783000),
+                    listOf(6u, 1u) to Rational(-16123292162, 14586075),
+                    listOf(7u, 1u) to Rational(-140339343808, 26254935),
+                    listOf(8u, 1u) to Rational(4570171616, 5250987),
+                    listOf(0u, 2u) to Rational(-181436530573, 10080000),
+                    listOf(1u, 2u) to Rational(6700437957491, 105840000),
+                    listOf(2u, 2u) to Rational(-3527267461, 1417500),
+                    listOf(3u, 2u) to Rational(-38084563451, 5556600),
+                    listOf(4u, 2u) to Rational(-565662040631, 13891500),
+                    listOf(5u, 2u) to Rational(-35479071126397, 583443000),
+                    listOf(6u, 2u) to Rational(-11717559078469, 525098700),
+                    listOf(7u, 2u) to Rational(-2043385293517, 225042300),
+                    listOf(8u, 2u) to Rational(-3644439630451, 551353635),
+                    listOf(0u, 3u) to Rational(-1760423269, 126000),
+                    listOf(1u, 3u) to Rational(310176758299, 2352000),
+                    listOf(2u, 3u) to Rational(-907229584837, 21168000),
+                    listOf(3u, 3u) to Rational(-16717135885963, 95256000),
+                    listOf(4u, 3u) to Rational(-43762928025353, 333396000),
+                    listOf(5u, 3u) to Rational(-328427480571607, 3000564000),
+                    listOf(6u, 3u) to Rational(-7722675917197, 210039480),
+                    listOf(7u, 3u) to Rational(1713350137019, 1225230300),
+                    listOf(8u, 3u) to Rational(156695935643, 31505922),
+                    listOf(0u, 4u) to Rational(18362364269, 1008000),
+                    listOf(1u, 4u) to Rational(955674858553, 10584000),
+                    listOf(2u, 4u) to Rational(-71937470607371, 444528000),
+                    listOf(3u, 4u) to Rational(-34097985615163, 95256000),
+                    listOf(4u, 4u) to Rational(-340736178775883, 2000376000),
+                    listOf(5u, 4u) to Rational(-511324523441897, 10501974000),
+                    listOf(6u, 4u) to Rational(-125375649409151, 8821658160),
+                    listOf(7u, 4u) to Rational(-2813518533421, 1575296100),
+                    listOf(8u, 4u) to Rational(-17044089109, 5250987),
+                    listOf(0u, 5u) to Rational(600086461, 20160),
+                    listOf(1u, 5u) to Rational(-18959931367, 423360),
+                    listOf(2u, 5u) to Rational(-9178804929607, 44452800),
+                    listOf(3u, 5u) to Rational(-1460114275979, 5334336),
+                    listOf(4u, 5u) to Rational(-342533479090169, 4200789600),
+                    listOf(5u, 5u) to Rational(20335453022963, 4200789600),
+                    listOf(6u, 5u) to Rational(-21649775090197, 6301184400),
+                    listOf(7u, 5u) to Rational(-197301716069, 131274675),
+                    listOf(8u, 5u) to Rational(18711357470, 15752961),
+                    listOf(0u, 6u) to Rational(621417991, 100800),
+                    listOf(1u, 6u) to Rational(-159236792977, 2116800),
+                    listOf(2u, 6u) to Rational(-6602528890883, 66679200),
+                    listOf(3u, 6u) to Rational(-1086091664047, 19051200),
+                    listOf(4u, 6u) to Rational(3769375009003, 1680315840),
+                    listOf(5u, 6u) to Rational(-12920385574769, 1050197400),
+                    listOf(6u, 6u) to Rational(-90219591809287, 6301184400),
+                    listOf(7u, 6u) to Rational(656361553391, 1575296100),
+                    listOf(8u, 6u) to Rational(757900793, 2250423),
+                    listOf(0u, 7u) to Rational(-100770017, 15120),
+                    listOf(1u, 7u) to Rational(-316364851, 17640),
+                    listOf(2u, 7u) to Rational(-85118560057, 6667920),
+                    listOf(3u, 7u) to Rational(6286563719, 416745),
+                    listOf(4u, 7u) to Rational(26803885301, 1714608),
+                    listOf(5u, 7u) to Rational(-13767154393, 4286520),
+                    listOf(6u, 7u) to Rational(-3875138933, 1224720),
+                    listOf(7u, 7u) to Rational(65193755, 333396),
+                    listOf(8u, 7u) to Rational(90974351, 2500470),
+                    listOf(0u, 8u) to Rational(-3182197, 1260),
+                    listOf(1u, 8u) to Rational(24899923, 8820),
+                    listOf(2u, 8u) to Rational(-19999556, 19845),
+                    listOf(3u, 8u) to Rational(3276587, 3969),
+                    listOf(4u, 8u) to Rational(13719549239, 5000940),
+                    listOf(5u, 8u) to Rational(-961839938, 1250235),
+                    listOf(6u, 8u) to Rational(-198184871, 833490),
+                    listOf(7u, 8u) to Rational(230659711, 5000940),
+                    listOf(8u, 8u) to Rational(292447, 35721)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(9, 100),
+                    listOf(1u) to Rational(-21, 50),
+                    listOf(2u) to Rational(293, 700),
+                    listOf(3u) to Rational(29, 210),
+                    listOf(4u) to Rational(3233, 8820),
+                    listOf(5u) to Rational(-289, 441),
+                    listOf(6u) to Rational(-1, 9),
+                    listOf(7u) to Rational(-20, 441),
+                    listOf(8u) to Rational(100, 441),
+                    listOf(0u, 1u) to Rational(-57, 80),
+                    listOf(1u, 1u) to Rational(-121, 400),
+                    listOf(2u, 1u) to Rational(37117, 8400),
+                    listOf(3u, 1u) to Rational(-4853, 3150),
+                    listOf(4u, 1u) to Rational(1166203, 132300),
+                    listOf(5u, 1u) to Rational(-2708, 567),
+                    listOf(6u, 1u) to Rational(-287159, 416745),
+                    listOf(7u, 1u) to Rational(-478204, 83349),
+                    listOf(8u, 1u) to Rational(176320, 83349),
+                    listOf(0u, 2u) to Rational(-6239, 6400),
+                    listOf(1u, 2u) to Rational(264211, 11200),
+                    listOf(2u, 2u) to Rational(-1591999, 100800),
+                    listOf(3u, 2u) to Rational(12450091, 529200),
+                    listOf(4u, 2u) to Rational(9230759, 226800),
+                    listOf(5u, 2u) to Rational(18995554, 2083725),
+                    listOf(6u, 2u) to Rational(136706258, 6251175),
+                    listOf(7u, 2u) to Rational(-120907496, 3750705),
+                    listOf(8u, 2u) to Rational(117200176, 15752961),
+                    listOf(0u, 3u) to Rational(5653, 320),
+                    listOf(1u, 3u) to Rational(-130853, 8400),
+                    listOf(2u, 3u) to Rational(-20939327, 151200),
+                    listOf(3u, 3u) to Rational(2566691, 25200),
+                    listOf(4u, 3u) to Rational(-68441519, 476280),
+                    listOf(5u, 3u) to Rational(2462904247, 12502350),
+                    listOf(6u, 3u) to Rational(353667161, 18753525),
+                    listOf(7u, 3u) to Rational(-1689134372, 26254935),
+                    listOf(8u, 3u) to Rational(35084104, 2250423),
+                    listOf(0u, 4u) to Rational(-3587, 300),
+                    listOf(1u, 4u) to Rational(-10513243, 33600),
+                    listOf(2u, 4u) to Rational(30766733, 176400),
+                    listOf(3u, 4u) to Rational(-65680021, 198450),
+                    listOf(4u, 4u) to Rational(-8108910547, 20003760),
+                    listOf(5u, 4u) to Rational(2922125159, 6251175),
+                    listOf(6u, 4u) to Rational(-4245279943, 131274675),
+                    listOf(7u, 4u) to Rational(-371946872, 3750705),
+                    listOf(8u, 4u) to Rational(61286752, 2250423),
+                    listOf(0u, 5u) to Rational(-20477, 160),
+                    listOf(1u, 5u) to Rational(215741, 1120),
+                    listOf(2u, 5u) to Rational(30785843, 31752),
+                    listOf(3u, 5u) to Rational(-357495959, 317520),
+                    listOf(4u, 5u) to Rational(-1611242993, 10001880),
+                    listOf(5u, 5u) to Rational(345925495, 500094),
+                    listOf(6u, 5u) to Rational(-755948411, 3750705),
+                    listOf(7u, 5u) to Rational(-108643496, 1250235),
+                    listOf(8u, 5u) to Rational(1122512, 35721),
+                    listOf(0u, 6u) to Rational(358037, 2880),
+                    listOf(1u, 6u) to Rational(3895837, 3360),
+                    listOf(2u, 6u) to Rational(359419201, 1270080),
+                    listOf(3u, 6u) to Rational(-158522587, 105840),
+                    listOf(4u, 6u) to Rational(10909002599, 20003760),
+                    listOf(5u, 6u) to Rational(76846972, 138915),
+                    listOf(6u, 6u) to Rational(-327696553, 1250235),
+                    listOf(7u, 6u) to Rational(-1687328, 35721),
+                    listOf(8u, 6u) to Rational(1016836, 35721),
+                    listOf(0u, 7u) to Rational(658, 3),
+                    listOf(1u, 7u) to Rational(48035, 168),
+                    listOf(2u, 7u) to Rational(-5777875, 5292),
+                    listOf(3u, 7u) to Rational(-7893899, 10584),
+                    listOf(4u, 7u) to Rational(10191652, 11907),
+                    listOf(5u, 7u) to Rational(2920121, 23814),
+                    listOf(6u, 7u) to Rational(-2699780, 11907),
+                    listOf(7u, 7u) to Rational(4556, 441),
+                    listOf(8u, 7u) to Rational(3440, 189),
+                    listOf(0u, 8u) to Rational(64, 1),
+                    listOf(1u, 8u) to Rational(-808, 7),
+                    listOf(2u, 8u) to Rational(-360895, 1764),
+                    listOf(3u, 8u) to Rational(257657, 882),
+                    listOf(4u, 8u) to Rational(3779917, 15876),
+                    listOf(5u, 8u) to Rational(-610279, 3969),
+                    listOf(6u, 8u) to Rational(-25091, 441),
+                    listOf(7u, 8u) to Rational(9560, 567),
+                    listOf(8u, 8u) to Rational(400, 81)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                0 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(17, 5),
+                        listOf(1u) to Rational(11, 6),
+                        listOf(2u) to Rational(14, 3),
+                        listOf(0u, 1u) to Rational(17, 1),
+                        listOf(1u, 1u) to Rational(12, 3),
+                        listOf(2u, 1u) to Rational(-6, 2),
+                        listOf(0u, 2u) to Rational(17, 1),
+                        listOf(1u, 2u) to Rational(-4, 3),
+                        listOf(2u, 2u) to Rational(2, 6),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(3, 5),
+                        listOf(1u) to Rational(3, 5),
+                        listOf(2u) to Rational(3, 7),
+                        listOf(0u, 1u) to Rational(-3, 8),
+                        listOf(1u, 1u) to Rational(-1, 1),
+                        listOf(2u, 1u) to Rational(17, 9),
+                        listOf(0u, 2u) to Rational(-8, 1),
+                        listOf(1u, 2u) to Rational(6, 4),
+                        listOf(2u, 2u) to Rational(10, 9),
+                    )
+                ),
+                1 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(18, 5),
+                        listOf(1u) to Rational(-17, 5),
+                        listOf(2u) to Rational(-2, 7),
+                        listOf(0u, 1u) to Rational(6, 5),
+                        listOf(1u, 1u) to Rational(-5, 1),
+                        listOf(2u, 1u) to Rational(-9, 1),
+                        listOf(0u, 2u) to Rational(-8, 8),
+                        listOf(1u, 2u) to Rational(2, 7),
+                        listOf(2u, 2u) to Rational(-13, 7),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-4, 8),
+                        listOf(1u) to Rational(15, 9),
+                        listOf(2u) to Rational(-10, 9),
+                        listOf(0u, 1u) to Rational(5, 3),
+                        listOf(1u, 1u) to Rational(4, 1),
+                        listOf(2u, 1u) to Rational(-2, 7),
+                        listOf(0u, 2u) to Rational(2, 2),
+                        listOf(1u, 2u) to Rational(-5, 7),
+                        listOf(2u, 2u) to Rational(-18, 9),
+                    )
+                ),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-6443599, 10000),
+                    listOf(1u) to Rational(166251223, 210000),
+                    listOf(2u) to Rational(-4606805099, 3528000),
+                    listOf(3u) to Rational(51204379, 19600),
+                    listOf(4u) to Rational(-529045460659, 277830000),
+                    listOf(5u) to Rational(2630836709, 1488375),
+                    listOf(6u) to Rational(-42675691369, 25004700),
+                    listOf(7u) to Rational(495825223, 1250235),
+                    listOf(8u) to Rational(-22531756, 1750329),
+                    listOf(0u, 1u) to Rational(-2526552797, 420000),
+                    listOf(1u, 1u) to Rational(31108840471, 2520000),
+                    listOf(2u, 1u) to Rational(-4789740847, 1102500),
+                    listOf(3u, 1u) to Rational(186594307807, 11340000),
+                    listOf(4u, 1u) to Rational(-11677815943, 1488375),
+                    listOf(5u, 1u) to Rational(-181118486447, 27783000),
+                    listOf(6u, 1u) to Rational(-16123292162, 14586075),
+                    listOf(7u, 1u) to Rational(-140339343808, 26254935),
+                    listOf(8u, 1u) to Rational(4570171616, 5250987),
+                    listOf(0u, 2u) to Rational(-181436530573, 10080000),
+                    listOf(1u, 2u) to Rational(6700437957491, 105840000),
+                    listOf(2u, 2u) to Rational(-3527267461, 1417500),
+                    listOf(3u, 2u) to Rational(-38084563451, 5556600),
+                    listOf(4u, 2u) to Rational(-565662040631, 13891500),
+                    listOf(5u, 2u) to Rational(-35479071126397, 583443000),
+                    listOf(6u, 2u) to Rational(-11717559078469, 525098700),
+                    listOf(7u, 2u) to Rational(-2043385293517, 225042300),
+                    listOf(8u, 2u) to Rational(-3644439630451, 551353635),
+                    listOf(0u, 3u) to Rational(-1760423269, 126000),
+                    listOf(1u, 3u) to Rational(310176758299, 2352000),
+                    listOf(2u, 3u) to Rational(-907229584837, 21168000),
+                    listOf(3u, 3u) to Rational(-16717135885963, 95256000),
+                    listOf(4u, 3u) to Rational(-43762928025353, 333396000),
+                    listOf(5u, 3u) to Rational(-328427480571607, 3000564000),
+                    listOf(6u, 3u) to Rational(-7722675917197, 210039480),
+                    listOf(7u, 3u) to Rational(1713350137019, 1225230300),
+                    listOf(8u, 3u) to Rational(156695935643, 31505922),
+                    listOf(0u, 4u) to Rational(18362364269, 1008000),
+                    listOf(1u, 4u) to Rational(955674858553, 10584000),
+                    listOf(2u, 4u) to Rational(-71937470607371, 444528000),
+                    listOf(3u, 4u) to Rational(-34097985615163, 95256000),
+                    listOf(4u, 4u) to Rational(-340736178775883, 2000376000),
+                    listOf(5u, 4u) to Rational(-511324523441897, 10501974000),
+                    listOf(6u, 4u) to Rational(-125375649409151, 8821658160),
+                    listOf(7u, 4u) to Rational(-2813518533421, 1575296100),
+                    listOf(8u, 4u) to Rational(-17044089109, 5250987),
+                    listOf(0u, 5u) to Rational(600086461, 20160),
+                    listOf(1u, 5u) to Rational(-18959931367, 423360),
+                    listOf(2u, 5u) to Rational(-9178804929607, 44452800),
+                    listOf(3u, 5u) to Rational(-1460114275979, 5334336),
+                    listOf(4u, 5u) to Rational(-342533479090169, 4200789600),
+                    listOf(5u, 5u) to Rational(20335453022963, 4200789600),
+                    listOf(6u, 5u) to Rational(-21649775090197, 6301184400),
+                    listOf(7u, 5u) to Rational(-197301716069, 131274675),
+                    listOf(8u, 5u) to Rational(18711357470, 15752961),
+                    listOf(0u, 6u) to Rational(621417991, 100800),
+                    listOf(1u, 6u) to Rational(-159236792977, 2116800),
+                    listOf(2u, 6u) to Rational(-6602528890883, 66679200),
+                    listOf(3u, 6u) to Rational(-1086091664047, 19051200),
+                    listOf(4u, 6u) to Rational(3769375009003, 1680315840),
+                    listOf(5u, 6u) to Rational(-12920385574769, 1050197400),
+                    listOf(6u, 6u) to Rational(-90219591809287, 6301184400),
+                    listOf(7u, 6u) to Rational(656361553391, 1575296100),
+                    listOf(8u, 6u) to Rational(757900793, 2250423),
+                    listOf(0u, 7u) to Rational(-100770017, 15120),
+                    listOf(1u, 7u) to Rational(-316364851, 17640),
+                    listOf(2u, 7u) to Rational(-85118560057, 6667920),
+                    listOf(3u, 7u) to Rational(6286563719, 416745),
+                    listOf(4u, 7u) to Rational(26803885301, 1714608),
+                    listOf(5u, 7u) to Rational(-13767154393, 4286520),
+                    listOf(6u, 7u) to Rational(-3875138933, 1224720),
+                    listOf(7u, 7u) to Rational(65193755, 333396),
+                    listOf(8u, 7u) to Rational(90974351, 2500470),
+                    listOf(0u, 8u) to Rational(-3182197, 1260),
+                    listOf(1u, 8u) to Rational(24899923, 8820),
+                    listOf(2u, 8u) to Rational(-19999556, 19845),
+                    listOf(3u, 8u) to Rational(3276587, 3969),
+                    listOf(4u, 8u) to Rational(13719549239, 5000940),
+                    listOf(5u, 8u) to Rational(-961839938, 1250235),
+                    listOf(6u, 8u) to Rational(-198184871, 833490),
+                    listOf(7u, 8u) to Rational(230659711, 5000940),
+                    listOf(8u, 8u) to Rational(292447, 35721)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(9, 100),
+                    listOf(1u) to Rational(-21, 50),
+                    listOf(2u) to Rational(293, 700),
+                    listOf(3u) to Rational(29, 210),
+                    listOf(4u) to Rational(3233, 8820),
+                    listOf(5u) to Rational(-289, 441),
+                    listOf(6u) to Rational(-1, 9),
+                    listOf(7u) to Rational(-20, 441),
+                    listOf(8u) to Rational(100, 441),
+                    listOf(0u, 1u) to Rational(-57, 80),
+                    listOf(1u, 1u) to Rational(-121, 400),
+                    listOf(2u, 1u) to Rational(37117, 8400),
+                    listOf(3u, 1u) to Rational(-4853, 3150),
+                    listOf(4u, 1u) to Rational(1166203, 132300),
+                    listOf(5u, 1u) to Rational(-2708, 567),
+                    listOf(6u, 1u) to Rational(-287159, 416745),
+                    listOf(7u, 1u) to Rational(-478204, 83349),
+                    listOf(8u, 1u) to Rational(176320, 83349),
+                    listOf(0u, 2u) to Rational(-6239, 6400),
+                    listOf(1u, 2u) to Rational(264211, 11200),
+                    listOf(2u, 2u) to Rational(-1591999, 100800),
+                    listOf(3u, 2u) to Rational(12450091, 529200),
+                    listOf(4u, 2u) to Rational(9230759, 226800),
+                    listOf(5u, 2u) to Rational(18995554, 2083725),
+                    listOf(6u, 2u) to Rational(136706258, 6251175),
+                    listOf(7u, 2u) to Rational(-120907496, 3750705),
+                    listOf(8u, 2u) to Rational(117200176, 15752961),
+                    listOf(0u, 3u) to Rational(5653, 320),
+                    listOf(1u, 3u) to Rational(-130853, 8400),
+                    listOf(2u, 3u) to Rational(-20939327, 151200),
+                    listOf(3u, 3u) to Rational(2566691, 25200),
+                    listOf(4u, 3u) to Rational(-68441519, 476280),
+                    listOf(5u, 3u) to Rational(2462904247, 12502350),
+                    listOf(6u, 3u) to Rational(353667161, 18753525),
+                    listOf(7u, 3u) to Rational(-1689134372, 26254935),
+                    listOf(8u, 3u) to Rational(35084104, 2250423),
+                    listOf(0u, 4u) to Rational(-3587, 300),
+                    listOf(1u, 4u) to Rational(-10513243, 33600),
+                    listOf(2u, 4u) to Rational(30766733, 176400),
+                    listOf(3u, 4u) to Rational(-65680021, 198450),
+                    listOf(4u, 4u) to Rational(-8108910547, 20003760),
+                    listOf(5u, 4u) to Rational(2922125159, 6251175),
+                    listOf(6u, 4u) to Rational(-4245279943, 131274675),
+                    listOf(7u, 4u) to Rational(-371946872, 3750705),
+                    listOf(8u, 4u) to Rational(61286752, 2250423),
+                    listOf(0u, 5u) to Rational(-20477, 160),
+                    listOf(1u, 5u) to Rational(215741, 1120),
+                    listOf(2u, 5u) to Rational(30785843, 31752),
+                    listOf(3u, 5u) to Rational(-357495959, 317520),
+                    listOf(4u, 5u) to Rational(-1611242993, 10001880),
+                    listOf(5u, 5u) to Rational(345925495, 500094),
+                    listOf(6u, 5u) to Rational(-755948411, 3750705),
+                    listOf(7u, 5u) to Rational(-108643496, 1250235),
+                    listOf(8u, 5u) to Rational(1122512, 35721),
+                    listOf(0u, 6u) to Rational(358037, 2880),
+                    listOf(1u, 6u) to Rational(3895837, 3360),
+                    listOf(2u, 6u) to Rational(359419201, 1270080),
+                    listOf(3u, 6u) to Rational(-158522587, 105840),
+                    listOf(4u, 6u) to Rational(10909002599, 20003760),
+                    listOf(5u, 6u) to Rational(76846972, 138915),
+                    listOf(6u, 6u) to Rational(-327696553, 1250235),
+                    listOf(7u, 6u) to Rational(-1687328, 35721),
+                    listOf(8u, 6u) to Rational(1016836, 35721),
+                    listOf(0u, 7u) to Rational(658, 3),
+                    listOf(1u, 7u) to Rational(48035, 168),
+                    listOf(2u, 7u) to Rational(-5777875, 5292),
+                    listOf(3u, 7u) to Rational(-7893899, 10584),
+                    listOf(4u, 7u) to Rational(10191652, 11907),
+                    listOf(5u, 7u) to Rational(2920121, 23814),
+                    listOf(6u, 7u) to Rational(-2699780, 11907),
+                    listOf(7u, 7u) to Rational(4556, 441),
+                    listOf(8u, 7u) to Rational(3440, 189),
+                    listOf(0u, 8u) to Rational(64, 1),
+                    listOf(1u, 8u) to Rational(-808, 7),
+                    listOf(2u, 8u) to Rational(-360895, 1764),
+                    listOf(3u, 8u) to Rational(257657, 882),
+                    listOf(4u, 8u) to Rational(3779917, 15876),
+                    listOf(5u, 8u) to Rational(-610279, 3969),
+                    listOf(6u, 8u) to Rational(-25091, 441),
+                    listOf(7u, 8u) to Rational(9560, 567),
+                    listOf(8u, 8u) to Rational(400, 81)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                0 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(17, 5),
+                        listOf(1u) to Rational(11, 6),
+                        listOf(2u) to Rational(14, 3),
+                        listOf(0u, 1u) to Rational(17, 1),
+                        listOf(1u, 1u) to Rational(12, 3),
+                        listOf(2u, 1u) to Rational(-6, 2),
+                        listOf(0u, 2u) to Rational(17, 1),
+                        listOf(1u, 2u) to Rational(-4, 3),
+                        listOf(2u, 2u) to Rational(2, 6),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(3, 5),
+                        listOf(1u) to Rational(3, 5),
+                        listOf(2u) to Rational(3, 7),
+                        listOf(0u, 1u) to Rational(-3, 8),
+                        listOf(1u, 1u) to Rational(-1, 1),
+                        listOf(2u, 1u) to Rational(17, 9),
+                        listOf(0u, 2u) to Rational(-8, 1),
+                        listOf(1u, 2u) to Rational(6, 4),
+                        listOf(2u, 2u) to Rational(10, 9),
+                    )
+                ),
+                1 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(18, 5),
+                        listOf(1u) to Rational(-17, 5),
+                        listOf(2u) to Rational(-2, 7),
+                        listOf(0u, 1u) to Rational(6, 5),
+                        listOf(1u, 1u) to Rational(-5, 1),
+                        listOf(2u, 1u) to Rational(-9, 1),
+                        listOf(0u, 2u) to Rational(-8, 8),
+                        listOf(1u, 2u) to Rational(2, 7),
+                        listOf(2u, 2u) to Rational(-13, 7),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-4, 8),
+                        listOf(1u) to Rational(15, 9),
+                        listOf(2u) to Rational(-10, 9),
+                        listOf(0u, 1u) to Rational(5, 3),
+                        listOf(1u, 1u) to Rational(4, 1),
+                        listOf(2u, 1u) to Rational(-2, 7),
+                        listOf(0u, 2u) to Rational(2, 2),
+                        listOf(1u, 2u) to Rational(-5, 7),
+                        listOf(2u, 2u) to Rational(-18, 9),
+                    )
+                ),
+                5 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-2, 9),
+                        listOf(1u) to Rational(-6, 3),
+                        listOf(2u) to Rational(10, 9),
+                        listOf(0u, 1u) to Rational(13, 3),
+                        listOf(1u, 1u) to Rational(-12, 4),
+                        listOf(2u, 1u) to Rational(3, 6),
+                        listOf(0u, 2u) to Rational(2, 9),
+                        listOf(1u, 2u) to Rational(7, 3),
+                        listOf(2u, 2u) to Rational(16, 5),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-6, 2),
+                        listOf(1u) to Rational(6, 2),
+                        listOf(2u) to Rational(2, 7),
+                        listOf(0u, 1u) to Rational(-18, 1),
+                        listOf(1u, 1u) to Rational(-11, 3),
+                        listOf(2u, 1u) to Rational(7, 5),
+                        listOf(0u, 2u) to Rational(8, 1),
+                        listOf(1u, 2u) to Rational(6, 7),
+                        listOf(2u, 2u) to Rational(17, 4),
+                    )
+                )
+            )),
+            "test 3'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-66677, 3500),
+                    listOf(1u) to Rational(-206281, 10500),
+                    listOf(2u) to Rational(-412567, 7056),
+                    listOf(3u) to Rational(-310081, 11025),
+                    listOf(4u) to Rational(-575996, 15435),
+                    listOf(0u, 1u) to Rational(-573701, 4200),
+                    listOf(1u, 1u) to Rational(-2239001, 25200),
+                    listOf(2u, 1u) to Rational(-8817889, 132300),
+                    listOf(3u, 1u) to Rational(2317919, 44100),
+                    listOf(4u, 1u) to Rational(1169471, 6615),
+                    listOf(0u, 2u) to Rational(-4057819, 33600),
+                    listOf(1u, 2u) to Rational(1373311, 12600),
+                    listOf(2u, 2u) to Rational(32433493, 52920),
+                    listOf(3u, 2u) to Rational(4998053, 33075),
+                    listOf(4u, 2u) to Rational(-2147779, 8820),
+                    listOf(0u, 3u) to Rational(2018481, 2240),
+                    listOf(1u, 3u) to Rational(941713, 1440),
+                    listOf(2u, 3u) to Rational(183749, 6615),
+                    listOf(3u, 3u) to Rational(-4631023, 15876),
+                    listOf(4u, 3u) to Rational(25609336, 178605),
+                    listOf(0u, 4u) to Rational(11886431, 6720),
+                    listOf(1u, 4u) to Rational(18433, 504),
+                    listOf(2u, 4u) to Rational(-39613331, 45360),
+                    listOf(3u, 4u) to Rational(681619, 5670),
+                    listOf(4u, 4u) to Rational(-864841, 20412),
+                    listOf(0u, 5u) to Rational(343535, 1008),
+                    listOf(1u, 5u) to Rational(-33583, 72),
+                    listOf(2u, 5u) to Rational(1194625, 9072),
+                    listOf(3u, 5u) to Rational(-62917, 2268),
+                    listOf(4u, 5u) to Rational(157645, 10206),
+                    listOf(0u, 6u) to Rational(-1381, 3),
+                    listOf(1u, 6u) to Rational(919, 36),
+                    listOf(2u, 6u) to Rational(-3053, 36),
+                    listOf(3u, 6u) to Rational(2125, 324),
+                    listOf(4u, 6u) to Rational(-236, 243)
+                ),
+                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-5, 3),
+                    listOf(2u) to Rational(35, 9),
+                    listOf(3u) to Rational(-100, 27),
+                    listOf(4u) to Rational(100, 81),
+                    listOf(0u, 1u) to Rational(-5, 3),
+                    listOf(1u, 1u) to Rational(14, 9),
+                    listOf(2u, 1u) to Rational(1874, 189),
+                    listOf(3u, 1u) to Rational(-620, 63),
+                    listOf(4u, 1u) to Rational(40, 63),
+                    listOf(0u, 2u) to Rational(16, 9),
+                    listOf(1u, 2u) to Rational(365, 21),
+                    listOf(2u, 2u) to Rational(112, 9),
+                    listOf(3u, 2u) to Rational(-464, 63),
+                    listOf(4u, 2u) to Rational(1996, 441),
+                    listOf(0u, 3u) to Rational(10, 3),
+                    listOf(1u, 3u) to Rational(118, 21),
+                    listOf(2u, 3u) to Rational(-272, 21),
+                    listOf(3u, 3u) to Rational(-764, 49),
+                    listOf(4u, 3u) to Rational(8, 7),
+                    listOf(0u, 4u) to Rational(1, 1),
+                    listOf(1u, 4u) to Rational(-10, 7),
+                    listOf(2u, 4u) to Rational(-171, 49),
+                    listOf(3u, 4u) to Rational(20, 7),
+                    listOf(4u, 4u) to Rational(4, 1)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                0 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(17, 5),
+                        listOf(1u) to Rational(11, 6),
+                        listOf(2u) to Rational(14, 3),
+                        listOf(0u, 1u) to Rational(17, 1),
+                        listOf(1u, 1u) to Rational(12, 3),
+                        listOf(2u, 1u) to Rational(-6, 2),
+                        listOf(0u, 2u) to Rational(17, 1),
+                        listOf(1u, 2u) to Rational(-4, 3),
+                        listOf(2u, 2u) to Rational(2, 6),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(3, 5),
+                        listOf(1u) to Rational(3, 5),
+                        listOf(2u) to Rational(3, 7),
+                        listOf(0u, 1u) to Rational(-3, 8),
+                        listOf(1u, 1u) to Rational(-1, 1),
+                        listOf(2u, 1u) to Rational(17, 9),
+                        listOf(0u, 2u) to Rational(-8, 1),
+                        listOf(1u, 2u) to Rational(6, 4),
+                        listOf(2u, 2u) to Rational(10, 9),
+                    )
+                ),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-66677, 3500),
+                    listOf(1u) to Rational(-206281, 10500),
+                    listOf(2u) to Rational(-412567, 7056),
+                    listOf(3u) to Rational(-310081, 11025),
+                    listOf(4u) to Rational(-575996, 15435),
+                    listOf(0u, 1u) to Rational(-573701, 4200),
+                    listOf(1u, 1u) to Rational(-2239001, 25200),
+                    listOf(2u, 1u) to Rational(-8817889, 132300),
+                    listOf(3u, 1u) to Rational(2317919, 44100),
+                    listOf(4u, 1u) to Rational(1169471, 6615),
+                    listOf(0u, 2u) to Rational(-4057819, 33600),
+                    listOf(1u, 2u) to Rational(1373311, 12600),
+                    listOf(2u, 2u) to Rational(32433493, 52920),
+                    listOf(3u, 2u) to Rational(4998053, 33075),
+                    listOf(4u, 2u) to Rational(-2147779, 8820),
+                    listOf(0u, 3u) to Rational(2018481, 2240),
+                    listOf(1u, 3u) to Rational(941713, 1440),
+                    listOf(2u, 3u) to Rational(183749, 6615),
+                    listOf(3u, 3u) to Rational(-4631023, 15876),
+                    listOf(4u, 3u) to Rational(25609336, 178605),
+                    listOf(0u, 4u) to Rational(11886431, 6720),
+                    listOf(1u, 4u) to Rational(18433, 504),
+                    listOf(2u, 4u) to Rational(-39613331, 45360),
+                    listOf(3u, 4u) to Rational(681619, 5670),
+                    listOf(4u, 4u) to Rational(-864841, 20412),
+                    listOf(0u, 5u) to Rational(343535, 1008),
+                    listOf(1u, 5u) to Rational(-33583, 72),
+                    listOf(2u, 5u) to Rational(1194625, 9072),
+                    listOf(3u, 5u) to Rational(-62917, 2268),
+                    listOf(4u, 5u) to Rational(157645, 10206),
+                    listOf(0u, 6u) to Rational(-1381, 3),
+                    listOf(1u, 6u) to Rational(919, 36),
+                    listOf(2u, 6u) to Rational(-3053, 36),
+                    listOf(3u, 6u) to Rational(2125, 324),
+                    listOf(4u, 6u) to Rational(-236, 243)
+                ),
+                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-5, 3),
+                    listOf(2u) to Rational(35, 9),
+                    listOf(3u) to Rational(-100, 27),
+                    listOf(4u) to Rational(100, 81),
+                    listOf(0u, 1u) to Rational(-5, 3),
+                    listOf(1u, 1u) to Rational(14, 9),
+                    listOf(2u, 1u) to Rational(1874, 189),
+                    listOf(3u, 1u) to Rational(-620, 63),
+                    listOf(4u, 1u) to Rational(40, 63),
+                    listOf(0u, 2u) to Rational(16, 9),
+                    listOf(1u, 2u) to Rational(365, 21),
+                    listOf(2u, 2u) to Rational(112, 9),
+                    listOf(3u, 2u) to Rational(-464, 63),
+                    listOf(4u, 2u) to Rational(1996, 441),
+                    listOf(0u, 3u) to Rational(10, 3),
+                    listOf(1u, 3u) to Rational(118, 21),
+                    listOf(2u, 3u) to Rational(-272, 21),
+                    listOf(3u, 3u) to Rational(-764, 49),
+                    listOf(4u, 3u) to Rational(8, 7),
+                    listOf(0u, 4u) to Rational(1, 1),
+                    listOf(1u, 4u) to Rational(-10, 7),
+                    listOf(2u, 4u) to Rational(-171, 49),
+                    listOf(3u, 4u) to Rational(20, 7),
+                    listOf(4u, 4u) to Rational(4, 1)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                0 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(17, 5),
+                        listOf(1u) to Rational(11, 6),
+                        listOf(2u) to Rational(14, 3),
+                        listOf(0u, 1u) to Rational(17, 1),
+                        listOf(1u, 1u) to Rational(12, 3),
+                        listOf(2u, 1u) to Rational(-6, 2),
+                        listOf(0u, 2u) to Rational(17, 1),
+                        listOf(1u, 2u) to Rational(-4, 3),
+                        listOf(2u, 2u) to Rational(2, 6),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(3, 5),
+                        listOf(1u) to Rational(3, 5),
+                        listOf(2u) to Rational(3, 7),
+                        listOf(0u, 1u) to Rational(-3, 8),
+                        listOf(1u, 1u) to Rational(-1, 1),
+                        listOf(2u, 1u) to Rational(17, 9),
+                        listOf(0u, 2u) to Rational(-8, 1),
+                        listOf(1u, 2u) to Rational(6, 4),
+                        listOf(2u, 2u) to Rational(10, 9),
+                    )
+                ),
+                5 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-2, 9),
+                        listOf(1u) to Rational(-6, 3),
+                        listOf(2u) to Rational(10, 9),
+                        listOf(0u, 1u) to Rational(13, 3),
+                        listOf(1u, 1u) to Rational(-12, 4),
+                        listOf(2u, 1u) to Rational(3, 6),
+                        listOf(0u, 2u) to Rational(2, 9),
+                        listOf(1u, 2u) to Rational(7, 3),
+                        listOf(2u, 2u) to Rational(16, 5),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-6, 2),
+                        listOf(1u) to Rational(6, 2),
+                        listOf(2u) to Rational(2, 7),
+                        listOf(0u, 1u) to Rational(-18, 1),
+                        listOf(1u, 1u) to Rational(-11, 3),
+                        listOf(2u, 1u) to Rational(7, 5),
+                        listOf(0u, 2u) to Rational(8, 1),
+                        listOf(1u, 2u) to Rational(6, 7),
+                        listOf(2u, 2u) to Rational(17, 4),
+                    )
+                )
+            )),
+            "test 4'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(3539, 700),
+                    listOf(1u) to Rational(-307079, 6300),
+                    listOf(2u) to Rational(451609, 15120),
+                    listOf(3u) to Rational(35287733, 396900),
+                    listOf(4u) to Rational(-37242617, 396900),
+                    listOf(5u) to Rational(382747, 19845),
+                    listOf(6u) to Rational(-2407, 3969),
+                    listOf(0u, 1u) to Rational(-226, 175),
+                    listOf(1u, 1u) to Rational(-74113, 1890),
+                    listOf(2u, 1u) to Rational(250931, 1764),
+                    listOf(3u, 1u) to Rational(30071473, 99225),
+                    listOf(4u, 1u) to Rational(-286466, 1323),
+                    listOf(5u, 1u) to Rational(-2285282, 9261),
+                    listOf(6u, 1u) to Rational(17900, 441),
+                    listOf(0u, 2u) to Rational(3817, 3150),
+                    listOf(1u, 2u) to Rational(577568, 11025),
+                    listOf(2u, 2u) to Rational(9073553, 99225),
+                    listOf(3u, 2u) to Rational(-1415849, 79380),
+                    listOf(4u, 2u) to Rational(-124715629, 277830),
+                    listOf(5u, 2u) to Rational(-1328953, 1890),
+                    listOf(6u, 2u) to Rational(-297148, 1323),
+                    listOf(0u, 3u) to Rational(6043, 945),
+                    listOf(1u, 3u) to Rational(160381, 6615),
+                    listOf(2u, 3u) to Rational(-673249, 13230),
+                    listOf(3u, 3u) to Rational(-319255, 2058),
+                    listOf(4u, 3u) to Rational(-98144, 1029),
+                    listOf(5u, 3u) to Rational(-320239, 5145),
+                    listOf(6u, 3u) to Rational(400, 147),
+                    listOf(0u, 4u) to Rational(163, 63),
+                    listOf(1u, 4u) to Rational(-25183, 4410),
+                    listOf(2u, 4u) to Rational(-21369, 1372),
+                    listOf(3u, 4u) to Rational(127499, 30870),
+                    listOf(4u, 4u) to Rational(86971, 12348),
+                    listOf(5u, 4u) to Rational(-11129, 1470),
+                    listOf(6u, 4u) to Rational(544, 147)
+                ),
+                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-5, 3),
+                    listOf(2u) to Rational(35, 9),
+                    listOf(3u) to Rational(-100, 27),
+                    listOf(4u) to Rational(100, 81),
+                    listOf(0u, 1u) to Rational(-5, 3),
+                    listOf(1u, 1u) to Rational(14, 9),
+                    listOf(2u, 1u) to Rational(1874, 189),
+                    listOf(3u, 1u) to Rational(-620, 63),
+                    listOf(4u, 1u) to Rational(40, 63),
+                    listOf(0u, 2u) to Rational(16, 9),
+                    listOf(1u, 2u) to Rational(365, 21),
+                    listOf(2u, 2u) to Rational(112, 9),
+                    listOf(3u, 2u) to Rational(-464, 63),
+                    listOf(4u, 2u) to Rational(1996, 441),
+                    listOf(0u, 3u) to Rational(10, 3),
+                    listOf(1u, 3u) to Rational(118, 21),
+                    listOf(2u, 3u) to Rational(-272, 21),
+                    listOf(3u, 3u) to Rational(-764, 49),
+                    listOf(4u, 3u) to Rational(8, 7),
+                    listOf(0u, 4u) to Rational(1, 1),
+                    listOf(1u, 4u) to Rational(-10, 7),
+                    listOf(2u, 4u) to Rational(-171, 49),
+                    listOf(3u, 4u) to Rational(20, 7),
+                    listOf(4u, 4u) to Rational(4, 1)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                1 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(18, 5),
+                        listOf(1u) to Rational(-17, 5),
+                        listOf(2u) to Rational(-2, 7),
+                        listOf(0u, 1u) to Rational(6, 5),
+                        listOf(1u, 1u) to Rational(-5, 1),
+                        listOf(2u, 1u) to Rational(-9, 1),
+                        listOf(0u, 2u) to Rational(-8, 8),
+                        listOf(1u, 2u) to Rational(2, 7),
+                        listOf(2u, 2u) to Rational(-13, 7),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-4, 8),
+                        listOf(1u) to Rational(15, 9),
+                        listOf(2u) to Rational(-10, 9),
+                        listOf(0u, 1u) to Rational(5, 3),
+                        listOf(1u, 1u) to Rational(4, 1),
+                        listOf(2u, 1u) to Rational(-2, 7),
+                        listOf(0u, 2u) to Rational(2, 2),
+                        listOf(1u, 2u) to Rational(-5, 7),
+                        listOf(2u, 2u) to Rational(-18, 9),
+                    )
+                ),
+            )),
+            "test 5"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(3539, 700),
+                    listOf(1u) to Rational(-307079, 6300),
+                    listOf(2u) to Rational(451609, 15120),
+                    listOf(3u) to Rational(35287733, 396900),
+                    listOf(4u) to Rational(-37242617, 396900),
+                    listOf(5u) to Rational(382747, 19845),
+                    listOf(6u) to Rational(-2407, 3969),
+                    listOf(0u, 1u) to Rational(-226, 175),
+                    listOf(1u, 1u) to Rational(-74113, 1890),
+                    listOf(2u, 1u) to Rational(250931, 1764),
+                    listOf(3u, 1u) to Rational(30071473, 99225),
+                    listOf(4u, 1u) to Rational(-286466, 1323),
+                    listOf(5u, 1u) to Rational(-2285282, 9261),
+                    listOf(6u, 1u) to Rational(17900, 441),
+                    listOf(0u, 2u) to Rational(3817, 3150),
+                    listOf(1u, 2u) to Rational(577568, 11025),
+                    listOf(2u, 2u) to Rational(9073553, 99225),
+                    listOf(3u, 2u) to Rational(-1415849, 79380),
+                    listOf(4u, 2u) to Rational(-124715629, 277830),
+                    listOf(5u, 2u) to Rational(-1328953, 1890),
+                    listOf(6u, 2u) to Rational(-297148, 1323),
+                    listOf(0u, 3u) to Rational(6043, 945),
+                    listOf(1u, 3u) to Rational(160381, 6615),
+                    listOf(2u, 3u) to Rational(-673249, 13230),
+                    listOf(3u, 3u) to Rational(-319255, 2058),
+                    listOf(4u, 3u) to Rational(-98144, 1029),
+                    listOf(5u, 3u) to Rational(-320239, 5145),
+                    listOf(6u, 3u) to Rational(400, 147),
+                    listOf(0u, 4u) to Rational(163, 63),
+                    listOf(1u, 4u) to Rational(-25183, 4410),
+                    listOf(2u, 4u) to Rational(-21369, 1372),
+                    listOf(3u, 4u) to Rational(127499, 30870),
+                    listOf(4u, 4u) to Rational(86971, 12348),
+                    listOf(5u, 4u) to Rational(-11129, 1470),
+                    listOf(6u, 4u) to Rational(544, 147)
+                ),
+                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-5, 3),
+                    listOf(2u) to Rational(35, 9),
+                    listOf(3u) to Rational(-100, 27),
+                    listOf(4u) to Rational(100, 81),
+                    listOf(0u, 1u) to Rational(-5, 3),
+                    listOf(1u, 1u) to Rational(14, 9),
+                    listOf(2u, 1u) to Rational(1874, 189),
+                    listOf(3u, 1u) to Rational(-620, 63),
+                    listOf(4u, 1u) to Rational(40, 63),
+                    listOf(0u, 2u) to Rational(16, 9),
+                    listOf(1u, 2u) to Rational(365, 21),
+                    listOf(2u, 2u) to Rational(112, 9),
+                    listOf(3u, 2u) to Rational(-464, 63),
+                    listOf(4u, 2u) to Rational(1996, 441),
+                    listOf(0u, 3u) to Rational(10, 3),
+                    listOf(1u, 3u) to Rational(118, 21),
+                    listOf(2u, 3u) to Rational(-272, 21),
+                    listOf(3u, 3u) to Rational(-764, 49),
+                    listOf(4u, 3u) to Rational(8, 7),
+                    listOf(0u, 4u) to Rational(1, 1),
+                    listOf(1u, 4u) to Rational(-10, 7),
+                    listOf(2u, 4u) to Rational(-171, 49),
+                    listOf(3u, 4u) to Rational(20, 7),
+                    listOf(4u, 4u) to Rational(4, 1)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                1 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(18, 5),
+                        listOf(1u) to Rational(-17, 5),
+                        listOf(2u) to Rational(-2, 7),
+                        listOf(0u, 1u) to Rational(6, 5),
+                        listOf(1u, 1u) to Rational(-5, 1),
+                        listOf(2u, 1u) to Rational(-9, 1),
+                        listOf(0u, 2u) to Rational(-8, 8),
+                        listOf(1u, 2u) to Rational(2, 7),
+                        listOf(2u, 2u) to Rational(-13, 7),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-4, 8),
+                        listOf(1u) to Rational(15, 9),
+                        listOf(2u) to Rational(-10, 9),
+                        listOf(0u, 1u) to Rational(5, 3),
+                        listOf(1u, 1u) to Rational(4, 1),
+                        listOf(2u, 1u) to Rational(-2, 7),
+                        listOf(0u, 2u) to Rational(2, 2),
+                        listOf(1u, 2u) to Rational(-5, 7),
+                        listOf(2u, 2u) to Rational(-18, 9),
+                    )
+                ),
+                5 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-2, 9),
+                        listOf(1u) to Rational(-6, 3),
+                        listOf(2u) to Rational(10, 9),
+                        listOf(0u, 1u) to Rational(13, 3),
+                        listOf(1u, 1u) to Rational(-12, 4),
+                        listOf(2u, 1u) to Rational(3, 6),
+                        listOf(0u, 2u) to Rational(2, 9),
+                        listOf(1u, 2u) to Rational(7, 3),
+                        listOf(2u, 2u) to Rational(16, 5),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-6, 2),
+                        listOf(1u) to Rational(6, 2),
+                        listOf(2u) to Rational(2, 7),
+                        listOf(0u, 1u) to Rational(-18, 1),
+                        listOf(1u, 1u) to Rational(-11, 3),
+                        listOf(2u, 1u) to Rational(7, 5),
+                        listOf(0u, 2u) to Rational(8, 1),
+                        listOf(1u, 2u) to Rational(6, 7),
+                        listOf(2u, 2u) to Rational(17, 4),
+                    )
+                )
+            )),
+            "test 5'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(15, 7),
+                    listOf(1u) to Rational(1, 5),
+                    listOf(2u) to Rational(-7, 4),
+                    listOf(0u, 1u) to Rational(-1, 9),
+                    listOf(1u, 1u) to Rational(-2, 7),
+                    listOf(2u, 1u) to Rational(17, 3),
+                    listOf(0u, 2u) to Rational(2, 6),
+                    listOf(1u, 2u) to Rational(-17, 6),
+                    listOf(2u, 2u) to Rational(-6, 2),
+                ),
+                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
+                    listOf<UInt>() to Rational(0, 1)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf<Int, NumberedRationalFunction<Rational>>()),
+            "test 6"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(15, 7),
+                    listOf(1u) to Rational(1, 5),
+                    listOf(2u) to Rational(-7, 4),
+                    listOf(0u, 1u) to Rational(-1, 9),
+                    listOf(1u, 1u) to Rational(-2, 7),
+                    listOf(2u, 1u) to Rational(17, 3),
+                    listOf(0u, 2u) to Rational(2, 6),
+                    listOf(1u, 2u) to Rational(-17, 6),
+                    listOf(2u, 2u) to Rational(-6, 2),
+                ),
+                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
+                    listOf<UInt>() to Rational(0, 1)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                5 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-2, 9),
+                        listOf(1u) to Rational(-6, 3),
+                        listOf(2u) to Rational(10, 9),
+                        listOf(0u, 1u) to Rational(13, 3),
+                        listOf(1u, 1u) to Rational(-12, 4),
+                        listOf(2u, 1u) to Rational(3, 6),
+                        listOf(0u, 2u) to Rational(2, 9),
+                        listOf(1u, 2u) to Rational(7, 3),
+                        listOf(2u, 2u) to Rational(16, 5),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-6, 2),
+                        listOf(1u) to Rational(6, 2),
+                        listOf(2u) to Rational(2, 7),
+                        listOf(0u, 1u) to Rational(-18, 1),
+                        listOf(1u, 1u) to Rational(-11, 3),
+                        listOf(2u, 1u) to Rational(7, 5),
+                        listOf(0u, 2u) to Rational(8, 1),
+                        listOf(1u, 2u) to Rational(6, 7),
+                        listOf(2u, 2u) to Rational(17, 4),
+                    )
+                )
+            )),
+            "test 6'"
+        )
+    }
+    @Test
+    @Ignore
+    fun test_RationalFunction_substitute_Double_Map() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_RationalFunction_substitute_Constant_Map() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_RationalFunction_substitute_Polynomial_Map() {
+        // TODO
+    }
+    @Test
+    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should make denominator r^deg(p),
+            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
+    fun test_RationalFunction_substitute_RationalFunction_Map() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_substitute_Double_Buffer() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_substitute_Constant_Buffer() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_substitute_Polynomial_Buffer() {
+        // TODO
+    }
+    @Test
+    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should make denominator r^deg(p),
+            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
+    fun test_Polynomial_substitute_RationalFunction_Buffer() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_RationalFunction_substitute_Double_Buffer() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_RationalFunction_substitute_Constant_Buffer() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_RationalFunction_substitute_Polynomial_Buffer() {
+        // TODO
+    }
+    @Test
+    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should make denominator r^deg(p),
+            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
+    fun test_RationalFunction_substitute_RationalFunction_Buffer() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_substituteFully_Double_Buffer() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_substituteFully_Constant_Buffer() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_RationalFunction_substituteFully_Double_Buffer() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_RationalFunction_substituteFully_Constant_Buffer() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_derivativeWithRespectTo_variable() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_nthDerivativeWithRespectTo_variable_order() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_nthDerivativeWithRespectTo_variablesAndOrders() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_antiderivativeWithRespectTo_variable() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_nthAntiderivativeWithRespectTo_variable_order() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_nthAntiderivativeWithRespectTo_variablesAndOrders() {
+        // TODO
     }
 }
\ No newline at end of file
-- 
2.34.1


From 672a3c1552332eb8530fbc71a50c72894ddd5073 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sun, 3 Jul 2022 15:47:12 +0300
Subject: [PATCH 550/713] Tests generation for numbered utilities in progress:
 finish map-wise substitutions. Also: - Upgrade operations on Rational. - Add
 new assertions. - Changed a bit FIXME comments.

---
 .../kmath/functions/ListPolynomialUtilTest.kt |    4 +-
 .../functions/NumberedPolynomialUtilTest.kt   | 3248 ++++++++++++++++-
 .../kscience/kmath/test/misc/Rational.kt      |  111 +-
 .../kscience/kmath/test/misc/assertion.kt     |   34 +
 4 files changed, 3321 insertions(+), 76 deletions(-)

diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
index 314044ba8..9d4f4411b 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -121,7 +121,7 @@ class ListPolynomialUtilTest {
     }
     @Test
     @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should make denominator r^deg(p),
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
             //  not r^(deg(p)(deg(p)+1)/2) as it is now.
     fun test_Polynomial_substitute_RationalFunction() {
         assertEquals(
@@ -589,7 +589,7 @@ class ListPolynomialUtilTest {
     }
     @Test
     @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should make denominator r^deg(p),
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
             //  not r^(deg(p)(deg(p)+1)/2) as it is now.
     fun test_RationalFunction_substitute_RationalFunction() {
         assertEquals(
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
index 8ece66145..b6baed6af 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.functions
 
 import space.kscience.kmath.test.misc.Rational
 import space.kscience.kmath.test.misc.RationalField
-import space.kscience.kmath.test.misc.assertContentEquals
+import space.kscience.kmath.test.misc.assertEquals
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -16,20 +16,20 @@ import kotlin.test.assertEquals
 class NumberedPolynomialUtilTest {
     @Test
     fun test_Polynomial_substitute_Double_Map() {
-        assertContentEquals(
-            mapOf(emptyList<UInt>() to 0.0),
+        assertEquals(
+            NumberedPolynomialAsIs(emptyList<UInt>() to 0.0),
             NumberedPolynomialAsIs(
                 listOf<UInt>() to 1.0,
                 listOf(1u) to -2.0,
                 listOf(2u) to 1.0,
             ).substitute(mapOf(
                 0 to 1.0
-            )).coefficients,
+            )),
             0.001,
             "test 1"
         )
-        assertContentEquals(
-            mapOf(
+        assertEquals(
+            NumberedPolynomialAsIs(
                 listOf<UInt>() to 0.8597048543814783,
                 listOf(1u) to 0.22997637465889875,
                 listOf(2u) to 0.32675302591924016,
@@ -50,12 +50,12 @@ class NumberedPolynomialUtilTest {
                 listOf(0u, 2u) to 0.2700930201481795,
                 listOf(1u, 2u) to -0.06962351375204712,
                 listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(mapOf()).coefficients,
+            ).substitute(mapOf()),
             0.001,
             "test 2"
         )
-        assertContentEquals(
-            mapOf(
+        assertEquals(
+            NumberedPolynomialAsIs(
                 listOf<UInt>() to 0.8597048543814783,
                 listOf(1u) to 0.22997637465889875,
                 listOf(2u) to 0.32675302591924016,
@@ -78,12 +78,12 @@ class NumberedPolynomialUtilTest {
                 listOf(2u, 2u) to -0.015206988092131501,
             ).substitute(mapOf(
                 5 to 0.9211194782050933
-            )).coefficients,
+            )),
             0.001,
             "test 2'"
         )
-        assertContentEquals(
-            mapOf(
+        assertEquals(
+            NumberedPolynomialAsIs(
                 listOf<UInt>() to 0.8597048543814783,
                 listOf(0u, 1u) to 0.4561746111587508,
                 listOf(0u, 2u) to 0.2700930201481795,
@@ -100,12 +100,12 @@ class NumberedPolynomialUtilTest {
                 listOf(2u, 2u) to -0.015206988092131501,
             ).substitute(mapOf(
                 0 to 0.0
-            )).coefficients,
+            )),
             0.001,
             "test 3"
         )
-        assertContentEquals(
-            mapOf(
+        assertEquals(
+            NumberedPolynomialAsIs(
                 listOf<UInt>() to 0.8597048543814783,
                 listOf(0u, 1u) to 0.4561746111587508,
                 listOf(0u, 2u) to 0.2700930201481795,
@@ -123,12 +123,12 @@ class NumberedPolynomialUtilTest {
             ).substitute(mapOf(
                 0 to 0.0,
                 5 to 0.9211194782050933
-            )).coefficients,
+            )),
             0.001,
             "test 3'"
         )
-        assertContentEquals(
-            mapOf(
+        assertEquals(
+            NumberedPolynomialAsIs(
                 listOf<UInt>() to 1.433510890645169,
                 listOf(1u) to 0.6264844682514724,
                 listOf(2u) to 0.8405727903771333,
@@ -145,12 +145,12 @@ class NumberedPolynomialUtilTest {
                 listOf(2u, 2u) to -0.015206988092131501,
             ).substitute(mapOf(
                 1 to 0.8400458576651112
-            )).coefficients,
+            )),
             0.001,
             "test 4"
         )
-        assertContentEquals(
-            mapOf(
+        assertEquals(
+            NumberedPolynomialAsIs(
                 listOf<UInt>() to 1.433510890645169,
                 listOf(1u) to 0.6264844682514724,
                 listOf(2u) to 0.8405727903771333,
@@ -168,12 +168,12 @@ class NumberedPolynomialUtilTest {
             ).substitute(mapOf(
                 1 to 0.8400458576651112,
                 5 to 0.9211194782050933
-            )).coefficients,
+            )),
             0.001,
             "test 4'"
         )
-        assertContentEquals(
-            mapOf(
+        assertEquals(
+            NumberedPolynomialAsIs(
                 listOf<UInt>() to 1.934530767358133,
             ),
             NumberedPolynomialAsIs(
@@ -189,12 +189,12 @@ class NumberedPolynomialUtilTest {
             ).substitute(mapOf(
                 0 to 0.4846192734143442,
                 1 to 0.8400458576651112,
-            )).coefficients,
+            )),
             0.001,
             "test 5"
         )
-        assertContentEquals(
-            mapOf(
+        assertEquals(
+            NumberedPolynomialAsIs(
                 listOf<UInt>() to 1.934530767358133,
             ),
             NumberedPolynomialAsIs(
@@ -211,7 +211,7 @@ class NumberedPolynomialUtilTest {
                 0 to 0.4846192734143442,
                 1 to 0.8400458576651112,
                 5 to 0.9211194782050933
-            )).coefficients,
+            )),
             0.001,
             "test 5'"
         )
@@ -1086,7 +1086,7 @@ class NumberedPolynomialUtilTest {
     }
     @Test
     @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should make denominator r^deg(p),
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
             //  not r^(deg(p)(deg(p)+1)/2) as it is now.
     fun test_Polynomial_substitute_RationalFunction_Map() {
         assertEquals(
@@ -2206,26 +2206,3198 @@ class NumberedPolynomialUtilTest {
         )
     }
     @Test
-    @Ignore
     fun test_RationalFunction_substitute_Double_Map() {
-        // TODO
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(emptyList<UInt>() to 0.0),
+                NumberedPolynomialAsIs(emptyList<UInt>() to 1.0),
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 1.0,
+                    listOf(1u) to -2.0,
+                    listOf(2u) to 1.0,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 1.0,
+                )
+            ).substitute(mapOf(
+                0 to 1.0
+            )),
+            0.001,
+            "test 1"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf()),
+            0.001,
+            "test 2"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                5 to 0.9211194782050933
+            )),
+            0.001,
+            "test 2'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 151.1502229133916,
+                    listOf(0u, 1u) to -262.3790170577034,
+                    listOf(0u, 2u) to 102.5097937392923,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to -367.9969733169944,
+                    listOf(0u, 1u) to 112.4911133334554,
+                    listOf(0u, 2u) to -469.755906895345,
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                0 to -8.11707689492641,
+            )),
+            0.001,
+            "test 3"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 151.1502229133916,
+                    listOf(0u, 1u) to -262.3790170577034,
+                    listOf(0u, 2u) to 102.5097937392923,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to -367.9969733169944,
+                    listOf(0u, 1u) to 112.4911133334554,
+                    listOf(0u, 2u) to -469.755906895345,
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                0 to -8.11707689492641,
+                5 to 0.9211194782050933
+            )),
+            0.001,
+            "test 3'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 14.24074356896978,
+                    listOf(1u) to -17.71987055153461,
+                    listOf(2u) to -2.288056483312383,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 7.480604285873397,
+                    listOf(1u) to -8.43478016688617,
+                    listOf(2u) to -9.88934943900592,
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                1 to 0.795265651276015,
+            )),
+            0.001,
+            "test 4"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 14.24074356896978,
+                    listOf(1u) to -17.71987055153461,
+                    listOf(2u) to -2.288056483312383,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 7.480604285873397,
+                    listOf(1u) to -8.43478016688617,
+                    listOf(2u) to -9.88934943900592,
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                1 to 0.795265651276015,
+                5 to 0.9211194782050933
+            )),
+            0.001,
+            "test 4'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 7.321261307532708,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to -575.6325831127576,
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                0 to -8.11707689492641,
+                1 to 0.795265651276015,
+            )),
+            0.001,
+            "test 5"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 7.321261307532708,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to -575.6325831127576,
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                0 to -8.11707689492641,
+                1 to 0.795265651276015,
+                5 to 0.9211194782050933
+            )),
+            0.001,
+            "test 5'"
+        )
     }
     @Test
-    @Ignore
     fun test_RationalFunction_substitute_Constant_Map() {
-        // TODO
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1),
+                    listOf(1u) to Rational(-2),
+                    listOf(2u) to Rational(1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            ).substitute(RationalField, mapOf(
+                0 to Rational(1)
+            )),
+            "test 1"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(22047, 2450),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-2204953, 147000),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to Rational(7, 5),
+                1 to Rational(-13, 7),
+            )),
+            "test 2"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(22047, 2450),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-2204953, 147000),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to Rational(7, 5),
+                1 to Rational(-13, 7),
+                5 to Rational(-16, 4),
+            )),
+            "test 2'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(4191, 490),
+                    listOf(1u) to Rational(14975, 1176),
+                    listOf(2u) to Rational(-10429, 1176)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-775, 147),
+                    listOf(1u) to Rational(-155, 49),
+                    listOf(2u) to Rational(-757, 280)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                1 to Rational(-13, 7),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(4191, 490),
+                    listOf(1u) to Rational(14975, 1176),
+                    listOf(2u) to Rational(-10429, 1176)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-775, 147),
+                    listOf(1u) to Rational(-155, 49),
+                    listOf(2u) to Rational(-757, 280)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                1 to Rational(-13, 7),
+                5 to Rational(-16, 4),
+            )),
+            "test 3'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-939, 200),
+                    listOf(0u, 1u) to Rational(123, 50),
+                    listOf(0u, 2u) to Rational(1059, 200)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(121, 25),
+                    listOf(0u, 1u) to Rational(-949, 375),
+                    listOf(0u, 2u) to Rational(-1423, 200)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to Rational(7, 5),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-939, 200),
+                    listOf(0u, 1u) to Rational(123, 50),
+                    listOf(0u, 2u) to Rational(1059, 200)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(121, 25),
+                    listOf(0u, 1u) to Rational(-949, 375),
+                    listOf(0u, 2u) to Rational(-1423, 200)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to Rational(7, 5),
+                5 to Rational(-16, 4),
+            )),
+            "test 4'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf<Int, Rational>()),
+            "test 5"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                5 to Rational(-16, 4),
+            )),
+            "test 5'"
+        )
     }
     @Test
-    @Ignore
     fun test_RationalFunction_substitute_Polynomial_Map() {
-        // TODO
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1),
+                    listOf(1u) to Rational(-2),
+                    listOf(2u) to Rational(1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            ).substitute(RationalField, mapOf(
+                0 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            )),
+            "test 1"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(211, 4),
+                    listOf(2u) to Rational(88, 3),
+                    listOf(3u) to Rational(-63, 8),
+                    listOf(4u) to Rational(441, 16),
+                    listOf(0u, 1u) to Rational(-671, 15),
+                    listOf(1u, 1u) to Rational(-551, 21),
+                    listOf(2u, 1u) to Rational(279, 25),
+                    listOf(3u, 1u) to Rational(231, 20),
+                    listOf(0u, 2u) to Rational(-1436, 1575),
+                    listOf(1u, 2u) to Rational(2471, 250),
+                    listOf(2u, 2u) to Rational(-4919, 100),
+                    listOf(0u, 3u) to Rational(-1464, 125),
+                    listOf(1u, 3u) to Rational(-264, 25),
+                    listOf(0u, 4u) to Rational(576, 25),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(-9, 4),
+                    listOf(2u) to Rational(943, 8),
+                    listOf(3u) to Rational(117, 8),
+                    listOf(4u) to Rational(147, 16),
+                    listOf(0u, 1u) to Rational(289, 90),
+                    listOf(1u, 1u) to Rational(-2692, 15),
+                    listOf(2u, 1u) to Rational(-1629, 140),
+                    listOf(3u, 1u) to Rational(77, 20),
+                    listOf(0u, 2u) to Rational(6187, 75),
+                    listOf(1u, 2u) to Rational(-2879, 175),
+                    listOf(2u, 2u) to Rational(-4919, 300),
+                    listOf(0u, 3u) to Rational(336, 25),
+                    listOf(1u, 3u) to Rational(-88, 25),
+                    listOf(0u, 4u) to Rational(192, 25),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to NumberedPolynomialAsIs(
+                    listOf(1u) to Rational(3, 2),
+                    listOf(0u, 1u) to Rational(8, 5),
+                ),
+                1 to NumberedPolynomialAsIs(
+                    listOf(1u) to Rational(7, 2),
+                    listOf(0u, 1u) to Rational(-3, 1),
+                )
+            )),
+            "test 2"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1202861, 210),
+                    listOf(1u) to Rational(-215117, 45),
+                    listOf(2u) to Rational(10889651, 19845),
+                    listOf(3u) to Rational(-3503956, 6615),
+                    listOf(4u) to Rational(809066, 2205),
+                    listOf(5u) to Rational(-9056, 735),
+                    listOf(6u) to Rational(5396, 315),
+                    listOf(7u) to Rational(-752, 147),
+                    listOf(8u) to Rational(16, 49),
+                    listOf(0u, 1u) to Rational(1738469, 1470),
+                    listOf(1u, 1u) to Rational(-926238703, 52920),
+                    listOf(2u, 1u) to Rational(-44113982, 6615),
+                    listOf(3u, 1u) to Rational(10423519, 5292),
+                    listOf(4u, 1u) to Rational(3769712, 2205),
+                    listOf(5u, 1u) to Rational(8905046, 6615),
+                    listOf(6u, 1u) to Rational(1186972, 6615),
+                    listOf(7u, 1u) to Rational(22124, 441),
+                    listOf(8u, 1u) to Rational(-1504, 147),
+                    listOf(0u, 2u) to Rational(-54723628, 2205),
+                    listOf(1u, 2u) to Rational(70109407, 1323),
+                    listOf(2u, 2u) to Rational(151072591, 17640),
+                    listOf(3u, 2u) to Rational(1216428107, 52920),
+                    listOf(4u, 2u) to Rational(2587873193, 317520),
+                    listOf(5u, 2u) to Rational(393536369, 79380),
+                    listOf(6u, 2u) to Rational(137614937, 79380),
+                    listOf(7u, 2u) to Rational(566866, 1323),
+                    listOf(8u, 2u) to Rational(41848, 441),
+                    listOf(0u, 3u) to Rational(-19470406, 2205),
+                    listOf(1u, 3u) to Rational(72514195, 882),
+                    listOf(2u, 3u) to Rational(-78090707, 1764),
+                    listOf(3u, 3u) to Rational(-1988237707, 26460),
+                    listOf(4u, 3u) to Rational(-802137919, 17640),
+                    listOf(5u, 3u) to Rational(-139989463, 5880),
+                    listOf(6u, 3u) to Rational(-26066641, 3780),
+                    listOf(7u, 3u) to Rational(-2363369, 1323),
+                    listOf(8u, 3u) to Rational(-108280, 441),
+                    listOf(0u, 4u) to Rational(14878516, 441),
+                    listOf(1u, 4u) to Rational(-253416724, 2205),
+                    listOf(2u, 4u) to Rational(16699157, 840),
+                    listOf(3u, 4u) to Rational(-105220979, 13230),
+                    listOf(4u, 4u) to Rational(208266383, 5880),
+                    listOf(5u, 4u) to Rational(650135309, 26460),
+                    listOf(6u, 4u) to Rational(123808663, 11760),
+                    listOf(7u, 4u) to Rational(8563385, 2646),
+                    listOf(8u, 4u) to Rational(19721, 49),
+                    listOf(0u, 5u) to Rational(675645, 49),
+                    listOf(1u, 5u) to Rational(-70554077, 588),
+                    listOf(2u, 5u) to Rational(157884029, 980),
+                    listOf(3u, 5u) to Rational(489548623, 4410),
+                    listOf(4u, 5u) to Rational(148540519, 17640),
+                    listOf(5u, 5u) to Rational(-5559551, 392),
+                    listOf(6u, 5u) to Rational(-18335711, 1470),
+                    listOf(7u, 5u) to Rational(-38437, 9),
+                    listOf(8u, 5u) to Rational(-29620, 63),
+                    listOf(0u, 6u) to Rational(-727625, 49),
+                    listOf(1u, 6u) to Rational(7046685, 98),
+                    listOf(2u, 6u) to Rational(-334814231, 7056),
+                    listOf(3u, 6u) to Rational(-243971737, 17640),
+                    listOf(4u, 6u) to Rational(-571116659, 35280),
+                    listOf(5u, 6u) to Rational(567538, 315),
+                    listOf(6u, 6u) to Rational(3199768, 315),
+                    listOf(7u, 6u) to Rational(227744, 63),
+                    listOf(8u, 6u) to Rational(23116, 63),
+                    listOf(0u, 7u) to Rational(-27500, 7),
+                    listOf(1u, 7u) to Rational(120125, 3),
+                    listOf(2u, 7u) to Rational(-279200, 3),
+                    listOf(3u, 7u) to Rational(-100160, 7),
+                    listOf(4u, 7u) to Rational(920452, 21),
+                    listOf(5u, 7u) to Rational(226481, 21),
+                    listOf(6u, 7u) to Rational(-34428, 7),
+                    listOf(7u, 7u) to Rational(-6232, 3),
+                    listOf(8u, 7u) to Rational(-608, 3),
+                    listOf(0u, 8u) to Rational(2500, 1),
+                    listOf(1u, 8u) to Rational(-19000, 1),
+                    listOf(2u, 8u) to Rational(37900, 1),
+                    listOf(3u, 8u) to Rational(-1840, 1),
+                    listOf(4u, 8u) to Rational(-17876, 1),
+                    listOf(5u, 8u) to Rational(-1240, 1),
+                    listOf(6u, 8u) to Rational(2788, 1),
+                    listOf(7u, 8u) to Rational(800, 1),
+                    listOf(8u, 8u) to Rational(64, 1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(162487, 63),
+                    listOf(1u) to Rational(-92713, 54),
+                    listOf(2u) to Rational(802436, 1323),
+                    listOf(3u) to Rational(-55088, 441),
+                    listOf(4u) to Rational(1404034, 9261),
+                    listOf(5u) to Rational(-5804, 1029),
+                    listOf(6u) to Rational(51556, 9261),
+                    listOf(7u) to Rational(-752, 441),
+                    listOf(8u) to Rational(16, 147),
+                    listOf(0u, 1u) to Rational(296071, 441),
+                    listOf(1u, 1u) to Rational(-4991281, 882),
+                    listOf(2u, 1u) to Rational(-18702811, 9261),
+                    listOf(3u, 1u) to Rational(40759043, 27783),
+                    listOf(4u, 1u) to Rational(19768501, 27783),
+                    listOf(5u, 1u) to Rational(14307337, 27783),
+                    listOf(6u, 1u) to Rational(1655684, 27783),
+                    listOf(7u, 1u) to Rational(22124, 1323),
+                    listOf(8u, 1u) to Rational(-1504, 441),
+                    listOf(0u, 2u) to Rational(-27667474, 3087),
+                    listOf(1u, 2u) to Rational(265605901, 12348),
+                    listOf(2u, 2u) to Rational(160360775, 98784),
+                    listOf(3u, 2u) to Rational(1169992093, 148176),
+                    listOf(4u, 2u) to Rational(3978014077, 1333584),
+                    listOf(5u, 2u) to Rational(567058123, 333396),
+                    listOf(6u, 2u) to Rational(205132579, 333396),
+                    listOf(7u, 2u) to Rational(566866, 3969),
+                    listOf(8u, 2u) to Rational(41848, 1323),
+                    listOf(0u, 3u) to Rational(-2228822, 1029),
+                    listOf(1u, 3u) to Rational(80179390, 3087),
+                    listOf(2u, 3u) to Rational(-1378630487, 74088),
+                    listOf(3u, 3u) to Rational(-3385811693, 111132),
+                    listOf(4u, 3u) to Rational(-820686977, 49392),
+                    listOf(5u, 3u) to Rational(-89101027, 10584),
+                    listOf(6u, 3u) to Rational(-37847387, 15876),
+                    listOf(7u, 3u) to Rational(-2363369, 3969),
+                    listOf(8u, 3u) to Rational(-108280, 1323),
+                    listOf(0u, 4u) to Rational(12619982, 1029),
+                    listOf(1u, 4u) to Rational(-277723177, 6174),
+                    listOf(2u, 4u) to Rational(649414169, 49392),
+                    listOf(3u, 4u) to Rational(14457595, 63504),
+                    listOf(4u, 4u) to Rational(139270339, 10584),
+                    listOf(5u, 4u) to Rational(140367961, 15876),
+                    listOf(6u, 4u) to Rational(25467083, 7056),
+                    listOf(7u, 4u) to Rational(8563385, 7938),
+                    listOf(8u, 4u) to Rational(19721, 147),
+                    listOf(0u, 5u) to Rational(643850, 147),
+                    listOf(1u, 5u) to Rational(-11818025, 294),
+                    listOf(2u, 5u) to Rational(33963203, 588),
+                    listOf(3u, 5u) to Rational(207216235, 5292),
+                    listOf(4u, 5u) to Rational(2861021, 1512),
+                    listOf(5u, 5u) to Rational(-6302335, 1176),
+                    listOf(6u, 5u) to Rational(-3738587, 882),
+                    listOf(7u, 5u) to Rational(-38437, 27),
+                    listOf(8u, 5u) to Rational(-29620, 189),
+                    listOf(0u, 6u) to Rational(-248725, 49),
+                    listOf(1u, 6u) to Rational(2478535, 98),
+                    listOf(2u, 6u) to Rational(-399721367, 21168),
+                    listOf(3u, 6u) to Rational(-54309317, 10584),
+                    listOf(4u, 6u) to Rational(-95398327, 21168),
+                    listOf(5u, 6u) to Rational(173750, 189),
+                    listOf(6u, 6u) to Rational(92216, 27),
+                    listOf(7u, 6u) to Rational(227744, 189),
+                    listOf(8u, 6u) to Rational(23116, 189),
+                    listOf(0u, 7u) to Rational(-27500, 21),
+                    listOf(1u, 7u) to Rational(120125, 9),
+                    listOf(2u, 7u) to Rational(-279200, 9),
+                    listOf(3u, 7u) to Rational(-100160, 21),
+                    listOf(4u, 7u) to Rational(920452, 63),
+                    listOf(5u, 7u) to Rational(226481, 63),
+                    listOf(6u, 7u) to Rational(-11476, 7),
+                    listOf(7u, 7u) to Rational(-6232, 9),
+                    listOf(8u, 7u) to Rational(-608, 9),
+                    listOf(0u, 8u) to Rational(2500, 3),
+                    listOf(1u, 8u) to Rational(-19000, 3),
+                    listOf(2u, 8u) to Rational(37900, 3),
+                    listOf(3u, 8u) to Rational(-1840, 3),
+                    listOf(4u, 8u) to Rational(-17876, 3),
+                    listOf(5u, 8u) to Rational(-1240, 3),
+                    listOf(6u, 8u) to Rational(2788, 3),
+                    listOf(7u, 8u) to Rational(800, 3),
+                    listOf(8u, 8u) to Rational(64, 3)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(18, 1),
+                    listOf(1u) to Rational(16, 3),
+                    listOf(2u) to Rational(12, 6),
+                    listOf(0u, 1u) to Rational(13, 1),
+                    listOf(1u, 1u) to Rational(-11, 4),
+                    listOf(2u, 1u) to Rational(-1, 1),
+                    listOf(0u, 2u) to Rational(-10, 1),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(2, 1),
+                ),
+                1 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(8, 2),
+                    listOf(1u) to Rational(-15, 5),
+                    listOf(2u) to Rational(2, 7),
+                    listOf(0u, 1u) to Rational(-18, 7),
+                    listOf(1u, 1u) to Rational(-16, 6),
+                    listOf(2u, 1u) to Rational(-13, 3),
+                    listOf(0u, 2u) to Rational(-5, 1),
+                    listOf(1u, 2u) to Rational(17, 1),
+                    listOf(2u, 2u) to Rational(8, 2),
+                ),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1202861, 210),
+                    listOf(1u) to Rational(-215117, 45),
+                    listOf(2u) to Rational(10889651, 19845),
+                    listOf(3u) to Rational(-3503956, 6615),
+                    listOf(4u) to Rational(809066, 2205),
+                    listOf(5u) to Rational(-9056, 735),
+                    listOf(6u) to Rational(5396, 315),
+                    listOf(7u) to Rational(-752, 147),
+                    listOf(8u) to Rational(16, 49),
+                    listOf(0u, 1u) to Rational(1738469, 1470),
+                    listOf(1u, 1u) to Rational(-926238703, 52920),
+                    listOf(2u, 1u) to Rational(-44113982, 6615),
+                    listOf(3u, 1u) to Rational(10423519, 5292),
+                    listOf(4u, 1u) to Rational(3769712, 2205),
+                    listOf(5u, 1u) to Rational(8905046, 6615),
+                    listOf(6u, 1u) to Rational(1186972, 6615),
+                    listOf(7u, 1u) to Rational(22124, 441),
+                    listOf(8u, 1u) to Rational(-1504, 147),
+                    listOf(0u, 2u) to Rational(-54723628, 2205),
+                    listOf(1u, 2u) to Rational(70109407, 1323),
+                    listOf(2u, 2u) to Rational(151072591, 17640),
+                    listOf(3u, 2u) to Rational(1216428107, 52920),
+                    listOf(4u, 2u) to Rational(2587873193, 317520),
+                    listOf(5u, 2u) to Rational(393536369, 79380),
+                    listOf(6u, 2u) to Rational(137614937, 79380),
+                    listOf(7u, 2u) to Rational(566866, 1323),
+                    listOf(8u, 2u) to Rational(41848, 441),
+                    listOf(0u, 3u) to Rational(-19470406, 2205),
+                    listOf(1u, 3u) to Rational(72514195, 882),
+                    listOf(2u, 3u) to Rational(-78090707, 1764),
+                    listOf(3u, 3u) to Rational(-1988237707, 26460),
+                    listOf(4u, 3u) to Rational(-802137919, 17640),
+                    listOf(5u, 3u) to Rational(-139989463, 5880),
+                    listOf(6u, 3u) to Rational(-26066641, 3780),
+                    listOf(7u, 3u) to Rational(-2363369, 1323),
+                    listOf(8u, 3u) to Rational(-108280, 441),
+                    listOf(0u, 4u) to Rational(14878516, 441),
+                    listOf(1u, 4u) to Rational(-253416724, 2205),
+                    listOf(2u, 4u) to Rational(16699157, 840),
+                    listOf(3u, 4u) to Rational(-105220979, 13230),
+                    listOf(4u, 4u) to Rational(208266383, 5880),
+                    listOf(5u, 4u) to Rational(650135309, 26460),
+                    listOf(6u, 4u) to Rational(123808663, 11760),
+                    listOf(7u, 4u) to Rational(8563385, 2646),
+                    listOf(8u, 4u) to Rational(19721, 49),
+                    listOf(0u, 5u) to Rational(675645, 49),
+                    listOf(1u, 5u) to Rational(-70554077, 588),
+                    listOf(2u, 5u) to Rational(157884029, 980),
+                    listOf(3u, 5u) to Rational(489548623, 4410),
+                    listOf(4u, 5u) to Rational(148540519, 17640),
+                    listOf(5u, 5u) to Rational(-5559551, 392),
+                    listOf(6u, 5u) to Rational(-18335711, 1470),
+                    listOf(7u, 5u) to Rational(-38437, 9),
+                    listOf(8u, 5u) to Rational(-29620, 63),
+                    listOf(0u, 6u) to Rational(-727625, 49),
+                    listOf(1u, 6u) to Rational(7046685, 98),
+                    listOf(2u, 6u) to Rational(-334814231, 7056),
+                    listOf(3u, 6u) to Rational(-243971737, 17640),
+                    listOf(4u, 6u) to Rational(-571116659, 35280),
+                    listOf(5u, 6u) to Rational(567538, 315),
+                    listOf(6u, 6u) to Rational(3199768, 315),
+                    listOf(7u, 6u) to Rational(227744, 63),
+                    listOf(8u, 6u) to Rational(23116, 63),
+                    listOf(0u, 7u) to Rational(-27500, 7),
+                    listOf(1u, 7u) to Rational(120125, 3),
+                    listOf(2u, 7u) to Rational(-279200, 3),
+                    listOf(3u, 7u) to Rational(-100160, 7),
+                    listOf(4u, 7u) to Rational(920452, 21),
+                    listOf(5u, 7u) to Rational(226481, 21),
+                    listOf(6u, 7u) to Rational(-34428, 7),
+                    listOf(7u, 7u) to Rational(-6232, 3),
+                    listOf(8u, 7u) to Rational(-608, 3),
+                    listOf(0u, 8u) to Rational(2500, 1),
+                    listOf(1u, 8u) to Rational(-19000, 1),
+                    listOf(2u, 8u) to Rational(37900, 1),
+                    listOf(3u, 8u) to Rational(-1840, 1),
+                    listOf(4u, 8u) to Rational(-17876, 1),
+                    listOf(5u, 8u) to Rational(-1240, 1),
+                    listOf(6u, 8u) to Rational(2788, 1),
+                    listOf(7u, 8u) to Rational(800, 1),
+                    listOf(8u, 8u) to Rational(64, 1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(162487, 63),
+                    listOf(1u) to Rational(-92713, 54),
+                    listOf(2u) to Rational(802436, 1323),
+                    listOf(3u) to Rational(-55088, 441),
+                    listOf(4u) to Rational(1404034, 9261),
+                    listOf(5u) to Rational(-5804, 1029),
+                    listOf(6u) to Rational(51556, 9261),
+                    listOf(7u) to Rational(-752, 441),
+                    listOf(8u) to Rational(16, 147),
+                    listOf(0u, 1u) to Rational(296071, 441),
+                    listOf(1u, 1u) to Rational(-4991281, 882),
+                    listOf(2u, 1u) to Rational(-18702811, 9261),
+                    listOf(3u, 1u) to Rational(40759043, 27783),
+                    listOf(4u, 1u) to Rational(19768501, 27783),
+                    listOf(5u, 1u) to Rational(14307337, 27783),
+                    listOf(6u, 1u) to Rational(1655684, 27783),
+                    listOf(7u, 1u) to Rational(22124, 1323),
+                    listOf(8u, 1u) to Rational(-1504, 441),
+                    listOf(0u, 2u) to Rational(-27667474, 3087),
+                    listOf(1u, 2u) to Rational(265605901, 12348),
+                    listOf(2u, 2u) to Rational(160360775, 98784),
+                    listOf(3u, 2u) to Rational(1169992093, 148176),
+                    listOf(4u, 2u) to Rational(3978014077, 1333584),
+                    listOf(5u, 2u) to Rational(567058123, 333396),
+                    listOf(6u, 2u) to Rational(205132579, 333396),
+                    listOf(7u, 2u) to Rational(566866, 3969),
+                    listOf(8u, 2u) to Rational(41848, 1323),
+                    listOf(0u, 3u) to Rational(-2228822, 1029),
+                    listOf(1u, 3u) to Rational(80179390, 3087),
+                    listOf(2u, 3u) to Rational(-1378630487, 74088),
+                    listOf(3u, 3u) to Rational(-3385811693, 111132),
+                    listOf(4u, 3u) to Rational(-820686977, 49392),
+                    listOf(5u, 3u) to Rational(-89101027, 10584),
+                    listOf(6u, 3u) to Rational(-37847387, 15876),
+                    listOf(7u, 3u) to Rational(-2363369, 3969),
+                    listOf(8u, 3u) to Rational(-108280, 1323),
+                    listOf(0u, 4u) to Rational(12619982, 1029),
+                    listOf(1u, 4u) to Rational(-277723177, 6174),
+                    listOf(2u, 4u) to Rational(649414169, 49392),
+                    listOf(3u, 4u) to Rational(14457595, 63504),
+                    listOf(4u, 4u) to Rational(139270339, 10584),
+                    listOf(5u, 4u) to Rational(140367961, 15876),
+                    listOf(6u, 4u) to Rational(25467083, 7056),
+                    listOf(7u, 4u) to Rational(8563385, 7938),
+                    listOf(8u, 4u) to Rational(19721, 147),
+                    listOf(0u, 5u) to Rational(643850, 147),
+                    listOf(1u, 5u) to Rational(-11818025, 294),
+                    listOf(2u, 5u) to Rational(33963203, 588),
+                    listOf(3u, 5u) to Rational(207216235, 5292),
+                    listOf(4u, 5u) to Rational(2861021, 1512),
+                    listOf(5u, 5u) to Rational(-6302335, 1176),
+                    listOf(6u, 5u) to Rational(-3738587, 882),
+                    listOf(7u, 5u) to Rational(-38437, 27),
+                    listOf(8u, 5u) to Rational(-29620, 189),
+                    listOf(0u, 6u) to Rational(-248725, 49),
+                    listOf(1u, 6u) to Rational(2478535, 98),
+                    listOf(2u, 6u) to Rational(-399721367, 21168),
+                    listOf(3u, 6u) to Rational(-54309317, 10584),
+                    listOf(4u, 6u) to Rational(-95398327, 21168),
+                    listOf(5u, 6u) to Rational(173750, 189),
+                    listOf(6u, 6u) to Rational(92216, 27),
+                    listOf(7u, 6u) to Rational(227744, 189),
+                    listOf(8u, 6u) to Rational(23116, 189),
+                    listOf(0u, 7u) to Rational(-27500, 21),
+                    listOf(1u, 7u) to Rational(120125, 9),
+                    listOf(2u, 7u) to Rational(-279200, 9),
+                    listOf(3u, 7u) to Rational(-100160, 21),
+                    listOf(4u, 7u) to Rational(920452, 63),
+                    listOf(5u, 7u) to Rational(226481, 63),
+                    listOf(6u, 7u) to Rational(-11476, 7),
+                    listOf(7u, 7u) to Rational(-6232, 9),
+                    listOf(8u, 7u) to Rational(-608, 9),
+                    listOf(0u, 8u) to Rational(2500, 3),
+                    listOf(1u, 8u) to Rational(-19000, 3),
+                    listOf(2u, 8u) to Rational(37900, 3),
+                    listOf(3u, 8u) to Rational(-1840, 3),
+                    listOf(4u, 8u) to Rational(-17876, 3),
+                    listOf(5u, 8u) to Rational(-1240, 3),
+                    listOf(6u, 8u) to Rational(2788, 3),
+                    listOf(7u, 8u) to Rational(800, 3),
+                    listOf(8u, 8u) to Rational(64, 3)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(18, 1),
+                    listOf(1u) to Rational(16, 3),
+                    listOf(2u) to Rational(12, 6),
+                    listOf(0u, 1u) to Rational(13, 1),
+                    listOf(1u, 1u) to Rational(-11, 4),
+                    listOf(2u, 1u) to Rational(-1, 1),
+                    listOf(0u, 2u) to Rational(-10, 1),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(2, 1),
+                ),
+                1 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(8, 2),
+                    listOf(1u) to Rational(-15, 5),
+                    listOf(2u) to Rational(2, 7),
+                    listOf(0u, 1u) to Rational(-18, 7),
+                    listOf(1u, 1u) to Rational(-16, 6),
+                    listOf(2u, 1u) to Rational(-13, 3),
+                    listOf(0u, 2u) to Rational(-5, 1),
+                    listOf(1u, 2u) to Rational(17, 1),
+                    listOf(2u, 2u) to Rational(8, 2),
+                ),
+                5 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-6, 1),
+                    listOf(1u) to Rational(-9, 8),
+                    listOf(2u) to Rational(17, 5),
+                    listOf(0u, 1u) to Rational(-2, 3),
+                    listOf(1u, 1u) to Rational(1, 5),
+                    listOf(2u, 1u) to Rational(-11, 7),
+                    listOf(0u, 2u) to Rational(13, 6),
+                    listOf(1u, 2u) to Rational(-15, 2),
+                    listOf(2u, 2u) to Rational(-14, 4),
+                )
+            )),
+            "test 3'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(493, 6),
+                    listOf(1u) to Rational(-15991, 210),
+                    listOf(2u) to Rational(2734, 63),
+                    listOf(3u) to Rational(-8213, 245),
+                    listOf(4u) to Rational(1843, 147),
+                    listOf(5u) to Rational(-432, 245),
+                    listOf(6u) to Rational(4, 49),
+                    listOf(0u, 1u) to Rational(-66, 1),
+                    listOf(1u, 1u) to Rational(-92924, 2205),
+                    listOf(2u, 1u) to Rational(-257461, 2205),
+                    listOf(3u, 1u) to Rational(58658, 2205),
+                    listOf(4u, 1u) to Rational(-87884, 2205),
+                    listOf(5u, 1u) to Rational(2726, 105),
+                    listOf(6u, 1u) to Rational(-52, 21),
+                    listOf(0u, 2u) to Rational(-17569, 147),
+                    listOf(1u, 2u) to Rational(368819, 735),
+                    listOf(2u, 2u) to Rational(-644626, 6615),
+                    listOf(3u, 2u) to Rational(221738, 945),
+                    listOf(4u, 2u) to Rational(-18022, 945),
+                    listOf(5u, 2u) to Rational(-1201, 315),
+                    listOf(6u, 2u) to Rational(1327, 63),
+                    listOf(0u, 3u) to Rational(240, 7),
+                    listOf(1u, 3u) to Rational(-868, 9),
+                    listOf(2u, 3u) to Rational(-8936, 315),
+                    listOf(3u, 3u) to Rational(-77146, 315),
+                    listOf(4u, 3u) to Rational(-4072, 315),
+                    listOf(5u, 3u) to Rational(-2218, 15),
+                    listOf(6u, 3u) to Rational(-104, 3),
+                    listOf(0u, 4u) to Rational(100, 3),
+                    listOf(1u, 4u) to Rational(-725, 3),
+                    listOf(2u, 4u) to Rational(459, 1),
+                    listOf(3u, 4u) to Rational(-2071, 15),
+                    listOf(4u, 4u) to Rational(2831, 15),
+                    listOf(5u, 4u) to Rational(632, 5),
+                    listOf(6u, 4u) to Rational(16, 1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1255, 9),
+                    listOf(1u) to Rational(-24781, 126),
+                    listOf(2u) to Rational(1195, 14),
+                    listOf(3u) to Rational(-1931, 147),
+                    listOf(4u) to Rational(439, 147),
+                    listOf(5u) to Rational(-172, 343),
+                    listOf(6u) to Rational(4, 147),
+                    listOf(0u, 1u) to Rational(-183, 1),
+                    listOf(1u, 1u) to Rational(-30988, 441),
+                    listOf(2u, 1u) to Rational(-56137, 294),
+                    listOf(3u, 1u) to Rational(204308, 1029),
+                    listOf(4u, 1u) to Rational(-3263, 441),
+                    listOf(5u, 1u) to Rational(2662, 441),
+                    listOf(6u, 1u) to Rational(-52, 63),
+                    listOf(0u, 2u) to Rational(-87119, 294),
+                    listOf(1u, 2u) to Rational(1077919, 686),
+                    listOf(2u, 2u) to Rational(-35209, 147),
+                    listOf(3u, 2u) to Rational(15041, 147),
+                    listOf(4u, 2u) to Rational(240889, 1323),
+                    listOf(5u, 2u) to Rational(27778, 1323),
+                    listOf(6u, 2u) to Rational(1327, 189),
+                    listOf(0u, 3u) to Rational(1620, 7),
+                    listOf(1u, 3u) to Rational(-25716, 49),
+                    listOf(2u, 3u) to Rational(-32078, 49),
+                    listOf(3u, 3u) to Rational(-704038, 441),
+                    listOf(4u, 3u) to Rational(-30190, 63),
+                    listOf(5u, 3u) to Rational(-5414, 63),
+                    listOf(6u, 3u) to Rational(-104, 9),
+                    listOf(0u, 4u) to Rational(225, 1),
+                    listOf(1u, 4u) to Rational(-10560, 7),
+                    listOf(2u, 4u) to Rational(44176, 21),
+                    listOf(3u, 4u) to Rational(28996, 21),
+                    listOf(4u, 4u) to Rational(2405, 7),
+                    listOf(5u, 4u) to Rational(1240, 21),
+                    listOf(6u, 4u) to Rational(16, 3)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                1 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(8, 2),
+                    listOf(1u) to Rational(-15, 5),
+                    listOf(2u) to Rational(2, 7),
+                    listOf(0u, 1u) to Rational(-18, 7),
+                    listOf(1u, 1u) to Rational(-16, 6),
+                    listOf(2u, 1u) to Rational(-13, 3),
+                    listOf(0u, 2u) to Rational(-5, 1),
+                    listOf(1u, 2u) to Rational(17, 1),
+                    listOf(2u, 2u) to Rational(8, 2),
+                ),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(493, 6),
+                    listOf(1u) to Rational(-15991, 210),
+                    listOf(2u) to Rational(2734, 63),
+                    listOf(3u) to Rational(-8213, 245),
+                    listOf(4u) to Rational(1843, 147),
+                    listOf(5u) to Rational(-432, 245),
+                    listOf(6u) to Rational(4, 49),
+                    listOf(0u, 1u) to Rational(-66, 1),
+                    listOf(1u, 1u) to Rational(-92924, 2205),
+                    listOf(2u, 1u) to Rational(-257461, 2205),
+                    listOf(3u, 1u) to Rational(58658, 2205),
+                    listOf(4u, 1u) to Rational(-87884, 2205),
+                    listOf(5u, 1u) to Rational(2726, 105),
+                    listOf(6u, 1u) to Rational(-52, 21),
+                    listOf(0u, 2u) to Rational(-17569, 147),
+                    listOf(1u, 2u) to Rational(368819, 735),
+                    listOf(2u, 2u) to Rational(-644626, 6615),
+                    listOf(3u, 2u) to Rational(221738, 945),
+                    listOf(4u, 2u) to Rational(-18022, 945),
+                    listOf(5u, 2u) to Rational(-1201, 315),
+                    listOf(6u, 2u) to Rational(1327, 63),
+                    listOf(0u, 3u) to Rational(240, 7),
+                    listOf(1u, 3u) to Rational(-868, 9),
+                    listOf(2u, 3u) to Rational(-8936, 315),
+                    listOf(3u, 3u) to Rational(-77146, 315),
+                    listOf(4u, 3u) to Rational(-4072, 315),
+                    listOf(5u, 3u) to Rational(-2218, 15),
+                    listOf(6u, 3u) to Rational(-104, 3),
+                    listOf(0u, 4u) to Rational(100, 3),
+                    listOf(1u, 4u) to Rational(-725, 3),
+                    listOf(2u, 4u) to Rational(459, 1),
+                    listOf(3u, 4u) to Rational(-2071, 15),
+                    listOf(4u, 4u) to Rational(2831, 15),
+                    listOf(5u, 4u) to Rational(632, 5),
+                    listOf(6u, 4u) to Rational(16, 1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1255, 9),
+                    listOf(1u) to Rational(-24781, 126),
+                    listOf(2u) to Rational(1195, 14),
+                    listOf(3u) to Rational(-1931, 147),
+                    listOf(4u) to Rational(439, 147),
+                    listOf(5u) to Rational(-172, 343),
+                    listOf(6u) to Rational(4, 147),
+                    listOf(0u, 1u) to Rational(-183, 1),
+                    listOf(1u, 1u) to Rational(-30988, 441),
+                    listOf(2u, 1u) to Rational(-56137, 294),
+                    listOf(3u, 1u) to Rational(204308, 1029),
+                    listOf(4u, 1u) to Rational(-3263, 441),
+                    listOf(5u, 1u) to Rational(2662, 441),
+                    listOf(6u, 1u) to Rational(-52, 63),
+                    listOf(0u, 2u) to Rational(-87119, 294),
+                    listOf(1u, 2u) to Rational(1077919, 686),
+                    listOf(2u, 2u) to Rational(-35209, 147),
+                    listOf(3u, 2u) to Rational(15041, 147),
+                    listOf(4u, 2u) to Rational(240889, 1323),
+                    listOf(5u, 2u) to Rational(27778, 1323),
+                    listOf(6u, 2u) to Rational(1327, 189),
+                    listOf(0u, 3u) to Rational(1620, 7),
+                    listOf(1u, 3u) to Rational(-25716, 49),
+                    listOf(2u, 3u) to Rational(-32078, 49),
+                    listOf(3u, 3u) to Rational(-704038, 441),
+                    listOf(4u, 3u) to Rational(-30190, 63),
+                    listOf(5u, 3u) to Rational(-5414, 63),
+                    listOf(6u, 3u) to Rational(-104, 9),
+                    listOf(0u, 4u) to Rational(225, 1),
+                    listOf(1u, 4u) to Rational(-10560, 7),
+                    listOf(2u, 4u) to Rational(44176, 21),
+                    listOf(3u, 4u) to Rational(28996, 21),
+                    listOf(4u, 4u) to Rational(2405, 7),
+                    listOf(5u, 4u) to Rational(1240, 21),
+                    listOf(6u, 4u) to Rational(16, 3)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                1 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(8, 2),
+                    listOf(1u) to Rational(-15, 5),
+                    listOf(2u) to Rational(2, 7),
+                    listOf(0u, 1u) to Rational(-18, 7),
+                    listOf(1u, 1u) to Rational(-16, 6),
+                    listOf(2u, 1u) to Rational(-13, 3),
+                    listOf(0u, 2u) to Rational(-5, 1),
+                    listOf(1u, 2u) to Rational(17, 1),
+                    listOf(2u, 2u) to Rational(8, 2),
+                ),
+                5 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-6, 1),
+                    listOf(1u) to Rational(-9, 8),
+                    listOf(2u) to Rational(17, 5),
+                    listOf(0u, 1u) to Rational(-2, 3),
+                    listOf(1u, 1u) to Rational(1, 5),
+                    listOf(2u, 1u) to Rational(-11, 7),
+                    listOf(0u, 2u) to Rational(13, 6),
+                    listOf(1u, 2u) to Rational(-15, 2),
+                    listOf(2u, 2u) to Rational(-14, 4),
+                )
+            )),
+            "test 4'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-409, 6),
+                    listOf(1u) to Rational(-376, 9),
+                    listOf(2u) to Rational(-1781, 81),
+                    listOf(3u) to Rational(-128, 27),
+                    listOf(4u) to Rational(-8, 9),
+                    listOf(0u, 1u) to Rational(18701, 210),
+                    listOf(1u, 1u) to Rational(614183, 7560),
+                    listOf(2u, 1u) to Rational(90941, 1890),
+                    listOf(3u, 1u) to Rational(1802, 135),
+                    listOf(4u, 1u) to Rational(112, 45),
+                    listOf(0u, 2u) to Rational(181421, 315),
+                    listOf(1u, 2u) to Rational(77813, 378),
+                    listOf(2u, 2u) to Rational(598583, 7560),
+                    listOf(3u, 2u) to Rational(85, 27),
+                    listOf(4u, 2u) to Rational(2, 5),
+                    listOf(0u, 3u) to Rational(130997, 315),
+                    listOf(1u, 3u) to Rational(1093, 420),
+                    listOf(2u, 3u) to Rational(9551, 2520),
+                    listOf(3u, 3u) to Rational(-14, 45),
+                    listOf(4u, 3u) to Rational(22, 45),
+                    listOf(0u, 4u) to Rational(-2801, 9),
+                    listOf(1u, 4u) to Rational(4033, 90),
+                    listOf(2u, 4u) to Rational(6429, 80),
+                    listOf(3u, 4u) to Rational(2851, 90),
+                    listOf(4u, 4u) to Rational(293, 45),
+                    listOf(0u, 5u) to Rational(-220, 1),
+                    listOf(1u, 5u) to Rational(127, 1),
+                    listOf(2u, 5u) to Rational(202, 5),
+                    listOf(3u, 5u) to Rational(-63, 5),
+                    listOf(4u, 5u) to Rational(-12, 5),
+                    listOf(0u, 6u) to Rational(100, 1),
+                    listOf(1u, 6u) to Rational(-80, 1),
+                    listOf(2u, 6u) to Rational(-24, 1),
+                    listOf(3u, 6u) to Rational(16, 1),
+                    listOf(4u, 6u) to Rational(4, 1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5407, 9),
+                    listOf(1u) to Rational(9568, 27),
+                    listOf(2u) to Rational(4996, 27),
+                    listOf(3u) to Rational(352, 9),
+                    listOf(4u) to Rational(22, 3),
+                    listOf(0u, 1u) to Rational(104411, 126),
+                    listOf(1u, 1u) to Rational(6001, 126),
+                    listOf(2u, 1u) to Rational(-796, 21),
+                    listOf(3u, 1u) to Rational(-5389, 126),
+                    listOf(4u, 1u) to Rational(-166, 21),
+                    listOf(0u, 2u) to Rational(-35327, 126),
+                    listOf(1u, 2u) to Rational(53, 252),
+                    listOf(2u, 2u) to Rational(849197, 6048),
+                    listOf(3u, 2u) to Rational(22361, 252),
+                    listOf(4u, 2u) to Rational(773, 42),
+                    listOf(0u, 3u) to Rational(-6067, 21),
+                    listOf(1u, 3u) to Rational(39049, 126),
+                    listOf(2u, 3u) to Rational(80303, 1008),
+                    listOf(3u, 3u) to Rational(-3035, 63),
+                    listOf(4u, 3u) to Rational(-209, 21),
+                    listOf(0u, 4u) to Rational(3113, 21),
+                    listOf(1u, 4u) to Rational(-22345, 126),
+                    listOf(2u, 4u) to Rational(-30931, 1008),
+                    listOf(3u, 4u) to Rational(5837, 126),
+                    listOf(4u, 4u) to Rational(229, 21),
+                    listOf(0u, 5u) to Rational(-2120, 21),
+                    listOf(1u, 5u) to Rational(451, 7),
+                    listOf(2u, 5u) to Rational(422, 21),
+                    listOf(3u, 5u) to Rational(-181, 21),
+                    listOf(4u, 5u) to Rational(-40, 21),
+                    listOf(0u, 6u) to Rational(100, 3),
+                    listOf(1u, 6u) to Rational(-80, 3),
+                    listOf(2u, 6u) to Rational(-8, 1),
+                    listOf(3u, 6u) to Rational(16, 3),
+                    listOf(4u, 6u) to Rational(4, 3)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(18, 1),
+                    listOf(1u) to Rational(16, 3),
+                    listOf(2u) to Rational(12, 6),
+                    listOf(0u, 1u) to Rational(13, 1),
+                    listOf(1u, 1u) to Rational(-11, 4),
+                    listOf(2u, 1u) to Rational(-1, 1),
+                    listOf(0u, 2u) to Rational(-10, 1),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(2, 1),
+                ),
+            )),
+            "test 5"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-409, 6),
+                    listOf(1u) to Rational(-376, 9),
+                    listOf(2u) to Rational(-1781, 81),
+                    listOf(3u) to Rational(-128, 27),
+                    listOf(4u) to Rational(-8, 9),
+                    listOf(0u, 1u) to Rational(18701, 210),
+                    listOf(1u, 1u) to Rational(614183, 7560),
+                    listOf(2u, 1u) to Rational(90941, 1890),
+                    listOf(3u, 1u) to Rational(1802, 135),
+                    listOf(4u, 1u) to Rational(112, 45),
+                    listOf(0u, 2u) to Rational(181421, 315),
+                    listOf(1u, 2u) to Rational(77813, 378),
+                    listOf(2u, 2u) to Rational(598583, 7560),
+                    listOf(3u, 2u) to Rational(85, 27),
+                    listOf(4u, 2u) to Rational(2, 5),
+                    listOf(0u, 3u) to Rational(130997, 315),
+                    listOf(1u, 3u) to Rational(1093, 420),
+                    listOf(2u, 3u) to Rational(9551, 2520),
+                    listOf(3u, 3u) to Rational(-14, 45),
+                    listOf(4u, 3u) to Rational(22, 45),
+                    listOf(0u, 4u) to Rational(-2801, 9),
+                    listOf(1u, 4u) to Rational(4033, 90),
+                    listOf(2u, 4u) to Rational(6429, 80),
+                    listOf(3u, 4u) to Rational(2851, 90),
+                    listOf(4u, 4u) to Rational(293, 45),
+                    listOf(0u, 5u) to Rational(-220, 1),
+                    listOf(1u, 5u) to Rational(127, 1),
+                    listOf(2u, 5u) to Rational(202, 5),
+                    listOf(3u, 5u) to Rational(-63, 5),
+                    listOf(4u, 5u) to Rational(-12, 5),
+                    listOf(0u, 6u) to Rational(100, 1),
+                    listOf(1u, 6u) to Rational(-80, 1),
+                    listOf(2u, 6u) to Rational(-24, 1),
+                    listOf(3u, 6u) to Rational(16, 1),
+                    listOf(4u, 6u) to Rational(4, 1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5407, 9),
+                    listOf(1u) to Rational(9568, 27),
+                    listOf(2u) to Rational(4996, 27),
+                    listOf(3u) to Rational(352, 9),
+                    listOf(4u) to Rational(22, 3),
+                    listOf(0u, 1u) to Rational(104411, 126),
+                    listOf(1u, 1u) to Rational(6001, 126),
+                    listOf(2u, 1u) to Rational(-796, 21),
+                    listOf(3u, 1u) to Rational(-5389, 126),
+                    listOf(4u, 1u) to Rational(-166, 21),
+                    listOf(0u, 2u) to Rational(-35327, 126),
+                    listOf(1u, 2u) to Rational(53, 252),
+                    listOf(2u, 2u) to Rational(849197, 6048),
+                    listOf(3u, 2u) to Rational(22361, 252),
+                    listOf(4u, 2u) to Rational(773, 42),
+                    listOf(0u, 3u) to Rational(-6067, 21),
+                    listOf(1u, 3u) to Rational(39049, 126),
+                    listOf(2u, 3u) to Rational(80303, 1008),
+                    listOf(3u, 3u) to Rational(-3035, 63),
+                    listOf(4u, 3u) to Rational(-209, 21),
+                    listOf(0u, 4u) to Rational(3113, 21),
+                    listOf(1u, 4u) to Rational(-22345, 126),
+                    listOf(2u, 4u) to Rational(-30931, 1008),
+                    listOf(3u, 4u) to Rational(5837, 126),
+                    listOf(4u, 4u) to Rational(229, 21),
+                    listOf(0u, 5u) to Rational(-2120, 21),
+                    listOf(1u, 5u) to Rational(451, 7),
+                    listOf(2u, 5u) to Rational(422, 21),
+                    listOf(3u, 5u) to Rational(-181, 21),
+                    listOf(4u, 5u) to Rational(-40, 21),
+                    listOf(0u, 6u) to Rational(100, 3),
+                    listOf(1u, 6u) to Rational(-80, 3),
+                    listOf(2u, 6u) to Rational(-8, 1),
+                    listOf(3u, 6u) to Rational(16, 3),
+                    listOf(4u, 6u) to Rational(4, 3)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(18, 1),
+                    listOf(1u) to Rational(16, 3),
+                    listOf(2u) to Rational(12, 6),
+                    listOf(0u, 1u) to Rational(13, 1),
+                    listOf(1u, 1u) to Rational(-11, 4),
+                    listOf(2u, 1u) to Rational(-1, 1),
+                    listOf(0u, 2u) to Rational(-10, 1),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(2, 1),
+                ),
+                5 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-6, 1),
+                    listOf(1u) to Rational(-9, 8),
+                    listOf(2u) to Rational(17, 5),
+                    listOf(0u, 1u) to Rational(-2, 3),
+                    listOf(1u, 1u) to Rational(1, 5),
+                    listOf(2u, 1u) to Rational(-11, 7),
+                    listOf(0u, 2u) to Rational(13, 6),
+                    listOf(1u, 2u) to Rational(-15, 2),
+                    listOf(2u, 2u) to Rational(-14, 4),
+                )
+            )),
+            "test 5'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf<Int, NumberedPolynomial<Rational>>()),
+            "test 6"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                5 to NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-6, 1),
+                    listOf(1u) to Rational(-9, 8),
+                    listOf(2u) to Rational(17, 5),
+                    listOf(0u, 1u) to Rational(-2, 3),
+                    listOf(1u, 1u) to Rational(1, 5),
+                    listOf(2u, 1u) to Rational(-11, 7),
+                    listOf(0u, 2u) to Rational(13, 6),
+                    listOf(1u, 2u) to Rational(-15, 2),
+                    listOf(2u, 2u) to Rational(-14, 4),
+                )
+            )),
+            "test 6'"
+        )
     }
     @Test
     @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should make denominator r^deg(p),
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
             //  not r^(deg(p)(deg(p)+1)/2) as it is now.
     fun test_RationalFunction_substitute_RationalFunction_Map() {
         // TODO
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1),
+                    listOf(1u) to Rational(-2),
+                    listOf(2u) to Rational(1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                ),
+            ).substitute(RationalField, mapOf(
+                0 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(1)
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(1)
+                    )
+                )
+            )),
+            "test 1"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf(4u) to Rational(-17166109, 793800),
+                    listOf(3u, 1u) to Rational(-930960143, 5556600),
+                    listOf(2u, 2u) to Rational(-144665109691, 350065800),
+                    listOf(1u, 3u) to Rational(-17232577, 52920),
+                    listOf(0u, 4u) to Rational(-68141, 1323),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf(4u) to Rational(-57522533, 14288400),
+                    listOf(3u, 1u) to Rational(-13085162953, 300056400),
+                    listOf(2u, 2u) to Rational(-92093367341, 525098700),
+                    listOf(1u, 3u) to Rational(-1979342797, 6667920),
+                    listOf(0u, 4u) to Rational(-3082727, 21168),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(11, 5),
+                        listOf(0u, 1u) to Rational(8, 4),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(1, 9),
+                        listOf(0u, 1u) to Rational(11, 7),
+                    )
+                ),
+                1 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(-2, 7),
+                        listOf(0u, 1u) to Rational(-4, 3),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(3, 6),
+                        listOf(0u, 1u) to Rational(12, 8),
+                    )
+                ),
+            )),
+            "test 2"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-130778291, 76800),
+                    listOf(1u) to Rational(-445270919, 230400),
+                    listOf(2u) to Rational(44578444937, 14515200),
+                    listOf(3u) to Rational(17329402153, 1555200),
+                    listOf(4u) to Rational(89239926809, 2332800),
+                    listOf(5u) to Rational(2808812267, 145152),
+                    listOf(6u) to Rational(-21362661007, 725760),
+                    listOf(7u) to Rational(-258455443, 2016),
+                    listOf(8u) to Rational(-21454693, 96),
+                    listOf(0u, 1u) to Rational(-1002137, 15360),
+                    listOf(1u, 1u) to Rational(-1704849697, 430080),
+                    listOf(2u, 1u) to Rational(-57657676789, 4838400),
+                    listOf(3u, 1u) to Rational(-101331731, 89600),
+                    listOf(4u, 1u) to Rational(5362280079329, 130636800),
+                    listOf(5u, 1u) to Rational(4069896167053, 130636800),
+                    listOf(6u, 1u) to Rational(12011514569, 544320),
+                    listOf(7u, 1u) to Rational(138293195623, 725760),
+                    listOf(8u, 1u) to Rational(6228779419, 48384),
+                    listOf(0u, 2u) to Rational(-32395872823, 8064000),
+                    listOf(1u, 2u) to Rational(-7398505523, 2304000),
+                    listOf(2u, 2u) to Rational(95217051699521, 3048192000),
+                    listOf(3u, 2u) to Rational(198026968812079, 3657830400),
+                    listOf(4u, 2u) to Rational(4291645618499, 228614400),
+                    listOf(5u, 2u) to Rational(-33211690942439, 914457600),
+                    listOf(6u, 2u) to Rational(-637385538163153, 1371686400),
+                    listOf(7u, 2u) to Rational(-138671528276273, 182891520),
+                    listOf(8u, 2u) to Rational(-14566368751, 217728),
+                    listOf(0u, 3u) to Rational(-10538718719, 2016000),
+                    listOf(1u, 3u) to Rational(-1844485375199, 84672000),
+                    listOf(2u, 3u) to Rational(103968665891, 12096000),
+                    listOf(3u, 3u) to Rational(175402107278351, 1828915200),
+                    listOf(4u, 3u) to Rational(8020699588879, 114307200),
+                    listOf(5u, 3u) to Rational(3414841894991, 38102400),
+                    listOf(6u, 3u) to Rational(1848405591611, 4665600),
+                    listOf(7u, 3u) to Rational(39486708738989, 137168640),
+                    listOf(8u, 3u) to Rational(255926289517, 9144576),
+                    listOf(0u, 4u) to Rational(-655379564629, 105840000),
+                    listOf(1u, 4u) to Rational(-208336039441, 127008000),
+                    listOf(2u, 4u) to Rational(40173146771411, 1143072000),
+                    listOf(3u, 4u) to Rational(150473493581239, 2667168000),
+                    listOf(4u, 4u) to Rational(38833783990483, 1143072000),
+                    listOf(5u, 4u) to Rational(-1963676248203053, 4800902400),
+                    listOf(6u, 4u) to Rational(-2598759412825747, 3200601600),
+                    listOf(7u, 4u) to Rational(-192895352019667, 1280240640),
+                    listOf(8u, 4u) to Rational(3737382679, 6858432),
+                    listOf(0u, 5u) to Rational(-16959378721, 1890000),
+                    listOf(1u, 5u) to Rational(-1864802244743, 79380000),
+                    listOf(2u, 5u) to Rational(13449261536489, 666792000),
+                    listOf(3u, 5u) to Rational(215272234137329, 2667168000),
+                    listOf(4u, 5u) to Rational(6040691379277, 83349000),
+                    listOf(5u, 5u) to Rational(153687143525887, 800150400),
+                    listOf(6u, 5u) to Rational(475602854903563, 2400451200),
+                    listOf(7u, 5u) to Rational(27315599358749, 640120320),
+                    listOf(8u, 5u) to Rational(-2630413357, 10668672),
+                    listOf(0u, 6u) to Rational(-6654999511, 2646000),
+                    listOf(1u, 6u) to Rational(-67885252327, 15876000),
+                    listOf(2u, 6u) to Rational(5786776220983, 2667168000),
+                    listOf(3u, 6u) to Rational(60615922629083, 1143072000),
+                    listOf(4u, 6u) to Rational(-34703539637627407, 672126336000),
+                    listOf(5u, 6u) to Rational(-744694192134101, 2240421120),
+                    listOf(6u, 6u) to Rational(-1782470617231, 14817600),
+                    listOf(7u, 6u) to Rational(59123208433, 8890560),
+                    listOf(8u, 6u) to Rational(-141653, 5292),
+                    listOf(0u, 7u) to Rational(-338051969, 441000),
+                    listOf(1u, 7u) to Rational(468850013, 1764000),
+                    listOf(2u, 7u) to Rational(2102343426101, 222264000),
+                    listOf(3u, 7u) to Rational(7836130602007, 1333584000),
+                    listOf(4u, 7u) to Rational(16239111865997, 746807040),
+                    listOf(5u, 7u) to Rational(3824649185383, 88905600),
+                    listOf(6u, 7u) to Rational(56058614459, 3457440),
+                    listOf(7u, 7u) to Rational(-396766339, 493920),
+                    listOf(8u, 7u) to Rational(-165147, 2744),
+                    listOf(0u, 8u) to Rational(-3088619, 58800),
+                    listOf(1u, 8u) to Rational(155343347, 88200),
+                    listOf(2u, 8u) to Rational(100098736469, 7408800),
+                    listOf(3u, 8u) to Rational(109725511381, 7408800),
+                    listOf(4u, 8u) to Rational(-2431199641013, 59270400),
+                    listOf(5u, 8u) to Rational(-102872383249, 3457440),
+                    listOf(6u, 8u) to Rational(1449461309, 576240),
+                    listOf(7u, 8u) to Rational(812775, 1372),
+                    listOf(8u, 8u) to Rational(-16461, 343)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(164202773, 230400),
+                    listOf(1u) to Rational(-70345303, 518400),
+                    listOf(2u) to Rational(-4229702731, 4665600),
+                    listOf(3u) to Rational(3262171027, 6998400),
+                    listOf(4u) to Rational(-25423104169, 13996800),
+                    listOf(5u) to Rational(64061869, 349920),
+                    listOf(6u) to Rational(-1655878091, 116640),
+                    listOf(7u) to Rational(-7991441, 648),
+                    listOf(8u) to Rational(-502591, 18),
+                    listOf(0u, 1u) to Rational(-8780429, 3840),
+                    listOf(1u, 1u) to Rational(434272361, 115200),
+                    listOf(2u, 1u) to Rational(429825727, 41472),
+                    listOf(3u, 1u) to Rational(-10066790339, 6998400),
+                    listOf(4u, 1u) to Rational(70022035471, 20995200),
+                    listOf(5u, 1u) to Rational(-32070283493, 1399680),
+                    listOf(6u, 1u) to Rational(-22051101001, 1399680),
+                    listOf(7u, 1u) to Rational(-126493427, 12960),
+                    listOf(8u, 1u) to Rational(3050245, 864),
+                    listOf(0u, 2u) to Rational(-1194654631, 345600),
+                    listOf(1u, 2u) to Rational(-542961452671, 31104000),
+                    listOf(2u, 2u) to Rational(-234000873607, 48988800),
+                    listOf(3u, 2u) to Rational(140520538087, 3628800),
+                    listOf(4u, 2u) to Rational(9215088876563, 130636800),
+                    listOf(5u, 2u) to Rational(27590569647253, 293932800),
+                    listOf(6u, 2u) to Rational(5129057792891, 97977600),
+                    listOf(7u, 2u) to Rational(-106334191, 5103),
+                    listOf(8u, 2u) to Rational(-1024113911, 435456),
+                    listOf(0u, 3u) to Rational(76223843, 6000),
+                    listOf(1u, 3u) to Rational(57425857357, 2592000),
+                    listOf(2u, 3u) to Rational(-2044736497573, 46656000),
+                    listOf(3u, 3u) to Rational(-26155810120031, 293932800),
+                    listOf(4u, 3u) to Rational(-1064419459813, 6998400),
+                    listOf(5u, 3u) to Rational(-753782018389, 4082400),
+                    listOf(6u, 3u) to Rational(-291973360873, 2799360),
+                    listOf(7u, 3u) to Rational(-46372122599, 816480),
+                    listOf(8u, 3u) to Rational(3579859657, 653184),
+                    listOf(0u, 4u) to Rational(-13374241901, 4320000),
+                    listOf(1u, 4u) to Rational(306606499811, 54432000),
+                    listOf(2u, 4u) to Rational(964267124745437, 13716864000),
+                    listOf(3u, 4u) to Rational(21603809415373, 182891520),
+                    listOf(4u, 4u) to Rational(1097860214654027, 6858432000),
+                    listOf(5u, 4u) to Rational(161615254570669, 914457600),
+                    listOf(6u, 4u) to Rational(758415239461, 22861440),
+                    listOf(7u, 4u) to Rational(2585568355471, 274337280),
+                    listOf(8u, 4u) to Rational(-70433747863, 9144576),
+                    listOf(0u, 5u) to Rational(-9582586217, 2520000),
+                    listOf(1u, 5u) to Rational(-19093471394171, 635040000),
+                    listOf(2u, 5u) to Rational(-13010261944411, 381024000),
+                    listOf(3u, 5u) to Rational(-259039825301861, 4572288000),
+                    listOf(4u, 5u) to Rational(-305081119071079, 2286144000),
+                    listOf(5u, 5u) to Rational(-1923114383311, 19595520),
+                    listOf(6u, 5u) to Rational(-14181787253231, 228614400),
+                    listOf(7u, 5u) to Rational(-3959584789, 4354560),
+                    listOf(8u, 5u) to Rational(4691742523, 762048),
+                    listOf(0u, 6u) to Rational(-588323437, 180000),
+                    listOf(1u, 6u) to Rational(5952234691, 52920000),
+                    listOf(2u, 6u) to Rational(21001851056959, 1088640000),
+                    listOf(3u, 6u) to Rational(84668034357563, 2133734400),
+                    listOf(4u, 6u) to Rational(2029754605811557, 25604812800),
+                    listOf(5u, 6u) to Rational(11721216739823, 426746880),
+                    listOf(6u, 6u) to Rational(-8275903187003, 2133734400),
+                    listOf(7u, 6u) to Rational(-4730447299, 2540160),
+                    listOf(8u, 6u) to Rational(-46069985, 21168),
+                    listOf(0u, 7u) to Rational(-75711301, 117600),
+                    listOf(1u, 7u) to Rational(32430417413, 7056000),
+                    listOf(2u, 7u) to Rational(677988533153, 98784000),
+                    listOf(3u, 7u) to Rational(-948417645827, 71124480),
+                    listOf(4u, 7u) to Rational(-11320265215207, 711244800),
+                    listOf(5u, 7u) to Rational(-676438627783, 50803200),
+                    listOf(6u, 7u) to Rational(-7382274253, 1975680),
+                    listOf(7u, 7u) to Rational(6505733, 2205),
+                    listOf(8u, 7u) to Rational(450137, 882),
+                    listOf(0u, 8u) to Rational(-8368253, 78400),
+                    listOf(1u, 8u) to Rational(6833783, 117600),
+                    listOf(2u, 8u) to Rational(4528971133, 5927040),
+                    listOf(3u, 8u) to Rational(146252636617, 29635200),
+                    listOf(4u, 8u) to Rational(8321882556889, 1659571200),
+                    listOf(5u, 8u) to Rational(-4686033011, 1975680),
+                    listOf(6u, 8u) to Rational(-1074445963, 987840),
+                    listOf(7u, 8u) to Rational(-142313, 588),
+                    listOf(8u, 8u) to Rational(-4281, 49)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-17, 5),
+                        listOf(1u) to Rational(2, 6),
+                        listOf(2u) to Rational(14, 1),
+                        listOf(0u, 1u) to Rational(-6, 6),
+                        listOf(1u, 1u) to Rational(-7, 3),
+                        listOf(2u, 1u) to Rational(-2, 9),
+                        listOf(0u, 2u) to Rational(-9, 6),
+                        listOf(1u, 2u) to Rational(17, 4),
+                        listOf(2u, 2u) to Rational(2, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(5, 4),
+                        listOf(1u) to Rational(-5, 9),
+                        listOf(2u) to Rational(-3, 6),
+                        listOf(0u, 1u) to Rational(6, 5),
+                        listOf(1u, 1u) to Rational(14, 5),
+                        listOf(2u, 1u) to Rational(5, 2),
+                        listOf(0u, 2u) to Rational(-18, 7),
+                        listOf(1u, 2u) to Rational(-8, 2),
+                        listOf(2u, 2u) to Rational(18, 9),
+                    )
+                ),
+                1 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(14, 4),
+                        listOf(1u) to Rational(7, 6),
+                        listOf(2u) to Rational(7, 2),
+                        listOf(0u, 1u) to Rational(-15, 2),
+                        listOf(1u, 1u) to Rational(-13, 8),
+                        listOf(2u, 1u) to Rational(-14, 3),
+                        listOf(0u, 2u) to Rational(-7, 6),
+                        listOf(1u, 2u) to Rational(7, 4),
+                        listOf(2u, 2u) to Rational(9, 7),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-7, 4),
+                        listOf(1u) to Rational(-6, 3),
+                        listOf(2u) to Rational(-16, 2),
+                        listOf(0u, 1u) to Rational(-15, 5),
+                        listOf(1u, 1u) to Rational(4, 6),
+                        listOf(2u, 1u) to Rational(5, 4),
+                        listOf(0u, 2u) to Rational(-12, 5),
+                        listOf(1u, 2u) to Rational(-18, 2),
+                        listOf(2u, 2u) to Rational(6, 7),
+                    )
+                ),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-130778291, 76800),
+                    listOf(1u) to Rational(-445270919, 230400),
+                    listOf(2u) to Rational(44578444937, 14515200),
+                    listOf(3u) to Rational(17329402153, 1555200),
+                    listOf(4u) to Rational(89239926809, 2332800),
+                    listOf(5u) to Rational(2808812267, 145152),
+                    listOf(6u) to Rational(-21362661007, 725760),
+                    listOf(7u) to Rational(-258455443, 2016),
+                    listOf(8u) to Rational(-21454693, 96),
+                    listOf(0u, 1u) to Rational(-1002137, 15360),
+                    listOf(1u, 1u) to Rational(-1704849697, 430080),
+                    listOf(2u, 1u) to Rational(-57657676789, 4838400),
+                    listOf(3u, 1u) to Rational(-101331731, 89600),
+                    listOf(4u, 1u) to Rational(5362280079329, 130636800),
+                    listOf(5u, 1u) to Rational(4069896167053, 130636800),
+                    listOf(6u, 1u) to Rational(12011514569, 544320),
+                    listOf(7u, 1u) to Rational(138293195623, 725760),
+                    listOf(8u, 1u) to Rational(6228779419, 48384),
+                    listOf(0u, 2u) to Rational(-32395872823, 8064000),
+                    listOf(1u, 2u) to Rational(-7398505523, 2304000),
+                    listOf(2u, 2u) to Rational(95217051699521, 3048192000),
+                    listOf(3u, 2u) to Rational(198026968812079, 3657830400),
+                    listOf(4u, 2u) to Rational(4291645618499, 228614400),
+                    listOf(5u, 2u) to Rational(-33211690942439, 914457600),
+                    listOf(6u, 2u) to Rational(-637385538163153, 1371686400),
+                    listOf(7u, 2u) to Rational(-138671528276273, 182891520),
+                    listOf(8u, 2u) to Rational(-14566368751, 217728),
+                    listOf(0u, 3u) to Rational(-10538718719, 2016000),
+                    listOf(1u, 3u) to Rational(-1844485375199, 84672000),
+                    listOf(2u, 3u) to Rational(103968665891, 12096000),
+                    listOf(3u, 3u) to Rational(175402107278351, 1828915200),
+                    listOf(4u, 3u) to Rational(8020699588879, 114307200),
+                    listOf(5u, 3u) to Rational(3414841894991, 38102400),
+                    listOf(6u, 3u) to Rational(1848405591611, 4665600),
+                    listOf(7u, 3u) to Rational(39486708738989, 137168640),
+                    listOf(8u, 3u) to Rational(255926289517, 9144576),
+                    listOf(0u, 4u) to Rational(-655379564629, 105840000),
+                    listOf(1u, 4u) to Rational(-208336039441, 127008000),
+                    listOf(2u, 4u) to Rational(40173146771411, 1143072000),
+                    listOf(3u, 4u) to Rational(150473493581239, 2667168000),
+                    listOf(4u, 4u) to Rational(38833783990483, 1143072000),
+                    listOf(5u, 4u) to Rational(-1963676248203053, 4800902400),
+                    listOf(6u, 4u) to Rational(-2598759412825747, 3200601600),
+                    listOf(7u, 4u) to Rational(-192895352019667, 1280240640),
+                    listOf(8u, 4u) to Rational(3737382679, 6858432),
+                    listOf(0u, 5u) to Rational(-16959378721, 1890000),
+                    listOf(1u, 5u) to Rational(-1864802244743, 79380000),
+                    listOf(2u, 5u) to Rational(13449261536489, 666792000),
+                    listOf(3u, 5u) to Rational(215272234137329, 2667168000),
+                    listOf(4u, 5u) to Rational(6040691379277, 83349000),
+                    listOf(5u, 5u) to Rational(153687143525887, 800150400),
+                    listOf(6u, 5u) to Rational(475602854903563, 2400451200),
+                    listOf(7u, 5u) to Rational(27315599358749, 640120320),
+                    listOf(8u, 5u) to Rational(-2630413357, 10668672),
+                    listOf(0u, 6u) to Rational(-6654999511, 2646000),
+                    listOf(1u, 6u) to Rational(-67885252327, 15876000),
+                    listOf(2u, 6u) to Rational(5786776220983, 2667168000),
+                    listOf(3u, 6u) to Rational(60615922629083, 1143072000),
+                    listOf(4u, 6u) to Rational(-34703539637627407, 672126336000),
+                    listOf(5u, 6u) to Rational(-744694192134101, 2240421120),
+                    listOf(6u, 6u) to Rational(-1782470617231, 14817600),
+                    listOf(7u, 6u) to Rational(59123208433, 8890560),
+                    listOf(8u, 6u) to Rational(-141653, 5292),
+                    listOf(0u, 7u) to Rational(-338051969, 441000),
+                    listOf(1u, 7u) to Rational(468850013, 1764000),
+                    listOf(2u, 7u) to Rational(2102343426101, 222264000),
+                    listOf(3u, 7u) to Rational(7836130602007, 1333584000),
+                    listOf(4u, 7u) to Rational(16239111865997, 746807040),
+                    listOf(5u, 7u) to Rational(3824649185383, 88905600),
+                    listOf(6u, 7u) to Rational(56058614459, 3457440),
+                    listOf(7u, 7u) to Rational(-396766339, 493920),
+                    listOf(8u, 7u) to Rational(-165147, 2744),
+                    listOf(0u, 8u) to Rational(-3088619, 58800),
+                    listOf(1u, 8u) to Rational(155343347, 88200),
+                    listOf(2u, 8u) to Rational(100098736469, 7408800),
+                    listOf(3u, 8u) to Rational(109725511381, 7408800),
+                    listOf(4u, 8u) to Rational(-2431199641013, 59270400),
+                    listOf(5u, 8u) to Rational(-102872383249, 3457440),
+                    listOf(6u, 8u) to Rational(1449461309, 576240),
+                    listOf(7u, 8u) to Rational(812775, 1372),
+                    listOf(8u, 8u) to Rational(-16461, 343)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(164202773, 230400),
+                    listOf(1u) to Rational(-70345303, 518400),
+                    listOf(2u) to Rational(-4229702731, 4665600),
+                    listOf(3u) to Rational(3262171027, 6998400),
+                    listOf(4u) to Rational(-25423104169, 13996800),
+                    listOf(5u) to Rational(64061869, 349920),
+                    listOf(6u) to Rational(-1655878091, 116640),
+                    listOf(7u) to Rational(-7991441, 648),
+                    listOf(8u) to Rational(-502591, 18),
+                    listOf(0u, 1u) to Rational(-8780429, 3840),
+                    listOf(1u, 1u) to Rational(434272361, 115200),
+                    listOf(2u, 1u) to Rational(429825727, 41472),
+                    listOf(3u, 1u) to Rational(-10066790339, 6998400),
+                    listOf(4u, 1u) to Rational(70022035471, 20995200),
+                    listOf(5u, 1u) to Rational(-32070283493, 1399680),
+                    listOf(6u, 1u) to Rational(-22051101001, 1399680),
+                    listOf(7u, 1u) to Rational(-126493427, 12960),
+                    listOf(8u, 1u) to Rational(3050245, 864),
+                    listOf(0u, 2u) to Rational(-1194654631, 345600),
+                    listOf(1u, 2u) to Rational(-542961452671, 31104000),
+                    listOf(2u, 2u) to Rational(-234000873607, 48988800),
+                    listOf(3u, 2u) to Rational(140520538087, 3628800),
+                    listOf(4u, 2u) to Rational(9215088876563, 130636800),
+                    listOf(5u, 2u) to Rational(27590569647253, 293932800),
+                    listOf(6u, 2u) to Rational(5129057792891, 97977600),
+                    listOf(7u, 2u) to Rational(-106334191, 5103),
+                    listOf(8u, 2u) to Rational(-1024113911, 435456),
+                    listOf(0u, 3u) to Rational(76223843, 6000),
+                    listOf(1u, 3u) to Rational(57425857357, 2592000),
+                    listOf(2u, 3u) to Rational(-2044736497573, 46656000),
+                    listOf(3u, 3u) to Rational(-26155810120031, 293932800),
+                    listOf(4u, 3u) to Rational(-1064419459813, 6998400),
+                    listOf(5u, 3u) to Rational(-753782018389, 4082400),
+                    listOf(6u, 3u) to Rational(-291973360873, 2799360),
+                    listOf(7u, 3u) to Rational(-46372122599, 816480),
+                    listOf(8u, 3u) to Rational(3579859657, 653184),
+                    listOf(0u, 4u) to Rational(-13374241901, 4320000),
+                    listOf(1u, 4u) to Rational(306606499811, 54432000),
+                    listOf(2u, 4u) to Rational(964267124745437, 13716864000),
+                    listOf(3u, 4u) to Rational(21603809415373, 182891520),
+                    listOf(4u, 4u) to Rational(1097860214654027, 6858432000),
+                    listOf(5u, 4u) to Rational(161615254570669, 914457600),
+                    listOf(6u, 4u) to Rational(758415239461, 22861440),
+                    listOf(7u, 4u) to Rational(2585568355471, 274337280),
+                    listOf(8u, 4u) to Rational(-70433747863, 9144576),
+                    listOf(0u, 5u) to Rational(-9582586217, 2520000),
+                    listOf(1u, 5u) to Rational(-19093471394171, 635040000),
+                    listOf(2u, 5u) to Rational(-13010261944411, 381024000),
+                    listOf(3u, 5u) to Rational(-259039825301861, 4572288000),
+                    listOf(4u, 5u) to Rational(-305081119071079, 2286144000),
+                    listOf(5u, 5u) to Rational(-1923114383311, 19595520),
+                    listOf(6u, 5u) to Rational(-14181787253231, 228614400),
+                    listOf(7u, 5u) to Rational(-3959584789, 4354560),
+                    listOf(8u, 5u) to Rational(4691742523, 762048),
+                    listOf(0u, 6u) to Rational(-588323437, 180000),
+                    listOf(1u, 6u) to Rational(5952234691, 52920000),
+                    listOf(2u, 6u) to Rational(21001851056959, 1088640000),
+                    listOf(3u, 6u) to Rational(84668034357563, 2133734400),
+                    listOf(4u, 6u) to Rational(2029754605811557, 25604812800),
+                    listOf(5u, 6u) to Rational(11721216739823, 426746880),
+                    listOf(6u, 6u) to Rational(-8275903187003, 2133734400),
+                    listOf(7u, 6u) to Rational(-4730447299, 2540160),
+                    listOf(8u, 6u) to Rational(-46069985, 21168),
+                    listOf(0u, 7u) to Rational(-75711301, 117600),
+                    listOf(1u, 7u) to Rational(32430417413, 7056000),
+                    listOf(2u, 7u) to Rational(677988533153, 98784000),
+                    listOf(3u, 7u) to Rational(-948417645827, 71124480),
+                    listOf(4u, 7u) to Rational(-11320265215207, 711244800),
+                    listOf(5u, 7u) to Rational(-676438627783, 50803200),
+                    listOf(6u, 7u) to Rational(-7382274253, 1975680),
+                    listOf(7u, 7u) to Rational(6505733, 2205),
+                    listOf(8u, 7u) to Rational(450137, 882),
+                    listOf(0u, 8u) to Rational(-8368253, 78400),
+                    listOf(1u, 8u) to Rational(6833783, 117600),
+                    listOf(2u, 8u) to Rational(4528971133, 5927040),
+                    listOf(3u, 8u) to Rational(146252636617, 29635200),
+                    listOf(4u, 8u) to Rational(8321882556889, 1659571200),
+                    listOf(5u, 8u) to Rational(-4686033011, 1975680),
+                    listOf(6u, 8u) to Rational(-1074445963, 987840),
+                    listOf(7u, 8u) to Rational(-142313, 588),
+                    listOf(8u, 8u) to Rational(-4281, 49)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-17, 5),
+                        listOf(1u) to Rational(2, 6),
+                        listOf(2u) to Rational(14, 1),
+                        listOf(0u, 1u) to Rational(-6, 6),
+                        listOf(1u, 1u) to Rational(-7, 3),
+                        listOf(2u, 1u) to Rational(-2, 9),
+                        listOf(0u, 2u) to Rational(-9, 6),
+                        listOf(1u, 2u) to Rational(17, 4),
+                        listOf(2u, 2u) to Rational(2, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(5, 4),
+                        listOf(1u) to Rational(-5, 9),
+                        listOf(2u) to Rational(-3, 6),
+                        listOf(0u, 1u) to Rational(6, 5),
+                        listOf(1u, 1u) to Rational(14, 5),
+                        listOf(2u, 1u) to Rational(5, 2),
+                        listOf(0u, 2u) to Rational(-18, 7),
+                        listOf(1u, 2u) to Rational(-8, 2),
+                        listOf(2u, 2u) to Rational(18, 9),
+                    )
+                ),
+                1 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(14, 4),
+                        listOf(1u) to Rational(7, 6),
+                        listOf(2u) to Rational(7, 2),
+                        listOf(0u, 1u) to Rational(-15, 2),
+                        listOf(1u, 1u) to Rational(-13, 8),
+                        listOf(2u, 1u) to Rational(-14, 3),
+                        listOf(0u, 2u) to Rational(-7, 6),
+                        listOf(1u, 2u) to Rational(7, 4),
+                        listOf(2u, 2u) to Rational(9, 7),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-7, 4),
+                        listOf(1u) to Rational(-6, 3),
+                        listOf(2u) to Rational(-16, 2),
+                        listOf(0u, 1u) to Rational(-15, 5),
+                        listOf(1u, 1u) to Rational(4, 6),
+                        listOf(2u, 1u) to Rational(5, 4),
+                        listOf(0u, 2u) to Rational(-12, 5),
+                        listOf(1u, 2u) to Rational(-18, 2),
+                        listOf(2u, 2u) to Rational(6, 7),
+                    )
+                ),
+                5 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(5, 8),
+                        listOf(1u) to Rational(-12, 6),
+                        listOf(2u) to Rational(7, 6),
+                        listOf(0u, 1u) to Rational(-10, 4),
+                        listOf(1u, 1u) to Rational(-7, 6),
+                        listOf(2u, 1u) to Rational(8, 9),
+                        listOf(0u, 2u) to Rational(16, 3),
+                        listOf(1u, 2u) to Rational(-13, 4),
+                        listOf(2u, 2u) to Rational(5, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(10, 6),
+                        listOf(1u) to Rational(-18, 6),
+                        listOf(2u) to Rational(5, 1),
+                        listOf(0u, 1u) to Rational(17, 7),
+                        listOf(1u, 1u) to Rational(8, 4),
+                        listOf(2u, 1u) to Rational(-4, 9),
+                        listOf(0u, 2u) to Rational(-6, 5),
+                        listOf(1u, 2u) to Rational(-15, 8),
+                        listOf(2u, 2u) to Rational(-18, 5),
+                    )
+                ),
+            )),
+            "test 3'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(2303, 64),
+                    listOf(1u) to Rational(31843, 192),
+                    listOf(2u) to Rational(118891, 576),
+                    listOf(3u) to Rational(94453, 168),
+                    listOf(4u) to Rational(-179203, 1512),
+                    listOf(5u) to Rational(-16979, 126),
+                    listOf(6u) to Rational(-13499, 12),
+                    listOf(0u, 1u) to Rational(-4767, 64),
+                    listOf(1u, 1u) to Rational(-58689, 256),
+                    listOf(2u, 1u) to Rational(-757333, 4032),
+                    listOf(3u, 1u) to Rational(-4921205, 4032),
+                    listOf(4u, 1u) to Rational(-2930815, 4032),
+                    listOf(5u, 1u) to Rational(-398803, 1512),
+                    listOf(6u, 1u) to Rational(18835, 36),
+                    listOf(0u, 2u) to Rational(224101, 960),
+                    listOf(1u, 2u) to Rational(9139699, 40320),
+                    listOf(2u, 2u) to Rational(3848803, 5760),
+                    listOf(3u, 2u) to Rational(93102371, 241920),
+                    listOf(4u, 2u) to Rational(-65821229, 141120),
+                    listOf(5u, 2u) to Rational(-15675899, 7056),
+                    listOf(6u, 2u) to Rational(10459, 189),
+                    listOf(0u, 3u) to Rational(2411, 16),
+                    listOf(1u, 3u) to Rational(1294543, 10080),
+                    listOf(2u, 3u) to Rational(-1740199, 1440),
+                    listOf(3u, 3u) to Rational(-266994841, 282240),
+                    listOf(4u, 3u) to Rational(-41261893, 211680),
+                    listOf(5u, 3u) to Rational(1717357, 3528),
+                    listOf(6u, 3u) to Rational(69, 14),
+                    listOf(0u, 4u) to Rational(13231, 360),
+                    listOf(1u, 4u) to Rational(4858831, 25200),
+                    listOf(2u, 4u) to Rational(15565759, 75600),
+                    listOf(3u, 4u) to Rational(-15583391, 35280),
+                    listOf(4u, 4u) to Rational(-13345747, 11760),
+                    listOf(5u, 4u) to Rational(140103, 686),
+                    listOf(6u, 4u) to Rational(-765, 49)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(31409, 576),
+                    listOf(1u) to Rational(-337099, 1728),
+                    listOf(2u) to Rational(-211429, 1728),
+                    listOf(3u) to Rational(-259241, 432),
+                    listOf(4u) to Rational(-13777, 36),
+                    listOf(5u) to Rational(-41389, 72),
+                    listOf(6u) to Rational(-7679, 48),
+                    listOf(0u, 1u) to Rational(-3269, 12),
+                    listOf(1u, 1u) to Rational(629569, 864),
+                    listOf(2u, 1u) to Rational(53867, 324),
+                    listOf(3u, 1u) to Rational(2290577, 1728),
+                    listOf(4u, 1u) to Rational(101507, 216),
+                    listOf(5u, 1u) to Rational(213109, 288),
+                    listOf(6u, 1u) to Rational(17927, 144),
+                    listOf(0u, 2u) to Rational(314587, 1080),
+                    listOf(1u, 2u) to Rational(-109771, 144),
+                    listOf(2u, 2u) to Rational(-6469, 16),
+                    listOf(3u, 2u) to Rational(-298291681, 181440),
+                    listOf(4u, 2u) to Rational(-59147357, 48384),
+                    listOf(5u, 2u) to Rational(-4982365, 6048),
+                    listOf(6u, 2u) to Rational(-18727, 576),
+                    listOf(0u, 3u) to Rational(12379, 90),
+                    listOf(1u, 3u) to Rational(-542911, 1620),
+                    listOf(2u, 3u) to Rational(143123, 1260),
+                    listOf(3u, 3u) to Rational(9859177, 30240),
+                    listOf(4u, 3u) to Rational(9312529, 20160),
+                    listOf(5u, 3u) to Rational(207001, 672),
+                    listOf(6u, 3u) to Rational(203, 24),
+                    listOf(0u, 4u) to Rational(9442, 675),
+                    listOf(1u, 4u) to Rational(-13729, 300),
+                    listOf(2u, 4u) to Rational(-3490471, 25200),
+                    listOf(3u, 4u) to Rational(-333031, 840),
+                    listOf(4u, 4u) to Rational(-7572211, 47040),
+                    listOf(5u, 4u) to Rational(-1189, 56),
+                    listOf(6u, 4u) to Rational(-405, 196)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                1 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(14, 4),
+                        listOf(1u) to Rational(7, 6),
+                        listOf(2u) to Rational(7, 2),
+                        listOf(0u, 1u) to Rational(-15, 2),
+                        listOf(1u, 1u) to Rational(-13, 8),
+                        listOf(2u, 1u) to Rational(-14, 3),
+                        listOf(0u, 2u) to Rational(-7, 6),
+                        listOf(1u, 2u) to Rational(7, 4),
+                        listOf(2u, 2u) to Rational(9, 7),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-7, 4),
+                        listOf(1u) to Rational(-6, 3),
+                        listOf(2u) to Rational(-16, 2),
+                        listOf(0u, 1u) to Rational(-15, 5),
+                        listOf(1u, 1u) to Rational(4, 6),
+                        listOf(2u, 1u) to Rational(5, 4),
+                        listOf(0u, 2u) to Rational(-12, 5),
+                        listOf(1u, 2u) to Rational(-18, 2),
+                        listOf(2u, 2u) to Rational(6, 7),
+                    )
+                ),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(2303, 64),
+                    listOf(1u) to Rational(31843, 192),
+                    listOf(2u) to Rational(118891, 576),
+                    listOf(3u) to Rational(94453, 168),
+                    listOf(4u) to Rational(-179203, 1512),
+                    listOf(5u) to Rational(-16979, 126),
+                    listOf(6u) to Rational(-13499, 12),
+                    listOf(0u, 1u) to Rational(-4767, 64),
+                    listOf(1u, 1u) to Rational(-58689, 256),
+                    listOf(2u, 1u) to Rational(-757333, 4032),
+                    listOf(3u, 1u) to Rational(-4921205, 4032),
+                    listOf(4u, 1u) to Rational(-2930815, 4032),
+                    listOf(5u, 1u) to Rational(-398803, 1512),
+                    listOf(6u, 1u) to Rational(18835, 36),
+                    listOf(0u, 2u) to Rational(224101, 960),
+                    listOf(1u, 2u) to Rational(9139699, 40320),
+                    listOf(2u, 2u) to Rational(3848803, 5760),
+                    listOf(3u, 2u) to Rational(93102371, 241920),
+                    listOf(4u, 2u) to Rational(-65821229, 141120),
+                    listOf(5u, 2u) to Rational(-15675899, 7056),
+                    listOf(6u, 2u) to Rational(10459, 189),
+                    listOf(0u, 3u) to Rational(2411, 16),
+                    listOf(1u, 3u) to Rational(1294543, 10080),
+                    listOf(2u, 3u) to Rational(-1740199, 1440),
+                    listOf(3u, 3u) to Rational(-266994841, 282240),
+                    listOf(4u, 3u) to Rational(-41261893, 211680),
+                    listOf(5u, 3u) to Rational(1717357, 3528),
+                    listOf(6u, 3u) to Rational(69, 14),
+                    listOf(0u, 4u) to Rational(13231, 360),
+                    listOf(1u, 4u) to Rational(4858831, 25200),
+                    listOf(2u, 4u) to Rational(15565759, 75600),
+                    listOf(3u, 4u) to Rational(-15583391, 35280),
+                    listOf(4u, 4u) to Rational(-13345747, 11760),
+                    listOf(5u, 4u) to Rational(140103, 686),
+                    listOf(6u, 4u) to Rational(-765, 49)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(31409, 576),
+                    listOf(1u) to Rational(-337099, 1728),
+                    listOf(2u) to Rational(-211429, 1728),
+                    listOf(3u) to Rational(-259241, 432),
+                    listOf(4u) to Rational(-13777, 36),
+                    listOf(5u) to Rational(-41389, 72),
+                    listOf(6u) to Rational(-7679, 48),
+                    listOf(0u, 1u) to Rational(-3269, 12),
+                    listOf(1u, 1u) to Rational(629569, 864),
+                    listOf(2u, 1u) to Rational(53867, 324),
+                    listOf(3u, 1u) to Rational(2290577, 1728),
+                    listOf(4u, 1u) to Rational(101507, 216),
+                    listOf(5u, 1u) to Rational(213109, 288),
+                    listOf(6u, 1u) to Rational(17927, 144),
+                    listOf(0u, 2u) to Rational(314587, 1080),
+                    listOf(1u, 2u) to Rational(-109771, 144),
+                    listOf(2u, 2u) to Rational(-6469, 16),
+                    listOf(3u, 2u) to Rational(-298291681, 181440),
+                    listOf(4u, 2u) to Rational(-59147357, 48384),
+                    listOf(5u, 2u) to Rational(-4982365, 6048),
+                    listOf(6u, 2u) to Rational(-18727, 576),
+                    listOf(0u, 3u) to Rational(12379, 90),
+                    listOf(1u, 3u) to Rational(-542911, 1620),
+                    listOf(2u, 3u) to Rational(143123, 1260),
+                    listOf(3u, 3u) to Rational(9859177, 30240),
+                    listOf(4u, 3u) to Rational(9312529, 20160),
+                    listOf(5u, 3u) to Rational(207001, 672),
+                    listOf(6u, 3u) to Rational(203, 24),
+                    listOf(0u, 4u) to Rational(9442, 675),
+                    listOf(1u, 4u) to Rational(-13729, 300),
+                    listOf(2u, 4u) to Rational(-3490471, 25200),
+                    listOf(3u, 4u) to Rational(-333031, 840),
+                    listOf(4u, 4u) to Rational(-7572211, 47040),
+                    listOf(5u, 4u) to Rational(-1189, 56),
+                    listOf(6u, 4u) to Rational(-405, 196)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                1 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(14, 4),
+                        listOf(1u) to Rational(7, 6),
+                        listOf(2u) to Rational(7, 2),
+                        listOf(0u, 1u) to Rational(-15, 2),
+                        listOf(1u, 1u) to Rational(-13, 8),
+                        listOf(2u, 1u) to Rational(-14, 3),
+                        listOf(0u, 2u) to Rational(-7, 6),
+                        listOf(1u, 2u) to Rational(7, 4),
+                        listOf(2u, 2u) to Rational(9, 7),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-7, 4),
+                        listOf(1u) to Rational(-6, 3),
+                        listOf(2u) to Rational(-16, 2),
+                        listOf(0u, 1u) to Rational(-15, 5),
+                        listOf(1u, 1u) to Rational(4, 6),
+                        listOf(2u, 1u) to Rational(5, 4),
+                        listOf(0u, 2u) to Rational(-12, 5),
+                        listOf(1u, 2u) to Rational(-18, 2),
+                        listOf(2u, 2u) to Rational(6, 7),
+                    )
+                ),
+                5 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(5, 8),
+                        listOf(1u) to Rational(-12, 6),
+                        listOf(2u) to Rational(7, 6),
+                        listOf(0u, 1u) to Rational(-10, 4),
+                        listOf(1u, 1u) to Rational(-7, 6),
+                        listOf(2u, 1u) to Rational(8, 9),
+                        listOf(0u, 2u) to Rational(16, 3),
+                        listOf(1u, 2u) to Rational(-13, 4),
+                        listOf(2u, 2u) to Rational(5, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(10, 6),
+                        listOf(1u) to Rational(-18, 6),
+                        listOf(2u) to Rational(5, 1),
+                        listOf(0u, 1u) to Rational(17, 7),
+                        listOf(1u, 1u) to Rational(8, 4),
+                        listOf(2u, 1u) to Rational(-4, 9),
+                        listOf(0u, 2u) to Rational(-6, 5),
+                        listOf(1u, 2u) to Rational(-15, 8),
+                        listOf(2u, 2u) to Rational(-18, 5),
+                    )
+                ),
+            )),
+            "test 4'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-506213, 2800),
+                    listOf(1u) to Rational(9859, 315),
+                    listOf(2u) to Rational(17384377, 11340),
+                    listOf(3u) to Rational(-9662, 63),
+                    listOf(4u) to Rational(-12563, 4),
+                    listOf(0u, 1u) to Rational(-486293, 22400),
+                    listOf(1u, 1u) to Rational(-6530947, 25200),
+                    listOf(2u, 1u) to Rational(866125, 18144),
+                    listOf(3u, 1u) to Rational(2948747, 2520),
+                    listOf(4u, 1u) to Rational(1196611, 2016),
+                    listOf(0u, 2u) to Rational(-20266021, 117600),
+                    listOf(1u, 2u) to Rational(26656339, 44100),
+                    listOf(2u, 2u) to Rational(19499183, 18144),
+                    listOf(3u, 2u) to Rational(-19801849, 7560),
+                    listOf(4u, 2u) to Rational(-2639635, 1296),
+                    listOf(0u, 3u) to Rational(-5017697, 29400),
+                    listOf(1u, 3u) to Rational(-606007, 1575),
+                    listOf(2u, 3u) to Rational(127494487, 132300),
+                    listOf(3u, 3u) to Rational(166567, 105),
+                    listOf(4u, 3u) to Rational(486403, 18144),
+                    listOf(0u, 4u) to Rational(-32182, 735),
+                    listOf(1u, 4u) to Rational(2420671, 8820),
+                    listOf(2u, 4u) to Rational(-12619193, 26460),
+                    listOf(3u, 4u) to Rational(-6823067, 5670),
+                    listOf(4u, 4u) to Rational(-2311693, 13608),
+                    listOf(0u, 5u) to Rational(-13324, 245),
+                    listOf(1u, 5u) to Rational(1966, 35),
+                    listOf(2u, 5u) to Rational(1052719, 2520),
+                    listOf(3u, 5u) to Rational(19153, 270),
+                    listOf(4u, 5u) to Rational(701, 54),
+                    listOf(0u, 6u) to Rational(4647, 196),
+                    listOf(1u, 6u) to Rational(2197, 28),
+                    listOf(2u, 6u) to Rational(-43853, 336),
+                    listOf(3u, 6u) to Rational(-301, 3),
+                    listOf(4u, 6u) to Rational(34, 3)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-2843, 1600),
+                    listOf(1u) to Rational(-1483, 240),
+                    listOf(2u) to Rational(110623, 1296),
+                    listOf(3u) to Rational(1265, 72),
+                    listOf(4u) to Rational(-5011, 16),
+                    listOf(0u, 1u) to Rational(47743, 1800),
+                    listOf(1u, 1u) to Rational(619229, 32400),
+                    listOf(2u, 1u) to Rational(-5978369, 58320),
+                    listOf(3u, 1u) to Rational(-86081, 1620),
+                    listOf(4u, 1u) to Rational(6325, 72),
+                    listOf(0u, 2u) to Rational(110951, 3360),
+                    listOf(1u, 2u) to Rational(-9550649, 302400),
+                    listOf(2u, 2u) to Rational(6542933, 85050),
+                    listOf(3u, 2u) to Rational(4708291, 38880),
+                    listOf(4u, 2u) to Rational(-433327, 1296),
+                    listOf(0u, 3u) to Rational(56143, 600),
+                    listOf(1u, 3u) to Rational(94243, 720),
+                    listOf(2u, 3u) to Rational(-46779139, 226800),
+                    listOf(3u, 3u) to Rational(-6948253, 12960),
+                    listOf(4u, 3u) to Rational(-260261, 486),
+                    listOf(0u, 4u) to Rational(-3205317, 19600),
+                    listOf(1u, 4u) to Rational(-201253, 1050),
+                    listOf(2u, 4u) to Rational(332192677, 302400),
+                    listOf(3u, 4u) to Rational(351511, 360),
+                    listOf(4u, 4u) to Rational(-40547, 81),
+                    listOf(0u, 5u) to Rational(-65421, 1960),
+                    listOf(1u, 5u) to Rational(-10118, 35),
+                    listOf(2u, 5u) to Rational(-4341709, 10080),
+                    listOf(3u, 5u) to Rational(-91703, 360),
+                    listOf(4u, 5u) to Rational(-85, 9),
+                    listOf(0u, 6u) to Rational(-25965, 784),
+                    listOf(1u, 6u) to Rational(3351, 16),
+                    listOf(2u, 6u) to Rational(595159, 1344),
+                    listOf(3u, 6u) to Rational(-1381, 12),
+                    listOf(4u, 6u) to Rational(-155, 3)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-17, 5),
+                        listOf(1u) to Rational(2, 6),
+                        listOf(2u) to Rational(14, 1),
+                        listOf(0u, 1u) to Rational(-6, 6),
+                        listOf(1u, 1u) to Rational(-7, 3),
+                        listOf(2u, 1u) to Rational(-2, 9),
+                        listOf(0u, 2u) to Rational(-9, 6),
+                        listOf(1u, 2u) to Rational(17, 4),
+                        listOf(2u, 2u) to Rational(2, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(5, 4),
+                        listOf(1u) to Rational(-5, 9),
+                        listOf(2u) to Rational(-3, 6),
+                        listOf(0u, 1u) to Rational(6, 5),
+                        listOf(1u, 1u) to Rational(14, 5),
+                        listOf(2u, 1u) to Rational(5, 2),
+                        listOf(0u, 2u) to Rational(-18, 7),
+                        listOf(1u, 2u) to Rational(-8, 2),
+                        listOf(2u, 2u) to Rational(18, 9),
+                    )
+                ),
+            )),
+            "test 5"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-506213, 2800),
+                    listOf(1u) to Rational(9859, 315),
+                    listOf(2u) to Rational(17384377, 11340),
+                    listOf(3u) to Rational(-9662, 63),
+                    listOf(4u) to Rational(-12563, 4),
+                    listOf(0u, 1u) to Rational(-486293, 22400),
+                    listOf(1u, 1u) to Rational(-6530947, 25200),
+                    listOf(2u, 1u) to Rational(866125, 18144),
+                    listOf(3u, 1u) to Rational(2948747, 2520),
+                    listOf(4u, 1u) to Rational(1196611, 2016),
+                    listOf(0u, 2u) to Rational(-20266021, 117600),
+                    listOf(1u, 2u) to Rational(26656339, 44100),
+                    listOf(2u, 2u) to Rational(19499183, 18144),
+                    listOf(3u, 2u) to Rational(-19801849, 7560),
+                    listOf(4u, 2u) to Rational(-2639635, 1296),
+                    listOf(0u, 3u) to Rational(-5017697, 29400),
+                    listOf(1u, 3u) to Rational(-606007, 1575),
+                    listOf(2u, 3u) to Rational(127494487, 132300),
+                    listOf(3u, 3u) to Rational(166567, 105),
+                    listOf(4u, 3u) to Rational(486403, 18144),
+                    listOf(0u, 4u) to Rational(-32182, 735),
+                    listOf(1u, 4u) to Rational(2420671, 8820),
+                    listOf(2u, 4u) to Rational(-12619193, 26460),
+                    listOf(3u, 4u) to Rational(-6823067, 5670),
+                    listOf(4u, 4u) to Rational(-2311693, 13608),
+                    listOf(0u, 5u) to Rational(-13324, 245),
+                    listOf(1u, 5u) to Rational(1966, 35),
+                    listOf(2u, 5u) to Rational(1052719, 2520),
+                    listOf(3u, 5u) to Rational(19153, 270),
+                    listOf(4u, 5u) to Rational(701, 54),
+                    listOf(0u, 6u) to Rational(4647, 196),
+                    listOf(1u, 6u) to Rational(2197, 28),
+                    listOf(2u, 6u) to Rational(-43853, 336),
+                    listOf(3u, 6u) to Rational(-301, 3),
+                    listOf(4u, 6u) to Rational(34, 3)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-2843, 1600),
+                    listOf(1u) to Rational(-1483, 240),
+                    listOf(2u) to Rational(110623, 1296),
+                    listOf(3u) to Rational(1265, 72),
+                    listOf(4u) to Rational(-5011, 16),
+                    listOf(0u, 1u) to Rational(47743, 1800),
+                    listOf(1u, 1u) to Rational(619229, 32400),
+                    listOf(2u, 1u) to Rational(-5978369, 58320),
+                    listOf(3u, 1u) to Rational(-86081, 1620),
+                    listOf(4u, 1u) to Rational(6325, 72),
+                    listOf(0u, 2u) to Rational(110951, 3360),
+                    listOf(1u, 2u) to Rational(-9550649, 302400),
+                    listOf(2u, 2u) to Rational(6542933, 85050),
+                    listOf(3u, 2u) to Rational(4708291, 38880),
+                    listOf(4u, 2u) to Rational(-433327, 1296),
+                    listOf(0u, 3u) to Rational(56143, 600),
+                    listOf(1u, 3u) to Rational(94243, 720),
+                    listOf(2u, 3u) to Rational(-46779139, 226800),
+                    listOf(3u, 3u) to Rational(-6948253, 12960),
+                    listOf(4u, 3u) to Rational(-260261, 486),
+                    listOf(0u, 4u) to Rational(-3205317, 19600),
+                    listOf(1u, 4u) to Rational(-201253, 1050),
+                    listOf(2u, 4u) to Rational(332192677, 302400),
+                    listOf(3u, 4u) to Rational(351511, 360),
+                    listOf(4u, 4u) to Rational(-40547, 81),
+                    listOf(0u, 5u) to Rational(-65421, 1960),
+                    listOf(1u, 5u) to Rational(-10118, 35),
+                    listOf(2u, 5u) to Rational(-4341709, 10080),
+                    listOf(3u, 5u) to Rational(-91703, 360),
+                    listOf(4u, 5u) to Rational(-85, 9),
+                    listOf(0u, 6u) to Rational(-25965, 784),
+                    listOf(1u, 6u) to Rational(3351, 16),
+                    listOf(2u, 6u) to Rational(595159, 1344),
+                    listOf(3u, 6u) to Rational(-1381, 12),
+                    listOf(4u, 6u) to Rational(-155, 3)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                0 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-17, 5),
+                        listOf(1u) to Rational(2, 6),
+                        listOf(2u) to Rational(14, 1),
+                        listOf(0u, 1u) to Rational(-6, 6),
+                        listOf(1u, 1u) to Rational(-7, 3),
+                        listOf(2u, 1u) to Rational(-2, 9),
+                        listOf(0u, 2u) to Rational(-9, 6),
+                        listOf(1u, 2u) to Rational(17, 4),
+                        listOf(2u, 2u) to Rational(2, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(5, 4),
+                        listOf(1u) to Rational(-5, 9),
+                        listOf(2u) to Rational(-3, 6),
+                        listOf(0u, 1u) to Rational(6, 5),
+                        listOf(1u, 1u) to Rational(14, 5),
+                        listOf(2u, 1u) to Rational(5, 2),
+                        listOf(0u, 2u) to Rational(-18, 7),
+                        listOf(1u, 2u) to Rational(-8, 2),
+                        listOf(2u, 2u) to Rational(18, 9),
+                    )
+                ),
+                5 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(5, 8),
+                        listOf(1u) to Rational(-12, 6),
+                        listOf(2u) to Rational(7, 6),
+                        listOf(0u, 1u) to Rational(-10, 4),
+                        listOf(1u, 1u) to Rational(-7, 6),
+                        listOf(2u, 1u) to Rational(8, 9),
+                        listOf(0u, 2u) to Rational(16, 3),
+                        listOf(1u, 2u) to Rational(-13, 4),
+                        listOf(2u, 2u) to Rational(5, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(10, 6),
+                        listOf(1u) to Rational(-18, 6),
+                        listOf(2u) to Rational(5, 1),
+                        listOf(0u, 1u) to Rational(17, 7),
+                        listOf(1u, 1u) to Rational(8, 4),
+                        listOf(2u, 1u) to Rational(-4, 9),
+                        listOf(0u, 2u) to Rational(-6, 5),
+                        listOf(1u, 2u) to Rational(-15, 8),
+                        listOf(2u, 2u) to Rational(-18, 5),
+                    )
+                ),
+            )),
+            "test 5'"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf<Int, NumberedRationalFunction<Rational>>()),
+            "test 6"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                5 to NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(5, 8),
+                        listOf(1u) to Rational(-12, 6),
+                        listOf(2u) to Rational(7, 6),
+                        listOf(0u, 1u) to Rational(-10, 4),
+                        listOf(1u, 1u) to Rational(-7, 6),
+                        listOf(2u, 1u) to Rational(8, 9),
+                        listOf(0u, 2u) to Rational(16, 3),
+                        listOf(1u, 2u) to Rational(-13, 4),
+                        listOf(2u, 2u) to Rational(5, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(10, 6),
+                        listOf(1u) to Rational(-18, 6),
+                        listOf(2u) to Rational(5, 1),
+                        listOf(0u, 1u) to Rational(17, 7),
+                        listOf(1u, 1u) to Rational(8, 4),
+                        listOf(2u, 1u) to Rational(-4, 9),
+                        listOf(0u, 2u) to Rational(-6, 5),
+                        listOf(1u, 2u) to Rational(-15, 8),
+                        listOf(2u, 2u) to Rational(-18, 5),
+                    )
+                ),
+            )),
+            "test 6'"
+        )
     }
     @Test
     @Ignore
@@ -2244,7 +5416,7 @@ class NumberedPolynomialUtilTest {
     }
     @Test
     @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should make denominator r^deg(p),
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
             //  not r^(deg(p)(deg(p)+1)/2) as it is now.
     fun test_Polynomial_substitute_RationalFunction_Buffer() {
         // TODO
@@ -2266,7 +5438,7 @@ class NumberedPolynomialUtilTest {
     }
     @Test
     @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should make denominator r^deg(p),
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
             //  not r^(deg(p)(deg(p)+1)/2) as it is now.
     fun test_RationalFunction_substitute_RationalFunction_Buffer() {
         // TODO
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
index 4bdd60704..071701593 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
@@ -41,66 +41,105 @@ class Rational {
 
     operator fun unaryPlus(): Rational = this
     operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
-    operator fun plus(other: Rational): Rational =
-        Rational(
-            numerator * other.denominator + denominator * other.numerator,
-            denominator * other.denominator
+    operator fun plus(other: Rational): Rational {
+        val denominatorsGcd = gcd(denominator, other.denominator)
+        val dividedThisDenominator = denominator / denominatorsGcd
+        val dividedOtherDenominator = other.denominator / denominatorsGcd
+        val numeratorCandidate = numerator * dividedOtherDenominator + dividedThisDenominator * other.numerator
+        val secondGcd = gcd(numeratorCandidate, denominatorsGcd)
+        return Rational(
+            numeratorCandidate / secondGcd,
+            dividedThisDenominator * (other.denominator / secondGcd),
+            toCheckInput = false
         )
+    }
     operator fun plus(other: Int): Rational =
         Rational(
             numerator + denominator * other.toLong(),
-            denominator
+            denominator,
+            toCheckInput = false
         )
     operator fun plus(other: Long): Rational =
         Rational(
             numerator + denominator * other,
-            denominator
+            denominator,
+            toCheckInput = false
         )
-    operator fun minus(other: Rational): Rational =
-        Rational(
-            numerator * other.denominator - denominator * other.numerator,
-            denominator * other.denominator
+    operator fun minus(other: Rational): Rational {
+        val denominatorsGcd = gcd(denominator, other.denominator)
+        val dividedThisDenominator = denominator / denominatorsGcd
+        val dividedOtherDenominator = other.denominator / denominatorsGcd
+        val numeratorCandidate = numerator * dividedOtherDenominator - dividedThisDenominator * other.numerator
+        val secondGcd = gcd(numeratorCandidate, denominatorsGcd)
+        return Rational(
+            numeratorCandidate / secondGcd,
+            dividedThisDenominator * (other.denominator / secondGcd),
+            toCheckInput = false
         )
+    }
     operator fun minus(other: Int): Rational =
         Rational(
             numerator - denominator * other.toLong(),
-            denominator
+            denominator,
+            toCheckInput = false
         )
     operator fun minus(other: Long): Rational =
         Rational(
             numerator - denominator * other,
-            denominator
+            denominator,
+            toCheckInput = false
         )
-    operator fun times(other: Rational): Rational =
-        Rational(
-            numerator * other.numerator,
-            denominator * other.denominator
+    operator fun times(other: Rational): Rational {
+        val thisDenominatorAndOtherNumeratorGcd = gcd(denominator, other.numerator)
+        val otherDenominatorAndThisNumeratorGcd = gcd(other.denominator, numerator)
+        return Rational(
+            (numerator / otherDenominatorAndThisNumeratorGcd) * (other.numerator / thisDenominatorAndOtherNumeratorGcd),
+            (denominator / thisDenominatorAndOtherNumeratorGcd) * (other.denominator / otherDenominatorAndThisNumeratorGcd),
+            toCheckInput = false
         )
-    operator fun times(other: Int): Rational =
-        Rational(
-            numerator * other.toLong(),
-            denominator
+    }
+    operator fun times(other: Int): Rational {
+        val other = other.toLong()
+        val denominatorAndOtherGcd = gcd(denominator, other)
+        return Rational(
+            numerator * (other / denominatorAndOtherGcd),
+            denominator / denominatorAndOtherGcd,
+            toCheckInput = false
         )
-    operator fun times(other: Long): Rational =
-        Rational(
-            numerator * other,
-            denominator
+    }
+    operator fun times(other: Long): Rational {
+        val denominatorAndOtherGcd = gcd(denominator, other)
+        return Rational(
+            numerator * (other / denominatorAndOtherGcd),
+            denominator / denominatorAndOtherGcd,
+            toCheckInput = false
         )
-    operator fun div(other: Rational): Rational =
-        Rational(
-            numerator * other.denominator,
-            denominator * other.numerator
+    }
+    operator fun div(other: Rational): Rational {
+        val denominatorsGcd = gcd(denominator, other.denominator)
+        val numeratorsGcd = gcd(numerator, other.numerator)
+        return Rational(
+            (numerator / numeratorsGcd) * (other.denominator / denominatorsGcd),
+            (denominator / denominatorsGcd) * (other.numerator / numeratorsGcd)
         )
-    operator fun div(other: Int): Rational =
-        Rational(
-            numerator,
-            denominator * other.toLong()
+    }
+    operator fun div(other: Int): Rational {
+        val other = other.toLong()
+        val numeratorAndOtherGcd = gcd(numerator, other)
+        return Rational(
+            numerator / numeratorAndOtherGcd,
+            denominator * (other / numeratorAndOtherGcd),
+            toCheckInput = false
         )
-    operator fun div(other: Long): Rational =
-        Rational(
-            numerator,
-            denominator * other
+    }
+    operator fun div(other: Long): Rational {
+        val numeratorAndOtherGcd = gcd(numerator, other)
+        return Rational(
+            numerator / numeratorAndOtherGcd,
+            denominator * (other / numeratorAndOtherGcd),
+            toCheckInput = false
         )
+    }
     override fun equals(other: Any?): Boolean =
         when (other) {
             is Rational -> numerator == other.numerator && denominator == other.denominator
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt
index 52ecf416a..bf8675675 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt
@@ -5,10 +5,44 @@
 
 package space.kscience.kmath.test.misc
 
+import space.kscience.kmath.functions.NumberedPolynomial
+import space.kscience.kmath.functions.NumberedRationalFunction
 import kotlin.test.assertEquals
 
 
 fun <T> assertContentEquals(expected: Map<T, Double>, actual: Map<T, Double>, absoluteTolerance: Double, message: String? = null) {
     assertEquals(expected.keys, actual.keys, message)
     for ((key, expectedValue) in expected) assertEquals(expectedValue, actual[key]!!, absoluteTolerance, message)
+}
+
+fun assertEquals(
+    expected: NumberedPolynomial<Double>,
+    actual: NumberedPolynomial<Double>,
+    absoluteTolerance: Double,
+    message: String? = null
+) = assertContentEquals(
+    expected.coefficients,
+    actual.coefficients,
+    absoluteTolerance,
+    message
+)
+
+fun assertEquals(
+    expected: NumberedRationalFunction<Double>,
+    actual: NumberedRationalFunction<Double>,
+    absoluteTolerance: Double,
+    message: String? = null
+) {
+    assertEquals(
+        expected.numerator,
+        actual.numerator,
+        absoluteTolerance,
+        message
+    )
+    assertEquals(
+        expected.denominator,
+        actual.denominator,
+        absoluteTolerance,
+        message
+    )
 }
\ No newline at end of file
-- 
2.34.1


From 102e83b4780209da177053d587aed35aabf7f811 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 4 Jul 2022 02:24:46 +0300
Subject: [PATCH 551/713] Tests generation for numbered utilities in progress:
 finish substitutions.

---
 .../kscience/kmath/functions/numberedUtil.kt  |    6 +-
 .../functions/NumberedPolynomialUtilTest.kt   | 3786 ++++++++++++++++-
 .../kscience/kmath/test/misc/assertion.kt     |   14 +-
 3 files changed, 3780 insertions(+), 26 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
index e485652f4..9397c1956 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
@@ -262,12 +262,14 @@ public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Buffe
         numerator.substitute(ring, args) / denominator.substitute(ring, args)
     }
 
+internal const val fullSubstitutionExceptionMessage: String = "Fully substituting buffer should cover all variables of the polynomial."
+
 /**
  * Substitutes provided Double arguments [args] into [this] Double polynomial.
  */
 public fun NumberedPolynomial<Double>.substituteFully(args: Buffer<Double>): Double = Double.algebra {
     val lastSubstitutionVariable = args.size - 1
-    require(coefficients.keys.all { it.lastIndex <= lastSubstitutionVariable }) { "Fully substituting buffer should cover all variables of the polynomial." }
+    require(coefficients.keys.all { it.lastIndex <= lastSubstitutionVariable }) { fullSubstitutionExceptionMessage }
     coefficients.entries.fold(.0) { acc, (degs, c) ->
         acc + degs.foldIndexed(c) { variable, product, deg ->
             if (deg == 0u) product else product * args[variable].pow(deg.toInt())
@@ -280,7 +282,7 @@ public fun NumberedPolynomial<Double>.substituteFully(args: Buffer<Double>): Dou
  */
 public fun <C> NumberedPolynomial<C>.substituteFully(ring: Ring<C>, args: Buffer<C>): C = ring {
     val lastSubstitutionVariable = args.size - 1
-    require(coefficients.keys.all { it.lastIndex <= lastSubstitutionVariable }) { "Fully substituting buffer should cover all variables of the polynomial." }
+    require(coefficients.keys.all { it.lastIndex <= lastSubstitutionVariable }) { fullSubstitutionExceptionMessage }
     coefficients.entries.fold(zero) { acc, (degs, c) ->
         acc + degs.foldIndexed(c) { variable, product, deg ->
             if (deg == 0u) product else product * power(args[variable], deg)
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
index b6baed6af..9e49f1315 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
@@ -5,14 +5,19 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.test.misc.Rational
 import space.kscience.kmath.test.misc.RationalField
 import space.kscience.kmath.test.misc.assertEquals
+import space.kscience.kmath.test.misc.assertFailsWithTypeAndMessage
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 
+fun <T> bufferOf(vararg elements: T): Buffer<T> = elements.asBuffer()
+
 class NumberedPolynomialUtilTest {
     @Test
     fun test_Polynomial_substitute_Double_Map() {
@@ -4104,7 +4109,6 @@ class NumberedPolynomialUtilTest {
             //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
             //  not r^(deg(p)(deg(p)+1)/2) as it is now.
     fun test_RationalFunction_substitute_RationalFunction_Map() {
-        // TODO
         assertEquals(
             NumberedRationalFunction(
                 NumberedPolynomialAsIs(
@@ -5400,68 +5404,3804 @@ class NumberedPolynomialUtilTest {
         )
     }
     @Test
-    @Ignore
     fun test_Polynomial_substitute_Double_Buffer() {
-        // TODO
+        assertEquals(
+            NumberedPolynomialAsIs(emptyList<UInt>() to 0.0),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 1.0,
+                listOf(1u) to -2.0,
+                listOf(2u) to 1.0,
+            ).substitute(bufferOf(
+                1.0
+            )),
+            0.001,
+            "test 1"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(bufferOf()),
+            0.001,
+            "test 2"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(0u, 2u) to 0.2700930201481795,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(bufferOf(
+                0.0,
+            )),
+            0.001,
+            "test 3"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 1.047895694399743,
+                listOf(0u, 1u) to 0.859913883275481,
+                listOf(0u, 2u) to 0.2327806735363575,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(bufferOf(
+                0.4846192734143442,
+            )),
+            0.001,
+            "test 4"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 1.934530767358133,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(bufferOf(
+                0.4846192734143442,
+                0.8400458576651112,
+            )),
+            0.001,
+            "test 5"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 1.934530767358133,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(bufferOf(
+                0.4846192734143442,
+                0.8400458576651112,
+                0.9211194782050933
+            )),
+            0.001,
+            "test 6"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 1.934530767358133,
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substitute(bufferOf(
+                0.4846192734143442,
+                0.8400458576651112,
+                0.9211194782050933,
+                0.4752854632152105
+            )),
+            0.001,
+            "test 7"
+        )
     }
     @Test
-    @Ignore
     fun test_Polynomial_substitute_Constant_Buffer() {
-        // TODO
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0)
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1)
+            ).substitute(RationalField, bufferOf(
+                Rational(1)
+            )),
+            "test 1"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, bufferOf<Rational>()),
+            "test 2"
+        )
+        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-83, 50),
+                listOf(0u, 1u) to Rational(29, 25),
+                listOf(0u, 2u) to Rational(3, 5),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, bufferOf(
+                Rational(-2, 5),
+            )),
+            "test 3"
+        )
+        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5%2C+y+%3D+12%2F9
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(143, 150)
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, bufferOf(
+                Rational(-2, 5),
+                Rational(12, 9),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(143, 150)
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, bufferOf(
+                Rational(-2, 5),
+                Rational(12, 9),
+                Rational(57, 179),
+            )),
+            "test 5"
+        )
+        // https://www.wolframalpha.com/input?i=%28%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2%29+p%5E8+where+x+%3D+q%2Fp%2C+y+%3D+x%5E3%2C+p+%3D+-2%2F5%2C+q+%3D+12%2F9
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(47639065216, 2562890625)
+            ),
+            NumberedPolynomialAsIs(
+                listOf(8u) to Rational(-3, 2),
+                listOf(7u, 1u) to Rational(8, 6),
+                listOf(6u, 2u) to Rational(14, 6),
+                listOf(5u, 3u) to Rational(-3, 1),
+                listOf(4u, 4u) to Rational(-19, 2),
+                listOf(3u, 5u) to Rational(9, 4),
+                listOf(2u, 6u) to Rational(5, 5),
+                listOf(1u, 7u) to Rational(18, 9),
+                listOf(0u, 8u) to Rational(5, 2),
+            ).substitute(RationalField, bufferOf(
+                Rational(-2, 5),
+                Rational(12, 9),
+            )),
+            "test 6"
+        )
     }
     @Test
-    @Ignore
     fun test_Polynomial_substitute_Polynomial_Buffer() {
-        // TODO
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0)
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1)
+            ).substitute(RationalField, bufferOf(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            )),
+            "test 1"
+        )
+        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-5%2F1+s+%2B+2%2F8+t%2C+y+%3D+11%2F7+t
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(0u, 1u) to Rational(-92, 21),
+                listOf(0u, 2u) to Rational(-2627, 2352),
+                listOf(0u, 3u) to Rational(4565, 3136),
+                listOf(0u, 4u) to Rational(605, 1568),
+                listOf(1u) to Rational(-20, 3),
+                listOf(1u, 1u) to Rational(1445, 21),
+                listOf(1u, 2u) to Rational(-13145, 392),
+                listOf(1u, 3u) to Rational(-3025, 196),
+                listOf(2u) to Rational(175, 3),
+                listOf(2u, 1u) to Rational(2475, 28),
+                listOf(2u, 2u) to Rational(15125, 98),
+                listOf(3u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, bufferOf(
+                NumberedPolynomialAsIs(
+                    listOf(1u) to Rational(-5, 1),
+                    listOf(0u, 1u) to Rational(2, 8),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf(1u) to Rational(0, 5),
+                    listOf(0u, 1u) to Rational(11, 7),
+                ),
+            )),
+            "test 2"
+        )
+        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = (0/6 + 14/8 s + -14/2 s^2) + (-3/5 + 11/1 s + 3/7 s^2) t + (-3/7 + -18/5 s + -9/1 s^2) t^2, y = (-9/2 + 2/7 s + 9/1 s^2) + (13/1 + -1/8 s + 2/8 s^2) t + (19/4 + 15/7 s + -19/4 s^2) t^2
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(129, 4),
+                listOf(1u) to Rational(48583, 336),
+                listOf(2u) to Rational(-913477, 1568),
+                listOf(3u) to Rational(-967567, 672),
+                listOf(4u) to Rational(4722043, 1344),
+                listOf(5u) to Rational(8855, 2),
+                listOf(6u) to Rational(-311971, 32),
+                listOf(7u) to Rational(-17325, 4),
+                listOf(8u) to Rational(19845, 2),
+                listOf(0u, 1u) to Rational(-827, 4),
+                listOf(1u, 1u) to Rational(191927, 840),
+                listOf(2u, 1u) to Rational(9592627, 2352),
+                listOf(3u, 1u) to Rational(-105400711, 53760),
+                listOf(4u, 1u) to Rational(-10054101459, 439040),
+                listOf(5u, 1u) to Rational(2127351, 128),
+                listOf(6u, 1u) to Rational(116680973, 3136),
+                listOf(7u, 1u) to Rational(-220445, 7),
+                listOf(8u, 1u) to Rational(-2655, 4),
+                listOf(0u, 2u) to Rational(30567, 100),
+                listOf(1u, 2u) to Rational(-156284953, 39200),
+                listOf(2u, 2u) to Rational(-57661541711, 6585600),
+                listOf(3u, 2u) to Rational(131931579, 3136),
+                listOf(4u, 2u) to Rational(98818124791, 3512320),
+                listOf(5u, 2u) to Rational(-94458855053, 878080),
+                listOf(6u, 2u) to Rational(13937705305, 1229312),
+                listOf(7u, 2u) to Rational(335706887, 21952),
+                listOf(8u, 2u) to Rational(23549165, 1568),
+                listOf(0u, 3u) to Rational(111367, 1400),
+                listOf(1u, 3u) to Rational(4937369, 700),
+                listOf(2u, 3u) to Rational(-4449423711, 274400),
+                listOf(3u, 3u) to Rational(-351873325703, 4390400),
+                listOf(4u, 3u) to Rational(23495875029, 307328),
+                listOf(5u, 3u) to Rational(17576300919, 878080),
+                listOf(6u, 3u) to Rational(230316993, 12544),
+                listOf(7u, 3u) to Rational(-191130515, 21952),
+                listOf(8u, 3u) to Rational(332435, 392),
+                listOf(0u, 4u) to Rational(-275084, 1225),
+                listOf(1u, 4u) to Rational(-266774603, 137200),
+                listOf(2u, 4u) to Rational(2176279167121, 30732800),
+                listOf(3u, 4u) to Rational(10904913303, 2195200),
+                listOf(4u, 4u) to Rational(-10769286147, 2195200),
+                listOf(5u, 4u) to Rational(-26277119793, 439040),
+                listOf(6u, 4u) to Rational(25859735869, 6146560),
+                listOf(7u, 4u) to Rational(38906289, 2744),
+                listOf(8u, 4u) to Rational(-3072025, 392),
+                listOf(0u, 5u) to Rational(9573, 98),
+                listOf(1u, 5u) to Rational(-4154651399, 548800),
+                listOf(2u, 5u) to Rational(3446069019, 548800),
+                listOf(3u, 5u) to Rational(-7851500623, 137200),
+                listOf(4u, 5u) to Rational(-53205142903, 1920800),
+                listOf(5u, 5u) to Rational(-31953611, 3430),
+                listOf(6u, 5u) to Rational(1447380313, 109760),
+                listOf(7u, 5u) to Rational(764158625, 21952),
+                listOf(8u, 5u) to Rational(1153515, 784),
+                listOf(0u, 6u) to Rational(1722351, 7840),
+                listOf(1u, 6u) to Rational(-164554821, 109760),
+                listOf(2u, 6u) to Rational(-79096147243, 7683200),
+                listOf(3u, 6u) to Rational(-624721089, 15680),
+                listOf(4u, 6u) to Rational(11147305567, 548800),
+                listOf(5u, 6u) to Rational(8318333679, 109760),
+                listOf(6u, 6u) to Rational(32981871553, 1536640),
+                listOf(7u, 6u) to Rational(-225359619, 21952),
+                listOf(8u, 6u) to Rational(-3973995, 392),
+                listOf(0u, 7u) to Rational(67203, 784),
+                listOf(1u, 7u) to Rational(39281469, 54880),
+                listOf(2u, 7u) to Rational(70162551, 27440),
+                listOf(3u, 7u) to Rational(413630709, 54880),
+                listOf(4u, 7u) to Rational(4640410269, 192080),
+                listOf(5u, 7u) to Rational(802712247, 54880),
+                listOf(6u, 7u) to Rational(-473517603, 27440),
+                listOf(7u, 7u) to Rational(-17055459, 1568),
+                listOf(8u, 7u) to Rational(-12825, 14),
+                listOf(0u, 8u) to Rational(16245, 1568),
+                listOf(1u, 8u) to Rational(503253, 2744),
+                listOf(2u, 8u) to Rational(125292591, 96040),
+                listOf(3u, 8u) to Rational(12033171, 2744),
+                listOf(4u, 8u) to Rational(154352673, 27440),
+                listOf(5u, 8u) to Rational(-1302291, 392),
+                listOf(6u, 8u) to Rational(-20265741, 1960),
+                listOf(7u, 8u) to Rational(-26163, 56),
+                listOf(8u, 8u) to Rational(146205, 32),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, bufferOf(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0, 6),
+                    listOf(1u) to Rational(14, 8),
+                    listOf(2u) to Rational(-14, 2),
+                    listOf(0u, 1u) to Rational(-3, 5),
+                    listOf(1u, 1u) to Rational(11, 1),
+                    listOf(2u, 1u) to Rational(3, 7),
+                    listOf(0u, 2u) to Rational(-3, 7),
+                    listOf(1u, 2u) to Rational(-18, 5),
+                    listOf(2u, 2u) to Rational(-9, 1),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-9, 2),
+                    listOf(1u) to Rational(2, 7),
+                    listOf(2u) to Rational(9, 1),
+                    listOf(0u, 1u) to Rational(13, 1),
+                    listOf(1u, 1u) to Rational(-1, 8),
+                    listOf(2u, 1u) to Rational(2, 8),
+                    listOf(0u, 2u) to Rational(19, 4),
+                    listOf(1u, 2u) to Rational(15, 7),
+                    listOf(2u, 2u) to Rational(-19, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 3),
+                    listOf(1u) to Rational(5, 2),
+                    listOf(2u) to Rational(13, 7),
+                    listOf(0u, 1u) to Rational(16, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(6, 1),
+                    listOf(0u, 2u) to Rational(-14, 3),
+                    listOf(1u, 2u) to Rational(-2, 7),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            )),
+            "test 3"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(129, 4),
+                listOf(1u) to Rational(48583, 336),
+                listOf(2u) to Rational(-913477, 1568),
+                listOf(3u) to Rational(-967567, 672),
+                listOf(4u) to Rational(4722043, 1344),
+                listOf(5u) to Rational(8855, 2),
+                listOf(6u) to Rational(-311971, 32),
+                listOf(7u) to Rational(-17325, 4),
+                listOf(8u) to Rational(19845, 2),
+                listOf(0u, 1u) to Rational(-827, 4),
+                listOf(1u, 1u) to Rational(191927, 840),
+                listOf(2u, 1u) to Rational(9592627, 2352),
+                listOf(3u, 1u) to Rational(-105400711, 53760),
+                listOf(4u, 1u) to Rational(-10054101459, 439040),
+                listOf(5u, 1u) to Rational(2127351, 128),
+                listOf(6u, 1u) to Rational(116680973, 3136),
+                listOf(7u, 1u) to Rational(-220445, 7),
+                listOf(8u, 1u) to Rational(-2655, 4),
+                listOf(0u, 2u) to Rational(30567, 100),
+                listOf(1u, 2u) to Rational(-156284953, 39200),
+                listOf(2u, 2u) to Rational(-57661541711, 6585600),
+                listOf(3u, 2u) to Rational(131931579, 3136),
+                listOf(4u, 2u) to Rational(98818124791, 3512320),
+                listOf(5u, 2u) to Rational(-94458855053, 878080),
+                listOf(6u, 2u) to Rational(13937705305, 1229312),
+                listOf(7u, 2u) to Rational(335706887, 21952),
+                listOf(8u, 2u) to Rational(23549165, 1568),
+                listOf(0u, 3u) to Rational(111367, 1400),
+                listOf(1u, 3u) to Rational(4937369, 700),
+                listOf(2u, 3u) to Rational(-4449423711, 274400),
+                listOf(3u, 3u) to Rational(-351873325703, 4390400),
+                listOf(4u, 3u) to Rational(23495875029, 307328),
+                listOf(5u, 3u) to Rational(17576300919, 878080),
+                listOf(6u, 3u) to Rational(230316993, 12544),
+                listOf(7u, 3u) to Rational(-191130515, 21952),
+                listOf(8u, 3u) to Rational(332435, 392),
+                listOf(0u, 4u) to Rational(-275084, 1225),
+                listOf(1u, 4u) to Rational(-266774603, 137200),
+                listOf(2u, 4u) to Rational(2176279167121, 30732800),
+                listOf(3u, 4u) to Rational(10904913303, 2195200),
+                listOf(4u, 4u) to Rational(-10769286147, 2195200),
+                listOf(5u, 4u) to Rational(-26277119793, 439040),
+                listOf(6u, 4u) to Rational(25859735869, 6146560),
+                listOf(7u, 4u) to Rational(38906289, 2744),
+                listOf(8u, 4u) to Rational(-3072025, 392),
+                listOf(0u, 5u) to Rational(9573, 98),
+                listOf(1u, 5u) to Rational(-4154651399, 548800),
+                listOf(2u, 5u) to Rational(3446069019, 548800),
+                listOf(3u, 5u) to Rational(-7851500623, 137200),
+                listOf(4u, 5u) to Rational(-53205142903, 1920800),
+                listOf(5u, 5u) to Rational(-31953611, 3430),
+                listOf(6u, 5u) to Rational(1447380313, 109760),
+                listOf(7u, 5u) to Rational(764158625, 21952),
+                listOf(8u, 5u) to Rational(1153515, 784),
+                listOf(0u, 6u) to Rational(1722351, 7840),
+                listOf(1u, 6u) to Rational(-164554821, 109760),
+                listOf(2u, 6u) to Rational(-79096147243, 7683200),
+                listOf(3u, 6u) to Rational(-624721089, 15680),
+                listOf(4u, 6u) to Rational(11147305567, 548800),
+                listOf(5u, 6u) to Rational(8318333679, 109760),
+                listOf(6u, 6u) to Rational(32981871553, 1536640),
+                listOf(7u, 6u) to Rational(-225359619, 21952),
+                listOf(8u, 6u) to Rational(-3973995, 392),
+                listOf(0u, 7u) to Rational(67203, 784),
+                listOf(1u, 7u) to Rational(39281469, 54880),
+                listOf(2u, 7u) to Rational(70162551, 27440),
+                listOf(3u, 7u) to Rational(413630709, 54880),
+                listOf(4u, 7u) to Rational(4640410269, 192080),
+                listOf(5u, 7u) to Rational(802712247, 54880),
+                listOf(6u, 7u) to Rational(-473517603, 27440),
+                listOf(7u, 7u) to Rational(-17055459, 1568),
+                listOf(8u, 7u) to Rational(-12825, 14),
+                listOf(0u, 8u) to Rational(16245, 1568),
+                listOf(1u, 8u) to Rational(503253, 2744),
+                listOf(2u, 8u) to Rational(125292591, 96040),
+                listOf(3u, 8u) to Rational(12033171, 2744),
+                listOf(4u, 8u) to Rational(154352673, 27440),
+                listOf(5u, 8u) to Rational(-1302291, 392),
+                listOf(6u, 8u) to Rational(-20265741, 1960),
+                listOf(7u, 8u) to Rational(-26163, 56),
+                listOf(8u, 8u) to Rational(146205, 32),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, bufferOf(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0, 6),
+                    listOf(1u) to Rational(14, 8),
+                    listOf(2u) to Rational(-14, 2),
+                    listOf(0u, 1u) to Rational(-3, 5),
+                    listOf(1u, 1u) to Rational(11, 1),
+                    listOf(2u, 1u) to Rational(3, 7),
+                    listOf(0u, 2u) to Rational(-3, 7),
+                    listOf(1u, 2u) to Rational(-18, 5),
+                    listOf(2u, 2u) to Rational(-9, 1),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-9, 2),
+                    listOf(1u) to Rational(2, 7),
+                    listOf(2u) to Rational(9, 1),
+                    listOf(0u, 1u) to Rational(13, 1),
+                    listOf(1u, 1u) to Rational(-1, 8),
+                    listOf(2u, 1u) to Rational(2, 8),
+                    listOf(0u, 2u) to Rational(19, 4),
+                    listOf(1u, 2u) to Rational(15, 7),
+                    listOf(2u, 2u) to Rational(-19, 4),
+                ),
+            )),
+            "test 4"
+        )
+        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = (0/6 + 14/8 s + -14/2 s^2) + (-3/5 + 11/1 s + 3/7 s^2) t + (-3/7 + -18/5 s + -9/1 s^2) t^2, y = t
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(7, 3),
+                listOf(2u) to Rational(-35, 16),
+                listOf(3u) to Rational(-343, 6),
+                listOf(4u) to Rational(343, 3),
+                listOf(0u, 1u) to Rational(-19, 5),
+                listOf(1u, 1u) to Rational(-823, 120),
+                listOf(2u, 1u) to Rational(1232417, 6720),
+                listOf(3u, 1u) to Rational(-9863, 24),
+                listOf(4u, 1u) to Rational(385, 4),
+                listOf(0u, 2u) to Rational(2439, 350),
+                listOf(1u, 2u) to Rational(-5793, 40),
+                listOf(2u, 2u) to Rational(1172113, 3360),
+                listOf(3u, 2u) to Rational(-13531, 40),
+                listOf(4u, 2u) to Rational(2824, 7),
+                listOf(0u, 3u) to Rational(3417, 700),
+                listOf(1u, 3u) to Rational(1191, 200),
+                listOf(2u, 3u) to Rational(8383, 28),
+                listOf(3u, 3u) to Rational(-220279, 280),
+                listOf(4u, 3u) to Rational(49179, 196),
+                listOf(0u, 4u) to Rational(57, 35),
+                listOf(1u, 4u) to Rational(-33771, 700),
+                listOf(2u, 4u) to Rational(196279, 1225),
+                listOf(3u, 4u) to Rational(-32259, 140),
+                listOf(4u, 4u) to Rational(23868, 49),
+                listOf(0u, 5u) to Rational(333, 196),
+                listOf(1u, 5u) to Rational(-204, 35),
+                listOf(2u, 5u) to Rational(-307233, 2450),
+                listOf(3u, 5u) to Rational(-12492, 35),
+                listOf(4u, 5u) to Rational(4563, 28),
+                listOf(0u, 6u) to Rational(45, 98),
+                listOf(1u, 6u) to Rational(54, 7),
+                listOf(2u, 6u) to Rational(1809, 35),
+                listOf(3u, 6u) to Rational(162),
+                listOf(4u, 6u) to Rational(405, 2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, bufferOf(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0, 6),
+                    listOf(1u) to Rational(14, 8),
+                    listOf(2u) to Rational(-14, 2),
+                    listOf(0u, 1u) to Rational(-3, 5),
+                    listOf(1u, 1u) to Rational(11, 1),
+                    listOf(2u, 1u) to Rational(3, 7),
+                    listOf(0u, 2u) to Rational(-3, 7),
+                    listOf(1u, 2u) to Rational(-18, 5),
+                    listOf(2u, 2u) to Rational(-9, 1),
+                ),
+            )),
+            "test 5"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substitute(RationalField, bufferOf<NumberedPolynomial<Rational>>()),
+            "test 6"
+        )
     }
     @Test
     @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
             //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
             //  not r^(deg(p)(deg(p)+1)/2) as it is now.
     fun test_Polynomial_substitute_RationalFunction_Buffer() {
-        // TODO
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1)
+            ).substitute(RationalField, bufferOf(
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(1)
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(1)
+                    )
+                )
+            )),
+            "test 1"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf(4u) to Rational(-194071, 4900),
+                    listOf(3u, 1u) to Rational(394811, 225),
+                    listOf(2u, 2u) to Rational(-444183161, 66150),
+                    listOf(1u, 3u) to Rational(70537618, 59535),
+                    listOf(0u, 4u) to Rational(9655504, 2835),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf(4u) to Rational(9, 1),
+                    listOf(3u, 1u) to Rational(61, 1),
+                    listOf(2u, 2u) to Rational(2137, 36),
+                    listOf(1u, 3u) to Rational(-1342, 9),
+                    listOf(0u, 4u) to Rational(484, 9),
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, bufferOf(
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(17, 7),
+                        listOf(0u, 1u) to Rational(-13, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(-18, 6),
+                        listOf(0u, 1u) to Rational(11, 6),
+                    )
+                ),
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(18, 5),
+                        listOf(0u, 1u) to Rational(-16, 3),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(-1, 1),
+                        listOf(0u, 1u) to Rational(-4, 1),
+                    )
+                ),
+            )),
+            "test 2"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-6443599, 10000),
+                    listOf(1u) to Rational(166251223, 210000),
+                    listOf(2u) to Rational(-4606805099, 3528000),
+                    listOf(3u) to Rational(51204379, 19600),
+                    listOf(4u) to Rational(-529045460659, 277830000),
+                    listOf(5u) to Rational(2630836709, 1488375),
+                    listOf(6u) to Rational(-42675691369, 25004700),
+                    listOf(7u) to Rational(495825223, 1250235),
+                    listOf(8u) to Rational(-22531756, 1750329),
+                    listOf(0u, 1u) to Rational(-2526552797, 420000),
+                    listOf(1u, 1u) to Rational(31108840471, 2520000),
+                    listOf(2u, 1u) to Rational(-4789740847, 1102500),
+                    listOf(3u, 1u) to Rational(186594307807, 11340000),
+                    listOf(4u, 1u) to Rational(-11677815943, 1488375),
+                    listOf(5u, 1u) to Rational(-181118486447, 27783000),
+                    listOf(6u, 1u) to Rational(-16123292162, 14586075),
+                    listOf(7u, 1u) to Rational(-140339343808, 26254935),
+                    listOf(8u, 1u) to Rational(4570171616, 5250987),
+                    listOf(0u, 2u) to Rational(-181436530573, 10080000),
+                    listOf(1u, 2u) to Rational(6700437957491, 105840000),
+                    listOf(2u, 2u) to Rational(-3527267461, 1417500),
+                    listOf(3u, 2u) to Rational(-38084563451, 5556600),
+                    listOf(4u, 2u) to Rational(-565662040631, 13891500),
+                    listOf(5u, 2u) to Rational(-35479071126397, 583443000),
+                    listOf(6u, 2u) to Rational(-11717559078469, 525098700),
+                    listOf(7u, 2u) to Rational(-2043385293517, 225042300),
+                    listOf(8u, 2u) to Rational(-3644439630451, 551353635),
+                    listOf(0u, 3u) to Rational(-1760423269, 126000),
+                    listOf(1u, 3u) to Rational(310176758299, 2352000),
+                    listOf(2u, 3u) to Rational(-907229584837, 21168000),
+                    listOf(3u, 3u) to Rational(-16717135885963, 95256000),
+                    listOf(4u, 3u) to Rational(-43762928025353, 333396000),
+                    listOf(5u, 3u) to Rational(-328427480571607, 3000564000),
+                    listOf(6u, 3u) to Rational(-7722675917197, 210039480),
+                    listOf(7u, 3u) to Rational(1713350137019, 1225230300),
+                    listOf(8u, 3u) to Rational(156695935643, 31505922),
+                    listOf(0u, 4u) to Rational(18362364269, 1008000),
+                    listOf(1u, 4u) to Rational(955674858553, 10584000),
+                    listOf(2u, 4u) to Rational(-71937470607371, 444528000),
+                    listOf(3u, 4u) to Rational(-34097985615163, 95256000),
+                    listOf(4u, 4u) to Rational(-340736178775883, 2000376000),
+                    listOf(5u, 4u) to Rational(-511324523441897, 10501974000),
+                    listOf(6u, 4u) to Rational(-125375649409151, 8821658160),
+                    listOf(7u, 4u) to Rational(-2813518533421, 1575296100),
+                    listOf(8u, 4u) to Rational(-17044089109, 5250987),
+                    listOf(0u, 5u) to Rational(600086461, 20160),
+                    listOf(1u, 5u) to Rational(-18959931367, 423360),
+                    listOf(2u, 5u) to Rational(-9178804929607, 44452800),
+                    listOf(3u, 5u) to Rational(-1460114275979, 5334336),
+                    listOf(4u, 5u) to Rational(-342533479090169, 4200789600),
+                    listOf(5u, 5u) to Rational(20335453022963, 4200789600),
+                    listOf(6u, 5u) to Rational(-21649775090197, 6301184400),
+                    listOf(7u, 5u) to Rational(-197301716069, 131274675),
+                    listOf(8u, 5u) to Rational(18711357470, 15752961),
+                    listOf(0u, 6u) to Rational(621417991, 100800),
+                    listOf(1u, 6u) to Rational(-159236792977, 2116800),
+                    listOf(2u, 6u) to Rational(-6602528890883, 66679200),
+                    listOf(3u, 6u) to Rational(-1086091664047, 19051200),
+                    listOf(4u, 6u) to Rational(3769375009003, 1680315840),
+                    listOf(5u, 6u) to Rational(-12920385574769, 1050197400),
+                    listOf(6u, 6u) to Rational(-90219591809287, 6301184400),
+                    listOf(7u, 6u) to Rational(656361553391, 1575296100),
+                    listOf(8u, 6u) to Rational(757900793, 2250423),
+                    listOf(0u, 7u) to Rational(-100770017, 15120),
+                    listOf(1u, 7u) to Rational(-316364851, 17640),
+                    listOf(2u, 7u) to Rational(-85118560057, 6667920),
+                    listOf(3u, 7u) to Rational(6286563719, 416745),
+                    listOf(4u, 7u) to Rational(26803885301, 1714608),
+                    listOf(5u, 7u) to Rational(-13767154393, 4286520),
+                    listOf(6u, 7u) to Rational(-3875138933, 1224720),
+                    listOf(7u, 7u) to Rational(65193755, 333396),
+                    listOf(8u, 7u) to Rational(90974351, 2500470),
+                    listOf(0u, 8u) to Rational(-3182197, 1260),
+                    listOf(1u, 8u) to Rational(24899923, 8820),
+                    listOf(2u, 8u) to Rational(-19999556, 19845),
+                    listOf(3u, 8u) to Rational(3276587, 3969),
+                    listOf(4u, 8u) to Rational(13719549239, 5000940),
+                    listOf(5u, 8u) to Rational(-961839938, 1250235),
+                    listOf(6u, 8u) to Rational(-198184871, 833490),
+                    listOf(7u, 8u) to Rational(230659711, 5000940),
+                    listOf(8u, 8u) to Rational(292447, 35721)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(9, 100),
+                    listOf(1u) to Rational(-21, 50),
+                    listOf(2u) to Rational(293, 700),
+                    listOf(3u) to Rational(29, 210),
+                    listOf(4u) to Rational(3233, 8820),
+                    listOf(5u) to Rational(-289, 441),
+                    listOf(6u) to Rational(-1, 9),
+                    listOf(7u) to Rational(-20, 441),
+                    listOf(8u) to Rational(100, 441),
+                    listOf(0u, 1u) to Rational(-57, 80),
+                    listOf(1u, 1u) to Rational(-121, 400),
+                    listOf(2u, 1u) to Rational(37117, 8400),
+                    listOf(3u, 1u) to Rational(-4853, 3150),
+                    listOf(4u, 1u) to Rational(1166203, 132300),
+                    listOf(5u, 1u) to Rational(-2708, 567),
+                    listOf(6u, 1u) to Rational(-287159, 416745),
+                    listOf(7u, 1u) to Rational(-478204, 83349),
+                    listOf(8u, 1u) to Rational(176320, 83349),
+                    listOf(0u, 2u) to Rational(-6239, 6400),
+                    listOf(1u, 2u) to Rational(264211, 11200),
+                    listOf(2u, 2u) to Rational(-1591999, 100800),
+                    listOf(3u, 2u) to Rational(12450091, 529200),
+                    listOf(4u, 2u) to Rational(9230759, 226800),
+                    listOf(5u, 2u) to Rational(18995554, 2083725),
+                    listOf(6u, 2u) to Rational(136706258, 6251175),
+                    listOf(7u, 2u) to Rational(-120907496, 3750705),
+                    listOf(8u, 2u) to Rational(117200176, 15752961),
+                    listOf(0u, 3u) to Rational(5653, 320),
+                    listOf(1u, 3u) to Rational(-130853, 8400),
+                    listOf(2u, 3u) to Rational(-20939327, 151200),
+                    listOf(3u, 3u) to Rational(2566691, 25200),
+                    listOf(4u, 3u) to Rational(-68441519, 476280),
+                    listOf(5u, 3u) to Rational(2462904247, 12502350),
+                    listOf(6u, 3u) to Rational(353667161, 18753525),
+                    listOf(7u, 3u) to Rational(-1689134372, 26254935),
+                    listOf(8u, 3u) to Rational(35084104, 2250423),
+                    listOf(0u, 4u) to Rational(-3587, 300),
+                    listOf(1u, 4u) to Rational(-10513243, 33600),
+                    listOf(2u, 4u) to Rational(30766733, 176400),
+                    listOf(3u, 4u) to Rational(-65680021, 198450),
+                    listOf(4u, 4u) to Rational(-8108910547, 20003760),
+                    listOf(5u, 4u) to Rational(2922125159, 6251175),
+                    listOf(6u, 4u) to Rational(-4245279943, 131274675),
+                    listOf(7u, 4u) to Rational(-371946872, 3750705),
+                    listOf(8u, 4u) to Rational(61286752, 2250423),
+                    listOf(0u, 5u) to Rational(-20477, 160),
+                    listOf(1u, 5u) to Rational(215741, 1120),
+                    listOf(2u, 5u) to Rational(30785843, 31752),
+                    listOf(3u, 5u) to Rational(-357495959, 317520),
+                    listOf(4u, 5u) to Rational(-1611242993, 10001880),
+                    listOf(5u, 5u) to Rational(345925495, 500094),
+                    listOf(6u, 5u) to Rational(-755948411, 3750705),
+                    listOf(7u, 5u) to Rational(-108643496, 1250235),
+                    listOf(8u, 5u) to Rational(1122512, 35721),
+                    listOf(0u, 6u) to Rational(358037, 2880),
+                    listOf(1u, 6u) to Rational(3895837, 3360),
+                    listOf(2u, 6u) to Rational(359419201, 1270080),
+                    listOf(3u, 6u) to Rational(-158522587, 105840),
+                    listOf(4u, 6u) to Rational(10909002599, 20003760),
+                    listOf(5u, 6u) to Rational(76846972, 138915),
+                    listOf(6u, 6u) to Rational(-327696553, 1250235),
+                    listOf(7u, 6u) to Rational(-1687328, 35721),
+                    listOf(8u, 6u) to Rational(1016836, 35721),
+                    listOf(0u, 7u) to Rational(658, 3),
+                    listOf(1u, 7u) to Rational(48035, 168),
+                    listOf(2u, 7u) to Rational(-5777875, 5292),
+                    listOf(3u, 7u) to Rational(-7893899, 10584),
+                    listOf(4u, 7u) to Rational(10191652, 11907),
+                    listOf(5u, 7u) to Rational(2920121, 23814),
+                    listOf(6u, 7u) to Rational(-2699780, 11907),
+                    listOf(7u, 7u) to Rational(4556, 441),
+                    listOf(8u, 7u) to Rational(3440, 189),
+                    listOf(0u, 8u) to Rational(64, 1),
+                    listOf(1u, 8u) to Rational(-808, 7),
+                    listOf(2u, 8u) to Rational(-360895, 1764),
+                    listOf(3u, 8u) to Rational(257657, 882),
+                    listOf(4u, 8u) to Rational(3779917, 15876),
+                    listOf(5u, 8u) to Rational(-610279, 3969),
+                    listOf(6u, 8u) to Rational(-25091, 441),
+                    listOf(7u, 8u) to Rational(9560, 567),
+                    listOf(8u, 8u) to Rational(400, 81)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, bufferOf(
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(17, 5),
+                        listOf(1u) to Rational(11, 6),
+                        listOf(2u) to Rational(14, 3),
+                        listOf(0u, 1u) to Rational(17, 1),
+                        listOf(1u, 1u) to Rational(12, 3),
+                        listOf(2u, 1u) to Rational(-6, 2),
+                        listOf(0u, 2u) to Rational(17, 1),
+                        listOf(1u, 2u) to Rational(-4, 3),
+                        listOf(2u, 2u) to Rational(2, 6),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(3, 5),
+                        listOf(1u) to Rational(3, 5),
+                        listOf(2u) to Rational(3, 7),
+                        listOf(0u, 1u) to Rational(-3, 8),
+                        listOf(1u, 1u) to Rational(-1, 1),
+                        listOf(2u, 1u) to Rational(17, 9),
+                        listOf(0u, 2u) to Rational(-8, 1),
+                        listOf(1u, 2u) to Rational(6, 4),
+                        listOf(2u, 2u) to Rational(10, 9),
+                    )
+                ),
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(18, 5),
+                        listOf(1u) to Rational(-17, 5),
+                        listOf(2u) to Rational(-2, 7),
+                        listOf(0u, 1u) to Rational(6, 5),
+                        listOf(1u, 1u) to Rational(-5, 1),
+                        listOf(2u, 1u) to Rational(-9, 1),
+                        listOf(0u, 2u) to Rational(-8, 8),
+                        listOf(1u, 2u) to Rational(2, 7),
+                        listOf(2u, 2u) to Rational(-13, 7),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-4, 8),
+                        listOf(1u) to Rational(15, 9),
+                        listOf(2u) to Rational(-10, 9),
+                        listOf(0u, 1u) to Rational(5, 3),
+                        listOf(1u, 1u) to Rational(4, 1),
+                        listOf(2u, 1u) to Rational(-2, 7),
+                        listOf(0u, 2u) to Rational(2, 2),
+                        listOf(1u, 2u) to Rational(-5, 7),
+                        listOf(2u, 2u) to Rational(-18, 9),
+                    )
+                ),
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-2, 9),
+                        listOf(1u) to Rational(-6, 3),
+                        listOf(2u) to Rational(10, 9),
+                        listOf(0u, 1u) to Rational(13, 3),
+                        listOf(1u, 1u) to Rational(-12, 4),
+                        listOf(2u, 1u) to Rational(3, 6),
+                        listOf(0u, 2u) to Rational(2, 9),
+                        listOf(1u, 2u) to Rational(7, 3),
+                        listOf(2u, 2u) to Rational(16, 5),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-6, 2),
+                        listOf(1u) to Rational(6, 2),
+                        listOf(2u) to Rational(2, 7),
+                        listOf(0u, 1u) to Rational(-18, 1),
+                        listOf(1u, 1u) to Rational(-11, 3),
+                        listOf(2u, 1u) to Rational(7, 5),
+                        listOf(0u, 2u) to Rational(8, 1),
+                        listOf(1u, 2u) to Rational(6, 7),
+                        listOf(2u, 2u) to Rational(17, 4),
+                    )
+                )
+            )),
+            "test 3"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-6443599, 10000),
+                    listOf(1u) to Rational(166251223, 210000),
+                    listOf(2u) to Rational(-4606805099, 3528000),
+                    listOf(3u) to Rational(51204379, 19600),
+                    listOf(4u) to Rational(-529045460659, 277830000),
+                    listOf(5u) to Rational(2630836709, 1488375),
+                    listOf(6u) to Rational(-42675691369, 25004700),
+                    listOf(7u) to Rational(495825223, 1250235),
+                    listOf(8u) to Rational(-22531756, 1750329),
+                    listOf(0u, 1u) to Rational(-2526552797, 420000),
+                    listOf(1u, 1u) to Rational(31108840471, 2520000),
+                    listOf(2u, 1u) to Rational(-4789740847, 1102500),
+                    listOf(3u, 1u) to Rational(186594307807, 11340000),
+                    listOf(4u, 1u) to Rational(-11677815943, 1488375),
+                    listOf(5u, 1u) to Rational(-181118486447, 27783000),
+                    listOf(6u, 1u) to Rational(-16123292162, 14586075),
+                    listOf(7u, 1u) to Rational(-140339343808, 26254935),
+                    listOf(8u, 1u) to Rational(4570171616, 5250987),
+                    listOf(0u, 2u) to Rational(-181436530573, 10080000),
+                    listOf(1u, 2u) to Rational(6700437957491, 105840000),
+                    listOf(2u, 2u) to Rational(-3527267461, 1417500),
+                    listOf(3u, 2u) to Rational(-38084563451, 5556600),
+                    listOf(4u, 2u) to Rational(-565662040631, 13891500),
+                    listOf(5u, 2u) to Rational(-35479071126397, 583443000),
+                    listOf(6u, 2u) to Rational(-11717559078469, 525098700),
+                    listOf(7u, 2u) to Rational(-2043385293517, 225042300),
+                    listOf(8u, 2u) to Rational(-3644439630451, 551353635),
+                    listOf(0u, 3u) to Rational(-1760423269, 126000),
+                    listOf(1u, 3u) to Rational(310176758299, 2352000),
+                    listOf(2u, 3u) to Rational(-907229584837, 21168000),
+                    listOf(3u, 3u) to Rational(-16717135885963, 95256000),
+                    listOf(4u, 3u) to Rational(-43762928025353, 333396000),
+                    listOf(5u, 3u) to Rational(-328427480571607, 3000564000),
+                    listOf(6u, 3u) to Rational(-7722675917197, 210039480),
+                    listOf(7u, 3u) to Rational(1713350137019, 1225230300),
+                    listOf(8u, 3u) to Rational(156695935643, 31505922),
+                    listOf(0u, 4u) to Rational(18362364269, 1008000),
+                    listOf(1u, 4u) to Rational(955674858553, 10584000),
+                    listOf(2u, 4u) to Rational(-71937470607371, 444528000),
+                    listOf(3u, 4u) to Rational(-34097985615163, 95256000),
+                    listOf(4u, 4u) to Rational(-340736178775883, 2000376000),
+                    listOf(5u, 4u) to Rational(-511324523441897, 10501974000),
+                    listOf(6u, 4u) to Rational(-125375649409151, 8821658160),
+                    listOf(7u, 4u) to Rational(-2813518533421, 1575296100),
+                    listOf(8u, 4u) to Rational(-17044089109, 5250987),
+                    listOf(0u, 5u) to Rational(600086461, 20160),
+                    listOf(1u, 5u) to Rational(-18959931367, 423360),
+                    listOf(2u, 5u) to Rational(-9178804929607, 44452800),
+                    listOf(3u, 5u) to Rational(-1460114275979, 5334336),
+                    listOf(4u, 5u) to Rational(-342533479090169, 4200789600),
+                    listOf(5u, 5u) to Rational(20335453022963, 4200789600),
+                    listOf(6u, 5u) to Rational(-21649775090197, 6301184400),
+                    listOf(7u, 5u) to Rational(-197301716069, 131274675),
+                    listOf(8u, 5u) to Rational(18711357470, 15752961),
+                    listOf(0u, 6u) to Rational(621417991, 100800),
+                    listOf(1u, 6u) to Rational(-159236792977, 2116800),
+                    listOf(2u, 6u) to Rational(-6602528890883, 66679200),
+                    listOf(3u, 6u) to Rational(-1086091664047, 19051200),
+                    listOf(4u, 6u) to Rational(3769375009003, 1680315840),
+                    listOf(5u, 6u) to Rational(-12920385574769, 1050197400),
+                    listOf(6u, 6u) to Rational(-90219591809287, 6301184400),
+                    listOf(7u, 6u) to Rational(656361553391, 1575296100),
+                    listOf(8u, 6u) to Rational(757900793, 2250423),
+                    listOf(0u, 7u) to Rational(-100770017, 15120),
+                    listOf(1u, 7u) to Rational(-316364851, 17640),
+                    listOf(2u, 7u) to Rational(-85118560057, 6667920),
+                    listOf(3u, 7u) to Rational(6286563719, 416745),
+                    listOf(4u, 7u) to Rational(26803885301, 1714608),
+                    listOf(5u, 7u) to Rational(-13767154393, 4286520),
+                    listOf(6u, 7u) to Rational(-3875138933, 1224720),
+                    listOf(7u, 7u) to Rational(65193755, 333396),
+                    listOf(8u, 7u) to Rational(90974351, 2500470),
+                    listOf(0u, 8u) to Rational(-3182197, 1260),
+                    listOf(1u, 8u) to Rational(24899923, 8820),
+                    listOf(2u, 8u) to Rational(-19999556, 19845),
+                    listOf(3u, 8u) to Rational(3276587, 3969),
+                    listOf(4u, 8u) to Rational(13719549239, 5000940),
+                    listOf(5u, 8u) to Rational(-961839938, 1250235),
+                    listOf(6u, 8u) to Rational(-198184871, 833490),
+                    listOf(7u, 8u) to Rational(230659711, 5000940),
+                    listOf(8u, 8u) to Rational(292447, 35721)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(9, 100),
+                    listOf(1u) to Rational(-21, 50),
+                    listOf(2u) to Rational(293, 700),
+                    listOf(3u) to Rational(29, 210),
+                    listOf(4u) to Rational(3233, 8820),
+                    listOf(5u) to Rational(-289, 441),
+                    listOf(6u) to Rational(-1, 9),
+                    listOf(7u) to Rational(-20, 441),
+                    listOf(8u) to Rational(100, 441),
+                    listOf(0u, 1u) to Rational(-57, 80),
+                    listOf(1u, 1u) to Rational(-121, 400),
+                    listOf(2u, 1u) to Rational(37117, 8400),
+                    listOf(3u, 1u) to Rational(-4853, 3150),
+                    listOf(4u, 1u) to Rational(1166203, 132300),
+                    listOf(5u, 1u) to Rational(-2708, 567),
+                    listOf(6u, 1u) to Rational(-287159, 416745),
+                    listOf(7u, 1u) to Rational(-478204, 83349),
+                    listOf(8u, 1u) to Rational(176320, 83349),
+                    listOf(0u, 2u) to Rational(-6239, 6400),
+                    listOf(1u, 2u) to Rational(264211, 11200),
+                    listOf(2u, 2u) to Rational(-1591999, 100800),
+                    listOf(3u, 2u) to Rational(12450091, 529200),
+                    listOf(4u, 2u) to Rational(9230759, 226800),
+                    listOf(5u, 2u) to Rational(18995554, 2083725),
+                    listOf(6u, 2u) to Rational(136706258, 6251175),
+                    listOf(7u, 2u) to Rational(-120907496, 3750705),
+                    listOf(8u, 2u) to Rational(117200176, 15752961),
+                    listOf(0u, 3u) to Rational(5653, 320),
+                    listOf(1u, 3u) to Rational(-130853, 8400),
+                    listOf(2u, 3u) to Rational(-20939327, 151200),
+                    listOf(3u, 3u) to Rational(2566691, 25200),
+                    listOf(4u, 3u) to Rational(-68441519, 476280),
+                    listOf(5u, 3u) to Rational(2462904247, 12502350),
+                    listOf(6u, 3u) to Rational(353667161, 18753525),
+                    listOf(7u, 3u) to Rational(-1689134372, 26254935),
+                    listOf(8u, 3u) to Rational(35084104, 2250423),
+                    listOf(0u, 4u) to Rational(-3587, 300),
+                    listOf(1u, 4u) to Rational(-10513243, 33600),
+                    listOf(2u, 4u) to Rational(30766733, 176400),
+                    listOf(3u, 4u) to Rational(-65680021, 198450),
+                    listOf(4u, 4u) to Rational(-8108910547, 20003760),
+                    listOf(5u, 4u) to Rational(2922125159, 6251175),
+                    listOf(6u, 4u) to Rational(-4245279943, 131274675),
+                    listOf(7u, 4u) to Rational(-371946872, 3750705),
+                    listOf(8u, 4u) to Rational(61286752, 2250423),
+                    listOf(0u, 5u) to Rational(-20477, 160),
+                    listOf(1u, 5u) to Rational(215741, 1120),
+                    listOf(2u, 5u) to Rational(30785843, 31752),
+                    listOf(3u, 5u) to Rational(-357495959, 317520),
+                    listOf(4u, 5u) to Rational(-1611242993, 10001880),
+                    listOf(5u, 5u) to Rational(345925495, 500094),
+                    listOf(6u, 5u) to Rational(-755948411, 3750705),
+                    listOf(7u, 5u) to Rational(-108643496, 1250235),
+                    listOf(8u, 5u) to Rational(1122512, 35721),
+                    listOf(0u, 6u) to Rational(358037, 2880),
+                    listOf(1u, 6u) to Rational(3895837, 3360),
+                    listOf(2u, 6u) to Rational(359419201, 1270080),
+                    listOf(3u, 6u) to Rational(-158522587, 105840),
+                    listOf(4u, 6u) to Rational(10909002599, 20003760),
+                    listOf(5u, 6u) to Rational(76846972, 138915),
+                    listOf(6u, 6u) to Rational(-327696553, 1250235),
+                    listOf(7u, 6u) to Rational(-1687328, 35721),
+                    listOf(8u, 6u) to Rational(1016836, 35721),
+                    listOf(0u, 7u) to Rational(658, 3),
+                    listOf(1u, 7u) to Rational(48035, 168),
+                    listOf(2u, 7u) to Rational(-5777875, 5292),
+                    listOf(3u, 7u) to Rational(-7893899, 10584),
+                    listOf(4u, 7u) to Rational(10191652, 11907),
+                    listOf(5u, 7u) to Rational(2920121, 23814),
+                    listOf(6u, 7u) to Rational(-2699780, 11907),
+                    listOf(7u, 7u) to Rational(4556, 441),
+                    listOf(8u, 7u) to Rational(3440, 189),
+                    listOf(0u, 8u) to Rational(64, 1),
+                    listOf(1u, 8u) to Rational(-808, 7),
+                    listOf(2u, 8u) to Rational(-360895, 1764),
+                    listOf(3u, 8u) to Rational(257657, 882),
+                    listOf(4u, 8u) to Rational(3779917, 15876),
+                    listOf(5u, 8u) to Rational(-610279, 3969),
+                    listOf(6u, 8u) to Rational(-25091, 441),
+                    listOf(7u, 8u) to Rational(9560, 567),
+                    listOf(8u, 8u) to Rational(400, 81)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, bufferOf(
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(17, 5),
+                        listOf(1u) to Rational(11, 6),
+                        listOf(2u) to Rational(14, 3),
+                        listOf(0u, 1u) to Rational(17, 1),
+                        listOf(1u, 1u) to Rational(12, 3),
+                        listOf(2u, 1u) to Rational(-6, 2),
+                        listOf(0u, 2u) to Rational(17, 1),
+                        listOf(1u, 2u) to Rational(-4, 3),
+                        listOf(2u, 2u) to Rational(2, 6),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(3, 5),
+                        listOf(1u) to Rational(3, 5),
+                        listOf(2u) to Rational(3, 7),
+                        listOf(0u, 1u) to Rational(-3, 8),
+                        listOf(1u, 1u) to Rational(-1, 1),
+                        listOf(2u, 1u) to Rational(17, 9),
+                        listOf(0u, 2u) to Rational(-8, 1),
+                        listOf(1u, 2u) to Rational(6, 4),
+                        listOf(2u, 2u) to Rational(10, 9),
+                    )
+                ),
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(18, 5),
+                        listOf(1u) to Rational(-17, 5),
+                        listOf(2u) to Rational(-2, 7),
+                        listOf(0u, 1u) to Rational(6, 5),
+                        listOf(1u, 1u) to Rational(-5, 1),
+                        listOf(2u, 1u) to Rational(-9, 1),
+                        listOf(0u, 2u) to Rational(-8, 8),
+                        listOf(1u, 2u) to Rational(2, 7),
+                        listOf(2u, 2u) to Rational(-13, 7),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-4, 8),
+                        listOf(1u) to Rational(15, 9),
+                        listOf(2u) to Rational(-10, 9),
+                        listOf(0u, 1u) to Rational(5, 3),
+                        listOf(1u, 1u) to Rational(4, 1),
+                        listOf(2u, 1u) to Rational(-2, 7),
+                        listOf(0u, 2u) to Rational(2, 2),
+                        listOf(1u, 2u) to Rational(-5, 7),
+                        listOf(2u, 2u) to Rational(-18, 9),
+                    )
+                ),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-66677, 3500),
+                    listOf(1u) to Rational(-206281, 10500),
+                    listOf(2u) to Rational(-412567, 7056),
+                    listOf(3u) to Rational(-310081, 11025),
+                    listOf(4u) to Rational(-575996, 15435),
+                    listOf(0u, 1u) to Rational(-573701, 4200),
+                    listOf(1u, 1u) to Rational(-2239001, 25200),
+                    listOf(2u, 1u) to Rational(-8817889, 132300),
+                    listOf(3u, 1u) to Rational(2317919, 44100),
+                    listOf(4u, 1u) to Rational(1169471, 6615),
+                    listOf(0u, 2u) to Rational(-4057819, 33600),
+                    listOf(1u, 2u) to Rational(1373311, 12600),
+                    listOf(2u, 2u) to Rational(32433493, 52920),
+                    listOf(3u, 2u) to Rational(4998053, 33075),
+                    listOf(4u, 2u) to Rational(-2147779, 8820),
+                    listOf(0u, 3u) to Rational(2018481, 2240),
+                    listOf(1u, 3u) to Rational(941713, 1440),
+                    listOf(2u, 3u) to Rational(183749, 6615),
+                    listOf(3u, 3u) to Rational(-4631023, 15876),
+                    listOf(4u, 3u) to Rational(25609336, 178605),
+                    listOf(0u, 4u) to Rational(11886431, 6720),
+                    listOf(1u, 4u) to Rational(18433, 504),
+                    listOf(2u, 4u) to Rational(-39613331, 45360),
+                    listOf(3u, 4u) to Rational(681619, 5670),
+                    listOf(4u, 4u) to Rational(-864841, 20412),
+                    listOf(0u, 5u) to Rational(343535, 1008),
+                    listOf(1u, 5u) to Rational(-33583, 72),
+                    listOf(2u, 5u) to Rational(1194625, 9072),
+                    listOf(3u, 5u) to Rational(-62917, 2268),
+                    listOf(4u, 5u) to Rational(157645, 10206),
+                    listOf(0u, 6u) to Rational(-1381, 3),
+                    listOf(1u, 6u) to Rational(919, 36),
+                    listOf(2u, 6u) to Rational(-3053, 36),
+                    listOf(3u, 6u) to Rational(2125, 324),
+                    listOf(4u, 6u) to Rational(-236, 243)
+                ),
+                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-5, 3),
+                    listOf(2u) to Rational(35, 9),
+                    listOf(3u) to Rational(-100, 27),
+                    listOf(4u) to Rational(100, 81),
+                    listOf(0u, 1u) to Rational(-5, 3),
+                    listOf(1u, 1u) to Rational(14, 9),
+                    listOf(2u, 1u) to Rational(1874, 189),
+                    listOf(3u, 1u) to Rational(-620, 63),
+                    listOf(4u, 1u) to Rational(40, 63),
+                    listOf(0u, 2u) to Rational(16, 9),
+                    listOf(1u, 2u) to Rational(365, 21),
+                    listOf(2u, 2u) to Rational(112, 9),
+                    listOf(3u, 2u) to Rational(-464, 63),
+                    listOf(4u, 2u) to Rational(1996, 441),
+                    listOf(0u, 3u) to Rational(10, 3),
+                    listOf(1u, 3u) to Rational(118, 21),
+                    listOf(2u, 3u) to Rational(-272, 21),
+                    listOf(3u, 3u) to Rational(-764, 49),
+                    listOf(4u, 3u) to Rational(8, 7),
+                    listOf(0u, 4u) to Rational(1, 1),
+                    listOf(1u, 4u) to Rational(-10, 7),
+                    listOf(2u, 4u) to Rational(-171, 49),
+                    listOf(3u, 4u) to Rational(20, 7),
+                    listOf(4u, 4u) to Rational(4, 1)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, bufferOf(
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(17, 5),
+                        listOf(1u) to Rational(11, 6),
+                        listOf(2u) to Rational(14, 3),
+                        listOf(0u, 1u) to Rational(17, 1),
+                        listOf(1u, 1u) to Rational(12, 3),
+                        listOf(2u, 1u) to Rational(-6, 2),
+                        listOf(0u, 2u) to Rational(17, 1),
+                        listOf(1u, 2u) to Rational(-4, 3),
+                        listOf(2u, 2u) to Rational(2, 6),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(3, 5),
+                        listOf(1u) to Rational(3, 5),
+                        listOf(2u) to Rational(3, 7),
+                        listOf(0u, 1u) to Rational(-3, 8),
+                        listOf(1u, 1u) to Rational(-1, 1),
+                        listOf(2u, 1u) to Rational(17, 9),
+                        listOf(0u, 2u) to Rational(-8, 1),
+                        listOf(1u, 2u) to Rational(6, 4),
+                        listOf(2u, 2u) to Rational(10, 9),
+                    )
+                ),
+            )),
+            "test 5"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(15, 7),
+                    listOf(1u) to Rational(1, 5),
+                    listOf(2u) to Rational(-7, 4),
+                    listOf(0u, 1u) to Rational(-1, 9),
+                    listOf(1u, 1u) to Rational(-2, 7),
+                    listOf(2u, 1u) to Rational(17, 3),
+                    listOf(0u, 2u) to Rational(2, 6),
+                    listOf(1u, 2u) to Rational(-17, 6),
+                    listOf(2u, 2u) to Rational(-6, 2),
+                ),
+                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
+                    listOf<UInt>() to Rational(0, 1)
+                )
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(15, 7),
+                listOf(1u) to Rational(1, 5),
+                listOf(2u) to Rational(-7, 4),
+                listOf(0u, 1u) to Rational(-1, 9),
+                listOf(1u, 1u) to Rational(-2, 7),
+                listOf(2u, 1u) to Rational(17, 3),
+                listOf(0u, 2u) to Rational(2, 6),
+                listOf(1u, 2u) to Rational(-17, 6),
+                listOf(2u, 2u) to Rational(-6, 2),
+            ).substitute(RationalField, bufferOf<NumberedRationalFunction<Rational>>()),
+            "test 6"
+        )
     }
     @Test
-    @Ignore
     fun test_RationalFunction_substitute_Double_Buffer() {
-        // TODO
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(emptyList<UInt>() to 0.0),
+                NumberedPolynomialAsIs(emptyList<UInt>() to 1.0),
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 1.0,
+                    listOf(1u) to -2.0,
+                    listOf(2u) to 1.0,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 1.0,
+                )
+            ).substitute(bufferOf(
+                1.0
+            )),
+            0.001,
+            "test 1"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substitute(bufferOf()),
+            0.001,
+            "test 2"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 151.1502229133916,
+                    listOf(0u, 1u) to -262.3790170577034,
+                    listOf(0u, 2u) to 102.5097937392923,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to -367.9969733169944,
+                    listOf(0u, 1u) to 112.4911133334554,
+                    listOf(0u, 2u) to -469.755906895345,
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substitute(bufferOf(
+                -8.11707689492641,
+            )),
+            0.001,
+            "test 3"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 7.321261307532708,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to -575.6325831127576,
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substitute(bufferOf(
+                -8.11707689492641,
+                0.795265651276015,
+            )),
+            0.001,
+            "test 4"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 7.321261307532708,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to -575.6325831127576,
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substitute(bufferOf(
+                -8.11707689492641,
+                0.795265651276015,
+                0.9211194782050933
+            )),
+            0.001,
+            "test 5"
+        )
     }
     @Test
-    @Ignore
     fun test_RationalFunction_substitute_Constant_Buffer() {
-        // TODO
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1),
+                    listOf(1u) to Rational(-2),
+                    listOf(2u) to Rational(1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            ).substitute(RationalField, bufferOf(
+                Rational(1)
+            )),
+            "test 1"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(22047, 2450),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-2204953, 147000),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, bufferOf(
+                Rational(7, 5),
+                Rational(-13, 7),
+                Rational(-16, 4),
+            )),
+            "test 2"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(22047, 2450),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-2204953, 147000),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, bufferOf(
+                Rational(7, 5),
+                Rational(-13, 7),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-939, 200),
+                    listOf(0u, 1u) to Rational(123, 50),
+                    listOf(0u, 2u) to Rational(1059, 200)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(121, 25),
+                    listOf(0u, 1u) to Rational(-949, 375),
+                    listOf(0u, 2u) to Rational(-1423, 200)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, bufferOf(
+                Rational(7, 5),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, bufferOf<Rational>()),
+            "test 5"
+        )
     }
     @Test
-    @Ignore
     fun test_RationalFunction_substitute_Polynomial_Buffer() {
-        // TODO
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1),
+                    listOf(1u) to Rational(-2),
+                    listOf(2u) to Rational(1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            ).substitute(RationalField, bufferOf(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            )),
+            "test 1"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(211, 4),
+                    listOf(2u) to Rational(88, 3),
+                    listOf(3u) to Rational(-63, 8),
+                    listOf(4u) to Rational(441, 16),
+                    listOf(0u, 1u) to Rational(-671, 15),
+                    listOf(1u, 1u) to Rational(-551, 21),
+                    listOf(2u, 1u) to Rational(279, 25),
+                    listOf(3u, 1u) to Rational(231, 20),
+                    listOf(0u, 2u) to Rational(-1436, 1575),
+                    listOf(1u, 2u) to Rational(2471, 250),
+                    listOf(2u, 2u) to Rational(-4919, 100),
+                    listOf(0u, 3u) to Rational(-1464, 125),
+                    listOf(1u, 3u) to Rational(-264, 25),
+                    listOf(0u, 4u) to Rational(576, 25),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(-9, 4),
+                    listOf(2u) to Rational(943, 8),
+                    listOf(3u) to Rational(117, 8),
+                    listOf(4u) to Rational(147, 16),
+                    listOf(0u, 1u) to Rational(289, 90),
+                    listOf(1u, 1u) to Rational(-2692, 15),
+                    listOf(2u, 1u) to Rational(-1629, 140),
+                    listOf(3u, 1u) to Rational(77, 20),
+                    listOf(0u, 2u) to Rational(6187, 75),
+                    listOf(1u, 2u) to Rational(-2879, 175),
+                    listOf(2u, 2u) to Rational(-4919, 300),
+                    listOf(0u, 3u) to Rational(336, 25),
+                    listOf(1u, 3u) to Rational(-88, 25),
+                    listOf(0u, 4u) to Rational(192, 25),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, bufferOf(
+                NumberedPolynomialAsIs(
+                    listOf(1u) to Rational(3, 2),
+                    listOf(0u, 1u) to Rational(8, 5),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf(1u) to Rational(7, 2),
+                    listOf(0u, 1u) to Rational(-3, 1),
+                )
+            )),
+            "test 2"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1202861, 210),
+                    listOf(1u) to Rational(-215117, 45),
+                    listOf(2u) to Rational(10889651, 19845),
+                    listOf(3u) to Rational(-3503956, 6615),
+                    listOf(4u) to Rational(809066, 2205),
+                    listOf(5u) to Rational(-9056, 735),
+                    listOf(6u) to Rational(5396, 315),
+                    listOf(7u) to Rational(-752, 147),
+                    listOf(8u) to Rational(16, 49),
+                    listOf(0u, 1u) to Rational(1738469, 1470),
+                    listOf(1u, 1u) to Rational(-926238703, 52920),
+                    listOf(2u, 1u) to Rational(-44113982, 6615),
+                    listOf(3u, 1u) to Rational(10423519, 5292),
+                    listOf(4u, 1u) to Rational(3769712, 2205),
+                    listOf(5u, 1u) to Rational(8905046, 6615),
+                    listOf(6u, 1u) to Rational(1186972, 6615),
+                    listOf(7u, 1u) to Rational(22124, 441),
+                    listOf(8u, 1u) to Rational(-1504, 147),
+                    listOf(0u, 2u) to Rational(-54723628, 2205),
+                    listOf(1u, 2u) to Rational(70109407, 1323),
+                    listOf(2u, 2u) to Rational(151072591, 17640),
+                    listOf(3u, 2u) to Rational(1216428107, 52920),
+                    listOf(4u, 2u) to Rational(2587873193, 317520),
+                    listOf(5u, 2u) to Rational(393536369, 79380),
+                    listOf(6u, 2u) to Rational(137614937, 79380),
+                    listOf(7u, 2u) to Rational(566866, 1323),
+                    listOf(8u, 2u) to Rational(41848, 441),
+                    listOf(0u, 3u) to Rational(-19470406, 2205),
+                    listOf(1u, 3u) to Rational(72514195, 882),
+                    listOf(2u, 3u) to Rational(-78090707, 1764),
+                    listOf(3u, 3u) to Rational(-1988237707, 26460),
+                    listOf(4u, 3u) to Rational(-802137919, 17640),
+                    listOf(5u, 3u) to Rational(-139989463, 5880),
+                    listOf(6u, 3u) to Rational(-26066641, 3780),
+                    listOf(7u, 3u) to Rational(-2363369, 1323),
+                    listOf(8u, 3u) to Rational(-108280, 441),
+                    listOf(0u, 4u) to Rational(14878516, 441),
+                    listOf(1u, 4u) to Rational(-253416724, 2205),
+                    listOf(2u, 4u) to Rational(16699157, 840),
+                    listOf(3u, 4u) to Rational(-105220979, 13230),
+                    listOf(4u, 4u) to Rational(208266383, 5880),
+                    listOf(5u, 4u) to Rational(650135309, 26460),
+                    listOf(6u, 4u) to Rational(123808663, 11760),
+                    listOf(7u, 4u) to Rational(8563385, 2646),
+                    listOf(8u, 4u) to Rational(19721, 49),
+                    listOf(0u, 5u) to Rational(675645, 49),
+                    listOf(1u, 5u) to Rational(-70554077, 588),
+                    listOf(2u, 5u) to Rational(157884029, 980),
+                    listOf(3u, 5u) to Rational(489548623, 4410),
+                    listOf(4u, 5u) to Rational(148540519, 17640),
+                    listOf(5u, 5u) to Rational(-5559551, 392),
+                    listOf(6u, 5u) to Rational(-18335711, 1470),
+                    listOf(7u, 5u) to Rational(-38437, 9),
+                    listOf(8u, 5u) to Rational(-29620, 63),
+                    listOf(0u, 6u) to Rational(-727625, 49),
+                    listOf(1u, 6u) to Rational(7046685, 98),
+                    listOf(2u, 6u) to Rational(-334814231, 7056),
+                    listOf(3u, 6u) to Rational(-243971737, 17640),
+                    listOf(4u, 6u) to Rational(-571116659, 35280),
+                    listOf(5u, 6u) to Rational(567538, 315),
+                    listOf(6u, 6u) to Rational(3199768, 315),
+                    listOf(7u, 6u) to Rational(227744, 63),
+                    listOf(8u, 6u) to Rational(23116, 63),
+                    listOf(0u, 7u) to Rational(-27500, 7),
+                    listOf(1u, 7u) to Rational(120125, 3),
+                    listOf(2u, 7u) to Rational(-279200, 3),
+                    listOf(3u, 7u) to Rational(-100160, 7),
+                    listOf(4u, 7u) to Rational(920452, 21),
+                    listOf(5u, 7u) to Rational(226481, 21),
+                    listOf(6u, 7u) to Rational(-34428, 7),
+                    listOf(7u, 7u) to Rational(-6232, 3),
+                    listOf(8u, 7u) to Rational(-608, 3),
+                    listOf(0u, 8u) to Rational(2500, 1),
+                    listOf(1u, 8u) to Rational(-19000, 1),
+                    listOf(2u, 8u) to Rational(37900, 1),
+                    listOf(3u, 8u) to Rational(-1840, 1),
+                    listOf(4u, 8u) to Rational(-17876, 1),
+                    listOf(5u, 8u) to Rational(-1240, 1),
+                    listOf(6u, 8u) to Rational(2788, 1),
+                    listOf(7u, 8u) to Rational(800, 1),
+                    listOf(8u, 8u) to Rational(64, 1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(162487, 63),
+                    listOf(1u) to Rational(-92713, 54),
+                    listOf(2u) to Rational(802436, 1323),
+                    listOf(3u) to Rational(-55088, 441),
+                    listOf(4u) to Rational(1404034, 9261),
+                    listOf(5u) to Rational(-5804, 1029),
+                    listOf(6u) to Rational(51556, 9261),
+                    listOf(7u) to Rational(-752, 441),
+                    listOf(8u) to Rational(16, 147),
+                    listOf(0u, 1u) to Rational(296071, 441),
+                    listOf(1u, 1u) to Rational(-4991281, 882),
+                    listOf(2u, 1u) to Rational(-18702811, 9261),
+                    listOf(3u, 1u) to Rational(40759043, 27783),
+                    listOf(4u, 1u) to Rational(19768501, 27783),
+                    listOf(5u, 1u) to Rational(14307337, 27783),
+                    listOf(6u, 1u) to Rational(1655684, 27783),
+                    listOf(7u, 1u) to Rational(22124, 1323),
+                    listOf(8u, 1u) to Rational(-1504, 441),
+                    listOf(0u, 2u) to Rational(-27667474, 3087),
+                    listOf(1u, 2u) to Rational(265605901, 12348),
+                    listOf(2u, 2u) to Rational(160360775, 98784),
+                    listOf(3u, 2u) to Rational(1169992093, 148176),
+                    listOf(4u, 2u) to Rational(3978014077, 1333584),
+                    listOf(5u, 2u) to Rational(567058123, 333396),
+                    listOf(6u, 2u) to Rational(205132579, 333396),
+                    listOf(7u, 2u) to Rational(566866, 3969),
+                    listOf(8u, 2u) to Rational(41848, 1323),
+                    listOf(0u, 3u) to Rational(-2228822, 1029),
+                    listOf(1u, 3u) to Rational(80179390, 3087),
+                    listOf(2u, 3u) to Rational(-1378630487, 74088),
+                    listOf(3u, 3u) to Rational(-3385811693, 111132),
+                    listOf(4u, 3u) to Rational(-820686977, 49392),
+                    listOf(5u, 3u) to Rational(-89101027, 10584),
+                    listOf(6u, 3u) to Rational(-37847387, 15876),
+                    listOf(7u, 3u) to Rational(-2363369, 3969),
+                    listOf(8u, 3u) to Rational(-108280, 1323),
+                    listOf(0u, 4u) to Rational(12619982, 1029),
+                    listOf(1u, 4u) to Rational(-277723177, 6174),
+                    listOf(2u, 4u) to Rational(649414169, 49392),
+                    listOf(3u, 4u) to Rational(14457595, 63504),
+                    listOf(4u, 4u) to Rational(139270339, 10584),
+                    listOf(5u, 4u) to Rational(140367961, 15876),
+                    listOf(6u, 4u) to Rational(25467083, 7056),
+                    listOf(7u, 4u) to Rational(8563385, 7938),
+                    listOf(8u, 4u) to Rational(19721, 147),
+                    listOf(0u, 5u) to Rational(643850, 147),
+                    listOf(1u, 5u) to Rational(-11818025, 294),
+                    listOf(2u, 5u) to Rational(33963203, 588),
+                    listOf(3u, 5u) to Rational(207216235, 5292),
+                    listOf(4u, 5u) to Rational(2861021, 1512),
+                    listOf(5u, 5u) to Rational(-6302335, 1176),
+                    listOf(6u, 5u) to Rational(-3738587, 882),
+                    listOf(7u, 5u) to Rational(-38437, 27),
+                    listOf(8u, 5u) to Rational(-29620, 189),
+                    listOf(0u, 6u) to Rational(-248725, 49),
+                    listOf(1u, 6u) to Rational(2478535, 98),
+                    listOf(2u, 6u) to Rational(-399721367, 21168),
+                    listOf(3u, 6u) to Rational(-54309317, 10584),
+                    listOf(4u, 6u) to Rational(-95398327, 21168),
+                    listOf(5u, 6u) to Rational(173750, 189),
+                    listOf(6u, 6u) to Rational(92216, 27),
+                    listOf(7u, 6u) to Rational(227744, 189),
+                    listOf(8u, 6u) to Rational(23116, 189),
+                    listOf(0u, 7u) to Rational(-27500, 21),
+                    listOf(1u, 7u) to Rational(120125, 9),
+                    listOf(2u, 7u) to Rational(-279200, 9),
+                    listOf(3u, 7u) to Rational(-100160, 21),
+                    listOf(4u, 7u) to Rational(920452, 63),
+                    listOf(5u, 7u) to Rational(226481, 63),
+                    listOf(6u, 7u) to Rational(-11476, 7),
+                    listOf(7u, 7u) to Rational(-6232, 9),
+                    listOf(8u, 7u) to Rational(-608, 9),
+                    listOf(0u, 8u) to Rational(2500, 3),
+                    listOf(1u, 8u) to Rational(-19000, 3),
+                    listOf(2u, 8u) to Rational(37900, 3),
+                    listOf(3u, 8u) to Rational(-1840, 3),
+                    listOf(4u, 8u) to Rational(-17876, 3),
+                    listOf(5u, 8u) to Rational(-1240, 3),
+                    listOf(6u, 8u) to Rational(2788, 3),
+                    listOf(7u, 8u) to Rational(800, 3),
+                    listOf(8u, 8u) to Rational(64, 3)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, bufferOf(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(18, 1),
+                    listOf(1u) to Rational(16, 3),
+                    listOf(2u) to Rational(12, 6),
+                    listOf(0u, 1u) to Rational(13, 1),
+                    listOf(1u, 1u) to Rational(-11, 4),
+                    listOf(2u, 1u) to Rational(-1, 1),
+                    listOf(0u, 2u) to Rational(-10, 1),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(2, 1),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(8, 2),
+                    listOf(1u) to Rational(-15, 5),
+                    listOf(2u) to Rational(2, 7),
+                    listOf(0u, 1u) to Rational(-18, 7),
+                    listOf(1u, 1u) to Rational(-16, 6),
+                    listOf(2u, 1u) to Rational(-13, 3),
+                    listOf(0u, 2u) to Rational(-5, 1),
+                    listOf(1u, 2u) to Rational(17, 1),
+                    listOf(2u, 2u) to Rational(8, 2),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-6, 1),
+                    listOf(1u) to Rational(-9, 8),
+                    listOf(2u) to Rational(17, 5),
+                    listOf(0u, 1u) to Rational(-2, 3),
+                    listOf(1u, 1u) to Rational(1, 5),
+                    listOf(2u, 1u) to Rational(-11, 7),
+                    listOf(0u, 2u) to Rational(13, 6),
+                    listOf(1u, 2u) to Rational(-15, 2),
+                    listOf(2u, 2u) to Rational(-14, 4),
+                )
+            )),
+            "test 3"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1202861, 210),
+                    listOf(1u) to Rational(-215117, 45),
+                    listOf(2u) to Rational(10889651, 19845),
+                    listOf(3u) to Rational(-3503956, 6615),
+                    listOf(4u) to Rational(809066, 2205),
+                    listOf(5u) to Rational(-9056, 735),
+                    listOf(6u) to Rational(5396, 315),
+                    listOf(7u) to Rational(-752, 147),
+                    listOf(8u) to Rational(16, 49),
+                    listOf(0u, 1u) to Rational(1738469, 1470),
+                    listOf(1u, 1u) to Rational(-926238703, 52920),
+                    listOf(2u, 1u) to Rational(-44113982, 6615),
+                    listOf(3u, 1u) to Rational(10423519, 5292),
+                    listOf(4u, 1u) to Rational(3769712, 2205),
+                    listOf(5u, 1u) to Rational(8905046, 6615),
+                    listOf(6u, 1u) to Rational(1186972, 6615),
+                    listOf(7u, 1u) to Rational(22124, 441),
+                    listOf(8u, 1u) to Rational(-1504, 147),
+                    listOf(0u, 2u) to Rational(-54723628, 2205),
+                    listOf(1u, 2u) to Rational(70109407, 1323),
+                    listOf(2u, 2u) to Rational(151072591, 17640),
+                    listOf(3u, 2u) to Rational(1216428107, 52920),
+                    listOf(4u, 2u) to Rational(2587873193, 317520),
+                    listOf(5u, 2u) to Rational(393536369, 79380),
+                    listOf(6u, 2u) to Rational(137614937, 79380),
+                    listOf(7u, 2u) to Rational(566866, 1323),
+                    listOf(8u, 2u) to Rational(41848, 441),
+                    listOf(0u, 3u) to Rational(-19470406, 2205),
+                    listOf(1u, 3u) to Rational(72514195, 882),
+                    listOf(2u, 3u) to Rational(-78090707, 1764),
+                    listOf(3u, 3u) to Rational(-1988237707, 26460),
+                    listOf(4u, 3u) to Rational(-802137919, 17640),
+                    listOf(5u, 3u) to Rational(-139989463, 5880),
+                    listOf(6u, 3u) to Rational(-26066641, 3780),
+                    listOf(7u, 3u) to Rational(-2363369, 1323),
+                    listOf(8u, 3u) to Rational(-108280, 441),
+                    listOf(0u, 4u) to Rational(14878516, 441),
+                    listOf(1u, 4u) to Rational(-253416724, 2205),
+                    listOf(2u, 4u) to Rational(16699157, 840),
+                    listOf(3u, 4u) to Rational(-105220979, 13230),
+                    listOf(4u, 4u) to Rational(208266383, 5880),
+                    listOf(5u, 4u) to Rational(650135309, 26460),
+                    listOf(6u, 4u) to Rational(123808663, 11760),
+                    listOf(7u, 4u) to Rational(8563385, 2646),
+                    listOf(8u, 4u) to Rational(19721, 49),
+                    listOf(0u, 5u) to Rational(675645, 49),
+                    listOf(1u, 5u) to Rational(-70554077, 588),
+                    listOf(2u, 5u) to Rational(157884029, 980),
+                    listOf(3u, 5u) to Rational(489548623, 4410),
+                    listOf(4u, 5u) to Rational(148540519, 17640),
+                    listOf(5u, 5u) to Rational(-5559551, 392),
+                    listOf(6u, 5u) to Rational(-18335711, 1470),
+                    listOf(7u, 5u) to Rational(-38437, 9),
+                    listOf(8u, 5u) to Rational(-29620, 63),
+                    listOf(0u, 6u) to Rational(-727625, 49),
+                    listOf(1u, 6u) to Rational(7046685, 98),
+                    listOf(2u, 6u) to Rational(-334814231, 7056),
+                    listOf(3u, 6u) to Rational(-243971737, 17640),
+                    listOf(4u, 6u) to Rational(-571116659, 35280),
+                    listOf(5u, 6u) to Rational(567538, 315),
+                    listOf(6u, 6u) to Rational(3199768, 315),
+                    listOf(7u, 6u) to Rational(227744, 63),
+                    listOf(8u, 6u) to Rational(23116, 63),
+                    listOf(0u, 7u) to Rational(-27500, 7),
+                    listOf(1u, 7u) to Rational(120125, 3),
+                    listOf(2u, 7u) to Rational(-279200, 3),
+                    listOf(3u, 7u) to Rational(-100160, 7),
+                    listOf(4u, 7u) to Rational(920452, 21),
+                    listOf(5u, 7u) to Rational(226481, 21),
+                    listOf(6u, 7u) to Rational(-34428, 7),
+                    listOf(7u, 7u) to Rational(-6232, 3),
+                    listOf(8u, 7u) to Rational(-608, 3),
+                    listOf(0u, 8u) to Rational(2500, 1),
+                    listOf(1u, 8u) to Rational(-19000, 1),
+                    listOf(2u, 8u) to Rational(37900, 1),
+                    listOf(3u, 8u) to Rational(-1840, 1),
+                    listOf(4u, 8u) to Rational(-17876, 1),
+                    listOf(5u, 8u) to Rational(-1240, 1),
+                    listOf(6u, 8u) to Rational(2788, 1),
+                    listOf(7u, 8u) to Rational(800, 1),
+                    listOf(8u, 8u) to Rational(64, 1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(162487, 63),
+                    listOf(1u) to Rational(-92713, 54),
+                    listOf(2u) to Rational(802436, 1323),
+                    listOf(3u) to Rational(-55088, 441),
+                    listOf(4u) to Rational(1404034, 9261),
+                    listOf(5u) to Rational(-5804, 1029),
+                    listOf(6u) to Rational(51556, 9261),
+                    listOf(7u) to Rational(-752, 441),
+                    listOf(8u) to Rational(16, 147),
+                    listOf(0u, 1u) to Rational(296071, 441),
+                    listOf(1u, 1u) to Rational(-4991281, 882),
+                    listOf(2u, 1u) to Rational(-18702811, 9261),
+                    listOf(3u, 1u) to Rational(40759043, 27783),
+                    listOf(4u, 1u) to Rational(19768501, 27783),
+                    listOf(5u, 1u) to Rational(14307337, 27783),
+                    listOf(6u, 1u) to Rational(1655684, 27783),
+                    listOf(7u, 1u) to Rational(22124, 1323),
+                    listOf(8u, 1u) to Rational(-1504, 441),
+                    listOf(0u, 2u) to Rational(-27667474, 3087),
+                    listOf(1u, 2u) to Rational(265605901, 12348),
+                    listOf(2u, 2u) to Rational(160360775, 98784),
+                    listOf(3u, 2u) to Rational(1169992093, 148176),
+                    listOf(4u, 2u) to Rational(3978014077, 1333584),
+                    listOf(5u, 2u) to Rational(567058123, 333396),
+                    listOf(6u, 2u) to Rational(205132579, 333396),
+                    listOf(7u, 2u) to Rational(566866, 3969),
+                    listOf(8u, 2u) to Rational(41848, 1323),
+                    listOf(0u, 3u) to Rational(-2228822, 1029),
+                    listOf(1u, 3u) to Rational(80179390, 3087),
+                    listOf(2u, 3u) to Rational(-1378630487, 74088),
+                    listOf(3u, 3u) to Rational(-3385811693, 111132),
+                    listOf(4u, 3u) to Rational(-820686977, 49392),
+                    listOf(5u, 3u) to Rational(-89101027, 10584),
+                    listOf(6u, 3u) to Rational(-37847387, 15876),
+                    listOf(7u, 3u) to Rational(-2363369, 3969),
+                    listOf(8u, 3u) to Rational(-108280, 1323),
+                    listOf(0u, 4u) to Rational(12619982, 1029),
+                    listOf(1u, 4u) to Rational(-277723177, 6174),
+                    listOf(2u, 4u) to Rational(649414169, 49392),
+                    listOf(3u, 4u) to Rational(14457595, 63504),
+                    listOf(4u, 4u) to Rational(139270339, 10584),
+                    listOf(5u, 4u) to Rational(140367961, 15876),
+                    listOf(6u, 4u) to Rational(25467083, 7056),
+                    listOf(7u, 4u) to Rational(8563385, 7938),
+                    listOf(8u, 4u) to Rational(19721, 147),
+                    listOf(0u, 5u) to Rational(643850, 147),
+                    listOf(1u, 5u) to Rational(-11818025, 294),
+                    listOf(2u, 5u) to Rational(33963203, 588),
+                    listOf(3u, 5u) to Rational(207216235, 5292),
+                    listOf(4u, 5u) to Rational(2861021, 1512),
+                    listOf(5u, 5u) to Rational(-6302335, 1176),
+                    listOf(6u, 5u) to Rational(-3738587, 882),
+                    listOf(7u, 5u) to Rational(-38437, 27),
+                    listOf(8u, 5u) to Rational(-29620, 189),
+                    listOf(0u, 6u) to Rational(-248725, 49),
+                    listOf(1u, 6u) to Rational(2478535, 98),
+                    listOf(2u, 6u) to Rational(-399721367, 21168),
+                    listOf(3u, 6u) to Rational(-54309317, 10584),
+                    listOf(4u, 6u) to Rational(-95398327, 21168),
+                    listOf(5u, 6u) to Rational(173750, 189),
+                    listOf(6u, 6u) to Rational(92216, 27),
+                    listOf(7u, 6u) to Rational(227744, 189),
+                    listOf(8u, 6u) to Rational(23116, 189),
+                    listOf(0u, 7u) to Rational(-27500, 21),
+                    listOf(1u, 7u) to Rational(120125, 9),
+                    listOf(2u, 7u) to Rational(-279200, 9),
+                    listOf(3u, 7u) to Rational(-100160, 21),
+                    listOf(4u, 7u) to Rational(920452, 63),
+                    listOf(5u, 7u) to Rational(226481, 63),
+                    listOf(6u, 7u) to Rational(-11476, 7),
+                    listOf(7u, 7u) to Rational(-6232, 9),
+                    listOf(8u, 7u) to Rational(-608, 9),
+                    listOf(0u, 8u) to Rational(2500, 3),
+                    listOf(1u, 8u) to Rational(-19000, 3),
+                    listOf(2u, 8u) to Rational(37900, 3),
+                    listOf(3u, 8u) to Rational(-1840, 3),
+                    listOf(4u, 8u) to Rational(-17876, 3),
+                    listOf(5u, 8u) to Rational(-1240, 3),
+                    listOf(6u, 8u) to Rational(2788, 3),
+                    listOf(7u, 8u) to Rational(800, 3),
+                    listOf(8u, 8u) to Rational(64, 3)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, bufferOf(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(18, 1),
+                    listOf(1u) to Rational(16, 3),
+                    listOf(2u) to Rational(12, 6),
+                    listOf(0u, 1u) to Rational(13, 1),
+                    listOf(1u, 1u) to Rational(-11, 4),
+                    listOf(2u, 1u) to Rational(-1, 1),
+                    listOf(0u, 2u) to Rational(-10, 1),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(2, 1),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(8, 2),
+                    listOf(1u) to Rational(-15, 5),
+                    listOf(2u) to Rational(2, 7),
+                    listOf(0u, 1u) to Rational(-18, 7),
+                    listOf(1u, 1u) to Rational(-16, 6),
+                    listOf(2u, 1u) to Rational(-13, 3),
+                    listOf(0u, 2u) to Rational(-5, 1),
+                    listOf(1u, 2u) to Rational(17, 1),
+                    listOf(2u, 2u) to Rational(8, 2),
+                ),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-409, 6),
+                    listOf(1u) to Rational(-376, 9),
+                    listOf(2u) to Rational(-1781, 81),
+                    listOf(3u) to Rational(-128, 27),
+                    listOf(4u) to Rational(-8, 9),
+                    listOf(0u, 1u) to Rational(18701, 210),
+                    listOf(1u, 1u) to Rational(614183, 7560),
+                    listOf(2u, 1u) to Rational(90941, 1890),
+                    listOf(3u, 1u) to Rational(1802, 135),
+                    listOf(4u, 1u) to Rational(112, 45),
+                    listOf(0u, 2u) to Rational(181421, 315),
+                    listOf(1u, 2u) to Rational(77813, 378),
+                    listOf(2u, 2u) to Rational(598583, 7560),
+                    listOf(3u, 2u) to Rational(85, 27),
+                    listOf(4u, 2u) to Rational(2, 5),
+                    listOf(0u, 3u) to Rational(130997, 315),
+                    listOf(1u, 3u) to Rational(1093, 420),
+                    listOf(2u, 3u) to Rational(9551, 2520),
+                    listOf(3u, 3u) to Rational(-14, 45),
+                    listOf(4u, 3u) to Rational(22, 45),
+                    listOf(0u, 4u) to Rational(-2801, 9),
+                    listOf(1u, 4u) to Rational(4033, 90),
+                    listOf(2u, 4u) to Rational(6429, 80),
+                    listOf(3u, 4u) to Rational(2851, 90),
+                    listOf(4u, 4u) to Rational(293, 45),
+                    listOf(0u, 5u) to Rational(-220, 1),
+                    listOf(1u, 5u) to Rational(127, 1),
+                    listOf(2u, 5u) to Rational(202, 5),
+                    listOf(3u, 5u) to Rational(-63, 5),
+                    listOf(4u, 5u) to Rational(-12, 5),
+                    listOf(0u, 6u) to Rational(100, 1),
+                    listOf(1u, 6u) to Rational(-80, 1),
+                    listOf(2u, 6u) to Rational(-24, 1),
+                    listOf(3u, 6u) to Rational(16, 1),
+                    listOf(4u, 6u) to Rational(4, 1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5407, 9),
+                    listOf(1u) to Rational(9568, 27),
+                    listOf(2u) to Rational(4996, 27),
+                    listOf(3u) to Rational(352, 9),
+                    listOf(4u) to Rational(22, 3),
+                    listOf(0u, 1u) to Rational(104411, 126),
+                    listOf(1u, 1u) to Rational(6001, 126),
+                    listOf(2u, 1u) to Rational(-796, 21),
+                    listOf(3u, 1u) to Rational(-5389, 126),
+                    listOf(4u, 1u) to Rational(-166, 21),
+                    listOf(0u, 2u) to Rational(-35327, 126),
+                    listOf(1u, 2u) to Rational(53, 252),
+                    listOf(2u, 2u) to Rational(849197, 6048),
+                    listOf(3u, 2u) to Rational(22361, 252),
+                    listOf(4u, 2u) to Rational(773, 42),
+                    listOf(0u, 3u) to Rational(-6067, 21),
+                    listOf(1u, 3u) to Rational(39049, 126),
+                    listOf(2u, 3u) to Rational(80303, 1008),
+                    listOf(3u, 3u) to Rational(-3035, 63),
+                    listOf(4u, 3u) to Rational(-209, 21),
+                    listOf(0u, 4u) to Rational(3113, 21),
+                    listOf(1u, 4u) to Rational(-22345, 126),
+                    listOf(2u, 4u) to Rational(-30931, 1008),
+                    listOf(3u, 4u) to Rational(5837, 126),
+                    listOf(4u, 4u) to Rational(229, 21),
+                    listOf(0u, 5u) to Rational(-2120, 21),
+                    listOf(1u, 5u) to Rational(451, 7),
+                    listOf(2u, 5u) to Rational(422, 21),
+                    listOf(3u, 5u) to Rational(-181, 21),
+                    listOf(4u, 5u) to Rational(-40, 21),
+                    listOf(0u, 6u) to Rational(100, 3),
+                    listOf(1u, 6u) to Rational(-80, 3),
+                    listOf(2u, 6u) to Rational(-8, 1),
+                    listOf(3u, 6u) to Rational(16, 3),
+                    listOf(4u, 6u) to Rational(4, 3)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, bufferOf(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(18, 1),
+                    listOf(1u) to Rational(16, 3),
+                    listOf(2u) to Rational(12, 6),
+                    listOf(0u, 1u) to Rational(13, 1),
+                    listOf(1u, 1u) to Rational(-11, 4),
+                    listOf(2u, 1u) to Rational(-1, 1),
+                    listOf(0u, 2u) to Rational(-10, 1),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(2, 1),
+                ),
+            )),
+            "test 5"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(5, 6),
+                    listOf(1u) to Rational(1, 6),
+                    listOf(2u) to Rational(-2, 9),
+                    listOf(0u, 1u) to Rational(15, 1),
+                    listOf(1u, 1u) to Rational(18, 7),
+                    listOf(2u, 1u) to Rational(2, 5),
+                    listOf(0u, 2u) to Rational(12, 9),
+                    listOf(1u, 2u) to Rational(-3, 5),
+                    listOf(2u, 2u) to Rational(4, 4),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-11, 9),
+                    listOf(1u) to Rational(4, 9),
+                    listOf(2u) to Rational(11, 6),
+                    listOf(0u, 1u) to Rational(-5, 6),
+                    listOf(1u, 1u) to Rational(4, 6),
+                    listOf(2u, 1u) to Rational(-1, 7),
+                    listOf(0u, 2u) to Rational(9, 1),
+                    listOf(1u, 2u) to Rational(6, 7),
+                    listOf(2u, 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, bufferOf<NumberedPolynomial<Rational>>()),
+            "test 6"
+        )
     }
     @Test
     @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
             //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
             //  not r^(deg(p)(deg(p)+1)/2) as it is now.
     fun test_RationalFunction_substitute_RationalFunction_Buffer() {
-        // TODO
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(0)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1),
+                    listOf(1u) to Rational(-2),
+                    listOf(2u) to Rational(1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                ),
+            ).substitute(RationalField, bufferOf(
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(1)
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(1)
+                    )
+                )
+            )),
+            "test 1"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf(4u) to Rational(-17166109, 793800),
+                    listOf(3u, 1u) to Rational(-930960143, 5556600),
+                    listOf(2u, 2u) to Rational(-144665109691, 350065800),
+                    listOf(1u, 3u) to Rational(-17232577, 52920),
+                    listOf(0u, 4u) to Rational(-68141, 1323),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf(4u) to Rational(-57522533, 14288400),
+                    listOf(3u, 1u) to Rational(-13085162953, 300056400),
+                    listOf(2u, 2u) to Rational(-92093367341, 525098700),
+                    listOf(1u, 3u) to Rational(-1979342797, 6667920),
+                    listOf(0u, 4u) to Rational(-3082727, 21168),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, bufferOf(
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(11, 5),
+                        listOf(0u, 1u) to Rational(8, 4),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(1, 9),
+                        listOf(0u, 1u) to Rational(11, 7),
+                    )
+                ),
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(-2, 7),
+                        listOf(0u, 1u) to Rational(-4, 3),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf(1u) to Rational(3, 6),
+                        listOf(0u, 1u) to Rational(12, 8),
+                    )
+                ),
+            )),
+            "test 2"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-130778291, 76800),
+                    listOf(1u) to Rational(-445270919, 230400),
+                    listOf(2u) to Rational(44578444937, 14515200),
+                    listOf(3u) to Rational(17329402153, 1555200),
+                    listOf(4u) to Rational(89239926809, 2332800),
+                    listOf(5u) to Rational(2808812267, 145152),
+                    listOf(6u) to Rational(-21362661007, 725760),
+                    listOf(7u) to Rational(-258455443, 2016),
+                    listOf(8u) to Rational(-21454693, 96),
+                    listOf(0u, 1u) to Rational(-1002137, 15360),
+                    listOf(1u, 1u) to Rational(-1704849697, 430080),
+                    listOf(2u, 1u) to Rational(-57657676789, 4838400),
+                    listOf(3u, 1u) to Rational(-101331731, 89600),
+                    listOf(4u, 1u) to Rational(5362280079329, 130636800),
+                    listOf(5u, 1u) to Rational(4069896167053, 130636800),
+                    listOf(6u, 1u) to Rational(12011514569, 544320),
+                    listOf(7u, 1u) to Rational(138293195623, 725760),
+                    listOf(8u, 1u) to Rational(6228779419, 48384),
+                    listOf(0u, 2u) to Rational(-32395872823, 8064000),
+                    listOf(1u, 2u) to Rational(-7398505523, 2304000),
+                    listOf(2u, 2u) to Rational(95217051699521, 3048192000),
+                    listOf(3u, 2u) to Rational(198026968812079, 3657830400),
+                    listOf(4u, 2u) to Rational(4291645618499, 228614400),
+                    listOf(5u, 2u) to Rational(-33211690942439, 914457600),
+                    listOf(6u, 2u) to Rational(-637385538163153, 1371686400),
+                    listOf(7u, 2u) to Rational(-138671528276273, 182891520),
+                    listOf(8u, 2u) to Rational(-14566368751, 217728),
+                    listOf(0u, 3u) to Rational(-10538718719, 2016000),
+                    listOf(1u, 3u) to Rational(-1844485375199, 84672000),
+                    listOf(2u, 3u) to Rational(103968665891, 12096000),
+                    listOf(3u, 3u) to Rational(175402107278351, 1828915200),
+                    listOf(4u, 3u) to Rational(8020699588879, 114307200),
+                    listOf(5u, 3u) to Rational(3414841894991, 38102400),
+                    listOf(6u, 3u) to Rational(1848405591611, 4665600),
+                    listOf(7u, 3u) to Rational(39486708738989, 137168640),
+                    listOf(8u, 3u) to Rational(255926289517, 9144576),
+                    listOf(0u, 4u) to Rational(-655379564629, 105840000),
+                    listOf(1u, 4u) to Rational(-208336039441, 127008000),
+                    listOf(2u, 4u) to Rational(40173146771411, 1143072000),
+                    listOf(3u, 4u) to Rational(150473493581239, 2667168000),
+                    listOf(4u, 4u) to Rational(38833783990483, 1143072000),
+                    listOf(5u, 4u) to Rational(-1963676248203053, 4800902400),
+                    listOf(6u, 4u) to Rational(-2598759412825747, 3200601600),
+                    listOf(7u, 4u) to Rational(-192895352019667, 1280240640),
+                    listOf(8u, 4u) to Rational(3737382679, 6858432),
+                    listOf(0u, 5u) to Rational(-16959378721, 1890000),
+                    listOf(1u, 5u) to Rational(-1864802244743, 79380000),
+                    listOf(2u, 5u) to Rational(13449261536489, 666792000),
+                    listOf(3u, 5u) to Rational(215272234137329, 2667168000),
+                    listOf(4u, 5u) to Rational(6040691379277, 83349000),
+                    listOf(5u, 5u) to Rational(153687143525887, 800150400),
+                    listOf(6u, 5u) to Rational(475602854903563, 2400451200),
+                    listOf(7u, 5u) to Rational(27315599358749, 640120320),
+                    listOf(8u, 5u) to Rational(-2630413357, 10668672),
+                    listOf(0u, 6u) to Rational(-6654999511, 2646000),
+                    listOf(1u, 6u) to Rational(-67885252327, 15876000),
+                    listOf(2u, 6u) to Rational(5786776220983, 2667168000),
+                    listOf(3u, 6u) to Rational(60615922629083, 1143072000),
+                    listOf(4u, 6u) to Rational(-34703539637627407, 672126336000),
+                    listOf(5u, 6u) to Rational(-744694192134101, 2240421120),
+                    listOf(6u, 6u) to Rational(-1782470617231, 14817600),
+                    listOf(7u, 6u) to Rational(59123208433, 8890560),
+                    listOf(8u, 6u) to Rational(-141653, 5292),
+                    listOf(0u, 7u) to Rational(-338051969, 441000),
+                    listOf(1u, 7u) to Rational(468850013, 1764000),
+                    listOf(2u, 7u) to Rational(2102343426101, 222264000),
+                    listOf(3u, 7u) to Rational(7836130602007, 1333584000),
+                    listOf(4u, 7u) to Rational(16239111865997, 746807040),
+                    listOf(5u, 7u) to Rational(3824649185383, 88905600),
+                    listOf(6u, 7u) to Rational(56058614459, 3457440),
+                    listOf(7u, 7u) to Rational(-396766339, 493920),
+                    listOf(8u, 7u) to Rational(-165147, 2744),
+                    listOf(0u, 8u) to Rational(-3088619, 58800),
+                    listOf(1u, 8u) to Rational(155343347, 88200),
+                    listOf(2u, 8u) to Rational(100098736469, 7408800),
+                    listOf(3u, 8u) to Rational(109725511381, 7408800),
+                    listOf(4u, 8u) to Rational(-2431199641013, 59270400),
+                    listOf(5u, 8u) to Rational(-102872383249, 3457440),
+                    listOf(6u, 8u) to Rational(1449461309, 576240),
+                    listOf(7u, 8u) to Rational(812775, 1372),
+                    listOf(8u, 8u) to Rational(-16461, 343)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(164202773, 230400),
+                    listOf(1u) to Rational(-70345303, 518400),
+                    listOf(2u) to Rational(-4229702731, 4665600),
+                    listOf(3u) to Rational(3262171027, 6998400),
+                    listOf(4u) to Rational(-25423104169, 13996800),
+                    listOf(5u) to Rational(64061869, 349920),
+                    listOf(6u) to Rational(-1655878091, 116640),
+                    listOf(7u) to Rational(-7991441, 648),
+                    listOf(8u) to Rational(-502591, 18),
+                    listOf(0u, 1u) to Rational(-8780429, 3840),
+                    listOf(1u, 1u) to Rational(434272361, 115200),
+                    listOf(2u, 1u) to Rational(429825727, 41472),
+                    listOf(3u, 1u) to Rational(-10066790339, 6998400),
+                    listOf(4u, 1u) to Rational(70022035471, 20995200),
+                    listOf(5u, 1u) to Rational(-32070283493, 1399680),
+                    listOf(6u, 1u) to Rational(-22051101001, 1399680),
+                    listOf(7u, 1u) to Rational(-126493427, 12960),
+                    listOf(8u, 1u) to Rational(3050245, 864),
+                    listOf(0u, 2u) to Rational(-1194654631, 345600),
+                    listOf(1u, 2u) to Rational(-542961452671, 31104000),
+                    listOf(2u, 2u) to Rational(-234000873607, 48988800),
+                    listOf(3u, 2u) to Rational(140520538087, 3628800),
+                    listOf(4u, 2u) to Rational(9215088876563, 130636800),
+                    listOf(5u, 2u) to Rational(27590569647253, 293932800),
+                    listOf(6u, 2u) to Rational(5129057792891, 97977600),
+                    listOf(7u, 2u) to Rational(-106334191, 5103),
+                    listOf(8u, 2u) to Rational(-1024113911, 435456),
+                    listOf(0u, 3u) to Rational(76223843, 6000),
+                    listOf(1u, 3u) to Rational(57425857357, 2592000),
+                    listOf(2u, 3u) to Rational(-2044736497573, 46656000),
+                    listOf(3u, 3u) to Rational(-26155810120031, 293932800),
+                    listOf(4u, 3u) to Rational(-1064419459813, 6998400),
+                    listOf(5u, 3u) to Rational(-753782018389, 4082400),
+                    listOf(6u, 3u) to Rational(-291973360873, 2799360),
+                    listOf(7u, 3u) to Rational(-46372122599, 816480),
+                    listOf(8u, 3u) to Rational(3579859657, 653184),
+                    listOf(0u, 4u) to Rational(-13374241901, 4320000),
+                    listOf(1u, 4u) to Rational(306606499811, 54432000),
+                    listOf(2u, 4u) to Rational(964267124745437, 13716864000),
+                    listOf(3u, 4u) to Rational(21603809415373, 182891520),
+                    listOf(4u, 4u) to Rational(1097860214654027, 6858432000),
+                    listOf(5u, 4u) to Rational(161615254570669, 914457600),
+                    listOf(6u, 4u) to Rational(758415239461, 22861440),
+                    listOf(7u, 4u) to Rational(2585568355471, 274337280),
+                    listOf(8u, 4u) to Rational(-70433747863, 9144576),
+                    listOf(0u, 5u) to Rational(-9582586217, 2520000),
+                    listOf(1u, 5u) to Rational(-19093471394171, 635040000),
+                    listOf(2u, 5u) to Rational(-13010261944411, 381024000),
+                    listOf(3u, 5u) to Rational(-259039825301861, 4572288000),
+                    listOf(4u, 5u) to Rational(-305081119071079, 2286144000),
+                    listOf(5u, 5u) to Rational(-1923114383311, 19595520),
+                    listOf(6u, 5u) to Rational(-14181787253231, 228614400),
+                    listOf(7u, 5u) to Rational(-3959584789, 4354560),
+                    listOf(8u, 5u) to Rational(4691742523, 762048),
+                    listOf(0u, 6u) to Rational(-588323437, 180000),
+                    listOf(1u, 6u) to Rational(5952234691, 52920000),
+                    listOf(2u, 6u) to Rational(21001851056959, 1088640000),
+                    listOf(3u, 6u) to Rational(84668034357563, 2133734400),
+                    listOf(4u, 6u) to Rational(2029754605811557, 25604812800),
+                    listOf(5u, 6u) to Rational(11721216739823, 426746880),
+                    listOf(6u, 6u) to Rational(-8275903187003, 2133734400),
+                    listOf(7u, 6u) to Rational(-4730447299, 2540160),
+                    listOf(8u, 6u) to Rational(-46069985, 21168),
+                    listOf(0u, 7u) to Rational(-75711301, 117600),
+                    listOf(1u, 7u) to Rational(32430417413, 7056000),
+                    listOf(2u, 7u) to Rational(677988533153, 98784000),
+                    listOf(3u, 7u) to Rational(-948417645827, 71124480),
+                    listOf(4u, 7u) to Rational(-11320265215207, 711244800),
+                    listOf(5u, 7u) to Rational(-676438627783, 50803200),
+                    listOf(6u, 7u) to Rational(-7382274253, 1975680),
+                    listOf(7u, 7u) to Rational(6505733, 2205),
+                    listOf(8u, 7u) to Rational(450137, 882),
+                    listOf(0u, 8u) to Rational(-8368253, 78400),
+                    listOf(1u, 8u) to Rational(6833783, 117600),
+                    listOf(2u, 8u) to Rational(4528971133, 5927040),
+                    listOf(3u, 8u) to Rational(146252636617, 29635200),
+                    listOf(4u, 8u) to Rational(8321882556889, 1659571200),
+                    listOf(5u, 8u) to Rational(-4686033011, 1975680),
+                    listOf(6u, 8u) to Rational(-1074445963, 987840),
+                    listOf(7u, 8u) to Rational(-142313, 588),
+                    listOf(8u, 8u) to Rational(-4281, 49)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, bufferOf(
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-17, 5),
+                        listOf(1u) to Rational(2, 6),
+                        listOf(2u) to Rational(14, 1),
+                        listOf(0u, 1u) to Rational(-6, 6),
+                        listOf(1u, 1u) to Rational(-7, 3),
+                        listOf(2u, 1u) to Rational(-2, 9),
+                        listOf(0u, 2u) to Rational(-9, 6),
+                        listOf(1u, 2u) to Rational(17, 4),
+                        listOf(2u, 2u) to Rational(2, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(5, 4),
+                        listOf(1u) to Rational(-5, 9),
+                        listOf(2u) to Rational(-3, 6),
+                        listOf(0u, 1u) to Rational(6, 5),
+                        listOf(1u, 1u) to Rational(14, 5),
+                        listOf(2u, 1u) to Rational(5, 2),
+                        listOf(0u, 2u) to Rational(-18, 7),
+                        listOf(1u, 2u) to Rational(-8, 2),
+                        listOf(2u, 2u) to Rational(18, 9),
+                    )
+                ),
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(14, 4),
+                        listOf(1u) to Rational(7, 6),
+                        listOf(2u) to Rational(7, 2),
+                        listOf(0u, 1u) to Rational(-15, 2),
+                        listOf(1u, 1u) to Rational(-13, 8),
+                        listOf(2u, 1u) to Rational(-14, 3),
+                        listOf(0u, 2u) to Rational(-7, 6),
+                        listOf(1u, 2u) to Rational(7, 4),
+                        listOf(2u, 2u) to Rational(9, 7),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-7, 4),
+                        listOf(1u) to Rational(-6, 3),
+                        listOf(2u) to Rational(-16, 2),
+                        listOf(0u, 1u) to Rational(-15, 5),
+                        listOf(1u, 1u) to Rational(4, 6),
+                        listOf(2u, 1u) to Rational(5, 4),
+                        listOf(0u, 2u) to Rational(-12, 5),
+                        listOf(1u, 2u) to Rational(-18, 2),
+                        listOf(2u, 2u) to Rational(6, 7),
+                    )
+                ),
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(5, 8),
+                        listOf(1u) to Rational(-12, 6),
+                        listOf(2u) to Rational(7, 6),
+                        listOf(0u, 1u) to Rational(-10, 4),
+                        listOf(1u, 1u) to Rational(-7, 6),
+                        listOf(2u, 1u) to Rational(8, 9),
+                        listOf(0u, 2u) to Rational(16, 3),
+                        listOf(1u, 2u) to Rational(-13, 4),
+                        listOf(2u, 2u) to Rational(5, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(10, 6),
+                        listOf(1u) to Rational(-18, 6),
+                        listOf(2u) to Rational(5, 1),
+                        listOf(0u, 1u) to Rational(17, 7),
+                        listOf(1u, 1u) to Rational(8, 4),
+                        listOf(2u, 1u) to Rational(-4, 9),
+                        listOf(0u, 2u) to Rational(-6, 5),
+                        listOf(1u, 2u) to Rational(-15, 8),
+                        listOf(2u, 2u) to Rational(-18, 5),
+                    )
+                ),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-130778291, 76800),
+                    listOf(1u) to Rational(-445270919, 230400),
+                    listOf(2u) to Rational(44578444937, 14515200),
+                    listOf(3u) to Rational(17329402153, 1555200),
+                    listOf(4u) to Rational(89239926809, 2332800),
+                    listOf(5u) to Rational(2808812267, 145152),
+                    listOf(6u) to Rational(-21362661007, 725760),
+                    listOf(7u) to Rational(-258455443, 2016),
+                    listOf(8u) to Rational(-21454693, 96),
+                    listOf(0u, 1u) to Rational(-1002137, 15360),
+                    listOf(1u, 1u) to Rational(-1704849697, 430080),
+                    listOf(2u, 1u) to Rational(-57657676789, 4838400),
+                    listOf(3u, 1u) to Rational(-101331731, 89600),
+                    listOf(4u, 1u) to Rational(5362280079329, 130636800),
+                    listOf(5u, 1u) to Rational(4069896167053, 130636800),
+                    listOf(6u, 1u) to Rational(12011514569, 544320),
+                    listOf(7u, 1u) to Rational(138293195623, 725760),
+                    listOf(8u, 1u) to Rational(6228779419, 48384),
+                    listOf(0u, 2u) to Rational(-32395872823, 8064000),
+                    listOf(1u, 2u) to Rational(-7398505523, 2304000),
+                    listOf(2u, 2u) to Rational(95217051699521, 3048192000),
+                    listOf(3u, 2u) to Rational(198026968812079, 3657830400),
+                    listOf(4u, 2u) to Rational(4291645618499, 228614400),
+                    listOf(5u, 2u) to Rational(-33211690942439, 914457600),
+                    listOf(6u, 2u) to Rational(-637385538163153, 1371686400),
+                    listOf(7u, 2u) to Rational(-138671528276273, 182891520),
+                    listOf(8u, 2u) to Rational(-14566368751, 217728),
+                    listOf(0u, 3u) to Rational(-10538718719, 2016000),
+                    listOf(1u, 3u) to Rational(-1844485375199, 84672000),
+                    listOf(2u, 3u) to Rational(103968665891, 12096000),
+                    listOf(3u, 3u) to Rational(175402107278351, 1828915200),
+                    listOf(4u, 3u) to Rational(8020699588879, 114307200),
+                    listOf(5u, 3u) to Rational(3414841894991, 38102400),
+                    listOf(6u, 3u) to Rational(1848405591611, 4665600),
+                    listOf(7u, 3u) to Rational(39486708738989, 137168640),
+                    listOf(8u, 3u) to Rational(255926289517, 9144576),
+                    listOf(0u, 4u) to Rational(-655379564629, 105840000),
+                    listOf(1u, 4u) to Rational(-208336039441, 127008000),
+                    listOf(2u, 4u) to Rational(40173146771411, 1143072000),
+                    listOf(3u, 4u) to Rational(150473493581239, 2667168000),
+                    listOf(4u, 4u) to Rational(38833783990483, 1143072000),
+                    listOf(5u, 4u) to Rational(-1963676248203053, 4800902400),
+                    listOf(6u, 4u) to Rational(-2598759412825747, 3200601600),
+                    listOf(7u, 4u) to Rational(-192895352019667, 1280240640),
+                    listOf(8u, 4u) to Rational(3737382679, 6858432),
+                    listOf(0u, 5u) to Rational(-16959378721, 1890000),
+                    listOf(1u, 5u) to Rational(-1864802244743, 79380000),
+                    listOf(2u, 5u) to Rational(13449261536489, 666792000),
+                    listOf(3u, 5u) to Rational(215272234137329, 2667168000),
+                    listOf(4u, 5u) to Rational(6040691379277, 83349000),
+                    listOf(5u, 5u) to Rational(153687143525887, 800150400),
+                    listOf(6u, 5u) to Rational(475602854903563, 2400451200),
+                    listOf(7u, 5u) to Rational(27315599358749, 640120320),
+                    listOf(8u, 5u) to Rational(-2630413357, 10668672),
+                    listOf(0u, 6u) to Rational(-6654999511, 2646000),
+                    listOf(1u, 6u) to Rational(-67885252327, 15876000),
+                    listOf(2u, 6u) to Rational(5786776220983, 2667168000),
+                    listOf(3u, 6u) to Rational(60615922629083, 1143072000),
+                    listOf(4u, 6u) to Rational(-34703539637627407, 672126336000),
+                    listOf(5u, 6u) to Rational(-744694192134101, 2240421120),
+                    listOf(6u, 6u) to Rational(-1782470617231, 14817600),
+                    listOf(7u, 6u) to Rational(59123208433, 8890560),
+                    listOf(8u, 6u) to Rational(-141653, 5292),
+                    listOf(0u, 7u) to Rational(-338051969, 441000),
+                    listOf(1u, 7u) to Rational(468850013, 1764000),
+                    listOf(2u, 7u) to Rational(2102343426101, 222264000),
+                    listOf(3u, 7u) to Rational(7836130602007, 1333584000),
+                    listOf(4u, 7u) to Rational(16239111865997, 746807040),
+                    listOf(5u, 7u) to Rational(3824649185383, 88905600),
+                    listOf(6u, 7u) to Rational(56058614459, 3457440),
+                    listOf(7u, 7u) to Rational(-396766339, 493920),
+                    listOf(8u, 7u) to Rational(-165147, 2744),
+                    listOf(0u, 8u) to Rational(-3088619, 58800),
+                    listOf(1u, 8u) to Rational(155343347, 88200),
+                    listOf(2u, 8u) to Rational(100098736469, 7408800),
+                    listOf(3u, 8u) to Rational(109725511381, 7408800),
+                    listOf(4u, 8u) to Rational(-2431199641013, 59270400),
+                    listOf(5u, 8u) to Rational(-102872383249, 3457440),
+                    listOf(6u, 8u) to Rational(1449461309, 576240),
+                    listOf(7u, 8u) to Rational(812775, 1372),
+                    listOf(8u, 8u) to Rational(-16461, 343)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(164202773, 230400),
+                    listOf(1u) to Rational(-70345303, 518400),
+                    listOf(2u) to Rational(-4229702731, 4665600),
+                    listOf(3u) to Rational(3262171027, 6998400),
+                    listOf(4u) to Rational(-25423104169, 13996800),
+                    listOf(5u) to Rational(64061869, 349920),
+                    listOf(6u) to Rational(-1655878091, 116640),
+                    listOf(7u) to Rational(-7991441, 648),
+                    listOf(8u) to Rational(-502591, 18),
+                    listOf(0u, 1u) to Rational(-8780429, 3840),
+                    listOf(1u, 1u) to Rational(434272361, 115200),
+                    listOf(2u, 1u) to Rational(429825727, 41472),
+                    listOf(3u, 1u) to Rational(-10066790339, 6998400),
+                    listOf(4u, 1u) to Rational(70022035471, 20995200),
+                    listOf(5u, 1u) to Rational(-32070283493, 1399680),
+                    listOf(6u, 1u) to Rational(-22051101001, 1399680),
+                    listOf(7u, 1u) to Rational(-126493427, 12960),
+                    listOf(8u, 1u) to Rational(3050245, 864),
+                    listOf(0u, 2u) to Rational(-1194654631, 345600),
+                    listOf(1u, 2u) to Rational(-542961452671, 31104000),
+                    listOf(2u, 2u) to Rational(-234000873607, 48988800),
+                    listOf(3u, 2u) to Rational(140520538087, 3628800),
+                    listOf(4u, 2u) to Rational(9215088876563, 130636800),
+                    listOf(5u, 2u) to Rational(27590569647253, 293932800),
+                    listOf(6u, 2u) to Rational(5129057792891, 97977600),
+                    listOf(7u, 2u) to Rational(-106334191, 5103),
+                    listOf(8u, 2u) to Rational(-1024113911, 435456),
+                    listOf(0u, 3u) to Rational(76223843, 6000),
+                    listOf(1u, 3u) to Rational(57425857357, 2592000),
+                    listOf(2u, 3u) to Rational(-2044736497573, 46656000),
+                    listOf(3u, 3u) to Rational(-26155810120031, 293932800),
+                    listOf(4u, 3u) to Rational(-1064419459813, 6998400),
+                    listOf(5u, 3u) to Rational(-753782018389, 4082400),
+                    listOf(6u, 3u) to Rational(-291973360873, 2799360),
+                    listOf(7u, 3u) to Rational(-46372122599, 816480),
+                    listOf(8u, 3u) to Rational(3579859657, 653184),
+                    listOf(0u, 4u) to Rational(-13374241901, 4320000),
+                    listOf(1u, 4u) to Rational(306606499811, 54432000),
+                    listOf(2u, 4u) to Rational(964267124745437, 13716864000),
+                    listOf(3u, 4u) to Rational(21603809415373, 182891520),
+                    listOf(4u, 4u) to Rational(1097860214654027, 6858432000),
+                    listOf(5u, 4u) to Rational(161615254570669, 914457600),
+                    listOf(6u, 4u) to Rational(758415239461, 22861440),
+                    listOf(7u, 4u) to Rational(2585568355471, 274337280),
+                    listOf(8u, 4u) to Rational(-70433747863, 9144576),
+                    listOf(0u, 5u) to Rational(-9582586217, 2520000),
+                    listOf(1u, 5u) to Rational(-19093471394171, 635040000),
+                    listOf(2u, 5u) to Rational(-13010261944411, 381024000),
+                    listOf(3u, 5u) to Rational(-259039825301861, 4572288000),
+                    listOf(4u, 5u) to Rational(-305081119071079, 2286144000),
+                    listOf(5u, 5u) to Rational(-1923114383311, 19595520),
+                    listOf(6u, 5u) to Rational(-14181787253231, 228614400),
+                    listOf(7u, 5u) to Rational(-3959584789, 4354560),
+                    listOf(8u, 5u) to Rational(4691742523, 762048),
+                    listOf(0u, 6u) to Rational(-588323437, 180000),
+                    listOf(1u, 6u) to Rational(5952234691, 52920000),
+                    listOf(2u, 6u) to Rational(21001851056959, 1088640000),
+                    listOf(3u, 6u) to Rational(84668034357563, 2133734400),
+                    listOf(4u, 6u) to Rational(2029754605811557, 25604812800),
+                    listOf(5u, 6u) to Rational(11721216739823, 426746880),
+                    listOf(6u, 6u) to Rational(-8275903187003, 2133734400),
+                    listOf(7u, 6u) to Rational(-4730447299, 2540160),
+                    listOf(8u, 6u) to Rational(-46069985, 21168),
+                    listOf(0u, 7u) to Rational(-75711301, 117600),
+                    listOf(1u, 7u) to Rational(32430417413, 7056000),
+                    listOf(2u, 7u) to Rational(677988533153, 98784000),
+                    listOf(3u, 7u) to Rational(-948417645827, 71124480),
+                    listOf(4u, 7u) to Rational(-11320265215207, 711244800),
+                    listOf(5u, 7u) to Rational(-676438627783, 50803200),
+                    listOf(6u, 7u) to Rational(-7382274253, 1975680),
+                    listOf(7u, 7u) to Rational(6505733, 2205),
+                    listOf(8u, 7u) to Rational(450137, 882),
+                    listOf(0u, 8u) to Rational(-8368253, 78400),
+                    listOf(1u, 8u) to Rational(6833783, 117600),
+                    listOf(2u, 8u) to Rational(4528971133, 5927040),
+                    listOf(3u, 8u) to Rational(146252636617, 29635200),
+                    listOf(4u, 8u) to Rational(8321882556889, 1659571200),
+                    listOf(5u, 8u) to Rational(-4686033011, 1975680),
+                    listOf(6u, 8u) to Rational(-1074445963, 987840),
+                    listOf(7u, 8u) to Rational(-142313, 588),
+                    listOf(8u, 8u) to Rational(-4281, 49)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, bufferOf(
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-17, 5),
+                        listOf(1u) to Rational(2, 6),
+                        listOf(2u) to Rational(14, 1),
+                        listOf(0u, 1u) to Rational(-6, 6),
+                        listOf(1u, 1u) to Rational(-7, 3),
+                        listOf(2u, 1u) to Rational(-2, 9),
+                        listOf(0u, 2u) to Rational(-9, 6),
+                        listOf(1u, 2u) to Rational(17, 4),
+                        listOf(2u, 2u) to Rational(2, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(5, 4),
+                        listOf(1u) to Rational(-5, 9),
+                        listOf(2u) to Rational(-3, 6),
+                        listOf(0u, 1u) to Rational(6, 5),
+                        listOf(1u, 1u) to Rational(14, 5),
+                        listOf(2u, 1u) to Rational(5, 2),
+                        listOf(0u, 2u) to Rational(-18, 7),
+                        listOf(1u, 2u) to Rational(-8, 2),
+                        listOf(2u, 2u) to Rational(18, 9),
+                    )
+                ),
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(14, 4),
+                        listOf(1u) to Rational(7, 6),
+                        listOf(2u) to Rational(7, 2),
+                        listOf(0u, 1u) to Rational(-15, 2),
+                        listOf(1u, 1u) to Rational(-13, 8),
+                        listOf(2u, 1u) to Rational(-14, 3),
+                        listOf(0u, 2u) to Rational(-7, 6),
+                        listOf(1u, 2u) to Rational(7, 4),
+                        listOf(2u, 2u) to Rational(9, 7),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-7, 4),
+                        listOf(1u) to Rational(-6, 3),
+                        listOf(2u) to Rational(-16, 2),
+                        listOf(0u, 1u) to Rational(-15, 5),
+                        listOf(1u, 1u) to Rational(4, 6),
+                        listOf(2u, 1u) to Rational(5, 4),
+                        listOf(0u, 2u) to Rational(-12, 5),
+                        listOf(1u, 2u) to Rational(-18, 2),
+                        listOf(2u, 2u) to Rational(6, 7),
+                    )
+                ),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-506213, 2800),
+                    listOf(1u) to Rational(9859, 315),
+                    listOf(2u) to Rational(17384377, 11340),
+                    listOf(3u) to Rational(-9662, 63),
+                    listOf(4u) to Rational(-12563, 4),
+                    listOf(0u, 1u) to Rational(-486293, 22400),
+                    listOf(1u, 1u) to Rational(-6530947, 25200),
+                    listOf(2u, 1u) to Rational(866125, 18144),
+                    listOf(3u, 1u) to Rational(2948747, 2520),
+                    listOf(4u, 1u) to Rational(1196611, 2016),
+                    listOf(0u, 2u) to Rational(-20266021, 117600),
+                    listOf(1u, 2u) to Rational(26656339, 44100),
+                    listOf(2u, 2u) to Rational(19499183, 18144),
+                    listOf(3u, 2u) to Rational(-19801849, 7560),
+                    listOf(4u, 2u) to Rational(-2639635, 1296),
+                    listOf(0u, 3u) to Rational(-5017697, 29400),
+                    listOf(1u, 3u) to Rational(-606007, 1575),
+                    listOf(2u, 3u) to Rational(127494487, 132300),
+                    listOf(3u, 3u) to Rational(166567, 105),
+                    listOf(4u, 3u) to Rational(486403, 18144),
+                    listOf(0u, 4u) to Rational(-32182, 735),
+                    listOf(1u, 4u) to Rational(2420671, 8820),
+                    listOf(2u, 4u) to Rational(-12619193, 26460),
+                    listOf(3u, 4u) to Rational(-6823067, 5670),
+                    listOf(4u, 4u) to Rational(-2311693, 13608),
+                    listOf(0u, 5u) to Rational(-13324, 245),
+                    listOf(1u, 5u) to Rational(1966, 35),
+                    listOf(2u, 5u) to Rational(1052719, 2520),
+                    listOf(3u, 5u) to Rational(19153, 270),
+                    listOf(4u, 5u) to Rational(701, 54),
+                    listOf(0u, 6u) to Rational(4647, 196),
+                    listOf(1u, 6u) to Rational(2197, 28),
+                    listOf(2u, 6u) to Rational(-43853, 336),
+                    listOf(3u, 6u) to Rational(-301, 3),
+                    listOf(4u, 6u) to Rational(34, 3)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-2843, 1600),
+                    listOf(1u) to Rational(-1483, 240),
+                    listOf(2u) to Rational(110623, 1296),
+                    listOf(3u) to Rational(1265, 72),
+                    listOf(4u) to Rational(-5011, 16),
+                    listOf(0u, 1u) to Rational(47743, 1800),
+                    listOf(1u, 1u) to Rational(619229, 32400),
+                    listOf(2u, 1u) to Rational(-5978369, 58320),
+                    listOf(3u, 1u) to Rational(-86081, 1620),
+                    listOf(4u, 1u) to Rational(6325, 72),
+                    listOf(0u, 2u) to Rational(110951, 3360),
+                    listOf(1u, 2u) to Rational(-9550649, 302400),
+                    listOf(2u, 2u) to Rational(6542933, 85050),
+                    listOf(3u, 2u) to Rational(4708291, 38880),
+                    listOf(4u, 2u) to Rational(-433327, 1296),
+                    listOf(0u, 3u) to Rational(56143, 600),
+                    listOf(1u, 3u) to Rational(94243, 720),
+                    listOf(2u, 3u) to Rational(-46779139, 226800),
+                    listOf(3u, 3u) to Rational(-6948253, 12960),
+                    listOf(4u, 3u) to Rational(-260261, 486),
+                    listOf(0u, 4u) to Rational(-3205317, 19600),
+                    listOf(1u, 4u) to Rational(-201253, 1050),
+                    listOf(2u, 4u) to Rational(332192677, 302400),
+                    listOf(3u, 4u) to Rational(351511, 360),
+                    listOf(4u, 4u) to Rational(-40547, 81),
+                    listOf(0u, 5u) to Rational(-65421, 1960),
+                    listOf(1u, 5u) to Rational(-10118, 35),
+                    listOf(2u, 5u) to Rational(-4341709, 10080),
+                    listOf(3u, 5u) to Rational(-91703, 360),
+                    listOf(4u, 5u) to Rational(-85, 9),
+                    listOf(0u, 6u) to Rational(-25965, 784),
+                    listOf(1u, 6u) to Rational(3351, 16),
+                    listOf(2u, 6u) to Rational(595159, 1344),
+                    listOf(3u, 6u) to Rational(-1381, 12),
+                    listOf(4u, 6u) to Rational(-155, 3)
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, bufferOf(
+                NumberedRationalFunction(
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(-17, 5),
+                        listOf(1u) to Rational(2, 6),
+                        listOf(2u) to Rational(14, 1),
+                        listOf(0u, 1u) to Rational(-6, 6),
+                        listOf(1u, 1u) to Rational(-7, 3),
+                        listOf(2u, 1u) to Rational(-2, 9),
+                        listOf(0u, 2u) to Rational(-9, 6),
+                        listOf(1u, 2u) to Rational(17, 4),
+                        listOf(2u, 2u) to Rational(2, 1),
+                    ),
+                    NumberedPolynomialAsIs(
+                        listOf<UInt>() to Rational(5, 4),
+                        listOf(1u) to Rational(-5, 9),
+                        listOf(2u) to Rational(-3, 6),
+                        listOf(0u, 1u) to Rational(6, 5),
+                        listOf(1u, 1u) to Rational(14, 5),
+                        listOf(2u, 1u) to Rational(5, 2),
+                        listOf(0u, 2u) to Rational(-18, 7),
+                        listOf(1u, 2u) to Rational(-8, 2),
+                        listOf(2u, 2u) to Rational(18, 9),
+                    )
+                ),
+            )),
+            "test 5"
+        )
+        assertEquals(
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(10, 2),
+                    listOf(1u) to Rational(6, 7),
+                    listOf(2u) to Rational(-16, 1),
+                    listOf(0u, 1u) to Rational(13, 8),
+                    listOf(1u, 1u) to Rational(-12, 1),
+                    listOf(2u, 1u) to Rational(16, 8),
+                    listOf(0u, 2u) to Rational(10, 4),
+                    listOf(1u, 2u) to Rational(4, 1),
+                    listOf(2u, 2u) to Rational(-11, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1, 4),
+                    listOf(1u) to Rational(-17, 4),
+                    listOf(2u) to Rational(-14, 8),
+                    listOf(0u, 1u) to Rational(17, 9),
+                    listOf(1u, 1u) to Rational(1, 3),
+                    listOf(2u, 1u) to Rational(7, 6),
+                    listOf(0u, 2u) to Rational(16, 3),
+                    listOf(1u, 2u) to Rational(-17, 1),
+                    listOf(2u, 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, bufferOf<NumberedRationalFunction<Rational>>()),
+            "test 6"
+        )
     }
     @Test
-    @Ignore
     fun test_Polynomial_substituteFully_Double_Buffer() {
-        // TODO
+        assertEquals(
+            0.0,
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 1.0,
+                listOf(1u) to -2.0,
+                listOf(2u) to 1.0,
+            ).substituteFully(bufferOf(
+                1.0
+            )),
+            0.001,
+            "test 1"
+        )
+        assertFailsWithTypeAndMessage<IllegalArgumentException>(
+            fullSubstitutionExceptionMessage,
+            "test 2"
+        ) {
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substituteFully(bufferOf())
+        }
+        assertFailsWithTypeAndMessage<IllegalArgumentException>(
+            fullSubstitutionExceptionMessage,
+            "test 3"
+        ) {
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substituteFully(bufferOf(
+                0.0,
+            ))
+        }
+        assertFailsWithTypeAndMessage<IllegalArgumentException>(
+            fullSubstitutionExceptionMessage,
+            "test 4"
+        ) {
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substituteFully(bufferOf(
+                0.4846192734143442,
+            ))
+        }
+        assertEquals(
+            1.934530767358133,
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substituteFully(bufferOf(
+                0.4846192734143442,
+                0.8400458576651112,
+            )),
+            0.001,
+            "test 5"
+        )
+        assertEquals(
+            1.934530767358133,
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substituteFully(bufferOf(
+                0.4846192734143442,
+                0.8400458576651112,
+                0.9211194782050933
+            )),
+            0.001,
+            "test 6"
+        )
+        assertEquals(
+            1.934530767358133,
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to 0.8597048543814783,
+                listOf(1u) to 0.22997637465889875,
+                listOf(2u) to 0.32675302591924016,
+                listOf(0u, 1u) to 0.4561746111587508,
+                listOf(1u, 1u) to 0.5304946210170756,
+                listOf(2u, 1u) to 0.6244313712888998,
+                listOf(0u, 2u) to 0.2700930201481795,
+                listOf(1u, 2u) to -0.06962351375204712,
+                listOf(2u, 2u) to -0.015206988092131501,
+            ).substituteFully(bufferOf(
+                0.4846192734143442,
+                0.8400458576651112,
+                0.9211194782050933,
+                0.4752854632152105
+            )),
+            0.001,
+            "test 7"
+        )
     }
     @Test
-    @Ignore
     fun test_Polynomial_substituteFully_Constant_Buffer() {
-        // TODO
+        assertEquals(
+            Rational(0),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1)
+            ).substituteFully(RationalField, bufferOf(
+                Rational(1)
+            )),
+            "test 1"
+        )
+        assertFailsWithTypeAndMessage<IllegalArgumentException>(
+            fullSubstitutionExceptionMessage,
+            "test 2"
+        ) {
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substituteFully(RationalField, bufferOf<Rational>())
+        }
+        assertFailsWithTypeAndMessage<IllegalArgumentException>(
+            fullSubstitutionExceptionMessage,
+            "test 3"
+        ) {
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substituteFully(
+                RationalField, bufferOf(
+                    Rational(-2, 5),
+                )
+            )
+        }
+        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5%2C+y+%3D+12%2F9
+        assertEquals(
+            Rational(143, 150),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substituteFully(RationalField, bufferOf(
+                Rational(-2, 5),
+                Rational(12, 9),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            Rational(143, 150),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-3, 2),
+                listOf(1u) to Rational(8, 6),
+                listOf(2u) to Rational(14, 6),
+                listOf(0u, 1u) to Rational(-3, 1),
+                listOf(1u, 1u) to Rational(-19, 2),
+                listOf(2u, 1u) to Rational(9, 4),
+                listOf(0u, 2u) to Rational(5, 5),
+                listOf(1u, 2u) to Rational(18, 9),
+                listOf(2u, 2u) to Rational(5, 2),
+            ).substituteFully(RationalField, bufferOf(
+                Rational(-2, 5),
+                Rational(12, 9),
+                Rational(57, 179),
+            )),
+            "test 5"
+        )
+        // https://www.wolframalpha.com/input?i=%28%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2%29+p%5E8+where+x+%3D+q%2Fp%2C+y+%3D+x%5E3%2C+p+%3D+-2%2F5%2C+q+%3D+12%2F9
+        assertEquals(
+            Rational(47639065216, 2562890625),
+            NumberedPolynomialAsIs(
+                listOf(8u) to Rational(-3, 2),
+                listOf(7u, 1u) to Rational(8, 6),
+                listOf(6u, 2u) to Rational(14, 6),
+                listOf(5u, 3u) to Rational(-3, 1),
+                listOf(4u, 4u) to Rational(-19, 2),
+                listOf(3u, 5u) to Rational(9, 4),
+                listOf(2u, 6u) to Rational(5, 5),
+                listOf(1u, 7u) to Rational(18, 9),
+                listOf(0u, 8u) to Rational(5, 2),
+            ).substituteFully(RationalField, bufferOf(
+                Rational(-2, 5),
+                Rational(12, 9),
+            )),
+            "test 6"
+        )
     }
     @Test
-    @Ignore
     fun test_RationalFunction_substituteFully_Double_Buffer() {
-        // TODO
+        assertEquals(
+            0.0,
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 1.0,
+                    listOf(1u) to -2.0,
+                    listOf(2u) to 1.0,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 1.0,
+                )
+            ).substituteFully(bufferOf(
+                1.0
+            )),
+            0.001,
+            "test 1"
+        )
+        assertFailsWithTypeAndMessage<IllegalArgumentException>(
+            fullSubstitutionExceptionMessage,
+            "test 2"
+        ) {
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substituteFully(bufferOf())
+        }
+        assertFailsWithTypeAndMessage<IllegalArgumentException>(
+            fullSubstitutionExceptionMessage,
+            "test 3"
+        ) {
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substituteFully(
+                bufferOf(
+                    -8.11707689492641,
+                )
+            )
+        }
+        assertEquals(
+            -0.012718636022899672,
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substituteFully(bufferOf(
+                -8.11707689492641,
+                0.795265651276015,
+            )),
+            0.001,
+            "test 4"
+        )
+        assertEquals(
+            -0.012718636022899672,
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 6.593754860231304,
+                    listOf(1u) to -7.853302571550634,
+                    listOf(2u) to 1.2265042281530025,
+                    listOf(0u, 1u) to 3.762648877294904,
+                    listOf(1u, 1u) to -8.945144619305292,
+                    listOf(2u, 1u) to -5.141384718042281,
+                    listOf(0u, 2u) to 7.359794483988782,
+                    listOf(1u, 2u) to -4.3526172680518815,
+                    listOf(2u, 2u) to 0.907910924854372,
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to 9.533292132172562,
+                    listOf(1u) to -1.982814534018857,
+                    listOf(2u) to -5.974248303415283,
+                    listOf(0u, 1u) to 1.5876716499288879,
+                    listOf(1u, 1u) to -7.535152566659664,
+                    listOf(2u, 1u) to 0.7549300500153517,
+                    listOf(0u, 2u) to -5.242030058021028,
+                    listOf(1u, 2u) to -0.7265704289690582,
+                    listOf(2u, 2u) to -7.139677818189821,
+                )
+            ).substituteFully(bufferOf(
+                -8.11707689492641,
+                0.795265651276015,
+                0.9211194782050933
+            )),
+            0.001,
+            "test 5"
+        )
     }
     @Test
-    @Ignore
     fun test_RationalFunction_substituteFully_Constant_Buffer() {
-        // TODO
+        assertEquals(
+            Rational(0),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1),
+                    listOf(1u) to Rational(-2),
+                    listOf(2u) to Rational(1)
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(1)
+                )
+            ).substituteFully(RationalField, bufferOf(
+                Rational(1)
+            )),
+            "test 1"
+        )
+        assertEquals(
+            Rational(-1322820, 2204953),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substituteFully(RationalField, bufferOf(
+                Rational(7, 5),
+                Rational(-13, 7),
+                Rational(-16, 4),
+            )),
+            "test 2"
+        )
+        assertEquals(
+            Rational(-1322820, 2204953),
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substituteFully(RationalField, bufferOf(
+                Rational(7, 5),
+                Rational(-13, 7),
+            )),
+            "test 3"
+        )
+        assertFailsWithTypeAndMessage<IllegalArgumentException>(
+            fullSubstitutionExceptionMessage,
+            "test 4"
+        ) {
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substituteFully(
+                RationalField, bufferOf(
+                    Rational(7, 5),
+                )
+            )
+        }
+        assertFailsWithTypeAndMessage<IllegalArgumentException>(
+            fullSubstitutionExceptionMessage,
+            "test 5"
+        ) {
+            NumberedRationalFunction(
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(-3, 5),
+                    listOf(1u) to Rational(-18, 4),
+                    listOf(2u) to Rational(9, 8),
+                    listOf(0u, 1u) to Rational(-11, 6),
+                    listOf(1u, 1u) to Rational(-16, 3),
+                    listOf(2u, 1u) to Rational(12, 2),
+                    listOf(0u, 2u) to Rational(5, 3),
+                    listOf(1u, 2u) to Rational(17, 8),
+                    listOf(2u, 2u) to Rational(1, 3),
+                ),
+                NumberedPolynomialAsIs(
+                    listOf<UInt>() to Rational(11, 1),
+                    listOf(1u) to Rational(4, 1),
+                    listOf(2u) to Rational(-18, 3),
+                    listOf(0u, 1u) to Rational(12, 9),
+                    listOf(1u, 1u) to Rational(14, 7),
+                    listOf(2u, 1u) to Rational(-17, 5),
+                    listOf(0u, 2u) to Rational(-4, 1),
+                    listOf(1u, 2u) to Rational(-5, 5),
+                    listOf(2u, 2u) to Rational(-7, 8),
+                )
+            ).substituteFully(RationalField, bufferOf<Rational>())
+        }
     }
     @Test
     @Ignore
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt
index bf8675675..3ad482454 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.test.misc
 import space.kscience.kmath.functions.NumberedPolynomial
 import space.kscience.kmath.functions.NumberedRationalFunction
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 
 
 fun <T> assertContentEquals(expected: Map<T, Double>, actual: Map<T, Double>, absoluteTolerance: Double, message: String? = null) {
@@ -45,4 +46,15 @@ fun assertEquals(
         absoluteTolerance,
         message
     )
-}
\ No newline at end of file
+}
+
+inline fun <reified T : Throwable> assertFailsWithTypeAndMessage(
+    expectedMessage: String? = null,
+    assertionMessage: String? = null,
+    block: () -> Unit
+) =
+    assertEquals(
+        expectedMessage,
+        assertFailsWith(T::class, assertionMessage, block).message,
+        assertionMessage
+    )
\ No newline at end of file
-- 
2.34.1


From 39088ec36b3ab7635889fc5ca593f6684021bf54 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 4 Jul 2022 02:36:46 +0300
Subject: [PATCH 552/713] Replaced assertFailsWith with
 assertFailsWithTypeAndMessage.

---
 .../kmath/functions/ListPolynomialUtilTest.kt  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
index 9d4f4411b..685a2a506 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -8,16 +8,22 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.test.misc.Rational
 import space.kscience.kmath.test.misc.RationalField
+import space.kscience.kmath.test.misc.assertFailsWithTypeAndMessage
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
 
 
 @OptIn(UnstableKMathAPI::class)
 class ListPolynomialUtilTest {
     @Test
     fun test_Polynomial_substitute_Double() {
+        assertEquals(
+            0.0,
+            ListPolynomial(1.0, -2.0, 1.0).substitute(1.0),
+            0.001,
+            "test 1"
+        )
         assertEquals(
             0.0,
             ListPolynomial(1.0, -2.0, 1.0).substitute(1.0),
@@ -859,7 +865,10 @@ class ListPolynomialUtilTest {
             ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 1),
             "test 1"
         )
-        assertFailsWith<IllegalArgumentException>("test2") {
+        assertFailsWithTypeAndMessage<IllegalArgumentException>(
+            "Order of derivative must be non-negative",
+            "test2"
+        ) {
             ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, -1)
         }
         assertEquals(
@@ -928,7 +937,10 @@ class ListPolynomialUtilTest {
             ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 1),
             "test 1"
         )
-        assertFailsWith<IllegalArgumentException>("test2") {
+        assertFailsWithTypeAndMessage<IllegalArgumentException>(
+            "Order of antiderivative must be non-negative",
+            "test2"
+        ) {
             ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, -1)
         }
         assertEquals(
-- 
2.34.1


From e89e4e19d35e61240e8cb7fb00d88c4e35087991 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 4 Jul 2022 03:54:28 +0300
Subject: [PATCH 553/713] Return suppresses.

---
 .../kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt  | 2 ++
 .../space/kscience/kmath/functions/LabeledRationalFunction.kt   | 2 ++
 .../kotlin/space/kscience/kmath/functions/ListPolynomial.kt     | 2 ++
 .../space/kscience/kmath/functions/ListRationalFunction.kt      | 2 ++
 .../kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt | 2 ++
 .../space/kscience/kmath/functions/NumberedRationalFunction.kt  | 2 ++
 .../space/kscience/kmath/functions/labeledConstructors.kt       | 2 +-
 .../space/kscience/kmath/functions/numberedConstructors.kt      | 2 +-
 .../kotlin/space/kscience/kmath/test/misc/Rational.kt           | 1 +
 9 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index f1859ac4b..6d9af631a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.expressions.Symbol
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index c34d1e46f..e4f2b6c37 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.expressions.Symbol
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index 3f470d5e7..a83b3915a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.Ring
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
index 40c6745d9..b744afc51 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.Ring
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 35d0c7448..ad421d7d3 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.Ring
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index 97dffebe1..0f3c1ced9 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.Ring
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
index f3fa32334..7a8d961c0 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:Suppress("FunctionName")
+@file:Suppress("FunctionName", "NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
 
 package space.kscience.kmath.functions
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
index d561e06ba..7f02ff1e3 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:Suppress("FunctionName")
+@file:Suppress("FunctionName", "NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
 
 package space.kscience.kmath.functions
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
index 071701593..62b7dc3be 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
@@ -9,6 +9,7 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.NumbersAddOps
 
+@Suppress("NAME_SHADOWING")
 class Rational {
     companion object {
         val ZERO: Rational = Rational(0L)
-- 
2.34.1


From e40977647ddf5637855fe9a3171d03895103ef02 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 4 Jul 2022 04:02:08 +0300
Subject: [PATCH 554/713] Added suppresses.

---
 .../kotlin/space/kscience/kmath/test/misc/IntModulo.kt          | 2 ++
 .../kotlin/space/kscience/kmath/test/misc/Rational.kt           | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
index b3bb4faf7..f6e8457bb 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
+
 package space.kscience.kmath.test.misc
 
 import space.kscience.kmath.functions.ListPolynomial
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
index 62b7dc3be..731621658 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
+
 package space.kscience.kmath.test.misc
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-- 
2.34.1


From 45ed45bd137bb5e5f7547333ca72bf6b3d90b46d Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 5 Jul 2022 03:41:52 +0300
Subject: [PATCH 555/713] Finish tests generation for numbered utilities. Also:
 - Optimize a bit labeled and numbered differentiation. - Fixed bugs in
 numbered anti-differentiation.

---
 .../kscience/kmath/functions/labeledUtil.kt   |   12 +-
 .../kscience/kmath/functions/numberedUtil.kt  |   24 +-
 .../functions/NumberedPolynomialUtilTest.kt   | 2816 ++++++++++++++++-
 3 files changed, 2823 insertions(+), 29 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
index 4002eb25a..4e799cb43 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
@@ -148,7 +148,7 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
     variable: Symbol,
 ): LabeledPolynomial<C> = algebra {
     LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
+        buildMap(coefficients.count { it.key.getOrElse(variable) { 0u } >= 1u }) {
             coefficients
                 .forEach { (degs, c) ->
                     if (variable !in degs) return@forEach
@@ -179,7 +179,7 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
 ): LabeledPolynomial<C> = algebra {
     if (order == 0u) return this@nthDerivativeWithRespectTo
     LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
+        buildMap(coefficients.count { it.key.getOrElse(variable) { 0u } >= order }) {
             coefficients
                 .forEach { (degs, c) ->
                     if (degs.getOrElse(variable) { 0u } < order) return@forEach
@@ -213,7 +213,13 @@ public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
     val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
     if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
     LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
+        buildMap(
+            coefficients.count {
+                variablesAndOrders.all { (variable, order) ->
+                    it.key.getOrElse(variable) { 0u } >= order
+                }
+            }
+        ) {
             coefficients
                 .forEach { (degs, c) ->
                     if (filteredVariablesAndOrders.any { (variable, order) -> degs.getOrElse(variable) { 0u } < order }) return@forEach
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
index 9397c1956..9d88cd648 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
@@ -352,7 +352,7 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
     variable: Int,
 ): NumberedPolynomial<C> = ring {
     NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
+        buildMap(coefficients.count { it.key.getOrElse(variable) { 0u } >= 1u }) {
             coefficients
                 .forEach { (degs, c) ->
                     if (degs.lastIndex < variable) return@forEach
@@ -382,7 +382,7 @@ public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
 ): NumberedPolynomial<C> = ring {
     if (order == 0u) return this@nthDerivativeWithRespectTo
     NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
+        buildMap(coefficients.count { it.key.getOrElse(variable) { 0u } >= order }) {
             coefficients
                 .forEach { (degs, c) ->
                     if (degs.lastIndex < variable) return@forEach
@@ -451,8 +451,8 @@ public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
             coefficients
                 .forEach { (degs, c) ->
                     put(
-                        List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + 1u },
-                        c / multiplyByDoubling(one, degs[variable])
+                        List(max(variable + 1, degs.size)) { degs.getOrElse(it) { 0u } + if (it != variable) 0u else 1u },
+                        c / multiplyByDoubling(one, degs.getOrElse(variable) { 0u } + 1u)
                     )
                 }
         }
@@ -474,9 +474,9 @@ public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectT
             coefficients
                 .forEach { (degs, c) ->
                     put(
-                        List(max(variable + 1, degs.size)) { if (it != variable) degs[it] else degs[it] + order },
-                        degs[variable].let { deg ->
-                            (deg downTo deg - order + 1u)
+                        List(max(variable + 1, degs.size)) { degs.getOrElse(it) { 0u } + if (it != variable) 0u else order },
+                        degs.getOrElse(variable) { 0u }.let { deg ->
+                            (deg + 1u .. deg + order)
                                 .fold(c) { acc, ord -> acc / multiplyByDoubling(one, ord) }
                         }
                     )
@@ -501,11 +501,11 @@ public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectT
             coefficients
                 .forEach { (degs, c) ->
                     put(
-                        List(max(maxRespectedVariable + 1, degs.size)) { degs[it] + filteredVariablesAndOrders.getOrElse(it) { 0u } },
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            degs[index].let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> acc2 / multiplyByDoubling(one, ord) }
+                        List(max(maxRespectedVariable + 1, degs.size)) { degs.getOrElse(it) { 0u } + filteredVariablesAndOrders.getOrElse(it) { 0u } },
+                        filteredVariablesAndOrders.entries.fold(c) { acc1, (variable, order) ->
+                            degs.getOrElse(variable) { 0u }.let { deg ->
+                                (deg + 1u .. deg + order)
+                                    .fold(acc1) { acc, ord -> acc / multiplyByDoubling(one, ord) }
                             }
                         }
                     )
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
index 9e49f1315..1b87d3fcf 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.test.misc.Rational
@@ -8832,7 +8833,7 @@ class NumberedPolynomialUtilTest {
                 listOf(0u, 2u) to Rational(5, 5),
                 listOf(1u, 2u) to Rational(18, 9),
                 listOf(2u, 2u) to Rational(5, 2),
-            ).substituteFully(RationalField, bufferOf<Rational>())
+            ).substituteFully(RationalField, bufferOf())
         }
         assertFailsWithTypeAndMessage<IllegalArgumentException>(
             fullSubstitutionExceptionMessage,
@@ -9200,37 +9201,2824 @@ class NumberedPolynomialUtilTest {
                     listOf(1u, 2u) to Rational(-5, 5),
                     listOf(2u, 2u) to Rational(-7, 8),
                 )
-            ).substituteFully(RationalField, bufferOf<Rational>())
+            ).substituteFully(RationalField, bufferOf())
         }
     }
     @Test
-    @Ignore
+    @OptIn(UnstableKMathAPI::class)
     fun test_Polynomial_derivativeWithRespectTo_variable() {
-        // TODO
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-2),
+                listOf(1u) to Rational(2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).derivativeWithRespectTo(RationalField, 0),
+            "test 1"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-2, 3),
+                listOf(1u) to Rational(1, 1),
+                listOf(2u) to Rational(-33, 8),
+                listOf(3u) to Rational(72, 1),
+                listOf(0u, 1u) to Rational(2, 3),
+                listOf(1u, 1u) to Rational(-22, 1),
+                listOf(2u, 1u) to Rational(-1, 1),
+                listOf(3u, 1u) to Rational(-36, 1),
+                listOf(0u, 2u) to Rational(-8, 5),
+                listOf(1u, 2u) to Rational(-1, 4),
+                listOf(2u, 2u) to Rational(12, 7),
+                listOf(3u, 2u) to Rational(-2, 1),
+                listOf(0u, 3u) to Rational(16, 8),
+                listOf(1u, 3u) to Rational(-4, 1),
+                listOf(2u, 3u) to Rational(9, 2),
+                listOf(3u, 3u) to Rational(20, 9),
+                listOf(0u, 4u) to Rational(-10, 1),
+                listOf(1u, 4u) to Rational(-14, 1),
+                listOf(2u, 4u) to Rational(3, 7),
+                listOf(3u, 4u) to Rational(20, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).derivativeWithRespectTo(RationalField, 0),
+            "test 2a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-18, 3),
+                listOf(1u) to Rational(2, 3),
+                listOf(2u) to Rational(-11, 1),
+                listOf(3u) to Rational(-1, 3),
+                listOf(4u) to Rational(-18, 2),
+                listOf(0u, 1u) to Rational(-20, 3),
+                listOf(1u, 1u) to Rational(-16, 5),
+                listOf(2u, 1u) to Rational(-1, 4),
+                listOf(3u, 1u) to Rational(8, 7),
+                listOf(4u, 1u) to Rational(-1, 1),
+                listOf(0u, 2u) to Rational(9, 7),
+                listOf(1u, 2u) to Rational(6, 1),
+                listOf(2u, 2u) to Rational(-6, 1),
+                listOf(3u, 2u) to Rational(9, 2),
+                listOf(4u, 2u) to Rational(5, 3),
+                listOf(0u, 3u) to Rational(-9, 1),
+                listOf(1u, 3u) to Rational(-40, 1),
+                listOf(2u, 3u) to Rational(-28, 1),
+                listOf(3u, 3u) to Rational(4, 7),
+                listOf(4u, 3u) to Rational(20, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).derivativeWithRespectTo(RationalField, 1),
+            "test 2b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(-1, 4),
+                listOf(2u, 2u) to Rational(12, 7),
+                listOf(3u, 2u) to Rational(-2, 1),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(-4, 1),
+                listOf(2u, 3u) to Rational(9, 2),
+                listOf(3u, 3u) to Rational(20, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(-14, 1),
+                listOf(2u, 4u) to Rational(3, 7),
+                listOf(3u, 4u) to Rational(20, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).derivativeWithRespectTo(RationalField, 0),
+            "test 3a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(-1, 4),
+                listOf(3u, 1u) to Rational(8, 7),
+                listOf(4u, 1u) to Rational(-1, 1),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-6, 1),
+                listOf(3u, 2u) to Rational(9, 2),
+                listOf(4u, 2u) to Rational(5, 3),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-28, 1),
+                listOf(3u, 3u) to Rational(4, 7),
+                listOf(4u, 3u) to Rational(20, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).derivativeWithRespectTo(RationalField, 1),
+            "test 3b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-2, 3),
+                listOf(1u) to Rational(1, 1),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(0u, 1u) to Rational(2, 3),
+                listOf(1u, 1u) to Rational(-22, 1),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-8, 5),
+                listOf(1u, 2u) to Rational(-1, 4),
+                listOf(2u, 2u) to Rational(0),
+                listOf(3u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).derivativeWithRespectTo(RationalField, 0),
+            "test 4a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-18, 3),
+                listOf(1u) to Rational(2, 3),
+                listOf(2u) to Rational(-11, 1),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-20, 3),
+                listOf(1u, 1u) to Rational(-16, 5),
+                listOf(2u, 1u) to Rational(-1, 4),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(0),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).derivativeWithRespectTo(RationalField, 1),
+            "test 4b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).derivativeWithRespectTo(RationalField, 5),
+            "test 5"
+        )
     }
     @Test
-    @Ignore
+    @OptIn(UnstableKMathAPI::class)
     fun test_Polynomial_nthDerivativeWithRespectTo_variable_order() {
-        // TODO
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-2),
+                listOf(1u) to Rational(2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, 0, 1u),
+            "test 1"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, 0, 0u),
+            "test 2"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, 0, 2u),
+            "test 3"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, 0, 3u),
+            "test 4"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, 0, 4u),
+            "test 5"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, 1, 0u),
+            "test 6"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, 1, 1u),
+            "test 7"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, 1, 2u),
+            "test 8"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1, 1),
+                listOf(1u) to Rational(-33, 4),
+                listOf(2u) to Rational(216, 1),
+                listOf(0u, 1u) to Rational(-22, 1),
+                listOf(1u, 1u) to Rational(-2, 1),
+                listOf(2u, 1u) to Rational(-108, 1),
+                listOf(0u, 2u) to Rational(-1, 4),
+                listOf(1u, 2u) to Rational(24, 7),
+                listOf(2u, 2u) to Rational(-6, 1),
+                listOf(0u, 3u) to Rational(-4, 1),
+                listOf(1u, 3u) to Rational(9, 1),
+                listOf(2u, 3u) to Rational(20, 3),
+                listOf(0u, 4u) to Rational(-14, 1),
+                listOf(1u, 4u) to Rational(6, 7),
+                listOf(2u, 4u) to Rational(60, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, 0, 2u),
+            "test 9a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-20, 3),
+                listOf(1u) to Rational(-16, 5),
+                listOf(2u) to Rational(-1, 4),
+                listOf(3u) to Rational(8, 7),
+                listOf(4u) to Rational(-1, 1),
+                listOf(0u, 1u) to Rational(18, 7),
+                listOf(1u, 1u) to Rational(12, 1),
+                listOf(2u, 1u) to Rational(-12, 1),
+                listOf(3u, 1u) to Rational(9, 1),
+                listOf(4u, 1u) to Rational(10, 3),
+                listOf(0u, 2u) to Rational(-27, 1),
+                listOf(1u, 2u) to Rational(-120, 1),
+                listOf(2u, 2u) to Rational(-84, 1),
+                listOf(3u, 2u) to Rational(12, 7),
+                listOf(4u, 2u) to Rational(60, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, 1, 2u),
+            "test 9b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-1, 4),
+                listOf(1u, 2u) to Rational(24, 7),
+                listOf(2u, 2u) to Rational(-6, 1),
+                listOf(0u, 3u) to Rational(-4, 1),
+                listOf(1u, 3u) to Rational(9, 1),
+                listOf(2u, 3u) to Rational(20, 3),
+                listOf(0u, 4u) to Rational(-14, 1),
+                listOf(1u, 4u) to Rational(6, 7),
+                listOf(2u, 4u) to Rational(60, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, 0, 2u),
+            "test 10a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(-1, 4),
+                listOf(3u) to Rational(8, 7),
+                listOf(4u) to Rational(-1, 1),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(-12, 1),
+                listOf(3u, 1u) to Rational(9, 1),
+                listOf(4u, 1u) to Rational(10, 3),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-84, 1),
+                listOf(3u, 2u) to Rational(12, 7),
+                listOf(4u, 2u) to Rational(60, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, 1, 2u),
+            "test 10b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1, 1),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(0u, 1u) to Rational(-22, 1),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-1, 4),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).nthDerivativeWithRespectTo(RationalField, 0, 2u),
+            "test 11a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-20, 3),
+                listOf(1u) to Rational(-16, 5),
+                listOf(2u) to Rational(-1, 4),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(0),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).nthDerivativeWithRespectTo(RationalField, 1, 2u),
+            "test 11b"
+        )
     }
     @Test
-    @Ignore
+    @OptIn(UnstableKMathAPI::class)
     fun test_Polynomial_nthDerivativeWithRespectTo_variablesAndOrders() {
-        // TODO
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-2),
+                listOf(1u) to Rational(2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 1u)),
+            "test 1"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 0u)),
+            "test 2"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
+            "test 3"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 3u)),
+            "test 4"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 4u)),
+            "test 5"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(1 to 0u)),
+            "test 6"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(1 to 1u)),
+            "test 7"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
+            "test 8"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf()),
+            "test 9"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-2),
+                listOf(1u) to Rational(2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(
+                0 to 1u,
+                1 to 0u
+            )),
+            "test 10"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(
+                0 to 0u,
+                1 to 1u
+            )),
+            "test 11"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1, 1),
+                listOf(1u) to Rational(-33, 4),
+                listOf(2u) to Rational(216, 1),
+                listOf(0u, 1u) to Rational(-22, 1),
+                listOf(1u, 1u) to Rational(-2, 1),
+                listOf(2u, 1u) to Rational(-108, 1),
+                listOf(0u, 2u) to Rational(-1, 4),
+                listOf(1u, 2u) to Rational(24, 7),
+                listOf(2u, 2u) to Rational(-6, 1),
+                listOf(0u, 3u) to Rational(-4, 1),
+                listOf(1u, 3u) to Rational(9, 1),
+                listOf(2u, 3u) to Rational(20, 3),
+                listOf(0u, 4u) to Rational(-14, 1),
+                listOf(1u, 4u) to Rational(6, 7),
+                listOf(2u, 4u) to Rational(60, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
+            "test 12a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(2, 3),
+                listOf(1u) to Rational(-22, 1),
+                listOf(2u) to Rational(-1, 1),
+                listOf(3u) to Rational(-36, 1),
+                listOf(0u, 1u) to Rational(-16, 5),
+                listOf(1u, 1u) to Rational(-1, 2),
+                listOf(2u, 1u) to Rational(24, 7),
+                listOf(3u, 1u) to Rational(-4, 1),
+                listOf(0u, 2u) to Rational(6, 1),
+                listOf(1u, 2u) to Rational(-12, 1),
+                listOf(2u, 2u) to Rational(27, 2),
+                listOf(3u, 2u) to Rational(20, 3),
+                listOf(0u, 3u) to Rational(-40, 1),
+                listOf(1u, 3u) to Rational(-56, 1),
+                listOf(2u, 3u) to Rational(12, 7),
+                listOf(3u, 3u) to Rational(80, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 1u, 1 to 1u)),
+            "test 12b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-20, 3),
+                listOf(1u) to Rational(-16, 5),
+                listOf(2u) to Rational(-1, 4),
+                listOf(3u) to Rational(8, 7),
+                listOf(4u) to Rational(-1, 1),
+                listOf(0u, 1u) to Rational(18, 7),
+                listOf(1u, 1u) to Rational(12, 1),
+                listOf(2u, 1u) to Rational(-12, 1),
+                listOf(3u, 1u) to Rational(9, 1),
+                listOf(4u, 1u) to Rational(10, 3),
+                listOf(0u, 2u) to Rational(-27, 1),
+                listOf(1u, 2u) to Rational(-120, 1),
+                listOf(2u, 2u) to Rational(-84, 1),
+                listOf(3u, 2u) to Rational(12, 7),
+                listOf(4u, 2u) to Rational(60, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
+            "test 12c"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-1, 4),
+                listOf(1u, 2u) to Rational(24, 7),
+                listOf(2u, 2u) to Rational(-6, 1),
+                listOf(0u, 3u) to Rational(-4, 1),
+                listOf(1u, 3u) to Rational(9, 1),
+                listOf(2u, 3u) to Rational(20, 3),
+                listOf(0u, 4u) to Rational(-14, 1),
+                listOf(1u, 4u) to Rational(6, 7),
+                listOf(2u, 4u) to Rational(60, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
+            "test 13a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(-1, 2),
+                listOf(2u, 1u) to Rational(24, 7),
+                listOf(3u, 1u) to Rational(-4, 1),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(-12, 1),
+                listOf(2u, 2u) to Rational(27, 2),
+                listOf(3u, 2u) to Rational(20, 3),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(-56, 1),
+                listOf(2u, 3u) to Rational(12, 7),
+                listOf(3u, 3u) to Rational(80, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 1u, 1 to 1u)),
+            "test 13b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(-1, 4),
+                listOf(3u) to Rational(8, 7),
+                listOf(4u) to Rational(-1, 1),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(-12, 1),
+                listOf(3u, 1u) to Rational(9, 1),
+                listOf(4u, 1u) to Rational(10, 3),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-84, 1),
+                listOf(3u, 2u) to Rational(12, 7),
+                listOf(4u, 2u) to Rational(60, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
+            "test 13c"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1, 1),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(0u, 1u) to Rational(-22, 1),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-1, 4),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
+            "test 14a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(2, 3),
+                listOf(1u) to Rational(-22, 1),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(0u, 1u) to Rational(-16, 5),
+                listOf(1u, 1u) to Rational(-1, 2),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(0),
+                listOf(3u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 1u, 1 to 1u)),
+            "test 14b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-20, 3),
+                listOf(1u) to Rational(-16, 5),
+                listOf(2u) to Rational(-1, 4),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(0),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
+            "test 14c"
+        )
     }
     @Test
-    @Ignore
+    @OptIn(UnstableKMathAPI::class)
     fun test_Polynomial_antiderivativeWithRespectTo_variable() {
-        // TODO
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(1u) to Rational(1),
+                listOf(2u) to Rational(-1),
+                listOf(3u) to Rational(1, 3),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).antiderivativeWithRespectTo(RationalField, 0),
+            "test 1"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(1u) to Rational(-6, 8),
+                listOf(2u) to Rational(-1, 3),
+                listOf(3u) to Rational(1, 6),
+                listOf(4u) to Rational(-11, 32),
+                listOf(5u) to Rational(18, 5),
+                listOf(1u, 1u) to Rational(-18, 3),
+                listOf(2u, 1u) to Rational(1, 3),
+                listOf(3u, 1u) to Rational(-11, 3),
+                listOf(4u, 1u) to Rational(-1, 12),
+                listOf(5u, 1u) to Rational(-18, 10),
+                listOf(1u, 2u) to Rational(-10, 3),
+                listOf(2u, 2u) to Rational(-4, 5),
+                listOf(3u, 2u) to Rational(-1, 24),
+                listOf(4u, 2u) to Rational(1, 7),
+                listOf(5u, 2u) to Rational(-1, 10),
+                listOf(1u, 3u) to Rational(3, 7),
+                listOf(2u, 3u) to Rational(1, 1),
+                listOf(3u, 3u) to Rational(-2, 3),
+                listOf(4u, 3u) to Rational(3, 8),
+                listOf(5u, 3u) to Rational(1, 9),
+                listOf(1u, 4u) to Rational(-18, 8),
+                listOf(2u, 4u) to Rational(-5, 1),
+                listOf(3u, 4u) to Rational(-7, 3),
+                listOf(4u, 4u) to Rational(1, 28),
+                listOf(5u, 4u) to Rational(1, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).antiderivativeWithRespectTo(RationalField, 0),
+            "test 2a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 1u) to Rational(-6, 8),
+                listOf(1u, 1u) to Rational(-2, 3),
+                listOf(2u, 1u) to Rational(1, 2),
+                listOf(3u, 1u) to Rational(-11, 8),
+                listOf(4u, 1u) to Rational(18, 1),
+                listOf(0u, 2u) to Rational(-9, 3),
+                listOf(1u, 2u) to Rational(1, 3),
+                listOf(2u, 2u) to Rational(-11, 2),
+                listOf(3u, 2u) to Rational(-1, 6),
+                listOf(4u, 2u) to Rational(-9, 2),
+                listOf(0u, 3u) to Rational(-10, 9),
+                listOf(1u, 3u) to Rational(-8, 15),
+                listOf(2u, 3u) to Rational(-1, 24),
+                listOf(3u, 3u) to Rational(4, 21),
+                listOf(4u, 3u) to Rational(-1, 6),
+                listOf(0u, 4u) to Rational(3, 28),
+                listOf(1u, 4u) to Rational(1, 2),
+                listOf(2u, 4u) to Rational(-1, 2),
+                listOf(3u, 4u) to Rational(3, 8),
+                listOf(4u, 4u) to Rational(5, 36),
+                listOf(0u, 5u) to Rational(-9, 20),
+                listOf(1u, 5u) to Rational(-2, 1),
+                listOf(2u, 5u) to Rational(-7, 5),
+                listOf(3u, 5u) to Rational(1, 35),
+                listOf(4u, 5u) to Rational(1, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).antiderivativeWithRespectTo(RationalField, 1),
+            "test 2b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(5u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(5u, 1u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(0),
+                listOf(3u, 2u) to Rational(-1, 24),
+                listOf(4u, 2u) to Rational(1, 7),
+                listOf(5u, 2u) to Rational(-1, 10),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(-2, 3),
+                listOf(4u, 3u) to Rational(3, 8),
+                listOf(5u, 3u) to Rational(1, 9),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(-7, 3),
+                listOf(4u, 4u) to Rational(1, 28),
+                listOf(5u, 4u) to Rational(1, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).antiderivativeWithRespectTo(RationalField, 0),
+            "test 3a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(0),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-1, 24),
+                listOf(3u, 3u) to Rational(4, 21),
+                listOf(4u, 3u) to Rational(-1, 6),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-1, 2),
+                listOf(3u, 4u) to Rational(3, 8),
+                listOf(4u, 4u) to Rational(5, 36),
+                listOf(0u, 5u) to Rational(0),
+                listOf(1u, 5u) to Rational(0),
+                listOf(2u, 5u) to Rational(-7, 5),
+                listOf(3u, 5u) to Rational(1, 35),
+                listOf(4u, 5u) to Rational(1, 1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).antiderivativeWithRespectTo(RationalField, 1),
+            "test 3b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(1u) to Rational(-6, 8),
+                listOf(2u) to Rational(-1, 3),
+                listOf(3u) to Rational(1, 6),
+                listOf(4u) to Rational(0),
+                listOf(5u) to Rational(0),
+                listOf(1u, 1u) to Rational(-18, 3),
+                listOf(2u, 1u) to Rational(1, 3),
+                listOf(3u, 1u) to Rational(-11, 3),
+                listOf(4u, 1u) to Rational(0),
+                listOf(5u, 1u) to Rational(0),
+                listOf(1u, 2u) to Rational(-10, 3),
+                listOf(2u, 2u) to Rational(-4, 5),
+                listOf(3u, 2u) to Rational(-1, 24),
+                listOf(4u, 2u) to Rational(0),
+                listOf(5u, 2u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(5u, 3u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+                listOf(5u, 4u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).antiderivativeWithRespectTo(RationalField, 0),
+            "test 4a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 1u) to Rational(-6, 8),
+                listOf(1u, 1u) to Rational(-2, 3),
+                listOf(2u, 1u) to Rational(1, 2),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-9, 3),
+                listOf(1u, 2u) to Rational(1, 3),
+                listOf(2u, 2u) to Rational(-11, 2),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(-10, 9),
+                listOf(1u, 3u) to Rational(-8, 15),
+                listOf(2u, 3u) to Rational(-1, 24),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+                listOf(0u, 5u) to Rational(0),
+                listOf(1u, 5u) to Rational(0),
+                listOf(2u, 5u) to Rational(0),
+                listOf(3u, 5u) to Rational(0),
+                listOf(4u, 5u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).antiderivativeWithRespectTo(RationalField, 1),
+            "test 4b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 0u, 0u, 0u, 0u, 1u) to Rational(-6, 8),
+                listOf(1u, 0u, 0u, 0u, 0u, 1u) to Rational(-2, 3),
+                listOf(2u, 0u, 0u, 0u, 0u, 1u) to Rational(1, 2),
+                listOf(3u, 0u, 0u, 0u, 0u, 1u) to Rational(-11, 8),
+                listOf(4u, 0u, 0u, 0u, 0u, 1u) to Rational(18, 1),
+                listOf(0u, 1u, 0u, 0u, 0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u, 0u, 0u, 0u, 1u) to Rational(2, 3),
+                listOf(2u, 1u, 0u, 0u, 0u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u, 0u, 0u, 0u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u, 0u, 0u, 0u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u, 0u, 0u, 0u, 1u) to Rational(-10, 3),
+                listOf(1u, 2u, 0u, 0u, 0u, 1u) to Rational(-8, 5),
+                listOf(2u, 2u, 0u, 0u, 0u, 1u) to Rational(-1, 8),
+                listOf(3u, 2u, 0u, 0u, 0u, 1u) to Rational(4, 7),
+                listOf(4u, 2u, 0u, 0u, 0u, 1u) to Rational(-4, 8),
+                listOf(0u, 3u, 0u, 0u, 0u, 1u) to Rational(3, 7),
+                listOf(1u, 3u, 0u, 0u, 0u, 1u) to Rational(16, 8),
+                listOf(2u, 3u, 0u, 0u, 0u, 1u) to Rational(-16, 8),
+                listOf(3u, 3u, 0u, 0u, 0u, 1u) to Rational(12, 8),
+                listOf(4u, 3u, 0u, 0u, 0u, 1u) to Rational(5, 9),
+                listOf(0u, 4u, 0u, 0u, 0u, 1u) to Rational(-18, 8),
+                listOf(1u, 4u, 0u, 0u, 0u, 1u) to Rational(-10, 1),
+                listOf(2u, 4u, 0u, 0u, 0u, 1u) to Rational(-14, 2),
+                listOf(3u, 4u, 0u, 0u, 0u, 1u) to Rational(1, 7),
+                listOf(4u, 4u, 0u, 0u, 0u, 1u) to Rational(15, 3),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).antiderivativeWithRespectTo(RationalField, 5),
+            "test 5"
+        )
     }
     @Test
-    @Ignore
+    @OptIn(UnstableKMathAPI::class)
     fun test_Polynomial_nthAntiderivativeWithRespectTo_variable_order() {
-        // TODO
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(1u) to Rational(1),
+                listOf(2u) to Rational(-1),
+                listOf(3u) to Rational(1, 3),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 0, 1u),
+            "test 1"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 0, 0u),
+            "test 2"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-1, 3),
+                listOf(4u) to Rational(1, 12),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 0, 2u),
+            "test 3"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(3u) to Rational(1, 6),
+                listOf(4u) to Rational(-1, 12),
+                listOf(5u) to Rational(1, 60),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 0, 3u),
+            "test 4"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(4u) to Rational(1, 24),
+                listOf(5u) to Rational(-1, 60),
+                listOf(6u) to Rational(1, 360),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 0, 4u),
+            "test 5"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 1, 0u),
+            "test 6"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 1u) to Rational(1),
+                listOf(1u, 1u) to Rational(-2),
+                listOf(2u, 1u) to Rational(1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 1, 1u),
+            "test 7"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 2u) to Rational(1, 2),
+                listOf(1u, 2u) to Rational(-1),
+                listOf(2u, 2u) to Rational(1, 2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 1, 2u),
+            "test 8"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(2u) to Rational(-3, 8),
+                listOf(3u) to Rational(-1, 9),
+                listOf(4u) to Rational(1, 24),
+                listOf(5u) to Rational(-11, 160),
+                listOf(6u) to Rational(3, 5),
+                listOf(2u, 1u) to Rational(-9, 3),
+                listOf(3u, 1u) to Rational(1, 9),
+                listOf(4u, 1u) to Rational(-11, 12),
+                listOf(5u, 1u) to Rational(-1, 60),
+                listOf(6u, 1u) to Rational(-3, 10),
+                listOf(2u, 2u) to Rational(-5, 3),
+                listOf(3u, 2u) to Rational(-4, 15),
+                listOf(4u, 2u) to Rational(-1, 96),
+                listOf(5u, 2u) to Rational(1, 35),
+                listOf(6u, 2u) to Rational(-1, 60),
+                listOf(2u, 3u) to Rational(3, 14),
+                listOf(3u, 3u) to Rational(1, 3),
+                listOf(4u, 3u) to Rational(-1, 6),
+                listOf(5u, 3u) to Rational(3, 40),
+                listOf(6u, 3u) to Rational(1, 54),
+                listOf(2u, 4u) to Rational(-9, 8),
+                listOf(3u, 4u) to Rational(-5, 3),
+                listOf(4u, 4u) to Rational(-7, 12),
+                listOf(5u, 4u) to Rational(1, 140),
+                listOf(6u, 4u) to Rational(1, 6),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, 0, 2u),
+            "test 9a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 2u) to Rational(-3, 8),
+                listOf(1u, 2u) to Rational(-1, 3),
+                listOf(2u, 2u) to Rational(1, 4),
+                listOf(3u, 2u) to Rational(-11, 16),
+                listOf(4u, 2u) to Rational(9, 1),
+                listOf(0u, 3u) to Rational(-1, 1),
+                listOf(1u, 3u) to Rational(1, 9),
+                listOf(2u, 3u) to Rational(-11, 6),
+                listOf(3u, 3u) to Rational(-1, 18),
+                listOf(4u, 3u) to Rational(-9, 6),
+                listOf(0u, 4u) to Rational(-5, 18),
+                listOf(1u, 4u) to Rational(-2, 15),
+                listOf(2u, 4u) to Rational(-1, 96),
+                listOf(3u, 4u) to Rational(1, 21),
+                listOf(4u, 4u) to Rational(-1, 24),
+                listOf(0u, 5u) to Rational(3, 140),
+                listOf(1u, 5u) to Rational(1, 10),
+                listOf(2u, 5u) to Rational(-1, 10),
+                listOf(3u, 5u) to Rational(3, 40),
+                listOf(4u, 5u) to Rational(1, 36),
+                listOf(0u, 6u) to Rational(-3, 40),
+                listOf(1u, 6u) to Rational(-1, 3),
+                listOf(2u, 6u) to Rational(-7, 30),
+                listOf(3u, 6u) to Rational(1, 210),
+                listOf(4u, 6u) to Rational(1, 6),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, 1, 2u),
+            "test 9b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(5u) to Rational(0),
+                listOf(6u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(5u, 1u) to Rational(0),
+                listOf(6u, 1u) to Rational(0),
+                listOf(2u, 2u) to Rational(0),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(-1, 96),
+                listOf(5u, 2u) to Rational(1, 35),
+                listOf(6u, 2u) to Rational(-1, 60),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(-1, 6),
+                listOf(5u, 3u) to Rational(3, 40),
+                listOf(6u, 3u) to Rational(1, 54),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(-7, 12),
+                listOf(5u, 4u) to Rational(1, 140),
+                listOf(6u, 4u) to Rational(1, 6),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, 0, 2u),
+            "test 10a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(0),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-1, 96),
+                listOf(3u, 4u) to Rational(1, 21),
+                listOf(4u, 4u) to Rational(-1, 24),
+                listOf(0u, 5u) to Rational(0),
+                listOf(1u, 5u) to Rational(0),
+                listOf(2u, 5u) to Rational(-1, 10),
+                listOf(3u, 5u) to Rational(3, 40),
+                listOf(4u, 5u) to Rational(1, 36),
+                listOf(0u, 6u) to Rational(0),
+                listOf(1u, 6u) to Rational(0),
+                listOf(2u, 6u) to Rational(-7, 30),
+                listOf(3u, 6u) to Rational(1, 210),
+                listOf(4u, 6u) to Rational(1, 6),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, 1, 2u),
+            "test 10b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(2u) to Rational(-3, 8),
+                listOf(3u) to Rational(-1, 9),
+                listOf(4u) to Rational(1, 24),
+                listOf(5u) to Rational(0),
+                listOf(6u) to Rational(0),
+                listOf(2u, 1u) to Rational(-9, 3),
+                listOf(3u, 1u) to Rational(1, 9),
+                listOf(4u, 1u) to Rational(-11, 12),
+                listOf(5u, 1u) to Rational(0),
+                listOf(6u, 1u) to Rational(0),
+                listOf(2u, 2u) to Rational(-5, 3),
+                listOf(3u, 2u) to Rational(-4, 15),
+                listOf(4u, 2u) to Rational(-1, 96),
+                listOf(5u, 2u) to Rational(0),
+                listOf(6u, 2u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(5u, 3u) to Rational(0),
+                listOf(6u, 3u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+                listOf(5u, 4u) to Rational(0),
+                listOf(6u, 4u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).nthAntiderivativeWithRespectTo(RationalField, 0, 2u),
+            "test 11a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 2u) to Rational(-3, 8),
+                listOf(1u, 2u) to Rational(-1, 3),
+                listOf(2u, 2u) to Rational(1, 4),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(-1, 1),
+                listOf(1u, 3u) to Rational(1, 9),
+                listOf(2u, 3u) to Rational(-11, 6),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(-5, 18),
+                listOf(1u, 4u) to Rational(-2, 15),
+                listOf(2u, 4u) to Rational(-1, 96),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+                listOf(0u, 5u) to Rational(0),
+                listOf(1u, 5u) to Rational(0),
+                listOf(2u, 5u) to Rational(0),
+                listOf(3u, 5u) to Rational(0),
+                listOf(4u, 5u) to Rational(0),
+                listOf(0u, 6u) to Rational(0),
+                listOf(1u, 6u) to Rational(0),
+                listOf(2u, 6u) to Rational(0),
+                listOf(3u, 6u) to Rational(0),
+                listOf(4u, 6u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).nthAntiderivativeWithRespectTo(RationalField, 1, 2u),
+            "test 11b"
+        )
     }
     @Test
-    @Ignore
+    @OptIn(UnstableKMathAPI::class)
     fun test_Polynomial_nthAntiderivativeWithRespectTo_variablesAndOrders() {
-        // TODO
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(1u) to Rational(1),
+                listOf(2u) to Rational(-1),
+                listOf(3u) to Rational(1, 3),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 1u)),
+            "test 1"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 0, 0u),
+            "test 2"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-1, 3),
+                listOf(4u) to Rational(1, 12),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 0, 2u),
+            "test 3"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(3u) to Rational(1, 6),
+                listOf(4u) to Rational(-1, 12),
+                listOf(5u) to Rational(1, 60),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 0, 3u),
+            "test 4"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(4u) to Rational(1, 24),
+                listOf(5u) to Rational(-1, 60),
+                listOf(6u) to Rational(1, 360),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 0, 4u),
+            "test 5"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 1, 0u),
+            "test 6"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 1u) to Rational(1),
+                listOf(1u, 1u) to Rational(-2),
+                listOf(2u, 1u) to Rational(1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 1, 1u),
+            "test 7"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 2u) to Rational(1, 2),
+                listOf(1u, 2u) to Rational(-1),
+                listOf(2u, 2u) to Rational(1, 2),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, 1, 2u),
+            "test 8"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf()),
+            "test 9"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(1u) to Rational(1),
+                listOf(2u) to Rational(-1),
+                listOf(3u) to Rational(1, 3),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(
+                0 to 1u,
+                1 to 0u
+            )),
+            "test 10"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 1u) to Rational(1),
+                listOf(1u, 1u) to Rational(-2),
+                listOf(2u, 1u) to Rational(1),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(1),
+                listOf(1u) to Rational(-2),
+                listOf(2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(
+                0 to 0u,
+                1 to 1u
+            )),
+            "test 11"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(2u) to Rational(-3, 8),
+                listOf(3u) to Rational(-1, 9),
+                listOf(4u) to Rational(1, 24),
+                listOf(5u) to Rational(-11, 160),
+                listOf(6u) to Rational(3, 5),
+                listOf(2u, 1u) to Rational(-9, 3),
+                listOf(3u, 1u) to Rational(1, 9),
+                listOf(4u, 1u) to Rational(-11, 12),
+                listOf(5u, 1u) to Rational(-1, 60),
+                listOf(6u, 1u) to Rational(-3, 10),
+                listOf(2u, 2u) to Rational(-5, 3),
+                listOf(3u, 2u) to Rational(-4, 15),
+                listOf(4u, 2u) to Rational(-1, 96),
+                listOf(5u, 2u) to Rational(1, 35),
+                listOf(6u, 2u) to Rational(-1, 60),
+                listOf(2u, 3u) to Rational(3, 14),
+                listOf(3u, 3u) to Rational(1, 3),
+                listOf(4u, 3u) to Rational(-1, 6),
+                listOf(5u, 3u) to Rational(3, 40),
+                listOf(6u, 3u) to Rational(1, 54),
+                listOf(2u, 4u) to Rational(-9, 8),
+                listOf(3u, 4u) to Rational(-5, 3),
+                listOf(4u, 4u) to Rational(-7, 12),
+                listOf(5u, 4u) to Rational(1, 140),
+                listOf(6u, 4u) to Rational(1, 6),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
+            "test 12a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(1u, 1u) to Rational(-6, 8),
+                listOf(2u, 1u) to Rational(-1, 3),
+                listOf(3u, 1u) to Rational(1, 6),
+                listOf(4u, 1u) to Rational(-11, 32),
+                listOf(5u, 1u) to Rational(18, 5),
+                listOf(1u, 2u) to Rational(-9, 3),
+                listOf(2u, 2u) to Rational(1, 6),
+                listOf(3u, 2u) to Rational(-11, 6),
+                listOf(4u, 2u) to Rational(-1, 24),
+                listOf(5u, 2u) to Rational(-9, 10),
+                listOf(1u, 3u) to Rational(-10, 9),
+                listOf(2u, 3u) to Rational(-4, 15),
+                listOf(3u, 3u) to Rational(-1, 72),
+                listOf(4u, 3u) to Rational(1, 21),
+                listOf(5u, 3u) to Rational(-1, 30),
+                listOf(1u, 4u) to Rational(3, 28),
+                listOf(2u, 4u) to Rational(1, 4),
+                listOf(3u, 4u) to Rational(-1, 6),
+                listOf(4u, 4u) to Rational(3, 32),
+                listOf(5u, 4u) to Rational(1, 36),
+                listOf(1u, 5u) to Rational(-9, 20),
+                listOf(2u, 5u) to Rational(-1, 1),
+                listOf(3u, 5u) to Rational(-7, 15),
+                listOf(4u, 5u) to Rational(1, 140),
+                listOf(5u, 5u) to Rational(1, 5),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 1u, 1 to 1u)),
+            "test 12b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 2u) to Rational(-3, 8),
+                listOf(1u, 2u) to Rational(-1, 3),
+                listOf(2u, 2u) to Rational(1, 4),
+                listOf(3u, 2u) to Rational(-11, 16),
+                listOf(4u, 2u) to Rational(9, 1),
+                listOf(0u, 3u) to Rational(-1, 1),
+                listOf(1u, 3u) to Rational(1, 9),
+                listOf(2u, 3u) to Rational(-11, 6),
+                listOf(3u, 3u) to Rational(-1, 18),
+                listOf(4u, 3u) to Rational(-9, 6),
+                listOf(0u, 4u) to Rational(-5, 18),
+                listOf(1u, 4u) to Rational(-2, 15),
+                listOf(2u, 4u) to Rational(-1, 96),
+                listOf(3u, 4u) to Rational(1, 21),
+                listOf(4u, 4u) to Rational(-1, 24),
+                listOf(0u, 5u) to Rational(3, 140),
+                listOf(1u, 5u) to Rational(1, 10),
+                listOf(2u, 5u) to Rational(-1, 10),
+                listOf(3u, 5u) to Rational(3, 40),
+                listOf(4u, 5u) to Rational(1, 36),
+                listOf(0u, 6u) to Rational(-3, 40),
+                listOf(1u, 6u) to Rational(-1, 3),
+                listOf(2u, 6u) to Rational(-7, 30),
+                listOf(3u, 6u) to Rational(1, 210),
+                listOf(4u, 6u) to Rational(1, 6),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(-11, 8),
+                listOf(4u) to Rational(18, 1),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(-1, 3),
+                listOf(4u, 1u) to Rational(-18, 2),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(3, 7),
+                listOf(1u, 3u) to Rational(16, 8),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(-18, 8),
+                listOf(1u, 4u) to Rational(-10, 1),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
+            "test 12c"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(5u) to Rational(0),
+                listOf(6u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(5u, 1u) to Rational(0),
+                listOf(6u, 1u) to Rational(0),
+                listOf(2u, 2u) to Rational(0),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(-1, 96),
+                listOf(5u, 2u) to Rational(1, 35),
+                listOf(6u, 2u) to Rational(-1, 60),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(-1, 6),
+                listOf(5u, 3u) to Rational(3, 40),
+                listOf(6u, 3u) to Rational(1, 54),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(-7, 12),
+                listOf(5u, 4u) to Rational(1, 140),
+                listOf(6u, 4u) to Rational(1, 6),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
+            "test 13a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(5u, 1u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(0),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(5u, 2u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(-1, 72),
+                listOf(4u, 3u) to Rational(1, 21),
+                listOf(5u, 3u) to Rational(-1, 30),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(-1, 6),
+                listOf(4u, 4u) to Rational(3, 32),
+                listOf(5u, 4u) to Rational(1, 36),
+                listOf(1u, 5u) to Rational(0),
+                listOf(2u, 5u) to Rational(0),
+                listOf(3u, 5u) to Rational(-7, 15),
+                listOf(4u, 5u) to Rational(1, 140),
+                listOf(5u, 5u) to Rational(1, 5),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 1u, 1 to 1u)),
+            "test 13b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(0),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-1, 96),
+                listOf(3u, 4u) to Rational(1, 21),
+                listOf(4u, 4u) to Rational(-1, 24),
+                listOf(0u, 5u) to Rational(0),
+                listOf(1u, 5u) to Rational(0),
+                listOf(2u, 5u) to Rational(-1, 10),
+                listOf(3u, 5u) to Rational(3, 40),
+                listOf(4u, 5u) to Rational(1, 36),
+                listOf(0u, 6u) to Rational(0),
+                listOf(1u, 6u) to Rational(0),
+                listOf(2u, 6u) to Rational(-7, 30),
+                listOf(3u, 6u) to Rational(1, 210),
+                listOf(4u, 6u) to Rational(1, 6),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(0),
+                listOf(1u) to Rational(0),
+                listOf(2u) to Rational(0),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(0),
+                listOf(1u, 1u) to Rational(0),
+                listOf(2u, 1u) to Rational(0),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(0),
+                listOf(1u, 2u) to Rational(0),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(4, 7),
+                listOf(4u, 2u) to Rational(-4, 8),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(-16, 8),
+                listOf(3u, 3u) to Rational(12, 8),
+                listOf(4u, 3u) to Rational(5, 9),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(-14, 2),
+                listOf(3u, 4u) to Rational(1, 7),
+                listOf(4u, 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
+            "test 13c"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(2u) to Rational(-3, 8),
+                listOf(3u) to Rational(-1, 9),
+                listOf(4u) to Rational(1, 24),
+                listOf(5u) to Rational(0),
+                listOf(6u) to Rational(0),
+                listOf(2u, 1u) to Rational(-9, 3),
+                listOf(3u, 1u) to Rational(1, 9),
+                listOf(4u, 1u) to Rational(-11, 12),
+                listOf(5u, 1u) to Rational(0),
+                listOf(6u, 1u) to Rational(0),
+                listOf(2u, 2u) to Rational(-5, 3),
+                listOf(3u, 2u) to Rational(-4, 15),
+                listOf(4u, 2u) to Rational(-1, 96),
+                listOf(5u, 2u) to Rational(0),
+                listOf(6u, 2u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(5u, 3u) to Rational(0),
+                listOf(6u, 3u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+                listOf(5u, 4u) to Rational(0),
+                listOf(6u, 4u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
+            "test 14a"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(1u, 1u) to Rational(-6, 8),
+                listOf(2u, 1u) to Rational(-1, 3),
+                listOf(3u, 1u) to Rational(1, 6),
+                listOf(4u, 1u) to Rational(0),
+                listOf(5u, 1u) to Rational(0),
+                listOf(1u, 2u) to Rational(-9, 3),
+                listOf(2u, 2u) to Rational(1, 6),
+                listOf(3u, 2u) to Rational(-11, 6),
+                listOf(4u, 2u) to Rational(0),
+                listOf(5u, 2u) to Rational(0),
+                listOf(1u, 3u) to Rational(-10, 9),
+                listOf(2u, 3u) to Rational(-4, 15),
+                listOf(3u, 3u) to Rational(-1, 72),
+                listOf(4u, 3u) to Rational(0),
+                listOf(5u, 3u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+                listOf(5u, 4u) to Rational(0),
+                listOf(1u, 5u) to Rational(0),
+                listOf(2u, 5u) to Rational(0),
+                listOf(3u, 5u) to Rational(0),
+                listOf(4u, 5u) to Rational(0),
+                listOf(5u, 5u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 1u, 1 to 1u)),
+            "test 14b"
+        )
+        assertEquals(
+            NumberedPolynomialAsIs(
+                listOf(0u, 2u) to Rational(-3, 8),
+                listOf(1u, 2u) to Rational(-1, 3),
+                listOf(2u, 2u) to Rational(1, 4),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(-1, 1),
+                listOf(1u, 3u) to Rational(1, 9),
+                listOf(2u, 3u) to Rational(-11, 6),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(-5, 18),
+                listOf(1u, 4u) to Rational(-2, 15),
+                listOf(2u, 4u) to Rational(-1, 96),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+                listOf(0u, 5u) to Rational(0),
+                listOf(1u, 5u) to Rational(0),
+                listOf(2u, 5u) to Rational(0),
+                listOf(3u, 5u) to Rational(0),
+                listOf(4u, 5u) to Rational(0),
+                listOf(0u, 6u) to Rational(0),
+                listOf(1u, 6u) to Rational(0),
+                listOf(2u, 6u) to Rational(0),
+                listOf(3u, 6u) to Rational(0),
+                listOf(4u, 6u) to Rational(0),
+            ),
+            NumberedPolynomialAsIs(
+                listOf<UInt>() to Rational(-6, 8),
+                listOf(1u) to Rational(-2, 3),
+                listOf(2u) to Rational(1, 2),
+                listOf(3u) to Rational(0),
+                listOf(4u) to Rational(0),
+                listOf(0u, 1u) to Rational(-18, 3),
+                listOf(1u, 1u) to Rational(2, 3),
+                listOf(2u, 1u) to Rational(-11, 1),
+                listOf(3u, 1u) to Rational(0),
+                listOf(4u, 1u) to Rational(0),
+                listOf(0u, 2u) to Rational(-10, 3),
+                listOf(1u, 2u) to Rational(-8, 5),
+                listOf(2u, 2u) to Rational(-1, 8),
+                listOf(3u, 2u) to Rational(0),
+                listOf(4u, 2u) to Rational(0),
+                listOf(0u, 3u) to Rational(0),
+                listOf(1u, 3u) to Rational(0),
+                listOf(2u, 3u) to Rational(0),
+                listOf(3u, 3u) to Rational(0),
+                listOf(4u, 3u) to Rational(0),
+                listOf(0u, 4u) to Rational(0),
+                listOf(1u, 4u) to Rational(0),
+                listOf(2u, 4u) to Rational(0),
+                listOf(3u, 4u) to Rational(0),
+                listOf(4u, 4u) to Rational(0),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
+            "test 14c"
+        )
     }
 }
\ No newline at end of file
-- 
2.34.1


From 5834fad938a973976eff3d0f1cea83df2198ba73 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 6 Jul 2022 00:37:46 +0300
Subject: [PATCH 556/713] Renamed constructing DSLs components. Fixed rejected
 NumberedPolynomial tests.

---
 .../kscience/kmath/functions/polynomials.kt   |  205 +-
 .../kmath/functions/labeledConstructors.kt    |   23 +-
 .../kmath/functions/numberedConstructors.kt   |   22 +-
 .../functions/NumberedConstructorsTest.kt     |   10 +-
 .../kmath/functions/NumberedPolynomialTest.kt | 2287 ++++++++---------
 5 files changed, 1270 insertions(+), 1277 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
index 273fe5cb9..7843a0210 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.invoke
 
 
 /**
@@ -102,7 +103,7 @@ fun numberedPolynomialsExample() {
 
         numberedPolynomialSpace {
             // Also there is DSL for constructing NumberedPolynomials:
-            val polynomial5: NumberedPolynomial<Int> = NumberedPolynomial {
+            val polynomial5: NumberedPolynomial<Int> = NumberedPolynomialDSL1 {
                 3 {}
                 5 { 2 inPowerOf 1u }
                 -7 with { 1 pow 2u; 3 pow 1u }
@@ -116,7 +117,7 @@ fun numberedPolynomialsExample() {
         }
     }
 
-    val polynomial6: NumberedPolynomial<Int> = with(Int.algebra) {
+    val polynomial6: NumberedPolynomial<Int> = Int.algebra {
         NumberedPolynomial(
             listOf<UInt>() to 7,
             listOf(0u, 1u) to -5,
@@ -127,28 +128,28 @@ fun numberedPolynomialsExample() {
     // For every ring there can be provided a polynomial ring:
     Int.algebra.numberedPolynomialSpace {
         println(
-            -polynomial6 == NumberedPolynomial {
-                (-7) {}
-                5 { 2 pow 1u }
-                0 { 1 pow 2u; 3 pow 1u }
-                (-4) { 4 pow 4u }
-            }
+            -polynomial6 == NumberedPolynomial(
+                listOf<UInt>() to -7,
+                listOf(0u, 1u) to 5,
+                listOf(2u, 0u, 1u) to 0,
+                listOf(0u, 0u, 0u, 4u) to (-4),
+            )
         ) // true
         println(
-            polynomial1 + polynomial6 == NumberedPolynomial {
-                10 {}
-                0 { 2 pow 1u }
-                (-7) { 1 pow 2u; 3 pow 1u }
-                4 { 4 pow 4u }
-            }
+            polynomial1 + polynomial6 == NumberedPolynomial(
+                listOf<UInt>() to 10,
+                listOf(0u, 1u) to 0,
+                listOf(2u, 0u, 1u) to -7,
+                listOf(0u, 0u, 0u, 4u) to 4,
+            )
         ) // true
         println(
-            polynomial1 - polynomial6 == NumberedPolynomial {
-                (-4) {}
-                10 { 2 pow 1u }
-                (-7) { 1 pow 2u; 3 pow 1u }
-                (-4) { 4 pow 4u }
-            }
+            polynomial1 - polynomial6 == NumberedPolynomial(
+                listOf<UInt>() to -4,
+                listOf(0u, 1u) to 10,
+                listOf(2u, 0u, 1u) to -7,
+                listOf(0u, 0u, 0u, 4u) to -4,
+            )
         ) // true
 
         polynomial1 * polynomial6 // Multiplication works too
@@ -156,14 +157,14 @@ fun numberedPolynomialsExample() {
 
     Double.algebra.numberedPolynomialSpace {
         // You can even write
-        val x_1: NumberedPolynomial<Double> = NumberedPolynomial { 1.0 { 1 pow 1u } }
-        val x_2: NumberedPolynomial<Double> = NumberedPolynomial { 1.0 { 2 pow 1u } }
-        val x_3: NumberedPolynomial<Double> = NumberedPolynomial { 1.0 { 3 pow 1u } }
-        val polynomial7: NumberedPolynomial<Double> = NumberedPolynomial {
-            3.0 {}
-            5.0 { 2 pow 1u }
-            (-7.0) { 1 pow 2u; 3 pow 1u }
-        }
+        val x_1: NumberedPolynomial<Double> = NumberedPolynomial(listOf(1u) to 1.0)
+        val x_2: NumberedPolynomial<Double> = NumberedPolynomial(listOf(0u, 1u) to 1.0)
+        val x_3: NumberedPolynomial<Double> = NumberedPolynomial(listOf(0u, 0u, 1u) to 1.0)
+        val polynomial7: NumberedPolynomial<Double> = NumberedPolynomial(
+            listOf<UInt>() to 3.0,
+            listOf(0u, 1u) to 5.0,
+            listOf(2u, 0u, 1u) to -7.0,
+        )
         Double.algebra.listPolynomialSpace {
             println(3 + 5 * x_2 - 7 * x_1 * x_1 * x_3 == polynomial7)
             println(3.0 + 5.0 * x_2 - 7.0 * x_1 * x_1 * x_3 == polynomial7)
@@ -171,49 +172,49 @@ fun numberedPolynomialsExample() {
     }
 
     Int.algebra.numberedPolynomialSpace {
-        val x_4: NumberedPolynomial<Int> = NumberedPolynomial { 1 { 4 pow 1u } }
+        val x_4: NumberedPolynomial<Int> = NumberedPolynomial(listOf(0u, 0u, 0u, 4u) to 1)
         // Also there are some utilities for polynomials:
         println(polynomial1.substitute(mapOf(0 to 1, 1 to -2, 2 to -1)) == 0.asNumberedPolynomial()) // true,
             // because it's substitution x_1 -> 1, x_2 -> -2, x_3 -> -1,
             // so 3 + 5 x_2 - 7 x_1^2 x_3 = 3 + 5 * (-2) - 7 * 1^2 * (-1) = 3 - 10 + 7 = 0
         println(
-            polynomial1.substitute(mapOf(1 to x_4)) == NumberedPolynomial {
-                3 {}
-                5 { 4 pow 1u }
-                (-7) { 1 pow 2u; 3 pow 1u }
-            }
+            polynomial1.substitute(mapOf(1 to x_4)) == NumberedPolynomial(
+                listOf<UInt>() to 3,
+                listOf(0u, 1u) to 5,
+                listOf(2u, 0u, 1u) to -7,
+            )
         ) // true, because it's substitution x_2 -> x_4, so result is 3 + 5 x_4 - 7 x_1^2 x_3
         println(
             polynomial1.derivativeWithRespectTo(Int.algebra, 1) ==
-                    NumberedPolynomial { 5 {} }
+                    NumberedPolynomial(listOf<UInt>() to 5)
         ) // true, d/dx_2 (3 + 5 x_2 - 7 x_1^2 x_3) = 5
     }
 
     // Lastly, there are rational functions and some other utilities:
     Double.algebra.numberedRationalFunctionSpace {
         val rationalFunction1: NumberedRationalFunction<Double> = NumberedRationalFunction(
-            NumberedPolynomial {
-                2.0 {}
-                (-3.0) { 1 pow 1u }
-                1.0 { 1 pow 2u }
-            },
-            NumberedPolynomial {
-                3.0 {}
-                (-1.0) { 1 pow 1u }
-            }
+            NumberedPolynomial(
+                listOf<UInt>() to 2.0,
+                listOf(1u) to -3.0,
+                listOf(2u) to 1.0,
+            ),
+            NumberedPolynomial(
+                listOf<UInt>() to 3.0,
+                listOf(1u) to -1.0,
+            )
         )
         // It's just (2 - 3x + x^2)/(3 - x) where x = x_1
 
         val rationalFunction2: NumberedRationalFunction<Double> = NumberedRationalFunction(
-            NumberedPolynomial {
-                5.0 {}
-                (-4.0) { 1 pow 1u }
-                1.0 { 1 pow 2u }
-            },
-            NumberedPolynomial {
-                3.0 {}
-                (-1.0) { 1 pow 1u }
-            }
+            NumberedPolynomial(
+                listOf<UInt>() to 5.0,
+                listOf(1u) to -4.0,
+                listOf(2u) to 1.0,
+            ),
+            NumberedPolynomial(
+                listOf<UInt>() to 3.0,
+                listOf(1u) to -1.0,
+            )
         )
         // It's just (5 - 4x + x^2)/(3 - x) where x = x_1
 
@@ -267,7 +268,7 @@ fun labeledPolynomialsExample() {
 
         labeledPolynomialSpace {
             // Also there is DSL for constructing NumberedPolynomials:
-            val polynomial5: LabeledPolynomial<Int> = LabeledPolynomial {
+            val polynomial5: LabeledPolynomial<Int> = LabeledPolynomialDSL1 {
                 3 {}
                 5 { y inPowerOf 1u }
                 -7 with { x pow 2u; z pow 1u }
@@ -281,7 +282,7 @@ fun labeledPolynomialsExample() {
         }
     }
 
-    val polynomial6: LabeledPolynomial<Int> = with(Int.algebra) {
+    val polynomial6: LabeledPolynomial<Int> = Int.algebra {
         LabeledPolynomial(
             mapOf<Symbol, UInt>() to 7,
             mapOf(y to 1u) to -5,
@@ -292,28 +293,28 @@ fun labeledPolynomialsExample() {
     // For every ring there can be provided a polynomial ring:
     Int.algebra.labeledPolynomialSpace {
         println(
-            -polynomial6 == LabeledPolynomial {
-                (-7) {}
-                5 { y pow 1u }
-                0 { x pow 2u; z pow 1u }
-                (-4) { t pow 4u }
-            }
+            -polynomial6 == LabeledPolynomial(
+                mapOf<Symbol, UInt>() to -7,
+                mapOf(y to 1u) to 5,
+                mapOf(x to 2u, z to 1u) to 0,
+                mapOf(t to 4u) to -4,
+            )
         ) // true
         println(
-            polynomial1 + polynomial6 == LabeledPolynomial {
-                10 {}
-                0 { y pow 1u }
-                (-7) { x pow 2u; z pow 1u }
-                4 { t pow 4u }
-            }
+            polynomial1 + polynomial6 == LabeledPolynomial(
+                mapOf<Symbol, UInt>() to 10,
+                mapOf(y to 1u) to 0,
+                mapOf(x to 2u, z to 1u) to -7,
+                mapOf(t to 4u) to 4,
+            )
         ) // true
         println(
-            polynomial1 - polynomial6 == LabeledPolynomial {
-                (-4) {}
-                10 { y pow 1u }
-                (-7) { x pow 2u; z pow 1u }
-                (-4) { t pow 4u }
-            }
+            polynomial1 - polynomial6 == LabeledPolynomial(
+                mapOf<Symbol, UInt>() to -4,
+                mapOf(y to 1u) to 10,
+                mapOf(x to 2u, z to 1u) to -7,
+                mapOf(t to 4u) to -4,
+            )
         ) // true
 
         polynomial1 * polynomial6 // Multiplication works too
@@ -321,11 +322,11 @@ fun labeledPolynomialsExample() {
 
     Double.algebra.labeledPolynomialSpace {
         // You can even write
-        val polynomial7: LabeledPolynomial<Double> = LabeledPolynomial {
-            3.0 {}
-            5.0 { y pow 1u }
-            (-7.0) { x pow 2u; z pow 1u }
-        }
+        val polynomial7: LabeledPolynomial<Double> = LabeledPolynomial(
+            mapOf<Symbol, UInt>() to 3.0,
+            mapOf(y to 1u) to 5.0,
+            mapOf(x to 2u, z to 1u) to -7.0,
+        )
         Double.algebra.listPolynomialSpace {
             println(3 + 5 * y - 7 * x * x * z == polynomial7)
             println(3.0 + 5.0 * y - 7.0 * x * x * z == polynomial7)
@@ -338,42 +339,42 @@ fun labeledPolynomialsExample() {
         // because it's substitution x -> 1, y -> -2, z -> -1,
         // so 3 + 5 y - 7 x^2 z = 3 + 5 * (-2) - 7 * 1^2 * (-1) = 3 - 10 + 7 = 0
         println(
-            polynomial1.substitute(mapOf(y to t.asPolynomial())) == LabeledPolynomial {
-                3 {}
-                5 { t pow 1u }
-                (-7) { x pow 2u; z pow 1u }
-            }
+            polynomial1.substitute(mapOf(y to t.asPolynomial())) == LabeledPolynomial(
+                mapOf<Symbol, UInt>() to 3,
+                mapOf(t to 1u) to 5,
+                mapOf(x to 2u, z to 1u) to -7,
+                )
         ) // true, because it's substitution y -> t, so result is 3 + 5 t - 7 x^2 z
         println(
-            polynomial1.derivativeWithRespectTo(Int.algebra, y) == LabeledPolynomial { 5 {} }
+            polynomial1.derivativeWithRespectTo(Int.algebra, y) == LabeledPolynomial(mapOf<Symbol, UInt>() to 5)
         ) // true, d/dy (3 + 5 y - 7 x^2 z) = 5
     }
 
     // Lastly, there are rational functions and some other utilities:
     Double.algebra.labeledRationalFunctionSpace {
         val rationalFunction1: LabeledRationalFunction<Double> = LabeledRationalFunction(
-            LabeledPolynomial {
-                2.0 {}
-                (-3.0) { x pow 1u }
-                1.0 { x pow 2u }
-            },
-            LabeledPolynomial {
-                3.0 {}
-                (-1.0) { x pow 1u }
-            }
+            LabeledPolynomial(
+                mapOf<Symbol, UInt>() to 2.0,
+                mapOf(x to 1u) to -3.0,
+                mapOf(x to 2u) to 1.0,
+            ),
+            LabeledPolynomial(
+                mapOf<Symbol, UInt>() to 3.0,
+                mapOf(x to 1u) to -1.0,
+            )
         )
         // It's just (2 - 3x + x^2)/(3 - x)
 
         val rationalFunction2: LabeledRationalFunction<Double> = LabeledRationalFunction(
-            LabeledPolynomial {
-                5.0 {}
-                (-4.0) { x pow 1u }
-                1.0 { x pow 2u }
-            },
-            LabeledPolynomial {
-                3.0 {}
-                (-1.0) { x pow 1u }
-            }
+            LabeledPolynomial(
+                mapOf<Symbol, UInt>() to 5.0,
+                mapOf(x to 1u) to -4.0,
+                mapOf(x to 2u) to 1.0,
+            ),
+            LabeledPolynomial(
+                mapOf<Symbol, UInt>() to 3.0,
+                mapOf(x to 1u) to -1.0,
+            )
         )
         // It's just (5 - 4x + x^2)/(3 - x)
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
index 7a8d961c0..8442d3f91 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
@@ -274,14 +274,14 @@ public inline fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPo
  */
 @DslMarker
 @UnstableKMathAPI
-internal annotation class LabeledPolynomialConstructorDSL
+internal annotation class LabeledPolynomialConstructorDSL1
 
 /**
  * Builder of [LabeledPolynomial] signature. It should be used as an implicit context for lambdas that describe term signature.
  */
 @UnstableKMathAPI
-@LabeledPolynomialConstructorDSL
-public class LabeledPolynomialTermSignatureBuilder {
+@LabeledPolynomialConstructorDSL1
+public class DSL1LabeledPolynomialTermSignatureBuilder {
     /**
      * Signature storage. Any declaration of any variable's power updates the storage by increasing corresponding value.
      * Afterward the storage will be used as a resulting signature.
@@ -302,7 +302,7 @@ public class LabeledPolynomialTermSignatureBuilder {
      * Declaring another power of the same variable will increase its degree by received degree.
      */
     public infix fun Symbol.inPowerOf(deg: UInt) {
-        signature[this] = deg
+        signature[this] = signature.getOrElse(this) { 0u } + deg
     }
     /**
      * Declares power of [this] variable of degree [deg].
@@ -328,7 +328,8 @@ public class LabeledPolynomialTermSignatureBuilder {
  * Builder of [LabeledPolynomial]. It should be used as an implicit context for lambdas that describe [LabeledPolynomial].
  */
 @UnstableKMathAPI
-public class LabeledPolynomialBuilder<C>(
+@LabeledPolynomialConstructorDSL1
+public class DSL1LabeledPolynomialBuilder<C>(
     /**
      * Summation operation that will be used to sum coefficients of monomials of same signatures.
      */
@@ -367,15 +368,15 @@ public class LabeledPolynomialBuilder<C>(
      * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
      * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
      */
-    public inline infix fun C.with(noinline block: LabeledPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
+    public inline infix fun C.with(noinline block: DSL1LabeledPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
     /**
      * Declares monomial with [this] coefficient and signature constructed by [block].
      *
      * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
      * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
      */
-    public inline operator fun C.invoke(block: LabeledPolynomialTermSignatureBuilder.() -> Unit): Unit =
-        this with LabeledPolynomialTermSignatureBuilder().apply(block).build()
+    public inline operator fun C.invoke(block: DSL1LabeledPolynomialTermSignatureBuilder.() -> Unit): Unit =
+        this with DSL1LabeledPolynomialTermSignatureBuilder().apply(block).build()
 }
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
@@ -398,7 +399,7 @@ public class LabeledPolynomialBuilder<C>(
 //  2. Union types are implemented. Then all three functions should be rewritten
 //     as one with single union type as a (context) receiver.
 //@UnstableKMathAPI
-//public inline fun <C, A: Ring<C>> A.LabeledPolynomial(initialCapacity: Int = 0, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(::add, initialCapacity).apply(block).build()
+//public inline fun <C, A: Ring<C>> A.LabeledPolynomialDSL1(initialCapacity: Int = 0, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(::add, initialCapacity).apply(block).build()
 /**
  * Creates [LabeledPolynomial] with lambda [block] in context of [this] ring of [LabeledPolynomial]s.
  *
@@ -413,7 +414,7 @@ public class LabeledPolynomialBuilder<C>(
  * ```
  */
 @UnstableKMathAPI
-public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(initialCapacity: Int = 0, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomialDSL1(initialCapacity: Int = 0, block: DSL1LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = DSL1LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 /**
  * Creates [LabeledPolynomial] with lambda [block] in context of [this] field of [LabeledRationalFunction]s.
  *
@@ -428,7 +429,7 @@ public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial
  * ```
  */
 @UnstableKMathAPI
-public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(initialCapacity: Int = 0, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomialDSL1(initialCapacity: Int = 0, block: DSL1LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = DSL1LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
index 7f02ff1e3..8d2c9e617 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
@@ -255,14 +255,14 @@ public inline fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = Numbere
  */
 @DslMarker
 @UnstableKMathAPI
-internal annotation class NumberedPolynomialConstructorDSL
+internal annotation class NumberedPolynomialConstructorDSL1
 
 /**
  * Builder of [NumberedPolynomial] signature. It should be used as an implicit context for lambdas that describe term signature.
  */
 @UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-public class NumberedPolynomialTermSignatureBuilder {
+@NumberedPolynomialConstructorDSL1
+public class DSL1NumberedPolynomialTermSignatureBuilder {
     /**
      * Signature storage. Any declaration of any variable's power updates the storage by increasing corresponding value.
      * Afterward the storage will be used as a resulting signature.
@@ -316,8 +316,8 @@ public class NumberedPolynomialTermSignatureBuilder {
  * Builder of [NumberedPolynomial]. It should be used as an implicit context for lambdas that describe [NumberedPolynomial].
  */
 @UnstableKMathAPI
-@NumberedPolynomialConstructorDSL
-public class NumberedPolynomialBuilder<C>(
+@NumberedPolynomialConstructorDSL1
+public class DSL1NumberedPolynomialBuilder<C>(
     /**
      * Summation operation that will be used to sum coefficients of monomials of same signatures.
      */
@@ -356,15 +356,15 @@ public class NumberedPolynomialBuilder<C>(
      * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
      * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
      */
-    public inline infix fun C.with(noinline block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
+    public inline infix fun C.with(noinline block: DSL1NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
     /**
      * Declares monomial with [this] coefficient and signature constructed by [block].
      *
      * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
      * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
      */
-    public inline operator fun C.invoke(block: NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit =
-        this with NumberedPolynomialTermSignatureBuilder().apply(block).build()
+    public inline operator fun C.invoke(block: DSL1NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit =
+        this with DSL1NumberedPolynomialTermSignatureBuilder().apply(block).build()
 }
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
@@ -387,7 +387,7 @@ public class NumberedPolynomialBuilder<C>(
 //  2. Union types are implemented. Then all three functions should be rewritten
 //     as one with single union type as a (context) receiver.
 //@UnstableKMathAPI
-//public inline fun <C, A: Ring<C>> A.NumberedPolynomial(initialCapacity: Int = 0, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(::add, initialCapacity).apply(block).build()
+//public inline fun <C, A: Ring<C>> A.NumberedPolynomialDSL1(initialCapacity: Int = 0, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(::add, initialCapacity).apply(block).build()
 /**
  * Creates [NumberedPolynomial] with lambda [block] in context of [this] ring of [NumberedPolynomial]s.
  *
@@ -402,7 +402,7 @@ public class NumberedPolynomialBuilder<C>(
  * ```
  */
 @UnstableKMathAPI
-public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(initialCapacity: Int = 0, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomialDSL1(initialCapacity: Int = 0, block: DSL1NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = DSL1NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 /**
  * Creates [NumberedPolynomial] with lambda [block] in context of [this] field of [NumberedRationalFunction]s.
  *
@@ -417,7 +417,7 @@ public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomi
  * ```
  */
 @UnstableKMathAPI
-public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(initialCapacity: Int = 0, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomialDSL1(initialCapacity: Int = 0, block: DSL1NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = DSL1NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
index 8d1b128cf..f9a5a041b 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
@@ -15,14 +15,14 @@ import kotlin.test.assertEquals
 class NumberedConstructorsTest {
     @Test
     @UnstableKMathAPI
-    fun testBuilder() {
+    fun testDSL1() {
         assertEquals(
             NumberedPolynomialAsIs(
                 listOf(2u, 0u, 3u) to 5,
                 listOf(0u, 1u) to -6,
             ),
             Int.algebra.numberedPolynomialSpace {
-                NumberedPolynomial {
+                NumberedPolynomialDSL1 {
                     5 { 1 pow 2u; 3 pow 3u }
                     (-6) { 2 pow 1u }
                 }
@@ -34,7 +34,7 @@ class NumberedConstructorsTest {
                 listOf<UInt>() to -1,
             ),
             Int.algebra.numberedPolynomialSpace {
-                NumberedPolynomial {
+                NumberedPolynomialDSL1 {
                     5 { }
                     (-6) { }
                 }
@@ -46,7 +46,7 @@ class NumberedConstructorsTest {
                 listOf(2u) to -1,
             ),
             Int.algebra.numberedPolynomialSpace {
-                NumberedPolynomial {
+                NumberedPolynomialDSL1 {
                     5 { 1 pow 1u; 1 pow 1u }
                     (-6) { 1 pow 2u }
                 }
@@ -58,7 +58,7 @@ class NumberedConstructorsTest {
                 listOf(2u) to -1,
             ),
             Int.algebra.numberedPolynomialSpace {
-                NumberedPolynomial {
+                NumberedPolynomialDSL1 {
                     5 { 1 pow 1u; 1 pow 1u }
                     (-6) { 1 pow 2u; 3 pow 0u }
                 }
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
index dac7c1a62..f0a1128b4 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
@@ -14,84 +14,85 @@ import kotlin.test.*
 
 @UnstableKMathAPI
 class NumberedPolynomialTest {
+    private val o = Rational(0)
     @Test
     fun test_Polynomial_Int_plus() {
         RationalField.numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(5, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } + -3,
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(5, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) + -3,
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-3, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } + -3,
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-3, 1),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) + -3,
                 "test 2"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } + -3,
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 1),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) + -3,
                 "test 3"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } + -3,
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ) + -3,
                 "test 4"
             )
-            val polynomial_5 = NumberedPolynomial {
-                Rational(-22, 9) with {}
-                Rational(-8, 9) with { 1 pow 3u }
-                Rational(-8, 7) with { 2 pow 4u }
-            }
+            val polynomial_5 = NumberedPolynomial(
+                listOf<UInt>() to Rational(-22, 9),
+                listOf(3u) to Rational(-8, 9),
+                listOf(0u, 4u) to Rational(-8, 7),
+            )
             assertSame(
                 polynomial_5,
                 polynomial_5 + 0,
                 "test 5"
             )
-            val polynomial_6 = NumberedPolynomial {
-                Rational(0, 9) with {}
-                Rational(-8, 9) with { 1 pow 3u }
-                Rational(-8, 7) with { 2 pow 4u }
-            }
+            val polynomial_6 = NumberedPolynomial(
+                listOf<UInt>() to Rational(0, 9),
+                listOf(3u) to Rational(-8, 9),
+                listOf(0u, 4u) to Rational(-8, 7),
+            )
             assertSame(
                 polynomial_6,
                 polynomial_6 + 0,
                 "test 6"
             )
-            val polynomial_7 = NumberedPolynomial {
-                Rational(-8, 9) with { 1 pow 3u }
-                Rational(-8, 7) with { 2 pow 4u }
-            }
+            val polynomial_7 = NumberedPolynomial(
+                listOf(3u) to Rational(-8, 9),
+                listOf(0u, 4u) to Rational(-8, 7),
+            )
             assertSame(
                 polynomial_7,
                 polynomial_7 + 0,
@@ -103,80 +104,80 @@ class NumberedPolynomialTest {
     fun test_Polynomial_Int_minus() {
         RationalField.numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(5, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } - 3,
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(5, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) - 3,
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-3, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } - 3,
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-3, 1),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) - 3,
                 "test 2"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } - 3,
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 1),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) - 3,
                 "test 3"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } - 3,
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ) - 3,
                 "test 4"
             )
-            val polynomial_5 = NumberedPolynomial {
-                Rational(-22, 9) with {}
-                Rational(-8, 9) with { 1 pow 3u }
-                Rational(-8, 7) with { 2 pow 4u }
-            }
+            val polynomial_5 = NumberedPolynomial(
+                listOf<UInt>() to Rational(-22, 9),
+                listOf(3u) to Rational(-8, 9),
+                listOf(0u, 4u) to Rational(-8, 7),
+            )
             assertSame(
                 polynomial_5,
                 polynomial_5 - 0,
                 "test 5"
             )
-            val polynomial_6 = NumberedPolynomial {
-                Rational(0, 9) with {}
-                Rational(-8, 9) with { 1 pow 3u }
-                Rational(-8, 7) with { 2 pow 4u }
-            }
+            val polynomial_6 = NumberedPolynomial(
+                listOf<UInt>() to Rational(0, 9),
+                listOf(3u) to Rational(-8, 9),
+                listOf(0u, 4u) to Rational(-8, 7),
+            )
             assertSame(
                 polynomial_6,
                 polynomial_6 - 0,
                 "test 6"
             )
-            val polynomial_7 = NumberedPolynomial {
-                Rational(-8, 9) with { 1 pow 3u }
-                Rational(-8, 7) with { 2 pow 4u }
-            }
+            val polynomial_7 = NumberedPolynomial(
+                listOf(3u) to Rational(-8, 9),
+                listOf(0u, 4u) to Rational(-8, 7),
+            )
             assertSame(
                 polynomial_7,
                 polynomial_7 - 0,
@@ -188,46 +189,46 @@ class NumberedPolynomialTest {
     fun test_Polynomial_Int_times() {
         IntModuloRing(35).numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    m(34) with {}
-                    m(2) with { 1 pow 3u }
-                    m(1) with { 2 pow 1u }
-                    m(20) with { 1 pow 1u }
-                    m(2) with { 3 pow 2u }
-               },
-                NumberedPolynomial {
-                    m(22) with {}
-                    m(26) with { 1 pow 3u }
-                    m(13) with { 2 pow 1u }
-                    m(15) with { 1 pow 1u }
-                    m(26) with { 3 pow 2u }
-                } * 27,
+                NumberedPolynomial(
+                    listOf<UInt>() to m(34),
+                    listOf(3u) to m(2),
+                    listOf(0u, 1u) to m(1),
+                    listOf(1u) to m(20),
+                    listOf(0u, 0u, 2u) to m(2),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to m(22),
+                    listOf(3u) to m(26),
+                    listOf(0u, 1u) to m(13),
+                    listOf(1u) to m(15),
+                    listOf(0u, 0u, 2u) to m(26),
+                ) * 27,
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    m(0) with {}
-                    m(0) with { 1 pow 3u }
-                    m(0) with { 2 pow 1u }
-                    m(0) with { 1 pow 1u }
-                    m(0) with { 3 pow 2u }
-                },
-                NumberedPolynomial {
-                    m(7) with {}
-                    m(0) with { 1 pow 3u }
-                    m(49) with { 2 pow 1u }
-                    m(21) with { 1 pow 1u }
-                    m(14) with { 3 pow 2u }
-                } * 15,
+                NumberedPolynomial(
+                    listOf<UInt>() to m(0),
+                    listOf(3u) to m(0),
+                    listOf(0u, 1u) to m(0),
+                    listOf(1u) to m(0),
+                    listOf(0u, 0u, 2u) to m(0),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to m(7),
+                    listOf(3u) to m(0),
+                    listOf(0u, 1u) to m(49),
+                    listOf(1u) to m(21),
+                    listOf(0u, 0u, 2u) to m(14),
+                ) * 15,
                 "test 2"
             )
-            val polynomial = NumberedPolynomial {
-                m(22) with {}
-                m(26) with { 1 pow 3u }
-                m(13) with { 2 pow 1u }
-                m(15) with { 1 pow 1u }
-                m(26) with { 3 pow 2u }
-            }
+            val polynomial = NumberedPolynomial(
+                listOf<UInt>() to m(22),
+                listOf(3u) to m(26),
+                listOf(0u, 1u) to m(13),
+                listOf(1u) to m(15),
+                listOf(0u, 0u, 2u) to m(26),
+            )
             assertSame(
                 zero,
                 polynomial * 0,
@@ -244,80 +245,80 @@ class NumberedPolynomialTest {
     fun test_Int_Polynomial_plus() {
         RationalField.numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                -3 + NumberedPolynomial {
-                    Rational(5, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                -3 + NumberedPolynomial(
+                    listOf<UInt>() to Rational(5, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-3, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                -3 + NumberedPolynomial {
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-3, 1),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                -3 + NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 2"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                -3 + NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                -3 + NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 3"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                -3 + NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ),
+                -3 + NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ),
                 "test 4"
             )
-            val polynomial_5 = NumberedPolynomial {
-                Rational(-22, 9) with {}
-                Rational(-8, 9) with { 1 pow 3u }
-                Rational(-8, 7) with { 2 pow 4u }
-            }
+            val polynomial_5 = NumberedPolynomial(
+                listOf<UInt>() to Rational(-22, 9),
+                listOf(3u) to Rational(-8, 9),
+                listOf(0u, 4u) to Rational(-8, 7),
+            )
             assertSame(
                 polynomial_5,
                 0 + polynomial_5,
                 "test 5"
             )
-            val polynomial_6 = NumberedPolynomial {
-                Rational(0, 9) with {}
-                Rational(-8, 9) with { 1 pow 3u }
-                Rational(-8, 7) with { 2 pow 4u }
-            }
+            val polynomial_6 = NumberedPolynomial(
+                listOf<UInt>() to Rational(0, 9),
+                listOf(3u) to Rational(-8, 9),
+                listOf(0u, 4u) to Rational(-8, 7),
+            )
             assertSame(
                 polynomial_6,
                 0 + polynomial_6,
                 "test 6"
             )
-            val polynomial_7 = NumberedPolynomial {
-                Rational(-8, 9) with { 1 pow 3u }
-                Rational(-8, 7) with { 2 pow 4u }
-            }
+            val polynomial_7 = NumberedPolynomial(
+                listOf(3u) to Rational(-8, 9),
+                listOf(0u, 4u) to Rational(-8, 7),
+            )
             assertSame(
                 polynomial_7,
                 0 + polynomial_7,
@@ -329,91 +330,91 @@ class NumberedPolynomialTest {
     fun test_Int_Polynomial_minus() {
         RationalField.numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    Rational(22, 9) with {}
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                3 - NumberedPolynomial {
-                    Rational(5, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(22, 9),
+                    listOf(3u) to Rational(8, 9),
+                    listOf(0u, 4u) to Rational(8, 7),
+                ),
+                3 - NumberedPolynomial(
+                    listOf<UInt>() to Rational(5, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(3, 1) with {}
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                3 - NumberedPolynomial {
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(3, 1),
+                    listOf(3u) to Rational(8, 9),
+                    listOf(0u, 4u) to Rational(8, 7),
+                ),
+                3 - NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 2"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                3 - NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 1),
+                    listOf(3u) to Rational(8, 9),
+                    listOf(0u, 4u) to Rational(8, 7),
+                ),
+                3 - NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 3"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                3 - NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ),
+                3 - NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ),
                 "test 4"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(22, 9) with {}
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                0 - NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(22, 9),
+                    listOf(3u) to Rational(8, 9),
+                    listOf(0u, 4u) to Rational(8, 7),
+                ),
+                0 - NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 5"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 9) with {}
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                0 - NumberedPolynomial {
-                    Rational(0, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 9),
+                    listOf(3u) to Rational(8, 9),
+                    listOf(0u, 4u) to Rational(8, 7),
+                ),
+                0 - NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 6"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                0 - NumberedPolynomial {
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf(3u) to Rational(8, 9),
+                    listOf(0u, 4u) to Rational(8, 7),
+                ),
+                0 - NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 7"
             )
         }
@@ -422,46 +423,46 @@ class NumberedPolynomialTest {
     fun test_Int_Polynomial_times() {
         IntModuloRing(35).numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    m(34) with {}
-                    m(2) with { 1 pow 3u }
-                    m(1) with { 2 pow 1u }
-                    m(20) with { 1 pow 1u }
-                    m(2) with { 3 pow 2u }
-                },
-                27 * NumberedPolynomial {
-                    m(22) with {}
-                    m(26) with { 1 pow 3u }
-                    m(13) with { 2 pow 1u }
-                    m(15) with { 1 pow 1u }
-                    m(26) with { 3 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to m(34),
+                    listOf(3u) to m(2),
+                    listOf(0u, 1u) to m(1),
+                    listOf(1u) to m(20),
+                    listOf(0u, 0u, 2u) to m(2),
+                ),
+                27 * NumberedPolynomial(
+                    listOf<UInt>() to m(22),
+                    listOf(3u) to m(26),
+                    listOf(0u, 1u) to m(13),
+                    listOf(1u) to m(15),
+                    listOf(0u, 0u, 2u) to m(26),
+                ),
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    m(0) with {}
-                    m(0) with { 1 pow 3u }
-                    m(0) with { 2 pow 1u }
-                    m(0) with { 1 pow 1u }
-                    m(0) with { 3 pow 2u }
-                },
-                15 * NumberedPolynomial {
-                    m(7) with {}
-                    m(0) with { 1 pow 3u }
-                    m(49) with { 2 pow 1u }
-                    m(21) with { 1 pow 1u }
-                    m(14) with { 3 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to m(0),
+                    listOf(3u) to m(0),
+                    listOf(0u, 1u) to m(0),
+                    listOf(1u) to m(0),
+                    listOf(0u, 0u, 2u) to m(0),
+                ),
+                15 * NumberedPolynomial(
+                    listOf<UInt>() to m(7),
+                    listOf(3u) to m(0),
+                    listOf(0u, 1u) to m(49),
+                    listOf(1u) to m(21),
+                    listOf(0u, 0u, 2u) to m(14),
+                ),
                 "test 2"
             )
-            val polynomial = NumberedPolynomial {
-                m(22) with {}
-                m(26) with { 1 pow 3u }
-                m(13) with { 2 pow 1u }
-                m(15) with { 1 pow 1u }
-                m(26) with { 3 pow 2u }
-            }
+            val polynomial = NumberedPolynomial(
+                listOf<UInt>() to m(22),
+                listOf(3u) to m(26),
+                listOf(0u, 1u) to m(13),
+                listOf(1u) to m(15),
+                listOf(0u, 0u, 2u) to m(26),
+            )
             assertSame(
                 zero,
                 0 * polynomial,
@@ -478,92 +479,91 @@ class NumberedPolynomialTest {
     fun test_Polynomial_Constant_plus() {
         RationalField.numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(5, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } + Rational(-3),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(5, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) + Rational(-3),
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-3, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } + Rational(-3),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-3, 1),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) + Rational(-3),
                 "test 2"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } + Rational(-3),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 1),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) + Rational(-3),
                 "test 3"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } + Rational(-3),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ) + Rational(-3),
                 "test 4"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } + Rational(0),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) + Rational(0),
                 "test 5"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(0, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } + Rational(0),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) + Rational(0),
                 "test 6"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } + Rational(0),
+                NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) + Rational(0),
                 "test 7"
             )
         }
@@ -572,92 +572,91 @@ class NumberedPolynomialTest {
     fun test_Polynomial_Constant_minus() {
         RationalField.numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(5, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } - Rational(3),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(5, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) - Rational(3),
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-3, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } - Rational(3),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-3, 1),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) - Rational(3),
                 "test 2"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } - Rational(3),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 1),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) - Rational(3),
                 "test 3"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } - Rational(3),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ) - Rational(3),
                 "test 4"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } - Rational(0),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) - Rational(0),
                 "test 5"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(0, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } - Rational(0),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) - Rational(0),
                 "test 6"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                NumberedPolynomial {
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                } - Rational(0),
+                NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ) - Rational(0),
                 "test 7"
             )
         }
@@ -666,71 +665,71 @@ class NumberedPolynomialTest {
     fun test_Polynomial_Constant_times() {
         IntModuloRing(35).numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    m(34) with {}
-                    m(2) with { 1 pow 3u }
-                    m(1) with { 2 pow 1u }
-                    m(20) with { 1 pow 1u }
-                    m(2) with { 3 pow 2u }
-                },
-                NumberedPolynomial {
-                    m(22) with {}
-                    m(26) with { 1 pow 3u }
-                    m(13) with { 2 pow 1u }
-                    m(15) with { 1 pow 1u }
-                    m(26) with { 3 pow 2u }
-                } * m(27),
+                NumberedPolynomial(
+                    listOf<UInt>() to m(34),
+                    listOf(3u) to m(2),
+                    listOf(0u, 1u) to m(1),
+                    listOf(1u) to m(20),
+                    listOf(0u, 0u, 2u) to m(2),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to m(22),
+                    listOf(3u) to m(26),
+                    listOf(0u, 1u) to m(13),
+                    listOf(1u) to m(15),
+                    listOf(0u, 0u, 2u) to m(26),
+                ) * m(27),
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    m(0) with {}
-                    m(0) with { 1 pow 3u }
-                    m(0) with { 2 pow 1u }
-                    m(0) with { 1 pow 1u }
-                    m(0) with { 3 pow 2u }
-                },
-                NumberedPolynomial {
-                    m(7) with {}
-                    m(0) with { 1 pow 3u }
-                    m(49) with { 2 pow 1u }
-                    m(21) with { 1 pow 1u }
-                    m(14) with { 3 pow 2u }
-                } * m(15),
+                NumberedPolynomial(
+                    listOf<UInt>() to m(0),
+                    listOf(3u) to m(0),
+                    listOf(0u, 1u) to m(0),
+                    listOf(1u) to m(0),
+                    listOf(0u, 0u, 2u) to m(0),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to m(7),
+                    listOf(3u) to m(0),
+                    listOf(0u, 1u) to m(49),
+                    listOf(1u) to m(21),
+                    listOf(0u, 0u, 2u) to m(14),
+                ) * m(15),
                 "test 2"
             )
             assertEquals(
-                NumberedPolynomial {
-                    m(0) with {}
-                    m(0) with { 1 pow 3u }
-                    m(0) with { 2 pow 1u }
-                    m(0) with { 1 pow 1u }
-                    m(0) with { 3 pow 2u }
-                },
-                NumberedPolynomial {
-                    m(22) with {}
-                    m(26) with { 1 pow 3u }
-                    m(13) with { 2 pow 1u }
-                    m(15) with { 1 pow 1u }
-                    m(26) with { 3 pow 2u }
-                } * m(0),
+                NumberedPolynomial(
+                    listOf<UInt>() to m(0),
+                    listOf(3u) to m(0),
+                    listOf(0u, 1u) to m(0),
+                    listOf(1u) to m(0),
+                    listOf(0u, 0u, 2u) to m(0),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to m(22),
+                    listOf(3u) to m(26),
+                    listOf(0u, 1u) to m(13),
+                    listOf(1u) to m(15),
+                    listOf(0u, 0u, 2u) to m(26),
+                ) * m(0),
                 "test 3"
             )
             assertEquals(
-                NumberedPolynomial {
-                    m(22) with {}
-                    m(26) with { 1 pow 3u }
-                    m(13) with { 2 pow 1u }
-                    m(15) with { 1 pow 1u }
-                    m(26) with { 3 pow 2u }
-                },
-                NumberedPolynomial {
-                    m(22) with {}
-                    m(26) with { 1 pow 3u }
-                    m(13) with { 2 pow 1u }
-                    m(15) with { 1 pow 1u }
-                    m(26) with { 3 pow 2u }
-                } * m(1),
+                NumberedPolynomial(
+                    listOf<UInt>() to m(22),
+                    listOf(3u) to m(26),
+                    listOf(0u, 1u) to m(13),
+                    listOf(1u) to m(15),
+                    listOf(0u, 0u, 2u) to m(26),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to m(22),
+                    listOf(3u) to m(26),
+                    listOf(0u, 1u) to m(13),
+                    listOf(1u) to m(15),
+                    listOf(0u, 0u, 2u) to m(26),
+                ) * m(1),
                 "test 4"
             )
         }
@@ -739,92 +738,91 @@ class NumberedPolynomialTest {
     fun test_Constant_Polynomial_plus() {
         RationalField.numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                Rational(-3) + NumberedPolynomial {
-                    Rational(5, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                Rational(-3) + NumberedPolynomial(
+                    listOf<UInt>() to Rational(5, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-3, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                Rational(-3) + NumberedPolynomial {
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-3, 1),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                Rational(-3) + NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 2"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                Rational(-3) + NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 1),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                Rational(-3) + NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 3"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                Rational(-3) + NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ),
+                Rational(-3) + NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ),
                 "test 4"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                Rational(0) + NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                Rational(0) + NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 5"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                Rational(0) + NumberedPolynomial {
-                    Rational(0, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                Rational(0) + NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 6"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
-                Rational(0) + NumberedPolynomial {
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
+                Rational(0) + NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 7"
             )
         }
@@ -833,92 +831,92 @@ class NumberedPolynomialTest {
     fun test_Constant_Polynomial_minus() {
         RationalField.numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    Rational(22, 9) with {}
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                Rational(3) - NumberedPolynomial {
-                    Rational(5, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(22, 9),
+                    listOf(3u) to Rational(8, 9),
+                    listOf(0u, 4u) to Rational(8, 7),
+                ),
+                Rational(3) - NumberedPolynomial(
+                    listOf<UInt>() to Rational(5, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(3, 1) with {}
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                Rational(3) - NumberedPolynomial {
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(3, 1),
+                    listOf(3u) to Rational(8, 9),
+                    listOf(0u, 4u) to Rational(8, 7),
+                ),
+                Rational(3) - NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 2"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                Rational(3) - NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 1),
+                    listOf(3u) to Rational(8, 9),
+                    listOf(0u, 4u) to Rational(8, 7),
+                ),
+                Rational(3) - NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 3"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 1) with {}
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                Rational(3) - NumberedPolynomial {
-                    Rational(27, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ),
+                Rational(3) - NumberedPolynomial(
+                    listOf<UInt>() to Rational(27, 9),
+                    listOf(3u) to Rational(0),
+                    listOf(0u, 4u) to Rational(0),
+                ),
                 "test 4"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(22, 9) with {}
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                Rational(0) - NumberedPolynomial {
-                    Rational(-22, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(22, 9),
+                    listOf(3u) to Rational(8, 9),
+                    listOf(0u, 4u) to Rational(8, 7),
+                ),
+                Rational(0) - NumberedPolynomial(
+                    listOf<UInt>() to Rational(-22, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 5"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0, 9) with {}
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                Rational(0) - NumberedPolynomial {
-                    Rational(0, 9) with {}
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 9),
+                    listOf(3u) to Rational(8, 9),
+                    listOf(0u, 4u) to Rational(8, 7),
+                ),
+                Rational(0) - NumberedPolynomial(
+                    listOf<UInt>() to Rational(0, 9),
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 6"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0) with {}
-                    Rational(8, 9) with { 1 pow 3u }
-                    Rational(8, 7) with { 2 pow 4u }
-                },
-                Rational(0) - NumberedPolynomial {
-                    Rational(-8, 9) with { 1 pow 3u }
-                    Rational(-8, 7) with { 2 pow 4u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
+                    listOf(3u) to Rational(8, 9),
+                    listOf(0u, 4u) to Rational(8, 7),
+                ),
+                Rational(0) - NumberedPolynomial(
+                    listOf(3u) to Rational(-8, 9),
+                    listOf(0u, 4u) to Rational(-8, 7),
+                ),
                 "test 7"
             )
         }
@@ -927,71 +925,71 @@ class NumberedPolynomialTest {
     fun test_Constant_Polynomial_times() {
         IntModuloRing(35).numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    m(34) with {}
-                    m(2) with { 1 pow 3u }
-                    m(1) with { 2 pow 1u }
-                    m(20) with { 1 pow 1u }
-                    m(2) with { 3 pow 2u }
-                },
-                m(27) * NumberedPolynomial {
-                    m(22) with {}
-                    m(26) with { 1 pow 3u }
-                    m(13) with { 2 pow 1u }
-                    m(15) with { 1 pow 1u }
-                    m(26) with { 3 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to m(34),
+                    listOf(3u) to m(2),
+                    listOf(0u, 1u) to m(1),
+                    listOf(1u) to m(20),
+                    listOf(0u, 0u, 2u) to m(2),
+                ),
+                m(27) * NumberedPolynomial(
+                    listOf<UInt>() to m(22),
+                    listOf(3u) to m(26),
+                    listOf(0u, 1u) to m(13),
+                    listOf(1u) to m(15),
+                    listOf(0u, 0u, 2u) to m(26),
+                ),
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    m(0) with {}
-                    m(0) with { 1 pow 3u }
-                    m(0) with { 2 pow 1u }
-                    m(0) with { 1 pow 1u }
-                    m(0) with { 3 pow 2u }
-                },
-                m(15) * NumberedPolynomial {
-                    m(7) with {}
-                    m(0) with { 1 pow 3u }
-                    m(49) with { 2 pow 1u }
-                    m(21) with { 1 pow 1u }
-                    m(14) with { 3 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to m(0),
+                    listOf(3u) to m(0),
+                    listOf(0u, 1u) to m(0),
+                    listOf(1u) to m(0),
+                    listOf(0u, 0u, 2u) to m(0),
+                ),
+                m(15) * NumberedPolynomial(
+                    listOf<UInt>() to m(7),
+                    listOf(3u) to m(0),
+                    listOf(0u, 1u) to m(49),
+                    listOf(1u) to m(21),
+                    listOf(0u, 0u, 2u) to m(14),
+                ),
                 "test 2"
             )
             assertEquals(
-                NumberedPolynomial {
-                    m(0) with {}
-                    m(0) with { 1 pow 3u }
-                    m(0) with { 2 pow 1u }
-                    m(0) with { 1 pow 1u }
-                    m(0) with { 3 pow 2u }
-                },
-                m(0) * NumberedPolynomial {
-                    m(22) with {}
-                    m(26) with { 1 pow 3u }
-                    m(13) with { 2 pow 1u }
-                    m(15) with { 1 pow 1u }
-                    m(26) with { 3 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to m(0),
+                    listOf(3u) to m(0),
+                    listOf(0u, 1u) to m(0),
+                    listOf(1u) to m(0),
+                    listOf(0u, 0u, 2u) to m(0),
+                ),
+                m(0) * NumberedPolynomial(
+                    listOf<UInt>() to m(22),
+                    listOf(3u) to m(26),
+                    listOf(0u, 1u) to m(13),
+                    listOf(1u) to m(15),
+                    listOf(0u, 0u, 2u) to m(26),
+                ),
                 "test 3"
             )
             assertEquals(
-                NumberedPolynomial {
-                    m(22) with {}
-                    m(26) with { 1 pow 3u }
-                    m(13) with { 2 pow 1u }
-                    m(15) with { 1 pow 1u }
-                    m(26) with { 3 pow 2u }
-                },
-                m(1) * NumberedPolynomial {
-                    m(22) with {}
-                    m(26) with { 1 pow 3u }
-                    m(13) with { 2 pow 1u }
-                    m(15) with { 1 pow 1u }
-                    m(26) with { 3 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to m(22),
+                    listOf(3u) to m(26),
+                    listOf(0u, 1u) to m(13),
+                    listOf(1u) to m(15),
+                    listOf(0u, 0u, 2u) to m(26),
+                ),
+                m(1) * NumberedPolynomial(
+                    listOf<UInt>() to m(22),
+                    listOf(3u) to m(26),
+                    listOf(0u, 1u) to m(13),
+                    listOf(1u) to m(15),
+                    listOf(0u, 0u, 2u) to m(26),
+                ),
                 "test 4"
             )
         }
@@ -1000,33 +998,33 @@ class NumberedPolynomialTest {
     fun test_Polynomial_unaryMinus() {
         RationalField.numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-5, 9) with { 1 pow 5u }
-                    Rational(8, 9) with {}
-                    Rational(8, 7) with { 7 pow 13u }
-                },
-                -NumberedPolynomial {
-                    Rational(5, 9) with { 1 pow 5u }
-                    Rational(-8, 9) with {}
-                    Rational(-8, 7) with { 7 pow 13u }
-                },
+                NumberedPolynomial(
+                    listOf(5u) to Rational(-5, 9),
+                    listOf<UInt>() to Rational(8, 9),
+                    listOf(0u, 0u, 0u, 0u, 0u, 0u, 13u) to Rational(8, 7),
+                ),
+                -NumberedPolynomial(
+                    listOf(5u) to Rational(5, 9),
+                    listOf<UInt>() to Rational(-8, 9),
+                    listOf(0u, 0u, 0u, 0u, 0u, 0u, 13u) to Rational(-8, 7),
+                ),
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-5, 9) with { 3 pow 7u }
-                    Rational(8, 9) with {}
-                    Rational(8, 7) with { 1 pow 3u }
-                    Rational(0) with { 2 pow 4u }
-                    Rational(0) with { 1 pow 5u }
-                },
-                -NumberedPolynomial {
-                    Rational(5, 9) with { 3 pow 7u }
-                    Rational(-8, 9) with {}
-                    Rational(-8, 7) with { 1 pow 3u }
-                    Rational(0) with { 2 pow 4u }
-                    Rational(0) with { 1 pow 5u }
-                },
+                NumberedPolynomial(
+                    listOf(5u) to Rational(-5, 9),
+                    listOf<UInt>() to Rational(8, 9),
+                    listOf(0u, 0u, 0u, 0u, 0u, 0u, 13u) to Rational(8, 7),
+                    listOf(0u, 4u) to Rational(0),
+                    listOf(5u) to Rational(0),
+                ),
+                -NumberedPolynomial(
+                    listOf(5u) to Rational(5, 9),
+                    listOf<UInt>() to Rational(-8, 9),
+                    listOf(0u, 0u, 0u, 0u, 0u, 0u, 13u) to Rational(-8, 7),
+                    listOf(0u, 4u) to Rational(0),
+                    listOf(5u) to Rational(0),
+                ),
                 "test 2"
             )
         }
@@ -1035,137 +1033,137 @@ class NumberedPolynomialTest {
     fun test_Polynomial_Polynomial_plus() {
         RationalField.numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-17, 2) with {}
-                    Rational(-1, 3) with { 1 pow 1u }
-                    Rational(-25, 21) with { 1 pow 2u }
-                    Rational(146, 63) with { 2 pow 1u }
-                    Rational(-3, 5) with { 1 pow 1u; 2 pow 1u }
-                    Rational(61, 15) with { 1 pow 2u; 2 pow 1u }
-                    Rational(157, 63) with { 2 pow 2u }
-                    Rational(-55, 21) with { 1 pow 1u; 2 pow 2u }
-                    Rational(11, 24) with { 1 pow 2u; 2 pow 2u }
-                },
-                NumberedPolynomial {
-                    Rational(6, 4) with {}
-                    Rational(-2, 6) with { 1 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u }
-                    Rational(17, 7) with { 2 pow 1u }
-                    Rational(-7, 7) with { 1 pow 1u; 2 pow 1u }
-                    Rational(12, 5) with { 1 pow 2u; 2 pow 1u }
-                    Rational(12, 7) with { 2 pow 2u }
-                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
-                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
-                } + NumberedPolynomial {
-                    Rational(-20, 2) with {}
-                    Rational(0, 9) with { 1 pow 1u }
-                    Rational(-20, 7) with { 1 pow 2u }
-                    Rational(-1, 9) with { 2 pow 1u }
-                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
-                    Rational(7, 9) with { 2 pow 2u }
-                    Rational(5, 7) with { 1 pow 1u; 2 pow 2u }
-                    Rational(-2, 3) with { 1 pow 2u; 2 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-17, 2),
+                    listOf(1u) to Rational(-1, 3),
+                    listOf(2u) to Rational(-25, 21),
+                    listOf(0u, 1u) to Rational(146, 63),
+                    listOf(1u, 1u) to Rational(-3, 5),
+                    listOf(2u, 1u) to Rational(61, 15),
+                    listOf(0u, 2u) to Rational(157, 63),
+                    listOf(1u, 2u) to Rational(-55, 21),
+                    listOf(2u, 2u) to Rational(11, 24),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(6, 4),
+                    listOf(1u) to Rational(-2, 6),
+                    listOf(2u) to Rational(10, 6),
+                    listOf(0u, 1u) to Rational(17, 7),
+                    listOf(1u, 1u) to Rational(-7, 7),
+                    listOf(2u, 1u) to Rational(12, 5),
+                    listOf(0u, 2u) to Rational(12, 7),
+                    listOf(1u, 2u) to Rational(-10, 3),
+                    listOf(2u, 2u) to Rational(9, 8),
+                ) + NumberedPolynomial(
+                    listOf<UInt>() to Rational(-20, 2),
+                    listOf(1u) to Rational(0, 9),
+                    listOf(2u) to Rational(-20, 7),
+                    listOf(0u, 1u) to Rational(-1, 9),
+                    listOf(1u, 1u) to Rational(2, 5),
+                    listOf(2u, 1u) to Rational(10, 6),
+                    listOf(0u, 2u) to Rational(7, 9),
+                    listOf(1u, 2u) to Rational(5, 7),
+                    listOf(2u, 2u) to Rational(-2, 3),
+                ),
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-17, 2) with {}
-                    Rational(-1, 3) with { 1 pow 1u }
-                    Rational(-25, 21) with { 1 pow 2u }
-                    Rational(-1, 9) with { 2 pow 1u }
-                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
-                    Rational(157, 63) with { 2 pow 2u }
-                    Rational(-55, 21) with { 1 pow 1u; 2 pow 2u }
-                    Rational(11, 24) with { 1 pow 2u; 2 pow 2u }
-                },
-                NumberedPolynomial {
-                    Rational(6, 4) with {}
-                    Rational(-2, 6) with { 1 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u }
-                    Rational(12, 7) with { 2 pow 2u }
-                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
-                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
-                } + NumberedPolynomial {
-                    Rational(-20, 2) with {}
-                    Rational(0, 9) with { 1 pow 1u }
-                    Rational(-20, 7) with { 1 pow 2u }
-                    Rational(-1, 9) with { 2 pow 1u }
-                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
-                    Rational(7, 9) with { 2 pow 2u }
-                    Rational(5, 7) with { 1 pow 1u; 2 pow 2u }
-                    Rational(-2, 3) with { 1 pow 2u; 2 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-17, 2),
+                    listOf(1u) to Rational(-1, 3),
+                    listOf(2u) to Rational(-25, 21),
+                    listOf(0u, 1u) to Rational(-1, 9),
+                    listOf(1u, 1u) to Rational(2, 5),
+                    listOf(2u, 1u) to Rational(10, 6),
+                    listOf(0u, 2u) to Rational(157, 63),
+                    listOf(1u, 2u) to Rational(-55, 21),
+                    listOf(2u, 2u) to Rational(11, 24),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(6, 4),
+                    listOf(1u) to Rational(-2, 6),
+                    listOf(2u) to Rational(10, 6),
+                    listOf(0u, 2u) to Rational(12, 7),
+                    listOf(1u, 2u) to Rational(-10, 3),
+                    listOf(2u, 2u) to Rational(9, 8),
+                ) + NumberedPolynomial(
+                    listOf<UInt>() to Rational(-20, 2),
+                    listOf(1u) to Rational(0, 9),
+                    listOf(2u) to Rational(-20, 7),
+                    listOf(0u, 1u) to Rational(-1, 9),
+                    listOf(1u, 1u) to Rational(2, 5),
+                    listOf(2u, 1u) to Rational(10, 6),
+                    listOf(0u, 2u) to Rational(7, 9),
+                    listOf(1u, 2u) to Rational(5, 7),
+                    listOf(2u, 2u) to Rational(-2, 3),
+                ),
                 "test 2"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-17, 2) with {}
-                    Rational(-1, 3) with { 1 pow 1u }
-                    Rational(-25, 21) with { 1 pow 2u }
-                    Rational(-1, 9) with { 2 pow 1u }
-                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
-                    Rational(12, 7) with { 2 pow 2u }
-                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
-                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
-                },
-                NumberedPolynomial {
-                    Rational(6, 4) with {}
-                    Rational(-2, 6) with { 1 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u }
-                    Rational(12, 7) with { 2 pow 2u }
-                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
-                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
-                } + NumberedPolynomial {
-                    Rational(-20, 2) with {}
-                    Rational(0, 9) with { 1 pow 1u }
-                    Rational(-20, 7) with { 1 pow 2u }
-                    Rational(-1, 9) with { 2 pow 1u }
-                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
-                    Rational(0) with { 2 pow 2u }
-                    Rational(0) with { 1 pow 1u; 2 pow 2u }
-                    Rational(0) with { 1 pow 2u; 2 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-17, 2),
+                    listOf(1u) to Rational(-1, 3),
+                    listOf(2u) to Rational(-25, 21),
+                    listOf(0u, 1u) to Rational(-1, 9),
+                    listOf(1u, 1u) to Rational(2, 5),
+                    listOf(2u, 1u) to Rational(10, 6),
+                    listOf(0u, 2u) to Rational(12, 7),
+                    listOf(1u, 2u) to Rational(-10, 3),
+                    listOf(2u, 2u) to Rational(9, 8),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(6, 4),
+                    listOf(1u) to Rational(-2, 6),
+                    listOf(2u) to Rational(10, 6),
+                    listOf(0u, 2u) to Rational(12, 7),
+                    listOf(1u, 2u) to Rational(-10, 3),
+                    listOf(2u, 2u) to Rational(9, 8),
+                ) + NumberedPolynomial(
+                    listOf<UInt>() to Rational(-20, 2),
+                    listOf(1u) to Rational(0, 9),
+                    listOf(2u) to Rational(-20, 7),
+                    listOf(0u, 1u) to Rational(-1, 9),
+                    listOf(1u, 1u) to Rational(2, 5),
+                    listOf(2u, 1u) to Rational(10, 6),
+                    listOf(0u, 2u) to Rational(0),
+                    listOf(1u, 2u) to Rational(0),
+                    listOf(2u, 2u) to Rational(0),
+                ),
                 "test 3"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0) with {}
-                    Rational(0) with { 1 pow 1u }
-                    Rational(0) with { 1 pow 2u }
-                    Rational(0) with { 2 pow 1u }
-                    Rational(0) with { 1 pow 1u; 2 pow 1u }
-                    Rational(0) with { 1 pow 2u; 2 pow 1u }
-                    Rational(0) with { 2 pow 2u }
-                    Rational(0) with { 1 pow 1u; 2 pow 2u }
-                    Rational(0) with { 1 pow 2u; 2 pow 2u }
-                },
-                NumberedPolynomial {
-                    Rational(6, 4) with {}
-                    Rational(-2, 6) with { 1 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u }
-                    Rational(17, 7) with { 2 pow 1u }
-                    Rational(-7, 7) with { 1 pow 1u; 2 pow 1u }
-                    Rational(12, 5) with { 1 pow 2u; 2 pow 1u }
-                    Rational(12, 7) with { 2 pow 2u }
-                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
-                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
-                } + NumberedPolynomial {
-                    Rational(-6, 4) with {}
-                    Rational(2, 6) with { 1 pow 1u }
-                    Rational(-10, 6) with { 1 pow 2u }
-                    Rational(-17, 7) with { 2 pow 1u }
-                    Rational(7, 7) with { 1 pow 1u; 2 pow 1u }
-                    Rational(-12, 5) with { 1 pow 2u; 2 pow 1u }
-                    Rational(-12, 7) with { 2 pow 2u }
-                    Rational(10, 3) with { 1 pow 1u; 2 pow 2u }
-                    Rational(-9, 8) with { 1 pow 2u; 2 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
+                    listOf(1u) to Rational(0),
+                    listOf(2u) to Rational(0),
+                    listOf(0u, 1u) to Rational(0),
+                    listOf(1u, 1u) to Rational(0),
+                    listOf(2u, 1u) to Rational(0),
+                    listOf(0u, 2u) to Rational(0),
+                    listOf(1u, 2u) to Rational(0),
+                    listOf(2u, 2u) to Rational(0),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(6, 4),
+                    listOf(1u) to Rational(-2, 6),
+                    listOf(2u) to Rational(10, 6),
+                    listOf(0u, 1u) to Rational(17, 7),
+                    listOf(1u, 1u) to Rational(-7, 7),
+                    listOf(2u, 1u) to Rational(12, 5),
+                    listOf(0u, 2u) to Rational(12, 7),
+                    listOf(1u, 2u) to Rational(-10, 3),
+                    listOf(2u, 2u) to Rational(9, 8),
+                ) + NumberedPolynomial(
+                    listOf<UInt>() to Rational(-6, 4),
+                    listOf(1u) to Rational(2, 6),
+                    listOf(2u) to Rational(-10, 6),
+                    listOf(0u, 1u) to Rational(-17, 7),
+                    listOf(1u, 1u) to Rational(7, 7),
+                    listOf(2u, 1u) to Rational(-12, 5),
+                    listOf(0u, 2u) to Rational(-12, 7),
+                    listOf(1u, 2u) to Rational(10, 3),
+                    listOf(2u, 2u) to Rational(-9, 8),
+                ),
                 "test 4"
             )
         }
@@ -1174,137 +1172,137 @@ class NumberedPolynomialTest {
     fun test_Polynomial_Polynomial_minus() {
         RationalField.numberedPolynomialSpace {
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-17, 2) with {}
-                    Rational(-1, 3) with { 1 pow 1u }
-                    Rational(-25, 21) with { 1 pow 2u }
-                    Rational(146, 63) with { 2 pow 1u }
-                    Rational(-3, 5) with { 1 pow 1u; 2 pow 1u }
-                    Rational(61, 15) with { 1 pow 2u; 2 pow 1u }
-                    Rational(157, 63) with { 2 pow 2u }
-                    Rational(-55, 21) with { 1 pow 1u; 2 pow 2u }
-                    Rational(11, 24) with { 1 pow 2u; 2 pow 2u }
-                },
-                NumberedPolynomial {
-                    Rational(6, 4) with {}
-                    Rational(-2, 6) with { 1 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u }
-                    Rational(17, 7) with { 2 pow 1u }
-                    Rational(-7, 7) with { 1 pow 1u; 2 pow 1u }
-                    Rational(12, 5) with { 1 pow 2u; 2 pow 1u }
-                    Rational(12, 7) with { 2 pow 2u }
-                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
-                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
-                } - NumberedPolynomial {
-                    Rational(20, 2) with {}
-                    Rational(0, 9) with { 1 pow 1u }
-                    Rational(20, 7) with { 1 pow 2u }
-                    Rational(1, 9) with { 2 pow 1u }
-                    Rational(-2, 5) with { 1 pow 1u; 2 pow 1u }
-                    Rational(-10, 6) with { 1 pow 2u; 2 pow 1u }
-                    Rational(-7, 9) with { 2 pow 2u }
-                    Rational(-5, 7) with { 1 pow 1u; 2 pow 2u }
-                    Rational(2, 3) with { 1 pow 2u; 2 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-17, 2),
+                    listOf(1u) to Rational(-1, 3),
+                    listOf(2u) to Rational(-25, 21),
+                    listOf(0u, 1u) to Rational(146, 63),
+                    listOf(1u, 1u) to Rational(-3, 5),
+                    listOf(2u, 1u) to Rational(61, 15),
+                    listOf(0u, 2u) to Rational(157, 63),
+                    listOf(1u, 2u) to Rational(-55, 21),
+                    listOf(2u, 2u) to Rational(11, 24),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(6, 4),
+                    listOf(1u) to Rational(-2, 6),
+                    listOf(2u) to Rational(10, 6),
+                    listOf(0u, 1u) to Rational(17, 7),
+                    listOf(1u, 1u) to Rational(-7, 7),
+                    listOf(2u, 1u) to Rational(12, 5),
+                    listOf(0u, 2u) to Rational(12, 7),
+                    listOf(1u, 2u) to Rational(-10, 3),
+                    listOf(2u, 2u) to Rational(9, 8),
+                ) - NumberedPolynomial(
+                    listOf<UInt>() to Rational(20, 2),
+                    listOf(1u) to Rational(0, 9),
+                    listOf(2u) to Rational(20, 7),
+                    listOf(0u, 1u) to Rational(1, 9),
+                    listOf(1u, 1u) to Rational(-2, 5),
+                    listOf(2u, 1u) to Rational(-10, 6),
+                    listOf(0u, 2u) to Rational(-7, 9),
+                    listOf(1u, 2u) to Rational(-5, 7),
+                    listOf(2u, 2u) to Rational(2, 3),
+                ),
                 "test 1"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-17, 2) with {}
-                    Rational(-1, 3) with { 1 pow 1u }
-                    Rational(-25, 21) with { 1 pow 2u }
-                    Rational(-1, 9) with { 2 pow 1u }
-                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
-                    Rational(157, 63) with { 2 pow 2u }
-                    Rational(-55, 21) with { 1 pow 1u; 2 pow 2u }
-                    Rational(11, 24) with { 1 pow 2u; 2 pow 2u }
-                },
-                NumberedPolynomial {
-                    Rational(6, 4) with {}
-                    Rational(-2, 6) with { 1 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u }
-                    Rational(12, 7) with { 2 pow 2u }
-                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
-                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
-                } - NumberedPolynomial {
-                    Rational(20, 2) with {}
-                    Rational(0, 9) with { 1 pow 1u }
-                    Rational(20, 7) with { 1 pow 2u }
-                    Rational(1, 9) with { 2 pow 1u }
-                    Rational(-2, 5) with { 1 pow 1u; 2 pow 1u }
-                    Rational(-10, 6) with { 1 pow 2u; 2 pow 1u }
-                    Rational(-7, 9) with { 2 pow 2u }
-                    Rational(-5, 7) with { 1 pow 1u; 2 pow 2u }
-                    Rational(2, 3) with { 1 pow 2u; 2 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-17, 2),
+                    listOf(1u) to Rational(-1, 3),
+                    listOf(2u) to Rational(-25, 21),
+                    listOf(0u, 1u) to Rational(-1, 9),
+                    listOf(1u, 1u) to Rational(2, 5),
+                    listOf(2u, 1u) to Rational(10, 6),
+                    listOf(0u, 2u) to Rational(157, 63),
+                    listOf(1u, 2u) to Rational(-55, 21),
+                    listOf(2u, 2u) to Rational(11, 24),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(6, 4),
+                    listOf(1u) to Rational(-2, 6),
+                    listOf(2u) to Rational(10, 6),
+                    listOf(0u, 2u) to Rational(12, 7),
+                    listOf(1u, 2u) to Rational(-10, 3),
+                    listOf(2u, 2u) to Rational(9, 8),
+                ) - NumberedPolynomial(
+                    listOf<UInt>() to Rational(20, 2),
+                    listOf(1u) to Rational(0, 9),
+                    listOf(2u) to Rational(20, 7),
+                    listOf(0u, 1u) to Rational(1, 9),
+                    listOf(1u, 1u) to Rational(-2, 5),
+                    listOf(2u, 1u) to Rational(-10, 6),
+                    listOf(0u, 2u) to Rational(-7, 9),
+                    listOf(1u, 2u) to Rational(-5, 7),
+                    listOf(2u, 2u) to Rational(2, 3),
+                ),
                 "test 2"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(-17, 2) with {}
-                    Rational(-1, 3) with { 1 pow 1u }
-                    Rational(-25, 21) with { 1 pow 2u }
-                    Rational(-1, 9) with { 2 pow 1u }
-                    Rational(2, 5) with { 1 pow 1u; 2 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u; 2 pow 1u }
-                    Rational(12, 7) with { 2 pow 2u }
-                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
-                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
-                },
-                NumberedPolynomial {
-                    Rational(6, 4) with {}
-                    Rational(-2, 6) with { 1 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u }
-                    Rational(12, 7) with { 2 pow 2u }
-                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
-                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
-                } - NumberedPolynomial {
-                    Rational(20, 2) with {}
-                    Rational(0, 9) with { 1 pow 1u }
-                    Rational(20, 7) with { 1 pow 2u }
-                    Rational(1, 9) with { 2 pow 1u }
-                    Rational(-2, 5) with { 1 pow 1u; 2 pow 1u }
-                    Rational(-10, 6) with { 1 pow 2u; 2 pow 1u }
-                    Rational(0) with { 2 pow 2u }
-                    Rational(0) with { 1 pow 1u; 2 pow 2u }
-                    Rational(0) with { 1 pow 2u; 2 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(-17, 2),
+                    listOf(1u) to Rational(-1, 3),
+                    listOf(2u) to Rational(-25, 21),
+                    listOf(0u, 1u) to Rational(-1, 9),
+                    listOf(1u, 1u) to Rational(2, 5),
+                    listOf(2u, 1u) to Rational(10, 6),
+                    listOf(0u, 2u) to Rational(12, 7),
+                    listOf(1u, 2u) to Rational(-10, 3),
+                    listOf(2u, 2u) to Rational(9, 8),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(6, 4),
+                    listOf(1u) to Rational(-2, 6),
+                    listOf(2u) to Rational(10, 6),
+                    listOf(0u, 2u) to Rational(12, 7),
+                    listOf(1u, 2u) to Rational(-10, 3),
+                    listOf(2u, 2u) to Rational(9, 8),
+                ) - NumberedPolynomial(
+                    listOf<UInt>() to Rational(20, 2),
+                    listOf(1u) to Rational(0, 9),
+                    listOf(2u) to Rational(20, 7),
+                    listOf(0u, 1u) to Rational(1, 9),
+                    listOf(1u, 1u) to Rational(-2, 5),
+                    listOf(2u, 1u) to Rational(-10, 6),
+                    listOf(0u, 2u) to Rational(0),
+                    listOf(1u, 2u) to Rational(0),
+                    listOf(2u, 2u) to Rational(0),
+                ),
                 "test 3"
             )
             assertEquals(
-                NumberedPolynomial {
-                    Rational(0) with {}
-                    Rational(0) with { 1 pow 1u }
-                    Rational(0) with { 1 pow 2u }
-                    Rational(0) with { 2 pow 1u }
-                    Rational(0) with { 1 pow 1u; 2 pow 1u }
-                    Rational(0) with { 1 pow 2u; 2 pow 1u }
-                    Rational(0) with { 2 pow 2u }
-                    Rational(0) with { 1 pow 1u; 2 pow 2u }
-                    Rational(0) with { 1 pow 2u; 2 pow 2u }
-                },
-                NumberedPolynomial {
-                    Rational(6, 4) with {}
-                    Rational(-2, 6) with { 1 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u }
-                    Rational(17, 7) with { 2 pow 1u }
-                    Rational(-7, 7) with { 1 pow 1u; 2 pow 1u }
-                    Rational(12, 5) with { 1 pow 2u; 2 pow 1u }
-                    Rational(12, 7) with { 2 pow 2u }
-                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
-                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
-                } - NumberedPolynomial {
-                    Rational(6, 4) with {}
-                    Rational(-2, 6) with { 1 pow 1u }
-                    Rational(10, 6) with { 1 pow 2u }
-                    Rational(17, 7) with { 2 pow 1u }
-                    Rational(-7, 7) with { 1 pow 1u; 2 pow 1u }
-                    Rational(12, 5) with { 1 pow 2u; 2 pow 1u }
-                    Rational(12, 7) with { 2 pow 2u }
-                    Rational(-10, 3) with { 1 pow 1u; 2 pow 2u }
-                    Rational(9, 8) with { 1 pow 2u; 2 pow 2u }
-                },
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
+                    listOf(1u) to Rational(0),
+                    listOf(2u) to Rational(0),
+                    listOf(0u, 1u) to Rational(0),
+                    listOf(1u, 1u) to Rational(0),
+                    listOf(2u, 1u) to Rational(0),
+                    listOf(0u, 2u) to Rational(0),
+                    listOf(1u, 2u) to Rational(0),
+                    listOf(2u, 2u) to Rational(0),
+                ),
+                NumberedPolynomial(
+                    listOf<UInt>() to Rational(6, 4),
+                    listOf(1u) to Rational(-2, 6),
+                    listOf(2u) to Rational(10, 6),
+                    listOf(0u, 1u) to Rational(17, 7),
+                    listOf(1u, 1u) to Rational(-7, 7),
+                    listOf(2u, 1u) to Rational(12, 5),
+                    listOf(0u, 2u) to Rational(12, 7),
+                    listOf(1u, 2u) to Rational(-10, 3),
+                    listOf(2u, 2u) to Rational(9, 8),
+                ) - NumberedPolynomial(
+                    listOf<UInt>() to Rational(6, 4),
+                    listOf(1u) to Rational(-2, 6),
+                    listOf(2u) to Rational(10, 6),
+                    listOf(0u, 1u) to Rational(17, 7),
+                    listOf(1u, 1u) to Rational(-7, 7),
+                    listOf(2u, 1u) to Rational(12, 5),
+                    listOf(0u, 2u) to Rational(12, 7),
+                    listOf(1u, 2u) to Rational(-10, 3),
+                    listOf(2u, 2u) to Rational(9, 8),
+                ),
                 "test 4"
             )
         }
@@ -1314,255 +1312,250 @@ class NumberedPolynomialTest {
         IntModuloRing(35).numberedPolynomialSpace {
             // (p + q + r) * (p^2 + q^2 + r^2 - pq - pr - qr) = p^3 + q^3 + r^3 - 3pqr
             assertEquals(
-                NumberedPolynomial {
-                    m(1) with { 1 pow 3u }
-                    m(1) with { 2 pow 3u }
-                    m(1) with { 3 pow 3u }
-                    m(0) with { 1 pow 1u; 2 pow 2u }
-                    m(0) with { 2 pow 1u; 3 pow 2u }
-                    m(0) with { 3 pow 1u; 1 pow 2u }
-                    m(0) with { 1 pow 1u; 3 pow 2u }
-                    m(0) with { 2 pow 1u; 1 pow 2u }
-                    m(0) with { 3 pow 1u; 2 pow 2u }
-                    m(-3) with { 1 pow 1u; 2 pow 1u; 3 pow 1u }
-                },
-                NumberedPolynomial {
-                    m(1) with { 1 pow 1u }
-                    m(1) with { 2 pow 1u }
-                    m(1) with { 3 pow 1u }
-                } * NumberedPolynomial {
-                    m(1) with { 1 pow 2u }
-                    m(1) with { 2 pow 2u }
-                    m(1) with { 3 pow 2u }
-                    m(-1) with { 1 pow 1u; 2 pow 1u }
-                    m(-1) with { 2 pow 1u; 3 pow 1u }
-                    m(-1) with { 3 pow 1u; 1 pow 1u }
-                },
+                NumberedPolynomial(
+                    listOf(3u) to m(1),
+                    listOf(0u, 3u) to m(1),
+                    listOf(0u, 0u, 3u) to m(1),
+                    listOf(1u, 2u) to m(0),
+                    listOf(0u, 1u, 2u) to m(0),
+                    listOf(2u, 0u, 1u) to m(0),
+                    listOf(1u, 0u, 2u) to m(0),
+                    listOf(2u, 1u) to m(0),
+                    listOf(0u, 2u, 1u) to m(0),
+                    listOf(1u, 1u, 1u) to m(-3),
+                ),
+                NumberedPolynomial(
+                    listOf(1u) to m(1),
+                    listOf(0u, 1u) to m(1),
+                    listOf(0u, 0u, 1u) to m(1),
+                ) * NumberedPolynomial(
+                    listOf(2u) to m(1),
+                    listOf(0u, 2u) to m(1),
+                    listOf(0u, 0u, 2u) to m(1),
+                    listOf(1u, 1u) to m(-1),
+                    listOf(0u, 1u, 1u) to m(-1),
+                    listOf(1u, 0u, 1u) to m(-1),
+                ),
                 "test 1"
             )
             // Spoiler: 5 * 7 = 0
             assertEquals(
-                NumberedPolynomial {
-                    m(0) with { 1 pow 2u }
-                    m(0) with { 2 pow 2u }
-                    m(0) with { 3 pow 2u }
-                    m(0) with { 1 pow 1u; 2 pow 1u }
-                    m(0) with { 2 pow 1u; 3 pow 1u }
-                    m(0) with { 3 pow 1u; 1 pow 1u }
-                },
-                NumberedPolynomial {
-                    m(5) with { 1 pow 1u }
-                    m(-25) with { 2 pow 1u }
-                    m(10) with { 3 pow 1u }
-                } * NumberedPolynomial {
-                    m(21) with { 1 pow 1u }
-                    m(14) with { 2 pow 1u }
-                    m(-7) with { 3 pow 1u }
-                },
+                NumberedPolynomial(
+                    listOf(2u) to m(0),
+                    listOf(0u, 2u) to m(0),
+                    listOf(0u, 0u, 2u) to m(0),
+                    listOf(1u, 1u) to m(0),
+                    listOf(0u, 1u, 1u) to m(0),
+                    listOf(1u, 0u, 1u) to m(0),
+                ),
+                NumberedPolynomial(
+                    listOf(1u) to m(5),
+                    listOf(0u, 1u) to m(-25),
+                    listOf(0u, 0u, 1u) to m(10),
+                ) * NumberedPolynomial(
+                    listOf(1u) to m(21),
+                    listOf(0u, 1u) to m(14),
+                    listOf(0u, 0u, 1u) to m(-7),
+                ),
                 "test 2"
             )
         }
     }
     @Test
     fun test_lastVariable() {
-        val o = Rational(0)
         RationalField.numberedPolynomialSpace {
             assertEquals(
                 -1,
-                NumberedPolynomial {}.lastVariable,
+                NumberedPolynomial().lastVariable,
                 "test 1"
             )
             assertEquals(
                 -1,
-                NumberedPolynomial {
-                    o {}
-                }.lastVariable,
+                NumberedPolynomial(
+                    listOf<UInt>() to o
+                ).lastVariable,
                 "test 2"
             )
             assertEquals(
                 2,
-                NumberedPolynomial {
-                    o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
-                }.lastVariable,
+                NumberedPolynomial(
+                    listOf(1u, 2u, 3u) to o
+                ).lastVariable,
                 "test 3"
             )
             assertEquals(
                 3,
-                NumberedPolynomial {
-                    o { 1 pow 0u; 2 pow 1u; 3 pow 2u; 4 pow 1u; 5 pow 0u }
-                }.also { println(it) }.lastVariable,
+                NumberedPolynomial(
+                    listOf(0u, 1u, 2u, 1u, 0u) to o
+                ).also { println(it) }.lastVariable,
                 "test 4"
             )
             assertEquals(
                 2,
-                NumberedPolynomial {
-                    o {}
-                    o { 2 pow 1u }
-                    o { 1 pow 2u; 3 pow 1u }
-                }.lastVariable,
+                NumberedPolynomial(
+                    listOf<UInt>() to o,
+                    listOf(0u, 1u) to o,
+                    listOf(2u, 0u, 1u) to o,
+                ).lastVariable,
                 "test 5"
             )
         }
     }
     @Test
     fun test_degree() {
-        val o = Rational(0)
         RationalField.numberedPolynomialSpace {
             assertEquals(
                 -1,
-                NumberedPolynomial {}.degree,
+                NumberedPolynomial().degree,
                 "test 1"
             )
             assertEquals(
                 0,
-                NumberedPolynomial {
-                    o {}
-                }.degree,
+                NumberedPolynomial(
+                    listOf<UInt>() to o
+                ).degree,
                 "test 2"
             )
             assertEquals(
                 6,
-                NumberedPolynomial {
-                    o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
-                }.degree,
+                NumberedPolynomial(
+                    listOf(1u, 2u, 3u) to o
+                ).degree,
                 "test 3"
             )
             assertEquals(
                 4,
-                NumberedPolynomial {
-                    o { 1 pow 0u; 2 pow 1u; 3 pow 2u; 4 pow 1u; 5 pow 0u }
-                }.degree,
+                NumberedPolynomial(
+                    listOf(0u, 1u, 2u, 1u, 0u) to o
+                ).degree,
                 "test 4"
             )
             assertEquals(
                 3,
-                NumberedPolynomial {
-                    o {}
-                    o { 2 pow 1u }
-                    o { 1 pow 2u; 3 pow 1u }
-                }.degree,
+                NumberedPolynomial(
+                    listOf<UInt>() to o,
+                    listOf(0u, 1u) to o,
+                    listOf(2u, 0u, 1u) to o,
+                ).degree,
                 "test 5"
             )
             assertEquals(
                 4,
-                NumberedPolynomial {
-                    o {}
-                    o { 2 pow 1u }
-                    o { 1 pow 2u; 3 pow 1u }
-                    o { 4 pow 4u }
-                }.degree,
+                NumberedPolynomial(
+                    listOf<UInt>() to o,
+                    listOf(0u, 1u) to o,
+                    listOf(2u, 0u, 1u) to o,
+                    listOf(0u, 0u, 0u, 4u) to o,
+                ).degree,
                 "test 6"
             )
         }
     }
     @Test
     fun test_degrees() {
-        val o = Rational(0)
         RationalField.numberedPolynomialSpace {
             assertEquals(
                 listOf(),
-                NumberedPolynomial {}.degrees,
+                NumberedPolynomial().degrees,
                 "test 1"
             )
             assertEquals(
                 listOf(),
-                NumberedPolynomial {
-                    o {}
-                }.degrees,
+                NumberedPolynomial(
+                    listOf<UInt>() to o
+                ).degrees,
                 "test 2"
             )
             assertEquals(
                 listOf(1u, 2u, 3u),
-                NumberedPolynomial {
-                    o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
-                }.degrees,
+                NumberedPolynomial(
+                    listOf(1u, 2u, 3u) to o
+                ).degrees,
                 "test 3"
             )
             assertEquals(
                 listOf(0u, 1u, 2u, 1u),
-                NumberedPolynomial {
-                    o { 1 pow 0u; 2 pow 1u; 3 pow 2u; 4 pow 1u; 5 pow 0u }
-                }.degrees,
+                NumberedPolynomial(
+                    listOf(0u, 1u, 2u, 1u, 0u) to o
+                ).degrees,
                 "test 4"
             )
             assertEquals(
                 listOf(2u, 1u, 1u),
-                NumberedPolynomial {
-                    o {}
-                    o { 2 pow 1u }
-                    o { 1 pow 2u; 3 pow 1u }
-                }.degrees,
+                NumberedPolynomial(
+                    listOf<UInt>() to o,
+                    listOf(0u, 1u) to o,
+                    listOf(2u, 0u, 1u) to o,
+                ).degrees,
                 "test 5"
             )
             assertEquals(
                 listOf(2u, 2u, 2u, 4u),
-                NumberedPolynomial {
-                    o {}
-                    o { 1 pow 1u; 2 pow 2u }
-                    o { 2 pow 1u; 3 pow 2u }
-                    o { 1 pow 2u; 3 pow 1u }
-                    o { 4 pow 4u }
-                }.degrees,
+                NumberedPolynomial(
+                    listOf<UInt>() to o,
+                    listOf(1u, 2u) to o,
+                    listOf(0u, 1u, 2u) to o,
+                    listOf(2u, 0u, 1u) to o,
+                    listOf(0u, 0u, 0u, 4u) to o,
+                ).degrees,
                 "test 6"
             )
         }
     }
     @Test
     fun test_degreeBy() {
-        val o = Rational(0)
         RationalField.numberedPolynomialSpace {
             fun NumberedPolynomial<Rational>.collectDegrees(limit: Int = lastVariable + 2): List<UInt> = List(limit) { degreeBy(it) }
             assertEquals(
                 listOf(0u),
-                NumberedPolynomial {}.collectDegrees(),
+                NumberedPolynomial().collectDegrees(),
                 "test 1"
             )
             assertEquals(
                 listOf(0u),
-                NumberedPolynomial {
-                    o {}
-                }.collectDegrees(),
+                NumberedPolynomial(
+                    listOf<UInt>() to o
+                ).collectDegrees(),
                 "test 2"
             )
             assertEquals(
                 listOf(1u, 2u, 3u, 0u),
-                NumberedPolynomial {
-                    o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
-                }.collectDegrees(),
+                NumberedPolynomial(
+                    listOf(1u, 2u, 3u) to o
+                ).collectDegrees(),
                 "test 3"
             )
             assertEquals(
                 listOf(0u, 1u, 2u, 1u, 0u),
-                NumberedPolynomial {
-                    o { 1 pow 0u; 2 pow 1u; 3 pow 2u; 4 pow 1u; 5 pow 0u }
-                }.collectDegrees(),
+                NumberedPolynomial(
+                    listOf(0u, 1u, 2u, 1u, 0u) to o
+                ).collectDegrees(),
                 "test 4"
             )
             assertEquals(
                 listOf(2u, 1u, 1u, 0u),
-                NumberedPolynomial {
-                    o {}
-                    o { 2 pow 1u }
-                    o { 1 pow 2u; 3 pow 1u }
-                }.collectDegrees(),
+                NumberedPolynomial(
+                    listOf<UInt>() to o,
+                    listOf(0u, 1u) to o,
+                    listOf(2u, 0u, 1u) to o,
+                ).collectDegrees(),
                 "test 5"
             )
             assertEquals(
                 listOf(2u, 2u, 2u, 4u, 0u),
-                NumberedPolynomial {
-                    o {}
-                    o { 1 pow 1u; 2 pow 2u }
-                    o { 2 pow 1u; 3 pow 2u }
-                    o { 1 pow 2u; 3 pow 1u }
-                    o { 4 pow 4u }
-                }.collectDegrees(),
+                NumberedPolynomial(
+                    listOf<UInt>() to o,
+                    listOf(1u, 2u) to o,
+                    listOf(0u, 1u, 2u) to o,
+                    listOf(2u, 0u, 1u) to o,
+                    listOf(0u, 0u, 0u, 4u) to o,
+                ).collectDegrees(),
                 "test 6"
             )
         }
     }
     @Test
     fun test_degreeBy_Collection() {
-        val o = Rational(0)
         RationalField.numberedPolynomialSpace {
             fun NumberedPolynomial<Rational>.checkDegreeBy(message: String? = null) {
                 val lastVariable = lastVariable
@@ -1587,153 +1580,151 @@ class NumberedPolynomialTest {
                         fail("${message ?: ""} Incorrect answer for variable collection $indexCollection: expected $expected, actual $actual")
                 }
             }
-            NumberedPolynomial {}.checkDegreeBy("test 1")
-            NumberedPolynomial {
-                o {}
-            }.checkDegreeBy("test 2")
-            NumberedPolynomial {
-                o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
-            }.checkDegreeBy("test 3")
-            NumberedPolynomial {
-                o { 1 pow 0u; 2 pow 1u; 3 pow 2u; 4 pow 1u; 5 pow 0u }
-            }.checkDegreeBy("test 4")
-            NumberedPolynomial {
-                o {}
-                o { 2 pow 1u }
-                o { 1 pow 2u; 3 pow 1u }
-            }.checkDegreeBy("test 5")
-            NumberedPolynomial {
-                o {}
-                o { 1 pow 1u; 2 pow 2u }
-                o { 2 pow 1u; 3 pow 2u }
-                o { 1 pow 2u; 3 pow 1u }
-                o { 4 pow 4u }
-            }.checkDegreeBy("test 6")
+            NumberedPolynomial().checkDegreeBy("test 1")
+            NumberedPolynomial(
+                listOf<UInt>() to o
+            ).checkDegreeBy("test 2")
+            NumberedPolynomial(
+                listOf(1u, 2u, 3u) to o
+            ).checkDegreeBy("test 3")
+            NumberedPolynomial(
+                listOf(0u, 1u, 2u, 1u, 0u) to o
+            ).checkDegreeBy("test 4")
+            NumberedPolynomial(
+                listOf<UInt>() to o,
+                listOf(0u, 1u) to o,
+                listOf(2u, 0u, 1u) to o,
+            ).checkDegreeBy("test 5")
+            NumberedPolynomial(
+                listOf<UInt>() to o,
+                listOf(1u, 2u) to o,
+                listOf(0u, 1u, 2u) to o,
+                listOf(2u, 0u, 1u) to o,
+                listOf(0u, 0u, 0u, 4u) to o,
+            ).checkDegreeBy("test 6")
         }
     }
     @Test
     fun test_countOfVariables() {
-        val o = Rational(0)
         RationalField.numberedPolynomialSpace {
             assertEquals(
                 0,
-                NumberedPolynomial {}.countOfVariables,
+                NumberedPolynomial().countOfVariables,
                 "test 1"
             )
             assertEquals(
                 0,
-                NumberedPolynomial {
-                    o {}
-                }.countOfVariables,
+                NumberedPolynomial(
+                    listOf<UInt>() to o
+                ).countOfVariables,
                 "test 2"
             )
             assertEquals(
                 3,
-                NumberedPolynomial {
-                    o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
-                }.countOfVariables,
+                NumberedPolynomial(
+                    listOf(1u, 2u, 3u) to o
+                ).countOfVariables,
                 "test 3"
             )
             assertEquals(
                 3,
-                NumberedPolynomial {
-                    o { 1 pow 0u; 2 pow 1u; 3 pow 2u; 4 pow 1u; 5 pow 0u }
-                }.countOfVariables,
+                NumberedPolynomial(
+                    listOf(0u, 1u, 2u, 1u, 0u) to o
+                ).countOfVariables,
                 "test 4"
             )
             assertEquals(
                 3,
-                NumberedPolynomial {
-                    o {}
-                    o { 2 pow 1u }
-                    o { 1 pow 2u; 3 pow 1u }
-                }.countOfVariables,
+                NumberedPolynomial(
+                    listOf<UInt>() to o,
+                    listOf(0u, 1u) to o,
+                    listOf(2u, 0u, 1u) to o,
+                ).countOfVariables,
                 "test 5"
             )
             assertEquals(
                 4,
-                NumberedPolynomial {
-                    o {}
-                    o { 1 pow 1u; 2 pow 2u }
-                    o { 2 pow 1u; 3 pow 2u }
-                    o { 1 pow 2u; 3 pow 1u }
-                    o { 4 pow 4u }
-                }.countOfVariables,
+                NumberedPolynomial(
+                    listOf<UInt>() to o,
+                    listOf(1u, 2u) to o,
+                    listOf(0u, 1u, 2u) to o,
+                    listOf(2u, 0u, 1u) to o,
+                    listOf(0u, 0u, 0u, 4u) to o,
+                ).countOfVariables,
                 "test 6"
             )
         }
     }
     @Test
     fun test_RF_countOfVariables() {
-        val o = Rational(0)
         RationalField.numberedRationalFunctionSpace {
             assertEquals(
                 0,
                 NumberedRationalFunction(
-                    NumberedPolynomial {}
+                    NumberedPolynomial()
                 ).countOfVariables,
                 "test 1"
             )
             assertEquals(
                 0,
                 NumberedRationalFunction(
-                    NumberedPolynomial {},
-                    NumberedPolynomial {}
+                    NumberedPolynomial(),
+                    NumberedPolynomial()
                 ).countOfVariables,
                 "test 2"
             )
             assertEquals(
                 0,
                 NumberedRationalFunction(
-                    NumberedPolynomial {
-                        o {}
-                    }
+                    NumberedPolynomial(
+                        listOf<UInt>() to o
+                    )
                 ).countOfVariables,
                 "test 3"
             )
             assertEquals(
                 3,
                 NumberedRationalFunction(
-                    NumberedPolynomial {
-                        o { 1 pow 1u; 2 pow 2u; 3 pow 3u }
-                    }
+                    NumberedPolynomial(
+                        listOf(1u, 2u, 3u) to o
+                    )
                 ).countOfVariables,
                 "test 4"
             )
             assertEquals(
                 3,
                 NumberedRationalFunction(
-                    NumberedPolynomial {
-                        o { 2 pow 1u; 4 pow 1u }
-                    },
-                    NumberedPolynomial {
-                        o { 1 pow 0u; 3 pow 2u; 5 pow 0u }
-                    }
+                    NumberedPolynomial(
+                        listOf(0u, 1u, 0u, 1u) to o
+                    ),
+                    NumberedPolynomial(
+                        listOf(0u, 0u, 2u) to o
+                    )
                 ).countOfVariables,
                 "test 5"
             )
             assertEquals(
                 3,
                 NumberedRationalFunction(
-                    NumberedPolynomial {
-                        o {}
-                        o { 2 pow 1u }
-                        o { 1 pow 2u; 3 pow 1u }
-                    }
+                    NumberedPolynomial(
+                        listOf<UInt>() to o,
+                        listOf(0u, 1u) to o,
+                        listOf(2u, 0u, 1u) to o,
+                    )
                 ).countOfVariables,
                 "test 6"
             )
             assertEquals(
                 4,
                 NumberedRationalFunction(
-                    NumberedPolynomial {
-                        o {}
-                        o { 1 pow 1u; 2 pow 2u }
-                        o { 1 pow 2u; 3 pow 1u }
-                    }, NumberedPolynomial {
-                        o { 2 pow 1u; 3 pow 2u }
-                        o { 4 pow 4u }
-                    }
+                    NumberedPolynomial(
+                        listOf<UInt>() to o,
+                        listOf(1u, 2u) to o,
+                        listOf(2u, 0u, 1u) to o,
+                    ), NumberedPolynomial(
+                        listOf(0u, 1u, 2u) to o,
+                        listOf(0u, 0u, 0u, 4u) to o,
+                    )
                 ).countOfVariables,
                 "test 7"
             )
-- 
2.34.1


From 923c52737d4f5ca4e1153757b7079ebc2e19718b Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 6 Jul 2022 17:13:50 +0300
Subject: [PATCH 557/713] Adapt NumberedPolynomial tests to LabeledPolynomial
 tests.

---
 .../kmath/functions/LabeledPolynomial.kt      |   42 +-
 .../kmath/functions/labeledConstructors.kt    |    1 +
 .../functions/LabeledConstructorsTest.kt      |  129 +
 .../kmath/functions/LabeledPolynomialTest.kt  | 1872 ++++
 .../functions/LabeledPolynomialUtilTest.kt    | 8224 +++++++++++++++++
 .../kmath/functions/NumberedPolynomialTest.kt |   18 +-
 .../kscience/kmath/test/misc/assertion.kt     |   34 +
 7 files changed, 10296 insertions(+), 24 deletions(-)
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 6d9af631a..1477796ea 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -177,14 +177,17 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * The operation is equivalent to sum of [other] copies of [this].
      */
     public override operator fun LabeledPolynomial<C>.times(other: Int): LabeledPolynomial<C> =
-        if (other == 0) zero
-        else LabeledPolynomial(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
-        )
+        when(other) {
+            0 -> zero
+            1 -> this
+            else -> LabeledPolynomial(
+                coefficients
+                    .toMutableMap()
+                    .apply {
+                        for (degs in keys) this[degs] = this[degs]!! * other
+                    }
+            )
+        }
 
     /**
      * Returns sum of the integer represented as a polynomial and the polynomial.
@@ -210,7 +213,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public override operator fun Int.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this == 0) other
+        if (this == 0) -other
         else with(other.coefficients) {
             if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this@minus.asConstant()))
             else LabeledPolynomialAsIs(
@@ -230,14 +233,17 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * The operation is equivalent to sum of [this] copies of [other].
      */
     public override operator fun Int.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this == 0) zero
-        else LabeledPolynomial(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
-        )
+        when(this) {
+            0 -> zero
+            1 -> other
+            else -> LabeledPolynomial(
+                other.coefficients
+                    .toMutableMap()
+                    .apply {
+                        for (degs in keys) this[degs] = this@times * this[degs]!!
+                    }
+            )
+        }
 
     /**
      * Converts the integer [value] to polynomial.
@@ -360,8 +366,6 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             else LabeledPolynomialAsIs(
                 toMutableMap()
                     .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
                         val degs = emptyMap<Symbol, UInt>()
 
                         this[degs] = getOrElse(degs) { constantZero } - other
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
index 8442d3f91..819a36449 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
@@ -302,6 +302,7 @@ public class DSL1LabeledPolynomialTermSignatureBuilder {
      * Declaring another power of the same variable will increase its degree by received degree.
      */
     public infix fun Symbol.inPowerOf(deg: UInt) {
+        if (deg == 0u) return
         signature[this] = signature.getOrElse(this) { 0u } + deg
     }
     /**
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
new file mode 100644
index 000000000..edeaef6a7
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.symbol
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.invoke
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class LabeledConstructorsTest {
+    val x by symbol
+    val y by symbol
+    val z by symbol
+    val t by symbol
+    
+    @Test
+    @UnstableKMathAPI
+    fun testDSL1() {
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 2u, z to 3u) to 5,
+                mapOf(y to 1u) to -6,
+            ),
+            Int.algebra.labeledPolynomialSpace {
+                LabeledPolynomialDSL1 {
+                    5 { x pow 2u; z pow 3u }
+                    (-6) { y pow 1u }
+                }
+            },
+            "test 1"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to -1,
+            ),
+            Int.algebra.labeledPolynomialSpace {
+                LabeledPolynomialDSL1 {
+                    5 { }
+                    (-6) { }
+                }
+            },
+            "test 2"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 2u) to -1,
+            ),
+            Int.algebra.labeledPolynomialSpace {
+                LabeledPolynomialDSL1 {
+                    5 { x pow 1u; x pow 1u }
+                    (-6) { x pow 2u }
+                }
+            },
+            "test 3"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 2u) to -1,
+            ),
+            Int.algebra.labeledPolynomialSpace {
+                LabeledPolynomialDSL1 {
+                    5 { x pow 1u; x pow 1u }
+                    (-6) { x pow 2u; z pow 0u }
+                }
+            },
+            "test 3"
+        )
+    }
+    @Test
+    @UnstableKMathAPI
+    fun testFabric() {
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 2u, z to 3u) to 5,
+                mapOf(y to 1u) to -6,
+            ),
+            Int.algebra {
+                LabeledPolynomial(
+                    mapOf(x to 2u, z to 3u) to 5,
+                    mapOf(y to 1u) to -6,
+                )
+            },
+            "test 1"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 2u, z to 3u) to 5,
+                mapOf(y to 1u) to -6,
+            ),
+            Int.algebra {
+                LabeledPolynomial(
+                    mapOf(x to 2u, y to 0u, z to 3u, t to 0u) to 5,
+                    mapOf(x to 0u, y to 1u, z to 0u, t to 0u) to -6,
+                )
+            },
+            "test 2"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to -1,
+            ),
+            Int.algebra {
+                LabeledPolynomial(
+                    mapOf(x to 0u) to 5,
+                    mapOf(y to 0u, z to 0u) to -6,
+                )
+            },
+            "test 3"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 0,
+            ),
+            Int.algebra {
+                LabeledPolynomial(
+                    mapOf(x to 0u) to 5,
+                    mapOf(z to 0u, t to 0u) to -5,
+                )
+            },
+            "test 4"
+        )
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
new file mode 100644
index 000000000..15c4c3656
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
@@ -0,0 +1,1872 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.symbol
+import space.kscience.kmath.test.misc.IntModuloRing
+import space.kscience.kmath.test.misc.Rational
+import space.kscience.kmath.test.misc.RationalField
+import space.kscience.kmath.test.misc.m
+import kotlin.test.*
+
+
+// TODO: Тесты на конвертацию.
+class LabeledPolynomialTest {
+    val x by symbol
+    val y by symbol
+    val z by symbol
+    val t by symbol
+    val s by symbol
+    val iota by symbol
+    
+    val o = Rational(0)
+
+    @Test
+    @Ignore
+    fun test_Variable_Int_plus() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Variable_Int_minus() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Variable_Int_times() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Int_Variable_plus() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Int_Variable_minus() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Int_Variable_times() {
+        // TODO
+    }
+    @Test
+    fun test_Polynomial_Int_plus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(5, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) + -3,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-3, 1),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) + -3,
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 1),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) + -3,
+                "test 3"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ) + -3,
+                "test 4"
+            )
+            val polynomial_5 = LabeledPolynomial(
+                mapOf<Symbol, UInt>() to Rational(-22, 9),
+                mapOf(x to 3u) to Rational(-8, 9),
+                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+            )
+            assertSame(
+                polynomial_5,
+                polynomial_5 + 0,
+                "test 5"
+            )
+            val polynomial_6 = LabeledPolynomial(
+                mapOf<Symbol, UInt>() to Rational(0, 9),
+                mapOf(x to 3u) to Rational(-8, 9),
+                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+            )
+            assertSame(
+                polynomial_6,
+                polynomial_6 + 0,
+                "test 6"
+            )
+            val polynomial_7 = LabeledPolynomial(
+                mapOf(x to 3u) to Rational(-8, 9),
+                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+            )
+            assertSame(
+                polynomial_7,
+                polynomial_7 + 0,
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Int_minus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(5, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) - 3,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-3, 1),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) - 3,
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 1),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) - 3,
+                "test 3"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ) - 3,
+                "test 4"
+            )
+            val polynomial_5 = LabeledPolynomial(
+                mapOf<Symbol, UInt>() to Rational(-22, 9),
+                mapOf(x to 3u) to Rational(-8, 9),
+                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+            )
+            assertSame(
+                polynomial_5,
+                polynomial_5 - 0,
+                "test 5"
+            )
+            val polynomial_6 = LabeledPolynomial(
+                mapOf<Symbol, UInt>() to Rational(0, 9),
+                mapOf(x to 3u) to Rational(-8, 9),
+                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+            )
+            assertSame(
+                polynomial_6,
+                polynomial_6 - 0,
+                "test 6"
+            )
+            val polynomial_7 = LabeledPolynomial(
+                mapOf(x to 3u) to Rational(-8, 9),
+                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+            )
+            assertSame(
+                polynomial_7,
+                polynomial_7 - 0,
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Int_times() {
+        IntModuloRing(35).labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(34),
+                    mapOf(x to 3u) to m(2),
+                    mapOf(x to 0u, y to 1u) to m(1),
+                    mapOf(x to 1u) to m(20),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(2),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(22),
+                    mapOf(x to 3u) to m(26),
+                    mapOf(x to 0u, y to 1u) to m(13),
+                    mapOf(x to 1u) to m(15),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
+                ) * 27,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(0),
+                    mapOf(x to 3u) to m(0),
+                    mapOf(x to 0u, y to 1u) to m(0),
+                    mapOf(x to 1u) to m(0),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(7),
+                    mapOf(x to 3u) to m(0),
+                    mapOf(x to 0u, y to 1u) to m(49),
+                    mapOf(x to 1u) to m(21),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(14),
+                ) * 15,
+                "test 2"
+            )
+            val polynomial = LabeledPolynomial(
+                mapOf<Symbol, UInt>() to m(22),
+                mapOf(x to 3u) to m(26),
+                mapOf(x to 0u, y to 1u) to m(13),
+                mapOf(x to 1u) to m(15),
+                mapOf(x to 0u, y to 0u, z to 2u) to m(26),
+            )
+            assertSame(
+                zero,
+                polynomial * 0,
+                "test 3"
+            )
+            assertSame(
+                polynomial,
+                polynomial * 1,
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_plus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                -3 + LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(5, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-3, 1),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                -3 + LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                -3 + LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 3"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ),
+                -3 + LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ),
+                "test 4"
+            )
+            val polynomial_5 = LabeledPolynomial(
+                mapOf<Symbol, UInt>() to Rational(-22, 9),
+                mapOf(x to 3u) to Rational(-8, 9),
+                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+            )
+            assertSame(
+                polynomial_5,
+                0 + polynomial_5,
+                "test 5"
+            )
+            val polynomial_6 = LabeledPolynomial(
+                mapOf<Symbol, UInt>() to Rational(0, 9),
+                mapOf(x to 3u) to Rational(-8, 9),
+                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+            )
+            assertSame(
+                polynomial_6,
+                0 + polynomial_6,
+                "test 6"
+            )
+            val polynomial_7 = LabeledPolynomial(
+                mapOf(x to 3u) to Rational(-8, 9),
+                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+            )
+            assertSame(
+                polynomial_7,
+                0 + polynomial_7,
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_minus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(22, 9),
+                    mapOf(x to 3u) to Rational(8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
+                ),
+                3 - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(5, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(3, 1),
+                    mapOf(x to 3u) to Rational(8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
+                ),
+                3 - LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 1),
+                    mapOf(x to 3u) to Rational(8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
+                ),
+                3 - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 3"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ),
+                3 - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ),
+                "test 4"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(22, 9),
+                    mapOf(x to 3u) to Rational(8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
+                ),
+                0 - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 5"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 9),
+                    mapOf(x to 3u) to Rational(8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
+                ),
+                0 - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 6"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
+                ),
+                0 - LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_times() {
+        IntModuloRing(35).labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(34),
+                    mapOf(x to 3u) to m(2),
+                    mapOf(x to 0u, y to 1u) to m(1),
+                    mapOf(x to 1u) to m(20),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(2),
+                ),
+                27 * LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(22),
+                    mapOf(x to 3u) to m(26),
+                    mapOf(x to 0u, y to 1u) to m(13),
+                    mapOf(x to 1u) to m(15),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
+                ),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(0),
+                    mapOf(x to 3u) to m(0),
+                    mapOf(x to 0u, y to 1u) to m(0),
+                    mapOf(x to 1u) to m(0),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
+                ),
+                15 * LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(7),
+                    mapOf(x to 3u) to m(0),
+                    mapOf(x to 0u, y to 1u) to m(49),
+                    mapOf(x to 1u) to m(21),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(14),
+                ),
+                "test 2"
+            )
+            val polynomial = LabeledPolynomial(
+                mapOf<Symbol, UInt>() to m(22),
+                mapOf(x to 3u) to m(26),
+                mapOf(x to 0u, y to 1u) to m(13),
+                mapOf(x to 1u) to m(15),
+                mapOf(x to 0u, y to 0u, z to 2u) to m(26),
+            )
+            assertSame(
+                zero,
+                0 * polynomial,
+                "test 3"
+            )
+            assertSame(
+                polynomial,
+                1 * polynomial,
+                "test 4"
+            )
+        }
+    }
+    @Test
+    @Ignore
+    fun test_Variable_Constant_plus() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Variable_Constant_minus() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Variable_Constant_times() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Constant_Variable_plus() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Constant_Variable_minus() {
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Constant_Variable_times() {
+        // TODO
+    }
+    @Test
+    fun test_Polynomial_Constant_plus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(5, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) + Rational(-3),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-3, 1),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) + Rational(-3),
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 1),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) + Rational(-3),
+                "test 3"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ) + Rational(-3),
+                "test 4"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) + Rational(0),
+                "test 5"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) + Rational(0),
+                "test 6"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) + Rational(0),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_minus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(5, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) - Rational(3),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-3, 1),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) - Rational(3),
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 1),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) - Rational(3),
+                "test 3"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ) - Rational(3),
+                "test 4"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) - Rational(0),
+                "test 5"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) - Rational(0),
+                "test 6"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ) - Rational(0),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_times() {
+        IntModuloRing(35).labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(34),
+                    mapOf(x to 3u) to m(2),
+                    mapOf(x to 0u, y to 1u) to m(1),
+                    mapOf(x to 1u) to m(20),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(2),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(22),
+                    mapOf(x to 3u) to m(26),
+                    mapOf(x to 0u, y to 1u) to m(13),
+                    mapOf(x to 1u) to m(15),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
+                ) * m(27),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(0),
+                    mapOf(x to 3u) to m(0),
+                    mapOf(x to 0u, y to 1u) to m(0),
+                    mapOf(x to 1u) to m(0),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(7),
+                    mapOf(x to 3u) to m(0),
+                    mapOf(x to 0u, y to 1u) to m(49),
+                    mapOf(x to 1u) to m(21),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(14),
+                ) * m(15),
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(0),
+                    mapOf(x to 3u) to m(0),
+                    mapOf(x to 0u, y to 1u) to m(0),
+                    mapOf(x to 1u) to m(0),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(22),
+                    mapOf(x to 3u) to m(26),
+                    mapOf(x to 0u, y to 1u) to m(13),
+                    mapOf(x to 1u) to m(15),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
+                ) * m(0),
+                "test 3"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(22),
+                    mapOf(x to 3u) to m(26),
+                    mapOf(x to 0u, y to 1u) to m(13),
+                    mapOf(x to 1u) to m(15),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(22),
+                    mapOf(x to 3u) to m(26),
+                    mapOf(x to 0u, y to 1u) to m(13),
+                    mapOf(x to 1u) to m(15),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
+                ) * m(1),
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_plus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                Rational(-3) + LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(5, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-3, 1),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                Rational(-3) + LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 1),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                Rational(-3) + LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 3"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ),
+                Rational(-3) + LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ),
+                "test 4"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                Rational(0) + LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 5"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                Rational(0) + LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 6"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                Rational(0) + LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_minus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(22, 9),
+                    mapOf(x to 3u) to Rational(8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
+                ),
+                Rational(3) - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(5, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(3, 1),
+                    mapOf(x to 3u) to Rational(8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
+                ),
+                Rational(3) - LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 1),
+                    mapOf(x to 3u) to Rational(8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
+                ),
+                Rational(3) - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 3"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ),
+                Rational(3) - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(27, 9),
+                    mapOf(x to 3u) to Rational(0),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                ),
+                "test 4"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(22, 9),
+                    mapOf(x to 3u) to Rational(8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
+                ),
+                Rational(0) - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-22, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 5"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 9),
+                    mapOf(x to 3u) to Rational(8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
+                ),
+                Rational(0) - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0, 9),
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 6"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 3u) to Rational(8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
+                ),
+                Rational(0) - LabeledPolynomial(
+                    mapOf(x to 3u) to Rational(-8, 9),
+                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
+                ),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_times() {
+        IntModuloRing(35).labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(34),
+                    mapOf(x to 3u) to m(2),
+                    mapOf(x to 0u, y to 1u) to m(1),
+                    mapOf(x to 1u) to m(20),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(2),
+                ),
+                m(27) * LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(22),
+                    mapOf(x to 3u) to m(26),
+                    mapOf(x to 0u, y to 1u) to m(13),
+                    mapOf(x to 1u) to m(15),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
+                ),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(0),
+                    mapOf(x to 3u) to m(0),
+                    mapOf(x to 0u, y to 1u) to m(0),
+                    mapOf(x to 1u) to m(0),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
+                ),
+                m(15) * LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(7),
+                    mapOf(x to 3u) to m(0),
+                    mapOf(x to 0u, y to 1u) to m(49),
+                    mapOf(x to 1u) to m(21),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(14),
+                ),
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(0),
+                    mapOf(x to 3u) to m(0),
+                    mapOf(x to 0u, y to 1u) to m(0),
+                    mapOf(x to 1u) to m(0),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
+                ),
+                m(0) * LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(22),
+                    mapOf(x to 3u) to m(26),
+                    mapOf(x to 0u, y to 1u) to m(13),
+                    mapOf(x to 1u) to m(15),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
+                ),
+                "test 3"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(22),
+                    mapOf(x to 3u) to m(26),
+                    mapOf(x to 0u, y to 1u) to m(13),
+                    mapOf(x to 1u) to m(15),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
+                ),
+                m(1) * LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to m(22),
+                    mapOf(x to 3u) to m(26),
+                    mapOf(x to 0u, y to 1u) to m(13),
+                    mapOf(x to 1u) to m(15),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
+                ),
+                "test 4"
+            )
+        }
+    }
+    @Test
+    @Ignore
+    fun test_Variable_unaryPlus(){
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Variable_unaryMinus(){
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Variable_Variable_plus(){
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Variable_Variable_minus(){
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Variable_Variable_times(){
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Variable_Polynomial_plus(){
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Variable_Polynomial_minus(){
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Variable_Polynomial_times(){
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_Variable_plus(){
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_Variable_minus(){
+        // TODO
+    }
+    @Test
+    @Ignore
+    fun test_Polynomial_Variable_times(){
+        // TODO
+    }
+    @Test
+    fun test_Polynomial_unaryMinus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf(x to 5u) to Rational(-5, 9),
+                    mapOf<Symbol, UInt>() to Rational(8, 9),
+                    mapOf(iota to 13u) to Rational(8, 7),
+                ),
+                -LabeledPolynomial(
+                    mapOf(x to 5u) to Rational(5, 9),
+                    mapOf<Symbol, UInt>() to Rational(-8, 9),
+                    mapOf(iota to 13u) to Rational(-8, 7),
+                ),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf(x to 5u) to Rational(-5, 9),
+                    mapOf<Symbol, UInt>() to Rational(8, 9),
+                    mapOf(iota to 13u) to Rational(8, 7),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                    mapOf(x to 5u) to Rational(0),
+                ),
+                -LabeledPolynomial(
+                    mapOf(x to 5u) to Rational(5, 9),
+                    mapOf<Symbol, UInt>() to Rational(-8, 9),
+                    mapOf(iota to 13u) to Rational(-8, 7),
+                    mapOf(x to 0u, y to 4u) to Rational(0),
+                    mapOf(x to 5u) to Rational(0),
+                ),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_plus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-17, 2),
+                    mapOf(x to 1u) to Rational(-1, 3),
+                    mapOf(x to 2u) to Rational(-25, 21),
+                    mapOf(x to 0u, y to 1u) to Rational(146, 63),
+                    mapOf(x to 1u, y to 1u) to Rational(-3, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(61, 15),
+                    mapOf(x to 0u, y to 2u) to Rational(157, 63),
+                    mapOf(x to 1u, y to 2u) to Rational(-55, 21),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 24),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(6, 4),
+                    mapOf(x to 1u) to Rational(-2, 6),
+                    mapOf(x to 2u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 1u) to Rational(17, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-7, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 5),
+                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
+                ) + LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-20, 2),
+                    mapOf(x to 1u) to Rational(0, 9),
+                    mapOf(x to 2u) to Rational(-20, 7),
+                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(7, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(5, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(-2, 3),
+                ),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-17, 2),
+                    mapOf(x to 1u) to Rational(-1, 3),
+                    mapOf(x to 2u) to Rational(-25, 21),
+                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(157, 63),
+                    mapOf(x to 1u, y to 2u) to Rational(-55, 21),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 24),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(6, 4),
+                    mapOf(x to 1u) to Rational(-2, 6),
+                    mapOf(x to 2u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
+                ) + LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-20, 2),
+                    mapOf(x to 1u) to Rational(0, 9),
+                    mapOf(x to 2u) to Rational(-20, 7),
+                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(7, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(5, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(-2, 3),
+                ),
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-17, 2),
+                    mapOf(x to 1u) to Rational(-1, 3),
+                    mapOf(x to 2u) to Rational(-25, 21),
+                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(6, 4),
+                    mapOf(x to 1u) to Rational(-2, 6),
+                    mapOf(x to 2u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
+                ) + LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-20, 2),
+                    mapOf(x to 1u) to Rational(0, 9),
+                    mapOf(x to 2u) to Rational(-20, 7),
+                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(0),
+                    mapOf(x to 1u, y to 2u) to Rational(0),
+                    mapOf(x to 2u, y to 2u) to Rational(0),
+                ),
+                "test 3"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 1u) to Rational(0),
+                    mapOf(x to 2u) to Rational(0),
+                    mapOf(x to 0u, y to 1u) to Rational(0),
+                    mapOf(x to 1u, y to 1u) to Rational(0),
+                    mapOf(x to 2u, y to 1u) to Rational(0),
+                    mapOf(x to 0u, y to 2u) to Rational(0),
+                    mapOf(x to 1u, y to 2u) to Rational(0),
+                    mapOf(x to 2u, y to 2u) to Rational(0),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(6, 4),
+                    mapOf(x to 1u) to Rational(-2, 6),
+                    mapOf(x to 2u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 1u) to Rational(17, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-7, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 5),
+                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
+                ) + LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-6, 4),
+                    mapOf(x to 1u) to Rational(2, 6),
+                    mapOf(x to 2u) to Rational(-10, 6),
+                    mapOf(x to 0u, y to 1u) to Rational(-17, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(7, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(-12, 5),
+                    mapOf(x to 0u, y to 2u) to Rational(-12, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(10, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(-9, 8),
+                ),
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_minus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-17, 2),
+                    mapOf(x to 1u) to Rational(-1, 3),
+                    mapOf(x to 2u) to Rational(-25, 21),
+                    mapOf(x to 0u, y to 1u) to Rational(146, 63),
+                    mapOf(x to 1u, y to 1u) to Rational(-3, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(61, 15),
+                    mapOf(x to 0u, y to 2u) to Rational(157, 63),
+                    mapOf(x to 1u, y to 2u) to Rational(-55, 21),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 24),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(6, 4),
+                    mapOf(x to 1u) to Rational(-2, 6),
+                    mapOf(x to 2u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 1u) to Rational(17, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-7, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 5),
+                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
+                ) - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(20, 2),
+                    mapOf(x to 1u) to Rational(0, 9),
+                    mapOf(x to 2u) to Rational(20, 7),
+                    mapOf(x to 0u, y to 1u) to Rational(1, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(-2, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(-10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(-7, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(-5, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(2, 3),
+                ),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-17, 2),
+                    mapOf(x to 1u) to Rational(-1, 3),
+                    mapOf(x to 2u) to Rational(-25, 21),
+                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(157, 63),
+                    mapOf(x to 1u, y to 2u) to Rational(-55, 21),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 24),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(6, 4),
+                    mapOf(x to 1u) to Rational(-2, 6),
+                    mapOf(x to 2u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
+                ) - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(20, 2),
+                    mapOf(x to 1u) to Rational(0, 9),
+                    mapOf(x to 2u) to Rational(20, 7),
+                    mapOf(x to 0u, y to 1u) to Rational(1, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(-2, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(-10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(-7, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(-5, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(2, 3),
+                ),
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(-17, 2),
+                    mapOf(x to 1u) to Rational(-1, 3),
+                    mapOf(x to 2u) to Rational(-25, 21),
+                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(6, 4),
+                    mapOf(x to 1u) to Rational(-2, 6),
+                    mapOf(x to 2u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
+                ) - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(20, 2),
+                    mapOf(x to 1u) to Rational(0, 9),
+                    mapOf(x to 2u) to Rational(20, 7),
+                    mapOf(x to 0u, y to 1u) to Rational(1, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(-2, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(-10, 6),
+                    mapOf(x to 0u, y to 2u) to Rational(0),
+                    mapOf(x to 1u, y to 2u) to Rational(0),
+                    mapOf(x to 2u, y to 2u) to Rational(0),
+                ),
+                "test 3"
+            )
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 1u) to Rational(0),
+                    mapOf(x to 2u) to Rational(0),
+                    mapOf(x to 0u, y to 1u) to Rational(0),
+                    mapOf(x to 1u, y to 1u) to Rational(0),
+                    mapOf(x to 2u, y to 1u) to Rational(0),
+                    mapOf(x to 0u, y to 2u) to Rational(0),
+                    mapOf(x to 1u, y to 2u) to Rational(0),
+                    mapOf(x to 2u, y to 2u) to Rational(0),
+                ),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(6, 4),
+                    mapOf(x to 1u) to Rational(-2, 6),
+                    mapOf(x to 2u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 1u) to Rational(17, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-7, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 5),
+                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
+                ) - LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to Rational(6, 4),
+                    mapOf(x to 1u) to Rational(-2, 6),
+                    mapOf(x to 2u) to Rational(10, 6),
+                    mapOf(x to 0u, y to 1u) to Rational(17, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-7, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 5),
+                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
+                ),
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_times() {
+        IntModuloRing(35).labeledPolynomialSpace {
+            // (p + q + r) * (p^2 + q^2 + r^2 - pq - pr - qr) = p^3 + q^3 + r^3 - 3pqr
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf(x to 3u) to m(1),
+                    mapOf(x to 0u, y to 3u) to m(1),
+                    mapOf(x to 0u, y to 0u, z to 3u) to m(1),
+                    mapOf(x to 1u, y to 2u) to m(0),
+                    mapOf(x to 0u, y to 1u, z to 2u) to m(0),
+                    mapOf(x to 2u, y to 0u, z to 1u) to m(0),
+                    mapOf(x to 1u, y to 0u, z to 2u) to m(0),
+                    mapOf(x to 2u, y to 1u) to m(0),
+                    mapOf(x to 0u, y to 2u, z to 1u) to m(0),
+                    mapOf(x to 1u, y to 1u, z to 1u) to m(-3),
+                ),
+                LabeledPolynomial(
+                    mapOf(x to 1u) to m(1),
+                    mapOf(x to 0u, y to 1u) to m(1),
+                    mapOf(x to 0u, y to 0u, z to 1u) to m(1),
+                ) * LabeledPolynomial(
+                    mapOf(x to 2u) to m(1),
+                    mapOf(x to 0u, y to 2u) to m(1),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(1),
+                    mapOf(x to 1u, y to 1u) to m(-1),
+                    mapOf(x to 0u, y to 1u, z to 1u) to m(-1),
+                    mapOf(x to 1u, y to 0u, z to 1u) to m(-1),
+                ),
+                "test 1"
+            )
+            // Spoiler: 5 * 7 = 0
+            assertEquals(
+                LabeledPolynomial(
+                    mapOf(x to 2u) to m(0),
+                    mapOf(x to 0u, y to 2u) to m(0),
+                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
+                    mapOf(x to 1u, y to 1u) to m(0),
+                    mapOf(x to 0u, y to 1u, z to 1u) to m(0),
+                    mapOf(x to 1u, y to 0u, z to 1u) to m(0),
+                ),
+                LabeledPolynomial(
+                    mapOf(x to 1u) to m(5),
+                    mapOf(x to 0u, y to 1u) to m(-25),
+                    mapOf(x to 0u, y to 0u, z to 1u) to m(10),
+                ) * LabeledPolynomial(
+                    mapOf(x to 1u) to m(21),
+                    mapOf(x to 0u, y to 1u) to m(14),
+                    mapOf(x to 0u, y to 0u, z to 1u) to m(-7),
+                ),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_degree() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                -1,
+                LabeledPolynomial().degree,
+                "test 1"
+            )
+            assertEquals(
+                0,
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o
+                ).degree,
+                "test 2"
+            )
+            assertEquals(
+                6,
+                LabeledPolynomial(
+                    mapOf(x to 1u, y to 2u, z to 3u) to o
+                ).degree,
+                "test 3"
+            )
+            assertEquals(
+                4,
+                LabeledPolynomial(
+                    mapOf(x to 0u, y to 1u, z to 2u, t to 1u, s to 0u) to o
+                ).degree,
+                "test 4"
+            )
+            assertEquals(
+                3,
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o,
+                    mapOf(x to 0u, y to 1u) to o,
+                    mapOf(x to 2u, y to 0u, z to 1u) to o,
+                ).degree,
+                "test 5"
+            )
+            assertEquals(
+                4,
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o,
+                    mapOf(x to 0u, y to 1u) to o,
+                    mapOf(x to 2u, y to 0u, z to 1u) to o,
+                    mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
+                ).degree,
+                "test 6"
+            )
+        }
+    }
+    @Test
+    fun test_degrees() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                mapOf(),
+                LabeledPolynomial().degrees,
+                "test 1"
+            )
+            assertEquals(
+                mapOf(),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o
+                ).degrees,
+                "test 2"
+            )
+            assertEquals(
+                mapOf(x to 1u, y to 2u, z to 3u),
+                LabeledPolynomial(
+                    mapOf(x to 1u, y to 2u, z to 3u) to o
+                ).degrees,
+                "test 3"
+            )
+            assertEquals(
+                mapOf(y to 1u, z to 2u, t to 1u),
+                LabeledPolynomial(
+                    mapOf(x to 0u, y to 1u, z to 2u, t to 1u, s to 0u) to o
+                ).degrees,
+                "test 4"
+            )
+            assertEquals(
+                mapOf(x to 2u, y to 1u, z to 1u),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o,
+                    mapOf(x to 0u, y to 1u) to o,
+                    mapOf(x to 2u, y to 0u, z to 1u) to o,
+                ).degrees,
+                "test 5"
+            )
+            assertEquals(
+                mapOf(x to 2u, y to 2u, z to 2u, t to 4u),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o,
+                    mapOf(x to 1u, y to 2u) to o,
+                    mapOf(x to 0u, y to 1u, z to 2u) to o,
+                    mapOf(x to 2u, y to 0u, z to 1u) to o,
+                    mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
+                ).degrees,
+                "test 6"
+            )
+        }
+    }
+    @Test
+    fun test_degreeBy() {
+        RationalField.labeledPolynomialSpace {
+            fun LabeledPolynomial<Rational>.collectDegrees(variables: Set<Symbol> = this.variables + iota): Map<Symbol, UInt> = variables.associateWith { degreeBy(it) }
+            assertEquals(
+                mapOf(iota to 0u),
+                LabeledPolynomial().collectDegrees(),
+                "test 1"
+            )
+            assertEquals(
+                mapOf(iota to 0u),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o
+                ).collectDegrees(),
+                "test 2"
+            )
+            assertEquals(
+                mapOf(x to 1u, y to 2u, z to 3u, iota to 0u),
+                LabeledPolynomial(
+                    mapOf(x to 1u, y to 2u, z to 3u) to o
+                ).collectDegrees(),
+                "test 3"
+            )
+            assertEquals(
+                mapOf(y to 1u, z to 2u, t to 1u, iota to 0u),
+                LabeledPolynomial(
+                    mapOf(x to 0u, y to 1u, z to 2u, t to 1u, s to 0u) to o
+                ).collectDegrees(),
+                "test 4"
+            )
+            assertEquals(
+                mapOf(x to 2u, y to 1u, z to 1u, iota to 0u),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o,
+                    mapOf(x to 0u, y to 1u) to o,
+                    mapOf(x to 2u, y to 0u, z to 1u) to o,
+                ).collectDegrees(),
+                "test 5"
+            )
+            assertEquals(
+                mapOf(x to 2u, y to 2u, z to 2u, t to 4u, iota to 0u),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o,
+                    mapOf(x to 1u, y to 2u) to o,
+                    mapOf(x to 0u, y to 1u, z to 2u) to o,
+                    mapOf(x to 2u, y to 0u, z to 1u) to o,
+                    mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
+                ).collectDegrees(),
+                "test 6"
+            )
+        }
+    }
+    @Test
+    fun test_degreeBy_Collection() {
+        RationalField.labeledPolynomialSpace {
+            fun LabeledPolynomial<Rational>.checkDegreeBy(message: String? = null) {
+                val variables = variables.toList() + iota
+                val variablesCollectionSequence: Sequence<List<Symbol>> = sequence {
+                    val appearances = MutableList(variables.size) { 0 }
+                    while (true) {
+                        yield(
+                            buildList {
+                                for ((variableIndex, count) in appearances.withIndex()) repeat(count) { add(variables[variableIndex]) }
+                            }
+                        )
+                        val indexChange = appearances.indexOfFirst { it < 4 }
+                        if (indexChange == -1) break
+                        appearances[indexChange] += 1
+                        for (index in 0 until indexChange) appearances[index] = 0
+                    }
+                }
+                for (variablesCollection in variablesCollectionSequence) {
+                    val expected = coefficients.keys.maxOfOrNull { degs -> degs.filterKeys { it in variablesCollection }.values.sum() } ?: 0u
+                    val actual = degreeBy(variablesCollection)
+                    if (actual != expected)
+                        fail("${message ?: ""} Incorrect answer for variable collection $variablesCollection: expected $expected, actual $actual")
+                }
+            }
+            LabeledPolynomial().checkDegreeBy("test 1")
+            LabeledPolynomial(
+                mapOf<Symbol, UInt>() to o
+            ).checkDegreeBy("test 2")
+            LabeledPolynomial(
+                mapOf(x to 1u, y to 2u, z to 3u) to o
+            ).checkDegreeBy("test 3")
+            LabeledPolynomial(
+                mapOf(x to 0u, y to 1u, z to 2u, t to 1u, s to 0u) to o
+            ).checkDegreeBy("test 4")
+            LabeledPolynomial(
+                mapOf<Symbol, UInt>() to o,
+                mapOf(x to 0u, y to 1u) to o,
+                mapOf(x to 2u, y to 0u, z to 1u) to o,
+            ).checkDegreeBy("test 5")
+            LabeledPolynomial(
+                mapOf<Symbol, UInt>() to o,
+                mapOf(x to 1u, y to 2u) to o,
+                mapOf(x to 0u, y to 1u, z to 2u) to o,
+                mapOf(x to 2u, y to 0u, z to 1u) to o,
+                mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
+            ).checkDegreeBy("test 6")
+        }
+    }
+    @Test
+    fun test_variables() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                setOf(),
+                LabeledPolynomial().variables,
+                "test 1"
+            )
+            assertEquals(
+                setOf(),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o
+                ).variables,
+                "test 2"
+            )
+            assertEquals(
+                setOf(x, y, z),
+                LabeledPolynomial(
+                    mapOf(x to 1u, y to 2u, z to 3u) to o
+                ).variables,
+                "test 3"
+            )
+            assertEquals(
+                setOf(y, z, t),
+                LabeledPolynomial(
+                    mapOf(x to 0u, y to 1u, z to 2u, t to 1u, s to 0u) to o
+                ).variables,
+                "test 4"
+            )
+            assertEquals(
+                setOf(x, y, z),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o,
+                    mapOf(x to 0u, y to 1u) to o,
+                    mapOf(x to 2u, y to 0u, z to 1u) to o,
+                ).variables,
+                "test 5"
+            )
+            assertEquals(
+                setOf(x, y, z, t),
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o,
+                    mapOf(x to 1u, y to 2u) to o,
+                    mapOf(x to 0u, y to 1u, z to 2u) to o,
+                    mapOf(x to 2u, y to 0u, z to 1u) to o,
+                    mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
+                ).variables,
+                "test 6"
+            )
+        }
+    }
+    @Test
+    fun test_countOfVariables() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                0,
+                LabeledPolynomial().countOfVariables,
+                "test 1"
+            )
+            assertEquals(
+                0,
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o
+                ).countOfVariables,
+                "test 2"
+            )
+            assertEquals(
+                3,
+                LabeledPolynomial(
+                    mapOf(x to 1u, y to 2u, z to 3u) to o
+                ).countOfVariables,
+                "test 3"
+            )
+            assertEquals(
+                3,
+                LabeledPolynomial(
+                    mapOf(x to 0u, y to 1u, z to 2u, t to 1u, s to 0u) to o
+                ).countOfVariables,
+                "test 4"
+            )
+            assertEquals(
+                3,
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o,
+                    mapOf(x to 0u, y to 1u) to o,
+                    mapOf(x to 2u, y to 0u, z to 1u) to o,
+                ).countOfVariables,
+                "test 5"
+            )
+            assertEquals(
+                4,
+                LabeledPolynomial(
+                    mapOf<Symbol, UInt>() to o,
+                    mapOf(x to 1u, y to 2u) to o,
+                    mapOf(x to 0u, y to 1u, z to 2u) to o,
+                    mapOf(x to 2u, y to 0u, z to 1u) to o,
+                    mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
+                ).countOfVariables,
+                "test 6"
+            )
+        }
+    }
+    @Test
+    fun test_RF_countOfVariables() {
+        RationalField.labeledRationalFunctionSpace {
+            assertEquals(
+                0,
+                LabeledRationalFunction(
+                    LabeledPolynomial()
+                ).countOfVariables,
+                "test 1"
+            )
+            assertEquals(
+                0,
+                LabeledRationalFunction(
+                    LabeledPolynomial(),
+                    LabeledPolynomial()
+                ).countOfVariables,
+                "test 2"
+            )
+            assertEquals(
+                0,
+                LabeledRationalFunction(
+                    LabeledPolynomial(
+                        mapOf<Symbol, UInt>() to o
+                    )
+                ).countOfVariables,
+                "test 3"
+            )
+            assertEquals(
+                3,
+                LabeledRationalFunction(
+                    LabeledPolynomial(
+                        mapOf(x to 1u, y to 2u, z to 3u) to o
+                    )
+                ).countOfVariables,
+                "test 4"
+            )
+            assertEquals(
+                3,
+                LabeledRationalFunction(
+                    LabeledPolynomial(
+                        mapOf(x to 0u, y to 1u, z to 0u, t to 1u) to o
+                    ),
+                    LabeledPolynomial(
+                        mapOf(x to 0u, y to 0u, z to 2u) to o
+                    )
+                ).countOfVariables,
+                "test 5"
+            )
+            assertEquals(
+                3,
+                LabeledRationalFunction(
+                    LabeledPolynomial(
+                        mapOf<Symbol, UInt>() to o,
+                        mapOf(x to 0u, y to 1u) to o,
+                        mapOf(x to 2u, y to 0u, z to 1u) to o,
+                    )
+                ).countOfVariables,
+                "test 6"
+            )
+            assertEquals(
+                4,
+                LabeledRationalFunction(
+                    LabeledPolynomial(
+                        mapOf<Symbol, UInt>() to o,
+                        mapOf(x to 1u, y to 2u) to o,
+                        mapOf(x to 2u, y to 0u, z to 1u) to o,
+                    ), LabeledPolynomial(
+                        mapOf(x to 0u, y to 1u, z to 2u) to o,
+                        mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
+                    )
+                ).countOfVariables,
+                "test 7"
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
new file mode 100644
index 000000000..cdfe309f9
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
@@ -0,0 +1,8224 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.symbol
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.test.misc.Rational
+import space.kscience.kmath.test.misc.RationalField
+import space.kscience.kmath.test.misc.assertEquals
+import kotlin.test.Ignore
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class LabeledPolynomialUtilTest {
+    val x by symbol
+    val y by symbol
+    val iota by symbol
+
+    @Test
+    fun test_Polynomial_substitute_Double() {
+        assertEquals(
+            LabeledPolynomialAsIs(emptyMap<Symbol, UInt>() to 0.0),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 1.0,
+                mapOf(x to 1u) to -2.0,
+                mapOf(x to 2u) to 1.0,
+            ).substitute(mapOf(
+                x to 1.0
+            )),
+            0.001,
+            "test 1"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 0.8597048543814783,
+                mapOf(x to 1u) to 0.22997637465889875,
+                mapOf(x to 2u) to 0.32675302591924016,
+                mapOf(y to 1u) to 0.4561746111587508,
+                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
+                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
+                mapOf(y to 2u) to 0.2700930201481795,
+                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
+                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 0.8597048543814783,
+                mapOf(x to 1u) to 0.22997637465889875,
+                mapOf(x to 2u) to 0.32675302591924016,
+                mapOf(y to 1u) to 0.4561746111587508,
+                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
+                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
+                mapOf(y to 2u) to 0.2700930201481795,
+                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
+                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
+            ).substitute(mapOf()),
+            0.001,
+            "test 2"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 0.8597048543814783,
+                mapOf(x to 1u) to 0.22997637465889875,
+                mapOf(x to 2u) to 0.32675302591924016,
+                mapOf(y to 1u) to 0.4561746111587508,
+                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
+                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
+                mapOf(y to 2u) to 0.2700930201481795,
+                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
+                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 0.8597048543814783,
+                mapOf(x to 1u) to 0.22997637465889875,
+                mapOf(x to 2u) to 0.32675302591924016,
+                mapOf(y to 1u) to 0.4561746111587508,
+                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
+                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
+                mapOf(y to 2u) to 0.2700930201481795,
+                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
+                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                iota to 0.9211194782050933
+            )),
+            0.001,
+            "test 2'"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 0.8597048543814783,
+                mapOf(y to 1u) to 0.4561746111587508,
+                mapOf(y to 2u) to 0.2700930201481795,
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 0.8597048543814783,
+                mapOf(x to 1u) to 0.22997637465889875,
+                mapOf(x to 2u) to 0.32675302591924016,
+                mapOf(y to 1u) to 0.4561746111587508,
+                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
+                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
+                mapOf(y to 2u) to 0.2700930201481795,
+                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
+                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                x to 0.0
+            )),
+            0.001,
+            "test 3"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 0.8597048543814783,
+                mapOf(y to 1u) to 0.4561746111587508,
+                mapOf(y to 2u) to 0.2700930201481795,
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 0.8597048543814783,
+                mapOf(x to 1u) to 0.22997637465889875,
+                mapOf(x to 2u) to 0.32675302591924016,
+                mapOf(y to 1u) to 0.4561746111587508,
+                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
+                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
+                mapOf(y to 2u) to 0.2700930201481795,
+                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
+                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                x to 0.0,
+                iota to 0.9211194782050933
+            )),
+            0.001,
+            "test 3'"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 1.433510890645169,
+                mapOf(x to 1u) to 0.6264844682514724,
+                mapOf(x to 2u) to 0.8405727903771333,
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 0.8597048543814783,
+                mapOf(x to 1u) to 0.22997637465889875,
+                mapOf(x to 2u) to 0.32675302591924016,
+                mapOf(y to 1u) to 0.4561746111587508,
+                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
+                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
+                mapOf(y to 2u) to 0.2700930201481795,
+                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
+                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                y to 0.8400458576651112
+            )),
+            0.001,
+            "test 4"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 1.433510890645169,
+                mapOf(x to 1u) to 0.6264844682514724,
+                mapOf(x to 2u) to 0.8405727903771333,
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 0.8597048543814783,
+                mapOf(x to 1u) to 0.22997637465889875,
+                mapOf(x to 2u) to 0.32675302591924016,
+                mapOf(y to 1u) to 0.4561746111587508,
+                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
+                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
+                mapOf(y to 2u) to 0.2700930201481795,
+                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
+                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                y to 0.8400458576651112,
+                iota to 0.9211194782050933
+            )),
+            0.001,
+            "test 4'"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 1.934530767358133,
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 0.8597048543814783,
+                mapOf(x to 1u) to 0.22997637465889875,
+                mapOf(x to 2u) to 0.32675302591924016,
+                mapOf(y to 1u) to 0.4561746111587508,
+                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
+                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
+                mapOf(y to 2u) to 0.2700930201481795,
+                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
+                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                x to 0.4846192734143442,
+                y to 0.8400458576651112,
+            )),
+            0.001,
+            "test 5"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 1.934530767358133,
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to 0.8597048543814783,
+                mapOf(x to 1u) to 0.22997637465889875,
+                mapOf(x to 2u) to 0.32675302591924016,
+                mapOf(y to 1u) to 0.4561746111587508,
+                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
+                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
+                mapOf(y to 2u) to 0.2700930201481795,
+                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
+                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
+            ).substitute(mapOf(
+                x to 0.4846192734143442,
+                y to 0.8400458576651112,
+                iota to 0.9211194782050933
+            )),
+            0.001,
+            "test 5'"
+        )
+    }
+    @Test
+    fun test_Polynomial_substitute_Constant_Map() {
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0)
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1)
+            ).substitute(RationalField, mapOf(
+                x to Rational(1)
+            )),
+            "test 1"
+        )
+        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5%2C+y+%3D+12%2F9
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(143, 150)
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                x to Rational(-2, 5),
+                y to Rational(12, 9),
+            )),
+            "test 2"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(143, 150)
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                x to Rational(-2, 5),
+                y to Rational(12, 9),
+                iota to Rational(57, 179),
+            )),
+            "test 2'"
+        )
+        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+y+%3D+12%2F9
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-67, 18),
+                mapOf(x to 1u) to Rational(-70, 9),
+                mapOf(x to 2u) to Rational(88, 9),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                y to Rational(12, 9),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-67, 18),
+                mapOf(x to 1u) to Rational(-70, 9),
+                mapOf(x to 2u) to Rational(88, 9),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                y to Rational(12, 9),
+                iota to Rational(57, 179),
+            )),
+            "test 3'"
+        )
+        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-83, 50),
+                mapOf(y to 1u) to Rational(29, 25),
+                mapOf(y to 2u) to Rational(3, 5),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                x to Rational(-2, 5),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-83, 50),
+                mapOf(y to 1u) to Rational(29, 25),
+                mapOf(y to 2u) to Rational(3, 5),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                x to Rational(-2, 5),
+                iota to Rational(57, 179),
+            )),
+            "test 4'"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf<Symbol, Rational>()),
+            "test 5"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                iota to Rational(57, 179),
+            )),
+            "test 5'"
+        )
+        // https://www.wolframalpha.com/input?i=%28%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2%29+p%5E8+where+x+%3D+q%2Fp%2C+y+%3D+x%5E3%2C+p+%3D+-2%2F5%2C+q+%3D+12%2F9
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(47639065216, 2562890625)
+            ),
+            LabeledPolynomialAsIs(
+                mapOf(x to 8u) to Rational(-3, 2),
+                mapOf(x to 7u, y to 1u) to Rational(8, 6),
+                mapOf(x to 6u, y to 2u) to Rational(14, 6),
+                mapOf(x to 5u, y to 3u) to Rational(-3, 1),
+                mapOf(x to 4u, y to 4u) to Rational(-19, 2),
+                mapOf(x to 3u, y to 5u) to Rational(9, 4),
+                mapOf(x to 2u, y to 6u) to Rational(5, 5),
+                mapOf(x to 1u, y to 7u) to Rational(18, 9),
+                mapOf(y to 8u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                x to Rational(-2, 5),
+                y to Rational(12, 9),
+            )),
+            "test 6"
+        )
+    }
+    @Test
+    fun test_Polynomial_substitute_Polynomial_Map() {
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0)
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1)
+            ).substitute(RationalField, mapOf(
+                x to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1)
+                )
+            )),
+            "test 1"
+        )
+        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-5%2F1+s+%2B+2%2F8+t%2C+y+%3D+11%2F7+t
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(y to 1u) to Rational(-92, 21),
+                mapOf(y to 2u) to Rational(-2627, 2352),
+                mapOf(y to 3u) to Rational(4565, 3136),
+                mapOf(y to 4u) to Rational(605, 1568),
+                mapOf(x to 1u) to Rational(-20, 3),
+                mapOf(x to 1u, y to 1u) to Rational(1445, 21),
+                mapOf(x to 1u, y to 2u) to Rational(-13145, 392),
+                mapOf(x to 1u, y to 3u) to Rational(-3025, 196),
+                mapOf(x to 2u) to Rational(175, 3),
+                mapOf(x to 2u, y to 1u) to Rational(2475, 28),
+                mapOf(x to 2u, y to 2u) to Rational(15125, 98),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                x to LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(-5, 1),
+                    mapOf(y to 1u) to Rational(2, 8),
+                ),
+                y to LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(0, 5),
+                    mapOf(y to 1u) to Rational(11, 7),
+                ),
+            )),
+            "test 2"
+        )
+        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = (0/6 + 14/8 s + -14/2 s^2) + (-3/5 + 11/1 s + 3/7 s^2) t + (-3/7 + -18/5 s + -9/1 s^2) t^2, y = (-9/2 + 2/7 s + 9/1 s^2) + (13/1 + -1/8 s + 2/8 s^2) t + (19/4 + 15/7 s + -19/4 s^2) t^2
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(129, 4),
+                mapOf(x to 1u) to Rational(48583, 336),
+                mapOf(x to 2u) to Rational(-913477, 1568),
+                mapOf(x to 3u) to Rational(-967567, 672),
+                mapOf(x to 4u) to Rational(4722043, 1344),
+                mapOf(x to 5u) to Rational(8855, 2),
+                mapOf(x to 6u) to Rational(-311971, 32),
+                mapOf(x to 7u) to Rational(-17325, 4),
+                mapOf(x to 8u) to Rational(19845, 2),
+                mapOf(y to 1u) to Rational(-827, 4),
+                mapOf(x to 1u, y to 1u) to Rational(191927, 840),
+                mapOf(x to 2u, y to 1u) to Rational(9592627, 2352),
+                mapOf(x to 3u, y to 1u) to Rational(-105400711, 53760),
+                mapOf(x to 4u, y to 1u) to Rational(-10054101459, 439040),
+                mapOf(x to 5u, y to 1u) to Rational(2127351, 128),
+                mapOf(x to 6u, y to 1u) to Rational(116680973, 3136),
+                mapOf(x to 7u, y to 1u) to Rational(-220445, 7),
+                mapOf(x to 8u, y to 1u) to Rational(-2655, 4),
+                mapOf(y to 2u) to Rational(30567, 100),
+                mapOf(x to 1u, y to 2u) to Rational(-156284953, 39200),
+                mapOf(x to 2u, y to 2u) to Rational(-57661541711, 6585600),
+                mapOf(x to 3u, y to 2u) to Rational(131931579, 3136),
+                mapOf(x to 4u, y to 2u) to Rational(98818124791, 3512320),
+                mapOf(x to 5u, y to 2u) to Rational(-94458855053, 878080),
+                mapOf(x to 6u, y to 2u) to Rational(13937705305, 1229312),
+                mapOf(x to 7u, y to 2u) to Rational(335706887, 21952),
+                mapOf(x to 8u, y to 2u) to Rational(23549165, 1568),
+                mapOf(y to 3u) to Rational(111367, 1400),
+                mapOf(x to 1u, y to 3u) to Rational(4937369, 700),
+                mapOf(x to 2u, y to 3u) to Rational(-4449423711, 274400),
+                mapOf(x to 3u, y to 3u) to Rational(-351873325703, 4390400),
+                mapOf(x to 4u, y to 3u) to Rational(23495875029, 307328),
+                mapOf(x to 5u, y to 3u) to Rational(17576300919, 878080),
+                mapOf(x to 6u, y to 3u) to Rational(230316993, 12544),
+                mapOf(x to 7u, y to 3u) to Rational(-191130515, 21952),
+                mapOf(x to 8u, y to 3u) to Rational(332435, 392),
+                mapOf(y to 4u) to Rational(-275084, 1225),
+                mapOf(x to 1u, y to 4u) to Rational(-266774603, 137200),
+                mapOf(x to 2u, y to 4u) to Rational(2176279167121, 30732800),
+                mapOf(x to 3u, y to 4u) to Rational(10904913303, 2195200),
+                mapOf(x to 4u, y to 4u) to Rational(-10769286147, 2195200),
+                mapOf(x to 5u, y to 4u) to Rational(-26277119793, 439040),
+                mapOf(x to 6u, y to 4u) to Rational(25859735869, 6146560),
+                mapOf(x to 7u, y to 4u) to Rational(38906289, 2744),
+                mapOf(x to 8u, y to 4u) to Rational(-3072025, 392),
+                mapOf(y to 5u) to Rational(9573, 98),
+                mapOf(x to 1u, y to 5u) to Rational(-4154651399, 548800),
+                mapOf(x to 2u, y to 5u) to Rational(3446069019, 548800),
+                mapOf(x to 3u, y to 5u) to Rational(-7851500623, 137200),
+                mapOf(x to 4u, y to 5u) to Rational(-53205142903, 1920800),
+                mapOf(x to 5u, y to 5u) to Rational(-31953611, 3430),
+                mapOf(x to 6u, y to 5u) to Rational(1447380313, 109760),
+                mapOf(x to 7u, y to 5u) to Rational(764158625, 21952),
+                mapOf(x to 8u, y to 5u) to Rational(1153515, 784),
+                mapOf(y to 6u) to Rational(1722351, 7840),
+                mapOf(x to 1u, y to 6u) to Rational(-164554821, 109760),
+                mapOf(x to 2u, y to 6u) to Rational(-79096147243, 7683200),
+                mapOf(x to 3u, y to 6u) to Rational(-624721089, 15680),
+                mapOf(x to 4u, y to 6u) to Rational(11147305567, 548800),
+                mapOf(x to 5u, y to 6u) to Rational(8318333679, 109760),
+                mapOf(x to 6u, y to 6u) to Rational(32981871553, 1536640),
+                mapOf(x to 7u, y to 6u) to Rational(-225359619, 21952),
+                mapOf(x to 8u, y to 6u) to Rational(-3973995, 392),
+                mapOf(y to 7u) to Rational(67203, 784),
+                mapOf(x to 1u, y to 7u) to Rational(39281469, 54880),
+                mapOf(x to 2u, y to 7u) to Rational(70162551, 27440),
+                mapOf(x to 3u, y to 7u) to Rational(413630709, 54880),
+                mapOf(x to 4u, y to 7u) to Rational(4640410269, 192080),
+                mapOf(x to 5u, y to 7u) to Rational(802712247, 54880),
+                mapOf(x to 6u, y to 7u) to Rational(-473517603, 27440),
+                mapOf(x to 7u, y to 7u) to Rational(-17055459, 1568),
+                mapOf(x to 8u, y to 7u) to Rational(-12825, 14),
+                mapOf(y to 8u) to Rational(16245, 1568),
+                mapOf(x to 1u, y to 8u) to Rational(503253, 2744),
+                mapOf(x to 2u, y to 8u) to Rational(125292591, 96040),
+                mapOf(x to 3u, y to 8u) to Rational(12033171, 2744),
+                mapOf(x to 4u, y to 8u) to Rational(154352673, 27440),
+                mapOf(x to 5u, y to 8u) to Rational(-1302291, 392),
+                mapOf(x to 6u, y to 8u) to Rational(-20265741, 1960),
+                mapOf(x to 7u, y to 8u) to Rational(-26163, 56),
+                mapOf(x to 8u, y to 8u) to Rational(146205, 32),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                x to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(0, 6),
+                    mapOf(x to 1u) to Rational(14, 8),
+                    mapOf(x to 2u) to Rational(-14, 2),
+                    mapOf(y to 1u) to Rational(-3, 5),
+                    mapOf(x to 1u, y to 1u) to Rational(11, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(3, 7),
+                    mapOf(y to 2u) to Rational(-3, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-18, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-9, 1),
+                ),
+                y to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-9, 2),
+                    mapOf(x to 1u) to Rational(2, 7),
+                    mapOf(x to 2u) to Rational(9, 1),
+                    mapOf(y to 1u) to Rational(13, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(-1, 8),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 8),
+                    mapOf(y to 2u) to Rational(19, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(15, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(-19, 4),
+                ),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(129, 4),
+                mapOf(x to 1u) to Rational(48583, 336),
+                mapOf(x to 2u) to Rational(-913477, 1568),
+                mapOf(x to 3u) to Rational(-967567, 672),
+                mapOf(x to 4u) to Rational(4722043, 1344),
+                mapOf(x to 5u) to Rational(8855, 2),
+                mapOf(x to 6u) to Rational(-311971, 32),
+                mapOf(x to 7u) to Rational(-17325, 4),
+                mapOf(x to 8u) to Rational(19845, 2),
+                mapOf(y to 1u) to Rational(-827, 4),
+                mapOf(x to 1u, y to 1u) to Rational(191927, 840),
+                mapOf(x to 2u, y to 1u) to Rational(9592627, 2352),
+                mapOf(x to 3u, y to 1u) to Rational(-105400711, 53760),
+                mapOf(x to 4u, y to 1u) to Rational(-10054101459, 439040),
+                mapOf(x to 5u, y to 1u) to Rational(2127351, 128),
+                mapOf(x to 6u, y to 1u) to Rational(116680973, 3136),
+                mapOf(x to 7u, y to 1u) to Rational(-220445, 7),
+                mapOf(x to 8u, y to 1u) to Rational(-2655, 4),
+                mapOf(y to 2u) to Rational(30567, 100),
+                mapOf(x to 1u, y to 2u) to Rational(-156284953, 39200),
+                mapOf(x to 2u, y to 2u) to Rational(-57661541711, 6585600),
+                mapOf(x to 3u, y to 2u) to Rational(131931579, 3136),
+                mapOf(x to 4u, y to 2u) to Rational(98818124791, 3512320),
+                mapOf(x to 5u, y to 2u) to Rational(-94458855053, 878080),
+                mapOf(x to 6u, y to 2u) to Rational(13937705305, 1229312),
+                mapOf(x to 7u, y to 2u) to Rational(335706887, 21952),
+                mapOf(x to 8u, y to 2u) to Rational(23549165, 1568),
+                mapOf(y to 3u) to Rational(111367, 1400),
+                mapOf(x to 1u, y to 3u) to Rational(4937369, 700),
+                mapOf(x to 2u, y to 3u) to Rational(-4449423711, 274400),
+                mapOf(x to 3u, y to 3u) to Rational(-351873325703, 4390400),
+                mapOf(x to 4u, y to 3u) to Rational(23495875029, 307328),
+                mapOf(x to 5u, y to 3u) to Rational(17576300919, 878080),
+                mapOf(x to 6u, y to 3u) to Rational(230316993, 12544),
+                mapOf(x to 7u, y to 3u) to Rational(-191130515, 21952),
+                mapOf(x to 8u, y to 3u) to Rational(332435, 392),
+                mapOf(y to 4u) to Rational(-275084, 1225),
+                mapOf(x to 1u, y to 4u) to Rational(-266774603, 137200),
+                mapOf(x to 2u, y to 4u) to Rational(2176279167121, 30732800),
+                mapOf(x to 3u, y to 4u) to Rational(10904913303, 2195200),
+                mapOf(x to 4u, y to 4u) to Rational(-10769286147, 2195200),
+                mapOf(x to 5u, y to 4u) to Rational(-26277119793, 439040),
+                mapOf(x to 6u, y to 4u) to Rational(25859735869, 6146560),
+                mapOf(x to 7u, y to 4u) to Rational(38906289, 2744),
+                mapOf(x to 8u, y to 4u) to Rational(-3072025, 392),
+                mapOf(y to 5u) to Rational(9573, 98),
+                mapOf(x to 1u, y to 5u) to Rational(-4154651399, 548800),
+                mapOf(x to 2u, y to 5u) to Rational(3446069019, 548800),
+                mapOf(x to 3u, y to 5u) to Rational(-7851500623, 137200),
+                mapOf(x to 4u, y to 5u) to Rational(-53205142903, 1920800),
+                mapOf(x to 5u, y to 5u) to Rational(-31953611, 3430),
+                mapOf(x to 6u, y to 5u) to Rational(1447380313, 109760),
+                mapOf(x to 7u, y to 5u) to Rational(764158625, 21952),
+                mapOf(x to 8u, y to 5u) to Rational(1153515, 784),
+                mapOf(y to 6u) to Rational(1722351, 7840),
+                mapOf(x to 1u, y to 6u) to Rational(-164554821, 109760),
+                mapOf(x to 2u, y to 6u) to Rational(-79096147243, 7683200),
+                mapOf(x to 3u, y to 6u) to Rational(-624721089, 15680),
+                mapOf(x to 4u, y to 6u) to Rational(11147305567, 548800),
+                mapOf(x to 5u, y to 6u) to Rational(8318333679, 109760),
+                mapOf(x to 6u, y to 6u) to Rational(32981871553, 1536640),
+                mapOf(x to 7u, y to 6u) to Rational(-225359619, 21952),
+                mapOf(x to 8u, y to 6u) to Rational(-3973995, 392),
+                mapOf(y to 7u) to Rational(67203, 784),
+                mapOf(x to 1u, y to 7u) to Rational(39281469, 54880),
+                mapOf(x to 2u, y to 7u) to Rational(70162551, 27440),
+                mapOf(x to 3u, y to 7u) to Rational(413630709, 54880),
+                mapOf(x to 4u, y to 7u) to Rational(4640410269, 192080),
+                mapOf(x to 5u, y to 7u) to Rational(802712247, 54880),
+                mapOf(x to 6u, y to 7u) to Rational(-473517603, 27440),
+                mapOf(x to 7u, y to 7u) to Rational(-17055459, 1568),
+                mapOf(x to 8u, y to 7u) to Rational(-12825, 14),
+                mapOf(y to 8u) to Rational(16245, 1568),
+                mapOf(x to 1u, y to 8u) to Rational(503253, 2744),
+                mapOf(x to 2u, y to 8u) to Rational(125292591, 96040),
+                mapOf(x to 3u, y to 8u) to Rational(12033171, 2744),
+                mapOf(x to 4u, y to 8u) to Rational(154352673, 27440),
+                mapOf(x to 5u, y to 8u) to Rational(-1302291, 392),
+                mapOf(x to 6u, y to 8u) to Rational(-20265741, 1960),
+                mapOf(x to 7u, y to 8u) to Rational(-26163, 56),
+                mapOf(x to 8u, y to 8u) to Rational(146205, 32),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                x to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(0, 6),
+                    mapOf(x to 1u) to Rational(14, 8),
+                    mapOf(x to 2u) to Rational(-14, 2),
+                    mapOf(y to 1u) to Rational(-3, 5),
+                    mapOf(x to 1u, y to 1u) to Rational(11, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(3, 7),
+                    mapOf(y to 2u) to Rational(-3, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-18, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-9, 1),
+                ),
+                y to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-9, 2),
+                    mapOf(x to 1u) to Rational(2, 7),
+                    mapOf(x to 2u) to Rational(9, 1),
+                    mapOf(y to 1u) to Rational(13, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(-1, 8),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 8),
+                    mapOf(y to 2u) to Rational(19, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(15, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(-19, 4),
+                ),
+                iota to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 3),
+                    mapOf(x to 1u) to Rational(5, 2),
+                    mapOf(x to 2u) to Rational(13, 7),
+                    mapOf(y to 1u) to Rational(16, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 1),
+                    mapOf(y to 2u) to Rational(-14, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-2, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            )),
+            "test 3'"
+        )
+        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = s, y = (-9/2 + 2/7 s + 9/1 s^2) + (13/1 + -1/8 s + 2/8 s^2) t + (19/4 + 15/7 s + -19/4 s^2) t^2
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(129, 4),
+                mapOf(x to 1u) to Rational(6817, 84),
+                mapOf(x to 2u) to Rational(-21445, 294),
+                mapOf(x to 3u) to Rational(-12151, 49),
+                mapOf(x to 4u) to Rational(-17789, 196),
+                mapOf(x to 5u) to Rational(1224, 7),
+                mapOf(x to 6u) to Rational(405, 2),
+                mapOf(y to 1u) to Rational(-156),
+                mapOf(x to 1u, y to 1u) to Rational(-2440, 7),
+                mapOf(x to 2u, y to 1u) to Rational(-1571, 112),
+                mapOf(x to 3u, y to 1u) to Rational(107515, 224),
+                mapOf(x to 4u, y to 1u) to Rational(64965, 112),
+                mapOf(x to 5u, y to 1u) to Rational(209, 56),
+                mapOf(x to 6u, y to 1u) to Rational(45, 4),
+                mapOf(y to 2u) to Rational(112),
+                mapOf(x to 1u, y to 2u) to Rational(1449, 8),
+                mapOf(x to 2u, y to 2u) to Rational(1306309, 3136),
+                mapOf(x to 3u, y to 2u) to Rational(483207, 1568),
+                mapOf(x to 4u, y to 2u) to Rational(1978437, 6272),
+                mapOf(x to 5u, y to 2u) to Rational(-18231, 224),
+                mapOf(x to 6u, y to 2u) to Rational(-6835, 32),
+                mapOf(y to 3u) to Rational(247, 2),
+                mapOf(x to 1u, y to 3u) to Rational(33771, 112),
+                mapOf(x to 2u, y to 3u) to Rational(2073, 7),
+                mapOf(x to 3u, y to 3u) to Rational(-23463, 224),
+                mapOf(x to 4u, y to 3u) to Rational(-33825, 112),
+                mapOf(x to 5u, y to 3u) to Rational(201, 224),
+                mapOf(x to 6u, y to 3u) to Rational(-95, 16),
+                mapOf(y to 4u) to Rational(361, 16),
+                mapOf(x to 1u, y to 4u) to Rational(3667, 56),
+                mapOf(x to 2u, y to 4u) to Rational(88729, 1568),
+                mapOf(x to 3u, y to 4u) to Rational(-2476, 49),
+                mapOf(x to 4u, y to 4u) to Rational(-23419, 196),
+                mapOf(x to 5u, y to 4u) to Rational(-323, 56),
+                mapOf(x to 6u, y to 4u) to Rational(1805, 32),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                y to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-9, 2),
+                    mapOf(x to 1u) to Rational(2, 7),
+                    mapOf(x to 2u) to Rational(9, 1),
+                    mapOf(y to 1u) to Rational(13, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(-1, 8),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 8),
+                    mapOf(y to 2u) to Rational(19, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(15, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(-19, 4),
+                ),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(129, 4),
+                mapOf(x to 1u) to Rational(6817, 84),
+                mapOf(x to 2u) to Rational(-21445, 294),
+                mapOf(x to 3u) to Rational(-12151, 49),
+                mapOf(x to 4u) to Rational(-17789, 196),
+                mapOf(x to 5u) to Rational(1224, 7),
+                mapOf(x to 6u) to Rational(405, 2),
+                mapOf(y to 1u) to Rational(-156),
+                mapOf(x to 1u, y to 1u) to Rational(-2440, 7),
+                mapOf(x to 2u, y to 1u) to Rational(-1571, 112),
+                mapOf(x to 3u, y to 1u) to Rational(107515, 224),
+                mapOf(x to 4u, y to 1u) to Rational(64965, 112),
+                mapOf(x to 5u, y to 1u) to Rational(209, 56),
+                mapOf(x to 6u, y to 1u) to Rational(45, 4),
+                mapOf(y to 2u) to Rational(112),
+                mapOf(x to 1u, y to 2u) to Rational(1449, 8),
+                mapOf(x to 2u, y to 2u) to Rational(1306309, 3136),
+                mapOf(x to 3u, y to 2u) to Rational(483207, 1568),
+                mapOf(x to 4u, y to 2u) to Rational(1978437, 6272),
+                mapOf(x to 5u, y to 2u) to Rational(-18231, 224),
+                mapOf(x to 6u, y to 2u) to Rational(-6835, 32),
+                mapOf(y to 3u) to Rational(247, 2),
+                mapOf(x to 1u, y to 3u) to Rational(33771, 112),
+                mapOf(x to 2u, y to 3u) to Rational(2073, 7),
+                mapOf(x to 3u, y to 3u) to Rational(-23463, 224),
+                mapOf(x to 4u, y to 3u) to Rational(-33825, 112),
+                mapOf(x to 5u, y to 3u) to Rational(201, 224),
+                mapOf(x to 6u, y to 3u) to Rational(-95, 16),
+                mapOf(y to 4u) to Rational(361, 16),
+                mapOf(x to 1u, y to 4u) to Rational(3667, 56),
+                mapOf(x to 2u, y to 4u) to Rational(88729, 1568),
+                mapOf(x to 3u, y to 4u) to Rational(-2476, 49),
+                mapOf(x to 4u, y to 4u) to Rational(-23419, 196),
+                mapOf(x to 5u, y to 4u) to Rational(-323, 56),
+                mapOf(x to 6u, y to 4u) to Rational(1805, 32),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                y to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-9, 2),
+                    mapOf(x to 1u) to Rational(2, 7),
+                    mapOf(x to 2u) to Rational(9, 1),
+                    mapOf(y to 1u) to Rational(13, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(-1, 8),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 8),
+                    mapOf(y to 2u) to Rational(19, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(15, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(-19, 4),
+                ),
+                iota to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 3),
+                    mapOf(x to 1u) to Rational(5, 2),
+                    mapOf(x to 2u) to Rational(13, 7),
+                    mapOf(y to 1u) to Rational(16, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 1),
+                    mapOf(y to 2u) to Rational(-14, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-2, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            )),
+            "test 4'"
+        )
+        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = (0/6 + 14/8 s + -14/2 s^2) + (-3/5 + 11/1 s + 3/7 s^2) t + (-3/7 + -18/5 s + -9/1 s^2) t^2, y = t
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(7, 3),
+                mapOf(x to 2u) to Rational(-35, 16),
+                mapOf(x to 3u) to Rational(-343, 6),
+                mapOf(x to 4u) to Rational(343, 3),
+                mapOf(y to 1u) to Rational(-19, 5),
+                mapOf(x to 1u, y to 1u) to Rational(-823, 120),
+                mapOf(x to 2u, y to 1u) to Rational(1232417, 6720),
+                mapOf(x to 3u, y to 1u) to Rational(-9863, 24),
+                mapOf(x to 4u, y to 1u) to Rational(385, 4),
+                mapOf(y to 2u) to Rational(2439, 350),
+                mapOf(x to 1u, y to 2u) to Rational(-5793, 40),
+                mapOf(x to 2u, y to 2u) to Rational(1172113, 3360),
+                mapOf(x to 3u, y to 2u) to Rational(-13531, 40),
+                mapOf(x to 4u, y to 2u) to Rational(2824, 7),
+                mapOf(y to 3u) to Rational(3417, 700),
+                mapOf(x to 1u, y to 3u) to Rational(1191, 200),
+                mapOf(x to 2u, y to 3u) to Rational(8383, 28),
+                mapOf(x to 3u, y to 3u) to Rational(-220279, 280),
+                mapOf(x to 4u, y to 3u) to Rational(49179, 196),
+                mapOf(y to 4u) to Rational(57, 35),
+                mapOf(x to 1u, y to 4u) to Rational(-33771, 700),
+                mapOf(x to 2u, y to 4u) to Rational(196279, 1225),
+                mapOf(x to 3u, y to 4u) to Rational(-32259, 140),
+                mapOf(x to 4u, y to 4u) to Rational(23868, 49),
+                mapOf(y to 5u) to Rational(333, 196),
+                mapOf(x to 1u, y to 5u) to Rational(-204, 35),
+                mapOf(x to 2u, y to 5u) to Rational(-307233, 2450),
+                mapOf(x to 3u, y to 5u) to Rational(-12492, 35),
+                mapOf(x to 4u, y to 5u) to Rational(4563, 28),
+                mapOf(y to 6u) to Rational(45, 98),
+                mapOf(x to 1u, y to 6u) to Rational(54, 7),
+                mapOf(x to 2u, y to 6u) to Rational(1809, 35),
+                mapOf(x to 3u, y to 6u) to Rational(162),
+                mapOf(x to 4u, y to 6u) to Rational(405, 2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                x to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(0, 6),
+                    mapOf(x to 1u) to Rational(14, 8),
+                    mapOf(x to 2u) to Rational(-14, 2),
+                    mapOf(y to 1u) to Rational(-3, 5),
+                    mapOf(x to 1u, y to 1u) to Rational(11, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(3, 7),
+                    mapOf(y to 2u) to Rational(-3, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-18, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-9, 1),
+                ),
+            )),
+            "test 5"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(7, 3),
+                mapOf(x to 2u) to Rational(-35, 16),
+                mapOf(x to 3u) to Rational(-343, 6),
+                mapOf(x to 4u) to Rational(343, 3),
+                mapOf(y to 1u) to Rational(-19, 5),
+                mapOf(x to 1u, y to 1u) to Rational(-823, 120),
+                mapOf(x to 2u, y to 1u) to Rational(1232417, 6720),
+                mapOf(x to 3u, y to 1u) to Rational(-9863, 24),
+                mapOf(x to 4u, y to 1u) to Rational(385, 4),
+                mapOf(y to 2u) to Rational(2439, 350),
+                mapOf(x to 1u, y to 2u) to Rational(-5793, 40),
+                mapOf(x to 2u, y to 2u) to Rational(1172113, 3360),
+                mapOf(x to 3u, y to 2u) to Rational(-13531, 40),
+                mapOf(x to 4u, y to 2u) to Rational(2824, 7),
+                mapOf(y to 3u) to Rational(3417, 700),
+                mapOf(x to 1u, y to 3u) to Rational(1191, 200),
+                mapOf(x to 2u, y to 3u) to Rational(8383, 28),
+                mapOf(x to 3u, y to 3u) to Rational(-220279, 280),
+                mapOf(x to 4u, y to 3u) to Rational(49179, 196),
+                mapOf(y to 4u) to Rational(57, 35),
+                mapOf(x to 1u, y to 4u) to Rational(-33771, 700),
+                mapOf(x to 2u, y to 4u) to Rational(196279, 1225),
+                mapOf(x to 3u, y to 4u) to Rational(-32259, 140),
+                mapOf(x to 4u, y to 4u) to Rational(23868, 49),
+                mapOf(y to 5u) to Rational(333, 196),
+                mapOf(x to 1u, y to 5u) to Rational(-204, 35),
+                mapOf(x to 2u, y to 5u) to Rational(-307233, 2450),
+                mapOf(x to 3u, y to 5u) to Rational(-12492, 35),
+                mapOf(x to 4u, y to 5u) to Rational(4563, 28),
+                mapOf(y to 6u) to Rational(45, 98),
+                mapOf(x to 1u, y to 6u) to Rational(54, 7),
+                mapOf(x to 2u, y to 6u) to Rational(1809, 35),
+                mapOf(x to 3u, y to 6u) to Rational(162),
+                mapOf(x to 4u, y to 6u) to Rational(405, 2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                x to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(0, 6),
+                    mapOf(x to 1u) to Rational(14, 8),
+                    mapOf(x to 2u) to Rational(-14, 2),
+                    mapOf(y to 1u) to Rational(-3, 5),
+                    mapOf(x to 1u, y to 1u) to Rational(11, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(3, 7),
+                    mapOf(y to 2u) to Rational(-3, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-18, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-9, 1),
+                ),
+                iota to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 3),
+                    mapOf(x to 1u) to Rational(5, 2),
+                    mapOf(x to 2u) to Rational(13, 7),
+                    mapOf(y to 1u) to Rational(16, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 1),
+                    mapOf(y to 2u) to Rational(-14, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-2, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            )),
+            "test 5'"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf<Symbol, LabeledPolynomial<Rational>>()),
+            "test 6"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-3, 2),
+                mapOf(x to 1u) to Rational(8, 6),
+                mapOf(x to 2u) to Rational(14, 6),
+                mapOf(y to 1u) to Rational(-3, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
+                mapOf(x to 2u, y to 1u) to Rational(9, 4),
+                mapOf(y to 2u) to Rational(5, 5),
+                mapOf(x to 1u, y to 2u) to Rational(18, 9),
+                mapOf(x to 2u, y to 2u) to Rational(5, 2),
+            ).substitute(RationalField, mapOf(
+                iota to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 3),
+                    mapOf(x to 1u) to Rational(5, 2),
+                    mapOf(x to 2u) to Rational(13, 7),
+                    mapOf(y to 1u) to Rational(16, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 1),
+                    mapOf(y to 2u) to Rational(-14, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-2, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            )),
+            "test 6'"
+        )
+    }
+    @Test
+    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
+            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
+    fun test_Polynomial_substitute_RationalFunction_Map() {
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(0)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1)
+                )
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1)
+            ).substitute(RationalField, mapOf(
+                x to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(1)
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(1)
+                    )
+                )
+            )),
+            "test 1"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 4u) to Rational(-194071, 4900),
+                    mapOf(x to 3u, y to 1u) to Rational(394811, 225),
+                    mapOf(x to 2u, y to 2u) to Rational(-444183161, 66150),
+                    mapOf(x to 1u, y to 3u) to Rational(70537618, 59535),
+                    mapOf(y to 4u) to Rational(9655504, 2835),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf(x to 4u) to Rational(9, 1),
+                    mapOf(x to 3u, y to 1u) to Rational(61, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(2137, 36),
+                    mapOf(x to 1u, y to 3u) to Rational(-1342, 9),
+                    mapOf(y to 4u) to Rational(484, 9),
+                )
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(15, 7),
+                mapOf(x to 1u) to Rational(1, 5),
+                mapOf(x to 2u) to Rational(-7, 4),
+                mapOf(y to 1u) to Rational(-1, 9),
+                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
+                mapOf(x to 2u, y to 1u) to Rational(17, 3),
+                mapOf(y to 2u) to Rational(2, 6),
+                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                x to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf(x to 1u) to Rational(17, 7),
+                        mapOf(y to 1u) to Rational(-13, 1),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf(x to 1u) to Rational(-18, 6),
+                        mapOf(y to 1u) to Rational(11, 6),
+                    )
+                ),
+                y to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf(x to 1u) to Rational(18, 5),
+                        mapOf(y to 1u) to Rational(-16, 3),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf(x to 1u) to Rational(-1, 1),
+                        mapOf(y to 1u) to Rational(-4, 1),
+                    )
+                ),
+            )),
+            "test 2"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-6443599, 10000),
+                    mapOf(x to 1u) to Rational(166251223, 210000),
+                    mapOf(x to 2u) to Rational(-4606805099, 3528000),
+                    mapOf(x to 3u) to Rational(51204379, 19600),
+                    mapOf(x to 4u) to Rational(-529045460659, 277830000),
+                    mapOf(x to 5u) to Rational(2630836709, 1488375),
+                    mapOf(x to 6u) to Rational(-42675691369, 25004700),
+                    mapOf(x to 7u) to Rational(495825223, 1250235),
+                    mapOf(x to 8u) to Rational(-22531756, 1750329),
+                    mapOf(y to 1u) to Rational(-2526552797, 420000),
+                    mapOf(x to 1u, y to 1u) to Rational(31108840471, 2520000),
+                    mapOf(x to 2u, y to 1u) to Rational(-4789740847, 1102500),
+                    mapOf(x to 3u, y to 1u) to Rational(186594307807, 11340000),
+                    mapOf(x to 4u, y to 1u) to Rational(-11677815943, 1488375),
+                    mapOf(x to 5u, y to 1u) to Rational(-181118486447, 27783000),
+                    mapOf(x to 6u, y to 1u) to Rational(-16123292162, 14586075),
+                    mapOf(x to 7u, y to 1u) to Rational(-140339343808, 26254935),
+                    mapOf(x to 8u, y to 1u) to Rational(4570171616, 5250987),
+                    mapOf(y to 2u) to Rational(-181436530573, 10080000),
+                    mapOf(x to 1u, y to 2u) to Rational(6700437957491, 105840000),
+                    mapOf(x to 2u, y to 2u) to Rational(-3527267461, 1417500),
+                    mapOf(x to 3u, y to 2u) to Rational(-38084563451, 5556600),
+                    mapOf(x to 4u, y to 2u) to Rational(-565662040631, 13891500),
+                    mapOf(x to 5u, y to 2u) to Rational(-35479071126397, 583443000),
+                    mapOf(x to 6u, y to 2u) to Rational(-11717559078469, 525098700),
+                    mapOf(x to 7u, y to 2u) to Rational(-2043385293517, 225042300),
+                    mapOf(x to 8u, y to 2u) to Rational(-3644439630451, 551353635),
+                    mapOf(y to 3u) to Rational(-1760423269, 126000),
+                    mapOf(x to 1u, y to 3u) to Rational(310176758299, 2352000),
+                    mapOf(x to 2u, y to 3u) to Rational(-907229584837, 21168000),
+                    mapOf(x to 3u, y to 3u) to Rational(-16717135885963, 95256000),
+                    mapOf(x to 4u, y to 3u) to Rational(-43762928025353, 333396000),
+                    mapOf(x to 5u, y to 3u) to Rational(-328427480571607, 3000564000),
+                    mapOf(x to 6u, y to 3u) to Rational(-7722675917197, 210039480),
+                    mapOf(x to 7u, y to 3u) to Rational(1713350137019, 1225230300),
+                    mapOf(x to 8u, y to 3u) to Rational(156695935643, 31505922),
+                    mapOf(y to 4u) to Rational(18362364269, 1008000),
+                    mapOf(x to 1u, y to 4u) to Rational(955674858553, 10584000),
+                    mapOf(x to 2u, y to 4u) to Rational(-71937470607371, 444528000),
+                    mapOf(x to 3u, y to 4u) to Rational(-34097985615163, 95256000),
+                    mapOf(x to 4u, y to 4u) to Rational(-340736178775883, 2000376000),
+                    mapOf(x to 5u, y to 4u) to Rational(-511324523441897, 10501974000),
+                    mapOf(x to 6u, y to 4u) to Rational(-125375649409151, 8821658160),
+                    mapOf(x to 7u, y to 4u) to Rational(-2813518533421, 1575296100),
+                    mapOf(x to 8u, y to 4u) to Rational(-17044089109, 5250987),
+                    mapOf(y to 5u) to Rational(600086461, 20160),
+                    mapOf(x to 1u, y to 5u) to Rational(-18959931367, 423360),
+                    mapOf(x to 2u, y to 5u) to Rational(-9178804929607, 44452800),
+                    mapOf(x to 3u, y to 5u) to Rational(-1460114275979, 5334336),
+                    mapOf(x to 4u, y to 5u) to Rational(-342533479090169, 4200789600),
+                    mapOf(x to 5u, y to 5u) to Rational(20335453022963, 4200789600),
+                    mapOf(x to 6u, y to 5u) to Rational(-21649775090197, 6301184400),
+                    mapOf(x to 7u, y to 5u) to Rational(-197301716069, 131274675),
+                    mapOf(x to 8u, y to 5u) to Rational(18711357470, 15752961),
+                    mapOf(y to 6u) to Rational(621417991, 100800),
+                    mapOf(x to 1u, y to 6u) to Rational(-159236792977, 2116800),
+                    mapOf(x to 2u, y to 6u) to Rational(-6602528890883, 66679200),
+                    mapOf(x to 3u, y to 6u) to Rational(-1086091664047, 19051200),
+                    mapOf(x to 4u, y to 6u) to Rational(3769375009003, 1680315840),
+                    mapOf(x to 5u, y to 6u) to Rational(-12920385574769, 1050197400),
+                    mapOf(x to 6u, y to 6u) to Rational(-90219591809287, 6301184400),
+                    mapOf(x to 7u, y to 6u) to Rational(656361553391, 1575296100),
+                    mapOf(x to 8u, y to 6u) to Rational(757900793, 2250423),
+                    mapOf(y to 7u) to Rational(-100770017, 15120),
+                    mapOf(x to 1u, y to 7u) to Rational(-316364851, 17640),
+                    mapOf(x to 2u, y to 7u) to Rational(-85118560057, 6667920),
+                    mapOf(x to 3u, y to 7u) to Rational(6286563719, 416745),
+                    mapOf(x to 4u, y to 7u) to Rational(26803885301, 1714608),
+                    mapOf(x to 5u, y to 7u) to Rational(-13767154393, 4286520),
+                    mapOf(x to 6u, y to 7u) to Rational(-3875138933, 1224720),
+                    mapOf(x to 7u, y to 7u) to Rational(65193755, 333396),
+                    mapOf(x to 8u, y to 7u) to Rational(90974351, 2500470),
+                    mapOf(y to 8u) to Rational(-3182197, 1260),
+                    mapOf(x to 1u, y to 8u) to Rational(24899923, 8820),
+                    mapOf(x to 2u, y to 8u) to Rational(-19999556, 19845),
+                    mapOf(x to 3u, y to 8u) to Rational(3276587, 3969),
+                    mapOf(x to 4u, y to 8u) to Rational(13719549239, 5000940),
+                    mapOf(x to 5u, y to 8u) to Rational(-961839938, 1250235),
+                    mapOf(x to 6u, y to 8u) to Rational(-198184871, 833490),
+                    mapOf(x to 7u, y to 8u) to Rational(230659711, 5000940),
+                    mapOf(x to 8u, y to 8u) to Rational(292447, 35721)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(9, 100),
+                    mapOf(x to 1u) to Rational(-21, 50),
+                    mapOf(x to 2u) to Rational(293, 700),
+                    mapOf(x to 3u) to Rational(29, 210),
+                    mapOf(x to 4u) to Rational(3233, 8820),
+                    mapOf(x to 5u) to Rational(-289, 441),
+                    mapOf(x to 6u) to Rational(-1, 9),
+                    mapOf(x to 7u) to Rational(-20, 441),
+                    mapOf(x to 8u) to Rational(100, 441),
+                    mapOf(y to 1u) to Rational(-57, 80),
+                    mapOf(x to 1u, y to 1u) to Rational(-121, 400),
+                    mapOf(x to 2u, y to 1u) to Rational(37117, 8400),
+                    mapOf(x to 3u, y to 1u) to Rational(-4853, 3150),
+                    mapOf(x to 4u, y to 1u) to Rational(1166203, 132300),
+                    mapOf(x to 5u, y to 1u) to Rational(-2708, 567),
+                    mapOf(x to 6u, y to 1u) to Rational(-287159, 416745),
+                    mapOf(x to 7u, y to 1u) to Rational(-478204, 83349),
+                    mapOf(x to 8u, y to 1u) to Rational(176320, 83349),
+                    mapOf(y to 2u) to Rational(-6239, 6400),
+                    mapOf(x to 1u, y to 2u) to Rational(264211, 11200),
+                    mapOf(x to 2u, y to 2u) to Rational(-1591999, 100800),
+                    mapOf(x to 3u, y to 2u) to Rational(12450091, 529200),
+                    mapOf(x to 4u, y to 2u) to Rational(9230759, 226800),
+                    mapOf(x to 5u, y to 2u) to Rational(18995554, 2083725),
+                    mapOf(x to 6u, y to 2u) to Rational(136706258, 6251175),
+                    mapOf(x to 7u, y to 2u) to Rational(-120907496, 3750705),
+                    mapOf(x to 8u, y to 2u) to Rational(117200176, 15752961),
+                    mapOf(y to 3u) to Rational(5653, 320),
+                    mapOf(x to 1u, y to 3u) to Rational(-130853, 8400),
+                    mapOf(x to 2u, y to 3u) to Rational(-20939327, 151200),
+                    mapOf(x to 3u, y to 3u) to Rational(2566691, 25200),
+                    mapOf(x to 4u, y to 3u) to Rational(-68441519, 476280),
+                    mapOf(x to 5u, y to 3u) to Rational(2462904247, 12502350),
+                    mapOf(x to 6u, y to 3u) to Rational(353667161, 18753525),
+                    mapOf(x to 7u, y to 3u) to Rational(-1689134372, 26254935),
+                    mapOf(x to 8u, y to 3u) to Rational(35084104, 2250423),
+                    mapOf(y to 4u) to Rational(-3587, 300),
+                    mapOf(x to 1u, y to 4u) to Rational(-10513243, 33600),
+                    mapOf(x to 2u, y to 4u) to Rational(30766733, 176400),
+                    mapOf(x to 3u, y to 4u) to Rational(-65680021, 198450),
+                    mapOf(x to 4u, y to 4u) to Rational(-8108910547, 20003760),
+                    mapOf(x to 5u, y to 4u) to Rational(2922125159, 6251175),
+                    mapOf(x to 6u, y to 4u) to Rational(-4245279943, 131274675),
+                    mapOf(x to 7u, y to 4u) to Rational(-371946872, 3750705),
+                    mapOf(x to 8u, y to 4u) to Rational(61286752, 2250423),
+                    mapOf(y to 5u) to Rational(-20477, 160),
+                    mapOf(x to 1u, y to 5u) to Rational(215741, 1120),
+                    mapOf(x to 2u, y to 5u) to Rational(30785843, 31752),
+                    mapOf(x to 3u, y to 5u) to Rational(-357495959, 317520),
+                    mapOf(x to 4u, y to 5u) to Rational(-1611242993, 10001880),
+                    mapOf(x to 5u, y to 5u) to Rational(345925495, 500094),
+                    mapOf(x to 6u, y to 5u) to Rational(-755948411, 3750705),
+                    mapOf(x to 7u, y to 5u) to Rational(-108643496, 1250235),
+                    mapOf(x to 8u, y to 5u) to Rational(1122512, 35721),
+                    mapOf(y to 6u) to Rational(358037, 2880),
+                    mapOf(x to 1u, y to 6u) to Rational(3895837, 3360),
+                    mapOf(x to 2u, y to 6u) to Rational(359419201, 1270080),
+                    mapOf(x to 3u, y to 6u) to Rational(-158522587, 105840),
+                    mapOf(x to 4u, y to 6u) to Rational(10909002599, 20003760),
+                    mapOf(x to 5u, y to 6u) to Rational(76846972, 138915),
+                    mapOf(x to 6u, y to 6u) to Rational(-327696553, 1250235),
+                    mapOf(x to 7u, y to 6u) to Rational(-1687328, 35721),
+                    mapOf(x to 8u, y to 6u) to Rational(1016836, 35721),
+                    mapOf(y to 7u) to Rational(658, 3),
+                    mapOf(x to 1u, y to 7u) to Rational(48035, 168),
+                    mapOf(x to 2u, y to 7u) to Rational(-5777875, 5292),
+                    mapOf(x to 3u, y to 7u) to Rational(-7893899, 10584),
+                    mapOf(x to 4u, y to 7u) to Rational(10191652, 11907),
+                    mapOf(x to 5u, y to 7u) to Rational(2920121, 23814),
+                    mapOf(x to 6u, y to 7u) to Rational(-2699780, 11907),
+                    mapOf(x to 7u, y to 7u) to Rational(4556, 441),
+                    mapOf(x to 8u, y to 7u) to Rational(3440, 189),
+                    mapOf(y to 8u) to Rational(64, 1),
+                    mapOf(x to 1u, y to 8u) to Rational(-808, 7),
+                    mapOf(x to 2u, y to 8u) to Rational(-360895, 1764),
+                    mapOf(x to 3u, y to 8u) to Rational(257657, 882),
+                    mapOf(x to 4u, y to 8u) to Rational(3779917, 15876),
+                    mapOf(x to 5u, y to 8u) to Rational(-610279, 3969),
+                    mapOf(x to 6u, y to 8u) to Rational(-25091, 441),
+                    mapOf(x to 7u, y to 8u) to Rational(9560, 567),
+                    mapOf(x to 8u, y to 8u) to Rational(400, 81)
+                )
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(15, 7),
+                mapOf(x to 1u) to Rational(1, 5),
+                mapOf(x to 2u) to Rational(-7, 4),
+                mapOf(y to 1u) to Rational(-1, 9),
+                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
+                mapOf(x to 2u, y to 1u) to Rational(17, 3),
+                mapOf(y to 2u) to Rational(2, 6),
+                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                x to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(17, 5),
+                        mapOf(x to 1u) to Rational(11, 6),
+                        mapOf(x to 2u) to Rational(14, 3),
+                        mapOf(y to 1u) to Rational(17, 1),
+                        mapOf(x to 1u, y to 1u) to Rational(12, 3),
+                        mapOf(x to 2u, y to 1u) to Rational(-6, 2),
+                        mapOf(y to 2u) to Rational(17, 1),
+                        mapOf(x to 1u, y to 2u) to Rational(-4, 3),
+                        mapOf(x to 2u, y to 2u) to Rational(2, 6),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(3, 5),
+                        mapOf(x to 1u) to Rational(3, 5),
+                        mapOf(x to 2u) to Rational(3, 7),
+                        mapOf(y to 1u) to Rational(-3, 8),
+                        mapOf(x to 1u, y to 1u) to Rational(-1, 1),
+                        mapOf(x to 2u, y to 1u) to Rational(17, 9),
+                        mapOf(y to 2u) to Rational(-8, 1),
+                        mapOf(x to 1u, y to 2u) to Rational(6, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(10, 9),
+                    )
+                ),
+                y to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(18, 5),
+                        mapOf(x to 1u) to Rational(-17, 5),
+                        mapOf(x to 2u) to Rational(-2, 7),
+                        mapOf(y to 1u) to Rational(6, 5),
+                        mapOf(x to 1u, y to 1u) to Rational(-5, 1),
+                        mapOf(x to 2u, y to 1u) to Rational(-9, 1),
+                        mapOf(y to 2u) to Rational(-8, 8),
+                        mapOf(x to 1u, y to 2u) to Rational(2, 7),
+                        mapOf(x to 2u, y to 2u) to Rational(-13, 7),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-4, 8),
+                        mapOf(x to 1u) to Rational(15, 9),
+                        mapOf(x to 2u) to Rational(-10, 9),
+                        mapOf(y to 1u) to Rational(5, 3),
+                        mapOf(x to 1u, y to 1u) to Rational(4, 1),
+                        mapOf(x to 2u, y to 1u) to Rational(-2, 7),
+                        mapOf(y to 2u) to Rational(2, 2),
+                        mapOf(x to 1u, y to 2u) to Rational(-5, 7),
+                        mapOf(x to 2u, y to 2u) to Rational(-18, 9),
+                    )
+                ),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-6443599, 10000),
+                    mapOf(x to 1u) to Rational(166251223, 210000),
+                    mapOf(x to 2u) to Rational(-4606805099, 3528000),
+                    mapOf(x to 3u) to Rational(51204379, 19600),
+                    mapOf(x to 4u) to Rational(-529045460659, 277830000),
+                    mapOf(x to 5u) to Rational(2630836709, 1488375),
+                    mapOf(x to 6u) to Rational(-42675691369, 25004700),
+                    mapOf(x to 7u) to Rational(495825223, 1250235),
+                    mapOf(x to 8u) to Rational(-22531756, 1750329),
+                    mapOf(y to 1u) to Rational(-2526552797, 420000),
+                    mapOf(x to 1u, y to 1u) to Rational(31108840471, 2520000),
+                    mapOf(x to 2u, y to 1u) to Rational(-4789740847, 1102500),
+                    mapOf(x to 3u, y to 1u) to Rational(186594307807, 11340000),
+                    mapOf(x to 4u, y to 1u) to Rational(-11677815943, 1488375),
+                    mapOf(x to 5u, y to 1u) to Rational(-181118486447, 27783000),
+                    mapOf(x to 6u, y to 1u) to Rational(-16123292162, 14586075),
+                    mapOf(x to 7u, y to 1u) to Rational(-140339343808, 26254935),
+                    mapOf(x to 8u, y to 1u) to Rational(4570171616, 5250987),
+                    mapOf(y to 2u) to Rational(-181436530573, 10080000),
+                    mapOf(x to 1u, y to 2u) to Rational(6700437957491, 105840000),
+                    mapOf(x to 2u, y to 2u) to Rational(-3527267461, 1417500),
+                    mapOf(x to 3u, y to 2u) to Rational(-38084563451, 5556600),
+                    mapOf(x to 4u, y to 2u) to Rational(-565662040631, 13891500),
+                    mapOf(x to 5u, y to 2u) to Rational(-35479071126397, 583443000),
+                    mapOf(x to 6u, y to 2u) to Rational(-11717559078469, 525098700),
+                    mapOf(x to 7u, y to 2u) to Rational(-2043385293517, 225042300),
+                    mapOf(x to 8u, y to 2u) to Rational(-3644439630451, 551353635),
+                    mapOf(y to 3u) to Rational(-1760423269, 126000),
+                    mapOf(x to 1u, y to 3u) to Rational(310176758299, 2352000),
+                    mapOf(x to 2u, y to 3u) to Rational(-907229584837, 21168000),
+                    mapOf(x to 3u, y to 3u) to Rational(-16717135885963, 95256000),
+                    mapOf(x to 4u, y to 3u) to Rational(-43762928025353, 333396000),
+                    mapOf(x to 5u, y to 3u) to Rational(-328427480571607, 3000564000),
+                    mapOf(x to 6u, y to 3u) to Rational(-7722675917197, 210039480),
+                    mapOf(x to 7u, y to 3u) to Rational(1713350137019, 1225230300),
+                    mapOf(x to 8u, y to 3u) to Rational(156695935643, 31505922),
+                    mapOf(y to 4u) to Rational(18362364269, 1008000),
+                    mapOf(x to 1u, y to 4u) to Rational(955674858553, 10584000),
+                    mapOf(x to 2u, y to 4u) to Rational(-71937470607371, 444528000),
+                    mapOf(x to 3u, y to 4u) to Rational(-34097985615163, 95256000),
+                    mapOf(x to 4u, y to 4u) to Rational(-340736178775883, 2000376000),
+                    mapOf(x to 5u, y to 4u) to Rational(-511324523441897, 10501974000),
+                    mapOf(x to 6u, y to 4u) to Rational(-125375649409151, 8821658160),
+                    mapOf(x to 7u, y to 4u) to Rational(-2813518533421, 1575296100),
+                    mapOf(x to 8u, y to 4u) to Rational(-17044089109, 5250987),
+                    mapOf(y to 5u) to Rational(600086461, 20160),
+                    mapOf(x to 1u, y to 5u) to Rational(-18959931367, 423360),
+                    mapOf(x to 2u, y to 5u) to Rational(-9178804929607, 44452800),
+                    mapOf(x to 3u, y to 5u) to Rational(-1460114275979, 5334336),
+                    mapOf(x to 4u, y to 5u) to Rational(-342533479090169, 4200789600),
+                    mapOf(x to 5u, y to 5u) to Rational(20335453022963, 4200789600),
+                    mapOf(x to 6u, y to 5u) to Rational(-21649775090197, 6301184400),
+                    mapOf(x to 7u, y to 5u) to Rational(-197301716069, 131274675),
+                    mapOf(x to 8u, y to 5u) to Rational(18711357470, 15752961),
+                    mapOf(y to 6u) to Rational(621417991, 100800),
+                    mapOf(x to 1u, y to 6u) to Rational(-159236792977, 2116800),
+                    mapOf(x to 2u, y to 6u) to Rational(-6602528890883, 66679200),
+                    mapOf(x to 3u, y to 6u) to Rational(-1086091664047, 19051200),
+                    mapOf(x to 4u, y to 6u) to Rational(3769375009003, 1680315840),
+                    mapOf(x to 5u, y to 6u) to Rational(-12920385574769, 1050197400),
+                    mapOf(x to 6u, y to 6u) to Rational(-90219591809287, 6301184400),
+                    mapOf(x to 7u, y to 6u) to Rational(656361553391, 1575296100),
+                    mapOf(x to 8u, y to 6u) to Rational(757900793, 2250423),
+                    mapOf(y to 7u) to Rational(-100770017, 15120),
+                    mapOf(x to 1u, y to 7u) to Rational(-316364851, 17640),
+                    mapOf(x to 2u, y to 7u) to Rational(-85118560057, 6667920),
+                    mapOf(x to 3u, y to 7u) to Rational(6286563719, 416745),
+                    mapOf(x to 4u, y to 7u) to Rational(26803885301, 1714608),
+                    mapOf(x to 5u, y to 7u) to Rational(-13767154393, 4286520),
+                    mapOf(x to 6u, y to 7u) to Rational(-3875138933, 1224720),
+                    mapOf(x to 7u, y to 7u) to Rational(65193755, 333396),
+                    mapOf(x to 8u, y to 7u) to Rational(90974351, 2500470),
+                    mapOf(y to 8u) to Rational(-3182197, 1260),
+                    mapOf(x to 1u, y to 8u) to Rational(24899923, 8820),
+                    mapOf(x to 2u, y to 8u) to Rational(-19999556, 19845),
+                    mapOf(x to 3u, y to 8u) to Rational(3276587, 3969),
+                    mapOf(x to 4u, y to 8u) to Rational(13719549239, 5000940),
+                    mapOf(x to 5u, y to 8u) to Rational(-961839938, 1250235),
+                    mapOf(x to 6u, y to 8u) to Rational(-198184871, 833490),
+                    mapOf(x to 7u, y to 8u) to Rational(230659711, 5000940),
+                    mapOf(x to 8u, y to 8u) to Rational(292447, 35721)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(9, 100),
+                    mapOf(x to 1u) to Rational(-21, 50),
+                    mapOf(x to 2u) to Rational(293, 700),
+                    mapOf(x to 3u) to Rational(29, 210),
+                    mapOf(x to 4u) to Rational(3233, 8820),
+                    mapOf(x to 5u) to Rational(-289, 441),
+                    mapOf(x to 6u) to Rational(-1, 9),
+                    mapOf(x to 7u) to Rational(-20, 441),
+                    mapOf(x to 8u) to Rational(100, 441),
+                    mapOf(y to 1u) to Rational(-57, 80),
+                    mapOf(x to 1u, y to 1u) to Rational(-121, 400),
+                    mapOf(x to 2u, y to 1u) to Rational(37117, 8400),
+                    mapOf(x to 3u, y to 1u) to Rational(-4853, 3150),
+                    mapOf(x to 4u, y to 1u) to Rational(1166203, 132300),
+                    mapOf(x to 5u, y to 1u) to Rational(-2708, 567),
+                    mapOf(x to 6u, y to 1u) to Rational(-287159, 416745),
+                    mapOf(x to 7u, y to 1u) to Rational(-478204, 83349),
+                    mapOf(x to 8u, y to 1u) to Rational(176320, 83349),
+                    mapOf(y to 2u) to Rational(-6239, 6400),
+                    mapOf(x to 1u, y to 2u) to Rational(264211, 11200),
+                    mapOf(x to 2u, y to 2u) to Rational(-1591999, 100800),
+                    mapOf(x to 3u, y to 2u) to Rational(12450091, 529200),
+                    mapOf(x to 4u, y to 2u) to Rational(9230759, 226800),
+                    mapOf(x to 5u, y to 2u) to Rational(18995554, 2083725),
+                    mapOf(x to 6u, y to 2u) to Rational(136706258, 6251175),
+                    mapOf(x to 7u, y to 2u) to Rational(-120907496, 3750705),
+                    mapOf(x to 8u, y to 2u) to Rational(117200176, 15752961),
+                    mapOf(y to 3u) to Rational(5653, 320),
+                    mapOf(x to 1u, y to 3u) to Rational(-130853, 8400),
+                    mapOf(x to 2u, y to 3u) to Rational(-20939327, 151200),
+                    mapOf(x to 3u, y to 3u) to Rational(2566691, 25200),
+                    mapOf(x to 4u, y to 3u) to Rational(-68441519, 476280),
+                    mapOf(x to 5u, y to 3u) to Rational(2462904247, 12502350),
+                    mapOf(x to 6u, y to 3u) to Rational(353667161, 18753525),
+                    mapOf(x to 7u, y to 3u) to Rational(-1689134372, 26254935),
+                    mapOf(x to 8u, y to 3u) to Rational(35084104, 2250423),
+                    mapOf(y to 4u) to Rational(-3587, 300),
+                    mapOf(x to 1u, y to 4u) to Rational(-10513243, 33600),
+                    mapOf(x to 2u, y to 4u) to Rational(30766733, 176400),
+                    mapOf(x to 3u, y to 4u) to Rational(-65680021, 198450),
+                    mapOf(x to 4u, y to 4u) to Rational(-8108910547, 20003760),
+                    mapOf(x to 5u, y to 4u) to Rational(2922125159, 6251175),
+                    mapOf(x to 6u, y to 4u) to Rational(-4245279943, 131274675),
+                    mapOf(x to 7u, y to 4u) to Rational(-371946872, 3750705),
+                    mapOf(x to 8u, y to 4u) to Rational(61286752, 2250423),
+                    mapOf(y to 5u) to Rational(-20477, 160),
+                    mapOf(x to 1u, y to 5u) to Rational(215741, 1120),
+                    mapOf(x to 2u, y to 5u) to Rational(30785843, 31752),
+                    mapOf(x to 3u, y to 5u) to Rational(-357495959, 317520),
+                    mapOf(x to 4u, y to 5u) to Rational(-1611242993, 10001880),
+                    mapOf(x to 5u, y to 5u) to Rational(345925495, 500094),
+                    mapOf(x to 6u, y to 5u) to Rational(-755948411, 3750705),
+                    mapOf(x to 7u, y to 5u) to Rational(-108643496, 1250235),
+                    mapOf(x to 8u, y to 5u) to Rational(1122512, 35721),
+                    mapOf(y to 6u) to Rational(358037, 2880),
+                    mapOf(x to 1u, y to 6u) to Rational(3895837, 3360),
+                    mapOf(x to 2u, y to 6u) to Rational(359419201, 1270080),
+                    mapOf(x to 3u, y to 6u) to Rational(-158522587, 105840),
+                    mapOf(x to 4u, y to 6u) to Rational(10909002599, 20003760),
+                    mapOf(x to 5u, y to 6u) to Rational(76846972, 138915),
+                    mapOf(x to 6u, y to 6u) to Rational(-327696553, 1250235),
+                    mapOf(x to 7u, y to 6u) to Rational(-1687328, 35721),
+                    mapOf(x to 8u, y to 6u) to Rational(1016836, 35721),
+                    mapOf(y to 7u) to Rational(658, 3),
+                    mapOf(x to 1u, y to 7u) to Rational(48035, 168),
+                    mapOf(x to 2u, y to 7u) to Rational(-5777875, 5292),
+                    mapOf(x to 3u, y to 7u) to Rational(-7893899, 10584),
+                    mapOf(x to 4u, y to 7u) to Rational(10191652, 11907),
+                    mapOf(x to 5u, y to 7u) to Rational(2920121, 23814),
+                    mapOf(x to 6u, y to 7u) to Rational(-2699780, 11907),
+                    mapOf(x to 7u, y to 7u) to Rational(4556, 441),
+                    mapOf(x to 8u, y to 7u) to Rational(3440, 189),
+                    mapOf(y to 8u) to Rational(64, 1),
+                    mapOf(x to 1u, y to 8u) to Rational(-808, 7),
+                    mapOf(x to 2u, y to 8u) to Rational(-360895, 1764),
+                    mapOf(x to 3u, y to 8u) to Rational(257657, 882),
+                    mapOf(x to 4u, y to 8u) to Rational(3779917, 15876),
+                    mapOf(x to 5u, y to 8u) to Rational(-610279, 3969),
+                    mapOf(x to 6u, y to 8u) to Rational(-25091, 441),
+                    mapOf(x to 7u, y to 8u) to Rational(9560, 567),
+                    mapOf(x to 8u, y to 8u) to Rational(400, 81)
+                )
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(15, 7),
+                mapOf(x to 1u) to Rational(1, 5),
+                mapOf(x to 2u) to Rational(-7, 4),
+                mapOf(y to 1u) to Rational(-1, 9),
+                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
+                mapOf(x to 2u, y to 1u) to Rational(17, 3),
+                mapOf(y to 2u) to Rational(2, 6),
+                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                x to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(17, 5),
+                        mapOf(x to 1u) to Rational(11, 6),
+                        mapOf(x to 2u) to Rational(14, 3),
+                        mapOf(y to 1u) to Rational(17, 1),
+                        mapOf(x to 1u, y to 1u) to Rational(12, 3),
+                        mapOf(x to 2u, y to 1u) to Rational(-6, 2),
+                        mapOf(y to 2u) to Rational(17, 1),
+                        mapOf(x to 1u, y to 2u) to Rational(-4, 3),
+                        mapOf(x to 2u, y to 2u) to Rational(2, 6),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(3, 5),
+                        mapOf(x to 1u) to Rational(3, 5),
+                        mapOf(x to 2u) to Rational(3, 7),
+                        mapOf(y to 1u) to Rational(-3, 8),
+                        mapOf(x to 1u, y to 1u) to Rational(-1, 1),
+                        mapOf(x to 2u, y to 1u) to Rational(17, 9),
+                        mapOf(y to 2u) to Rational(-8, 1),
+                        mapOf(x to 1u, y to 2u) to Rational(6, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(10, 9),
+                    )
+                ),
+                y to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(18, 5),
+                        mapOf(x to 1u) to Rational(-17, 5),
+                        mapOf(x to 2u) to Rational(-2, 7),
+                        mapOf(y to 1u) to Rational(6, 5),
+                        mapOf(x to 1u, y to 1u) to Rational(-5, 1),
+                        mapOf(x to 2u, y to 1u) to Rational(-9, 1),
+                        mapOf(y to 2u) to Rational(-8, 8),
+                        mapOf(x to 1u, y to 2u) to Rational(2, 7),
+                        mapOf(x to 2u, y to 2u) to Rational(-13, 7),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-4, 8),
+                        mapOf(x to 1u) to Rational(15, 9),
+                        mapOf(x to 2u) to Rational(-10, 9),
+                        mapOf(y to 1u) to Rational(5, 3),
+                        mapOf(x to 1u, y to 1u) to Rational(4, 1),
+                        mapOf(x to 2u, y to 1u) to Rational(-2, 7),
+                        mapOf(y to 2u) to Rational(2, 2),
+                        mapOf(x to 1u, y to 2u) to Rational(-5, 7),
+                        mapOf(x to 2u, y to 2u) to Rational(-18, 9),
+                    )
+                ),
+                iota to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-2, 9),
+                        mapOf(x to 1u) to Rational(-6, 3),
+                        mapOf(x to 2u) to Rational(10, 9),
+                        mapOf(y to 1u) to Rational(13, 3),
+                        mapOf(x to 1u, y to 1u) to Rational(-12, 4),
+                        mapOf(x to 2u, y to 1u) to Rational(3, 6),
+                        mapOf(y to 2u) to Rational(2, 9),
+                        mapOf(x to 1u, y to 2u) to Rational(7, 3),
+                        mapOf(x to 2u, y to 2u) to Rational(16, 5),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-6, 2),
+                        mapOf(x to 1u) to Rational(6, 2),
+                        mapOf(x to 2u) to Rational(2, 7),
+                        mapOf(y to 1u) to Rational(-18, 1),
+                        mapOf(x to 1u, y to 1u) to Rational(-11, 3),
+                        mapOf(x to 2u, y to 1u) to Rational(7, 5),
+                        mapOf(y to 2u) to Rational(8, 1),
+                        mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                        mapOf(x to 2u, y to 2u) to Rational(17, 4),
+                    )
+                )
+            )),
+            "test 3'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-66677, 3500),
+                    mapOf(x to 1u) to Rational(-206281, 10500),
+                    mapOf(x to 2u) to Rational(-412567, 7056),
+                    mapOf(x to 3u) to Rational(-310081, 11025),
+                    mapOf(x to 4u) to Rational(-575996, 15435),
+                    mapOf(y to 1u) to Rational(-573701, 4200),
+                    mapOf(x to 1u, y to 1u) to Rational(-2239001, 25200),
+                    mapOf(x to 2u, y to 1u) to Rational(-8817889, 132300),
+                    mapOf(x to 3u, y to 1u) to Rational(2317919, 44100),
+                    mapOf(x to 4u, y to 1u) to Rational(1169471, 6615),
+                    mapOf(y to 2u) to Rational(-4057819, 33600),
+                    mapOf(x to 1u, y to 2u) to Rational(1373311, 12600),
+                    mapOf(x to 2u, y to 2u) to Rational(32433493, 52920),
+                    mapOf(x to 3u, y to 2u) to Rational(4998053, 33075),
+                    mapOf(x to 4u, y to 2u) to Rational(-2147779, 8820),
+                    mapOf(y to 3u) to Rational(2018481, 2240),
+                    mapOf(x to 1u, y to 3u) to Rational(941713, 1440),
+                    mapOf(x to 2u, y to 3u) to Rational(183749, 6615),
+                    mapOf(x to 3u, y to 3u) to Rational(-4631023, 15876),
+                    mapOf(x to 4u, y to 3u) to Rational(25609336, 178605),
+                    mapOf(y to 4u) to Rational(11886431, 6720),
+                    mapOf(x to 1u, y to 4u) to Rational(18433, 504),
+                    mapOf(x to 2u, y to 4u) to Rational(-39613331, 45360),
+                    mapOf(x to 3u, y to 4u) to Rational(681619, 5670),
+                    mapOf(x to 4u, y to 4u) to Rational(-864841, 20412),
+                    mapOf(y to 5u) to Rational(343535, 1008),
+                    mapOf(x to 1u, y to 5u) to Rational(-33583, 72),
+                    mapOf(x to 2u, y to 5u) to Rational(1194625, 9072),
+                    mapOf(x to 3u, y to 5u) to Rational(-62917, 2268),
+                    mapOf(x to 4u, y to 5u) to Rational(157645, 10206),
+                    mapOf(y to 6u) to Rational(-1381, 3),
+                    mapOf(x to 1u, y to 6u) to Rational(919, 36),
+                    mapOf(x to 2u, y to 6u) to Rational(-3053, 36),
+                    mapOf(x to 3u, y to 6u) to Rational(2125, 324),
+                    mapOf(x to 4u, y to 6u) to Rational(-236, 243)
+                ),
+                LabeledPolynomialAsIs(mapOf<Symbol, UInt>() to Rational(0, 1),
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-5, 3),
+                    mapOf(x to 2u) to Rational(35, 9),
+                    mapOf(x to 3u) to Rational(-100, 27),
+                    mapOf(x to 4u) to Rational(100, 81),
+                    mapOf(y to 1u) to Rational(-5, 3),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 9),
+                    mapOf(x to 2u, y to 1u) to Rational(1874, 189),
+                    mapOf(x to 3u, y to 1u) to Rational(-620, 63),
+                    mapOf(x to 4u, y to 1u) to Rational(40, 63),
+                    mapOf(y to 2u) to Rational(16, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(365, 21),
+                    mapOf(x to 2u, y to 2u) to Rational(112, 9),
+                    mapOf(x to 3u, y to 2u) to Rational(-464, 63),
+                    mapOf(x to 4u, y to 2u) to Rational(1996, 441),
+                    mapOf(y to 3u) to Rational(10, 3),
+                    mapOf(x to 1u, y to 3u) to Rational(118, 21),
+                    mapOf(x to 2u, y to 3u) to Rational(-272, 21),
+                    mapOf(x to 3u, y to 3u) to Rational(-764, 49),
+                    mapOf(x to 4u, y to 3u) to Rational(8, 7),
+                    mapOf(y to 4u) to Rational(1, 1),
+                    mapOf(x to 1u, y to 4u) to Rational(-10, 7),
+                    mapOf(x to 2u, y to 4u) to Rational(-171, 49),
+                    mapOf(x to 3u, y to 4u) to Rational(20, 7),
+                    mapOf(x to 4u, y to 4u) to Rational(4, 1)
+                )
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(15, 7),
+                mapOf(x to 1u) to Rational(1, 5),
+                mapOf(x to 2u) to Rational(-7, 4),
+                mapOf(y to 1u) to Rational(-1, 9),
+                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
+                mapOf(x to 2u, y to 1u) to Rational(17, 3),
+                mapOf(y to 2u) to Rational(2, 6),
+                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                x to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(17, 5),
+                        mapOf(x to 1u) to Rational(11, 6),
+                        mapOf(x to 2u) to Rational(14, 3),
+                        mapOf(y to 1u) to Rational(17, 1),
+                        mapOf(x to 1u, y to 1u) to Rational(12, 3),
+                        mapOf(x to 2u, y to 1u) to Rational(-6, 2),
+                        mapOf(y to 2u) to Rational(17, 1),
+                        mapOf(x to 1u, y to 2u) to Rational(-4, 3),
+                        mapOf(x to 2u, y to 2u) to Rational(2, 6),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(3, 5),
+                        mapOf(x to 1u) to Rational(3, 5),
+                        mapOf(x to 2u) to Rational(3, 7),
+                        mapOf(y to 1u) to Rational(-3, 8),
+                        mapOf(x to 1u, y to 1u) to Rational(-1, 1),
+                        mapOf(x to 2u, y to 1u) to Rational(17, 9),
+                        mapOf(y to 2u) to Rational(-8, 1),
+                        mapOf(x to 1u, y to 2u) to Rational(6, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(10, 9),
+                    )
+                ),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-66677, 3500),
+                    mapOf(x to 1u) to Rational(-206281, 10500),
+                    mapOf(x to 2u) to Rational(-412567, 7056),
+                    mapOf(x to 3u) to Rational(-310081, 11025),
+                    mapOf(x to 4u) to Rational(-575996, 15435),
+                    mapOf(y to 1u) to Rational(-573701, 4200),
+                    mapOf(x to 1u, y to 1u) to Rational(-2239001, 25200),
+                    mapOf(x to 2u, y to 1u) to Rational(-8817889, 132300),
+                    mapOf(x to 3u, y to 1u) to Rational(2317919, 44100),
+                    mapOf(x to 4u, y to 1u) to Rational(1169471, 6615),
+                    mapOf(y to 2u) to Rational(-4057819, 33600),
+                    mapOf(x to 1u, y to 2u) to Rational(1373311, 12600),
+                    mapOf(x to 2u, y to 2u) to Rational(32433493, 52920),
+                    mapOf(x to 3u, y to 2u) to Rational(4998053, 33075),
+                    mapOf(x to 4u, y to 2u) to Rational(-2147779, 8820),
+                    mapOf(y to 3u) to Rational(2018481, 2240),
+                    mapOf(x to 1u, y to 3u) to Rational(941713, 1440),
+                    mapOf(x to 2u, y to 3u) to Rational(183749, 6615),
+                    mapOf(x to 3u, y to 3u) to Rational(-4631023, 15876),
+                    mapOf(x to 4u, y to 3u) to Rational(25609336, 178605),
+                    mapOf(y to 4u) to Rational(11886431, 6720),
+                    mapOf(x to 1u, y to 4u) to Rational(18433, 504),
+                    mapOf(x to 2u, y to 4u) to Rational(-39613331, 45360),
+                    mapOf(x to 3u, y to 4u) to Rational(681619, 5670),
+                    mapOf(x to 4u, y to 4u) to Rational(-864841, 20412),
+                    mapOf(y to 5u) to Rational(343535, 1008),
+                    mapOf(x to 1u, y to 5u) to Rational(-33583, 72),
+                    mapOf(x to 2u, y to 5u) to Rational(1194625, 9072),
+                    mapOf(x to 3u, y to 5u) to Rational(-62917, 2268),
+                    mapOf(x to 4u, y to 5u) to Rational(157645, 10206),
+                    mapOf(y to 6u) to Rational(-1381, 3),
+                    mapOf(x to 1u, y to 6u) to Rational(919, 36),
+                    mapOf(x to 2u, y to 6u) to Rational(-3053, 36),
+                    mapOf(x to 3u, y to 6u) to Rational(2125, 324),
+                    mapOf(x to 4u, y to 6u) to Rational(-236, 243)
+                ),
+                LabeledPolynomialAsIs(mapOf<Symbol, UInt>() to Rational(0, 1),
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-5, 3),
+                    mapOf(x to 2u) to Rational(35, 9),
+                    mapOf(x to 3u) to Rational(-100, 27),
+                    mapOf(x to 4u) to Rational(100, 81),
+                    mapOf(y to 1u) to Rational(-5, 3),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 9),
+                    mapOf(x to 2u, y to 1u) to Rational(1874, 189),
+                    mapOf(x to 3u, y to 1u) to Rational(-620, 63),
+                    mapOf(x to 4u, y to 1u) to Rational(40, 63),
+                    mapOf(y to 2u) to Rational(16, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(365, 21),
+                    mapOf(x to 2u, y to 2u) to Rational(112, 9),
+                    mapOf(x to 3u, y to 2u) to Rational(-464, 63),
+                    mapOf(x to 4u, y to 2u) to Rational(1996, 441),
+                    mapOf(y to 3u) to Rational(10, 3),
+                    mapOf(x to 1u, y to 3u) to Rational(118, 21),
+                    mapOf(x to 2u, y to 3u) to Rational(-272, 21),
+                    mapOf(x to 3u, y to 3u) to Rational(-764, 49),
+                    mapOf(x to 4u, y to 3u) to Rational(8, 7),
+                    mapOf(y to 4u) to Rational(1, 1),
+                    mapOf(x to 1u, y to 4u) to Rational(-10, 7),
+                    mapOf(x to 2u, y to 4u) to Rational(-171, 49),
+                    mapOf(x to 3u, y to 4u) to Rational(20, 7),
+                    mapOf(x to 4u, y to 4u) to Rational(4, 1)
+                )
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(15, 7),
+                mapOf(x to 1u) to Rational(1, 5),
+                mapOf(x to 2u) to Rational(-7, 4),
+                mapOf(y to 1u) to Rational(-1, 9),
+                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
+                mapOf(x to 2u, y to 1u) to Rational(17, 3),
+                mapOf(y to 2u) to Rational(2, 6),
+                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                x to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(17, 5),
+                        mapOf(x to 1u) to Rational(11, 6),
+                        mapOf(x to 2u) to Rational(14, 3),
+                        mapOf(y to 1u) to Rational(17, 1),
+                        mapOf(x to 1u, y to 1u) to Rational(12, 3),
+                        mapOf(x to 2u, y to 1u) to Rational(-6, 2),
+                        mapOf(y to 2u) to Rational(17, 1),
+                        mapOf(x to 1u, y to 2u) to Rational(-4, 3),
+                        mapOf(x to 2u, y to 2u) to Rational(2, 6),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(3, 5),
+                        mapOf(x to 1u) to Rational(3, 5),
+                        mapOf(x to 2u) to Rational(3, 7),
+                        mapOf(y to 1u) to Rational(-3, 8),
+                        mapOf(x to 1u, y to 1u) to Rational(-1, 1),
+                        mapOf(x to 2u, y to 1u) to Rational(17, 9),
+                        mapOf(y to 2u) to Rational(-8, 1),
+                        mapOf(x to 1u, y to 2u) to Rational(6, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(10, 9),
+                    )
+                ),
+                iota to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-2, 9),
+                        mapOf(x to 1u) to Rational(-6, 3),
+                        mapOf(x to 2u) to Rational(10, 9),
+                        mapOf(y to 1u) to Rational(13, 3),
+                        mapOf(x to 1u, y to 1u) to Rational(-12, 4),
+                        mapOf(x to 2u, y to 1u) to Rational(3, 6),
+                        mapOf(y to 2u) to Rational(2, 9),
+                        mapOf(x to 1u, y to 2u) to Rational(7, 3),
+                        mapOf(x to 2u, y to 2u) to Rational(16, 5),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-6, 2),
+                        mapOf(x to 1u) to Rational(6, 2),
+                        mapOf(x to 2u) to Rational(2, 7),
+                        mapOf(y to 1u) to Rational(-18, 1),
+                        mapOf(x to 1u, y to 1u) to Rational(-11, 3),
+                        mapOf(x to 2u, y to 1u) to Rational(7, 5),
+                        mapOf(y to 2u) to Rational(8, 1),
+                        mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                        mapOf(x to 2u, y to 2u) to Rational(17, 4),
+                    )
+                )
+            )),
+            "test 4'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(3539, 700),
+                    mapOf(x to 1u) to Rational(-307079, 6300),
+                    mapOf(x to 2u) to Rational(451609, 15120),
+                    mapOf(x to 3u) to Rational(35287733, 396900),
+                    mapOf(x to 4u) to Rational(-37242617, 396900),
+                    mapOf(x to 5u) to Rational(382747, 19845),
+                    mapOf(x to 6u) to Rational(-2407, 3969),
+                    mapOf(y to 1u) to Rational(-226, 175),
+                    mapOf(x to 1u, y to 1u) to Rational(-74113, 1890),
+                    mapOf(x to 2u, y to 1u) to Rational(250931, 1764),
+                    mapOf(x to 3u, y to 1u) to Rational(30071473, 99225),
+                    mapOf(x to 4u, y to 1u) to Rational(-286466, 1323),
+                    mapOf(x to 5u, y to 1u) to Rational(-2285282, 9261),
+                    mapOf(x to 6u, y to 1u) to Rational(17900, 441),
+                    mapOf(y to 2u) to Rational(3817, 3150),
+                    mapOf(x to 1u, y to 2u) to Rational(577568, 11025),
+                    mapOf(x to 2u, y to 2u) to Rational(9073553, 99225),
+                    mapOf(x to 3u, y to 2u) to Rational(-1415849, 79380),
+                    mapOf(x to 4u, y to 2u) to Rational(-124715629, 277830),
+                    mapOf(x to 5u, y to 2u) to Rational(-1328953, 1890),
+                    mapOf(x to 6u, y to 2u) to Rational(-297148, 1323),
+                    mapOf(y to 3u) to Rational(6043, 945),
+                    mapOf(x to 1u, y to 3u) to Rational(160381, 6615),
+                    mapOf(x to 2u, y to 3u) to Rational(-673249, 13230),
+                    mapOf(x to 3u, y to 3u) to Rational(-319255, 2058),
+                    mapOf(x to 4u, y to 3u) to Rational(-98144, 1029),
+                    mapOf(x to 5u, y to 3u) to Rational(-320239, 5145),
+                    mapOf(x to 6u, y to 3u) to Rational(400, 147),
+                    mapOf(y to 4u) to Rational(163, 63),
+                    mapOf(x to 1u, y to 4u) to Rational(-25183, 4410),
+                    mapOf(x to 2u, y to 4u) to Rational(-21369, 1372),
+                    mapOf(x to 3u, y to 4u) to Rational(127499, 30870),
+                    mapOf(x to 4u, y to 4u) to Rational(86971, 12348),
+                    mapOf(x to 5u, y to 4u) to Rational(-11129, 1470),
+                    mapOf(x to 6u, y to 4u) to Rational(544, 147)
+                ),
+                LabeledPolynomialAsIs(mapOf<Symbol, UInt>() to Rational(0, 1),
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-5, 3),
+                    mapOf(x to 2u) to Rational(35, 9),
+                    mapOf(x to 3u) to Rational(-100, 27),
+                    mapOf(x to 4u) to Rational(100, 81),
+                    mapOf(y to 1u) to Rational(-5, 3),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 9),
+                    mapOf(x to 2u, y to 1u) to Rational(1874, 189),
+                    mapOf(x to 3u, y to 1u) to Rational(-620, 63),
+                    mapOf(x to 4u, y to 1u) to Rational(40, 63),
+                    mapOf(y to 2u) to Rational(16, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(365, 21),
+                    mapOf(x to 2u, y to 2u) to Rational(112, 9),
+                    mapOf(x to 3u, y to 2u) to Rational(-464, 63),
+                    mapOf(x to 4u, y to 2u) to Rational(1996, 441),
+                    mapOf(y to 3u) to Rational(10, 3),
+                    mapOf(x to 1u, y to 3u) to Rational(118, 21),
+                    mapOf(x to 2u, y to 3u) to Rational(-272, 21),
+                    mapOf(x to 3u, y to 3u) to Rational(-764, 49),
+                    mapOf(x to 4u, y to 3u) to Rational(8, 7),
+                    mapOf(y to 4u) to Rational(1, 1),
+                    mapOf(x to 1u, y to 4u) to Rational(-10, 7),
+                    mapOf(x to 2u, y to 4u) to Rational(-171, 49),
+                    mapOf(x to 3u, y to 4u) to Rational(20, 7),
+                    mapOf(x to 4u, y to 4u) to Rational(4, 1)
+                )
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(15, 7),
+                mapOf(x to 1u) to Rational(1, 5),
+                mapOf(x to 2u) to Rational(-7, 4),
+                mapOf(y to 1u) to Rational(-1, 9),
+                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
+                mapOf(x to 2u, y to 1u) to Rational(17, 3),
+                mapOf(y to 2u) to Rational(2, 6),
+                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                y to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(18, 5),
+                        mapOf(x to 1u) to Rational(-17, 5),
+                        mapOf(x to 2u) to Rational(-2, 7),
+                        mapOf(y to 1u) to Rational(6, 5),
+                        mapOf(x to 1u, y to 1u) to Rational(-5, 1),
+                        mapOf(x to 2u, y to 1u) to Rational(-9, 1),
+                        mapOf(y to 2u) to Rational(-8, 8),
+                        mapOf(x to 1u, y to 2u) to Rational(2, 7),
+                        mapOf(x to 2u, y to 2u) to Rational(-13, 7),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-4, 8),
+                        mapOf(x to 1u) to Rational(15, 9),
+                        mapOf(x to 2u) to Rational(-10, 9),
+                        mapOf(y to 1u) to Rational(5, 3),
+                        mapOf(x to 1u, y to 1u) to Rational(4, 1),
+                        mapOf(x to 2u, y to 1u) to Rational(-2, 7),
+                        mapOf(y to 2u) to Rational(2, 2),
+                        mapOf(x to 1u, y to 2u) to Rational(-5, 7),
+                        mapOf(x to 2u, y to 2u) to Rational(-18, 9),
+                    )
+                ),
+            )),
+            "test 5"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(3539, 700),
+                    mapOf(x to 1u) to Rational(-307079, 6300),
+                    mapOf(x to 2u) to Rational(451609, 15120),
+                    mapOf(x to 3u) to Rational(35287733, 396900),
+                    mapOf(x to 4u) to Rational(-37242617, 396900),
+                    mapOf(x to 5u) to Rational(382747, 19845),
+                    mapOf(x to 6u) to Rational(-2407, 3969),
+                    mapOf(y to 1u) to Rational(-226, 175),
+                    mapOf(x to 1u, y to 1u) to Rational(-74113, 1890),
+                    mapOf(x to 2u, y to 1u) to Rational(250931, 1764),
+                    mapOf(x to 3u, y to 1u) to Rational(30071473, 99225),
+                    mapOf(x to 4u, y to 1u) to Rational(-286466, 1323),
+                    mapOf(x to 5u, y to 1u) to Rational(-2285282, 9261),
+                    mapOf(x to 6u, y to 1u) to Rational(17900, 441),
+                    mapOf(y to 2u) to Rational(3817, 3150),
+                    mapOf(x to 1u, y to 2u) to Rational(577568, 11025),
+                    mapOf(x to 2u, y to 2u) to Rational(9073553, 99225),
+                    mapOf(x to 3u, y to 2u) to Rational(-1415849, 79380),
+                    mapOf(x to 4u, y to 2u) to Rational(-124715629, 277830),
+                    mapOf(x to 5u, y to 2u) to Rational(-1328953, 1890),
+                    mapOf(x to 6u, y to 2u) to Rational(-297148, 1323),
+                    mapOf(y to 3u) to Rational(6043, 945),
+                    mapOf(x to 1u, y to 3u) to Rational(160381, 6615),
+                    mapOf(x to 2u, y to 3u) to Rational(-673249, 13230),
+                    mapOf(x to 3u, y to 3u) to Rational(-319255, 2058),
+                    mapOf(x to 4u, y to 3u) to Rational(-98144, 1029),
+                    mapOf(x to 5u, y to 3u) to Rational(-320239, 5145),
+                    mapOf(x to 6u, y to 3u) to Rational(400, 147),
+                    mapOf(y to 4u) to Rational(163, 63),
+                    mapOf(x to 1u, y to 4u) to Rational(-25183, 4410),
+                    mapOf(x to 2u, y to 4u) to Rational(-21369, 1372),
+                    mapOf(x to 3u, y to 4u) to Rational(127499, 30870),
+                    mapOf(x to 4u, y to 4u) to Rational(86971, 12348),
+                    mapOf(x to 5u, y to 4u) to Rational(-11129, 1470),
+                    mapOf(x to 6u, y to 4u) to Rational(544, 147)
+                ),
+                LabeledPolynomialAsIs(mapOf<Symbol, UInt>() to Rational(0, 1),
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-5, 3),
+                    mapOf(x to 2u) to Rational(35, 9),
+                    mapOf(x to 3u) to Rational(-100, 27),
+                    mapOf(x to 4u) to Rational(100, 81),
+                    mapOf(y to 1u) to Rational(-5, 3),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 9),
+                    mapOf(x to 2u, y to 1u) to Rational(1874, 189),
+                    mapOf(x to 3u, y to 1u) to Rational(-620, 63),
+                    mapOf(x to 4u, y to 1u) to Rational(40, 63),
+                    mapOf(y to 2u) to Rational(16, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(365, 21),
+                    mapOf(x to 2u, y to 2u) to Rational(112, 9),
+                    mapOf(x to 3u, y to 2u) to Rational(-464, 63),
+                    mapOf(x to 4u, y to 2u) to Rational(1996, 441),
+                    mapOf(y to 3u) to Rational(10, 3),
+                    mapOf(x to 1u, y to 3u) to Rational(118, 21),
+                    mapOf(x to 2u, y to 3u) to Rational(-272, 21),
+                    mapOf(x to 3u, y to 3u) to Rational(-764, 49),
+                    mapOf(x to 4u, y to 3u) to Rational(8, 7),
+                    mapOf(y to 4u) to Rational(1, 1),
+                    mapOf(x to 1u, y to 4u) to Rational(-10, 7),
+                    mapOf(x to 2u, y to 4u) to Rational(-171, 49),
+                    mapOf(x to 3u, y to 4u) to Rational(20, 7),
+                    mapOf(x to 4u, y to 4u) to Rational(4, 1)
+                )
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(15, 7),
+                mapOf(x to 1u) to Rational(1, 5),
+                mapOf(x to 2u) to Rational(-7, 4),
+                mapOf(y to 1u) to Rational(-1, 9),
+                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
+                mapOf(x to 2u, y to 1u) to Rational(17, 3),
+                mapOf(y to 2u) to Rational(2, 6),
+                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                y to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(18, 5),
+                        mapOf(x to 1u) to Rational(-17, 5),
+                        mapOf(x to 2u) to Rational(-2, 7),
+                        mapOf(y to 1u) to Rational(6, 5),
+                        mapOf(x to 1u, y to 1u) to Rational(-5, 1),
+                        mapOf(x to 2u, y to 1u) to Rational(-9, 1),
+                        mapOf(y to 2u) to Rational(-8, 8),
+                        mapOf(x to 1u, y to 2u) to Rational(2, 7),
+                        mapOf(x to 2u, y to 2u) to Rational(-13, 7),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-4, 8),
+                        mapOf(x to 1u) to Rational(15, 9),
+                        mapOf(x to 2u) to Rational(-10, 9),
+                        mapOf(y to 1u) to Rational(5, 3),
+                        mapOf(x to 1u, y to 1u) to Rational(4, 1),
+                        mapOf(x to 2u, y to 1u) to Rational(-2, 7),
+                        mapOf(y to 2u) to Rational(2, 2),
+                        mapOf(x to 1u, y to 2u) to Rational(-5, 7),
+                        mapOf(x to 2u, y to 2u) to Rational(-18, 9),
+                    )
+                ),
+                iota to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-2, 9),
+                        mapOf(x to 1u) to Rational(-6, 3),
+                        mapOf(x to 2u) to Rational(10, 9),
+                        mapOf(y to 1u) to Rational(13, 3),
+                        mapOf(x to 1u, y to 1u) to Rational(-12, 4),
+                        mapOf(x to 2u, y to 1u) to Rational(3, 6),
+                        mapOf(y to 2u) to Rational(2, 9),
+                        mapOf(x to 1u, y to 2u) to Rational(7, 3),
+                        mapOf(x to 2u, y to 2u) to Rational(16, 5),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-6, 2),
+                        mapOf(x to 1u) to Rational(6, 2),
+                        mapOf(x to 2u) to Rational(2, 7),
+                        mapOf(y to 1u) to Rational(-18, 1),
+                        mapOf(x to 1u, y to 1u) to Rational(-11, 3),
+                        mapOf(x to 2u, y to 1u) to Rational(7, 5),
+                        mapOf(y to 2u) to Rational(8, 1),
+                        mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                        mapOf(x to 2u, y to 2u) to Rational(17, 4),
+                    )
+                )
+            )),
+            "test 5'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(15, 7),
+                    mapOf(x to 1u) to Rational(1, 5),
+                    mapOf(x to 2u) to Rational(-7, 4),
+                    mapOf(y to 1u) to Rational(-1, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(-2, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(17, 3),
+                    mapOf(y to 2u) to Rational(2, 6),
+                    mapOf(x to 1u, y to 2u) to Rational(-17, 6),
+                    mapOf(x to 2u, y to 2u) to Rational(-6, 2),
+                ),
+                LabeledPolynomialAsIs(mapOf<Symbol, UInt>() to Rational(0, 1),
+                    mapOf<Symbol, UInt>() to Rational(0, 1)
+                )
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(15, 7),
+                mapOf(x to 1u) to Rational(1, 5),
+                mapOf(x to 2u) to Rational(-7, 4),
+                mapOf(y to 1u) to Rational(-1, 9),
+                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
+                mapOf(x to 2u, y to 1u) to Rational(17, 3),
+                mapOf(y to 2u) to Rational(2, 6),
+                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf<Symbol, LabeledRationalFunction<Rational>>()),
+            "test 6"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(15, 7),
+                    mapOf(x to 1u) to Rational(1, 5),
+                    mapOf(x to 2u) to Rational(-7, 4),
+                    mapOf(y to 1u) to Rational(-1, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(-2, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(17, 3),
+                    mapOf(y to 2u) to Rational(2, 6),
+                    mapOf(x to 1u, y to 2u) to Rational(-17, 6),
+                    mapOf(x to 2u, y to 2u) to Rational(-6, 2),
+                ),
+                LabeledPolynomialAsIs(mapOf<Symbol, UInt>() to Rational(0, 1),
+                    mapOf<Symbol, UInt>() to Rational(0, 1)
+                )
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(15, 7),
+                mapOf(x to 1u) to Rational(1, 5),
+                mapOf(x to 2u) to Rational(-7, 4),
+                mapOf(y to 1u) to Rational(-1, 9),
+                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
+                mapOf(x to 2u, y to 1u) to Rational(17, 3),
+                mapOf(y to 2u) to Rational(2, 6),
+                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
+            ).substitute(RationalField, mapOf(
+                iota to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-2, 9),
+                        mapOf(x to 1u) to Rational(-6, 3),
+                        mapOf(x to 2u) to Rational(10, 9),
+                        mapOf(y to 1u) to Rational(13, 3),
+                        mapOf(x to 1u, y to 1u) to Rational(-12, 4),
+                        mapOf(x to 2u, y to 1u) to Rational(3, 6),
+                        mapOf(y to 2u) to Rational(2, 9),
+                        mapOf(x to 1u, y to 2u) to Rational(7, 3),
+                        mapOf(x to 2u, y to 2u) to Rational(16, 5),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-6, 2),
+                        mapOf(x to 1u) to Rational(6, 2),
+                        mapOf(x to 2u) to Rational(2, 7),
+                        mapOf(y to 1u) to Rational(-18, 1),
+                        mapOf(x to 1u, y to 1u) to Rational(-11, 3),
+                        mapOf(x to 2u, y to 1u) to Rational(7, 5),
+                        mapOf(y to 2u) to Rational(8, 1),
+                        mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                        mapOf(x to 2u, y to 2u) to Rational(17, 4),
+                    )
+                )
+            )),
+            "test 6'"
+        )
+    }
+    @Test
+    fun test_RationalFunction_substitute_Double_Map() {
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(emptyMap<Symbol, UInt>() to 0.0),
+                LabeledPolynomialAsIs(emptyMap<Symbol, UInt>() to 1.0),
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 1.0,
+                    mapOf(x to 1u) to -2.0,
+                    mapOf(x to 2u) to 1.0,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 1.0,
+                )
+            ).substitute(mapOf(
+                x to 1.0
+            )),
+            0.001,
+            "test 1"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 6.593754860231304,
+                    mapOf(x to 1u) to -7.853302571550634,
+                    mapOf(x to 2u) to 1.2265042281530025,
+                    mapOf(y to 1u) to 3.762648877294904,
+                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
+                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
+                    mapOf(y to 2u) to 7.359794483988782,
+                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
+                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 9.533292132172562,
+                    mapOf(x to 1u) to -1.982814534018857,
+                    mapOf(x to 2u) to -5.974248303415283,
+                    mapOf(y to 1u) to 1.5876716499288879,
+                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
+                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
+                    mapOf(y to 2u) to -5.242030058021028,
+                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
+                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 6.593754860231304,
+                    mapOf(x to 1u) to -7.853302571550634,
+                    mapOf(x to 2u) to 1.2265042281530025,
+                    mapOf(y to 1u) to 3.762648877294904,
+                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
+                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
+                    mapOf(y to 2u) to 7.359794483988782,
+                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
+                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 9.533292132172562,
+                    mapOf(x to 1u) to -1.982814534018857,
+                    mapOf(x to 2u) to -5.974248303415283,
+                    mapOf(y to 1u) to 1.5876716499288879,
+                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
+                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
+                    mapOf(y to 2u) to -5.242030058021028,
+                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
+                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf()),
+            0.001,
+            "test 2"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 6.593754860231304,
+                    mapOf(x to 1u) to -7.853302571550634,
+                    mapOf(x to 2u) to 1.2265042281530025,
+                    mapOf(y to 1u) to 3.762648877294904,
+                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
+                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
+                    mapOf(y to 2u) to 7.359794483988782,
+                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
+                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 9.533292132172562,
+                    mapOf(x to 1u) to -1.982814534018857,
+                    mapOf(x to 2u) to -5.974248303415283,
+                    mapOf(y to 1u) to 1.5876716499288879,
+                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
+                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
+                    mapOf(y to 2u) to -5.242030058021028,
+                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
+                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 6.593754860231304,
+                    mapOf(x to 1u) to -7.853302571550634,
+                    mapOf(x to 2u) to 1.2265042281530025,
+                    mapOf(y to 1u) to 3.762648877294904,
+                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
+                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
+                    mapOf(y to 2u) to 7.359794483988782,
+                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
+                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 9.533292132172562,
+                    mapOf(x to 1u) to -1.982814534018857,
+                    mapOf(x to 2u) to -5.974248303415283,
+                    mapOf(y to 1u) to 1.5876716499288879,
+                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
+                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
+                    mapOf(y to 2u) to -5.242030058021028,
+                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
+                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                iota to 0.9211194782050933
+            )),
+            0.001,
+            "test 2'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 151.1502229133916,
+                    mapOf(y to 1u) to -262.3790170577034,
+                    mapOf(y to 2u) to 102.5097937392923,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to -367.9969733169944,
+                    mapOf(y to 1u) to 112.4911133334554,
+                    mapOf(y to 2u) to -469.755906895345,
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 6.593754860231304,
+                    mapOf(x to 1u) to -7.853302571550634,
+                    mapOf(x to 2u) to 1.2265042281530025,
+                    mapOf(y to 1u) to 3.762648877294904,
+                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
+                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
+                    mapOf(y to 2u) to 7.359794483988782,
+                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
+                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 9.533292132172562,
+                    mapOf(x to 1u) to -1.982814534018857,
+                    mapOf(x to 2u) to -5.974248303415283,
+                    mapOf(y to 1u) to 1.5876716499288879,
+                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
+                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
+                    mapOf(y to 2u) to -5.242030058021028,
+                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
+                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                x to -8.11707689492641,
+            )),
+            0.001,
+            "test 3"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 151.1502229133916,
+                    mapOf(y to 1u) to -262.3790170577034,
+                    mapOf(y to 2u) to 102.5097937392923,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to -367.9969733169944,
+                    mapOf(y to 1u) to 112.4911133334554,
+                    mapOf(y to 2u) to -469.755906895345,
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 6.593754860231304,
+                    mapOf(x to 1u) to -7.853302571550634,
+                    mapOf(x to 2u) to 1.2265042281530025,
+                    mapOf(y to 1u) to 3.762648877294904,
+                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
+                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
+                    mapOf(y to 2u) to 7.359794483988782,
+                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
+                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 9.533292132172562,
+                    mapOf(x to 1u) to -1.982814534018857,
+                    mapOf(x to 2u) to -5.974248303415283,
+                    mapOf(y to 1u) to 1.5876716499288879,
+                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
+                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
+                    mapOf(y to 2u) to -5.242030058021028,
+                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
+                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                x to -8.11707689492641,
+                iota to 0.9211194782050933
+            )),
+            0.001,
+            "test 3'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 14.24074356896978,
+                    mapOf(x to 1u) to -17.71987055153461,
+                    mapOf(x to 2u) to -2.288056483312383,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 7.480604285873397,
+                    mapOf(x to 1u) to -8.43478016688617,
+                    mapOf(x to 2u) to -9.88934943900592,
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 6.593754860231304,
+                    mapOf(x to 1u) to -7.853302571550634,
+                    mapOf(x to 2u) to 1.2265042281530025,
+                    mapOf(y to 1u) to 3.762648877294904,
+                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
+                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
+                    mapOf(y to 2u) to 7.359794483988782,
+                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
+                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 9.533292132172562,
+                    mapOf(x to 1u) to -1.982814534018857,
+                    mapOf(x to 2u) to -5.974248303415283,
+                    mapOf(y to 1u) to 1.5876716499288879,
+                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
+                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
+                    mapOf(y to 2u) to -5.242030058021028,
+                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
+                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                y to 0.795265651276015,
+            )),
+            0.001,
+            "test 4"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 14.24074356896978,
+                    mapOf(x to 1u) to -17.71987055153461,
+                    mapOf(x to 2u) to -2.288056483312383,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 7.480604285873397,
+                    mapOf(x to 1u) to -8.43478016688617,
+                    mapOf(x to 2u) to -9.88934943900592,
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 6.593754860231304,
+                    mapOf(x to 1u) to -7.853302571550634,
+                    mapOf(x to 2u) to 1.2265042281530025,
+                    mapOf(y to 1u) to 3.762648877294904,
+                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
+                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
+                    mapOf(y to 2u) to 7.359794483988782,
+                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
+                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 9.533292132172562,
+                    mapOf(x to 1u) to -1.982814534018857,
+                    mapOf(x to 2u) to -5.974248303415283,
+                    mapOf(y to 1u) to 1.5876716499288879,
+                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
+                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
+                    mapOf(y to 2u) to -5.242030058021028,
+                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
+                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                y to 0.795265651276015,
+                iota to 0.9211194782050933
+            )),
+            0.001,
+            "test 4'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 7.321261307532708,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to -575.6325831127576,
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 6.593754860231304,
+                    mapOf(x to 1u) to -7.853302571550634,
+                    mapOf(x to 2u) to 1.2265042281530025,
+                    mapOf(y to 1u) to 3.762648877294904,
+                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
+                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
+                    mapOf(y to 2u) to 7.359794483988782,
+                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
+                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 9.533292132172562,
+                    mapOf(x to 1u) to -1.982814534018857,
+                    mapOf(x to 2u) to -5.974248303415283,
+                    mapOf(y to 1u) to 1.5876716499288879,
+                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
+                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
+                    mapOf(y to 2u) to -5.242030058021028,
+                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
+                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                x to -8.11707689492641,
+                y to 0.795265651276015,
+            )),
+            0.001,
+            "test 5"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 7.321261307532708,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to -575.6325831127576,
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 6.593754860231304,
+                    mapOf(x to 1u) to -7.853302571550634,
+                    mapOf(x to 2u) to 1.2265042281530025,
+                    mapOf(y to 1u) to 3.762648877294904,
+                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
+                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
+                    mapOf(y to 2u) to 7.359794483988782,
+                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
+                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to 9.533292132172562,
+                    mapOf(x to 1u) to -1.982814534018857,
+                    mapOf(x to 2u) to -5.974248303415283,
+                    mapOf(y to 1u) to 1.5876716499288879,
+                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
+                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
+                    mapOf(y to 2u) to -5.242030058021028,
+                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
+                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
+                )
+            ).substitute(mapOf(
+                x to -8.11707689492641,
+                y to 0.795265651276015,
+                iota to 0.9211194782050933
+            )),
+            0.001,
+            "test 5'"
+        )
+    }
+    @Test
+    fun test_RationalFunction_substitute_Constant_Map() {
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(0)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1),
+                    mapOf(x to 1u) to Rational(-2),
+                    mapOf(x to 2u) to Rational(1)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1)
+                )
+            ).substitute(RationalField, mapOf(
+                x to Rational(1)
+            )),
+            "test 1"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(22047, 2450),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-2204953, 147000),
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-3, 5),
+                    mapOf(x to 1u) to Rational(-18, 4),
+                    mapOf(x to 2u) to Rational(9, 8),
+                    mapOf(y to 1u) to Rational(-11, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
+                    mapOf(y to 2u) to Rational(5, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(11, 1),
+                    mapOf(x to 1u) to Rational(4, 1),
+                    mapOf(x to 2u) to Rational(-18, 3),
+                    mapOf(y to 1u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
+                    mapOf(y to 2u) to Rational(-4, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                x to Rational(7, 5),
+                y to Rational(-13, 7),
+            )),
+            "test 2"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(22047, 2450),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-2204953, 147000),
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-3, 5),
+                    mapOf(x to 1u) to Rational(-18, 4),
+                    mapOf(x to 2u) to Rational(9, 8),
+                    mapOf(y to 1u) to Rational(-11, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
+                    mapOf(y to 2u) to Rational(5, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(11, 1),
+                    mapOf(x to 1u) to Rational(4, 1),
+                    mapOf(x to 2u) to Rational(-18, 3),
+                    mapOf(y to 1u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
+                    mapOf(y to 2u) to Rational(-4, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                x to Rational(7, 5),
+                y to Rational(-13, 7),
+                iota to Rational(-16, 4),
+            )),
+            "test 2'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(4191, 490),
+                    mapOf(x to 1u) to Rational(14975, 1176),
+                    mapOf(x to 2u) to Rational(-10429, 1176)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-775, 147),
+                    mapOf(x to 1u) to Rational(-155, 49),
+                    mapOf(x to 2u) to Rational(-757, 280)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-3, 5),
+                    mapOf(x to 1u) to Rational(-18, 4),
+                    mapOf(x to 2u) to Rational(9, 8),
+                    mapOf(y to 1u) to Rational(-11, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
+                    mapOf(y to 2u) to Rational(5, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(11, 1),
+                    mapOf(x to 1u) to Rational(4, 1),
+                    mapOf(x to 2u) to Rational(-18, 3),
+                    mapOf(y to 1u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
+                    mapOf(y to 2u) to Rational(-4, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                y to Rational(-13, 7),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(4191, 490),
+                    mapOf(x to 1u) to Rational(14975, 1176),
+                    mapOf(x to 2u) to Rational(-10429, 1176)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-775, 147),
+                    mapOf(x to 1u) to Rational(-155, 49),
+                    mapOf(x to 2u) to Rational(-757, 280)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-3, 5),
+                    mapOf(x to 1u) to Rational(-18, 4),
+                    mapOf(x to 2u) to Rational(9, 8),
+                    mapOf(y to 1u) to Rational(-11, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
+                    mapOf(y to 2u) to Rational(5, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(11, 1),
+                    mapOf(x to 1u) to Rational(4, 1),
+                    mapOf(x to 2u) to Rational(-18, 3),
+                    mapOf(y to 1u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
+                    mapOf(y to 2u) to Rational(-4, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                y to Rational(-13, 7),
+                iota to Rational(-16, 4),
+            )),
+            "test 3'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-939, 200),
+                    mapOf(y to 1u) to Rational(123, 50),
+                    mapOf(y to 2u) to Rational(1059, 200)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(121, 25),
+                    mapOf(y to 1u) to Rational(-949, 375),
+                    mapOf(y to 2u) to Rational(-1423, 200)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-3, 5),
+                    mapOf(x to 1u) to Rational(-18, 4),
+                    mapOf(x to 2u) to Rational(9, 8),
+                    mapOf(y to 1u) to Rational(-11, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
+                    mapOf(y to 2u) to Rational(5, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(11, 1),
+                    mapOf(x to 1u) to Rational(4, 1),
+                    mapOf(x to 2u) to Rational(-18, 3),
+                    mapOf(y to 1u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
+                    mapOf(y to 2u) to Rational(-4, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                x to Rational(7, 5),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-939, 200),
+                    mapOf(y to 1u) to Rational(123, 50),
+                    mapOf(y to 2u) to Rational(1059, 200)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(121, 25),
+                    mapOf(y to 1u) to Rational(-949, 375),
+                    mapOf(y to 2u) to Rational(-1423, 200)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-3, 5),
+                    mapOf(x to 1u) to Rational(-18, 4),
+                    mapOf(x to 2u) to Rational(9, 8),
+                    mapOf(y to 1u) to Rational(-11, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
+                    mapOf(y to 2u) to Rational(5, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(11, 1),
+                    mapOf(x to 1u) to Rational(4, 1),
+                    mapOf(x to 2u) to Rational(-18, 3),
+                    mapOf(y to 1u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
+                    mapOf(y to 2u) to Rational(-4, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                x to Rational(7, 5),
+                iota to Rational(-16, 4),
+            )),
+            "test 4'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-3, 5),
+                    mapOf(x to 1u) to Rational(-18, 4),
+                    mapOf(x to 2u) to Rational(9, 8),
+                    mapOf(y to 1u) to Rational(-11, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
+                    mapOf(y to 2u) to Rational(5, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(11, 1),
+                    mapOf(x to 1u) to Rational(4, 1),
+                    mapOf(x to 2u) to Rational(-18, 3),
+                    mapOf(y to 1u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
+                    mapOf(y to 2u) to Rational(-4, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-3, 5),
+                    mapOf(x to 1u) to Rational(-18, 4),
+                    mapOf(x to 2u) to Rational(9, 8),
+                    mapOf(y to 1u) to Rational(-11, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
+                    mapOf(y to 2u) to Rational(5, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(11, 1),
+                    mapOf(x to 1u) to Rational(4, 1),
+                    mapOf(x to 2u) to Rational(-18, 3),
+                    mapOf(y to 1u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
+                    mapOf(y to 2u) to Rational(-4, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf<Symbol, Rational>()),
+            "test 5"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-3, 5),
+                    mapOf(x to 1u) to Rational(-18, 4),
+                    mapOf(x to 2u) to Rational(9, 8),
+                    mapOf(y to 1u) to Rational(-11, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
+                    mapOf(y to 2u) to Rational(5, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(11, 1),
+                    mapOf(x to 1u) to Rational(4, 1),
+                    mapOf(x to 2u) to Rational(-18, 3),
+                    mapOf(y to 1u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
+                    mapOf(y to 2u) to Rational(-4, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-3, 5),
+                    mapOf(x to 1u) to Rational(-18, 4),
+                    mapOf(x to 2u) to Rational(9, 8),
+                    mapOf(y to 1u) to Rational(-11, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
+                    mapOf(y to 2u) to Rational(5, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(11, 1),
+                    mapOf(x to 1u) to Rational(4, 1),
+                    mapOf(x to 2u) to Rational(-18, 3),
+                    mapOf(y to 1u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
+                    mapOf(y to 2u) to Rational(-4, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                iota to Rational(-16, 4),
+            )),
+            "test 5'"
+        )
+    }
+    @Test
+    fun test_RationalFunction_substitute_Polynomial_Map() {
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(0)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1),
+                    mapOf(x to 1u) to Rational(-2),
+                    mapOf(x to 2u) to Rational(1)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1)
+                )
+            ).substitute(RationalField, mapOf(
+                x to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1)
+                )
+            )),
+            "test 1"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5, 6),
+                    mapOf(x to 1u) to Rational(211, 4),
+                    mapOf(x to 2u) to Rational(88, 3),
+                    mapOf(x to 3u) to Rational(-63, 8),
+                    mapOf(x to 4u) to Rational(441, 16),
+                    mapOf(y to 1u) to Rational(-671, 15),
+                    mapOf(x to 1u, y to 1u) to Rational(-551, 21),
+                    mapOf(x to 2u, y to 1u) to Rational(279, 25),
+                    mapOf(x to 3u, y to 1u) to Rational(231, 20),
+                    mapOf(y to 2u) to Rational(-1436, 1575),
+                    mapOf(x to 1u, y to 2u) to Rational(2471, 250),
+                    mapOf(x to 2u, y to 2u) to Rational(-4919, 100),
+                    mapOf(y to 3u) to Rational(-1464, 125),
+                    mapOf(x to 1u, y to 3u) to Rational(-264, 25),
+                    mapOf(y to 4u) to Rational(576, 25),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 9),
+                    mapOf(x to 1u) to Rational(-9, 4),
+                    mapOf(x to 2u) to Rational(943, 8),
+                    mapOf(x to 3u) to Rational(117, 8),
+                    mapOf(x to 4u) to Rational(147, 16),
+                    mapOf(y to 1u) to Rational(289, 90),
+                    mapOf(x to 1u, y to 1u) to Rational(-2692, 15),
+                    mapOf(x to 2u, y to 1u) to Rational(-1629, 140),
+                    mapOf(x to 3u, y to 1u) to Rational(77, 20),
+                    mapOf(y to 2u) to Rational(6187, 75),
+                    mapOf(x to 1u, y to 2u) to Rational(-2879, 175),
+                    mapOf(x to 2u, y to 2u) to Rational(-4919, 300),
+                    mapOf(y to 3u) to Rational(336, 25),
+                    mapOf(x to 1u, y to 3u) to Rational(-88, 25),
+                    mapOf(y to 4u) to Rational(192, 25),
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5, 6),
+                    mapOf(x to 1u) to Rational(1, 6),
+                    mapOf(x to 2u) to Rational(-2, 9),
+                    mapOf(y to 1u) to Rational(15, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
+                    mapOf(y to 2u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 9),
+                    mapOf(x to 1u) to Rational(4, 9),
+                    mapOf(x to 2u) to Rational(11, 6),
+                    mapOf(y to 1u) to Rational(-5, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
+                    mapOf(y to 2u) to Rational(9, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                x to LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(3, 2),
+                    mapOf(y to 1u) to Rational(8, 5),
+                ),
+                y to LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(7, 2),
+                    mapOf(y to 1u) to Rational(-3, 1),
+                )
+            )),
+            "test 2"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1202861, 210),
+                    mapOf(x to 1u) to Rational(-215117, 45),
+                    mapOf(x to 2u) to Rational(10889651, 19845),
+                    mapOf(x to 3u) to Rational(-3503956, 6615),
+                    mapOf(x to 4u) to Rational(809066, 2205),
+                    mapOf(x to 5u) to Rational(-9056, 735),
+                    mapOf(x to 6u) to Rational(5396, 315),
+                    mapOf(x to 7u) to Rational(-752, 147),
+                    mapOf(x to 8u) to Rational(16, 49),
+                    mapOf(y to 1u) to Rational(1738469, 1470),
+                    mapOf(x to 1u, y to 1u) to Rational(-926238703, 52920),
+                    mapOf(x to 2u, y to 1u) to Rational(-44113982, 6615),
+                    mapOf(x to 3u, y to 1u) to Rational(10423519, 5292),
+                    mapOf(x to 4u, y to 1u) to Rational(3769712, 2205),
+                    mapOf(x to 5u, y to 1u) to Rational(8905046, 6615),
+                    mapOf(x to 6u, y to 1u) to Rational(1186972, 6615),
+                    mapOf(x to 7u, y to 1u) to Rational(22124, 441),
+                    mapOf(x to 8u, y to 1u) to Rational(-1504, 147),
+                    mapOf(y to 2u) to Rational(-54723628, 2205),
+                    mapOf(x to 1u, y to 2u) to Rational(70109407, 1323),
+                    mapOf(x to 2u, y to 2u) to Rational(151072591, 17640),
+                    mapOf(x to 3u, y to 2u) to Rational(1216428107, 52920),
+                    mapOf(x to 4u, y to 2u) to Rational(2587873193, 317520),
+                    mapOf(x to 5u, y to 2u) to Rational(393536369, 79380),
+                    mapOf(x to 6u, y to 2u) to Rational(137614937, 79380),
+                    mapOf(x to 7u, y to 2u) to Rational(566866, 1323),
+                    mapOf(x to 8u, y to 2u) to Rational(41848, 441),
+                    mapOf(y to 3u) to Rational(-19470406, 2205),
+                    mapOf(x to 1u, y to 3u) to Rational(72514195, 882),
+                    mapOf(x to 2u, y to 3u) to Rational(-78090707, 1764),
+                    mapOf(x to 3u, y to 3u) to Rational(-1988237707, 26460),
+                    mapOf(x to 4u, y to 3u) to Rational(-802137919, 17640),
+                    mapOf(x to 5u, y to 3u) to Rational(-139989463, 5880),
+                    mapOf(x to 6u, y to 3u) to Rational(-26066641, 3780),
+                    mapOf(x to 7u, y to 3u) to Rational(-2363369, 1323),
+                    mapOf(x to 8u, y to 3u) to Rational(-108280, 441),
+                    mapOf(y to 4u) to Rational(14878516, 441),
+                    mapOf(x to 1u, y to 4u) to Rational(-253416724, 2205),
+                    mapOf(x to 2u, y to 4u) to Rational(16699157, 840),
+                    mapOf(x to 3u, y to 4u) to Rational(-105220979, 13230),
+                    mapOf(x to 4u, y to 4u) to Rational(208266383, 5880),
+                    mapOf(x to 5u, y to 4u) to Rational(650135309, 26460),
+                    mapOf(x to 6u, y to 4u) to Rational(123808663, 11760),
+                    mapOf(x to 7u, y to 4u) to Rational(8563385, 2646),
+                    mapOf(x to 8u, y to 4u) to Rational(19721, 49),
+                    mapOf(y to 5u) to Rational(675645, 49),
+                    mapOf(x to 1u, y to 5u) to Rational(-70554077, 588),
+                    mapOf(x to 2u, y to 5u) to Rational(157884029, 980),
+                    mapOf(x to 3u, y to 5u) to Rational(489548623, 4410),
+                    mapOf(x to 4u, y to 5u) to Rational(148540519, 17640),
+                    mapOf(x to 5u, y to 5u) to Rational(-5559551, 392),
+                    mapOf(x to 6u, y to 5u) to Rational(-18335711, 1470),
+                    mapOf(x to 7u, y to 5u) to Rational(-38437, 9),
+                    mapOf(x to 8u, y to 5u) to Rational(-29620, 63),
+                    mapOf(y to 6u) to Rational(-727625, 49),
+                    mapOf(x to 1u, y to 6u) to Rational(7046685, 98),
+                    mapOf(x to 2u, y to 6u) to Rational(-334814231, 7056),
+                    mapOf(x to 3u, y to 6u) to Rational(-243971737, 17640),
+                    mapOf(x to 4u, y to 6u) to Rational(-571116659, 35280),
+                    mapOf(x to 5u, y to 6u) to Rational(567538, 315),
+                    mapOf(x to 6u, y to 6u) to Rational(3199768, 315),
+                    mapOf(x to 7u, y to 6u) to Rational(227744, 63),
+                    mapOf(x to 8u, y to 6u) to Rational(23116, 63),
+                    mapOf(y to 7u) to Rational(-27500, 7),
+                    mapOf(x to 1u, y to 7u) to Rational(120125, 3),
+                    mapOf(x to 2u, y to 7u) to Rational(-279200, 3),
+                    mapOf(x to 3u, y to 7u) to Rational(-100160, 7),
+                    mapOf(x to 4u, y to 7u) to Rational(920452, 21),
+                    mapOf(x to 5u, y to 7u) to Rational(226481, 21),
+                    mapOf(x to 6u, y to 7u) to Rational(-34428, 7),
+                    mapOf(x to 7u, y to 7u) to Rational(-6232, 3),
+                    mapOf(x to 8u, y to 7u) to Rational(-608, 3),
+                    mapOf(y to 8u) to Rational(2500, 1),
+                    mapOf(x to 1u, y to 8u) to Rational(-19000, 1),
+                    mapOf(x to 2u, y to 8u) to Rational(37900, 1),
+                    mapOf(x to 3u, y to 8u) to Rational(-1840, 1),
+                    mapOf(x to 4u, y to 8u) to Rational(-17876, 1),
+                    mapOf(x to 5u, y to 8u) to Rational(-1240, 1),
+                    mapOf(x to 6u, y to 8u) to Rational(2788, 1),
+                    mapOf(x to 7u, y to 8u) to Rational(800, 1),
+                    mapOf(x to 8u, y to 8u) to Rational(64, 1)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(162487, 63),
+                    mapOf(x to 1u) to Rational(-92713, 54),
+                    mapOf(x to 2u) to Rational(802436, 1323),
+                    mapOf(x to 3u) to Rational(-55088, 441),
+                    mapOf(x to 4u) to Rational(1404034, 9261),
+                    mapOf(x to 5u) to Rational(-5804, 1029),
+                    mapOf(x to 6u) to Rational(51556, 9261),
+                    mapOf(x to 7u) to Rational(-752, 441),
+                    mapOf(x to 8u) to Rational(16, 147),
+                    mapOf(y to 1u) to Rational(296071, 441),
+                    mapOf(x to 1u, y to 1u) to Rational(-4991281, 882),
+                    mapOf(x to 2u, y to 1u) to Rational(-18702811, 9261),
+                    mapOf(x to 3u, y to 1u) to Rational(40759043, 27783),
+                    mapOf(x to 4u, y to 1u) to Rational(19768501, 27783),
+                    mapOf(x to 5u, y to 1u) to Rational(14307337, 27783),
+                    mapOf(x to 6u, y to 1u) to Rational(1655684, 27783),
+                    mapOf(x to 7u, y to 1u) to Rational(22124, 1323),
+                    mapOf(x to 8u, y to 1u) to Rational(-1504, 441),
+                    mapOf(y to 2u) to Rational(-27667474, 3087),
+                    mapOf(x to 1u, y to 2u) to Rational(265605901, 12348),
+                    mapOf(x to 2u, y to 2u) to Rational(160360775, 98784),
+                    mapOf(x to 3u, y to 2u) to Rational(1169992093, 148176),
+                    mapOf(x to 4u, y to 2u) to Rational(3978014077, 1333584),
+                    mapOf(x to 5u, y to 2u) to Rational(567058123, 333396),
+                    mapOf(x to 6u, y to 2u) to Rational(205132579, 333396),
+                    mapOf(x to 7u, y to 2u) to Rational(566866, 3969),
+                    mapOf(x to 8u, y to 2u) to Rational(41848, 1323),
+                    mapOf(y to 3u) to Rational(-2228822, 1029),
+                    mapOf(x to 1u, y to 3u) to Rational(80179390, 3087),
+                    mapOf(x to 2u, y to 3u) to Rational(-1378630487, 74088),
+                    mapOf(x to 3u, y to 3u) to Rational(-3385811693, 111132),
+                    mapOf(x to 4u, y to 3u) to Rational(-820686977, 49392),
+                    mapOf(x to 5u, y to 3u) to Rational(-89101027, 10584),
+                    mapOf(x to 6u, y to 3u) to Rational(-37847387, 15876),
+                    mapOf(x to 7u, y to 3u) to Rational(-2363369, 3969),
+                    mapOf(x to 8u, y to 3u) to Rational(-108280, 1323),
+                    mapOf(y to 4u) to Rational(12619982, 1029),
+                    mapOf(x to 1u, y to 4u) to Rational(-277723177, 6174),
+                    mapOf(x to 2u, y to 4u) to Rational(649414169, 49392),
+                    mapOf(x to 3u, y to 4u) to Rational(14457595, 63504),
+                    mapOf(x to 4u, y to 4u) to Rational(139270339, 10584),
+                    mapOf(x to 5u, y to 4u) to Rational(140367961, 15876),
+                    mapOf(x to 6u, y to 4u) to Rational(25467083, 7056),
+                    mapOf(x to 7u, y to 4u) to Rational(8563385, 7938),
+                    mapOf(x to 8u, y to 4u) to Rational(19721, 147),
+                    mapOf(y to 5u) to Rational(643850, 147),
+                    mapOf(x to 1u, y to 5u) to Rational(-11818025, 294),
+                    mapOf(x to 2u, y to 5u) to Rational(33963203, 588),
+                    mapOf(x to 3u, y to 5u) to Rational(207216235, 5292),
+                    mapOf(x to 4u, y to 5u) to Rational(2861021, 1512),
+                    mapOf(x to 5u, y to 5u) to Rational(-6302335, 1176),
+                    mapOf(x to 6u, y to 5u) to Rational(-3738587, 882),
+                    mapOf(x to 7u, y to 5u) to Rational(-38437, 27),
+                    mapOf(x to 8u, y to 5u) to Rational(-29620, 189),
+                    mapOf(y to 6u) to Rational(-248725, 49),
+                    mapOf(x to 1u, y to 6u) to Rational(2478535, 98),
+                    mapOf(x to 2u, y to 6u) to Rational(-399721367, 21168),
+                    mapOf(x to 3u, y to 6u) to Rational(-54309317, 10584),
+                    mapOf(x to 4u, y to 6u) to Rational(-95398327, 21168),
+                    mapOf(x to 5u, y to 6u) to Rational(173750, 189),
+                    mapOf(x to 6u, y to 6u) to Rational(92216, 27),
+                    mapOf(x to 7u, y to 6u) to Rational(227744, 189),
+                    mapOf(x to 8u, y to 6u) to Rational(23116, 189),
+                    mapOf(y to 7u) to Rational(-27500, 21),
+                    mapOf(x to 1u, y to 7u) to Rational(120125, 9),
+                    mapOf(x to 2u, y to 7u) to Rational(-279200, 9),
+                    mapOf(x to 3u, y to 7u) to Rational(-100160, 21),
+                    mapOf(x to 4u, y to 7u) to Rational(920452, 63),
+                    mapOf(x to 5u, y to 7u) to Rational(226481, 63),
+                    mapOf(x to 6u, y to 7u) to Rational(-11476, 7),
+                    mapOf(x to 7u, y to 7u) to Rational(-6232, 9),
+                    mapOf(x to 8u, y to 7u) to Rational(-608, 9),
+                    mapOf(y to 8u) to Rational(2500, 3),
+                    mapOf(x to 1u, y to 8u) to Rational(-19000, 3),
+                    mapOf(x to 2u, y to 8u) to Rational(37900, 3),
+                    mapOf(x to 3u, y to 8u) to Rational(-1840, 3),
+                    mapOf(x to 4u, y to 8u) to Rational(-17876, 3),
+                    mapOf(x to 5u, y to 8u) to Rational(-1240, 3),
+                    mapOf(x to 6u, y to 8u) to Rational(2788, 3),
+                    mapOf(x to 7u, y to 8u) to Rational(800, 3),
+                    mapOf(x to 8u, y to 8u) to Rational(64, 3)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5, 6),
+                    mapOf(x to 1u) to Rational(1, 6),
+                    mapOf(x to 2u) to Rational(-2, 9),
+                    mapOf(y to 1u) to Rational(15, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
+                    mapOf(y to 2u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 9),
+                    mapOf(x to 1u) to Rational(4, 9),
+                    mapOf(x to 2u) to Rational(11, 6),
+                    mapOf(y to 1u) to Rational(-5, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
+                    mapOf(y to 2u) to Rational(9, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                x to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(18, 1),
+                    mapOf(x to 1u) to Rational(16, 3),
+                    mapOf(x to 2u) to Rational(12, 6),
+                    mapOf(y to 1u) to Rational(13, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(-11, 4),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 1),
+                    mapOf(y to 2u) to Rational(-10, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(2, 1),
+                ),
+                y to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(8, 2),
+                    mapOf(x to 1u) to Rational(-15, 5),
+                    mapOf(x to 2u) to Rational(2, 7),
+                    mapOf(y to 1u) to Rational(-18, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-13, 3),
+                    mapOf(y to 2u) to Rational(-5, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(8, 2),
+                ),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1202861, 210),
+                    mapOf(x to 1u) to Rational(-215117, 45),
+                    mapOf(x to 2u) to Rational(10889651, 19845),
+                    mapOf(x to 3u) to Rational(-3503956, 6615),
+                    mapOf(x to 4u) to Rational(809066, 2205),
+                    mapOf(x to 5u) to Rational(-9056, 735),
+                    mapOf(x to 6u) to Rational(5396, 315),
+                    mapOf(x to 7u) to Rational(-752, 147),
+                    mapOf(x to 8u) to Rational(16, 49),
+                    mapOf(y to 1u) to Rational(1738469, 1470),
+                    mapOf(x to 1u, y to 1u) to Rational(-926238703, 52920),
+                    mapOf(x to 2u, y to 1u) to Rational(-44113982, 6615),
+                    mapOf(x to 3u, y to 1u) to Rational(10423519, 5292),
+                    mapOf(x to 4u, y to 1u) to Rational(3769712, 2205),
+                    mapOf(x to 5u, y to 1u) to Rational(8905046, 6615),
+                    mapOf(x to 6u, y to 1u) to Rational(1186972, 6615),
+                    mapOf(x to 7u, y to 1u) to Rational(22124, 441),
+                    mapOf(x to 8u, y to 1u) to Rational(-1504, 147),
+                    mapOf(y to 2u) to Rational(-54723628, 2205),
+                    mapOf(x to 1u, y to 2u) to Rational(70109407, 1323),
+                    mapOf(x to 2u, y to 2u) to Rational(151072591, 17640),
+                    mapOf(x to 3u, y to 2u) to Rational(1216428107, 52920),
+                    mapOf(x to 4u, y to 2u) to Rational(2587873193, 317520),
+                    mapOf(x to 5u, y to 2u) to Rational(393536369, 79380),
+                    mapOf(x to 6u, y to 2u) to Rational(137614937, 79380),
+                    mapOf(x to 7u, y to 2u) to Rational(566866, 1323),
+                    mapOf(x to 8u, y to 2u) to Rational(41848, 441),
+                    mapOf(y to 3u) to Rational(-19470406, 2205),
+                    mapOf(x to 1u, y to 3u) to Rational(72514195, 882),
+                    mapOf(x to 2u, y to 3u) to Rational(-78090707, 1764),
+                    mapOf(x to 3u, y to 3u) to Rational(-1988237707, 26460),
+                    mapOf(x to 4u, y to 3u) to Rational(-802137919, 17640),
+                    mapOf(x to 5u, y to 3u) to Rational(-139989463, 5880),
+                    mapOf(x to 6u, y to 3u) to Rational(-26066641, 3780),
+                    mapOf(x to 7u, y to 3u) to Rational(-2363369, 1323),
+                    mapOf(x to 8u, y to 3u) to Rational(-108280, 441),
+                    mapOf(y to 4u) to Rational(14878516, 441),
+                    mapOf(x to 1u, y to 4u) to Rational(-253416724, 2205),
+                    mapOf(x to 2u, y to 4u) to Rational(16699157, 840),
+                    mapOf(x to 3u, y to 4u) to Rational(-105220979, 13230),
+                    mapOf(x to 4u, y to 4u) to Rational(208266383, 5880),
+                    mapOf(x to 5u, y to 4u) to Rational(650135309, 26460),
+                    mapOf(x to 6u, y to 4u) to Rational(123808663, 11760),
+                    mapOf(x to 7u, y to 4u) to Rational(8563385, 2646),
+                    mapOf(x to 8u, y to 4u) to Rational(19721, 49),
+                    mapOf(y to 5u) to Rational(675645, 49),
+                    mapOf(x to 1u, y to 5u) to Rational(-70554077, 588),
+                    mapOf(x to 2u, y to 5u) to Rational(157884029, 980),
+                    mapOf(x to 3u, y to 5u) to Rational(489548623, 4410),
+                    mapOf(x to 4u, y to 5u) to Rational(148540519, 17640),
+                    mapOf(x to 5u, y to 5u) to Rational(-5559551, 392),
+                    mapOf(x to 6u, y to 5u) to Rational(-18335711, 1470),
+                    mapOf(x to 7u, y to 5u) to Rational(-38437, 9),
+                    mapOf(x to 8u, y to 5u) to Rational(-29620, 63),
+                    mapOf(y to 6u) to Rational(-727625, 49),
+                    mapOf(x to 1u, y to 6u) to Rational(7046685, 98),
+                    mapOf(x to 2u, y to 6u) to Rational(-334814231, 7056),
+                    mapOf(x to 3u, y to 6u) to Rational(-243971737, 17640),
+                    mapOf(x to 4u, y to 6u) to Rational(-571116659, 35280),
+                    mapOf(x to 5u, y to 6u) to Rational(567538, 315),
+                    mapOf(x to 6u, y to 6u) to Rational(3199768, 315),
+                    mapOf(x to 7u, y to 6u) to Rational(227744, 63),
+                    mapOf(x to 8u, y to 6u) to Rational(23116, 63),
+                    mapOf(y to 7u) to Rational(-27500, 7),
+                    mapOf(x to 1u, y to 7u) to Rational(120125, 3),
+                    mapOf(x to 2u, y to 7u) to Rational(-279200, 3),
+                    mapOf(x to 3u, y to 7u) to Rational(-100160, 7),
+                    mapOf(x to 4u, y to 7u) to Rational(920452, 21),
+                    mapOf(x to 5u, y to 7u) to Rational(226481, 21),
+                    mapOf(x to 6u, y to 7u) to Rational(-34428, 7),
+                    mapOf(x to 7u, y to 7u) to Rational(-6232, 3),
+                    mapOf(x to 8u, y to 7u) to Rational(-608, 3),
+                    mapOf(y to 8u) to Rational(2500, 1),
+                    mapOf(x to 1u, y to 8u) to Rational(-19000, 1),
+                    mapOf(x to 2u, y to 8u) to Rational(37900, 1),
+                    mapOf(x to 3u, y to 8u) to Rational(-1840, 1),
+                    mapOf(x to 4u, y to 8u) to Rational(-17876, 1),
+                    mapOf(x to 5u, y to 8u) to Rational(-1240, 1),
+                    mapOf(x to 6u, y to 8u) to Rational(2788, 1),
+                    mapOf(x to 7u, y to 8u) to Rational(800, 1),
+                    mapOf(x to 8u, y to 8u) to Rational(64, 1)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(162487, 63),
+                    mapOf(x to 1u) to Rational(-92713, 54),
+                    mapOf(x to 2u) to Rational(802436, 1323),
+                    mapOf(x to 3u) to Rational(-55088, 441),
+                    mapOf(x to 4u) to Rational(1404034, 9261),
+                    mapOf(x to 5u) to Rational(-5804, 1029),
+                    mapOf(x to 6u) to Rational(51556, 9261),
+                    mapOf(x to 7u) to Rational(-752, 441),
+                    mapOf(x to 8u) to Rational(16, 147),
+                    mapOf(y to 1u) to Rational(296071, 441),
+                    mapOf(x to 1u, y to 1u) to Rational(-4991281, 882),
+                    mapOf(x to 2u, y to 1u) to Rational(-18702811, 9261),
+                    mapOf(x to 3u, y to 1u) to Rational(40759043, 27783),
+                    mapOf(x to 4u, y to 1u) to Rational(19768501, 27783),
+                    mapOf(x to 5u, y to 1u) to Rational(14307337, 27783),
+                    mapOf(x to 6u, y to 1u) to Rational(1655684, 27783),
+                    mapOf(x to 7u, y to 1u) to Rational(22124, 1323),
+                    mapOf(x to 8u, y to 1u) to Rational(-1504, 441),
+                    mapOf(y to 2u) to Rational(-27667474, 3087),
+                    mapOf(x to 1u, y to 2u) to Rational(265605901, 12348),
+                    mapOf(x to 2u, y to 2u) to Rational(160360775, 98784),
+                    mapOf(x to 3u, y to 2u) to Rational(1169992093, 148176),
+                    mapOf(x to 4u, y to 2u) to Rational(3978014077, 1333584),
+                    mapOf(x to 5u, y to 2u) to Rational(567058123, 333396),
+                    mapOf(x to 6u, y to 2u) to Rational(205132579, 333396),
+                    mapOf(x to 7u, y to 2u) to Rational(566866, 3969),
+                    mapOf(x to 8u, y to 2u) to Rational(41848, 1323),
+                    mapOf(y to 3u) to Rational(-2228822, 1029),
+                    mapOf(x to 1u, y to 3u) to Rational(80179390, 3087),
+                    mapOf(x to 2u, y to 3u) to Rational(-1378630487, 74088),
+                    mapOf(x to 3u, y to 3u) to Rational(-3385811693, 111132),
+                    mapOf(x to 4u, y to 3u) to Rational(-820686977, 49392),
+                    mapOf(x to 5u, y to 3u) to Rational(-89101027, 10584),
+                    mapOf(x to 6u, y to 3u) to Rational(-37847387, 15876),
+                    mapOf(x to 7u, y to 3u) to Rational(-2363369, 3969),
+                    mapOf(x to 8u, y to 3u) to Rational(-108280, 1323),
+                    mapOf(y to 4u) to Rational(12619982, 1029),
+                    mapOf(x to 1u, y to 4u) to Rational(-277723177, 6174),
+                    mapOf(x to 2u, y to 4u) to Rational(649414169, 49392),
+                    mapOf(x to 3u, y to 4u) to Rational(14457595, 63504),
+                    mapOf(x to 4u, y to 4u) to Rational(139270339, 10584),
+                    mapOf(x to 5u, y to 4u) to Rational(140367961, 15876),
+                    mapOf(x to 6u, y to 4u) to Rational(25467083, 7056),
+                    mapOf(x to 7u, y to 4u) to Rational(8563385, 7938),
+                    mapOf(x to 8u, y to 4u) to Rational(19721, 147),
+                    mapOf(y to 5u) to Rational(643850, 147),
+                    mapOf(x to 1u, y to 5u) to Rational(-11818025, 294),
+                    mapOf(x to 2u, y to 5u) to Rational(33963203, 588),
+                    mapOf(x to 3u, y to 5u) to Rational(207216235, 5292),
+                    mapOf(x to 4u, y to 5u) to Rational(2861021, 1512),
+                    mapOf(x to 5u, y to 5u) to Rational(-6302335, 1176),
+                    mapOf(x to 6u, y to 5u) to Rational(-3738587, 882),
+                    mapOf(x to 7u, y to 5u) to Rational(-38437, 27),
+                    mapOf(x to 8u, y to 5u) to Rational(-29620, 189),
+                    mapOf(y to 6u) to Rational(-248725, 49),
+                    mapOf(x to 1u, y to 6u) to Rational(2478535, 98),
+                    mapOf(x to 2u, y to 6u) to Rational(-399721367, 21168),
+                    mapOf(x to 3u, y to 6u) to Rational(-54309317, 10584),
+                    mapOf(x to 4u, y to 6u) to Rational(-95398327, 21168),
+                    mapOf(x to 5u, y to 6u) to Rational(173750, 189),
+                    mapOf(x to 6u, y to 6u) to Rational(92216, 27),
+                    mapOf(x to 7u, y to 6u) to Rational(227744, 189),
+                    mapOf(x to 8u, y to 6u) to Rational(23116, 189),
+                    mapOf(y to 7u) to Rational(-27500, 21),
+                    mapOf(x to 1u, y to 7u) to Rational(120125, 9),
+                    mapOf(x to 2u, y to 7u) to Rational(-279200, 9),
+                    mapOf(x to 3u, y to 7u) to Rational(-100160, 21),
+                    mapOf(x to 4u, y to 7u) to Rational(920452, 63),
+                    mapOf(x to 5u, y to 7u) to Rational(226481, 63),
+                    mapOf(x to 6u, y to 7u) to Rational(-11476, 7),
+                    mapOf(x to 7u, y to 7u) to Rational(-6232, 9),
+                    mapOf(x to 8u, y to 7u) to Rational(-608, 9),
+                    mapOf(y to 8u) to Rational(2500, 3),
+                    mapOf(x to 1u, y to 8u) to Rational(-19000, 3),
+                    mapOf(x to 2u, y to 8u) to Rational(37900, 3),
+                    mapOf(x to 3u, y to 8u) to Rational(-1840, 3),
+                    mapOf(x to 4u, y to 8u) to Rational(-17876, 3),
+                    mapOf(x to 5u, y to 8u) to Rational(-1240, 3),
+                    mapOf(x to 6u, y to 8u) to Rational(2788, 3),
+                    mapOf(x to 7u, y to 8u) to Rational(800, 3),
+                    mapOf(x to 8u, y to 8u) to Rational(64, 3)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5, 6),
+                    mapOf(x to 1u) to Rational(1, 6),
+                    mapOf(x to 2u) to Rational(-2, 9),
+                    mapOf(y to 1u) to Rational(15, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
+                    mapOf(y to 2u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 9),
+                    mapOf(x to 1u) to Rational(4, 9),
+                    mapOf(x to 2u) to Rational(11, 6),
+                    mapOf(y to 1u) to Rational(-5, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
+                    mapOf(y to 2u) to Rational(9, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                x to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(18, 1),
+                    mapOf(x to 1u) to Rational(16, 3),
+                    mapOf(x to 2u) to Rational(12, 6),
+                    mapOf(y to 1u) to Rational(13, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(-11, 4),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 1),
+                    mapOf(y to 2u) to Rational(-10, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(2, 1),
+                ),
+                y to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(8, 2),
+                    mapOf(x to 1u) to Rational(-15, 5),
+                    mapOf(x to 2u) to Rational(2, 7),
+                    mapOf(y to 1u) to Rational(-18, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-13, 3),
+                    mapOf(y to 2u) to Rational(-5, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(8, 2),
+                ),
+                iota to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-6, 1),
+                    mapOf(x to 1u) to Rational(-9, 8),
+                    mapOf(x to 2u) to Rational(17, 5),
+                    mapOf(y to 1u) to Rational(-2, 3),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(-11, 7),
+                    mapOf(y to 2u) to Rational(13, 6),
+                    mapOf(x to 1u, y to 2u) to Rational(-15, 2),
+                    mapOf(x to 2u, y to 2u) to Rational(-14, 4),
+                )
+            )),
+            "test 3'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(493, 6),
+                    mapOf(x to 1u) to Rational(-15991, 210),
+                    mapOf(x to 2u) to Rational(2734, 63),
+                    mapOf(x to 3u) to Rational(-8213, 245),
+                    mapOf(x to 4u) to Rational(1843, 147),
+                    mapOf(x to 5u) to Rational(-432, 245),
+                    mapOf(x to 6u) to Rational(4, 49),
+                    mapOf(y to 1u) to Rational(-66, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(-92924, 2205),
+                    mapOf(x to 2u, y to 1u) to Rational(-257461, 2205),
+                    mapOf(x to 3u, y to 1u) to Rational(58658, 2205),
+                    mapOf(x to 4u, y to 1u) to Rational(-87884, 2205),
+                    mapOf(x to 5u, y to 1u) to Rational(2726, 105),
+                    mapOf(x to 6u, y to 1u) to Rational(-52, 21),
+                    mapOf(y to 2u) to Rational(-17569, 147),
+                    mapOf(x to 1u, y to 2u) to Rational(368819, 735),
+                    mapOf(x to 2u, y to 2u) to Rational(-644626, 6615),
+                    mapOf(x to 3u, y to 2u) to Rational(221738, 945),
+                    mapOf(x to 4u, y to 2u) to Rational(-18022, 945),
+                    mapOf(x to 5u, y to 2u) to Rational(-1201, 315),
+                    mapOf(x to 6u, y to 2u) to Rational(1327, 63),
+                    mapOf(y to 3u) to Rational(240, 7),
+                    mapOf(x to 1u, y to 3u) to Rational(-868, 9),
+                    mapOf(x to 2u, y to 3u) to Rational(-8936, 315),
+                    mapOf(x to 3u, y to 3u) to Rational(-77146, 315),
+                    mapOf(x to 4u, y to 3u) to Rational(-4072, 315),
+                    mapOf(x to 5u, y to 3u) to Rational(-2218, 15),
+                    mapOf(x to 6u, y to 3u) to Rational(-104, 3),
+                    mapOf(y to 4u) to Rational(100, 3),
+                    mapOf(x to 1u, y to 4u) to Rational(-725, 3),
+                    mapOf(x to 2u, y to 4u) to Rational(459, 1),
+                    mapOf(x to 3u, y to 4u) to Rational(-2071, 15),
+                    mapOf(x to 4u, y to 4u) to Rational(2831, 15),
+                    mapOf(x to 5u, y to 4u) to Rational(632, 5),
+                    mapOf(x to 6u, y to 4u) to Rational(16, 1)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1255, 9),
+                    mapOf(x to 1u) to Rational(-24781, 126),
+                    mapOf(x to 2u) to Rational(1195, 14),
+                    mapOf(x to 3u) to Rational(-1931, 147),
+                    mapOf(x to 4u) to Rational(439, 147),
+                    mapOf(x to 5u) to Rational(-172, 343),
+                    mapOf(x to 6u) to Rational(4, 147),
+                    mapOf(y to 1u) to Rational(-183, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(-30988, 441),
+                    mapOf(x to 2u, y to 1u) to Rational(-56137, 294),
+                    mapOf(x to 3u, y to 1u) to Rational(204308, 1029),
+                    mapOf(x to 4u, y to 1u) to Rational(-3263, 441),
+                    mapOf(x to 5u, y to 1u) to Rational(2662, 441),
+                    mapOf(x to 6u, y to 1u) to Rational(-52, 63),
+                    mapOf(y to 2u) to Rational(-87119, 294),
+                    mapOf(x to 1u, y to 2u) to Rational(1077919, 686),
+                    mapOf(x to 2u, y to 2u) to Rational(-35209, 147),
+                    mapOf(x to 3u, y to 2u) to Rational(15041, 147),
+                    mapOf(x to 4u, y to 2u) to Rational(240889, 1323),
+                    mapOf(x to 5u, y to 2u) to Rational(27778, 1323),
+                    mapOf(x to 6u, y to 2u) to Rational(1327, 189),
+                    mapOf(y to 3u) to Rational(1620, 7),
+                    mapOf(x to 1u, y to 3u) to Rational(-25716, 49),
+                    mapOf(x to 2u, y to 3u) to Rational(-32078, 49),
+                    mapOf(x to 3u, y to 3u) to Rational(-704038, 441),
+                    mapOf(x to 4u, y to 3u) to Rational(-30190, 63),
+                    mapOf(x to 5u, y to 3u) to Rational(-5414, 63),
+                    mapOf(x to 6u, y to 3u) to Rational(-104, 9),
+                    mapOf(y to 4u) to Rational(225, 1),
+                    mapOf(x to 1u, y to 4u) to Rational(-10560, 7),
+                    mapOf(x to 2u, y to 4u) to Rational(44176, 21),
+                    mapOf(x to 3u, y to 4u) to Rational(28996, 21),
+                    mapOf(x to 4u, y to 4u) to Rational(2405, 7),
+                    mapOf(x to 5u, y to 4u) to Rational(1240, 21),
+                    mapOf(x to 6u, y to 4u) to Rational(16, 3)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5, 6),
+                    mapOf(x to 1u) to Rational(1, 6),
+                    mapOf(x to 2u) to Rational(-2, 9),
+                    mapOf(y to 1u) to Rational(15, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
+                    mapOf(y to 2u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 9),
+                    mapOf(x to 1u) to Rational(4, 9),
+                    mapOf(x to 2u) to Rational(11, 6),
+                    mapOf(y to 1u) to Rational(-5, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
+                    mapOf(y to 2u) to Rational(9, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                y to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(8, 2),
+                    mapOf(x to 1u) to Rational(-15, 5),
+                    mapOf(x to 2u) to Rational(2, 7),
+                    mapOf(y to 1u) to Rational(-18, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-13, 3),
+                    mapOf(y to 2u) to Rational(-5, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(8, 2),
+                ),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(493, 6),
+                    mapOf(x to 1u) to Rational(-15991, 210),
+                    mapOf(x to 2u) to Rational(2734, 63),
+                    mapOf(x to 3u) to Rational(-8213, 245),
+                    mapOf(x to 4u) to Rational(1843, 147),
+                    mapOf(x to 5u) to Rational(-432, 245),
+                    mapOf(x to 6u) to Rational(4, 49),
+                    mapOf(y to 1u) to Rational(-66, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(-92924, 2205),
+                    mapOf(x to 2u, y to 1u) to Rational(-257461, 2205),
+                    mapOf(x to 3u, y to 1u) to Rational(58658, 2205),
+                    mapOf(x to 4u, y to 1u) to Rational(-87884, 2205),
+                    mapOf(x to 5u, y to 1u) to Rational(2726, 105),
+                    mapOf(x to 6u, y to 1u) to Rational(-52, 21),
+                    mapOf(y to 2u) to Rational(-17569, 147),
+                    mapOf(x to 1u, y to 2u) to Rational(368819, 735),
+                    mapOf(x to 2u, y to 2u) to Rational(-644626, 6615),
+                    mapOf(x to 3u, y to 2u) to Rational(221738, 945),
+                    mapOf(x to 4u, y to 2u) to Rational(-18022, 945),
+                    mapOf(x to 5u, y to 2u) to Rational(-1201, 315),
+                    mapOf(x to 6u, y to 2u) to Rational(1327, 63),
+                    mapOf(y to 3u) to Rational(240, 7),
+                    mapOf(x to 1u, y to 3u) to Rational(-868, 9),
+                    mapOf(x to 2u, y to 3u) to Rational(-8936, 315),
+                    mapOf(x to 3u, y to 3u) to Rational(-77146, 315),
+                    mapOf(x to 4u, y to 3u) to Rational(-4072, 315),
+                    mapOf(x to 5u, y to 3u) to Rational(-2218, 15),
+                    mapOf(x to 6u, y to 3u) to Rational(-104, 3),
+                    mapOf(y to 4u) to Rational(100, 3),
+                    mapOf(x to 1u, y to 4u) to Rational(-725, 3),
+                    mapOf(x to 2u, y to 4u) to Rational(459, 1),
+                    mapOf(x to 3u, y to 4u) to Rational(-2071, 15),
+                    mapOf(x to 4u, y to 4u) to Rational(2831, 15),
+                    mapOf(x to 5u, y to 4u) to Rational(632, 5),
+                    mapOf(x to 6u, y to 4u) to Rational(16, 1)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1255, 9),
+                    mapOf(x to 1u) to Rational(-24781, 126),
+                    mapOf(x to 2u) to Rational(1195, 14),
+                    mapOf(x to 3u) to Rational(-1931, 147),
+                    mapOf(x to 4u) to Rational(439, 147),
+                    mapOf(x to 5u) to Rational(-172, 343),
+                    mapOf(x to 6u) to Rational(4, 147),
+                    mapOf(y to 1u) to Rational(-183, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(-30988, 441),
+                    mapOf(x to 2u, y to 1u) to Rational(-56137, 294),
+                    mapOf(x to 3u, y to 1u) to Rational(204308, 1029),
+                    mapOf(x to 4u, y to 1u) to Rational(-3263, 441),
+                    mapOf(x to 5u, y to 1u) to Rational(2662, 441),
+                    mapOf(x to 6u, y to 1u) to Rational(-52, 63),
+                    mapOf(y to 2u) to Rational(-87119, 294),
+                    mapOf(x to 1u, y to 2u) to Rational(1077919, 686),
+                    mapOf(x to 2u, y to 2u) to Rational(-35209, 147),
+                    mapOf(x to 3u, y to 2u) to Rational(15041, 147),
+                    mapOf(x to 4u, y to 2u) to Rational(240889, 1323),
+                    mapOf(x to 5u, y to 2u) to Rational(27778, 1323),
+                    mapOf(x to 6u, y to 2u) to Rational(1327, 189),
+                    mapOf(y to 3u) to Rational(1620, 7),
+                    mapOf(x to 1u, y to 3u) to Rational(-25716, 49),
+                    mapOf(x to 2u, y to 3u) to Rational(-32078, 49),
+                    mapOf(x to 3u, y to 3u) to Rational(-704038, 441),
+                    mapOf(x to 4u, y to 3u) to Rational(-30190, 63),
+                    mapOf(x to 5u, y to 3u) to Rational(-5414, 63),
+                    mapOf(x to 6u, y to 3u) to Rational(-104, 9),
+                    mapOf(y to 4u) to Rational(225, 1),
+                    mapOf(x to 1u, y to 4u) to Rational(-10560, 7),
+                    mapOf(x to 2u, y to 4u) to Rational(44176, 21),
+                    mapOf(x to 3u, y to 4u) to Rational(28996, 21),
+                    mapOf(x to 4u, y to 4u) to Rational(2405, 7),
+                    mapOf(x to 5u, y to 4u) to Rational(1240, 21),
+                    mapOf(x to 6u, y to 4u) to Rational(16, 3)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5, 6),
+                    mapOf(x to 1u) to Rational(1, 6),
+                    mapOf(x to 2u) to Rational(-2, 9),
+                    mapOf(y to 1u) to Rational(15, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
+                    mapOf(y to 2u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 9),
+                    mapOf(x to 1u) to Rational(4, 9),
+                    mapOf(x to 2u) to Rational(11, 6),
+                    mapOf(y to 1u) to Rational(-5, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
+                    mapOf(y to 2u) to Rational(9, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                y to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(8, 2),
+                    mapOf(x to 1u) to Rational(-15, 5),
+                    mapOf(x to 2u) to Rational(2, 7),
+                    mapOf(y to 1u) to Rational(-18, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-16, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-13, 3),
+                    mapOf(y to 2u) to Rational(-5, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(8, 2),
+                ),
+                iota to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-6, 1),
+                    mapOf(x to 1u) to Rational(-9, 8),
+                    mapOf(x to 2u) to Rational(17, 5),
+                    mapOf(y to 1u) to Rational(-2, 3),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(-11, 7),
+                    mapOf(y to 2u) to Rational(13, 6),
+                    mapOf(x to 1u, y to 2u) to Rational(-15, 2),
+                    mapOf(x to 2u, y to 2u) to Rational(-14, 4),
+                )
+            )),
+            "test 4'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-409, 6),
+                    mapOf(x to 1u) to Rational(-376, 9),
+                    mapOf(x to 2u) to Rational(-1781, 81),
+                    mapOf(x to 3u) to Rational(-128, 27),
+                    mapOf(x to 4u) to Rational(-8, 9),
+                    mapOf(y to 1u) to Rational(18701, 210),
+                    mapOf(x to 1u, y to 1u) to Rational(614183, 7560),
+                    mapOf(x to 2u, y to 1u) to Rational(90941, 1890),
+                    mapOf(x to 3u, y to 1u) to Rational(1802, 135),
+                    mapOf(x to 4u, y to 1u) to Rational(112, 45),
+                    mapOf(y to 2u) to Rational(181421, 315),
+                    mapOf(x to 1u, y to 2u) to Rational(77813, 378),
+                    mapOf(x to 2u, y to 2u) to Rational(598583, 7560),
+                    mapOf(x to 3u, y to 2u) to Rational(85, 27),
+                    mapOf(x to 4u, y to 2u) to Rational(2, 5),
+                    mapOf(y to 3u) to Rational(130997, 315),
+                    mapOf(x to 1u, y to 3u) to Rational(1093, 420),
+                    mapOf(x to 2u, y to 3u) to Rational(9551, 2520),
+                    mapOf(x to 3u, y to 3u) to Rational(-14, 45),
+                    mapOf(x to 4u, y to 3u) to Rational(22, 45),
+                    mapOf(y to 4u) to Rational(-2801, 9),
+                    mapOf(x to 1u, y to 4u) to Rational(4033, 90),
+                    mapOf(x to 2u, y to 4u) to Rational(6429, 80),
+                    mapOf(x to 3u, y to 4u) to Rational(2851, 90),
+                    mapOf(x to 4u, y to 4u) to Rational(293, 45),
+                    mapOf(y to 5u) to Rational(-220, 1),
+                    mapOf(x to 1u, y to 5u) to Rational(127, 1),
+                    mapOf(x to 2u, y to 5u) to Rational(202, 5),
+                    mapOf(x to 3u, y to 5u) to Rational(-63, 5),
+                    mapOf(x to 4u, y to 5u) to Rational(-12, 5),
+                    mapOf(y to 6u) to Rational(100, 1),
+                    mapOf(x to 1u, y to 6u) to Rational(-80, 1),
+                    mapOf(x to 2u, y to 6u) to Rational(-24, 1),
+                    mapOf(x to 3u, y to 6u) to Rational(16, 1),
+                    mapOf(x to 4u, y to 6u) to Rational(4, 1)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5407, 9),
+                    mapOf(x to 1u) to Rational(9568, 27),
+                    mapOf(x to 2u) to Rational(4996, 27),
+                    mapOf(x to 3u) to Rational(352, 9),
+                    mapOf(x to 4u) to Rational(22, 3),
+                    mapOf(y to 1u) to Rational(104411, 126),
+                    mapOf(x to 1u, y to 1u) to Rational(6001, 126),
+                    mapOf(x to 2u, y to 1u) to Rational(-796, 21),
+                    mapOf(x to 3u, y to 1u) to Rational(-5389, 126),
+                    mapOf(x to 4u, y to 1u) to Rational(-166, 21),
+                    mapOf(y to 2u) to Rational(-35327, 126),
+                    mapOf(x to 1u, y to 2u) to Rational(53, 252),
+                    mapOf(x to 2u, y to 2u) to Rational(849197, 6048),
+                    mapOf(x to 3u, y to 2u) to Rational(22361, 252),
+                    mapOf(x to 4u, y to 2u) to Rational(773, 42),
+                    mapOf(y to 3u) to Rational(-6067, 21),
+                    mapOf(x to 1u, y to 3u) to Rational(39049, 126),
+                    mapOf(x to 2u, y to 3u) to Rational(80303, 1008),
+                    mapOf(x to 3u, y to 3u) to Rational(-3035, 63),
+                    mapOf(x to 4u, y to 3u) to Rational(-209, 21),
+                    mapOf(y to 4u) to Rational(3113, 21),
+                    mapOf(x to 1u, y to 4u) to Rational(-22345, 126),
+                    mapOf(x to 2u, y to 4u) to Rational(-30931, 1008),
+                    mapOf(x to 3u, y to 4u) to Rational(5837, 126),
+                    mapOf(x to 4u, y to 4u) to Rational(229, 21),
+                    mapOf(y to 5u) to Rational(-2120, 21),
+                    mapOf(x to 1u, y to 5u) to Rational(451, 7),
+                    mapOf(x to 2u, y to 5u) to Rational(422, 21),
+                    mapOf(x to 3u, y to 5u) to Rational(-181, 21),
+                    mapOf(x to 4u, y to 5u) to Rational(-40, 21),
+                    mapOf(y to 6u) to Rational(100, 3),
+                    mapOf(x to 1u, y to 6u) to Rational(-80, 3),
+                    mapOf(x to 2u, y to 6u) to Rational(-8, 1),
+                    mapOf(x to 3u, y to 6u) to Rational(16, 3),
+                    mapOf(x to 4u, y to 6u) to Rational(4, 3)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5, 6),
+                    mapOf(x to 1u) to Rational(1, 6),
+                    mapOf(x to 2u) to Rational(-2, 9),
+                    mapOf(y to 1u) to Rational(15, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
+                    mapOf(y to 2u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 9),
+                    mapOf(x to 1u) to Rational(4, 9),
+                    mapOf(x to 2u) to Rational(11, 6),
+                    mapOf(y to 1u) to Rational(-5, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
+                    mapOf(y to 2u) to Rational(9, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                x to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(18, 1),
+                    mapOf(x to 1u) to Rational(16, 3),
+                    mapOf(x to 2u) to Rational(12, 6),
+                    mapOf(y to 1u) to Rational(13, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(-11, 4),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 1),
+                    mapOf(y to 2u) to Rational(-10, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(2, 1),
+                ),
+            )),
+            "test 5"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-409, 6),
+                    mapOf(x to 1u) to Rational(-376, 9),
+                    mapOf(x to 2u) to Rational(-1781, 81),
+                    mapOf(x to 3u) to Rational(-128, 27),
+                    mapOf(x to 4u) to Rational(-8, 9),
+                    mapOf(y to 1u) to Rational(18701, 210),
+                    mapOf(x to 1u, y to 1u) to Rational(614183, 7560),
+                    mapOf(x to 2u, y to 1u) to Rational(90941, 1890),
+                    mapOf(x to 3u, y to 1u) to Rational(1802, 135),
+                    mapOf(x to 4u, y to 1u) to Rational(112, 45),
+                    mapOf(y to 2u) to Rational(181421, 315),
+                    mapOf(x to 1u, y to 2u) to Rational(77813, 378),
+                    mapOf(x to 2u, y to 2u) to Rational(598583, 7560),
+                    mapOf(x to 3u, y to 2u) to Rational(85, 27),
+                    mapOf(x to 4u, y to 2u) to Rational(2, 5),
+                    mapOf(y to 3u) to Rational(130997, 315),
+                    mapOf(x to 1u, y to 3u) to Rational(1093, 420),
+                    mapOf(x to 2u, y to 3u) to Rational(9551, 2520),
+                    mapOf(x to 3u, y to 3u) to Rational(-14, 45),
+                    mapOf(x to 4u, y to 3u) to Rational(22, 45),
+                    mapOf(y to 4u) to Rational(-2801, 9),
+                    mapOf(x to 1u, y to 4u) to Rational(4033, 90),
+                    mapOf(x to 2u, y to 4u) to Rational(6429, 80),
+                    mapOf(x to 3u, y to 4u) to Rational(2851, 90),
+                    mapOf(x to 4u, y to 4u) to Rational(293, 45),
+                    mapOf(y to 5u) to Rational(-220, 1),
+                    mapOf(x to 1u, y to 5u) to Rational(127, 1),
+                    mapOf(x to 2u, y to 5u) to Rational(202, 5),
+                    mapOf(x to 3u, y to 5u) to Rational(-63, 5),
+                    mapOf(x to 4u, y to 5u) to Rational(-12, 5),
+                    mapOf(y to 6u) to Rational(100, 1),
+                    mapOf(x to 1u, y to 6u) to Rational(-80, 1),
+                    mapOf(x to 2u, y to 6u) to Rational(-24, 1),
+                    mapOf(x to 3u, y to 6u) to Rational(16, 1),
+                    mapOf(x to 4u, y to 6u) to Rational(4, 1)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5407, 9),
+                    mapOf(x to 1u) to Rational(9568, 27),
+                    mapOf(x to 2u) to Rational(4996, 27),
+                    mapOf(x to 3u) to Rational(352, 9),
+                    mapOf(x to 4u) to Rational(22, 3),
+                    mapOf(y to 1u) to Rational(104411, 126),
+                    mapOf(x to 1u, y to 1u) to Rational(6001, 126),
+                    mapOf(x to 2u, y to 1u) to Rational(-796, 21),
+                    mapOf(x to 3u, y to 1u) to Rational(-5389, 126),
+                    mapOf(x to 4u, y to 1u) to Rational(-166, 21),
+                    mapOf(y to 2u) to Rational(-35327, 126),
+                    mapOf(x to 1u, y to 2u) to Rational(53, 252),
+                    mapOf(x to 2u, y to 2u) to Rational(849197, 6048),
+                    mapOf(x to 3u, y to 2u) to Rational(22361, 252),
+                    mapOf(x to 4u, y to 2u) to Rational(773, 42),
+                    mapOf(y to 3u) to Rational(-6067, 21),
+                    mapOf(x to 1u, y to 3u) to Rational(39049, 126),
+                    mapOf(x to 2u, y to 3u) to Rational(80303, 1008),
+                    mapOf(x to 3u, y to 3u) to Rational(-3035, 63),
+                    mapOf(x to 4u, y to 3u) to Rational(-209, 21),
+                    mapOf(y to 4u) to Rational(3113, 21),
+                    mapOf(x to 1u, y to 4u) to Rational(-22345, 126),
+                    mapOf(x to 2u, y to 4u) to Rational(-30931, 1008),
+                    mapOf(x to 3u, y to 4u) to Rational(5837, 126),
+                    mapOf(x to 4u, y to 4u) to Rational(229, 21),
+                    mapOf(y to 5u) to Rational(-2120, 21),
+                    mapOf(x to 1u, y to 5u) to Rational(451, 7),
+                    mapOf(x to 2u, y to 5u) to Rational(422, 21),
+                    mapOf(x to 3u, y to 5u) to Rational(-181, 21),
+                    mapOf(x to 4u, y to 5u) to Rational(-40, 21),
+                    mapOf(y to 6u) to Rational(100, 3),
+                    mapOf(x to 1u, y to 6u) to Rational(-80, 3),
+                    mapOf(x to 2u, y to 6u) to Rational(-8, 1),
+                    mapOf(x to 3u, y to 6u) to Rational(16, 3),
+                    mapOf(x to 4u, y to 6u) to Rational(4, 3)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5, 6),
+                    mapOf(x to 1u) to Rational(1, 6),
+                    mapOf(x to 2u) to Rational(-2, 9),
+                    mapOf(y to 1u) to Rational(15, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
+                    mapOf(y to 2u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 9),
+                    mapOf(x to 1u) to Rational(4, 9),
+                    mapOf(x to 2u) to Rational(11, 6),
+                    mapOf(y to 1u) to Rational(-5, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
+                    mapOf(y to 2u) to Rational(9, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                x to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(18, 1),
+                    mapOf(x to 1u) to Rational(16, 3),
+                    mapOf(x to 2u) to Rational(12, 6),
+                    mapOf(y to 1u) to Rational(13, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(-11, 4),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 1),
+                    mapOf(y to 2u) to Rational(-10, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(2, 1),
+                ),
+                iota to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-6, 1),
+                    mapOf(x to 1u) to Rational(-9, 8),
+                    mapOf(x to 2u) to Rational(17, 5),
+                    mapOf(y to 1u) to Rational(-2, 3),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(-11, 7),
+                    mapOf(y to 2u) to Rational(13, 6),
+                    mapOf(x to 1u, y to 2u) to Rational(-15, 2),
+                    mapOf(x to 2u, y to 2u) to Rational(-14, 4),
+                )
+            )),
+            "test 5'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5, 6),
+                    mapOf(x to 1u) to Rational(1, 6),
+                    mapOf(x to 2u) to Rational(-2, 9),
+                    mapOf(y to 1u) to Rational(15, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
+                    mapOf(y to 2u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 9),
+                    mapOf(x to 1u) to Rational(4, 9),
+                    mapOf(x to 2u) to Rational(11, 6),
+                    mapOf(y to 1u) to Rational(-5, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
+                    mapOf(y to 2u) to Rational(9, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5, 6),
+                    mapOf(x to 1u) to Rational(1, 6),
+                    mapOf(x to 2u) to Rational(-2, 9),
+                    mapOf(y to 1u) to Rational(15, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
+                    mapOf(y to 2u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 9),
+                    mapOf(x to 1u) to Rational(4, 9),
+                    mapOf(x to 2u) to Rational(11, 6),
+                    mapOf(y to 1u) to Rational(-5, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
+                    mapOf(y to 2u) to Rational(9, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf<Symbol, LabeledPolynomial<Rational>>()),
+            "test 6"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5, 6),
+                    mapOf(x to 1u) to Rational(1, 6),
+                    mapOf(x to 2u) to Rational(-2, 9),
+                    mapOf(y to 1u) to Rational(15, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
+                    mapOf(y to 2u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 9),
+                    mapOf(x to 1u) to Rational(4, 9),
+                    mapOf(x to 2u) to Rational(11, 6),
+                    mapOf(y to 1u) to Rational(-5, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
+                    mapOf(y to 2u) to Rational(9, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5, 6),
+                    mapOf(x to 1u) to Rational(1, 6),
+                    mapOf(x to 2u) to Rational(-2, 9),
+                    mapOf(y to 1u) to Rational(15, 1),
+                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
+                    mapOf(y to 2u) to Rational(12, 9),
+                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
+                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-11, 9),
+                    mapOf(x to 1u) to Rational(4, 9),
+                    mapOf(x to 2u) to Rational(11, 6),
+                    mapOf(y to 1u) to Rational(-5, 6),
+                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
+                    mapOf(y to 2u) to Rational(9, 1),
+                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
+                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
+                )
+            ).substitute(RationalField, mapOf(
+                iota to LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-6, 1),
+                    mapOf(x to 1u) to Rational(-9, 8),
+                    mapOf(x to 2u) to Rational(17, 5),
+                    mapOf(y to 1u) to Rational(-2, 3),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 5),
+                    mapOf(x to 2u, y to 1u) to Rational(-11, 7),
+                    mapOf(y to 2u) to Rational(13, 6),
+                    mapOf(x to 1u, y to 2u) to Rational(-15, 2),
+                    mapOf(x to 2u, y to 2u) to Rational(-14, 4),
+                )
+            )),
+            "test 6'"
+        )
+    }
+    @Test
+    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
+            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
+    fun test_RationalFunction_substitute_RationalFunction_Map() {
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(0)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1),
+                    mapOf(x to 1u) to Rational(-2),
+                    mapOf(x to 2u) to Rational(1)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1)
+                ),
+            ).substitute(RationalField, mapOf(
+                x to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(1)
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(1)
+                    )
+                )
+            )),
+            "test 1"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 4u) to Rational(-17166109, 793800),
+                    mapOf(x to 3u, y to 1u) to Rational(-930960143, 5556600),
+                    mapOf(x to 2u, y to 2u) to Rational(-144665109691, 350065800),
+                    mapOf(x to 1u, y to 3u) to Rational(-17232577, 52920),
+                    mapOf(y to 4u) to Rational(-68141, 1323),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf(x to 4u) to Rational(-57522533, 14288400),
+                    mapOf(x to 3u, y to 1u) to Rational(-13085162953, 300056400),
+                    mapOf(x to 2u, y to 2u) to Rational(-92093367341, 525098700),
+                    mapOf(x to 1u, y to 3u) to Rational(-1979342797, 6667920),
+                    mapOf(y to 4u) to Rational(-3082727, 21168),
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(10, 2),
+                    mapOf(x to 1u) to Rational(6, 7),
+                    mapOf(x to 2u) to Rational(-16, 1),
+                    mapOf(y to 1u) to Rational(13, 8),
+                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
+                    mapOf(y to 2u) to Rational(10, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-17, 4),
+                    mapOf(x to 2u) to Rational(-14, 8),
+                    mapOf(y to 1u) to Rational(17, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
+                    mapOf(y to 2u) to Rational(16, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                x to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf(x to 1u) to Rational(11, 5),
+                        mapOf(y to 1u) to Rational(8, 4),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf(x to 1u) to Rational(1, 9),
+                        mapOf(y to 1u) to Rational(11, 7),
+                    )
+                ),
+                y to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf(x to 1u) to Rational(-2, 7),
+                        mapOf(y to 1u) to Rational(-4, 3),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf(x to 1u) to Rational(3, 6),
+                        mapOf(y to 1u) to Rational(12, 8),
+                    )
+                ),
+            )),
+            "test 2"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-130778291, 76800),
+                    mapOf(x to 1u) to Rational(-445270919, 230400),
+                    mapOf(x to 2u) to Rational(44578444937, 14515200),
+                    mapOf(x to 3u) to Rational(17329402153, 1555200),
+                    mapOf(x to 4u) to Rational(89239926809, 2332800),
+                    mapOf(x to 5u) to Rational(2808812267, 145152),
+                    mapOf(x to 6u) to Rational(-21362661007, 725760),
+                    mapOf(x to 7u) to Rational(-258455443, 2016),
+                    mapOf(x to 8u) to Rational(-21454693, 96),
+                    mapOf(y to 1u) to Rational(-1002137, 15360),
+                    mapOf(x to 1u, y to 1u) to Rational(-1704849697, 430080),
+                    mapOf(x to 2u, y to 1u) to Rational(-57657676789, 4838400),
+                    mapOf(x to 3u, y to 1u) to Rational(-101331731, 89600),
+                    mapOf(x to 4u, y to 1u) to Rational(5362280079329, 130636800),
+                    mapOf(x to 5u, y to 1u) to Rational(4069896167053, 130636800),
+                    mapOf(x to 6u, y to 1u) to Rational(12011514569, 544320),
+                    mapOf(x to 7u, y to 1u) to Rational(138293195623, 725760),
+                    mapOf(x to 8u, y to 1u) to Rational(6228779419, 48384),
+                    mapOf(y to 2u) to Rational(-32395872823, 8064000),
+                    mapOf(x to 1u, y to 2u) to Rational(-7398505523, 2304000),
+                    mapOf(x to 2u, y to 2u) to Rational(95217051699521, 3048192000),
+                    mapOf(x to 3u, y to 2u) to Rational(198026968812079, 3657830400),
+                    mapOf(x to 4u, y to 2u) to Rational(4291645618499, 228614400),
+                    mapOf(x to 5u, y to 2u) to Rational(-33211690942439, 914457600),
+                    mapOf(x to 6u, y to 2u) to Rational(-637385538163153, 1371686400),
+                    mapOf(x to 7u, y to 2u) to Rational(-138671528276273, 182891520),
+                    mapOf(x to 8u, y to 2u) to Rational(-14566368751, 217728),
+                    mapOf(y to 3u) to Rational(-10538718719, 2016000),
+                    mapOf(x to 1u, y to 3u) to Rational(-1844485375199, 84672000),
+                    mapOf(x to 2u, y to 3u) to Rational(103968665891, 12096000),
+                    mapOf(x to 3u, y to 3u) to Rational(175402107278351, 1828915200),
+                    mapOf(x to 4u, y to 3u) to Rational(8020699588879, 114307200),
+                    mapOf(x to 5u, y to 3u) to Rational(3414841894991, 38102400),
+                    mapOf(x to 6u, y to 3u) to Rational(1848405591611, 4665600),
+                    mapOf(x to 7u, y to 3u) to Rational(39486708738989, 137168640),
+                    mapOf(x to 8u, y to 3u) to Rational(255926289517, 9144576),
+                    mapOf(y to 4u) to Rational(-655379564629, 105840000),
+                    mapOf(x to 1u, y to 4u) to Rational(-208336039441, 127008000),
+                    mapOf(x to 2u, y to 4u) to Rational(40173146771411, 1143072000),
+                    mapOf(x to 3u, y to 4u) to Rational(150473493581239, 2667168000),
+                    mapOf(x to 4u, y to 4u) to Rational(38833783990483, 1143072000),
+                    mapOf(x to 5u, y to 4u) to Rational(-1963676248203053, 4800902400),
+                    mapOf(x to 6u, y to 4u) to Rational(-2598759412825747, 3200601600),
+                    mapOf(x to 7u, y to 4u) to Rational(-192895352019667, 1280240640),
+                    mapOf(x to 8u, y to 4u) to Rational(3737382679, 6858432),
+                    mapOf(y to 5u) to Rational(-16959378721, 1890000),
+                    mapOf(x to 1u, y to 5u) to Rational(-1864802244743, 79380000),
+                    mapOf(x to 2u, y to 5u) to Rational(13449261536489, 666792000),
+                    mapOf(x to 3u, y to 5u) to Rational(215272234137329, 2667168000),
+                    mapOf(x to 4u, y to 5u) to Rational(6040691379277, 83349000),
+                    mapOf(x to 5u, y to 5u) to Rational(153687143525887, 800150400),
+                    mapOf(x to 6u, y to 5u) to Rational(475602854903563, 2400451200),
+                    mapOf(x to 7u, y to 5u) to Rational(27315599358749, 640120320),
+                    mapOf(x to 8u, y to 5u) to Rational(-2630413357, 10668672),
+                    mapOf(y to 6u) to Rational(-6654999511, 2646000),
+                    mapOf(x to 1u, y to 6u) to Rational(-67885252327, 15876000),
+                    mapOf(x to 2u, y to 6u) to Rational(5786776220983, 2667168000),
+                    mapOf(x to 3u, y to 6u) to Rational(60615922629083, 1143072000),
+                    mapOf(x to 4u, y to 6u) to Rational(-34703539637627407, 672126336000),
+                    mapOf(x to 5u, y to 6u) to Rational(-744694192134101, 2240421120),
+                    mapOf(x to 6u, y to 6u) to Rational(-1782470617231, 14817600),
+                    mapOf(x to 7u, y to 6u) to Rational(59123208433, 8890560),
+                    mapOf(x to 8u, y to 6u) to Rational(-141653, 5292),
+                    mapOf(y to 7u) to Rational(-338051969, 441000),
+                    mapOf(x to 1u, y to 7u) to Rational(468850013, 1764000),
+                    mapOf(x to 2u, y to 7u) to Rational(2102343426101, 222264000),
+                    mapOf(x to 3u, y to 7u) to Rational(7836130602007, 1333584000),
+                    mapOf(x to 4u, y to 7u) to Rational(16239111865997, 746807040),
+                    mapOf(x to 5u, y to 7u) to Rational(3824649185383, 88905600),
+                    mapOf(x to 6u, y to 7u) to Rational(56058614459, 3457440),
+                    mapOf(x to 7u, y to 7u) to Rational(-396766339, 493920),
+                    mapOf(x to 8u, y to 7u) to Rational(-165147, 2744),
+                    mapOf(y to 8u) to Rational(-3088619, 58800),
+                    mapOf(x to 1u, y to 8u) to Rational(155343347, 88200),
+                    mapOf(x to 2u, y to 8u) to Rational(100098736469, 7408800),
+                    mapOf(x to 3u, y to 8u) to Rational(109725511381, 7408800),
+                    mapOf(x to 4u, y to 8u) to Rational(-2431199641013, 59270400),
+                    mapOf(x to 5u, y to 8u) to Rational(-102872383249, 3457440),
+                    mapOf(x to 6u, y to 8u) to Rational(1449461309, 576240),
+                    mapOf(x to 7u, y to 8u) to Rational(812775, 1372),
+                    mapOf(x to 8u, y to 8u) to Rational(-16461, 343)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(164202773, 230400),
+                    mapOf(x to 1u) to Rational(-70345303, 518400),
+                    mapOf(x to 2u) to Rational(-4229702731, 4665600),
+                    mapOf(x to 3u) to Rational(3262171027, 6998400),
+                    mapOf(x to 4u) to Rational(-25423104169, 13996800),
+                    mapOf(x to 5u) to Rational(64061869, 349920),
+                    mapOf(x to 6u) to Rational(-1655878091, 116640),
+                    mapOf(x to 7u) to Rational(-7991441, 648),
+                    mapOf(x to 8u) to Rational(-502591, 18),
+                    mapOf(y to 1u) to Rational(-8780429, 3840),
+                    mapOf(x to 1u, y to 1u) to Rational(434272361, 115200),
+                    mapOf(x to 2u, y to 1u) to Rational(429825727, 41472),
+                    mapOf(x to 3u, y to 1u) to Rational(-10066790339, 6998400),
+                    mapOf(x to 4u, y to 1u) to Rational(70022035471, 20995200),
+                    mapOf(x to 5u, y to 1u) to Rational(-32070283493, 1399680),
+                    mapOf(x to 6u, y to 1u) to Rational(-22051101001, 1399680),
+                    mapOf(x to 7u, y to 1u) to Rational(-126493427, 12960),
+                    mapOf(x to 8u, y to 1u) to Rational(3050245, 864),
+                    mapOf(y to 2u) to Rational(-1194654631, 345600),
+                    mapOf(x to 1u, y to 2u) to Rational(-542961452671, 31104000),
+                    mapOf(x to 2u, y to 2u) to Rational(-234000873607, 48988800),
+                    mapOf(x to 3u, y to 2u) to Rational(140520538087, 3628800),
+                    mapOf(x to 4u, y to 2u) to Rational(9215088876563, 130636800),
+                    mapOf(x to 5u, y to 2u) to Rational(27590569647253, 293932800),
+                    mapOf(x to 6u, y to 2u) to Rational(5129057792891, 97977600),
+                    mapOf(x to 7u, y to 2u) to Rational(-106334191, 5103),
+                    mapOf(x to 8u, y to 2u) to Rational(-1024113911, 435456),
+                    mapOf(y to 3u) to Rational(76223843, 6000),
+                    mapOf(x to 1u, y to 3u) to Rational(57425857357, 2592000),
+                    mapOf(x to 2u, y to 3u) to Rational(-2044736497573, 46656000),
+                    mapOf(x to 3u, y to 3u) to Rational(-26155810120031, 293932800),
+                    mapOf(x to 4u, y to 3u) to Rational(-1064419459813, 6998400),
+                    mapOf(x to 5u, y to 3u) to Rational(-753782018389, 4082400),
+                    mapOf(x to 6u, y to 3u) to Rational(-291973360873, 2799360),
+                    mapOf(x to 7u, y to 3u) to Rational(-46372122599, 816480),
+                    mapOf(x to 8u, y to 3u) to Rational(3579859657, 653184),
+                    mapOf(y to 4u) to Rational(-13374241901, 4320000),
+                    mapOf(x to 1u, y to 4u) to Rational(306606499811, 54432000),
+                    mapOf(x to 2u, y to 4u) to Rational(964267124745437, 13716864000),
+                    mapOf(x to 3u, y to 4u) to Rational(21603809415373, 182891520),
+                    mapOf(x to 4u, y to 4u) to Rational(1097860214654027, 6858432000),
+                    mapOf(x to 5u, y to 4u) to Rational(161615254570669, 914457600),
+                    mapOf(x to 6u, y to 4u) to Rational(758415239461, 22861440),
+                    mapOf(x to 7u, y to 4u) to Rational(2585568355471, 274337280),
+                    mapOf(x to 8u, y to 4u) to Rational(-70433747863, 9144576),
+                    mapOf(y to 5u) to Rational(-9582586217, 2520000),
+                    mapOf(x to 1u, y to 5u) to Rational(-19093471394171, 635040000),
+                    mapOf(x to 2u, y to 5u) to Rational(-13010261944411, 381024000),
+                    mapOf(x to 3u, y to 5u) to Rational(-259039825301861, 4572288000),
+                    mapOf(x to 4u, y to 5u) to Rational(-305081119071079, 2286144000),
+                    mapOf(x to 5u, y to 5u) to Rational(-1923114383311, 19595520),
+                    mapOf(x to 6u, y to 5u) to Rational(-14181787253231, 228614400),
+                    mapOf(x to 7u, y to 5u) to Rational(-3959584789, 4354560),
+                    mapOf(x to 8u, y to 5u) to Rational(4691742523, 762048),
+                    mapOf(y to 6u) to Rational(-588323437, 180000),
+                    mapOf(x to 1u, y to 6u) to Rational(5952234691, 52920000),
+                    mapOf(x to 2u, y to 6u) to Rational(21001851056959, 1088640000),
+                    mapOf(x to 3u, y to 6u) to Rational(84668034357563, 2133734400),
+                    mapOf(x to 4u, y to 6u) to Rational(2029754605811557, 25604812800),
+                    mapOf(x to 5u, y to 6u) to Rational(11721216739823, 426746880),
+                    mapOf(x to 6u, y to 6u) to Rational(-8275903187003, 2133734400),
+                    mapOf(x to 7u, y to 6u) to Rational(-4730447299, 2540160),
+                    mapOf(x to 8u, y to 6u) to Rational(-46069985, 21168),
+                    mapOf(y to 7u) to Rational(-75711301, 117600),
+                    mapOf(x to 1u, y to 7u) to Rational(32430417413, 7056000),
+                    mapOf(x to 2u, y to 7u) to Rational(677988533153, 98784000),
+                    mapOf(x to 3u, y to 7u) to Rational(-948417645827, 71124480),
+                    mapOf(x to 4u, y to 7u) to Rational(-11320265215207, 711244800),
+                    mapOf(x to 5u, y to 7u) to Rational(-676438627783, 50803200),
+                    mapOf(x to 6u, y to 7u) to Rational(-7382274253, 1975680),
+                    mapOf(x to 7u, y to 7u) to Rational(6505733, 2205),
+                    mapOf(x to 8u, y to 7u) to Rational(450137, 882),
+                    mapOf(y to 8u) to Rational(-8368253, 78400),
+                    mapOf(x to 1u, y to 8u) to Rational(6833783, 117600),
+                    mapOf(x to 2u, y to 8u) to Rational(4528971133, 5927040),
+                    mapOf(x to 3u, y to 8u) to Rational(146252636617, 29635200),
+                    mapOf(x to 4u, y to 8u) to Rational(8321882556889, 1659571200),
+                    mapOf(x to 5u, y to 8u) to Rational(-4686033011, 1975680),
+                    mapOf(x to 6u, y to 8u) to Rational(-1074445963, 987840),
+                    mapOf(x to 7u, y to 8u) to Rational(-142313, 588),
+                    mapOf(x to 8u, y to 8u) to Rational(-4281, 49)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(10, 2),
+                    mapOf(x to 1u) to Rational(6, 7),
+                    mapOf(x to 2u) to Rational(-16, 1),
+                    mapOf(y to 1u) to Rational(13, 8),
+                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
+                    mapOf(y to 2u) to Rational(10, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-17, 4),
+                    mapOf(x to 2u) to Rational(-14, 8),
+                    mapOf(y to 1u) to Rational(17, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
+                    mapOf(y to 2u) to Rational(16, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                x to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-17, 5),
+                        mapOf(x to 1u) to Rational(2, 6),
+                        mapOf(x to 2u) to Rational(14, 1),
+                        mapOf(y to 1u) to Rational(-6, 6),
+                        mapOf(x to 1u, y to 1u) to Rational(-7, 3),
+                        mapOf(x to 2u, y to 1u) to Rational(-2, 9),
+                        mapOf(y to 2u) to Rational(-9, 6),
+                        mapOf(x to 1u, y to 2u) to Rational(17, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(2, 1),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(5, 4),
+                        mapOf(x to 1u) to Rational(-5, 9),
+                        mapOf(x to 2u) to Rational(-3, 6),
+                        mapOf(y to 1u) to Rational(6, 5),
+                        mapOf(x to 1u, y to 1u) to Rational(14, 5),
+                        mapOf(x to 2u, y to 1u) to Rational(5, 2),
+                        mapOf(y to 2u) to Rational(-18, 7),
+                        mapOf(x to 1u, y to 2u) to Rational(-8, 2),
+                        mapOf(x to 2u, y to 2u) to Rational(18, 9),
+                    )
+                ),
+                y to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(14, 4),
+                        mapOf(x to 1u) to Rational(7, 6),
+                        mapOf(x to 2u) to Rational(7, 2),
+                        mapOf(y to 1u) to Rational(-15, 2),
+                        mapOf(x to 1u, y to 1u) to Rational(-13, 8),
+                        mapOf(x to 2u, y to 1u) to Rational(-14, 3),
+                        mapOf(y to 2u) to Rational(-7, 6),
+                        mapOf(x to 1u, y to 2u) to Rational(7, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(9, 7),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-7, 4),
+                        mapOf(x to 1u) to Rational(-6, 3),
+                        mapOf(x to 2u) to Rational(-16, 2),
+                        mapOf(y to 1u) to Rational(-15, 5),
+                        mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                        mapOf(x to 2u, y to 1u) to Rational(5, 4),
+                        mapOf(y to 2u) to Rational(-12, 5),
+                        mapOf(x to 1u, y to 2u) to Rational(-18, 2),
+                        mapOf(x to 2u, y to 2u) to Rational(6, 7),
+                    )
+                ),
+            )),
+            "test 3"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-130778291, 76800),
+                    mapOf(x to 1u) to Rational(-445270919, 230400),
+                    mapOf(x to 2u) to Rational(44578444937, 14515200),
+                    mapOf(x to 3u) to Rational(17329402153, 1555200),
+                    mapOf(x to 4u) to Rational(89239926809, 2332800),
+                    mapOf(x to 5u) to Rational(2808812267, 145152),
+                    mapOf(x to 6u) to Rational(-21362661007, 725760),
+                    mapOf(x to 7u) to Rational(-258455443, 2016),
+                    mapOf(x to 8u) to Rational(-21454693, 96),
+                    mapOf(y to 1u) to Rational(-1002137, 15360),
+                    mapOf(x to 1u, y to 1u) to Rational(-1704849697, 430080),
+                    mapOf(x to 2u, y to 1u) to Rational(-57657676789, 4838400),
+                    mapOf(x to 3u, y to 1u) to Rational(-101331731, 89600),
+                    mapOf(x to 4u, y to 1u) to Rational(5362280079329, 130636800),
+                    mapOf(x to 5u, y to 1u) to Rational(4069896167053, 130636800),
+                    mapOf(x to 6u, y to 1u) to Rational(12011514569, 544320),
+                    mapOf(x to 7u, y to 1u) to Rational(138293195623, 725760),
+                    mapOf(x to 8u, y to 1u) to Rational(6228779419, 48384),
+                    mapOf(y to 2u) to Rational(-32395872823, 8064000),
+                    mapOf(x to 1u, y to 2u) to Rational(-7398505523, 2304000),
+                    mapOf(x to 2u, y to 2u) to Rational(95217051699521, 3048192000),
+                    mapOf(x to 3u, y to 2u) to Rational(198026968812079, 3657830400),
+                    mapOf(x to 4u, y to 2u) to Rational(4291645618499, 228614400),
+                    mapOf(x to 5u, y to 2u) to Rational(-33211690942439, 914457600),
+                    mapOf(x to 6u, y to 2u) to Rational(-637385538163153, 1371686400),
+                    mapOf(x to 7u, y to 2u) to Rational(-138671528276273, 182891520),
+                    mapOf(x to 8u, y to 2u) to Rational(-14566368751, 217728),
+                    mapOf(y to 3u) to Rational(-10538718719, 2016000),
+                    mapOf(x to 1u, y to 3u) to Rational(-1844485375199, 84672000),
+                    mapOf(x to 2u, y to 3u) to Rational(103968665891, 12096000),
+                    mapOf(x to 3u, y to 3u) to Rational(175402107278351, 1828915200),
+                    mapOf(x to 4u, y to 3u) to Rational(8020699588879, 114307200),
+                    mapOf(x to 5u, y to 3u) to Rational(3414841894991, 38102400),
+                    mapOf(x to 6u, y to 3u) to Rational(1848405591611, 4665600),
+                    mapOf(x to 7u, y to 3u) to Rational(39486708738989, 137168640),
+                    mapOf(x to 8u, y to 3u) to Rational(255926289517, 9144576),
+                    mapOf(y to 4u) to Rational(-655379564629, 105840000),
+                    mapOf(x to 1u, y to 4u) to Rational(-208336039441, 127008000),
+                    mapOf(x to 2u, y to 4u) to Rational(40173146771411, 1143072000),
+                    mapOf(x to 3u, y to 4u) to Rational(150473493581239, 2667168000),
+                    mapOf(x to 4u, y to 4u) to Rational(38833783990483, 1143072000),
+                    mapOf(x to 5u, y to 4u) to Rational(-1963676248203053, 4800902400),
+                    mapOf(x to 6u, y to 4u) to Rational(-2598759412825747, 3200601600),
+                    mapOf(x to 7u, y to 4u) to Rational(-192895352019667, 1280240640),
+                    mapOf(x to 8u, y to 4u) to Rational(3737382679, 6858432),
+                    mapOf(y to 5u) to Rational(-16959378721, 1890000),
+                    mapOf(x to 1u, y to 5u) to Rational(-1864802244743, 79380000),
+                    mapOf(x to 2u, y to 5u) to Rational(13449261536489, 666792000),
+                    mapOf(x to 3u, y to 5u) to Rational(215272234137329, 2667168000),
+                    mapOf(x to 4u, y to 5u) to Rational(6040691379277, 83349000),
+                    mapOf(x to 5u, y to 5u) to Rational(153687143525887, 800150400),
+                    mapOf(x to 6u, y to 5u) to Rational(475602854903563, 2400451200),
+                    mapOf(x to 7u, y to 5u) to Rational(27315599358749, 640120320),
+                    mapOf(x to 8u, y to 5u) to Rational(-2630413357, 10668672),
+                    mapOf(y to 6u) to Rational(-6654999511, 2646000),
+                    mapOf(x to 1u, y to 6u) to Rational(-67885252327, 15876000),
+                    mapOf(x to 2u, y to 6u) to Rational(5786776220983, 2667168000),
+                    mapOf(x to 3u, y to 6u) to Rational(60615922629083, 1143072000),
+                    mapOf(x to 4u, y to 6u) to Rational(-34703539637627407, 672126336000),
+                    mapOf(x to 5u, y to 6u) to Rational(-744694192134101, 2240421120),
+                    mapOf(x to 6u, y to 6u) to Rational(-1782470617231, 14817600),
+                    mapOf(x to 7u, y to 6u) to Rational(59123208433, 8890560),
+                    mapOf(x to 8u, y to 6u) to Rational(-141653, 5292),
+                    mapOf(y to 7u) to Rational(-338051969, 441000),
+                    mapOf(x to 1u, y to 7u) to Rational(468850013, 1764000),
+                    mapOf(x to 2u, y to 7u) to Rational(2102343426101, 222264000),
+                    mapOf(x to 3u, y to 7u) to Rational(7836130602007, 1333584000),
+                    mapOf(x to 4u, y to 7u) to Rational(16239111865997, 746807040),
+                    mapOf(x to 5u, y to 7u) to Rational(3824649185383, 88905600),
+                    mapOf(x to 6u, y to 7u) to Rational(56058614459, 3457440),
+                    mapOf(x to 7u, y to 7u) to Rational(-396766339, 493920),
+                    mapOf(x to 8u, y to 7u) to Rational(-165147, 2744),
+                    mapOf(y to 8u) to Rational(-3088619, 58800),
+                    mapOf(x to 1u, y to 8u) to Rational(155343347, 88200),
+                    mapOf(x to 2u, y to 8u) to Rational(100098736469, 7408800),
+                    mapOf(x to 3u, y to 8u) to Rational(109725511381, 7408800),
+                    mapOf(x to 4u, y to 8u) to Rational(-2431199641013, 59270400),
+                    mapOf(x to 5u, y to 8u) to Rational(-102872383249, 3457440),
+                    mapOf(x to 6u, y to 8u) to Rational(1449461309, 576240),
+                    mapOf(x to 7u, y to 8u) to Rational(812775, 1372),
+                    mapOf(x to 8u, y to 8u) to Rational(-16461, 343)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(164202773, 230400),
+                    mapOf(x to 1u) to Rational(-70345303, 518400),
+                    mapOf(x to 2u) to Rational(-4229702731, 4665600),
+                    mapOf(x to 3u) to Rational(3262171027, 6998400),
+                    mapOf(x to 4u) to Rational(-25423104169, 13996800),
+                    mapOf(x to 5u) to Rational(64061869, 349920),
+                    mapOf(x to 6u) to Rational(-1655878091, 116640),
+                    mapOf(x to 7u) to Rational(-7991441, 648),
+                    mapOf(x to 8u) to Rational(-502591, 18),
+                    mapOf(y to 1u) to Rational(-8780429, 3840),
+                    mapOf(x to 1u, y to 1u) to Rational(434272361, 115200),
+                    mapOf(x to 2u, y to 1u) to Rational(429825727, 41472),
+                    mapOf(x to 3u, y to 1u) to Rational(-10066790339, 6998400),
+                    mapOf(x to 4u, y to 1u) to Rational(70022035471, 20995200),
+                    mapOf(x to 5u, y to 1u) to Rational(-32070283493, 1399680),
+                    mapOf(x to 6u, y to 1u) to Rational(-22051101001, 1399680),
+                    mapOf(x to 7u, y to 1u) to Rational(-126493427, 12960),
+                    mapOf(x to 8u, y to 1u) to Rational(3050245, 864),
+                    mapOf(y to 2u) to Rational(-1194654631, 345600),
+                    mapOf(x to 1u, y to 2u) to Rational(-542961452671, 31104000),
+                    mapOf(x to 2u, y to 2u) to Rational(-234000873607, 48988800),
+                    mapOf(x to 3u, y to 2u) to Rational(140520538087, 3628800),
+                    mapOf(x to 4u, y to 2u) to Rational(9215088876563, 130636800),
+                    mapOf(x to 5u, y to 2u) to Rational(27590569647253, 293932800),
+                    mapOf(x to 6u, y to 2u) to Rational(5129057792891, 97977600),
+                    mapOf(x to 7u, y to 2u) to Rational(-106334191, 5103),
+                    mapOf(x to 8u, y to 2u) to Rational(-1024113911, 435456),
+                    mapOf(y to 3u) to Rational(76223843, 6000),
+                    mapOf(x to 1u, y to 3u) to Rational(57425857357, 2592000),
+                    mapOf(x to 2u, y to 3u) to Rational(-2044736497573, 46656000),
+                    mapOf(x to 3u, y to 3u) to Rational(-26155810120031, 293932800),
+                    mapOf(x to 4u, y to 3u) to Rational(-1064419459813, 6998400),
+                    mapOf(x to 5u, y to 3u) to Rational(-753782018389, 4082400),
+                    mapOf(x to 6u, y to 3u) to Rational(-291973360873, 2799360),
+                    mapOf(x to 7u, y to 3u) to Rational(-46372122599, 816480),
+                    mapOf(x to 8u, y to 3u) to Rational(3579859657, 653184),
+                    mapOf(y to 4u) to Rational(-13374241901, 4320000),
+                    mapOf(x to 1u, y to 4u) to Rational(306606499811, 54432000),
+                    mapOf(x to 2u, y to 4u) to Rational(964267124745437, 13716864000),
+                    mapOf(x to 3u, y to 4u) to Rational(21603809415373, 182891520),
+                    mapOf(x to 4u, y to 4u) to Rational(1097860214654027, 6858432000),
+                    mapOf(x to 5u, y to 4u) to Rational(161615254570669, 914457600),
+                    mapOf(x to 6u, y to 4u) to Rational(758415239461, 22861440),
+                    mapOf(x to 7u, y to 4u) to Rational(2585568355471, 274337280),
+                    mapOf(x to 8u, y to 4u) to Rational(-70433747863, 9144576),
+                    mapOf(y to 5u) to Rational(-9582586217, 2520000),
+                    mapOf(x to 1u, y to 5u) to Rational(-19093471394171, 635040000),
+                    mapOf(x to 2u, y to 5u) to Rational(-13010261944411, 381024000),
+                    mapOf(x to 3u, y to 5u) to Rational(-259039825301861, 4572288000),
+                    mapOf(x to 4u, y to 5u) to Rational(-305081119071079, 2286144000),
+                    mapOf(x to 5u, y to 5u) to Rational(-1923114383311, 19595520),
+                    mapOf(x to 6u, y to 5u) to Rational(-14181787253231, 228614400),
+                    mapOf(x to 7u, y to 5u) to Rational(-3959584789, 4354560),
+                    mapOf(x to 8u, y to 5u) to Rational(4691742523, 762048),
+                    mapOf(y to 6u) to Rational(-588323437, 180000),
+                    mapOf(x to 1u, y to 6u) to Rational(5952234691, 52920000),
+                    mapOf(x to 2u, y to 6u) to Rational(21001851056959, 1088640000),
+                    mapOf(x to 3u, y to 6u) to Rational(84668034357563, 2133734400),
+                    mapOf(x to 4u, y to 6u) to Rational(2029754605811557, 25604812800),
+                    mapOf(x to 5u, y to 6u) to Rational(11721216739823, 426746880),
+                    mapOf(x to 6u, y to 6u) to Rational(-8275903187003, 2133734400),
+                    mapOf(x to 7u, y to 6u) to Rational(-4730447299, 2540160),
+                    mapOf(x to 8u, y to 6u) to Rational(-46069985, 21168),
+                    mapOf(y to 7u) to Rational(-75711301, 117600),
+                    mapOf(x to 1u, y to 7u) to Rational(32430417413, 7056000),
+                    mapOf(x to 2u, y to 7u) to Rational(677988533153, 98784000),
+                    mapOf(x to 3u, y to 7u) to Rational(-948417645827, 71124480),
+                    mapOf(x to 4u, y to 7u) to Rational(-11320265215207, 711244800),
+                    mapOf(x to 5u, y to 7u) to Rational(-676438627783, 50803200),
+                    mapOf(x to 6u, y to 7u) to Rational(-7382274253, 1975680),
+                    mapOf(x to 7u, y to 7u) to Rational(6505733, 2205),
+                    mapOf(x to 8u, y to 7u) to Rational(450137, 882),
+                    mapOf(y to 8u) to Rational(-8368253, 78400),
+                    mapOf(x to 1u, y to 8u) to Rational(6833783, 117600),
+                    mapOf(x to 2u, y to 8u) to Rational(4528971133, 5927040),
+                    mapOf(x to 3u, y to 8u) to Rational(146252636617, 29635200),
+                    mapOf(x to 4u, y to 8u) to Rational(8321882556889, 1659571200),
+                    mapOf(x to 5u, y to 8u) to Rational(-4686033011, 1975680),
+                    mapOf(x to 6u, y to 8u) to Rational(-1074445963, 987840),
+                    mapOf(x to 7u, y to 8u) to Rational(-142313, 588),
+                    mapOf(x to 8u, y to 8u) to Rational(-4281, 49)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(10, 2),
+                    mapOf(x to 1u) to Rational(6, 7),
+                    mapOf(x to 2u) to Rational(-16, 1),
+                    mapOf(y to 1u) to Rational(13, 8),
+                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
+                    mapOf(y to 2u) to Rational(10, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-17, 4),
+                    mapOf(x to 2u) to Rational(-14, 8),
+                    mapOf(y to 1u) to Rational(17, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
+                    mapOf(y to 2u) to Rational(16, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                x to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-17, 5),
+                        mapOf(x to 1u) to Rational(2, 6),
+                        mapOf(x to 2u) to Rational(14, 1),
+                        mapOf(y to 1u) to Rational(-6, 6),
+                        mapOf(x to 1u, y to 1u) to Rational(-7, 3),
+                        mapOf(x to 2u, y to 1u) to Rational(-2, 9),
+                        mapOf(y to 2u) to Rational(-9, 6),
+                        mapOf(x to 1u, y to 2u) to Rational(17, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(2, 1),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(5, 4),
+                        mapOf(x to 1u) to Rational(-5, 9),
+                        mapOf(x to 2u) to Rational(-3, 6),
+                        mapOf(y to 1u) to Rational(6, 5),
+                        mapOf(x to 1u, y to 1u) to Rational(14, 5),
+                        mapOf(x to 2u, y to 1u) to Rational(5, 2),
+                        mapOf(y to 2u) to Rational(-18, 7),
+                        mapOf(x to 1u, y to 2u) to Rational(-8, 2),
+                        mapOf(x to 2u, y to 2u) to Rational(18, 9),
+                    )
+                ),
+                y to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(14, 4),
+                        mapOf(x to 1u) to Rational(7, 6),
+                        mapOf(x to 2u) to Rational(7, 2),
+                        mapOf(y to 1u) to Rational(-15, 2),
+                        mapOf(x to 1u, y to 1u) to Rational(-13, 8),
+                        mapOf(x to 2u, y to 1u) to Rational(-14, 3),
+                        mapOf(y to 2u) to Rational(-7, 6),
+                        mapOf(x to 1u, y to 2u) to Rational(7, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(9, 7),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-7, 4),
+                        mapOf(x to 1u) to Rational(-6, 3),
+                        mapOf(x to 2u) to Rational(-16, 2),
+                        mapOf(y to 1u) to Rational(-15, 5),
+                        mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                        mapOf(x to 2u, y to 1u) to Rational(5, 4),
+                        mapOf(y to 2u) to Rational(-12, 5),
+                        mapOf(x to 1u, y to 2u) to Rational(-18, 2),
+                        mapOf(x to 2u, y to 2u) to Rational(6, 7),
+                    )
+                ),
+                iota to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(5, 8),
+                        mapOf(x to 1u) to Rational(-12, 6),
+                        mapOf(x to 2u) to Rational(7, 6),
+                        mapOf(y to 1u) to Rational(-10, 4),
+                        mapOf(x to 1u, y to 1u) to Rational(-7, 6),
+                        mapOf(x to 2u, y to 1u) to Rational(8, 9),
+                        mapOf(y to 2u) to Rational(16, 3),
+                        mapOf(x to 1u, y to 2u) to Rational(-13, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(5, 1),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(10, 6),
+                        mapOf(x to 1u) to Rational(-18, 6),
+                        mapOf(x to 2u) to Rational(5, 1),
+                        mapOf(y to 1u) to Rational(17, 7),
+                        mapOf(x to 1u, y to 1u) to Rational(8, 4),
+                        mapOf(x to 2u, y to 1u) to Rational(-4, 9),
+                        mapOf(y to 2u) to Rational(-6, 5),
+                        mapOf(x to 1u, y to 2u) to Rational(-15, 8),
+                        mapOf(x to 2u, y to 2u) to Rational(-18, 5),
+                    )
+                ),
+            )),
+            "test 3'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(2303, 64),
+                    mapOf(x to 1u) to Rational(31843, 192),
+                    mapOf(x to 2u) to Rational(118891, 576),
+                    mapOf(x to 3u) to Rational(94453, 168),
+                    mapOf(x to 4u) to Rational(-179203, 1512),
+                    mapOf(x to 5u) to Rational(-16979, 126),
+                    mapOf(x to 6u) to Rational(-13499, 12),
+                    mapOf(y to 1u) to Rational(-4767, 64),
+                    mapOf(x to 1u, y to 1u) to Rational(-58689, 256),
+                    mapOf(x to 2u, y to 1u) to Rational(-757333, 4032),
+                    mapOf(x to 3u, y to 1u) to Rational(-4921205, 4032),
+                    mapOf(x to 4u, y to 1u) to Rational(-2930815, 4032),
+                    mapOf(x to 5u, y to 1u) to Rational(-398803, 1512),
+                    mapOf(x to 6u, y to 1u) to Rational(18835, 36),
+                    mapOf(y to 2u) to Rational(224101, 960),
+                    mapOf(x to 1u, y to 2u) to Rational(9139699, 40320),
+                    mapOf(x to 2u, y to 2u) to Rational(3848803, 5760),
+                    mapOf(x to 3u, y to 2u) to Rational(93102371, 241920),
+                    mapOf(x to 4u, y to 2u) to Rational(-65821229, 141120),
+                    mapOf(x to 5u, y to 2u) to Rational(-15675899, 7056),
+                    mapOf(x to 6u, y to 2u) to Rational(10459, 189),
+                    mapOf(y to 3u) to Rational(2411, 16),
+                    mapOf(x to 1u, y to 3u) to Rational(1294543, 10080),
+                    mapOf(x to 2u, y to 3u) to Rational(-1740199, 1440),
+                    mapOf(x to 3u, y to 3u) to Rational(-266994841, 282240),
+                    mapOf(x to 4u, y to 3u) to Rational(-41261893, 211680),
+                    mapOf(x to 5u, y to 3u) to Rational(1717357, 3528),
+                    mapOf(x to 6u, y to 3u) to Rational(69, 14),
+                    mapOf(y to 4u) to Rational(13231, 360),
+                    mapOf(x to 1u, y to 4u) to Rational(4858831, 25200),
+                    mapOf(x to 2u, y to 4u) to Rational(15565759, 75600),
+                    mapOf(x to 3u, y to 4u) to Rational(-15583391, 35280),
+                    mapOf(x to 4u, y to 4u) to Rational(-13345747, 11760),
+                    mapOf(x to 5u, y to 4u) to Rational(140103, 686),
+                    mapOf(x to 6u, y to 4u) to Rational(-765, 49)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(31409, 576),
+                    mapOf(x to 1u) to Rational(-337099, 1728),
+                    mapOf(x to 2u) to Rational(-211429, 1728),
+                    mapOf(x to 3u) to Rational(-259241, 432),
+                    mapOf(x to 4u) to Rational(-13777, 36),
+                    mapOf(x to 5u) to Rational(-41389, 72),
+                    mapOf(x to 6u) to Rational(-7679, 48),
+                    mapOf(y to 1u) to Rational(-3269, 12),
+                    mapOf(x to 1u, y to 1u) to Rational(629569, 864),
+                    mapOf(x to 2u, y to 1u) to Rational(53867, 324),
+                    mapOf(x to 3u, y to 1u) to Rational(2290577, 1728),
+                    mapOf(x to 4u, y to 1u) to Rational(101507, 216),
+                    mapOf(x to 5u, y to 1u) to Rational(213109, 288),
+                    mapOf(x to 6u, y to 1u) to Rational(17927, 144),
+                    mapOf(y to 2u) to Rational(314587, 1080),
+                    mapOf(x to 1u, y to 2u) to Rational(-109771, 144),
+                    mapOf(x to 2u, y to 2u) to Rational(-6469, 16),
+                    mapOf(x to 3u, y to 2u) to Rational(-298291681, 181440),
+                    mapOf(x to 4u, y to 2u) to Rational(-59147357, 48384),
+                    mapOf(x to 5u, y to 2u) to Rational(-4982365, 6048),
+                    mapOf(x to 6u, y to 2u) to Rational(-18727, 576),
+                    mapOf(y to 3u) to Rational(12379, 90),
+                    mapOf(x to 1u, y to 3u) to Rational(-542911, 1620),
+                    mapOf(x to 2u, y to 3u) to Rational(143123, 1260),
+                    mapOf(x to 3u, y to 3u) to Rational(9859177, 30240),
+                    mapOf(x to 4u, y to 3u) to Rational(9312529, 20160),
+                    mapOf(x to 5u, y to 3u) to Rational(207001, 672),
+                    mapOf(x to 6u, y to 3u) to Rational(203, 24),
+                    mapOf(y to 4u) to Rational(9442, 675),
+                    mapOf(x to 1u, y to 4u) to Rational(-13729, 300),
+                    mapOf(x to 2u, y to 4u) to Rational(-3490471, 25200),
+                    mapOf(x to 3u, y to 4u) to Rational(-333031, 840),
+                    mapOf(x to 4u, y to 4u) to Rational(-7572211, 47040),
+                    mapOf(x to 5u, y to 4u) to Rational(-1189, 56),
+                    mapOf(x to 6u, y to 4u) to Rational(-405, 196)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(10, 2),
+                    mapOf(x to 1u) to Rational(6, 7),
+                    mapOf(x to 2u) to Rational(-16, 1),
+                    mapOf(y to 1u) to Rational(13, 8),
+                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
+                    mapOf(y to 2u) to Rational(10, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-17, 4),
+                    mapOf(x to 2u) to Rational(-14, 8),
+                    mapOf(y to 1u) to Rational(17, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
+                    mapOf(y to 2u) to Rational(16, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                y to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(14, 4),
+                        mapOf(x to 1u) to Rational(7, 6),
+                        mapOf(x to 2u) to Rational(7, 2),
+                        mapOf(y to 1u) to Rational(-15, 2),
+                        mapOf(x to 1u, y to 1u) to Rational(-13, 8),
+                        mapOf(x to 2u, y to 1u) to Rational(-14, 3),
+                        mapOf(y to 2u) to Rational(-7, 6),
+                        mapOf(x to 1u, y to 2u) to Rational(7, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(9, 7),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-7, 4),
+                        mapOf(x to 1u) to Rational(-6, 3),
+                        mapOf(x to 2u) to Rational(-16, 2),
+                        mapOf(y to 1u) to Rational(-15, 5),
+                        mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                        mapOf(x to 2u, y to 1u) to Rational(5, 4),
+                        mapOf(y to 2u) to Rational(-12, 5),
+                        mapOf(x to 1u, y to 2u) to Rational(-18, 2),
+                        mapOf(x to 2u, y to 2u) to Rational(6, 7),
+                    )
+                ),
+            )),
+            "test 4"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(2303, 64),
+                    mapOf(x to 1u) to Rational(31843, 192),
+                    mapOf(x to 2u) to Rational(118891, 576),
+                    mapOf(x to 3u) to Rational(94453, 168),
+                    mapOf(x to 4u) to Rational(-179203, 1512),
+                    mapOf(x to 5u) to Rational(-16979, 126),
+                    mapOf(x to 6u) to Rational(-13499, 12),
+                    mapOf(y to 1u) to Rational(-4767, 64),
+                    mapOf(x to 1u, y to 1u) to Rational(-58689, 256),
+                    mapOf(x to 2u, y to 1u) to Rational(-757333, 4032),
+                    mapOf(x to 3u, y to 1u) to Rational(-4921205, 4032),
+                    mapOf(x to 4u, y to 1u) to Rational(-2930815, 4032),
+                    mapOf(x to 5u, y to 1u) to Rational(-398803, 1512),
+                    mapOf(x to 6u, y to 1u) to Rational(18835, 36),
+                    mapOf(y to 2u) to Rational(224101, 960),
+                    mapOf(x to 1u, y to 2u) to Rational(9139699, 40320),
+                    mapOf(x to 2u, y to 2u) to Rational(3848803, 5760),
+                    mapOf(x to 3u, y to 2u) to Rational(93102371, 241920),
+                    mapOf(x to 4u, y to 2u) to Rational(-65821229, 141120),
+                    mapOf(x to 5u, y to 2u) to Rational(-15675899, 7056),
+                    mapOf(x to 6u, y to 2u) to Rational(10459, 189),
+                    mapOf(y to 3u) to Rational(2411, 16),
+                    mapOf(x to 1u, y to 3u) to Rational(1294543, 10080),
+                    mapOf(x to 2u, y to 3u) to Rational(-1740199, 1440),
+                    mapOf(x to 3u, y to 3u) to Rational(-266994841, 282240),
+                    mapOf(x to 4u, y to 3u) to Rational(-41261893, 211680),
+                    mapOf(x to 5u, y to 3u) to Rational(1717357, 3528),
+                    mapOf(x to 6u, y to 3u) to Rational(69, 14),
+                    mapOf(y to 4u) to Rational(13231, 360),
+                    mapOf(x to 1u, y to 4u) to Rational(4858831, 25200),
+                    mapOf(x to 2u, y to 4u) to Rational(15565759, 75600),
+                    mapOf(x to 3u, y to 4u) to Rational(-15583391, 35280),
+                    mapOf(x to 4u, y to 4u) to Rational(-13345747, 11760),
+                    mapOf(x to 5u, y to 4u) to Rational(140103, 686),
+                    mapOf(x to 6u, y to 4u) to Rational(-765, 49)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(31409, 576),
+                    mapOf(x to 1u) to Rational(-337099, 1728),
+                    mapOf(x to 2u) to Rational(-211429, 1728),
+                    mapOf(x to 3u) to Rational(-259241, 432),
+                    mapOf(x to 4u) to Rational(-13777, 36),
+                    mapOf(x to 5u) to Rational(-41389, 72),
+                    mapOf(x to 6u) to Rational(-7679, 48),
+                    mapOf(y to 1u) to Rational(-3269, 12),
+                    mapOf(x to 1u, y to 1u) to Rational(629569, 864),
+                    mapOf(x to 2u, y to 1u) to Rational(53867, 324),
+                    mapOf(x to 3u, y to 1u) to Rational(2290577, 1728),
+                    mapOf(x to 4u, y to 1u) to Rational(101507, 216),
+                    mapOf(x to 5u, y to 1u) to Rational(213109, 288),
+                    mapOf(x to 6u, y to 1u) to Rational(17927, 144),
+                    mapOf(y to 2u) to Rational(314587, 1080),
+                    mapOf(x to 1u, y to 2u) to Rational(-109771, 144),
+                    mapOf(x to 2u, y to 2u) to Rational(-6469, 16),
+                    mapOf(x to 3u, y to 2u) to Rational(-298291681, 181440),
+                    mapOf(x to 4u, y to 2u) to Rational(-59147357, 48384),
+                    mapOf(x to 5u, y to 2u) to Rational(-4982365, 6048),
+                    mapOf(x to 6u, y to 2u) to Rational(-18727, 576),
+                    mapOf(y to 3u) to Rational(12379, 90),
+                    mapOf(x to 1u, y to 3u) to Rational(-542911, 1620),
+                    mapOf(x to 2u, y to 3u) to Rational(143123, 1260),
+                    mapOf(x to 3u, y to 3u) to Rational(9859177, 30240),
+                    mapOf(x to 4u, y to 3u) to Rational(9312529, 20160),
+                    mapOf(x to 5u, y to 3u) to Rational(207001, 672),
+                    mapOf(x to 6u, y to 3u) to Rational(203, 24),
+                    mapOf(y to 4u) to Rational(9442, 675),
+                    mapOf(x to 1u, y to 4u) to Rational(-13729, 300),
+                    mapOf(x to 2u, y to 4u) to Rational(-3490471, 25200),
+                    mapOf(x to 3u, y to 4u) to Rational(-333031, 840),
+                    mapOf(x to 4u, y to 4u) to Rational(-7572211, 47040),
+                    mapOf(x to 5u, y to 4u) to Rational(-1189, 56),
+                    mapOf(x to 6u, y to 4u) to Rational(-405, 196)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(10, 2),
+                    mapOf(x to 1u) to Rational(6, 7),
+                    mapOf(x to 2u) to Rational(-16, 1),
+                    mapOf(y to 1u) to Rational(13, 8),
+                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
+                    mapOf(y to 2u) to Rational(10, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-17, 4),
+                    mapOf(x to 2u) to Rational(-14, 8),
+                    mapOf(y to 1u) to Rational(17, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
+                    mapOf(y to 2u) to Rational(16, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                y to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(14, 4),
+                        mapOf(x to 1u) to Rational(7, 6),
+                        mapOf(x to 2u) to Rational(7, 2),
+                        mapOf(y to 1u) to Rational(-15, 2),
+                        mapOf(x to 1u, y to 1u) to Rational(-13, 8),
+                        mapOf(x to 2u, y to 1u) to Rational(-14, 3),
+                        mapOf(y to 2u) to Rational(-7, 6),
+                        mapOf(x to 1u, y to 2u) to Rational(7, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(9, 7),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-7, 4),
+                        mapOf(x to 1u) to Rational(-6, 3),
+                        mapOf(x to 2u) to Rational(-16, 2),
+                        mapOf(y to 1u) to Rational(-15, 5),
+                        mapOf(x to 1u, y to 1u) to Rational(4, 6),
+                        mapOf(x to 2u, y to 1u) to Rational(5, 4),
+                        mapOf(y to 2u) to Rational(-12, 5),
+                        mapOf(x to 1u, y to 2u) to Rational(-18, 2),
+                        mapOf(x to 2u, y to 2u) to Rational(6, 7),
+                    )
+                ),
+                iota to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(5, 8),
+                        mapOf(x to 1u) to Rational(-12, 6),
+                        mapOf(x to 2u) to Rational(7, 6),
+                        mapOf(y to 1u) to Rational(-10, 4),
+                        mapOf(x to 1u, y to 1u) to Rational(-7, 6),
+                        mapOf(x to 2u, y to 1u) to Rational(8, 9),
+                        mapOf(y to 2u) to Rational(16, 3),
+                        mapOf(x to 1u, y to 2u) to Rational(-13, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(5, 1),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(10, 6),
+                        mapOf(x to 1u) to Rational(-18, 6),
+                        mapOf(x to 2u) to Rational(5, 1),
+                        mapOf(y to 1u) to Rational(17, 7),
+                        mapOf(x to 1u, y to 1u) to Rational(8, 4),
+                        mapOf(x to 2u, y to 1u) to Rational(-4, 9),
+                        mapOf(y to 2u) to Rational(-6, 5),
+                        mapOf(x to 1u, y to 2u) to Rational(-15, 8),
+                        mapOf(x to 2u, y to 2u) to Rational(-18, 5),
+                    )
+                ),
+            )),
+            "test 4'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-506213, 2800),
+                    mapOf(x to 1u) to Rational(9859, 315),
+                    mapOf(x to 2u) to Rational(17384377, 11340),
+                    mapOf(x to 3u) to Rational(-9662, 63),
+                    mapOf(x to 4u) to Rational(-12563, 4),
+                    mapOf(y to 1u) to Rational(-486293, 22400),
+                    mapOf(x to 1u, y to 1u) to Rational(-6530947, 25200),
+                    mapOf(x to 2u, y to 1u) to Rational(866125, 18144),
+                    mapOf(x to 3u, y to 1u) to Rational(2948747, 2520),
+                    mapOf(x to 4u, y to 1u) to Rational(1196611, 2016),
+                    mapOf(y to 2u) to Rational(-20266021, 117600),
+                    mapOf(x to 1u, y to 2u) to Rational(26656339, 44100),
+                    mapOf(x to 2u, y to 2u) to Rational(19499183, 18144),
+                    mapOf(x to 3u, y to 2u) to Rational(-19801849, 7560),
+                    mapOf(x to 4u, y to 2u) to Rational(-2639635, 1296),
+                    mapOf(y to 3u) to Rational(-5017697, 29400),
+                    mapOf(x to 1u, y to 3u) to Rational(-606007, 1575),
+                    mapOf(x to 2u, y to 3u) to Rational(127494487, 132300),
+                    mapOf(x to 3u, y to 3u) to Rational(166567, 105),
+                    mapOf(x to 4u, y to 3u) to Rational(486403, 18144),
+                    mapOf(y to 4u) to Rational(-32182, 735),
+                    mapOf(x to 1u, y to 4u) to Rational(2420671, 8820),
+                    mapOf(x to 2u, y to 4u) to Rational(-12619193, 26460),
+                    mapOf(x to 3u, y to 4u) to Rational(-6823067, 5670),
+                    mapOf(x to 4u, y to 4u) to Rational(-2311693, 13608),
+                    mapOf(y to 5u) to Rational(-13324, 245),
+                    mapOf(x to 1u, y to 5u) to Rational(1966, 35),
+                    mapOf(x to 2u, y to 5u) to Rational(1052719, 2520),
+                    mapOf(x to 3u, y to 5u) to Rational(19153, 270),
+                    mapOf(x to 4u, y to 5u) to Rational(701, 54),
+                    mapOf(y to 6u) to Rational(4647, 196),
+                    mapOf(x to 1u, y to 6u) to Rational(2197, 28),
+                    mapOf(x to 2u, y to 6u) to Rational(-43853, 336),
+                    mapOf(x to 3u, y to 6u) to Rational(-301, 3),
+                    mapOf(x to 4u, y to 6u) to Rational(34, 3)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-2843, 1600),
+                    mapOf(x to 1u) to Rational(-1483, 240),
+                    mapOf(x to 2u) to Rational(110623, 1296),
+                    mapOf(x to 3u) to Rational(1265, 72),
+                    mapOf(x to 4u) to Rational(-5011, 16),
+                    mapOf(y to 1u) to Rational(47743, 1800),
+                    mapOf(x to 1u, y to 1u) to Rational(619229, 32400),
+                    mapOf(x to 2u, y to 1u) to Rational(-5978369, 58320),
+                    mapOf(x to 3u, y to 1u) to Rational(-86081, 1620),
+                    mapOf(x to 4u, y to 1u) to Rational(6325, 72),
+                    mapOf(y to 2u) to Rational(110951, 3360),
+                    mapOf(x to 1u, y to 2u) to Rational(-9550649, 302400),
+                    mapOf(x to 2u, y to 2u) to Rational(6542933, 85050),
+                    mapOf(x to 3u, y to 2u) to Rational(4708291, 38880),
+                    mapOf(x to 4u, y to 2u) to Rational(-433327, 1296),
+                    mapOf(y to 3u) to Rational(56143, 600),
+                    mapOf(x to 1u, y to 3u) to Rational(94243, 720),
+                    mapOf(x to 2u, y to 3u) to Rational(-46779139, 226800),
+                    mapOf(x to 3u, y to 3u) to Rational(-6948253, 12960),
+                    mapOf(x to 4u, y to 3u) to Rational(-260261, 486),
+                    mapOf(y to 4u) to Rational(-3205317, 19600),
+                    mapOf(x to 1u, y to 4u) to Rational(-201253, 1050),
+                    mapOf(x to 2u, y to 4u) to Rational(332192677, 302400),
+                    mapOf(x to 3u, y to 4u) to Rational(351511, 360),
+                    mapOf(x to 4u, y to 4u) to Rational(-40547, 81),
+                    mapOf(y to 5u) to Rational(-65421, 1960),
+                    mapOf(x to 1u, y to 5u) to Rational(-10118, 35),
+                    mapOf(x to 2u, y to 5u) to Rational(-4341709, 10080),
+                    mapOf(x to 3u, y to 5u) to Rational(-91703, 360),
+                    mapOf(x to 4u, y to 5u) to Rational(-85, 9),
+                    mapOf(y to 6u) to Rational(-25965, 784),
+                    mapOf(x to 1u, y to 6u) to Rational(3351, 16),
+                    mapOf(x to 2u, y to 6u) to Rational(595159, 1344),
+                    mapOf(x to 3u, y to 6u) to Rational(-1381, 12),
+                    mapOf(x to 4u, y to 6u) to Rational(-155, 3)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(10, 2),
+                    mapOf(x to 1u) to Rational(6, 7),
+                    mapOf(x to 2u) to Rational(-16, 1),
+                    mapOf(y to 1u) to Rational(13, 8),
+                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
+                    mapOf(y to 2u) to Rational(10, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-17, 4),
+                    mapOf(x to 2u) to Rational(-14, 8),
+                    mapOf(y to 1u) to Rational(17, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
+                    mapOf(y to 2u) to Rational(16, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                x to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-17, 5),
+                        mapOf(x to 1u) to Rational(2, 6),
+                        mapOf(x to 2u) to Rational(14, 1),
+                        mapOf(y to 1u) to Rational(-6, 6),
+                        mapOf(x to 1u, y to 1u) to Rational(-7, 3),
+                        mapOf(x to 2u, y to 1u) to Rational(-2, 9),
+                        mapOf(y to 2u) to Rational(-9, 6),
+                        mapOf(x to 1u, y to 2u) to Rational(17, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(2, 1),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(5, 4),
+                        mapOf(x to 1u) to Rational(-5, 9),
+                        mapOf(x to 2u) to Rational(-3, 6),
+                        mapOf(y to 1u) to Rational(6, 5),
+                        mapOf(x to 1u, y to 1u) to Rational(14, 5),
+                        mapOf(x to 2u, y to 1u) to Rational(5, 2),
+                        mapOf(y to 2u) to Rational(-18, 7),
+                        mapOf(x to 1u, y to 2u) to Rational(-8, 2),
+                        mapOf(x to 2u, y to 2u) to Rational(18, 9),
+                    )
+                ),
+            )),
+            "test 5"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-506213, 2800),
+                    mapOf(x to 1u) to Rational(9859, 315),
+                    mapOf(x to 2u) to Rational(17384377, 11340),
+                    mapOf(x to 3u) to Rational(-9662, 63),
+                    mapOf(x to 4u) to Rational(-12563, 4),
+                    mapOf(y to 1u) to Rational(-486293, 22400),
+                    mapOf(x to 1u, y to 1u) to Rational(-6530947, 25200),
+                    mapOf(x to 2u, y to 1u) to Rational(866125, 18144),
+                    mapOf(x to 3u, y to 1u) to Rational(2948747, 2520),
+                    mapOf(x to 4u, y to 1u) to Rational(1196611, 2016),
+                    mapOf(y to 2u) to Rational(-20266021, 117600),
+                    mapOf(x to 1u, y to 2u) to Rational(26656339, 44100),
+                    mapOf(x to 2u, y to 2u) to Rational(19499183, 18144),
+                    mapOf(x to 3u, y to 2u) to Rational(-19801849, 7560),
+                    mapOf(x to 4u, y to 2u) to Rational(-2639635, 1296),
+                    mapOf(y to 3u) to Rational(-5017697, 29400),
+                    mapOf(x to 1u, y to 3u) to Rational(-606007, 1575),
+                    mapOf(x to 2u, y to 3u) to Rational(127494487, 132300),
+                    mapOf(x to 3u, y to 3u) to Rational(166567, 105),
+                    mapOf(x to 4u, y to 3u) to Rational(486403, 18144),
+                    mapOf(y to 4u) to Rational(-32182, 735),
+                    mapOf(x to 1u, y to 4u) to Rational(2420671, 8820),
+                    mapOf(x to 2u, y to 4u) to Rational(-12619193, 26460),
+                    mapOf(x to 3u, y to 4u) to Rational(-6823067, 5670),
+                    mapOf(x to 4u, y to 4u) to Rational(-2311693, 13608),
+                    mapOf(y to 5u) to Rational(-13324, 245),
+                    mapOf(x to 1u, y to 5u) to Rational(1966, 35),
+                    mapOf(x to 2u, y to 5u) to Rational(1052719, 2520),
+                    mapOf(x to 3u, y to 5u) to Rational(19153, 270),
+                    mapOf(x to 4u, y to 5u) to Rational(701, 54),
+                    mapOf(y to 6u) to Rational(4647, 196),
+                    mapOf(x to 1u, y to 6u) to Rational(2197, 28),
+                    mapOf(x to 2u, y to 6u) to Rational(-43853, 336),
+                    mapOf(x to 3u, y to 6u) to Rational(-301, 3),
+                    mapOf(x to 4u, y to 6u) to Rational(34, 3)
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-2843, 1600),
+                    mapOf(x to 1u) to Rational(-1483, 240),
+                    mapOf(x to 2u) to Rational(110623, 1296),
+                    mapOf(x to 3u) to Rational(1265, 72),
+                    mapOf(x to 4u) to Rational(-5011, 16),
+                    mapOf(y to 1u) to Rational(47743, 1800),
+                    mapOf(x to 1u, y to 1u) to Rational(619229, 32400),
+                    mapOf(x to 2u, y to 1u) to Rational(-5978369, 58320),
+                    mapOf(x to 3u, y to 1u) to Rational(-86081, 1620),
+                    mapOf(x to 4u, y to 1u) to Rational(6325, 72),
+                    mapOf(y to 2u) to Rational(110951, 3360),
+                    mapOf(x to 1u, y to 2u) to Rational(-9550649, 302400),
+                    mapOf(x to 2u, y to 2u) to Rational(6542933, 85050),
+                    mapOf(x to 3u, y to 2u) to Rational(4708291, 38880),
+                    mapOf(x to 4u, y to 2u) to Rational(-433327, 1296),
+                    mapOf(y to 3u) to Rational(56143, 600),
+                    mapOf(x to 1u, y to 3u) to Rational(94243, 720),
+                    mapOf(x to 2u, y to 3u) to Rational(-46779139, 226800),
+                    mapOf(x to 3u, y to 3u) to Rational(-6948253, 12960),
+                    mapOf(x to 4u, y to 3u) to Rational(-260261, 486),
+                    mapOf(y to 4u) to Rational(-3205317, 19600),
+                    mapOf(x to 1u, y to 4u) to Rational(-201253, 1050),
+                    mapOf(x to 2u, y to 4u) to Rational(332192677, 302400),
+                    mapOf(x to 3u, y to 4u) to Rational(351511, 360),
+                    mapOf(x to 4u, y to 4u) to Rational(-40547, 81),
+                    mapOf(y to 5u) to Rational(-65421, 1960),
+                    mapOf(x to 1u, y to 5u) to Rational(-10118, 35),
+                    mapOf(x to 2u, y to 5u) to Rational(-4341709, 10080),
+                    mapOf(x to 3u, y to 5u) to Rational(-91703, 360),
+                    mapOf(x to 4u, y to 5u) to Rational(-85, 9),
+                    mapOf(y to 6u) to Rational(-25965, 784),
+                    mapOf(x to 1u, y to 6u) to Rational(3351, 16),
+                    mapOf(x to 2u, y to 6u) to Rational(595159, 1344),
+                    mapOf(x to 3u, y to 6u) to Rational(-1381, 12),
+                    mapOf(x to 4u, y to 6u) to Rational(-155, 3)
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(10, 2),
+                    mapOf(x to 1u) to Rational(6, 7),
+                    mapOf(x to 2u) to Rational(-16, 1),
+                    mapOf(y to 1u) to Rational(13, 8),
+                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
+                    mapOf(y to 2u) to Rational(10, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-17, 4),
+                    mapOf(x to 2u) to Rational(-14, 8),
+                    mapOf(y to 1u) to Rational(17, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
+                    mapOf(y to 2u) to Rational(16, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                x to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(-17, 5),
+                        mapOf(x to 1u) to Rational(2, 6),
+                        mapOf(x to 2u) to Rational(14, 1),
+                        mapOf(y to 1u) to Rational(-6, 6),
+                        mapOf(x to 1u, y to 1u) to Rational(-7, 3),
+                        mapOf(x to 2u, y to 1u) to Rational(-2, 9),
+                        mapOf(y to 2u) to Rational(-9, 6),
+                        mapOf(x to 1u, y to 2u) to Rational(17, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(2, 1),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(5, 4),
+                        mapOf(x to 1u) to Rational(-5, 9),
+                        mapOf(x to 2u) to Rational(-3, 6),
+                        mapOf(y to 1u) to Rational(6, 5),
+                        mapOf(x to 1u, y to 1u) to Rational(14, 5),
+                        mapOf(x to 2u, y to 1u) to Rational(5, 2),
+                        mapOf(y to 2u) to Rational(-18, 7),
+                        mapOf(x to 1u, y to 2u) to Rational(-8, 2),
+                        mapOf(x to 2u, y to 2u) to Rational(18, 9),
+                    )
+                ),
+                iota to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(5, 8),
+                        mapOf(x to 1u) to Rational(-12, 6),
+                        mapOf(x to 2u) to Rational(7, 6),
+                        mapOf(y to 1u) to Rational(-10, 4),
+                        mapOf(x to 1u, y to 1u) to Rational(-7, 6),
+                        mapOf(x to 2u, y to 1u) to Rational(8, 9),
+                        mapOf(y to 2u) to Rational(16, 3),
+                        mapOf(x to 1u, y to 2u) to Rational(-13, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(5, 1),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(10, 6),
+                        mapOf(x to 1u) to Rational(-18, 6),
+                        mapOf(x to 2u) to Rational(5, 1),
+                        mapOf(y to 1u) to Rational(17, 7),
+                        mapOf(x to 1u, y to 1u) to Rational(8, 4),
+                        mapOf(x to 2u, y to 1u) to Rational(-4, 9),
+                        mapOf(y to 2u) to Rational(-6, 5),
+                        mapOf(x to 1u, y to 2u) to Rational(-15, 8),
+                        mapOf(x to 2u, y to 2u) to Rational(-18, 5),
+                    )
+                ),
+            )),
+            "test 5'"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(10, 2),
+                    mapOf(x to 1u) to Rational(6, 7),
+                    mapOf(x to 2u) to Rational(-16, 1),
+                    mapOf(y to 1u) to Rational(13, 8),
+                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
+                    mapOf(y to 2u) to Rational(10, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-17, 4),
+                    mapOf(x to 2u) to Rational(-14, 8),
+                    mapOf(y to 1u) to Rational(17, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
+                    mapOf(y to 2u) to Rational(16, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(10, 2),
+                    mapOf(x to 1u) to Rational(6, 7),
+                    mapOf(x to 2u) to Rational(-16, 1),
+                    mapOf(y to 1u) to Rational(13, 8),
+                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
+                    mapOf(y to 2u) to Rational(10, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-17, 4),
+                    mapOf(x to 2u) to Rational(-14, 8),
+                    mapOf(y to 1u) to Rational(17, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
+                    mapOf(y to 2u) to Rational(16, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf<Symbol, LabeledRationalFunction<Rational>>()),
+            "test 6"
+        )
+        assertEquals(
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(10, 2),
+                    mapOf(x to 1u) to Rational(6, 7),
+                    mapOf(x to 2u) to Rational(-16, 1),
+                    mapOf(y to 1u) to Rational(13, 8),
+                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
+                    mapOf(y to 2u) to Rational(10, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-17, 4),
+                    mapOf(x to 2u) to Rational(-14, 8),
+                    mapOf(y to 1u) to Rational(17, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
+                    mapOf(y to 2u) to Rational(16, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            ),
+            LabeledRationalFunction(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(10, 2),
+                    mapOf(x to 1u) to Rational(6, 7),
+                    mapOf(x to 2u) to Rational(-16, 1),
+                    mapOf(y to 1u) to Rational(13, 8),
+                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
+                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
+                    mapOf(y to 2u) to Rational(10, 4),
+                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(1, 4),
+                    mapOf(x to 1u) to Rational(-17, 4),
+                    mapOf(x to 2u) to Rational(-14, 8),
+                    mapOf(y to 1u) to Rational(17, 9),
+                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
+                    mapOf(y to 2u) to Rational(16, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
+                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
+                )
+            ).substitute(RationalField, mapOf(
+                iota to LabeledRationalFunction(
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(5, 8),
+                        mapOf(x to 1u) to Rational(-12, 6),
+                        mapOf(x to 2u) to Rational(7, 6),
+                        mapOf(y to 1u) to Rational(-10, 4),
+                        mapOf(x to 1u, y to 1u) to Rational(-7, 6),
+                        mapOf(x to 2u, y to 1u) to Rational(8, 9),
+                        mapOf(y to 2u) to Rational(16, 3),
+                        mapOf(x to 1u, y to 2u) to Rational(-13, 4),
+                        mapOf(x to 2u, y to 2u) to Rational(5, 1),
+                    ),
+                    LabeledPolynomialAsIs(
+                        mapOf<Symbol, UInt>() to Rational(10, 6),
+                        mapOf(x to 1u) to Rational(-18, 6),
+                        mapOf(x to 2u) to Rational(5, 1),
+                        mapOf(y to 1u) to Rational(17, 7),
+                        mapOf(x to 1u, y to 1u) to Rational(8, 4),
+                        mapOf(x to 2u, y to 1u) to Rational(-4, 9),
+                        mapOf(y to 2u) to Rational(-6, 5),
+                        mapOf(x to 1u, y to 2u) to Rational(-15, 8),
+                        mapOf(x to 2u, y to 2u) to Rational(-18, 5),
+                    )
+                ),
+            )),
+            "test 6'"
+        )
+    }
+    @Test
+    @OptIn(UnstableKMathAPI::class)
+    fun test_Polynomial_derivativeWithRespectTo_variable() {
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-2),
+                mapOf(x to 1u) to Rational(2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).derivativeWithRespectTo(RationalField, x),
+            "test 1"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-2, 3),
+                mapOf(x to 1u) to Rational(1, 1),
+                mapOf(x to 2u) to Rational(-33, 8),
+                mapOf(x to 3u) to Rational(72, 1),
+                mapOf(y to 1u) to Rational(2, 3),
+                mapOf(x to 1u, y to 1u) to Rational(-22, 1),
+                mapOf(x to 2u, y to 1u) to Rational(-1, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-36, 1),
+                mapOf(y to 2u) to Rational(-8, 5),
+                mapOf(x to 1u, y to 2u) to Rational(-1, 4),
+                mapOf(x to 2u, y to 2u) to Rational(12, 7),
+                mapOf(x to 3u, y to 2u) to Rational(-2, 1),
+                mapOf(y to 3u) to Rational(16, 8),
+                mapOf(x to 1u, y to 3u) to Rational(-4, 1),
+                mapOf(x to 2u, y to 3u) to Rational(9, 2),
+                mapOf(x to 3u, y to 3u) to Rational(20, 9),
+                mapOf(y to 4u) to Rational(-10, 1),
+                mapOf(x to 1u, y to 4u) to Rational(-14, 1),
+                mapOf(x to 2u, y to 4u) to Rational(3, 7),
+                mapOf(x to 3u, y to 4u) to Rational(20, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).derivativeWithRespectTo(RationalField, x),
+            "test 2a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-18, 3),
+                mapOf(x to 1u) to Rational(2, 3),
+                mapOf(x to 2u) to Rational(-11, 1),
+                mapOf(x to 3u) to Rational(-1, 3),
+                mapOf(x to 4u) to Rational(-18, 2),
+                mapOf(y to 1u) to Rational(-20, 3),
+                mapOf(x to 1u, y to 1u) to Rational(-16, 5),
+                mapOf(x to 2u, y to 1u) to Rational(-1, 4),
+                mapOf(x to 3u, y to 1u) to Rational(8, 7),
+                mapOf(x to 4u, y to 1u) to Rational(-1, 1),
+                mapOf(y to 2u) to Rational(9, 7),
+                mapOf(x to 1u, y to 2u) to Rational(6, 1),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 1),
+                mapOf(x to 3u, y to 2u) to Rational(9, 2),
+                mapOf(x to 4u, y to 2u) to Rational(5, 3),
+                mapOf(y to 3u) to Rational(-9, 1),
+                mapOf(x to 1u, y to 3u) to Rational(-40, 1),
+                mapOf(x to 2u, y to 3u) to Rational(-28, 1),
+                mapOf(x to 3u, y to 3u) to Rational(4, 7),
+                mapOf(x to 4u, y to 3u) to Rational(20, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).derivativeWithRespectTo(RationalField, y),
+            "test 2b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(-1, 4),
+                mapOf(x to 2u, y to 2u) to Rational(12, 7),
+                mapOf(x to 3u, y to 2u) to Rational(-2, 1),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(-4, 1),
+                mapOf(x to 2u, y to 3u) to Rational(9, 2),
+                mapOf(x to 3u, y to 3u) to Rational(20, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(-14, 1),
+                mapOf(x to 2u, y to 4u) to Rational(3, 7),
+                mapOf(x to 3u, y to 4u) to Rational(20, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).derivativeWithRespectTo(RationalField, x),
+            "test 3a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(-1, 4),
+                mapOf(x to 3u, y to 1u) to Rational(8, 7),
+                mapOf(x to 4u, y to 1u) to Rational(-1, 1),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 1),
+                mapOf(x to 3u, y to 2u) to Rational(9, 2),
+                mapOf(x to 4u, y to 2u) to Rational(5, 3),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-28, 1),
+                mapOf(x to 3u, y to 3u) to Rational(4, 7),
+                mapOf(x to 4u, y to 3u) to Rational(20, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).derivativeWithRespectTo(RationalField, y),
+            "test 3b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-2, 3),
+                mapOf(x to 1u) to Rational(1, 1),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(y to 1u) to Rational(2, 3),
+                mapOf(x to 1u, y to 1u) to Rational(-22, 1),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-8, 5),
+                mapOf(x to 1u, y to 2u) to Rational(-1, 4),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).derivativeWithRespectTo(RationalField, x),
+            "test 4a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-18, 3),
+                mapOf(x to 1u) to Rational(2, 3),
+                mapOf(x to 2u) to Rational(-11, 1),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-20, 3),
+                mapOf(x to 1u, y to 1u) to Rational(-16, 5),
+                mapOf(x to 2u, y to 1u) to Rational(-1, 4),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).derivativeWithRespectTo(RationalField, y),
+            "test 4b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).derivativeWithRespectTo(RationalField, iota),
+            "test 5"
+        )
+    }
+    @Test
+    @OptIn(UnstableKMathAPI::class)
+    fun test_Polynomial_nthDerivativeWithRespectTo_variable_order() {
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-2),
+                mapOf(x to 1u) to Rational(2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, x, 1u),
+            "test 1"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, x, 0u),
+            "test 2"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, x, 2u),
+            "test 3"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, x, 3u),
+            "test 4"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, x, 4u),
+            "test 5"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, y, 0u),
+            "test 6"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, y, 1u),
+            "test 7"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, y, 2u),
+            "test 8"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1, 1),
+                mapOf(x to 1u) to Rational(-33, 4),
+                mapOf(x to 2u) to Rational(216, 1),
+                mapOf(y to 1u) to Rational(-22, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-2, 1),
+                mapOf(x to 2u, y to 1u) to Rational(-108, 1),
+                mapOf(y to 2u) to Rational(-1, 4),
+                mapOf(x to 1u, y to 2u) to Rational(24, 7),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 1),
+                mapOf(y to 3u) to Rational(-4, 1),
+                mapOf(x to 1u, y to 3u) to Rational(9, 1),
+                mapOf(x to 2u, y to 3u) to Rational(20, 3),
+                mapOf(y to 4u) to Rational(-14, 1),
+                mapOf(x to 1u, y to 4u) to Rational(6, 7),
+                mapOf(x to 2u, y to 4u) to Rational(60, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, x, 2u),
+            "test 9a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-20, 3),
+                mapOf(x to 1u) to Rational(-16, 5),
+                mapOf(x to 2u) to Rational(-1, 4),
+                mapOf(x to 3u) to Rational(8, 7),
+                mapOf(x to 4u) to Rational(-1, 1),
+                mapOf(y to 1u) to Rational(18, 7),
+                mapOf(x to 1u, y to 1u) to Rational(12, 1),
+                mapOf(x to 2u, y to 1u) to Rational(-12, 1),
+                mapOf(x to 3u, y to 1u) to Rational(9, 1),
+                mapOf(x to 4u, y to 1u) to Rational(10, 3),
+                mapOf(y to 2u) to Rational(-27, 1),
+                mapOf(x to 1u, y to 2u) to Rational(-120, 1),
+                mapOf(x to 2u, y to 2u) to Rational(-84, 1),
+                mapOf(x to 3u, y to 2u) to Rational(12, 7),
+                mapOf(x to 4u, y to 2u) to Rational(60, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, y, 2u),
+            "test 9b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-1, 4),
+                mapOf(x to 1u, y to 2u) to Rational(24, 7),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 1),
+                mapOf(y to 3u) to Rational(-4, 1),
+                mapOf(x to 1u, y to 3u) to Rational(9, 1),
+                mapOf(x to 2u, y to 3u) to Rational(20, 3),
+                mapOf(y to 4u) to Rational(-14, 1),
+                mapOf(x to 1u, y to 4u) to Rational(6, 7),
+                mapOf(x to 2u, y to 4u) to Rational(60, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, x, 2u),
+            "test 10a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(-1, 4),
+                mapOf(x to 3u) to Rational(8, 7),
+                mapOf(x to 4u) to Rational(-1, 1),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(-12, 1),
+                mapOf(x to 3u, y to 1u) to Rational(9, 1),
+                mapOf(x to 4u, y to 1u) to Rational(10, 3),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-84, 1),
+                mapOf(x to 3u, y to 2u) to Rational(12, 7),
+                mapOf(x to 4u, y to 2u) to Rational(60, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, y, 2u),
+            "test 10b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1, 1),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(y to 1u) to Rational(-22, 1),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-1, 4),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).nthDerivativeWithRespectTo(RationalField, x, 2u),
+            "test 11a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-20, 3),
+                mapOf(x to 1u) to Rational(-16, 5),
+                mapOf(x to 2u) to Rational(-1, 4),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).nthDerivativeWithRespectTo(RationalField, y, 2u),
+            "test 11b"
+        )
+    }
+    @Test
+    @OptIn(UnstableKMathAPI::class)
+    fun test_Polynomial_nthDerivativeWithRespectTo_variablesAndOrders() {
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-2),
+                mapOf(x to 1u) to Rational(2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 1u)),
+            "test 1"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 0u)),
+            "test 2"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 2u)),
+            "test 3"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 3u)),
+            "test 4"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 4u)),
+            "test 5"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(y to 0u)),
+            "test 6"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(y to 1u)),
+            "test 7"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(y to 2u)),
+            "test 8"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf()),
+            "test 9"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-2),
+                mapOf(x to 1u) to Rational(2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(
+                x to 1u,
+                y to 0u
+            )),
+            "test 10"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(
+                x to 0u,
+                y to 1u
+            )),
+            "test 11"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1, 1),
+                mapOf(x to 1u) to Rational(-33, 4),
+                mapOf(x to 2u) to Rational(216, 1),
+                mapOf(y to 1u) to Rational(-22, 1),
+                mapOf(x to 1u, y to 1u) to Rational(-2, 1),
+                mapOf(x to 2u, y to 1u) to Rational(-108, 1),
+                mapOf(y to 2u) to Rational(-1, 4),
+                mapOf(x to 1u, y to 2u) to Rational(24, 7),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 1),
+                mapOf(y to 3u) to Rational(-4, 1),
+                mapOf(x to 1u, y to 3u) to Rational(9, 1),
+                mapOf(x to 2u, y to 3u) to Rational(20, 3),
+                mapOf(y to 4u) to Rational(-14, 1),
+                mapOf(x to 1u, y to 4u) to Rational(6, 7),
+                mapOf(x to 2u, y to 4u) to Rational(60, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 2u)),
+            "test 12a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(2, 3),
+                mapOf(x to 1u) to Rational(-22, 1),
+                mapOf(x to 2u) to Rational(-1, 1),
+                mapOf(x to 3u) to Rational(-36, 1),
+                mapOf(y to 1u) to Rational(-16, 5),
+                mapOf(x to 1u, y to 1u) to Rational(-1, 2),
+                mapOf(x to 2u, y to 1u) to Rational(24, 7),
+                mapOf(x to 3u, y to 1u) to Rational(-4, 1),
+                mapOf(y to 2u) to Rational(6, 1),
+                mapOf(x to 1u, y to 2u) to Rational(-12, 1),
+                mapOf(x to 2u, y to 2u) to Rational(27, 2),
+                mapOf(x to 3u, y to 2u) to Rational(20, 3),
+                mapOf(y to 3u) to Rational(-40, 1),
+                mapOf(x to 1u, y to 3u) to Rational(-56, 1),
+                mapOf(x to 2u, y to 3u) to Rational(12, 7),
+                mapOf(x to 3u, y to 3u) to Rational(80, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 1u, y to 1u)),
+            "test 12b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-20, 3),
+                mapOf(x to 1u) to Rational(-16, 5),
+                mapOf(x to 2u) to Rational(-1, 4),
+                mapOf(x to 3u) to Rational(8, 7),
+                mapOf(x to 4u) to Rational(-1, 1),
+                mapOf(y to 1u) to Rational(18, 7),
+                mapOf(x to 1u, y to 1u) to Rational(12, 1),
+                mapOf(x to 2u, y to 1u) to Rational(-12, 1),
+                mapOf(x to 3u, y to 1u) to Rational(9, 1),
+                mapOf(x to 4u, y to 1u) to Rational(10, 3),
+                mapOf(y to 2u) to Rational(-27, 1),
+                mapOf(x to 1u, y to 2u) to Rational(-120, 1),
+                mapOf(x to 2u, y to 2u) to Rational(-84, 1),
+                mapOf(x to 3u, y to 2u) to Rational(12, 7),
+                mapOf(x to 4u, y to 2u) to Rational(60, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(y to 2u)),
+            "test 12c"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-1, 4),
+                mapOf(x to 1u, y to 2u) to Rational(24, 7),
+                mapOf(x to 2u, y to 2u) to Rational(-6, 1),
+                mapOf(y to 3u) to Rational(-4, 1),
+                mapOf(x to 1u, y to 3u) to Rational(9, 1),
+                mapOf(x to 2u, y to 3u) to Rational(20, 3),
+                mapOf(y to 4u) to Rational(-14, 1),
+                mapOf(x to 1u, y to 4u) to Rational(6, 7),
+                mapOf(x to 2u, y to 4u) to Rational(60, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 2u)),
+            "test 13a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(-1, 2),
+                mapOf(x to 2u, y to 1u) to Rational(24, 7),
+                mapOf(x to 3u, y to 1u) to Rational(-4, 1),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(-12, 1),
+                mapOf(x to 2u, y to 2u) to Rational(27, 2),
+                mapOf(x to 3u, y to 2u) to Rational(20, 3),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(-56, 1),
+                mapOf(x to 2u, y to 3u) to Rational(12, 7),
+                mapOf(x to 3u, y to 3u) to Rational(80, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 1u, y to 1u)),
+            "test 13b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(-1, 4),
+                mapOf(x to 3u) to Rational(8, 7),
+                mapOf(x to 4u) to Rational(-1, 1),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(-12, 1),
+                mapOf(x to 3u, y to 1u) to Rational(9, 1),
+                mapOf(x to 4u, y to 1u) to Rational(10, 3),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-84, 1),
+                mapOf(x to 3u, y to 2u) to Rational(12, 7),
+                mapOf(x to 4u, y to 2u) to Rational(60, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(y to 2u)),
+            "test 13c"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1, 1),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(y to 1u) to Rational(-22, 1),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-1, 4),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 2u)),
+            "test 14a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(2, 3),
+                mapOf(x to 1u) to Rational(-22, 1),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(y to 1u) to Rational(-16, 5),
+                mapOf(x to 1u, y to 1u) to Rational(-1, 2),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 1u, y to 1u)),
+            "test 14b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-20, 3),
+                mapOf(x to 1u) to Rational(-16, 5),
+                mapOf(x to 2u) to Rational(-1, 4),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).nthDerivativeWithRespectTo(RationalField, mapOf(y to 2u)),
+            "test 14c"
+        )
+    }
+    @Test
+    @OptIn(UnstableKMathAPI::class)
+    fun test_Polynomial_antiderivativeWithRespectTo_variable() {
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 1u) to Rational(1),
+                mapOf(x to 2u) to Rational(-1),
+                mapOf(x to 3u) to Rational(1, 3),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).antiderivativeWithRespectTo(RationalField, x),
+            "test 1"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 1u) to Rational(-6, 8),
+                mapOf(x to 2u) to Rational(-1, 3),
+                mapOf(x to 3u) to Rational(1, 6),
+                mapOf(x to 4u) to Rational(-11, 32),
+                mapOf(x to 5u) to Rational(18, 5),
+                mapOf(x to 1u, y to 1u) to Rational(-18, 3),
+                mapOf(x to 2u, y to 1u) to Rational(1, 3),
+                mapOf(x to 3u, y to 1u) to Rational(-11, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-1, 12),
+                mapOf(x to 5u, y to 1u) to Rational(-18, 10),
+                mapOf(x to 1u, y to 2u) to Rational(-10, 3),
+                mapOf(x to 2u, y to 2u) to Rational(-4, 5),
+                mapOf(x to 3u, y to 2u) to Rational(-1, 24),
+                mapOf(x to 4u, y to 2u) to Rational(1, 7),
+                mapOf(x to 5u, y to 2u) to Rational(-1, 10),
+                mapOf(x to 1u, y to 3u) to Rational(3, 7),
+                mapOf(x to 2u, y to 3u) to Rational(1, 1),
+                mapOf(x to 3u, y to 3u) to Rational(-2, 3),
+                mapOf(x to 4u, y to 3u) to Rational(3, 8),
+                mapOf(x to 5u, y to 3u) to Rational(1, 9),
+                mapOf(x to 1u, y to 4u) to Rational(-18, 8),
+                mapOf(x to 2u, y to 4u) to Rational(-5, 1),
+                mapOf(x to 3u, y to 4u) to Rational(-7, 3),
+                mapOf(x to 4u, y to 4u) to Rational(1, 28),
+                mapOf(x to 5u, y to 4u) to Rational(1, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).antiderivativeWithRespectTo(RationalField, x),
+            "test 2a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 1u) to Rational(-6, 8),
+                mapOf(x to 1u, y to 1u) to Rational(-2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(1, 2),
+                mapOf(x to 3u, y to 1u) to Rational(-11, 8),
+                mapOf(x to 4u, y to 1u) to Rational(18, 1),
+                mapOf(y to 2u) to Rational(-9, 3),
+                mapOf(x to 1u, y to 2u) to Rational(1, 3),
+                mapOf(x to 2u, y to 2u) to Rational(-11, 2),
+                mapOf(x to 3u, y to 2u) to Rational(-1, 6),
+                mapOf(x to 4u, y to 2u) to Rational(-9, 2),
+                mapOf(y to 3u) to Rational(-10, 9),
+                mapOf(x to 1u, y to 3u) to Rational(-8, 15),
+                mapOf(x to 2u, y to 3u) to Rational(-1, 24),
+                mapOf(x to 3u, y to 3u) to Rational(4, 21),
+                mapOf(x to 4u, y to 3u) to Rational(-1, 6),
+                mapOf(y to 4u) to Rational(3, 28),
+                mapOf(x to 1u, y to 4u) to Rational(1, 2),
+                mapOf(x to 2u, y to 4u) to Rational(-1, 2),
+                mapOf(x to 3u, y to 4u) to Rational(3, 8),
+                mapOf(x to 4u, y to 4u) to Rational(5, 36),
+                mapOf(y to 5u) to Rational(-9, 20),
+                mapOf(x to 1u, y to 5u) to Rational(-2, 1),
+                mapOf(x to 2u, y to 5u) to Rational(-7, 5),
+                mapOf(x to 3u, y to 5u) to Rational(1, 35),
+                mapOf(x to 4u, y to 5u) to Rational(1, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).antiderivativeWithRespectTo(RationalField, y),
+            "test 2b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(x to 5u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(x to 5u, y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(x to 3u, y to 2u) to Rational(-1, 24),
+                mapOf(x to 4u, y to 2u) to Rational(1, 7),
+                mapOf(x to 5u, y to 2u) to Rational(-1, 10),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(-2, 3),
+                mapOf(x to 4u, y to 3u) to Rational(3, 8),
+                mapOf(x to 5u, y to 3u) to Rational(1, 9),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(-7, 3),
+                mapOf(x to 4u, y to 4u) to Rational(1, 28),
+                mapOf(x to 5u, y to 4u) to Rational(1, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).antiderivativeWithRespectTo(RationalField, x),
+            "test 3a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-1, 24),
+                mapOf(x to 3u, y to 3u) to Rational(4, 21),
+                mapOf(x to 4u, y to 3u) to Rational(-1, 6),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-1, 2),
+                mapOf(x to 3u, y to 4u) to Rational(3, 8),
+                mapOf(x to 4u, y to 4u) to Rational(5, 36),
+                mapOf(y to 5u) to Rational(0),
+                mapOf(x to 1u, y to 5u) to Rational(0),
+                mapOf(x to 2u, y to 5u) to Rational(-7, 5),
+                mapOf(x to 3u, y to 5u) to Rational(1, 35),
+                mapOf(x to 4u, y to 5u) to Rational(1, 1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).antiderivativeWithRespectTo(RationalField, y),
+            "test 3b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 1u) to Rational(-6, 8),
+                mapOf(x to 2u) to Rational(-1, 3),
+                mapOf(x to 3u) to Rational(1, 6),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(x to 5u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(-18, 3),
+                mapOf(x to 2u, y to 1u) to Rational(1, 3),
+                mapOf(x to 3u, y to 1u) to Rational(-11, 3),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(x to 5u, y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(-10, 3),
+                mapOf(x to 2u, y to 2u) to Rational(-4, 5),
+                mapOf(x to 3u, y to 2u) to Rational(-1, 24),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(x to 5u, y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(x to 5u, y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+                mapOf(x to 5u, y to 4u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).antiderivativeWithRespectTo(RationalField, x),
+            "test 4a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 1u) to Rational(-6, 8),
+                mapOf(x to 1u, y to 1u) to Rational(-2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(1, 2),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-9, 3),
+                mapOf(x to 1u, y to 2u) to Rational(1, 3),
+                mapOf(x to 2u, y to 2u) to Rational(-11, 2),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(-10, 9),
+                mapOf(x to 1u, y to 3u) to Rational(-8, 15),
+                mapOf(x to 2u, y to 3u) to Rational(-1, 24),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+                mapOf(y to 5u) to Rational(0),
+                mapOf(x to 1u, y to 5u) to Rational(0),
+                mapOf(x to 2u, y to 5u) to Rational(0),
+                mapOf(x to 3u, y to 5u) to Rational(0),
+                mapOf(x to 4u, y to 5u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).antiderivativeWithRespectTo(RationalField, y),
+            "test 4b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(iota to 1u) to Rational(-6, 8),
+                mapOf(x to 1u, iota to 1u) to Rational(-2, 3),
+                mapOf(x to 2u, iota to 1u) to Rational(1, 2),
+                mapOf(x to 3u, iota to 1u) to Rational(-11, 8),
+                mapOf(x to 4u, iota to 1u) to Rational(18, 1),
+                mapOf(y to 1u, iota to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u, iota to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u, iota to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u, iota to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u, iota to 1u) to Rational(-18, 2),
+                mapOf(y to 2u, iota to 1u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u, iota to 1u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u, iota to 1u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u, iota to 1u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u, iota to 1u) to Rational(-4, 8),
+                mapOf(y to 3u, iota to 1u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u, iota to 1u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u, iota to 1u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u, iota to 1u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u, iota to 1u) to Rational(5, 9),
+                mapOf(y to 4u, iota to 1u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u, iota to 1u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u, iota to 1u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u, iota to 1u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u, iota to 1u) to Rational(15, 3),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).antiderivativeWithRespectTo(RationalField, iota),
+            "test 5"
+        )
+    }
+    @Test
+    @OptIn(UnstableKMathAPI::class)
+    fun test_Polynomial_nthAntiderivativeWithRespectTo_variable_order() {
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 1u) to Rational(1),
+                mapOf(x to 2u) to Rational(-1),
+                mapOf(x to 3u) to Rational(1, 3),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, x, 1u),
+            "test 1"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, x, 0u),
+            "test 2"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-1, 3),
+                mapOf(x to 4u) to Rational(1, 12),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, x, 2u),
+            "test 3"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 3u) to Rational(1, 6),
+                mapOf(x to 4u) to Rational(-1, 12),
+                mapOf(x to 5u) to Rational(1, 60),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, x, 3u),
+            "test 4"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 4u) to Rational(1, 24),
+                mapOf(x to 5u) to Rational(-1, 60),
+                mapOf(x to 6u) to Rational(1, 360),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, x, 4u),
+            "test 5"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, y, 0u),
+            "test 6"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 1u) to Rational(1),
+                mapOf(x to 1u, y to 1u) to Rational(-2),
+                mapOf(x to 2u, y to 1u) to Rational(1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, y, 1u),
+            "test 7"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 2u) to Rational(1, 2),
+                mapOf(x to 1u, y to 2u) to Rational(-1),
+                mapOf(x to 2u, y to 2u) to Rational(1, 2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, y, 2u),
+            "test 8"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 2u) to Rational(-3, 8),
+                mapOf(x to 3u) to Rational(-1, 9),
+                mapOf(x to 4u) to Rational(1, 24),
+                mapOf(x to 5u) to Rational(-11, 160),
+                mapOf(x to 6u) to Rational(3, 5),
+                mapOf(x to 2u, y to 1u) to Rational(-9, 3),
+                mapOf(x to 3u, y to 1u) to Rational(1, 9),
+                mapOf(x to 4u, y to 1u) to Rational(-11, 12),
+                mapOf(x to 5u, y to 1u) to Rational(-1, 60),
+                mapOf(x to 6u, y to 1u) to Rational(-3, 10),
+                mapOf(x to 2u, y to 2u) to Rational(-5, 3),
+                mapOf(x to 3u, y to 2u) to Rational(-4, 15),
+                mapOf(x to 4u, y to 2u) to Rational(-1, 96),
+                mapOf(x to 5u, y to 2u) to Rational(1, 35),
+                mapOf(x to 6u, y to 2u) to Rational(-1, 60),
+                mapOf(x to 2u, y to 3u) to Rational(3, 14),
+                mapOf(x to 3u, y to 3u) to Rational(1, 3),
+                mapOf(x to 4u, y to 3u) to Rational(-1, 6),
+                mapOf(x to 5u, y to 3u) to Rational(3, 40),
+                mapOf(x to 6u, y to 3u) to Rational(1, 54),
+                mapOf(x to 2u, y to 4u) to Rational(-9, 8),
+                mapOf(x to 3u, y to 4u) to Rational(-5, 3),
+                mapOf(x to 4u, y to 4u) to Rational(-7, 12),
+                mapOf(x to 5u, y to 4u) to Rational(1, 140),
+                mapOf(x to 6u, y to 4u) to Rational(1, 6),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, x, 2u),
+            "test 9a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 2u) to Rational(-3, 8),
+                mapOf(x to 1u, y to 2u) to Rational(-1, 3),
+                mapOf(x to 2u, y to 2u) to Rational(1, 4),
+                mapOf(x to 3u, y to 2u) to Rational(-11, 16),
+                mapOf(x to 4u, y to 2u) to Rational(9, 1),
+                mapOf(y to 3u) to Rational(-1, 1),
+                mapOf(x to 1u, y to 3u) to Rational(1, 9),
+                mapOf(x to 2u, y to 3u) to Rational(-11, 6),
+                mapOf(x to 3u, y to 3u) to Rational(-1, 18),
+                mapOf(x to 4u, y to 3u) to Rational(-9, 6),
+                mapOf(y to 4u) to Rational(-5, 18),
+                mapOf(x to 1u, y to 4u) to Rational(-2, 15),
+                mapOf(x to 2u, y to 4u) to Rational(-1, 96),
+                mapOf(x to 3u, y to 4u) to Rational(1, 21),
+                mapOf(x to 4u, y to 4u) to Rational(-1, 24),
+                mapOf(y to 5u) to Rational(3, 140),
+                mapOf(x to 1u, y to 5u) to Rational(1, 10),
+                mapOf(x to 2u, y to 5u) to Rational(-1, 10),
+                mapOf(x to 3u, y to 5u) to Rational(3, 40),
+                mapOf(x to 4u, y to 5u) to Rational(1, 36),
+                mapOf(y to 6u) to Rational(-3, 40),
+                mapOf(x to 1u, y to 6u) to Rational(-1, 3),
+                mapOf(x to 2u, y to 6u) to Rational(-7, 30),
+                mapOf(x to 3u, y to 6u) to Rational(1, 210),
+                mapOf(x to 4u, y to 6u) to Rational(1, 6),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, y, 2u),
+            "test 9b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(x to 5u) to Rational(0),
+                mapOf(x to 6u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(x to 5u, y to 1u) to Rational(0),
+                mapOf(x to 6u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(-1, 96),
+                mapOf(x to 5u, y to 2u) to Rational(1, 35),
+                mapOf(x to 6u, y to 2u) to Rational(-1, 60),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(-1, 6),
+                mapOf(x to 5u, y to 3u) to Rational(3, 40),
+                mapOf(x to 6u, y to 3u) to Rational(1, 54),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(-7, 12),
+                mapOf(x to 5u, y to 4u) to Rational(1, 140),
+                mapOf(x to 6u, y to 4u) to Rational(1, 6),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, x, 2u),
+            "test 10a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-1, 96),
+                mapOf(x to 3u, y to 4u) to Rational(1, 21),
+                mapOf(x to 4u, y to 4u) to Rational(-1, 24),
+                mapOf(y to 5u) to Rational(0),
+                mapOf(x to 1u, y to 5u) to Rational(0),
+                mapOf(x to 2u, y to 5u) to Rational(-1, 10),
+                mapOf(x to 3u, y to 5u) to Rational(3, 40),
+                mapOf(x to 4u, y to 5u) to Rational(1, 36),
+                mapOf(y to 6u) to Rational(0),
+                mapOf(x to 1u, y to 6u) to Rational(0),
+                mapOf(x to 2u, y to 6u) to Rational(-7, 30),
+                mapOf(x to 3u, y to 6u) to Rational(1, 210),
+                mapOf(x to 4u, y to 6u) to Rational(1, 6),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, y, 2u),
+            "test 10b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 2u) to Rational(-3, 8),
+                mapOf(x to 3u) to Rational(-1, 9),
+                mapOf(x to 4u) to Rational(1, 24),
+                mapOf(x to 5u) to Rational(0),
+                mapOf(x to 6u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(-9, 3),
+                mapOf(x to 3u, y to 1u) to Rational(1, 9),
+                mapOf(x to 4u, y to 1u) to Rational(-11, 12),
+                mapOf(x to 5u, y to 1u) to Rational(0),
+                mapOf(x to 6u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-5, 3),
+                mapOf(x to 3u, y to 2u) to Rational(-4, 15),
+                mapOf(x to 4u, y to 2u) to Rational(-1, 96),
+                mapOf(x to 5u, y to 2u) to Rational(0),
+                mapOf(x to 6u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(x to 5u, y to 3u) to Rational(0),
+                mapOf(x to 6u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+                mapOf(x to 5u, y to 4u) to Rational(0),
+                mapOf(x to 6u, y to 4u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).nthAntiderivativeWithRespectTo(RationalField, x, 2u),
+            "test 11a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 2u) to Rational(-3, 8),
+                mapOf(x to 1u, y to 2u) to Rational(-1, 3),
+                mapOf(x to 2u, y to 2u) to Rational(1, 4),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(-1, 1),
+                mapOf(x to 1u, y to 3u) to Rational(1, 9),
+                mapOf(x to 2u, y to 3u) to Rational(-11, 6),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(-5, 18),
+                mapOf(x to 1u, y to 4u) to Rational(-2, 15),
+                mapOf(x to 2u, y to 4u) to Rational(-1, 96),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+                mapOf(y to 5u) to Rational(0),
+                mapOf(x to 1u, y to 5u) to Rational(0),
+                mapOf(x to 2u, y to 5u) to Rational(0),
+                mapOf(x to 3u, y to 5u) to Rational(0),
+                mapOf(x to 4u, y to 5u) to Rational(0),
+                mapOf(y to 6u) to Rational(0),
+                mapOf(x to 1u, y to 6u) to Rational(0),
+                mapOf(x to 2u, y to 6u) to Rational(0),
+                mapOf(x to 3u, y to 6u) to Rational(0),
+                mapOf(x to 4u, y to 6u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).nthAntiderivativeWithRespectTo(RationalField, y, 2u),
+            "test 11b"
+        )
+    }
+    @Test
+    @OptIn(UnstableKMathAPI::class)
+    fun test_Polynomial_nthAntiderivativeWithRespectTo_variablesAndOrders() {
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 1u) to Rational(1),
+                mapOf(x to 2u) to Rational(-1),
+                mapOf(x to 3u) to Rational(1, 3),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 1u)),
+            "test 1"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, x, 0u),
+            "test 2"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-1, 3),
+                mapOf(x to 4u) to Rational(1, 12),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, x, 2u),
+            "test 3"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 3u) to Rational(1, 6),
+                mapOf(x to 4u) to Rational(-1, 12),
+                mapOf(x to 5u) to Rational(1, 60),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, x, 3u),
+            "test 4"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 4u) to Rational(1, 24),
+                mapOf(x to 5u) to Rational(-1, 60),
+                mapOf(x to 6u) to Rational(1, 360),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, x, 4u),
+            "test 5"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, y, 0u),
+            "test 6"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 1u) to Rational(1),
+                mapOf(x to 1u, y to 1u) to Rational(-2),
+                mapOf(x to 2u, y to 1u) to Rational(1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, y, 1u),
+            "test 7"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 2u) to Rational(1, 2),
+                mapOf(x to 1u, y to 2u) to Rational(-1),
+                mapOf(x to 2u, y to 2u) to Rational(1, 2),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, y, 2u),
+            "test 8"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf()),
+            "test 9"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 1u) to Rational(1),
+                mapOf(x to 2u) to Rational(-1),
+                mapOf(x to 3u) to Rational(1, 3),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(
+                x to 1u,
+                y to 0u
+            )),
+            "test 10"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 1u) to Rational(1),
+                mapOf(x to 1u, y to 1u) to Rational(-2),
+                mapOf(x to 2u, y to 1u) to Rational(1),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(1),
+                mapOf(x to 1u) to Rational(-2),
+                mapOf(x to 2u) to Rational(1),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(
+                x to 0u,
+                y to 1u
+            )),
+            "test 11"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 2u) to Rational(-3, 8),
+                mapOf(x to 3u) to Rational(-1, 9),
+                mapOf(x to 4u) to Rational(1, 24),
+                mapOf(x to 5u) to Rational(-11, 160),
+                mapOf(x to 6u) to Rational(3, 5),
+                mapOf(x to 2u, y to 1u) to Rational(-9, 3),
+                mapOf(x to 3u, y to 1u) to Rational(1, 9),
+                mapOf(x to 4u, y to 1u) to Rational(-11, 12),
+                mapOf(x to 5u, y to 1u) to Rational(-1, 60),
+                mapOf(x to 6u, y to 1u) to Rational(-3, 10),
+                mapOf(x to 2u, y to 2u) to Rational(-5, 3),
+                mapOf(x to 3u, y to 2u) to Rational(-4, 15),
+                mapOf(x to 4u, y to 2u) to Rational(-1, 96),
+                mapOf(x to 5u, y to 2u) to Rational(1, 35),
+                mapOf(x to 6u, y to 2u) to Rational(-1, 60),
+                mapOf(x to 2u, y to 3u) to Rational(3, 14),
+                mapOf(x to 3u, y to 3u) to Rational(1, 3),
+                mapOf(x to 4u, y to 3u) to Rational(-1, 6),
+                mapOf(x to 5u, y to 3u) to Rational(3, 40),
+                mapOf(x to 6u, y to 3u) to Rational(1, 54),
+                mapOf(x to 2u, y to 4u) to Rational(-9, 8),
+                mapOf(x to 3u, y to 4u) to Rational(-5, 3),
+                mapOf(x to 4u, y to 4u) to Rational(-7, 12),
+                mapOf(x to 5u, y to 4u) to Rational(1, 140),
+                mapOf(x to 6u, y to 4u) to Rational(1, 6),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 2u)),
+            "test 12a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 1u, y to 1u) to Rational(-6, 8),
+                mapOf(x to 2u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 3u, y to 1u) to Rational(1, 6),
+                mapOf(x to 4u, y to 1u) to Rational(-11, 32),
+                mapOf(x to 5u, y to 1u) to Rational(18, 5),
+                mapOf(x to 1u, y to 2u) to Rational(-9, 3),
+                mapOf(x to 2u, y to 2u) to Rational(1, 6),
+                mapOf(x to 3u, y to 2u) to Rational(-11, 6),
+                mapOf(x to 4u, y to 2u) to Rational(-1, 24),
+                mapOf(x to 5u, y to 2u) to Rational(-9, 10),
+                mapOf(x to 1u, y to 3u) to Rational(-10, 9),
+                mapOf(x to 2u, y to 3u) to Rational(-4, 15),
+                mapOf(x to 3u, y to 3u) to Rational(-1, 72),
+                mapOf(x to 4u, y to 3u) to Rational(1, 21),
+                mapOf(x to 5u, y to 3u) to Rational(-1, 30),
+                mapOf(x to 1u, y to 4u) to Rational(3, 28),
+                mapOf(x to 2u, y to 4u) to Rational(1, 4),
+                mapOf(x to 3u, y to 4u) to Rational(-1, 6),
+                mapOf(x to 4u, y to 4u) to Rational(3, 32),
+                mapOf(x to 5u, y to 4u) to Rational(1, 36),
+                mapOf(x to 1u, y to 5u) to Rational(-9, 20),
+                mapOf(x to 2u, y to 5u) to Rational(-1, 1),
+                mapOf(x to 3u, y to 5u) to Rational(-7, 15),
+                mapOf(x to 4u, y to 5u) to Rational(1, 140),
+                mapOf(x to 5u, y to 5u) to Rational(1, 5),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 1u, y to 1u)),
+            "test 12b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 2u) to Rational(-3, 8),
+                mapOf(x to 1u, y to 2u) to Rational(-1, 3),
+                mapOf(x to 2u, y to 2u) to Rational(1, 4),
+                mapOf(x to 3u, y to 2u) to Rational(-11, 16),
+                mapOf(x to 4u, y to 2u) to Rational(9, 1),
+                mapOf(y to 3u) to Rational(-1, 1),
+                mapOf(x to 1u, y to 3u) to Rational(1, 9),
+                mapOf(x to 2u, y to 3u) to Rational(-11, 6),
+                mapOf(x to 3u, y to 3u) to Rational(-1, 18),
+                mapOf(x to 4u, y to 3u) to Rational(-9, 6),
+                mapOf(y to 4u) to Rational(-5, 18),
+                mapOf(x to 1u, y to 4u) to Rational(-2, 15),
+                mapOf(x to 2u, y to 4u) to Rational(-1, 96),
+                mapOf(x to 3u, y to 4u) to Rational(1, 21),
+                mapOf(x to 4u, y to 4u) to Rational(-1, 24),
+                mapOf(y to 5u) to Rational(3, 140),
+                mapOf(x to 1u, y to 5u) to Rational(1, 10),
+                mapOf(x to 2u, y to 5u) to Rational(-1, 10),
+                mapOf(x to 3u, y to 5u) to Rational(3, 40),
+                mapOf(x to 4u, y to 5u) to Rational(1, 36),
+                mapOf(y to 6u) to Rational(-3, 40),
+                mapOf(x to 1u, y to 6u) to Rational(-1, 3),
+                mapOf(x to 2u, y to 6u) to Rational(-7, 30),
+                mapOf(x to 3u, y to 6u) to Rational(1, 210),
+                mapOf(x to 4u, y to 6u) to Rational(1, 6),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(-11, 8),
+                mapOf(x to 4u) to Rational(18, 1),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(3, 7),
+                mapOf(x to 1u, y to 3u) to Rational(16, 8),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(-18, 8),
+                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(y to 2u)),
+            "test 12c"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(x to 5u) to Rational(0),
+                mapOf(x to 6u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(x to 5u, y to 1u) to Rational(0),
+                mapOf(x to 6u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(-1, 96),
+                mapOf(x to 5u, y to 2u) to Rational(1, 35),
+                mapOf(x to 6u, y to 2u) to Rational(-1, 60),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(-1, 6),
+                mapOf(x to 5u, y to 3u) to Rational(3, 40),
+                mapOf(x to 6u, y to 3u) to Rational(1, 54),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(-7, 12),
+                mapOf(x to 5u, y to 4u) to Rational(1, 140),
+                mapOf(x to 6u, y to 4u) to Rational(1, 6),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 2u)),
+            "test 13a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(x to 5u, y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(x to 5u, y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(-1, 72),
+                mapOf(x to 4u, y to 3u) to Rational(1, 21),
+                mapOf(x to 5u, y to 3u) to Rational(-1, 30),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(-1, 6),
+                mapOf(x to 4u, y to 4u) to Rational(3, 32),
+                mapOf(x to 5u, y to 4u) to Rational(1, 36),
+                mapOf(x to 1u, y to 5u) to Rational(0),
+                mapOf(x to 2u, y to 5u) to Rational(0),
+                mapOf(x to 3u, y to 5u) to Rational(-7, 15),
+                mapOf(x to 4u, y to 5u) to Rational(1, 140),
+                mapOf(x to 5u, y to 5u) to Rational(1, 5),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 1u, y to 1u)),
+            "test 13b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(0),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-1, 96),
+                mapOf(x to 3u, y to 4u) to Rational(1, 21),
+                mapOf(x to 4u, y to 4u) to Rational(-1, 24),
+                mapOf(y to 5u) to Rational(0),
+                mapOf(x to 1u, y to 5u) to Rational(0),
+                mapOf(x to 2u, y to 5u) to Rational(-1, 10),
+                mapOf(x to 3u, y to 5u) to Rational(3, 40),
+                mapOf(x to 4u, y to 5u) to Rational(1, 36),
+                mapOf(y to 6u) to Rational(0),
+                mapOf(x to 1u, y to 6u) to Rational(0),
+                mapOf(x to 2u, y to 6u) to Rational(-7, 30),
+                mapOf(x to 3u, y to 6u) to Rational(1, 210),
+                mapOf(x to 4u, y to 6u) to Rational(1, 6),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(0),
+                mapOf(x to 1u) to Rational(0),
+                mapOf(x to 2u) to Rational(0),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(0),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(4, 7),
+                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
+                mapOf(x to 3u, y to 3u) to Rational(12, 8),
+                mapOf(x to 4u, y to 3u) to Rational(5, 9),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
+                mapOf(x to 3u, y to 4u) to Rational(1, 7),
+                mapOf(x to 4u, y to 4u) to Rational(15, 3),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(y to 2u)),
+            "test 13c"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 2u) to Rational(-3, 8),
+                mapOf(x to 3u) to Rational(-1, 9),
+                mapOf(x to 4u) to Rational(1, 24),
+                mapOf(x to 5u) to Rational(0),
+                mapOf(x to 6u) to Rational(0),
+                mapOf(x to 2u, y to 1u) to Rational(-9, 3),
+                mapOf(x to 3u, y to 1u) to Rational(1, 9),
+                mapOf(x to 4u, y to 1u) to Rational(-11, 12),
+                mapOf(x to 5u, y to 1u) to Rational(0),
+                mapOf(x to 6u, y to 1u) to Rational(0),
+                mapOf(x to 2u, y to 2u) to Rational(-5, 3),
+                mapOf(x to 3u, y to 2u) to Rational(-4, 15),
+                mapOf(x to 4u, y to 2u) to Rational(-1, 96),
+                mapOf(x to 5u, y to 2u) to Rational(0),
+                mapOf(x to 6u, y to 2u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(x to 5u, y to 3u) to Rational(0),
+                mapOf(x to 6u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+                mapOf(x to 5u, y to 4u) to Rational(0),
+                mapOf(x to 6u, y to 4u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 2u)),
+            "test 14a"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(x to 1u, y to 1u) to Rational(-6, 8),
+                mapOf(x to 2u, y to 1u) to Rational(-1, 3),
+                mapOf(x to 3u, y to 1u) to Rational(1, 6),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(x to 5u, y to 1u) to Rational(0),
+                mapOf(x to 1u, y to 2u) to Rational(-9, 3),
+                mapOf(x to 2u, y to 2u) to Rational(1, 6),
+                mapOf(x to 3u, y to 2u) to Rational(-11, 6),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(x to 5u, y to 2u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(-10, 9),
+                mapOf(x to 2u, y to 3u) to Rational(-4, 15),
+                mapOf(x to 3u, y to 3u) to Rational(-1, 72),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(x to 5u, y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+                mapOf(x to 5u, y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 5u) to Rational(0),
+                mapOf(x to 2u, y to 5u) to Rational(0),
+                mapOf(x to 3u, y to 5u) to Rational(0),
+                mapOf(x to 4u, y to 5u) to Rational(0),
+                mapOf(x to 5u, y to 5u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 1u, y to 1u)),
+            "test 14b"
+        )
+        assertEquals(
+            LabeledPolynomialAsIs(
+                mapOf(y to 2u) to Rational(-3, 8),
+                mapOf(x to 1u, y to 2u) to Rational(-1, 3),
+                mapOf(x to 2u, y to 2u) to Rational(1, 4),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(-1, 1),
+                mapOf(x to 1u, y to 3u) to Rational(1, 9),
+                mapOf(x to 2u, y to 3u) to Rational(-11, 6),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(-5, 18),
+                mapOf(x to 1u, y to 4u) to Rational(-2, 15),
+                mapOf(x to 2u, y to 4u) to Rational(-1, 96),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+                mapOf(y to 5u) to Rational(0),
+                mapOf(x to 1u, y to 5u) to Rational(0),
+                mapOf(x to 2u, y to 5u) to Rational(0),
+                mapOf(x to 3u, y to 5u) to Rational(0),
+                mapOf(x to 4u, y to 5u) to Rational(0),
+                mapOf(y to 6u) to Rational(0),
+                mapOf(x to 1u, y to 6u) to Rational(0),
+                mapOf(x to 2u, y to 6u) to Rational(0),
+                mapOf(x to 3u, y to 6u) to Rational(0),
+                mapOf(x to 4u, y to 6u) to Rational(0),
+            ),
+            LabeledPolynomialAsIs(
+                mapOf<Symbol, UInt>() to Rational(-6, 8),
+                mapOf(x to 1u) to Rational(-2, 3),
+                mapOf(x to 2u) to Rational(1, 2),
+                mapOf(x to 3u) to Rational(0),
+                mapOf(x to 4u) to Rational(0),
+                mapOf(y to 1u) to Rational(-18, 3),
+                mapOf(x to 1u, y to 1u) to Rational(2, 3),
+                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
+                mapOf(x to 3u, y to 1u) to Rational(0),
+                mapOf(x to 4u, y to 1u) to Rational(0),
+                mapOf(y to 2u) to Rational(-10, 3),
+                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
+                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
+                mapOf(x to 3u, y to 2u) to Rational(0),
+                mapOf(x to 4u, y to 2u) to Rational(0),
+                mapOf(y to 3u) to Rational(0),
+                mapOf(x to 1u, y to 3u) to Rational(0),
+                mapOf(x to 2u, y to 3u) to Rational(0),
+                mapOf(x to 3u, y to 3u) to Rational(0),
+                mapOf(x to 4u, y to 3u) to Rational(0),
+                mapOf(y to 4u) to Rational(0),
+                mapOf(x to 1u, y to 4u) to Rational(0),
+                mapOf(x to 2u, y to 4u) to Rational(0),
+                mapOf(x to 3u, y to 4u) to Rational(0),
+                mapOf(x to 4u, y to 4u) to Rational(0),
+            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(y to 2u)),
+            "test 14c"
+        )
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
index f0a1128b4..007c3e5e9 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
@@ -7,14 +7,19 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.test.misc.*
-import kotlin.test.*
+import space.kscience.kmath.test.misc.IntModuloRing
+import space.kscience.kmath.test.misc.Rational
+import space.kscience.kmath.test.misc.RationalField
+import space.kscience.kmath.test.misc.m
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertSame
+import kotlin.test.fail
 
 
-@UnstableKMathAPI
 class NumberedPolynomialTest {
-    private val o = Rational(0)
+    val o = Rational(0)
+
     @Test
     fun test_Polynomial_Int_plus() {
         RationalField.numberedPolynomialSpace {
@@ -557,6 +562,7 @@ class NumberedPolynomialTest {
             )
             assertEquals(
                 NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
                     listOf(3u) to Rational(-8, 9),
                     listOf(0u, 4u) to Rational(-8, 7),
                 ),
@@ -650,6 +656,7 @@ class NumberedPolynomialTest {
             )
             assertEquals(
                 NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
                     listOf(3u) to Rational(-8, 9),
                     listOf(0u, 4u) to Rational(-8, 7),
                 ),
@@ -816,6 +823,7 @@ class NumberedPolynomialTest {
             )
             assertEquals(
                 NumberedPolynomial(
+                    listOf<UInt>() to Rational(0),
                     listOf(3u) to Rational(-8, 9),
                     listOf(0u, 4u) to Rational(-8, 7),
                 ),
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt
index 3ad482454..85180bd2a 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.test.misc
 
+import space.kscience.kmath.functions.LabeledPolynomial
+import space.kscience.kmath.functions.LabeledRationalFunction
 import space.kscience.kmath.functions.NumberedPolynomial
 import space.kscience.kmath.functions.NumberedRationalFunction
 import kotlin.test.assertEquals
@@ -28,6 +30,18 @@ fun assertEquals(
     message
 )
 
+fun assertEquals(
+    expected: LabeledPolynomial<Double>,
+    actual: LabeledPolynomial<Double>,
+    absoluteTolerance: Double,
+    message: String? = null
+) = assertContentEquals(
+    expected.coefficients,
+    actual.coefficients,
+    absoluteTolerance,
+    message
+)
+
 fun assertEquals(
     expected: NumberedRationalFunction<Double>,
     actual: NumberedRationalFunction<Double>,
@@ -48,6 +62,26 @@ fun assertEquals(
     )
 }
 
+fun assertEquals(
+    expected: LabeledRationalFunction<Double>,
+    actual: LabeledRationalFunction<Double>,
+    absoluteTolerance: Double,
+    message: String? = null
+) {
+    assertEquals(
+        expected.numerator,
+        actual.numerator,
+        absoluteTolerance,
+        message
+    )
+    assertEquals(
+        expected.denominator,
+        actual.denominator,
+        absoluteTolerance,
+        message
+    )
+}
+
 inline fun <reified T : Throwable> assertFailsWithTypeAndMessage(
     expectedMessage: String? = null,
     assertionMessage: String? = null,
-- 
2.34.1


From d3be07987c30e5dd786cdfb04cec4801d22b6d30 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 6 Jul 2022 23:16:25 +0300
Subject: [PATCH 558/713] Simplify usages of LabeledPolynomial constructing
 fabrics. Fix bugs. Add tests for variable's interoperability.

---
 .../kmath/functions/LabeledPolynomial.kt      | 150 ++--
 .../kmath/functions/ListPolynomial.kt         |   5 -
 .../kmath/functions/NumberedPolynomial.kt     |   5 -
 .../kscience/kmath/functions/Polynomial.kt    |   2 +-
 .../kmath/functions/LabeledPolynomialTest.kt  | 800 ++++++++++++++++--
 5 files changed, 816 insertions(+), 146 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 1477796ea..7f107a87f 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -77,63 +77,63 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
      */
     public override operator fun Symbol.plus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) LabeledPolynomialAsIs(mapOf(
+        if (other == 0) LabeledPolynomialAsIs(
             mapOf(this@plus to 1U) to constantOne,
-        ))
-        else LabeledPolynomialAsIs(mapOf(
+        )
+        else LabeledPolynomialAsIs(
             mapOf(this@plus to 1U) to constantOne,
             emptyMap<Symbol, UInt>() to constantOne * other,
-        ))
+        )
     /**
      * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
      */
     public override operator fun Symbol.minus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) LabeledPolynomialAsIs(mapOf(
-            mapOf(this@minus to 1U) to -constantOne,
-        ))
-        else LabeledPolynomialAsIs(mapOf(
-            mapOf(this@minus to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * other,
-        ))
+        if (other == 0) LabeledPolynomialAsIs(
+            mapOf(this@minus to 1U) to constantOne,
+        )
+        else LabeledPolynomialAsIs(
+            mapOf(this@minus to 1U) to constantOne,
+            emptyMap<Symbol, UInt>() to constantOne * -other,
+        )
     /**
      * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
      */
     public override operator fun Symbol.times(other: Int): LabeledPolynomial<C> =
         if (other == 0) zero
-        else LabeledPolynomialAsIs(mapOf(
+        else LabeledPolynomialAsIs(
             mapOf(this to 1U) to constantOne * other,
-        ))
+        )
 
     /**
      * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
      */
     public override operator fun Int.plus(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) LabeledPolynomialAsIs(mapOf(
+        if (this == 0) LabeledPolynomialAsIs(
             mapOf(other to 1U) to constantOne,
-        ))
-        else LabeledPolynomialAsIs(mapOf(
+        )
+        else LabeledPolynomialAsIs(
             mapOf(other to 1U) to constantOne,
             emptyMap<Symbol, UInt>() to constantOne * this@plus,
-        ))
+        )
     /**
      * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
      */
     public override operator fun Int.minus(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) LabeledPolynomialAsIs(mapOf(
+        if (this == 0) LabeledPolynomialAsIs(
             mapOf(other to 1U) to -constantOne,
-        ))
-        else LabeledPolynomialAsIs(mapOf(
+        )
+        else LabeledPolynomialAsIs(
             mapOf(other to 1U) to -constantOne,
             emptyMap<Symbol, UInt>() to constantOne * this@minus,
-        ))
+        )
     /**
      * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
      */
     public override operator fun Int.times(other: Symbol): LabeledPolynomial<C> =
         if (this == 0) zero
-        else LabeledPolynomialAsIs(mapOf(
+        else LabeledPolynomialAsIs(
             mapOf(other to 1U) to constantOne * this@times,
-        ))
+        )
 
     /**
      * Returns sum of the polynomial and the integer represented as a polynomial.
@@ -143,7 +143,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override operator fun LabeledPolynomial<C>.plus(other: Int): LabeledPolynomial<C> =
         if (other == 0) this
         else with(coefficients) {
-            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to other.asConstant()))
+            if (isEmpty()) other.asPolynomial()
             else LabeledPolynomialAsIs(
                 toMutableMap()
                     .apply {
@@ -161,7 +161,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override operator fun LabeledPolynomial<C>.minus(other: Int): LabeledPolynomial<C> =
         if (other == 0) this
         else with(coefficients) {
-            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to (-other).asConstant()))
+            if (isEmpty()) (-other).asPolynomial()
             else LabeledPolynomialAsIs(
                 toMutableMap()
                     .apply {
@@ -180,7 +180,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         when(other) {
             0 -> zero
             1 -> this
-            else -> LabeledPolynomial(
+            else -> LabeledPolynomialAsIs(
                 coefficients
                     .toMutableMap()
                     .apply {
@@ -197,7 +197,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override operator fun Int.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         if (this == 0) other
         else with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this@plus.asConstant()))
+            if (isEmpty()) this@plus.asPolynomial()
             else LabeledPolynomialAsIs(
                 toMutableMap()
                     .apply {
@@ -215,7 +215,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override operator fun Int.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         if (this == 0) -other
         else with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this@minus.asConstant()))
+            if (isEmpty()) this@minus.asPolynomial()
             else LabeledPolynomialAsIs(
                 toMutableMap()
                     .apply {
@@ -236,7 +236,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         when(this) {
             0 -> zero
             1 -> other
-            else -> LabeledPolynomial(
+            else -> LabeledPolynomialAsIs(
                 other.coefficients
                     .toMutableMap()
                     .apply {
@@ -245,65 +245,60 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             )
         }
 
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public override fun number(value: Int): LabeledPolynomial<C> = number(constantNumber(value))
-
     /**
      * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
      */
     public override operator fun Symbol.plus(other: C): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(mapOf(
+        LabeledPolynomialAsIs(
             mapOf(this@plus to 1U) to constantOne,
             emptyMap<Symbol, UInt>() to other,
-        ))
+        )
     /**
      * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
      */
     public override operator fun Symbol.minus(other: C): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(mapOf(
-            mapOf(this@minus to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to other,
-        ))
+        LabeledPolynomialAsIs(
+            mapOf(this@minus to 1U) to constantOne,
+            emptyMap<Symbol, UInt>() to -other,
+        )
     /**
      * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
      */
     public override operator fun Symbol.times(other: C): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(mapOf(
+        LabeledPolynomialAsIs(
             mapOf(this@times to 1U) to other,
-        ))
+        )
 
     /**
      * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
      */
     public override operator fun C.plus(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(mapOf(
+        LabeledPolynomialAsIs(
             mapOf(other to 1U) to constantOne,
             emptyMap<Symbol, UInt>() to this@plus,
-        ))
+        )
     /**
      * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
      */
     public override operator fun C.minus(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(mapOf(
+        LabeledPolynomialAsIs(
             mapOf(other to 1U) to -constantOne,
             emptyMap<Symbol, UInt>() to this@minus,
-        ))
+        )
     /**
      * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
      */
     public override operator fun C.times(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(mapOf(
+        LabeledPolynomialAsIs(
             mapOf(other to 1U) to this@times,
-        ))
+        )
 
     /**
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     override operator fun C.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this@plus))
+            if (isEmpty()) this@plus.asLabeledPolynomial()
             else LabeledPolynomialAsIs(
                 toMutableMap()
                     .apply {
@@ -318,7 +313,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun C.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this@minus))
+            if (isEmpty()) this@minus.asLabeledPolynomial()
             else LabeledPolynomialAsIs(
                 toMutableMap()
                     .apply {
@@ -347,7 +342,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun LabeledPolynomial<C>.plus(other: C): LabeledPolynomial<C> =
         with(coefficients) {
-            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to other))
+            if (isEmpty()) other.asLabeledPolynomial()
             else LabeledPolynomialAsIs(
                 toMutableMap()
                     .apply {
@@ -362,7 +357,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun LabeledPolynomial<C>.minus(other: C): LabeledPolynomial<C> =
         with(coefficients) {
-            if (isEmpty()) LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to other))
+            if (isEmpty()) other.asLabeledPolynomial()
             else LabeledPolynomialAsIs(
                 toMutableMap()
                     .apply {
@@ -387,60 +382,59 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     /**
      * Converts the constant [value] to polynomial.
      */
-    public override fun number(value: C): LabeledPolynomial<C> =
-        LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to value))
+    public override fun number(value: C): LabeledPolynomial<C> = value.asLabeledPolynomial()
 
     /**
      * Represents the variable as a monic monomial.
      */
     public override operator fun Symbol.unaryPlus(): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(mapOf(
+        LabeledPolynomialAsIs(
             mapOf(this to 1U) to constantOne,
-        ))
+        )
     /**
      * Returns negation of representation of the variable as a monic monomial.
      */
     public override operator fun Symbol.unaryMinus(): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(mapOf(
+        LabeledPolynomialAsIs(
             mapOf(this to 1U) to -constantOne,
-        ))
+        )
     /**
      * Returns sum of the variables represented as monic monomials.
      */
     public override operator fun Symbol.plus(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) LabeledPolynomialAsIs(mapOf(
+        if (this == other) LabeledPolynomialAsIs(
             mapOf(this to 1U) to constantOne * 2
-        ))
-        else LabeledPolynomialAsIs(mapOf(
+        )
+        else LabeledPolynomialAsIs(
             mapOf(this to 1U) to constantOne,
             mapOf(other to 1U) to constantOne,
-        ))
+        )
     /**
      * Returns difference between the variables represented as monic monomials.
      */
     public override operator fun Symbol.minus(other: Symbol): LabeledPolynomial<C> =
         if (this == other) zero
-        else LabeledPolynomialAsIs(mapOf(
+        else LabeledPolynomialAsIs(
             mapOf(this to 1U) to constantOne,
             mapOf(other to 1U) to -constantOne,
-        ))
+        )
     /**
      * Returns product of the variables represented as monic monomials.
      */
     public override operator fun Symbol.times(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) LabeledPolynomialAsIs(mapOf(
+        if (this == other) LabeledPolynomialAsIs(
             mapOf(this to 2U) to constantOne
-        ))
-        else LabeledPolynomialAsIs(mapOf(
+        )
+        else LabeledPolynomialAsIs(
             mapOf(this to 1U, other to 1U) to constantOne,
-        ))
+        )
 
     /**
      * Returns sum of the variable represented as a monic monomial and the polynomial.
      */
     public override operator fun Symbol.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomialAsIs(mapOf(mapOf(this@plus to 1u) to constantOne))
+            if (isEmpty()) this@plus.asPolynomial()
             else LabeledPolynomialAsIs(
                 toMutableMap()
                     .apply {
@@ -455,15 +449,15 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     public override operator fun Symbol.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         with(other.coefficients) {
-            if (isEmpty()) LabeledPolynomialAsIs(mapOf(mapOf(this@minus to 1u) to constantOne))
+            if (isEmpty()) this@minus.asPolynomial()
             else LabeledPolynomialAsIs(
                 toMutableMap()
                     .apply {
-                        val degs = mapOf(this@minus to 1U)
+                        val theVariableDegs = mapOf(this@minus to 1U)
 
-                        forEach { (degs, c) -> if(degs != degs) this[degs] = -c }
+                        forEach { (degs, c) -> if(degs != theVariableDegs) this[degs] = -c }
 
-                        this[degs] = constantOne - getOrElse(degs) { constantZero }
+                        this[theVariableDegs] = constantOne - getOrElse(theVariableDegs) { constantZero }
                     }
             )
         }
@@ -481,7 +475,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     public override operator fun LabeledPolynomial<C>.plus(other: Symbol): LabeledPolynomial<C> =
         with(coefficients) {
-            if (isEmpty()) LabeledPolynomialAsIs(mapOf(mapOf(other to 1u) to constantOne))
+            if (isEmpty()) other.asPolynomial()
             else LabeledPolynomialAsIs(
                 toMutableMap()
                     .apply {
@@ -496,13 +490,13 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     public override operator fun LabeledPolynomial<C>.minus(other: Symbol): LabeledPolynomial<C> =
         with(coefficients) {
-            if (isEmpty()) LabeledPolynomialAsIs(mapOf(mapOf(other to 1u) to constantOne))
+            if (isEmpty()) other.asPolynomial()
             else LabeledPolynomialAsIs(
                 toMutableMap()
                     .apply {
                         val degs = mapOf(other to 1U)
 
-                        this[degs] = constantOne - getOrElse(degs) { constantZero }
+                        this[degs] = getOrElse(degs) { constantZero } - constantOne
                     }
             )
         }
@@ -560,11 +554,11 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
      */
-    override val zero: LabeledPolynomial<C> = LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to constantZero))
+    override val zero: LabeledPolynomial<C> = LabeledPolynomialAsIs()
     /**
      * Instance of unit polynomial (unit of the polynomial ring).
      */
-    override val one: LabeledPolynomial<C> = LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to constantOne))
+    override val one: LabeledPolynomial<C> = constantOne.asLabeledPolynomial()
 
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index a83b3915a..76e1a6bb6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -172,11 +172,6 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
             )
         }
 
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public override fun number(value: Int): ListPolynomial<C> = number(constantNumber(value))
-
     /**
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index ad421d7d3..f7dd9d8de 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -169,11 +169,6 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
             )
         }
 
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public override fun number(value: Int): NumberedPolynomial<C> = number(constantNumber(value))
-
     /**
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 12490d133..61ea5a342 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -112,7 +112,7 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     /**
      * Converts the integer [value] to polynomial.
      */
-    public fun number(value: Int): P = one * value
+    public fun number(value: Int): P = number(constantNumber(value))
     /**
      * Converts the integer to polynomial.
      */
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
index 15c4c3656..95481f2ef 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("LocalVariableName")
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.expressions.Symbol
@@ -26,34 +28,118 @@ class LabeledPolynomialTest {
     val o = Rational(0)
 
     @Test
-    @Ignore
     fun test_Variable_Int_plus() {
-        // TODO
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5),
+                    mapOf(x to 1u) to Rational(1),
+                ),
+                x + 5,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(1),
+                ),
+                x + 0,
+                "test 2"
+            )
+        }
     }
     @Test
-    @Ignore
     fun test_Variable_Int_minus() {
-        // TODO
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-5),
+                    mapOf(x to 1u) to Rational(1),
+                ),
+                x - 5,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(1),
+                ),
+                x - 0,
+                "test 2"
+            )
+        }
     }
     @Test
-    @Ignore
     fun test_Variable_Int_times() {
-        // TODO
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(5),
+                ),
+                x * 5,
+                "test 1"
+            )
+            assertSame(
+                zero,
+                x * 0,
+                "test 2"
+            )
+        }
     }
     @Test
-    @Ignore
     fun test_Int_Variable_plus() {
-        // TODO
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5),
+                    mapOf(x to 1u) to Rational(1),
+                ),
+                5 + x,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(1),
+                ),
+                0 + x,
+                "test 2"
+            )
+        }
     }
     @Test
-    @Ignore
     fun test_Int_Variable_minus() {
-        // TODO
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5),
+                    mapOf(x to 1u) to Rational(-1),
+                ),
+                5 - x,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(-1),
+                ),
+                0 - x,
+                "test 2"
+            )
+        }
     }
     @Test
-    @Ignore
     fun test_Int_Variable_times() {
-        // TODO
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(5),
+                ),
+                5 * x,
+                "test 1"
+            )
+            assertSame(
+                zero,
+                0 * x,
+                "test 2"
+            )
+        }
     }
     @Test
     fun test_Polynomial_Int_plus() {
@@ -516,34 +602,126 @@ class LabeledPolynomialTest {
         }
     }
     @Test
-    @Ignore
     fun test_Variable_Constant_plus() {
-        // TODO
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5),
+                    mapOf(x to 1u) to Rational(1),
+                ),
+                x + Rational(5),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 1u) to Rational(1),
+                ),
+                x + Rational(0),
+                "test 2"
+            )
+        }
     }
     @Test
-    @Ignore
     fun test_Variable_Constant_minus() {
-        // TODO
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-5),
+                    mapOf(x to 1u) to Rational(1),
+                ),
+                x - Rational(5),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 1u) to Rational(1),
+                ),
+                x - Rational(0),
+                "test 2"
+            )
+        }
     }
     @Test
-    @Ignore
     fun test_Variable_Constant_times() {
-        // TODO
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(5),
+                ),
+                x * Rational(5),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(0),
+                ),
+                x * Rational(0),
+                "test 2"
+            )
+        }
     }
     @Test
-    @Ignore
     fun test_Constant_Variable_plus() {
-        // TODO
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5),
+                    mapOf(x to 1u) to Rational(1),
+                ),
+                Rational(5) + x,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 1u) to Rational(1),
+                ),
+                Rational(0) + x,
+                "test 2"
+            )
+        }
     }
     @Test
-    @Ignore
     fun test_Constant_Variable_minus() {
-        // TODO
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(5),
+                    mapOf(x to 1u) to Rational(-1),
+                ),
+                Rational(5) - x,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(0),
+                    mapOf(x to 1u) to Rational(-1),
+                ),
+                Rational(0) - x,
+                "test 2"
+            )
+        }
     }
     @Test
-    @Ignore
     fun test_Constant_Variable_times() {
-        // TODO
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(5),
+                ),
+                Rational(5) * x,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(0),
+                ),
+                Rational(0) * x,
+                "test 2"
+            )
+        }
     }
     @Test
     fun test_Polynomial_Constant_plus() {
@@ -1068,59 +1246,567 @@ class LabeledPolynomialTest {
         }
     }
     @Test
-    @Ignore
-    fun test_Variable_unaryPlus(){
-        // TODO
+    fun test_Variable_unaryPlus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(1),
+                ),
+                +x
+            )
+        }
     }
     @Test
-    @Ignore
-    fun test_Variable_unaryMinus(){
-        // TODO
+    fun test_Variable_unaryMinus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(-1),
+                ),
+                -x
+            )
+        }
     }
     @Test
-    @Ignore
-    fun test_Variable_Variable_plus(){
-        // TODO
+    fun test_Variable_Variable_plus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(1),
+                    mapOf(y to 1u) to Rational(1),
+                ),
+                x + y,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(2),
+                ),
+                x + x,
+                "test 2"
+            )
+        }
     }
     @Test
-    @Ignore
-    fun test_Variable_Variable_minus(){
-        // TODO
+    fun test_Variable_Variable_minus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(1),
+                    mapOf(y to 1u) to Rational(-1),
+                ),
+                x - y,
+                "test 1"
+            )
+            assertSame(
+                zero,
+                x - x,
+                "test 2"
+            )
+        }
     }
     @Test
-    @Ignore
-    fun test_Variable_Variable_times(){
-        // TODO
+    fun test_Variable_Variable_times() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u, y to 1u) to Rational(1),
+                ),
+                x * y,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 2u) to Rational(1),
+                ),
+                x * x,
+                "test 2"
+            )
+        }
     }
     @Test
-    @Ignore
-    fun test_Variable_Polynomial_plus(){
-        // TODO
+    fun test_Variable_Polynomial_plus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(7, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                x + LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(6, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                y + LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                    mapOf(iota to 1u) to Rational(1),
+                ),
+                iota + LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                "test 3"
+            )
+        }
     }
     @Test
-    @Ignore
-    fun test_Variable_Polynomial_minus(){
-        // TODO
+    fun test_Variable_Polynomial_minus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(16, 4),
+                    mapOf(x to 1u) to Rational(-1, 3),
+                    mapOf(x to 2u) to Rational(-3, 8),
+                    mapOf(y to 1u) to Rational(1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(-6, 5),
+                    mapOf(y to 2u) to Rational(13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 8),
+                ),
+                x - LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(16, 4),
+                    mapOf(x to 1u) to Rational(-4, 3),
+                    mapOf(x to 2u) to Rational(-3, 8),
+                    mapOf(y to 1u) to Rational(8, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(-6, 5),
+                    mapOf(y to 2u) to Rational(13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 8),
+                ),
+                y - LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(16, 4),
+                    mapOf(x to 1u) to Rational(-4, 3),
+                    mapOf(x to 2u) to Rational(-3, 8),
+                    mapOf(y to 1u) to Rational(1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(-6, 5),
+                    mapOf(y to 2u) to Rational(13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(-13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(-11, 8),
+                    mapOf(iota to 1u) to Rational(1),
+                ),
+                iota - LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                "test 3"
+            )
+        }
     }
     @Test
-    @Ignore
-    fun test_Variable_Polynomial_times(){
-        // TODO
+    fun test_Variable_Polynomial_times() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(-16, 4),
+                    mapOf(x to 2u) to Rational(4, 3),
+                    mapOf(x to 3u) to Rational(3, 8),
+                    mapOf(x to 1u, y to 1u) to Rational(-1, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 3u, y to 1u) to Rational(6, 5),
+                    mapOf(x to 1u, y to 2u) to Rational(-13, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 3u, y to 2u) to Rational(11, 8),
+                ),
+                x * LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(y to 1u) to Rational(-16, 4),
+                    mapOf(x to 1u, y to 1u) to Rational(4, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(3, 8),
+                    mapOf(y to 2u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(6, 5),
+                    mapOf(y to 3u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 3u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 3u) to Rational(11, 8),
+                ),
+                y * LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(iota to 1u) to Rational(-16, 4),
+                    mapOf(x to 1u, iota to 1u) to Rational(4, 3),
+                    mapOf(x to 2u, iota to 1u) to Rational(3, 8),
+                    mapOf(y to 1u, iota to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u, iota to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u, iota to 1u) to Rational(6, 5),
+                    mapOf(y to 2u, iota to 1u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u, iota to 1u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u, iota to 1u) to Rational(11, 8),
+                ),
+                iota * LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                "test 3"
+            )
+        }
     }
     @Test
-    @Ignore
-    fun test_Polynomial_Variable_plus(){
-        // TODO
+    fun test_Polynomial_Variable_plus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(7, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ) + x,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(6, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ) + y,
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                    mapOf(iota to 1u) to Rational(1),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ) + iota,
+                "test 3"
+            )
+        }
     }
     @Test
-    @Ignore
-    fun test_Polynomial_Variable_minus(){
-        // TODO
+    fun test_Polynomial_Variable_minus() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(1, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ) - x,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-8, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ) - y,
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                    mapOf(iota to 1u) to Rational(-1),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ) - iota,
+                "test 3"
+            )
+        }
     }
     @Test
-    @Ignore
-    fun test_Polynomial_Variable_times(){
-        // TODO
+    fun test_Polynomial_Variable_times() {
+        RationalField.labeledPolynomialSpace {
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(x to 1u) to Rational(-16, 4),
+                    mapOf(x to 2u) to Rational(4, 3),
+                    mapOf(x to 3u) to Rational(3, 8),
+                    mapOf(x to 1u, y to 1u) to Rational(-1, 7),
+                    mapOf(x to 2u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 3u, y to 1u) to Rational(6, 5),
+                    mapOf(x to 1u, y to 2u) to Rational(-13, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 3u, y to 2u) to Rational(11, 8),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ) * x,
+                "test 1"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(y to 1u) to Rational(-16, 4),
+                    mapOf(x to 1u, y to 1u) to Rational(4, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(3, 8),
+                    mapOf(y to 2u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 2u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 2u) to Rational(6, 5),
+                    mapOf(y to 3u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 3u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 3u) to Rational(11, 8),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ) * y,
+                "test 2"
+            )
+            assertEquals(
+                LabeledPolynomialAsIs(
+                    mapOf(iota to 1u) to Rational(-16, 4),
+                    mapOf(x to 1u, iota to 1u) to Rational(4, 3),
+                    mapOf(x to 2u, iota to 1u) to Rational(3, 8),
+                    mapOf(y to 1u, iota to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u, iota to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u, iota to 1u) to Rational(6, 5),
+                    mapOf(y to 2u, iota to 1u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u, iota to 1u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u, iota to 1u) to Rational(11, 8),
+                ),
+                LabeledPolynomialAsIs(
+                    mapOf<Symbol, UInt>() to Rational(-16, 4),
+                    mapOf(x to 1u) to Rational(4, 3),
+                    mapOf(x to 2u) to Rational(3, 8),
+                    mapOf(y to 1u) to Rational(-1, 7),
+                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
+                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
+                    mapOf(y to 2u) to Rational(-13, 3),
+                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
+                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
+                ) * iota,
+                "test 3"
+            )
+        }
     }
     @Test
     fun test_Polynomial_unaryMinus() {
-- 
2.34.1


From d44a48bdb1c7d9fa1d8d0918373cf068d04a4c6a Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 11 Jul 2022 17:27:59 +0300
Subject: [PATCH 559/713] Moving to new modules.

---
 kmath-functions/build.gradle.kts              |  13 +-
 .../kmath/functions/ListPolynomialTest.kt     |   5 +-
 .../kmath/functions/ListPolynomialUtilTest.kt |  14 +-
 kmath-polynomialX/build.gradle.kts            |  30 ++++
 .../LabeledPolynomial.kt                      |   0
 .../LabeledRationalFunction.kt                |   0
 .../NumberedPolynomial.kt                     |   0
 .../NumberedRationalFunction.kt               |   0
 .../algebraicStub.kt                          | 146 ++++++++++++++++++
 .../labeledConstructors.kt                    |   0
 .../labeledUtil.kt                            |   0
 .../numberedConstructors.kt                   |   0
 .../numberedUtil.kt                           |   0
 .../functions/LabeledConstructorsTest.kt      |  10 +-
 .../kmath/functions/LabeledPolynomialTest.kt  |  25 ++-
 .../functions/LabeledPolynomialUtilTest.kt    |  14 +-
 .../functions/NumberedConstructorsTest.kt     |   0
 .../kmath/functions/NumberedPolynomialTest.kt |  11 +-
 .../functions/NumberedPolynomialUtilTest.kt   |  13 +-
 settings.gradle.kts                           |   3 +
 test-utils-functions/build.gradle.kts         |  14 ++
 .../kmath/functions/testUtils}/IntModulo.kt   |  55 +++----
 .../functions/testUtils/IntModuloUtils.kt     |  19 +++
 .../kmath/functions/testUtils}/Rational.kt    |  56 +++----
 .../kmath/functions/testUtils/assertion.kt    |  22 +++
 .../kmath/functions/testUtils}/misc.kt        |   8 +-
 test-utils-polynomialX/build.gradle.kts       |  16 ++
 .../kmath/functions/testUtils/BufferUtils.kt  |  12 ++
 .../kmath/functions/testUtils}/assertion.kt   |  53 ++++---
 .../kmath/functions/testUtils/misc.kt         |  19 +++
 30 files changed, 419 insertions(+), 139 deletions(-)
 create mode 100644 kmath-polynomialX/build.gradle.kts
 rename {kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions => kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions}/LabeledPolynomial.kt (100%)
 rename {kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions => kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions}/LabeledRationalFunction.kt (100%)
 rename {kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions => kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions}/NumberedPolynomial.kt (100%)
 rename {kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions => kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions}/NumberedRationalFunction.kt (100%)
 create mode 100644 kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/algebraicStub.kt
 rename {kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions => kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions}/labeledConstructors.kt (100%)
 rename {kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions => kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions}/labeledUtil.kt (100%)
 rename {kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions => kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions}/numberedConstructors.kt (100%)
 rename {kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions => kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions}/numberedUtil.kt (100%)
 rename {kmath-functions => kmath-polynomialX}/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt (94%)
 rename {kmath-functions => kmath-polynomialX}/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt (99%)
 rename {kmath-functions => kmath-polynomialX}/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt (99%)
 rename {kmath-functions => kmath-polynomialX}/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt (100%)
 rename {kmath-functions => kmath-polynomialX}/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt (99%)
 rename {kmath-functions => kmath-polynomialX}/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt (99%)
 create mode 100644 test-utils-functions/build.gradle.kts
 rename {kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc => test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils}/IntModulo.kt (70%)
 create mode 100644 test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
 rename {kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc => test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils}/Rational.kt (77%)
 create mode 100644 test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
 rename {kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc => test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils}/misc.kt (76%)
 create mode 100644 test-utils-polynomialX/build.gradle.kts
 create mode 100644 test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
 rename {kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc => test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils}/assertion.kt (72%)
 create mode 100644 test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt

diff --git a/kmath-functions/build.gradle.kts b/kmath-functions/build.gradle.kts
index fadbac091..0a8e8a1be 100644
--- a/kmath-functions/build.gradle.kts
+++ b/kmath-functions/build.gradle.kts
@@ -6,9 +6,16 @@ plugins {
 
 description = "Functions, integration and interpolation"
 
-kotlin.sourceSets.commonMain {
-    dependencies {
-        api(project(":kmath-core"))
+kotlin.sourceSets {
+    commonMain {
+        dependencies {
+            api(project(":kmath-core"))
+        }
+    }
+    commonTest {
+        dependencies {
+            api(projects.testUtilsFunctions)
+        }
     }
 }
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
index c4a7cc564..e7d8dfd8c 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
@@ -7,7 +7,10 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.test.misc.*
+import space.kscience.kmath.functions.testUtils.IntModuloRing
+import space.kscience.kmath.functions.testUtils.ListPolynomial
+import space.kscience.kmath.functions.testUtils.Rational
+import space.kscience.kmath.functions.testUtils.RationalField
 import kotlin.test.*
 
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
index 685a2a506..339643d02 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -6,9 +6,9 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.test.misc.Rational
-import space.kscience.kmath.test.misc.RationalField
-import space.kscience.kmath.test.misc.assertFailsWithTypeAndMessage
+import space.kscience.kmath.functions.testUtils.Rational
+import space.kscience.kmath.functions.testUtils.RationalField
+import space.kscience.kmath.functions.testUtils.assertFailsWithTypeAndMessage
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -64,7 +64,7 @@ class ListPolynomialUtilTest {
         )
         assertEquals(
             Rational(25057, 21000),
-            ListPolynomial(Rational(5,8), Rational(8, 3), Rational(4, 7), Rational(3, 2))
+            ListPolynomial(Rational(5, 8), Rational(8, 3), Rational(4, 7), Rational(3, 2))
                 .substitute(RationalField, Rational(1, 5)),
             "test 2"
         )
@@ -76,13 +76,13 @@ class ListPolynomialUtilTest {
         )
         assertEquals(
             Rational(4961, 4200),
-            ListPolynomial(Rational(5,8), Rational(8, 3), Rational(4, 7), Rational(0))
+            ListPolynomial(Rational(5, 8), Rational(8, 3), Rational(4, 7), Rational(0))
                 .substitute(RationalField, Rational(1, 5)),
             "test 4"
         )
         assertEquals(
             Rational(3511, 3000),
-            ListPolynomial(Rational(5,8), Rational(8, 3), Rational(0), Rational(3, 2))
+            ListPolynomial(Rational(5, 8), Rational(8, 3), Rational(0), Rational(3, 2))
                 .substitute(RationalField, Rational(1, 5)),
             "test 5"
         )
@@ -233,7 +233,7 @@ class ListPolynomialUtilTest {
                 ListPolynomial(
                     Rational(-13, 9),
                     Rational(5, 3),
-                    Rational(-5, 4) ,
+                    Rational(-5, 4),
                     Rational(0),
                     Rational(0),
                     Rational(0),
diff --git a/kmath-polynomialX/build.gradle.kts b/kmath-polynomialX/build.gradle.kts
new file mode 100644
index 000000000..51b3c0665
--- /dev/null
+++ b/kmath-polynomialX/build.gradle.kts
@@ -0,0 +1,30 @@
+plugins {
+    kotlin("multiplatform")
+    id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.native")
+}
+
+description = "Polynomial extra utilities and rational functions"
+
+kotlin.sourceSets {
+    commonMain {
+        dependencies {
+            api(projects.kmathCore)
+            api(projects.kmathFunctions)
+        }
+    }
+    commonTest {
+        dependencies {
+            api(projects.testUtilsFunctions)
+            api(projects.testUtilsPolynomialX)
+            api(kotlin("test"))
+        }
+    }
+}
+
+readme {
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
+
+//    feature("TODO") { "TODO" }
+}
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
similarity index 100%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
rename to kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledRationalFunction.kt
similarity index 100%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
rename to kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledRationalFunction.kt
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
similarity index 100%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
rename to kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedRationalFunction.kt
similarity index 100%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
rename to kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedRationalFunction.kt
diff --git a/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/algebraicStub.kt b/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/algebraicStub.kt
new file mode 100644
index 000000000..b40aa4775
--- /dev/null
+++ b/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/algebraicStub.kt
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.*
+
+
+// TODO: All of this should be moved to algebraic structures' place for utilities
+// FIXME: Move receiver to context receiver
+/**
+ * Returns product of [arg] and integer [multiplier].
+ *
+ * @param arg the multiplicand.
+ * @param multiplier the integer multiplier.
+ * @return product of the multiplicand [arg] and the multiplier [multiplier].
+ * @author Gleb Minaev
+ */
+internal fun <C> Group<C>.multiplyByDoubling(arg: C, multiplier: Int): C =
+    if (multiplier >= 0) multiplyByDoubling(arg, multiplier.toUInt())
+    else multiplyByDoubling(-arg, (-multiplier).toUInt())
+
+// FIXME: Move receiver to context receiver
+/**
+ * Adds product of [arg] and [multiplier] to [base].
+ *
+ * @param base the augend.
+ * @param arg the multiplicand.
+ * @param multiplier the integer multiplier.
+ * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
+ * @author Gleb Minaev
+ */
+internal fun <C> GroupOps<C>.addMultipliedByDoubling(base: C, arg: C, multiplier: Int): C =
+    if (multiplier >= 0) addMultipliedByDoubling(base, arg, multiplier.toUInt())
+    else addMultipliedByDoubling(base, -arg, (-multiplier).toUInt())
+
+// FIXME: Move receiver to context receiver
+/**
+ * Returns product of [arg] and integer [multiplier].
+ *
+ * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
+ *
+ * @param arg the multiplicand.
+ * @param multiplier the integer multiplier.
+ * @return product of the multiplicand [arg] and the multiplier [multiplier].
+ * @author Gleb Minaev
+ */
+internal tailrec fun <C> Group<C>.multiplyByDoubling(arg: C, multiplier: UInt): C =
+    when {
+        multiplier == 0u -> zero
+        multiplier == 1u -> arg
+        multiplier and 1u == 0u -> multiplyByDoubling(arg + arg, multiplier shr 1)
+        multiplier and 1u == 1u -> addMultipliedByDoubling(arg, arg + arg, multiplier shr 1)
+        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
+    }
+
+// FIXME: Move receiver to context receiver
+/**
+ * Adds product of [arg] and [multiplier] to [base].
+ *
+ * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
+ *
+ * @param base the augend.
+ * @param arg the multiplicand.
+ * @param multiplier the integer multiplier.
+ * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
+ * @author Gleb Minaev
+ */
+internal tailrec fun <C> GroupOps<C>.addMultipliedByDoubling(base: C, arg: C, multiplier: UInt): C =
+    when {
+        multiplier == 0u -> base
+        multiplier == 1u -> base + arg
+        multiplier and 1u == 0u -> addMultipliedByDoubling(base, arg + arg, multiplier shr 1)
+        multiplier and 1u == 1u -> addMultipliedByDoubling(base + arg, arg + arg, multiplier shr 1)
+        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
+    }
+
+// FIXME: Move receiver to context receiver
+/**
+ * Raises [arg] to the integer power [exponent].
+ *
+ * @param arg the base of the power.
+ * @param exponent the exponent of the power.
+ * @return [arg] raised to the power [exponent].
+ * @author Gleb Minaev
+ */
+internal fun <C> Field<C>.exponentiateBySquaring(arg: C, exponent: Int): C =
+    if (exponent >= 0) exponentiateBySquaring(arg, exponent.toUInt())
+    else exponentiateBySquaring(one / arg, (-exponent).toUInt())
+
+// FIXME: Move receiver to context receiver
+/**
+ * Multiplies [base] and [arg] raised to the integer power [exponent].
+ *
+ * @param base the multiplicand.
+ * @param arg the base of the power.
+ * @param exponent the exponent of the power.
+ * @return product of [base] and [arg] raised to the power [exponent].
+ * @author Gleb Minaev
+ */
+internal fun <C> Field<C>.multiplyExponentiatedBySquaring(base: C, arg: C, exponent: Int): C =
+    if (exponent >= 0) multiplyExponentiatedBySquaring(base, arg, exponent.toUInt())
+    else multiplyExponentiatedBySquaring(base, one / arg, (-exponent).toUInt())
+
+// FIXME: Move receiver to context receiver
+/**
+ * Raises [arg] to the integer power [exponent].
+ *
+ * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
+ *
+ * @param arg the base of the power.
+ * @param exponent the exponent of the power.
+ * @return [arg] raised to the power [exponent].
+ * @author Gleb Minaev
+ */
+internal tailrec fun <C> Ring<C>.exponentiateBySquaring(arg: C, exponent: UInt): C =
+    when {
+        exponent == 0u -> zero
+        exponent == 1u -> arg
+        exponent and 1u == 0u -> exponentiateBySquaring(arg * arg, exponent shr 1)
+        exponent and 1u == 1u -> multiplyExponentiatedBySquaring(arg, arg * arg, exponent shr 1)
+        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
+    }
+
+// FIXME: Move receiver to context receiver
+/**
+ * Multiplies [base] and [arg] raised to the integer power [exponent].
+ *
+ * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
+ *
+ * @param base the multiplicand.
+ * @param arg the base of the power.
+ * @param exponent the exponent of the power.
+ * @return product of [base] and [arg] raised to the power [exponent].
+ * @author Gleb Minaev
+ */
+internal tailrec fun <C> RingOps<C>.multiplyExponentiatedBySquaring(base: C, arg: C, exponent: UInt): C =
+    when {
+        exponent == 0u -> base
+        exponent == 1u -> base * arg
+        exponent and 1u == 0u -> multiplyExponentiatedBySquaring(base, arg * arg, exponent shr 1)
+        exponent and 1u == 1u -> multiplyExponentiatedBySquaring(base * arg, arg * arg, exponent shr 1)
+        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
+    }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
similarity index 100%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
rename to kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt b/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt
similarity index 100%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
rename to kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
similarity index 100%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
rename to kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt b/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/numberedUtil.kt
similarity index 100%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
rename to kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/numberedUtil.kt
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt b/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
similarity index 94%
rename from kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
rename to kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
index edeaef6a7..081cf06e4 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
+++ b/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
@@ -6,19 +6,17 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.functions.testUtils.t
+import space.kscience.kmath.functions.testUtils.x
+import space.kscience.kmath.functions.testUtils.y
+import space.kscience.kmath.functions.testUtils.z
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class LabeledConstructorsTest {
-    val x by symbol
-    val y by symbol
-    val z by symbol
-    val t by symbol
-    
     @Test
     @UnstableKMathAPI
     fun testDSL1() {
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt b/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
similarity index 99%
rename from kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
rename to kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
index 95481f2ef..d2d417a02 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
+++ b/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
@@ -8,25 +8,22 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.test.misc.IntModuloRing
-import space.kscience.kmath.test.misc.Rational
-import space.kscience.kmath.test.misc.RationalField
-import space.kscience.kmath.test.misc.m
+import space.kscience.kmath.functions.testUtils.IntModuloRing
+import space.kscience.kmath.functions.testUtils.Rational
+import space.kscience.kmath.functions.testUtils.RationalField
+import space.kscience.kmath.functions.testUtils.o
+import space.kscience.kmath.functions.testUtils.m
 import kotlin.test.*
+import space.kscience.kmath.functions.testUtils.x
+import space.kscience.kmath.functions.testUtils.y
+import space.kscience.kmath.functions.testUtils.z
+import space.kscience.kmath.functions.testUtils.t
+import space.kscience.kmath.functions.testUtils.s
+import space.kscience.kmath.functions.testUtils.iota
 
 
 // TODO: Тесты на конвертацию.
 class LabeledPolynomialTest {
-    val x by symbol
-    val y by symbol
-    val z by symbol
-    val t by symbol
-    val s by symbol
-    val iota by symbol
-    
-    val o = Rational(0)
-
     @Test
     fun test_Variable_Int_plus() {
         RationalField.labeledPolynomialSpace {
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt b/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
similarity index 99%
rename from kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
rename to kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
index cdfe309f9..37329a318 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
+++ b/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
@@ -6,20 +6,18 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.test.misc.Rational
-import space.kscience.kmath.test.misc.RationalField
-import space.kscience.kmath.test.misc.assertEquals
+import space.kscience.kmath.functions.testUtils.Rational
+import space.kscience.kmath.functions.testUtils.RationalField
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import space.kscience.kmath.functions.testUtils.x
+import space.kscience.kmath.functions.testUtils.y
+import space.kscience.kmath.functions.testUtils.iota
+import space.kscience.kmath.functions.testUtils.assertEquals
 
 class LabeledPolynomialUtilTest {
-    val x by symbol
-    val y by symbol
-    val iota by symbol
-
     @Test
     fun test_Polynomial_substitute_Double() {
         assertEquals(
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt b/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
similarity index 100%
rename from kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
rename to kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt b/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
similarity index 99%
rename from kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
rename to kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
index 007c3e5e9..ec2e34520 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
+++ b/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
@@ -7,10 +7,11 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.test.misc.IntModuloRing
-import space.kscience.kmath.test.misc.Rational
-import space.kscience.kmath.test.misc.RationalField
-import space.kscience.kmath.test.misc.m
+import space.kscience.kmath.functions.testUtils.IntModuloRing
+import space.kscience.kmath.functions.testUtils.Rational
+import space.kscience.kmath.functions.testUtils.RationalField
+import space.kscience.kmath.functions.testUtils.m
+import space.kscience.kmath.functions.testUtils.o
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertSame
@@ -18,8 +19,6 @@ import kotlin.test.fail
 
 
 class NumberedPolynomialTest {
-    val o = Rational(0)
-
     @Test
     fun test_Polynomial_Int_plus() {
         RationalField.numberedPolynomialSpace {
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt b/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
similarity index 99%
rename from kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
rename to kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
index 1b87d3fcf..82f1e561a 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
+++ b/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
@@ -6,19 +6,16 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asBuffer
-import space.kscience.kmath.test.misc.Rational
-import space.kscience.kmath.test.misc.RationalField
-import space.kscience.kmath.test.misc.assertEquals
-import space.kscience.kmath.test.misc.assertFailsWithTypeAndMessage
+import space.kscience.kmath.functions.testUtils.Rational
+import space.kscience.kmath.functions.testUtils.RationalField
+import space.kscience.kmath.functions.testUtils.assertFailsWithTypeAndMessage
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import space.kscience.kmath.functions.testUtils.bufferOf
+import space.kscience.kmath.functions.testUtils.assertEquals
 
 
-fun <T> bufferOf(vararg elements: T): Buffer<T> = elements.asBuffer()
-
 class NumberedPolynomialUtilTest {
     @Test
     fun test_Polynomial_substitute_Double_Map() {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e3c621e9a..543d08001 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,6 +26,9 @@ include(
     ":kmath-core",
     ":kmath-coroutines",
     ":kmath-functions",
+    ":test-utils-functions",
+    ":kmath-polynomialX",
+    ":test-utils-polynomialX",
     ":kmath-histograms",
     ":kmath-commons",
     ":kmath-viktor",
diff --git a/test-utils-functions/build.gradle.kts b/test-utils-functions/build.gradle.kts
new file mode 100644
index 000000000..8476abecc
--- /dev/null
+++ b/test-utils-functions/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    id("ru.mipt.npm.gradle.mpp")
+    id("ru.mipt.npm.gradle.native")
+}
+
+kotlin.sourceSets {
+    commonMain {
+        dependencies {
+            api(projects.kmathCore)
+            api(projects.kmathFunctions)
+            api(kotlin("test"))
+        }
+    }
+}
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
similarity index 70%
rename from kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
rename to test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
index f6e8457bb..933c4dc4c 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/IntModulo.kt
+++ b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
@@ -5,40 +5,37 @@
 
 @file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
 
-package space.kscience.kmath.test.misc
+package space.kscience.kmath.functions.testUtils
 
-import space.kscience.kmath.functions.ListPolynomial
-import space.kscience.kmath.functions.ListPolynomialSpace
-import space.kscience.kmath.functions.PolynomialSpaceOverRing
 import space.kscience.kmath.operations.Ring
 
 
-class IntModulo {
-    val residue: Int
-    val modulus: Int
+public class IntModulo {
+    public val residue: Int
+    public val modulus: Int
 
     @PublishedApi
     internal constructor(residue: Int, modulus: Int, toCheckInput: Boolean = true) {
         if (toCheckInput) {
             require(modulus != 0) { "modulus can not be zero" }
             this.modulus = if (modulus < 0) -modulus else modulus
-            this.residue = residue.mod(modulus)
+            this.residue = residue.mod(this.modulus)
         } else {
             this.residue = residue
             this.modulus = modulus
         }
     }
 
-    constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
+    public constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
 
-    operator fun unaryPlus(): IntModulo = this
-    operator fun unaryMinus(): IntModulo =
+    public operator fun unaryPlus(): IntModulo = this
+    public operator fun unaryMinus(): IntModulo =
         IntModulo(
             if (residue == 0) 0 else modulus - residue,
             modulus,
             toCheckInput = false
         )
-    operator fun plus(other: IntModulo): IntModulo {
+    public operator fun plus(other: IntModulo): IntModulo {
         require(modulus == other.modulus) { "can not add two residue different modulo" }
         return IntModulo(
             (residue + other.residue) % modulus,
@@ -46,13 +43,13 @@ class IntModulo {
             toCheckInput = false
         )
     }
-    operator fun plus(other: Int): IntModulo =
+    public operator fun plus(other: Int): IntModulo =
         IntModulo(
             (residue + other) % modulus,
             modulus,
             toCheckInput = false
         )
-    operator fun minus(other: IntModulo): IntModulo {
+    public operator fun minus(other: IntModulo): IntModulo {
         require(modulus == other.modulus) { "can not subtract two residue different modulo" }
         return IntModulo(
             (residue - other.residue) % modulus,
@@ -60,13 +57,13 @@ class IntModulo {
             toCheckInput = false
         )
     }
-    operator fun minus(other: Int): IntModulo =
+    public operator fun minus(other: Int): IntModulo =
         IntModulo(
             (residue - other) % modulus,
             modulus,
             toCheckInput = false
         )
-    operator fun times(other: IntModulo): IntModulo {
+    public operator fun times(other: IntModulo): IntModulo {
         require(modulus == other.modulus) { "can not multiply two residue different modulo" }
         return IntModulo(
             (residue * other.residue) % modulus,
@@ -74,13 +71,13 @@ class IntModulo {
             toCheckInput = false
         )
     }
-    operator fun times(other: Int): IntModulo =
+    public operator fun times(other: Int): IntModulo =
         IntModulo(
             (residue * other) % modulus,
             modulus,
             toCheckInput = false
         )
-    operator fun div(other: IntModulo): IntModulo {
+    public operator fun div(other: IntModulo): IntModulo {
         require(modulus == other.modulus) { "can not divide two residue different modulo" }
         val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other.residue, modulus)
         require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
@@ -90,7 +87,7 @@ class IntModulo {
             toCheckInput = false
         )
     }
-    operator fun div(other: Int): IntModulo {
+    public operator fun div(other: Int): IntModulo {
         val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other, modulus)
         require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
         return IntModulo(
@@ -111,11 +108,11 @@ class IntModulo {
 }
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
-class IntModuloRing : Ring<IntModulo> {
+public class IntModuloRing : Ring<IntModulo> {
 
-    val modulus: Int
+    public val modulus: Int
 
-    constructor(modulus: Int) {
+    public constructor(modulus: Int) {
         require(modulus != 0) { "modulus can not be zero" }
         this.modulus = if (modulus < 0) -modulus else modulus
     }
@@ -123,7 +120,7 @@ class IntModuloRing : Ring<IntModulo> {
     override inline val zero: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
     override inline val one: IntModulo get() = IntModulo(1, modulus, toCheckInput = false)
 
-    fun number(arg: Int) = IntModulo(arg, modulus, toCheckInput = false)
+    public fun number(arg: Int): IntModulo = IntModulo(arg, modulus, toCheckInput = false)
 
     override inline fun add(left: IntModulo, right: IntModulo): IntModulo = left + right
     override inline fun multiply(left: IntModulo, right: IntModulo): IntModulo = left * right
@@ -132,13 +129,5 @@ class IntModuloRing : Ring<IntModulo> {
     override inline fun IntModulo.plus(arg: IntModulo): IntModulo = this + arg
     override inline fun IntModulo.minus(arg: IntModulo): IntModulo = this - arg
     override inline fun IntModulo.times(arg: IntModulo): IntModulo = this * arg
-    inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
-}
-
-fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
-    ListPolynomial(coefs.map { IntModulo(it, ring.modulus) })
-fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
-    ListPolynomial(coefs.map { IntModulo(it, modulus) })
-
-fun IntModuloRing.m(arg: Int) = IntModulo(arg, modulus)
-fun PolynomialSpaceOverRing<IntModulo, *, IntModuloRing>.m(arg: Int) = IntModulo(arg, ring.modulus)
\ No newline at end of file
+    public inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
+}
\ No newline at end of file
diff --git a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
new file mode 100644
index 000000000..4b65fbea1
--- /dev/null
+++ b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions.testUtils
+
+import space.kscience.kmath.functions.ListPolynomial
+import space.kscience.kmath.functions.ListPolynomialSpace
+import space.kscience.kmath.functions.PolynomialSpaceOverRing
+
+
+public fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
+    ListPolynomial(coefs.map { IntModulo(it, ring.modulus) })
+public fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
+    ListPolynomial(coefs.map { IntModulo(it, modulus) })
+
+public fun IntModuloRing.m(arg: Int): IntModulo = IntModulo(arg, modulus)
+public fun PolynomialSpaceOverRing<IntModulo, *, IntModuloRing>.m(arg: Int): IntModulo = IntModulo(arg, ring.modulus)
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
similarity index 77%
rename from kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
rename to test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
index 731621658..27b0eb21e 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/Rational.kt
+++ b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
@@ -5,21 +5,21 @@
 
 @file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
 
-package space.kscience.kmath.test.misc
+package space.kscience.kmath.functions.testUtils
 
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.NumbersAddOps
 
 @Suppress("NAME_SHADOWING")
-class Rational {
-    companion object {
-        val ZERO: Rational = Rational(0L)
-        val ONE: Rational = Rational(1L)
+public class Rational {
+    public companion object {
+        public val ZERO: Rational = Rational(0L)
+        public val ONE: Rational = Rational(1L)
     }
 
-    val numerator: Long
-    val denominator: Long
+    public val numerator: Long
+    public val denominator: Long
 
     internal constructor(numerator: Long, denominator: Long, toCheckInput: Boolean = true) {
         if (toCheckInput) {
@@ -35,16 +35,16 @@ class Rational {
         }
     }
 
-    constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
-    constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
-    constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
-    constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
-    constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
-    constructor(numerator: Long) : this(numerator, 1L, false)
+    public constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
+    public constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
+    public constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
+    public constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
+    public constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
+    public constructor(numerator: Long) : this(numerator, 1L, false)
 
-    operator fun unaryPlus(): Rational = this
-    operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
-    operator fun plus(other: Rational): Rational {
+    public operator fun unaryPlus(): Rational = this
+    public operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
+    public operator fun plus(other: Rational): Rational {
         val denominatorsGcd = gcd(denominator, other.denominator)
         val dividedThisDenominator = denominator / denominatorsGcd
         val dividedOtherDenominator = other.denominator / denominatorsGcd
@@ -56,19 +56,19 @@ class Rational {
             toCheckInput = false
         )
     }
-    operator fun plus(other: Int): Rational =
+    public operator fun plus(other: Int): Rational =
         Rational(
             numerator + denominator * other.toLong(),
             denominator,
             toCheckInput = false
         )
-    operator fun plus(other: Long): Rational =
+    public operator fun plus(other: Long): Rational =
         Rational(
             numerator + denominator * other,
             denominator,
             toCheckInput = false
         )
-    operator fun minus(other: Rational): Rational {
+    public operator fun minus(other: Rational): Rational {
         val denominatorsGcd = gcd(denominator, other.denominator)
         val dividedThisDenominator = denominator / denominatorsGcd
         val dividedOtherDenominator = other.denominator / denominatorsGcd
@@ -80,19 +80,19 @@ class Rational {
             toCheckInput = false
         )
     }
-    operator fun minus(other: Int): Rational =
+    public operator fun minus(other: Int): Rational =
         Rational(
             numerator - denominator * other.toLong(),
             denominator,
             toCheckInput = false
         )
-    operator fun minus(other: Long): Rational =
+    public operator fun minus(other: Long): Rational =
         Rational(
             numerator - denominator * other,
             denominator,
             toCheckInput = false
         )
-    operator fun times(other: Rational): Rational {
+    public operator fun times(other: Rational): Rational {
         val thisDenominatorAndOtherNumeratorGcd = gcd(denominator, other.numerator)
         val otherDenominatorAndThisNumeratorGcd = gcd(other.denominator, numerator)
         return Rational(
@@ -101,7 +101,7 @@ class Rational {
             toCheckInput = false
         )
     }
-    operator fun times(other: Int): Rational {
+    public operator fun times(other: Int): Rational {
         val other = other.toLong()
         val denominatorAndOtherGcd = gcd(denominator, other)
         return Rational(
@@ -110,7 +110,7 @@ class Rational {
             toCheckInput = false
         )
     }
-    operator fun times(other: Long): Rational {
+    public operator fun times(other: Long): Rational {
         val denominatorAndOtherGcd = gcd(denominator, other)
         return Rational(
             numerator * (other / denominatorAndOtherGcd),
@@ -118,7 +118,7 @@ class Rational {
             toCheckInput = false
         )
     }
-    operator fun div(other: Rational): Rational {
+    public operator fun div(other: Rational): Rational {
         val denominatorsGcd = gcd(denominator, other.denominator)
         val numeratorsGcd = gcd(numerator, other.numerator)
         return Rational(
@@ -126,7 +126,7 @@ class Rational {
             (denominator / denominatorsGcd) * (other.numerator / numeratorsGcd)
         )
     }
-    operator fun div(other: Int): Rational {
+    public operator fun div(other: Int): Rational {
         val other = other.toLong()
         val numeratorAndOtherGcd = gcd(numerator, other)
         return Rational(
@@ -135,7 +135,7 @@ class Rational {
             toCheckInput = false
         )
     }
-    operator fun div(other: Long): Rational {
+    public operator fun div(other: Long): Rational {
         val numeratorAndOtherGcd = gcd(numerator, other)
         return Rational(
             numerator / numeratorAndOtherGcd,
@@ -158,7 +158,7 @@ class Rational {
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
 @OptIn(UnstableKMathAPI::class)
-object RationalField : Field<Rational>, NumbersAddOps<Rational> {
+public object RationalField : Field<Rational>, NumbersAddOps<Rational> {
     override inline val zero: Rational get() = Rational.ZERO
     override inline val one: Rational get() = Rational.ONE
 
diff --git a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
new file mode 100644
index 000000000..5cf82996f
--- /dev/null
+++ b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions.testUtils
+
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+
+
+public inline fun <reified T : Throwable> assertFailsWithTypeAndMessage(
+    expectedMessage: String? = null,
+    assertionMessage: String? = null,
+    block: () -> Unit
+) {
+    assertEquals(
+        expectedMessage,
+        assertFailsWith(T::class, assertionMessage, block).message,
+        assertionMessage
+    )
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
similarity index 76%
rename from kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
rename to test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
index ed41b9245..ff67f19d8 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/misc.kt
+++ b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
@@ -3,16 +3,16 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.test.misc
+package space.kscience.kmath.functions.testUtils
 
 import kotlin.math.abs
 
 
-data class BezoutIdentityWithGCD<T>(val first: T, val second: T, val gcd: T)
+internal data class BezoutIdentityWithGCD<T>(val first: T, val second: T, val gcd: T)
 
-tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
+internal tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
 
-fun bezoutIdentityWithGCD(a: Int, b: Int): BezoutIdentityWithGCD<Int> =
+internal fun bezoutIdentityWithGCD(a: Int, b: Int): BezoutIdentityWithGCD<Int> =
     when {
         a < 0 && b < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, -second, gcd) }
         a < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, second, gcd) }
diff --git a/test-utils-polynomialX/build.gradle.kts b/test-utils-polynomialX/build.gradle.kts
new file mode 100644
index 000000000..f20e1b8bb
--- /dev/null
+++ b/test-utils-polynomialX/build.gradle.kts
@@ -0,0 +1,16 @@
+plugins {
+    id("ru.mipt.npm.gradle.mpp")
+    id("ru.mipt.npm.gradle.native")
+}
+
+kotlin.sourceSets {
+    commonMain {
+        dependencies {
+            api(projects.kmathCore)
+            api(projects.kmathFunctions)
+            api(projects.testUtilsFunctions)
+            api(projects.kmathPolynomialX)
+            api(kotlin("test"))
+        }
+    }
+}
diff --git a/test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt b/test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
new file mode 100644
index 000000000..afd26dd36
--- /dev/null
+++ b/test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions.testUtils
+
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.asBuffer
+
+
+public fun <T> bufferOf(vararg elements: T): Buffer<T> = elements.asBuffer()
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt b/test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
similarity index 72%
rename from kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt
rename to test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
index 85180bd2a..9ca5f43a3 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/test/misc/assertion.kt
+++ b/test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.test.misc
+package space.kscience.kmath.functions.testUtils
 
 import space.kscience.kmath.functions.LabeledPolynomial
 import space.kscience.kmath.functions.LabeledRationalFunction
@@ -13,36 +13,45 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
 
-fun <T> assertContentEquals(expected: Map<T, Double>, actual: Map<T, Double>, absoluteTolerance: Double, message: String? = null) {
+public fun <T> assertContentEquals(
+    expected: Map<T, Double>,
+    actual: Map<T, Double>,
+    absoluteTolerance: Double,
+    message: String? = null
+) {
     assertEquals(expected.keys, actual.keys, message)
     for ((key, expectedValue) in expected) assertEquals(expectedValue, actual[key]!!, absoluteTolerance, message)
 }
 
-fun assertEquals(
+public fun assertEquals(
     expected: NumberedPolynomial<Double>,
     actual: NumberedPolynomial<Double>,
     absoluteTolerance: Double,
     message: String? = null
-) = assertContentEquals(
-    expected.coefficients,
-    actual.coefficients,
-    absoluteTolerance,
-    message
-)
+) {
+    assertContentEquals(
+        expected.coefficients,
+        actual.coefficients,
+        absoluteTolerance,
+        message
+    )
+}
 
-fun assertEquals(
+public fun assertEquals(
     expected: LabeledPolynomial<Double>,
     actual: LabeledPolynomial<Double>,
     absoluteTolerance: Double,
     message: String? = null
-) = assertContentEquals(
-    expected.coefficients,
-    actual.coefficients,
-    absoluteTolerance,
-    message
-)
+) {
+    assertContentEquals(
+        expected.coefficients,
+        actual.coefficients,
+        absoluteTolerance,
+        message
+    )
+}
 
-fun assertEquals(
+public fun assertEquals(
     expected: NumberedRationalFunction<Double>,
     actual: NumberedRationalFunction<Double>,
     absoluteTolerance: Double,
@@ -62,7 +71,7 @@ fun assertEquals(
     )
 }
 
-fun assertEquals(
+public fun assertEquals(
     expected: LabeledRationalFunction<Double>,
     actual: LabeledRationalFunction<Double>,
     absoluteTolerance: Double,
@@ -82,13 +91,15 @@ fun assertEquals(
     )
 }
 
-inline fun <reified T : Throwable> assertFailsWithTypeAndMessage(
+// FIXME: Don't understand why but the same function from test-utils-functions module can not be used
+public inline fun <reified T : Throwable> assertFailsWithTypeAndMessage(
     expectedMessage: String? = null,
     assertionMessage: String? = null,
     block: () -> Unit
-) =
+) {
     assertEquals(
         expectedMessage,
         assertFailsWith(T::class, assertionMessage, block).message,
         assertionMessage
-    )
\ No newline at end of file
+    )
+}
\ No newline at end of file
diff --git a/test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt b/test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
new file mode 100644
index 000000000..051fc0f37
--- /dev/null
+++ b/test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions.testUtils
+
+import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.symbol
+
+
+public val o: Rational = Rational(0)
+
+public val x: Symbol by symbol
+public val y: Symbol by symbol
+public val z: Symbol by symbol
+public val t: Symbol by symbol
+public val s: Symbol by symbol
+public val iota: Symbol by symbol
\ No newline at end of file
-- 
2.34.1


From 1c719b9e709ec07920545a99db6c7c9f274b8908 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 11 Jul 2022 17:52:46 +0300
Subject: [PATCH 560/713] Fix examples.

---
 examples/build.gradle.kts                                       | 2 ++
 .../main/kotlin/space/kscience/kmath/functions/polynomials.kt   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 60f8f5aed..67b28cd85 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -15,6 +15,8 @@ dependencies {
     implementation(project(":kmath-coroutines"))
     implementation(project(":kmath-commons"))
     implementation(project(":kmath-complex"))
+    implementation(project(":kmath-functions"))
+    implementation(project(":kmath-polynomialX"))
     implementation(project(":kmath-optimization"))
     implementation(project(":kmath-stat"))
     implementation(project(":kmath-viktor"))
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
index 7843a0210..4151b0283 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("LocalVariableName")
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.expressions.Symbol
-- 
2.34.1


From 51dd72e48f2043a00bc2a5da75dbf8b6c1c2039b Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 11 Jul 2022 22:39:13 +0300
Subject: [PATCH 561/713] Finish move.

---
 examples/build.gradle.kts                     |   2 +-
 .../build.gradle.kts                          |   4 +-
 .../LabeledPolynomial.kt                      |   0
 .../LabeledRationalFunction.kt                |   0
 .../ListPolynomial.kt                         | 387 ++++++++++++++
 .../ListRationalFunction.kt                   |   0
 .../NumberedPolynomial.kt                     |   0
 .../NumberedRationalFunction.kt               |   0
 .../Polynomial.kt                             | 502 ++++++++++++++++++
 .../RationalFunction.kt                       |   3 +-
 .../algebraicStub.kt                          |   0
 .../labeledConstructors.kt                    |   0
 .../labeledUtil.kt                            |   2 +-
 .../listConstructors.kt                       |  92 ++++
 .../listUtil.kt                               | 255 +++++++++
 .../space.kscience.kmath.functions/misc.kt    |  22 +
 .../numberedConstructors.kt                   |   0
 .../numberedUtil.kt                           |   0
 .../functions/LabeledConstructorsTest.kt      |   6 +-
 .../kmath/functions/LabeledPolynomialTest.kt  |  10 +-
 .../functions/LabeledPolynomialUtilTest.kt    |   9 +-
 .../functions/NumberedConstructorsTest.kt     |   0
 .../kmath/functions/NumberedPolynomialTest.kt |   0
 .../functions/NumberedPolynomialUtilTest.kt   |   0
 settings.gradle.kts                           |   4 +-
 .../build.gradle.kts                          |   4 +-
 .../kmath/functions/testUtils/BufferUtils.kt  |   0
 .../kmath/functions/testUtils/assertion.kt    |   0
 .../kmath/functions/testUtils/misc.kt         |   0
 29 files changed, 1278 insertions(+), 24 deletions(-)
 rename {kmath-polynomialX => kmath-polynomial}/build.gradle.kts (81%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt (100%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledRationalFunction.kt (100%)
 create mode 100644 kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt
 rename {kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions => kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions}/ListRationalFunction.kt (100%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt (100%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedRationalFunction.kt (100%)
 create mode 100644 kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/Polynomial.kt
 rename {kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions => kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions}/RationalFunction.kt (99%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonMain/kotlin/space.kscience.kmath.functions/algebraicStub.kt (100%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt (100%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt (99%)
 create mode 100644 kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/listConstructors.kt
 create mode 100644 kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/listUtil.kt
 create mode 100644 kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/misc.kt
 rename {kmath-polynomialX => kmath-polynomial}/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt (100%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonMain/kotlin/space.kscience.kmath.functions/numberedUtil.kt (100%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt (99%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt (99%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt (99%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt (100%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt (100%)
 rename {kmath-polynomialX => kmath-polynomial}/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt (100%)
 rename {test-utils-polynomialX => test-utils-polynomial}/build.gradle.kts (63%)
 rename {test-utils-polynomialX => test-utils-polynomial}/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt (100%)
 rename {test-utils-polynomialX => test-utils-polynomial}/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt (100%)
 rename {test-utils-polynomialX => test-utils-polynomial}/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt (100%)

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 67b28cd85..aa5c1f47a 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
     implementation(project(":kmath-commons"))
     implementation(project(":kmath-complex"))
     implementation(project(":kmath-functions"))
-    implementation(project(":kmath-polynomialX"))
+    implementation(project(":kmath-polynomial"))
     implementation(project(":kmath-optimization"))
     implementation(project(":kmath-stat"))
     implementation(project(":kmath-viktor"))
diff --git a/kmath-polynomialX/build.gradle.kts b/kmath-polynomial/build.gradle.kts
similarity index 81%
rename from kmath-polynomialX/build.gradle.kts
rename to kmath-polynomial/build.gradle.kts
index 51b3c0665..dcfcb1b46 100644
--- a/kmath-polynomialX/build.gradle.kts
+++ b/kmath-polynomial/build.gradle.kts
@@ -10,13 +10,11 @@ kotlin.sourceSets {
     commonMain {
         dependencies {
             api(projects.kmathCore)
-            api(projects.kmathFunctions)
         }
     }
     commonTest {
         dependencies {
-            api(projects.testUtilsFunctions)
-            api(projects.testUtilsPolynomialX)
+            api(projects.testUtilsPolynomial)
             api(kotlin("test"))
         }
     }
diff --git a/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
similarity index 100%
rename from kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
rename to kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
diff --git a/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledRationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledRationalFunction.kt
similarity index 100%
rename from kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledRationalFunction.kt
rename to kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledRationalFunction.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt
new file mode 100644
index 000000000..76e1a6bb6
--- /dev/null
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt
@@ -0,0 +1,387 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.ScaleOperations
+import space.kscience.kmath.operations.invoke
+import kotlin.math.max
+import kotlin.math.min
+
+
+/**
+ * Represents univariate polynomial that stores its coefficients in a [List].
+ *
+ * @param C the type of constants.
+ */
+public data class ListPolynomial<C>(
+    /**
+     * List that contains coefficients of the polynomial. Every monomial `a x^d` is stored as a coefficient `a` placed
+     * into the list at index `d`. For example, coefficients of a polynomial `5 x^2 - 6` can be represented as
+     * ```
+     * listOf(
+     *     -6, // -6 +
+     *     0,  // 0 x +
+     *     5,  // 5 x^2
+     * )
+     * ```
+     * and also as
+     * ```
+     * listOf(
+     *     -6, // -6 +
+     *     0,  // 0 x +
+     *     5,  // 5 x^2
+     *     0,  // 0 x^3
+     *     0,  // 0 x^4
+     * )
+     * ```
+     * It is not prohibited to put extra zeros at end of the list (as for `0x^3` and `0x^4` in the example). But the
+     * longer the coefficients list the worse performance of arithmetical operations performed on it. Thus, it is
+     * recommended not to put (or even to remove) extra (or useless) coefficients at the end of the coefficients list.
+     */
+    public val coefficients: List<C>
+) : Polynomial<C> {
+    override fun toString(): String = "ListPolynomial$coefficients"
+}
+
+/**
+ * Arithmetic context for univariate polynomials with coefficients stored as a [List] constructed with the provided
+ * [ring] of constants.
+ *
+ * @param C the type of constants. Polynomials have them a coefficients in their terms.
+ * @param A type of provided underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
+ */
+public open class ListPolynomialSpace<C, A : Ring<C>>(
+    public override val ring: A,
+) : PolynomialSpaceOverRing<C, ListPolynomial<C>, A> {
+    /**
+     * Returns sum of the polynomial and the integer represented as a polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public override operator fun ListPolynomial<C>.plus(other: Int): ListPolynomial<C> =
+        if (other == 0) this
+        else
+            ListPolynomial(
+                coefficients
+                    .toMutableList()
+                    .apply {
+                        val result = getOrElse(0) { constantZero } + other
+
+                        if(size == 0) add(result)
+                        else this[0] = result
+                    }
+            )
+    /**
+     * Returns difference between the polynomial and the integer represented as a polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public override operator fun ListPolynomial<C>.minus(other: Int): ListPolynomial<C> =
+        if (other == 0) this
+        else
+            ListPolynomial(
+                coefficients
+                    .toMutableList()
+                    .apply {
+                        val result = getOrElse(0) { constantZero } - other
+
+                        if(size == 0) add(result)
+                        else this[0] = result
+                    }
+            )
+    /**
+     * Returns product of the polynomial and the integer represented as a polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun ListPolynomial<C>.times(other: Int): ListPolynomial<C> =
+        when (other) {
+            0 -> zero
+            1 -> this
+            else -> ListPolynomial(
+                coefficients
+                    .toMutableList()
+                    .apply {
+                        for (deg in indices) this[deg] = this[deg] * other
+                    }
+            )
+        }
+
+    /**
+     * Returns sum of the integer represented as a polynomial and the polynomial.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public override operator fun Int.plus(other: ListPolynomial<C>): ListPolynomial<C> =
+        if (this == 0) other
+        else
+            ListPolynomial(
+                other.coefficients
+                    .toMutableList()
+                    .apply {
+                        val result = this@plus + getOrElse(0) { constantZero }
+
+                        if(size == 0) add(result)
+                        else this[0] = result
+                    }
+            )
+    /**
+     * Returns difference between the integer represented as a polynomial and the polynomial.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public override operator fun Int.minus(other: ListPolynomial<C>): ListPolynomial<C> =
+        ListPolynomial(
+            other.coefficients
+                .toMutableList()
+                .apply {
+                    if (this@minus == 0) {
+                        indices.forEach { this[it] = -this[it] }
+                    } else {
+                        (1..lastIndex).forEach { this[it] = -this[it] }
+
+                        val result = this@minus - getOrElse(0) { constantZero }
+
+                        if (size == 0) add(result)
+                        else this[0] = result
+                    }
+                }
+        )
+    /**
+     * Returns product of the integer represented as a polynomial and the polynomial.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: ListPolynomial<C>): ListPolynomial<C> =
+        when (this) {
+            0 -> zero
+            1 -> other
+            else -> ListPolynomial(
+                other.coefficients
+                    .toMutableList()
+                    .apply {
+                        for (deg in indices) this[deg] = this@times * this[deg]
+                    }
+            )
+        }
+
+    /**
+     * Returns sum of the constant represented as a polynomial and the polynomial.
+     */
+    public override operator fun C.plus(other: ListPolynomial<C>): ListPolynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) ListPolynomial(listOf(this@plus))
+            else ListPolynomial(
+                toMutableList()
+                    .apply {
+                        val result = if (size == 0) this@plus else this@plus + get(0)
+
+                        if(size == 0) add(result)
+                        else this[0] = result
+                    }
+            )
+        }
+    /**
+     * Returns difference between the constant represented as a polynomial and the polynomial.
+     */
+    public override operator fun C.minus(other: ListPolynomial<C>): ListPolynomial<C> =
+        with(other.coefficients) {
+            if (isEmpty()) ListPolynomial(listOf(this@minus))
+            else ListPolynomial(
+                toMutableList()
+                    .apply {
+                        (1 .. lastIndex).forEach { this[it] = -this[it] }
+
+                        val result = if (size == 0) this@minus else this@minus - get(0)
+
+                        if(size == 0) add(result)
+                        else this[0] = result
+                    }
+            )
+        }
+    /**
+     * Returns product of the constant represented as a polynomial and the polynomial.
+     */
+    public override operator fun C.times(other: ListPolynomial<C>): ListPolynomial<C> =
+        ListPolynomial(
+            other.coefficients
+                .toMutableList()
+                .apply {
+                    for (deg in indices) this[deg] = this@times * this[deg]
+                }
+        )
+
+    /**
+     * Returns sum of the constant represented as a polynomial and the polynomial.
+     */
+    public override operator fun ListPolynomial<C>.plus(other: C): ListPolynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) ListPolynomial(listOf(other))
+            else ListPolynomial(
+                toMutableList()
+                    .apply {
+                        val result = if (size == 0) other else get(0) + other
+
+                        if(size == 0) add(result)
+                        else this[0] = result
+                    }
+            )
+        }
+    /**
+     * Returns difference between the constant represented as a polynomial and the polynomial.
+     */
+    public override operator fun ListPolynomial<C>.minus(other: C): ListPolynomial<C> =
+        with(coefficients) {
+            if (isEmpty()) ListPolynomial(listOf(-other))
+            else ListPolynomial(
+                toMutableList()
+                    .apply {
+                        val result = if (size == 0) other else get(0) - other
+
+                        if(size == 0) add(result)
+                        else this[0] = result
+                    }
+            )
+        }
+    /**
+     * Returns product of the constant represented as a polynomial and the polynomial.
+     */
+    public override operator fun ListPolynomial<C>.times(other: C): ListPolynomial<C> =
+        ListPolynomial(
+            coefficients
+                .toMutableList()
+                .apply {
+                    for (deg in indices) this[deg] = this[deg] * other
+                }
+        )
+
+    /**
+     * Converts the constant [value] to polynomial.
+     */
+    public override fun number(value: C): ListPolynomial<C> = ListPolynomial(listOf(value))
+
+    /**
+     * Returns negation of the polynomial.
+     */
+    public override operator fun ListPolynomial<C>.unaryMinus(): ListPolynomial<C> =
+        ListPolynomial(coefficients.map { -it })
+    /**
+     * Returns sum of the polynomials.
+     */
+    public override operator fun ListPolynomial<C>.plus(other: ListPolynomial<C>): ListPolynomial<C> {
+        val thisDegree = degree
+        val otherDegree = other.degree
+        return ListPolynomial(
+            List(max(thisDegree, otherDegree) + 1) {
+                when {
+                    it > thisDegree -> other.coefficients[it]
+                    it > otherDegree -> coefficients[it]
+                    else -> coefficients[it] + other.coefficients[it]
+                }
+            }
+        )
+    }
+    /**
+     * Returns difference of the polynomials.
+     */
+    public override operator fun ListPolynomial<C>.minus(other: ListPolynomial<C>): ListPolynomial<C> {
+        val thisDegree = degree
+        val otherDegree = other.degree
+        return ListPolynomial(
+            List(max(thisDegree, otherDegree) + 1) {
+                when {
+                    it > thisDegree -> -other.coefficients[it]
+                    it > otherDegree -> coefficients[it]
+                    else -> coefficients[it] - other.coefficients[it]
+                }
+            }
+        )
+    }
+    /**
+     * Returns product of the polynomials.
+     */
+    public override operator fun ListPolynomial<C>.times(other: ListPolynomial<C>): ListPolynomial<C> {
+        val thisDegree = degree
+        val otherDegree = other.degree
+        return ListPolynomial(
+            List(thisDegree + otherDegree + 1) { d ->
+                (max(0, d - otherDegree)..min(thisDegree, d))
+                    .map { coefficients[it] * other.coefficients[d - it] }
+                    .reduce { acc, rational -> acc + rational }
+            }
+        )
+    }
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */ // TODO: To optimize boxing
+    override fun power(arg: ListPolynomial<C>, exponent: UInt): ListPolynomial<C> = super.power(arg, exponent)
+
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
+    override val zero: ListPolynomial<C> = ListPolynomial(emptyList())
+    /**
+     * Instance of unit polynomial (unit of the polynomial ring).
+     */
+    override val one: ListPolynomial<C> by lazy { ListPolynomial(listOf(constantOne)) }
+
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    public override val ListPolynomial<C>.degree: Int get() = coefficients.lastIndex
+
+    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
+    //  [ListPolynomialSpace] as a context receiver
+    /**
+     * Evaluates value of [this] polynomial on provided [argument].
+     */
+    public inline fun ListPolynomial<C>.substitute(argument: C): C = substitute(ring, argument)
+    /**
+     * Substitutes provided polynomial [argument] into [this] polynomial.
+     */
+    public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
+
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    public inline fun ListPolynomial<C>.asFunction(): (C) -> C = asFunctionOver(ring)
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = asFunctionOfConstantOver(ring)
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = asFunctionOfPolynomialOver(ring)
+
+    /**
+     * Evaluates value of [this] polynomial on provided [argument].
+     */
+    public inline operator fun ListPolynomial<C>.invoke(argument: C): C = substitute(ring, argument)
+    /**
+     * Evaluates value of [this] polynomial on provided [argument].
+     */
+    public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
+}
+
+/**
+ * Space of polynomials constructed over ring.
+ *
+ * @param C the type of constants. Polynomials have them as a coefficients in their terms.
+ * @param A type of underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
+ */
+public class ScalableListPolynomialSpace<C, A>(
+    ring: A,
+) : ListPolynomialSpace<C, A>(ring), ScaleOperations<ListPolynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
+    override fun scale(a: ListPolynomial<C>, value: Double): ListPolynomial<C> =
+        ring { ListPolynomial(a.coefficients.map { scale(it, value) }) }
+}
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListRationalFunction.kt
similarity index 100%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
rename to kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListRationalFunction.kt
diff --git a/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
similarity index 100%
rename from kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
rename to kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
diff --git a/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedRationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedRationalFunction.kt
similarity index 100%
rename from kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedRationalFunction.kt
rename to kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedRationalFunction.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/Polynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/Polynomial.kt
new file mode 100644
index 000000000..61ea5a342
--- /dev/null
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/Polynomial.kt
@@ -0,0 +1,502 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.invoke
+import kotlin.js.JsName
+import kotlin.jvm.JvmName
+
+
+/**
+ * Abstraction of polynomials.
+ */
+public interface Polynomial<C>
+
+/**
+ * Abstraction of ring of polynomials of type [P] over ring of constants of type [C].
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param P the type of polynomials.
+ */
+@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
+public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
+    /**
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     */
+    public operator fun C.plus(other: Int): C
+    /**
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    public operator fun C.minus(other: Int): C
+    /**
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public operator fun C.times(other: Int): C
+
+    /**
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    public operator fun Int.plus(other: C): C
+    /**
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    public operator fun Int.minus(other: C): C
+    /**
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public operator fun Int.times(other: C): C
+
+    /**
+     * Converts the integer [value] to constant.
+     */
+    public fun constantNumber(value: Int): C = constantOne * value
+    /**
+     * Converts the integer to constant.
+     */
+    public fun Int.asConstant(): C = constantNumber(this)
+
+    /**
+     * Returns sum of the polynomial and the integer represented as a polynomial.
+     *
+     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
+     */
+    public operator fun P.plus(other: Int): P = addMultipliedByDoubling(this, one, other)
+    /**
+     * Returns difference between the polynomial and the integer represented as a polynomial.
+     *
+     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
+     */
+    public operator fun P.minus(other: Int): P = addMultipliedByDoubling(this, one, -other)
+    /**
+     * Returns product of the polynomial and the integer represented as a polynomial.
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public operator fun P.times(other: Int): P = multiplyByDoubling(this, other)
+
+    /**
+     * Returns sum of the integer represented as a polynomial and the polynomial.
+     *
+     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
+     */
+    public operator fun Int.plus(other: P): P = addMultipliedByDoubling(other, one, this)
+    /**
+     * Returns difference between the integer represented as a polynomial and the polynomial.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
+     */
+    public operator fun Int.minus(other: P): P = addMultipliedByDoubling(-other, one, this)
+    /**
+     * Returns product of the integer represented as a polynomial and the polynomial.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public operator fun Int.times(other: P): P = multiplyByDoubling(other, this)
+
+    /**
+     * Converts the integer [value] to polynomial.
+     */
+    public fun number(value: Int): P = number(constantNumber(value))
+    /**
+     * Converts the integer to polynomial.
+     */
+    public fun Int.asPolynomial(): P = number(this)
+
+    /**
+     * Returns the same constant.
+     */
+    @JvmName("unaryPlusConstant")
+    @JsName("unaryPlusConstant")
+    public operator fun C.unaryPlus(): C = this
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("unaryMinusConstant")
+    @JsName("unaryMinusConstant")
+    public operator fun C.unaryMinus(): C
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("plusConstantConstant")
+    @JsName("plusConstantConstant")
+    public operator fun C.plus(other: C): C
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("minusConstantConstant")
+    @JsName("minusConstantConstant")
+    public operator fun C.minus(other: C): C
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("timesConstantConstant")
+    @JsName("timesConstantConstant")
+    public operator fun C.times(other: C): C
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    @JvmName("powerConstant")
+    @JsName("powerConstant")
+    public fun power(arg: C, exponent: UInt) : C
+
+    /**
+     * Instance of zero constant (zero of the underlying ring).
+     */
+    public val constantZero: C
+    /**
+     * Instance of unit constant (unit of the underlying ring).
+     */
+    public val constantOne: C
+
+    /**
+     * Returns sum of the constant represented as a polynomial and the polynomial.
+     */
+    public operator fun C.plus(other: P): P
+    /**
+     * Returns difference between the constant represented as a polynomial and the polynomial.
+     */
+    public operator fun C.minus(other: P): P
+    /**
+     * Returns product of the constant represented as a polynomial and the polynomial.
+     */
+    public operator fun C.times(other: P): P
+
+    /**
+     * Returns sum of the constant represented as a polynomial and the polynomial.
+     */
+    public operator fun P.plus(other: C): P
+    /**
+     * Returns difference between the constant represented as a polynomial and the polynomial.
+     */
+    public operator fun P.minus(other: C): P
+    /**
+     * Returns product of the constant represented as a polynomial and the polynomial.
+     */
+    public operator fun P.times(other: C): P
+
+    /**
+     * Converts the constant [value] to polynomial.
+     */
+    public fun number(value: C): P = one * value
+    /**
+     * Converts the constant to polynomial.
+     */
+    public fun C.asPolynomial(): P = number(this)
+
+    /**
+     * Returns the same polynomial.
+     */
+    public override operator fun P.unaryPlus(): P = this
+    /**
+     * Returns negation of the polynomial.
+     */
+    public override operator fun P.unaryMinus(): P
+    /**
+     * Returns sum of the polynomials.
+     */
+    public override operator fun P.plus(other: P): P
+    /**
+     * Returns difference of the polynomials.
+     */
+    public override operator fun P.minus(other: P): P
+    /**
+     * Returns product of the polynomials.
+     */
+    public override operator fun P.times(other: P): P
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    public override fun power(arg: P, exponent: UInt) : P = exponentiateBySquaring(arg, exponent)
+
+    /**
+     * Instance of zero polynomial (zero of the polynomial ring).
+     */
+    public override val zero: P
+    /**
+     * Instance of unit polynomial (unit of the polynomial ring).
+     */
+    public override val one: P
+
+    /**
+     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
+     * zero, degree is -1.
+     */
+    public val P.degree: Int
+
+    override fun add(left: P, right: P): P = left + right
+    override fun multiply(left: P, right: P): P = left * right
+}
+
+/**
+ * Abstraction of ring of polynomials of type [P] over ring of constants of type [C]. It also assumes that there is
+ * provided [ring] (of type [A]), that provides constant-wise operations.
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param P the type of polynomials.
+ * @param A the type of algebraic structure (precisely, of ring) provided for constants.
+ */
+@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
+public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : PolynomialSpace<C, P> {
+
+    /**
+     * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
+     */
+    public val ring: A
+
+    /**
+     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
+     *
+     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     */
+    public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
+    /**
+     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
+     *
+     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
+     */
+    public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
+    /**
+     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
+     *
+     * The operation is equivalent to sum of [other] copies of [this].
+     */
+    public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
+
+    /**
+     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     */
+    public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
+    /**
+     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
+     */
+    public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
+    /**
+     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
+     *
+     * The operation is equivalent to sum of [this] copies of [other].
+     */
+    public override operator fun Int.times(other: C): C = ring { multiplyByDoubling(other, this@times) }
+
+    /**
+     * Returns negation of the constant.
+     */
+    @JvmName("unaryMinusConstant")
+    public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
+    /**
+     * Returns sum of the constants.
+     */
+    @JvmName("plusConstantConstant")
+    public override operator fun C.plus(other: C): C = ring { this@plus + other }
+    /**
+     * Returns difference of the constants.
+     */
+    @JvmName("minusConstantConstant")
+    public override operator fun C.minus(other: C): C = ring { this@minus - other }
+    /**
+     * Returns product of the constants.
+     */
+    @JvmName("timesConstantConstant")
+    public override operator fun C.times(other: C): C = ring { this@times * other }
+    /**
+     * Raises [arg] to the integer power [exponent].
+     */
+    @JvmName("powerConstant")
+    override fun power(arg: C, exponent: UInt): C = ring { power(arg, exponent) }
+
+    /**
+     * Instance of zero constant (zero of the underlying ring).
+     */
+    public override val constantZero: C get() = ring.zero
+    /**
+     * Instance of unit constant (unit of the underlying ring).
+     */
+    public override val constantOne: C get() = ring.one
+}
+
+/**
+ * Abstraction of ring of polynomials of type [P] of variables of type [V] and over ring of constants of type [C].
+ *
+ * @param C the type of constants. Polynomials have them as coefficients in their terms.
+ * @param V the type of variables. Polynomials have them in representations of terms.
+ * @param P the type of polynomials.
+ */
+@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
+public interface MultivariatePolynomialSpace<C, V, P: Polynomial<C>>: PolynomialSpace<C, P> {
+    /**
+     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
+    @JvmName("plusVariableInt")
+    public operator fun V.plus(other: Int): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
+    @JvmName("minusVariableInt")
+    public operator fun V.minus(other: Int): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
+     */
+    @JvmName("timesVariableInt")
+    public operator fun V.times(other: Int): P
+
+    /**
+     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("plusIntVariable")
+    public operator fun Int.plus(other: V): P
+    /**
+     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("minusIntVariable")
+    public operator fun Int.minus(other: V): P
+    /**
+     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("timesIntVariable")
+    public operator fun Int.times(other: V): P
+
+    /**
+     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
+    @JvmName("plusVariableConstant")
+    public operator fun V.plus(other: C): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
+    @JvmName("minusVariableConstant")
+    public operator fun V.minus(other: C): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
+     */
+    @JvmName("timesVariableConstant")
+    public operator fun V.times(other: C): P
+
+    /**
+     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("plusConstantVariable")
+    public operator fun C.plus(other: V): P
+    /**
+     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("minusConstantVariable")
+    public operator fun C.minus(other: V): P
+    /**
+     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("timesConstantVariable")
+    public operator fun C.times(other: V): P
+
+    /**
+     * Represents the variable as a monic monomial.
+     */
+    @JvmName("unaryPlusVariable")
+    public operator fun V.unaryPlus(): P
+    /**
+     * Returns negation of representation of the variable as a monic monomial.
+     */
+    @JvmName("unaryMinusVariable")
+    public operator fun V.unaryMinus(): P
+    /**
+     * Returns sum of the variables represented as monic monomials.
+     */
+    @JvmName("plusVariableVariable")
+    public operator fun V.plus(other: V): P
+    /**
+     * Returns difference between the variables represented as monic monomials.
+     */
+    @JvmName("minusVariableVariable")
+    public operator fun V.minus(other: V): P
+    /**
+     * Returns product of the variables represented as monic monomials.
+     */
+    @JvmName("timesVariableVariable")
+    public operator fun V.times(other: V): P
+
+    /**
+     * Represents the [variable] as a monic monomial.
+     */
+    @JvmName("numberVariable")
+    public fun number(variable: V): P = +variable
+    /**
+     * Represents the variable as a monic monomial.
+     */
+    @JvmName("asPolynomialVariable")
+    public fun V.asPolynomial(): P = number(this)
+
+    /**
+     * Returns sum of the variable represented as a monic monomial and the polynomial.
+     */
+    @JvmName("plusVariablePolynomial")
+    public operator fun V.plus(other: P): P
+    /**
+     * Returns difference between the variable represented as a monic monomial and the polynomial.
+     */
+    @JvmName("minusVariablePolynomial")
+    public operator fun V.minus(other: P): P
+    /**
+     * Returns product of the variable represented as a monic monomial and the polynomial.
+     */
+    @JvmName("timesVariablePolynomial")
+    public operator fun V.times(other: P): P
+
+    /**
+     * Returns sum of the polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("plusPolynomialVariable")
+    public operator fun P.plus(other: V): P
+    /**
+     * Returns difference between the polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("minusPolynomialVariable")
+    public operator fun P.minus(other: V): P
+    /**
+     * Returns product of the polynomial and the variable represented as a monic monomial.
+     */
+    @JvmName("timesPolynomialVariable")
+    public operator fun P.times(other: V): P
+
+    /**
+     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
+     * in which they are appeared in the polynomial.
+     *
+     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
+     * And keys of the map is the same as in [variables].
+     */
+    public val P.degrees: Map<V, UInt>
+    /**
+     * Counts degree of the polynomial by the specified [variable].
+     */
+    public fun P.degreeBy(variable: V): UInt = degrees.getOrElse(variable) { 0u }
+    /**
+     * Counts degree of the polynomial by the specified [variables].
+     */
+    public fun P.degreeBy(variables: Collection<V>): UInt
+    /**
+     * Set of all variables that appear in the polynomial in positive exponents.
+     */
+    public val P.variables: Set<V> get() = degrees.keys
+    /**
+     * Count of all variables that appear in the polynomial in positive exponents.
+     */
+    public val P.countOfVariables: Int get() = variables.size
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/RationalFunction.kt
similarity index 99%
rename from kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
rename to kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/RationalFunction.kt
index 1782dba74..f664ae9db 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/RationalFunction.kt
@@ -5,7 +5,8 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.invoke
 import kotlin.js.JsName
 import kotlin.jvm.JvmName
 
diff --git a/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/algebraicStub.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/algebraicStub.kt
similarity index 100%
rename from kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/algebraicStub.kt
rename to kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/algebraicStub.kt
diff --git a/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
similarity index 100%
rename from kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
rename to kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
diff --git a/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt
similarity index 99%
rename from kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt
rename to kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt
index 4e799cb43..e3b35facc 100644
--- a/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt
@@ -8,9 +8,9 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.invoke
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.jvm.JvmName
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/listConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/listConstructors.kt
new file mode 100644
index 000000000..e95361724
--- /dev/null
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/listConstructors.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.operations.Ring
+
+
+/**
+ * Constructs a [ListPolynomial] instance with provided [coefficients]. The collection of coefficients will be reversed
+ * if [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false): ListPolynomial<C> =
+    ListPolynomial(with(coefficients) { if (reverse) reversed() else this })
+
+/**
+ * Constructs a [ListPolynomial] instance with provided [coefficients]. The collection of coefficients will be reversed
+ * if [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C> ListPolynomial(vararg coefficients: C, reverse: Boolean = false): ListPolynomial<C> =
+    ListPolynomial(with(coefficients) { if (reverse) reversed() else toList() })
+
+/**
+ * Represents [this] constant as a [ListPolynomial].
+ */
+public fun <C> C.asListPolynomial() : ListPolynomial<C> = ListPolynomial(listOf(this))
+
+
+// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
+
+/**
+ * Constructs [ListRationalFunction] instance with numerator and denominator constructed with provided
+ * [numeratorCoefficients] and [denominatorCoefficients]. The both collections of coefficients will be reversed if
+ * [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C> ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
+    )
+/**
+ * Constructs [ListRationalFunction] instance with provided [numerator] and unit denominator.
+ */
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
+    ListRationalFunction<C>(numerator, ListPolynomial(listOf(one)))
+/**
+ * Constructs [ListRationalFunction] instance with provided [numerator] and unit denominator.
+ */
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
+    ListRationalFunction<C>(numerator, polynomialOne)
+/**
+ * Constructs [ListRationalFunction] instance with numerator constructed with provided [numeratorCoefficients] and unit
+ * denominator. The collection of numerator coefficients will be reversed if [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> A.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        ListPolynomial(listOf(one))
+    )
+/**
+ * Constructs [ListRationalFunction] instance with numerator constructed with provided [numeratorCoefficients] and unit
+ * denominator. The collection of numerator coefficients will be reversed if [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
+    ListRationalFunction<C>(
+        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
+        polynomialOne
+    )
+
+/**
+ * Represents [this] constant as a rational function.
+ */ // FIXME: When context receivers will be ready, delete this function and uncomment the following two
+public fun <C, A: Ring<C>> C.asListRationalFunction(ring: A) : ListRationalFunction<C> = ring.ListRationalFunction(asListPolynomial())
+///**
+// * Represents [this] constant as a rational function.
+// */
+//context(A)
+//public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
+///**
+// * Represents [this] constant as a rational function.
+// */
+//context(ListRationalFunctionSpace<C, A>)
+//public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/listUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/listUtil.kt
new file mode 100644
index 000000000..4f3f6d88e
--- /dev/null
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/listUtil.kt
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.math.max
+import kotlin.math.pow
+
+
+/**
+ * Creates a [ListPolynomialSpace] over a received ring.
+ */
+public inline val <C, A : Ring<C>> A.listPolynomialSpace: ListPolynomialSpace<C, A>
+    get() = ListPolynomialSpace(this)
+
+/**
+ * Creates a [ListPolynomialSpace]'s scope over a received ring.
+ */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
+public inline fun <C, A : Ring<C>, R> A.listPolynomialSpace(block: ListPolynomialSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return ListPolynomialSpace(this).block()
+}
+
+/**
+ * Creates a [ScalableListPolynomialSpace] over a received scalable ring.
+ */
+public inline val <C, A> A.scalableListPolynomialSpace: ScalableListPolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C>
+    get() = ScalableListPolynomialSpace(this)
+
+/**
+ * Creates a [ScalableListPolynomialSpace]'s scope over a received scalable ring.
+ */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
+public inline fun <C, A, R> A.scalableListPolynomialSpace(block: ScalableListPolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return ScalableListPolynomialSpace(this).block()
+}
+
+/**
+ * Creates a [ListRationalFunctionSpace] over a received ring.
+ */
+public inline val <C, A : Ring<C>> A.listRationalFunctionSpace: ListRationalFunctionSpace<C, A>
+    get() = ListRationalFunctionSpace(this)
+
+/**
+ * Creates a [ListRationalFunctionSpace]'s scope over a received ring.
+ */ // TODO: When context will be ready move [ListRationalFunctionSpace] and add [A] to context receivers of [block]
+public inline fun <C, A : Ring<C>, R> A.listRationalFunctionSpace(block: ListRationalFunctionSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return ListRationalFunctionSpace(this).block()
+}
+
+
+/**
+ * Evaluates value of [this] Double polynomial on provided Double argument.
+ */
+public fun ListPolynomial<Double>.substitute(arg: Double): Double =
+    coefficients.reduceIndexedOrNull { index, acc, c ->
+        acc + c * arg.pow(index)
+    } ?: .0
+
+/**
+ * Evaluates value of [this] polynomial on provided argument.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */
+public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
+    if (coefficients.isEmpty()) return zero
+    var result: C = coefficients.last()
+    for (j in coefficients.size - 2 downTo 0) {
+        result = (arg * result) + coefficients[j]
+    }
+    return result
+}
+
+/**
+ * Substitutes provided polynomial [arg] into [this] polynomial.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */ // TODO: To optimize boxing
+public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListPolynomial<C> =
+    ring.listPolynomialSpace {
+        if (coefficients.isEmpty()) return zero
+        var result: ListPolynomial<C> = coefficients.last().asPolynomial()
+        for (j in coefficients.size - 2 downTo 0) {
+            result = (arg * result) + coefficients[j]
+        }
+        return result
+    }
+
+/**
+ * Substitutes provided rational function [arg] into [this] polynomial.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */ // TODO: To optimize boxing
+public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListRationalFunction<C>) : ListRationalFunction<C> =
+    ring.listRationalFunctionSpace {
+        if (coefficients.isEmpty()) return zero
+        var result: ListRationalFunction<C> = coefficients.last().asRationalFunction()
+        for (j in coefficients.size - 2 downTo 0) {
+            result = (arg * result) + coefficients[j]
+        }
+        return result
+    }
+
+/**
+ * Evaluates value of [this] Double rational function in provided Double argument.
+ */
+public fun ListRationalFunction<Double>.substitute(arg: Double): Double =
+    numerator.substitute(arg) / denominator.substitute(arg)
+
+/**
+ * Evaluates value of [this] polynomial for provided argument.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */
+public fun <C> ListRationalFunction<C>.substitute(ring: Field<C>, arg: C): C = ring {
+    numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
+}
+
+/**
+ * Substitutes provided polynomial [arg] into [this] rational function.
+ */ // TODO: To optimize boxing
+public fun <C> ListRationalFunction<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListRationalFunction<C> =
+    ring.listRationalFunctionSpace {
+        numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
+    }
+
+/**
+ * Substitutes provided rational function [arg] into [this] rational function.
+ */ // TODO: To optimize boxing
+public fun <C> ListRationalFunction<C>.substitute(ring: Ring<C>, arg: ListRationalFunction<C>) : ListRationalFunction<C> =
+    ring.listRationalFunctionSpace {
+        numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
+    }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOver(ring: A): (C) -> C = { substitute(ring, it) }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfConstantOver(ring: A): (C) -> C = { substitute(ring, it) }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfPolynomialOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfRationalFunctionOver(ring: A): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Field<C>> ListRationalFunction<C>.asFunctionOver(ring: A): (C) -> C = { substitute(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Field<C>> ListRationalFunction<C>.asFunctionOfConstantOver(ring: A): (C) -> C = { substitute(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListRationalFunction<C>.asFunctionOfPolynomialOver(ring: A): (ListPolynomial<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
+
+/**
+ * Represent [this] rational function as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> ListRationalFunction<C>.asFunctionOfRationalFunctionOver(ring: A): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListPolynomial<C>.derivative(
+    ring: A,
+): ListPolynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = ring {
+    ListPolynomial(
+        buildList(max(0, coefficients.size - 1)) {
+            for (deg in 1 .. coefficients.lastIndex) add(number(deg) * coefficients[deg])
+        }
+    )
+}
+
+/**
+ * Returns algebraic derivative of received polynomial of specified [order]. The [order] should be non-negative integer.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListPolynomial<C>.nthDerivative(
+    ring: A,
+    order: Int,
+): ListPolynomial<C> where A : Ring<C>, A : NumericAlgebra<C> = ring {
+    require(order >= 0) { "Order of derivative must be non-negative" }
+    ListPolynomial(
+        buildList(max(0, coefficients.size - order)) {
+            for (deg in order.. coefficients.lastIndex)
+                add((deg - order + 1 .. deg).fold(coefficients[deg]) { acc, d -> acc * number(d) })
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListPolynomial<C>.antiderivative(
+    ring: A,
+): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = ring {
+    ListPolynomial(
+        buildList(coefficients.size + 1) {
+            add(zero)
+            coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial of specified [order]. The [order] should be non-negative integer.
+ */
+@UnstableKMathAPI
+public fun <C, A> ListPolynomial<C>.nthAntiderivative(
+    ring: A,
+    order: Int,
+): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = ring {
+    require(order >= 0) { "Order of antiderivative must be non-negative" }
+    ListPolynomial(
+        buildList(coefficients.size + order) {
+            repeat(order) { add(zero) }
+            coefficients.mapIndexedTo(this) { index, c -> (1..order).fold(c) { acc, i -> acc / number(index + i) } }
+        }
+    )
+}
+
+/**
+ * Computes a definite integral of [this] polynomial in the specified [range].
+ */
+@UnstableKMathAPI
+public fun <C : Comparable<C>> ListPolynomial<C>.integrate(
+    ring: Field<C>,
+    range: ClosedRange<C>,
+): C = ring {
+    val antiderivative = antiderivative(ring)
+    antiderivative.substitute(ring, range.endInclusive) - antiderivative.substitute(ring, range.start)
+}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/misc.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/misc.kt
new file mode 100644
index 000000000..76f1c294e
--- /dev/null
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/misc.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+
+/**
+ * Marks declarations that give access to internal entities of polynomials delicate structure. Thus, it allows to
+ * optimize performance a bit by skipping standard steps, but such skips may cause critical errors if something is
+ * implemented badly. Make sure you fully read and understand documentation and don't break internal contracts.
+ */
+@RequiresOptIn(
+    message = "This declaration gives access to delicate internal structure of polynomials. " +
+            "It allows to optimize performance by skipping unnecessary arguments check. " +
+            "But at the same time makes it easy to make a mistake " +
+            "that will cause wrong computation result or even runtime error. " +
+            "Make sure you fully read and understand documentation.",
+    level = RequiresOptIn.Level.ERROR
+)
+public annotation class DelicatePolynomialAPI
\ No newline at end of file
diff --git a/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
similarity index 100%
rename from kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
rename to kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
diff --git a/kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/numberedUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedUtil.kt
similarity index 100%
rename from kmath-polynomialX/src/commonMain/kotlin/space.kscience.kmath.functions/numberedUtil.kt
rename to kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedUtil.kt
diff --git a/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
similarity index 99%
rename from kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
rename to kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
index 081cf06e4..80476050b 100644
--- a/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
@@ -6,13 +6,13 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.algebra
-import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.functions.testUtils.t
 import space.kscience.kmath.functions.testUtils.x
 import space.kscience.kmath.functions.testUtils.y
 import space.kscience.kmath.functions.testUtils.z
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
similarity index 99%
rename from kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
rename to kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
index d2d417a02..bde1386da 100644
--- a/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
@@ -11,15 +11,15 @@ import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.functions.testUtils.IntModuloRing
 import space.kscience.kmath.functions.testUtils.Rational
 import space.kscience.kmath.functions.testUtils.RationalField
-import space.kscience.kmath.functions.testUtils.o
+import space.kscience.kmath.functions.testUtils.iota
 import space.kscience.kmath.functions.testUtils.m
-import kotlin.test.*
+import space.kscience.kmath.functions.testUtils.o
+import space.kscience.kmath.functions.testUtils.s
+import space.kscience.kmath.functions.testUtils.t
 import space.kscience.kmath.functions.testUtils.x
 import space.kscience.kmath.functions.testUtils.y
 import space.kscience.kmath.functions.testUtils.z
-import space.kscience.kmath.functions.testUtils.t
-import space.kscience.kmath.functions.testUtils.s
-import space.kscience.kmath.functions.testUtils.iota
+import kotlin.test.*
 
 
 // TODO: Тесты на конвертацию.
diff --git a/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
similarity index 99%
rename from kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
rename to kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
index 37329a318..88ee1cbb8 100644
--- a/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
@@ -6,16 +6,15 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.functions.testUtils.Rational
 import space.kscience.kmath.functions.testUtils.RationalField
+import space.kscience.kmath.functions.testUtils.iota
+import space.kscience.kmath.functions.testUtils.x
+import space.kscience.kmath.functions.testUtils.y
+import space.kscience.kmath.misc.UnstableKMathAPI
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import space.kscience.kmath.functions.testUtils.x
-import space.kscience.kmath.functions.testUtils.y
-import space.kscience.kmath.functions.testUtils.iota
-import space.kscience.kmath.functions.testUtils.assertEquals
 
 class LabeledPolynomialUtilTest {
     @Test
diff --git a/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
similarity index 100%
rename from kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
rename to kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
diff --git a/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
similarity index 100%
rename from kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
rename to kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
diff --git a/kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
similarity index 100%
rename from kmath-polynomialX/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
rename to kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 543d08001..bdd83d04e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -27,8 +27,8 @@ include(
     ":kmath-coroutines",
     ":kmath-functions",
     ":test-utils-functions",
-    ":kmath-polynomialX",
-    ":test-utils-polynomialX",
+    ":kmath-polynomial",
+    ":test-utils-polynomial",
     ":kmath-histograms",
     ":kmath-commons",
     ":kmath-viktor",
diff --git a/test-utils-polynomialX/build.gradle.kts b/test-utils-polynomial/build.gradle.kts
similarity index 63%
rename from test-utils-polynomialX/build.gradle.kts
rename to test-utils-polynomial/build.gradle.kts
index f20e1b8bb..e10e1f2b1 100644
--- a/test-utils-polynomialX/build.gradle.kts
+++ b/test-utils-polynomial/build.gradle.kts
@@ -7,9 +7,7 @@ kotlin.sourceSets {
     commonMain {
         dependencies {
             api(projects.kmathCore)
-            api(projects.kmathFunctions)
-            api(projects.testUtilsFunctions)
-            api(projects.kmathPolynomialX)
+            api(projects.kmathPolynomial)
             api(kotlin("test"))
         }
     }
diff --git a/test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt b/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
similarity index 100%
rename from test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
rename to test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
diff --git a/test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt b/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
similarity index 100%
rename from test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
rename to test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
diff --git a/test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt b/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
similarity index 100%
rename from test-utils-polynomialX/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
rename to test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
-- 
2.34.1


From f726e6d0f17698dd47d6060212c8a6a04257f726 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Mon, 11 Jul 2022 23:32:15 +0300
Subject: [PATCH 562/713] Minimise appearance of new feature, leave only
 upgrades.

---
 .../kmath/functions/ListPolynomial.kt         | 387 --------
 .../kscience/kmath/functions/Piecewise.kt     |  22 +-
 .../kscience/kmath/functions/Polynomial.kt    | 629 +++++--------
 .../kscience/kmath/functions/algebraicStub.kt |  95 --
 .../kmath/functions/listConstructors.kt       |  92 --
 .../kscience/kmath/functions/listUtil.kt      | 255 ------
 .../space/kscience/kmath/functions/misc.kt    |  22 -
 .../kmath/functions/polynomialConstructors.kt |  28 +
 .../kmath/functions/polynomialUtil.kt         | 111 +++
 .../kmath/functions/AlgebraicStubTest.kt      | 460 ----------
 .../kmath/functions/ListPolynomialTest.kt     | 251 +-----
 .../kmath/functions/ListPolynomialUtilTest.kt | 850 +-----------------
 .../functions/testUtils/IntModuloUtils.kt     |  13 +-
 13 files changed, 376 insertions(+), 2839 deletions(-)
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialConstructors.kt
 create mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
deleted file mode 100644
index 76e1a6bb6..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.ScaleOperations
-import space.kscience.kmath.operations.invoke
-import kotlin.math.max
-import kotlin.math.min
-
-
-/**
- * Represents univariate polynomial that stores its coefficients in a [List].
- *
- * @param C the type of constants.
- */
-public data class ListPolynomial<C>(
-    /**
-     * List that contains coefficients of the polynomial. Every monomial `a x^d` is stored as a coefficient `a` placed
-     * into the list at index `d`. For example, coefficients of a polynomial `5 x^2 - 6` can be represented as
-     * ```
-     * listOf(
-     *     -6, // -6 +
-     *     0,  // 0 x +
-     *     5,  // 5 x^2
-     * )
-     * ```
-     * and also as
-     * ```
-     * listOf(
-     *     -6, // -6 +
-     *     0,  // 0 x +
-     *     5,  // 5 x^2
-     *     0,  // 0 x^3
-     *     0,  // 0 x^4
-     * )
-     * ```
-     * It is not prohibited to put extra zeros at end of the list (as for `0x^3` and `0x^4` in the example). But the
-     * longer the coefficients list the worse performance of arithmetical operations performed on it. Thus, it is
-     * recommended not to put (or even to remove) extra (or useless) coefficients at the end of the coefficients list.
-     */
-    public val coefficients: List<C>
-) : Polynomial<C> {
-    override fun toString(): String = "ListPolynomial$coefficients"
-}
-
-/**
- * Arithmetic context for univariate polynomials with coefficients stored as a [List] constructed with the provided
- * [ring] of constants.
- *
- * @param C the type of constants. Polynomials have them a coefficients in their terms.
- * @param A type of provided underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
- */
-public open class ListPolynomialSpace<C, A : Ring<C>>(
-    public override val ring: A,
-) : PolynomialSpaceOverRing<C, ListPolynomial<C>, A> {
-    /**
-     * Returns sum of the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun ListPolynomial<C>.plus(other: Int): ListPolynomial<C> =
-        if (other == 0) this
-        else
-            ListPolynomial(
-                coefficients
-                    .toMutableList()
-                    .apply {
-                        val result = getOrElse(0) { constantZero } + other
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-    /**
-     * Returns difference between the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun ListPolynomial<C>.minus(other: Int): ListPolynomial<C> =
-        if (other == 0) this
-        else
-            ListPolynomial(
-                coefficients
-                    .toMutableList()
-                    .apply {
-                        val result = getOrElse(0) { constantZero } - other
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-    /**
-     * Returns product of the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun ListPolynomial<C>.times(other: Int): ListPolynomial<C> =
-        when (other) {
-            0 -> zero
-            1 -> this
-            else -> ListPolynomial(
-                coefficients
-                    .toMutableList()
-                    .apply {
-                        for (deg in indices) this[deg] = this[deg] * other
-                    }
-            )
-        }
-
-    /**
-     * Returns sum of the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: ListPolynomial<C>): ListPolynomial<C> =
-        if (this == 0) other
-        else
-            ListPolynomial(
-                other.coefficients
-                    .toMutableList()
-                    .apply {
-                        val result = this@plus + getOrElse(0) { constantZero }
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-    /**
-     * Returns difference between the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: ListPolynomial<C>): ListPolynomial<C> =
-        ListPolynomial(
-            other.coefficients
-                .toMutableList()
-                .apply {
-                    if (this@minus == 0) {
-                        indices.forEach { this[it] = -this[it] }
-                    } else {
-                        (1..lastIndex).forEach { this[it] = -this[it] }
-
-                        val result = this@minus - getOrElse(0) { constantZero }
-
-                        if (size == 0) add(result)
-                        else this[0] = result
-                    }
-                }
-        )
-    /**
-     * Returns product of the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: ListPolynomial<C>): ListPolynomial<C> =
-        when (this) {
-            0 -> zero
-            1 -> other
-            else -> ListPolynomial(
-                other.coefficients
-                    .toMutableList()
-                    .apply {
-                        for (deg in indices) this[deg] = this@times * this[deg]
-                    }
-            )
-        }
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    public override operator fun C.plus(other: ListPolynomial<C>): ListPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) ListPolynomial(listOf(this@plus))
-            else ListPolynomial(
-                toMutableList()
-                    .apply {
-                        val result = if (size == 0) this@plus else this@plus + get(0)
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    public override operator fun C.minus(other: ListPolynomial<C>): ListPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) ListPolynomial(listOf(this@minus))
-            else ListPolynomial(
-                toMutableList()
-                    .apply {
-                        (1 .. lastIndex).forEach { this[it] = -this[it] }
-
-                        val result = if (size == 0) this@minus else this@minus - get(0)
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    public override operator fun C.times(other: ListPolynomial<C>): ListPolynomial<C> =
-        ListPolynomial(
-            other.coefficients
-                .toMutableList()
-                .apply {
-                    for (deg in indices) this[deg] = this@times * this[deg]
-                }
-        )
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    public override operator fun ListPolynomial<C>.plus(other: C): ListPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) ListPolynomial(listOf(other))
-            else ListPolynomial(
-                toMutableList()
-                    .apply {
-                        val result = if (size == 0) other else get(0) + other
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    public override operator fun ListPolynomial<C>.minus(other: C): ListPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) ListPolynomial(listOf(-other))
-            else ListPolynomial(
-                toMutableList()
-                    .apply {
-                        val result = if (size == 0) other else get(0) - other
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    public override operator fun ListPolynomial<C>.times(other: C): ListPolynomial<C> =
-        ListPolynomial(
-            coefficients
-                .toMutableList()
-                .apply {
-                    for (deg in indices) this[deg] = this[deg] * other
-                }
-        )
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public override fun number(value: C): ListPolynomial<C> = ListPolynomial(listOf(value))
-
-    /**
-     * Returns negation of the polynomial.
-     */
-    public override operator fun ListPolynomial<C>.unaryMinus(): ListPolynomial<C> =
-        ListPolynomial(coefficients.map { -it })
-    /**
-     * Returns sum of the polynomials.
-     */
-    public override operator fun ListPolynomial<C>.plus(other: ListPolynomial<C>): ListPolynomial<C> {
-        val thisDegree = degree
-        val otherDegree = other.degree
-        return ListPolynomial(
-            List(max(thisDegree, otherDegree) + 1) {
-                when {
-                    it > thisDegree -> other.coefficients[it]
-                    it > otherDegree -> coefficients[it]
-                    else -> coefficients[it] + other.coefficients[it]
-                }
-            }
-        )
-    }
-    /**
-     * Returns difference of the polynomials.
-     */
-    public override operator fun ListPolynomial<C>.minus(other: ListPolynomial<C>): ListPolynomial<C> {
-        val thisDegree = degree
-        val otherDegree = other.degree
-        return ListPolynomial(
-            List(max(thisDegree, otherDegree) + 1) {
-                when {
-                    it > thisDegree -> -other.coefficients[it]
-                    it > otherDegree -> coefficients[it]
-                    else -> coefficients[it] - other.coefficients[it]
-                }
-            }
-        )
-    }
-    /**
-     * Returns product of the polynomials.
-     */
-    public override operator fun ListPolynomial<C>.times(other: ListPolynomial<C>): ListPolynomial<C> {
-        val thisDegree = degree
-        val otherDegree = other.degree
-        return ListPolynomial(
-            List(thisDegree + otherDegree + 1) { d ->
-                (max(0, d - otherDegree)..min(thisDegree, d))
-                    .map { coefficients[it] * other.coefficients[d - it] }
-                    .reduce { acc, rational -> acc + rational }
-            }
-        )
-    }
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */ // TODO: To optimize boxing
-    override fun power(arg: ListPolynomial<C>, exponent: UInt): ListPolynomial<C> = super.power(arg, exponent)
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    override val zero: ListPolynomial<C> = ListPolynomial(emptyList())
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    override val one: ListPolynomial<C> by lazy { ListPolynomial(listOf(constantOne)) }
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    public override val ListPolynomial<C>.degree: Int get() = coefficients.lastIndex
-
-    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
-    //  [ListPolynomialSpace] as a context receiver
-    /**
-     * Evaluates value of [this] polynomial on provided [argument].
-     */
-    public inline fun ListPolynomial<C>.substitute(argument: C): C = substitute(ring, argument)
-    /**
-     * Substitutes provided polynomial [argument] into [this] polynomial.
-     */
-    public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
-
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun ListPolynomial<C>.asFunction(): (C) -> C = asFunctionOver(ring)
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = asFunctionOfConstantOver(ring)
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = asFunctionOfPolynomialOver(ring)
-
-    /**
-     * Evaluates value of [this] polynomial on provided [argument].
-     */
-    public inline operator fun ListPolynomial<C>.invoke(argument: C): C = substitute(ring, argument)
-    /**
-     * Evaluates value of [this] polynomial on provided [argument].
-     */
-    public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
-}
-
-/**
- * Space of polynomials constructed over ring.
- *
- * @param C the type of constants. Polynomials have them as a coefficients in their terms.
- * @param A type of underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
- */
-public class ScalableListPolynomialSpace<C, A>(
-    ring: A,
-) : ListPolynomialSpace<C, A>(ring), ScaleOperations<ListPolynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
-    override fun scale(a: ListPolynomial<C>, value: Double): ListPolynomial<C> =
-        ring { ListPolynomial(a.coefficients.map { scale(it, value) }) }
-}
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index 612b00535..cfd21d552 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -27,10 +27,10 @@ public fun interface Piecewise<in T, out R> {
  * @property pieces An ordered list of range-polynomial pairs. The list does not in general guarantee that there are no
  * "holes" in it.
  */
-public interface PiecewisePolynomial<T : Comparable<T>> : Piecewise<T, ListPolynomial<T>> {
-    public val pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>>
+public interface PiecewisePolynomial<T : Comparable<T>> : Piecewise<T, Polynomial<T>> {
+    public val pieces: Collection<Pair<ClosedRange<T>, Polynomial<T>>>
 
-    override fun findPiece(arg: T): ListPolynomial<T>?
+    override fun findPiece(arg: T): Polynomial<T>?
 }
 
 /**
@@ -38,11 +38,11 @@ public interface PiecewisePolynomial<T : Comparable<T>> : Piecewise<T, ListPolyn
  */
 @PerformancePitfall("findPiece method of resulting piecewise is slow")
 public fun <T : Comparable<T>> PiecewisePolynomial(
-    pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>>,
+    pieces: Collection<Pair<ClosedRange<T>, Polynomial<T>>>,
 ): PiecewisePolynomial<T> = object : PiecewisePolynomial<T> {
-    override val pieces: Collection<Pair<ClosedRange<T>, ListPolynomial<T>>> = pieces
+    override val pieces: Collection<Pair<ClosedRange<T>, Polynomial<T>>> = pieces
 
-    override fun findPiece(arg: T): ListPolynomial<T>? = pieces.firstOrNull { arg in it.first }?.second
+    override fun findPiece(arg: T): Polynomial<T>? = pieces.firstOrNull { arg in it.first }?.second
 }
 
 /**
@@ -50,10 +50,10 @@ public fun <T : Comparable<T>> PiecewisePolynomial(
  * The pieces search is logarithmic.
  */
 private class OrderedPiecewisePolynomial<T : Comparable<T>>(
-    override val pieces: List<Pair<ClosedRange<T>, ListPolynomial<T>>>,
+    override val pieces: List<Pair<ClosedRange<T>, Polynomial<T>>>,
 ) : PiecewisePolynomial<T> {
 
-    override fun findPiece(arg: T): ListPolynomial<T>? {
+    override fun findPiece(arg: T): Polynomial<T>? {
         val index = pieces.binarySearch { (range, _) ->
             when {
                 arg >= range.endInclusive -> -1
@@ -74,7 +74,7 @@ private class OrderedPiecewisePolynomial<T : Comparable<T>>(
  */
 public class PiecewiseBuilder<T : Comparable<T>>(delimiter: T) {
     private val delimiters: MutableList<T> = arrayListOf(delimiter)
-    private val pieces: MutableList<ListPolynomial<T>> = arrayListOf()
+    private val pieces: MutableList<Polynomial<T>> = arrayListOf()
 
     /**
      * Dynamically adds a piece to the right side (beyond maximum argument value of previous piece)
@@ -82,7 +82,7 @@ public class PiecewiseBuilder<T : Comparable<T>>(delimiter: T) {
      * @param right new rightmost position. If is less than current rightmost position, an error is thrown.
      * @param piece the sub-function.
      */
-    public fun putRight(right: T, piece: ListPolynomial<T>) {
+    public fun putRight(right: T, piece: Polynomial<T>) {
         require(right > delimiters.last()) { "New delimiter should be to the right of old one" }
         delimiters += right
         pieces += piece
@@ -94,7 +94,7 @@ public class PiecewiseBuilder<T : Comparable<T>>(delimiter: T) {
      * @param left the new leftmost position. If is less than current rightmost position, an error is thrown.
      * @param piece the sub-function.
      */
-    public fun putLeft(left: T, piece: ListPolynomial<T>) {
+    public fun putLeft(left: T, piece: Polynomial<T>) {
         require(left < delimiters.first()) { "New delimiter should be to the left of old one" }
         delimiters.add(0, left)
         pieces.add(0, piece)
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 61ea5a342..fec4776d9 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -3,500 +3,299 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress", "PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
-import kotlin.js.JsName
-import kotlin.jvm.JvmName
+import kotlin.jvm.JvmInline
+import kotlin.math.max
+import kotlin.math.min
 
 
 /**
- * Abstraction of polynomials.
- */
-public interface Polynomial<C>
-
-/**
- * Abstraction of ring of polynomials of type [P] over ring of constants of type [C].
+ * Represents univariate polynomial that stores its coefficients in a [List].
  *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials.
+ * @param C the type of constants.
  */
-@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
-public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
+@JvmInline
+public value class Polynomial<C>(
     /**
-     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
+     * List that contains coefficients of the polynomial. Every monomial `a x^d` is stored as a coefficient `a` placed
+     * into the list at index `d`. For example, coefficients of a polynomial `5 x^2 - 6` can be represented as
+     * ```
+     * listOf(
+     *     -6, // -6 +
+     *     0,  // 0 x +
+     *     5,  // 5 x^2
+     * )
+     * ```
+     * and also as
+     * ```
+     * listOf(
+     *     -6, // -6 +
+     *     0,  // 0 x +
+     *     5,  // 5 x^2
+     *     0,  // 0 x^3
+     *     0,  // 0 x^4
+     * )
+     * ```
+     * It is not prohibited to put extra zeros at end of the list (as for `0x^3` and `0x^4` in the example). But the
+     * longer the coefficients list the worse performance of arithmetical operations performed on it. Thus, it is
+     * recommended not to put (or even to remove) extra (or useless) coefficients at the end of the coefficients list.
      */
-    public operator fun C.plus(other: Int): C
-    /**
-     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
-     */
-    public operator fun C.minus(other: Int): C
-    /**
-     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public operator fun C.times(other: Int): C
+    public val coefficients: List<C>
+) {
+    override fun toString(): String = "ListPolynomial$coefficients"
+}
 
+/**
+ * Arithmetic context for univariate polynomials with coefficients stored as a [List] constructed with the provided
+ * [ring] of constants.
+ *
+ * @param C the type of constants. Polynomials have them a coefficients in their terms.
+ * @param A type of provided underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
+ */
+public open class ListPolynomialSpace<C, A : Ring<C>>(
     /**
-     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
+     * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
      */
-    public operator fun Int.plus(other: C): C
-    /**
-     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
-     */
-    public operator fun Int.minus(other: C): C
-    /**
-     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public operator fun Int.times(other: C): C
-
-    /**
-     * Converts the integer [value] to constant.
-     */
-    public fun constantNumber(value: Int): C = constantOne * value
-    /**
-     * Converts the integer to constant.
-     */
-    public fun Int.asConstant(): C = constantNumber(this)
-
-    /**
-     * Returns sum of the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public operator fun P.plus(other: Int): P = addMultipliedByDoubling(this, one, other)
-    /**
-     * Returns difference between the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public operator fun P.minus(other: Int): P = addMultipliedByDoubling(this, one, -other)
-    /**
-     * Returns product of the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public operator fun P.times(other: Int): P = multiplyByDoubling(this, other)
-
-    /**
-     * Returns sum of the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public operator fun Int.plus(other: P): P = addMultipliedByDoubling(other, one, this)
-    /**
-     * Returns difference between the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public operator fun Int.minus(other: P): P = addMultipliedByDoubling(-other, one, this)
-    /**
-     * Returns product of the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public operator fun Int.times(other: P): P = multiplyByDoubling(other, this)
-
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public fun number(value: Int): P = number(constantNumber(value))
-    /**
-     * Converts the integer to polynomial.
-     */
-    public fun Int.asPolynomial(): P = number(this)
-
-    /**
-     * Returns the same constant.
-     */
-    @JvmName("unaryPlusConstant")
-    @JsName("unaryPlusConstant")
-    public operator fun C.unaryPlus(): C = this
-    /**
-     * Returns negation of the constant.
-     */
-    @JvmName("unaryMinusConstant")
-    @JsName("unaryMinusConstant")
-    public operator fun C.unaryMinus(): C
-    /**
-     * Returns sum of the constants.
-     */
-    @JvmName("plusConstantConstant")
-    @JsName("plusConstantConstant")
-    public operator fun C.plus(other: C): C
-    /**
-     * Returns difference of the constants.
-     */
-    @JvmName("minusConstantConstant")
-    @JsName("minusConstantConstant")
-    public operator fun C.minus(other: C): C
-    /**
-     * Returns product of the constants.
-     */
-    @JvmName("timesConstantConstant")
-    @JsName("timesConstantConstant")
-    public operator fun C.times(other: C): C
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("powerConstant")
-    @JsName("powerConstant")
-    public fun power(arg: C, exponent: UInt) : C
+    public val ring: A,
+) : Ring<Polynomial<C>> {
 
     /**
      * Instance of zero constant (zero of the underlying ring).
      */
-    public val constantZero: C
+    public val constantZero: C get() = ring.zero
     /**
      * Instance of unit constant (unit of the underlying ring).
      */
-    public val constantOne: C
+    public val constantOne: C get() = ring.one
 
     /**
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
-    public operator fun C.plus(other: P): P
+    public operator fun C.plus(other: Polynomial<C>): Polynomial<C> =
+        with(ring) {
+            with(other.coefficients) {
+                if (isEmpty()) Polynomial(listOf(this@plus))
+                else Polynomial(
+                    toMutableList()
+                        .apply {
+                            val result = if (size == 0) this@plus else this@plus + get(0)
+
+                            if (size == 0) add(result)
+                            else this[0] = result
+                        }
+                )
+            }
+        }
     /**
      * Returns difference between the constant represented as a polynomial and the polynomial.
      */
-    public operator fun C.minus(other: P): P
+    public operator fun C.minus(other: Polynomial<C>): Polynomial<C> =
+        with(ring) {
+            with(other.coefficients) {
+                if (isEmpty()) Polynomial(listOf(this@minus))
+                else Polynomial(
+                    toMutableList()
+                        .apply {
+                            (1..lastIndex).forEach { this[it] = -this[it] }
+
+                            val result = if (size == 0) this@minus else this@minus - get(0)
+
+                            if (size == 0) add(result)
+                            else this[0] = result
+                        }
+                )
+            }
+        }
     /**
      * Returns product of the constant represented as a polynomial and the polynomial.
      */
-    public operator fun C.times(other: P): P
+    public operator fun C.times(other: Polynomial<C>): Polynomial<C> =
+        with(ring) {
+            Polynomial(
+                other.coefficients
+                    .toMutableList()
+                    .apply {
+                        for (deg in indices) this[deg] = this@times * this[deg]
+                    }
+            )
+        }
 
     /**
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
-    public operator fun P.plus(other: C): P
+    public operator fun Polynomial<C>.plus(other: C): Polynomial<C> =
+        with(ring) {
+            with(coefficients) {
+                if (isEmpty()) Polynomial(listOf(other))
+                else Polynomial(
+                    toMutableList()
+                        .apply {
+                            val result = if (size == 0) other else get(0) + other
+
+                            if (size == 0) add(result)
+                            else this[0] = result
+                        }
+                )
+            }
+        }
     /**
      * Returns difference between the constant represented as a polynomial and the polynomial.
      */
-    public operator fun P.minus(other: C): P
+    public operator fun Polynomial<C>.minus(other: C): Polynomial<C> =
+        with(ring) {
+            with(coefficients) {
+                if (isEmpty()) Polynomial(listOf(-other))
+                else Polynomial(
+                    toMutableList()
+                        .apply {
+                            val result = if (size == 0) other else get(0) - other
+
+                            if (size == 0) add(result)
+                            else this[0] = result
+                        }
+                )
+            }
+        }
     /**
      * Returns product of the constant represented as a polynomial and the polynomial.
      */
-    public operator fun P.times(other: C): P
+    public operator fun Polynomial<C>.times(other: C): Polynomial<C> =
+        with(ring) {
+            Polynomial(
+                coefficients
+                    .toMutableList()
+                    .apply {
+                        for (deg in indices) this[deg] = this[deg] * other
+                    }
+            )
+        }
 
     /**
      * Converts the constant [value] to polynomial.
      */
-    public fun number(value: C): P = one * value
+    public fun number(value: C): Polynomial<C> = Polynomial(listOf(value))
     /**
      * Converts the constant to polynomial.
      */
-    public fun C.asPolynomial(): P = number(this)
+    public fun C.asPolynomial(): Polynomial<C> = number(this)
 
-    /**
-     * Returns the same polynomial.
-     */
-    public override operator fun P.unaryPlus(): P = this
     /**
      * Returns negation of the polynomial.
      */
-    public override operator fun P.unaryMinus(): P
+    public override operator fun Polynomial<C>.unaryMinus(): Polynomial<C> =
+        with(ring) {
+            Polynomial(coefficients.map { -it })
+        }
     /**
      * Returns sum of the polynomials.
      */
-    public override operator fun P.plus(other: P): P
+    public override operator fun Polynomial<C>.plus(other: Polynomial<C>): Polynomial<C> {
+        with(ring) {
+            val thisDegree = degree
+            val otherDegree = other.degree
+            return Polynomial(
+                List(max(thisDegree, otherDegree) + 1) {
+                    when {
+                        it > thisDegree -> other.coefficients[it]
+                        it > otherDegree -> coefficients[it]
+                        else -> coefficients[it] + other.coefficients[it]
+                    }
+                }
+            )
+        }
+    }
     /**
      * Returns difference of the polynomials.
      */
-    public override operator fun P.minus(other: P): P
+    public override operator fun Polynomial<C>.minus(other: Polynomial<C>): Polynomial<C> {
+        with(ring) {
+            val thisDegree = degree
+            val otherDegree = other.degree
+            return Polynomial(
+                List(max(thisDegree, otherDegree) + 1) {
+                    when {
+                        it > thisDegree -> -other.coefficients[it]
+                        it > otherDegree -> coefficients[it]
+                        else -> coefficients[it] - other.coefficients[it]
+                    }
+                }
+            )
+        }
+    }
     /**
      * Returns product of the polynomials.
      */
-    public override operator fun P.times(other: P): P
+    public override operator fun Polynomial<C>.times(other: Polynomial<C>): Polynomial<C> {
+        with(ring) {
+            val thisDegree = degree
+            val otherDegree = other.degree
+            return Polynomial(
+                List(thisDegree + otherDegree + 1) { d ->
+                    (max(0, d - otherDegree)..min(thisDegree, d))
+                        .map { coefficients[it] * other.coefficients[d - it] }
+                        .reduce { acc, rational -> acc + rational }
+                }
+            )
+        }
+    }
     /**
      * Raises [arg] to the integer power [exponent].
-     */
-    public override fun power(arg: P, exponent: UInt) : P = exponentiateBySquaring(arg, exponent)
+     */ // TODO: To optimize boxing
+    override fun power(arg: Polynomial<C>, exponent: UInt): Polynomial<C> = exponentiateBySquaring(arg, exponent)
 
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
      */
-    public override val zero: P
+    override val zero: Polynomial<C> = Polynomial(emptyList())
     /**
      * Instance of unit polynomial (unit of the polynomial ring).
      */
-    public override val one: P
+    override val one: Polynomial<C> by lazy { Polynomial(listOf(constantOne)) }
 
     /**
      * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
      * zero, degree is -1.
      */
-    public val P.degree: Int
+    public val Polynomial<C>.degree: Int get() = coefficients.lastIndex
 
-    override fun add(left: P, right: P): P = left + right
-    override fun multiply(left: P, right: P): P = left * right
+    override fun add(left: Polynomial<C>, right: Polynomial<C>): Polynomial<C> = left + right
+    override fun multiply(left: Polynomial<C>, right: Polynomial<C>): Polynomial<C> = left * right
+
+    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
+    //  [ListPolynomialSpace] as a context receiver
+    /**
+     * Evaluates value of [this] polynomial on provided [argument].
+     */
+    public inline fun Polynomial<C>.substitute(argument: C): C = substitute(ring, argument)
+
+    /**
+     * Represent [this] polynomial as a regular context-less function.
+     */
+    public inline fun Polynomial<C>.asFunction(): (C) -> C = asFunctionOver(ring)
+
+    /**
+     * Evaluates value of [this] polynomial on provided [argument].
+     */
+    public inline operator fun Polynomial<C>.invoke(argument: C): C = substitute(ring, argument)
 }
 
 /**
- * Abstraction of ring of polynomials of type [P] over ring of constants of type [C]. It also assumes that there is
- * provided [ring] (of type [A]), that provides constant-wise operations.
+ * Space of polynomials constructed over ring.
  *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials.
- * @param A the type of algebraic structure (precisely, of ring) provided for constants.
+ * @param C the type of constants. Polynomials have them as a coefficients in their terms.
+ * @param A type of underlying ring of constants. It's [Ring] of [C].
+ * @param ring underlying ring of constants of type [A].
  */
-@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : PolynomialSpace<C, P> {
-
-    /**
-     * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
-     */
-    public val ring: A
-
-    /**
-     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
-     */
-    public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
-    /**
-     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
-     */
-    public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
-    /**
-     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
-
-    /**
-     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
-     */
-    public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
-    /**
-     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
-     */
-    public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
-    /**
-     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: C): C = ring { multiplyByDoubling(other, this@times) }
-
-    /**
-     * Returns negation of the constant.
-     */
-    @JvmName("unaryMinusConstant")
-    public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
-    /**
-     * Returns sum of the constants.
-     */
-    @JvmName("plusConstantConstant")
-    public override operator fun C.plus(other: C): C = ring { this@plus + other }
-    /**
-     * Returns difference of the constants.
-     */
-    @JvmName("minusConstantConstant")
-    public override operator fun C.minus(other: C): C = ring { this@minus - other }
-    /**
-     * Returns product of the constants.
-     */
-    @JvmName("timesConstantConstant")
-    public override operator fun C.times(other: C): C = ring { this@times * other }
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("powerConstant")
-    override fun power(arg: C, exponent: UInt): C = ring { power(arg, exponent) }
-
-    /**
-     * Instance of zero constant (zero of the underlying ring).
-     */
-    public override val constantZero: C get() = ring.zero
-    /**
-     * Instance of unit constant (unit of the underlying ring).
-     */
-    public override val constantOne: C get() = ring.one
+public class ScalableListPolynomialSpace<C, A>(
+    ring: A,
+) : ListPolynomialSpace<C, A>(ring), ScaleOperations<Polynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
+    override fun scale(a: Polynomial<C>, value: Double): Polynomial<C> =
+        ring { Polynomial(a.coefficients.map { scale(it, value) }) }
 }
-
-/**
- * Abstraction of ring of polynomials of type [P] of variables of type [V] and over ring of constants of type [C].
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param V the type of variables. Polynomials have them in representations of terms.
- * @param P the type of polynomials.
- */
-@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface MultivariatePolynomialSpace<C, V, P: Polynomial<C>>: PolynomialSpace<C, P> {
-    /**
-     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    @JvmName("plusVariableInt")
-    public operator fun V.plus(other: Int): P
-    /**
-     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    @JvmName("minusVariableInt")
-    public operator fun V.minus(other: Int): P
-    /**
-     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    @JvmName("timesVariableInt")
-    public operator fun V.times(other: Int): P
-
-    /**
-     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("plusIntVariable")
-    public operator fun Int.plus(other: V): P
-    /**
-     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("minusIntVariable")
-    public operator fun Int.minus(other: V): P
-    /**
-     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("timesIntVariable")
-    public operator fun Int.times(other: V): P
-
-    /**
-     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    @JvmName("plusVariableConstant")
-    public operator fun V.plus(other: C): P
-    /**
-     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    @JvmName("minusVariableConstant")
-    public operator fun V.minus(other: C): P
-    /**
-     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    @JvmName("timesVariableConstant")
-    public operator fun V.times(other: C): P
-
-    /**
-     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("plusConstantVariable")
-    public operator fun C.plus(other: V): P
-    /**
-     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("minusConstantVariable")
-    public operator fun C.minus(other: V): P
-    /**
-     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("timesConstantVariable")
-    public operator fun C.times(other: V): P
-
-    /**
-     * Represents the variable as a monic monomial.
-     */
-    @JvmName("unaryPlusVariable")
-    public operator fun V.unaryPlus(): P
-    /**
-     * Returns negation of representation of the variable as a monic monomial.
-     */
-    @JvmName("unaryMinusVariable")
-    public operator fun V.unaryMinus(): P
-    /**
-     * Returns sum of the variables represented as monic monomials.
-     */
-    @JvmName("plusVariableVariable")
-    public operator fun V.plus(other: V): P
-    /**
-     * Returns difference between the variables represented as monic monomials.
-     */
-    @JvmName("minusVariableVariable")
-    public operator fun V.minus(other: V): P
-    /**
-     * Returns product of the variables represented as monic monomials.
-     */
-    @JvmName("timesVariableVariable")
-    public operator fun V.times(other: V): P
-
-    /**
-     * Represents the [variable] as a monic monomial.
-     */
-    @JvmName("numberVariable")
-    public fun number(variable: V): P = +variable
-    /**
-     * Represents the variable as a monic monomial.
-     */
-    @JvmName("asPolynomialVariable")
-    public fun V.asPolynomial(): P = number(this)
-
-    /**
-     * Returns sum of the variable represented as a monic monomial and the polynomial.
-     */
-    @JvmName("plusVariablePolynomial")
-    public operator fun V.plus(other: P): P
-    /**
-     * Returns difference between the variable represented as a monic monomial and the polynomial.
-     */
-    @JvmName("minusVariablePolynomial")
-    public operator fun V.minus(other: P): P
-    /**
-     * Returns product of the variable represented as a monic monomial and the polynomial.
-     */
-    @JvmName("timesVariablePolynomial")
-    public operator fun V.times(other: P): P
-
-    /**
-     * Returns sum of the polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("plusPolynomialVariable")
-    public operator fun P.plus(other: V): P
-    /**
-     * Returns difference between the polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("minusPolynomialVariable")
-    public operator fun P.minus(other: V): P
-    /**
-     * Returns product of the polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("timesPolynomialVariable")
-    public operator fun P.times(other: V): P
-
-    /**
-     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
-     * in which they are appeared in the polynomial.
-     *
-     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
-     * And keys of the map is the same as in [variables].
-     */
-    public val P.degrees: Map<V, UInt>
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public fun P.degreeBy(variable: V): UInt = degrees.getOrElse(variable) { 0u }
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public fun P.degreeBy(variables: Collection<V>): UInt
-    /**
-     * Set of all variables that appear in the polynomial in positive exponents.
-     */
-    public val P.variables: Set<V> get() = degrees.keys
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public val P.countOfVariables: Int get() = variables.size
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
index b40aa4775..5eb1af4dc 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
@@ -9,101 +9,6 @@ import space.kscience.kmath.operations.*
 
 
 // TODO: All of this should be moved to algebraic structures' place for utilities
-// FIXME: Move receiver to context receiver
-/**
- * Returns product of [arg] and integer [multiplier].
- *
- * @param arg the multiplicand.
- * @param multiplier the integer multiplier.
- * @return product of the multiplicand [arg] and the multiplier [multiplier].
- * @author Gleb Minaev
- */
-internal fun <C> Group<C>.multiplyByDoubling(arg: C, multiplier: Int): C =
-    if (multiplier >= 0) multiplyByDoubling(arg, multiplier.toUInt())
-    else multiplyByDoubling(-arg, (-multiplier).toUInt())
-
-// FIXME: Move receiver to context receiver
-/**
- * Adds product of [arg] and [multiplier] to [base].
- *
- * @param base the augend.
- * @param arg the multiplicand.
- * @param multiplier the integer multiplier.
- * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
- * @author Gleb Minaev
- */
-internal fun <C> GroupOps<C>.addMultipliedByDoubling(base: C, arg: C, multiplier: Int): C =
-    if (multiplier >= 0) addMultipliedByDoubling(base, arg, multiplier.toUInt())
-    else addMultipliedByDoubling(base, -arg, (-multiplier).toUInt())
-
-// FIXME: Move receiver to context receiver
-/**
- * Returns product of [arg] and integer [multiplier].
- *
- * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
- *
- * @param arg the multiplicand.
- * @param multiplier the integer multiplier.
- * @return product of the multiplicand [arg] and the multiplier [multiplier].
- * @author Gleb Minaev
- */
-internal tailrec fun <C> Group<C>.multiplyByDoubling(arg: C, multiplier: UInt): C =
-    when {
-        multiplier == 0u -> zero
-        multiplier == 1u -> arg
-        multiplier and 1u == 0u -> multiplyByDoubling(arg + arg, multiplier shr 1)
-        multiplier and 1u == 1u -> addMultipliedByDoubling(arg, arg + arg, multiplier shr 1)
-        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
-    }
-
-// FIXME: Move receiver to context receiver
-/**
- * Adds product of [arg] and [multiplier] to [base].
- *
- * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
- *
- * @param base the augend.
- * @param arg the multiplicand.
- * @param multiplier the integer multiplier.
- * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
- * @author Gleb Minaev
- */
-internal tailrec fun <C> GroupOps<C>.addMultipliedByDoubling(base: C, arg: C, multiplier: UInt): C =
-    when {
-        multiplier == 0u -> base
-        multiplier == 1u -> base + arg
-        multiplier and 1u == 0u -> addMultipliedByDoubling(base, arg + arg, multiplier shr 1)
-        multiplier and 1u == 1u -> addMultipliedByDoubling(base + arg, arg + arg, multiplier shr 1)
-        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
-    }
-
-// FIXME: Move receiver to context receiver
-/**
- * Raises [arg] to the integer power [exponent].
- *
- * @param arg the base of the power.
- * @param exponent the exponent of the power.
- * @return [arg] raised to the power [exponent].
- * @author Gleb Minaev
- */
-internal fun <C> Field<C>.exponentiateBySquaring(arg: C, exponent: Int): C =
-    if (exponent >= 0) exponentiateBySquaring(arg, exponent.toUInt())
-    else exponentiateBySquaring(one / arg, (-exponent).toUInt())
-
-// FIXME: Move receiver to context receiver
-/**
- * Multiplies [base] and [arg] raised to the integer power [exponent].
- *
- * @param base the multiplicand.
- * @param arg the base of the power.
- * @param exponent the exponent of the power.
- * @return product of [base] and [arg] raised to the power [exponent].
- * @author Gleb Minaev
- */
-internal fun <C> Field<C>.multiplyExponentiatedBySquaring(base: C, arg: C, exponent: Int): C =
-    if (exponent >= 0) multiplyExponentiatedBySquaring(base, arg, exponent.toUInt())
-    else multiplyExponentiatedBySquaring(base, one / arg, (-exponent).toUInt())
-
 // FIXME: Move receiver to context receiver
 /**
  * Raises [arg] to the integer power [exponent].
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
deleted file mode 100644
index e95361724..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-
-
-/**
- * Constructs a [ListPolynomial] instance with provided [coefficients]. The collection of coefficients will be reversed
- * if [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false): ListPolynomial<C> =
-    ListPolynomial(with(coefficients) { if (reverse) reversed() else this })
-
-/**
- * Constructs a [ListPolynomial] instance with provided [coefficients]. The collection of coefficients will be reversed
- * if [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C> ListPolynomial(vararg coefficients: C, reverse: Boolean = false): ListPolynomial<C> =
-    ListPolynomial(with(coefficients) { if (reverse) reversed() else toList() })
-
-/**
- * Represents [this] constant as a [ListPolynomial].
- */
-public fun <C> C.asListPolynomial() : ListPolynomial<C> = ListPolynomial(listOf(this))
-
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-/**
- * Constructs [ListRationalFunction] instance with numerator and denominator constructed with provided
- * [numeratorCoefficients] and [denominatorCoefficients]. The both collections of coefficients will be reversed if
- * [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C> ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
-    )
-/**
- * Constructs [ListRationalFunction] instance with provided [numerator] and unit denominator.
- */
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
-    ListRationalFunction<C>(numerator, ListPolynomial(listOf(one)))
-/**
- * Constructs [ListRationalFunction] instance with provided [numerator] and unit denominator.
- */
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
-    ListRationalFunction<C>(numerator, polynomialOne)
-/**
- * Constructs [ListRationalFunction] instance with numerator constructed with provided [numeratorCoefficients] and unit
- * denominator. The collection of numerator coefficients will be reversed if [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        ListPolynomial(listOf(one))
-    )
-/**
- * Constructs [ListRationalFunction] instance with numerator constructed with provided [numeratorCoefficients] and unit
- * denominator. The collection of numerator coefficients will be reversed if [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        polynomialOne
-    )
-
-/**
- * Represents [this] constant as a rational function.
- */ // FIXME: When context receivers will be ready, delete this function and uncomment the following two
-public fun <C, A: Ring<C>> C.asListRationalFunction(ring: A) : ListRationalFunction<C> = ring.ListRationalFunction(asListPolynomial())
-///**
-// * Represents [this] constant as a rational function.
-// */
-//context(A)
-//public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
-///**
-// * Represents [this] constant as a rational function.
-// */
-//context(ListRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
deleted file mode 100644
index 4f3f6d88e..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.math.max
-import kotlin.math.pow
-
-
-/**
- * Creates a [ListPolynomialSpace] over a received ring.
- */
-public inline val <C, A : Ring<C>> A.listPolynomialSpace: ListPolynomialSpace<C, A>
-    get() = ListPolynomialSpace(this)
-
-/**
- * Creates a [ListPolynomialSpace]'s scope over a received ring.
- */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
-public inline fun <C, A : Ring<C>, R> A.listPolynomialSpace(block: ListPolynomialSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ListPolynomialSpace(this).block()
-}
-
-/**
- * Creates a [ScalableListPolynomialSpace] over a received scalable ring.
- */
-public inline val <C, A> A.scalableListPolynomialSpace: ScalableListPolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C>
-    get() = ScalableListPolynomialSpace(this)
-
-/**
- * Creates a [ScalableListPolynomialSpace]'s scope over a received scalable ring.
- */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
-public inline fun <C, A, R> A.scalableListPolynomialSpace(block: ScalableListPolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ScalableListPolynomialSpace(this).block()
-}
-
-/**
- * Creates a [ListRationalFunctionSpace] over a received ring.
- */
-public inline val <C, A : Ring<C>> A.listRationalFunctionSpace: ListRationalFunctionSpace<C, A>
-    get() = ListRationalFunctionSpace(this)
-
-/**
- * Creates a [ListRationalFunctionSpace]'s scope over a received ring.
- */ // TODO: When context will be ready move [ListRationalFunctionSpace] and add [A] to context receivers of [block]
-public inline fun <C, A : Ring<C>, R> A.listRationalFunctionSpace(block: ListRationalFunctionSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ListRationalFunctionSpace(this).block()
-}
-
-
-/**
- * Evaluates value of [this] Double polynomial on provided Double argument.
- */
-public fun ListPolynomial<Double>.substitute(arg: Double): Double =
-    coefficients.reduceIndexedOrNull { index, acc, c ->
-        acc + c * arg.pow(index)
-    } ?: .0
-
-/**
- * Evaluates value of [this] polynomial on provided argument.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */
-public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
-    if (coefficients.isEmpty()) return zero
-    var result: C = coefficients.last()
-    for (j in coefficients.size - 2 downTo 0) {
-        result = (arg * result) + coefficients[j]
-    }
-    return result
-}
-
-/**
- * Substitutes provided polynomial [arg] into [this] polynomial.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */ // TODO: To optimize boxing
-public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListPolynomial<C> =
-    ring.listPolynomialSpace {
-        if (coefficients.isEmpty()) return zero
-        var result: ListPolynomial<C> = coefficients.last().asPolynomial()
-        for (j in coefficients.size - 2 downTo 0) {
-            result = (arg * result) + coefficients[j]
-        }
-        return result
-    }
-
-/**
- * Substitutes provided rational function [arg] into [this] polynomial.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */ // TODO: To optimize boxing
-public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListRationalFunction<C>) : ListRationalFunction<C> =
-    ring.listRationalFunctionSpace {
-        if (coefficients.isEmpty()) return zero
-        var result: ListRationalFunction<C> = coefficients.last().asRationalFunction()
-        for (j in coefficients.size - 2 downTo 0) {
-            result = (arg * result) + coefficients[j]
-        }
-        return result
-    }
-
-/**
- * Evaluates value of [this] Double rational function in provided Double argument.
- */
-public fun ListRationalFunction<Double>.substitute(arg: Double): Double =
-    numerator.substitute(arg) / denominator.substitute(arg)
-
-/**
- * Evaluates value of [this] polynomial for provided argument.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */
-public fun <C> ListRationalFunction<C>.substitute(ring: Field<C>, arg: C): C = ring {
-    numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
-}
-
-/**
- * Substitutes provided polynomial [arg] into [this] rational function.
- */ // TODO: To optimize boxing
-public fun <C> ListRationalFunction<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListRationalFunction<C> =
-    ring.listRationalFunctionSpace {
-        numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
-    }
-
-/**
- * Substitutes provided rational function [arg] into [this] rational function.
- */ // TODO: To optimize boxing
-public fun <C> ListRationalFunction<C>.substitute(ring: Ring<C>, arg: ListRationalFunction<C>) : ListRationalFunction<C> =
-    ring.listRationalFunctionSpace {
-        numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
-    }
-
-/**
- * Represent [this] polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOver(ring: A): (C) -> C = { substitute(ring, it) }
-
-/**
- * Represent [this] polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfConstantOver(ring: A): (C) -> C = { substitute(ring, it) }
-
-/**
- * Represent [this] polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfPolynomialOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
-
-/**
- * Represent [this] polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfRationalFunctionOver(ring: A): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
-
-/**
- * Represent [this] rational function as a regular context-less function.
- */
-public fun <C, A : Field<C>> ListRationalFunction<C>.asFunctionOver(ring: A): (C) -> C = { substitute(ring, it) }
-
-/**
- * Represent [this] rational function as a regular context-less function.
- */
-public fun <C, A : Field<C>> ListRationalFunction<C>.asFunctionOfConstantOver(ring: A): (C) -> C = { substitute(ring, it) }
-
-/**
- * Represent [this] rational function as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListRationalFunction<C>.asFunctionOfPolynomialOver(ring: A): (ListPolynomial<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
-
-/**
- * Represent [this] rational function as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListRationalFunction<C>.asFunctionOfRationalFunctionOver(ring: A): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.derivative(
-    ring: A,
-): ListPolynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = ring {
-    ListPolynomial(
-        buildList(max(0, coefficients.size - 1)) {
-            for (deg in 1 .. coefficients.lastIndex) add(number(deg) * coefficients[deg])
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial of specified [order]. The [order] should be non-negative integer.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.nthDerivative(
-    ring: A,
-    order: Int,
-): ListPolynomial<C> where A : Ring<C>, A : NumericAlgebra<C> = ring {
-    require(order >= 0) { "Order of derivative must be non-negative" }
-    ListPolynomial(
-        buildList(max(0, coefficients.size - order)) {
-            for (deg in order.. coefficients.lastIndex)
-                add((deg - order + 1 .. deg).fold(coefficients[deg]) { acc, d -> acc * number(d) })
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.antiderivative(
-    ring: A,
-): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = ring {
-    ListPolynomial(
-        buildList(coefficients.size + 1) {
-            add(zero)
-            coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial of specified [order]. The [order] should be non-negative integer.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.nthAntiderivative(
-    ring: A,
-    order: Int,
-): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = ring {
-    require(order >= 0) { "Order of antiderivative must be non-negative" }
-    ListPolynomial(
-        buildList(coefficients.size + order) {
-            repeat(order) { add(zero) }
-            coefficients.mapIndexedTo(this) { index, c -> (1..order).fold(c) { acc, i -> acc / number(index + i) } }
-        }
-    )
-}
-
-/**
- * Computes a definite integral of [this] polynomial in the specified [range].
- */
-@UnstableKMathAPI
-public fun <C : Comparable<C>> ListPolynomial<C>.integrate(
-    ring: Field<C>,
-    range: ClosedRange<C>,
-): C = ring {
-    val antiderivative = antiderivative(ring)
-    antiderivative.substitute(ring, range.endInclusive) - antiderivative.substitute(ring, range.start)
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
deleted file mode 100644
index 76f1c294e..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-
-/**
- * Marks declarations that give access to internal entities of polynomials delicate structure. Thus, it allows to
- * optimize performance a bit by skipping standard steps, but such skips may cause critical errors if something is
- * implemented badly. Make sure you fully read and understand documentation and don't break internal contracts.
- */
-@RequiresOptIn(
-    message = "This declaration gives access to delicate internal structure of polynomials. " +
-            "It allows to optimize performance by skipping unnecessary arguments check. " +
-            "But at the same time makes it easy to make a mistake " +
-            "that will cause wrong computation result or even runtime error. " +
-            "Make sure you fully read and understand documentation.",
-    level = RequiresOptIn.Level.ERROR
-)
-public annotation class DelicatePolynomialAPI
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialConstructors.kt
new file mode 100644
index 000000000..ff04607a7
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialConstructors.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+
+/**
+ * Constructs a [Polynomial] instance with provided [coefficients]. The collection of coefficients will be reversed
+ * if [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false): Polynomial<C> =
+    Polynomial(with(coefficients) { if (reverse) reversed() else this })
+
+/**
+ * Constructs a [Polynomial] instance with provided [coefficients]. The collection of coefficients will be reversed
+ * if [reverse] parameter is true.
+ */
+@Suppress("FunctionName")
+public fun <C> ListPolynomial(vararg coefficients: C, reverse: Boolean = false): Polynomial<C> =
+    Polynomial(with(coefficients) { if (reverse) reversed() else toList() })
+
+/**
+ * Represents [this] constant as a [Polynomial].
+ */
+public fun <C> C.asListPolynomial() : Polynomial<C> = Polynomial(listOf(this))
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
new file mode 100644
index 000000000..fc3a728df
--- /dev/null
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.math.max
+import kotlin.math.pow
+
+
+/**
+ * Creates a [ListPolynomialSpace] over a received ring.
+ */
+public inline val <C, A : Ring<C>> A.listPolynomialSpace: ListPolynomialSpace<C, A>
+    get() = ListPolynomialSpace(this)
+
+/**
+ * Creates a [ListPolynomialSpace]'s scope over a received ring.
+ */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
+public inline fun <C, A : Ring<C>, R> A.listPolynomialSpace(block: ListPolynomialSpace<C, A>.() -> R): R {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return ListPolynomialSpace(this).block()
+}
+
+/**
+ * Creates a [ScalableListPolynomialSpace] over a received scalable ring.
+ */
+public inline val <C, A> A.scalableListPolynomialSpace: ScalableListPolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C>
+    get() = ScalableListPolynomialSpace(this)
+
+/**
+ * Creates a [ScalableListPolynomialSpace]'s scope over a received scalable ring.
+ */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
+public inline fun <C, A, R> A.scalableListPolynomialSpace(block: ScalableListPolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
+    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
+    return ScalableListPolynomialSpace(this).block()
+}
+
+
+/**
+ * Evaluates value of [this] Double polynomial on provided Double argument.
+ */
+public fun Polynomial<Double>.substitute(arg: Double): Double =
+    coefficients.reduceIndexedOrNull { index, acc, c ->
+        acc + c * arg.pow(index)
+    } ?: .0
+
+/**
+ * Evaluates value of [this] polynomial on provided argument.
+ *
+ * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
+ */
+public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
+    if (coefficients.isEmpty()) return zero
+    var result: C = coefficients.last()
+    for (j in coefficients.size - 2 downTo 0) {
+        result = (arg * result) + coefficients[j]
+    }
+    return result
+}
+
+/**
+ * Represent [this] polynomial as a regular context-less function.
+ */
+public fun <C, A : Ring<C>> Polynomial<C>.asFunctionOver(ring: A): (C) -> C = { substitute(ring, it) }
+
+/**
+ * Returns algebraic derivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> Polynomial<C>.derivative(
+    ring: A,
+): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = ring {
+    Polynomial(
+        buildList(max(0, coefficients.size - 1)) {
+            for (deg in 1 .. coefficients.lastIndex) add(number(deg) * coefficients[deg])
+        }
+    )
+}
+
+/**
+ * Returns algebraic antiderivative of received polynomial.
+ */
+@UnstableKMathAPI
+public fun <C, A> Polynomial<C>.antiderivative(
+    ring: A,
+): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = ring {
+    Polynomial(
+        buildList(coefficients.size + 1) {
+            add(zero)
+            coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
+        }
+    )
+}
+
+/**
+ * Computes a definite integral of [this] polynomial in the specified [range].
+ */
+@UnstableKMathAPI
+public fun <C : Comparable<C>> Polynomial<C>.integrate(
+    ring: Field<C>,
+    range: ClosedRange<C>,
+): C {
+    val antiderivative = antiderivative(ring)
+    return ring { antiderivative.substitute(ring, range.endInclusive) - antiderivative.substitute(ring, range.start) }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
index 487cd9ee1..5782292b1 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
@@ -26,286 +26,6 @@ object ExprRing : Field<Expr> {
 }
 
 class AlgebraicStubTest {
-    @Test
-    fun test_addMultipliedBySquaring_for_UInt() {
-        ExprRing {
-            assertEquals(
-                "57",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 0u).expr,
-                "tried addMultipliedBySquaring(57, 179, 0u)"
-            )
-            assertEquals(
-                "(57 + 179)",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 1u).expr,
-                "tried addMultipliedBySquaring(57, 179, 1u)"
-            )
-            assertEquals(
-                "(57 + (179 + 179))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 2u).expr,
-                "tried addMultipliedBySquaring(57, 179, 2u)"
-            )
-            assertEquals(
-                "((57 + 179) + (179 + 179))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 3u).expr,
-                "tried addMultipliedBySquaring(57, 179, 3u)"
-            )
-            assertEquals(
-                "(57 + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 4u).expr,
-                "tried addMultipliedBySquaring(57, 179, 4u)"
-            )
-            assertEquals(
-                "((57 + 179) + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 5u).expr,
-                "tried addMultipliedBySquaring(57, 179, 5u)"
-            )
-            assertEquals(
-                "((57 + (179 + 179)) + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 6u).expr,
-                "tried addMultipliedBySquaring(57, 179, 6u)"
-            )
-            assertEquals(
-                "(((57 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 7u).expr,
-                "tried addMultipliedBySquaring(57, 179, 7u)"
-            )
-            assertEquals(
-                "(57 + (((179 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179))))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 8u).expr,
-                "tried addMultipliedBySquaring(57, 179, 8u)"
-            )
-        }
-    }
-    @Test
-    fun test_multiplyBySquaring_for_UInt() {
-        ExprRing {
-            assertEquals(
-                "0",
-                multiplyByDoubling(Expr("57"), 0u).expr,
-                "tried multiplyBySquaring(57, 0u)"
-            )
-            assertEquals(
-                "57",
-                multiplyByDoubling(Expr("57"), 1u).expr,
-                "tried multiplyBySquaring(57, 1u)"
-            )
-            assertEquals(
-                "(57 + 57)",
-                multiplyByDoubling(Expr("57"), 2u).expr,
-                "tried multiplyBySquaring(57, 2u)"
-            )
-            assertEquals(
-                "(57 + (57 + 57))",
-                multiplyByDoubling(Expr("57"), 3u).expr,
-                "tried multiplyBySquaring(57, 3u)"
-            )
-            assertEquals(
-                "((57 + 57) + (57 + 57))",
-                multiplyByDoubling(Expr("57"), 4u).expr,
-                "tried multiplyBySquaring(57, 4u)"
-            )
-            assertEquals(
-                "(57 + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 5u).expr,
-                "tried multiplyBySquaring(57, 5u)"
-            )
-            assertEquals(
-                "((57 + 57) + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 6u).expr,
-                "tried multiplyBySquaring(57, 6u)"
-            )
-            assertEquals(
-                "((57 + (57 + 57)) + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 7u).expr,
-                "tried multiplyBySquaring(57, 7u)"
-            )
-            assertEquals(
-                "(((57 + 57) + (57 + 57)) + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 8u).expr,
-                "tried multiplyBySquaring(57, 8u)"
-            )
-        }
-    }
-    @Test
-    fun test_addMultipliedBySquaring_for_Int() {
-        ExprRing {
-            assertEquals(
-                "57",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 0).expr,
-                "tried addMultipliedBySquaring(57, 179, 0)"
-            )
-            assertEquals(
-                "(57 + 179)",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 1).expr,
-                "tried addMultipliedBySquaring(57, 179, 1)"
-            )
-            assertEquals(
-                "(57 + -179)",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -1).expr,
-                "tried addMultipliedBySquaring(57, 179, -1)"
-            )
-            assertEquals(
-                "(57 + (179 + 179))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 2).expr,
-                "tried addMultipliedBySquaring(57, 179, 2)"
-            )
-            assertEquals(
-                "(57 + (-179 + -179))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -2).expr,
-                "tried addMultipliedBySquaring(57, 179, -2)"
-            )
-            assertEquals(
-                "((57 + 179) + (179 + 179))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 3).expr,
-                "tried addMultipliedBySquaring(57, 179, 3)"
-            )
-            assertEquals(
-                "((57 + -179) + (-179 + -179))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -3).expr,
-                "tried addMultipliedBySquaring(57, 179, -3)"
-            )
-            assertEquals(
-                "(57 + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 4).expr,
-                "tried addMultipliedBySquaring(57, 179, 4)"
-            )
-            assertEquals(
-                "(57 + ((-179 + -179) + (-179 + -179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -4).expr,
-                "tried addMultipliedBySquaring(57, 179, -4)"
-            )
-            assertEquals(
-                "((57 + 179) + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 5).expr,
-                "tried addMultipliedBySquaring(57, 179, 5)"
-            )
-            assertEquals(
-                "((57 + -179) + ((-179 + -179) + (-179 + -179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -5).expr,
-                "tried addMultipliedBySquaring(57, 179, -5)"
-            )
-            assertEquals(
-                "((57 + (179 + 179)) + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 6).expr,
-                "tried addMultipliedBySquaring(57, 179, 6)"
-            )
-            assertEquals(
-                "((57 + (-179 + -179)) + ((-179 + -179) + (-179 + -179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -6).expr,
-                "tried addMultipliedBySquaring(57, 179, -6)"
-            )
-            assertEquals(
-                "(((57 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 7).expr,
-                "tried addMultipliedBySquaring(57, 179, 7)"
-            )
-            assertEquals(
-                "(((57 + -179) + (-179 + -179)) + ((-179 + -179) + (-179 + -179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -7).expr,
-                "tried addMultipliedBySquaring(57, 179, -7)"
-            )
-            assertEquals(
-                "(57 + (((179 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179))))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 8).expr,
-                "tried addMultipliedBySquaring(57, 179, 8)"
-            )
-            assertEquals(
-                "(57 + (((-179 + -179) + (-179 + -179)) + ((-179 + -179) + (-179 + -179))))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -8).expr,
-                "tried addMultipliedBySquaring(57, 179, -8)"
-            )
-        }
-    }
-    @Test
-    fun test_multiplyBySquaring_for_Int() {
-        ExprRing {
-            assertEquals(
-                "0",
-                multiplyByDoubling(Expr("57"), 0).expr,
-                "tried multiplyBySquaring(57, 0)"
-            )
-            assertEquals(
-                "57",
-                multiplyByDoubling(Expr("57"), 1).expr,
-                "tried multiplyBySquaring(57, 1)"
-            )
-            assertEquals(
-                "-57",
-                multiplyByDoubling(Expr("57"), -1).expr,
-                "tried multiplyBySquaring(57, -1)"
-            )
-            assertEquals(
-                "(57 + 57)",
-                multiplyByDoubling(Expr("57"), 2).expr,
-                "tried multiplyBySquaring(57, 2)"
-            )
-            assertEquals(
-                "(-57 + -57)",
-                multiplyByDoubling(Expr("57"), -2).expr,
-                "tried multiplyBySquaring(57, -2)"
-            )
-            assertEquals(
-                "(57 + (57 + 57))",
-                multiplyByDoubling(Expr("57"), 3).expr,
-                "tried multiplyBySquaring(57, 3)"
-            )
-            assertEquals(
-                "(-57 + (-57 + -57))",
-                multiplyByDoubling(Expr("57"), -3).expr,
-                "tried multiplyBySquaring(57, -3)"
-            )
-            assertEquals(
-                "((57 + 57) + (57 + 57))",
-                multiplyByDoubling(Expr("57"), 4).expr,
-                "tried multiplyBySquaring(57, 4)"
-            )
-            assertEquals(
-                "((-57 + -57) + (-57 + -57))",
-                multiplyByDoubling(Expr("57"), -4).expr,
-                "tried multiplyBySquaring(57, -4)"
-            )
-            assertEquals(
-                "(57 + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 5).expr,
-                "tried multiplyBySquaring(57, 5)"
-            )
-            assertEquals(
-                "(-57 + ((-57 + -57) + (-57 + -57)))",
-                multiplyByDoubling(Expr("57"), -5).expr,
-                "tried multiplyBySquaring(57, -5)"
-            )
-            assertEquals(
-                "((57 + 57) + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 6).expr,
-                "tried multiplyBySquaring(57, 6)"
-            )
-            assertEquals(
-                "((-57 + -57) + ((-57 + -57) + (-57 + -57)))",
-                multiplyByDoubling(Expr("57"), -6).expr,
-                "tried multiplyBySquaring(57, -6)"
-            )
-            assertEquals(
-                "((57 + (57 + 57)) + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 7).expr,
-                "tried multiplyBySquaring(57, 7)"
-            )
-            assertEquals(
-                "((-57 + (-57 + -57)) + ((-57 + -57) + (-57 + -57)))",
-                multiplyByDoubling(Expr("57"), -7).expr,
-                "tried multiplyBySquaring(57, -7)"
-            )
-            assertEquals(
-                "(((57 + 57) + (57 + 57)) + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 8).expr,
-                "tried multiplyBySquaring(57, 8)"
-            )
-            assertEquals(
-                "(((-57 + -57) + (-57 + -57)) + ((-57 + -57) + (-57 + -57)))",
-                multiplyByDoubling(Expr("57"), -8).expr,
-                "tried multiplyBySquaring(57, -8)"
-            )
-        }
-    }
     @Test
     fun test_multiplyExponentiationBySquaring_for_UInt() {
         ExprRing {
@@ -406,184 +126,4 @@ class AlgebraicStubTest {
             )
         }
     }
-    @Test
-    fun test_multiplyExponentiationBySquaring_for_Int() {
-        ExprRing {
-            assertEquals(
-                "57",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 0).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 0)"
-            )
-            assertEquals(
-                "(57 * 179)",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 1).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 1)"
-            )
-            assertEquals(
-                "(57 * (1 / 179))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -1).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -1)"
-            )
-            assertEquals(
-                "(57 * (179 * 179))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 2).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 2)"
-            )
-            assertEquals(
-                "(57 * ((1 / 179) * (1 / 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -2).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -2)"
-            )
-            assertEquals(
-                "((57 * 179) * (179 * 179))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 3).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 3)"
-            )
-            assertEquals(
-                "((57 * (1 / 179)) * ((1 / 179) * (1 / 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -3).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -3)"
-            )
-            assertEquals(
-                "(57 * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 4).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 4)"
-            )
-            assertEquals(
-                "(57 * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -4).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -4)"
-            )
-            assertEquals(
-                "((57 * 179) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 5).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 5)"
-            )
-            assertEquals(
-                "((57 * (1 / 179)) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -5).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -5)"
-            )
-            assertEquals(
-                "((57 * (179 * 179)) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 6).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 6)"
-            )
-            assertEquals(
-                "((57 * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -6).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -6)"
-            )
-            assertEquals(
-                "(((57 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 7).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 7)"
-            )
-            assertEquals(
-                "(((57 * (1 / 179)) * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -7).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -7)"
-            )
-            assertEquals(
-                "(57 * (((179 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 8).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 8)"
-            )
-            assertEquals(
-                "(57 * ((((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179)))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -8).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -8)"
-            )
-        }
-    }
-    @Test
-    fun test_exponentiationBySquaring_for_Int() {
-        ExprRing {
-            assertEquals(
-                "0",
-                exponentiateBySquaring(Expr("57"), 0).expr,
-                "tried exponentiationBySquaring(57, 0)"
-            )
-            assertEquals(
-                "57",
-                exponentiateBySquaring(Expr("57"), 1).expr,
-                "tried exponentiationBySquaring(57, 1)"
-            )
-            assertEquals(
-                "(1 / 57)",
-                exponentiateBySquaring(Expr("57"), -1).expr,
-                "tried exponentiationBySquaring(57, -1)"
-            )
-            assertEquals(
-                "(57 * 57)",
-                exponentiateBySquaring(Expr("57"), 2).expr,
-                "tried exponentiationBySquaring(57, 2)"
-            )
-            assertEquals(
-                "((1 / 57) * (1 / 57))",
-                exponentiateBySquaring(Expr("57"), -2).expr,
-                "tried exponentiationBySquaring(57, -2)"
-            )
-            assertEquals(
-                "(57 * (57 * 57))",
-                exponentiateBySquaring(Expr("57"), 3).expr,
-                "tried exponentiationBySquaring(57, 3)"
-            )
-            assertEquals(
-                "((1 / 57) * ((1 / 57) * (1 / 57)))",
-                exponentiateBySquaring(Expr("57"), -3).expr,
-                "tried exponentiationBySquaring(57, -3)"
-            )
-            assertEquals(
-                "((57 * 57) * (57 * 57))",
-                exponentiateBySquaring(Expr("57"), 4).expr,
-                "tried exponentiationBySquaring(57, 4)"
-            )
-            assertEquals(
-                "(((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57)))",
-                exponentiateBySquaring(Expr("57"), -4).expr,
-                "tried exponentiationBySquaring(57, -4)"
-            )
-            assertEquals(
-                "(57 * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 5).expr,
-                "tried exponentiationBySquaring(57, 5)"
-            )
-            assertEquals(
-                "((1 / 57) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
-                exponentiateBySquaring(Expr("57"), -5).expr,
-                "tried exponentiationBySquaring(57, -5)"
-            )
-            assertEquals(
-                "((57 * 57) * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 6).expr,
-                "tried exponentiationBySquaring(57, 6)"
-            )
-            assertEquals(
-                "(((1 / 57) * (1 / 57)) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
-                exponentiateBySquaring(Expr("57"), -6).expr,
-                "tried exponentiationBySquaring(57, -6)"
-            )
-            assertEquals(
-                "((57 * (57 * 57)) * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 7).expr,
-                "tried exponentiationBySquaring(57, 7)"
-            )
-            assertEquals(
-                "(((1 / 57) * ((1 / 57) * (1 / 57))) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
-                exponentiateBySquaring(Expr("57"), -7).expr,
-                "tried exponentiationBySquaring(57, -7)"
-            )
-            assertEquals(
-                "(((57 * 57) * (57 * 57)) * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 8).expr,
-                "tried exponentiationBySquaring(57, 8)"
-            )
-            assertEquals(
-                "((((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
-                exponentiateBySquaring(Expr("57"), -8).expr,
-                "tried exponentiationBySquaring(57, -8)"
-            )
-        }
-    }
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
index e7d8dfd8c..117ffb579 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
@@ -7,252 +7,11 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.functions.testUtils.IntModuloRing
-import space.kscience.kmath.functions.testUtils.ListPolynomial
-import space.kscience.kmath.functions.testUtils.Rational
-import space.kscience.kmath.functions.testUtils.RationalField
+import space.kscience.kmath.functions.testUtils.*
 import kotlin.test.*
 
 
 class ListPolynomialTest {
-    @Test
-    fun test_Polynomial_Int_plus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + -3,
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 2,
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(-2)) + 2,
-                "test 3"
-            )
-            val polynomial_4 = ListPolynomial<Rational>()
-            assertSame(
-                polynomial_4,
-                polynomial_4 + 0,
-                "test 4"
-            )
-            val polynomial_5 = ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7))
-            assertSame(
-                polynomial_5,
-                polynomial_5 + 0,
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 1,
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1)),
-                ListPolynomial(Rational(-2)) + 1,
-                "test 7"
-            )
-            assertEquals(
-                ListPolynomial(Rational(2)),
-                ListPolynomial<Rational>() + 2,
-                "test 8"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Int_minus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - -3,
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 2,
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(2)) - 2,
-                "test 3"
-            )
-            val polynomial_4 = ListPolynomial<Rational>()
-            assertSame(
-                polynomial_4,
-                polynomial_4 - 0,
-                "test 4"
-            )
-            val polynomial_5 = ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7))
-            assertEquals(
-                polynomial_5,
-                polynomial_5 - 0,
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 1,
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1)),
-                ListPolynomial(Rational(2)) - 1,
-                "test 7"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-2)),
-                ListPolynomial<Rational>() - 2,
-                "test 8"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Int_times() {
-        IntModuloRing(35).listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(34, 2, 1, 20, 2),
-                ListPolynomial(22, 26, 13, 15, 26) * 27,
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                ListPolynomial(7, 0, 49, 21, 14) * 15,
-                "test 2"
-            )
-            val polynomial = ListPolynomial(22, 26, 13, 15, 26)
-            assertSame(
-                zero,
-                polynomial * 0,
-                "test 3"
-            )
-            assertSame(
-                polynomial,
-                polynomial * 1,
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_plus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                -3 + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                2 + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                2 + ListPolynomial(Rational(-2)),
-                "test 3"
-            )
-            val polynomial_4 = ListPolynomial<Rational>()
-            assertSame(
-                polynomial_4,
-                0 + polynomial_4,
-                "test 4"
-            )
-            val polynomial_5 = ListPolynomial<Rational>(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7))
-            assertSame(
-                polynomial_5,
-                0 + polynomial_5,
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                1 + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1)),
-                1 + ListPolynomial(Rational(-2)),
-                "test 7"
-            )
-            assertEquals(
-                ListPolynomial(Rational(2)),
-                2 + ListPolynomial(),
-                "test 8"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_minus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                3 - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                -2 - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                -2 - ListPolynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-32, 9), Rational(-8, -9), Rational(8, 7)),
-                0 - ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(),
-                0 - ListPolynomial(),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                -1 - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1)),
-                -1 - ListPolynomial(Rational(-2)),
-                "test 7"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-2)),
-                -2 - ListPolynomial(),
-                "test 8"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_times() {
-        IntModuloRing(35).listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(34, 2, 1, 20, 2),
-                27 * ListPolynomial(22, 26, 13, 15, 26),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                15 * ListPolynomial(7, 0, 49, 21, 14),
-                "test 2"
-            )
-            val polynomial = ListPolynomial(22, 26, 13, 15, 26)
-            assertSame(
-                zero,
-                0 * polynomial,
-                "test 3"
-            )
-            assertSame(
-                polynomial,
-                1 * polynomial,
-                "test 4"
-            )
-        }
-    }
     @Test
     fun test_Polynomial_Constant_plus() {
         RationalField.listPolynomialSpace {
@@ -338,12 +97,12 @@ class ListPolynomialTest {
         IntModuloRing(35).listPolynomialSpace {
             assertEquals(
                 ListPolynomial(34, 2, 1, 20, 2),
-                ListPolynomial(22, 26, 13, 15, 26) * 27.asConstant(),
+                ListPolynomial(22, 26, 13, 15, 26) * m(27),
                 "test 1"
             )
             assertEquals(
                 ListPolynomial(0, 0, 0, 0, 0),
-                ListPolynomial(7, 0, 49, 21, 14) * 15.asConstant(),
+                ListPolynomial(7, 0, 49, 21, 14) * m(15),
                 "test 2"
             )
         }
@@ -433,12 +192,12 @@ class ListPolynomialTest {
         IntModuloRing(35).listPolynomialSpace {
             assertEquals(
                 ListPolynomial(34, 2, 1, 20, 2),
-                27 * ListPolynomial(22, 26, 13, 15, 26),
+                m(27) * ListPolynomial(22, 26, 13, 15, 26),
                 "test 1"
             )
             assertEquals(
                 ListPolynomial(0, 0, 0, 0, 0),
-                15 * ListPolynomial(7, 0, 49, 21, 14),
+                m(15) * ListPolynomial(7, 0, 49, 21, 14),
                 "test 2"
             )
         }
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
index 339643d02..153b0134b 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -5,11 +5,9 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.functions.testUtils.Rational
 import space.kscience.kmath.functions.testUtils.RationalField
-import space.kscience.kmath.functions.testUtils.assertFailsWithTypeAndMessage
-import kotlin.test.Ignore
+import space.kscience.kmath.misc.UnstableKMathAPI
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -88,754 +86,6 @@ class ListPolynomialUtilTest {
         )
     }
     @Test
-    fun test_Polynomial_substitute_Polynomial() {
-        assertEquals(
-            ListPolynomial(Rational(0)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, ListPolynomial(Rational(1))),
-            "test 1"
-        )
-        assertEquals(
-            ListPolynomial(Rational(709, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
-            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(2, 7))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
-            "test 2"
-        )
-        assertEquals(
-            ListPolynomial(Rational(655, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
-            ListPolynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(2, 7))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(677, 378), Rational(97, 180), Rational(1, 75), Rational(0)),
-            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(0))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
-            "test 4"
-        )
-        assertEquals(
-            ListPolynomial(Rational(653, 378), Rational(221, 420), Rational(4, 175), Rational(2, 875)),
-            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(0), Rational(2, 7))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
-            "test 5"
-        )
-        assertEquals(
-            ListPolynomial(Rational(89, 54), Rational(0), Rational(0), Rational(0)),
-            ListPolynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(0))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(0))),
-            "test 6"
-        )
-    }
-    @Test
-    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
-            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
-    fun test_Polynomial_substitute_RationalFunction() {
-        assertEquals(
-            ListRationalFunction(ListPolynomial(Rational(0)), ListPolynomial(Rational(1))),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1))
-                .substitute(RationalField, ListRationalFunction(ListPolynomial(Rational(1)), ListPolynomial(Rational(1)))),
-            "test 1"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(66349, 243),
-                    Rational(-17873, 405),
-                    Rational(173533, 3780),
-                    Rational(-91141, 567),
-                    Rational(5773909, 105840),
-                    Rational(-23243, 630),
-                    Rational(1573, 27)
-                ),
-                ListPolynomial(
-                    Rational(169, 81),
-                    Rational(-130, 27),
-                    Rational(115, 18),
-                    Rational(-797, 54),
-                    Rational(1985, 144),
-                    Rational(-55, 6),
-                    Rational(121, 9)
-                )
-            ),
-            ListPolynomial(
-                Rational(13, 3),
-                Rational(-9, 5),
-                Rational(5, 5)
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(15, 1),
-                        Rational(6, 9),
-                        Rational(-3, 7)
-                    ),
-                    ListPolynomial(
-                        Rational(-13, 9),
-                        Rational(10, 6),
-                        Rational(-10, 8),
-                        Rational(11, 3)
-                    )
-                )
-            ),
-            "test 2"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(-14, 9),
-                    Rational(31, 14),
-                    Rational(-5077, 980),
-                    Rational(99, 35)
-                ),
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(25, 9),
-                    Rational(-25, 6),
-                    Rational(1985, 144),
-                    Rational(-55, 6),
-                    Rational(121, 9)
-                )
-            ),
-            ListPolynomial(
-                Rational(0),
-                Rational(-9, 5),
-                Rational(5, 5)
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(0),
-                        Rational(6, 9),
-                        Rational(-3, 7)
-                    ),
-                    ListPolynomial(
-                        Rational(0),
-                        Rational(10, 6),
-                        Rational(-10, 8),
-                        Rational(11, 3)
-                    )
-                )
-            ),
-            "test 3"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(-898, 27),
-                    Rational(271, 45),
-                    Rational(-65, 12) ,
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0)
-                ),
-                ListPolynomial(
-                    Rational(-13, 9),
-                    Rational(5, 3),
-                    Rational(-5, 4),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0)
-                )
-            ),
-            ListPolynomial(
-                Rational(13, 3),
-                Rational(-9, 5),
-                Rational(0)
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(15, 1),
-                        Rational(6, 9),
-                        Rational(0)
-                    ),
-                    ListPolynomial(
-                        Rational(-13, 9),
-                        Rational(10, 6),
-                        Rational(-10, 8),
-                        Rational(0)
-                    )
-                )
-            ),
-            "test 4"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(56872, 243),
-                    Rational(0, 1),
-                    Rational(-90, 7),
-                    Rational(-3718, 81),
-                    Rational(9, 49),
-                    Rational(0, 1),
-                    Rational(1573, 27)
-                ),
-                ListPolynomial(
-                    Rational(169, 81),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(-286, 27),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(121, 9)
-                )
-            ),
-            ListPolynomial(
-                Rational(13, 3),
-                Rational(0),
-                Rational(5, 5)
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(15, 1),
-                        Rational(0),
-                        Rational(-3, 7)
-                    ),
-                    ListPolynomial(
-                        Rational(-13, 9),
-                        Rational(0),
-                        Rational(0),
-                        Rational(11, 3)
-                    )
-                )
-            ),
-            "test 5"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Double() {
-        assertEquals(
-            0.0,
-            ListRationalFunction(
-                ListPolynomial(1.0, -2.0, 1.0),
-                ListPolynomial(-6.302012278484357, 5.831971885376948, -9.271604788393432, 5.494387848015814, -3.7187384450880785)
-            ).substitute(1.0),
-            0.001,
-            "test 1"
-        )
-        assertEquals(
-            2.693702616649797,
-            ListRationalFunction(
-                ListPolynomial(-5.848840571263625, -1.660411278951134, -3.793740946372443, -9.624569269490076),
-                ListPolynomial(-2.9680680215311073, -1.862973627119981, 4.776550592888336, -2.7320154512368466)
-            ).substitute(-7.53452770353279),
-            0.001,
-            "test 2"
-        )
-        assertEquals(
-            2.692226268901378,
-            ListRationalFunction(
-                ListPolynomial(0.0, -1.660411278951134, -3.793740946372443, -9.624569269490076),
-                ListPolynomial(0.0, -1.862973627119981, 4.776550592888336, -2.7320154512368466)
-            ).substitute(-7.53452770353279),
-            0.001,
-            "test 3"
-        )
-        assertEquals(
-            -0.7394904842099175,
-            ListRationalFunction(
-                ListPolynomial(-5.848840571263625, -1.660411278951134, -3.793740946372443, 0.0),
-                ListPolynomial(-2.9680680215311073, -1.862973627119981, 4.776550592888336, 0.0)
-            ).substitute(-7.53452770353279),
-            0.001,
-            "test 4"
-        )
-        assertEquals(
-            3.526835209398159,
-            ListRationalFunction(
-                ListPolynomial(-5.848840571263625, 0.0, 0.0, -9.624569269490076),
-                ListPolynomial(-2.9680680215311073, 0.0, 0.0, -2.7320154512368466)
-            ).substitute(-7.53452770353279),
-            0.001,
-            "test 5"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Constant() {
-        assertEquals(
-            Rational(0),
-            ListRationalFunction(
-                ListPolynomial(Rational(1), Rational(-2), Rational(1)),
-                ListPolynomial(Rational(1)),
-            ).substitute(RationalField, Rational(1)),
-            "test 1"
-        )
-        assertEquals(
-            Rational(1149615, 61306),
-            ListRationalFunction(
-                ListPolynomial(Rational(17, 7), Rational(18, 3), Rational(18, 8), Rational(9, 1)),
-                ListPolynomial(Rational(11, 9), Rational(-6, 5), Rational(-12, 7), Rational(2, 1)),
-            ).substitute(RationalField, Rational(-7, 8)),
-            "test 2"
-        )
-        assertEquals(
-            Rational(3495, 586),
-            ListRationalFunction(
-                ListPolynomial(Rational(0), Rational(18, 3), Rational(18, 8), Rational(9, 1)),
-                ListPolynomial(Rational(0), Rational(-6, 5), Rational(-12, 7), Rational(2, 1)),
-            ).substitute(RationalField, Rational(-7, 8)),
-            "test 3"
-        )
-        assertEquals(
-            Rational(-88605, 77392),
-            ListRationalFunction(
-                ListPolynomial(Rational(17, 7), Rational(18, 3), Rational(18, 8), Rational(0)),
-                ListPolynomial(Rational(11, 9), Rational(-6, 5), Rational(-12, 7), Rational(0)),
-            ).substitute(RationalField, Rational(-7, 8)),
-            "test 4"
-        )
-        assertEquals(
-            Rational(116145, 3794),
-            ListRationalFunction(
-                ListPolynomial(Rational(17, 7), Rational(0), Rational(0), Rational(9, 1)),
-                ListPolynomial(Rational(11, 9), Rational(0), Rational(0), Rational(2, 1)),
-            ).substitute(RationalField, Rational(-7, 8)),
-            "test 5"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Polynomial() {
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(1))
-            ),
-            ListRationalFunction(
-                ListPolynomial(Rational(1), Rational(-2), Rational(1)),
-                ListPolynomial(Rational(1)),
-            ).substitute(RationalField, ListPolynomial(Rational(1))),
-            "test 1"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(-283303, 36),
-                    Rational(-23593, 24),
-                    Rational(368713, 192),
-                    Rational(1455, 8),
-                    Rational(-272171, 1536),
-                    Rational(-2149, 192),
-                    Rational(469, 64),
-                    Rational(11, 48),
-                    Rational(-11, 96)
-                ),
-                ListPolynomial(
-                    Rational(5797, 12),
-                    Rational(595, 16),
-                    Rational(-5285, 72),
-                    Rational(-745, 192),
-                    Rational(1105, 288),
-                    Rational(5, 48),
-                    Rational(-5, 72)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(2, 9),
-                    Rational(11, 3),
-                    Rational(-9, 4),
-                    Rational(-6, 1),
-                    Rational(-11, 6)
-                ),
-                ListPolynomial(
-                    Rational(-2, 3),
-                    Rational(-15, 4),
-                    Rational(5, 9),
-                    Rational(-5, 9)
-                )
-            ).substitute(RationalField,
-                ListPolynomial(
-                    Rational(-9, 1),
-                    Rational(-1, 4),
-                    Rational(2, 4)
-                )
-            ),
-            "test 2"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(-11, 12),
-                    Rational(325, 192),
-                    Rational(21, 32),
-                    Rational(-1739, 1536),
-                    Rational(227, 192),
-                    Rational(-59, 64),
-                    Rational(11, 48),
-                    Rational(-11, 96)
-                ),
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(15, 16),
-                    Rational(-265, 144),
-                    Rational(-25, 192),
-                    Rational(25, 288),
-                    Rational(5, 48),
-                    Rational(-5, 72)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(0, 9),
-                    Rational(11, 3),
-                    Rational(-9, 4),
-                    Rational(-6, 1),
-                    Rational(-11, 6)
-                ),
-                ListPolynomial(
-                    Rational(0, 3),
-                    Rational(-15, 4),
-                    Rational(5, 9),
-                    Rational(-5, 9)
-                )
-            ).substitute(RationalField,
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(-1, 4),
-                    Rational(2, 4)
-                )
-            ),
-            "test 3"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(149723, 36),
-                    Rational(8483, 24),
-                    Rational(639, 64),
-                    Rational(3, 32),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0)
-                ),
-                ListPolynomial(
-                    Rational(937, 12),
-                    Rational(55, 16),
-                    Rational(5, 144),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(2, 9),
-                    Rational(11, 3),
-                    Rational(-9, 4),
-                    Rational(-6, 1),
-                    Rational(0)
-                ),
-                ListPolynomial(
-                    Rational(-2, 3),
-                    Rational(-15, 4),
-                    Rational(5, 9),
-                    Rational(0)
-                )
-            ).substitute(RationalField,
-                ListPolynomial(
-                    Rational(-9, 1),
-                    Rational(-1, 4),
-                    Rational(0)
-                )
-            ),
-            "test 4"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(-216509, 18),
-                    Rational(0, 1),
-                    Rational(2673, 1),
-                    Rational(0, 1),
-                    Rational(-891, 4),
-                    Rational(0, 1),
-                    Rational(33, 4),
-                    Rational(0, 1),
-                    Rational(-11, 96)
-                ),
-                ListPolynomial(
-                    Rational(1213, 3),
-                    Rational(0, 1),
-                    Rational(-135, 2),
-                    Rational(0, 1),
-                    Rational(15, 4),
-                    Rational(0, 1),
-                    Rational(-5, 72)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(2, 9),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(-11, 6)
-                ),
-                ListPolynomial(
-                    Rational(-2, 3),
-                    Rational(0),
-                    Rational(0),
-                    Rational(-5, 9)
-                )
-            ).substitute(RationalField,
-                ListPolynomial(
-                    Rational(-9, 1),
-                    Rational(0),
-                    Rational(2, 4)
-                )
-            ),
-            "test 5"
-        )
-    }
-    @Test
-    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
-            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
-    fun test_RationalFunction_substitute_RationalFunction() {
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(1))
-            ),
-            ListRationalFunction(
-                ListPolynomial(Rational(1), Rational(-2), Rational(1)),
-                ListPolynomial(Rational(1))
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(Rational(1)),
-                    ListPolynomial(Rational(1))
-                )
-            ),
-            "test 1"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(130087, 3888),
-                    Rational(-2866333, 65610),
-                    Rational(-5076229, 97200),
-                    Rational(222136997, 3280500),
-                    Rational(754719329, 20995200),
-                    Rational(-12010283, 324000),
-                    Rational(-2011967, 172800),
-                    Rational(18607, 2880),
-                    Rational(4705, 4096)
-                ),
-                ListPolynomial(
-                    Rational(-143820355, 3779136),
-                    Rational(73886869, 1574640),
-                    Rational(1440175193, 15746400),
-                    Rational(-5308968857, 52488000),
-                    Rational(-186910083731, 2099520000),
-                    Rational(125043463, 1555200),
-                    Rational(5299123, 388800),
-                    Rational(-213757, 15360),
-                    Rational(1380785, 147456)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(1, 1),
-                    Rational(-10, 5),
-                    Rational(18, 8),
-                    Rational(-8, 8)
-                ),
-                ListPolynomial(
-                    Rational(-14, 8),
-                    Rational(-14, 8),
-                    Rational(-19, 6),
-                    Rational(14, 3),
-                    Rational(8, 9)
-                )
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(14, 9),
-                        Rational(-2, 5),
-                        Rational(-14, 7)
-                    ),
-                    ListPolynomial(
-                        Rational(-6, 4),
-                        Rational(5, 9),
-                        Rational(1, 8)
-                    )
-                )
-            ),
-            "test 2"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(5173, 18225),
-                    Rational(904291, 364500),
-                    Rational(283127, 43200),
-                    Rational(37189, 5760),
-                    Rational(147, 128)
-                ),
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(-163589, 911250),
-                    Rational(-881831, 291600),
-                    Rational(-10722229, 777600),
-                    Rational(-640921, 46080),
-                    Rational(86303, 9216)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(0),
-                    Rational(-10, 5),
-                    Rational(18, 8),
-                    Rational(-8, 8)
-                ),
-                ListPolynomial(
-                    Rational(0),
-                    Rational(-14, 8),
-                    Rational(-19, 6),
-                    Rational(14, 3),
-                    Rational(8, 9)
-                )
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(0),
-                        Rational(-2, 5),
-                        Rational(-14, 7)
-                    ),
-                    ListPolynomial(
-                        Rational(0),
-                        Rational(5, 9),
-                        Rational(1, 8)
-                    )
-                )
-            ),
-            "test 3"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(445, 16),
-                    Rational(-2011, 54),
-                    Rational(1359199, 72900),
-                    Rational(-135733, 32805),
-                    Rational(2254, 6561),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1)
-                ),
-                ListPolynomial(
-                    Rational(-2018387, 46656),
-                    Rational(82316437, 1574640),
-                    Rational(-9335047, 393660),
-                    Rational(15765889, 3280500),
-                    Rational(-242089, 656100),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(1, 1),
-                    Rational(-10, 5),
-                    Rational(18, 8),
-                    Rational(0)
-                ),
-                ListPolynomial(
-                    Rational(-14, 8),
-                    Rational(-14, 8),
-                    Rational(-19, 6),
-                    Rational(14, 3),
-                    Rational(0)
-                )
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(14, 9),
-                        Rational(-2, 5),
-                        Rational(0)
-                    ),
-                    ListPolynomial(
-                        Rational(-6, 4),
-                        Rational(5, 9),
-                        Rational(0)
-                    )
-                )
-            ),
-            "test 4"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(41635, 3888),
-                    Rational(0, 1),
-                    Rational(-279187, 11664),
-                    Rational(0, 1),
-                    Rational(103769, 3456),
-                    Rational(0, 1),
-                    Rational(-11017, 768),
-                    Rational(0, 1),
-                    Rational(4097, 4096)
-                ),
-                ListPolynomial(
-                    Rational(-13811791, 3779136),
-                    Rational(0, 1),
-                    Rational(-9999395, 419904),
-                    Rational(0, 1),
-                    Rational(6376601, 124416),
-                    Rational(0, 1),
-                    Rational(-3668315, 82944),
-                    Rational(0, 1),
-                    Rational(2097089, 147456)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(1, 1),
-                    Rational(0),
-                    Rational(0),
-                    Rational(-8, 8)
-                ),
-                ListPolynomial(
-                    Rational(-14, 8),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(8, 9)
-                )
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(14, 9),
-                        Rational(0),
-                        Rational(-14, 7)
-                    ),
-                    ListPolynomial(
-                        Rational(-6, 4),
-                        Rational(0),
-                        Rational(1, 8)
-                    )
-                )
-            ),
-            "test 5"
-        )
-    }
-    @Test
     fun test_Polynomial_derivative() {
         assertEquals(
             ListPolynomial(Rational(-2), Rational(2)),
@@ -859,55 +109,6 @@ class ListPolynomialUtilTest {
         )
     }
     @Test
-    fun test_Polynomial_nthDerivative() {
-        assertEquals(
-            ListPolynomial(Rational(-2), Rational(2)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 1),
-            "test 1"
-        )
-        assertFailsWithTypeAndMessage<IllegalArgumentException>(
-            "Order of derivative must be non-negative",
-            "test2"
-        ) {
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, -1)
-        }
-        assertEquals(
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 0),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(2)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 2),
-            "test 4"
-        )
-        assertEquals(
-            ListPolynomial(),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 3),
-            "test 5"
-        )
-        assertEquals(
-            ListPolynomial(),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 4),
-            "test 6"
-        )
-        assertEquals(
-            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
-            "test 7"
-        )
-        assertEquals(
-            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
-            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
-            "test 8"
-        )
-        assertEquals(
-            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(0)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthDerivative(RationalField, 2),
-            "test 9"
-        )
-    }
-    @Test
     fun test_Polynomial_antiderivative() {
         assertEquals(
             ListPolynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
@@ -930,53 +131,4 @@ class ListPolynomialUtilTest {
             "test 4"
         )
     }
-    @Test
-    fun test_Polynomial_nthAntiderivative() {
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 1),
-            "test 1"
-        )
-        assertFailsWithTypeAndMessage<IllegalArgumentException>(
-            "Order of antiderivative must be non-negative",
-            "test2"
-        ) {
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, -1)
-        }
-        assertEquals(
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 0),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(1, 2), Rational(-1, 3), Rational(1, 12)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 2),
-            "test 4"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(1, 6), Rational(-1, 12), Rational(1, 60)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 3),
-            "test 5"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 24), Rational(-1, 60), Rational(1, 360)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 4),
-            "test 6"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
-            "test 7"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
-            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
-            "test 8"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28), Rational(0)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthAntiderivative(RationalField, 2),
-            "test 9"
-        )
-    }
 }
\ No newline at end of file
diff --git a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
index 4b65fbea1..997a966a7 100644
--- a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
+++ b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
@@ -5,15 +5,14 @@
 
 package space.kscience.kmath.functions.testUtils
 
-import space.kscience.kmath.functions.ListPolynomial
+import space.kscience.kmath.functions.Polynomial
 import space.kscience.kmath.functions.ListPolynomialSpace
-import space.kscience.kmath.functions.PolynomialSpaceOverRing
 
 
-public fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
-    ListPolynomial(coefs.map { IntModulo(it, ring.modulus) })
-public fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
-    ListPolynomial(coefs.map { IntModulo(it, modulus) })
+public fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): Polynomial<IntModulo> =
+    Polynomial(coefs.map { IntModulo(it, ring.modulus) })
+public fun IntModuloRing.ListPolynomial(vararg coefs: Int): Polynomial<IntModulo> =
+    Polynomial(coefs.map { IntModulo(it, modulus) })
 
 public fun IntModuloRing.m(arg: Int): IntModulo = IntModulo(arg, modulus)
-public fun PolynomialSpaceOverRing<IntModulo, *, IntModuloRing>.m(arg: Int): IntModulo = IntModulo(arg, ring.modulus)
\ No newline at end of file
+public fun ListPolynomialSpace<IntModulo, IntModuloRing>.m(arg: Int): IntModulo = IntModulo(arg, ring.modulus)
\ No newline at end of file
-- 
2.34.1


From 6ff79e28ac0b34e74cbec682866610492425a157 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 12 Jul 2022 00:57:44 +0300
Subject: [PATCH 563/713] Fix names, references, etc.

---
 .../kscience/kmath/functions/Polynomial.kt    |   6 +-
 .../kmath/functions/polynomialConstructors.kt |   6 +-
 .../kmath/functions/polynomialUtil.kt         |  24 +-
 .../kmath/interpolation/LinearInterpolator.kt |   4 +-
 .../kmath/interpolation/SplineInterpolator.kt |   4 +-
 .../kmath/functions/ListPolynomialTest.kt     | 303 ------------------
 .../kmath/functions/ListPolynomialUtilTest.kt | 134 --------
 .../kmath/functions/PolynomialTest.kt         | 303 ++++++++++++++++++
 .../kmath/functions/PolynomialUtilTest.kt     | 134 ++++++++
 .../kmath/integration/SplineIntegralTest.kt   |   4 +-
 .../functions/LabeledPolynomialUtilTest.kt    |   1 +
 .../functions/testUtils/IntModuloUtils.kt     |   8 +-
 .../kmath/functions/testUtils/IntModulo.kt    | 133 ++++++++
 .../functions/testUtils/IntModuloUtils.kt     |  20 ++
 .../kmath/functions/testUtils/NTMisc.kt       |  29 ++
 .../kmath/functions/testUtils/Rational.kt     | 177 ++++++++++
 .../kmath/functions/testUtils/assertion.kt    |   1 -
 17 files changed, 825 insertions(+), 466 deletions(-)
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
 create mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
 create mode 100644 test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
 create mode 100644 test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
 create mode 100644 test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt
 create mode 100644 test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index fec4776d9..061f556f6 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -59,7 +59,7 @@ public value class Polynomial<C>(
  * @param A type of provided underlying ring of constants. It's [Ring] of [C].
  * @param ring underlying ring of constants of type [A].
  */
-public open class ListPolynomialSpace<C, A : Ring<C>>(
+public open class PolynomialSpace<C, A : Ring<C>>(
     /**
      * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
      */
@@ -293,9 +293,9 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
  * @param A type of underlying ring of constants. It's [Ring] of [C].
  * @param ring underlying ring of constants of type [A].
  */
-public class ScalableListPolynomialSpace<C, A>(
+public class ScalablePolynomialSpace<C, A>(
     ring: A,
-) : ListPolynomialSpace<C, A>(ring), ScaleOperations<Polynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
+) : PolynomialSpace<C, A>(ring), ScaleOperations<Polynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
     override fun scale(a: Polynomial<C>, value: Double): Polynomial<C> =
         ring { Polynomial(a.coefficients.map { scale(it, value) }) }
 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialConstructors.kt
index ff04607a7..2da9ea6f5 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialConstructors.kt
@@ -11,7 +11,7 @@ package space.kscience.kmath.functions
  * if [reverse] parameter is true.
  */
 @Suppress("FunctionName")
-public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false): Polynomial<C> =
+public fun <C> Polynomial(coefficients: List<C>, reverse: Boolean = false): Polynomial<C> =
     Polynomial(with(coefficients) { if (reverse) reversed() else this })
 
 /**
@@ -19,10 +19,10 @@ public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false):
  * if [reverse] parameter is true.
  */
 @Suppress("FunctionName")
-public fun <C> ListPolynomial(vararg coefficients: C, reverse: Boolean = false): Polynomial<C> =
+public fun <C> Polynomial(vararg coefficients: C, reverse: Boolean = false): Polynomial<C> =
     Polynomial(with(coefficients) { if (reverse) reversed() else toList() })
 
 /**
  * Represents [this] constant as a [Polynomial].
  */
-public fun <C> C.asListPolynomial() : Polynomial<C> = Polynomial(listOf(this))
\ No newline at end of file
+public fun <C> C.asPolynomial() : Polynomial<C> = Polynomial(listOf(this))
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index fc3a728df..0e1259bee 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -14,31 +14,31 @@ import kotlin.math.pow
 
 
 /**
- * Creates a [ListPolynomialSpace] over a received ring.
+ * Creates a [PolynomialSpace] over a received ring.
  */
-public inline val <C, A : Ring<C>> A.listPolynomialSpace: ListPolynomialSpace<C, A>
-    get() = ListPolynomialSpace(this)
+public inline val <C, A : Ring<C>> A.polynomialSpace: PolynomialSpace<C, A>
+    get() = PolynomialSpace(this)
 
 /**
- * Creates a [ListPolynomialSpace]'s scope over a received ring.
+ * Creates a [PolynomialSpace]'s scope over a received ring.
  */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
-public inline fun <C, A : Ring<C>, R> A.listPolynomialSpace(block: ListPolynomialSpace<C, A>.() -> R): R {
+public inline fun <C, A : Ring<C>, R> A.polynomialSpace(block: PolynomialSpace<C, A>.() -> R): R {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ListPolynomialSpace(this).block()
+    return PolynomialSpace(this).block()
 }
 
 /**
- * Creates a [ScalableListPolynomialSpace] over a received scalable ring.
+ * Creates a [ScalablePolynomialSpace] over a received scalable ring.
  */
-public inline val <C, A> A.scalableListPolynomialSpace: ScalableListPolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C>
-    get() = ScalableListPolynomialSpace(this)
+public inline val <C, A> A.scalablePolynomialSpace: ScalablePolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C>
+    get() = ScalablePolynomialSpace(this)
 
 /**
- * Creates a [ScalableListPolynomialSpace]'s scope over a received scalable ring.
+ * Creates a [ScalablePolynomialSpace]'s scope over a received scalable ring.
  */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
-public inline fun <C, A, R> A.scalableListPolynomialSpace(block: ScalableListPolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
+public inline fun <C, A, R> A.scalablePolynomialSpace(block: ScalablePolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ScalableListPolynomialSpace(this).block()
+    return ScalablePolynomialSpace(this).block()
 }
 
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
index b55f16cf2..34d7bcf41 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.interpolation
 
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.ListPolynomial
+import space.kscience.kmath.functions.Polynomial
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.invoke
@@ -32,7 +32,7 @@ public class LinearInterpolator<T : Comparable<T>>(override val algebra: Field<T
             for (i in 0 until points.size - 1) {
                 val slope = (points.y[i + 1] - points.y[i]) / (points.x[i + 1] - points.x[i])
                 val const = points.y[i] - slope * points.x[i]
-                val polynomial = ListPolynomial(const, slope)
+                val polynomial = Polynomial(const, slope)
                 putRight(points.x[i + 1], polynomial)
             }
         }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
index 48c90ff23..afcb33bd4 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.interpolation
 
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.functions.PiecewisePolynomial
-import space.kscience.kmath.functions.ListPolynomial
+import space.kscience.kmath.functions.Polynomial
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Field
@@ -61,7 +61,7 @@ public class SplineInterpolator<T : Comparable<T>>(
                 val x02 = x0 * x0
                 val x03 = x02 * x0
                 //Shift coefficients to represent absolute polynomial instead of one with an offset
-                val polynomial = ListPolynomial(
+                val polynomial = Polynomial(
                     a - b * x0 + c * x02 - d * x03,
                     b - 2 * c * x0 + 3 * d * x02,
                     c - 3 * d * x0,
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
deleted file mode 100644
index 117ffb579..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("LocalVariableName")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.functions.testUtils.*
-import kotlin.test.*
-
-
-class ListPolynomialTest {
-    @Test
-    fun test_Polynomial_Constant_plus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + Rational(-3),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(2),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(-2)) + Rational(2),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial<Rational>() + Rational(0),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(1),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1)),
-                ListPolynomial(Rational(-2)) + Rational(1),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(2)),
-                ListPolynomial<Rational>() + Rational(2),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_minus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - Rational(-3),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(2),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(2)) - Rational(2),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial<Rational>() - Rational(0),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(1),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1)),
-                ListPolynomial(Rational(2)) - Rational(1),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-2)),
-                ListPolynomial<Rational>() - Rational(2),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_times() {
-        IntModuloRing(35).listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(34, 2, 1, 20, 2),
-                ListPolynomial(22, 26, 13, 15, 26) * m(27),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                ListPolynomial(7, 0, 49, 21, 14) * m(15),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_plus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                Rational(-3) + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                Rational(2) + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                Rational(2) + ListPolynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                Rational(0) + ListPolynomial(),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                Rational(1) + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1)),
-                Rational(1) + ListPolynomial(Rational(-2)),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(2)),
-                Rational(2) + ListPolynomial(),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_minus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                Rational(3) - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                Rational(-2) - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                Rational(-2) - ListPolynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                Rational(0) - ListPolynomial(),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                Rational(-1) - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1)),
-                Rational(-1) - ListPolynomial(Rational(-2)),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-2)),
-                Rational(-2) - ListPolynomial(),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_times() {
-        IntModuloRing(35).listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(34, 2, 1, 20, 2),
-                m(27) * ListPolynomial(22, 26, 13, 15, 26),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                m(15) * ListPolynomial(7, 0, 49, 21, 14),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_unaryMinus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
-                -ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7), Rational(0), Rational(0)),
-                -ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7), Rational(0), Rational(0)),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_plus() {
-        RationalField.listPolynomialSpace {
-            // (5/9 - 8/9 x - 8/7 x^2) + (-5/7 + 5/1 x + 5/8 x^2) ?= -10/63 + 37/9 x - 29/56 x^2
-            assertEquals(
-                ListPolynomial(Rational(-10, 63), Rational(37, 9), Rational(-29, 56)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) +
-                        ListPolynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
-                "test 1"
-            )
-            // (-2/9 - 8/3 x) + (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 5/12 x + 2/4 x^2
-            assertEquals(
-                ListPolynomial(Rational(-2, 9), Rational(-5, 12), Rational(2, 4)),
-                ListPolynomial(Rational(-2, 9), Rational(-8, 3)) +
-                        ListPolynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
-                "test 2"
-            )
-            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) + (-6/3 - 7/2 x + 2/3 x^2) ?= -18/7 - 23/6 x + 2/3 x^2
-            assertEquals(
-                ListPolynomial(Rational(-18, 7), Rational(-23, 6), Rational(2, 3), Rational(0)),
-                ListPolynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) +
-                        ListPolynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
-                "test 3"
-            )
-            // (-2/4 - 6/9 x - 4/9 x^2) + (2/4 + 6/9 x + 4/9 x^2) ?= 0
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) +
-                        ListPolynomial(Rational(2, 4), Rational(6, 9), Rational(4, 9)),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_minus() {
-        RationalField.listPolynomialSpace {
-            // (5/9 - 8/9 x - 8/7 x^2) - (-5/7 + 5/1 x + 5/8 x^2) ?= 80/63 - 53/9 x - 99/56 x^2
-            assertEquals(
-                ListPolynomial(Rational(80, 63), Rational(-53, 9), Rational(-99, 56)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) -
-                        ListPolynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
-                "test 1"
-            )
-            // (-2/9 - 8/3 x) - (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 59/12 x - 2/4 x^2
-            assertEquals(
-                ListPolynomial(Rational(-2, 9), Rational(-59, 12), Rational(-2, 4)),
-                ListPolynomial(Rational(-2, 9), Rational(-8, 3)) -
-                        ListPolynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
-                "test 2"
-            )
-            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) - (-6/3 - 7/2 x + 2/3 x^2) ?= 10/7 + 19/6 x - 2/3 x^2
-            assertEquals(
-                ListPolynomial(Rational(10, 7), Rational(19, 6), Rational(-2, 3), Rational(0)),
-                ListPolynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) -
-                        ListPolynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
-                "test 3"
-            )
-            // (-2/4 - 6/9 x - 4/9 x^2) - (-2/4 - 6/9 x - 4/9 x^2) ?= 0
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) -
-                        ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_times() {
-        IntModuloRing(35).listPolynomialSpace {
-            // (1 + x + x^2) * (1 - x + x^2) ?= 1 + x^2 + x^4
-            assertEquals(
-                ListPolynomial(1, 0, 1, 0, 1),
-                ListPolynomial(1, -1, 1) * ListPolynomial(1, 1, 1),
-                "test 1"
-            )
-            // Spoiler: 5 * 7 = 0
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                ListPolynomial(5, -25, 10) * ListPolynomial(21, 14, -7),
-                "test 2"
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
deleted file mode 100644
index 153b0134b..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.functions.testUtils.Rational
-import space.kscience.kmath.functions.testUtils.RationalField
-import space.kscience.kmath.misc.UnstableKMathAPI
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-
-@OptIn(UnstableKMathAPI::class)
-class ListPolynomialUtilTest {
-    @Test
-    fun test_Polynomial_substitute_Double() {
-        assertEquals(
-            0.0,
-            ListPolynomial(1.0, -2.0, 1.0).substitute(1.0),
-            0.001,
-            "test 1"
-        )
-        assertEquals(
-            0.0,
-            ListPolynomial(1.0, -2.0, 1.0).substitute(1.0),
-            0.001,
-            "test 1"
-        )
-        assertEquals(
-            1.1931904761904761,
-            ListPolynomial(0.625, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
-            0.001,
-            "test 2"
-        )
-        assertEquals(
-            0.5681904761904762,
-            ListPolynomial(0.0, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
-            0.001,
-            "test 3"
-        )
-        assertEquals(
-            1.1811904761904761,
-            ListPolynomial(0.625, 2.6666666666666665, 0.5714285714285714, 0.0).substitute(0.2),
-            0.001,
-            "test 4"
-        )
-        assertEquals(
-            1.1703333333333332,
-            ListPolynomial(0.625, 2.6666666666666665, 0.0, 1.5).substitute(0.2),
-            0.001,
-            "test 5"
-        )
-    }
-    @Test
-    fun test_Polynomial_substitute_Constant() {
-        assertEquals(
-            Rational(0),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, Rational(1)),
-            "test 1"
-        )
-        assertEquals(
-            Rational(25057, 21000),
-            ListPolynomial(Rational(5, 8), Rational(8, 3), Rational(4, 7), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 2"
-        )
-        assertEquals(
-            Rational(2983, 5250),
-            ListPolynomial(Rational(0), Rational(8, 3), Rational(4, 7), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 3"
-        )
-        assertEquals(
-            Rational(4961, 4200),
-            ListPolynomial(Rational(5, 8), Rational(8, 3), Rational(4, 7), Rational(0))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 4"
-        )
-        assertEquals(
-            Rational(3511, 3000),
-            ListPolynomial(Rational(5, 8), Rational(8, 3), Rational(0), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 5"
-        )
-    }
-    @Test
-    fun test_Polynomial_derivative() {
-        assertEquals(
-            ListPolynomial(Rational(-2), Rational(2)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).derivative(RationalField),
-            "test 1"
-        )
-        assertEquals(
-            ListPolynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
-            "test 2"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
-            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(0)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).derivative(RationalField),
-            "test 4"
-        )
-    }
-    @Test
-    fun test_Polynomial_antiderivative() {
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).antiderivative(RationalField),
-            "test 1"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
-            "test 2"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
-            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(0)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).antiderivative(RationalField),
-            "test 4"
-        )
-    }
-}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
new file mode 100644
index 000000000..7e0c6cdf2
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
@@ -0,0 +1,303 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("LocalVariableName")
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.functions.testUtils.*
+import kotlin.test.*
+
+
+class PolynomialTest {
+    @Test
+    fun test_Polynomial_Constant_plus() {
+        RationalField.polynomialSpace {
+            assertEquals(
+                Polynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + Rational(-3),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(2),
+                "test 2"
+            )
+            assertEquals(
+                Polynomial(Rational(0)),
+                Polynomial(Rational(-2)) + Rational(2),
+                "test 3"
+            )
+            assertEquals(
+                Polynomial(Rational(0)),
+                Polynomial<Rational>() + Rational(0),
+                "test 4"
+            )
+            assertEquals(
+                Polynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(1),
+                "test 5"
+            )
+            assertEquals(
+                Polynomial(Rational(-1)),
+                Polynomial(Rational(-2)) + Rational(1),
+                "test 6"
+            )
+            assertEquals(
+                Polynomial(Rational(2)),
+                Polynomial<Rational>() + Rational(2),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_minus() {
+        RationalField.polynomialSpace {
+            assertEquals(
+                Polynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - Rational(-3),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(2),
+                "test 2"
+            )
+            assertEquals(
+                Polynomial(Rational(0)),
+                Polynomial(Rational(2)) - Rational(2),
+                "test 3"
+            )
+            assertEquals(
+                Polynomial(Rational(0)),
+                Polynomial<Rational>() - Rational(0),
+                "test 4"
+            )
+            assertEquals(
+                Polynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(1),
+                "test 5"
+            )
+            assertEquals(
+                Polynomial(Rational(1)),
+                Polynomial(Rational(2)) - Rational(1),
+                "test 6"
+            )
+            assertEquals(
+                Polynomial(Rational(-2)),
+                Polynomial<Rational>() - Rational(2),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_times() {
+        IntModuloRing(35).polynomialSpace {
+            assertEquals(
+                Polynomial(34, 2, 1, 20, 2),
+                Polynomial(22, 26, 13, 15, 26) * m(27),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(0, 0, 0, 0, 0),
+                Polynomial(7, 0, 49, 21, 14) * m(15),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_plus() {
+        RationalField.polynomialSpace {
+            assertEquals(
+                Polynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                Rational(-3) + Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Rational(2) + Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                Polynomial(Rational(0)),
+                Rational(2) + Polynomial(Rational(-2)),
+                "test 3"
+            )
+            assertEquals(
+                Polynomial(Rational(0)),
+                Rational(0) + Polynomial(),
+                "test 4"
+            )
+            assertEquals(
+                Polynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                Rational(1) + Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 5"
+            )
+            assertEquals(
+                Polynomial(Rational(-1)),
+                Rational(1) + Polynomial(Rational(-2)),
+                "test 6"
+            )
+            assertEquals(
+                Polynomial(Rational(2)),
+                Rational(2) + Polynomial(),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_minus() {
+        RationalField.polynomialSpace {
+            assertEquals(
+                Polynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                Rational(3) - Polynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Rational(-2) - Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                Polynomial(Rational(0)),
+                Rational(-2) - Polynomial(Rational(-2)),
+                "test 3"
+            )
+            assertEquals(
+                Polynomial(Rational(0)),
+                Rational(0) - Polynomial(),
+                "test 4"
+            )
+            assertEquals(
+                Polynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                Rational(-1) - Polynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 5"
+            )
+            assertEquals(
+                Polynomial(Rational(1)),
+                Rational(-1) - Polynomial(Rational(-2)),
+                "test 6"
+            )
+            assertEquals(
+                Polynomial(Rational(-2)),
+                Rational(-2) - Polynomial(),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_times() {
+        IntModuloRing(35).polynomialSpace {
+            assertEquals(
+                Polynomial(34, 2, 1, 20, 2),
+                m(27) * Polynomial(22, 26, 13, 15, 26),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(0, 0, 0, 0, 0),
+                m(15) * Polynomial(7, 0, 49, 21, 14),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_unaryMinus() {
+        RationalField.polynomialSpace {
+            assertEquals(
+                Polynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
+                -Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                Polynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7), Rational(0), Rational(0)),
+                -Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7), Rational(0), Rational(0)),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_plus() {
+        RationalField.polynomialSpace {
+            // (5/9 - 8/9 x - 8/7 x^2) + (-5/7 + 5/1 x + 5/8 x^2) ?= -10/63 + 37/9 x - 29/56 x^2
+            assertEquals(
+                Polynomial(Rational(-10, 63), Rational(37, 9), Rational(-29, 56)),
+                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) +
+                        Polynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
+                "test 1"
+            )
+            // (-2/9 - 8/3 x) + (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 5/12 x + 2/4 x^2
+            assertEquals(
+                Polynomial(Rational(-2, 9), Rational(-5, 12), Rational(2, 4)),
+                Polynomial(Rational(-2, 9), Rational(-8, 3)) +
+                        Polynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
+                "test 2"
+            )
+            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) + (-6/3 - 7/2 x + 2/3 x^2) ?= -18/7 - 23/6 x + 2/3 x^2
+            assertEquals(
+                Polynomial(Rational(-18, 7), Rational(-23, 6), Rational(2, 3), Rational(0)),
+                Polynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) +
+                        Polynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
+                "test 3"
+            )
+            // (-2/4 - 6/9 x - 4/9 x^2) + (2/4 + 6/9 x + 4/9 x^2) ?= 0
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) +
+                        Polynomial(Rational(2, 4), Rational(6, 9), Rational(4, 9)),
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_minus() {
+        RationalField.polynomialSpace {
+            // (5/9 - 8/9 x - 8/7 x^2) - (-5/7 + 5/1 x + 5/8 x^2) ?= 80/63 - 53/9 x - 99/56 x^2
+            assertEquals(
+                Polynomial(Rational(80, 63), Rational(-53, 9), Rational(-99, 56)),
+                Polynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) -
+                        Polynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
+                "test 1"
+            )
+            // (-2/9 - 8/3 x) - (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 59/12 x - 2/4 x^2
+            assertEquals(
+                Polynomial(Rational(-2, 9), Rational(-59, 12), Rational(-2, 4)),
+                Polynomial(Rational(-2, 9), Rational(-8, 3)) -
+                        Polynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
+                "test 2"
+            )
+            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) - (-6/3 - 7/2 x + 2/3 x^2) ?= 10/7 + 19/6 x - 2/3 x^2
+            assertEquals(
+                Polynomial(Rational(10, 7), Rational(19, 6), Rational(-2, 3), Rational(0)),
+                Polynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) -
+                        Polynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
+                "test 3"
+            )
+            // (-2/4 - 6/9 x - 4/9 x^2) - (-2/4 - 6/9 x - 4/9 x^2) ?= 0
+            assertEquals(
+                Polynomial(Rational(0), Rational(0), Rational(0)),
+                Polynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) -
+                        Polynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)),
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_times() {
+        IntModuloRing(35).polynomialSpace {
+            // (1 + x + x^2) * (1 - x + x^2) ?= 1 + x^2 + x^4
+            assertEquals(
+                Polynomial(1, 0, 1, 0, 1),
+                Polynomial(1, -1, 1) * Polynomial(1, 1, 1),
+                "test 1"
+            )
+            // Spoiler: 5 * 7 = 0
+            assertEquals(
+                Polynomial(0, 0, 0, 0, 0),
+                Polynomial(5, -25, 10) * Polynomial(21, 14, -7),
+                "test 2"
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
new file mode 100644
index 000000000..820b487b4
--- /dev/null
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.functions.testUtils.Rational
+import space.kscience.kmath.functions.testUtils.RationalField
+import space.kscience.kmath.misc.UnstableKMathAPI
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+
+@OptIn(UnstableKMathAPI::class)
+class PolynomialUtilTest {
+    @Test
+    fun test_Polynomial_substitute_Double() {
+        assertEquals(
+            0.0,
+            Polynomial(1.0, -2.0, 1.0).substitute(1.0),
+            0.001,
+            "test 1"
+        )
+        assertEquals(
+            0.0,
+            Polynomial(1.0, -2.0, 1.0).substitute(1.0),
+            0.001,
+            "test 1"
+        )
+        assertEquals(
+            1.1931904761904761,
+            Polynomial(0.625, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
+            0.001,
+            "test 2"
+        )
+        assertEquals(
+            0.5681904761904762,
+            Polynomial(0.0, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
+            0.001,
+            "test 3"
+        )
+        assertEquals(
+            1.1811904761904761,
+            Polynomial(0.625, 2.6666666666666665, 0.5714285714285714, 0.0).substitute(0.2),
+            0.001,
+            "test 4"
+        )
+        assertEquals(
+            1.1703333333333332,
+            Polynomial(0.625, 2.6666666666666665, 0.0, 1.5).substitute(0.2),
+            0.001,
+            "test 5"
+        )
+    }
+    @Test
+    fun test_Polynomial_substitute_Constant() {
+        assertEquals(
+            Rational(0),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, Rational(1)),
+            "test 1"
+        )
+        assertEquals(
+            Rational(25057, 21000),
+            Polynomial(Rational(5, 8), Rational(8, 3), Rational(4, 7), Rational(3, 2))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 2"
+        )
+        assertEquals(
+            Rational(2983, 5250),
+            Polynomial(Rational(0), Rational(8, 3), Rational(4, 7), Rational(3, 2))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 3"
+        )
+        assertEquals(
+            Rational(4961, 4200),
+            Polynomial(Rational(5, 8), Rational(8, 3), Rational(4, 7), Rational(0))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 4"
+        )
+        assertEquals(
+            Rational(3511, 3000),
+            Polynomial(Rational(5, 8), Rational(8, 3), Rational(0), Rational(3, 2))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 5"
+        )
+    }
+    @Test
+    fun test_Polynomial_derivative() {
+        assertEquals(
+            Polynomial(Rational(-2), Rational(2)),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).derivative(RationalField),
+            "test 1"
+        )
+        assertEquals(
+            Polynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
+            "test 2"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
+            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
+            "test 3"
+        )
+        assertEquals(
+            Polynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(0)),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).derivative(RationalField),
+            "test 4"
+        )
+    }
+    @Test
+    fun test_Polynomial_antiderivative() {
+        assertEquals(
+            Polynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).antiderivative(RationalField),
+            "test 1"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
+            "test 2"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(0), Rational(0), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
+            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
+            "test 3"
+        )
+        assertEquals(
+            Polynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(0)),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).antiderivative(RationalField),
+            "test 4"
+        )
+    }
+}
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
index aae0ad017..afeba0be4 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.integration
 
-import space.kscience.kmath.functions.ListPolynomial
+import space.kscience.kmath.functions.Polynomial
 import space.kscience.kmath.functions.integrate
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
@@ -19,7 +19,7 @@ class SplineIntegralTest {
 
     @Test
     fun integratePolynomial(){
-        val polynomial = ListPolynomial(1.0, 2.0, 3.0)
+        val polynomial = Polynomial(1.0, 2.0, 3.0)
         val integral = polynomial.integrate(DoubleField,1.0..2.0)
         assertEquals(11.0, integral, 0.001)
     }
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
index 88ee1cbb8..6243818b4 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.functions
 
 import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.functions.testUtils.assertEquals
 import space.kscience.kmath.functions.testUtils.Rational
 import space.kscience.kmath.functions.testUtils.RationalField
 import space.kscience.kmath.functions.testUtils.iota
diff --git a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
index 997a966a7..e534c243e 100644
--- a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
+++ b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
@@ -6,13 +6,13 @@
 package space.kscience.kmath.functions.testUtils
 
 import space.kscience.kmath.functions.Polynomial
-import space.kscience.kmath.functions.ListPolynomialSpace
+import space.kscience.kmath.functions.PolynomialSpace
 
 
-public fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): Polynomial<IntModulo> =
+public fun PolynomialSpace<IntModulo, IntModuloRing>.Polynomial(vararg coefs: Int): Polynomial<IntModulo> =
     Polynomial(coefs.map { IntModulo(it, ring.modulus) })
-public fun IntModuloRing.ListPolynomial(vararg coefs: Int): Polynomial<IntModulo> =
+public fun IntModuloRing.Polynomial(vararg coefs: Int): Polynomial<IntModulo> =
     Polynomial(coefs.map { IntModulo(it, modulus) })
 
 public fun IntModuloRing.m(arg: Int): IntModulo = IntModulo(arg, modulus)
-public fun ListPolynomialSpace<IntModulo, IntModuloRing>.m(arg: Int): IntModulo = IntModulo(arg, ring.modulus)
\ No newline at end of file
+public fun PolynomialSpace<IntModulo, IntModuloRing>.m(arg: Int): IntModulo = IntModulo(arg, ring.modulus)
\ No newline at end of file
diff --git a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt b/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
new file mode 100644
index 000000000..933c4dc4c
--- /dev/null
+++ b/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
+
+package space.kscience.kmath.functions.testUtils
+
+import space.kscience.kmath.operations.Ring
+
+
+public class IntModulo {
+    public val residue: Int
+    public val modulus: Int
+
+    @PublishedApi
+    internal constructor(residue: Int, modulus: Int, toCheckInput: Boolean = true) {
+        if (toCheckInput) {
+            require(modulus != 0) { "modulus can not be zero" }
+            this.modulus = if (modulus < 0) -modulus else modulus
+            this.residue = residue.mod(this.modulus)
+        } else {
+            this.residue = residue
+            this.modulus = modulus
+        }
+    }
+
+    public constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
+
+    public operator fun unaryPlus(): IntModulo = this
+    public operator fun unaryMinus(): IntModulo =
+        IntModulo(
+            if (residue == 0) 0 else modulus - residue,
+            modulus,
+            toCheckInput = false
+        )
+    public operator fun plus(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not add two residue different modulo" }
+        return IntModulo(
+            (residue + other.residue) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    public operator fun plus(other: Int): IntModulo =
+        IntModulo(
+            (residue + other) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    public operator fun minus(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not subtract two residue different modulo" }
+        return IntModulo(
+            (residue - other.residue) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    public operator fun minus(other: Int): IntModulo =
+        IntModulo(
+            (residue - other) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    public operator fun times(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not multiply two residue different modulo" }
+        return IntModulo(
+            (residue * other.residue) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    public operator fun times(other: Int): IntModulo =
+        IntModulo(
+            (residue * other) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    public operator fun div(other: IntModulo): IntModulo {
+        require(modulus == other.modulus) { "can not divide two residue different modulo" }
+        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other.residue, modulus)
+        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
+        return IntModulo(
+            (residue * reciprocalCandidate) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    public operator fun div(other: Int): IntModulo {
+        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other, modulus)
+        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
+        return IntModulo(
+            (residue * reciprocalCandidate) % modulus,
+            modulus,
+            toCheckInput = false
+        )
+    }
+    override fun equals(other: Any?): Boolean =
+        when (other) {
+            is IntModulo -> residue == other.residue && modulus == other.modulus
+            else -> false
+        }
+
+    override fun hashCode(): Int = residue.hashCode()
+
+    override fun toString(): String = "$residue mod $modulus"
+}
+
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
+public class IntModuloRing : Ring<IntModulo> {
+
+    public val modulus: Int
+
+    public constructor(modulus: Int) {
+        require(modulus != 0) { "modulus can not be zero" }
+        this.modulus = if (modulus < 0) -modulus else modulus
+    }
+
+    override inline val zero: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
+    override inline val one: IntModulo get() = IntModulo(1, modulus, toCheckInput = false)
+
+    public fun number(arg: Int): IntModulo = IntModulo(arg, modulus, toCheckInput = false)
+
+    override inline fun add(left: IntModulo, right: IntModulo): IntModulo = left + right
+    override inline fun multiply(left: IntModulo, right: IntModulo): IntModulo = left * right
+
+    override inline fun IntModulo.unaryMinus(): IntModulo = -this
+    override inline fun IntModulo.plus(arg: IntModulo): IntModulo = this + arg
+    override inline fun IntModulo.minus(arg: IntModulo): IntModulo = this - arg
+    override inline fun IntModulo.times(arg: IntModulo): IntModulo = this * arg
+    public inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
+}
\ No newline at end of file
diff --git a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt b/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
new file mode 100644
index 000000000..32ca1c3aa
--- /dev/null
+++ b/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions.testUtils
+
+import space.kscience.kmath.functions.ListPolynomial
+import space.kscience.kmath.functions.Polynomial
+import space.kscience.kmath.functions.ListPolynomialSpace
+import space.kscience.kmath.functions.PolynomialSpaceOverRing
+
+
+public fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
+    ListPolynomial(coefs.map { IntModulo(it, ring.modulus) })
+public fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
+    ListPolynomial(coefs.map { IntModulo(it, modulus) })
+
+public fun IntModuloRing.m(arg: Int): IntModulo = IntModulo(arg, modulus)
+public fun PolynomialSpaceOverRing<IntModulo, *, IntModuloRing>.m(arg: Int): IntModulo = IntModulo(arg, ring.modulus)
\ No newline at end of file
diff --git a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt b/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt
new file mode 100644
index 000000000..ff67f19d8
--- /dev/null
+++ b/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions.testUtils
+
+import kotlin.math.abs
+
+
+internal data class BezoutIdentityWithGCD<T>(val first: T, val second: T, val gcd: T)
+
+internal tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
+
+internal fun bezoutIdentityWithGCD(a: Int, b: Int): BezoutIdentityWithGCD<Int> =
+    when {
+        a < 0 && b < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, -second, gcd) }
+        a < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, second, gcd) }
+        b < 0 -> with(bezoutIdentityWithGCDInternalLogic(a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(first, -second, gcd) }
+        else -> bezoutIdentityWithGCDInternalLogic(a, b, 1, 0, 0, 1)
+    }
+
+internal tailrec fun bezoutIdentityWithGCDInternalLogic(a: Int, b: Int, m1: Int, m2: Int, m3: Int, m4: Int): BezoutIdentityWithGCD<Int> =
+    if (b == 0) BezoutIdentityWithGCD(m1, m3, a)
+    else {
+        val quotient = a / b
+        val reminder = a % b
+        bezoutIdentityWithGCDInternalLogic(b, reminder, m2, m1 - quotient * m2, m4, m3 - quotient * m4)
+    }
\ No newline at end of file
diff --git a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt b/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
new file mode 100644
index 000000000..27b0eb21e
--- /dev/null
+++ b/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
+
+package space.kscience.kmath.functions.testUtils
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.NumbersAddOps
+
+@Suppress("NAME_SHADOWING")
+public class Rational {
+    public companion object {
+        public val ZERO: Rational = Rational(0L)
+        public val ONE: Rational = Rational(1L)
+    }
+
+    public val numerator: Long
+    public val denominator: Long
+
+    internal constructor(numerator: Long, denominator: Long, toCheckInput: Boolean = true) {
+        if (toCheckInput) {
+            if (denominator == 0L) throw ArithmeticException("/ by zero")
+
+            val greatestCommonDivider = gcd(numerator, denominator).let { if (denominator < 0L) -it else it }
+
+            this.numerator = numerator / greatestCommonDivider
+            this.denominator = denominator / greatestCommonDivider
+        } else {
+            this.numerator = numerator
+            this.denominator = denominator
+        }
+    }
+
+    public constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
+    public constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
+    public constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
+    public constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
+    public constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
+    public constructor(numerator: Long) : this(numerator, 1L, false)
+
+    public operator fun unaryPlus(): Rational = this
+    public operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
+    public operator fun plus(other: Rational): Rational {
+        val denominatorsGcd = gcd(denominator, other.denominator)
+        val dividedThisDenominator = denominator / denominatorsGcd
+        val dividedOtherDenominator = other.denominator / denominatorsGcd
+        val numeratorCandidate = numerator * dividedOtherDenominator + dividedThisDenominator * other.numerator
+        val secondGcd = gcd(numeratorCandidate, denominatorsGcd)
+        return Rational(
+            numeratorCandidate / secondGcd,
+            dividedThisDenominator * (other.denominator / secondGcd),
+            toCheckInput = false
+        )
+    }
+    public operator fun plus(other: Int): Rational =
+        Rational(
+            numerator + denominator * other.toLong(),
+            denominator,
+            toCheckInput = false
+        )
+    public operator fun plus(other: Long): Rational =
+        Rational(
+            numerator + denominator * other,
+            denominator,
+            toCheckInput = false
+        )
+    public operator fun minus(other: Rational): Rational {
+        val denominatorsGcd = gcd(denominator, other.denominator)
+        val dividedThisDenominator = denominator / denominatorsGcd
+        val dividedOtherDenominator = other.denominator / denominatorsGcd
+        val numeratorCandidate = numerator * dividedOtherDenominator - dividedThisDenominator * other.numerator
+        val secondGcd = gcd(numeratorCandidate, denominatorsGcd)
+        return Rational(
+            numeratorCandidate / secondGcd,
+            dividedThisDenominator * (other.denominator / secondGcd),
+            toCheckInput = false
+        )
+    }
+    public operator fun minus(other: Int): Rational =
+        Rational(
+            numerator - denominator * other.toLong(),
+            denominator,
+            toCheckInput = false
+        )
+    public operator fun minus(other: Long): Rational =
+        Rational(
+            numerator - denominator * other,
+            denominator,
+            toCheckInput = false
+        )
+    public operator fun times(other: Rational): Rational {
+        val thisDenominatorAndOtherNumeratorGcd = gcd(denominator, other.numerator)
+        val otherDenominatorAndThisNumeratorGcd = gcd(other.denominator, numerator)
+        return Rational(
+            (numerator / otherDenominatorAndThisNumeratorGcd) * (other.numerator / thisDenominatorAndOtherNumeratorGcd),
+            (denominator / thisDenominatorAndOtherNumeratorGcd) * (other.denominator / otherDenominatorAndThisNumeratorGcd),
+            toCheckInput = false
+        )
+    }
+    public operator fun times(other: Int): Rational {
+        val other = other.toLong()
+        val denominatorAndOtherGcd = gcd(denominator, other)
+        return Rational(
+            numerator * (other / denominatorAndOtherGcd),
+            denominator / denominatorAndOtherGcd,
+            toCheckInput = false
+        )
+    }
+    public operator fun times(other: Long): Rational {
+        val denominatorAndOtherGcd = gcd(denominator, other)
+        return Rational(
+            numerator * (other / denominatorAndOtherGcd),
+            denominator / denominatorAndOtherGcd,
+            toCheckInput = false
+        )
+    }
+    public operator fun div(other: Rational): Rational {
+        val denominatorsGcd = gcd(denominator, other.denominator)
+        val numeratorsGcd = gcd(numerator, other.numerator)
+        return Rational(
+            (numerator / numeratorsGcd) * (other.denominator / denominatorsGcd),
+            (denominator / denominatorsGcd) * (other.numerator / numeratorsGcd)
+        )
+    }
+    public operator fun div(other: Int): Rational {
+        val other = other.toLong()
+        val numeratorAndOtherGcd = gcd(numerator, other)
+        return Rational(
+            numerator / numeratorAndOtherGcd,
+            denominator * (other / numeratorAndOtherGcd),
+            toCheckInput = false
+        )
+    }
+    public operator fun div(other: Long): Rational {
+        val numeratorAndOtherGcd = gcd(numerator, other)
+        return Rational(
+            numerator / numeratorAndOtherGcd,
+            denominator * (other / numeratorAndOtherGcd),
+            toCheckInput = false
+        )
+    }
+    override fun equals(other: Any?): Boolean =
+        when (other) {
+            is Rational -> numerator == other.numerator && denominator == other.denominator
+            is Int -> numerator == other && denominator == 1L
+            is Long -> numerator == other && denominator == 1L
+            else -> false
+        }
+
+    override fun hashCode(): Int = 31 * numerator.hashCode() + denominator.hashCode()
+
+    override fun toString(): String = if (denominator == 1L) "$numerator" else "$numerator/$denominator"
+}
+
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
+@OptIn(UnstableKMathAPI::class)
+public object RationalField : Field<Rational>, NumbersAddOps<Rational> {
+    override inline val zero: Rational get() = Rational.ZERO
+    override inline val one: Rational get() = Rational.ONE
+
+    override inline fun number(value: Number): Rational = Rational(value.toLong())
+
+    override inline fun add(left: Rational, right: Rational): Rational = left + right
+    override inline fun multiply(left: Rational, right: Rational): Rational = left * right
+    override inline fun divide(left: Rational, right: Rational): Rational = left / right
+    override inline fun scale(a: Rational, value: Double): Rational = a * number(value)
+
+    override inline fun Rational.unaryMinus(): Rational = -this
+    override inline fun Rational.plus(arg: Rational): Rational = this + arg
+    override inline fun Rational.minus(arg: Rational): Rational = this - arg
+    override inline fun Rational.times(arg: Rational): Rational = this * arg
+    override inline fun Rational.div(arg: Rational): Rational = this / arg
+}
\ No newline at end of file
diff --git a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt b/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
index 9ca5f43a3..5d0b77aa8 100644
--- a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
+++ b/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
@@ -91,7 +91,6 @@ public fun assertEquals(
     )
 }
 
-// FIXME: Don't understand why but the same function from test-utils-functions module can not be used
 public inline fun <reified T : Throwable> assertFailsWithTypeAndMessage(
     expectedMessage: String? = null,
     assertionMessage: String? = null,
-- 
2.34.1


From 5bc627f1d414730c2b2383a179edf290f6e5a47f Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 12 Jul 2022 01:56:34 +0300
Subject: [PATCH 564/713] Rollback all breaking changes. The only breaking
 change now is value class.

---
 .../kscience/kmath/functions/Piecewise.kt     |  8 ++--
 .../kscience/kmath/functions/Polynomial.kt    | 24 +++-------
 .../kmath/functions/polynomialUtil.kt         | 32 ++++---------
 .../kmath/integration/SplineIntegrator.kt     |  3 +-
 .../kmath/interpolation/Interpolator.kt       |  4 +-
 .../kmath/functions/PolynomialUtilTest.kt     | 46 +++++++++----------
 6 files changed, 45 insertions(+), 72 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index cfd21d552..16af7f555 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -117,16 +117,16 @@ public fun <T : Comparable<T>> PiecewisePolynomial(
  * Return a value of polynomial function with given [ring] a given [arg] or null if argument is outside piecewise
  * definition.
  */
-public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.substitute(ring: C, arg: T): T? =
-    findPiece(arg)?.substitute(ring, arg)
+public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.value(ring: C, arg: T): T? =
+    findPiece(arg)?.value(ring, arg)
 
 /**
  * Convert this polynomial to a function returning nullable value (null if argument is outside piecewise range).
  */
-public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C): (T) -> T? = { substitute(ring, it) }
+public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C): (T) -> T? = { value(ring, it) }
 
 /**
  * Convert this polynomial to a function using [defaultValue] for arguments outside the piecewise range.
  */
 public fun <T : Comparable<T>, C : Ring<T>> PiecewisePolynomial<T>.asFunction(ring: C, defaultValue: T): (T) -> T =
-    { substitute(ring, it) ?: defaultValue }
+    { value(ring, it) ?: defaultValue }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 061f556f6..bfb378cce 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -59,12 +59,12 @@ public value class Polynomial<C>(
  * @param A type of provided underlying ring of constants. It's [Ring] of [C].
  * @param ring underlying ring of constants of type [A].
  */
-public open class PolynomialSpace<C, A : Ring<C>>(
+public open class PolynomialSpace<C, A>(
     /**
      * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
      */
     public val ring: A,
-) : Ring<Polynomial<C>> {
+) : Ring<Polynomial<C>>, ScaleOperations<Polynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
 
     /**
      * Instance of zero constant (zero of the underlying ring).
@@ -267,13 +267,15 @@ public open class PolynomialSpace<C, A : Ring<C>>(
 
     override fun add(left: Polynomial<C>, right: Polynomial<C>): Polynomial<C> = left + right
     override fun multiply(left: Polynomial<C>, right: Polynomial<C>): Polynomial<C> = left * right
+    override fun scale(a: Polynomial<C>, value: Double): Polynomial<C> =
+        ring { Polynomial(a.coefficients.map { scale(it, value) }) }
 
     // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
     //  [ListPolynomialSpace] as a context receiver
     /**
      * Evaluates value of [this] polynomial on provided [argument].
      */
-    public inline fun Polynomial<C>.substitute(argument: C): C = substitute(ring, argument)
+    public inline fun Polynomial<C>.substitute(argument: C): C = value(ring, argument)
 
     /**
      * Represent [this] polynomial as a regular context-less function.
@@ -283,19 +285,5 @@ public open class PolynomialSpace<C, A : Ring<C>>(
     /**
      * Evaluates value of [this] polynomial on provided [argument].
      */
-    public inline operator fun Polynomial<C>.invoke(argument: C): C = substitute(ring, argument)
-}
-
-/**
- * Space of polynomials constructed over ring.
- *
- * @param C the type of constants. Polynomials have them as a coefficients in their terms.
- * @param A type of underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
- */
-public class ScalablePolynomialSpace<C, A>(
-    ring: A,
-) : PolynomialSpace<C, A>(ring), ScaleOperations<Polynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
-    override fun scale(a: Polynomial<C>, value: Double): Polynomial<C> =
-        ring { Polynomial(a.coefficients.map { scale(it, value) }) }
+    public inline operator fun Polynomial<C>.invoke(argument: C): C = value(ring, argument)
 }
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index 0e1259bee..f745bf6e4 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -16,36 +16,22 @@ import kotlin.math.pow
 /**
  * Creates a [PolynomialSpace] over a received ring.
  */
-public inline val <C, A : Ring<C>> A.polynomialSpace: PolynomialSpace<C, A>
+public inline val <C, A> A.polynomialSpace: PolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C>
     get() = PolynomialSpace(this)
 
 /**
  * Creates a [PolynomialSpace]'s scope over a received ring.
  */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
-public inline fun <C, A : Ring<C>, R> A.polynomialSpace(block: PolynomialSpace<C, A>.() -> R): R {
+public inline fun <C, A, R> A.polynomialSpace(block: PolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
     return PolynomialSpace(this).block()
 }
 
-/**
- * Creates a [ScalablePolynomialSpace] over a received scalable ring.
- */
-public inline val <C, A> A.scalablePolynomialSpace: ScalablePolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C>
-    get() = ScalablePolynomialSpace(this)
-
-/**
- * Creates a [ScalablePolynomialSpace]'s scope over a received scalable ring.
- */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
-public inline fun <C, A, R> A.scalablePolynomialSpace(block: ScalablePolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ScalablePolynomialSpace(this).block()
-}
-
 
 /**
  * Evaluates value of [this] Double polynomial on provided Double argument.
  */
-public fun Polynomial<Double>.substitute(arg: Double): Double =
+public fun Polynomial<Double>.value(arg: Double): Double =
     coefficients.reduceIndexedOrNull { index, acc, c ->
         acc + c * arg.pow(index)
     } ?: .0
@@ -55,7 +41,7 @@ public fun Polynomial<Double>.substitute(arg: Double): Double =
  *
  * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
  */
-public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
+public fun <C> Polynomial<C>.value(ring: Ring<C>, arg: C): C = ring {
     if (coefficients.isEmpty()) return zero
     var result: C = coefficients.last()
     for (j in coefficients.size - 2 downTo 0) {
@@ -67,13 +53,13 @@ public fun <C> Polynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
 /**
  * Represent [this] polynomial as a regular context-less function.
  */
-public fun <C, A : Ring<C>> Polynomial<C>.asFunctionOver(ring: A): (C) -> C = { substitute(ring, it) }
+public fun <C, A : Ring<C>> Polynomial<C>.asFunctionOver(ring: A): (C) -> C = { value(ring, it) }
 
 /**
  * Returns algebraic derivative of received polynomial.
  */
 @UnstableKMathAPI
-public fun <C, A> Polynomial<C>.derivative(
+public fun <C, A> Polynomial<C>.differentiate(
     ring: A,
 ): Polynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = ring {
     Polynomial(
@@ -87,7 +73,7 @@ public fun <C, A> Polynomial<C>.derivative(
  * Returns algebraic antiderivative of received polynomial.
  */
 @UnstableKMathAPI
-public fun <C, A> Polynomial<C>.antiderivative(
+public fun <C, A> Polynomial<C>.integrate(
     ring: A,
 ): Polynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = ring {
     Polynomial(
@@ -106,6 +92,6 @@ public fun <C : Comparable<C>> Polynomial<C>.integrate(
     ring: Field<C>,
     range: ClosedRange<C>,
 ): C {
-    val antiderivative = antiderivative(ring)
-    return ring { antiderivative.substitute(ring, range.endInclusive) - antiderivative.substitute(ring, range.start) }
+    val antiderivative = integrate(ring)
+    return ring { antiderivative.value(ring, range.endInclusive) - antiderivative.value(ring, range.start) }
 }
\ No newline at end of file
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index 0fcd4c6e5..eb88d9ae0 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -7,7 +7,6 @@ package space.kscience.kmath.integration
 
 import space.kscience.kmath.functions.PiecewisePolynomial
 import space.kscience.kmath.functions.integrate
-import space.kscience.kmath.functions.antiderivative
 import space.kscience.kmath.interpolation.PolynomialInterpolator
 import space.kscience.kmath.interpolation.SplineInterpolator
 import space.kscience.kmath.interpolation.interpolatePolynomials
@@ -24,7 +23,7 @@ import space.kscience.kmath.structures.MutableBufferFactory
 @OptIn(PerformancePitfall::class)
 @UnstableKMathAPI
 public fun <T : Comparable<T>> PiecewisePolynomial<T>.integrate(algebra: Field<T>): PiecewisePolynomial<T> =
-    PiecewisePolynomial(pieces.map { it.first to it.second.antiderivative(algebra) })
+    PiecewisePolynomial(pieces.map { it.first to it.second.integrate(algebra) })
 
 /**
  * Compute definite integral of given [PiecewisePolynomial] piece by piece in a given [range]
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
index 62819be0c..2266092a3 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
@@ -10,7 +10,7 @@ package space.kscience.kmath.interpolation
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.functions.PiecewisePolynomial
 import space.kscience.kmath.functions.asFunction
-import space.kscience.kmath.functions.substitute
+import space.kscience.kmath.functions.value
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.structures.Buffer
@@ -34,7 +34,7 @@ public interface PolynomialInterpolator<T : Comparable<T>> : Interpolator<T, T,
     public fun interpolatePolynomials(points: XYColumnarData<T, T, T>): PiecewisePolynomial<T>
 
     override fun interpolate(points: XYColumnarData<T, T, T>): (T) -> T = { x ->
-        interpolatePolynomials(points).substitute(algebra, x) ?: getDefaultValue()
+        interpolatePolynomials(points).value(algebra, x) ?: getDefaultValue()
     }
 }
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
index 820b487b4..9d0fe4cc3 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
@@ -15,119 +15,119 @@ import kotlin.test.assertEquals
 @OptIn(UnstableKMathAPI::class)
 class PolynomialUtilTest {
     @Test
-    fun test_Polynomial_substitute_Double() {
+    fun test_Polynomial_value_Double() {
         assertEquals(
             0.0,
-            Polynomial(1.0, -2.0, 1.0).substitute(1.0),
+            Polynomial(1.0, -2.0, 1.0).value(1.0),
             0.001,
             "test 1"
         )
         assertEquals(
             0.0,
-            Polynomial(1.0, -2.0, 1.0).substitute(1.0),
+            Polynomial(1.0, -2.0, 1.0).value(1.0),
             0.001,
             "test 1"
         )
         assertEquals(
             1.1931904761904761,
-            Polynomial(0.625, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
+            Polynomial(0.625, 2.6666666666666665, 0.5714285714285714, 1.5).value(0.2),
             0.001,
             "test 2"
         )
         assertEquals(
             0.5681904761904762,
-            Polynomial(0.0, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
+            Polynomial(0.0, 2.6666666666666665, 0.5714285714285714, 1.5).value(0.2),
             0.001,
             "test 3"
         )
         assertEquals(
             1.1811904761904761,
-            Polynomial(0.625, 2.6666666666666665, 0.5714285714285714, 0.0).substitute(0.2),
+            Polynomial(0.625, 2.6666666666666665, 0.5714285714285714, 0.0).value(0.2),
             0.001,
             "test 4"
         )
         assertEquals(
             1.1703333333333332,
-            Polynomial(0.625, 2.6666666666666665, 0.0, 1.5).substitute(0.2),
+            Polynomial(0.625, 2.6666666666666665, 0.0, 1.5).value(0.2),
             0.001,
             "test 5"
         )
     }
     @Test
-    fun test_Polynomial_substitute_Constant() {
+    fun test_Polynomial_value_Constant() {
         assertEquals(
             Rational(0),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, Rational(1)),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).value(RationalField, Rational(1)),
             "test 1"
         )
         assertEquals(
             Rational(25057, 21000),
             Polynomial(Rational(5, 8), Rational(8, 3), Rational(4, 7), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
+                .value(RationalField, Rational(1, 5)),
             "test 2"
         )
         assertEquals(
             Rational(2983, 5250),
             Polynomial(Rational(0), Rational(8, 3), Rational(4, 7), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
+                .value(RationalField, Rational(1, 5)),
             "test 3"
         )
         assertEquals(
             Rational(4961, 4200),
             Polynomial(Rational(5, 8), Rational(8, 3), Rational(4, 7), Rational(0))
-                .substitute(RationalField, Rational(1, 5)),
+                .value(RationalField, Rational(1, 5)),
             "test 4"
         )
         assertEquals(
             Rational(3511, 3000),
             Polynomial(Rational(5, 8), Rational(8, 3), Rational(0), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
+                .value(RationalField, Rational(1, 5)),
             "test 5"
         )
     }
     @Test
-    fun test_Polynomial_derivative() {
+    fun test_Polynomial_differentiate() {
         assertEquals(
             Polynomial(Rational(-2), Rational(2)),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).derivative(RationalField),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).differentiate(RationalField),
             "test 1"
         )
         assertEquals(
             Polynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
-            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).differentiate(RationalField),
             "test 2"
         )
         assertEquals(
             Polynomial(Rational(0), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
-            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
+            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).differentiate(RationalField),
             "test 3"
         )
         assertEquals(
             Polynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(0)),
-            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).derivative(RationalField),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).differentiate(RationalField),
             "test 4"
         )
     }
     @Test
-    fun test_Polynomial_antiderivative() {
+    fun test_Polynomial_integrate() {
         assertEquals(
             Polynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
-            Polynomial(Rational(1), Rational(-2), Rational(1)).antiderivative(RationalField),
+            Polynomial(Rational(1), Rational(-2), Rational(1)).integrate(RationalField),
             "test 1"
         )
         assertEquals(
             Polynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
-            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).integrate(RationalField),
             "test 2"
         )
         assertEquals(
             Polynomial(Rational(0), Rational(0), Rational(0), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
-            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
+            Polynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).integrate(RationalField),
             "test 3"
         )
         assertEquals(
             Polynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(0)),
-            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).antiderivative(RationalField),
+            Polynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).integrate(RationalField),
             "test 4"
         )
     }
-- 
2.34.1


From f7d159bc036d2fa2496906e612db67fa6ce42e06 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 12 Jul 2022 02:05:29 +0300
Subject: [PATCH 565/713] Made IntModulo implement ScaleOperations.

---
 .../space/kscience/kmath/functions/testUtils/IntModulo.kt    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
index 933c4dc4c..21095d858 100644
--- a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
+++ b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
@@ -8,6 +8,7 @@
 package space.kscience.kmath.functions.testUtils
 
 import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.ScaleOperations
 
 
 public class IntModulo {
@@ -108,7 +109,7 @@ public class IntModulo {
 }
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
-public class IntModuloRing : Ring<IntModulo> {
+public class IntModuloRing : Ring<IntModulo>, ScaleOperations<IntModulo> {
 
     public val modulus: Int
 
@@ -130,4 +131,6 @@ public class IntModuloRing : Ring<IntModulo> {
     override inline fun IntModulo.minus(arg: IntModulo): IntModulo = this - arg
     override inline fun IntModulo.times(arg: IntModulo): IntModulo = this * arg
     public inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
+
+    override fun scale(a: IntModulo, value: Double): IntModulo = a * value.toInt()
 }
\ No newline at end of file
-- 
2.34.1


From 0eb9bd810c26fffff4f4542cf256f643a6279cc2 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 12 Jul 2022 22:56:08 +0300
Subject: [PATCH 566/713] Kotlin 1.7.10

---
 .space.kts        | 2 +-
 gradle.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.space.kts b/.space.kts
index d70ad6d59..c9500e967 100644
--- a/.space.kts
+++ b/.space.kts
@@ -1,3 +1,3 @@
 job("Build") {
     gradlew("openjdk:11", "build")
-}
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 5202289fa..6b45ee49f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,4 +12,4 @@ org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.11.7-kotlin-1.7.0
+toolsVersion=0.11.8-kotlin-1.7.10
-- 
2.34.1


From 87aeda84d9fcbbed2a250695010fb7f254acb276 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 12 Jul 2022 23:10:38 +0300
Subject: [PATCH 567/713] Added MathJax to docs.

---
 kmath-functions/build.gradle.kts                   |  4 ++++
 .../space/kscience/kmath/functions/Polynomial.kt   | 10 +++++++---
 kmath-polynomial/build.gradle.kts                  |  4 ++++
 .../LabeledPolynomial.kt                           | 13 +++++++++----
 .../ListPolynomial.kt                              |  9 ++++++---
 .../NumberedPolynomial.kt                          | 13 +++++++------
 .../labeledConstructors.kt                         | 14 +++++++++-----
 .../numberedConstructors.kt                        | 12 ++++++++----
 8 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/kmath-functions/build.gradle.kts b/kmath-functions/build.gradle.kts
index 0a8e8a1be..149a8f277 100644
--- a/kmath-functions/build.gradle.kts
+++ b/kmath-functions/build.gradle.kts
@@ -19,6 +19,10 @@ kotlin.sourceSets {
     }
 }
 
+dependencies {
+    dokkaPlugin("org.jetbrains.dokka:mathjax-plugin:${versionCatalogs.named("npmlibs").findVersion("dokka").get().requiredVersion}")
+}
+
 readme {
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index bfb378cce..1e811d3ba 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -23,8 +23,10 @@ import kotlin.math.min
 @JvmInline
 public value class Polynomial<C>(
     /**
-     * List that contains coefficients of the polynomial. Every monomial `a x^d` is stored as a coefficient `a` placed
-     * into the list at index `d`. For example, coefficients of a polynomial `5 x^2 - 6` can be represented as
+     * List that contains coefficients of the polynomial.
+     *
+     * Every monomial \(a x^d\) is stored as a coefficient \(a\) placed
+     * into the list at index \(d\). For example, coefficients of a polynomial \(5 x^2 - 6\) can be represented as
      * ```
      * listOf(
      *     -6, // -6 +
@@ -42,9 +44,11 @@ public value class Polynomial<C>(
      *     0,  // 0 x^4
      * )
      * ```
-     * It is not prohibited to put extra zeros at end of the list (as for `0x^3` and `0x^4` in the example). But the
+     * It is not prohibited to put extra zeros at end of the list (as for \(0x^3\) and \(0x^4\) in the example). But the
      * longer the coefficients list the worse performance of arithmetical operations performed on it. Thus, it is
      * recommended not to put (or even to remove) extra (or useless) coefficients at the end of the coefficients list.
+     *
+     * @usesMathJax
      */
     public val coefficients: List<C>
 ) {
diff --git a/kmath-polynomial/build.gradle.kts b/kmath-polynomial/build.gradle.kts
index dcfcb1b46..b0f4a095c 100644
--- a/kmath-polynomial/build.gradle.kts
+++ b/kmath-polynomial/build.gradle.kts
@@ -20,6 +20,10 @@ kotlin.sourceSets {
     }
 }
 
+dependencies {
+    dokkaPlugin("org.jetbrains.dokka:mathjax-plugin:${versionCatalogs.named("npmlibs").findVersion("dokka").get().requiredVersion}")
+}
+
 readme {
     maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
index 7f107a87f..12bf9f839 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
@@ -25,9 +25,9 @@ internal constructor(
     /**
      * Map that contains coefficients of the polynomial.
      *
-     * Every monomial `a x_1^{d_1} ... x_n^{d_n}` is stored as a pair "key-value" in the map, where the value is the
-     * coefficient `a` and the key is a map that associates variables in the monomial with their degree in the monomial.
-     * For example, coefficients of a polynomial `5 a^2 c^3 - 6 b` can be represented as
+     * Every monomial \(a x_1^{d_1} ... x_n^{d_n}\) is stored as a pair "key-value" in the map, where the value is the
+     * coefficient \(a\) and the key is a map that associates variables in the monomial with their degree in the monomial.
+     * For example, coefficients of a polynomial \(5 a^2 c^3 - 6 b\) can be represented as
      * ```
      * mapOf(
      *      mapOf(
@@ -55,7 +55,12 @@ internal constructor(
      *      ) to 0
      * )
      * ```
-     * where `a`, `b` and `c` are corresponding [Symbol] objects.
+     * where \(a\), \(b\) and \(c\) are corresponding [Symbol] objects.
+     *
+     * It is not prohibited to put extra zero monomials into the map (as for \(0 b c\) in the example). But the
+     * bigger the coefficients map the worse performance of arithmetical operations performed on it. Thus, it is
+     * recommended not to put (or even to remove) extra (or useless) monomials in the coefficients map.
+     * @usesMathJax
      */
     public val coefficients: Map<Map<Symbol, UInt>, C>
 ) : Polynomial<C> {
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt
index 76e1a6bb6..91b9c7658 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt
@@ -21,8 +21,10 @@ import kotlin.math.min
  */
 public data class ListPolynomial<C>(
     /**
-     * List that contains coefficients of the polynomial. Every monomial `a x^d` is stored as a coefficient `a` placed
-     * into the list at index `d`. For example, coefficients of a polynomial `5 x^2 - 6` can be represented as
+     * List that contains coefficients of the polynomial.
+     *
+     * Every monomial \(a x^d\) is stored as a coefficient \(a\) placed
+     * into the list at index \(d\). For example, coefficients of a polynomial \(5 x^2 - 6\) can be represented as
      * ```
      * listOf(
      *     -6, // -6 +
@@ -40,9 +42,10 @@ public data class ListPolynomial<C>(
      *     0,  // 0 x^4
      * )
      * ```
-     * It is not prohibited to put extra zeros at end of the list (as for `0x^3` and `0x^4` in the example). But the
+     * It is not prohibited to put extra zeros at end of the list (as for \(0x^3\) and \(0x^4\) in the example). But the
      * longer the coefficients list the worse performance of arithmetical operations performed on it. Thus, it is
      * recommended not to put (or even to remove) extra (or useless) coefficients at the end of the coefficients list.
+     * @usesMathJax
      */
     public val coefficients: List<C>
 ) : Polynomial<C> {
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
index f7dd9d8de..96c96e555 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
@@ -24,9 +24,9 @@ internal constructor(
     /**
      * Map that contains coefficients of the polynomial.
      *
-     * Every monomial `a x_1^{d_1} ... x_n^{d_n}` is stored as a pair "key-value" in the map, where the value is the
-     * coefficient `a` and the key is a list that associates index of every variable in the monomial with their degree
-     * in the monomial. For example, coefficients of a polynomial `5 x_1^2 x_3^3 - 6 x_2` can be represented as
+     * Every monomial \(a x_1^{d_1} ... x_n^{d_n}\) is stored as a pair "key-value" in the map, where the value is the
+     * coefficient \(a\) and the key is a list that associates index of every variable in the monomial with their degree
+     * in the monomial. For example, coefficients of a polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be represented as
      * ```
      * mapOf(
      *      listOf(2, 0, 3) to 5, // 5 x_1^2 x_3^3 +
@@ -41,9 +41,10 @@ internal constructor(
      *      listOf(0, 1, 1) to 0, // 0 x_2^1 x_3^1
      * )
      * ```
-     * It is not prohibited to put extra zero monomials into the map (as for `0 x_2 x_3` in the example). But the
+     * It is not prohibited to put extra zero monomials into the map (as for \(0 x_2 x_3\) in the example). But the
      * bigger the coefficients map the worse performance of arithmetical operations performed on it. Thus, it is
      * recommended not to put (or even to remove) extra (or useless) monomials in the coefficients map.
+     * @usesMathJax
      */
     public val coefficients: Map<List<UInt>, C>
 ) : Polynomial<C> {
@@ -325,7 +326,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
 
     /**
      * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `-1`.
+     * the result is -1.
      */
     public val NumberedPolynomial<C>.lastVariable: Int
         get() = coefficients.keys.maxOfOrNull { degs -> degs.lastIndex } ?: -1
@@ -365,7 +366,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
         } ?: 0u
     /**
      * Count of variables occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `0`.
+     * the result is 0.
      */
     public val NumberedPolynomial<C>.countOfVariables: Int
         get() =
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
index 819a36449..d23efc5c2 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
@@ -262,7 +262,7 @@ public inline fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPo
 /**
  * Marks DSL that allows to more simply create [LabeledPolynomial]s with good performance.
  *
- * For example, polynomial `5 a^2 c^3 - 6 b` can be described as
+ * For example, polynomial \(5 a^2 c^3 - 6 b\) can be described as
  * ```
  * Int.algebra {
  *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
@@ -271,6 +271,7 @@ public inline fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPo
  *     }
  * }
  * ```
+ * @usesMathJax
  */
 @DslMarker
 @UnstableKMathAPI
@@ -385,7 +386,7 @@ public class DSL1LabeledPolynomialBuilder<C>(
 ///**
 // * Creates [LabeledPolynomial] with lambda [block] in context of [this] ring of constants.
 // *
-// * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+// * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
 // * ```
 // * Int.algebra {
 // *     val LabeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomial {
@@ -394,6 +395,7 @@ public class DSL1LabeledPolynomialBuilder<C>(
 // *     }
 // * }
 // * ```
+// * @usesMathJax
 // */
 // FIXME: For now this fabric does not let next two fabrics work. (See KT-52803.) Possible feature solutions:
 //  1. `LowPriorityInOverloadResolution` becomes public. Then it should be applied to this function.
@@ -404,7 +406,7 @@ public class DSL1LabeledPolynomialBuilder<C>(
 /**
  * Creates [LabeledPolynomial] with lambda [block] in context of [this] ring of [LabeledPolynomial]s.
  *
- * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+ * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
  * ```
  * Int.algebra {
  *     val LabeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomial {
@@ -413,14 +415,15 @@ public class DSL1LabeledPolynomialBuilder<C>(
  *     }
  * }
  * ```
+ * @usesMathJax
  */
 @UnstableKMathAPI
 public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomialDSL1(initialCapacity: Int = 0, block: DSL1LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = DSL1LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 /**
  * Creates [LabeledPolynomial] with lambda [block] in context of [this] field of [LabeledRationalFunction]s.
  *
- * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
- * ```
+ * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
+ * ``
  * Int.algebra {
  *     val LabeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomial {
  *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
@@ -428,6 +431,7 @@ public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial
  *     }
  * }
  * ```
+ * @usesMathJax
  */
 @UnstableKMathAPI
 public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomialDSL1(initialCapacity: Int = 0, block: DSL1LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = DSL1LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
index 8d2c9e617..051019159 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
@@ -243,7 +243,7 @@ public inline fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = Numbere
 /**
  * Marks DSL that allows to more simply create [NumberedPolynomial]s with good performance.
  *
- * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+ * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
  * ```
  * Int.algebra {
  *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
@@ -252,6 +252,7 @@ public inline fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = Numbere
  *     }
  * }
  * ```
+ * @usesMathJax
  */
 @DslMarker
 @UnstableKMathAPI
@@ -372,7 +373,7 @@ public class DSL1NumberedPolynomialBuilder<C>(
 ///**
 // * Creates [NumberedPolynomial] with lambda [block] in context of [this] ring of constants.
 // *
-// * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+// * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
 // * ```
 // * Int.algebra {
 // *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
@@ -381,6 +382,7 @@ public class DSL1NumberedPolynomialBuilder<C>(
 // *     }
 // * }
 // * ```
+// * @usesMathJax
 // */
 // FIXME: For now this fabric does not let next two fabrics work. (See KT-52803.) Possible feature solutions:
 //  1. `LowPriorityInOverloadResolution` becomes public. Then it should be applied to this function.
@@ -391,7 +393,7 @@ public class DSL1NumberedPolynomialBuilder<C>(
 /**
  * Creates [NumberedPolynomial] with lambda [block] in context of [this] ring of [NumberedPolynomial]s.
  *
- * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+ * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
  * ```
  * Int.algebra {
  *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
@@ -400,13 +402,14 @@ public class DSL1NumberedPolynomialBuilder<C>(
  *     }
  * }
  * ```
+ * @usesMathJax
  */
 @UnstableKMathAPI
 public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomialDSL1(initialCapacity: Int = 0, block: DSL1NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = DSL1NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 /**
  * Creates [NumberedPolynomial] with lambda [block] in context of [this] field of [NumberedRationalFunction]s.
  *
- * For example, polynomial `5 x_1^2 x_3^3 - 6 x_2` can be described as
+ * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
  * ```
  * Int.algebra {
  *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
@@ -415,6 +418,7 @@ public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomi
  *     }
  * }
  * ```
+ * @usesMathJax
  */
 @UnstableKMathAPI
 public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomialDSL1(initialCapacity: Int = 0, block: DSL1NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = DSL1NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
-- 
2.34.1


From 4ea29c82c5abcc079123bd964f77ac4ea0e307a8 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 13 Jul 2022 12:05:53 +0300
Subject: [PATCH 568/713] Small fix of DSL1.

---
 .../kscience/kmath/functions/polynomials.kt   |  4 +-
 .../labeledConstructors.kt                    | 40 +++++++++----------
 .../numberedConstructors.kt                   | 36 ++++++++---------
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
index 4151b0283..c65ca589d 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
@@ -107,8 +107,8 @@ fun numberedPolynomialsExample() {
             // Also there is DSL for constructing NumberedPolynomials:
             val polynomial5: NumberedPolynomial<Int> = NumberedPolynomialDSL1 {
                 3 {}
-                5 { 2 inPowerOf 1u }
-                -7 with { 1 pow 2u; 3 pow 1u }
+                5 { 1 inPowerOf 1u }
+                -7 with { 0 pow 2u; 2 pow 1u }
                 // `pow` and `inPowerOf` are the same
                 // `with` is omittable
             }
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
index d23efc5c2..aa44660c1 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
@@ -265,7 +265,7 @@ public inline fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPo
  * For example, polynomial \(5 a^2 c^3 - 6 b\) can be described as
  * ```
  * Int.algebra {
- *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
+ *     val labeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomialDSL1 {
  *         5 { a inPowerOf 2u; c inPowerOf 3u } // 5 a^2 c^3 +
  *         (-6) { b inPowerOf 1u }              // (-6) b^1
  *     }
@@ -339,18 +339,18 @@ public class DSL1LabeledPolynomialBuilder<C>(
     /**
      * Initial capacity of coefficients map.
      */
-    initialCapacity: Int = 0
+    initialCapacity: Int? = null
 ) {
     /**
      * Coefficients storage. Any declaration of any monomial updates the storage.
      * Afterward the storage will be used as a resulting coefficients map.
      */
-    private val coefficients: MutableMap<Map<Symbol, UInt>, C> = LinkedHashMap(initialCapacity)
+    private val coefficients: MutableMap<Map<Symbol, UInt>, C> = if (initialCapacity != null) LinkedHashMap(initialCapacity) else LinkedHashMap()
 
     /**
      * Builds the resulting coefficients map.
      *
-     * In fact, it just returns [coefficients] as regular coefficients map of type `Map<List<UInt>, C>`.
+     * In fact, it just returns [coefficients] as regular coefficients map of type `Map<Map<Symbol, UInt>, C>`.
      */
     @PublishedApi
     internal fun build(): LabeledPolynomial<C> = LabeledPolynomial<C>(coefficients)
@@ -386,12 +386,12 @@ public class DSL1LabeledPolynomialBuilder<C>(
 ///**
 // * Creates [LabeledPolynomial] with lambda [block] in context of [this] ring of constants.
 // *
-// * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
+// * For example, polynomial \(5 a^2 c^3 - 6 b\) can be described as
 // * ```
 // * Int.algebra {
-// *     val LabeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomial {
-// *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
-// *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+// *     val labeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomialDSL1 {
+// *         5 { a inPowerOf 2u; c inPowerOf 3u } // 5 a^2 c^3 +
+// *         (-6) { b inPowerOf 1u }              // (-6) b^1
 // *     }
 // * }
 // * ```
@@ -402,39 +402,39 @@ public class DSL1LabeledPolynomialBuilder<C>(
 //  2. Union types are implemented. Then all three functions should be rewritten
 //     as one with single union type as a (context) receiver.
 //@UnstableKMathAPI
-//public inline fun <C, A: Ring<C>> A.LabeledPolynomialDSL1(initialCapacity: Int = 0, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(::add, initialCapacity).apply(block).build()
+//public inline fun <C, A: Ring<C>> A.LabeledPolynomialDSL1(initialCapacity: Int? = null, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(::add, initialCapacity).apply(block).build()
 /**
  * Creates [LabeledPolynomial] with lambda [block] in context of [this] ring of [LabeledPolynomial]s.
  *
- * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
+ * For example, polynomial \(5 a^2 c^3 - 6 b\) can be described as
  * ```
  * Int.algebra {
- *     val LabeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomial {
- *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
- *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+ *     val labeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomialDSL1 {
+ *         5 { a inPowerOf 2u; c inPowerOf 3u } // 5 a^2 c^3 +
+ *         (-6) { b inPowerOf 1u }              // (-6) b^1
  *     }
  * }
  * ```
  * @usesMathJax
  */
 @UnstableKMathAPI
-public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomialDSL1(initialCapacity: Int = 0, block: DSL1LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = DSL1LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomialDSL1(initialCapacity: Int? = null, block: DSL1LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = DSL1LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 /**
  * Creates [LabeledPolynomial] with lambda [block] in context of [this] field of [LabeledRationalFunction]s.
  *
- * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
- * ``
+ * For example, polynomial \(5 a^2 c^3 - 6 b\) can be described as
+ * ```
  * Int.algebra {
- *     val LabeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomial {
- *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
- *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+ *     val labeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomialDSL1 {
+ *         5 { a inPowerOf 2u; c inPowerOf 3u } // 5 a^2 c^3 +
+ *         (-6) { b inPowerOf 1u }              // (-6) b^1
  *     }
  * }
  * ```
  * @usesMathJax
  */
 @UnstableKMathAPI
-public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomialDSL1(initialCapacity: Int = 0, block: DSL1LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = DSL1LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomialDSL1(initialCapacity: Int? = null, block: DSL1LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = DSL1LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
index 051019159..ce0db3d17 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
@@ -243,12 +243,12 @@ public inline fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = Numbere
 /**
  * Marks DSL that allows to more simply create [NumberedPolynomial]s with good performance.
  *
- * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
+ * For example, polynomial \(5 x_0^2 x_2^3 - 6 x_1\) can be described as
  * ```
  * Int.algebra {
  *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
- *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
- *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+ *         5 { 0 inPowerOf 2u; 2 inPowerOf 3u } // 5 x_0^2 x_2^3 +
+ *         (-6) { 1 inPowerOf 1u }              // (-6) x_1^1
  *     }
  * }
  * ```
@@ -285,7 +285,7 @@ public class DSL1NumberedPolynomialTermSignatureBuilder {
      */
     public infix fun Int.inPowerOf(deg: UInt) {
         if (deg == 0u) return
-        val index = this - 1
+        val index = this
         if (index > signature.lastIndex) {
             signature.addAll(List(index - signature.lastIndex - 1) { 0u })
             signature.add(deg)
@@ -326,13 +326,13 @@ public class DSL1NumberedPolynomialBuilder<C>(
     /**
      * Initial capacity of coefficients map.
      */
-    initialCapacity: Int = 0
+    initialCapacity: Int? = null
 ) {
     /**
      * Coefficients storage. Any declaration of any monomial updates the storage.
      * Afterward the storage will be used as a resulting coefficients map.
      */
-    private val coefficients: MutableMap<List<UInt>, C> = LinkedHashMap(initialCapacity)
+    private val coefficients: MutableMap<List<UInt>, C> = if (initialCapacity != null) LinkedHashMap(initialCapacity) else LinkedHashMap()
 
     /**
      * Builds the resulting coefficients map.
@@ -373,12 +373,12 @@ public class DSL1NumberedPolynomialBuilder<C>(
 ///**
 // * Creates [NumberedPolynomial] with lambda [block] in context of [this] ring of constants.
 // *
-// * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
+// * For example, polynomial \(5 x_0^2 x_2^3 - 6 x_1\) can be described as
 // * ```
 // * Int.algebra {
 // *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
-// *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
-// *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+// *         5 { 0 inPowerOf 2u; 2 inPowerOf 3u } // 5 x_0^2 x_2^3 +
+// *         (-6) { 1 inPowerOf 1u }              // (-6) x_1^1
 // *     }
 // * }
 // * ```
@@ -389,39 +389,39 @@ public class DSL1NumberedPolynomialBuilder<C>(
 //  2. Union types are implemented. Then all three functions should be rewritten
 //     as one with single union type as a (context) receiver.
 //@UnstableKMathAPI
-//public inline fun <C, A: Ring<C>> A.NumberedPolynomialDSL1(initialCapacity: Int = 0, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(::add, initialCapacity).apply(block).build()
+//public inline fun <C, A: Ring<C>> A.NumberedPolynomialDSL1(initialCapacity: Int? = null, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(::add, initialCapacity).apply(block).build()
 /**
  * Creates [NumberedPolynomial] with lambda [block] in context of [this] ring of [NumberedPolynomial]s.
  *
- * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
+ * For example, polynomial \(5 x_0^2 x_2^3 - 6 x_1\) can be described as
  * ```
  * Int.algebra {
  *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
- *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
- *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+ *         5 { 0 inPowerOf 2u; 2 inPowerOf 3u } // 5 x_0^2 x_2^3 +
+ *         (-6) { 1 inPowerOf 1u }              // (-6) x_1^1
  *     }
  * }
  * ```
  * @usesMathJax
  */
 @UnstableKMathAPI
-public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomialDSL1(initialCapacity: Int = 0, block: DSL1NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = DSL1NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomialDSL1(initialCapacity: Int? = null, block: DSL1NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = DSL1NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 /**
  * Creates [NumberedPolynomial] with lambda [block] in context of [this] field of [NumberedRationalFunction]s.
  *
- * For example, polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be described as
+ * For example, polynomial \(5 x_0^2 x_2^3 - 6 x_1\) can be described as
  * ```
  * Int.algebra {
  *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
- *         5 { 1 inPowerOf 2u; 3 inPowerOf 3u } // 5 x_1^2 x_3^3 +
- *         (-6) { 2 inPowerOf 1u }              // (-6) x_2^1
+ *         5 { 0 inPowerOf 2u; 2 inPowerOf 3u } // 5 x_0^2 x_2^3 +
+ *         (-6) { 1 inPowerOf 1u }              // (-6) x_1^1
  *     }
  * }
  * ```
  * @usesMathJax
  */
 @UnstableKMathAPI
-public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomialDSL1(initialCapacity: Int = 0, block: DSL1NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = DSL1NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
+public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomialDSL1(initialCapacity: Int? = null, block: DSL1NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = DSL1NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
-- 
2.34.1


From 5846f42141a210bef8ba873030f9566ebc14c5e9 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 15 Jul 2022 15:21:49 +0300
Subject: [PATCH 569/713] Grand derivative refactoring. Phase 1

---
 .../kscience/kmath/expressions/DSCompiler.kt  |   90 +-
 .../kmath/expressions/DerivativeStructure.kt  |  191 ++--
 .../DerivativeStructureExpression.kt          |  327 +++---
 .../kscience/kmath/linear/LinearSpace.kt      |    2 +-
 .../space/kscience/kmath/misc/annotations.kt  |    2 +-
 .../space/kscience/kmath/nd/BufferND.kt       |    2 +-
 .../space/kscience/kmath/nd/StructureND.kt    |    4 +-
 .../kmath/operations/DoubleBufferOps.kt       |    4 +-
 .../kmath/operations/bufferOperation.kt       |   26 +-
 .../space/kscience/kmath/structures/Buffer.kt |    8 +-
 .../space/kscience/kmath/ejml/_generated.kt   | 1003 -----------------
 .../histogram/UniformHistogramGroupND.kt      |    6 +-
 .../kmath/multik/MultikDoubleAlgebra.kt       |    7 +
 .../space/kscience/kmath/stat/Sampler.kt      |    2 +-
 14 files changed, 311 insertions(+), 1363 deletions(-)
 delete mode 100644 kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
index bb88ce52c..e0050cf03 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
@@ -5,11 +5,11 @@
 
 package space.kscience.kmath.expressions
 
+
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.structures.MutableBufferFactory
-import kotlin.math.max
 import kotlin.math.min
 
 internal fun <T> MutableBuffer<T>.fill(element: T, fromIndex: Int = 0, toIndex: Int = size) {
@@ -54,7 +54,7 @@ internal fun <T> MutableBuffer<T>.fill(element: T, fromIndex: Int = 0, toIndex:
  * @property order Derivation order.
  * @see DerivativeStructure
  */
-internal class DSCompiler<T, out A : Algebra<T>> internal constructor(
+class DSCompiler<T, out A : Algebra<T>> internal constructor(
     val algebra: A,
     val bufferFactory: MutableBufferFactory<T>,
     val freeParameters: Int,
@@ -120,8 +120,7 @@ internal class DSCompiler<T, out A : Algebra<T>> internal constructor(
      * This number includes the single 0 order derivative element, which is
      * guaranteed to be stored in the first element of the array.
      */
-    val size: Int
-        get() = sizes[freeParameters][order]
+    val size: Int get() = sizes[freeParameters][order]
 
     /**
      * Get the index of a partial derivative in the array.
@@ -178,7 +177,7 @@ internal fun <T, A> DSCompiler<T, A>.ln(
     operand: Buffer<T>,
     operandOffset: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Field<T>, A : ExponentialOperations<T> = algebra {
     // create the function value and derivatives
     val function = bufferFactory(1 + order) { zero }
@@ -211,7 +210,7 @@ internal fun <T, A> DSCompiler<T, A>.pow(
     operandOffset: Int,
     n: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Field<T>, A : PowerOperations<T> = algebra {
     if (n == 0) {
         // special case, x^0 = 1 for all x
@@ -267,7 +266,7 @@ internal fun <T, A> DSCompiler<T, A>.exp(
     operand: Buffer<T>,
     operandOffset: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Ring<T>, A : ScaleOperations<T>, A : ExponentialOperations<T> = algebra {
     // create the function value and derivatives
     val function = bufferFactory(1 + order) { zero }
@@ -290,7 +289,7 @@ internal fun <T, A> DSCompiler<T, A>.sqrt(
     operand: Buffer<T>,
     operandOffset: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Field<T>, A : PowerOperations<T> = algebra {
     // create the function value and derivatives
     // [x^(1/n), (1/n)x^((1/n)-1), (1-n)/n^2x^((1/n)-2), ... ]
@@ -351,7 +350,7 @@ internal fun <T, A> DSCompiler<T, A>.pow(
     operandOffset: Int,
     p: Double,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Ring<T>, A : NumericAlgebra<T>, A : PowerOperations<T>, A : ScaleOperations<T> = algebra {
     // create the function value and derivatives
     // [x^p, px^(p-1), p(p-1)x^(p-2), ... ]
@@ -387,7 +386,7 @@ internal fun <T, A> DSCompiler<T, A>.tan(
     operand: Buffer<T>,
     operandOffset: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Ring<T>, A : TrigonometricOperations<T>, A : ScaleOperations<T> = algebra {
     // create the function value and derivatives
     val function = bufferFactory(1 + order) { zero }
@@ -469,7 +468,7 @@ internal fun <T, A> DSCompiler<T, A>.sin(
     operand: Buffer<T>,
     operandOffset: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Ring<T>, A : ScaleOperations<T>, A : TrigonometricOperations<T> = algebra {
     // create the function value and derivatives
     val function = bufferFactory(1 + order) { zero }
@@ -497,7 +496,7 @@ internal fun <T, A> DSCompiler<T, A>.acos(
     operand: Buffer<T>,
     operandOffset: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Field<T>, A : TrigonometricOperations<T>, A : PowerOperations<T> = algebra {
     // create the function value and derivatives
     val function = bufferFactory(1 + order) { zero }
@@ -559,7 +558,7 @@ internal fun <T, A> DSCompiler<T, A>.asin(
     operand: Buffer<T>,
     operandOffset: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Field<T>, A : TrigonometricOperations<T>, A : PowerOperations<T> = algebra {
     // create the function value and derivatives
     val function = bufferFactory(1 + order) { zero }
@@ -618,7 +617,7 @@ internal fun <T, A> DSCompiler<T, A>.atan(
     operand: Buffer<T>,
     operandOffset: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Field<T>, A : TrigonometricOperations<T> = algebra {
     // create the function value and derivatives
     val function = bufferFactory(1 + order) { zero }
@@ -678,7 +677,7 @@ internal fun <T, A> DSCompiler<T, A>.cosh(
     operand: Buffer<T>,
     operandOffset: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Ring<T>, A : ScaleOperations<T>, A : ExponentialOperations<T> = algebra {
     // create the function value and derivatives
     val function = bufferFactory(1 + order) { zero }
@@ -708,7 +707,7 @@ internal fun <T, A> DSCompiler<T, A>.tanh(
     operand: Buffer<T>,
     operandOffset: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Field<T>, A : ExponentialOperations<T> = algebra {
     // create the function value and derivatives
     val function = bufferFactory(1 + order) { zero }
@@ -765,7 +764,7 @@ internal fun <T, A> DSCompiler<T, A>.acosh(
     operand: Buffer<T>,
     operandOffset: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Field<T>, A : ExponentialOperations<T>, A : PowerOperations<T> = algebra {
     // create the function value and derivatives
     val function = bufferFactory(1 + order) { zero }
@@ -857,7 +856,7 @@ internal fun <T, A> DSCompiler<T, A>.sinh(
     operand: Buffer<T>,
     operandOffset: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Field<T>, A : ExponentialOperations<T> = algebra {
     // create the function value and derivatives
     val function = bufferFactory(1 + order) { zero }
@@ -964,7 +963,7 @@ internal fun <T, A> DSCompiler<T, A>.asinh(
     operand: Buffer<T>,
     operandOffset: Int,
     result: MutableBuffer<T>,
-    resultOffset: Int
+    resultOffset: Int,
 ) where A : Field<T>, A : ExponentialOperations<T>, A : PowerOperations<T> = algebra {
     // create the function value and derivatives
     val function = bufferFactory(1 + order) { zero }
@@ -1109,59 +1108,6 @@ internal fun <T, A> DSCompiler<T, A>.atanh(
     compose(operand, operandOffset, function, result, resultOffset)
 }
 
-/**
- * Get the compiler for number of free parameters and order.
- *
- * @param parameters number of free parameters.
- * @param order derivation order.
- * @return cached rules set.
- */
-internal fun <T, A : Algebra<T>> getCompiler(
-    algebra: A,
-    bufferFactory: MutableBufferFactory<T>,
-    parameters: Int,
-    order: Int
-): DSCompiler<T, A> {
-    // get the cached compilers
-    val cache: Array<Array<DSCompiler<T, A>?>>? = null
-
-    // we need to create more compilers
-    val maxParameters: Int = max(parameters, cache?.size ?: 0)
-    val maxOrder: Int = max(order, if (cache == null) 0 else cache[0].size)
-    val newCache: Array<Array<DSCompiler<T, A>?>> = Array(maxParameters + 1) { arrayOfNulls(maxOrder + 1) }
-
-    if (cache != null) {
-        // preserve the already created compilers
-        for (i in cache.indices) {
-            cache[i].copyInto(newCache[i], endIndex = cache[i].size)
-        }
-    }
-
-    // create the array in increasing diagonal order
-
-    // create the array in increasing diagonal order
-    for (diag in 0..parameters + order) {
-        for (o in max(0, diag - parameters)..min(order, diag)) {
-            val p: Int = diag - o
-            if (newCache[p][o] == null) {
-                val valueCompiler: DSCompiler<T, A>? = if (p == 0) null else newCache[p - 1][o]!!
-                val derivativeCompiler: DSCompiler<T, A>? = if (o == 0) null else newCache[p][o - 1]!!
-
-                newCache[p][o] = DSCompiler(
-                    algebra,
-                    bufferFactory,
-                    p,
-                    o,
-                    valueCompiler,
-                    derivativeCompiler,
-                )
-            }
-        }
-    }
-
-    return newCache[parameters][order]!!
-}
-
 /**
  * Compile the sizes array.
  *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructure.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructure.kt
index a1a6354f0..01c045cdb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructure.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructure.kt
@@ -6,10 +6,9 @@
 package space.kscience.kmath.expressions
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.NumericAlgebra
 import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.ScaleOperations
-import space.kscience.kmath.structures.MutableBuffer
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.asBuffer
 
 /**
  * Class representing both the value and the differentials of a function.
@@ -28,128 +27,29 @@ import space.kscience.kmath.structures.MutableBuffer
  * [Commons Math's `DerivativeStructure`](https://github.com/apache/commons-math/blob/924f6c357465b39beb50e3c916d5eb6662194175/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/differentiation/DerivativeStructure.java).
  */
 @UnstableKMathAPI
-public open class DerivativeStructure<T, A> internal constructor(
-    internal val derivativeAlgebra: DerivativeStructureRing<T, A>,
-    internal val compiler: DSCompiler<T, A>,
-) where A : Ring<T>, A : NumericAlgebra<T>, A : ScaleOperations<T> {
-    /**
-     * Combined array holding all values.
-     */
-    internal var data: MutableBuffer<T> =
-        derivativeAlgebra.bufferFactory(compiler.size) { derivativeAlgebra.algebra.zero }
+public open class DerivativeStructure<T, A : Ring<T>> @PublishedApi internal constructor(
+    private val derivativeAlgebra: DerivativeStructureAlgebra<T, A>,
+    @PublishedApi internal val data: Buffer<T>,
+) {
 
-    /**
-     * Build an instance with all values and derivatives set to 0.
-     *
-     * @param parameters number of free parameters.
-     * @param order derivation order.
-     */
-    public constructor (
-        derivativeAlgebra: DerivativeStructureRing<T, A>,
-        parameters: Int,
-        order: Int,
-    ) : this(
-        derivativeAlgebra,
-        getCompiler<T, A>(derivativeAlgebra.algebra, derivativeAlgebra.bufferFactory, parameters, order),
-    )
-
-    /**
-     * Build an instance representing a constant value.
-     *
-     * @param parameters number of free parameters.
-     * @param order derivation order.
-     * @param value value of the constant.
-     * @see DerivativeStructure
-     */
-    public constructor (
-        derivativeAlgebra: DerivativeStructureRing<T, A>,
-        parameters: Int,
-        order: Int,
-        value: T,
-    ) : this(
-        derivativeAlgebra,
-        parameters,
-        order,
-    ) {
-        data[0] = value
-    }
-
-    /**
-     * Build an instance representing a variable.
-     *
-     * Instances built using this constructor are considered to be the free variables with respect to which
-     * differentials are computed. As such, their differential with respect to themselves is +1.
-     *
-     * @param parameters number of free parameters.
-     * @param order derivation order.
-     * @param index index of the variable (from 0 to `parameters - 1`).
-     * @param value value of the variable.
-     */
-    public constructor (
-        derivativeAlgebra: DerivativeStructureRing<T, A>,
-        parameters: Int,
-        order: Int,
-        index: Int,
-        value: T,
-    ) : this(derivativeAlgebra, parameters, order, value) {
-        require(index < parameters) { "number is too large: $index >= $parameters" }
-
-        if (order > 0) {
-            // the derivative of the variable with respect to itself is 1.
-            data[getCompiler(derivativeAlgebra.algebra, derivativeAlgebra.bufferFactory, index, order).size] =
-                derivativeAlgebra.algebra.one
-        }
-    }
-
-    /**
-     * Build an instance from all its derivatives.
-     *
-     * @param parameters number of free parameters.
-     * @param order derivation order.
-     * @param derivatives derivatives sorted according to [DSCompiler.getPartialDerivativeIndex].
-     */
-    public constructor (
-        derivativeAlgebra: DerivativeStructureRing<T, A>,
-        parameters: Int,
-        order: Int,
-        vararg derivatives: T,
-    ) : this(
-        derivativeAlgebra,
-        parameters,
-        order,
-    ) {
-        require(derivatives.size == data.size) { "dimension mismatch: ${derivatives.size} and ${data.size}" }
-        data = derivativeAlgebra.bufferFactory(data.size) { derivatives[it] }
-    }
-
-    /**
-     * Copy constructor.
-     *
-     * @param ds instance to copy.
-     */
-    internal constructor(ds: DerivativeStructure<T, A>) : this(ds.derivativeAlgebra, ds.compiler) {
-        this.data = ds.data.copy()
-    }
+    public val compiler: DSCompiler<T, A> get() = derivativeAlgebra.compiler
 
     /**
      * The number of free parameters.
      */
-    public val freeParameters: Int
-        get() = compiler.freeParameters
+    public val freeParameters: Int get() = compiler.freeParameters
 
     /**
      * The derivation order.
      */
-    public val order: Int
-        get() = compiler.order
+    public val order: Int get() = compiler.order
 
     /**
      * The value part of the derivative structure.
      *
      * @see getPartialDerivative
      */
-    public val value: T
-        get() = data[0]
+    public val value: T get() = data[0]
 
     /**
      * Get a partial derivative.
@@ -183,4 +83,75 @@ public open class DerivativeStructure<T, A> internal constructor(
 
     public override fun hashCode(): Int =
         227 + 229 * freeParameters + 233 * order + 239 * data.hashCode()
+
+    public companion object {
+
+        /**
+         * Build an instance representing a variable.
+         *
+         * Instances built using this constructor are considered to be the free variables with respect to which
+         * differentials are computed. As such, their differential with respect to themselves is +1.
+         */
+        public fun <T, A : Ring<T>> variable(
+            derivativeAlgebra: DerivativeStructureAlgebra<T, A>,
+            index: Int,
+            value: T,
+        ): DerivativeStructure<T, A> {
+            val compiler = derivativeAlgebra.compiler
+            require(index < compiler.freeParameters) { "number is too large: $index >= ${compiler.freeParameters}" }
+            return DerivativeStructure(derivativeAlgebra, derivativeAlgebra.bufferForVariable(index, value))
+        }
+
+        /**
+         * Build an instance from all its derivatives.
+         *
+         * @param derivatives derivatives sorted according to [DSCompiler.getPartialDerivativeIndex].
+         */
+        public fun <T, A : Ring<T>> ofDerivatives(
+            derivativeAlgebra: DerivativeStructureAlgebra<T, A>,
+            vararg derivatives: T,
+        ): DerivativeStructure<T, A> {
+            val compiler = derivativeAlgebra.compiler
+            require(derivatives.size == compiler.size) { "dimension mismatch: ${derivatives.size} and ${compiler.size}" }
+            val data = derivatives.asBuffer()
+
+            return DerivativeStructure(
+                derivativeAlgebra,
+                data
+            )
+        }
+    }
+}
+
+@OptIn(UnstableKMathAPI::class)
+private fun <T, A : Ring<T>> DerivativeStructureAlgebra<T, A>.bufferForVariable(index: Int, value: T): Buffer<T> {
+    val buffer = bufferFactory(compiler.size) { algebra.zero }
+    buffer[0] = value
+    if (compiler.order > 0) {
+        // the derivative of the variable with respect to itself is 1.
+
+        val indexOfDerivative = compiler.getPartialDerivativeIndex(*IntArray(numberOfVariables).apply {
+            set(index, 1)
+        })
+
+        buffer[indexOfDerivative] = algebra.one
+    }
+    return buffer
+}
+
+/**
+ * A class implementing both [DerivativeStructure] and [Symbol].
+ */
+@UnstableKMathAPI
+public class DerivativeStructureSymbol<T, A : Ring<T>> internal constructor(
+    derivativeAlgebra: DerivativeStructureAlgebra<T, A>,
+    index: Int,
+    symbol: Symbol,
+    value: T,
+) : Symbol by symbol, DerivativeStructure<T, A>(
+    derivativeAlgebra, derivativeAlgebra.bufferForVariable(index, value)
+) {
+    override fun toString(): String = symbol.toString()
+    override fun equals(other: Any?): Boolean = (other as? Symbol) == symbol
+    override fun hashCode(): Int = symbol.hashCode()
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpression.kt
index f91fb55e8..638057921 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpression.kt
@@ -7,83 +7,89 @@ package space.kscience.kmath.expressions
 
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.structures.MutableBufferFactory
-import space.kscience.kmath.structures.indices
+import kotlin.math.max
+import kotlin.math.min
 
-/**
- * A class implementing both [DerivativeStructure] and [Symbol].
- */
 @UnstableKMathAPI
-public class DerivativeStructureSymbol<T, A>(
-    derivativeAlgebra: DerivativeStructureRing<T, A>,
-    size: Int,
-    order: Int,
-    index: Int,
-    symbol: Symbol,
-    value: T,
-) : Symbol by symbol, DerivativeStructure<T, A>(
-    derivativeAlgebra,
-    size,
-    order,
-    index,
-    value
-) where A : Ring<T>, A : NumericAlgebra<T>, A : ScaleOperations<T> {
-    override fun toString(): String = symbol.toString()
-    override fun equals(other: Any?): Boolean = (other as? Symbol) == symbol
-    override fun hashCode(): Int = symbol.hashCode()
-}
-
-/**
- * A ring over [DerivativeStructure].
- *
- * @property order The derivation order.
- * @param bindings The map of bindings values. All bindings are considered free parameters.
- */
-@UnstableKMathAPI
-public open class DerivativeStructureRing<T, A>(
+public abstract class DerivativeStructureAlgebra<T, A : Ring<T>>(
     public val algebra: A,
     public val bufferFactory: MutableBufferFactory<T>,
     public val order: Int,
     bindings: Map<Symbol, T>,
-) : Ring<DerivativeStructure<T, A>>, ScaleOperations<DerivativeStructure<T, A>>,
-    NumericAlgebra<DerivativeStructure<T, A>>,
-    ExpressionAlgebra<T, DerivativeStructure<T, A>>,
-    NumbersAddOps<DerivativeStructure<T, A>> where A : Ring<T>, A : NumericAlgebra<T>, A : ScaleOperations<T> {
+) : ExpressionAlgebra<T, DerivativeStructure<T, A>> {
+
     public val numberOfVariables: Int = bindings.size
 
-    override val zero: DerivativeStructure<T, A> by lazy {
-        DerivativeStructure(
-            this,
-            numberOfVariables,
-            order,
-        )
-    }
 
-    override val one: DerivativeStructure<T, A> by lazy {
-        DerivativeStructure(
-            this,
-            numberOfVariables,
-            order,
-            algebra.one,
-        )
-    }
+    /**
+     * Get the compiler for number of free parameters and order.
+     *
+     * @return cached rules set.
+     */
+    @PublishedApi
+    internal val compiler: DSCompiler<T, A> by lazy {
+        // get the cached compilers
+        val cache: Array<Array<DSCompiler<T, A>?>>? = null
 
-    override fun number(value: Number): DerivativeStructure<T, A> = const(algebra.number(value))
+        // we need to create more compilers
+        val maxParameters: Int = max(numberOfVariables, cache?.size ?: 0)
+        val maxOrder: Int = max(order, if (cache == null) 0 else cache[0].size)
+        val newCache: Array<Array<DSCompiler<T, A>?>> = Array(maxParameters + 1) { arrayOfNulls(maxOrder + 1) }
+
+        if (cache != null) {
+            // preserve the already created compilers
+            for (i in cache.indices) {
+                cache[i].copyInto(newCache[i], endIndex = cache[i].size)
+            }
+        }
+
+        // create the array in increasing diagonal order
+        for (diag in 0..numberOfVariables + order) {
+            for (o in max(0, diag - numberOfVariables)..min(order, diag)) {
+                val p: Int = diag - o
+                if (newCache[p][o] == null) {
+                    val valueCompiler: DSCompiler<T, A>? = if (p == 0) null else newCache[p - 1][o]!!
+                    val derivativeCompiler: DSCompiler<T, A>? = if (o == 0) null else newCache[p][o - 1]!!
+
+                    newCache[p][o] = DSCompiler(
+                        algebra,
+                        bufferFactory,
+                        p,
+                        o,
+                        valueCompiler,
+                        derivativeCompiler,
+                    )
+                }
+            }
+        }
+
+        return@lazy newCache[numberOfVariables][order]!!
+    }
 
     private val variables: Map<Symbol, DerivativeStructureSymbol<T, A>> =
         bindings.entries.mapIndexed { index, (key, value) ->
             key to DerivativeStructureSymbol(
                 this,
-                numberOfVariables,
-                order,
                 index,
                 key,
                 value,
             )
         }.toMap()
 
-    public override fun const(value: T): DerivativeStructure<T, A> =
-        DerivativeStructure(this, numberOfVariables, order, value)
+
+
+    public override fun const(value: T): DerivativeStructure<T, A> {
+        val buffer = bufferFactory(compiler.size) { algebra.zero }
+        buffer[0] = value
+
+        return DerivativeStructure(
+            this,
+            buffer
+        )
+    }
 
     override fun bindSymbolOrNull(value: String): DerivativeStructureSymbol<T, A>? = variables[StringSymbol(value)]
 
@@ -103,54 +109,99 @@ public open class DerivativeStructureRing<T, A>(
 
     public fun DerivativeStructure<T, A>.derivative(vararg symbols: Symbol): T = derivative(symbols.toList())
 
+}
+
+
+/**
+ * A ring over [DerivativeStructure].
+ *
+ * @property order The derivation order.
+ * @param bindings The map of bindings values. All bindings are considered free parameters.
+ */
+@UnstableKMathAPI
+public open class DerivativeStructureRing<T, A>(
+    algebra: A,
+    bufferFactory: MutableBufferFactory<T>,
+    order: Int,
+    bindings: Map<Symbol, T>,
+) : DerivativeStructureAlgebra<T, A>(algebra, bufferFactory, order, bindings),
+    Ring<DerivativeStructure<T, A>>, ScaleOperations<DerivativeStructure<T, A>>,
+    NumericAlgebra<DerivativeStructure<T, A>>,
+    NumbersAddOps<DerivativeStructure<T, A>> where A : Ring<T>, A : NumericAlgebra<T>, A : ScaleOperations<T> {
+
+    override fun bindSymbolOrNull(value: String): DerivativeStructureSymbol<T, A>? =
+        super<DerivativeStructureAlgebra>.bindSymbolOrNull(value)
+
     override fun DerivativeStructure<T, A>.unaryMinus(): DerivativeStructure<T, A> {
-        val ds = DerivativeStructure(this@DerivativeStructureRing, compiler)
-        for (i in ds.data.indices) {
-            ds.data[i] = algebra { -data[i] }
-        }
-        return ds
+        val newData = algebra { data.map(bufferFactory) { -it } }
+        return DerivativeStructure(this@DerivativeStructureRing, newData)
     }
 
+    /**
+     * Create a copy of given [Buffer] and modify it according to [block]
+     */
+    protected inline fun DerivativeStructure<T, A>.transformDataBuffer(block: DSCompiler<T, A>.(MutableBuffer<T>) -> Unit): DerivativeStructure<T, A> {
+        val newData = bufferFactory(compiler.size) { data[it] }
+        compiler.block(newData)
+        return DerivativeStructure(this@DerivativeStructureRing, newData)
+    }
+
+    protected fun DerivativeStructure<T, A>.mapData(block: (T) -> T): DerivativeStructure<T, A> {
+        val newData: Buffer<T> = data.map(bufferFactory, block)
+        return DerivativeStructure(this@DerivativeStructureRing, newData)
+    }
+
+    protected fun DerivativeStructure<T, A>.mapDataIndexed(block: (Int, T) -> T): DerivativeStructure<T, A> {
+        val newData: Buffer<T> = data.mapIndexed(bufferFactory, block)
+        return DerivativeStructure(this@DerivativeStructureRing, newData)
+    }
+
+    override val zero: DerivativeStructure<T, A> by lazy {
+        const(algebra.zero)
+    }
+
+    override val one: DerivativeStructure<T, A> by lazy {
+        const(algebra.one)
+    }
+
+    override fun number(value: Number): DerivativeStructure<T, A> = const(algebra.number(value))
+
     override fun add(left: DerivativeStructure<T, A>, right: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
         left.compiler.checkCompatibility(right.compiler)
-        val ds = DerivativeStructure(left)
-        left.compiler.add(left.data, 0, right.data, 0, ds.data, 0)
-        return ds
+        return left.transformDataBuffer { result ->
+            add(left.data, 0, right.data, 0, result, 0)
+        }
     }
 
-    override fun scale(a: DerivativeStructure<T, A>, value: Double): DerivativeStructure<T, A> {
-        val ds = DerivativeStructure(a)
-        for (i in ds.data.indices) {
-            ds.data[i] = algebra { ds.data[i].times(value) }
-        }
-        return ds
+    override fun scale(a: DerivativeStructure<T, A>, value: Double): DerivativeStructure<T, A> = algebra {
+        a.mapData { it.times(value) }
     }
 
     override fun multiply(
         left: DerivativeStructure<T, A>,
-        right: DerivativeStructure<T, A>
+        right: DerivativeStructure<T, A>,
     ): DerivativeStructure<T, A> {
         left.compiler.checkCompatibility(right.compiler)
-        val result = DerivativeStructure(this, left.compiler)
-        left.compiler.multiply(left.data, 0, right.data, 0, result.data, 0)
-        return result
+        return left.transformDataBuffer { result ->
+            multiply(left.data, 0, right.data, 0, result, 0)
+        }
     }
 
     override fun DerivativeStructure<T, A>.minus(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
         compiler.checkCompatibility(arg.compiler)
-        val ds = DerivativeStructure(this)
-        compiler.subtract(data, 0, arg.data, 0, ds.data, 0)
-        return ds
+        return transformDataBuffer { result ->
+            subtract(data, 0, arg.data, 0, result, 0)
+        }
     }
 
-    override operator fun DerivativeStructure<T, A>.plus(other: Number): DerivativeStructure<T, A> {
-        val ds = DerivativeStructure(this)
-        ds.data[0] = algebra { ds.data[0] + number(other) }
-        return ds
+    override operator fun DerivativeStructure<T, A>.plus(other: Number): DerivativeStructure<T, A> = algebra {
+        transformDataBuffer {
+            it[0] += number(other)
+        }
     }
 
     override operator fun DerivativeStructure<T, A>.minus(other: Number): DerivativeStructure<T, A> =
-        this + -other.toDouble()
+        this + (-other.toDouble())
 
     override operator fun Number.plus(other: DerivativeStructure<T, A>): DerivativeStructure<T, A> = other + this
     override operator fun Number.minus(other: DerivativeStructure<T, A>): DerivativeStructure<T, A> = other - this
@@ -194,119 +245,85 @@ public class DerivativeStructureField<T, A : ExtendedField<T>>(
 
     override fun divide(left: DerivativeStructure<T, A>, right: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
         left.compiler.checkCompatibility(right.compiler)
-        val result = DerivativeStructure(this, left.compiler)
-        left.compiler.divide(left.data, 0, right.data, 0, result.data, 0)
-        return result
+        return left.transformDataBuffer { result ->
+            left.compiler.divide(left.data, 0, right.data, 0, result, 0)
+        }
     }
 
-    override fun sin(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.sin(arg.data, 0, result.data, 0)
-        return result
+    override fun sin(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        sin(arg.data, 0, result, 0)
     }
 
-    override fun cos(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.cos(arg.data, 0, result.data, 0)
-        return result
+    override fun cos(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        cos(arg.data, 0, result, 0)
     }
 
-    override fun tan(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.tan(arg.data, 0, result.data, 0)
-        return result
+    override fun tan(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        tan(arg.data, 0, result, 0)
     }
 
-    override fun asin(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.asin(arg.data, 0, result.data, 0)
-        return result
+    override fun asin(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        asin(arg.data, 0, result, 0)
     }
 
-    override fun acos(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.acos(arg.data, 0, result.data, 0)
-        return result
+    override fun acos(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        acos(arg.data, 0, result, 0)
     }
 
-    override fun atan(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.atan(arg.data, 0, result.data, 0)
-        return result
+    override fun atan(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        atan(arg.data, 0, result, 0)
     }
 
-    override fun sinh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.sinh(arg.data, 0, result.data, 0)
-        return result
+    override fun sinh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        sinh(arg.data, 0, result, 0)
     }
 
-    override fun cosh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.cosh(arg.data, 0, result.data, 0)
-        return result
+    override fun cosh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        cosh(arg.data, 0, result, 0)
     }
 
-    override fun tanh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.tanh(arg.data, 0, result.data, 0)
-        return result
+    override fun tanh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        tanh(arg.data, 0, result, 0)
     }
 
-    override fun asinh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.asinh(arg.data, 0, result.data, 0)
-        return result
+    override fun asinh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        asinh(arg.data, 0, result, 0)
     }
 
-    override fun acosh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.acosh(arg.data, 0, result.data, 0)
-        return result
+    override fun acosh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        acosh(arg.data, 0, result, 0)
     }
 
-    override fun atanh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.atanh(arg.data, 0, result.data, 0)
-        return result
+    override fun atanh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        atanh(arg.data, 0, result, 0)
     }
 
     override fun power(arg: DerivativeStructure<T, A>, pow: Number): DerivativeStructure<T, A> = when (pow) {
-        is Int -> {
-            val result = DerivativeStructure(this, arg.compiler)
-            arg.compiler.pow(arg.data, 0, pow, result.data, 0)
-            result
+        is Int -> arg.transformDataBuffer { result ->
+            pow(arg.data, 0, pow, result, 0)
         }
-        else -> {
-            val result = DerivativeStructure(this, arg.compiler)
-            arg.compiler.pow(arg.data, 0, pow.toDouble(), result.data, 0)
-            result
+        else -> arg.transformDataBuffer { result ->
+            pow(arg.data, 0, pow.toDouble(), result, 0)
         }
     }
 
-    override fun sqrt(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.sqrt(arg.data, 0, result.data, 0)
-        return result
+    override fun sqrt(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        sqrt(arg.data, 0, result, 0)
     }
 
     public fun power(arg: DerivativeStructure<T, A>, pow: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
         arg.compiler.checkCompatibility(pow.compiler)
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.pow(arg.data, 0, pow.data, 0, result.data, 0)
-        return result
+        return arg.transformDataBuffer { result ->
+            pow(arg.data, 0, pow.data, 0, result, 0)
+        }
     }
 
-    override fun exp(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.exp(arg.data, 0, result.data, 0)
-        return result
+    override fun exp(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        exp(arg.data, 0, result, 0)
     }
 
-    override fun ln(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        val result = DerivativeStructure(this, arg.compiler)
-        arg.compiler.ln(arg.data, 0, result.data, 0)
-        return result
+    override fun ln(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
+        ln(arg.data, 0, result, 0)
     }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
index 715fad07b..10438dd02 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
@@ -188,7 +188,7 @@ public interface LinearSpace<T, out A : Ring<T>> {
          */
         public fun <T : Any, A : Ring<T>> buffered(
             algebra: A,
-            bufferFactory: BufferFactory<T> = Buffer.Companion::boxing,
+            bufferFactory: BufferFactory<T> = BufferFactory(Buffer.Companion::boxing),
         ): LinearSpace<T, A> = BufferedLinearSpace(BufferRingOps(algebra, bufferFactory))
 
         @Deprecated("use DoubleField.linearSpace")
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
index 7c612b6a9..60fa81cd8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
@@ -27,5 +27,5 @@ public annotation class UnstableKMathAPI
     RequiresOptIn.Level.WARNING,
 )
 public annotation class PerformancePitfall(
-    val message: String = "Potential performance problem"
+    val message: String = "Potential performance problem",
 )
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 2401f6319..8175bd65e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -69,7 +69,7 @@ public class MutableBufferND<T>(
  * Transform structure to a new structure using provided [MutableBufferFactory] and optimizing if argument is [MutableBufferND]
  */
 public inline fun <T, reified R : Any> MutableStructureND<T>.mapToMutableBuffer(
-    factory: MutableBufferFactory<R> = MutableBuffer.Companion::auto,
+    factory: MutableBufferFactory<R> = MutableBufferFactory(MutableBuffer.Companion::auto),
     crossinline transform: (T) -> R,
 ): MutableBufferND<R> {
     return if (this is MutableBufferND<T>)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index e934c6370..6e54e1b9d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -120,7 +120,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
          */
         public fun <T> buffered(
             strides: Strides,
-            bufferFactory: BufferFactory<T> = Buffer.Companion::boxing,
+            bufferFactory: BufferFactory<T> = BufferFactory(Buffer.Companion::boxing),
             initializer: (IntArray) -> T,
         ): BufferND<T> = BufferND(strides, bufferFactory(strides.linearSize) { i -> initializer(strides.index(i)) })
 
@@ -140,7 +140,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
 
         public fun <T> buffered(
             shape: IntArray,
-            bufferFactory: BufferFactory<T> = Buffer.Companion::boxing,
+            bufferFactory: BufferFactory<T> = BufferFactory(Buffer.Companion::boxing),
             initializer: (IntArray) -> T,
         ): BufferND<T> = buffered(DefaultStrides(shape), bufferFactory, initializer)
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index 0ee591acc..083892105 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -6,12 +6,10 @@
 package space.kscience.kmath.operations
 
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
-
 import kotlin.math.*
 
 /**
@@ -21,7 +19,7 @@ public abstract class DoubleBufferOps : BufferAlgebra<Double, DoubleField>, Exte
     Norm<Buffer<Double>, Double> {
 
     override val elementAlgebra: DoubleField get() = DoubleField
-    override val bufferFactory: BufferFactory<Double> get() = ::DoubleBuffer
+    override val bufferFactory: BufferFactory<Double> get() = BufferFactory(::DoubleBuffer)
 
     override fun Buffer<Double>.map(block: DoubleField.(Double) -> Double): DoubleBuffer =
         mapInline { DoubleField.block(it) }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
index 31b0c2841..652472fcf 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
@@ -61,31 +61,39 @@ public inline fun <reified T> Buffer<T>.toTypedArray(): Array<T> = Array(size, :
 /**
  * Create a new buffer from this one with the given mapping function and using [Buffer.Companion.auto] buffer factory.
  */
-public inline fun <T : Any, reified R : Any> Buffer<T>.map(block: (T) -> R): Buffer<R> =
+public inline fun <T, reified R : Any> Buffer<T>.map(block: (T) -> R): Buffer<R> =
     Buffer.auto(size) { block(get(it)) }
 
 /**
  * Create a new buffer from this one with the given mapping function.
  * Provided [bufferFactory] is used to construct the new buffer.
  */
-public inline fun <T : Any, R : Any> Buffer<T>.map(
+public inline fun <T, R> Buffer<T>.map(
     bufferFactory: BufferFactory<R>,
     crossinline block: (T) -> R,
 ): Buffer<R> = bufferFactory(size) { block(get(it)) }
 
 /**
- * Create a new buffer from this one with the given indexed mapping function.
- * Provided [BufferFactory] is used to construct the new buffer.
+ * Create a new buffer from this one with the given mapping (indexed) function.
+ * Provided [bufferFactory] is used to construct the new buffer.
  */
-public inline fun <T : Any, reified R : Any> Buffer<T>.mapIndexed(
-    bufferFactory: BufferFactory<R> = Buffer.Companion::auto,
+public inline fun <T, R> Buffer<T>.mapIndexed(
+    bufferFactory: BufferFactory<R>,
     crossinline block: (index: Int, value: T) -> R,
 ): Buffer<R> = bufferFactory(size) { block(it, get(it)) }
 
+/**
+ * Create a new buffer from this one with the given indexed mapping function.
+ * Provided [BufferFactory] is used to construct the new buffer.
+ */
+public inline fun <T, reified R : Any> Buffer<T>.mapIndexed(
+    crossinline block: (index: Int, value: T) -> R,
+): Buffer<R> = BufferFactory<R>(Buffer.Companion::auto).invoke(size) { block(it, get(it)) }
+
 /**
  * Fold given buffer according to [operation]
  */
-public inline fun <T : Any, R> Buffer<T>.fold(initial: R, operation: (acc: R, T) -> R): R {
+public inline fun <T, R> Buffer<T>.fold(initial: R, operation: (acc: R, T) -> R): R {
     var accumulator = initial
     for (index in this.indices) accumulator = operation(accumulator, get(index))
     return accumulator
@@ -95,9 +103,9 @@ public inline fun <T : Any, R> Buffer<T>.fold(initial: R, operation: (acc: R, T)
  * Zip two buffers using given [transform].
  */
 @UnstableKMathAPI
-public inline fun <T1 : Any, T2 : Any, reified R : Any> Buffer<T1>.zip(
+public inline fun <T1, T2 : Any, reified R : Any> Buffer<T1>.zip(
     other: Buffer<T2>,
-    bufferFactory: BufferFactory<R> = Buffer.Companion::auto,
+    bufferFactory: BufferFactory<R> = BufferFactory(Buffer.Companion::auto),
     crossinline transform: (T1, T2) -> R,
 ): Buffer<R> {
     require(size == other.size) { "Buffer size mismatch in zip: expected $size but found ${other.size}" }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index a1b0307c4..1c79c257a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -14,14 +14,18 @@ import kotlin.reflect.KClass
  *
  * @param T the type of buffer.
  */
-public typealias BufferFactory<T> = (Int, (Int) -> T) -> Buffer<T>
+public fun interface BufferFactory<T> {
+    public operator fun invoke(size: Int, builder: (Int) -> T): Buffer<T>
+}
 
 /**
  * Function that produces [MutableBuffer] from its size and function that supplies values.
  *
  * @param T the type of buffer.
  */
-public typealias MutableBufferFactory<T> = (Int, (Int) -> T) -> MutableBuffer<T>
+public fun interface MutableBufferFactory<T>: BufferFactory<T>{
+    override fun invoke(size: Int, builder: (Int) -> T): MutableBuffer<T>
+}
 
 /**
  * A generic read-only random-access structure for both primitives and objects.
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
deleted file mode 100644
index aac327a84..000000000
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
+++ /dev/null
@@ -1,1003 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
-
-/* This file is generated with buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt */
-
-package space.kscience.kmath.ejml
-
-import org.ejml.data.*
-import org.ejml.dense.row.CommonOps_DDRM
-import org.ejml.dense.row.CommonOps_FDRM
-import org.ejml.dense.row.factory.DecompositionFactory_DDRM
-import org.ejml.dense.row.factory.DecompositionFactory_FDRM
-import org.ejml.sparse.FillReducing
-import org.ejml.sparse.csc.CommonOps_DSCC
-import org.ejml.sparse.csc.CommonOps_FSCC
-import org.ejml.sparse.csc.factory.DecompositionFactory_DSCC
-import org.ejml.sparse.csc.factory.DecompositionFactory_FSCC
-import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
-import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
-import space.kscience.kmath.linear.*
-import space.kscience.kmath.linear.Matrix
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.StructureFeature
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.FloatField
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.FloatBuffer
-import kotlin.reflect.KClass
-import kotlin.reflect.cast
-
-/**
- * [EjmlVector] specialization for [Double].
- */
-public class EjmlDoubleVector<out M : DMatrix>(override val origin: M) : EjmlVector<Double, M>(origin) {
-    init {
-        require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
-    }
-
-    override operator fun get(index: Int): Double = origin[0, index]
-}
-
-/**
- * [EjmlVector] specialization for [Float].
- */
-public class EjmlFloatVector<out M : FMatrix>(override val origin: M) : EjmlVector<Float, M>(origin) {
-    init {
-        require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
-    }
-
-    override operator fun get(index: Int): Float = origin[0, index]
-}
-
-/**
- * [EjmlMatrix] specialization for [Double].
- */
-public class EjmlDoubleMatrix<out M : DMatrix>(override val origin: M) : EjmlMatrix<Double, M>(origin) {
-    override operator fun get(i: Int, j: Int): Double = origin[i, j]
-}
-
-/**
- * [EjmlMatrix] specialization for [Float].
- */
-public class EjmlFloatMatrix<out M : FMatrix>(override val origin: M) : EjmlMatrix<Float, M>(origin) {
-    override operator fun get(i: Int, j: Int): Float = origin[i, j]
-}
-
-/**
- * [EjmlLinearSpace] implementation based on [CommonOps_DDRM], [DecompositionFactory_DDRM] operations and
- * [DMatrixRMaj] matrices.
- */
-public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrixRMaj>() {
-    /**
-     * The [DoubleField] reference.
-     */
-    override val elementAlgebra: DoubleField get() = DoubleField
-
-    @Suppress("UNCHECKED_CAST")
-    override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixRMaj> = when {
-        this is EjmlDoubleMatrix<*> && origin is DMatrixRMaj -> this as EjmlDoubleMatrix<DMatrixRMaj>
-        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixRMaj> = when {
-        this is EjmlDoubleVector<*> && origin is DMatrixRMaj -> this as EjmlDoubleVector<DMatrixRMaj>
-        else -> EjmlDoubleVector(DMatrixRMaj(size, 1).also {
-            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
-        })
-    }
-
-    override fun buildMatrix(
-        rows: Int,
-        columns: Int,
-        initializer: DoubleField.(i: Int, j: Int) -> Double,
-    ): EjmlDoubleMatrix<DMatrixRMaj> = DMatrixRMaj(rows, columns).also {
-        (0 until rows).forEach { row ->
-            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
-        }
-    }.wrapMatrix()
-
-    override fun buildVector(
-        size: Int,
-        initializer: DoubleField.(Int) -> Double,
-    ): EjmlDoubleVector<DMatrixRMaj> = EjmlDoubleVector(DMatrixRMaj(size, 1).also {
-        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
-    })
-
-    private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
-    private fun <T : DMatrix> T.wrapVector() = EjmlDoubleVector(this)
-
-    override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
-
-    override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.mult(toEjml().origin, other.toEjml().origin, out)
-        return out.wrapMatrix()
-    }
-
-    override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.mult(toEjml().origin, vector.toEjml().origin, out)
-        return out.wrapVector()
-    }
-
-    override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-
-        CommonOps_DDRM.add(
-            elementAlgebra.one, 
-            toEjml().origin, 
-            elementAlgebra { -one },
-            other.toEjml().origin, 
-            out,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixRMaj> {
-        val res = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.scale(value, toEjml().origin, res)
-        return res.wrapMatrix()
-    }
-
-    override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixRMaj> {
-        val res = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.changeSign(toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-        
-        CommonOps_DDRM.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin, 
-            out,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-
-        CommonOps_DDRM.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin,
-            out,
-        )
-
-        return out.wrapVector()
-    }
-
-    override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
-        val out = DMatrixRMaj(1, 1)
-
-        CommonOps_DDRM.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra { -one },
-            other.toEjml().origin,
-            out,
-        )
-
-        return out.wrapVector()
-    }
-
-    override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> = m * this
-
-    override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixRMaj> {
-        val res = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.scale(value, toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixRMaj> = v * this
-
-    @UnstableKMathAPI
-    override fun <F : StructureFeature> computeFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
-        structure.getFeature(type)?.let { return it }
-        val origin = structure.toEjml().origin
-
-        return when (type) {
-            InverseMatrixFeature::class -> object : InverseMatrixFeature<Double> {
-                override val inverse: Matrix<Double> by lazy {
-                    val res = origin.copy()
-                    CommonOps_DDRM.invert(res)
-                    res.wrapMatrix()
-                }
-            }
-
-            DeterminantFeature::class -> object : DeterminantFeature<Double> {
-                override val determinant: Double by lazy { CommonOps_DDRM.det(origin) }
-            }
-
-            SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<Double> {
-                private val svd by lazy {
-                    DecompositionFactory_DDRM.svd(origin.numRows, origin.numCols, true, true, false)
-                        .apply { decompose(origin.copy()) }
-                }
-
-                override val u: Matrix<Double> by lazy { svd.getU(null, false).wrapMatrix() }
-                override val s: Matrix<Double> by lazy { svd.getW(null).wrapMatrix() }
-                override val v: Matrix<Double> by lazy { svd.getV(null, false).wrapMatrix() }
-                override val singularValues: Point<Double> by lazy { DoubleBuffer(svd.singularValues) }
-            }
-
-            QRDecompositionFeature::class -> object : QRDecompositionFeature<Double> {
-                private val qr by lazy {
-                    DecompositionFactory_DDRM.qr().apply { decompose(origin.copy()) }
-                }
-
-                override val q: Matrix<Double> by lazy {
-                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
-                }
-
-                override val r: Matrix<Double> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
-            }
-
-            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Double> {
-                override val l: Matrix<Double> by lazy {
-                    val cholesky =
-                        DecompositionFactory_DDRM.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
-
-                    cholesky.getT(null).wrapMatrix().withFeature(LFeature)
-                }
-            }
-
-            LupDecompositionFeature::class -> object : LupDecompositionFeature<Double> {
-                private val lup by lazy {
-                    DecompositionFactory_DDRM.lu(origin.numRows, origin.numCols).apply { decompose(origin.copy()) }
-                }
-
-                override val l: Matrix<Double> by lazy {
-                    lup.getLower(null).wrapMatrix().withFeature(LFeature)
-                }
-
-                override val u: Matrix<Double> by lazy {
-                    lup.getUpper(null).wrapMatrix().withFeature(UFeature)
-                }
-
-                override val p: Matrix<Double> by lazy { lup.getRowPivot(null).wrapMatrix() }
-            }
-
-            else -> null
-        }?.let{
-            type.cast(it)
-        }
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p matrix.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Double>, b: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
-        val res = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
-        return res.wrapMatrix()
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p vector.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Double>, b: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
-        val res = DMatrixRMaj(1, 1)
-        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
-        return EjmlDoubleVector(res)
-    }
-}
-
-/**
- * [EjmlLinearSpace] implementation based on [CommonOps_FDRM], [DecompositionFactory_FDRM] operations and
- * [FMatrixRMaj] matrices.
- */
-public object EjmlLinearSpaceFDRM : EjmlLinearSpace<Float, FloatField, FMatrixRMaj>() {
-    /**
-     * The [FloatField] reference.
-     */
-    override val elementAlgebra: FloatField get() = FloatField
-
-    @Suppress("UNCHECKED_CAST")
-    override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixRMaj> = when {
-        this is EjmlFloatMatrix<*> && origin is FMatrixRMaj -> this as EjmlFloatMatrix<FMatrixRMaj>
-        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixRMaj> = when {
-        this is EjmlFloatVector<*> && origin is FMatrixRMaj -> this as EjmlFloatVector<FMatrixRMaj>
-        else -> EjmlFloatVector(FMatrixRMaj(size, 1).also {
-            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
-        })
-    }
-
-    override fun buildMatrix(
-        rows: Int,
-        columns: Int,
-        initializer: FloatField.(i: Int, j: Int) -> Float,
-    ): EjmlFloatMatrix<FMatrixRMaj> = FMatrixRMaj(rows, columns).also {
-        (0 until rows).forEach { row ->
-            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
-        }
-    }.wrapMatrix()
-
-    override fun buildVector(
-        size: Int,
-        initializer: FloatField.(Int) -> Float,
-    ): EjmlFloatVector<FMatrixRMaj> = EjmlFloatVector(FMatrixRMaj(size, 1).also {
-        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
-    })
-
-    private fun <T : FMatrix> T.wrapMatrix() = EjmlFloatMatrix(this)
-    private fun <T : FMatrix> T.wrapVector() = EjmlFloatVector(this)
-
-    override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
-
-    override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
-        val out = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.mult(toEjml().origin, other.toEjml().origin, out)
-        return out.wrapMatrix()
-    }
-
-    override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
-        val out = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.mult(toEjml().origin, vector.toEjml().origin, out)
-        return out.wrapVector()
-    }
-
-    override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
-        val out = FMatrixRMaj(1, 1)
-
-        CommonOps_FDRM.add(
-            elementAlgebra.one, 
-            toEjml().origin, 
-            elementAlgebra { -one },
-            other.toEjml().origin, 
-            out,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixRMaj> {
-        val res = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.scale(value, toEjml().origin, res)
-        return res.wrapMatrix()
-    }
-
-    override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixRMaj> {
-        val res = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.changeSign(toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
-        val out = FMatrixRMaj(1, 1)
-        
-        CommonOps_FDRM.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin, 
-            out,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
-        val out = FMatrixRMaj(1, 1)
-
-        CommonOps_FDRM.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin,
-            out,
-        )
-
-        return out.wrapVector()
-    }
-
-    override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
-        val out = FMatrixRMaj(1, 1)
-
-        CommonOps_FDRM.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra { -one },
-            other.toEjml().origin,
-            out,
-        )
-
-        return out.wrapVector()
-    }
-
-    override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> = m * this
-
-    override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixRMaj> {
-        val res = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.scale(value, toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixRMaj> = v * this
-
-    @UnstableKMathAPI
-    override fun <F : StructureFeature> computeFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
-        structure.getFeature(type)?.let { return it }
-        val origin = structure.toEjml().origin
-
-        return when (type) {
-            InverseMatrixFeature::class -> object : InverseMatrixFeature<Float> {
-                override val inverse: Matrix<Float> by lazy {
-                    val res = origin.copy()
-                    CommonOps_FDRM.invert(res)
-                    res.wrapMatrix()
-                }
-            }
-
-            DeterminantFeature::class -> object : DeterminantFeature<Float> {
-                override val determinant: Float by lazy { CommonOps_FDRM.det(origin) }
-            }
-
-            SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<Float> {
-                private val svd by lazy {
-                    DecompositionFactory_FDRM.svd(origin.numRows, origin.numCols, true, true, false)
-                        .apply { decompose(origin.copy()) }
-                }
-
-                override val u: Matrix<Float> by lazy { svd.getU(null, false).wrapMatrix() }
-                override val s: Matrix<Float> by lazy { svd.getW(null).wrapMatrix() }
-                override val v: Matrix<Float> by lazy { svd.getV(null, false).wrapMatrix() }
-                override val singularValues: Point<Float> by lazy { FloatBuffer(svd.singularValues) }
-            }
-
-            QRDecompositionFeature::class -> object : QRDecompositionFeature<Float> {
-                private val qr by lazy {
-                    DecompositionFactory_FDRM.qr().apply { decompose(origin.copy()) }
-                }
-
-                override val q: Matrix<Float> by lazy {
-                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
-                }
-
-                override val r: Matrix<Float> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
-            }
-
-            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Float> {
-                override val l: Matrix<Float> by lazy {
-                    val cholesky =
-                        DecompositionFactory_FDRM.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
-
-                    cholesky.getT(null).wrapMatrix().withFeature(LFeature)
-                }
-            }
-
-            LupDecompositionFeature::class -> object : LupDecompositionFeature<Float> {
-                private val lup by lazy {
-                    DecompositionFactory_FDRM.lu(origin.numRows, origin.numCols).apply { decompose(origin.copy()) }
-                }
-
-                override val l: Matrix<Float> by lazy {
-                    lup.getLower(null).wrapMatrix().withFeature(LFeature)
-                }
-
-                override val u: Matrix<Float> by lazy {
-                    lup.getUpper(null).wrapMatrix().withFeature(UFeature)
-                }
-
-                override val p: Matrix<Float> by lazy { lup.getRowPivot(null).wrapMatrix() }
-            }
-
-            else -> null
-        }?.let{
-            type.cast(it)
-        }
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p matrix.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Float>, b: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
-        val res = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.solve(FMatrixRMaj(a.toEjml().origin), FMatrixRMaj(b.toEjml().origin), res)
-        return res.wrapMatrix()
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p vector.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Float>, b: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
-        val res = FMatrixRMaj(1, 1)
-        CommonOps_FDRM.solve(FMatrixRMaj(a.toEjml().origin), FMatrixRMaj(b.toEjml().origin), res)
-        return EjmlFloatVector(res)
-    }
-}
-
-/**
- * [EjmlLinearSpace] implementation based on [CommonOps_DSCC], [DecompositionFactory_DSCC] operations and
- * [DMatrixSparseCSC] matrices.
- */
-public object EjmlLinearSpaceDSCC : EjmlLinearSpace<Double, DoubleField, DMatrixSparseCSC>() {
-    /**
-     * The [DoubleField] reference.
-     */
-    override val elementAlgebra: DoubleField get() = DoubleField
-
-    @Suppress("UNCHECKED_CAST")
-    override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixSparseCSC> = when {
-        this is EjmlDoubleMatrix<*> && origin is DMatrixSparseCSC -> this as EjmlDoubleMatrix<DMatrixSparseCSC>
-        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixSparseCSC> = when {
-        this is EjmlDoubleVector<*> && origin is DMatrixSparseCSC -> this as EjmlDoubleVector<DMatrixSparseCSC>
-        else -> EjmlDoubleVector(DMatrixSparseCSC(size, 1).also {
-            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
-        })
-    }
-
-    override fun buildMatrix(
-        rows: Int,
-        columns: Int,
-        initializer: DoubleField.(i: Int, j: Int) -> Double,
-    ): EjmlDoubleMatrix<DMatrixSparseCSC> = DMatrixSparseCSC(rows, columns).also {
-        (0 until rows).forEach { row ->
-            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
-        }
-    }.wrapMatrix()
-
-    override fun buildVector(
-        size: Int,
-        initializer: DoubleField.(Int) -> Double,
-    ): EjmlDoubleVector<DMatrixSparseCSC> = EjmlDoubleVector(DMatrixSparseCSC(size, 1).also {
-        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
-    })
-
-    private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
-    private fun <T : DMatrix> T.wrapVector() = EjmlDoubleVector(this)
-
-    override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
-
-    override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
-        val out = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.mult(toEjml().origin, other.toEjml().origin, out)
-        return out.wrapMatrix()
-    }
-
-    override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
-        val out = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.mult(toEjml().origin, vector.toEjml().origin, out)
-        return out.wrapVector()
-    }
-
-    override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
-        val out = DMatrixSparseCSC(1, 1)
-
-        CommonOps_DSCC.add(
-            elementAlgebra.one, 
-            toEjml().origin, 
-            elementAlgebra { -one },
-            other.toEjml().origin, 
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixSparseCSC> {
-        val res = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.scale(value, toEjml().origin, res)
-        return res.wrapMatrix()
-    }
-
-    override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixSparseCSC> {
-        val res = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.changeSign(toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
-        val out = DMatrixSparseCSC(1, 1)
-        
-        CommonOps_DSCC.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin, 
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
-        val out = DMatrixSparseCSC(1, 1)
-
-        CommonOps_DSCC.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin,
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapVector()
-    }
-
-    override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
-        val out = DMatrixSparseCSC(1, 1)
-
-        CommonOps_DSCC.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra { -one },
-            other.toEjml().origin,
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapVector()
-    }
-
-    override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> = m * this
-
-    override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixSparseCSC> {
-        val res = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.scale(value, toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> = v * this
-
-    @UnstableKMathAPI
-    override fun <F : StructureFeature> computeFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
-        structure.getFeature(type)?.let { return it }
-        val origin = structure.toEjml().origin
-
-        return when (type) {
-            QRDecompositionFeature::class -> object : QRDecompositionFeature<Double> {
-                private val qr by lazy {
-                    DecompositionFactory_DSCC.qr(FillReducing.NONE).apply { decompose(origin.copy()) }
-                }
-
-                override val q: Matrix<Double> by lazy {
-                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
-                }
-
-                override val r: Matrix<Double> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
-            }
-
-            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Double> {
-                override val l: Matrix<Double> by lazy {
-                    val cholesky =
-                        DecompositionFactory_DSCC.cholesky().apply { decompose(origin.copy()) }
-
-                    (cholesky.getT(null) as DMatrix).wrapMatrix().withFeature(LFeature)
-                }
-            }
-
-            LUDecompositionFeature::class, DeterminantFeature::class, InverseMatrixFeature::class -> object :
-                LUDecompositionFeature<Double>, DeterminantFeature<Double>, InverseMatrixFeature<Double> {
-                private val lu by lazy {
-                    DecompositionFactory_DSCC.lu(FillReducing.NONE).apply { decompose(origin.copy()) }
-                }
-
-                override val l: Matrix<Double> by lazy {
-                    lu.getLower(null).wrapMatrix().withFeature(LFeature)
-                }
-
-                override val u: Matrix<Double> by lazy {
-                    lu.getUpper(null).wrapMatrix().withFeature(UFeature)
-                }
-
-                override val inverse: Matrix<Double> by lazy {
-                    var a = origin
-                    val inverse = DMatrixRMaj(1, 1)
-                    val solver = LinearSolverFactory_DSCC.lu(FillReducing.NONE)
-                    if (solver.modifiesA()) a = a.copy()
-                    val i = CommonOps_DDRM.identity(a.numRows)
-                    solver.solve(i, inverse)
-                    inverse.wrapMatrix()
-                }
-
-                override val determinant: Double by lazy { elementAlgebra.number(lu.computeDeterminant().real) }
-            }
-
-            else -> null
-        }?.let{
-            type.cast(it)
-        }
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p matrix.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Double>, b: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
-        val res = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.solve(DMatrixSparseCSC(a.toEjml().origin), DMatrixSparseCSC(b.toEjml().origin), res)
-        return res.wrapMatrix()
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p vector.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Double>, b: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
-        val res = DMatrixSparseCSC(1, 1)
-        CommonOps_DSCC.solve(DMatrixSparseCSC(a.toEjml().origin), DMatrixSparseCSC(b.toEjml().origin), res)
-        return EjmlDoubleVector(res)
-    }
-}
-
-/**
- * [EjmlLinearSpace] implementation based on [CommonOps_FSCC], [DecompositionFactory_FSCC] operations and
- * [FMatrixSparseCSC] matrices.
- */
-public object EjmlLinearSpaceFSCC : EjmlLinearSpace<Float, FloatField, FMatrixSparseCSC>() {
-    /**
-     * The [FloatField] reference.
-     */
-    override val elementAlgebra: FloatField get() = FloatField
-
-    @Suppress("UNCHECKED_CAST")
-    override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixSparseCSC> = when {
-        this is EjmlFloatMatrix<*> && origin is FMatrixSparseCSC -> this as EjmlFloatMatrix<FMatrixSparseCSC>
-        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixSparseCSC> = when {
-        this is EjmlFloatVector<*> && origin is FMatrixSparseCSC -> this as EjmlFloatVector<FMatrixSparseCSC>
-        else -> EjmlFloatVector(FMatrixSparseCSC(size, 1).also {
-            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
-        })
-    }
-
-    override fun buildMatrix(
-        rows: Int,
-        columns: Int,
-        initializer: FloatField.(i: Int, j: Int) -> Float,
-    ): EjmlFloatMatrix<FMatrixSparseCSC> = FMatrixSparseCSC(rows, columns).also {
-        (0 until rows).forEach { row ->
-            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
-        }
-    }.wrapMatrix()
-
-    override fun buildVector(
-        size: Int,
-        initializer: FloatField.(Int) -> Float,
-    ): EjmlFloatVector<FMatrixSparseCSC> = EjmlFloatVector(FMatrixSparseCSC(size, 1).also {
-        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
-    })
-
-    private fun <T : FMatrix> T.wrapMatrix() = EjmlFloatMatrix(this)
-    private fun <T : FMatrix> T.wrapVector() = EjmlFloatVector(this)
-
-    override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
-
-    override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
-        val out = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.mult(toEjml().origin, other.toEjml().origin, out)
-        return out.wrapMatrix()
-    }
-
-    override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
-        val out = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.mult(toEjml().origin, vector.toEjml().origin, out)
-        return out.wrapVector()
-    }
-
-    override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
-        val out = FMatrixSparseCSC(1, 1)
-
-        CommonOps_FSCC.add(
-            elementAlgebra.one, 
-            toEjml().origin, 
-            elementAlgebra { -one },
-            other.toEjml().origin, 
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixSparseCSC> {
-        val res = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.scale(value, toEjml().origin, res)
-        return res.wrapMatrix()
-    }
-
-    override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixSparseCSC> {
-        val res = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.changeSign(toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
-        val out = FMatrixSparseCSC(1, 1)
-        
-        CommonOps_FSCC.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin, 
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapMatrix()
-    }
-
-    override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
-        val out = FMatrixSparseCSC(1, 1)
-
-        CommonOps_FSCC.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra.one,
-            other.toEjml().origin,
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapVector()
-    }
-
-    override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
-        val out = FMatrixSparseCSC(1, 1)
-
-        CommonOps_FSCC.add(
-            elementAlgebra.one,
-            toEjml().origin,
-            elementAlgebra { -one },
-            other.toEjml().origin,
-            out,
-            null, 
-            null,
-        )
-
-        return out.wrapVector()
-    }
-
-    override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> = m * this
-
-    override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixSparseCSC> {
-        val res = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.scale(value, toEjml().origin, res)
-        return res.wrapVector()
-    }
-
-    override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> = v * this
-
-    @UnstableKMathAPI
-    override fun <F : StructureFeature> computeFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
-        structure.getFeature(type)?.let { return it }
-        val origin = structure.toEjml().origin
-
-        return when (type) {
-            QRDecompositionFeature::class -> object : QRDecompositionFeature<Float> {
-                private val qr by lazy {
-                    DecompositionFactory_FSCC.qr(FillReducing.NONE).apply { decompose(origin.copy()) }
-                }
-
-                override val q: Matrix<Float> by lazy {
-                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
-                }
-
-                override val r: Matrix<Float> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
-            }
-
-            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Float> {
-                override val l: Matrix<Float> by lazy {
-                    val cholesky =
-                        DecompositionFactory_FSCC.cholesky().apply { decompose(origin.copy()) }
-
-                    (cholesky.getT(null) as FMatrix).wrapMatrix().withFeature(LFeature)
-                }
-            }
-
-            LUDecompositionFeature::class, DeterminantFeature::class, InverseMatrixFeature::class -> object :
-                LUDecompositionFeature<Float>, DeterminantFeature<Float>, InverseMatrixFeature<Float> {
-                private val lu by lazy {
-                    DecompositionFactory_FSCC.lu(FillReducing.NONE).apply { decompose(origin.copy()) }
-                }
-
-                override val l: Matrix<Float> by lazy {
-                    lu.getLower(null).wrapMatrix().withFeature(LFeature)
-                }
-
-                override val u: Matrix<Float> by lazy {
-                    lu.getUpper(null).wrapMatrix().withFeature(UFeature)
-                }
-
-                override val inverse: Matrix<Float> by lazy {
-                    var a = origin
-                    val inverse = FMatrixRMaj(1, 1)
-                    val solver = LinearSolverFactory_FSCC.lu(FillReducing.NONE)
-                    if (solver.modifiesA()) a = a.copy()
-                    val i = CommonOps_FDRM.identity(a.numRows)
-                    solver.solve(i, inverse)
-                    inverse.wrapMatrix()
-                }
-
-                override val determinant: Float by lazy { elementAlgebra.number(lu.computeDeterminant().real) }
-            }
-
-            else -> null
-        }?.let{
-            type.cast(it)
-        }
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p matrix.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Float>, b: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
-        val res = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.solve(FMatrixSparseCSC(a.toEjml().origin), FMatrixSparseCSC(b.toEjml().origin), res)
-        return res.wrapMatrix()
-    }
-
-    /**
-     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
-     *
-     * @param a the base matrix.
-     * @param b n by p vector.
-     * @return the solution for *x* that is n by p.
-     */
-    public fun solve(a: Matrix<Float>, b: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
-        val res = FMatrixSparseCSC(1, 1)
-        CommonOps_FSCC.solve(FMatrixSparseCSC(a.toEjml().origin), FMatrixSparseCSC(b.toEjml().origin), res)
-        return EjmlFloatVector(res)
-    }
-}
-
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
index 90ec29ce3..eafd55513 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
@@ -28,7 +28,7 @@ public class UniformHistogramGroupND<V : Any, A : Field<V>>(
     private val lower: Buffer<Double>,
     private val upper: Buffer<Double>,
     private val binNums: IntArray = IntArray(lower.size) { 20 },
-    private val bufferFactory: BufferFactory<V> = Buffer.Companion::boxing,
+    private val bufferFactory: BufferFactory<V> = BufferFactory(Buffer.Companion::boxing),
 ) : HistogramGroupND<Double, HyperSquareDomain, V> {
 
     init {
@@ -114,7 +114,7 @@ public class UniformHistogramGroupND<V : Any, A : Field<V>>(
 public fun <V : Any, A : Field<V>> Histogram.Companion.uniformNDFromRanges(
     valueAlgebraND: FieldOpsND<V, A>,
     vararg ranges: ClosedFloatingPointRange<Double>,
-    bufferFactory: BufferFactory<V> = Buffer.Companion::boxing,
+    bufferFactory: BufferFactory<V> = BufferFactory(Buffer.Companion::boxing),
 ): UniformHistogramGroupND<V, A> = UniformHistogramGroupND(
     valueAlgebraND,
     ranges.map(ClosedFloatingPointRange<Double>::start).asBuffer(),
@@ -140,7 +140,7 @@ public fun Histogram.Companion.uniformDoubleNDFromRanges(
 public fun <V : Any, A : Field<V>> Histogram.Companion.uniformNDFromRanges(
     valueAlgebraND: FieldOpsND<V, A>,
     vararg ranges: Pair<ClosedFloatingPointRange<Double>, Int>,
-    bufferFactory: BufferFactory<V> = Buffer.Companion::boxing,
+    bufferFactory: BufferFactory<V> = BufferFactory(Buffer.Companion::boxing),
 ): UniformHistogramGroupND<V, A> = UniformHistogramGroupND(
     valueAlgebraND,
     ListBuffer(
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
index 1dc318517..0de2d8349 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.multik
 
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.ExponentialOperations
@@ -22,10 +23,13 @@ public object MultikDoubleAlgebra : MultikDivisionTensorAlgebra<Double, DoubleFi
 
     override fun tan(arg: StructureND<Double>): MultikTensor<Double> = sin(arg) / cos(arg)
 
+    @PerformancePitfall
     override fun asin(arg: StructureND<Double>): MultikTensor<Double>  = arg.map { asin(it) }
 
+    @PerformancePitfall
     override fun acos(arg: StructureND<Double>): MultikTensor<Double> = arg.map { acos(it) }
 
+    @PerformancePitfall
     override fun atan(arg: StructureND<Double>): MultikTensor<Double> = arg.map { atan(it) }
 
     override fun exp(arg: StructureND<Double>): MultikTensor<Double> = multikMath.mathEx.exp(arg.asMultik().array).wrap()
@@ -42,10 +46,13 @@ public object MultikDoubleAlgebra : MultikDivisionTensorAlgebra<Double, DoubleFi
         return (expPlus - expMinus) / (expPlus + expMinus)
     }
 
+    @PerformancePitfall
     override fun asinh(arg: StructureND<Double>): MultikTensor<Double> = arg.map { asinh(it) }
 
+    @PerformancePitfall
     override fun acosh(arg: StructureND<Double>): MultikTensor<Double> = arg.map { acosh(it) }
 
+    @PerformancePitfall
     override fun atanh(arg: StructureND<Double>): MultikTensor<Double> = arg.map { atanh(it) }
 }
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
index a88f3e437..890318e31 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
@@ -35,7 +35,7 @@ public fun interface Sampler<out T : Any> {
 public fun <T : Any> Sampler<T>.sampleBuffer(
     generator: RandomGenerator,
     size: Int,
-    bufferFactory: BufferFactory<T> = Buffer.Companion::boxing,
+    bufferFactory: BufferFactory<T> = BufferFactory(Buffer.Companion::boxing),
 ): Chain<Buffer<T>> {
     require(size > 1)
     //creating temporary storage once
-- 
2.34.1


From f5fe53a9f234edd47ecb2e7d73e7700e12f4a01c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 15 Jul 2022 16:20:28 +0300
Subject: [PATCH 570/713] Grand derivative refactoring. Phase 2

---
 .../kscience/kmath/expressions/DSAlgebra.kt   | 437 ++++++++++++++++++
 .../kmath/expressions/DerivativeStructure.kt  | 157 -------
 .../DerivativeStructureExpression.kt          | 349 --------------
 .../DerivativeStructureExpressionTest.kt      |   4 +-
 4 files changed, 439 insertions(+), 508 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructure.kt
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpression.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
new file mode 100644
index 000000000..d9fc46b47
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
@@ -0,0 +1,437 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+package space.kscience.kmath.expressions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.*
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.MutableBuffer
+import space.kscience.kmath.structures.MutableBufferFactory
+import space.kscience.kmath.structures.asBuffer
+import kotlin.math.max
+import kotlin.math.min
+
+/**
+ * Class representing both the value and the differentials of a function.
+ *
+ * This class is the workhorse of the differentiation package.
+ *
+ * This class is an implementation of the extension to Rall's numbers described in Dan Kalman's paper
+ * [Doubly Recursive Multivariate Automatic Differentiation](http://www1.american.edu/cas/mathstat/People/kalman/pdffiles/mmgautodiff.pdf),
+ * Mathematics Magazine, vol. 75, no. 3, June 2002. Rall's numbers are an extension to the real numbers used
+ * throughout mathematical expressions; they hold the derivative together with the value of a function. Dan Kalman's
+ * derivative structures hold all partial derivatives up to any specified order, with respect to any number of free
+ * parameters. Rall's numbers therefore can be seen as derivative structures for order one derivative and one free
+ * parameter, and real numbers can be seen as derivative structures with zero order derivative and no free parameters.
+ *
+ * Derived from
+ * [Commons Math's `DerivativeStructure`](https://github.com/apache/commons-math/blob/924f6c357465b39beb50e3c916d5eb6662194175/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/differentiation/DerivativeStructure.java).
+ */
+@UnstableKMathAPI
+public interface DS<T, A : Ring<T>> {
+    public val derivativeAlgebra: DSAlgebra<T, A>
+    public val data: Buffer<T>
+}
+
+/**
+ * Get a partial derivative.
+ *
+ * @param orders derivation orders with respect to each variable (if all orders are 0, the value is returned).
+ * @return partial derivative.
+ * @see value
+ */
+@UnstableKMathAPI
+public fun <T, A : Ring<T>> DS<T, A>.getPartialDerivative(vararg orders: Int): T =
+    data[derivativeAlgebra.compiler.getPartialDerivativeIndex(*orders)]
+
+/**
+ * The value part of the derivative structure.
+ *
+ * @see getPartialDerivative
+ */
+@UnstableKMathAPI
+public val <T, A : Ring<T>> DS<T, A>.value: T get() = data[0]
+
+@UnstableKMathAPI
+public abstract class DSAlgebra<T, A : Ring<T>>(
+    public val algebra: A,
+    public val bufferFactory: MutableBufferFactory<T>,
+    public val order: Int,
+    bindings: Map<Symbol, T>,
+) : ExpressionAlgebra<T, DS<T, A>> {
+
+    @OptIn(UnstableKMathAPI::class)
+    private fun bufferForVariable(index: Int, value: T): Buffer<T> {
+        val buffer = bufferFactory(compiler.size) { algebra.zero }
+        buffer[0] = value
+        if (compiler.order > 0) {
+            // the derivative of the variable with respect to itself is 1.
+
+            val indexOfDerivative = compiler.getPartialDerivativeIndex(*IntArray(numberOfVariables).apply {
+                set(index, 1)
+            })
+
+            buffer[indexOfDerivative] = algebra.one
+        }
+        return buffer
+    }
+
+    @UnstableKMathAPI
+    protected inner class DSImpl internal constructor(
+        override val data: Buffer<T>,
+    ) : DS<T, A> {
+        override val derivativeAlgebra: DSAlgebra<T, A> get() = this@DSAlgebra
+    }
+
+    protected fun DS(data: Buffer<T>): DS<T, A> = DSImpl(data)
+
+
+    /**
+     * Build an instance representing a variable.
+     *
+     * Instances built using this constructor are considered to be the free variables with respect to which
+     * differentials are computed. As such, their differential with respect to themselves is +1.
+     */
+    public fun variable(
+        index: Int,
+        value: T,
+    ): DS<T, A> {
+        require(index < compiler.freeParameters) { "number is too large: $index >= ${compiler.freeParameters}" }
+        return DS(bufferForVariable(index, value))
+    }
+
+    /**
+     * Build an instance from all its derivatives.
+     *
+     * @param derivatives derivatives sorted according to [DSCompiler.getPartialDerivativeIndex].
+     */
+    public fun ofDerivatives(
+        vararg derivatives: T,
+    ): DS<T, A> {
+        require(derivatives.size == compiler.size) { "dimension mismatch: ${derivatives.size} and ${compiler.size}" }
+        val data = derivatives.asBuffer()
+
+        return DS(data)
+    }
+
+    /**
+     * A class implementing both [DS] and [Symbol].
+     */
+    @UnstableKMathAPI
+    public inner class DSSymbol internal constructor(
+        index: Int,
+        symbol: Symbol,
+        value: T,
+    ) : Symbol by symbol, DS<T, A> {
+        override val derivativeAlgebra: DSAlgebra<T, A> get() = this@DSAlgebra
+        override val data: Buffer<T> = bufferForVariable(index, value)
+    }
+
+
+    public val numberOfVariables: Int = bindings.size
+
+    /**
+     * Get the compiler for number of free parameters and order.
+     *
+     * @return cached rules set.
+     */
+    @PublishedApi
+    internal val compiler: DSCompiler<T, A> by lazy {
+        // get the cached compilers
+        val cache: Array<Array<DSCompiler<T, A>?>>? = null
+
+        // we need to create more compilers
+        val maxParameters: Int = max(numberOfVariables, cache?.size ?: 0)
+        val maxOrder: Int = max(order, if (cache == null) 0 else cache[0].size)
+        val newCache: Array<Array<DSCompiler<T, A>?>> = Array(maxParameters + 1) { arrayOfNulls(maxOrder + 1) }
+
+        if (cache != null) {
+            // preserve the already created compilers
+            for (i in cache.indices) {
+                cache[i].copyInto(newCache[i], endIndex = cache[i].size)
+            }
+        }
+
+        // create the array in increasing diagonal order
+        for (diag in 0..numberOfVariables + order) {
+            for (o in max(0, diag - numberOfVariables)..min(order, diag)) {
+                val p: Int = diag - o
+                if (newCache[p][o] == null) {
+                    val valueCompiler: DSCompiler<T, A>? = if (p == 0) null else newCache[p - 1][o]!!
+                    val derivativeCompiler: DSCompiler<T, A>? = if (o == 0) null else newCache[p][o - 1]!!
+
+                    newCache[p][o] = DSCompiler(
+                        algebra,
+                        bufferFactory,
+                        p,
+                        o,
+                        valueCompiler,
+                        derivativeCompiler,
+                    )
+                }
+            }
+        }
+
+        return@lazy newCache[numberOfVariables][order]!!
+    }
+
+    private val variables: Map<Symbol, DSSymbol> = bindings.entries.mapIndexed { index, (key, value) ->
+        key to DSSymbol(
+            index,
+            key,
+            value,
+        )
+    }.toMap()
+
+
+    public override fun const(value: T): DS<T, A> {
+        val buffer = bufferFactory(compiler.size) { algebra.zero }
+        buffer[0] = value
+
+        return DS(buffer)
+    }
+
+    override fun bindSymbolOrNull(value: String): DSSymbol? = variables[StringSymbol(value)]
+
+    override fun bindSymbol(value: String): DSSymbol =
+        bindSymbolOrNull(value) ?: error("Symbol '$value' is not supported in $this")
+
+    public fun bindSymbolOrNull(symbol: Symbol): DSSymbol? = variables[symbol.identity]
+
+    public fun bindSymbol(symbol: Symbol): DSSymbol =
+        bindSymbolOrNull(symbol.identity) ?: error("Symbol '${symbol}' is not supported in $this")
+
+    public fun DS<T, A>.derivative(symbols: List<Symbol>): T {
+        require(symbols.size <= order) { "The order of derivative ${symbols.size} exceeds computed order $order" }
+        val ordersCount = symbols.groupBy { it }.mapValues { it.value.size }
+        return getPartialDerivative(*variables.keys.map { ordersCount[it] ?: 0 }.toIntArray())
+    }
+
+    public fun DS<T, A>.derivative(vararg symbols: Symbol): T = derivative(symbols.toList())
+
+}
+
+
+/**
+ * A ring over [DS].
+ *
+ * @property order The derivation order.
+ * @param bindings The map of bindings values. All bindings are considered free parameters.
+ */
+@UnstableKMathAPI
+public open class DSRing<T, A>(
+    algebra: A,
+    bufferFactory: MutableBufferFactory<T>,
+    order: Int,
+    bindings: Map<Symbol, T>,
+) : DSAlgebra<T, A>(algebra, bufferFactory, order, bindings),
+    Ring<DS<T, A>>, ScaleOperations<DS<T, A>>,
+    NumericAlgebra<DS<T, A>>,
+    NumbersAddOps<DS<T, A>> where A : Ring<T>, A : NumericAlgebra<T>, A : ScaleOperations<T> {
+
+    override fun bindSymbolOrNull(value: String): DSSymbol? =
+        super<DSAlgebra>.bindSymbolOrNull(value)
+
+    override fun DS<T, A>.unaryMinus(): DS<T, A> = mapData { -it }
+
+    /**
+     * Create a copy of given [Buffer] and modify it according to [block]
+     */
+    protected inline fun DS<T, A>.transformDataBuffer(block: A.(MutableBuffer<T>) -> Unit): DS<T, A> {
+        require(derivativeAlgebra == this@DSRing) { "All derivative operations should be done in the same algebra" }
+        val newData = bufferFactory(compiler.size) { data[it] }
+        algebra.block(newData)
+        return DS(newData)
+    }
+
+    protected fun DS<T, A>.mapData(block: A.(T) -> T): DS<T, A> {
+        require(derivativeAlgebra == this@DSRing) { "All derivative operations should be done in the same algebra" }
+        val newData: Buffer<T> = data.map(bufferFactory) {
+            algebra.block(it)
+        }
+        return DS(newData)
+    }
+
+    protected fun DS<T, A>.mapDataIndexed(block: (Int, T) -> T): DS<T, A> {
+        require(derivativeAlgebra == this@DSRing) { "All derivative operations should be done in the same algebra" }
+        val newData: Buffer<T> = data.mapIndexed(bufferFactory, block)
+        return DS(newData)
+    }
+
+    override val zero: DS<T, A> by lazy {
+        const(algebra.zero)
+    }
+
+    override val one: DS<T, A> by lazy {
+        const(algebra.one)
+    }
+
+    override fun number(value: Number): DS<T, A> = const(algebra.number(value))
+
+    override fun add(left: DS<T, A>, right: DS<T, A>): DS<T, A> = left.transformDataBuffer { result ->
+        require(right.derivativeAlgebra == this@DSRing) { "All derivative operations should be done in the same algebra" }
+        compiler.add(left.data, 0, right.data, 0, result, 0)
+    }
+
+    override fun scale(a: DS<T, A>, value: Double): DS<T, A> = a.mapData {
+        it.times(value)
+    }
+
+    override fun multiply(
+        left: DS<T, A>,
+        right: DS<T, A>,
+    ): DS<T, A> = left.transformDataBuffer { result ->
+        compiler.multiply(left.data, 0, right.data, 0, result, 0)
+    }
+//
+//    override fun DS<T, A>.minus(arg: DS): DS<T, A> = transformDataBuffer { result ->
+//        subtract(data, 0, arg.data, 0, result, 0)
+//    }
+
+    override operator fun DS<T, A>.plus(other: Number): DS<T, A> = transformDataBuffer {
+        it[0] += number(other)
+    }
+
+//
+//    override operator fun DS<T, A>.minus(other: Number): DS<T, A> =
+//        this + (-other.toDouble())
+
+    override operator fun Number.plus(other: DS<T, A>): DS<T, A> = other + this
+    override operator fun Number.minus(other: DS<T, A>): DS<T, A> = other - this
+}
+
+@UnstableKMathAPI
+public class DerivativeStructureRingExpression<T, A>(
+    public val algebra: A,
+    public val bufferFactory: MutableBufferFactory<T>,
+    public val function: DSRing<T, A>.() -> DS<T, A>,
+) : DifferentiableExpression<T> where A : Ring<T>, A : ScaleOperations<T>, A : NumericAlgebra<T> {
+    override operator fun invoke(arguments: Map<Symbol, T>): T =
+        DSRing(algebra, bufferFactory, 0, arguments).function().value
+
+    override fun derivativeOrNull(symbols: List<Symbol>): Expression<T> = Expression { arguments ->
+        with(
+            DSRing(
+                algebra,
+                bufferFactory,
+                symbols.size,
+                arguments
+            )
+        ) { function().derivative(symbols) }
+    }
+}
+
+/**
+ * A field over commons-math [DerivativeStructure].
+ *
+ * @property order The derivation order.
+ * @param bindings The map of bindings values. All bindings are considered free parameters.
+ */
+@UnstableKMathAPI
+public class DSField<T, A : ExtendedField<T>>(
+    algebra: A,
+    bufferFactory: MutableBufferFactory<T>,
+    order: Int,
+    bindings: Map<Symbol, T>,
+) : DSRing<T, A>(algebra, bufferFactory, order, bindings), ExtendedField<DS<T, A>> {
+    override fun number(value: Number): DS<T, A> = const(algebra.number(value))
+
+    override fun divide(left: DS<T, A>, right: DS<T, A>): DS<T, A> = left.transformDataBuffer { result ->
+        compiler.divide(left.data, 0, right.data, 0, result, 0)
+    }
+
+    override fun sin(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.sin(arg.data, 0, result, 0)
+    }
+
+    override fun cos(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.cos(arg.data, 0, result, 0)
+    }
+
+    override fun tan(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.tan(arg.data, 0, result, 0)
+    }
+
+    override fun asin(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.asin(arg.data, 0, result, 0)
+    }
+
+    override fun acos(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.acos(arg.data, 0, result, 0)
+    }
+
+    override fun atan(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.atan(arg.data, 0, result, 0)
+    }
+
+    override fun sinh(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.sinh(arg.data, 0, result, 0)
+    }
+
+    override fun cosh(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.cosh(arg.data, 0, result, 0)
+    }
+
+    override fun tanh(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.tanh(arg.data, 0, result, 0)
+    }
+
+    override fun asinh(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.asinh(arg.data, 0, result, 0)
+    }
+
+    override fun acosh(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.acosh(arg.data, 0, result, 0)
+    }
+
+    override fun atanh(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.atanh(arg.data, 0, result, 0)
+    }
+
+    override fun power(arg: DS<T, A>, pow: Number): DS<T, A> = when (pow) {
+        is Int -> arg.transformDataBuffer { result ->
+            compiler.pow(arg.data, 0, pow, result, 0)
+        }
+        else -> arg.transformDataBuffer { result ->
+            compiler.pow(arg.data, 0, pow.toDouble(), result, 0)
+        }
+    }
+
+    override fun sqrt(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.sqrt(arg.data, 0, result, 0)
+    }
+
+    public fun power(arg: DS<T, A>, pow: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.pow(arg.data, 0, pow.data, 0, result, 0)
+    }
+
+    override fun exp(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.exp(arg.data, 0, result, 0)
+    }
+
+    override fun ln(arg: DS<T, A>): DS<T, A> = arg.transformDataBuffer { result ->
+        compiler.ln(arg.data, 0, result, 0)
+    }
+}
+
+@UnstableKMathAPI
+public class DerivativeStructureFieldExpression<T, A : ExtendedField<T>>(
+    public val algebra: A,
+    public val bufferFactory: MutableBufferFactory<T>,
+    public val function: DSField<T, A>.() -> DS<T, A>,
+) : DifferentiableExpression<T> {
+    override operator fun invoke(arguments: Map<Symbol, T>): T =
+        DSField(algebra, bufferFactory, 0, arguments).function().value
+
+    override fun derivativeOrNull(symbols: List<Symbol>): Expression<T> = Expression { arguments ->
+        DSField(
+            algebra,
+            bufferFactory,
+            symbols.size,
+            arguments,
+        ).run { function().derivative(symbols) }
+    }
+}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructure.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructure.kt
deleted file mode 100644
index 01c045cdb..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructure.kt
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
-
-package space.kscience.kmath.expressions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asBuffer
-
-/**
- * Class representing both the value and the differentials of a function.
- *
- * This class is the workhorse of the differentiation package.
- *
- * This class is an implementation of the extension to Rall's numbers described in Dan Kalman's paper [Doubly Recursive
- * Multivariate Automatic Differentiation](http://www1.american.edu/cas/mathstat/People/kalman/pdffiles/mmgautodiff.pdf),
- * Mathematics Magazine, vol. 75, no. 3, June 2002. Rall's numbers are an extension to the real numbers used
- * throughout mathematical expressions; they hold the derivative together with the value of a function. Dan Kalman's
- * derivative structures hold all partial derivatives up to any specified order, with respect to any number of free
- * parameters. Rall's numbers therefore can be seen as derivative structures for order one derivative and one free
- * parameter, and real numbers can be seen as derivative structures with zero order derivative and no free parameters.
- *
- * Derived from
- * [Commons Math's `DerivativeStructure`](https://github.com/apache/commons-math/blob/924f6c357465b39beb50e3c916d5eb6662194175/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/differentiation/DerivativeStructure.java).
- */
-@UnstableKMathAPI
-public open class DerivativeStructure<T, A : Ring<T>> @PublishedApi internal constructor(
-    private val derivativeAlgebra: DerivativeStructureAlgebra<T, A>,
-    @PublishedApi internal val data: Buffer<T>,
-) {
-
-    public val compiler: DSCompiler<T, A> get() = derivativeAlgebra.compiler
-
-    /**
-     * The number of free parameters.
-     */
-    public val freeParameters: Int get() = compiler.freeParameters
-
-    /**
-     * The derivation order.
-     */
-    public val order: Int get() = compiler.order
-
-    /**
-     * The value part of the derivative structure.
-     *
-     * @see getPartialDerivative
-     */
-    public val value: T get() = data[0]
-
-    /**
-     * Get a partial derivative.
-     *
-     * @param orders derivation orders with respect to each variable (if all orders are 0, the value is returned).
-     * @return partial derivative.
-     * @see value
-     */
-    public fun getPartialDerivative(vararg orders: Int): T = data[compiler.getPartialDerivativeIndex(*orders)]
-
-
-    /**
-     * Test for the equality of two derivative structures.
-     *
-     * Derivative structures are considered equal if they have the same number
-     * of free parameters, the same derivation order, and the same derivatives.
-     *
-     * @return `true` if two derivative structures are equal.
-     */
-    public override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-
-        if (other is DerivativeStructure<*, *>) {
-            return ((freeParameters == other.freeParameters) &&
-                    (order == other.order) &&
-                    data == other.data)
-        }
-
-        return false
-    }
-
-    public override fun hashCode(): Int =
-        227 + 229 * freeParameters + 233 * order + 239 * data.hashCode()
-
-    public companion object {
-
-        /**
-         * Build an instance representing a variable.
-         *
-         * Instances built using this constructor are considered to be the free variables with respect to which
-         * differentials are computed. As such, their differential with respect to themselves is +1.
-         */
-        public fun <T, A : Ring<T>> variable(
-            derivativeAlgebra: DerivativeStructureAlgebra<T, A>,
-            index: Int,
-            value: T,
-        ): DerivativeStructure<T, A> {
-            val compiler = derivativeAlgebra.compiler
-            require(index < compiler.freeParameters) { "number is too large: $index >= ${compiler.freeParameters}" }
-            return DerivativeStructure(derivativeAlgebra, derivativeAlgebra.bufferForVariable(index, value))
-        }
-
-        /**
-         * Build an instance from all its derivatives.
-         *
-         * @param derivatives derivatives sorted according to [DSCompiler.getPartialDerivativeIndex].
-         */
-        public fun <T, A : Ring<T>> ofDerivatives(
-            derivativeAlgebra: DerivativeStructureAlgebra<T, A>,
-            vararg derivatives: T,
-        ): DerivativeStructure<T, A> {
-            val compiler = derivativeAlgebra.compiler
-            require(derivatives.size == compiler.size) { "dimension mismatch: ${derivatives.size} and ${compiler.size}" }
-            val data = derivatives.asBuffer()
-
-            return DerivativeStructure(
-                derivativeAlgebra,
-                data
-            )
-        }
-    }
-}
-
-@OptIn(UnstableKMathAPI::class)
-private fun <T, A : Ring<T>> DerivativeStructureAlgebra<T, A>.bufferForVariable(index: Int, value: T): Buffer<T> {
-    val buffer = bufferFactory(compiler.size) { algebra.zero }
-    buffer[0] = value
-    if (compiler.order > 0) {
-        // the derivative of the variable with respect to itself is 1.
-
-        val indexOfDerivative = compiler.getPartialDerivativeIndex(*IntArray(numberOfVariables).apply {
-            set(index, 1)
-        })
-
-        buffer[indexOfDerivative] = algebra.one
-    }
-    return buffer
-}
-
-/**
- * A class implementing both [DerivativeStructure] and [Symbol].
- */
-@UnstableKMathAPI
-public class DerivativeStructureSymbol<T, A : Ring<T>> internal constructor(
-    derivativeAlgebra: DerivativeStructureAlgebra<T, A>,
-    index: Int,
-    symbol: Symbol,
-    value: T,
-) : Symbol by symbol, DerivativeStructure<T, A>(
-    derivativeAlgebra, derivativeAlgebra.bufferForVariable(index, value)
-) {
-    override fun toString(): String = symbol.toString()
-    override fun equals(other: Any?): Boolean = (other as? Symbol) == symbol
-    override fun hashCode(): Int = symbol.hashCode()
-}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpression.kt
deleted file mode 100644
index 638057921..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpression.kt
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
-
-package space.kscience.kmath.expressions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.MutableBuffer
-import space.kscience.kmath.structures.MutableBufferFactory
-import kotlin.math.max
-import kotlin.math.min
-
-@UnstableKMathAPI
-public abstract class DerivativeStructureAlgebra<T, A : Ring<T>>(
-    public val algebra: A,
-    public val bufferFactory: MutableBufferFactory<T>,
-    public val order: Int,
-    bindings: Map<Symbol, T>,
-) : ExpressionAlgebra<T, DerivativeStructure<T, A>> {
-
-    public val numberOfVariables: Int = bindings.size
-
-
-    /**
-     * Get the compiler for number of free parameters and order.
-     *
-     * @return cached rules set.
-     */
-    @PublishedApi
-    internal val compiler: DSCompiler<T, A> by lazy {
-        // get the cached compilers
-        val cache: Array<Array<DSCompiler<T, A>?>>? = null
-
-        // we need to create more compilers
-        val maxParameters: Int = max(numberOfVariables, cache?.size ?: 0)
-        val maxOrder: Int = max(order, if (cache == null) 0 else cache[0].size)
-        val newCache: Array<Array<DSCompiler<T, A>?>> = Array(maxParameters + 1) { arrayOfNulls(maxOrder + 1) }
-
-        if (cache != null) {
-            // preserve the already created compilers
-            for (i in cache.indices) {
-                cache[i].copyInto(newCache[i], endIndex = cache[i].size)
-            }
-        }
-
-        // create the array in increasing diagonal order
-        for (diag in 0..numberOfVariables + order) {
-            for (o in max(0, diag - numberOfVariables)..min(order, diag)) {
-                val p: Int = diag - o
-                if (newCache[p][o] == null) {
-                    val valueCompiler: DSCompiler<T, A>? = if (p == 0) null else newCache[p - 1][o]!!
-                    val derivativeCompiler: DSCompiler<T, A>? = if (o == 0) null else newCache[p][o - 1]!!
-
-                    newCache[p][o] = DSCompiler(
-                        algebra,
-                        bufferFactory,
-                        p,
-                        o,
-                        valueCompiler,
-                        derivativeCompiler,
-                    )
-                }
-            }
-        }
-
-        return@lazy newCache[numberOfVariables][order]!!
-    }
-
-    private val variables: Map<Symbol, DerivativeStructureSymbol<T, A>> =
-        bindings.entries.mapIndexed { index, (key, value) ->
-            key to DerivativeStructureSymbol(
-                this,
-                index,
-                key,
-                value,
-            )
-        }.toMap()
-
-
-
-    public override fun const(value: T): DerivativeStructure<T, A> {
-        val buffer = bufferFactory(compiler.size) { algebra.zero }
-        buffer[0] = value
-
-        return DerivativeStructure(
-            this,
-            buffer
-        )
-    }
-
-    override fun bindSymbolOrNull(value: String): DerivativeStructureSymbol<T, A>? = variables[StringSymbol(value)]
-
-    override fun bindSymbol(value: String): DerivativeStructureSymbol<T, A> =
-        bindSymbolOrNull(value) ?: error("Symbol '$value' is not supported in $this")
-
-    public fun bindSymbolOrNull(symbol: Symbol): DerivativeStructureSymbol<T, A>? = variables[symbol.identity]
-
-    public fun bindSymbol(symbol: Symbol): DerivativeStructureSymbol<T, A> =
-        bindSymbolOrNull(symbol.identity) ?: error("Symbol '${symbol}' is not supported in $this")
-
-    public fun DerivativeStructure<T, A>.derivative(symbols: List<Symbol>): T {
-        require(symbols.size <= order) { "The order of derivative ${symbols.size} exceeds computed order $order" }
-        val ordersCount = symbols.groupBy { it }.mapValues { it.value.size }
-        return getPartialDerivative(*variables.keys.map { ordersCount[it] ?: 0 }.toIntArray())
-    }
-
-    public fun DerivativeStructure<T, A>.derivative(vararg symbols: Symbol): T = derivative(symbols.toList())
-
-}
-
-
-/**
- * A ring over [DerivativeStructure].
- *
- * @property order The derivation order.
- * @param bindings The map of bindings values. All bindings are considered free parameters.
- */
-@UnstableKMathAPI
-public open class DerivativeStructureRing<T, A>(
-    algebra: A,
-    bufferFactory: MutableBufferFactory<T>,
-    order: Int,
-    bindings: Map<Symbol, T>,
-) : DerivativeStructureAlgebra<T, A>(algebra, bufferFactory, order, bindings),
-    Ring<DerivativeStructure<T, A>>, ScaleOperations<DerivativeStructure<T, A>>,
-    NumericAlgebra<DerivativeStructure<T, A>>,
-    NumbersAddOps<DerivativeStructure<T, A>> where A : Ring<T>, A : NumericAlgebra<T>, A : ScaleOperations<T> {
-
-    override fun bindSymbolOrNull(value: String): DerivativeStructureSymbol<T, A>? =
-        super<DerivativeStructureAlgebra>.bindSymbolOrNull(value)
-
-    override fun DerivativeStructure<T, A>.unaryMinus(): DerivativeStructure<T, A> {
-        val newData = algebra { data.map(bufferFactory) { -it } }
-        return DerivativeStructure(this@DerivativeStructureRing, newData)
-    }
-
-    /**
-     * Create a copy of given [Buffer] and modify it according to [block]
-     */
-    protected inline fun DerivativeStructure<T, A>.transformDataBuffer(block: DSCompiler<T, A>.(MutableBuffer<T>) -> Unit): DerivativeStructure<T, A> {
-        val newData = bufferFactory(compiler.size) { data[it] }
-        compiler.block(newData)
-        return DerivativeStructure(this@DerivativeStructureRing, newData)
-    }
-
-    protected fun DerivativeStructure<T, A>.mapData(block: (T) -> T): DerivativeStructure<T, A> {
-        val newData: Buffer<T> = data.map(bufferFactory, block)
-        return DerivativeStructure(this@DerivativeStructureRing, newData)
-    }
-
-    protected fun DerivativeStructure<T, A>.mapDataIndexed(block: (Int, T) -> T): DerivativeStructure<T, A> {
-        val newData: Buffer<T> = data.mapIndexed(bufferFactory, block)
-        return DerivativeStructure(this@DerivativeStructureRing, newData)
-    }
-
-    override val zero: DerivativeStructure<T, A> by lazy {
-        const(algebra.zero)
-    }
-
-    override val one: DerivativeStructure<T, A> by lazy {
-        const(algebra.one)
-    }
-
-    override fun number(value: Number): DerivativeStructure<T, A> = const(algebra.number(value))
-
-    override fun add(left: DerivativeStructure<T, A>, right: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        left.compiler.checkCompatibility(right.compiler)
-        return left.transformDataBuffer { result ->
-            add(left.data, 0, right.data, 0, result, 0)
-        }
-    }
-
-    override fun scale(a: DerivativeStructure<T, A>, value: Double): DerivativeStructure<T, A> = algebra {
-        a.mapData { it.times(value) }
-    }
-
-    override fun multiply(
-        left: DerivativeStructure<T, A>,
-        right: DerivativeStructure<T, A>,
-    ): DerivativeStructure<T, A> {
-        left.compiler.checkCompatibility(right.compiler)
-        return left.transformDataBuffer { result ->
-            multiply(left.data, 0, right.data, 0, result, 0)
-        }
-    }
-
-    override fun DerivativeStructure<T, A>.minus(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        compiler.checkCompatibility(arg.compiler)
-        return transformDataBuffer { result ->
-            subtract(data, 0, arg.data, 0, result, 0)
-        }
-    }
-
-    override operator fun DerivativeStructure<T, A>.plus(other: Number): DerivativeStructure<T, A> = algebra {
-        transformDataBuffer {
-            it[0] += number(other)
-        }
-    }
-
-    override operator fun DerivativeStructure<T, A>.minus(other: Number): DerivativeStructure<T, A> =
-        this + (-other.toDouble())
-
-    override operator fun Number.plus(other: DerivativeStructure<T, A>): DerivativeStructure<T, A> = other + this
-    override operator fun Number.minus(other: DerivativeStructure<T, A>): DerivativeStructure<T, A> = other - this
-}
-
-@UnstableKMathAPI
-public class DerivativeStructureRingExpression<T, A>(
-    public val algebra: A,
-    public val bufferFactory: MutableBufferFactory<T>,
-    public val function: DerivativeStructureRing<T, A>.() -> DerivativeStructure<T, A>,
-) : DifferentiableExpression<T> where A : Ring<T>, A : ScaleOperations<T>, A : NumericAlgebra<T> {
-    override operator fun invoke(arguments: Map<Symbol, T>): T =
-        DerivativeStructureRing(algebra, bufferFactory, 0, arguments).function().value
-
-    override fun derivativeOrNull(symbols: List<Symbol>): Expression<T> = Expression { arguments ->
-        with(
-            DerivativeStructureRing(
-                algebra,
-                bufferFactory,
-                symbols.size,
-                arguments
-            )
-        ) { function().derivative(symbols) }
-    }
-}
-
-/**
- * A field over commons-math [DerivativeStructure].
- *
- * @property order The derivation order.
- * @param bindings The map of bindings values. All bindings are considered free parameters.
- */
-@UnstableKMathAPI
-public class DerivativeStructureField<T, A : ExtendedField<T>>(
-    algebra: A,
-    bufferFactory: MutableBufferFactory<T>,
-    order: Int,
-    bindings: Map<Symbol, T>,
-) : DerivativeStructureRing<T, A>(algebra, bufferFactory, order, bindings), ExtendedField<DerivativeStructure<T, A>> {
-    override fun number(value: Number): DerivativeStructure<T, A> = const(algebra.number(value))
-
-    override fun divide(left: DerivativeStructure<T, A>, right: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        left.compiler.checkCompatibility(right.compiler)
-        return left.transformDataBuffer { result ->
-            left.compiler.divide(left.data, 0, right.data, 0, result, 0)
-        }
-    }
-
-    override fun sin(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        sin(arg.data, 0, result, 0)
-    }
-
-    override fun cos(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        cos(arg.data, 0, result, 0)
-    }
-
-    override fun tan(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        tan(arg.data, 0, result, 0)
-    }
-
-    override fun asin(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        asin(arg.data, 0, result, 0)
-    }
-
-    override fun acos(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        acos(arg.data, 0, result, 0)
-    }
-
-    override fun atan(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        atan(arg.data, 0, result, 0)
-    }
-
-    override fun sinh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        sinh(arg.data, 0, result, 0)
-    }
-
-    override fun cosh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        cosh(arg.data, 0, result, 0)
-    }
-
-    override fun tanh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        tanh(arg.data, 0, result, 0)
-    }
-
-    override fun asinh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        asinh(arg.data, 0, result, 0)
-    }
-
-    override fun acosh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        acosh(arg.data, 0, result, 0)
-    }
-
-    override fun atanh(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        atanh(arg.data, 0, result, 0)
-    }
-
-    override fun power(arg: DerivativeStructure<T, A>, pow: Number): DerivativeStructure<T, A> = when (pow) {
-        is Int -> arg.transformDataBuffer { result ->
-            pow(arg.data, 0, pow, result, 0)
-        }
-        else -> arg.transformDataBuffer { result ->
-            pow(arg.data, 0, pow.toDouble(), result, 0)
-        }
-    }
-
-    override fun sqrt(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        sqrt(arg.data, 0, result, 0)
-    }
-
-    public fun power(arg: DerivativeStructure<T, A>, pow: DerivativeStructure<T, A>): DerivativeStructure<T, A> {
-        arg.compiler.checkCompatibility(pow.compiler)
-        return arg.transformDataBuffer { result ->
-            pow(arg.data, 0, pow.data, 0, result, 0)
-        }
-    }
-
-    override fun exp(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        exp(arg.data, 0, result, 0)
-    }
-
-    override fun ln(arg: DerivativeStructure<T, A>): DerivativeStructure<T, A> = arg.transformDataBuffer { result ->
-        ln(arg.data, 0, result, 0)
-    }
-}
-
-@UnstableKMathAPI
-public class DerivativeStructureFieldExpression<T, A : ExtendedField<T>>(
-    public val algebra: A,
-    public val bufferFactory: MutableBufferFactory<T>,
-    public val function: DerivativeStructureField<T, A>.() -> DerivativeStructure<T, A>,
-) : DifferentiableExpression<T> {
-    override operator fun invoke(arguments: Map<Symbol, T>): T =
-        DerivativeStructureField(algebra, bufferFactory, 0, arguments).function().value
-
-    override fun derivativeOrNull(symbols: List<Symbol>): Expression<T> = Expression { arguments ->
-        with(
-            DerivativeStructureField(
-                algebra,
-                bufferFactory,
-                symbols.size,
-                arguments,
-            )
-        ) { function().derivative(symbols) }
-    }
-}
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt
index 429fe310b..fdeda4512 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt
@@ -19,10 +19,10 @@ import kotlin.test.assertFails
 internal inline fun diff(
     order: Int,
     vararg parameters: Pair<Symbol, Double>,
-    block: DerivativeStructureField<Double, DoubleField>.() -> Unit,
+    block: DSField<Double, DoubleField>.() -> Unit,
 ) {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    DerivativeStructureField(DoubleField, ::DoubleBuffer, order, mapOf(*parameters)).block()
+    DSField(DoubleField, ::DoubleBuffer, order, mapOf(*parameters)).block()
 }
 
 internal class AutoDiffTest {
-- 
2.34.1


From 846a6d2620810dc9e15538befba437f0882a77db Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 15 Jul 2022 17:20:00 +0300
Subject: [PATCH 571/713] Grand derivative refactoring. Phase 3

---
 .../kscience/kmath/expressions/DSAlgebra.kt   | 143 ++++++++++--------
 .../kscience/kmath/expressions/DSCompiler.kt  |  28 ++--
 2 files changed, 96 insertions(+), 75 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
index d9fc46b47..506fbd001 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
@@ -44,9 +44,29 @@ public interface DS<T, A : Ring<T>> {
  * @see value
  */
 @UnstableKMathAPI
-public fun <T, A : Ring<T>> DS<T, A>.getPartialDerivative(vararg orders: Int): T =
+private fun <T, A : Ring<T>> DS<T, A>.getPartialDerivative(vararg orders: Int): T =
     data[derivativeAlgebra.compiler.getPartialDerivativeIndex(*orders)]
 
+/**
+ * Provide a partial derivative with given symbols. On symbol could me mentioned multiple times
+ */
+@UnstableKMathAPI
+public fun <T, A : Ring<T>> DS<T, A>.derivative(symbols: List<Symbol>): T {
+    require(symbols.size <= derivativeAlgebra.order) { "The order of derivative ${symbols.size} exceeds computed order ${derivativeAlgebra.order}" }
+    val ordersCount: Map<String, Int> = symbols.map { it.identity }.groupBy { it }.mapValues { it.value.size }
+    return getPartialDerivative(*symbols.map { ordersCount[it] ?: 0 }.toIntArray())
+}
+
+/**
+ * Provide a partial derivative with given symbols. On symbol could me mentioned multiple times
+ */
+@UnstableKMathAPI
+public fun <T, A : Ring<T>> DS<T, A>.derivative(vararg symbols: Symbol): T {
+    require(symbols.size <= derivativeAlgebra.order) { "The order of derivative ${symbols.size} exceeds computed order ${derivativeAlgebra.order}" }
+    val ordersCount: Map<String, Int> = symbols.map { it.identity }.groupBy { it }.mapValues { it.value.size }
+    return getPartialDerivative(*symbols.map { ordersCount[it] ?: 0 }.toIntArray())
+}
+
 /**
  * The value part of the derivative structure.
  *
@@ -61,9 +81,67 @@ public abstract class DSAlgebra<T, A : Ring<T>>(
     public val bufferFactory: MutableBufferFactory<T>,
     public val order: Int,
     bindings: Map<Symbol, T>,
-) : ExpressionAlgebra<T, DS<T, A>> {
+) : ExpressionAlgebra<T, DS<T, A>>, SymbolIndexer {
+
+    /**
+     * Get the compiler for number of free parameters and order.
+     *
+     * @return cached rules set.
+     */
+    @PublishedApi
+    internal val compiler: DSCompiler<T, A> by lazy {
+        // get the cached compilers
+        val cache: Array<Array<DSCompiler<T, A>?>>? = null
+
+        // we need to create more compilers
+        val maxParameters: Int = max(numberOfVariables, cache?.size ?: 0)
+        val maxOrder: Int = max(order, if (cache == null) 0 else cache[0].size)
+        val newCache: Array<Array<DSCompiler<T, A>?>> = Array(maxParameters + 1) { arrayOfNulls(maxOrder + 1) }
+
+        if (cache != null) {
+            // preserve the already created compilers
+            for (i in cache.indices) {
+                cache[i].copyInto(newCache[i], endIndex = cache[i].size)
+            }
+        }
+
+        // create the array in increasing diagonal order
+        for (diag in 0..numberOfVariables + order) {
+            for (o in max(0, diag - numberOfVariables)..min(order, diag)) {
+                val p: Int = diag - o
+                if (newCache[p][o] == null) {
+                    val valueCompiler: DSCompiler<T, A>? = if (p == 0) null else newCache[p - 1][o]!!
+                    val derivativeCompiler: DSCompiler<T, A>? = if (o == 0) null else newCache[p][o - 1]!!
+
+                    newCache[p][o] = DSCompiler(
+                        algebra,
+                        bufferFactory,
+                        p,
+                        o,
+                        valueCompiler,
+                        derivativeCompiler,
+                    )
+                }
+            }
+        }
+
+        return@lazy newCache[numberOfVariables][order]!!
+    }
+
+    private val variables: Map<Symbol, DSSymbol> by lazy {
+        bindings.entries.mapIndexed { index, (key, value) ->
+            key to DSSymbol(
+                index,
+                key,
+                value,
+            )
+        }.toMap()
+    }
+    override val symbols: List<Symbol> = bindings.map { it.key }
+
+    public val numberOfVariables: Int get() = symbols.size
+
 
-    @OptIn(UnstableKMathAPI::class)
     private fun bufferForVariable(index: Int, value: T): Buffer<T> {
         val buffer = bufferFactory(compiler.size) { algebra.zero }
         buffer[0] = value
@@ -80,7 +158,7 @@ public abstract class DSAlgebra<T, A : Ring<T>>(
     }
 
     @UnstableKMathAPI
-    protected inner class DSImpl internal constructor(
+    private inner class DSImpl(
         override val data: Buffer<T>,
     ) : DS<T, A> {
         override val derivativeAlgebra: DSAlgebra<T, A> get() = this@DSAlgebra
@@ -130,63 +208,6 @@ public abstract class DSAlgebra<T, A : Ring<T>>(
         override val data: Buffer<T> = bufferForVariable(index, value)
     }
 
-
-    public val numberOfVariables: Int = bindings.size
-
-    /**
-     * Get the compiler for number of free parameters and order.
-     *
-     * @return cached rules set.
-     */
-    @PublishedApi
-    internal val compiler: DSCompiler<T, A> by lazy {
-        // get the cached compilers
-        val cache: Array<Array<DSCompiler<T, A>?>>? = null
-
-        // we need to create more compilers
-        val maxParameters: Int = max(numberOfVariables, cache?.size ?: 0)
-        val maxOrder: Int = max(order, if (cache == null) 0 else cache[0].size)
-        val newCache: Array<Array<DSCompiler<T, A>?>> = Array(maxParameters + 1) { arrayOfNulls(maxOrder + 1) }
-
-        if (cache != null) {
-            // preserve the already created compilers
-            for (i in cache.indices) {
-                cache[i].copyInto(newCache[i], endIndex = cache[i].size)
-            }
-        }
-
-        // create the array in increasing diagonal order
-        for (diag in 0..numberOfVariables + order) {
-            for (o in max(0, diag - numberOfVariables)..min(order, diag)) {
-                val p: Int = diag - o
-                if (newCache[p][o] == null) {
-                    val valueCompiler: DSCompiler<T, A>? = if (p == 0) null else newCache[p - 1][o]!!
-                    val derivativeCompiler: DSCompiler<T, A>? = if (o == 0) null else newCache[p][o - 1]!!
-
-                    newCache[p][o] = DSCompiler(
-                        algebra,
-                        bufferFactory,
-                        p,
-                        o,
-                        valueCompiler,
-                        derivativeCompiler,
-                    )
-                }
-            }
-        }
-
-        return@lazy newCache[numberOfVariables][order]!!
-    }
-
-    private val variables: Map<Symbol, DSSymbol> = bindings.entries.mapIndexed { index, (key, value) ->
-        key to DSSymbol(
-            index,
-            key,
-            value,
-        )
-    }.toMap()
-
-
     public override fun const(value: T): DS<T, A> {
         val buffer = bufferFactory(compiler.size) { algebra.zero }
         buffer[0] = value
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
index e0050cf03..b5b2988a3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
@@ -52,20 +52,20 @@ internal fun <T> MutableBuffer<T>.fill(element: T, fromIndex: Int = 0, toIndex:
  *
  * @property freeParameters Number of free parameters.
  * @property order Derivation order.
- * @see DerivativeStructure
+ * @see DS
  */
-class DSCompiler<T, out A : Algebra<T>> internal constructor(
-    val algebra: A,
-    val bufferFactory: MutableBufferFactory<T>,
-    val freeParameters: Int,
-    val order: Int,
+public class DSCompiler<T, out A : Algebra<T>> internal constructor(
+    public val algebra: A,
+    public val bufferFactory: MutableBufferFactory<T>,
+    public val freeParameters: Int,
+    public val order: Int,
     valueCompiler: DSCompiler<T, A>?,
     derivativeCompiler: DSCompiler<T, A>?,
 ) {
     /**
      * Number of partial derivatives (including the single 0 order derivative element).
      */
-    val sizes: Array<IntArray> by lazy {
+    public val sizes: Array<IntArray> by lazy {
         compileSizes(
             freeParameters,
             order,
@@ -76,7 +76,7 @@ class DSCompiler<T, out A : Algebra<T>> internal constructor(
     /**
      * Indirection array for partial derivatives.
      */
-    val derivativesIndirection: Array<IntArray> by lazy {
+    internal val derivativesIndirection: Array<IntArray> by lazy {
         compileDerivativesIndirection(
             freeParameters, order,
             valueCompiler, derivativeCompiler,
@@ -86,7 +86,7 @@ class DSCompiler<T, out A : Algebra<T>> internal constructor(
     /**
      * Indirection array of the lower derivative elements.
      */
-    val lowerIndirection: IntArray by lazy {
+    internal val lowerIndirection: IntArray by lazy {
         compileLowerIndirection(
             freeParameters, order,
             valueCompiler, derivativeCompiler,
@@ -96,7 +96,7 @@ class DSCompiler<T, out A : Algebra<T>> internal constructor(
     /**
      * Indirection arrays for multiplication.
      */
-    val multIndirection: Array<Array<IntArray>> by lazy {
+    internal val multIndirection: Array<Array<IntArray>> by lazy {
         compileMultiplicationIndirection(
             freeParameters, order,
             valueCompiler, derivativeCompiler, lowerIndirection,
@@ -106,7 +106,7 @@ class DSCompiler<T, out A : Algebra<T>> internal constructor(
     /**
      * Indirection arrays for function composition.
      */
-    val compositionIndirection: Array<Array<IntArray>> by lazy {
+    internal val compositionIndirection: Array<Array<IntArray>> by lazy {
         compileCompositionIndirection(
             freeParameters, order,
             valueCompiler, derivativeCompiler,
@@ -120,7 +120,7 @@ class DSCompiler<T, out A : Algebra<T>> internal constructor(
      * This number includes the single 0 order derivative element, which is
      * guaranteed to be stored in the first element of the array.
      */
-    val size: Int get() = sizes[freeParameters][order]
+    public val size: Int get() = sizes[freeParameters][order]
 
     /**
      * Get the index of a partial derivative in the array.
@@ -147,7 +147,7 @@ class DSCompiler<T, out A : Algebra<T>> internal constructor(
      * @return index of the partial derivative.
      * @see getPartialDerivativeOrders
      */
-    fun getPartialDerivativeIndex(vararg orders: Int): Int {
+    public fun getPartialDerivativeIndex(vararg orders: Int): Int {
         // safety check
         require(orders.size == freeParameters) { "dimension mismatch: ${orders.size} and $freeParameters" }
         return getPartialDerivativeIndex(freeParameters, order, sizes, *orders)
@@ -162,7 +162,7 @@ class DSCompiler<T, out A : Algebra<T>> internal constructor(
      * @return orders derivation orders with respect to each parameter
      * @see getPartialDerivativeIndex
      */
-    fun getPartialDerivativeOrders(index: Int): IntArray = derivativesIndirection[index]
+    public fun getPartialDerivativeOrders(index: Int): IntArray = derivativesIndirection[index]
 }
 
 /**
-- 
2.34.1


From bfadf5b33d545ac0e4d40f2253e20e0ad88e4ba0 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 15 Jul 2022 17:31:28 +0300
Subject: [PATCH 572/713] Name refactor

---
 .../kotlin/space/kscience/kmath/expressions/DSAlgebra.kt    | 2 +-
 .../kmath/expressions/DerivativeStructureExpressionTest.kt  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
index 506fbd001..59e6f4f6f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
@@ -439,7 +439,7 @@ public class DSField<T, A : ExtendedField<T>>(
 }
 
 @UnstableKMathAPI
-public class DerivativeStructureFieldExpression<T, A : ExtendedField<T>>(
+public class DSFieldExpression<T, A : ExtendedField<T>>(
     public val algebra: A,
     public val bufferFactory: MutableBufferFactory<T>,
     public val function: DSField<T, A>.() -> DS<T, A>,
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt
index fdeda4512..e5bc9805a 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt
@@ -30,7 +30,7 @@ internal class AutoDiffTest {
     private val y by symbol
 
     @Test
-    fun derivativeStructureFieldTest() {
+    fun dsAlgebraTest() {
         diff(2, x to 1.0, y to 1.0) {
             val x = bindSymbol(x)//by binding()
             val y = bindSymbol("y")
@@ -44,8 +44,8 @@ internal class AutoDiffTest {
     }
 
     @Test
-    fun autoDifTest() {
-        val f = DerivativeStructureFieldExpression(DoubleField, ::DoubleBuffer) {
+    fun dsExpressionTest() {
+        val f = DSFieldExpression(DoubleField, ::DoubleBuffer) {
             val x by binding
             val y by binding
             x.pow(2) + 2 * x * y + y.pow(2) + 1
-- 
2.34.1


From 18ae964e57a2d1059aaa4f17909da45c3a4a1972 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 15 Jul 2022 17:35:13 +0300
Subject: [PATCH 573/713] Name refactor

---
 .../space/kscience/kmath/ejml/_generated.kt   | 1003 +++++++++++++++++
 1 file changed, 1003 insertions(+)
 create mode 100644 kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt

diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
new file mode 100644
index 000000000..aac327a84
--- /dev/null
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
@@ -0,0 +1,1003 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+/* This file is generated with buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt */
+
+package space.kscience.kmath.ejml
+
+import org.ejml.data.*
+import org.ejml.dense.row.CommonOps_DDRM
+import org.ejml.dense.row.CommonOps_FDRM
+import org.ejml.dense.row.factory.DecompositionFactory_DDRM
+import org.ejml.dense.row.factory.DecompositionFactory_FDRM
+import org.ejml.sparse.FillReducing
+import org.ejml.sparse.csc.CommonOps_DSCC
+import org.ejml.sparse.csc.CommonOps_FSCC
+import org.ejml.sparse.csc.factory.DecompositionFactory_DSCC
+import org.ejml.sparse.csc.factory.DecompositionFactory_FSCC
+import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
+import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
+import space.kscience.kmath.linear.*
+import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.nd.StructureFeature
+import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.operations.FloatField
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.FloatBuffer
+import kotlin.reflect.KClass
+import kotlin.reflect.cast
+
+/**
+ * [EjmlVector] specialization for [Double].
+ */
+public class EjmlDoubleVector<out M : DMatrix>(override val origin: M) : EjmlVector<Double, M>(origin) {
+    init {
+        require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
+    }
+
+    override operator fun get(index: Int): Double = origin[0, index]
+}
+
+/**
+ * [EjmlVector] specialization for [Float].
+ */
+public class EjmlFloatVector<out M : FMatrix>(override val origin: M) : EjmlVector<Float, M>(origin) {
+    init {
+        require(origin.numRows == 1) { "The origin matrix must have only one row to form a vector" }
+    }
+
+    override operator fun get(index: Int): Float = origin[0, index]
+}
+
+/**
+ * [EjmlMatrix] specialization for [Double].
+ */
+public class EjmlDoubleMatrix<out M : DMatrix>(override val origin: M) : EjmlMatrix<Double, M>(origin) {
+    override operator fun get(i: Int, j: Int): Double = origin[i, j]
+}
+
+/**
+ * [EjmlMatrix] specialization for [Float].
+ */
+public class EjmlFloatMatrix<out M : FMatrix>(override val origin: M) : EjmlMatrix<Float, M>(origin) {
+    override operator fun get(i: Int, j: Int): Float = origin[i, j]
+}
+
+/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_DDRM], [DecompositionFactory_DDRM] operations and
+ * [DMatrixRMaj] matrices.
+ */
+public object EjmlLinearSpaceDDRM : EjmlLinearSpace<Double, DoubleField, DMatrixRMaj>() {
+    /**
+     * The [DoubleField] reference.
+     */
+    override val elementAlgebra: DoubleField get() = DoubleField
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixRMaj> = when {
+        this is EjmlDoubleMatrix<*> && origin is DMatrixRMaj -> this as EjmlDoubleMatrix<DMatrixRMaj>
+        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixRMaj> = when {
+        this is EjmlDoubleVector<*> && origin is DMatrixRMaj -> this as EjmlDoubleVector<DMatrixRMaj>
+        else -> EjmlDoubleVector(DMatrixRMaj(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
+        })
+    }
+
+    override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: DoubleField.(i: Int, j: Int) -> Double,
+    ): EjmlDoubleMatrix<DMatrixRMaj> = DMatrixRMaj(rows, columns).also {
+        (0 until rows).forEach { row ->
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
+        }
+    }.wrapMatrix()
+
+    override fun buildVector(
+        size: Int,
+        initializer: DoubleField.(Int) -> Double,
+    ): EjmlDoubleVector<DMatrixRMaj> = EjmlDoubleVector(DMatrixRMaj(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
+
+    private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
+    private fun <T : DMatrix> T.wrapVector() = EjmlDoubleVector(this)
+
+    override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
+
+    override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
+
+    override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
+
+    override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+
+        CommonOps_DDRM.add(
+            elementAlgebra.one, 
+            toEjml().origin, 
+            elementAlgebra { -one },
+            other.toEjml().origin, 
+            out,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.scale(value, toEjml().origin, res)
+        return res.wrapMatrix()
+    }
+
+    override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.changeSign(toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+        
+        CommonOps_DDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin, 
+            out,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+
+        CommonOps_DDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin,
+            out,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val out = DMatrixRMaj(1, 1)
+
+        CommonOps_DDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra { -one },
+            other.toEjml().origin,
+            out,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> = m * this
+
+    override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.scale(value, toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixRMaj> = v * this
+
+    @UnstableKMathAPI
+    override fun <F : StructureFeature> computeFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
+        structure.getFeature(type)?.let { return it }
+        val origin = structure.toEjml().origin
+
+        return when (type) {
+            InverseMatrixFeature::class -> object : InverseMatrixFeature<Double> {
+                override val inverse: Matrix<Double> by lazy {
+                    val res = origin.copy()
+                    CommonOps_DDRM.invert(res)
+                    res.wrapMatrix()
+                }
+            }
+
+            DeterminantFeature::class -> object : DeterminantFeature<Double> {
+                override val determinant: Double by lazy { CommonOps_DDRM.det(origin) }
+            }
+
+            SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<Double> {
+                private val svd by lazy {
+                    DecompositionFactory_DDRM.svd(origin.numRows, origin.numCols, true, true, false)
+                        .apply { decompose(origin.copy()) }
+                }
+
+                override val u: Matrix<Double> by lazy { svd.getU(null, false).wrapMatrix() }
+                override val s: Matrix<Double> by lazy { svd.getW(null).wrapMatrix() }
+                override val v: Matrix<Double> by lazy { svd.getV(null, false).wrapMatrix() }
+                override val singularValues: Point<Double> by lazy { DoubleBuffer(svd.singularValues) }
+            }
+
+            QRDecompositionFeature::class -> object : QRDecompositionFeature<Double> {
+                private val qr by lazy {
+                    DecompositionFactory_DDRM.qr().apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<Double> by lazy {
+                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
+                }
+
+                override val r: Matrix<Double> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Double> {
+                override val l: Matrix<Double> by lazy {
+                    val cholesky =
+                        DecompositionFactory_DDRM.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
+
+                    cholesky.getT(null).wrapMatrix().withFeature(LFeature)
+                }
+            }
+
+            LupDecompositionFeature::class -> object : LupDecompositionFeature<Double> {
+                private val lup by lazy {
+                    DecompositionFactory_DDRM.lu(origin.numRows, origin.numCols).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<Double> by lazy {
+                    lup.getLower(null).wrapMatrix().withFeature(LFeature)
+                }
+
+                override val u: Matrix<Double> by lazy {
+                    lup.getUpper(null).wrapMatrix().withFeature(UFeature)
+                }
+
+                override val p: Matrix<Double> by lazy { lup.getRowPivot(null).wrapMatrix() }
+            }
+
+            else -> null
+        }?.let{
+            type.cast(it)
+        }
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Matrix<Double>): EjmlDoubleMatrix<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
+        return res.wrapMatrix()
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Point<Double>): EjmlDoubleVector<DMatrixRMaj> {
+        val res = DMatrixRMaj(1, 1)
+        CommonOps_DDRM.solve(DMatrixRMaj(a.toEjml().origin), DMatrixRMaj(b.toEjml().origin), res)
+        return EjmlDoubleVector(res)
+    }
+}
+
+/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_FDRM], [DecompositionFactory_FDRM] operations and
+ * [FMatrixRMaj] matrices.
+ */
+public object EjmlLinearSpaceFDRM : EjmlLinearSpace<Float, FloatField, FMatrixRMaj>() {
+    /**
+     * The [FloatField] reference.
+     */
+    override val elementAlgebra: FloatField get() = FloatField
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixRMaj> = when {
+        this is EjmlFloatMatrix<*> && origin is FMatrixRMaj -> this as EjmlFloatMatrix<FMatrixRMaj>
+        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixRMaj> = when {
+        this is EjmlFloatVector<*> && origin is FMatrixRMaj -> this as EjmlFloatVector<FMatrixRMaj>
+        else -> EjmlFloatVector(FMatrixRMaj(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
+        })
+    }
+
+    override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: FloatField.(i: Int, j: Int) -> Float,
+    ): EjmlFloatMatrix<FMatrixRMaj> = FMatrixRMaj(rows, columns).also {
+        (0 until rows).forEach { row ->
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
+        }
+    }.wrapMatrix()
+
+    override fun buildVector(
+        size: Int,
+        initializer: FloatField.(Int) -> Float,
+    ): EjmlFloatVector<FMatrixRMaj> = EjmlFloatVector(FMatrixRMaj(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
+
+    private fun <T : FMatrix> T.wrapMatrix() = EjmlFloatMatrix(this)
+    private fun <T : FMatrix> T.wrapVector() = EjmlFloatVector(this)
+
+    override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
+
+    override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
+
+    override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
+
+    override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+
+        CommonOps_FDRM.add(
+            elementAlgebra.one, 
+            toEjml().origin, 
+            elementAlgebra { -one },
+            other.toEjml().origin, 
+            out,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.scale(value, toEjml().origin, res)
+        return res.wrapMatrix()
+    }
+
+    override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.changeSign(toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+        
+        CommonOps_FDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin, 
+            out,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+
+        CommonOps_FDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin,
+            out,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+        val out = FMatrixRMaj(1, 1)
+
+        CommonOps_FDRM.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra { -one },
+            other.toEjml().origin,
+            out,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> = m * this
+
+    override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.scale(value, toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixRMaj> = v * this
+
+    @UnstableKMathAPI
+    override fun <F : StructureFeature> computeFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
+        structure.getFeature(type)?.let { return it }
+        val origin = structure.toEjml().origin
+
+        return when (type) {
+            InverseMatrixFeature::class -> object : InverseMatrixFeature<Float> {
+                override val inverse: Matrix<Float> by lazy {
+                    val res = origin.copy()
+                    CommonOps_FDRM.invert(res)
+                    res.wrapMatrix()
+                }
+            }
+
+            DeterminantFeature::class -> object : DeterminantFeature<Float> {
+                override val determinant: Float by lazy { CommonOps_FDRM.det(origin) }
+            }
+
+            SingularValueDecompositionFeature::class -> object : SingularValueDecompositionFeature<Float> {
+                private val svd by lazy {
+                    DecompositionFactory_FDRM.svd(origin.numRows, origin.numCols, true, true, false)
+                        .apply { decompose(origin.copy()) }
+                }
+
+                override val u: Matrix<Float> by lazy { svd.getU(null, false).wrapMatrix() }
+                override val s: Matrix<Float> by lazy { svd.getW(null).wrapMatrix() }
+                override val v: Matrix<Float> by lazy { svd.getV(null, false).wrapMatrix() }
+                override val singularValues: Point<Float> by lazy { FloatBuffer(svd.singularValues) }
+            }
+
+            QRDecompositionFeature::class -> object : QRDecompositionFeature<Float> {
+                private val qr by lazy {
+                    DecompositionFactory_FDRM.qr().apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<Float> by lazy {
+                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
+                }
+
+                override val r: Matrix<Float> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Float> {
+                override val l: Matrix<Float> by lazy {
+                    val cholesky =
+                        DecompositionFactory_FDRM.chol(structure.rowNum, true).apply { decompose(origin.copy()) }
+
+                    cholesky.getT(null).wrapMatrix().withFeature(LFeature)
+                }
+            }
+
+            LupDecompositionFeature::class -> object : LupDecompositionFeature<Float> {
+                private val lup by lazy {
+                    DecompositionFactory_FDRM.lu(origin.numRows, origin.numCols).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<Float> by lazy {
+                    lup.getLower(null).wrapMatrix().withFeature(LFeature)
+                }
+
+                override val u: Matrix<Float> by lazy {
+                    lup.getUpper(null).wrapMatrix().withFeature(UFeature)
+                }
+
+                override val p: Matrix<Float> by lazy { lup.getRowPivot(null).wrapMatrix() }
+            }
+
+            else -> null
+        }?.let{
+            type.cast(it)
+        }
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Float>, b: Matrix<Float>): EjmlFloatMatrix<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.solve(FMatrixRMaj(a.toEjml().origin), FMatrixRMaj(b.toEjml().origin), res)
+        return res.wrapMatrix()
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Float>, b: Point<Float>): EjmlFloatVector<FMatrixRMaj> {
+        val res = FMatrixRMaj(1, 1)
+        CommonOps_FDRM.solve(FMatrixRMaj(a.toEjml().origin), FMatrixRMaj(b.toEjml().origin), res)
+        return EjmlFloatVector(res)
+    }
+}
+
+/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_DSCC], [DecompositionFactory_DSCC] operations and
+ * [DMatrixSparseCSC] matrices.
+ */
+public object EjmlLinearSpaceDSCC : EjmlLinearSpace<Double, DoubleField, DMatrixSparseCSC>() {
+    /**
+     * The [DoubleField] reference.
+     */
+    override val elementAlgebra: DoubleField get() = DoubleField
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Matrix<Double>.toEjml(): EjmlDoubleMatrix<DMatrixSparseCSC> = when {
+        this is EjmlDoubleMatrix<*> && origin is DMatrixSparseCSC -> this as EjmlDoubleMatrix<DMatrixSparseCSC>
+        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Point<Double>.toEjml(): EjmlDoubleVector<DMatrixSparseCSC> = when {
+        this is EjmlDoubleVector<*> && origin is DMatrixSparseCSC -> this as EjmlDoubleVector<DMatrixSparseCSC>
+        else -> EjmlDoubleVector(DMatrixSparseCSC(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
+        })
+    }
+
+    override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: DoubleField.(i: Int, j: Int) -> Double,
+    ): EjmlDoubleMatrix<DMatrixSparseCSC> = DMatrixSparseCSC(rows, columns).also {
+        (0 until rows).forEach { row ->
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
+        }
+    }.wrapMatrix()
+
+    override fun buildVector(
+        size: Int,
+        initializer: DoubleField.(Int) -> Double,
+    ): EjmlDoubleVector<DMatrixSparseCSC> = EjmlDoubleVector(DMatrixSparseCSC(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
+
+    private fun <T : DMatrix> T.wrapMatrix() = EjmlDoubleMatrix(this)
+    private fun <T : DMatrix> T.wrapVector() = EjmlDoubleVector(this)
+
+    override fun Matrix<Double>.unaryMinus(): Matrix<Double> = this * elementAlgebra { -one }
+
+    override fun Matrix<Double>.dot(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
+
+    override fun Matrix<Double>.dot(vector: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
+
+    override operator fun Matrix<Double>.minus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+
+        CommonOps_DSCC.add(
+            elementAlgebra.one, 
+            toEjml().origin, 
+            elementAlgebra { -one },
+            other.toEjml().origin, 
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override operator fun Matrix<Double>.times(value: Double): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.scale(value, toEjml().origin, res)
+        return res.wrapMatrix()
+    }
+
+    override fun Point<Double>.unaryMinus(): EjmlDoubleVector<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.changeSign(toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Matrix<Double>.plus(other: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+        
+        CommonOps_DSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin, 
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override fun Point<Double>.plus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+
+        CommonOps_DSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin,
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Point<Double>.minus(other: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+        val out = DMatrixSparseCSC(1, 1)
+
+        CommonOps_DSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra { -one },
+            other.toEjml().origin,
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Double.times(m: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> = m * this
+
+    override fun Point<Double>.times(value: Double): EjmlDoubleVector<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.scale(value, toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Double.times(v: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> = v * this
+
+    @UnstableKMathAPI
+    override fun <F : StructureFeature> computeFeature(structure: Matrix<Double>, type: KClass<out F>): F? {
+        structure.getFeature(type)?.let { return it }
+        val origin = structure.toEjml().origin
+
+        return when (type) {
+            QRDecompositionFeature::class -> object : QRDecompositionFeature<Double> {
+                private val qr by lazy {
+                    DecompositionFactory_DSCC.qr(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<Double> by lazy {
+                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
+                }
+
+                override val r: Matrix<Double> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Double> {
+                override val l: Matrix<Double> by lazy {
+                    val cholesky =
+                        DecompositionFactory_DSCC.cholesky().apply { decompose(origin.copy()) }
+
+                    (cholesky.getT(null) as DMatrix).wrapMatrix().withFeature(LFeature)
+                }
+            }
+
+            LUDecompositionFeature::class, DeterminantFeature::class, InverseMatrixFeature::class -> object :
+                LUDecompositionFeature<Double>, DeterminantFeature<Double>, InverseMatrixFeature<Double> {
+                private val lu by lazy {
+                    DecompositionFactory_DSCC.lu(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<Double> by lazy {
+                    lu.getLower(null).wrapMatrix().withFeature(LFeature)
+                }
+
+                override val u: Matrix<Double> by lazy {
+                    lu.getUpper(null).wrapMatrix().withFeature(UFeature)
+                }
+
+                override val inverse: Matrix<Double> by lazy {
+                    var a = origin
+                    val inverse = DMatrixRMaj(1, 1)
+                    val solver = LinearSolverFactory_DSCC.lu(FillReducing.NONE)
+                    if (solver.modifiesA()) a = a.copy()
+                    val i = CommonOps_DDRM.identity(a.numRows)
+                    solver.solve(i, inverse)
+                    inverse.wrapMatrix()
+                }
+
+                override val determinant: Double by lazy { elementAlgebra.number(lu.computeDeterminant().real) }
+            }
+
+            else -> null
+        }?.let{
+            type.cast(it)
+        }
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Matrix<Double>): EjmlDoubleMatrix<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.solve(DMatrixSparseCSC(a.toEjml().origin), DMatrixSparseCSC(b.toEjml().origin), res)
+        return res.wrapMatrix()
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Double>, b: Point<Double>): EjmlDoubleVector<DMatrixSparseCSC> {
+        val res = DMatrixSparseCSC(1, 1)
+        CommonOps_DSCC.solve(DMatrixSparseCSC(a.toEjml().origin), DMatrixSparseCSC(b.toEjml().origin), res)
+        return EjmlDoubleVector(res)
+    }
+}
+
+/**
+ * [EjmlLinearSpace] implementation based on [CommonOps_FSCC], [DecompositionFactory_FSCC] operations and
+ * [FMatrixSparseCSC] matrices.
+ */
+public object EjmlLinearSpaceFSCC : EjmlLinearSpace<Float, FloatField, FMatrixSparseCSC>() {
+    /**
+     * The [FloatField] reference.
+     */
+    override val elementAlgebra: FloatField get() = FloatField
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Matrix<Float>.toEjml(): EjmlFloatMatrix<FMatrixSparseCSC> = when {
+        this is EjmlFloatMatrix<*> && origin is FMatrixSparseCSC -> this as EjmlFloatMatrix<FMatrixSparseCSC>
+        else -> buildMatrix(rowNum, colNum) { i, j -> get(i, j) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun Point<Float>.toEjml(): EjmlFloatVector<FMatrixSparseCSC> = when {
+        this is EjmlFloatVector<*> && origin is FMatrixSparseCSC -> this as EjmlFloatVector<FMatrixSparseCSC>
+        else -> EjmlFloatVector(FMatrixSparseCSC(size, 1).also {
+            (0 until it.numRows).forEach { row -> it[row, 0] = get(row) }
+        })
+    }
+
+    override fun buildMatrix(
+        rows: Int,
+        columns: Int,
+        initializer: FloatField.(i: Int, j: Int) -> Float,
+    ): EjmlFloatMatrix<FMatrixSparseCSC> = FMatrixSparseCSC(rows, columns).also {
+        (0 until rows).forEach { row ->
+            (0 until columns).forEach { col -> it[row, col] = elementAlgebra.initializer(row, col) }
+        }
+    }.wrapMatrix()
+
+    override fun buildVector(
+        size: Int,
+        initializer: FloatField.(Int) -> Float,
+    ): EjmlFloatVector<FMatrixSparseCSC> = EjmlFloatVector(FMatrixSparseCSC(size, 1).also {
+        (0 until it.numRows).forEach { row -> it[row, 0] = elementAlgebra.initializer(row) }
+    })
+
+    private fun <T : FMatrix> T.wrapMatrix() = EjmlFloatMatrix(this)
+    private fun <T : FMatrix> T.wrapVector() = EjmlFloatVector(this)
+
+    override fun Matrix<Float>.unaryMinus(): Matrix<Float> = this * elementAlgebra { -one }
+
+    override fun Matrix<Float>.dot(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.mult(toEjml().origin, other.toEjml().origin, out)
+        return out.wrapMatrix()
+    }
+
+    override fun Matrix<Float>.dot(vector: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.mult(toEjml().origin, vector.toEjml().origin, out)
+        return out.wrapVector()
+    }
+
+    override operator fun Matrix<Float>.minus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+
+        CommonOps_FSCC.add(
+            elementAlgebra.one, 
+            toEjml().origin, 
+            elementAlgebra { -one },
+            other.toEjml().origin, 
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override operator fun Matrix<Float>.times(value: Float): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.scale(value, toEjml().origin, res)
+        return res.wrapMatrix()
+    }
+
+    override fun Point<Float>.unaryMinus(): EjmlFloatVector<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.changeSign(toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Matrix<Float>.plus(other: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+        
+        CommonOps_FSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin, 
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapMatrix()
+    }
+
+    override fun Point<Float>.plus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+
+        CommonOps_FSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra.one,
+            other.toEjml().origin,
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Point<Float>.minus(other: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+        val out = FMatrixSparseCSC(1, 1)
+
+        CommonOps_FSCC.add(
+            elementAlgebra.one,
+            toEjml().origin,
+            elementAlgebra { -one },
+            other.toEjml().origin,
+            out,
+            null, 
+            null,
+        )
+
+        return out.wrapVector()
+    }
+
+    override fun Float.times(m: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> = m * this
+
+    override fun Point<Float>.times(value: Float): EjmlFloatVector<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.scale(value, toEjml().origin, res)
+        return res.wrapVector()
+    }
+
+    override fun Float.times(v: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> = v * this
+
+    @UnstableKMathAPI
+    override fun <F : StructureFeature> computeFeature(structure: Matrix<Float>, type: KClass<out F>): F? {
+        structure.getFeature(type)?.let { return it }
+        val origin = structure.toEjml().origin
+
+        return when (type) {
+            QRDecompositionFeature::class -> object : QRDecompositionFeature<Float> {
+                private val qr by lazy {
+                    DecompositionFactory_FSCC.qr(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val q: Matrix<Float> by lazy {
+                    qr.getQ(null, false).wrapMatrix().withFeature(OrthogonalFeature)
+                }
+
+                override val r: Matrix<Float> by lazy { qr.getR(null, false).wrapMatrix().withFeature(UFeature) }
+            }
+
+            CholeskyDecompositionFeature::class -> object : CholeskyDecompositionFeature<Float> {
+                override val l: Matrix<Float> by lazy {
+                    val cholesky =
+                        DecompositionFactory_FSCC.cholesky().apply { decompose(origin.copy()) }
+
+                    (cholesky.getT(null) as FMatrix).wrapMatrix().withFeature(LFeature)
+                }
+            }
+
+            LUDecompositionFeature::class, DeterminantFeature::class, InverseMatrixFeature::class -> object :
+                LUDecompositionFeature<Float>, DeterminantFeature<Float>, InverseMatrixFeature<Float> {
+                private val lu by lazy {
+                    DecompositionFactory_FSCC.lu(FillReducing.NONE).apply { decompose(origin.copy()) }
+                }
+
+                override val l: Matrix<Float> by lazy {
+                    lu.getLower(null).wrapMatrix().withFeature(LFeature)
+                }
+
+                override val u: Matrix<Float> by lazy {
+                    lu.getUpper(null).wrapMatrix().withFeature(UFeature)
+                }
+
+                override val inverse: Matrix<Float> by lazy {
+                    var a = origin
+                    val inverse = FMatrixRMaj(1, 1)
+                    val solver = LinearSolverFactory_FSCC.lu(FillReducing.NONE)
+                    if (solver.modifiesA()) a = a.copy()
+                    val i = CommonOps_FDRM.identity(a.numRows)
+                    solver.solve(i, inverse)
+                    inverse.wrapMatrix()
+                }
+
+                override val determinant: Float by lazy { elementAlgebra.number(lu.computeDeterminant().real) }
+            }
+
+            else -> null
+        }?.let{
+            type.cast(it)
+        }
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p matrix.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Float>, b: Matrix<Float>): EjmlFloatMatrix<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.solve(FMatrixSparseCSC(a.toEjml().origin), FMatrixSparseCSC(b.toEjml().origin), res)
+        return res.wrapMatrix()
+    }
+
+    /**
+     * Solves for *x* in the following equation: *x = [a] <sup>-1</sup> &middot; [b]*.
+     *
+     * @param a the base matrix.
+     * @param b n by p vector.
+     * @return the solution for *x* that is n by p.
+     */
+    public fun solve(a: Matrix<Float>, b: Point<Float>): EjmlFloatVector<FMatrixSparseCSC> {
+        val res = FMatrixSparseCSC(1, 1)
+        CommonOps_FSCC.solve(FMatrixSparseCSC(a.toEjml().origin), FMatrixSparseCSC(b.toEjml().origin), res)
+        return EjmlFloatVector(res)
+    }
+}
+
-- 
2.34.1


From 32769d690683d8b1975f1d3380c2f6f3ffe49972 Mon Sep 17 00:00:00 2001
From: Erik Schouten <Erik@ErikSchouten.com>
Date: Fri, 15 Jul 2022 18:13:50 +0200
Subject: [PATCH 574/713] Dubins path

---
 kmath-trajectory/README.md                    |  32 ++++
 kmath-trajectory/build.gradle.kts             |  15 ++
 .../kmath/trajectory/dubins/DubinsPath.kt     |  30 +++
 .../trajectory/dubins/DubinsPathFactory.kt    | 171 ++++++++++++++++++
 .../kscience/kmath/trajectory/segments/Arc.kt |  43 +++++
 .../kmath/trajectory/segments/Line.kt         |  23 +++
 .../kmath/trajectory/segments/Segment.kt      |   5 +
 .../trajectory/segments/components/Circle.kt  |  11 ++
 .../trajectory/segments/components/Pose2D.kt  |  18 ++
 .../space/kscience/kmath/trajectory/Math.kt   |  27 +++
 .../kmath/trajectory/dubins/DubinsTests.kt    |  68 +++++++
 .../kmath/trajectory/segments/ArcTests.kt     |  24 +++
 .../kmath/trajectory/segments/LineTests.kt    |  33 ++++
 settings.gradle.kts                           |   3 +-
 14 files changed, 502 insertions(+), 1 deletion(-)
 create mode 100644 kmath-trajectory/README.md
 create mode 100644 kmath-trajectory/build.gradle.kts
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Segment.kt
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Circle.kt
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt
 create mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
 create mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
 create mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
 create mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt

diff --git a/kmath-trajectory/README.md b/kmath-trajectory/README.md
new file mode 100644
index 000000000..cb2b6989f
--- /dev/null
+++ b/kmath-trajectory/README.md
@@ -0,0 +1,32 @@
+# Module kmath-trajectory
+
+
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-trajectory:0.3.0`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-trajectory:0.3.0'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-trajectory:0.3.0")
+}
+```
diff --git a/kmath-trajectory/build.gradle.kts b/kmath-trajectory/build.gradle.kts
new file mode 100644
index 000000000..502867ee3
--- /dev/null
+++ b/kmath-trajectory/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+    kotlin("multiplatform")
+    id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.native")
+}
+
+kotlin.sourceSets.commonMain {
+    dependencies {
+        api(projects.kmath.kmathGeometry)
+    }
+}
+
+readme {
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+}
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
new file mode 100644
index 000000000..005d7fd60
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory.dubins
+
+import space.kscience.kmath.trajectory.segments.Arc
+import space.kscience.kmath.trajectory.segments.Segment
+
+public class DubinsPath(
+    public val a: Arc,
+    public val b: Segment,
+    public val c: Arc,
+) {
+
+    public val type: TYPE = TYPE.valueOf(
+        arrayOf(
+            a.direction.name[0],
+            if (b is Arc) b.direction.name[0] else 'S',
+            c.direction.name[0]
+        ).toCharArray().concatToString()
+    )
+
+    public val length: Double = a.length + b.length + c.length
+
+    public enum class TYPE {
+        RLR, LRL, RSR, LSL, RSL, LSR
+    }
+}
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
new file mode 100644
index 000000000..98ed8ed32
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory.dubins
+
+import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
+import space.kscience.kmath.geometry.Line2D
+import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.trajectory.segments.Arc
+import space.kscience.kmath.trajectory.segments.LineSegment
+import space.kscience.kmath.trajectory.segments.components.Circle
+import space.kscience.kmath.trajectory.segments.components.Pose2D
+import space.kscience.kmath.trajectory.segments.length
+import space.kscience.kmath.trajectory.segments.theta
+import kotlin.math.acos
+import kotlin.math.cos
+import kotlin.math.sin
+
+public class DubinsPathFactory(
+    private val base: Pose2D,
+    private val direction: Pose2D,
+    private val turningRadius: Double
+) {
+
+    public val all: List<DubinsPath> get() = listOfNotNull(rlr, lrl, rsr, lsl, rsl, lsr)
+    public val shortest: DubinsPath get() = all.minByOrNull { it.length }!!
+    public operator fun get(type: DubinsPath.TYPE): DubinsPath? = all.find { it.type == type }
+
+    public val rlr: DubinsPath? get () {
+        val c1 = base.getRightCircle(turningRadius)
+        val c2 = direction.getRightCircle(turningRadius)
+        val centers = Line2D(c1.center, c2.center)
+        return if (centers.length < turningRadius * 4) {
+            var theta = (centers.theta - acos(centers.length / (turningRadius * 4))).theta
+            var dX = turningRadius * sin(theta)
+            var dY = turningRadius * cos(theta)
+            val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
+            val e = Circle(p, turningRadius)
+            val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
+            theta = (centers.theta + acos(centers.length / (turningRadius * 4))).theta
+            dX = turningRadius * sin(theta)
+            dY = turningRadius * cos(theta)
+            val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
+            val a1 = Arc(c1.center, turningRadius, base, p1, Arc.Direction.RIGHT)
+            val a2 = Arc(e.center, turningRadius, p1, p2, Arc.Direction.LEFT)
+            val a3 = Arc(c2.center, turningRadius, p2, direction, Arc.Direction.RIGHT)
+            DubinsPath(a1, a2, a3)
+        } else {
+            null
+        }
+    }
+
+    private val lrl: DubinsPath? get () {
+        val c1 = base.getLeftCircle(turningRadius)
+        val c2 = direction.getLeftCircle(turningRadius)
+        val centers = Line2D(c1.center, c2.center)
+        return if (centers.length < turningRadius * 4) {
+            var theta = (centers.theta + acos(centers.length / (turningRadius * 4))).theta
+            var dX = turningRadius * sin(theta)
+            var dY = turningRadius * cos(theta)
+            val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
+            val e = Circle(p, turningRadius)
+            val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
+            theta = (centers.theta - acos(centers.length / (turningRadius * 4))).theta
+            dX = turningRadius * sin(theta)
+            dY = turningRadius * cos(theta)
+            val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
+            val a1 = Arc(c1.center, turningRadius, base, p1, Arc.Direction.LEFT)
+            val a2 = Arc(e.center, turningRadius, p1, p2, Arc.Direction.RIGHT)
+            val a3 = Arc(c2.center, turningRadius, p2, direction, Arc.Direction.LEFT)
+            DubinsPath(a1, a2, a3)
+        } else {
+            null
+        }
+    }
+
+    public val rsr: DubinsPath? get () {
+        val c1 = base.getRightCircle(turningRadius)
+        val c2 = direction.getRightCircle(turningRadius)
+        val l = leftOuterTangent(c1, c2)
+        val a1 = Arc(c1.center, turningRadius, base, l.base, Arc.Direction.RIGHT)
+        val a3 = Arc(c2.center, turningRadius, l.direction, direction, Arc.Direction.RIGHT)
+        return DubinsPath(a1, LineSegment(l), a3)
+    }
+
+    public val lsl: DubinsPath
+        get () {
+        val c1 = base.getLeftCircle(turningRadius)
+        val c2 = direction.getLeftCircle(turningRadius)
+        val l = rightOuterTangent(c1, c2)
+        val a1 = Arc(c1.center, turningRadius, base, l.base, Arc.Direction.LEFT)
+        val a3 = Arc(c2.center, turningRadius, l.direction, direction, Arc.Direction.LEFT)
+        return DubinsPath(a1, LineSegment(l), a3)
+    }
+
+    public val rsl: DubinsPath? get () {
+        val c1 = base.getRightCircle(turningRadius)
+        val c2 = direction.getLeftCircle(turningRadius)
+        val l = rightInnerTangent(c1, c2)
+        return if (c1.center.distanceTo(c2.center) > turningRadius * 2 && l != null) {
+            val a1 = Arc(c1.center, turningRadius, base, l.base, Arc.Direction.RIGHT)
+            val a3 = Arc(c2.center, turningRadius, l.direction, direction, Arc.Direction.LEFT)
+            DubinsPath(a1, LineSegment(l), a3)
+        } else {
+            null
+        }
+    }
+
+    public val lsr: DubinsPath? get () {
+        val c1 = base.getLeftCircle(turningRadius)
+        val c2 = direction.getRightCircle(turningRadius)
+        val l = leftInnerTangent(c1, c2)
+        return if (c1.center.distanceTo(c2.center) > turningRadius * 2 && l != null) {
+            val a1 = Arc(c1.center, turningRadius, base, l.base, Arc.Direction.LEFT)
+            val a3 = Arc(c2.center, turningRadius, l.direction, direction, Arc.Direction.RIGHT)
+            DubinsPath(a1, LineSegment(l), a3)
+        } else {
+            null
+        }
+    }
+}
+
+private enum class SIDE {
+    LEFT, RIGHT
+}
+
+private fun Pose2D.getLeftCircle(radius: Double): Circle = getTangentCircles(radius).first
+private fun Pose2D.getRightCircle(radius: Double): Circle = getTangentCircles(radius).second
+private fun Pose2D.getTangentCircles(radius: Double): Pair<Circle, Circle> {
+    val dX = radius * cos(theta)
+    val dY = radius * sin(theta)
+    return Circle(Vector2D(x - dX, y + dY), radius) to Circle(Vector2D(x + dX, y - dY), radius)
+}
+
+private fun leftOuterTangent(a: Circle, b: Circle) = outerTangent(a, b, SIDE.LEFT)
+private fun rightOuterTangent(a: Circle, b: Circle) = outerTangent(a, b, SIDE.RIGHT)
+private fun outerTangent(a: Circle, b: Circle, side: SIDE): Line2D {
+    val centers = Line2D(a.center, b.center)
+    val p1 = when (side) {
+        SIDE.LEFT -> Vector2D(
+            a.center.x - a.radius * cos(centers.theta),
+            a.center.y + a.radius * sin(centers.theta)
+        )
+        SIDE.RIGHT -> Vector2D(
+            a.center.x + a.radius * cos(centers.theta),
+            a.center.y - a.radius * sin(centers.theta)
+        )
+    }
+    return Line2D(p1, Vector2D(p1.x + (centers.direction.x - centers.base.x), p1.y + (centers.direction.y - centers.base.y)))
+}
+
+private fun leftInnerTangent(base: Circle, direction: Circle) = innerTangent(base, direction, SIDE.LEFT)
+private fun rightInnerTangent(base: Circle, direction: Circle) = innerTangent(base, direction, SIDE.RIGHT)
+private fun innerTangent(base: Circle, direction: Circle, side: SIDE): Line2D? {
+    val centers = Line2D(base.center, direction.center)
+    return if (centers.length > base.radius * 2) {
+        val angle = when (side) {
+            SIDE.LEFT -> centers.theta + acos(base.radius * 2 / centers.length)
+            SIDE.RIGHT -> centers.theta - acos(base.radius * 2 / centers.length)
+        }.theta
+        val dX = base.radius * sin(angle)
+        val dY = base.radius * cos(angle)
+        val p1 = Vector2D(base.center.x + dX, base.center.y + dY)
+        val p2 = Vector2D(direction.center.x - dX, direction.center.y - dY)
+        Line2D(p1, p2)
+    } else {
+        null
+    }
+}
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
new file mode 100644
index 000000000..a7b2fe259
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
@@ -0,0 +1,43 @@
+package space.kscience.kmath.trajectory.segments
+
+import space.kscience.kmath.geometry.Line2D
+import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.trajectory.segments.components.Circle
+import space.kscience.kmath.trajectory.segments.components.Pose2D
+import kotlin.math.PI
+
+public class Arc(
+    center: Vector2D,
+    radius: Double,
+    a: Vector2D,
+    b: Vector2D,
+    internal val direction: Direction
+) : Circle(center, radius), Segment {
+
+    private val l1 = Line2D(center, a)
+    private val l2 = Line2D(center, b)
+
+    internal val pose1 = calculatePose(a, l1.theta)
+    internal val pose2 = calculatePose(b, l2.theta)
+    private val angle = calculateAngle()
+    override val length: Double = calculateLength()
+
+    public enum class Direction {
+        LEFT, RIGHT
+    }
+
+    private fun calculateAngle() =
+        (if (direction == Direction.LEFT) l1.theta - l2.theta else l2.theta - l1.theta).theta
+
+    private fun calculateLength(): Double {
+        val proportion = angle / (2 * PI)
+        return circumference * proportion
+    }
+
+    private fun calculatePose(vector: Vector2D, theta: Double): Pose2D =
+        if (direction == Direction.LEFT) {
+            Pose2D(vector.x, vector.y, (theta - PI / 2).theta)
+        } else {
+            Pose2D(vector.x, vector.y, (theta + PI / 2).theta)
+        }
+}
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt
new file mode 100644
index 000000000..f63372016
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt
@@ -0,0 +1,23 @@
+package space.kscience.kmath.trajectory.segments
+
+import space.kscience.kmath.geometry.Line2D
+import space.kscience.kmath.operations.DoubleField.pow
+import kotlin.math.PI
+import kotlin.math.atan2
+import kotlin.math.sqrt
+
+public class LineSegment(
+    internal val line: Line2D
+) : Segment {
+    override val length: Double
+        get() = line.length
+}
+
+internal val Line2D.theta: Double
+    get() = atan2(direction.x - base.x, direction.y - base.y).theta
+
+internal val Line2D.length: Double
+    get() = sqrt((direction.x - base.x).pow(2) + (direction.y - base.y).pow(2))
+
+internal val Double.theta: Double
+    get() = (this + (2 * PI)) % (2 * PI)
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Segment.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Segment.kt
new file mode 100644
index 000000000..8a1d086fc
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Segment.kt
@@ -0,0 +1,5 @@
+package space.kscience.kmath.trajectory.segments
+
+public interface Segment {
+    public val length: Double
+}
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Circle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Circle.kt
new file mode 100644
index 000000000..946dd8c6e
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Circle.kt
@@ -0,0 +1,11 @@
+package space.kscience.kmath.trajectory.segments.components
+
+import space.kscience.kmath.geometry.Vector2D
+import kotlin.math.PI
+
+public open class Circle(
+    internal val center: Vector2D,
+    internal val radius: Double
+) {
+    internal val circumference = radius * 2 * PI
+}
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt
new file mode 100644
index 000000000..6bcc3d308
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt
@@ -0,0 +1,18 @@
+package space.kscience.kmath.trajectory.segments.components
+
+import space.kscience.kmath.geometry.Vector2D
+import kotlin.math.cos
+import kotlin.math.sin
+
+public class Pose2D(
+    override val x: Double,
+    override val y: Double,
+    public val theta: Double
+) : Vector2D {
+
+    internal constructor(vector: Vector2D, theta: Double) : this(vector.x, vector.y, theta)
+
+    override fun toString(): String {
+        return "Pose2D(x=$x, y=$y, theta=$theta)"
+    }
+}
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
new file mode 100644
index 000000000..9258e6b4a
--- /dev/null
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
@@ -0,0 +1,27 @@
+package space.kscience.kmath.trajectory
+
+import space.kscience.kmath.geometry.Line2D
+import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.trajectory.segments.components.Pose2D
+import space.kscience.kmath.trajectory.segments.theta
+import kotlin.math.PI
+import kotlin.math.abs
+import kotlin.math.sin
+
+private const val maxFloatDelta = 0.000001
+
+fun Double.radiansToDegrees() = this * 180 / PI
+
+fun Double.equalFloat(other: Double) = abs(this - other) < maxFloatDelta
+fun Pose2D.equalsFloat(other: Pose2D) = x.equalFloat(other.x) && y.equalFloat(other.y) && theta.equalFloat(other.theta)
+
+fun Line2D.inverse() = Line2D(direction, base)
+fun Line2D.shift(shift: Int, width: Double): Line2D {
+    val dX = width * sin(inverse().theta)
+    val dY = width * sin(theta)
+
+    return Line2D(
+        Vector2D(base.x - dX * shift, base.y - dY * shift),
+        Vector2D(direction.x - dX * shift, direction.y - dY * shift)
+    )
+}
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
new file mode 100644
index 000000000..583e7a4e0
--- /dev/null
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory.dubins
+
+import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
+import space.kscience.kmath.geometry.Line2D
+import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.trajectory.segments.Arc
+import space.kscience.kmath.trajectory.segments.LineSegment
+import space.kscience.kmath.trajectory.equalFloat
+import space.kscience.kmath.trajectory.equalsFloat
+import space.kscience.kmath.trajectory.inverse
+import space.kscience.kmath.trajectory.segments.components.Pose2D
+import space.kscience.kmath.trajectory.segments.theta
+import space.kscience.kmath.trajectory.shift
+import kotlin.test.Test
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+
+class DubinsTests {
+
+    @Test
+    fun dubinsTest() {
+        val line = Line2D(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
+        val lineP1 = line.shift(1, 10.0).inverse()
+
+        val start = Pose2D(line.direction, line.theta)
+        val end = Pose2D(lineP1.base, lineP1.theta)
+        val radius = 2.0
+        val dubins = DubinsPathFactory(start, end, radius)
+
+        val absoluteDistance = start.distanceTo(end)
+        println("Absolute distance: $absoluteDistance")
+
+        val expectedLengths = mapOf(
+            DubinsPath.TYPE.RLR to 13.067681939031397,
+            DubinsPath.TYPE.RSR to 12.28318530717957,
+            DubinsPath.TYPE.LSL to 32.84955592153878,
+            DubinsPath.TYPE.RSL to 23.37758938854081,
+            DubinsPath.TYPE.LSR to 23.37758938854081
+        )
+
+        expectedLengths.forEach {
+            val path = dubins[it.key]
+            assertNotNull(path, "Path ${it.key} not found")
+            println("${it.key}: ${path.length}")
+            assertTrue(it.value.equalFloat(path.length))
+
+            assertTrue(start.equalsFloat(path.a.pose1))
+            assertTrue(end.equalsFloat(path.c.pose2))
+
+            // Not working, theta double precision inaccuracy
+            if (path.b is Arc) {
+                val b = path.b as Arc
+                assertTrue(path.a.pose2.equalsFloat(b.pose1))
+                assertTrue(path.c.pose1.equalsFloat(b.pose2))
+            } else if (path.b is LineSegment) {
+                val b = (path.b as LineSegment).line
+                assertTrue(path.a.pose2.equalsFloat(Pose2D(b.base, b.theta)))
+                assertTrue(path.c.pose1.equalsFloat(Pose2D(b.direction, b.theta)))
+            }
+        }
+    }
+}
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
new file mode 100644
index 000000000..73b3a1d87
--- /dev/null
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
@@ -0,0 +1,24 @@
+package space.kscience.kmath.trajectory.segments
+
+import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.trajectory.radiansToDegrees
+import space.kscience.kmath.trajectory.segments.components.Circle
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class ArcTests {
+
+    @Test
+    fun arcTest() {
+        val center = Vector2D(0.0, 0.0)
+        val radius = 2.0
+        val expectedCircumference = 12.56637
+        val circle = Circle(center, radius)
+        assertEquals(expectedCircumference, circle.circumference, 1.0)
+
+        val arc = Arc(center, radius, Vector2D(-2.0, 0.0), Vector2D(0.0, 2.0), Arc.Direction.RIGHT)
+        assertEquals(expectedCircumference / 4, arc.length, 1.0)
+        assertEquals(0.0, arc.pose1.theta.radiansToDegrees())
+        assertEquals(90.0, arc.pose2.theta.radiansToDegrees())
+    }
+}
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
new file mode 100644
index 000000000..30f5ef6d8
--- /dev/null
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
@@ -0,0 +1,33 @@
+package space.kscience.kmath.trajectory.segments
+
+import space.kscience.kmath.geometry.Euclidean2DSpace
+import space.kscience.kmath.geometry.Line2D
+import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.trajectory.radiansToDegrees
+import kotlin.math.pow
+import kotlin.math.sqrt
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class LineTests {
+
+    @Test
+    fun lineTest() {
+        val line = Line2D(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
+        assertEquals(sqrt(100.0.pow(2) + 100.0.pow(2)), line.length)
+        assertEquals(45.0, line.theta.radiansToDegrees())
+    }
+
+    @Test
+    fun lineAngleTest() {
+        val zero = Vector2D(0.0, 0.0)
+        val north = Line2D(Euclidean2DSpace.zero, Vector2D(0.0, 2.0))
+        assertEquals(0.0, north.theta.radiansToDegrees())
+        val east = Line2D(Euclidean2DSpace.zero, Vector2D(2.0, 0.0))
+        assertEquals(90.0, east.theta.radiansToDegrees())
+        val south = Line2D(Euclidean2DSpace.zero, Vector2D(0.0, -2.0))
+        assertEquals(180.0, south.theta.radiansToDegrees())
+        val west = Line2D(Euclidean2DSpace.zero, Vector2D(-2.0, 0.0))
+        assertEquals(270.0, west.theta.radiansToDegrees())
+    }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e3c621e9a..b564972c7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,6 +44,7 @@ include(
     ":kmath-jupyter",
     ":kmath-symja",
     ":kmath-jafama",
+    ":kmath-trajectory",
     ":examples",
     ":benchmarks",
-)
\ No newline at end of file
+)
-- 
2.34.1


From cdb116fa2009c36a2aaad9942032b35f83d4f8de Mon Sep 17 00:00:00 2001
From: Erik Schouten <Erik@ErikSchouten.com>
Date: Fri, 15 Jul 2022 18:55:37 +0200
Subject: [PATCH 575/713] Cleanup

---
 .../trajectory/dubins/DubinsPathFactory.kt    | 94 +++++++++----------
 1 file changed, 43 insertions(+), 51 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
index 98ed8ed32..56875ac5b 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
@@ -32,51 +32,47 @@ public class DubinsPathFactory(
         val c1 = base.getRightCircle(turningRadius)
         val c2 = direction.getRightCircle(turningRadius)
         val centers = Line2D(c1.center, c2.center)
-        return if (centers.length < turningRadius * 4) {
-            var theta = (centers.theta - acos(centers.length / (turningRadius * 4))).theta
-            var dX = turningRadius * sin(theta)
-            var dY = turningRadius * cos(theta)
-            val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
-            val e = Circle(p, turningRadius)
-            val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
-            theta = (centers.theta + acos(centers.length / (turningRadius * 4))).theta
-            dX = turningRadius * sin(theta)
-            dY = turningRadius * cos(theta)
-            val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-            val a1 = Arc(c1.center, turningRadius, base, p1, Arc.Direction.RIGHT)
-            val a2 = Arc(e.center, turningRadius, p1, p2, Arc.Direction.LEFT)
-            val a3 = Arc(c2.center, turningRadius, p2, direction, Arc.Direction.RIGHT)
-            DubinsPath(a1, a2, a3)
-        } else {
-            null
-        }
+        if (centers.length > turningRadius * 4) return null
+
+        var theta = (centers.theta - acos(centers.length / (turningRadius * 4))).theta
+        var dX = turningRadius * sin(theta)
+        var dY = turningRadius * cos(theta)
+        val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
+        val e = Circle(p, turningRadius)
+        val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
+        theta = (centers.theta + acos(centers.length / (turningRadius * 4))).theta
+        dX = turningRadius * sin(theta)
+        dY = turningRadius * cos(theta)
+        val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
+        val a1 = Arc(c1.center, turningRadius, base, p1, Arc.Direction.RIGHT)
+        val a2 = Arc(e.center, turningRadius, p1, p2, Arc.Direction.LEFT)
+        val a3 = Arc(c2.center, turningRadius, p2, direction, Arc.Direction.RIGHT)
+        return DubinsPath(a1, a2, a3)
     }
 
     private val lrl: DubinsPath? get () {
         val c1 = base.getLeftCircle(turningRadius)
         val c2 = direction.getLeftCircle(turningRadius)
         val centers = Line2D(c1.center, c2.center)
-        return if (centers.length < turningRadius * 4) {
-            var theta = (centers.theta + acos(centers.length / (turningRadius * 4))).theta
-            var dX = turningRadius * sin(theta)
-            var dY = turningRadius * cos(theta)
-            val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
-            val e = Circle(p, turningRadius)
-            val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
-            theta = (centers.theta - acos(centers.length / (turningRadius * 4))).theta
-            dX = turningRadius * sin(theta)
-            dY = turningRadius * cos(theta)
-            val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-            val a1 = Arc(c1.center, turningRadius, base, p1, Arc.Direction.LEFT)
-            val a2 = Arc(e.center, turningRadius, p1, p2, Arc.Direction.RIGHT)
-            val a3 = Arc(c2.center, turningRadius, p2, direction, Arc.Direction.LEFT)
-            DubinsPath(a1, a2, a3)
-        } else {
-            null
-        }
+        if (centers.length > turningRadius * 4) return null
+
+        var theta = (centers.theta + acos(centers.length / (turningRadius * 4))).theta
+        var dX = turningRadius * sin(theta)
+        var dY = turningRadius * cos(theta)
+        val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
+        val e = Circle(p, turningRadius)
+        val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
+        theta = (centers.theta - acos(centers.length / (turningRadius * 4))).theta
+        dX = turningRadius * sin(theta)
+        dY = turningRadius * cos(theta)
+        val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
+        val a1 = Arc(c1.center, turningRadius, base, p1, Arc.Direction.LEFT)
+        val a2 = Arc(e.center, turningRadius, p1, p2, Arc.Direction.RIGHT)
+        val a3 = Arc(c2.center, turningRadius, p2, direction, Arc.Direction.LEFT)
+        return DubinsPath(a1, a2, a3)
     }
 
-    public val rsr: DubinsPath? get () {
+    public val rsr: DubinsPath get () {
         val c1 = base.getRightCircle(turningRadius)
         val c2 = direction.getRightCircle(turningRadius)
         val l = leftOuterTangent(c1, c2)
@@ -99,26 +95,22 @@ public class DubinsPathFactory(
         val c1 = base.getRightCircle(turningRadius)
         val c2 = direction.getLeftCircle(turningRadius)
         val l = rightInnerTangent(c1, c2)
-        return if (c1.center.distanceTo(c2.center) > turningRadius * 2 && l != null) {
-            val a1 = Arc(c1.center, turningRadius, base, l.base, Arc.Direction.RIGHT)
-            val a3 = Arc(c2.center, turningRadius, l.direction, direction, Arc.Direction.LEFT)
-            DubinsPath(a1, LineSegment(l), a3)
-        } else {
-            null
-        }
+        if (c1.center.distanceTo(c2.center) < turningRadius * 2 || l == null) return null
+
+        val a1 = Arc(c1.center, turningRadius, base, l.base, Arc.Direction.RIGHT)
+        val a3 = Arc(c2.center, turningRadius, l.direction, direction, Arc.Direction.LEFT)
+        return DubinsPath(a1, LineSegment(l), a3)
     }
 
     public val lsr: DubinsPath? get () {
         val c1 = base.getLeftCircle(turningRadius)
         val c2 = direction.getRightCircle(turningRadius)
         val l = leftInnerTangent(c1, c2)
-        return if (c1.center.distanceTo(c2.center) > turningRadius * 2 && l != null) {
-            val a1 = Arc(c1.center, turningRadius, base, l.base, Arc.Direction.LEFT)
-            val a3 = Arc(c2.center, turningRadius, l.direction, direction, Arc.Direction.RIGHT)
-            DubinsPath(a1, LineSegment(l), a3)
-        } else {
-            null
-        }
+        if (c1.center.distanceTo(c2.center) < turningRadius * 2 || l == null) return null
+
+        val a1 = Arc(c1.center, turningRadius, base, l.base, Arc.Direction.LEFT)
+        val a3 = Arc(c2.center, turningRadius, l.direction, direction, Arc.Direction.RIGHT)
+        return DubinsPath(a1, LineSegment(l), a3)
     }
 }
 
-- 
2.34.1


From ada1141738328101da29f48af4ba71bc8fca2d30 Mon Sep 17 00:00:00 2001
From: Erik Schouten <Erik@ErikSchouten.com>
Date: Fri, 15 Jul 2022 18:57:10 +0200
Subject: [PATCH 576/713] Use Line distancTo function

---
 .../kotlin/space/kscience/kmath/trajectory/segments/Line.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt
index f63372016..b3e93b5ed 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt
@@ -1,5 +1,6 @@
 package space.kscience.kmath.trajectory.segments
 
+import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
 import space.kscience.kmath.geometry.Line2D
 import space.kscience.kmath.operations.DoubleField.pow
 import kotlin.math.PI
@@ -17,7 +18,7 @@ internal val Line2D.theta: Double
     get() = atan2(direction.x - base.x, direction.y - base.y).theta
 
 internal val Line2D.length: Double
-    get() = sqrt((direction.x - base.x).pow(2) + (direction.y - base.y).pow(2))
+    get() = base.distanceTo(direction)
 
 internal val Double.theta: Double
     get() = (this + (2 * PI)) % (2 * PI)
-- 
2.34.1


From fa6d741869099923c120e709e11c521c85d425fc Mon Sep 17 00:00:00 2001
From: Erik Schouten <Erik@ErikSchouten.com>
Date: Fri, 15 Jul 2022 22:12:36 +0200
Subject: [PATCH 577/713] Small improvement in test classes, theta function

---
 .../trajectory/dubins/DubinsPathFactory.kt    | 46 ++++++++++---------
 .../kscience/kmath/trajectory/segments/Arc.kt | 11 ++---
 .../kmath/trajectory/segments/Line.kt         |  7 ++-
 .../trajectory/segments/components/Pose2D.kt  |  7 +--
 .../space/kscience/kmath/trajectory/Math.kt   |  2 +-
 .../kmath/trajectory/segments/ArcTests.kt     | 11 ++---
 .../segments/components/CircleTests.kt        | 23 ++++++++++
 7 files changed, 60 insertions(+), 47 deletions(-)
 create mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/components/CircleTests.kt

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
index 56875ac5b..818735a96 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
@@ -34,19 +34,19 @@ public class DubinsPathFactory(
         val centers = Line2D(c1.center, c2.center)
         if (centers.length > turningRadius * 4) return null
 
-        var theta = (centers.theta - acos(centers.length / (turningRadius * 4))).theta
+        var theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
         var dX = turningRadius * sin(theta)
         var dY = turningRadius * cos(theta)
         val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
         val e = Circle(p, turningRadius)
         val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
-        theta = (centers.theta + acos(centers.length / (turningRadius * 4))).theta
+        theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
         dX = turningRadius * sin(theta)
         dY = turningRadius * cos(theta)
         val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-        val a1 = Arc(c1.center, turningRadius, base, p1, Arc.Direction.RIGHT)
-        val a2 = Arc(e.center, turningRadius, p1, p2, Arc.Direction.LEFT)
-        val a3 = Arc(c2.center, turningRadius, p2, direction, Arc.Direction.RIGHT)
+        val a1 = Arc(c1.center, base, p1, Arc.Direction.RIGHT)
+        val a2 = Arc(e.center, p1, p2, Arc.Direction.LEFT)
+        val a3 = Arc(c2.center, p2, direction, Arc.Direction.RIGHT)
         return DubinsPath(a1, a2, a3)
     }
 
@@ -56,19 +56,19 @@ public class DubinsPathFactory(
         val centers = Line2D(c1.center, c2.center)
         if (centers.length > turningRadius * 4) return null
 
-        var theta = (centers.theta + acos(centers.length / (turningRadius * 4))).theta
+        var theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
         var dX = turningRadius * sin(theta)
         var dY = turningRadius * cos(theta)
         val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
         val e = Circle(p, turningRadius)
         val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
-        theta = (centers.theta - acos(centers.length / (turningRadius * 4))).theta
+        theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
         dX = turningRadius * sin(theta)
         dY = turningRadius * cos(theta)
         val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-        val a1 = Arc(c1.center, turningRadius, base, p1, Arc.Direction.LEFT)
-        val a2 = Arc(e.center, turningRadius, p1, p2, Arc.Direction.RIGHT)
-        val a3 = Arc(c2.center, turningRadius, p2, direction, Arc.Direction.LEFT)
+        val a1 = Arc(c1.center, base, p1, Arc.Direction.LEFT)
+        val a2 = Arc(e.center, p1, p2, Arc.Direction.RIGHT)
+        val a3 = Arc(c2.center, p2, direction, Arc.Direction.LEFT)
         return DubinsPath(a1, a2, a3)
     }
 
@@ -76,8 +76,8 @@ public class DubinsPathFactory(
         val c1 = base.getRightCircle(turningRadius)
         val c2 = direction.getRightCircle(turningRadius)
         val l = leftOuterTangent(c1, c2)
-        val a1 = Arc(c1.center, turningRadius, base, l.base, Arc.Direction.RIGHT)
-        val a3 = Arc(c2.center, turningRadius, l.direction, direction, Arc.Direction.RIGHT)
+        val a1 = Arc(c1.center, base, l.base, Arc.Direction.RIGHT)
+        val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.RIGHT)
         return DubinsPath(a1, LineSegment(l), a3)
     }
 
@@ -86,8 +86,8 @@ public class DubinsPathFactory(
         val c1 = base.getLeftCircle(turningRadius)
         val c2 = direction.getLeftCircle(turningRadius)
         val l = rightOuterTangent(c1, c2)
-        val a1 = Arc(c1.center, turningRadius, base, l.base, Arc.Direction.LEFT)
-        val a3 = Arc(c2.center, turningRadius, l.direction, direction, Arc.Direction.LEFT)
+        val a1 = Arc(c1.center, base, l.base, Arc.Direction.LEFT)
+        val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.LEFT)
         return DubinsPath(a1, LineSegment(l), a3)
     }
 
@@ -97,8 +97,8 @@ public class DubinsPathFactory(
         val l = rightInnerTangent(c1, c2)
         if (c1.center.distanceTo(c2.center) < turningRadius * 2 || l == null) return null
 
-        val a1 = Arc(c1.center, turningRadius, base, l.base, Arc.Direction.RIGHT)
-        val a3 = Arc(c2.center, turningRadius, l.direction, direction, Arc.Direction.LEFT)
+        val a1 = Arc(c1.center, base, l.base, Arc.Direction.RIGHT)
+        val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.LEFT)
         return DubinsPath(a1, LineSegment(l), a3)
     }
 
@@ -108,8 +108,8 @@ public class DubinsPathFactory(
         val l = leftInnerTangent(c1, c2)
         if (c1.center.distanceTo(c2.center) < turningRadius * 2 || l == null) return null
 
-        val a1 = Arc(c1.center, turningRadius, base, l.base, Arc.Direction.LEFT)
-        val a3 = Arc(c2.center, turningRadius, l.direction, direction, Arc.Direction.RIGHT)
+        val a1 = Arc(c1.center, base, l.base, Arc.Direction.LEFT)
+        val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.RIGHT)
         return DubinsPath(a1, LineSegment(l), a3)
     }
 }
@@ -148,10 +148,12 @@ private fun rightInnerTangent(base: Circle, direction: Circle) = innerTangent(ba
 private fun innerTangent(base: Circle, direction: Circle, side: SIDE): Line2D? {
     val centers = Line2D(base.center, direction.center)
     return if (centers.length > base.radius * 2) {
-        val angle = when (side) {
-            SIDE.LEFT -> centers.theta + acos(base.radius * 2 / centers.length)
-            SIDE.RIGHT -> centers.theta - acos(base.radius * 2 / centers.length)
-        }.theta
+        val angle = theta(
+            when (side) {
+                SIDE.LEFT -> centers.theta + acos(base.radius * 2 / centers.length)
+                SIDE.RIGHT -> centers.theta - acos(base.radius * 2 / centers.length)
+            }
+        )
         val dX = base.radius * sin(angle)
         val dY = base.radius * cos(angle)
         val p1 = Vector2D(base.center.x + dX, base.center.y + dY)
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
index a7b2fe259..b8a81a070 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
@@ -1,5 +1,6 @@
 package space.kscience.kmath.trajectory.segments
 
+import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
 import space.kscience.kmath.geometry.Line2D
 import space.kscience.kmath.geometry.Vector2D
 import space.kscience.kmath.trajectory.segments.components.Circle
@@ -8,11 +9,10 @@ import kotlin.math.PI
 
 public class Arc(
     center: Vector2D,
-    radius: Double,
     a: Vector2D,
     b: Vector2D,
     internal val direction: Direction
-) : Circle(center, radius), Segment {
+) : Circle(center, center.distanceTo(a)), Segment {
 
     private val l1 = Line2D(center, a)
     private val l2 = Line2D(center, b)
@@ -26,8 +26,7 @@ public class Arc(
         LEFT, RIGHT
     }
 
-    private fun calculateAngle() =
-        (if (direction == Direction.LEFT) l1.theta - l2.theta else l2.theta - l1.theta).theta
+    private fun calculateAngle() = theta(if (direction == Direction.LEFT) l1.theta - l2.theta else l2.theta - l1.theta)
 
     private fun calculateLength(): Double {
         val proportion = angle / (2 * PI)
@@ -36,8 +35,8 @@ public class Arc(
 
     private fun calculatePose(vector: Vector2D, theta: Double): Pose2D =
         if (direction == Direction.LEFT) {
-            Pose2D(vector.x, vector.y, (theta - PI / 2).theta)
+            Pose2D(vector.x, vector.y, theta(theta - PI / 2))
         } else {
-            Pose2D(vector.x, vector.y, (theta + PI / 2).theta)
+            Pose2D(vector.x, vector.y, theta(theta + PI / 2))
         }
 }
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt
index b3e93b5ed..0e23b27f1 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt
@@ -7,7 +7,7 @@ import kotlin.math.PI
 import kotlin.math.atan2
 import kotlin.math.sqrt
 
-public class LineSegment(
+public data class LineSegment(
     internal val line: Line2D
 ) : Segment {
     override val length: Double
@@ -15,10 +15,9 @@ public class LineSegment(
 }
 
 internal val Line2D.theta: Double
-    get() = atan2(direction.x - base.x, direction.y - base.y).theta
+    get() = theta(atan2(direction.x - base.x, direction.y - base.y))
 
 internal val Line2D.length: Double
     get() = base.distanceTo(direction)
 
-internal val Double.theta: Double
-    get() = (this + (2 * PI)) % (2 * PI)
+internal fun theta(theta: Double) = (theta + (2 * PI)) % (2 * PI)
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt
index 6bcc3d308..d00dfbd96 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt
@@ -4,15 +4,10 @@ import space.kscience.kmath.geometry.Vector2D
 import kotlin.math.cos
 import kotlin.math.sin
 
-public class Pose2D(
+public data class Pose2D(
     override val x: Double,
     override val y: Double,
     public val theta: Double
 ) : Vector2D {
-
     internal constructor(vector: Vector2D, theta: Double) : this(vector.x, vector.y, theta)
-
-    override fun toString(): String {
-        return "Pose2D(x=$x, y=$y, theta=$theta)"
-    }
 }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
index 9258e6b4a..f52bb56f2 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
@@ -8,7 +8,7 @@ import kotlin.math.PI
 import kotlin.math.abs
 import kotlin.math.sin
 
-private const val maxFloatDelta = 0.000001
+const val maxFloatDelta = 0.000001
 
 fun Double.radiansToDegrees() = this * 180 / PI
 
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
index 73b3a1d87..a59643c0c 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
@@ -10,14 +10,9 @@ class ArcTests {
 
     @Test
     fun arcTest() {
-        val center = Vector2D(0.0, 0.0)
-        val radius = 2.0
-        val expectedCircumference = 12.56637
-        val circle = Circle(center, radius)
-        assertEquals(expectedCircumference, circle.circumference, 1.0)
-
-        val arc = Arc(center, radius, Vector2D(-2.0, 0.0), Vector2D(0.0, 2.0), Arc.Direction.RIGHT)
-        assertEquals(expectedCircumference / 4, arc.length, 1.0)
+        val circle = Circle(Vector2D(0.0, 0.0), 2.0)
+        val arc = Arc(circle.center, Vector2D(-2.0, 0.0), Vector2D(0.0, 2.0), Arc.Direction.RIGHT)
+        assertEquals(circle.circumference / 4, arc.length, 1.0)
         assertEquals(0.0, arc.pose1.theta.radiansToDegrees())
         assertEquals(90.0, arc.pose2.theta.radiansToDegrees())
     }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/components/CircleTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/components/CircleTests.kt
new file mode 100644
index 000000000..6f28885e0
--- /dev/null
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/components/CircleTests.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory.segments.components
+
+import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.trajectory.maxFloatDelta
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class CircleTests {
+
+    @Test
+    fun arcTest() {
+        val center = Vector2D(0.0, 0.0)
+        val radius = 2.0
+        val expectedCircumference = 12.56637
+        val circle = Circle(center, radius)
+        assertEquals(expectedCircumference, circle.circumference, maxFloatDelta)
+    }
+}
-- 
2.34.1


From 4f88982734acfdfa5f771c3c9c3705801ab00781 Mon Sep 17 00:00:00 2001
From: Erik Schouten <Erik@ErikSchouten.com>
Date: Fri, 15 Jul 2022 22:13:50 +0200
Subject: [PATCH 578/713] Formatting

---
 .../trajectory/dubins/DubinsPathFactory.kt    | 158 +++++++++---------
 1 file changed, 83 insertions(+), 75 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
index 818735a96..91287b952 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
@@ -28,90 +28,95 @@ public class DubinsPathFactory(
     public val shortest: DubinsPath get() = all.minByOrNull { it.length }!!
     public operator fun get(type: DubinsPath.TYPE): DubinsPath? = all.find { it.type == type }
 
-    public val rlr: DubinsPath? get () {
-        val c1 = base.getRightCircle(turningRadius)
-        val c2 = direction.getRightCircle(turningRadius)
-        val centers = Line2D(c1.center, c2.center)
-        if (centers.length > turningRadius * 4) return null
+    public val rlr: DubinsPath?
+        get() {
+            val c1 = base.getRightCircle(turningRadius)
+            val c2 = direction.getRightCircle(turningRadius)
+            val centers = Line2D(c1.center, c2.center)
+            if (centers.length > turningRadius * 4) return null
 
-        var theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
-        var dX = turningRadius * sin(theta)
-        var dY = turningRadius * cos(theta)
-        val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
-        val e = Circle(p, turningRadius)
-        val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
-        theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
-        dX = turningRadius * sin(theta)
-        dY = turningRadius * cos(theta)
-        val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-        val a1 = Arc(c1.center, base, p1, Arc.Direction.RIGHT)
-        val a2 = Arc(e.center, p1, p2, Arc.Direction.LEFT)
-        val a3 = Arc(c2.center, p2, direction, Arc.Direction.RIGHT)
-        return DubinsPath(a1, a2, a3)
-    }
+            var theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
+            var dX = turningRadius * sin(theta)
+            var dY = turningRadius * cos(theta)
+            val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
+            val e = Circle(p, turningRadius)
+            val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
+            theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
+            dX = turningRadius * sin(theta)
+            dY = turningRadius * cos(theta)
+            val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
+            val a1 = Arc(c1.center, base, p1, Arc.Direction.RIGHT)
+            val a2 = Arc(e.center, p1, p2, Arc.Direction.LEFT)
+            val a3 = Arc(c2.center, p2, direction, Arc.Direction.RIGHT)
+            return DubinsPath(a1, a2, a3)
+        }
 
-    private val lrl: DubinsPath? get () {
-        val c1 = base.getLeftCircle(turningRadius)
-        val c2 = direction.getLeftCircle(turningRadius)
-        val centers = Line2D(c1.center, c2.center)
-        if (centers.length > turningRadius * 4) return null
+    private val lrl: DubinsPath?
+        get() {
+            val c1 = base.getLeftCircle(turningRadius)
+            val c2 = direction.getLeftCircle(turningRadius)
+            val centers = Line2D(c1.center, c2.center)
+            if (centers.length > turningRadius * 4) return null
 
-        var theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
-        var dX = turningRadius * sin(theta)
-        var dY = turningRadius * cos(theta)
-        val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
-        val e = Circle(p, turningRadius)
-        val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
-        theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
-        dX = turningRadius * sin(theta)
-        dY = turningRadius * cos(theta)
-        val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-        val a1 = Arc(c1.center, base, p1, Arc.Direction.LEFT)
-        val a2 = Arc(e.center, p1, p2, Arc.Direction.RIGHT)
-        val a3 = Arc(c2.center, p2, direction, Arc.Direction.LEFT)
-        return DubinsPath(a1, a2, a3)
-    }
+            var theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
+            var dX = turningRadius * sin(theta)
+            var dY = turningRadius * cos(theta)
+            val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
+            val e = Circle(p, turningRadius)
+            val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
+            theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
+            dX = turningRadius * sin(theta)
+            dY = turningRadius * cos(theta)
+            val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
+            val a1 = Arc(c1.center, base, p1, Arc.Direction.LEFT)
+            val a2 = Arc(e.center, p1, p2, Arc.Direction.RIGHT)
+            val a3 = Arc(c2.center, p2, direction, Arc.Direction.LEFT)
+            return DubinsPath(a1, a2, a3)
+        }
 
-    public val rsr: DubinsPath get () {
-        val c1 = base.getRightCircle(turningRadius)
-        val c2 = direction.getRightCircle(turningRadius)
-        val l = leftOuterTangent(c1, c2)
-        val a1 = Arc(c1.center, base, l.base, Arc.Direction.RIGHT)
-        val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.RIGHT)
-        return DubinsPath(a1, LineSegment(l), a3)
-    }
+    public val rsr: DubinsPath
+        get() {
+            val c1 = base.getRightCircle(turningRadius)
+            val c2 = direction.getRightCircle(turningRadius)
+            val l = leftOuterTangent(c1, c2)
+            val a1 = Arc(c1.center, base, l.base, Arc.Direction.RIGHT)
+            val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.RIGHT)
+            return DubinsPath(a1, LineSegment(l), a3)
+        }
 
     public val lsl: DubinsPath
-        get () {
-        val c1 = base.getLeftCircle(turningRadius)
-        val c2 = direction.getLeftCircle(turningRadius)
-        val l = rightOuterTangent(c1, c2)
-        val a1 = Arc(c1.center, base, l.base, Arc.Direction.LEFT)
-        val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.LEFT)
-        return DubinsPath(a1, LineSegment(l), a3)
-    }
+        get() {
+            val c1 = base.getLeftCircle(turningRadius)
+            val c2 = direction.getLeftCircle(turningRadius)
+            val l = rightOuterTangent(c1, c2)
+            val a1 = Arc(c1.center, base, l.base, Arc.Direction.LEFT)
+            val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.LEFT)
+            return DubinsPath(a1, LineSegment(l), a3)
+        }
 
-    public val rsl: DubinsPath? get () {
-        val c1 = base.getRightCircle(turningRadius)
-        val c2 = direction.getLeftCircle(turningRadius)
-        val l = rightInnerTangent(c1, c2)
-        if (c1.center.distanceTo(c2.center) < turningRadius * 2 || l == null) return null
+    public val rsl: DubinsPath?
+        get() {
+            val c1 = base.getRightCircle(turningRadius)
+            val c2 = direction.getLeftCircle(turningRadius)
+            val l = rightInnerTangent(c1, c2)
+            if (c1.center.distanceTo(c2.center) < turningRadius * 2 || l == null) return null
 
-        val a1 = Arc(c1.center, base, l.base, Arc.Direction.RIGHT)
-        val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.LEFT)
-        return DubinsPath(a1, LineSegment(l), a3)
-    }
+            val a1 = Arc(c1.center, base, l.base, Arc.Direction.RIGHT)
+            val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.LEFT)
+            return DubinsPath(a1, LineSegment(l), a3)
+        }
 
-    public val lsr: DubinsPath? get () {
-        val c1 = base.getLeftCircle(turningRadius)
-        val c2 = direction.getRightCircle(turningRadius)
-        val l = leftInnerTangent(c1, c2)
-        if (c1.center.distanceTo(c2.center) < turningRadius * 2 || l == null) return null
+    public val lsr: DubinsPath?
+        get() {
+            val c1 = base.getLeftCircle(turningRadius)
+            val c2 = direction.getRightCircle(turningRadius)
+            val l = leftInnerTangent(c1, c2)
+            if (c1.center.distanceTo(c2.center) < turningRadius * 2 || l == null) return null
 
-        val a1 = Arc(c1.center, base, l.base, Arc.Direction.LEFT)
-        val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.RIGHT)
-        return DubinsPath(a1, LineSegment(l), a3)
-    }
+            val a1 = Arc(c1.center, base, l.base, Arc.Direction.LEFT)
+            val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.RIGHT)
+            return DubinsPath(a1, LineSegment(l), a3)
+        }
 }
 
 private enum class SIDE {
@@ -140,7 +145,10 @@ private fun outerTangent(a: Circle, b: Circle, side: SIDE): Line2D {
             a.center.y - a.radius * sin(centers.theta)
         )
     }
-    return Line2D(p1, Vector2D(p1.x + (centers.direction.x - centers.base.x), p1.y + (centers.direction.y - centers.base.y)))
+    return Line2D(
+        p1,
+        Vector2D(p1.x + (centers.direction.x - centers.base.x), p1.y + (centers.direction.y - centers.base.y))
+    )
 }
 
 private fun leftInnerTangent(base: Circle, direction: Circle) = innerTangent(base, direction, SIDE.LEFT)
-- 
2.34.1


From 68add4cb5f189d30a7ab5156d141beec97746b02 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 16 Jul 2022 11:35:50 +0300
Subject: [PATCH 579/713] Refactor test naming

---
 CHANGELOG.md                                                    | 1 +
 .../{DerivativeStructureExpressionTest.kt => DSTest.kt}         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/{DerivativeStructureExpressionTest.kt => DSTest.kt} (98%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4b8c06cf..ec993fb36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 ### Added
+- Autodiff for generic algebra elements in core!
 
 ### Changed
 - Kotlin 1.7
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
similarity index 98%
rename from kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt
rename to kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
index e5bc9805a..727a918ec 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DerivativeStructureExpressionTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
@@ -25,7 +25,7 @@ internal inline fun diff(
     DSField(DoubleField, ::DoubleBuffer, order, mapOf(*parameters)).block()
 }
 
-internal class AutoDiffTest {
+internal class DSTest {
     private val x by symbol
     private val y by symbol
 
-- 
2.34.1


From 579511a5ee0b598fd0e72863ad69f33456e84996 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 16 Jul 2022 16:07:03 +0300
Subject: [PATCH 580/713] Add utilities for maps. Fix some tests.

---
 .../LabeledPolynomial.kt                      | 171 ++----
 .../ListPolynomial.kt                         |  24 +-
 .../NumberedPolynomial.kt                     |  80 +--
 .../collectionUtils.kt                        | 500 ++++++++++++++++++
 .../labeledConstructors.kt                    |  50 +-
 .../labeledUtil.kt                            |  24 +-
 .../numberedConstructors.kt                   |  47 +-
 .../numberedUtil.kt                           |  10 +-
 .../functions/NumberedConstructorsTest.kt     |  12 +-
 9 files changed, 606 insertions(+), 312 deletions(-)
 create mode 100644 kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/collectionUtils.kt

diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
index 12bf9f839..b07674a1e 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
@@ -150,12 +150,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         else with(coefficients) {
             if (isEmpty()) other.asPolynomial()
             else LabeledPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
+                withPutOrChanged(emptyMap(), other.asConstant()) { it -> it + other }
             )
         }
     /**
@@ -168,12 +163,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         else with(coefficients) {
             if (isEmpty()) (-other).asPolynomial()
             else LabeledPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
+                withPutOrChanged(emptyMap(), (-other).asConstant()) { it -> it - other }
             )
         }
     /**
@@ -186,11 +176,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             0 -> zero
             1 -> this
             else -> LabeledPolynomialAsIs(
-                coefficients
-                    .toMutableMap()
-                    .apply {
-                        for (degs in keys) this[degs] = this[degs]!! * other
-                    }
+                coefficients.mapValues { (_, value) -> value * other }
             )
         }
 
@@ -204,12 +190,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         else with(other.coefficients) {
             if (isEmpty()) this@plus.asPolynomial()
             else LabeledPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
+                withPutOrChanged(emptyMap(), this@plus.asConstant()) { it -> this@plus + it }
             )
         }
     /**
@@ -218,18 +199,14 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public override operator fun Int.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this == 0) -other
-        else with(other.coefficients) {
-            if (isEmpty()) this@minus.asPolynomial()
-            else LabeledPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        forEach { (key, value) -> if (key.isNotEmpty()) this[key] = -value }
-
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
+        when {
+            this == 0 -> -other
+            other.coefficients.isEmpty() -> this@minus.asPolynomial()
+            else -> LabeledPolynomialAsIs(
+                buildMap(other.coefficients.size + 1) {
+                    put(emptyMap(), asConstant())
+                    other.coefficients.copyMapToBy(this, { _, c -> -c }, { currentC, newC -> currentC - newC })
+                }
             )
         }
     /**
@@ -242,11 +219,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
             0 -> zero
             1 -> other
             else -> LabeledPolynomialAsIs(
-                other.coefficients
-                    .toMutableMap()
-                    .apply {
-                        for (degs in keys) this[degs] = this@times * this[degs]!!
-                    }
+                other.coefficients.mapValues { (_, value) -> this@times * value }
             )
         }
 
@@ -305,41 +278,26 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         with(other.coefficients) {
             if (isEmpty()) this@plus.asLabeledPolynomial()
             else LabeledPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
+                withPutOrChanged(emptyMap(), this@plus) { it -> this@plus + it }
             )
         }
     /**
      * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     override operator fun C.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) this@minus.asLabeledPolynomial()
-            else LabeledPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if(degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
+        if (other.coefficients.isEmpty()) this@minus.asPolynomial()
+        else LabeledPolynomialAsIs(
+            buildMap(other.coefficients.size + 1) {
+                put(emptyMap(), this@minus)
+                other.coefficients.copyMapToBy(this, { _, c -> -c }, { currentC, newC -> currentC - newC })
+            }
+        )
     /**
      * Returns product of the constant represented as a polynomial and the polynomial.
      */
     override operator fun C.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         LabeledPolynomialAsIs(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
+            other.coefficients.mapValues { this@times * it.value }
         )
 
     /**
@@ -349,12 +307,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         with(coefficients) {
             if (isEmpty()) other.asLabeledPolynomial()
             else LabeledPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
+                withPutOrChanged(emptyMap(), other) { it -> it + other }
             )
         }
     /**
@@ -364,12 +317,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         with(coefficients) {
             if (isEmpty()) other.asLabeledPolynomial()
             else LabeledPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyMap<Symbol, UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
+                withPutOrChanged(emptyMap(), -other) { it -> it - other }
             )
         }
     /**
@@ -377,11 +325,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun LabeledPolynomial<C>.times(other: C): LabeledPolynomial<C> =
         LabeledPolynomialAsIs(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
+            coefficients.mapValues { it.value * other }
         )
 
     /**
@@ -441,38 +385,27 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         with(other.coefficients) {
             if (isEmpty()) this@plus.asPolynomial()
             else LabeledPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        val degs = mapOf(this@plus to 1U)
-
-                        this[degs] = constantOne + getOrElse(degs) { constantZero }
-                    }
+                withPutOrChanged(mapOf(this@plus to 1U), constantOne) { it -> constantOne + it }
             )
         }
     /**
      * Returns difference between the variable represented as a monic monomial and the polynomial.
      */
     public override operator fun Symbol.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) this@minus.asPolynomial()
-            else LabeledPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        val theVariableDegs = mapOf(this@minus to 1U)
-
-                        forEach { (degs, c) -> if(degs != theVariableDegs) this[degs] = -c }
-
-                        this[theVariableDegs] = constantOne - getOrElse(theVariableDegs) { constantZero }
-                    }
-            )
-        }
+        if (other.coefficients.isEmpty()) this@minus.asPolynomial()
+        else LabeledPolynomialAsIs(
+            buildMap(other.coefficients.size + 1) {
+                put(mapOf(this@minus to 1U), constantOne)
+                other.coefficients.copyMapToBy(this, { _, c -> -c }) { currentC, newC -> currentC - newC }
+            }
+        )
     /**
      * Returns product of the variable represented as a monic monomial and the polynomial.
      */
     public override operator fun Symbol.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         LabeledPolynomialAsIs(
             other.coefficients
-                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[this] = if (this in it) it[this]!! + 1U else 1U } }
+                .mapKeys { (degs, _) -> degs.withPutOrChanged(this, 1u) { it -> it + 1u } }
         )
 
     /**
@@ -482,12 +415,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         with(coefficients) {
             if (isEmpty()) other.asPolynomial()
             else LabeledPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        val degs = mapOf(other to 1U)
-
-                        this[degs] = constantOne + getOrElse(degs) { constantZero }
-                    }
+                withPutOrChanged(mapOf(other to 1U), constantOne) { it -> it + constantOne }
             )
         }
     /**
@@ -497,12 +425,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         with(coefficients) {
             if (isEmpty()) other.asPolynomial()
             else LabeledPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        val degs = mapOf(other to 1U)
-
-                        this[degs] = getOrElse(degs) { constantZero } - constantOne
-                    }
+                withPutOrChanged(mapOf(other to 1U), -constantOne) { it -> it - constantOne }
             )
         }
     /**
@@ -511,7 +434,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override operator fun LabeledPolynomial<C>.times(other: Symbol): LabeledPolynomial<C> =
         LabeledPolynomialAsIs(
             coefficients
-                .mapKeys { (degs, _) -> degs.toMutableMap().also{ it[other] = if (other in it) it[other]!! + 1U else 1U } }
+                .mapKeys { (degs, _) -> degs.withPutOrChanged(other, 1u) { it -> it + 1u } }
         )
 
     /**
@@ -526,10 +449,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun LabeledPolynomial<C>.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         LabeledPolynomialAsIs(
-            buildMap(coefficients.size + other.coefficients.size) {
-                coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
-            }
+            mergeBy(coefficients, other.coefficients) { c1, c2 -> c1 + c2 }
         )
     /**
      * Returns difference of the polynomials.
@@ -537,8 +457,8 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     override operator fun LabeledPolynomial<C>.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
         LabeledPolynomialAsIs(
             buildMap(coefficients.size + other.coefficients.size) {
-                coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
+                coefficients.copyTo(this)
+                other.coefficients.copyMapToBy(this, { _, c -> -c }, { currentC, newC -> currentC - newC })
             }
         )
     /**
@@ -548,10 +468,9 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         LabeledPolynomialAsIs(
             buildMap(coefficients.size * other.coefficients.size) {
                 for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
-                    val degs = degs1.toMutableMap()
-                    degs2.mapValuesTo(degs) { (variable, deg) -> degs.getOrElse(variable) { 0u } + deg }
+                    val degs = mergeBy(degs1, degs2) { deg1, deg2 -> deg1 + deg2 }
                     val c = c1 * c2
-                    this[degs] = if (degs in this) this[degs]!! + c else c
+                    this.putOrChange(degs, c) { it -> it + c }
                 }
             }
         )
@@ -581,10 +500,8 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override val LabeledPolynomial<C>.degrees: Map<Symbol, UInt>
         get() =
             buildMap {
-                coefficients.entries.forEach { (degs, _) ->
-                    degs.mapValuesTo(this) { (variable, deg) ->
-                        max(getOrElse(variable) { 0u }, deg)
-                    }
+                coefficients.keys.forEach { degs ->
+                    degs.copyToBy(this, ::max)
                 }
             }
     /**
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt
index 91b9c7658..17c42ac8c 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt
@@ -109,11 +109,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
             0 -> zero
             1 -> this
             else -> ListPolynomial(
-                coefficients
-                    .toMutableList()
-                    .apply {
-                        for (deg in indices) this[deg] = this[deg] * other
-                    }
+                coefficients.map { it * other }
             )
         }
 
@@ -167,11 +163,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
             0 -> zero
             1 -> other
             else -> ListPolynomial(
-                other.coefficients
-                    .toMutableList()
-                    .apply {
-                        for (deg in indices) this[deg] = this@times * this[deg]
-                    }
+                other.coefficients.map { this@times * it }
             )
         }
 
@@ -214,11 +206,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      */
     public override operator fun C.times(other: ListPolynomial<C>): ListPolynomial<C> =
         ListPolynomial(
-            other.coefficients
-                .toMutableList()
-                .apply {
-                    for (deg in indices) this[deg] = this@times * this[deg]
-                }
+            other.coefficients.map { this@times * it }
         )
 
     /**
@@ -258,11 +246,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
      */
     public override operator fun ListPolynomial<C>.times(other: C): ListPolynomial<C> =
         ListPolynomial(
-            coefficients
-                .toMutableList()
-                .apply {
-                    for (deg in indices) this[deg] = this[deg] * other
-                }
+            coefficients.map { it * other }
         )
 
     /**
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
index 96c96e555..14c03ff7c 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
@@ -71,13 +71,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
         if (other == 0) this
         else
             NumberedPolynomialAsIs(
-                coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
+                coefficients.withPutOrChanged(emptyList(), other.asConstant()) { it -> it + other }
             )
     /**
      * Returns difference between the polynomial and the integer represented as a polynomial.
@@ -88,13 +82,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
         if (other == 0) this
         else
             NumberedPolynomialAsIs(
-                coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
+                coefficients.withPutOrChanged(emptyList(), (-other).asConstant()) { it -> it - other }
             )
     /**
      * Returns product of the polynomial and the integer represented as a polynomial.
@@ -106,11 +94,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
             0 -> zero
             1 -> this
             else -> NumberedPolynomialAsIs(
-                coefficients
-                    .toMutableMap()
-                    .apply {
-                        for (degs in keys) this[degs] = this[degs]!! * other
-                    }
+                coefficients.mapValues { it.value * other }
             )
         }
 
@@ -123,13 +107,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
         if (this == 0) other
         else
             NumberedPolynomialAsIs(
-                other.coefficients
-                    .toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
+                other.coefficients.withPutOrChanged(emptyList(), this@plus.asConstant()) { it -> this@plus + it }
             )
     /**
      * Returns difference between the integer represented as a polynomial and the polynomial.
@@ -162,11 +140,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
             0 -> zero
             1 -> other
             else -> NumberedPolynomialAsIs(
-                other.coefficients
-                    .toMutableMap()
-                    .apply {
-                        for (degs in keys) this[degs] = this@times * this[degs]!!
-                    }
+                other.coefficients.mapValues { this@times * it.value }
             )
         }
 
@@ -177,12 +151,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
         with(other.coefficients) {
             if (isEmpty()) NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to this@plus))
             else NumberedPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@plus + getOrElse(degs) { constantZero }
-                    }
+                withPutOrChanged(emptyList(), this@plus) { it -> this@plus + it }
             )
         }
     /**
@@ -207,11 +176,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun C.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         NumberedPolynomialAsIs(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this@times * this[degs]!!
-                }
+            other.coefficients.mapValues { this@times * it.value }
         )
 
     /**
@@ -221,12 +186,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
         with(coefficients) {
             if (isEmpty()) NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to other))
             else NumberedPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } + other
-                    }
+                withPutOrChanged(emptyList(), other) { it -> it + other }
             )
         }
     /**
@@ -236,12 +196,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
         with(coefficients) {
             if (isEmpty()) NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to other))
             else NumberedPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = getOrElse(degs) { constantZero } - other
-                    }
+                withPutOrChanged(emptyList(), -other) { it -> it - other }
             )
         }
     /**
@@ -249,11 +204,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun NumberedPolynomial<C>.times(other: C): NumberedPolynomial<C> =
         NumberedPolynomialAsIs(
-            coefficients
-                .toMutableMap()
-                .apply {
-                    for (degs in keys) this[degs] = this[degs]!! * other
-                }
+            coefficients.mapValues { it.value * other }
         )
 
     /**
@@ -274,10 +225,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
      */
     override operator fun NumberedPolynomial<C>.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         NumberedPolynomialAsIs(
-            buildMap(coefficients.size + other.coefficients.size) {
-                coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! + value else value }
-            }
+            mergeBy(coefficients, other.coefficients) { c1, c2 -> c1 + c2 }
         )
     /**
      * Returns difference of the polynomials.
@@ -285,8 +233,8 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
     override operator fun NumberedPolynomial<C>.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         NumberedPolynomialAsIs(
             buildMap(coefficients.size + other.coefficients.size) {
-                coefficients.mapValuesTo(this) { it.value }
-                other.coefficients.mapValuesTo(this) { (key, value) -> if (key in this) this[key]!! - value else -value }
+                coefficients.copyTo(this)
+                other.coefficients.copyMapToBy(this, { _, c -> -c }, { currentC, newC -> currentC - newC })
             }
         )
     /**
@@ -300,7 +248,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
                         (0..max(degs1.lastIndex, degs2.lastIndex))
                             .map { degs1.getOrElse(it) { 0U } + degs2.getOrElse(it) { 0U } }
                     val c = c1 * c2
-                    this[degs] = if (degs in this) this[degs]!! + c else c
+                    putOrChange(degs, c) { it -> it + c }
                 }
             }
         )
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/collectionUtils.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/collectionUtils.kt
new file mode 100644
index 000000000..1d3da4c8b
--- /dev/null
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/collectionUtils.kt
@@ -0,0 +1,500 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import kotlin.contracts.InvocationKind.*
+import kotlin.contracts.contract
+
+
+/**
+ * Applies the [transformation][transform] to the value corresponding to the given [key] or null instead if it's not
+ * present.
+ *
+ * @param key key to check.
+ * @param transform transformation to apply.
+ * @return result of the transformation
+ */
+internal inline fun <K, V> MutableMap<in K, V>.applyToKey(key: K, transform: (currentValue: V?) -> V): V {
+    contract {
+        callsInPlace(transform, EXACTLY_ONCE)
+    }
+    return transform(get(key)).also { this[key] = it }
+}
+
+/**
+ * Depending on presence of value corresponding to the given [key] either puts new value calculated by [valueOnPut] or
+ * changes the present value with [transformOnChange].
+ *
+ * @param key key to check.
+ * @param valueOnPut lazily calculated value to put in case of absence of the [key].
+ * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
+ * current value as a parameter.
+ * @return result value corresponding to the [key].
+ */
+internal inline fun <K, V> MutableMap<K, V>.putOrChange(key: K, valueOnPut: () -> V, transformOnChange: (currentValue: V) -> V): V {
+    contract {
+        callsInPlace(valueOnPut, AT_MOST_ONCE)
+        callsInPlace(transformOnChange, AT_MOST_ONCE)
+    }
+    @Suppress("UNCHECKED_CAST")
+    return (if (key !in this) valueOnPut() else transformOnChange(get(key) as V)).also { this[key] = it }
+}
+
+/**
+ * Depending on presence of value corresponding to the given [key] either puts new value [valueOnPut] or
+ * changes the present value with [transformOnChange].
+ *
+ * @param key key to check.
+ * @param valueOnPut value to put in case of absence of the [key].
+ * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
+ * current value as a parameter.
+ * @return result value corresponding to the [key].
+ */
+internal inline fun <K, V> MutableMap<K, V>.putOrChange(key: K, valueOnPut: V, transformOnChange: (currentValue: V) -> V): V {
+    contract {
+        callsInPlace(transformOnChange, AT_MOST_ONCE)
+    }
+    return putOrChange<K, V>(key, { valueOnPut }, transformOnChange)
+}
+
+/**
+ * Depending on presence of value corresponding to the given [key] either puts new value [valueOnPut] or
+ * changes the present value with [transformOnChange].
+ *
+ * @param key key to check.
+ * @param valueOnPut value to put in case of absence of the [key].
+ * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
+ * current value and new value as parameters.
+ * @return result value corresponding to the [key].
+ */
+internal inline fun <K, V> MutableMap<K, V>.putOrChange(key: K, valueOnPut: V, transformOnChange: (currentValue: V, newValue: V) -> V): V {
+    contract {
+        callsInPlace(transformOnChange, AT_MOST_ONCE)
+    }
+    return putOrChange<K, V>(key, { valueOnPut }, { transformOnChange(it, valueOnPut) })
+}
+
+/**
+ * Depending on presence of value corresponding to the given [key] either puts new value [valueOnPut] or
+ * changes the present value with [transformOnChange].
+ *
+ * @param key key to check.
+ * @param valueOnPut value to put in case of absence of the [key].
+ * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
+ * the [key], current value, and new value as parameters.
+ * @return result value corresponding to the [key].
+ */
+internal inline fun <K, V> MutableMap<K, V>.putOrChange(key: K, valueOnPut: V, transformOnChange: (key: K, currentValue: V, newValue: V) -> V): V {
+    contract {
+        callsInPlace(transformOnChange, AT_MOST_ONCE)
+    }
+    return putOrChange<K, V>(key, { valueOnPut }, { transformOnChange(key, it, valueOnPut) })
+}
+
+/**
+ * Creates copy of [the map][this] and applies the [transformation][transform] to the value corresponding to the given
+ * [key] in the copy or null instead if it's not present.
+ *
+ * @param key key to check.
+ * @param transform transformation to apply.
+ * @return the copy of [the map][this].
+ */
+internal inline fun <K, V> Map<in K, V>.withAppliedToKey(key: K, transform: (currentValue: V?) -> V): Map<K, V> {
+    contract {
+        callsInPlace(transform, EXACTLY_ONCE)
+    }
+    return buildMap(size) {
+        putAll(this)
+        applyToKey(key, transform)
+    }
+}
+
+/**
+ * Creates copy of [the map][this] and depending on presence of value corresponding to the given [key] either puts new
+ * value calculated by [valueOnPut] or changes the present value with [transformOnChange].
+ *
+ * @param key key to check.
+ * @param valueOnPut lazily calculated value to put in case of absence of the [key].
+ * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
+ * current value as a parameter.
+ * @return the copy of [the map][this].
+ */
+internal inline fun <K, V> Map<K, V>.withPutOrChanged(key: K, valueOnPut: () -> V, transformOnChange: (currentValue: V) -> V): Map<K, V> {
+    contract {
+        callsInPlace(valueOnPut, AT_MOST_ONCE)
+        callsInPlace(transformOnChange, AT_MOST_ONCE)
+    }
+    return buildMap(size + 1) {
+        putAll(this@withPutOrChanged)
+        putOrChange(key, valueOnPut, transformOnChange)
+    }
+}
+
+/**
+ * Creates copy of [the map][this] and depending on presence of value corresponding to the given [key] either puts new
+ * value [valueOnPut] or changes the present value with [transformOnChange].
+ *
+ * @param key key to check.
+ * @param valueOnPut value to put in case of absence of the [key].
+ * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
+ * current value as a parameter.
+ * @return the copy of [the map][this].
+ */
+internal inline fun <K, V> Map<K, V>.withPutOrChanged(key: K, valueOnPut: V, transformOnChange: (currentValue: V) -> V): Map<K, V> {
+    contract {
+        callsInPlace(transformOnChange, AT_MOST_ONCE)
+    }
+    return withPutOrChanged<K, V>(key, { valueOnPut }, transformOnChange)
+}
+
+/**
+ * Creates copy of [the map][this] and depending on presence of value corresponding to the given [key] either puts new
+ * value [valueOnPut] or changes the present value with [transformOnChange].
+ *
+ * @param key key to check.
+ * @param valueOnPut value to put in case of absence of the [key].
+ * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
+ * current value and new value as parameters.
+ * @return the copy of [the map][this].
+ */
+internal inline fun <K, V> Map<K, V>.withPutOrChanged(key: K, valueOnPut: V, transformOnChange: (currentValue: V, newValue: V) -> V): Map<K, V> {
+    contract {
+        callsInPlace(transformOnChange, AT_MOST_ONCE)
+    }
+    return withPutOrChanged<K, V>(key, { valueOnPut }, { transformOnChange(it, valueOnPut) })
+}
+
+/**
+ * Creates copy of [the map][this] and depending on presence of value corresponding to the given [key] either puts new
+ * value [valueOnPut] or changes the present value with [transformOnChange].
+ *
+ * @param key key to check.
+ * @param valueOnPut value to put in case of absence of the [key].
+ * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
+ * the [key], current value, and new value as parameters.
+ * @return the copy of [the map][this].
+ */
+internal inline fun <K, V> Map<K, V>.withPutOrChanged(key: K, valueOnPut: V, transformOnChange: (key: K, currentValue: V, newValue: V) -> V): Map<K, V> {
+    contract {
+        callsInPlace(transformOnChange, AT_MOST_ONCE)
+    }
+    return withPutOrChanged<K, V>(key, { valueOnPut }, { transformOnChange(key, it, valueOnPut) })
+}
+
+/**
+ * Copies entries of [this map][this] to the [destination] map overriding present ones if needed.
+ *
+ * @receiver map to be copied.
+ * @param destination map to receive copies.
+ * @return the [destination].
+ */
+internal fun <K, V, D: MutableMap<K, V>> Map<K, V>.copyTo(destination: D): D {
+    for ((key, value) in this) {
+        destination[key] = value
+    }
+    return destination
+}
+
+/**
+ * Copies entries of [this map][this] to the [destination] map merging present entries with new ones using [resolve]
+ * lambda.
+ *
+ * @receiver map to be copied.
+ * @param destination map to receive copies.
+ * @param resolve lambda function that resolves overriding. It takes a key, current value corresponding to the key, and
+ * a new one and returns value to associate to the key.
+ * @return the [destination].
+ */
+internal inline fun <K, V: W, W, D: MutableMap<K, W>> Map<out K, V>.copyToBy(destination: D, resolve: (key: K, currentValue: W, newValue: V) -> W): D {
+    for ((key, value) in this) {
+        destination.putOrChange(key, value) { it -> resolve(key, it, value) }
+    }
+    return destination
+}
+
+/**
+ * Copies entries of [this map][this] to the [destination] map merging present entries with new ones using [resolve]
+ * lambda.
+ *
+ * @receiver map to be copied.
+ * @param destination map to receive copies.
+ * @param resolve lambda function that resolves overriding. It takes current value corresponding to some key, and
+ * a new one and returns value to associate to the key.
+ * @return the [destination].
+ */
+internal inline fun <K, V: W, W, D: MutableMap<K, W>> Map<out K, V>.copyToBy(destination: D, resolve: (currentValue: W, newValue: V) -> W): D =
+    copyToBy(destination) { _, currentValue, newValue -> resolve(currentValue, newValue) }
+
+/**
+ * Transforms values of entries of [this map][this] with [the given transformation][transform] and copies resulting
+ * entries to the [destination] map overriding present ones if needed. Is equivalent to
+ * ```kotlin
+ * this.mapValues(transform).copyTo(destination)
+ * ```
+ *
+ * @receiver map to be transformed and copied.
+ * @param destination map to receive copies.
+ * @param transform generates value of transformed entry using initial entry as an argument. Key of transformed entry is
+ * the same as initial entry.
+ * @return the [destination].
+ */
+internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapTo(destination: D, transform: (Map.Entry<K, V>) -> W): D {
+    for (entry in this) {
+        destination[entry.key] = transform(entry)
+    }
+    return destination
+}
+
+/**
+ * Transforms values of entries of [this map][this] with [the given transformation][transform] and copies resulting
+ * entries to the [destination] map overriding present ones if needed. Is equivalent to
+ * ```kotlin
+ * this.mapValues(transform).copyTo(destination)
+ * ```
+ *
+ * @receiver map to be transformed and copied.
+ * @param destination map to receive copies.
+ * @param transform generates value of transformed entry using initial entry as an argument. Key of transformed entry is
+ * the same as initial entry.
+ * @return the [destination].
+ */
+internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapTo(destination: D, transform: (key: K, value: V) -> W): D =
+    copyMapTo(destination) { (key, value) -> transform(key, value) }
+
+/**
+ * Transforms values of entries of [this map][this] with [the given transformation][transform] and copies resulting
+ * entries to the [destination] map merging present entries with new ones using [resolve] lambda. Is equivalent to
+ * ```kotlin
+ * this.mapValues(transform).copyToBy(destination, resolve)
+ * ```
+ *
+ * @receiver map to be transformed and copied.
+ * @param destination map to receive copies.
+ * @param transform generates value of transformed entry using initial entry as an argument. Key of transformed entry is
+ * the same as initial entry.
+ * @param resolve lambda function that resolves overriding. It takes a key, current value corresponding to the key, and
+ * a new one and returns value to associate to the key.
+ * @return the [destination].
+ */
+internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapToBy(destination: D, transform: (Map.Entry<K, V>) -> W, resolve: (key: K, currentValue: W, newValue: V) -> W): D {
+    for (entry in this) {
+        val (key, value) = entry
+        destination.putOrChange(key, transform(entry)) { it -> resolve(key, it, value) }
+    }
+    return destination
+}
+
+/**
+ * Transforms values of entries of [this map][this] with [the given transformation][transform] and copies resulting
+ * entries to the [destination] map merging present entries with new ones using [resolve] lambda. Is equivalent to
+ * ```kotlin
+ * this.mapValues(transform).copyToBy(destination, resolve)
+ * ```
+ *
+ * @receiver map to be transformed and copied.
+ * @param destination map to receive copies.
+ * @param transform generates value of transformed entry using initial entry as an argument. Key of transformed entry is
+ * the same as initial entry.
+ * @param resolve lambda function that resolves overriding. It takes a key, current value corresponding to the key, and
+ * a new one and returns value to associate to the key.
+ * @return the [destination].
+ */
+internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapToBy(destination: D, transform: (key: K, value: V) -> W, resolve: (key: K, currentValue: W, newValue: V) -> W): D =
+    copyMapToBy(destination, { (key, value) -> transform(key, value) }, resolve)
+
+/**
+ * Transforms values of entries of [this map][this] with [the given transformation][transform] and copies resulting
+ * entries to the [destination] map merging present entries with new ones using [resolve] lambda. Is equivalent to
+ * ```kotlin
+ * this.mapValues(transform).copyToBy(destination, resolve)
+ * ```
+ *
+ * @receiver map to be transformed and copied.
+ * @param destination map to receive copies.
+ * @param transform generates value of transformed entry using initial entry as an argument. Key of transformed entry is
+ * the same as initial entry.
+ * @param resolve lambda function that resolves overriding. It takes current value corresponding to some key, and
+ * a new one and returns value to associate to the key.
+ * @return the [destination].
+ */
+internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapToBy(destination: D, transform: (Map.Entry<K, V>) -> W, resolve: (currentValue: W, newValue: V) -> W): D =
+    copyMapToBy(destination, transform, { _, currentValue, newValue -> resolve(currentValue, newValue) })
+
+/**
+ * Transforms values of entries of [this map][this] with [the given transformation][transform] and copies resulting
+ * entries to the [destination] map merging present entries with new ones using [resolve] lambda. Is equivalent to
+ * ```kotlin
+ * this.mapValues(transform).copyToBy(destination, resolve)
+ * ```
+ *
+ * @receiver map to be transformed and copied.
+ * @param destination map to receive copies.
+ * @param transform generates value of transformed entry using initial entry as an argument. Key of transformed entry is
+ * the same as initial entry.
+ * @param resolve lambda function that resolves overriding. It takes current value corresponding to some key, and
+ * a new one and returns value to associate to the key.
+ * @return the [destination].
+ */
+internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapToBy(destination: D, transform: (key: K, value: V) -> W, resolve: (currentValue: W, newValue: V) -> W): D =
+    copyMapToBy(destination, { (key, value) -> transform(key, value) }, { _, currentValue, newValue -> resolve(currentValue, newValue) })
+
+// TODO: Docs
+internal fun <K, V, D: MutableMap<K, V>> mergeTo(map1: Map<out K, V>, map2: Map<out K, V>, destination: D): D {
+    for ((key, value) in map1) {
+        destination.put(key, value)
+    }
+    for ((key, value) in map2) {
+        destination.put(key, value)
+    }
+    return destination
+}
+
+// TODO: Docs
+internal inline fun <K, V1: W, V2: W, W, D: MutableMap<K, W>> mergeToBy(map1: Map<out K, V1>, map2: Map<out K, V2>, destination: D, resolve: (key: K, value1: V1, value2: V2) -> W): D {
+    for (key in map2.keys) {
+        destination.remove(key)
+    }
+    for ((key, value) in map1) {
+        destination.put(key, value)
+    }
+    for ((key, value) in map2) {
+        @Suppress("UNCHECKED_CAST")
+        destination.putOrChange(key, value) { it -> resolve(key, it as V1, value) }
+    }
+    return destination
+}
+
+// TODO: Docs
+internal inline fun <K, V1: W, V2: W, W, D: MutableMap<K, W>> mergeToBy(map1: Map<K, V1>, map2: Map<K, V2>, destination: D, resolve: (value1: V1, value2: V2) -> W): D =
+    mergeToBy(map1, map2, destination) { _, value1, value2 -> resolve(value1, value2) }
+
+// TODO: Docs
+internal fun <K, V1: W, V2: W, W> merge(map1: Map<K, V1>, map2: Map<K, V2>): Map<K, W> {
+    val result = LinkedHashMap<K, W>(map1.size + map2.size)
+    return mergeTo(map1, map2, result)
+}
+
+// TODO: Docs
+internal inline fun <K, V1: W, V2: W, W> mergeBy(map1: Map<K, V1>, map2: Map<K, V2>, transform: (key: K, value1: V1, value2: V2) -> W): Map<K, W> {
+    val result = LinkedHashMap<K, W>(map1.size + map2.size)
+    return mergeToBy(map1, map2, result, transform)
+}
+
+// TODO: Docs
+internal inline fun <K, V1: W, V2: W, W> mergeBy(map1: Map<K, V1>, map2: Map<K, V2>, transform: (value1: V1, value2: V2) -> W): Map<K, W> =
+    mergeBy(map1, map2) { _, value1, value2 -> transform(value1, value2) }
+
+// TODO: Docs
+internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateTo(destination: D, transform: (T) -> Pair<K, V>, resolve: (key: K, currentValue: V, newValue: V) -> V): D {
+    for (element in this) {
+        val (key, value) = transform(element)
+        destination.putOrChange(key, value, resolve)
+    }
+    return destination
+}
+
+// TODO: Docs
+internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateByTo(destination: D, keySelector: (T) -> K, valueTransform: (T) -> V, resolve: (key: K, currentValue: V, newValue: V) -> V): D {
+    for (element in this) {
+        val key = keySelector(element)
+        val value = valueTransform(element)
+        destination.putOrChange(key, value, resolve)
+    }
+    return destination
+}
+
+// TODO: Docs
+internal inline fun <T, K, D : MutableMap<K, T>> Iterable<T>.associateByTo(destination: D, keySelector: (T) -> K, resolve: (key: K, currentValue: T, newValue: T) -> T): D {
+    for (element in this) {
+        val key = keySelector(element)
+        destination.putOrChange(key, element, resolve)
+    }
+    return destination
+}
+
+// TODO: Docs
+internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateTo(destination: D, transform: (T) -> Pair<K, V>, resolve: (currentValue: V, newValue: V) -> V): D =
+    associateTo(destination, transform) { _, currentValue, newValue -> resolve(currentValue, newValue) }
+
+// TODO: Docs
+internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateByTo(destination: D, keySelector: (T) -> K, valueTransform: (T) -> V, resolve: (currentValue: V, newValue: V) -> V): D =
+    associateByTo(destination, keySelector, valueTransform) { _, currentValue, newValue -> resolve(currentValue, newValue) }
+
+// TODO: Docs
+internal inline fun <T, K, D : MutableMap<K, T>> Iterable<T>.associateByTo(destination: D, keySelector: (T) -> K, resolve: (currentValue: T, newValue: T) -> T): D =
+    associateByTo(destination, keySelector) { _, currentValue, newValue -> resolve(currentValue, newValue) }
+
+// TODO: Docs
+internal inline fun <T, K, V> Iterable<T>.associate(transform: (T) -> Pair<K, V>, resolve: (key: K, currentValue: V, newValue: V) -> V): Map<K, V> =
+    associateTo(LinkedHashMap(), transform, resolve)
+
+// TODO: Docs
+internal inline fun <T, K, V> Iterable<T>.associateBy(keySelector: (T) -> K, valueTransform: (T) -> V, resolve: (key: K, currentValue: V, newValue: V) -> V): Map<K, V> =
+    associateByTo(LinkedHashMap(), keySelector, valueTransform, resolve)
+
+// TODO: Docs
+internal inline fun <T, K> Iterable<T>.associateBy(keySelector: (T) -> K, resolve: (key: K, currentValue: T, newValue: T) -> T): Map<K, T> =
+    associateByTo(LinkedHashMap(), keySelector, resolve)
+
+// TODO: Docs
+internal inline fun <T, K, V> Iterable<T>.associate(transform: (T) -> Pair<K, V>, resolve: (currentValue: V, newValue: V) -> V): Map<K, V> =
+    associateTo(LinkedHashMap(), transform, resolve)
+
+// TODO: Docs
+internal inline fun <T, K, V> Iterable<T>.associateBy(keySelector: (T) -> K, valueTransform: (T) -> V, resolve: (currentValue: V, newValue: V) -> V): Map<K, V> =
+    associateByTo(LinkedHashMap(), keySelector, valueTransform, resolve)
+
+// TODO: Docs
+internal inline fun <T, K> Iterable<T>.associateBy(keySelector: (T) -> K, resolve: (currentValue: T, newValue: T) -> T): Map<K, T> =
+    associateByTo(LinkedHashMap(), keySelector, resolve)
+
+// TODO: Docs
+internal inline fun <K, V, W, D : MutableMap<K, W>> Map<out K, V>.mapValuesTo(destination: D, transform: (Map.Entry<K, V>) -> W, resolve: (key: K, currentValue: W, newValue: W) -> W): D =
+    entries.associateByTo(destination, { it.key }, transform, resolve)
+
+// TODO: Docs
+internal inline fun <K, V, W, D : MutableMap<K, W>> Map<out K, V>.mapValuesTo(destination: D, transform: (key: K, value: V) -> W, resolve: (key: K, currentValue: W, newValue: W) -> W): D =
+    entries.associateByTo(destination, { it.key }, { (key, value) -> transform(key, value) }, resolve)
+
+// TODO: Docs
+internal inline fun <K, V, W, D : MutableMap<K, W>> Map<out K, V>.mapValuesTo(destination: D, transform: (Map.Entry<K, V>) -> W, resolve: (currentValue: W, newValue: W) -> W): D =
+    entries.associateByTo(destination, { it.key }, transform, resolve)
+
+// TODO: Docs
+internal inline fun <K, V, W, D : MutableMap<K, W>> Map<out K, V>.mapValuesTo(destination: D, transform: (key: K, value: V) -> W, resolve: (currentValue: W, newValue: W) -> W): D =
+    entries.associateByTo(destination, { it.key }, { (key, value) -> transform(key, value) }, resolve)
+
+// TODO: Docs
+internal inline fun <K, V, L, D : MutableMap<L, V>> Map<out K, V>.mapKeysTo(destination: D, transform: (Map.Entry<K, V>) -> L, resolve: (key: L, currentValue: V, newValue: V) -> V): D =
+    entries.associateByTo(destination, transform, { it.value }, resolve)
+
+// TODO: Docs
+internal inline fun <K, V, L, D : MutableMap<L, V>> Map<out K, V>.mapKeysTo(destination: D, transform: (key: K, value: V) -> L, resolve: (key: L, currentValue: V, newValue: V) -> V): D =
+    entries.associateByTo(destination, { (key, value) -> transform(key, value) }, { it.value }, resolve)
+
+// TODO: Docs
+internal inline fun <K, V, L, D : MutableMap<L, V>> Map<out K, V>.mapKeysTo(destination: D, transform: (Map.Entry<K, V>) -> L, resolve: (currentValue: V, newValue: V) -> V): D =
+    entries.associateByTo(destination, transform, { it.value }, resolve)
+
+// TODO: Docs
+internal inline fun <K, V, L, D : MutableMap<L, V>> Map<out K, V>.mapKeysTo(destination: D, transform: (key: K, value: V) -> L, resolve: (currentValue: V, newValue: V) -> V): D =
+    entries.associateByTo(destination, { (key, value) -> transform(key, value) }, { it.value }, resolve)
+
+// TODO: Docs
+internal inline fun <K, V, L> Map<out K, V>.mapKeys(transform: (Map.Entry<K, V>) -> L, resolve: (key: L, currentValue: V, newValue: V) -> V): Map<L, V> =
+    mapKeysTo(LinkedHashMap(size), transform, resolve)
+
+// TODO: Docs
+internal inline fun <K, V, L> Map<out K, V>.mapKeys(transform: (key: K, value: V) -> L, resolve: (key: L, currentValue: V, newValue: V) -> V): Map<L, V> =
+    mapKeysTo(LinkedHashMap(size), transform, resolve)
+
+// TODO: Docs
+internal inline fun <K, V, L> Map<out K, V>.mapKeys(transform: (Map.Entry<K, V>) -> L, resolve: (currentValue: V, newValue: V) -> V): Map<L, V> =
+    mapKeysTo(LinkedHashMap(size), transform, resolve)
+
+// TODO: Docs
+internal inline fun <K, V, L> Map<out K, V>.mapKeys(transform: (key: K, value: V) -> L, resolve: (currentValue: V, newValue: V) -> V): Map<L, V> =
+    mapKeysTo(LinkedHashMap(size), transform, resolve)
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
index aa44660c1..43048089e 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
@@ -10,6 +10,7 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.invoke
 
 
 /**
@@ -76,17 +77,10 @@ public inline fun <C> LabeledPolynomialWithoutCheck(vararg pairs: Pair<Map<Symbo
  *
  * @see LabeledPolynomialWithoutCheck
  */
-public fun <C> LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, add: (C, C) -> C) : LabeledPolynomial<C> {
-    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
-
-    for (entry in coefs) {
-        val key = entry.key.cleanUp()
-        val value = entry.value
-        fixedCoefs[key] = if (key in fixedCoefs) add(fixedCoefs[key]!!, value) else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
+public fun <C> LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, add: (C, C) -> C) : LabeledPolynomial<C> =
+    LabeledPolynomialAsIs(
+        coefs.mapKeys({ key, _ -> key.cleanUp() }, add)
+    )
 
 /**
  * Constructs [LabeledPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
@@ -98,17 +92,10 @@ public fun <C> LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, add: (C, C) -
  *
  * @see LabeledPolynomialWithoutCheck
  */
-public fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, add: (C, C) -> C) : LabeledPolynomial<C> {
-    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) add(fixedCoefs[key]!!, value) else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
+public fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, add: (C, C) -> C) : LabeledPolynomial<C> =
+    LabeledPolynomialAsIs(
+        pairs.associateBy({ it.first.cleanUp() }, { it.second }, add)
+    )
 
 /**
  * Constructs [LabeledPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
@@ -120,17 +107,10 @@ public fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>,
  *
  * @see LabeledPolynomialWithoutCheck
  */
-public fun <C> LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, add: (C, C) -> C) : LabeledPolynomial<C> {
-    val fixedCoefs = mutableMapOf<Map<Symbol, UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) add(fixedCoefs[key]!!, value) else value
-    }
-
-    return LabeledPolynomial<C>(fixedCoefs)
-}
+public fun <C> LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, add: (C, C) -> C) : LabeledPolynomial<C> =
+    LabeledPolynomialAsIs(
+        pairs.asIterable().associateBy({ it.first.cleanUp() }, { it.second }, add)
+    )
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
@@ -304,7 +284,7 @@ public class DSL1LabeledPolynomialTermSignatureBuilder {
      */
     public infix fun Symbol.inPowerOf(deg: UInt) {
         if (deg == 0u) return
-        signature[this] = signature.getOrElse(this) { 0u } + deg
+        signature.putOrChange(this, deg) { it -> it + deg }
     }
     /**
      * Declares power of [this] variable of degree [deg].
@@ -362,7 +342,7 @@ public class DSL1LabeledPolynomialBuilder<C>(
      * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
      */
     public infix fun C.with(signature: Map<Symbol, UInt>) {
-        coefficients[signature] = if (signature in coefficients) add(coefficients[signature]!!, this@with) else this@with
+        coefficients.putOrChange(signature, this@with, add)
     }
     /**
      * Declares monomial with [this] coefficient and signature constructed by [block].
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt
index e3b35facc..a37a1fe39 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt
@@ -7,10 +7,7 @@ package space.kscience.kmath.functions
 
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.algebra
-import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.operations.*
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.jvm.JvmName
@@ -56,7 +53,7 @@ public fun LabeledPolynomial<Double>.substitute(args: Map<Symbol, Double>): Labe
                     val deg = degs.getOrElse(variable) { 0u }
                     if (deg == 0u) product else product * power(substitution, deg)
                 }
-                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
+                putOrChange(newDegs, newC, ::add)
             }
         }
     )
@@ -75,7 +72,7 @@ public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Symbol,
                     val deg = degs.getOrElse(variable) { 0u }
                     if (deg == 0u) product else product * power(substitution, deg)
                 }
-                this[newDegs] = if (newDegs in this) this[newDegs]!! + newC else newC
+                putOrChange(newDegs, newC, ::add)
             }
         }
     )
@@ -257,10 +254,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
         buildMap(coefficients.size) {
             coefficients
                 .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        put(variable, 1u)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
+                    val newDegs = degs.withPutOrChanged(variable, 1u) { it -> it + 1u }
                     put(
                         newDegs,
                         c / multiplyByDoubling(one, newDegs[variable]!!)
@@ -284,10 +278,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo
         buildMap(coefficients.size) {
             coefficients
                 .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        put(variable, order)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
+                    val newDegs = degs.withPutOrChanged(variable, order) { it -> it + order }
                     put(
                         newDegs,
                         newDegs[variable]!!.let { deg ->
@@ -314,10 +305,7 @@ public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo
         buildMap(coefficients.size) {
             coefficients
                 .forEach { (degs, c) ->
-                    val newDegs = buildMap<Symbol, UInt>(degs.size + 1) {
-                        for ((variable, order) in filteredVariablesAndOrders) put(variable, order)
-                        for ((vari, deg) in degs) put(vari, deg + getOrElse(vari) { 0u })
-                    }
+                    val newDegs = mergeBy(degs, filteredVariablesAndOrders) { deg, order -> deg + order }
                     put(
                         newDegs,
                         filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
index ce0db3d17..ce49088ae 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
@@ -75,17 +75,10 @@ public inline fun <C> NumberedPolynomialWithoutCheck(vararg pairs: Pair<List<UIn
  *
  * @see NumberedPolynomialWithoutCheck
  */
-public fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>, add: (C, C) -> C) : NumberedPolynomial<C> {
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in coefs) {
-        val key = entry.key.cleanUp()
-        val value = entry.value
-        fixedCoefs[key] = if (key in fixedCoefs) add(fixedCoefs[key]!!, value) else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
+public fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>, add: (C, C) -> C) : NumberedPolynomial<C> =
+    NumberedPolynomialAsIs(
+        coefs.mapKeys({ key, _ -> key.cleanUp() }, add)
+    )
 
 /**
  * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
@@ -97,17 +90,10 @@ public fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>, add: (C, C) -> C) :
  *
  * @see NumberedPolynomialWithoutCheck
  */
-public fun <C> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, add: (C, C) -> C) : NumberedPolynomial<C> {
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) add(fixedCoefs[key]!!, value) else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
+public fun <C> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, add: (C, C) -> C) : NumberedPolynomial<C> =
+    NumberedPolynomialAsIs(
+        pairs.associateBy({ it.first.cleanUp() }, { it.second }, add)
+    )
 
 /**
  * Constructs [NumberedPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
@@ -119,17 +105,10 @@ public fun <C> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, add: (
  *
  * @see NumberedPolynomialWithoutCheck
  */
-public fun <C> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, add: (C, C) -> C) : NumberedPolynomial<C> {
-    val fixedCoefs = mutableMapOf<List<UInt>, C>()
-
-    for (entry in pairs) {
-        val key = entry.first.cleanUp()
-        val value = entry.second
-        fixedCoefs[key] = if (key in fixedCoefs) add(fixedCoefs[key]!!, value) else value
-    }
-
-    return NumberedPolynomial<C>(fixedCoefs)
-}
+public fun <C> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, add: (C, C) -> C) : NumberedPolynomial<C> =
+    NumberedPolynomialAsIs(
+        pairs.asIterable().associateBy({ it.first.cleanUp() }, { it.second }, add)
+    )
 
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
@@ -349,7 +328,7 @@ public class DSL1NumberedPolynomialBuilder<C>(
      * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
      */
     public infix fun C.with(signature: List<UInt>) {
-        coefficients[signature] = if (signature in coefficients) add(coefficients[signature]!!, this@with) else this@with
+        coefficients.putOrChange(signature, this@with, add)
     }
     /**
      * Declares monomial with [this] coefficient and signature constructed by [block].
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedUtil.kt
index 9d88cd648..9f29cf31a 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedUtil.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedUtil.kt
@@ -58,7 +58,7 @@ public fun NumberedPolynomial<Double>.substitute(args: Map<Int, Double>): Number
                     val deg = degs.getOrElse(variable) { 0u }
                     if (deg == 0u) product else product * substitution.pow(deg.toInt())
                 }
-                this[newDegs] = if (newDegs !in this) newC else this[newDegs]!! + newC
+                putOrChange(newDegs, newC) { it -> it + newC }
             }
         }
     )
@@ -76,7 +76,7 @@ public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>
                     val deg = degs.getOrElse(variable) { 0u }
                     if (deg == 0u) product else product * power(substitution, deg)
                 }
-                this[newDegs] = if (newDegs !in this) newC else this[newDegs]!! + newC
+                putOrChange(newDegs, newC) { it -> it + newC }
             }
         }
     )
@@ -158,8 +158,7 @@ public fun NumberedPolynomial<Double>.substitute(args: Buffer<Double>): Numbered
                     val deg = degs[variable]
                     if (deg == 0u) product else product * args[variable].pow(deg.toInt())
                 }
-                if (newDegs !in this) this[newDegs] = newC
-                else this[newDegs] = this[newDegs]!! + newC
+                putOrChange(newDegs, newC) { it -> it + newC }
             }
         }
     )
@@ -183,8 +182,7 @@ public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Buffer<C>):
                     val deg = degs[variable]
                     if (deg == 0u) product else product * power(args[variable], deg)
                 }
-                if (newDegs !in this) this[newDegs] = newC
-                else this[newDegs] = this[newDegs]!! + newC
+                putOrChange(newDegs, newC) { it -> it + newC }
             }
         }
     )
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
index f9a5a041b..1815749ce 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
@@ -23,8 +23,8 @@ class NumberedConstructorsTest {
             ),
             Int.algebra.numberedPolynomialSpace {
                 NumberedPolynomialDSL1 {
-                    5 { 1 pow 2u; 3 pow 3u }
-                    (-6) { 2 pow 1u }
+                    5 { 0 pow 2u; 2 pow 3u }
+                    (-6) { 1 pow 1u }
                 }
             },
             "test 1"
@@ -47,8 +47,8 @@ class NumberedConstructorsTest {
             ),
             Int.algebra.numberedPolynomialSpace {
                 NumberedPolynomialDSL1 {
-                    5 { 1 pow 1u; 1 pow 1u }
-                    (-6) { 1 pow 2u }
+                    5 { 0 pow 1u; 0 pow 1u }
+                    (-6) { 0 pow 2u }
                 }
             },
             "test 3"
@@ -59,8 +59,8 @@ class NumberedConstructorsTest {
             ),
             Int.algebra.numberedPolynomialSpace {
                 NumberedPolynomialDSL1 {
-                    5 { 1 pow 1u; 1 pow 1u }
-                    (-6) { 1 pow 2u; 3 pow 0u }
+                    5 { 0 pow 1u; 0 pow 1u }
+                    (-6) { 0 pow 2u; 2 pow 0u }
                 }
             },
             "test 3"
-- 
2.34.1


From 3eef778f6036baa375d40be4f71f697ca707c5ea Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 16 Jul 2022 16:27:11 +0300
Subject: [PATCH 581/713] Add mandatory MutableBufferFactory to Algebra #477

---
 CHANGELOG.md                                  |  1 +
 .../kscience/kmath/benchmarks/DotBenchmark.kt |  3 +-
 .../kmath/benchmarks/NDFieldBenchmark.kt      | 10 +---
 .../kmath/benchmarks/ViktorBenchmark.kt       | 21 +++----
 .../kmath/benchmarks/ViktorLogBenchmark.kt    |  7 +--
 .../kscience/kmath/operations/complexDemo.kt  |  5 +-
 .../kscience/kmath/structures/NDField.kt      | 21 ++-----
 .../space/kscience/kmath/complex/Complex.kt   |  8 +--
 .../kscience/kmath/complex/ComplexFieldND.kt  |  5 --
 .../kscience/kmath/expressions/DSAlgebra.kt   | 42 +++++++-------
 .../kmath/linear/BufferedLinearSpace.kt       |  7 +--
 .../kscience/kmath/linear/LinearSpace.kt      | 16 +-----
 .../kscience/kmath/nd/BufferAlgebraND.kt      | 10 ++--
 .../space/kscience/kmath/nd/StructureND.kt    |  4 +-
 .../kscience/kmath/operations/Algebra.kt      | 13 +++--
 .../space/kscience/kmath/operations/BigInt.kt | 13 +----
 .../kmath/operations/BufferAlgebra.kt         | 47 +++++++--------
 .../kmath/operations/DoubleBufferOps.kt       |  4 +-
 .../kmath/operations/bufferOperation.kt       |  4 +-
 .../kscience/kmath/operations/numbers.kt      | 33 +++++------
 .../space/kscience/kmath/structures/Buffer.kt | 18 +++++-
 .../kscience/kmath/structures/ByteBuffer.kt   | 57 +++++++++++++++++++
 .../kscience/kmath/expressions/DSTest.kt      |  2 +-
 .../histogram/UniformHistogramGroupND.kt      | 14 ++---
 .../space/kscience/kmath/stat/Sampler.kt      |  2 +-
 25 files changed, 187 insertions(+), 180 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ByteBuffer.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec993fb36..4852f474a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [Unreleased]
 ### Added
 - Autodiff for generic algebra elements in core!
+- Algebra now has an obligatory `bufferFactory` (#477).
 
 ### Changed
 - Kotlin 1.7
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 7d5ae310b..7ceecb5ab 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -16,7 +16,6 @@ import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.multik.multikAlgebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.tensorflow.produceWithTF
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.tensorAlgebra
@@ -84,7 +83,7 @@ internal class DotBenchmark {
     }
 
     @Benchmark
-    fun bufferedDot(blackhole: Blackhole) = with(DoubleField.linearSpace(Buffer.Companion::auto)) {
+    fun bufferedDot(blackhole: Blackhole) = with(DoubleField.linearSpace) {
         blackhole.consume(matrix1 dot matrix2)
     }
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index e3b3dde05..89673acd4 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -20,7 +20,6 @@ import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.nd.one
 import space.kscience.kmath.nd4j.nd4j
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.one
 import space.kscience.kmath.tensors.core.tensorAlgebra
@@ -28,12 +27,6 @@ import space.kscience.kmath.viktor.viktorAlgebra
 
 @State(Scope.Benchmark)
 internal class NDFieldBenchmark {
-    @Benchmark
-    fun autoFieldAdd(blackhole: Blackhole) = with(autoField) {
-        var res: StructureND<Double> = one(shape)
-        repeat(n) { res += 1.0 }
-        blackhole.consume(res)
-    }
 
     @Benchmark
     fun specializedFieldAdd(blackhole: Blackhole) = with(specializedField) {
@@ -95,9 +88,8 @@ internal class NDFieldBenchmark {
         private const val dim = 1000
         private const val n = 100
         private val shape = intArrayOf(dim, dim)
-        private val autoField = BufferedFieldOpsND(DoubleField, Buffer.Companion::auto)
         private val specializedField = DoubleField.ndAlgebra
-        private val genericField = BufferedFieldOpsND(DoubleField, Buffer.Companion::boxing)
+        private val genericField = BufferedFieldOpsND(DoubleField)
         private val nd4jField = DoubleField.nd4j
         private val multikField = DoubleField.multikAlgebra
         private val viktorField = DoubleField.viktorAlgebra
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
index de301678c..0e92a703e 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
@@ -10,25 +10,19 @@ import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import org.jetbrains.bio.viktor.F64Array
-import space.kscience.kmath.nd.*
+import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.ndAlgebra
+import space.kscience.kmath.nd.one
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.viktor.ViktorFieldND
 
 @State(Scope.Benchmark)
 internal class ViktorBenchmark {
-    @Benchmark
-    fun automaticFieldAddition(blackhole: Blackhole) {
-        with(autoField) {
-            var res: StructureND<Double> = one(shape)
-            repeat(n) { res += 1.0 }
-            blackhole.consume(res)
-        }
-    }
 
     @Benchmark
-    fun realFieldAddition(blackhole: Blackhole) {
-        with(realField) {
+    fun doubleFieldAddition(blackhole: Blackhole) {
+        with(doubleField) {
             var res: StructureND<Double> = one(shape)
             repeat(n) { res += 1.0 }
             blackhole.consume(res)
@@ -58,8 +52,7 @@ internal class ViktorBenchmark {
         private val shape = Shape(dim, dim)
 
         // automatically build context most suited for given type.
-        private val autoField = BufferedFieldOpsND(DoubleField, Buffer.Companion::auto)
-        private val realField = DoubleField.ndAlgebra
+        private val doubleField = DoubleField.ndAlgebra
         private val viktorField = ViktorFieldND(dim, dim)
     }
 }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
index dfdd89d74..7bb0b876e 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
@@ -10,19 +10,17 @@ import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import org.jetbrains.bio.viktor.F64Array
-import space.kscience.kmath.nd.BufferedFieldOpsND
 import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.nd.one
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.viktor.ViktorFieldND
 
 @State(Scope.Benchmark)
 internal class ViktorLogBenchmark {
     @Benchmark
     fun realFieldLog(blackhole: Blackhole) {
-        with(realField) {
+        with(doubleField) {
             val fortyTwo = structureND(shape) { 42.0 }
             var res = one(shape)
             repeat(n) { res = ln(fortyTwo) }
@@ -54,8 +52,7 @@ internal class ViktorLogBenchmark {
         private val shape = Shape(dim, dim)
 
         // automatically build context most suited for given type.
-        private val autoField = BufferedFieldOpsND(DoubleField, Buffer.Companion::auto)
-        private val realField = DoubleField.ndAlgebra
+        private val doubleField = DoubleField.ndAlgebra
         private val viktorField = ViktorFieldND(dim, dim)
     }
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
index 2e1801cc2..285b8d000 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
@@ -7,7 +7,6 @@ package space.kscience.kmath.operations
 
 import space.kscience.kmath.complex.Complex
 import space.kscience.kmath.complex.algebra
-import space.kscience.kmath.complex.bufferAlgebra
 import space.kscience.kmath.complex.ndAlgebra
 import space.kscience.kmath.nd.BufferND
 import space.kscience.kmath.nd.StructureND
@@ -18,7 +17,7 @@ fun main() = Complex.algebra {
     println(complex * 8 - 5 * i)
 
     //flat buffer
-    val buffer = with(bufferAlgebra){
+    val buffer = with(bufferAlgebra) {
         buffer(8) { Complex(it, -it) }.map { Complex(it.im, it.re) }
     }
     println(buffer)
@@ -30,7 +29,7 @@ fun main() = Complex.algebra {
     println(element)
 
     // 1d element operation
-    val result: StructureND<Complex> = ndAlgebra{
+    val result: StructureND<Complex> = ndAlgebra {
         val a = structureND(8) { (it) -> i * it - it.toDouble() }
         val b = 3
         val c = Complex(1.0, 1.0)
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
index b680e267d..d6ff1dceb 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
@@ -32,12 +32,10 @@ fun main() {
     val shape = Shape(dim, dim)
 
 
-    // automatically build context most suited for given type.
-    val autoField = BufferedFieldOpsND(DoubleField, Buffer.Companion::auto)
     // specialized nd-field for Double. It works as generic Double field as well.
-    val realField = DoubleField.ndAlgebra
-    //A generic boxing field. It should be used for objects, not primitives.
-    val boxingField = BufferedFieldOpsND(DoubleField, Buffer.Companion::boxing)
+    val doubleField = DoubleField.ndAlgebra
+    //A generic field. It should be used for objects, not primitives.
+    val genericField = BufferedFieldOpsND(DoubleField)
     // Nd4j specialized field.
     val nd4jField = DoubleField.nd4j
     //viktor field
@@ -46,14 +44,14 @@ fun main() {
     val parallelField = DoubleField.ndStreaming(dim, dim)
 
     measureAndPrint("Boxing addition") {
-        boxingField {
+        genericField {
             var res: StructureND<Double> = one(shape)
             repeat(n) { res += 1.0 }
         }
     }
 
     measureAndPrint("Specialized addition") {
-        realField {
+        doubleField {
             var res: StructureND<Double> = one(shape)
             repeat(n) { res += 1.0 }
         }
@@ -80,15 +78,8 @@ fun main() {
         }
     }
 
-    measureAndPrint("Automatic field addition") {
-        autoField {
-            var res: StructureND<Double> = one(shape)
-            repeat(n) { res += 1.0 }
-        }
-    }
-
     measureAndPrint("Lazy addition") {
-        val res = realField.one(shape).mapAsync(GlobalScope) {
+        val res = doubleField.one(shape).mapAsync(GlobalScope) {
             var c = 0.0
             repeat(n) {
                 c += 1.0
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index 77fe782a9..f56fb0f6e 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -10,10 +10,7 @@ import space.kscience.kmath.memory.MemorySpec
 import space.kscience.kmath.memory.MemoryWriter
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.MemoryBuffer
-import space.kscience.kmath.structures.MutableBuffer
-import space.kscience.kmath.structures.MutableMemoryBuffer
+import space.kscience.kmath.structures.*
 import kotlin.math.*
 
 /**
@@ -54,6 +51,9 @@ public object ComplexField :
     Norm<Complex, Complex>,
     NumbersAddOps<Complex>,
     ScaleOperations<Complex> {
+    override val bufferFactory: MutableBufferFactory<Complex> = MutableBufferFactory { size, init ->
+        MutableMemoryBuffer.create(Complex, size, init)
+    }
 
     override val zero: Complex = 0.0.toComplex()
     override val one: Complex = 1.0.toComplex()
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
index 46d4b7c5c..65943f421 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
@@ -56,11 +56,6 @@ public sealed class ComplexFieldOpsND : BufferedFieldOpsND<Complex, ComplexField
     public companion object : ComplexFieldOpsND()
 }
 
-@UnstableKMathAPI
-public val ComplexField.bufferAlgebra: BufferFieldOps<Complex, ComplexField>
-    get() = bufferAlgebra(Buffer.Companion::complex)
-
-
 @OptIn(UnstableKMathAPI::class)
 public class ComplexFieldND(override val shape: Shape) :
     ComplexFieldOpsND(), FieldND<Complex, ComplexField>,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
index 59e6f4f6f..c55e41bb2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
@@ -78,9 +78,9 @@ public val <T, A : Ring<T>> DS<T, A>.value: T get() = data[0]
 @UnstableKMathAPI
 public abstract class DSAlgebra<T, A : Ring<T>>(
     public val algebra: A,
-    public val bufferFactory: MutableBufferFactory<T>,
     public val order: Int,
     bindings: Map<Symbol, T>,
+    public val valueBufferFactory: MutableBufferFactory<T> = algebra.bufferFactory,
 ) : ExpressionAlgebra<T, DS<T, A>>, SymbolIndexer {
 
     /**
@@ -90,6 +90,7 @@ public abstract class DSAlgebra<T, A : Ring<T>>(
      */
     @PublishedApi
     internal val compiler: DSCompiler<T, A> by lazy {
+        val numberOfVariables = bindings.size
         // get the cached compilers
         val cache: Array<Array<DSCompiler<T, A>?>>? = null
 
@@ -115,7 +116,7 @@ public abstract class DSAlgebra<T, A : Ring<T>>(
 
                     newCache[p][o] = DSCompiler(
                         algebra,
-                        bufferFactory,
+                        valueBufferFactory,
                         p,
                         o,
                         valueCompiler,
@@ -139,16 +140,13 @@ public abstract class DSAlgebra<T, A : Ring<T>>(
     }
     override val symbols: List<Symbol> = bindings.map { it.key }
 
-    public val numberOfVariables: Int get() = symbols.size
-
-
     private fun bufferForVariable(index: Int, value: T): Buffer<T> {
-        val buffer = bufferFactory(compiler.size) { algebra.zero }
+        val buffer = valueBufferFactory(compiler.size) { algebra.zero }
         buffer[0] = value
         if (compiler.order > 0) {
             // the derivative of the variable with respect to itself is 1.
 
-            val indexOfDerivative = compiler.getPartialDerivativeIndex(*IntArray(numberOfVariables).apply {
+            val indexOfDerivative = compiler.getPartialDerivativeIndex(*IntArray(symbols.size).apply {
                 set(index, 1)
             })
 
@@ -209,7 +207,7 @@ public abstract class DSAlgebra<T, A : Ring<T>>(
     }
 
     public override fun const(value: T): DS<T, A> {
-        val buffer = bufferFactory(compiler.size) { algebra.zero }
+        val buffer = valueBufferFactory(compiler.size) { algebra.zero }
         buffer[0] = value
 
         return DS(buffer)
@@ -245,10 +243,10 @@ public abstract class DSAlgebra<T, A : Ring<T>>(
 @UnstableKMathAPI
 public open class DSRing<T, A>(
     algebra: A,
-    bufferFactory: MutableBufferFactory<T>,
     order: Int,
     bindings: Map<Symbol, T>,
-) : DSAlgebra<T, A>(algebra, bufferFactory, order, bindings),
+    valueBufferFactory: MutableBufferFactory<T>,
+) : DSAlgebra<T, A>(algebra, order, bindings, valueBufferFactory),
     Ring<DS<T, A>>, ScaleOperations<DS<T, A>>,
     NumericAlgebra<DS<T, A>>,
     NumbersAddOps<DS<T, A>> where A : Ring<T>, A : NumericAlgebra<T>, A : ScaleOperations<T> {
@@ -263,14 +261,14 @@ public open class DSRing<T, A>(
      */
     protected inline fun DS<T, A>.transformDataBuffer(block: A.(MutableBuffer<T>) -> Unit): DS<T, A> {
         require(derivativeAlgebra == this@DSRing) { "All derivative operations should be done in the same algebra" }
-        val newData = bufferFactory(compiler.size) { data[it] }
+        val newData = valueBufferFactory(compiler.size) { data[it] }
         algebra.block(newData)
         return DS(newData)
     }
 
     protected fun DS<T, A>.mapData(block: A.(T) -> T): DS<T, A> {
         require(derivativeAlgebra == this@DSRing) { "All derivative operations should be done in the same algebra" }
-        val newData: Buffer<T> = data.map(bufferFactory) {
+        val newData: Buffer<T> = data.map(valueBufferFactory) {
             algebra.block(it)
         }
         return DS(newData)
@@ -278,7 +276,7 @@ public open class DSRing<T, A>(
 
     protected fun DS<T, A>.mapDataIndexed(block: (Int, T) -> T): DS<T, A> {
         require(derivativeAlgebra == this@DSRing) { "All derivative operations should be done in the same algebra" }
-        val newData: Buffer<T> = data.mapIndexed(bufferFactory, block)
+        val newData: Buffer<T> = data.mapIndexed(valueBufferFactory, block)
         return DS(newData)
     }
 
@@ -327,19 +325,19 @@ public open class DSRing<T, A>(
 @UnstableKMathAPI
 public class DerivativeStructureRingExpression<T, A>(
     public val algebra: A,
-    public val bufferFactory: MutableBufferFactory<T>,
+    public val elementBufferFactory: MutableBufferFactory<T> = algebra.bufferFactory,
     public val function: DSRing<T, A>.() -> DS<T, A>,
 ) : DifferentiableExpression<T> where A : Ring<T>, A : ScaleOperations<T>, A : NumericAlgebra<T> {
     override operator fun invoke(arguments: Map<Symbol, T>): T =
-        DSRing(algebra, bufferFactory, 0, arguments).function().value
+        DSRing(algebra, 0, arguments, elementBufferFactory).function().value
 
     override fun derivativeOrNull(symbols: List<Symbol>): Expression<T> = Expression { arguments ->
         with(
             DSRing(
                 algebra,
-                bufferFactory,
                 symbols.size,
-                arguments
+                arguments,
+                elementBufferFactory
             )
         ) { function().derivative(symbols) }
     }
@@ -354,10 +352,10 @@ public class DerivativeStructureRingExpression<T, A>(
 @UnstableKMathAPI
 public class DSField<T, A : ExtendedField<T>>(
     algebra: A,
-    bufferFactory: MutableBufferFactory<T>,
     order: Int,
     bindings: Map<Symbol, T>,
-) : DSRing<T, A>(algebra, bufferFactory, order, bindings), ExtendedField<DS<T, A>> {
+    valueBufferFactory: MutableBufferFactory<T>,
+) : DSRing<T, A>(algebra, order, bindings, valueBufferFactory), ExtendedField<DS<T, A>> {
     override fun number(value: Number): DS<T, A> = const(algebra.number(value))
 
     override fun divide(left: DS<T, A>, right: DS<T, A>): DS<T, A> = left.transformDataBuffer { result ->
@@ -441,18 +439,18 @@ public class DSField<T, A : ExtendedField<T>>(
 @UnstableKMathAPI
 public class DSFieldExpression<T, A : ExtendedField<T>>(
     public val algebra: A,
-    public val bufferFactory: MutableBufferFactory<T>,
+    private val valueBufferFactory: MutableBufferFactory<T> = algebra.bufferFactory,
     public val function: DSField<T, A>.() -> DS<T, A>,
 ) : DifferentiableExpression<T> {
     override operator fun invoke(arguments: Map<Symbol, T>): T =
-        DSField(algebra, bufferFactory, 0, arguments).function().value
+        DSField(algebra, 0, arguments, valueBufferFactory).function().value
 
     override fun derivativeOrNull(symbols: List<Symbol>): Expression<T> = Expression { arguments ->
         DSField(
             algebra,
-            bufferFactory,
             symbols.size,
             arguments,
+            valueBufferFactory,
         ).run { function().derivative(symbols) }
     }
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 36cbd9064..8f7569699 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -11,13 +11,12 @@ import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.nd.asND
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.VirtualBuffer
 import space.kscience.kmath.structures.indices
 
 
 public class BufferedLinearSpace<T, out A : Ring<T>>(
-    private val bufferAlgebra: BufferAlgebra<T, A>
+    private val bufferAlgebra: BufferAlgebra<T, A>,
 ) : LinearSpace<T, A> {
     override val elementAlgebra: A get() = bufferAlgebra.elementAlgebra
 
@@ -91,5 +90,5 @@ public class BufferedLinearSpace<T, out A : Ring<T>>(
 }
 
 
-public fun <T, A : Ring<T>> A.linearSpace(bufferFactory: BufferFactory<T>): BufferedLinearSpace<T, A> =
-    BufferedLinearSpace(BufferRingOps(this, bufferFactory))
+public val <T, A : Ring<T>> A.linearSpace: BufferedLinearSpace<T, A>
+    get() = BufferedLinearSpace(BufferRingOps(this))
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
index 10438dd02..d437070c9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
@@ -11,12 +11,9 @@ import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.nd.StructureFeature
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.operations.BufferRingOps
-import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.BufferFactory
-import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.reflect.KClass
 
 /**
@@ -187,18 +184,9 @@ public interface LinearSpace<T, out A : Ring<T>> {
          * A structured matrix with custom buffer
          */
         public fun <T : Any, A : Ring<T>> buffered(
-            algebra: A,
-            bufferFactory: BufferFactory<T> = BufferFactory(Buffer.Companion::boxing),
-        ): LinearSpace<T, A> = BufferedLinearSpace(BufferRingOps(algebra, bufferFactory))
+            algebra: A
+        ): LinearSpace<T, A> = BufferedLinearSpace(BufferRingOps(algebra))
 
-        @Deprecated("use DoubleField.linearSpace")
-        public val double: LinearSpace<Double, DoubleField> = buffered(DoubleField, ::DoubleBuffer)
-
-        /**
-         * Automatic buffered matrix, unboxed if it is possible
-         */
-        public inline fun <reified T : Any, A : Ring<T>> auto(ring: A): LinearSpace<T, A> =
-            buffered(ring, Buffer.Companion::auto)
     }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index 68e8ebe90..8c5eef3d0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -10,7 +10,6 @@ package space.kscience.kmath.nd
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
-import space.kscience.kmath.structures.BufferFactory
 
 public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
     public val indexerBuilder: (IntArray) -> ShapeIndexer
@@ -60,7 +59,7 @@ public inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.mapInline(
     return BufferND(
         indexes,
         bufferAlgebra.run {
-            bufferFactory(buffer.size) { elementAlgebra.transform(buffer[it]) }
+            elementBufferFactory(buffer.size) { elementAlgebra.transform(buffer[it]) }
         }
     )
 }
@@ -74,7 +73,7 @@ internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.mapIndexedInline(
     return BufferND(
         indexes,
         bufferAlgebra.run {
-            bufferFactory(buffer.size) { elementAlgebra.transform(indexes.index(it), buffer[it]) }
+            elementBufferFactory(buffer.size) { elementAlgebra.transform(indexes.index(it), buffer[it]) }
         }
     )
 }
@@ -91,7 +90,7 @@ internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.zipInline(
     return BufferND(
         indexes,
         bufferAlgebra.run {
-            bufferFactory(lbuffer.size) { elementAlgebra.block(lbuffer[it], rbuffer[it]) }
+            elementBufferFactory(lbuffer.size) { elementAlgebra.block(lbuffer[it], rbuffer[it]) }
         }
     )
 }
@@ -116,9 +115,8 @@ public open class BufferedFieldOpsND<T, out A : Field<T>>(
 
     public constructor(
         elementAlgebra: A,
-        bufferFactory: BufferFactory<T>,
         indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
-    ) : this(BufferFieldOps(elementAlgebra, bufferFactory), indexerBuilder)
+    ) : this(BufferFieldOps(elementAlgebra), indexerBuilder)
 
     @OptIn(PerformancePitfall::class)
     override fun scale(a: StructureND<T>, value: Double): StructureND<T> = a.map { it * value }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 6e54e1b9d..e14b8bf9d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -120,7 +120,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
          */
         public fun <T> buffered(
             strides: Strides,
-            bufferFactory: BufferFactory<T> = BufferFactory(Buffer.Companion::boxing),
+            bufferFactory: BufferFactory<T> = BufferFactory.boxing(),
             initializer: (IntArray) -> T,
         ): BufferND<T> = BufferND(strides, bufferFactory(strides.linearSize) { i -> initializer(strides.index(i)) })
 
@@ -140,7 +140,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
 
         public fun <T> buffered(
             shape: IntArray,
-            bufferFactory: BufferFactory<T> = BufferFactory(Buffer.Companion::boxing),
+            bufferFactory: BufferFactory<T> = BufferFactory.boxing(),
             initializer: (IntArray) -> T,
         ): BufferND<T> = buffered(DefaultStrides(shape), bufferFactory, initializer)
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index 45ba32c13..a93b4365e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -8,12 +8,7 @@ package space.kscience.kmath.operations
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring.Companion.optimizedPower
-
-/**
- * Stub for DSL the [Algebra] is.
- */
-@DslMarker
-public annotation class KMathContext
+import space.kscience.kmath.structures.MutableBufferFactory
 
 /**
  * Represents an algebraic structure.
@@ -21,6 +16,12 @@ public annotation class KMathContext
  * @param T the type of element of this structure.
  */
 public interface Algebra<T> {
+
+    /**
+     * Provide a factory for buffers, associated with this [Algebra]
+     */
+    public val bufferFactory: MutableBufferFactory<T> get() = MutableBufferFactory.boxing()
+
     /**
      * Wraps a raw string to [T] object. This method is designed for three purposes:
      *
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 99268348b..9b6911f73 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -10,7 +10,6 @@ import space.kscience.kmath.nd.BufferedRingOpsND
 import space.kscience.kmath.operations.BigInt.Companion.BASE
 import space.kscience.kmath.operations.BigInt.Companion.BASE_SIZE
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.MutableBuffer
 import kotlin.math.log2
 import kotlin.math.max
 import kotlin.math.min
@@ -528,19 +527,11 @@ public fun String.parseBigInteger(): BigInt? {
 
 public val BigInt.algebra: BigIntField get() = BigIntField
 
-@Deprecated("Use BigInt::buffer")
-public inline fun Buffer.Companion.bigInt(size: Int, initializer: (Int) -> BigInt): Buffer<BigInt> =
-    boxing(size, initializer)
-
 public inline fun BigInt.Companion.buffer(size: Int, initializer: (Int) -> BigInt): Buffer<BigInt> =
     Buffer.boxing(size, initializer)
 
-@Deprecated("Use BigInt::mutableBuffer")
-public inline fun MutableBuffer.Companion.bigInt(size: Int, initializer: (Int) -> BigInt): MutableBuffer<BigInt> =
-    boxing(size, initializer)
-
-public inline fun BigInt.mutableBuffer(size: Int, initializer: (Int) -> BigInt): Buffer<BigInt> =
+public inline fun BigInt.Companion.mutableBuffer(size: Int, initializer: (Int) -> BigInt): Buffer<BigInt> =
     Buffer.boxing(size, initializer)
 
 public val BigIntField.nd: BufferedRingOpsND<BigInt, BigIntField>
-    get() = BufferedRingOpsND(BufferRingOps(BigIntField, BigInt::buffer))
+    get() = BufferedRingOpsND(BufferRingOps(BigIntField))
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
index 51fff8b69..a256fe7d1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
@@ -7,8 +7,6 @@ package space.kscience.kmath.operations
 
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
-import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.ShortBuffer
 
 public interface WithSize {
     public val size: Int
@@ -19,11 +17,11 @@ public interface WithSize {
  */
 public interface BufferAlgebra<T, out A : Algebra<T>> : Algebra<Buffer<T>> {
     public val elementAlgebra: A
-    public val bufferFactory: BufferFactory<T>
+    public val elementBufferFactory: BufferFactory<T> get() = elementAlgebra.bufferFactory
 
     public fun buffer(size: Int, vararg elements: T): Buffer<T> {
         require(elements.size == size) { "Expected $size elements but found ${elements.size}" }
-        return bufferFactory(size) { elements[it] }
+        return elementBufferFactory(size) { elements[it] }
     }
 
     //TODO move to multi-receiver inline extension
@@ -36,13 +34,13 @@ public interface BufferAlgebra<T, out A : Algebra<T>> : Algebra<Buffer<T>> {
 
     override fun unaryOperationFunction(operation: String): (arg: Buffer<T>) -> Buffer<T> {
         val operationFunction = elementAlgebra.unaryOperationFunction(operation)
-        return { arg -> bufferFactory(arg.size) { operationFunction(arg[it]) } }
+        return { arg -> elementBufferFactory(arg.size) { operationFunction(arg[it]) } }
     }
 
     override fun binaryOperationFunction(operation: String): (left: Buffer<T>, right: Buffer<T>) -> Buffer<T> {
         val operationFunction = elementAlgebra.binaryOperationFunction(operation)
         return { left, right ->
-            bufferFactory(left.size) { operationFunction(left[it], right[it]) }
+            elementBufferFactory(left.size) { operationFunction(left[it], right[it]) }
         }
     }
 }
@@ -53,7 +51,7 @@ public interface BufferAlgebra<T, out A : Algebra<T>> : Algebra<Buffer<T>> {
 private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapInline(
     buffer: Buffer<T>,
     crossinline block: A.(T) -> T,
-): Buffer<T> = bufferFactory(buffer.size) { elementAlgebra.block(buffer[it]) }
+): Buffer<T> = elementBufferFactory(buffer.size) { elementAlgebra.block(buffer[it]) }
 
 /**
  * Inline map
@@ -61,7 +59,7 @@ private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapInline(
 private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.mapIndexedInline(
     buffer: Buffer<T>,
     crossinline block: A.(index: Int, arg: T) -> T,
-): Buffer<T> = bufferFactory(buffer.size) { elementAlgebra.block(it, buffer[it]) }
+): Buffer<T> = elementBufferFactory(buffer.size) { elementAlgebra.block(it, buffer[it]) }
 
 /**
  * Inline zip
@@ -72,15 +70,15 @@ private inline fun <T, A : Algebra<T>> BufferAlgebra<T, A>.zipInline(
     crossinline block: A.(l: T, r: T) -> T,
 ): Buffer<T> {
     require(l.size == r.size) { "Incompatible buffer sizes. left: ${l.size}, right: ${r.size}" }
-    return bufferFactory(l.size) { elementAlgebra.block(l[it], r[it]) }
+    return elementBufferFactory(l.size) { elementAlgebra.block(l[it], r[it]) }
 }
 
 public fun <T> BufferAlgebra<T, *>.buffer(size: Int, initializer: (Int) -> T): Buffer<T> {
-    return bufferFactory(size, initializer)
+    return elementBufferFactory(size, initializer)
 }
 
 public fun <T, A> A.buffer(initializer: (Int) -> T): Buffer<T> where A : BufferAlgebra<T, *>, A : WithSize {
-    return bufferFactory(size, initializer)
+    return elementBufferFactory(size, initializer)
 }
 
 public fun <T, A : TrigonometricOperations<T>> BufferAlgebra<T, A>.sin(arg: Buffer<T>): Buffer<T> =
@@ -131,7 +129,6 @@ public fun <T, A : PowerOperations<T>> BufferAlgebra<T, A>.pow(arg: Buffer<T>, p
 
 public open class BufferRingOps<T, A : Ring<T>>(
     override val elementAlgebra: A,
-    override val bufferFactory: BufferFactory<T>,
 ) : BufferAlgebra<T, A>, RingOps<Buffer<T>> {
 
     override fun add(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l + r }
@@ -146,15 +143,13 @@ public open class BufferRingOps<T, A : Ring<T>>(
 }
 
 public val ShortRing.bufferAlgebra: BufferRingOps<Short, ShortRing>
-    get() = BufferRingOps(ShortRing, ::ShortBuffer)
+    get() = BufferRingOps(ShortRing)
 
 public open class BufferFieldOps<T, A : Field<T>>(
     elementAlgebra: A,
-    bufferFactory: BufferFactory<T>,
-) : BufferRingOps<T, A>(elementAlgebra, bufferFactory), BufferAlgebra<T, A>, FieldOps<Buffer<T>>,
-    ScaleOperations<Buffer<T>> {
+) : BufferRingOps<T, A>(elementAlgebra), BufferAlgebra<T, A>, FieldOps<Buffer<T>>, ScaleOperations<Buffer<T>> {
 
-//    override fun add(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l + r }
+    //    override fun add(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l + r }
 //    override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l * r }
     override fun divide(left: Buffer<T>, right: Buffer<T>): Buffer<T> = zipInline(left, right) { l, r -> l / r }
 
@@ -167,30 +162,26 @@ public open class BufferFieldOps<T, A : Field<T>>(
 
 public class BufferField<T, A : Field<T>>(
     elementAlgebra: A,
-    bufferFactory: BufferFactory<T>,
     override val size: Int,
-) : BufferFieldOps<T, A>(elementAlgebra, bufferFactory), Field<Buffer<T>>, WithSize {
+) : BufferFieldOps<T, A>(elementAlgebra), Field<Buffer<T>>, WithSize {
 
-    override val zero: Buffer<T> = bufferFactory(size) { elementAlgebra.zero }
-    override val one: Buffer<T> = bufferFactory(size) { elementAlgebra.one }
+    override val zero: Buffer<T> = elementAlgebra.bufferFactory(size) { elementAlgebra.zero }
+    override val one: Buffer<T> = elementAlgebra.bufferFactory(size) { elementAlgebra.one }
 }
 
 /**
  * Generate full buffer field from given buffer operations
  */
 public fun <T, A : Field<T>> BufferFieldOps<T, A>.withSize(size: Int): BufferField<T, A> =
-    BufferField(elementAlgebra, bufferFactory, size)
+    BufferField(elementAlgebra, size)
 
 //Double buffer specialization
 
 public fun BufferField<Double, *>.buffer(vararg elements: Number): Buffer<Double> {
     require(elements.size == size) { "Expected $size elements but found ${elements.size}" }
-    return bufferFactory(size) { elements[it].toDouble() }
+    return elementBufferFactory(size) { elements[it].toDouble() }
 }
 
-public fun <T, A : Field<T>> A.bufferAlgebra(bufferFactory: BufferFactory<T>): BufferFieldOps<T, A> =
-    BufferFieldOps(this, bufferFactory)
-
-public val DoubleField.bufferAlgebra: BufferFieldOps<Double, DoubleField>
-    get() = BufferFieldOps(DoubleField, ::DoubleBuffer)
+public val <T, A : Field<T>> A.bufferAlgebra: BufferFieldOps<T, A>
+    get() = BufferFieldOps(this)
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index 083892105..669c0a390 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -7,8 +7,8 @@ package space.kscience.kmath.operations
 
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.MutableBufferFactory
 import space.kscience.kmath.structures.asBuffer
 import kotlin.math.*
 
@@ -19,7 +19,7 @@ public abstract class DoubleBufferOps : BufferAlgebra<Double, DoubleField>, Exte
     Norm<Buffer<Double>, Double> {
 
     override val elementAlgebra: DoubleField get() = DoubleField
-    override val bufferFactory: BufferFactory<Double> get() = BufferFactory(::DoubleBuffer)
+    override val elementBufferFactory: MutableBufferFactory<Double> get() = elementAlgebra.bufferFactory
 
     override fun Buffer<Double>.map(block: DoubleField.(Double) -> Double): DoubleBuffer =
         mapInline { DoubleField.block(it) }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
index 652472fcf..0beda11a5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
@@ -88,7 +88,7 @@ public inline fun <T, R> Buffer<T>.mapIndexed(
  */
 public inline fun <T, reified R : Any> Buffer<T>.mapIndexed(
     crossinline block: (index: Int, value: T) -> R,
-): Buffer<R> = BufferFactory<R>(Buffer.Companion::auto).invoke(size) { block(it, get(it)) }
+): Buffer<R> = Buffer.auto(size) { block(it, get(it)) }
 
 /**
  * Fold given buffer according to [operation]
@@ -105,7 +105,7 @@ public inline fun <T, R> Buffer<T>.fold(initial: R, operation: (acc: R, T) -> R)
 @UnstableKMathAPI
 public inline fun <T1, T2 : Any, reified R : Any> Buffer<T1>.zip(
     other: Buffer<T2>,
-    bufferFactory: BufferFactory<R> = BufferFactory(Buffer.Companion::auto),
+    bufferFactory: BufferFactory<R> = BufferFactory.auto(),
     crossinline transform: (T1, T2) -> R,
 ): Buffer<R> {
     require(size == other.size) { "Buffer size mismatch in zip: expected $size but found ${other.size}" }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index 07a137415..c108aa729 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.operations
 
+import space.kscience.kmath.structures.*
 import kotlin.math.pow as kpow
 
 /**
@@ -65,6 +66,8 @@ public interface ExtendedField<T> : ExtendedFieldOps<T>, Field<T>, PowerOperatio
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
+    override val bufferFactory: MutableBufferFactory<Double> = MutableBufferFactory(::DoubleBuffer)
+
     override inline val zero: Double get() = 0.0
     override inline val one: Double get() = 1.0
 
@@ -123,6 +126,8 @@ public val Double.Companion.algebra: DoubleField get() = DoubleField
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object FloatField : ExtendedField<Float>, Norm<Float, Float> {
+    override val bufferFactory: MutableBufferFactory<Float> = MutableBufferFactory(::FloatBuffer)
+
     override inline val zero: Float get() = 0.0f
     override inline val one: Float get() = 1.0f
 
@@ -177,11 +182,10 @@ public val Float.Companion.algebra: FloatField get() = FloatField
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object IntRing : Ring<Int>, Norm<Int, Int>, NumericAlgebra<Int> {
-    override inline val zero: Int
-        get() = 0
+    override val bufferFactory: MutableBufferFactory<Int> = MutableBufferFactory(::IntBuffer)
 
-    override inline val one: Int
-        get() = 1
+    override inline val zero: Int get() = 0
+    override inline val one: Int get() = 1
 
     override fun number(value: Number): Int = value.toInt()
     override inline fun add(left: Int, right: Int): Int = left + right
@@ -201,11 +205,10 @@ public val Int.Companion.algebra: IntRing get() = IntRing
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object ShortRing : Ring<Short>, Norm<Short, Short>, NumericAlgebra<Short> {
-    override inline val zero: Short
-        get() = 0
+    override val bufferFactory: MutableBufferFactory<Short> = MutableBufferFactory(::ShortBuffer)
 
-    override inline val one: Short
-        get() = 1
+    override inline val zero: Short get() = 0
+    override inline val one: Short get() = 1
 
     override fun number(value: Number): Short = value.toShort()
     override inline fun add(left: Short, right: Short): Short = (left + right).toShort()
@@ -225,11 +228,10 @@ public val Short.Companion.algebra: ShortRing get() = ShortRing
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object ByteRing : Ring<Byte>, Norm<Byte, Byte>, NumericAlgebra<Byte> {
-    override inline val zero: Byte
-        get() = 0
+    override val bufferFactory: MutableBufferFactory<Byte> = MutableBufferFactory(::ByteBuffer)
 
-    override inline val one: Byte
-        get() = 1
+    override inline val zero: Byte get() = 0
+    override inline val one: Byte get() = 1
 
     override fun number(value: Number): Byte = value.toByte()
     override inline fun add(left: Byte, right: Byte): Byte = (left + right).toByte()
@@ -249,11 +251,10 @@ public val Byte.Companion.algebra: ByteRing get() = ByteRing
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public object LongRing : Ring<Long>, Norm<Long, Long>, NumericAlgebra<Long> {
-    override inline val zero: Long
-        get() = 0L
+    override val bufferFactory: MutableBufferFactory<Long> = MutableBufferFactory(::LongBuffer)
 
-    override inline val one: Long
-        get() = 1L
+    override inline val zero: Long get() = 0L
+    override inline val one: Long get() = 1L
 
     override fun number(value: Number): Long = value.toLong()
     override inline fun add(left: Long, right: Long): Long = left + right
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index 1c79c257a..5757848fe 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -16,6 +16,14 @@ import kotlin.reflect.KClass
  */
 public fun interface BufferFactory<T> {
     public operator fun invoke(size: Int, builder: (Int) -> T): Buffer<T>
+
+    public companion object{
+        public inline fun <reified T : Any> auto(): BufferFactory<T> =
+            BufferFactory(Buffer.Companion::auto)
+
+        public fun <T> boxing(): BufferFactory<T> =
+            BufferFactory(Buffer.Companion::boxing)
+    }
 }
 
 /**
@@ -23,8 +31,16 @@ public fun interface BufferFactory<T> {
  *
  * @param T the type of buffer.
  */
-public fun interface MutableBufferFactory<T>: BufferFactory<T>{
+public fun interface MutableBufferFactory<T> : BufferFactory<T> {
     override fun invoke(size: Int, builder: (Int) -> T): MutableBuffer<T>
+
+    public companion object {
+        public inline fun <reified T : Any> auto(): MutableBufferFactory<T> =
+            MutableBufferFactory(MutableBuffer.Companion::auto)
+
+        public fun <T> boxing(): MutableBufferFactory<T> =
+            MutableBufferFactory(MutableBuffer.Companion::boxing)
+    }
 }
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ByteBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ByteBuffer.kt
new file mode 100644
index 000000000..e7bf2b47c
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ByteBuffer.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.structures
+
+import kotlin.jvm.JvmInline
+
+/**
+ * Specialized [MutableBuffer] implementation over [ByteArray].
+ *
+ * @property array the underlying array.
+ */
+@JvmInline
+public value class ByteBuffer(public val array: ByteArray) : MutableBuffer<Byte> {
+    override val size: Int get() = array.size
+
+    override operator fun get(index: Int): Byte = array[index]
+
+    override operator fun set(index: Int, value: Byte) {
+        array[index] = value
+    }
+
+    override operator fun iterator(): ByteIterator = array.iterator()
+    override fun copy(): MutableBuffer<Byte> = ByteBuffer(array.copyOf())
+}
+
+/**
+ * Creates a new [ByteBuffer] with the specified [size], where each element is calculated by calling the specified
+ * [init] function.
+ *
+ * The function [init] is called for each array element sequentially starting from the first one.
+ * It should return the value for a buffer element given its index.
+ */
+public inline fun ByteBuffer(size: Int, init: (Int) -> Byte): ByteBuffer = ByteBuffer(ByteArray(size) { init(it) })
+
+/**
+ * Returns a new [ByteBuffer] of given elements.
+ */
+public fun ByteBuffer(vararg bytes: Byte): ByteBuffer = ByteBuffer(bytes)
+
+/**
+ * Returns a new [ByteArray] containing all the elements of this [Buffer].
+ */
+public fun Buffer<Byte>.toByteArray(): ByteArray = when (this) {
+    is ByteBuffer -> array.copyOf()
+    else -> ByteArray(size, ::get)
+}
+
+/**
+ * Returns [ByteBuffer] over this array.
+ *
+ * @receiver the array.
+ * @return the new buffer.
+ */
+public fun ByteArray.asBuffer(): ByteBuffer = ByteBuffer(this)
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
index 727a918ec..b6581e503 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
@@ -22,7 +22,7 @@ internal inline fun diff(
     block: DSField<Double, DoubleField>.() -> Unit,
 ) {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    DSField(DoubleField, ::DoubleBuffer, order, mapOf(*parameters)).block()
+    DSField(DoubleField, order, mapOf(*parameters), ::DoubleBuffer).block()
 }
 
 internal class DSTest {
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
index eafd55513..1ead049e6 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
@@ -21,14 +21,14 @@ public typealias HyperSquareBin<V> = DomainBin<Double, HyperSquareDomain, V>
 
 /**
  * Multivariate histogram space for hyper-square real-field bins.
- * @param bufferFactory is an optional parameter used to optimize buffer production.
+ * @param valueBufferFactory is an optional parameter used to optimize buffer production.
  */
 public class UniformHistogramGroupND<V : Any, A : Field<V>>(
     override val valueAlgebraND: FieldOpsND<V, A>,
     private val lower: Buffer<Double>,
     private val upper: Buffer<Double>,
     private val binNums: IntArray = IntArray(lower.size) { 20 },
-    private val bufferFactory: BufferFactory<V> = BufferFactory(Buffer.Companion::boxing),
+    private val valueBufferFactory: BufferFactory<V> = valueAlgebraND.elementAlgebra.bufferFactory,
 ) : HistogramGroupND<Double, HyperSquareDomain, V> {
 
     init {
@@ -94,7 +94,7 @@ public class UniformHistogramGroupND<V : Any, A : Field<V>>(
             }
         }
         hBuilder.apply(builder)
-        val values: BufferND<V> = ndCounter.mapToBuffer(bufferFactory) { it.value }
+        val values: BufferND<V> = ndCounter.mapToBuffer(valueBufferFactory) { it.value }
         return HistogramND(this, values)
     }
 
@@ -114,12 +114,12 @@ public class UniformHistogramGroupND<V : Any, A : Field<V>>(
 public fun <V : Any, A : Field<V>> Histogram.Companion.uniformNDFromRanges(
     valueAlgebraND: FieldOpsND<V, A>,
     vararg ranges: ClosedFloatingPointRange<Double>,
-    bufferFactory: BufferFactory<V> = BufferFactory(Buffer.Companion::boxing),
+    bufferFactory: BufferFactory<V> = valueAlgebraND.elementAlgebra.bufferFactory,
 ): UniformHistogramGroupND<V, A> = UniformHistogramGroupND(
     valueAlgebraND,
     ranges.map(ClosedFloatingPointRange<Double>::start).asBuffer(),
     ranges.map(ClosedFloatingPointRange<Double>::endInclusive).asBuffer(),
-    bufferFactory = bufferFactory
+    valueBufferFactory = bufferFactory
 )
 
 public fun Histogram.Companion.uniformDoubleNDFromRanges(
@@ -140,7 +140,7 @@ public fun Histogram.Companion.uniformDoubleNDFromRanges(
 public fun <V : Any, A : Field<V>> Histogram.Companion.uniformNDFromRanges(
     valueAlgebraND: FieldOpsND<V, A>,
     vararg ranges: Pair<ClosedFloatingPointRange<Double>, Int>,
-    bufferFactory: BufferFactory<V> = BufferFactory(Buffer.Companion::boxing),
+    bufferFactory: BufferFactory<V> = valueAlgebraND.elementAlgebra.bufferFactory,
 ): UniformHistogramGroupND<V, A> = UniformHistogramGroupND(
     valueAlgebraND,
     ListBuffer(
@@ -154,7 +154,7 @@ public fun <V : Any, A : Field<V>> Histogram.Companion.uniformNDFromRanges(
             .map(ClosedFloatingPointRange<Double>::endInclusive)
     ),
     ranges.map(Pair<ClosedFloatingPointRange<Double>, Int>::second).toIntArray(),
-    bufferFactory = bufferFactory
+    valueBufferFactory = bufferFactory
 )
 
 public fun Histogram.Companion.uniformDoubleNDFromRanges(
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
index 890318e31..1c88922ac 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
@@ -35,7 +35,7 @@ public fun interface Sampler<out T : Any> {
 public fun <T : Any> Sampler<T>.sampleBuffer(
     generator: RandomGenerator,
     size: Int,
-    bufferFactory: BufferFactory<T> = BufferFactory(Buffer.Companion::boxing),
+    bufferFactory: BufferFactory<T> = BufferFactory.boxing(),
 ): Chain<Buffer<T>> {
     require(size > 1)
     //creating temporary storage once
-- 
2.34.1


From a1a2c41846b5a720cb05ec4bee9c5136c74b55c9 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 16 Jul 2022 17:13:05 +0300
Subject: [PATCH 582/713] Add a bit more utilities for maps and refactor
 polynomials' code.

---
 .../LabeledPolynomial.kt                      | 100 ++++++++----------
 .../NumberedPolynomial.kt                     | 100 +++++++-----------
 .../collectionUtils.kt                        |  39 ++++++-
 3 files changed, 117 insertions(+), 122 deletions(-)

diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
index b07674a1e..7df51930e 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
@@ -87,7 +87,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         )
         else LabeledPolynomialAsIs(
             mapOf(this@plus to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * other,
+            emptyMap<Symbol, UInt>() to other.asConstant(),
         )
     /**
      * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
@@ -98,7 +98,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         )
         else LabeledPolynomialAsIs(
             mapOf(this@minus to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * -other,
+            emptyMap<Symbol, UInt>() to (-other).asConstant(),
         )
     /**
      * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
@@ -106,7 +106,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override operator fun Symbol.times(other: Int): LabeledPolynomial<C> =
         if (other == 0) zero
         else LabeledPolynomialAsIs(
-            mapOf(this to 1U) to constantOne * other,
+            mapOf(this to 1U) to other.asConstant(),
         )
 
     /**
@@ -118,7 +118,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
         )
         else LabeledPolynomialAsIs(
             mapOf(other to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * this@plus,
+            emptyMap<Symbol, UInt>() to this@plus.asConstant(),
         )
     /**
      * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
@@ -137,7 +137,7 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
     public override operator fun Int.times(other: Symbol): LabeledPolynomial<C> =
         if (this == 0) zero
         else LabeledPolynomialAsIs(
-            mapOf(other to 1U) to constantOne * this@times,
+            mapOf(other to 1U) to this@times.asConstant(),
         )
 
     /**
@@ -146,11 +146,11 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
     public override operator fun LabeledPolynomial<C>.plus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) this
-        else with(coefficients) {
-            if (isEmpty()) other.asPolynomial()
-            else LabeledPolynomialAsIs(
-                withPutOrChanged(emptyMap(), other.asConstant()) { it -> it + other }
+        when {
+            other == 0 -> this
+            coefficients.isEmpty() -> other.asPolynomial()
+            else -> LabeledPolynomialAsIs(
+                coefficients.withPutOrChanged(emptyMap(), other.asConstant()) { it -> it + other }
             )
         }
     /**
@@ -159,11 +159,11 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
     public override operator fun LabeledPolynomial<C>.minus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) this
-        else with(coefficients) {
-            if (isEmpty()) (-other).asPolynomial()
-            else LabeledPolynomialAsIs(
-                withPutOrChanged(emptyMap(), (-other).asConstant()) { it -> it - other }
+        when {
+            other == 0 -> this
+            coefficients.isEmpty() -> other.asPolynomial()
+            else -> LabeledPolynomialAsIs(
+                coefficients.withPutOrChanged(emptyMap(), (-other).asConstant()) { it -> it - other }
             )
         }
     /**
@@ -186,11 +186,11 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
     public override operator fun Int.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (this == 0) other
-        else with(other.coefficients) {
-            if (isEmpty()) this@plus.asPolynomial()
-            else LabeledPolynomialAsIs(
-                withPutOrChanged(emptyMap(), this@plus.asConstant()) { it -> this@plus + it }
+        when {
+            this == 0 -> other
+            other.coefficients.isEmpty() -> this@plus.asPolynomial()
+            else -> LabeledPolynomialAsIs(
+                other.coefficients.withPutOrChanged(emptyMap(), this@plus.asConstant()) { it -> this@plus + it }
             )
         }
     /**
@@ -275,12 +275,10 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     override operator fun C.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) this@plus.asLabeledPolynomial()
-            else LabeledPolynomialAsIs(
-                withPutOrChanged(emptyMap(), this@plus) { it -> this@plus + it }
-            )
-        }
+        if (other.coefficients.isEmpty()) this@plus.asLabeledPolynomial()
+        else LabeledPolynomialAsIs(
+            other.coefficients.withPutOrChanged(emptyMap(), this@plus) { it -> this@plus + it }
+        )
     /**
      * Returns difference between the constant represented as a polynomial and the polynomial.
      */
@@ -304,22 +302,18 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     override operator fun LabeledPolynomial<C>.plus(other: C): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) other.asLabeledPolynomial()
-            else LabeledPolynomialAsIs(
-                withPutOrChanged(emptyMap(), other) { it -> it + other }
-            )
-        }
+        if (coefficients.isEmpty()) other.asLabeledPolynomial()
+        else LabeledPolynomialAsIs(
+            coefficients.withPutOrChanged(emptyMap(), other) { it -> it + other }
+        )
     /**
      * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     override operator fun LabeledPolynomial<C>.minus(other: C): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) other.asLabeledPolynomial()
-            else LabeledPolynomialAsIs(
-                withPutOrChanged(emptyMap(), -other) { it -> it - other }
-            )
-        }
+        if (coefficients.isEmpty()) other.asLabeledPolynomial()
+        else LabeledPolynomialAsIs(
+            coefficients.withPutOrChanged(emptyMap(), -other) { it -> it - other }
+        )
     /**
      * Returns product of the constant represented as a polynomial and the polynomial.
      */
@@ -382,12 +376,10 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Returns sum of the variable represented as a monic monomial and the polynomial.
      */
     public override operator fun Symbol.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) this@plus.asPolynomial()
-            else LabeledPolynomialAsIs(
-                withPutOrChanged(mapOf(this@plus to 1U), constantOne) { it -> constantOne + it }
-            )
-        }
+        if (other.coefficients.isEmpty()) this@plus.asPolynomial()
+        else LabeledPolynomialAsIs(
+            other.coefficients.withPutOrChanged(mapOf(this@plus to 1U), constantOne) { it -> constantOne + it }
+        )
     /**
      * Returns difference between the variable represented as a monic monomial and the polynomial.
      */
@@ -412,22 +404,18 @@ public class LabeledPolynomialSpace<C, A : Ring<C>>(
      * Returns sum of the polynomial and the variable represented as a monic monomial.
      */
     public override operator fun LabeledPolynomial<C>.plus(other: Symbol): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) other.asPolynomial()
-            else LabeledPolynomialAsIs(
-                withPutOrChanged(mapOf(other to 1U), constantOne) { it -> it + constantOne }
-            )
-        }
+        if (coefficients.isEmpty()) other.asPolynomial()
+        else LabeledPolynomialAsIs(
+            coefficients.withPutOrChanged(mapOf(other to 1U), constantOne) { it -> it + constantOne }
+        )
     /**
      * Returns difference between the polynomial and the variable represented as a monic monomial.
      */
     public override operator fun LabeledPolynomial<C>.minus(other: Symbol): LabeledPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) other.asPolynomial()
-            else LabeledPolynomialAsIs(
-                withPutOrChanged(mapOf(other to 1U), -constantOne) { it -> it - constantOne }
-            )
-        }
+        if (coefficients.isEmpty()) other.asPolynomial()
+        else LabeledPolynomialAsIs(
+            coefficients.withPutOrChanged(mapOf(other to 1U), -constantOne) { it -> it - constantOne }
+        )
     /**
      * Returns product of the polynomial and the variable represented as a monic monomial.
      */
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
index 14c03ff7c..037419cfc 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
@@ -69,10 +69,9 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
      */
     public override operator fun NumberedPolynomial<C>.plus(other: Int): NumberedPolynomial<C> =
         if (other == 0) this
-        else
-            NumberedPolynomialAsIs(
-                coefficients.withPutOrChanged(emptyList(), other.asConstant()) { it -> it + other }
-            )
+        else NumberedPolynomialAsIs(
+            coefficients.withPutOrChanged(emptyList(), other.asConstant()) { it -> it + other }
+        )
     /**
      * Returns difference between the polynomial and the integer represented as a polynomial.
      *
@@ -80,10 +79,9 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
      */
     public override operator fun NumberedPolynomial<C>.minus(other: Int): NumberedPolynomial<C> =
         if (other == 0) this
-        else
-            NumberedPolynomialAsIs(
-                coefficients.withPutOrChanged(emptyList(), (-other).asConstant()) { it -> it - other }
-            )
+        else NumberedPolynomialAsIs(
+            coefficients.withPutOrChanged(emptyList(), (-other).asConstant()) { it -> it - other }
+        )
     /**
      * Returns product of the polynomial and the integer represented as a polynomial.
      *
@@ -105,31 +103,25 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
      */
     public override operator fun Int.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
         if (this == 0) other
-        else
-            NumberedPolynomialAsIs(
-                other.coefficients.withPutOrChanged(emptyList(), this@plus.asConstant()) { it -> this@plus + it }
-            )
+        else NumberedPolynomialAsIs(
+            other.coefficients.withPutOrChanged(emptyList(), this@plus.asConstant()) { it -> this@plus + it }
+        )
     /**
      * Returns difference between the integer represented as a polynomial and the polynomial.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
     public override operator fun Int.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomialAsIs(
-            other.coefficients
-                .toMutableMap()
-                .apply {
-                    if (this@minus == 0) {
-                        forEach { (key, value) -> this[key] = -value }
-                    } else {
-                        forEach { (key, value) -> if (key.isNotEmpty()) this[key] = -value }
-
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
+        when {
+            this == 0 -> -other
+            other.coefficients.isEmpty() -> this.asPolynomial()
+            else -> NumberedPolynomialAsIs(
+                buildMap(other.coefficients.size + 1) {
+                    put(emptyList(), other.coefficients.computeOnOrElse(emptyList(), { this@minus.asConstant() }, { it -> this@minus - it}))
+                    other.coefficients.copyMapToBy(this, { _, c -> -c }) { currentC, _ -> currentC }
                 }
             )
+        }
     /**
      * Returns product of the integer represented as a polynomial and the polynomial.
      *
@@ -148,29 +140,21 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     override operator fun C.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to this@plus))
-            else NumberedPolynomialAsIs(
-                withPutOrChanged(emptyList(), this@plus) { it -> this@plus + it }
-            )
-        }
+        if (other.coefficients.isEmpty()) this@plus.asPolynomial()
+        else NumberedPolynomialAsIs(
+            other.coefficients.withPutOrChanged(emptyList(), this@plus) { it -> this@plus + it }
+        )
     /**
      * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     override operator fun C.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to this@minus))
-            else NumberedPolynomialAsIs(
-                toMutableMap()
-                    .apply {
-                        forEach { (degs, c) -> if (degs.isNotEmpty()) this[degs] = -c }
-
-                        val degs = emptyList<UInt>()
-
-                        this[degs] = this@minus - getOrElse(degs) { constantZero }
-                    }
-            )
-        }
+        if (other.coefficients.isEmpty()) this@minus.asPolynomial()
+        else NumberedPolynomialAsIs(
+            buildMap(other.coefficients.size) {
+                put(emptyList(), other.coefficients.computeOnOrElse(emptyList(), this@minus) { it -> this@minus - it })
+                other.coefficients.copyMapToBy(this, { _, c -> -c }, { currentC, _ -> currentC })
+            }
+        )
     /**
      * Returns product of the constant represented as a polynomial and the polynomial.
      */
@@ -183,22 +167,18 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
     override operator fun NumberedPolynomial<C>.plus(other: C): NumberedPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to other))
-            else NumberedPolynomialAsIs(
-                withPutOrChanged(emptyList(), other) { it -> it + other }
-            )
-        }
+        if (coefficients.isEmpty()) other.asPolynomial()
+        else NumberedPolynomialAsIs(
+            coefficients.withPutOrChanged(emptyList(), other) { it -> it + other }
+        )
     /**
      * Returns difference between the constant represented as a polynomial and the polynomial.
      */
     override operator fun NumberedPolynomial<C>.minus(other: C): NumberedPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to other))
-            else NumberedPolynomialAsIs(
-                withPutOrChanged(emptyList(), -other) { it -> it - other }
-            )
-        }
+        if (coefficients.isEmpty()) other.asPolynomial()
+        else NumberedPolynomialAsIs(
+            coefficients.withPutOrChanged(emptyList(), -other) { it -> it - other }
+        )
     /**
      * Returns product of the constant represented as a polynomial and the polynomial.
      */
@@ -264,13 +244,7 @@ public class NumberedPolynomialSpace<C, A : Ring<C>>(
     /**
      * Instance of unit polynomial (unit of the polynomial ring).
      */
-    override val one: NumberedPolynomial<C> by lazy {
-        NumberedPolynomialAsIs(
-            mapOf(
-                emptyList<UInt>() to constantOne // 1 * x_1^0 * x_2^0 * ...
-            )
-        )
-    }
+    override val one: NumberedPolynomial<C> by lazy { NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to constantOne)) }
 
     /**
      * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/collectionUtils.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/collectionUtils.kt
index 1d3da4c8b..ee32aa9a7 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/collectionUtils.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/collectionUtils.kt
@@ -9,6 +9,40 @@ import kotlin.contracts.InvocationKind.*
 import kotlin.contracts.contract
 
 
+// TODO: Docs
+internal inline fun <K, V, R> Map<in K, V>.computeOn(key: K, compute: (V?) -> R): R {
+    contract {
+        callsInPlace(compute, EXACTLY_ONCE)
+    }
+    return compute(get(key))
+}
+
+// TODO: Docs
+internal inline fun <K, V, R> Map<K, V>.computeOnOrElse(key: K, defaultResult: () -> R, compute: (value: V) -> R): R {
+    contract {
+        callsInPlace(defaultResult, AT_MOST_ONCE)
+        callsInPlace(compute, AT_MOST_ONCE)
+    }
+    @Suppress("UNCHECKED_CAST")
+    return (if (key !in this) defaultResult() else compute(get(key) as V))
+}
+
+// TODO: Docs
+internal inline fun <K, V, R> Map<K, V>.computeOnOrElse(key: K, defaultResult: R, compute: (value: V) -> R): R {
+    contract {
+        callsInPlace(compute, AT_MOST_ONCE)
+    }
+    return computeOnOrElse(key, { defaultResult }, compute)
+}
+
+// TODO: Docs
+internal inline fun <K, V, R> Map<K, V>.computeOnOrElse(key: K, defaultResult: R, compute: (key: K, value: V) -> R): R {
+    contract {
+        callsInPlace(compute, AT_MOST_ONCE)
+    }
+    return computeOnOrElse(key, { defaultResult }, { it -> compute(key, it) })
+}
+
 /**
  * Applies the [transformation][transform] to the value corresponding to the given [key] or null instead if it's not
  * present.
@@ -21,7 +55,7 @@ internal inline fun <K, V> MutableMap<in K, V>.applyToKey(key: K, transform: (cu
     contract {
         callsInPlace(transform, EXACTLY_ONCE)
     }
-    return transform(get(key)).also { this[key] = it }
+    return computeOn(key, transform).also { this[key] = it }
 }
 
 /**
@@ -39,8 +73,7 @@ internal inline fun <K, V> MutableMap<K, V>.putOrChange(key: K, valueOnPut: () -
         callsInPlace(valueOnPut, AT_MOST_ONCE)
         callsInPlace(transformOnChange, AT_MOST_ONCE)
     }
-    @Suppress("UNCHECKED_CAST")
-    return (if (key !in this) valueOnPut() else transformOnChange(get(key) as V)).also { this[key] = it }
+    return computeOnOrElse(key, valueOnPut, transformOnChange).also { this[key] = it }
 }
 
 /**
-- 
2.34.1


From 3a91cb2579862e7ef9d617a46d6c8b44c8e61438 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 16 Jul 2022 18:46:40 +0300
Subject: [PATCH 583/713] Draft another DSL for labeled polynomials. Add
 variance.

---
 .../LabeledPolynomial.kt                      |   2 +-
 .../ListPolynomial.kt                         |   4 +-
 .../NumberedPolynomial.kt                     |   2 +-
 .../Polynomial.kt                             |   2 +-
 .../RationalFunction.kt                       |   6 +-
 .../labeledConstructors.kt                    | 255 ++++++++++++++++++
 6 files changed, 263 insertions(+), 8 deletions(-)

diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
index 7df51930e..e2320114b 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
@@ -75,7 +75,7 @@ internal constructor(
  * @param A type of provided underlying ring of constants. It's [Ring] of [C].
  * @param ring underlying ring of constants of type [A].
  */
-public class LabeledPolynomialSpace<C, A : Ring<C>>(
+public class LabeledPolynomialSpace<C, out A : Ring<C>>(
     public override val ring: A,
 ) : MultivariatePolynomialSpace<C, Symbol, LabeledPolynomial<C>>, PolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
     /**
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt
index 17c42ac8c..d0e58c0d6 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt
@@ -60,7 +60,7 @@ public data class ListPolynomial<C>(
  * @param A type of provided underlying ring of constants. It's [Ring] of [C].
  * @param ring underlying ring of constants of type [A].
  */
-public open class ListPolynomialSpace<C, A : Ring<C>>(
+public open class ListPolynomialSpace<C, out A : Ring<C>>(
     public override val ring: A,
 ) : PolynomialSpaceOverRing<C, ListPolynomial<C>, A> {
     /**
@@ -366,7 +366,7 @@ public open class ListPolynomialSpace<C, A : Ring<C>>(
  * @param A type of underlying ring of constants. It's [Ring] of [C].
  * @param ring underlying ring of constants of type [A].
  */
-public class ScalableListPolynomialSpace<C, A>(
+public class ScalableListPolynomialSpace<C, out A>(
     ring: A,
 ) : ListPolynomialSpace<C, A>(ring), ScaleOperations<ListPolynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
     override fun scale(a: ListPolynomial<C>, value: Double): ListPolynomial<C> =
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
index 037419cfc..d2fc5ffa1 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
@@ -59,7 +59,7 @@ internal constructor(
  * @param A type of provided underlying ring of constants. It's [Ring] of [C].
  * @param ring underlying ring of constants of type [A].
  */
-public class NumberedPolynomialSpace<C, A : Ring<C>>(
+public class NumberedPolynomialSpace<C, out A : Ring<C>>(
     public override val ring: A,
 ) : PolynomialSpaceOverRing<C, NumberedPolynomial<C>, A> {
     /**
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/Polynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/Polynomial.kt
index 61ea5a342..66308a7bc 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/Polynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/Polynomial.kt
@@ -252,7 +252,7 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
  * @param A the type of algebraic structure (precisely, of ring) provided for constants.
  */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, A: Ring<C>> : PolynomialSpace<C, P> {
+public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, out A: Ring<C>> : PolynomialSpace<C, P> {
 
     /**
      * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/RationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/RationalFunction.kt
index f664ae9db..da91c8d61 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/RationalFunction.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/RationalFunction.kt
@@ -464,7 +464,7 @@ public interface RationalFunctionSpaceOverRing<
         C,
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
-        A: Ring<C>
+        out A: Ring<C>
         > : RationalFunctionSpace<C, P, R> {
 
     /**
@@ -566,7 +566,7 @@ public interface RationalFunctionSpaceOverPolynomialSpace<
         C,
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
-        AP: PolynomialSpace<C, P>,
+        out AP: PolynomialSpace<C, P>,
         > : RationalFunctionSpace<C, P, R> {
 
     /**
@@ -1341,7 +1341,7 @@ public interface MultivariateRationalFunctionSpaceOverMultivariatePolynomialSpac
         V,
         P: Polynomial<C>,
         R: RationalFunction<C, P>,
-        AP: MultivariatePolynomialSpace<C, V, P>,
+        out AP: MultivariatePolynomialSpace<C, V, P>,
         > : RationalFunctionSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionSpace<C, V, P, R> {
     /**
      * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
index 43048089e..d74c0e1fb 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
@@ -416,6 +416,261 @@ public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial
 @UnstableKMathAPI
 public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomialDSL1(initialCapacity: Int? = null, block: DSL1LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = DSL1LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
 
+/**
+ * Marks DSL that allows to more simply create [LabeledPolynomial]s with good performance.
+ *
+ * For example, polynomial \(5 a^2 c^3 - 6 b\) can be described as
+ * ```
+ * Int.algebra {
+ *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
+ *         5 { a inPowerOf 2u; c inPowerOf 3u } // 5 a^2 c^3 +
+ *         (-6) { b inPowerOf 1u }              // (-6) b^1
+ *     }
+ * }
+ * ```
+ * @usesMathJax
+ */
+@DslMarker
+@UnstableKMathAPI
+internal annotation class LabeledPolynomialBuilderDSL2
+
+/**
+ * Builder of [LabeledPolynomial]. It should be used as an implicit context for lambdas that describe [LabeledPolynomial].
+ */
+@UnstableKMathAPI
+@LabeledPolynomialBuilderDSL2
+public class DSL2LabeledPolynomialBuilder<C>(
+    private val ring: Ring<C>,
+    /**
+     * Initial capacity of coefficients map.
+     */
+    initialCapacity: Int? = null
+) {
+    /**
+     * Coefficients storage. Any declaration of any monomial updates the storage.
+     * Afterward the storage will be used as a resulting coefficients map.
+     */
+    private val coefficients: MutableMap<Map<Symbol, UInt>, C> = if (initialCapacity != null) LinkedHashMap(initialCapacity) else LinkedHashMap()
+
+    /**
+     * Builds the resulting coefficients map.
+     *
+     * In fact, it just returns [coefficients] as regular coefficients map of type `Map<Map<Symbol, UInt>, C>`.
+     */
+    @PublishedApi
+    internal fun build(): LabeledPolynomial<C> = LabeledPolynomial<C>(coefficients)
+
+    public inner class Term internal constructor(
+        internal val signature: Map<Symbol, UInt> = HashMap(),
+        internal val coefficient: C
+    )
+
+    private inline fun submit(signature: Map<Symbol, UInt>, onPut: Ring<C>.() -> C, onChange: Ring<C>.(C) -> C) {
+        coefficients.putOrChange<_, C>(signature, { ring.onPut() }, { ring.onChange(it) })
+    }
+
+    private inline fun submit(signature: Map<Symbol, UInt>, lazyCoefficient: Ring<C>.() -> C) {
+        submit(signature, lazyCoefficient, { it + lazyCoefficient() })
+    }
+
+    private fun submit(signature: Map<Symbol, UInt>, coefficient: C) {
+        submit(signature) { coefficient }
+    }
+
+    // TODO: `@submit` will be resolved differently. Change it to `@C`.
+    private fun C.submit() = submit(emptyMap(), { this@submit })
+
+    private fun Symbol.submit() = submit(mapOf(this to 1u), { one })
+
+    private fun Term.submit(): Submit {
+        submit(signature, coefficient)
+        return Submit
+    }
+
+    public object Submit
+
+    public operator fun C.unaryPlus(): Submit {
+        submit()
+        return Submit
+    }
+
+    public operator fun C.unaryMinus(): Submit {
+        submit(emptyMap(), { -this@unaryMinus }, { it - this@unaryMinus })
+        return Submit
+    }
+
+    public operator fun C.plus(other: C): Submit {
+        submit(emptyMap(), { this@plus + other })
+        return Submit
+    }
+
+    public operator fun C.minus(other: C): Submit {
+        submit(emptyMap(), { this@minus - other })
+        return Submit
+    }
+
+    public operator fun C.times(other: C): C = ring { this@times * other }
+
+    public operator fun C.plus(other: Symbol): Submit {
+        submit(emptyMap(), this)
+        submit(mapOf(other to 1u), ring.one)
+        return Submit
+    }
+
+    public operator fun C.minus(other: Symbol): Submit {
+        submit(emptyMap(), this)
+        submit(mapOf(other to 1u), { -one }, { it - one })
+        return Submit
+    }
+
+    public operator fun C.times(other: Symbol): Term = Term(mapOf(other to 1u), this)
+
+    public operator fun C.plus(other: Term): Submit {
+        submit(emptyMap(), this)
+        other.submit()
+        return Submit
+    }
+
+    public operator fun C.minus(other: Term): Submit {
+        submit(emptyMap(), this)
+        submit(other.signature, { -other.coefficient }, { it - other.coefficient })
+        return Submit
+    }
+
+    public operator fun C.times(other: Term): Term = Term(other.signature, ring { this@times * other.coefficient })
+
+    public operator fun Symbol.plus(other: C): Submit {
+        this.submit()
+        other.submit()
+        return Submit
+    }
+
+    public operator fun Symbol.minus(other: C): Submit {
+        this.submit()
+        submit(emptyMap(), { -other }, { it - other })
+        return Submit
+    }
+
+    public operator fun Symbol.times(other: C): Term = Term(mapOf(this to 1u), other)
+
+    public operator fun Symbol.unaryPlus(): Submit {
+        this.submit()
+        return Submit
+    }
+
+    public operator fun Symbol.unaryMinus(): Submit {
+        submit(mapOf(this to 1u), { -one }, { it - one })
+        return Submit
+    }
+
+    public operator fun Symbol.plus(other: Symbol): Submit {
+        this.submit()
+        other.submit()
+        return Submit
+    }
+
+    public operator fun Symbol.minus(other: Symbol): Submit {
+        this.submit()
+        submit(mapOf(other to 1u), { -one }, { it - one })
+        return Submit
+    }
+
+    public operator fun Symbol.times(other: Symbol): Term =
+        if (this == other) Term(mapOf(this to 2u), ring.one)
+        else Term(mapOf(this to 1u, other to 1u), ring.one)
+
+    public operator fun Symbol.plus(other: Term): Submit {
+        this.submit()
+        other.submit()
+        return Submit
+    }
+
+    public operator fun Symbol.minus(other: Term): Submit {
+        this.submit()
+        submit(other.signature, { -other.coefficient }, { it - other.coefficient })
+        return Submit
+    }
+
+    public operator fun Symbol.times(other: Term): Term =
+        Term(
+            other.signature.withPutOrChanged(this, 1u) { it -> it + 1u },
+            other.coefficient
+        )
+
+    public operator fun Term.plus(other: C): Submit {
+        this.submit()
+        other.submit()
+        return Submit
+    }
+
+    public operator fun Term.minus(other: C): Submit {
+        this.submit()
+        submit(emptyMap(), { -other }, { it - other })
+        return Submit
+    }
+
+    public operator fun Term.times(other: C): Term =
+        Term(
+            signature,
+            ring { coefficient * other }
+        )
+
+    public operator fun Term.plus(other: Symbol): Submit {
+        this.submit()
+        other.submit()
+        return Submit
+    }
+
+    public operator fun Term.minus(other: Symbol): Submit {
+        this.submit()
+        submit(mapOf(other to 1u), { -one }, { it - one })
+        return Submit
+    }
+
+    public operator fun Term.times(other: Symbol): Term =
+        Term(
+            signature.withPutOrChanged(other, 1u) { it -> it + 1u },
+            coefficient
+        )
+
+    public operator fun Term.unaryPlus(): Submit {
+        this.submit()
+        return Submit
+    }
+
+    public operator fun Term.unaryMinus(): Submit {
+        submit(signature, { -coefficient }, { it - coefficient })
+        return Submit
+    }
+
+    public operator fun Term.plus(other: Term): Submit {
+        this.submit()
+        other.submit()
+        return Submit
+    }
+
+    public operator fun Term.minus(other: Term): Submit {
+        this.submit()
+        submit(other.signature, { -other.coefficient }, { it - other.coefficient })
+        return Submit
+    }
+
+    public operator fun Term.times(other: Term): Term =
+        Term(
+            mergeBy(signature, other.signature) { deg1, deg2 -> deg1 + deg2 },
+            ring { coefficient * other.coefficient }
+        )
+}
+
+//@UnstableKMathAPI
+//public fun <C> Ring<C>.LabeledPolynomialDSL2(initialCapacity: Int? = null, block: DSL2LabeledPolynomialBuilder<C>.() -> Unit): LabeledPolynomial<C> = DSL2LabeledPolynomialBuilder(this, initialCapacity).apply(block).build()
+
+@UnstableKMathAPI
+public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomialDSL2(initialCapacity: Int? = null, block: DSL2LabeledPolynomialBuilder<C>.() -> Unit): LabeledPolynomial<C> = DSL2LabeledPolynomialBuilder(ring, initialCapacity).apply(block).build()
+
+@UnstableKMathAPI
+public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomialDSL2(initialCapacity: Int? = null, block: DSL2LabeledPolynomialBuilder<C>.() -> Unit): LabeledPolynomial<C> = DSL2LabeledPolynomialBuilder(ring, initialCapacity).apply(block).build()
+
 // Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
 
 /**
-- 
2.34.1


From 58d7015782bc24c12e11ff2c84d0fe2c631a3c59 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 16 Jul 2022 20:15:30 +0300
Subject: [PATCH 584/713] Remove utils modules. Revive suddenly lost tests.

---
 kmath-functions/build.gradle.kts              |   5 -
 .../kmath/functions/testUtils/IntModulo.kt    |  38 +-
 .../functions/testUtils/IntModuloUtils.kt     |   8 +-
 .../kmath/functions/testUtils/Rational.kt     |  54 +-
 .../kmath/functions/testUtils/misc.kt         |   0
 kmath-polynomial/build.gradle.kts             |   6 -
 .../kmath/functions/AlgebraicStubTest.kt      | 589 +++++++++++
 .../kmath/functions/ListPolynomialTest.kt     | 544 ++++++++++
 .../kmath/functions/ListPolynomialUtilTest.kt | 982 ++++++++++++++++++
 .../kmath/functions/testUtils/BufferUtils.kt  |   2 +-
 .../kmath/functions/testUtils/IntModulo.kt    |  38 +-
 .../functions/testUtils/IntModuloUtils.kt     |   9 +-
 .../kmath/functions/testUtils/NTMisc.kt       |   0
 .../kmath/functions/testUtils/Rational.kt     |  54 +-
 .../kmath/functions/testUtils/assertion.kt    |  12 +-
 .../kmath/functions/testUtils/misc.kt         |  14 +-
 settings.gradle.kts                           |   2 -
 test-utils-functions/build.gradle.kts         |  14 -
 .../kmath/functions/testUtils/assertion.kt    |  22 -
 test-utils-polynomial/build.gradle.kts        |  14 -
 20 files changed, 2229 insertions(+), 178 deletions(-)
 rename {test-utils-functions/src/commonMain => kmath-functions/src/commonTest}/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt (80%)
 rename {test-utils-functions/src/commonMain => kmath-functions/src/commonTest}/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt (54%)
 rename {test-utils-polynomial/src/commonMain => kmath-functions/src/commonTest}/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt (78%)
 rename {test-utils-functions/src/commonMain => kmath-functions/src/commonTest}/kotlin/space/kscience/kmath/functions/testUtils/misc.kt (100%)
 create mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
 create mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
 create mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
 rename {test-utils-polynomial/src/commonMain => kmath-polynomial/src/commonTest}/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt (80%)
 rename {test-utils-polynomial/src/commonMain => kmath-polynomial/src/commonTest}/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt (79%)
 rename {test-utils-polynomial/src/commonMain => kmath-polynomial/src/commonTest}/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt (53%)
 rename {test-utils-polynomial/src/commonMain => kmath-polynomial/src/commonTest}/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt (100%)
 rename {test-utils-functions/src/commonMain => kmath-polynomial/src/commonTest}/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt (78%)
 rename {test-utils-polynomial/src/commonMain => kmath-polynomial/src/commonTest}/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt (92%)
 rename {test-utils-polynomial/src/commonMain => kmath-polynomial/src/commonTest}/kotlin/space/kscience/kmath/functions/testUtils/misc.kt (58%)
 delete mode 100644 test-utils-functions/build.gradle.kts
 delete mode 100644 test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
 delete mode 100644 test-utils-polynomial/build.gradle.kts

diff --git a/kmath-functions/build.gradle.kts b/kmath-functions/build.gradle.kts
index 149a8f277..eec17e82b 100644
--- a/kmath-functions/build.gradle.kts
+++ b/kmath-functions/build.gradle.kts
@@ -12,11 +12,6 @@ kotlin.sourceSets {
             api(project(":kmath-core"))
         }
     }
-    commonTest {
-        dependencies {
-            api(projects.testUtilsFunctions)
-        }
-    }
 }
 
 dependencies {
diff --git a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
similarity index 80%
rename from test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
rename to kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
index 21095d858..ef601c941 100644
--- a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
@@ -11,9 +11,9 @@ import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.ScaleOperations
 
 
-public class IntModulo {
-    public val residue: Int
-    public val modulus: Int
+class IntModulo {
+    val residue: Int
+    val modulus: Int
 
     @PublishedApi
     internal constructor(residue: Int, modulus: Int, toCheckInput: Boolean = true) {
@@ -27,16 +27,16 @@ public class IntModulo {
         }
     }
 
-    public constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
+    constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
 
-    public operator fun unaryPlus(): IntModulo = this
-    public operator fun unaryMinus(): IntModulo =
+    operator fun unaryPlus(): IntModulo = this
+    operator fun unaryMinus(): IntModulo =
         IntModulo(
             if (residue == 0) 0 else modulus - residue,
             modulus,
             toCheckInput = false
         )
-    public operator fun plus(other: IntModulo): IntModulo {
+    operator fun plus(other: IntModulo): IntModulo {
         require(modulus == other.modulus) { "can not add two residue different modulo" }
         return IntModulo(
             (residue + other.residue) % modulus,
@@ -44,13 +44,13 @@ public class IntModulo {
             toCheckInput = false
         )
     }
-    public operator fun plus(other: Int): IntModulo =
+    operator fun plus(other: Int): IntModulo =
         IntModulo(
             (residue + other) % modulus,
             modulus,
             toCheckInput = false
         )
-    public operator fun minus(other: IntModulo): IntModulo {
+    operator fun minus(other: IntModulo): IntModulo {
         require(modulus == other.modulus) { "can not subtract two residue different modulo" }
         return IntModulo(
             (residue - other.residue) % modulus,
@@ -58,13 +58,13 @@ public class IntModulo {
             toCheckInput = false
         )
     }
-    public operator fun minus(other: Int): IntModulo =
+    operator fun minus(other: Int): IntModulo =
         IntModulo(
             (residue - other) % modulus,
             modulus,
             toCheckInput = false
         )
-    public operator fun times(other: IntModulo): IntModulo {
+    operator fun times(other: IntModulo): IntModulo {
         require(modulus == other.modulus) { "can not multiply two residue different modulo" }
         return IntModulo(
             (residue * other.residue) % modulus,
@@ -72,13 +72,13 @@ public class IntModulo {
             toCheckInput = false
         )
     }
-    public operator fun times(other: Int): IntModulo =
+    operator fun times(other: Int): IntModulo =
         IntModulo(
             (residue * other) % modulus,
             modulus,
             toCheckInput = false
         )
-    public operator fun div(other: IntModulo): IntModulo {
+    operator fun div(other: IntModulo): IntModulo {
         require(modulus == other.modulus) { "can not divide two residue different modulo" }
         val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other.residue, modulus)
         require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
@@ -88,7 +88,7 @@ public class IntModulo {
             toCheckInput = false
         )
     }
-    public operator fun div(other: Int): IntModulo {
+    operator fun div(other: Int): IntModulo {
         val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other, modulus)
         require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
         return IntModulo(
@@ -109,11 +109,11 @@ public class IntModulo {
 }
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
-public class IntModuloRing : Ring<IntModulo>, ScaleOperations<IntModulo> {
+class IntModuloRing : Ring<IntModulo>, ScaleOperations<IntModulo> {
 
-    public val modulus: Int
+    val modulus: Int
 
-    public constructor(modulus: Int) {
+    constructor(modulus: Int) {
         require(modulus != 0) { "modulus can not be zero" }
         this.modulus = if (modulus < 0) -modulus else modulus
     }
@@ -121,7 +121,7 @@ public class IntModuloRing : Ring<IntModulo>, ScaleOperations<IntModulo> {
     override inline val zero: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
     override inline val one: IntModulo get() = IntModulo(1, modulus, toCheckInput = false)
 
-    public fun number(arg: Int): IntModulo = IntModulo(arg, modulus, toCheckInput = false)
+    fun number(arg: Int): IntModulo = IntModulo(arg, modulus, toCheckInput = false)
 
     override inline fun add(left: IntModulo, right: IntModulo): IntModulo = left + right
     override inline fun multiply(left: IntModulo, right: IntModulo): IntModulo = left * right
@@ -130,7 +130,7 @@ public class IntModuloRing : Ring<IntModulo>, ScaleOperations<IntModulo> {
     override inline fun IntModulo.plus(arg: IntModulo): IntModulo = this + arg
     override inline fun IntModulo.minus(arg: IntModulo): IntModulo = this - arg
     override inline fun IntModulo.times(arg: IntModulo): IntModulo = this * arg
-    public inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
+    inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
 
     override fun scale(a: IntModulo, value: Double): IntModulo = a * value.toInt()
 }
\ No newline at end of file
diff --git a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
similarity index 54%
rename from test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
rename to kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
index e534c243e..730a455bf 100644
--- a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
@@ -9,10 +9,10 @@ import space.kscience.kmath.functions.Polynomial
 import space.kscience.kmath.functions.PolynomialSpace
 
 
-public fun PolynomialSpace<IntModulo, IntModuloRing>.Polynomial(vararg coefs: Int): Polynomial<IntModulo> =
+fun PolynomialSpace<IntModulo, IntModuloRing>.Polynomial(vararg coefs: Int): Polynomial<IntModulo> =
     Polynomial(coefs.map { IntModulo(it, ring.modulus) })
-public fun IntModuloRing.Polynomial(vararg coefs: Int): Polynomial<IntModulo> =
+fun IntModuloRing.Polynomial(vararg coefs: Int): Polynomial<IntModulo> =
     Polynomial(coefs.map { IntModulo(it, modulus) })
 
-public fun IntModuloRing.m(arg: Int): IntModulo = IntModulo(arg, modulus)
-public fun PolynomialSpace<IntModulo, IntModuloRing>.m(arg: Int): IntModulo = IntModulo(arg, ring.modulus)
\ No newline at end of file
+fun IntModuloRing.m(arg: Int): IntModulo = IntModulo(arg, modulus)
+fun PolynomialSpace<IntModulo, IntModuloRing>.m(arg: Int): IntModulo = IntModulo(arg, ring.modulus)
\ No newline at end of file
diff --git a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
similarity index 78%
rename from test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
rename to kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
index 27b0eb21e..19cb77df5 100644
--- a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
@@ -12,14 +12,14 @@ import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.NumbersAddOps
 
 @Suppress("NAME_SHADOWING")
-public class Rational {
-    public companion object {
-        public val ZERO: Rational = Rational(0L)
-        public val ONE: Rational = Rational(1L)
+class Rational {
+    companion object {
+        val ZERO: Rational = Rational(0L)
+        val ONE: Rational = Rational(1L)
     }
 
-    public val numerator: Long
-    public val denominator: Long
+    val numerator: Long
+    val denominator: Long
 
     internal constructor(numerator: Long, denominator: Long, toCheckInput: Boolean = true) {
         if (toCheckInput) {
@@ -35,16 +35,16 @@ public class Rational {
         }
     }
 
-    public constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
-    public constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
-    public constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
-    public constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
-    public constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
-    public constructor(numerator: Long) : this(numerator, 1L, false)
+    constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
+    constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
+    constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
+    constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
+    constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
+    constructor(numerator: Long) : this(numerator, 1L, false)
 
-    public operator fun unaryPlus(): Rational = this
-    public operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
-    public operator fun plus(other: Rational): Rational {
+    operator fun unaryPlus(): Rational = this
+    operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
+    operator fun plus(other: Rational): Rational {
         val denominatorsGcd = gcd(denominator, other.denominator)
         val dividedThisDenominator = denominator / denominatorsGcd
         val dividedOtherDenominator = other.denominator / denominatorsGcd
@@ -56,19 +56,19 @@ public class Rational {
             toCheckInput = false
         )
     }
-    public operator fun plus(other: Int): Rational =
+    operator fun plus(other: Int): Rational =
         Rational(
             numerator + denominator * other.toLong(),
             denominator,
             toCheckInput = false
         )
-    public operator fun plus(other: Long): Rational =
+    operator fun plus(other: Long): Rational =
         Rational(
             numerator + denominator * other,
             denominator,
             toCheckInput = false
         )
-    public operator fun minus(other: Rational): Rational {
+    operator fun minus(other: Rational): Rational {
         val denominatorsGcd = gcd(denominator, other.denominator)
         val dividedThisDenominator = denominator / denominatorsGcd
         val dividedOtherDenominator = other.denominator / denominatorsGcd
@@ -80,19 +80,19 @@ public class Rational {
             toCheckInput = false
         )
     }
-    public operator fun minus(other: Int): Rational =
+    operator fun minus(other: Int): Rational =
         Rational(
             numerator - denominator * other.toLong(),
             denominator,
             toCheckInput = false
         )
-    public operator fun minus(other: Long): Rational =
+    operator fun minus(other: Long): Rational =
         Rational(
             numerator - denominator * other,
             denominator,
             toCheckInput = false
         )
-    public operator fun times(other: Rational): Rational {
+    operator fun times(other: Rational): Rational {
         val thisDenominatorAndOtherNumeratorGcd = gcd(denominator, other.numerator)
         val otherDenominatorAndThisNumeratorGcd = gcd(other.denominator, numerator)
         return Rational(
@@ -101,7 +101,7 @@ public class Rational {
             toCheckInput = false
         )
     }
-    public operator fun times(other: Int): Rational {
+    operator fun times(other: Int): Rational {
         val other = other.toLong()
         val denominatorAndOtherGcd = gcd(denominator, other)
         return Rational(
@@ -110,7 +110,7 @@ public class Rational {
             toCheckInput = false
         )
     }
-    public operator fun times(other: Long): Rational {
+    operator fun times(other: Long): Rational {
         val denominatorAndOtherGcd = gcd(denominator, other)
         return Rational(
             numerator * (other / denominatorAndOtherGcd),
@@ -118,7 +118,7 @@ public class Rational {
             toCheckInput = false
         )
     }
-    public operator fun div(other: Rational): Rational {
+    operator fun div(other: Rational): Rational {
         val denominatorsGcd = gcd(denominator, other.denominator)
         val numeratorsGcd = gcd(numerator, other.numerator)
         return Rational(
@@ -126,7 +126,7 @@ public class Rational {
             (denominator / denominatorsGcd) * (other.numerator / numeratorsGcd)
         )
     }
-    public operator fun div(other: Int): Rational {
+    operator fun div(other: Int): Rational {
         val other = other.toLong()
         val numeratorAndOtherGcd = gcd(numerator, other)
         return Rational(
@@ -135,7 +135,7 @@ public class Rational {
             toCheckInput = false
         )
     }
-    public operator fun div(other: Long): Rational {
+    operator fun div(other: Long): Rational {
         val numeratorAndOtherGcd = gcd(numerator, other)
         return Rational(
             numerator / numeratorAndOtherGcd,
@@ -158,7 +158,7 @@ public class Rational {
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
 @OptIn(UnstableKMathAPI::class)
-public object RationalField : Field<Rational>, NumbersAddOps<Rational> {
+object RationalField : Field<Rational>, NumbersAddOps<Rational> {
     override inline val zero: Rational get() = Rational.ZERO
     override inline val one: Rational get() = Rational.ONE
 
diff --git a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
similarity index 100%
rename from test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
rename to kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
diff --git a/kmath-polynomial/build.gradle.kts b/kmath-polynomial/build.gradle.kts
index b0f4a095c..85b87fb34 100644
--- a/kmath-polynomial/build.gradle.kts
+++ b/kmath-polynomial/build.gradle.kts
@@ -12,12 +12,6 @@ kotlin.sourceSets {
             api(projects.kmathCore)
         }
     }
-    commonTest {
-        dependencies {
-            api(projects.testUtilsPolynomial)
-            api(kotlin("test"))
-        }
-    }
 }
 
 dependencies {
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
new file mode 100644
index 000000000..487cd9ee1
--- /dev/null
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
@@ -0,0 +1,589 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+
+import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.operations.Field
+import kotlin.jvm.JvmInline
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+@JvmInline
+value class Expr(val expr: String)
+
+object ExprRing : Field<Expr> {
+    override fun Expr.unaryMinus(): Expr = Expr("-${expr}")
+    override fun add(left: Expr, right: Expr): Expr = Expr("(${left.expr} + ${right.expr})")
+    override fun multiply(left: Expr, right: Expr): Expr = Expr("(${left.expr} * ${right.expr})")
+    override val zero: Expr = Expr("0")
+    override val one: Expr = Expr("1")
+    override fun divide(left: Expr, right: Expr): Expr = Expr("(${left.expr} / ${right.expr})")
+    override fun scale(a: Expr, value: Double): Expr = Expr("(${a.expr} / $value)")
+}
+
+class AlgebraicStubTest {
+    @Test
+    fun test_addMultipliedBySquaring_for_UInt() {
+        ExprRing {
+            assertEquals(
+                "57",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 0u).expr,
+                "tried addMultipliedBySquaring(57, 179, 0u)"
+            )
+            assertEquals(
+                "(57 + 179)",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 1u).expr,
+                "tried addMultipliedBySquaring(57, 179, 1u)"
+            )
+            assertEquals(
+                "(57 + (179 + 179))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 2u).expr,
+                "tried addMultipliedBySquaring(57, 179, 2u)"
+            )
+            assertEquals(
+                "((57 + 179) + (179 + 179))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 3u).expr,
+                "tried addMultipliedBySquaring(57, 179, 3u)"
+            )
+            assertEquals(
+                "(57 + ((179 + 179) + (179 + 179)))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 4u).expr,
+                "tried addMultipliedBySquaring(57, 179, 4u)"
+            )
+            assertEquals(
+                "((57 + 179) + ((179 + 179) + (179 + 179)))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 5u).expr,
+                "tried addMultipliedBySquaring(57, 179, 5u)"
+            )
+            assertEquals(
+                "((57 + (179 + 179)) + ((179 + 179) + (179 + 179)))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 6u).expr,
+                "tried addMultipliedBySquaring(57, 179, 6u)"
+            )
+            assertEquals(
+                "(((57 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179)))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 7u).expr,
+                "tried addMultipliedBySquaring(57, 179, 7u)"
+            )
+            assertEquals(
+                "(57 + (((179 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179))))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 8u).expr,
+                "tried addMultipliedBySquaring(57, 179, 8u)"
+            )
+        }
+    }
+    @Test
+    fun test_multiplyBySquaring_for_UInt() {
+        ExprRing {
+            assertEquals(
+                "0",
+                multiplyByDoubling(Expr("57"), 0u).expr,
+                "tried multiplyBySquaring(57, 0u)"
+            )
+            assertEquals(
+                "57",
+                multiplyByDoubling(Expr("57"), 1u).expr,
+                "tried multiplyBySquaring(57, 1u)"
+            )
+            assertEquals(
+                "(57 + 57)",
+                multiplyByDoubling(Expr("57"), 2u).expr,
+                "tried multiplyBySquaring(57, 2u)"
+            )
+            assertEquals(
+                "(57 + (57 + 57))",
+                multiplyByDoubling(Expr("57"), 3u).expr,
+                "tried multiplyBySquaring(57, 3u)"
+            )
+            assertEquals(
+                "((57 + 57) + (57 + 57))",
+                multiplyByDoubling(Expr("57"), 4u).expr,
+                "tried multiplyBySquaring(57, 4u)"
+            )
+            assertEquals(
+                "(57 + ((57 + 57) + (57 + 57)))",
+                multiplyByDoubling(Expr("57"), 5u).expr,
+                "tried multiplyBySquaring(57, 5u)"
+            )
+            assertEquals(
+                "((57 + 57) + ((57 + 57) + (57 + 57)))",
+                multiplyByDoubling(Expr("57"), 6u).expr,
+                "tried multiplyBySquaring(57, 6u)"
+            )
+            assertEquals(
+                "((57 + (57 + 57)) + ((57 + 57) + (57 + 57)))",
+                multiplyByDoubling(Expr("57"), 7u).expr,
+                "tried multiplyBySquaring(57, 7u)"
+            )
+            assertEquals(
+                "(((57 + 57) + (57 + 57)) + ((57 + 57) + (57 + 57)))",
+                multiplyByDoubling(Expr("57"), 8u).expr,
+                "tried multiplyBySquaring(57, 8u)"
+            )
+        }
+    }
+    @Test
+    fun test_addMultipliedBySquaring_for_Int() {
+        ExprRing {
+            assertEquals(
+                "57",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 0).expr,
+                "tried addMultipliedBySquaring(57, 179, 0)"
+            )
+            assertEquals(
+                "(57 + 179)",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 1).expr,
+                "tried addMultipliedBySquaring(57, 179, 1)"
+            )
+            assertEquals(
+                "(57 + -179)",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -1).expr,
+                "tried addMultipliedBySquaring(57, 179, -1)"
+            )
+            assertEquals(
+                "(57 + (179 + 179))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 2).expr,
+                "tried addMultipliedBySquaring(57, 179, 2)"
+            )
+            assertEquals(
+                "(57 + (-179 + -179))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -2).expr,
+                "tried addMultipliedBySquaring(57, 179, -2)"
+            )
+            assertEquals(
+                "((57 + 179) + (179 + 179))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 3).expr,
+                "tried addMultipliedBySquaring(57, 179, 3)"
+            )
+            assertEquals(
+                "((57 + -179) + (-179 + -179))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -3).expr,
+                "tried addMultipliedBySquaring(57, 179, -3)"
+            )
+            assertEquals(
+                "(57 + ((179 + 179) + (179 + 179)))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 4).expr,
+                "tried addMultipliedBySquaring(57, 179, 4)"
+            )
+            assertEquals(
+                "(57 + ((-179 + -179) + (-179 + -179)))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -4).expr,
+                "tried addMultipliedBySquaring(57, 179, -4)"
+            )
+            assertEquals(
+                "((57 + 179) + ((179 + 179) + (179 + 179)))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 5).expr,
+                "tried addMultipliedBySquaring(57, 179, 5)"
+            )
+            assertEquals(
+                "((57 + -179) + ((-179 + -179) + (-179 + -179)))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -5).expr,
+                "tried addMultipliedBySquaring(57, 179, -5)"
+            )
+            assertEquals(
+                "((57 + (179 + 179)) + ((179 + 179) + (179 + 179)))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 6).expr,
+                "tried addMultipliedBySquaring(57, 179, 6)"
+            )
+            assertEquals(
+                "((57 + (-179 + -179)) + ((-179 + -179) + (-179 + -179)))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -6).expr,
+                "tried addMultipliedBySquaring(57, 179, -6)"
+            )
+            assertEquals(
+                "(((57 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179)))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 7).expr,
+                "tried addMultipliedBySquaring(57, 179, 7)"
+            )
+            assertEquals(
+                "(((57 + -179) + (-179 + -179)) + ((-179 + -179) + (-179 + -179)))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -7).expr,
+                "tried addMultipliedBySquaring(57, 179, -7)"
+            )
+            assertEquals(
+                "(57 + (((179 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179))))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), 8).expr,
+                "tried addMultipliedBySquaring(57, 179, 8)"
+            )
+            assertEquals(
+                "(57 + (((-179 + -179) + (-179 + -179)) + ((-179 + -179) + (-179 + -179))))",
+                addMultipliedByDoubling(Expr("57"), Expr("179"), -8).expr,
+                "tried addMultipliedBySquaring(57, 179, -8)"
+            )
+        }
+    }
+    @Test
+    fun test_multiplyBySquaring_for_Int() {
+        ExprRing {
+            assertEquals(
+                "0",
+                multiplyByDoubling(Expr("57"), 0).expr,
+                "tried multiplyBySquaring(57, 0)"
+            )
+            assertEquals(
+                "57",
+                multiplyByDoubling(Expr("57"), 1).expr,
+                "tried multiplyBySquaring(57, 1)"
+            )
+            assertEquals(
+                "-57",
+                multiplyByDoubling(Expr("57"), -1).expr,
+                "tried multiplyBySquaring(57, -1)"
+            )
+            assertEquals(
+                "(57 + 57)",
+                multiplyByDoubling(Expr("57"), 2).expr,
+                "tried multiplyBySquaring(57, 2)"
+            )
+            assertEquals(
+                "(-57 + -57)",
+                multiplyByDoubling(Expr("57"), -2).expr,
+                "tried multiplyBySquaring(57, -2)"
+            )
+            assertEquals(
+                "(57 + (57 + 57))",
+                multiplyByDoubling(Expr("57"), 3).expr,
+                "tried multiplyBySquaring(57, 3)"
+            )
+            assertEquals(
+                "(-57 + (-57 + -57))",
+                multiplyByDoubling(Expr("57"), -3).expr,
+                "tried multiplyBySquaring(57, -3)"
+            )
+            assertEquals(
+                "((57 + 57) + (57 + 57))",
+                multiplyByDoubling(Expr("57"), 4).expr,
+                "tried multiplyBySquaring(57, 4)"
+            )
+            assertEquals(
+                "((-57 + -57) + (-57 + -57))",
+                multiplyByDoubling(Expr("57"), -4).expr,
+                "tried multiplyBySquaring(57, -4)"
+            )
+            assertEquals(
+                "(57 + ((57 + 57) + (57 + 57)))",
+                multiplyByDoubling(Expr("57"), 5).expr,
+                "tried multiplyBySquaring(57, 5)"
+            )
+            assertEquals(
+                "(-57 + ((-57 + -57) + (-57 + -57)))",
+                multiplyByDoubling(Expr("57"), -5).expr,
+                "tried multiplyBySquaring(57, -5)"
+            )
+            assertEquals(
+                "((57 + 57) + ((57 + 57) + (57 + 57)))",
+                multiplyByDoubling(Expr("57"), 6).expr,
+                "tried multiplyBySquaring(57, 6)"
+            )
+            assertEquals(
+                "((-57 + -57) + ((-57 + -57) + (-57 + -57)))",
+                multiplyByDoubling(Expr("57"), -6).expr,
+                "tried multiplyBySquaring(57, -6)"
+            )
+            assertEquals(
+                "((57 + (57 + 57)) + ((57 + 57) + (57 + 57)))",
+                multiplyByDoubling(Expr("57"), 7).expr,
+                "tried multiplyBySquaring(57, 7)"
+            )
+            assertEquals(
+                "((-57 + (-57 + -57)) + ((-57 + -57) + (-57 + -57)))",
+                multiplyByDoubling(Expr("57"), -7).expr,
+                "tried multiplyBySquaring(57, -7)"
+            )
+            assertEquals(
+                "(((57 + 57) + (57 + 57)) + ((57 + 57) + (57 + 57)))",
+                multiplyByDoubling(Expr("57"), 8).expr,
+                "tried multiplyBySquaring(57, 8)"
+            )
+            assertEquals(
+                "(((-57 + -57) + (-57 + -57)) + ((-57 + -57) + (-57 + -57)))",
+                multiplyByDoubling(Expr("57"), -8).expr,
+                "tried multiplyBySquaring(57, -8)"
+            )
+        }
+    }
+    @Test
+    fun test_multiplyExponentiationBySquaring_for_UInt() {
+        ExprRing {
+            assertEquals(
+                "57",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 0u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 0u)"
+            )
+            assertEquals(
+                "(57 * 179)",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 1u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 1u)"
+            )
+            assertEquals(
+                "(57 * (179 * 179))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 2u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 2u)"
+            )
+            assertEquals(
+                "((57 * 179) * (179 * 179))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 3u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 3u)"
+            )
+            assertEquals(
+                "(57 * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 4u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 4u)"
+            )
+            assertEquals(
+                "((57 * 179) * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 5u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 5u)"
+            )
+            assertEquals(
+                "((57 * (179 * 179)) * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 6u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 6u)"
+            )
+            assertEquals(
+                "(((57 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 7u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 7u)"
+            )
+            assertEquals(
+                "(57 * (((179 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179))))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 8u).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 8u)"
+            )
+        }
+    }
+    @Test
+    fun test_exponentiationBySquaring_for_UInt() {
+        ExprRing {
+            assertEquals(
+                "0",
+                exponentiateBySquaring(Expr("57"), 0u).expr,
+                "tried exponentiationBySquaring(57, 0u)"
+            )
+            assertEquals(
+                "57",
+                exponentiateBySquaring(Expr("57"), 1u).expr,
+                "tried exponentiationBySquaring(57, 1u)"
+            )
+            assertEquals(
+                "(57 * 57)",
+                exponentiateBySquaring(Expr("57"), 2u).expr,
+                "tried exponentiationBySquaring(57, 2u)"
+            )
+            assertEquals(
+                "(57 * (57 * 57))",
+                exponentiateBySquaring(Expr("57"), 3u).expr,
+                "tried exponentiationBySquaring(57, 3u)"
+            )
+            assertEquals(
+                "((57 * 57) * (57 * 57))",
+                exponentiateBySquaring(Expr("57"), 4u).expr,
+                "tried exponentiationBySquaring(57, 4u)"
+            )
+            assertEquals(
+                "(57 * ((57 * 57) * (57 * 57)))",
+                exponentiateBySquaring(Expr("57"), 5u).expr,
+                "tried exponentiationBySquaring(57, 5u)"
+            )
+            assertEquals(
+                "((57 * 57) * ((57 * 57) * (57 * 57)))",
+                exponentiateBySquaring(Expr("57"), 6u).expr,
+                "tried exponentiationBySquaring(57, 6u)"
+            )
+            assertEquals(
+                "((57 * (57 * 57)) * ((57 * 57) * (57 * 57)))",
+                exponentiateBySquaring(Expr("57"), 7u).expr,
+                "tried exponentiationBySquaring(57, 7u)"
+            )
+            assertEquals(
+                "(((57 * 57) * (57 * 57)) * ((57 * 57) * (57 * 57)))",
+                exponentiateBySquaring(Expr("57"), 8u).expr,
+                "tried exponentiationBySquaring(57, 8u)"
+            )
+        }
+    }
+    @Test
+    fun test_multiplyExponentiationBySquaring_for_Int() {
+        ExprRing {
+            assertEquals(
+                "57",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 0).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 0)"
+            )
+            assertEquals(
+                "(57 * 179)",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 1).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 1)"
+            )
+            assertEquals(
+                "(57 * (1 / 179))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -1).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -1)"
+            )
+            assertEquals(
+                "(57 * (179 * 179))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 2).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 2)"
+            )
+            assertEquals(
+                "(57 * ((1 / 179) * (1 / 179)))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -2).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -2)"
+            )
+            assertEquals(
+                "((57 * 179) * (179 * 179))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 3).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 3)"
+            )
+            assertEquals(
+                "((57 * (1 / 179)) * ((1 / 179) * (1 / 179)))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -3).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -3)"
+            )
+            assertEquals(
+                "(57 * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 4).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 4)"
+            )
+            assertEquals(
+                "(57 * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -4).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -4)"
+            )
+            assertEquals(
+                "((57 * 179) * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 5).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 5)"
+            )
+            assertEquals(
+                "((57 * (1 / 179)) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -5).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -5)"
+            )
+            assertEquals(
+                "((57 * (179 * 179)) * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 6).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 6)"
+            )
+            assertEquals(
+                "((57 * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -6).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -6)"
+            )
+            assertEquals(
+                "(((57 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179)))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 7).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 7)"
+            )
+            assertEquals(
+                "(((57 * (1 / 179)) * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -7).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -7)"
+            )
+            assertEquals(
+                "(57 * (((179 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179))))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 8).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, 8)"
+            )
+            assertEquals(
+                "(57 * ((((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179)))))",
+                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -8).expr,
+                "tried multiplyExponentiationBySquaring(57, 179, -8)"
+            )
+        }
+    }
+    @Test
+    fun test_exponentiationBySquaring_for_Int() {
+        ExprRing {
+            assertEquals(
+                "0",
+                exponentiateBySquaring(Expr("57"), 0).expr,
+                "tried exponentiationBySquaring(57, 0)"
+            )
+            assertEquals(
+                "57",
+                exponentiateBySquaring(Expr("57"), 1).expr,
+                "tried exponentiationBySquaring(57, 1)"
+            )
+            assertEquals(
+                "(1 / 57)",
+                exponentiateBySquaring(Expr("57"), -1).expr,
+                "tried exponentiationBySquaring(57, -1)"
+            )
+            assertEquals(
+                "(57 * 57)",
+                exponentiateBySquaring(Expr("57"), 2).expr,
+                "tried exponentiationBySquaring(57, 2)"
+            )
+            assertEquals(
+                "((1 / 57) * (1 / 57))",
+                exponentiateBySquaring(Expr("57"), -2).expr,
+                "tried exponentiationBySquaring(57, -2)"
+            )
+            assertEquals(
+                "(57 * (57 * 57))",
+                exponentiateBySquaring(Expr("57"), 3).expr,
+                "tried exponentiationBySquaring(57, 3)"
+            )
+            assertEquals(
+                "((1 / 57) * ((1 / 57) * (1 / 57)))",
+                exponentiateBySquaring(Expr("57"), -3).expr,
+                "tried exponentiationBySquaring(57, -3)"
+            )
+            assertEquals(
+                "((57 * 57) * (57 * 57))",
+                exponentiateBySquaring(Expr("57"), 4).expr,
+                "tried exponentiationBySquaring(57, 4)"
+            )
+            assertEquals(
+                "(((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57)))",
+                exponentiateBySquaring(Expr("57"), -4).expr,
+                "tried exponentiationBySquaring(57, -4)"
+            )
+            assertEquals(
+                "(57 * ((57 * 57) * (57 * 57)))",
+                exponentiateBySquaring(Expr("57"), 5).expr,
+                "tried exponentiationBySquaring(57, 5)"
+            )
+            assertEquals(
+                "((1 / 57) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
+                exponentiateBySquaring(Expr("57"), -5).expr,
+                "tried exponentiationBySquaring(57, -5)"
+            )
+            assertEquals(
+                "((57 * 57) * ((57 * 57) * (57 * 57)))",
+                exponentiateBySquaring(Expr("57"), 6).expr,
+                "tried exponentiationBySquaring(57, 6)"
+            )
+            assertEquals(
+                "(((1 / 57) * (1 / 57)) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
+                exponentiateBySquaring(Expr("57"), -6).expr,
+                "tried exponentiationBySquaring(57, -6)"
+            )
+            assertEquals(
+                "((57 * (57 * 57)) * ((57 * 57) * (57 * 57)))",
+                exponentiateBySquaring(Expr("57"), 7).expr,
+                "tried exponentiationBySquaring(57, 7)"
+            )
+            assertEquals(
+                "(((1 / 57) * ((1 / 57) * (1 / 57))) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
+                exponentiateBySquaring(Expr("57"), -7).expr,
+                "tried exponentiationBySquaring(57, -7)"
+            )
+            assertEquals(
+                "(((57 * 57) * (57 * 57)) * ((57 * 57) * (57 * 57)))",
+                exponentiateBySquaring(Expr("57"), 8).expr,
+                "tried exponentiationBySquaring(57, 8)"
+            )
+            assertEquals(
+                "((((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
+                exponentiateBySquaring(Expr("57"), -8).expr,
+                "tried exponentiationBySquaring(57, -8)"
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
new file mode 100644
index 000000000..e7d8dfd8c
--- /dev/null
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
@@ -0,0 +1,544 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:Suppress("LocalVariableName")
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.functions.testUtils.IntModuloRing
+import space.kscience.kmath.functions.testUtils.ListPolynomial
+import space.kscience.kmath.functions.testUtils.Rational
+import space.kscience.kmath.functions.testUtils.RationalField
+import kotlin.test.*
+
+
+class ListPolynomialTest {
+    @Test
+    fun test_Polynomial_Int_plus() {
+        RationalField.listPolynomialSpace {
+            assertEquals(
+                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + -3,
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 2,
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0)),
+                ListPolynomial(Rational(-2)) + 2,
+                "test 3"
+            )
+            val polynomial_4 = ListPolynomial<Rational>()
+            assertSame(
+                polynomial_4,
+                polynomial_4 + 0,
+                "test 4"
+            )
+            val polynomial_5 = ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7))
+            assertSame(
+                polynomial_5,
+                polynomial_5 + 0,
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 1,
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1)),
+                ListPolynomial(Rational(-2)) + 1,
+                "test 7"
+            )
+            assertEquals(
+                ListPolynomial(Rational(2)),
+                ListPolynomial<Rational>() + 2,
+                "test 8"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Int_minus() {
+        RationalField.listPolynomialSpace {
+            assertEquals(
+                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - -3,
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 2,
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0)),
+                ListPolynomial(Rational(2)) - 2,
+                "test 3"
+            )
+            val polynomial_4 = ListPolynomial<Rational>()
+            assertSame(
+                polynomial_4,
+                polynomial_4 - 0,
+                "test 4"
+            )
+            val polynomial_5 = ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7))
+            assertEquals(
+                polynomial_5,
+                polynomial_5 - 0,
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 1,
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1)),
+                ListPolynomial(Rational(2)) - 1,
+                "test 7"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-2)),
+                ListPolynomial<Rational>() - 2,
+                "test 8"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Int_times() {
+        IntModuloRing(35).listPolynomialSpace {
+            assertEquals(
+                ListPolynomial(34, 2, 1, 20, 2),
+                ListPolynomial(22, 26, 13, 15, 26) * 27,
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(0, 0, 0, 0, 0),
+                ListPolynomial(7, 0, 49, 21, 14) * 15,
+                "test 2"
+            )
+            val polynomial = ListPolynomial(22, 26, 13, 15, 26)
+            assertSame(
+                zero,
+                polynomial * 0,
+                "test 3"
+            )
+            assertSame(
+                polynomial,
+                polynomial * 1,
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_plus() {
+        RationalField.listPolynomialSpace {
+            assertEquals(
+                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                -3 + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                2 + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0)),
+                2 + ListPolynomial(Rational(-2)),
+                "test 3"
+            )
+            val polynomial_4 = ListPolynomial<Rational>()
+            assertSame(
+                polynomial_4,
+                0 + polynomial_4,
+                "test 4"
+            )
+            val polynomial_5 = ListPolynomial<Rational>(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7))
+            assertSame(
+                polynomial_5,
+                0 + polynomial_5,
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                1 + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1)),
+                1 + ListPolynomial(Rational(-2)),
+                "test 7"
+            )
+            assertEquals(
+                ListPolynomial(Rational(2)),
+                2 + ListPolynomial(),
+                "test 8"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_minus() {
+        RationalField.listPolynomialSpace {
+            assertEquals(
+                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                3 - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                -2 - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0)),
+                -2 - ListPolynomial(Rational(-2)),
+                "test 3"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-32, 9), Rational(-8, -9), Rational(8, 7)),
+                0 - ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                "test 4"
+            )
+            assertEquals(
+                ListPolynomial(),
+                0 - ListPolynomial(),
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                -1 - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1)),
+                -1 - ListPolynomial(Rational(-2)),
+                "test 7"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-2)),
+                -2 - ListPolynomial(),
+                "test 8"
+            )
+        }
+    }
+    @Test
+    fun test_Int_Polynomial_times() {
+        IntModuloRing(35).listPolynomialSpace {
+            assertEquals(
+                ListPolynomial(34, 2, 1, 20, 2),
+                27 * ListPolynomial(22, 26, 13, 15, 26),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(0, 0, 0, 0, 0),
+                15 * ListPolynomial(7, 0, 49, 21, 14),
+                "test 2"
+            )
+            val polynomial = ListPolynomial(22, 26, 13, 15, 26)
+            assertSame(
+                zero,
+                0 * polynomial,
+                "test 3"
+            )
+            assertSame(
+                polynomial,
+                1 * polynomial,
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_plus() {
+        RationalField.listPolynomialSpace {
+            assertEquals(
+                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + Rational(-3),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(2),
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0)),
+                ListPolynomial(Rational(-2)) + Rational(2),
+                "test 3"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0)),
+                ListPolynomial<Rational>() + Rational(0),
+                "test 4"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(1),
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1)),
+                ListPolynomial(Rational(-2)) + Rational(1),
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(2)),
+                ListPolynomial<Rational>() + Rational(2),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_minus() {
+        RationalField.listPolynomialSpace {
+            assertEquals(
+                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - Rational(-3),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(2),
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0)),
+                ListPolynomial(Rational(2)) - Rational(2),
+                "test 3"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0)),
+                ListPolynomial<Rational>() - Rational(0),
+                "test 4"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(1),
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1)),
+                ListPolynomial(Rational(2)) - Rational(1),
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-2)),
+                ListPolynomial<Rational>() - Rational(2),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Constant_times() {
+        IntModuloRing(35).listPolynomialSpace {
+            assertEquals(
+                ListPolynomial(34, 2, 1, 20, 2),
+                ListPolynomial(22, 26, 13, 15, 26) * 27.asConstant(),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(0, 0, 0, 0, 0),
+                ListPolynomial(7, 0, 49, 21, 14) * 15.asConstant(),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_plus() {
+        RationalField.listPolynomialSpace {
+            assertEquals(
+                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
+                Rational(-3) + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Rational(2) + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0)),
+                Rational(2) + ListPolynomial(Rational(-2)),
+                "test 3"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0)),
+                Rational(0) + ListPolynomial(),
+                "test 4"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
+                Rational(1) + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-1)),
+                Rational(1) + ListPolynomial(Rational(-2)),
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(2)),
+                Rational(2) + ListPolynomial(),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_minus() {
+        RationalField.listPolynomialSpace {
+            assertEquals(
+                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
+                Rational(3) - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
+                Rational(-2) - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 2"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0)),
+                Rational(-2) - ListPolynomial(Rational(-2)),
+                "test 3"
+            )
+            assertEquals(
+                ListPolynomial(Rational(0)),
+                Rational(0) - ListPolynomial(),
+                "test 4"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
+                Rational(-1) - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
+                "test 5"
+            )
+            assertEquals(
+                ListPolynomial(Rational(1)),
+                Rational(-1) - ListPolynomial(Rational(-2)),
+                "test 6"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-2)),
+                Rational(-2) - ListPolynomial(),
+                "test 7"
+            )
+        }
+    }
+    @Test
+    fun test_Constant_Polynomial_times() {
+        IntModuloRing(35).listPolynomialSpace {
+            assertEquals(
+                ListPolynomial(34, 2, 1, 20, 2),
+                27 * ListPolynomial(22, 26, 13, 15, 26),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(0, 0, 0, 0, 0),
+                15 * ListPolynomial(7, 0, 49, 21, 14),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_unaryMinus() {
+        RationalField.listPolynomialSpace {
+            assertEquals(
+                ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
+                -ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
+                "test 1"
+            )
+            assertEquals(
+                ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7), Rational(0), Rational(0)),
+                -ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7), Rational(0), Rational(0)),
+                "test 2"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_plus() {
+        RationalField.listPolynomialSpace {
+            // (5/9 - 8/9 x - 8/7 x^2) + (-5/7 + 5/1 x + 5/8 x^2) ?= -10/63 + 37/9 x - 29/56 x^2
+            assertEquals(
+                ListPolynomial(Rational(-10, 63), Rational(37, 9), Rational(-29, 56)),
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) +
+                        ListPolynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
+                "test 1"
+            )
+            // (-2/9 - 8/3 x) + (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 5/12 x + 2/4 x^2
+            assertEquals(
+                ListPolynomial(Rational(-2, 9), Rational(-5, 12), Rational(2, 4)),
+                ListPolynomial(Rational(-2, 9), Rational(-8, 3)) +
+                        ListPolynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
+                "test 2"
+            )
+            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) + (-6/3 - 7/2 x + 2/3 x^2) ?= -18/7 - 23/6 x + 2/3 x^2
+            assertEquals(
+                ListPolynomial(Rational(-18, 7), Rational(-23, 6), Rational(2, 3), Rational(0)),
+                ListPolynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) +
+                        ListPolynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
+                "test 3"
+            )
+            // (-2/4 - 6/9 x - 4/9 x^2) + (2/4 + 6/9 x + 4/9 x^2) ?= 0
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) +
+                        ListPolynomial(Rational(2, 4), Rational(6, 9), Rational(4, 9)),
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_minus() {
+        RationalField.listPolynomialSpace {
+            // (5/9 - 8/9 x - 8/7 x^2) - (-5/7 + 5/1 x + 5/8 x^2) ?= 80/63 - 53/9 x - 99/56 x^2
+            assertEquals(
+                ListPolynomial(Rational(80, 63), Rational(-53, 9), Rational(-99, 56)),
+                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) -
+                        ListPolynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
+                "test 1"
+            )
+            // (-2/9 - 8/3 x) - (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 59/12 x - 2/4 x^2
+            assertEquals(
+                ListPolynomial(Rational(-2, 9), Rational(-59, 12), Rational(-2, 4)),
+                ListPolynomial(Rational(-2, 9), Rational(-8, 3)) -
+                        ListPolynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
+                "test 2"
+            )
+            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) - (-6/3 - 7/2 x + 2/3 x^2) ?= 10/7 + 19/6 x - 2/3 x^2
+            assertEquals(
+                ListPolynomial(Rational(10, 7), Rational(19, 6), Rational(-2, 3), Rational(0)),
+                ListPolynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) -
+                        ListPolynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
+                "test 3"
+            )
+            // (-2/4 - 6/9 x - 4/9 x^2) - (-2/4 - 6/9 x - 4/9 x^2) ?= 0
+            assertEquals(
+                ListPolynomial(Rational(0), Rational(0), Rational(0)),
+                ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) -
+                        ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)),
+                "test 4"
+            )
+        }
+    }
+    @Test
+    fun test_Polynomial_Polynomial_times() {
+        IntModuloRing(35).listPolynomialSpace {
+            // (1 + x + x^2) * (1 - x + x^2) ?= 1 + x^2 + x^4
+            assertEquals(
+                ListPolynomial(1, 0, 1, 0, 1),
+                ListPolynomial(1, -1, 1) * ListPolynomial(1, 1, 1),
+                "test 1"
+            )
+            // Spoiler: 5 * 7 = 0
+            assertEquals(
+                ListPolynomial(0, 0, 0, 0, 0),
+                ListPolynomial(5, -25, 10) * ListPolynomial(21, 14, -7),
+                "test 2"
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
new file mode 100644
index 000000000..339643d02
--- /dev/null
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -0,0 +1,982 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.functions
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.functions.testUtils.Rational
+import space.kscience.kmath.functions.testUtils.RationalField
+import space.kscience.kmath.functions.testUtils.assertFailsWithTypeAndMessage
+import kotlin.test.Ignore
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+
+@OptIn(UnstableKMathAPI::class)
+class ListPolynomialUtilTest {
+    @Test
+    fun test_Polynomial_substitute_Double() {
+        assertEquals(
+            0.0,
+            ListPolynomial(1.0, -2.0, 1.0).substitute(1.0),
+            0.001,
+            "test 1"
+        )
+        assertEquals(
+            0.0,
+            ListPolynomial(1.0, -2.0, 1.0).substitute(1.0),
+            0.001,
+            "test 1"
+        )
+        assertEquals(
+            1.1931904761904761,
+            ListPolynomial(0.625, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
+            0.001,
+            "test 2"
+        )
+        assertEquals(
+            0.5681904761904762,
+            ListPolynomial(0.0, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
+            0.001,
+            "test 3"
+        )
+        assertEquals(
+            1.1811904761904761,
+            ListPolynomial(0.625, 2.6666666666666665, 0.5714285714285714, 0.0).substitute(0.2),
+            0.001,
+            "test 4"
+        )
+        assertEquals(
+            1.1703333333333332,
+            ListPolynomial(0.625, 2.6666666666666665, 0.0, 1.5).substitute(0.2),
+            0.001,
+            "test 5"
+        )
+    }
+    @Test
+    fun test_Polynomial_substitute_Constant() {
+        assertEquals(
+            Rational(0),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, Rational(1)),
+            "test 1"
+        )
+        assertEquals(
+            Rational(25057, 21000),
+            ListPolynomial(Rational(5, 8), Rational(8, 3), Rational(4, 7), Rational(3, 2))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 2"
+        )
+        assertEquals(
+            Rational(2983, 5250),
+            ListPolynomial(Rational(0), Rational(8, 3), Rational(4, 7), Rational(3, 2))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 3"
+        )
+        assertEquals(
+            Rational(4961, 4200),
+            ListPolynomial(Rational(5, 8), Rational(8, 3), Rational(4, 7), Rational(0))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 4"
+        )
+        assertEquals(
+            Rational(3511, 3000),
+            ListPolynomial(Rational(5, 8), Rational(8, 3), Rational(0), Rational(3, 2))
+                .substitute(RationalField, Rational(1, 5)),
+            "test 5"
+        )
+    }
+    @Test
+    fun test_Polynomial_substitute_Polynomial() {
+        assertEquals(
+            ListPolynomial(Rational(0)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, ListPolynomial(Rational(1))),
+            "test 1"
+        )
+        assertEquals(
+            ListPolynomial(Rational(709, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
+            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(2, 7))
+                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
+            "test 2"
+        )
+        assertEquals(
+            ListPolynomial(Rational(655, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
+            ListPolynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(2, 7))
+                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
+            "test 3"
+        )
+        assertEquals(
+            ListPolynomial(Rational(677, 378), Rational(97, 180), Rational(1, 75), Rational(0)),
+            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(0))
+                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
+            "test 4"
+        )
+        assertEquals(
+            ListPolynomial(Rational(653, 378), Rational(221, 420), Rational(4, 175), Rational(2, 875)),
+            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(0), Rational(2, 7))
+                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
+            "test 5"
+        )
+        assertEquals(
+            ListPolynomial(Rational(89, 54), Rational(0), Rational(0), Rational(0)),
+            ListPolynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(0))
+                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(0))),
+            "test 6"
+        )
+    }
+    @Test
+    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
+            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
+    fun test_Polynomial_substitute_RationalFunction() {
+        assertEquals(
+            ListRationalFunction(ListPolynomial(Rational(0)), ListPolynomial(Rational(1))),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1))
+                .substitute(RationalField, ListRationalFunction(ListPolynomial(Rational(1)), ListPolynomial(Rational(1)))),
+            "test 1"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(66349, 243),
+                    Rational(-17873, 405),
+                    Rational(173533, 3780),
+                    Rational(-91141, 567),
+                    Rational(5773909, 105840),
+                    Rational(-23243, 630),
+                    Rational(1573, 27)
+                ),
+                ListPolynomial(
+                    Rational(169, 81),
+                    Rational(-130, 27),
+                    Rational(115, 18),
+                    Rational(-797, 54),
+                    Rational(1985, 144),
+                    Rational(-55, 6),
+                    Rational(121, 9)
+                )
+            ),
+            ListPolynomial(
+                Rational(13, 3),
+                Rational(-9, 5),
+                Rational(5, 5)
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(15, 1),
+                        Rational(6, 9),
+                        Rational(-3, 7)
+                    ),
+                    ListPolynomial(
+                        Rational(-13, 9),
+                        Rational(10, 6),
+                        Rational(-10, 8),
+                        Rational(11, 3)
+                    )
+                )
+            ),
+            "test 2"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(-14, 9),
+                    Rational(31, 14),
+                    Rational(-5077, 980),
+                    Rational(99, 35)
+                ),
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(25, 9),
+                    Rational(-25, 6),
+                    Rational(1985, 144),
+                    Rational(-55, 6),
+                    Rational(121, 9)
+                )
+            ),
+            ListPolynomial(
+                Rational(0),
+                Rational(-9, 5),
+                Rational(5, 5)
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(0),
+                        Rational(6, 9),
+                        Rational(-3, 7)
+                    ),
+                    ListPolynomial(
+                        Rational(0),
+                        Rational(10, 6),
+                        Rational(-10, 8),
+                        Rational(11, 3)
+                    )
+                )
+            ),
+            "test 3"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(-898, 27),
+                    Rational(271, 45),
+                    Rational(-65, 12) ,
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0)
+                ),
+                ListPolynomial(
+                    Rational(-13, 9),
+                    Rational(5, 3),
+                    Rational(-5, 4),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0)
+                )
+            ),
+            ListPolynomial(
+                Rational(13, 3),
+                Rational(-9, 5),
+                Rational(0)
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(15, 1),
+                        Rational(6, 9),
+                        Rational(0)
+                    ),
+                    ListPolynomial(
+                        Rational(-13, 9),
+                        Rational(10, 6),
+                        Rational(-10, 8),
+                        Rational(0)
+                    )
+                )
+            ),
+            "test 4"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(56872, 243),
+                    Rational(0, 1),
+                    Rational(-90, 7),
+                    Rational(-3718, 81),
+                    Rational(9, 49),
+                    Rational(0, 1),
+                    Rational(1573, 27)
+                ),
+                ListPolynomial(
+                    Rational(169, 81),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(-286, 27),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(121, 9)
+                )
+            ),
+            ListPolynomial(
+                Rational(13, 3),
+                Rational(0),
+                Rational(5, 5)
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(15, 1),
+                        Rational(0),
+                        Rational(-3, 7)
+                    ),
+                    ListPolynomial(
+                        Rational(-13, 9),
+                        Rational(0),
+                        Rational(0),
+                        Rational(11, 3)
+                    )
+                )
+            ),
+            "test 5"
+        )
+    }
+    @Test
+    fun test_RationalFunction_substitute_Double() {
+        assertEquals(
+            0.0,
+            ListRationalFunction(
+                ListPolynomial(1.0, -2.0, 1.0),
+                ListPolynomial(-6.302012278484357, 5.831971885376948, -9.271604788393432, 5.494387848015814, -3.7187384450880785)
+            ).substitute(1.0),
+            0.001,
+            "test 1"
+        )
+        assertEquals(
+            2.693702616649797,
+            ListRationalFunction(
+                ListPolynomial(-5.848840571263625, -1.660411278951134, -3.793740946372443, -9.624569269490076),
+                ListPolynomial(-2.9680680215311073, -1.862973627119981, 4.776550592888336, -2.7320154512368466)
+            ).substitute(-7.53452770353279),
+            0.001,
+            "test 2"
+        )
+        assertEquals(
+            2.692226268901378,
+            ListRationalFunction(
+                ListPolynomial(0.0, -1.660411278951134, -3.793740946372443, -9.624569269490076),
+                ListPolynomial(0.0, -1.862973627119981, 4.776550592888336, -2.7320154512368466)
+            ).substitute(-7.53452770353279),
+            0.001,
+            "test 3"
+        )
+        assertEquals(
+            -0.7394904842099175,
+            ListRationalFunction(
+                ListPolynomial(-5.848840571263625, -1.660411278951134, -3.793740946372443, 0.0),
+                ListPolynomial(-2.9680680215311073, -1.862973627119981, 4.776550592888336, 0.0)
+            ).substitute(-7.53452770353279),
+            0.001,
+            "test 4"
+        )
+        assertEquals(
+            3.526835209398159,
+            ListRationalFunction(
+                ListPolynomial(-5.848840571263625, 0.0, 0.0, -9.624569269490076),
+                ListPolynomial(-2.9680680215311073, 0.0, 0.0, -2.7320154512368466)
+            ).substitute(-7.53452770353279),
+            0.001,
+            "test 5"
+        )
+    }
+    @Test
+    fun test_RationalFunction_substitute_Constant() {
+        assertEquals(
+            Rational(0),
+            ListRationalFunction(
+                ListPolynomial(Rational(1), Rational(-2), Rational(1)),
+                ListPolynomial(Rational(1)),
+            ).substitute(RationalField, Rational(1)),
+            "test 1"
+        )
+        assertEquals(
+            Rational(1149615, 61306),
+            ListRationalFunction(
+                ListPolynomial(Rational(17, 7), Rational(18, 3), Rational(18, 8), Rational(9, 1)),
+                ListPolynomial(Rational(11, 9), Rational(-6, 5), Rational(-12, 7), Rational(2, 1)),
+            ).substitute(RationalField, Rational(-7, 8)),
+            "test 2"
+        )
+        assertEquals(
+            Rational(3495, 586),
+            ListRationalFunction(
+                ListPolynomial(Rational(0), Rational(18, 3), Rational(18, 8), Rational(9, 1)),
+                ListPolynomial(Rational(0), Rational(-6, 5), Rational(-12, 7), Rational(2, 1)),
+            ).substitute(RationalField, Rational(-7, 8)),
+            "test 3"
+        )
+        assertEquals(
+            Rational(-88605, 77392),
+            ListRationalFunction(
+                ListPolynomial(Rational(17, 7), Rational(18, 3), Rational(18, 8), Rational(0)),
+                ListPolynomial(Rational(11, 9), Rational(-6, 5), Rational(-12, 7), Rational(0)),
+            ).substitute(RationalField, Rational(-7, 8)),
+            "test 4"
+        )
+        assertEquals(
+            Rational(116145, 3794),
+            ListRationalFunction(
+                ListPolynomial(Rational(17, 7), Rational(0), Rational(0), Rational(9, 1)),
+                ListPolynomial(Rational(11, 9), Rational(0), Rational(0), Rational(2, 1)),
+            ).substitute(RationalField, Rational(-7, 8)),
+            "test 5"
+        )
+    }
+    @Test
+    fun test_RationalFunction_substitute_Polynomial() {
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(Rational(0)),
+                ListPolynomial(Rational(1))
+            ),
+            ListRationalFunction(
+                ListPolynomial(Rational(1), Rational(-2), Rational(1)),
+                ListPolynomial(Rational(1)),
+            ).substitute(RationalField, ListPolynomial(Rational(1))),
+            "test 1"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(-283303, 36),
+                    Rational(-23593, 24),
+                    Rational(368713, 192),
+                    Rational(1455, 8),
+                    Rational(-272171, 1536),
+                    Rational(-2149, 192),
+                    Rational(469, 64),
+                    Rational(11, 48),
+                    Rational(-11, 96)
+                ),
+                ListPolynomial(
+                    Rational(5797, 12),
+                    Rational(595, 16),
+                    Rational(-5285, 72),
+                    Rational(-745, 192),
+                    Rational(1105, 288),
+                    Rational(5, 48),
+                    Rational(-5, 72)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(2, 9),
+                    Rational(11, 3),
+                    Rational(-9, 4),
+                    Rational(-6, 1),
+                    Rational(-11, 6)
+                ),
+                ListPolynomial(
+                    Rational(-2, 3),
+                    Rational(-15, 4),
+                    Rational(5, 9),
+                    Rational(-5, 9)
+                )
+            ).substitute(RationalField,
+                ListPolynomial(
+                    Rational(-9, 1),
+                    Rational(-1, 4),
+                    Rational(2, 4)
+                )
+            ),
+            "test 2"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(-11, 12),
+                    Rational(325, 192),
+                    Rational(21, 32),
+                    Rational(-1739, 1536),
+                    Rational(227, 192),
+                    Rational(-59, 64),
+                    Rational(11, 48),
+                    Rational(-11, 96)
+                ),
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(15, 16),
+                    Rational(-265, 144),
+                    Rational(-25, 192),
+                    Rational(25, 288),
+                    Rational(5, 48),
+                    Rational(-5, 72)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(0, 9),
+                    Rational(11, 3),
+                    Rational(-9, 4),
+                    Rational(-6, 1),
+                    Rational(-11, 6)
+                ),
+                ListPolynomial(
+                    Rational(0, 3),
+                    Rational(-15, 4),
+                    Rational(5, 9),
+                    Rational(-5, 9)
+                )
+            ).substitute(RationalField,
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(-1, 4),
+                    Rational(2, 4)
+                )
+            ),
+            "test 3"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(149723, 36),
+                    Rational(8483, 24),
+                    Rational(639, 64),
+                    Rational(3, 32),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0)
+                ),
+                ListPolynomial(
+                    Rational(937, 12),
+                    Rational(55, 16),
+                    Rational(5, 144),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(2, 9),
+                    Rational(11, 3),
+                    Rational(-9, 4),
+                    Rational(-6, 1),
+                    Rational(0)
+                ),
+                ListPolynomial(
+                    Rational(-2, 3),
+                    Rational(-15, 4),
+                    Rational(5, 9),
+                    Rational(0)
+                )
+            ).substitute(RationalField,
+                ListPolynomial(
+                    Rational(-9, 1),
+                    Rational(-1, 4),
+                    Rational(0)
+                )
+            ),
+            "test 4"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(-216509, 18),
+                    Rational(0, 1),
+                    Rational(2673, 1),
+                    Rational(0, 1),
+                    Rational(-891, 4),
+                    Rational(0, 1),
+                    Rational(33, 4),
+                    Rational(0, 1),
+                    Rational(-11, 96)
+                ),
+                ListPolynomial(
+                    Rational(1213, 3),
+                    Rational(0, 1),
+                    Rational(-135, 2),
+                    Rational(0, 1),
+                    Rational(15, 4),
+                    Rational(0, 1),
+                    Rational(-5, 72)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(2, 9),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(-11, 6)
+                ),
+                ListPolynomial(
+                    Rational(-2, 3),
+                    Rational(0),
+                    Rational(0),
+                    Rational(-5, 9)
+                )
+            ).substitute(RationalField,
+                ListPolynomial(
+                    Rational(-9, 1),
+                    Rational(0),
+                    Rational(2, 4)
+                )
+            ),
+            "test 5"
+        )
+    }
+    @Test
+    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
+            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
+            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
+    fun test_RationalFunction_substitute_RationalFunction() {
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(Rational(0)),
+                ListPolynomial(Rational(1))
+            ),
+            ListRationalFunction(
+                ListPolynomial(Rational(1), Rational(-2), Rational(1)),
+                ListPolynomial(Rational(1))
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(Rational(1)),
+                    ListPolynomial(Rational(1))
+                )
+            ),
+            "test 1"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(130087, 3888),
+                    Rational(-2866333, 65610),
+                    Rational(-5076229, 97200),
+                    Rational(222136997, 3280500),
+                    Rational(754719329, 20995200),
+                    Rational(-12010283, 324000),
+                    Rational(-2011967, 172800),
+                    Rational(18607, 2880),
+                    Rational(4705, 4096)
+                ),
+                ListPolynomial(
+                    Rational(-143820355, 3779136),
+                    Rational(73886869, 1574640),
+                    Rational(1440175193, 15746400),
+                    Rational(-5308968857, 52488000),
+                    Rational(-186910083731, 2099520000),
+                    Rational(125043463, 1555200),
+                    Rational(5299123, 388800),
+                    Rational(-213757, 15360),
+                    Rational(1380785, 147456)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(1, 1),
+                    Rational(-10, 5),
+                    Rational(18, 8),
+                    Rational(-8, 8)
+                ),
+                ListPolynomial(
+                    Rational(-14, 8),
+                    Rational(-14, 8),
+                    Rational(-19, 6),
+                    Rational(14, 3),
+                    Rational(8, 9)
+                )
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(14, 9),
+                        Rational(-2, 5),
+                        Rational(-14, 7)
+                    ),
+                    ListPolynomial(
+                        Rational(-6, 4),
+                        Rational(5, 9),
+                        Rational(1, 8)
+                    )
+                )
+            ),
+            "test 2"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(5173, 18225),
+                    Rational(904291, 364500),
+                    Rational(283127, 43200),
+                    Rational(37189, 5760),
+                    Rational(147, 128)
+                ),
+                ListPolynomial(
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(-163589, 911250),
+                    Rational(-881831, 291600),
+                    Rational(-10722229, 777600),
+                    Rational(-640921, 46080),
+                    Rational(86303, 9216)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(0),
+                    Rational(-10, 5),
+                    Rational(18, 8),
+                    Rational(-8, 8)
+                ),
+                ListPolynomial(
+                    Rational(0),
+                    Rational(-14, 8),
+                    Rational(-19, 6),
+                    Rational(14, 3),
+                    Rational(8, 9)
+                )
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(0),
+                        Rational(-2, 5),
+                        Rational(-14, 7)
+                    ),
+                    ListPolynomial(
+                        Rational(0),
+                        Rational(5, 9),
+                        Rational(1, 8)
+                    )
+                )
+            ),
+            "test 3"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(445, 16),
+                    Rational(-2011, 54),
+                    Rational(1359199, 72900),
+                    Rational(-135733, 32805),
+                    Rational(2254, 6561),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1)
+                ),
+                ListPolynomial(
+                    Rational(-2018387, 46656),
+                    Rational(82316437, 1574640),
+                    Rational(-9335047, 393660),
+                    Rational(15765889, 3280500),
+                    Rational(-242089, 656100),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1),
+                    Rational(0, 1)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(1, 1),
+                    Rational(-10, 5),
+                    Rational(18, 8),
+                    Rational(0)
+                ),
+                ListPolynomial(
+                    Rational(-14, 8),
+                    Rational(-14, 8),
+                    Rational(-19, 6),
+                    Rational(14, 3),
+                    Rational(0)
+                )
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(14, 9),
+                        Rational(-2, 5),
+                        Rational(0)
+                    ),
+                    ListPolynomial(
+                        Rational(-6, 4),
+                        Rational(5, 9),
+                        Rational(0)
+                    )
+                )
+            ),
+            "test 4"
+        )
+        assertEquals(
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(41635, 3888),
+                    Rational(0, 1),
+                    Rational(-279187, 11664),
+                    Rational(0, 1),
+                    Rational(103769, 3456),
+                    Rational(0, 1),
+                    Rational(-11017, 768),
+                    Rational(0, 1),
+                    Rational(4097, 4096)
+                ),
+                ListPolynomial(
+                    Rational(-13811791, 3779136),
+                    Rational(0, 1),
+                    Rational(-9999395, 419904),
+                    Rational(0, 1),
+                    Rational(6376601, 124416),
+                    Rational(0, 1),
+                    Rational(-3668315, 82944),
+                    Rational(0, 1),
+                    Rational(2097089, 147456)
+                )
+            ),
+            ListRationalFunction(
+                ListPolynomial(
+                    Rational(1, 1),
+                    Rational(0),
+                    Rational(0),
+                    Rational(-8, 8)
+                ),
+                ListPolynomial(
+                    Rational(-14, 8),
+                    Rational(0),
+                    Rational(0),
+                    Rational(0),
+                    Rational(8, 9)
+                )
+            ).substitute(RationalField,
+                ListRationalFunction(
+                    ListPolynomial(
+                        Rational(14, 9),
+                        Rational(0),
+                        Rational(-14, 7)
+                    ),
+                    ListPolynomial(
+                        Rational(-6, 4),
+                        Rational(0),
+                        Rational(1, 8)
+                    )
+                )
+            ),
+            "test 5"
+        )
+    }
+    @Test
+    fun test_Polynomial_derivative() {
+        assertEquals(
+            ListPolynomial(Rational(-2), Rational(2)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).derivative(RationalField),
+            "test 1"
+        )
+        assertEquals(
+            ListPolynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
+            "test 2"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
+            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
+            "test 3"
+        )
+        assertEquals(
+            ListPolynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(0)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).derivative(RationalField),
+            "test 4"
+        )
+    }
+    @Test
+    fun test_Polynomial_nthDerivative() {
+        assertEquals(
+            ListPolynomial(Rational(-2), Rational(2)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 1),
+            "test 1"
+        )
+        assertFailsWithTypeAndMessage<IllegalArgumentException>(
+            "Order of derivative must be non-negative",
+            "test2"
+        ) {
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, -1)
+        }
+        assertEquals(
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 0),
+            "test 3"
+        )
+        assertEquals(
+            ListPolynomial(Rational(2)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 2),
+            "test 4"
+        )
+        assertEquals(
+            ListPolynomial(),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 3),
+            "test 5"
+        )
+        assertEquals(
+            ListPolynomial(),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 4),
+            "test 6"
+        )
+        assertEquals(
+            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
+            "test 7"
+        )
+        assertEquals(
+            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
+            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
+            "test 8"
+        )
+        assertEquals(
+            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(0)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthDerivative(RationalField, 2),
+            "test 9"
+        )
+    }
+    @Test
+    fun test_Polynomial_antiderivative() {
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).antiderivative(RationalField),
+            "test 1"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
+            "test 2"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
+            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
+            "test 3"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(0)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).antiderivative(RationalField),
+            "test 4"
+        )
+    }
+    @Test
+    fun test_Polynomial_nthAntiderivative() {
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 1),
+            "test 1"
+        )
+        assertFailsWithTypeAndMessage<IllegalArgumentException>(
+            "Order of antiderivative must be non-negative",
+            "test2"
+        ) {
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, -1)
+        }
+        assertEquals(
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 0),
+            "test 3"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(1, 2), Rational(-1, 3), Rational(1, 12)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 2),
+            "test 4"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(1, 6), Rational(-1, 12), Rational(1, 60)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 3),
+            "test 5"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 24), Rational(-1, 60), Rational(1, 360)),
+            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 4),
+            "test 6"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
+            "test 7"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
+            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
+            "test 8"
+        )
+        assertEquals(
+            ListPolynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28), Rational(0)),
+            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthAntiderivative(RationalField, 2),
+            "test 9"
+        )
+    }
+}
\ No newline at end of file
diff --git a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
similarity index 80%
rename from test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
rename to kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
index afd26dd36..3297733b1 100644
--- a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
@@ -9,4 +9,4 @@ import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asBuffer
 
 
-public fun <T> bufferOf(vararg elements: T): Buffer<T> = elements.asBuffer()
\ No newline at end of file
+fun <T> bufferOf(vararg elements: T): Buffer<T> = elements.asBuffer()
\ No newline at end of file
diff --git a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
similarity index 79%
rename from test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
rename to kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
index 933c4dc4c..5bac4cd73 100644
--- a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
@@ -10,9 +10,9 @@ package space.kscience.kmath.functions.testUtils
 import space.kscience.kmath.operations.Ring
 
 
-public class IntModulo {
-    public val residue: Int
-    public val modulus: Int
+class IntModulo {
+    val residue: Int
+    val modulus: Int
 
     @PublishedApi
     internal constructor(residue: Int, modulus: Int, toCheckInput: Boolean = true) {
@@ -26,16 +26,16 @@ public class IntModulo {
         }
     }
 
-    public constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
+    constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
 
-    public operator fun unaryPlus(): IntModulo = this
-    public operator fun unaryMinus(): IntModulo =
+    operator fun unaryPlus(): IntModulo = this
+    operator fun unaryMinus(): IntModulo =
         IntModulo(
             if (residue == 0) 0 else modulus - residue,
             modulus,
             toCheckInput = false
         )
-    public operator fun plus(other: IntModulo): IntModulo {
+    operator fun plus(other: IntModulo): IntModulo {
         require(modulus == other.modulus) { "can not add two residue different modulo" }
         return IntModulo(
             (residue + other.residue) % modulus,
@@ -43,13 +43,13 @@ public class IntModulo {
             toCheckInput = false
         )
     }
-    public operator fun plus(other: Int): IntModulo =
+    operator fun plus(other: Int): IntModulo =
         IntModulo(
             (residue + other) % modulus,
             modulus,
             toCheckInput = false
         )
-    public operator fun minus(other: IntModulo): IntModulo {
+    operator fun minus(other: IntModulo): IntModulo {
         require(modulus == other.modulus) { "can not subtract two residue different modulo" }
         return IntModulo(
             (residue - other.residue) % modulus,
@@ -57,13 +57,13 @@ public class IntModulo {
             toCheckInput = false
         )
     }
-    public operator fun minus(other: Int): IntModulo =
+    operator fun minus(other: Int): IntModulo =
         IntModulo(
             (residue - other) % modulus,
             modulus,
             toCheckInput = false
         )
-    public operator fun times(other: IntModulo): IntModulo {
+    operator fun times(other: IntModulo): IntModulo {
         require(modulus == other.modulus) { "can not multiply two residue different modulo" }
         return IntModulo(
             (residue * other.residue) % modulus,
@@ -71,13 +71,13 @@ public class IntModulo {
             toCheckInput = false
         )
     }
-    public operator fun times(other: Int): IntModulo =
+    operator fun times(other: Int): IntModulo =
         IntModulo(
             (residue * other) % modulus,
             modulus,
             toCheckInput = false
         )
-    public operator fun div(other: IntModulo): IntModulo {
+    operator fun div(other: IntModulo): IntModulo {
         require(modulus == other.modulus) { "can not divide two residue different modulo" }
         val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other.residue, modulus)
         require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
@@ -87,7 +87,7 @@ public class IntModulo {
             toCheckInput = false
         )
     }
-    public operator fun div(other: Int): IntModulo {
+    operator fun div(other: Int): IntModulo {
         val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other, modulus)
         require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
         return IntModulo(
@@ -108,11 +108,11 @@ public class IntModulo {
 }
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
-public class IntModuloRing : Ring<IntModulo> {
+class IntModuloRing : Ring<IntModulo> {
 
-    public val modulus: Int
+    val modulus: Int
 
-    public constructor(modulus: Int) {
+    constructor(modulus: Int) {
         require(modulus != 0) { "modulus can not be zero" }
         this.modulus = if (modulus < 0) -modulus else modulus
     }
@@ -120,7 +120,7 @@ public class IntModuloRing : Ring<IntModulo> {
     override inline val zero: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
     override inline val one: IntModulo get() = IntModulo(1, modulus, toCheckInput = false)
 
-    public fun number(arg: Int): IntModulo = IntModulo(arg, modulus, toCheckInput = false)
+    fun number(arg: Int): IntModulo = IntModulo(arg, modulus, toCheckInput = false)
 
     override inline fun add(left: IntModulo, right: IntModulo): IntModulo = left + right
     override inline fun multiply(left: IntModulo, right: IntModulo): IntModulo = left * right
@@ -129,5 +129,5 @@ public class IntModuloRing : Ring<IntModulo> {
     override inline fun IntModulo.plus(arg: IntModulo): IntModulo = this + arg
     override inline fun IntModulo.minus(arg: IntModulo): IntModulo = this - arg
     override inline fun IntModulo.times(arg: IntModulo): IntModulo = this * arg
-    public inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
+    inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
 }
\ No newline at end of file
diff --git a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
similarity index 53%
rename from test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
rename to kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
index 32ca1c3aa..33fd03aa0 100644
--- a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
@@ -6,15 +6,14 @@
 package space.kscience.kmath.functions.testUtils
 
 import space.kscience.kmath.functions.ListPolynomial
-import space.kscience.kmath.functions.Polynomial
 import space.kscience.kmath.functions.ListPolynomialSpace
 import space.kscience.kmath.functions.PolynomialSpaceOverRing
 
 
-public fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
+fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
     ListPolynomial(coefs.map { IntModulo(it, ring.modulus) })
-public fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
+fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
     ListPolynomial(coefs.map { IntModulo(it, modulus) })
 
-public fun IntModuloRing.m(arg: Int): IntModulo = IntModulo(arg, modulus)
-public fun PolynomialSpaceOverRing<IntModulo, *, IntModuloRing>.m(arg: Int): IntModulo = IntModulo(arg, ring.modulus)
\ No newline at end of file
+fun IntModuloRing.m(arg: Int): IntModulo = IntModulo(arg, modulus)
+fun PolynomialSpaceOverRing<IntModulo, *, IntModuloRing>.m(arg: Int): IntModulo = IntModulo(arg, ring.modulus)
\ No newline at end of file
diff --git a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt
similarity index 100%
rename from test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt
rename to kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt
diff --git a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
similarity index 78%
rename from test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
rename to kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
index 27b0eb21e..19cb77df5 100644
--- a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
@@ -12,14 +12,14 @@ import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.NumbersAddOps
 
 @Suppress("NAME_SHADOWING")
-public class Rational {
-    public companion object {
-        public val ZERO: Rational = Rational(0L)
-        public val ONE: Rational = Rational(1L)
+class Rational {
+    companion object {
+        val ZERO: Rational = Rational(0L)
+        val ONE: Rational = Rational(1L)
     }
 
-    public val numerator: Long
-    public val denominator: Long
+    val numerator: Long
+    val denominator: Long
 
     internal constructor(numerator: Long, denominator: Long, toCheckInput: Boolean = true) {
         if (toCheckInput) {
@@ -35,16 +35,16 @@ public class Rational {
         }
     }
 
-    public constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
-    public constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
-    public constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
-    public constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
-    public constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
-    public constructor(numerator: Long) : this(numerator, 1L, false)
+    constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
+    constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
+    constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
+    constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
+    constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
+    constructor(numerator: Long) : this(numerator, 1L, false)
 
-    public operator fun unaryPlus(): Rational = this
-    public operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
-    public operator fun plus(other: Rational): Rational {
+    operator fun unaryPlus(): Rational = this
+    operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
+    operator fun plus(other: Rational): Rational {
         val denominatorsGcd = gcd(denominator, other.denominator)
         val dividedThisDenominator = denominator / denominatorsGcd
         val dividedOtherDenominator = other.denominator / denominatorsGcd
@@ -56,19 +56,19 @@ public class Rational {
             toCheckInput = false
         )
     }
-    public operator fun plus(other: Int): Rational =
+    operator fun plus(other: Int): Rational =
         Rational(
             numerator + denominator * other.toLong(),
             denominator,
             toCheckInput = false
         )
-    public operator fun plus(other: Long): Rational =
+    operator fun plus(other: Long): Rational =
         Rational(
             numerator + denominator * other,
             denominator,
             toCheckInput = false
         )
-    public operator fun minus(other: Rational): Rational {
+    operator fun minus(other: Rational): Rational {
         val denominatorsGcd = gcd(denominator, other.denominator)
         val dividedThisDenominator = denominator / denominatorsGcd
         val dividedOtherDenominator = other.denominator / denominatorsGcd
@@ -80,19 +80,19 @@ public class Rational {
             toCheckInput = false
         )
     }
-    public operator fun minus(other: Int): Rational =
+    operator fun minus(other: Int): Rational =
         Rational(
             numerator - denominator * other.toLong(),
             denominator,
             toCheckInput = false
         )
-    public operator fun minus(other: Long): Rational =
+    operator fun minus(other: Long): Rational =
         Rational(
             numerator - denominator * other,
             denominator,
             toCheckInput = false
         )
-    public operator fun times(other: Rational): Rational {
+    operator fun times(other: Rational): Rational {
         val thisDenominatorAndOtherNumeratorGcd = gcd(denominator, other.numerator)
         val otherDenominatorAndThisNumeratorGcd = gcd(other.denominator, numerator)
         return Rational(
@@ -101,7 +101,7 @@ public class Rational {
             toCheckInput = false
         )
     }
-    public operator fun times(other: Int): Rational {
+    operator fun times(other: Int): Rational {
         val other = other.toLong()
         val denominatorAndOtherGcd = gcd(denominator, other)
         return Rational(
@@ -110,7 +110,7 @@ public class Rational {
             toCheckInput = false
         )
     }
-    public operator fun times(other: Long): Rational {
+    operator fun times(other: Long): Rational {
         val denominatorAndOtherGcd = gcd(denominator, other)
         return Rational(
             numerator * (other / denominatorAndOtherGcd),
@@ -118,7 +118,7 @@ public class Rational {
             toCheckInput = false
         )
     }
-    public operator fun div(other: Rational): Rational {
+    operator fun div(other: Rational): Rational {
         val denominatorsGcd = gcd(denominator, other.denominator)
         val numeratorsGcd = gcd(numerator, other.numerator)
         return Rational(
@@ -126,7 +126,7 @@ public class Rational {
             (denominator / denominatorsGcd) * (other.numerator / numeratorsGcd)
         )
     }
-    public operator fun div(other: Int): Rational {
+    operator fun div(other: Int): Rational {
         val other = other.toLong()
         val numeratorAndOtherGcd = gcd(numerator, other)
         return Rational(
@@ -135,7 +135,7 @@ public class Rational {
             toCheckInput = false
         )
     }
-    public operator fun div(other: Long): Rational {
+    operator fun div(other: Long): Rational {
         val numeratorAndOtherGcd = gcd(numerator, other)
         return Rational(
             numerator / numeratorAndOtherGcd,
@@ -158,7 +158,7 @@ public class Rational {
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
 @OptIn(UnstableKMathAPI::class)
-public object RationalField : Field<Rational>, NumbersAddOps<Rational> {
+object RationalField : Field<Rational>, NumbersAddOps<Rational> {
     override inline val zero: Rational get() = Rational.ZERO
     override inline val one: Rational get() = Rational.ONE
 
diff --git a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
similarity index 92%
rename from test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
rename to kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
index 5d0b77aa8..4ef87f736 100644
--- a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
@@ -13,7 +13,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
 
-public fun <T> assertContentEquals(
+fun <T> assertContentEquals(
     expected: Map<T, Double>,
     actual: Map<T, Double>,
     absoluteTolerance: Double,
@@ -23,7 +23,7 @@ public fun <T> assertContentEquals(
     for ((key, expectedValue) in expected) assertEquals(expectedValue, actual[key]!!, absoluteTolerance, message)
 }
 
-public fun assertEquals(
+fun assertEquals(
     expected: NumberedPolynomial<Double>,
     actual: NumberedPolynomial<Double>,
     absoluteTolerance: Double,
@@ -37,7 +37,7 @@ public fun assertEquals(
     )
 }
 
-public fun assertEquals(
+fun assertEquals(
     expected: LabeledPolynomial<Double>,
     actual: LabeledPolynomial<Double>,
     absoluteTolerance: Double,
@@ -51,7 +51,7 @@ public fun assertEquals(
     )
 }
 
-public fun assertEquals(
+fun assertEquals(
     expected: NumberedRationalFunction<Double>,
     actual: NumberedRationalFunction<Double>,
     absoluteTolerance: Double,
@@ -71,7 +71,7 @@ public fun assertEquals(
     )
 }
 
-public fun assertEquals(
+fun assertEquals(
     expected: LabeledRationalFunction<Double>,
     actual: LabeledRationalFunction<Double>,
     absoluteTolerance: Double,
@@ -91,7 +91,7 @@ public fun assertEquals(
     )
 }
 
-public inline fun <reified T : Throwable> assertFailsWithTypeAndMessage(
+inline fun <reified T : Throwable> assertFailsWithTypeAndMessage(
     expectedMessage: String? = null,
     assertionMessage: String? = null,
     block: () -> Unit
diff --git a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
similarity index 58%
rename from test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
rename to kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
index 051fc0f37..93c3f8ea5 100644
--- a/test-utils-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
@@ -9,11 +9,11 @@ import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.symbol
 
 
-public val o: Rational = Rational(0)
+val o: Rational = Rational(0)
 
-public val x: Symbol by symbol
-public val y: Symbol by symbol
-public val z: Symbol by symbol
-public val t: Symbol by symbol
-public val s: Symbol by symbol
-public val iota: Symbol by symbol
\ No newline at end of file
+val x: Symbol by symbol
+val y: Symbol by symbol
+val z: Symbol by symbol
+val t: Symbol by symbol
+val s: Symbol by symbol
+val iota: Symbol by symbol
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bdd83d04e..336e1c36b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,9 +26,7 @@ include(
     ":kmath-core",
     ":kmath-coroutines",
     ":kmath-functions",
-    ":test-utils-functions",
     ":kmath-polynomial",
-    ":test-utils-polynomial",
     ":kmath-histograms",
     ":kmath-commons",
     ":kmath-viktor",
diff --git a/test-utils-functions/build.gradle.kts b/test-utils-functions/build.gradle.kts
deleted file mode 100644
index 8476abecc..000000000
--- a/test-utils-functions/build.gradle.kts
+++ /dev/null
@@ -1,14 +0,0 @@
-plugins {
-    id("ru.mipt.npm.gradle.mpp")
-    id("ru.mipt.npm.gradle.native")
-}
-
-kotlin.sourceSets {
-    commonMain {
-        dependencies {
-            api(projects.kmathCore)
-            api(projects.kmathFunctions)
-            api(kotlin("test"))
-        }
-    }
-}
diff --git a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt b/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
deleted file mode 100644
index 5cf82996f..000000000
--- a/test-utils-functions/src/commonMain/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions.testUtils
-
-import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
-
-
-public inline fun <reified T : Throwable> assertFailsWithTypeAndMessage(
-    expectedMessage: String? = null,
-    assertionMessage: String? = null,
-    block: () -> Unit
-) {
-    assertEquals(
-        expectedMessage,
-        assertFailsWith(T::class, assertionMessage, block).message,
-        assertionMessage
-    )
-}
\ No newline at end of file
diff --git a/test-utils-polynomial/build.gradle.kts b/test-utils-polynomial/build.gradle.kts
deleted file mode 100644
index e10e1f2b1..000000000
--- a/test-utils-polynomial/build.gradle.kts
+++ /dev/null
@@ -1,14 +0,0 @@
-plugins {
-    id("ru.mipt.npm.gradle.mpp")
-    id("ru.mipt.npm.gradle.native")
-}
-
-kotlin.sourceSets {
-    commonMain {
-        dependencies {
-            api(projects.kmathCore)
-            api(projects.kmathPolynomial)
-            api(kotlin("test"))
-        }
-    }
-}
-- 
2.34.1


From 99c7174802e263d1961322a658d85b5e0da9d0a4 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 16 Jul 2022 20:55:10 +0300
Subject: [PATCH 585/713] Turn Polynomial data class back.

---
 .../kotlin/space/kscience/kmath/functions/Polynomial.kt       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 1e811d3ba..b57697dd9 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -10,7 +10,6 @@ package space.kscience.kmath.functions
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
-import kotlin.jvm.JvmInline
 import kotlin.math.max
 import kotlin.math.min
 
@@ -20,8 +19,7 @@ import kotlin.math.min
  *
  * @param C the type of constants.
  */
-@JvmInline
-public value class Polynomial<C>(
+public data class Polynomial<out C>(
     /**
      * List that contains coefficients of the polynomial.
      *
-- 
2.34.1


From 2d86cf1cc7e6294185038b2b34fc08c7bd17b040 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 16 Jul 2022 21:55:35 +0300
Subject: [PATCH 586/713] Remove power overriding and algebraic stub.

---
 .../kscience/kmath/functions/Polynomial.kt    |   4 -
 .../kscience/kmath/functions/algebraicStub.kt |  51 -------
 .../kmath/functions/AlgebraicStubTest.kt      | 129 ------------------
 3 files changed, 184 deletions(-)
 delete mode 100644 kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
 delete mode 100644 kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index b57697dd9..9275ff8eb 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -247,10 +247,6 @@ public open class PolynomialSpace<C, A>(
             )
         }
     }
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */ // TODO: To optimize boxing
-    override fun power(arg: Polynomial<C>, exponent: UInt): Polynomial<C> = exponentiateBySquaring(arg, exponent)
 
     /**
      * Instance of zero polynomial (zero of the polynomial ring).
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
deleted file mode 100644
index 5eb1af4dc..000000000
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.*
-
-
-// TODO: All of this should be moved to algebraic structures' place for utilities
-// FIXME: Move receiver to context receiver
-/**
- * Raises [arg] to the integer power [exponent].
- *
- * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
- *
- * @param arg the base of the power.
- * @param exponent the exponent of the power.
- * @return [arg] raised to the power [exponent].
- * @author Gleb Minaev
- */
-internal tailrec fun <C> Ring<C>.exponentiateBySquaring(arg: C, exponent: UInt): C =
-    when {
-        exponent == 0u -> zero
-        exponent == 1u -> arg
-        exponent and 1u == 0u -> exponentiateBySquaring(arg * arg, exponent shr 1)
-        exponent and 1u == 1u -> multiplyExponentiatedBySquaring(arg, arg * arg, exponent shr 1)
-        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
-    }
-
-// FIXME: Move receiver to context receiver
-/**
- * Multiplies [base] and [arg] raised to the integer power [exponent].
- *
- * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
- *
- * @param base the multiplicand.
- * @param arg the base of the power.
- * @param exponent the exponent of the power.
- * @return product of [base] and [arg] raised to the power [exponent].
- * @author Gleb Minaev
- */
-internal tailrec fun <C> RingOps<C>.multiplyExponentiatedBySquaring(base: C, arg: C, exponent: UInt): C =
-    when {
-        exponent == 0u -> base
-        exponent == 1u -> base * arg
-        exponent and 1u == 0u -> multiplyExponentiatedBySquaring(base, arg * arg, exponent shr 1)
-        exponent and 1u == 1u -> multiplyExponentiatedBySquaring(base * arg, arg * arg, exponent shr 1)
-        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
-    }
\ No newline at end of file
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
deleted file mode 100644
index 5782292b1..000000000
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.operations.Field
-import kotlin.jvm.JvmInline
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-@JvmInline
-value class Expr(val expr: String)
-
-object ExprRing : Field<Expr> {
-    override fun Expr.unaryMinus(): Expr = Expr("-${expr}")
-    override fun add(left: Expr, right: Expr): Expr = Expr("(${left.expr} + ${right.expr})")
-    override fun multiply(left: Expr, right: Expr): Expr = Expr("(${left.expr} * ${right.expr})")
-    override val zero: Expr = Expr("0")
-    override val one: Expr = Expr("1")
-    override fun divide(left: Expr, right: Expr): Expr = Expr("(${left.expr} / ${right.expr})")
-    override fun scale(a: Expr, value: Double): Expr = Expr("(${a.expr} / $value)")
-}
-
-class AlgebraicStubTest {
-    @Test
-    fun test_multiplyExponentiationBySquaring_for_UInt() {
-        ExprRing {
-            assertEquals(
-                "57",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 0u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 0u)"
-            )
-            assertEquals(
-                "(57 * 179)",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 1u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 1u)"
-            )
-            assertEquals(
-                "(57 * (179 * 179))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 2u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 2u)"
-            )
-            assertEquals(
-                "((57 * 179) * (179 * 179))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 3u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 3u)"
-            )
-            assertEquals(
-                "(57 * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 4u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 4u)"
-            )
-            assertEquals(
-                "((57 * 179) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 5u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 5u)"
-            )
-            assertEquals(
-                "((57 * (179 * 179)) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 6u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 6u)"
-            )
-            assertEquals(
-                "(((57 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 7u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 7u)"
-            )
-            assertEquals(
-                "(57 * (((179 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 8u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 8u)"
-            )
-        }
-    }
-    @Test
-    fun test_exponentiationBySquaring_for_UInt() {
-        ExprRing {
-            assertEquals(
-                "0",
-                exponentiateBySquaring(Expr("57"), 0u).expr,
-                "tried exponentiationBySquaring(57, 0u)"
-            )
-            assertEquals(
-                "57",
-                exponentiateBySquaring(Expr("57"), 1u).expr,
-                "tried exponentiationBySquaring(57, 1u)"
-            )
-            assertEquals(
-                "(57 * 57)",
-                exponentiateBySquaring(Expr("57"), 2u).expr,
-                "tried exponentiationBySquaring(57, 2u)"
-            )
-            assertEquals(
-                "(57 * (57 * 57))",
-                exponentiateBySquaring(Expr("57"), 3u).expr,
-                "tried exponentiationBySquaring(57, 3u)"
-            )
-            assertEquals(
-                "((57 * 57) * (57 * 57))",
-                exponentiateBySquaring(Expr("57"), 4u).expr,
-                "tried exponentiationBySquaring(57, 4u)"
-            )
-            assertEquals(
-                "(57 * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 5u).expr,
-                "tried exponentiationBySquaring(57, 5u)"
-            )
-            assertEquals(
-                "((57 * 57) * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 6u).expr,
-                "tried exponentiationBySquaring(57, 6u)"
-            )
-            assertEquals(
-                "((57 * (57 * 57)) * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 7u).expr,
-                "tried exponentiationBySquaring(57, 7u)"
-            )
-            assertEquals(
-                "(((57 * 57) * (57 * 57)) * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 8u).expr,
-                "tried exponentiationBySquaring(57, 8u)"
-            )
-        }
-    }
-}
\ No newline at end of file
-- 
2.34.1


From f48e4483cc282730f6d7b6e9bddbb47046360682 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 16 Jul 2022 22:21:13 +0300
Subject: [PATCH 587/713] Last cosmetic changes.

---
 .../kscience/kmath/functions/Polynomial.kt    | 81 +++++++++----------
 .../kmath/functions/polynomialUtil.kt         |  4 +-
 2 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 9275ff8eb..1f9bab52c 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -50,7 +50,7 @@ public data class Polynomial<out C>(
      */
     public val coefficients: List<C>
 ) {
-    override fun toString(): String = "ListPolynomial$coefficients"
+    override fun toString(): String = "Polynomial$coefficients"
 }
 
 /**
@@ -63,7 +63,7 @@ public data class Polynomial<out C>(
  */
 public open class PolynomialSpace<C, A>(
     /**
-     * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
+     * Underlying ring of constants. Its operations on constants are used by local operations on constants and polynomials.
      */
     public val ring: A,
 ) : Ring<Polynomial<C>>, ScaleOperations<Polynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
@@ -191,61 +191,54 @@ public open class PolynomialSpace<C, A>(
     /**
      * Returns negation of the polynomial.
      */
-    public override operator fun Polynomial<C>.unaryMinus(): Polynomial<C> =
-        with(ring) {
-            Polynomial(coefficients.map { -it })
-        }
+    public override operator fun Polynomial<C>.unaryMinus(): Polynomial<C> = ring {
+        Polynomial(coefficients.map { -it })
+    }
     /**
      * Returns sum of the polynomials.
      */
-    public override operator fun Polynomial<C>.plus(other: Polynomial<C>): Polynomial<C> {
-        with(ring) {
-            val thisDegree = degree
-            val otherDegree = other.degree
-            return Polynomial(
-                List(max(thisDegree, otherDegree) + 1) {
-                    when {
-                        it > thisDegree -> other.coefficients[it]
-                        it > otherDegree -> coefficients[it]
-                        else -> coefficients[it] + other.coefficients[it]
-                    }
+    public override operator fun Polynomial<C>.plus(other: Polynomial<C>): Polynomial<C> = ring {
+        val thisDegree = degree
+        val otherDegree = other.degree
+        return Polynomial(
+            List(max(thisDegree, otherDegree) + 1) {
+                when {
+                    it > thisDegree -> other.coefficients[it]
+                    it > otherDegree -> coefficients[it]
+                    else -> coefficients[it] + other.coefficients[it]
                 }
-            )
-        }
+            }
+        )
     }
     /**
      * Returns difference of the polynomials.
      */
-    public override operator fun Polynomial<C>.minus(other: Polynomial<C>): Polynomial<C> {
-        with(ring) {
-            val thisDegree = degree
-            val otherDegree = other.degree
-            return Polynomial(
-                List(max(thisDegree, otherDegree) + 1) {
-                    when {
-                        it > thisDegree -> -other.coefficients[it]
-                        it > otherDegree -> coefficients[it]
-                        else -> coefficients[it] - other.coefficients[it]
-                    }
+    public override operator fun Polynomial<C>.minus(other: Polynomial<C>): Polynomial<C> = ring {
+        val thisDegree = degree
+        val otherDegree = other.degree
+        return Polynomial(
+            List(max(thisDegree, otherDegree) + 1) {
+                when {
+                    it > thisDegree -> -other.coefficients[it]
+                    it > otherDegree -> coefficients[it]
+                    else -> coefficients[it] - other.coefficients[it]
                 }
-            )
-        }
+            }
+        )
     }
     /**
      * Returns product of the polynomials.
      */
-    public override operator fun Polynomial<C>.times(other: Polynomial<C>): Polynomial<C> {
-        with(ring) {
-            val thisDegree = degree
-            val otherDegree = other.degree
-            return Polynomial(
-                List(thisDegree + otherDegree + 1) { d ->
-                    (max(0, d - otherDegree)..min(thisDegree, d))
-                        .map { coefficients[it] * other.coefficients[d - it] }
-                        .reduce { acc, rational -> acc + rational }
-                }
-            )
-        }
+    public override operator fun Polynomial<C>.times(other: Polynomial<C>): Polynomial<C> = ring {
+        val thisDegree = degree
+        val otherDegree = other.degree
+        return Polynomial(
+            List(thisDegree + otherDegree + 1) { d ->
+                (max(0, d - otherDegree)..min(thisDegree, d))
+                    .map { coefficients[it] * other.coefficients[d - it] }
+                    .reduce { acc, rational -> acc + rational }
+            }
+        )
     }
 
     /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index f745bf6e4..c9377a6c1 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -91,7 +91,7 @@ public fun <C, A> Polynomial<C>.integrate(
 public fun <C : Comparable<C>> Polynomial<C>.integrate(
     ring: Field<C>,
     range: ClosedRange<C>,
-): C {
+): C = ring {
     val antiderivative = integrate(ring)
-    return ring { antiderivative.value(ring, range.endInclusive) - antiderivative.value(ring, range.start) }
+    return antiderivative.value(ring, range.endInclusive) - antiderivative.value(ring, range.start)
 }
\ No newline at end of file
-- 
2.34.1


From 7de157ce24da9346f323c3226ce93d0355d996bf Mon Sep 17 00:00:00 2001
From: Erik Schouten <Erik@ErikSchouten.com>
Date: Sun, 17 Jul 2022 14:21:12 +0200
Subject: [PATCH 588/713] Re-introduce line/straight segment, rename components
 to start/end

---
 .../trajectory/dubins/DubinsPathFactory.kt    | 124 +++++++++---------
 .../kscience/kmath/trajectory/segments/Arc.kt |  12 +-
 .../kmath/trajectory/segments/Line.kt         |  23 ----
 .../kmath/trajectory/segments/Straight.kt     |  18 +++
 .../space/kscience/kmath/trajectory/Math.kt   |  13 +-
 .../kmath/trajectory/dubins/DubinsTests.kt    |  20 ++-
 .../kmath/trajectory/segments/LineTests.kt    |  15 +--
 7 files changed, 106 insertions(+), 119 deletions(-)
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Straight.kt

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
index 91287b952..04c639576 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
@@ -6,21 +6,18 @@
 package space.kscience.kmath.trajectory.dubins
 
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.geometry.Line2D
 import space.kscience.kmath.geometry.Vector2D
-import space.kscience.kmath.trajectory.segments.Arc
-import space.kscience.kmath.trajectory.segments.LineSegment
+import space.kscience.kmath.trajectory.segments.*
 import space.kscience.kmath.trajectory.segments.components.Circle
 import space.kscience.kmath.trajectory.segments.components.Pose2D
-import space.kscience.kmath.trajectory.segments.length
-import space.kscience.kmath.trajectory.segments.theta
+import kotlin.math.PI
 import kotlin.math.acos
 import kotlin.math.cos
 import kotlin.math.sin
 
 public class DubinsPathFactory(
-    private val base: Pose2D,
-    private val direction: Pose2D,
+    private val start: Pose2D,
+    private val end: Pose2D,
     private val turningRadius: Double
 ) {
 
@@ -30,9 +27,9 @@ public class DubinsPathFactory(
 
     public val rlr: DubinsPath?
         get() {
-            val c1 = base.getRightCircle(turningRadius)
-            val c2 = direction.getRightCircle(turningRadius)
-            val centers = Line2D(c1.center, c2.center)
+            val c1 = start.getRightCircle(turningRadius)
+            val c2 = end.getRightCircle(turningRadius)
+            val centers = Straight(c1.center, c2.center)
             if (centers.length > turningRadius * 4) return null
 
             var theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
@@ -45,17 +42,17 @@ public class DubinsPathFactory(
             dX = turningRadius * sin(theta)
             dY = turningRadius * cos(theta)
             val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-            val a1 = Arc(c1.center, base, p1, Arc.Direction.RIGHT)
+            val a1 = Arc(c1.center, start, p1, Arc.Direction.RIGHT)
             val a2 = Arc(e.center, p1, p2, Arc.Direction.LEFT)
-            val a3 = Arc(c2.center, p2, direction, Arc.Direction.RIGHT)
+            val a3 = Arc(c2.center, p2, end, Arc.Direction.RIGHT)
             return DubinsPath(a1, a2, a3)
         }
 
     private val lrl: DubinsPath?
         get() {
-            val c1 = base.getLeftCircle(turningRadius)
-            val c2 = direction.getLeftCircle(turningRadius)
-            val centers = Line2D(c1.center, c2.center)
+            val c1 = start.getLeftCircle(turningRadius)
+            val c2 = end.getLeftCircle(turningRadius)
+            val centers = Straight(c1.center, c2.center)
             if (centers.length > turningRadius * 4) return null
 
             var theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
@@ -68,54 +65,54 @@ public class DubinsPathFactory(
             dX = turningRadius * sin(theta)
             dY = turningRadius * cos(theta)
             val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-            val a1 = Arc(c1.center, base, p1, Arc.Direction.LEFT)
+            val a1 = Arc(c1.center, start, p1, Arc.Direction.LEFT)
             val a2 = Arc(e.center, p1, p2, Arc.Direction.RIGHT)
-            val a3 = Arc(c2.center, p2, direction, Arc.Direction.LEFT)
+            val a3 = Arc(c2.center, p2, end, Arc.Direction.LEFT)
             return DubinsPath(a1, a2, a3)
         }
 
     public val rsr: DubinsPath
         get() {
-            val c1 = base.getRightCircle(turningRadius)
-            val c2 = direction.getRightCircle(turningRadius)
-            val l = leftOuterTangent(c1, c2)
-            val a1 = Arc(c1.center, base, l.base, Arc.Direction.RIGHT)
-            val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.RIGHT)
-            return DubinsPath(a1, LineSegment(l), a3)
+            val c1 = start.getRightCircle(turningRadius)
+            val c2 = end.getRightCircle(turningRadius)
+            val s = leftOuterTangent(c1, c2)
+            val a1 = Arc(c1.center, start, s.start, Arc.Direction.RIGHT)
+            val a3 = Arc(c2.center, s.end, end, Arc.Direction.RIGHT)
+            return DubinsPath(a1, s, a3)
         }
 
     public val lsl: DubinsPath
         get() {
-            val c1 = base.getLeftCircle(turningRadius)
-            val c2 = direction.getLeftCircle(turningRadius)
-            val l = rightOuterTangent(c1, c2)
-            val a1 = Arc(c1.center, base, l.base, Arc.Direction.LEFT)
-            val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.LEFT)
-            return DubinsPath(a1, LineSegment(l), a3)
+            val c1 = start.getLeftCircle(turningRadius)
+            val c2 = end.getLeftCircle(turningRadius)
+            val s = rightOuterTangent(c1, c2)
+            val a1 = Arc(c1.center, start, s.start, Arc.Direction.LEFT)
+            val a3 = Arc(c2.center, s.end, end, Arc.Direction.LEFT)
+            return DubinsPath(a1, s, a3)
         }
 
     public val rsl: DubinsPath?
         get() {
-            val c1 = base.getRightCircle(turningRadius)
-            val c2 = direction.getLeftCircle(turningRadius)
-            val l = rightInnerTangent(c1, c2)
-            if (c1.center.distanceTo(c2.center) < turningRadius * 2 || l == null) return null
+            val c1 = start.getRightCircle(turningRadius)
+            val c2 = end.getLeftCircle(turningRadius)
+            val s = rightInnerTangent(c1, c2)
+            if (c1.center.distanceTo(c2.center) < turningRadius * 2 || s == null) return null
 
-            val a1 = Arc(c1.center, base, l.base, Arc.Direction.RIGHT)
-            val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.LEFT)
-            return DubinsPath(a1, LineSegment(l), a3)
+            val a1 = Arc(c1.center, start, s.start, Arc.Direction.RIGHT)
+            val a3 = Arc(c2.center, s.end, end, Arc.Direction.LEFT)
+            return DubinsPath(a1, s, a3)
         }
 
     public val lsr: DubinsPath?
         get() {
-            val c1 = base.getLeftCircle(turningRadius)
-            val c2 = direction.getRightCircle(turningRadius)
-            val l = leftInnerTangent(c1, c2)
-            if (c1.center.distanceTo(c2.center) < turningRadius * 2 || l == null) return null
+            val c1 = start.getLeftCircle(turningRadius)
+            val c2 = end.getRightCircle(turningRadius)
+            val s = leftInnerTangent(c1, c2)
+            if (c1.center.distanceTo(c2.center) < turningRadius * 2 || s == null) return null
 
-            val a1 = Arc(c1.center, base, l.base, Arc.Direction.LEFT)
-            val a3 = Arc(c2.center, l.direction, direction, Arc.Direction.RIGHT)
-            return DubinsPath(a1, LineSegment(l), a3)
+            val a1 = Arc(c1.center, start, s.start, Arc.Direction.LEFT)
+            val a3 = Arc(c2.center, s.end, end, Arc.Direction.RIGHT)
+            return DubinsPath(a1, s, a3)
         }
 }
 
@@ -133,8 +130,8 @@ private fun Pose2D.getTangentCircles(radius: Double): Pair<Circle, Circle> {
 
 private fun leftOuterTangent(a: Circle, b: Circle) = outerTangent(a, b, SIDE.LEFT)
 private fun rightOuterTangent(a: Circle, b: Circle) = outerTangent(a, b, SIDE.RIGHT)
-private fun outerTangent(a: Circle, b: Circle, side: SIDE): Line2D {
-    val centers = Line2D(a.center, b.center)
+private fun outerTangent(a: Circle, b: Circle, side: SIDE): Straight {
+    val centers = Straight(a.center, b.center)
     val p1 = when (side) {
         SIDE.LEFT -> Vector2D(
             a.center.x - a.radius * cos(centers.theta),
@@ -145,29 +142,28 @@ private fun outerTangent(a: Circle, b: Circle, side: SIDE): Line2D {
             a.center.y - a.radius * sin(centers.theta)
         )
     }
-    return Line2D(
+    return Straight(
         p1,
-        Vector2D(p1.x + (centers.direction.x - centers.base.x), p1.y + (centers.direction.y - centers.base.y))
+        Vector2D(p1.x + (centers.end.x - centers.start.x), p1.y + (centers.end.y - centers.start.y))
     )
 }
 
 private fun leftInnerTangent(base: Circle, direction: Circle) = innerTangent(base, direction, SIDE.LEFT)
 private fun rightInnerTangent(base: Circle, direction: Circle) = innerTangent(base, direction, SIDE.RIGHT)
-private fun innerTangent(base: Circle, direction: Circle, side: SIDE): Line2D? {
-    val centers = Line2D(base.center, direction.center)
-    return if (centers.length > base.radius * 2) {
-        val angle = theta(
-            when (side) {
-                SIDE.LEFT -> centers.theta + acos(base.radius * 2 / centers.length)
-                SIDE.RIGHT -> centers.theta - acos(base.radius * 2 / centers.length)
-            }
-        )
-        val dX = base.radius * sin(angle)
-        val dY = base.radius * cos(angle)
-        val p1 = Vector2D(base.center.x + dX, base.center.y + dY)
-        val p2 = Vector2D(direction.center.x - dX, direction.center.y - dY)
-        Line2D(p1, p2)
-    } else {
-        null
-    }
+private fun innerTangent(base: Circle, direction: Circle, side: SIDE): Straight? {
+    val centers = Straight(base.center, direction.center)
+    if (centers.length < base.radius * 2) return null
+    val angle = theta(
+        when (side) {
+            SIDE.LEFT -> centers.theta + acos(base.radius * 2 / centers.length)
+            SIDE.RIGHT -> centers.theta - acos(base.radius * 2 / centers.length)
+        }
+    )
+    val dX = base.radius * sin(angle)
+    val dY = base.radius * cos(angle)
+    val p1 = Vector2D(base.center.x + dX, base.center.y + dY)
+    val p2 = Vector2D(direction.center.x - dX, direction.center.y - dY)
+    return Straight(p1, p2)
 }
+
+internal fun theta(theta: Double) = (theta + (2 * PI)) % (2 * PI)
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
index b8a81a070..b5e091db7 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
@@ -1,8 +1,8 @@
 package space.kscience.kmath.trajectory.segments
 
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.geometry.Line2D
 import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.trajectory.dubins.theta
 import space.kscience.kmath.trajectory.segments.components.Circle
 import space.kscience.kmath.trajectory.segments.components.Pose2D
 import kotlin.math.PI
@@ -14,11 +14,11 @@ public class Arc(
     internal val direction: Direction
 ) : Circle(center, center.distanceTo(a)), Segment {
 
-    private val l1 = Line2D(center, a)
-    private val l2 = Line2D(center, b)
+    private val s1 = Straight(center, a)
+    private val s2 = Straight(center, b)
 
-    internal val pose1 = calculatePose(a, l1.theta)
-    internal val pose2 = calculatePose(b, l2.theta)
+    internal val pose1 = calculatePose(a, s1.theta)
+    internal val pose2 = calculatePose(b, s2.theta)
     private val angle = calculateAngle()
     override val length: Double = calculateLength()
 
@@ -26,7 +26,7 @@ public class Arc(
         LEFT, RIGHT
     }
 
-    private fun calculateAngle() = theta(if (direction == Direction.LEFT) l1.theta - l2.theta else l2.theta - l1.theta)
+    private fun calculateAngle() = theta(if (direction == Direction.LEFT) s1.theta - s2.theta else s2.theta - s1.theta)
 
     private fun calculateLength(): Double {
         val proportion = angle / (2 * PI)
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt
deleted file mode 100644
index 0e23b27f1..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Line.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package space.kscience.kmath.trajectory.segments
-
-import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.geometry.Line2D
-import space.kscience.kmath.operations.DoubleField.pow
-import kotlin.math.PI
-import kotlin.math.atan2
-import kotlin.math.sqrt
-
-public data class LineSegment(
-    internal val line: Line2D
-) : Segment {
-    override val length: Double
-        get() = line.length
-}
-
-internal val Line2D.theta: Double
-    get() = theta(atan2(direction.x - base.x, direction.y - base.y))
-
-internal val Line2D.length: Double
-    get() = base.distanceTo(direction)
-
-internal fun theta(theta: Double) = (theta + (2 * PI)) % (2 * PI)
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Straight.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Straight.kt
new file mode 100644
index 000000000..444025d83
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Straight.kt
@@ -0,0 +1,18 @@
+package space.kscience.kmath.trajectory.segments
+
+import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
+import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.trajectory.dubins.theta
+import kotlin.math.PI
+import kotlin.math.atan2
+
+public data class Straight(
+    internal val start: Vector2D,
+    internal val end: Vector2D
+) : Segment {
+    override val length: Double
+        get() = start.distanceTo(end)
+
+    internal val theta: Double
+        get() = theta(atan2(end.x - start.x, end.y - start.y))
+}
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
index f52bb56f2..92b2f1df9 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
@@ -1,9 +1,8 @@
 package space.kscience.kmath.trajectory
 
-import space.kscience.kmath.geometry.Line2D
 import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.trajectory.segments.Straight
 import space.kscience.kmath.trajectory.segments.components.Pose2D
-import space.kscience.kmath.trajectory.segments.theta
 import kotlin.math.PI
 import kotlin.math.abs
 import kotlin.math.sin
@@ -15,13 +14,13 @@ fun Double.radiansToDegrees() = this * 180 / PI
 fun Double.equalFloat(other: Double) = abs(this - other) < maxFloatDelta
 fun Pose2D.equalsFloat(other: Pose2D) = x.equalFloat(other.x) && y.equalFloat(other.y) && theta.equalFloat(other.theta)
 
-fun Line2D.inverse() = Line2D(direction, base)
-fun Line2D.shift(shift: Int, width: Double): Line2D {
+fun Straight.inverse() = Straight(end, start)
+fun Straight.shift(shift: Int, width: Double): Straight {
     val dX = width * sin(inverse().theta)
     val dY = width * sin(theta)
 
-    return Line2D(
-        Vector2D(base.x - dX * shift, base.y - dY * shift),
-        Vector2D(direction.x - dX * shift, direction.y - dY * shift)
+    return Straight(
+        Vector2D(start.x - dX * shift, start.y - dY * shift),
+        Vector2D(end.x - dX * shift, end.y - dY * shift)
     )
 }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
index 583e7a4e0..efe35e5d8 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -6,15 +6,13 @@
 package space.kscience.kmath.trajectory.dubins
 
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.geometry.Line2D
 import space.kscience.kmath.geometry.Vector2D
 import space.kscience.kmath.trajectory.segments.Arc
-import space.kscience.kmath.trajectory.segments.LineSegment
 import space.kscience.kmath.trajectory.equalFloat
 import space.kscience.kmath.trajectory.equalsFloat
 import space.kscience.kmath.trajectory.inverse
+import space.kscience.kmath.trajectory.segments.Straight
 import space.kscience.kmath.trajectory.segments.components.Pose2D
-import space.kscience.kmath.trajectory.segments.theta
 import space.kscience.kmath.trajectory.shift
 import kotlin.test.Test
 import kotlin.test.assertNotNull
@@ -25,11 +23,11 @@ class DubinsTests {
 
     @Test
     fun dubinsTest() {
-        val line = Line2D(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
-        val lineP1 = line.shift(1, 10.0).inverse()
+        val straight = Straight(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
+        val lineP1 = straight.shift(1, 10.0).inverse()
 
-        val start = Pose2D(line.direction, line.theta)
-        val end = Pose2D(lineP1.base, lineP1.theta)
+        val start = Pose2D(straight.end, straight.theta)
+        val end = Pose2D(lineP1.start, lineP1.theta)
         val radius = 2.0
         val dubins = DubinsPathFactory(start, end, radius)
 
@@ -58,10 +56,10 @@ class DubinsTests {
                 val b = path.b as Arc
                 assertTrue(path.a.pose2.equalsFloat(b.pose1))
                 assertTrue(path.c.pose1.equalsFloat(b.pose2))
-            } else if (path.b is LineSegment) {
-                val b = (path.b as LineSegment).line
-                assertTrue(path.a.pose2.equalsFloat(Pose2D(b.base, b.theta)))
-                assertTrue(path.c.pose1.equalsFloat(Pose2D(b.direction, b.theta)))
+            } else if (path.b is Straight) {
+                val b = path.b as Straight
+                assertTrue(path.a.pose2.equalsFloat(Pose2D(b.start, b.theta)))
+                assertTrue(path.c.pose1.equalsFloat(Pose2D(b.end, b.theta)))
             }
         }
     }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
index 30f5ef6d8..e8184e178 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
@@ -1,7 +1,6 @@
 package space.kscience.kmath.trajectory.segments
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.geometry.Line2D
 import space.kscience.kmath.geometry.Vector2D
 import space.kscience.kmath.trajectory.radiansToDegrees
 import kotlin.math.pow
@@ -13,21 +12,21 @@ class LineTests {
 
     @Test
     fun lineTest() {
-        val line = Line2D(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
-        assertEquals(sqrt(100.0.pow(2) + 100.0.pow(2)), line.length)
-        assertEquals(45.0, line.theta.radiansToDegrees())
+        val straight = Straight(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
+        assertEquals(sqrt(100.0.pow(2) + 100.0.pow(2)), straight.length)
+        assertEquals(45.0, straight.theta.radiansToDegrees())
     }
 
     @Test
     fun lineAngleTest() {
         val zero = Vector2D(0.0, 0.0)
-        val north = Line2D(Euclidean2DSpace.zero, Vector2D(0.0, 2.0))
+        val north = Straight(Euclidean2DSpace.zero, Vector2D(0.0, 2.0))
         assertEquals(0.0, north.theta.radiansToDegrees())
-        val east = Line2D(Euclidean2DSpace.zero, Vector2D(2.0, 0.0))
+        val east = Straight(Euclidean2DSpace.zero, Vector2D(2.0, 0.0))
         assertEquals(90.0, east.theta.radiansToDegrees())
-        val south = Line2D(Euclidean2DSpace.zero, Vector2D(0.0, -2.0))
+        val south = Straight(Euclidean2DSpace.zero, Vector2D(0.0, -2.0))
         assertEquals(180.0, south.theta.radiansToDegrees())
-        val west = Line2D(Euclidean2DSpace.zero, Vector2D(-2.0, 0.0))
+        val west = Straight(Euclidean2DSpace.zero, Vector2D(-2.0, 0.0))
         assertEquals(270.0, west.theta.radiansToDegrees())
     }
 }
-- 
2.34.1


From 3260c3d17146226f465aa98a5fc6f8a7cb4262cd Mon Sep 17 00:00:00 2001
From: Erik Schouten <Erik@ErikSchouten.com>
Date: Sun, 17 Jul 2022 14:39:43 +0200
Subject: [PATCH 589/713] Pose2D facrtory function

---
 .../space/kscience/kmath/trajectory/segments/Arc.kt  | 12 +++++++-----
 .../kmath/trajectory/segments/components/Pose2D.kt   |  6 +++---
 .../kscience/kmath/trajectory/dubins/DubinsTests.kt  | 10 +++++-----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
index b5e091db7..fe101f359 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
@@ -34,9 +34,11 @@ public class Arc(
     }
 
     private fun calculatePose(vector: Vector2D, theta: Double): Pose2D =
-        if (direction == Direction.LEFT) {
-            Pose2D(vector.x, vector.y, theta(theta - PI / 2))
-        } else {
-            Pose2D(vector.x, vector.y, theta(theta + PI / 2))
-        }
+        Pose2D.of(
+            vector,
+            when (direction) {
+                Direction.LEFT -> theta(theta - PI / 2)
+                Direction.RIGHT -> theta(theta + PI / 2)
+            }
+        )
 }
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt
index d00dfbd96..c49da3187 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt
@@ -1,13 +1,13 @@
 package space.kscience.kmath.trajectory.segments.components
 
 import space.kscience.kmath.geometry.Vector2D
-import kotlin.math.cos
-import kotlin.math.sin
 
 public data class Pose2D(
     override val x: Double,
     override val y: Double,
     public val theta: Double
 ) : Vector2D {
-    internal constructor(vector: Vector2D, theta: Double) : this(vector.x, vector.y, theta)
+    internal companion object {
+        internal fun of(vector: Vector2D, theta: Double) = Pose2D(vector.x, vector.y, theta)
+    }
 }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
index efe35e5d8..025aab2b7 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -7,10 +7,10 @@ package space.kscience.kmath.trajectory.dubins
 
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
 import space.kscience.kmath.geometry.Vector2D
-import space.kscience.kmath.trajectory.segments.Arc
 import space.kscience.kmath.trajectory.equalFloat
 import space.kscience.kmath.trajectory.equalsFloat
 import space.kscience.kmath.trajectory.inverse
+import space.kscience.kmath.trajectory.segments.Arc
 import space.kscience.kmath.trajectory.segments.Straight
 import space.kscience.kmath.trajectory.segments.components.Pose2D
 import space.kscience.kmath.trajectory.shift
@@ -26,8 +26,8 @@ class DubinsTests {
         val straight = Straight(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
         val lineP1 = straight.shift(1, 10.0).inverse()
 
-        val start = Pose2D(straight.end, straight.theta)
-        val end = Pose2D(lineP1.start, lineP1.theta)
+        val start = Pose2D.of(straight.end, straight.theta)
+        val end = Pose2D.of(lineP1.start, lineP1.theta)
         val radius = 2.0
         val dubins = DubinsPathFactory(start, end, radius)
 
@@ -58,8 +58,8 @@ class DubinsTests {
                 assertTrue(path.c.pose1.equalsFloat(b.pose2))
             } else if (path.b is Straight) {
                 val b = path.b as Straight
-                assertTrue(path.a.pose2.equalsFloat(Pose2D(b.start, b.theta)))
-                assertTrue(path.c.pose1.equalsFloat(Pose2D(b.end, b.theta)))
+                assertTrue(path.a.pose2.equalsFloat(Pose2D.of(b.start, b.theta)))
+                assertTrue(path.c.pose1.equalsFloat(Pose2D.of(b.end, b.theta)))
             }
         }
     }
-- 
2.34.1


From 8faa312424f37bf6aa4b6db3c33e166709c346d2 Mon Sep 17 00:00:00 2001
From: Erik Schouten <Erik@ErikSchouten.com>
Date: Sun, 17 Jul 2022 14:56:21 +0200
Subject: [PATCH 590/713] Dubins factory functions

---
 .../kmath/trajectory/dubins/DubinsPath.kt     | 106 +++++++++++
 .../trajectory/dubins/DubinsPathFactory.kt    | 169 ------------------
 .../trajectory/dubins/TrajectoryFunctions.kt  |  67 +++++++
 .../kmath/trajectory/dubins/DubinsTests.kt    |   4 +-
 4 files changed, 175 insertions(+), 171 deletions(-)
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/TrajectoryFunctions.kt

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
index 005d7fd60..ad67fa11d 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
@@ -5,8 +5,16 @@
 
 package space.kscience.kmath.trajectory.dubins
 
+import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
+import space.kscience.kmath.geometry.Vector2D
 import space.kscience.kmath.trajectory.segments.Arc
 import space.kscience.kmath.trajectory.segments.Segment
+import space.kscience.kmath.trajectory.segments.Straight
+import space.kscience.kmath.trajectory.segments.components.Circle
+import space.kscience.kmath.trajectory.segments.components.Pose2D
+import kotlin.math.acos
+import kotlin.math.cos
+import kotlin.math.sin
 
 public class DubinsPath(
     public val a: Arc,
@@ -27,4 +35,102 @@ public class DubinsPath(
     public enum class TYPE {
         RLR, LRL, RSR, LSL, RSL, LSR
     }
+
+    public companion object {
+        public fun all(start: Pose2D, end: Pose2D, turningRadius: Double): List<DubinsPath> =
+            listOfNotNull(
+                rlr(start, end, turningRadius),
+                lrl(start, end, turningRadius),
+                rsr(start, end, turningRadius),
+                lsl(start, end, turningRadius),
+                rsl(start, end, turningRadius),
+                lsr(start, end, turningRadius)
+            )
+        public fun shortest(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath =
+            all(start, end, turningRadius).minByOrNull { it.length }!!
+
+        public fun rlr(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? {
+            val c1 = start.getRightCircle(turningRadius)
+            val c2 = end.getRightCircle(turningRadius)
+            val centers = Straight(c1.center, c2.center)
+            if (centers.length > turningRadius * 4) return null
+
+            var theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
+            var dX = turningRadius * sin(theta)
+            var dY = turningRadius * cos(theta)
+            val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
+            val e = Circle(p, turningRadius)
+            val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
+            theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
+            dX = turningRadius * sin(theta)
+            dY = turningRadius * cos(theta)
+            val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
+            val a1 = Arc(c1.center, start, p1, Arc.Direction.RIGHT)
+            val a2 = Arc(e.center, p1, p2, Arc.Direction.LEFT)
+            val a3 = Arc(c2.center, p2, end, Arc.Direction.RIGHT)
+            return DubinsPath(a1, a2, a3)
+        }
+
+        public fun lrl(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? {
+            val c1 = start.getLeftCircle(turningRadius)
+            val c2 = end.getLeftCircle(turningRadius)
+            val centers = Straight(c1.center, c2.center)
+            if (centers.length > turningRadius * 4) return null
+
+            var theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
+            var dX = turningRadius * sin(theta)
+            var dY = turningRadius * cos(theta)
+            val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
+            val e = Circle(p, turningRadius)
+            val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
+            theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
+            dX = turningRadius * sin(theta)
+            dY = turningRadius * cos(theta)
+            val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
+            val a1 = Arc(c1.center, start, p1, Arc.Direction.LEFT)
+            val a2 = Arc(e.center, p1, p2, Arc.Direction.RIGHT)
+            val a3 = Arc(c2.center, p2, end, Arc.Direction.LEFT)
+            return DubinsPath(a1, a2, a3)
+        }
+
+        public fun rsr(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath {
+            val c1 = start.getRightCircle(turningRadius)
+            val c2 = end.getRightCircle(turningRadius)
+            val s = leftOuterTangent(c1, c2)
+            val a1 = Arc(c1.center, start, s.start, Arc.Direction.RIGHT)
+            val a3 = Arc(c2.center, s.end, end, Arc.Direction.RIGHT)
+            return DubinsPath(a1, s, a3)
+        }
+
+        public fun lsl(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath {
+            val c1 = start.getLeftCircle(turningRadius)
+            val c2 = end.getLeftCircle(turningRadius)
+            val s = rightOuterTangent(c1, c2)
+            val a1 = Arc(c1.center, start, s.start, Arc.Direction.LEFT)
+            val a3 = Arc(c2.center, s.end, end, Arc.Direction.LEFT)
+            return DubinsPath(a1, s, a3)
+        }
+
+        public fun rsl(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? {
+            val c1 = start.getRightCircle(turningRadius)
+            val c2 = end.getLeftCircle(turningRadius)
+            val s = rightInnerTangent(c1, c2)
+            if (c1.center.distanceTo(c2.center) < turningRadius * 2 || s == null) return null
+
+            val a1 = Arc(c1.center, start, s.start, Arc.Direction.RIGHT)
+            val a3 = Arc(c2.center, s.end, end, Arc.Direction.LEFT)
+            return DubinsPath(a1, s, a3)
+        }
+
+        public fun lsr(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? {
+            val c1 = start.getLeftCircle(turningRadius)
+            val c2 = end.getRightCircle(turningRadius)
+            val s = leftInnerTangent(c1, c2)
+            if (c1.center.distanceTo(c2.center) < turningRadius * 2 || s == null) return null
+
+            val a1 = Arc(c1.center, start, s.start, Arc.Direction.LEFT)
+            val a3 = Arc(c2.center, s.end, end, Arc.Direction.RIGHT)
+            return DubinsPath(a1, s, a3)
+        }
+    }
 }
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
deleted file mode 100644
index 04c639576..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPathFactory.kt
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory.dubins
-
-import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.geometry.Vector2D
-import space.kscience.kmath.trajectory.segments.*
-import space.kscience.kmath.trajectory.segments.components.Circle
-import space.kscience.kmath.trajectory.segments.components.Pose2D
-import kotlin.math.PI
-import kotlin.math.acos
-import kotlin.math.cos
-import kotlin.math.sin
-
-public class DubinsPathFactory(
-    private val start: Pose2D,
-    private val end: Pose2D,
-    private val turningRadius: Double
-) {
-
-    public val all: List<DubinsPath> get() = listOfNotNull(rlr, lrl, rsr, lsl, rsl, lsr)
-    public val shortest: DubinsPath get() = all.minByOrNull { it.length }!!
-    public operator fun get(type: DubinsPath.TYPE): DubinsPath? = all.find { it.type == type }
-
-    public val rlr: DubinsPath?
-        get() {
-            val c1 = start.getRightCircle(turningRadius)
-            val c2 = end.getRightCircle(turningRadius)
-            val centers = Straight(c1.center, c2.center)
-            if (centers.length > turningRadius * 4) return null
-
-            var theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
-            var dX = turningRadius * sin(theta)
-            var dY = turningRadius * cos(theta)
-            val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
-            val e = Circle(p, turningRadius)
-            val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
-            theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
-            dX = turningRadius * sin(theta)
-            dY = turningRadius * cos(theta)
-            val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-            val a1 = Arc(c1.center, start, p1, Arc.Direction.RIGHT)
-            val a2 = Arc(e.center, p1, p2, Arc.Direction.LEFT)
-            val a3 = Arc(c2.center, p2, end, Arc.Direction.RIGHT)
-            return DubinsPath(a1, a2, a3)
-        }
-
-    private val lrl: DubinsPath?
-        get() {
-            val c1 = start.getLeftCircle(turningRadius)
-            val c2 = end.getLeftCircle(turningRadius)
-            val centers = Straight(c1.center, c2.center)
-            if (centers.length > turningRadius * 4) return null
-
-            var theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
-            var dX = turningRadius * sin(theta)
-            var dY = turningRadius * cos(theta)
-            val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
-            val e = Circle(p, turningRadius)
-            val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
-            theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
-            dX = turningRadius * sin(theta)
-            dY = turningRadius * cos(theta)
-            val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-            val a1 = Arc(c1.center, start, p1, Arc.Direction.LEFT)
-            val a2 = Arc(e.center, p1, p2, Arc.Direction.RIGHT)
-            val a3 = Arc(c2.center, p2, end, Arc.Direction.LEFT)
-            return DubinsPath(a1, a2, a3)
-        }
-
-    public val rsr: DubinsPath
-        get() {
-            val c1 = start.getRightCircle(turningRadius)
-            val c2 = end.getRightCircle(turningRadius)
-            val s = leftOuterTangent(c1, c2)
-            val a1 = Arc(c1.center, start, s.start, Arc.Direction.RIGHT)
-            val a3 = Arc(c2.center, s.end, end, Arc.Direction.RIGHT)
-            return DubinsPath(a1, s, a3)
-        }
-
-    public val lsl: DubinsPath
-        get() {
-            val c1 = start.getLeftCircle(turningRadius)
-            val c2 = end.getLeftCircle(turningRadius)
-            val s = rightOuterTangent(c1, c2)
-            val a1 = Arc(c1.center, start, s.start, Arc.Direction.LEFT)
-            val a3 = Arc(c2.center, s.end, end, Arc.Direction.LEFT)
-            return DubinsPath(a1, s, a3)
-        }
-
-    public val rsl: DubinsPath?
-        get() {
-            val c1 = start.getRightCircle(turningRadius)
-            val c2 = end.getLeftCircle(turningRadius)
-            val s = rightInnerTangent(c1, c2)
-            if (c1.center.distanceTo(c2.center) < turningRadius * 2 || s == null) return null
-
-            val a1 = Arc(c1.center, start, s.start, Arc.Direction.RIGHT)
-            val a3 = Arc(c2.center, s.end, end, Arc.Direction.LEFT)
-            return DubinsPath(a1, s, a3)
-        }
-
-    public val lsr: DubinsPath?
-        get() {
-            val c1 = start.getLeftCircle(turningRadius)
-            val c2 = end.getRightCircle(turningRadius)
-            val s = leftInnerTangent(c1, c2)
-            if (c1.center.distanceTo(c2.center) < turningRadius * 2 || s == null) return null
-
-            val a1 = Arc(c1.center, start, s.start, Arc.Direction.LEFT)
-            val a3 = Arc(c2.center, s.end, end, Arc.Direction.RIGHT)
-            return DubinsPath(a1, s, a3)
-        }
-}
-
-private enum class SIDE {
-    LEFT, RIGHT
-}
-
-private fun Pose2D.getLeftCircle(radius: Double): Circle = getTangentCircles(radius).first
-private fun Pose2D.getRightCircle(radius: Double): Circle = getTangentCircles(radius).second
-private fun Pose2D.getTangentCircles(radius: Double): Pair<Circle, Circle> {
-    val dX = radius * cos(theta)
-    val dY = radius * sin(theta)
-    return Circle(Vector2D(x - dX, y + dY), radius) to Circle(Vector2D(x + dX, y - dY), radius)
-}
-
-private fun leftOuterTangent(a: Circle, b: Circle) = outerTangent(a, b, SIDE.LEFT)
-private fun rightOuterTangent(a: Circle, b: Circle) = outerTangent(a, b, SIDE.RIGHT)
-private fun outerTangent(a: Circle, b: Circle, side: SIDE): Straight {
-    val centers = Straight(a.center, b.center)
-    val p1 = when (side) {
-        SIDE.LEFT -> Vector2D(
-            a.center.x - a.radius * cos(centers.theta),
-            a.center.y + a.radius * sin(centers.theta)
-        )
-        SIDE.RIGHT -> Vector2D(
-            a.center.x + a.radius * cos(centers.theta),
-            a.center.y - a.radius * sin(centers.theta)
-        )
-    }
-    return Straight(
-        p1,
-        Vector2D(p1.x + (centers.end.x - centers.start.x), p1.y + (centers.end.y - centers.start.y))
-    )
-}
-
-private fun leftInnerTangent(base: Circle, direction: Circle) = innerTangent(base, direction, SIDE.LEFT)
-private fun rightInnerTangent(base: Circle, direction: Circle) = innerTangent(base, direction, SIDE.RIGHT)
-private fun innerTangent(base: Circle, direction: Circle, side: SIDE): Straight? {
-    val centers = Straight(base.center, direction.center)
-    if (centers.length < base.radius * 2) return null
-    val angle = theta(
-        when (side) {
-            SIDE.LEFT -> centers.theta + acos(base.radius * 2 / centers.length)
-            SIDE.RIGHT -> centers.theta - acos(base.radius * 2 / centers.length)
-        }
-    )
-    val dX = base.radius * sin(angle)
-    val dY = base.radius * cos(angle)
-    val p1 = Vector2D(base.center.x + dX, base.center.y + dY)
-    val p2 = Vector2D(direction.center.x - dX, direction.center.y - dY)
-    return Straight(p1, p2)
-}
-
-internal fun theta(theta: Double) = (theta + (2 * PI)) % (2 * PI)
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/TrajectoryFunctions.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/TrajectoryFunctions.kt
new file mode 100644
index 000000000..547cb99fc
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/TrajectoryFunctions.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory.dubins
+
+import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.trajectory.segments.Straight
+import space.kscience.kmath.trajectory.segments.components.Circle
+import space.kscience.kmath.trajectory.segments.components.Pose2D
+import kotlin.math.PI
+import kotlin.math.acos
+import kotlin.math.cos
+import kotlin.math.sin
+
+private enum class SIDE {
+    LEFT, RIGHT
+}
+
+internal fun Pose2D.getLeftCircle(radius: Double): Circle = getTangentCircles(radius).first
+internal fun Pose2D.getRightCircle(radius: Double): Circle = getTangentCircles(radius).second
+internal fun Pose2D.getTangentCircles(radius: Double): Pair<Circle, Circle> {
+    val dX = radius * cos(theta)
+    val dY = radius * sin(theta)
+    return Circle(Vector2D(x - dX, y + dY), radius) to Circle(Vector2D(x + dX, y - dY), radius)
+}
+
+internal fun leftOuterTangent(a: Circle, b: Circle) = outerTangent(a, b, SIDE.LEFT)
+internal fun rightOuterTangent(a: Circle, b: Circle) = outerTangent(a, b, SIDE.RIGHT)
+private fun outerTangent(a: Circle, b: Circle, side: SIDE): Straight {
+    val centers = Straight(a.center, b.center)
+    val p1 = when (side) {
+        SIDE.LEFT -> Vector2D(
+            a.center.x - a.radius * cos(centers.theta),
+            a.center.y + a.radius * sin(centers.theta)
+        )
+        SIDE.RIGHT -> Vector2D(
+            a.center.x + a.radius * cos(centers.theta),
+            a.center.y - a.radius * sin(centers.theta)
+        )
+    }
+    return Straight(
+        p1,
+        Vector2D(p1.x + (centers.end.x - centers.start.x), p1.y + (centers.end.y - centers.start.y))
+    )
+}
+
+internal fun leftInnerTangent(base: Circle, direction: Circle) = innerTangent(base, direction, SIDE.LEFT)
+internal fun rightInnerTangent(base: Circle, direction: Circle) = innerTangent(base, direction, SIDE.RIGHT)
+private fun innerTangent(base: Circle, direction: Circle, side: SIDE): Straight? {
+    val centers = Straight(base.center, direction.center)
+    if (centers.length < base.radius * 2) return null
+    val angle = theta(
+        when (side) {
+            SIDE.LEFT -> centers.theta + acos(base.radius * 2 / centers.length)
+            SIDE.RIGHT -> centers.theta - acos(base.radius * 2 / centers.length)
+        }
+    )
+    val dX = base.radius * sin(angle)
+    val dY = base.radius * cos(angle)
+    val p1 = Vector2D(base.center.x + dX, base.center.y + dY)
+    val p2 = Vector2D(direction.center.x - dX, direction.center.y - dY)
+    return Straight(p1, p2)
+}
+
+internal fun theta(theta: Double) = (theta + (2 * PI)) % (2 * PI)
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
index 025aab2b7..a5288e40d 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -29,7 +29,7 @@ class DubinsTests {
         val start = Pose2D.of(straight.end, straight.theta)
         val end = Pose2D.of(lineP1.start, lineP1.theta)
         val radius = 2.0
-        val dubins = DubinsPathFactory(start, end, radius)
+        val dubins = DubinsPath.all(start, end, radius)
 
         val absoluteDistance = start.distanceTo(end)
         println("Absolute distance: $absoluteDistance")
@@ -43,7 +43,7 @@ class DubinsTests {
         )
 
         expectedLengths.forEach {
-            val path = dubins[it.key]
+            val path = dubins.find { p -> p.type === it.key }
             assertNotNull(path, "Path ${it.key} not found")
             println("${it.key}: ${path.length}")
             assertTrue(it.value.equalFloat(path.length))
-- 
2.34.1


From 86fce7ec68d10dda664ddd936652eacd387c83b8 Mon Sep 17 00:00:00 2001
From: Erik Schouten <Erik@ErikSchouten.com>
Date: Sun, 17 Jul 2022 15:47:05 +0200
Subject: [PATCH 591/713] Arc contains circle, circle direction is computed
 from poses, factory function can create Arc based on Vector points and
 provided direction

---
 .../kmath/trajectory/dubins/DubinsPath.kt     | 28 ++++----
 .../kscience/kmath/trajectory/segments/Arc.kt | 64 +++++++++++--------
 .../kmath/trajectory/dubins/DubinsTests.kt    | 12 ++--
 .../kmath/trajectory/segments/ArcTests.kt     |  6 +-
 4 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
index ad67fa11d..ee4f38662 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
@@ -65,9 +65,9 @@ public class DubinsPath(
             dX = turningRadius * sin(theta)
             dY = turningRadius * cos(theta)
             val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-            val a1 = Arc(c1.center, start, p1, Arc.Direction.RIGHT)
-            val a2 = Arc(e.center, p1, p2, Arc.Direction.LEFT)
-            val a3 = Arc(c2.center, p2, end, Arc.Direction.RIGHT)
+            val a1 = Arc.of(c1.center, start, p1, Arc.Direction.RIGHT)
+            val a2 = Arc.of(e.center, p1, p2, Arc.Direction.LEFT)
+            val a3 = Arc.of(c2.center, p2, end, Arc.Direction.RIGHT)
             return DubinsPath(a1, a2, a3)
         }
 
@@ -87,9 +87,9 @@ public class DubinsPath(
             dX = turningRadius * sin(theta)
             dY = turningRadius * cos(theta)
             val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-            val a1 = Arc(c1.center, start, p1, Arc.Direction.LEFT)
-            val a2 = Arc(e.center, p1, p2, Arc.Direction.RIGHT)
-            val a3 = Arc(c2.center, p2, end, Arc.Direction.LEFT)
+            val a1 = Arc.of(c1.center, start, p1, Arc.Direction.LEFT)
+            val a2 = Arc.of(e.center, p1, p2, Arc.Direction.RIGHT)
+            val a3 = Arc.of(c2.center, p2, end, Arc.Direction.LEFT)
             return DubinsPath(a1, a2, a3)
         }
 
@@ -97,8 +97,8 @@ public class DubinsPath(
             val c1 = start.getRightCircle(turningRadius)
             val c2 = end.getRightCircle(turningRadius)
             val s = leftOuterTangent(c1, c2)
-            val a1 = Arc(c1.center, start, s.start, Arc.Direction.RIGHT)
-            val a3 = Arc(c2.center, s.end, end, Arc.Direction.RIGHT)
+            val a1 = Arc.of(c1.center, start, s.start, Arc.Direction.RIGHT)
+            val a3 = Arc.of(c2.center, s.end, end, Arc.Direction.RIGHT)
             return DubinsPath(a1, s, a3)
         }
 
@@ -106,8 +106,8 @@ public class DubinsPath(
             val c1 = start.getLeftCircle(turningRadius)
             val c2 = end.getLeftCircle(turningRadius)
             val s = rightOuterTangent(c1, c2)
-            val a1 = Arc(c1.center, start, s.start, Arc.Direction.LEFT)
-            val a3 = Arc(c2.center, s.end, end, Arc.Direction.LEFT)
+            val a1 = Arc.of(c1.center, start, s.start, Arc.Direction.LEFT)
+            val a3 = Arc.of(c2.center, s.end, end, Arc.Direction.LEFT)
             return DubinsPath(a1, s, a3)
         }
 
@@ -117,8 +117,8 @@ public class DubinsPath(
             val s = rightInnerTangent(c1, c2)
             if (c1.center.distanceTo(c2.center) < turningRadius * 2 || s == null) return null
 
-            val a1 = Arc(c1.center, start, s.start, Arc.Direction.RIGHT)
-            val a3 = Arc(c2.center, s.end, end, Arc.Direction.LEFT)
+            val a1 = Arc.of(c1.center, start, s.start, Arc.Direction.RIGHT)
+            val a3 = Arc.of(c2.center, s.end, end, Arc.Direction.LEFT)
             return DubinsPath(a1, s, a3)
         }
 
@@ -128,8 +128,8 @@ public class DubinsPath(
             val s = leftInnerTangent(c1, c2)
             if (c1.center.distanceTo(c2.center) < turningRadius * 2 || s == null) return null
 
-            val a1 = Arc(c1.center, start, s.start, Arc.Direction.LEFT)
-            val a3 = Arc(c2.center, s.end, end, Arc.Direction.RIGHT)
+            val a1 = Arc.of(c1.center, start, s.start, Arc.Direction.LEFT)
+            val a3 = Arc.of(c2.center, s.end, end, Arc.Direction.RIGHT)
             return DubinsPath(a1, s, a3)
         }
     }
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
index fe101f359..966e1e4e2 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
@@ -1,44 +1,56 @@
 package space.kscience.kmath.trajectory.segments
 
-import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
 import space.kscience.kmath.geometry.Vector2D
 import space.kscience.kmath.trajectory.dubins.theta
 import space.kscience.kmath.trajectory.segments.components.Circle
 import space.kscience.kmath.trajectory.segments.components.Pose2D
 import kotlin.math.PI
 
-public class Arc(
-    center: Vector2D,
-    a: Vector2D,
-    b: Vector2D,
-    internal val direction: Direction
-) : Circle(center, center.distanceTo(a)), Segment {
+public data class Arc(
+    public val circle: Circle,
+    public val start: Pose2D,
+    public val end: Pose2D
+) : Segment {
 
-    private val s1 = Straight(center, a)
-    private val s2 = Straight(center, b)
+    internal companion object {
+        fun of(center: Vector2D, start: Vector2D, end: Vector2D, direction: Direction): Arc {
+            val s1 = Straight(center, start)
+            val s2 = Straight(center, end)
+            val pose1 = calculatePose(start, s1.theta, direction)
+            val pose2 = calculatePose(end, s2.theta, direction)
+            return Arc(Circle(center, s1.length), pose1, pose2)
+        }
 
-    internal val pose1 = calculatePose(a, s1.theta)
-    internal val pose2 = calculatePose(b, s2.theta)
-    private val angle = calculateAngle()
-    override val length: Double = calculateLength()
+        private fun calculatePose(vector: Vector2D, theta: Double, direction: Direction): Pose2D =
+            Pose2D.of(
+                vector,
+                when (direction) {
+                    Direction.LEFT -> theta(theta - PI / 2)
+                    Direction.RIGHT -> theta(theta + PI / 2)
+                }
+            )
+    }
 
-    public enum class Direction {
+    internal enum class Direction {
         LEFT, RIGHT
     }
 
-    private fun calculateAngle() = theta(if (direction == Direction.LEFT) s1.theta - s2.theta else s2.theta - s1.theta)
-
-    private fun calculateLength(): Double {
+    override val length: Double get() {
+        val angle: Double = theta(if (direction == Direction.LEFT) start.theta - end.theta else end.theta - start.theta)
         val proportion = angle / (2 * PI)
-        return circumference * proportion
+        return circle.circumference * proportion
+    }
+
+    internal val direction: Direction = if (start.y < circle.center.y) {
+        if (start.theta > PI) Direction.RIGHT else Direction.LEFT
+    } else if (start.y > circle.center.y) {
+        if (start.theta < PI) Direction.RIGHT else Direction.LEFT
+    } else {
+        if (start.theta == 0.0) {
+            if (start.x < circle.center.x) Direction.RIGHT else Direction.LEFT
+        } else {
+            if (start.x > circle.center.x) Direction.RIGHT else Direction.LEFT
+        }
     }
 
-    private fun calculatePose(vector: Vector2D, theta: Double): Pose2D =
-        Pose2D.of(
-            vector,
-            when (direction) {
-                Direction.LEFT -> theta(theta - PI / 2)
-                Direction.RIGHT -> theta(theta + PI / 2)
-            }
-        )
 }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
index a5288e40d..47e6ac2ef 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -48,18 +48,18 @@ class DubinsTests {
             println("${it.key}: ${path.length}")
             assertTrue(it.value.equalFloat(path.length))
 
-            assertTrue(start.equalsFloat(path.a.pose1))
-            assertTrue(end.equalsFloat(path.c.pose2))
+            assertTrue(start.equalsFloat(path.a.start))
+            assertTrue(end.equalsFloat(path.c.end))
 
             // Not working, theta double precision inaccuracy
             if (path.b is Arc) {
                 val b = path.b as Arc
-                assertTrue(path.a.pose2.equalsFloat(b.pose1))
-                assertTrue(path.c.pose1.equalsFloat(b.pose2))
+                assertTrue(path.a.end.equalsFloat(b.start))
+                assertTrue(path.c.start.equalsFloat(b.end))
             } else if (path.b is Straight) {
                 val b = path.b as Straight
-                assertTrue(path.a.pose2.equalsFloat(Pose2D.of(b.start, b.theta)))
-                assertTrue(path.c.pose1.equalsFloat(Pose2D.of(b.end, b.theta)))
+                assertTrue(path.a.end.equalsFloat(Pose2D.of(b.start, b.theta)))
+                assertTrue(path.c.start.equalsFloat(Pose2D.of(b.end, b.theta)))
             }
         }
     }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
index a59643c0c..5b4ae6d7a 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
@@ -11,9 +11,9 @@ class ArcTests {
     @Test
     fun arcTest() {
         val circle = Circle(Vector2D(0.0, 0.0), 2.0)
-        val arc = Arc(circle.center, Vector2D(-2.0, 0.0), Vector2D(0.0, 2.0), Arc.Direction.RIGHT)
+        val arc = Arc.of(circle.center, Vector2D(-2.0, 0.0), Vector2D(0.0, 2.0), Arc.Direction.RIGHT)
         assertEquals(circle.circumference / 4, arc.length, 1.0)
-        assertEquals(0.0, arc.pose1.theta.radiansToDegrees())
-        assertEquals(90.0, arc.pose2.theta.radiansToDegrees())
+        assertEquals(0.0, arc.start.theta.radiansToDegrees())
+        assertEquals(90.0, arc.end.theta.radiansToDegrees())
     }
 }
-- 
2.34.1


From 429eefa3f7750c4d8e6dfccabb1206c77988ec38 Mon Sep 17 00:00:00 2001
From: Erik Schouten <Erik@ErikSchouten.com>
Date: Sun, 17 Jul 2022 15:48:08 +0200
Subject: [PATCH 592/713] Arc direction as computed property

---
 .../kscience/kmath/trajectory/segments/Arc.kt | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
index 966e1e4e2..1c02dd952 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
@@ -35,22 +35,25 @@ public data class Arc(
         LEFT, RIGHT
     }
 
-    override val length: Double get() {
-        val angle: Double = theta(if (direction == Direction.LEFT) start.theta - end.theta else end.theta - start.theta)
-        val proportion = angle / (2 * PI)
-        return circle.circumference * proportion
-    }
-
-    internal val direction: Direction = if (start.y < circle.center.y) {
-        if (start.theta > PI) Direction.RIGHT else Direction.LEFT
-    } else if (start.y > circle.center.y) {
-        if (start.theta < PI) Direction.RIGHT else Direction.LEFT
-    } else {
-        if (start.theta == 0.0) {
-            if (start.x < circle.center.x) Direction.RIGHT else Direction.LEFT
-        } else {
-            if (start.x > circle.center.x) Direction.RIGHT else Direction.LEFT
+    override val length: Double
+        get() {
+            val angle: Double =
+                theta(if (direction == Direction.LEFT) start.theta - end.theta else end.theta - start.theta)
+            val proportion = angle / (2 * PI)
+            return circle.circumference * proportion
+        }
+
+    internal val direction: Direction
+        get() = if (start.y < circle.center.y) {
+            if (start.theta > PI) Direction.RIGHT else Direction.LEFT
+        } else if (start.y > circle.center.y) {
+            if (start.theta < PI) Direction.RIGHT else Direction.LEFT
+        } else {
+            if (start.theta == 0.0) {
+                if (start.x < circle.center.x) Direction.RIGHT else Direction.LEFT
+            } else {
+                if (start.x > circle.center.x) Direction.RIGHT else Direction.LEFT
+            }
         }
-    }
 
 }
-- 
2.34.1


From f2cbbeba2017af8dd54795e9c4b0ef82682b7715 Mon Sep 17 00:00:00 2001
From: Erik Schouten <Erik@ErikSchouten.com>
Date: Sun, 17 Jul 2022 15:56:24 +0200
Subject: [PATCH 593/713] Author details

---
 docs/templates/README-TEMPLATE.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/templates/README-TEMPLATE.md b/docs/templates/README-TEMPLATE.md
index 4ffa9e75f..c466324b8 100644
--- a/docs/templates/README-TEMPLATE.md
+++ b/docs/templates/README-TEMPLATE.md
@@ -103,3 +103,10 @@ The project requires a lot of additional work. The most important thing we need
 required the most. Feel free to create feature requests. We are also welcome to code contributions, especially in issues
 marked with
 [waiting for a hero](https://github.com/mipt-npm/kmath/labels/waiting%20for%20a%20hero) label.
+
+## Author
+Erik Schouten
+
+Github: ESchouten
+
+Email: erik-schouten@hotmail.nl
-- 
2.34.1


From 9d4df5d8e03a1aadb85109e3fabb2d25694b1695 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 20 Jul 2022 08:22:41 +0300
Subject: [PATCH 594/713] Add and regenerate READMEs. Fix files' directory.

---
 README.md                                     | 31 +++++++++++-
 kmath-ast/README.md                           |  6 +--
 kmath-commons/README.md                       |  6 +--
 kmath-complex/README.md                       | 10 ++--
 kmath-core/README.md                          |  6 +--
 kmath-coroutines/README.md                    |  6 +--
 kmath-dimensions/README.md                    |  6 +--
 kmath-ejml/README.md                          |  6 +--
 kmath-for-real/README.md                      |  6 +--
 kmath-functions/README.md                     |  6 +--
 kmath-geometry/README.md                      |  6 +--
 kmath-histograms/README.md                    |  6 +--
 kmath-jafama/README.md                        |  6 +--
 kmath-jupyter/README.md                       |  6 +--
 kmath-kotlingrad/README.md                    |  6 +--
 kmath-memory/README.md                        |  6 +--
 kmath-multik/README.md                        |  6 +--
 kmath-nd4j/README.md                          |  6 +--
 kmath-optimization/README.md                  |  6 +--
 kmath-polynomial/README.md                    | 50 +++++++++++++++++++
 kmath-polynomial/build.gradle.kts             | 43 +++++++++++++++-
 .../kmath/functions}/LabeledPolynomial.kt     |  0
 .../functions}/LabeledRationalFunction.kt     |  0
 .../kmath/functions}/ListPolynomial.kt        |  0
 .../kmath/functions}/ListRationalFunction.kt  |  0
 .../kmath/functions}/NumberedPolynomial.kt    |  0
 .../functions}/NumberedRationalFunction.kt    |  0
 .../kscience/kmath/functions}/Polynomial.kt   |  0
 .../kmath/functions}/RationalFunction.kt      |  0
 .../kmath/functions}/algebraicStub.kt         |  0
 .../kmath/functions}/collectionUtils.kt       |  0
 .../kmath/functions}/labeledConstructors.kt   |  0
 .../kscience/kmath/functions}/labeledUtil.kt  |  0
 .../kmath/functions}/listConstructors.kt      |  0
 .../kscience/kmath/functions}/listUtil.kt     |  0
 .../kscience/kmath/functions}/misc.kt         |  0
 .../kmath/functions}/numberedConstructors.kt  |  0
 .../kscience/kmath/functions}/numberedUtil.kt |  0
 kmath-stat/README.md                          |  6 +--
 kmath-symja/README.md                         |  6 +--
 kmath-tensorflow/README.md                    |  6 +--
 kmath-tensors/README.md                       |  6 +--
 kmath-viktor/README.md                        |  6 +--
 43 files changed, 192 insertions(+), 74 deletions(-)
 create mode 100644 kmath-polynomial/README.md
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/LabeledPolynomial.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/LabeledRationalFunction.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/ListPolynomial.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/ListRationalFunction.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/NumberedPolynomial.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/NumberedRationalFunction.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/Polynomial.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/RationalFunction.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/algebraicStub.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/collectionUtils.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/labeledConstructors.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/labeledUtil.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/listConstructors.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/listUtil.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/misc.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/numberedConstructors.kt (100%)
 rename kmath-polynomial/src/commonMain/kotlin/{space.kscience.kmath.functions => space/kscience/kmath/functions}/numberedUtil.kt (100%)

diff --git a/README.md b/README.md
index 8353d341b..39cbf19c9 100644
--- a/README.md
+++ b/README.md
@@ -86,8 +86,8 @@ module definitions below. The module stability could have the following levels:
 > **Maturity**: PROTOTYPE
 >
 > **Features:**
-> - [complex](kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt) : Complex Numbers
-> - [quaternion](kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt) : Quaternions
+> - [complex](kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt) : Complex numbers operations
+> - [quaternion](kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt) : Quaternions and their composition
 
 
 ### [kmath-core](kmath-core)
@@ -214,6 +214,28 @@ One can still use generic algebras though.
 >
 > **Maturity**: EXPERIMENTAL
 
+### [kmath-polynomial](kmath-polynomial)
+> 
+>
+> **Maturity**: PROTOTYPE
+>
+> **Features:**
+> - [polynomial abstraction](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt) : Abstraction for polynomial spaces.
+> - [rational function abstraction](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt) : Abstraction for rational functions spaces.
+> - ["list" polynomials](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt) : List implementation of univariate polynomials.
+> - ["list" rational functions](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt) : List implementation of univariate rational functions.
+> - ["list" polynomials and rational functions constructors](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt) : Constructors for list polynomials and rational functions.
+> - ["list" polynomials and rational functions utilities](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt) : Utilities for list polynomials and rational functions.
+> - ["numbered" polynomials](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt) : Numbered implementation of multivariate polynomials.
+> - ["numbered" rational functions](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt) : Numbered implementation of multivariate rational functions.
+> - ["numbered" polynomials and rational functions constructors](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt) : Constructors for numbered polynomials and rational functions.
+> - ["numbered" polynomials and rational functions utilities](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt) : Utilities for numbered polynomials and rational functions.
+> - ["labeled" polynomials](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt) : Labeled implementation of multivariate polynomials.
+> - ["labeled" rational functions](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt) : Labeled implementation of multivariate rational functions.
+> - ["labeled" polynomials and rational functions constructors](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt) : Constructors for labeled polynomials and rational functions.
+> - ["labeled" polynomials and rational functions utilities](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt) : Utilities for labeled polynomials and rational functions.
+
+
 ### [kmath-stat](kmath-stat)
 > 
 >
@@ -245,6 +267,11 @@ One can still use generic algebras though.
 >
 > **Maturity**: DEVELOPMENT
 
+### [test-utils](test-utils)
+> 
+>
+> **Maturity**: EXPERIMENTAL
+
 
 ## Multi-platform support
 
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index 553c60bb3..c6da64982 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -10,7 +10,7 @@ Extensions to MST API: transformations, dynamic compilation and visualization.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.0'
+    implementation 'space.kscience:kmath-ast:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.0")
+    implementation("space.kscience:kmath-ast:0.3.1-dev-1")
 }
 ```
 
diff --git a/kmath-commons/README.md b/kmath-commons/README.md
index 7195e6fb1..89f1f6c9f 100644
--- a/kmath-commons/README.md
+++ b/kmath-commons/README.md
@@ -6,7 +6,7 @@ Commons math binding for kmath
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-commons:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-commons:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-commons:0.3.0'
+    implementation 'space.kscience:kmath-commons:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-commons:0.3.0")
+    implementation("space.kscience:kmath-commons:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index 4646c6a80..f00952065 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -2,13 +2,13 @@
 
 Complex and hypercomplex number systems in KMath.
 
- - [complex](src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt) : Complex Numbers
- - [quaternion](src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt) : Quaternions
+ - [complex](src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt) : Complex numbers operations
+ - [quaternion](src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt) : Quaternions and their composition
 
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-complex:0.3.0'
+    implementation 'space.kscience:kmath-complex:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-complex:0.3.0")
+    implementation("space.kscience:kmath-complex:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-core/README.md b/kmath-core/README.md
index 4fddd327c..e84ca38d7 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -15,7 +15,7 @@ performance calculations to code generation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-core:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-core:0.3.0'
+    implementation 'space.kscience:kmath-core:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -36,6 +36,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-core:0.3.0")
+    implementation("space.kscience:kmath-core:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-coroutines/README.md b/kmath-coroutines/README.md
index d0fef6e0f..337d8e037 100644
--- a/kmath-coroutines/README.md
+++ b/kmath-coroutines/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-coroutines:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-coroutines:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-coroutines:0.3.0'
+    implementation 'space.kscience:kmath-coroutines:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-coroutines:0.3.0")
+    implementation("space.kscience:kmath-coroutines:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-dimensions/README.md b/kmath-dimensions/README.md
index 650bcafde..12aa2a7fa 100644
--- a/kmath-dimensions/README.md
+++ b/kmath-dimensions/README.md
@@ -6,7 +6,7 @@ A proof of concept module for adding type-safe dimensions to structures
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-dimensions:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-dimensions:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-dimensions:0.3.0'
+    implementation 'space.kscience:kmath-dimensions:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-dimensions:0.3.0")
+    implementation("space.kscience:kmath-dimensions:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index eaa90120f..2d6c661e4 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -9,7 +9,7 @@ EJML based linear algebra implementation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ejml:0.3.0'
+    implementation 'space.kscience:kmath-ejml:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ejml:0.3.0")
+    implementation("space.kscience:kmath-ejml:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index 9e8f95a16..5a8376976 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -9,7 +9,7 @@ Specialization of KMath APIs for Double numbers.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-for-real:0.3.0'
+    implementation 'space.kscience:kmath-for-real:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-for-real:0.3.0")
+    implementation("space.kscience:kmath-for-real:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index 3f44bd3f9..1292424b5 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -11,7 +11,7 @@ Functions and interpolations.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-functions:0.3.0'
+    implementation 'space.kscience:kmath-functions:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-functions:0.3.0")
+    implementation("space.kscience:kmath-functions:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-geometry/README.md b/kmath-geometry/README.md
index 6602f5510..72d275697 100644
--- a/kmath-geometry/README.md
+++ b/kmath-geometry/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-geometry:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-geometry:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-geometry:0.3.0'
+    implementation 'space.kscience:kmath-geometry:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-geometry:0.3.0")
+    implementation("space.kscience:kmath-geometry:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-histograms/README.md b/kmath-histograms/README.md
index 27f1b43ec..5fd91ee0c 100644
--- a/kmath-histograms/README.md
+++ b/kmath-histograms/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-histograms:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-histograms:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-histograms:0.3.0'
+    implementation 'space.kscience:kmath-histograms:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-histograms:0.3.0")
+    implementation("space.kscience:kmath-histograms:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index fe6afb835..c008c76ca 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -7,7 +7,7 @@ Integration with [Jafama](https://github.com/jeffhain/jafama).
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-jafama:0.3.0'
+    implementation 'space.kscience:kmath-jafama:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-jafama:0.3.0")
+    implementation("space.kscience:kmath-jafama:0.3.1-dev-1")
 }
 ```
 
diff --git a/kmath-jupyter/README.md b/kmath-jupyter/README.md
index db58ad840..3c9832625 100644
--- a/kmath-jupyter/README.md
+++ b/kmath-jupyter/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-jupyter:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-jupyter:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-jupyter:0.3.0'
+    implementation 'space.kscience:kmath-jupyter:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-jupyter:0.3.0")
+    implementation("space.kscience:kmath-jupyter:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
index 52e8b3116..457652aaf 100644
--- a/kmath-kotlingrad/README.md
+++ b/kmath-kotlingrad/README.md
@@ -8,7 +8,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-kotlingrad:0.3.0'
+    implementation 'space.kscience:kmath-kotlingrad:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-kotlingrad:0.3.0")
+    implementation("space.kscience:kmath-kotlingrad:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-memory/README.md b/kmath-memory/README.md
index 9f4520bd8..536d7f145 100644
--- a/kmath-memory/README.md
+++ b/kmath-memory/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-memory:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-memory:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-memory:0.3.0'
+    implementation 'space.kscience:kmath-memory:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-memory:0.3.0")
+    implementation("space.kscience:kmath-memory:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-multik/README.md b/kmath-multik/README.md
index edfce6f79..0f5b65b4c 100644
--- a/kmath-multik/README.md
+++ b/kmath-multik/README.md
@@ -6,7 +6,7 @@ JetBrains Multik connector
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-multik:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-multik:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-multik:0.3.0'
+    implementation 'space.kscience:kmath-multik:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-multik:0.3.0")
+    implementation("space.kscience:kmath-multik:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index 0bcae138e..bb065a300 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -9,7 +9,7 @@ ND4J based implementations of KMath abstractions.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-nd4j:0.3.0'
+    implementation 'space.kscience:kmath-nd4j:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-nd4j:0.3.0")
+    implementation("space.kscience:kmath-nd4j:0.3.1-dev-1")
 }
 ```
 
diff --git a/kmath-optimization/README.md b/kmath-optimization/README.md
index 63e0f43e3..d7441ebd1 100644
--- a/kmath-optimization/README.md
+++ b/kmath-optimization/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-optimization:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-optimization:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-optimization:0.3.0'
+    implementation 'space.kscience:kmath-optimization:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-optimization:0.3.0")
+    implementation("space.kscience:kmath-optimization:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-polynomial/README.md b/kmath-polynomial/README.md
new file mode 100644
index 000000000..640ea8876
--- /dev/null
+++ b/kmath-polynomial/README.md
@@ -0,0 +1,50 @@
+# Module kmath-polynomial
+
+Polynomial extra utilities and rational functions
+
+## Features
+
+ - [polynomial abstraction](src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt) : Abstraction for polynomial spaces.
+ - [rational function abstraction](src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt) : Abstraction for rational functions spaces.
+ - ["list" polynomials](src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt) : List implementation of univariate polynomials.
+ - ["list" rational functions](src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt) : List implementation of univariate rational functions.
+ - ["list" polynomials and rational functions constructors](src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt) : Constructors for list polynomials and rational functions.
+ - ["list" polynomials and rational functions utilities](src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt) : Utilities for list polynomials and rational functions.
+ - ["numbered" polynomials](src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt) : Numbered implementation of multivariate polynomials.
+ - ["numbered" rational functions](src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt) : Numbered implementation of multivariate rational functions.
+ - ["numbered" polynomials and rational functions constructors](src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt) : Constructors for numbered polynomials and rational functions.
+ - ["numbered" polynomials and rational functions utilities](src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt) : Utilities for numbered polynomials and rational functions.
+ - ["labeled" polynomials](src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt) : Labeled implementation of multivariate polynomials.
+ - ["labeled" rational functions](src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt) : Labeled implementation of multivariate rational functions.
+ - ["labeled" polynomials and rational functions constructors](src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt) : Constructors for labeled polynomials and rational functions.
+ - ["labeled" polynomials and rational functions utilities](src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt) : Utilities for labeled polynomials and rational functions.
+
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:kmath-polynomial:0.3.1-dev-1`.
+
+**Gradle Groovy:**
+```groovy
+repositories {
+    maven { url 'https://repo.kotlin.link' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'space.kscience:kmath-polynomial:0.3.1-dev-1'
+}
+```
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenCentral()
+}
+
+dependencies {
+    implementation("space.kscience:kmath-polynomial:0.3.1-dev-1")
+}
+```
diff --git a/kmath-polynomial/build.gradle.kts b/kmath-polynomial/build.gradle.kts
index 85b87fb34..dd0d9e77d 100644
--- a/kmath-polynomial/build.gradle.kts
+++ b/kmath-polynomial/build.gradle.kts
@@ -22,5 +22,46 @@ readme {
     maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
-//    feature("TODO") { "TODO" }
+    feature("polynomial abstraction", "src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt") {
+        "Abstraction for polynomial spaces."
+    }
+    feature("rational function abstraction", "src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt") {
+        "Abstraction for rational functions spaces."
+    }
+    feature("\"list\" polynomials", "src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt") {
+        "List implementation of univariate polynomials."
+    }
+    feature("\"list\" rational functions", "src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt") {
+        "List implementation of univariate rational functions."
+    }
+    feature("\"list\" polynomials and rational functions constructors", "src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt") {
+        "Constructors for list polynomials and rational functions."
+    }
+    feature("\"list\" polynomials and rational functions utilities", "src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt") {
+        "Utilities for list polynomials and rational functions."
+    }
+    feature("\"numbered\" polynomials", "src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt") {
+        "Numbered implementation of multivariate polynomials."
+    }
+    feature("\"numbered\" rational functions", "src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt") {
+        "Numbered implementation of multivariate rational functions."
+    }
+    feature("\"numbered\" polynomials and rational functions constructors", "src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt") {
+        "Constructors for numbered polynomials and rational functions."
+    }
+    feature("\"numbered\" polynomials and rational functions utilities", "src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt") {
+        "Utilities for numbered polynomials and rational functions."
+    }
+    feature("\"labeled\" polynomials", "src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt") {
+        "Labeled implementation of multivariate polynomials."
+    }
+    feature("\"labeled\" rational functions", "src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt") {
+        "Labeled implementation of multivariate rational functions."
+    }
+    feature("\"labeled\" polynomials and rational functions constructors", "src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt") {
+        "Constructors for labeled polynomials and rational functions."
+    }
+    feature("\"labeled\" polynomials and rational functions utilities", "src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt") {
+        "Utilities for labeled polynomials and rational functions."
+    }
 }
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledPolynomial.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledRationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/LabeledRationalFunction.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListPolynomial.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListRationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/ListRationalFunction.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedPolynomial.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedRationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/NumberedRationalFunction.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/Polynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/Polynomial.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/RationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/RationalFunction.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/algebraicStub.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/algebraicStub.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/collectionUtils.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/collectionUtils.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledConstructors.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/labeledUtil.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/listConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/listConstructors.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/listUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/listUtil.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/misc.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/misc.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedConstructors.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
diff --git a/kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
similarity index 100%
rename from kmath-polynomial/src/commonMain/kotlin/space.kscience.kmath.functions/numberedUtil.kt
rename to kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
diff --git a/kmath-stat/README.md b/kmath-stat/README.md
index 80c6e0fcd..7ed20fcf4 100644
--- a/kmath-stat/README.md
+++ b/kmath-stat/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-stat:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-stat:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-stat:0.3.0'
+    implementation 'space.kscience:kmath-stat:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-stat:0.3.0")
+    implementation("space.kscience:kmath-stat:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-symja/README.md b/kmath-symja/README.md
index ea2d5d68f..a96b0e835 100644
--- a/kmath-symja/README.md
+++ b/kmath-symja/README.md
@@ -6,7 +6,7 @@ Symja integration module
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-symja:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-symja:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-symja:0.3.0'
+    implementation 'space.kscience:kmath-symja:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-symja:0.3.0")
+    implementation("space.kscience:kmath-symja:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-tensorflow/README.md b/kmath-tensorflow/README.md
index 7852c07be..83f2eb315 100644
--- a/kmath-tensorflow/README.md
+++ b/kmath-tensorflow/README.md
@@ -6,7 +6,7 @@ Google tensorflow connector
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensorflow:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-tensorflow:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensorflow:0.3.0'
+    implementation 'space.kscience:kmath-tensorflow:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensorflow:0.3.0")
+    implementation("space.kscience:kmath-tensorflow:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index 44ee47675..4208cd83d 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -9,7 +9,7 @@ Common linear algebra operations on tensors.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensors:0.3.0'
+    implementation 'space.kscience:kmath-tensors:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensors:0.3.0")
+    implementation("space.kscience:kmath-tensors:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-viktor/README.md b/kmath-viktor/README.md
index 5d7c2dea1..abff20427 100644
--- a/kmath-viktor/README.md
+++ b/kmath-viktor/README.md
@@ -6,7 +6,7 @@ Binding for https://github.com/JetBrains-Research/viktor
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-viktor:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-viktor:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-viktor:0.3.0'
+    implementation 'space.kscience:kmath-viktor:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-viktor:0.3.0")
+    implementation("space.kscience:kmath-viktor:0.3.1-dev-1")
 }
 ```
-- 
2.34.1


From 163a7c717a922b8f670475ad489184dd28716c11 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 20 Jul 2022 08:28:47 +0300
Subject: [PATCH 595/713] Fix description.

---
 kmath-polynomial/README.md        | 2 +-
 kmath-polynomial/build.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-polynomial/README.md b/kmath-polynomial/README.md
index 640ea8876..a5078a7e0 100644
--- a/kmath-polynomial/README.md
+++ b/kmath-polynomial/README.md
@@ -1,6 +1,6 @@
 # Module kmath-polynomial
 
-Polynomial extra utilities and rational functions
+Polynomials, rational functions, and utilities
 
 ## Features
 
diff --git a/kmath-polynomial/build.gradle.kts b/kmath-polynomial/build.gradle.kts
index dd0d9e77d..9c5083d2d 100644
--- a/kmath-polynomial/build.gradle.kts
+++ b/kmath-polynomial/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("ru.mipt.npm.gradle.native")
 }
 
-description = "Polynomial extra utilities and rational functions"
+description = "Polynomials, rational functions, and utilities"
 
 kotlin.sourceSets {
     commonMain {
-- 
2.34.1


From fe4eb96daed13a30d9c7f328fa49d2daefe9a2f5 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 20 Jul 2022 19:09:20 +0300
Subject: [PATCH 596/713] Add docs.

---
 .../kmath/functions/collectionUtils.kt        | 451 ++++++++++++++++--
 1 file changed, 412 insertions(+), 39 deletions(-)

diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
index ee32aa9a7..0d2ea3653 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
@@ -9,7 +9,13 @@ import kotlin.contracts.InvocationKind.*
 import kotlin.contracts.contract
 
 
-// TODO: Docs
+/**
+ * Computes the given lambda [compute] on value corresponding to the provided [key] or `null` if the key is not present.
+ *
+ * @param key key which corresponding value will be used if it's present.
+ * @param compute lambda that is computed on the received value.
+ * @return result of the computation of the lambda.
+ */
 internal inline fun <K, V, R> Map<in K, V>.computeOn(key: K, compute: (V?) -> R): R {
     contract {
         callsInPlace(compute, EXACTLY_ONCE)
@@ -17,7 +23,15 @@ internal inline fun <K, V, R> Map<in K, V>.computeOn(key: K, compute: (V?) -> R)
     return compute(get(key))
 }
 
-// TODO: Docs
+/**
+ * Computes the given lambda [compute] on value corresponding to the provided [key] or computes the given lambda
+ * [defaultResult] if the key is not present.
+ *
+ * @param key key which corresponding value will be used if it's present.
+ * @param compute lambda that is computed on the value corresponding to the [key].
+ * @param defaultResult lambda that is computed if the [key] is not present.
+ * @return result of [compute] lambda if the [key] is present or result of [defaultResult] otherwise.
+ */
 internal inline fun <K, V, R> Map<K, V>.computeOnOrElse(key: K, defaultResult: () -> R, compute: (value: V) -> R): R {
     contract {
         callsInPlace(defaultResult, AT_MOST_ONCE)
@@ -27,7 +41,15 @@ internal inline fun <K, V, R> Map<K, V>.computeOnOrElse(key: K, defaultResult: (
     return (if (key !in this) defaultResult() else compute(get(key) as V))
 }
 
-// TODO: Docs
+/**
+ * Computes the given lambda [compute] on value corresponding to the provided [key] or computes the given lambda
+ * [defaultResult] if the key is not present.
+ *
+ * @param key key which corresponding value will be used if it's present.
+ * @param compute lambda that is computed on the value corresponding to the [key].
+ * @param defaultResult default result that is returned in case of the [key]'s absence.
+ * @return result of [compute] lambda if the [key] is present or [defaultResult] otherwise.
+ */
 internal inline fun <K, V, R> Map<K, V>.computeOnOrElse(key: K, defaultResult: R, compute: (value: V) -> R): R {
     contract {
         callsInPlace(compute, AT_MOST_ONCE)
@@ -35,7 +57,15 @@ internal inline fun <K, V, R> Map<K, V>.computeOnOrElse(key: K, defaultResult: R
     return computeOnOrElse(key, { defaultResult }, compute)
 }
 
-// TODO: Docs
+/**
+ * Computes the given lambda [compute] on value corresponding to the provided [key] or computes the given lambda
+ * [defaultResult] if the key is not present.
+ *
+ * @param key key which corresponding value will be used if it's present.
+ * @param compute lambda that is computed on the value corresponding to the [key].
+ * @param defaultResult default result that is returned in case of the [key]'s absence.
+ * @return result of [compute] lambda if the [key] is present or [defaultResult] otherwise.
+ */
 internal inline fun <K, V, R> Map<K, V>.computeOnOrElse(key: K, defaultResult: R, compute: (key: K, value: V) -> R): R {
     contract {
         callsInPlace(compute, AT_MOST_ONCE)
@@ -374,8 +404,20 @@ internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapToBy(des
 internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapToBy(destination: D, transform: (key: K, value: V) -> W, resolve: (currentValue: W, newValue: V) -> W): D =
     copyMapToBy(destination, { (key, value) -> transform(key, value) }, { _, currentValue, newValue -> resolve(currentValue, newValue) })
 
-// TODO: Docs
-internal fun <K, V, D: MutableMap<K, V>> mergeTo(map1: Map<out K, V>, map2: Map<out K, V>, destination: D): D {
+/**
+ * Merges [the first map][map1] and [the second map][map2] prioritising the second one, puts result to the [destination]
+ * and returns the [destination].
+ *
+ * Precisely, corresponding keys and values of the received maps are put into the destination overriding existing values
+ * in the [destination] if needed. For every key appearing in both maps corresponding value from the second map is
+ * chosen.
+ *
+ * @param map1 the first (less prioritised) map to merge.
+ * @param map2 the second (more prioritised) map to merge.
+ * @param destination the map where result of the merge is put.
+ * @return the destination.
+ */
+internal fun <K, V, D: MutableMap<in K, in V>> mergeTo(map1: Map<out K, V>, map2: Map<out K, V>, destination: D): D {
     for ((key, value) in map1) {
         destination.put(key, value)
     }
@@ -385,7 +427,20 @@ internal fun <K, V, D: MutableMap<K, V>> mergeTo(map1: Map<out K, V>, map2: Map<
     return destination
 }
 
-// TODO: Docs
+/**
+ * Merges [the first map][map1] and [the second map][map2] resolving conflicts with [resolve] lambda, puts result to the
+ * [destination] and returns the [destination].
+ *
+ * Precisely, corresponding keys and values of the received maps are put into the destination overriding existing values
+ * in the [destination] if needed. For every key appearing in both maps corresponding value is a result of the [resolve]
+ * lambda calculated on the key and its corresponding values from the merged maps.
+ *
+ * @param map1 the first (less prioritised) map to merge.
+ * @param map2 the second (more prioritised) map to merge.
+ * @param resolve lambda function that resolves merge conflicts.
+ * @param destination the map where result of the merge is put.
+ * @return the destination.
+ */
 internal inline fun <K, V1: W, V2: W, W, D: MutableMap<K, W>> mergeToBy(map1: Map<out K, V1>, map2: Map<out K, V2>, destination: D, resolve: (key: K, value1: V1, value2: V2) -> W): D {
     for (key in map2.keys) {
         destination.remove(key)
@@ -400,27 +455,82 @@ internal inline fun <K, V1: W, V2: W, W, D: MutableMap<K, W>> mergeToBy(map1: Ma
     return destination
 }
 
-// TODO: Docs
+/**
+ * Merges [the first map][map1] and [the second map][map2] resolving conflicts with [resolve] lambda, puts result to the
+ * [destination] and returns the [destination].
+ *
+ * Precisely, corresponding keys and values of the received maps are put into the destination overriding existing values
+ * in the [destination] if needed. For every key appearing in both maps corresponding value is a result of the [resolve]
+ * lambda calculated on the key's corresponding values from the merged maps.
+ *
+ * @param map1 the first (less prioritised) map to merge.
+ * @param map2 the second (more prioritised) map to merge.
+ * @param resolve lambda function that resolves merge conflicts.
+ * @param destination the map where result of the merge is put.
+ * @return the destination.
+ */
 internal inline fun <K, V1: W, V2: W, W, D: MutableMap<K, W>> mergeToBy(map1: Map<K, V1>, map2: Map<K, V2>, destination: D, resolve: (value1: V1, value2: V2) -> W): D =
     mergeToBy(map1, map2, destination) { _, value1, value2 -> resolve(value1, value2) }
 
-// TODO: Docs
+/**
+ * Merges [the first map][map1] and [the second map][map2] prioritising the second one.
+ *
+ * Precisely, corresponding keys and values of the received maps are put into a new empty map which is returned after
+ * afterwards. For every key appearing in both maps corresponding value from the second map is chosen.
+ *
+ * @param map1 the first (less prioritised) map to merge.
+ * @param map2 the second (more prioritised) map to merge.
+ * @return the result of the merge.
+ */
 internal fun <K, V1: W, V2: W, W> merge(map1: Map<K, V1>, map2: Map<K, V2>): Map<K, W> {
     val result = LinkedHashMap<K, W>(map1.size + map2.size)
     return mergeTo(map1, map2, result)
 }
 
-// TODO: Docs
-internal inline fun <K, V1: W, V2: W, W> mergeBy(map1: Map<K, V1>, map2: Map<K, V2>, transform: (key: K, value1: V1, value2: V2) -> W): Map<K, W> {
+/**
+ * Merges [the first map][map1] and [the second map][map2] resolving conflicts with [resolve] lambda.
+ *
+ * Precisely, corresponding keys and values of the received maps are put into a new empty map which is returned after
+ * afterwards. For every key appearing in both maps corresponding value is a result of the [resolve] lambda calculated
+ * on the key and its corresponding values from the merged maps.
+ *
+ * @param map1 the first (less prioritised) map to merge.
+ * @param map2 the second (more prioritised) map to merge.
+ * @param resolve lambda function that resolves merge conflicts.
+ * @return the result of the merge.
+ */
+internal inline fun <K, V1: W, V2: W, W> mergeBy(map1: Map<K, V1>, map2: Map<K, V2>, resolve: (key: K, value1: V1, value2: V2) -> W): Map<K, W> {
     val result = LinkedHashMap<K, W>(map1.size + map2.size)
-    return mergeToBy(map1, map2, result, transform)
+    return mergeToBy(map1, map2, result, resolve)
 }
 
-// TODO: Docs
-internal inline fun <K, V1: W, V2: W, W> mergeBy(map1: Map<K, V1>, map2: Map<K, V2>, transform: (value1: V1, value2: V2) -> W): Map<K, W> =
-    mergeBy(map1, map2) { _, value1, value2 -> transform(value1, value2) }
+/**
+ * Merges [the first map][map1] and [the second map][map2] resolving conflicts with [resolve] lambda.
+ *
+ * Precisely, corresponding keys and values of the received maps are put into a new empty map which is returned after
+ * afterwards. For every key appearing in both maps corresponding value is a result of the [resolve] lambda calculated
+ * on the key's corresponding values from the merged maps.
+ *
+ * @param map1 the first (less prioritised) map to merge.
+ * @param map2 the second (more prioritised) map to merge.
+ * @param resolve lambda function that resolves merge conflicts.
+ * @return the result of the merge.
+ */
+internal inline fun <K, V1: W, V2: W, W> mergeBy(map1: Map<K, V1>, map2: Map<K, V2>, resolve: (value1: V1, value2: V2) -> W): Map<K, W> =
+    mergeBy(map1, map2) { _, value1, value2 -> resolve(value1, value2) }
 
-// TODO: Docs
+/**
+ * Populates the [destination] map with key-value pairs provided by [transform] function applied to each element of the
+ * given collection resolving conflicts with [resolve] function and returns the [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param transform function which transforms each element to key-value.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the [destination].
+ */
 internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateTo(destination: D, transform: (T) -> Pair<K, V>, resolve: (key: K, currentValue: V, newValue: V) -> V): D {
     for (element in this) {
         val (key, value) = transform(element)
@@ -429,7 +539,20 @@ internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateTo(dest
     return destination
 }
 
-// TODO: Docs
+/**
+ * Populates the [destination] map with key-value pairs, where key is provided by [keySelector] function and value is
+ * provided by [valueTransform] applied to each element of the given collection, resolving conflicts with [resolve]
+ * function and returns the [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param keySelector lambda functions that generates keys for the key-value pairs.
+ * @param valueTransform lambda functions that generates value for the key-value pairs.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the [destination].
+ */
 internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateByTo(destination: D, keySelector: (T) -> K, valueTransform: (T) -> V, resolve: (key: K, currentValue: V, newValue: V) -> V): D {
     for (element in this) {
         val key = keySelector(element)
@@ -439,7 +562,19 @@ internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateByTo(de
     return destination
 }
 
-// TODO: Docs
+/**
+ * Populates the [destination] map with key-value pairs, where key is provided by [keySelector] function applied to each
+ * element of the given collection and value is the element itself, resolving conflicts with [resolve] function and
+ * returns the [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param keySelector lambda functions that generates keys for the key-value pairs.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the [destination].
+ */
 internal inline fun <T, K, D : MutableMap<K, T>> Iterable<T>.associateByTo(destination: D, keySelector: (T) -> K, resolve: (key: K, currentValue: T, newValue: T) -> T): D {
     for (element in this) {
         val key = keySelector(element)
@@ -448,86 +583,324 @@ internal inline fun <T, K, D : MutableMap<K, T>> Iterable<T>.associateByTo(desti
     return destination
 }
 
-// TODO: Docs
+/**
+ * Populates the [destination] map with key-value pairs provided by [transform] function applied to each element of the
+ * given collection resolving conflicts with [resolve] function and returns the [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param transform function which transforms each element to key-value pair.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the [destination].
+ */
 internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateTo(destination: D, transform: (T) -> Pair<K, V>, resolve: (currentValue: V, newValue: V) -> V): D =
     associateTo(destination, transform) { _, currentValue, newValue -> resolve(currentValue, newValue) }
 
-// TODO: Docs
+/**
+ * Populates the [destination] map with key-value pairs, where key is provided by [keySelector] function and value is
+ * provided by [valueTransform] applied to each element of the given collection, resolving conflicts with [resolve]
+ * function and returns the [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param keySelector lambda functions that generates keys for the key-value pairs.
+ * @param valueTransform lambda functions that generates value for the key-value pairs.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the [destination].
+ */
 internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateByTo(destination: D, keySelector: (T) -> K, valueTransform: (T) -> V, resolve: (currentValue: V, newValue: V) -> V): D =
     associateByTo(destination, keySelector, valueTransform) { _, currentValue, newValue -> resolve(currentValue, newValue) }
 
-// TODO: Docs
+/**
+ * Populates the [destination] map with key-value pairs, where key is provided by [keySelector] function applied to each
+ * element of the given collection and value is the element itself, resolving conflicts with [resolve] function and
+ * returns the [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param keySelector lambda functions that generates keys for the key-value pairs.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the [destination].
+ */
 internal inline fun <T, K, D : MutableMap<K, T>> Iterable<T>.associateByTo(destination: D, keySelector: (T) -> K, resolve: (currentValue: T, newValue: T) -> T): D =
     associateByTo(destination, keySelector) { _, currentValue, newValue -> resolve(currentValue, newValue) }
 
-// TODO: Docs
+/**
+ * Returns a map containing key-value pairs provided by [transform] function applied to elements of the given collection.
+ *
+ * All pairs are added in order of iteration. If some key is already added to the map, adding new key-value pair with the
+ * key is resolved with [resolve] function which takes the key, current value corresponding to the key, and new value
+ * from the pair.
+ *
+ * @param transform function which transforms each element to key-value pair.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the result map.
+ */
 internal inline fun <T, K, V> Iterable<T>.associate(transform: (T) -> Pair<K, V>, resolve: (key: K, currentValue: V, newValue: V) -> V): Map<K, V> =
     associateTo(LinkedHashMap(), transform, resolve)
 
-// TODO: Docs
+/**
+ * Returns a map containing the values provided by [valueTransform] and indexed by [keySelector] functions applied to
+ * elements of the given collection.
+ *
+ * All pairs are added in order of iteration. If some key is already added to the map, adding new key-value pair with
+ * the key is resolved with [resolve] function which takes the key, current value corresponding to the key, and new
+ * value from the pair.
+ *
+ * @param keySelector lambda functions that generates keys for the key-value pairs.
+ * @param valueTransform lambda functions that generates value for the key-value pairs.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the result map.
+ */
 internal inline fun <T, K, V> Iterable<T>.associateBy(keySelector: (T) -> K, valueTransform: (T) -> V, resolve: (key: K, currentValue: V, newValue: V) -> V): Map<K, V> =
     associateByTo(LinkedHashMap(), keySelector, valueTransform, resolve)
 
-// TODO: Docs
+/**
+ * Returns a map containing the elements from the given collection indexed by the key returned from [keySelector]
+ * function applied to each element.
+ *
+ * All pairs are added in order of iteration. If some key is already added to the map, adding new key-value pair with
+ * the key is resolved with [resolve] function which takes the key, current value corresponding to the key, and new
+ * value from the pair.
+ *
+ * @param keySelector lambda functions that generates keys for the key-value pairs.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the result map.
+ */
 internal inline fun <T, K> Iterable<T>.associateBy(keySelector: (T) -> K, resolve: (key: K, currentValue: T, newValue: T) -> T): Map<K, T> =
     associateByTo(LinkedHashMap(), keySelector, resolve)
 
-// TODO: Docs
+/**
+ * Returns a map containing key-value pairs provided by [transform] function applied to elements of the given collection.
+ *
+ * All pairs are added in order of iteration. If some key is already added to the map, adding new key-value pair with
+ * the key is resolved with [resolve] function which takes current value corresponding to the key and new value from the
+ * pair.
+ *
+ * @param transform function which transforms each element to key-value pair.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the result map.
+ */
 internal inline fun <T, K, V> Iterable<T>.associate(transform: (T) -> Pair<K, V>, resolve: (currentValue: V, newValue: V) -> V): Map<K, V> =
     associateTo(LinkedHashMap(), transform, resolve)
 
-// TODO: Docs
+/**
+ * Returns a map containing the values provided by [valueTransform] and indexed by [keySelector] functions applied to
+ * elements of the given collection.
+ *
+ * All pairs are added in order of iteration. If some key is already added to the map, adding new key-value pair with
+ * the key is resolved with [resolve] function which takes current value corresponding to the key and new value from the
+ * pair.
+ *
+ * @param keySelector lambda functions that generates keys for the key-value pairs.
+ * @param valueTransform lambda functions that generates value for the key-value pairs.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the result map.
+ */
 internal inline fun <T, K, V> Iterable<T>.associateBy(keySelector: (T) -> K, valueTransform: (T) -> V, resolve: (currentValue: V, newValue: V) -> V): Map<K, V> =
     associateByTo(LinkedHashMap(), keySelector, valueTransform, resolve)
 
-// TODO: Docs
+/**
+ * Returns a map containing the elements from the given collection indexed by the key returned from [keySelector]
+ * function applied to each element.
+ *
+ * All pairs are added in order of iteration. If some key is already added to the map, adding new key-value pair with
+ * the key is resolved with [resolve] function which takes current value corresponding to the key and new value from the
+ * pair.
+ *
+ * @param keySelector lambda functions that generates keys for the key-value pairs.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the result map.
+ */
 internal inline fun <T, K> Iterable<T>.associateBy(keySelector: (T) -> K, resolve: (currentValue: T, newValue: T) -> T): Map<K, T> =
     associateByTo(LinkedHashMap(), keySelector, resolve)
 
-// TODO: Docs
+/**
+ * Populates the given [destination] map with entries having the keys of this map and the values obtained
+ * by applying the [transform] function to each entry in this map resolving conflicts with [resolve] function and
+ * returns the [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param transform function which transforms each key-value pair to new value.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the [destination].
+ */
 internal inline fun <K, V, W, D : MutableMap<K, W>> Map<out K, V>.mapValuesTo(destination: D, transform: (Map.Entry<K, V>) -> W, resolve: (key: K, currentValue: W, newValue: W) -> W): D =
     entries.associateByTo(destination, { it.key }, transform, resolve)
 
-// TODO: Docs
+/**
+ * Populates the given [destination] map with entries having the keys of this map and the values obtained
+ * by applying the [transform] function to each entry in this map resolving conflicts with [resolve] function and
+ * returns the [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param transform function which transforms each key-value pair to new value.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the [destination].
+ */
 internal inline fun <K, V, W, D : MutableMap<K, W>> Map<out K, V>.mapValuesTo(destination: D, transform: (key: K, value: V) -> W, resolve: (key: K, currentValue: W, newValue: W) -> W): D =
     entries.associateByTo(destination, { it.key }, { (key, value) -> transform(key, value) }, resolve)
 
-// TODO: Docs
+/**
+ * Populates the given [destination] map with entries having the keys of this map and the values obtained
+ * by applying the [transform] function to each entry in this map resolving conflicts with [resolve] function and
+ * returns the [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param transform function which transforms each key-value pair to new value.
+ * @param resolve lambda function that resolves merge conflicts which current and new values corresponding to some key.
+ * @return the [destination].
+ */
 internal inline fun <K, V, W, D : MutableMap<K, W>> Map<out K, V>.mapValuesTo(destination: D, transform: (Map.Entry<K, V>) -> W, resolve: (currentValue: W, newValue: W) -> W): D =
     entries.associateByTo(destination, { it.key }, transform, resolve)
 
-// TODO: Docs
+/**
+ * Populates the given [destination] map with entries having the keys of this map and the values obtained
+ * by applying the [transform] function to each entry in this map resolving conflicts with [resolve] function and
+ * returns the [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param transform function which transforms each key-value pair to new value.
+ * @param resolve lambda function that resolves merge conflicts which current and new values corresponding to some key.
+ * @return the [destination].
+ */
 internal inline fun <K, V, W, D : MutableMap<K, W>> Map<out K, V>.mapValuesTo(destination: D, transform: (key: K, value: V) -> W, resolve: (currentValue: W, newValue: W) -> W): D =
     entries.associateByTo(destination, { it.key }, { (key, value) -> transform(key, value) }, resolve)
 
-// TODO: Docs
+/**
+ * Populates the given [destination] map with entries having the keys obtained by applying the [transform] function to
+ * each entry in this map and the values of this map, resolving conflicts with [resolve] function and returns the
+ * [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param transform function which transforms each key-value pair to new key.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the [destination].
+ */
 internal inline fun <K, V, L, D : MutableMap<L, V>> Map<out K, V>.mapKeysTo(destination: D, transform: (Map.Entry<K, V>) -> L, resolve: (key: L, currentValue: V, newValue: V) -> V): D =
     entries.associateByTo(destination, transform, { it.value }, resolve)
 
-// TODO: Docs
+/**
+ * Populates the given [destination] map with entries having the keys obtained by applying the [transform] function to
+ * each entry in this map and the values of this map, resolving conflicts with [resolve] function and returns the
+ * [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param transform function which transforms each key-value pair to new key.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the [destination].
+ */
 internal inline fun <K, V, L, D : MutableMap<L, V>> Map<out K, V>.mapKeysTo(destination: D, transform: (key: K, value: V) -> L, resolve: (key: L, currentValue: V, newValue: V) -> V): D =
     entries.associateByTo(destination, { (key, value) -> transform(key, value) }, { it.value }, resolve)
 
-// TODO: Docs
+/**
+ * Populates the given [destination] map with entries having the keys obtained by applying the [transform] function to
+ * each entry in this map and the values of this map, resolving conflicts with [resolve] function and returns the
+ * [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param transform function which transforms each key-value pair to new key.
+ * @param resolve lambda function that resolves merge conflicts which current and new values corresponding to some key.
+ * @return the [destination].
+ */
 internal inline fun <K, V, L, D : MutableMap<L, V>> Map<out K, V>.mapKeysTo(destination: D, transform: (Map.Entry<K, V>) -> L, resolve: (currentValue: V, newValue: V) -> V): D =
     entries.associateByTo(destination, transform, { it.value }, resolve)
 
-// TODO: Docs
+/**
+ * Populates the given [destination] map with entries having the keys obtained by applying the [transform] function to
+ * each entry in this map and the values of this map, resolving conflicts with [resolve] function and returns the
+ * [destination].
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param destination the destination of the generated key-value pairs.
+ * @param transform function which transforms each key-value pair to new key.
+ * @param resolve lambda function that resolves merge conflicts which current and new values corresponding to some key.
+ * @return the [destination].
+ */
 internal inline fun <K, V, L, D : MutableMap<L, V>> Map<out K, V>.mapKeysTo(destination: D, transform: (key: K, value: V) -> L, resolve: (currentValue: V, newValue: V) -> V): D =
     entries.associateByTo(destination, { (key, value) -> transform(key, value) }, { it.value }, resolve)
 
-// TODO: Docs
+/**
+ * Returns a new map with entries having the keys obtained by applying the [transform] function to each entry in this
+ * map and the values of this map and resolving conflicts with [resolve] function.
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param transform function which transforms each key-value pair to new key.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the result map.
+ */
 internal inline fun <K, V, L> Map<out K, V>.mapKeys(transform: (Map.Entry<K, V>) -> L, resolve: (key: L, currentValue: V, newValue: V) -> V): Map<L, V> =
     mapKeysTo(LinkedHashMap(size), transform, resolve)
 
-// TODO: Docs
+/**
+ * Returns a new map with entries having the keys obtained by applying the [transform] function to each entry in this
+ * map and the values of this map and resolving conflicts with [resolve] function.
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param transform function which transforms each key-value pair to new key.
+ * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
+ * corresponding values.
+ * @return the result map.
+ */
 internal inline fun <K, V, L> Map<out K, V>.mapKeys(transform: (key: K, value: V) -> L, resolve: (key: L, currentValue: V, newValue: V) -> V): Map<L, V> =
     mapKeysTo(LinkedHashMap(size), transform, resolve)
 
-// TODO: Docs
+/**
+ * Returns a new map with entries having the keys obtained by applying the [transform] function to each entry in this
+ * map and the values of this map and resolving conflicts with [resolve] function.
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param transform function which transforms each key-value pair to new key.
+ * @param resolve lambda function that resolves merge conflicts which current and new values corresponding to some key.
+ * @return the result map.
+ */
 internal inline fun <K, V, L> Map<out K, V>.mapKeys(transform: (Map.Entry<K, V>) -> L, resolve: (currentValue: V, newValue: V) -> V): Map<L, V> =
     mapKeysTo(LinkedHashMap(size), transform, resolve)
 
-// TODO: Docs
+/**
+ * Returns a new map with entries having the keys obtained by applying the [transform] function to each entry in this
+ * map and the values of this map and resolving conflicts with [resolve] function..
+ *
+ * All pairs are added and resolved in order of iteration.
+ *
+ * @param transform function which transforms each key-value pair to new key.
+ * @param resolve lambda function that resolves merge conflicts which current and new values corresponding to some key.
+ * @return the result map.
+ */
 internal inline fun <K, V, L> Map<out K, V>.mapKeys(transform: (key: K, value: V) -> L, resolve: (currentValue: V, newValue: V) -> V): Map<L, V> =
     mapKeysTo(LinkedHashMap(size), transform, resolve)
\ No newline at end of file
-- 
2.34.1


From e1b8fcdbbf78d13a04aa0602e2f341d420f8b103 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 20 Jul 2022 19:10:35 +0300
Subject: [PATCH 597/713] Two consecutive dots...

---
 .../kotlin/space/kscience/kmath/functions/collectionUtils.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
index 0d2ea3653..c9146a493 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
@@ -894,7 +894,7 @@ internal inline fun <K, V, L> Map<out K, V>.mapKeys(transform: (Map.Entry<K, V>)
 
 /**
  * Returns a new map with entries having the keys obtained by applying the [transform] function to each entry in this
- * map and the values of this map and resolving conflicts with [resolve] function..
+ * map and the values of this map and resolving conflicts with [resolve] function.
  *
  * All pairs are added and resolved in order of iteration.
  *
-- 
2.34.1


From 0c6ad35c13ecf6bff31170092685e71ce016f1b5 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Sat, 23 Jul 2022 10:24:52 +0300
Subject: [PATCH 598/713] Simplify the version catalog usage.

---
 kmath-functions/build.gradle.kts  | 2 +-
 kmath-polynomial/build.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-functions/build.gradle.kts b/kmath-functions/build.gradle.kts
index eec17e82b..337875ba4 100644
--- a/kmath-functions/build.gradle.kts
+++ b/kmath-functions/build.gradle.kts
@@ -15,7 +15,7 @@ kotlin.sourceSets {
 }
 
 dependencies {
-    dokkaPlugin("org.jetbrains.dokka:mathjax-plugin:${versionCatalogs.named("npmlibs").findVersion("dokka").get().requiredVersion}")
+    dokkaPlugin("org.jetbrains.dokka:mathjax-plugin:${npmlibs.versions.dokka.get()}")
 }
 
 readme {
diff --git a/kmath-polynomial/build.gradle.kts b/kmath-polynomial/build.gradle.kts
index 9c5083d2d..5e66f83ec 100644
--- a/kmath-polynomial/build.gradle.kts
+++ b/kmath-polynomial/build.gradle.kts
@@ -15,7 +15,7 @@ kotlin.sourceSets {
 }
 
 dependencies {
-    dokkaPlugin("org.jetbrains.dokka:mathjax-plugin:${versionCatalogs.named("npmlibs").findVersion("dokka").get().requiredVersion}")
+    dokkaPlugin("org.jetbrains.dokka:mathjax-plugin:${npmlibs.versions.dokka.get()}")
 }
 
 readme {
-- 
2.34.1


From 1e8a8cac7efa0d10495aca413ed3c5fa82c6fba1 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 24 Jul 2022 12:01:02 +0300
Subject: [PATCH 599/713] Fix readme

---
 .github/CODEOWNERS                       |  3 +++
 .space/CODEOWNERS                        |  0
 README.md                                | 19 ++++++++++++++-----
 docs/templates/README-TEMPLATE.md        | 12 ++----------
 kmath-ast/README.md                      |  6 +++---
 kmath-commons/README.md                  |  6 +++---
 kmath-complex/README.md                  | 10 +++++-----
 kmath-core/README.md                     |  6 +++---
 kmath-coroutines/README.md               |  6 +++---
 kmath-dimensions/README.md               |  6 +++---
 kmath-ejml/README.md                     |  6 +++---
 kmath-for-real/README.md                 |  6 +++---
 kmath-functions/README.md                |  6 +++---
 kmath-geometry/README.md                 |  6 +++---
 kmath-histograms/README.md               |  6 +++---
 kmath-jafama/README.md                   |  6 +++---
 kmath-jupyter/README.md                  |  6 +++---
 kmath-kotlingrad/README.md               |  6 +++---
 kmath-memory/README.md                   |  6 +++---
 kmath-multik/README.md                   |  6 +++---
 kmath-nd4j/README.md                     |  6 +++---
 kmath-optimization/README.md             |  6 +++---
 kmath-stat/README.md                     |  6 +++---
 kmath-symja/README.md                    |  6 +++---
 kmath-tensorflow/README.md               |  6 +++---
 kmath-tensors/README.md                  |  6 +++---
 kmath-trajectory/README.md               | 12 +++++++-----
 kmath-trajectory/build.gradle.kts        |  2 ++
 kmath-trajectory/docs/README-TEMPLATE.md | 13 +++++++++++++
 kmath-viktor/README.md                   |  6 +++---
 30 files changed, 112 insertions(+), 91 deletions(-)
 create mode 100644 .github/CODEOWNERS
 create mode 100644 .space/CODEOWNERS
 create mode 100644 kmath-trajectory/docs/README-TEMPLATE.md

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..7273b6a50
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,3 @@
+@altavir
+
+/kmath-trajectory @ESchouten
\ No newline at end of file
diff --git a/.space/CODEOWNERS b/.space/CODEOWNERS
new file mode 100644
index 000000000..e69de29bb
diff --git a/README.md b/README.md
index 8353d341b..63238f320 100644
--- a/README.md
+++ b/README.md
@@ -86,8 +86,8 @@ module definitions below. The module stability could have the following levels:
 > **Maturity**: PROTOTYPE
 >
 > **Features:**
-> - [complex](kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt) : Complex Numbers
-> - [quaternion](kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt) : Quaternions
+> - [complex](kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt) : Complex numbers operations
+> - [quaternion](kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt) : Quaternions and their composition
 
 
 ### [kmath-core](kmath-core)
@@ -240,11 +240,21 @@ One can still use generic algebras though.
 > - [linear algebra operations](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Advanced linear algebra operations like LU decomposition, SVD, etc.
 
 
+### [kmath-trajectory](kmath-trajectory)
+> Path and trajectory optimization
+>
+> **Maturity**: PROTOTYPE
+
 ### [kmath-viktor](kmath-viktor)
 > 
 >
 > **Maturity**: DEVELOPMENT
 
+### [test-utils](test-utils)
+> 
+>
+> **Maturity**: EXPERIMENTAL
+
 
 ## Multi-platform support
 
@@ -261,8 +271,7 @@ performance and flexibility.
 
 We expect to focus on creating convenient universal API first and then work on increasing performance for specific
 cases. We expect the worst KMath benchmarks will perform better than native Python, but worse than optimized
-native/SciPy (mostly due to boxing operations on primitive numbers). The best performance of optimized parts could be
-better than SciPy.
+native/SciPy (mostly due to boxing operations on primitive numbers). The best performance of optimized parts could be better than SciPy.
 
 ## Requirements
 
@@ -294,4 +303,4 @@ Gradle `6.0+` is required for multiplatform artifacts.
 The project requires a lot of additional work. The most important thing we need is a feedback about what features are
 required the most. Feel free to create feature requests. We are also welcome to code contributions, especially in issues
 marked with
-[waiting for a hero](https://github.com/mipt-npm/kmath/labels/waiting%20for%20a%20hero) label.
+[waiting for a hero](https://github.com/mipt-npm/kmath/labels/waiting%20for%20a%20hero) label.
\ No newline at end of file
diff --git a/docs/templates/README-TEMPLATE.md b/docs/templates/README-TEMPLATE.md
index b8446a76f..1633f3ff1 100644
--- a/docs/templates/README-TEMPLATE.md
+++ b/docs/templates/README-TEMPLATE.md
@@ -69,8 +69,7 @@ performance and flexibility.
 
 We expect to focus on creating convenient universal API first and then work on increasing performance for specific
 cases. We expect the worst KMath benchmarks will perform better than native Python, but worse than optimized
-native/SciPy (mostly due to boxing operations on primitive numbers). The best performance of optimized parts could be
-better than SciPy.
+native/SciPy (mostly due to boxing operations on primitive numbers). The best performance of optimized parts could be better than SciPy.
 
 ## Requirements
 
@@ -102,11 +101,4 @@ Gradle `6.0+` is required for multiplatform artifacts.
 The project requires a lot of additional work. The most important thing we need is a feedback about what features are
 required the most. Feel free to create feature requests. We are also welcome to code contributions, especially in issues
 marked with
-[waiting for a hero](https://github.com/mipt-npm/kmath/labels/waiting%20for%20a%20hero) label.
-
-## Author
-Erik Schouten
-
-Github: ESchouten
-
-Email: erik-schouten@hotmail.nl
+[waiting for a hero](https://github.com/mipt-npm/kmath/labels/waiting%20for%20a%20hero) label.
\ No newline at end of file
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index 553c60bb3..c6da64982 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -10,7 +10,7 @@ Extensions to MST API: transformations, dynamic compilation and visualization.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.0'
+    implementation 'space.kscience:kmath-ast:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.0")
+    implementation("space.kscience:kmath-ast:0.3.1-dev-1")
 }
 ```
 
diff --git a/kmath-commons/README.md b/kmath-commons/README.md
index 7195e6fb1..89f1f6c9f 100644
--- a/kmath-commons/README.md
+++ b/kmath-commons/README.md
@@ -6,7 +6,7 @@ Commons math binding for kmath
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-commons:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-commons:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-commons:0.3.0'
+    implementation 'space.kscience:kmath-commons:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-commons:0.3.0")
+    implementation("space.kscience:kmath-commons:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index 4646c6a80..f00952065 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -2,13 +2,13 @@
 
 Complex and hypercomplex number systems in KMath.
 
- - [complex](src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt) : Complex Numbers
- - [quaternion](src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt) : Quaternions
+ - [complex](src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt) : Complex numbers operations
+ - [quaternion](src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt) : Quaternions and their composition
 
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-complex:0.3.0'
+    implementation 'space.kscience:kmath-complex:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-complex:0.3.0")
+    implementation("space.kscience:kmath-complex:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-core/README.md b/kmath-core/README.md
index 4fddd327c..e84ca38d7 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -15,7 +15,7 @@ performance calculations to code generation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-core:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-core:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-core:0.3.0'
+    implementation 'space.kscience:kmath-core:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -36,6 +36,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-core:0.3.0")
+    implementation("space.kscience:kmath-core:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-coroutines/README.md b/kmath-coroutines/README.md
index d0fef6e0f..337d8e037 100644
--- a/kmath-coroutines/README.md
+++ b/kmath-coroutines/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-coroutines:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-coroutines:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-coroutines:0.3.0'
+    implementation 'space.kscience:kmath-coroutines:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-coroutines:0.3.0")
+    implementation("space.kscience:kmath-coroutines:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-dimensions/README.md b/kmath-dimensions/README.md
index 650bcafde..12aa2a7fa 100644
--- a/kmath-dimensions/README.md
+++ b/kmath-dimensions/README.md
@@ -6,7 +6,7 @@ A proof of concept module for adding type-safe dimensions to structures
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-dimensions:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-dimensions:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-dimensions:0.3.0'
+    implementation 'space.kscience:kmath-dimensions:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-dimensions:0.3.0")
+    implementation("space.kscience:kmath-dimensions:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index eaa90120f..2d6c661e4 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -9,7 +9,7 @@ EJML based linear algebra implementation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ejml:0.3.0'
+    implementation 'space.kscience:kmath-ejml:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ejml:0.3.0")
+    implementation("space.kscience:kmath-ejml:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index 9e8f95a16..5a8376976 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -9,7 +9,7 @@ Specialization of KMath APIs for Double numbers.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-for-real:0.3.0'
+    implementation 'space.kscience:kmath-for-real:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-for-real:0.3.0")
+    implementation("space.kscience:kmath-for-real:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index 3f44bd3f9..1292424b5 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -11,7 +11,7 @@ Functions and interpolations.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-functions:0.3.0'
+    implementation 'space.kscience:kmath-functions:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-functions:0.3.0")
+    implementation("space.kscience:kmath-functions:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-geometry/README.md b/kmath-geometry/README.md
index 6602f5510..72d275697 100644
--- a/kmath-geometry/README.md
+++ b/kmath-geometry/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-geometry:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-geometry:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-geometry:0.3.0'
+    implementation 'space.kscience:kmath-geometry:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-geometry:0.3.0")
+    implementation("space.kscience:kmath-geometry:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-histograms/README.md b/kmath-histograms/README.md
index 27f1b43ec..5fd91ee0c 100644
--- a/kmath-histograms/README.md
+++ b/kmath-histograms/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-histograms:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-histograms:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-histograms:0.3.0'
+    implementation 'space.kscience:kmath-histograms:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-histograms:0.3.0")
+    implementation("space.kscience:kmath-histograms:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index fe6afb835..c008c76ca 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -7,7 +7,7 @@ Integration with [Jafama](https://github.com/jeffhain/jafama).
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-jafama:0.3.0'
+    implementation 'space.kscience:kmath-jafama:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-jafama:0.3.0")
+    implementation("space.kscience:kmath-jafama:0.3.1-dev-1")
 }
 ```
 
diff --git a/kmath-jupyter/README.md b/kmath-jupyter/README.md
index db58ad840..3c9832625 100644
--- a/kmath-jupyter/README.md
+++ b/kmath-jupyter/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-jupyter:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-jupyter:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-jupyter:0.3.0'
+    implementation 'space.kscience:kmath-jupyter:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-jupyter:0.3.0")
+    implementation("space.kscience:kmath-jupyter:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
index 52e8b3116..457652aaf 100644
--- a/kmath-kotlingrad/README.md
+++ b/kmath-kotlingrad/README.md
@@ -8,7 +8,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-kotlingrad:0.3.0'
+    implementation 'space.kscience:kmath-kotlingrad:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-kotlingrad:0.3.0")
+    implementation("space.kscience:kmath-kotlingrad:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-memory/README.md b/kmath-memory/README.md
index 9f4520bd8..536d7f145 100644
--- a/kmath-memory/README.md
+++ b/kmath-memory/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-memory:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-memory:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-memory:0.3.0'
+    implementation 'space.kscience:kmath-memory:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-memory:0.3.0")
+    implementation("space.kscience:kmath-memory:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-multik/README.md b/kmath-multik/README.md
index edfce6f79..0f5b65b4c 100644
--- a/kmath-multik/README.md
+++ b/kmath-multik/README.md
@@ -6,7 +6,7 @@ JetBrains Multik connector
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-multik:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-multik:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-multik:0.3.0'
+    implementation 'space.kscience:kmath-multik:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-multik:0.3.0")
+    implementation("space.kscience:kmath-multik:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index 0bcae138e..bb065a300 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -9,7 +9,7 @@ ND4J based implementations of KMath abstractions.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-nd4j:0.3.0'
+    implementation 'space.kscience:kmath-nd4j:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-nd4j:0.3.0")
+    implementation("space.kscience:kmath-nd4j:0.3.1-dev-1")
 }
 ```
 
diff --git a/kmath-optimization/README.md b/kmath-optimization/README.md
index 63e0f43e3..d7441ebd1 100644
--- a/kmath-optimization/README.md
+++ b/kmath-optimization/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-optimization:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-optimization:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-optimization:0.3.0'
+    implementation 'space.kscience:kmath-optimization:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-optimization:0.3.0")
+    implementation("space.kscience:kmath-optimization:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-stat/README.md b/kmath-stat/README.md
index 80c6e0fcd..7ed20fcf4 100644
--- a/kmath-stat/README.md
+++ b/kmath-stat/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-stat:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-stat:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-stat:0.3.0'
+    implementation 'space.kscience:kmath-stat:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-stat:0.3.0")
+    implementation("space.kscience:kmath-stat:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-symja/README.md b/kmath-symja/README.md
index ea2d5d68f..a96b0e835 100644
--- a/kmath-symja/README.md
+++ b/kmath-symja/README.md
@@ -6,7 +6,7 @@ Symja integration module
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-symja:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-symja:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-symja:0.3.0'
+    implementation 'space.kscience:kmath-symja:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-symja:0.3.0")
+    implementation("space.kscience:kmath-symja:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-tensorflow/README.md b/kmath-tensorflow/README.md
index 7852c07be..83f2eb315 100644
--- a/kmath-tensorflow/README.md
+++ b/kmath-tensorflow/README.md
@@ -6,7 +6,7 @@ Google tensorflow connector
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensorflow:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-tensorflow:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensorflow:0.3.0'
+    implementation 'space.kscience:kmath-tensorflow:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensorflow:0.3.0")
+    implementation("space.kscience:kmath-tensorflow:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index 44ee47675..4208cd83d 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -9,7 +9,7 @@ Common linear algebra operations on tensors.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensors:0.3.0'
+    implementation 'space.kscience:kmath-tensors:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensors:0.3.0")
+    implementation("space.kscience:kmath-tensors:0.3.1-dev-1")
 }
 ```
diff --git a/kmath-trajectory/README.md b/kmath-trajectory/README.md
index cb2b6989f..ac2930b04 100644
--- a/kmath-trajectory/README.md
+++ b/kmath-trajectory/README.md
@@ -1,12 +1,11 @@
-# Module kmath-trajectory
+# kmath-trajectory
 
 
 
-## Usage
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-trajectory:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-trajectory:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-trajectory:0.3.0'
+    implementation 'space.kscience:kmath-trajectory:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +26,9 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-trajectory:0.3.0")
+    implementation("space.kscience:kmath-trajectory:0.3.1-dev-1")
 }
 ```
+
+## Contributors
+Erik Schouten (github: @ESchouten, email: erik-schouten@hotmail.nl)
diff --git a/kmath-trajectory/build.gradle.kts b/kmath-trajectory/build.gradle.kts
index 502867ee3..db80be02a 100644
--- a/kmath-trajectory/build.gradle.kts
+++ b/kmath-trajectory/build.gradle.kts
@@ -11,5 +11,7 @@ kotlin.sourceSets.commonMain {
 }
 
 readme {
+    description = "Path and trajectory optimization"
     maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 }
diff --git a/kmath-trajectory/docs/README-TEMPLATE.md b/kmath-trajectory/docs/README-TEMPLATE.md
new file mode 100644
index 000000000..eb8e4a0c0
--- /dev/null
+++ b/kmath-trajectory/docs/README-TEMPLATE.md
@@ -0,0 +1,13 @@
+# kmath-trajectory
+
+
+${features}
+
+${artifact}
+
+## Author
+Erik Schouten
+
+Github: ESchouten
+
+Email: erik-schouten@hotmail.nl
diff --git a/kmath-viktor/README.md b/kmath-viktor/README.md
index 5d7c2dea1..abff20427 100644
--- a/kmath-viktor/README.md
+++ b/kmath-viktor/README.md
@@ -6,7 +6,7 @@ Binding for https://github.com/JetBrains-Research/viktor
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-viktor:0.3.0`.
+The Maven coordinates of this project are `space.kscience:kmath-viktor:0.3.1-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-viktor:0.3.0'
+    implementation 'space.kscience:kmath-viktor:0.3.1-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-viktor:0.3.0")
+    implementation("space.kscience:kmath-viktor:0.3.1-dev-1")
 }
 ```
-- 
2.34.1


From 323e8b6872137eb6da1b8c91aff1ce8b4e8d31d7 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 26 Jul 2022 09:19:04 +0300
Subject: [PATCH 600/713] Code simplification for Dubins path

---
 .../space/kscience/kmath/geometry/Circle2D.kt | 18 ++++
 .../space/kscience/kmath/geometry/Line.kt     |  4 +
 .../kmath/trajectory/dubins/DubinsPath.kt     | 82 +++++++++--------
 ...oryFunctions.kt => trajectoryFunctions.kt} | 41 +++++----
 .../kscience/kmath/trajectory/segments/Arc.kt | 59 ------------
 .../kmath/trajectory/segments/Pose2D.kt       | 21 +++++
 .../kmath/trajectory/segments/Segment.kt      |  5 --
 .../kmath/trajectory/segments/Straight.kt     | 18 ----
 .../kmath/trajectory/segments/Trajectory.kt   | 89 +++++++++++++++++++
 .../trajectory/segments/components/Circle.kt  | 11 ---
 .../trajectory/segments/components/Pose2D.kt  | 13 ---
 .../space/kscience/kmath/trajectory/Math.kt   | 10 +--
 .../kmath/trajectory/dubins/DubinsTests.kt    | 16 ++--
 .../kmath/trajectory/segments/ArcTests.kt     |  7 +-
 .../segments/{components => }/CircleTests.kt  |  6 +-
 .../kmath/trajectory/segments/LineTests.kt    | 12 +--
 16 files changed, 225 insertions(+), 187 deletions(-)
 create mode 100644 kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
 rename kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/{TrajectoryFunctions.kt => trajectoryFunctions.kt} (51%)
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Pose2D.kt
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Segment.kt
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Straight.kt
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Trajectory.kt
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Circle.kt
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt
 rename kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/{components => }/CircleTests.kt (74%)

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
new file mode 100644
index 000000000..8623335b9
--- /dev/null
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.geometry
+
+import kotlin.math.PI
+
+/**
+ * A circle in 2D space
+ */
+public class Circle2D(
+    public val center: Vector2D,
+    public val radius: Double
+)
+
+public val Circle2D.circumference: Double get() = radius * 2 * PI
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
index 8c6ccb55e..85bfcdd8f 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
@@ -5,6 +5,10 @@
 
 package space.kscience.kmath.geometry
 
+/**
+ * A line formed by [base] vector of start and a [direction] vector. Direction vector is not necessarily normalized,
+ * but its length does not affect line properties
+ */
 public data class Line<out V : Vector>(val base: V, val direction: V)
 
 public typealias Line2D = Line<Vector2D>
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
index ee4f38662..f510e3572 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
@@ -5,91 +5,95 @@
 
 package space.kscience.kmath.trajectory.dubins
 
+import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
 import space.kscience.kmath.geometry.Vector2D
-import space.kscience.kmath.trajectory.segments.Arc
-import space.kscience.kmath.trajectory.segments.Segment
-import space.kscience.kmath.trajectory.segments.Straight
-import space.kscience.kmath.trajectory.segments.components.Circle
-import space.kscience.kmath.trajectory.segments.components.Pose2D
+import space.kscience.kmath.trajectory.segments.ArcSegment
+import space.kscience.kmath.trajectory.segments.Pose2D
+import space.kscience.kmath.trajectory.segments.StraightSegment
+import space.kscience.kmath.trajectory.segments.Trajectory
 import kotlin.math.acos
 import kotlin.math.cos
 import kotlin.math.sin
 
 public class DubinsPath(
-    public val a: Arc,
-    public val b: Segment,
-    public val c: Arc,
-) {
+    public val a: ArcSegment,
+    public val b: Trajectory,
+    public val c: ArcSegment,
+) : Trajectory {
 
     public val type: TYPE = TYPE.valueOf(
         arrayOf(
             a.direction.name[0],
-            if (b is Arc) b.direction.name[0] else 'S',
+            if (b is ArcSegment) b.direction.name[0] else 'S',
             c.direction.name[0]
         ).toCharArray().concatToString()
     )
 
-    public val length: Double = a.length + b.length + c.length
+    override val length: Double get() = a.length + b.length + c.length
 
     public enum class TYPE {
         RLR, LRL, RSR, LSL, RSL, LSR
     }
 
     public companion object {
-        public fun all(start: Pose2D, end: Pose2D, turningRadius: Double): List<DubinsPath> =
-            listOfNotNull(
-                rlr(start, end, turningRadius),
-                lrl(start, end, turningRadius),
-                rsr(start, end, turningRadius),
-                lsl(start, end, turningRadius),
-                rsl(start, end, turningRadius),
-                lsr(start, end, turningRadius)
-            )
+        public fun all(
+            start: Pose2D,
+            end: Pose2D,
+            turningRadius: Double,
+        ): List<DubinsPath> = listOfNotNull(
+            rlr(start, end, turningRadius),
+            lrl(start, end, turningRadius),
+            rsr(start, end, turningRadius),
+            lsl(start, end, turningRadius),
+            rsl(start, end, turningRadius),
+            lsr(start, end, turningRadius)
+        )
+
         public fun shortest(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath =
-            all(start, end, turningRadius).minByOrNull { it.length }!!
+            all(start, end, turningRadius).minBy { it.length }
 
         public fun rlr(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? {
             val c1 = start.getRightCircle(turningRadius)
             val c2 = end.getRightCircle(turningRadius)
-            val centers = Straight(c1.center, c2.center)
+            val centers = StraightSegment(c1.center, c2.center)
             if (centers.length > turningRadius * 4) return null
 
             var theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
             var dX = turningRadius * sin(theta)
             var dY = turningRadius * cos(theta)
             val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
-            val e = Circle(p, turningRadius)
+            val e = Circle2D(p, turningRadius)
             val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
             theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
             dX = turningRadius * sin(theta)
             dY = turningRadius * cos(theta)
             val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-            val a1 = Arc.of(c1.center, start, p1, Arc.Direction.RIGHT)
-            val a2 = Arc.of(e.center, p1, p2, Arc.Direction.LEFT)
-            val a3 = Arc.of(c2.center, p2, end, Arc.Direction.RIGHT)
+            val a1 = ArcSegment.of(c1.center, start, p1, ArcSegment.Direction.RIGHT)
+            val a2 = ArcSegment.of(e.center, p1, p2, ArcSegment.Direction.LEFT)
+            val a3 = ArcSegment.of(c2.center, p2, end, ArcSegment.Direction.RIGHT)
             return DubinsPath(a1, a2, a3)
         }
 
         public fun lrl(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? {
             val c1 = start.getLeftCircle(turningRadius)
             val c2 = end.getLeftCircle(turningRadius)
-            val centers = Straight(c1.center, c2.center)
+            val centers = StraightSegment(c1.center, c2.center)
             if (centers.length > turningRadius * 4) return null
 
             var theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
             var dX = turningRadius * sin(theta)
             var dY = turningRadius * cos(theta)
             val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
-            val e = Circle(p, turningRadius)
+            val e = Circle2D(p, turningRadius)
             val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
             theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
             dX = turningRadius * sin(theta)
             dY = turningRadius * cos(theta)
             val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
-            val a1 = Arc.of(c1.center, start, p1, Arc.Direction.LEFT)
-            val a2 = Arc.of(e.center, p1, p2, Arc.Direction.RIGHT)
-            val a3 = Arc.of(c2.center, p2, end, Arc.Direction.LEFT)
+            val a1 = ArcSegment.of(c1.center, start, p1, ArcSegment.Direction.LEFT)
+            val a2 = ArcSegment.of(e.center, p1, p2, ArcSegment.Direction.RIGHT)
+            val a3 = ArcSegment.of(c2.center, p2, end, ArcSegment.Direction.LEFT)
             return DubinsPath(a1, a2, a3)
         }
 
@@ -97,8 +101,8 @@ public class DubinsPath(
             val c1 = start.getRightCircle(turningRadius)
             val c2 = end.getRightCircle(turningRadius)
             val s = leftOuterTangent(c1, c2)
-            val a1 = Arc.of(c1.center, start, s.start, Arc.Direction.RIGHT)
-            val a3 = Arc.of(c2.center, s.end, end, Arc.Direction.RIGHT)
+            val a1 = ArcSegment.of(c1.center, start, s.start, ArcSegment.Direction.RIGHT)
+            val a3 = ArcSegment.of(c2.center, s.end, end, ArcSegment.Direction.RIGHT)
             return DubinsPath(a1, s, a3)
         }
 
@@ -106,8 +110,8 @@ public class DubinsPath(
             val c1 = start.getLeftCircle(turningRadius)
             val c2 = end.getLeftCircle(turningRadius)
             val s = rightOuterTangent(c1, c2)
-            val a1 = Arc.of(c1.center, start, s.start, Arc.Direction.LEFT)
-            val a3 = Arc.of(c2.center, s.end, end, Arc.Direction.LEFT)
+            val a1 = ArcSegment.of(c1.center, start, s.start, ArcSegment.Direction.LEFT)
+            val a3 = ArcSegment.of(c2.center, s.end, end, ArcSegment.Direction.LEFT)
             return DubinsPath(a1, s, a3)
         }
 
@@ -117,8 +121,8 @@ public class DubinsPath(
             val s = rightInnerTangent(c1, c2)
             if (c1.center.distanceTo(c2.center) < turningRadius * 2 || s == null) return null
 
-            val a1 = Arc.of(c1.center, start, s.start, Arc.Direction.RIGHT)
-            val a3 = Arc.of(c2.center, s.end, end, Arc.Direction.LEFT)
+            val a1 = ArcSegment.of(c1.center, start, s.start, ArcSegment.Direction.RIGHT)
+            val a3 = ArcSegment.of(c2.center, s.end, end, ArcSegment.Direction.LEFT)
             return DubinsPath(a1, s, a3)
         }
 
@@ -128,8 +132,8 @@ public class DubinsPath(
             val s = leftInnerTangent(c1, c2)
             if (c1.center.distanceTo(c2.center) < turningRadius * 2 || s == null) return null
 
-            val a1 = Arc.of(c1.center, start, s.start, Arc.Direction.LEFT)
-            val a3 = Arc.of(c2.center, s.end, end, Arc.Direction.RIGHT)
+            val a1 = ArcSegment.of(c1.center, start, s.start, ArcSegment.Direction.LEFT)
+            val a3 = ArcSegment.of(c2.center, s.end, end, ArcSegment.Direction.RIGHT)
             return DubinsPath(a1, s, a3)
         }
     }
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/TrajectoryFunctions.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/trajectoryFunctions.kt
similarity index 51%
rename from kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/TrajectoryFunctions.kt
rename to kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/trajectoryFunctions.kt
index 547cb99fc..18384d349 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/TrajectoryFunctions.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/trajectoryFunctions.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.trajectory.dubins
 
+import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Vector2D
-import space.kscience.kmath.trajectory.segments.Straight
-import space.kscience.kmath.trajectory.segments.components.Circle
-import space.kscience.kmath.trajectory.segments.components.Pose2D
+import space.kscience.kmath.trajectory.segments.Pose2D
+import space.kscience.kmath.trajectory.segments.StraightSegment
 import kotlin.math.PI
 import kotlin.math.acos
 import kotlin.math.cos
@@ -18,18 +18,19 @@ private enum class SIDE {
     LEFT, RIGHT
 }
 
-internal fun Pose2D.getLeftCircle(radius: Double): Circle = getTangentCircles(radius).first
-internal fun Pose2D.getRightCircle(radius: Double): Circle = getTangentCircles(radius).second
-internal fun Pose2D.getTangentCircles(radius: Double): Pair<Circle, Circle> {
+internal fun Pose2D.getLeftCircle(radius: Double): Circle2D = getTangentCircles(radius).first
+internal fun Pose2D.getRightCircle(radius: Double): Circle2D = getTangentCircles(radius).second
+internal fun Pose2D.getTangentCircles(radius: Double): Pair<Circle2D, Circle2D> {
     val dX = radius * cos(theta)
     val dY = radius * sin(theta)
-    return Circle(Vector2D(x - dX, y + dY), radius) to Circle(Vector2D(x + dX, y - dY), radius)
+    return Circle2D(Vector2D(x - dX, y + dY), radius) to Circle2D(Vector2D(x + dX, y - dY), radius)
 }
 
-internal fun leftOuterTangent(a: Circle, b: Circle) = outerTangent(a, b, SIDE.LEFT)
-internal fun rightOuterTangent(a: Circle, b: Circle) = outerTangent(a, b, SIDE.RIGHT)
-private fun outerTangent(a: Circle, b: Circle, side: SIDE): Straight {
-    val centers = Straight(a.center, b.center)
+internal fun leftOuterTangent(a: Circle2D, b: Circle2D): StraightSegment = outerTangent(a, b, SIDE.LEFT)
+internal fun rightOuterTangent(a: Circle2D, b: Circle2D): StraightSegment = outerTangent(a, b, SIDE.RIGHT)
+
+private fun outerTangent(a: Circle2D, b: Circle2D, side: SIDE): StraightSegment {
+    val centers = StraightSegment(a.center, b.center)
     val p1 = when (side) {
         SIDE.LEFT -> Vector2D(
             a.center.x - a.radius * cos(centers.theta),
@@ -40,16 +41,20 @@ private fun outerTangent(a: Circle, b: Circle, side: SIDE): Straight {
             a.center.y - a.radius * sin(centers.theta)
         )
     }
-    return Straight(
+    return StraightSegment(
         p1,
         Vector2D(p1.x + (centers.end.x - centers.start.x), p1.y + (centers.end.y - centers.start.y))
     )
 }
 
-internal fun leftInnerTangent(base: Circle, direction: Circle) = innerTangent(base, direction, SIDE.LEFT)
-internal fun rightInnerTangent(base: Circle, direction: Circle) = innerTangent(base, direction, SIDE.RIGHT)
-private fun innerTangent(base: Circle, direction: Circle, side: SIDE): Straight? {
-    val centers = Straight(base.center, direction.center)
+internal fun leftInnerTangent(base: Circle2D, direction: Circle2D): StraightSegment? =
+    innerTangent(base, direction, SIDE.LEFT)
+
+internal fun rightInnerTangent(base: Circle2D, direction: Circle2D): StraightSegment? =
+    innerTangent(base, direction, SIDE.RIGHT)
+
+private fun innerTangent(base: Circle2D, direction: Circle2D, side: SIDE): StraightSegment? {
+    val centers = StraightSegment(base.center, direction.center)
     if (centers.length < base.radius * 2) return null
     val angle = theta(
         when (side) {
@@ -61,7 +66,7 @@ private fun innerTangent(base: Circle, direction: Circle, side: SIDE): Straight?
     val dY = base.radius * cos(angle)
     val p1 = Vector2D(base.center.x + dX, base.center.y + dY)
     val p2 = Vector2D(direction.center.x - dX, direction.center.y - dY)
-    return Straight(p1, p2)
+    return StraightSegment(p1, p2)
 }
 
-internal fun theta(theta: Double) = (theta + (2 * PI)) % (2 * PI)
+internal fun theta(theta: Double): Double = (theta + (2 * PI)) % (2 * PI)
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
deleted file mode 100644
index 1c02dd952..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Arc.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package space.kscience.kmath.trajectory.segments
-
-import space.kscience.kmath.geometry.Vector2D
-import space.kscience.kmath.trajectory.dubins.theta
-import space.kscience.kmath.trajectory.segments.components.Circle
-import space.kscience.kmath.trajectory.segments.components.Pose2D
-import kotlin.math.PI
-
-public data class Arc(
-    public val circle: Circle,
-    public val start: Pose2D,
-    public val end: Pose2D
-) : Segment {
-
-    internal companion object {
-        fun of(center: Vector2D, start: Vector2D, end: Vector2D, direction: Direction): Arc {
-            val s1 = Straight(center, start)
-            val s2 = Straight(center, end)
-            val pose1 = calculatePose(start, s1.theta, direction)
-            val pose2 = calculatePose(end, s2.theta, direction)
-            return Arc(Circle(center, s1.length), pose1, pose2)
-        }
-
-        private fun calculatePose(vector: Vector2D, theta: Double, direction: Direction): Pose2D =
-            Pose2D.of(
-                vector,
-                when (direction) {
-                    Direction.LEFT -> theta(theta - PI / 2)
-                    Direction.RIGHT -> theta(theta + PI / 2)
-                }
-            )
-    }
-
-    internal enum class Direction {
-        LEFT, RIGHT
-    }
-
-    override val length: Double
-        get() {
-            val angle: Double =
-                theta(if (direction == Direction.LEFT) start.theta - end.theta else end.theta - start.theta)
-            val proportion = angle / (2 * PI)
-            return circle.circumference * proportion
-        }
-
-    internal val direction: Direction
-        get() = if (start.y < circle.center.y) {
-            if (start.theta > PI) Direction.RIGHT else Direction.LEFT
-        } else if (start.y > circle.center.y) {
-            if (start.theta < PI) Direction.RIGHT else Direction.LEFT
-        } else {
-            if (start.theta == 0.0) {
-                if (start.x < circle.center.x) Direction.RIGHT else Direction.LEFT
-            } else {
-                if (start.x > circle.center.x) Direction.RIGHT else Direction.LEFT
-            }
-        }
-
-}
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Pose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Pose2D.kt
new file mode 100644
index 000000000..3df34c107
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Pose2D.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory.segments
+
+import space.kscience.kmath.geometry.Vector2D
+
+/**
+ * A [Vector2D] with view direction
+ */
+public data class Pose2D(
+    override val x: Double,
+    override val y: Double,
+    public val theta: Double
+) : Vector2D {
+    public companion object {
+        public fun of(vector: Vector2D, theta: Double): Pose2D = Pose2D(vector.x, vector.y, theta)
+    }
+}
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Segment.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Segment.kt
deleted file mode 100644
index 8a1d086fc..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Segment.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package space.kscience.kmath.trajectory.segments
-
-public interface Segment {
-    public val length: Double
-}
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Straight.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Straight.kt
deleted file mode 100644
index 444025d83..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Straight.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package space.kscience.kmath.trajectory.segments
-
-import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.geometry.Vector2D
-import space.kscience.kmath.trajectory.dubins.theta
-import kotlin.math.PI
-import kotlin.math.atan2
-
-public data class Straight(
-    internal val start: Vector2D,
-    internal val end: Vector2D
-) : Segment {
-    override val length: Double
-        get() = start.distanceTo(end)
-
-    internal val theta: Double
-        get() = theta(atan2(end.x - start.x, end.y - start.y))
-}
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Trajectory.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Trajectory.kt
new file mode 100644
index 000000000..453eef47f
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Trajectory.kt
@@ -0,0 +1,89 @@
+package space.kscience.kmath.trajectory.segments
+
+import space.kscience.kmath.geometry.Circle2D
+import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
+import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.geometry.circumference
+import space.kscience.kmath.trajectory.dubins.theta
+import kotlin.math.PI
+import kotlin.math.atan2
+
+public interface Trajectory {
+    public val length: Double
+}
+
+/**
+ * Straight path segment. The order of start and end defines the direction
+ */
+public data class StraightSegment(
+    internal val start: Vector2D,
+    internal val end: Vector2D,
+) : Trajectory {
+    override val length: Double get() = start.distanceTo(end)
+
+    internal val theta: Double get() = theta(atan2(end.x - start.x, end.y - start.y))
+}
+
+/**
+ * An arc segment
+ */
+public data class ArcSegment(
+    public val circle: Circle2D,
+    public val start: Pose2D,
+    public val end: Pose2D,
+) : Trajectory {
+
+    public enum class Direction {
+        LEFT, RIGHT
+    }
+
+    override val length: Double by lazy {
+        val angle: Double = theta(
+            if (direction == Direction.LEFT) {
+                start.theta - end.theta
+            } else {
+                end.theta - start.theta
+            }
+        )
+        val proportion = angle / (2 * PI)
+        circle.circumference * proportion
+    }
+
+    internal val direction: Direction by lazy {
+        if (start.y < circle.center.y) {
+            if (start.theta > PI) Direction.RIGHT else Direction.LEFT
+        } else if (start.y > circle.center.y) {
+            if (start.theta < PI) Direction.RIGHT else Direction.LEFT
+        } else {
+            if (start.theta == 0.0) {
+                if (start.x < circle.center.x) Direction.RIGHT else Direction.LEFT
+            } else {
+                if (start.x > circle.center.x) Direction.RIGHT else Direction.LEFT
+            }
+        }
+    }
+
+    public companion object {
+        public fun of(center: Vector2D, start: Vector2D, end: Vector2D, direction: Direction): ArcSegment {
+            fun calculatePose(
+                vector: Vector2D,
+                theta: Double,
+                direction: Direction,
+            ): Pose2D = Pose2D.of(
+                vector,
+                when (direction) {
+                    Direction.LEFT -> theta(theta - PI / 2)
+                    Direction.RIGHT -> theta(theta + PI / 2)
+                }
+            )
+
+            val s1 = StraightSegment(center, start)
+            val s2 = StraightSegment(center, end)
+            val pose1 = calculatePose(start, s1.theta, direction)
+            val pose2 = calculatePose(end, s2.theta, direction)
+            return ArcSegment(Circle2D(center, s1.length), pose1, pose2)
+        }
+    }
+
+}
+
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Circle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Circle.kt
deleted file mode 100644
index 946dd8c6e..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Circle.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package space.kscience.kmath.trajectory.segments.components
-
-import space.kscience.kmath.geometry.Vector2D
-import kotlin.math.PI
-
-public open class Circle(
-    internal val center: Vector2D,
-    internal val radius: Double
-) {
-    internal val circumference = radius * 2 * PI
-}
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt
deleted file mode 100644
index c49da3187..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/components/Pose2D.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package space.kscience.kmath.trajectory.segments.components
-
-import space.kscience.kmath.geometry.Vector2D
-
-public data class Pose2D(
-    override val x: Double,
-    override val y: Double,
-    public val theta: Double
-) : Vector2D {
-    internal companion object {
-        internal fun of(vector: Vector2D, theta: Double) = Pose2D(vector.x, vector.y, theta)
-    }
-}
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
index 92b2f1df9..4f8fda826 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
@@ -1,8 +1,8 @@
 package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Vector2D
-import space.kscience.kmath.trajectory.segments.Straight
-import space.kscience.kmath.trajectory.segments.components.Pose2D
+import space.kscience.kmath.trajectory.segments.Pose2D
+import space.kscience.kmath.trajectory.segments.StraightSegment
 import kotlin.math.PI
 import kotlin.math.abs
 import kotlin.math.sin
@@ -14,12 +14,12 @@ fun Double.radiansToDegrees() = this * 180 / PI
 fun Double.equalFloat(other: Double) = abs(this - other) < maxFloatDelta
 fun Pose2D.equalsFloat(other: Pose2D) = x.equalFloat(other.x) && y.equalFloat(other.y) && theta.equalFloat(other.theta)
 
-fun Straight.inverse() = Straight(end, start)
-fun Straight.shift(shift: Int, width: Double): Straight {
+fun StraightSegment.inverse() = StraightSegment(end, start)
+fun StraightSegment.shift(shift: Int, width: Double): StraightSegment {
     val dX = width * sin(inverse().theta)
     val dY = width * sin(theta)
 
-    return Straight(
+    return StraightSegment(
         Vector2D(start.x - dX * shift, start.y - dY * shift),
         Vector2D(end.x - dX * shift, end.y - dY * shift)
     )
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
index 47e6ac2ef..9069f6dd2 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -10,9 +10,9 @@ import space.kscience.kmath.geometry.Vector2D
 import space.kscience.kmath.trajectory.equalFloat
 import space.kscience.kmath.trajectory.equalsFloat
 import space.kscience.kmath.trajectory.inverse
-import space.kscience.kmath.trajectory.segments.Arc
-import space.kscience.kmath.trajectory.segments.Straight
-import space.kscience.kmath.trajectory.segments.components.Pose2D
+import space.kscience.kmath.trajectory.segments.ArcSegment
+import space.kscience.kmath.trajectory.segments.Pose2D
+import space.kscience.kmath.trajectory.segments.StraightSegment
 import space.kscience.kmath.trajectory.shift
 import kotlin.test.Test
 import kotlin.test.assertNotNull
@@ -23,7 +23,7 @@ class DubinsTests {
 
     @Test
     fun dubinsTest() {
-        val straight = Straight(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
+        val straight = StraightSegment(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
         val lineP1 = straight.shift(1, 10.0).inverse()
 
         val start = Pose2D.of(straight.end, straight.theta)
@@ -52,12 +52,12 @@ class DubinsTests {
             assertTrue(end.equalsFloat(path.c.end))
 
             // Not working, theta double precision inaccuracy
-            if (path.b is Arc) {
-                val b = path.b as Arc
+            if (path.b is ArcSegment) {
+                val b = path.b as ArcSegment
                 assertTrue(path.a.end.equalsFloat(b.start))
                 assertTrue(path.c.start.equalsFloat(b.end))
-            } else if (path.b is Straight) {
-                val b = path.b as Straight
+            } else if (path.b is StraightSegment) {
+                val b = path.b as StraightSegment
                 assertTrue(path.a.end.equalsFloat(Pose2D.of(b.start, b.theta)))
                 assertTrue(path.c.start.equalsFloat(Pose2D.of(b.end, b.theta)))
             }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
index 5b4ae6d7a..aa8778315 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
@@ -1,8 +1,9 @@
 package space.kscience.kmath.trajectory.segments
 
+import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.geometry.circumference
 import space.kscience.kmath.trajectory.radiansToDegrees
-import space.kscience.kmath.trajectory.segments.components.Circle
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -10,8 +11,8 @@ class ArcTests {
 
     @Test
     fun arcTest() {
-        val circle = Circle(Vector2D(0.0, 0.0), 2.0)
-        val arc = Arc.of(circle.center, Vector2D(-2.0, 0.0), Vector2D(0.0, 2.0), Arc.Direction.RIGHT)
+        val circle = Circle2D(Vector2D(0.0, 0.0), 2.0)
+        val arc = ArcSegment.of(circle.center, Vector2D(-2.0, 0.0), Vector2D(0.0, 2.0), ArcSegment.Direction.RIGHT)
         assertEquals(circle.circumference / 4, arc.length, 1.0)
         assertEquals(0.0, arc.start.theta.radiansToDegrees())
         assertEquals(90.0, arc.end.theta.radiansToDegrees())
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/components/CircleTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
similarity index 74%
rename from kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/components/CircleTests.kt
rename to kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
index 6f28885e0..5170c1db5 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/components/CircleTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
@@ -3,9 +3,11 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.trajectory.segments.components
+package space.kscience.kmath.trajectory.segments
 
+import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.geometry.circumference
 import space.kscience.kmath.trajectory.maxFloatDelta
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -17,7 +19,7 @@ class CircleTests {
         val center = Vector2D(0.0, 0.0)
         val radius = 2.0
         val expectedCircumference = 12.56637
-        val circle = Circle(center, radius)
+        val circle = Circle2D(center, radius)
         assertEquals(expectedCircumference, circle.circumference, maxFloatDelta)
     }
 }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
index e8184e178..afc473d79 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
@@ -12,21 +12,21 @@ class LineTests {
 
     @Test
     fun lineTest() {
-        val straight = Straight(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
+        val straight = StraightSegment(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
         assertEquals(sqrt(100.0.pow(2) + 100.0.pow(2)), straight.length)
         assertEquals(45.0, straight.theta.radiansToDegrees())
     }
 
     @Test
     fun lineAngleTest() {
-        val zero = Vector2D(0.0, 0.0)
-        val north = Straight(Euclidean2DSpace.zero, Vector2D(0.0, 2.0))
+        //val zero = Vector2D(0.0, 0.0)
+        val north = StraightSegment(Euclidean2DSpace.zero, Vector2D(0.0, 2.0))
         assertEquals(0.0, north.theta.radiansToDegrees())
-        val east = Straight(Euclidean2DSpace.zero, Vector2D(2.0, 0.0))
+        val east = StraightSegment(Euclidean2DSpace.zero, Vector2D(2.0, 0.0))
         assertEquals(90.0, east.theta.radiansToDegrees())
-        val south = Straight(Euclidean2DSpace.zero, Vector2D(0.0, -2.0))
+        val south = StraightSegment(Euclidean2DSpace.zero, Vector2D(0.0, -2.0))
         assertEquals(180.0, south.theta.radiansToDegrees())
-        val west = Straight(Euclidean2DSpace.zero, Vector2D(-2.0, 0.0))
+        val west = StraightSegment(Euclidean2DSpace.zero, Vector2D(-2.0, 0.0))
         assertEquals(270.0, west.theta.radiansToDegrees())
     }
 }
-- 
2.34.1


From c2025ee1c9f1323b446f992a8f80b302bcd46774 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Wed, 27 Jul 2022 14:31:55 +0300
Subject: [PATCH 601/713] Remove Polynomial interface, fix consequent platform
 clashes. Add invariance.

---
 .../kmath/functions/LabeledPolynomial.kt      |   4 +-
 .../kmath/functions/ListPolynomial.kt         |   4 +-
 .../kmath/functions/NumberedPolynomial.kt     |   4 +-
 .../kscience/kmath/functions/Polynomial.kt    |  41 ++++--
 .../kmath/functions/RationalFunction.kt       | 130 ++++++++++++++++--
 5 files changed, 160 insertions(+), 23 deletions(-)

diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index e2320114b..6a4d1409f 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -19,7 +19,7 @@ import kotlin.math.max
  *
  * @param C the type of constants.
  */
-public data class LabeledPolynomial<C>
+public data class LabeledPolynomial<out C>
 @PublishedApi
 internal constructor(
     /**
@@ -63,7 +63,7 @@ internal constructor(
      * @usesMathJax
      */
     public val coefficients: Map<Map<Symbol, UInt>, C>
-) : Polynomial<C> {
+) {
     override fun toString(): String = "LabeledPolynomial$coefficients"
 }
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index d0e58c0d6..6ab660b63 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -19,7 +19,7 @@ import kotlin.math.min
  *
  * @param C the type of constants.
  */
-public data class ListPolynomial<C>(
+public data class ListPolynomial<out C>(
     /**
      * List that contains coefficients of the polynomial.
      *
@@ -48,7 +48,7 @@ public data class ListPolynomial<C>(
      * @usesMathJax
      */
     public val coefficients: List<C>
-) : Polynomial<C> {
+) {
     override fun toString(): String = "ListPolynomial$coefficients"
 }
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index d2fc5ffa1..267bbd91d 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -18,7 +18,7 @@ import kotlin.math.max
  *
  * @param C the type of constants.
  */
-public data class NumberedPolynomial<C>
+public data class NumberedPolynomial<out C>
 @PublishedApi
 internal constructor(
     /**
@@ -47,7 +47,7 @@ internal constructor(
      * @usesMathJax
      */
     public val coefficients: Map<List<UInt>, C>
-) : Polynomial<C> {
+) {
     override fun toString(): String = "NumberedPolynomial$coefficients"
 }
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 66308a7bc..6a11eb1bd 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -11,11 +11,6 @@ import kotlin.js.JsName
 import kotlin.jvm.JvmName
 
 
-/**
- * Abstraction of polynomials.
- */
-public interface Polynomial<C>
-
 /**
  * Abstraction of ring of polynomials of type [P] over ring of constants of type [C].
  *
@@ -23,24 +18,27 @@ public interface Polynomial<C>
  * @param P the type of polynomials.
  */
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
-public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
+public interface PolynomialSpace<C, P> : Ring<P> {
     /**
      * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
+    @JvmName("plusConstantInt")
     public operator fun C.plus(other: Int): C
     /**
      * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
+    @JvmName("minusConstantInt")
     public operator fun C.minus(other: Int): C
     /**
      * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
+    @JvmName("timesConstantInt")
     public operator fun C.times(other: Int): C
 
     /**
@@ -48,18 +46,21 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
+    @JvmName("plusIntConstant")
     public operator fun Int.plus(other: C): C
     /**
      * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
+    @JvmName("minusIntConstant")
     public operator fun Int.minus(other: C): C
     /**
      * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
+    @JvmName("timesIntConstant")
     public operator fun Int.times(other: C): C
 
     /**
@@ -167,27 +168,33 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
     /**
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("plusConstantPolynomial")
     public operator fun C.plus(other: P): P
     /**
      * Returns difference between the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("minusConstantPolynomial")
     public operator fun C.minus(other: P): P
     /**
      * Returns product of the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("timesConstantPolynomial")
     public operator fun C.times(other: P): P
 
     /**
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("plusPolynomialConstant")
     public operator fun P.plus(other: C): P
     /**
      * Returns difference between the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("minusPolynomialConstant")
     public operator fun P.minus(other: C): P
     /**
      * Returns product of the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("timesPolynomialConstant")
     public operator fun P.times(other: C): P
 
     /**
@@ -252,7 +259,7 @@ public interface PolynomialSpace<C, P: Polynomial<C>> : Ring<P> {
  * @param A the type of algebraic structure (precisely, of ring) provided for constants.
  */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, out A: Ring<C>> : PolynomialSpace<C, P> {
+public interface PolynomialSpaceOverRing<C, P, out A: Ring<C>> : PolynomialSpace<C, P> {
 
     /**
      * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
@@ -264,18 +271,21 @@ public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, out A: Ring<C>> :
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
+    @JvmName("plusConstantInt")
     public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
     /**
      * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
+    @JvmName("minusConstantInt")
     public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
     /**
      * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
+    @JvmName("timesConstantInt")
     public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
 
     /**
@@ -283,18 +293,21 @@ public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, out A: Ring<C>> :
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
+    @JvmName("plusIntConstant")
     public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
     /**
      * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
+    @JvmName("minusIntConstant")
     public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
     /**
      * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
+    @JvmName("timesIntConstant")
     public override operator fun Int.times(other: C): C = ring { multiplyByDoubling(other, this@times) }
 
     /**
@@ -341,69 +354,81 @@ public interface PolynomialSpaceOverRing<C, P: Polynomial<C>, out A: Ring<C>> :
  * @param P the type of polynomials.
  */
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface MultivariatePolynomialSpace<C, V, P: Polynomial<C>>: PolynomialSpace<C, P> {
+public interface MultivariatePolynomialSpace<C, V, P>: PolynomialSpace<C, P> {
     /**
      * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
      */
     @JvmName("plusVariableInt")
+    @JsName("plusVariableInt")
     public operator fun V.plus(other: Int): P
     /**
      * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
      */
     @JvmName("minusVariableInt")
+    @JsName("minusVariableInt")
     public operator fun V.minus(other: Int): P
     /**
      * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
      */
     @JvmName("timesVariableInt")
+    @JsName("timesVariableInt")
     public operator fun V.times(other: Int): P
 
     /**
      * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
      */
     @JvmName("plusIntVariable")
+    @JsName("plusIntVariable")
     public operator fun Int.plus(other: V): P
     /**
      * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
      */
     @JvmName("minusIntVariable")
+    @JsName("minusIntVariable")
     public operator fun Int.minus(other: V): P
     /**
      * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
      */
     @JvmName("timesIntVariable")
+    @JsName("timesIntVariable")
     public operator fun Int.times(other: V): P
 
     /**
      * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
      */
     @JvmName("plusVariableConstant")
+    @JsName("plusVariableConstant")
     public operator fun V.plus(other: C): P
     /**
      * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
      */
     @JvmName("minusVariableConstant")
+    @JsName("minusVariableConstant")
     public operator fun V.minus(other: C): P
     /**
      * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
      */
     @JvmName("timesVariableConstant")
+    @JsName("timesVariableConstant")
     public operator fun V.times(other: C): P
 
     /**
      * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
      */
     @JvmName("plusConstantVariable")
+    @JsName("plusConstantVariable")
     public operator fun C.plus(other: V): P
     /**
      * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
      */
     @JvmName("minusConstantVariable")
+    @JsName("minusConstantVariable")
     public operator fun C.minus(other: V): P
     /**
      * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
      */
     @JvmName("timesConstantVariable")
+    @JsName("timesConstantVariable")
     public operator fun C.times(other: V): P
 
     /**
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index da91c8d61..3c1548516 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -14,7 +14,7 @@ import kotlin.jvm.JvmName
 /**
  * Abstraction of rational function.
  */
-public interface RationalFunction<C, P: Polynomial<C>> {
+public interface RationalFunction<C, P> {
     public val numerator: P
     public val denominator: P
     public operator fun component1(): P = numerator
@@ -30,24 +30,27 @@ public interface RationalFunction<C, P: Polynomial<C>> {
  * @param R the type of rational functions.
  */
 @Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
-public interface RationalFunctionSpace<C, P: Polynomial<C>, R: RationalFunction<C, P>> : Ring<R> {
+public interface RationalFunctionSpace<C, P, R: RationalFunction<C, P>> : Ring<R> {
     /**
      * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
+    @JvmName("plusConstantInt")
     public operator fun C.plus(other: Int): C
     /**
      * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
+    @JvmName("minusConstantInt")
     public operator fun C.minus(other: Int): C
     /**
      * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
+    @JvmName("timesConstantInt")
     public operator fun C.times(other: Int): C
 
     /**
@@ -55,18 +58,21 @@ public interface RationalFunctionSpace<C, P: Polynomial<C>, R: RationalFunction<
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
+    @JvmName("plusIntConstant")
     public operator fun Int.plus(other: C): C
     /**
      * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
+    @JvmName("minusIntConstant")
     public operator fun Int.minus(other: C): C
     /**
      * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
+    @JvmName("timesIntConstant")
     public operator fun Int.times(other: C): C
 
     /**
@@ -83,18 +89,21 @@ public interface RationalFunctionSpace<C, P: Polynomial<C>, R: RationalFunction<
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
+    @JvmName("plusPolynomialInt")
     public operator fun P.plus(other: Int): P
     /**
      * Returns difference between the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
+    @JvmName("minusPolynomialInt")
     public operator fun P.minus(other: Int): P
     /**
      * Returns product of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
+    @JvmName("timesPolynomialInt")
     public operator fun P.times(other: Int): P
 
     /**
@@ -102,18 +111,21 @@ public interface RationalFunctionSpace<C, P: Polynomial<C>, R: RationalFunction<
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
+    @JvmName("plusIntPolynomial")
     public operator fun Int.plus(other: P): P
     /**
      * Returns difference between the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
+    @JvmName("minusIntPolynomial")
     public operator fun Int.minus(other: P): P
     /**
      * Returns product of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
+    @JvmName("timesIntPolynomial")
     public operator fun Int.times(other: P): P
 
     /**
@@ -235,27 +247,33 @@ public interface RationalFunctionSpace<C, P: Polynomial<C>, R: RationalFunction<
     /**
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("plusConstantPolynomial")
     public operator fun C.plus(other: P): P
     /**
      * Returns difference between the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("minusConstantPolynomial")
     public operator fun C.minus(other: P): P
     /**
      * Returns product of the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("timesConstantPolynomial")
     public operator fun C.times(other: P): P
 
     /**
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("plusPolynomialConstant")
     public operator fun P.plus(other: C): P
     /**
      * Returns difference between the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("minusPolynomialConstant")
     public operator fun P.minus(other: C): P
     /**
      * Returns product of the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("timesPolynomialConstant")
     public operator fun P.times(other: C): P
 
     /**
@@ -270,30 +288,37 @@ public interface RationalFunctionSpace<C, P: Polynomial<C>, R: RationalFunction<
     /**
      * Returns the same polynomial.
      */
+    @JvmName("unaryPlusPolynomial")
     public operator fun P.unaryPlus(): P = this
     /**
      * Returns negation of the polynomial.
      */
+    @JvmName("unaryMinusPolynomial")
     public operator fun P.unaryMinus(): P
     /**
      * Returns sum of the polynomials.
      */
+    @JvmName("plusPolynomialPolynomial")
     public operator fun P.plus(other: P): P
     /**
      * Returns difference of the polynomials.
      */
+    @JvmName("minusPolynomialPolynomial")
     public operator fun P.minus(other: P): P
     /**
      * Returns product of the polynomials.
      */
+    @JvmName("timesPolynomialPolynomial")
     public operator fun P.times(other: P): P
     /**
      * Returns quotient of the polynomials as rational function.
      */
+    @JvmName("divPolynomialPolynomial")
     public operator fun P.div(other: P): R
     /**
      * Raises [arg] to the integer power [exponent].
      */
+    @JvmName("powerPolynomial")
     public fun power(arg: P, exponent: UInt) : P
 
     /**
@@ -308,87 +333,107 @@ public interface RationalFunctionSpace<C, P: Polynomial<C>, R: RationalFunction<
     /**
      * Returns sum of the constant represented as a rational function and the rational function.
      */
+    @JvmName("plusConstantRational")
     public operator fun C.plus(other: R): R
     /**
      * Returns difference between the constant represented as a polynomial and the rational function.
      */
+    @JvmName("minusConstantRational")
     public operator fun C.minus(other: R): R
     /**
      * Returns product of the constant represented as a polynomial and the rational function.
      */
+    @JvmName("timesConstantRational")
     public operator fun C.times(other: R): R
     /**
      * Returns quotient of the constant represented as a polynomial and the rational function.
      */
+    @JvmName("divConstantRational")
     public operator fun C.div(other: R): R
 
     /**
      * Returns sum of the rational function and the constant represented as a rational function.
      */
+    @JvmName("plusRationalConstant")
     public operator fun R.plus(other: C): R
     /**
      * Returns difference between the rational function and the constant represented as a rational function.
      */
+    @JvmName("minusRationalConstant")
     public operator fun R.minus(other: C): R
     /**
      * Returns product of the rational function and the constant represented as a rational function.
      */
+    @JvmName("timesRationalConstant")
     public operator fun R.times(other: C): R
     /**
      * Returns quotient of the rational function and the constant represented as a rational function.
      */
+    @JvmName("divRationalConstant")
     public operator fun R.div(other: C): R
 
     /**
      * Converts the constant [value] to rational function.
      */
+    @JvmName("numberConstant")
     public fun number(value: C): R = one * value
     /**
      * Converts the constant to rational function.
      */
+    @JvmName("asRationalFunctionConstant")
     public fun C.asRationalFunction(): R = number(this)
 
     /**
      * Returns sum of the polynomial represented as a rational function and the rational function.
      */
+    @JvmName("plusPolynomialRational")
     public operator fun P.plus(other: R): R
     /**
      * Returns difference between the polynomial represented as a polynomial and the rational function.
      */
+    @JvmName("minusPolynomialRational")
     public operator fun P.minus(other: R): R
     /**
      * Returns product of the polynomial represented as a polynomial and the rational function.
      */
+    @JvmName("timesPolynomialRational")
     public operator fun P.times(other: R): R
     /**
      * Returns quotient of the polynomial represented as a polynomial and the rational function.
      */
+    @JvmName("divPolynomialRational")
     public operator fun P.div(other: R): R
 
     /**
      * Returns sum of the rational function and the polynomial represented as a rational function.
      */
+    @JvmName("plusRationalPolynomial")
     public operator fun R.plus(other: P): R
     /**
      * Returns difference between the rational function and the polynomial represented as a rational function.
      */
+    @JvmName("minusRationalPolynomial")
     public operator fun R.minus(other: P): R
     /**
      * Returns product of the rational function and the polynomial represented as a rational function.
      */
+    @JvmName("timesRationalPolynomial")
     public operator fun R.times(other: P): R
     /**
      * Returns quotient of the rational function and the polynomial represented as a rational function.
      */
+    @JvmName("divRationalPolynomial")
     public operator fun R.div(other: P): R
 
     /**
      * Converts the polynomial [value] to rational function.
      */
+    @JvmName("numberPolynomial")
     public fun number(value: P): R = one * value
     /**
      * Converts the polynomial to rational function.
      */
+    @JvmName("asRationalFunctionPolynomial")
     public fun P.asRationalFunction(): R = number(this)
 
     /**
@@ -462,7 +507,7 @@ public interface RationalFunctionSpace<C, P: Polynomial<C>, R: RationalFunction<
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface RationalFunctionSpaceOverRing<
         C,
-        P: Polynomial<C>,
+        P,
         R: RationalFunction<C, P>,
         out A: Ring<C>
         > : RationalFunctionSpace<C, P, R> {
@@ -477,18 +522,21 @@ public interface RationalFunctionSpaceOverRing<
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
+    @JvmName("plusConstantInt")
     public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
     /**
      * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
+    @JvmName("minusConstantInt")
     public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
     /**
      * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
+    @JvmName("timesConstantInt")
     public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
 
     /**
@@ -496,18 +544,21 @@ public interface RationalFunctionSpaceOverRing<
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
+    @JvmName("plusIntConstant")
     public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
     /**
      * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
+    @JvmName("minusIntConstant")
     public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
     /**
      * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
+    @JvmName("timesIntConstant")
     public override operator fun Int.times(other: C): C = ring { multiplyByDoubling(other, this@times) }
 
     /**
@@ -564,7 +615,7 @@ public interface RationalFunctionSpaceOverRing<
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public interface RationalFunctionSpaceOverPolynomialSpace<
         C,
-        P: Polynomial<C>,
+        P,
         R: RationalFunction<C, P>,
         out AP: PolynomialSpace<C, P>,
         > : RationalFunctionSpace<C, P, R> {
@@ -579,18 +630,21 @@ public interface RationalFunctionSpaceOverPolynomialSpace<
      *
      * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
      */
+    @JvmName("plusConstantInt")
     public override operator fun C.plus(other: Int): C = polynomialRing { this@plus + other }
     /**
      * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
      */
+    @JvmName("minusConstantInt")
     public override operator fun C.minus(other: Int): C = polynomialRing { this@minus - other }
     /**
      * Returns product of the constant and the integer represented as a constant (member of underlying ring).
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
+    @JvmName("timesConstantInt")
     public override operator fun C.times(other: Int): C = polynomialRing { this@times * other }
 
     /**
@@ -598,18 +652,21 @@ public interface RationalFunctionSpaceOverPolynomialSpace<
      *
      * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
      */
+    @JvmName("plusIntConstant")
     public override operator fun Int.plus(other: C): C = polynomialRing { this@plus + other }
     /**
      * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
      */
+    @JvmName("minusIntConstant")
     public override operator fun Int.minus(other: C): C = polynomialRing { this@minus - other }
     /**
      * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
+    @JvmName("timesIntConstant")
     public override operator fun Int.times(other: C): C = polynomialRing { this@times * other }
 
     /**
@@ -626,18 +683,21 @@ public interface RationalFunctionSpaceOverPolynomialSpace<
      *
      * The operation is equivalent to adding [other] copies of unit polynomial to [this].
      */
+    @JvmName("plusPolynomialInt")
     public override operator fun P.plus(other: Int): P = polynomialRing { this@plus + other }
     /**
      * Returns difference between the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
      */
+    @JvmName("minusPolynomialInt")
     public override operator fun P.minus(other: Int): P = polynomialRing { this@minus - other }
     /**
      * Returns product of the constant and the integer represented as a polynomial.
      *
      * The operation is equivalent to sum of [other] copies of [this].
      */
+    @JvmName("timesPolynomialInt")
     public override operator fun P.times(other: Int): P = polynomialRing { this@times * other }
 
     /**
@@ -645,18 +705,21 @@ public interface RationalFunctionSpaceOverPolynomialSpace<
      *
      * The operation is equivalent to adding [this] copies of unit polynomial to [other].
      */
+    @JvmName("plusIntPolynomial")
     public override operator fun Int.plus(other: P): P = polynomialRing { this@plus + other }
     /**
      * Returns difference between the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
      */
+    @JvmName("minusIntPolynomial")
     public override operator fun Int.minus(other: P): P = polynomialRing { this@minus - other }
     /**
      * Returns product of the integer represented as a polynomial and the constant.
      *
      * The operation is equivalent to sum of [this] copies of [other].
      */
+    @JvmName("timesIntPolynomial")
     public override operator fun Int.times(other: P): P = polynomialRing { this@times * other }
 
     /**
@@ -711,27 +774,33 @@ public interface RationalFunctionSpaceOverPolynomialSpace<
     /**
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("plusConstantPolynomial")
     public override operator fun C.plus(other: P): P = polynomialRing { this@plus + other }
     /**
      * Returns difference between the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("minusConstantPolynomial")
     public override operator fun C.minus(other: P): P = polynomialRing { this@minus - other }
     /**
      * Returns product of the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("timesConstantPolynomial")
     public override operator fun C.times(other: P): P = polynomialRing { this@times * other }
 
     /**
      * Returns sum of the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("plusPolynomialConstant")
     public override operator fun P.plus(other: C): P = polynomialRing { this@plus + other }
     /**
      * Returns difference between the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("minusPolynomialConstant")
     public override operator fun P.minus(other: C): P = polynomialRing { this@minus - other }
     /**
      * Returns product of the constant represented as a polynomial and the polynomial.
      */
+    @JvmName("timesPolynomialConstant")
     public override operator fun P.times(other: C): P = polynomialRing { this@times * other }
 
     /**
@@ -746,26 +815,32 @@ public interface RationalFunctionSpaceOverPolynomialSpace<
     /**
      * Returns the same polynomial.
      */
+    @JvmName("unaryPlusPolynomial")
     public override operator fun P.unaryPlus(): P = polynomialRing { +this@unaryPlus }
     /**
      * Returns negation of the polynomial.
      */
+    @JvmName("unaryMinusPolynomial")
     public override operator fun P.unaryMinus(): P = polynomialRing { -this@unaryMinus }
     /**
      * Returns sum of the polynomials.
      */
+    @JvmName("plusPolynomialPolynomial")
     public override operator fun P.plus(other: P): P = polynomialRing { this@plus + other }
     /**
      * Returns difference of the polynomials.
      */
+    @JvmName("minusPolynomialPolynomial")
     public override operator fun P.minus(other: P): P = polynomialRing { this@minus - other }
     /**
      * Returns product of the polynomials.
      */
+    @JvmName("timesPolynomialPolynomial")
     public override operator fun P.times(other: P): P = polynomialRing { this@times * other }
     /**
      * Raises [arg] to the integer power [exponent].
      */
+    @JvmName("powerPolynomial")
     public override fun power(arg: P, exponent: UInt) : P = polynomialRing { power(arg, exponent) }
 
     /**
@@ -796,7 +871,7 @@ public interface RationalFunctionSpaceOverPolynomialSpace<
 @Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
 public abstract class PolynomialSpaceOfFractions<
         C,
-        P: Polynomial<C>,
+        P,
         R: RationalFunction<C, P>,
         > : RationalFunctionSpace<C, P, R> {
 
@@ -897,11 +972,13 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns quotient of the polynomials as rational function.
      */
+    @JvmName("divPolynomialPolynomial")
     public override operator fun P.div(other: P): R = constructRationalFunction(this, other)
 
     /**
      * Returns sum of the constant represented as a rational function and the rational function.
      */
+    @JvmName("plusConstantRational")
     public override operator fun C.plus(other: R): R =
         constructRationalFunction(
             other.denominator * this + other.numerator,
@@ -910,6 +987,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns difference between the constant represented as a polynomial and the rational function.
      */
+    @JvmName("minusConstantRational")
     public override operator fun C.minus(other: R): R =
         constructRationalFunction(
             other.denominator * this - other.numerator,
@@ -918,6 +996,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns product of the constant represented as a polynomial and the rational function.
      */
+    @JvmName("timesConstantRational")
     public override operator fun C.times(other: R): R =
         constructRationalFunction(
             this * other.numerator,
@@ -926,6 +1005,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns quotient of the constant represented as a polynomial and the rational function.
      */
+    @JvmName("divConstantRational")
     public override operator fun C.div(other: R): R =
         constructRationalFunction(
             this * other.denominator,
@@ -935,6 +1015,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns sum of the constant represented as a rational function and the rational function.
      */
+    @JvmName("plusRationalConstant")
     public override operator fun R.plus(other: C): R =
         constructRationalFunction(
             numerator + denominator * other,
@@ -943,6 +1024,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns difference between the constant represented as a rational function and the rational function.
      */
+    @JvmName("minusRationalConstant")
     public override operator fun R.minus(other: C): R =
         constructRationalFunction(
             numerator - denominator * other,
@@ -951,6 +1033,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns product of the constant represented as a rational function and the rational function.
      */
+    @JvmName("timesRationalConstant")
     public override operator fun R.times(other: C): R =
         constructRationalFunction(
             numerator * other,
@@ -959,6 +1042,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns quotient of the rational function and the constant represented as a rational function.
      */
+    @JvmName("divRationalConstant")
     public override operator fun R.div(other: C): R =
         constructRationalFunction(
             numerator,
@@ -968,11 +1052,13 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Converts the constant [value] to rational function.
      */
+    @JvmName("numberConstant")
     public override fun number(value: C): R = constructRationalFunction(polynomialNumber(value))
 
     /**
      * Returns sum of the polynomial represented as a rational function and the rational function.
      */
+    @JvmName("plusPolynomialRational")
     public override operator fun P.plus(other: R): R =
         constructRationalFunction(
             other.denominator * this + other.numerator,
@@ -981,6 +1067,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns difference between the polynomial represented as a polynomial and the rational function.
      */
+    @JvmName("minusPolynomialRational")
     public override operator fun P.minus(other: R): R =
         constructRationalFunction(
             other.denominator * this - other.numerator,
@@ -989,6 +1076,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns product of the polynomial represented as a polynomial and the rational function.
      */
+    @JvmName("timesPolynomialRational")
     public override operator fun P.times(other: R): R =
         constructRationalFunction(
             this * other.numerator,
@@ -997,6 +1085,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns quotient of the polynomial represented as a polynomial and the rational function.
      */
+    @JvmName("divPolynomialRational")
     public override operator fun P.div(other: R): R =
         constructRationalFunction(
             this * other.denominator,
@@ -1006,6 +1095,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns sum of the polynomial represented as a rational function and the rational function.
      */
+    @JvmName("plusRationalPolynomial")
     public override operator fun R.plus(other: P): R =
         constructRationalFunction(
             numerator + denominator * other,
@@ -1014,6 +1104,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns difference between the polynomial represented as a rational function and the rational function.
      */
+    @JvmName("minusRationalPolynomial")
     public override operator fun R.minus(other: P): R =
         constructRationalFunction(
             numerator - denominator * other,
@@ -1022,6 +1113,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns product of the polynomial represented as a rational function and the rational function.
      */
+    @JvmName("timesRationalPolynomial")
     public override operator fun R.times(other: P): R =
         constructRationalFunction(
             numerator * other,
@@ -1030,6 +1122,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Returns quotient of the rational function and the polynomial represented as a rational function.
      */
+    @JvmName("divRationalPolynomial")
     public override operator fun R.div(other: P): R =
         constructRationalFunction(
             numerator,
@@ -1039,6 +1132,7 @@ public abstract class PolynomialSpaceOfFractions<
     /**
      * Converts the polynomial [value] to rational function.
      */
+    @JvmName("numberPolynomial")
     public override fun number(value: P): R = constructRationalFunction(value)
 
     /**
@@ -1110,97 +1204,114 @@ public abstract class PolynomialSpaceOfFractions<
 public interface MultivariateRationalFunctionSpace<
         C,
         V,
-        P: Polynomial<C>,
+        P,
         R: RationalFunction<C, P>
         >: RationalFunctionSpace<C, P, R> {
     /**
      * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
      */
     @JvmName("plusVariableInt")
+    @JsName("plusVariableInt")
     public operator fun V.plus(other: Int): P
     /**
      * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
      */
     @JvmName("minusVariableInt")
+    @JsName("minusVariableInt")
     public operator fun V.minus(other: Int): P
     /**
      * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
      */
     @JvmName("timesVariableInt")
+    @JsName("timesVariableInt")
     public operator fun V.times(other: Int): P
 
     /**
      * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
      */
     @JvmName("plusIntVariable")
+    @JsName("plusIntVariable")
     public operator fun Int.plus(other: V): P
     /**
      * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
      */
     @JvmName("minusIntVariable")
+    @JsName("minusIntVariable")
     public operator fun Int.minus(other: V): P
     /**
      * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
      */
     @JvmName("timesIntVariable")
+    @JsName("timesIntVariable")
     public operator fun Int.times(other: V): P
 
     /**
      * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
      */
     @JvmName("plusVariableConstant")
+    @JsName("plusVariableConstant")
     public operator fun V.plus(other: C): P
     /**
      * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
      */
     @JvmName("minusVariableConstant")
+    @JsName("minusVariableConstant")
     public operator fun V.minus(other: C): P
     /**
      * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
      */
     @JvmName("timesVariableConstant")
+    @JsName("timesVariableConstant")
     public operator fun V.times(other: C): P
 
     /**
      * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
      */
     @JvmName("plusConstantVariable")
+    @JsName("plusConstantVariable")
     public operator fun C.plus(other: V): P
     /**
      * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
      */
     @JvmName("minusConstantVariable")
+    @JsName("minusConstantVariable")
     public operator fun C.minus(other: V): P
     /**
      * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
      */
     @JvmName("timesConstantVariable")
+    @JsName("timesConstantVariable")
     public operator fun C.times(other: V): P
 
     /**
      * Represents the variable as a monic monomial.
      */
     @JvmName("unaryPlusVariable")
+    @JsName("unaryPlusVariable")
     public operator fun V.unaryPlus(): P
     /**
      * Returns negation of representation of the variable as a monic monomial.
      */
     @JvmName("unaryMinusVariable")
+    @JsName("unaryMinusVariable")
     public operator fun V.unaryMinus(): P
     /**
      * Returns sum of the variables represented as monic monomials.
      */
     @JvmName("plusVariableVariable")
+    @JsName("plusVariableVariable")
     public operator fun V.plus(other: V): P
     /**
      * Returns difference between the variables represented as monic monomials.
      */
     @JvmName("minusVariableVariable")
+    @JsName("minusVariableVariable")
     public operator fun V.minus(other: V): P
     /**
      * Returns product of the variables represented as monic monomials.
      */
     @JvmName("timesVariableVariable")
+    @JsName("timesVariableVariable")
     public operator fun V.times(other: V): P
 
     /**
@@ -1218,11 +1329,13 @@ public interface MultivariateRationalFunctionSpace<
      * Represents the [variable] as a rational function.
      */
     @JvmName("numberVariable")
+    @JsName("numberVariable")
     public fun number(variable: V): R = number(polynomialNumber(variable))
     /**
      * Represents the variable as a rational function.
      */
     @JvmName("asRationalFunctionVariable")
+    @JsName("asRationalFunctionVariable")
     public fun V.asRationalFunction(): R = number(this)
 
     /**
@@ -1339,7 +1452,7 @@ public interface MultivariateRationalFunctionSpace<
 public interface MultivariateRationalFunctionSpaceOverMultivariatePolynomialSpace<
         C,
         V,
-        P: Polynomial<C>,
+        P,
         R: RationalFunction<C, P>,
         out AP: MultivariatePolynomialSpace<C, V, P>,
         > : RationalFunctionSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionSpace<C, V, P, R> {
@@ -1516,7 +1629,7 @@ public interface MultivariateRationalFunctionSpaceOverMultivariatePolynomialSpac
 public abstract class MultivariatePolynomialSpaceOfFractions<
         C,
         V,
-        P: Polynomial<C>,
+        P,
         R: RationalFunction<C, P>,
         > : MultivariateRationalFunctionSpace<C, V, P, R>,  PolynomialSpaceOfFractions<C, P, R>() {
     /**
@@ -1568,7 +1681,6 @@ public abstract class MultivariatePolynomialSpaceOfFractions<
     /**
      * Returns product of the rational function and the variable represented as a rational function.
      */
-    @JvmName("timesRationalVariable")
     public override operator fun R.times(other: V): R =
         constructRationalFunction(
             numerator * other,
-- 
2.34.1


From 137ddb3ade4f57ee11d2fb05defaa68829d93925 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 29 Jul 2022 14:12:44 +0300
Subject: [PATCH 602/713] Code simplification for Dubins path

---
 .../trajectory/{dubins => }/DubinsPath.kt     | 75 ++++++++++++++++---
 .../space/kscience/kmath/trajectory/Pose2D.kt | 33 ++++++++
 .../trajectory/{segments => }/Trajectory.kt   | 17 +++--
 .../kmath/trajectory/TrajectoryCost.kt        | 14 ++++
 .../trajectory/dubins/trajectoryFunctions.kt  | 72 ------------------
 .../space/kscience/kmath/trajectory/route.kt  | 16 ++++
 .../kmath/trajectory/segments/Pose2D.kt       | 21 ------
 .../space/kscience/kmath/trajectory/Math.kt   |  2 -
 .../kmath/trajectory/dubins/DubinsTests.kt    | 16 ++--
 .../kmath/trajectory/segments/ArcTests.kt     |  1 +
 .../kmath/trajectory/segments/LineTests.kt    |  1 +
 11 files changed, 146 insertions(+), 122 deletions(-)
 rename kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/{dubins => }/DubinsPath.kt (67%)
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt
 rename kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/{segments => }/Trajectory.kt (85%)
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/TrajectoryCost.kt
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/trajectoryFunctions.kt
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Pose2D.kt

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
similarity index 67%
rename from kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
rename to kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
index f510e3572..134342b33 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
@@ -3,24 +3,79 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.trajectory.dubins
+package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
 import space.kscience.kmath.geometry.Vector2D
-import space.kscience.kmath.trajectory.segments.ArcSegment
-import space.kscience.kmath.trajectory.segments.Pose2D
-import space.kscience.kmath.trajectory.segments.StraightSegment
-import space.kscience.kmath.trajectory.segments.Trajectory
+import kotlin.math.PI
 import kotlin.math.acos
 import kotlin.math.cos
 import kotlin.math.sin
 
+internal fun Pose2D.getLeftCircle(radius: Double): Circle2D = getTangentCircles(radius).first
+
+internal fun Pose2D.getRightCircle(radius: Double): Circle2D = getTangentCircles(radius).second
+
+internal fun Pose2D.getTangentCircles(radius: Double): Pair<Circle2D, Circle2D> {
+    val dX = radius * cos(theta)
+    val dY = radius * sin(theta)
+    return Circle2D(Vector2D(x - dX, y + dY), radius) to Circle2D(Vector2D(x + dX, y - dY), radius)
+}
+
+internal fun leftOuterTangent(a: Circle2D, b: Circle2D): StraightSegment = outerTangent(a, b, ArcSegment.Direction.LEFT)
+
+internal fun rightOuterTangent(a: Circle2D, b: Circle2D): StraightSegment = outerTangent(a, b,
+    ArcSegment.Direction.RIGHT
+)
+
+private fun outerTangent(a: Circle2D, b: Circle2D, side: ArcSegment.Direction): StraightSegment {
+    val centers = StraightSegment(a.center, b.center)
+    val p1 = when (side) {
+        ArcSegment.Direction.LEFT -> Vector2D(
+            a.center.x - a.radius * cos(centers.theta),
+            a.center.y + a.radius * sin(centers.theta)
+        )
+        ArcSegment.Direction.RIGHT -> Vector2D(
+            a.center.x + a.radius * cos(centers.theta),
+            a.center.y - a.radius * sin(centers.theta)
+        )
+    }
+    return StraightSegment(
+        p1,
+        Vector2D(p1.x + (centers.end.x - centers.start.x), p1.y + (centers.end.y - centers.start.y))
+    )
+}
+
+internal fun leftInnerTangent(base: Circle2D, direction: Circle2D): StraightSegment? =
+    innerTangent(base, direction, ArcSegment.Direction.LEFT)
+
+internal fun rightInnerTangent(base: Circle2D, direction: Circle2D): StraightSegment? =
+    innerTangent(base, direction, ArcSegment.Direction.RIGHT)
+
+private fun innerTangent(base: Circle2D, direction: Circle2D, side: ArcSegment.Direction): StraightSegment? {
+    val centers = StraightSegment(base.center, direction.center)
+    if (centers.length < base.radius * 2) return null
+    val angle = theta(
+        when (side) {
+            ArcSegment.Direction.LEFT -> centers.theta + acos(base.radius * 2 / centers.length)
+            ArcSegment.Direction.RIGHT -> centers.theta - acos(base.radius * 2 / centers.length)
+        }
+    )
+    val dX = base.radius * sin(angle)
+    val dY = base.radius * cos(angle)
+    val p1 = Vector2D(base.center.x + dX, base.center.y + dY)
+    val p2 = Vector2D(direction.center.x - dX, direction.center.y - dY)
+    return StraightSegment(p1, p2)
+}
+
+internal fun theta(theta: Double): Double = (theta + (2 * PI)) % (2 * PI)
+
 public class DubinsPath(
     public val a: ArcSegment,
     public val b: Trajectory,
     public val c: ArcSegment,
-) : Trajectory {
+) : CompositeTrajectory(listOf(a,b,c)) {
 
     public val type: TYPE = TYPE.valueOf(
         arrayOf(
@@ -30,8 +85,6 @@ public class DubinsPath(
         ).toCharArray().concatToString()
     )
 
-    override val length: Double get() = a.length + b.length + c.length
-
     public enum class TYPE {
         RLR, LRL, RSR, LSL, RSL, LSR
     }
@@ -119,7 +172,7 @@ public class DubinsPath(
             val c1 = start.getRightCircle(turningRadius)
             val c2 = end.getLeftCircle(turningRadius)
             val s = rightInnerTangent(c1, c2)
-            if (c1.center.distanceTo(c2.center) < turningRadius * 2 || s == null) return null
+            if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
 
             val a1 = ArcSegment.of(c1.center, start, s.start, ArcSegment.Direction.RIGHT)
             val a3 = ArcSegment.of(c2.center, s.end, end, ArcSegment.Direction.LEFT)
@@ -130,11 +183,11 @@ public class DubinsPath(
             val c1 = start.getLeftCircle(turningRadius)
             val c2 = end.getRightCircle(turningRadius)
             val s = leftInnerTangent(c1, c2)
-            if (c1.center.distanceTo(c2.center) < turningRadius * 2 || s == null) return null
+            if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
 
             val a1 = ArcSegment.of(c1.center, start, s.start, ArcSegment.Direction.LEFT)
             val a3 = ArcSegment.of(c2.center, s.end, end, ArcSegment.Direction.RIGHT)
             return DubinsPath(a1, s, a3)
         }
     }
-}
+}
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt
new file mode 100644
index 000000000..1f7c4a52e
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory
+
+import space.kscience.kmath.geometry.Vector
+import space.kscience.kmath.geometry.Vector2D
+import kotlin.math.atan2
+
+/**
+ * Combination of [Vector] and its view angle
+ */
+public interface Pose2D: Vector2D{
+    public val coordinate: Vector2D
+    public val theta: Double
+}
+
+public class PhaseVector2D(
+    override val coordinate: Vector2D,
+    public val velocity: Vector2D
+): Pose2D, Vector2D by coordinate{
+    override val theta: Double get() = atan2(velocity.y, velocity.x)
+}
+
+internal class Pose2DImpl(
+    override val coordinate: Vector2D,
+    override val theta: Double
+) : Pose2D, Vector2D by coordinate
+
+
+public fun Pose2D(coordinate: Vector2D, theta: Double): Pose2D = Pose2DImpl(coordinate, theta)
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Trajectory.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
similarity index 85%
rename from kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Trajectory.kt
rename to kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
index 453eef47f..2e97d43b0 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Trajectory.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
@@ -1,14 +1,18 @@
-package space.kscience.kmath.trajectory.segments
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
 import space.kscience.kmath.geometry.Vector2D
 import space.kscience.kmath.geometry.circumference
-import space.kscience.kmath.trajectory.dubins.theta
 import kotlin.math.PI
 import kotlin.math.atan2
 
-public interface Trajectory {
+public sealed interface Trajectory {
     public val length: Double
 }
 
@@ -69,7 +73,7 @@ public data class ArcSegment(
                 vector: Vector2D,
                 theta: Double,
                 direction: Direction,
-            ): Pose2D = Pose2D.of(
+            ): Pose2D = Pose2D(
                 vector,
                 when (direction) {
                     Direction.LEFT -> theta(theta - PI / 2)
@@ -84,6 +88,9 @@ public data class ArcSegment(
             return ArcSegment(Circle2D(center, s1.length), pose1, pose2)
         }
     }
-
+}
+
+public open class CompositeTrajectory(public val segments: Collection<Trajectory>) : Trajectory {
+    override val length: Double get() = segments.sumOf { it.length }
 }
 
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/TrajectoryCost.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/TrajectoryCost.kt
new file mode 100644
index 000000000..170851c43
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/TrajectoryCost.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory
+
+public fun interface TrajectoryCost {
+    public fun estimate(trajectory: Trajectory): Double
+
+    public companion object{
+        public val length: TrajectoryCost = TrajectoryCost { it.length }
+    }
+}
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/trajectoryFunctions.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/trajectoryFunctions.kt
deleted file mode 100644
index 18384d349..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/dubins/trajectoryFunctions.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory.dubins
-
-import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.Vector2D
-import space.kscience.kmath.trajectory.segments.Pose2D
-import space.kscience.kmath.trajectory.segments.StraightSegment
-import kotlin.math.PI
-import kotlin.math.acos
-import kotlin.math.cos
-import kotlin.math.sin
-
-private enum class SIDE {
-    LEFT, RIGHT
-}
-
-internal fun Pose2D.getLeftCircle(radius: Double): Circle2D = getTangentCircles(radius).first
-internal fun Pose2D.getRightCircle(radius: Double): Circle2D = getTangentCircles(radius).second
-internal fun Pose2D.getTangentCircles(radius: Double): Pair<Circle2D, Circle2D> {
-    val dX = radius * cos(theta)
-    val dY = radius * sin(theta)
-    return Circle2D(Vector2D(x - dX, y + dY), radius) to Circle2D(Vector2D(x + dX, y - dY), radius)
-}
-
-internal fun leftOuterTangent(a: Circle2D, b: Circle2D): StraightSegment = outerTangent(a, b, SIDE.LEFT)
-internal fun rightOuterTangent(a: Circle2D, b: Circle2D): StraightSegment = outerTangent(a, b, SIDE.RIGHT)
-
-private fun outerTangent(a: Circle2D, b: Circle2D, side: SIDE): StraightSegment {
-    val centers = StraightSegment(a.center, b.center)
-    val p1 = when (side) {
-        SIDE.LEFT -> Vector2D(
-            a.center.x - a.radius * cos(centers.theta),
-            a.center.y + a.radius * sin(centers.theta)
-        )
-        SIDE.RIGHT -> Vector2D(
-            a.center.x + a.radius * cos(centers.theta),
-            a.center.y - a.radius * sin(centers.theta)
-        )
-    }
-    return StraightSegment(
-        p1,
-        Vector2D(p1.x + (centers.end.x - centers.start.x), p1.y + (centers.end.y - centers.start.y))
-    )
-}
-
-internal fun leftInnerTangent(base: Circle2D, direction: Circle2D): StraightSegment? =
-    innerTangent(base, direction, SIDE.LEFT)
-
-internal fun rightInnerTangent(base: Circle2D, direction: Circle2D): StraightSegment? =
-    innerTangent(base, direction, SIDE.RIGHT)
-
-private fun innerTangent(base: Circle2D, direction: Circle2D, side: SIDE): StraightSegment? {
-    val centers = StraightSegment(base.center, direction.center)
-    if (centers.length < base.radius * 2) return null
-    val angle = theta(
-        when (side) {
-            SIDE.LEFT -> centers.theta + acos(base.radius * 2 / centers.length)
-            SIDE.RIGHT -> centers.theta - acos(base.radius * 2 / centers.length)
-        }
-    )
-    val dX = base.radius * sin(angle)
-    val dY = base.radius * cos(angle)
-    val p1 = Vector2D(base.center.x + dX, base.center.y + dY)
-    val p2 = Vector2D(direction.center.x - dX, direction.center.y - dY)
-    return StraightSegment(p1, p2)
-}
-
-internal fun theta(theta: Double): Double = (theta + (2 * PI)) % (2 * PI)
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt
new file mode 100644
index 000000000..f67ab124d
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory
+
+public fun interface MaxCurvature {
+    public fun compute(startPoint: PhaseVector2D): Double
+}
+
+public fun DubinsPath.Companion.shortest(
+    start: PhaseVector2D,
+    end: PhaseVector2D,
+    computer: MaxCurvature,
+): DubinsPath = shortest(start, end, computer.compute(start))
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Pose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Pose2D.kt
deleted file mode 100644
index 3df34c107..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/segments/Pose2D.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory.segments
-
-import space.kscience.kmath.geometry.Vector2D
-
-/**
- * A [Vector2D] with view direction
- */
-public data class Pose2D(
-    override val x: Double,
-    override val y: Double,
-    public val theta: Double
-) : Vector2D {
-    public companion object {
-        public fun of(vector: Vector2D, theta: Double): Pose2D = Pose2D(vector.x, vector.y, theta)
-    }
-}
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
index 4f8fda826..7ee68bd92 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
@@ -1,8 +1,6 @@
 package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Vector2D
-import space.kscience.kmath.trajectory.segments.Pose2D
-import space.kscience.kmath.trajectory.segments.StraightSegment
 import kotlin.math.PI
 import kotlin.math.abs
 import kotlin.math.sin
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
index 9069f6dd2..09375a400 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -7,13 +7,7 @@ package space.kscience.kmath.trajectory.dubins
 
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
 import space.kscience.kmath.geometry.Vector2D
-import space.kscience.kmath.trajectory.equalFloat
-import space.kscience.kmath.trajectory.equalsFloat
-import space.kscience.kmath.trajectory.inverse
-import space.kscience.kmath.trajectory.segments.ArcSegment
-import space.kscience.kmath.trajectory.segments.Pose2D
-import space.kscience.kmath.trajectory.segments.StraightSegment
-import space.kscience.kmath.trajectory.shift
+import space.kscience.kmath.trajectory.*
 import kotlin.test.Test
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
@@ -26,8 +20,8 @@ class DubinsTests {
         val straight = StraightSegment(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
         val lineP1 = straight.shift(1, 10.0).inverse()
 
-        val start = Pose2D.of(straight.end, straight.theta)
-        val end = Pose2D.of(lineP1.start, lineP1.theta)
+        val start = Pose2D(straight.end, straight.theta)
+        val end = Pose2D(lineP1.start, lineP1.theta)
         val radius = 2.0
         val dubins = DubinsPath.all(start, end, radius)
 
@@ -58,8 +52,8 @@ class DubinsTests {
                 assertTrue(path.c.start.equalsFloat(b.end))
             } else if (path.b is StraightSegment) {
                 val b = path.b as StraightSegment
-                assertTrue(path.a.end.equalsFloat(Pose2D.of(b.start, b.theta)))
-                assertTrue(path.c.start.equalsFloat(Pose2D.of(b.end, b.theta)))
+                assertTrue(path.a.end.equalsFloat(Pose2D(b.start, b.theta)))
+                assertTrue(path.c.start.equalsFloat(Pose2D(b.end, b.theta)))
             }
         }
     }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
index aa8778315..c66fa201b 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
@@ -3,6 +3,7 @@ package space.kscience.kmath.trajectory.segments
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Vector2D
 import space.kscience.kmath.geometry.circumference
+import space.kscience.kmath.trajectory.ArcSegment
 import space.kscience.kmath.trajectory.radiansToDegrees
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
index afc473d79..11eaa0fb3 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
@@ -2,6 +2,7 @@ package space.kscience.kmath.trajectory.segments
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.trajectory.StraightSegment
 import space.kscience.kmath.trajectory.radiansToDegrees
 import kotlin.math.pow
 import kotlin.math.sqrt
-- 
2.34.1


From 0e9072710fe43a17cedf780fb22331b27fb69589 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 29 Jul 2022 15:58:02 +0300
Subject: [PATCH 603/713] Kotlin 1.7.20-Beta

---
 CHANGELOG.md                                              | 1 +
 benchmarks/build.gradle.kts                               | 2 +-
 build.gradle.kts                                          | 2 +-
 buildSrc/build.gradle.kts                                 | 4 ++--
 buildSrc/settings.gradle.kts                              | 2 +-
 .../kscience/kmath/benchmarks/addBenchmarkProperties.kt   | 2 +-
 examples/build.gradle.kts                                 | 2 +-
 gradle.properties                                         | 2 +-
 kmath-ast/build.gradle.kts                                | 4 ++--
 kmath-commons/build.gradle.kts                            | 4 ++--
 kmath-complex/build.gradle.kts                            | 6 +++---
 kmath-core/build.gradle.kts                               | 6 +++---
 kmath-coroutines/build.gradle.kts                         | 8 ++++----
 kmath-dimensions/build.gradle.kts                         | 6 +++---
 kmath-ejml/build.gradle.kts                               | 4 ++--
 kmath-for-real/build.gradle.kts                           | 6 +++---
 kmath-functions/build.gradle.kts                          | 6 +++---
 kmath-geometry/build.gradle.kts                           | 6 +++---
 kmath-histograms/build.gradle.kts                         | 6 +++---
 kmath-jafama/build.gradle.kts                             | 4 ++--
 kmath-jupyter/build.gradle.kts                            | 4 ++--
 kmath-kotlingrad/build.gradle.kts                         | 4 ++--
 kmath-memory/build.gradle.kts                             | 6 +++---
 kmath-multik/build.gradle.kts                             | 4 ++--
 kmath-nd4j/build.gradle.kts                               | 4 ++--
 kmath-optimization/build.gradle.kts                       | 6 +++---
 kmath-polynomial/build.gradle.kts                         | 6 +++---
 kmath-stat/build.gradle.kts                               | 6 +++---
 kmath-symja/build.gradle.kts                              | 4 ++--
 kmath-tensorflow/build.gradle.kts                         | 4 ++--
 kmath-tensors/build.gradle.kts                            | 6 +++---
 kmath-trajectory/build.gradle.kts                         | 6 +++---
 kmath-viktor/build.gradle.kts                             | 4 ++--
 settings.gradle.kts                                       | 2 +-
 test-utils/build.gradle.kts                               | 4 ++--
 35 files changed, 77 insertions(+), 76 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4852f474a..66d83ec34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 ### Added
+- 2D optimal trajectory computation in a separate module `kmath-trajectory`
 - Autodiff for generic algebra elements in core!
 - Algebra now has an obligatory `bufferFactory` (#477).
 
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 22712816d..e86990043 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -163,7 +163,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+    maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
 }
 
 addBenchmarkProperties()
diff --git a/build.gradle.kts b/build.gradle.kts
index d8c591799..c57b29105 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.gradle.project")
+    id("space.kscience.gradle.project")
     id("org.jetbrains.kotlinx.kover") version "0.5.0"
 }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 20611e92d..9bf5d03d0 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.7.0"
+    kotlin("jvm") version "1.7.20-Beta"
     `kotlin-dsl`
     `version-catalog`
     alias(npmlibs.plugins.kotlin.plugin.serialization)
@@ -19,7 +19,7 @@ val kotlinVersion = npmlibs.versions.kotlin.asProvider().get()
 val benchmarksVersion = npmlibs.versions.kotlinx.benchmark.get()
 
 dependencies {
-    api("ru.mipt.npm:gradle-tools:$toolsVersion")
+    api("space.kscience:gradle-tools:$toolsVersion")
     api(npmlibs.atomicfu.gradle)
     //plugins form benchmarks
     api("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:$benchmarksVersion")
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index bce265510..403e0f52c 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -27,7 +27,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("npmlibs") {
-            from("ru.mipt.npm:version-catalog:$toolsVersion")
+            from("space.kscience:version-catalog:$toolsVersion")
         }
     }
 }
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
index dc9327348..33d186bfc 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
@@ -9,7 +9,7 @@ import kotlinx.benchmark.gradle.BenchmarksExtension
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import org.gradle.api.Project
-import ru.mipt.npm.gradle.KScienceReadmeExtension
+import space.kscience.gradle.KScienceReadmeExtension
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index aa5c1f47a..cfa50815d 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -68,5 +68,5 @@ tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+    maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
 }
diff --git a/gradle.properties b/gradle.properties
index 6b45ee49f..ca8c91191 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,4 +12,4 @@ org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.11.8-kotlin-1.7.10
+toolsVersion=0.12.0-kotlin-1.7.20-Beta
diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index f49c2767a..c1333eba5 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
+    id("space.kscience.gradle.common")
 }
 
 kotlin.js {
@@ -61,7 +61,7 @@ if (System.getProperty("space.kscience.kmath.ast.dump.generated.classes") == "1"
     }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+    maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/kmath-commons/build.gradle.kts b/kmath-commons/build.gradle.kts
index 96c17a215..643307b48 100644
--- a/kmath-commons/build.gradle.kts
+++ b/kmath-commons/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     kotlin("jvm")
-    id("ru.mipt.npm.gradle.common")
+    id("space.kscience.gradle.common")
 }
 
 description = "Commons math binding for kmath"
@@ -16,5 +16,5 @@ dependencies {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+    maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
 }
\ No newline at end of file
diff --git a/kmath-complex/build.gradle.kts b/kmath-complex/build.gradle.kts
index f0ce631a5..dbe96b153 100644
--- a/kmath-complex/build.gradle.kts
+++ b/kmath-complex/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.native")
 }
 
 kotlin.sourceSets {
@@ -14,7 +14,7 @@ kotlin.sourceSets {
 
 readme {
     description = "Complex numbers and quaternions."
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = space.kscience.gradle.Maturity.PROTOTYPE
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index 052924ce8..d055b5350 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("ru.mipt.npm.gradle.mpp")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.mpp")
+    id("space.kscience.gradle.native")
 }
 
 kotlin.sourceSets {
@@ -26,7 +26,7 @@ kotlin.sourceSets {
 
 readme {
     description = "Core classes, algebra definitions, basic linear algebra"
-    maturity = ru.mipt.npm.gradle.Maturity.DEVELOPMENT
+    maturity = space.kscience.gradle.Maturity.DEVELOPMENT
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/kmath-coroutines/build.gradle.kts b/kmath-coroutines/build.gradle.kts
index aa30c412b..104adf268 100644
--- a/kmath-coroutines/build.gradle.kts
+++ b/kmath-coroutines/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.native")
 }
 
 kotlin.sourceSets {
@@ -17,11 +17,11 @@ kotlin.sourceSets {
         dependencies {
             api(project(":kmath-core"))
             api(project(":kmath-complex"))
-            api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${ru.mipt.npm.gradle.KScienceVersions.coroutinesVersion}")
+            api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${space.kscience.gradle.KScienceVersions.coroutinesVersion}")
         }
     }
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+    maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
 }
\ No newline at end of file
diff --git a/kmath-dimensions/build.gradle.kts b/kmath-dimensions/build.gradle.kts
index 885f3c227..ee1950fa8 100644
--- a/kmath-dimensions/build.gradle.kts
+++ b/kmath-dimensions/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.native")
 }
 
 description = "A proof of concept module for adding type-safe dimensions to structures"
@@ -21,5 +21,5 @@ kotlin.sourceSets {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }
diff --git a/kmath-ejml/build.gradle.kts b/kmath-ejml/build.gradle.kts
index 727d21e3a..d400d6600 100644
--- a/kmath-ejml/build.gradle.kts
+++ b/kmath-ejml/build.gradle.kts
@@ -2,7 +2,7 @@ import space.kscience.kmath.ejml.codegen.ejmlCodegen
 
 plugins {
     kotlin("jvm")
-    id("ru.mipt.npm.gradle.common")
+    id("space.kscience.gradle.common")
 }
 
 dependencies {
@@ -14,7 +14,7 @@ dependencies {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = space.kscience.gradle.Maturity.PROTOTYPE
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/kmath-for-real/build.gradle.kts b/kmath-for-real/build.gradle.kts
index 18c2c50ad..6b6242c24 100644
--- a/kmath-for-real/build.gradle.kts
+++ b/kmath-for-real/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.native")
 }
 
 kotlin.sourceSets.commonMain {
@@ -16,7 +16,7 @@ readme {
         All operations are specialized to work with `Double` numbers without declaring algebraic contexts.
         One can still use generic algebras though.
         """.trimIndent()
-    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+    maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/kmath-functions/build.gradle.kts b/kmath-functions/build.gradle.kts
index 337875ba4..c68102c2e 100644
--- a/kmath-functions/build.gradle.kts
+++ b/kmath-functions/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.native")
 }
 
 description = "Functions, integration and interpolation"
@@ -19,7 +19,7 @@ dependencies {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+    maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature("piecewise", "src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt") {
diff --git a/kmath-geometry/build.gradle.kts b/kmath-geometry/build.gradle.kts
index bfe2e32a2..c9d8823bc 100644
--- a/kmath-geometry/build.gradle.kts
+++ b/kmath-geometry/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.native")
 }
 
 kotlin.sourceSets.commonMain {
@@ -11,5 +11,5 @@ kotlin.sourceSets.commonMain {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }
diff --git a/kmath-histograms/build.gradle.kts b/kmath-histograms/build.gradle.kts
index 786086c9f..94d1f5fb7 100644
--- a/kmath-histograms/build.gradle.kts
+++ b/kmath-histograms/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("ru.mipt.npm.gradle.mpp")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.mpp")
+    id("space.kscience.gradle.native")
 }
 
 //apply(plugin = "kotlinx-atomicfu")
@@ -22,5 +22,5 @@ kotlin.sourceSets {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }
diff --git a/kmath-jafama/build.gradle.kts b/kmath-jafama/build.gradle.kts
index 925a2bc60..da77f469d 100644
--- a/kmath-jafama/build.gradle.kts
+++ b/kmath-jafama/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.gradle.jvm")
+    id("space.kscience.gradle.jvm")
 }
 
 description = "Jafama integration module"
@@ -14,7 +14,7 @@ repositories {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = space.kscience.gradle.Maturity.PROTOTYPE
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature("jafama-double", "src/main/kotlin/space/kscience/kmath/jafama/") {
diff --git a/kmath-jupyter/build.gradle.kts b/kmath-jupyter/build.gradle.kts
index ca1a5485f..d92b6ca0d 100644
--- a/kmath-jupyter/build.gradle.kts
+++ b/kmath-jupyter/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.gradle.jvm")
+    id("space.kscience.gradle.jvm")
     kotlin("jupyter.api")
 }
 
@@ -14,7 +14,7 @@ kscience {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }
 
 kotlin.sourceSets.all {
diff --git a/kmath-kotlingrad/build.gradle.kts b/kmath-kotlingrad/build.gradle.kts
index 2f6d41bbb..a7f4ee37f 100644
--- a/kmath-kotlingrad/build.gradle.kts
+++ b/kmath-kotlingrad/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     kotlin("jvm")
-    id("ru.mipt.npm.gradle.common")
+    id("space.kscience.gradle.common")
 }
 
 kotlin.sourceSets
@@ -18,7 +18,7 @@ dependencies {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+    maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/kmath-memory/build.gradle.kts b/kmath-memory/build.gradle.kts
index 2bd6dd723..55a7ff6aa 100644
--- a/kmath-memory/build.gradle.kts
+++ b/kmath-memory/build.gradle.kts
@@ -1,10 +1,10 @@
 plugins {
-    id("ru.mipt.npm.gradle.mpp")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.mpp")
+    id("space.kscience.gradle.native")
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.DEVELOPMENT
+    maturity = space.kscience.gradle.Maturity.DEVELOPMENT
     description = """
         An API and basic implementation for arranging objects in a continuous memory block.
     """.trimIndent()
diff --git a/kmath-multik/build.gradle.kts b/kmath-multik/build.gradle.kts
index df2292f2e..0f31a183a 100644
--- a/kmath-multik/build.gradle.kts
+++ b/kmath-multik/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.gradle.jvm")
+    id("space.kscience.gradle.jvm")
 }
 
 description = "JetBrains Multik connector"
@@ -10,5 +10,5 @@ dependencies {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }
\ No newline at end of file
diff --git a/kmath-nd4j/build.gradle.kts b/kmath-nd4j/build.gradle.kts
index 09264501f..11af7d6dc 100644
--- a/kmath-nd4j/build.gradle.kts
+++ b/kmath-nd4j/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     kotlin("jvm")
-    id("ru.mipt.npm.gradle.common")
+    id("space.kscience.gradle.common")
 }
 
 description = "ND4J NDStructure implementation and according NDAlgebra classes"
@@ -13,7 +13,7 @@ dependencies {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+    maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
     feature(id = "nd4jarraystructure") { "NDStructure wrapper for INDArray" }
     feature(id = "nd4jarrayrings") { "Rings over Nd4jArrayStructure of Int and Long" }
diff --git a/kmath-optimization/build.gradle.kts b/kmath-optimization/build.gradle.kts
index 2e5bf6005..53f379830 100644
--- a/kmath-optimization/build.gradle.kts
+++ b/kmath-optimization/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("ru.mipt.npm.gradle.mpp")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.mpp")
+    id("space.kscience.gradle.native")
 }
 
 kotlin.sourceSets {
@@ -17,5 +17,5 @@ kotlin.sourceSets {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+    maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
 }
diff --git a/kmath-polynomial/build.gradle.kts b/kmath-polynomial/build.gradle.kts
index 5e66f83ec..42b90a70e 100644
--- a/kmath-polynomial/build.gradle.kts
+++ b/kmath-polynomial/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.native")
 }
 
 description = "Polynomials, rational functions, and utilities"
@@ -19,7 +19,7 @@ dependencies {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = space.kscience.gradle.Maturity.PROTOTYPE
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature("polynomial abstraction", "src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt") {
diff --git a/kmath-stat/build.gradle.kts b/kmath-stat/build.gradle.kts
index b458135b3..1d1831047 100644
--- a/kmath-stat/build.gradle.kts
+++ b/kmath-stat/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("ru.mipt.npm.gradle.mpp")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.mpp")
+    id("space.kscience.gradle.native")
 }
 
 kotlin.sourceSets {
@@ -20,5 +20,5 @@ kotlin.sourceSets {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+    maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
 }
\ No newline at end of file
diff --git a/kmath-symja/build.gradle.kts b/kmath-symja/build.gradle.kts
index 65c329d52..1984236ca 100644
--- a/kmath-symja/build.gradle.kts
+++ b/kmath-symja/build.gradle.kts
@@ -5,7 +5,7 @@
 
 plugins {
     kotlin("jvm")
-    id("ru.mipt.npm.gradle.common")
+    id("space.kscience.gradle.common")
 }
 
 description = "Symja integration module"
@@ -38,5 +38,5 @@ dependencies {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }
diff --git a/kmath-tensorflow/build.gradle.kts b/kmath-tensorflow/build.gradle.kts
index 9380a7308..1e4ba12da 100644
--- a/kmath-tensorflow/build.gradle.kts
+++ b/kmath-tensorflow/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.gradle.jvm")
+    id("space.kscience.gradle.jvm")
 }
 
 description = "Google tensorflow connector"
@@ -11,5 +11,5 @@ dependencies {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }
\ No newline at end of file
diff --git a/kmath-tensors/build.gradle.kts b/kmath-tensors/build.gradle.kts
index 66316d21d..b2a4c36bd 100644
--- a/kmath-tensors/build.gradle.kts
+++ b/kmath-tensors/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.native")
 }
 
 kotlin.sourceSets {
@@ -22,7 +22,7 @@ kotlin.sourceSets {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = space.kscience.gradle.Maturity.PROTOTYPE
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 
     feature(
diff --git a/kmath-trajectory/build.gradle.kts b/kmath-trajectory/build.gradle.kts
index db80be02a..f4dba25ab 100644
--- a/kmath-trajectory/build.gradle.kts
+++ b/kmath-trajectory/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.native")
 }
 
 kotlin.sourceSets.commonMain {
@@ -12,6 +12,6 @@ kotlin.sourceSets.commonMain {
 
 readme {
     description = "Path and trajectory optimization"
-    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+    maturity = space.kscience.gradle.Maturity.PROTOTYPE
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 }
diff --git a/kmath-viktor/build.gradle.kts b/kmath-viktor/build.gradle.kts
index 2e932b441..1b22e9c38 100644
--- a/kmath-viktor/build.gradle.kts
+++ b/kmath-viktor/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     kotlin("jvm")
-    id("ru.mipt.npm.gradle.common")
+    id("space.kscience.gradle.common")
 }
 
 description = "Binding for https://github.com/JetBrains-Research/viktor"
@@ -11,5 +11,5 @@ dependencies {
 }
 
 readme {
-    maturity = ru.mipt.npm.gradle.Maturity.DEVELOPMENT
+    maturity = space.kscience.gradle.Maturity.DEVELOPMENT
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 829e59144..f53232f44 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,7 +14,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("npmlibs") {
-            from("ru.mipt.npm:version-catalog:$toolsVersion")
+            from("space.kscience:version-catalog:$toolsVersion")
         }
     }
 }
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index 88c7ea9d0..49c4758e3 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("ru.mipt.npm.gradle.mpp")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.mpp")
+    id("space.kscience.gradle.native")
 }
 
 kotlin.sourceSets {
-- 
2.34.1


From 94562179354d5cf86d5894826ebee0afa88ca771 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 3 Aug 2022 17:29:01 +0300
Subject: [PATCH 604/713] Update multik algebra

---
 gradle.properties                             |   2 +-
 kmath-multik/build.gradle.kts                 |   2 +-
 .../kmath/multik/MultikDoubleAlgebra.kt       |   4 +
 .../kmath/multik/MultikFloatAlgebra.kt        |  22 ++++
 .../kscience/kmath/multik/MultikIntAlgebra.kt |  20 ++++
 .../kmath/multik/MultikLongAlgebra.kt         |  22 ++++
 .../kmath/multik/MultikShortAlgebra.kt        |  20 ++++
 .../kscience/kmath/multik/MultikTensor.kt     |  40 +++++++
 .../kmath/multik/MultikTensorAlgebra.kt       | 102 +++++-------------
 9 files changed, 154 insertions(+), 80 deletions(-)
 create mode 100644 kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt
 create mode 100644 kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt
 create mode 100644 kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt
 create mode 100644 kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt
 create mode 100644 kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensor.kt

diff --git a/gradle.properties b/gradle.properties
index ca8c91191..b3e3f4cda 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ kotlin.code.style=official
 kotlin.jupyter.add.scanner=false
 kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
-//kotlin.incremental.js.ir=true
+kotlin.incremental.js.ir=true
 
 org.gradle.configureondemand=true
 org.gradle.parallel=true
diff --git a/kmath-multik/build.gradle.kts b/kmath-multik/build.gradle.kts
index 0f31a183a..ee31ead3c 100644
--- a/kmath-multik/build.gradle.kts
+++ b/kmath-multik/build.gradle.kts
@@ -6,7 +6,7 @@ description = "JetBrains Multik connector"
 
 dependencies {
     api(project(":kmath-tensors"))
-    api("org.jetbrains.kotlinx:multik-default:0.1.0")
+    api("org.jetbrains.kotlinx:multik-default:0.2.0")
 }
 
 readme {
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
index 0de2d8349..1d4665618 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.multik
 
+import org.jetbrains.kotlinx.multik.api.Multik
+import org.jetbrains.kotlinx.multik.api.ndarrayOf
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.StructureND
@@ -54,6 +56,8 @@ public object MultikDoubleAlgebra : MultikDivisionTensorAlgebra<Double, DoubleFi
 
     @PerformancePitfall
     override fun atanh(arg: StructureND<Double>): MultikTensor<Double> = arg.map { atanh(it) }
+
+    override fun scalar(value: Double): MultikTensor<Double>  = Multik.ndarrayOf(value).wrap()
 }
 
 public val Double.Companion.multikAlgebra: MultikTensorAlgebra<Double, DoubleField> get() = MultikDoubleAlgebra
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt
new file mode 100644
index 000000000..8dd9b3f60
--- /dev/null
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.multik
+
+import org.jetbrains.kotlinx.multik.api.Multik
+import org.jetbrains.kotlinx.multik.api.ndarrayOf
+import org.jetbrains.kotlinx.multik.ndarray.data.DataType
+import space.kscience.kmath.operations.FloatField
+
+public object MultikFloatAlgebra : MultikDivisionTensorAlgebra<Float, FloatField>() {
+    override val elementAlgebra: FloatField get() = FloatField
+    override val type: DataType get() = DataType.FloatDataType
+
+    override fun scalar(value: Float): MultikTensor<Float> = Multik.ndarrayOf(value).wrap()
+}
+
+
+public val Float.Companion.multikAlgebra: MultikTensorAlgebra<Float, FloatField> get() = MultikFloatAlgebra
+public val FloatField.multikAlgebra: MultikTensorAlgebra<Float, FloatField> get() = MultikFloatAlgebra
\ No newline at end of file
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt
new file mode 100644
index 000000000..b9e0125e8
--- /dev/null
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.multik
+
+import org.jetbrains.kotlinx.multik.api.Multik
+import org.jetbrains.kotlinx.multik.api.ndarrayOf
+import org.jetbrains.kotlinx.multik.ndarray.data.DataType
+import space.kscience.kmath.operations.IntRing
+
+public object MultikIntAlgebra : MultikTensorAlgebra<Int, IntRing>() {
+    override val elementAlgebra: IntRing get() = IntRing
+    override val type: DataType get() = DataType.IntDataType
+    override fun scalar(value: Int): MultikTensor<Int>  = Multik.ndarrayOf(value).wrap()
+}
+
+public val Int.Companion.multikAlgebra: MultikTensorAlgebra<Int, IntRing> get() = MultikIntAlgebra
+public val IntRing.multikAlgebra: MultikTensorAlgebra<Int, IntRing> get() = MultikIntAlgebra
\ No newline at end of file
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt
new file mode 100644
index 000000000..1f3dfb0e5
--- /dev/null
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.multik
+
+import org.jetbrains.kotlinx.multik.api.Multik
+import org.jetbrains.kotlinx.multik.api.ndarrayOf
+import org.jetbrains.kotlinx.multik.ndarray.data.DataType
+import space.kscience.kmath.operations.LongRing
+
+public object MultikLongAlgebra : MultikTensorAlgebra<Long, LongRing>() {
+    override val elementAlgebra: LongRing get() = LongRing
+    override val type: DataType get() = DataType.LongDataType
+
+    override fun scalar(value: Long): MultikTensor<Long>  = Multik.ndarrayOf(value).wrap()
+}
+
+
+public val Long.Companion.multikAlgebra: MultikTensorAlgebra<Long, LongRing> get() = MultikLongAlgebra
+public val LongRing.multikAlgebra: MultikTensorAlgebra<Long, LongRing> get() = MultikLongAlgebra
\ No newline at end of file
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt
new file mode 100644
index 000000000..b9746571d
--- /dev/null
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.multik
+
+import org.jetbrains.kotlinx.multik.api.Multik
+import org.jetbrains.kotlinx.multik.api.ndarrayOf
+import org.jetbrains.kotlinx.multik.ndarray.data.DataType
+import space.kscience.kmath.operations.ShortRing
+
+public object MultikShortAlgebra : MultikTensorAlgebra<Short, ShortRing>() {
+    override val elementAlgebra: ShortRing get() = ShortRing
+    override val type: DataType get() = DataType.ShortDataType
+    override fun scalar(value: Short): MultikTensor<Short>  = Multik.ndarrayOf(value).wrap()
+}
+
+public val Short.Companion.multikAlgebra: MultikTensorAlgebra<Short, ShortRing> get() = MultikShortAlgebra
+public val ShortRing.multikAlgebra: MultikTensorAlgebra<Short, ShortRing> get() = MultikShortAlgebra
\ No newline at end of file
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensor.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensor.kt
new file mode 100644
index 000000000..7efe672b4
--- /dev/null
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensor.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.multik
+
+import org.jetbrains.kotlinx.multik.ndarray.data.*
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.tensors.api.Tensor
+
+@JvmInline
+public value class MultikTensor<T>(public val array: MutableMultiArray<T, DN>) : Tensor<T> {
+    override val shape: Shape get() = array.shape
+
+    override fun get(index: IntArray): T = array[index]
+
+    @PerformancePitfall
+    override fun elements(): Sequence<Pair<IntArray, T>> =
+        array.multiIndices.iterator().asSequence().map { it to get(it) }
+
+    override fun set(index: IntArray, value: T) {
+        array[index] = value
+    }
+}
+
+
+internal fun <T, D : Dimension> MultiArray<T, D>.asD1Array(): D1Array<T> {
+    if (this is NDArray<T, D>)
+        return this.asD1Array()
+    else throw ClassCastException("Cannot cast MultiArray to NDArray.")
+}
+
+
+internal fun <T, D : Dimension> MultiArray<T, D>.asD2Array(): D2Array<T> {
+    if (this is NDArray<T, D>)
+        return this.asD2Array()
+    else throw ClassCastException("Cannot cast MultiArray to NDArray.")
+}
\ No newline at end of file
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index 250ef7e7f..1cc1b9b6d 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -10,46 +10,16 @@ package space.kscience.kmath.multik
 import org.jetbrains.kotlinx.multik.api.*
 import org.jetbrains.kotlinx.multik.api.linalg.LinAlg
 import org.jetbrains.kotlinx.multik.api.math.Math
+import org.jetbrains.kotlinx.multik.api.stat.Statistics
 import org.jetbrains.kotlinx.multik.ndarray.data.*
 import org.jetbrains.kotlinx.multik.ndarray.operations.*
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.DefaultStrides
-import space.kscience.kmath.nd.Shape
-import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.mapInPlace
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.api.TensorAlgebra
 import space.kscience.kmath.tensors.api.TensorPartialDivisionAlgebra
 
-@JvmInline
-public value class MultikTensor<T>(public val array: MutableMultiArray<T, DN>) : Tensor<T> {
-    override val shape: Shape get() = array.shape
-
-    override fun get(index: IntArray): T = array[index]
-
-    @PerformancePitfall
-    override fun elements(): Sequence<Pair<IntArray, T>> =
-        array.multiIndices.iterator().asSequence().map { it to get(it) }
-
-    override fun set(index: IntArray, value: T) {
-        array[index] = value
-    }
-}
-
-private fun <T, D : Dimension> MultiArray<T, D>.asD1Array(): D1Array<T> {
-    if (this is NDArray<T, D>)
-        return this.asD1Array()
-    else throw ClassCastException("Cannot cast MultiArray to NDArray.")
-}
-
-
-private fun <T, D : Dimension> MultiArray<T, D>.asD2Array(): D2Array<T> {
-    if (this is NDArray<T, D>)
-        return this.asD2Array()
-    else throw ClassCastException("Cannot cast MultiArray to NDArray.")
-}
-
 public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
         where T : Number, T : Comparable<T> {
 
@@ -59,7 +29,6 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
     protected val multikLinAl: LinAlg = mk.linalg
     protected val multikStat: Statistics = mk.stat
 
-
     override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): MultikTensor<T> {
         val strides = DefaultStrides(shape)
         val memoryView = initMemoryView<T>(strides.linearSize, type)
@@ -240,11 +209,15 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
 
     override fun Tensor<T>.viewAs(other: StructureND<T>): MultikTensor<T> = view(other.shape)
 
+    public abstract fun scalar(value: T): MultikTensor<T>
+
     override fun StructureND<T>.dot(other: StructureND<T>): MultikTensor<T> =
         if (this.shape.size == 1 && other.shape.size == 1) {
-            Multik.ndarrayOf(
-                multikLinAl.linAlgEx.dotVV(asMultik().array.asD1Array(), other.asMultik().array.asD1Array())
-            ).wrap()
+            scalar(
+                multikLinAl.linAlgEx.dotVV(
+                    asMultik().array.asD1Array(), other.asMultik().array.asD1Array()
+                )
+            )
         } else if (this.shape.size == 2 && other.shape.size == 2) {
             multikLinAl.linAlgEx.dotMM(asMultik().array.asD2Array(), other.asMultik().array.asD2Array()).wrap()
         } else if (this.shape.size == 2 && other.shape.size == 1) {
@@ -254,41 +227,46 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
         }
 
     override fun diagonalEmbedding(diagonalEntries: Tensor<T>, offset: Int, dim1: Int, dim2: Int): MultikTensor<T> {
+
         TODO("Diagonal embedding not implemented")
     }
 
-    override fun StructureND<T>.sum(): T = asMultik().array.reduceMultiIndexed { _: IntArray, acc: T, t: T ->
-        elementAlgebra.add(acc, t)
-    }
+    override fun StructureND<T>.sum(): T = multikMath.sum(asMultik().array)
 
     override fun StructureND<T>.sum(dim: Int, keepDim: Boolean): MultikTensor<T> {
-        TODO("Not yet implemented")
+        if (keepDim) TODO("keepDim not implemented")
+        return multikMath.sumDN(asMultik().array, dim).wrap()
     }
 
     override fun StructureND<T>.min(): T? = asMultik().array.min()
 
     override fun StructureND<T>.min(dim: Int, keepDim: Boolean): Tensor<T> {
-        TODO("Not yet implemented")
+        if (keepDim) TODO("keepDim not implemented")
+        return multikMath.minDN(asMultik().array, dim).wrap()
     }
 
     override fun StructureND<T>.max(): T? = asMultik().array.max()
 
     override fun StructureND<T>.max(dim: Int, keepDim: Boolean): Tensor<T> {
-        TODO("Not yet implemented")
+        if (keepDim) TODO("keepDim not implemented")
+        return multikMath.maxDN(asMultik().array, dim).wrap()
     }
 
     override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<Int> {
-        TODO("Not yet implemented")
+        if (keepDim) TODO("keepDim not implemented")
+        val res = multikMath.argMaxDN(asMultik().array, dim)
+        return with(MultikIntAlgebra) { res.wrap() }
     }
 }
 
 public abstract class MultikDivisionTensorAlgebra<T, A : Field<T>>
     : MultikTensorAlgebra<T, A>(), TensorPartialDivisionAlgebra<T, A> where T : Number, T : Comparable<T> {
 
-    override fun T.div(arg: StructureND<T>): MultikTensor<T> = arg.map { elementAlgebra.divide(this@div, it) }
+    override fun T.div(arg: StructureND<T>): MultikTensor<T> =
+        Multik.ones<T, DN>(arg.shape, type).apply { divAssign(arg.asMultik().array) }.wrap()
 
     override fun StructureND<T>.div(arg: T): MultikTensor<T> =
-        asMultik().array.deepCopy().apply { divAssign(arg) }.wrap()
+        asMultik().array.div(arg).wrap()
 
     override fun StructureND<T>.div(arg: StructureND<T>): MultikTensor<T> =
         asMultik().array.div(arg.asMultik().array).wrap()
@@ -308,36 +286,4 @@ public abstract class MultikDivisionTensorAlgebra<T, A : Field<T>>
             mapInPlace { index, t -> elementAlgebra.divide(t, arg[index]) }
         }
     }
-}
-
-public object MultikFloatAlgebra : MultikDivisionTensorAlgebra<Float, FloatField>() {
-    override val elementAlgebra: FloatField get() = FloatField
-    override val type: DataType get() = DataType.FloatDataType
-}
-
-public val Float.Companion.multikAlgebra: MultikTensorAlgebra<Float, FloatField> get() = MultikFloatAlgebra
-public val FloatField.multikAlgebra: MultikTensorAlgebra<Float, FloatField> get() = MultikFloatAlgebra
-
-public object MultikShortAlgebra : MultikTensorAlgebra<Short, ShortRing>() {
-    override val elementAlgebra: ShortRing get() = ShortRing
-    override val type: DataType get() = DataType.ShortDataType
-}
-
-public val Short.Companion.multikAlgebra: MultikTensorAlgebra<Short, ShortRing> get() = MultikShortAlgebra
-public val ShortRing.multikAlgebra: MultikTensorAlgebra<Short, ShortRing> get() = MultikShortAlgebra
-
-public object MultikIntAlgebra : MultikTensorAlgebra<Int, IntRing>() {
-    override val elementAlgebra: IntRing get() = IntRing
-    override val type: DataType get() = DataType.IntDataType
-}
-
-public val Int.Companion.multikAlgebra: MultikTensorAlgebra<Int, IntRing> get() = MultikIntAlgebra
-public val IntRing.multikAlgebra: MultikTensorAlgebra<Int, IntRing> get() = MultikIntAlgebra
-
-public object MultikLongAlgebra : MultikTensorAlgebra<Long, LongRing>() {
-    override val elementAlgebra: LongRing get() = LongRing
-    override val type: DataType get() = DataType.LongDataType
-}
-
-public val Long.Companion.multikAlgebra: MultikTensorAlgebra<Long, LongRing> get() = MultikLongAlgebra
-public val LongRing.multikAlgebra: MultikTensorAlgebra<Long, LongRing> get() = MultikLongAlgebra
\ No newline at end of file
+}
\ No newline at end of file
-- 
2.34.1


From 5402ba47c90be0f24f4642dd78adb5ed208c4c08 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 3 Aug 2022 18:10:44 +0300
Subject: [PATCH 605/713] Restrict tensor dot ot vectors and matrices only.
 Introduce bdot to Double TensorAlgebra for broadcasting operations.

---
 CHANGELOG.md                                  |  3 +-
 .../kmath/tensors/api/TensorAlgebra.kt        | 11 +----
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 46 +++++++++++++++++--
 .../core/TestDoubleLinearOpsAlgebra.kt        | 12 ++---
 .../tensors/core/TestDoubleTensorAlgebra.kt   |  4 +-
 5 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66d83ec34..03fb4cf8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,9 @@
 - Algebra now has an obligatory `bufferFactory` (#477).
 
 ### Changed
-- Kotlin 1.7
+- Kotlin 1.7.20
 - `LazyStructure` `deffered` -> `async` to comply with coroutines code style
+- Default `dot` operation in tensor algebra no longer support broadcasting. Instead `bdot` operation is added to `DoubleTensorAlgebra`.
 
 ### Deprecated
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 86d4eaa4e..1b11dc54f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -213,16 +213,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * 4. If the first argument is 2-dimensional and the second argument is 1-dimensional,
      * the matrix-vector product is returned.
      *
-     * 5. If both arguments are at least 1-dimensional and at least one argument is N-dimensional (where N > 2),
-     * then a batched matrix multiply is returned. If the first argument is 1-dimensional,
-     * a 1 is prepended to its dimension for the purpose of the batched matrix multiply and removed after.
-     * If the second argument is 1-dimensional, a 1 is appended to its dimension for the purpose of the batched matrix
-     * multiple and removed after.
-     * The non-matrix (i.e., batch) dimensions are broadcast (and thus must be broadcastable).
-     * For example, if `input` is a (j &times; 1 &times; n &times; n) tensor and `other` is a
-     * (k &times; n &times; n) tensor, out will be a (j &times; k &times; n &times; n) tensor.
-     *
-     * For more information: https://pytorch.org/docs/stable/generated/torch.matmul.html
+     * Otherwise, throw an exception.
      *
      * @param other tensor to be multiplied.
      * @return a mathematical product of two tensors.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index e9dc34748..af4150f5b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -381,7 +381,36 @@ public open class DoubleTensorAlgebra :
     override fun Tensor<Double>.viewAs(other: StructureND<Double>): DoubleTensor =
         tensor.view(other.shape)
 
-    override infix fun StructureND<Double>.dot(other: StructureND<Double>): DoubleTensor {
+    /**
+     * Broadcasting Matrix product of two tensors.
+     *
+     * The behavior depends on the dimensionality of the tensors as follows:
+     * 1. If both tensors are 1-dimensional, the dot product (scalar) is returned.
+     *
+     * 2. If both arguments are 2-dimensional, the matrix-matrix product is returned.
+     *
+     * 3. If the first argument is 1-dimensional and the second argument is 2-dimensional,
+     * a 1 is prepended to its dimension for the purpose of the matrix multiply.
+     * After the matrix multiply, depending on the implementation the prepended dimension might be removed.
+     *
+     * 4. If the first argument is 2-dimensional and the second argument is 1-dimensional,
+     * the matrix-vector product is returned.
+     *
+     * 5. If both arguments are at least 1-dimensional and at least one argument is N-dimensional (where N > 2),
+     * then a batched matrix multiply is returned. If the first argument is 1-dimensional,
+     * a 1 is prepended to its dimension for the purpose of the batched matrix multiply and removed after.
+     * If the second argument is 1-dimensional, a 1 is appended to its dimension for the purpose of the batched matrix
+     * multiple and removed after.
+     * The non-matrix (i.e., batch) dimensions are broadcast (and thus must be broadcastable).
+     * For example, if `input` is a (j &times; 1 &times; n &times; n) tensor and `other` is a
+     * (k &times; n &times; n) tensor, out will be a (j &times; k &times; n &times; n) tensor.
+     *
+     * For more information: https://pytorch.org/docs/stable/generated/torch.matmul.html
+     *
+     * @param other tensor to be multiplied.
+     * @return a mathematical product of two tensors.
+     */
+    public infix fun StructureND<Double>.bdot(other: StructureND<Double>): DoubleTensor {
         if (tensor.shape.size == 1 && other.shape.size == 1) {
             return DoubleTensor(intArrayOf(1), doubleArrayOf(tensor.times(other).tensor.mutableBuffer.array().sum()))
         }
@@ -430,6 +459,11 @@ public open class DoubleTensorAlgebra :
         }
     }
 
+    override fun StructureND<Double>.dot(other: StructureND<Double>): DoubleTensor {
+        return if (dimension in 0..2 && other.dimension in 0..2) bdot(other)
+        else error("Only vectors and matrices are allowed in non-broadcasting dot operation")
+    }
+
     override fun diagonalEmbedding(
         diagonalEntries: Tensor<Double>,
         offset: Int,
@@ -587,7 +621,8 @@ public open class DoubleTensorAlgebra :
         val resNumElements = resShape.reduce(Int::times)
         val init = foldFunction(DoubleArray(1) { 0.0 })
         val resTensor = BufferedTensor(resShape,
-            MutableBuffer.auto(resNumElements) { init }, 0)
+            MutableBuffer.auto(resNumElements) { init }, 0
+        )
         for (index in resTensor.indices) {
             val prefix = index.take(dim).toIntArray()
             val suffix = index.takeLast(dimension - dim - 1).toIntArray()
@@ -882,7 +917,8 @@ public open class DoubleTensorAlgebra :
         return Triple(uTensor.transpose(), sTensor, vTensor.transpose())
     }
 
-    override fun StructureND<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> = symEigJacobi(maxIteration = 50, epsilon = 1e-15)
+    override fun StructureND<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> =
+        symEigJacobi(maxIteration = 50, epsilon = 1e-15)
 
     /**
      * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
@@ -909,7 +945,7 @@ public open class DoubleTensorAlgebra :
 
         val (u, s, v) = tensor.svd(epsilon)
         val shp = s.shape + intArrayOf(1)
-        val utv = u.transpose() dot v
+        val utv = u.transpose() bdot v
         val n = s.shape.last()
         for (matrix in utv.matrixSequence()) {
             matrix.as2D().cleanSym(n)
@@ -951,7 +987,7 @@ public open class DoubleTensorAlgebra :
 
     private fun MutableStructure2D<Double>.jacobiHelper(
         maxIteration: Int,
-        epsilon: Double
+        epsilon: Double,
     ): Pair<Structure1D<Double>, Structure2D<Double>> {
         val n = this.shape[0]
         val A_ = this.copy()
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index e025d4b71..6ae7ae8ef 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -115,7 +115,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         assertTrue { q.shape contentEquals shape }
         assertTrue { r.shape contentEquals shape }
 
-        assertTrue((q dot r).eq(tensor))
+        assertTrue((q bdot r).eq(tensor))
 
     }
 
@@ -136,17 +136,17 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         assertTrue { l.shape contentEquals shape }
         assertTrue { u.shape contentEquals shape }
 
-        assertTrue((p dot tensor).eq(l dot u))
+        assertTrue((p bdot tensor).eq(l bdot u))
     }
 
     @Test
     fun testCholesky() = DoubleTensorAlgebra {
         val tensor = randomNormal(intArrayOf(2, 5, 5), 0)
-        val sigma = (tensor dot tensor.transpose()) + diagonalEmbedding(
+        val sigma = (tensor bdot tensor.transpose()) + diagonalEmbedding(
             fromArray(intArrayOf(2, 5), DoubleArray(10) { 0.1 })
         )
         val low = sigma.cholesky()
-        val sigmChol = low dot low.transpose()
+        val sigmChol = low bdot low.transpose()
         assertTrue(sigma.eq(sigmChol))
     }
 
@@ -171,7 +171,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     fun testBatchedSVD() = DoubleTensorAlgebra {
         val tensor = randomNormal(intArrayOf(2, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
-        val tensorSVD = tensorU dot (diagonalEmbedding(tensorS) dot tensorV.transpose())
+        val tensorSVD = tensorU bdot (diagonalEmbedding(tensorS) bdot tensorV.transpose())
         assertTrue(tensor.eq(tensorSVD))
     }
 
@@ -180,7 +180,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         val tensor = randomNormal(shape = intArrayOf(2, 3, 3), 0)
         val tensorSigma = tensor + tensor.transpose()
         val (tensorS, tensorV) = tensorSigma.symEig()
-        val tensorSigmaCalc = tensorV dot (diagonalEmbedding(tensorS) dot tensorV.transpose())
+        val tensorSigmaCalc = tensorV bdot (diagonalEmbedding(tensorS) bdot tensorV.transpose())
         assertTrue(tensorSigma.eq(tensorSigmaCalc))
     }
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 205ae2fee..2f3c8e2de 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -114,7 +114,7 @@ internal class TestDoubleTensorAlgebra {
         assertTrue(res12.mutableBuffer.array() contentEquals doubleArrayOf(140.0, 320.0))
         assertTrue(res12.shape contentEquals intArrayOf(2))
 
-        val res32 = tensor3.dot(tensor2)
+        val res32 = tensor3.bdot(tensor2)
         assertTrue(res32.mutableBuffer.array() contentEquals doubleArrayOf(-140.0))
         assertTrue(res32.shape contentEquals intArrayOf(1, 1))
 
@@ -126,7 +126,7 @@ internal class TestDoubleTensorAlgebra {
         assertTrue(res11.mutableBuffer.array() contentEquals doubleArrayOf(22.0, 28.0, 49.0, 64.0))
         assertTrue(res11.shape contentEquals intArrayOf(2, 2))
 
-        val res45 = tensor4.dot(tensor5)
+        val res45 = tensor4.bdot(tensor5)
         assertTrue(res45.mutableBuffer.array() contentEquals doubleArrayOf(
             36.0, 42.0, 48.0, 81.0, 96.0, 111.0, 126.0, 150.0, 174.0,
             468.0, 501.0, 534.0, 594.0, 636.0, 678.0, 720.0, 771.0, 822.0
-- 
2.34.1


From ee0d44e12e557b9b997b180ccfdb50d61bb90051 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 3 Aug 2022 18:20:46 +0300
Subject: [PATCH 606/713] rename bdot to matmul

---
 CHANGELOG.md                                         |  2 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt        |  8 +++++---
 .../kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt | 12 ++++++------
 .../kmath/tensors/core/TestDoubleTensorAlgebra.kt    |  4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03fb4cf8c..f5ed80597 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 ### Changed
 - Kotlin 1.7.20
 - `LazyStructure` `deffered` -> `async` to comply with coroutines code style
-- Default `dot` operation in tensor algebra no longer support broadcasting. Instead `bdot` operation is added to `DoubleTensorAlgebra`.
+- Default `dot` operation in tensor algebra no longer support broadcasting. Instead `matmul` operation is added to `DoubleTensorAlgebra`.
 
 ### Deprecated
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index af4150f5b..63193fe4c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -9,6 +9,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.MutableBuffer
@@ -410,7 +411,8 @@ public open class DoubleTensorAlgebra :
      * @param other tensor to be multiplied.
      * @return a mathematical product of two tensors.
      */
-    public infix fun StructureND<Double>.bdot(other: StructureND<Double>): DoubleTensor {
+    @UnstableKMathAPI
+    public infix fun StructureND<Double>.matmul(other: StructureND<Double>): DoubleTensor {
         if (tensor.shape.size == 1 && other.shape.size == 1) {
             return DoubleTensor(intArrayOf(1), doubleArrayOf(tensor.times(other).tensor.mutableBuffer.array().sum()))
         }
@@ -460,7 +462,7 @@ public open class DoubleTensorAlgebra :
     }
 
     override fun StructureND<Double>.dot(other: StructureND<Double>): DoubleTensor {
-        return if (dimension in 0..2 && other.dimension in 0..2) bdot(other)
+        return if (dimension in 0..2 && other.dimension in 0..2) matmul(other)
         else error("Only vectors and matrices are allowed in non-broadcasting dot operation")
     }
 
@@ -945,7 +947,7 @@ public open class DoubleTensorAlgebra :
 
         val (u, s, v) = tensor.svd(epsilon)
         val shp = s.shape + intArrayOf(1)
-        val utv = u.transpose() bdot v
+        val utv = u.transpose() matmul v
         val n = s.shape.last()
         for (matrix in utv.matrixSequence()) {
             matrix.as2D().cleanSym(n)
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 6ae7ae8ef..98ee9e3cb 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -115,7 +115,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         assertTrue { q.shape contentEquals shape }
         assertTrue { r.shape contentEquals shape }
 
-        assertTrue((q bdot r).eq(tensor))
+        assertTrue((q matmul r).eq(tensor))
 
     }
 
@@ -136,17 +136,17 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         assertTrue { l.shape contentEquals shape }
         assertTrue { u.shape contentEquals shape }
 
-        assertTrue((p bdot tensor).eq(l bdot u))
+        assertTrue((p matmul tensor).eq(l matmul u))
     }
 
     @Test
     fun testCholesky() = DoubleTensorAlgebra {
         val tensor = randomNormal(intArrayOf(2, 5, 5), 0)
-        val sigma = (tensor bdot tensor.transpose()) + diagonalEmbedding(
+        val sigma = (tensor matmul tensor.transpose()) + diagonalEmbedding(
             fromArray(intArrayOf(2, 5), DoubleArray(10) { 0.1 })
         )
         val low = sigma.cholesky()
-        val sigmChol = low bdot low.transpose()
+        val sigmChol = low matmul low.transpose()
         assertTrue(sigma.eq(sigmChol))
     }
 
@@ -171,7 +171,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     fun testBatchedSVD() = DoubleTensorAlgebra {
         val tensor = randomNormal(intArrayOf(2, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
-        val tensorSVD = tensorU bdot (diagonalEmbedding(tensorS) bdot tensorV.transpose())
+        val tensorSVD = tensorU matmul (diagonalEmbedding(tensorS) matmul tensorV.transpose())
         assertTrue(tensor.eq(tensorSVD))
     }
 
@@ -180,7 +180,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         val tensor = randomNormal(shape = intArrayOf(2, 3, 3), 0)
         val tensorSigma = tensor + tensor.transpose()
         val (tensorS, tensorV) = tensorSigma.symEig()
-        val tensorSigmaCalc = tensorV bdot (diagonalEmbedding(tensorS) bdot tensorV.transpose())
+        val tensorSigmaCalc = tensorV matmul (diagonalEmbedding(tensorS) matmul tensorV.transpose())
         assertTrue(tensorSigma.eq(tensorSigmaCalc))
     }
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 2f3c8e2de..bca6e65d0 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -114,7 +114,7 @@ internal class TestDoubleTensorAlgebra {
         assertTrue(res12.mutableBuffer.array() contentEquals doubleArrayOf(140.0, 320.0))
         assertTrue(res12.shape contentEquals intArrayOf(2))
 
-        val res32 = tensor3.bdot(tensor2)
+        val res32 = tensor3.matmul(tensor2)
         assertTrue(res32.mutableBuffer.array() contentEquals doubleArrayOf(-140.0))
         assertTrue(res32.shape contentEquals intArrayOf(1, 1))
 
@@ -126,7 +126,7 @@ internal class TestDoubleTensorAlgebra {
         assertTrue(res11.mutableBuffer.array() contentEquals doubleArrayOf(22.0, 28.0, 49.0, 64.0))
         assertTrue(res11.shape contentEquals intArrayOf(2, 2))
 
-        val res45 = tensor4.bdot(tensor5)
+        val res45 = tensor4.matmul(tensor5)
         assertTrue(res45.mutableBuffer.array() contentEquals doubleArrayOf(
             36.0, 42.0, 48.0, 81.0, 96.0, 111.0, 126.0, 150.0, 174.0,
             468.0, 501.0, 534.0, 594.0, 636.0, 678.0, 720.0, 771.0, 822.0
-- 
2.34.1


From a8182fad23417f4302ea77ccdeba3b931e50a471 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 4 Aug 2022 09:54:59 +0300
Subject: [PATCH 607/713] Multik went MPP

---
 CHANGELOG.md                                  |  1 +
 benchmarks/build.gradle.kts                   | 10 ++++++---
 .../kscience/kmath/benchmarks/DotBenchmark.kt |  3 +--
 .../kmath/benchmarks/NDFieldBenchmark.kt      |  6 ++----
 .../kscience/kmath/benchmarks/globals.kt      | 11 ++++++++++
 build.gradle.kts                              |  2 ++
 examples/build.gradle.kts                     |  3 +++
 .../space/kscience/kmath/tensors/multik.kt    |  9 +++++---
 kmath-multik/build.gradle.kts                 | 21 +++++++++++++++----
 .../kmath/multik/MultikDoubleAlgebra.kt       |  9 +++++---
 .../kmath/multik/MultikFloatAlgebra.kt        |  9 +++++---
 .../kscience/kmath/multik/MultikIntAlgebra.kt |  9 +++++---
 .../kmath/multik/MultikLongAlgebra.kt         |  9 +++++---
 .../kmath/multik/MultikShortAlgebra.kt        |  9 +++++---
 .../kscience/kmath/multik/MultikTensor.kt     |  1 +
 .../kmath/multik/MultikTensorAlgebra.kt       | 18 +++++++++-------
 .../kscience/kmath/multik/MultikNDTest.kt     | 16 +++++++-------
 17 files changed, 100 insertions(+), 46 deletions(-)
 create mode 100644 benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/globals.kt
 rename kmath-multik/src/{main => commonMain}/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt (87%)
 rename kmath-multik/src/{main => commonMain}/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt (62%)
 rename kmath-multik/src/{main => commonMain}/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt (63%)
 rename kmath-multik/src/{main => commonMain}/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt (63%)
 rename kmath-multik/src/{main => commonMain}/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt (62%)
 rename kmath-multik/src/{main => commonMain}/kotlin/space/kscience/kmath/multik/MultikTensor.kt (97%)
 rename kmath-multik/src/{main => commonMain}/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt (94%)
 rename kmath-multik/src/{test => commonTest}/kotlin/space/kscience/kmath/multik/MultikNDTest.kt (72%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5ed80597..acec30836 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Kotlin 1.7.20
 - `LazyStructure` `deffered` -> `async` to comply with coroutines code style
 - Default `dot` operation in tensor algebra no longer support broadcasting. Instead `matmul` operation is added to `DoubleTensorAlgebra`.
+- Multik went MPP
 
 ### Deprecated
 
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index e86990043..9c8dc613a 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -1,5 +1,6 @@
 @file:Suppress("UNUSED_VARIABLE")
 
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 import space.kscience.kmath.benchmarks.addBenchmarkProperties
 
 plugins {
@@ -15,6 +16,8 @@ repositories {
     mavenCentral()
 }
 
+val multikVersion: String by rootProject.extra
+
 kotlin {
     jvm()
 
@@ -39,7 +42,9 @@ kotlin {
                 implementation(project(":kmath-dimensions"))
                 implementation(project(":kmath-for-real"))
                 implementation(project(":kmath-tensors"))
-                implementation("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:0.4.2")
+                implementation(project(":kmath-multik"))
+                implementation("org.jetbrains.kotlinx:multik-default:$multikVersion")
+                implementation(npmlibs.kotlinx.benchmark.runtime)
             }
         }
 
@@ -51,7 +56,6 @@ kotlin {
                 implementation(project(":kmath-kotlingrad"))
                 implementation(project(":kmath-viktor"))
                 implementation(project(":kmath-jafama"))
-                implementation(project(":kmath-multik"))
                 implementation(projects.kmath.kmathTensorflow)
                 implementation("org.tensorflow:tensorflow-core-platform:0.4.0")
                 implementation("org.nd4j:nd4j-native:1.0.0-M1")
@@ -155,7 +159,7 @@ kotlin.sourceSets.all {
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
+tasks.withType<KotlinJvmCompile> {
     kotlinOptions {
         jvmTarget = "11"
         freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" + "-Xlambdas=indy"
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index 7ceecb5ab..d7ead6dd8 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -13,7 +13,6 @@ import space.kscience.kmath.commons.linear.CMLinearSpace
 import space.kscience.kmath.ejml.EjmlLinearSpaceDDRM
 import space.kscience.kmath.linear.invoke
 import space.kscience.kmath.linear.linearSpace
-import space.kscience.kmath.multik.multikAlgebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensorflow.produceWithTF
@@ -78,7 +77,7 @@ internal class DotBenchmark {
     }
 
     @Benchmark
-    fun multikDot(blackhole: Blackhole) = with(DoubleField.multikAlgebra) {
+    fun multikDot(blackhole: Blackhole) = with(multikAlgebra) {
         blackhole.consume(matrix1 dot matrix2)
     }
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index 89673acd4..eb5e1da47 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -13,7 +13,6 @@ import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.ones
 import org.jetbrains.kotlinx.multik.ndarray.data.DN
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
-import space.kscience.kmath.multik.multikAlgebra
 import space.kscience.kmath.nd.BufferedFieldOpsND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.ndAlgebra
@@ -43,7 +42,7 @@ internal class NDFieldBenchmark {
     }
 
     @Benchmark
-    fun multikAdd(blackhole: Blackhole) = with(multikField) {
+    fun multikAdd(blackhole: Blackhole) = with(multikAlgebra) {
         var res: StructureND<Double> = one(shape)
         repeat(n) { res += 1.0 }
         blackhole.consume(res)
@@ -71,7 +70,7 @@ internal class NDFieldBenchmark {
     }
 
     @Benchmark
-    fun multikInPlaceAdd(blackhole: Blackhole) = with(DoubleField.multikAlgebra) {
+    fun multikInPlaceAdd(blackhole: Blackhole) = with(multikAlgebra) {
         val res = Multik.ones<Double, DN>(shape, DataType.DoubleDataType).wrap()
         repeat(n) { res += 1.0 }
         blackhole.consume(res)
@@ -91,7 +90,6 @@ internal class NDFieldBenchmark {
         private val specializedField = DoubleField.ndAlgebra
         private val genericField = BufferedFieldOpsND(DoubleField)
         private val nd4jField = DoubleField.nd4j
-        private val multikField = DoubleField.multikAlgebra
         private val viktorField = DoubleField.viktorAlgebra
     }
 }
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/globals.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/globals.kt
new file mode 100644
index 000000000..9f235c56e
--- /dev/null
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/globals.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.benchmarks
+
+import org.jetbrains.kotlinx.multik.default.DefaultEngine
+import space.kscience.kmath.multik.MultikDoubleAlgebra
+
+val multikAlgebra = MultikDoubleAlgebra(DefaultEngine())
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index c57b29105..b6e5b0748 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -74,3 +74,5 @@ ksciencePublish {
 }
 
 apiValidation.nonPublicMarkers.add("space.kscience.kmath.misc.UnstableKMathAPI")
+
+val multikVersion by extra("0.2.0")
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index cfa50815d..1d224bace 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -8,6 +8,8 @@ repositories {
     maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
 }
 
+val multikVersion: String by rootProject.extra
+
 dependencies {
     implementation(project(":kmath-ast"))
     implementation(project(":kmath-kotlingrad"))
@@ -30,6 +32,7 @@ dependencies {
     implementation(project(":kmath-jafama"))
     //multik
     implementation(project(":kmath-multik"))
+    implementation("org.jetbrains.kotlinx:multik-default:$multikVersion")
 
 
     implementation("org.nd4j:nd4j-native:1.0.0-beta7")
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
index f2d1f0b41..7cf1c5120 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
@@ -7,11 +7,14 @@ package space.kscience.kmath.tensors
 
 import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.ndarray
-import space.kscience.kmath.multik.multikAlgebra
+import org.jetbrains.kotlinx.multik.default.DefaultEngine
+import space.kscience.kmath.multik.MultikDoubleAlgebra
 import space.kscience.kmath.nd.one
-import space.kscience.kmath.operations.DoubleField
 
-fun main(): Unit = with(DoubleField.multikAlgebra) {
+
+val multikAlgebra = MultikDoubleAlgebra(DefaultEngine())
+
+fun main(): Unit = with(multikAlgebra) {
     val a = Multik.ndarray(intArrayOf(1, 2, 3)).asType<Double>().wrap()
     val b = Multik.ndarray(doubleArrayOf(1.0, 2.0, 3.0)).wrap()
     one(a.shape) - a + b * 3.0
diff --git a/kmath-multik/build.gradle.kts b/kmath-multik/build.gradle.kts
index ee31ead3c..39c03ab9b 100644
--- a/kmath-multik/build.gradle.kts
+++ b/kmath-multik/build.gradle.kts
@@ -1,12 +1,25 @@
 plugins {
-    id("space.kscience.gradle.jvm")
+    id("space.kscience.gradle.mpp")
 }
 
 description = "JetBrains Multik connector"
 
-dependencies {
-    api(project(":kmath-tensors"))
-    api("org.jetbrains.kotlinx:multik-default:0.2.0")
+val multikVersion: String by rootProject.extra
+
+kotlin{
+    sourceSets{
+        commonMain{
+            dependencies{
+                api(project(":kmath-tensors"))
+                api("org.jetbrains.kotlinx:multik-core:$multikVersion")
+            }
+        }
+        commonTest{
+            dependencies{
+                api("org.jetbrains.kotlinx:multik-default:$multikVersion")
+            }
+        }
+    }
 }
 
 readme {
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
similarity index 87%
rename from kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
rename to kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
index 1d4665618..dcc1623cc 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.multik
 
+import org.jetbrains.kotlinx.multik.api.Engine
 import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.ndarrayOf
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
@@ -14,7 +15,9 @@ import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.ExponentialOperations
 import space.kscience.kmath.operations.TrigonometricOperations
 
-public object MultikDoubleAlgebra : MultikDivisionTensorAlgebra<Double, DoubleField>(),
+public class MultikDoubleAlgebra(
+    multikEngine: Engine
+) : MultikDivisionTensorAlgebra<Double, DoubleField>(multikEngine),
     TrigonometricOperations<StructureND<Double>>, ExponentialOperations<StructureND<Double>> {
     override val elementAlgebra: DoubleField get() = DoubleField
     override val type: DataType get() = DataType.DoubleDataType
@@ -60,6 +63,6 @@ public object MultikDoubleAlgebra : MultikDivisionTensorAlgebra<Double, DoubleFi
     override fun scalar(value: Double): MultikTensor<Double>  = Multik.ndarrayOf(value).wrap()
 }
 
-public val Double.Companion.multikAlgebra: MultikTensorAlgebra<Double, DoubleField> get() = MultikDoubleAlgebra
-public val DoubleField.multikAlgebra: MultikTensorAlgebra<Double, DoubleField> get() = MultikDoubleAlgebra
+//public val Double.Companion.multikAlgebra: MultikTensorAlgebra<Double, DoubleField> get() = MultikDoubleAlgebra
+//public val DoubleField.multikAlgebra: MultikTensorAlgebra<Double, DoubleField> get() = MultikDoubleAlgebra
 
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt
similarity index 62%
rename from kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt
rename to kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt
index 8dd9b3f60..db251b552 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt
@@ -5,12 +5,15 @@
 
 package space.kscience.kmath.multik
 
+import org.jetbrains.kotlinx.multik.api.Engine
 import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.ndarrayOf
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
 import space.kscience.kmath.operations.FloatField
 
-public object MultikFloatAlgebra : MultikDivisionTensorAlgebra<Float, FloatField>() {
+public class MultikFloatAlgebra(
+    multikEngine: Engine
+) : MultikDivisionTensorAlgebra<Float, FloatField>(multikEngine) {
     override val elementAlgebra: FloatField get() = FloatField
     override val type: DataType get() = DataType.FloatDataType
 
@@ -18,5 +21,5 @@ public object MultikFloatAlgebra : MultikDivisionTensorAlgebra<Float, FloatField
 }
 
 
-public val Float.Companion.multikAlgebra: MultikTensorAlgebra<Float, FloatField> get() = MultikFloatAlgebra
-public val FloatField.multikAlgebra: MultikTensorAlgebra<Float, FloatField> get() = MultikFloatAlgebra
\ No newline at end of file
+//public val Float.Companion.multikAlgebra: MultikTensorAlgebra<Float, FloatField> get() = MultikFloatAlgebra
+//public val FloatField.multikAlgebra: MultikTensorAlgebra<Float, FloatField> get() = MultikFloatAlgebra
\ No newline at end of file
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt
similarity index 63%
rename from kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt
rename to kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt
index b9e0125e8..517845939 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt
@@ -5,16 +5,19 @@
 
 package space.kscience.kmath.multik
 
+import org.jetbrains.kotlinx.multik.api.Engine
 import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.ndarrayOf
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
 import space.kscience.kmath.operations.IntRing
 
-public object MultikIntAlgebra : MultikTensorAlgebra<Int, IntRing>() {
+public class MultikIntAlgebra(
+    multikEngine: Engine
+) : MultikTensorAlgebra<Int, IntRing>(multikEngine) {
     override val elementAlgebra: IntRing get() = IntRing
     override val type: DataType get() = DataType.IntDataType
     override fun scalar(value: Int): MultikTensor<Int>  = Multik.ndarrayOf(value).wrap()
 }
 
-public val Int.Companion.multikAlgebra: MultikTensorAlgebra<Int, IntRing> get() = MultikIntAlgebra
-public val IntRing.multikAlgebra: MultikTensorAlgebra<Int, IntRing> get() = MultikIntAlgebra
\ No newline at end of file
+//public val Int.Companion.multikAlgebra: MultikTensorAlgebra<Int, IntRing> get() = MultikIntAlgebra
+//public val IntRing.multikAlgebra: MultikTensorAlgebra<Int, IntRing> get() = MultikIntAlgebra
\ No newline at end of file
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt
similarity index 63%
rename from kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt
rename to kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt
index 1f3dfb0e5..9c6c1af54 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt
@@ -5,12 +5,15 @@
 
 package space.kscience.kmath.multik
 
+import org.jetbrains.kotlinx.multik.api.Engine
 import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.ndarrayOf
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
 import space.kscience.kmath.operations.LongRing
 
-public object MultikLongAlgebra : MultikTensorAlgebra<Long, LongRing>() {
+public class MultikLongAlgebra(
+    multikEngine: Engine
+) : MultikTensorAlgebra<Long, LongRing>(multikEngine) {
     override val elementAlgebra: LongRing get() = LongRing
     override val type: DataType get() = DataType.LongDataType
 
@@ -18,5 +21,5 @@ public object MultikLongAlgebra : MultikTensorAlgebra<Long, LongRing>() {
 }
 
 
-public val Long.Companion.multikAlgebra: MultikTensorAlgebra<Long, LongRing> get() = MultikLongAlgebra
-public val LongRing.multikAlgebra: MultikTensorAlgebra<Long, LongRing> get() = MultikLongAlgebra
\ No newline at end of file
+//public val Long.Companion.multikAlgebra: MultikTensorAlgebra<Long, LongRing> get() = MultikLongAlgebra
+//public val LongRing.multikAlgebra: MultikTensorAlgebra<Long, LongRing> get() = MultikLongAlgebra
\ No newline at end of file
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt
similarity index 62%
rename from kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt
rename to kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt
index b9746571d..5288351b2 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt
@@ -5,16 +5,19 @@
 
 package space.kscience.kmath.multik
 
+import org.jetbrains.kotlinx.multik.api.Engine
 import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.ndarrayOf
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
 import space.kscience.kmath.operations.ShortRing
 
-public object MultikShortAlgebra : MultikTensorAlgebra<Short, ShortRing>() {
+public class MultikShortAlgebra(
+    multikEngine: Engine
+) : MultikTensorAlgebra<Short, ShortRing>(multikEngine) {
     override val elementAlgebra: ShortRing get() = ShortRing
     override val type: DataType get() = DataType.ShortDataType
     override fun scalar(value: Short): MultikTensor<Short>  = Multik.ndarrayOf(value).wrap()
 }
 
-public val Short.Companion.multikAlgebra: MultikTensorAlgebra<Short, ShortRing> get() = MultikShortAlgebra
-public val ShortRing.multikAlgebra: MultikTensorAlgebra<Short, ShortRing> get() = MultikShortAlgebra
\ No newline at end of file
+//public val Short.Companion.multikAlgebra: MultikTensorAlgebra<Short, ShortRing> get() = MultikShortAlgebra
+//public val ShortRing.multikAlgebra: MultikTensorAlgebra<Short, ShortRing> get() = MultikShortAlgebra
\ No newline at end of file
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensor.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
similarity index 97%
rename from kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensor.kt
rename to kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
index 7efe672b4..3ab4b0e3d 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensor.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
@@ -9,6 +9,7 @@ import org.jetbrains.kotlinx.multik.ndarray.data.*
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.tensors.api.Tensor
+import kotlin.jvm.JvmInline
 
 @JvmInline
 public value class MultikTensor<T>(public val array: MutableMultiArray<T, DN>) : Tensor<T> {
diff --git a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
similarity index 94%
rename from kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
rename to kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index 1cc1b9b6d..f9768ea39 100644
--- a/kmath-multik/src/main/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -20,14 +20,15 @@ import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.api.TensorAlgebra
 import space.kscience.kmath.tensors.api.TensorPartialDivisionAlgebra
 
-public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
-        where T : Number, T : Comparable<T> {
+public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
+    private val multikEngine: Engine,
+) : TensorAlgebra<T, A> where T : Number, T : Comparable<T> {
 
     public abstract val type: DataType
 
-    protected val multikMath: Math = mk.math
-    protected val multikLinAl: LinAlg = mk.linalg
-    protected val multikStat: Statistics = mk.stat
+    protected val multikMath: Math = multikEngine.getMath()
+    protected val multikLinAl: LinAlg = multikEngine.getLinAlg()
+    protected val multikStat: Statistics = multikEngine.getStatistics()
 
     override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): MultikTensor<T> {
         val strides = DefaultStrides(shape)
@@ -255,12 +256,13 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>> : TensorAlgebra<T, A>
     override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<Int> {
         if (keepDim) TODO("keepDim not implemented")
         val res = multikMath.argMaxDN(asMultik().array, dim)
-        return with(MultikIntAlgebra) { res.wrap() }
+        return with(MultikIntAlgebra(multikEngine)) { res.wrap() }
     }
 }
 
-public abstract class MultikDivisionTensorAlgebra<T, A : Field<T>>
-    : MultikTensorAlgebra<T, A>(), TensorPartialDivisionAlgebra<T, A> where T : Number, T : Comparable<T> {
+public abstract class MultikDivisionTensorAlgebra<T, A : Field<T>>(
+    multikEngine: Engine,
+) : MultikTensorAlgebra<T, A>(multikEngine), TensorPartialDivisionAlgebra<T, A> where T : Number, T : Comparable<T> {
 
     override fun T.div(arg: StructureND<T>): MultikTensor<T> =
         Multik.ones<T, DN>(arg.shape, type).apply { divAssign(arg.asMultik().array) }.wrap()
diff --git a/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
similarity index 72%
rename from kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
rename to kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
index 72c43d8e6..8bc43eef2 100644
--- a/kmath-multik/src/test/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
+++ b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
@@ -5,33 +5,35 @@
 
 package space.kscience.kmath.multik
 
-import org.junit.jupiter.api.Test
+import org.jetbrains.kotlinx.multik.default.DefaultEngine
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.one
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.tensorAlgebra
+import kotlin.test.Test
 import kotlin.test.assertTrue
 
 internal class MultikNDTest {
+    val multikAlgebra = MultikDoubleAlgebra(DefaultEngine())
+
     @Test
-    fun basicAlgebra(): Unit = DoubleField.multikAlgebra{
-        one(2,2) + 1.0
+    fun basicAlgebra(): Unit = with(multikAlgebra) {
+        one(2, 2) + 1.0
     }
 
     @Test
-    fun dotResult(){
+    fun dotResult() {
         val dim = 100
 
         val tensor1 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12224)
         val tensor2 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12225)
 
-        val multikResult = with(DoubleField.multikAlgebra){
+        val multikResult = with(multikAlgebra) {
             tensor1 dot tensor2
         }
 
-        val defaultResult = with(DoubleField.tensorAlgebra){
+        val defaultResult = with(DoubleField.tensorAlgebra) {
             tensor1 dot tensor2
         }
 
-- 
2.34.1


From b6d2eb3b1b3ef37df5b02dfe5c4ef18b1e72ef6e Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 19 Aug 2022 15:19:01 +0300
Subject: [PATCH 608/713] Replace main `mipt-npm` appearances with
 `SciProgCentre`. Now link in "Documentation site (WIP)" works.

---
 README.md                         | 6 +++---
 build.gradle.kts                  | 2 +-
 docs/templates/README-TEMPLATE.md | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b9d36df50..03e803180 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![JetBrains Research](https://jb.gg/badges/research.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 [![DOI](https://zenodo.org/badge/129486382.svg)](https://zenodo.org/badge/latestdoi/129486382)
-![Gradle build](https://github.com/mipt-npm/kmath/workflows/Gradle%20build/badge.svg)
+![Gradle build](https://github.com/SciProgCentre/kmath/workflows/Gradle%20build/badge.svg)
 [![Maven Central](https://img.shields.io/maven-central/v/space.kscience/kmath-core.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22space.kscience%22)
 [![Space](https://img.shields.io/badge/dynamic/xml?color=orange&label=Space&query=//metadata/versioning/latest&url=https%3A%2F%2Fmaven.pkg.jetbrains.space%2Fmipt-npm%2Fp%2Fsci%2Fmaven%2Fspace%2Fkscience%2Fkmath-core%2Fmaven-metadata.xml)](https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven/space/kscience/)
 
@@ -11,7 +11,7 @@ analog to Python's NumPy library. Later we found that kotlin is much more flexib
 architecture designs. In contrast to `numpy` and `scipy` it is modular and has a lightweight core. The `numpy`-like
 experience could be achieved with [kmath-for-real](/kmath-for-real) extension module.
 
-[Documentation site (**WIP**)](https://mipt-npm.github.io/kmath/)
+[Documentation site (**WIP**)](https://SciProgCentre.github.io/kmath/)
 
 ## Publications and talks
 
@@ -325,4 +325,4 @@ Gradle `6.0+` is required for multiplatform artifacts.
 The project requires a lot of additional work. The most important thing we need is a feedback about what features are
 required the most. Feel free to create feature requests. We are also welcome to code contributions, especially in issues
 marked with
-[waiting for a hero](https://github.com/mipt-npm/kmath/labels/waiting%20for%20a%20hero) label.
\ No newline at end of file
+[waiting for a hero](https://github.com/SciProgCentre/kmath/labels/waiting%20for%20a%20hero) label.
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index b6e5b0748..d20d7f4ca 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -31,7 +31,7 @@ subprojects {
                     localDirectory.set(kotlinDir)
 
                     remoteUrl.set(
-                        java.net.URL("https://github.com/mipt-npm/kmath/tree/master/${this@subprojects.name}/$kotlinDirPath")
+                        java.net.URL("https://github.com/SciProgCentre/kmath/tree/master/${this@subprojects.name}/$kotlinDirPath")
                     )
                 }
 
diff --git a/docs/templates/README-TEMPLATE.md b/docs/templates/README-TEMPLATE.md
index 1633f3ff1..d7d5a806d 100644
--- a/docs/templates/README-TEMPLATE.md
+++ b/docs/templates/README-TEMPLATE.md
@@ -1,6 +1,6 @@
 [![JetBrains Research](https://jb.gg/badges/research.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 [![DOI](https://zenodo.org/badge/129486382.svg)](https://zenodo.org/badge/latestdoi/129486382)
-![Gradle build](https://github.com/mipt-npm/kmath/workflows/Gradle%20build/badge.svg)
+![Gradle build](https://github.com/SciProgCentre/kmath/workflows/Gradle%20build/badge.svg)
 [![Maven Central](https://img.shields.io/maven-central/v/space.kscience/kmath-core.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22space.kscience%22)
 [![Space](https://img.shields.io/badge/dynamic/xml?color=orange&label=Space&query=//metadata/versioning/latest&url=https%3A%2F%2Fmaven.pkg.jetbrains.space%2Fmipt-npm%2Fp%2Fsci%2Fmaven%2Fspace%2Fkscience%2Fkmath-core%2Fmaven-metadata.xml)](https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven/space/kscience/)
 
@@ -11,7 +11,7 @@ analog to Python's NumPy library. Later we found that kotlin is much more flexib
 architecture designs. In contrast to `numpy` and `scipy` it is modular and has a lightweight core. The `numpy`-like
 experience could be achieved with [kmath-for-real](/kmath-for-real) extension module.
 
-[Documentation site (**WIP**)](https://mipt-npm.github.io/kmath/)
+[Documentation site (**WIP**)](https://SciProgCentre.github.io/kmath/)
 
 ## Publications and talks
 
-- 
2.34.1


From efe14f50bf9c8aa8465d189b35acbdb5f5bba754 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 19 Aug 2022 15:59:13 +0300
Subject: [PATCH 609/713] #472: Update copyright.

---
 .idea/copyright/kmath.xml                             | 11 ++++++-----
 .idea/copyright/profiles_settings.xml                 |  2 +-
 .../benchmarks/ExpressionsInterpretersBenchmark.kt    |  2 +-
 .../space/kscience/kmath/benchmarks/ArrayBenchmark.kt |  2 +-
 .../kscience/kmath/benchmarks/BigIntBenchmark.kt      |  2 +-
 .../kscience/kmath/benchmarks/BufferBenchmark.kt      |  2 +-
 .../space/kscience/kmath/benchmarks/DotBenchmark.kt   |  2 +-
 .../benchmarks/ExpressionsInterpretersBenchmark.kt    |  2 +-
 .../kscience/kmath/benchmarks/JafamaBenchmark.kt      |  2 +-
 .../kmath/benchmarks/MatrixInverseBenchmark.kt        |  2 +-
 .../kscience/kmath/benchmarks/NDFieldBenchmark.kt     |  2 +-
 .../kmath/benchmarks/TensorAlgebraBenchmark.kt        |  2 +-
 .../kscience/kmath/benchmarks/ViktorBenchmark.kt      |  2 +-
 .../kscience/kmath/benchmarks/ViktorLogBenchmark.kt   |  2 +-
 .../kotlin/space/kscience/kmath/benchmarks/globals.kt |  2 +-
 .../space/kscience/kmath/benchmarks/JmhReport.kt      |  2 +-
 .../kmath/benchmarks/addBenchmarkProperties.kt        |  2 +-
 .../space/kscience/kmath/ejml/codegen/ejmlCodegen.kt  |  2 +-
 docs/images/KM.svg                                    |  2 +-
 docs/images/KM_mono.svg                               |  2 +-
 docs/images/KMath.svg                                 |  2 +-
 docs/images/KMath_mono.svg                            |  2 +-
 .../kotlin/space/kscience/kmath/ast/astRendering.kt   |  2 +-
 .../kotlin/space/kscience/kmath/ast/expressions.kt    |  2 +-
 .../space/kscience/kmath/ast/kotlingradSupport.kt     |  2 +-
 .../kotlin/space/kscience/kmath/ast/symjaSupport.kt   |  2 +-
 .../kotlin/space/kscience/kmath/fit/chiSquared.kt     |  2 +-
 .../main/kotlin/space/kscience/kmath/fit/qowFit.kt    |  2 +-
 .../space/kscience/kmath/functions/integrate.kt       |  2 +-
 .../space/kscience/kmath/functions/interpolate.kt     |  2 +-
 .../kscience/kmath/functions/interpolateSquare.kt     |  2 +-
 .../kscience/kmath/functions/matrixIntegration.kt     |  2 +-
 .../space/kscience/kmath/functions/polynomials.kt     |  2 +-
 .../kotlin/space/kscience/kmath/jafama/JafamaDemo.kt  |  2 +-
 .../space/kscience/kmath/linear/dotPerformance.kt     |  2 +-
 .../kotlin/space/kscience/kmath/linear/gradient.kt    |  2 +-
 .../space/kscience/kmath/operations/BigIntDemo.kt     |  2 +-
 .../space/kscience/kmath/operations/complexDemo.kt    |  2 +-
 .../kscience/kmath/operations/mixedNDOperations.kt    |  2 +-
 .../kscience/kmath/stat/DistributionBenchmark.kt      |  2 +-
 .../space/kscience/kmath/stat/DistributionDemo.kt     |  2 +-
 .../space/kscience/kmath/structures/ComplexND.kt      |  2 +-
 .../kotlin/space/kscience/kmath/structures/NDField.kt |  2 +-
 .../kscience/kmath/structures/StreamDoubleFieldND.kt  |  2 +-
 .../kmath/structures/StructureReadBenchmark.kt        |  2 +-
 .../kmath/structures/StructureWriteBenchmark.kt       |  2 +-
 .../kotlin/space/kscience/kmath/structures/buffers.kt |  2 +-
 .../kscience/kmath/structures/typeSafeDimensions.kt   |  2 +-
 .../kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt |  2 +-
 .../main/kotlin/space/kscience/kmath/tensors/PCA.kt   |  2 +-
 .../kscience/kmath/tensors/dataSetNormalization.kt    |  2 +-
 .../kmath/tensors/linearSystemSolvingWithLUP.kt       |  2 +-
 .../kotlin/space/kscience/kmath/tensors/multik.kt     |  2 +-
 .../space/kscience/kmath/tensors/neuralNetwork.kt     |  2 +-
 .../kotlin/space/kscience/kmath/ast/TypedMst.kt       |  2 +-
 .../space/kscience/kmath/ast/evaluateConstants.kt     |  2 +-
 .../kotlin/space/kscience/kmath/ast/parser.kt         |  2 +-
 .../kmath/ast/rendering/LatexSyntaxRenderer.kt        |  2 +-
 .../kmath/ast/rendering/MathMLSyntaxRenderer.kt       |  2 +-
 .../kscience/kmath/ast/rendering/MathRenderer.kt      |  2 +-
 .../space/kscience/kmath/ast/rendering/MathSyntax.kt  |  2 +-
 .../kscience/kmath/ast/rendering/SyntaxRenderer.kt    |  2 +-
 .../space/kscience/kmath/ast/rendering/features.kt    |  2 +-
 .../kmath/ast/rendering/multiplatformToString.kt      |  2 +-
 .../space/kscience/kmath/ast/rendering/phases.kt      |  2 +-
 .../ast/TestCompilerConsistencyWithInterpreter.kt     |  2 +-
 .../kscience/kmath/ast/TestCompilerOperations.kt      |  2 +-
 .../space/kscience/kmath/ast/TestCompilerVariables.kt |  2 +-
 .../kotlin/space/kscience/kmath/ast/TestFolding.kt    |  2 +-
 .../kotlin/space/kscience/kmath/ast/TestParser.kt     |  2 +-
 .../space/kscience/kmath/ast/TestParserPrecedence.kt  |  2 +-
 .../kscience/kmath/ast/rendering/TestFeatures.kt      |  2 +-
 .../space/kscience/kmath/ast/rendering/TestLatex.kt   |  2 +-
 .../space/kscience/kmath/ast/rendering/TestMathML.kt  |  2 +-
 .../space/kscience/kmath/ast/rendering/TestStages.kt  |  2 +-
 .../space/kscience/kmath/ast/rendering/TestUtils.kt   |  2 +-
 .../kotlin/space/kscience/kmath/ast/utils.kt          |  2 +-
 .../kmath/ast/rendering/multiplatformToString.kt      |  2 +-
 .../kotlin/space/kscience/kmath/estree/estree.kt      |  2 +-
 .../kscience/kmath/estree/internal/ESTreeBuilder.kt   |  2 +-
 .../estree/internal/astring/astring.typealises.kt     |  2 +-
 .../space/kscience/kmath/internal/astring/astring.kt  |  2 +-
 .../kmath/internal/astring/astring.typealises.kt      |  2 +-
 .../space/kscience/kmath/internal/base64/base64.kt    |  2 +-
 .../kmath/internal/binaryen/index.binaryen.kt         |  2 +-
 .../internal/binaryen/index.binaryen.typealiases.kt   |  2 +-
 .../space/kscience/kmath/internal/emitter/emitter.kt  |  2 +-
 .../kmath/internal/estree/estree.extensions.kt        |  2 +-
 .../space/kscience/kmath/internal/estree/estree.kt    |  2 +-
 .../space/kscience/kmath/internal/stream/stream.kt    |  2 +-
 .../kmath/internal/tsstdlib/lib.es2015.iterable.kt    |  2 +-
 .../space/kscience/kmath/internal/tsstdlib/lib.es5.kt |  2 +-
 .../webassembly/lib.dom.WebAssembly.module_dukat.kt   |  2 +-
 .../webassembly/nonDeclarations.WebAssembly.kt        |  2 +-
 .../space/kscience/kmath/wasm/internal/WasmBuilder.kt |  2 +-
 .../kmath/wasm/internal/f64StandardFunctions.kt       |  2 +-
 .../jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt   |  2 +-
 .../jsTest/kotlin/space/kscience/kmath/ast/utils.kt   |  2 +-
 .../space/kscience/kmath/wasm/TestWasmSpecific.kt     |  2 +-
 .../jvmMain/kotlin/space/kscience/kmath/asm/asm.kt    |  2 +-
 .../space/kscience/kmath/asm/internal/AsmBuilder.kt   |  2 +-
 .../kscience/kmath/asm/internal/GenericAsmBuilder.kt  |  2 +-
 .../kmath/asm/internal/PrimitiveAsmBuilder.kt         |  2 +-
 .../space/kscience/kmath/asm/internal/codegenUtils.kt |  2 +-
 .../kscience/kmath/asm/internal/mapIntrinsics.kt      |  2 +-
 .../kmath/ast/rendering/multiplatformToString.kt      |  2 +-
 .../jvmTest/kotlin/space/kscience/kmath/ast/utils.kt  |  2 +-
 .../expressions/DerivativeStructureExpression.kt      |  2 +-
 .../commons/integration/CMGaussRuleIntegrator.kt      |  2 +-
 .../kmath/commons/integration/CMIntegrator.kt         |  2 +-
 .../space/kscience/kmath/commons/linear/CMMatrix.kt   |  2 +-
 .../space/kscience/kmath/commons/linear/CMSolver.kt   |  2 +-
 .../kmath/commons/optimization/CMOptimizer.kt         |  2 +-
 .../kmath/commons/random/CMRandomGeneratorWrapper.kt  |  2 +-
 .../kmath/commons/transform/Transformations.kt        |  2 +-
 .../expressions/DerivativeStructureExpressionTest.kt  |  2 +-
 .../kmath/commons/integration/IntegrationTest.kt      |  2 +-
 .../kmath/commons/optimization/OptimizeTest.kt        |  2 +-
 .../kotlin/space/kscience/kmath/complex/Complex.kt    |  2 +-
 .../space/kscience/kmath/complex/ComplexFieldND.kt    |  2 +-
 .../kotlin/space/kscience/kmath/complex/Quaternion.kt |  2 +-
 .../kscience/kmath/complex/ComplexBufferSpecTest.kt   |  2 +-
 .../space/kscience/kmath/complex/ComplexFieldTest.kt  |  2 +-
 .../space/kscience/kmath/complex/ComplexTest.kt       |  2 +-
 .../kmath/complex/ExpressionFieldForComplexTest.kt    |  2 +-
 .../space/kscience/kmath/complex/QuaternionTest.kt    |  2 +-
 .../kotlin/space/kscience/kmath/data/ColumnarData.kt  |  2 +-
 .../space/kscience/kmath/data/XYColumnarData.kt       |  2 +-
 .../space/kscience/kmath/data/XYErrorColumnarData.kt  |  2 +-
 .../space/kscience/kmath/data/XYZColumnarData.kt      |  2 +-
 .../kotlin/space/kscience/kmath/domains/Domain.kt     |  2 +-
 .../kotlin/space/kscience/kmath/domains/Domain1D.kt   |  2 +-
 .../space/kscience/kmath/domains/DoubleDomain.kt      |  2 +-
 .../space/kscience/kmath/domains/HyperSquareDomain.kt |  2 +-
 .../kscience/kmath/domains/UnconstrainedDomain.kt     |  2 +-
 .../space/kscience/kmath/expressions/DSAlgebra.kt     |  4 ++--
 .../space/kscience/kmath/expressions/DSCompiler.kt    |  4 ++--
 .../kmath/expressions/DifferentiableExpression.kt     |  2 +-
 .../space/kscience/kmath/expressions/Expression.kt    |  2 +-
 .../kmath/expressions/FunctionalExpressionAlgebra.kt  |  2 +-
 .../kotlin/space/kscience/kmath/expressions/MST.kt    |  2 +-
 .../space/kscience/kmath/expressions/MstAlgebra.kt    |  2 +-
 .../kscience/kmath/expressions/SimpleAutoDiff.kt      |  2 +-
 .../kotlin/space/kscience/kmath/expressions/Symbol.kt |  2 +-
 .../space/kscience/kmath/expressions/SymbolIndexer.kt |  2 +-
 .../kscience/kmath/expressions/specialExpressions.kt  |  2 +-
 .../kscience/kmath/linear/BufferedLinearSpace.kt      |  2 +-
 .../space/kscience/kmath/linear/DoubleLinearSpace.kt  |  2 +-
 .../space/kscience/kmath/linear/LinearSolver.kt       |  2 +-
 .../kotlin/space/kscience/kmath/linear/LinearSpace.kt |  2 +-
 .../space/kscience/kmath/linear/LupDecomposition.kt   |  2 +-
 .../space/kscience/kmath/linear/MatrixBuilder.kt      |  2 +-
 .../space/kscience/kmath/linear/MatrixFeatures.kt     |  2 +-
 .../space/kscience/kmath/linear/MatrixWrapper.kt      |  2 +-
 .../space/kscience/kmath/linear/VirtualMatrix.kt      |  2 +-
 .../kotlin/space/kscience/kmath/misc/Featured.kt      |  2 +-
 .../kotlin/space/kscience/kmath/misc/annotations.kt   |  2 +-
 .../kotlin/space/kscience/kmath/misc/cumulative.kt    |  2 +-
 .../kotlin/space/kscience/kmath/misc/logging.kt       |  2 +-
 .../kotlin/space/kscience/kmath/misc/numbers.kt       |  2 +-
 .../kotlin/space/kscience/kmath/misc/sorting.kt       |  4 ++--
 .../kotlin/space/kscience/kmath/nd/AlgebraND.kt       |  2 +-
 .../kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt |  2 +-
 .../kotlin/space/kscience/kmath/nd/BufferND.kt        |  2 +-
 .../kotlin/space/kscience/kmath/nd/DoubleFieldND.kt   |  2 +-
 .../kotlin/space/kscience/kmath/nd/Shape.kt           |  2 +-
 .../kotlin/space/kscience/kmath/nd/ShapeIndexer.kt    |  2 +-
 .../kotlin/space/kscience/kmath/nd/ShortRingND.kt     |  2 +-
 .../kotlin/space/kscience/kmath/nd/Structure1D.kt     |  2 +-
 .../kotlin/space/kscience/kmath/nd/Structure2D.kt     |  2 +-
 .../kotlin/space/kscience/kmath/nd/StructureND.kt     |  2 +-
 .../space/kscience/kmath/nd/VirtualStructureND.kt     |  2 +-
 .../space/kscience/kmath/nd/algebraNDExtentions.kt    |  2 +-
 .../kotlin/space/kscience/kmath/nd/operationsND.kt    |  2 +-
 .../kotlin/space/kscience/kmath/operations/Algebra.kt |  2 +-
 .../kotlin/space/kscience/kmath/operations/BigInt.kt  |  2 +-
 .../space/kscience/kmath/operations/BufferAlgebra.kt  |  2 +-
 .../kscience/kmath/operations/DoubleBufferField.kt    |  2 +-
 .../kscience/kmath/operations/DoubleBufferOps.kt      |  2 +-
 .../space/kscience/kmath/operations/LogicAlgebra.kt   |  2 +-
 .../space/kscience/kmath/operations/NumericAlgebra.kt |  2 +-
 .../kscience/kmath/operations/OptionalOperations.kt   |  2 +-
 .../kscience/kmath/operations/algebraExtensions.kt    |  2 +-
 .../kscience/kmath/operations/bufferOperation.kt      |  2 +-
 .../kotlin/space/kscience/kmath/operations/numbers.kt |  2 +-
 .../space/kscience/kmath/structures/ArrayBuffer.kt    |  2 +-
 .../kotlin/space/kscience/kmath/structures/Buffer.kt  |  2 +-
 .../kscience/kmath/structures/BufferAccessor2D.kt     |  2 +-
 .../space/kscience/kmath/structures/ByteBuffer.kt     |  2 +-
 .../space/kscience/kmath/structures/DoubleBuffer.kt   |  2 +-
 .../space/kscience/kmath/structures/FlaggedBuffer.kt  |  2 +-
 .../space/kscience/kmath/structures/FloatBuffer.kt    |  2 +-
 .../space/kscience/kmath/structures/IntBuffer.kt      |  2 +-
 .../space/kscience/kmath/structures/ListBuffer.kt     |  2 +-
 .../space/kscience/kmath/structures/LongBuffer.kt     |  2 +-
 .../space/kscience/kmath/structures/MemoryBuffer.kt   |  2 +-
 .../space/kscience/kmath/structures/MutableBuffer.kt  |  2 +-
 .../space/kscience/kmath/structures/ShortBuffer.kt    |  2 +-
 .../kotlin/space/kscience/kmath/expressions/DSTest.kt |  4 ++--
 .../kscience/kmath/expressions/ExpressionFieldTest.kt |  2 +-
 .../space/kscience/kmath/expressions/InterpretTest.kt |  2 +-
 .../kscience/kmath/expressions/SimpleAutoDiffTest.kt  |  2 +-
 .../space/kscience/kmath/linear/DoubleLUSolverTest.kt |  2 +-
 .../kotlin/space/kscience/kmath/linear/MatrixTest.kt  |  2 +-
 .../space/kscience/kmath/misc/CumulativeKtTest.kt     |  2 +-
 .../kotlin/space/kscience/kmath/misc/PermSortTest.kt  |  4 ++--
 .../space/kscience/kmath/nd/NdOperationsTest.kt       |  2 +-
 .../kscience/kmath/operations/BigIntAlgebraTest.kt    |  2 +-
 .../kmath/operations/BigIntConstructorTest.kt         |  2 +-
 .../kmath/operations/BigIntConversionsTest.kt         |  2 +-
 .../kscience/kmath/operations/BigIntOperationsTest.kt |  2 +-
 .../kscience/kmath/operations/DoubleFieldTest.kt      |  2 +-
 .../space/kscience/kmath/structures/NDFieldTest.kt    |  2 +-
 .../kscience/kmath/structures/NumberNDFieldTest.kt    |  2 +-
 .../kotlin/space/kscience/kmath/misc/numbers.kt       |  2 +-
 .../space/kscience/kmath/operations/isInteger.kt      |  2 +-
 .../kotlin/space/kscience/kmath/misc/numbersJVM.kt    |  2 +-
 .../space/kscience/kmath/operations/BigNumbers.kt     |  2 +-
 .../space/kscience/kmath/operations/isInteger.kt      |  2 +-
 .../kotlin/space/kscience/kmath/misc/numbers.kt       |  2 +-
 .../space/kscience/kmath/operations/isInteger.kt      |  2 +-
 .../space/kscience/kmath/chains/BlockingChain.kt      |  2 +-
 .../kscience/kmath/chains/BlockingDoubleChain.kt      |  2 +-
 .../space/kscience/kmath/chains/BlockingIntChain.kt   |  2 +-
 .../kotlin/space/kscience/kmath/chains/Chain.kt       |  2 +-
 .../kotlin/space/kscience/kmath/chains/flowExtra.kt   |  2 +-
 .../kscience/kmath/coroutines/coroutinesExtra.kt      |  2 +-
 .../space/kscience/kmath/streaming/BufferFlow.kt      |  2 +-
 .../space/kscience/kmath/streaming/RingBuffer.kt      |  2 +-
 .../kotlin/space/kscience/kmath/chains/ChainExt.kt    |  2 +-
 .../kscience/kmath/structures/LazyStructureND.kt      |  2 +-
 .../space/kscience/kmath/streaming/BufferFlowTest.kt  |  2 +-
 .../space/kscience/kmath/streaming/RingBufferTest.kt  |  2 +-
 .../space/kscience/kmath/dimensions/Dimension.kt      |  2 +-
 .../space/kscience/kmath/dimensions/Wrappers.kt       |  2 +-
 .../space/kscience/dimensions/DMatrixContextTest.kt   |  2 +-
 .../space/kscience/kmath/dimensions/Dimension.kt      |  2 +-
 .../space/kscience/kmath/dimensions/Dimension.kt      |  2 +-
 .../space/kscience/kmath/dimensions/Dimension.kt      |  2 +-
 .../space/kscience/kmath/ejml/EjmlLinearSpace.kt      |  2 +-
 .../kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt    |  2 +-
 .../kotlin/space/kscience/kmath/ejml/EjmlVector.kt    |  2 +-
 .../kotlin/space/kscience/kmath/ejml/_generated.kt    |  4 ++--
 .../space/kscience/kmath/ejml/EjmlMatrixTest.kt       |  2 +-
 .../space/kscience/kmath/ejml/EjmlVectorTest.kt       |  2 +-
 .../kotlin/space/kscience/kmath/real/DoubleVector.kt  |  2 +-
 .../kotlin/space/kscience/kmath/real/RealMatrix.kt    |  2 +-
 .../kotlin/space/kscience/kmath/real/dot.kt           |  2 +-
 .../kotlin/space/kscience/kmath/real/grids.kt         |  2 +-
 .../kotlin/space/kscience/kmath/real/realND.kt        |  2 +-
 .../space/kscience/kmath/real/DoubleMatrixTest.kt     |  2 +-
 .../space/kscience/kmath/real/DoubleVectorTest.kt     |  2 +-
 .../kotlin/space/kscience/kmath/real/GridTest.kt      |  2 +-
 .../space/kscience/kmath/functions/Piecewise.kt       |  2 +-
 .../space/kscience/kmath/functions/Polynomial.kt      |  2 +-
 .../space/kscience/kmath/functions/functionTypes.kt   |  2 +-
 .../kmath/functions/polynomialConstructors.kt         |  2 +-
 .../space/kscience/kmath/functions/polynomialUtil.kt  |  2 +-
 .../kscience/kmath/integration/GaussIntegrator.kt     |  2 +-
 .../kmath/integration/GaussIntegratorRuleFactory.kt   |  2 +-
 .../space/kscience/kmath/integration/Integrand.kt     |  2 +-
 .../space/kscience/kmath/integration/Integrator.kt    |  2 +-
 .../kmath/integration/MultivariateIntegrand.kt        |  2 +-
 .../kscience/kmath/integration/SimpsonIntegrator.kt   |  2 +-
 .../kscience/kmath/integration/SplineIntegrator.kt    |  2 +-
 .../kscience/kmath/integration/UnivariateIntegrand.kt |  2 +-
 .../kscience/kmath/interpolation/Interpolator.kt      |  2 +-
 .../kmath/interpolation/LinearInterpolator.kt         |  2 +-
 .../kmath/interpolation/SplineInterpolator.kt         |  2 +-
 .../space/kscience/kmath/functions/PolynomialTest.kt  |  2 +-
 .../kscience/kmath/functions/PolynomialUtilTest.kt    |  2 +-
 .../kscience/kmath/functions/testUtils/IntModulo.kt   |  2 +-
 .../kmath/functions/testUtils/IntModuloUtils.kt       |  2 +-
 .../kscience/kmath/functions/testUtils/Rational.kt    |  2 +-
 .../space/kscience/kmath/functions/testUtils/misc.kt  |  2 +-
 .../kscience/kmath/integration/GaussIntegralTest.kt   |  2 +-
 .../kscience/kmath/integration/SimpsonIntegralTest.kt |  2 +-
 .../kscience/kmath/integration/SplineIntegralTest.kt  |  2 +-
 .../kmath/interpolation/LinearInterpolatorTest.kt     |  2 +-
 .../kmath/interpolation/SplineInterpolatorTest.kt     |  2 +-
 .../kotlin/space/kscience/kmath/geometry/Circle2D.kt  |  2 +-
 .../space/kscience/kmath/geometry/Euclidean2DSpace.kt |  2 +-
 .../space/kscience/kmath/geometry/Euclidean3DSpace.kt |  2 +-
 .../space/kscience/kmath/geometry/GeometrySpace.kt    |  2 +-
 .../kotlin/space/kscience/kmath/geometry/Line.kt      |  2 +-
 .../space/kscience/kmath/geometry/ReferenceFrame.kt   |  2 +-
 .../space/kscience/kmath/geometry/projections.kt      |  2 +-
 .../space/kscience/kmath/geometry/rotations3D.kt      |  2 +-
 .../kscience/kmath/geometry/Euclidean2DSpaceTest.kt   |  2 +-
 .../kscience/kmath/geometry/Euclidean3DSpaceTest.kt   |  2 +-
 .../kscience/kmath/geometry/ProjectionAlongTest.kt    |  2 +-
 .../kscience/kmath/geometry/ProjectionOntoLineTest.kt |  2 +-
 .../space/kscience/kmath/geometry/RotationTest.kt     |  2 +-
 .../space/kscience/kmath/geometry/Vector2DTest.kt     |  2 +-
 .../space/kscience/kmath/geometry/Vector3DTest.kt     |  2 +-
 .../kotlin/space/kscience/kmath/geometry/testUtils.kt |  2 +-
 .../kotlin/space/kscience/kmath/histogram/Counter.kt  |  2 +-
 .../space/kscience/kmath/histogram/Histogram.kt       |  2 +-
 .../space/kscience/kmath/histogram/Histogram1D.kt     |  2 +-
 .../space/kscience/kmath/histogram/HistogramND.kt     |  2 +-
 .../kscience/kmath/histogram/UniformHistogram1D.kt    |  2 +-
 .../kmath/histogram/UniformHistogramGroupND.kt        |  2 +-
 .../kmath/histogram/MultivariateHistogramTest.kt      |  2 +-
 .../kmath/histogram/UniformHistogram1DTest.kt         |  2 +-
 .../kscience/kmath/histogram/TreeHistogramGroup.kt    |  2 +-
 .../kscience/kmath/histogram/TreeHistogramTest.kt     |  2 +-
 .../kotlin/space/kscience/kmath/jafama/KMathJafama.kt |  2 +-
 .../space/kscience/kmath/jupyter/KMathJupyter.kt      |  2 +-
 .../space/kscience/kmath/kotlingrad/KMathNumber.kt    |  2 +-
 .../kscience/kmath/kotlingrad/KotlingradExpression.kt |  2 +-
 .../kscience/kmath/kotlingrad/scalarsAdapters.kt      |  2 +-
 .../space/kscience/kmath/kotlingrad/AdaptingTests.kt  |  2 +-
 .../kotlin/space/kscience/kmath/memory/Memory.kt      |  2 +-
 .../kotlin/space/kscience/kmath/memory/MemorySpec.kt  |  2 +-
 .../space/kscience/kmath/memory/DataViewMemory.kt     |  2 +-
 .../space/kscience/kmath/memory/ByteBufferMemory.kt   |  2 +-
 .../space/kscience/kmath/memory/NativeMemory.kt       |  2 +-
 .../kscience/kmath/multik/MultikDoubleAlgebra.kt      |  2 +-
 .../space/kscience/kmath/multik/MultikFloatAlgebra.kt |  2 +-
 .../space/kscience/kmath/multik/MultikIntAlgebra.kt   |  2 +-
 .../space/kscience/kmath/multik/MultikLongAlgebra.kt  |  2 +-
 .../space/kscience/kmath/multik/MultikShortAlgebra.kt |  2 +-
 .../space/kscience/kmath/multik/MultikTensor.kt       |  2 +-
 .../kscience/kmath/multik/MultikTensorAlgebra.kt      |  2 +-
 .../space/kscience/kmath/multik/MultikNDTest.kt       |  2 +-
 .../space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt     |  2 +-
 .../space/kscience/kmath/nd4j/Nd4jArrayIterator.kt    |  2 +-
 .../space/kscience/kmath/nd4j/Nd4jArrayStructure.kt   |  2 +-
 .../space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt    |  2 +-
 .../main/kotlin/space/kscience/kmath/nd4j/arrays.kt   |  2 +-
 .../space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt |  2 +-
 .../kscience/kmath/nd4j/Nd4jArrayStructureTest.kt     |  2 +-
 .../kmath/optimization/FunctionOptimization.kt        |  2 +-
 .../kmath/optimization/OptimizationBuilder.kt         |  2 +-
 .../kmath/optimization/OptimizationProblem.kt         |  2 +-
 .../space/kscience/kmath/optimization/Optimizer.kt    |  2 +-
 .../space/kscience/kmath/optimization/QowOptimizer.kt |  2 +-
 .../kotlin/space/kscience/kmath/optimization/XYFit.kt |  2 +-
 .../kscience/kmath/optimization/logLikelihood.kt      |  2 +-
 .../kscience/kmath/functions/LabeledPolynomial.kt     |  2 +-
 .../kmath/functions/LabeledRationalFunction.kt        |  2 +-
 .../space/kscience/kmath/functions/ListPolynomial.kt  |  2 +-
 .../kscience/kmath/functions/ListRationalFunction.kt  |  2 +-
 .../kscience/kmath/functions/NumberedPolynomial.kt    |  2 +-
 .../kmath/functions/NumberedRationalFunction.kt       |  2 +-
 .../space/kscience/kmath/functions/Polynomial.kt      |  2 +-
 .../kscience/kmath/functions/RationalFunction.kt      |  2 +-
 .../space/kscience/kmath/functions/algebraicStub.kt   |  2 +-
 .../space/kscience/kmath/functions/collectionUtils.kt |  2 +-
 .../kscience/kmath/functions/labeledConstructors.kt   |  2 +-
 .../space/kscience/kmath/functions/labeledUtil.kt     |  2 +-
 .../kscience/kmath/functions/listConstructors.kt      |  2 +-
 .../kotlin/space/kscience/kmath/functions/listUtil.kt |  2 +-
 .../kotlin/space/kscience/kmath/functions/misc.kt     |  2 +-
 .../kscience/kmath/functions/numberedConstructors.kt  |  2 +-
 .../space/kscience/kmath/functions/numberedUtil.kt    |  2 +-
 .../kscience/kmath/functions/AlgebraicStubTest.kt     |  2 +-
 .../kmath/functions/LabeledConstructorsTest.kt        |  2 +-
 .../kscience/kmath/functions/LabeledPolynomialTest.kt |  2 +-
 .../kmath/functions/LabeledPolynomialUtilTest.kt      |  2 +-
 .../kscience/kmath/functions/ListPolynomialTest.kt    |  2 +-
 .../kmath/functions/ListPolynomialUtilTest.kt         |  2 +-
 .../kmath/functions/NumberedConstructorsTest.kt       |  2 +-
 .../kmath/functions/NumberedPolynomialTest.kt         |  2 +-
 .../kmath/functions/NumberedPolynomialUtilTest.kt     |  2 +-
 .../kscience/kmath/functions/testUtils/BufferUtils.kt |  2 +-
 .../kscience/kmath/functions/testUtils/IntModulo.kt   |  2 +-
 .../kmath/functions/testUtils/IntModuloUtils.kt       |  2 +-
 .../kscience/kmath/functions/testUtils/NTMisc.kt      |  2 +-
 .../kscience/kmath/functions/testUtils/Rational.kt    |  2 +-
 .../kscience/kmath/functions/testUtils/assertion.kt   |  2 +-
 .../space/kscience/kmath/functions/testUtils/misc.kt  |  2 +-
 .../kscience/kmath/distributions/Distribution.kt      |  2 +-
 .../kmath/distributions/FactorizedDistribution.kt     |  2 +-
 .../kmath/distributions/NormalDistribution.kt         |  2 +-
 .../space/kscience/kmath/internal/InternalErf.kt      |  2 +-
 .../space/kscience/kmath/internal/InternalGamma.kt    |  2 +-
 .../space/kscience/kmath/internal/InternalUtils.kt    |  2 +-
 .../kmath/samplers/AhrensDieterExponentialSampler.kt  |  2 +-
 .../AhrensDieterMarsagliaTsangGammaSampler.kt         |  2 +-
 .../kmath/samplers/AliasMethodDiscreteSampler.kt      |  2 +-
 .../space/kscience/kmath/samplers/BoxMullerSampler.kt |  2 +-
 .../space/kscience/kmath/samplers/GaussianSampler.kt  |  2 +-
 .../kmath/samplers/KempSmallMeanPoissonSampler.kt     |  2 +-
 .../samplers/MarsagliaNormalizedGaussianSampler.kt    |  2 +-
 .../kmath/samplers/NormalizedGaussianSampler.kt       |  2 +-
 .../space/kscience/kmath/samplers/PoissonSampler.kt   |  2 +-
 .../samplers/ZigguratNormalizedGaussianSampler.kt     |  2 +-
 .../kotlin/space/kscience/kmath/stat/MCScope.kt       |  2 +-
 .../kotlin/space/kscience/kmath/stat/Mean.kt          |  2 +-
 .../kotlin/space/kscience/kmath/stat/Median.kt        |  2 +-
 .../kotlin/space/kscience/kmath/stat/RandomChain.kt   |  2 +-
 .../space/kscience/kmath/stat/RandomGenerator.kt      |  2 +-
 .../kotlin/space/kscience/kmath/stat/Sampler.kt       |  2 +-
 .../space/kscience/kmath/stat/SamplerAlgebra.kt       |  2 +-
 .../kotlin/space/kscience/kmath/stat/Statistic.kt     |  2 +-
 .../space/kscience/kmath/stat/UniformDistribution.kt  |  2 +-
 .../space/kscience/kmath/stat/ValueAndErrorField.kt   |  2 +-
 .../kscience/kmath/stat/RandomSourceGenerator.kt      |  2 +-
 .../kscience/kmath/stat/CommonsDistributionsTest.kt   |  2 +-
 .../kotlin/space/kscience/kmath/stat/MCScopeTest.kt   |  2 +-
 .../kotlin/space/kscience/kmath/stat/SamplerTest.kt   |  2 +-
 .../kotlin/space/kscience/kmath/stat/StatisticTest.kt |  2 +-
 .../space/kscience/kmath/symja/SymjaExpression.kt     |  2 +-
 .../kotlin/space/kscience/kmath/symja/adapters.kt     |  2 +-
 .../kmath/tensorflow/DoubleTensorFlowAlgebra.kt       |  5 +++++
 .../kscience/kmath/tensorflow/IntTensorFlowAlgebra.kt |  5 +++++
 .../kscience/kmath/tensorflow/TensorFlowAlgebra.kt    |  5 +++++
 .../space/kscience/kmath/tensorflow/tfOperations.kt   |  2 +-
 .../kscience/kmath/tensorflow/DoubleTensorFlowOps.kt  |  5 +++++
 .../kmath/tensors/api/AnalyticTensorAlgebra.kt        |  2 +-
 .../kmath/tensors/api/LinearOpsTensorAlgebra.kt       |  2 +-
 .../kotlin/space/kscience/kmath/tensors/api/Tensor.kt |  2 +-
 .../space/kscience/kmath/tensors/api/TensorAlgebra.kt |  2 +-
 .../kmath/tensors/api/TensorPartialDivisionAlgebra.kt |  2 +-
 .../tensors/core/BroadcastDoubleTensorAlgebra.kt      |  2 +-
 .../kscience/kmath/tensors/core/BufferedTensor.kt     |  2 +-
 .../space/kscience/kmath/tensors/core/DoubleTensor.kt |  2 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt         |  2 +-
 .../space/kscience/kmath/tensors/core/IntTensor.kt    |  2 +-
 .../kmath/tensors/core/TensorLinearStructure.kt       |  2 +-
 .../kmath/tensors/core/internal/broadcastUtils.kt     |  2 +-
 .../kscience/kmath/tensors/core/internal/checks.kt    |  2 +-
 .../kscience/kmath/tensors/core/internal/linUtils.kt  |  2 +-
 .../kmath/tensors/core/internal/tensorCastsUtils.kt   |  2 +-
 .../kscience/kmath/tensors/core/internal/utils.kt     |  2 +-
 .../kmath/tensors/core/tensorAlgebraExtensions.kt     |  2 +-
 .../space/kscience/kmath/tensors/core/tensorCasts.kt  |  2 +-
 .../kscience/kmath/tensors/core/TestBroadcasting.kt   |  2 +-
 .../tensors/core/TestDoubleAnalyticTensorAlgebra.kt   |  2 +-
 .../kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt  |  2 +-
 .../kscience/kmath/tensors/core/TestDoubleTensor.kt   |  2 +-
 .../kmath/tensors/core/TestDoubleTensorAlgebra.kt     |  2 +-
 .../space/kscience/kmath/trajectory/DubinsPath.kt     |  2 +-
 .../kotlin/space/kscience/kmath/trajectory/Pose2D.kt  |  2 +-
 .../space/kscience/kmath/trajectory/Trajectory.kt     |  2 +-
 .../space/kscience/kmath/trajectory/TrajectoryCost.kt |  2 +-
 .../kotlin/space/kscience/kmath/trajectory/route.kt   |  2 +-
 .../kotlin/space/kscience/kmath/trajectory/Math.kt    |  5 +++++
 .../kscience/kmath/trajectory/dubins/DubinsTests.kt   |  2 +-
 .../kscience/kmath/trajectory/segments/ArcTests.kt    |  5 +++++
 .../kscience/kmath/trajectory/segments/CircleTests.kt |  2 +-
 .../kscience/kmath/trajectory/segments/LineTests.kt   |  5 +++++
 .../space/kscience/kmath/viktor/ViktorBuffer.kt       |  2 +-
 .../space/kscience/kmath/viktor/ViktorFieldOpsND.kt   |  2 +-
 .../space/kscience/kmath/viktor/ViktorStructureND.kt  |  2 +-
 test-utils/src/commonMain/kotlin/AlgebraicVerifier.kt |  2 +-
 test-utils/src/commonMain/kotlin/FieldVerifier.kt     |  2 +-
 test-utils/src/commonMain/kotlin/RingVerifier.kt      |  2 +-
 test-utils/src/commonMain/kotlin/SpaceVerifier.kt     |  2 +-
 test-utils/src/commonMain/kotlin/asserts.kt           |  2 +-
 451 files changed, 490 insertions(+), 454 deletions(-)

diff --git a/.idea/copyright/kmath.xml b/.idea/copyright/kmath.xml
index 17e44e4d0..840e0c87c 100644
--- a/.idea/copyright/kmath.xml
+++ b/.idea/copyright/kmath.xml
@@ -1,6 +1,7 @@
 <component name="CopyrightManager">
-    <copyright>
-        <option name="notice" value="Copyright 2018-2021 KMath contributors.&#10;Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file." />
-        <option name="myName" value="kmath" />
-    </copyright>
-</component>
+  <copyright>
+    <option name="allowReplaceRegexp" value="Copyright \d{4}-\d{4} KMath" />
+    <option name="notice" value="Copyright 2018-&amp;#36;today.year KMath contributors.&#10;Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file." />
+    <option name="myName" value="kmath" />
+  </copyright>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
index b538bdf41..1c10bd6f5 100644
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,5 +1,5 @@
 <component name="CopyrightManager">
-  <settings default="kmath">
+  <settings>
     <module2copyright>
       <element module="Apply copyright" copyright="kmath" />
     </module2copyright>
diff --git a/benchmarks/src/jsMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jsMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
index 126a2e648..fd1b4307a 100644
--- a/benchmarks/src/jsMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
+++ b/benchmarks/src/jsMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt
index ff933997f..abfc8cbf2 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ArrayBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index 188a48ca7..19795b9eb 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
index 39819d407..41b9005e4 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BufferBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
index d7ead6dd8..7cbe83113 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/DotBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
index db3524e67..4df5f372f 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
index 5d4eee7c0..041f7e92a 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/JafamaBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
index 4ff687aac..f7aac8199 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/MatrixInverseBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index eb5e1da47..141d0433b 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/TensorAlgebraBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/TensorAlgebraBenchmark.kt
index 38e064e53..3ed7163b3 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/TensorAlgebraBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/TensorAlgebraBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
index 0e92a703e..25ce8410a 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
index 7bb0b876e..ea417e564 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/globals.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/globals.kt
index 9f235c56e..f6d278d83 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/globals.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/globals.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
index eaa0f59d8..62cf44915 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
index 33d186bfc..5c6a2ac83 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
index 7c23d8ea0..183510232 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/docs/images/KM.svg b/docs/images/KM.svg
index 6f80e4d08..55a4339b1 100644
--- a/docs/images/KM.svg
+++ b/docs/images/KM.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  - Copyright 2018-2021 KMath contributors.
+  - Copyright 2018-2022 KMath contributors.
   - Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
   -->
 
diff --git a/docs/images/KM_mono.svg b/docs/images/KM_mono.svg
index 8f8e470b2..f1194f887 100644
--- a/docs/images/KM_mono.svg
+++ b/docs/images/KM_mono.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  - Copyright 2018-2021 KMath contributors.
+  - Copyright 2018-2022 KMath contributors.
   - Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
   -->
 
diff --git a/docs/images/KMath.svg b/docs/images/KMath.svg
index f751d8eb9..509a184bc 100644
--- a/docs/images/KMath.svg
+++ b/docs/images/KMath.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  - Copyright 2018-2021 KMath contributors.
+  - Copyright 2018-2022 KMath contributors.
   - Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
   -->
 
diff --git a/docs/images/KMath_mono.svg b/docs/images/KMath_mono.svg
index 8ca6c5e84..e781979e2 100644
--- a/docs/images/KMath_mono.svg
+++ b/docs/images/KMath_mono.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  - Copyright 2018-2021 KMath contributors.
+  - Copyright 2018-2022 KMath contributors.
   - Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
   -->
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt
index c4f263f97..e85bab8d8 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/astRendering.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
index 907f1bbe4..cacb6683e 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
index dec3bfb81..b443e639d 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/kotlingradSupport.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt b/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
index 7e09faeff..92ee1781b 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/ast/symjaSupport.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
index 63e57bd8c..e32b97136 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
index d52976671..73fca8a38 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
index 59eaba5bd..28169f15a 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
index 8dbc7b7a4..b4ce6ad2d 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolate.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
index a50df0931..7bcd96990 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/interpolateSquare.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index 4f99aeb47..1b578626d 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
index c65ca589d..8228983e2 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt
index 9c3d0fdbe..52451e9f3 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/jafama/JafamaDemo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt b/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
index a2d7d7c27..d9c3281f2 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt b/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt
index a01ea7fe2..52ed8f05f 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/linear/gradient.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/BigIntDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/BigIntDemo.kt
index 51f439612..2447d06ed 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/BigIntDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/BigIntDemo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
index 285b8d000..77cfca4ae 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/complexDemo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
index 62c9c8076..8fc6e1b06 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
index 8e3cdf86f..bdbf42797 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
index 15654971f..3de9b6f34 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionDemo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
index d55f3df09..86d7c0d89 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/ComplexND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
index d6ff1dceb..48d14cb4c 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index 548fb16c1..aed0a7868 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
index de36c664d..a64ac7280 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
index dea7095a8..ce5301a7b 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
index 889ea99bd..2ac0dc6a4 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/buffers.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt
index c28b566b9..1ba0e3503 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/typeSafeDimensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index b42602988..f7c5bb4b7 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index aced0cf7d..c4d0ed93e 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
index a436ae1c3..6d72fd623 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
index f465fc424..a08fe4106 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
index 7cf1c5120..67e0631e7 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/multik.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
index 5c41ab0f1..cbc83c336 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt
index 8a8b8797d..6458dc123 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt
index 71fb154c9..e411cd251 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
index 012a6e65f..2c9a2a9ad 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/parser.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
index 2df3d3cc7..13806703c 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
index 8b5819b84..bd941745b 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
index fdef35ebd..dd8ed3457 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
index ee23ab408..14df5ad8d 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
index 362c07d72..e19a9722e 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index 90f78a152..c1a895015 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
index 291399cee..dce99cc5a 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
index c0271fbb5..f42237ba6 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
index 1edb5923e..3400db0f8 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerConsistencyWithInterpreter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
index be8a92f3e..bf56b80a6 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerOperations.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
index 93ef97b0f..f23d36240 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestCompilerVariables.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestFolding.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestFolding.kt
index 954a0f330..95b804455 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestFolding.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestFolding.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
index d0c3a789e..d3c203903 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParser.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
index 42cf5ce58..4b3631663 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/TestParserPrecedence.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
index a40c785b9..7b5ec5765 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestFeatures.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
index 43f31baba..66c0ae1ae 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestLatex.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
index 145055494..8bc014c54 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestMathML.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
index 09ec127c7..306538d5d 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestStages.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
index bf87b6fd0..79f178eef 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/rendering/TestUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
index ec7436188..fe035c69f 100644
--- a/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/commonTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
index 521907d2c..f6411334c 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
index 240acf1d7..853f5f983 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
index 16a59d273..1517cdef2 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/ESTreeBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.typealises.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.typealises.kt
index eb5c1e3dd..2434788ec 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.typealises.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/internal/astring/astring.typealises.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt
index cca2d83af..cc4360f8d 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
index 93b4f6ce6..a17726c9d 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/astring/astring.typealises.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
index 86e0cede7..8ea699837 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
index 42b6ac7d8..d907a12c9 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
index 523b13b40..eebfeb6ef 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.typealiases.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt
index 1f7b09af8..a2a04da79 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/emitter/emitter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
index 5b1ce914e..2dd2c08cd 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.extensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
index b62b8c06c..bf4a25367 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/estree/estree.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
index 52be5530f..ced165a3a 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/stream/stream.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt
index 9c012e3a3..2c0dc9de1 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es2015.iterable.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt
index 0cd395f2c..f20e2d865 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/tsstdlib/lib.es5.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
index 90690abed..873a5e1d2 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
index c5023c384..ba86e977b 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index 878919d8d..d29fbde55 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
index 21a88b5d0..d60f24247 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/f64StandardFunctions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
index f9540f9db..6a20da799 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
index 0d896c6f6..c6b241e5c 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
index 8ae5fcb36..0a85d5f24 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
index 73b9c97a7..59a26af7d 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
index a76b47ecc..e1fd455fd 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/AsmBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
index 6cf3d8721..acae45d87 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/GenericAsmBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
index 01bad83e5..d50318cd1 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
index 9e880f4fc..b3ccfdc0c 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/codegenUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
index 3a5ef74f7..6459f4dcf 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/mapIntrinsics.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
index 556adbe7d..ec66be830 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
index 47f1cc476..9f0fb33ab 100644
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
index 82694d95a..6d756b15f 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
index e0a2f4931..263463d37 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMGaussRuleIntegrator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 package space.kscience.kmath.commons.integration
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
index 257429fa7..4839518e6 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
index aa7e0a638..e95c9115d 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
index 9bb5deffd..19799aab3 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMSolver.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
index 11eb6fba8..46baa7d50 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 @file:OptIn(UnstableKMathAPI::class)
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
index 194be6002..c7a23ebc4 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
index 40168971e..2243dc5d9 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
index 56252ab34..40ba9fc7d 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
index c5573fef1..308f504af 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index 0977dc247..b1b7b3ed7 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index f56fb0f6e..5804e47c1 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
index 65943f421..42914ed5b 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index 0305bfc88..aa5806932 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexBufferSpecTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexBufferSpecTest.kt
index 17a077ea7..ca3f8f43f 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexBufferSpecTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexBufferSpecTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexFieldTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexFieldTest.kt
index cbaaa815b..e11f1c1ea 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexFieldTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexFieldTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexTest.kt
index 7ad7f883d..1a35d1dd8 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ComplexTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt
index 4279471d4..767406e0b 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/ExpressionFieldForComplexTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionTest.kt b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionTest.kt
index fd4df736c..fd0fd46a7 100644
--- a/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionTest.kt
+++ b/kmath-complex/src/commonTest/kotlin/space/kscience/kmath/complex/QuaternionTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
index e06b774fd..d09228e96 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
index 2fce772cc..a3c3a2eda 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
index 8ddd6406f..dd0e35bc8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
index e99ae0698..3dc1bb99b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt
index b5a84cf6c..eecdcebad 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
index 3d531349c..10755e633 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt
index ee1bebde0..b0803f3e1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 package space.kscience.kmath.domains
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
index 485416a69..7d5843a97 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 package space.kscience.kmath.domains
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
index 32a5fc56c..e8b867fac 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 package space.kscience.kmath.domains
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
index c55e41bb2..fa8bf5e58 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
index b5b2988a3..6ab9b3d44 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.expressions
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
index 12b7df0ea..7c8a957c7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DifferentiableExpression.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
index 5ba32f190..9c769caa0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
index 68cc8e791..1054d1aa1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/FunctionalExpressionAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
index 18226119b..9705a3f03 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MST.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
index 4bd2a6c53..a75940cca 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
index ac8c44446..f00e6d3f3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
index 8ab2bec31..c57ce69ab 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Symbol.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
index bf37e9615..e5f92efc9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
index 907ce4004..8cfa1b353 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 8f7569699..361d59be1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
index 4e6debc60..e2f81d84e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
index fae9e7c91..af9ebb463 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSolver.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
index d437070c9..757752115 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
index fb57f2343..0ee7c8828 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
index 029612bc5..d0105e4cd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
index b70e9d8a9..ce7acdcba 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixFeatures.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
index b1812f49d..feea26b40 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
index fb2b1e547..eb5e20856 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
index 29b7caec6..a752a8339 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
index 60fa81cd8..f7b486850 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
index ee7f1d8be..6ccb487c3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/logging.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/logging.kt
index 9dfc564c3..c7886469f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/logging.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/logging.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt
index f879a06d5..77ef07ea8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/numbers.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
index dc5421136..daf5e1eff 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index ad291cf7f..101f90160 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index 8c5eef3d0..4025ba548 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 8175bd65e..5484ce545 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index d01a8ee95..7f8d3c55d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
index d682d5e69..c5d04c9de 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
index 29701425f..2dce407ca 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndexer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
index 8152adaa5..ea37da7a3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index 4ccb15eef..2a258a7f4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index a2fd83474..d8fd2031c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index e14b8bf9d..0fed49f40 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
index 7e86ea73d..579a0d7c8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
index 53f946fbd..1b7bd20db 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt
index c9624dc4e..5814e2f9c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index a93b4365e..a7a5bc5fd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 9b6911f73..8730ff163 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
index a256fe7d1..3af77856c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
index f2f7326aa..449730e7a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index 669c0a390..811926c23 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
index 9037525e1..5cf98c7d5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
index d0405c705..5c2747686 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
index 709506fc4..c24394add 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/OptionalOperations.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index 539440de9..efadfb3cc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
index 46abc0266..3d25d8750 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index c108aa729..16088a825 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt
index 3528b0460..8e81dd941 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ArrayBuffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index 5757848fe..2f9f8a8e0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
index 4d04a5235..07355d396 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ByteBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ByteBuffer.kt
index e7bf2b47c..2be17c5e4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ByteBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ByteBuffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
index f4388a477..e39c22158 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
index b3c537280..d99e02996 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FlaggedBuffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
index e7e98fc71..8666ca675 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/FloatBuffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
index 35b722e2b..8477fc13b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt
index 65d9dc77d..fbc9a489b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ListBuffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
index c69f4646d..9d6f1b2a7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/LongBuffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
index 1dadaf7d4..80d5033c4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt
index 429c1a64b..709ebd680 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MutableBuffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
index 20691511b..7dbb2b58e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/ShortBuffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
index b6581e503..f46f3023d 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 @file:OptIn(UnstableKMathAPI::class)
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
index 80c5943cf..def9f91a6 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/ExpressionFieldTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
index 156334b2e..6f207eab3 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
index 201890933..1618296be 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/SimpleAutoDiffTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
index 70e010f2e..25e29f3d6 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
index 25d187bf0..fe5ea3642 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/CumulativeKtTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/CumulativeKtTest.kt
index e5f3f337f..811f2e87f 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/CumulativeKtTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/CumulativeKtTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
index 4a724ac5f..4f3469ea2 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package space.kscience.kmath.misc
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/NdOperationsTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/NdOperationsTest.kt
index 25b062b44..e909a2aea 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/NdOperationsTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/NdOperationsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
index 0527f5252..f4f7b1a51 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConstructorTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConstructorTest.kt
index eec3dc3bf..786c68c70 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConstructorTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConstructorTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
index 85f368f3e..36f00dc75 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntConversionsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
index 26d6af224..8a6116605 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntOperationsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
index 76171fedd..688daa7fe 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/DoubleFieldTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
index b7b89d107..566145621 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NDFieldTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index d33eb5112..62c4811e8 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt
index 68a3c995b..e52ea9298 100644
--- a/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt
+++ b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/misc/numbers.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/jsMain/kotlin/space/kscience/kmath/operations/isInteger.kt b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/operations/isInteger.kt
index 24b81322e..3103f5168 100644
--- a/kmath-core/src/jsMain/kotlin/space/kscience/kmath/operations/isInteger.kt
+++ b/kmath-core/src/jsMain/kotlin/space/kscience/kmath/operations/isInteger.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt
index 5ba0dbc9b..3780ea1ae 100644
--- a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt
+++ b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/misc/numbersJVM.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
index 6e22c2381..584748bd7 100644
--- a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
+++ b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/BigNumbers.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/isInteger.kt b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/isInteger.kt
index b2f9b957b..9868daddf 100644
--- a/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/isInteger.kt
+++ b/kmath-core/src/jvmMain/kotlin/space/kscience/kmath/operations/isInteger.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt
index 68a3c995b..e52ea9298 100644
--- a/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt
+++ b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/misc/numbers.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/operations/isInteger.kt b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/operations/isInteger.kt
index b2f9b957b..9868daddf 100644
--- a/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/operations/isInteger.kt
+++ b/kmath-core/src/nativeMain/kotlin/space/kscience/kmath/operations/isInteger.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt
index 87aebff61..2e9a15eed 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingChain.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
index 25e20291e..797d2db4a 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingDoubleChain.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingIntChain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingIntChain.kt
index ac0327d0b..a481156f2 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingIntChain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/BlockingIntChain.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
index 994255e38..ed0283630 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt
index 7bf54d50f..77d4203c5 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/flowExtra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
index 1f17efe49..3f06693b0 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
index 4d4493aa4..00c874751 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
index abe1c9df9..2ac8c1eb4 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/RingBuffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/chains/ChainExt.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/chains/ChainExt.kt
index dd6e39071..a62bcc6b8 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/chains/ChainExt.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/chains/ChainExt.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
index 2b9265843..786d32190 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/BufferFlowTest.kt b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/BufferFlowTest.kt
index 9b67f7253..c448168e3 100644
--- a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/BufferFlowTest.kt
+++ b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/BufferFlowTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
index 305b97e5d..a6d7f006c 100644
--- a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
+++ b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index e57c22834..14677319c 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
index f04536f04..b93114804 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt b/kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt
index 59260fe73..e2793855b 100644
--- a/kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt
+++ b/kmath-dimensions/src/commonTest/kotlin/space/kscience/dimensions/DMatrixContextTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt b/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index 610e8b4c0..1ae484228 100644
--- a/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
+++ b/kmath-dimensions/src/jsMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt b/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index e6d8b3b35..24cfb14e8 100644
--- a/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
+++ b/kmath-dimensions/src/jvmMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt b/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
index 64edbe935..f5f749c8a 100644
--- a/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
+++ b/kmath-dimensions/src/nativeMain/kotlin/space/kscience/kmath/dimensions/Dimension.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
index 32030dfe3..beb79fc0e 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
index 27fd3fc53..1d70c0e7d 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlMatrix.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
index 37995c27e..c4fae9951 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlVector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
index aac327a84..5426055b3 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2018-2021 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 /* This file is generated with buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt */
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
index af6284e5e..e3bff8987 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
index 9592bfa6c..7d3ea314b 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlVectorTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/DoubleVector.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/DoubleVector.kt
index 7b9740c35..e607786fb 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/DoubleVector.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/DoubleVector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
index 671e272ab..c44b1dff0 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
index dc5c58be0..0c18602f1 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/dot.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
index 1926ef02c..6403cf509 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
index 52362f4b4..2c06b76b7 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
index 4a0e8de1d..89e55c6d4 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
index e77b96c12..a25091ac2 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleVectorTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
index 8fed8d10e..31be9a452 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index 16af7f555..a9f51f7b0 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 1f9bab52c..af84f47f2 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt
index 0e814993c..c2f95f040 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/functionTypes.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialConstructors.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialConstructors.kt
index 2da9ea6f5..4e9791a87 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialConstructors.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialConstructors.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index c9377a6c1..5effe566a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index 9785d7744..603f0503a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 package space.kscience.kmath.integration
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
index 778d85e66..4cfed8efe 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
index 05e2e5c55..40fe78898 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrand.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt
index 1cf15b42f..18c46b83b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/Integrator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
index 96b81aaa6..53a563086 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
index 7815757aa..7e4ff0f8b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index eb88d9ae0..9a8f475c8 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index 6fd75e6e6..af8c858fa 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
index 2266092a3..52e8991b1 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
index 34d7bcf41..49d7fd1ca 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
index afcb33bd4..a63142be4 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
index 7e0c6cdf2..3051cdd8d 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
index 9d0fe4cc3..c1b1008ae 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
index ef601c941..3b7409e82 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
index 730a455bf..ffab2157c 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
index 19cb77df5..0a3d00e96 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
index ff67f19d8..61b50f128 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
index 9f48a15ea..32fc08ae4 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
index 9f2d71554..188f8d15f 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
index afeba0be4..4a15e96c3 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
index 1143036d4..c0ca6c484 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/LinearInterpolatorTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
index 4c7d816d4..851a8ab7d 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/interpolation/SplineInterpolatorTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
index 8623335b9..585843278 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
index a83cb3ac7..d79c6c40e 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index c1fc74bf1..173ed5688 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
index d4245c744..4ea2aefdf 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
index 85bfcdd8f..ee16a7698 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/ReferenceFrame.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/ReferenceFrame.kt
index a7a28b596..21045e94e 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/ReferenceFrame.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/ReferenceFrame.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/projections.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/projections.kt
index 6ffc43739..6950abbdc 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/projections.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/projections.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
index 67c3666ed..fbe7ae8ee 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
index 6b5f474bc..73edc0fc2 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
index 0bc91e77e..6e1fa9943 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
index dfb65a57c..b57a31a75 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
index 076025110..02f386158 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
index 89b69d0f2..3ebe9c4b9 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
index 5e45b4870..211fd4ed0 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
index 55bab4775..315a70374 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
index 0f957529d..2a8c0c3c8 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
index fe3278026..43ed24c70 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Counter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
index 12edafd81..a4ae6d935 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
index 710e4478b..f9ca6a486 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
index 68b24db5d..2cefb33a5 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
index e13928394..3c687d2df 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
index 1ead049e6..36e994bcf 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
index ca7c2f324..717f9d7a1 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
index 09bf3939d..fd107f5e8 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramGroup.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramGroup.kt
index 6bec01f9b..a7d34ff71 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramGroup.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramGroup.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
index 2c56a88a7..77dc189ee 100644
--- a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
+++ b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
index 91d952a76..f9b8287b4 100644
--- a/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
+++ b/kmath-jafama/src/main/kotlin/space/kscience/kmath/jafama/KMathJafama.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
index 504ad693e..85797134f 100644
--- a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
index f7858e172..cd35e0c42 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KMathNumber.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
index 31b8a9286..110572140 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/KotlingradExpression.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
index 37ce40cab..dd75a704c 100644
--- a/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
+++ b/kmath-kotlingrad/src/main/kotlin/space/kscience/kmath/kotlingrad/scalarsAdapters.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
index 570d7dd7f..042777c8a 100644
--- a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
+++ b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
index e8e51e9e2..006d57c5f 100644
--- a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
+++ b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/MemorySpec.kt b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/MemorySpec.kt
index 1ee1cf4e2..19bc3bae4 100644
--- a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/MemorySpec.kt
+++ b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/MemorySpec.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt b/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
index 6153743fc..40ba84c10 100644
--- a/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
+++ b/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt b/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
index aef68fd80..84f7ea412 100644
--- a/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
+++ b/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt b/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
index 5146d9689..b224383e4 100644
--- a/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
+++ b/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
index dcc1623cc..989ebcd5d 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt
index db251b552..ee194ae24 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikFloatAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt
index 517845939..05b240787 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikIntAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt
index 9c6c1af54..e713e556e 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikLongAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt
index 5288351b2..6e5ca5882 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikShortAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
index 3ab4b0e3d..38d61e982 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index f9768ea39..c6266c985 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
index 8bc43eef2..8ad220221 100644
--- a/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
+++ b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index e29a3f467..f359b9115 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
index d4cad8996..fedad26e0 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayIterator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
index 2a0fdc86c..0a7d15e20 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index ceb384f0d..5ecfe30d6 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
index 3ca756600..401c57a7b 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/arrays.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
index 9d30c2027..9f1022fd9 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
index 30d01338f..d1ad746fe 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
index 02602b068..07146625c 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
index 416d0195d..d1ceccf1a 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
index b42be4035..db154be42 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt
index 78385a99b..41dcbf770 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/Optimizer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
index babbaf6cd..669860934 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
index 07fea3126..d2182e91f 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 @file:OptIn(UnstableKMathAPI::class)
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt
index b4cb2f1cf..e0eeb339c 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
index 6a4d1409f..662e8ca74 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
index e4f2b6c37..185782f22 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
index 6ab660b63..3753a93c4 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
index b744afc51..c2fa6b2ec 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
index 267bbd91d..eaf5befb1 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
index 0f3c1ced9..4109338fd 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
index 6a11eb1bd..7140ba70e 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
index 3c1548516..766d9ce98 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
index b40aa4775..80bf6ec53 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
index c9146a493..e294f3533 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
index d74c0e1fb..9cb0ebb3f 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
index a37a1fe39..188240bf7 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
index e95361724..30b1e2fe4 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
index 4f3f6d88e..e7c11f5ea 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
index 76f1c294e..0a251b3b7 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
index ce49088ae..df4afbd12 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
index 9f29cf31a..88424d23c 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
index 487cd9ee1..9dd2bb743 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
index 80476050b..054f0dc4c 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
index bde1386da..bb30f7742 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
index 6243818b4..637981b66 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
index e7d8dfd8c..5f7e1a95b 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
index 339643d02..48ea89a46 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
index 1815749ce..ad6240fb9 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
index ec2e34520..c2f86198c 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
index 82f1e561a..e5d1ddf48 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
index 3297733b1..ab912a464 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
index 5bac4cd73..a037dcd18 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
index 33fd03aa0..615523873 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt
index ff67f19d8..61b50f128 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
index 19cb77df5..0a3d00e96 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
index 4ef87f736..c70c229ca 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
index 93c3f8ea5..66e46c902 100644
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
+++ b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
index 8dbcb3367..cf2fd5b08 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
index 1218f13c5..14f49a35f 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/FactorizedDistribution.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
index cfc6eba04..8a249c340 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt
index 25668446c..bb2bfdd09 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalErf.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
index 63db1c56f..1ef2ec02c 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalGamma.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
index 71fd15fe6..a80407773 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/internal/InternalUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
index 77d29981f..d861fddae 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
index 993215d41..912bb0fa3 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
index 5390a2e09..34d1131b4 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
index b3c014553..60a8491f2 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/BoxMullerSampler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
index 9219df43e..4a4bfdfeb 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/GaussianSampler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
index 0105731c4..145946b14 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
index 0a68e5c88..a8d289d47 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/MarsagliaNormalizedGaussianSampler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
index 83f87e832..3f6797881 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
index f0f94900e..83480b4ba 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
index b534fdc14..2cd561468 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/ZigguratNormalizedGaussianSampler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
index 0e06fa162..37e6ea13b 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/MCScope.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
index aff7d03d9..fb14a95be 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
index c587277f9..87046cd46 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
index d4bc36b5b..ac7977659 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomChain.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
index f280a78aa..94b2bfbea 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/RandomGenerator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
index 1c88922ac..66ade8119 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Sampler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
index 1f442c09b..1e34fa434 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/SamplerAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
index 43cd5b402..d7638ff81 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Statistic.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
index 20cc0e802..fa51bb521 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/UniformDistribution.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/ValueAndErrorField.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/ValueAndErrorField.kt
index 5949213e7..38cd5f900 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/ValueAndErrorField.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/ValueAndErrorField.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt b/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
index 202a1c8dd..2da9a9e21 100644
--- a/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
+++ b/kmath-stat/src/jvmMain/kotlin/space/kscience/kmath/stat/RandomSourceGenerator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
index 19c01e099..802f3ac24 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/CommonsDistributionsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
index cca645809..889274c86 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/MCScopeTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
index 1dbbf591b..7b76fb4b6 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
index 9eb84899c..0db22fef4 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
index 3067b5efb..0f8014913 100644
--- a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
+++ b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/SymjaExpression.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
index 30c37c799..92f2474b8 100644
--- a/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
+++ b/kmath-symja/src/main/kotlin/space/kscience/kmath/symja/adapters.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
index ad7a978a0..fa7050d2a 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.tensorflow
 
 import org.tensorflow.Graph
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/IntTensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/IntTensorFlowAlgebra.kt
index 084a445e0..01c8054b3 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/IntTensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/IntTensorFlowAlgebra.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.tensorflow
 
 import org.tensorflow.Graph
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index 7185b84d6..c6eaa7266 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.tensorflow
 
 
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/tfOperations.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/tfOperations.kt
index f67c333ce..a0a2ddc80 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/tfOperations.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/tfOperations.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
index 308469eed..21340a8db 100644
--- a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
+++ b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.tensorflow
 
 import org.junit.jupiter.api.Test
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index 3ed34ae5e..587096500 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index 0bddc3f9c..07dfd1597 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt
index 482bb5244..b328fbeec 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/Tensor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 1b11dc54f..dbc42f7c7 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
index 9c492cda1..33effb2d2 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorPartialDivisionAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index e412ab5bb..e5739359e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 73a89502c..98e6ab430 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
index 8e5116336..e8239caf4 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 63193fe4c..53115d5e5 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
index e3d7c3d35..ccff9606e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
index 19eefc2f8..3de1c9b1a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
index 9d37423e5..ab97903e4 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index a2d445b45..5db311db4 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index aba6167ce..49d67c205 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index a5cdb2f47..dad4368c1 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index 85cc91b1d..8a96d516f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
index d8e8df31e..5904e574e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
index 5dc8114dd..968efa468 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 6788ae792..67d5f9a96 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index 1e21379b4..c777273f3 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 98ee9e3cb..5b226bd5d 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index d808637c7..5e5ef95be 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index bca6e65d0..28c327973 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
index 134342b33..98beed646 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt
index 1f7c4a52e..901ba5c67 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
index 2e97d43b0..620a5fcc1 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/TrajectoryCost.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/TrajectoryCost.kt
index 170851c43..3782a9a32 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/TrajectoryCost.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/TrajectoryCost.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt
index f67ab124d..2e8e43be9 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
index 7ee68bd92..cc342de75 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Vector2D
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
index 09375a400..6ea48dae6 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
index c66fa201b..ce8c6c7a5 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.trajectory.segments
 
 import space.kscience.kmath.geometry.Circle2D
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
index 5170c1db5..eff843ae0 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
index 11eaa0fb3..c1a13f4d9 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package space.kscience.kmath.trajectory.segments
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
index 4eedcb5ee..90d5ad9a9 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
index cecbc35b8..493af54c9 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index 25ca3a10e..c9749d41a 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/test-utils/src/commonMain/kotlin/AlgebraicVerifier.kt b/test-utils/src/commonMain/kotlin/AlgebraicVerifier.kt
index ddd8fc3ea..261e74f5a 100644
--- a/test-utils/src/commonMain/kotlin/AlgebraicVerifier.kt
+++ b/test-utils/src/commonMain/kotlin/AlgebraicVerifier.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/test-utils/src/commonMain/kotlin/FieldVerifier.kt b/test-utils/src/commonMain/kotlin/FieldVerifier.kt
index f4ca7506b..a03ca0a27 100644
--- a/test-utils/src/commonMain/kotlin/FieldVerifier.kt
+++ b/test-utils/src/commonMain/kotlin/FieldVerifier.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/test-utils/src/commonMain/kotlin/RingVerifier.kt b/test-utils/src/commonMain/kotlin/RingVerifier.kt
index 14606cb2c..c40075d93 100644
--- a/test-utils/src/commonMain/kotlin/RingVerifier.kt
+++ b/test-utils/src/commonMain/kotlin/RingVerifier.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/test-utils/src/commonMain/kotlin/SpaceVerifier.kt b/test-utils/src/commonMain/kotlin/SpaceVerifier.kt
index d761a3775..01c02997b 100644
--- a/test-utils/src/commonMain/kotlin/SpaceVerifier.kt
+++ b/test-utils/src/commonMain/kotlin/SpaceVerifier.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/test-utils/src/commonMain/kotlin/asserts.kt b/test-utils/src/commonMain/kotlin/asserts.kt
index 8e7d1ae23..8ddce517c 100644
--- a/test-utils/src/commonMain/kotlin/asserts.kt
+++ b/test-utils/src/commonMain/kotlin/asserts.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 KMath contributors.
+ * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-- 
2.34.1


From 6111c673eec9c96448711fd8b62f6708b16aee64 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 21 Aug 2022 11:39:17 +0300
Subject: [PATCH 610/713] Type-safe angles

---
 .../space/kscience/kmath/geometry/angles.kt   | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/angles.kt

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/angles.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/angles.kt
new file mode 100644
index 000000000..e7b0afcda
--- /dev/null
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/angles.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.geometry
+
+import kotlin.jvm.JvmInline
+import kotlin.math.PI
+
+public sealed interface Angle {
+    public fun toRadians(): Radians
+    public fun toDegrees(): Degrees
+
+    public operator fun plus(other: Angle): Angle
+    public operator fun minus(other: Angle): Angle
+
+    public operator fun times(other: Number): Angle
+    public operator fun div(other: Number): Angle
+    public operator fun unaryMinus(): Angle
+}
+
+/**
+ * Type safe radians
+ */
+@JvmInline
+public value class Radians(public val value: Double) : Angle {
+    override fun toRadians(): Radians = this
+    override fun toDegrees(): Degrees = Degrees(value * 180 / PI)
+
+    public override fun plus(other: Angle): Radians = Radians(value + other.toRadians().value)
+    public override fun minus(other: Angle): Radians = Radians(value - other.toRadians().value)
+
+    public override fun times(other: Number): Radians = Radians(value + other.toDouble())
+    public override fun div(other: Number): Radians = Radians(value / other.toDouble())
+    public override fun unaryMinus(): Radians = Radians(-value)
+}
+
+public fun sin(angle: Angle): Double = kotlin.math.sin(angle.toRadians().value)
+public fun cos(angle: Angle): Double = kotlin.math.cos(angle.toRadians().value)
+public fun tan(angle: Angle): Double = kotlin.math.tan(angle.toRadians().value)
+
+public val Number.radians: Radians get() = Radians(toDouble())
+
+/**
+ * Type safe degrees
+ */
+@JvmInline
+public value class Degrees(public val value: Double) : Angle {
+    override fun toRadians(): Radians = Radians(value * PI / 180)
+    override fun toDegrees(): Degrees = this
+
+    public override fun plus(other: Angle): Degrees = Degrees(value + other.toDegrees().value)
+    public override fun minus(other: Angle): Degrees = Degrees(value - other.toDegrees().value)
+
+    public override fun times(other: Number): Degrees = Degrees(value + other.toDouble())
+    public override fun div(other: Number): Degrees = Degrees(value / other.toDouble())
+    public override fun unaryMinus(): Degrees = Degrees(-value)
+}
+
+public val Number.degrees: Degrees get() = Degrees(toDouble())
+
+/**
+ * A holder class for Pi representation in radians and degrees
+ */
+public object Pi {
+    public val radians: Radians = Radians(PI)
+    public val degrees: Degrees = radians.toDegrees()
+}
+
+public object PiTimes2 {
+    public val radians: Radians = Radians(2 * PI)
+    public val degrees: Degrees = radians.toDegrees()
+}
+
+public object PiDiv2 {
+    public val radians: Radians = Radians(PI / 2)
+    public val degrees: Degrees = radians.toDegrees()
+}
\ No newline at end of file
-- 
2.34.1


From 5af0c91f0a7fca7b7b64039a5574c92a54071e9b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 21 Aug 2022 11:39:41 +0300
Subject: [PATCH 611/713] Misc

---
 build.gradle.kts                                            | 2 +-
 kmath-polynomial/build.gradle.kts                           | 6 +++---
 .../kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt      | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b6e5b0748..28349f1b9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.1-dev-1"
+    version = "0.3.1-dev-2"
 }
 
 subprojects {
diff --git a/kmath-polynomial/build.gradle.kts b/kmath-polynomial/build.gradle.kts
index 42b90a70e..c6946878c 100644
--- a/kmath-polynomial/build.gradle.kts
+++ b/kmath-polynomial/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-    kotlin("multiplatform")
-    id("space.kscience.gradle.common")
-    id("space.kscience.gradle.native")
+    id("space.kscience.gradle.mpp")
+    // Disable native target to avoid CI crashes
+//    id("space.kscience.gradle.native")
 }
 
 description = "Polynomials, rational functions, and utilities"
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index e412ab5bb..292357a71 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.tensors.api.Tensor
@@ -18,8 +17,6 @@ import space.kscience.kmath.tensors.core.internal.tensor
  * Basic linear algebra operations implemented with broadcasting.
  * For more information: https://pytorch.org/docs/stable/notes/broadcasting.html
  */
-
-@PerformancePitfall
 public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun StructureND<Double>.plus(arg: StructureND<Double>): DoubleTensor {
@@ -102,6 +99,5 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
  * Compute a value using broadcast double tensor algebra
  */
 @UnstableKMathAPI
-@PerformancePitfall
 public fun <R> DoubleTensorAlgebra.withBroadcast(block: BroadcastDoubleTensorAlgebra.() -> R): R =
     BroadcastDoubleTensorAlgebra.block()
\ No newline at end of file
-- 
2.34.1


From 978de59b7a412a64309e03d879a9fc053ae6c177 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 21 Aug 2022 11:40:02 +0300
Subject: [PATCH 612/713] Add rotations converter to Quaternions

---
 .../kscience/kmath/complex/Quaternion.kt      |   5 +
 .../kmath/geometry/Euclidean3DSpace.kt        |  12 +-
 .../kscience/kmath/geometry/rotations3D.kt    | 105 ++++++++++++++++--
 .../kscience/kmath/geometry/RotationTest.kt   |  21 +++-
 .../kmath/functions/labeledConstructors.kt    |  16 +--
 5 files changed, 139 insertions(+), 20 deletions(-)

diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index 0305bfc88..643bff696 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -117,6 +117,11 @@ public val Quaternion.reciprocal: Quaternion
         return Quaternion(w / norm2, -x / norm2, -y / norm2, -z / norm2)
     }
 
+
+//TODO consider adding a-priory normalized quaternions
+/**
+ * Produce a normalized version of this quaternion
+ */
 public fun Quaternion.normalized(): Quaternion = with(QuaternionField){ this@normalized / norm(this@normalized) }
 
 /**
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index c1fc74bf1..3bfd265b6 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -27,8 +27,9 @@ public interface Vector3D : Point<Double>, Vector {
     override operator fun iterator(): Iterator<Double> = listOf(x, y, z).iterator()
 }
 
-@Suppress("FunctionName")
-public fun Vector3D(x: Double, y: Double, z: Double): Vector3D = Vector3DImpl(x, y, z)
+public operator fun Vector3D.component1(): Double = x
+public operator fun Vector3D.component2(): Double = y
+public operator fun Vector3D.component3(): Double = z
 
 public fun Buffer<Double>.asVector3D(): Vector3D = object : Vector3D {
     init {
@@ -51,6 +52,9 @@ private data class Vector3DImpl(
     override val z: Double,
 ) : Vector3D
 
+
+public fun Vector3D(x: Double, y: Double, z: Double): Vector3D = Vector3DImpl(x, y, z)
+
 public object Euclidean3DSpace : GeometrySpace<Vector3D>, ScaleOperations<Vector3D> {
     override val zero: Vector3D by lazy { Vector3D(0.0, 0.0, 0.0) }
 
@@ -67,4 +71,8 @@ public object Euclidean3DSpace : GeometrySpace<Vector3D>, ScaleOperations<Vector
 
     override fun Vector3D.dot(other: Vector3D): Double =
         x * other.x + y * other.y + z * other.z
+
+    public val xAxis: Vector3D = Vector3D(1.0, 0.0, 0.0)
+    public val yAxis: Vector3D = Vector3D(0.0, 1.0, 0.0)
+    public val zAxis: Vector3D = Vector3D(0.0, 0.0, 1.0)
 }
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
index 67c3666ed..c0d90463a 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
@@ -7,11 +7,9 @@ package space.kscience.kmath.geometry
 
 import space.kscience.kmath.complex.Quaternion
 import space.kscience.kmath.complex.QuaternionField
+import space.kscience.kmath.complex.normalized
 import space.kscience.kmath.complex.reciprocal
-import space.kscience.kmath.linear.LinearSpace
-import space.kscience.kmath.linear.Matrix
-import space.kscience.kmath.linear.linearSpace
-import space.kscience.kmath.linear.matrix
+import space.kscience.kmath.linear.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import kotlin.math.pow
@@ -22,16 +20,25 @@ internal fun Vector3D.toQuaternion(): Quaternion = Quaternion(0.0, x, y, z)
 /**
  * Angle in radians denoted by this quaternion rotation
  */
-public val Quaternion.theta: Double get() = kotlin.math.acos(w) * 2
+public val Quaternion.theta: Radians get() = (kotlin.math.acos(normalized().w) * 2).radians
+
+/**
+ * Create a normalized Quaternion from rotation angle and rotation vector
+ */
+public fun Quaternion.Companion.fromRotation(theta: Angle, vector: Vector3D): Quaternion {
+    val s = sin(theta / 2)
+    val c = cos(theta / 2)
+    val norm = with(Euclidean3DSpace) { vector.norm() }
+    return Quaternion(c, vector.x * s / norm, vector.y * s / norm, vector.z * s / norm)
+}
 
 /**
  * An axis of quaternion rotation
  */
 public val Quaternion.vector: Vector3D
     get() {
-        val sint2 = sqrt(1 - w * w)
-
         return object : Vector3D {
+            private val sint2 = sqrt(1 - w * w)
             override val x: Double get() = this@vector.x / sint2
             override val y: Double get() = this@vector.y / sint2
             override val z: Double get() = this@vector.z / sint2
@@ -50,6 +57,7 @@ public fun Euclidean3DSpace.rotate(vector: Vector3D, q: Quaternion): Vector3D =
 /**
  * Use a composition of quaternions to create a rotation
  */
+@UnstableKMathAPI
 public fun Euclidean3DSpace.rotate(vector: Vector3D, composition: QuaternionField.() -> Quaternion): Vector3D =
     rotate(vector, QuaternionField.composition())
 
@@ -113,4 +121,87 @@ public fun Quaternion.Companion.fromRotationMatrix(matrix: Matrix<Double>): Quat
             z = 0.25 * s,
         )
     }
+}
+
+public enum class RotationOrder {
+    // proper Euler
+    XZX,
+    XYX,
+    YXY,
+    YZY,
+    ZYZ,
+    ZXZ,
+
+    //Tait–Bryan
+    XZY,
+    XYZ,
+    YXZ,
+    YZX,
+    ZYX,
+    ZXY
+}
+
+/**
+ * Based on https://github.com/mrdoob/three.js/blob/master/src/math/Quaternion.js
+ */
+public fun Quaternion.Companion.fromEuler(
+    a: Angle,
+    b: Angle,
+    c: Angle,
+    rotationOrder: RotationOrder,
+): Quaternion {
+    val c1 = cos (a / 2)
+    val c2 = cos (b / 2)
+    val c3 = cos (c / 2)
+
+    val s1 = sin (a / 2)
+    val s2 = sin (b / 2)
+    val s3 = sin (c / 2)
+
+    return when (rotationOrder) {
+
+        RotationOrder.XYZ -> Quaternion(
+            c1 * c2 * c3 - s1 * s2 * s3,
+            s1 * c2 * c3 + c1 * s2 * s3,
+            c1 * s2 * c3 - s1 * c2 * s3,
+            c1 * c2 * s3 + s1 * s2 * c3
+        )
+
+        RotationOrder.YXZ -> Quaternion(
+            c1 * c2 * c3 + s1 * s2 * s3,
+            s1 * c2 * c3 + c1 * s2 * s3,
+            c1 * s2 * c3 - s1 * c2 * s3,
+            c1 * c2 * s3 - s1 * s2 * c3
+        )
+
+        RotationOrder.ZXY -> Quaternion(
+            c1 * c2 * c3 - s1 * s2 * s3,
+            s1 * c2 * c3 - c1 * s2 * s3,
+            c1 * s2 * c3 + s1 * c2 * s3,
+            c1 * c2 * s3 + s1 * s2 * c3
+        )
+
+
+        RotationOrder.ZYX -> Quaternion(
+            c1 * c2 * c3 + s1 * s2 * s3,
+            s1 * c2 * c3 - c1 * s2 * s3,
+            c1 * s2 * c3 + s1 * c2 * s3,
+            c1 * c2 * s3 - s1 * s2 * c3
+        )
+
+        RotationOrder.YZX -> Quaternion(
+            c1 * c2 * c3 - s1 * s2 * s3,
+            s1 * c2 * c3 + c1 * s2 * s3,
+            c1 * s2 * c3 + s1 * c2 * s3,
+            c1 * c2 * s3 - s1 * s2 * c3
+        )
+
+        RotationOrder.XZY -> Quaternion(
+            c1 * c2 * c3 + s1 * s2 * s3,
+            s1 * c2 * c3 - c1 * s2 * s3,
+            c1 * s2 * c3 - s1 * c2 * s3,
+            c1 * c2 * s3 + s1 * s2 * c3
+        )
+         else -> TODO("Proper Euler rotation orders are not supported yet")
+    }
 }
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
index 89b69d0f2..033055c19 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
@@ -7,24 +7,25 @@ package space.kscience.kmath.geometry
 
 import space.kscience.kmath.complex.Quaternion
 import space.kscience.kmath.complex.normalized
+import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.testutils.assertBufferEquals
 import kotlin.test.Test
 
 class RotationTest {
 
     @Test
-    fun rotations() = with(Euclidean3DSpace) {
+    fun differentRotations() = with(Euclidean3DSpace) {
         val vector = Vector3D(1.0, 1.0, 1.0)
         val q = Quaternion(1.0, 2.0, -3.0, 4.0).normalized()
         val rotatedByQ = rotate(vector, q)
         val matrix = q.toRotationMatrix()
-        val rotatedByM = rotate(vector,matrix)
+        val rotatedByM = rotate(vector, matrix)
 
         assertBufferEquals(rotatedByQ, rotatedByM, 1e-4)
     }
 
     @Test
-    fun rotationConversion() {
+    fun matrixConversion() {
 
         val q = Quaternion(1.0, 2.0, -3.0, 4.0).normalized()
 
@@ -32,4 +33,18 @@ class RotationTest {
 
         assertBufferEquals(q, Quaternion.fromRotationMatrix(matrix))
     }
+
+    @Test
+    fun fromRotation() {
+        val q = Quaternion.fromRotation(0.3.radians, Vector3D(1.0, 1.0, 1.0))
+
+        assertBufferEquals(DoubleBuffer(0.9887711, 0.0862781, 0.0862781, 0.0862781), q)
+    }
+
+    @Test
+    fun fromEuler() {
+        val q = Quaternion.fromEuler(0.1.radians, 0.2.radians, 0.3.radians, RotationOrder.ZXY)
+
+        assertBufferEquals(DoubleBuffer(0.9818562, 0.0342708, 0.1060205, 0.1534393), q)
+    }
 }
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
index d74c0e1fb..082b133a0 100644
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
+++ b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
@@ -470,7 +470,7 @@ public class DSL2LabeledPolynomialBuilder<C>(
     }
 
     private inline fun submit(signature: Map<Symbol, UInt>, lazyCoefficient: Ring<C>.() -> C) {
-        submit(signature, lazyCoefficient, { it + lazyCoefficient() })
+        submit(signature, lazyCoefficient) { it + lazyCoefficient() }
     }
 
     private fun submit(signature: Map<Symbol, UInt>, coefficient: C) {
@@ -478,9 +478,9 @@ public class DSL2LabeledPolynomialBuilder<C>(
     }
 
     // TODO: `@submit` will be resolved differently. Change it to `@C`.
-    private fun C.submit() = submit(emptyMap(), { this@submit })
+    private fun C.submitSelf() = submit(emptyMap()) { this@submitSelf }
 
-    private fun Symbol.submit() = submit(mapOf(this to 1u), { one })
+    private fun Symbol.submit() = submit(mapOf(this to 1u)) { one }
 
     private fun Term.submit(): Submit {
         submit(signature, coefficient)
@@ -490,7 +490,7 @@ public class DSL2LabeledPolynomialBuilder<C>(
     public object Submit
 
     public operator fun C.unaryPlus(): Submit {
-        submit()
+        submitSelf()
         return Submit
     }
 
@@ -500,12 +500,12 @@ public class DSL2LabeledPolynomialBuilder<C>(
     }
 
     public operator fun C.plus(other: C): Submit {
-        submit(emptyMap(), { this@plus + other })
+        submit(emptyMap()) { this@plus + other }
         return Submit
     }
 
     public operator fun C.minus(other: C): Submit {
-        submit(emptyMap(), { this@minus - other })
+        submit(emptyMap()) { this@minus - other }
         return Submit
     }
 
@@ -541,7 +541,7 @@ public class DSL2LabeledPolynomialBuilder<C>(
 
     public operator fun Symbol.plus(other: C): Submit {
         this.submit()
-        other.submit()
+        other.submitSelf()
         return Submit
     }
 
@@ -599,7 +599,7 @@ public class DSL2LabeledPolynomialBuilder<C>(
 
     public operator fun Term.plus(other: C): Submit {
         this.submit()
-        other.submit()
+        other.submitSelf()
         return Submit
     }
 
-- 
2.34.1


From ec77cd1fc324df8cfba80272186e3e3c40184522 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 21 Aug 2022 19:17:38 +0300
Subject: [PATCH 613/713] Geometry overhaul

---
 kmath-dimensions/build.gradle.kts             |  3 +-
 kmath-geometry/build.gradle.kts               |  7 +-
 .../space/kscience/kmath/geometry/Circle2D.kt |  2 +-
 .../kmath/geometry/Euclidean2DSpace.kt        | 61 ++++++++++-----
 .../kmath/geometry/Euclidean3DSpace.kt        | 76 ++++++++++---------
 .../kscience/kmath/geometry/GeometrySpace.kt  |  3 +-
 .../space/kscience/kmath/geometry/Line.kt     |  9 ++-
 .../kscience/kmath/geometry/rotations3D.kt    | 14 ++--
 .../kmath/geometry/Euclidean2DSpaceTest.kt    | 40 +++++-----
 .../kmath/geometry/Euclidean3DSpaceTest.kt    | 50 ++++++------
 .../kmath/geometry/ProjectionAlongTest.kt     | 20 ++---
 .../kmath/geometry/ProjectionOntoLineTest.kt  | 46 +++++------
 .../kscience/kmath/geometry/RotationTest.kt   |  4 +-
 .../kscience/kmath/geometry/Vector2DTest.kt   |  2 +-
 .../kscience/kmath/geometry/Vector3DTest.kt   |  2 +-
 .../kscience/kmath/geometry/testUtils.kt      |  4 +-
 .../kscience/kmath/geometry/lineExtensions.kt | 20 +++++
 .../kscience/kmath/trajectory/DubinsPath.kt   | 36 ++++-----
 .../space/kscience/kmath/trajectory/Pose2D.kt | 18 ++---
 .../kscience/kmath/trajectory/Trajectory.kt   | 10 +--
 .../space/kscience/kmath/trajectory/Math.kt   |  8 +-
 .../kmath/trajectory/dubins/DubinsTests.kt    |  7 +-
 .../kmath/trajectory/segments/ArcTests.kt     |  8 +-
 .../kmath/trajectory/segments/CircleTests.kt  |  4 +-
 .../kmath/trajectory/segments/LineTests.kt    | 15 ++--
 25 files changed, 260 insertions(+), 209 deletions(-)
 create mode 100644 kmath-geometry/src/jvmMain/kotlin/space/kscience/kmath/geometry/lineExtensions.kt

diff --git a/kmath-dimensions/build.gradle.kts b/kmath-dimensions/build.gradle.kts
index ee1950fa8..1c042ab70 100644
--- a/kmath-dimensions/build.gradle.kts
+++ b/kmath-dimensions/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-    kotlin("multiplatform")
-    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.mpp")
     id("space.kscience.gradle.native")
 }
 
diff --git a/kmath-geometry/build.gradle.kts b/kmath-geometry/build.gradle.kts
index c9d8823bc..c2057bcbe 100644
--- a/kmath-geometry/build.gradle.kts
+++ b/kmath-geometry/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-    kotlin("multiplatform")
-    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.mpp")
     id("space.kscience.gradle.native")
 }
 
@@ -10,6 +9,10 @@ kotlin.sourceSets.commonMain {
     }
 }
 
+kscience {
+    withContextReceivers()
+}
+
 readme {
     maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
index 8623335b9..c665ae6bb 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
@@ -11,7 +11,7 @@ import kotlin.math.PI
  * A circle in 2D space
  */
 public class Circle2D(
-    public val center: Vector2D,
+    public val center: DoubleVector2D,
     public val radius: Double
 )
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
index a83cb3ac7..f622bbb76 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
@@ -6,45 +6,64 @@
 package space.kscience.kmath.geometry
 
 import space.kscience.kmath.linear.Point
+import space.kscience.kmath.operations.Norm
 import space.kscience.kmath.operations.ScaleOperations
-import space.kscience.kmath.operations.invoke
+import kotlin.math.pow
 import kotlin.math.sqrt
 
-public interface Vector2D : Point<Double>, Vector {
-    public val x: Double
-    public val y: Double
+public interface Vector2D<T> : Point<T>, Vector {
+    public val x: T
+    public val y: T
     override val size: Int get() = 2
 
-    override operator fun get(index: Int): Double = when (index) {
+    override operator fun get(index: Int): T = when (index) {
         0 -> x
         1 -> y
         else -> error("Accessing outside of point bounds")
     }
 
-    override operator fun iterator(): Iterator<Double> = listOf(x, y).iterator()
+    override operator fun iterator(): Iterator<T> = iterator {
+        yield(x)
+        yield(y)
+    }
 }
 
-public val Vector2D.r: Double
-    get() = Euclidean2DSpace { norm() }
 
-public fun Vector2D(x: Double, y: Double): Vector2D = Vector2DImpl(x, y)
+public operator fun <T> Vector2D<T>.component1(): T = x
+public operator fun <T> Vector2D<T>.component2(): T = y
+
+public typealias DoubleVector2D = Vector2D<Double>
+
+public val Vector2D<Double>.r: Double get() = Euclidean2DSpace.norm(this)
 
-private data class Vector2DImpl(
-    override val x: Double,
-    override val y: Double,
-) : Vector2D
 
 /**
  * 2D Euclidean space
  */
-public object Euclidean2DSpace : GeometrySpace<Vector2D>, ScaleOperations<Vector2D> {
-    override val zero: Vector2D by lazy { Vector2D(0.0, 0.0) }
+public object Euclidean2DSpace : GeometrySpace<DoubleVector2D>,
+    ScaleOperations<DoubleVector2D>,
+    Norm<DoubleVector2D, Double> {
 
-    public fun Vector2D.norm(): Double = sqrt(x * x + y * y)
-    override fun Vector2D.unaryMinus(): Vector2D = Vector2D(-x, -y)
+    private data class Vector2DImpl(
+        override val x: Double,
+        override val y: Double,
+    ) : DoubleVector2D
 
-    override fun Vector2D.distanceTo(other: Vector2D): Double = (this - other).norm()
-    override fun add(left: Vector2D, right: Vector2D): Vector2D = Vector2D(left.x + right.x, left.y + right.y)
-    override fun scale(a: Vector2D, value: Double): Vector2D = Vector2D(a.x * value, a.y * value)
-    override fun Vector2D.dot(other: Vector2D): Double = x * other.x + y * other.y
+    public fun vector(x: Number, y: Number): DoubleVector2D = Vector2DImpl(x.toDouble(), y.toDouble())
+
+    override val zero: DoubleVector2D by lazy { vector(0.0, 0.0) }
+
+    override fun norm(arg: DoubleVector2D): Double = sqrt(arg.x.pow(2) + arg.y.pow(2))
+
+    override fun DoubleVector2D.unaryMinus(): DoubleVector2D = vector(-x, -y)
+
+    override fun DoubleVector2D.distanceTo(other: DoubleVector2D): Double = norm(this - other)
+    override fun add(left: DoubleVector2D, right: DoubleVector2D): DoubleVector2D =
+        vector(left.x + right.x, left.y + right.y)
+
+    override fun scale(a: DoubleVector2D, value: Double): DoubleVector2D = vector(a.x * value, a.y * value)
+    override fun DoubleVector2D.dot(other: DoubleVector2D): Double = x * other.x + y * other.y
+
+    public val xAxis: DoubleVector2D = vector(1.0, 0.0)
+    public val yAxis: DoubleVector2D = vector(0.0, 1.0)
 }
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index 3bfd265b6..93be2df52 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -6,73 +6,79 @@
 package space.kscience.kmath.geometry
 
 import space.kscience.kmath.linear.Point
+import space.kscience.kmath.operations.Norm
 import space.kscience.kmath.operations.ScaleOperations
-import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
+import kotlin.math.pow
 import kotlin.math.sqrt
 
-public interface Vector3D : Point<Double>, Vector {
-    public val x: Double
-    public val y: Double
-    public val z: Double
+public interface Vector3D<T> : Point<T>, Vector {
+    public val x: T
+    public val y: T
+    public val z: T
     override val size: Int get() = 3
 
-    override operator fun get(index: Int): Double = when (index) {
+    override operator fun get(index: Int): T = when (index) {
         0 -> x
         1 -> y
         2 -> z
         else -> error("Accessing outside of point bounds")
     }
 
-    override operator fun iterator(): Iterator<Double> = listOf(x, y, z).iterator()
+    override operator fun iterator(): Iterator<T> = listOf(x, y, z).iterator()
 }
 
-public operator fun Vector3D.component1(): Double = x
-public operator fun Vector3D.component2(): Double = y
-public operator fun Vector3D.component3(): Double = z
+public operator fun <T> Vector3D<T>.component1(): T = x
+public operator fun <T> Vector3D<T>.component2(): T = y
+public operator fun <T> Vector3D<T>.component3(): T = z
 
-public fun Buffer<Double>.asVector3D(): Vector3D = object : Vector3D {
+public fun <T> Buffer<T>.asVector3D(): Vector3D<T> = object : Vector3D<T> {
     init {
         require(this@asVector3D.size == 3) { "Buffer of size 3 is required for Vector3D" }
     }
 
-    override val x: Double get() = this@asVector3D[0]
-    override val y: Double get() = this@asVector3D[1]
-    override val z: Double get() = this@asVector3D[2]
+    override val x: T get() = this@asVector3D[0]
+    override val y: T get() = this@asVector3D[1]
+    override val z: T get() = this@asVector3D[2]
 
     override fun toString(): String = this@asVector3D.toString()
-
 }
 
-public val Vector3D.r: Double get() = Euclidean3DSpace { norm() }
+public typealias DoubleVector3D = Vector3D<Double>
 
-private data class Vector3DImpl(
-    override val x: Double,
-    override val y: Double,
-    override val z: Double,
-) : Vector3D
+public val DoubleVector3D.r: Double get() = Euclidean3DSpace.norm(this)
 
+public object Euclidean3DSpace : GeometrySpace<DoubleVector3D>, ScaleOperations<DoubleVector3D>,
+    Norm<DoubleVector3D, Double> {
+    private data class Vector3DImpl(
+        override val x: Double,
+        override val y: Double,
+        override val z: Double,
+    ) : DoubleVector3D
 
-public fun Vector3D(x: Double, y: Double, z: Double): Vector3D = Vector3DImpl(x, y, z)
+    public fun vector(x: Number, y: Number, z: Number): DoubleVector3D =
+        Vector3DImpl(x.toDouble(), y.toDouble(), z.toDouble())
 
-public object Euclidean3DSpace : GeometrySpace<Vector3D>, ScaleOperations<Vector3D> {
-    override val zero: Vector3D by lazy { Vector3D(0.0, 0.0, 0.0) }
+    override val zero: DoubleVector3D by lazy { vector(0.0, 0.0, 0.0) }
 
-    public fun Vector3D.norm(): Double = sqrt(x * x + y * y + z * z)
-    override fun Vector3D.unaryMinus(): Vector3D = Vector3D(-x, -y, -z)
+    override fun norm(arg: DoubleVector3D): Double = sqrt(arg.x.pow(2) + arg.y.pow(2) + arg.z.pow(2))
 
-    override fun Vector3D.distanceTo(other: Vector3D): Double = (this - other).norm()
+    public fun DoubleVector3D.norm(): Double = norm(this)
 
-    override fun add(left: Vector3D, right: Vector3D): Vector3D =
-        Vector3D(left.x + right.x, left.y + right.y, left.z + right.z)
+    override fun DoubleVector3D.unaryMinus(): DoubleVector3D = vector(-x, -y, -z)
 
-    override fun scale(a: Vector3D, value: Double): Vector3D =
-        Vector3D(a.x * value, a.y * value, a.z * value)
+    override fun DoubleVector3D.distanceTo(other: DoubleVector3D): Double = (this - other).norm()
 
-    override fun Vector3D.dot(other: Vector3D): Double =
+    override fun add(left: DoubleVector3D, right: DoubleVector3D): DoubleVector3D =
+        vector(left.x + right.x, left.y + right.y, left.z + right.z)
+
+    override fun scale(a: DoubleVector3D, value: Double): DoubleVector3D =
+        vector(a.x * value, a.y * value, a.z * value)
+
+    override fun DoubleVector3D.dot(other: DoubleVector3D): Double =
         x * other.x + y * other.y + z * other.z
 
-    public val xAxis: Vector3D = Vector3D(1.0, 0.0, 0.0)
-    public val yAxis: Vector3D = Vector3D(0.0, 1.0, 0.0)
-    public val zAxis: Vector3D = Vector3D(0.0, 0.0, 1.0)
+    public val xAxis: DoubleVector3D = vector(1.0, 0.0, 0.0)
+    public val yAxis: DoubleVector3D = vector(0.0, 1.0, 0.0)
+    public val zAxis: DoubleVector3D = vector(0.0, 0.0, 1.0)
 }
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
index d4245c744..b06ff9989 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
@@ -6,11 +6,12 @@
 package space.kscience.kmath.geometry
 
 import space.kscience.kmath.operations.Group
+import space.kscience.kmath.operations.Norm
 import space.kscience.kmath.operations.ScaleOperations
 
 public interface Vector
 
-public interface GeometrySpace<V : Vector> : Group<V>, ScaleOperations<V> {
+public interface GeometrySpace<V : Vector> : Group<V>, ScaleOperations<V>, Norm<V, Double> {
     /**
      * L2 distance
      */
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
index 85bfcdd8f..2251af600 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
@@ -11,5 +11,10 @@ package space.kscience.kmath.geometry
  */
 public data class Line<out V : Vector>(val base: V, val direction: V)
 
-public typealias Line2D = Line<Vector2D>
-public typealias Line3D = Line<Vector3D>
+public typealias Line2D = Line<DoubleVector2D>
+public typealias Line3D = Line<DoubleVector3D>
+
+/**
+ * A directed line segment between [begin] and [end]
+ */
+public data class LineSegment<out V : Vector>(val begin: V, val end: V)
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
index c0d90463a..2500c78d6 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
@@ -15,7 +15,7 @@ import space.kscience.kmath.operations.DoubleField
 import kotlin.math.pow
 import kotlin.math.sqrt
 
-internal fun Vector3D.toQuaternion(): Quaternion = Quaternion(0.0, x, y, z)
+internal fun DoubleVector3D.toQuaternion(): Quaternion = Quaternion(0.0, x, y, z)
 
 /**
  * Angle in radians denoted by this quaternion rotation
@@ -25,7 +25,7 @@ public val Quaternion.theta: Radians get() = (kotlin.math.acos(normalized().w) *
 /**
  * Create a normalized Quaternion from rotation angle and rotation vector
  */
-public fun Quaternion.Companion.fromRotation(theta: Angle, vector: Vector3D): Quaternion {
+public fun Quaternion.Companion.fromRotation(theta: Angle, vector: DoubleVector3D): Quaternion {
     val s = sin(theta / 2)
     val c = cos(theta / 2)
     val norm = with(Euclidean3DSpace) { vector.norm() }
@@ -35,9 +35,9 @@ public fun Quaternion.Companion.fromRotation(theta: Angle, vector: Vector3D): Qu
 /**
  * An axis of quaternion rotation
  */
-public val Quaternion.vector: Vector3D
+public val Quaternion.vector: DoubleVector3D
     get() {
-        return object : Vector3D {
+        return object : DoubleVector3D {
             private val sint2 = sqrt(1 - w * w)
             override val x: Double get() = this@vector.x / sint2
             override val y: Double get() = this@vector.y / sint2
@@ -49,7 +49,7 @@ public val Quaternion.vector: Vector3D
 /**
  * Rotate a vector in a [Euclidean3DSpace]
  */
-public fun Euclidean3DSpace.rotate(vector: Vector3D, q: Quaternion): Vector3D = with(QuaternionField) {
+public fun Euclidean3DSpace.rotate(vector: DoubleVector3D, q: Quaternion): DoubleVector3D = with(QuaternionField) {
     val p = vector.toQuaternion()
     (q * p * q.reciprocal).vector
 }
@@ -58,10 +58,10 @@ public fun Euclidean3DSpace.rotate(vector: Vector3D, q: Quaternion): Vector3D =
  * Use a composition of quaternions to create a rotation
  */
 @UnstableKMathAPI
-public fun Euclidean3DSpace.rotate(vector: Vector3D, composition: QuaternionField.() -> Quaternion): Vector3D =
+public fun Euclidean3DSpace.rotate(vector: DoubleVector3D, composition: QuaternionField.() -> Quaternion): DoubleVector3D =
     rotate(vector, QuaternionField.composition())
 
-public fun Euclidean3DSpace.rotate(vector: Vector3D, matrix: Matrix<Double>): Vector3D {
+public fun Euclidean3DSpace.rotate(vector: DoubleVector3D, matrix: Matrix<Double>): DoubleVector3D {
     require(matrix.colNum == 3 && matrix.rowNum == 3) { "Square 3x3 rotation matrix is required" }
     return with(DoubleField.linearSpace) { matrix.dot(vector).asVector3D() }
 }
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
index 6b5f474bc..8ca6ba248 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean2DSpaceTest.kt
@@ -12,16 +12,16 @@ import kotlin.test.assertEquals
 internal class Euclidean2DSpaceTest {
     @Test
     fun zero() {
-        assertVectorEquals(Vector2D(0.0, 0.0), Euclidean2DSpace.zero)
+        assertVectorEquals(Euclidean2DSpace.vector(0.0, 0.0), Euclidean2DSpace.zero)
     }
 
     @Test
     fun norm() {
         with(Euclidean2DSpace) {
-            assertEquals(0.0, zero.norm())
-            assertEquals(1.0, Vector2D(1.0, 0.0).norm())
-            assertEquals(sqrt(2.0), Vector2D(1.0, 1.0).norm())
-            assertEquals(sqrt(5.002001), Vector2D(-2.0, 1.001).norm())
+            assertEquals(0.0, norm(zero))
+            assertEquals(1.0, norm(vector(1.0, 0.0)))
+            assertEquals(sqrt(2.0), norm(vector(1.0, 1.0)))
+            assertEquals(sqrt(5.002001), norm(vector(-2.0, 1.001)))
         }
     }
 
@@ -29,16 +29,16 @@ internal class Euclidean2DSpaceTest {
     fun dotProduct() {
         with(Euclidean2DSpace) {
             assertEquals(0.0, zero dot zero)
-            assertEquals(0.0, zero dot Vector2D(1.0, 0.0))
-            assertEquals(0.0, Vector2D(-2.0, 0.001) dot zero)
-            assertEquals(0.0, Vector2D(1.0, 0.0) dot Vector2D(0.0, 1.0))
+            assertEquals(0.0, zero dot vector(1.0, 0.0))
+            assertEquals(0.0, vector(-2.0, 0.001) dot zero)
+            assertEquals(0.0, vector(1.0, 0.0) dot vector(0.0, 1.0))
 
-            assertEquals(1.0, Vector2D(1.0, 0.0) dot Vector2D(1.0, 0.0))
-            assertEquals(-2.0, Vector2D(0.0, 1.0) dot Vector2D(1.0, -2.0))
-            assertEquals(2.0, Vector2D(1.0, 1.0) dot Vector2D(1.0, 1.0))
-            assertEquals(4.001001, Vector2D(-2.0, 1.001) dot Vector2D(-2.0, 0.001))
+            assertEquals(1.0, vector(1.0, 0.0) dot vector(1.0, 0.0))
+            assertEquals(-2.0, vector(0.0, 1.0) dot vector(1.0, -2.0))
+            assertEquals(2.0, vector(1.0, 1.0) dot vector(1.0, 1.0))
+            assertEquals(4.001001, vector(-2.0, 1.001) dot vector(-2.0, 0.001))
 
-            assertEquals(-4.998, Vector2D(1.0, 2.0) dot Vector2D(-5.0, 0.001))
+            assertEquals(-4.998, vector(1.0, 2.0) dot vector(-5.0, 0.001))
         }
     }
 
@@ -46,12 +46,12 @@ internal class Euclidean2DSpaceTest {
     fun add() {
         with(Euclidean2DSpace) {
             assertVectorEquals(
-                Vector2D(-2.0, 0.001),
-                Vector2D(-2.0, 0.001) + zero
+                vector(-2.0, 0.001),
+                vector(-2.0, 0.001) + zero
             )
             assertVectorEquals(
-                Vector2D(-3.0, 3.001),
-                Vector2D(2.0, 3.0) + Vector2D(-5.0, 0.001)
+                vector(-3.0, 3.001),
+                vector(2.0, 3.0) + vector(-5.0, 0.001)
             )
         }
     }
@@ -59,9 +59,9 @@ internal class Euclidean2DSpaceTest {
     @Test
     fun multiply() {
         with(Euclidean2DSpace) {
-            assertVectorEquals(Vector2D(-4.0, 0.0), Vector2D(-2.0, 0.0) * 2)
-            assertVectorEquals(Vector2D(4.0, 0.0), Vector2D(-2.0, 0.0) * -2)
-            assertVectorEquals(Vector2D(300.0, 0.0003), Vector2D(100.0, 0.0001) * 3)
+            assertVectorEquals(vector(-4.0, 0.0), vector(-2.0, 0.0) * 2)
+            assertVectorEquals(vector(4.0, 0.0), vector(-2.0, 0.0) * -2)
+            assertVectorEquals(vector(300.0, 0.0003), vector(100.0, 0.0001) * 3)
         }
     }
 }
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
index 0bc91e77e..191ba54ab 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
@@ -11,21 +11,21 @@ import kotlin.test.assertEquals
 internal class Euclidean3DSpaceTest {
     @Test
     fun zero() {
-        assertVectorEquals(Vector3D(0.0, 0.0, 0.0), Euclidean3DSpace.zero)
+        assertVectorEquals(Euclidean3DSpace.vector(0.0, 0.0, 0.0), Euclidean3DSpace.zero)
     }
 
     @Test
     fun distance() {
         with(Euclidean3DSpace) {
             assertEquals(0.0, zero.distanceTo(zero))
-            assertEquals(1.0, zero.distanceTo(Vector3D(1.0, 0.0, 0.0)))
-            assertEquals(kotlin.math.sqrt(5.000001), Vector3D(1.0, -2.0, 0.001).distanceTo(zero))
-            assertEquals(0.0, Vector3D(1.0, -2.0, 0.001).distanceTo(Vector3D(1.0, -2.0, 0.001)))
-            assertEquals(0.0, Vector3D(1.0, 0.0, 0.0).distanceTo(Vector3D(1.0, 0.0, 0.0)))
-            assertEquals(kotlin.math.sqrt(2.0), Vector3D(1.0, 0.0, 0.0).distanceTo(Vector3D(1.0, 1.0, 1.0)))
-            assertEquals(3.1622778182822584, Vector3D(0.0, 1.0, 0.0).distanceTo(Vector3D(1.0, -2.0, 0.001)))
-            assertEquals(0.0, Vector3D(1.0, -2.0, 0.001).distanceTo(Vector3D(1.0, -2.0, 0.001)))
-            assertEquals(9.695050335093676, Vector3D(1.0, 2.0, 3.0).distanceTo(Vector3D(7.0, -5.0, 0.001)))
+            assertEquals(1.0, zero.distanceTo(vector(1.0, 0.0, 0.0)))
+            assertEquals(kotlin.math.sqrt(5.000001), vector(1.0, -2.0, 0.001).distanceTo(zero))
+            assertEquals(0.0, vector(1.0, -2.0, 0.001).distanceTo(vector(1.0, -2.0, 0.001)))
+            assertEquals(0.0, vector(1.0, 0.0, 0.0).distanceTo(vector(1.0, 0.0, 0.0)))
+            assertEquals(kotlin.math.sqrt(2.0), vector(1.0, 0.0, 0.0).distanceTo(vector(1.0, 1.0, 1.0)))
+            assertEquals(3.1622778182822584, vector(0.0, 1.0, 0.0).distanceTo(vector(1.0, -2.0, 0.001)))
+            assertEquals(0.0, vector(1.0, -2.0, 0.001).distanceTo(vector(1.0, -2.0, 0.001)))
+            assertEquals(9.695050335093676, vector(1.0, 2.0, 3.0).distanceTo(vector(7.0, -5.0, 0.001)))
         }
     }
 
@@ -33,9 +33,9 @@ internal class Euclidean3DSpaceTest {
     fun norm() {
         with(Euclidean3DSpace) {
             assertEquals(0.0, zero.norm())
-            assertEquals(1.0, Vector3D(1.0, 0.0, 0.0).norm())
-            assertEquals(kotlin.math.sqrt(3.0), Vector3D(1.0, 1.0, 1.0).norm())
-            assertEquals(kotlin.math.sqrt(5.000001), Vector3D(1.0, -2.0, 0.001).norm())
+            assertEquals(1.0, vector(1.0, 0.0, 0.0).norm())
+            assertEquals(kotlin.math.sqrt(3.0), vector(1.0, 1.0, 1.0).norm())
+            assertEquals(kotlin.math.sqrt(5.000001), vector(1.0, -2.0, 0.001).norm())
         }
     }
 
@@ -43,16 +43,16 @@ internal class Euclidean3DSpaceTest {
     fun dotProduct() {
         with(Euclidean3DSpace) {
             assertEquals(0.0, zero dot zero)
-            assertEquals(0.0, zero dot Vector3D(1.0, 0.0, 0.0))
-            assertEquals(0.0, Vector3D(1.0, -2.0, 0.001) dot zero)
+            assertEquals(0.0, zero dot vector(1.0, 0.0, 0.0))
+            assertEquals(0.0, vector(1.0, -2.0, 0.001) dot zero)
 
-            assertEquals(1.0, Vector3D(1.0, 0.0, 0.0) dot Vector3D(1.0, 0.0, 0.0))
-            assertEquals(1.0, Vector3D(1.0, 0.0, 0.0) dot Vector3D(1.0, 1.0, 1.0))
-            assertEquals(-2.0, Vector3D(0.0, 1.0, 0.0) dot Vector3D(1.0, -2.0, 0.001))
-            assertEquals(3.0, Vector3D(1.0, 1.0, 1.0) dot Vector3D(1.0, 1.0, 1.0))
-            assertEquals(5.000001, Vector3D(1.0, -2.0, 0.001) dot Vector3D(1.0, -2.0, 0.001))
+            assertEquals(1.0, vector(1.0, 0.0, 0.0) dot vector(1.0, 0.0, 0.0))
+            assertEquals(1.0, vector(1.0, 0.0, 0.0) dot vector(1.0, 1.0, 1.0))
+            assertEquals(-2.0, vector(0.0, 1.0, 0.0) dot vector(1.0, -2.0, 0.001))
+            assertEquals(3.0, vector(1.0, 1.0, 1.0) dot vector(1.0, 1.0, 1.0))
+            assertEquals(5.000001, vector(1.0, -2.0, 0.001) dot vector(1.0, -2.0, 0.001))
 
-            assertEquals(-2.997, Vector3D(1.0, 2.0, 3.0) dot Vector3D(7.0, -5.0, 0.001))
+            assertEquals(-2.997, vector(1.0, 2.0, 3.0) dot vector(7.0, -5.0, 0.001))
         }
     }
 
@@ -60,12 +60,12 @@ internal class Euclidean3DSpaceTest {
     fun add() {
         with(Euclidean3DSpace) {
             assertVectorEquals(
-                Vector3D(1.0, -2.0, 0.001),
-                Vector3D(1.0, -2.0, 0.001) + zero
+                vector(1.0, -2.0, 0.001),
+                vector(1.0, -2.0, 0.001) + zero
             )
             assertVectorEquals(
-                Vector3D(8.0, -3.0, 3.001),
-                Vector3D(1.0, 2.0, 3.0) + Vector3D(7.0, -5.0, 0.001)
+                vector(8.0, -3.0, 3.001),
+                vector(1.0, 2.0, 3.0) + vector(7.0, -5.0, 0.001)
             )
         }
     }
@@ -73,7 +73,7 @@ internal class Euclidean3DSpaceTest {
     @Test
     fun multiply() {
         with(Euclidean3DSpace) {
-            assertVectorEquals(Vector3D(2.0, -4.0, 0.0), Vector3D(1.0, -2.0, 0.0) * 2)
+            assertVectorEquals(vector(2.0, -4.0, 0.0), vector(1.0, -2.0, 0.0) * 2)
         }
     }
 }
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
index dfb65a57c..cebbf5a4d 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionAlongTest.kt
@@ -12,14 +12,14 @@ internal class ProjectionAlongTest {
     @Test
     fun projectionIntoYEqualsX() {
         with(Euclidean2DSpace) {
-            val normal = Vector2D(-2.0, 2.0)
-            val base = Vector2D(2.3, 2.3)
+            val normal = vector(-2.0, 2.0)
+            val base = vector(2.3, 2.3)
 
             assertVectorEquals(zero, projectAlong(zero, normal, base))
 
             grid(-10.0..10.0, -10.0..10.0, 0.15).forEach { (x, y) ->
                 val d = (y - x) / 2.0
-                assertVectorEquals(Vector2D(x + d, y - d), projectAlong(Vector2D(x, y), normal, base))
+                assertVectorEquals(vector(x + d, y - d), projectAlong(vector(x, y), normal, base))
             }
         }
     }
@@ -30,28 +30,28 @@ internal class ProjectionAlongTest {
             val a = 5.0
             val b = -3.0
             val c = -15.0
-            val normal = Vector2D(-5.0, 3.0)
-            val base = Vector2D(3.0, 0.0)
+            val normal = vector(-5.0, 3.0)
+            val base = vector(3.0, 0.0)
 
             grid(-10.0..10.0, -10.0..10.0, 0.15).forEach { (x, y) ->
                 val xProj = (b * (b * x - a * y) - a * c) / (a * a + b * b)
                 val yProj = (a * (-b * x + a * y) - b * c) / (a * a + b * b)
-                assertVectorEquals(Vector2D(xProj, yProj), projectAlong(Vector2D(x, y), normal, base))
+                assertVectorEquals(vector(xProj, yProj), projectAlong(vector(x, y), normal, base))
             }
         }
     }
 
     @Test
-    fun projectOntoPlane() {
-        val normal = Vector3D(1.0, 3.5, 0.07)
-        val base = Vector3D(2.0, -0.0037, 11.1111)
+    fun projectOntoPlane() = with(Euclidean3DSpace){
+        val normal = vector(1.0, 3.5, 0.07)
+        val base = vector(2.0, -0.0037, 11.1111)
 
         with(Euclidean3DSpace) {
             val testDomain = (-10.0..10.0).generateList(0.43)
             for (x in testDomain) {
                 for (y in testDomain) {
                     for (z in testDomain) {
-                        val v = Vector3D(x, y, z)
+                        val v = vector(x, y, z)
                         val result = projectAlong(v, normal, base)
 
                         // assert that result is on plane
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
index 076025110..2ca0b5f76 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
@@ -12,10 +12,10 @@ internal class ProjectionOntoLineTest {
     @Test
     fun projectionIntoOx() {
         with(Euclidean2DSpace) {
-            val ox = Line(zero, Vector2D(1.0, 0.0))
+            val ox = Line(zero, vector(1.0, 0.0))
 
             grid(-10.0..10.0, -10.0..10.0, 0.15).forEach { (x, y) ->
-                assertVectorEquals(Vector2D(x, 0.0), projectToLine(Vector2D(x, y), ox))
+                assertVectorEquals(vector(x, 0.0), projectToLine(vector(x, y), ox))
             }
         }
     }
@@ -23,10 +23,10 @@ internal class ProjectionOntoLineTest {
     @Test
     fun projectionIntoOy() {
         with(Euclidean2DSpace) {
-            val line = Line(zero, Vector2D(0.0, 1.0))
+            val line = Line(zero, vector(0.0, 1.0))
 
             grid(-10.0..10.0, -10.0..10.0, 0.15).forEach { (x, y) ->
-                assertVectorEquals(Vector2D(0.0, y), projectToLine(Vector2D(x, y), line))
+                assertVectorEquals(vector(0.0, y), projectToLine(vector(x, y), line))
             }
         }
     }
@@ -34,13 +34,13 @@ internal class ProjectionOntoLineTest {
     @Test
     fun projectionIntoYEqualsX() {
         with(Euclidean2DSpace) {
-            val line = Line(zero, Vector2D(1.0, 1.0))
+            val line = Line(zero, vector(1.0, 1.0))
 
             assertVectorEquals(zero, projectToLine(zero, line))
 
             grid(-10.0..10.0, -10.0..10.0, 0.15).forEach { (x, y) ->
                 val d = (y - x) / 2.0
-                assertVectorEquals(Vector2D(x + d, y - d), projectToLine(Vector2D(x, y), line))
+                assertVectorEquals(vector(x + d, y - d), projectToLine(vector(x, y), line))
             }
         }
     }
@@ -51,38 +51,38 @@ internal class ProjectionOntoLineTest {
             val a = 5.0
             val b = -3.0
             val c = -15.0
-            val line = Line(Vector2D(3.0, 0.0), Vector2D(3.0, 5.0))
+            val line = Line(vector(3.0, 0.0), vector(3.0, 5.0))
 
             grid(-10.0..10.0, -10.0..10.0, 0.15).forEach { (x, y) ->
                 val xProj = (b * (b * x - a * y) - a * c) / (a * a + b * b)
                 val yProj = (a * (-b * x + a * y) - b * c) / (a * a + b * b)
-                assertVectorEquals(Vector2D(xProj, yProj), projectToLine(Vector2D(x, y), line))
+                assertVectorEquals(vector(xProj, yProj), projectToLine(vector(x, y), line))
             }
         }
     }
 
     @Test
-    fun projectionOntoLine3d() {
+    fun projectionOntoLine3d() = with(Euclidean3DSpace) {
         val line = Line3D(
-            base = Vector3D(1.0, 3.5, 0.07),
-            direction = Vector3D(2.0, -0.0037, 11.1111)
+            base = vector(1.0, 3.5, 0.07),
+            direction = vector(2.0, -0.0037, 11.1111)
         )
 
-        with(Euclidean3DSpace) {
-            val testDomain = (-10.0..10.0).generateList(0.43)
-            for (x in testDomain) {
-                for (y in testDomain) {
-                    for (z in testDomain) {
-                        val v = Vector3D(x, y, z)
-                        val result = projectToLine(v, line)
 
-                        // assert that result is on line
-                        assertTrue(isCollinear(result - line.base, line.direction))
-                        // assert that PV vector is orthogonal to direction vector
-                        assertTrue(isOrthogonal(v - result, line.direction))
-                    }
+        val testDomain = (-10.0..10.0).generateList(0.43)
+        for (x in testDomain) {
+            for (y in testDomain) {
+                for (z in testDomain) {
+                    val v = vector(x, y, z)
+                    val result = projectToLine(v, line)
+
+                    // assert that result is on the line
+                    assertTrue(isCollinear(result - line.base, line.direction))
+                    // assert that PV vector is orthogonal to direction vector
+                    assertTrue(isOrthogonal(v - result, line.direction))
                 }
             }
         }
+
     }
 }
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
index 033055c19..8febe6722 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/RotationTest.kt
@@ -15,7 +15,7 @@ class RotationTest {
 
     @Test
     fun differentRotations() = with(Euclidean3DSpace) {
-        val vector = Vector3D(1.0, 1.0, 1.0)
+        val vector = vector(1.0, 1.0, 1.0)
         val q = Quaternion(1.0, 2.0, -3.0, 4.0).normalized()
         val rotatedByQ = rotate(vector, q)
         val matrix = q.toRotationMatrix()
@@ -36,7 +36,7 @@ class RotationTest {
 
     @Test
     fun fromRotation() {
-        val q = Quaternion.fromRotation(0.3.radians, Vector3D(1.0, 1.0, 1.0))
+        val q = Quaternion.fromRotation(0.3.radians, Euclidean3DSpace.vector(1.0, 1.0, 1.0))
 
         assertBufferEquals(DoubleBuffer(0.9887711, 0.0862781, 0.0862781, 0.0862781), q)
     }
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
index 5e45b4870..c98bfa45a 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
@@ -10,7 +10,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 internal class Vector2DTest {
-    private val vector = Vector2D(1.0, -7.999)
+    private val vector = Euclidean2DSpace.vector(1.0, -7.999)
 
     @Test
     fun size() {
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
index 55bab4775..fabcaa9aa 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
@@ -10,7 +10,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 internal class Vector3DTest {
-    private val vector = Vector3D(1.0, -7.999, 0.001)
+    private val vector = Euclidean3DSpace.vector(1.0, -7.999, 0.001)
 
     @Test
     fun size() {
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
index 0f957529d..f8b64bc64 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
@@ -25,12 +25,12 @@ fun grid(
     return xs.flatMap { x -> ys.map { y -> x to y } }
 }
 
-fun assertVectorEquals(expected: Vector2D, actual: Vector2D, absoluteTolerance: Double = 1e-6) {
+fun assertVectorEquals(expected: DoubleVector2D, actual: DoubleVector2D, absoluteTolerance: Double = 1e-6) {
     assertEquals(expected.x, actual.x, absoluteTolerance)
     assertEquals(expected.y, actual.y, absoluteTolerance)
 }
 
-fun assertVectorEquals(expected: Vector3D, actual: Vector3D, absoluteTolerance: Double = 1e-6) {
+fun assertVectorEquals(expected: DoubleVector3D, actual: DoubleVector3D, absoluteTolerance: Double = 1e-6) {
     assertEquals(expected.x, actual.x, absoluteTolerance)
     assertEquals(expected.y, actual.y, absoluteTolerance)
     assertEquals(expected.z, actual.z, absoluteTolerance)
diff --git a/kmath-geometry/src/jvmMain/kotlin/space/kscience/kmath/geometry/lineExtensions.kt b/kmath-geometry/src/jvmMain/kotlin/space/kscience/kmath/geometry/lineExtensions.kt
new file mode 100644
index 000000000..5fcd2b23e
--- /dev/null
+++ b/kmath-geometry/src/jvmMain/kotlin/space/kscience/kmath/geometry/lineExtensions.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+import space.kscience.kmath.geometry.GeometrySpace
+import space.kscience.kmath.geometry.Line
+import space.kscience.kmath.geometry.LineSegment
+import space.kscience.kmath.geometry.Vector
+import space.kscience.kmath.operations.Group
+
+/**
+ * Get a line, containing this [LineSegment]
+ */
+context(Group<V>) public val <V : Vector> LineSegment<V>.line: Line<V> get() = Line(begin, end - begin)
+
+/**
+ * Get a length of a line segment
+ */
+context(GeometrySpace<V>) public val <V : Vector> LineSegment<V>.length: Double get() = norm(end - begin)
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
index 134342b33..a7a98288c 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Circle2D
+import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.geometry.Vector2D
 import kotlin.math.PI
 import kotlin.math.acos
 import kotlin.math.cos
@@ -17,10 +17,10 @@ internal fun Pose2D.getLeftCircle(radius: Double): Circle2D = getTangentCircles(
 
 internal fun Pose2D.getRightCircle(radius: Double): Circle2D = getTangentCircles(radius).second
 
-internal fun Pose2D.getTangentCircles(radius: Double): Pair<Circle2D, Circle2D> {
+internal fun Pose2D.getTangentCircles(radius: Double): Pair<Circle2D, Circle2D> = with(Euclidean2DSpace) {
     val dX = radius * cos(theta)
     val dY = radius * sin(theta)
-    return Circle2D(Vector2D(x - dX, y + dY), radius) to Circle2D(Vector2D(x + dX, y - dY), radius)
+    return Circle2D(vector(x - dX, y + dY), radius) to Circle2D(vector(x + dX, y - dY), radius)
 }
 
 internal fun leftOuterTangent(a: Circle2D, b: Circle2D): StraightSegment = outerTangent(a, b, ArcSegment.Direction.LEFT)
@@ -29,21 +29,21 @@ internal fun rightOuterTangent(a: Circle2D, b: Circle2D): StraightSegment = oute
     ArcSegment.Direction.RIGHT
 )
 
-private fun outerTangent(a: Circle2D, b: Circle2D, side: ArcSegment.Direction): StraightSegment {
+private fun outerTangent(a: Circle2D, b: Circle2D, side: ArcSegment.Direction): StraightSegment = with(Euclidean2DSpace){
     val centers = StraightSegment(a.center, b.center)
     val p1 = when (side) {
-        ArcSegment.Direction.LEFT -> Vector2D(
+        ArcSegment.Direction.LEFT -> vector(
             a.center.x - a.radius * cos(centers.theta),
             a.center.y + a.radius * sin(centers.theta)
         )
-        ArcSegment.Direction.RIGHT -> Vector2D(
+        ArcSegment.Direction.RIGHT -> vector(
             a.center.x + a.radius * cos(centers.theta),
             a.center.y - a.radius * sin(centers.theta)
         )
     }
     return StraightSegment(
         p1,
-        Vector2D(p1.x + (centers.end.x - centers.start.x), p1.y + (centers.end.y - centers.start.y))
+        vector(p1.x + (centers.end.x - centers.start.x), p1.y + (centers.end.y - centers.start.y))
     )
 }
 
@@ -53,7 +53,7 @@ internal fun leftInnerTangent(base: Circle2D, direction: Circle2D): StraightSegm
 internal fun rightInnerTangent(base: Circle2D, direction: Circle2D): StraightSegment? =
     innerTangent(base, direction, ArcSegment.Direction.RIGHT)
 
-private fun innerTangent(base: Circle2D, direction: Circle2D, side: ArcSegment.Direction): StraightSegment? {
+private fun innerTangent(base: Circle2D, direction: Circle2D, side: ArcSegment.Direction): StraightSegment? = with(Euclidean2DSpace){
     val centers = StraightSegment(base.center, direction.center)
     if (centers.length < base.radius * 2) return null
     val angle = theta(
@@ -64,8 +64,8 @@ private fun innerTangent(base: Circle2D, direction: Circle2D, side: ArcSegment.D
     )
     val dX = base.radius * sin(angle)
     val dY = base.radius * cos(angle)
-    val p1 = Vector2D(base.center.x + dX, base.center.y + dY)
-    val p2 = Vector2D(direction.center.x - dX, direction.center.y - dY)
+    val p1 = vector(base.center.x + dX, base.center.y + dY)
+    val p2 = vector(direction.center.x - dX, direction.center.y - dY)
     return StraightSegment(p1, p2)
 }
 
@@ -106,7 +106,7 @@ public class DubinsPath(
         public fun shortest(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath =
             all(start, end, turningRadius).minBy { it.length }
 
-        public fun rlr(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? {
+        public fun rlr(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? = with(Euclidean2DSpace){
             val c1 = start.getRightCircle(turningRadius)
             val c2 = end.getRightCircle(turningRadius)
             val centers = StraightSegment(c1.center, c2.center)
@@ -115,20 +115,20 @@ public class DubinsPath(
             var theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
             var dX = turningRadius * sin(theta)
             var dY = turningRadius * cos(theta)
-            val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
+            val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
             val e = Circle2D(p, turningRadius)
-            val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
+            val p1 = vector(c1.center.x + dX, c1.center.y + dY)
             theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
             dX = turningRadius * sin(theta)
             dY = turningRadius * cos(theta)
-            val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
+            val p2 = vector(e.center.x + dX, e.center.y + dY)
             val a1 = ArcSegment.of(c1.center, start, p1, ArcSegment.Direction.RIGHT)
             val a2 = ArcSegment.of(e.center, p1, p2, ArcSegment.Direction.LEFT)
             val a3 = ArcSegment.of(c2.center, p2, end, ArcSegment.Direction.RIGHT)
             return DubinsPath(a1, a2, a3)
         }
 
-        public fun lrl(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? {
+        public fun lrl(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath?= with(Euclidean2DSpace) {
             val c1 = start.getLeftCircle(turningRadius)
             val c2 = end.getLeftCircle(turningRadius)
             val centers = StraightSegment(c1.center, c2.center)
@@ -137,13 +137,13 @@ public class DubinsPath(
             var theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
             var dX = turningRadius * sin(theta)
             var dY = turningRadius * cos(theta)
-            val p = Vector2D(c1.center.x + dX * 2, c1.center.y + dY * 2)
+            val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
             val e = Circle2D(p, turningRadius)
-            val p1 = Vector2D(c1.center.x + dX, c1.center.y + dY)
+            val p1 = vector(c1.center.x + dX, c1.center.y + dY)
             theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
             dX = turningRadius * sin(theta)
             dY = turningRadius * cos(theta)
-            val p2 = Vector2D(e.center.x + dX, e.center.y + dY)
+            val p2 = vector(e.center.x + dX, e.center.y + dY)
             val a1 = ArcSegment.of(c1.center, start, p1, ArcSegment.Direction.LEFT)
             val a2 = ArcSegment.of(e.center, p1, p2, ArcSegment.Direction.RIGHT)
             val a3 = ArcSegment.of(c2.center, p2, end, ArcSegment.Direction.LEFT)
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt
index 1f7c4a52e..a7570156c 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt
@@ -5,29 +5,29 @@
 
 package space.kscience.kmath.trajectory
 
+import space.kscience.kmath.geometry.DoubleVector2D
 import space.kscience.kmath.geometry.Vector
-import space.kscience.kmath.geometry.Vector2D
 import kotlin.math.atan2
 
 /**
  * Combination of [Vector] and its view angle
  */
-public interface Pose2D: Vector2D{
-    public val coordinate: Vector2D
+public interface Pose2D: DoubleVector2D{
+    public val coordinate: DoubleVector2D
     public val theta: Double
 }
 
 public class PhaseVector2D(
-    override val coordinate: Vector2D,
-    public val velocity: Vector2D
-): Pose2D, Vector2D by coordinate{
+    override val coordinate: DoubleVector2D,
+    public val velocity: DoubleVector2D
+): Pose2D, DoubleVector2D by coordinate{
     override val theta: Double get() = atan2(velocity.y, velocity.x)
 }
 
 internal class Pose2DImpl(
-    override val coordinate: Vector2D,
+    override val coordinate: DoubleVector2D,
     override val theta: Double
-) : Pose2D, Vector2D by coordinate
+) : Pose2D, DoubleVector2D by coordinate
 
 
-public fun Pose2D(coordinate: Vector2D, theta: Double): Pose2D = Pose2DImpl(coordinate, theta)
\ No newline at end of file
+public fun Pose2D(coordinate: DoubleVector2D, theta: Double): Pose2D = Pose2DImpl(coordinate, theta)
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
index 2e97d43b0..554607cbd 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Circle2D
+import space.kscience.kmath.geometry.DoubleVector2D
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.geometry.Vector2D
 import space.kscience.kmath.geometry.circumference
 import kotlin.math.PI
 import kotlin.math.atan2
@@ -20,8 +20,8 @@ public sealed interface Trajectory {
  * Straight path segment. The order of start and end defines the direction
  */
 public data class StraightSegment(
-    internal val start: Vector2D,
-    internal val end: Vector2D,
+    internal val start: DoubleVector2D,
+    internal val end: DoubleVector2D,
 ) : Trajectory {
     override val length: Double get() = start.distanceTo(end)
 
@@ -68,9 +68,9 @@ public data class ArcSegment(
     }
 
     public companion object {
-        public fun of(center: Vector2D, start: Vector2D, end: Vector2D, direction: Direction): ArcSegment {
+        public fun of(center: DoubleVector2D, start: DoubleVector2D, end: DoubleVector2D, direction: Direction): ArcSegment {
             fun calculatePose(
-                vector: Vector2D,
+                vector: DoubleVector2D,
                 theta: Double,
                 direction: Direction,
             ): Pose2D = Pose2D(
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
index 7ee68bd92..5a9cc5be8 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.trajectory
 
-import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.geometry.Euclidean2DSpace
 import kotlin.math.PI
 import kotlin.math.abs
 import kotlin.math.sin
@@ -13,12 +13,12 @@ fun Double.equalFloat(other: Double) = abs(this - other) < maxFloatDelta
 fun Pose2D.equalsFloat(other: Pose2D) = x.equalFloat(other.x) && y.equalFloat(other.y) && theta.equalFloat(other.theta)
 
 fun StraightSegment.inverse() = StraightSegment(end, start)
-fun StraightSegment.shift(shift: Int, width: Double): StraightSegment {
+fun StraightSegment.shift(shift: Int, width: Double): StraightSegment = with(Euclidean2DSpace){
     val dX = width * sin(inverse().theta)
     val dY = width * sin(theta)
 
     return StraightSegment(
-        Vector2D(start.x - dX * shift, start.y - dY * shift),
-        Vector2D(end.x - dX * shift, end.y - dY * shift)
+        vector(start.x - dX * shift, start.y - dY * shift),
+        vector(end.x - dX * shift, end.y - dY * shift)
     )
 }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
index 09375a400..68a5f8454 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -5,8 +5,7 @@
 
 package space.kscience.kmath.trajectory.dubins
 
-import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.trajectory.*
 import kotlin.test.Test
 import kotlin.test.assertNotNull
@@ -16,8 +15,8 @@ import kotlin.test.assertTrue
 class DubinsTests {
 
     @Test
-    fun dubinsTest() {
-        val straight = StraightSegment(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
+    fun dubinsTest() = with(Euclidean2DSpace){
+        val straight = StraightSegment(vector(0.0, 0.0), vector(100.0, 100.0))
         val lineP1 = straight.shift(1, 10.0).inverse()
 
         val start = Pose2D(straight.end, straight.theta)
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
index c66fa201b..88423ee99 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
@@ -1,7 +1,7 @@
 package space.kscience.kmath.trajectory.segments
 
 import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.circumference
 import space.kscience.kmath.trajectory.ArcSegment
 import space.kscience.kmath.trajectory.radiansToDegrees
@@ -11,9 +11,9 @@ import kotlin.test.assertEquals
 class ArcTests {
 
     @Test
-    fun arcTest() {
-        val circle = Circle2D(Vector2D(0.0, 0.0), 2.0)
-        val arc = ArcSegment.of(circle.center, Vector2D(-2.0, 0.0), Vector2D(0.0, 2.0), ArcSegment.Direction.RIGHT)
+    fun arcTest() = with(Euclidean2DSpace){
+        val circle = Circle2D(vector(0.0, 0.0), 2.0)
+        val arc = ArcSegment.of(circle.center, vector(-2.0, 0.0), vector(0.0, 2.0), ArcSegment.Direction.RIGHT)
         assertEquals(circle.circumference / 4, arc.length, 1.0)
         assertEquals(0.0, arc.start.theta.radiansToDegrees())
         assertEquals(90.0, arc.end.theta.radiansToDegrees())
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
index 5170c1db5..f1f9c6a3b 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.trajectory.segments
 
 import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.Vector2D
+import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.circumference
 import space.kscience.kmath.trajectory.maxFloatDelta
 import kotlin.test.Test
@@ -16,7 +16,7 @@ class CircleTests {
 
     @Test
     fun arcTest() {
-        val center = Vector2D(0.0, 0.0)
+        val center = Euclidean2DSpace.vector(0.0, 0.0)
         val radius = 2.0
         val expectedCircumference = 12.56637
         val circle = Circle2D(center, radius)
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
index 11eaa0fb3..b8fe256c7 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
@@ -1,7 +1,6 @@
 package space.kscience.kmath.trajectory.segments
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.geometry.Vector2D
 import space.kscience.kmath.trajectory.StraightSegment
 import space.kscience.kmath.trajectory.radiansToDegrees
 import kotlin.math.pow
@@ -12,22 +11,22 @@ import kotlin.test.assertEquals
 class LineTests {
 
     @Test
-    fun lineTest() {
-        val straight = StraightSegment(Vector2D(0.0, 0.0), Vector2D(100.0, 100.0))
+    fun lineTest() = with(Euclidean2DSpace){
+        val straight = StraightSegment(vector(0.0, 0.0), vector(100.0, 100.0))
         assertEquals(sqrt(100.0.pow(2) + 100.0.pow(2)), straight.length)
         assertEquals(45.0, straight.theta.radiansToDegrees())
     }
 
     @Test
-    fun lineAngleTest() {
+    fun lineAngleTest() = with(Euclidean2DSpace){
         //val zero = Vector2D(0.0, 0.0)
-        val north = StraightSegment(Euclidean2DSpace.zero, Vector2D(0.0, 2.0))
+        val north = StraightSegment(Euclidean2DSpace.zero, vector(0.0, 2.0))
         assertEquals(0.0, north.theta.radiansToDegrees())
-        val east = StraightSegment(Euclidean2DSpace.zero, Vector2D(2.0, 0.0))
+        val east = StraightSegment(Euclidean2DSpace.zero, vector(2.0, 0.0))
         assertEquals(90.0, east.theta.radiansToDegrees())
-        val south = StraightSegment(Euclidean2DSpace.zero, Vector2D(0.0, -2.0))
+        val south = StraightSegment(Euclidean2DSpace.zero, vector(0.0, -2.0))
         assertEquals(180.0, south.theta.radiansToDegrees())
-        val west = StraightSegment(Euclidean2DSpace.zero, Vector2D(-2.0, 0.0))
+        val west = StraightSegment(Euclidean2DSpace.zero, vector(-2.0, 0.0))
         assertEquals(270.0, west.theta.radiansToDegrees())
     }
 }
-- 
2.34.1


From ad9775132792b93e33c143cbfe38b347bc26abf3 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 4 Sep 2022 20:59:30 +0300
Subject: [PATCH 614/713] Refactor for build tools 0.13.0

---
 build.gradle.kts                              | 11 ++++++++--
 .../kmath/structures/StreamDoubleFieldND.kt   |  4 ++++
 .../kscience/kmath/tensors/OLSWithSVD.kt      |  2 ++
 .../kscience/kmath/tensors/neuralNetwork.kt   |  3 +++
 gradle.properties                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 kmath-ast/build.gradle.kts                    |  7 +++++--
 .../ast/rendering/multiplatformToString.kt    |  9 ++++++++
 .../kscience/kmath/ast/runCompilerTest.kt     | 10 +++++++++
 kmath-commons/build.gradle.kts                |  3 +--
 kmath-complex/build.gradle.kts                | 12 ++++++-----
 kmath-core/build.gradle.kts                   | 21 +++++++------------
 kmath-coroutines/build.gradle.kts             |  8 ++++---
 kmath-dimensions/build.gradle.kts             |  5 ++++-
 kmath-ejml/build.gradle.kts                   |  3 +--
 .../space/kscience/kmath/ejml/_generated.kt   |  4 ++--
 kmath-for-real/build.gradle.kts               |  8 ++++---
 kmath-functions/build.gradle.kts              |  8 ++++---
 kmath-geometry/build.gradle.kts               |  5 ++++-
 kmath-histograms/build.gradle.kts             |  5 ++++-
 kmath-kotlingrad/build.gradle.kts             |  3 +--
 kmath-memory/build.gradle.kts                 |  5 ++++-
 .../kscience/kmath/multik/MultikNDTest.kt     |  2 ++
 kmath-nd4j/build.gradle.kts                   |  3 +--
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   |  2 ++
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |  3 +++
 kmath-optimization/build.gradle.kts           |  5 ++++-
 kmath-polynomial/build.gradle.kts             |  6 ++++--
 kmath-stat/build.gradle.kts                   |  5 ++++-
 kmath-symja/build.gradle.kts                  |  3 +--
 .../tensorflow/DoubleTensorFlowAlgebra.kt     |  1 +
 .../kmath/tensorflow/DoubleTensorFlowOps.kt   |  2 ++
 kmath-tensors/build.gradle.kts                |  8 ++++---
 kmath-trajectory/build.gradle.kts             |  8 ++++---
 kmath-viktor/build.gradle.kts                 |  5 ++---
 .../kscience/kmath/viktor/ViktorBuffer.kt     |  2 +-
 test-utils/build.gradle.kts                   |  5 ++++-
 37 files changed, 136 insertions(+), 64 deletions(-)
 create mode 100644 kmath-ast/src/nativeMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
 create mode 100644 kmath-ast/src/nativeTest/kotlin/space/kscience/kmath/ast/runCompilerTest.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 04cb76285..4a083b437 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,6 @@
+import space.kscience.gradle.useApache2Licence
+import space.kscience.gradle.useSPCTeam
+
 plugins {
     id("space.kscience.gradle.project")
     id("org.jetbrains.kotlinx.kover") version "0.5.0"
@@ -68,8 +71,12 @@ subprojects {
 readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md")
 
 ksciencePublish {
-    github("kmath", addToRelease = false)
-    space()
+    pom("https://github.com/SciProgCentre/kmath") {
+        useApache2Licence()
+        useSPCTeam()
+    }
+    github("kmath", "SciProgCentre", addToRelease = false)
+    space("https://maven.pkg.jetbrains.space/mipt-npm/p/sci/dev")
     sonatype()
 }
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index aed0a7868..4aa420305 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.structures
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.ExtendedField
@@ -49,6 +50,7 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
         return BufferND(strides, array.asBuffer())
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.map(
         transform: DoubleField.(Double) -> Double,
     ): BufferND<Double> {
@@ -56,6 +58,7 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
         return BufferND(strides, array.asBuffer())
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.mapIndexed(
         transform: DoubleField.(index: IntArray, Double) -> Double,
     ): BufferND<Double> {
@@ -69,6 +72,7 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
         return BufferND(strides, array.asBuffer())
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun zip(
         left: StructureND<Double>,
         right: StructureND<Double>,
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index f7c5bb4b7..8082ed8e2 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
@@ -13,6 +14,7 @@ import kotlin.math.abs
 
 // OLS estimator using SVD
 
+@OptIn(PerformancePitfall::class)
 fun main() {
     //seed for random
     val randSeed = 100500L
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
index cbc83c336..502f6d53f 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
@@ -3,8 +3,11 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:OptIn(PerformancePitfall::class)
+
 package space.kscience.kmath.tensors
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.DoubleTensor
diff --git a/gradle.properties b/gradle.properties
index b3e3f4cda..0d1506980 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,4 +12,4 @@ org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.12.0-kotlin-1.7.20-Beta
+toolsVersion=0.13.0-kotlin-1.7.20-Beta
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fcea..8049c684f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index c1333eba5..7fd0f43f7 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -1,6 +1,9 @@
 plugins {
-    kotlin("multiplatform")
-    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.mpp")
+}
+
+kscience{
+    native()
 }
 
 kotlin.js {
diff --git a/kmath-ast/src/nativeMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt b/kmath-ast/src/nativeMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
new file mode 100644
index 000000000..ec66be830
--- /dev/null
+++ b/kmath-ast/src/nativeMain/kotlin/space/kscience/kmath/ast/rendering/multiplatformToString.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast.rendering
+
+internal actual fun Double.multiplatformToString(): String = toString()
+internal actual fun Float.multiplatformToString(): String = toString()
diff --git a/kmath-ast/src/nativeTest/kotlin/space/kscience/kmath/ast/runCompilerTest.kt b/kmath-ast/src/nativeTest/kotlin/space/kscience/kmath/ast/runCompilerTest.kt
new file mode 100644
index 000000000..0674b0492
--- /dev/null
+++ b/kmath-ast/src/nativeTest/kotlin/space/kscience/kmath/ast/runCompilerTest.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.ast
+
+internal actual inline fun runCompilerTest(action: CompilerTestContext.() -> Unit) {
+    //doNothing
+}
\ No newline at end of file
diff --git a/kmath-commons/build.gradle.kts b/kmath-commons/build.gradle.kts
index 643307b48..50fef7ac8 100644
--- a/kmath-commons/build.gradle.kts
+++ b/kmath-commons/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-    kotlin("jvm")
-    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.jvm")
 }
 
 description = "Commons math binding for kmath"
diff --git a/kmath-complex/build.gradle.kts b/kmath-complex/build.gradle.kts
index dbe96b153..b63def0a7 100644
--- a/kmath-complex/build.gradle.kts
+++ b/kmath-complex/build.gradle.kts
@@ -1,7 +1,9 @@
 plugins {
-    kotlin("multiplatform")
-    id("space.kscience.gradle.common")
-    id("space.kscience.gradle.native")
+    id("space.kscience.gradle.mpp")
+}
+
+kscience {
+    native()
 }
 
 kotlin.sourceSets {
@@ -20,14 +22,14 @@ readme {
     feature(
         id = "complex",
         ref = "src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt"
-    ){
+    ) {
         "Complex numbers operations"
     }
 
     feature(
         id = "quaternion",
         ref = "src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt"
-    ){
+    ) {
         "Quaternions and their composition"
     }
 }
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index d055b5350..f33d33324 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -1,6 +1,13 @@
 plugins {
     id("space.kscience.gradle.mpp")
-    id("space.kscience.gradle.native")
+}
+
+kscience{
+    native()
+
+    dependencies {
+        api(project(":kmath-memory"))
+    }
 }
 
 kotlin.sourceSets {
@@ -10,20 +17,8 @@ kotlin.sourceSets {
             it.optIn("space.kscience.kmath.misc.PerformancePitfall")
             it.optIn("space.kscience.kmath.misc.UnstableKMathAPI")
         }
-
-    commonMain {
-        dependencies {
-            api(project(":kmath-memory"))
-        }
-    }
 }
 
-//generateUml {
-//    classTree {
-//
-//    }
-//}
-
 readme {
     description = "Core classes, algebra definitions, basic linear algebra"
     maturity = space.kscience.gradle.Maturity.DEVELOPMENT
diff --git a/kmath-coroutines/build.gradle.kts b/kmath-coroutines/build.gradle.kts
index 104adf268..529084619 100644
--- a/kmath-coroutines/build.gradle.kts
+++ b/kmath-coroutines/build.gradle.kts
@@ -1,7 +1,9 @@
 plugins {
-    kotlin("multiplatform")
-    id("space.kscience.gradle.common")
-    id("space.kscience.gradle.native")
+    id("space.kscience.gradle.mpp")
+}
+
+kscience{
+    native()
 }
 
 kotlin.sourceSets {
diff --git a/kmath-dimensions/build.gradle.kts b/kmath-dimensions/build.gradle.kts
index 1c042ab70..29c0eccb6 100644
--- a/kmath-dimensions/build.gradle.kts
+++ b/kmath-dimensions/build.gradle.kts
@@ -1,6 +1,9 @@
 plugins {
     id("space.kscience.gradle.mpp")
-    id("space.kscience.gradle.native")
+}
+
+kscience{
+    native()
 }
 
 description = "A proof of concept module for adding type-safe dimensions to structures"
diff --git a/kmath-ejml/build.gradle.kts b/kmath-ejml/build.gradle.kts
index d400d6600..d7f780d79 100644
--- a/kmath-ejml/build.gradle.kts
+++ b/kmath-ejml/build.gradle.kts
@@ -1,8 +1,7 @@
 import space.kscience.kmath.ejml.codegen.ejmlCodegen
 
 plugins {
-    kotlin("jvm")
-    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.jvm")
 }
 
 dependencies {
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
index 5426055b3..aac327a84 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Copyright 2018-2021 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 /* This file is generated with buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt */
diff --git a/kmath-for-real/build.gradle.kts b/kmath-for-real/build.gradle.kts
index 6b6242c24..308b8d732 100644
--- a/kmath-for-real/build.gradle.kts
+++ b/kmath-for-real/build.gradle.kts
@@ -1,7 +1,9 @@
 plugins {
-    kotlin("multiplatform")
-    id("space.kscience.gradle.common")
-    id("space.kscience.gradle.native")
+    id("space.kscience.gradle.mpp")
+}
+
+kscience{
+    native()
 }
 
 kotlin.sourceSets.commonMain {
diff --git a/kmath-functions/build.gradle.kts b/kmath-functions/build.gradle.kts
index c68102c2e..2e7b023c1 100644
--- a/kmath-functions/build.gradle.kts
+++ b/kmath-functions/build.gradle.kts
@@ -1,7 +1,9 @@
 plugins {
-    kotlin("multiplatform")
-    id("space.kscience.gradle.common")
-    id("space.kscience.gradle.native")
+    id("space.kscience.gradle.mpp")
+}
+
+kscience{
+    native()
 }
 
 description = "Functions, integration and interpolation"
diff --git a/kmath-geometry/build.gradle.kts b/kmath-geometry/build.gradle.kts
index c2057bcbe..b868af8d0 100644
--- a/kmath-geometry/build.gradle.kts
+++ b/kmath-geometry/build.gradle.kts
@@ -1,6 +1,9 @@
 plugins {
     id("space.kscience.gradle.mpp")
-    id("space.kscience.gradle.native")
+}
+
+kscience{
+    native()
 }
 
 kotlin.sourceSets.commonMain {
diff --git a/kmath-histograms/build.gradle.kts b/kmath-histograms/build.gradle.kts
index 94d1f5fb7..d31526a74 100644
--- a/kmath-histograms/build.gradle.kts
+++ b/kmath-histograms/build.gradle.kts
@@ -1,6 +1,9 @@
 plugins {
     id("space.kscience.gradle.mpp")
-    id("space.kscience.gradle.native")
+}
+
+kscience{
+    native()
 }
 
 //apply(plugin = "kotlinx-atomicfu")
diff --git a/kmath-kotlingrad/build.gradle.kts b/kmath-kotlingrad/build.gradle.kts
index a7f4ee37f..cf4a4bc1d 100644
--- a/kmath-kotlingrad/build.gradle.kts
+++ b/kmath-kotlingrad/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-    kotlin("jvm")
-    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.jvm")
 }
 
 kotlin.sourceSets
diff --git a/kmath-memory/build.gradle.kts b/kmath-memory/build.gradle.kts
index 55a7ff6aa..50eb448a7 100644
--- a/kmath-memory/build.gradle.kts
+++ b/kmath-memory/build.gradle.kts
@@ -1,6 +1,9 @@
 plugins {
     id("space.kscience.gradle.mpp")
-    id("space.kscience.gradle.native")
+}
+
+kscience {
+    native()
 }
 
 readme {
diff --git a/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
index 8ad220221..392532d8e 100644
--- a/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
+++ b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.multik
 
 import org.jetbrains.kotlinx.multik.default.DefaultEngine
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.one
 import space.kscience.kmath.operations.DoubleField
@@ -14,6 +15,7 @@ import space.kscience.kmath.tensors.core.tensorAlgebra
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
+@OptIn(PerformancePitfall::class)
 internal class MultikNDTest {
     val multikAlgebra = MultikDoubleAlgebra(DefaultEngine())
 
diff --git a/kmath-nd4j/build.gradle.kts b/kmath-nd4j/build.gradle.kts
index 11af7d6dc..e5c4af891 100644
--- a/kmath-nd4j/build.gradle.kts
+++ b/kmath-nd4j/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-    kotlin("jvm")
-    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.jvm")
 }
 
 description = "ND4J NDStructure implementation and according NDAlgebra classes"
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index f359b9115..859773211 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -45,6 +45,7 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
         return newStruct
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<T>.mapIndexed(
         transform: C.(index: IntArray, T) -> T,
     ): Nd4jArrayStructure<T> {
@@ -53,6 +54,7 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
         return new
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun zip(
         left: StructureND<T>,
         right: StructureND<T>,
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index 5ecfe30d6..b6a2029e7 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -40,12 +40,15 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
 
     override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): Nd4jArrayStructure<T>
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<T>.map(transform: A.(T) -> T): Nd4jArrayStructure<T> =
         structureND(shape) { index -> elementAlgebra.transform(get(index)) }
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<T>.mapIndexed(transform: A.(index: IntArray, T) -> T): Nd4jArrayStructure<T> =
         structureND(shape) { index -> elementAlgebra.transform(index, get(index)) }
 
+    @OptIn(PerformancePitfall::class)
     override fun zip(left: StructureND<T>, right: StructureND<T>, transform: A.(T, T) -> T): Nd4jArrayStructure<T> {
         require(left.shape.contentEquals(right.shape))
         return structureND(left.shape) { index -> elementAlgebra.transform(left[index], right[index]) }
diff --git a/kmath-optimization/build.gradle.kts b/kmath-optimization/build.gradle.kts
index 53f379830..f4256b9aa 100644
--- a/kmath-optimization/build.gradle.kts
+++ b/kmath-optimization/build.gradle.kts
@@ -1,6 +1,9 @@
 plugins {
     id("space.kscience.gradle.mpp")
-    id("space.kscience.gradle.native")
+}
+
+kscience{
+    native()
 }
 
 kotlin.sourceSets {
diff --git a/kmath-polynomial/build.gradle.kts b/kmath-polynomial/build.gradle.kts
index c6946878c..4e469f0d1 100644
--- a/kmath-polynomial/build.gradle.kts
+++ b/kmath-polynomial/build.gradle.kts
@@ -1,7 +1,9 @@
 plugins {
     id("space.kscience.gradle.mpp")
-    // Disable native target to avoid CI crashes
-//    id("space.kscience.gradle.native")
+}
+
+kscience{
+    native()
 }
 
 description = "Polynomials, rational functions, and utilities"
diff --git a/kmath-stat/build.gradle.kts b/kmath-stat/build.gradle.kts
index 1d1831047..f6ca54e17 100644
--- a/kmath-stat/build.gradle.kts
+++ b/kmath-stat/build.gradle.kts
@@ -1,6 +1,9 @@
 plugins {
     id("space.kscience.gradle.mpp")
-    id("space.kscience.gradle.native")
+}
+
+kscience{
+    native()
 }
 
 kotlin.sourceSets {
diff --git a/kmath-symja/build.gradle.kts b/kmath-symja/build.gradle.kts
index 1984236ca..8741de2ae 100644
--- a/kmath-symja/build.gradle.kts
+++ b/kmath-symja/build.gradle.kts
@@ -4,8 +4,7 @@
  */
 
 plugins {
-    kotlin("jvm")
-    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.jvm")
 }
 
 description = "Symja integration module"
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
index fa7050d2a..c4d192792 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
@@ -93,6 +93,7 @@ public fun DoubleField.produceWithTF(
  *
  * The resulting tensors are available outside of scope
  */
+@OptIn(UnstableKMathAPI::class)
 public fun DoubleField.produceMapWithTF(
     block: DoubleTensorFlowAlgebra.() -> Map<Symbol, StructureND<Double>>,
 ): Map<Symbol, StructureND<Double>> = Graph().use { graph ->
diff --git a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
index 21340a8db..a35556be1 100644
--- a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
+++ b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.tensorflow
 
 import org.junit.jupiter.api.Test
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.get
 import space.kscience.kmath.nd.structureND
 import space.kscience.kmath.operations.DoubleField
@@ -13,6 +14,7 @@ import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra.Companion.sum
 import kotlin.test.assertEquals
 
+@OptIn(UnstableKMathAPI::class)
 class DoubleTensorFlowOps {
     @Test
     fun basicOps() {
diff --git a/kmath-tensors/build.gradle.kts b/kmath-tensors/build.gradle.kts
index b2a4c36bd..3d92f07b6 100644
--- a/kmath-tensors/build.gradle.kts
+++ b/kmath-tensors/build.gradle.kts
@@ -1,7 +1,9 @@
 plugins {
-    kotlin("multiplatform")
-    id("space.kscience.gradle.common")
-    id("space.kscience.gradle.native")
+    id("space.kscience.gradle.mpp")
+}
+
+kscience{
+    native()
 }
 
 kotlin.sourceSets {
diff --git a/kmath-trajectory/build.gradle.kts b/kmath-trajectory/build.gradle.kts
index f4dba25ab..5ee0a241d 100644
--- a/kmath-trajectory/build.gradle.kts
+++ b/kmath-trajectory/build.gradle.kts
@@ -1,7 +1,9 @@
 plugins {
-    kotlin("multiplatform")
-    id("space.kscience.gradle.common")
-    id("space.kscience.gradle.native")
+    id("space.kscience.gradle.mpp")
+}
+
+kscience{
+    native()
 }
 
 kotlin.sourceSets.commonMain {
diff --git a/kmath-viktor/build.gradle.kts b/kmath-viktor/build.gradle.kts
index 1b22e9c38..7a135f316 100644
--- a/kmath-viktor/build.gradle.kts
+++ b/kmath-viktor/build.gradle.kts
@@ -1,13 +1,12 @@
 plugins {
-    kotlin("jvm")
-    id("space.kscience.gradle.common")
+    id("space.kscience.gradle.jvm")
 }
 
 description = "Binding for https://github.com/JetBrains-Research/viktor"
 
 dependencies {
     api(project(":kmath-core"))
-    api("org.jetbrains.bio:viktor:1.1.0")
+    api("org.jetbrains.bio:viktor:1.2.0")
 }
 
 readme {
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
index 90d5ad9a9..52dc1e192 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorBuffer.kt
@@ -13,7 +13,7 @@ import space.kscience.kmath.structures.MutableBuffer
 @JvmInline
 public value class ViktorBuffer(public val flatArray: F64FlatArray) : MutableBuffer<Double> {
     override val size: Int
-        get() = flatArray.size
+        get() = flatArray.length
 
     override inline fun get(index: Int): Double = flatArray[index]
 
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index 49c4758e3..98bd7328d 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -1,6 +1,9 @@
 plugins {
     id("space.kscience.gradle.mpp")
-    id("space.kscience.gradle.native")
+}
+
+kscience{
+    native()
 }
 
 kotlin.sourceSets {
-- 
2.34.1


From 5042fda751940c04d944046d645a58c685776a75 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 5 Sep 2022 16:30:39 +0300
Subject: [PATCH 615/713] Int Tensor Algebra implementation

---
 build.gradle.kts                              |   2 +-
 buildSrc/build.gradle.kts                     |   3 +-
 .../space/kscience/kmath/nd/BufferND.kt       |   2 +-
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |   2 +-
 .../space/kscience/kmath/nd/IntRingND.kt      |  50 ++
 .../space/kscience/kmath/nd/ShortRingND.kt    |   5 +-
 .../space/kscience/kmath/nd/StructureND.kt    |  17 +-
 .../kmath/operations/BufferAlgebra.kt         |   3 +
 kmath-geometry/build.gradle.kts               |  10 +-
 kmath-tensors/build.gradle.kts                |   4 +
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |   6 +-
 .../kscience/kmath/tensors/core/IntTensor.kt  |  10 +-
 .../kmath/tensors/core/IntTensorAlgebra.kt    | 493 ++++++++++++++++++
 .../kmath/tensors/core/internal/checks.kt     |   9 +-
 .../tensors/core/internal/tensorCastsUtils.kt |   4 +-
 .../tensors/core/tensorAlgebraExtensions.kt   |   5 +-
 kmath-trajectory/build.gradle.kts             |   4 +-
 17 files changed, 593 insertions(+), 36 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 4a083b437..890824d65 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.1-dev-2"
+    version = "0.3.1-dev-3"
 }
 
 subprojects {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 9bf5d03d0..0f95a7b3f 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    kotlin("jvm") version "1.7.20-Beta"
     `kotlin-dsl`
     `version-catalog`
-    alias(npmlibs.plugins.kotlin.plugin.serialization)
+    kotlin("plugin.serialization") version "1.6.21"
 }
 
 java.targetCompatibility = JavaVersion.VERSION_11
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 5484ce545..1eb08fa8c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -56,7 +56,7 @@ public inline fun <T, reified R : Any> StructureND<T>.mapToBuffer(
  * @param strides The strides to access elements of [MutableBuffer] by linear indices.
  * @param buffer The underlying buffer.
  */
-public class MutableBufferND<T>(
+public open class MutableBufferND<T>(
     strides: ShapeIndexer,
     override val buffer: MutableBuffer<T>,
 ) : MutableStructureND<T>, BufferND<T>(strides, buffer) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 7f8d3c55d..4e8876731 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -16,7 +16,7 @@ import kotlin.math.pow as kpow
 public class DoubleBufferND(
     indexes: ShapeIndexer,
     override val buffer: DoubleBuffer,
-) : BufferND<Double>(indexes, buffer)
+) : MutableBufferND<Double>(indexes, buffer)
 
 
 public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(DoubleField.bufferAlgebra),
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt
new file mode 100644
index 000000000..ac01239a9
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.nd
+
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.operations.IntRing
+import space.kscience.kmath.operations.NumbersAddOps
+import space.kscience.kmath.operations.bufferAlgebra
+import space.kscience.kmath.structures.IntBuffer
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+
+public class IntBufferND(
+    indexes: ShapeIndexer,
+    override val buffer: IntBuffer,
+) : MutableBufferND<Int>(indexes, buffer)
+
+public sealed class IntRingOpsND : BufferedRingOpsND<Int, IntRing>(IntRing.bufferAlgebra) {
+
+    override fun structureND(shape: Shape, initializer: IntRing.(IntArray) -> Int): IntBufferND {
+        val indexer = indexerBuilder(shape)
+        return IntBufferND(
+            indexer,
+            IntBuffer(indexer.linearSize) { offset ->
+                elementAlgebra.initializer(indexer.index(offset))
+            }
+        )
+    }
+
+    public companion object : IntRingOpsND()
+}
+
+@OptIn(UnstableKMathAPI::class)
+public class IntRingND(
+    override val shape: Shape
+) : IntRingOpsND(), RingND<Int, IntRing>, NumbersAddOps<StructureND<Int>> {
+
+    override fun number(value: Number): BufferND<Int> {
+        val int = value.toInt() // minimize conversions
+        return structureND(shape) { int }
+    }
+}
+
+public inline fun <R> IntRing.withNdAlgebra(vararg shape: Int, action: IntRingND.() -> R): R {
+    contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
+    return IntRingND(shape).run(action)
+}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
index ea37da7a3..249b6801d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
@@ -22,8 +22,9 @@ public class ShortRingND(
 ) : ShortRingOpsND(), RingND<Short, ShortRing>, NumbersAddOps<StructureND<Short>> {
 
     override fun number(value: Number): BufferND<Short> {
-        val d = value.toShort() // minimize conversions
-        return structureND(shape) { d }
+        val short
+        = value.toShort() // minimize conversions
+        return structureND(shape) { short }
     }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 0fed49f40..aece10c2e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -82,7 +82,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
         public fun contentEquals(
             st1: StructureND<Double>,
             st2: StructureND<Double>,
-            tolerance: Double = 1e-11
+            tolerance: Double = 1e-11,
         ): Boolean {
             if (st1 === st2) return true
 
@@ -101,11 +101,17 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
             val bufferRepr: String = when (structure.shape.size) {
                 1 -> (0 until structure.shape[0]).map { structure[it] }
                     .joinToString(prefix = "[", postfix = "]", separator = ", ")
-                2 -> (0 until structure.shape[0]).joinToString(prefix = "[\n", postfix = "\n]", separator = ",\n") { i ->
+
+                2 -> (0 until structure.shape[0]).joinToString(
+                    prefix = "[\n",
+                    postfix = "\n]",
+                    separator = ",\n"
+                ) { i ->
                     (0 until structure.shape[1]).joinToString(prefix = "  [", postfix = "]", separator = ", ") { j ->
                         structure[i, j].toString()
                     }
                 }
+
                 else -> "..."
             }
             val className = structure::class.simpleName ?: "StructureND"
@@ -226,6 +232,13 @@ public interface MutableStructureND<T> : StructureND<T> {
     public operator fun set(index: IntArray, value: T)
 }
 
+/**
+ * Set value at specified indices
+ */
+public operator fun <T> MutableStructureND<T>.set(vararg index: Int, value: T) {
+    set(index, value)
+}
+
 /**
  * Transform a structure element-by element in place.
  */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
index 3af77856c..af0bc4d9b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BufferAlgebra.kt
@@ -142,6 +142,9 @@ public open class BufferRingOps<T, A : Ring<T>>(
         super<BufferAlgebra>.binaryOperationFunction(operation)
 }
 
+public val IntRing.bufferAlgebra: BufferRingOps<Int, IntRing>
+    get() = BufferRingOps(IntRing)
+
 public val ShortRing.bufferAlgebra: BufferRingOps<Short, ShortRing>
     get() = BufferRingOps(ShortRing)
 
diff --git a/kmath-geometry/build.gradle.kts b/kmath-geometry/build.gradle.kts
index b868af8d0..52d76d5d2 100644
--- a/kmath-geometry/build.gradle.kts
+++ b/kmath-geometry/build.gradle.kts
@@ -4,18 +4,12 @@ plugins {
 
 kscience{
     native()
-}
-
-kotlin.sourceSets.commonMain {
-    dependencies {
+    withContextReceivers()
+    dependencies{
         api(projects.kmath.kmathComplex)
     }
 }
 
-kscience {
-    withContextReceivers()
-}
-
 readme {
     maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }
diff --git a/kmath-tensors/build.gradle.kts b/kmath-tensors/build.gradle.kts
index 3d92f07b6..78ea4ba42 100644
--- a/kmath-tensors/build.gradle.kts
+++ b/kmath-tensors/build.gradle.kts
@@ -4,6 +4,10 @@ plugins {
 
 kscience{
     native()
+    dependencies {
+        api(projects.kmathCore)
+        api(projects.kmathStat)
+    }
 }
 
 kotlin.sourceSets {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 53115d5e5..94ad3f43c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -31,8 +31,7 @@ public open class DoubleTensorAlgebra :
 
     public companion object : DoubleTensorAlgebra()
 
-    override val elementAlgebra: DoubleField
-        get() = DoubleField
+    override val elementAlgebra: DoubleField get() = DoubleField
 
 
     /**
@@ -622,7 +621,8 @@ public open class DoubleTensorAlgebra :
         }
         val resNumElements = resShape.reduce(Int::times)
         val init = foldFunction(DoubleArray(1) { 0.0 })
-        val resTensor = BufferedTensor(resShape,
+        val resTensor = BufferedTensor(
+            resShape,
             MutableBuffer.auto(resNumElements) { init }, 0
         )
         for (index in resTensor.indices) {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
index ccff9606e..a2b942bf0 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
@@ -11,11 +11,11 @@ import space.kscience.kmath.tensors.core.internal.array
 /**
  * Default [BufferedTensor] implementation for [Int] values
  */
-public class IntTensor internal constructor(
+public class IntTensor @PublishedApi internal constructor(
     shape: IntArray,
     buffer: IntArray,
-    offset: Int = 0
-) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset){
-    public fun asDouble() : DoubleTensor =
-        DoubleTensor(shape, mutableBuffer.array().map{ it.toDouble()}.toDoubleArray(), bufferStart)
+    offset: Int = 0,
+) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset) {
+    public fun asDouble(): DoubleTensor =
+        DoubleTensor(shape, mutableBuffer.array().map { it.toDouble() }.toDoubleArray(), bufferStart)
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
new file mode 100644
index 000000000..0c8ddcf87
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
@@ -0,0 +1,493 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+
+@file:OptIn(PerformancePitfall::class)
+
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.*
+import space.kscience.kmath.operations.IntRing
+import space.kscience.kmath.structures.MutableBuffer
+import space.kscience.kmath.tensors.api.*
+import space.kscience.kmath.tensors.core.internal.*
+import kotlin.math.*
+
+/**
+ * Implementation of basic operations over double tensors and basic algebra operations on them.
+ */
+public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
+
+    public companion object : IntTensorAlgebra()
+
+    override fun StructureND<Int>.dot(other: StructureND<Int>): Tensor<Int> {
+        TODO("Not yet implemented")
+    }
+
+    override val elementAlgebra: IntRing get() = IntRing
+
+
+    /**
+     * Applies the [transform] function to each element of the tensor and returns the resulting modified tensor.
+     *
+     * @param transform the function to be applied to each element of the tensor.
+     * @return the resulting tensor after applying the function.
+     */
+    @PerformancePitfall
+    @Suppress("OVERRIDE_BY_INLINE")
+    final override inline fun StructureND<Int>.map(transform: IntRing.(Int) -> Int): IntTensor {
+        val tensor = this.tensor
+        //TODO remove additional copy
+        val sourceArray = tensor.copyArray()
+        val array = IntArray(tensor.numElements) { IntRing.transform(sourceArray[it]) }
+        return IntTensor(
+            tensor.shape,
+            array,
+            tensor.bufferStart
+        )
+    }
+
+    @PerformancePitfall
+    @Suppress("OVERRIDE_BY_INLINE")
+    final override inline fun StructureND<Int>.mapIndexed(transform: IntRing.(index: IntArray, Int) -> Int): IntTensor {
+        val tensor = this.tensor
+        //TODO remove additional copy
+        val sourceArray = tensor.copyArray()
+        val array = IntArray(tensor.numElements) { IntRing.transform(tensor.indices.index(it), sourceArray[it]) }
+        return IntTensor(
+            tensor.shape,
+            array,
+            tensor.bufferStart
+        )
+    }
+
+    @PerformancePitfall
+    override fun zip(
+        left: StructureND<Int>,
+        right: StructureND<Int>,
+        transform: IntRing.(Int, Int) -> Int,
+    ): IntTensor {
+        require(left.shape.contentEquals(right.shape)) {
+            "The shapes in zip are not equal: left - ${left.shape}, right - ${right.shape}"
+        }
+        val leftTensor = left.tensor
+        val leftArray = leftTensor.copyArray()
+        val rightTensor = right.tensor
+        val rightArray = rightTensor.copyArray()
+        val array = IntArray(leftTensor.numElements) { IntRing.transform(leftArray[it], rightArray[it]) }
+        return IntTensor(
+            leftTensor.shape,
+            array
+        )
+    }
+
+    override fun StructureND<Int>.valueOrNull(): Int? = if (tensor.shape contentEquals intArrayOf(1))
+        tensor.mutableBuffer.array()[tensor.bufferStart] else null
+
+    override fun StructureND<Int>.value(): Int = valueOrNull()
+        ?: throw IllegalArgumentException("The tensor shape is $shape, but value method is allowed only for shape [1]")
+
+    /**
+     * Constructs a tensor with the specified shape and data.
+     *
+     * @param shape the desired shape for the tensor.
+     * @param buffer one-dimensional data array.
+     * @return tensor with the [shape] shape and [buffer] data.
+     */
+    public fun fromArray(shape: IntArray, buffer: IntArray): IntTensor {
+        checkEmptyShape(shape)
+        check(buffer.isNotEmpty()) { "Illegal empty buffer provided" }
+        check(buffer.size == shape.reduce(Int::times)) {
+            "Inconsistent shape ${shape.toList()} for buffer of size ${buffer.size} provided"
+        }
+        return IntTensor(shape, buffer, 0)
+    }
+
+    /**
+     * Constructs a tensor with the specified shape and initializer.
+     *
+     * @param shape the desired shape for the tensor.
+     * @param initializer mapping tensor indices to values.
+     * @return tensor with the [shape] shape and data generated by the [initializer].
+     */
+    override fun structureND(shape: IntArray, initializer: IntRing.(IntArray) -> Int): IntTensor = fromArray(
+        shape,
+        TensorLinearStructure(shape).asSequence().map { IntRing.initializer(it) }.toMutableList().toIntArray()
+    )
+
+    override operator fun Tensor<Int>.get(i: Int): IntTensor {
+        val lastShape = tensor.shape.drop(1).toIntArray()
+        val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
+        val newStart = newShape.reduce(Int::times) * i + tensor.bufferStart
+        return IntTensor(newShape, tensor.mutableBuffer.array(), newStart)
+    }
+
+    /**
+     * Creates a tensor of a given shape and fills all elements with a given value.
+     *
+     * @param value the value to fill the output tensor with.
+     * @param shape array of integers defining the shape of the output tensor.
+     * @return tensor with the [shape] shape and filled with [value].
+     */
+    public fun full(value: Int, shape: IntArray): IntTensor {
+        checkEmptyShape(shape)
+        val buffer = IntArray(shape.reduce(Int::times)) { value }
+        return IntTensor(shape, buffer)
+    }
+
+    /**
+     * Returns a tensor with the same shape as `input` filled with [value].
+     *
+     * @param value the value to fill the output tensor with.
+     * @return tensor with the `input` tensor shape and filled with [value].
+     */
+    public fun Tensor<Int>.fullLike(value: Int): IntTensor {
+        val shape = tensor.shape
+        val buffer = IntArray(tensor.numElements) { value }
+        return IntTensor(shape, buffer)
+    }
+
+    /**
+     * Returns a tensor filled with the scalar value `0`, with the shape defined by the variable argument [shape].
+     *
+     * @param shape array of integers defining the shape of the output tensor.
+     * @return tensor filled with the scalar value `0`, with the [shape] shape.
+     */
+    public fun zeros(shape: IntArray): IntTensor = full(0, shape)
+
+    /**
+     * Returns a tensor filled with the scalar value `0`, with the same shape as a given array.
+     *
+     * @return tensor filled with the scalar value `0`, with the same shape as `input` tensor.
+     */
+    public fun StructureND<Int>.zeroesLike(): IntTensor = tensor.fullLike(0)
+
+    /**
+     * Returns a tensor filled with the scalar value `1`, with the shape defined by the variable argument [shape].
+     *
+     * @param shape array of integers defining the shape of the output tensor.
+     * @return tensor filled with the scalar value `1`, with the [shape] shape.
+     */
+    public fun ones(shape: IntArray): IntTensor = full(1, shape)
+
+    /**
+     * Returns a tensor filled with the scalar value `1`, with the same shape as a given array.
+     *
+     * @return tensor filled with the scalar value `1`, with the same shape as `input` tensor.
+     */
+    public fun Tensor<Int>.onesLike(): IntTensor = tensor.fullLike(1)
+
+    /**
+     * Returns a 2D tensor with shape ([n], [n]), with ones on the diagonal and zeros elsewhere.
+     *
+     * @param n the number of rows and columns
+     * @return a 2-D tensor with ones on the diagonal and zeros elsewhere.
+     */
+    public fun eye(n: Int): IntTensor {
+        val shape = intArrayOf(n, n)
+        val buffer = IntArray(n * n) { 0 }
+        val res = IntTensor(shape, buffer)
+        for (i in 0 until n) {
+            res[intArrayOf(i, i)] = 1
+        }
+        return res
+    }
+
+    /**
+     * Return a copy of the tensor.
+     *
+     * @return a copy of the `input` tensor with a copied buffer.
+     */
+    public fun StructureND<Int>.copy(): IntTensor =
+        IntTensor(tensor.shape, tensor.mutableBuffer.array().copyOf(), tensor.bufferStart)
+
+    override fun Int.plus(arg: StructureND<Int>): IntTensor {
+        val resBuffer = IntArray(arg.tensor.numElements) { i ->
+            arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i] + this
+        }
+        return IntTensor(arg.shape, resBuffer)
+    }
+
+    override fun StructureND<Int>.plus(arg: Int): IntTensor = arg + tensor
+
+    override fun StructureND<Int>.plus(arg: StructureND<Int>): IntTensor {
+        checkShapesCompatible(tensor, arg.tensor)
+        val resBuffer = IntArray(tensor.numElements) { i ->
+            tensor.mutableBuffer.array()[i] + arg.tensor.mutableBuffer.array()[i]
+        }
+        return IntTensor(tensor.shape, resBuffer)
+    }
+
+    override fun Tensor<Int>.plusAssign(value: Int) {
+        for (i in 0 until tensor.numElements) {
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] += value
+        }
+    }
+
+    override fun Tensor<Int>.plusAssign(arg: StructureND<Int>) {
+        checkShapesCompatible(tensor, arg.tensor)
+        for (i in 0 until tensor.numElements) {
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
+                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+        }
+    }
+
+    override fun Int.minus(arg: StructureND<Int>): IntTensor {
+        val resBuffer = IntArray(arg.tensor.numElements) { i ->
+            this - arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i]
+        }
+        return IntTensor(arg.shape, resBuffer)
+    }
+
+    override fun StructureND<Int>.minus(arg: Int): IntTensor {
+        val resBuffer = IntArray(tensor.numElements) { i ->
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] - arg
+        }
+        return IntTensor(tensor.shape, resBuffer)
+    }
+
+    override fun StructureND<Int>.minus(arg: StructureND<Int>): IntTensor {
+        checkShapesCompatible(tensor, arg)
+        val resBuffer = IntArray(tensor.numElements) { i ->
+            tensor.mutableBuffer.array()[i] - arg.tensor.mutableBuffer.array()[i]
+        }
+        return IntTensor(tensor.shape, resBuffer)
+    }
+
+    override fun Tensor<Int>.minusAssign(value: Int) {
+        for (i in 0 until tensor.numElements) {
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] -= value
+        }
+    }
+
+    override fun Tensor<Int>.minusAssign(arg: StructureND<Int>) {
+        checkShapesCompatible(tensor, arg)
+        for (i in 0 until tensor.numElements) {
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
+                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+        }
+    }
+
+    override fun Int.times(arg: StructureND<Int>): IntTensor {
+        val resBuffer = IntArray(arg.tensor.numElements) { i ->
+            arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i] * this
+        }
+        return IntTensor(arg.shape, resBuffer)
+    }
+
+    override fun StructureND<Int>.times(arg: Int): IntTensor = arg * tensor
+
+    override fun StructureND<Int>.times(arg: StructureND<Int>): IntTensor {
+        checkShapesCompatible(tensor, arg)
+        val resBuffer = IntArray(tensor.numElements) { i ->
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] *
+                    arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i]
+        }
+        return IntTensor(tensor.shape, resBuffer)
+    }
+
+    override fun Tensor<Int>.timesAssign(value: Int) {
+        for (i in 0 until tensor.numElements) {
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] *= value
+        }
+    }
+
+    override fun Tensor<Int>.timesAssign(arg: StructureND<Int>) {
+        checkShapesCompatible(tensor, arg)
+        for (i in 0 until tensor.numElements) {
+            tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
+                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+        }
+    }
+
+    override fun StructureND<Int>.unaryMinus(): IntTensor {
+        val resBuffer = IntArray(tensor.numElements) { i ->
+            tensor.mutableBuffer.array()[tensor.bufferStart + i].unaryMinus()
+        }
+        return IntTensor(tensor.shape, resBuffer)
+    }
+
+    override fun Tensor<Int>.transpose(i: Int, j: Int): IntTensor {
+        val ii = tensor.minusIndex(i)
+        val jj = tensor.minusIndex(j)
+        checkTranspose(tensor.dimension, ii, jj)
+        val n = tensor.numElements
+        val resBuffer = IntArray(n)
+
+        val resShape = tensor.shape.copyOf()
+        resShape[ii] = resShape[jj].also { resShape[jj] = resShape[ii] }
+
+        val resTensor = IntTensor(resShape, resBuffer)
+
+        for (offset in 0 until n) {
+            val oldMultiIndex = tensor.indices.index(offset)
+            val newMultiIndex = oldMultiIndex.copyOf()
+            newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
+
+            val linearIndex = resTensor.indices.offset(newMultiIndex)
+            resTensor.mutableBuffer.array()[linearIndex] =
+                tensor.mutableBuffer.array()[tensor.bufferStart + offset]
+        }
+        return resTensor
+    }
+
+    override fun Tensor<Int>.view(shape: IntArray): IntTensor {
+        checkView(tensor, shape)
+        return IntTensor(shape, tensor.mutableBuffer.array(), tensor.bufferStart)
+    }
+
+    override fun Tensor<Int>.viewAs(other: StructureND<Int>): IntTensor =
+        tensor.view(other.shape)
+
+    override fun diagonalEmbedding(
+        diagonalEntries: Tensor<Int>,
+        offset: Int,
+        dim1: Int,
+        dim2: Int,
+    ): IntTensor {
+        val n = diagonalEntries.shape.size
+        val d1 = minusIndexFrom(n + 1, dim1)
+        val d2 = minusIndexFrom(n + 1, dim2)
+
+        check(d1 != d2) {
+            "Diagonal dimensions cannot be identical $d1, $d2"
+        }
+        check(d1 <= n && d2 <= n) {
+            "Dimension out of range"
+        }
+
+        var lessDim = d1
+        var greaterDim = d2
+        var realOffset = offset
+        if (lessDim > greaterDim) {
+            realOffset *= -1
+            lessDim = greaterDim.also { greaterDim = lessDim }
+        }
+
+        val resShape = diagonalEntries.shape.slice(0 until lessDim).toIntArray() +
+                intArrayOf(diagonalEntries.shape[n - 1] + abs(realOffset)) +
+                diagonalEntries.shape.slice(lessDim until greaterDim - 1).toIntArray() +
+                intArrayOf(diagonalEntries.shape[n - 1] + abs(realOffset)) +
+                diagonalEntries.shape.slice(greaterDim - 1 until n - 1).toIntArray()
+        val resTensor = zeros(resShape)
+
+        for (i in 0 until diagonalEntries.tensor.numElements) {
+            val multiIndex = diagonalEntries.tensor.indices.index(i)
+
+            var offset1 = 0
+            var offset2 = abs(realOffset)
+            if (realOffset < 0) {
+                offset1 = offset2.also { offset2 = offset1 }
+            }
+            val diagonalMultiIndex = multiIndex.slice(0 until lessDim).toIntArray() +
+                    intArrayOf(multiIndex[n - 1] + offset1) +
+                    multiIndex.slice(lessDim until greaterDim - 1).toIntArray() +
+                    intArrayOf(multiIndex[n - 1] + offset2) +
+                    multiIndex.slice(greaterDim - 1 until n - 1).toIntArray()
+
+            resTensor[diagonalMultiIndex] = diagonalEntries[multiIndex]
+        }
+
+        return resTensor.tensor
+    }
+
+    private infix fun Tensor<Int>.eq(
+        other: Tensor<Int>,
+    ): Boolean {
+        checkShapesCompatible(tensor, other)
+        val n = tensor.numElements
+        if (n != other.tensor.numElements) {
+            return false
+        }
+        for (i in 0 until n) {
+            if (tensor.mutableBuffer[tensor.bufferStart + i] != other.tensor.mutableBuffer[other.tensor.bufferStart + i]) {
+                return false
+            }
+        }
+        return true
+    }
+
+    /**
+     * Concatenates a sequence of tensors with equal shapes along the first dimension.
+     *
+     * @param tensors the [List] of tensors with same shapes to concatenate
+     * @return tensor with concatenation result
+     */
+    public fun stack(tensors: List<Tensor<Int>>): IntTensor {
+        check(tensors.isNotEmpty()) { "List must have at least 1 element" }
+        val shape = tensors[0].shape
+        check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
+        val resShape = intArrayOf(tensors.size) + shape
+        val resBuffer = tensors.flatMap {
+            it.tensor.mutableBuffer.array().drop(it.tensor.bufferStart).take(it.tensor.numElements)
+        }.toIntArray()
+        return IntTensor(resShape, resBuffer, 0)
+    }
+
+    /**
+     * Builds tensor from rows of the input tensor.
+     *
+     * @param indices the [IntArray] of 1-dimensional indices
+     * @return tensor with rows corresponding to row by [indices]
+     */
+    public fun Tensor<Int>.rowsByIndices(indices: IntArray): IntTensor = stack(indices.map { this[it] })
+
+    private inline fun StructureND<Int>.fold(foldFunction: (IntArray) -> Int): Int =
+        foldFunction(tensor.copyArray())
+
+    private inline fun <reified R : Any> StructureND<Int>.foldDim(
+        dim: Int,
+        keepDim: Boolean,
+        foldFunction: (IntArray) -> R,
+    ): BufferedTensor<R> {
+        check(dim < dimension) { "Dimension $dim out of range $dimension" }
+        val resShape = if (keepDim) {
+            shape.take(dim).toIntArray() + intArrayOf(1) + shape.takeLast(dimension - dim - 1).toIntArray()
+        } else {
+            shape.take(dim).toIntArray() + shape.takeLast(dimension - dim - 1).toIntArray()
+        }
+        val resNumElements = resShape.reduce(Int::times)
+        val init = foldFunction(IntArray(1) { 0 })
+        val resTensor = BufferedTensor(
+            resShape,
+            MutableBuffer.auto(resNumElements) { init }, 0
+        )
+        for (index in resTensor.indices) {
+            val prefix = index.take(dim).toIntArray()
+            val suffix = index.takeLast(dimension - dim - 1).toIntArray()
+            resTensor[index] = foldFunction(IntArray(shape[dim]) { i ->
+                tensor[prefix + intArrayOf(i) + suffix]
+            })
+        }
+        return resTensor
+    }
+
+    override fun StructureND<Int>.sum(): Int = tensor.fold { it.sum() }
+
+    override fun StructureND<Int>.sum(dim: Int, keepDim: Boolean): IntTensor =
+        foldDim(dim, keepDim) { x -> x.sum() }.toIntTensor()
+
+    override fun StructureND<Int>.min(): Int = this.fold { it.minOrNull()!! }
+
+    override fun StructureND<Int>.min(dim: Int, keepDim: Boolean): IntTensor =
+        foldDim(dim, keepDim) { x -> x.minOrNull()!! }.toIntTensor()
+
+    override fun StructureND<Int>.max(): Int = this.fold { it.maxOrNull()!! }
+
+    override fun StructureND<Int>.max(dim: Int, keepDim: Boolean): IntTensor =
+        foldDim(dim, keepDim) { x -> x.maxOrNull()!! }.toIntTensor()
+
+
+    override fun StructureND<Int>.argMax(dim: Int, keepDim: Boolean): IntTensor =
+        foldDim(dim, keepDim) { x ->
+            x.withIndex().maxByOrNull { it.value }?.index!!
+        }.toIntTensor()
+}
+
+public val Int.Companion.tensorAlgebra: IntTensorAlgebra.Companion get() = IntTensorAlgebra
+public val IntRing.tensorAlgebra: IntTensorAlgebra.Companion get() = IntTensorAlgebra
+
+
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index 5db311db4..e997dfcca 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -16,10 +16,9 @@ internal fun checkEmptyShape(shape: IntArray) =
         "Illegal empty shape provided"
     }
 
-internal fun checkEmptyDoubleBuffer(buffer: DoubleArray) =
-    check(buffer.isNotEmpty()) {
-        "Illegal empty buffer provided"
-    }
+internal fun checkEmptyDoubleBuffer(buffer: DoubleArray) = check(buffer.isNotEmpty()) {
+    "Illegal empty buffer provided"
+}
 
 internal fun checkBufferShapeConsistency(shape: IntArray, buffer: DoubleArray) =
     check(buffer.size == shape.reduce(Int::times)) {
@@ -50,7 +49,7 @@ internal fun checkSquareMatrix(shape: IntArray) {
 }
 
 internal fun DoubleTensorAlgebra.checkSymmetric(
-    tensor: Tensor<Double>, epsilon: Double = 1e-6
+    tensor: Tensor<Double>, epsilon: Double = 1e-6,
 ) =
     check(tensor.eq(tensor.transpose(), epsilon)) {
         "Tensor is not symmetric about the last 2 dimensions at precision $epsilon"
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index dad4368c1..c19b8bf95 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -8,7 +8,6 @@ package space.kscience.kmath.tensors.core.internal
 import space.kscience.kmath.nd.MutableBufferND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.structures.asMutableBuffer
-import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.BufferedTensor
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.IntTensor
@@ -43,7 +42,8 @@ internal val StructureND<Double>.tensor: DoubleTensor
         else -> this.toBufferedTensor().asTensor()
     }
 
-internal val Tensor<Int>.tensor: IntTensor
+@PublishedApi
+internal val StructureND<Int>.tensor: IntTensor
     get() = when (this) {
         is IntTensor -> this
         else -> this.toBufferedTensor().asTensor()
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
index 5904e574e..619d5c753 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
@@ -13,7 +13,10 @@ import kotlin.jvm.JvmName
 
 @JvmName("varArgOne")
 public fun DoubleTensorAlgebra.one(vararg shape: Int): DoubleTensor = ones(intArrayOf(*shape))
+
 public fun DoubleTensorAlgebra.one(shape: Shape): DoubleTensor = ones(shape)
+
 @JvmName("varArgZero")
 public fun DoubleTensorAlgebra.zero(vararg shape: Int): DoubleTensor = zeros(intArrayOf(*shape))
-public fun DoubleTensorAlgebra.zero(shape: Shape): DoubleTensor = zeros(shape)
\ No newline at end of file
+
+public fun DoubleTensorAlgebra.zero(shape: Shape): DoubleTensor = zeros(shape)
diff --git a/kmath-trajectory/build.gradle.kts b/kmath-trajectory/build.gradle.kts
index 5ee0a241d..16a84b691 100644
--- a/kmath-trajectory/build.gradle.kts
+++ b/kmath-trajectory/build.gradle.kts
@@ -4,9 +4,7 @@ plugins {
 
 kscience{
     native()
-}
-
-kotlin.sourceSets.commonMain {
+    withContextReceivers()
     dependencies {
         api(projects.kmath.kmathGeometry)
     }
-- 
2.34.1


From a9821772dbb021f52390428cc510c182f9a1bd16 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 5 Sep 2022 22:08:35 +0300
Subject: [PATCH 616/713] Move power to ExtendedFieldOps

---
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |  12 +-
 .../kmath/operations/DoubleBufferOps.kt       |   6 +
 .../kscience/kmath/operations/numbers.kt      |  20 +-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |   1 +
 .../core/BroadcastDoubleTensorAlgebra.kt      |  41 ++-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 320 +++++++++---------
 .../kmath/tensors/core/IntTensorAlgebra.kt    | 172 +++++-----
 .../kmath/tensors/core/internal/checks.kt     |   4 +-
 .../tensors/core/internal/tensorCastsUtils.kt |  21 +-
 .../kmath/tensors/core/tensorCasts.kt         |  14 +-
 .../kmath/tensors/core/TestDoubleTensor.kt    |  10 +-
 11 files changed, 320 insertions(+), 301 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 4e8876731..aab137321 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -11,6 +11,7 @@ import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
+import kotlin.math.pow
 import kotlin.math.pow as kpow
 
 public class DoubleBufferND(
@@ -165,6 +166,15 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
     override fun atanh(arg: StructureND<Double>): DoubleBufferND =
         mapInline(arg.toBufferND()) { kotlin.math.atanh(it) }
 
+    override fun power(
+        arg: StructureND<Double>,
+        pow: Number,
+    ): StructureND<Double> = if (pow is Int) {
+        mapInline(arg.toBufferND()) { it.pow(pow) }
+    } else {
+        mapInline(arg.toBufferND()) { it.pow(pow.toDouble()) }
+    }
+
     public companion object : DoubleFieldOpsND()
 }
 
@@ -181,7 +191,7 @@ public class DoubleFieldND(override val shape: Shape) :
         it.kpow(pow)
     }
 
-    override fun power(arg: StructureND<Double>, pow: Number): DoubleBufferND = if(pow.isInteger()){
+    override fun power(arg: StructureND<Double>, pow: Number): DoubleBufferND = if (pow.isInteger()) {
         power(arg, pow.toInt())
     } else {
         val dpow = pow.toDouble()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index 811926c23..ded8753a3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -133,6 +133,12 @@ public abstract class DoubleBufferOps : BufferAlgebra<Double, DoubleField>, Exte
 
     override fun scale(a: Buffer<Double>, value: Double): DoubleBuffer = a.mapInline { it * value }
 
+    override fun power(arg: Buffer<Double>, pow: Number): Buffer<Double> = if (pow is Int) {
+        arg.mapInline { it.pow(pow) }
+    } else {
+        arg.mapInline { it.pow(pow.toDouble()) }
+    }
+
     public companion object : DoubleBufferOps() {
         public inline fun Buffer<Double>.mapInline(block: (Double) -> Double): DoubleBuffer =
             if (this is DoubleBuffer) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
index 16088a825..224ca1daf 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/numbers.kt
@@ -2,12 +2,13 @@
  * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
-
+@file:Suppress("NOTHING_TO_INLINE")
 package space.kscience.kmath.operations
 
 import space.kscience.kmath.structures.*
 import kotlin.math.pow as kpow
 
+
 /**
  * Advanced Number-like semifield that implements basic operations.
  */
@@ -15,7 +16,8 @@ public interface ExtendedFieldOps<T> :
     FieldOps<T>,
     TrigonometricOperations<T>,
     ExponentialOperations<T>,
-    ScaleOperations<T> {
+    ScaleOperations<T>,
+    PowerOperations<T> {
     override fun tan(arg: T): T = sin(arg) / cos(arg)
     override fun tanh(arg: T): T = sinh(arg) / cosh(arg)
 
@@ -41,7 +43,7 @@ public interface ExtendedFieldOps<T> :
 /**
  * Advanced Number-like field that implements basic operations.
  */
-public interface ExtendedField<T> : ExtendedFieldOps<T>, Field<T>, PowerOperations<T>, NumericAlgebra<T> {
+public interface ExtendedField<T> : ExtendedFieldOps<T>, Field<T>, NumericAlgebra<T> {
     override fun sinh(arg: T): T = (exp(arg) - exp(-arg)) / 2.0
     override fun cosh(arg: T): T = (exp(arg) + exp(-arg)) / 2.0
     override fun tanh(arg: T): T = (exp(arg) - exp(-arg)) / (exp(-arg) + exp(arg))
@@ -64,7 +66,7 @@ public interface ExtendedField<T> : ExtendedFieldOps<T>, Field<T>, PowerOperatio
 /**
  * A field for [Double] without boxing. Does not produce appropriate field element.
  */
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
 public object DoubleField : ExtendedField<Double>, Norm<Double, Double>, ScaleOperations<Double> {
     override val bufferFactory: MutableBufferFactory<Double> = MutableBufferFactory(::DoubleBuffer)
 
@@ -124,7 +126,7 @@ public val Double.Companion.algebra: DoubleField get() = DoubleField
 /**
  * A field for [Float] without boxing. Does not produce appropriate field element.
  */
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
 public object FloatField : ExtendedField<Float>, Norm<Float, Float> {
     override val bufferFactory: MutableBufferFactory<Float> = MutableBufferFactory(::FloatBuffer)
 
@@ -180,7 +182,7 @@ public val Float.Companion.algebra: FloatField get() = FloatField
 /**
  * A field for [Int] without boxing. Does not produce corresponding ring element.
  */
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
 public object IntRing : Ring<Int>, Norm<Int, Int>, NumericAlgebra<Int> {
     override val bufferFactory: MutableBufferFactory<Int> = MutableBufferFactory(::IntBuffer)
 
@@ -203,7 +205,7 @@ public val Int.Companion.algebra: IntRing get() = IntRing
 /**
  * A field for [Short] without boxing. Does not produce appropriate ring element.
  */
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
 public object ShortRing : Ring<Short>, Norm<Short, Short>, NumericAlgebra<Short> {
     override val bufferFactory: MutableBufferFactory<Short> = MutableBufferFactory(::ShortBuffer)
 
@@ -226,7 +228,7 @@ public val Short.Companion.algebra: ShortRing get() = ShortRing
 /**
  * A field for [Byte] without boxing. Does not produce appropriate ring element.
  */
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
 public object ByteRing : Ring<Byte>, Norm<Byte, Byte>, NumericAlgebra<Byte> {
     override val bufferFactory: MutableBufferFactory<Byte> = MutableBufferFactory(::ByteBuffer)
 
@@ -249,7 +251,7 @@ public val Byte.Companion.algebra: ByteRing get() = ByteRing
 /**
  * A field for [Double] without boxing. Does not produce appropriate ring element.
  */
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
 public object LongRing : Ring<Long>, Norm<Long, Long>, NumericAlgebra<Long> {
     override val bufferFactory: MutableBufferFactory<Long> = MutableBufferFactory(::LongBuffer)
 
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index b6a2029e7..18068eaec 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -138,6 +138,7 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
     override fun StructureND<T>.atan(): Nd4jArrayStructure<T> = Transforms.atan(ndArray).wrap()
     override fun StructureND<T>.tanh(): Nd4jArrayStructure<T> = Transforms.tanh(ndArray).wrap()
     override fun StructureND<T>.atanh(): Nd4jArrayStructure<T> = Transforms.atanh(ndArray).wrap()
+    override fun power(arg: StructureND<T>, pow: Number): StructureND<T> = Transforms.pow(arg.ndArray, pow).wrap()
     override fun StructureND<T>.ceil(): Nd4jArrayStructure<T> = Transforms.ceil(ndArray).wrap()
     override fun StructureND<T>.floor(): Nd4jArrayStructure<T> = Transforms.floor(ndArray).wrap()
     override fun StructureND<T>.std(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index fce7d30fd..31e5b6e69 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -11,7 +11,6 @@ import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.internal.array
 import space.kscience.kmath.tensors.core.internal.broadcastTensors
 import space.kscience.kmath.tensors.core.internal.broadcastTo
-import space.kscience.kmath.tensors.core.internal.tensor
 
 /**
  * Basic linear algebra operations implemented with broadcasting.
@@ -20,7 +19,7 @@ import space.kscience.kmath.tensors.core.internal.tensor
 public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
 
     override fun StructureND<Double>.plus(arg: StructureND<Double>): DoubleTensor {
-        val broadcast = broadcastTensors(tensor, arg.tensor)
+        val broadcast = broadcastTensors(asDoubleTensor(), arg.asDoubleTensor())
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
@@ -30,15 +29,15 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
     }
 
     override fun Tensor<Double>.plusAssign(arg: StructureND<Double>) {
-        val newOther = broadcastTo(arg.tensor, tensor.shape)
-        for (i in 0 until tensor.indices.linearSize) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
-                newOther.mutableBuffer.array()[tensor.bufferStart + i]
+        val newOther = broadcastTo(arg.asDoubleTensor(), asDoubleTensor().shape)
+        for (i in 0 until asDoubleTensor().indices.linearSize) {
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] +=
+                newOther.mutableBuffer.array()[asDoubleTensor().bufferStart + i]
         }
     }
 
     override fun StructureND<Double>.minus(arg: StructureND<Double>): DoubleTensor {
-        val broadcast = broadcastTensors(tensor, arg.tensor)
+        val broadcast = broadcastTensors(asDoubleTensor(), arg.asDoubleTensor())
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
@@ -48,15 +47,15 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
     }
 
     override fun Tensor<Double>.minusAssign(arg: StructureND<Double>) {
-        val newOther = broadcastTo(arg.tensor, tensor.shape)
-        for (i in 0 until tensor.indices.linearSize) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
-                newOther.mutableBuffer.array()[tensor.bufferStart + i]
+        val newOther = broadcastTo(arg.asDoubleTensor(), asDoubleTensor().shape)
+        for (i in 0 until asDoubleTensor().indices.linearSize) {
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] -=
+                newOther.mutableBuffer.array()[asDoubleTensor().bufferStart + i]
         }
     }
 
     override fun StructureND<Double>.times(arg: StructureND<Double>): DoubleTensor {
-        val broadcast = broadcastTensors(tensor, arg.tensor)
+        val broadcast = broadcastTensors(asDoubleTensor(), arg.asDoubleTensor())
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
@@ -67,15 +66,15 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
     }
 
     override fun Tensor<Double>.timesAssign(arg: StructureND<Double>) {
-        val newOther = broadcastTo(arg.tensor, tensor.shape)
-        for (i in 0 until tensor.indices.linearSize) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
-                newOther.mutableBuffer.array()[tensor.bufferStart + i]
+        val newOther = broadcastTo(arg.asDoubleTensor(), asDoubleTensor().shape)
+        for (i in 0 until asDoubleTensor().indices.linearSize) {
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] *=
+                newOther.mutableBuffer.array()[asDoubleTensor().bufferStart + i]
         }
     }
 
     override fun StructureND<Double>.div(arg: StructureND<Double>): DoubleTensor {
-        val broadcast = broadcastTensors(tensor, arg.tensor)
+        val broadcast = broadcastTensors(asDoubleTensor(), arg.asDoubleTensor())
         val newThis = broadcast[0]
         val newOther = broadcast[1]
         val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
@@ -86,10 +85,10 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
     }
 
     override fun Tensor<Double>.divAssign(arg: StructureND<Double>) {
-        val newOther = broadcastTo(arg.tensor, tensor.shape)
-        for (i in 0 until tensor.indices.linearSize) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] /=
-                newOther.mutableBuffer.array()[tensor.bufferStart + i]
+        val newOther = broadcastTo(arg.asDoubleTensor(), asDoubleTensor().shape)
+        for (i in 0 until asDoubleTensor().indices.linearSize) {
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] /=
+                newOther.mutableBuffer.array()[asDoubleTensor().bufferStart + i]
         }
     }
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 94ad3f43c..096c97324 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -43,7 +43,7 @@ public open class DoubleTensorAlgebra :
     @PerformancePitfall
     @Suppress("OVERRIDE_BY_INLINE")
     final override inline fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): DoubleTensor {
-        val tensor = this.tensor
+        val tensor = this.asDoubleTensor()
         //TODO remove additional copy
         val sourceArray = tensor.copyArray()
         val array = DoubleArray(tensor.numElements) { DoubleField.transform(sourceArray[it]) }
@@ -57,7 +57,7 @@ public open class DoubleTensorAlgebra :
     @PerformancePitfall
     @Suppress("OVERRIDE_BY_INLINE")
     final override inline fun StructureND<Double>.mapIndexed(transform: DoubleField.(index: IntArray, Double) -> Double): DoubleTensor {
-        val tensor = this.tensor
+        val tensor = this.asDoubleTensor()
         //TODO remove additional copy
         val sourceArray = tensor.copyArray()
         val array = DoubleArray(tensor.numElements) { DoubleField.transform(tensor.indices.index(it), sourceArray[it]) }
@@ -77,9 +77,9 @@ public open class DoubleTensorAlgebra :
         require(left.shape.contentEquals(right.shape)) {
             "The shapes in zip are not equal: left - ${left.shape}, right - ${right.shape}"
         }
-        val leftTensor = left.tensor
+        val leftTensor = left.asDoubleTensor()
         val leftArray = leftTensor.copyArray()
-        val rightTensor = right.tensor
+        val rightTensor = right.asDoubleTensor()
         val rightArray = rightTensor.copyArray()
         val array = DoubleArray(leftTensor.numElements) { DoubleField.transform(leftArray[it], rightArray[it]) }
         return DoubleTensor(
@@ -88,8 +88,8 @@ public open class DoubleTensorAlgebra :
         )
     }
 
-    override fun StructureND<Double>.valueOrNull(): Double? = if (tensor.shape contentEquals intArrayOf(1))
-        tensor.mutableBuffer.array()[tensor.bufferStart] else null
+    override fun StructureND<Double>.valueOrNull(): Double? = if (asDoubleTensor().shape contentEquals intArrayOf(1))
+        asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart] else null
 
     override fun StructureND<Double>.value(): Double = valueOrNull()
         ?: throw IllegalArgumentException("The tensor shape is $shape, but value method is allowed only for shape [1]")
@@ -121,10 +121,10 @@ public open class DoubleTensorAlgebra :
     )
 
     override operator fun Tensor<Double>.get(i: Int): DoubleTensor {
-        val lastShape = tensor.shape.drop(1).toIntArray()
+        val lastShape = asDoubleTensor().shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
-        val newStart = newShape.reduce(Int::times) * i + tensor.bufferStart
-        return DoubleTensor(newShape, tensor.mutableBuffer.array(), newStart)
+        val newStart = newShape.reduce(Int::times) * i + asDoubleTensor().bufferStart
+        return DoubleTensor(newShape, asDoubleTensor().mutableBuffer.array(), newStart)
     }
 
     /**
@@ -147,8 +147,8 @@ public open class DoubleTensorAlgebra :
      * @return tensor with the `input` tensor shape and filled with [value].
      */
     public fun Tensor<Double>.fullLike(value: Double): DoubleTensor {
-        val shape = tensor.shape
-        val buffer = DoubleArray(tensor.numElements) { value }
+        val shape = asDoubleTensor().shape
+        val buffer = DoubleArray(asDoubleTensor().numElements) { value }
         return DoubleTensor(shape, buffer)
     }
 
@@ -165,7 +165,7 @@ public open class DoubleTensorAlgebra :
      *
      * @return tensor filled with the scalar value `0.0`, with the same shape as `input` tensor.
      */
-    public fun StructureND<Double>.zeroesLike(): DoubleTensor = tensor.fullLike(0.0)
+    public fun StructureND<Double>.zeroesLike(): DoubleTensor = asDoubleTensor().fullLike(0.0)
 
     /**
      * Returns a tensor filled with the scalar value `1.0`, with the shape defined by the variable argument [shape].
@@ -180,7 +180,7 @@ public open class DoubleTensorAlgebra :
      *
      * @return tensor filled with the scalar value `1.0`, with the same shape as `input` tensor.
      */
-    public fun Tensor<Double>.onesLike(): DoubleTensor = tensor.fullLike(1.0)
+    public fun Tensor<Double>.onesLike(): DoubleTensor = asDoubleTensor().fullLike(1.0)
 
     /**
      * Returns a 2D tensor with shape ([n], [n]), with ones on the diagonal and zeros elsewhere.
@@ -204,182 +204,182 @@ public open class DoubleTensorAlgebra :
      * @return a copy of the `input` tensor with a copied buffer.
      */
     public fun StructureND<Double>.copy(): DoubleTensor =
-        DoubleTensor(tensor.shape, tensor.mutableBuffer.array().copyOf(), tensor.bufferStart)
+        DoubleTensor(asDoubleTensor().shape, asDoubleTensor().mutableBuffer.array().copyOf(), asDoubleTensor().bufferStart)
 
     override fun Double.plus(arg: StructureND<Double>): DoubleTensor {
-        val resBuffer = DoubleArray(arg.tensor.numElements) { i ->
-            arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i] + this
+        val resBuffer = DoubleArray(arg.asDoubleTensor().numElements) { i ->
+            arg.asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i] + this
         }
         return DoubleTensor(arg.shape, resBuffer)
     }
 
-    override fun StructureND<Double>.plus(arg: Double): DoubleTensor = arg + tensor
+    override fun StructureND<Double>.plus(arg: Double): DoubleTensor = arg + asDoubleTensor()
 
     override fun StructureND<Double>.plus(arg: StructureND<Double>): DoubleTensor {
-        checkShapesCompatible(tensor, arg.tensor)
-        val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[i] + arg.tensor.mutableBuffer.array()[i]
+        checkShapesCompatible(asDoubleTensor(), arg.asDoubleTensor())
+        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
+            asDoubleTensor().mutableBuffer.array()[i] + arg.asDoubleTensor().mutableBuffer.array()[i]
         }
-        return DoubleTensor(tensor.shape, resBuffer)
+        return DoubleTensor(asDoubleTensor().shape, resBuffer)
     }
 
     override fun Tensor<Double>.plusAssign(value: Double) {
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] += value
+        for (i in 0 until asDoubleTensor().numElements) {
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] += value
         }
     }
 
     override fun Tensor<Double>.plusAssign(arg: StructureND<Double>) {
-        checkShapesCompatible(tensor, arg.tensor)
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
-                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+        checkShapesCompatible(asDoubleTensor(), arg.asDoubleTensor())
+        for (i in 0 until asDoubleTensor().numElements) {
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] +=
+                arg.asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i]
         }
     }
 
     override fun Double.minus(arg: StructureND<Double>): DoubleTensor {
-        val resBuffer = DoubleArray(arg.tensor.numElements) { i ->
-            this - arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i]
+        val resBuffer = DoubleArray(arg.asDoubleTensor().numElements) { i ->
+            this - arg.asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i]
         }
         return DoubleTensor(arg.shape, resBuffer)
     }
 
     override fun StructureND<Double>.minus(arg: Double): DoubleTensor {
-        val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] - arg
+        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] - arg
         }
-        return DoubleTensor(tensor.shape, resBuffer)
+        return DoubleTensor(asDoubleTensor().shape, resBuffer)
     }
 
     override fun StructureND<Double>.minus(arg: StructureND<Double>): DoubleTensor {
-        checkShapesCompatible(tensor, arg)
-        val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[i] - arg.tensor.mutableBuffer.array()[i]
+        checkShapesCompatible(asDoubleTensor(), arg)
+        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
+            asDoubleTensor().mutableBuffer.array()[i] - arg.asDoubleTensor().mutableBuffer.array()[i]
         }
-        return DoubleTensor(tensor.shape, resBuffer)
+        return DoubleTensor(asDoubleTensor().shape, resBuffer)
     }
 
     override fun Tensor<Double>.minusAssign(value: Double) {
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] -= value
+        for (i in 0 until asDoubleTensor().numElements) {
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] -= value
         }
     }
 
     override fun Tensor<Double>.minusAssign(arg: StructureND<Double>) {
-        checkShapesCompatible(tensor, arg)
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
-                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+        checkShapesCompatible(asDoubleTensor(), arg)
+        for (i in 0 until asDoubleTensor().numElements) {
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] -=
+                arg.asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i]
         }
     }
 
     override fun Double.times(arg: StructureND<Double>): DoubleTensor {
-        val resBuffer = DoubleArray(arg.tensor.numElements) { i ->
-            arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i] * this
+        val resBuffer = DoubleArray(arg.asDoubleTensor().numElements) { i ->
+            arg.asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i] * this
         }
         return DoubleTensor(arg.shape, resBuffer)
     }
 
-    override fun StructureND<Double>.times(arg: Double): DoubleTensor = arg * tensor
+    override fun StructureND<Double>.times(arg: Double): DoubleTensor = arg * asDoubleTensor()
 
     override fun StructureND<Double>.times(arg: StructureND<Double>): DoubleTensor {
-        checkShapesCompatible(tensor, arg)
-        val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] *
-                    arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i]
+        checkShapesCompatible(asDoubleTensor(), arg)
+        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] *
+                    arg.asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i]
         }
-        return DoubleTensor(tensor.shape, resBuffer)
+        return DoubleTensor(asDoubleTensor().shape, resBuffer)
     }
 
     override fun Tensor<Double>.timesAssign(value: Double) {
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] *= value
+        for (i in 0 until asDoubleTensor().numElements) {
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] *= value
         }
     }
 
     override fun Tensor<Double>.timesAssign(arg: StructureND<Double>) {
-        checkShapesCompatible(tensor, arg)
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
-                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+        checkShapesCompatible(asDoubleTensor(), arg)
+        for (i in 0 until asDoubleTensor().numElements) {
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] *=
+                arg.asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i]
         }
     }
 
     override fun Double.div(arg: StructureND<Double>): DoubleTensor {
-        val resBuffer = DoubleArray(arg.tensor.numElements) { i ->
-            this / arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i]
+        val resBuffer = DoubleArray(arg.asDoubleTensor().numElements) { i ->
+            this / arg.asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i]
         }
         return DoubleTensor(arg.shape, resBuffer)
     }
 
     override fun StructureND<Double>.div(arg: Double): DoubleTensor {
-        val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] / arg
+        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] / arg
         }
         return DoubleTensor(shape, resBuffer)
     }
 
     override fun StructureND<Double>.div(arg: StructureND<Double>): DoubleTensor {
-        checkShapesCompatible(tensor, arg)
-        val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[arg.tensor.bufferStart + i] /
-                    arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i]
+        checkShapesCompatible(asDoubleTensor(), arg)
+        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
+            asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i] /
+                    arg.asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i]
         }
-        return DoubleTensor(tensor.shape, resBuffer)
+        return DoubleTensor(asDoubleTensor().shape, resBuffer)
     }
 
     override fun Tensor<Double>.divAssign(value: Double) {
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] /= value
+        for (i in 0 until asDoubleTensor().numElements) {
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] /= value
         }
     }
 
     override fun Tensor<Double>.divAssign(arg: StructureND<Double>) {
-        checkShapesCompatible(tensor, arg)
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] /=
-                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+        checkShapesCompatible(asDoubleTensor(), arg)
+        for (i in 0 until asDoubleTensor().numElements) {
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] /=
+                arg.asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i]
         }
     }
 
     override fun StructureND<Double>.unaryMinus(): DoubleTensor {
-        val resBuffer = DoubleArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[tensor.bufferStart + i].unaryMinus()
+        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
+            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i].unaryMinus()
         }
-        return DoubleTensor(tensor.shape, resBuffer)
+        return DoubleTensor(asDoubleTensor().shape, resBuffer)
     }
 
     override fun Tensor<Double>.transpose(i: Int, j: Int): DoubleTensor {
-        val ii = tensor.minusIndex(i)
-        val jj = tensor.minusIndex(j)
-        checkTranspose(tensor.dimension, ii, jj)
-        val n = tensor.numElements
+        val ii = asDoubleTensor().minusIndex(i)
+        val jj = asDoubleTensor().minusIndex(j)
+        checkTranspose(asDoubleTensor().dimension, ii, jj)
+        val n = asDoubleTensor().numElements
         val resBuffer = DoubleArray(n)
 
-        val resShape = tensor.shape.copyOf()
+        val resShape = asDoubleTensor().shape.copyOf()
         resShape[ii] = resShape[jj].also { resShape[jj] = resShape[ii] }
 
         val resTensor = DoubleTensor(resShape, resBuffer)
 
         for (offset in 0 until n) {
-            val oldMultiIndex = tensor.indices.index(offset)
+            val oldMultiIndex = asDoubleTensor().indices.index(offset)
             val newMultiIndex = oldMultiIndex.copyOf()
             newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
 
             val linearIndex = resTensor.indices.offset(newMultiIndex)
             resTensor.mutableBuffer.array()[linearIndex] =
-                tensor.mutableBuffer.array()[tensor.bufferStart + offset]
+                asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + offset]
         }
         return resTensor
     }
 
     override fun Tensor<Double>.view(shape: IntArray): DoubleTensor {
-        checkView(tensor, shape)
-        return DoubleTensor(shape, tensor.mutableBuffer.array(), tensor.bufferStart)
+        checkView(asDoubleTensor(), shape)
+        return DoubleTensor(shape, asDoubleTensor().mutableBuffer.array(), asDoubleTensor().bufferStart)
     }
 
     override fun Tensor<Double>.viewAs(other: StructureND<Double>): DoubleTensor =
-        tensor.view(other.shape)
+        asDoubleTensor().view(other.shape)
 
     /**
      * Broadcasting Matrix product of two tensors.
@@ -412,25 +412,25 @@ public open class DoubleTensorAlgebra :
      */
     @UnstableKMathAPI
     public infix fun StructureND<Double>.matmul(other: StructureND<Double>): DoubleTensor {
-        if (tensor.shape.size == 1 && other.shape.size == 1) {
-            return DoubleTensor(intArrayOf(1), doubleArrayOf(tensor.times(other).tensor.mutableBuffer.array().sum()))
+        if (asDoubleTensor().shape.size == 1 && other.shape.size == 1) {
+            return DoubleTensor(intArrayOf(1), doubleArrayOf(asDoubleTensor().times(other).asDoubleTensor().mutableBuffer.array().sum()))
         }
 
-        var newThis = tensor.copy()
+        var newThis = asDoubleTensor().copy()
         var newOther = other.copy()
 
         var penultimateDim = false
         var lastDim = false
-        if (tensor.shape.size == 1) {
+        if (asDoubleTensor().shape.size == 1) {
             penultimateDim = true
-            newThis = tensor.view(intArrayOf(1) + tensor.shape)
+            newThis = asDoubleTensor().view(intArrayOf(1) + asDoubleTensor().shape)
         }
         if (other.shape.size == 1) {
             lastDim = true
-            newOther = other.tensor.view(other.shape + intArrayOf(1))
+            newOther = other.asDoubleTensor().view(other.shape + intArrayOf(1))
         }
 
-        val broadcastTensors = broadcastOuterTensors(newThis.tensor, newOther.tensor)
+        val broadcastTensors = broadcastOuterTensors(newThis.asDoubleTensor(), newOther.asDoubleTensor())
         newThis = broadcastTensors[0]
         newOther = broadcastTensors[1]
 
@@ -497,8 +497,8 @@ public open class DoubleTensorAlgebra :
                 diagonalEntries.shape.slice(greaterDim - 1 until n - 1).toIntArray()
         val resTensor = zeros(resShape)
 
-        for (i in 0 until diagonalEntries.tensor.numElements) {
-            val multiIndex = diagonalEntries.tensor.indices.index(i)
+        for (i in 0 until diagonalEntries.asDoubleTensor().numElements) {
+            val multiIndex = diagonalEntries.asDoubleTensor().indices.index(i)
 
             var offset1 = 0
             var offset2 = abs(realOffset)
@@ -514,7 +514,7 @@ public open class DoubleTensorAlgebra :
             resTensor[diagonalMultiIndex] = diagonalEntries[multiIndex]
         }
 
-        return resTensor.tensor
+        return resTensor.asDoubleTensor()
     }
 
     /**
@@ -525,7 +525,7 @@ public open class DoubleTensorAlgebra :
      * @return true if two tensors have the same shape and elements, false otherwise.
      */
     public fun Tensor<Double>.eq(other: Tensor<Double>, epsilon: Double): Boolean =
-        tensor.eq(other) { x, y -> abs(x - y) < epsilon }
+        asDoubleTensor().eq(other) { x, y -> abs(x - y) < epsilon }
 
     /**
      * Compares element-wise two tensors.
@@ -534,21 +534,21 @@ public open class DoubleTensorAlgebra :
      * @param other the tensor to compare with `input` tensor.
      * @return true if two tensors have the same shape and elements, false otherwise.
      */
-    public infix fun Tensor<Double>.eq(other: Tensor<Double>): Boolean = tensor.eq(other, 1e-5)
+    public infix fun Tensor<Double>.eq(other: Tensor<Double>): Boolean = asDoubleTensor().eq(other, 1e-5)
 
     private fun Tensor<Double>.eq(
         other: Tensor<Double>,
         eqFunction: (Double, Double) -> Boolean,
     ): Boolean {
-        checkShapesCompatible(tensor, other)
-        val n = tensor.numElements
-        if (n != other.tensor.numElements) {
+        checkShapesCompatible(asDoubleTensor(), other)
+        val n = asDoubleTensor().numElements
+        if (n != other.asDoubleTensor().numElements) {
             return false
         }
         for (i in 0 until n) {
             if (!eqFunction(
-                    tensor.mutableBuffer[tensor.bufferStart + i],
-                    other.tensor.mutableBuffer[other.tensor.bufferStart + i]
+                    asDoubleTensor().mutableBuffer[asDoubleTensor().bufferStart + i],
+                    other.asDoubleTensor().mutableBuffer[other.asDoubleTensor().bufferStart + i]
                 )
             ) {
                 return false
@@ -578,7 +578,7 @@ public open class DoubleTensorAlgebra :
      * with `0.0` mean and `1.0` standard deviation.
      */
     public fun Tensor<Double>.randomNormalLike(seed: Long = 0): DoubleTensor =
-        DoubleTensor(tensor.shape, getRandomNormals(tensor.shape.reduce(Int::times), seed))
+        DoubleTensor(asDoubleTensor().shape, getRandomNormals(asDoubleTensor().shape.reduce(Int::times), seed))
 
     /**
      * Concatenates a sequence of tensors with equal shapes along the first dimension.
@@ -592,7 +592,7 @@ public open class DoubleTensorAlgebra :
         check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
         val resShape = intArrayOf(tensors.size) + shape
         val resBuffer = tensors.flatMap {
-            it.tensor.mutableBuffer.array().drop(it.tensor.bufferStart).take(it.tensor.numElements)
+            it.asDoubleTensor().mutableBuffer.array().drop(it.asDoubleTensor().bufferStart).take(it.asDoubleTensor().numElements)
         }.toDoubleArray()
         return DoubleTensor(resShape, resBuffer, 0)
     }
@@ -606,7 +606,7 @@ public open class DoubleTensorAlgebra :
     public fun Tensor<Double>.rowsByIndices(indices: IntArray): DoubleTensor = stack(indices.map { this[it] })
 
     private inline fun StructureND<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
-        foldFunction(tensor.copyArray())
+        foldFunction(asDoubleTensor().copyArray())
 
     private inline fun <reified R : Any> StructureND<Double>.foldDim(
         dim: Int,
@@ -629,44 +629,44 @@ public open class DoubleTensorAlgebra :
             val prefix = index.take(dim).toIntArray()
             val suffix = index.takeLast(dimension - dim - 1).toIntArray()
             resTensor[index] = foldFunction(DoubleArray(shape[dim]) { i ->
-                tensor[prefix + intArrayOf(i) + suffix]
+                asDoubleTensor()[prefix + intArrayOf(i) + suffix]
             })
         }
         return resTensor
     }
 
-    override fun StructureND<Double>.sum(): Double = tensor.fold { it.sum() }
+    override fun StructureND<Double>.sum(): Double = asDoubleTensor().fold { it.sum() }
 
     override fun StructureND<Double>.sum(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim(dim, keepDim) { x -> x.sum() }.toDoubleTensor()
+        foldDim(dim, keepDim) { x -> x.sum() }.asDoubleTensor()
 
     override fun StructureND<Double>.min(): Double = this.fold { it.minOrNull()!! }
 
     override fun StructureND<Double>.min(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim(dim, keepDim) { x -> x.minOrNull()!! }.toDoubleTensor()
+        foldDim(dim, keepDim) { x -> x.minOrNull()!! }.asDoubleTensor()
 
     override fun StructureND<Double>.max(): Double = this.fold { it.maxOrNull()!! }
 
     override fun StructureND<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim(dim, keepDim) { x -> x.maxOrNull()!! }.toDoubleTensor()
+        foldDim(dim, keepDim) { x -> x.maxOrNull()!! }.asDoubleTensor()
 
 
     override fun StructureND<Double>.argMax(dim: Int, keepDim: Boolean): IntTensor =
         foldDim(dim, keepDim) { x ->
             x.withIndex().maxByOrNull { it.value }?.index!!
-        }.toIntTensor()
+        }.asIntTensor()
 
 
-    override fun StructureND<Double>.mean(): Double = this.fold { it.sum() / tensor.numElements }
+    override fun StructureND<Double>.mean(): Double = this.fold { it.sum() / asDoubleTensor().numElements }
 
     override fun StructureND<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(dim, keepDim) { arr ->
         check(dim < dimension) { "Dimension $dim out of range $dimension" }
         arr.sum() / shape[dim]
-    }.toDoubleTensor()
+    }.asDoubleTensor()
 
     override fun StructureND<Double>.std(): Double = fold { arr ->
-        val mean = arr.sum() / tensor.numElements
-        sqrt(arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1))
+        val mean = arr.sum() / asDoubleTensor().numElements
+        sqrt(arr.sumOf { (it - mean) * (it - mean) } / (asDoubleTensor().numElements - 1))
     }
 
     override fun StructureND<Double>.std(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
@@ -676,11 +676,11 @@ public open class DoubleTensorAlgebra :
         check(dim < dimension) { "Dimension $dim out of range $dimension" }
         val mean = arr.sum() / shape[dim]
         sqrt(arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1))
-    }.toDoubleTensor()
+    }.asDoubleTensor()
 
     override fun StructureND<Double>.variance(): Double = fold { arr ->
-        val mean = arr.sum() / tensor.numElements
-        arr.sumOf { (it - mean) * (it - mean) } / (tensor.numElements - 1)
+        val mean = arr.sum() / asDoubleTensor().numElements
+        arr.sumOf { (it - mean) * (it - mean) } / (asDoubleTensor().numElements - 1)
     }
 
     override fun StructureND<Double>.variance(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
@@ -690,7 +690,7 @@ public open class DoubleTensorAlgebra :
         check(dim < dimension) { "Dimension $dim out of range $dimension" }
         val mean = arr.sum() / shape[dim]
         arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1)
-    }.toDoubleTensor()
+    }.asDoubleTensor()
 
     private fun cov(x: DoubleTensor, y: DoubleTensor): Double {
         val n = x.shape[0]
@@ -716,45 +716,51 @@ public open class DoubleTensorAlgebra :
         )
         for (i in 0 until n) {
             for (j in 0 until n) {
-                resTensor[intArrayOf(i, j)] = cov(tensors[i].tensor, tensors[j].tensor)
+                resTensor[intArrayOf(i, j)] = cov(tensors[i].asDoubleTensor(), tensors[j].asDoubleTensor())
             }
         }
         return resTensor
     }
 
-    override fun StructureND<Double>.exp(): DoubleTensor = tensor.map { exp(it) }
+    override fun StructureND<Double>.exp(): DoubleTensor = asDoubleTensor().map { exp(it) }
 
-    override fun StructureND<Double>.ln(): DoubleTensor = tensor.map { ln(it) }
+    override fun StructureND<Double>.ln(): DoubleTensor = asDoubleTensor().map { ln(it) }
 
-    override fun StructureND<Double>.sqrt(): DoubleTensor = tensor.map { sqrt(it) }
+    override fun StructureND<Double>.sqrt(): DoubleTensor = asDoubleTensor().map { sqrt(it) }
 
-    override fun StructureND<Double>.cos(): DoubleTensor = tensor.map { cos(it) }
+    override fun StructureND<Double>.cos(): DoubleTensor = asDoubleTensor().map { cos(it) }
 
-    override fun StructureND<Double>.acos(): DoubleTensor = tensor.map { acos(it) }
+    override fun StructureND<Double>.acos(): DoubleTensor = asDoubleTensor().map { acos(it) }
 
-    override fun StructureND<Double>.cosh(): DoubleTensor = tensor.map { cosh(it) }
+    override fun StructureND<Double>.cosh(): DoubleTensor = asDoubleTensor().map { cosh(it) }
 
-    override fun StructureND<Double>.acosh(): DoubleTensor = tensor.map { acosh(it) }
+    override fun StructureND<Double>.acosh(): DoubleTensor = asDoubleTensor().map { acosh(it) }
 
-    override fun StructureND<Double>.sin(): DoubleTensor = tensor.map { sin(it) }
+    override fun StructureND<Double>.sin(): DoubleTensor = asDoubleTensor().map { sin(it) }
 
-    override fun StructureND<Double>.asin(): DoubleTensor = tensor.map { asin(it) }
+    override fun StructureND<Double>.asin(): DoubleTensor = asDoubleTensor().map { asin(it) }
 
-    override fun StructureND<Double>.sinh(): DoubleTensor = tensor.map { sinh(it) }
+    override fun StructureND<Double>.sinh(): DoubleTensor = asDoubleTensor().map { sinh(it) }
 
-    override fun StructureND<Double>.asinh(): DoubleTensor = tensor.map { asinh(it) }
+    override fun StructureND<Double>.asinh(): DoubleTensor = asDoubleTensor().map { asinh(it) }
 
-    override fun StructureND<Double>.tan(): DoubleTensor = tensor.map { tan(it) }
+    override fun StructureND<Double>.tan(): DoubleTensor = asDoubleTensor().map { tan(it) }
 
-    override fun StructureND<Double>.atan(): DoubleTensor = tensor.map { atan(it) }
+    override fun StructureND<Double>.atan(): DoubleTensor = asDoubleTensor().map { atan(it) }
 
-    override fun StructureND<Double>.tanh(): DoubleTensor = tensor.map { tanh(it) }
+    override fun StructureND<Double>.tanh(): DoubleTensor = asDoubleTensor().map { tanh(it) }
 
-    override fun StructureND<Double>.atanh(): DoubleTensor = tensor.map { atanh(it) }
+    override fun StructureND<Double>.atanh(): DoubleTensor = asDoubleTensor().map { atanh(it) }
 
-    override fun StructureND<Double>.ceil(): DoubleTensor = tensor.map { ceil(it) }
+    override fun power(arg: StructureND<Double>, pow: Number): StructureND<Double> = if (pow is Int) {
+        arg.map { it.pow(pow) }
+    } else {
+        arg.map { it.pow(pow.toDouble()) }
+    }
 
-    override fun StructureND<Double>.floor(): DoubleTensor = tensor.map { floor(it) }
+    override fun StructureND<Double>.ceil(): DoubleTensor = asDoubleTensor().map { ceil(it) }
+
+    override fun StructureND<Double>.floor(): DoubleTensor = asDoubleTensor().map { floor(it) }
 
     override fun StructureND<Double>.inv(): DoubleTensor = invLU(1e-9)
 
@@ -770,7 +776,7 @@ public open class DoubleTensorAlgebra :
      * The `pivots`  has the shape ``(∗, min(m, n))``. `pivots` stores all the intermediate transpositions of rows.
      */
     public fun StructureND<Double>.luFactor(epsilon: Double): Pair<DoubleTensor, IntTensor> =
-        computeLU(tensor, epsilon)
+        computeLU(asDoubleTensor(), epsilon)
             ?: throw IllegalArgumentException("Tensor contains matrices which are singular at precision $epsilon")
 
     /**
@@ -809,7 +815,7 @@ public open class DoubleTensorAlgebra :
         val pTensor = luTensor.zeroesLike()
         pTensor
             .matrixSequence()
-            .zip(pivotsTensor.tensor.vectorSequence())
+            .zip(pivotsTensor.asIntTensor().vectorSequence())
             .forEach { (p, pivot) -> pivInit(p.as2D(), pivot.as1D(), n) }
 
         val lTensor = luTensor.zeroesLike()
@@ -817,7 +823,7 @@ public open class DoubleTensorAlgebra :
 
         lTensor.matrixSequence()
             .zip(uTensor.matrixSequence())
-            .zip(luTensor.tensor.matrixSequence())
+            .zip(luTensor.asDoubleTensor().matrixSequence())
             .forEach { (pairLU, lu) ->
                 val (l, u) = pairLU
                 luPivotHelper(l.as2D(), u.as2D(), lu.as2D(), n)
@@ -841,12 +847,12 @@ public open class DoubleTensorAlgebra :
      */
     public fun StructureND<Double>.cholesky(epsilon: Double): DoubleTensor {
         checkSquareMatrix(shape)
-        checkPositiveDefinite(tensor, epsilon)
+        checkPositiveDefinite(asDoubleTensor(), epsilon)
 
         val n = shape.last()
         val lTensor = zeroesLike()
 
-        for ((a, l) in tensor.matrixSequence().zip(lTensor.matrixSequence()))
+        for ((a, l) in asDoubleTensor().matrixSequence().zip(lTensor.matrixSequence()))
             for (i in 0 until n) choleskyHelper(a.as2D(), l.as2D(), n)
 
         return lTensor
@@ -858,13 +864,13 @@ public open class DoubleTensorAlgebra :
         checkSquareMatrix(shape)
         val qTensor = zeroesLike()
         val rTensor = zeroesLike()
-        tensor.matrixSequence()
+        asDoubleTensor().matrixSequence()
             .zip(
                 (qTensor.matrixSequence()
                     .zip(rTensor.matrixSequence()))
             ).forEach { (matrix, qr) ->
                 val (q, r) = qr
-                qrHelper(matrix.asTensor(), q.asTensor(), r.as2D())
+                qrHelper(matrix.toTensor(), q.toTensor(), r.as2D())
             }
 
         return qTensor to rTensor
@@ -887,14 +893,14 @@ public open class DoubleTensorAlgebra :
      * @return a triple `Triple(U, S, V)`.
      */
     public fun StructureND<Double>.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        val size = tensor.dimension
-        val commonShape = tensor.shape.sliceArray(0 until size - 2)
-        val (n, m) = tensor.shape.sliceArray(size - 2 until size)
+        val size = asDoubleTensor().dimension
+        val commonShape = asDoubleTensor().shape.sliceArray(0 until size - 2)
+        val (n, m) = asDoubleTensor().shape.sliceArray(size - 2 until size)
         val uTensor = zeros(commonShape + intArrayOf(min(n, m), n))
         val sTensor = zeros(commonShape + intArrayOf(min(n, m)))
         val vTensor = zeros(commonShape + intArrayOf(min(n, m), m))
 
-        val matrices = tensor.matrices
+        val matrices = asDoubleTensor().matrices
         val uTensors = uTensor.matrices
         val sTensorVectors = sTensor.vectors
         val vTensors = vTensor.matrices
@@ -931,7 +937,7 @@ public open class DoubleTensorAlgebra :
      * @return a pair `eigenvalues to eigenvectors`.
      */
     public fun StructureND<Double>.symEigSvd(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
-        checkSymmetric(tensor, epsilon)
+        checkSymmetric(asDoubleTensor(), epsilon)
 
         fun MutableStructure2D<Double>.cleanSym(n: Int) {
             for (i in 0 until n) {
@@ -945,7 +951,7 @@ public open class DoubleTensorAlgebra :
             }
         }
 
-        val (u, s, v) = tensor.svd(epsilon)
+        val (u, s, v) = asDoubleTensor().svd(epsilon)
         val shp = s.shape + intArrayOf(1)
         val utv = u.transpose() matmul v
         val n = s.shape.last()
@@ -958,7 +964,7 @@ public open class DoubleTensorAlgebra :
     }
 
     public fun StructureND<Double>.symEigJacobi(maxIteration: Int, epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
-        checkSymmetric(tensor, epsilon)
+        checkSymmetric(asDoubleTensor(), epsilon)
 
         val size = this.dimension
         val eigenvectors = zeros(this.shape)
@@ -966,7 +972,7 @@ public open class DoubleTensorAlgebra :
 
         var eigenvalueStart = 0
         var eigenvectorStart = 0
-        for (matrix in tensor.matrixSequence()) {
+        for (matrix in asDoubleTensor().matrixSequence()) {
             val matrix2D = matrix.as2D()
             val (d, v) = matrix2D.jacobiHelper(maxIteration, epsilon)
 
@@ -1111,9 +1117,9 @@ public open class DoubleTensorAlgebra :
      * @return the determinant.
      */
     public fun StructureND<Double>.detLU(epsilon: Double = 1e-9): DoubleTensor {
-        checkSquareMatrix(tensor.shape)
-        val luTensor = tensor.copy()
-        val pivotsTensor = tensor.setUpPivots()
+        checkSquareMatrix(asDoubleTensor().shape)
+        val luTensor = asDoubleTensor().copy()
+        val pivotsTensor = asDoubleTensor().setUpPivots()
 
         val n = shape.size
 
@@ -1169,14 +1175,14 @@ public open class DoubleTensorAlgebra :
      * @return triple of `P`, `L` and `U` tensors.
      */
     public fun StructureND<Double>.lu(epsilon: Double = 1e-9): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        val (lu, pivots) = tensor.luFactor(epsilon)
+        val (lu, pivots) = asDoubleTensor().luFactor(epsilon)
         return luPivot(lu, pivots)
     }
 
     override fun StructureND<Double>.lu(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> = lu(1e-9)
 }
 
-public val Double.Companion.tensorAlgebra: DoubleTensorAlgebra.Companion get() = DoubleTensorAlgebra
-public val DoubleField.tensorAlgebra: DoubleTensorAlgebra.Companion get() = DoubleTensorAlgebra
+public val Double.Companion.tensorAlgebra: DoubleTensorAlgebra get() = DoubleTensorAlgebra
+public val DoubleField.tensorAlgebra: DoubleTensorAlgebra get() = DoubleTensorAlgebra
 
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
index 0c8ddcf87..194f2bd18 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
@@ -39,7 +39,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
     @PerformancePitfall
     @Suppress("OVERRIDE_BY_INLINE")
     final override inline fun StructureND<Int>.map(transform: IntRing.(Int) -> Int): IntTensor {
-        val tensor = this.tensor
+        val tensor = this.asIntTensor()
         //TODO remove additional copy
         val sourceArray = tensor.copyArray()
         val array = IntArray(tensor.numElements) { IntRing.transform(sourceArray[it]) }
@@ -53,7 +53,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
     @PerformancePitfall
     @Suppress("OVERRIDE_BY_INLINE")
     final override inline fun StructureND<Int>.mapIndexed(transform: IntRing.(index: IntArray, Int) -> Int): IntTensor {
-        val tensor = this.tensor
+        val tensor = this.asIntTensor()
         //TODO remove additional copy
         val sourceArray = tensor.copyArray()
         val array = IntArray(tensor.numElements) { IntRing.transform(tensor.indices.index(it), sourceArray[it]) }
@@ -73,9 +73,9 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
         require(left.shape.contentEquals(right.shape)) {
             "The shapes in zip are not equal: left - ${left.shape}, right - ${right.shape}"
         }
-        val leftTensor = left.tensor
+        val leftTensor = left.asIntTensor()
         val leftArray = leftTensor.copyArray()
-        val rightTensor = right.tensor
+        val rightTensor = right.asIntTensor()
         val rightArray = rightTensor.copyArray()
         val array = IntArray(leftTensor.numElements) { IntRing.transform(leftArray[it], rightArray[it]) }
         return IntTensor(
@@ -84,8 +84,8 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
         )
     }
 
-    override fun StructureND<Int>.valueOrNull(): Int? = if (tensor.shape contentEquals intArrayOf(1))
-        tensor.mutableBuffer.array()[tensor.bufferStart] else null
+    override fun StructureND<Int>.valueOrNull(): Int? = if (asIntTensor().shape contentEquals intArrayOf(1))
+        asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart] else null
 
     override fun StructureND<Int>.value(): Int = valueOrNull()
         ?: throw IllegalArgumentException("The tensor shape is $shape, but value method is allowed only for shape [1]")
@@ -119,10 +119,10 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
     )
 
     override operator fun Tensor<Int>.get(i: Int): IntTensor {
-        val lastShape = tensor.shape.drop(1).toIntArray()
+        val lastShape = asIntTensor().shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
-        val newStart = newShape.reduce(Int::times) * i + tensor.bufferStart
-        return IntTensor(newShape, tensor.mutableBuffer.array(), newStart)
+        val newStart = newShape.reduce(Int::times) * i + asIntTensor().bufferStart
+        return IntTensor(newShape, asIntTensor().mutableBuffer.array(), newStart)
     }
 
     /**
@@ -145,8 +145,8 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @return tensor with the `input` tensor shape and filled with [value].
      */
     public fun Tensor<Int>.fullLike(value: Int): IntTensor {
-        val shape = tensor.shape
-        val buffer = IntArray(tensor.numElements) { value }
+        val shape = asIntTensor().shape
+        val buffer = IntArray(asIntTensor().numElements) { value }
         return IntTensor(shape, buffer)
     }
 
@@ -163,7 +163,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      *
      * @return tensor filled with the scalar value `0`, with the same shape as `input` tensor.
      */
-    public fun StructureND<Int>.zeroesLike(): IntTensor = tensor.fullLike(0)
+    public fun StructureND<Int>.zeroesLike(): IntTensor = asIntTensor().fullLike(0)
 
     /**
      * Returns a tensor filled with the scalar value `1`, with the shape defined by the variable argument [shape].
@@ -178,7 +178,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      *
      * @return tensor filled with the scalar value `1`, with the same shape as `input` tensor.
      */
-    public fun Tensor<Int>.onesLike(): IntTensor = tensor.fullLike(1)
+    public fun Tensor<Int>.onesLike(): IntTensor = asIntTensor().fullLike(1)
 
     /**
      * Returns a 2D tensor with shape ([n], [n]), with ones on the diagonal and zeros elsewhere.
@@ -202,145 +202,145 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @return a copy of the `input` tensor with a copied buffer.
      */
     public fun StructureND<Int>.copy(): IntTensor =
-        IntTensor(tensor.shape, tensor.mutableBuffer.array().copyOf(), tensor.bufferStart)
+        IntTensor(asIntTensor().shape, asIntTensor().mutableBuffer.array().copyOf(), asIntTensor().bufferStart)
 
     override fun Int.plus(arg: StructureND<Int>): IntTensor {
-        val resBuffer = IntArray(arg.tensor.numElements) { i ->
-            arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i] + this
+        val resBuffer = IntArray(arg.asIntTensor().numElements) { i ->
+            arg.asIntTensor().mutableBuffer.array()[arg.asIntTensor().bufferStart + i] + this
         }
         return IntTensor(arg.shape, resBuffer)
     }
 
-    override fun StructureND<Int>.plus(arg: Int): IntTensor = arg + tensor
+    override fun StructureND<Int>.plus(arg: Int): IntTensor = arg + asIntTensor()
 
     override fun StructureND<Int>.plus(arg: StructureND<Int>): IntTensor {
-        checkShapesCompatible(tensor, arg.tensor)
-        val resBuffer = IntArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[i] + arg.tensor.mutableBuffer.array()[i]
+        checkShapesCompatible(asIntTensor(), arg.asIntTensor())
+        val resBuffer = IntArray(asIntTensor().numElements) { i ->
+            asIntTensor().mutableBuffer.array()[i] + arg.asIntTensor().mutableBuffer.array()[i]
         }
-        return IntTensor(tensor.shape, resBuffer)
+        return IntTensor(asIntTensor().shape, resBuffer)
     }
 
     override fun Tensor<Int>.plusAssign(value: Int) {
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] += value
+        for (i in 0 until asIntTensor().numElements) {
+            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] += value
         }
     }
 
     override fun Tensor<Int>.plusAssign(arg: StructureND<Int>) {
-        checkShapesCompatible(tensor, arg.tensor)
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] +=
-                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+        checkShapesCompatible(asIntTensor(), arg.asIntTensor())
+        for (i in 0 until asIntTensor().numElements) {
+            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] +=
+                arg.asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i]
         }
     }
 
     override fun Int.minus(arg: StructureND<Int>): IntTensor {
-        val resBuffer = IntArray(arg.tensor.numElements) { i ->
-            this - arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i]
+        val resBuffer = IntArray(arg.asIntTensor().numElements) { i ->
+            this - arg.asIntTensor().mutableBuffer.array()[arg.asIntTensor().bufferStart + i]
         }
         return IntTensor(arg.shape, resBuffer)
     }
 
     override fun StructureND<Int>.minus(arg: Int): IntTensor {
-        val resBuffer = IntArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] - arg
+        val resBuffer = IntArray(asIntTensor().numElements) { i ->
+            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] - arg
         }
-        return IntTensor(tensor.shape, resBuffer)
+        return IntTensor(asIntTensor().shape, resBuffer)
     }
 
     override fun StructureND<Int>.minus(arg: StructureND<Int>): IntTensor {
-        checkShapesCompatible(tensor, arg)
-        val resBuffer = IntArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[i] - arg.tensor.mutableBuffer.array()[i]
+        checkShapesCompatible(asIntTensor(), arg)
+        val resBuffer = IntArray(asIntTensor().numElements) { i ->
+            asIntTensor().mutableBuffer.array()[i] - arg.asIntTensor().mutableBuffer.array()[i]
         }
-        return IntTensor(tensor.shape, resBuffer)
+        return IntTensor(asIntTensor().shape, resBuffer)
     }
 
     override fun Tensor<Int>.minusAssign(value: Int) {
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] -= value
+        for (i in 0 until asIntTensor().numElements) {
+            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] -= value
         }
     }
 
     override fun Tensor<Int>.minusAssign(arg: StructureND<Int>) {
-        checkShapesCompatible(tensor, arg)
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] -=
-                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+        checkShapesCompatible(asIntTensor(), arg)
+        for (i in 0 until asIntTensor().numElements) {
+            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] -=
+                arg.asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i]
         }
     }
 
     override fun Int.times(arg: StructureND<Int>): IntTensor {
-        val resBuffer = IntArray(arg.tensor.numElements) { i ->
-            arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i] * this
+        val resBuffer = IntArray(arg.asIntTensor().numElements) { i ->
+            arg.asIntTensor().mutableBuffer.array()[arg.asIntTensor().bufferStart + i] * this
         }
         return IntTensor(arg.shape, resBuffer)
     }
 
-    override fun StructureND<Int>.times(arg: Int): IntTensor = arg * tensor
+    override fun StructureND<Int>.times(arg: Int): IntTensor = arg * asIntTensor()
 
     override fun StructureND<Int>.times(arg: StructureND<Int>): IntTensor {
-        checkShapesCompatible(tensor, arg)
-        val resBuffer = IntArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] *
-                    arg.tensor.mutableBuffer.array()[arg.tensor.bufferStart + i]
+        checkShapesCompatible(asIntTensor(), arg)
+        val resBuffer = IntArray(asIntTensor().numElements) { i ->
+            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] *
+                    arg.asIntTensor().mutableBuffer.array()[arg.asIntTensor().bufferStart + i]
         }
-        return IntTensor(tensor.shape, resBuffer)
+        return IntTensor(asIntTensor().shape, resBuffer)
     }
 
     override fun Tensor<Int>.timesAssign(value: Int) {
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] *= value
+        for (i in 0 until asIntTensor().numElements) {
+            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] *= value
         }
     }
 
     override fun Tensor<Int>.timesAssign(arg: StructureND<Int>) {
-        checkShapesCompatible(tensor, arg)
-        for (i in 0 until tensor.numElements) {
-            tensor.mutableBuffer.array()[tensor.bufferStart + i] *=
-                arg.tensor.mutableBuffer.array()[tensor.bufferStart + i]
+        checkShapesCompatible(asIntTensor(), arg)
+        for (i in 0 until asIntTensor().numElements) {
+            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] *=
+                arg.asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i]
         }
     }
 
     override fun StructureND<Int>.unaryMinus(): IntTensor {
-        val resBuffer = IntArray(tensor.numElements) { i ->
-            tensor.mutableBuffer.array()[tensor.bufferStart + i].unaryMinus()
+        val resBuffer = IntArray(asIntTensor().numElements) { i ->
+            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i].unaryMinus()
         }
-        return IntTensor(tensor.shape, resBuffer)
+        return IntTensor(asIntTensor().shape, resBuffer)
     }
 
     override fun Tensor<Int>.transpose(i: Int, j: Int): IntTensor {
-        val ii = tensor.minusIndex(i)
-        val jj = tensor.minusIndex(j)
-        checkTranspose(tensor.dimension, ii, jj)
-        val n = tensor.numElements
+        val ii = asIntTensor().minusIndex(i)
+        val jj = asIntTensor().minusIndex(j)
+        checkTranspose(asIntTensor().dimension, ii, jj)
+        val n = asIntTensor().numElements
         val resBuffer = IntArray(n)
 
-        val resShape = tensor.shape.copyOf()
+        val resShape = asIntTensor().shape.copyOf()
         resShape[ii] = resShape[jj].also { resShape[jj] = resShape[ii] }
 
         val resTensor = IntTensor(resShape, resBuffer)
 
         for (offset in 0 until n) {
-            val oldMultiIndex = tensor.indices.index(offset)
+            val oldMultiIndex = asIntTensor().indices.index(offset)
             val newMultiIndex = oldMultiIndex.copyOf()
             newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
 
             val linearIndex = resTensor.indices.offset(newMultiIndex)
             resTensor.mutableBuffer.array()[linearIndex] =
-                tensor.mutableBuffer.array()[tensor.bufferStart + offset]
+                asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + offset]
         }
         return resTensor
     }
 
     override fun Tensor<Int>.view(shape: IntArray): IntTensor {
-        checkView(tensor, shape)
-        return IntTensor(shape, tensor.mutableBuffer.array(), tensor.bufferStart)
+        checkView(asIntTensor(), shape)
+        return IntTensor(shape, asIntTensor().mutableBuffer.array(), asIntTensor().bufferStart)
     }
 
     override fun Tensor<Int>.viewAs(other: StructureND<Int>): IntTensor =
-        tensor.view(other.shape)
+        asIntTensor().view(other.shape)
 
     override fun diagonalEmbedding(
         diagonalEntries: Tensor<Int>,
@@ -374,8 +374,8 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
                 diagonalEntries.shape.slice(greaterDim - 1 until n - 1).toIntArray()
         val resTensor = zeros(resShape)
 
-        for (i in 0 until diagonalEntries.tensor.numElements) {
-            val multiIndex = diagonalEntries.tensor.indices.index(i)
+        for (i in 0 until diagonalEntries.asIntTensor().numElements) {
+            val multiIndex = diagonalEntries.asIntTensor().indices.index(i)
 
             var offset1 = 0
             var offset2 = abs(realOffset)
@@ -391,19 +391,19 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
             resTensor[diagonalMultiIndex] = diagonalEntries[multiIndex]
         }
 
-        return resTensor.tensor
+        return resTensor.asIntTensor()
     }
 
     private infix fun Tensor<Int>.eq(
         other: Tensor<Int>,
     ): Boolean {
-        checkShapesCompatible(tensor, other)
-        val n = tensor.numElements
-        if (n != other.tensor.numElements) {
+        checkShapesCompatible(asIntTensor(), other)
+        val n = asIntTensor().numElements
+        if (n != other.asIntTensor().numElements) {
             return false
         }
         for (i in 0 until n) {
-            if (tensor.mutableBuffer[tensor.bufferStart + i] != other.tensor.mutableBuffer[other.tensor.bufferStart + i]) {
+            if (asIntTensor().mutableBuffer[asIntTensor().bufferStart + i] != other.asIntTensor().mutableBuffer[other.asIntTensor().bufferStart + i]) {
                 return false
             }
         }
@@ -422,7 +422,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
         check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
         val resShape = intArrayOf(tensors.size) + shape
         val resBuffer = tensors.flatMap {
-            it.tensor.mutableBuffer.array().drop(it.tensor.bufferStart).take(it.tensor.numElements)
+            it.asIntTensor().mutableBuffer.array().drop(it.asIntTensor().bufferStart).take(it.asIntTensor().numElements)
         }.toIntArray()
         return IntTensor(resShape, resBuffer, 0)
     }
@@ -436,7 +436,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
     public fun Tensor<Int>.rowsByIndices(indices: IntArray): IntTensor = stack(indices.map { this[it] })
 
     private inline fun StructureND<Int>.fold(foldFunction: (IntArray) -> Int): Int =
-        foldFunction(tensor.copyArray())
+        foldFunction(asIntTensor().copyArray())
 
     private inline fun <reified R : Any> StructureND<Int>.foldDim(
         dim: Int,
@@ -459,35 +459,35 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
             val prefix = index.take(dim).toIntArray()
             val suffix = index.takeLast(dimension - dim - 1).toIntArray()
             resTensor[index] = foldFunction(IntArray(shape[dim]) { i ->
-                tensor[prefix + intArrayOf(i) + suffix]
+                asIntTensor()[prefix + intArrayOf(i) + suffix]
             })
         }
         return resTensor
     }
 
-    override fun StructureND<Int>.sum(): Int = tensor.fold { it.sum() }
+    override fun StructureND<Int>.sum(): Int = asIntTensor().fold { it.sum() }
 
     override fun StructureND<Int>.sum(dim: Int, keepDim: Boolean): IntTensor =
-        foldDim(dim, keepDim) { x -> x.sum() }.toIntTensor()
+        foldDim(dim, keepDim) { x -> x.sum() }.asIntTensor()
 
     override fun StructureND<Int>.min(): Int = this.fold { it.minOrNull()!! }
 
     override fun StructureND<Int>.min(dim: Int, keepDim: Boolean): IntTensor =
-        foldDim(dim, keepDim) { x -> x.minOrNull()!! }.toIntTensor()
+        foldDim(dim, keepDim) { x -> x.minOrNull()!! }.asIntTensor()
 
     override fun StructureND<Int>.max(): Int = this.fold { it.maxOrNull()!! }
 
     override fun StructureND<Int>.max(dim: Int, keepDim: Boolean): IntTensor =
-        foldDim(dim, keepDim) { x -> x.maxOrNull()!! }.toIntTensor()
+        foldDim(dim, keepDim) { x -> x.maxOrNull()!! }.asIntTensor()
 
 
     override fun StructureND<Int>.argMax(dim: Int, keepDim: Boolean): IntTensor =
         foldDim(dim, keepDim) { x ->
             x.withIndex().maxByOrNull { it.value }?.index!!
-        }.toIntTensor()
+        }.asIntTensor()
 }
 
-public val Int.Companion.tensorAlgebra: IntTensorAlgebra.Companion get() = IntTensorAlgebra
-public val IntRing.tensorAlgebra: IntTensorAlgebra.Companion get() = IntTensorAlgebra
+public val Int.Companion.tensorAlgebra: IntTensorAlgebra get() = IntTensorAlgebra
+public val IntRing.tensorAlgebra: IntTensorAlgebra get() = IntTensorAlgebra
 
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index e997dfcca..62cc85396 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -58,7 +58,7 @@ internal fun DoubleTensorAlgebra.checkSymmetric(
 internal fun DoubleTensorAlgebra.checkPositiveDefinite(tensor: DoubleTensor, epsilon: Double = 1e-6) {
     checkSymmetric(tensor, epsilon)
     for (mat in tensor.matrixSequence())
-        check(mat.asTensor().detLU().value() > 0.0) {
-            "Tensor contains matrices which are not positive definite ${mat.asTensor().detLU().value()}"
+        check(mat.toTensor().detLU().value() > 0.0) {
+            "Tensor contains matrices which are not positive definite ${mat.toTensor().detLU().value()}"
         }
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
index c19b8bf95..e7704b257 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
@@ -13,16 +13,17 @@ import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.IntTensor
 import space.kscience.kmath.tensors.core.TensorLinearStructure
 
-internal fun BufferedTensor<Int>.asTensor(): IntTensor =
+internal fun BufferedTensor<Int>.toTensor(): IntTensor =
     IntTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
 
-internal fun BufferedTensor<Double>.asTensor(): DoubleTensor =
+internal fun BufferedTensor<Double>.toTensor(): DoubleTensor =
     DoubleTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
 
 internal fun <T> StructureND<T>.copyToBufferedTensor(): BufferedTensor<T> =
     BufferedTensor(
         this.shape,
-        TensorLinearStructure(this.shape).asSequence().map(this::get).toMutableList().asMutableBuffer(), 0
+        TensorLinearStructure(this.shape).asSequence().map(this::get).toMutableList().asMutableBuffer(),
+        0
     )
 
 internal fun <T> StructureND<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
@@ -34,17 +35,3 @@ internal fun <T> StructureND<T>.toBufferedTensor(): BufferedTensor<T> = when (th
     }
     else -> this.copyToBufferedTensor()
 }
-
-@PublishedApi
-internal val StructureND<Double>.tensor: DoubleTensor
-    get() = when (this) {
-        is DoubleTensor -> this
-        else -> this.toBufferedTensor().asTensor()
-    }
-
-@PublishedApi
-internal val StructureND<Int>.tensor: IntTensor
-    get() = when (this) {
-        is IntTensor -> this
-        else -> this.toBufferedTensor().asTensor()
-    }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
index 968efa468..1c914d474 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
@@ -5,18 +5,26 @@
 
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.tensors.api.Tensor
-import space.kscience.kmath.tensors.core.internal.tensor
+import space.kscience.kmath.tensors.core.internal.toBufferedTensor
+import space.kscience.kmath.tensors.core.internal.toTensor
 
 /**
  * Casts [Tensor] of [Double] to [DoubleTensor]
  */
-public fun Tensor<Double>.toDoubleTensor(): DoubleTensor = this.tensor
+public fun StructureND<Double>.asDoubleTensor(): DoubleTensor = when (this) {
+    is DoubleTensor -> this
+    else -> this.toBufferedTensor().toTensor()
+}
 
 /**
  * Casts [Tensor] of [Int] to [IntTensor]
  */
-public fun Tensor<Int>.toIntTensor(): IntTensor = this.tensor
+public fun StructureND<Int>.asIntTensor(): IntTensor = when (this) {
+    is IntTensor -> this
+    else -> this.toBufferedTensor().toTensor()
+}
 
 /**
  * Returns a copy-protected [DoubleArray] of tensor elements
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 5e5ef95be..61248cbb8 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -14,9 +14,9 @@ import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.toDoubleArray
 import space.kscience.kmath.tensors.core.internal.array
-import space.kscience.kmath.tensors.core.internal.asTensor
 import space.kscience.kmath.tensors.core.internal.matrixSequence
 import space.kscience.kmath.tensors.core.internal.toBufferedTensor
+import space.kscience.kmath.tensors.core.internal.toTensor
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -56,7 +56,7 @@ internal class TestDoubleTensor {
         assertEquals(tensor[intArrayOf(0, 1, 0)], 109.56)
 
         tensor.matrixSequence().forEach {
-            val a = it.asTensor()
+            val a = it.toTensor()
             val secondRow = a[1].as1D()
             val secondColumn = a.transpose(0, 1)[1].as1D()
             assertEquals(secondColumn[0], 77.89)
@@ -75,10 +75,10 @@ internal class TestDoubleTensor {
 
         // map to tensors
         val bufferedTensorArray = ndArray.toBufferedTensor() // strides are flipped so data copied
-        val tensorArray = bufferedTensorArray.asTensor() // data not contiguous so copied again
+        val tensorArray = bufferedTensorArray.toTensor() // data not contiguous so copied again
 
-        val tensorArrayPublic = ndArray.toDoubleTensor() // public API, data copied twice
-        val sharedTensorArray = tensorArrayPublic.toDoubleTensor() // no data copied by matching type
+        val tensorArrayPublic = ndArray.asDoubleTensor() // public API, data copied twice
+        val sharedTensorArray = tensorArrayPublic.asDoubleTensor() // no data copied by matching type
 
         assertTrue(tensorArray.mutableBuffer.array() contentEquals sharedTensorArray.mutableBuffer.array())
 
-- 
2.34.1


From 3729faf49bfde2c4158d2ac446f93a37a1057daa Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 5 Sep 2022 23:24:01 +0300
Subject: [PATCH 617/713] Rename Tensor::get to Tensor::getTensor to avoid name
 clash.

---
 .../space/kscience/kmath/tensors/PCA.kt       |  6 ++---
 .../tensors/linearSystemSolvingWithLUP.kt     |  2 +-
 .../kscience/kmath/tensors/neuralNetwork.kt   |  2 +-
 .../space/kscience/kmath/misc/cumulative.kt   | 18 +++++++++++----
 .../kmath/multik/MultikTensorAlgebra.kt       |  8 ++++++-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |  5 +++-
 .../kmath/tensorflow/TensorFlowAlgebra.kt     |  7 +++++-
 .../kmath/tensors/api/TensorAlgebra.kt        | 21 +++++++++++++++--
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 23 +++++++++++++++----
 .../kmath/tensors/core/IntTensorAlgebra.kt    |  9 ++++++--
 .../kmath/tensors/core/internal/linUtils.kt   |  8 +++----
 .../kmath/tensors/core/TestDoubleTensor.kt    | 11 +++++----
 12 files changed, 90 insertions(+), 30 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index c4d0ed93e..e5d1ef9f8 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -58,7 +58,7 @@ fun main(): Unit = Double.tensorAlgebra.withBroadcast {  // work in context with
 
     // and find out eigenvector of it
     val (_, evecs) = covMatrix.symEig()
-    val v = evecs[0]
+    val v = evecs.getTensor(0)
     println("Eigenvector:\n$v")
 
     // reduce dimension of dataset
@@ -68,7 +68,7 @@ fun main(): Unit = Double.tensorAlgebra.withBroadcast {  // work in context with
     // we can restore original data from reduced data;
     // for example, find 7th element of dataset.
     val n = 7
-    val restored = (datasetReduced[n] dot v.view(intArrayOf(1, 2))) * std + mean
-    println("Original value:\n${dataset[n]}")
+    val restored = (datasetReduced.getTensor(n) dot v.view(intArrayOf(1, 2))) * std + mean
+    println("Original value:\n${dataset.getTensor(n)}")
     println("Restored value:\n$restored")
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
index a08fe4106..bafdf9b21 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
@@ -66,7 +66,7 @@ fun main() = Double.tensorAlgebra.withBroadcast {// work in context with linear
         val n = l.shape[0]
         val x = zeros(intArrayOf(n))
         for (i in 0 until n) {
-            x[intArrayOf(i)] = (b[intArrayOf(i)] - l[i].dot(x).value()) / l[intArrayOf(i, i)]
+            x[intArrayOf(i)] = (b[intArrayOf(i)] - l.getTensor(i).dot(x).value()) / l[intArrayOf(i, i)]
         }
         return x
     }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
index 502f6d53f..7289d86c4 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
@@ -197,7 +197,7 @@ fun main() = BroadcastDoubleTensorAlgebra {
     val y = fromArray(
         intArrayOf(sampleSize, 1),
         DoubleArray(sampleSize) { i ->
-            if (x[i].sum() > 0.0) {
+            if (x.getTensor(i).sum() > 0.0) {
                 1.0
             } else {
                 0.0
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
index 6ccb487c3..c05f1a6a9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/cumulative.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.misc
 
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.Buffer
 import kotlin.jvm.JvmName
 
 /**
@@ -42,8 +43,8 @@ public inline fun <T, R> List<T>.cumulative(initial: R, crossinline operation: (
 /**
  * Cumulative sum with custom space
  */
-public fun <T> Iterable<T>.cumulativeSum(group: Ring<T>): Iterable<T> =
-    group { cumulative(zero) { element: T, sum: T -> sum + element } }
+public fun <T> Iterable<T>.cumulativeSum(ring: Ring<T>): Iterable<T> =
+    ring { cumulative(zero) { element: T, sum: T -> sum + element } }
 
 @JvmName("cumulativeSumOfDouble")
 public fun Iterable<Double>.cumulativeSum(): Iterable<Double> = cumulative(0.0) { element, sum -> sum + element }
@@ -54,8 +55,8 @@ public fun Iterable<Int>.cumulativeSum(): Iterable<Int> = cumulative(0) { elemen
 @JvmName("cumulativeSumOfLong")
 public fun Iterable<Long>.cumulativeSum(): Iterable<Long> = cumulative(0L) { element, sum -> sum + element }
 
-public fun <T> Sequence<T>.cumulativeSum(group: Ring<T>): Sequence<T> =
-    group { cumulative(zero) { element: T, sum: T -> sum + element } }
+public fun <T> Sequence<T>.cumulativeSum(ring: Ring<T>): Sequence<T> =
+    ring { cumulative(zero) { element: T, sum: T -> sum + element } }
 
 @JvmName("cumulativeSumOfDouble")
 public fun Sequence<Double>.cumulativeSum(): Sequence<Double> = cumulative(0.0) { element, sum -> sum + element }
@@ -77,3 +78,12 @@ public fun List<Int>.cumulativeSum(): List<Int> = cumulative(0) { element, sum -
 
 @JvmName("cumulativeSumOfLong")
 public fun List<Long>.cumulativeSum(): List<Long> = cumulative(0L) { element, sum -> sum + element }
+
+
+public fun <T> Buffer<T>.cumulativeSum(ring: Ring<T>): Buffer<T> = with(ring) {
+    var accumulator: T = zero
+    return bufferFactory(size) {
+        accumulator += get(it)
+        accumulator
+    }
+}
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index c6266c985..e32221dbf 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -185,7 +185,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
     override fun StructureND<T>.unaryMinus(): MultikTensor<T> =
         asMultik().array.unaryMinus().wrap()
 
-    override fun Tensor<T>.get(i: Int): MultikTensor<T> = asMultik().array.mutableView(i).wrap()
+    override fun Tensor<T>.getTensor(i: Int): MultikTensor<T> = asMultik().array.mutableView(i).wrap()
 
     override fun Tensor<T>.transpose(i: Int, j: Int): MultikTensor<T> = asMultik().array.transpose(i, j).wrap()
 
@@ -246,6 +246,12 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
         return multikMath.minDN(asMultik().array, dim).wrap()
     }
 
+    override fun StructureND<T>.argMin(dim: Int, keepDim: Boolean): Tensor<Int> {
+        if (keepDim) TODO("keepDim not implemented")
+        val res = multikMath.argMinDN(asMultik().array, dim)
+        return with(MultikIntAlgebra(multikEngine)) { res.wrap() }
+    }
+
     override fun StructureND<T>.max(): T? = asMultik().array.max()
 
     override fun StructureND<T>.max(dim: Int, keepDim: Boolean): Tensor<T> {
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index 18068eaec..efd3ded70 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -95,7 +95,7 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
     }
 
     override fun StructureND<T>.unaryMinus(): Nd4jArrayStructure<T> = ndArray.neg().wrap()
-    override fun Tensor<T>.get(i: Int): Nd4jArrayStructure<T> = ndArray.slice(i.toLong()).wrap()
+    override fun Tensor<T>.getTensor(i: Int): Nd4jArrayStructure<T> = ndArray.slice(i.toLong()).wrap()
     override fun Tensor<T>.transpose(i: Int, j: Int): Nd4jArrayStructure<T> = ndArray.swapAxes(i, j).wrap()
     override fun StructureND<T>.dot(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.mmul(other.ndArray).wrap()
 
@@ -111,6 +111,9 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
     override fun Tensor<T>.view(shape: IntArray): Nd4jArrayStructure<T> = ndArray.reshape(shape).wrap()
     override fun Tensor<T>.viewAs(other: StructureND<T>): Nd4jArrayStructure<T> = view(other.shape)
 
+    override fun StructureND<T>.argMin(dim: Int, keepDim: Boolean): Tensor<Int> =
+        ndBase.get().argmin(ndArray, keepDim, dim).asIntStructure()
+
     override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<Int> =
         ndBase.get().argmax(ndArray, keepDim, dim).asIntStructure()
 
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index c6eaa7266..346750f88 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -184,7 +184,7 @@ public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal c
 
     override fun StructureND<T>.unaryMinus(): TensorFlowOutput<T, TT> = operate(ops.math::neg)
 
-    override fun Tensor<T>.get(i: Int): Tensor<T> = operate {
+    override fun Tensor<T>.getTensor(i: Int): Tensor<T> = operate {
         StridedSliceHelper.stridedSlice(ops.scope(), it, Indices.at(i.toLong()))
     }
 
@@ -238,6 +238,11 @@ public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal c
         ops.min(it, ops.constant(dim), Min.keepDims(keepDim))
     }
 
+    override fun StructureND<T>.argMin(dim: Int, keepDim: Boolean): Tensor<Int> = IntTensorFlowOutput(
+        graph,
+        ops.math.argMin(asTensorFlow().output, ops.constant(dim), TInt32::class.java).output()
+    ).actualTensor
+
     override fun StructureND<T>.max(): T = operate {
         ops.max(it, ops.constant(intArrayOf()))
     }.value()
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index dbc42f7c7..7615af2ea 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -166,7 +166,11 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param i index of the extractable tensor
      * @return subtensor of the original tensor with index [i]
      */
-    public operator fun Tensor<T>.get(i: Int): Tensor<T>
+    public fun Tensor<T>.getTensor(i: Int): Tensor<T>
+
+    public fun Tensor<T>.getTensor(first: Int, second: Int): Tensor<T> {
+        return getTensor(first).getTensor(second)
+    }
 
     /**
      * Returns a tensor that is a transposed version of this tensor. The given dimensions [i] and [j] are swapped.
@@ -286,6 +290,19 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      */
     public fun StructureND<T>.min(dim: Int, keepDim: Boolean): Tensor<T>
 
+    /**
+     * Returns the index of minimum value of each row of the input tensor in the given dimension [dim].
+     *
+     * If [keepDim] is true, the output tensor is of the same size as
+     * input except in the dimension [dim] where it is of size 1.
+     * Otherwise, [dim] is squeezed, resulting in the output tensor having 1 fewer dimension.
+     *
+     * @param dim the dimension to reduce.
+     * @param keepDim whether the output tensor has [dim] retained or not.
+     * @return the index of maximum value of each row of the input tensor in the given dimension [dim].
+     */
+    public fun StructureND<T>.argMin(dim: Int, keepDim: Boolean): Tensor<Int>
+
     /**
      * Returns the maximum value of all elements in the input tensor or null if there are no values
      */
@@ -320,4 +337,4 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
     override fun add(left: StructureND<T>, right: StructureND<T>): Tensor<T> = left + right
 
     override fun multiply(left: StructureND<T>, right: StructureND<T>): Tensor<T> = left * right
-}
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 096c97324..8acb15251 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -24,6 +24,7 @@ import kotlin.math.*
 /**
  * Implementation of basic operations over double tensors and basic algebra operations on them.
  */
+@OptIn(PerformancePitfall::class)
 public open class DoubleTensorAlgebra :
     TensorPartialDivisionAlgebra<Double, DoubleField>,
     AnalyticTensorAlgebra<Double, DoubleField>,
@@ -120,7 +121,7 @@ public open class DoubleTensorAlgebra :
         TensorLinearStructure(shape).asSequence().map { DoubleField.initializer(it) }.toMutableList().toDoubleArray()
     )
 
-    override operator fun Tensor<Double>.get(i: Int): DoubleTensor {
+    override fun Tensor<Double>.getTensor(i: Int): DoubleTensor {
         val lastShape = asDoubleTensor().shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
         val newStart = newShape.reduce(Int::times) * i + asDoubleTensor().bufferStart
@@ -204,7 +205,11 @@ public open class DoubleTensorAlgebra :
      * @return a copy of the `input` tensor with a copied buffer.
      */
     public fun StructureND<Double>.copy(): DoubleTensor =
-        DoubleTensor(asDoubleTensor().shape, asDoubleTensor().mutableBuffer.array().copyOf(), asDoubleTensor().bufferStart)
+        DoubleTensor(
+            asDoubleTensor().shape,
+            asDoubleTensor().mutableBuffer.array().copyOf(),
+            asDoubleTensor().bufferStart
+        )
 
     override fun Double.plus(arg: StructureND<Double>): DoubleTensor {
         val resBuffer = DoubleArray(arg.asDoubleTensor().numElements) { i ->
@@ -413,7 +418,10 @@ public open class DoubleTensorAlgebra :
     @UnstableKMathAPI
     public infix fun StructureND<Double>.matmul(other: StructureND<Double>): DoubleTensor {
         if (asDoubleTensor().shape.size == 1 && other.shape.size == 1) {
-            return DoubleTensor(intArrayOf(1), doubleArrayOf(asDoubleTensor().times(other).asDoubleTensor().mutableBuffer.array().sum()))
+            return DoubleTensor(
+                intArrayOf(1),
+                doubleArrayOf(asDoubleTensor().times(other).asDoubleTensor().mutableBuffer.array().sum())
+            )
         }
 
         var newThis = asDoubleTensor().copy()
@@ -592,7 +600,8 @@ public open class DoubleTensorAlgebra :
         check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
         val resShape = intArrayOf(tensors.size) + shape
         val resBuffer = tensors.flatMap {
-            it.asDoubleTensor().mutableBuffer.array().drop(it.asDoubleTensor().bufferStart).take(it.asDoubleTensor().numElements)
+            it.asDoubleTensor().mutableBuffer.array().drop(it.asDoubleTensor().bufferStart)
+                .take(it.asDoubleTensor().numElements)
         }.toDoubleArray()
         return DoubleTensor(resShape, resBuffer, 0)
     }
@@ -603,7 +612,7 @@ public open class DoubleTensorAlgebra :
      * @param indices the [IntArray] of 1-dimensional indices
      * @return tensor with rows corresponding to row by [indices]
      */
-    public fun Tensor<Double>.rowsByIndices(indices: IntArray): DoubleTensor = stack(indices.map { this[it] })
+    public fun Tensor<Double>.rowsByIndices(indices: IntArray): DoubleTensor = stack(indices.map { getTensor(it) })
 
     private inline fun StructureND<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
         foldFunction(asDoubleTensor().copyArray())
@@ -645,6 +654,10 @@ public open class DoubleTensorAlgebra :
     override fun StructureND<Double>.min(dim: Int, keepDim: Boolean): DoubleTensor =
         foldDim(dim, keepDim) { x -> x.minOrNull()!! }.asDoubleTensor()
 
+    override fun StructureND<Double>.argMin(dim: Int, keepDim: Boolean): Tensor<Int> = foldDim(dim, keepDim) { x ->
+        x.withIndex().minByOrNull { it.value }?.index!!
+    }.asIntTensor()
+
     override fun StructureND<Double>.max(): Double = this.fold { it.maxOrNull()!! }
 
     override fun StructureND<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
index 194f2bd18..3ddbd3301 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
@@ -118,7 +118,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
         TensorLinearStructure(shape).asSequence().map { IntRing.initializer(it) }.toMutableList().toIntArray()
     )
 
-    override operator fun Tensor<Int>.get(i: Int): IntTensor {
+    override fun Tensor<Int>.getTensor(i: Int): IntTensor {
         val lastShape = asIntTensor().shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
         val newStart = newShape.reduce(Int::times) * i + asIntTensor().bufferStart
@@ -433,7 +433,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @param indices the [IntArray] of 1-dimensional indices
      * @return tensor with rows corresponding to row by [indices]
      */
-    public fun Tensor<Int>.rowsByIndices(indices: IntArray): IntTensor = stack(indices.map { this[it] })
+    public fun Tensor<Int>.rowsByIndices(indices: IntArray): IntTensor = stack(indices.map { getTensor(it) })
 
     private inline fun StructureND<Int>.fold(foldFunction: (IntArray) -> Int): Int =
         foldFunction(asIntTensor().copyArray())
@@ -475,6 +475,11 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
     override fun StructureND<Int>.min(dim: Int, keepDim: Boolean): IntTensor =
         foldDim(dim, keepDim) { x -> x.minOrNull()!! }.asIntTensor()
 
+    override fun StructureND<Int>.argMin(dim: Int, keepDim: Boolean): IntTensor =
+        foldDim(dim, keepDim) { x ->
+            x.withIndex().minByOrNull { it.value }?.index!!
+        }.asIntTensor()
+
     override fun StructureND<Int>.max(): Int = this.fold { it.maxOrNull()!! }
 
     override fun StructureND<Int>.max(dim: Int, keepDim: Boolean): IntTensor =
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index 49d67c205..ec529590f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -257,13 +257,13 @@ internal fun DoubleTensorAlgebra.qrHelper(
     val qT = q.transpose(0, 1)
 
     for (j in 0 until n) {
-        val v = matrixT[j]
+        val v = matrixT.getTensor(j)
         val vv = v.as1D()
         if (j > 0) {
             for (i in 0 until j) {
-                r[i, j] = (qT[i] dot matrixT[j]).value()
+                r[i, j] = (qT.getTensor(i) dot matrixT.getTensor(j)).value()
                 for (k in 0 until n) {
-                    val qTi = qT[i].as1D()
+                    val qTi = qT.getTensor(i).as1D()
                     vv[k] = vv[k] - r[i, j] * qTi[k]
                 }
             }
@@ -313,7 +313,7 @@ internal fun DoubleTensorAlgebra.svdHelper(
             val outerProduct = DoubleArray(u.shape[0] * v.shape[0])
             for (i in 0 until u.shape[0]) {
                 for (j in 0 until v.shape[0]) {
-                    outerProduct[i * v.shape[0] + j] = u[i].value() * v[j].value()
+                    outerProduct[i * v.shape[0] + j] = u.getTensor(i).value() * v.getTensor(j).value()
                 }
             }
             a = a - singularValue.times(DoubleTensor(intArrayOf(u.shape[0], v.shape[0]), outerProduct))
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 61248cbb8..efdf6ba81 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -36,17 +36,18 @@ internal class TestDoubleTensor {
         val tensor = fromArray(intArrayOf(2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
         assertEquals(tensor[intArrayOf(0, 1)], 5.8)
         assertTrue(
-            tensor.elements().map { it.second }.toList().toDoubleArray() contentEquals tensor.mutableBuffer.toDoubleArray()
+            tensor.elements().map { it.second }.toList()
+                .toDoubleArray() contentEquals tensor.mutableBuffer.toDoubleArray()
         )
     }
 
     @Test
     fun testGet() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(1, 2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
-        val matrix = tensor[0].as2D()
+        val matrix = tensor.getTensor(0).as2D()
         assertEquals(matrix[0, 1], 5.8)
 
-        val vector = tensor[0][1].as1D()
+        val vector = tensor.getTensor(0, 1).as1D()
         assertEquals(vector[0], 58.4)
 
         matrix[0, 1] = 77.89
@@ -57,8 +58,8 @@ internal class TestDoubleTensor {
 
         tensor.matrixSequence().forEach {
             val a = it.toTensor()
-            val secondRow = a[1].as1D()
-            val secondColumn = a.transpose(0, 1)[1].as1D()
+            val secondRow = a.getTensor(1).as1D()
+            val secondColumn = a.transpose(0, 1).getTensor(1).as1D()
             assertEquals(secondColumn[0], 77.89)
             assertEquals(secondRow[1], secondColumn[1])
         }
-- 
2.34.1


From b5d04ba02cd325d71120819563db8a305a54688b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 11 Sep 2022 15:27:38 +0300
Subject: [PATCH 618/713] Global refactor of tensors

---
 CHANGELOG.md                                  |   1 +
 build.gradle.kts                              |  15 +-
 .../kscience/kmath/tensors/OLSWithSVD.kt      |   2 +-
 .../space/kscience/kmath/tensors/PCA.kt       |   2 +-
 .../tensors/linearSystemSolvingWithLUP.kt     |   2 +-
 .../kscience/kmath/tensors/neuralNetwork.kt   |  19 +-
 .../space/kscience/kmath/nd/StructureND.kt    |  17 +-
 .../space/kscience/kmath/structures/Buffer.kt |   1 -
 .../kscience/kmath/structures/DoubleBuffer.kt |   5 -
 .../kscience/kmath/structures/IntBuffer.kt    |   3 +-
 .../kmath/structures/NumberNDFieldTest.kt     |   4 +-
 kmath-for-real/build.gradle.kts               |  16 +-
 .../kscience/kmath/real/DoubleMatrixTest.kt   |   2 +-
 .../kmath/multik/MultikTensorAlgebra.kt       |  32 +-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |   2 +-
 .../kmath/tensorflow/TensorFlowAlgebra.kt     |   2 +-
 kmath-tensors/build.gradle.kts                |   6 +
 .../kmath/tensors/api/TensorAlgebra.kt        |   2 +-
 .../core/BroadcastDoubleTensorAlgebra.kt      |  38 +-
 .../kmath/tensors/core/BufferedTensor.kt      |  14 +-
 .../kmath/tensors/core/DoubleTensor.kt        |  82 ++-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 653 +++++++-----------
 .../kscience/kmath/tensors/core/IntTensor.kt  |  88 ++-
 .../kmath/tensors/core/IntTensorAlgebra.kt    | 307 ++++----
 .../tensors/core/internal/broadcastUtils.kt   |  21 +-
 .../kmath/tensors/core/internal/checks.kt     |  17 +-
 .../core/internal/doubleTensorHelpers.kt      | 189 +++++
 .../tensors/core/internal/intTensorHelpers.kt |  64 ++
 .../kmath/tensors/core/internal/linUtils.kt   |  94 +--
 .../tensors/core/internal/tensorCastsUtils.kt |  37 -
 .../kmath/tensors/core/internal/utils.kt      |  35 +-
 .../kmath/tensors/core/tensorCasts.kt         |  46 --
 .../kmath/tensors/core/tensorTransform.kt     |  55 ++
 .../kmath/tensors/core/TestBroadcasting.kt    |  29 +-
 .../core/TestDoubleAnalyticTensorAlgebra.kt   |  87 ++-
 .../core/TestDoubleLinearOpsAlgebra.kt        |  19 +-
 .../kmath/tensors/core/TestDoubleTensor.kt    |  17 +-
 .../tensors/core/TestDoubleTensorAlgebra.kt   | 108 +--
 .../tensors/core/offsetBufferEquality.kt      |  24 +
 .../src/commonMain/kotlin/bufferEquality.kt   |  20 +
 40 files changed, 1183 insertions(+), 994 deletions(-)
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
 delete mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
 delete mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt
 create mode 100644 kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/offsetBufferEquality.kt
 create mode 100644 test-utils/src/commonMain/kotlin/bufferEquality.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acec30836..feb925436 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Algebra now has an obligatory `bufferFactory` (#477).
 
 ### Changed
+- Major refactor of tensors (only minor API changes)
 - Kotlin 1.7.20
 - `LazyStructure` `deffered` -> `async` to comply with coroutines code style
 - Default `dot` operation in tensor algebra no longer support broadcasting. Instead `matmul` operation is added to `DoubleTensorAlgebra`.
diff --git a/build.gradle.kts b/build.gradle.kts
index 890824d65..120b0f35d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,9 +1,10 @@
+import space.kscience.gradle.isInDevelopment
 import space.kscience.gradle.useApache2Licence
 import space.kscience.gradle.useSPCTeam
 
 plugins {
     id("space.kscience.gradle.project")
-    id("org.jetbrains.kotlinx.kover") version "0.5.0"
+    id("org.jetbrains.kotlinx.kover") version "0.6.0"
 }
 
 allprojects {
@@ -14,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.1-dev-3"
+    version = "0.3.1-dev-4"
 }
 
 subprojects {
@@ -75,8 +76,14 @@ ksciencePublish {
         useApache2Licence()
         useSPCTeam()
     }
-    github("kmath", "SciProgCentre", addToRelease = false)
-    space("https://maven.pkg.jetbrains.space/mipt-npm/p/sci/dev")
+    github("kmath", "SciProgCentre")
+    space(
+        if (isInDevelopment) {
+            "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/dev"
+        } else {
+            "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/release"
+        }
+    )
     sonatype()
 }
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index 8082ed8e2..d0b24de70 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -52,7 +52,7 @@ fun main() {
         // inverse Sigma matrix can be restored from singular values with diagonalEmbedding function
         val sigma = diagonalEmbedding(singValues.map{ if (abs(it) < 1e-3) 0.0 else 1.0/it })
 
-        val alphaOLS = v dot sigma dot u.transpose() dot y
+        val alphaOLS = v dot sigma dot u.transposed() dot y
         println("Estimated alpha:\n" +
                 "$alphaOLS")
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index e5d1ef9f8..1768be283 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -27,7 +27,7 @@ fun main(): Unit = Double.tensorAlgebra.withBroadcast {  // work in context with
     println("y:\n$y")
 
     // stack them into single dataset
-    val dataset = stack(listOf(x, y)).transpose()
+    val dataset = stack(listOf(x, y)).transposed()
 
     // normalize both x and y
     val xMean = x.mean()
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
index bafdf9b21..64cc138d7 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
@@ -75,7 +75,7 @@ fun main() = Double.tensorAlgebra.withBroadcast {// work in context with linear
 
     // solveLT(l, b) function can be easily adapted for upper triangular matrix by the permutation matrix revMat
     // create it by placing ones on side diagonal
-    val revMat = u.zeroesLike()
+    val revMat = zeroesLike(u)
     val n = revMat.shape[0]
     for (i in 0 until n) {
         revMat[intArrayOf(i, n - 1 - i)] = 1.0
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
index 7289d86c4..84d6dcd22 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
@@ -3,16 +3,14 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:OptIn(PerformancePitfall::class)
-
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
-import space.kscience.kmath.tensors.core.copyArray
+import space.kscience.kmath.tensors.core.toDoubleTensor
 import kotlin.math.sqrt
 
 const val seed = 100500L
@@ -82,9 +80,9 @@ class Dense(
     }
 
     override fun backward(input: DoubleTensor, outputError: DoubleTensor): DoubleTensor = DoubleTensorAlgebra {
-        val gradInput = outputError dot weights.transpose()
+        val gradInput = outputError dot weights.transposed()
 
-        val gradW = input.transpose() dot outputError
+        val gradW = input.transposed() dot outputError
         val gradBias = outputError.mean(dim = 0, keepDim = false) * input.shape[0].toDouble()
 
         weights -= learningRate * gradW
@@ -109,12 +107,11 @@ fun accuracy(yPred: DoubleTensor, yTrue: DoubleTensor): Double {
 }
 
 // neural network class
-@OptIn(ExperimentalStdlibApi::class)
 class NeuralNetwork(private val layers: List<Layer>) {
     private fun softMaxLoss(yPred: DoubleTensor, yTrue: DoubleTensor): DoubleTensor = BroadcastDoubleTensorAlgebra {
 
-        val onesForAnswers = yPred.zeroesLike()
-        yTrue.copyArray().forEachIndexed { index, labelDouble ->
+        val onesForAnswers = zeroesLike(yPred)
+        yTrue.source.asIterable().forEachIndexed { index, labelDouble ->
             val label = labelDouble.toInt()
             onesForAnswers[intArrayOf(index, label)] = 1.0
         }
@@ -166,7 +163,7 @@ class NeuralNetwork(private val layers: List<Layer>) {
             for ((xBatch, yBatch) in iterBatch(xTrain, yTrain)) {
                 train(xBatch, yBatch)
             }
-            println("Accuracy:${accuracy(yTrain, predict(xTrain).argMax(1, true).asDouble())}")
+            println("Accuracy:${accuracy(yTrain, predict(xTrain).argMax(1, true).toDoubleTensor())}")
         }
     }
 
@@ -233,7 +230,7 @@ fun main() = BroadcastDoubleTensorAlgebra {
     val prediction = model.predict(xTest)
 
     // process raw prediction via argMax
-    val predictionLabels = prediction.argMax(1, true).asDouble()
+    val predictionLabels = prediction.argMax(1, true).toDoubleTensor()
 
     // find out accuracy
     val acc = accuracy(yTest, predictionLabels)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index aece10c2e..b2da083bb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -237,19 +237,4 @@ public interface MutableStructureND<T> : StructureND<T> {
  */
 public operator fun <T> MutableStructureND<T>.set(vararg index: Int, value: T) {
     set(index, value)
-}
-
-/**
- * Transform a structure element-by element in place.
- */
-@OptIn(PerformancePitfall::class)
-public inline fun <T> MutableStructureND<T>.mapInPlace(action: (index: IntArray, t: T) -> T): Unit =
-    elements().forEach { (index, oldValue) -> this[index] = action(index, oldValue) }
-
-public inline fun <reified T : Any> StructureND<T>.zip(
-    struct: StructureND<T>,
-    crossinline block: (T, T) -> T,
-): StructureND<T> {
-    require(shape.contentEquals(struct.shape)) { "Shape mismatch in structure combination" }
-    return StructureND.auto(shape) { block(this[it], struct[it]) }
-}
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index 2f9f8a8e0..5cfafe5a5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -114,7 +114,6 @@ public interface Buffer<out T> {
          *
          * The [size] is specified, and each element is calculated by calling the specified [initializer] function.
          */
-        @Suppress("UNCHECKED_CAST")
         public inline fun <reified T : Any> auto(size: Int, initializer: (Int) -> T): Buffer<T> =
             auto(T::class, size, initializer)
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
index e39c22158..4dd9003f3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
@@ -47,11 +47,6 @@ public inline fun DoubleBuffer(size: Int, init: (Int) -> Double): DoubleBuffer =
  */
 public fun DoubleBuffer(vararg doubles: Double): DoubleBuffer = DoubleBuffer(doubles)
 
-/**
- * Simplified [DoubleBuffer] to array comparison
- */
-public fun DoubleBuffer.contentEquals(vararg doubles: Double): Boolean = array.contentEquals(doubles)
-
 /**
  * Returns a new [DoubleArray] containing all the elements of this [Buffer].
  */
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
index 8477fc13b..f80ad0ff7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/IntBuffer.kt
@@ -24,8 +24,7 @@ public value class IntBuffer(public val array: IntArray) : MutableBuffer<Int> {
 
     override operator fun iterator(): IntIterator = array.iterator()
 
-    override fun copy(): MutableBuffer<Int> =
-        IntBuffer(array.copyOf())
+    override fun copy(): IntBuffer = IntBuffer(array.copyOf())
 }
 
 /**
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index 62c4811e8..a54af571e 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -74,7 +74,9 @@ class NumberNDFieldTest {
 
     @Test
     fun combineTest() {
-        val division = array1.zip(array2, Double::div)
+        algebra {
+            val division = zip(array1, array2) { l, r -> l / r }
+        }
     }
 
     object L2Norm : Norm<StructureND<Number>, Double> {
diff --git a/kmath-for-real/build.gradle.kts b/kmath-for-real/build.gradle.kts
index 308b8d732..1e964d99c 100644
--- a/kmath-for-real/build.gradle.kts
+++ b/kmath-for-real/build.gradle.kts
@@ -2,13 +2,13 @@ plugins {
     id("space.kscience.gradle.mpp")
 }
 
-kscience{
+kscience {
     native()
-}
-
-kotlin.sourceSets.commonMain {
     dependencies {
-        api(project(":kmath-core"))
+        api(projects.kmathCore)
+    }
+    dependencies("commonTest") {
+        implementation(projects.testUtils)
     }
 }
 
@@ -24,21 +24,21 @@ readme {
     feature(
         id = "DoubleVector",
         ref = "src/commonMain/kotlin/space/kscience/kmath/real/DoubleVector.kt"
-    ){
+    ) {
         "Numpy-like operations for Buffers/Points"
     }
 
     feature(
         id = "DoubleMatrix",
         ref = "src/commonMain/kotlin/space/kscience/kmath/real/DoubleMatrix.kt"
-    ){
+    ) {
         "Numpy-like operations for 2d real structures"
     }
 
     feature(
         id = "grids",
         ref = "src/commonMain/kotlin/space/kscience/kmath/structures/grids.kt"
-    ){
+    ) {
         "Uniform grid generators"
     }
 }
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
index 89e55c6d4..0d016116d 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
@@ -11,7 +11,7 @@ import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.algebra
-import space.kscience.kmath.structures.contentEquals
+import space.kscience.kmath.testutils.contentEquals
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index e32221dbf..194c5fcee 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -72,6 +72,20 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
             }
         }
 
+    /**
+     * Transform a structure element-by element in place.
+     */
+    public inline fun <T> MutableStructureND<T>.mapIndexedInPlace(operation: (index: IntArray, t: T) -> T): Unit {
+        if (this is MultikTensor) {
+            array.multiIndices.iterator().forEach {
+                set(it, operation(it, get(it)))
+            }
+        } else {
+            indices.forEach { set(it, operation(it, get(it))) }
+        }
+    }
+
+
     @OptIn(PerformancePitfall::class)
     override fun zip(left: StructureND<T>, right: StructureND<T>, transform: A.(T, T) -> T): MultikTensor<T> {
         require(left.shape.contentEquals(right.shape)) { "ND array shape mismatch" } //TODO replace by ShapeMismatchException
@@ -121,7 +135,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
         if (this is MultikTensor) {
             array.plusAssign(value)
         } else {
-            mapInPlace { _, t -> elementAlgebra.add(t, value) }
+            mapIndexedInPlace { _, t -> elementAlgebra.add(t, value) }
         }
     }
 
@@ -129,7 +143,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
         if (this is MultikTensor) {
             array.plusAssign(arg.asMultik().array)
         } else {
-            mapInPlace { index, t -> elementAlgebra.add(t, arg[index]) }
+            mapIndexedInPlace { index, t -> elementAlgebra.add(t, arg[index]) }
         }
     }
 
@@ -145,7 +159,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
         if (this is MultikTensor) {
             array.minusAssign(value)
         } else {
-            mapInPlace { _, t -> elementAlgebra.run { t - value } }
+            mapIndexedInPlace { _, t -> elementAlgebra.run { t - value } }
         }
     }
 
@@ -153,7 +167,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
         if (this is MultikTensor) {
             array.minusAssign(arg.asMultik().array)
         } else {
-            mapInPlace { index, t -> elementAlgebra.run { t - arg[index] } }
+            mapIndexedInPlace { index, t -> elementAlgebra.run { t - arg[index] } }
         }
     }
 
@@ -170,7 +184,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
         if (this is MultikTensor) {
             array.timesAssign(value)
         } else {
-            mapInPlace { _, t -> elementAlgebra.multiply(t, value) }
+            mapIndexedInPlace { _, t -> elementAlgebra.multiply(t, value) }
         }
     }
 
@@ -178,7 +192,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
         if (this is MultikTensor) {
             array.timesAssign(arg.asMultik().array)
         } else {
-            mapInPlace { index, t -> elementAlgebra.multiply(t, arg[index]) }
+            mapIndexedInPlace { index, t -> elementAlgebra.multiply(t, arg[index]) }
         }
     }
 
@@ -187,7 +201,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
 
     override fun Tensor<T>.getTensor(i: Int): MultikTensor<T> = asMultik().array.mutableView(i).wrap()
 
-    override fun Tensor<T>.transpose(i: Int, j: Int): MultikTensor<T> = asMultik().array.transpose(i, j).wrap()
+    override fun Tensor<T>.transposed(i: Int, j: Int): MultikTensor<T> = asMultik().array.transpose(i, j).wrap()
 
     override fun Tensor<T>.view(shape: IntArray): MultikTensor<T> {
         require(shape.all { it > 0 })
@@ -283,7 +297,7 @@ public abstract class MultikDivisionTensorAlgebra<T, A : Field<T>>(
         if (this is MultikTensor) {
             array.divAssign(value)
         } else {
-            mapInPlace { _, t -> elementAlgebra.divide(t, value) }
+            mapIndexedInPlace { _, t -> elementAlgebra.divide(t, value) }
         }
     }
 
@@ -291,7 +305,7 @@ public abstract class MultikDivisionTensorAlgebra<T, A : Field<T>>(
         if (this is MultikTensor) {
             array.divAssign(arg.asMultik().array)
         } else {
-            mapInPlace { index, t -> elementAlgebra.divide(t, arg[index]) }
+            mapIndexedInPlace { index, t -> elementAlgebra.divide(t, arg[index]) }
         }
     }
 }
\ No newline at end of file
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index efd3ded70..c1772683f 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -96,7 +96,7 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
 
     override fun StructureND<T>.unaryMinus(): Nd4jArrayStructure<T> = ndArray.neg().wrap()
     override fun Tensor<T>.getTensor(i: Int): Nd4jArrayStructure<T> = ndArray.slice(i.toLong()).wrap()
-    override fun Tensor<T>.transpose(i: Int, j: Int): Nd4jArrayStructure<T> = ndArray.swapAxes(i, j).wrap()
+    override fun Tensor<T>.transposed(i: Int, j: Int): Nd4jArrayStructure<T> = ndArray.swapAxes(i, j).wrap()
     override fun StructureND<T>.dot(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.mmul(other.ndArray).wrap()
 
     override fun StructureND<T>.min(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index 346750f88..74fcf2d7d 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -188,7 +188,7 @@ public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal c
         StridedSliceHelper.stridedSlice(ops.scope(), it, Indices.at(i.toLong()))
     }
 
-    override fun Tensor<T>.transpose(i: Int, j: Int): Tensor<T> = operate {
+    override fun Tensor<T>.transposed(i: Int, j: Int): Tensor<T> = operate {
         ops.linalg.transpose(it, ops.constant(intArrayOf(i, j)))
     }
 
diff --git a/kmath-tensors/build.gradle.kts b/kmath-tensors/build.gradle.kts
index 78ea4ba42..1060b37b4 100644
--- a/kmath-tensors/build.gradle.kts
+++ b/kmath-tensors/build.gradle.kts
@@ -25,6 +25,12 @@ kotlin.sourceSets {
             api(project(":kmath-stat"))
         }
     }
+
+    commonTest{
+        dependencies{
+            implementation(projects.testUtils)
+        }
+    }
 }
 
 readme {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 7615af2ea..70b985a54 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -180,7 +180,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param j the second dimension to be transposed
      * @return transposed tensor
      */
-    public fun Tensor<T>.transpose(i: Int = -2, j: Int = -1): Tensor<T>
+    public fun Tensor<T>.transposed(i: Int = -2, j: Int = -1): Tensor<T>
 
     /**
      * Returns a new tensor with the same data as the self tensor but of a different shape.
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index 31e5b6e69..f337a2175 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -7,8 +7,8 @@ package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.tensors.api.Tensor
-import space.kscience.kmath.tensors.core.internal.array
 import space.kscience.kmath.tensors.core.internal.broadcastTensors
 import space.kscience.kmath.tensors.core.internal.broadcastTo
 
@@ -22,8 +22,8 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(asDoubleTensor(), arg.asDoubleTensor())
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
-            newThis.mutableBuffer.array()[i] + newOther.mutableBuffer.array()[i]
+        val resBuffer = DoubleBuffer(newThis.indices.linearSize) { i ->
+            newThis.source[i] + newOther.source[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
@@ -31,8 +31,7 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
     override fun Tensor<Double>.plusAssign(arg: StructureND<Double>) {
         val newOther = broadcastTo(arg.asDoubleTensor(), asDoubleTensor().shape)
         for (i in 0 until asDoubleTensor().indices.linearSize) {
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] +=
-                newOther.mutableBuffer.array()[asDoubleTensor().bufferStart + i]
+            asDoubleTensor().source[i] += newOther.source[i]
         }
     }
 
@@ -40,17 +39,16 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(asDoubleTensor(), arg.asDoubleTensor())
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
-            newThis.mutableBuffer.array()[i] - newOther.mutableBuffer.array()[i]
+        val resBuffer = DoubleBuffer(newThis.indices.linearSize) { i ->
+            newThis.source[i] - newOther.source[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
     override fun Tensor<Double>.minusAssign(arg: StructureND<Double>) {
         val newOther = broadcastTo(arg.asDoubleTensor(), asDoubleTensor().shape)
-        for (i in 0 until asDoubleTensor().indices.linearSize) {
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] -=
-                newOther.mutableBuffer.array()[asDoubleTensor().bufferStart + i]
+        for (i in 0 until indices.linearSize) {
+            asDoubleTensor().source[i] -= newOther.source[i]
         }
     }
 
@@ -58,18 +56,16 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(asDoubleTensor(), arg.asDoubleTensor())
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
-            newThis.mutableBuffer.array()[newThis.bufferStart + i] *
-                    newOther.mutableBuffer.array()[newOther.bufferStart + i]
+        val resBuffer = DoubleBuffer(newThis.indices.linearSize) { i ->
+            newThis.source[i] * newOther.source[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
     override fun Tensor<Double>.timesAssign(arg: StructureND<Double>) {
         val newOther = broadcastTo(arg.asDoubleTensor(), asDoubleTensor().shape)
-        for (i in 0 until asDoubleTensor().indices.linearSize) {
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] *=
-                newOther.mutableBuffer.array()[asDoubleTensor().bufferStart + i]
+        for (i in 0 until indices.linearSize) {
+            asDoubleTensor().source[+i] *= newOther.source[i]
         }
     }
 
@@ -77,18 +73,16 @@ public object BroadcastDoubleTensorAlgebra : DoubleTensorAlgebra() {
         val broadcast = broadcastTensors(asDoubleTensor(), arg.asDoubleTensor())
         val newThis = broadcast[0]
         val newOther = broadcast[1]
-        val resBuffer = DoubleArray(newThis.indices.linearSize) { i ->
-            newThis.mutableBuffer.array()[newOther.bufferStart + i] /
-                    newOther.mutableBuffer.array()[newOther.bufferStart + i]
+        val resBuffer = DoubleBuffer(newThis.indices.linearSize) { i ->
+            newThis.source[i] / newOther.source[i]
         }
         return DoubleTensor(newThis.shape, resBuffer)
     }
 
     override fun Tensor<Double>.divAssign(arg: StructureND<Double>) {
         val newOther = broadcastTo(arg.asDoubleTensor(), asDoubleTensor().shape)
-        for (i in 0 until asDoubleTensor().indices.linearSize) {
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] /=
-                newOther.mutableBuffer.array()[asDoubleTensor().bufferStart + i]
+        for (i in 0 until indices.linearSize) {
+            asDoubleTensor().source[i] /= newOther.source[i]
         }
     }
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 98e6ab430..0b043db56 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -13,12 +13,12 @@ import space.kscience.kmath.tensors.api.Tensor
 /**
  * Represents [Tensor] over a [MutableBuffer] intended to be used through [DoubleTensor] and [IntTensor]
  */
-public open class BufferedTensor<T> internal constructor(
+public abstract class BufferedTensor<T>(
     override val shape: IntArray,
-    @PublishedApi internal val mutableBuffer: MutableBuffer<T>,
-    @PublishedApi internal val bufferStart: Int,
 ) : Tensor<T> {
 
+    public abstract val source: MutableBuffer<T>
+
     /**
      * Buffer strides based on [TensorLinearStructure] implementation
      */
@@ -27,14 +27,8 @@ public open class BufferedTensor<T> internal constructor(
     /**
      * Number of elements in tensor
      */
-    public val numElements: Int
-        get() = indices.linearSize
+    public val linearSize: Int get() = indices.linearSize
 
-    override fun get(index: IntArray): T = mutableBuffer[bufferStart + indices.offset(index)]
-
-    override fun set(index: IntArray, value: T) {
-        mutableBuffer[bufferStart + indices.offset(index)] = value
-    }
 
     @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, T>> = indices.asSequence().map {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
index e8239caf4..e9589eb0a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -5,16 +5,88 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.core.internal.toPrettyString
 
+public class OffsetDoubleBuffer(
+    private val source: DoubleBuffer,
+    private val offset: Int,
+    override val size: Int,
+) : MutableBuffer<Double> {
+
+    init {
+        require(offset >= 0) { "Offset must be non-negative" }
+        require(size >= 0) { "Size must be non-negative" }
+        require(offset + size <= source.size) { "Maximum index must be inside source dimension" }
+    }
+
+    override fun set(index: Int, value: Double) {
+        require(index in 0 until size) { "Index must be in [0, size)" }
+        source[index + offset] = value
+    }
+
+    override fun get(index: Int): Double = source[index + offset]
+
+    /**
+     * Copy only a part of buffer that belongs to this tensor
+     */
+    override fun copy(): DoubleBuffer = source.array.copyOfRange(offset, offset + size).asBuffer()
+
+    override fun iterator(): Iterator<Double> = iterator {
+        for (i in indices) {
+            yield(get(i))
+        }
+    }
+
+    override fun toString(): String = Buffer.toString(this)
+
+    public fun view(addOffset: Int, newSize: Int = size - addOffset): OffsetDoubleBuffer =
+        OffsetDoubleBuffer(source, offset + addOffset, newSize)
+}
+
+public fun OffsetDoubleBuffer.slice(range: IntRange): OffsetDoubleBuffer = view(range.first, range.last - range.first)
+
+/**
+ * Map only operable content of the offset buffer
+ */
+public inline fun OffsetDoubleBuffer.map(operation: (Double) -> Double): DoubleBuffer =
+    DoubleBuffer(size) { operation(get(it)) }
+
+public inline fun OffsetDoubleBuffer.zip(
+    other: OffsetDoubleBuffer,
+    operation: (l: Double, r: Double) -> Double,
+): DoubleBuffer {
+    require(size == other.size) { "The sizes of zipped buffers must be the same" }
+    return DoubleBuffer(size) { operation(get(it), other[it]) }
+}
+
+/**
+ * map in place
+ */
+public inline fun OffsetDoubleBuffer.mapInPlace(operation: (Double) -> Double) {
+    indices.forEach { set(it, operation(get(it))) }
+}
+
 /**
  * Default [BufferedTensor] implementation for [Double] values
  */
-public class DoubleTensor @PublishedApi internal constructor(
+public class DoubleTensor(
     shape: IntArray,
-    buffer: DoubleArray,
-    offset: Int = 0
-) : BufferedTensor<Double>(shape, DoubleBuffer(buffer), offset) {
+    override val source: OffsetDoubleBuffer,
+) : BufferedTensor<Double>(shape) {
+
+    init {
+        require(linearSize == source.size) { "Source buffer size must be equal tensor size" }
+    }
+
+    public constructor(shape: IntArray, buffer: DoubleBuffer) : this(shape, OffsetDoubleBuffer(buffer, 0, buffer.size))
+
+    override fun get(index: IntArray): Double = this.source[indices.offset(index)]
+
+    override fun set(index: IntArray, value: Double) {
+        source[indices.offset(index)] = value
+    }
+
+
     override fun toString(): String = toPrettyString()
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 8acb15251..d758c49a1 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -12,8 +12,7 @@ import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.structures.MutableBuffer
-import space.kscience.kmath.structures.indices
+import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
 import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
 import space.kscience.kmath.tensors.api.Tensor
@@ -41,56 +40,64 @@ public open class DoubleTensorAlgebra :
      * @param transform the function to be applied to each element of the tensor.
      * @return the resulting tensor after applying the function.
      */
-    @PerformancePitfall
     @Suppress("OVERRIDE_BY_INLINE")
     final override inline fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): DoubleTensor {
-        val tensor = this.asDoubleTensor()
+        val tensor = asDoubleTensor()
         //TODO remove additional copy
-        val sourceArray = tensor.copyArray()
-        val array = DoubleArray(tensor.numElements) { DoubleField.transform(sourceArray[it]) }
+        val array = DoubleBuffer(tensor.source.size) { DoubleField.transform(tensor.source[it]) }
         return DoubleTensor(
             tensor.shape,
             array,
-            tensor.bufferStart
         )
     }
 
-    @PerformancePitfall
+    public inline fun Tensor<Double>.mapInPlace(operation: (Double) -> Double) {
+        if (this is DoubleTensor) {
+            source.mapInPlace(operation)
+        } else {
+            indices.forEach { set(it, operation(get(it))) }
+        }
+    }
+
+    public inline fun Tensor<Double>.mapIndexedInPlace(operation: (IntArray, Double) -> Double) {
+        indices.forEach { set(it, operation(it, get(it))) }
+    }
+
     @Suppress("OVERRIDE_BY_INLINE")
     final override inline fun StructureND<Double>.mapIndexed(transform: DoubleField.(index: IntArray, Double) -> Double): DoubleTensor {
         val tensor = this.asDoubleTensor()
         //TODO remove additional copy
-        val sourceArray = tensor.copyArray()
-        val array = DoubleArray(tensor.numElements) { DoubleField.transform(tensor.indices.index(it), sourceArray[it]) }
-        return DoubleTensor(
-            tensor.shape,
-            array,
-            tensor.bufferStart
-        )
+        val buffer = DoubleBuffer(tensor.source.size) {
+            DoubleField.transform(tensor.indices.index(it), tensor.source[it])
+        }
+        return DoubleTensor(tensor.shape, buffer)
     }
 
-    @PerformancePitfall
-    override fun zip(
+    @Suppress("OVERRIDE_BY_INLINE")
+    final override inline fun zip(
         left: StructureND<Double>,
         right: StructureND<Double>,
         transform: DoubleField.(Double, Double) -> Double,
     ): DoubleTensor {
-        require(left.shape.contentEquals(right.shape)) {
-            "The shapes in zip are not equal: left - ${left.shape}, right - ${right.shape}"
-        }
+        checkShapesCompatible(left, right)
+
         val leftTensor = left.asDoubleTensor()
-        val leftArray = leftTensor.copyArray()
         val rightTensor = right.asDoubleTensor()
-        val rightArray = rightTensor.copyArray()
-        val array = DoubleArray(leftTensor.numElements) { DoubleField.transform(leftArray[it], rightArray[it]) }
-        return DoubleTensor(
-            leftTensor.shape,
-            array
-        )
+        val buffer = DoubleBuffer(leftTensor.source.size) {
+            DoubleField.transform(leftTensor.source[it], rightTensor.source[it])
+        }
+        return DoubleTensor(leftTensor.shape, buffer)
     }
 
-    override fun StructureND<Double>.valueOrNull(): Double? = if (asDoubleTensor().shape contentEquals intArrayOf(1))
-        asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart] else null
+
+    public inline fun StructureND<Double>.reduceElements(transform: (DoubleBuffer) -> Double): Double =
+        transform(asDoubleTensor().source.copy())
+    //TODO do we need protective copy?
+
+    override fun StructureND<Double>.valueOrNull(): Double? {
+        val dt = asDoubleTensor()
+        return if (dt.shape contentEquals intArrayOf(1)) dt.source[0] else null
+    }
 
     override fun StructureND<Double>.value(): Double = valueOrNull()
         ?: throw IllegalArgumentException("The tensor shape is $shape, but value method is allowed only for shape [1]")
@@ -99,14 +106,14 @@ public open class DoubleTensorAlgebra :
      * Constructs a tensor with the specified shape and data.
      *
      * @param shape the desired shape for the tensor.
-     * @param buffer one-dimensional data array.
-     * @return tensor with the [shape] shape and [buffer] data.
+     * @param array one-dimensional data array.
+     * @return tensor with the [shape] shape and [array] data.
      */
-    public fun fromArray(shape: IntArray, buffer: DoubleArray): DoubleTensor {
-        checkEmptyShape(shape)
-        checkEmptyDoubleBuffer(buffer)
-        checkBufferShapeConsistency(shape, buffer)
-        return DoubleTensor(shape, buffer, 0)
+    public fun fromArray(shape: IntArray, array: DoubleArray): DoubleTensor {
+        checkNotEmptyShape(shape)
+        checkEmptyDoubleBuffer(array)
+        checkBufferShapeConsistency(shape, array)
+        return DoubleTensor(shape, array.asBuffer())
     }
 
     /**
@@ -122,10 +129,10 @@ public open class DoubleTensorAlgebra :
     )
 
     override fun Tensor<Double>.getTensor(i: Int): DoubleTensor {
-        val lastShape = asDoubleTensor().shape.drop(1).toIntArray()
+        val dt = asDoubleTensor()
+        val lastShape = shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
-        val newStart = newShape.reduce(Int::times) * i + asDoubleTensor().bufferStart
-        return DoubleTensor(newShape, asDoubleTensor().mutableBuffer.array(), newStart)
+        return DoubleTensor(newShape, dt.source.view(newShape.reduce(Int::times) * i))
     }
 
     /**
@@ -136,8 +143,8 @@ public open class DoubleTensorAlgebra :
      * @return tensor with the [shape] shape and filled with [value].
      */
     public fun full(value: Double, shape: IntArray): DoubleTensor {
-        checkEmptyShape(shape)
-        val buffer = DoubleArray(shape.reduce(Int::times)) { value }
+        checkNotEmptyShape(shape)
+        val buffer = DoubleBuffer(shape.reduce(Int::times)) { value }
         return DoubleTensor(shape, buffer)
     }
 
@@ -147,9 +154,9 @@ public open class DoubleTensorAlgebra :
      * @param value the value to fill the output tensor with.
      * @return tensor with the `input` tensor shape and filled with [value].
      */
-    public fun Tensor<Double>.fullLike(value: Double): DoubleTensor {
-        val shape = asDoubleTensor().shape
-        val buffer = DoubleArray(asDoubleTensor().numElements) { value }
+    public fun fullLike(structureND: StructureND<*>, value: Double): DoubleTensor {
+        val shape = structureND.shape
+        val buffer = DoubleBuffer(structureND.indices.linearSize) { value }
         return DoubleTensor(shape, buffer)
     }
 
@@ -166,7 +173,7 @@ public open class DoubleTensorAlgebra :
      *
      * @return tensor filled with the scalar value `0.0`, with the same shape as `input` tensor.
      */
-    public fun StructureND<Double>.zeroesLike(): DoubleTensor = asDoubleTensor().fullLike(0.0)
+    public fun zeroesLike(structureND: StructureND<*>): DoubleTensor = fullLike(structureND, 0.0)
 
     /**
      * Returns a tensor filled with the scalar value `1.0`, with the shape defined by the variable argument [shape].
@@ -181,7 +188,7 @@ public open class DoubleTensorAlgebra :
      *
      * @return tensor filled with the scalar value `1.0`, with the same shape as `input` tensor.
      */
-    public fun Tensor<Double>.onesLike(): DoubleTensor = asDoubleTensor().fullLike(1.0)
+    public fun onesLike(structureND: StructureND<*>): DoubleTensor = fullLike(structureND, 1.0)
 
     /**
      * Returns a 2D tensor with shape ([n], [n]), with ones on the diagonal and zeros elsewhere.
@@ -191,7 +198,7 @@ public open class DoubleTensorAlgebra :
      */
     public fun eye(n: Int): DoubleTensor {
         val shape = intArrayOf(n, n)
-        val buffer = DoubleArray(n * n) { 0.0 }
+        val buffer = DoubleBuffer(n * n) { 0.0 }
         val res = DoubleTensor(shape, buffer)
         for (i in 0 until n) {
             res[intArrayOf(i, i)] = 1.0
@@ -199,192 +206,102 @@ public open class DoubleTensorAlgebra :
         return res
     }
 
-    /**
-     * Return a copy of the tensor.
-     *
-     * @return a copy of the `input` tensor with a copied buffer.
-     */
-    public fun StructureND<Double>.copy(): DoubleTensor =
-        DoubleTensor(
-            asDoubleTensor().shape,
-            asDoubleTensor().mutableBuffer.array().copyOf(),
-            asDoubleTensor().bufferStart
-        )
+    override fun Double.plus(arg: StructureND<Double>): DoubleTensor = arg.map { this@plus + it }
 
-    override fun Double.plus(arg: StructureND<Double>): DoubleTensor {
-        val resBuffer = DoubleArray(arg.asDoubleTensor().numElements) { i ->
-            arg.asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i] + this
-        }
-        return DoubleTensor(arg.shape, resBuffer)
-    }
+    override fun StructureND<Double>.plus(arg: Double): DoubleTensor = map { it + arg }
 
-    override fun StructureND<Double>.plus(arg: Double): DoubleTensor = arg + asDoubleTensor()
-
-    override fun StructureND<Double>.plus(arg: StructureND<Double>): DoubleTensor {
-        checkShapesCompatible(asDoubleTensor(), arg.asDoubleTensor())
-        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
-            asDoubleTensor().mutableBuffer.array()[i] + arg.asDoubleTensor().mutableBuffer.array()[i]
-        }
-        return DoubleTensor(asDoubleTensor().shape, resBuffer)
-    }
+    override fun StructureND<Double>.plus(arg: StructureND<Double>): DoubleTensor = zip(this, arg) { l, r -> l + r }
 
     override fun Tensor<Double>.plusAssign(value: Double) {
-        for (i in 0 until asDoubleTensor().numElements) {
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] += value
-        }
+        mapInPlace { it + value }
     }
 
     override fun Tensor<Double>.plusAssign(arg: StructureND<Double>) {
         checkShapesCompatible(asDoubleTensor(), arg.asDoubleTensor())
-        for (i in 0 until asDoubleTensor().numElements) {
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] +=
-                arg.asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i]
+        mapIndexedInPlace { index, value ->
+            value + arg[index]
         }
     }
 
-    override fun Double.minus(arg: StructureND<Double>): DoubleTensor {
-        val resBuffer = DoubleArray(arg.asDoubleTensor().numElements) { i ->
-            this - arg.asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i]
-        }
-        return DoubleTensor(arg.shape, resBuffer)
-    }
+    override fun Double.minus(arg: StructureND<Double>): DoubleTensor = arg.map { this@minus - it }
 
-    override fun StructureND<Double>.minus(arg: Double): DoubleTensor {
-        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] - arg
-        }
-        return DoubleTensor(asDoubleTensor().shape, resBuffer)
-    }
+    override fun StructureND<Double>.minus(arg: Double): DoubleTensor = map { it - arg }
 
-    override fun StructureND<Double>.minus(arg: StructureND<Double>): DoubleTensor {
-        checkShapesCompatible(asDoubleTensor(), arg)
-        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
-            asDoubleTensor().mutableBuffer.array()[i] - arg.asDoubleTensor().mutableBuffer.array()[i]
-        }
-        return DoubleTensor(asDoubleTensor().shape, resBuffer)
-    }
+    override fun StructureND<Double>.minus(arg: StructureND<Double>): DoubleTensor = zip(this, arg) { l, r -> l + r }
 
     override fun Tensor<Double>.minusAssign(value: Double) {
-        for (i in 0 until asDoubleTensor().numElements) {
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] -= value
-        }
+        mapInPlace { it - value }
     }
 
     override fun Tensor<Double>.minusAssign(arg: StructureND<Double>) {
-        checkShapesCompatible(asDoubleTensor(), arg)
-        for (i in 0 until asDoubleTensor().numElements) {
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] -=
-                arg.asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i]
-        }
+        checkShapesCompatible(this, arg)
+        mapIndexedInPlace { index, value -> value - arg[index] }
     }
 
-    override fun Double.times(arg: StructureND<Double>): DoubleTensor {
-        val resBuffer = DoubleArray(arg.asDoubleTensor().numElements) { i ->
-            arg.asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i] * this
-        }
-        return DoubleTensor(arg.shape, resBuffer)
-    }
+    override fun Double.times(arg: StructureND<Double>): DoubleTensor = arg.map { this@times * it }
 
     override fun StructureND<Double>.times(arg: Double): DoubleTensor = arg * asDoubleTensor()
 
-    override fun StructureND<Double>.times(arg: StructureND<Double>): DoubleTensor {
-        checkShapesCompatible(asDoubleTensor(), arg)
-        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] *
-                    arg.asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i]
-        }
-        return DoubleTensor(asDoubleTensor().shape, resBuffer)
-    }
+    override fun StructureND<Double>.times(arg: StructureND<Double>): DoubleTensor = zip(this, arg) { l, r -> l * r }
 
     override fun Tensor<Double>.timesAssign(value: Double) {
-        for (i in 0 until asDoubleTensor().numElements) {
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] *= value
-        }
+        mapInPlace { it * value }
     }
 
     override fun Tensor<Double>.timesAssign(arg: StructureND<Double>) {
-        checkShapesCompatible(asDoubleTensor(), arg)
-        for (i in 0 until asDoubleTensor().numElements) {
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] *=
-                arg.asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i]
-        }
+        checkShapesCompatible(this, arg)
+        mapIndexedInPlace { index, value -> value * arg[index] }
     }
 
-    override fun Double.div(arg: StructureND<Double>): DoubleTensor {
-        val resBuffer = DoubleArray(arg.asDoubleTensor().numElements) { i ->
-            this / arg.asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i]
-        }
-        return DoubleTensor(arg.shape, resBuffer)
-    }
+    override fun Double.div(arg: StructureND<Double>): DoubleTensor = arg.map { this@div / it }
 
-    override fun StructureND<Double>.div(arg: Double): DoubleTensor {
-        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] / arg
-        }
-        return DoubleTensor(shape, resBuffer)
-    }
+    override fun StructureND<Double>.div(arg: Double): DoubleTensor = map { it / arg }
 
-    override fun StructureND<Double>.div(arg: StructureND<Double>): DoubleTensor {
-        checkShapesCompatible(asDoubleTensor(), arg)
-        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
-            asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i] /
-                    arg.asDoubleTensor().mutableBuffer.array()[arg.asDoubleTensor().bufferStart + i]
-        }
-        return DoubleTensor(asDoubleTensor().shape, resBuffer)
-    }
+    override fun StructureND<Double>.div(arg: StructureND<Double>): DoubleTensor = zip(this, arg) { l, r -> l / r }
 
     override fun Tensor<Double>.divAssign(value: Double) {
-        for (i in 0 until asDoubleTensor().numElements) {
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] /= value
-        }
+        mapInPlace { it / value }
     }
 
     override fun Tensor<Double>.divAssign(arg: StructureND<Double>) {
         checkShapesCompatible(asDoubleTensor(), arg)
-        for (i in 0 until asDoubleTensor().numElements) {
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i] /=
-                arg.asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i]
-        }
+        mapIndexedInPlace { index, value -> value / arg[index] }
     }
 
-    override fun StructureND<Double>.unaryMinus(): DoubleTensor {
-        val resBuffer = DoubleArray(asDoubleTensor().numElements) { i ->
-            asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + i].unaryMinus()
-        }
-        return DoubleTensor(asDoubleTensor().shape, resBuffer)
-    }
+    override fun StructureND<Double>.unaryMinus(): DoubleTensor = map { -it }
 
-    override fun Tensor<Double>.transpose(i: Int, j: Int): DoubleTensor {
-        val ii = asDoubleTensor().minusIndex(i)
-        val jj = asDoubleTensor().minusIndex(j)
-        checkTranspose(asDoubleTensor().dimension, ii, jj)
-        val n = asDoubleTensor().numElements
+    override fun Tensor<Double>.transposed(i: Int, j: Int): DoubleTensor {
+        // TODO change strides instead of changing content
+        val dt = asDoubleTensor()
+        val ii = dt.minusIndex(i)
+        val jj = dt.minusIndex(j)
+        checkTranspose(dt.dimension, ii, jj)
+        val n = dt.linearSize
         val resBuffer = DoubleArray(n)
 
-        val resShape = asDoubleTensor().shape.copyOf()
+        val resShape = dt.shape.copyOf()
         resShape[ii] = resShape[jj].also { resShape[jj] = resShape[ii] }
 
-        val resTensor = DoubleTensor(resShape, resBuffer)
+        val resTensor = DoubleTensor(resShape, resBuffer.asBuffer())
 
         for (offset in 0 until n) {
-            val oldMultiIndex = asDoubleTensor().indices.index(offset)
+            val oldMultiIndex = dt.indices.index(offset)
             val newMultiIndex = oldMultiIndex.copyOf()
             newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
 
             val linearIndex = resTensor.indices.offset(newMultiIndex)
-            resTensor.mutableBuffer.array()[linearIndex] =
-                asDoubleTensor().mutableBuffer.array()[asDoubleTensor().bufferStart + offset]
+            resTensor.source[linearIndex] = dt.source[offset]
         }
         return resTensor
     }
 
     override fun Tensor<Double>.view(shape: IntArray): DoubleTensor {
         checkView(asDoubleTensor(), shape)
-        return DoubleTensor(shape, asDoubleTensor().mutableBuffer.array(), asDoubleTensor().bufferStart)
+        return DoubleTensor(shape, asDoubleTensor().source)
     }
 
     override fun Tensor<Double>.viewAs(other: StructureND<Double>): DoubleTensor =
-        asDoubleTensor().view(other.shape)
+        view(other.shape)
 
     /**
      * Broadcasting Matrix product of two tensors.
@@ -417,28 +334,28 @@ public open class DoubleTensorAlgebra :
      */
     @UnstableKMathAPI
     public infix fun StructureND<Double>.matmul(other: StructureND<Double>): DoubleTensor {
-        if (asDoubleTensor().shape.size == 1 && other.shape.size == 1) {
-            return DoubleTensor(
-                intArrayOf(1),
-                doubleArrayOf(asDoubleTensor().times(other).asDoubleTensor().mutableBuffer.array().sum())
-            )
+        if (shape.size == 1 && other.shape.size == 1) {
+            return DoubleTensor(intArrayOf(1), DoubleBuffer(times(other).sum()))
         }
 
-        var newThis = asDoubleTensor().copy()
-        var newOther = other.copy()
-
         var penultimateDim = false
         var lastDim = false
-        if (asDoubleTensor().shape.size == 1) {
+
+        //TODO do we need protective copy here?
+        var newThis: DoubleTensor = copyToTensor()
+        var newOther: DoubleTensor = other.copyToTensor()
+
+        if (shape.size == 1) {
             penultimateDim = true
-            newThis = asDoubleTensor().view(intArrayOf(1) + asDoubleTensor().shape)
-        }
-        if (other.shape.size == 1) {
-            lastDim = true
-            newOther = other.asDoubleTensor().view(other.shape + intArrayOf(1))
+            newThis = newThis.view(intArrayOf(1) + shape)
         }
 
-        val broadcastTensors = broadcastOuterTensors(newThis.asDoubleTensor(), newOther.asDoubleTensor())
+        if (other.shape.size == 1) {
+            lastDim = true
+            newOther = newOther.view(other.shape + intArrayOf(1))
+        }
+
+        val broadcastTensors = broadcastOuterTensors(newThis, newOther)
         newThis = broadcastTensors[0]
         newOther = broadcastTensors[1]
 
@@ -452,12 +369,20 @@ public open class DoubleTensorAlgebra :
 
         val resShape = newThis.shape.sliceArray(0..(newThis.shape.size - 2)) + intArrayOf(newOther.shape.last())
         val resSize = resShape.reduce { acc, i -> acc * i }
-        val resTensor = DoubleTensor(resShape, DoubleArray(resSize))
+        val resTensor = DoubleTensor(resShape, DoubleArray(resSize).asBuffer())
 
-        for ((res, ab) in resTensor.matrixSequence().zip(newThis.matrixSequence().zip(newOther.matrixSequence()))) {
-            val (a, b) = ab
-            dotTo(a, b, res, l, m1, n)
+        val resMatrices = resTensor.matrices
+        val newThisMatrices = newThis.matrices
+        val newOtherMatrices = newOther.matrices
+
+        for (i in resMatrices.indices) {
+            dotTo(newThisMatrices[i], newOtherMatrices[i], resMatrices[i], l, m1, n)
         }
+//
+//        for ((res, ab) in resTensor.matrixSequence().zip(newThis.matrixSequence().zip(newOther.matrixSequence()))) {
+//            val (a, b) = ab
+//            dotTo(a, b, res, l, m1, n)
+//        }
 
         return if (penultimateDim) {
             resTensor.view(resTensor.shape.dropLast(2).toIntArray() + intArrayOf(resTensor.shape.last()))
@@ -503,10 +428,10 @@ public open class DoubleTensorAlgebra :
                 diagonalEntries.shape.slice(lessDim until greaterDim - 1).toIntArray() +
                 intArrayOf(diagonalEntries.shape[n - 1] + abs(realOffset)) +
                 diagonalEntries.shape.slice(greaterDim - 1 until n - 1).toIntArray()
-        val resTensor = zeros(resShape)
+        val resTensor: DoubleTensor = zeros(resShape)
 
-        for (i in 0 until diagonalEntries.asDoubleTensor().numElements) {
-            val multiIndex = diagonalEntries.asDoubleTensor().indices.index(i)
+        for (i in 0 until diagonalEntries.indices.linearSize) {
+            val multiIndex = diagonalEntries.indices.index(i)
 
             var offset1 = 0
             var offset2 = abs(realOffset)
@@ -522,7 +447,7 @@ public open class DoubleTensorAlgebra :
             resTensor[diagonalMultiIndex] = diagonalEntries[multiIndex]
         }
 
-        return resTensor.asDoubleTensor()
+        return resTensor
     }
 
     /**
@@ -542,23 +467,20 @@ public open class DoubleTensorAlgebra :
      * @param other the tensor to compare with `input` tensor.
      * @return true if two tensors have the same shape and elements, false otherwise.
      */
-    public infix fun Tensor<Double>.eq(other: Tensor<Double>): Boolean = asDoubleTensor().eq(other, 1e-5)
+    public infix fun Tensor<Double>.eq(other: Tensor<Double>): Boolean = eq(other, 1e-5)
 
     private fun Tensor<Double>.eq(
         other: Tensor<Double>,
         eqFunction: (Double, Double) -> Boolean,
     ): Boolean {
+        //TODO optimize tensor conversion
         checkShapesCompatible(asDoubleTensor(), other)
-        val n = asDoubleTensor().numElements
-        if (n != other.asDoubleTensor().numElements) {
+        val n = asDoubleTensor().linearSize
+        if (n != other.asDoubleTensor().linearSize) {
             return false
         }
         for (i in 0 until n) {
-            if (!eqFunction(
-                    asDoubleTensor().mutableBuffer[asDoubleTensor().bufferStart + i],
-                    other.asDoubleTensor().mutableBuffer[other.asDoubleTensor().bufferStart + i]
-                )
-            ) {
+            if (!eqFunction(asDoubleTensor().source[i], other.asDoubleTensor().source[i])) {
                 return false
             }
         }
@@ -586,7 +508,7 @@ public open class DoubleTensorAlgebra :
      * with `0.0` mean and `1.0` standard deviation.
      */
     public fun Tensor<Double>.randomNormalLike(seed: Long = 0): DoubleTensor =
-        DoubleTensor(asDoubleTensor().shape, getRandomNormals(asDoubleTensor().shape.reduce(Int::times), seed))
+        DoubleTensor(shape, getRandomNormals(shape.reduce(Int::times), seed))
 
     /**
      * Concatenates a sequence of tensors with equal shapes along the first dimension.
@@ -599,11 +521,12 @@ public open class DoubleTensorAlgebra :
         val shape = tensors[0].shape
         check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
         val resShape = intArrayOf(tensors.size) + shape
-        val resBuffer = tensors.flatMap {
-            it.asDoubleTensor().mutableBuffer.array().drop(it.asDoubleTensor().bufferStart)
-                .take(it.asDoubleTensor().numElements)
-        }.toDoubleArray()
-        return DoubleTensor(resShape, resBuffer, 0)
+//        val resBuffer: List<Double> = tensors.flatMap {
+//            it.asDoubleTensor().source.array.drop(it.asDoubleTensor().bufferStart)
+//                .take(it.asDoubleTensor().linearSize)
+//        }
+        val resBuffer = tensors.map { it.asDoubleTensor().source }.concat()
+        return DoubleTensor(resShape, resBuffer)
     }
 
     /**
@@ -614,14 +537,12 @@ public open class DoubleTensorAlgebra :
      */
     public fun Tensor<Double>.rowsByIndices(indices: IntArray): DoubleTensor = stack(indices.map { getTensor(it) })
 
-    private inline fun StructureND<Double>.fold(foldFunction: (DoubleArray) -> Double): Double =
-        foldFunction(asDoubleTensor().copyArray())
 
-    private inline fun <reified R : Any> StructureND<Double>.foldDim(
+    private inline fun StructureND<Double>.foldDimToDouble(
         dim: Int,
         keepDim: Boolean,
-        foldFunction: (DoubleArray) -> R,
-    ): BufferedTensor<R> {
+        foldFunction: (DoubleArray) -> Double,
+    ): DoubleTensor {
         check(dim < dimension) { "Dimension $dim out of range $dimension" }
         val resShape = if (keepDim) {
             shape.take(dim).toIntArray() + intArrayOf(1) + shape.takeLast(dimension - dim - 1).toIntArray()
@@ -630,9 +551,37 @@ public open class DoubleTensorAlgebra :
         }
         val resNumElements = resShape.reduce(Int::times)
         val init = foldFunction(DoubleArray(1) { 0.0 })
-        val resTensor = BufferedTensor(
+        val resTensor = DoubleTensor(
             resShape,
-            MutableBuffer.auto(resNumElements) { init }, 0
+            DoubleBuffer(resNumElements) { init }
+        )
+        val dt = asDoubleTensor()
+        for (index in resTensor.indices) {
+            val prefix = index.take(dim).toIntArray()
+            val suffix = index.takeLast(dimension - dim - 1).toIntArray()
+            resTensor[index] = foldFunction(DoubleArray(shape[dim]) { i ->
+                dt[prefix + intArrayOf(i) + suffix]
+            })
+        }
+        return resTensor
+    }
+
+    private inline fun StructureND<Double>.foldDimToInt(
+        dim: Int,
+        keepDim: Boolean,
+        foldFunction: (DoubleArray) -> Int,
+    ): IntTensor {
+        check(dim < dimension) { "Dimension $dim out of range $dimension" }
+        val resShape = if (keepDim) {
+            shape.take(dim).toIntArray() + intArrayOf(1) + shape.takeLast(dimension - dim - 1).toIntArray()
+        } else {
+            shape.take(dim).toIntArray() + shape.takeLast(dimension - dim - 1).toIntArray()
+        }
+        val resNumElements = resShape.reduce(Int::times)
+        val init = foldFunction(DoubleArray(1) { 0.0 })
+        val resTensor = IntTensor(
+            resShape,
+            IntBuffer(resNumElements) { init }
         )
         for (index in resTensor.indices) {
             val prefix = index.take(dim).toIntArray()
@@ -644,68 +593,71 @@ public open class DoubleTensorAlgebra :
         return resTensor
     }
 
-    override fun StructureND<Double>.sum(): Double = asDoubleTensor().fold { it.sum() }
+
+    override fun StructureND<Double>.sum(): Double = reduceElements { it.array.sum() }
 
     override fun StructureND<Double>.sum(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim(dim, keepDim) { x -> x.sum() }.asDoubleTensor()
+        foldDimToDouble(dim, keepDim) { x -> x.sum() }
 
-    override fun StructureND<Double>.min(): Double = this.fold { it.minOrNull()!! }
+    override fun StructureND<Double>.min(): Double = reduceElements { it.array.min() }
 
     override fun StructureND<Double>.min(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim(dim, keepDim) { x -> x.minOrNull()!! }.asDoubleTensor()
+        foldDimToDouble(dim, keepDim) { x -> x.minOrNull()!! }
 
-    override fun StructureND<Double>.argMin(dim: Int, keepDim: Boolean): Tensor<Int> = foldDim(dim, keepDim) { x ->
-        x.withIndex().minByOrNull { it.value }?.index!!
-    }.asIntTensor()
+    override fun StructureND<Double>.argMin(dim: Int, keepDim: Boolean): Tensor<Int> = foldDimToInt(dim, keepDim) { x ->
+        x.withIndex().minBy { it.value }.index
+    }
 
-    override fun StructureND<Double>.max(): Double = this.fold { it.maxOrNull()!! }
+    override fun StructureND<Double>.max(): Double = reduceElements { it.array.max() }
 
     override fun StructureND<Double>.max(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDim(dim, keepDim) { x -> x.maxOrNull()!! }.asDoubleTensor()
+        foldDimToDouble(dim, keepDim) { x -> x.maxOrNull()!! }
 
 
     override fun StructureND<Double>.argMax(dim: Int, keepDim: Boolean): IntTensor =
-        foldDim(dim, keepDim) { x ->
-            x.withIndex().maxByOrNull { it.value }?.index!!
-        }.asIntTensor()
+        foldDimToInt(dim, keepDim) { x ->
+            x.withIndex().maxBy { it.value }.index
+        }
 
 
-    override fun StructureND<Double>.mean(): Double = this.fold { it.sum() / asDoubleTensor().numElements }
+    override fun StructureND<Double>.mean(): Double = sum() / indices.linearSize
 
-    override fun StructureND<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(dim, keepDim) { arr ->
-        check(dim < dimension) { "Dimension $dim out of range $dimension" }
-        arr.sum() / shape[dim]
-    }.asDoubleTensor()
+    override fun StructureND<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor =
+        foldDimToDouble(dim, keepDim) { arr ->
+            check(dim < dimension) { "Dimension $dim out of range $dimension" }
+            arr.sum() / shape[dim]
+        }
 
-    override fun StructureND<Double>.std(): Double = fold { arr ->
-        val mean = arr.sum() / asDoubleTensor().numElements
-        sqrt(arr.sumOf { (it - mean) * (it - mean) } / (asDoubleTensor().numElements - 1))
+    override fun StructureND<Double>.std(): Double = reduceElements { arr ->
+        val mean = arr.array.sum() / indices.linearSize
+        sqrt(arr.array.sumOf { (it - mean) * (it - mean) } / (indices.linearSize - 1))
     }
 
-    override fun StructureND<Double>.std(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
+    override fun StructureND<Double>.std(dim: Int, keepDim: Boolean): DoubleTensor = foldDimToDouble(
         dim,
         keepDim
     ) { arr ->
         check(dim < dimension) { "Dimension $dim out of range $dimension" }
         val mean = arr.sum() / shape[dim]
         sqrt(arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1))
-    }.asDoubleTensor()
-
-    override fun StructureND<Double>.variance(): Double = fold { arr ->
-        val mean = arr.sum() / asDoubleTensor().numElements
-        arr.sumOf { (it - mean) * (it - mean) } / (asDoubleTensor().numElements - 1)
     }
 
-    override fun StructureND<Double>.variance(dim: Int, keepDim: Boolean): DoubleTensor = foldDim(
+    override fun StructureND<Double>.variance(): Double = reduceElements { arr ->
+        val linearSize = indices.linearSize
+        val mean = arr.array.sum() / linearSize
+        arr.array.sumOf { (it - mean) * (it - mean) } / (linearSize - 1)
+    }
+
+    override fun StructureND<Double>.variance(dim: Int, keepDim: Boolean): DoubleTensor = foldDimToDouble(
         dim,
         keepDim
     ) { arr ->
         check(dim < dimension) { "Dimension $dim out of range $dimension" }
         val mean = arr.sum() / shape[dim]
         arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1)
-    }.asDoubleTensor()
+    }
 
-    private fun cov(x: DoubleTensor, y: DoubleTensor): Double {
+    private fun cov(x: StructureND<Double>, y: StructureND<Double>): Double {
         val n = x.shape[0]
         return ((x - x.mean()) * (y - y.mean())).mean() * n / (n - 1)
     }
@@ -725,45 +677,45 @@ public open class DoubleTensorAlgebra :
         check(tensors.all { it.shape contentEquals intArrayOf(m) }) { "Tensors must have same shapes" }
         val resTensor = DoubleTensor(
             intArrayOf(n, n),
-            DoubleArray(n * n) { 0.0 }
+            DoubleBuffer(n * n) { 0.0 }
         )
         for (i in 0 until n) {
             for (j in 0 until n) {
-                resTensor[intArrayOf(i, j)] = cov(tensors[i].asDoubleTensor(), tensors[j].asDoubleTensor())
+                resTensor[intArrayOf(i, j)] = cov(tensors[i], tensors[j])
             }
         }
         return resTensor
     }
 
-    override fun StructureND<Double>.exp(): DoubleTensor = asDoubleTensor().map { exp(it) }
+    override fun StructureND<Double>.exp(): DoubleTensor = map { exp(it) }
 
-    override fun StructureND<Double>.ln(): DoubleTensor = asDoubleTensor().map { ln(it) }
+    override fun StructureND<Double>.ln(): DoubleTensor = map { ln(it) }
 
-    override fun StructureND<Double>.sqrt(): DoubleTensor = asDoubleTensor().map { sqrt(it) }
+    override fun StructureND<Double>.sqrt(): DoubleTensor = map { sqrt(it) }
 
-    override fun StructureND<Double>.cos(): DoubleTensor = asDoubleTensor().map { cos(it) }
+    override fun StructureND<Double>.cos(): DoubleTensor = map { cos(it) }
 
-    override fun StructureND<Double>.acos(): DoubleTensor = asDoubleTensor().map { acos(it) }
+    override fun StructureND<Double>.acos(): DoubleTensor = map { acos(it) }
 
-    override fun StructureND<Double>.cosh(): DoubleTensor = asDoubleTensor().map { cosh(it) }
+    override fun StructureND<Double>.cosh(): DoubleTensor = map { cosh(it) }
 
-    override fun StructureND<Double>.acosh(): DoubleTensor = asDoubleTensor().map { acosh(it) }
+    override fun StructureND<Double>.acosh(): DoubleTensor = map { acosh(it) }
 
-    override fun StructureND<Double>.sin(): DoubleTensor = asDoubleTensor().map { sin(it) }
+    override fun StructureND<Double>.sin(): DoubleTensor = map { sin(it) }
 
-    override fun StructureND<Double>.asin(): DoubleTensor = asDoubleTensor().map { asin(it) }
+    override fun StructureND<Double>.asin(): DoubleTensor = map { asin(it) }
 
-    override fun StructureND<Double>.sinh(): DoubleTensor = asDoubleTensor().map { sinh(it) }
+    override fun StructureND<Double>.sinh(): DoubleTensor = map { sinh(it) }
 
-    override fun StructureND<Double>.asinh(): DoubleTensor = asDoubleTensor().map { asinh(it) }
+    override fun StructureND<Double>.asinh(): DoubleTensor = map { asinh(it) }
 
-    override fun StructureND<Double>.tan(): DoubleTensor = asDoubleTensor().map { tan(it) }
+    override fun StructureND<Double>.tan(): DoubleTensor = map { tan(it) }
 
-    override fun StructureND<Double>.atan(): DoubleTensor = asDoubleTensor().map { atan(it) }
+    override fun StructureND<Double>.atan(): DoubleTensor = map { atan(it) }
 
-    override fun StructureND<Double>.tanh(): DoubleTensor = asDoubleTensor().map { tanh(it) }
+    override fun StructureND<Double>.tanh(): DoubleTensor = map { tanh(it) }
 
-    override fun StructureND<Double>.atanh(): DoubleTensor = asDoubleTensor().map { atanh(it) }
+    override fun StructureND<Double>.atanh(): DoubleTensor = map { atanh(it) }
 
     override fun power(arg: StructureND<Double>, pow: Number): StructureND<Double> = if (pow is Int) {
         arg.map { it.pow(pow) }
@@ -771,9 +723,9 @@ public open class DoubleTensorAlgebra :
         arg.map { it.pow(pow.toDouble()) }
     }
 
-    override fun StructureND<Double>.ceil(): DoubleTensor = asDoubleTensor().map { ceil(it) }
+    override fun StructureND<Double>.ceil(): DoubleTensor = map { ceil(it) }
 
-    override fun StructureND<Double>.floor(): DoubleTensor = asDoubleTensor().map { floor(it) }
+    override fun StructureND<Double>.floor(): DoubleTensor = map { floor(it) }
 
     override fun StructureND<Double>.inv(): DoubleTensor = invLU(1e-9)
 
@@ -789,7 +741,7 @@ public open class DoubleTensorAlgebra :
      * The `pivots`  has the shape ``(∗, min(m, n))``. `pivots` stores all the intermediate transpositions of rows.
      */
     public fun StructureND<Double>.luFactor(epsilon: Double): Pair<DoubleTensor, IntTensor> =
-        computeLU(asDoubleTensor(), epsilon)
+        computeLU(this, epsilon)
             ?: throw IllegalArgumentException("Tensor contains matrices which are singular at precision $epsilon")
 
     /**
@@ -825,14 +777,14 @@ public open class DoubleTensorAlgebra :
         ) { "Inappropriate shapes of input tensors" }
 
         val n = luTensor.shape.last()
-        val pTensor = luTensor.zeroesLike()
+        val pTensor = zeroesLike(luTensor)
         pTensor
             .matrixSequence()
             .zip(pivotsTensor.asIntTensor().vectorSequence())
             .forEach { (p, pivot) -> pivInit(p.as2D(), pivot.as1D(), n) }
 
-        val lTensor = luTensor.zeroesLike()
-        val uTensor = luTensor.zeroesLike()
+        val lTensor = zeroesLike(luTensor)
+        val uTensor = zeroesLike(luTensor)
 
         lTensor.matrixSequence()
             .zip(uTensor.matrixSequence())
@@ -863,7 +815,7 @@ public open class DoubleTensorAlgebra :
         checkPositiveDefinite(asDoubleTensor(), epsilon)
 
         val n = shape.last()
-        val lTensor = zeroesLike()
+        val lTensor = zeroesLike(this)
 
         for ((a, l) in asDoubleTensor().matrixSequence().zip(lTensor.matrixSequence()))
             for (i in 0 until n) choleskyHelper(a.as2D(), l.as2D(), n)
@@ -875,15 +827,17 @@ public open class DoubleTensorAlgebra :
 
     override fun StructureND<Double>.qr(): Pair<DoubleTensor, DoubleTensor> {
         checkSquareMatrix(shape)
-        val qTensor = zeroesLike()
-        val rTensor = zeroesLike()
+        val qTensor = zeroesLike(this)
+        val rTensor = zeroesLike(this)
+
+        //TODO replace with cycle
         asDoubleTensor().matrixSequence()
             .zip(
                 (qTensor.matrixSequence()
                     .zip(rTensor.matrixSequence()))
             ).forEach { (matrix, qr) ->
                 val (q, r) = qr
-                qrHelper(matrix.toTensor(), q.toTensor(), r.as2D())
+                qrHelper(matrix, q, r.as2D())
             }
 
         return qTensor to rTensor
@@ -906,14 +860,14 @@ public open class DoubleTensorAlgebra :
      * @return a triple `Triple(U, S, V)`.
      */
     public fun StructureND<Double>.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        val size = asDoubleTensor().dimension
-        val commonShape = asDoubleTensor().shape.sliceArray(0 until size - 2)
-        val (n, m) = asDoubleTensor().shape.sliceArray(size - 2 until size)
+        val size = dimension
+        val commonShape = shape.sliceArray(0 until size - 2)
+        val (n, m) = shape.sliceArray(size - 2 until size)
         val uTensor = zeros(commonShape + intArrayOf(min(n, m), n))
         val sTensor = zeros(commonShape + intArrayOf(min(n, m)))
         val vTensor = zeros(commonShape + intArrayOf(min(n, m), m))
 
-        val matrices = asDoubleTensor().matrices
+        val matrices: VirtualBuffer<DoubleTensor> = asDoubleTensor().matrices
         val uTensors = uTensor.matrices
         val sTensorVectors = sTensor.vectors
         val vTensors = vTensor.matrices
@@ -928,14 +882,12 @@ public open class DoubleTensorAlgebra :
             val matrixSize = matrix.shape.reduce { acc, i -> acc * i }
             val curMatrix = DoubleTensor(
                 matrix.shape,
-                matrix.mutableBuffer.array()
-                    .slice(matrix.bufferStart until matrix.bufferStart + matrixSize)
-                    .toDoubleArray()
+                matrix.source.view(0, matrixSize)
             )
             svdHelper(curMatrix, usv, m, n, epsilon)
         }
 
-        return Triple(uTensor.transpose(), sTensor, vTensor.transpose())
+        return Triple(uTensor.transposed(), sTensor, vTensor.transposed())
     }
 
     override fun StructureND<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> =
@@ -950,6 +902,7 @@ public open class DoubleTensorAlgebra :
      * @return a pair `eigenvalues to eigenvectors`.
      */
     public fun StructureND<Double>.symEigSvd(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
+        //TODO optimize conversion
         checkSymmetric(asDoubleTensor(), epsilon)
 
         fun MutableStructure2D<Double>.cleanSym(n: Int) {
@@ -964,9 +917,9 @@ public open class DoubleTensorAlgebra :
             }
         }
 
-        val (u, s, v) = asDoubleTensor().svd(epsilon)
+        val (u, s, v) = svd(epsilon)
         val shp = s.shape + intArrayOf(1)
-        val utv = u.transpose() matmul v
+        val utv = u.transposed() matmul v
         val n = s.shape.last()
         for (matrix in utv.matrixSequence()) {
             matrix.as2D().cleanSym(n)
@@ -977,6 +930,7 @@ public open class DoubleTensorAlgebra :
     }
 
     public fun StructureND<Double>.symEigJacobi(maxIteration: Int, epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
+        //TODO optimize conversion
         checkSymmetric(asDoubleTensor(), epsilon)
 
         val size = this.dimension
@@ -991,12 +945,12 @@ public open class DoubleTensorAlgebra :
 
             for (i in 0 until matrix2D.rowNum) {
                 for (j in 0 until matrix2D.colNum) {
-                    eigenvectors.mutableBuffer.array()[eigenvectorStart + i * matrix2D.rowNum + j] = v[i, j]
+                    eigenvectors.source[eigenvectorStart + i * matrix2D.rowNum + j] = v[i, j]
                 }
             }
 
             for (i in 0 until matrix2D.rowNum) {
-                eigenvalues.mutableBuffer.array()[eigenvalueStart + i] = d[i]
+                eigenvalues.source[eigenvalueStart + i] = d[i]
             }
 
             eigenvalueStart += this.shape.last()
@@ -1006,121 +960,6 @@ public open class DoubleTensorAlgebra :
         return eigenvalues to eigenvectors
     }
 
-    private fun MutableStructure2D<Double>.jacobiHelper(
-        maxIteration: Int,
-        epsilon: Double,
-    ): Pair<Structure1D<Double>, Structure2D<Double>> {
-        val n = this.shape[0]
-        val A_ = this.copy()
-        val V = eye(n)
-        val D = DoubleTensor(intArrayOf(n), (0 until this.rowNum).map { this[it, it] }.toDoubleArray()).as1D()
-        val B = DoubleTensor(intArrayOf(n), (0 until this.rowNum).map { this[it, it] }.toDoubleArray()).as1D()
-        val Z = zeros(intArrayOf(n)).as1D()
-
-        // assume that buffered tensor is square matrix
-        operator fun BufferedTensor<Double>.get(i: Int, j: Int): Double {
-            return this.mutableBuffer.array()[bufferStart + i * this.shape[0] + j]
-        }
-
-        operator fun BufferedTensor<Double>.set(i: Int, j: Int, value: Double) {
-            this.mutableBuffer.array()[bufferStart + i * this.shape[0] + j] = value
-        }
-
-        fun maxOffDiagonal(matrix: BufferedTensor<Double>): Double {
-            var maxOffDiagonalElement = 0.0
-            for (i in 0 until n - 1) {
-                for (j in i + 1 until n) {
-                    maxOffDiagonalElement = max(maxOffDiagonalElement, abs(matrix[i, j]))
-                }
-            }
-            return maxOffDiagonalElement
-        }
-
-        fun rotate(a: BufferedTensor<Double>, s: Double, tau: Double, i: Int, j: Int, k: Int, l: Int) {
-            val g = a[i, j]
-            val h = a[k, l]
-            a[i, j] = g - s * (h + g * tau)
-            a[k, l] = h + s * (g - h * tau)
-        }
-
-        fun jacobiIteration(
-            a: BufferedTensor<Double>,
-            v: BufferedTensor<Double>,
-            d: MutableStructure1D<Double>,
-            z: MutableStructure1D<Double>,
-        ) {
-            for (ip in 0 until n - 1) {
-                for (iq in ip + 1 until n) {
-                    val g = 100.0 * abs(a[ip, iq])
-
-                    if (g <= epsilon * abs(d[ip]) && g <= epsilon * abs(d[iq])) {
-                        a[ip, iq] = 0.0
-                        continue
-                    }
-
-                    var h = d[iq] - d[ip]
-                    val t = when {
-                        g <= epsilon * abs(h) -> (a[ip, iq]) / h
-                        else -> {
-                            val theta = 0.5 * h / (a[ip, iq])
-                            val denominator = abs(theta) + sqrt(1.0 + theta * theta)
-                            if (theta < 0.0) -1.0 / denominator else 1.0 / denominator
-                        }
-                    }
-
-                    val c = 1.0 / sqrt(1 + t * t)
-                    val s = t * c
-                    val tau = s / (1.0 + c)
-                    h = t * a[ip, iq]
-                    z[ip] -= h
-                    z[iq] += h
-                    d[ip] -= h
-                    d[iq] += h
-                    a[ip, iq] = 0.0
-
-                    for (j in 0 until ip) {
-                        rotate(a, s, tau, j, ip, j, iq)
-                    }
-                    for (j in (ip + 1) until iq) {
-                        rotate(a, s, tau, ip, j, j, iq)
-                    }
-                    for (j in (iq + 1) until n) {
-                        rotate(a, s, tau, ip, j, iq, j)
-                    }
-                    for (j in 0 until n) {
-                        rotate(v, s, tau, j, ip, j, iq)
-                    }
-                }
-            }
-        }
-
-        fun updateDiagonal(
-            d: MutableStructure1D<Double>,
-            z: MutableStructure1D<Double>,
-            b: MutableStructure1D<Double>,
-        ) {
-            for (ip in 0 until d.size) {
-                b[ip] += z[ip]
-                d[ip] = b[ip]
-                z[ip] = 0.0
-            }
-        }
-
-        var sm = maxOffDiagonal(A_)
-        for (iteration in 0 until maxIteration) {
-            if (sm < epsilon) {
-                break
-            }
-
-            jacobiIteration(A_, V, D, Z)
-            updateDiagonal(D, Z, B)
-            sm = maxOffDiagonal(A_)
-        }
-
-        // TODO sort eigenvalues
-        return D to V.as2D()
-    }
-
     /**
      * Computes the determinant of a square matrix input, or of each square matrix in a batched input
      * using LU factorization algorithm.
@@ -1130,15 +969,16 @@ public open class DoubleTensorAlgebra :
      * @return the determinant.
      */
     public fun StructureND<Double>.detLU(epsilon: Double = 1e-9): DoubleTensor {
-        checkSquareMatrix(asDoubleTensor().shape)
-        val luTensor = asDoubleTensor().copy()
-        val pivotsTensor = asDoubleTensor().setUpPivots()
+        checkSquareMatrix(shape)
+        //TODO check for unnecessary copies
+        val luTensor = copyToTensor()
+        val pivotsTensor = setUpPivots()
 
         val n = shape.size
 
         val detTensorShape = IntArray(n - 1) { i -> shape[i] }
         detTensorShape[n - 2] = 1
-        val resBuffer = DoubleArray(detTensorShape.reduce(Int::times)) { 0.0 }
+        val resBuffer = DoubleBuffer(detTensorShape.reduce(Int::times)) { 0.0 }
 
         val detTensor = DoubleTensor(
             detTensorShape,
@@ -1164,8 +1004,9 @@ public open class DoubleTensorAlgebra :
      */
     public fun StructureND<Double>.invLU(epsilon: Double = 1e-9): DoubleTensor {
         val (luTensor, pivotsTensor) = luFactor(epsilon)
-        val invTensor = luTensor.zeroesLike()
+        val invTensor = zeroesLike(luTensor)
 
+        //TODO replace sequence with a cycle
         val seq = luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).zip(invTensor.matrixSequence())
         for ((luP, invMatrix) in seq) {
             val (lu, pivots) = luP
@@ -1188,7 +1029,7 @@ public open class DoubleTensorAlgebra :
      * @return triple of `P`, `L` and `U` tensors.
      */
     public fun StructureND<Double>.lu(epsilon: Double = 1e-9): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        val (lu, pivots) = asDoubleTensor().luFactor(epsilon)
+        val (lu, pivots) = luFactor(epsilon)
         return luPivot(lu, pivots)
     }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
index a2b942bf0..ed96b6c8f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
@@ -5,17 +5,87 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.structures.IntBuffer
-import space.kscience.kmath.tensors.core.internal.array
+import space.kscience.kmath.structures.*
 
 /**
  * Default [BufferedTensor] implementation for [Int] values
  */
-public class IntTensor @PublishedApi internal constructor(
-    shape: IntArray,
-    buffer: IntArray,
-    offset: Int = 0,
-) : BufferedTensor<Int>(shape, IntBuffer(buffer), offset) {
-    public fun asDouble(): DoubleTensor =
-        DoubleTensor(shape, mutableBuffer.array().map { it.toDouble() }.toDoubleArray(), bufferStart)
+public class OffsetIntBuffer(
+    private val source: IntBuffer,
+    private val offset: Int,
+    override val size: Int,
+) : MutableBuffer<Int> {
+
+    init {
+        require(offset >= 0) { "Offset must be non-negative" }
+        require(size >= 0) { "Size must be non-negative" }
+        require(offset + size <= source.size) { "Maximum index must be inside source dimension" }
+    }
+
+    override fun set(index: Int, value: Int) {
+        require(index in 0 until size) { "Index must be in [0, size)" }
+        source[index + offset] = value
+    }
+
+    override fun get(index: Int): Int = source[index + offset]
+
+    /**
+     * Copy only a part of buffer that belongs to this tensor
+     */
+    override fun copy(): IntBuffer = source.array.copyOfRange(offset, offset + size).asBuffer()
+
+    override fun iterator(): Iterator<Int> = iterator {
+        for (i in indices) {
+            yield(get(i))
+        }
+    }
+
+    override fun toString(): String = Buffer.toString(this)
+
+    public fun view(addOffset: Int, newSize: Int = size - addOffset): OffsetIntBuffer =
+        OffsetIntBuffer(source, offset + addOffset, newSize)
+}
+
+public fun OffsetIntBuffer.slice(range: IntRange): OffsetIntBuffer = view(range.first, range.last - range.first)
+
+/**
+ * Map only operable content of the offset buffer
+ */
+public inline fun OffsetIntBuffer.map(operation: (Int) -> Int): IntBuffer =
+    IntBuffer(size) { operation(get(it)) }
+
+public inline fun OffsetIntBuffer.zip(
+    other: OffsetIntBuffer,
+    operation: (l: Int, r: Int) -> Int,
+): IntBuffer {
+    require(size == other.size) { "The sizes of zipped buffers must be the same" }
+    return IntBuffer(size) { operation(get(it), other[it]) }
+}
+
+/**
+ * map in place
+ */
+public inline fun OffsetIntBuffer.mapInPlace(operation: (Int) -> Int) {
+    indices.forEach { set(it, operation(get(it))) }
+}
+
+/**
+ * Default [BufferedTensor] implementation for [Int] values
+ */
+public class IntTensor(
+    shape: IntArray,
+    override val source: OffsetIntBuffer,
+) : BufferedTensor<Int>(shape) {
+
+    init {
+        require(linearSize == source.size) { "Source buffer size must be equal tensor size" }
+    }
+
+    public constructor(shape: IntArray, buffer: IntBuffer) : this(shape, OffsetIntBuffer(buffer, 0, buffer.size))
+
+    override fun get(index: IntArray): Int = this.source[indices.offset(index)]
+
+    override fun set(index: IntArray, value: Int) {
+        source[indices.offset(index)] = value
+    }
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
index 3ddbd3301..7c18fe533 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
@@ -11,7 +11,7 @@ package space.kscience.kmath.tensors.core
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.IntRing
-import space.kscience.kmath.structures.MutableBuffer
+import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.api.*
 import space.kscience.kmath.tensors.core.internal.*
 import kotlin.math.*
@@ -23,10 +23,6 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
 
     public companion object : IntTensorAlgebra()
 
-    override fun StructureND<Int>.dot(other: StructureND<Int>): Tensor<Int> {
-        TODO("Not yet implemented")
-    }
-
     override val elementAlgebra: IntRing get() = IntRing
 
 
@@ -36,56 +32,64 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @param transform the function to be applied to each element of the tensor.
      * @return the resulting tensor after applying the function.
      */
-    @PerformancePitfall
     @Suppress("OVERRIDE_BY_INLINE")
     final override inline fun StructureND<Int>.map(transform: IntRing.(Int) -> Int): IntTensor {
         val tensor = this.asIntTensor()
         //TODO remove additional copy
-        val sourceArray = tensor.copyArray()
-        val array = IntArray(tensor.numElements) { IntRing.transform(sourceArray[it]) }
+        val array = IntBuffer(tensor.source.size) { IntRing.transform(tensor.source[it]) }
         return IntTensor(
             tensor.shape,
             array,
-            tensor.bufferStart
         )
     }
 
-    @PerformancePitfall
+    public inline fun Tensor<Int>.mapInPlace(operation: (Int) -> Int) {
+        if (this is IntTensor) {
+            source.mapInPlace(operation)
+        } else {
+            indices.forEach { set(it, operation(get(it))) }
+        }
+    }
+
+    public inline fun Tensor<Int>.mapIndexedInPlace(operation: (IntArray, Int) -> Int) {
+        indices.forEach { set(it, operation(it, get(it))) }
+    }
+
     @Suppress("OVERRIDE_BY_INLINE")
     final override inline fun StructureND<Int>.mapIndexed(transform: IntRing.(index: IntArray, Int) -> Int): IntTensor {
         val tensor = this.asIntTensor()
         //TODO remove additional copy
-        val sourceArray = tensor.copyArray()
-        val array = IntArray(tensor.numElements) { IntRing.transform(tensor.indices.index(it), sourceArray[it]) }
-        return IntTensor(
-            tensor.shape,
-            array,
-            tensor.bufferStart
-        )
+        val buffer = IntBuffer(tensor.source.size) {
+            IntRing.transform(tensor.indices.index(it), tensor.source[it])
+        }
+        return IntTensor(tensor.shape, buffer)
     }
 
-    @PerformancePitfall
-    override fun zip(
+    @Suppress("OVERRIDE_BY_INLINE")
+    final override inline fun zip(
         left: StructureND<Int>,
         right: StructureND<Int>,
         transform: IntRing.(Int, Int) -> Int,
     ): IntTensor {
-        require(left.shape.contentEquals(right.shape)) {
-            "The shapes in zip are not equal: left - ${left.shape}, right - ${right.shape}"
-        }
+        checkShapesCompatible(left, right)
+
         val leftTensor = left.asIntTensor()
-        val leftArray = leftTensor.copyArray()
         val rightTensor = right.asIntTensor()
-        val rightArray = rightTensor.copyArray()
-        val array = IntArray(leftTensor.numElements) { IntRing.transform(leftArray[it], rightArray[it]) }
-        return IntTensor(
-            leftTensor.shape,
-            array
-        )
+        val buffer = IntBuffer(leftTensor.source.size) {
+            IntRing.transform(leftTensor.source[it], rightTensor.source[it])
+        }
+        return IntTensor(leftTensor.shape, buffer)
     }
 
-    override fun StructureND<Int>.valueOrNull(): Int? = if (asIntTensor().shape contentEquals intArrayOf(1))
-        asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart] else null
+
+    public inline fun StructureND<Int>.reduceElements(transform: (IntBuffer) -> Int): Int =
+        transform(asIntTensor().source.copy())
+    //TODO do we need protective copy?
+
+    override fun StructureND<Int>.valueOrNull(): Int? {
+        val dt = asIntTensor()
+        return if (dt.shape contentEquals intArrayOf(1)) dt.source[0] else null
+    }
 
     override fun StructureND<Int>.value(): Int = valueOrNull()
         ?: throw IllegalArgumentException("The tensor shape is $shape, but value method is allowed only for shape [1]")
@@ -94,16 +98,16 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * Constructs a tensor with the specified shape and data.
      *
      * @param shape the desired shape for the tensor.
-     * @param buffer one-dimensional data array.
-     * @return tensor with the [shape] shape and [buffer] data.
+     * @param array one-dimensional data array.
+     * @return tensor with the [shape] shape and [array] data.
      */
-    public fun fromArray(shape: IntArray, buffer: IntArray): IntTensor {
-        checkEmptyShape(shape)
-        check(buffer.isNotEmpty()) { "Illegal empty buffer provided" }
-        check(buffer.size == shape.reduce(Int::times)) {
-            "Inconsistent shape ${shape.toList()} for buffer of size ${buffer.size} provided"
+    public fun fromArray(shape: IntArray, array: IntArray): IntTensor {
+        checkNotEmptyShape(shape)
+        check(array.isNotEmpty()) { "Illegal empty buffer provided" }
+        check(array.size == shape.reduce(Int::times)) {
+            "Inconsistent shape ${shape.toList()} for buffer of size ${array.size} provided"
         }
-        return IntTensor(shape, buffer, 0)
+        return IntTensor(shape, array.asBuffer())
     }
 
     /**
@@ -119,10 +123,10 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
     )
 
     override fun Tensor<Int>.getTensor(i: Int): IntTensor {
-        val lastShape = asIntTensor().shape.drop(1).toIntArray()
+        val dt = asIntTensor()
+        val lastShape = shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
-        val newStart = newShape.reduce(Int::times) * i + asIntTensor().bufferStart
-        return IntTensor(newShape, asIntTensor().mutableBuffer.array(), newStart)
+        return IntTensor(newShape, dt.source.view(newShape.reduce(Int::times) * i))
     }
 
     /**
@@ -133,8 +137,8 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @return tensor with the [shape] shape and filled with [value].
      */
     public fun full(value: Int, shape: IntArray): IntTensor {
-        checkEmptyShape(shape)
-        val buffer = IntArray(shape.reduce(Int::times)) { value }
+        checkNotEmptyShape(shape)
+        val buffer = IntBuffer(shape.reduce(Int::times)) { value }
         return IntTensor(shape, buffer)
     }
 
@@ -144,9 +148,9 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @param value the value to fill the output tensor with.
      * @return tensor with the `input` tensor shape and filled with [value].
      */
-    public fun Tensor<Int>.fullLike(value: Int): IntTensor {
-        val shape = asIntTensor().shape
-        val buffer = IntArray(asIntTensor().numElements) { value }
+    public fun fullLike(structureND: StructureND<*>, value: Int): IntTensor {
+        val shape = structureND.shape
+        val buffer = IntBuffer(structureND.indices.linearSize) { value }
         return IntTensor(shape, buffer)
     }
 
@@ -163,7 +167,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      *
      * @return tensor filled with the scalar value `0`, with the same shape as `input` tensor.
      */
-    public fun StructureND<Int>.zeroesLike(): IntTensor = asIntTensor().fullLike(0)
+    public fun zeroesLike(structureND: StructureND<Int>): IntTensor = fullLike(structureND.asIntTensor(), 0)
 
     /**
      * Returns a tensor filled with the scalar value `1`, with the shape defined by the variable argument [shape].
@@ -178,7 +182,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      *
      * @return tensor filled with the scalar value `1`, with the same shape as `input` tensor.
      */
-    public fun Tensor<Int>.onesLike(): IntTensor = asIntTensor().fullLike(1)
+    public fun onesLike(structureND: Tensor<*>): IntTensor = fullLike(structureND, 1)
 
     /**
      * Returns a 2D tensor with shape ([n], [n]), with ones on the diagonal and zeros elsewhere.
@@ -188,7 +192,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      */
     public fun eye(n: Int): IntTensor {
         val shape = intArrayOf(n, n)
-        val buffer = IntArray(n * n) { 0 }
+        val buffer = IntBuffer(n * n) { 0 }
         val res = IntTensor(shape, buffer)
         for (i in 0 until n) {
             res[intArrayOf(i, i)] = 1
@@ -196,151 +200,92 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
         return res
     }
 
-    /**
-     * Return a copy of the tensor.
-     *
-     * @return a copy of the `input` tensor with a copied buffer.
-     */
-    public fun StructureND<Int>.copy(): IntTensor =
-        IntTensor(asIntTensor().shape, asIntTensor().mutableBuffer.array().copyOf(), asIntTensor().bufferStart)
+    override fun Int.plus(arg: StructureND<Int>): IntTensor = arg.map { this@plus + it }
 
-    override fun Int.plus(arg: StructureND<Int>): IntTensor {
-        val resBuffer = IntArray(arg.asIntTensor().numElements) { i ->
-            arg.asIntTensor().mutableBuffer.array()[arg.asIntTensor().bufferStart + i] + this
-        }
-        return IntTensor(arg.shape, resBuffer)
-    }
+    override fun StructureND<Int>.plus(arg: Int): IntTensor = map { it + arg }
 
-    override fun StructureND<Int>.plus(arg: Int): IntTensor = arg + asIntTensor()
-
-    override fun StructureND<Int>.plus(arg: StructureND<Int>): IntTensor {
-        checkShapesCompatible(asIntTensor(), arg.asIntTensor())
-        val resBuffer = IntArray(asIntTensor().numElements) { i ->
-            asIntTensor().mutableBuffer.array()[i] + arg.asIntTensor().mutableBuffer.array()[i]
-        }
-        return IntTensor(asIntTensor().shape, resBuffer)
-    }
+    override fun StructureND<Int>.plus(arg: StructureND<Int>): IntTensor = zip(this, arg) { l, r -> l + r }
 
     override fun Tensor<Int>.plusAssign(value: Int) {
-        for (i in 0 until asIntTensor().numElements) {
-            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] += value
-        }
+        mapInPlace { it + value }
     }
 
     override fun Tensor<Int>.plusAssign(arg: StructureND<Int>) {
         checkShapesCompatible(asIntTensor(), arg.asIntTensor())
-        for (i in 0 until asIntTensor().numElements) {
-            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] +=
-                arg.asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i]
+        mapIndexedInPlace { index, value ->
+            value + arg[index]
         }
     }
 
-    override fun Int.minus(arg: StructureND<Int>): IntTensor {
-        val resBuffer = IntArray(arg.asIntTensor().numElements) { i ->
-            this - arg.asIntTensor().mutableBuffer.array()[arg.asIntTensor().bufferStart + i]
-        }
-        return IntTensor(arg.shape, resBuffer)
-    }
+    override fun Int.minus(arg: StructureND<Int>): IntTensor = arg.map { this@minus - it }
 
-    override fun StructureND<Int>.minus(arg: Int): IntTensor {
-        val resBuffer = IntArray(asIntTensor().numElements) { i ->
-            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] - arg
-        }
-        return IntTensor(asIntTensor().shape, resBuffer)
-    }
+    override fun StructureND<Int>.minus(arg: Int): IntTensor = map { it - arg }
 
-    override fun StructureND<Int>.minus(arg: StructureND<Int>): IntTensor {
-        checkShapesCompatible(asIntTensor(), arg)
-        val resBuffer = IntArray(asIntTensor().numElements) { i ->
-            asIntTensor().mutableBuffer.array()[i] - arg.asIntTensor().mutableBuffer.array()[i]
-        }
-        return IntTensor(asIntTensor().shape, resBuffer)
-    }
+    override fun StructureND<Int>.minus(arg: StructureND<Int>): IntTensor = zip(this, arg) { l, r -> l + r }
 
     override fun Tensor<Int>.minusAssign(value: Int) {
-        for (i in 0 until asIntTensor().numElements) {
-            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] -= value
-        }
+        mapInPlace { it - value }
     }
 
     override fun Tensor<Int>.minusAssign(arg: StructureND<Int>) {
-        checkShapesCompatible(asIntTensor(), arg)
-        for (i in 0 until asIntTensor().numElements) {
-            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] -=
-                arg.asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i]
-        }
+        checkShapesCompatible(this, arg)
+        mapIndexedInPlace { index, value -> value - arg[index] }
     }
 
-    override fun Int.times(arg: StructureND<Int>): IntTensor {
-        val resBuffer = IntArray(arg.asIntTensor().numElements) { i ->
-            arg.asIntTensor().mutableBuffer.array()[arg.asIntTensor().bufferStart + i] * this
-        }
-        return IntTensor(arg.shape, resBuffer)
-    }
+    override fun Int.times(arg: StructureND<Int>): IntTensor = arg.map { this@times * it }
 
     override fun StructureND<Int>.times(arg: Int): IntTensor = arg * asIntTensor()
 
-    override fun StructureND<Int>.times(arg: StructureND<Int>): IntTensor {
-        checkShapesCompatible(asIntTensor(), arg)
-        val resBuffer = IntArray(asIntTensor().numElements) { i ->
-            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] *
-                    arg.asIntTensor().mutableBuffer.array()[arg.asIntTensor().bufferStart + i]
-        }
-        return IntTensor(asIntTensor().shape, resBuffer)
-    }
+    override fun StructureND<Int>.times(arg: StructureND<Int>): IntTensor = zip(this, arg) { l, r -> l * r }
 
     override fun Tensor<Int>.timesAssign(value: Int) {
-        for (i in 0 until asIntTensor().numElements) {
-            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] *= value
-        }
+        mapInPlace { it * value }
     }
 
     override fun Tensor<Int>.timesAssign(arg: StructureND<Int>) {
-        checkShapesCompatible(asIntTensor(), arg)
-        for (i in 0 until asIntTensor().numElements) {
-            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i] *=
-                arg.asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i]
-        }
+        checkShapesCompatible(this, arg)
+        mapIndexedInPlace { index, value -> value * arg[index] }
     }
 
-    override fun StructureND<Int>.unaryMinus(): IntTensor {
-        val resBuffer = IntArray(asIntTensor().numElements) { i ->
-            asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + i].unaryMinus()
-        }
-        return IntTensor(asIntTensor().shape, resBuffer)
-    }
+    override fun StructureND<Int>.unaryMinus(): IntTensor = map { -it }
 
-    override fun Tensor<Int>.transpose(i: Int, j: Int): IntTensor {
-        val ii = asIntTensor().minusIndex(i)
-        val jj = asIntTensor().minusIndex(j)
-        checkTranspose(asIntTensor().dimension, ii, jj)
-        val n = asIntTensor().numElements
+    override fun Tensor<Int>.transposed(i: Int, j: Int): IntTensor {
+        // TODO change strides instead of changing content
+        val dt = asIntTensor()
+        val ii = dt.minusIndex(i)
+        val jj = dt.minusIndex(j)
+        checkTranspose(dt.dimension, ii, jj)
+        val n = dt.linearSize
         val resBuffer = IntArray(n)
 
-        val resShape = asIntTensor().shape.copyOf()
+        val resShape = dt.shape.copyOf()
         resShape[ii] = resShape[jj].also { resShape[jj] = resShape[ii] }
 
-        val resTensor = IntTensor(resShape, resBuffer)
+        val resTensor = IntTensor(resShape, resBuffer.asBuffer())
 
         for (offset in 0 until n) {
-            val oldMultiIndex = asIntTensor().indices.index(offset)
+            val oldMultiIndex = dt.indices.index(offset)
             val newMultiIndex = oldMultiIndex.copyOf()
             newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
 
             val linearIndex = resTensor.indices.offset(newMultiIndex)
-            resTensor.mutableBuffer.array()[linearIndex] =
-                asIntTensor().mutableBuffer.array()[asIntTensor().bufferStart + offset]
+            resTensor.source[linearIndex] = dt.source[offset]
         }
         return resTensor
     }
 
     override fun Tensor<Int>.view(shape: IntArray): IntTensor {
         checkView(asIntTensor(), shape)
-        return IntTensor(shape, asIntTensor().mutableBuffer.array(), asIntTensor().bufferStart)
+        return IntTensor(shape, asIntTensor().source)
     }
 
     override fun Tensor<Int>.viewAs(other: StructureND<Int>): IntTensor =
-        asIntTensor().view(other.shape)
+        view(other.shape)
+
+    override fun StructureND<Int>.dot(other: StructureND<Int>): IntTensor {
+        return if (dimension in 0..2 && other.dimension in 0..2) TODO("not implemented")
+        else error("Only vectors and matrices are allowed in non-broadcasting dot operation")
+    }
 
     override fun diagonalEmbedding(
         diagonalEntries: Tensor<Int>,
@@ -374,7 +319,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
                 diagonalEntries.shape.slice(greaterDim - 1 until n - 1).toIntArray()
         val resTensor = zeros(resShape)
 
-        for (i in 0 until diagonalEntries.asIntTensor().numElements) {
+        for (i in 0 until diagonalEntries.asIntTensor().linearSize) {
             val multiIndex = diagonalEntries.asIntTensor().indices.index(i)
 
             var offset1 = 0
@@ -394,16 +339,27 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
         return resTensor.asIntTensor()
     }
 
-    private infix fun Tensor<Int>.eq(
+    /**
+     * Compares element-wise two int tensors
+     *
+     * @param other the tensor to compare with `input` tensor.
+     * @param epsilon permissible error when comparing two Int values.
+     * @return true if two tensors have the same shape and elements, false otherwise.
+     */
+    public fun Tensor<Int>.eq(other: Tensor<Int>): Boolean =
+        asIntTensor().eq(other) { x, y -> x == y }
+
+    private fun Tensor<Int>.eq(
         other: Tensor<Int>,
+        eqFunction: (Int, Int) -> Boolean,
     ): Boolean {
         checkShapesCompatible(asIntTensor(), other)
-        val n = asIntTensor().numElements
-        if (n != other.asIntTensor().numElements) {
+        val n = asIntTensor().linearSize
+        if (n != other.asIntTensor().linearSize) {
             return false
         }
         for (i in 0 until n) {
-            if (asIntTensor().mutableBuffer[asIntTensor().bufferStart + i] != other.asIntTensor().mutableBuffer[other.asIntTensor().bufferStart + i]) {
+            if (!eqFunction(asIntTensor().source[i], other.asIntTensor().source[i])) {
                 return false
             }
         }
@@ -421,10 +377,12 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
         val shape = tensors[0].shape
         check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
         val resShape = intArrayOf(tensors.size) + shape
-        val resBuffer = tensors.flatMap {
-            it.asIntTensor().mutableBuffer.array().drop(it.asIntTensor().bufferStart).take(it.asIntTensor().numElements)
-        }.toIntArray()
-        return IntTensor(resShape, resBuffer, 0)
+//        val resBuffer: List<Int> = tensors.flatMap {
+//            it.asIntTensor().source.array.drop(it.asIntTensor().bufferStart)
+//                .take(it.asIntTensor().linearSize)
+//        }
+        val resBuffer = tensors.map { it.asIntTensor().source }.concat()
+        return IntTensor(resShape, resBuffer)
     }
 
     /**
@@ -435,14 +393,11 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      */
     public fun Tensor<Int>.rowsByIndices(indices: IntArray): IntTensor = stack(indices.map { getTensor(it) })
 
-    private inline fun StructureND<Int>.fold(foldFunction: (IntArray) -> Int): Int =
-        foldFunction(asIntTensor().copyArray())
-
-    private inline fun <reified R : Any> StructureND<Int>.foldDim(
+    private inline fun StructureND<Int>.foldDimToInt(
         dim: Int,
         keepDim: Boolean,
-        foldFunction: (IntArray) -> R,
-    ): BufferedTensor<R> {
+        foldFunction: (IntArray) -> Int,
+    ): IntTensor {
         check(dim < dimension) { "Dimension $dim out of range $dimension" }
         val resShape = if (keepDim) {
             shape.take(dim).toIntArray() + intArrayOf(1) + shape.takeLast(dimension - dim - 1).toIntArray()
@@ -451,9 +406,9 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
         }
         val resNumElements = resShape.reduce(Int::times)
         val init = foldFunction(IntArray(1) { 0 })
-        val resTensor = BufferedTensor(
+        val resTensor = IntTensor(
             resShape,
-            MutableBuffer.auto(resNumElements) { init }, 0
+            IntBuffer(resNumElements) { init }
         )
         for (index in resTensor.indices) {
             val prefix = index.take(dim).toIntArray()
@@ -465,31 +420,33 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
         return resTensor
     }
 
-    override fun StructureND<Int>.sum(): Int = asIntTensor().fold { it.sum() }
+
+    override fun StructureND<Int>.sum(): Int = reduceElements { it.array.sum() }
 
     override fun StructureND<Int>.sum(dim: Int, keepDim: Boolean): IntTensor =
-        foldDim(dim, keepDim) { x -> x.sum() }.asIntTensor()
+        foldDimToInt(dim, keepDim) { x -> x.sum() }
 
-    override fun StructureND<Int>.min(): Int = this.fold { it.minOrNull()!! }
+    override fun StructureND<Int>.min(): Int = reduceElements { it.array.min() }
 
     override fun StructureND<Int>.min(dim: Int, keepDim: Boolean): IntTensor =
-        foldDim(dim, keepDim) { x -> x.minOrNull()!! }.asIntTensor()
+        foldDimToInt(dim, keepDim) { x -> x.minOrNull()!! }
 
-    override fun StructureND<Int>.argMin(dim: Int, keepDim: Boolean): IntTensor =
-        foldDim(dim, keepDim) { x ->
-            x.withIndex().minByOrNull { it.value }?.index!!
-        }.asIntTensor()
+    override fun StructureND<Int>.argMin(dim: Int, keepDim: Boolean): Tensor<Int> = foldDimToInt(dim, keepDim) { x ->
+        x.withIndex().minBy { it.value }.index
+    }
 
-    override fun StructureND<Int>.max(): Int = this.fold { it.maxOrNull()!! }
+    override fun StructureND<Int>.max(): Int = reduceElements { it.array.max() }
 
     override fun StructureND<Int>.max(dim: Int, keepDim: Boolean): IntTensor =
-        foldDim(dim, keepDim) { x -> x.maxOrNull()!! }.asIntTensor()
+        foldDimToInt(dim, keepDim) { x -> x.max() }
 
 
     override fun StructureND<Int>.argMax(dim: Int, keepDim: Boolean): IntTensor =
-        foldDim(dim, keepDim) { x ->
-            x.withIndex().maxByOrNull { it.value }?.index!!
-        }.asIntTensor()
+        foldDimToInt(dim, keepDim) { x ->
+            x.withIndex().maxBy { it.value }.index
+        }
+
+    public fun StructureND<Int>.mean(): Double = sum().toDouble() / indices.linearSize
 }
 
 public val Int.Companion.tensorAlgebra: IntTensorAlgebra get() = IntTensorAlgebra
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
index ab97903e4..fee62c79c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors.core.internal
 
+import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.tensors.core.DoubleTensor
 import kotlin.math.max
 
@@ -24,8 +25,8 @@ internal fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: DoubleTenso
         }
 
         val curLinearIndex = tensor.indices.offset(curMultiIndex)
-        resTensor.mutableBuffer.array()[linearIndex] =
-            tensor.mutableBuffer.array()[tensor.bufferStart + curLinearIndex]
+        resTensor.source[linearIndex] =
+            tensor.source[curLinearIndex]
     }
 }
 
@@ -63,7 +64,7 @@ internal fun broadcastTo(tensor: DoubleTensor, newShape: IntArray): DoubleTensor
     }
 
     val n = newShape.reduce { acc, i -> acc * i }
-    val resTensor = DoubleTensor(newShape, DoubleArray(n))
+    val resTensor = DoubleTensor(newShape, DoubleArray(n).asBuffer())
 
     for (i in tensor.shape.indices) {
         val curDim = tensor.shape[i]
@@ -82,7 +83,7 @@ internal fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleTensor>
     val n = totalShape.reduce { acc, i -> acc * i }
 
     return tensors.map { tensor ->
-        val resTensor = DoubleTensor(totalShape, DoubleArray(n))
+        val resTensor = DoubleTensor(totalShape, DoubleArray(n).asBuffer())
         multiIndexBroadCasting(tensor, resTensor, n)
         resTensor
     }
@@ -106,17 +107,17 @@ internal fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTen
         for (tensor in tensors) {
             val matrixShape = tensor.shape.sliceArray(tensor.shape.size - 2 until tensor.shape.size).copyOf()
             val matrixSize = matrixShape[0] * matrixShape[1]
-            val matrix = DoubleTensor(matrixShape, DoubleArray(matrixSize))
+            val matrix = DoubleTensor(matrixShape, DoubleArray(matrixSize).asBuffer())
 
-            val outerTensor = DoubleTensor(totalShape, DoubleArray(n))
-            val resTensor = DoubleTensor(totalShape + matrixShape, DoubleArray(n * matrixSize))
+            val outerTensor = DoubleTensor(totalShape, DoubleArray(n).asBuffer())
+            val resTensor = DoubleTensor(totalShape + matrixShape, DoubleArray(n * matrixSize).asBuffer())
 
             for (linearIndex in 0 until n) {
                 val totalMultiIndex = outerTensor.indices.index(linearIndex)
                 var curMultiIndex = tensor.shape.sliceArray(0..tensor.shape.size - 3).copyOf()
                 curMultiIndex = IntArray(totalMultiIndex.size - curMultiIndex.size) { 1 } + curMultiIndex
 
-                val newTensor = DoubleTensor(curMultiIndex + matrixShape, tensor.mutableBuffer.array())
+                val newTensor = DoubleTensor(curMultiIndex + matrixShape, tensor.source)
 
                 for (i in curMultiIndex.indices) {
                     if (curMultiIndex[i] != 1) {
@@ -136,8 +137,8 @@ internal fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTen
                                 matrix.indices.index(i)
                     )
 
-                    resTensor.mutableBuffer.array()[resTensor.bufferStart + newLinearIndex] =
-                        newTensor.mutableBuffer.array()[newTensor.bufferStart + curLinearIndex]
+                    resTensor.source[newLinearIndex] =
+                        newTensor.source[curLinearIndex]
                 }
             }
             add(resTensor)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index 62cc85396..f19ee8f3d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -9,9 +9,10 @@ import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.asDoubleTensor
 
 
-internal fun checkEmptyShape(shape: IntArray) =
+internal fun checkNotEmptyShape(shape: IntArray) =
     check(shape.isNotEmpty()) {
         "Illegal empty shape provided"
     }
@@ -25,7 +26,8 @@ internal fun checkBufferShapeConsistency(shape: IntArray, buffer: DoubleArray) =
         "Inconsistent shape ${shape.toList()} for buffer of size ${buffer.size} provided"
     }
 
-internal fun <T> checkShapesCompatible(a: StructureND<T>, b: StructureND<T>) =
+@PublishedApi
+internal fun <T> checkShapesCompatible(a: StructureND<T>, b: StructureND<T>): Unit =
     check(a.shape contentEquals b.shape) {
         "Incompatible shapes ${a.shape.toList()} and ${b.shape.toList()} "
     }
@@ -50,15 +52,14 @@ internal fun checkSquareMatrix(shape: IntArray) {
 
 internal fun DoubleTensorAlgebra.checkSymmetric(
     tensor: Tensor<Double>, epsilon: Double = 1e-6,
-) =
-    check(tensor.eq(tensor.transpose(), epsilon)) {
-        "Tensor is not symmetric about the last 2 dimensions at precision $epsilon"
-    }
+) = check(tensor.eq(tensor.transposed(), epsilon)) {
+    "Tensor is not symmetric about the last 2 dimensions at precision $epsilon"
+}
 
 internal fun DoubleTensorAlgebra.checkPositiveDefinite(tensor: DoubleTensor, epsilon: Double = 1e-6) {
     checkSymmetric(tensor, epsilon)
     for (mat in tensor.matrixSequence())
-        check(mat.toTensor().detLU().value() > 0.0) {
-            "Tensor contains matrices which are not positive definite ${mat.toTensor().detLU().value()}"
+        check(mat.asDoubleTensor().detLU().value() > 0.0) {
+            "Tensor contains matrices which are not positive definite ${mat.asDoubleTensor().detLU().value()}"
         }
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
new file mode 100644
index 000000000..9c6f54d61
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core.internal
+
+import space.kscience.kmath.nd.MutableStructure2D
+import space.kscience.kmath.nd.Structure2D
+import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.nd.get
+import space.kscience.kmath.operations.asSequence
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.VirtualBuffer
+import space.kscience.kmath.structures.asBuffer
+import space.kscience.kmath.structures.indices
+import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra.eye
+import space.kscience.kmath.tensors.core.BufferedTensor
+import space.kscience.kmath.tensors.core.DoubleTensor
+import space.kscience.kmath.tensors.core.OffsetDoubleBuffer
+import space.kscience.kmath.tensors.core.copyToTensor
+import kotlin.math.abs
+import kotlin.math.max
+import kotlin.math.sqrt
+
+
+internal fun MutableStructure2D<Double>.jacobiHelper(
+    maxIteration: Int,
+    epsilon: Double,
+): Pair<DoubleBuffer, Structure2D<Double>> {
+    val n = rowNum
+    val A_ = copyToTensor()
+    val V = eye(n)
+    val D = DoubleBuffer(n) { get(it, it) }
+    val B = DoubleBuffer(n) { get(it, it) }
+    val Z = DoubleBuffer(n) { 0.0 }
+
+    // assume that buffered tensor is square matrix
+    operator fun DoubleTensor.get(i: Int, j: Int): Double {
+        return source[i * shape[0] + j]
+    }
+
+    operator fun BufferedTensor<Double>.set(i: Int, j: Int, value: Double) {
+        source[i * shape[0] + j] = value
+    }
+
+    fun maxOffDiagonal(matrix: BufferedTensor<Double>): Double {
+        var maxOffDiagonalElement = 0.0
+        for (i in 0 until n - 1) {
+            for (j in i + 1 until n) {
+                maxOffDiagonalElement = max(maxOffDiagonalElement, abs(matrix[i, j]))
+            }
+        }
+        return maxOffDiagonalElement
+    }
+
+    fun rotate(a: BufferedTensor<Double>, s: Double, tau: Double, i: Int, j: Int, k: Int, l: Int) {
+        val g = a[i, j]
+        val h = a[k, l]
+        a[i, j] = g - s * (h + g * tau)
+        a[k, l] = h + s * (g - h * tau)
+    }
+
+    fun jacobiIteration(
+        a: BufferedTensor<Double>,
+        v: BufferedTensor<Double>,
+        d: DoubleBuffer,
+        z: DoubleBuffer,
+    ) {
+        for (ip in 0 until n - 1) {
+            for (iq in ip + 1 until n) {
+                val g = 100.0 * abs(a[ip, iq])
+
+                if (g <= epsilon * abs(d[ip]) && g <= epsilon * abs(d[iq])) {
+                    a[ip, iq] = 0.0
+                    continue
+                }
+
+                var h = d[iq] - d[ip]
+                val t = when {
+                    g <= epsilon * abs(h) -> (a[ip, iq]) / h
+                    else -> {
+                        val theta = 0.5 * h / (a[ip, iq])
+                        val denominator = abs(theta) + sqrt(1.0 + theta * theta)
+                        if (theta < 0.0) -1.0 / denominator else 1.0 / denominator
+                    }
+                }
+
+                val c = 1.0 / sqrt(1 + t * t)
+                val s = t * c
+                val tau = s / (1.0 + c)
+                h = t * a[ip, iq]
+                z[ip] -= h
+                z[iq] += h
+                d[ip] -= h
+                d[iq] += h
+                a[ip, iq] = 0.0
+
+                for (j in 0 until ip) {
+                    rotate(a, s, tau, j, ip, j, iq)
+                }
+                for (j in (ip + 1) until iq) {
+                    rotate(a, s, tau, ip, j, j, iq)
+                }
+                for (j in (iq + 1) until n) {
+                    rotate(a, s, tau, ip, j, iq, j)
+                }
+                for (j in 0 until n) {
+                    rotate(v, s, tau, j, ip, j, iq)
+                }
+            }
+        }
+    }
+
+    fun updateDiagonal(
+        d: DoubleBuffer,
+        z: DoubleBuffer,
+        b: DoubleBuffer,
+    ) {
+        for (ip in 0 until d.size) {
+            b[ip] += z[ip]
+            d[ip] = b[ip]
+            z[ip] = 0.0
+        }
+    }
+
+    var sm = maxOffDiagonal(A_)
+    for (iteration in 0 until maxIteration) {
+        if (sm < epsilon) {
+            break
+        }
+
+        jacobiIteration(A_, V, D, Z)
+        updateDiagonal(D, Z, B)
+        sm = maxOffDiagonal(A_)
+    }
+
+    // TODO sort eigenvalues
+    return D to V.as2D()
+}
+
+/**
+ * Concatenate a list of arrays
+ */
+internal fun List<OffsetDoubleBuffer>.concat(): DoubleBuffer {
+    val array = DoubleArray(sumOf { it.size })
+    var pointer = 0
+    while (pointer < array.size) {
+        for (bufferIndex in indices) {
+            val buffer = get(bufferIndex)
+            for (innerIndex in buffer.indices) {
+                array[pointer] = buffer[innerIndex]
+                pointer++
+            }
+        }
+    }
+    return array.asBuffer()
+}
+
+internal val DoubleTensor.vectors: VirtualBuffer<DoubleTensor>
+    get() {
+        val n = shape.size
+        val vectorOffset = shape[n - 1]
+        val vectorShape = intArrayOf(shape.last())
+
+        return VirtualBuffer(linearSize / vectorOffset) { index ->
+            val offset = index * vectorOffset
+            DoubleTensor(vectorShape, source.view(offset))
+        }
+    }
+
+
+internal fun DoubleTensor.vectorSequence(): Sequence<DoubleTensor> = vectors.asSequence()
+
+
+internal val DoubleTensor.matrices: VirtualBuffer<DoubleTensor>
+    get(){
+    val n = shape.size
+    check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
+    val matrixOffset = shape[n - 1] * shape[n - 2]
+    val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
+
+    return VirtualBuffer(linearSize / matrixOffset) { index ->
+        val offset = index * matrixOffset
+        DoubleTensor(matrixShape, source.view(offset))
+    }
+}
+
+internal fun DoubleTensor.matrixSequence(): Sequence<DoubleTensor> = matrices.asSequence()
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
new file mode 100644
index 000000000..93229c2d4
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core.internal
+
+import space.kscience.kmath.operations.asSequence
+import space.kscience.kmath.structures.IntBuffer
+import space.kscience.kmath.structures.VirtualBuffer
+import space.kscience.kmath.structures.asBuffer
+import space.kscience.kmath.structures.indices
+import space.kscience.kmath.tensors.core.IntTensor
+import space.kscience.kmath.tensors.core.OffsetIntBuffer
+
+/**
+ * Concatenate a list of arrays
+ */
+internal fun List<OffsetIntBuffer>.concat(): IntBuffer {
+    val array = IntArray(sumOf { it.size })
+    var pointer = 0
+    while (pointer < array.size) {
+        for (bufferIndex in indices) {
+            val buffer = get(bufferIndex)
+            for (innerIndex in buffer.indices) {
+                array[pointer] = buffer[innerIndex]
+                pointer++
+            }
+        }
+    }
+    return array.asBuffer()
+}
+
+
+internal val IntTensor.vectors: VirtualBuffer<IntTensor>
+    get() {
+        val n = shape.size
+        val vectorOffset = shape[n - 1]
+        val vectorShape = intArrayOf(shape.last())
+
+        return VirtualBuffer(linearSize / vectorOffset) { index ->
+            val offset = index * vectorOffset
+            IntTensor(vectorShape, source.view(offset))
+        }
+    }
+
+
+internal fun IntTensor.vectorSequence(): Sequence<IntTensor> = vectors.asSequence()
+
+
+internal val IntTensor.matrices: VirtualBuffer<IntTensor>
+    get(){
+        val n = shape.size
+        check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
+        val matrixOffset = shape[n - 1] * shape[n - 2]
+        val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
+
+        return VirtualBuffer(linearSize / matrixOffset) { index ->
+            val offset = index * matrixOffset
+            IntTensor(matrixShape, source.view(offset))
+        }
+    }
+
+internal fun IntTensor.matrixSequence(): Sequence<IntTensor> = matrices.asSequence()
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index ec529590f..9047ba29e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -5,75 +5,33 @@
 
 package space.kscience.kmath.tensors.core.internal
 
-import space.kscience.kmath.nd.MutableStructure1D
-import space.kscience.kmath.nd.MutableStructure2D
-import space.kscience.kmath.nd.as1D
-import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.operations.asSequence
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.structures.VirtualBuffer
-import space.kscience.kmath.tensors.core.BufferedTensor
-import space.kscience.kmath.tensors.core.DoubleTensor
-import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
-import space.kscience.kmath.tensors.core.IntTensor
+import space.kscience.kmath.structures.IntBuffer
+import space.kscience.kmath.structures.asBuffer
+import space.kscience.kmath.structures.indices
+import space.kscience.kmath.tensors.core.*
 import kotlin.math.abs
 import kotlin.math.min
 import kotlin.math.sqrt
 
-internal val <T> BufferedTensor<T>.vectors: VirtualBuffer<BufferedTensor<T>>
-    get() {
-        val n = shape.size
-        val vectorOffset = shape[n - 1]
-        val vectorShape = intArrayOf(shape.last())
-
-        return VirtualBuffer(numElements / vectorOffset) { index ->
-            val offset = index * vectorOffset
-            BufferedTensor(vectorShape, mutableBuffer, bufferStart + offset)
-        }
-    }
-
-
-internal fun <T> BufferedTensor<T>.vectorSequence(): Sequence<BufferedTensor<T>> = vectors.asSequence()
-
-/**
- * A random access alternative to [matrixSequence]
- */
-internal val <T> BufferedTensor<T>.matrices: VirtualBuffer<BufferedTensor<T>>
-    get() {
-        val n = shape.size
-        check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
-        val matrixOffset = shape[n - 1] * shape[n - 2]
-        val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
-
-        return VirtualBuffer(numElements / matrixOffset) { index ->
-            val offset = index * matrixOffset
-            BufferedTensor(matrixShape, mutableBuffer, bufferStart + offset)
-        }
-    }
-
-internal fun <T> BufferedTensor<T>.matrixSequence(): Sequence<BufferedTensor<T>> = matrices.asSequence()
-
 internal fun dotTo(
     a: BufferedTensor<Double>,
     b: BufferedTensor<Double>,
     res: BufferedTensor<Double>,
     l: Int, m: Int, n: Int,
 ) {
-    val aStart = a.bufferStart
-    val bStart = b.bufferStart
-    val resStart = res.bufferStart
-
-    val aBuffer = a.mutableBuffer
-    val bBuffer = b.mutableBuffer
-    val resBuffer = res.mutableBuffer
+    val aBuffer = a.source
+    val bBuffer = b.source
+    val resBuffer = res.source
 
     for (i in 0 until l) {
         for (j in 0 until n) {
             var curr = 0.0
             for (k in 0 until m) {
-                curr += aBuffer[aStart + i * m + k] * bBuffer[bStart + k * n + j]
+                curr += aBuffer[i * m + k] * bBuffer[k * n + j]
             }
-            resBuffer[resStart + i * n + j] = curr
+            resBuffer[i * n + j] = curr
         }
     }
 }
@@ -129,7 +87,7 @@ internal fun luHelper(
     return false
 }
 
-internal fun <T> BufferedTensor<T>.setUpPivots(): IntTensor {
+internal fun <T> StructureND<T>.setUpPivots(): IntTensor {
     val n = this.shape.size
     val m = this.shape.last()
     val pivotsShape = IntArray(n - 1) { i -> this.shape[i] }
@@ -137,17 +95,17 @@ internal fun <T> BufferedTensor<T>.setUpPivots(): IntTensor {
 
     return IntTensor(
         pivotsShape,
-        IntArray(pivotsShape.reduce(Int::times)) { 0 }
+        IntBuffer(pivotsShape.reduce(Int::times)) { 0 }
     )
 }
 
 internal fun DoubleTensorAlgebra.computeLU(
-    tensor: DoubleTensor,
+    tensor: StructureND<Double>,
     epsilon: Double,
 ): Pair<DoubleTensor, IntTensor>? {
 
     checkSquareMatrix(tensor.shape)
-    val luTensor = tensor.copy()
+    val luTensor = tensor.copyToTensor()
     val pivotsTensor = tensor.setUpPivots()
 
     for ((lu, pivots) in luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()))
@@ -253,8 +211,8 @@ internal fun DoubleTensorAlgebra.qrHelper(
     checkSquareMatrix(matrix.shape)
     val n = matrix.shape[0]
     val qM = q.as2D()
-    val matrixT = matrix.transpose(0, 1)
-    val qT = q.transpose(0, 1)
+    val matrixT = matrix.transposed(0, 1)
+    val qT = q.transposed(0, 1)
 
     for (j in 0 until n) {
         val v = matrixT.getTensor(j)
@@ -280,10 +238,10 @@ internal fun DoubleTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double = 1e-10)
     var v: DoubleTensor
     val b: DoubleTensor
     if (n > m) {
-        b = a.transpose(0, 1).dot(a)
+        b = a.transposed(0, 1).dot(a)
         v = DoubleTensor(intArrayOf(m), getRandomUnitVector(m, 0))
     } else {
-        b = a.dot(a.transpose(0, 1))
+        b = a.dot(a.transposed(0, 1))
         v = DoubleTensor(intArrayOf(n), getRandomUnitVector(n, 0))
     }
 
@@ -308,7 +266,7 @@ internal fun DoubleTensorAlgebra.svdHelper(
     val (matrixU, matrixS, matrixV) = USV
 
     for (k in 0 until min(n, m)) {
-        var a = matrix.copy()
+        var a = matrix.copyToTensor()
         for ((singularValue, u, v) in res.slice(0 until k)) {
             val outerProduct = DoubleArray(u.shape[0] * v.shape[0])
             for (i in 0 until u.shape[0]) {
@@ -316,7 +274,7 @@ internal fun DoubleTensorAlgebra.svdHelper(
                     outerProduct[i * v.shape[0] + j] = u.getTensor(i).value() * v.getTensor(j).value()
                 }
             }
-            a = a - singularValue.times(DoubleTensor(intArrayOf(u.shape[0], v.shape[0]), outerProduct))
+            a = a - singularValue.times(DoubleTensor(intArrayOf(u.shape[0], v.shape[0]), outerProduct.asBuffer()))
         }
         var v: DoubleTensor
         var u: DoubleTensor
@@ -328,7 +286,7 @@ internal fun DoubleTensorAlgebra.svdHelper(
             u = u.times(1.0 / norm)
         } else {
             u = svd1d(a, epsilon)
-            v = matrix.transpose(0, 1).dot(u)
+            v = matrix.transposed(0, 1).dot(u)
             norm = DoubleTensorAlgebra { (v dot v).sqrt().value() }
             v = v.times(1.0 / norm)
         }
@@ -337,15 +295,15 @@ internal fun DoubleTensorAlgebra.svdHelper(
     }
 
     val s = res.map { it.first }.toDoubleArray()
-    val uBuffer = res.map { it.second }.flatMap { it.mutableBuffer.array().toList() }.toDoubleArray()
-    val vBuffer = res.map { it.third }.flatMap { it.mutableBuffer.array().toList() }.toDoubleArray()
+    val uBuffer = res.map { it.second.source }.concat()
+    val vBuffer = res.map { it.third.source }.concat()
     for (i in uBuffer.indices) {
-        matrixU.mutableBuffer.array()[matrixU.bufferStart + i] = uBuffer[i]
+        matrixU.source[i] = uBuffer[i]
     }
     for (i in s.indices) {
-        matrixS.mutableBuffer.array()[matrixS.bufferStart + i] = s[i]
+        matrixS.source[i] = s[i]
     }
     for (i in vBuffer.indices) {
-        matrixV.mutableBuffer.array()[matrixV.bufferStart + i] = vBuffer[i]
+        matrixV.source[i] = vBuffer[i]
     }
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
deleted file mode 100644
index e7704b257..000000000
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/tensorCastsUtils.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.tensors.core.internal
-
-import space.kscience.kmath.nd.MutableBufferND
-import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.structures.asMutableBuffer
-import space.kscience.kmath.tensors.core.BufferedTensor
-import space.kscience.kmath.tensors.core.DoubleTensor
-import space.kscience.kmath.tensors.core.IntTensor
-import space.kscience.kmath.tensors.core.TensorLinearStructure
-
-internal fun BufferedTensor<Int>.toTensor(): IntTensor =
-    IntTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
-
-internal fun BufferedTensor<Double>.toTensor(): DoubleTensor =
-    DoubleTensor(this.shape, this.mutableBuffer.array(), this.bufferStart)
-
-internal fun <T> StructureND<T>.copyToBufferedTensor(): BufferedTensor<T> =
-    BufferedTensor(
-        this.shape,
-        TensorLinearStructure(this.shape).asSequence().map(this::get).toMutableList().asMutableBuffer(),
-        0
-    )
-
-internal fun <T> StructureND<T>.toBufferedTensor(): BufferedTensor<T> = when (this) {
-    is BufferedTensor<T> -> this
-    is MutableBufferND<T> -> if (this.indices == TensorLinearStructure(this.shape)) {
-        BufferedTensor(this.shape, this.buffer, 0)
-    } else {
-        this.copyToBufferedTensor()
-    }
-    else -> this.copyToBufferedTensor()
-}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index 8a96d516f..daafdaa58 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -6,41 +6,25 @@
 package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.nd.as1D
+import space.kscience.kmath.operations.DoubleBufferOps.Companion.map
 import space.kscience.kmath.operations.toMutableList
 import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.stat.RandomGenerator
-import space.kscience.kmath.structures.*
+import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.tensors.core.BufferedTensor
 import space.kscience.kmath.tensors.core.DoubleTensor
 import kotlin.math.*
 
-/**
- * Returns a reference to [IntArray] containing all the elements of this [Buffer] or copy the data.
- */
-internal fun Buffer<Int>.array(): IntArray = when (this) {
-    is IntBuffer -> array
-    else -> this.toIntArray()
-}
-
-/**
- * Returns a reference to [DoubleArray] containing all the elements of this [Buffer] or copy the data.
- */
-@PublishedApi
-internal fun Buffer<Double>.array(): DoubleArray = when (this) {
-    is DoubleBuffer -> array
-    else -> this.toDoubleArray()
-}
-
-internal fun getRandomNormals(n: Int, seed: Long): DoubleArray {
+internal fun getRandomNormals(n: Int, seed: Long): DoubleBuffer {
     val distribution = GaussianSampler(0.0, 1.0)
     val generator = RandomGenerator.default(seed)
-    return distribution.sample(generator).nextBufferBlocking(n).toDoubleArray()
+    return distribution.sample(generator).nextBufferBlocking(n)
 }
 
-internal fun getRandomUnitVector(n: Int, seed: Long): DoubleArray {
-    val unnorm = getRandomNormals(n, seed)
-    val norm = sqrt(unnorm.sumOf { it * it })
-    return unnorm.map { it / norm }.toDoubleArray()
+internal fun getRandomUnitVector(n: Int, seed: Long): DoubleBuffer {
+    val unnorm: DoubleBuffer = getRandomNormals(n, seed)
+    val norm = sqrt(unnorm.array.sumOf { it * it })
+    return unnorm.map { it / norm }
 }
 
 internal fun minusIndexFrom(n: Int, i: Int): Int = if (i >= 0) i else {
@@ -71,6 +55,7 @@ internal fun format(value: Double, digits: Int = 4): String = buildString {
                 append("e+")
                 append(order)
             }
+
             else -> {
                 append('e')
                 append(order)
@@ -116,7 +101,7 @@ internal fun DoubleTensor.toPrettyString(): String = buildString {
         }
 
         offset += vectorSize
-        if (this@toPrettyString.numElements == offset) {
+        if (this@toPrettyString.linearSize == offset) {
             break
         }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
deleted file mode 100644
index 1c914d474..000000000
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorCasts.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.tensors.core
-
-import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.tensors.api.Tensor
-import space.kscience.kmath.tensors.core.internal.toBufferedTensor
-import space.kscience.kmath.tensors.core.internal.toTensor
-
-/**
- * Casts [Tensor] of [Double] to [DoubleTensor]
- */
-public fun StructureND<Double>.asDoubleTensor(): DoubleTensor = when (this) {
-    is DoubleTensor -> this
-    else -> this.toBufferedTensor().toTensor()
-}
-
-/**
- * Casts [Tensor] of [Int] to [IntTensor]
- */
-public fun StructureND<Int>.asIntTensor(): IntTensor = when (this) {
-    is IntTensor -> this
-    else -> this.toBufferedTensor().toTensor()
-}
-
-/**
- * Returns a copy-protected [DoubleArray] of tensor elements
- */
-public fun DoubleTensor.copyArray(): DoubleArray {
-    //TODO use ArrayCopy
-    return DoubleArray(numElements) { i ->
-        mutableBuffer[bufferStart + i]
-    }
-}
-
-/**
- * Returns a copy-protected [IntArray] of tensor elements
- */
-public fun IntTensor.copyArray(): IntArray {
-    return IntArray(numElements) { i ->
-        mutableBuffer[bufferStart + i]
-    }
-}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt
new file mode 100644
index 000000000..30a828d6a
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.asBuffer
+import space.kscience.kmath.tensors.api.Tensor
+
+
+public fun StructureND<Double>.copyToTensor(): DoubleTensor = if (this is DoubleTensor) {
+    DoubleTensor(shape, source.copy())
+} else {
+    DoubleTensor(
+        shape,
+        TensorLinearStructure(this.shape).map(this::get).toDoubleArray().asBuffer(),
+    )
+}
+
+public fun StructureND<Int>.toDoubleTensor(): DoubleTensor {
+    return if (this is IntTensor) {
+        DoubleTensor(
+            shape,
+            DoubleBuffer(linearSize) { source[it].toDouble() }
+        )
+    } else {
+        val tensor = DoubleTensorAlgebra.zeroesLike(this)
+        indices.forEach {
+            tensor[it] = get(it).toDouble()
+        }
+        return tensor
+    }
+}
+
+/**
+ * Casts [Tensor] of [Double] to [DoubleTensor]
+ */
+public fun StructureND<Double>.asDoubleTensor(): DoubleTensor = when (this) {
+    is DoubleTensor -> this
+    else -> copyToTensor()
+}
+
+/**
+ * Casts [Tensor] of [Int] to [IntTensor]
+ */
+public fun StructureND<Int>.asIntTensor(): IntTensor = when (this) {
+    is IntTensor -> this
+    else -> IntTensor(
+        this.shape,
+        TensorLinearStructure(this.shape).map(this::get).toIntArray().asBuffer()
+    )
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 67d5f9a96..6a99b9ba8 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -6,7 +6,10 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.internal.*
+import space.kscience.kmath.tensors.core.internal.broadcastOuterTensors
+import space.kscience.kmath.tensors.core.internal.broadcastShapes
+import space.kscience.kmath.tensors.core.internal.broadcastTensors
+import space.kscience.kmath.tensors.core.internal.broadcastTo
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
@@ -34,7 +37,7 @@ internal class TestBroadcasting {
 
         val res = broadcastTo(tensor2, tensor1.shape)
         assertTrue(res.shape contentEquals intArrayOf(2, 3))
-        assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
+        assertTrue(res.source contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
     }
 
     @Test
@@ -49,9 +52,9 @@ internal class TestBroadcasting {
         assertTrue(res[1].shape contentEquals intArrayOf(1, 2, 3))
         assertTrue(res[2].shape contentEquals intArrayOf(1, 2, 3))
 
-        assertTrue(res[0].mutableBuffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res[1].mutableBuffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
-        assertTrue(res[2].mutableBuffer.array() contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
+        assertTrue(res[0].source contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res[1].source contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
+        assertTrue(res[2].source contentEquals doubleArrayOf(500.0, 500.0, 500.0, 500.0, 500.0, 500.0))
     }
 
     @Test
@@ -66,15 +69,15 @@ internal class TestBroadcasting {
         assertTrue(res[1].shape contentEquals intArrayOf(1, 1, 3))
         assertTrue(res[2].shape contentEquals intArrayOf(1, 1, 1))
 
-        assertTrue(res[0].mutableBuffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res[1].mutableBuffer.array() contentEquals doubleArrayOf(10.0, 20.0, 30.0))
-        assertTrue(res[2].mutableBuffer.array() contentEquals doubleArrayOf(500.0))
+        assertTrue(res[0].source contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res[1].source contentEquals doubleArrayOf(10.0, 20.0, 30.0))
+        assertTrue(res[2].source contentEquals doubleArrayOf(500.0))
     }
 
     @Test
     fun testBroadcastOuterTensorsShapes() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(intArrayOf(2, 1, 3, 2, 3), DoubleArray(2 * 1 * 3 * 2 * 3) {0.0})
-        val tensor2 = fromArray(intArrayOf(4, 2, 5, 1, 3, 3), DoubleArray(4 * 2 * 5 * 1 * 3 * 3) {0.0})
+        val tensor1 = fromArray(intArrayOf(2, 1, 3, 2, 3), DoubleArray(2 * 1 * 3 * 2 * 3) { 0.0 })
+        val tensor2 = fromArray(intArrayOf(4, 2, 5, 1, 3, 3), DoubleArray(4 * 2 * 5 * 1 * 3 * 3) { 0.0 })
         val tensor3 = fromArray(intArrayOf(1, 1), doubleArrayOf(500.0))
 
         val res = broadcastOuterTensors(tensor1, tensor2, tensor3)
@@ -95,16 +98,16 @@ internal class TestBroadcasting {
         val tensor32 = tensor3 - tensor2
 
         assertTrue(tensor21.shape contentEquals intArrayOf(2, 3))
-        assertTrue(tensor21.mutableBuffer.array() contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
+        assertTrue(tensor21.source contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
 
         assertTrue(tensor31.shape contentEquals intArrayOf(1, 2, 3))
         assertTrue(
-            tensor31.mutableBuffer.array()
+            tensor31.source
                     contentEquals doubleArrayOf(499.0, 498.0, 497.0, 496.0, 495.0, 494.0)
         )
 
         assertTrue(tensor32.shape contentEquals intArrayOf(1, 1, 3))
-        assertTrue(tensor32.mutableBuffer.array() contentEquals doubleArrayOf(490.0, 480.0, 470.0))
+        assertTrue(tensor32.source contentEquals doubleArrayOf(490.0, 480.0, 470.0))
     }
 
 }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index c777273f3..4bc2e3bdb 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.asBuffer
 import kotlin.math.*
 import kotlin.test.Test
 import kotlin.test.assertTrue
@@ -20,14 +21,14 @@ internal class TestDoubleAnalyticTensorAlgebra {
         3.23, 133.7, 25.3,
         100.3, 11.0, 12.012
     )
-    val tensor = DoubleTensor(shape, buffer)
+    val tensor = DoubleTensor(shape, buffer.asBuffer())
 
     fun DoubleArray.fmap(transform: (Double) -> Double): DoubleArray {
         return this.map(transform).toDoubleArray()
     }
 
     fun expectedTensor(transform: (Double) -> Double): DoubleTensor {
-        return DoubleTensor(shape, buffer.fmap(transform))
+        return DoubleTensor(shape, buffer.fmap(transform).asBuffer())
     }
 
     @Test
@@ -106,58 +107,74 @@ internal class TestDoubleAnalyticTensorAlgebra {
         1.0, 2.0,
         -3.0, 4.0
     )
-    val tensor2 = DoubleTensor(shape2, buffer2)
+    val tensor2 = DoubleTensor(shape2, buffer2.asBuffer())
 
     @Test
     fun testMin() = DoubleTensorAlgebra {
         assertTrue { tensor2.min() == -3.0 }
-        assertTrue { tensor2.min(0, true) eq fromArray(
-            intArrayOf(1, 2),
-            doubleArrayOf(-3.0, 2.0)
-        )}
-        assertTrue { tensor2.min(1, false) eq fromArray(
-            intArrayOf(2),
-            doubleArrayOf(1.0, -3.0)
-        )}
+        assertTrue {
+            tensor2.min(0, true) eq fromArray(
+                intArrayOf(1, 2),
+                doubleArrayOf(-3.0, 2.0)
+            )
+        }
+        assertTrue {
+            tensor2.min(1, false) eq fromArray(
+                intArrayOf(2),
+                doubleArrayOf(1.0, -3.0)
+            )
+        }
     }
 
     @Test
     fun testMax() = DoubleTensorAlgebra {
         assertTrue { tensor2.max() == 4.0 }
-        assertTrue { tensor2.max(0, true) eq fromArray(
-            intArrayOf(1, 2),
-            doubleArrayOf(1.0, 4.0)
-        )}
-        assertTrue { tensor2.max(1, false) eq fromArray(
-            intArrayOf(2),
-            doubleArrayOf(2.0, 4.0)
-        )}
+        assertTrue {
+            tensor2.max(0, true) eq fromArray(
+                intArrayOf(1, 2),
+                doubleArrayOf(1.0, 4.0)
+            )
+        }
+        assertTrue {
+            tensor2.max(1, false) eq fromArray(
+                intArrayOf(2),
+                doubleArrayOf(2.0, 4.0)
+            )
+        }
     }
 
     @Test
     fun testSum() = DoubleTensorAlgebra {
         assertTrue { tensor2.sum() == 4.0 }
-        assertTrue { tensor2.sum(0, true) eq fromArray(
-            intArrayOf(1, 2),
-            doubleArrayOf(-2.0, 6.0)
-        )}
-        assertTrue { tensor2.sum(1, false) eq fromArray(
-            intArrayOf(2),
-            doubleArrayOf(3.0, 1.0)
-        )}
+        assertTrue {
+            tensor2.sum(0, true) eq fromArray(
+                intArrayOf(1, 2),
+                doubleArrayOf(-2.0, 6.0)
+            )
+        }
+        assertTrue {
+            tensor2.sum(1, false) eq fromArray(
+                intArrayOf(2),
+                doubleArrayOf(3.0, 1.0)
+            )
+        }
     }
 
     @Test
     fun testMean() = DoubleTensorAlgebra {
         assertTrue { tensor2.mean() == 1.0 }
-        assertTrue { tensor2.mean(0, true) eq fromArray(
-            intArrayOf(1, 2),
-            doubleArrayOf(-1.0, 3.0)
-        )}
-        assertTrue { tensor2.mean(1, false) eq fromArray(
-            intArrayOf(2),
-            doubleArrayOf(1.5, 0.5)
-        )}
+        assertTrue {
+            tensor2.mean(0, true) eq fromArray(
+                intArrayOf(1, 2),
+                doubleArrayOf(-1.0, 3.0)
+            )
+        }
+        assertTrue {
+            tensor2.mean(1, false) eq fromArray(
+                intArrayOf(2),
+                doubleArrayOf(1.5, 0.5)
+            )
+        }
     }
 
 }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 5b226bd5d..1c23cff18 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -6,7 +6,6 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.internal.array
 import space.kscience.kmath.tensors.core.internal.svd1d
 import kotlin.math.abs
 import kotlin.test.Test
@@ -142,11 +141,11 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     @Test
     fun testCholesky() = DoubleTensorAlgebra {
         val tensor = randomNormal(intArrayOf(2, 5, 5), 0)
-        val sigma = (tensor matmul tensor.transpose()) + diagonalEmbedding(
+        val sigma = (tensor matmul tensor.transposed()) + diagonalEmbedding(
             fromArray(intArrayOf(2, 5), DoubleArray(10) { 0.1 })
         )
         val low = sigma.cholesky()
-        val sigmChol = low matmul low.transpose()
+        val sigmChol = low matmul low.transposed()
         assertTrue(sigma.eq(sigmChol))
     }
 
@@ -157,12 +156,12 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         val res = svd1d(tensor2)
 
         assertTrue(res.shape contentEquals intArrayOf(2))
-        assertTrue { abs(abs(res.mutableBuffer.array()[res.bufferStart]) - 0.386) < 0.01 }
-        assertTrue { abs(abs(res.mutableBuffer.array()[res.bufferStart + 1]) - 0.922) < 0.01 }
+        assertTrue { abs(abs(res.source[0]) - 0.386) < 0.01 }
+        assertTrue { abs(abs(res.source[1]) - 0.922) < 0.01 }
     }
 
     @Test
-    fun testSVD() = DoubleTensorAlgebra{
+    fun testSVD() = DoubleTensorAlgebra {
         testSVDFor(fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0)))
         testSVDFor(fromArray(intArrayOf(2, 2), doubleArrayOf(-1.0, 0.0, 239.0, 238.0)))
     }
@@ -171,16 +170,16 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     fun testBatchedSVD() = DoubleTensorAlgebra {
         val tensor = randomNormal(intArrayOf(2, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
-        val tensorSVD = tensorU matmul (diagonalEmbedding(tensorS) matmul tensorV.transpose())
+        val tensorSVD = tensorU matmul (diagonalEmbedding(tensorS) matmul tensorV.transposed())
         assertTrue(tensor.eq(tensorSVD))
     }
 
     @Test
     fun testBatchedSymEig() = DoubleTensorAlgebra {
         val tensor = randomNormal(shape = intArrayOf(2, 3, 3), 0)
-        val tensorSigma = tensor + tensor.transpose()
+        val tensorSigma = tensor + tensor.transposed()
         val (tensorS, tensorV) = tensorSigma.symEig()
-        val tensorSigmaCalc = tensorV matmul (diagonalEmbedding(tensorS) matmul tensorV.transpose())
+        val tensorSigmaCalc = tensorV matmul (diagonalEmbedding(tensorS) matmul tensorV.transposed())
         assertTrue(tensorSigma.eq(tensorSigmaCalc))
     }
 
@@ -194,7 +193,7 @@ private fun DoubleTensorAlgebra.testSVDFor(tensor: DoubleTensor, epsilon: Double
     val tensorSVD = svd.first
         .dot(
             diagonalEmbedding(svd.second)
-                .dot(svd.third.transpose())
+                .dot(svd.third.transposed())
         )
 
     assertTrue(tensor.eq(tensorSVD, epsilon))
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index efdf6ba81..a36f32ac9 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -13,10 +13,7 @@ import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.toDoubleArray
-import space.kscience.kmath.tensors.core.internal.array
 import space.kscience.kmath.tensors.core.internal.matrixSequence
-import space.kscience.kmath.tensors.core.internal.toBufferedTensor
-import space.kscience.kmath.tensors.core.internal.toTensor
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -37,7 +34,7 @@ internal class TestDoubleTensor {
         assertEquals(tensor[intArrayOf(0, 1)], 5.8)
         assertTrue(
             tensor.elements().map { it.second }.toList()
-                .toDoubleArray() contentEquals tensor.mutableBuffer.toDoubleArray()
+                .toDoubleArray() contentEquals tensor.source.toDoubleArray()
         )
     }
 
@@ -57,9 +54,9 @@ internal class TestDoubleTensor {
         assertEquals(tensor[intArrayOf(0, 1, 0)], 109.56)
 
         tensor.matrixSequence().forEach {
-            val a = it.toTensor()
+            val a = it.asDoubleTensor()
             val secondRow = a.getTensor(1).as1D()
-            val secondColumn = a.transpose(0, 1).getTensor(1).as1D()
+            val secondColumn = a.transposed(0, 1).getTensor(1).as1D()
             assertEquals(secondColumn[0], 77.89)
             assertEquals(secondRow[1], secondColumn[1])
         }
@@ -72,16 +69,16 @@ internal class TestDoubleTensor {
         val doubleArray = DoubleBuffer(doubleArrayOf(1.0, 2.0, 3.0))
 
         // create ND buffers, no data is copied
-        val ndArray = MutableBufferND(DefaultStrides(intArrayOf(3)), doubleArray)
+        val ndArray: MutableBufferND<Double> = MutableBufferND(DefaultStrides(intArrayOf(3)), doubleArray)
 
         // map to tensors
-        val bufferedTensorArray = ndArray.toBufferedTensor() // strides are flipped so data copied
-        val tensorArray = bufferedTensorArray.toTensor() // data not contiguous so copied again
+        val bufferedTensorArray = ndArray.asDoubleTensor() // strides are flipped so data copied
+        val tensorArray = bufferedTensorArray.asDoubleTensor() // data not contiguous so copied again
 
         val tensorArrayPublic = ndArray.asDoubleTensor() // public API, data copied twice
         val sharedTensorArray = tensorArrayPublic.asDoubleTensor() // no data copied by matching type
 
-        assertTrue(tensorArray.mutableBuffer.array() contentEquals sharedTensorArray.mutableBuffer.array())
+        assertTrue(tensorArray.source contentEquals sharedTensorArray.source)
 
         tensorArray[intArrayOf(0)] = 55.9
         assertEquals(tensorArrayPublic[intArrayOf(0)], 1.0)
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 28c327973..79b199471 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -6,9 +6,10 @@
 package space.kscience.kmath.tensors.core
 
 
+import space.kscience.kmath.nd.get
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.internal.array
 import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
@@ -18,55 +19,55 @@ internal class TestDoubleTensorAlgebra {
     fun testDoublePlus() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(1.0, 2.0))
         val res = 10.0 + tensor
-        assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(11.0, 12.0))
+        assertTrue(res.source contentEquals doubleArrayOf(11.0, 12.0))
     }
 
     @Test
     fun testDoubleDiv() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(2.0, 4.0))
-        val res = 2.0/tensor
-        assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(1.0, 0.5))
+        val res = 2.0 / tensor
+        assertTrue(res.source contentEquals doubleArrayOf(1.0, 0.5))
     }
 
     @Test
     fun testDivDouble() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(2), doubleArrayOf(10.0, 5.0))
         val res = tensor / 2.5
-        assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(4.0, 2.0))
+        assertTrue(res.source contentEquals doubleArrayOf(4.0, 2.0))
     }
 
     @Test
     fun testTranspose1x1() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(1), doubleArrayOf(0.0))
-        val res = tensor.transpose(0, 0)
+        val res = tensor.transposed(0, 0)
 
-        assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(0.0))
+        assertTrue(res.source contentEquals doubleArrayOf(0.0))
         assertTrue(res.shape contentEquals intArrayOf(1))
     }
 
     @Test
     fun testTranspose3x2() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val res = tensor.transpose(1, 0)
+        val res = tensor.transposed(1, 0)
 
-        assertTrue(res.mutableBuffer.array() contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
+        assertTrue(res.source contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
         assertTrue(res.shape contentEquals intArrayOf(2, 3))
     }
 
     @Test
     fun testTranspose1x2x3() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val res01 = tensor.transpose(0, 1)
-        val res02 = tensor.transpose(-3, 2)
-        val res12 = tensor.transpose()
+        val res01 = tensor.transposed(0, 1)
+        val res02 = tensor.transposed(-3, 2)
+        val res12 = tensor.transposed()
 
         assertTrue(res01.shape contentEquals intArrayOf(2, 1, 3))
         assertTrue(res02.shape contentEquals intArrayOf(3, 2, 1))
         assertTrue(res12.shape contentEquals intArrayOf(1, 3, 2))
 
-        assertTrue(res01.mutableBuffer.array() contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res02.mutableBuffer.array() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
-        assertTrue(res12.mutableBuffer.array() contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res01.source contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res02.source contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res12.source contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
     }
 
     @Test
@@ -97,8 +98,8 @@ internal class TestDoubleTensorAlgebra {
         assignResult += tensorC
         assignResult += -39.4
 
-        assertTrue(expected.mutableBuffer.array() contentEquals result.mutableBuffer.array())
-        assertTrue(expected.mutableBuffer.array() contentEquals assignResult.mutableBuffer.array())
+        assertTrue(expected.source contentEquals result.source)
+        assertTrue(expected.source contentEquals assignResult.source)
     }
 
     @Test
@@ -111,26 +112,28 @@ internal class TestDoubleTensorAlgebra {
         val tensor5 = fromArray(intArrayOf(2, 3, 3), (1..18).map { 1 + it.toDouble() }.toDoubleArray())
 
         val res12 = tensor1.dot(tensor2)
-        assertTrue(res12.mutableBuffer.array() contentEquals doubleArrayOf(140.0, 320.0))
+        assertTrue(res12.source contentEquals doubleArrayOf(140.0, 320.0))
         assertTrue(res12.shape contentEquals intArrayOf(2))
 
         val res32 = tensor3.matmul(tensor2)
-        assertTrue(res32.mutableBuffer.array() contentEquals doubleArrayOf(-140.0))
+        assertTrue(res32.source contentEquals doubleArrayOf(-140.0))
         assertTrue(res32.shape contentEquals intArrayOf(1, 1))
 
         val res22 = tensor2.dot(tensor2)
-        assertTrue(res22.mutableBuffer.array() contentEquals doubleArrayOf(1400.0))
+        assertTrue(res22.source contentEquals doubleArrayOf(1400.0))
         assertTrue(res22.shape contentEquals intArrayOf(1))
 
         val res11 = tensor1.dot(tensor11)
-        assertTrue(res11.mutableBuffer.array() contentEquals doubleArrayOf(22.0, 28.0, 49.0, 64.0))
+        assertTrue(res11.source contentEquals doubleArrayOf(22.0, 28.0, 49.0, 64.0))
         assertTrue(res11.shape contentEquals intArrayOf(2, 2))
 
         val res45 = tensor4.matmul(tensor5)
-        assertTrue(res45.mutableBuffer.array() contentEquals doubleArrayOf(
-            36.0, 42.0, 48.0, 81.0, 96.0, 111.0, 126.0, 150.0, 174.0,
-            468.0, 501.0, 534.0, 594.0, 636.0, 678.0, 720.0, 771.0, 822.0
-        ))
+        assertTrue(
+            res45.source contentEquals doubleArrayOf(
+                36.0, 42.0, 48.0, 81.0, 96.0, 111.0, 126.0, 150.0, 174.0,
+                468.0, 501.0, 534.0, 594.0, 636.0, 678.0, 720.0, 771.0, 822.0
+            )
+        )
         assertTrue(res45.shape contentEquals intArrayOf(2, 3, 3))
     }
 
@@ -140,31 +143,44 @@ internal class TestDoubleTensorAlgebra {
         val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val tensor3 = zeros(intArrayOf(2, 3, 4, 5))
 
-        assertTrue(diagonalEmbedding(tensor3, 0, 3, 4).shape contentEquals
-                intArrayOf(2, 3, 4, 5, 5))
-        assertTrue(diagonalEmbedding(tensor3, 1, 3, 4).shape contentEquals
-                intArrayOf(2, 3, 4, 6, 6))
-        assertTrue(diagonalEmbedding(tensor3, 2, 0, 3).shape contentEquals
-                intArrayOf(7, 2, 3, 7, 4))
+        assertTrue(
+            diagonalEmbedding(tensor3, 0, 3, 4).shape contentEquals
+                    intArrayOf(2, 3, 4, 5, 5)
+        )
+        assertTrue(
+            diagonalEmbedding(tensor3, 1, 3, 4).shape contentEquals
+                    intArrayOf(2, 3, 4, 6, 6)
+        )
+        assertTrue(
+            diagonalEmbedding(tensor3, 2, 0, 3).shape contentEquals
+                    intArrayOf(7, 2, 3, 7, 4)
+        )
 
         val diagonal1 = diagonalEmbedding(tensor1, 0, 1, 0)
         assertTrue(diagonal1.shape contentEquals intArrayOf(3, 3))
-        assertTrue(diagonal1.mutableBuffer.array() contentEquals
-                doubleArrayOf(10.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 30.0))
+        assertTrue(
+            diagonal1.source contentEquals
+                    doubleArrayOf(10.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 30.0)
+        )
 
         val diagonal1Offset = diagonalEmbedding(tensor1, 1, 1, 0)
         assertTrue(diagonal1Offset.shape contentEquals intArrayOf(4, 4))
-        assertTrue(diagonal1Offset.mutableBuffer.array() contentEquals
-                doubleArrayOf(0.0, 0.0, 0.0, 0.0, 10.0, 0.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 0.0, 30.0, 0.0))
+        assertTrue(
+            diagonal1Offset.source contentEquals
+                    doubleArrayOf(0.0, 0.0, 0.0, 0.0, 10.0, 0.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 0.0, 30.0, 0.0)
+        )
 
         val diagonal2 = diagonalEmbedding(tensor2, 1, 0, 2)
         assertTrue(diagonal2.shape contentEquals intArrayOf(4, 2, 4))
-        assertTrue(diagonal2.mutableBuffer.array() contentEquals
-                doubleArrayOf(
-                    0.0, 1.0, 0.0, 0.0, 0.0, 4.0, 0.0, 0.0,
-                    0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 5.0, 0.0,
-                    0.0, 0.0, 0.0, 3.0, 0.0, 0.0, 0.0, 6.0,
-                    0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0))
+        assertTrue(
+            diagonal2.source contentEquals
+                    doubleArrayOf(
+                        0.0, 1.0, 0.0, 0.0, 0.0, 4.0, 0.0, 0.0,
+                        0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 5.0, 0.0,
+                        0.0, 0.0, 0.0, 3.0, 0.0, 0.0, 0.0, 6.0,
+                        0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0
+                    )
+        )
     }
 
     @Test
@@ -178,4 +194,14 @@ internal class TestDoubleTensorAlgebra {
         assertFalse(tensor1.eq(tensor3))
 
     }
+
+    @Test
+    fun testMap() = DoubleTensorAlgebra {
+        val tensor = one(5, 5, 5)
+        val l = tensor.getTensor(0).map { it + 1.0 }
+        val r = tensor.getTensor(1).map { it - 1.0 }
+        val res = l + r
+        assertTrue { intArrayOf(5, 5) contentEquals res.shape }
+        assertEquals(1.0, res[4, 4])
+    }
 }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/offsetBufferEquality.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/offsetBufferEquality.kt
new file mode 100644
index 000000000..e9fc7fb9c
--- /dev/null
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/offsetBufferEquality.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.structures.indices
+import kotlin.jvm.JvmName
+
+
+/**
+ * Simplified [DoubleBuffer] to array comparison
+ */
+public fun OffsetDoubleBuffer.contentEquals(vararg doubles: Double): Boolean = indices.all { get(it) == doubles[it] }
+
+@JvmName("contentEqualsArray")
+public infix fun OffsetDoubleBuffer.contentEquals(otherArray: DoubleArray): Boolean = contentEquals(*otherArray)
+
+@JvmName("contentEqualsBuffer")
+public infix fun OffsetDoubleBuffer.contentEquals(otherBuffer: Buffer<Double>): Boolean =
+    indices.all { get(it) == otherBuffer[it] }
\ No newline at end of file
diff --git a/test-utils/src/commonMain/kotlin/bufferEquality.kt b/test-utils/src/commonMain/kotlin/bufferEquality.kt
new file mode 100644
index 000000000..9e4d9ec22
--- /dev/null
+++ b/test-utils/src/commonMain/kotlin/bufferEquality.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.testutils
+
+import space.kscience.kmath.structures.DoubleBuffer
+import kotlin.jvm.JvmName
+
+/**
+ * Simplified [DoubleBuffer] to array comparison
+ */
+public fun DoubleBuffer.contentEquals(vararg doubles: Double): Boolean = array.contentEquals(doubles)
+
+@JvmName("contentEqualsArray")
+public infix fun DoubleBuffer.contentEquals(otherArray: DoubleArray): Boolean = array.contentEquals(otherArray)
+
+@JvmName("contentEqualsBuffer")
+public infix fun DoubleBuffer.contentEquals(otherBuffer: DoubleBuffer): Boolean = array.contentEquals(otherBuffer.array)
\ No newline at end of file
-- 
2.34.1


From 20886d6f6b366047e7d80cee76030f5413e60ed0 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 11 Sep 2022 17:10:26 +0300
Subject: [PATCH 619/713] Global refactor of tensors

---
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  7 +++--
 .../kmath/tensors/core/IntTensorAlgebra.kt    |  5 ++--
 .../tensors/core/TensorLinearStructure.kt     |  8 +++---
 .../core/internal/doubleTensorHelpers.kt      | 27 +++++++++----------
 .../tensors/core/internal/intTensorHelpers.kt |  2 +-
 .../kmath/tensors/core/tensorTransform.kt     | 17 +++++++++---
 .../kmath/tensors/core/TestDoubleTensor.kt    | 23 +++++++---------
 .../tensors/core/TestDoubleTensorAlgebra.kt   |  7 ++---
 8 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index d758c49a1..f563d00ae 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -132,7 +132,10 @@ public open class DoubleTensorAlgebra :
         val dt = asDoubleTensor()
         val lastShape = shape.drop(1).toIntArray()
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
-        return DoubleTensor(newShape, dt.source.view(newShape.reduce(Int::times) * i))
+        return DoubleTensor(
+            newShape,
+            dt.source.view(newShape.reduce(Int::times) * i, TensorLinearStructure.linearSizeOf(newShape))
+        )
     }
 
     /**
@@ -227,7 +230,7 @@ public open class DoubleTensorAlgebra :
 
     override fun StructureND<Double>.minus(arg: Double): DoubleTensor = map { it - arg }
 
-    override fun StructureND<Double>.minus(arg: StructureND<Double>): DoubleTensor = zip(this, arg) { l, r -> l + r }
+    override fun StructureND<Double>.minus(arg: StructureND<Double>): DoubleTensor = zip(this, arg) { l, r -> l - r }
 
     override fun Tensor<Double>.minusAssign(value: Double) {
         mapInPlace { it - value }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
index 7c18fe533..124ccc668 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
@@ -221,7 +221,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
 
     override fun StructureND<Int>.minus(arg: Int): IntTensor = map { it - arg }
 
-    override fun StructureND<Int>.minus(arg: StructureND<Int>): IntTensor = zip(this, arg) { l, r -> l + r }
+    override fun StructureND<Int>.minus(arg: StructureND<Int>): IntTensor = zip(this, arg) { l, r -> l - r }
 
     override fun Tensor<Int>.minusAssign(value: Int) {
         mapInPlace { it - value }
@@ -283,8 +283,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
         view(other.shape)
 
     override fun StructureND<Int>.dot(other: StructureND<Int>): IntTensor {
-        return if (dimension in 0..2 && other.dimension in 0..2) TODO("not implemented")
-        else error("Only vectors and matrices are allowed in non-broadcasting dot operation")
+        TODO("not implemented for integers")
     }
 
     override fun diagonalEmbedding(
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
index 3de1c9b1a..729fc0d13 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
@@ -15,14 +15,12 @@ import kotlin.math.max
  * @param shape the shape of the tensor.
  */
 public class TensorLinearStructure(override val shape: IntArray) : Strides() {
-    override val strides: IntArray
-        get() = stridesFromShape(shape)
+    override val strides: IntArray get() = stridesFromShape(shape)
 
     override fun index(offset: Int): IntArray =
         indexFromOffset(offset, strides, shape.size)
 
-    override val linearSize: Int
-        get() = shape.reduce(Int::times)
+    override val linearSize: Int get() = linearSizeOf(shape)
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -41,6 +39,8 @@ public class TensorLinearStructure(override val shape: IntArray) : Strides() {
 
     public companion object {
 
+        public fun linearSizeOf(shape: IntArray): Int = shape.reduce(Int::times)
+
         public fun stridesFromShape(shape: IntArray): IntArray {
             val nDim = shape.size
             val res = IntArray(nDim)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
index 9c6f54d61..c5910a436 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
@@ -14,11 +14,8 @@ import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.VirtualBuffer
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.structures.indices
+import space.kscience.kmath.tensors.core.*
 import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra.eye
-import space.kscience.kmath.tensors.core.BufferedTensor
-import space.kscience.kmath.tensors.core.DoubleTensor
-import space.kscience.kmath.tensors.core.OffsetDoubleBuffer
-import space.kscience.kmath.tensors.core.copyToTensor
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.sqrt
@@ -165,7 +162,7 @@ internal val DoubleTensor.vectors: VirtualBuffer<DoubleTensor>
 
         return VirtualBuffer(linearSize / vectorOffset) { index ->
             val offset = index * vectorOffset
-            DoubleTensor(vectorShape, source.view(offset))
+            DoubleTensor(vectorShape, source.view(offset, vectorShape.first()))
         }
     }
 
@@ -174,16 +171,18 @@ internal fun DoubleTensor.vectorSequence(): Sequence<DoubleTensor> = vectors.asS
 
 
 internal val DoubleTensor.matrices: VirtualBuffer<DoubleTensor>
-    get(){
-    val n = shape.size
-    check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
-    val matrixOffset = shape[n - 1] * shape[n - 2]
-    val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
+    get() {
+        val n = shape.size
+        check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
+        val matrixOffset = shape[n - 1] * shape[n - 2]
+        val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
 
-    return VirtualBuffer(linearSize / matrixOffset) { index ->
-        val offset = index * matrixOffset
-        DoubleTensor(matrixShape, source.view(offset))
+        val size = TensorLinearStructure.linearSizeOf(matrixShape)
+
+        return VirtualBuffer(linearSize / matrixOffset) { index ->
+            val offset = index * matrixOffset
+            DoubleTensor(matrixShape, source.view(offset, size))
+        }
     }
-}
 
 internal fun DoubleTensor.matrixSequence(): Sequence<DoubleTensor> = matrices.asSequence()
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
index 93229c2d4..db289a090 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
@@ -40,7 +40,7 @@ internal val IntTensor.vectors: VirtualBuffer<IntTensor>
 
         return VirtualBuffer(linearSize / vectorOffset) { index ->
             val offset = index * vectorOffset
-            IntTensor(vectorShape, source.view(offset))
+            IntTensor(vectorShape, source.view(offset, vectorShape.first()))
         }
     }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt
index 30a828d6a..118624440 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt
@@ -5,14 +5,20 @@
 
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.nd.DoubleBufferND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.tensors.api.Tensor
 
 
+/**
+ * Create a mutable copy of given [StructureND].
+ */
 public fun StructureND<Double>.copyToTensor(): DoubleTensor = if (this is DoubleTensor) {
     DoubleTensor(shape, source.copy())
+} else if (this is DoubleBufferND && indices is TensorLinearStructure) {
+    DoubleTensor(shape, buffer.copy())
 } else {
     DoubleTensor(
         shape,
@@ -36,11 +42,14 @@ public fun StructureND<Int>.toDoubleTensor(): DoubleTensor {
 }
 
 /**
- * Casts [Tensor] of [Double] to [DoubleTensor]
+ * Transforms [StructureND] of [Double] to [DoubleTensor]. Zero copy if possible, but is not guaranteed
  */
-public fun StructureND<Double>.asDoubleTensor(): DoubleTensor = when (this) {
-    is DoubleTensor -> this
-    else -> copyToTensor()
+public fun StructureND<Double>.asDoubleTensor(): DoubleTensor = if (this is DoubleTensor) {
+    this
+} else if (this is DoubleBufferND && indices is TensorLinearStructure) {
+    DoubleTensor(shape, buffer)
+} else {
+    copyToTensor()
 }
 
 /**
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index a36f32ac9..c87cf2a68 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -6,10 +6,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.DefaultStrides
-import space.kscience.kmath.nd.MutableBufferND
-import space.kscience.kmath.nd.as1D
-import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.toDoubleArray
@@ -66,16 +63,16 @@ internal class TestDoubleTensor {
     fun testNoBufferProtocol() {
 
         // create buffer
-        val doubleArray = DoubleBuffer(doubleArrayOf(1.0, 2.0, 3.0))
+        val doubleArray = DoubleBuffer(1.0, 2.0, 3.0)
 
         // create ND buffers, no data is copied
-        val ndArray: MutableBufferND<Double> = MutableBufferND(DefaultStrides(intArrayOf(3)), doubleArray)
+        val ndArray: MutableBufferND<Double> = DoubleBufferND(DefaultStrides(intArrayOf(3)), doubleArray)
 
         // map to tensors
-        val bufferedTensorArray = ndArray.asDoubleTensor() // strides are flipped so data copied
-        val tensorArray = bufferedTensorArray.asDoubleTensor() // data not contiguous so copied again
+        val tensorArray = ndArray.asDoubleTensor() // Data is copied because of strides change.
 
-        val tensorArrayPublic = ndArray.asDoubleTensor() // public API, data copied twice
+        //protective copy
+        val tensorArrayPublic = ndArray.copyToTensor() // public API, data copied twice
         val sharedTensorArray = tensorArrayPublic.asDoubleTensor() // no data copied by matching type
 
         assertTrue(tensorArray.source contentEquals sharedTensorArray.source)
@@ -83,11 +80,11 @@ internal class TestDoubleTensor {
         tensorArray[intArrayOf(0)] = 55.9
         assertEquals(tensorArrayPublic[intArrayOf(0)], 1.0)
 
-        tensorArrayPublic[intArrayOf(0)] = 55.9
-        assertEquals(sharedTensorArray[intArrayOf(0)], 55.9)
-        assertEquals(bufferedTensorArray[intArrayOf(0)], 1.0)
+        tensorArrayPublic[intArrayOf(0)] = 57.9
+        assertEquals(sharedTensorArray[intArrayOf(0)], 57.9)
+        assertEquals(tensorArray[intArrayOf(0)], 55.9)
 
-        bufferedTensorArray[intArrayOf(0)] = 55.9
+        tensorArray[intArrayOf(0)] = 55.9
         assertEquals(ndArray[intArrayOf(0)], 1.0)
 
     }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 79b199471..67bebb9a7 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.nd.get
 import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.testutils.assertBufferEquals
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
@@ -98,8 +99,8 @@ internal class TestDoubleTensorAlgebra {
         assignResult += tensorC
         assignResult += -39.4
 
-        assertTrue(expected.source contentEquals result.source)
-        assertTrue(expected.source contentEquals assignResult.source)
+        assertBufferEquals(expected.source, result.source)
+        assertBufferEquals(expected.source, assignResult.source)
     }
 
     @Test
@@ -202,6 +203,6 @@ internal class TestDoubleTensorAlgebra {
         val r = tensor.getTensor(1).map { it - 1.0 }
         val res = l + r
         assertTrue { intArrayOf(5, 5) contentEquals res.shape }
-        assertEquals(1.0, res[4, 4])
+        assertEquals(2.0, res[4, 4])
     }
 }
-- 
2.34.1


From 2358f53cf7ae26220d0f7ae5bc99c8b54942d89b Mon Sep 17 00:00:00 2001
From: darksnake <altavir@gmail.com>
Date: Thu, 15 Sep 2022 17:42:37 +0300
Subject: [PATCH 620/713] Make Circle2D data class

---
 .../commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
index 5a25fef7d..162130908 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
@@ -10,7 +10,7 @@ import kotlin.math.PI
 /**
  * A circle in 2D space
  */
-public class Circle2D(
+public data class Circle2D(
     public val center: DoubleVector2D,
     public val radius: Double
 )
-- 
2.34.1


From 6bf8d9d325d6a04e74c2b776cc8f7025729a5f94 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 26 Sep 2022 13:08:49 +0300
Subject: [PATCH 621/713] Naming refactoring

---
 .../commons/transform/Transformations.kt      |  53 +++---
 .../space/kscience/kmath/complex/Complex.kt   |   1 -
 .../kmath/operations/bufferOperation.kt       |  16 +-
 .../kscience/kmath/structures/DoubleBuffer.kt |  20 ++-
 .../space/kscience/kmath/misc/JBigTest.kt     |  20 +++
 .../kscience/kmath/streaming/BufferFlow.kt    |   7 +-
 .../kmath/tensors/core/DoubleTensor.kt        |   2 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  14 +-
 .../kscience/kmath/trajectory/DubinsPath.kt   | 163 +++++++++++-------
 .../kscience/kmath/trajectory/Trajectory.kt   |  12 +-
 .../space/kscience/kmath/trajectory/Math.kt   |   6 +-
 .../kmath/trajectory/dubins/DubinsTests.kt    |  10 +-
 .../kmath/trajectory/segments/ArcTests.kt     |   4 +-
 .../kmath/trajectory/segments/LineTests.kt    |  12 +-
 14 files changed, 202 insertions(+), 138 deletions(-)
 create mode 100644 kmath-core/src/jvmTest/kotlin/space/kscience/kmath/misc/JBigTest.kt

diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
index 2243dc5d9..a77da2d2f 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/transform/Transformations.kt
@@ -10,28 +10,18 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import org.apache.commons.math3.transform.*
 import space.kscience.kmath.complex.Complex
-import space.kscience.kmath.operations.SuspendBufferTransform
+import space.kscience.kmath.operations.BufferTransform
 import space.kscience.kmath.streaming.chunked
 import space.kscience.kmath.streaming.spread
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.VirtualBuffer
-import space.kscience.kmath.structures.asBuffer
-
+import space.kscience.kmath.structures.*
 
 /**
- * Streaming and buffer transformations
+ * Streaming and buffer transformations with Commons-math algorithms
  */
 public object Transformations {
-    private fun Buffer<Complex>.toArray(): Array<org.apache.commons.math3.complex.Complex> =
+    private fun Buffer<Complex>.toCmComplexArray(): Array<org.apache.commons.math3.complex.Complex> =
         Array(size) { org.apache.commons.math3.complex.Complex(get(it).re, get(it).im) }
 
-    private fun Buffer<Double>.asArray() = if (this is DoubleBuffer) {
-        array
-    } else {
-        DoubleArray(size) { i -> get(i) }
-    }
-
     /**
      * Create a virtual buffer on top of array
      */
@@ -43,70 +33,67 @@ public object Transformations {
     public fun fourier(
         normalization: DftNormalization = DftNormalization.STANDARD,
         direction: TransformType = TransformType.FORWARD,
-    ): SuspendBufferTransform<Complex, Complex> = {
-        FastFourierTransformer(normalization).transform(it.toArray(), direction).asBuffer()
+    ): BufferTransform<Complex, Complex> = BufferTransform {
+        FastFourierTransformer(normalization).transform(it.toCmComplexArray(), direction).asBuffer()
     }
 
     public fun realFourier(
         normalization: DftNormalization = DftNormalization.STANDARD,
         direction: TransformType = TransformType.FORWARD,
-    ): SuspendBufferTransform<Double, Complex> = {
-        FastFourierTransformer(normalization).transform(it.asArray(), direction).asBuffer()
+    ): BufferTransform<Double, Complex> = BufferTransform {
+        FastFourierTransformer(normalization).transform(it.toDoubleArray(), direction).asBuffer()
     }
 
     public fun sine(
         normalization: DstNormalization = DstNormalization.STANDARD_DST_I,
         direction: TransformType = TransformType.FORWARD,
-    ): SuspendBufferTransform<Double, Double> = {
-        FastSineTransformer(normalization).transform(it.asArray(), direction).asBuffer()
+    ): BufferTransform<Double, Double> = DoubleBufferTransform {
+        FastSineTransformer(normalization).transform(it.array, direction).asBuffer()
     }
 
     public fun cosine(
         normalization: DctNormalization = DctNormalization.STANDARD_DCT_I,
         direction: TransformType = TransformType.FORWARD,
-    ): SuspendBufferTransform<Double, Double> = {
-        FastCosineTransformer(normalization).transform(it.asArray(), direction).asBuffer()
+    ): BufferTransform<Double, Double> = BufferTransform {
+        FastCosineTransformer(normalization).transform(it.toDoubleArray(), direction).asBuffer()
     }
 
     public fun hadamard(
         direction: TransformType = TransformType.FORWARD,
-    ): SuspendBufferTransform<Double, Double> = {
-        FastHadamardTransformer().transform(it.asArray(), direction).asBuffer()
+    ): BufferTransform<Double, Double> = DoubleBufferTransform {
+        FastHadamardTransformer().transform(it.array, direction).asBuffer()
     }
 }
 
 /**
  * Process given [Flow] with commons-math fft transformation
  */
-@FlowPreview
-public fun Flow<Buffer<Complex>>.FFT(
+public fun Flow<Buffer<Complex>>.fft(
     normalization: DftNormalization = DftNormalization.STANDARD,
     direction: TransformType = TransformType.FORWARD,
 ): Flow<Buffer<Complex>> {
     val transform = Transformations.fourier(normalization, direction)
-    return map { transform(it) }
+    return map(transform::transform)
 }
 
-@FlowPreview
 @JvmName("realFFT")
-public fun Flow<Buffer<Double>>.FFT(
+public fun Flow<Buffer<Double>>.fft(
     normalization: DftNormalization = DftNormalization.STANDARD,
     direction: TransformType = TransformType.FORWARD,
 ): Flow<Buffer<Complex>> {
     val transform = Transformations.realFourier(normalization, direction)
-    return map(transform)
+    return map(transform::transform)
 }
 
 /**
  * Process a continuous flow of real numbers in FFT splitting it in chunks of [bufferSize].
  */
-@FlowPreview
 @JvmName("realFFT")
-public fun Flow<Double>.FFT(
+public fun Flow<Double>.fft(
     bufferSize: Int = Int.MAX_VALUE,
     normalization: DftNormalization = DftNormalization.STANDARD,
     direction: TransformType = TransformType.FORWARD,
-): Flow<Complex> = chunked(bufferSize).FFT(normalization, direction).spread()
+): Flow<Complex> = chunked(bufferSize).fft(normalization, direction).spread()
 
 /**
  * Map a complex flow into real flow by taking real part of each number
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index 5804e47c1..7bf8af4e8 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -193,7 +193,6 @@ public object ComplexField :
  * @property re The real part.
  * @property im The imaginary part.
  */
-@OptIn(UnstableKMathAPI::class)
 public data class Complex(val re: Double, val im: Double) {
     public constructor(re: Number, im: Number) : this(re.toDouble(), im.toDouble())
     public constructor(re: Number) : this(re.toDouble(), 0.0)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
index 3d25d8750..0a5d6b964 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/bufferOperation.kt
@@ -9,14 +9,18 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.*
 
 /**
- * Typealias for buffer transformations.
+ * Type alias for buffer transformations.
  */
-public typealias BufferTransform<T, R> = (Buffer<T>) -> Buffer<R>
+public fun interface BufferTransform<T, R> {
+    public fun transform(arg: Buffer<T>): Buffer<R>
+}
 
-/**
- * Typealias for buffer transformations with suspend function.
- */
-public typealias SuspendBufferTransform<T, R> = suspend (Buffer<T>) -> Buffer<R>
+///**
+// * Type alias for buffer transformations with suspend function.
+// */
+//public fun interface SuspendBufferTransform<T, R>{
+//    public suspend fun transform(arg: Buffer<T>): Buffer<R>
+//}
 
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
index 4dd9003f3..5d80f2b1f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.structures
 
+import space.kscience.kmath.operations.BufferTransform
 import kotlin.jvm.JvmInline
 
 /**
@@ -28,7 +29,7 @@ public value class DoubleBuffer(public val array: DoubleArray) : MutableBuffer<D
 
     override fun toString(): String = Buffer.toString(this)
 
-    public companion object{
+    public companion object {
         public fun zero(size: Int): DoubleBuffer = DoubleArray(size).asBuffer()
     }
 }
@@ -40,7 +41,8 @@ public value class DoubleBuffer(public val array: DoubleArray) : MutableBuffer<D
  * The function [init] is called for each array element sequentially starting from the first one.
  * It should return the value for a buffer element given its index.
  */
-public inline fun DoubleBuffer(size: Int, init: (Int) -> Double): DoubleBuffer = DoubleBuffer(DoubleArray(size) { init(it) })
+public inline fun DoubleBuffer(size: Int, init: (Int) -> Double): DoubleBuffer =
+    DoubleBuffer(DoubleArray(size) { init(it) })
 
 /**
  * Returns a new [DoubleBuffer] of given elements.
@@ -51,10 +53,15 @@ public fun DoubleBuffer(vararg doubles: Double): DoubleBuffer = DoubleBuffer(dou
  * Returns a new [DoubleArray] containing all the elements of this [Buffer].
  */
 public fun Buffer<Double>.toDoubleArray(): DoubleArray = when (this) {
-    is DoubleBuffer -> array.copyOf()
+    is DoubleBuffer -> array
     else -> DoubleArray(size, ::get)
 }
 
+public fun Buffer<Double>.toDoubleBuffer(): DoubleBuffer = when (this) {
+    is DoubleBuffer -> this
+    else -> DoubleArray(size, ::get).asBuffer()
+}
+
 /**
  * Returns [DoubleBuffer] over this array.
  *
@@ -62,3 +69,10 @@ public fun Buffer<Double>.toDoubleArray(): DoubleArray = when (this) {
  * @return the new buffer.
  */
 public fun DoubleArray.asBuffer(): DoubleBuffer = DoubleBuffer(this)
+
+
+public fun interface DoubleBufferTransform : BufferTransform<Double, Double> {
+    public fun transform(arg: DoubleBuffer): DoubleBuffer
+
+    override fun transform(arg: Buffer<Double>): DoubleBuffer = arg.toDoubleBuffer()
+}
diff --git a/kmath-core/src/jvmTest/kotlin/space/kscience/kmath/misc/JBigTest.kt b/kmath-core/src/jvmTest/kotlin/space/kscience/kmath/misc/JBigTest.kt
new file mode 100644
index 000000000..f7f8027e6
--- /dev/null
+++ b/kmath-core/src/jvmTest/kotlin/space/kscience/kmath/misc/JBigTest.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.misc
+
+import org.junit.jupiter.api.Test
+import space.kscience.kmath.operations.JBigDecimalField
+import kotlin.test.assertEquals
+import kotlin.test.assertNotEquals
+
+class JBigTest {
+
+    @Test
+    fun testExact() = with(JBigDecimalField) {
+        assertNotEquals(0.3, 0.1 + 0.2)
+        assertEquals(one * 0.3, one * 0.1 + one * 0.2)
+    }
+}
\ No newline at end of file
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
index 00c874751..8aa5a937c 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
@@ -5,8 +5,10 @@
 
 package space.kscience.kmath.streaming
 
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.asFlow
+import kotlinx.coroutines.flow.flatMapConcat
+import kotlinx.coroutines.flow.flow
 import space.kscience.kmath.chains.BlockingDoubleChain
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
@@ -20,7 +22,6 @@ public fun <T> Buffer<T>.asFlow(): Flow<T> = iterator().asFlow()
 /**
  * Flat map a [Flow] of [Buffer] into continuous [Flow] of elements
  */
-@FlowPreview
 public fun <T> Flow<Buffer<T>>.spread(): Flow<T> = flatMapConcat { it.asFlow() }
 
 /**
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
index e9589eb0a..d3308a69f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -28,7 +28,7 @@ public class OffsetDoubleBuffer(
     override fun get(index: Int): Double = source[index + offset]
 
     /**
-     * Copy only a part of buffer that belongs to this tensor
+     * Copy only a part of buffer that belongs to this [OffsetDoubleBuffer]
      */
     override fun copy(): DoubleBuffer = source.array.copyOfRange(offset, offset + size).asBuffer()
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index f563d00ae..67248890c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -59,20 +59,16 @@ public open class DoubleTensorAlgebra :
         }
     }
 
-    public inline fun Tensor<Double>.mapIndexedInPlace(operation: (IntArray, Double) -> Double) {
-        indices.forEach { set(it, operation(it, get(it))) }
+    public inline fun Tensor<Double>.mapIndexedInPlace(operation: DoubleField.(IntArray, Double) -> Double) {
+        indices.forEach { set(it, DoubleField.operation(it, get(it))) }
     }
 
     @Suppress("OVERRIDE_BY_INLINE")
     final override inline fun StructureND<Double>.mapIndexed(transform: DoubleField.(index: IntArray, Double) -> Double): DoubleTensor {
-        val tensor = this.asDoubleTensor()
-        //TODO remove additional copy
-        val buffer = DoubleBuffer(tensor.source.size) {
-            DoubleField.transform(tensor.indices.index(it), tensor.source[it])
-        }
-        return DoubleTensor(tensor.shape, buffer)
+        return copyToTensor().apply { mapIndexedInPlace(transform) }
     }
 
+
     @Suppress("OVERRIDE_BY_INLINE")
     final override inline fun zip(
         left: StructureND<Double>,
@@ -92,7 +88,7 @@ public open class DoubleTensorAlgebra :
 
     public inline fun StructureND<Double>.reduceElements(transform: (DoubleBuffer) -> Double): Double =
         transform(asDoubleTensor().source.copy())
-    //TODO do we need protective copy?
+    //TODO Add read-only DoubleBuffer wrapper. To avoid protective copy
 
     override fun StructureND<Double>.valueOrNull(): Double? {
         val dt = asDoubleTensor()
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
index e90e3de41..6a340f6b9 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
@@ -23,64 +23,65 @@ internal fun Pose2D.getTangentCircles(radius: Double): Pair<Circle2D, Circle2D>
     return Circle2D(vector(x - dX, y + dY), radius) to Circle2D(vector(x + dX, y - dY), radius)
 }
 
-internal fun leftOuterTangent(a: Circle2D, b: Circle2D): StraightSegment = outerTangent(a, b, ArcSegment.Direction.LEFT)
+internal fun leftOuterTangent(a: Circle2D, b: Circle2D): StraightTrajectory = outerTangent(a, b, CircleTrajectory.Direction.LEFT)
 
-internal fun rightOuterTangent(a: Circle2D, b: Circle2D): StraightSegment = outerTangent(a, b,
-    ArcSegment.Direction.RIGHT
+internal fun rightOuterTangent(a: Circle2D, b: Circle2D): StraightTrajectory = outerTangent(a, b,
+    CircleTrajectory.Direction.RIGHT
 )
 
-private fun outerTangent(a: Circle2D, b: Circle2D, side: ArcSegment.Direction): StraightSegment = with(Euclidean2DSpace){
-    val centers = StraightSegment(a.center, b.center)
+private fun outerTangent(a: Circle2D, b: Circle2D, side: CircleTrajectory.Direction): StraightTrajectory = with(Euclidean2DSpace){
+    val centers = StraightTrajectory(a.center, b.center)
     val p1 = when (side) {
-        ArcSegment.Direction.LEFT -> vector(
+        CircleTrajectory.Direction.LEFT -> vector(
             a.center.x - a.radius * cos(centers.theta),
             a.center.y + a.radius * sin(centers.theta)
         )
-        ArcSegment.Direction.RIGHT -> vector(
+        CircleTrajectory.Direction.RIGHT -> vector(
             a.center.x + a.radius * cos(centers.theta),
             a.center.y - a.radius * sin(centers.theta)
         )
     }
-    return StraightSegment(
+    return StraightTrajectory(
         p1,
         vector(p1.x + (centers.end.x - centers.start.x), p1.y + (centers.end.y - centers.start.y))
     )
 }
 
-internal fun leftInnerTangent(base: Circle2D, direction: Circle2D): StraightSegment? =
-    innerTangent(base, direction, ArcSegment.Direction.LEFT)
+internal fun leftInnerTangent(base: Circle2D, direction: Circle2D): StraightTrajectory? =
+    innerTangent(base, direction, CircleTrajectory.Direction.LEFT)
 
-internal fun rightInnerTangent(base: Circle2D, direction: Circle2D): StraightSegment? =
-    innerTangent(base, direction, ArcSegment.Direction.RIGHT)
+internal fun rightInnerTangent(base: Circle2D, direction: Circle2D): StraightTrajectory? =
+    innerTangent(base, direction, CircleTrajectory.Direction.RIGHT)
 
-private fun innerTangent(base: Circle2D, direction: Circle2D, side: ArcSegment.Direction): StraightSegment? = with(Euclidean2DSpace){
-    val centers = StraightSegment(base.center, direction.center)
+private fun innerTangent(base: Circle2D, direction: Circle2D, side: CircleTrajectory.Direction): StraightTrajectory? = with(Euclidean2DSpace){
+    val centers = StraightTrajectory(base.center, direction.center)
     if (centers.length < base.radius * 2) return null
     val angle = theta(
         when (side) {
-            ArcSegment.Direction.LEFT -> centers.theta + acos(base.radius * 2 / centers.length)
-            ArcSegment.Direction.RIGHT -> centers.theta - acos(base.radius * 2 / centers.length)
+            CircleTrajectory.Direction.LEFT -> centers.theta + acos(base.radius * 2 / centers.length)
+            CircleTrajectory.Direction.RIGHT -> centers.theta - acos(base.radius * 2 / centers.length)
         }
     )
     val dX = base.radius * sin(angle)
     val dY = base.radius * cos(angle)
     val p1 = vector(base.center.x + dX, base.center.y + dY)
     val p2 = vector(direction.center.x - dX, direction.center.y - dY)
-    return StraightSegment(p1, p2)
+    return StraightTrajectory(p1, p2)
 }
 
 internal fun theta(theta: Double): Double = (theta + (2 * PI)) % (2 * PI)
 
+@Suppress("DuplicatedCode")
 public class DubinsPath(
-    public val a: ArcSegment,
+    public val a: CircleTrajectory,
     public val b: Trajectory,
-    public val c: ArcSegment,
+    public val c: CircleTrajectory,
 ) : CompositeTrajectory(listOf(a,b,c)) {
 
     public val type: TYPE = TYPE.valueOf(
         arrayOf(
             a.direction.name[0],
-            if (b is ArcSegment) b.direction.name[0] else 'S',
+            if (b is CircleTrajectory) b.direction.name[0] else 'S',
             c.direction.name[0]
         ).toCharArray().concatToString()
     )
@@ -106,56 +107,98 @@ public class DubinsPath(
         public fun shortest(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath =
             all(start, end, turningRadius).minBy { it.length }
 
-        public fun rlr(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? = with(Euclidean2DSpace){
+        public fun rlr(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? = with(Euclidean2DSpace) {
             val c1 = start.getRightCircle(turningRadius)
             val c2 = end.getRightCircle(turningRadius)
-            val centers = StraightSegment(c1.center, c2.center)
+            val centers = StraightTrajectory(c1.center, c2.center)
             if (centers.length > turningRadius * 4) return null
 
-            var theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
-            var dX = turningRadius * sin(theta)
-            var dY = turningRadius * cos(theta)
-            val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
-            val e = Circle2D(p, turningRadius)
-            val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-            theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
-            dX = turningRadius * sin(theta)
-            dY = turningRadius * cos(theta)
-            val p2 = vector(e.center.x + dX, e.center.y + dY)
-            val a1 = ArcSegment.of(c1.center, start, p1, ArcSegment.Direction.RIGHT)
-            val a2 = ArcSegment.of(e.center, p1, p2, ArcSegment.Direction.LEFT)
-            val a3 = ArcSegment.of(c2.center, p2, end, ArcSegment.Direction.RIGHT)
-            return DubinsPath(a1, a2, a3)
+            val firstVariant = run {
+                var theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
+                var dX = turningRadius * sin(theta)
+                var dY = turningRadius * cos(theta)
+                val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
+                val e = Circle2D(p, turningRadius)
+                val p1 = vector(c1.center.x + dX, c1.center.y + dY)
+                theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
+                dX = turningRadius * sin(theta)
+                dY = turningRadius * cos(theta)
+                val p2 = vector(e.center.x + dX, e.center.y + dY)
+                val a1 = CircleTrajectory.of(c1.center, start, p1, CircleTrajectory.Direction.RIGHT)
+                val a2 = CircleTrajectory.of(e.center, p1, p2, CircleTrajectory.Direction.LEFT)
+                val a3 = CircleTrajectory.of(c2.center, p2, end, CircleTrajectory.Direction.RIGHT)
+                DubinsPath(a1, a2, a3)
+            }
+
+            val secondVariant = run {
+                var theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
+                var dX = turningRadius * sin(theta)
+                var dY = turningRadius * cos(theta)
+                val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
+                val e = Circle2D(p, turningRadius)
+                val p1 = vector(c1.center.x + dX, c1.center.y + dY)
+                theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
+                dX = turningRadius * sin(theta)
+                dY = turningRadius * cos(theta)
+                val p2 = vector(e.center.x + dX, e.center.y + dY)
+                val a1 = CircleTrajectory.of(c1.center, start, p1, CircleTrajectory.Direction.RIGHT)
+                val a2 = CircleTrajectory.of(e.center, p1, p2, CircleTrajectory.Direction.LEFT)
+                val a3 = CircleTrajectory.of(c2.center, p2, end, CircleTrajectory.Direction.RIGHT)
+                DubinsPath(a1, a2, a3)
+            }
+
+            return if (firstVariant.length < secondVariant.length) firstVariant else secondVariant
         }
 
-        public fun lrl(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath?= with(Euclidean2DSpace) {
+        public fun lrl(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? = with(Euclidean2DSpace) {
             val c1 = start.getLeftCircle(turningRadius)
             val c2 = end.getLeftCircle(turningRadius)
-            val centers = StraightSegment(c1.center, c2.center)
+            val centers = StraightTrajectory(c1.center, c2.center)
             if (centers.length > turningRadius * 4) return null
 
-            var theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
-            var dX = turningRadius * sin(theta)
-            var dY = turningRadius * cos(theta)
-            val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
-            val e = Circle2D(p, turningRadius)
-            val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-            theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
-            dX = turningRadius * sin(theta)
-            dY = turningRadius * cos(theta)
-            val p2 = vector(e.center.x + dX, e.center.y + dY)
-            val a1 = ArcSegment.of(c1.center, start, p1, ArcSegment.Direction.LEFT)
-            val a2 = ArcSegment.of(e.center, p1, p2, ArcSegment.Direction.RIGHT)
-            val a3 = ArcSegment.of(c2.center, p2, end, ArcSegment.Direction.LEFT)
-            return DubinsPath(a1, a2, a3)
+            val firstVariant = run {
+                var theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
+                var dX = turningRadius * sin(theta)
+                var dY = turningRadius * cos(theta)
+                val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
+                val e = Circle2D(p, turningRadius)
+                val p1 = vector(c1.center.x + dX, c1.center.y + dY)
+                theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
+                dX = turningRadius * sin(theta)
+                dY = turningRadius * cos(theta)
+                val p2 = vector(e.center.x + dX, e.center.y + dY)
+                val a1 = CircleTrajectory.of(c1.center, start, p1, CircleTrajectory.Direction.LEFT)
+                val a2 = CircleTrajectory.of(e.center, p1, p2, CircleTrajectory.Direction.RIGHT)
+                val a3 = CircleTrajectory.of(c2.center, p2, end, CircleTrajectory.Direction.LEFT)
+                DubinsPath(a1, a2, a3)
+            }
+
+            val secondVariant = run{
+                var theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
+                var dX = turningRadius * sin(theta)
+                var dY = turningRadius * cos(theta)
+                val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
+                val e = Circle2D(p, turningRadius)
+                val p1 = vector(c1.center.x + dX, c1.center.y + dY)
+                theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
+                dX = turningRadius * sin(theta)
+                dY = turningRadius * cos(theta)
+                val p2 = vector(e.center.x + dX, e.center.y + dY)
+                val a1 = CircleTrajectory.of(c1.center, start, p1, CircleTrajectory.Direction.LEFT)
+                val a2 = CircleTrajectory.of(e.center, p1, p2, CircleTrajectory.Direction.RIGHT)
+                val a3 = CircleTrajectory.of(c2.center, p2, end, CircleTrajectory.Direction.LEFT)
+                DubinsPath(a1, a2, a3)
+            }
+
+            return if (firstVariant.length < secondVariant.length) firstVariant else secondVariant
         }
 
         public fun rsr(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath {
             val c1 = start.getRightCircle(turningRadius)
             val c2 = end.getRightCircle(turningRadius)
             val s = leftOuterTangent(c1, c2)
-            val a1 = ArcSegment.of(c1.center, start, s.start, ArcSegment.Direction.RIGHT)
-            val a3 = ArcSegment.of(c2.center, s.end, end, ArcSegment.Direction.RIGHT)
+            val a1 = CircleTrajectory.of(c1.center, start, s.start, CircleTrajectory.Direction.RIGHT)
+            val a3 = CircleTrajectory.of(c2.center, s.end, end, CircleTrajectory.Direction.RIGHT)
             return DubinsPath(a1, s, a3)
         }
 
@@ -163,8 +206,8 @@ public class DubinsPath(
             val c1 = start.getLeftCircle(turningRadius)
             val c2 = end.getLeftCircle(turningRadius)
             val s = rightOuterTangent(c1, c2)
-            val a1 = ArcSegment.of(c1.center, start, s.start, ArcSegment.Direction.LEFT)
-            val a3 = ArcSegment.of(c2.center, s.end, end, ArcSegment.Direction.LEFT)
+            val a1 = CircleTrajectory.of(c1.center, start, s.start, CircleTrajectory.Direction.LEFT)
+            val a3 = CircleTrajectory.of(c2.center, s.end, end, CircleTrajectory.Direction.LEFT)
             return DubinsPath(a1, s, a3)
         }
 
@@ -174,8 +217,8 @@ public class DubinsPath(
             val s = rightInnerTangent(c1, c2)
             if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
 
-            val a1 = ArcSegment.of(c1.center, start, s.start, ArcSegment.Direction.RIGHT)
-            val a3 = ArcSegment.of(c2.center, s.end, end, ArcSegment.Direction.LEFT)
+            val a1 = CircleTrajectory.of(c1.center, start, s.start, CircleTrajectory.Direction.RIGHT)
+            val a3 = CircleTrajectory.of(c2.center, s.end, end, CircleTrajectory.Direction.LEFT)
             return DubinsPath(a1, s, a3)
         }
 
@@ -185,8 +228,8 @@ public class DubinsPath(
             val s = leftInnerTangent(c1, c2)
             if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
 
-            val a1 = ArcSegment.of(c1.center, start, s.start, ArcSegment.Direction.LEFT)
-            val a3 = ArcSegment.of(c2.center, s.end, end, ArcSegment.Direction.RIGHT)
+            val a1 = CircleTrajectory.of(c1.center, start, s.start, CircleTrajectory.Direction.LEFT)
+            val a3 = CircleTrajectory.of(c2.center, s.end, end, CircleTrajectory.Direction.RIGHT)
             return DubinsPath(a1, s, a3)
         }
     }
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
index 03b0fcec9..1085f7847 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
@@ -19,7 +19,7 @@ public sealed interface Trajectory {
 /**
  * Straight path segment. The order of start and end defines the direction
  */
-public data class StraightSegment(
+public data class StraightTrajectory(
     internal val start: DoubleVector2D,
     internal val end: DoubleVector2D,
 ) : Trajectory {
@@ -31,7 +31,7 @@ public data class StraightSegment(
 /**
  * An arc segment
  */
-public data class ArcSegment(
+public data class CircleTrajectory(
     public val circle: Circle2D,
     public val start: Pose2D,
     public val end: Pose2D,
@@ -68,7 +68,7 @@ public data class ArcSegment(
     }
 
     public companion object {
-        public fun of(center: DoubleVector2D, start: DoubleVector2D, end: DoubleVector2D, direction: Direction): ArcSegment {
+        public fun of(center: DoubleVector2D, start: DoubleVector2D, end: DoubleVector2D, direction: Direction): CircleTrajectory {
             fun calculatePose(
                 vector: DoubleVector2D,
                 theta: Double,
@@ -81,11 +81,11 @@ public data class ArcSegment(
                 }
             )
 
-            val s1 = StraightSegment(center, start)
-            val s2 = StraightSegment(center, end)
+            val s1 = StraightTrajectory(center, start)
+            val s2 = StraightTrajectory(center, end)
             val pose1 = calculatePose(start, s1.theta, direction)
             val pose2 = calculatePose(end, s2.theta, direction)
-            return ArcSegment(Circle2D(center, s1.length), pose1, pose2)
+            return CircleTrajectory(Circle2D(center, s1.length), pose1, pose2)
         }
     }
 }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
index 3b2535cee..64513f6e2 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
@@ -17,12 +17,12 @@ fun Double.radiansToDegrees() = this * 180 / PI
 fun Double.equalFloat(other: Double) = abs(this - other) < maxFloatDelta
 fun Pose2D.equalsFloat(other: Pose2D) = x.equalFloat(other.x) && y.equalFloat(other.y) && theta.equalFloat(other.theta)
 
-fun StraightSegment.inverse() = StraightSegment(end, start)
-fun StraightSegment.shift(shift: Int, width: Double): StraightSegment = with(Euclidean2DSpace){
+fun StraightTrajectory.inverse() = StraightTrajectory(end, start)
+fun StraightTrajectory.shift(shift: Int, width: Double): StraightTrajectory = with(Euclidean2DSpace){
     val dX = width * sin(inverse().theta)
     val dY = width * sin(theta)
 
-    return StraightSegment(
+    return StraightTrajectory(
         vector(start.x - dX * shift, start.y - dY * shift),
         vector(end.x - dX * shift, end.y - dY * shift)
     )
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
index 166567475..b545b7c94 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -16,7 +16,7 @@ class DubinsTests {
 
     @Test
     fun dubinsTest() = with(Euclidean2DSpace){
-        val straight = StraightSegment(vector(0.0, 0.0), vector(100.0, 100.0))
+        val straight = StraightTrajectory(vector(0.0, 0.0), vector(100.0, 100.0))
         val lineP1 = straight.shift(1, 10.0).inverse()
 
         val start = Pose2D(straight.end, straight.theta)
@@ -45,12 +45,12 @@ class DubinsTests {
             assertTrue(end.equalsFloat(path.c.end))
 
             // Not working, theta double precision inaccuracy
-            if (path.b is ArcSegment) {
-                val b = path.b as ArcSegment
+            if (path.b is CircleTrajectory) {
+                val b = path.b as CircleTrajectory
                 assertTrue(path.a.end.equalsFloat(b.start))
                 assertTrue(path.c.start.equalsFloat(b.end))
-            } else if (path.b is StraightSegment) {
-                val b = path.b as StraightSegment
+            } else if (path.b is StraightTrajectory) {
+                val b = path.b as StraightTrajectory
                 assertTrue(path.a.end.equalsFloat(Pose2D(b.start, b.theta)))
                 assertTrue(path.c.start.equalsFloat(Pose2D(b.end, b.theta)))
             }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
index 86c79a5d6..17277c35e 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.trajectory.segments
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.circumference
-import space.kscience.kmath.trajectory.ArcSegment
+import space.kscience.kmath.trajectory.CircleTrajectory
 import space.kscience.kmath.trajectory.radiansToDegrees
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -18,7 +18,7 @@ class ArcTests {
     @Test
     fun arcTest() = with(Euclidean2DSpace){
         val circle = Circle2D(vector(0.0, 0.0), 2.0)
-        val arc = ArcSegment.of(circle.center, vector(-2.0, 0.0), vector(0.0, 2.0), ArcSegment.Direction.RIGHT)
+        val arc = CircleTrajectory.of(circle.center, vector(-2.0, 0.0), vector(0.0, 2.0), CircleTrajectory.Direction.RIGHT)
         assertEquals(circle.circumference / 4, arc.length, 1.0)
         assertEquals(0.0, arc.start.theta.radiansToDegrees())
         assertEquals(90.0, arc.end.theta.radiansToDegrees())
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
index c5e88c1f1..4b54d775c 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.trajectory.segments
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.trajectory.StraightSegment
+import space.kscience.kmath.trajectory.StraightTrajectory
 import space.kscience.kmath.trajectory.radiansToDegrees
 import kotlin.math.pow
 import kotlin.math.sqrt
@@ -17,7 +17,7 @@ class LineTests {
 
     @Test
     fun lineTest() = with(Euclidean2DSpace){
-        val straight = StraightSegment(vector(0.0, 0.0), vector(100.0, 100.0))
+        val straight = StraightTrajectory(vector(0.0, 0.0), vector(100.0, 100.0))
         assertEquals(sqrt(100.0.pow(2) + 100.0.pow(2)), straight.length)
         assertEquals(45.0, straight.theta.radiansToDegrees())
     }
@@ -25,13 +25,13 @@ class LineTests {
     @Test
     fun lineAngleTest() = with(Euclidean2DSpace){
         //val zero = Vector2D(0.0, 0.0)
-        val north = StraightSegment(Euclidean2DSpace.zero, vector(0.0, 2.0))
+        val north = StraightTrajectory(Euclidean2DSpace.zero, vector(0.0, 2.0))
         assertEquals(0.0, north.theta.radiansToDegrees())
-        val east = StraightSegment(Euclidean2DSpace.zero, vector(2.0, 0.0))
+        val east = StraightTrajectory(Euclidean2DSpace.zero, vector(2.0, 0.0))
         assertEquals(90.0, east.theta.radiansToDegrees())
-        val south = StraightSegment(Euclidean2DSpace.zero, vector(0.0, -2.0))
+        val south = StraightTrajectory(Euclidean2DSpace.zero, vector(0.0, -2.0))
         assertEquals(180.0, south.theta.radiansToDegrees())
-        val west = StraightSegment(Euclidean2DSpace.zero, vector(-2.0, 0.0))
+        val west = StraightTrajectory(Euclidean2DSpace.zero, vector(-2.0, 0.0))
         assertEquals(270.0, west.theta.radiansToDegrees())
     }
 }
-- 
2.34.1


From d70389d2e622c93fa5ffb0f828428ae5261ab1f9 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 26 Sep 2022 16:47:38 +0300
Subject: [PATCH 622/713] Fix after series merge

---
 .../kotlin/space/kscience/kmath/fit/chiSquared.kt     |  4 ++--
 .../main/kotlin/space/kscience/kmath/fit/qowFit.kt    |  4 ++--
 .../kotlin/space/kscience/kmath/series/analyzeDif.kt  |  5 +++--
 .../kscience/kmath/structures/StreamDoubleFieldND.kt  |  3 ++-
 .../kmath/commons/random/CMRandomGeneratorWrapper.kt  |  3 +--
 .../kmath/commons/optimization/OptimizeTest.kt        |  2 +-
 .../kscience/kmath/expressions/specialExpressions.kt  |  2 +-
 .../kotlin/space/kscience/kmath/nd/DoubleFieldND.kt   |  8 ++++----
 .../kotlin/space/kscience/kmath/nd/Structure1D.kt     |  2 +-
 .../kotlin/space/kscience/kmath/nd/StructureND.kt     |  6 +++---
 .../kotlin/space/kscience/kmath/structures/Buffer.kt  |  1 +
 .../space/kscience/kmath/streaming/RingBufferTest.kt  |  2 +-
 .../kotlin/space/kscience/kmath/real/RealMatrix.kt    |  4 ++--
 .../kotlin/space/kscience/kmath/real/realND.kt        |  4 ++--
 .../kmath/integration/GaussIntegratorRuleFactory.kt   |  4 ++--
 .../kscience/kmath/integration/SplineIntegrator.kt    |  6 +-----
 .../space/kscience/kmath/geometry/Vector2DTest.kt     |  2 +-
 .../space/kscience/kmath/geometry/Vector3DTest.kt     |  2 +-
 .../kmath/histogram/UniformHistogram1DTest.kt         |  8 ++++----
 .../space/kscience/kmath/jupyter/KMathJupyter.kt      |  4 +++-
 .../kscience/kmath/distributions/Distribution.kt      |  2 +-
 .../kmath/distributions/UniformDistribution.kt        |  5 ++---
 .../kmath/samplers/AhrensDieterExponentialSampler.kt  |  1 +
 .../AhrensDieterMarsagliaTsangGammaSampler.kt         |  2 ++
 .../kmath/samplers/AliasMethodDiscreteSampler.kt      |  1 +
 .../kmath/samplers/KempSmallMeanPoissonSampler.kt     |  1 +
 .../kmath/samplers/NormalizedGaussianSampler.kt       |  1 +
 .../space/kscience/kmath/samplers/PoissonSampler.kt   |  1 +
 .../kotlin/space/kscience/kmath/samplers/Sampler.kt   |  1 +
 .../space/kscience/kmath/samplers/SamplerAlgebra.kt   |  1 +
 .../space/kscience/kmath/series/SeriesAlgebra.kt      |  8 ++++----
 .../kotlin/space/kscience/kmath/stat/Median.kt        |  2 +-
 .../kotlin/space/kscience/kmath/stat/Rank.kt          |  2 +-
 .../space/kscience/kmath/stat/StatisticalAlgebra.kt   | 11 +++++------
 .../kotlin/space/kscience/kmath/stat/SamplerTest.kt   |  2 --
 .../kscience/kmath/tensors/core/internal/utils.kt     |  2 +-
 36 files changed, 62 insertions(+), 57 deletions(-)

diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
index 80baf1795..febf55283 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
@@ -12,6 +12,8 @@ import space.kscience.kmath.commons.optimization.CMOptimizer
 import space.kscience.kmath.distributions.NormalDistribution
 import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
+import space.kscience.kmath.operations.asIterable
+import space.kscience.kmath.operations.toList
 import space.kscience.kmath.optimization.FunctionOptimizationTarget
 import space.kscience.kmath.optimization.optimizeWith
 import space.kscience.kmath.optimization.resultPoint
@@ -20,8 +22,6 @@ import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.real.DoubleVector
 import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
-import space.kscience.kmath.structures.asIterable
-import space.kscience.kmath.structures.toList
 import space.kscience.plotly.*
 import space.kscience.plotly.models.ScatterMode
 import space.kscience.plotly.models.TraceValues
diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
index d6676b9ca..c7eefa6b9 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
@@ -13,6 +13,8 @@ import space.kscience.kmath.distributions.NormalDistribution
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.binding
 import space.kscience.kmath.expressions.symbol
+import space.kscience.kmath.operations.asIterable
+import space.kscience.kmath.operations.toList
 import space.kscience.kmath.optimization.QowOptimizer
 import space.kscience.kmath.optimization.chiSquaredOrNull
 import space.kscience.kmath.optimization.fitWith
@@ -20,8 +22,6 @@ import space.kscience.kmath.optimization.resultPoint
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
-import space.kscience.kmath.structures.asIterable
-import space.kscience.kmath.structures.toList
 import space.kscience.plotly.*
 import space.kscience.plotly.models.ScatterMode
 import kotlin.math.abs
diff --git a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
index b9c3141dd..308345ded 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
@@ -3,12 +3,13 @@ package space.kscience.kmath.series
 
 import kotlinx.html.FlowContent
 import kotlinx.html.h1
+import space.kscience.kmath.operations.DoubleBufferOps
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.bufferAlgebra
+import space.kscience.kmath.operations.toList
 import space.kscience.kmath.stat.ksComparisonStatistic
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.slice
-import space.kscience.kmath.structures.toList
 import space.kscience.plotly.*
 import kotlin.math.PI
 
@@ -33,7 +34,7 @@ fun main() = with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
     val s2 = s1.slice(20U..50U).moveTo(40)
 
     val s3: Buffer<Double> = s1.zip(s2) { l, r -> l + r } //s1 + s2
-    val s4 = ln(s3)
+    val s4 = DoubleBufferOps.ln(s3)
 
     val kmTest = ksComparisonStatistic(s1, s2)
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index b047a2aff..1061112eb 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -37,7 +37,8 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
                 this@StreamDoubleFieldND.shape,
                 shape
             )
-            this is BufferND && this.shapeIndices == this@StreamDoubleFieldND.strides -> this.buffer as DoubleBuffer
+
+            this is BufferND && indices == this@StreamDoubleFieldND.strides -> this.buffer as DoubleBuffer
             else -> DoubleBuffer(strides.linearSize) { offset -> get(strides.index(offset)) }
         }
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
index 62967eae5..32962659f 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/random/CMRandomGeneratorWrapper.kt
@@ -6,11 +6,10 @@
 package space.kscience.kmath.commons.random
 
 import kotlinx.coroutines.runBlocking
-import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.toIntExact
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.samplers.GaussianSampler
-import space.kscience.kmath.samplers.next
+import space.kscience.kmath.stat.next
 
 
 public class CMRandomGeneratorWrapper(
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index 53d86c6b7..f6819a27f 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -13,11 +13,11 @@ import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.Symbol.Companion.y
 import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
+import space.kscience.kmath.operations.map
 import space.kscience.kmath.optimization.*
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
-import space.kscience.kmath.structures.map
 import kotlin.math.pow
 import kotlin.test.Test
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
index f56b1f6d6..8cfa1b353 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.expressions
 
 import space.kscience.kmath.operations.ExtendedField
+import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asIterable
 import space.kscience.kmath.structures.indices
 import kotlin.jvm.JvmName
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index f7b81f46f..aab137321 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -15,7 +15,7 @@ import kotlin.math.pow
 import kotlin.math.pow as kpow
 
 public class DoubleBufferND(
-    indexes: ShapeIndices,
+    indexes: ShapeIndexer,
     override val buffer: DoubleBuffer,
 ) : MutableBufferND<Double>(indexes, buffer)
 
@@ -35,7 +35,7 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
         arg: DoubleBufferND,
         transform: (Double) -> Double,
     ): DoubleBufferND {
-        val indexes = arg.shapeIndices
+        val indexes = arg.indices
         val array = arg.buffer.array
         return DoubleBufferND(indexes, DoubleBuffer(indexes.linearSize) { transform(array[it]) })
     }
@@ -45,8 +45,8 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
         r: DoubleBufferND,
         block: (l: Double, r: Double) -> Double,
     ): DoubleBufferND {
-        require(l.shapeIndices == r.shapeIndices) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
-        val indexes = l.shapeIndices
+        require(l.indices == r.indices) { "Zip requires the same shapes, but found ${l.shape} on the left and ${r.shape} on the right" }
+        val indexes = l.indices
         val lArray = l.buffer.array
         val rArray = r.buffer.array
         return DoubleBufferND(indexes, DoubleBuffer(indexes.linearSize) { block(lArray[it], rArray[it]) })
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index 47feefd43..2a258a7f4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -6,10 +6,10 @@
 package space.kscience.kmath.nd
 
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.structures.asMutableBuffer
-import space.kscience.kmath.structures.asSequence
 import kotlin.jvm.JvmInline
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 7d417c4ed..b2da083bb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -54,7 +54,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
      * @return the lazy sequence of pairs of indices to values.
      */
     @PerformancePitfall
-    public fun elements(): Sequence<Pair<IntArray, T>> = shapeIndices.asSequence().map { it to get(it) }
+    public fun elements(): Sequence<Pair<IntArray, T>> = indices.asSequence().map { it to get(it) }
 
     /**
      * Feature is some additional structure information that allows to access it special properties or hints.
@@ -71,7 +71,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
             if (st1 === st2) return true
 
             // fast comparison of buffers if possible
-            if (st1 is BufferND && st2 is BufferND && st1.shapeIndices == st2.shapeIndices)
+            if (st1 is BufferND && st2 is BufferND && st1.indices == st2.indices)
                 return Buffer.contentEquals(st1.buffer, st2.buffer)
 
             //element by element comparison if it could not be avoided
@@ -87,7 +87,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
             if (st1 === st2) return true
 
             // fast comparison of buffers if possible
-            if (st1 is BufferND && st2 is BufferND && st1.shapeIndices == st2.shapeIndices)
+            if (st1 is BufferND && st2 is BufferND && st1.indices == st2.indices)
                 return Buffer.contentEquals(st1.buffer, st2.buffer)
 
             //element by element comparison if it could not be avoided
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
index 75b0f54f0..cef8d1d4d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/Buffer.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.structures
 
 import space.kscience.kmath.operations.WithSize
+import space.kscience.kmath.operations.asSequence
 import kotlin.jvm.JvmInline
 import kotlin.reflect.KClass
 
diff --git a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
index dea694016..a6d7f006c 100644
--- a/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
+++ b/kmath-coroutines/src/jvmTest/kotlin/space/kscience/kmath/streaming/RingBufferTest.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.streaming
 
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.runBlocking
-import space.kscience.kmath.structures.asSequence
+import space.kscience.kmath.operations.asSequence
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
index 1b6490862..cfa59bf32 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
@@ -13,9 +13,9 @@ import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.asIterable
 import kotlin.math.pow
 
 /*
@@ -131,7 +131,7 @@ public fun RealMatrix.extractColumn(columnIndex: Int): RealMatrix =
     extractColumns(columnIndex..columnIndex)
 
 public fun RealMatrix.sumByColumn(): DoubleBuffer = DoubleBuffer(colNum) { j ->
-    columns[j].asIterable().sum()
+    columns[j].sum()
 }
 
 public fun RealMatrix.minByColumn(): DoubleBuffer = DoubleBuffer(colNum) { j ->
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
index e9f0d3063..2c06b76b7 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/realND.kt
@@ -13,8 +13,8 @@ import space.kscience.kmath.structures.DoubleBuffer
  * Map one [BufferND] using function without indices.
  */
 public inline fun BufferND<Double>.mapInline(crossinline transform: DoubleField.(Double) -> Double): BufferND<Double> {
-    val array = DoubleArray(shapeIndices.linearSize) { offset -> DoubleField.transform(buffer[offset]) }
-    return BufferND(shapeIndices, DoubleBuffer(array))
+    val array = DoubleArray(indices.linearSize) { offset -> DoubleField.transform(buffer[offset]) }
+    return BufferND(indices, DoubleBuffer(array))
 }
 
 /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
index 57d77ab47..3845bd2a7 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.integration
 
+import space.kscience.kmath.operations.map
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
-import space.kscience.kmath.structures.map
 import kotlin.jvm.Synchronized
 import kotlin.math.ulp
 import kotlin.native.concurrent.ThreadLocal
@@ -30,7 +30,7 @@ public fun GaussIntegratorRuleFactory.build(
     numPoints: Int,
     range: ClosedRange<Double>,
 ): Pair<Buffer<Double>, Buffer<Double>> {
-    val normalized = build(numPoints)
+    val normalized: Pair<Buffer<Double>, Buffer<Double>> = build(numPoints)
     val length = range.endInclusive - range.start
 
     val points = normalized.first.map(::DoubleBuffer) {
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index 6189d17cd..9a8f475c8 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -12,14 +12,10 @@ import space.kscience.kmath.interpolation.SplineInterpolator
 import space.kscience.kmath.interpolation.interpolatePolynomials
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.operations.sum
+import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.MutableBufferFactory
-import space.kscience.kmath.structures.map
 
 /**
  * Compute analytical indefinite integral of this [PiecewisePolynomial], keeping all intervals intact
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
index 6ad323f26..0db06f4c8 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector2DTest.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.geometry
 
 
-import space.kscience.kmath.structures.toList
+import space.kscience.kmath.operations.toList
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
index 6716bf940..1c8607838 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Vector3DTest.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.geometry
 
-import space.kscience.kmath.structures.toList
+import space.kscience.kmath.operations.toList
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
index fd107f5e8..c4554b575 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
@@ -10,7 +10,7 @@ import kotlinx.coroutines.test.runTest
 import space.kscience.kmath.distributions.NormalDistribution
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.stat.RandomGenerator
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.stat.nextBuffer
 import kotlin.native.concurrent.ThreadLocal
 import kotlin.test.Test
@@ -36,7 +36,7 @@ internal class UniformHistogram1DTest {
     @Test
     fun rebinDown() = runTest {
         val h1 = Histogram.uniform1D(DoubleField, 0.01).produce(generator.nextDoubleBuffer(10000))
-        val h2 = Histogram.uniform1D(DoubleField,0.03).produceFrom(h1)
+        val h2 = Histogram.uniform1D(DoubleField, 0.03).produceFrom(h1)
 
         assertEquals(10000, h2.bins.sumOf { it.binValue }.toInt())
     }
@@ -44,13 +44,13 @@ internal class UniformHistogram1DTest {
     @Test
     fun rebinUp() = runTest {
         val h1 = Histogram.uniform1D(DoubleField, 0.03).produce(generator.nextDoubleBuffer(10000))
-        val h2 = Histogram.uniform1D(DoubleField,0.01).produceFrom(h1)
+        val h2 = Histogram.uniform1D(DoubleField, 0.01).produceFrom(h1)
 
         assertEquals(10000, h2.bins.sumOf { it.binValue }.toInt())
     }
 
     @ThreadLocal
-    companion object{
+    companion object {
         private val generator = RandomGenerator.default(123)
     }
 }
\ No newline at end of file
diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
index 18630ee14..1fe9fe92f 100644
--- a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -21,9 +21,9 @@ import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.MstRing
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.Structure2D
+import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asSequence
 
 /**
  * A function for conversion of number to MST for pretty print
@@ -47,11 +47,13 @@ internal class KMathJupyter : JupyterIntegration() {
                 syntaxRender.renderPart(mathRender.render(MST.Numeric(it)), s)
                 +s.toString()
             }
+
             is MST -> {
                 val s = StringBuilder()
                 syntaxRender.renderPart(mathRender.render(it), s)
                 +s.toString()
             }
+
             else -> {
                 +"<ms>"
                 +it.toString()
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
index aca224375..806da5560 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/Distribution.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.distributions
 
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.random.RandomGenerator
-import space.kscience.kmath.samplers.Sampler
+import space.kscience.kmath.stat.Sampler
 
 /**
  * A distribution of typed objects.
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/UniformDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/UniformDistribution.kt
index fa51bb521..953be06fd 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/UniformDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/UniformDistribution.kt
@@ -3,12 +3,11 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.stat
+package space.kscience.kmath.distributions
 
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.chains.SimpleChain
-import space.kscience.kmath.distributions.Distribution
-import space.kscience.kmath.distributions.Distribution1D
+import space.kscience.kmath.random.RandomGenerator
 
 public class UniformDistribution(public val range: ClosedFloatingPointRange<Double>) : Distribution1D<Double> {
     private val length: Double = range.endInclusive - range.start
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
index 67d2c8003..e5a48d4d8 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterExponentialSampler.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingDoubleChain
 import space.kscience.kmath.random.RandomGenerator
+import space.kscience.kmath.stat.Sampler
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.math.ln
 import kotlin.math.pow
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
index 30fce19e9..d301ff637 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AhrensDieterMarsagliaTsangGammaSampler.kt
@@ -8,6 +8,8 @@ package space.kscience.kmath.samplers
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.random.chain
+import space.kscience.kmath.stat.Sampler
+import space.kscience.kmath.stat.next
 import kotlin.math.*
 
 /**
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
index dc88d866f..2ec40c347 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/AliasMethodDiscreteSampler.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.samplers
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.random.chain
+import space.kscience.kmath.stat.Sampler
 import kotlin.math.ceil
 import kotlin.math.max
 import kotlin.math.min
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
index be378c2fc..6d2899314 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/KempSmallMeanPoissonSampler.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingIntChain
 import space.kscience.kmath.random.RandomGenerator
+import space.kscience.kmath.stat.Sampler
 import space.kscience.kmath.structures.IntBuffer
 import kotlin.math.exp
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
index ea121bfa6..291d0bffe 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/NormalizedGaussianSampler.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.samplers
 
 import space.kscience.kmath.chains.BlockingDoubleChain
 import space.kscience.kmath.random.RandomGenerator
+import space.kscience.kmath.stat.Sampler
 
 public interface BlockingDoubleSampler : Sampler<Double> {
     override fun sample(generator: RandomGenerator): BlockingDoubleChain
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
index 5dcf4e3e2..454691e05 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/PoissonSampler.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.samplers
 import space.kscience.kmath.chains.BlockingIntChain
 import space.kscience.kmath.misc.toIntExact
 import space.kscience.kmath.random.RandomGenerator
+import space.kscience.kmath.stat.Sampler
 import space.kscience.kmath.structures.IntBuffer
 import kotlin.math.*
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt
index 66ade8119..52e400bf1 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.flow.first
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.chains.combine
 import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.DoubleBuffer
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/SamplerAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/SamplerAlgebra.kt
index 748da727b..44b87a431 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/SamplerAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/SamplerAlgebra.kt
@@ -13,6 +13,7 @@ import space.kscience.kmath.operations.Group
 import space.kscience.kmath.operations.ScaleOperations
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.random.RandomGenerator
+import space.kscience.kmath.stat.Sampler
 
 /**
  * Implements [Sampler] by sampling only certain [value].
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index 79da3d98d..96ad4daf7 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -97,7 +97,7 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
      * Build a new series
      */
     public fun series(size: Int, fromIndex: Int = 0, block: A.(label: L) -> T): Series<T> {
-        return bufferFactory(size) {
+        return elementAlgebra.bufferFactory(size) {
             val index = it + fromIndex
             elementAlgebra.block(labelResolver(index))
         }.moveTo(fromIndex)
@@ -122,7 +122,7 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
      * Map a series to another series of the same size
      */
     public inline fun Buffer<T>.map(crossinline transform: A.(T) -> T): Series<T> {
-        val buf = bufferFactory(size) {
+        val buf = elementAlgebra.bufferFactory(size) {
             elementAlgebra.transform(getAbsolute(it))
         }
         return buf.moveTo(indices.first)
@@ -133,7 +133,7 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
      */
     public inline fun Buffer<T>.mapWithLabel(crossinline transform: A.(arg: T, label: L) -> T): Series<T> {
         val labels = labels
-        val buf = bufferFactory(size) {
+        val buf = elementAlgebra.bufferFactory(size) {
             elementAlgebra.transform(getAbsolute(it), labels[it])
         }
         return buf.moveTo(indices.first)
@@ -161,7 +161,7 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
         crossinline operation: A.(left: T, right: T) -> T,
     ): Series<T> {
         val newRange = indices.intersect(other.indices)
-        return bufferFactory(newRange.size) {
+        return elementAlgebra.bufferFactory(newRange.size) {
             elementAlgebra.operation(
                 getAbsolute(it),
                 other.getAbsolute(it)
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
index cc7d488dc..87046cd46 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Median.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.stat
 
+import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asSequence
 
 /**
  * Non-composable median
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Rank.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Rank.kt
index 5a5b99177..5a873b466 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Rank.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Rank.kt
@@ -1,7 +1,7 @@
 package space.kscience.kmath.stat
 
+import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asIterable
 
 /**
  * Rank statistics
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt
index fcda58268..f36826c28 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt
@@ -1,16 +1,15 @@
 package space.kscience.kmath.stat
 
 import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.misc.sorted
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.BufferFactory
-import space.kscience.kmath.structures.asIterable
-import space.kscience.kmath.structures.sorted
+import space.kscience.kmath.structures.MutableBufferFactory
 
 public interface StatisticalAlgebra<T, out A : Algebra<T>, out BA : BufferAlgebra<T, A>> : Algebra<Buffer<T>> {
     public val bufferAlgebra: BA
     public val elementAlgebra: A get() = bufferAlgebra.elementAlgebra
-    public val bufferFactory: BufferFactory<T> get() = bufferAlgebra.bufferFactory
+    override val bufferFactory: MutableBufferFactory<Buffer<T>> get() = bufferAlgebra.bufferFactory
 }
 
 /**
@@ -41,8 +40,8 @@ public fun <T : Comparable<T>, A, BA : BufferAlgebra<T, A>> StatisticalAlgebra<T
     val n = sx.size
     val m = sy.size
 
-    var rankX = 0
-    var rankY = 0
+    var rankX: Int = 0
+    var rankY: Int = 0
     var curD: T = zero
 
     // Find the max difference between cdf_x and cdf_y
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
index 56912e55b..0076006e6 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/SamplerTest.kt
@@ -8,8 +8,6 @@ package space.kscience.kmath.stat
 import kotlinx.coroutines.runBlocking
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.random.chain
-import space.kscience.kmath.samplers.Sampler
-import space.kscience.kmath.samplers.sampleBuffer
 import kotlin.test.Test
 
 class SamplerTest {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index daafdaa58..cfbd9bdc9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -8,8 +8,8 @@ package space.kscience.kmath.tensors.core.internal
 import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.operations.DoubleBufferOps.Companion.map
 import space.kscience.kmath.operations.toMutableList
+import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.samplers.GaussianSampler
-import space.kscience.kmath.stat.RandomGenerator
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.tensors.core.BufferedTensor
 import space.kscience.kmath.tensors.core.DoubleTensor
-- 
2.34.1


From b602066f4880037f60a49db7b4d417cd0626765c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 27 Sep 2022 16:57:06 +0300
Subject: [PATCH 623/713] Change the default strides and unify strides
 processing

---
 .../space/kscience/kmath/series/analyzeDif.kt |  5 +-
 .../kmath/structures/StreamDoubleFieldND.kt   |  2 +-
 .../structures/StructureReadBenchmark.kt      |  4 +-
 .../space/kscience/kmath/nd/BufferND.kt       |  4 +-
 .../kotlin/space/kscience/kmath/nd/Shape.kt   |  2 +-
 .../space/kscience/kmath/nd/ShapeIndices.kt   | 73 +++++++++++++---
 .../space/kscience/kmath/nd/Structure2D.kt    |  9 +-
 .../space/kscience/kmath/nd/StructureND.kt    |  8 +-
 .../kmath/structures/BufferAccessor2D.kt      |  4 +-
 .../kscience/kmath/structures/BufferView.kt   | 33 ++++----
 .../kmath/structures/bufferPrimitiveAccess.kt |  4 +-
 .../space/kscience/kmath/nd/StridesTest.kt    | 38 +++++++++
 .../kmath/structures/BufferExpandedTest.kt    |  2 +-
 .../kmath/structures/LazyStructureND.kt       |  4 +-
 .../kscience/kmath/histogram/HistogramND.kt   |  4 +-
 .../histogram/MultivariateHistogramTest.kt    |  4 +-
 .../kmath/multik/MultikTensorAlgebra.kt       |  2 +-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |  4 +-
 .../kscience/kmath/series/SeriesAlgebra.kt    |  6 +-
 .../tensorflow/DoubleTensorFlowAlgebra.kt     |  4 +-
 .../kmath/tensors/core/BufferedTensor.kt      |  5 +-
 .../kmath/tensors/core/DoubleTensor.kt        | 83 +++++++++++++++++--
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  5 +-
 .../kmath/tensors/core/IntTensorAlgebra.kt    |  2 +-
 .../tensors/core/TensorLinearStructure.kt     | 74 -----------------
 .../core/internal/doubleTensorHelpers.kt      | 13 +--
 .../tensors/core/internal/intTensorHelpers.kt | 19 ++---
 .../kmath/tensors/core/internal/utils.kt      |  8 +-
 .../kmath/tensors/core/tensorTransform.kt     |  9 +-
 .../kmath/tensors/core/TestDoubleTensor.kt    |  2 +-
 .../kscience/kmath/viktor/ViktorFieldOpsND.kt |  8 +-
 .../kmath/viktor/ViktorStructureND.kt         |  4 +-
 32 files changed, 268 insertions(+), 180 deletions(-)
 create mode 100644 kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/StridesTest.kt
 delete mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
index 308345ded..c1b0c056e 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
@@ -7,6 +7,7 @@ import space.kscience.kmath.operations.DoubleBufferOps
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.bufferAlgebra
 import space.kscience.kmath.operations.toList
+import space.kscience.kmath.stat.KMComparisonResult
 import space.kscience.kmath.stat.ksComparisonStatistic
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.slice
@@ -31,12 +32,12 @@ fun main() = with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
 
 
     val s1 = series(100) { sin(2 * PI * it / 100) + 1.0 }
-    val s2 = s1.slice(20U..50U).moveTo(40)
+    val s2 = s1.slice(20..50).moveTo(40)
 
     val s3: Buffer<Double> = s1.zip(s2) { l, r -> l + r } //s1 + s2
     val s4 = DoubleBufferOps.ln(s3)
 
-    val kmTest = ksComparisonStatistic(s1, s2)
+    val kmTest: KMComparisonResult<Double> = ksComparisonStatistic(s1, s2)
 
     Plotly.page {
         h1 { +"This is my plot" }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index 1061112eb..f97e98973 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -21,7 +21,7 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
     NumbersAddOps<StructureND<Double>>,
     ExtendedField<StructureND<Double>> {
 
-    private val strides = DefaultStrides(shape)
+    private val strides = ColumnStrides(shape)
     override val elementAlgebra: DoubleField get() = DoubleField
     override val zero: BufferND<Double> by lazy { structureND(shape) { zero } }
     override val one: BufferND<Double> by lazy { structureND(shape) { one } }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
index a64ac7280..ae7693f03 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.structures
 
 import space.kscience.kmath.nd.BufferND
-import space.kscience.kmath.nd.DefaultStrides
+import space.kscience.kmath.nd.ColumnStrides
 import kotlin.system.measureTimeMillis
 
 @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
@@ -14,7 +14,7 @@ fun main() {
     val n = 6000
     val array = DoubleArray(n * n) { 1.0 }
     val buffer = DoubleBuffer(array)
-    val strides = DefaultStrides(intArrayOf(n, n))
+    val strides = ColumnStrides(intArrayOf(n, n))
     val structure = BufferND(strides, buffer)
 
     measureTimeMillis {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 1eb08fa8c..7efc785fb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -38,7 +38,7 @@ public inline fun <T, R : Any> StructureND<T>.mapToBuffer(
 ): BufferND<R> = if (this is BufferND<T>)
     BufferND(this.indices, factory.invoke(indices.linearSize) { transform(buffer[it]) })
 else {
-    val strides = DefaultStrides(shape)
+    val strides = ColumnStrides(shape)
     BufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
 }
 
@@ -75,7 +75,7 @@ public inline fun <T, reified R : Any> MutableStructureND<T>.mapToMutableBuffer(
     return if (this is MutableBufferND<T>)
         MutableBufferND(this.indices, factory.invoke(indices.linearSize) { transform(buffer[it]) })
     else {
-        val strides = DefaultStrides(shape)
+        val strides = ColumnStrides(shape)
         MutableBufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
     }
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
index c5d04c9de..fc0b4b6ea 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
@@ -24,7 +24,7 @@ public fun Shape(shapeFirst: Int, vararg shapeRest: Int): Shape = intArrayOf(sha
 public interface WithShape {
     public val shape: Shape
 
-    public val indices: ShapeIndexer get() = DefaultStrides(shape)
+    public val indices: ShapeIndexer get() = ColumnStrides(shape)
 }
 
 internal fun requireIndexInShape(index: IntArray, shape: Shape) {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
index 2dce407ca..4b31e3fc5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.nd
 
+import kotlin.math.max
 import kotlin.native.concurrent.ThreadLocal
 
 /**
@@ -61,12 +62,16 @@ public abstract class Strides : ShapeIndexer {
      * Iterate over ND indices in a natural order
      */
     public override fun asSequence(): Sequence<IntArray> = (0 until linearSize).asSequence().map(::index)
+
+    public companion object{
+        public fun linearSizeOf(shape: IntArray): Int = shape.reduce(Int::times)
+    }
 }
 
 /**
- * Simple implementation of [Strides].
+ * Column-first [Strides]. Columns are represented as continuous arrays
  */
-public class DefaultStrides(override val shape: IntArray) : Strides() {
+public class ColumnStrides(override val shape: IntArray) : Strides() {
     override val linearSize: Int get() = strides[shape.size]
 
     /**
@@ -100,22 +105,64 @@ public class DefaultStrides(override val shape: IntArray) : Strides() {
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other !is DefaultStrides) return false
-        if (!shape.contentEquals(other.shape)) return false
-        return true
+        if (other !is ColumnStrides) return false
+        return shape.contentEquals(other.shape)
     }
 
     override fun hashCode(): Int = shape.contentHashCode()
 
 
-    public companion object {
-        /**
-         * Cached builder for default strides
-         */
-        @Deprecated("Replace by Strides(shape)")
-        public operator fun invoke(shape: IntArray): Strides =
-            defaultStridesCache.getOrPut(shape) { DefaultStrides(shape) }
+    public companion object
+}
+
+/**
+ * This [Strides] implementation follows the last dimension first convention
+ * For more information: https://numpy.org/doc/stable/reference/generated/numpy.ndarray.strides.html
+ *
+ * @param shape the shape of the tensor.
+ */
+public class RowStrides(override val shape: IntArray) : Strides() {
+
+    override val strides: IntArray by lazy {
+        val nDim = shape.size
+        val res = IntArray(nDim)
+        if (nDim == 0) return@lazy res
+
+        var current = nDim - 1
+        res[current] = 1
+
+        while (current > 0) {
+            res[current - 1] = max(1, shape[current]) * res[current]
+            current--
+        }
+        res
     }
+
+    override fun index(offset: Int): IntArray {
+        val res = IntArray(shape.size)
+        var current = offset
+        var strideIndex = 0
+
+        while (strideIndex < shape.size) {
+            res[strideIndex] = (current / strides[strideIndex])
+            current %= strides[strideIndex]
+            strideIndex++
+        }
+        return res
+    }
+
+    override val linearSize: Int get() = linearSizeOf(shape)
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is RowStrides) return false
+        return shape.contentEquals(other.shape)
+    }
+
+    override fun hashCode(): Int = shape.contentHashCode()
+
+    public companion object
+
 }
 
 @ThreadLocal
@@ -124,4 +171,4 @@ private val defaultStridesCache = HashMap<IntArray, Strides>()
 /**
  * Cached builder for default strides
  */
-public fun Strides(shape: IntArray): Strides = defaultStridesCache.getOrPut(shape) { DefaultStrides(shape) }
\ No newline at end of file
+public fun Strides(shape: IntArray): Strides = defaultStridesCache.getOrPut(shape) { RowStrides(shape) }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index d8fd2031c..2822a74d4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.nd
 
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.structures.MutableListBuffer
 import space.kscience.kmath.structures.VirtualBuffer
 import kotlin.jvm.JvmInline
@@ -84,15 +85,15 @@ public interface MutableStructure2D<T> : Structure2D<T>, MutableStructureND<T> {
      * The buffer of rows of this structure. It gets elements from the structure dynamically.
      */
     @PerformancePitfall
-    override val rows: List<MutableStructure1D<T>>
-        get() = List(rowNum) { i -> MutableBuffer1DWrapper(MutableListBuffer(colNum) { j -> get(i, j) }) }
+    override val rows: List<MutableBuffer<T>>
+        get() = List(rowNum) { i -> MutableListBuffer(colNum) { j -> get(i, j) } }
 
     /**
      * The buffer of columns of this structure. It gets elements from the structure dynamically.
      */
     @PerformancePitfall
-    override val columns: List<MutableStructure1D<T>>
-        get() = List(colNum) { j -> MutableBuffer1DWrapper(MutableListBuffer(rowNum) { i -> get(i, j) }) }
+    override val columns: List<MutableBuffer<T>>
+        get() = List(colNum) { j -> MutableListBuffer(rowNum) { i -> get(i, j) } }
 }
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index b2da083bb..4e1cc1ff4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -148,25 +148,25 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
             shape: IntArray,
             bufferFactory: BufferFactory<T> = BufferFactory.boxing(),
             initializer: (IntArray) -> T,
-        ): BufferND<T> = buffered(DefaultStrides(shape), bufferFactory, initializer)
+        ): BufferND<T> = buffered(ColumnStrides(shape), bufferFactory, initializer)
 
         public inline fun <reified T : Any> auto(
             shape: IntArray,
             crossinline initializer: (IntArray) -> T,
-        ): BufferND<T> = auto(DefaultStrides(shape), initializer)
+        ): BufferND<T> = auto(ColumnStrides(shape), initializer)
 
         @JvmName("autoVarArg")
         public inline fun <reified T : Any> auto(
             vararg shape: Int,
             crossinline initializer: (IntArray) -> T,
         ): BufferND<T> =
-            auto(DefaultStrides(shape), initializer)
+            auto(ColumnStrides(shape), initializer)
 
         public inline fun <T : Any> auto(
             type: KClass<T>,
             vararg shape: Int,
             crossinline initializer: (IntArray) -> T,
-        ): BufferND<T> = auto(type, DefaultStrides(shape), initializer)
+        ): BufferND<T> = auto(type, ColumnStrides(shape), initializer)
     }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
index 07355d396..f61a0a623 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.structures
 
-import space.kscience.kmath.nd.DefaultStrides
+import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.as2D
@@ -31,7 +31,7 @@ internal class BufferAccessor2D<T>(
 
     //TODO optimize wrapper
     fun MutableBuffer<T>.collect(): Structure2D<T> = StructureND.buffered(
-        DefaultStrides(intArrayOf(rowNum, colNum)),
+        ColumnStrides(intArrayOf(rowNum, colNum)),
         factory
     ) { (i, j) ->
         get(i, j)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
index 8dc0d63ef..e8ab4f0ba 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
@@ -15,6 +15,9 @@ public interface BufferView<T> : Buffer<T> {
      */
     @UnstableKMathAPI
     public fun originIndex(index: Int): Int
+
+    @OptIn(UnstableKMathAPI::class)
+    override fun get(index: Int): T = origin[originIndex(index)]
 }
 
 /**
@@ -22,40 +25,40 @@ public interface BufferView<T> : Buffer<T> {
  */
 public class BufferSlice<T>(
     override val origin: Buffer<T>,
-    public val offset: UInt = 0U,
+    public val offset: Int = 0,
     override val size: Int,
 ) : BufferView<T> {
 
     init {
         require(size > 0) { "Size must be positive" }
-        require(offset + size.toUInt() <= origin.size.toUInt()) {
-            "End of buffer ${offset + size.toUInt()} is beyond the end of origin buffer size ${origin.size}"
+        require(offset + size <= origin.size) {
+            "End of buffer ${offset + size} is beyond the end of origin buffer size ${origin.size}"
         }
     }
 
     override fun get(index: Int): T = if (index >= size) {
         throw IndexOutOfBoundsException("$index is out of ${0 until size} rage")
     } else {
-        origin[index.toUInt() + offset]
+        origin[index + offset]
     }
 
     override fun iterator(): Iterator<T> =
-        (offset until (offset + size.toUInt())).asSequence().map { origin[it] }.iterator()
+        (offset until (offset + size)).asSequence().map { origin[it] }.iterator()
 
     @UnstableKMathAPI
-    override fun originIndex(index: Int): Int = if (index >= size) -1 else index - offset.toInt()
+    override fun originIndex(index: Int): Int = if (index >= size) -1 else index - offset
 
-    override fun toString(): String = "$origin[$offset..${offset + size.toUInt()}"
+    override fun toString(): String = "$origin[$offset..${offset + size}"
 }
 
 /**
- * An expanded buffer that could include the whole initial buffer ot its part and fills all space beyond it borders with [defaultValue].
+ * An expanded buffer that could include the whole initial buffer or its part and fills all space beyond it borders with [defaultValue].
  *
  * The [offset] parameter shows the shift of expanded buffer start relative to origin start and could be both positive and negative.
  */
 public class BufferExpanded<T>(
     override val origin: Buffer<T>,
-    public val defaultValue: T,
+    private val defaultValue: T,
     public val offset: Int = 0,
     override val size: Int = origin.size,
 ) : BufferView<T> {
@@ -79,17 +82,17 @@ public class BufferExpanded<T>(
 /**
  * Zero-copy select a slice inside the original buffer
  */
-public fun <T> Buffer<T>.slice(range: UIntRange): BufferView<T> = if (this is BufferSlice) {
+public fun <T> Buffer<T>.slice(range: IntRange): BufferView<T> = if (this is BufferSlice) {
     BufferSlice(
         origin,
         this.offset + range.first,
-        (range.last - range.first).toInt() + 1
+        (range.last - range.first) + 1
     )
 } else {
     BufferSlice(
         this,
         range.first,
-        (range.last - range.first).toInt() + 1
+        (range.last - range.first) + 1
     )
 }
 
@@ -103,7 +106,7 @@ public fun <T> Buffer<T>.expand(
 ): BufferView<T> = if (range.first >= 0 && range.last < size) {
     BufferSlice(
         this,
-        range.first.toUInt(),
+        range.first,
         (range.last - range.first) + 1
     )
 } else {
@@ -118,7 +121,7 @@ public fun <T> Buffer<T>.expand(
 /**
  * A [BufferView] that overrides indexing of the original buffer
  */
-public class PermutatedBuffer<T>(
+public class PermutedBuffer<T>(
     override val origin: Buffer<T>,
     private val permutations: IntArray,
 ) : BufferView<T> {
@@ -145,4 +148,4 @@ public class PermutatedBuffer<T>(
 /**
  * Created a permuted view of given buffer using provided [indices]
  */
-public fun <T> Buffer<T>.permute(indices: IntArray): PermutatedBuffer<T> = PermutatedBuffer(this, indices)
\ No newline at end of file
+public fun <T> Buffer<T>.permute(indices: IntArray): PermutedBuffer<T> = PermutedBuffer(this, indices)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
index d361cb013..2f2cc80b3 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
@@ -9,7 +9,7 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 @UnstableKMathAPI
 public fun Buffer<Double>.getDouble(index: Int): Double = if (this is BufferView) {
     val originIndex = originIndex(index)
-    if( originIndex>=0) {
+    if (originIndex >= 0) {
         origin.getDouble(originIndex)
     } else {
         get(index)
@@ -26,7 +26,7 @@ public fun Buffer<Double>.getDouble(index: Int): Double = if (this is BufferView
 @UnstableKMathAPI
 public fun Buffer<Int>.getInt(index: Int): Int = if (this is BufferView) {
     val originIndex = originIndex(index)
-    if( originIndex>=0) {
+    if (originIndex >= 0) {
         origin.getInt(originIndex)
     } else {
         get(index)
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/StridesTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/StridesTest.kt
new file mode 100644
index 000000000..eac4f17e1
--- /dev/null
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/StridesTest.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.nd
+
+import kotlin.test.Test
+
+class StridesTest {
+    @Test
+    fun checkRowBasedStrides() {
+        val strides = RowStrides(intArrayOf(3, 3))
+        var counter = 0
+        for(i in 0..2){
+            for(j in 0..2){
+//                print(strides.offset(intArrayOf(i,j)).toString() + "\t")
+                require(strides.offset(intArrayOf(i,j)) == counter)
+                counter++
+            }
+            println()
+        }
+    }
+
+    @Test
+    fun checkColumnBasedStrides() {
+        val strides = ColumnStrides(intArrayOf(3, 3))
+        var counter = 0
+        for(i in 0..2){
+            for(j in 0..2){
+//                print(strides.offset(intArrayOf(i,j)).toString() + "\t")
+                require(strides.offset(intArrayOf(j,i)) == counter)
+                counter++
+            }
+            println()
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/BufferExpandedTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/BufferExpandedTest.kt
index 992080fb0..04671e040 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/BufferExpandedTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/BufferExpandedTest.kt
@@ -9,7 +9,7 @@ internal class BufferExpandedTest {
 
     @Test
     fun shrink(){
-        val view = buffer.slice(20U..30U)
+        val view = buffer.slice(20..30)
         assertEquals(20, view[0])
         assertEquals(30, view[10])
         assertFails { view[11] }
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
index 786d32190..c217c3a26 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.structures
 import kotlinx.coroutines.*
 import space.kscience.kmath.coroutines.Math
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.DefaultStrides
+import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.StructureND
 
 public class LazyStructureND<out T>(
@@ -27,7 +27,7 @@ public class LazyStructureND<out T>(
 
     @OptIn(PerformancePitfall::class)
     override fun elements(): Sequence<Pair<IntArray, T>> {
-        val strides = DefaultStrides(shape)
+        val strides = ColumnStrides(shape)
         val res = runBlocking { strides.asSequence().toList().map { index -> index to await(index) } }
         return res.asSequence()
     }
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
index 2cefb33a5..1c9f00838 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.histogram
 
 import space.kscience.kmath.domains.Domain
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.nd.DefaultStrides
+import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.FieldOpsND
 import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
@@ -32,7 +32,7 @@ public class HistogramND<T : Comparable<T>, D : Domain<T>, V : Any>(
     override val dimension: Int get() = group.shape.size
 
     override val bins: Iterable<DomainBin<T, D, V>>
-        get() = DefaultStrides(group.shape).asSequence().map {
+        get() = ColumnStrides(group.shape).asSequence().map {
             group.produceBin(it, values[it])
         }.asIterable()
 }
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
index 717f9d7a1..7e11c9a2f 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
@@ -8,7 +8,7 @@
 package space.kscience.kmath.histogram
 
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.DefaultStrides
+import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.real.DoubleVector
 import kotlin.random.Random
@@ -73,7 +73,7 @@ internal class MultivariateHistogramTest {
             }
             val res = histogram1 - histogram2
             assertTrue {
-                DefaultStrides(shape).asSequence().all { index ->
+                ColumnStrides(shape).asSequence().all { index ->
                     res.values[index] <= histogram1.values[index]
                 }
             }
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index 194c5fcee..dd0249fbc 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -31,7 +31,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
     protected val multikStat: Statistics = multikEngine.getStatistics()
 
     override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): MultikTensor<T> {
-        val strides = DefaultStrides(shape)
+        val strides = ColumnStrides(shape)
         val memoryView = initMemoryView<T>(strides.linearSize, type)
         strides.asSequence().forEachIndexed { linearIndex, tensorIndex ->
             memoryView[linearIndex] = elementAlgebra.initializer(tensorIndex)
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index c1772683f..b0fce8dcf 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -13,7 +13,7 @@ import org.nd4j.linalg.factory.Nd4j
 import org.nd4j.linalg.factory.ops.NDBase
 import org.nd4j.linalg.ops.transforms.Transforms
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.DefaultStrides
+import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.DoubleField
@@ -178,7 +178,7 @@ public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double, DoubleField> {
 
     override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): Nd4jArrayStructure<Double> {
         val array: INDArray = Nd4j.zeros(*shape)
-        val indices = DefaultStrides(shape)
+        val indices = ColumnStrides(shape)
         indices.asSequence().forEach { index ->
             array.putScalar(index, elementAlgebra.initializer(index))
         }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index 96ad4daf7..3cd2212f6 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -38,7 +38,7 @@ public val <T> Series<T>.absoluteIndices: IntRange get() = position until positi
 /**
  * A [BufferView] with index offset (both positive and negative) and possible size change
  */
-private class OffsetBufer<T>(
+private class SeriesImpl<T>(
     override val origin: Buffer<T>,
     override val position: Int,
     override val size: Int = origin.size,
@@ -86,9 +86,9 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
      * Create an offset series with index starting point at [index]
      */
     public fun Buffer<T>.moveTo(index: Int): Series<T> = if (this is Series) {
-        OffsetBufer(origin, index, size)
+        SeriesImpl(origin, index, size)
     } else {
-        OffsetBufer(this, index, size)
+        SeriesImpl(this, index, size)
     }
 
     public val Buffer<T>.offset: Int get() = if (this is Series) position else 0
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
index c4d192792..953076680 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
@@ -13,7 +13,7 @@ import org.tensorflow.types.TFloat64
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.DefaultStrides
+import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.DoubleField
@@ -39,7 +39,7 @@ public class DoubleTensorFlowAlgebra internal constructor(
         initializer: DoubleField.(IntArray) -> Double,
     ): StructureND<Double> {
         val res = TFloat64.tensorOf(org.tensorflow.ndarray.Shape.of(*shape.toLongArray())) { array ->
-            DefaultStrides(shape).forEach { index ->
+            ColumnStrides(shape).forEach { index ->
                 array.setDouble(elementAlgebra.initializer(index), *index.toLongArray())
             }
         }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 0b043db56..53f77195c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.RowStrides
 import space.kscience.kmath.nd.Strides
 import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.tensors.api.Tensor
@@ -20,9 +21,9 @@ public abstract class BufferedTensor<T>(
     public abstract val source: MutableBuffer<T>
 
     /**
-     * Buffer strides based on [TensorLinearStructure] implementation
+     * Buffer strides based on [RowStrides] implementation
      */
-    override val indices: Strides get() = TensorLinearStructure(shape)
+    override val indices: Strides get() = RowStrides(shape)
 
     /**
      * Number of elements in tensor
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
index d3308a69f..05d2b0feb 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -5,32 +5,38 @@
 
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.nd.MutableStructure2D
+import space.kscience.kmath.nd.MutableStructureND
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.core.internal.toPrettyString
+import kotlin.jvm.JvmInline
 
 public class OffsetDoubleBuffer(
-    private val source: DoubleBuffer,
+    override val origin: DoubleBuffer,
     private val offset: Int,
     override val size: Int,
-) : MutableBuffer<Double> {
+) : MutableBuffer<Double>, BufferView<Double> {
 
     init {
         require(offset >= 0) { "Offset must be non-negative" }
         require(size >= 0) { "Size must be non-negative" }
-        require(offset + size <= source.size) { "Maximum index must be inside source dimension" }
+        require(offset + size <= origin.size) { "Maximum index must be inside source dimension" }
     }
 
     override fun set(index: Int, value: Double) {
         require(index in 0 until size) { "Index must be in [0, size)" }
-        source[index + offset] = value
+        origin[index + offset] = value
     }
 
-    override fun get(index: Int): Double = source[index + offset]
+    override fun get(index: Int): Double = origin[index + offset]
 
     /**
      * Copy only a part of buffer that belongs to this [OffsetDoubleBuffer]
      */
-    override fun copy(): DoubleBuffer = source.array.copyOfRange(offset, offset + size).asBuffer()
+    override fun copy(): DoubleBuffer = origin.array.copyOfRange(offset, offset + size).asBuffer()
 
     override fun iterator(): Iterator<Double> = iterator {
         for (i in indices) {
@@ -41,7 +47,14 @@ public class OffsetDoubleBuffer(
     override fun toString(): String = Buffer.toString(this)
 
     public fun view(addOffset: Int, newSize: Int = size - addOffset): OffsetDoubleBuffer =
-        OffsetDoubleBuffer(source, offset + addOffset, newSize)
+        OffsetDoubleBuffer(origin, offset + addOffset, newSize)
+
+    @UnstableKMathAPI
+    override fun originIndex(index: Int): Int = if (index in 0 until size) {
+        index + offset
+    } else {
+        -1
+    }
 }
 
 public fun OffsetDoubleBuffer.slice(range: IntRange): OffsetDoubleBuffer = view(range.first, range.last - range.first)
@@ -90,3 +103,59 @@ public class DoubleTensor(
 
     override fun toString(): String = toPrettyString()
 }
+
+@JvmInline
+public value class DoubleTensor2D(public val tensor: DoubleTensor) : MutableStructureND<Double> by tensor,
+    MutableStructure2D<Double> {
+
+    init {
+        require(tensor.shape.size == 2) { "Only 2D tensors could be cast to 2D" }
+    }
+
+    override val rowNum: Int get() = shape[0]
+    override val colNum: Int get() = shape[1]
+
+    override fun get(i: Int, j: Int): Double = tensor.source[i * colNum + j]
+
+    override fun set(i: Int, j: Int, value: Double) {
+        tensor.source[i * colNum + j] = value
+    }
+
+    @OptIn(PerformancePitfall::class)
+    override val rows: List<OffsetDoubleBuffer>
+        get() = List(rowNum) { i ->
+            tensor.source.view(i * colNum, colNum)
+        }
+
+
+//    @OptIn(PerformancePitfall::class)
+//    override val columns: List<MutableBuffer<Double>> get() = List(colNum) { j ->
+//        object : MutableBuffer<Double>{
+//
+//            override fun get(index: Int): Double {
+//                tensor.source.get()
+//            }
+//
+//            override fun set(index: Int, value: Double) {
+//                TODO("Not yet implemented")
+//            }
+//
+//            override fun copy(): MutableBuffer<Double> {
+//                TODO("Not yet implemented")
+//            }
+//
+//            override val size: Int
+//                get() = TODO("Not yet implemented")
+//
+//            override fun toString(): String {
+//                TODO("Not yet implemented")
+//            }
+//
+//        }
+//    }
+
+    @PerformancePitfall
+    override fun elements(): Sequence<Pair<IntArray, Double>> = tensor.elements()
+    override fun get(index: IntArray): Double = tensor[index]
+    override val shape: Shape get() = tensor.shape
+}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 67248890c..4c65373d8 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -11,6 +11,7 @@ package space.kscience.kmath.tensors.core
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
+import space.kscience.kmath.nd.Strides.Companion.linearSizeOf
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
@@ -121,7 +122,7 @@ public open class DoubleTensorAlgebra :
      */
     override fun structureND(shape: IntArray, initializer: DoubleField.(IntArray) -> Double): DoubleTensor = fromArray(
         shape,
-        TensorLinearStructure(shape).asSequence().map { DoubleField.initializer(it) }.toMutableList().toDoubleArray()
+        RowStrides(shape).asSequence().map { DoubleField.initializer(it) }.toMutableList().toDoubleArray()
     )
 
     override fun Tensor<Double>.getTensor(i: Int): DoubleTensor {
@@ -130,7 +131,7 @@ public open class DoubleTensorAlgebra :
         val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
         return DoubleTensor(
             newShape,
-            dt.source.view(newShape.reduce(Int::times) * i, TensorLinearStructure.linearSizeOf(newShape))
+            dt.source.view(newShape.reduce(Int::times) * i, linearSizeOf(newShape))
         )
     }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
index 124ccc668..3b00744a1 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
@@ -119,7 +119,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      */
     override fun structureND(shape: IntArray, initializer: IntRing.(IntArray) -> Int): IntTensor = fromArray(
         shape,
-        TensorLinearStructure(shape).asSequence().map { IntRing.initializer(it) }.toMutableList().toIntArray()
+        RowStrides(shape).asSequence().map { IntRing.initializer(it) }.toMutableList().toIntArray()
     )
 
     override fun Tensor<Int>.getTensor(i: Int): IntTensor {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
deleted file mode 100644
index 729fc0d13..000000000
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/TensorLinearStructure.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.tensors.core
-
-import space.kscience.kmath.nd.Strides
-import kotlin.math.max
-
-/**
- * This [Strides] implementation follows the last dimension first convention
- * For more information: https://numpy.org/doc/stable/reference/generated/numpy.ndarray.strides.html
- *
- * @param shape the shape of the tensor.
- */
-public class TensorLinearStructure(override val shape: IntArray) : Strides() {
-    override val strides: IntArray get() = stridesFromShape(shape)
-
-    override fun index(offset: Int): IntArray =
-        indexFromOffset(offset, strides, shape.size)
-
-    override val linearSize: Int get() = linearSizeOf(shape)
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other == null || this::class != other::class) return false
-
-        other as TensorLinearStructure
-
-        if (!shape.contentEquals(other.shape)) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return shape.contentHashCode()
-    }
-
-    public companion object {
-
-        public fun linearSizeOf(shape: IntArray): Int = shape.reduce(Int::times)
-
-        public fun stridesFromShape(shape: IntArray): IntArray {
-            val nDim = shape.size
-            val res = IntArray(nDim)
-            if (nDim == 0)
-                return res
-
-            var current = nDim - 1
-            res[current] = 1
-
-            while (current > 0) {
-                res[current - 1] = max(1, shape[current]) * res[current]
-                current--
-            }
-            return res
-        }
-
-        public fun indexFromOffset(offset: Int, strides: IntArray, nDim: Int): IntArray {
-            val res = IntArray(nDim)
-            var current = offset
-            var strideIndex = 0
-
-            while (strideIndex < nDim) {
-                res[strideIndex] = (current / strides[strideIndex])
-                current %= strides[strideIndex]
-                strideIndex++
-            }
-            return res
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
index c5910a436..daf6f5a07 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
@@ -5,17 +5,18 @@
 
 package space.kscience.kmath.tensors.core.internal
 
-import space.kscience.kmath.nd.MutableStructure2D
-import space.kscience.kmath.nd.Structure2D
-import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.nd.get
+import space.kscience.kmath.nd.*
+import space.kscience.kmath.nd.Strides.Companion.linearSizeOf
 import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.VirtualBuffer
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.structures.indices
-import space.kscience.kmath.tensors.core.*
 import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra.eye
+import space.kscience.kmath.tensors.core.BufferedTensor
+import space.kscience.kmath.tensors.core.DoubleTensor
+import space.kscience.kmath.tensors.core.OffsetDoubleBuffer
+import space.kscience.kmath.tensors.core.copyToTensor
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.sqrt
@@ -177,7 +178,7 @@ internal val DoubleTensor.matrices: VirtualBuffer<DoubleTensor>
         val matrixOffset = shape[n - 1] * shape[n - 2]
         val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
 
-        val size = TensorLinearStructure.linearSizeOf(matrixShape)
+        val size = linearSizeOf(matrixShape)
 
         return VirtualBuffer(linearSize / matrixOffset) { index ->
             val offset = index * matrixOffset
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
index db289a090..f938d1c61 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
@@ -32,20 +32,19 @@ internal fun List<OffsetIntBuffer>.concat(): IntBuffer {
 }
 
 
-internal val IntTensor.vectors: VirtualBuffer<IntTensor>
-    get() {
-        val n = shape.size
-        val vectorOffset = shape[n - 1]
-        val vectorShape = intArrayOf(shape.last())
+internal fun IntTensor.vectors(): VirtualBuffer<IntTensor> {
+    val n = shape.size
+    val vectorOffset = shape[n - 1]
+    val vectorShape = intArrayOf(shape.last())
 
-        return VirtualBuffer(linearSize / vectorOffset) { index ->
-            val offset = index * vectorOffset
-            IntTensor(vectorShape, source.view(offset, vectorShape.first()))
-        }
+    return VirtualBuffer(linearSize / vectorOffset) { index ->
+        val offset = index * vectorOffset
+        IntTensor(vectorShape, source.view(offset, vectorShape.first()))
     }
+}
 
 
-internal fun IntTensor.vectorSequence(): Sequence<IntTensor> = vectors.asSequence()
+internal fun IntTensor.vectorSequence(): Sequence<IntTensor> = vectors().asSequence()
 
 
 internal val IntTensor.matrices: VirtualBuffer<IntTensor>
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index cfbd9bdc9..cba81f56b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -5,9 +5,8 @@
 
 package space.kscience.kmath.tensors.core.internal
 
-import space.kscience.kmath.nd.as1D
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.operations.DoubleBufferOps.Companion.map
-import space.kscience.kmath.operations.toMutableList
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.structures.DoubleBuffer
@@ -67,6 +66,7 @@ internal fun format(value: Double, digits: Int = 4): String = buildString {
     repeat(fLength - res.length) { append(' ') }
 }
 
+@OptIn(PerformancePitfall::class)
 internal fun DoubleTensor.toPrettyString(): String = buildString {
     var offset = 0
     val shape = this@toPrettyString.shape
@@ -85,7 +85,7 @@ internal fun DoubleTensor.toPrettyString(): String = buildString {
             charOffset += 1
         }
 
-        val values = vector.as1D().toMutableList().map(::format)
+        val values = vector.elements().map { format(it.second) }
 
         values.joinTo(this, separator = ", ")
 
@@ -101,7 +101,7 @@ internal fun DoubleTensor.toPrettyString(): String = buildString {
         }
 
         offset += vectorSize
-        if (this@toPrettyString.linearSize == offset) {
+        if (this@toPrettyString.indices.linearSize == offset) {
             break
         }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt
index 118624440..61bf2341e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.nd.DoubleBufferND
+import space.kscience.kmath.nd.RowStrides
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
@@ -17,12 +18,12 @@ import space.kscience.kmath.tensors.api.Tensor
  */
 public fun StructureND<Double>.copyToTensor(): DoubleTensor = if (this is DoubleTensor) {
     DoubleTensor(shape, source.copy())
-} else if (this is DoubleBufferND && indices is TensorLinearStructure) {
+} else if (this is DoubleBufferND && indices is RowStrides) {
     DoubleTensor(shape, buffer.copy())
 } else {
     DoubleTensor(
         shape,
-        TensorLinearStructure(this.shape).map(this::get).toDoubleArray().asBuffer(),
+        RowStrides(this.shape).map(this::get).toDoubleArray().asBuffer(),
     )
 }
 
@@ -46,7 +47,7 @@ public fun StructureND<Int>.toDoubleTensor(): DoubleTensor {
  */
 public fun StructureND<Double>.asDoubleTensor(): DoubleTensor = if (this is DoubleTensor) {
     this
-} else if (this is DoubleBufferND && indices is TensorLinearStructure) {
+} else if (this is DoubleBufferND && indices is RowStrides) {
     DoubleTensor(shape, buffer)
 } else {
     copyToTensor()
@@ -59,6 +60,6 @@ public fun StructureND<Int>.asIntTensor(): IntTensor = when (this) {
     is IntTensor -> this
     else -> IntTensor(
         this.shape,
-        TensorLinearStructure(this.shape).map(this::get).toIntArray().asBuffer()
+        RowStrides(this.shape).map(this::get).toIntArray().asBuffer()
     )
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index c87cf2a68..5261fab8c 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -66,7 +66,7 @@ internal class TestDoubleTensor {
         val doubleArray = DoubleBuffer(1.0, 2.0, 3.0)
 
         // create ND buffers, no data is copied
-        val ndArray: MutableBufferND<Double> = DoubleBufferND(DefaultStrides(intArrayOf(3)), doubleArray)
+        val ndArray: MutableBufferND<Double> = DoubleBufferND(ColumnStrides(intArrayOf(3)), doubleArray)
 
         // map to tensors
         val tensorArray = ndArray.asDoubleTensor() // Data is copied because of strides change.
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
index 493af54c9..1b7601a14 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
@@ -33,7 +33,7 @@ public open class ViktorFieldOpsND :
 
     override fun structureND(shape: IntArray, initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
         F64Array(*shape).apply {
-            DefaultStrides(shape).asSequence().forEach { index ->
+            ColumnStrides(shape).asSequence().forEach { index ->
                 set(value = DoubleField.initializer(index), indices = index)
             }
         }.asStructure()
@@ -43,7 +43,7 @@ public open class ViktorFieldOpsND :
     @PerformancePitfall
     override fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): ViktorStructureND =
         F64Array(*shape).apply {
-            DefaultStrides(shape).asSequence().forEach { index ->
+            ColumnStrides(shape).asSequence().forEach { index ->
                 set(value = DoubleField.transform(this@map[index]), indices = index)
             }
         }.asStructure()
@@ -52,7 +52,7 @@ public open class ViktorFieldOpsND :
     override fun StructureND<Double>.mapIndexed(
         transform: DoubleField.(index: IntArray, Double) -> Double,
     ): ViktorStructureND = F64Array(*shape).apply {
-        DefaultStrides(shape).asSequence().forEach { index ->
+        ColumnStrides(shape).asSequence().forEach { index ->
             set(value = DoubleField.transform(index, this@mapIndexed[index]), indices = index)
         }
     }.asStructure()
@@ -65,7 +65,7 @@ public open class ViktorFieldOpsND :
     ): ViktorStructureND {
         require(left.shape.contentEquals(right.shape))
         return F64Array(*left.shape).apply {
-            DefaultStrides(left.shape).asSequence().forEach { index ->
+            ColumnStrides(left.shape).asSequence().forEach { index ->
                 set(value = DoubleField.transform(left[index], right[index]), indices = index)
             }
         }.asStructure()
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index c9749d41a..ea279a912 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.viktor
 
 import org.jetbrains.bio.viktor.F64Array
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.DefaultStrides
+import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.MutableStructureND
 
 @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
@@ -22,7 +22,7 @@ public class ViktorStructureND(public val f64Buffer: F64Array) : MutableStructur
 
     @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, Double>> =
-        DefaultStrides(shape).asSequence().map { it to get(it) }
+        ColumnStrides(shape).asSequence().map { it to get(it) }
 }
 
 public fun F64Array.asStructure(): ViktorStructureND = ViktorStructureND(this)
-- 
2.34.1


From 89d0cbc7ea92bdace8920ce401c30825d48d5949 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 30 Sep 2022 11:34:44 +0300
Subject: [PATCH 624/713] Refactoring and optimization of tensorAlgebra

---
 .../kscience/kmath/structures/BufferView.kt   | 43 +++++++++++++-
 .../kmath/tensors/core/DoubleTensor.kt        | 58 ++++++++++---------
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 24 ++++----
 .../core/internal/doubleTensorHelpers.kt      | 10 ++--
 .../kmath/tensors/core/internal/linUtils.kt   | 18 +++---
 .../kmath/tensors/core/internal/utils.kt      |  8 +--
 .../kmath/tensors/core/TestDoubleTensor.kt    | 24 +++++++-
 7 files changed, 126 insertions(+), 59 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
index e8ab4f0ba..697939bdf 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
@@ -148,4 +148,45 @@ public class PermutedBuffer<T>(
 /**
  * Created a permuted view of given buffer using provided [indices]
  */
-public fun <T> Buffer<T>.permute(indices: IntArray): PermutedBuffer<T> = PermutedBuffer(this, indices)
\ No newline at end of file
+public fun <T> Buffer<T>.permute(indices: IntArray): PermutedBuffer<T> =
+    PermutedBuffer(this, indices)
+
+/**
+ * A [BufferView] that overrides indexing of the original buffer
+ */
+public class PermutedMutableBuffer<T>(
+    override val origin: MutableBuffer<T>,
+    private val permutations: IntArray,
+) : BufferView<T>, MutableBuffer<T> {
+    init {
+        permutations.forEach { index ->
+            if (index !in origin.indices) {
+                throw IndexOutOfBoundsException("Index $index is not in ${origin.indices}")
+            }
+        }
+    }
+
+    override val size: Int get() = permutations.size
+
+    override fun get(index: Int): T = origin[permutations[index]]
+
+    override fun set(index: Int, value: T) {
+        origin[permutations[index]] = value
+    }
+
+    override fun copy(): MutableBuffer<T> = PermutedMutableBuffer(origin.copy(), permutations)
+    //TODO Probably could be optimized
+
+    override fun iterator(): Iterator<T> = permutations.asSequence().map { origin[it] }.iterator()
+
+    @UnstableKMathAPI
+    override fun originIndex(index: Int): Int = if (index in permutations.indices) permutations[index] else -1
+
+    override fun toString(): String = Buffer.toString(this)
+}
+
+/**
+ * Created a permuted mutable view of given buffer using provided [indices]
+ */
+public fun <T> MutableBuffer<T>.permute(indices: IntArray): PermutedMutableBuffer<T> =
+    PermutedMutableBuffer(this, indices)
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
index 05d2b0feb..470b6070b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -10,6 +10,7 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.MutableStructureND
 import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.Strides
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.core.internal.toPrettyString
 import kotlin.jvm.JvmInline
@@ -81,7 +82,9 @@ public inline fun OffsetDoubleBuffer.mapInPlace(operation: (Double) -> Double) {
 }
 
 /**
- * Default [BufferedTensor] implementation for [Double] values
+ * Default [BufferedTensor] implementation for [Double] values.
+ *
+ * [DoubleTensor] always uses row-based strides
  */
 public class DoubleTensor(
     shape: IntArray,
@@ -128,34 +131,37 @@ public value class DoubleTensor2D(public val tensor: DoubleTensor) : MutableStru
         }
 
 
-//    @OptIn(PerformancePitfall::class)
-//    override val columns: List<MutableBuffer<Double>> get() = List(colNum) { j ->
-//        object : MutableBuffer<Double>{
-//
-//            override fun get(index: Int): Double {
-//                tensor.source.get()
-//            }
-//
-//            override fun set(index: Int, value: Double) {
-//                TODO("Not yet implemented")
-//            }
-//
-//            override fun copy(): MutableBuffer<Double> {
-//                TODO("Not yet implemented")
-//            }
-//
-//            override val size: Int
-//                get() = TODO("Not yet implemented")
-//
-//            override fun toString(): String {
-//                TODO("Not yet implemented")
-//            }
-//
-//        }
-//    }
+    @OptIn(PerformancePitfall::class)
+    override val columns: List<PermutedMutableBuffer<Double>>
+        get() = List(colNum) { j ->
+            val indices = IntArray(rowNum) { i -> j + i * colNum }
+            tensor.source.permute(indices)
+        }
 
     @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, Double>> = tensor.elements()
     override fun get(index: IntArray): Double = tensor[index]
     override val shape: Shape get() = tensor.shape
 }
+
+public fun DoubleTensor.asDoubleTensor2D(): DoubleTensor2D = DoubleTensor2D(this)
+
+public fun DoubleTensor.asDoubleBuffer(): OffsetDoubleBuffer = if(shape.size == 1){
+    source
+} else {
+    error("Only 1D tensors could be cast to 1D" )
+}
+
+public inline fun DoubleTensor.forEachMatrix(block: (index: IntArray, matrix: DoubleTensor2D) -> Unit) {
+    val n = shape.size
+    check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
+    val matrixOffset = shape[n - 1] * shape[n - 2]
+    val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
+
+    val size = Strides.linearSizeOf(matrixShape)
+    for (i in 0 until linearSize / matrixOffset) {
+        val offset = i * matrixOffset
+        val index = indices.index(offset).sliceArray(0 until (shape.size - 2))
+        block(index, DoubleTensor(matrixShape, source.view(offset, size)).asDoubleTensor2D())
+    }
+}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 4c65373d8..71e55a3b9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -496,7 +496,7 @@ public open class DoubleTensorAlgebra :
      * with `0.0` mean and `1.0` standard deviation.
      */
     public fun randomNormal(shape: IntArray, seed: Long = 0): DoubleTensor =
-        DoubleTensor(shape, getRandomNormals(shape.reduce(Int::times), seed))
+        DoubleTensor(shape, DoubleBuffer.randomNormals(shape.reduce(Int::times), seed))
 
     /**
      * Returns a tensor with the same shape as `input` of random numbers drawn from normal distributions
@@ -508,7 +508,7 @@ public open class DoubleTensorAlgebra :
      * with `0.0` mean and `1.0` standard deviation.
      */
     public fun Tensor<Double>.randomNormalLike(seed: Long = 0): DoubleTensor =
-        DoubleTensor(shape, getRandomNormals(shape.reduce(Int::times), seed))
+        DoubleTensor(shape, DoubleBuffer.randomNormals(shape.reduce(Int::times), seed))
 
     /**
      * Concatenates a sequence of tensors with equal shapes along the first dimension.
@@ -781,7 +781,7 @@ public open class DoubleTensorAlgebra :
         pTensor
             .matrixSequence()
             .zip(pivotsTensor.asIntTensor().vectorSequence())
-            .forEach { (p, pivot) -> pivInit(p.as2D(), pivot.as1D(), n) }
+            .forEach { (p, pivot) -> pivInit(p.asDoubleTensor2D(), pivot.as1D(), n) }
 
         val lTensor = zeroesLike(luTensor)
         val uTensor = zeroesLike(luTensor)
@@ -791,7 +791,7 @@ public open class DoubleTensorAlgebra :
             .zip(luTensor.asDoubleTensor().matrixSequence())
             .forEach { (pairLU, lu) ->
                 val (l, u) = pairLU
-                luPivotHelper(l.as2D(), u.as2D(), lu.as2D(), n)
+                luPivotHelper(l.asDoubleTensor2D(), u.asDoubleTensor2D(), lu.asDoubleTensor2D(), n)
             }
 
         return Triple(pTensor, lTensor, uTensor)
@@ -818,7 +818,7 @@ public open class DoubleTensorAlgebra :
         val lTensor = zeroesLike(this)
 
         for ((a, l) in asDoubleTensor().matrixSequence().zip(lTensor.matrixSequence()))
-            for (i in 0 until n) choleskyHelper(a.as2D(), l.as2D(), n)
+            for (i in 0 until n) choleskyHelper(a.asDoubleTensor2D(), l.asDoubleTensor2D(), n)
 
         return lTensor
     }
@@ -837,7 +837,7 @@ public open class DoubleTensorAlgebra :
                     .zip(rTensor.matrixSequence()))
             ).forEach { (matrix, qr) ->
                 val (q, r) = qr
-                qrHelper(matrix, q, r.as2D())
+                qrHelper(matrix, q, r.asDoubleTensor2D())
             }
 
         return qTensor to rTensor
@@ -867,7 +867,7 @@ public open class DoubleTensorAlgebra :
         val sTensor = zeros(commonShape + intArrayOf(min(n, m)))
         val vTensor = zeros(commonShape + intArrayOf(min(n, m), m))
 
-        val matrices: VirtualBuffer<DoubleTensor> = asDoubleTensor().matrices
+        val matrices = asDoubleTensor().matrices
         val uTensors = uTensor.matrices
         val sTensorVectors = sTensor.vectors
         val vTensors = vTensor.matrices
@@ -922,7 +922,7 @@ public open class DoubleTensorAlgebra :
         val utv = u.transposed() matmul v
         val n = s.shape.last()
         for (matrix in utv.matrixSequence()) {
-            matrix.as2D().cleanSym(n)
+            matrix.asDoubleTensor2D().cleanSym(n)
         }
 
         val eig = (utv dot s.view(shp)).view(s.shape)
@@ -940,7 +940,7 @@ public open class DoubleTensorAlgebra :
         var eigenvalueStart = 0
         var eigenvectorStart = 0
         for (matrix in asDoubleTensor().matrixSequence()) {
-            val matrix2D = matrix.as2D()
+            val matrix2D = matrix.asDoubleTensor2D()
             val (d, v) = matrix2D.jacobiHelper(maxIteration, epsilon)
 
             for (i in 0 until matrix2D.rowNum) {
@@ -986,8 +986,8 @@ public open class DoubleTensorAlgebra :
         )
 
         luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).forEachIndexed { index, (lu, pivots) ->
-            resBuffer[index] = if (luHelper(lu.as2D(), pivots.as1D(), epsilon))
-                0.0 else luMatrixDet(lu.as2D(), pivots.as1D())
+            resBuffer[index] = if (luHelper(lu.asDoubleTensor2D(), pivots.as1D(), epsilon))
+                0.0 else luMatrixDet(lu.asDoubleTensor2D(), pivots.as1D())
         }
 
         return detTensor
@@ -1010,7 +1010,7 @@ public open class DoubleTensorAlgebra :
         val seq = luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).zip(invTensor.matrixSequence())
         for ((luP, invMatrix) in seq) {
             val (lu, pivots) = luP
-            luMatrixInv(lu.as2D(), pivots.as1D(), invMatrix.as2D())
+            luMatrixInv(lu.asDoubleTensor2D(), pivots.as1D(), invMatrix.asDoubleTensor2D())
         }
 
         return invTensor
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
index daf6f5a07..22047e458 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
@@ -7,9 +7,7 @@ package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.nd.Strides.Companion.linearSizeOf
-import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.VirtualBuffer
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.structures.indices
 import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra.eye
@@ -155,13 +153,13 @@ internal fun List<OffsetDoubleBuffer>.concat(): DoubleBuffer {
     return array.asBuffer()
 }
 
-internal val DoubleTensor.vectors: VirtualBuffer<DoubleTensor>
+internal val DoubleTensor.vectors: List<DoubleTensor>
     get() {
         val n = shape.size
         val vectorOffset = shape[n - 1]
         val vectorShape = intArrayOf(shape.last())
 
-        return VirtualBuffer(linearSize / vectorOffset) { index ->
+        return List(linearSize / vectorOffset) { index ->
             val offset = index * vectorOffset
             DoubleTensor(vectorShape, source.view(offset, vectorShape.first()))
         }
@@ -171,7 +169,7 @@ internal val DoubleTensor.vectors: VirtualBuffer<DoubleTensor>
 internal fun DoubleTensor.vectorSequence(): Sequence<DoubleTensor> = vectors.asSequence()
 
 
-internal val DoubleTensor.matrices: VirtualBuffer<DoubleTensor>
+internal val DoubleTensor.matrices: List<DoubleTensor>
     get() {
         val n = shape.size
         check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
@@ -180,7 +178,7 @@ internal val DoubleTensor.matrices: VirtualBuffer<DoubleTensor>
 
         val size = linearSizeOf(matrixShape)
 
-        return VirtualBuffer(linearSize / matrixOffset) { index ->
+        return List(linearSize / matrixOffset) { index ->
             val offset = index * matrixOffset
             DoubleTensor(matrixShape, source.view(offset, size))
         }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index 9047ba29e..cc699e1bb 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -5,8 +5,12 @@
 
 package space.kscience.kmath.tensors.core.internal
 
-import space.kscience.kmath.nd.*
+import space.kscience.kmath.nd.MutableStructure1D
+import space.kscience.kmath.nd.MutableStructure2D
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.as1D
 import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.IntBuffer
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.structures.indices
@@ -109,7 +113,7 @@ internal fun DoubleTensorAlgebra.computeLU(
     val pivotsTensor = tensor.setUpPivots()
 
     for ((lu, pivots) in luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()))
-        if (luHelper(lu.as2D(), pivots.as1D(), epsilon))
+        if (luHelper(lu.asDoubleTensor2D(), pivots.as1D(), epsilon))
             return null
 
     return Pair(luTensor, pivotsTensor)
@@ -210,18 +214,18 @@ internal fun DoubleTensorAlgebra.qrHelper(
 ) {
     checkSquareMatrix(matrix.shape)
     val n = matrix.shape[0]
-    val qM = q.as2D()
+    val qM = q.asDoubleTensor2D()
     val matrixT = matrix.transposed(0, 1)
     val qT = q.transposed(0, 1)
 
     for (j in 0 until n) {
         val v = matrixT.getTensor(j)
-        val vv = v.as1D()
+        val vv = v.asDoubleBuffer()
         if (j > 0) {
             for (i in 0 until j) {
                 r[i, j] = (qT.getTensor(i) dot matrixT.getTensor(j)).value()
                 for (k in 0 until n) {
-                    val qTi = qT.getTensor(i).as1D()
+                    val qTi = qT.getTensor(i).asDoubleBuffer()
                     vv[k] = vv[k] - r[i, j] * qTi[k]
                 }
             }
@@ -239,10 +243,10 @@ internal fun DoubleTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double = 1e-10)
     val b: DoubleTensor
     if (n > m) {
         b = a.transposed(0, 1).dot(a)
-        v = DoubleTensor(intArrayOf(m), getRandomUnitVector(m, 0))
+        v = DoubleTensor(intArrayOf(m), DoubleBuffer.randomUnitVector(m, 0))
     } else {
         b = a.dot(a.transposed(0, 1))
-        v = DoubleTensor(intArrayOf(n), getRandomUnitVector(n, 0))
+        v = DoubleTensor(intArrayOf(n), DoubleBuffer.randomUnitVector(n, 0))
     }
 
     var lastV: DoubleTensor
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index cba81f56b..c5ba98811 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -14,14 +14,14 @@ import space.kscience.kmath.tensors.core.BufferedTensor
 import space.kscience.kmath.tensors.core.DoubleTensor
 import kotlin.math.*
 
-internal fun getRandomNormals(n: Int, seed: Long): DoubleBuffer {
+internal fun DoubleBuffer.Companion.randomNormals(n: Int, seed: Long): DoubleBuffer {
     val distribution = GaussianSampler(0.0, 1.0)
     val generator = RandomGenerator.default(seed)
     return distribution.sample(generator).nextBufferBlocking(n)
 }
 
-internal fun getRandomUnitVector(n: Int, seed: Long): DoubleBuffer {
-    val unnorm: DoubleBuffer = getRandomNormals(n, seed)
+internal fun DoubleBuffer.Companion.randomUnitVector(n: Int, seed: Long): DoubleBuffer {
+    val unnorm: DoubleBuffer = randomNormals(n, seed)
     val norm = sqrt(unnorm.array.sumOf { it * it })
     return unnorm.map { it / norm }
 }
@@ -67,7 +67,7 @@ internal fun format(value: Double, digits: Int = 4): String = buildString {
 }
 
 @OptIn(PerformancePitfall::class)
-internal fun DoubleTensor.toPrettyString(): String = buildString {
+public fun DoubleTensor.toPrettyString(): String = buildString {
     var offset = 0
     val shape = this@toPrettyString.shape
     val linearStructure = this@toPrettyString.indices
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 5261fab8c..505031b67 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -11,6 +11,7 @@ import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.toDoubleArray
 import space.kscience.kmath.tensors.core.internal.matrixSequence
+import space.kscience.kmath.testutils.assertBufferEquals
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -38,7 +39,7 @@ internal class TestDoubleTensor {
     @Test
     fun testGet() = DoubleTensorAlgebra {
         val tensor = fromArray(intArrayOf(1, 2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
-        val matrix = tensor.getTensor(0).as2D()
+        val matrix = tensor.getTensor(0).asDoubleTensor2D()
         assertEquals(matrix[0, 1], 5.8)
 
         val vector = tensor.getTensor(0, 1).as1D()
@@ -52,8 +53,8 @@ internal class TestDoubleTensor {
 
         tensor.matrixSequence().forEach {
             val a = it.asDoubleTensor()
-            val secondRow = a.getTensor(1).as1D()
-            val secondColumn = a.transposed(0, 1).getTensor(1).as1D()
+            val secondRow = a.getTensor(1).asDoubleBuffer()
+            val secondColumn = a.transposed(0, 1).getTensor(1).asDoubleBuffer()
             assertEquals(secondColumn[0], 77.89)
             assertEquals(secondRow[1], secondColumn[1])
         }
@@ -86,6 +87,23 @@ internal class TestDoubleTensor {
 
         tensorArray[intArrayOf(0)] = 55.9
         assertEquals(ndArray[intArrayOf(0)], 1.0)
+    }
 
+    @Test
+    fun test2D() = with(DoubleTensorAlgebra) {
+        val tensor: DoubleTensor = structureND(intArrayOf(3, 3)) { (i, j) -> (i - j).toDouble() }
+        //println(tensor.toPrettyString())
+        val tensor2d = tensor.asDoubleTensor2D()
+        assertBufferEquals(DoubleBuffer(1.0, 0.0, -1.0), tensor2d.rows[1])
+        assertBufferEquals(DoubleBuffer(-2.0, -1.0, 0.0), tensor2d.columns[2])
+    }
+
+    @Test
+    fun testMatrixIteration() = with(DoubleTensorAlgebra) {
+        val tensor = structureND(intArrayOf(3, 3, 3, 3)) { index -> index.sum().toDouble() }
+        tensor.forEachMatrix { index, matrix ->
+            println(index.joinToString { it.toString() })
+            println(matrix)
+        }
     }
 }
-- 
2.34.1


From b0abcf2d0c0d468f927dffe277e525e7cf678847 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 14 Oct 2022 12:47:57 +0300
Subject: [PATCH 625/713] Safe shapes

---
 CHANGELOG.md                                  |   1 +
 .../kmath/benchmarks/NDFieldBenchmark.kt      |  11 +-
 build.gradle.kts                              |  14 +-
 .../kmath/structures/StreamDoubleFieldND.kt   |   5 +-
 .../structures/StructureReadBenchmark.kt      |   5 +-
 .../structures/StructureWriteBenchmark.kt     |  12 +-
 .../kscience/kmath/tensors/OLSWithSVD.kt      |  16 +-
 .../space/kscience/kmath/tensors/PCA.kt       |   9 +-
 .../kmath/tensors/dataSetNormalization.kt     |   5 +-
 .../tensors/linearSystemSolvingWithLUP.kt     |   7 +-
 .../kscience/kmath/tensors/neuralNetwork.kt   |  12 +-
 gradle.properties                             |   4 +-
 .../kscience/kmath/complex/ComplexFieldND.kt  |   6 +-
 .../kmath/linear/BufferedLinearSpace.kt       |   6 +-
 .../kmath/linear/DoubleLinearSpace.kt         |   6 +-
 .../kscience/kmath/linear/VirtualMatrix.kt    |   4 +-
 .../space/kscience/kmath/misc/annotations.kt  |  13 ++
 .../kscience/kmath/nd/BufferAlgebraND.kt      |  15 +-
 .../space/kscience/kmath/nd/BufferND.kt       |  74 ++++----
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |  17 +-
 .../space/kscience/kmath/nd/IntRingND.kt      |   2 +-
 .../kscience/kmath/nd/PermutedStructureND.kt  |  50 ++++++
 .../kotlin/space/kscience/kmath/nd/Shape.kt   |  83 ++++++++-
 .../space/kscience/kmath/nd/ShapeIndices.kt   |  17 +-
 .../space/kscience/kmath/nd/ShortRingND.kt    |   2 +-
 .../space/kscience/kmath/nd/Structure1D.kt    |  15 +-
 .../space/kscience/kmath/nd/Structure2D.kt    |   7 +-
 .../space/kscience/kmath/nd/StructureND.kt    |  19 +-
 .../kscience/kmath/nd/VirtualStructureND.kt   |   3 +
 .../space/kscience/kmath/nd/operationsND.kt   |   4 +
 .../kscience/kmath/nd/primitiveStructureND.kt |  45 +++++
 .../kmath/structures/BufferAccessor2D.kt      |   7 +-
 .../space/kscience/kmath/nd/StridesTest.kt    |   4 +-
 .../kmath/structures/NumberNDFieldTest.kt     |   2 +-
 .../kmath/structures/LazyStructureND.kt       |   4 +-
 .../kscience/kmath/dimensions/Wrappers.kt     |   3 +-
 .../kscience/kmath/ejml/EjmlMatrixTest.kt     |   3 +-
 .../kscience/kmath/histogram/HistogramND.kt   |   3 +
 .../histogram/UniformHistogramGroupND.kt      |  18 +-
 .../histogram/MultivariateHistogramTest.kt    |   2 +
 .../kscience/kmath/multik/MultikTensor.kt     |   4 +-
 .../kmath/multik/MultikTensorAlgebra.kt       |  39 +++--
 .../kscience/kmath/multik/MultikNDTest.kt     |   5 +-
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   |  30 ++--
 .../kscience/kmath/nd4j/Nd4jArrayStructure.kt |  27 ++-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |  22 +--
 .../kmath/nd4j/Nd4jArrayStructureTest.kt      |   3 +-
 .../tensorflow/DoubleTensorFlowAlgebra.kt     |   2 +
 .../kmath/tensorflow/TensorFlowAlgebra.kt     |  20 ++-
 .../kmath/tensorflow/DoubleTensorFlowOps.kt   |   5 +-
 .../tensors/api/LinearOpsTensorAlgebra.kt     |  14 +-
 .../kmath/tensors/api/TensorAlgebra.kt        |   9 +-
 .../kmath/tensors/core/BufferedTensor.kt      |   3 +-
 .../kmath/tensors/core/DoubleTensor.kt        |  30 ++--
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 162 ++++++++++--------
 .../kscience/kmath/tensors/core/IntTensor.kt  |   8 +-
 .../kmath/tensors/core/IntTensorAlgebra.kt    | 101 ++++++-----
 .../tensors/core/internal/broadcastUtils.kt   |  27 +--
 .../kmath/tensors/core/internal/checks.kt     |  21 ++-
 .../core/internal/doubleTensorHelpers.kt      |  15 +-
 .../tensors/core/internal/intTensorHelpers.kt |   7 +-
 .../kmath/tensors/core/internal/linUtils.kt   |  13 +-
 .../kmath/tensors/core/internal/utils.kt      |   4 +-
 .../tensors/core/tensorAlgebraExtensions.kt   |   4 +-
 .../kmath/tensors/core/tensorTransform.kt     |  12 +-
 .../kmath/tensors/core/TestBroadcasting.kt    |  64 +++----
 .../core/TestDoubleAnalyticTensorAlgebra.kt   |  21 +--
 .../core/TestDoubleLinearOpsAlgebra.kt        |  38 ++--
 .../kmath/tensors/core/TestDoubleTensor.kt    |  12 +-
 .../tensors/core/TestDoubleTensorAlgebra.kt   |  84 ++++-----
 .../kscience/kmath/viktor/ViktorFieldOpsND.kt |  31 ++--
 .../kmath/viktor/ViktorStructureND.kt         |   5 +-
 72 files changed, 860 insertions(+), 517 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/PermutedStructureND.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/primitiveStructureND.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index feb925436..eea1dd3ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Algebra now has an obligatory `bufferFactory` (#477).
 
 ### Changed
+- Shape is read-only
 - Major refactor of tensors (only minor API changes)
 - Kotlin 1.7.20
 - `LazyStructure` `deffered` -> `async` to comply with coroutines code style
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index 141d0433b..75c1a3ee3 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -13,10 +13,8 @@ import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.ones
 import org.jetbrains.kotlinx.multik.ndarray.data.DN
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
-import space.kscience.kmath.nd.BufferedFieldOpsND
-import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.ndAlgebra
-import space.kscience.kmath.nd.one
+import space.kscience.kmath.misc.UnsafeKMathAPI
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.nd4j.nd4j
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.tensors.core.DoubleTensor
@@ -69,9 +67,10 @@ internal class NDFieldBenchmark {
         blackhole.consume(res)
     }
 
+    @OptIn(UnsafeKMathAPI::class)
     @Benchmark
     fun multikInPlaceAdd(blackhole: Blackhole) = with(multikAlgebra) {
-        val res = Multik.ones<Double, DN>(shape, DataType.DoubleDataType).wrap()
+        val res = Multik.ones<Double, DN>(shape.asArray(), DataType.DoubleDataType).wrap()
         repeat(n) { res += 1.0 }
         blackhole.consume(res)
     }
@@ -86,7 +85,7 @@ internal class NDFieldBenchmark {
     private companion object {
         private const val dim = 1000
         private const val n = 100
-        private val shape = intArrayOf(dim, dim)
+        private val shape = Shape(dim, dim)
         private val specializedField = DoubleField.ndAlgebra
         private val genericField = BufferedFieldOpsND(DoubleField)
         private val nd4jField = DoubleField.nd4j
diff --git a/build.gradle.kts b/build.gradle.kts
index 120b0f35d..c7e2e5892 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,3 @@
-import space.kscience.gradle.isInDevelopment
 import space.kscience.gradle.useApache2Licence
 import space.kscience.gradle.useSPCTeam
 
@@ -15,7 +14,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.1-dev-4"
+    version = "0.3.1-dev-5"
 }
 
 subprojects {
@@ -78,11 +77,12 @@ ksciencePublish {
     }
     github("kmath", "SciProgCentre")
     space(
-        if (isInDevelopment) {
-            "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/dev"
-        } else {
-            "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/release"
-        }
+        "https://maven.pkg.jetbrains.space/spc/p/sci/maven"
+//        if (isInDevelopment) {
+//            "https://maven.pkg.jetbrains.space/spc/p/sci/dev"
+//        } else {
+//            "https://maven.pkg.jetbrains.space/spc/p/sci/release"
+//        }
     )
     sonatype()
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index f97e98973..dd1516fcd 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -17,7 +17,7 @@ import java.util.stream.IntStream
  * A demonstration implementation of NDField over Real using Java [java.util.stream.DoubleStream] for parallel
  * execution.
  */
-class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, DoubleField>,
+class StreamDoubleFieldND(override val shape: Shape) : FieldND<Double, DoubleField>,
     NumbersAddOps<StructureND<Double>>,
     ExtendedField<StructureND<Double>> {
 
@@ -31,6 +31,7 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
         return structureND(shape) { d }
     }
 
+    @OptIn(PerformancePitfall::class)
     private val StructureND<Double>.buffer: DoubleBuffer
         get() = when {
             !shape.contentEquals(this@StreamDoubleFieldND.shape) -> throw ShapeMismatchException(
@@ -110,4 +111,4 @@ class StreamDoubleFieldND(override val shape: IntArray) : FieldND<Double, Double
     override fun atanh(arg: StructureND<Double>): BufferND<Double> = arg.map { atanh(it) }
 }
 
-fun DoubleField.ndStreaming(vararg shape: Int): StreamDoubleFieldND = StreamDoubleFieldND(shape)
+fun DoubleField.ndStreaming(vararg shape: Int): StreamDoubleFieldND = StreamDoubleFieldND(Shape(shape))
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
index ae7693f03..ec05f38d0 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
@@ -5,16 +5,19 @@
 
 package space.kscience.kmath.structures
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.BufferND
 import space.kscience.kmath.nd.ColumnStrides
+import space.kscience.kmath.nd.Shape
 import kotlin.system.measureTimeMillis
 
 @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
+@OptIn(PerformancePitfall::class)
 fun main() {
     val n = 6000
     val array = DoubleArray(n * n) { 1.0 }
     val buffer = DoubleBuffer(array)
-    val strides = ColumnStrides(intArrayOf(n, n))
+    val strides = ColumnStrides(Shape(n, n))
     val structure = BufferND(strides, buffer)
 
     measureTimeMillis {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
index ce5301a7b..081bfa5c0 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
@@ -5,16 +5,20 @@
 
 package space.kscience.kmath.structures
 
+import space.kscience.kmath.nd.BufferND
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.mapToBuffer
+import space.kscience.kmath.operations.map
 import kotlin.system.measureTimeMillis
 
+private inline fun <T, reified R: Any> BufferND<T>.map(block: (T) -> R): BufferND<R> = BufferND(indices, buffer.map(block))
+
 @Suppress("UNUSED_VARIABLE")
 fun main() {
     val n = 6000
-    val structure = StructureND.buffered(intArrayOf(n, n), Buffer.Companion::auto) { 1.0 }
-    structure.mapToBuffer { it + 1 } // warm-up
-    val time1 = measureTimeMillis { val res = structure.mapToBuffer { it + 1 } }
+    val structure = StructureND.buffered(Shape(n, n), Buffer.Companion::auto) { 1.0 }
+    structure.map { it + 1 } // warm-up
+    val time1 = measureTimeMillis { val res = structure.map { it + 1 } }
     println("Structure mapping finished in $time1 millis")
     val array = DoubleArray(n * n) { 1.0 }
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index d0b24de70..32d4176c1 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -6,6 +6,8 @@
 package space.kscience.kmath.tensors
 
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
@@ -23,10 +25,10 @@ fun main() {
     DoubleTensorAlgebra {
         // take coefficient vector from normal distribution
         val alpha = randomNormal(
-            intArrayOf(5),
+            Shape(5),
             randSeed
         ) + fromArray(
-            intArrayOf(5),
+            Shape(5),
             doubleArrayOf(1.0, 2.5, 3.4, 5.0, 10.1)
         )
 
@@ -34,7 +36,7 @@ fun main() {
 
         // also take sample of size 20 from normal distribution for x
         val x = randomNormal(
-            intArrayOf(20, 5),
+            Shape(20, 5),
             randSeed
         )
 
@@ -50,11 +52,13 @@ fun main() {
 
 
         // inverse Sigma matrix can be restored from singular values with diagonalEmbedding function
-        val sigma = diagonalEmbedding(singValues.map{ if (abs(it) < 1e-3) 0.0 else 1.0/it })
+        val sigma = diagonalEmbedding(singValues.map { if (abs(it) < 1e-3) 0.0 else 1.0 / it })
 
         val alphaOLS = v dot sigma dot u.transposed() dot y
-        println("Estimated alpha:\n" +
-                "$alphaOLS")
+        println(
+            "Estimated alpha:\n" +
+                    "$alphaOLS"
+        )
 
         // figure out MSE of approximation
         fun mse(yTrue: DoubleTensor, yPred: DoubleTensor): Double {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index 1768be283..2022b6472 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors
 
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.tensors.core.tensorAlgebra
 import space.kscience.kmath.tensors.core.withBroadcast
 
@@ -16,7 +17,7 @@ fun main(): Unit = Double.tensorAlgebra.withBroadcast {  // work in context with
 
     // assume x is range from 0 until 10
     val x = fromArray(
-        intArrayOf(10),
+        Shape(10),
         DoubleArray(10) { it.toDouble() }
     )
 
@@ -41,13 +42,13 @@ fun main(): Unit = Double.tensorAlgebra.withBroadcast {  // work in context with
 
     // save means ans standard deviations for further recovery
     val mean = fromArray(
-        intArrayOf(2),
+        Shape(2),
         doubleArrayOf(xMean, yMean)
     )
     println("Means:\n$mean")
 
     val std = fromArray(
-        intArrayOf(2),
+        Shape(2),
         doubleArrayOf(xStd, yStd)
     )
     println("Standard deviations:\n$std")
@@ -68,7 +69,7 @@ fun main(): Unit = Double.tensorAlgebra.withBroadcast {  // work in context with
     // we can restore original data from reduced data;
     // for example, find 7th element of dataset.
     val n = 7
-    val restored = (datasetReduced.getTensor(n) dot v.view(intArrayOf(1, 2))) * std + mean
+    val restored = (datasetReduced.getTensor(n) dot v.view(Shape(1, 2))) * std + mean
     println("Original value:\n${dataset.getTensor(n)}")
     println("Restored value:\n$restored")
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
index 6d72fd623..248266edb 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors
 
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.tensors.core.tensorAlgebra
 import space.kscience.kmath.tensors.core.withBroadcast
 
@@ -13,10 +14,10 @@ import space.kscience.kmath.tensors.core.withBroadcast
 
 fun main() = Double.tensorAlgebra.withBroadcast {  // work in context with broadcast methods
     // take dataset of 5-element vectors from normal distribution
-    val dataset = randomNormal(intArrayOf(100, 5)) * 1.5 // all elements from N(0, 1.5)
+    val dataset = randomNormal(Shape(100, 5)) * 1.5 // all elements from N(0, 1.5)
 
     dataset += fromArray(
-        intArrayOf(5),
+        Shape(5),
         doubleArrayOf(0.0, 1.0, 1.5, 3.0, 5.0) // row means
     )
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
index 64cc138d7..3eab64429 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors
 
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.tensorAlgebra
 import space.kscience.kmath.tensors.core.withBroadcast
@@ -15,13 +16,13 @@ fun main() = Double.tensorAlgebra.withBroadcast {// work in context with linear
 
     // set true value of x
     val trueX = fromArray(
-        intArrayOf(4),
+        Shape(4),
         doubleArrayOf(-2.0, 1.5, 6.8, -2.4)
     )
 
     // and A matrix
     val a = fromArray(
-        intArrayOf(4, 4),
+        Shape(4, 4),
         doubleArrayOf(
             0.5, 10.5, 4.5, 1.0,
             8.5, 0.9, 12.8, 0.1,
@@ -64,7 +65,7 @@ fun main() = Double.tensorAlgebra.withBroadcast {// work in context with linear
     // this function returns solution x of a system lx = b, l should be lower triangular
     fun solveLT(l: DoubleTensor, b: DoubleTensor): DoubleTensor {
         val n = l.shape[0]
-        val x = zeros(intArrayOf(n))
+        val x = zeros(Shape(n))
         for (i in 0 until n) {
             x[intArrayOf(i)] = (b[intArrayOf(i)] - l.getTensor(i).dot(x).value()) / l[intArrayOf(i, i)]
         }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
index 84d6dcd22..1e4e339dc 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.tensors
 
+import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
@@ -68,12 +70,12 @@ class Dense(
 
     private val weights: DoubleTensor = DoubleTensorAlgebra {
         randomNormal(
-            intArrayOf(inputUnits, outputUnits),
+            Shape(inputUnits, outputUnits),
             seed
         ) * sqrt(2.0 / (inputUnits + outputUnits))
     }
 
-    private val bias: DoubleTensor = DoubleTensorAlgebra { zeros(intArrayOf(outputUnits)) }
+    private val bias: DoubleTensor = DoubleTensorAlgebra { zeros(Shape(outputUnits)) }
 
     override fun forward(input: DoubleTensor): DoubleTensor = BroadcastDoubleTensorAlgebra {
         (input dot weights) + bias
@@ -182,17 +184,17 @@ fun main() = BroadcastDoubleTensorAlgebra {
     //val testSize = sampleSize - trainSize
 
     // take sample of features from normal distribution
-    val x = randomNormal(intArrayOf(sampleSize, features), seed) * 2.5
+    val x = randomNormal(Shape(sampleSize, features), seed) * 2.5
 
     x += fromArray(
-        intArrayOf(5),
+        Shape(5),
         doubleArrayOf(0.0, -1.0, -2.5, -3.0, 5.5) // row means
     )
 
 
     // define class like '1' if the sum of features > 0 and '0' otherwise
     val y = fromArray(
-        intArrayOf(sampleSize, 1),
+        Shape(sampleSize, 1),
         DoubleArray(sampleSize) { i ->
             if (x.getTensor(i).sum() > 0.0) {
                 1.0
diff --git a/gradle.properties b/gradle.properties
index 0d1506980..216ebf74a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,13 +3,11 @@
 # Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
 #
 kotlin.code.style=official
-kotlin.jupyter.add.scanner=false
 kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
 kotlin.incremental.js.ir=true
 
 org.gradle.configureondemand=true
-org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.13.0-kotlin-1.7.20-Beta
+toolsVersion=0.13.1-kotlin-1.7.20
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
index 42914ed5b..cbc69ca6e 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.complex
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.*
@@ -20,6 +21,7 @@ import kotlin.contracts.contract
 public sealed class ComplexFieldOpsND : BufferedFieldOpsND<Complex, ComplexField>(ComplexField.bufferAlgebra),
     ScaleOperations<StructureND<Complex>>, ExtendedFieldOps<StructureND<Complex>>, PowerOperations<StructureND<Complex>> {
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<Complex>.toBufferND(): BufferND<Complex> = when (this) {
         is BufferND -> this
         else -> {
@@ -69,12 +71,12 @@ public class ComplexFieldND(override val shape: Shape) :
 
 public val ComplexField.ndAlgebra: ComplexFieldOpsND get() = ComplexFieldOpsND
 
-public fun ComplexField.ndAlgebra(vararg shape: Int): ComplexFieldND = ComplexFieldND(shape)
+public fun ComplexField.ndAlgebra(vararg shape: Int): ComplexFieldND = ComplexFieldND(Shape(shape))
 
 /**
  * Produce a context for n-dimensional operations inside this real field
  */
 public inline fun <R> ComplexField.withNdAlgebra(vararg shape: Int, action: ComplexFieldND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return ComplexFieldND(shape).action()
+    return ComplexFieldND(Shape(shape)).action()
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 361d59be1..52f04d76a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -6,9 +6,7 @@
 package space.kscience.kmath.linear
 
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.BufferedRingOpsND
-import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.nd.asND
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.VirtualBuffer
@@ -23,7 +21,7 @@ public class BufferedLinearSpace<T, out A : Ring<T>>(
     private val ndAlgebra = BufferedRingOpsND(bufferAlgebra)
 
     override fun buildMatrix(rows: Int, columns: Int, initializer: A.(i: Int, j: Int) -> T): Matrix<T> =
-        ndAlgebra.structureND(intArrayOf(rows, columns)) { (i, j) -> elementAlgebra.initializer(i, j) }.as2D()
+        ndAlgebra.structureND(Shape(rows, columns)) { (i, j) -> elementAlgebra.initializer(i, j) }.as2D()
 
     override fun buildVector(size: Int, initializer: A.(Int) -> T): Point<T> =
         bufferAlgebra.buffer(size) { elementAlgebra.initializer(it) }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
index e2f81d84e..47ab5bece 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
@@ -6,9 +6,7 @@
 package space.kscience.kmath.linear
 
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.DoubleFieldOpsND
-import space.kscience.kmath.nd.as2D
-import space.kscience.kmath.nd.asND
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleBufferOps
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
@@ -23,7 +21,7 @@ public object DoubleLinearSpace : LinearSpace<Double, DoubleField> {
         rows: Int,
         columns: Int,
         initializer: DoubleField.(i: Int, j: Int) -> Double
-    ): Matrix<Double> = DoubleFieldOpsND.structureND(intArrayOf(rows, columns)) { (i, j) ->
+    ): Matrix<Double> = DoubleFieldOpsND.structureND(Shape(rows, columns)) { (i, j) ->
         DoubleField.initializer(i, j)
     }.as2D()
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
index eb5e20856..b7ed6e867 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.linear
 
+import space.kscience.kmath.nd.Shape
+
 /**
  * The matrix where each element is evaluated each time when is being accessed.
  *
@@ -16,7 +18,7 @@ public class VirtualMatrix<out T : Any>(
     public val generator: (i: Int, j: Int) -> T,
 ) : Matrix<T> {
 
-    override val shape: IntArray get() = intArrayOf(rowNum, colNum)
+    override val shape: Shape get() = Shape(rowNum, colNum)
 
     override operator fun get(i: Int, j: Int): T = generator(i, j)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
index f7b486850..7da333a45 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
@@ -29,3 +29,16 @@ public annotation class UnstableKMathAPI
 public annotation class PerformancePitfall(
     val message: String = "Potential performance problem",
 )
+
+/**
+ * Marks API that is public, but should not be used without clear understanding what it does.
+ */
+@MustBeDocumented
+@Retention(value = AnnotationRetention.BINARY)
+@RequiresOptIn(
+    "This API is unsafe and should be used carefully",
+    RequiresOptIn.Level.ERROR,
+)
+public annotation class UnsafeKMathAPI(
+    val message: String = "Unsafe API",
+)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index 4025ba548..597fc7d97 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -12,7 +12,7 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 
 public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
-    public val indexerBuilder: (IntArray) -> ShapeIndexer
+    public val indexerBuilder: (Shape) -> ShapeIndexer
     public val bufferAlgebra: BufferAlgebra<T, A>
     override val elementAlgebra: A get() = bufferAlgebra.elementAlgebra
 
@@ -26,6 +26,7 @@ public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
         )
     }
 
+    @OptIn(PerformancePitfall::class)
     public fun StructureND<T>.toBufferND(): BufferND<T> = when (this) {
         is BufferND -> this
         else -> {
@@ -46,7 +47,7 @@ public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
         zipInline(left.toBufferND(), right.toBufferND(), transform)
 
     public companion object {
-        public val defaultIndexerBuilder: (IntArray) -> ShapeIndexer = ::Strides
+        public val defaultIndexerBuilder: (Shape) -> ShapeIndexer = ::Strides
     }
 }
 
@@ -98,24 +99,24 @@ internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.zipInline(
 @OptIn(PerformancePitfall::class)
 public open class BufferedGroupNDOps<T, out A : Group<T>>(
     override val bufferAlgebra: BufferAlgebra<T, A>,
-    override val indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
+    override val indexerBuilder: (Shape) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
 ) : GroupOpsND<T, A>, BufferAlgebraND<T, A> {
     override fun StructureND<T>.unaryMinus(): StructureND<T> = map { -it }
 }
 
 public open class BufferedRingOpsND<T, out A : Ring<T>>(
     bufferAlgebra: BufferAlgebra<T, A>,
-    indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
+    indexerBuilder: (Shape) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
 ) : BufferedGroupNDOps<T, A>(bufferAlgebra, indexerBuilder), RingOpsND<T, A>
 
 public open class BufferedFieldOpsND<T, out A : Field<T>>(
     bufferAlgebra: BufferAlgebra<T, A>,
-    indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
+    indexerBuilder: (Shape) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
 ) : BufferedRingOpsND<T, A>(bufferAlgebra, indexerBuilder), FieldOpsND<T, A> {
 
     public constructor(
         elementAlgebra: A,
-        indexerBuilder: (IntArray) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
+        indexerBuilder: (Shape) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
     ) : this(BufferFieldOps(elementAlgebra), indexerBuilder)
 
     @OptIn(PerformancePitfall::class)
@@ -130,7 +131,7 @@ public val <T, A : Field<T>> BufferAlgebra<T, A>.nd: BufferedFieldOpsND<T, A> ge
 public fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.structureND(
     vararg shape: Int,
     initializer: A.(IntArray) -> T,
-): BufferND<T> = structureND(shape, initializer)
+): BufferND<T> = structureND(Shape(shape), initializer)
 
 public fun <T, EA : Algebra<T>, A> A.structureND(
     initializer: EA.(IntArray) -> T,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 7efc785fb..644b62ebe 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -5,10 +5,9 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.MutableBuffer
-import space.kscience.kmath.structures.MutableBufferFactory
 
 /**
  * Represents [StructureND] over [Buffer].
@@ -22,32 +21,33 @@ public open class BufferND<out T>(
     public open val buffer: Buffer<T>,
 ) : StructureND<T> {
 
+    @PerformancePitfall
     override operator fun get(index: IntArray): T = buffer[indices.offset(index)]
 
-    override val shape: IntArray get() = indices.shape
+    override val shape: Shape get() = indices.shape
 
     override fun toString(): String = StructureND.toString(this)
 }
 
-/**
- * Transform structure to a new structure using provided [BufferFactory] and optimizing if argument is [BufferND]
- */
-public inline fun <T, R : Any> StructureND<T>.mapToBuffer(
-    factory: BufferFactory<R>,
-    crossinline transform: (T) -> R,
-): BufferND<R> = if (this is BufferND<T>)
-    BufferND(this.indices, factory.invoke(indices.linearSize) { transform(buffer[it]) })
-else {
-    val strides = ColumnStrides(shape)
-    BufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
-}
-
-/**
- * Transform structure to a new structure using inferred [BufferFactory]
- */
-public inline fun <T, reified R : Any> StructureND<T>.mapToBuffer(
-    crossinline transform: (T) -> R,
-): BufferND<R> = mapToBuffer(Buffer.Companion::auto, transform)
+///**
+// * Transform structure to a new structure using provided [BufferFactory] and optimizing if argument is [BufferND]
+// */
+//public inline fun <T, R : Any> StructureND<T>.mapToBuffer(
+//    factory: BufferFactory<R>,
+//    crossinline transform: (T) -> R,
+//): BufferND<R> = if (this is BufferND<T>)
+//    BufferND(this.indices, factory.invoke(indices.linearSize) { transform(buffer[it]) })
+//else {
+//    val strides = ColumnStrides(shape)
+//    BufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
+//}
+//
+///**
+// * Transform structure to a new structure using inferred [BufferFactory]
+// */
+//public inline fun <T, reified R : Any> StructureND<T>.mapToBuffer(
+//    crossinline transform: (T) -> R,
+//): BufferND<R> = mapToBuffer(Buffer.Companion::auto, transform)
 
 /**
  * Represents [MutableStructureND] over [MutableBuffer].
@@ -60,22 +60,24 @@ public open class MutableBufferND<T>(
     strides: ShapeIndexer,
     override val buffer: MutableBuffer<T>,
 ) : MutableStructureND<T>, BufferND<T>(strides, buffer) {
+
+    @PerformancePitfall
     override fun set(index: IntArray, value: T) {
         buffer[indices.offset(index)] = value
     }
 }
 
-/**
- * Transform structure to a new structure using provided [MutableBufferFactory] and optimizing if argument is [MutableBufferND]
- */
-public inline fun <T, reified R : Any> MutableStructureND<T>.mapToMutableBuffer(
-    factory: MutableBufferFactory<R> = MutableBufferFactory(MutableBuffer.Companion::auto),
-    crossinline transform: (T) -> R,
-): MutableBufferND<R> {
-    return if (this is MutableBufferND<T>)
-        MutableBufferND(this.indices, factory.invoke(indices.linearSize) { transform(buffer[it]) })
-    else {
-        val strides = ColumnStrides(shape)
-        MutableBufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
-    }
-}
\ No newline at end of file
+///**
+// * Transform structure to a new structure using provided [MutableBufferFactory] and optimizing if argument is [MutableBufferND]
+// */
+//public inline fun <T, reified R : Any> MutableStructureND<T>.mapToMutableBuffer(
+//    factory: MutableBufferFactory<R> = MutableBufferFactory(MutableBuffer.Companion::auto),
+//    crossinline transform: (T) -> R,
+//): MutableBufferND<R> {
+//    return if (this is MutableBufferND<T>)
+//        MutableBufferND(this.indices, factory.invoke(indices.linearSize) { transform(buffer[it]) })
+//    else {
+//        val strides = ColumnStrides(shape)
+//        MutableBufferND(strides, factory.invoke(strides.linearSize) { transform(get(strides.index(it))) })
+//    }
+//}
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index aab137321..182ce38d6 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -14,15 +14,25 @@ import kotlin.contracts.contract
 import kotlin.math.pow
 import kotlin.math.pow as kpow
 
+/**
+ * A simple mutable [StructureND] of doubles
+ */
 public class DoubleBufferND(
     indexes: ShapeIndexer,
     override val buffer: DoubleBuffer,
-) : MutableBufferND<Double>(indexes, buffer)
+) : MutableBufferND<Double>(indexes, buffer), MutableStructureNDOfDouble{
+    override fun getDouble(index: IntArray): Double = buffer[indices.offset(index)]
+
+    override fun setDouble(index: IntArray, value: Double) {
+        buffer[indices.offset(index)] = value
+    }
+}
 
 
 public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(DoubleField.bufferAlgebra),
     ScaleOperations<StructureND<Double>>, ExtendedFieldOps<StructureND<Double>> {
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<Double>.toBufferND(): DoubleBufferND = when (this) {
         is DoubleBufferND -> this
         else -> {
@@ -221,7 +231,8 @@ public class DoubleFieldND(override val shape: Shape) :
 
 public val DoubleField.ndAlgebra: DoubleFieldOpsND get() = DoubleFieldOpsND
 
-public fun DoubleField.ndAlgebra(vararg shape: Int): DoubleFieldND = DoubleFieldND(shape)
+public fun DoubleField.ndAlgebra(vararg shape: Int): DoubleFieldND = DoubleFieldND(Shape(shape))
+public fun DoubleField.ndAlgebra(shape: Shape): DoubleFieldND = DoubleFieldND(shape)
 
 /**
  * Produce a context for n-dimensional operations inside this real field
@@ -229,5 +240,5 @@ public fun DoubleField.ndAlgebra(vararg shape: Int): DoubleFieldND = DoubleField
 @UnstableKMathAPI
 public inline fun <R> DoubleField.withNdAlgebra(vararg shape: Int, action: DoubleFieldND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return DoubleFieldND(shape).run(action)
+    return DoubleFieldND(Shape(shape)).run(action)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt
index ac01239a9..697e351d2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt
@@ -46,5 +46,5 @@ public class IntRingND(
 
 public inline fun <R> IntRing.withNdAlgebra(vararg shape: Int, action: IntRingND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return IntRingND(shape).run(action)
+    return IntRingND(Shape(shape)).run(action)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/PermutedStructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/PermutedStructureND.kt
new file mode 100644
index 000000000..0efc7beb0
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/PermutedStructureND.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.nd
+
+import space.kscience.kmath.misc.PerformancePitfall
+
+
+public class PermutedStructureND<T>(
+    public val origin: StructureND<T>,
+    public val permutation: (IntArray) -> IntArray,
+) : StructureND<T> {
+
+    override val shape: Shape
+        get() = origin.shape
+
+    @OptIn(PerformancePitfall::class)
+    override fun get(index: IntArray): T {
+        return origin[permutation(index)]
+    }
+}
+
+public fun <T> StructureND<T>.permute(
+    permutation: (IntArray) -> IntArray,
+): PermutedStructureND<T> = PermutedStructureND(this, permutation)
+
+public class PermutedMutableStructureND<T>(
+    public val origin: MutableStructureND<T>,
+    override val shape: Shape = origin.shape,
+    public val permutation: (IntArray) -> IntArray,
+) : MutableStructureND<T> {
+
+
+    @OptIn(PerformancePitfall::class)
+    override fun set(index: IntArray, value: T) {
+        origin[permutation(index)] = value
+    }
+
+    @OptIn(PerformancePitfall::class)
+    override fun get(index: IntArray): T {
+        return origin[permutation(index)]
+    }
+}
+
+public fun <T> MutableStructureND<T>.permute(
+    newShape: Shape = shape,
+    permutation: (IntArray) -> IntArray,
+): PermutedMutableStructureND<T> = PermutedMutableStructureND(this, newShape, permutation)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
index fc0b4b6ea..8dd17ab32 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
@@ -5,21 +5,88 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.UnsafeKMathAPI
+import kotlin.jvm.JvmInline
+
+/**
+ * A read-only ND shape
+ */
+@JvmInline
+public value class Shape(@PublishedApi internal val array: IntArray) {
+    public val size: Int get() = array.size
+    public operator fun get(index: Int): Int = array[index]
+    override fun toString(): String = array.contentToString()
+}
+
+public inline fun Shape.forEach(block: (value: Int) -> Unit): Unit = array.forEach(block)
+
+public inline fun Shape.forEachIndexed(block: (index: Int, value: Int) -> Unit): Unit = array.forEachIndexed(block)
+
+public infix fun Shape.contentEquals(other: Shape): Boolean = array.contentEquals(other.array)
+
+public fun Shape.contentHashCode(): Int = array.contentHashCode()
+
+public val Shape.indices: IntRange get() = array.indices
+public val Shape.linearSize: Int get() = array.reduce(Int::times)
+
+public fun Shape.slice(range: IntRange): Shape = Shape(array.sliceArray(range))
+
+public fun Shape.last(): Int = array.last()
+
+/**
+ * A shape including last [n] dimensions of this shape
+ */
+public fun Shape.last(n: Int): Shape = Shape(array.copyOfRange(size - n, size))
+
+public fun Shape.first(): Int = array.first()
+
+/**
+ * A shape including first [n] dimensions of this shape
+ */
+public fun Shape.first(n: Int): Shape = Shape(array.copyOfRange(0, n))
+
+public operator fun Shape.plus(add: IntArray): Shape = Shape(array + add)
+
+public operator fun Shape.plus(add: Shape): Shape = Shape(array + add.array)
+
+public fun Shape.isEmpty(): Boolean = size == 0
+public fun Shape.isNotEmpty(): Boolean = size > 0
+
+public fun Shape.transposed(i: Int, j: Int): Shape = Shape(array.copyOf().apply {
+    val ith = get(i)
+    val jth = get(j)
+    set(i, jth)
+    set(j, ith)
+})
+
+public operator fun Shape.component1(): Int = get(0)
+public operator fun Shape.component2(): Int = get(1)
+public operator fun Shape.component3(): Int = get(2)
+
+/**
+ * Convert to array with protective copy
+ */
+public fun Shape.toArray(): IntArray = array.copyOf()
+
+@UnsafeKMathAPI
+public fun Shape.asArray(): IntArray = array
+
+public fun Shape.asList(): List<Int> = array.asList()
+
+
 /**
  * An exception is thrown when the expected and actual shape of NDArray differ.
  *
  * @property expected the expected shape.
  * @property actual the actual shape.
  */
-public class ShapeMismatchException(public val expected: IntArray, public val actual: IntArray) :
-    RuntimeException("Shape ${actual.contentToString()} doesn't fit in expected shape ${expected.contentToString()}.")
+public class ShapeMismatchException(public val expected: Shape, public val actual: Shape) :
+    RuntimeException("Shape $actual doesn't fit in expected shape ${expected}.")
 
 public class IndexOutOfShapeException(public val shape: Shape, public val index: IntArray) :
-    RuntimeException("Index ${index.contentToString()} is out of shape ${shape.contentToString()}")
+    RuntimeException("Index ${index.contentToString()} is out of shape ${shape}")
 
-public typealias Shape = IntArray
-
-public fun Shape(shapeFirst: Int, vararg shapeRest: Int): Shape = intArrayOf(shapeFirst, *shapeRest)
+public fun Shape(shapeFirst: Int, vararg shapeRest: Int): Shape = Shape(intArrayOf(shapeFirst, *shapeRest))
 
 public interface WithShape {
     public val shape: Shape
@@ -28,8 +95,8 @@ public interface WithShape {
 }
 
 internal fun requireIndexInShape(index: IntArray, shape: Shape) {
-    if (index.size != shape.size) throw IndexOutOfShapeException(index, shape)
+    if (index.size != shape.size) throw IndexOutOfShapeException(shape, index)
     shape.forEachIndexed { axis, axisShape ->
-        if (index[axis] !in 0 until axisShape) throw IndexOutOfShapeException(index, shape)
+        if (index[axis] !in 0 until axisShape) throw IndexOutOfShapeException(shape, index)
     }
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
index 4b31e3fc5..d2ea302fd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
@@ -49,10 +49,10 @@ public abstract class Strides : ShapeIndexer {
     /**
      * Array strides
      */
-    public abstract val strides: IntArray
+    internal abstract val strides: IntArray
 
     public override fun offset(index: IntArray): Int = index.mapIndexed { i, value ->
-        if (value < 0 || value >= shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0,${this.shape[i]})")
+        if (value !in 0 until shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0, ${this.shape[i]})")
         value * strides[i]
     }.sum()
 
@@ -63,15 +63,12 @@ public abstract class Strides : ShapeIndexer {
      */
     public override fun asSequence(): Sequence<IntArray> = (0 until linearSize).asSequence().map(::index)
 
-    public companion object{
-        public fun linearSizeOf(shape: IntArray): Int = shape.reduce(Int::times)
-    }
 }
 
 /**
  * Column-first [Strides]. Columns are represented as continuous arrays
  */
-public class ColumnStrides(override val shape: IntArray) : Strides() {
+public class ColumnStrides(override val shape: Shape) : Strides() {
     override val linearSize: Int get() = strides[shape.size]
 
     /**
@@ -121,7 +118,7 @@ public class ColumnStrides(override val shape: IntArray) : Strides() {
  *
  * @param shape the shape of the tensor.
  */
-public class RowStrides(override val shape: IntArray) : Strides() {
+public class RowStrides(override val shape: Shape) : Strides() {
 
     override val strides: IntArray by lazy {
         val nDim = shape.size
@@ -151,7 +148,7 @@ public class RowStrides(override val shape: IntArray) : Strides() {
         return res
     }
 
-    override val linearSize: Int get() = linearSizeOf(shape)
+    override val linearSize: Int get() = shape.linearSize
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -166,9 +163,9 @@ public class RowStrides(override val shape: IntArray) : Strides() {
 }
 
 @ThreadLocal
-private val defaultStridesCache = HashMap<IntArray, Strides>()
+private val defaultStridesCache = HashMap<Shape, Strides>()
 
 /**
  * Cached builder for default strides
  */
-public fun Strides(shape: IntArray): Strides = defaultStridesCache.getOrPut(shape) { RowStrides(shape) }
\ No newline at end of file
+public fun Strides(shape: Shape): Strides = defaultStridesCache.getOrPut(shape) { RowStrides(shape) }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
index 249b6801d..d34c722a1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
@@ -30,5 +30,5 @@ public class ShortRingND(
 
 public inline fun <R> ShortRing.withNdAlgebra(vararg shape: Int, action: ShortRingND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return ShortRingND(shape).run(action)
+    return ShortRingND(Shape(shape)).run(action)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index 2a258a7f4..51a3d7fd0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -18,6 +18,7 @@ import kotlin.jvm.JvmInline
 public interface Structure1D<out T> : StructureND<T>, Buffer<T> {
     override val dimension: Int get() = 1
 
+    @PerformancePitfall
     override operator fun get(index: IntArray): T {
         require(index.size == 1) { "Index dimension mismatch. Expected 1 but found ${index.size}" }
         return get(index[0])
@@ -32,6 +33,8 @@ public interface Structure1D<out T> : StructureND<T>, Buffer<T> {
  * A mutable structure that is guaranteed to be one-dimensional
  */
 public interface MutableStructure1D<T> : Structure1D<T>, MutableStructureND<T>, MutableBuffer<T> {
+
+    @PerformancePitfall
     override operator fun set(index: IntArray, value: T) {
         require(index.size == 1) { "Index dimension mismatch. Expected 1 but found ${index.size}" }
         set(index[0], value)
@@ -43,9 +46,10 @@ public interface MutableStructure1D<T> : Structure1D<T>, MutableStructureND<T>,
  */
 @JvmInline
 private value class Structure1DWrapper<out T>(val structure: StructureND<T>) : Structure1D<T> {
-    override val shape: IntArray get() = structure.shape
+    override val shape: Shape get() = structure.shape
     override val size: Int get() = structure.shape[0]
 
+    @PerformancePitfall
     override operator fun get(index: Int): T = structure[index]
 
     @PerformancePitfall
@@ -56,13 +60,16 @@ private value class Structure1DWrapper<out T>(val structure: StructureND<T>) : S
  * A 1D wrapper for a mutable nd-structure
  */
 private class MutableStructure1DWrapper<T>(val structure: MutableStructureND<T>) : MutableStructure1D<T> {
-    override val shape: IntArray get() = structure.shape
+    override val shape: Shape get() = structure.shape
     override val size: Int get() = structure.shape[0]
 
     @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, T>> = structure.elements()
 
+    @PerformancePitfall
     override fun get(index: Int): T = structure[index]
+
+    @PerformancePitfall
     override fun set(index: Int, value: T) {
         structure[intArrayOf(index)] = value
     }
@@ -83,7 +90,7 @@ private class MutableStructure1DWrapper<T>(val structure: MutableStructureND<T>)
  */
 @JvmInline
 private value class Buffer1DWrapper<out T>(val buffer: Buffer<T>) : Structure1D<T> {
-    override val shape: IntArray get() = intArrayOf(buffer.size)
+    override val shape: Shape get() = Shape(buffer.size)
     override val size: Int get() = buffer.size
 
     @PerformancePitfall
@@ -95,7 +102,7 @@ private value class Buffer1DWrapper<out T>(val buffer: Buffer<T>) : Structure1D<
 }
 
 internal class MutableBuffer1DWrapper<T>(val buffer: MutableBuffer<T>) : MutableStructure1D<T> {
-    override val shape: IntArray get() = intArrayOf(buffer.size)
+    override val shape: Shape get() = Shape(buffer.size)
     override val size: Int get() = buffer.size
 
     @PerformancePitfall
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index 2822a74d4..d10c43c25 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -29,7 +29,7 @@ public interface Structure2D<out T> : StructureND<T> {
      */
     public val colNum: Int
 
-    override val shape: IntArray get() = intArrayOf(rowNum, colNum)
+    override val shape: Shape get() = Shape(rowNum, colNum)
 
     /**
      * The buffer of rows of this structure. It gets elements from the structure dynamically.
@@ -54,6 +54,7 @@ public interface Structure2D<out T> : StructureND<T> {
      */
     public operator fun get(i: Int, j: Int): T
 
+    @PerformancePitfall
     override operator fun get(index: IntArray): T {
         require(index.size == 2) { "Index dimension mismatch. Expected 2 but found ${index.size}" }
         return get(index[0], index[1])
@@ -106,6 +107,7 @@ private value class Structure2DWrapper<out T>(val structure: StructureND<T>) : S
     override val rowNum: Int get() = shape[0]
     override val colNum: Int get() = shape[1]
 
+    @PerformancePitfall
     override operator fun get(i: Int, j: Int): T = structure[i, j]
 
     override fun <F : StructureFeature> getFeature(type: KClass<out F>): F? = structure.getFeature(type)
@@ -123,12 +125,15 @@ private class MutableStructure2DWrapper<T>(val structure: MutableStructureND<T>)
     override val rowNum: Int get() = shape[0]
     override val colNum: Int get() = shape[1]
 
+    @PerformancePitfall
     override operator fun get(i: Int, j: Int): T = structure[i, j]
 
+    @PerformancePitfall
     override fun set(index: IntArray, value: T) {
         structure[index] = value
     }
 
+    @PerformancePitfall
     override operator fun set(i: Int, j: Int, value: T) {
         structure[intArrayOf(i, j)] = value
     }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index 4e1cc1ff4..baea5da15 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -46,6 +46,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
      * @param index the indices.
      * @return the value.
      */
+    @PerformancePitfall
     public operator fun get(index: IntArray): T
 
     /**
@@ -97,6 +98,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
         /**
          * Debug output to string
          */
+        @OptIn(PerformancePitfall::class)
         public fun toString(structure: StructureND<*>): String {
             val bufferRepr: String = when (structure.shape.size) {
                 1 -> (0 until structure.shape[0]).map { structure[it] }
@@ -116,7 +118,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
             }
             val className = structure::class.simpleName ?: "StructureND"
 
-            return "$className(shape=${structure.shape.contentToString()}, buffer=$bufferRepr)"
+            return "$className(shape=${structure.shape}, buffer=$bufferRepr)"
         }
 
         /**
@@ -145,13 +147,13 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
         ): BufferND<T> = BufferND(strides, Buffer.auto(type, strides.linearSize) { i -> initializer(strides.index(i)) })
 
         public fun <T> buffered(
-            shape: IntArray,
+            shape: Shape,
             bufferFactory: BufferFactory<T> = BufferFactory.boxing(),
             initializer: (IntArray) -> T,
         ): BufferND<T> = buffered(ColumnStrides(shape), bufferFactory, initializer)
 
         public inline fun <reified T : Any> auto(
-            shape: IntArray,
+            shape: Shape,
             crossinline initializer: (IntArray) -> T,
         ): BufferND<T> = auto(ColumnStrides(shape), initializer)
 
@@ -160,13 +162,13 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
             vararg shape: Int,
             crossinline initializer: (IntArray) -> T,
         ): BufferND<T> =
-            auto(ColumnStrides(shape), initializer)
+            auto(ColumnStrides(Shape(shape)), initializer)
 
         public inline fun <T : Any> auto(
             type: KClass<T>,
             vararg shape: Int,
             crossinline initializer: (IntArray) -> T,
-        ): BufferND<T> = auto(type, ColumnStrides(shape), initializer)
+        ): BufferND<T> = auto(type, ColumnStrides(Shape(shape)), initializer)
     }
 }
 
@@ -214,8 +216,13 @@ public fun <T : Comparable<T>> LinearSpace<T, Ring<T>>.contentEquals(
  * @param index the indices.
  * @return the value.
  */
+@PerformancePitfall
 public operator fun <T> StructureND<T>.get(vararg index: Int): T = get(index)
 
+public operator fun StructureND<Double>.get(vararg index: Int): Double = getDouble(index)
+
+public operator fun StructureND<Int>.get(vararg index: Int): Int = getInt(index)
+
 //@UnstableKMathAPI
 //public inline fun <reified T : StructureFeature> StructureND<*>.getFeature(): T? = getFeature(T::class)
 
@@ -229,12 +236,14 @@ public interface MutableStructureND<T> : StructureND<T> {
      * @param index the indices.
      * @param value the value.
      */
+    @PerformancePitfall
     public operator fun set(index: IntArray, value: T)
 }
 
 /**
  * Set value at specified indices
  */
+@PerformancePitfall
 public operator fun <T> MutableStructureND<T>.set(vararg index: Int, value: T) {
     set(index, value)
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
index 579a0d7c8..e5edeef7f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
@@ -5,12 +5,15 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 
 public open class VirtualStructureND<T>(
     override val shape: Shape,
     public val producer: (IntArray) -> T,
 ) : StructureND<T> {
+
+    @PerformancePitfall
     override fun get(index: IntArray): T {
         requireIndexInShape(index, shape)
         return producer(index)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt
index 5814e2f9c..424081738 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt
@@ -5,6 +5,9 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.misc.PerformancePitfall
+
+@OptIn(PerformancePitfall::class)
 public fun <T> StructureND<T>.roll(axis: Int, step: Int = 1): StructureND<T> {
     require(axis in shape.indices) { "Axis $axis is outside of shape dimensions: [0, ${shape.size})" }
     return VirtualStructureND(shape) { index ->
@@ -19,6 +22,7 @@ public fun <T> StructureND<T>.roll(axis: Int, step: Int = 1): StructureND<T> {
     }
 }
 
+@OptIn(PerformancePitfall::class)
 public fun <T> StructureND<T>.roll(pair: Pair<Int, Int>, vararg others: Pair<Int, Int>): StructureND<T> {
     val axisMap: Map<Int, Int> = mapOf(pair, *others)
     require(axisMap.keys.all { it in shape.indices }) { "Some of axes ${axisMap.keys} is outside of shape dimensions: [0, ${shape.size})" }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/primitiveStructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/primitiveStructureND.kt
new file mode 100644
index 000000000..f50233ecc
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/primitiveStructureND.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.nd
+
+import space.kscience.kmath.misc.PerformancePitfall
+
+public interface StructureNDOfDouble : StructureND<Double> {
+    /**
+     * Guaranteed non-blocking access to content
+     */
+    public fun getDouble(index: IntArray): Double
+}
+
+/**
+ * Optimized method to access primitive without boxing if possible
+ */
+@OptIn(PerformancePitfall::class)
+public fun StructureND<Double>.getDouble(index: IntArray): Double =
+    if (this is StructureNDOfDouble) getDouble(index) else get(index)
+
+public interface MutableStructureNDOfDouble : StructureNDOfDouble, MutableStructureND<Double> {
+    /**
+     * Guaranteed non-blocking access to content
+     */
+    public fun setDouble(index: IntArray, value: Double)
+}
+
+@OptIn(PerformancePitfall::class)
+public fun MutableStructureND<Double>.getDouble(index: IntArray): Double =
+    if (this is StructureNDOfDouble) getDouble(index) else get(index)
+
+
+public interface StructureNDOfInt : StructureND<Int> {
+    /**
+     * Guaranteed non-blocking access to content
+     */
+    public fun getInt(index: IntArray): Int
+}
+
+@OptIn(PerformancePitfall::class)
+public fun StructureND<Int>.getInt(index: IntArray): Int =
+    if (this is StructureNDOfInt) getInt(index) else get(index)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
index f61a0a623..b1b6fba9f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
@@ -5,10 +5,7 @@
 
 package space.kscience.kmath.structures
 
-import space.kscience.kmath.nd.ColumnStrides
-import space.kscience.kmath.nd.Structure2D
-import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.as2D
+import space.kscience.kmath.nd.*
 
 /**
  * A context that allows to operate on a [MutableBuffer] as on 2d array
@@ -31,7 +28,7 @@ internal class BufferAccessor2D<T>(
 
     //TODO optimize wrapper
     fun MutableBuffer<T>.collect(): Structure2D<T> = StructureND.buffered(
-        ColumnStrides(intArrayOf(rowNum, colNum)),
+        ColumnStrides(Shape(rowNum, colNum)),
         factory
     ) { (i, j) ->
         get(i, j)
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/StridesTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/StridesTest.kt
index eac4f17e1..7044eb930 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/StridesTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/StridesTest.kt
@@ -10,7 +10,7 @@ import kotlin.test.Test
 class StridesTest {
     @Test
     fun checkRowBasedStrides() {
-        val strides = RowStrides(intArrayOf(3, 3))
+        val strides = RowStrides(Shape(3, 3))
         var counter = 0
         for(i in 0..2){
             for(j in 0..2){
@@ -24,7 +24,7 @@ class StridesTest {
 
     @Test
     fun checkColumnBasedStrides() {
-        val strides = ColumnStrides(intArrayOf(3, 3))
+        val strides = ColumnStrides(Shape(3, 3))
         var counter = 0
         for(i in 0..2){
             for(j in 0..2){
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index a54af571e..147488273 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -88,7 +88,7 @@ class NumberNDFieldTest {
     @Test
     fun testInternalContext() {
         algebra {
-            (DoubleField.ndAlgebra(*array1.shape)) { with(L2Norm) { 1 + norm(array1) + exp(array2) } }
+            (DoubleField.ndAlgebra(array1.shape)) { with(L2Norm) { 1 + norm(array1) + exp(array2) } }
         }
     }
 }
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
index c217c3a26..97e27df96 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
@@ -9,11 +9,12 @@ import kotlinx.coroutines.*
 import space.kscience.kmath.coroutines.Math
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.ColumnStrides
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
 
 public class LazyStructureND<out T>(
     public val scope: CoroutineScope,
-    override val shape: IntArray,
+    override val shape: Shape,
     public val function: suspend (IntArray) -> T,
 ) : StructureND<T> {
     private val cache: MutableMap<IntArray, Deferred<T>> = HashMap()
@@ -23,6 +24,7 @@ public class LazyStructureND<out T>(
     }
 
     public suspend fun await(index: IntArray): T = async(index).await()
+    @PerformancePitfall
     override operator fun get(index: IntArray): T = runBlocking { async(index).await() }
 
     @OptIn(PerformancePitfall::class)
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
index b93114804..30c84d848 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.dimensions
 
 import space.kscience.kmath.linear.*
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Ring
@@ -47,7 +48,7 @@ public interface DMatrix<out T, R : Dimension, C : Dimension> : Structure2D<T> {
 public value class DMatrixWrapper<out T, R : Dimension, C : Dimension>(
     private val structure: Structure2D<T>,
 ) : DMatrix<T, R, C> {
-    override val shape: IntArray get() = structure.shape
+    override val shape: Shape get() = structure.shape
     override val rowNum: Int get() = shape[0]
     override val colNum: Int get() = shape[1]
     override operator fun get(i: Int, j: Int): T = structure[i, j]
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
index e3bff8987..d1ae80ef9 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
@@ -15,6 +15,7 @@ import space.kscience.kmath.linear.*
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.toArray
 import space.kscience.kmath.operations.algebra
 import kotlin.random.Random
 import kotlin.random.asJavaRandom
@@ -52,7 +53,7 @@ internal class EjmlMatrixTest {
     fun shape() {
         val m = randomMatrix
         val w = EjmlDoubleMatrix(m)
-        assertContentEquals(intArrayOf(m.numRows, m.numCols), w.shape)
+        assertContentEquals(intArrayOf(m.numRows, m.numCols), w.shape.toArray())
     }
 
     @OptIn(UnstableKMathAPI::class)
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
index 1c9f00838..06320c8d9 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.histogram
 
 import space.kscience.kmath.domains.Domain
 import space.kscience.kmath.linear.Point
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.FieldOpsND
 import space.kscience.kmath.nd.Shape
@@ -24,6 +25,7 @@ public class HistogramND<T : Comparable<T>, D : Domain<T>, V : Any>(
     internal val values: StructureND<V>,
 ) : Histogram<T, V, DomainBin<T, D, V>> {
 
+    @OptIn(PerformancePitfall::class)
     override fun get(point: Point<T>): DomainBin<T, D, V>? {
         val index = group.getIndexOrNull(point) ?: return null
         return group.produceBin(index, values[index])
@@ -31,6 +33,7 @@ public class HistogramND<T : Comparable<T>, D : Domain<T>, V : Any>(
 
     override val dimension: Int get() = group.shape.size
 
+    @OptIn(PerformancePitfall::class)
     override val bins: Iterable<DomainBin<T, D, V>>
         get() = ColumnStrides(group.shape).asSequence().map {
             group.produceBin(it, values[it])
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
index 36e994bcf..cf8b59087 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
@@ -9,11 +9,10 @@ package space.kscience.kmath.histogram
 
 import space.kscience.kmath.domains.HyperSquareDomain
 import space.kscience.kmath.linear.Point
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
-import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.invoke
+import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.*
 import kotlin.math.floor
 
@@ -40,7 +39,7 @@ public class UniformHistogramGroupND<V : Any, A : Field<V>>(
 
     public val dimension: Int get() = lower.size
 
-    override val shape: IntArray = IntArray(binNums.size) { binNums[it] + 2 }
+    override val shape: Shape = Shape(IntArray(binNums.size) { binNums[it] + 2 })
 
     private val binSize = DoubleBuffer(dimension) { (upper[it] - lower[it]) / binNums[it] }
 
@@ -83,8 +82,12 @@ public class UniformHistogramGroupND<V : Any, A : Field<V>>(
     }
 
 
-    override fun produce(builder: HistogramBuilder<Double, V>.() -> Unit): HistogramND<Double, HyperSquareDomain, V> {
-        val ndCounter = StructureND.buffered(shape) { Counter.of(valueAlgebraND.elementAlgebra) }
+    @OptIn(PerformancePitfall::class)
+    override fun produce(
+        builder: HistogramBuilder<Double, V>.() -> Unit,
+    ): HistogramND<Double, HyperSquareDomain, V> {
+        val ndCounter: BufferND<ObjectCounter<V>> =
+            StructureND.buffered(shape) { Counter.of(valueAlgebraND.elementAlgebra) }
         val hBuilder = object : HistogramBuilder<Double, V> {
             override val defaultValue: V get() = valueAlgebraND.elementAlgebra.one
 
@@ -94,7 +97,8 @@ public class UniformHistogramGroupND<V : Any, A : Field<V>>(
             }
         }
         hBuilder.apply(builder)
-        val values: BufferND<V> = ndCounter.mapToBuffer(valueBufferFactory) { it.value }
+        val values: BufferND<V> = BufferND(ndCounter.indices, ndCounter.buffer.map(valueBufferFactory) { it.value })
+
         return HistogramND(this, values)
     }
 
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
index 7e11c9a2f..64cc4f203 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
@@ -7,6 +7,7 @@
 
 package space.kscience.kmath.histogram
 
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.operations.invoke
@@ -50,6 +51,7 @@ internal class MultivariateHistogramTest {
         assertEquals(n, histogram.bins.sumOf { it.binValue.toInt() })
     }
 
+    @OptIn(PerformancePitfall::class)
     @Test
     fun testHistogramAlgebra() {
         Histogram.uniformDoubleNDFromRanges(
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
index 38d61e982..88c004c7b 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
@@ -13,14 +13,16 @@ import kotlin.jvm.JvmInline
 
 @JvmInline
 public value class MultikTensor<T>(public val array: MutableMultiArray<T, DN>) : Tensor<T> {
-    override val shape: Shape get() = array.shape
+    override val shape: Shape get() = Shape(array.shape)
 
+    @PerformancePitfall
     override fun get(index: IntArray): T = array[index]
 
     @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, T>> =
         array.multiIndices.iterator().asSequence().map { it to get(it) }
 
+    @PerformancePitfall
     override fun set(index: IntArray, value: T) {
         array[index] = value
     }
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index dd0249fbc..99cbc3193 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -14,6 +14,7 @@ import org.jetbrains.kotlinx.multik.api.stat.Statistics
 import org.jetbrains.kotlinx.multik.ndarray.data.*
 import org.jetbrains.kotlinx.multik.ndarray.operations.*
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.misc.UnsafeKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.tensors.api.Tensor
@@ -30,21 +31,22 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
     protected val multikLinAl: LinAlg = multikEngine.getLinAlg()
     protected val multikStat: Statistics = multikEngine.getStatistics()
 
+    @OptIn(UnsafeKMathAPI::class)
     override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): MultikTensor<T> {
         val strides = ColumnStrides(shape)
         val memoryView = initMemoryView<T>(strides.linearSize, type)
         strides.asSequence().forEachIndexed { linearIndex, tensorIndex ->
             memoryView[linearIndex] = elementAlgebra.initializer(tensorIndex)
         }
-        return MultikTensor(NDArray(memoryView, shape = shape, dim = DN(shape.size)))
+        return MultikTensor(NDArray(memoryView, shape = shape.asArray(), dim = DN(shape.size)))
     }
 
-    @OptIn(PerformancePitfall::class)
+    @OptIn(PerformancePitfall::class, UnsafeKMathAPI::class)
     override fun StructureND<T>.map(transform: A.(T) -> T): MultikTensor<T> = if (this is MultikTensor) {
         val data = initMemoryView<T>(array.size, type)
         var count = 0
         for (el in array) data[count++] = elementAlgebra.transform(el)
-        NDArray(data, shape = shape, dim = array.dim).wrap()
+        NDArray(data, shape = shape.asArray(), dim = array.dim).wrap()
     } else {
         structureND(shape) { index ->
             transform(get(index))
@@ -75,6 +77,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
     /**
      * Transform a structure element-by element in place.
      */
+    @OptIn(PerformancePitfall::class)
     public inline fun <T> MutableStructureND<T>.mapIndexedInPlace(operation: (index: IntArray, t: T) -> T): Unit {
         if (this is MultikTensor) {
             array.multiIndices.iterator().forEach {
@@ -106,10 +109,11 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
      * Convert a tensor to [MultikTensor] if necessary. If tensor is converted, changes on the resulting tensor
      * are not reflected back onto the source
      */
+    @OptIn(UnsafeKMathAPI::class, PerformancePitfall::class)
     public fun StructureND<T>.asMultik(): MultikTensor<T> = if (this is MultikTensor) {
         this
     } else {
-        val res = mk.zeros<T, DN>(shape, type).asDNArray()
+        val res = mk.zeros<T, DN>(shape.asArray(), type).asDNArray()
         for (index in res.multiIndices) {
             res[index] = this[index]
         }
@@ -118,7 +122,8 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
 
     public fun MutableMultiArray<T, *>.wrap(): MultikTensor<T> = MultikTensor(this.asDNArray())
 
-    override fun StructureND<T>.valueOrNull(): T? = if (shape contentEquals intArrayOf(1)) {
+    @OptIn(PerformancePitfall::class)
+    override fun StructureND<T>.valueOrNull(): T? = if (shape contentEquals Shape(1)) {
         get(intArrayOf(0))
     } else null
 
@@ -139,6 +144,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
         }
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun Tensor<T>.plusAssign(arg: StructureND<T>) {
         if (this is MultikTensor) {
             array.plusAssign(arg.asMultik().array)
@@ -163,6 +169,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
         }
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun Tensor<T>.minusAssign(arg: StructureND<T>) {
         if (this is MultikTensor) {
             array.minusAssign(arg.asMultik().array)
@@ -188,6 +195,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
         }
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun Tensor<T>.timesAssign(arg: StructureND<T>) {
         if (this is MultikTensor) {
             array.timesAssign(arg.asMultik().array)
@@ -201,13 +209,13 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
 
     override fun Tensor<T>.getTensor(i: Int): MultikTensor<T> = asMultik().array.mutableView(i).wrap()
 
-    override fun Tensor<T>.transposed(i: Int, j: Int): MultikTensor<T> = asMultik().array.transpose(i, j).wrap()
+    override fun StructureND<T>.transposed(i: Int, j: Int): MultikTensor<T> = asMultik().array.transpose(i, j).wrap()
 
-    override fun Tensor<T>.view(shape: IntArray): MultikTensor<T> {
-        require(shape.all { it > 0 })
-        require(shape.fold(1, Int::times) == this.shape.size) {
+    override fun Tensor<T>.view(shape: Shape): MultikTensor<T> {
+        require(shape.asList().all { it > 0 })
+        require(shape.linearSize == this.shape.size) {
             "Cannot reshape array of size ${this.shape.size} into a new shape ${
-                shape.joinToString(
+                shape.asList().joinToString(
                     prefix = "(",
                     postfix = ")"
                 )
@@ -215,10 +223,11 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
         }
 
         val mt = asMultik().array
-        return if (mt.shape.contentEquals(shape)) {
+        return if (Shape(mt.shape).contentEquals(shape)) {
             mt
         } else {
-            NDArray(mt.data, mt.offset, shape, dim = DN(shape.size), base = mt.base ?: mt)
+            @OptIn(UnsafeKMathAPI::class)
+            NDArray(mt.data, mt.offset, shape.asArray(), dim = DN(shape.size), base = mt.base ?: mt)
         }.wrap()
     }
 
@@ -241,7 +250,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
             TODO("Not implemented for broadcasting")
         }
 
-    override fun diagonalEmbedding(diagonalEntries: Tensor<T>, offset: Int, dim1: Int, dim2: Int): MultikTensor<T> {
+    override fun diagonalEmbedding(diagonalEntries: StructureND<T>, offset: Int, dim1: Int, dim2: Int): MultikTensor<T> {
 
         TODO("Diagonal embedding not implemented")
     }
@@ -284,8 +293,9 @@ public abstract class MultikDivisionTensorAlgebra<T, A : Field<T>>(
     multikEngine: Engine,
 ) : MultikTensorAlgebra<T, A>(multikEngine), TensorPartialDivisionAlgebra<T, A> where T : Number, T : Comparable<T> {
 
+    @OptIn(UnsafeKMathAPI::class)
     override fun T.div(arg: StructureND<T>): MultikTensor<T> =
-        Multik.ones<T, DN>(arg.shape, type).apply { divAssign(arg.asMultik().array) }.wrap()
+        Multik.ones<T, DN>(arg.shape.asArray(), type).apply { divAssign(arg.asMultik().array) }.wrap()
 
     override fun StructureND<T>.div(arg: T): MultikTensor<T> =
         asMultik().array.div(arg).wrap()
@@ -301,6 +311,7 @@ public abstract class MultikDivisionTensorAlgebra<T, A : Field<T>>(
         }
     }
 
+    @OptIn(PerformancePitfall::class)
     override fun Tensor<T>.divAssign(arg: StructureND<T>) {
         if (this is MultikTensor) {
             array.divAssign(arg.asMultik().array)
diff --git a/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
index 392532d8e..de54af732 100644
--- a/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
+++ b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.multik
 
 import org.jetbrains.kotlinx.multik.default.DefaultEngine
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.one
 import space.kscience.kmath.operations.DoubleField
@@ -28,8 +29,8 @@ internal class MultikNDTest {
     fun dotResult() {
         val dim = 100
 
-        val tensor1 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12224)
-        val tensor2 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12225)
+        val tensor1 = DoubleTensorAlgebra.randomNormal(shape = Shape(dim, dim), 12224)
+        val tensor2 = DoubleTensorAlgebra.randomNormal(shape = Shape(dim, dim), 12225)
 
         val multikResult = with(multikAlgebra) {
             tensor1 dot tensor2
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index 859773211..7654ec9ce 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -11,6 +11,7 @@ import org.nd4j.linalg.api.ops.impl.transforms.strict.ASinh
 import org.nd4j.linalg.factory.Nd4j
 import org.nd4j.linalg.ops.transforms.Transforms
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.misc.UnsafeKMathAPI
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.*
@@ -33,7 +34,8 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
     public val StructureND<T>.ndArray: INDArray
 
     override fun structureND(shape: Shape, initializer: C.(IntArray) -> T): Nd4jArrayStructure<T> {
-        val struct = Nd4j.create(*shape)!!.wrap()
+        @OptIn(UnsafeKMathAPI::class)
+        val struct: Nd4jArrayStructure<T> = Nd4j.create(*shape.asArray())!!.wrap()
         struct.indicesIterator().forEach { struct[it] = elementAlgebra.initializer(it) }
         return struct
     }
@@ -45,23 +47,23 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
         return newStruct
     }
 
-    @OptIn(PerformancePitfall::class)
+    @OptIn(PerformancePitfall::class, UnsafeKMathAPI::class)
     override fun StructureND<T>.mapIndexed(
         transform: C.(index: IntArray, T) -> T,
     ): Nd4jArrayStructure<T> {
-        val new = Nd4j.create(*shape).wrap()
+        val new = Nd4j.create(*shape.asArray()).wrap()
         new.indicesIterator().forEach { idx -> new[idx] = elementAlgebra.transform(idx, this[idx]) }
         return new
     }
 
-    @OptIn(PerformancePitfall::class)
+    @OptIn(PerformancePitfall::class, UnsafeKMathAPI::class)
     override fun zip(
         left: StructureND<T>,
         right: StructureND<T>,
         transform: C.(T, T) -> T,
     ): Nd4jArrayStructure<T> {
         require(left.shape.contentEquals(right.shape)) { "Can't zip tow structures of shape ${left.shape} and ${right.shape}" }
-        val new = Nd4j.create(*left.shape).wrap()
+        val new = Nd4j.create(*left.shape.asArray()).wrap()
         new.indicesIterator().forEach { idx -> new[idx] = elementAlgebra.transform(left[idx], right[idx]) }
         return new
     }
@@ -192,11 +194,11 @@ public open class DoubleNd4jArrayFieldOps : Nd4jArrayExtendedFieldOps<Double, Do
 
     override fun INDArray.wrap(): Nd4jArrayStructure<Double> = asDoubleStructure()
 
-    @OptIn(PerformancePitfall::class)
+    @OptIn(PerformancePitfall::class, UnsafeKMathAPI::class)
     override val StructureND<Double>.ndArray: INDArray
         get() = when (this) {
             is Nd4jArrayStructure<Double> -> ndArray
-            else -> Nd4j.zeros(*shape).also {
+            else -> Nd4j.zeros(*shape.asArray()).also {
                 elements().forEach { (idx, value) -> it.putScalar(idx, value) }
             }
         }
@@ -225,7 +227,7 @@ public val DoubleField.nd4j: DoubleNd4jArrayFieldOps get() = DoubleNd4jArrayFiel
 public class DoubleNd4jArrayField(override val shape: Shape) : DoubleNd4jArrayFieldOps(), FieldND<Double, DoubleField>
 
 public fun DoubleField.nd4j(shapeFirst: Int, vararg shapeRest: Int): DoubleNd4jArrayField =
-    DoubleNd4jArrayField(intArrayOf(shapeFirst, * shapeRest))
+    DoubleNd4jArrayField(Shape(shapeFirst, * shapeRest))
 
 
 /**
@@ -236,11 +238,11 @@ public open class FloatNd4jArrayFieldOps : Nd4jArrayExtendedFieldOps<Float, Floa
 
     override fun INDArray.wrap(): Nd4jArrayStructure<Float> = asFloatStructure()
 
-    @OptIn(PerformancePitfall::class)
+    @OptIn(PerformancePitfall::class, UnsafeKMathAPI::class)
     override val StructureND<Float>.ndArray: INDArray
         get() = when (this) {
             is Nd4jArrayStructure<Float> -> ndArray
-            else -> Nd4j.zeros(*shape).also {
+            else -> Nd4j.zeros(*shape.asArray()).also {
                 elements().forEach { (idx, value) -> it.putScalar(idx, value) }
             }
         }
@@ -274,7 +276,7 @@ public class FloatNd4jArrayField(override val shape: Shape) : FloatNd4jArrayFiel
 public val FloatField.nd4j: FloatNd4jArrayFieldOps get() = FloatNd4jArrayFieldOps
 
 public fun FloatField.nd4j(shapeFirst: Int, vararg shapeRest: Int): FloatNd4jArrayField =
-    FloatNd4jArrayField(intArrayOf(shapeFirst, * shapeRest))
+    FloatNd4jArrayField(Shape(shapeFirst, * shapeRest))
 
 /**
  * Represents [RingND] over [Nd4jArrayIntStructure].
@@ -284,11 +286,11 @@ public open class IntNd4jArrayRingOps : Nd4jArrayRingOps<Int, IntRing> {
 
     override fun INDArray.wrap(): Nd4jArrayStructure<Int> = asIntStructure()
 
-    @OptIn(PerformancePitfall::class)
+    @OptIn(PerformancePitfall::class, UnsafeKMathAPI::class)
     override val StructureND<Int>.ndArray: INDArray
         get() = when (this) {
             is Nd4jArrayStructure<Int> -> ndArray
-            else -> Nd4j.zeros(*shape).also {
+            else -> Nd4j.zeros(*shape.asArray()).also {
                 elements().forEach { (idx, value) -> it.putScalar(idx, value) }
             }
         }
@@ -313,4 +315,4 @@ public val IntRing.nd4j: IntNd4jArrayRingOps get() = IntNd4jArrayRingOps
 public class IntNd4jArrayRing(override val shape: Shape) : IntNd4jArrayRingOps(), RingND<Int, IntRing>
 
 public fun IntRing.nd4j(shapeFirst: Int, vararg shapeRest: Int): IntNd4jArrayRing =
-    IntNd4jArrayRing(intArrayOf(shapeFirst, * shapeRest))
\ No newline at end of file
+    IntNd4jArrayRing(Shape(shapeFirst, * shapeRest))
\ No newline at end of file
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
index 0a7d15e20..60c865a02 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
@@ -7,8 +7,7 @@ package space.kscience.kmath.nd4j
 
 import org.nd4j.linalg.api.ndarray.INDArray
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.MutableStructureND
-import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.*
 
 /**
  * Represents a [StructureND] wrapping an [INDArray] object.
@@ -22,7 +21,7 @@ public sealed class Nd4jArrayStructure<T> : MutableStructureND<T> {
      */
     public abstract val ndArray: INDArray
 
-    override val shape: IntArray get() = ndArray.shape().toIntArray()
+    override val shape: Shape get() = Shape(ndArray.shape().toIntArray())
 
     internal abstract fun elementsIterator(): Iterator<Pair<IntArray, T>>
     internal fun indicesIterator(): Iterator<IntArray> = ndArray.indicesIterator()
@@ -31,20 +30,31 @@ public sealed class Nd4jArrayStructure<T> : MutableStructureND<T> {
     override fun elements(): Sequence<Pair<IntArray, T>> = Sequence(::elementsIterator)
 }
 
-private data class Nd4jArrayIntStructure(override val ndArray: INDArray) : Nd4jArrayStructure<Int>() {
+public data class Nd4jArrayIntStructure(override val ndArray: INDArray) : Nd4jArrayStructure<Int>(), StructureNDOfInt {
     override fun elementsIterator(): Iterator<Pair<IntArray, Int>> = ndArray.intIterator()
+
+    @OptIn(PerformancePitfall::class)
     override fun get(index: IntArray): Int = ndArray.getInt(*index)
+
+    override fun getInt(index: IntArray): Int = ndArray.getInt(*index)
+
+    @OptIn(PerformancePitfall::class)
     override fun set(index: IntArray, value: Int): Unit = run { ndArray.putScalar(index, value) }
 }
 
 /**
  * Wraps this [INDArray] to [Nd4jArrayStructure].
  */
-public fun INDArray.asIntStructure(): Nd4jArrayStructure<Int> = Nd4jArrayIntStructure(this)
+public fun INDArray.asIntStructure(): Nd4jArrayIntStructure = Nd4jArrayIntStructure(this)
 
-private data class Nd4jArrayDoubleStructure(override val ndArray: INDArray) : Nd4jArrayStructure<Double>() {
+public data class Nd4jArrayDoubleStructure(override val ndArray: INDArray) : Nd4jArrayStructure<Double>(), StructureNDOfDouble {
     override fun elementsIterator(): Iterator<Pair<IntArray, Double>> = ndArray.realIterator()
+    @OptIn(PerformancePitfall::class)
     override fun get(index: IntArray): Double = ndArray.getDouble(*index)
+
+    override fun getDouble(index: IntArray): Double = ndArray.getDouble(*index)
+
+    @OptIn(PerformancePitfall::class)
     override fun set(index: IntArray, value: Double): Unit = run { ndArray.putScalar(index, value) }
 }
 
@@ -53,9 +63,12 @@ private data class Nd4jArrayDoubleStructure(override val ndArray: INDArray) : Nd
  */
 public fun INDArray.asDoubleStructure(): Nd4jArrayStructure<Double> = Nd4jArrayDoubleStructure(this)
 
-private data class Nd4jArrayFloatStructure(override val ndArray: INDArray) : Nd4jArrayStructure<Float>() {
+public data class Nd4jArrayFloatStructure(override val ndArray: INDArray) : Nd4jArrayStructure<Float>() {
     override fun elementsIterator(): Iterator<Pair<IntArray, Float>> = ndArray.floatIterator()
+    @PerformancePitfall
     override fun get(index: IntArray): Float = ndArray.getFloat(*index)
+
+    @PerformancePitfall
     override fun set(index: IntArray, value: Float): Unit = run { ndArray.putScalar(index, value) }
 }
 
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index b0fce8dcf..d505b3c0e 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -13,9 +13,8 @@ import org.nd4j.linalg.factory.Nd4j
 import org.nd4j.linalg.factory.ops.NDBase
 import org.nd4j.linalg.ops.transforms.Transforms
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.ColumnStrides
-import space.kscience.kmath.nd.Shape
-import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.misc.UnsafeKMathAPI
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
@@ -96,7 +95,7 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
 
     override fun StructureND<T>.unaryMinus(): Nd4jArrayStructure<T> = ndArray.neg().wrap()
     override fun Tensor<T>.getTensor(i: Int): Nd4jArrayStructure<T> = ndArray.slice(i.toLong()).wrap()
-    override fun Tensor<T>.transposed(i: Int, j: Int): Nd4jArrayStructure<T> = ndArray.swapAxes(i, j).wrap()
+    override fun StructureND<T>.transposed(i: Int, j: Int): Nd4jArrayStructure<T> = ndArray.swapAxes(i, j).wrap()
     override fun StructureND<T>.dot(other: StructureND<T>): Nd4jArrayStructure<T> = ndArray.mmul(other.ndArray).wrap()
 
     override fun StructureND<T>.min(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
@@ -108,7 +107,9 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
     override fun StructureND<T>.max(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
         ndArray.max(keepDim, dim).wrap()
 
-    override fun Tensor<T>.view(shape: IntArray): Nd4jArrayStructure<T> = ndArray.reshape(shape).wrap()
+    @OptIn(UnsafeKMathAPI::class)
+    override fun Tensor<T>.view(shape: Shape): Nd4jArrayStructure<T> = ndArray.reshape(shape.asArray()).wrap()
+
     override fun Tensor<T>.viewAs(other: StructureND<T>): Nd4jArrayStructure<T> = view(other.shape)
 
     override fun StructureND<T>.argMin(dim: Int, keepDim: Boolean): Tensor<Int> =
@@ -176,8 +177,9 @@ public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double, DoubleField> {
 
     override fun INDArray.wrap(): Nd4jArrayStructure<Double> = asDoubleStructure()
 
+    @OptIn(UnsafeKMathAPI::class)
     override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): Nd4jArrayStructure<Double> {
-        val array: INDArray = Nd4j.zeros(*shape)
+        val array: INDArray = Nd4j.zeros(*shape.asArray())
         val indices = ColumnStrides(shape)
         indices.asSequence().forEach { index ->
             array.putScalar(index, elementAlgebra.initializer(index))
@@ -186,21 +188,21 @@ public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double, DoubleField> {
     }
 
 
-    @OptIn(PerformancePitfall::class)
+    @OptIn(PerformancePitfall::class, UnsafeKMathAPI::class)
     override val StructureND<Double>.ndArray: INDArray
         get() = when (this) {
             is Nd4jArrayStructure<Double> -> ndArray
-            else -> Nd4j.zeros(*shape).also {
+            else -> Nd4j.zeros(*shape.asArray()).also {
                 elements().forEach { (idx, value) -> it.putScalar(idx, value) }
             }
         }
 
     override fun StructureND<Double>.valueOrNull(): Double? =
-        if (shape contentEquals intArrayOf(1)) ndArray.getDouble(0) else null
+        if (shape contentEquals Shape(1)) ndArray.getDouble(0) else null
 
     // TODO rewrite
     override fun diagonalEmbedding(
-        diagonalEntries: Tensor<Double>,
+        diagonalEntries: StructureND<Double>,
         offset: Int,
         dim1: Int,
         dim2: Int,
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
index d1ad746fe..25c3fe23f 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.nd4j
 
 import org.nd4j.linalg.factory.Nd4j
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.asList
 import space.kscience.kmath.nd.get
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -27,7 +28,7 @@ internal class Nd4jArrayStructureTest {
     fun testShape() {
         val nd = Nd4j.rand(10, 2, 3, 6) ?: fail()
         val struct = nd.asDoubleStructure()
-        assertEquals(intArrayOf(10, 2, 3, 6).toList(), struct.shape.toList())
+        assertEquals(intArrayOf(10, 2, 3, 6).toList(), struct.shape.asList())
     }
 
     @Test
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
index 953076680..674485fd1 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
@@ -28,6 +28,8 @@ public class DoubleTensorFlowOutput(
 
 }
 
+internal fun Shape.toLongArray(): LongArray = LongArray(size) { get(it).toLong() }
+
 public class DoubleTensorFlowAlgebra internal constructor(
     graph: Graph,
 ) : TensorFlowAlgebra<Double, TFloat64, DoubleField>(graph), PowerOperations<StructureND<Double>> {
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index 74fcf2d7d..a1e0335f8 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -18,9 +18,12 @@ import org.tensorflow.types.TInt32
 import org.tensorflow.types.family.TNumber
 import org.tensorflow.types.family.TType
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.misc.UnsafeKMathAPI
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.asArray
+import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.api.TensorAlgebra
@@ -38,7 +41,7 @@ public sealed interface TensorFlowTensor<T> : Tensor<T>
  */
 @JvmInline
 public value class TensorFlowArray<T>(public val tensor: NdArray<T>) : Tensor<T> {
-    override val shape: Shape get() = tensor.shape().asArray().toIntArray()
+    override val shape: Shape get() = Shape(tensor.shape().asArray().toIntArray())
 
     override fun get(index: IntArray): T = tensor.getObject(*index.toLongArray())
 
@@ -62,7 +65,7 @@ public abstract class TensorFlowOutput<T, TT : TType>(
     public var output: Output<TT> = output
         internal set
 
-    override val shape: Shape get() = output.shape().asArray().toIntArray()
+    override val shape: Shape get() = Shape(output.shape().asArray().toIntArray())
 
     protected abstract fun org.tensorflow.Tensor.actualizeTensor(): NdArray<T>
 
@@ -96,8 +99,8 @@ public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal c
 
     protected abstract fun const(value: T): Constant<TT>
 
-    override fun StructureND<T>.valueOrNull(): T? = if (shape contentEquals intArrayOf(1))
-        get(Shape(0)) else null
+    override fun StructureND<T>.valueOrNull(): T? = if (shape contentEquals Shape(1))
+        get(intArrayOf(0)) else null
 
     /**
      * Perform binary lazy operation on tensor. Both arguments are implicitly converted
@@ -188,12 +191,13 @@ public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal c
         StridedSliceHelper.stridedSlice(ops.scope(), it, Indices.at(i.toLong()))
     }
 
-    override fun Tensor<T>.transposed(i: Int, j: Int): Tensor<T> = operate {
+    override fun StructureND<T>.transposed(i: Int, j: Int): Tensor<T> = operate {
         ops.linalg.transpose(it, ops.constant(intArrayOf(i, j)))
     }
 
-    override fun Tensor<T>.view(shape: IntArray): Tensor<T> = operate {
-        ops.reshape(it, ops.constant(shape))
+    override fun Tensor<T>.view(shape: Shape): Tensor<T> = operate {
+        @OptIn(UnsafeKMathAPI::class)
+        ops.reshape(it, ops.constant(shape.asArray()))
     }
 
     override fun Tensor<T>.viewAs(other: StructureND<T>): Tensor<T> = operate(other) { l, r ->
@@ -208,7 +212,7 @@ public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal c
     }
 
     override fun diagonalEmbedding(
-        diagonalEntries: Tensor<T>,
+        diagonalEntries: StructureND<T>,
         offset: Int,
         dim1: Int,
         dim2: Int,
diff --git a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
index a35556be1..44a594299 100644
--- a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
+++ b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.tensorflow
 
 import org.junit.jupiter.api.Test
 import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.get
 import space.kscience.kmath.nd.structureND
 import space.kscience.kmath.operations.DoubleField
@@ -31,8 +32,8 @@ class DoubleTensorFlowOps {
     fun dot(){
         val dim = 1000
 
-        val tensor1 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12224)
-        val tensor2 = DoubleTensorAlgebra.randomNormal(shape = intArrayOf(dim, dim), 12225)
+        val tensor1 = DoubleTensorAlgebra.randomNormal(shape = Shape(dim, dim), 12224)
+        val tensor2 = DoubleTensorAlgebra.randomNormal(shape = Shape(dim, dim), 12225)
 
         DoubleField.produceWithTF {
             tensor1 dot tensor2
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index 07dfd1597..e15fbb3a6 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -21,7 +21,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      *
      * @return the determinant.
      */
-    public fun StructureND<T>.det(): Tensor<T>
+    public fun StructureND<T>.det(): StructureND<T>
 
     /**
      * Computes the multiplicative inverse matrix of a square matrix input, or of each square matrix in a batched input.
@@ -31,7 +31,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      *
      * @return the multiplicative inverse of a matrix.
      */
-    public fun StructureND<T>.inv(): Tensor<T>
+    public fun StructureND<T>.inv(): StructureND<T>
 
     /**
      * Cholesky decomposition.
@@ -47,7 +47,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return the batch of `L` matrices.
      */
-    public fun StructureND<T>.cholesky(): Tensor<T>
+    public fun StructureND<T>.cholesky(): StructureND<T>
 
     /**
      * QR decomposition.
@@ -61,7 +61,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return pair of `Q` and `R` tensors.
      */
-    public fun StructureND<T>.qr(): Pair<Tensor<T>, Tensor<T>>
+    public fun StructureND<T>.qr(): Pair<StructureND<T>, StructureND<T>>
 
     /**
      * LUP decomposition
@@ -75,7 +75,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return triple of P, L and U tensors
      */
-    public fun StructureND<T>.lu(): Triple<Tensor<T>, Tensor<T>, Tensor<T>>
+    public fun StructureND<T>.lu(): Triple<StructureND<T>, StructureND<T>, StructureND<T>>
 
     /**
      * Singular Value Decomposition.
@@ -91,7 +91,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return triple `Triple(U, S, V)`.
      */
-    public fun StructureND<T>.svd(): Triple<Tensor<T>, Tensor<T>, Tensor<T>>
+    public fun StructureND<T>.svd(): Triple<StructureND<T>, StructureND<T>, StructureND<T>>
 
     /**
      * Returns eigenvalues and eigenvectors of a real symmetric matrix `input` or a batch of real symmetric matrices,
@@ -101,6 +101,6 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return a pair `eigenvalues to eigenvectors`
      */
-    public fun StructureND<T>.symEig(): Pair<Tensor<T>, Tensor<T>>
+    public fun StructureND<T>.symEig(): Pair<StructureND<T>, StructureND<T>>
 
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index 70b985a54..ec5d6f5e6 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.tensors.api
 
 import space.kscience.kmath.nd.RingOpsND
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.Ring
 
@@ -176,11 +177,13 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * Returns a tensor that is a transposed version of this tensor. The given dimensions [i] and [j] are swapped.
      * For more information: https://pytorch.org/docs/stable/generated/torch.transpose.html
      *
+     * If axis indices are negative, they are counted from shape end.
+     *
      * @param i the first dimension to be transposed
      * @param j the second dimension to be transposed
      * @return transposed tensor
      */
-    public fun Tensor<T>.transposed(i: Int = -2, j: Int = -1): Tensor<T>
+    public fun StructureND<T>.transposed(i: Int = shape.size - 2, j: Int = shape.size - 1): Tensor<T>
 
     /**
      * Returns a new tensor with the same data as the self tensor but of a different shape.
@@ -190,7 +193,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param shape the desired size
      * @return tensor with new shape
      */
-    public fun Tensor<T>.view(shape: IntArray): Tensor<T>
+    public fun Tensor<T>.view(shape: Shape): Tensor<T>
 
     /**
      * View this tensor as the same size as [other].
@@ -248,7 +251,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * are filled by [diagonalEntries]
      */
     public fun diagonalEmbedding(
-        diagonalEntries: Tensor<T>,
+        diagonalEntries: StructureND<T>,
         offset: Int = 0,
         dim1: Int = -2,
         dim2: Int = -1,
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index 53f77195c..c4266c669 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -7,6 +7,7 @@ package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.RowStrides
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.Strides
 import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.tensors.api.Tensor
@@ -15,7 +16,7 @@ import space.kscience.kmath.tensors.api.Tensor
  * Represents [Tensor] over a [MutableBuffer] intended to be used through [DoubleTensor] and [IntTensor]
  */
 public abstract class BufferedTensor<T>(
-    override val shape: IntArray,
+    override val shape: Shape,
 ) : Tensor<T> {
 
     public abstract val source: MutableBuffer<T>
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
index 470b6070b..3dfea7f8a 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -7,10 +7,7 @@ package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.MutableStructure2D
-import space.kscience.kmath.nd.MutableStructureND
-import space.kscience.kmath.nd.Shape
-import space.kscience.kmath.nd.Strides
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.core.internal.toPrettyString
 import kotlin.jvm.JvmInline
@@ -87,22 +84,30 @@ public inline fun OffsetDoubleBuffer.mapInPlace(operation: (Double) -> Double) {
  * [DoubleTensor] always uses row-based strides
  */
 public class DoubleTensor(
-    shape: IntArray,
+    shape: Shape,
     override val source: OffsetDoubleBuffer,
-) : BufferedTensor<Double>(shape) {
+) : BufferedTensor<Double>(shape), MutableStructureNDOfDouble {
 
     init {
         require(linearSize == source.size) { "Source buffer size must be equal tensor size" }
     }
 
-    public constructor(shape: IntArray, buffer: DoubleBuffer) : this(shape, OffsetDoubleBuffer(buffer, 0, buffer.size))
+    public constructor(shape: Shape, buffer: DoubleBuffer) : this(shape, OffsetDoubleBuffer(buffer, 0, buffer.size))
 
-    override fun get(index: IntArray): Double = this.source[indices.offset(index)]
 
+    @OptIn(PerformancePitfall::class)
+    override fun get(index: IntArray): Double = source[indices.offset(index)]
+
+    @OptIn(PerformancePitfall::class)
     override fun set(index: IntArray, value: Double) {
         source[indices.offset(index)] = value
     }
 
+    override fun getDouble(index: IntArray): Double = get(index)
+
+    override fun setDouble(index: IntArray, value: Double) {
+        set(index, value)
+    }
 
     override fun toString(): String = toPrettyString()
 }
@@ -140,25 +145,26 @@ public value class DoubleTensor2D(public val tensor: DoubleTensor) : MutableStru
 
     @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, Double>> = tensor.elements()
+    @OptIn(PerformancePitfall::class)
     override fun get(index: IntArray): Double = tensor[index]
     override val shape: Shape get() = tensor.shape
 }
 
 public fun DoubleTensor.asDoubleTensor2D(): DoubleTensor2D = DoubleTensor2D(this)
 
-public fun DoubleTensor.asDoubleBuffer(): OffsetDoubleBuffer = if(shape.size == 1){
+public fun DoubleTensor.asDoubleBuffer(): OffsetDoubleBuffer = if (shape.size == 1) {
     source
 } else {
-    error("Only 1D tensors could be cast to 1D" )
+    error("Only 1D tensors could be cast to 1D")
 }
 
 public inline fun DoubleTensor.forEachMatrix(block: (index: IntArray, matrix: DoubleTensor2D) -> Unit) {
     val n = shape.size
     check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
     val matrixOffset = shape[n - 1] * shape[n - 2]
-    val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
+    val matrixShape = Shape(shape[n - 2], shape[n - 1])
 
-    val size = Strides.linearSizeOf(matrixShape)
+    val size = matrixShape.linearSize
     for (i in 0 until linearSize / matrixOffset) {
         val offset = i * matrixOffset
         val index = indices.index(offset).sliceArray(0 until (shape.size - 2))
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 71e55a3b9..a022f31a6 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -11,7 +11,6 @@ package space.kscience.kmath.tensors.core
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
-import space.kscience.kmath.nd.Strides.Companion.linearSizeOf
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
@@ -93,7 +92,7 @@ public open class DoubleTensorAlgebra :
 
     override fun StructureND<Double>.valueOrNull(): Double? {
         val dt = asDoubleTensor()
-        return if (dt.shape contentEquals intArrayOf(1)) dt.source[0] else null
+        return if (dt.shape contentEquals Shape(1)) dt.source[0] else null
     }
 
     override fun StructureND<Double>.value(): Double = valueOrNull()
@@ -106,7 +105,7 @@ public open class DoubleTensorAlgebra :
      * @param array one-dimensional data array.
      * @return tensor with the [shape] shape and [array] data.
      */
-    public fun fromArray(shape: IntArray, array: DoubleArray): DoubleTensor {
+    public fun fromArray(shape: Shape, array: DoubleArray): DoubleTensor {
         checkNotEmptyShape(shape)
         checkEmptyDoubleBuffer(array)
         checkBufferShapeConsistency(shape, array)
@@ -120,18 +119,18 @@ public open class DoubleTensorAlgebra :
      * @param initializer mapping tensor indices to values.
      * @return tensor with the [shape] shape and data generated by the [initializer].
      */
-    override fun structureND(shape: IntArray, initializer: DoubleField.(IntArray) -> Double): DoubleTensor = fromArray(
+    override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): DoubleTensor = fromArray(
         shape,
         RowStrides(shape).asSequence().map { DoubleField.initializer(it) }.toMutableList().toDoubleArray()
     )
 
     override fun Tensor<Double>.getTensor(i: Int): DoubleTensor {
         val dt = asDoubleTensor()
-        val lastShape = shape.drop(1).toIntArray()
-        val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
+        val lastShape = shape.last(shape.size - 1)
+        val newShape: Shape = if (lastShape.isNotEmpty()) lastShape else Shape(1)
         return DoubleTensor(
             newShape,
-            dt.source.view(newShape.reduce(Int::times) * i, linearSizeOf(newShape))
+            dt.source.view(newShape.linearSize * i, newShape.linearSize)
         )
     }
 
@@ -142,9 +141,9 @@ public open class DoubleTensorAlgebra :
      * @param shape array of integers defining the shape of the output tensor.
      * @return tensor with the [shape] shape and filled with [value].
      */
-    public fun full(value: Double, shape: IntArray): DoubleTensor {
+    public fun full(value: Double, shape: Shape): DoubleTensor {
         checkNotEmptyShape(shape)
-        val buffer = DoubleBuffer(shape.reduce(Int::times)) { value }
+        val buffer = DoubleBuffer(shape.linearSize) { value }
         return DoubleTensor(shape, buffer)
     }
 
@@ -166,7 +165,7 @@ public open class DoubleTensorAlgebra :
      * @param shape array of integers defining the shape of the output tensor.
      * @return tensor filled with the scalar value `0.0`, with the [shape] shape.
      */
-    public fun zeros(shape: IntArray): DoubleTensor = full(0.0, shape)
+    public fun zeros(shape: Shape): DoubleTensor = full(0.0, shape)
 
     /**
      * Returns a tensor filled with the scalar value `0.0`, with the same shape as a given array.
@@ -181,7 +180,7 @@ public open class DoubleTensorAlgebra :
      * @param shape array of integers defining the shape of the output tensor.
      * @return tensor filled with the scalar value `1.0`, with the [shape] shape.
      */
-    public fun ones(shape: IntArray): DoubleTensor = full(1.0, shape)
+    public fun ones(shape: Shape): DoubleTensor = full(1.0, shape)
 
     /**
      * Returns a tensor filled with the scalar value `1.0`, with the same shape as a given array.
@@ -197,7 +196,7 @@ public open class DoubleTensorAlgebra :
      * @return a 2-D tensor with ones on the diagonal and zeros elsewhere.
      */
     public fun eye(n: Int): DoubleTensor {
-        val shape = intArrayOf(n, n)
+        val shape = Shape(n, n)
         val buffer = DoubleBuffer(n * n) { 0.0 }
         val res = DoubleTensor(shape, buffer)
         for (i in 0 until n) {
@@ -235,7 +234,7 @@ public open class DoubleTensorAlgebra :
 
     override fun Tensor<Double>.minusAssign(arg: StructureND<Double>) {
         checkShapesCompatible(this, arg)
-        mapIndexedInPlace { index, value -> value - arg[index] }
+        mapIndexedInPlace { index, value -> value - arg.getDouble(index) }
     }
 
     override fun Double.times(arg: StructureND<Double>): DoubleTensor = arg.map { this@times * it }
@@ -270,32 +269,44 @@ public open class DoubleTensorAlgebra :
 
     override fun StructureND<Double>.unaryMinus(): DoubleTensor = map { -it }
 
-    override fun Tensor<Double>.transposed(i: Int, j: Int): DoubleTensor {
-        // TODO change strides instead of changing content
-        val dt = asDoubleTensor()
-        val ii = dt.minusIndex(i)
-        val jj = dt.minusIndex(j)
-        checkTranspose(dt.dimension, ii, jj)
-        val n = dt.linearSize
-        val resBuffer = DoubleArray(n)
-
-        val resShape = dt.shape.copyOf()
-        resShape[ii] = resShape[jj].also { resShape[jj] = resShape[ii] }
-
-        val resTensor = DoubleTensor(resShape, resBuffer.asBuffer())
-
-        for (offset in 0 until n) {
-            val oldMultiIndex = dt.indices.index(offset)
-            val newMultiIndex = oldMultiIndex.copyOf()
-            newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
-
-            val linearIndex = resTensor.indices.offset(newMultiIndex)
-            resTensor.source[linearIndex] = dt.source[offset]
+    override fun StructureND<Double>.transposed(i: Int, j: Int): Tensor<Double> {
+        val actualI = if (i >= 0) i else shape.size + i
+        val actualJ = if(j>=0) j else shape.size + j
+        return asDoubleTensor().permute(
+            shape.transposed(actualI, actualJ)
+        ) { originIndex ->
+            originIndex.copyOf().apply {
+                val ith = get(actualI)
+                val jth = get(actualJ)
+                set(actualI, jth)
+                set(actualJ, ith)
+            }
         }
-        return resTensor
+//        // TODO change strides instead of changing content
+//        val dt = asDoubleTensor()
+//        val ii = dt.minusIndex(i)
+//        val jj = dt.minusIndex(j)
+//        checkTranspose(dt.dimension, ii, jj)
+//        val n = dt.linearSize
+//        val resBuffer = DoubleArray(n)
+//
+//        val resShape = dt.shape.copyOf()
+//        resShape[ii] = resShape[jj].also { resShape[jj] = resShape[ii] }
+//
+//        val resTensor = DoubleTensor(resShape, resBuffer.asBuffer())
+//
+//        for (offset in 0 until n) {
+//            val oldMultiIndex = dt.indices.index(offset)
+//            val newMultiIndex = oldMultiIndex.copyOf()
+//            newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
+//
+//            val linearIndex = resTensor.indices.offset(newMultiIndex)
+//            resTensor.source[linearIndex] = dt.source[offset]
+//        }
+//        return resTensor
     }
 
-    override fun Tensor<Double>.view(shape: IntArray): DoubleTensor {
+    override fun Tensor<Double>.view(shape: Shape): DoubleTensor {
         checkView(asDoubleTensor(), shape)
         return DoubleTensor(shape, asDoubleTensor().source)
     }
@@ -335,7 +346,7 @@ public open class DoubleTensorAlgebra :
     @UnstableKMathAPI
     public infix fun StructureND<Double>.matmul(other: StructureND<Double>): DoubleTensor {
         if (shape.size == 1 && other.shape.size == 1) {
-            return DoubleTensor(intArrayOf(1), DoubleBuffer(times(other).sum()))
+            return DoubleTensor(Shape(1), DoubleBuffer(times(other).sum()))
         }
 
         var penultimateDim = false
@@ -347,7 +358,7 @@ public open class DoubleTensorAlgebra :
 
         if (shape.size == 1) {
             penultimateDim = true
-            newThis = newThis.view(intArrayOf(1) + shape)
+            newThis = newThis.view(Shape(1) + shape)
         }
 
         if (other.shape.size == 1) {
@@ -367,8 +378,8 @@ public open class DoubleTensorAlgebra :
             "Tensors dot operation dimension mismatch: ($l, $m1) x ($m2, $n)"
         }
 
-        val resShape = newThis.shape.sliceArray(0..(newThis.shape.size - 2)) + intArrayOf(newOther.shape.last())
-        val resSize = resShape.reduce { acc, i -> acc * i }
+        val resShape = newThis.shape.slice(0..(newThis.shape.size - 2)) + intArrayOf(newOther.shape.last())
+        val resSize = resShape.linearSize
         val resTensor = DoubleTensor(resShape, DoubleArray(resSize).asBuffer())
 
         val resMatrices = resTensor.matrices
@@ -385,9 +396,9 @@ public open class DoubleTensorAlgebra :
 //        }
 
         return if (penultimateDim) {
-            resTensor.view(resTensor.shape.dropLast(2).toIntArray() + intArrayOf(resTensor.shape.last()))
+            resTensor.view(resTensor.shape.first(resTensor.shape.size - 2) + Shape(resTensor.shape.last()))
         } else if (lastDim) {
-            resTensor.view(resTensor.shape.dropLast(1).toIntArray())
+            resTensor.view(resTensor.shape.first(resTensor.shape.size - 1))
         } else {
             resTensor
         }
@@ -399,7 +410,7 @@ public open class DoubleTensorAlgebra :
     }
 
     override fun diagonalEmbedding(
-        diagonalEntries: Tensor<Double>,
+        diagonalEntries: StructureND<Double>,
         offset: Int,
         dim1: Int,
         dim2: Int,
@@ -423,11 +434,11 @@ public open class DoubleTensorAlgebra :
             lessDim = greaterDim.also { greaterDim = lessDim }
         }
 
-        val resShape = diagonalEntries.shape.slice(0 until lessDim).toIntArray() +
+        val resShape = diagonalEntries.shape.slice(0 until lessDim) +
                 intArrayOf(diagonalEntries.shape[n - 1] + abs(realOffset)) +
-                diagonalEntries.shape.slice(lessDim until greaterDim - 1).toIntArray() +
+                diagonalEntries.shape.slice(lessDim until greaterDim - 1) +
                 intArrayOf(diagonalEntries.shape[n - 1] + abs(realOffset)) +
-                diagonalEntries.shape.slice(greaterDim - 1 until n - 1).toIntArray()
+                diagonalEntries.shape.slice(greaterDim - 1 until n - 1)
         val resTensor: DoubleTensor = zeros(resShape)
 
         for (i in 0 until diagonalEntries.indices.linearSize) {
@@ -495,8 +506,8 @@ public open class DoubleTensorAlgebra :
      * @return tensor of a given shape filled with numbers from the normal distribution
      * with `0.0` mean and `1.0` standard deviation.
      */
-    public fun randomNormal(shape: IntArray, seed: Long = 0): DoubleTensor =
-        DoubleTensor(shape, DoubleBuffer.randomNormals(shape.reduce(Int::times), seed))
+    public fun randomNormal(shape: Shape, seed: Long = 0): DoubleTensor =
+        DoubleTensor(shape, DoubleBuffer.randomNormals(shape.linearSize, seed))
 
     /**
      * Returns a tensor with the same shape as `input` of random numbers drawn from normal distributions
@@ -508,7 +519,7 @@ public open class DoubleTensorAlgebra :
      * with `0.0` mean and `1.0` standard deviation.
      */
     public fun Tensor<Double>.randomNormalLike(seed: Long = 0): DoubleTensor =
-        DoubleTensor(shape, DoubleBuffer.randomNormals(shape.reduce(Int::times), seed))
+        DoubleTensor(shape, DoubleBuffer.randomNormals(shape.linearSize, seed))
 
     /**
      * Concatenates a sequence of tensors with equal shapes along the first dimension.
@@ -520,7 +531,7 @@ public open class DoubleTensorAlgebra :
         check(tensors.isNotEmpty()) { "List must have at least 1 element" }
         val shape = tensors[0].shape
         check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
-        val resShape = intArrayOf(tensors.size) + shape
+        val resShape = Shape(tensors.size) + shape
 //        val resBuffer: List<Double> = tensors.flatMap {
 //            it.asDoubleTensor().source.array.drop(it.asDoubleTensor().bufferStart)
 //                .take(it.asDoubleTensor().linearSize)
@@ -545,11 +556,11 @@ public open class DoubleTensorAlgebra :
     ): DoubleTensor {
         check(dim < dimension) { "Dimension $dim out of range $dimension" }
         val resShape = if (keepDim) {
-            shape.take(dim).toIntArray() + intArrayOf(1) + shape.takeLast(dimension - dim - 1).toIntArray()
+            shape.first(dim) + intArrayOf(1) + shape.last(dimension - dim - 1)
         } else {
-            shape.take(dim).toIntArray() + shape.takeLast(dimension - dim - 1).toIntArray()
+            shape.first(dim) + shape.last(dimension - dim - 1)
         }
-        val resNumElements = resShape.reduce(Int::times)
+        val resNumElements = resShape.linearSize
         val init = foldFunction(DoubleArray(1) { 0.0 })
         val resTensor = DoubleTensor(
             resShape,
@@ -573,11 +584,11 @@ public open class DoubleTensorAlgebra :
     ): IntTensor {
         check(dim < dimension) { "Dimension $dim out of range $dimension" }
         val resShape = if (keepDim) {
-            shape.take(dim).toIntArray() + intArrayOf(1) + shape.takeLast(dimension - dim - 1).toIntArray()
+            shape.first(dim) + intArrayOf(1) + shape.last(dimension - dim - 1)
         } else {
-            shape.take(dim).toIntArray() + shape.takeLast(dimension - dim - 1).toIntArray()
+            shape.first(dim) + shape.last(dimension - dim - 1)
         }
-        val resNumElements = resShape.reduce(Int::times)
+        val resNumElements = resShape.linearSize
         val init = foldFunction(DoubleArray(1) { 0.0 })
         val resTensor = IntTensor(
             resShape,
@@ -674,9 +685,9 @@ public open class DoubleTensorAlgebra :
         check(tensors.isNotEmpty()) { "List must have at least 1 element" }
         val n = tensors.size
         val m = tensors[0].shape[0]
-        check(tensors.all { it.shape contentEquals intArrayOf(m) }) { "Tensors must have same shapes" }
+        check(tensors.all { it.shape contentEquals Shape(m) }) { "Tensors must have same shapes" }
         val resTensor = DoubleTensor(
-            intArrayOf(n, n),
+            Shape(n, n),
             DoubleBuffer(n * n) { 0.0 }
         )
         for (i in 0 until n) {
@@ -772,7 +783,7 @@ public open class DoubleTensorAlgebra :
     ): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
         checkSquareMatrix(luTensor.shape)
         check(
-            luTensor.shape.dropLast(2).toIntArray() contentEquals pivotsTensor.shape.dropLast(1).toIntArray() ||
+            luTensor.shape.first(luTensor.shape.size - 2) contentEquals pivotsTensor.shape.first(pivotsTensor.shape.size - 1) ||
                     luTensor.shape.last() == pivotsTensor.shape.last() - 1
         ) { "Inappropriate shapes of input tensors" }
 
@@ -843,9 +854,10 @@ public open class DoubleTensorAlgebra :
         return qTensor to rTensor
     }
 
-    override fun StructureND<Double>.svd(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> =
+    override fun StructureND<Double>.svd(): Triple<StructureND<Double>, StructureND<Double>, StructureND<Double>> =
         svd(epsilon = 1e-10)
 
+
     /**
      * Singular Value Decomposition.
      *
@@ -859,13 +871,13 @@ public open class DoubleTensorAlgebra :
      * i.e., the precision with which the cosine approaches 1 in an iterative algorithm.
      * @return a triple `Triple(U, S, V)`.
      */
-    public fun StructureND<Double>.svd(epsilon: Double): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+    public fun StructureND<Double>.svd(epsilon: Double): Triple<StructureND<Double>, StructureND<Double>, StructureND<Double>> {
         val size = dimension
-        val commonShape = shape.sliceArray(0 until size - 2)
-        val (n, m) = shape.sliceArray(size - 2 until size)
-        val uTensor = zeros(commonShape + intArrayOf(min(n, m), n))
-        val sTensor = zeros(commonShape + intArrayOf(min(n, m)))
-        val vTensor = zeros(commonShape + intArrayOf(min(n, m), m))
+        val commonShape = shape.slice(0 until size - 2)
+        val (n, m) = shape.slice(size - 2 until size)
+        val uTensor = zeros(commonShape + Shape(min(n, m), n))
+        val sTensor = zeros(commonShape + Shape(min(n, m)))
+        val vTensor = zeros(commonShape + Shape(min(n, m), m))
 
         val matrices = asDoubleTensor().matrices
         val uTensors = uTensor.matrices
@@ -879,7 +891,7 @@ public open class DoubleTensorAlgebra :
                 sTensorVectors[index],
                 vTensors[index]
             )
-            val matrixSize = matrix.shape.reduce { acc, i -> acc * i }
+            val matrixSize = matrix.shape.linearSize
             val curMatrix = DoubleTensor(
                 matrix.shape,
                 matrix.source.view(0, matrixSize)
@@ -901,7 +913,7 @@ public open class DoubleTensorAlgebra :
      * and when the cosine approaches 1 in the SVD algorithm.
      * @return a pair `eigenvalues to eigenvectors`.
      */
-    public fun StructureND<Double>.symEigSvd(epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
+    public fun StructureND<Double>.symEigSvd(epsilon: Double): Pair<DoubleTensor, StructureND<Double>> {
         //TODO optimize conversion
         checkSymmetric(asDoubleTensor(), epsilon)
 
@@ -925,7 +937,7 @@ public open class DoubleTensorAlgebra :
             matrix.asDoubleTensor2D().cleanSym(n)
         }
 
-        val eig = (utv dot s.view(shp)).view(s.shape)
+        val eig = (utv dot s.asDoubleTensor().view(shp)).view(s.shape)
         return eig to v
     }
 
@@ -934,8 +946,8 @@ public open class DoubleTensorAlgebra :
         checkSymmetric(asDoubleTensor(), epsilon)
 
         val size = this.dimension
-        val eigenvectors = zeros(this.shape)
-        val eigenvalues = zeros(this.shape.sliceArray(0 until size - 1))
+        val eigenvectors = zeros(shape)
+        val eigenvalues = zeros(shape.slice(0 until size - 1))
 
         var eigenvalueStart = 0
         var eigenvectorStart = 0
@@ -976,9 +988,11 @@ public open class DoubleTensorAlgebra :
 
         val n = shape.size
 
-        val detTensorShape = IntArray(n - 1) { i -> shape[i] }
-        detTensorShape[n - 2] = 1
-        val resBuffer = DoubleBuffer(detTensorShape.reduce(Int::times)) { 0.0 }
+        val detTensorShape = Shape(IntArray(n - 1) { i -> shape[i] }.apply {
+            set(n - 2, 1)
+        })
+
+        val resBuffer = DoubleBuffer(detTensorShape.linearSize) { 0.0 }
 
         val detTensor = DoubleTensor(
             detTensorShape,
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
index ed96b6c8f..a99773f84 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.structures.*
 
 /**
@@ -73,7 +75,7 @@ public inline fun OffsetIntBuffer.mapInPlace(operation: (Int) -> Int) {
  * Default [BufferedTensor] implementation for [Int] values
  */
 public class IntTensor(
-    shape: IntArray,
+    shape: Shape,
     override val source: OffsetIntBuffer,
 ) : BufferedTensor<Int>(shape) {
 
@@ -81,10 +83,12 @@ public class IntTensor(
         require(linearSize == source.size) { "Source buffer size must be equal tensor size" }
     }
 
-    public constructor(shape: IntArray, buffer: IntBuffer) : this(shape, OffsetIntBuffer(buffer, 0, buffer.size))
+    public constructor(shape: Shape, buffer: IntBuffer) : this(shape, OffsetIntBuffer(buffer, 0, buffer.size))
 
+    @OptIn(PerformancePitfall::class)
     override fun get(index: IntArray): Int = this.source[indices.offset(index)]
 
+    @OptIn(PerformancePitfall::class)
     override fun set(index: IntArray, value: Int) {
         source[indices.offset(index)] = value
     }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
index 3b00744a1..86199d19b 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
@@ -23,6 +23,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
 
     public companion object : IntTensorAlgebra()
 
+
     override val elementAlgebra: IntRing get() = IntRing
 
 
@@ -88,7 +89,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
 
     override fun StructureND<Int>.valueOrNull(): Int? {
         val dt = asIntTensor()
-        return if (dt.shape contentEquals intArrayOf(1)) dt.source[0] else null
+        return if (dt.shape contentEquals Shape(1)) dt.source[0] else null
     }
 
     override fun StructureND<Int>.value(): Int = valueOrNull()
@@ -101,11 +102,11 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @param array one-dimensional data array.
      * @return tensor with the [shape] shape and [array] data.
      */
-    public fun fromArray(shape: IntArray, array: IntArray): IntTensor {
+    public fun fromArray(shape: Shape, array: IntArray): IntTensor {
         checkNotEmptyShape(shape)
         check(array.isNotEmpty()) { "Illegal empty buffer provided" }
-        check(array.size == shape.reduce(Int::times)) {
-            "Inconsistent shape ${shape.toList()} for buffer of size ${array.size} provided"
+        check(array.size == shape.linearSize) {
+            "Inconsistent shape ${shape} for buffer of size ${array.size} provided"
         }
         return IntTensor(shape, array.asBuffer())
     }
@@ -117,16 +118,16 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @param initializer mapping tensor indices to values.
      * @return tensor with the [shape] shape and data generated by the [initializer].
      */
-    override fun structureND(shape: IntArray, initializer: IntRing.(IntArray) -> Int): IntTensor = fromArray(
+    override fun structureND(shape: Shape, initializer: IntRing.(IntArray) -> Int): IntTensor = fromArray(
         shape,
         RowStrides(shape).asSequence().map { IntRing.initializer(it) }.toMutableList().toIntArray()
     )
 
     override fun Tensor<Int>.getTensor(i: Int): IntTensor {
         val dt = asIntTensor()
-        val lastShape = shape.drop(1).toIntArray()
-        val newShape = if (lastShape.isNotEmpty()) lastShape else intArrayOf(1)
-        return IntTensor(newShape, dt.source.view(newShape.reduce(Int::times) * i))
+        val lastShape = shape.last(shape.size - 1)
+        val newShape = if (lastShape.isNotEmpty()) lastShape else Shape(1)
+        return IntTensor(newShape, dt.source.view(newShape.linearSize * i))
     }
 
     /**
@@ -136,9 +137,9 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @param shape array of integers defining the shape of the output tensor.
      * @return tensor with the [shape] shape and filled with [value].
      */
-    public fun full(value: Int, shape: IntArray): IntTensor {
+    public fun full(value: Int, shape: Shape): IntTensor {
         checkNotEmptyShape(shape)
-        val buffer = IntBuffer(shape.reduce(Int::times)) { value }
+        val buffer = IntBuffer(shape.linearSize) { value }
         return IntTensor(shape, buffer)
     }
 
@@ -160,7 +161,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @param shape array of integers defining the shape of the output tensor.
      * @return tensor filled with the scalar value `0`, with the [shape] shape.
      */
-    public fun zeros(shape: IntArray): IntTensor = full(0, shape)
+    public fun zeros(shape: Shape): IntTensor = full(0, shape)
 
     /**
      * Returns a tensor filled with the scalar value `0`, with the same shape as a given array.
@@ -175,7 +176,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @param shape array of integers defining the shape of the output tensor.
      * @return tensor filled with the scalar value `1`, with the [shape] shape.
      */
-    public fun ones(shape: IntArray): IntTensor = full(1, shape)
+    public fun ones(shape: Shape): IntTensor = full(1, shape)
 
     /**
      * Returns a tensor filled with the scalar value `1`, with the same shape as a given array.
@@ -191,7 +192,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @return a 2-D tensor with ones on the diagonal and zeros elsewhere.
      */
     public fun eye(n: Int): IntTensor {
-        val shape = intArrayOf(n, n)
+        val shape = Shape(n, n)
         val buffer = IntBuffer(n * n) { 0 }
         val res = IntTensor(shape, buffer)
         for (i in 0 until n) {
@@ -249,32 +250,44 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
 
     override fun StructureND<Int>.unaryMinus(): IntTensor = map { -it }
 
-    override fun Tensor<Int>.transposed(i: Int, j: Int): IntTensor {
-        // TODO change strides instead of changing content
-        val dt = asIntTensor()
-        val ii = dt.minusIndex(i)
-        val jj = dt.minusIndex(j)
-        checkTranspose(dt.dimension, ii, jj)
-        val n = dt.linearSize
-        val resBuffer = IntArray(n)
-
-        val resShape = dt.shape.copyOf()
-        resShape[ii] = resShape[jj].also { resShape[jj] = resShape[ii] }
-
-        val resTensor = IntTensor(resShape, resBuffer.asBuffer())
-
-        for (offset in 0 until n) {
-            val oldMultiIndex = dt.indices.index(offset)
-            val newMultiIndex = oldMultiIndex.copyOf()
-            newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
-
-            val linearIndex = resTensor.indices.offset(newMultiIndex)
-            resTensor.source[linearIndex] = dt.source[offset]
+    override fun StructureND<Int>.transposed(i: Int, j: Int): Tensor<Int> {
+        val actualI = if (i >= 0) i else shape.size + i
+        val actualJ = if(j>=0) j else shape.size + j
+        return asIntTensor().permute(
+            shape.transposed(actualI, actualJ)
+        ) { originIndex ->
+            originIndex.copyOf().apply {
+                val ith = get(actualI)
+                val jth = get(actualJ)
+                set(actualI, jth)
+                set(actualJ, ith)
+            }
         }
-        return resTensor
+//        // TODO change strides instead of changing content
+//        val dt = asIntTensor()
+//        val ii = dt.minusIndex(i)
+//        val jj = dt.minusIndex(j)
+//        checkTranspose(dt.dimension, ii, jj)
+//        val n = dt.linearSize
+//        val resBuffer = IntArray(n)
+//
+//        val resShape = dt.shape.toArray()
+//        resShape[ii] = resShape[jj].also { resShape[jj] = resShape[ii] }
+//
+//        val resTensor = IntTensor(Shape(resShape), resBuffer.asBuffer())
+//
+//        for (offset in 0 until n) {
+//            val oldMultiIndex = dt.indices.index(offset)
+//            val newMultiIndex = oldMultiIndex.copyOf()
+//            newMultiIndex[ii] = newMultiIndex[jj].also { newMultiIndex[jj] = newMultiIndex[ii] }
+//
+//            val linearIndex = resTensor.indices.offset(newMultiIndex)
+//            resTensor.source[linearIndex] = dt.source[offset]
+//        }
+//        return resTensor
     }
 
-    override fun Tensor<Int>.view(shape: IntArray): IntTensor {
+    override fun Tensor<Int>.view(shape: Shape): IntTensor {
         checkView(asIntTensor(), shape)
         return IntTensor(shape, asIntTensor().source)
     }
@@ -287,7 +300,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
     }
 
     override fun diagonalEmbedding(
-        diagonalEntries: Tensor<Int>,
+        diagonalEntries: StructureND<Int>,
         offset: Int,
         dim1: Int,
         dim2: Int,
@@ -311,11 +324,11 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
             lessDim = greaterDim.also { greaterDim = lessDim }
         }
 
-        val resShape = diagonalEntries.shape.slice(0 until lessDim).toIntArray() +
+        val resShape = diagonalEntries.shape.slice(0 until lessDim) +
                 intArrayOf(diagonalEntries.shape[n - 1] + abs(realOffset)) +
-                diagonalEntries.shape.slice(lessDim until greaterDim - 1).toIntArray() +
+                diagonalEntries.shape.slice(lessDim until greaterDim - 1) +
                 intArrayOf(diagonalEntries.shape[n - 1] + abs(realOffset)) +
-                diagonalEntries.shape.slice(greaterDim - 1 until n - 1).toIntArray()
+                diagonalEntries.shape.slice(greaterDim - 1 until n - 1)
         val resTensor = zeros(resShape)
 
         for (i in 0 until diagonalEntries.asIntTensor().linearSize) {
@@ -375,7 +388,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
         check(tensors.isNotEmpty()) { "List must have at least 1 element" }
         val shape = tensors[0].shape
         check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
-        val resShape = intArrayOf(tensors.size) + shape
+        val resShape = Shape(tensors.size) + shape
 //        val resBuffer: List<Int> = tensors.flatMap {
 //            it.asIntTensor().source.array.drop(it.asIntTensor().bufferStart)
 //                .take(it.asIntTensor().linearSize)
@@ -399,11 +412,11 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
     ): IntTensor {
         check(dim < dimension) { "Dimension $dim out of range $dimension" }
         val resShape = if (keepDim) {
-            shape.take(dim).toIntArray() + intArrayOf(1) + shape.takeLast(dimension - dim - 1).toIntArray()
+            shape.first(dim) + intArrayOf(1) + shape.last(dimension - dim - 1)
         } else {
-            shape.take(dim).toIntArray() + shape.takeLast(dimension - dim - 1).toIntArray()
+            shape.first(dim) + shape.last(dimension - dim - 1)
         }
-        val resNumElements = resShape.reduce(Int::times)
+        val resNumElements = resShape.linearSize
         val init = foldFunction(IntArray(1) { 0 })
         val resTensor = IntTensor(
             resShape,
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
index fee62c79c..dcb16b755 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.tensors.core.internal
 
+import space.kscience.kmath.misc.UnsafeKMathAPI
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.tensors.core.DoubleTensor
 import kotlin.math.max
@@ -12,7 +14,7 @@ import kotlin.math.max
 internal fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: DoubleTensor, linearSize: Int) {
     for (linearIndex in 0 until linearSize) {
         val totalMultiIndex = resTensor.indices.index(linearIndex)
-        val curMultiIndex = tensor.shape.copyOf()
+        val curMultiIndex = tensor.shape.toArray()
 
         val offset = totalMultiIndex.size - curMultiIndex.size
 
@@ -30,7 +32,7 @@ internal fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: DoubleTenso
     }
 }
 
-internal fun broadcastShapes(vararg shapes: IntArray): IntArray {
+internal fun broadcastShapes(shapes: List<Shape>): Shape {
     var totalDim = 0
     for (shape in shapes) {
         totalDim = max(totalDim, shape.size)
@@ -55,15 +57,15 @@ internal fun broadcastShapes(vararg shapes: IntArray): IntArray {
         }
     }
 
-    return totalShape
+    return Shape(totalShape)
 }
 
-internal fun broadcastTo(tensor: DoubleTensor, newShape: IntArray): DoubleTensor {
+internal fun broadcastTo(tensor: DoubleTensor, newShape: Shape): DoubleTensor {
     require(tensor.shape.size <= newShape.size) {
         "Tensor is not compatible with the new shape"
     }
 
-    val n = newShape.reduce { acc, i -> acc * i }
+    val n = newShape.linearSize
     val resTensor = DoubleTensor(newShape, DoubleArray(n).asBuffer())
 
     for (i in tensor.shape.indices) {
@@ -79,8 +81,8 @@ internal fun broadcastTo(tensor: DoubleTensor, newShape: IntArray): DoubleTensor
 }
 
 internal fun broadcastTensors(vararg tensors: DoubleTensor): List<DoubleTensor> {
-    val totalShape = broadcastShapes(*(tensors.map { it.shape }).toTypedArray())
-    val n = totalShape.reduce { acc, i -> acc * i }
+    val totalShape = broadcastShapes(tensors.map { it.shape })
+    val n = totalShape.linearSize
 
     return tensors.map { tensor ->
         val resTensor = DoubleTensor(totalShape, DoubleArray(n).asBuffer())
@@ -100,12 +102,12 @@ internal fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTen
         return tensors.asList()
     }
 
-    val totalShape = broadcastShapes(*(tensors.map { it.shape.sliceArray(0..it.shape.size - 3) }).toTypedArray())
-    val n = totalShape.reduce { acc, i -> acc * i }
+    val totalShape = broadcastShapes(tensors.map { it.shape.slice(0..it.shape.size - 3) })
+    val n = totalShape.linearSize
 
     return buildList {
         for (tensor in tensors) {
-            val matrixShape = tensor.shape.sliceArray(tensor.shape.size - 2 until tensor.shape.size).copyOf()
+            val matrixShape = tensor.shape.slice(tensor.shape.size - 2 until tensor.shape.size)
             val matrixSize = matrixShape[0] * matrixShape[1]
             val matrix = DoubleTensor(matrixShape, DoubleArray(matrixSize).asBuffer())
 
@@ -114,10 +116,11 @@ internal fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTen
 
             for (linearIndex in 0 until n) {
                 val totalMultiIndex = outerTensor.indices.index(linearIndex)
-                var curMultiIndex = tensor.shape.sliceArray(0..tensor.shape.size - 3).copyOf()
+                @OptIn(UnsafeKMathAPI::class)
+                var curMultiIndex = tensor.shape.slice(0..tensor.shape.size - 3).asArray()
                 curMultiIndex = IntArray(totalMultiIndex.size - curMultiIndex.size) { 1 } + curMultiIndex
 
-                val newTensor = DoubleTensor(curMultiIndex + matrixShape, tensor.source)
+                val newTensor = DoubleTensor(Shape(curMultiIndex) + matrixShape, tensor.source)
 
                 for (i in curMultiIndex.indices) {
                     if (curMultiIndex[i] != 1) {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index f19ee8f3d..33724764f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -5,15 +5,18 @@
 
 package space.kscience.kmath.tensors.core.internal
 
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.contentEquals
+import space.kscience.kmath.nd.linearSize
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.asDoubleTensor
 
 
-internal fun checkNotEmptyShape(shape: IntArray) =
-    check(shape.isNotEmpty()) {
+internal fun checkNotEmptyShape(shape: Shape) =
+    check(shape.size > 0) {
         "Illegal empty shape provided"
     }
 
@@ -21,15 +24,15 @@ internal fun checkEmptyDoubleBuffer(buffer: DoubleArray) = check(buffer.isNotEmp
     "Illegal empty buffer provided"
 }
 
-internal fun checkBufferShapeConsistency(shape: IntArray, buffer: DoubleArray) =
-    check(buffer.size == shape.reduce(Int::times)) {
-        "Inconsistent shape ${shape.toList()} for buffer of size ${buffer.size} provided"
+internal fun checkBufferShapeConsistency(shape: Shape, buffer: DoubleArray) =
+    check(buffer.size == shape.linearSize) {
+        "Inconsistent shape ${shape} for buffer of size ${buffer.size} provided"
     }
 
 @PublishedApi
 internal fun <T> checkShapesCompatible(a: StructureND<T>, b: StructureND<T>): Unit =
     check(a.shape contentEquals b.shape) {
-        "Incompatible shapes ${a.shape.toList()} and ${b.shape.toList()} "
+        "Incompatible shapes ${a.shape} and ${b.shape} "
     }
 
 internal fun checkTranspose(dim: Int, i: Int, j: Int) =
@@ -37,10 +40,10 @@ internal fun checkTranspose(dim: Int, i: Int, j: Int) =
         "Cannot transpose $i to $j for a tensor of dim $dim"
     }
 
-internal fun <T> checkView(a: Tensor<T>, shape: IntArray) =
-    check(a.shape.reduce(Int::times) == shape.reduce(Int::times))
+internal fun <T> checkView(a: Tensor<T>, shape: Shape) =
+    check(a.shape.linearSize == shape.linearSize)
 
-internal fun checkSquareMatrix(shape: IntArray) {
+internal fun checkSquareMatrix(shape: Shape) {
     val n = shape.size
     check(n >= 2) {
         "Expected tensor with 2 or more dimensions, got size $n instead"
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
index 22047e458..1c6e5edfb 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
@@ -6,7 +6,6 @@
 package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.nd.*
-import space.kscience.kmath.nd.Strides.Companion.linearSizeOf
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.structures.indices
@@ -40,7 +39,7 @@ internal fun MutableStructure2D<Double>.jacobiHelper(
         source[i * shape[0] + j] = value
     }
 
-    fun maxOffDiagonal(matrix: BufferedTensor<Double>): Double {
+    fun maxOffDiagonal(matrix: DoubleTensor): Double {
         var maxOffDiagonalElement = 0.0
         for (i in 0 until n - 1) {
             for (j in i + 1 until n) {
@@ -50,7 +49,7 @@ internal fun MutableStructure2D<Double>.jacobiHelper(
         return maxOffDiagonalElement
     }
 
-    fun rotate(a: BufferedTensor<Double>, s: Double, tau: Double, i: Int, j: Int, k: Int, l: Int) {
+    fun rotate(a: DoubleTensor, s: Double, tau: Double, i: Int, j: Int, k: Int, l: Int) {
         val g = a[i, j]
         val h = a[k, l]
         a[i, j] = g - s * (h + g * tau)
@@ -58,8 +57,8 @@ internal fun MutableStructure2D<Double>.jacobiHelper(
     }
 
     fun jacobiIteration(
-        a: BufferedTensor<Double>,
-        v: BufferedTensor<Double>,
+        a: DoubleTensor,
+        v: DoubleTensor,
         d: DoubleBuffer,
         z: DoubleBuffer,
     ) {
@@ -157,7 +156,7 @@ internal val DoubleTensor.vectors: List<DoubleTensor>
     get() {
         val n = shape.size
         val vectorOffset = shape[n - 1]
-        val vectorShape = intArrayOf(shape.last())
+        val vectorShape = Shape(shape.last())
 
         return List(linearSize / vectorOffset) { index ->
             val offset = index * vectorOffset
@@ -174,9 +173,9 @@ internal val DoubleTensor.matrices: List<DoubleTensor>
         val n = shape.size
         check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
         val matrixOffset = shape[n - 1] * shape[n - 2]
-        val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
+        val matrixShape = Shape(shape[n - 2], shape[n - 1])
 
-        val size = linearSizeOf(matrixShape)
+        val size = matrixShape.linearSize
 
         return List(linearSize / matrixOffset) { index ->
             val offset = index * matrixOffset
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
index f938d1c61..2513dedb7 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
@@ -5,6 +5,9 @@
 
 package space.kscience.kmath.tensors.core.internal
 
+import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.first
+import space.kscience.kmath.nd.last
 import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.IntBuffer
 import space.kscience.kmath.structures.VirtualBuffer
@@ -35,7 +38,7 @@ internal fun List<OffsetIntBuffer>.concat(): IntBuffer {
 internal fun IntTensor.vectors(): VirtualBuffer<IntTensor> {
     val n = shape.size
     val vectorOffset = shape[n - 1]
-    val vectorShape = intArrayOf(shape.last())
+    val vectorShape = shape.last(1)
 
     return VirtualBuffer(linearSize / vectorOffset) { index ->
         val offset = index * vectorOffset
@@ -52,7 +55,7 @@ internal val IntTensor.matrices: VirtualBuffer<IntTensor>
         val n = shape.size
         check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
         val matrixOffset = shape[n - 1] * shape[n - 2]
-        val matrixShape = intArrayOf(shape[n - 2], shape[n - 1])
+        val matrixShape = Shape(shape[n - 2], shape[n - 1])
 
         return VirtualBuffer(linearSize / matrixOffset) { index ->
             val offset = index * matrixOffset
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index cc699e1bb..b01e67eee 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -5,10 +5,7 @@
 
 package space.kscience.kmath.tensors.core.internal
 
-import space.kscience.kmath.nd.MutableStructure1D
-import space.kscience.kmath.nd.MutableStructure2D
-import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.nd.as1D
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.IntBuffer
@@ -98,7 +95,7 @@ internal fun <T> StructureND<T>.setUpPivots(): IntTensor {
     pivotsShape[n - 2] = m + 1
 
     return IntTensor(
-        pivotsShape,
+        Shape(pivotsShape),
         IntBuffer(pivotsShape.reduce(Int::times)) { 0 }
     )
 }
@@ -243,10 +240,10 @@ internal fun DoubleTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double = 1e-10)
     val b: DoubleTensor
     if (n > m) {
         b = a.transposed(0, 1).dot(a)
-        v = DoubleTensor(intArrayOf(m), DoubleBuffer.randomUnitVector(m, 0))
+        v = DoubleTensor(Shape(m), DoubleBuffer.randomUnitVector(m, 0))
     } else {
         b = a.dot(a.transposed(0, 1))
-        v = DoubleTensor(intArrayOf(n), DoubleBuffer.randomUnitVector(n, 0))
+        v = DoubleTensor(Shape(n), DoubleBuffer.randomUnitVector(n, 0))
     }
 
     var lastV: DoubleTensor
@@ -278,7 +275,7 @@ internal fun DoubleTensorAlgebra.svdHelper(
                     outerProduct[i * v.shape[0] + j] = u.getTensor(i).value() * v.getTensor(j).value()
                 }
             }
-            a = a - singularValue.times(DoubleTensor(intArrayOf(u.shape[0], v.shape[0]), outerProduct.asBuffer()))
+            a = a - singularValue.times(DoubleTensor(Shape(u.shape[0], v.shape[0]), outerProduct.asBuffer()))
         }
         var v: DoubleTensor
         var u: DoubleTensor
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index c5ba98811..91fcc90ee 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -6,6 +6,8 @@
 package space.kscience.kmath.tensors.core.internal
 
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.asList
+import space.kscience.kmath.nd.last
 import space.kscience.kmath.operations.DoubleBufferOps.Companion.map
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.samplers.GaussianSampler
@@ -92,7 +94,7 @@ public fun DoubleTensor.toPrettyString(): String = buildString {
         append(']')
         charOffset -= 1
 
-        index.reversed().zip(shape.reversed()).drop(1).forEach { (ind, maxInd) ->
+        index.reversed().zip(shape.asList().reversed()).drop(1).forEach { (ind, maxInd) ->
             if (ind != maxInd - 1) {
                 return@forEach
             }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
index 619d5c753..7e30c7965 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
@@ -12,11 +12,11 @@ import space.kscience.kmath.nd.Shape
 import kotlin.jvm.JvmName
 
 @JvmName("varArgOne")
-public fun DoubleTensorAlgebra.one(vararg shape: Int): DoubleTensor = ones(intArrayOf(*shape))
+public fun DoubleTensorAlgebra.one(vararg shape: Int): DoubleTensor = ones(Shape(shape))
 
 public fun DoubleTensorAlgebra.one(shape: Shape): DoubleTensor = ones(shape)
 
 @JvmName("varArgZero")
-public fun DoubleTensorAlgebra.zero(vararg shape: Int): DoubleTensor = zeros(intArrayOf(*shape))
+public fun DoubleTensorAlgebra.zero(vararg shape: Int): DoubleTensor = zeros(Shape(shape))
 
 public fun DoubleTensorAlgebra.zero(shape: Shape): DoubleTensor = zeros(shape)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt
index 61bf2341e..3b0d15400 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorTransform.kt
@@ -5,9 +5,7 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.nd.DoubleBufferND
-import space.kscience.kmath.nd.RowStrides
-import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.*
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.tensors.api.Tensor
@@ -23,7 +21,7 @@ public fun StructureND<Double>.copyToTensor(): DoubleTensor = if (this is Double
 } else {
     DoubleTensor(
         shape,
-        RowStrides(this.shape).map(this::get).toDoubleArray().asBuffer(),
+        RowStrides(this.shape).map(this::getDouble).toDoubleArray().asBuffer(),
     )
 }
 
@@ -36,7 +34,7 @@ public fun StructureND<Int>.toDoubleTensor(): DoubleTensor {
     } else {
         val tensor = DoubleTensorAlgebra.zeroesLike(this)
         indices.forEach {
-            tensor[it] = get(it).toDouble()
+            tensor[it] = getInt(it).toDouble()
         }
         return tensor
     }
@@ -59,7 +57,7 @@ public fun StructureND<Double>.asDoubleTensor(): DoubleTensor = if (this is Doub
 public fun StructureND<Int>.asIntTensor(): IntTensor = when (this) {
     is IntTensor -> this
     else -> IntTensor(
-        this.shape,
-        RowStrides(this.shape).map(this::get).toIntArray().asBuffer()
+        shape,
+        RowStrides(shape).map(this::getInt).toIntArray().asBuffer()
     )
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 6a99b9ba8..5940d44e9 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.internal.broadcastOuterTensors
 import space.kscience.kmath.tensors.core.internal.broadcastShapes
@@ -19,38 +21,38 @@ internal class TestBroadcasting {
     fun testBroadcastShapes() = DoubleTensorAlgebra {
         assertTrue(
             broadcastShapes(
-                intArrayOf(2, 3), intArrayOf(1, 3), intArrayOf(1, 1, 1)
-            ) contentEquals intArrayOf(1, 2, 3)
+                listOf(Shape(2, 3), Shape(1, 3), Shape(1, 1, 1))
+            ) contentEquals Shape(1, 2, 3)
         )
 
         assertTrue(
             broadcastShapes(
-                intArrayOf(6, 7), intArrayOf(5, 6, 1), intArrayOf(7), intArrayOf(5, 1, 7)
-            ) contentEquals intArrayOf(5, 6, 7)
+                listOf(Shape(6, 7), Shape(5, 6, 1), Shape(7), Shape(5, 1, 7))
+            ) contentEquals Shape(5, 6, 7)
         )
     }
 
     @Test
     fun testBroadcastTo() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor1 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(Shape(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
 
         val res = broadcastTo(tensor2, tensor1.shape)
-        assertTrue(res.shape contentEquals intArrayOf(2, 3))
+        assertTrue(res.shape contentEquals Shape(2, 3))
         assertTrue(res.source contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
     }
 
     @Test
     fun testBroadcastTensors() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
+        val tensor1 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(Shape(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = fromArray(Shape(1, 1, 1), doubleArrayOf(500.0))
 
         val res = broadcastTensors(tensor1, tensor2, tensor3)
 
-        assertTrue(res[0].shape contentEquals intArrayOf(1, 2, 3))
-        assertTrue(res[1].shape contentEquals intArrayOf(1, 2, 3))
-        assertTrue(res[2].shape contentEquals intArrayOf(1, 2, 3))
+        assertTrue(res[0].shape contentEquals Shape(1, 2, 3))
+        assertTrue(res[1].shape contentEquals Shape(1, 2, 3))
+        assertTrue(res[2].shape contentEquals Shape(1, 2, 3))
 
         assertTrue(res[0].source contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         assertTrue(res[1].source contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
@@ -59,15 +61,15 @@ internal class TestBroadcasting {
 
     @Test
     fun testBroadcastOuterTensors() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
+        val tensor1 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(Shape(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = fromArray(Shape(1, 1, 1), doubleArrayOf(500.0))
 
         val res = broadcastOuterTensors(tensor1, tensor2, tensor3)
 
-        assertTrue(res[0].shape contentEquals intArrayOf(1, 2, 3))
-        assertTrue(res[1].shape contentEquals intArrayOf(1, 1, 3))
-        assertTrue(res[2].shape contentEquals intArrayOf(1, 1, 1))
+        assertTrue(res[0].shape contentEquals Shape(1, 2, 3))
+        assertTrue(res[1].shape contentEquals Shape(1, 1, 3))
+        assertTrue(res[2].shape contentEquals Shape(1, 1, 1))
 
         assertTrue(res[0].source contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         assertTrue(res[1].source contentEquals doubleArrayOf(10.0, 20.0, 30.0))
@@ -76,37 +78,37 @@ internal class TestBroadcasting {
 
     @Test
     fun testBroadcastOuterTensorsShapes() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(intArrayOf(2, 1, 3, 2, 3), DoubleArray(2 * 1 * 3 * 2 * 3) { 0.0 })
-        val tensor2 = fromArray(intArrayOf(4, 2, 5, 1, 3, 3), DoubleArray(4 * 2 * 5 * 1 * 3 * 3) { 0.0 })
-        val tensor3 = fromArray(intArrayOf(1, 1), doubleArrayOf(500.0))
+        val tensor1 = fromArray(Shape(2, 1, 3, 2, 3), DoubleArray(2 * 1 * 3 * 2 * 3) { 0.0 })
+        val tensor2 = fromArray(Shape(4, 2, 5, 1, 3, 3), DoubleArray(4 * 2 * 5 * 1 * 3 * 3) { 0.0 })
+        val tensor3 = fromArray(Shape(1, 1), doubleArrayOf(500.0))
 
         val res = broadcastOuterTensors(tensor1, tensor2, tensor3)
 
-        assertTrue(res[0].shape contentEquals intArrayOf(4, 2, 5, 3, 2, 3))
-        assertTrue(res[1].shape contentEquals intArrayOf(4, 2, 5, 3, 3, 3))
-        assertTrue(res[2].shape contentEquals intArrayOf(4, 2, 5, 3, 1, 1))
+        assertTrue(res[0].shape contentEquals Shape(4, 2, 5, 3, 2, 3))
+        assertTrue(res[1].shape contentEquals Shape(4, 2, 5, 3, 3, 3))
+        assertTrue(res[2].shape contentEquals Shape(4, 2, 5, 3, 1, 1))
     }
 
     @Test
     fun testMinusTensor() = BroadcastDoubleTensorAlgebra.invoke {
-        val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = fromArray(intArrayOf(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor3 = fromArray(intArrayOf(1, 1, 1), doubleArrayOf(500.0))
+        val tensor1 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(Shape(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = fromArray(Shape(1, 1, 1), doubleArrayOf(500.0))
 
         val tensor21 = tensor2 - tensor1
         val tensor31 = tensor3 - tensor1
         val tensor32 = tensor3 - tensor2
 
-        assertTrue(tensor21.shape contentEquals intArrayOf(2, 3))
+        assertTrue(tensor21.shape contentEquals Shape(2, 3))
         assertTrue(tensor21.source contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
 
-        assertTrue(tensor31.shape contentEquals intArrayOf(1, 2, 3))
+        assertTrue(tensor31.shape contentEquals Shape(1, 2, 3))
         assertTrue(
             tensor31.source
                     contentEquals doubleArrayOf(499.0, 498.0, 497.0, 496.0, 495.0, 494.0)
         )
 
-        assertTrue(tensor32.shape contentEquals intArrayOf(1, 1, 3))
+        assertTrue(tensor32.shape contentEquals Shape(1, 1, 3))
         assertTrue(tensor32.source contentEquals doubleArrayOf(490.0, 480.0, 470.0))
     }
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index 4bc2e3bdb..f098eecb0 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.nd.Shape
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.asBuffer
 import kotlin.math.*
@@ -13,7 +14,7 @@ import kotlin.test.assertTrue
 
 internal class TestDoubleAnalyticTensorAlgebra {
 
-    val shape = intArrayOf(2, 1, 3, 2)
+    val shape = Shape(2, 1, 3, 2)
     val buffer = doubleArrayOf(
         27.1, 20.0, 19.84,
         23.123, 3.0, 2.0,
@@ -102,7 +103,7 @@ internal class TestDoubleAnalyticTensorAlgebra {
         assertTrue { tensor.floor() eq expectedTensor(::floor) }
     }
 
-    val shape2 = intArrayOf(2, 2)
+    val shape2 = Shape(2, 2)
     val buffer2 = doubleArrayOf(
         1.0, 2.0,
         -3.0, 4.0
@@ -114,13 +115,13 @@ internal class TestDoubleAnalyticTensorAlgebra {
         assertTrue { tensor2.min() == -3.0 }
         assertTrue {
             tensor2.min(0, true) eq fromArray(
-                intArrayOf(1, 2),
+                Shape(1, 2),
                 doubleArrayOf(-3.0, 2.0)
             )
         }
         assertTrue {
             tensor2.min(1, false) eq fromArray(
-                intArrayOf(2),
+                Shape(2),
                 doubleArrayOf(1.0, -3.0)
             )
         }
@@ -131,13 +132,13 @@ internal class TestDoubleAnalyticTensorAlgebra {
         assertTrue { tensor2.max() == 4.0 }
         assertTrue {
             tensor2.max(0, true) eq fromArray(
-                intArrayOf(1, 2),
+                Shape(1, 2),
                 doubleArrayOf(1.0, 4.0)
             )
         }
         assertTrue {
             tensor2.max(1, false) eq fromArray(
-                intArrayOf(2),
+                Shape(2),
                 doubleArrayOf(2.0, 4.0)
             )
         }
@@ -148,13 +149,13 @@ internal class TestDoubleAnalyticTensorAlgebra {
         assertTrue { tensor2.sum() == 4.0 }
         assertTrue {
             tensor2.sum(0, true) eq fromArray(
-                intArrayOf(1, 2),
+                Shape(1, 2),
                 doubleArrayOf(-2.0, 6.0)
             )
         }
         assertTrue {
             tensor2.sum(1, false) eq fromArray(
-                intArrayOf(2),
+                Shape(2),
                 doubleArrayOf(3.0, 1.0)
             )
         }
@@ -165,13 +166,13 @@ internal class TestDoubleAnalyticTensorAlgebra {
         assertTrue { tensor2.mean() == 1.0 }
         assertTrue {
             tensor2.mean(0, true) eq fromArray(
-                intArrayOf(1, 2),
+                Shape(1, 2),
                 doubleArrayOf(-1.0, 3.0)
             )
         }
         assertTrue {
             tensor2.mean(1, false) eq fromArray(
-                intArrayOf(2),
+                Shape(2),
                 doubleArrayOf(1.5, 0.5)
             )
         }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index 1c23cff18..b9f845bb2 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -5,6 +5,8 @@
 
 package space.kscience.kmath.tensors.core
 
+import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.internal.svd1d
 import kotlin.math.abs
@@ -17,7 +19,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     @Test
     fun testDetLU() = DoubleTensorAlgebra {
         val tensor = fromArray(
-            intArrayOf(2, 2, 2),
+            Shape(2, 2, 2),
             doubleArrayOf(
                 1.0, 3.0,
                 1.0, 2.0,
@@ -27,7 +29,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         )
 
         val expectedTensor = fromArray(
-            intArrayOf(2, 1),
+            Shape(2, 1),
             doubleArrayOf(
                 -1.0,
                 -7.0
@@ -43,7 +45,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     fun testDet() = DoubleTensorAlgebra {
         val expectedValue = 0.019827417
         val m = fromArray(
-            intArrayOf(3, 3), doubleArrayOf(
+            Shape(3, 3), doubleArrayOf(
                 2.1843, 1.4391, -0.4845,
                 1.4391, 1.7772, 0.4055,
                 -0.4845, 0.4055, 0.7519
@@ -57,7 +59,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     fun testDetSingle() = DoubleTensorAlgebra {
         val expectedValue = 48.151623
         val m = fromArray(
-            intArrayOf(1, 1), doubleArrayOf(
+            Shape(1, 1), doubleArrayOf(
                 expectedValue
             )
         )
@@ -68,7 +70,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     @Test
     fun testInvLU() = DoubleTensorAlgebra {
         val tensor = fromArray(
-            intArrayOf(2, 2, 2),
+            Shape(2, 2, 2),
             doubleArrayOf(
                 1.0, 0.0,
                 0.0, 2.0,
@@ -78,7 +80,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         )
 
         val expectedTensor = fromArray(
-            intArrayOf(2, 2, 2), doubleArrayOf(
+            Shape(2, 2, 2), doubleArrayOf(
                 1.0, 0.0,
                 0.0, 0.5,
                 0.0, 1.0,
@@ -92,14 +94,14 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testScalarProduct() = DoubleTensorAlgebra {
-        val a = fromArray(intArrayOf(3), doubleArrayOf(1.8, 2.5, 6.8))
-        val b = fromArray(intArrayOf(3), doubleArrayOf(5.5, 2.6, 6.4))
+        val a = fromArray(Shape(3), doubleArrayOf(1.8, 2.5, 6.8))
+        val b = fromArray(Shape(3), doubleArrayOf(5.5, 2.6, 6.4))
         assertEquals(a.dot(b).value(), 59.92)
     }
 
     @Test
     fun testQR() = DoubleTensorAlgebra {
-        val shape = intArrayOf(2, 2, 2)
+        val shape = Shape(2, 2, 2)
         val buffer = doubleArrayOf(
             1.0, 3.0,
             1.0, 2.0,
@@ -120,7 +122,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testLU() = DoubleTensorAlgebra {
-        val shape = intArrayOf(2, 2, 2)
+        val shape = Shape(2, 2, 2)
         val buffer = doubleArrayOf(
             1.0, 3.0,
             1.0, 2.0,
@@ -140,9 +142,9 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testCholesky() = DoubleTensorAlgebra {
-        val tensor = randomNormal(intArrayOf(2, 5, 5), 0)
+        val tensor = randomNormal(Shape(2, 5, 5), 0)
         val sigma = (tensor matmul tensor.transposed()) + diagonalEmbedding(
-            fromArray(intArrayOf(2, 5), DoubleArray(10) { 0.1 })
+            fromArray(Shape(2, 5), DoubleArray(10) { 0.1 })
         )
         val low = sigma.cholesky()
         val sigmChol = low matmul low.transposed()
@@ -151,24 +153,24 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testSVD1D() = DoubleTensorAlgebra {
-        val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
 
         val res = svd1d(tensor2)
 
-        assertTrue(res.shape contentEquals intArrayOf(2))
+        assertTrue(res.shape contentEquals Shape(2))
         assertTrue { abs(abs(res.source[0]) - 0.386) < 0.01 }
         assertTrue { abs(abs(res.source[1]) - 0.922) < 0.01 }
     }
 
     @Test
     fun testSVD() = DoubleTensorAlgebra {
-        testSVDFor(fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0)))
-        testSVDFor(fromArray(intArrayOf(2, 2), doubleArrayOf(-1.0, 0.0, 239.0, 238.0)))
+        testSVDFor(fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0)))
+        testSVDFor(fromArray(Shape(2, 2), doubleArrayOf(-1.0, 0.0, 239.0, 238.0)))
     }
 
     @Test
     fun testBatchedSVD() = DoubleTensorAlgebra {
-        val tensor = randomNormal(intArrayOf(2, 5, 3), 0)
+        val tensor = randomNormal(Shape(2, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
         val tensorSVD = tensorU matmul (diagonalEmbedding(tensorS) matmul tensorV.transposed())
         assertTrue(tensor.eq(tensorSVD))
@@ -176,7 +178,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testBatchedSymEig() = DoubleTensorAlgebra {
-        val tensor = randomNormal(shape = intArrayOf(2, 3, 3), 0)
+        val tensor = randomNormal(shape = Shape(2, 3, 3), 0)
         val tensorSigma = tensor + tensor.transposed()
         val (tensorS, tensorV) = tensorSigma.symEig()
         val tensorSigmaCalc = tensorV matmul (diagonalEmbedding(tensorS) matmul tensorV.transposed())
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index 505031b67..f07614d05 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -21,14 +21,14 @@ internal class TestDoubleTensor {
     @Test
     fun testValue() = DoubleTensorAlgebra {
         val value = 12.5
-        val tensor = fromArray(intArrayOf(1), doubleArrayOf(value))
+        val tensor = fromArray(Shape(1), doubleArrayOf(value))
         assertEquals(tensor.value(), value)
     }
 
     @OptIn(PerformancePitfall::class)
     @Test
     fun testStrides() = DoubleTensorAlgebra {
-        val tensor = fromArray(intArrayOf(2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
+        val tensor = fromArray(Shape(2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
         assertEquals(tensor[intArrayOf(0, 1)], 5.8)
         assertTrue(
             tensor.elements().map { it.second }.toList()
@@ -38,7 +38,7 @@ internal class TestDoubleTensor {
 
     @Test
     fun testGet() = DoubleTensorAlgebra {
-        val tensor = fromArray(intArrayOf(1, 2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
+        val tensor = fromArray(Shape(1, 2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
         val matrix = tensor.getTensor(0).asDoubleTensor2D()
         assertEquals(matrix[0, 1], 5.8)
 
@@ -67,7 +67,7 @@ internal class TestDoubleTensor {
         val doubleArray = DoubleBuffer(1.0, 2.0, 3.0)
 
         // create ND buffers, no data is copied
-        val ndArray: MutableBufferND<Double> = DoubleBufferND(ColumnStrides(intArrayOf(3)), doubleArray)
+        val ndArray: MutableBufferND<Double> = DoubleBufferND(ColumnStrides(Shape(3)), doubleArray)
 
         // map to tensors
         val tensorArray = ndArray.asDoubleTensor() // Data is copied because of strides change.
@@ -91,7 +91,7 @@ internal class TestDoubleTensor {
 
     @Test
     fun test2D() = with(DoubleTensorAlgebra) {
-        val tensor: DoubleTensor = structureND(intArrayOf(3, 3)) { (i, j) -> (i - j).toDouble() }
+        val tensor: DoubleTensor = structureND(Shape(3, 3)) { (i, j) -> (i - j).toDouble() }
         //println(tensor.toPrettyString())
         val tensor2d = tensor.asDoubleTensor2D()
         assertBufferEquals(DoubleBuffer(1.0, 0.0, -1.0), tensor2d.rows[1])
@@ -100,7 +100,7 @@ internal class TestDoubleTensor {
 
     @Test
     fun testMatrixIteration() = with(DoubleTensorAlgebra) {
-        val tensor = structureND(intArrayOf(3, 3, 3, 3)) { index -> index.sum().toDouble() }
+        val tensor = structureND(Shape(3, 3, 3, 3)) { index -> index.sum().toDouble() }
         tensor.forEachMatrix { index, matrix ->
             println(index.joinToString { it.toString() })
             println(matrix)
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 67bebb9a7..3c693b089 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -6,6 +6,8 @@
 package space.kscience.kmath.tensors.core
 
 
+import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.nd.get
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.testutils.assertBufferEquals
@@ -18,62 +20,62 @@ internal class TestDoubleTensorAlgebra {
 
     @Test
     fun testDoublePlus() = DoubleTensorAlgebra {
-        val tensor = fromArray(intArrayOf(2), doubleArrayOf(1.0, 2.0))
+        val tensor = fromArray(Shape(2), doubleArrayOf(1.0, 2.0))
         val res = 10.0 + tensor
         assertTrue(res.source contentEquals doubleArrayOf(11.0, 12.0))
     }
 
     @Test
     fun testDoubleDiv() = DoubleTensorAlgebra {
-        val tensor = fromArray(intArrayOf(2), doubleArrayOf(2.0, 4.0))
+        val tensor = fromArray(Shape(2), doubleArrayOf(2.0, 4.0))
         val res = 2.0 / tensor
         assertTrue(res.source contentEquals doubleArrayOf(1.0, 0.5))
     }
 
     @Test
     fun testDivDouble() = DoubleTensorAlgebra {
-        val tensor = fromArray(intArrayOf(2), doubleArrayOf(10.0, 5.0))
+        val tensor = fromArray(Shape(2), doubleArrayOf(10.0, 5.0))
         val res = tensor / 2.5
         assertTrue(res.source contentEquals doubleArrayOf(4.0, 2.0))
     }
 
     @Test
     fun testTranspose1x1() = DoubleTensorAlgebra {
-        val tensor = fromArray(intArrayOf(1), doubleArrayOf(0.0))
+        val tensor = fromArray(Shape(1), doubleArrayOf(0.0))
         val res = tensor.transposed(0, 0)
 
-        assertTrue(res.source contentEquals doubleArrayOf(0.0))
-        assertTrue(res.shape contentEquals intArrayOf(1))
+        assertTrue(res.asDoubleTensor().source contentEquals doubleArrayOf(0.0))
+        assertTrue(res.shape contentEquals Shape(1))
     }
 
     @Test
     fun testTranspose3x2() = DoubleTensorAlgebra {
-        val tensor = fromArray(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor = fromArray(Shape(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res = tensor.transposed(1, 0)
 
-        assertTrue(res.source contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
-        assertTrue(res.shape contentEquals intArrayOf(2, 3))
+        assertTrue(res.asDoubleTensor().source contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
+        assertTrue(res.shape contentEquals Shape(2, 3))
     }
 
     @Test
     fun testTranspose1x2x3() = DoubleTensorAlgebra {
-        val tensor = fromArray(intArrayOf(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor = fromArray(Shape(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res01 = tensor.transposed(0, 1)
         val res02 = tensor.transposed(-3, 2)
         val res12 = tensor.transposed()
 
-        assertTrue(res01.shape contentEquals intArrayOf(2, 1, 3))
-        assertTrue(res02.shape contentEquals intArrayOf(3, 2, 1))
-        assertTrue(res12.shape contentEquals intArrayOf(1, 3, 2))
+        assertTrue(res01.shape contentEquals Shape(2, 1, 3))
+        assertTrue(res02.shape contentEquals Shape(3, 2, 1))
+        assertTrue(res12.shape contentEquals Shape(1, 3, 2))
 
-        assertTrue(res01.source contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        assertTrue(res02.source contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
-        assertTrue(res12.source contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res01.asDoubleTensor().source contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        assertTrue(res02.asDoubleTensor().source contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
+        assertTrue(res12.asDoubleTensor().source contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
     }
 
     @Test
     fun testLinearStructure() = DoubleTensorAlgebra {
-        val shape = intArrayOf(3)
+        val shape = Shape(3)
         val tensorA = full(value = -4.5, shape = shape)
         val tensorB = full(value = 10.9, shape = shape)
         val tensorC = full(value = 789.3, shape = shape)
@@ -105,28 +107,28 @@ internal class TestDoubleTensorAlgebra {
 
     @Test
     fun testDot() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor11 = fromArray(intArrayOf(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = fromArray(intArrayOf(3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor3 = fromArray(intArrayOf(1, 1, 3), doubleArrayOf(-1.0, -2.0, -3.0))
-        val tensor4 = fromArray(intArrayOf(2, 3, 3), (1..18).map { it.toDouble() }.toDoubleArray())
-        val tensor5 = fromArray(intArrayOf(2, 3, 3), (1..18).map { 1 + it.toDouble() }.toDoubleArray())
+        val tensor1 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor11 = fromArray(Shape(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(Shape(3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = fromArray(Shape(1, 1, 3), doubleArrayOf(-1.0, -2.0, -3.0))
+        val tensor4 = fromArray(Shape(2, 3, 3), (1..18).map { it.toDouble() }.toDoubleArray())
+        val tensor5 = fromArray(Shape(2, 3, 3), (1..18).map { 1 + it.toDouble() }.toDoubleArray())
 
         val res12 = tensor1.dot(tensor2)
         assertTrue(res12.source contentEquals doubleArrayOf(140.0, 320.0))
-        assertTrue(res12.shape contentEquals intArrayOf(2))
+        assertTrue(res12.shape contentEquals Shape(2))
 
         val res32 = tensor3.matmul(tensor2)
         assertTrue(res32.source contentEquals doubleArrayOf(-140.0))
-        assertTrue(res32.shape contentEquals intArrayOf(1, 1))
+        assertTrue(res32.shape contentEquals Shape(1, 1))
 
         val res22 = tensor2.dot(tensor2)
         assertTrue(res22.source contentEquals doubleArrayOf(1400.0))
-        assertTrue(res22.shape contentEquals intArrayOf(1))
+        assertTrue(res22.shape contentEquals Shape(1))
 
         val res11 = tensor1.dot(tensor11)
         assertTrue(res11.source contentEquals doubleArrayOf(22.0, 28.0, 49.0, 64.0))
-        assertTrue(res11.shape contentEquals intArrayOf(2, 2))
+        assertTrue(res11.shape contentEquals Shape(2, 2))
 
         val res45 = tensor4.matmul(tensor5)
         assertTrue(
@@ -135,44 +137,44 @@ internal class TestDoubleTensorAlgebra {
                 468.0, 501.0, 534.0, 594.0, 636.0, 678.0, 720.0, 771.0, 822.0
             )
         )
-        assertTrue(res45.shape contentEquals intArrayOf(2, 3, 3))
+        assertTrue(res45.shape contentEquals Shape(2, 3, 3))
     }
 
     @Test
     fun testDiagonalEmbedding() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(intArrayOf(3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor3 = zeros(intArrayOf(2, 3, 4, 5))
+        val tensor1 = fromArray(Shape(3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor2 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor3 = zeros(Shape(2, 3, 4, 5))
 
         assertTrue(
             diagonalEmbedding(tensor3, 0, 3, 4).shape contentEquals
-                    intArrayOf(2, 3, 4, 5, 5)
+                    Shape(2, 3, 4, 5, 5)
         )
         assertTrue(
             diagonalEmbedding(tensor3, 1, 3, 4).shape contentEquals
-                    intArrayOf(2, 3, 4, 6, 6)
+                    Shape(2, 3, 4, 6, 6)
         )
         assertTrue(
             diagonalEmbedding(tensor3, 2, 0, 3).shape contentEquals
-                    intArrayOf(7, 2, 3, 7, 4)
+                    Shape(7, 2, 3, 7, 4)
         )
 
         val diagonal1 = diagonalEmbedding(tensor1, 0, 1, 0)
-        assertTrue(diagonal1.shape contentEquals intArrayOf(3, 3))
+        assertTrue(diagonal1.shape contentEquals Shape(3, 3))
         assertTrue(
             diagonal1.source contentEquals
                     doubleArrayOf(10.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 30.0)
         )
 
         val diagonal1Offset = diagonalEmbedding(tensor1, 1, 1, 0)
-        assertTrue(diagonal1Offset.shape contentEquals intArrayOf(4, 4))
+        assertTrue(diagonal1Offset.shape contentEquals Shape(4, 4))
         assertTrue(
             diagonal1Offset.source contentEquals
                     doubleArrayOf(0.0, 0.0, 0.0, 0.0, 10.0, 0.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 0.0, 30.0, 0.0)
         )
 
         val diagonal2 = diagonalEmbedding(tensor2, 1, 0, 2)
-        assertTrue(diagonal2.shape contentEquals intArrayOf(4, 2, 4))
+        assertTrue(diagonal2.shape contentEquals Shape(4, 2, 4))
         assertTrue(
             diagonal2.source contentEquals
                     doubleArrayOf(
@@ -186,9 +188,9 @@ internal class TestDoubleTensorAlgebra {
 
     @Test
     fun testEq() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor3 = fromArray(intArrayOf(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 5.0))
+        val tensor1 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor3 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 5.0))
 
         assertTrue(tensor1 eq tensor1)
         assertTrue(tensor1 eq tensor2)
@@ -202,7 +204,7 @@ internal class TestDoubleTensorAlgebra {
         val l = tensor.getTensor(0).map { it + 1.0 }
         val r = tensor.getTensor(1).map { it - 1.0 }
         val res = l + r
-        assertTrue { intArrayOf(5, 5) contentEquals res.shape }
+        assertTrue { Shape(5, 5) contentEquals res.shape }
         assertEquals(2.0, res[4, 4])
     }
 }
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
index 1b7601a14..5ac1c74a3 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
@@ -9,6 +9,7 @@ package space.kscience.kmath.viktor
 
 import org.jetbrains.bio.viktor.F64Array
 import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.misc.UnsafeKMathAPI
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
@@ -31,8 +32,9 @@ public open class ViktorFieldOpsND :
 
     override val elementAlgebra: DoubleField get() = DoubleField
 
-    override fun structureND(shape: IntArray, initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
-        F64Array(*shape).apply {
+    @OptIn(UnsafeKMathAPI::class)
+    override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
+        F64Array(*shape.asArray()).apply {
             ColumnStrides(shape).asSequence().forEach { index ->
                 set(value = DoubleField.initializer(index), indices = index)
             }
@@ -40,23 +42,26 @@ public open class ViktorFieldOpsND :
 
     override fun StructureND<Double>.unaryMinus(): StructureND<Double> = -1 * this
 
+    @OptIn(UnsafeKMathAPI::class)
     @PerformancePitfall
     override fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): ViktorStructureND =
-        F64Array(*shape).apply {
-            ColumnStrides(shape).asSequence().forEach { index ->
+        F64Array(*shape.asArray()).apply {
+            ColumnStrides(Shape(shape)).asSequence().forEach { index ->
                 set(value = DoubleField.transform(this@map[index]), indices = index)
             }
         }.asStructure()
 
+    @OptIn(UnsafeKMathAPI::class)
     @PerformancePitfall
     override fun StructureND<Double>.mapIndexed(
         transform: DoubleField.(index: IntArray, Double) -> Double,
-    ): ViktorStructureND = F64Array(*shape).apply {
-        ColumnStrides(shape).asSequence().forEach { index ->
+    ): ViktorStructureND = F64Array(*shape.asArray()).apply {
+        ColumnStrides(Shape(shape)).asSequence().forEach { index ->
             set(value = DoubleField.transform(index, this@mapIndexed[index]), indices = index)
         }
     }.asStructure()
 
+    @OptIn(UnsafeKMathAPI::class)
     @PerformancePitfall
     override fun zip(
         left: StructureND<Double>,
@@ -64,7 +69,7 @@ public open class ViktorFieldOpsND :
         transform: DoubleField.(Double, Double) -> Double,
     ): ViktorStructureND {
         require(left.shape.contentEquals(right.shape))
-        return F64Array(*left.shape).apply {
+        return F64Array(*left.shape.asArray()).apply {
             ColumnStrides(left.shape).asSequence().forEach { index ->
                 set(value = DoubleField.transform(left[index], right[index]), indices = index)
             }
@@ -119,13 +124,17 @@ public val DoubleField.viktorAlgebra: ViktorFieldOpsND get() = ViktorFieldOpsND
 
 @OptIn(UnstableKMathAPI::class)
 public open class ViktorFieldND(
-    override val shape: Shape,
+    private val shapeAsArray: IntArray,
 ) : ViktorFieldOpsND(), FieldND<Double, DoubleField>, NumbersAddOps<StructureND<Double>> {
-    override val zero: ViktorStructureND by lazy { F64Array.full(init = 0.0, shape = shape).asStructure() }
-    override val one: ViktorStructureND by lazy { F64Array.full(init = 1.0, shape = shape).asStructure() }
+
+    override val shape: Shape = Shape(shapeAsArray)
+
+
+    override val zero: ViktorStructureND by lazy { F64Array.full(init = 0.0, shape = shapeAsArray).asStructure() }
+    override val one: ViktorStructureND by lazy { F64Array.full(init = 1.0, shape = shapeAsArray).asStructure() }
 
     override fun number(value: Number): ViktorStructureND =
-        F64Array.full(init = value.toDouble(), shape = shape).asStructure()
+        F64Array.full(init = value.toDouble(), shape = shapeAsArray).asStructure()
 }
 
 public fun DoubleField.viktorAlgebra(vararg shape: Int): ViktorFieldND = ViktorFieldND(shape)
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index ea279a912..cee52b06d 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -9,13 +9,16 @@ import org.jetbrains.bio.viktor.F64Array
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.MutableStructureND
+import space.kscience.kmath.nd.Shape
 
 @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public class ViktorStructureND(public val f64Buffer: F64Array) : MutableStructureND<Double> {
-    override val shape: IntArray get() = f64Buffer.shape
+    override val shape: Shape get() = Shape(f64Buffer.shape)
 
+    @OptIn(PerformancePitfall::class)
     override inline fun get(index: IntArray): Double = f64Buffer.get(*index)
 
+    @OptIn(PerformancePitfall::class)
     override inline fun set(index: IntArray, value: Double) {
         f64Buffer.set(*index, value = value)
     }
-- 
2.34.1


From ee569b85f801972fd7cbd44d43abcd1df0a1b30d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 14 Oct 2022 13:05:39 +0300
Subject: [PATCH 626/713] Safe shapes

---
 .../kmath/benchmarks/NDFieldBenchmark.kt      |   2 +-
 .../kmath/benchmarks/ViktorBenchmark.kt       |   4 +-
 .../kmath/benchmarks/ViktorLogBenchmark.kt    |   4 +-
 .../kmath/operations/mixedNDOperations.kt     |   4 +-
 .../kscience/kmath/structures/NDField.kt      |   2 +-
 .../kmath/structures/StreamDoubleFieldND.kt   |   6 +-
 .../structures/StructureReadBenchmark.kt      |   4 +-
 .../structures/StructureWriteBenchmark.kt     |   4 +-
 .../kscience/kmath/tensors/OLSWithSVD.kt      |   8 +-
 .../space/kscience/kmath/tensors/PCA.kt       |  10 +-
 .../kmath/tensors/dataSetNormalization.kt     |   6 +-
 .../tensors/linearSystemSolvingWithLUP.kt     |   8 +-
 .../kscience/kmath/tensors/neuralNetwork.kt   |  12 +--
 .../kscience/kmath/complex/ComplexFieldND.kt  |   6 +-
 .../kmath/linear/BufferedLinearSpace.kt       |   2 +-
 .../kmath/linear/DoubleLinearSpace.kt         |   2 +-
 .../kscience/kmath/linear/VirtualMatrix.kt    |   5 +-
 .../space/kscience/kmath/nd/AlgebraND.kt      |   2 +-
 .../kscience/kmath/nd/BufferAlgebraND.kt      |  16 +--
 .../space/kscience/kmath/nd/BufferND.kt       |   2 +-
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |  10 +-
 .../space/kscience/kmath/nd/IntRingND.kt      |   6 +-
 .../kscience/kmath/nd/PermutedStructureND.kt  |   6 +-
 .../kotlin/space/kscience/kmath/nd/Shape.kt   | 102 ------------------
 .../space/kscience/kmath/nd/ShapeIndices.kt   |  10 +-
 .../kotlin/space/kscience/kmath/nd/ShapeND.kt | 102 ++++++++++++++++++
 .../space/kscience/kmath/nd/ShortRingND.kt    |   4 +-
 .../space/kscience/kmath/nd/Structure1D.kt    |   8 +-
 .../space/kscience/kmath/nd/Structure2D.kt    |   6 +-
 .../space/kscience/kmath/nd/StructureND.kt    |  10 +-
 .../kscience/kmath/nd/VirtualStructureND.kt   |   6 +-
 .../kscience/kmath/nd/algebraNDExtentions.kt  |   6 +-
 .../kmath/structures/BufferAccessor2D.kt      |   2 +-
 .../space/kscience/kmath/nd/StridesTest.kt    |   4 +-
 .../kmath/structures/LazyStructureND.kt       |   8 +-
 .../kscience/kmath/dimensions/Wrappers.kt     |   4 +-
 .../kscience/kmath/histogram/HistogramND.kt   |   4 +-
 .../histogram/UniformHistogramGroupND.kt      |   2 +-
 .../kscience/kmath/multik/MultikTensor.kt     |   4 +-
 .../kmath/multik/MultikTensorAlgebra.kt       |   8 +-
 .../kscience/kmath/multik/MultikNDTest.kt     |   6 +-
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   |  15 +--
 .../kscience/kmath/nd4j/Nd4jArrayStructure.kt |   2 +-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |   8 +-
 .../tensorflow/DoubleTensorFlowAlgebra.kt     |   6 +-
 .../kmath/tensorflow/TensorFlowAlgebra.kt     |  12 ++-
 .../kmath/tensorflow/DoubleTensorFlowOps.kt   |   6 +-
 .../kmath/tensors/api/TensorAlgebra.kt        |   4 +-
 .../kmath/tensors/core/BufferedTensor.kt      |   4 +-
 .../kmath/tensors/core/DoubleTensor.kt        |   8 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt |  40 +++----
 .../kscience/kmath/tensors/core/IntTensor.kt  |   6 +-
 .../kmath/tensors/core/IntTensorAlgebra.kt    |  20 ++--
 .../tensors/core/internal/broadcastUtils.kt   |   8 +-
 .../kmath/tensors/core/internal/checks.kt     |  10 +-
 .../core/internal/doubleTensorHelpers.kt      |   4 +-
 .../tensors/core/internal/intTensorHelpers.kt |   4 +-
 .../kmath/tensors/core/internal/linUtils.kt   |   8 +-
 .../tensors/core/tensorAlgebraExtensions.kt   |  10 +-
 .../kmath/tensors/core/TestBroadcasting.kt    |  64 +++++------
 .../core/TestDoubleAnalyticTensorAlgebra.kt   |  22 ++--
 .../core/TestDoubleLinearOpsAlgebra.kt        |  38 +++----
 .../kmath/tensors/core/TestDoubleTensor.kt    |  12 +--
 .../tensors/core/TestDoubleTensorAlgebra.kt   |  74 ++++++-------
 .../kscience/kmath/viktor/ViktorFieldOpsND.kt |   8 +-
 .../kmath/viktor/ViktorStructureND.kt         |   4 +-
 66 files changed, 416 insertions(+), 408 deletions(-)
 delete mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeND.kt

diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index 75c1a3ee3..3d39e89a5 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -85,7 +85,7 @@ internal class NDFieldBenchmark {
     private companion object {
         private const val dim = 1000
         private const val n = 100
-        private val shape = Shape(dim, dim)
+        private val shape = ShapeND(dim, dim)
         private val specializedField = DoubleField.ndAlgebra
         private val genericField = BufferedFieldOpsND(DoubleField)
         private val nd4jField = DoubleField.nd4j
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
index 25ce8410a..90f3cb765 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorBenchmark.kt
@@ -10,7 +10,7 @@ import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import org.jetbrains.bio.viktor.F64Array
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.nd.one
@@ -49,7 +49,7 @@ internal class ViktorBenchmark {
     private companion object {
         private const val dim = 1000
         private const val n = 100
-        private val shape = Shape(dim, dim)
+        private val shape = ShapeND(dim, dim)
 
         // automatically build context most suited for given type.
         private val doubleField = DoubleField.ndAlgebra
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
index ea417e564..4ec4605ed 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/ViktorLogBenchmark.kt
@@ -10,7 +10,7 @@ import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
 import org.jetbrains.bio.viktor.F64Array
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.nd.one
 import space.kscience.kmath.operations.DoubleField
@@ -49,7 +49,7 @@ internal class ViktorLogBenchmark {
     private companion object {
         private const val dim = 1000
         private const val n = 100
-        private val shape = Shape(dim, dim)
+        private val shape = ShapeND(dim, dim)
 
         // automatically build context most suited for given type.
         private val doubleField = DoubleField.ndAlgebra
diff --git a/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt b/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
index 8fc6e1b06..4a5d783e1 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/operations/mixedNDOperations.kt
@@ -8,14 +8,14 @@ package space.kscience.kmath.operations
 import space.kscience.kmath.commons.linear.CMLinearSpace
 import space.kscience.kmath.linear.matrix
 import space.kscience.kmath.nd.DoubleBufferND
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.nd.ndAlgebra
 import space.kscience.kmath.viktor.ViktorStructureND
 import space.kscience.kmath.viktor.viktorAlgebra
 
 fun main() {
-    val viktorStructure: ViktorStructureND = DoubleField.viktorAlgebra.structureND(Shape(2, 2)) { (i, j) ->
+    val viktorStructure: ViktorStructureND = DoubleField.viktorAlgebra.structureND(ShapeND(2, 2)) { (i, j) ->
         if (i == j) 2.0 else 0.0
     }
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
index 48d14cb4c..ba8f047a8 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/NDField.kt
@@ -29,7 +29,7 @@ fun main() {
     Nd4j.zeros(0)
     val dim = 1000
     val n = 1000
-    val shape = Shape(dim, dim)
+    val shape = ShapeND(dim, dim)
 
 
     // specialized nd-field for Double. It works as generic Double field as well.
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index dd1516fcd..67c9b421f 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -17,7 +17,7 @@ import java.util.stream.IntStream
  * A demonstration implementation of NDField over Real using Java [java.util.stream.DoubleStream] for parallel
  * execution.
  */
-class StreamDoubleFieldND(override val shape: Shape) : FieldND<Double, DoubleField>,
+class StreamDoubleFieldND(override val shape: ShapeND) : FieldND<Double, DoubleField>,
     NumbersAddOps<StructureND<Double>>,
     ExtendedField<StructureND<Double>> {
 
@@ -43,7 +43,7 @@ class StreamDoubleFieldND(override val shape: Shape) : FieldND<Double, DoubleFie
             else -> DoubleBuffer(strides.linearSize) { offset -> get(strides.index(offset)) }
         }
 
-    override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): BufferND<Double> {
+    override fun structureND(shape: ShapeND, initializer: DoubleField.(IntArray) -> Double): BufferND<Double> {
         val array = IntStream.range(0, strides.linearSize).parallel().mapToDouble { offset ->
             val index = strides.index(offset)
             DoubleField.initializer(index)
@@ -111,4 +111,4 @@ class StreamDoubleFieldND(override val shape: Shape) : FieldND<Double, DoubleFie
     override fun atanh(arg: StructureND<Double>): BufferND<Double> = arg.map { atanh(it) }
 }
 
-fun DoubleField.ndStreaming(vararg shape: Int): StreamDoubleFieldND = StreamDoubleFieldND(Shape(shape))
+fun DoubleField.ndStreaming(vararg shape: Int): StreamDoubleFieldND = StreamDoubleFieldND(ShapeND(shape))
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
index ec05f38d0..e3e7daaae 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.structures
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.BufferND
 import space.kscience.kmath.nd.ColumnStrides
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import kotlin.system.measureTimeMillis
 
 @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
@@ -17,7 +17,7 @@ fun main() {
     val n = 6000
     val array = DoubleArray(n * n) { 1.0 }
     val buffer = DoubleBuffer(array)
-    val strides = ColumnStrides(Shape(n, n))
+    val strides = ColumnStrides(ShapeND(n, n))
     val structure = BufferND(strides, buffer)
 
     measureTimeMillis {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
index 081bfa5c0..522eeb768 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.structures
 
 import space.kscience.kmath.nd.BufferND
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.map
 import kotlin.system.measureTimeMillis
@@ -16,7 +16,7 @@ private inline fun <T, reified R: Any> BufferND<T>.map(block: (T) -> R): BufferN
 @Suppress("UNUSED_VARIABLE")
 fun main() {
     val n = 6000
-    val structure = StructureND.buffered(Shape(n, n), Buffer.Companion::auto) { 1.0 }
+    val structure = StructureND.buffered(ShapeND(n, n), Buffer.Companion::auto) { 1.0 }
     structure.map { it + 1 } // warm-up
     val time1 = measureTimeMillis { val res = structure.map { it + 1 } }
     println("Structure mapping finished in $time1 millis")
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index 32d4176c1..40b927215 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.tensors
 
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.DoubleTensor
@@ -25,10 +25,10 @@ fun main() {
     DoubleTensorAlgebra {
         // take coefficient vector from normal distribution
         val alpha = randomNormal(
-            Shape(5),
+            ShapeND(5),
             randSeed
         ) + fromArray(
-            Shape(5),
+            ShapeND(5),
             doubleArrayOf(1.0, 2.5, 3.4, 5.0, 10.1)
         )
 
@@ -36,7 +36,7 @@ fun main() {
 
         // also take sample of size 20 from normal distribution for x
         val x = randomNormal(
-            Shape(20, 5),
+            ShapeND(20, 5),
             randSeed
         )
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index 2022b6472..78199aa8b 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.tensors.core.tensorAlgebra
 import space.kscience.kmath.tensors.core.withBroadcast
 
@@ -17,7 +17,7 @@ fun main(): Unit = Double.tensorAlgebra.withBroadcast {  // work in context with
 
     // assume x is range from 0 until 10
     val x = fromArray(
-        Shape(10),
+        ShapeND(10),
         DoubleArray(10) { it.toDouble() }
     )
 
@@ -42,13 +42,13 @@ fun main(): Unit = Double.tensorAlgebra.withBroadcast {  // work in context with
 
     // save means ans standard deviations for further recovery
     val mean = fromArray(
-        Shape(2),
+        ShapeND(2),
         doubleArrayOf(xMean, yMean)
     )
     println("Means:\n$mean")
 
     val std = fromArray(
-        Shape(2),
+        ShapeND(2),
         doubleArrayOf(xStd, yStd)
     )
     println("Standard deviations:\n$std")
@@ -69,7 +69,7 @@ fun main(): Unit = Double.tensorAlgebra.withBroadcast {  // work in context with
     // we can restore original data from reduced data;
     // for example, find 7th element of dataset.
     val n = 7
-    val restored = (datasetReduced.getTensor(n) dot v.view(Shape(1, 2))) * std + mean
+    val restored = (datasetReduced.getTensor(n) dot v.view(ShapeND(1, 2))) * std + mean
     println("Original value:\n${dataset.getTensor(n)}")
     println("Restored value:\n$restored")
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
index 248266edb..091889e8e 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.tensors.core.tensorAlgebra
 import space.kscience.kmath.tensors.core.withBroadcast
 
@@ -14,10 +14,10 @@ import space.kscience.kmath.tensors.core.withBroadcast
 
 fun main() = Double.tensorAlgebra.withBroadcast {  // work in context with broadcast methods
     // take dataset of 5-element vectors from normal distribution
-    val dataset = randomNormal(Shape(100, 5)) * 1.5 // all elements from N(0, 1.5)
+    val dataset = randomNormal(ShapeND(100, 5)) * 1.5 // all elements from N(0, 1.5)
 
     dataset += fromArray(
-        Shape(5),
+        ShapeND(5),
         doubleArrayOf(0.0, 1.0, 1.5, 3.0, 5.0) // row means
     )
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
index 3eab64429..60716d0ba 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.tensorAlgebra
 import space.kscience.kmath.tensors.core.withBroadcast
@@ -16,13 +16,13 @@ fun main() = Double.tensorAlgebra.withBroadcast {// work in context with linear
 
     // set true value of x
     val trueX = fromArray(
-        Shape(4),
+        ShapeND(4),
         doubleArrayOf(-2.0, 1.5, 6.8, -2.4)
     )
 
     // and A matrix
     val a = fromArray(
-        Shape(4, 4),
+        ShapeND(4, 4),
         doubleArrayOf(
             0.5, 10.5, 4.5, 1.0,
             8.5, 0.9, 12.8, 0.1,
@@ -65,7 +65,7 @@ fun main() = Double.tensorAlgebra.withBroadcast {// work in context with linear
     // this function returns solution x of a system lx = b, l should be lower triangular
     fun solveLT(l: DoubleTensor, b: DoubleTensor): DoubleTensor {
         val n = l.shape[0]
-        val x = zeros(Shape(n))
+        val x = zeros(ShapeND(n))
         for (i in 0 until n) {
             x[intArrayOf(i)] = (b[intArrayOf(i)] - l.getTensor(i).dot(x).value()) / l[intArrayOf(i, i)]
         }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
index 1e4e339dc..52b3b556c 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.operations.invoke
@@ -70,12 +70,12 @@ class Dense(
 
     private val weights: DoubleTensor = DoubleTensorAlgebra {
         randomNormal(
-            Shape(inputUnits, outputUnits),
+            ShapeND(inputUnits, outputUnits),
             seed
         ) * sqrt(2.0 / (inputUnits + outputUnits))
     }
 
-    private val bias: DoubleTensor = DoubleTensorAlgebra { zeros(Shape(outputUnits)) }
+    private val bias: DoubleTensor = DoubleTensorAlgebra { zeros(ShapeND(outputUnits)) }
 
     override fun forward(input: DoubleTensor): DoubleTensor = BroadcastDoubleTensorAlgebra {
         (input dot weights) + bias
@@ -184,17 +184,17 @@ fun main() = BroadcastDoubleTensorAlgebra {
     //val testSize = sampleSize - trainSize
 
     // take sample of features from normal distribution
-    val x = randomNormal(Shape(sampleSize, features), seed) * 2.5
+    val x = randomNormal(ShapeND(sampleSize, features), seed) * 2.5
 
     x += fromArray(
-        Shape(5),
+        ShapeND(5),
         doubleArrayOf(0.0, -1.0, -2.5, -3.0, 5.5) // row means
     )
 
 
     // define class like '1' if the sum of features > 0 and '0' otherwise
     val y = fromArray(
-        Shape(sampleSize, 1),
+        ShapeND(sampleSize, 1),
         DoubleArray(sampleSize) { i ->
             if (x.getTensor(i).sum() > 0.0) {
                 1.0
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
index cbc69ca6e..06f6cad85 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
@@ -59,7 +59,7 @@ public sealed class ComplexFieldOpsND : BufferedFieldOpsND<Complex, ComplexField
 }
 
 @OptIn(UnstableKMathAPI::class)
-public class ComplexFieldND(override val shape: Shape) :
+public class ComplexFieldND(override val shape: ShapeND) :
     ComplexFieldOpsND(), FieldND<Complex, ComplexField>,
     NumbersAddOps<StructureND<Complex>> {
 
@@ -71,12 +71,12 @@ public class ComplexFieldND(override val shape: Shape) :
 
 public val ComplexField.ndAlgebra: ComplexFieldOpsND get() = ComplexFieldOpsND
 
-public fun ComplexField.ndAlgebra(vararg shape: Int): ComplexFieldND = ComplexFieldND(Shape(shape))
+public fun ComplexField.ndAlgebra(vararg shape: Int): ComplexFieldND = ComplexFieldND(ShapeND(shape))
 
 /**
  * Produce a context for n-dimensional operations inside this real field
  */
 public inline fun <R> ComplexField.withNdAlgebra(vararg shape: Int, action: ComplexFieldND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return ComplexFieldND(Shape(shape)).action()
+    return ComplexFieldND(ShapeND(shape)).action()
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 52f04d76a..5976b67b1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -21,7 +21,7 @@ public class BufferedLinearSpace<T, out A : Ring<T>>(
     private val ndAlgebra = BufferedRingOpsND(bufferAlgebra)
 
     override fun buildMatrix(rows: Int, columns: Int, initializer: A.(i: Int, j: Int) -> T): Matrix<T> =
-        ndAlgebra.structureND(Shape(rows, columns)) { (i, j) -> elementAlgebra.initializer(i, j) }.as2D()
+        ndAlgebra.structureND(ShapeND(rows, columns)) { (i, j) -> elementAlgebra.initializer(i, j) }.as2D()
 
     override fun buildVector(size: Int, initializer: A.(Int) -> T): Point<T> =
         bufferAlgebra.buffer(size) { elementAlgebra.initializer(it) }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
index 47ab5bece..4e7ab55ef 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
@@ -21,7 +21,7 @@ public object DoubleLinearSpace : LinearSpace<Double, DoubleField> {
         rows: Int,
         columns: Int,
         initializer: DoubleField.(i: Int, j: Int) -> Double
-    ): Matrix<Double> = DoubleFieldOpsND.structureND(Shape(rows, columns)) { (i, j) ->
+    ): Matrix<Double> = DoubleFieldOpsND.structureND(ShapeND(rows, columns)) { (i, j) ->
         DoubleField.initializer(i, j)
     }.as2D()
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
index b7ed6e867..55b970f4a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/VirtualMatrix.kt
@@ -5,7 +5,8 @@
 
 package space.kscience.kmath.linear
 
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
+
 
 /**
  * The matrix where each element is evaluated each time when is being accessed.
@@ -18,7 +19,7 @@ public class VirtualMatrix<out T : Any>(
     public val generator: (i: Int, j: Int) -> T,
 ) : Matrix<T> {
 
-    override val shape: Shape get() = Shape(rowNum, colNum)
+    override val shape: ShapeND get() = ShapeND(rowNum, colNum)
 
     override operator fun get(i: Int, j: Int): T = generator(i, j)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index 101f90160..d53f5488a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -25,7 +25,7 @@ public interface AlgebraND<T, out C : Algebra<T>>: Algebra<StructureND<T>> {
     /**
      * Produces a new [StructureND] using given initializer function.
      */
-    public fun structureND(shape: Shape, initializer: C.(IntArray) -> T): StructureND<T>
+    public fun structureND(shape: ShapeND, initializer: C.(IntArray) -> T): StructureND<T>
 
     /**
      * Maps elements from one structure to another one by applying [transform] to them.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index 597fc7d97..781d2e367 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -12,11 +12,11 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 
 public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
-    public val indexerBuilder: (Shape) -> ShapeIndexer
+    public val indexerBuilder: (ShapeND) -> ShapeIndexer
     public val bufferAlgebra: BufferAlgebra<T, A>
     override val elementAlgebra: A get() = bufferAlgebra.elementAlgebra
 
-    override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): BufferND<T> {
+    override fun structureND(shape: ShapeND, initializer: A.(IntArray) -> T): BufferND<T> {
         val indexer = indexerBuilder(shape)
         return BufferND(
             indexer,
@@ -47,7 +47,7 @@ public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
         zipInline(left.toBufferND(), right.toBufferND(), transform)
 
     public companion object {
-        public val defaultIndexerBuilder: (Shape) -> ShapeIndexer = ::Strides
+        public val defaultIndexerBuilder: (ShapeND) -> ShapeIndexer = ::Strides
     }
 }
 
@@ -99,24 +99,24 @@ internal inline fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.zipInline(
 @OptIn(PerformancePitfall::class)
 public open class BufferedGroupNDOps<T, out A : Group<T>>(
     override val bufferAlgebra: BufferAlgebra<T, A>,
-    override val indexerBuilder: (Shape) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
+    override val indexerBuilder: (ShapeND) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
 ) : GroupOpsND<T, A>, BufferAlgebraND<T, A> {
     override fun StructureND<T>.unaryMinus(): StructureND<T> = map { -it }
 }
 
 public open class BufferedRingOpsND<T, out A : Ring<T>>(
     bufferAlgebra: BufferAlgebra<T, A>,
-    indexerBuilder: (Shape) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
+    indexerBuilder: (ShapeND) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
 ) : BufferedGroupNDOps<T, A>(bufferAlgebra, indexerBuilder), RingOpsND<T, A>
 
 public open class BufferedFieldOpsND<T, out A : Field<T>>(
     bufferAlgebra: BufferAlgebra<T, A>,
-    indexerBuilder: (Shape) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
+    indexerBuilder: (ShapeND) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
 ) : BufferedRingOpsND<T, A>(bufferAlgebra, indexerBuilder), FieldOpsND<T, A> {
 
     public constructor(
         elementAlgebra: A,
-        indexerBuilder: (Shape) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
+        indexerBuilder: (ShapeND) -> ShapeIndexer = BufferAlgebraND.defaultIndexerBuilder,
     ) : this(BufferFieldOps(elementAlgebra), indexerBuilder)
 
     @OptIn(PerformancePitfall::class)
@@ -131,7 +131,7 @@ public val <T, A : Field<T>> BufferAlgebra<T, A>.nd: BufferedFieldOpsND<T, A> ge
 public fun <T, A : Algebra<T>> BufferAlgebraND<T, A>.structureND(
     vararg shape: Int,
     initializer: A.(IntArray) -> T,
-): BufferND<T> = structureND(Shape(shape), initializer)
+): BufferND<T> = structureND(ShapeND(shape), initializer)
 
 public fun <T, EA : Algebra<T>, A> A.structureND(
     initializer: EA.(IntArray) -> T,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 644b62ebe..55e8bbcf8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -24,7 +24,7 @@ public open class BufferND<out T>(
     @PerformancePitfall
     override operator fun get(index: IntArray): T = buffer[indices.offset(index)]
 
-    override val shape: Shape get() = indices.shape
+    override val shape: ShapeND get() = indices.shape
 
     override fun toString(): String = StructureND.toString(this)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index 182ce38d6..b5ed64108 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -74,7 +74,7 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
         transform: DoubleField.(Double, Double) -> Double,
     ): BufferND<Double> = zipInline(left.toBufferND(), right.toBufferND()) { l, r -> DoubleField.transform(l, r) }
 
-    override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): DoubleBufferND {
+    override fun structureND(shape: ShapeND, initializer: DoubleField.(IntArray) -> Double): DoubleBufferND {
         val indexer = indexerBuilder(shape)
         return DoubleBufferND(
             indexer,
@@ -189,7 +189,7 @@ public sealed class DoubleFieldOpsND : BufferedFieldOpsND<Double, DoubleField>(D
 }
 
 @OptIn(UnstableKMathAPI::class)
-public class DoubleFieldND(override val shape: Shape) :
+public class DoubleFieldND(override val shape: ShapeND) :
     DoubleFieldOpsND(), FieldND<Double, DoubleField>, NumbersAddOps<StructureND<Double>>,
     ExtendedField<StructureND<Double>> {
 
@@ -231,8 +231,8 @@ public class DoubleFieldND(override val shape: Shape) :
 
 public val DoubleField.ndAlgebra: DoubleFieldOpsND get() = DoubleFieldOpsND
 
-public fun DoubleField.ndAlgebra(vararg shape: Int): DoubleFieldND = DoubleFieldND(Shape(shape))
-public fun DoubleField.ndAlgebra(shape: Shape): DoubleFieldND = DoubleFieldND(shape)
+public fun DoubleField.ndAlgebra(vararg shape: Int): DoubleFieldND = DoubleFieldND(ShapeND(shape))
+public fun DoubleField.ndAlgebra(shape: ShapeND): DoubleFieldND = DoubleFieldND(shape)
 
 /**
  * Produce a context for n-dimensional operations inside this real field
@@ -240,5 +240,5 @@ public fun DoubleField.ndAlgebra(shape: Shape): DoubleFieldND = DoubleFieldND(sh
 @UnstableKMathAPI
 public inline fun <R> DoubleField.withNdAlgebra(vararg shape: Int, action: DoubleFieldND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return DoubleFieldND(Shape(shape)).run(action)
+    return DoubleFieldND(ShapeND(shape)).run(action)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt
index 697e351d2..f46defeee 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt
@@ -20,7 +20,7 @@ public class IntBufferND(
 
 public sealed class IntRingOpsND : BufferedRingOpsND<Int, IntRing>(IntRing.bufferAlgebra) {
 
-    override fun structureND(shape: Shape, initializer: IntRing.(IntArray) -> Int): IntBufferND {
+    override fun structureND(shape: ShapeND, initializer: IntRing.(IntArray) -> Int): IntBufferND {
         val indexer = indexerBuilder(shape)
         return IntBufferND(
             indexer,
@@ -35,7 +35,7 @@ public sealed class IntRingOpsND : BufferedRingOpsND<Int, IntRing>(IntRing.buffe
 
 @OptIn(UnstableKMathAPI::class)
 public class IntRingND(
-    override val shape: Shape
+    override val shape: ShapeND
 ) : IntRingOpsND(), RingND<Int, IntRing>, NumbersAddOps<StructureND<Int>> {
 
     override fun number(value: Number): BufferND<Int> {
@@ -46,5 +46,5 @@ public class IntRingND(
 
 public inline fun <R> IntRing.withNdAlgebra(vararg shape: Int, action: IntRingND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return IntRingND(Shape(shape)).run(action)
+    return IntRingND(ShapeND(shape)).run(action)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/PermutedStructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/PermutedStructureND.kt
index 0efc7beb0..e4ba72cec 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/PermutedStructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/PermutedStructureND.kt
@@ -13,7 +13,7 @@ public class PermutedStructureND<T>(
     public val permutation: (IntArray) -> IntArray,
 ) : StructureND<T> {
 
-    override val shape: Shape
+    override val shape: ShapeND
         get() = origin.shape
 
     @OptIn(PerformancePitfall::class)
@@ -28,7 +28,7 @@ public fun <T> StructureND<T>.permute(
 
 public class PermutedMutableStructureND<T>(
     public val origin: MutableStructureND<T>,
-    override val shape: Shape = origin.shape,
+    override val shape: ShapeND = origin.shape,
     public val permutation: (IntArray) -> IntArray,
 ) : MutableStructureND<T> {
 
@@ -45,6 +45,6 @@ public class PermutedMutableStructureND<T>(
 }
 
 public fun <T> MutableStructureND<T>.permute(
-    newShape: Shape = shape,
+    newShape: ShapeND = shape,
     permutation: (IntArray) -> IntArray,
 ): PermutedMutableStructureND<T> = PermutedMutableStructureND(this, newShape, permutation)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
deleted file mode 100644
index 8dd17ab32..000000000
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Shape.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.nd
-
-import space.kscience.kmath.misc.UnsafeKMathAPI
-import kotlin.jvm.JvmInline
-
-/**
- * A read-only ND shape
- */
-@JvmInline
-public value class Shape(@PublishedApi internal val array: IntArray) {
-    public val size: Int get() = array.size
-    public operator fun get(index: Int): Int = array[index]
-    override fun toString(): String = array.contentToString()
-}
-
-public inline fun Shape.forEach(block: (value: Int) -> Unit): Unit = array.forEach(block)
-
-public inline fun Shape.forEachIndexed(block: (index: Int, value: Int) -> Unit): Unit = array.forEachIndexed(block)
-
-public infix fun Shape.contentEquals(other: Shape): Boolean = array.contentEquals(other.array)
-
-public fun Shape.contentHashCode(): Int = array.contentHashCode()
-
-public val Shape.indices: IntRange get() = array.indices
-public val Shape.linearSize: Int get() = array.reduce(Int::times)
-
-public fun Shape.slice(range: IntRange): Shape = Shape(array.sliceArray(range))
-
-public fun Shape.last(): Int = array.last()
-
-/**
- * A shape including last [n] dimensions of this shape
- */
-public fun Shape.last(n: Int): Shape = Shape(array.copyOfRange(size - n, size))
-
-public fun Shape.first(): Int = array.first()
-
-/**
- * A shape including first [n] dimensions of this shape
- */
-public fun Shape.first(n: Int): Shape = Shape(array.copyOfRange(0, n))
-
-public operator fun Shape.plus(add: IntArray): Shape = Shape(array + add)
-
-public operator fun Shape.plus(add: Shape): Shape = Shape(array + add.array)
-
-public fun Shape.isEmpty(): Boolean = size == 0
-public fun Shape.isNotEmpty(): Boolean = size > 0
-
-public fun Shape.transposed(i: Int, j: Int): Shape = Shape(array.copyOf().apply {
-    val ith = get(i)
-    val jth = get(j)
-    set(i, jth)
-    set(j, ith)
-})
-
-public operator fun Shape.component1(): Int = get(0)
-public operator fun Shape.component2(): Int = get(1)
-public operator fun Shape.component3(): Int = get(2)
-
-/**
- * Convert to array with protective copy
- */
-public fun Shape.toArray(): IntArray = array.copyOf()
-
-@UnsafeKMathAPI
-public fun Shape.asArray(): IntArray = array
-
-public fun Shape.asList(): List<Int> = array.asList()
-
-
-/**
- * An exception is thrown when the expected and actual shape of NDArray differ.
- *
- * @property expected the expected shape.
- * @property actual the actual shape.
- */
-public class ShapeMismatchException(public val expected: Shape, public val actual: Shape) :
-    RuntimeException("Shape $actual doesn't fit in expected shape ${expected}.")
-
-public class IndexOutOfShapeException(public val shape: Shape, public val index: IntArray) :
-    RuntimeException("Index ${index.contentToString()} is out of shape ${shape}")
-
-public fun Shape(shapeFirst: Int, vararg shapeRest: Int): Shape = Shape(intArrayOf(shapeFirst, *shapeRest))
-
-public interface WithShape {
-    public val shape: Shape
-
-    public val indices: ShapeIndexer get() = ColumnStrides(shape)
-}
-
-internal fun requireIndexInShape(index: IntArray, shape: Shape) {
-    if (index.size != shape.size) throw IndexOutOfShapeException(shape, index)
-    shape.forEachIndexed { axis, axisShape ->
-        if (index[axis] !in 0 until axisShape) throw IndexOutOfShapeException(shape, index)
-    }
-}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
index d2ea302fd..37e0c7b5e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
@@ -12,7 +12,7 @@ import kotlin.native.concurrent.ThreadLocal
  * A converter from linear index to multivariate index
  */
 public interface ShapeIndexer : Iterable<IntArray> {
-    public val shape: Shape
+    public val shape: ShapeND
 
     /**
      * Get linear index from multidimensional index
@@ -68,7 +68,7 @@ public abstract class Strides : ShapeIndexer {
 /**
  * Column-first [Strides]. Columns are represented as continuous arrays
  */
-public class ColumnStrides(override val shape: Shape) : Strides() {
+public class ColumnStrides(override val shape: ShapeND) : Strides() {
     override val linearSize: Int get() = strides[shape.size]
 
     /**
@@ -118,7 +118,7 @@ public class ColumnStrides(override val shape: Shape) : Strides() {
  *
  * @param shape the shape of the tensor.
  */
-public class RowStrides(override val shape: Shape) : Strides() {
+public class RowStrides(override val shape: ShapeND) : Strides() {
 
     override val strides: IntArray by lazy {
         val nDim = shape.size
@@ -163,9 +163,9 @@ public class RowStrides(override val shape: Shape) : Strides() {
 }
 
 @ThreadLocal
-private val defaultStridesCache = HashMap<Shape, Strides>()
+private val defaultStridesCache = HashMap<ShapeND, Strides>()
 
 /**
  * Cached builder for default strides
  */
-public fun Strides(shape: Shape): Strides = defaultStridesCache.getOrPut(shape) { RowStrides(shape) }
\ No newline at end of file
+public fun Strides(shape: ShapeND): Strides = defaultStridesCache.getOrPut(shape) { RowStrides(shape) }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeND.kt
new file mode 100644
index 000000000..63728e94f
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeND.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.nd
+
+import space.kscience.kmath.misc.UnsafeKMathAPI
+import kotlin.jvm.JvmInline
+
+/**
+ * A read-only ND shape
+ */
+@JvmInline
+public value class ShapeND(@PublishedApi internal val array: IntArray) {
+    public val size: Int get() = array.size
+    public operator fun get(index: Int): Int = array[index]
+    override fun toString(): String = array.contentToString()
+}
+
+public inline fun ShapeND.forEach(block: (value: Int) -> Unit): Unit = array.forEach(block)
+
+public inline fun ShapeND.forEachIndexed(block: (index: Int, value: Int) -> Unit): Unit = array.forEachIndexed(block)
+
+public infix fun ShapeND.contentEquals(other: ShapeND): Boolean = array.contentEquals(other.array)
+
+public fun ShapeND.contentHashCode(): Int = array.contentHashCode()
+
+public val ShapeND.indices: IntRange get() = array.indices
+public val ShapeND.linearSize: Int get() = array.reduce(Int::times)
+
+public fun ShapeND.slice(range: IntRange): ShapeND = ShapeND(array.sliceArray(range))
+
+public fun ShapeND.last(): Int = array.last()
+
+/**
+ * A shape including last [n] dimensions of this shape
+ */
+public fun ShapeND.last(n: Int): ShapeND = ShapeND(array.copyOfRange(size - n, size))
+
+public fun ShapeND.first(): Int = array.first()
+
+/**
+ * A shape including first [n] dimensions of this shape
+ */
+public fun ShapeND.first(n: Int): ShapeND = ShapeND(array.copyOfRange(0, n))
+
+public operator fun ShapeND.plus(add: IntArray): ShapeND = ShapeND(array + add)
+
+public operator fun ShapeND.plus(add: ShapeND): ShapeND = ShapeND(array + add.array)
+
+public fun ShapeND.isEmpty(): Boolean = size == 0
+public fun ShapeND.isNotEmpty(): Boolean = size > 0
+
+public fun ShapeND.transposed(i: Int, j: Int): ShapeND = ShapeND(array.copyOf().apply {
+    val ith = get(i)
+    val jth = get(j)
+    set(i, jth)
+    set(j, ith)
+})
+
+public operator fun ShapeND.component1(): Int = get(0)
+public operator fun ShapeND.component2(): Int = get(1)
+public operator fun ShapeND.component3(): Int = get(2)
+
+/**
+ * Convert to array with protective copy
+ */
+public fun ShapeND.toArray(): IntArray = array.copyOf()
+
+@UnsafeKMathAPI
+public fun ShapeND.asArray(): IntArray = array
+
+public fun ShapeND.asList(): List<Int> = array.asList()
+
+
+/**
+ * An exception is thrown when the expected and actual shape of NDArray differ.
+ *
+ * @property expected the expected shape.
+ * @property actual the actual shape.
+ */
+public class ShapeMismatchException(public val expected: ShapeND, public val actual: ShapeND) :
+    RuntimeException("Shape $actual doesn't fit in expected shape ${expected}.")
+
+public class IndexOutOfShapeException(public val shape: ShapeND, public val index: IntArray) :
+    RuntimeException("Index ${index.contentToString()} is out of shape ${shape}")
+
+public fun ShapeND(shapeFirst: Int, vararg shapeRest: Int): ShapeND = ShapeND(intArrayOf(shapeFirst, *shapeRest))
+
+public interface WithShape {
+    public val shape: ShapeND
+
+    public val indices: ShapeIndexer get() = ColumnStrides(shape)
+}
+
+internal fun requireIndexInShape(index: IntArray, shape: ShapeND) {
+    if (index.size != shape.size) throw IndexOutOfShapeException(shape, index)
+    shape.forEachIndexed { axis, axisShape ->
+        if (index[axis] !in 0 until axisShape) throw IndexOutOfShapeException(shape, index)
+    }
+}
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
index d34c722a1..34d748b3f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
@@ -18,7 +18,7 @@ public sealed class ShortRingOpsND : BufferedRingOpsND<Short, ShortRing>(ShortRi
 
 @OptIn(UnstableKMathAPI::class)
 public class ShortRingND(
-    override val shape: Shape
+    override val shape: ShapeND
 ) : ShortRingOpsND(), RingND<Short, ShortRing>, NumbersAddOps<StructureND<Short>> {
 
     override fun number(value: Number): BufferND<Short> {
@@ -30,5 +30,5 @@ public class ShortRingND(
 
 public inline fun <R> ShortRing.withNdAlgebra(vararg shape: Int, action: ShortRingND.() -> R): R {
     contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
-    return ShortRingND(Shape(shape)).run(action)
+    return ShortRingND(ShapeND(shape)).run(action)
 }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index 51a3d7fd0..ba48e25ce 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -46,7 +46,7 @@ public interface MutableStructure1D<T> : Structure1D<T>, MutableStructureND<T>,
  */
 @JvmInline
 private value class Structure1DWrapper<out T>(val structure: StructureND<T>) : Structure1D<T> {
-    override val shape: Shape get() = structure.shape
+    override val shape: ShapeND get() = structure.shape
     override val size: Int get() = structure.shape[0]
 
     @PerformancePitfall
@@ -60,7 +60,7 @@ private value class Structure1DWrapper<out T>(val structure: StructureND<T>) : S
  * A 1D wrapper for a mutable nd-structure
  */
 private class MutableStructure1DWrapper<T>(val structure: MutableStructureND<T>) : MutableStructure1D<T> {
-    override val shape: Shape get() = structure.shape
+    override val shape: ShapeND get() = structure.shape
     override val size: Int get() = structure.shape[0]
 
     @PerformancePitfall
@@ -90,7 +90,7 @@ private class MutableStructure1DWrapper<T>(val structure: MutableStructureND<T>)
  */
 @JvmInline
 private value class Buffer1DWrapper<out T>(val buffer: Buffer<T>) : Structure1D<T> {
-    override val shape: Shape get() = Shape(buffer.size)
+    override val shape: ShapeND get() = ShapeND(buffer.size)
     override val size: Int get() = buffer.size
 
     @PerformancePitfall
@@ -102,7 +102,7 @@ private value class Buffer1DWrapper<out T>(val buffer: Buffer<T>) : Structure1D<
 }
 
 internal class MutableBuffer1DWrapper<T>(val buffer: MutableBuffer<T>) : MutableStructure1D<T> {
-    override val shape: Shape get() = Shape(buffer.size)
+    override val shape: ShapeND get() = ShapeND(buffer.size)
     override val size: Int get() = buffer.size
 
     @PerformancePitfall
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index d10c43c25..a9c6c2748 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -29,7 +29,7 @@ public interface Structure2D<out T> : StructureND<T> {
      */
     public val colNum: Int
 
-    override val shape: Shape get() = Shape(rowNum, colNum)
+    override val shape: ShapeND get() = ShapeND(rowNum, colNum)
 
     /**
      * The buffer of rows of this structure. It gets elements from the structure dynamically.
@@ -102,7 +102,7 @@ public interface MutableStructure2D<T> : Structure2D<T>, MutableStructureND<T> {
  */
 @JvmInline
 private value class Structure2DWrapper<out T>(val structure: StructureND<T>) : Structure2D<T> {
-    override val shape: Shape get() = structure.shape
+    override val shape: ShapeND get() = structure.shape
 
     override val rowNum: Int get() = shape[0]
     override val colNum: Int get() = shape[1]
@@ -120,7 +120,7 @@ private value class Structure2DWrapper<out T>(val structure: StructureND<T>) : S
  * A 2D wrapper for a mutable nd-structure
  */
 private class MutableStructure2DWrapper<T>(val structure: MutableStructureND<T>) : MutableStructure2D<T> {
-    override val shape: Shape get() = structure.shape
+    override val shape: ShapeND get() = structure.shape
 
     override val rowNum: Int get() = shape[0]
     override val colNum: Int get() = shape[1]
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index baea5da15..c96843651 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -33,7 +33,7 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
      * The shape of structure i.e., non-empty sequence of non-negative integers that specify sizes of dimensions of
      * this structure.
      */
-    override val shape: Shape
+    override val shape: ShapeND
 
     /**
      * The count of dimensions in this structure. It should be equal to size of [shape].
@@ -147,13 +147,13 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
         ): BufferND<T> = BufferND(strides, Buffer.auto(type, strides.linearSize) { i -> initializer(strides.index(i)) })
 
         public fun <T> buffered(
-            shape: Shape,
+            shape: ShapeND,
             bufferFactory: BufferFactory<T> = BufferFactory.boxing(),
             initializer: (IntArray) -> T,
         ): BufferND<T> = buffered(ColumnStrides(shape), bufferFactory, initializer)
 
         public inline fun <reified T : Any> auto(
-            shape: Shape,
+            shape: ShapeND,
             crossinline initializer: (IntArray) -> T,
         ): BufferND<T> = auto(ColumnStrides(shape), initializer)
 
@@ -162,13 +162,13 @@ public interface StructureND<out T> : Featured<StructureFeature>, WithShape {
             vararg shape: Int,
             crossinline initializer: (IntArray) -> T,
         ): BufferND<T> =
-            auto(ColumnStrides(Shape(shape)), initializer)
+            auto(ColumnStrides(ShapeND(shape)), initializer)
 
         public inline fun <T : Any> auto(
             type: KClass<T>,
             vararg shape: Int,
             crossinline initializer: (IntArray) -> T,
-        ): BufferND<T> = auto(type, ColumnStrides(Shape(shape)), initializer)
+        ): BufferND<T> = auto(type, ColumnStrides(ShapeND(shape)), initializer)
     }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
index e5edeef7f..4932dca41 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
@@ -9,7 +9,7 @@ import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 
 public open class VirtualStructureND<T>(
-    override val shape: Shape,
+    override val shape: ShapeND,
     public val producer: (IntArray) -> T,
 ) : StructureND<T> {
 
@@ -22,12 +22,12 @@ public open class VirtualStructureND<T>(
 
 @UnstableKMathAPI
 public class VirtualDoubleStructureND(
-    shape: Shape,
+    shape: ShapeND,
     producer: (IntArray) -> Double,
 ) : VirtualStructureND<Double>(shape, producer)
 
 @UnstableKMathAPI
 public class VirtualIntStructureND(
-    shape: Shape,
+    shape: ShapeND,
     producer: (IntArray) -> Int,
 ) : VirtualStructureND<Int>(shape, producer)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
index 1b7bd20db..f0d4bd7f5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/algebraNDExtentions.kt
@@ -15,9 +15,9 @@ public fun <T, A : Algebra<T>> AlgebraND<T, A>.structureND(
     shapeFirst: Int,
     vararg shapeRest: Int,
     initializer: A.(IntArray) -> T
-): StructureND<T> = structureND(Shape(shapeFirst, *shapeRest), initializer)
+): StructureND<T> = structureND(ShapeND(shapeFirst, *shapeRest), initializer)
 
-public fun <T, A : Group<T>> AlgebraND<T, A>.zero(shape: Shape): StructureND<T> = structureND(shape) { zero }
+public fun <T, A : Group<T>> AlgebraND<T, A>.zero(shape: ShapeND): StructureND<T> = structureND(shape) { zero }
 
 @JvmName("zeroVarArg")
 public fun <T, A : Group<T>> AlgebraND<T, A>.zero(
@@ -25,7 +25,7 @@ public fun <T, A : Group<T>> AlgebraND<T, A>.zero(
     vararg shapeRest: Int,
 ): StructureND<T> = structureND(shapeFirst, *shapeRest) { zero }
 
-public fun <T, A : Ring<T>> AlgebraND<T, A>.one(shape: Shape): StructureND<T> = structureND(shape) { one }
+public fun <T, A : Ring<T>> AlgebraND<T, A>.one(shape: ShapeND): StructureND<T> = structureND(shape) { one }
 
 @JvmName("oneVarArg")
 public fun <T, A : Ring<T>> AlgebraND<T, A>.one(
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
index b1b6fba9f..48f3e919b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferAccessor2D.kt
@@ -28,7 +28,7 @@ internal class BufferAccessor2D<T>(
 
     //TODO optimize wrapper
     fun MutableBuffer<T>.collect(): Structure2D<T> = StructureND.buffered(
-        ColumnStrides(Shape(rowNum, colNum)),
+        ColumnStrides(ShapeND(rowNum, colNum)),
         factory
     ) { (i, j) ->
         get(i, j)
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/StridesTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/StridesTest.kt
index 7044eb930..e6335f652 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/StridesTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/nd/StridesTest.kt
@@ -10,7 +10,7 @@ import kotlin.test.Test
 class StridesTest {
     @Test
     fun checkRowBasedStrides() {
-        val strides = RowStrides(Shape(3, 3))
+        val strides = RowStrides(ShapeND(3, 3))
         var counter = 0
         for(i in 0..2){
             for(j in 0..2){
@@ -24,7 +24,7 @@ class StridesTest {
 
     @Test
     fun checkColumnBasedStrides() {
-        val strides = ColumnStrides(Shape(3, 3))
+        val strides = ColumnStrides(ShapeND(3, 3))
         var counter = 0
         for(i in 0..2){
             for(j in 0..2){
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
index 97e27df96..1f717658e 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
@@ -9,12 +9,12 @@ import kotlinx.coroutines.*
 import space.kscience.kmath.coroutines.Math
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.ColumnStrides
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
 
 public class LazyStructureND<out T>(
     public val scope: CoroutineScope,
-    override val shape: Shape,
+    override val shape: ShapeND,
     public val function: suspend (IntArray) -> T,
 ) : StructureND<T> {
     private val cache: MutableMap<IntArray, Deferred<T>> = HashMap()
@@ -35,20 +35,24 @@ public class LazyStructureND<out T>(
     }
 }
 
+@OptIn(PerformancePitfall::class)
 public fun <T> StructureND<T>.async(index: IntArray): Deferred<T> =
     if (this is LazyStructureND<T>) this@async.async(index) else CompletableDeferred(get(index))
 
+@OptIn(PerformancePitfall::class)
 public suspend fun <T> StructureND<T>.await(index: IntArray): T =
     if (this is LazyStructureND<T>) await(index) else get(index)
 
 /**
  * PENDING would benefit from KEEP-176
  */
+@OptIn(PerformancePitfall::class)
 public inline fun <T, R> StructureND<T>.mapAsyncIndexed(
     scope: CoroutineScope,
     crossinline function: suspend (T, index: IntArray) -> R,
 ): LazyStructureND<R> = LazyStructureND(scope, shape) { index -> function(get(index), index) }
 
+@OptIn(PerformancePitfall::class)
 public inline fun <T, R> StructureND<T>.mapAsync(
     scope: CoroutineScope,
     crossinline function: suspend (T) -> R,
diff --git a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
index 30c84d848..dde2d4fcf 100644
--- a/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
+++ b/kmath-dimensions/src/commonMain/kotlin/space/kscience/kmath/dimensions/Wrappers.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.dimensions
 
 import space.kscience.kmath.linear.*
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Ring
@@ -48,7 +48,7 @@ public interface DMatrix<out T, R : Dimension, C : Dimension> : Structure2D<T> {
 public value class DMatrixWrapper<out T, R : Dimension, C : Dimension>(
     private val structure: Structure2D<T>,
 ) : DMatrix<T, R, C> {
-    override val shape: Shape get() = structure.shape
+    override val shape: ShapeND get() = structure.shape
     override val rowNum: Int get() = shape[0]
     override val colNum: Int get() = shape[1]
     override operator fun get(i: Int, j: Int): T = structure[i, j]
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
index 06320c8d9..623452422 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
@@ -10,7 +10,7 @@ import space.kscience.kmath.linear.Point
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.FieldOpsND
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.Group
 import space.kscience.kmath.operations.ScaleOperations
@@ -45,7 +45,7 @@ public class HistogramND<T : Comparable<T>, D : Domain<T>, V : Any>(
  */
 public interface HistogramGroupND<T : Comparable<T>, D : Domain<T>, V : Any> :
     Group<HistogramND<T, D, V>>, ScaleOperations<HistogramND<T, D, V>> {
-    public val shape: Shape
+    public val shape: ShapeND
     public val valueAlgebraND: FieldOpsND<V, *> //= NDAlgebra.space(valueSpace, Buffer.Companion::boxing, *shape),
 
     /**
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
index cf8b59087..f22ea9776 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
@@ -39,7 +39,7 @@ public class UniformHistogramGroupND<V : Any, A : Field<V>>(
 
     public val dimension: Int get() = lower.size
 
-    override val shape: Shape = Shape(IntArray(binNums.size) { binNums[it] + 2 })
+    override val shape: ShapeND = ShapeND(IntArray(binNums.size) { binNums[it] + 2 })
 
     private val binSize = DoubleBuffer(dimension) { (upper[it] - lower[it]) / binNums[it] }
 
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
index 88c004c7b..ae526873d 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
@@ -7,13 +7,13 @@ package space.kscience.kmath.multik
 
 import org.jetbrains.kotlinx.multik.ndarray.data.*
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.tensors.api.Tensor
 import kotlin.jvm.JvmInline
 
 @JvmInline
 public value class MultikTensor<T>(public val array: MutableMultiArray<T, DN>) : Tensor<T> {
-    override val shape: Shape get() = Shape(array.shape)
+    override val shape: ShapeND get() = ShapeND(array.shape)
 
     @PerformancePitfall
     override fun get(index: IntArray): T = array[index]
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index 99cbc3193..1736b48e3 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -32,7 +32,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
     protected val multikStat: Statistics = multikEngine.getStatistics()
 
     @OptIn(UnsafeKMathAPI::class)
-    override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): MultikTensor<T> {
+    override fun structureND(shape: ShapeND, initializer: A.(IntArray) -> T): MultikTensor<T> {
         val strides = ColumnStrides(shape)
         val memoryView = initMemoryView<T>(strides.linearSize, type)
         strides.asSequence().forEachIndexed { linearIndex, tensorIndex ->
@@ -123,7 +123,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
     public fun MutableMultiArray<T, *>.wrap(): MultikTensor<T> = MultikTensor(this.asDNArray())
 
     @OptIn(PerformancePitfall::class)
-    override fun StructureND<T>.valueOrNull(): T? = if (shape contentEquals Shape(1)) {
+    override fun StructureND<T>.valueOrNull(): T? = if (shape contentEquals ShapeND(1)) {
         get(intArrayOf(0))
     } else null
 
@@ -211,7 +211,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
 
     override fun StructureND<T>.transposed(i: Int, j: Int): MultikTensor<T> = asMultik().array.transpose(i, j).wrap()
 
-    override fun Tensor<T>.view(shape: Shape): MultikTensor<T> {
+    override fun Tensor<T>.view(shape: ShapeND): MultikTensor<T> {
         require(shape.asList().all { it > 0 })
         require(shape.linearSize == this.shape.size) {
             "Cannot reshape array of size ${this.shape.size} into a new shape ${
@@ -223,7 +223,7 @@ public abstract class MultikTensorAlgebra<T, A : Ring<T>>(
         }
 
         val mt = asMultik().array
-        return if (Shape(mt.shape).contentEquals(shape)) {
+        return if (ShapeND(mt.shape).contentEquals(shape)) {
             mt
         } else {
             @OptIn(UnsafeKMathAPI::class)
diff --git a/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
index de54af732..afd292904 100644
--- a/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
+++ b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.multik
 
 import org.jetbrains.kotlinx.multik.default.DefaultEngine
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.one
 import space.kscience.kmath.operations.DoubleField
@@ -29,8 +29,8 @@ internal class MultikNDTest {
     fun dotResult() {
         val dim = 100
 
-        val tensor1 = DoubleTensorAlgebra.randomNormal(shape = Shape(dim, dim), 12224)
-        val tensor2 = DoubleTensorAlgebra.randomNormal(shape = Shape(dim, dim), 12225)
+        val tensor1 = DoubleTensorAlgebra.randomNormal(shape = ShapeND(dim, dim), 12224)
+        val tensor2 = DoubleTensorAlgebra.randomNormal(shape = ShapeND(dim, dim), 12225)
 
         val multikResult = with(multikAlgebra) {
             tensor1 dot tensor2
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index 7654ec9ce..6f01233d7 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -33,7 +33,8 @@ public sealed interface Nd4jArrayAlgebra<T, out C : Algebra<T>> : AlgebraND<T, C
      */
     public val StructureND<T>.ndArray: INDArray
 
-    override fun structureND(shape: Shape, initializer: C.(IntArray) -> T): Nd4jArrayStructure<T> {
+    @OptIn(PerformancePitfall::class)
+    override fun structureND(shape: ShapeND, initializer: C.(IntArray) -> T): Nd4jArrayStructure<T> {
         @OptIn(UnsafeKMathAPI::class)
         val struct: Nd4jArrayStructure<T> = Nd4j.create(*shape.asArray())!!.wrap()
         struct.indicesIterator().forEach { struct[it] = elementAlgebra.initializer(it) }
@@ -224,10 +225,10 @@ public open class DoubleNd4jArrayFieldOps : Nd4jArrayExtendedFieldOps<Double, Do
 
 public val DoubleField.nd4j: DoubleNd4jArrayFieldOps get() = DoubleNd4jArrayFieldOps
 
-public class DoubleNd4jArrayField(override val shape: Shape) : DoubleNd4jArrayFieldOps(), FieldND<Double, DoubleField>
+public class DoubleNd4jArrayField(override val shape: ShapeND) : DoubleNd4jArrayFieldOps(), FieldND<Double, DoubleField>
 
 public fun DoubleField.nd4j(shapeFirst: Int, vararg shapeRest: Int): DoubleNd4jArrayField =
-    DoubleNd4jArrayField(Shape(shapeFirst, * shapeRest))
+    DoubleNd4jArrayField(ShapeND(shapeFirst, * shapeRest))
 
 
 /**
@@ -271,12 +272,12 @@ public open class FloatNd4jArrayFieldOps : Nd4jArrayExtendedFieldOps<Float, Floa
     public companion object : FloatNd4jArrayFieldOps()
 }
 
-public class FloatNd4jArrayField(override val shape: Shape) : FloatNd4jArrayFieldOps(), RingND<Float, FloatField>
+public class FloatNd4jArrayField(override val shape: ShapeND) : FloatNd4jArrayFieldOps(), RingND<Float, FloatField>
 
 public val FloatField.nd4j: FloatNd4jArrayFieldOps get() = FloatNd4jArrayFieldOps
 
 public fun FloatField.nd4j(shapeFirst: Int, vararg shapeRest: Int): FloatNd4jArrayField =
-    FloatNd4jArrayField(Shape(shapeFirst, * shapeRest))
+    FloatNd4jArrayField(ShapeND(shapeFirst, * shapeRest))
 
 /**
  * Represents [RingND] over [Nd4jArrayIntStructure].
@@ -312,7 +313,7 @@ public open class IntNd4jArrayRingOps : Nd4jArrayRingOps<Int, IntRing> {
 
 public val IntRing.nd4j: IntNd4jArrayRingOps get() = IntNd4jArrayRingOps
 
-public class IntNd4jArrayRing(override val shape: Shape) : IntNd4jArrayRingOps(), RingND<Int, IntRing>
+public class IntNd4jArrayRing(override val shape: ShapeND) : IntNd4jArrayRingOps(), RingND<Int, IntRing>
 
 public fun IntRing.nd4j(shapeFirst: Int, vararg shapeRest: Int): IntNd4jArrayRing =
-    IntNd4jArrayRing(Shape(shapeFirst, * shapeRest))
\ No newline at end of file
+    IntNd4jArrayRing(ShapeND(shapeFirst, * shapeRest))
\ No newline at end of file
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
index 60c865a02..a1405ccfb 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
@@ -21,7 +21,7 @@ public sealed class Nd4jArrayStructure<T> : MutableStructureND<T> {
      */
     public abstract val ndArray: INDArray
 
-    override val shape: Shape get() = Shape(ndArray.shape().toIntArray())
+    override val shape: ShapeND get() = ShapeND(ndArray.shape().toIntArray())
 
     internal abstract fun elementsIterator(): Iterator<Pair<IntArray, T>>
     internal fun indicesIterator(): Iterator<IntArray> = ndArray.indicesIterator()
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index d505b3c0e..62bfe90ba 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -37,7 +37,7 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
      */
     public val StructureND<T>.ndArray: INDArray
 
-    override fun structureND(shape: Shape, initializer: A.(IntArray) -> T): Nd4jArrayStructure<T>
+    override fun structureND(shape: ShapeND, initializer: A.(IntArray) -> T): Nd4jArrayStructure<T>
 
     @OptIn(PerformancePitfall::class)
     override fun StructureND<T>.map(transform: A.(T) -> T): Nd4jArrayStructure<T> =
@@ -108,7 +108,7 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
         ndArray.max(keepDim, dim).wrap()
 
     @OptIn(UnsafeKMathAPI::class)
-    override fun Tensor<T>.view(shape: Shape): Nd4jArrayStructure<T> = ndArray.reshape(shape.asArray()).wrap()
+    override fun Tensor<T>.view(shape: ShapeND): Nd4jArrayStructure<T> = ndArray.reshape(shape.asArray()).wrap()
 
     override fun Tensor<T>.viewAs(other: StructureND<T>): Nd4jArrayStructure<T> = view(other.shape)
 
@@ -178,7 +178,7 @@ public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double, DoubleField> {
     override fun INDArray.wrap(): Nd4jArrayStructure<Double> = asDoubleStructure()
 
     @OptIn(UnsafeKMathAPI::class)
-    override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): Nd4jArrayStructure<Double> {
+    override fun structureND(shape: ShapeND, initializer: DoubleField.(IntArray) -> Double): Nd4jArrayStructure<Double> {
         val array: INDArray = Nd4j.zeros(*shape.asArray())
         val indices = ColumnStrides(shape)
         indices.asSequence().forEach { index ->
@@ -198,7 +198,7 @@ public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double, DoubleField> {
         }
 
     override fun StructureND<Double>.valueOrNull(): Double? =
-        if (shape contentEquals Shape(1)) ndArray.getDouble(0) else null
+        if (shape contentEquals ShapeND(1)) ndArray.getDouble(0) else null
 
     // TODO rewrite
     override fun diagonalEmbedding(
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
index 674485fd1..27a20aafe 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
@@ -14,7 +14,7 @@ import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.ColumnStrides
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.PowerOperations
@@ -28,7 +28,7 @@ public class DoubleTensorFlowOutput(
 
 }
 
-internal fun Shape.toLongArray(): LongArray = LongArray(size) { get(it).toLong() }
+internal fun ShapeND.toLongArray(): LongArray = LongArray(size) { get(it).toLong() }
 
 public class DoubleTensorFlowAlgebra internal constructor(
     graph: Graph,
@@ -37,7 +37,7 @@ public class DoubleTensorFlowAlgebra internal constructor(
     override val elementAlgebra: DoubleField get() = DoubleField
 
     override fun structureND(
-        shape: Shape,
+        shape: ShapeND,
         initializer: DoubleField.(IntArray) -> Double,
     ): StructureND<Double> {
         val res = TFloat64.tensorOf(org.tensorflow.ndarray.Shape.of(*shape.toLongArray())) { array ->
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index a1e0335f8..435b01b80 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -20,7 +20,7 @@ import org.tensorflow.types.family.TType
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnsafeKMathAPI
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.asArray
 import space.kscience.kmath.nd.contentEquals
@@ -41,12 +41,14 @@ public sealed interface TensorFlowTensor<T> : Tensor<T>
  */
 @JvmInline
 public value class TensorFlowArray<T>(public val tensor: NdArray<T>) : Tensor<T> {
-    override val shape: Shape get() = Shape(tensor.shape().asArray().toIntArray())
+    override val shape: ShapeND get() = ShapeND(tensor.shape().asArray().toIntArray())
 
+    @PerformancePitfall
     override fun get(index: IntArray): T = tensor.getObject(*index.toLongArray())
 
     //TODO implement native element sequence
 
+    @PerformancePitfall
     override fun set(index: IntArray, value: T) {
         tensor.setObject(value, *index.toLongArray())
     }
@@ -65,7 +67,7 @@ public abstract class TensorFlowOutput<T, TT : TType>(
     public var output: Output<TT> = output
         internal set
 
-    override val shape: Shape get() = Shape(output.shape().asArray().toIntArray())
+    override val shape: ShapeND get() = ShapeND(output.shape().asArray().toIntArray())
 
     protected abstract fun org.tensorflow.Tensor.actualizeTensor(): NdArray<T>
 
@@ -99,7 +101,7 @@ public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal c
 
     protected abstract fun const(value: T): Constant<TT>
 
-    override fun StructureND<T>.valueOrNull(): T? = if (shape contentEquals Shape(1))
+    override fun StructureND<T>.valueOrNull(): T? = if (shape contentEquals ShapeND(1))
         get(intArrayOf(0)) else null
 
     /**
@@ -195,7 +197,7 @@ public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal c
         ops.linalg.transpose(it, ops.constant(intArrayOf(i, j)))
     }
 
-    override fun Tensor<T>.view(shape: Shape): Tensor<T> = operate {
+    override fun Tensor<T>.view(shape: ShapeND): Tensor<T> = operate {
         @OptIn(UnsafeKMathAPI::class)
         ops.reshape(it, ops.constant(shape.asArray()))
     }
diff --git a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
index 44a594299..ff11dc8fe 100644
--- a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
+++ b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.tensorflow
 
 import org.junit.jupiter.api.Test
 import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.get
 import space.kscience.kmath.nd.structureND
 import space.kscience.kmath.operations.DoubleField
@@ -32,8 +32,8 @@ class DoubleTensorFlowOps {
     fun dot(){
         val dim = 1000
 
-        val tensor1 = DoubleTensorAlgebra.randomNormal(shape = Shape(dim, dim), 12224)
-        val tensor2 = DoubleTensorAlgebra.randomNormal(shape = Shape(dim, dim), 12225)
+        val tensor1 = DoubleTensorAlgebra.randomNormal(shape = ShapeND(dim, dim), 12224)
+        val tensor2 = DoubleTensorAlgebra.randomNormal(shape = ShapeND(dim, dim), 12225)
 
         DoubleField.produceWithTF {
             tensor1 dot tensor2
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
index ec5d6f5e6..f923400c5 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/TensorAlgebra.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.tensors.api
 
 import space.kscience.kmath.nd.RingOpsND
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.Ring
 
@@ -193,7 +193,7 @@ public interface TensorAlgebra<T, A : Ring<T>> : RingOpsND<T, A> {
      * @param shape the desired size
      * @return tensor with new shape
      */
-    public fun Tensor<T>.view(shape: Shape): Tensor<T>
+    public fun Tensor<T>.view(shape: ShapeND): Tensor<T>
 
     /**
      * View this tensor as the same size as [other].
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index c4266c669..a7283e4c8 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -7,7 +7,7 @@ package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.RowStrides
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.Strides
 import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.tensors.api.Tensor
@@ -16,7 +16,7 @@ import space.kscience.kmath.tensors.api.Tensor
  * Represents [Tensor] over a [MutableBuffer] intended to be used through [DoubleTensor] and [IntTensor]
  */
 public abstract class BufferedTensor<T>(
-    override val shape: Shape,
+    override val shape: ShapeND,
 ) : Tensor<T> {
 
     public abstract val source: MutableBuffer<T>
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
index 3dfea7f8a..12e9549da 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -84,7 +84,7 @@ public inline fun OffsetDoubleBuffer.mapInPlace(operation: (Double) -> Double) {
  * [DoubleTensor] always uses row-based strides
  */
 public class DoubleTensor(
-    shape: Shape,
+    shape: ShapeND,
     override val source: OffsetDoubleBuffer,
 ) : BufferedTensor<Double>(shape), MutableStructureNDOfDouble {
 
@@ -92,7 +92,7 @@ public class DoubleTensor(
         require(linearSize == source.size) { "Source buffer size must be equal tensor size" }
     }
 
-    public constructor(shape: Shape, buffer: DoubleBuffer) : this(shape, OffsetDoubleBuffer(buffer, 0, buffer.size))
+    public constructor(shape: ShapeND, buffer: DoubleBuffer) : this(shape, OffsetDoubleBuffer(buffer, 0, buffer.size))
 
 
     @OptIn(PerformancePitfall::class)
@@ -147,7 +147,7 @@ public value class DoubleTensor2D(public val tensor: DoubleTensor) : MutableStru
     override fun elements(): Sequence<Pair<IntArray, Double>> = tensor.elements()
     @OptIn(PerformancePitfall::class)
     override fun get(index: IntArray): Double = tensor[index]
-    override val shape: Shape get() = tensor.shape
+    override val shape: ShapeND get() = tensor.shape
 }
 
 public fun DoubleTensor.asDoubleTensor2D(): DoubleTensor2D = DoubleTensor2D(this)
@@ -162,7 +162,7 @@ public inline fun DoubleTensor.forEachMatrix(block: (index: IntArray, matrix: Do
     val n = shape.size
     check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
     val matrixOffset = shape[n - 1] * shape[n - 2]
-    val matrixShape = Shape(shape[n - 2], shape[n - 1])
+    val matrixShape = ShapeND(shape[n - 2], shape[n - 1])
 
     val size = matrixShape.linearSize
     for (i in 0 until linearSize / matrixOffset) {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index a022f31a6..ce1778013 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -92,7 +92,7 @@ public open class DoubleTensorAlgebra :
 
     override fun StructureND<Double>.valueOrNull(): Double? {
         val dt = asDoubleTensor()
-        return if (dt.shape contentEquals Shape(1)) dt.source[0] else null
+        return if (dt.shape contentEquals ShapeND(1)) dt.source[0] else null
     }
 
     override fun StructureND<Double>.value(): Double = valueOrNull()
@@ -105,7 +105,7 @@ public open class DoubleTensorAlgebra :
      * @param array one-dimensional data array.
      * @return tensor with the [shape] shape and [array] data.
      */
-    public fun fromArray(shape: Shape, array: DoubleArray): DoubleTensor {
+    public fun fromArray(shape: ShapeND, array: DoubleArray): DoubleTensor {
         checkNotEmptyShape(shape)
         checkEmptyDoubleBuffer(array)
         checkBufferShapeConsistency(shape, array)
@@ -119,7 +119,7 @@ public open class DoubleTensorAlgebra :
      * @param initializer mapping tensor indices to values.
      * @return tensor with the [shape] shape and data generated by the [initializer].
      */
-    override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): DoubleTensor = fromArray(
+    override fun structureND(shape: ShapeND, initializer: DoubleField.(IntArray) -> Double): DoubleTensor = fromArray(
         shape,
         RowStrides(shape).asSequence().map { DoubleField.initializer(it) }.toMutableList().toDoubleArray()
     )
@@ -127,7 +127,7 @@ public open class DoubleTensorAlgebra :
     override fun Tensor<Double>.getTensor(i: Int): DoubleTensor {
         val dt = asDoubleTensor()
         val lastShape = shape.last(shape.size - 1)
-        val newShape: Shape = if (lastShape.isNotEmpty()) lastShape else Shape(1)
+        val newShape: ShapeND = if (lastShape.isNotEmpty()) lastShape else ShapeND(1)
         return DoubleTensor(
             newShape,
             dt.source.view(newShape.linearSize * i, newShape.linearSize)
@@ -141,7 +141,7 @@ public open class DoubleTensorAlgebra :
      * @param shape array of integers defining the shape of the output tensor.
      * @return tensor with the [shape] shape and filled with [value].
      */
-    public fun full(value: Double, shape: Shape): DoubleTensor {
+    public fun full(value: Double, shape: ShapeND): DoubleTensor {
         checkNotEmptyShape(shape)
         val buffer = DoubleBuffer(shape.linearSize) { value }
         return DoubleTensor(shape, buffer)
@@ -165,7 +165,7 @@ public open class DoubleTensorAlgebra :
      * @param shape array of integers defining the shape of the output tensor.
      * @return tensor filled with the scalar value `0.0`, with the [shape] shape.
      */
-    public fun zeros(shape: Shape): DoubleTensor = full(0.0, shape)
+    public fun zeros(shape: ShapeND): DoubleTensor = full(0.0, shape)
 
     /**
      * Returns a tensor filled with the scalar value `0.0`, with the same shape as a given array.
@@ -180,7 +180,7 @@ public open class DoubleTensorAlgebra :
      * @param shape array of integers defining the shape of the output tensor.
      * @return tensor filled with the scalar value `1.0`, with the [shape] shape.
      */
-    public fun ones(shape: Shape): DoubleTensor = full(1.0, shape)
+    public fun ones(shape: ShapeND): DoubleTensor = full(1.0, shape)
 
     /**
      * Returns a tensor filled with the scalar value `1.0`, with the same shape as a given array.
@@ -196,7 +196,7 @@ public open class DoubleTensorAlgebra :
      * @return a 2-D tensor with ones on the diagonal and zeros elsewhere.
      */
     public fun eye(n: Int): DoubleTensor {
-        val shape = Shape(n, n)
+        val shape = ShapeND(n, n)
         val buffer = DoubleBuffer(n * n) { 0.0 }
         val res = DoubleTensor(shape, buffer)
         for (i in 0 until n) {
@@ -306,7 +306,7 @@ public open class DoubleTensorAlgebra :
 //        return resTensor
     }
 
-    override fun Tensor<Double>.view(shape: Shape): DoubleTensor {
+    override fun Tensor<Double>.view(shape: ShapeND): DoubleTensor {
         checkView(asDoubleTensor(), shape)
         return DoubleTensor(shape, asDoubleTensor().source)
     }
@@ -346,7 +346,7 @@ public open class DoubleTensorAlgebra :
     @UnstableKMathAPI
     public infix fun StructureND<Double>.matmul(other: StructureND<Double>): DoubleTensor {
         if (shape.size == 1 && other.shape.size == 1) {
-            return DoubleTensor(Shape(1), DoubleBuffer(times(other).sum()))
+            return DoubleTensor(ShapeND(1), DoubleBuffer(times(other).sum()))
         }
 
         var penultimateDim = false
@@ -358,7 +358,7 @@ public open class DoubleTensorAlgebra :
 
         if (shape.size == 1) {
             penultimateDim = true
-            newThis = newThis.view(Shape(1) + shape)
+            newThis = newThis.view(ShapeND(1) + shape)
         }
 
         if (other.shape.size == 1) {
@@ -396,7 +396,7 @@ public open class DoubleTensorAlgebra :
 //        }
 
         return if (penultimateDim) {
-            resTensor.view(resTensor.shape.first(resTensor.shape.size - 2) + Shape(resTensor.shape.last()))
+            resTensor.view(resTensor.shape.first(resTensor.shape.size - 2) + ShapeND(resTensor.shape.last()))
         } else if (lastDim) {
             resTensor.view(resTensor.shape.first(resTensor.shape.size - 1))
         } else {
@@ -506,7 +506,7 @@ public open class DoubleTensorAlgebra :
      * @return tensor of a given shape filled with numbers from the normal distribution
      * with `0.0` mean and `1.0` standard deviation.
      */
-    public fun randomNormal(shape: Shape, seed: Long = 0): DoubleTensor =
+    public fun randomNormal(shape: ShapeND, seed: Long = 0): DoubleTensor =
         DoubleTensor(shape, DoubleBuffer.randomNormals(shape.linearSize, seed))
 
     /**
@@ -531,7 +531,7 @@ public open class DoubleTensorAlgebra :
         check(tensors.isNotEmpty()) { "List must have at least 1 element" }
         val shape = tensors[0].shape
         check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
-        val resShape = Shape(tensors.size) + shape
+        val resShape = ShapeND(tensors.size) + shape
 //        val resBuffer: List<Double> = tensors.flatMap {
 //            it.asDoubleTensor().source.array.drop(it.asDoubleTensor().bufferStart)
 //                .take(it.asDoubleTensor().linearSize)
@@ -685,9 +685,9 @@ public open class DoubleTensorAlgebra :
         check(tensors.isNotEmpty()) { "List must have at least 1 element" }
         val n = tensors.size
         val m = tensors[0].shape[0]
-        check(tensors.all { it.shape contentEquals Shape(m) }) { "Tensors must have same shapes" }
+        check(tensors.all { it.shape contentEquals ShapeND(m) }) { "Tensors must have same shapes" }
         val resTensor = DoubleTensor(
-            Shape(n, n),
+            ShapeND(n, n),
             DoubleBuffer(n * n) { 0.0 }
         )
         for (i in 0 until n) {
@@ -875,9 +875,9 @@ public open class DoubleTensorAlgebra :
         val size = dimension
         val commonShape = shape.slice(0 until size - 2)
         val (n, m) = shape.slice(size - 2 until size)
-        val uTensor = zeros(commonShape + Shape(min(n, m), n))
-        val sTensor = zeros(commonShape + Shape(min(n, m)))
-        val vTensor = zeros(commonShape + Shape(min(n, m), m))
+        val uTensor = zeros(commonShape + ShapeND(min(n, m), n))
+        val sTensor = zeros(commonShape + ShapeND(min(n, m)))
+        val vTensor = zeros(commonShape + ShapeND(min(n, m), m))
 
         val matrices = asDoubleTensor().matrices
         val uTensors = uTensor.matrices
@@ -988,7 +988,7 @@ public open class DoubleTensorAlgebra :
 
         val n = shape.size
 
-        val detTensorShape = Shape(IntArray(n - 1) { i -> shape[i] }.apply {
+        val detTensorShape = ShapeND(IntArray(n - 1) { i -> shape[i] }.apply {
             set(n - 2, 1)
         })
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
index a99773f84..a77c4de4c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.structures.*
 
 /**
@@ -75,7 +75,7 @@ public inline fun OffsetIntBuffer.mapInPlace(operation: (Int) -> Int) {
  * Default [BufferedTensor] implementation for [Int] values
  */
 public class IntTensor(
-    shape: Shape,
+    shape: ShapeND,
     override val source: OffsetIntBuffer,
 ) : BufferedTensor<Int>(shape) {
 
@@ -83,7 +83,7 @@ public class IntTensor(
         require(linearSize == source.size) { "Source buffer size must be equal tensor size" }
     }
 
-    public constructor(shape: Shape, buffer: IntBuffer) : this(shape, OffsetIntBuffer(buffer, 0, buffer.size))
+    public constructor(shape: ShapeND, buffer: IntBuffer) : this(shape, OffsetIntBuffer(buffer, 0, buffer.size))
 
     @OptIn(PerformancePitfall::class)
     override fun get(index: IntArray): Int = this.source[indices.offset(index)]
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
index 86199d19b..429b3ffa9 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
@@ -89,7 +89,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
 
     override fun StructureND<Int>.valueOrNull(): Int? {
         val dt = asIntTensor()
-        return if (dt.shape contentEquals Shape(1)) dt.source[0] else null
+        return if (dt.shape contentEquals ShapeND(1)) dt.source[0] else null
     }
 
     override fun StructureND<Int>.value(): Int = valueOrNull()
@@ -102,7 +102,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @param array one-dimensional data array.
      * @return tensor with the [shape] shape and [array] data.
      */
-    public fun fromArray(shape: Shape, array: IntArray): IntTensor {
+    public fun fromArray(shape: ShapeND, array: IntArray): IntTensor {
         checkNotEmptyShape(shape)
         check(array.isNotEmpty()) { "Illegal empty buffer provided" }
         check(array.size == shape.linearSize) {
@@ -118,7 +118,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @param initializer mapping tensor indices to values.
      * @return tensor with the [shape] shape and data generated by the [initializer].
      */
-    override fun structureND(shape: Shape, initializer: IntRing.(IntArray) -> Int): IntTensor = fromArray(
+    override fun structureND(shape: ShapeND, initializer: IntRing.(IntArray) -> Int): IntTensor = fromArray(
         shape,
         RowStrides(shape).asSequence().map { IntRing.initializer(it) }.toMutableList().toIntArray()
     )
@@ -126,7 +126,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
     override fun Tensor<Int>.getTensor(i: Int): IntTensor {
         val dt = asIntTensor()
         val lastShape = shape.last(shape.size - 1)
-        val newShape = if (lastShape.isNotEmpty()) lastShape else Shape(1)
+        val newShape = if (lastShape.isNotEmpty()) lastShape else ShapeND(1)
         return IntTensor(newShape, dt.source.view(newShape.linearSize * i))
     }
 
@@ -137,7 +137,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @param shape array of integers defining the shape of the output tensor.
      * @return tensor with the [shape] shape and filled with [value].
      */
-    public fun full(value: Int, shape: Shape): IntTensor {
+    public fun full(value: Int, shape: ShapeND): IntTensor {
         checkNotEmptyShape(shape)
         val buffer = IntBuffer(shape.linearSize) { value }
         return IntTensor(shape, buffer)
@@ -161,7 +161,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @param shape array of integers defining the shape of the output tensor.
      * @return tensor filled with the scalar value `0`, with the [shape] shape.
      */
-    public fun zeros(shape: Shape): IntTensor = full(0, shape)
+    public fun zeros(shape: ShapeND): IntTensor = full(0, shape)
 
     /**
      * Returns a tensor filled with the scalar value `0`, with the same shape as a given array.
@@ -176,7 +176,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @param shape array of integers defining the shape of the output tensor.
      * @return tensor filled with the scalar value `1`, with the [shape] shape.
      */
-    public fun ones(shape: Shape): IntTensor = full(1, shape)
+    public fun ones(shape: ShapeND): IntTensor = full(1, shape)
 
     /**
      * Returns a tensor filled with the scalar value `1`, with the same shape as a given array.
@@ -192,7 +192,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
      * @return a 2-D tensor with ones on the diagonal and zeros elsewhere.
      */
     public fun eye(n: Int): IntTensor {
-        val shape = Shape(n, n)
+        val shape = ShapeND(n, n)
         val buffer = IntBuffer(n * n) { 0 }
         val res = IntTensor(shape, buffer)
         for (i in 0 until n) {
@@ -287,7 +287,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
 //        return resTensor
     }
 
-    override fun Tensor<Int>.view(shape: Shape): IntTensor {
+    override fun Tensor<Int>.view(shape: ShapeND): IntTensor {
         checkView(asIntTensor(), shape)
         return IntTensor(shape, asIntTensor().source)
     }
@@ -388,7 +388,7 @@ public open class IntTensorAlgebra : TensorAlgebra<Int, IntRing> {
         check(tensors.isNotEmpty()) { "List must have at least 1 element" }
         val shape = tensors[0].shape
         check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
-        val resShape = Shape(tensors.size) + shape
+        val resShape = ShapeND(tensors.size) + shape
 //        val resBuffer: List<Int> = tensors.flatMap {
 //            it.asIntTensor().source.array.drop(it.asIntTensor().bufferStart)
 //                .take(it.asIntTensor().linearSize)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
index dcb16b755..0b0325a85 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
@@ -32,7 +32,7 @@ internal fun multiIndexBroadCasting(tensor: DoubleTensor, resTensor: DoubleTenso
     }
 }
 
-internal fun broadcastShapes(shapes: List<Shape>): Shape {
+internal fun broadcastShapes(shapes: List<ShapeND>): ShapeND {
     var totalDim = 0
     for (shape in shapes) {
         totalDim = max(totalDim, shape.size)
@@ -57,10 +57,10 @@ internal fun broadcastShapes(shapes: List<Shape>): Shape {
         }
     }
 
-    return Shape(totalShape)
+    return ShapeND(totalShape)
 }
 
-internal fun broadcastTo(tensor: DoubleTensor, newShape: Shape): DoubleTensor {
+internal fun broadcastTo(tensor: DoubleTensor, newShape: ShapeND): DoubleTensor {
     require(tensor.shape.size <= newShape.size) {
         "Tensor is not compatible with the new shape"
     }
@@ -120,7 +120,7 @@ internal fun broadcastOuterTensors(vararg tensors: DoubleTensor): List<DoubleTen
                 var curMultiIndex = tensor.shape.slice(0..tensor.shape.size - 3).asArray()
                 curMultiIndex = IntArray(totalMultiIndex.size - curMultiIndex.size) { 1 } + curMultiIndex
 
-                val newTensor = DoubleTensor(Shape(curMultiIndex) + matrixShape, tensor.source)
+                val newTensor = DoubleTensor(ShapeND(curMultiIndex) + matrixShape, tensor.source)
 
                 for (i in curMultiIndex.indices) {
                     if (curMultiIndex[i] != 1) {
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index 33724764f..dcdf49e1e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core.internal
 
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.nd.linearSize
@@ -15,7 +15,7 @@ import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.asDoubleTensor
 
 
-internal fun checkNotEmptyShape(shape: Shape) =
+internal fun checkNotEmptyShape(shape: ShapeND) =
     check(shape.size > 0) {
         "Illegal empty shape provided"
     }
@@ -24,7 +24,7 @@ internal fun checkEmptyDoubleBuffer(buffer: DoubleArray) = check(buffer.isNotEmp
     "Illegal empty buffer provided"
 }
 
-internal fun checkBufferShapeConsistency(shape: Shape, buffer: DoubleArray) =
+internal fun checkBufferShapeConsistency(shape: ShapeND, buffer: DoubleArray) =
     check(buffer.size == shape.linearSize) {
         "Inconsistent shape ${shape} for buffer of size ${buffer.size} provided"
     }
@@ -40,10 +40,10 @@ internal fun checkTranspose(dim: Int, i: Int, j: Int) =
         "Cannot transpose $i to $j for a tensor of dim $dim"
     }
 
-internal fun <T> checkView(a: Tensor<T>, shape: Shape) =
+internal fun <T> checkView(a: Tensor<T>, shape: ShapeND) =
     check(a.shape.linearSize == shape.linearSize)
 
-internal fun checkSquareMatrix(shape: Shape) {
+internal fun checkSquareMatrix(shape: ShapeND) {
     val n = shape.size
     check(n >= 2) {
         "Expected tensor with 2 or more dimensions, got size $n instead"
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
index 1c6e5edfb..a293c8da3 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/doubleTensorHelpers.kt
@@ -156,7 +156,7 @@ internal val DoubleTensor.vectors: List<DoubleTensor>
     get() {
         val n = shape.size
         val vectorOffset = shape[n - 1]
-        val vectorShape = Shape(shape.last())
+        val vectorShape = ShapeND(shape.last())
 
         return List(linearSize / vectorOffset) { index ->
             val offset = index * vectorOffset
@@ -173,7 +173,7 @@ internal val DoubleTensor.matrices: List<DoubleTensor>
         val n = shape.size
         check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
         val matrixOffset = shape[n - 1] * shape[n - 2]
-        val matrixShape = Shape(shape[n - 2], shape[n - 1])
+        val matrixShape = ShapeND(shape[n - 2], shape[n - 1])
 
         val size = matrixShape.linearSize
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
index 2513dedb7..35f0bf324 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/intTensorHelpers.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core.internal
 
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.first
 import space.kscience.kmath.nd.last
 import space.kscience.kmath.operations.asSequence
@@ -55,7 +55,7 @@ internal val IntTensor.matrices: VirtualBuffer<IntTensor>
         val n = shape.size
         check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
         val matrixOffset = shape[n - 1] * shape[n - 2]
-        val matrixShape = Shape(shape[n - 2], shape[n - 1])
+        val matrixShape = ShapeND(shape[n - 2], shape[n - 1])
 
         return VirtualBuffer(linearSize / matrixOffset) { index ->
             val offset = index * matrixOffset
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index b01e67eee..44459ad14 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -95,7 +95,7 @@ internal fun <T> StructureND<T>.setUpPivots(): IntTensor {
     pivotsShape[n - 2] = m + 1
 
     return IntTensor(
-        Shape(pivotsShape),
+        ShapeND(pivotsShape),
         IntBuffer(pivotsShape.reduce(Int::times)) { 0 }
     )
 }
@@ -240,10 +240,10 @@ internal fun DoubleTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double = 1e-10)
     val b: DoubleTensor
     if (n > m) {
         b = a.transposed(0, 1).dot(a)
-        v = DoubleTensor(Shape(m), DoubleBuffer.randomUnitVector(m, 0))
+        v = DoubleTensor(ShapeND(m), DoubleBuffer.randomUnitVector(m, 0))
     } else {
         b = a.dot(a.transposed(0, 1))
-        v = DoubleTensor(Shape(n), DoubleBuffer.randomUnitVector(n, 0))
+        v = DoubleTensor(ShapeND(n), DoubleBuffer.randomUnitVector(n, 0))
     }
 
     var lastV: DoubleTensor
@@ -275,7 +275,7 @@ internal fun DoubleTensorAlgebra.svdHelper(
                     outerProduct[i * v.shape[0] + j] = u.getTensor(i).value() * v.getTensor(j).value()
                 }
             }
-            a = a - singularValue.times(DoubleTensor(Shape(u.shape[0], v.shape[0]), outerProduct.asBuffer()))
+            a = a - singularValue.times(DoubleTensor(ShapeND(u.shape[0], v.shape[0]), outerProduct.asBuffer()))
         }
         var v: DoubleTensor
         var u: DoubleTensor
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
index 7e30c7965..1733c1a7e 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
@@ -8,15 +8,15 @@
 package space.kscience.kmath.tensors.core
 
 import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import kotlin.jvm.JvmName
 
 @JvmName("varArgOne")
-public fun DoubleTensorAlgebra.one(vararg shape: Int): DoubleTensor = ones(Shape(shape))
+public fun DoubleTensorAlgebra.one(vararg shape: Int): DoubleTensor = ones(ShapeND(shape))
 
-public fun DoubleTensorAlgebra.one(shape: Shape): DoubleTensor = ones(shape)
+public fun DoubleTensorAlgebra.one(shape: ShapeND): DoubleTensor = ones(shape)
 
 @JvmName("varArgZero")
-public fun DoubleTensorAlgebra.zero(vararg shape: Int): DoubleTensor = zeros(Shape(shape))
+public fun DoubleTensorAlgebra.zero(vararg shape: Int): DoubleTensor = zeros(ShapeND(shape))
 
-public fun DoubleTensorAlgebra.zero(shape: Shape): DoubleTensor = zeros(shape)
+public fun DoubleTensorAlgebra.zero(shape: ShapeND): DoubleTensor = zeros(shape)
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
index 5940d44e9..73aed8a7b 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestBroadcasting.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.internal.broadcastOuterTensors
@@ -21,38 +21,38 @@ internal class TestBroadcasting {
     fun testBroadcastShapes() = DoubleTensorAlgebra {
         assertTrue(
             broadcastShapes(
-                listOf(Shape(2, 3), Shape(1, 3), Shape(1, 1, 1))
-            ) contentEquals Shape(1, 2, 3)
+                listOf(ShapeND(2, 3), ShapeND(1, 3), ShapeND(1, 1, 1))
+            ) contentEquals ShapeND(1, 2, 3)
         )
 
         assertTrue(
             broadcastShapes(
-                listOf(Shape(6, 7), Shape(5, 6, 1), Shape(7), Shape(5, 1, 7))
-            ) contentEquals Shape(5, 6, 7)
+                listOf(ShapeND(6, 7), ShapeND(5, 6, 1), ShapeND(7), ShapeND(5, 1, 7))
+            ) contentEquals ShapeND(5, 6, 7)
         )
     }
 
     @Test
     fun testBroadcastTo() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = fromArray(Shape(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor1 = fromArray(ShapeND(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(ShapeND(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
 
         val res = broadcastTo(tensor2, tensor1.shape)
-        assertTrue(res.shape contentEquals Shape(2, 3))
+        assertTrue(res.shape contentEquals ShapeND(2, 3))
         assertTrue(res.source contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
     }
 
     @Test
     fun testBroadcastTensors() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = fromArray(Shape(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor3 = fromArray(Shape(1, 1, 1), doubleArrayOf(500.0))
+        val tensor1 = fromArray(ShapeND(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(ShapeND(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = fromArray(ShapeND(1, 1, 1), doubleArrayOf(500.0))
 
         val res = broadcastTensors(tensor1, tensor2, tensor3)
 
-        assertTrue(res[0].shape contentEquals Shape(1, 2, 3))
-        assertTrue(res[1].shape contentEquals Shape(1, 2, 3))
-        assertTrue(res[2].shape contentEquals Shape(1, 2, 3))
+        assertTrue(res[0].shape contentEquals ShapeND(1, 2, 3))
+        assertTrue(res[1].shape contentEquals ShapeND(1, 2, 3))
+        assertTrue(res[2].shape contentEquals ShapeND(1, 2, 3))
 
         assertTrue(res[0].source contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         assertTrue(res[1].source contentEquals doubleArrayOf(10.0, 20.0, 30.0, 10.0, 20.0, 30.0))
@@ -61,15 +61,15 @@ internal class TestBroadcasting {
 
     @Test
     fun testBroadcastOuterTensors() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = fromArray(Shape(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor3 = fromArray(Shape(1, 1, 1), doubleArrayOf(500.0))
+        val tensor1 = fromArray(ShapeND(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(ShapeND(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = fromArray(ShapeND(1, 1, 1), doubleArrayOf(500.0))
 
         val res = broadcastOuterTensors(tensor1, tensor2, tensor3)
 
-        assertTrue(res[0].shape contentEquals Shape(1, 2, 3))
-        assertTrue(res[1].shape contentEquals Shape(1, 1, 3))
-        assertTrue(res[2].shape contentEquals Shape(1, 1, 1))
+        assertTrue(res[0].shape contentEquals ShapeND(1, 2, 3))
+        assertTrue(res[1].shape contentEquals ShapeND(1, 1, 3))
+        assertTrue(res[2].shape contentEquals ShapeND(1, 1, 1))
 
         assertTrue(res[0].source contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         assertTrue(res[1].source contentEquals doubleArrayOf(10.0, 20.0, 30.0))
@@ -78,37 +78,37 @@ internal class TestBroadcasting {
 
     @Test
     fun testBroadcastOuterTensorsShapes() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(Shape(2, 1, 3, 2, 3), DoubleArray(2 * 1 * 3 * 2 * 3) { 0.0 })
-        val tensor2 = fromArray(Shape(4, 2, 5, 1, 3, 3), DoubleArray(4 * 2 * 5 * 1 * 3 * 3) { 0.0 })
-        val tensor3 = fromArray(Shape(1, 1), doubleArrayOf(500.0))
+        val tensor1 = fromArray(ShapeND(2, 1, 3, 2, 3), DoubleArray(2 * 1 * 3 * 2 * 3) { 0.0 })
+        val tensor2 = fromArray(ShapeND(4, 2, 5, 1, 3, 3), DoubleArray(4 * 2 * 5 * 1 * 3 * 3) { 0.0 })
+        val tensor3 = fromArray(ShapeND(1, 1), doubleArrayOf(500.0))
 
         val res = broadcastOuterTensors(tensor1, tensor2, tensor3)
 
-        assertTrue(res[0].shape contentEquals Shape(4, 2, 5, 3, 2, 3))
-        assertTrue(res[1].shape contentEquals Shape(4, 2, 5, 3, 3, 3))
-        assertTrue(res[2].shape contentEquals Shape(4, 2, 5, 3, 1, 1))
+        assertTrue(res[0].shape contentEquals ShapeND(4, 2, 5, 3, 2, 3))
+        assertTrue(res[1].shape contentEquals ShapeND(4, 2, 5, 3, 3, 3))
+        assertTrue(res[2].shape contentEquals ShapeND(4, 2, 5, 3, 1, 1))
     }
 
     @Test
     fun testMinusTensor() = BroadcastDoubleTensorAlgebra.invoke {
-        val tensor1 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = fromArray(Shape(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor3 = fromArray(Shape(1, 1, 1), doubleArrayOf(500.0))
+        val tensor1 = fromArray(ShapeND(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(ShapeND(1, 3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = fromArray(ShapeND(1, 1, 1), doubleArrayOf(500.0))
 
         val tensor21 = tensor2 - tensor1
         val tensor31 = tensor3 - tensor1
         val tensor32 = tensor3 - tensor2
 
-        assertTrue(tensor21.shape contentEquals Shape(2, 3))
+        assertTrue(tensor21.shape contentEquals ShapeND(2, 3))
         assertTrue(tensor21.source contentEquals doubleArrayOf(9.0, 18.0, 27.0, 6.0, 15.0, 24.0))
 
-        assertTrue(tensor31.shape contentEquals Shape(1, 2, 3))
+        assertTrue(tensor31.shape contentEquals ShapeND(1, 2, 3))
         assertTrue(
             tensor31.source
                     contentEquals doubleArrayOf(499.0, 498.0, 497.0, 496.0, 495.0, 494.0)
         )
 
-        assertTrue(tensor32.shape contentEquals Shape(1, 1, 3))
+        assertTrue(tensor32.shape contentEquals ShapeND(1, 1, 3))
         assertTrue(tensor32.source contentEquals doubleArrayOf(490.0, 480.0, 470.0))
     }
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index f098eecb0..2ef2d87d6 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.asBuffer
 import kotlin.math.*
@@ -14,7 +14,7 @@ import kotlin.test.assertTrue
 
 internal class TestDoubleAnalyticTensorAlgebra {
 
-    val shape = Shape(2, 1, 3, 2)
+    val shape = ShapeND(2, 1, 3, 2)
     val buffer = doubleArrayOf(
         27.1, 20.0, 19.84,
         23.123, 3.0, 2.0,
@@ -103,7 +103,7 @@ internal class TestDoubleAnalyticTensorAlgebra {
         assertTrue { tensor.floor() eq expectedTensor(::floor) }
     }
 
-    val shape2 = Shape(2, 2)
+    val shape2 = ShapeND(2, 2)
     val buffer2 = doubleArrayOf(
         1.0, 2.0,
         -3.0, 4.0
@@ -115,13 +115,13 @@ internal class TestDoubleAnalyticTensorAlgebra {
         assertTrue { tensor2.min() == -3.0 }
         assertTrue {
             tensor2.min(0, true) eq fromArray(
-                Shape(1, 2),
+                ShapeND(1, 2),
                 doubleArrayOf(-3.0, 2.0)
             )
         }
         assertTrue {
             tensor2.min(1, false) eq fromArray(
-                Shape(2),
+                ShapeND(2),
                 doubleArrayOf(1.0, -3.0)
             )
         }
@@ -132,13 +132,13 @@ internal class TestDoubleAnalyticTensorAlgebra {
         assertTrue { tensor2.max() == 4.0 }
         assertTrue {
             tensor2.max(0, true) eq fromArray(
-                Shape(1, 2),
+                ShapeND(1, 2),
                 doubleArrayOf(1.0, 4.0)
             )
         }
         assertTrue {
             tensor2.max(1, false) eq fromArray(
-                Shape(2),
+                ShapeND(2),
                 doubleArrayOf(2.0, 4.0)
             )
         }
@@ -149,13 +149,13 @@ internal class TestDoubleAnalyticTensorAlgebra {
         assertTrue { tensor2.sum() == 4.0 }
         assertTrue {
             tensor2.sum(0, true) eq fromArray(
-                Shape(1, 2),
+                ShapeND(1, 2),
                 doubleArrayOf(-2.0, 6.0)
             )
         }
         assertTrue {
             tensor2.sum(1, false) eq fromArray(
-                Shape(2),
+                ShapeND(2),
                 doubleArrayOf(3.0, 1.0)
             )
         }
@@ -166,13 +166,13 @@ internal class TestDoubleAnalyticTensorAlgebra {
         assertTrue { tensor2.mean() == 1.0 }
         assertTrue {
             tensor2.mean(0, true) eq fromArray(
-                Shape(1, 2),
+                ShapeND(1, 2),
                 doubleArrayOf(-1.0, 3.0)
             )
         }
         assertTrue {
             tensor2.mean(1, false) eq fromArray(
-                Shape(2),
+                ShapeND(2),
                 doubleArrayOf(1.5, 0.5)
             )
         }
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index b9f845bb2..d47af4a64 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.internal.svd1d
@@ -19,7 +19,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     @Test
     fun testDetLU() = DoubleTensorAlgebra {
         val tensor = fromArray(
-            Shape(2, 2, 2),
+            ShapeND(2, 2, 2),
             doubleArrayOf(
                 1.0, 3.0,
                 1.0, 2.0,
@@ -29,7 +29,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         )
 
         val expectedTensor = fromArray(
-            Shape(2, 1),
+            ShapeND(2, 1),
             doubleArrayOf(
                 -1.0,
                 -7.0
@@ -45,7 +45,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     fun testDet() = DoubleTensorAlgebra {
         val expectedValue = 0.019827417
         val m = fromArray(
-            Shape(3, 3), doubleArrayOf(
+            ShapeND(3, 3), doubleArrayOf(
                 2.1843, 1.4391, -0.4845,
                 1.4391, 1.7772, 0.4055,
                 -0.4845, 0.4055, 0.7519
@@ -59,7 +59,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     fun testDetSingle() = DoubleTensorAlgebra {
         val expectedValue = 48.151623
         val m = fromArray(
-            Shape(1, 1), doubleArrayOf(
+            ShapeND(1, 1), doubleArrayOf(
                 expectedValue
             )
         )
@@ -70,7 +70,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     @Test
     fun testInvLU() = DoubleTensorAlgebra {
         val tensor = fromArray(
-            Shape(2, 2, 2),
+            ShapeND(2, 2, 2),
             doubleArrayOf(
                 1.0, 0.0,
                 0.0, 2.0,
@@ -80,7 +80,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         )
 
         val expectedTensor = fromArray(
-            Shape(2, 2, 2), doubleArrayOf(
+            ShapeND(2, 2, 2), doubleArrayOf(
                 1.0, 0.0,
                 0.0, 0.5,
                 0.0, 1.0,
@@ -94,14 +94,14 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testScalarProduct() = DoubleTensorAlgebra {
-        val a = fromArray(Shape(3), doubleArrayOf(1.8, 2.5, 6.8))
-        val b = fromArray(Shape(3), doubleArrayOf(5.5, 2.6, 6.4))
+        val a = fromArray(ShapeND(3), doubleArrayOf(1.8, 2.5, 6.8))
+        val b = fromArray(ShapeND(3), doubleArrayOf(5.5, 2.6, 6.4))
         assertEquals(a.dot(b).value(), 59.92)
     }
 
     @Test
     fun testQR() = DoubleTensorAlgebra {
-        val shape = Shape(2, 2, 2)
+        val shape = ShapeND(2, 2, 2)
         val buffer = doubleArrayOf(
             1.0, 3.0,
             1.0, 2.0,
@@ -122,7 +122,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testLU() = DoubleTensorAlgebra {
-        val shape = Shape(2, 2, 2)
+        val shape = ShapeND(2, 2, 2)
         val buffer = doubleArrayOf(
             1.0, 3.0,
             1.0, 2.0,
@@ -142,9 +142,9 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testCholesky() = DoubleTensorAlgebra {
-        val tensor = randomNormal(Shape(2, 5, 5), 0)
+        val tensor = randomNormal(ShapeND(2, 5, 5), 0)
         val sigma = (tensor matmul tensor.transposed()) + diagonalEmbedding(
-            fromArray(Shape(2, 5), DoubleArray(10) { 0.1 })
+            fromArray(ShapeND(2, 5), DoubleArray(10) { 0.1 })
         )
         val low = sigma.cholesky()
         val sigmChol = low matmul low.transposed()
@@ -153,24 +153,24 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testSVD1D() = DoubleTensorAlgebra {
-        val tensor2 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(ShapeND(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
 
         val res = svd1d(tensor2)
 
-        assertTrue(res.shape contentEquals Shape(2))
+        assertTrue(res.shape contentEquals ShapeND(2))
         assertTrue { abs(abs(res.source[0]) - 0.386) < 0.01 }
         assertTrue { abs(abs(res.source[1]) - 0.922) < 0.01 }
     }
 
     @Test
     fun testSVD() = DoubleTensorAlgebra {
-        testSVDFor(fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0)))
-        testSVDFor(fromArray(Shape(2, 2), doubleArrayOf(-1.0, 0.0, 239.0, 238.0)))
+        testSVDFor(fromArray(ShapeND(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0)))
+        testSVDFor(fromArray(ShapeND(2, 2), doubleArrayOf(-1.0, 0.0, 239.0, 238.0)))
     }
 
     @Test
     fun testBatchedSVD() = DoubleTensorAlgebra {
-        val tensor = randomNormal(Shape(2, 5, 3), 0)
+        val tensor = randomNormal(ShapeND(2, 5, 3), 0)
         val (tensorU, tensorS, tensorV) = tensor.svd()
         val tensorSVD = tensorU matmul (diagonalEmbedding(tensorS) matmul tensorV.transposed())
         assertTrue(tensor.eq(tensorSVD))
@@ -178,7 +178,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
     @Test
     fun testBatchedSymEig() = DoubleTensorAlgebra {
-        val tensor = randomNormal(shape = Shape(2, 3, 3), 0)
+        val tensor = randomNormal(shape = ShapeND(2, 3, 3), 0)
         val tensorSigma = tensor + tensor.transposed()
         val (tensorS, tensorV) = tensorSigma.symEig()
         val tensorSigmaCalc = tensorV matmul (diagonalEmbedding(tensorS) matmul tensorV.transposed())
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index f07614d05..d01ae124b 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -21,14 +21,14 @@ internal class TestDoubleTensor {
     @Test
     fun testValue() = DoubleTensorAlgebra {
         val value = 12.5
-        val tensor = fromArray(Shape(1), doubleArrayOf(value))
+        val tensor = fromArray(ShapeND(1), doubleArrayOf(value))
         assertEquals(tensor.value(), value)
     }
 
     @OptIn(PerformancePitfall::class)
     @Test
     fun testStrides() = DoubleTensorAlgebra {
-        val tensor = fromArray(Shape(2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
+        val tensor = fromArray(ShapeND(2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
         assertEquals(tensor[intArrayOf(0, 1)], 5.8)
         assertTrue(
             tensor.elements().map { it.second }.toList()
@@ -38,7 +38,7 @@ internal class TestDoubleTensor {
 
     @Test
     fun testGet() = DoubleTensorAlgebra {
-        val tensor = fromArray(Shape(1, 2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
+        val tensor = fromArray(ShapeND(1, 2, 2), doubleArrayOf(3.5, 5.8, 58.4, 2.4))
         val matrix = tensor.getTensor(0).asDoubleTensor2D()
         assertEquals(matrix[0, 1], 5.8)
 
@@ -67,7 +67,7 @@ internal class TestDoubleTensor {
         val doubleArray = DoubleBuffer(1.0, 2.0, 3.0)
 
         // create ND buffers, no data is copied
-        val ndArray: MutableBufferND<Double> = DoubleBufferND(ColumnStrides(Shape(3)), doubleArray)
+        val ndArray: MutableBufferND<Double> = DoubleBufferND(ColumnStrides(ShapeND(3)), doubleArray)
 
         // map to tensors
         val tensorArray = ndArray.asDoubleTensor() // Data is copied because of strides change.
@@ -91,7 +91,7 @@ internal class TestDoubleTensor {
 
     @Test
     fun test2D() = with(DoubleTensorAlgebra) {
-        val tensor: DoubleTensor = structureND(Shape(3, 3)) { (i, j) -> (i - j).toDouble() }
+        val tensor: DoubleTensor = structureND(ShapeND(3, 3)) { (i, j) -> (i - j).toDouble() }
         //println(tensor.toPrettyString())
         val tensor2d = tensor.asDoubleTensor2D()
         assertBufferEquals(DoubleBuffer(1.0, 0.0, -1.0), tensor2d.rows[1])
@@ -100,7 +100,7 @@ internal class TestDoubleTensor {
 
     @Test
     fun testMatrixIteration() = with(DoubleTensorAlgebra) {
-        val tensor = structureND(Shape(3, 3, 3, 3)) { index -> index.sum().toDouble() }
+        val tensor = structureND(ShapeND(3, 3, 3, 3)) { index -> index.sum().toDouble() }
         tensor.forEachMatrix { index, matrix ->
             println(index.joinToString { it.toString() })
             println(matrix)
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
index 3c693b089..cae01bed8 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensorAlgebra.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.tensors.core
 
 
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.nd.get
 import space.kscience.kmath.operations.invoke
@@ -20,53 +20,53 @@ internal class TestDoubleTensorAlgebra {
 
     @Test
     fun testDoublePlus() = DoubleTensorAlgebra {
-        val tensor = fromArray(Shape(2), doubleArrayOf(1.0, 2.0))
+        val tensor = fromArray(ShapeND(2), doubleArrayOf(1.0, 2.0))
         val res = 10.0 + tensor
         assertTrue(res.source contentEquals doubleArrayOf(11.0, 12.0))
     }
 
     @Test
     fun testDoubleDiv() = DoubleTensorAlgebra {
-        val tensor = fromArray(Shape(2), doubleArrayOf(2.0, 4.0))
+        val tensor = fromArray(ShapeND(2), doubleArrayOf(2.0, 4.0))
         val res = 2.0 / tensor
         assertTrue(res.source contentEquals doubleArrayOf(1.0, 0.5))
     }
 
     @Test
     fun testDivDouble() = DoubleTensorAlgebra {
-        val tensor = fromArray(Shape(2), doubleArrayOf(10.0, 5.0))
+        val tensor = fromArray(ShapeND(2), doubleArrayOf(10.0, 5.0))
         val res = tensor / 2.5
         assertTrue(res.source contentEquals doubleArrayOf(4.0, 2.0))
     }
 
     @Test
     fun testTranspose1x1() = DoubleTensorAlgebra {
-        val tensor = fromArray(Shape(1), doubleArrayOf(0.0))
+        val tensor = fromArray(ShapeND(1), doubleArrayOf(0.0))
         val res = tensor.transposed(0, 0)
 
         assertTrue(res.asDoubleTensor().source contentEquals doubleArrayOf(0.0))
-        assertTrue(res.shape contentEquals Shape(1))
+        assertTrue(res.shape contentEquals ShapeND(1))
     }
 
     @Test
     fun testTranspose3x2() = DoubleTensorAlgebra {
-        val tensor = fromArray(Shape(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor = fromArray(ShapeND(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res = tensor.transposed(1, 0)
 
         assertTrue(res.asDoubleTensor().source contentEquals doubleArrayOf(1.0, 3.0, 5.0, 2.0, 4.0, 6.0))
-        assertTrue(res.shape contentEquals Shape(2, 3))
+        assertTrue(res.shape contentEquals ShapeND(2, 3))
     }
 
     @Test
     fun testTranspose1x2x3() = DoubleTensorAlgebra {
-        val tensor = fromArray(Shape(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor = fromArray(ShapeND(1, 2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         val res01 = tensor.transposed(0, 1)
         val res02 = tensor.transposed(-3, 2)
         val res12 = tensor.transposed()
 
-        assertTrue(res01.shape contentEquals Shape(2, 1, 3))
-        assertTrue(res02.shape contentEquals Shape(3, 2, 1))
-        assertTrue(res12.shape contentEquals Shape(1, 3, 2))
+        assertTrue(res01.shape contentEquals ShapeND(2, 1, 3))
+        assertTrue(res02.shape contentEquals ShapeND(3, 2, 1))
+        assertTrue(res12.shape contentEquals ShapeND(1, 3, 2))
 
         assertTrue(res01.asDoubleTensor().source contentEquals doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
         assertTrue(res02.asDoubleTensor().source contentEquals doubleArrayOf(1.0, 4.0, 2.0, 5.0, 3.0, 6.0))
@@ -75,7 +75,7 @@ internal class TestDoubleTensorAlgebra {
 
     @Test
     fun testLinearStructure() = DoubleTensorAlgebra {
-        val shape = Shape(3)
+        val shape = ShapeND(3)
         val tensorA = full(value = -4.5, shape = shape)
         val tensorB = full(value = 10.9, shape = shape)
         val tensorC = full(value = 789.3, shape = shape)
@@ -107,28 +107,28 @@ internal class TestDoubleTensorAlgebra {
 
     @Test
     fun testDot() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor11 = fromArray(Shape(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = fromArray(Shape(3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor3 = fromArray(Shape(1, 1, 3), doubleArrayOf(-1.0, -2.0, -3.0))
-        val tensor4 = fromArray(Shape(2, 3, 3), (1..18).map { it.toDouble() }.toDoubleArray())
-        val tensor5 = fromArray(Shape(2, 3, 3), (1..18).map { 1 + it.toDouble() }.toDoubleArray())
+        val tensor1 = fromArray(ShapeND(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor11 = fromArray(ShapeND(3, 2), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(ShapeND(3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor3 = fromArray(ShapeND(1, 1, 3), doubleArrayOf(-1.0, -2.0, -3.0))
+        val tensor4 = fromArray(ShapeND(2, 3, 3), (1..18).map { it.toDouble() }.toDoubleArray())
+        val tensor5 = fromArray(ShapeND(2, 3, 3), (1..18).map { 1 + it.toDouble() }.toDoubleArray())
 
         val res12 = tensor1.dot(tensor2)
         assertTrue(res12.source contentEquals doubleArrayOf(140.0, 320.0))
-        assertTrue(res12.shape contentEquals Shape(2))
+        assertTrue(res12.shape contentEquals ShapeND(2))
 
         val res32 = tensor3.matmul(tensor2)
         assertTrue(res32.source contentEquals doubleArrayOf(-140.0))
-        assertTrue(res32.shape contentEquals Shape(1, 1))
+        assertTrue(res32.shape contentEquals ShapeND(1, 1))
 
         val res22 = tensor2.dot(tensor2)
         assertTrue(res22.source contentEquals doubleArrayOf(1400.0))
-        assertTrue(res22.shape contentEquals Shape(1))
+        assertTrue(res22.shape contentEquals ShapeND(1))
 
         val res11 = tensor1.dot(tensor11)
         assertTrue(res11.source contentEquals doubleArrayOf(22.0, 28.0, 49.0, 64.0))
-        assertTrue(res11.shape contentEquals Shape(2, 2))
+        assertTrue(res11.shape contentEquals ShapeND(2, 2))
 
         val res45 = tensor4.matmul(tensor5)
         assertTrue(
@@ -137,44 +137,44 @@ internal class TestDoubleTensorAlgebra {
                 468.0, 501.0, 534.0, 594.0, 636.0, 678.0, 720.0, 771.0, 822.0
             )
         )
-        assertTrue(res45.shape contentEquals Shape(2, 3, 3))
+        assertTrue(res45.shape contentEquals ShapeND(2, 3, 3))
     }
 
     @Test
     fun testDiagonalEmbedding() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(Shape(3), doubleArrayOf(10.0, 20.0, 30.0))
-        val tensor2 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor3 = zeros(Shape(2, 3, 4, 5))
+        val tensor1 = fromArray(ShapeND(3), doubleArrayOf(10.0, 20.0, 30.0))
+        val tensor2 = fromArray(ShapeND(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor3 = zeros(ShapeND(2, 3, 4, 5))
 
         assertTrue(
             diagonalEmbedding(tensor3, 0, 3, 4).shape contentEquals
-                    Shape(2, 3, 4, 5, 5)
+                    ShapeND(2, 3, 4, 5, 5)
         )
         assertTrue(
             diagonalEmbedding(tensor3, 1, 3, 4).shape contentEquals
-                    Shape(2, 3, 4, 6, 6)
+                    ShapeND(2, 3, 4, 6, 6)
         )
         assertTrue(
             diagonalEmbedding(tensor3, 2, 0, 3).shape contentEquals
-                    Shape(7, 2, 3, 7, 4)
+                    ShapeND(7, 2, 3, 7, 4)
         )
 
         val diagonal1 = diagonalEmbedding(tensor1, 0, 1, 0)
-        assertTrue(diagonal1.shape contentEquals Shape(3, 3))
+        assertTrue(diagonal1.shape contentEquals ShapeND(3, 3))
         assertTrue(
             diagonal1.source contentEquals
                     doubleArrayOf(10.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 30.0)
         )
 
         val diagonal1Offset = diagonalEmbedding(tensor1, 1, 1, 0)
-        assertTrue(diagonal1Offset.shape contentEquals Shape(4, 4))
+        assertTrue(diagonal1Offset.shape contentEquals ShapeND(4, 4))
         assertTrue(
             diagonal1Offset.source contentEquals
                     doubleArrayOf(0.0, 0.0, 0.0, 0.0, 10.0, 0.0, 0.0, 0.0, 0.0, 20.0, 0.0, 0.0, 0.0, 0.0, 30.0, 0.0)
         )
 
         val diagonal2 = diagonalEmbedding(tensor2, 1, 0, 2)
-        assertTrue(diagonal2.shape contentEquals Shape(4, 2, 4))
+        assertTrue(diagonal2.shape contentEquals ShapeND(4, 2, 4))
         assertTrue(
             diagonal2.source contentEquals
                     doubleArrayOf(
@@ -188,9 +188,9 @@ internal class TestDoubleTensorAlgebra {
 
     @Test
     fun testEq() = DoubleTensorAlgebra {
-        val tensor1 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor2 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
-        val tensor3 = fromArray(Shape(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 5.0))
+        val tensor1 = fromArray(ShapeND(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor2 = fromArray(ShapeND(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 6.0))
+        val tensor3 = fromArray(ShapeND(2, 3), doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0, 5.0))
 
         assertTrue(tensor1 eq tensor1)
         assertTrue(tensor1 eq tensor2)
@@ -204,7 +204,7 @@ internal class TestDoubleTensorAlgebra {
         val l = tensor.getTensor(0).map { it + 1.0 }
         val r = tensor.getTensor(1).map { it - 1.0 }
         val res = l + r
-        assertTrue { Shape(5, 5) contentEquals res.shape }
+        assertTrue { ShapeND(5, 5) contentEquals res.shape }
         assertEquals(2.0, res[4, 4])
     }
 }
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
index 5ac1c74a3..8533c9d32 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
@@ -33,7 +33,7 @@ public open class ViktorFieldOpsND :
     override val elementAlgebra: DoubleField get() = DoubleField
 
     @OptIn(UnsafeKMathAPI::class)
-    override fun structureND(shape: Shape, initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
+    override fun structureND(shape: ShapeND, initializer: DoubleField.(IntArray) -> Double): ViktorStructureND =
         F64Array(*shape.asArray()).apply {
             ColumnStrides(shape).asSequence().forEach { index ->
                 set(value = DoubleField.initializer(index), indices = index)
@@ -46,7 +46,7 @@ public open class ViktorFieldOpsND :
     @PerformancePitfall
     override fun StructureND<Double>.map(transform: DoubleField.(Double) -> Double): ViktorStructureND =
         F64Array(*shape.asArray()).apply {
-            ColumnStrides(Shape(shape)).asSequence().forEach { index ->
+            ColumnStrides(ShapeND(shape)).asSequence().forEach { index ->
                 set(value = DoubleField.transform(this@map[index]), indices = index)
             }
         }.asStructure()
@@ -56,7 +56,7 @@ public open class ViktorFieldOpsND :
     override fun StructureND<Double>.mapIndexed(
         transform: DoubleField.(index: IntArray, Double) -> Double,
     ): ViktorStructureND = F64Array(*shape.asArray()).apply {
-        ColumnStrides(Shape(shape)).asSequence().forEach { index ->
+        ColumnStrides(ShapeND(shape)).asSequence().forEach { index ->
             set(value = DoubleField.transform(index, this@mapIndexed[index]), indices = index)
         }
     }.asStructure()
@@ -127,7 +127,7 @@ public open class ViktorFieldND(
     private val shapeAsArray: IntArray,
 ) : ViktorFieldOpsND(), FieldND<Double, DoubleField>, NumbersAddOps<StructureND<Double>> {
 
-    override val shape: Shape = Shape(shapeAsArray)
+    override val shape: ShapeND = ShapeND(shapeAsArray)
 
 
     override val zero: ViktorStructureND by lazy { F64Array.full(init = 0.0, shape = shapeAsArray).asStructure() }
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index cee52b06d..085790355 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -9,11 +9,11 @@ import org.jetbrains.bio.viktor.F64Array
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.MutableStructureND
-import space.kscience.kmath.nd.Shape
+import space.kscience.kmath.nd.ShapeND
 
 @Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE")
 public class ViktorStructureND(public val f64Buffer: F64Array) : MutableStructureND<Double> {
-    override val shape: Shape get() = Shape(f64Buffer.shape)
+    override val shape: ShapeND get() = ShapeND(f64Buffer.shape)
 
     @OptIn(PerformancePitfall::class)
     override inline fun get(index: IntArray): Double = f64Buffer.get(*index)
-- 
2.34.1


From e24463c58bc6368709c2db681f9d1b8518f36f7d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 15 Oct 2022 18:45:06 +0300
Subject: [PATCH 627/713] Refactor Dubins path

---
 build.gradle.kts                              |   2 +-
 .../kmath/tensorflow/TensorFlowAlgebra.kt     |   3 +
 .../kscience/kmath/trajectory/DubinsPath.kt   | 177 +++++++++---------
 .../kscience/kmath/trajectory/DubinsPose2D.kt |  36 ++++
 .../space/kscience/kmath/trajectory/Pose2D.kt |  33 ----
 .../{Trajectory.kt => Trajectory2D.kt}        |  64 ++++---
 .../kmath/trajectory/TrajectoryCost.kt        |  14 --
 .../space/kscience/kmath/trajectory/route.kt  |   4 +-
 .../space/kscience/kmath/trajectory/Math.kt   |  12 +-
 .../kmath/trajectory/dubins/DubinsTests.kt    |  18 +-
 .../kmath/trajectory/segments/ArcTests.kt     |   8 +-
 .../kmath/trajectory/segments/LineTests.kt    |  22 +--
 12 files changed, 201 insertions(+), 192 deletions(-)
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt
 rename kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/{Trajectory.kt => Trajectory2D.kt} (53%)
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/TrajectoryCost.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index c7e2e5892..bf732c893 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.1-dev-5"
+    version = "0.3.1-dev-6"
 }
 
 subprojects {
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index 435b01b80..bc5fb9616 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -77,11 +77,13 @@ public abstract class TensorFlowOutput<T, TT : TType>(
         }
     }
 
+    @PerformancePitfall
     override fun get(index: IntArray): T = actualTensor[index]
 
     @PerformancePitfall
     override fun elements(): Sequence<Pair<IntArray, T>> = actualTensor.elements()
 
+    @PerformancePitfall
     override fun set(index: IntArray, value: T) {
         actualTensor[index] = value
     }
@@ -101,6 +103,7 @@ public abstract class TensorFlowAlgebra<T, TT : TNumber, A : Ring<T>> internal c
 
     protected abstract fun const(value: T): Constant<TT>
 
+    @OptIn(PerformancePitfall::class)
     override fun StructureND<T>.valueOrNull(): T? = if (shape contentEquals ShapeND(1))
         get(intArrayOf(0)) else null
 
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
index 6a340f6b9..1ba9936ee 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
@@ -13,75 +13,80 @@ import kotlin.math.acos
 import kotlin.math.cos
 import kotlin.math.sin
 
-internal fun Pose2D.getLeftCircle(radius: Double): Circle2D = getTangentCircles(radius).first
+internal fun DubinsPose2D.getLeftCircle(radius: Double): Circle2D = getTangentCircles(radius).first
 
-internal fun Pose2D.getRightCircle(radius: Double): Circle2D = getTangentCircles(radius).second
+internal fun DubinsPose2D.getRightCircle(radius: Double): Circle2D = getTangentCircles(radius).second
 
-internal fun Pose2D.getTangentCircles(radius: Double): Pair<Circle2D, Circle2D> = with(Euclidean2DSpace) {
-    val dX = radius * cos(theta)
-    val dY = radius * sin(theta)
+internal fun DubinsPose2D.getTangentCircles(radius: Double): Pair<Circle2D, Circle2D> = with(Euclidean2DSpace) {
+    val dX = radius * cos(bearing)
+    val dY = radius * sin(bearing)
     return Circle2D(vector(x - dX, y + dY), radius) to Circle2D(vector(x + dX, y - dY), radius)
 }
 
-internal fun leftOuterTangent(a: Circle2D, b: Circle2D): StraightTrajectory = outerTangent(a, b, CircleTrajectory.Direction.LEFT)
+internal fun leftOuterTangent(a: Circle2D, b: Circle2D): StraightTrajectory2D =
+    outerTangent(a, b, CircleTrajectory2D.Direction.LEFT)
 
-internal fun rightOuterTangent(a: Circle2D, b: Circle2D): StraightTrajectory = outerTangent(a, b,
-    CircleTrajectory.Direction.RIGHT
+internal fun rightOuterTangent(a: Circle2D, b: Circle2D): StraightTrajectory2D = outerTangent(
+    a, b,
+    CircleTrajectory2D.Direction.RIGHT
 )
 
-private fun outerTangent(a: Circle2D, b: Circle2D, side: CircleTrajectory.Direction): StraightTrajectory = with(Euclidean2DSpace){
-    val centers = StraightTrajectory(a.center, b.center)
-    val p1 = when (side) {
-        CircleTrajectory.Direction.LEFT -> vector(
-            a.center.x - a.radius * cos(centers.theta),
-            a.center.y + a.radius * sin(centers.theta)
-        )
-        CircleTrajectory.Direction.RIGHT -> vector(
-            a.center.x + a.radius * cos(centers.theta),
-            a.center.y - a.radius * sin(centers.theta)
+private fun outerTangent(a: Circle2D, b: Circle2D, side: CircleTrajectory2D.Direction): StraightTrajectory2D =
+    with(Euclidean2DSpace) {
+        val centers = StraightTrajectory2D(a.center, b.center)
+        val p1 = when (side) {
+            CircleTrajectory2D.Direction.LEFT -> vector(
+                a.center.x - a.radius * cos(centers.bearing),
+                a.center.y + a.radius * sin(centers.bearing)
+            )
+
+            CircleTrajectory2D.Direction.RIGHT -> vector(
+                a.center.x + a.radius * cos(centers.bearing),
+                a.center.y - a.radius * sin(centers.bearing)
+            )
+        }
+        return StraightTrajectory2D(
+            p1,
+            vector(p1.x + (centers.end.x - centers.start.x), p1.y + (centers.end.y - centers.start.y))
         )
     }
-    return StraightTrajectory(
-        p1,
-        vector(p1.x + (centers.end.x - centers.start.x), p1.y + (centers.end.y - centers.start.y))
-    )
-}
 
-internal fun leftInnerTangent(base: Circle2D, direction: Circle2D): StraightTrajectory? =
-    innerTangent(base, direction, CircleTrajectory.Direction.LEFT)
+internal fun leftInnerTangent(base: Circle2D, direction: Circle2D): StraightTrajectory2D? =
+    innerTangent(base, direction, CircleTrajectory2D.Direction.LEFT)
 
-internal fun rightInnerTangent(base: Circle2D, direction: Circle2D): StraightTrajectory? =
-    innerTangent(base, direction, CircleTrajectory.Direction.RIGHT)
+internal fun rightInnerTangent(base: Circle2D, direction: Circle2D): StraightTrajectory2D? =
+    innerTangent(base, direction, CircleTrajectory2D.Direction.RIGHT)
 
-private fun innerTangent(base: Circle2D, direction: Circle2D, side: CircleTrajectory.Direction): StraightTrajectory? = with(Euclidean2DSpace){
-    val centers = StraightTrajectory(base.center, direction.center)
-    if (centers.length < base.radius * 2) return null
-    val angle = theta(
-        when (side) {
-            CircleTrajectory.Direction.LEFT -> centers.theta + acos(base.radius * 2 / centers.length)
-            CircleTrajectory.Direction.RIGHT -> centers.theta - acos(base.radius * 2 / centers.length)
-        }
-    )
-    val dX = base.radius * sin(angle)
-    val dY = base.radius * cos(angle)
-    val p1 = vector(base.center.x + dX, base.center.y + dY)
-    val p2 = vector(direction.center.x - dX, direction.center.y - dY)
-    return StraightTrajectory(p1, p2)
-}
+private fun innerTangent(base: Circle2D, direction: Circle2D, side: CircleTrajectory2D.Direction): StraightTrajectory2D? =
+    with(Euclidean2DSpace) {
+        val centers = StraightTrajectory2D(base.center, direction.center)
+        if (centers.length < base.radius * 2) return null
+        val angle = theta(
+            when (side) {
+                CircleTrajectory2D.Direction.LEFT -> centers.bearing + acos(base.radius * 2 / centers.length)
+                CircleTrajectory2D.Direction.RIGHT -> centers.bearing - acos(base.radius * 2 / centers.length)
+            }
+        )
+        val dX = base.radius * sin(angle)
+        val dY = base.radius * cos(angle)
+        val p1 = vector(base.center.x + dX, base.center.y + dY)
+        val p2 = vector(direction.center.x - dX, direction.center.y - dY)
+        return StraightTrajectory2D(p1, p2)
+    }
 
 internal fun theta(theta: Double): Double = (theta + (2 * PI)) % (2 * PI)
 
 @Suppress("DuplicatedCode")
 public class DubinsPath(
-    public val a: CircleTrajectory,
-    public val b: Trajectory,
-    public val c: CircleTrajectory,
-) : CompositeTrajectory(listOf(a,b,c)) {
+    public val a: CircleTrajectory2D,
+    public val b: Trajectory2D,
+    public val c: CircleTrajectory2D,
+) : CompositeTrajectory2D(listOf(a, b, c)) {
 
     public val type: TYPE = TYPE.valueOf(
         arrayOf(
             a.direction.name[0],
-            if (b is CircleTrajectory) b.direction.name[0] else 'S',
+            if (b is CircleTrajectory2D) b.direction.name[0] else 'S',
             c.direction.name[0]
         ).toCharArray().concatToString()
     )
@@ -92,8 +97,8 @@ public class DubinsPath(
 
     public companion object {
         public fun all(
-            start: Pose2D,
-            end: Pose2D,
+            start: DubinsPose2D,
+            end: DubinsPose2D,
             turningRadius: Double,
         ): List<DubinsPath> = listOfNotNull(
             rlr(start, end, turningRadius),
@@ -104,132 +109,132 @@ public class DubinsPath(
             lsr(start, end, turningRadius)
         )
 
-        public fun shortest(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath =
+        public fun shortest(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath =
             all(start, end, turningRadius).minBy { it.length }
 
-        public fun rlr(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? = with(Euclidean2DSpace) {
+        public fun rlr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath? = with(Euclidean2DSpace) {
             val c1 = start.getRightCircle(turningRadius)
             val c2 = end.getRightCircle(turningRadius)
-            val centers = StraightTrajectory(c1.center, c2.center)
+            val centers = StraightTrajectory2D(c1.center, c2.center)
             if (centers.length > turningRadius * 4) return null
 
             val firstVariant = run {
-                var theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
+                var theta = theta(centers.bearing - acos(centers.length / (turningRadius * 4)))
                 var dX = turningRadius * sin(theta)
                 var dY = turningRadius * cos(theta)
                 val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
                 val e = Circle2D(p, turningRadius)
                 val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-                theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
+                theta = theta(centers.bearing + acos(centers.length / (turningRadius * 4)))
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory.of(c1.center, start, p1, CircleTrajectory.Direction.RIGHT)
-                val a2 = CircleTrajectory.of(e.center, p1, p2, CircleTrajectory.Direction.LEFT)
-                val a3 = CircleTrajectory.of(c2.center, p2, end, CircleTrajectory.Direction.RIGHT)
+                val a1 = CircleTrajectory2D.of(c1.center, start, p1, CircleTrajectory2D.Direction.RIGHT)
+                val a2 = CircleTrajectory2D.of(e.center, p1, p2, CircleTrajectory2D.Direction.LEFT)
+                val a3 = CircleTrajectory2D.of(c2.center, p2, end, CircleTrajectory2D.Direction.RIGHT)
                 DubinsPath(a1, a2, a3)
             }
 
             val secondVariant = run {
-                var theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
+                var theta = theta(centers.bearing + acos(centers.length / (turningRadius * 4)))
                 var dX = turningRadius * sin(theta)
                 var dY = turningRadius * cos(theta)
                 val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
                 val e = Circle2D(p, turningRadius)
                 val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-                theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
+                theta = theta(centers.bearing - acos(centers.length / (turningRadius * 4)))
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory.of(c1.center, start, p1, CircleTrajectory.Direction.RIGHT)
-                val a2 = CircleTrajectory.of(e.center, p1, p2, CircleTrajectory.Direction.LEFT)
-                val a3 = CircleTrajectory.of(c2.center, p2, end, CircleTrajectory.Direction.RIGHT)
+                val a1 = CircleTrajectory2D.of(c1.center, start, p1, CircleTrajectory2D.Direction.RIGHT)
+                val a2 = CircleTrajectory2D.of(e.center, p1, p2, CircleTrajectory2D.Direction.LEFT)
+                val a3 = CircleTrajectory2D.of(c2.center, p2, end, CircleTrajectory2D.Direction.RIGHT)
                 DubinsPath(a1, a2, a3)
             }
 
             return if (firstVariant.length < secondVariant.length) firstVariant else secondVariant
         }
 
-        public fun lrl(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? = with(Euclidean2DSpace) {
+        public fun lrl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath? = with(Euclidean2DSpace) {
             val c1 = start.getLeftCircle(turningRadius)
             val c2 = end.getLeftCircle(turningRadius)
-            val centers = StraightTrajectory(c1.center, c2.center)
+            val centers = StraightTrajectory2D(c1.center, c2.center)
             if (centers.length > turningRadius * 4) return null
 
             val firstVariant = run {
-                var theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
+                var theta = theta(centers.bearing + acos(centers.length / (turningRadius * 4)))
                 var dX = turningRadius * sin(theta)
                 var dY = turningRadius * cos(theta)
                 val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
                 val e = Circle2D(p, turningRadius)
                 val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-                theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
+                theta = theta(centers.bearing - acos(centers.length / (turningRadius * 4)))
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory.of(c1.center, start, p1, CircleTrajectory.Direction.LEFT)
-                val a2 = CircleTrajectory.of(e.center, p1, p2, CircleTrajectory.Direction.RIGHT)
-                val a3 = CircleTrajectory.of(c2.center, p2, end, CircleTrajectory.Direction.LEFT)
+                val a1 = CircleTrajectory2D.of(c1.center, start, p1, CircleTrajectory2D.Direction.LEFT)
+                val a2 = CircleTrajectory2D.of(e.center, p1, p2, CircleTrajectory2D.Direction.RIGHT)
+                val a3 = CircleTrajectory2D.of(c2.center, p2, end, CircleTrajectory2D.Direction.LEFT)
                 DubinsPath(a1, a2, a3)
             }
 
             val secondVariant = run{
-                var theta = theta(centers.theta - acos(centers.length / (turningRadius * 4)))
+                var theta = theta(centers.bearing - acos(centers.length / (turningRadius * 4)))
                 var dX = turningRadius * sin(theta)
                 var dY = turningRadius * cos(theta)
                 val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
                 val e = Circle2D(p, turningRadius)
                 val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-                theta = theta(centers.theta + acos(centers.length / (turningRadius * 4)))
+                theta = theta(centers.bearing + acos(centers.length / (turningRadius * 4)))
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory.of(c1.center, start, p1, CircleTrajectory.Direction.LEFT)
-                val a2 = CircleTrajectory.of(e.center, p1, p2, CircleTrajectory.Direction.RIGHT)
-                val a3 = CircleTrajectory.of(c2.center, p2, end, CircleTrajectory.Direction.LEFT)
+                val a1 = CircleTrajectory2D.of(c1.center, start, p1, CircleTrajectory2D.Direction.LEFT)
+                val a2 = CircleTrajectory2D.of(e.center, p1, p2, CircleTrajectory2D.Direction.RIGHT)
+                val a3 = CircleTrajectory2D.of(c2.center, p2, end, CircleTrajectory2D.Direction.LEFT)
                 DubinsPath(a1, a2, a3)
             }
 
             return if (firstVariant.length < secondVariant.length) firstVariant else secondVariant
         }
 
-        public fun rsr(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath {
+        public fun rsr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath {
             val c1 = start.getRightCircle(turningRadius)
             val c2 = end.getRightCircle(turningRadius)
             val s = leftOuterTangent(c1, c2)
-            val a1 = CircleTrajectory.of(c1.center, start, s.start, CircleTrajectory.Direction.RIGHT)
-            val a3 = CircleTrajectory.of(c2.center, s.end, end, CircleTrajectory.Direction.RIGHT)
+            val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.RIGHT)
+            val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.RIGHT)
             return DubinsPath(a1, s, a3)
         }
 
-        public fun lsl(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath {
+        public fun lsl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath {
             val c1 = start.getLeftCircle(turningRadius)
             val c2 = end.getLeftCircle(turningRadius)
             val s = rightOuterTangent(c1, c2)
-            val a1 = CircleTrajectory.of(c1.center, start, s.start, CircleTrajectory.Direction.LEFT)
-            val a3 = CircleTrajectory.of(c2.center, s.end, end, CircleTrajectory.Direction.LEFT)
+            val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.LEFT)
+            val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.LEFT)
             return DubinsPath(a1, s, a3)
         }
 
-        public fun rsl(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? {
+        public fun rsl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath? {
             val c1 = start.getRightCircle(turningRadius)
             val c2 = end.getLeftCircle(turningRadius)
             val s = rightInnerTangent(c1, c2)
             if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
 
-            val a1 = CircleTrajectory.of(c1.center, start, s.start, CircleTrajectory.Direction.RIGHT)
-            val a3 = CircleTrajectory.of(c2.center, s.end, end, CircleTrajectory.Direction.LEFT)
+            val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.RIGHT)
+            val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.LEFT)
             return DubinsPath(a1, s, a3)
         }
 
-        public fun lsr(start: Pose2D, end: Pose2D, turningRadius: Double): DubinsPath? {
+        public fun lsr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath? {
             val c1 = start.getLeftCircle(turningRadius)
             val c2 = end.getRightCircle(turningRadius)
             val s = leftInnerTangent(c1, c2)
             if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
 
-            val a1 = CircleTrajectory.of(c1.center, start, s.start, CircleTrajectory.Direction.LEFT)
-            val a3 = CircleTrajectory.of(c2.center, s.end, end, CircleTrajectory.Direction.RIGHT)
+            val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.LEFT)
+            val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.RIGHT)
             return DubinsPath(a1, s, a3)
         }
     }
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
new file mode 100644
index 000000000..ba001b4a5
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory
+
+import space.kscience.kmath.geometry.DoubleVector2D
+import space.kscience.kmath.geometry.Vector
+import kotlin.math.atan2
+
+/**
+ * Combination of [Vector] and its view angle (clockwise from positive y-axis direction)
+ */
+public interface DubinsPose2D : DoubleVector2D {
+    public val coordinate: DoubleVector2D
+    public val bearing: Double
+}
+
+public class PhaseVector2D(
+    override val coordinate: DoubleVector2D,
+    public val velocity: DoubleVector2D,
+) : DubinsPose2D, DoubleVector2D by coordinate {
+    override val bearing: Double get() = atan2(velocity.x, velocity.y)
+}
+
+internal class Pose2DImpl(
+    override val coordinate: DoubleVector2D,
+    override val bearing: Double,
+) : DubinsPose2D, DoubleVector2D by coordinate{
+
+    override fun toString(): String = "Pose2D(x=$x, y=$y, bearing=$bearing)"
+}
+
+
+public fun Pose2D(coordinate: DoubleVector2D, theta: Double): DubinsPose2D = Pose2DImpl(coordinate, theta)
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt
deleted file mode 100644
index 788cf57af..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Pose2D.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory
-
-import space.kscience.kmath.geometry.DoubleVector2D
-import space.kscience.kmath.geometry.Vector
-import kotlin.math.atan2
-
-/**
- * Combination of [Vector] and its view angle
- */
-public interface Pose2D: DoubleVector2D{
-    public val coordinate: DoubleVector2D
-    public val theta: Double
-}
-
-public class PhaseVector2D(
-    override val coordinate: DoubleVector2D,
-    public val velocity: DoubleVector2D
-): Pose2D, DoubleVector2D by coordinate{
-    override val theta: Double get() = atan2(velocity.y, velocity.x)
-}
-
-internal class Pose2DImpl(
-    override val coordinate: DoubleVector2D,
-    override val theta: Double
-) : Pose2D, DoubleVector2D by coordinate
-
-
-public fun Pose2D(coordinate: DoubleVector2D, theta: Double): Pose2D = Pose2DImpl(coordinate, theta)
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
similarity index 53%
rename from kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
rename to kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
index 1085f7847..f1ae20722 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
@@ -8,58 +8,61 @@ package space.kscience.kmath.trajectory
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.DoubleVector2D
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.geometry.circumference
 import kotlin.math.PI
 import kotlin.math.atan2
 
-public sealed interface Trajectory {
+public sealed interface Trajectory2D {
     public val length: Double
 }
 
 /**
  * Straight path segment. The order of start and end defines the direction
  */
-public data class StraightTrajectory(
+public data class StraightTrajectory2D(
     internal val start: DoubleVector2D,
     internal val end: DoubleVector2D,
-) : Trajectory {
+) : Trajectory2D {
     override val length: Double get() = start.distanceTo(end)
 
-    internal val theta: Double get() = theta(atan2(end.x - start.x, end.y - start.y))
+    internal val bearing: Double get() = theta(atan2(end.x - start.x, end.y - start.y))
 }
 
 /**
  * An arc segment
  */
-public data class CircleTrajectory(
+public data class CircleTrajectory2D(
     public val circle: Circle2D,
-    public val start: Pose2D,
-    public val end: Pose2D,
-) : Trajectory {
+    public val start: DubinsPose2D,
+    public val end: DubinsPose2D,
+) : Trajectory2D {
 
     public enum class Direction {
         LEFT, RIGHT
     }
 
-    override val length: Double by lazy {
-        val angle: Double = theta(
+    /**
+     * Arc length in radians
+     */
+    val arcLength: Double
+        get() = theta(
             if (direction == Direction.LEFT) {
-                start.theta - end.theta
+                start.bearing - end.bearing
             } else {
-                end.theta - start.theta
+                end.bearing - start.bearing
             }
         )
-        val proportion = angle / (2 * PI)
-        circle.circumference * proportion
+
+    override val length: Double by lazy {
+        circle.radius * arcLength
     }
 
     internal val direction: Direction by lazy {
         if (start.y < circle.center.y) {
-            if (start.theta > PI) Direction.RIGHT else Direction.LEFT
+            if (start.bearing > PI) Direction.RIGHT else Direction.LEFT
         } else if (start.y > circle.center.y) {
-            if (start.theta < PI) Direction.RIGHT else Direction.LEFT
+            if (start.bearing < PI) Direction.RIGHT else Direction.LEFT
         } else {
-            if (start.theta == 0.0) {
+            if (start.bearing == 0.0) {
                 if (start.x < circle.center.x) Direction.RIGHT else Direction.LEFT
             } else {
                 if (start.x > circle.center.x) Direction.RIGHT else Direction.LEFT
@@ -68,12 +71,17 @@ public data class CircleTrajectory(
     }
 
     public companion object {
-        public fun of(center: DoubleVector2D, start: DoubleVector2D, end: DoubleVector2D, direction: Direction): CircleTrajectory {
+        public fun of(
+            center: DoubleVector2D,
+            start: DoubleVector2D,
+            end: DoubleVector2D,
+            direction: Direction,
+        ): CircleTrajectory2D {
             fun calculatePose(
                 vector: DoubleVector2D,
                 theta: Double,
                 direction: Direction,
-            ): Pose2D = Pose2D(
+            ): DubinsPose2D = Pose2D(
                 vector,
                 when (direction) {
                     Direction.LEFT -> theta(theta - PI / 2)
@@ -81,16 +89,20 @@ public data class CircleTrajectory(
                 }
             )
 
-            val s1 = StraightTrajectory(center, start)
-            val s2 = StraightTrajectory(center, end)
-            val pose1 = calculatePose(start, s1.theta, direction)
-            val pose2 = calculatePose(end, s2.theta, direction)
-            return CircleTrajectory(Circle2D(center, s1.length), pose1, pose2)
+            val s1 = StraightTrajectory2D(center, start)
+            val s2 = StraightTrajectory2D(center, end)
+            val pose1 = calculatePose(start, s1.bearing, direction)
+            val pose2 = calculatePose(end, s2.bearing, direction)
+            val trajectory = CircleTrajectory2D(Circle2D(center, s1.length), pose1, pose2)
+            if(trajectory.direction != direction){
+                error("Trajectory direction mismatch")
+            }
+            return trajectory
         }
     }
 }
 
-public open class CompositeTrajectory(public val segments: Collection<Trajectory>) : Trajectory {
+public open class CompositeTrajectory2D(public val segments: Collection<Trajectory2D>) : Trajectory2D {
     override val length: Double get() = segments.sumOf { it.length }
 }
 
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/TrajectoryCost.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/TrajectoryCost.kt
deleted file mode 100644
index 3782a9a32..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/TrajectoryCost.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory
-
-public fun interface TrajectoryCost {
-    public fun estimate(trajectory: Trajectory): Double
-
-    public companion object{
-        public val length: TrajectoryCost = TrajectoryCost { it.length }
-    }
-}
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt
index 2e8e43be9..56350835d 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt
@@ -12,5 +12,5 @@ public fun interface MaxCurvature {
 public fun DubinsPath.Companion.shortest(
     start: PhaseVector2D,
     end: PhaseVector2D,
-    computer: MaxCurvature,
-): DubinsPath = shortest(start, end, computer.compute(start))
+    maxCurvature: MaxCurvature,
+): DubinsPath = shortest(start, end, maxCurvature.compute(start))
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
index 64513f6e2..4599f30f8 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
@@ -15,14 +15,14 @@ const val maxFloatDelta = 0.000001
 fun Double.radiansToDegrees() = this * 180 / PI
 
 fun Double.equalFloat(other: Double) = abs(this - other) < maxFloatDelta
-fun Pose2D.equalsFloat(other: Pose2D) = x.equalFloat(other.x) && y.equalFloat(other.y) && theta.equalFloat(other.theta)
+fun DubinsPose2D.equalsFloat(other: DubinsPose2D) = x.equalFloat(other.x) && y.equalFloat(other.y) && bearing.equalFloat(other.bearing)
 
-fun StraightTrajectory.inverse() = StraightTrajectory(end, start)
-fun StraightTrajectory.shift(shift: Int, width: Double): StraightTrajectory = with(Euclidean2DSpace){
-    val dX = width * sin(inverse().theta)
-    val dY = width * sin(theta)
+fun StraightTrajectory2D.inverse() = StraightTrajectory2D(end, start)
+fun StraightTrajectory2D.shift(shift: Int, width: Double): StraightTrajectory2D = with(Euclidean2DSpace){
+    val dX = width * sin(inverse().bearing)
+    val dY = width * sin(bearing)
 
-    return StraightTrajectory(
+    return StraightTrajectory2D(
         vector(start.x - dX * shift, start.y - dY * shift),
         vector(end.x - dX * shift, end.y - dY * shift)
     )
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
index b545b7c94..8cea22b45 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -16,11 +16,11 @@ class DubinsTests {
 
     @Test
     fun dubinsTest() = with(Euclidean2DSpace){
-        val straight = StraightTrajectory(vector(0.0, 0.0), vector(100.0, 100.0))
+        val straight = StraightTrajectory2D(vector(0.0, 0.0), vector(100.0, 100.0))
         val lineP1 = straight.shift(1, 10.0).inverse()
 
-        val start = Pose2D(straight.end, straight.theta)
-        val end = Pose2D(lineP1.start, lineP1.theta)
+        val start = Pose2D(straight.end, straight.bearing)
+        val end = Pose2D(lineP1.start, lineP1.bearing)
         val radius = 2.0
         val dubins = DubinsPath.all(start, end, radius)
 
@@ -45,14 +45,14 @@ class DubinsTests {
             assertTrue(end.equalsFloat(path.c.end))
 
             // Not working, theta double precision inaccuracy
-            if (path.b is CircleTrajectory) {
-                val b = path.b as CircleTrajectory
+            if (path.b is CircleTrajectory2D) {
+                val b = path.b as CircleTrajectory2D
                 assertTrue(path.a.end.equalsFloat(b.start))
                 assertTrue(path.c.start.equalsFloat(b.end))
-            } else if (path.b is StraightTrajectory) {
-                val b = path.b as StraightTrajectory
-                assertTrue(path.a.end.equalsFloat(Pose2D(b.start, b.theta)))
-                assertTrue(path.c.start.equalsFloat(Pose2D(b.end, b.theta)))
+            } else if (path.b is StraightTrajectory2D) {
+                val b = path.b as StraightTrajectory2D
+                assertTrue(path.a.end.equalsFloat(Pose2D(b.start, b.bearing)))
+                assertTrue(path.c.start.equalsFloat(Pose2D(b.end, b.bearing)))
             }
         }
     }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
index 17277c35e..af1444ade 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
@@ -8,7 +8,7 @@ package space.kscience.kmath.trajectory.segments
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.circumference
-import space.kscience.kmath.trajectory.CircleTrajectory
+import space.kscience.kmath.trajectory.CircleTrajectory2D
 import space.kscience.kmath.trajectory.radiansToDegrees
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -18,9 +18,9 @@ class ArcTests {
     @Test
     fun arcTest() = with(Euclidean2DSpace){
         val circle = Circle2D(vector(0.0, 0.0), 2.0)
-        val arc = CircleTrajectory.of(circle.center, vector(-2.0, 0.0), vector(0.0, 2.0), CircleTrajectory.Direction.RIGHT)
+        val arc = CircleTrajectory2D.of(circle.center, vector(-2.0, 0.0), vector(0.0, 2.0), CircleTrajectory2D.Direction.RIGHT)
         assertEquals(circle.circumference / 4, arc.length, 1.0)
-        assertEquals(0.0, arc.start.theta.radiansToDegrees())
-        assertEquals(90.0, arc.end.theta.radiansToDegrees())
+        assertEquals(0.0, arc.start.bearing.radiansToDegrees())
+        assertEquals(90.0, arc.end.bearing.radiansToDegrees())
     }
 }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
index 4b54d775c..03320a3df 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.trajectory.segments
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.trajectory.StraightTrajectory
+import space.kscience.kmath.trajectory.StraightTrajectory2D
 import space.kscience.kmath.trajectory.radiansToDegrees
 import kotlin.math.pow
 import kotlin.math.sqrt
@@ -17,21 +17,21 @@ class LineTests {
 
     @Test
     fun lineTest() = with(Euclidean2DSpace){
-        val straight = StraightTrajectory(vector(0.0, 0.0), vector(100.0, 100.0))
+        val straight = StraightTrajectory2D(vector(0.0, 0.0), vector(100.0, 100.0))
         assertEquals(sqrt(100.0.pow(2) + 100.0.pow(2)), straight.length)
-        assertEquals(45.0, straight.theta.radiansToDegrees())
+        assertEquals(45.0, straight.bearing.radiansToDegrees())
     }
 
     @Test
     fun lineAngleTest() = with(Euclidean2DSpace){
         //val zero = Vector2D(0.0, 0.0)
-        val north = StraightTrajectory(Euclidean2DSpace.zero, vector(0.0, 2.0))
-        assertEquals(0.0, north.theta.radiansToDegrees())
-        val east = StraightTrajectory(Euclidean2DSpace.zero, vector(2.0, 0.0))
-        assertEquals(90.0, east.theta.radiansToDegrees())
-        val south = StraightTrajectory(Euclidean2DSpace.zero, vector(0.0, -2.0))
-        assertEquals(180.0, south.theta.radiansToDegrees())
-        val west = StraightTrajectory(Euclidean2DSpace.zero, vector(-2.0, 0.0))
-        assertEquals(270.0, west.theta.radiansToDegrees())
+        val north = StraightTrajectory2D(zero, vector(0.0, 2.0))
+        assertEquals(0.0, north.bearing.radiansToDegrees())
+        val east = StraightTrajectory2D(zero, vector(2.0, 0.0))
+        assertEquals(90.0, east.bearing.radiansToDegrees())
+        val south = StraightTrajectory2D(zero, vector(0.0, -2.0))
+        assertEquals(180.0, south.bearing.radiansToDegrees())
+        val west = StraightTrajectory2D(zero, vector(-2.0, 0.0))
+        assertEquals(270.0, west.bearing.radiansToDegrees())
     }
 }
-- 
2.34.1


From fb0d016aa824227b2b76f102525584426ad1e48a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 15 Oct 2022 18:58:30 +0300
Subject: [PATCH 628/713] Perform merge build only on JVM

---
 .github/workflows/build.yml | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cffef64b0..20d5f9a68 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,26 +7,18 @@ on:
 
 jobs:
   build:
-    strategy:
-      matrix:
-        os: [ macOS-latest, windows-latest ]
-    runs-on: ${{matrix.os}}
-    timeout-minutes: 40
+    runs-on: windows-latest
+    timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v3.0.0
-      - uses: actions/setup-java@v3.0.0
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3.5.1
         with:
-          java-version: 11
-          distribution: liberica
-      - name: Cache konan
-        uses: actions/cache@v3.0.1
-        with:
-          path: ~/.konan
-          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          java-version: '11'
+          distribution: 'liberica'
+          cache: 'gradle'
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1.0.4
-      - uses: gradle/gradle-build-action@v2.1.5
+      - name: Gradle Build
+        uses: gradle/gradle-build-action@v2.3.2
         with:
-          arguments: build
+          arguments: test jvmTest
-- 
2.34.1


From 94489b28e254f0f3c5c95c1b8a63588e3a390838 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 16 Oct 2022 14:41:48 +0300
Subject: [PATCH 629/713] Fix visibility in Trajectory2D

---
 build.gradle.kts                                     | 12 ++++++------
 docs/templates/ARTIFACT-TEMPLATE.md                  |  6 +++++-
 .../space/kscience/kmath/trajectory/DubinsPose2D.kt  |  4 ++--
 .../space/kscience/kmath/trajectory/Trajectory2D.kt  | 10 +++++-----
 .../kscience/kmath/trajectory/dubins/DubinsTests.kt  |  8 ++++----
 .../kscience/kmath/trajectory/{Math.kt => math.kt}   |  0
 6 files changed, 22 insertions(+), 18 deletions(-)
 rename kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/{Math.kt => math.kt} (100%)

diff --git a/build.gradle.kts b/build.gradle.kts
index bf732c893..92379d915 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,4 @@
+import space.kscience.gradle.isInDevelopment
 import space.kscience.gradle.useApache2Licence
 import space.kscience.gradle.useSPCTeam
 
@@ -77,12 +78,11 @@ ksciencePublish {
     }
     github("kmath", "SciProgCentre")
     space(
-        "https://maven.pkg.jetbrains.space/spc/p/sci/maven"
-//        if (isInDevelopment) {
-//            "https://maven.pkg.jetbrains.space/spc/p/sci/dev"
-//        } else {
-//            "https://maven.pkg.jetbrains.space/spc/p/sci/release"
-//        }
+        if (isInDevelopment) {
+            "https://maven.pkg.jetbrains.space/spc/p/sci/dev"
+        } else {
+            "https://maven.pkg.jetbrains.space/spc/p/sci/maven"
+        }
     )
     sonatype()
 }
diff --git a/docs/templates/ARTIFACT-TEMPLATE.md b/docs/templates/ARTIFACT-TEMPLATE.md
index 1bac2a8ff..a3e47e693 100644
--- a/docs/templates/ARTIFACT-TEMPLATE.md
+++ b/docs/templates/ARTIFACT-TEMPLATE.md
@@ -3,10 +3,12 @@
 The Maven coordinates of this project are `${group}:${name}:${version}`.
 
 **Gradle:**
-```gradle
+```groovy
 repositories {
     maven { url 'https://repo.kotlin.link' }
     mavenCentral()
+    // development and snapshot versions
+    maven { url 'https://maven.pkg.jetbrains.space/spc/p/sci/dev' }
 }
 
 dependencies {
@@ -18,6 +20,8 @@ dependencies {
 repositories {
     maven("https://repo.kotlin.link")
     mavenCentral()
+    // development and snapshot versions
+    maven("https://maven.pkg.jetbrains.space/spc/p/sci/dev")
 }
 
 dependencies {
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
index ba001b4a5..5aa8c1455 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
@@ -24,7 +24,7 @@ public class PhaseVector2D(
     override val bearing: Double get() = atan2(velocity.x, velocity.y)
 }
 
-internal class Pose2DImpl(
+private class DubinsPose2DImpl(
     override val coordinate: DoubleVector2D,
     override val bearing: Double,
 ) : DubinsPose2D, DoubleVector2D by coordinate{
@@ -33,4 +33,4 @@ internal class Pose2DImpl(
 }
 
 
-public fun Pose2D(coordinate: DoubleVector2D, theta: Double): DubinsPose2D = Pose2DImpl(coordinate, theta)
\ No newline at end of file
+public fun DubinsPose2D(coordinate: DoubleVector2D, theta: Double): DubinsPose2D = DubinsPose2DImpl(coordinate, theta)
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
index f1ae20722..3fcf4365d 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
@@ -19,12 +19,12 @@ public sealed interface Trajectory2D {
  * Straight path segment. The order of start and end defines the direction
  */
 public data class StraightTrajectory2D(
-    internal val start: DoubleVector2D,
-    internal val end: DoubleVector2D,
+    public val start: DoubleVector2D,
+    public val end: DoubleVector2D,
 ) : Trajectory2D {
     override val length: Double get() = start.distanceTo(end)
 
-    internal val bearing: Double get() = theta(atan2(end.x - start.x, end.y - start.y))
+    public val bearing: Double get() = theta(atan2(end.x - start.x, end.y - start.y))
 }
 
 /**
@@ -56,7 +56,7 @@ public data class CircleTrajectory2D(
         circle.radius * arcLength
     }
 
-    internal val direction: Direction by lazy {
+    public val direction: Direction by lazy {
         if (start.y < circle.center.y) {
             if (start.bearing > PI) Direction.RIGHT else Direction.LEFT
         } else if (start.y > circle.center.y) {
@@ -81,7 +81,7 @@ public data class CircleTrajectory2D(
                 vector: DoubleVector2D,
                 theta: Double,
                 direction: Direction,
-            ): DubinsPose2D = Pose2D(
+            ): DubinsPose2D = DubinsPose2D(
                 vector,
                 when (direction) {
                     Direction.LEFT -> theta(theta - PI / 2)
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
index 8cea22b45..5bbf8c294 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -19,8 +19,8 @@ class DubinsTests {
         val straight = StraightTrajectory2D(vector(0.0, 0.0), vector(100.0, 100.0))
         val lineP1 = straight.shift(1, 10.0).inverse()
 
-        val start = Pose2D(straight.end, straight.bearing)
-        val end = Pose2D(lineP1.start, lineP1.bearing)
+        val start = DubinsPose2D(straight.end, straight.bearing)
+        val end = DubinsPose2D(lineP1.start, lineP1.bearing)
         val radius = 2.0
         val dubins = DubinsPath.all(start, end, radius)
 
@@ -51,8 +51,8 @@ class DubinsTests {
                 assertTrue(path.c.start.equalsFloat(b.end))
             } else if (path.b is StraightTrajectory2D) {
                 val b = path.b as StraightTrajectory2D
-                assertTrue(path.a.end.equalsFloat(Pose2D(b.start, b.bearing)))
-                assertTrue(path.c.start.equalsFloat(Pose2D(b.end, b.bearing)))
+                assertTrue(path.a.end.equalsFloat(DubinsPose2D(b.start, b.bearing)))
+                assertTrue(path.c.start.equalsFloat(DubinsPose2D(b.end, b.bearing)))
             }
         }
     }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
similarity index 100%
rename from kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/Math.kt
rename to kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
-- 
2.34.1


From 8286db30afef0fb5e647117fd7892f20ebfc1e73 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 16 Oct 2022 20:15:37 +0300
Subject: [PATCH 630/713] Optimize tensor shape computation

---
 .../space/kscience/kmath/nd/ShapeIndices.kt   | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
index 37e0c7b5e..3a27614c5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeIndices.kt
@@ -51,10 +51,15 @@ public abstract class Strides : ShapeIndexer {
      */
     internal abstract val strides: IntArray
 
-    public override fun offset(index: IntArray): Int = index.mapIndexed { i, value ->
-        if (value !in 0 until shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0, ${this.shape[i]})")
-        value * strides[i]
-    }.sum()
+    public override fun offset(index: IntArray): Int {
+        var res = 0
+        index.forEachIndexed { i, value ->
+            if (value !in 0 until shape[i]) throw IndexOutOfBoundsException("Index $value out of shape bounds: (0, ${this.shape[i]})")
+            res += value * strides[i]
+
+        }
+        return res
+    }
 
     // TODO introduce a fast way to calculate index of the next element?
 
@@ -74,17 +79,15 @@ public class ColumnStrides(override val shape: ShapeND) : Strides() {
     /**
      * Strides for memory access
      */
-    override val strides: IntArray by lazy {
-        sequence {
-            var current = 1
-            yield(1)
+    override val strides: IntArray = sequence {
+        var current = 1
+        yield(1)
 
-            shape.forEach {
-                current *= it
-                yield(current)
-            }
-        }.toList().toIntArray()
-    }
+        shape.forEach {
+            current *= it
+            yield(current)
+        }
+    }.toList().toIntArray()
 
     override fun index(offset: Int): IntArray {
         val res = IntArray(shape.size)
@@ -120,10 +123,10 @@ public class ColumnStrides(override val shape: ShapeND) : Strides() {
  */
 public class RowStrides(override val shape: ShapeND) : Strides() {
 
-    override val strides: IntArray by lazy {
+    override val strides: IntArray = run {
         val nDim = shape.size
         val res = IntArray(nDim)
-        if (nDim == 0) return@lazy res
+        if (nDim == 0) return@run res
 
         var current = nDim - 1
         res[current] = 1
-- 
2.34.1


From cff563c321fba4c5fe9be3660d504079acfdc746 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 5 Nov 2022 16:14:23 +0300
Subject: [PATCH 631/713] Major tensor refactoring

---
 CHANGELOG.md                                  |   3 +
 .../benchmarks/TensorAlgebraBenchmark.kt      |   6 +-
 build.gradle.kts                              |   2 +-
 .../structures/StructureWriteBenchmark.kt     |  11 +-
 .../kscience/kmath/tensors/OLSWithSVD.kt      |  11 +-
 .../space/kscience/kmath/tensors/PCA.kt       |  21 +-
 .../kmath/tensors/dataSetNormalization.kt     |  11 +-
 .../tensors/linearSystemSolvingWithLUP.kt     |   2 +-
 .../kscience/kmath/tensors/neuralNetwork.kt   |  12 +-
 gradle.properties                             |   4 +
 .../commons/optimization/OptimizeTest.kt      |   3 +-
 .../kscience/kmath/expressions/DSAlgebra.kt   |   4 +-
 .../kmath/expressions/specialExpressions.kt   |   2 +
 .../kmath/operations/DoubleBufferField.kt     | 105 +---
 .../kmath/operations/DoubleBufferOps.kt       | 110 ++--
 .../kmath/operations/algebraExtensions.kt     |  28 +-
 .../kscience/kmath/structures/DoubleBuffer.kt |   3 +
 .../kmath/structures/bufferExtensions.kt      |  50 +-
 .../space/kscience/kmath/structures/types.kt  |  20 +
 .../kmath/coroutines/coroutinesExtra.kt       |   4 +-
 .../integration/GaussIntegratorRuleFactory.kt |   6 +-
 .../kmath/integration/SplineIntegrator.kt     |   6 +-
 .../histogram/UniformHistogramGroupND.kt      |   2 +-
 .../kscience/kmath/multik/MultikNDTest.kt     |   1 +
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |  56 +-
 .../tmp/minuit/HessianGradientCalculator.kt   |   2 +-
 .../src/commonMain/tmp/minuit/MnPosDef.kt     |  10 +-
 .../kotlin/space/kscience/kmath/stat/Mean.kt  |  12 +-
 .../kscience/kmath/stat/StatisticTest.kt      |  17 +-
 .../kmath/tensorflow/DoubleTensorFlowOps.kt   |   1 +
 .../tensors/api/AnalyticTensorAlgebra.kt      |  81 +--
 .../tensors/api/LinearOpsTensorAlgebra.kt     |  10 +-
 .../kmath/tensors/core/DoubleTensor.kt        |  61 +--
 .../kmath/tensors/core/DoubleTensor1D.kt      |  45 ++
 .../kmath/tensors/core/DoubleTensor2D.kt      |  71 +++
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 490 +++---------------
 .../kmath/tensors/core/internal/checks.kt     |   7 +-
 .../kmath/tensors/core/internal/linUtils.kt   |   8 +-
 .../kscience/kmath/tensors/core/tensorOps.kt  | 370 +++++++++++++
 .../core/TestDoubleAnalyticTensorAlgebra.kt   |  34 +-
 .../core/TestDoubleLinearOpsAlgebra.kt        |  16 +-
 41 files changed, 897 insertions(+), 821 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/types.kt
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor1D.kt
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor2D.kt
 create mode 100644 kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorOps.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eea1dd3ea..c31740a31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,14 @@
 
 ## [Unreleased]
 ### Added
+- Type-aliases for numbers like `Float64`
 - 2D optimal trajectory computation in a separate module `kmath-trajectory`
 - Autodiff for generic algebra elements in core!
 - Algebra now has an obligatory `bufferFactory` (#477).
 
 ### Changed
+- Tensor operations switched to prefix notation
+- Row-wise and column-wise ND shapes in the core
 - Shape is read-only
 - Major refactor of tensors (only minor API changes)
 - Kotlin 1.7.20
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/TensorAlgebraBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/TensorAlgebraBenchmark.kt
index 3ed7163b3..c4382374a 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/TensorAlgebraBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/TensorAlgebraBenchmark.kt
@@ -13,6 +13,8 @@ import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.linear.matrix
 import space.kscience.kmath.linear.symmetric
 import space.kscience.kmath.operations.DoubleField
+import space.kscience.kmath.tensors.core.symEigJacobi
+import space.kscience.kmath.tensors.core.symEigSvd
 import space.kscience.kmath.tensors.core.tensorAlgebra
 import kotlin.random.Random
 
@@ -27,11 +29,11 @@ internal class TensorAlgebraBenchmark {
 
     @Benchmark
     fun tensorSymEigSvd(blackhole: Blackhole) = with(Double.tensorAlgebra) {
-        blackhole.consume(matrix.symEigSvd(1e-10))
+        blackhole.consume(symEigSvd(matrix, 1e-10))
     }
 
     @Benchmark
     fun tensorSymEigJacobi(blackhole: Blackhole) = with(Double.tensorAlgebra) {
-        blackhole.consume(matrix.symEigJacobi(50, 1e-10))
+        blackhole.consume(symEigJacobi(matrix, 50, 1e-10))
     }
 }
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 92379d915..e03bec9af 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.1-dev-6"
+    version = "0.3.1-dev-7"
 }
 
 subprojects {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
index 522eeb768..14c058417 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureWriteBenchmark.kt
@@ -8,17 +8,20 @@ package space.kscience.kmath.structures
 import space.kscience.kmath.nd.BufferND
 import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
-import space.kscience.kmath.operations.map
+import space.kscience.kmath.operations.mapToBuffer
 import kotlin.system.measureTimeMillis
 
-private inline fun <T, reified R: Any> BufferND<T>.map(block: (T) -> R): BufferND<R> = BufferND(indices, buffer.map(block))
+private inline fun <T, reified R : Any> BufferND<T>.mapToBufferND(
+    bufferFactory: BufferFactory<R> = BufferFactory.auto(),
+    crossinline block: (T) -> R,
+): BufferND<R> = BufferND(indices, buffer.mapToBuffer(bufferFactory, block))
 
 @Suppress("UNUSED_VARIABLE")
 fun main() {
     val n = 6000
     val structure = StructureND.buffered(ShapeND(n, n), Buffer.Companion::auto) { 1.0 }
-    structure.map { it + 1 } // warm-up
-    val time1 = measureTimeMillis { val res = structure.map { it + 1 } }
+    structure.mapToBufferND { it + 1 } // warm-up
+    val time1 = measureTimeMillis { val res = structure.mapToBufferND { it + 1 } }
     println("Structure mapping finished in $time1 millis")
     val array = DoubleArray(n * n) { 1.0 }
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
index 40b927215..2c570ea34 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/OLSWithSVD.kt
@@ -5,18 +5,17 @@
 
 package space.kscience.kmath.tensors
 
-import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
-
+import space.kscience.kmath.tensors.core.randomNormal
+import space.kscience.kmath.tensors.core.randomNormalLike
 import kotlin.math.abs
 
 // OLS estimator using SVD
 
-@OptIn(PerformancePitfall::class)
 fun main() {
     //seed for random
     val randSeed = 100500L
@@ -42,10 +41,10 @@ fun main() {
 
         // calculate y and add gaussian noise (N(0, 0.05))
         val y = x dot alpha
-        y += y.randomNormalLike(randSeed) * 0.05
+        y += randomNormalLike(y, randSeed) * 0.05
 
         // now restore the coefficient vector with OSL estimator with SVD
-        val (u, singValues, v) = x.svd()
+        val (u, singValues, v) = svd(x)
 
         // we have to make sure the singular values of the matrix are not close to zero
         println("Singular values:\n$singValues")
@@ -66,7 +65,7 @@ fun main() {
             require(yTrue.shape contentEquals yPred.shape)
 
             val diff = yTrue - yPred
-            return diff.dot(diff).sqrt().value()
+            return sqrt(diff.dot(diff)).value()
         }
 
         println("MSE: ${mse(alpha, alphaOLS)}")
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
index 78199aa8b..fb774a39d 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/PCA.kt
@@ -6,8 +6,7 @@
 package space.kscience.kmath.tensors
 
 import space.kscience.kmath.nd.ShapeND
-import space.kscience.kmath.tensors.core.tensorAlgebra
-import space.kscience.kmath.tensors.core.withBroadcast
+import space.kscience.kmath.tensors.core.*
 
 
 // simple PCA
@@ -22,7 +21,7 @@ fun main(): Unit = Double.tensorAlgebra.withBroadcast {  // work in context with
     )
 
     // take y dependent on x with noise
-    val y = 2.0 * x + (3.0 + x.randomNormalLike(seed) * 1.5)
+    val y = 2.0 * x + (3.0 + randomNormalLike(x, seed) * 1.5)
 
     println("x:\n$x")
     println("y:\n$y")
@@ -31,14 +30,14 @@ fun main(): Unit = Double.tensorAlgebra.withBroadcast {  // work in context with
     val dataset = stack(listOf(x, y)).transposed()
 
     // normalize both x and y
-    val xMean = x.mean()
-    val yMean = y.mean()
+    val xMean = mean(x)
+    val yMean = mean(y)
 
-    val xStd = x.std()
-    val yStd = y.std()
+    val xStd = std(x)
+    val yStd = std(y)
 
-    val xScaled = (x - xMean) / xStd
-    val yScaled = (y - yMean) / yStd
+    val xScaled: DoubleTensor = (x - xMean) / xStd
+    val yScaled: DoubleTensor = (y - yMean) / yStd
 
     // save means ans standard deviations for further recovery
     val mean = fromArray(
@@ -54,11 +53,11 @@ fun main(): Unit = Double.tensorAlgebra.withBroadcast {  // work in context with
     println("Standard deviations:\n$std")
 
     // calculate the covariance matrix of scaled x and y
-    val covMatrix = cov(listOf(xScaled, yScaled))
+    val covMatrix = covariance(listOf(xScaled.asDoubleTensor1D(), yScaled.asDoubleTensor1D()))
     println("Covariance matrix:\n$covMatrix")
 
     // and find out eigenvector of it
-    val (_, evecs) = covMatrix.symEig()
+    val (_, evecs) = symEig(covMatrix)
     val v = evecs.getTensor(0)
     println("Eigenvector:\n$v")
 
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
index 091889e8e..45c2ff120 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/dataSetNormalization.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.tensors
 
 import space.kscience.kmath.nd.ShapeND
+import space.kscience.kmath.tensors.core.randomNormal
 import space.kscience.kmath.tensors.core.tensorAlgebra
 import space.kscience.kmath.tensors.core.withBroadcast
 
@@ -23,8 +24,8 @@ fun main() = Double.tensorAlgebra.withBroadcast {  // work in context with broad
 
 
     // find out mean and standard deviation of each column
-    val mean = dataset.mean(0, false)
-    val std = dataset.std(0, false)
+    val mean = mean(dataset, 0, false)
+    val std = std(dataset, 0, false)
 
     println("Mean:\n$mean")
     println("Standard deviation:\n$std")
@@ -36,8 +37,8 @@ fun main() = Double.tensorAlgebra.withBroadcast {  // work in context with broad
     // now we can scale dataset with mean normalization
     val datasetScaled = (dataset - mean) / std
 
-    // find out mean and std of scaled dataset
+    // find out mean and standardDiviation of scaled dataset
 
-    println("Mean of scaled:\n${datasetScaled.mean(0, false)}")
-    println("Mean of scaled:\n${datasetScaled.std(0, false)}")
+    println("Mean of scaled:\n${mean(datasetScaled, 0, false)}")
+    println("Mean of scaled:\n${std(datasetScaled, 0, false)}")
 }
\ No newline at end of file
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
index 60716d0ba..238696cf9 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/linearSystemSolvingWithLUP.kt
@@ -41,7 +41,7 @@ fun main() = Double.tensorAlgebra.withBroadcast {// work in context with linear
     // solve `Ax = b` system using LUP decomposition
 
     // get P, L, U such that PA = LU
-    val (p, l, u) = a.lu()
+    val (p, l, u) = lu(a)
 
     // check P is permutation matrix
     println("P:\n$p")
diff --git a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
index 52b3b556c..8fd5ae5ad 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/tensors/neuralNetwork.kt
@@ -9,10 +9,7 @@ import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.contentEquals
 import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.tensors.core.BroadcastDoubleTensorAlgebra
-import space.kscience.kmath.tensors.core.DoubleTensor
-import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
-import space.kscience.kmath.tensors.core.toDoubleTensor
+import space.kscience.kmath.tensors.core.*
 import kotlin.math.sqrt
 
 const val seed = 100500L
@@ -51,7 +48,7 @@ fun reluDer(x: DoubleTensor): DoubleTensor = DoubleTensorAlgebra {
 class ReLU : Activation(::relu, ::reluDer)
 
 fun sigmoid(x: DoubleTensor): DoubleTensor = DoubleTensorAlgebra {
-    1.0 / (1.0 + (-x).exp())
+    1.0 / (1.0 + exp((-x)))
 }
 
 fun sigmoidDer(x: DoubleTensor): DoubleTensor = DoubleTensorAlgebra {
@@ -85,7 +82,7 @@ class Dense(
         val gradInput = outputError dot weights.transposed()
 
         val gradW = input.transposed() dot outputError
-        val gradBias = outputError.mean(dim = 0, keepDim = false) * input.shape[0].toDouble()
+        val gradBias = mean(structureND = outputError, dim = 0, keepDim = false) * input.shape[0].toDouble()
 
         weights -= learningRate * gradW
         bias -= learningRate * gradBias
@@ -118,7 +115,7 @@ class NeuralNetwork(private val layers: List<Layer>) {
             onesForAnswers[intArrayOf(index, label)] = 1.0
         }
 
-        val softmaxValue = yPred.exp() / yPred.exp().sum(dim = 1, keepDim = true)
+        val softmaxValue = exp(yPred) / exp(yPred).sum(dim = 1, keepDim = true)
 
         (-onesForAnswers + softmaxValue) / (yPred.shape[0].toDouble())
     }
@@ -176,7 +173,6 @@ class NeuralNetwork(private val layers: List<Layer>) {
 }
 
 
-@OptIn(ExperimentalStdlibApi::class)
 fun main() = BroadcastDoubleTensorAlgebra {
     val features = 5
     val sampleSize = 250
diff --git a/gradle.properties b/gradle.properties
index 216ebf74a..da5867ea4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,3 +11,7 @@ org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx4096m
 
 toolsVersion=0.13.1-kotlin-1.7.20
+
+
+org.gradle.parallel=true
+org.gradle.workers.max=4
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index f6819a27f..7c8ba7d27 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -13,12 +13,11 @@ import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.Symbol.Companion.y
 import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.operations.map
+import space.kscience.kmath.operations.DoubleBufferOps.Companion.map
 import space.kscience.kmath.optimization.*
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
-import kotlin.math.pow
 import kotlin.test.Test
 
 internal class OptimizeTest {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
index fa8bf5e58..e7ade4f66 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
@@ -268,7 +268,7 @@ public open class DSRing<T, A>(
 
     protected fun DS<T, A>.mapData(block: A.(T) -> T): DS<T, A> {
         require(derivativeAlgebra == this@DSRing) { "All derivative operations should be done in the same algebra" }
-        val newData: Buffer<T> = data.map(valueBufferFactory) {
+        val newData: Buffer<T> = data.mapToBuffer(valueBufferFactory) {
             algebra.block(it)
         }
         return DS(newData)
@@ -276,7 +276,7 @@ public open class DSRing<T, A>(
 
     protected fun DS<T, A>.mapDataIndexed(block: (Int, T) -> T): DS<T, A> {
         require(derivativeAlgebra == this@DSRing) { "All derivative operations should be done in the same algebra" }
-        val newData: Buffer<T> = data.mapIndexed(valueBufferFactory, block)
+        val newData: Buffer<T> = data.mapIndexedToBuffer(valueBufferFactory, block)
         return DS(newData)
     }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
index 8cfa1b353..59dfeb8ea 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
@@ -11,6 +11,8 @@ import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.indices
 import kotlin.jvm.JvmName
 
+//TODO move to stat
+
 /**
  * Generate a chi squared expression from given x-y-sigma data and inline model. Provides automatic
  * differentiation.
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
index 449730e7a..2e6b63a92 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferField.kt
@@ -5,8 +5,6 @@
 
 package space.kscience.kmath.operations
 
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.DoubleField.pow
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 
@@ -32,9 +30,9 @@ public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Doub
     override fun atanh(arg: Buffer<Double>): DoubleBuffer = super<DoubleBufferOps>.atanh(arg)
 
     override fun power(arg: Buffer<Double>, pow: Number): DoubleBuffer = if (pow.isInteger()) {
-        arg.mapInline { it.pow(pow.toInt()) }
+        arg.map { it.pow(pow.toInt()) }
     } else {
-        arg.mapInline {
+        arg.map {
             if(it<0) throw IllegalArgumentException("Negative argument $it could not be raised to the fractional power")
             it.pow(pow.toDouble())
         }
@@ -42,103 +40,4 @@ public class DoubleBufferField(public val size: Int) : ExtendedField<Buffer<Doub
 
     override fun unaryOperationFunction(operation: String): (arg: Buffer<Double>) -> Buffer<Double> =
         super<ExtendedField>.unaryOperationFunction(operation)
-
-    //    override fun number(value: Number): Buffer<Double> = DoubleBuffer(size) { value.toDouble() }
-//
-//    override fun Buffer<Double>.unaryMinus(): Buffer<Double> = DoubleBufferOperations.run {
-//        -this@unaryMinus
-//    }
-//
-//    override fun add(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
-//        require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
-//        return DoubleBufferOperations.add(a, b)
-//    }
-//
-
-//
-//    override fun multiply(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
-//        require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
-//        return DoubleBufferOperations.multiply(a, b)
-//    }
-//
-//    override fun divide(a: Buffer<Double>, b: Buffer<Double>): DoubleBuffer {
-//        require(a.size == size) { "The buffer size ${a.size} does not match context size $size" }
-//        return DoubleBufferOperations.divide(a, b)
-//    }
-//
-//    override fun sin(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.sin(arg)
-//    }
-//
-//    override fun cos(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.cos(arg)
-//    }
-//
-//    override fun tan(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.tan(arg)
-//    }
-//
-//    override fun asin(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.asin(arg)
-//    }
-//
-//    override fun acos(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.acos(arg)
-//    }
-//
-//    override fun atan(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.atan(arg)
-//    }
-//
-//    override fun sinh(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.sinh(arg)
-//    }
-//
-//    override fun cosh(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.cosh(arg)
-//    }
-//
-//    override fun tanh(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.tanh(arg)
-//    }
-//
-//    override fun asinh(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.asinh(arg)
-//    }
-//
-//    override fun acosh(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.acosh(arg)
-//    }
-//
-//    override fun atanh(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.atanh(arg)
-//    }
-//
-//    override fun power(arg: Buffer<Double>, pow: Number): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.power(arg, pow)
-//    }
-//
-//    override fun exp(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.exp(arg)
-//    }
-//
-//    override fun ln(arg: Buffer<Double>): DoubleBuffer {
-//        require(arg.size == size) { "The buffer size ${arg.size} does not match context size $size" }
-//        return DoubleBufferOperations.ln(arg)
-//    }
-
 }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index ded8753a3..7ba1a7066 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -6,10 +6,8 @@
 package space.kscience.kmath.operations
 
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.DoubleBuffer
-import space.kscience.kmath.structures.MutableBufferFactory
-import space.kscience.kmath.structures.asBuffer
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.structures.*
 import kotlin.math.*
 
 /**
@@ -19,10 +17,29 @@ public abstract class DoubleBufferOps : BufferAlgebra<Double, DoubleField>, Exte
     Norm<Buffer<Double>, Double> {
 
     override val elementAlgebra: DoubleField get() = DoubleField
+
     override val elementBufferFactory: MutableBufferFactory<Double> get() = elementAlgebra.bufferFactory
 
-    override fun Buffer<Double>.map(block: DoubleField.(Double) -> Double): DoubleBuffer =
-        mapInline { DoubleField.block(it) }
+    @Suppress("OVERRIDE_BY_INLINE")
+    @OptIn(UnstableKMathAPI::class)
+    final override inline fun Buffer<Double>.map(block: DoubleField.(Double) -> Double): DoubleBuffer =
+        DoubleArray(size) { DoubleField.block(getDouble(it)) }.asBuffer()
+
+
+    @OptIn(UnstableKMathAPI::class)
+    @Suppress("OVERRIDE_BY_INLINE")
+    final override inline fun Buffer<Double>.mapIndexed(block: DoubleField.(index: Int, arg: Double) -> Double): DoubleBuffer =
+        DoubleBuffer(size) { DoubleField.block(it, getDouble(it)) }
+
+    @OptIn(UnstableKMathAPI::class)
+    @Suppress("OVERRIDE_BY_INLINE")
+    final override inline fun Buffer<Double>.zip(
+        other: Buffer<Double>,
+        block: DoubleField.(left: Double, right: Double) -> Double,
+    ): DoubleBuffer {
+        require(size == other.size) { "Incompatible buffer sizes. left: ${size}, right: ${other.size}" }
+        return DoubleBuffer(size) { DoubleField.block(getDouble(it), other.getDouble(it)) }
+    }
 
     override fun unaryOperationFunction(operation: String): (arg: Buffer<Double>) -> Buffer<Double> =
         super<ExtendedFieldOps>.unaryOperationFunction(operation)
@@ -30,7 +47,7 @@ public abstract class DoubleBufferOps : BufferAlgebra<Double, DoubleField>, Exte
     override fun binaryOperationFunction(operation: String): (left: Buffer<Double>, right: Buffer<Double>) -> Buffer<Double> =
         super<ExtendedFieldOps>.binaryOperationFunction(operation)
 
-    override fun Buffer<Double>.unaryMinus(): DoubleBuffer = mapInline { -it }
+    override fun Buffer<Double>.unaryMinus(): DoubleBuffer = map { -it }
 
     override fun add(left: Buffer<Double>, right: Buffer<Double>): DoubleBuffer {
         require(right.size == left.size) {
@@ -77,6 +94,7 @@ public abstract class DoubleBufferOps : BufferAlgebra<Double, DoubleField>, Exte
 //        } else RealBuffer(DoubleArray(a.size) { a[it] / kValue })
 //    }
 
+    @UnstableKMathAPI
     override fun multiply(left: Buffer<Double>, right: Buffer<Double>): DoubleBuffer {
         require(right.size == left.size) {
             "The size of the first buffer ${left.size} should be the same as for second one: ${right.size} "
@@ -101,55 +119,83 @@ public abstract class DoubleBufferOps : BufferAlgebra<Double, DoubleField>, Exte
         } else DoubleBuffer(DoubleArray(left.size) { left[it] / right[it] })
     }
 
-    override fun sin(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::sin)
+    override fun sin(arg: Buffer<Double>): DoubleBuffer = arg.map { sin(it) }
 
-    override fun cos(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::cos)
+    override fun cos(arg: Buffer<Double>): DoubleBuffer = arg.map { cos(it) }
 
-    override fun tan(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::tan)
+    override fun tan(arg: Buffer<Double>): DoubleBuffer = arg.map { tan(it) }
 
-    override fun asin(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::asin)
+    override fun asin(arg: Buffer<Double>): DoubleBuffer = arg.map { asin(it) }
 
-    override fun acos(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::acos)
+    override fun acos(arg: Buffer<Double>): DoubleBuffer = arg.map { acos(it) }
 
-    override fun atan(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::atan)
+    override fun atan(arg: Buffer<Double>): DoubleBuffer = arg.map { atan(it) }
 
-    override fun sinh(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::sinh)
+    override fun sinh(arg: Buffer<Double>): DoubleBuffer = arg.map { sinh(it) }
 
-    override fun cosh(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::cosh)
+    override fun cosh(arg: Buffer<Double>): DoubleBuffer = arg.map { cosh(it) }
 
-    override fun tanh(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::tanh)
+    override fun tanh(arg: Buffer<Double>): DoubleBuffer = arg.map { tanh(it) }
 
-    override fun asinh(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::asinh)
+    override fun asinh(arg: Buffer<Double>): DoubleBuffer = arg.map { asinh(it) }
 
-    override fun acosh(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::acosh)
+    override fun acosh(arg: Buffer<Double>): DoubleBuffer = arg.map { acosh(it) }
 
-    override fun atanh(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::atanh)
+    override fun atanh(arg: Buffer<Double>): DoubleBuffer = arg.map { atanh(it) }
 
-    override fun exp(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::exp)
+    override fun exp(arg: Buffer<Double>): DoubleBuffer = arg.map { exp(it) }
 
-    override fun ln(arg: Buffer<Double>): DoubleBuffer = arg.mapInline(::ln)
+    override fun ln(arg: Buffer<Double>): DoubleBuffer = arg.map { ln(it) }
 
     override fun norm(arg: Buffer<Double>): Double = DoubleL2Norm.norm(arg)
 
-    override fun scale(a: Buffer<Double>, value: Double): DoubleBuffer = a.mapInline { it * value }
+    override fun scale(a: Buffer<Double>, value: Double): DoubleBuffer = a.map { it * value }
 
     override fun power(arg: Buffer<Double>, pow: Number): Buffer<Double> = if (pow is Int) {
-        arg.mapInline { it.pow(pow) }
+        arg.map { it.pow(pow) }
     } else {
-        arg.mapInline { it.pow(pow.toDouble()) }
+        arg.map { it.pow(pow.toDouble()) }
     }
 
-    public companion object : DoubleBufferOps() {
-        public inline fun Buffer<Double>.mapInline(block: (Double) -> Double): DoubleBuffer =
-            if (this is DoubleBuffer) {
-                DoubleArray(size) { block(array[it]) }.asBuffer()
-            } else {
-                DoubleArray(size) { block(get(it)) }.asBuffer()
-            }
-    }
+    public companion object : DoubleBufferOps()
 }
 
 public object DoubleL2Norm : Norm<Point<Double>, Double> {
     override fun norm(arg: Point<Double>): Double = sqrt(arg.fold(0.0) { acc: Double, d: Double -> acc + d.pow(2) })
 }
 
+public fun DoubleBufferOps.sum(buffer: Buffer<Double>): Double = buffer.reduce(Double::plus)
+
+/**
+ * Sum of elements using given [conversion]
+ */
+public inline fun <T> DoubleBufferOps.sumOf(buffer: Buffer<T>, conversion: (T) -> Double): Double =
+    buffer.fold(0.0) { acc, value -> acc + conversion(value) }
+
+public fun DoubleBufferOps.average(buffer: Buffer<Double>): Double = sum(buffer) / buffer.size
+
+/**
+ * Average of elements using given [conversion]
+ */
+public inline fun <T> DoubleBufferOps.averageOf(buffer: Buffer<T>, conversion: (T) -> Double): Double =
+    sumOf(buffer, conversion) / buffer.size
+
+public fun DoubleBufferOps.dispersion(buffer: Buffer<Double>): Double {
+    val av = average(buffer)
+    return buffer.fold(0.0) { acc, value -> acc + (value - av).pow(2) } / buffer.size
+}
+
+public fun DoubleBufferOps.std(buffer: Buffer<Double>): Double = sqrt(dispersion(buffer))
+
+public fun DoubleBufferOps.covariance(x: Buffer<Double>, y: Buffer<Double>): Double {
+    require(x.size == y.size) { "Expected buffers of the same size, but x.size == ${x.size} and y.size == ${y.size}" }
+    val xMean = average(x)
+    val yMean = average(y)
+    var sum = 0.0
+    x.indices.forEach {
+        sum += (x[it] - xMean) * (y[it] - yMean)
+    }
+    return sum / (x.size - 1)
+}
+
+
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index efadfb3cc..f05ddafb8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -5,6 +5,21 @@
 
 package space.kscience.kmath.operations
 
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.structures.Buffer
+
+/**
+ * Returns the sum of all elements in the iterable in this [Group].
+ *
+ * @receiver the algebra that provides addition.
+ * @param data the iterable to sum up.
+ * @return the sum.
+ */
+@PerformancePitfall("Potential boxing access to buffer elements")
+public fun <T> Group<T>.sum(data: Buffer<T>): T = data.fold(zero) { left, right ->
+    add(left, right)
+}
+
 /**
  * Returns the sum of all elements in the iterable in this [Group].
  *
@@ -29,6 +44,18 @@ public fun <T> Group<T>.sum(data: Sequence<T>): T = data.fold(zero) { left, righ
     add(left, right)
 }
 
+/**
+ * Returns an average value of elements in the iterable in this [Group].
+ *
+ * @receiver the algebra that provides addition and division.
+ * @param data the iterable to find average.
+ * @return the average value.
+ * @author Iaroslav Postovalov
+ */
+@PerformancePitfall("Potential boxing access to buffer elements")
+public fun <T, S> S.average(data: Buffer<T>): T where S : Group<T>, S : ScaleOperations<T> =
+    sum(data) / data.size
+
 /**
  * Returns an average value of elements in the iterable in this [Group].
  *
@@ -95,4 +122,3 @@ public fun <T, S> Iterable<T>.averageWith(space: S): T where S : Group<T>, S : S
  */
 public fun <T, S> Sequence<T>.averageWith(space: S): T where S : Group<T>, S : ScaleOperations<T> =
     space.average(this)
-
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
index 5a8594616..1696d5055 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/DoubleBuffer.kt
@@ -57,6 +57,9 @@ public fun Buffer<Double>.toDoubleArray(): DoubleArray = when (this) {
     else -> DoubleArray(size, ::get)
 }
 
+/**
+ * Represent this buffer as [DoubleBuffer]. Does not guarantee that changes in the original buffer are reflected on this buffer.
+ */
 public fun Buffer<Double>.toDoubleBuffer(): DoubleBuffer = when (this) {
     is DoubleBuffer -> this
     else -> DoubleArray(size, ::get).asBuffer()
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferExtensions.kt
index 0a5d6b964..0a475187f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferExtensions.kt
@@ -61,18 +61,18 @@ public fun <T> Buffer<T>.toMutableList(): MutableList<T> = when (this) {
  */
 @UnstableKMathAPI
 public inline fun <reified T> Buffer<T>.toTypedArray(): Array<T> = Array(size, ::get)
-
-/**
- * Create a new buffer from this one with the given mapping function and using [Buffer.Companion.auto] buffer factory.
- */
-public inline fun <T, reified R : Any> Buffer<T>.map(block: (T) -> R): Buffer<R> =
-    Buffer.auto(size) { block(get(it)) }
+//
+///**
+// * Create a new buffer from this one with the given mapping function and using [Buffer.Companion.auto] buffer factory.
+// */
+//public inline fun <T, reified R : Any> Buffer<T>.map(block: (T) -> R): Buffer<R> =
+//    Buffer.auto(size) { block(get(it)) }
 
 /**
  * Create a new buffer from this one with the given mapping function.
  * Provided [bufferFactory] is used to construct the new buffer.
  */
-public inline fun <T, R> Buffer<T>.map(
+public inline fun <T, R> Buffer<T>.mapToBuffer(
     bufferFactory: BufferFactory<R>,
     crossinline block: (T) -> R,
 ): Buffer<R> = bufferFactory(size) { block(get(it)) }
@@ -81,23 +81,24 @@ public inline fun <T, R> Buffer<T>.map(
  * Create a new buffer from this one with the given mapping (indexed) function.
  * Provided [bufferFactory] is used to construct the new buffer.
  */
-public inline fun <T, R> Buffer<T>.mapIndexed(
+public inline fun <T, R> Buffer<T>.mapIndexedToBuffer(
     bufferFactory: BufferFactory<R>,
     crossinline block: (index: Int, value: T) -> R,
 ): Buffer<R> = bufferFactory(size) { block(it, get(it)) }
-
-/**
- * Create a new buffer from this one with the given indexed mapping function.
- * Provided [BufferFactory] is used to construct the new buffer.
- */
-public inline fun <T, reified R : Any> Buffer<T>.mapIndexed(
-    crossinline block: (index: Int, value: T) -> R,
-): Buffer<R> = Buffer.auto(size) { block(it, get(it)) }
+//
+///**
+// * Create a new buffer from this one with the given indexed mapping function.
+// * Provided [BufferFactory] is used to construct the new buffer.
+// */
+//public inline fun <T, reified R : Any> Buffer<T>.mapIndexed(
+//    crossinline block: (index: Int, value: T) -> R,
+//): Buffer<R> = Buffer.auto(size) { block(it, get(it)) }
 
 /**
  * Fold given buffer according to [operation]
  */
 public inline fun <T, R> Buffer<T>.fold(initial: R, operation: (acc: R, T) -> R): R {
+    if (size == 0) return initial
     var accumulator = initial
     for (index in this.indices) accumulator = operation(accumulator, get(index))
     return accumulator
@@ -107,18 +108,31 @@ public inline fun <T, R> Buffer<T>.fold(initial: R, operation: (acc: R, T) -> R)
  * Fold given buffer according to indexed [operation]
  */
 public inline fun <T : Any, R> Buffer<T>.foldIndexed(initial: R, operation: (index: Int, acc: R, T) -> R): R {
+    if (size == 0) return initial
     var accumulator = initial
     for (index in this.indices) accumulator = operation(index, accumulator, get(index))
     return accumulator
 }
 
+/**
+ * Reduce a buffer from left to right according to [operation]
+ */
+public inline fun <T> Buffer<T>.reduce(operation: (left: T, value: T) -> T): T {
+    require(size > 0) { "Buffer must have elements" }
+    var current = get(0)
+    for (i in 1 until size) {
+        current = operation(current, get(i))
+    }
+    return current
+}
+
 /**
  * Zip two buffers using given [transform].
  */
 @UnstableKMathAPI
-public inline fun <T1, T2 : Any, reified R : Any> Buffer<T1>.zip(
+public inline fun <T1, T2, R> Buffer<T1>.combineToBuffer(
     other: Buffer<T2>,
-    bufferFactory: BufferFactory<R> = BufferFactory.auto(),
+    bufferFactory: BufferFactory<R>,
     crossinline transform: (T1, T2) -> R,
 ): Buffer<R> {
     require(size == other.size) { "Buffer size mismatch in zip: expected $size but found ${other.size}" }
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/types.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/types.kt
new file mode 100644
index 000000000..4ace17538
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/types.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.structures
+
+
+public typealias Float32 = Float
+public typealias Float64 = Double
+
+public typealias Int8 = Byte
+public typealias Int16 = Short
+public typealias Int32 = Int
+public typealias Int64 = Long
+
+public typealias UInt8 = UByte
+public typealias UInt16 = UShort
+public typealias UInt32 = UInt
+public typealias UInt64 = ULong
\ No newline at end of file
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
index 3f06693b0..7bae388a8 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
@@ -81,9 +81,7 @@ public suspend fun <T> AsyncFlow<T>.collect(concurrency: Int, collector: FlowCol
 public suspend inline fun <T> AsyncFlow<T>.collect(
     concurrency: Int,
     crossinline action: suspend (value: T) -> Unit,
-): Unit = collect(concurrency, object : FlowCollector<T> {
-    override suspend fun emit(value: T): Unit = action(value)
-})
+): Unit = collect(concurrency, FlowCollector<T> { value -> action(value) })
 
 public inline fun <T, R> Flow<T>.mapParallel(
     dispatcher: CoroutineDispatcher = Dispatchers.Default,
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
index 3845bd2a7..fc76ea819 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.integration
 
-import space.kscience.kmath.operations.map
+import space.kscience.kmath.operations.mapToBuffer
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
@@ -33,11 +33,11 @@ public fun GaussIntegratorRuleFactory.build(
     val normalized: Pair<Buffer<Double>, Buffer<Double>> = build(numPoints)
     val length = range.endInclusive - range.start
 
-    val points = normalized.first.map(::DoubleBuffer) {
+    val points = normalized.first.mapToBuffer(::DoubleBuffer) {
         range.start + length / 2 + length / 2 * it
     }
 
-    val weights = normalized.second.map(::DoubleBuffer) {
+    val weights = normalized.second.mapToBuffer(::DoubleBuffer) {
         it * length / 2
     }
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index 9a8f475c8..c66674fbb 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -65,9 +65,9 @@ public class SplineIntegrator<T : Comparable<T>>(
             DoubleBuffer(numPoints) { i -> range.start + i * step }
         }
 
-        val values = nodes.map(bufferFactory) { integrand.function(it) }
+        val values = nodes.mapToBuffer(bufferFactory) { integrand.function(it) }
         val polynomials = interpolator.interpolatePolynomials(
-            nodes.map(bufferFactory) { number(it) },
+            nodes.mapToBuffer(bufferFactory) { number(it) },
             values
         )
         val res = polynomials.integrate(algebra, number(range.start)..number(range.endInclusive))
@@ -93,7 +93,7 @@ public object DoubleSplineIntegrator : UnivariateIntegrator<Double> {
             DoubleBuffer(numPoints) { i -> range.start + i * step }
         }
 
-        val values = nodes.map { integrand.function(it) }
+        val values = nodes.mapToBuffer(::DoubleBuffer) { integrand.function(it) }
         val polynomials = interpolator.interpolatePolynomials(nodes, values)
         val res = polynomials.integrate(DoubleField, range)
         return integrand + IntegrandValue(res) + IntegrandCallsPerformed(integrand.calls + nodes.size)
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
index f22ea9776..b62780ed5 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
@@ -97,7 +97,7 @@ public class UniformHistogramGroupND<V : Any, A : Field<V>>(
             }
         }
         hBuilder.apply(builder)
-        val values: BufferND<V> = BufferND(ndCounter.indices, ndCounter.buffer.map(valueBufferFactory) { it.value })
+        val values: BufferND<V> = BufferND(ndCounter.indices, ndCounter.buffer.mapToBuffer(valueBufferFactory) { it.value })
 
         return HistogramND(this, values)
     }
diff --git a/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
index afd292904..d52420fc6 100644
--- a/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
+++ b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
@@ -12,6 +12,7 @@ import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.one
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
+import space.kscience.kmath.tensors.core.randomNormal
 import space.kscience.kmath.tensors.core.tensorAlgebra
 import kotlin.test.Test
 import kotlin.test.assertTrue
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index 62bfe90ba..ef7b7f257 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -118,35 +118,35 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
     override fun StructureND<T>.argMax(dim: Int, keepDim: Boolean): Tensor<Int> =
         ndBase.get().argmax(ndArray, keepDim, dim).asIntStructure()
 
-    override fun StructureND<T>.mean(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
-        ndArray.mean(keepDim, dim).wrap()
+    override fun mean(structureND: StructureND<T>, dim: Int, keepDim: Boolean): Tensor<T> =
+        structureND.ndArray.mean(keepDim, dim).wrap()
 
-    override fun StructureND<T>.exp(): Nd4jArrayStructure<T> = Transforms.exp(ndArray).wrap()
-    override fun StructureND<T>.ln(): Nd4jArrayStructure<T> = Transforms.log(ndArray).wrap()
-    override fun StructureND<T>.sqrt(): Nd4jArrayStructure<T> = Transforms.sqrt(ndArray).wrap()
-    override fun StructureND<T>.cos(): Nd4jArrayStructure<T> = Transforms.cos(ndArray).wrap()
-    override fun StructureND<T>.acos(): Nd4jArrayStructure<T> = Transforms.acos(ndArray).wrap()
-    override fun StructureND<T>.cosh(): Nd4jArrayStructure<T> = Transforms.cosh(ndArray).wrap()
+    override fun exp(arg: StructureND<T>): Nd4jArrayStructure<T> = Transforms.exp(arg.ndArray).wrap()
+    override fun ln(arg: StructureND<T>): Nd4jArrayStructure<T> = Transforms.log(arg.ndArray).wrap()
+    override fun sqrt(arg: StructureND<T>): Nd4jArrayStructure<T> = Transforms.sqrt(arg.ndArray).wrap()
+    override fun cos(arg: StructureND<T>): Nd4jArrayStructure<T> = Transforms.cos(arg.ndArray).wrap()
+    override fun acos(arg: StructureND<T>): Nd4jArrayStructure<T> = Transforms.acos(arg.ndArray).wrap()
+    override fun cosh(arg: StructureND<T>): Nd4jArrayStructure<T> = Transforms.cosh(arg.ndArray).wrap()
 
-    override fun StructureND<T>.acosh(): Nd4jArrayStructure<T> =
-        Nd4j.getExecutioner().exec(ACosh(ndArray, ndArray.ulike())).wrap()
+    override fun acosh(arg: StructureND<T>): Nd4jArrayStructure<T> =
+        Nd4j.getExecutioner().exec(ACosh(arg.ndArray, arg.ndArray.ulike())).wrap()
 
-    override fun StructureND<T>.sin(): Nd4jArrayStructure<T> = Transforms.sin(ndArray).wrap()
-    override fun StructureND<T>.asin(): Nd4jArrayStructure<T> = Transforms.asin(ndArray).wrap()
-    override fun StructureND<T>.sinh(): Tensor<T> = Transforms.sinh(ndArray).wrap()
+    override fun sin(arg: StructureND<T>): Nd4jArrayStructure<T> = Transforms.sin(arg.ndArray).wrap()
+    override fun asin(arg: StructureND<T>): Nd4jArrayStructure<T> = Transforms.asin(arg.ndArray).wrap()
+    override fun sinh(arg: StructureND<T>): Tensor<T> = Transforms.sinh(arg.ndArray).wrap()
 
-    override fun StructureND<T>.asinh(): Nd4jArrayStructure<T> =
-        Nd4j.getExecutioner().exec(ASinh(ndArray, ndArray.ulike())).wrap()
+    override fun asinh(arg: StructureND<T>): Nd4jArrayStructure<T> =
+        Nd4j.getExecutioner().exec(ASinh(arg.ndArray, arg.ndArray.ulike())).wrap()
 
-    override fun StructureND<T>.tan(): Nd4jArrayStructure<T> = Transforms.tan(ndArray).wrap()
-    override fun StructureND<T>.atan(): Nd4jArrayStructure<T> = Transforms.atan(ndArray).wrap()
-    override fun StructureND<T>.tanh(): Nd4jArrayStructure<T> = Transforms.tanh(ndArray).wrap()
-    override fun StructureND<T>.atanh(): Nd4jArrayStructure<T> = Transforms.atanh(ndArray).wrap()
+    override fun tan(arg: StructureND<T>): Nd4jArrayStructure<T> = Transforms.tan(arg.ndArray).wrap()
+    override fun atan(arg: StructureND<T>): Nd4jArrayStructure<T> = Transforms.atan(arg.ndArray).wrap()
+    override fun tanh(arg: StructureND<T>): Nd4jArrayStructure<T> = Transforms.tanh(arg.ndArray).wrap()
+    override fun atanh(arg: StructureND<T>): Nd4jArrayStructure<T> = Transforms.atanh(arg.ndArray).wrap()
     override fun power(arg: StructureND<T>, pow: Number): StructureND<T> = Transforms.pow(arg.ndArray, pow).wrap()
-    override fun StructureND<T>.ceil(): Nd4jArrayStructure<T> = Transforms.ceil(ndArray).wrap()
-    override fun StructureND<T>.floor(): Nd4jArrayStructure<T> = Transforms.floor(ndArray).wrap()
-    override fun StructureND<T>.std(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
-        ndArray.std(true, keepDim, dim).wrap()
+    override fun ceil(arg: StructureND<T>): Nd4jArrayStructure<T> = Transforms.ceil(arg.ndArray).wrap()
+    override fun floor(structureND: StructureND<T>): Nd4jArrayStructure<T> = Transforms.floor(structureND.ndArray).wrap()
+    override fun std(structureND: StructureND<T>, dim: Int, keepDim: Boolean): Tensor<T> =
+        structureND.ndArray.std(true, keepDim, dim).wrap()
 
     override fun T.div(arg: StructureND<T>): Nd4jArrayStructure<T> = arg.ndArray.rdiv(this).wrap()
     override fun StructureND<T>.div(arg: T): Nd4jArrayStructure<T> = ndArray.div(arg).wrap()
@@ -160,8 +160,8 @@ public sealed interface Nd4jTensorAlgebra<T : Number, A : Field<T>> : AnalyticTe
         ndArray.divi(arg.ndArray)
     }
 
-    override fun StructureND<T>.variance(dim: Int, keepDim: Boolean): Nd4jArrayStructure<T> =
-        Nd4j.getExecutioner().exec(Variance(ndArray, true, true, dim)).wrap()
+    override fun variance(structureND: StructureND<T>, dim: Int, keepDim: Boolean): Tensor<T> =
+        Nd4j.getExecutioner().exec(Variance(structureND.ndArray, true, true, dim)).wrap()
 
     private companion object {
         private val ndBase: ThreadLocal<NDBase> = ThreadLocal.withInitial(::NDBase)
@@ -211,7 +211,7 @@ public object DoubleNd4jTensorAlgebra : Nd4jTensorAlgebra<Double, DoubleField> {
     override fun StructureND<Double>.sum(): Double = ndArray.sumNumber().toDouble()
     override fun StructureND<Double>.min(): Double = ndArray.minNumber().toDouble()
     override fun StructureND<Double>.max(): Double = ndArray.maxNumber().toDouble()
-    override fun StructureND<Double>.mean(): Double = ndArray.meanNumber().toDouble()
-    override fun StructureND<Double>.std(): Double = ndArray.stdNumber().toDouble()
-    override fun StructureND<Double>.variance(): Double = ndArray.varNumber().toDouble()
+    override fun mean(structureND: StructureND<Double>): Double = structureND.ndArray.meanNumber().toDouble()
+    override fun std(structureND: StructureND<Double>): Double = structureND.ndArray.stdNumber().toDouble()
+    override fun variance(structureND: StructureND<Double>): Double = structureND.ndArray.varNumber().toDouble()
 }
diff --git a/kmath-optimization/src/commonMain/tmp/minuit/HessianGradientCalculator.kt b/kmath-optimization/src/commonMain/tmp/minuit/HessianGradientCalculator.kt
index 150d192f9..4ef743955 100644
--- a/kmath-optimization/src/commonMain/tmp/minuit/HessianGradientCalculator.kt
+++ b/kmath-optimization/src/commonMain/tmp/minuit/HessianGradientCalculator.kt
@@ -33,7 +33,7 @@ internal class HessianGradientCalculator(fcn: MnFcn, par: MnUserTransformation,
         val g2: RealVector = gradient.getGradientDerivative()
         val gstep: RealVector = gradient.getStep()
         val fcnmin: Double = par.fval()
-        //   std::cout<<"fval: "<<fcnmin<<std::endl;
+        //   standardDiviation::cout<<"fval: "<<fcnmin<<standardDiviation::endl;
         val dfmin: Double = 4.0 * precision().eps2() * (abs(fcnmin) + theFcn.errorDef())
         val n: Int = x.getDimension()
         val dgrd: RealVector = ArrayRealVector(n)
diff --git a/kmath-optimization/src/commonMain/tmp/minuit/MnPosDef.kt b/kmath-optimization/src/commonMain/tmp/minuit/MnPosDef.kt
index f94e387d9..e8d29c8e4 100644
--- a/kmath-optimization/src/commonMain/tmp/minuit/MnPosDef.kt
+++ b/kmath-optimization/src/commonMain/tmp/minuit/MnPosDef.kt
@@ -36,7 +36,7 @@ internal object MnPosDef {
         if (err.size() === 1 && err[0, 0] > prec.eps()) {
             return e
         }
-        //   std::cout<<"MnPosDef init matrix= "<<err<<std::endl;
+        //   standardDiviation::cout<<"MnPosDef init matrix= "<<err<<standardDiviation::endl;
         val epspdf: Double = max(1e-6, prec.eps2())
         var dgmin: Double = err[0, 0]
         for (i in 0 until err.nrow()) {
@@ -66,11 +66,11 @@ internal object MnPosDef {
             }
         }
 
-        //   std::cout<<"MnPosDef p: "<<p<<std::endl;
+        //   standardDiviation::cout<<"MnPosDef p: "<<p<<standardDiviation::endl;
         val eval: RealVector = p.eigenvalues()
         val pmin: Double = eval.getEntry(0)
         var pmax: Double = eval.getEntry(eval.getDimension() - 1)
-        //   std::cout<<"pmin= "<<pmin<<" pmax= "<<pmax<<std::endl;
+        //   standardDiviation::cout<<"pmin= "<<pmin<<" pmax= "<<pmax<<standardDiviation::endl;
         pmax = max(abs(pmax), 1.0)
         if (pmin > epspdf * pmax) {
             return e
@@ -81,9 +81,9 @@ internal object MnPosDef {
             err[i, i] = err[i, i] * (1.0 + padd)
             MINUITPlugin.logStatic(java.lang.Double.toString(eval.getEntry(i)))
         }
-        //   std::cout<<"MnPosDef final matrix: "<<err<<std::endl;
+        //   standardDiviation::cout<<"MnPosDef final matrix: "<<err<<standardDiviation::endl;
         MINUITPlugin.logStatic("matrix forced pos-def by adding $padd to diagonal")
-        //   std::cout<<"eigenvalues: "<<eval<<std::endl;
+        //   standardDiviation::cout<<"eigenvalues: "<<eval<<standardDiviation::endl;
         return MinimumError(err, MnMadePosDef())
     }
 }
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
index feb888169..3bf8b33e8 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/Mean.kt
@@ -52,16 +52,16 @@ public class Mean<T>(
         @Deprecated("Use Long.mean instead")
         public val long: Mean<Long> = Mean(LongRing) { sum, count -> sum / count }
 
-        public fun evaluate(buffer: Buffer<Double>): Double = Double.mean.evaluateBlocking(buffer)
-        public fun evaluate(buffer: Buffer<Int>): Int = Int.mean.evaluateBlocking(buffer)
-        public fun evaluate(buffer: Buffer<Long>): Long = Long.mean.evaluateBlocking(buffer)
+        public fun evaluate(buffer: Buffer<Double>): Double = DoubleField.mean.evaluateBlocking(buffer)
+        public fun evaluate(buffer: Buffer<Int>): Int = IntRing.mean.evaluateBlocking(buffer)
+        public fun evaluate(buffer: Buffer<Long>): Long = LongRing.mean.evaluateBlocking(buffer)
     }
 }
 
 
 //TODO replace with optimized version which respects overflow
-public val Double.Companion.mean: Mean<Double> get() = Mean(DoubleField) { sum, count -> sum / count }
-public val Int.Companion.mean: Mean<Int> get() = Mean(IntRing) { sum, count -> sum / count }
-public val Long.Companion.mean: Mean<Long> get() = Mean(LongRing) { sum, count -> sum / count }
+public val DoubleField.mean: Mean<Double> get() = Mean(DoubleField) { sum, count -> sum / count }
+public val IntRing.mean: Mean<Int> get() = Mean(IntRing) { sum, count -> sum / count }
+public val LongRing.mean: Mean<Long> get() = Mean(LongRing) { sum, count -> sum / count }
 
 
diff --git a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
index 264d62246..3be7fa314 100644
--- a/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
+++ b/kmath-stat/src/jvmTest/kotlin/space/kscience/kmath/stat/StatisticTest.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.last
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.runBlocking
+import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.random.chain
 import space.kscience.kmath.streaming.chunked
@@ -27,26 +28,26 @@ internal class StatisticTest {
 
     @Test
     fun singleBlockingMean() {
-        val first = runBlocking { chunked.first()}
-        val res = Double.mean(first)
-        assertEquals(0.5,res, 1e-1)
+        val first = runBlocking { chunked.first() }
+        val res = DoubleField.mean(first)
+        assertEquals(0.5, res, 1e-1)
     }
 
     @Test
     fun singleSuspendMean() = runBlocking {
-        val first = runBlocking { chunked.first()}
-        val res = Double.mean(first)
-        assertEquals(0.5,res, 1e-1)
+        val first = runBlocking { chunked.first() }
+        val res = DoubleField.mean(first)
+        assertEquals(0.5, res, 1e-1)
     }
 
     @Test
     fun parallelMean() = runBlocking {
-        val average = Double.mean
+        val average = DoubleField.mean
             .flow(chunked) //create a flow from evaluated results
             .take(100) // Take 100 data chunks from the source and accumulate them
             .last() //get 1e5 data samples average
 
-        assertEquals(0.5,average, 1e-2)
+        assertEquals(0.5, average, 1e-2)
     }
 
 }
diff --git a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
index ff11dc8fe..af754f841 100644
--- a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
+++ b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
@@ -13,6 +13,7 @@ import space.kscience.kmath.nd.structureND
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra.Companion.sum
+import space.kscience.kmath.tensors.core.randomNormal
 import kotlin.test.assertEquals
 
 @OptIn(UnstableKMathAPI::class)
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
index 587096500..1a324b200 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/AnalyticTensorAlgebra.kt
@@ -21,7 +21,7 @@ public interface AnalyticTensorAlgebra<T, A : Field<T>> :
     /**
      * @return the mean of all elements in the input tensor.
      */
-    public fun StructureND<T>.mean(): T
+    public fun mean(structureND: StructureND<T>): T
 
     /**
      * Returns the mean of each row of the input tensor in the given dimension [dim].
@@ -34,12 +34,12 @@ public interface AnalyticTensorAlgebra<T, A : Field<T>> :
      * @param keepDim whether the output tensor has [dim] retained or not.
      * @return the mean of each row of the input tensor in the given dimension [dim].
      */
-    public fun StructureND<T>.mean(dim: Int, keepDim: Boolean): Tensor<T>
+    public fun mean(structureND: StructureND<T>, dim: Int, keepDim: Boolean): Tensor<T>
 
     /**
      * @return the standard deviation of all elements in the input tensor.
      */
-    public fun StructureND<T>.std(): T
+    public fun std(structureND: StructureND<T>): T
 
     /**
      * Returns the standard deviation of each row of the input tensor in the given dimension [dim].
@@ -52,12 +52,12 @@ public interface AnalyticTensorAlgebra<T, A : Field<T>> :
      * @param keepDim whether the output tensor has [dim] retained or not.
      * @return the standard deviation of each row of the input tensor in the given dimension [dim].
      */
-    public fun StructureND<T>.std(dim: Int, keepDim: Boolean): Tensor<T>
+    public fun std(structureND: StructureND<T>, dim: Int, keepDim: Boolean): Tensor<T>
 
     /**
      * @return the variance of all elements in the input tensor.
      */
-    public fun StructureND<T>.variance(): T
+    public fun variance(structureND: StructureND<T>): T
 
     /**
      * Returns the variance of each row of the input tensor in the given dimension [dim].
@@ -70,80 +70,45 @@ public interface AnalyticTensorAlgebra<T, A : Field<T>> :
      * @param keepDim whether the output tensor has [dim] retained or not.
      * @return the variance of each row of the input tensor in the given dimension [dim].
      */
-    public fun StructureND<T>.variance(dim: Int, keepDim: Boolean): Tensor<T>
-
-    //For information: https://pytorch.org/docs/stable/generated/torch.exp.html
-    public fun StructureND<T>.exp(): Tensor<T>
-
-    //For information: https://pytorch.org/docs/stable/generated/torch.log.html
-    public fun StructureND<T>.ln(): Tensor<T>
+    public fun variance(structureND: StructureND<T>, dim: Int, keepDim: Boolean): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.sqrt.html
-    public fun StructureND<T>.sqrt(): Tensor<T>
-
-    //For information: https://pytorch.org/docs/stable/generated/torch.acos.html#torch.cos
-    public fun StructureND<T>.cos(): Tensor<T>
-
-    //For information: https://pytorch.org/docs/stable/generated/torch.acos.html#torch.acos
-    public fun StructureND<T>.acos(): Tensor<T>
-
-    //For information: https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.cosh
-    public fun StructureND<T>.cosh(): Tensor<T>
-
-    //For information: https://pytorch.org/docs/stable/generated/torch.acosh.html#torch.acosh
-    public fun StructureND<T>.acosh(): Tensor<T>
-
-    //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sin
-    public fun StructureND<T>.sin(): Tensor<T>
-
-    //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asin
-    public fun StructureND<T>.asin(): Tensor<T>
-
-    //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.sinh
-    public fun StructureND<T>.sinh(): Tensor<T>
-
-    //For information: https://pytorch.org/docs/stable/generated/torch.asin.html#torch.asinh
-    public fun StructureND<T>.asinh(): Tensor<T>
+    override fun sqrt(arg: StructureND<T>): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.atan.html#torch.tan
-    public fun StructureND<T>.tan(): Tensor<T>
+    override fun tan(arg: StructureND<T>): Tensor<T>
 
     //https://pytorch.org/docs/stable/generated/torch.atan.html#torch.atan
-    public fun StructureND<T>.atan(): Tensor<T>
+    override fun atan(arg: StructureND<T>): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.tanh
-    public fun StructureND<T>.tanh(): Tensor<T>
-
-    //For information: https://pytorch.org/docs/stable/generated/torch.atanh.html#torch.atanh
-    public fun StructureND<T>.atanh(): Tensor<T>
+    override fun tanh(arg: StructureND<T>): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.ceil.html#torch.ceil
-    public fun StructureND<T>.ceil(): Tensor<T>
+    public fun ceil(arg: StructureND<T>): Tensor<T>
 
     //For information: https://pytorch.org/docs/stable/generated/torch.floor.html#torch.floor
-    public fun StructureND<T>.floor(): Tensor<T>
+    public fun floor(structureND: StructureND<T>): Tensor<T>
 
-    override fun sin(arg: StructureND<T>): StructureND<T> = arg.sin()
+    override fun sin(arg: StructureND<T>): StructureND<T> 
 
-    override fun cos(arg: StructureND<T>): StructureND<T> = arg.cos()
+    override fun cos(arg: StructureND<T>): StructureND<T> 
 
-    override fun asin(arg: StructureND<T>): StructureND<T> = arg.asin()
+    override fun asin(arg: StructureND<T>): StructureND<T>
 
-    override fun acos(arg: StructureND<T>): StructureND<T> = arg.acos()
+    override fun acos(arg: StructureND<T>): StructureND<T>
 
-    override fun atan(arg: StructureND<T>): StructureND<T> = arg.atan()
+    override fun exp(arg: StructureND<T>): StructureND<T> 
 
-    override fun exp(arg: StructureND<T>): StructureND<T> = arg.exp()
+    override fun ln(arg: StructureND<T>): StructureND<T>
 
-    override fun ln(arg: StructureND<T>): StructureND<T> = arg.ln()
+    override fun sinh(arg: StructureND<T>): StructureND<T>
 
-    override fun sinh(arg: StructureND<T>): StructureND<T> = arg.sinh()
+    override fun cosh(arg: StructureND<T>): StructureND<T>
 
-    override fun cosh(arg: StructureND<T>): StructureND<T> = arg.cosh()
+    override fun asinh(arg: StructureND<T>): StructureND<T>
 
-    override fun asinh(arg: StructureND<T>): StructureND<T> = arg.asinh()
+    override fun acosh(arg: StructureND<T>): StructureND<T>
 
-    override fun acosh(arg: StructureND<T>): StructureND<T> = arg.acosh()
-
-    override fun atanh(arg: StructureND<T>): StructureND<T> = arg.atanh()
+    override fun atanh(arg: StructureND<T>): StructureND<T>
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
index e15fbb3a6..faff2eb80 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt
@@ -47,7 +47,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return the batch of `L` matrices.
      */
-    public fun StructureND<T>.cholesky(): StructureND<T>
+    public fun cholesky(structureND: StructureND<T>): StructureND<T>
 
     /**
      * QR decomposition.
@@ -61,7 +61,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return pair of `Q` and `R` tensors.
      */
-    public fun StructureND<T>.qr(): Pair<StructureND<T>, StructureND<T>>
+    public fun qr(structureND: StructureND<T>): Pair<StructureND<T>, StructureND<T>>
 
     /**
      * LUP decomposition
@@ -75,7 +75,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return triple of P, L and U tensors
      */
-    public fun StructureND<T>.lu(): Triple<StructureND<T>, StructureND<T>, StructureND<T>>
+    public fun lu(structureND: StructureND<T>): Triple<StructureND<T>, StructureND<T>, StructureND<T>>
 
     /**
      * Singular Value Decomposition.
@@ -91,7 +91,7 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return triple `Triple(U, S, V)`.
      */
-    public fun StructureND<T>.svd(): Triple<StructureND<T>, StructureND<T>, StructureND<T>>
+    public fun svd(structureND: StructureND<T>): Triple<StructureND<T>, StructureND<T>, StructureND<T>>
 
     /**
      * Returns eigenvalues and eigenvectors of a real symmetric matrix `input` or a batch of real symmetric matrices,
@@ -101,6 +101,6 @@ public interface LinearOpsTensorAlgebra<T, A : Field<T>> : TensorPartialDivision
      * @receiver the `input`.
      * @return a pair `eigenvalues to eigenvectors`
      */
-    public fun StructureND<T>.symEig(): Pair<StructureND<T>, StructureND<T>>
+    public fun symEig(structureND: StructureND<T>): Pair<StructureND<T>, StructureND<T>>
 
 }
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
index 12e9549da..4eed7a2a8 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -10,7 +10,6 @@ import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.core.internal.toPrettyString
-import kotlin.jvm.JvmInline
 
 public class OffsetDoubleBuffer(
     override val origin: DoubleBuffer,
@@ -83,9 +82,9 @@ public inline fun OffsetDoubleBuffer.mapInPlace(operation: (Double) -> Double) {
  *
  * [DoubleTensor] always uses row-based strides
  */
-public class DoubleTensor(
+public open class DoubleTensor(
     shape: ShapeND,
-    override val source: OffsetDoubleBuffer,
+    final override val source: OffsetDoubleBuffer,
 ) : BufferedTensor<Double>(shape), MutableStructureNDOfDouble {
 
     init {
@@ -103,7 +102,7 @@ public class DoubleTensor(
         source[indices.offset(index)] = value
     }
 
-    override fun getDouble(index: IntArray): Double = get(index)
+    override fun getDouble(index: IntArray): Double = source[indices.offset(index)]
 
     override fun setDouble(index: IntArray, value: Double) {
         set(index, value)
@@ -112,62 +111,8 @@ public class DoubleTensor(
     override fun toString(): String = toPrettyString()
 }
 
-@JvmInline
-public value class DoubleTensor2D(public val tensor: DoubleTensor) : MutableStructureND<Double> by tensor,
-    MutableStructure2D<Double> {
-
-    init {
-        require(tensor.shape.size == 2) { "Only 2D tensors could be cast to 2D" }
-    }
-
-    override val rowNum: Int get() = shape[0]
-    override val colNum: Int get() = shape[1]
-
-    override fun get(i: Int, j: Int): Double = tensor.source[i * colNum + j]
-
-    override fun set(i: Int, j: Int, value: Double) {
-        tensor.source[i * colNum + j] = value
-    }
-
-    @OptIn(PerformancePitfall::class)
-    override val rows: List<OffsetDoubleBuffer>
-        get() = List(rowNum) { i ->
-            tensor.source.view(i * colNum, colNum)
-        }
-
-
-    @OptIn(PerformancePitfall::class)
-    override val columns: List<PermutedMutableBuffer<Double>>
-        get() = List(colNum) { j ->
-            val indices = IntArray(rowNum) { i -> j + i * colNum }
-            tensor.source.permute(indices)
-        }
-
-    @PerformancePitfall
-    override fun elements(): Sequence<Pair<IntArray, Double>> = tensor.elements()
-    @OptIn(PerformancePitfall::class)
-    override fun get(index: IntArray): Double = tensor[index]
-    override val shape: ShapeND get() = tensor.shape
-}
-
-public fun DoubleTensor.asDoubleTensor2D(): DoubleTensor2D = DoubleTensor2D(this)
-
 public fun DoubleTensor.asDoubleBuffer(): OffsetDoubleBuffer = if (shape.size == 1) {
     source
 } else {
     error("Only 1D tensors could be cast to 1D")
 }
-
-public inline fun DoubleTensor.forEachMatrix(block: (index: IntArray, matrix: DoubleTensor2D) -> Unit) {
-    val n = shape.size
-    check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
-    val matrixOffset = shape[n - 1] * shape[n - 2]
-    val matrixShape = ShapeND(shape[n - 2], shape[n - 1])
-
-    val size = matrixShape.linearSize
-    for (i in 0 until linearSize / matrixOffset) {
-        val offset = i * matrixOffset
-        val index = indices.index(offset).sliceArray(0 until (shape.size - 2))
-        block(index, DoubleTensor(matrixShape, source.view(offset, size)).asDoubleTensor2D())
-    }
-}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor1D.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor1D.kt
new file mode 100644
index 000000000..e74f73800
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor1D.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.MutableStructure1D
+import space.kscience.kmath.nd.ShapeND
+import space.kscience.kmath.structures.MutableBuffer
+
+public class DoubleTensor1D(
+    source: OffsetDoubleBuffer,
+) : DoubleTensor(ShapeND(source.size), source), MutableStructure1D<Double> {
+
+    @PerformancePitfall
+    override fun get(index: IntArray): Double = super<MutableStructure1D>.get(index)
+
+    @PerformancePitfall
+    override fun set(index: IntArray, value: Double) {
+        super<MutableStructure1D>.set(index, value)
+    }
+
+    override val size: Int get() = source.size
+
+    override fun get(index: Int): Double = source[index]
+
+    override fun set(index: Int, value: Double) {
+        source[index] = value
+    }
+
+    override fun copy(): MutableBuffer<Double> = source.copy()
+
+    @PerformancePitfall
+    override fun elements(): Sequence<Pair<IntArray, Double>> = super<MutableStructure1D>.elements()
+}
+
+/**
+ * A zero-copy cast to 1D structure. Changes in resulting structure are reflected on original tensor.
+ */
+public fun DoubleTensor.asDoubleTensor1D(): DoubleTensor1D {
+    require(shape.size == 1) { "Only 1D tensors could be cast to 1D" }
+    return DoubleTensor1D(source)
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor2D.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor2D.kt
new file mode 100644
index 000000000..7c84b91e1
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor2D.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.nd.MutableStructure2D
+import space.kscience.kmath.nd.ShapeND
+import space.kscience.kmath.nd.linearSize
+import space.kscience.kmath.structures.PermutedMutableBuffer
+import space.kscience.kmath.structures.permute
+
+public class DoubleTensor2D(
+    override val rowNum: Int,
+    override val colNum: Int,
+    source: OffsetDoubleBuffer,
+) : DoubleTensor(ShapeND(rowNum, colNum), source), MutableStructure2D<Double> {
+
+    override fun get(i: Int, j: Int): Double = source[i * colNum + j]
+
+    @OptIn(PerformancePitfall::class)
+    override fun get(index: IntArray): Double = getDouble(index)
+
+    override fun set(i: Int, j: Int, value: Double) {
+        source[i * colNum + j] = value
+    }
+
+    @OptIn(PerformancePitfall::class)
+    override val rows: List<OffsetDoubleBuffer>
+        get() = List(rowNum) { i ->
+            source.view(i * colNum, colNum)
+        }
+
+
+    @OptIn(PerformancePitfall::class)
+    override val columns: List<PermutedMutableBuffer<Double>>
+        get() = List(colNum) { j ->
+            val indices = IntArray(rowNum) { i -> j + i * colNum }
+            source.permute(indices)
+        }
+
+    override val shape: ShapeND get() = super<DoubleTensor>.shape
+
+    @PerformancePitfall
+    override fun elements(): Sequence<Pair<IntArray, Double>> = super<MutableStructure2D>.elements()
+}
+
+/**
+ * A zero-copy cast to 2D structure. Changes in resulting structure are reflected on original tensor.
+ */
+public fun DoubleTensor.asDoubleTensor2D(): DoubleTensor2D {
+    require(shape.size == 2) { "Only 2D tensors could be cast to 2D" }
+    return DoubleTensor2D(shape[0], shape[1], source)
+}
+
+
+public inline fun DoubleTensor.forEachMatrix(block: (index: IntArray, matrix: DoubleTensor2D) -> Unit) {
+    val n = shape.size
+    check(n >= 2) { "Expected tensor with 2 or more dimensions, got size $n" }
+    val matrixOffset = shape[n - 1] * shape[n - 2]
+    val matrixShape = ShapeND(shape[n - 2], shape[n - 1])
+
+    val size = matrixShape.linearSize
+    for (i in 0 until linearSize / matrixOffset) {
+        val offset = i * matrixOffset
+        val index = indices.index(offset).sliceArray(0 until (shape.size - 2))
+        block(index, DoubleTensor(matrixShape, source.view(offset, size)).asDoubleTensor2D())
+    }
+}
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index ce1778013..997c0a316 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -11,12 +11,12 @@ package space.kscience.kmath.tensors.core
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
+import space.kscience.kmath.operations.DoubleBufferOps
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
 import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
 import space.kscience.kmath.tensors.api.Tensor
-import space.kscience.kmath.tensors.api.TensorPartialDivisionAlgebra
 import space.kscience.kmath.tensors.core.internal.*
 import kotlin.math.*
 
@@ -25,7 +25,6 @@ import kotlin.math.*
  */
 @OptIn(PerformancePitfall::class)
 public open class DoubleTensorAlgebra :
-    TensorPartialDivisionAlgebra<Double, DoubleField>,
     AnalyticTensorAlgebra<Double, DoubleField>,
     LinearOpsTensorAlgebra<Double, DoubleField> {
 
@@ -33,6 +32,8 @@ public open class DoubleTensorAlgebra :
 
     override val elementAlgebra: DoubleField get() = DoubleField
 
+    public val bufferAlgebra: DoubleBufferOps get() = DoubleBufferOps
+
 
     /**
      * Applies the [transform] function to each element of the tensor and returns the resulting modified tensor.
@@ -98,6 +99,16 @@ public open class DoubleTensorAlgebra :
     override fun StructureND<Double>.value(): Double = valueOrNull()
         ?: throw IllegalArgumentException("The tensor shape is $shape, but value method is allowed only for shape [1]")
 
+    public fun fromBuffer(shape: ShapeND, buffer: Buffer<Double>): DoubleTensor {
+        checkNotEmptyShape(shape)
+        check(buffer.size > 0) { "Illegal empty buffer provided" }
+        check(buffer.size == shape.linearSize) {
+            "Inconsistent shape $shape for buffer of size ${buffer.size} provided"
+        }
+        return DoubleTensor(shape, buffer.toDoubleBuffer())
+    }
+
+
     /**
      * Constructs a tensor with the specified shape and data.
      *
@@ -105,12 +116,7 @@ public open class DoubleTensorAlgebra :
      * @param array one-dimensional data array.
      * @return tensor with the [shape] shape and [array] data.
      */
-    public fun fromArray(shape: ShapeND, array: DoubleArray): DoubleTensor {
-        checkNotEmptyShape(shape)
-        checkEmptyDoubleBuffer(array)
-        checkBufferShapeConsistency(shape, array)
-        return DoubleTensor(shape, array.asBuffer())
-    }
+    public fun fromArray(shape: ShapeND, array: DoubleArray): DoubleTensor = fromBuffer(shape, array.asBuffer())
 
     /**
      * Constructs a tensor with the specified shape and initializer.
@@ -271,7 +277,7 @@ public open class DoubleTensorAlgebra :
 
     override fun StructureND<Double>.transposed(i: Int, j: Int): Tensor<Double> {
         val actualI = if (i >= 0) i else shape.size + i
-        val actualJ = if(j>=0) j else shape.size + j
+        val actualJ = if (j >= 0) j else shape.size + j
         return asDoubleTensor().permute(
             shape.transposed(actualI, actualJ)
         ) { originIndex ->
@@ -498,48 +504,6 @@ public open class DoubleTensorAlgebra :
         return true
     }
 
-    /**
-     * Returns a tensor of random numbers drawn from normal distributions with `0.0` mean and `1.0` standard deviation.
-     *
-     * @param shape the desired shape for the output tensor.
-     * @param seed the random seed of the pseudo-random number generator.
-     * @return tensor of a given shape filled with numbers from the normal distribution
-     * with `0.0` mean and `1.0` standard deviation.
-     */
-    public fun randomNormal(shape: ShapeND, seed: Long = 0): DoubleTensor =
-        DoubleTensor(shape, DoubleBuffer.randomNormals(shape.linearSize, seed))
-
-    /**
-     * Returns a tensor with the same shape as `input` of random numbers drawn from normal distributions
-     * with `0.0` mean and `1.0` standard deviation.
-     *
-     * @receiver the `input`.
-     * @param seed the random seed of the pseudo-random number generator.
-     * @return a tensor with the same shape as `input` filled with numbers from the normal distribution
-     * with `0.0` mean and `1.0` standard deviation.
-     */
-    public fun Tensor<Double>.randomNormalLike(seed: Long = 0): DoubleTensor =
-        DoubleTensor(shape, DoubleBuffer.randomNormals(shape.linearSize, seed))
-
-    /**
-     * Concatenates a sequence of tensors with equal shapes along the first dimension.
-     *
-     * @param tensors the [List] of tensors with same shapes to concatenate
-     * @return tensor with concatenation result
-     */
-    public fun stack(tensors: List<Tensor<Double>>): DoubleTensor {
-        check(tensors.isNotEmpty()) { "List must have at least 1 element" }
-        val shape = tensors[0].shape
-        check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
-        val resShape = ShapeND(tensors.size) + shape
-//        val resBuffer: List<Double> = tensors.flatMap {
-//            it.asDoubleTensor().source.array.drop(it.asDoubleTensor().bufferStart)
-//                .take(it.asDoubleTensor().linearSize)
-//        }
-        val resBuffer = tensors.map { it.asDoubleTensor().source }.concat()
-        return DoubleTensor(resShape, resBuffer)
-    }
-
     /**
      * Builds tensor from rows of the input tensor.
      *
@@ -631,102 +595,75 @@ public open class DoubleTensorAlgebra :
         }
 
 
-    override fun StructureND<Double>.mean(): Double = sum() / indices.linearSize
+    override fun mean(structureND: StructureND<Double>): Double = structureND.sum() / structureND.indices.linearSize
 
-    override fun StructureND<Double>.mean(dim: Int, keepDim: Boolean): DoubleTensor =
-        foldDimToDouble(dim, keepDim) { arr ->
-            check(dim < dimension) { "Dimension $dim out of range $dimension" }
-            arr.sum() / shape[dim]
+    override fun mean(structureND: StructureND<Double>, dim: Int, keepDim: Boolean): Tensor<Double> =
+        structureND.foldDimToDouble(dim, keepDim) { arr ->
+            check(dim < structureND.dimension) { "Dimension $dim out of range ${structureND.dimension}" }
+            arr.sum() / structureND.shape[dim]
         }
 
-    override fun StructureND<Double>.std(): Double = reduceElements { arr ->
-        val mean = arr.array.sum() / indices.linearSize
-        sqrt(arr.array.sumOf { (it - mean) * (it - mean) } / (indices.linearSize - 1))
+    override fun std(structureND: StructureND<Double>): Double = structureND.reduceElements { arr ->
+        val mean = arr.array.sum() / structureND.indices.linearSize
+        sqrt(arr.array.sumOf { (it - mean) * (it - mean) } / (structureND.indices.linearSize - 1))
     }
 
-    override fun StructureND<Double>.std(dim: Int, keepDim: Boolean): DoubleTensor = foldDimToDouble(
-        dim,
-        keepDim
-    ) { arr ->
-        check(dim < dimension) { "Dimension $dim out of range $dimension" }
-        val mean = arr.sum() / shape[dim]
-        sqrt(arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1))
-    }
+    override fun std(structureND: StructureND<Double>, dim: Int, keepDim: Boolean): Tensor<Double> =
+        structureND.foldDimToDouble(
+            dim,
+            keepDim
+        ) { arr ->
+            check(dim < structureND.dimension) { "Dimension $dim out of range ${structureND.dimension}" }
+            val mean = arr.sum() / structureND.shape[dim]
+            sqrt(arr.sumOf { (it - mean) * (it - mean) } / (structureND.shape[dim] - 1))
+        }
 
-    override fun StructureND<Double>.variance(): Double = reduceElements { arr ->
-        val linearSize = indices.linearSize
+    override fun variance(structureND: StructureND<Double>): Double = structureND.reduceElements { arr ->
+        val linearSize = structureND.indices.linearSize
         val mean = arr.array.sum() / linearSize
         arr.array.sumOf { (it - mean) * (it - mean) } / (linearSize - 1)
     }
 
-    override fun StructureND<Double>.variance(dim: Int, keepDim: Boolean): DoubleTensor = foldDimToDouble(
-        dim,
-        keepDim
-    ) { arr ->
-        check(dim < dimension) { "Dimension $dim out of range $dimension" }
-        val mean = arr.sum() / shape[dim]
-        arr.sumOf { (it - mean) * (it - mean) } / (shape[dim] - 1)
-    }
-
-    private fun cov(x: StructureND<Double>, y: StructureND<Double>): Double {
-        val n = x.shape[0]
-        return ((x - x.mean()) * (y - y.mean())).mean() * n / (n - 1)
-    }
-
-    /**
-     * Returns the covariance matrix `M` of given vectors.
-     *
-     * `M[i, j]` contains covariance of `i`-th and `j`-th given vectors
-     *
-     * @param tensors the [List] of 1-dimensional tensors with same shape
-     * @return `M`.
-     */
-    public fun cov(tensors: List<StructureND<Double>>): DoubleTensor {
-        check(tensors.isNotEmpty()) { "List must have at least 1 element" }
-        val n = tensors.size
-        val m = tensors[0].shape[0]
-        check(tensors.all { it.shape contentEquals ShapeND(m) }) { "Tensors must have same shapes" }
-        val resTensor = DoubleTensor(
-            ShapeND(n, n),
-            DoubleBuffer(n * n) { 0.0 }
-        )
-        for (i in 0 until n) {
-            for (j in 0 until n) {
-                resTensor[intArrayOf(i, j)] = cov(tensors[i], tensors[j])
-            }
+    override fun variance(structureND: StructureND<Double>, dim: Int, keepDim: Boolean): Tensor<Double> =
+        structureND.foldDimToDouble(
+            dim,
+            keepDim
+        ) { arr ->
+            check(dim < structureND.dimension) { "Dimension $dim out of range ${structureND.dimension}" }
+            val mean = arr.sum() / structureND.shape[dim]
+            arr.sumOf { (it - mean) * (it - mean) } / (structureND.shape[dim] - 1)
         }
-        return resTensor
-    }
 
-    override fun StructureND<Double>.exp(): DoubleTensor = map { exp(it) }
 
-    override fun StructureND<Double>.ln(): DoubleTensor = map { ln(it) }
+    override fun exp(arg: StructureND<Double>): DoubleTensor = arg.map { this.exp(it) }
 
-    override fun StructureND<Double>.sqrt(): DoubleTensor = map { sqrt(it) }
+    override fun ln(arg: StructureND<Double>): DoubleTensor = arg.map { this.ln(it) }
 
-    override fun StructureND<Double>.cos(): DoubleTensor = map { cos(it) }
+    override fun sqrt(arg: StructureND<Double>): DoubleTensor = arg.map { this.sqrt(it) }
 
-    override fun StructureND<Double>.acos(): DoubleTensor = map { acos(it) }
+    override fun cos(arg: StructureND<Double>): DoubleTensor = arg.map { this.cos(it) }
 
-    override fun StructureND<Double>.cosh(): DoubleTensor = map { cosh(it) }
+    override fun acos(arg: StructureND<Double>): DoubleTensor = arg.map { this.acos(it) }
 
-    override fun StructureND<Double>.acosh(): DoubleTensor = map { acosh(it) }
+    override fun cosh(arg: StructureND<Double>): DoubleTensor = arg.map { this.cosh(it) }
 
-    override fun StructureND<Double>.sin(): DoubleTensor = map { sin(it) }
+    override fun acosh(arg: StructureND<Double>): DoubleTensor = arg.map { this.acosh(it) }
 
-    override fun StructureND<Double>.asin(): DoubleTensor = map { asin(it) }
+    override fun sin(arg: StructureND<Double>): DoubleTensor = arg.map { this.sin(it) }
 
-    override fun StructureND<Double>.sinh(): DoubleTensor = map { sinh(it) }
+    override fun asin(arg: StructureND<Double>): DoubleTensor = arg.map { this.asin(it) }
 
-    override fun StructureND<Double>.asinh(): DoubleTensor = map { asinh(it) }
+    override fun sinh(arg: StructureND<Double>): DoubleTensor = arg.map { this.sinh(it) }
 
-    override fun StructureND<Double>.tan(): DoubleTensor = map { tan(it) }
+    override fun asinh(arg: StructureND<Double>): DoubleTensor = arg.map { this.asinh(it) }
 
-    override fun StructureND<Double>.atan(): DoubleTensor = map { atan(it) }
+    override fun tan(arg: StructureND<Double>): DoubleTensor = arg.map { this.tan(it) }
 
-    override fun StructureND<Double>.tanh(): DoubleTensor = map { tanh(it) }
+    override fun atan(arg: StructureND<Double>): DoubleTensor = arg.map { this.atan(it) }
 
-    override fun StructureND<Double>.atanh(): DoubleTensor = map { atanh(it) }
+    override fun tanh(arg: StructureND<Double>): DoubleTensor = arg.map { this.tanh(it) }
+
+    override fun atanh(arg: StructureND<Double>): DoubleTensor = arg.map { this.atanh(it) }
 
     override fun power(arg: StructureND<Double>, pow: Number): StructureND<Double> = if (pow is Int) {
         arg.map { it.pow(pow) }
@@ -734,115 +671,26 @@ public open class DoubleTensorAlgebra :
         arg.map { it.pow(pow.toDouble()) }
     }
 
-    override fun StructureND<Double>.ceil(): DoubleTensor = map { ceil(it) }
+    override fun ceil(arg: StructureND<Double>): DoubleTensor = arg.map { ceil(it) }
 
-    override fun StructureND<Double>.floor(): DoubleTensor = map { floor(it) }
+    override fun floor(structureND: StructureND<Double>): DoubleTensor = structureND.map { floor(it) }
 
-    override fun StructureND<Double>.inv(): DoubleTensor = invLU(1e-9)
+    override fun StructureND<Double>.inv(): DoubleTensor = invLU(this, 1e-9)
 
-    override fun StructureND<Double>.det(): DoubleTensor = detLU(1e-9)
+    override fun StructureND<Double>.det(): DoubleTensor = detLU(this, 1e-9)
 
-    /**
-     * Computes the LU factorization of a matrix or batches of matrices `input`.
-     * Returns a tuple containing the LU factorization and pivots of `input`.
-     *
-     * @param epsilon permissible error when comparing the determinant of a matrix with zero
-     * @return pair of `factorization` and `pivots`.
-     * The `factorization` has the shape ``(*, m, n)``, where``(*, m, n)`` is the shape of the `input` tensor.
-     * The `pivots`  has the shape ``(∗, min(m, n))``. `pivots` stores all the intermediate transpositions of rows.
-     */
-    public fun StructureND<Double>.luFactor(epsilon: Double): Pair<DoubleTensor, IntTensor> =
-        computeLU(this, epsilon)
-            ?: throw IllegalArgumentException("Tensor contains matrices which are singular at precision $epsilon")
+    override fun lu(structureND: StructureND<Double>): Triple<DoubleTensor, DoubleTensor, DoubleTensor> =
+        lu(structureND, 1e-9)
 
-    /**
-     * Computes the LU factorization of a matrix or batches of matrices `input`.
-     * Returns a tuple containing the LU factorization and pivots of `input`.
-     * Uses an error of ``1e-9`` when calculating whether a matrix is degenerate.
-     *
-     * @return pair of `factorization` and `pivots`.
-     * The `factorization` has the shape ``(*, m, n)``, where``(*, m, n)`` is the shape of the `input` tensor.
-     * The `pivots`  has the shape ``(∗, min(m, n))``. `pivots` stores all the intermediate transpositions of rows.
-     */
-    public fun StructureND<Double>.luFactor(): Pair<DoubleTensor, IntTensor> = luFactor(1e-9)
+    override fun cholesky(structureND: StructureND<Double>): DoubleTensor = cholesky(structureND, 1e-6)
 
-    /**
-     * Unpacks the data and pivots from a LU factorization of a tensor.
-     * Given a tensor [luTensor], return tensors `Triple(P, L, U)` satisfying `P dot luTensor = L dot U`,
-     * with `P` being a permutation matrix or batch of matrices,
-     * `L` being a lower triangular matrix or batch of matrices,
-     * `U` being an upper triangular matrix or batch of matrices.
-     *
-     * @param luTensor the packed LU factorization data
-     * @param pivotsTensor the packed LU factorization pivots
-     * @return triple of `P`, `L` and `U` tensors
-     */
-    public fun luPivot(
-        luTensor: StructureND<Double>,
-        pivotsTensor: Tensor<Int>,
-    ): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        checkSquareMatrix(luTensor.shape)
-        check(
-            luTensor.shape.first(luTensor.shape.size - 2) contentEquals pivotsTensor.shape.first(pivotsTensor.shape.size - 1) ||
-                    luTensor.shape.last() == pivotsTensor.shape.last() - 1
-        ) { "Inappropriate shapes of input tensors" }
-
-        val n = luTensor.shape.last()
-        val pTensor = zeroesLike(luTensor)
-        pTensor
-            .matrixSequence()
-            .zip(pivotsTensor.asIntTensor().vectorSequence())
-            .forEach { (p, pivot) -> pivInit(p.asDoubleTensor2D(), pivot.as1D(), n) }
-
-        val lTensor = zeroesLike(luTensor)
-        val uTensor = zeroesLike(luTensor)
-
-        lTensor.matrixSequence()
-            .zip(uTensor.matrixSequence())
-            .zip(luTensor.asDoubleTensor().matrixSequence())
-            .forEach { (pairLU, lu) ->
-                val (l, u) = pairLU
-                luPivotHelper(l.asDoubleTensor2D(), u.asDoubleTensor2D(), lu.asDoubleTensor2D(), n)
-            }
-
-        return Triple(pTensor, lTensor, uTensor)
-    }
-
-    /**
-     * QR decomposition.
-     *
-     * Computes the QR decomposition of a matrix or a batch of matrices, and returns a pair `Q to R` of tensors.
-     * Given a tensor `input`, return tensors `Q to R` satisfying `input == Q dot R`,
-     * with `Q` being an orthogonal matrix or batch of orthogonal matrices
-     * and `R` being an upper triangular matrix or batch of upper triangular matrices.
-     *
-     * @receiver the `input`.
-     * @param epsilon the permissible error when comparing tensors for equality.
-     * Used when checking the positive definiteness of the input matrix or matrices.
-     * @return a pair of `Q` and `R` tensors.
-     */
-    public fun StructureND<Double>.cholesky(epsilon: Double): DoubleTensor {
-        checkSquareMatrix(shape)
-        checkPositiveDefinite(asDoubleTensor(), epsilon)
-
-        val n = shape.last()
-        val lTensor = zeroesLike(this)
-
-        for ((a, l) in asDoubleTensor().matrixSequence().zip(lTensor.matrixSequence()))
-            for (i in 0 until n) choleskyHelper(a.asDoubleTensor2D(), l.asDoubleTensor2D(), n)
-
-        return lTensor
-    }
-
-    override fun StructureND<Double>.cholesky(): DoubleTensor = cholesky(1e-6)
-
-    override fun StructureND<Double>.qr(): Pair<DoubleTensor, DoubleTensor> {
-        checkSquareMatrix(shape)
-        val qTensor = zeroesLike(this)
-        val rTensor = zeroesLike(this)
+    override fun qr(structureND: StructureND<Double>): Pair<DoubleTensor, DoubleTensor> {
+        checkSquareMatrix(structureND.shape)
+        val qTensor = zeroesLike(structureND)
+        val rTensor = zeroesLike(structureND)
 
         //TODO replace with cycle
-        asDoubleTensor().matrixSequence()
+        structureND.asDoubleTensor().matrixSequence()
             .zip(
                 (qTensor.matrixSequence()
                     .zip(rTensor.matrixSequence()))
@@ -854,200 +702,14 @@ public open class DoubleTensorAlgebra :
         return qTensor to rTensor
     }
 
-    override fun StructureND<Double>.svd(): Triple<StructureND<Double>, StructureND<Double>, StructureND<Double>> =
-        svd(epsilon = 1e-10)
+    override fun svd(
+        structureND: StructureND<Double>,
+    ): Triple<StructureND<Double>, StructureND<Double>, StructureND<Double>> =
+        svd(structureND = structureND, epsilon = 1e-10)
 
+    override fun symEig(structureND: StructureND<Double>): Pair<DoubleTensor, DoubleTensor> =
+        symEigJacobi(structureND = structureND, maxIteration = 50, epsilon = 1e-15)
 
-    /**
-     * Singular Value Decomposition.
-     *
-     * Computes the singular value decomposition of either a matrix or batch of matrices `input`.
-     * The singular value decomposition is represented as a triple `Triple(U, S, V)`,
-     * such that `input == U dot diagonalEmbedding(S) dot V.transpose()`.
-     * If `input` is a batch of tensors, then U, S, and Vh are also batched with the same batch dimensions as `input.
-     *
-     * @receiver the `input`.
-     * @param epsilon permissible error when calculating the dot product of vectors
-     * i.e., the precision with which the cosine approaches 1 in an iterative algorithm.
-     * @return a triple `Triple(U, S, V)`.
-     */
-    public fun StructureND<Double>.svd(epsilon: Double): Triple<StructureND<Double>, StructureND<Double>, StructureND<Double>> {
-        val size = dimension
-        val commonShape = shape.slice(0 until size - 2)
-        val (n, m) = shape.slice(size - 2 until size)
-        val uTensor = zeros(commonShape + ShapeND(min(n, m), n))
-        val sTensor = zeros(commonShape + ShapeND(min(n, m)))
-        val vTensor = zeros(commonShape + ShapeND(min(n, m), m))
-
-        val matrices = asDoubleTensor().matrices
-        val uTensors = uTensor.matrices
-        val sTensorVectors = sTensor.vectors
-        val vTensors = vTensor.matrices
-
-        for (index in matrices.indices) {
-            val matrix = matrices[index]
-            val usv = Triple(
-                uTensors[index],
-                sTensorVectors[index],
-                vTensors[index]
-            )
-            val matrixSize = matrix.shape.linearSize
-            val curMatrix = DoubleTensor(
-                matrix.shape,
-                matrix.source.view(0, matrixSize)
-            )
-            svdHelper(curMatrix, usv, m, n, epsilon)
-        }
-
-        return Triple(uTensor.transposed(), sTensor, vTensor.transposed())
-    }
-
-    override fun StructureND<Double>.symEig(): Pair<DoubleTensor, DoubleTensor> =
-        symEigJacobi(maxIteration = 50, epsilon = 1e-15)
-
-    /**
-     * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
-     * represented by a pair `eigenvalues to eigenvectors`.
-     *
-     * @param epsilon the permissible error when comparing tensors for equality
-     * and when the cosine approaches 1 in the SVD algorithm.
-     * @return a pair `eigenvalues to eigenvectors`.
-     */
-    public fun StructureND<Double>.symEigSvd(epsilon: Double): Pair<DoubleTensor, StructureND<Double>> {
-        //TODO optimize conversion
-        checkSymmetric(asDoubleTensor(), epsilon)
-
-        fun MutableStructure2D<Double>.cleanSym(n: Int) {
-            for (i in 0 until n) {
-                for (j in 0 until n) {
-                    if (i == j) {
-                        this[i, j] = sign(this[i, j])
-                    } else {
-                        this[i, j] = 0.0
-                    }
-                }
-            }
-        }
-
-        val (u, s, v) = svd(epsilon)
-        val shp = s.shape + intArrayOf(1)
-        val utv = u.transposed() matmul v
-        val n = s.shape.last()
-        for (matrix in utv.matrixSequence()) {
-            matrix.asDoubleTensor2D().cleanSym(n)
-        }
-
-        val eig = (utv dot s.asDoubleTensor().view(shp)).view(s.shape)
-        return eig to v
-    }
-
-    public fun StructureND<Double>.symEigJacobi(maxIteration: Int, epsilon: Double): Pair<DoubleTensor, DoubleTensor> {
-        //TODO optimize conversion
-        checkSymmetric(asDoubleTensor(), epsilon)
-
-        val size = this.dimension
-        val eigenvectors = zeros(shape)
-        val eigenvalues = zeros(shape.slice(0 until size - 1))
-
-        var eigenvalueStart = 0
-        var eigenvectorStart = 0
-        for (matrix in asDoubleTensor().matrixSequence()) {
-            val matrix2D = matrix.asDoubleTensor2D()
-            val (d, v) = matrix2D.jacobiHelper(maxIteration, epsilon)
-
-            for (i in 0 until matrix2D.rowNum) {
-                for (j in 0 until matrix2D.colNum) {
-                    eigenvectors.source[eigenvectorStart + i * matrix2D.rowNum + j] = v[i, j]
-                }
-            }
-
-            for (i in 0 until matrix2D.rowNum) {
-                eigenvalues.source[eigenvalueStart + i] = d[i]
-            }
-
-            eigenvalueStart += this.shape.last()
-            eigenvectorStart += this.shape.last() * this.shape.last()
-        }
-
-        return eigenvalues to eigenvectors
-    }
-
-    /**
-     * Computes the determinant of a square matrix input, or of each square matrix in a batched input
-     * using LU factorization algorithm.
-     *
-     * @param epsilon the error in the LU algorithm&mdash;permissible error when comparing the determinant of a matrix
-     * with zero.
-     * @return the determinant.
-     */
-    public fun StructureND<Double>.detLU(epsilon: Double = 1e-9): DoubleTensor {
-        checkSquareMatrix(shape)
-        //TODO check for unnecessary copies
-        val luTensor = copyToTensor()
-        val pivotsTensor = setUpPivots()
-
-        val n = shape.size
-
-        val detTensorShape = ShapeND(IntArray(n - 1) { i -> shape[i] }.apply {
-            set(n - 2, 1)
-        })
-
-        val resBuffer = DoubleBuffer(detTensorShape.linearSize) { 0.0 }
-
-        val detTensor = DoubleTensor(
-            detTensorShape,
-            resBuffer
-        )
-
-        luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).forEachIndexed { index, (lu, pivots) ->
-            resBuffer[index] = if (luHelper(lu.asDoubleTensor2D(), pivots.as1D(), epsilon))
-                0.0 else luMatrixDet(lu.asDoubleTensor2D(), pivots.as1D())
-        }
-
-        return detTensor
-    }
-
-    /**
-     * Computes the multiplicative inverse matrix of a square matrix input, or of each square matrix in a batched input
-     * using LU factorization algorithm.
-     * Given a square matrix `a`, return the matrix `aInv` satisfying
-     * `a dot aInv == aInv dot a == eye(a.shape[0])`.
-     *
-     * @param epsilon error in the LU algorithm&mdash;permissible error when comparing the determinant of a matrix with zero
-     * @return the multiplicative inverse of a matrix.
-     */
-    public fun StructureND<Double>.invLU(epsilon: Double = 1e-9): DoubleTensor {
-        val (luTensor, pivotsTensor) = luFactor(epsilon)
-        val invTensor = zeroesLike(luTensor)
-
-        //TODO replace sequence with a cycle
-        val seq = luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).zip(invTensor.matrixSequence())
-        for ((luP, invMatrix) in seq) {
-            val (lu, pivots) = luP
-            luMatrixInv(lu.asDoubleTensor2D(), pivots.as1D(), invMatrix.asDoubleTensor2D())
-        }
-
-        return invTensor
-    }
-
-    /**
-     * LUP decomposition.
-     *
-     * Computes the LUP decomposition of a matrix or a batch of matrices.
-     * Given a tensor `input`, return tensors `Triple(P, L, U)` satisfying `P dot input == L dot U`,
-     * with `P` being a permutation matrix or batch of matrices,
-     * `L` being a lower triangular matrix or batch of matrices,
-     * `U` being an upper triangular matrix or batch of matrices.
-     *
-     * @param epsilon permissible error when comparing the determinant of a matrix with zero.
-     * @return triple of `P`, `L` and `U` tensors.
-     */
-    public fun StructureND<Double>.lu(epsilon: Double = 1e-9): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
-        val (lu, pivots) = luFactor(epsilon)
-        return luPivot(lu, pivots)
-    }
-
-    override fun StructureND<Double>.lu(): Triple<DoubleTensor, DoubleTensor, DoubleTensor> = lu(1e-9)
 }
 
 public val Double.Companion.tensorAlgebra: DoubleTensorAlgebra get() = DoubleTensorAlgebra
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
index dcdf49e1e..f384ed462 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/checks.kt
@@ -13,6 +13,7 @@ import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.DoubleTensor
 import space.kscience.kmath.tensors.core.DoubleTensorAlgebra
 import space.kscience.kmath.tensors.core.asDoubleTensor
+import space.kscience.kmath.tensors.core.detLU
 
 
 internal fun checkNotEmptyShape(shape: ShapeND) =
@@ -26,7 +27,7 @@ internal fun checkEmptyDoubleBuffer(buffer: DoubleArray) = check(buffer.isNotEmp
 
 internal fun checkBufferShapeConsistency(shape: ShapeND, buffer: DoubleArray) =
     check(buffer.size == shape.linearSize) {
-        "Inconsistent shape ${shape} for buffer of size ${buffer.size} provided"
+        "Inconsistent shape $shape for buffer of size ${buffer.size} provided"
     }
 
 @PublishedApi
@@ -62,7 +63,7 @@ internal fun DoubleTensorAlgebra.checkSymmetric(
 internal fun DoubleTensorAlgebra.checkPositiveDefinite(tensor: DoubleTensor, epsilon: Double = 1e-6) {
     checkSymmetric(tensor, epsilon)
     for (mat in tensor.matrixSequence())
-        check(mat.asDoubleTensor().detLU().value() > 0.0) {
-            "Tensor contains matrices which are not positive definite ${mat.asDoubleTensor().detLU().value()}"
+        check(detLU(mat.asDoubleTensor()).value() > 0.0) {
+            "Tensor contains matrices which are not positive definite ${detLU(mat.asDoubleTensor()).value()}"
         }
 }
\ No newline at end of file
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
index 44459ad14..cf3697e76 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/linUtils.kt
@@ -227,7 +227,7 @@ internal fun DoubleTensorAlgebra.qrHelper(
                 }
             }
         }
-        r[j, j] = DoubleTensorAlgebra { (v dot v).sqrt().value() }
+        r[j, j] = DoubleTensorAlgebra { sqrt((v dot v)).value() }
         for (i in 0 until n) {
             qM[i, j] = vv[i] / r[j, j]
         }
@@ -250,7 +250,7 @@ internal fun DoubleTensorAlgebra.svd1d(a: DoubleTensor, epsilon: Double = 1e-10)
     while (true) {
         lastV = v
         v = b.dot(lastV)
-        val norm = DoubleTensorAlgebra { (v dot v).sqrt().value() }
+        val norm = DoubleTensorAlgebra { sqrt((v dot v)).value() }
         v = v.times(1.0 / norm)
         if (abs(v.dot(lastV).value()) > 1 - epsilon) {
             return v
@@ -283,12 +283,12 @@ internal fun DoubleTensorAlgebra.svdHelper(
         if (n > m) {
             v = svd1d(a, epsilon)
             u = matrix.dot(v)
-            norm = DoubleTensorAlgebra { (u dot u).sqrt().value() }
+            norm = DoubleTensorAlgebra { sqrt((u dot u)).value() }
             u = u.times(1.0 / norm)
         } else {
             u = svd1d(a, epsilon)
             v = matrix.transposed(0, 1).dot(u)
-            norm = DoubleTensorAlgebra { (v dot v).sqrt().value() }
+            norm = DoubleTensorAlgebra { sqrt((v dot v)).value() }
             v = v.times(1.0 / norm)
         }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorOps.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorOps.kt
new file mode 100644
index 000000000..e5dc55f68
--- /dev/null
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorOps.kt
@@ -0,0 +1,370 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.tensors.core
+
+import space.kscience.kmath.nd.*
+import space.kscience.kmath.operations.covariance
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.DoubleBuffer
+import space.kscience.kmath.tensors.api.Tensor
+import space.kscience.kmath.tensors.core.internal.*
+import kotlin.math.min
+import kotlin.math.sign
+
+
+/**
+ * Returns a tensor of random numbers drawn from normal distributions with `0.0` mean and `1.0` standard deviation.
+ *
+ * @param shape the desired shape for the output tensor.
+ * @param seed the random seed of the pseudo-random number generator.
+ * @return tensor of a given shape filled with numbers from the normal distribution
+ * with `0.0` mean and `1.0` standard deviation.
+ */
+public fun DoubleTensorAlgebra.randomNormal(shape: ShapeND, seed: Long = 0): DoubleTensor =
+    fromBuffer(shape, DoubleBuffer.randomNormals(shape.linearSize, seed))
+
+/**
+ * Returns a tensor with the same shape as `input` of random numbers drawn from normal distributions
+ * with `0.0` mean and `1.0` standard deviation.
+ *
+ * @receiver the `input`.
+ * @param seed the random seed of the pseudo-random number generator.
+ * @return a tensor with the same shape as `input` filled with numbers from the normal distribution
+ * with `0.0` mean and `1.0` standard deviation.
+ */
+public fun DoubleTensorAlgebra.randomNormalLike(structure: WithShape, seed: Long = 0): DoubleTensor =
+    DoubleTensor(structure.shape, DoubleBuffer.randomNormals(structure.shape.linearSize, seed))
+
+/**
+ * Concatenates a sequence of tensors with equal shapes along the first dimension.
+ *
+ * @param tensors the [List] of tensors with same shapes to concatenate
+ * @return tensor with concatenation result
+ */
+public fun stack(tensors: List<Tensor<Double>>): DoubleTensor {
+    check(tensors.isNotEmpty()) { "List must have at least 1 element" }
+    val shape = tensors[0].shape
+    check(tensors.all { it.shape contentEquals shape }) { "Tensors must have same shapes" }
+    val resShape = ShapeND(tensors.size) + shape
+//        val resBuffer: List<Double> = tensors.flatMap {
+//            it.asDoubleTensor().source.array.drop(it.asDoubleTensor().bufferStart)
+//                .take(it.asDoubleTensor().linearSize)
+//        }
+    val resBuffer = tensors.map { it.asDoubleTensor().source }.concat()
+    return DoubleTensor(resShape, resBuffer)
+}
+
+/**
+ * Computes the LU factorization of a matrix or batches of matrices `input`.
+ * Returns a tuple containing the LU factorization and pivots of `input`.
+ *
+ * @param epsilon permissible error when comparing the determinant of a matrix with zero default is 1e-9
+ * @return pair of `factorization` and `pivots`.
+ * The `factorization` has the shape ``(*, m, n)``, where``(*, m, n)`` is the shape of the `input` tensor.
+ * The `pivots`  has the shape ``(∗, min(m, n))``. `pivots` stores all the intermediate transpositions of rows.
+ */
+public fun DoubleTensorAlgebra.luFactor(
+    structureND: StructureND<Double>,
+    epsilon: Double = 1e-9,
+): Pair<DoubleTensor, IntTensor> =
+    computeLU(structureND, epsilon)
+        ?: throw IllegalArgumentException("Tensor contains matrices which are singular at precision $epsilon")
+
+
+/**
+ * Unpacks the data and pivots from a LU factorization of a tensor.
+ * Given a tensor [luTensor], return tensors `Triple(P, L, U)` satisfying `P dot luTensor = L dot U`,
+ * with `P` being a permutation matrix or batch of matrices,
+ * `L` being a lower triangular matrix or batch of matrices,
+ * `U` being an upper triangular matrix or batch of matrices.
+ *
+ * @param luTensor the packed LU factorization data
+ * @param pivotsTensor the packed LU factorization pivots
+ * @return triple of `P`, `L` and `U` tensors
+ */
+public fun DoubleTensorAlgebra.luPivot(
+    luTensor: StructureND<Double>,
+    pivotsTensor: Tensor<Int>,
+): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+    checkSquareMatrix(luTensor.shape)
+    check(
+        luTensor.shape.first(luTensor.shape.size - 2) contentEquals pivotsTensor.shape.first(pivotsTensor.shape.size - 1) ||
+                luTensor.shape.last() == pivotsTensor.shape.last() - 1
+    ) { "Inappropriate shapes of input tensors" }
+
+    val n = luTensor.shape.last()
+    val pTensor = zeroesLike(luTensor)
+    pTensor
+        .matrixSequence()
+        .zip(pivotsTensor.asIntTensor().vectorSequence())
+        .forEach { (p, pivot) -> pivInit(p.asDoubleTensor2D(), pivot.as1D(), n) }
+
+    val lTensor = zeroesLike(luTensor)
+    val uTensor = zeroesLike(luTensor)
+
+    lTensor.matrixSequence()
+        .zip(uTensor.matrixSequence())
+        .zip(luTensor.asDoubleTensor().matrixSequence())
+        .forEach { (pairLU, lu) ->
+            val (l, u) = pairLU
+            luPivotHelper(l.asDoubleTensor2D(), u.asDoubleTensor2D(), lu.asDoubleTensor2D(), n)
+        }
+
+    return Triple(pTensor, lTensor, uTensor)
+}
+
+
+/**
+ * LUP decomposition.
+ *
+ * Computes the LUP decomposition of a matrix or a batch of matrices.
+ * Given a tensor `input`, return tensors `Triple(P, L, U)` satisfying `P dot input == L dot U`,
+ * with `P` being a permutation matrix or batch of matrices,
+ * `L` being a lower triangular matrix or batch of matrices,
+ * `U` being an upper triangular matrix or batch of matrices.
+ *
+ * @param epsilon permissible error when comparing the determinant of a matrix with zero.
+ * @return triple of `P`, `L` and `U` tensors.
+ */
+public fun DoubleTensorAlgebra.lu(
+    structureND: StructureND<Double>,
+    epsilon: Double = 1e-9,
+): Triple<DoubleTensor, DoubleTensor, DoubleTensor> {
+    val (lu, pivots) = luFactor(structureND, epsilon)
+    return luPivot(lu, pivots)
+}
+
+
+/**
+ * QR decomposition.
+ *
+ * Computes the QR decomposition of a matrix or a batch of matrices, and returns a pair `Q to R` of tensors.
+ * Given a tensor `input`, return tensors `Q to R` satisfying `input == Q dot R`,
+ * with `Q` being an orthogonal matrix or batch of orthogonal matrices
+ * and `R` being an upper triangular matrix or batch of upper triangular matrices.
+ *
+ * @receiver the `input`.
+ * @param epsilon the permissible error when comparing tensors for equality. The default is 1e-6
+ * Used when checking the positive definiteness of the input matrix or matrices.
+ * @return a pair of `Q` and `R` tensors.
+ */
+public fun DoubleTensorAlgebra.cholesky(structureND: StructureND<Double>, epsilon: Double = 1e-6): DoubleTensor {
+    checkSquareMatrix(structureND.shape)
+    checkPositiveDefinite(structureND.asDoubleTensor(), epsilon)
+
+    val n = structureND.shape.last()
+    val lTensor = zeroesLike(structureND)
+
+    for ((a, l) in structureND.asDoubleTensor().matrixSequence().zip(lTensor.matrixSequence()))
+        for (i in 0 until n) choleskyHelper(a.asDoubleTensor2D(), l.asDoubleTensor2D(), n)
+
+    return lTensor
+}
+
+
+/**
+ * Singular Value Decomposition.
+ *
+ * Computes the singular value decomposition of either a matrix or batch of matrices `input`.
+ * The singular value decomposition is represented as a triple `Triple(U, S, V)`,
+ * such that `input == U dot diagonalEmbedding(S) dot V.transpose()`.
+ * If `input` is a batch of tensors, then U, S, and Vh are also batched with the same batch dimensions as `input.
+ *
+ * @receiver the `input`.
+ * @param epsilon permissible error when calculating the dot product of vectors
+ * i.e., the precision with which the cosine approaches 1 in an iterative algorithm.
+ * @return a triple `Triple(U, S, V)`.
+ */
+public fun DoubleTensorAlgebra.svd(
+    structureND: StructureND<Double>,
+    epsilon: Double,
+): Triple<StructureND<Double>, StructureND<Double>, StructureND<Double>> {
+    val size = structureND.dimension
+    val commonShape = structureND.shape.slice(0 until size - 2)
+    val (n, m) = structureND.shape.slice(size - 2 until size)
+    val uTensor = zeros(commonShape + ShapeND(min(n, m), n))
+    val sTensor = zeros(commonShape + ShapeND(min(n, m)))
+    val vTensor = zeros(commonShape + ShapeND(min(n, m), m))
+
+    val matrices = structureND.asDoubleTensor().matrices
+    val uTensors = uTensor.matrices
+    val sTensorVectors = sTensor.vectors
+    val vTensors = vTensor.matrices
+
+    for (index in matrices.indices) {
+        val matrix = matrices[index]
+        val usv = Triple(
+            uTensors[index],
+            sTensorVectors[index],
+            vTensors[index]
+        )
+        val matrixSize = matrix.shape.linearSize
+        val curMatrix = DoubleTensor(
+            matrix.shape,
+            matrix.source.view(0, matrixSize)
+        )
+        svdHelper(curMatrix, usv, m, n, epsilon)
+    }
+
+    return Triple(uTensor.transposed(), sTensor, vTensor.transposed())
+}
+
+/**
+ * Returns eigenvalues and eigenvectors of a real symmetric matrix input or a batch of real symmetric matrices,
+ * represented by a pair `eigenvalues to eigenvectors`.
+ *
+ * @param epsilon the permissible error when comparing tensors for equality
+ * and when the cosine approaches 1 in the SVD algorithm.
+ * @return a pair `eigenvalues to eigenvectors`.
+ */
+public fun DoubleTensorAlgebra.symEigSvd(
+    structureND: StructureND<Double>,
+    epsilon: Double,
+): Pair<DoubleTensor, StructureND<Double>> {
+    //TODO optimize conversion
+    checkSymmetric(structureND.asDoubleTensor(), epsilon)
+
+    fun MutableStructure2D<Double>.cleanSym(n: Int) {
+        for (i in 0 until n) {
+            for (j in 0 until n) {
+                if (i == j) {
+                    this[i, j] = sign(this[i, j])
+                } else {
+                    this[i, j] = 0.0
+                }
+            }
+        }
+    }
+
+    val (u, s, v) = svd(structureND, epsilon)
+    val shp = s.shape + intArrayOf(1)
+    val utv = u.transposed() matmul v
+    val n = s.shape.last()
+    for (matrix in utv.matrixSequence()) {
+        matrix.asDoubleTensor2D().cleanSym(n)
+    }
+
+    val eig = (utv dot s.asDoubleTensor().view(shp)).view(s.shape)
+    return eig to v
+}
+
+public fun DoubleTensorAlgebra.symEigJacobi(
+    structureND: StructureND<Double>,
+    maxIteration: Int,
+    epsilon: Double,
+): Pair<DoubleTensor, DoubleTensor> {
+    //TODO optimize conversion
+    checkSymmetric(structureND.asDoubleTensor(), epsilon)
+
+    val size = structureND.dimension
+    val eigenvectors = zeros(structureND.shape)
+    val eigenvalues = zeros(structureND.shape.slice(0 until size - 1))
+
+    var eigenvalueStart = 0
+    var eigenvectorStart = 0
+    for (matrix in structureND.asDoubleTensor().matrixSequence()) {
+        val matrix2D = matrix.asDoubleTensor2D()
+        val (d, v) = matrix2D.jacobiHelper(maxIteration, epsilon)
+
+        for (i in 0 until matrix2D.rowNum) {
+            for (j in 0 until matrix2D.colNum) {
+                eigenvectors.source[eigenvectorStart + i * matrix2D.rowNum + j] = v[i, j]
+            }
+        }
+
+        for (i in 0 until matrix2D.rowNum) {
+            eigenvalues.source[eigenvalueStart + i] = d[i]
+        }
+
+        eigenvalueStart += structureND.shape.last()
+        eigenvectorStart += structureND.shape.last() * structureND.shape.last()
+    }
+
+    return eigenvalues to eigenvectors
+}
+
+/**
+ * Computes the determinant of a square matrix input, or of each square matrix in a batched input
+ * using LU factorization algorithm.
+ *
+ * @param epsilon the error in the LU algorithm&mdash;permissible error when comparing the determinant of a matrix
+ * with zero.
+ * @return the determinant.
+ */
+public fun DoubleTensorAlgebra.detLU(structureND: StructureND<Double>, epsilon: Double = 1e-9): DoubleTensor {
+    checkSquareMatrix(structureND.shape)
+    //TODO check for unnecessary copies
+    val luTensor = structureND.copyToTensor()
+    val pivotsTensor = structureND.setUpPivots()
+
+    val n = structureND.shape.size
+
+    val detTensorShape = ShapeND(IntArray(n - 1) { i -> structureND.shape[i] }.apply {
+        set(n - 2, 1)
+    })
+
+    val resBuffer = DoubleBuffer(detTensorShape.linearSize) { 0.0 }
+
+    val detTensor = DoubleTensor(
+        detTensorShape,
+        resBuffer
+    )
+
+    luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).forEachIndexed { index, (lu, pivots) ->
+        resBuffer[index] = if (luHelper(lu.asDoubleTensor2D(), pivots.as1D(), epsilon))
+            0.0 else luMatrixDet(lu.asDoubleTensor2D(), pivots.as1D())
+    }
+
+    return detTensor
+}
+
+/**
+ * Computes the multiplicative inverse matrix of a square matrix input, or of each square matrix in a batched input
+ * using LU factorization algorithm.
+ * Given a square matrix `a`, return the matrix `aInv` satisfying
+ * `a dot aInv == aInv dot a == eye(a.shape[0])`.
+ *
+ * @param epsilon error in the LU algorithm&mdash;permissible error when comparing the determinant of a matrix with zero
+ * @return the multiplicative inverse of a matrix.
+ */
+public fun DoubleTensorAlgebra.invLU(structureND: StructureND<Double>, epsilon: Double = 1e-9): DoubleTensor {
+    val (luTensor, pivotsTensor) = luFactor(structureND, epsilon)
+    val invTensor = zeroesLike(luTensor)
+
+    //TODO replace sequence with a cycle
+    val seq = luTensor.matrixSequence().zip(pivotsTensor.vectorSequence()).zip(invTensor.matrixSequence())
+    for ((luP, invMatrix) in seq) {
+        val (lu, pivots) = luP
+        luMatrixInv(lu.asDoubleTensor2D(), pivots.as1D(), invMatrix.asDoubleTensor2D())
+    }
+
+    return invTensor
+}
+
+/**
+ * Returns the covariance matrix `M` of given vectors.
+ *
+ * `M[i, j]` contains covariance of `i`-th and `j`-th given vectors
+ *
+ * @param vectors the [List] of 1-dimensional tensors with same shape
+ * @return `M`.
+ */
+public fun DoubleTensorAlgebra.covariance(vectors: List<Buffer<Double>>): DoubleTensor {
+    check(vectors.isNotEmpty()) { "List must have at least 1 element" }
+    val n = vectors.size
+    val m = vectors[0].size
+    check(vectors.all { it.size == m }) { "Vectors must have same shapes" }
+    val resTensor = DoubleTensor(
+        ShapeND(n, n),
+        DoubleBuffer(n * n) { 0.0 }
+    )
+    for (i in 0 until n) {
+        for (j in 0 until n) {
+            resTensor[intArrayOf(i, j)] = bufferAlgebra.covariance(vectors[i], vectors[j])
+        }
+    }
+    return resTensor
+}
\ No newline at end of file
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
index 2ef2d87d6..e4c2c40ea 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleAnalyticTensorAlgebra.kt
@@ -34,73 +34,73 @@ internal class TestDoubleAnalyticTensorAlgebra {
 
     @Test
     fun testExp() = DoubleTensorAlgebra {
-        assertTrue { tensor.exp() eq expectedTensor(::exp) }
+        assertTrue { exp(tensor) eq expectedTensor(::exp) }
     }
 
     @Test
     fun testLog() = DoubleTensorAlgebra {
-        assertTrue { tensor.ln() eq expectedTensor(::ln) }
+        assertTrue { ln(tensor) eq expectedTensor(::ln) }
     }
 
     @Test
     fun testSqrt() = DoubleTensorAlgebra {
-        assertTrue { tensor.sqrt() eq expectedTensor(::sqrt) }
+        assertTrue { sqrt(tensor) eq expectedTensor(::sqrt) }
     }
 
     @Test
     fun testCos() = DoubleTensorAlgebra {
-        assertTrue { tensor.cos() eq expectedTensor(::cos) }
+        assertTrue { cos(tensor) eq expectedTensor(::cos) }
     }
 
 
     @Test
     fun testCosh() = DoubleTensorAlgebra {
-        assertTrue { tensor.cosh() eq expectedTensor(::cosh) }
+        assertTrue { cosh(tensor) eq expectedTensor(::cosh) }
     }
 
     @Test
     fun testAcosh() = DoubleTensorAlgebra {
-        assertTrue { tensor.acosh() eq expectedTensor(::acosh) }
+        assertTrue { acosh(tensor) eq expectedTensor(::acosh) }
     }
 
     @Test
     fun testSin() = DoubleTensorAlgebra {
-        assertTrue { tensor.sin() eq expectedTensor(::sin) }
+        assertTrue { sin(tensor) eq expectedTensor(::sin) }
     }
 
     @Test
     fun testSinh() = DoubleTensorAlgebra {
-        assertTrue { tensor.sinh() eq expectedTensor(::sinh) }
+        assertTrue { sinh(tensor) eq expectedTensor(::sinh) }
     }
 
     @Test
     fun testAsinh() = DoubleTensorAlgebra {
-        assertTrue { tensor.asinh() eq expectedTensor(::asinh) }
+        assertTrue { asinh(tensor) eq expectedTensor(::asinh) }
     }
 
     @Test
     fun testTan() = DoubleTensorAlgebra {
-        assertTrue { tensor.tan() eq expectedTensor(::tan) }
+        assertTrue { tan(tensor) eq expectedTensor(::tan) }
     }
 
     @Test
     fun testAtan() = DoubleTensorAlgebra {
-        assertTrue { tensor.atan() eq expectedTensor(::atan) }
+        assertTrue { atan(tensor) eq expectedTensor(::atan) }
     }
 
     @Test
     fun testTanh() = DoubleTensorAlgebra {
-        assertTrue { tensor.tanh() eq expectedTensor(::tanh) }
+        assertTrue { tanh(tensor) eq expectedTensor(::tanh) }
     }
 
     @Test
     fun testCeil() = DoubleTensorAlgebra {
-        assertTrue { tensor.ceil() eq expectedTensor(::ceil) }
+        assertTrue { ceil(tensor) eq expectedTensor(::ceil) }
     }
 
     @Test
     fun testFloor() = DoubleTensorAlgebra {
-        assertTrue { tensor.floor() eq expectedTensor(::floor) }
+        assertTrue { floor(tensor) eq expectedTensor(::floor) }
     }
 
     val shape2 = ShapeND(2, 2)
@@ -163,15 +163,15 @@ internal class TestDoubleAnalyticTensorAlgebra {
 
     @Test
     fun testMean() = DoubleTensorAlgebra {
-        assertTrue { tensor2.mean() == 1.0 }
+        assertTrue { mean(tensor2) == 1.0 }
         assertTrue {
-            tensor2.mean(0, true) eq fromArray(
+            mean(tensor2, 0, true) eq fromArray(
                 ShapeND(1, 2),
                 doubleArrayOf(-1.0, 3.0)
             )
         }
         assertTrue {
-            tensor2.mean(1, false) eq fromArray(
+            mean(tensor2, 1, false) eq fromArray(
                 ShapeND(2),
                 doubleArrayOf(1.5, 0.5)
             )
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
index d47af4a64..cbd7b9887 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleLinearOpsAlgebra.kt
@@ -35,7 +35,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
                 -7.0
             )
         )
-        val detTensor = tensor.detLU()
+        val detTensor = detLU(tensor)
 
         assertTrue(detTensor.eq(expectedTensor))
 
@@ -88,7 +88,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
             )
         )
 
-        val invTensor = tensor.invLU()
+        val invTensor = invLU(tensor)
         assertTrue(invTensor.eq(expectedTensor))
     }
 
@@ -111,7 +111,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
         val tensor = fromArray(shape, buffer)
 
-        val (q, r) = tensor.qr()
+        val (q, r) = qr(tensor)
 
         assertTrue { q.shape contentEquals shape }
         assertTrue { r.shape contentEquals shape }
@@ -131,7 +131,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         )
         val tensor = fromArray(shape, buffer)
 
-        val (p, l, u) = tensor.lu()
+        val (p, l, u) = lu(tensor)
 
         assertTrue { p.shape contentEquals shape }
         assertTrue { l.shape contentEquals shape }
@@ -146,7 +146,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
         val sigma = (tensor matmul tensor.transposed()) + diagonalEmbedding(
             fromArray(ShapeND(2, 5), DoubleArray(10) { 0.1 })
         )
-        val low = sigma.cholesky()
+        val low = cholesky(sigma)
         val sigmChol = low matmul low.transposed()
         assertTrue(sigma.eq(sigmChol))
     }
@@ -171,7 +171,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     @Test
     fun testBatchedSVD() = DoubleTensorAlgebra {
         val tensor = randomNormal(ShapeND(2, 5, 3), 0)
-        val (tensorU, tensorS, tensorV) = tensor.svd()
+        val (tensorU, tensorS, tensorV) = svd(tensor)
         val tensorSVD = tensorU matmul (diagonalEmbedding(tensorS) matmul tensorV.transposed())
         assertTrue(tensor.eq(tensorSVD))
     }
@@ -180,7 +180,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
     fun testBatchedSymEig() = DoubleTensorAlgebra {
         val tensor = randomNormal(shape = ShapeND(2, 3, 3), 0)
         val tensorSigma = tensor + tensor.transposed()
-        val (tensorS, tensorV) = tensorSigma.symEig()
+        val (tensorS, tensorV) = symEig(tensorSigma)
         val tensorSigmaCalc = tensorV matmul (diagonalEmbedding(tensorS) matmul tensorV.transposed())
         assertTrue(tensorSigma.eq(tensorSigmaCalc))
     }
@@ -190,7 +190,7 @@ internal class TestDoubleLinearOpsTensorAlgebra {
 
 
 private fun DoubleTensorAlgebra.testSVDFor(tensor: DoubleTensor, epsilon: Double = 1e-10) {
-    val svd = tensor.svd()
+    val svd = svd(tensor)
 
     val tensorSVD = svd.first
         .dot(
-- 
2.34.1


From b14e2fdd083e26a7843e75ec35a0a5c5118a2d53 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 5 Nov 2022 21:44:41 +0300
Subject: [PATCH 632/713] Moved polynomials to
 https://github.com/SciProgCentre/kmath-polynomial

---
 CHANGELOG.md                                  |     1 +
 examples/build.gradle.kts                     |     1 -
 .../kscience/kmath/functions/polynomials.kt   |   399 -
 kmath-polynomial/README.md                    |    50 -
 kmath-polynomial/build.gradle.kts             |    69 -
 .../kmath/functions/LabeledPolynomial.kt      |   529 -
 .../functions/LabeledRationalFunction.kt      |    92 -
 .../kmath/functions/ListPolynomial.kt         |   374 -
 .../kmath/functions/ListRationalFunction.kt   |   123 -
 .../kmath/functions/NumberedPolynomial.kt     |   350 -
 .../functions/NumberedRationalFunction.kt     |   225 -
 .../kscience/kmath/functions/Polynomial.kt    |   527 -
 .../kmath/functions/RationalFunction.kt       |  1689 ---
 .../kscience/kmath/functions/algebraicStub.kt |   146 -
 .../kmath/functions/collectionUtils.kt        |   906 --
 .../kmath/functions/labeledConstructors.kt    |   779 -
 .../kscience/kmath/functions/labeledUtil.kt   |   321 -
 .../kmath/functions/listConstructors.kt       |    92 -
 .../kscience/kmath/functions/listUtil.kt      |   255 -
 .../space/kscience/kmath/functions/misc.kt    |    22 -
 .../kmath/functions/numberedConstructors.kt   |   491 -
 .../kscience/kmath/functions/numberedUtil.kt  |   513 -
 .../kmath/functions/AlgebraicStubTest.kt      |   589 -
 .../functions/LabeledConstructorsTest.kt      |   127 -
 .../kmath/functions/LabeledPolynomialTest.kt  |  2555 ----
 .../functions/LabeledPolynomialUtilTest.kt    |  8222 -----------
 .../kmath/functions/ListPolynomialTest.kt     |   544 -
 .../kmath/functions/ListPolynomialUtilTest.kt |   982 --
 .../functions/NumberedConstructorsTest.kt     |   123 -
 .../kmath/functions/NumberedPolynomialTest.kt |  1740 ---
 .../functions/NumberedPolynomialUtilTest.kt   | 12021 ----------------
 .../kmath/functions/testUtils/BufferUtils.kt  |    12 -
 .../kmath/functions/testUtils/IntModulo.kt    |   133 -
 .../functions/testUtils/IntModuloUtils.kt     |    19 -
 .../kmath/functions/testUtils/NTMisc.kt       |    29 -
 .../kmath/functions/testUtils/Rational.kt     |   177 -
 .../kmath/functions/testUtils/assertion.kt    |   104 -
 .../kmath/functions/testUtils/misc.kt         |    19 -
 settings.gradle.kts                           |     1 -
 39 files changed, 1 insertion(+), 35350 deletions(-)
 delete mode 100644 examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
 delete mode 100644 kmath-polynomial/README.md
 delete mode 100644 kmath-polynomial/build.gradle.kts
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
 delete mode 100644 kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
 delete mode 100644 kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c31740a31..1b3ab75fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 ### Deprecated
 
 ### Removed
+- Polynomials moved to https://github.com/SciProgCentre/kmath-polynomial
 
 ### Fixed
 
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 1d224bace..da645f012 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -18,7 +18,6 @@ dependencies {
     implementation(project(":kmath-commons"))
     implementation(project(":kmath-complex"))
     implementation(project(":kmath-functions"))
-    implementation(project(":kmath-polynomial"))
     implementation(project(":kmath-optimization"))
     implementation(project(":kmath-stat"))
     implementation(project(":kmath-viktor"))
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
deleted file mode 100644
index 8228983e2..000000000
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/polynomials.kt
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("LocalVariableName")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.operations.algebra
-import space.kscience.kmath.operations.invoke
-
-
-/**
- * Shows [ListPolynomial]s' and [ListRationalFunction]s' capabilities.
- */
-fun listPolynomialsExample() {
-    // [ListPolynomial] is a representation of a univariate polynomial as a list of coefficients from the least term to
-    // the greatest term. For example,
-    val polynomial1: ListPolynomial<Int> = ListPolynomial(listOf(2, -3, 1))
-    // represents polynomial 2 + (-3) x + x^2
-
-    // There are also shortcut fabrics:
-    val polynomial2: ListPolynomial<Int> = ListPolynomial(2, -3, 1)
-    println(polynomial1 == polynomial2) // true
-    // and even
-    val polynomial3: ListPolynomial<Int> = 57.asListPolynomial()
-    val polynomial4: ListPolynomial<Int> = ListPolynomial(listOf(57))
-    println(polynomial3 == polynomial4) // true
-
-    val polynomial5: ListPolynomial<Int> = ListPolynomial(3, -1)
-    // For every ring there can be provided a polynomial ring:
-    Int.algebra.listPolynomialSpace {
-        println(-polynomial5 == ListPolynomial(-3, 1)) // true
-        println(polynomial1 + polynomial5 == ListPolynomial(5, -4, 1)) // true
-        println(polynomial1 - polynomial5 == ListPolynomial(-1, -2, 1)) // true
-        println(polynomial1 * polynomial5 == ListPolynomial(6, -11, 6, -1)) // true
-    }
-    // You can even write
-    val x: ListPolynomial<Double> = ListPolynomial(0.0, 1.0)
-    val polynomial6: ListPolynomial<Double> = ListPolynomial(2.0, -3.0, 1.0)
-    Double.algebra.listPolynomialSpace {
-        println(2 - 3 * x + x * x == polynomial6)
-        println(2.0 - 3.0 * x + x * x == polynomial6)
-    }
-
-    // Also there are some utilities for polynomials:
-    println(polynomial1.substitute(Int.algebra, 1) == 0) // true, because 2 + (-3) * 1 + 1^2 = 0
-    println(polynomial1.substitute(Int.algebra, polynomial5) == polynomial1) // true, because 2 + (-3) * (3-x) + (3-x)^2 = 2 - 3x + x^2
-    println(polynomial1.derivative(Int.algebra) == ListPolynomial(-3, 2)) // true, (2 - 3x + x^2)' = -3 + 2x
-    println(polynomial1.nthDerivative(Int.algebra, 2) == 2.asListPolynomial()) // true, (2 - 3x + x^2)'' = 2
-
-    // Lastly, there are rational functions and some other utilities:
-    Double.algebra.listRationalFunctionSpace {
-        val rationalFunction1: ListRationalFunction<Double> = ListRationalFunction(listOf(2.0, -3.0, 1.0), listOf(3.0, -1.0))
-        // It's just (2 - 3x + x^2)/(3 - x)
-
-        val rationalFunction2 : ListRationalFunction<Double> = ListRationalFunction(listOf(5.0, -4.0, 1.0), listOf(3.0, -1.0))
-        // It's just (5 - 4x + x^2)/(3 - x)
-
-        println(rationalFunction1 + 1 == rationalFunction2)
-    }
-}
-
-/**
- * Shows [NumberedPolynomial]s' and [NumberedRationalFunction]s' capabilities.
- */
-fun numberedPolynomialsExample() {
-    // Consider polynomial
-    // 3 + 5 x_2 - 7 x_1^2 x_3
-    // Consider, for example, its term -7 x_1^2 x_3. -7 is a coefficient of the term, whereas (2, 0, 1, 0, 0, ...) is
-    // description of degrees of variables x_1, x_2, ... in the term. Such description with removed leading zeros
-    // [2, 0, 1] is called "signature" of the term -7 x_1^2 x_3.
-
-    val polynomial1: NumberedPolynomial<Int>
-    with(Int.algebra) {
-        // [NumberedPolynomial] is a representation of a multivariate polynomial, that stores terms in a map with terms'
-        // signatures as the map's keys and terms' coefficients as corresponding values. For example,
-        polynomial1 = NumberedPolynomial(
-            mapOf(
-                listOf<UInt>() to 3,
-                listOf(0u, 1u) to 5,
-                listOf(2u, 0u, 1u) to -7,
-            )
-        )
-        // represents polynomial 3 + 5 x_2 - 7 x_1^2 x_3
-
-        // This `NumberedPolynomial` function needs context of either ring of constant (as `Int.algebra` in this example)
-        // or space of NumberedPolynomials over it. To understand why it is like this see documentations of functions
-        // NumberedPolynomial and NumberedPolynomialWithoutCheck
-
-        // There are also shortcut fabrics:
-        val polynomial2: NumberedPolynomial<Int> = NumberedPolynomial(
-            listOf<UInt>() to 3,
-            listOf(0u, 1u) to 5,
-            listOf(2u, 0u, 1u) to -7,
-        )
-        println(polynomial1 == polynomial2) // true
-        // and even
-        val polynomial3: NumberedPolynomial<Int> = 57.asNumberedPolynomial() // This one actually does not algebraic context!
-        val polynomial4: NumberedPolynomial<Int> = NumberedPolynomial(listOf<UInt>() to 57)
-        println(polynomial3 == polynomial4) // true
-
-        numberedPolynomialSpace {
-            // Also there is DSL for constructing NumberedPolynomials:
-            val polynomial5: NumberedPolynomial<Int> = NumberedPolynomialDSL1 {
-                3 {}
-                5 { 1 inPowerOf 1u }
-                -7 with { 0 pow 2u; 2 pow 1u }
-                // `pow` and `inPowerOf` are the same
-                // `with` is omittable
-            }
-            println(polynomial1 == polynomial5) // true
-
-            // Unfortunately the DSL does not work good in bare context of constants' ring, so for now it's disabled and
-            // works only in NumberedPolynomialSpace and NumberedRationalFunctionSpace
-        }
-    }
-
-    val polynomial6: NumberedPolynomial<Int> = Int.algebra {
-        NumberedPolynomial(
-            listOf<UInt>() to 7,
-            listOf(0u, 1u) to -5,
-            listOf(2u, 0u, 1u) to 0,
-            listOf(0u, 0u, 0u, 4u) to 4,
-        )
-    }
-    // For every ring there can be provided a polynomial ring:
-    Int.algebra.numberedPolynomialSpace {
-        println(
-            -polynomial6 == NumberedPolynomial(
-                listOf<UInt>() to -7,
-                listOf(0u, 1u) to 5,
-                listOf(2u, 0u, 1u) to 0,
-                listOf(0u, 0u, 0u, 4u) to (-4),
-            )
-        ) // true
-        println(
-            polynomial1 + polynomial6 == NumberedPolynomial(
-                listOf<UInt>() to 10,
-                listOf(0u, 1u) to 0,
-                listOf(2u, 0u, 1u) to -7,
-                listOf(0u, 0u, 0u, 4u) to 4,
-            )
-        ) // true
-        println(
-            polynomial1 - polynomial6 == NumberedPolynomial(
-                listOf<UInt>() to -4,
-                listOf(0u, 1u) to 10,
-                listOf(2u, 0u, 1u) to -7,
-                listOf(0u, 0u, 0u, 4u) to -4,
-            )
-        ) // true
-
-        polynomial1 * polynomial6 // Multiplication works too
-    }
-
-    Double.algebra.numberedPolynomialSpace {
-        // You can even write
-        val x_1: NumberedPolynomial<Double> = NumberedPolynomial(listOf(1u) to 1.0)
-        val x_2: NumberedPolynomial<Double> = NumberedPolynomial(listOf(0u, 1u) to 1.0)
-        val x_3: NumberedPolynomial<Double> = NumberedPolynomial(listOf(0u, 0u, 1u) to 1.0)
-        val polynomial7: NumberedPolynomial<Double> = NumberedPolynomial(
-            listOf<UInt>() to 3.0,
-            listOf(0u, 1u) to 5.0,
-            listOf(2u, 0u, 1u) to -7.0,
-        )
-        Double.algebra.listPolynomialSpace {
-            println(3 + 5 * x_2 - 7 * x_1 * x_1 * x_3 == polynomial7)
-            println(3.0 + 5.0 * x_2 - 7.0 * x_1 * x_1 * x_3 == polynomial7)
-        }
-    }
-
-    Int.algebra.numberedPolynomialSpace {
-        val x_4: NumberedPolynomial<Int> = NumberedPolynomial(listOf(0u, 0u, 0u, 4u) to 1)
-        // Also there are some utilities for polynomials:
-        println(polynomial1.substitute(mapOf(0 to 1, 1 to -2, 2 to -1)) == 0.asNumberedPolynomial()) // true,
-            // because it's substitution x_1 -> 1, x_2 -> -2, x_3 -> -1,
-            // so 3 + 5 x_2 - 7 x_1^2 x_3 = 3 + 5 * (-2) - 7 * 1^2 * (-1) = 3 - 10 + 7 = 0
-        println(
-            polynomial1.substitute(mapOf(1 to x_4)) == NumberedPolynomial(
-                listOf<UInt>() to 3,
-                listOf(0u, 1u) to 5,
-                listOf(2u, 0u, 1u) to -7,
-            )
-        ) // true, because it's substitution x_2 -> x_4, so result is 3 + 5 x_4 - 7 x_1^2 x_3
-        println(
-            polynomial1.derivativeWithRespectTo(Int.algebra, 1) ==
-                    NumberedPolynomial(listOf<UInt>() to 5)
-        ) // true, d/dx_2 (3 + 5 x_2 - 7 x_1^2 x_3) = 5
-    }
-
-    // Lastly, there are rational functions and some other utilities:
-    Double.algebra.numberedRationalFunctionSpace {
-        val rationalFunction1: NumberedRationalFunction<Double> = NumberedRationalFunction(
-            NumberedPolynomial(
-                listOf<UInt>() to 2.0,
-                listOf(1u) to -3.0,
-                listOf(2u) to 1.0,
-            ),
-            NumberedPolynomial(
-                listOf<UInt>() to 3.0,
-                listOf(1u) to -1.0,
-            )
-        )
-        // It's just (2 - 3x + x^2)/(3 - x) where x = x_1
-
-        val rationalFunction2: NumberedRationalFunction<Double> = NumberedRationalFunction(
-            NumberedPolynomial(
-                listOf<UInt>() to 5.0,
-                listOf(1u) to -4.0,
-                listOf(2u) to 1.0,
-            ),
-            NumberedPolynomial(
-                listOf<UInt>() to 3.0,
-                listOf(1u) to -1.0,
-            )
-        )
-        // It's just (5 - 4x + x^2)/(3 - x) where x = x_1
-
-        println(rationalFunction1 + 1 == rationalFunction2)
-    }
-}
-
-/**
- * Shows [LabeledPolynomial]s' and [LabeledRationalFunction]s' capabilities.
- */
-fun labeledPolynomialsExample() {
-    val x by symbol
-    val y by symbol
-    val z by symbol
-    val t by symbol
-
-    // Consider polynomial
-    // 3 + 5 y - 7 x^2 z
-    // Consider, for example, its term -7 x^2 z. -7 is a coefficient of the term, whereas matching (x -> 2, z -> 3) is
-    // description of degrees of variables x_1, x_2, ... in the term. Such description is called "signature" of the
-    // term -7 x_1^2 x_3.
-
-    val polynomial1: LabeledPolynomial<Int>
-    with(Int.algebra) {
-        // [LabeledPolynomial] is a representation of a multivariate polynomial, that stores terms in a map with terms'
-        // signatures as the map's keys and terms' coefficients as corresponding values. For example,
-        polynomial1 = LabeledPolynomial(
-            mapOf(
-                mapOf<Symbol, UInt>() to 3,
-                mapOf(y to 1u) to 5,
-                mapOf(x to 2u, z to 1u) to -7,
-            )
-        )
-        // represents polynomial 3 + 5 y - 7 x^2 z
-
-        // This `LabeledPolynomial` function needs context of either ring of constant (as `Int.algebra` in this example)
-        // or space of LabeledPolynomials over it. To understand why it is like this see documentations of functions
-        // LabeledPolynomial and LabeledPolynomialWithoutCheck
-
-        // There are also shortcut fabrics:
-        val polynomial2: LabeledPolynomial<Int> = LabeledPolynomial(
-            mapOf<Symbol, UInt>() to 3,
-            mapOf(y to 1u) to 5,
-            mapOf(x to 2u, z to 1u) to -7,
-        )
-        println(polynomial1 == polynomial2) // true
-        // and even
-        val polynomial3: LabeledPolynomial<Int> = 57.asLabeledPolynomial() // This one actually does not algebraic context!
-        val polynomial4: LabeledPolynomial<Int> = LabeledPolynomial(mapOf<Symbol, UInt>() to 57)
-        println(polynomial3 == polynomial4) // true
-
-        labeledPolynomialSpace {
-            // Also there is DSL for constructing NumberedPolynomials:
-            val polynomial5: LabeledPolynomial<Int> = LabeledPolynomialDSL1 {
-                3 {}
-                5 { y inPowerOf 1u }
-                -7 with { x pow 2u; z pow 1u }
-                // `pow` and `inPowerOf` are the same
-                // `with` is omittable
-            }
-            println(polynomial1 == polynomial5) // true
-
-            // Unfortunately the DSL does not work good in bare context of constants' ring, so for now it's disabled and
-            // works only in NumberedPolynomialSpace and NumberedRationalFunctionSpace
-        }
-    }
-
-    val polynomial6: LabeledPolynomial<Int> = Int.algebra {
-        LabeledPolynomial(
-            mapOf<Symbol, UInt>() to 7,
-            mapOf(y to 1u) to -5,
-            mapOf(x to 2u, z to 1u) to 0,
-            mapOf(t to 4u) to 4,
-        )
-    }
-    // For every ring there can be provided a polynomial ring:
-    Int.algebra.labeledPolynomialSpace {
-        println(
-            -polynomial6 == LabeledPolynomial(
-                mapOf<Symbol, UInt>() to -7,
-                mapOf(y to 1u) to 5,
-                mapOf(x to 2u, z to 1u) to 0,
-                mapOf(t to 4u) to -4,
-            )
-        ) // true
-        println(
-            polynomial1 + polynomial6 == LabeledPolynomial(
-                mapOf<Symbol, UInt>() to 10,
-                mapOf(y to 1u) to 0,
-                mapOf(x to 2u, z to 1u) to -7,
-                mapOf(t to 4u) to 4,
-            )
-        ) // true
-        println(
-            polynomial1 - polynomial6 == LabeledPolynomial(
-                mapOf<Symbol, UInt>() to -4,
-                mapOf(y to 1u) to 10,
-                mapOf(x to 2u, z to 1u) to -7,
-                mapOf(t to 4u) to -4,
-            )
-        ) // true
-
-        polynomial1 * polynomial6 // Multiplication works too
-    }
-
-    Double.algebra.labeledPolynomialSpace {
-        // You can even write
-        val polynomial7: LabeledPolynomial<Double> = LabeledPolynomial(
-            mapOf<Symbol, UInt>() to 3.0,
-            mapOf(y to 1u) to 5.0,
-            mapOf(x to 2u, z to 1u) to -7.0,
-        )
-        Double.algebra.listPolynomialSpace {
-            println(3 + 5 * y - 7 * x * x * z == polynomial7)
-            println(3.0 + 5.0 * y - 7.0 * x * x * z == polynomial7)
-        }
-    }
-
-    Int.algebra.labeledPolynomialSpace {
-        // Also there are some utilities for polynomials:
-        println(polynomial1.substitute(mapOf(x to 1, y to -2, z to -1)) == 0.asLabeledPolynomial()) // true,
-        // because it's substitution x -> 1, y -> -2, z -> -1,
-        // so 3 + 5 y - 7 x^2 z = 3 + 5 * (-2) - 7 * 1^2 * (-1) = 3 - 10 + 7 = 0
-        println(
-            polynomial1.substitute(mapOf(y to t.asPolynomial())) == LabeledPolynomial(
-                mapOf<Symbol, UInt>() to 3,
-                mapOf(t to 1u) to 5,
-                mapOf(x to 2u, z to 1u) to -7,
-                )
-        ) // true, because it's substitution y -> t, so result is 3 + 5 t - 7 x^2 z
-        println(
-            polynomial1.derivativeWithRespectTo(Int.algebra, y) == LabeledPolynomial(mapOf<Symbol, UInt>() to 5)
-        ) // true, d/dy (3 + 5 y - 7 x^2 z) = 5
-    }
-
-    // Lastly, there are rational functions and some other utilities:
-    Double.algebra.labeledRationalFunctionSpace {
-        val rationalFunction1: LabeledRationalFunction<Double> = LabeledRationalFunction(
-            LabeledPolynomial(
-                mapOf<Symbol, UInt>() to 2.0,
-                mapOf(x to 1u) to -3.0,
-                mapOf(x to 2u) to 1.0,
-            ),
-            LabeledPolynomial(
-                mapOf<Symbol, UInt>() to 3.0,
-                mapOf(x to 1u) to -1.0,
-            )
-        )
-        // It's just (2 - 3x + x^2)/(3 - x)
-
-        val rationalFunction2: LabeledRationalFunction<Double> = LabeledRationalFunction(
-            LabeledPolynomial(
-                mapOf<Symbol, UInt>() to 5.0,
-                mapOf(x to 1u) to -4.0,
-                mapOf(x to 2u) to 1.0,
-            ),
-            LabeledPolynomial(
-                mapOf<Symbol, UInt>() to 3.0,
-                mapOf(x to 1u) to -1.0,
-            )
-        )
-        // It's just (5 - 4x + x^2)/(3 - x)
-
-        println(rationalFunction1 + 1 == rationalFunction2)
-    }
-}
-
-fun main() {
-    println("ListPolynomials:")
-    listPolynomialsExample()
-    println()
-
-    println("NumberedPolynomials:")
-    numberedPolynomialsExample()
-    println()
-
-    println("ListPolynomials:")
-    labeledPolynomialsExample()
-    println()
-}
diff --git a/kmath-polynomial/README.md b/kmath-polynomial/README.md
deleted file mode 100644
index a5078a7e0..000000000
--- a/kmath-polynomial/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Module kmath-polynomial
-
-Polynomials, rational functions, and utilities
-
-## Features
-
- - [polynomial abstraction](src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt) : Abstraction for polynomial spaces.
- - [rational function abstraction](src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt) : Abstraction for rational functions spaces.
- - ["list" polynomials](src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt) : List implementation of univariate polynomials.
- - ["list" rational functions](src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt) : List implementation of univariate rational functions.
- - ["list" polynomials and rational functions constructors](src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt) : Constructors for list polynomials and rational functions.
- - ["list" polynomials and rational functions utilities](src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt) : Utilities for list polynomials and rational functions.
- - ["numbered" polynomials](src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt) : Numbered implementation of multivariate polynomials.
- - ["numbered" rational functions](src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt) : Numbered implementation of multivariate rational functions.
- - ["numbered" polynomials and rational functions constructors](src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt) : Constructors for numbered polynomials and rational functions.
- - ["numbered" polynomials and rational functions utilities](src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt) : Utilities for numbered polynomials and rational functions.
- - ["labeled" polynomials](src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt) : Labeled implementation of multivariate polynomials.
- - ["labeled" rational functions](src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt) : Labeled implementation of multivariate rational functions.
- - ["labeled" polynomials and rational functions constructors](src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt) : Constructors for labeled polynomials and rational functions.
- - ["labeled" polynomials and rational functions utilities](src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt) : Utilities for labeled polynomials and rational functions.
-
-
-## Usage
-
-## Artifact:
-
-The Maven coordinates of this project are `space.kscience:kmath-polynomial:0.3.1-dev-1`.
-
-**Gradle Groovy:**
-```groovy
-repositories {
-    maven { url 'https://repo.kotlin.link' }
-    mavenCentral()
-}
-
-dependencies {
-    implementation 'space.kscience:kmath-polynomial:0.3.1-dev-1'
-}
-```
-**Gradle Kotlin DSL:**
-```kotlin
-repositories {
-    maven("https://repo.kotlin.link")
-    mavenCentral()
-}
-
-dependencies {
-    implementation("space.kscience:kmath-polynomial:0.3.1-dev-1")
-}
-```
diff --git a/kmath-polynomial/build.gradle.kts b/kmath-polynomial/build.gradle.kts
deleted file mode 100644
index 4e469f0d1..000000000
--- a/kmath-polynomial/build.gradle.kts
+++ /dev/null
@@ -1,69 +0,0 @@
-plugins {
-    id("space.kscience.gradle.mpp")
-}
-
-kscience{
-    native()
-}
-
-description = "Polynomials, rational functions, and utilities"
-
-kotlin.sourceSets {
-    commonMain {
-        dependencies {
-            api(projects.kmathCore)
-        }
-    }
-}
-
-dependencies {
-    dokkaPlugin("org.jetbrains.dokka:mathjax-plugin:${npmlibs.versions.dokka.get()}")
-}
-
-readme {
-    maturity = space.kscience.gradle.Maturity.PROTOTYPE
-    propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
-
-    feature("polynomial abstraction", "src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt") {
-        "Abstraction for polynomial spaces."
-    }
-    feature("rational function abstraction", "src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt") {
-        "Abstraction for rational functions spaces."
-    }
-    feature("\"list\" polynomials", "src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt") {
-        "List implementation of univariate polynomials."
-    }
-    feature("\"list\" rational functions", "src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt") {
-        "List implementation of univariate rational functions."
-    }
-    feature("\"list\" polynomials and rational functions constructors", "src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt") {
-        "Constructors for list polynomials and rational functions."
-    }
-    feature("\"list\" polynomials and rational functions utilities", "src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt") {
-        "Utilities for list polynomials and rational functions."
-    }
-    feature("\"numbered\" polynomials", "src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt") {
-        "Numbered implementation of multivariate polynomials."
-    }
-    feature("\"numbered\" rational functions", "src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt") {
-        "Numbered implementation of multivariate rational functions."
-    }
-    feature("\"numbered\" polynomials and rational functions constructors", "src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt") {
-        "Constructors for numbered polynomials and rational functions."
-    }
-    feature("\"numbered\" polynomials and rational functions utilities", "src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt") {
-        "Utilities for numbered polynomials and rational functions."
-    }
-    feature("\"labeled\" polynomials", "src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt") {
-        "Labeled implementation of multivariate polynomials."
-    }
-    feature("\"labeled\" rational functions", "src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt") {
-        "Labeled implementation of multivariate rational functions."
-    }
-    feature("\"labeled\" polynomials and rational functions constructors", "src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt") {
-        "Constructors for labeled polynomials and rational functions."
-    }
-    feature("\"labeled\" polynomials and rational functions utilities", "src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt") {
-        "Utilities for labeled polynomials and rational functions."
-    }
-}
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
deleted file mode 100644
index 662e8ca74..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.operations.Ring
-import kotlin.jvm.JvmName
-import kotlin.math.max
-
-
-/**
- * Represents multivariate polynomial that stores its coefficients in a [Map] and terms' signatures in a [Map] that
- * associates variables (of type [Symbol]) with their degree.
- *
- * @param C the type of constants.
- */
-public data class LabeledPolynomial<out C>
-@PublishedApi
-internal constructor(
-    /**
-     * Map that contains coefficients of the polynomial.
-     *
-     * Every monomial \(a x_1^{d_1} ... x_n^{d_n}\) is stored as a pair "key-value" in the map, where the value is the
-     * coefficient \(a\) and the key is a map that associates variables in the monomial with their degree in the monomial.
-     * For example, coefficients of a polynomial \(5 a^2 c^3 - 6 b\) can be represented as
-     * ```
-     * mapOf(
-     *      mapOf(
-     *          a to 2,
-     *          c to 3
-     *      ) to 5,
-     *      mapOf(
-     *          b to 1
-     *      ) to (-6)
-     * )
-     * ```
-     * and also as
-     * ```
-     * mapOf(
-     *      mapOf(
-     *          a to 2,
-     *          c to 3
-     *      ) to 5,
-     *      mapOf(
-     *          b to 1
-     *      ) to (-6),
-     *      mapOf(
-     *          b to 1,
-     *          c to 1
-     *      ) to 0
-     * )
-     * ```
-     * where \(a\), \(b\) and \(c\) are corresponding [Symbol] objects.
-     *
-     * It is not prohibited to put extra zero monomials into the map (as for \(0 b c\) in the example). But the
-     * bigger the coefficients map the worse performance of arithmetical operations performed on it. Thus, it is
-     * recommended not to put (or even to remove) extra (or useless) monomials in the coefficients map.
-     * @usesMathJax
-     */
-    public val coefficients: Map<Map<Symbol, UInt>, C>
-) {
-    override fun toString(): String = "LabeledPolynomial$coefficients"
-}
-
-/**
- * Arithmetic context for multivariate polynomials with coefficients stored as a [Map] and terms' signatures stored as a
- * [Map] constructed with the provided [ring] of constants.
- *
- * @param C the type of constants. Polynomials have them a coefficients in their terms.
- * @param A type of provided underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
- */
-public class LabeledPolynomialSpace<C, out A : Ring<C>>(
-    public override val ring: A,
-) : MultivariatePolynomialSpace<C, Symbol, LabeledPolynomial<C>>, PolynomialSpaceOverRing<C, LabeledPolynomial<C>, A> {
-    /**
-     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    public override operator fun Symbol.plus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) LabeledPolynomialAsIs(
-            mapOf(this@plus to 1U) to constantOne,
-        )
-        else LabeledPolynomialAsIs(
-            mapOf(this@plus to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to other.asConstant(),
-        )
-    /**
-     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    public override operator fun Symbol.minus(other: Int): LabeledPolynomial<C> =
-        if (other == 0) LabeledPolynomialAsIs(
-            mapOf(this@minus to 1U) to constantOne,
-        )
-        else LabeledPolynomialAsIs(
-            mapOf(this@minus to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to (-other).asConstant(),
-        )
-    /**
-     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    public override operator fun Symbol.times(other: Int): LabeledPolynomial<C> =
-        if (other == 0) zero
-        else LabeledPolynomialAsIs(
-            mapOf(this to 1U) to other.asConstant(),
-        )
-
-    /**
-     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    public override operator fun Int.plus(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) LabeledPolynomialAsIs(
-            mapOf(other to 1U) to constantOne,
-        )
-        else LabeledPolynomialAsIs(
-            mapOf(other to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to this@plus.asConstant(),
-        )
-    /**
-     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    public override operator fun Int.minus(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) LabeledPolynomialAsIs(
-            mapOf(other to 1U) to -constantOne,
-        )
-        else LabeledPolynomialAsIs(
-            mapOf(other to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to constantOne * this@minus,
-        )
-    /**
-     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    public override operator fun Int.times(other: Symbol): LabeledPolynomial<C> =
-        if (this == 0) zero
-        else LabeledPolynomialAsIs(
-            mapOf(other to 1U) to this@times.asConstant(),
-        )
-
-    /**
-     * Returns sum of the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun LabeledPolynomial<C>.plus(other: Int): LabeledPolynomial<C> =
-        when {
-            other == 0 -> this
-            coefficients.isEmpty() -> other.asPolynomial()
-            else -> LabeledPolynomialAsIs(
-                coefficients.withPutOrChanged(emptyMap(), other.asConstant()) { it -> it + other }
-            )
-        }
-    /**
-     * Returns difference between the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun LabeledPolynomial<C>.minus(other: Int): LabeledPolynomial<C> =
-        when {
-            other == 0 -> this
-            coefficients.isEmpty() -> other.asPolynomial()
-            else -> LabeledPolynomialAsIs(
-                coefficients.withPutOrChanged(emptyMap(), (-other).asConstant()) { it -> it - other }
-            )
-        }
-    /**
-     * Returns product of the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun LabeledPolynomial<C>.times(other: Int): LabeledPolynomial<C> =
-        when(other) {
-            0 -> zero
-            1 -> this
-            else -> LabeledPolynomialAsIs(
-                coefficients.mapValues { (_, value) -> value * other }
-            )
-        }
-
-    /**
-     * Returns sum of the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        when {
-            this == 0 -> other
-            other.coefficients.isEmpty() -> this@plus.asPolynomial()
-            else -> LabeledPolynomialAsIs(
-                other.coefficients.withPutOrChanged(emptyMap(), this@plus.asConstant()) { it -> this@plus + it }
-            )
-        }
-    /**
-     * Returns difference between the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        when {
-            this == 0 -> -other
-            other.coefficients.isEmpty() -> this@minus.asPolynomial()
-            else -> LabeledPolynomialAsIs(
-                buildMap(other.coefficients.size + 1) {
-                    put(emptyMap(), asConstant())
-                    other.coefficients.copyMapToBy(this, { _, c -> -c }, { currentC, newC -> currentC - newC })
-                }
-            )
-        }
-    /**
-     * Returns product of the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        when(this) {
-            0 -> zero
-            1 -> other
-            else -> LabeledPolynomialAsIs(
-                other.coefficients.mapValues { (_, value) -> this@times * value }
-            )
-        }
-
-    /**
-     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    public override operator fun Symbol.plus(other: C): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            mapOf(this@plus to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to other,
-        )
-    /**
-     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    public override operator fun Symbol.minus(other: C): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            mapOf(this@minus to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to -other,
-        )
-    /**
-     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    public override operator fun Symbol.times(other: C): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            mapOf(this@times to 1U) to other,
-        )
-
-    /**
-     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    public override operator fun C.plus(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            mapOf(other to 1U) to constantOne,
-            emptyMap<Symbol, UInt>() to this@plus,
-        )
-    /**
-     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    public override operator fun C.minus(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            mapOf(other to 1U) to -constantOne,
-            emptyMap<Symbol, UInt>() to this@minus,
-        )
-    /**
-     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    public override operator fun C.times(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            mapOf(other to 1U) to this@times,
-        )
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    override operator fun C.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (other.coefficients.isEmpty()) this@plus.asLabeledPolynomial()
-        else LabeledPolynomialAsIs(
-            other.coefficients.withPutOrChanged(emptyMap(), this@plus) { it -> this@plus + it }
-        )
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    override operator fun C.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (other.coefficients.isEmpty()) this@minus.asPolynomial()
-        else LabeledPolynomialAsIs(
-            buildMap(other.coefficients.size + 1) {
-                put(emptyMap(), this@minus)
-                other.coefficients.copyMapToBy(this, { _, c -> -c }, { currentC, newC -> currentC - newC })
-            }
-        )
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    override operator fun C.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            other.coefficients.mapValues { this@times * it.value }
-        )
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    override operator fun LabeledPolynomial<C>.plus(other: C): LabeledPolynomial<C> =
-        if (coefficients.isEmpty()) other.asLabeledPolynomial()
-        else LabeledPolynomialAsIs(
-            coefficients.withPutOrChanged(emptyMap(), other) { it -> it + other }
-        )
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    override operator fun LabeledPolynomial<C>.minus(other: C): LabeledPolynomial<C> =
-        if (coefficients.isEmpty()) other.asLabeledPolynomial()
-        else LabeledPolynomialAsIs(
-            coefficients.withPutOrChanged(emptyMap(), -other) { it -> it - other }
-        )
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    override operator fun LabeledPolynomial<C>.times(other: C): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            coefficients.mapValues { it.value * other }
-        )
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public override fun number(value: C): LabeledPolynomial<C> = value.asLabeledPolynomial()
-
-    /**
-     * Represents the variable as a monic monomial.
-     */
-    public override operator fun Symbol.unaryPlus(): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            mapOf(this to 1U) to constantOne,
-        )
-    /**
-     * Returns negation of representation of the variable as a monic monomial.
-     */
-    public override operator fun Symbol.unaryMinus(): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            mapOf(this to 1U) to -constantOne,
-        )
-    /**
-     * Returns sum of the variables represented as monic monomials.
-     */
-    public override operator fun Symbol.plus(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) LabeledPolynomialAsIs(
-            mapOf(this to 1U) to constantOne * 2
-        )
-        else LabeledPolynomialAsIs(
-            mapOf(this to 1U) to constantOne,
-            mapOf(other to 1U) to constantOne,
-        )
-    /**
-     * Returns difference between the variables represented as monic monomials.
-     */
-    public override operator fun Symbol.minus(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) zero
-        else LabeledPolynomialAsIs(
-            mapOf(this to 1U) to constantOne,
-            mapOf(other to 1U) to -constantOne,
-        )
-    /**
-     * Returns product of the variables represented as monic monomials.
-     */
-    public override operator fun Symbol.times(other: Symbol): LabeledPolynomial<C> =
-        if (this == other) LabeledPolynomialAsIs(
-            mapOf(this to 2U) to constantOne
-        )
-        else LabeledPolynomialAsIs(
-            mapOf(this to 1U, other to 1U) to constantOne,
-        )
-
-    /**
-     * Returns sum of the variable represented as a monic monomial and the polynomial.
-     */
-    public override operator fun Symbol.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (other.coefficients.isEmpty()) this@plus.asPolynomial()
-        else LabeledPolynomialAsIs(
-            other.coefficients.withPutOrChanged(mapOf(this@plus to 1U), constantOne) { it -> constantOne + it }
-        )
-    /**
-     * Returns difference between the variable represented as a monic monomial and the polynomial.
-     */
-    public override operator fun Symbol.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        if (other.coefficients.isEmpty()) this@minus.asPolynomial()
-        else LabeledPolynomialAsIs(
-            buildMap(other.coefficients.size + 1) {
-                put(mapOf(this@minus to 1U), constantOne)
-                other.coefficients.copyMapToBy(this, { _, c -> -c }) { currentC, newC -> currentC - newC }
-            }
-        )
-    /**
-     * Returns product of the variable represented as a monic monomial and the polynomial.
-     */
-    public override operator fun Symbol.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            other.coefficients
-                .mapKeys { (degs, _) -> degs.withPutOrChanged(this, 1u) { it -> it + 1u } }
-        )
-
-    /**
-     * Returns sum of the polynomial and the variable represented as a monic monomial.
-     */
-    public override operator fun LabeledPolynomial<C>.plus(other: Symbol): LabeledPolynomial<C> =
-        if (coefficients.isEmpty()) other.asPolynomial()
-        else LabeledPolynomialAsIs(
-            coefficients.withPutOrChanged(mapOf(other to 1U), constantOne) { it -> it + constantOne }
-        )
-    /**
-     * Returns difference between the polynomial and the variable represented as a monic monomial.
-     */
-    public override operator fun LabeledPolynomial<C>.minus(other: Symbol): LabeledPolynomial<C> =
-        if (coefficients.isEmpty()) other.asPolynomial()
-        else LabeledPolynomialAsIs(
-            coefficients.withPutOrChanged(mapOf(other to 1U), -constantOne) { it -> it - constantOne }
-        )
-    /**
-     * Returns product of the polynomial and the variable represented as a monic monomial.
-     */
-    public override operator fun LabeledPolynomial<C>.times(other: Symbol): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            coefficients
-                .mapKeys { (degs, _) -> degs.withPutOrChanged(other, 1u) { it -> it + 1u } }
-        )
-
-    /**
-     * Returns negation of the polynomial.
-     */
-    override fun LabeledPolynomial<C>.unaryMinus(): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            coefficients.mapValues { -it.value }
-        )
-    /**
-     * Returns sum of the polynomials.
-     */
-    override operator fun LabeledPolynomial<C>.plus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            mergeBy(coefficients, other.coefficients) { c1, c2 -> c1 + c2 }
-        )
-    /**
-     * Returns difference of the polynomials.
-     */
-    override operator fun LabeledPolynomial<C>.minus(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            buildMap(coefficients.size + other.coefficients.size) {
-                coefficients.copyTo(this)
-                other.coefficients.copyMapToBy(this, { _, c -> -c }, { currentC, newC -> currentC - newC })
-            }
-        )
-    /**
-     * Returns product of the polynomials.
-     */
-    override operator fun LabeledPolynomial<C>.times(other: LabeledPolynomial<C>): LabeledPolynomial<C> =
-        LabeledPolynomialAsIs(
-            buildMap(coefficients.size * other.coefficients.size) {
-                for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
-                    val degs = mergeBy(degs1, degs2) { deg1, deg2 -> deg1 + deg2 }
-                    val c = c1 * c2
-                    this.putOrChange(degs, c) { it -> it + c }
-                }
-            }
-        )
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    override val zero: LabeledPolynomial<C> = LabeledPolynomialAsIs()
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    override val one: LabeledPolynomial<C> = constantOne.asLabeledPolynomial()
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    override val LabeledPolynomial<C>.degree: Int
-        get() = coefficients.entries.maxOfOrNull { (degs, _) -> degs.values.sum().toInt() } ?: -1
-    /**
-     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
-     * in which they are appeared in the polynomial.
-     *
-     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
-     * And keys of the map is the same as in [variables].
-     */
-    public override val LabeledPolynomial<C>.degrees: Map<Symbol, UInt>
-        get() =
-            buildMap {
-                coefficients.keys.forEach { degs ->
-                    degs.copyToBy(this, ::max)
-                }
-            }
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public override fun LabeledPolynomial<C>.degreeBy(variable: Symbol): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) -> degs.getOrElse(variable) { 0u } } ?: 0u
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public override fun LabeledPolynomial<C>.degreeBy(variables: Collection<Symbol>): UInt =
-        coefficients.entries.maxOfOrNull { (degs, _) -> degs.filterKeys { it in variables }.values.sum() } ?: 0u
-    /**
-     * Set of all variables that appear in the polynomial in positive exponents.
-     */
-    public override val LabeledPolynomial<C>.variables: Set<Symbol>
-        get() =
-            buildSet {
-                coefficients.entries.forEach { (degs, _) -> addAll(degs.keys) }
-            }
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public override val LabeledPolynomial<C>.countOfVariables: Int get() = variables.size
-
-    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
-    //  [ListPolynomialSpace] as a context receiver
-    /**
-     * Substitutes provided arguments [arguments] into [this] polynomial.
-     */
-    public inline fun LabeledPolynomial<C>.substitute(arguments: Map<Symbol, C>): LabeledPolynomial<C> = substitute(ring, arguments)
-    /**
-     * Substitutes provided arguments [arguments] into [this] polynomial.
-     */
-    @JvmName("substitutePolynomial")
-    public inline fun LabeledPolynomial<C>.substitute(arguments: Map<Symbol, LabeledPolynomial<C>>) : LabeledPolynomial<C> = substitute(ring, arguments)
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
deleted file mode 100644
index 185782f22..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.operations.Ring
-import kotlin.jvm.JvmName
-
-
-/**
- * Represents multivariate rational function that stores its numerator and denominator as [LabeledPolynomial]s.
- */
-public data class LabeledRationalFunction<C>(
-    public override val numerator: LabeledPolynomial<C>,
-    public override val denominator: LabeledPolynomial<C>
-) : RationalFunction<C, LabeledPolynomial<C>> {
-    override fun toString(): String = "LabeledRationalFunction${numerator.coefficients}/${denominator.coefficients}"
-}
-
-/**
- * Arithmetic context for univariate rational functions with numerator and denominator represented as [LabeledPolynomial]s.
- *
- * @param C the type of constants. Polynomials have them a coefficients in their terms.
- * @param A type of provided underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
- */
-public class LabeledRationalFunctionSpace<C, A: Ring<C>>(
-    public val ring: A,
-) :
-    MultivariateRationalFunctionSpaceOverMultivariatePolynomialSpace<
-            C,
-            Symbol,
-            LabeledPolynomial<C>,
-            LabeledRationalFunction<C>,
-            LabeledPolynomialSpace<C, A>,
-            >,
-    MultivariatePolynomialSpaceOfFractions<
-            C,
-            Symbol,
-            LabeledPolynomial<C>,
-            LabeledRationalFunction<C>,
-            >() {
-
-    /**
-     * Underlying polynomial ring. Its polynomial operations are inherited by local polynomial operations.
-     */
-    override val polynomialRing : LabeledPolynomialSpace<C, A> = LabeledPolynomialSpace(ring)
-    /**
-     * Constructor of rational functions (of type [LabeledRationalFunction]) from numerator and denominator (of type [LabeledPolynomial]).
-     */
-    override fun constructRationalFunction(
-        numerator: LabeledPolynomial<C>,
-        denominator: LabeledPolynomial<C>
-    ): LabeledRationalFunction<C> =
-        LabeledRationalFunction<C>(numerator, denominator)
-
-    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
-    //  [ListPolynomialSpace] as a context receiver
-    /**
-     * Substitutes provided constant [argument] into [this] polynomial.
-     */
-    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, C>): LabeledPolynomial<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided polynomial [argument] into [this] polynomial.
-     */
-    @JvmName("substitutePolynomial")
-    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledPolynomial<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided rational function [argument] into [this] polynomial.
-     */
-    @JvmName("substituteRationalFunction")
-    public inline fun LabeledPolynomial<C>.substitute(argument: Map<Symbol, LabeledRationalFunction<C>>): LabeledRationalFunction<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided constant [argument] into [this] rational function.
-     */
-    public inline fun LabeledRationalFunction<C>.substitute(argument: Map<Symbol, C>): LabeledRationalFunction<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided polynomial [argument] into [this] rational function.
-     */
-    @JvmName("substitutePolynomial")
-    public inline fun LabeledRationalFunction<C>.substitute(argument: Map<Symbol, LabeledPolynomial<C>>): LabeledRationalFunction<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided rational function [argument] into [this] rational function.
-     */
-    @JvmName("substituteRationalFunction")
-    public inline fun LabeledRationalFunction<C>.substitute(argument: Map<Symbol, LabeledRationalFunction<C>>): LabeledRationalFunction<C> = substitute(ring, argument)
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
deleted file mode 100644
index 3753a93c4..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.ScaleOperations
-import space.kscience.kmath.operations.invoke
-import kotlin.math.max
-import kotlin.math.min
-
-
-/**
- * Represents univariate polynomial that stores its coefficients in a [List].
- *
- * @param C the type of constants.
- */
-public data class ListPolynomial<out C>(
-    /**
-     * List that contains coefficients of the polynomial.
-     *
-     * Every monomial \(a x^d\) is stored as a coefficient \(a\) placed
-     * into the list at index \(d\). For example, coefficients of a polynomial \(5 x^2 - 6\) can be represented as
-     * ```
-     * listOf(
-     *     -6, // -6 +
-     *     0,  // 0 x +
-     *     5,  // 5 x^2
-     * )
-     * ```
-     * and also as
-     * ```
-     * listOf(
-     *     -6, // -6 +
-     *     0,  // 0 x +
-     *     5,  // 5 x^2
-     *     0,  // 0 x^3
-     *     0,  // 0 x^4
-     * )
-     * ```
-     * It is not prohibited to put extra zeros at end of the list (as for \(0x^3\) and \(0x^4\) in the example). But the
-     * longer the coefficients list the worse performance of arithmetical operations performed on it. Thus, it is
-     * recommended not to put (or even to remove) extra (or useless) coefficients at the end of the coefficients list.
-     * @usesMathJax
-     */
-    public val coefficients: List<C>
-) {
-    override fun toString(): String = "ListPolynomial$coefficients"
-}
-
-/**
- * Arithmetic context for univariate polynomials with coefficients stored as a [List] constructed with the provided
- * [ring] of constants.
- *
- * @param C the type of constants. Polynomials have them a coefficients in their terms.
- * @param A type of provided underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
- */
-public open class ListPolynomialSpace<C, out A : Ring<C>>(
-    public override val ring: A,
-) : PolynomialSpaceOverRing<C, ListPolynomial<C>, A> {
-    /**
-     * Returns sum of the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun ListPolynomial<C>.plus(other: Int): ListPolynomial<C> =
-        if (other == 0) this
-        else
-            ListPolynomial(
-                coefficients
-                    .toMutableList()
-                    .apply {
-                        val result = getOrElse(0) { constantZero } + other
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-    /**
-     * Returns difference between the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun ListPolynomial<C>.minus(other: Int): ListPolynomial<C> =
-        if (other == 0) this
-        else
-            ListPolynomial(
-                coefficients
-                    .toMutableList()
-                    .apply {
-                        val result = getOrElse(0) { constantZero } - other
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-    /**
-     * Returns product of the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun ListPolynomial<C>.times(other: Int): ListPolynomial<C> =
-        when (other) {
-            0 -> zero
-            1 -> this
-            else -> ListPolynomial(
-                coefficients.map { it * other }
-            )
-        }
-
-    /**
-     * Returns sum of the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: ListPolynomial<C>): ListPolynomial<C> =
-        if (this == 0) other
-        else
-            ListPolynomial(
-                other.coefficients
-                    .toMutableList()
-                    .apply {
-                        val result = this@plus + getOrElse(0) { constantZero }
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-    /**
-     * Returns difference between the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: ListPolynomial<C>): ListPolynomial<C> =
-        ListPolynomial(
-            other.coefficients
-                .toMutableList()
-                .apply {
-                    if (this@minus == 0) {
-                        indices.forEach { this[it] = -this[it] }
-                    } else {
-                        (1..lastIndex).forEach { this[it] = -this[it] }
-
-                        val result = this@minus - getOrElse(0) { constantZero }
-
-                        if (size == 0) add(result)
-                        else this[0] = result
-                    }
-                }
-        )
-    /**
-     * Returns product of the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: ListPolynomial<C>): ListPolynomial<C> =
-        when (this) {
-            0 -> zero
-            1 -> other
-            else -> ListPolynomial(
-                other.coefficients.map { this@times * it }
-            )
-        }
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    public override operator fun C.plus(other: ListPolynomial<C>): ListPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) ListPolynomial(listOf(this@plus))
-            else ListPolynomial(
-                toMutableList()
-                    .apply {
-                        val result = if (size == 0) this@plus else this@plus + get(0)
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    public override operator fun C.minus(other: ListPolynomial<C>): ListPolynomial<C> =
-        with(other.coefficients) {
-            if (isEmpty()) ListPolynomial(listOf(this@minus))
-            else ListPolynomial(
-                toMutableList()
-                    .apply {
-                        (1 .. lastIndex).forEach { this[it] = -this[it] }
-
-                        val result = if (size == 0) this@minus else this@minus - get(0)
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    public override operator fun C.times(other: ListPolynomial<C>): ListPolynomial<C> =
-        ListPolynomial(
-            other.coefficients.map { this@times * it }
-        )
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    public override operator fun ListPolynomial<C>.plus(other: C): ListPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) ListPolynomial(listOf(other))
-            else ListPolynomial(
-                toMutableList()
-                    .apply {
-                        val result = if (size == 0) other else get(0) + other
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-        }
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    public override operator fun ListPolynomial<C>.minus(other: C): ListPolynomial<C> =
-        with(coefficients) {
-            if (isEmpty()) ListPolynomial(listOf(-other))
-            else ListPolynomial(
-                toMutableList()
-                    .apply {
-                        val result = if (size == 0) other else get(0) - other
-
-                        if(size == 0) add(result)
-                        else this[0] = result
-                    }
-            )
-        }
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    public override operator fun ListPolynomial<C>.times(other: C): ListPolynomial<C> =
-        ListPolynomial(
-            coefficients.map { it * other }
-        )
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public override fun number(value: C): ListPolynomial<C> = ListPolynomial(listOf(value))
-
-    /**
-     * Returns negation of the polynomial.
-     */
-    public override operator fun ListPolynomial<C>.unaryMinus(): ListPolynomial<C> =
-        ListPolynomial(coefficients.map { -it })
-    /**
-     * Returns sum of the polynomials.
-     */
-    public override operator fun ListPolynomial<C>.plus(other: ListPolynomial<C>): ListPolynomial<C> {
-        val thisDegree = degree
-        val otherDegree = other.degree
-        return ListPolynomial(
-            List(max(thisDegree, otherDegree) + 1) {
-                when {
-                    it > thisDegree -> other.coefficients[it]
-                    it > otherDegree -> coefficients[it]
-                    else -> coefficients[it] + other.coefficients[it]
-                }
-            }
-        )
-    }
-    /**
-     * Returns difference of the polynomials.
-     */
-    public override operator fun ListPolynomial<C>.minus(other: ListPolynomial<C>): ListPolynomial<C> {
-        val thisDegree = degree
-        val otherDegree = other.degree
-        return ListPolynomial(
-            List(max(thisDegree, otherDegree) + 1) {
-                when {
-                    it > thisDegree -> -other.coefficients[it]
-                    it > otherDegree -> coefficients[it]
-                    else -> coefficients[it] - other.coefficients[it]
-                }
-            }
-        )
-    }
-    /**
-     * Returns product of the polynomials.
-     */
-    public override operator fun ListPolynomial<C>.times(other: ListPolynomial<C>): ListPolynomial<C> {
-        val thisDegree = degree
-        val otherDegree = other.degree
-        return ListPolynomial(
-            List(thisDegree + otherDegree + 1) { d ->
-                (max(0, d - otherDegree)..min(thisDegree, d))
-                    .map { coefficients[it] * other.coefficients[d - it] }
-                    .reduce { acc, rational -> acc + rational }
-            }
-        )
-    }
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */ // TODO: To optimize boxing
-    override fun power(arg: ListPolynomial<C>, exponent: UInt): ListPolynomial<C> = super.power(arg, exponent)
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    override val zero: ListPolynomial<C> = ListPolynomial(emptyList())
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    override val one: ListPolynomial<C> by lazy { ListPolynomial(listOf(constantOne)) }
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    public override val ListPolynomial<C>.degree: Int get() = coefficients.lastIndex
-
-    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
-    //  [ListPolynomialSpace] as a context receiver
-    /**
-     * Evaluates value of [this] polynomial on provided [argument].
-     */
-    public inline fun ListPolynomial<C>.substitute(argument: C): C = substitute(ring, argument)
-    /**
-     * Substitutes provided polynomial [argument] into [this] polynomial.
-     */
-    public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
-
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun ListPolynomial<C>.asFunction(): (C) -> C = asFunctionOver(ring)
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = asFunctionOfConstantOver(ring)
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = asFunctionOfPolynomialOver(ring)
-
-    /**
-     * Evaluates value of [this] polynomial on provided [argument].
-     */
-    public inline operator fun ListPolynomial<C>.invoke(argument: C): C = substitute(ring, argument)
-    /**
-     * Evaluates value of [this] polynomial on provided [argument].
-     */
-    public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
-}
-
-/**
- * Space of polynomials constructed over ring.
- *
- * @param C the type of constants. Polynomials have them as a coefficients in their terms.
- * @param A type of underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
- */
-public class ScalableListPolynomialSpace<C, out A>(
-    ring: A,
-) : ListPolynomialSpace<C, A>(ring), ScaleOperations<ListPolynomial<C>> where A : Ring<C>, A : ScaleOperations<C> {
-    override fun scale(a: ListPolynomial<C>, value: Double): ListPolynomial<C> =
-        ring { ListPolynomial(a.coefficients.map { scale(it, value) }) }
-}
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
deleted file mode 100644
index c2fa6b2ec..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-
-
-/**
- * Represents univariate rational function that stores its numerator and denominator as [ListPolynomial]s.
- */
-public data class ListRationalFunction<C>(
-    public override val numerator: ListPolynomial<C>,
-    public override val denominator: ListPolynomial<C>
-) : RationalFunction<C, ListPolynomial<C>> {
-    override fun toString(): String = "ListRationalFunction${numerator.coefficients}/${denominator.coefficients}"
-}
-
-/**
- * Arithmetic context for univariate rational functions with numerator and denominator represented as [ListPolynomial]s.
- *
- * @param C the type of constants. Polynomials have them a coefficients in their terms.
- * @param A type of provided underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
- */
-public class ListRationalFunctionSpace<C, A : Ring<C>> (
-    public val ring: A,
-) :
-    RationalFunctionSpaceOverPolynomialSpace<
-            C,
-            ListPolynomial<C>,
-            ListRationalFunction<C>,
-            ListPolynomialSpace<C, A>,
-            >,
-    PolynomialSpaceOfFractions<
-            C,
-            ListPolynomial<C>,
-            ListRationalFunction<C>,
-            >() {
-
-    /**
-     * Underlying polynomial ring. Its polynomial operations are inherited by local polynomial operations.
-     */
-    override val polynomialRing : ListPolynomialSpace<C, A> = ListPolynomialSpace(ring)
-    /**
-     * Constructor of [ListRationalFunction] from numerator and denominator [ListPolynomial].
-     */
-    override fun constructRationalFunction(numerator: ListPolynomial<C>, denominator: ListPolynomial<C>): ListRationalFunction<C> =
-        ListRationalFunction(numerator, denominator)
-
-    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
-    //  [ListPolynomialSpace] as a context receiver
-    /**
-     * Evaluates value of [this] polynomial on provided argument.
-     */
-    public inline fun ListPolynomial<C>.substitute(argument: C): C = substitute(ring, argument)
-    /**
-     * Substitutes provided polynomial [argument] into [this] polynomial.
-     */
-    public inline fun ListPolynomial<C>.substitute(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided rational function [argument] into [this] polynomial.
-     */
-    public inline fun ListPolynomial<C>.substitute(argument: ListRationalFunction<C>): ListRationalFunction<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided polynomial [argument] into [this] rational function.
-     */
-    public inline fun ListRationalFunction<C>.substitute(argument: ListPolynomial<C>): ListRationalFunction<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided rational function [argument] into [this] rational function.
-     */
-    public inline fun ListRationalFunction<C>.substitute(argument: ListRationalFunction<C>): ListRationalFunction<C> = substitute(ring, argument)
-
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun ListPolynomial<C>.asFunction(): (C) -> C = { substitute(ring, it) }
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun ListPolynomial<C>.asFunctionOfConstant(): (C) -> C = { substitute(ring, it) }
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun ListPolynomial<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun ListPolynomial<C>.asFunctionOfRationalFunction(): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
-    /**
-     * Represent [this] rational function as a regular context-less function.
-     */
-    public inline fun ListRationalFunction<C>.asFunctionOfPolynomial(): (ListPolynomial<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
-    /**
-     * Represent [this] rational function as a regular context-less function.
-     */
-    public inline fun ListRationalFunction<C>.asFunctionOfRationalFunction(): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
-
-    /**
-     * Evaluates value of [this] polynomial on provided argument.
-     */
-    public inline operator fun ListPolynomial<C>.invoke(argument: C): C = substitute(ring, argument)
-    /**
-     * Evaluates value of [this] polynomial on provided argument.
-     */
-    public inline operator fun ListPolynomial<C>.invoke(argument: ListPolynomial<C>): ListPolynomial<C> = substitute(ring, argument)
-    /**
-     * Evaluates value of [this] polynomial on provided argument.
-     */
-    public inline operator fun ListPolynomial<C>.invoke(argument: ListRationalFunction<C>): ListRationalFunction<C> = substitute(ring, argument)
-    /**
-     * Evaluates value of [this] rational function on provided argument.
-     */
-    public inline operator fun ListRationalFunction<C>.invoke(argument: ListPolynomial<C>): ListRationalFunction<C> = substitute(ring, argument)
-    /**
-     * Evaluates value of [this] rational function on provided argument.
-     */
-    public inline operator fun ListRationalFunction<C>.invoke(argument: ListRationalFunction<C>): ListRationalFunction<C> = substitute(ring, argument)
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
deleted file mode 100644
index eaf5befb1..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.structures.Buffer
-import kotlin.jvm.JvmName
-import kotlin.math.max
-
-
-/**
- * Represents multivariate polynomial that stores its coefficients in a [Map] and terms' signatures in a [List].
- *
- * @param C the type of constants.
- */
-public data class NumberedPolynomial<out C>
-@PublishedApi
-internal constructor(
-    /**
-     * Map that contains coefficients of the polynomial.
-     *
-     * Every monomial \(a x_1^{d_1} ... x_n^{d_n}\) is stored as a pair "key-value" in the map, where the value is the
-     * coefficient \(a\) and the key is a list that associates index of every variable in the monomial with their degree
-     * in the monomial. For example, coefficients of a polynomial \(5 x_1^2 x_3^3 - 6 x_2\) can be represented as
-     * ```
-     * mapOf(
-     *      listOf(2, 0, 3) to 5, // 5 x_1^2 x_3^3 +
-     *      listOf(0, 1) to (-6), // (-6) x_2^1
-     * )
-     * ```
-     * and also as
-     * ```
-     * mapOf(
-     *      listOf(2, 0, 3) to 5, // 5 x_1^2 x_3^3 +
-     *      listOf(0, 1) to (-6), // (-6) x_2^1
-     *      listOf(0, 1, 1) to 0, // 0 x_2^1 x_3^1
-     * )
-     * ```
-     * It is not prohibited to put extra zero monomials into the map (as for \(0 x_2 x_3\) in the example). But the
-     * bigger the coefficients map the worse performance of arithmetical operations performed on it. Thus, it is
-     * recommended not to put (or even to remove) extra (or useless) monomials in the coefficients map.
-     * @usesMathJax
-     */
-    public val coefficients: Map<List<UInt>, C>
-) {
-    override fun toString(): String = "NumberedPolynomial$coefficients"
-}
-
-/**
- * Arithmetic context for multivariate polynomials with coefficients stored as a [Map] and terms' signatures stored as a
- * [List] constructed with the provided [ring] of constants.
- *
- * @param C the type of constants. Polynomials have them a coefficients in their terms.
- * @param A type of provided underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
- */
-public class NumberedPolynomialSpace<C, out A : Ring<C>>(
-    public override val ring: A,
-) : PolynomialSpaceOverRing<C, NumberedPolynomial<C>, A> {
-    /**
-     * Returns sum of the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun NumberedPolynomial<C>.plus(other: Int): NumberedPolynomial<C> =
-        if (other == 0) this
-        else NumberedPolynomialAsIs(
-            coefficients.withPutOrChanged(emptyList(), other.asConstant()) { it -> it + other }
-        )
-    /**
-     * Returns difference between the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun NumberedPolynomial<C>.minus(other: Int): NumberedPolynomial<C> =
-        if (other == 0) this
-        else NumberedPolynomialAsIs(
-            coefficients.withPutOrChanged(emptyList(), (-other).asConstant()) { it -> it - other }
-        )
-    /**
-     * Returns product of the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun NumberedPolynomial<C>.times(other: Int): NumberedPolynomial<C> =
-        when (other) {
-            0 -> zero
-            1 -> this
-            else -> NumberedPolynomialAsIs(
-                coefficients.mapValues { it.value * other }
-            )
-        }
-
-    /**
-     * Returns sum of the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (this == 0) other
-        else NumberedPolynomialAsIs(
-            other.coefficients.withPutOrChanged(emptyList(), this@plus.asConstant()) { it -> this@plus + it }
-        )
-    /**
-     * Returns difference between the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        when {
-            this == 0 -> -other
-            other.coefficients.isEmpty() -> this.asPolynomial()
-            else -> NumberedPolynomialAsIs(
-                buildMap(other.coefficients.size + 1) {
-                    put(emptyList(), other.coefficients.computeOnOrElse(emptyList(), { this@minus.asConstant() }, { it -> this@minus - it}))
-                    other.coefficients.copyMapToBy(this, { _, c -> -c }) { currentC, _ -> currentC }
-                }
-            )
-        }
-    /**
-     * Returns product of the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        when (this) {
-            0 -> zero
-            1 -> other
-            else -> NumberedPolynomialAsIs(
-                other.coefficients.mapValues { this@times * it.value }
-            )
-        }
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    override operator fun C.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (other.coefficients.isEmpty()) this@plus.asPolynomial()
-        else NumberedPolynomialAsIs(
-            other.coefficients.withPutOrChanged(emptyList(), this@plus) { it -> this@plus + it }
-        )
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    override operator fun C.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        if (other.coefficients.isEmpty()) this@minus.asPolynomial()
-        else NumberedPolynomialAsIs(
-            buildMap(other.coefficients.size) {
-                put(emptyList(), other.coefficients.computeOnOrElse(emptyList(), this@minus) { it -> this@minus - it })
-                other.coefficients.copyMapToBy(this, { _, c -> -c }, { currentC, _ -> currentC })
-            }
-        )
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    override operator fun C.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomialAsIs(
-            other.coefficients.mapValues { this@times * it.value }
-        )
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    override operator fun NumberedPolynomial<C>.plus(other: C): NumberedPolynomial<C> =
-        if (coefficients.isEmpty()) other.asPolynomial()
-        else NumberedPolynomialAsIs(
-            coefficients.withPutOrChanged(emptyList(), other) { it -> it + other }
-        )
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    override operator fun NumberedPolynomial<C>.minus(other: C): NumberedPolynomial<C> =
-        if (coefficients.isEmpty()) other.asPolynomial()
-        else NumberedPolynomialAsIs(
-            coefficients.withPutOrChanged(emptyList(), -other) { it -> it - other }
-        )
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    override operator fun NumberedPolynomial<C>.times(other: C): NumberedPolynomial<C> =
-        NumberedPolynomialAsIs(
-            coefficients.mapValues { it.value * other }
-        )
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public override fun number(value: C): NumberedPolynomial<C> =
-        NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to value))
-
-    /**
-     * Returns negation of the polynomial.
-     */
-    override fun NumberedPolynomial<C>.unaryMinus(): NumberedPolynomial<C> =
-        NumberedPolynomialAsIs(
-            coefficients.mapValues { -it.value }
-        )
-    /**
-     * Returns sum of the polynomials.
-     */
-    override operator fun NumberedPolynomial<C>.plus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomialAsIs(
-            mergeBy(coefficients, other.coefficients) { c1, c2 -> c1 + c2 }
-        )
-    /**
-     * Returns difference of the polynomials.
-     */
-    override operator fun NumberedPolynomial<C>.minus(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomialAsIs(
-            buildMap(coefficients.size + other.coefficients.size) {
-                coefficients.copyTo(this)
-                other.coefficients.copyMapToBy(this, { _, c -> -c }, { currentC, newC -> currentC - newC })
-            }
-        )
-    /**
-     * Returns product of the polynomials.
-     */
-    override operator fun NumberedPolynomial<C>.times(other: NumberedPolynomial<C>): NumberedPolynomial<C> =
-        NumberedPolynomialAsIs(
-            buildMap(coefficients.size * other.coefficients.size) {
-                for ((degs1, c1) in coefficients) for ((degs2, c2) in other.coefficients) {
-                    val degs =
-                        (0..max(degs1.lastIndex, degs2.lastIndex))
-                            .map { degs1.getOrElse(it) { 0U } + degs2.getOrElse(it) { 0U } }
-                    val c = c1 * c2
-                    putOrChange(degs, c) { it -> it + c }
-                }
-            }
-        )
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */ // TODO: To optimize boxing
-    override fun power(arg: NumberedPolynomial<C>, exponent: UInt): NumberedPolynomial<C> = super.power(arg, exponent)
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    override val zero: NumberedPolynomial<C> = NumberedPolynomialAsIs(emptyMap())
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    override val one: NumberedPolynomial<C> by lazy { NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to constantOne)) }
-
-    /**
-     * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
-     * the result is -1.
-     */
-    public val NumberedPolynomial<C>.lastVariable: Int
-        get() = coefficients.keys.maxOfOrNull { degs -> degs.lastIndex } ?: -1
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    override val NumberedPolynomial<C>.degree: Int
-        get() = coefficients.keys.maxOfOrNull { degs -> degs.sum().toInt() } ?: -1
-    /**
-     * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
-     * exponents in which the variables are appeared in the polynomial.
-     *
-     * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
-     * And last index of the list is [lastVariable].
-     */
-    public val NumberedPolynomial<C>.degrees: List<UInt>
-        get() =
-            MutableList(lastVariable + 1) { 0u }.apply {
-                coefficients.keys.forEach { degs ->
-                    degs.forEachIndexed { index, deg ->
-                        this[index] = max(this[index], deg)
-                    }
-                }
-            }
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt =
-        coefficients.keys.maxOfOrNull { degs -> degs.getOrElse(variable) { 0u } } ?: 0u
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt =
-        coefficients.keys.maxOfOrNull { degs ->
-            degs.withIndex().fold(0u) { acc, (index, value) -> if (index in variables) acc + value else acc }
-        } ?: 0u
-    /**
-     * Count of variables occurring in the polynomial with positive power. If there is no such variable,
-     * the result is 0.
-     */
-    public val NumberedPolynomial<C>.countOfVariables: Int
-        get() =
-            MutableList(lastVariable + 1) { false }.apply {
-                coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        if (deg != 0u) this[index] = true
-                    }
-                }
-            }.count { it }
-
-    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
-    //  [ListPolynomialSpace] as a context receiver
-    /**
-     * Substitutes provided arguments [arguments] into [this] polynomial.
-     */
-    public inline fun NumberedPolynomial<C>.substitute(arguments: Map<Int, C>): NumberedPolynomial<C> = substitute(ring, arguments)
-    /**
-     * Substitutes provided arguments [arguments] into [this] polynomial.
-     */
-    @JvmName("substitutePolynomial")
-    public inline fun NumberedPolynomial<C>.substitute(arguments: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> = substitute(ring, arguments)
-    /**
-     * Substitutes provided arguments [arguments] into [this] polynomial.
-     */
-    public inline fun NumberedPolynomial<C>.substitute(arguments: Buffer<C>): NumberedPolynomial<C> = substitute(ring, arguments)
-    /**
-     * Substitutes provided arguments [arguments] into [this] polynomial.
-     */
-    @JvmName("substitutePolynomial")
-    public inline fun NumberedPolynomial<C>.substitute(arguments: Buffer<NumberedPolynomial<C>>) : NumberedPolynomial<C> = substitute(ring, arguments)
-    /**
-     * Substitutes provided arguments [arguments] into [this] polynomial.
-     */
-    public inline fun NumberedPolynomial<C>.substituteFully(arguments: Buffer<C>): C = this.substituteFully(ring, arguments)
-
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun NumberedPolynomial<C>.asFunction(): (Buffer<C>) -> C = asFunctionOver(ring)
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun NumberedPolynomial<C>.asFunctionOfConstant(): (Buffer<C>) -> C = asFunctionOfConstantOver(ring)
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun NumberedPolynomial<C>.asFunctionOfPolynomial(): (Buffer<NumberedPolynomial<C>>) -> NumberedPolynomial<C> = asFunctionOfPolynomialOver(ring)
-
-    /**
-     * Evaluates value of [this] polynomial on provided [arguments].
-     */
-    public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<C>): C = substituteFully(ring, arguments)
-    /**
-     * Substitutes provided [arguments] into [this] polynomial.
-     */
-    @JvmName("invokePolynomial")
-    public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, arguments)
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
deleted file mode 100644
index 4109338fd..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.structures.Buffer
-import kotlin.jvm.JvmName
-import kotlin.math.max
-
-
-/**
- * Represents multivariate rational function that stores its numerator and denominator as [NumberedPolynomial]s.
- */
-public data class NumberedRationalFunction<C>(
-    public override val numerator: NumberedPolynomial<C>,
-    public override val denominator: NumberedPolynomial<C>
-) : RationalFunction<C, NumberedPolynomial<C>> {
-    override fun toString(): String = "NumberedRationalFunction${numerator.coefficients}/${denominator.coefficients}"
-}
-
-/**
- * Arithmetic context for univariate rational functions with numerator and denominator represented as [NumberedPolynomial]s.
- *
- * @param C the type of constants. Polynomials have them a coefficients in their terms.
- * @param A type of provided underlying ring of constants. It's [Ring] of [C].
- * @param ring underlying ring of constants of type [A].
- */
-public class NumberedRationalFunctionSpace<C, A: Ring<C>> (
-    public val ring: A,
-) :
-    RationalFunctionSpaceOverPolynomialSpace<
-            C,
-            NumberedPolynomial<C>,
-            NumberedRationalFunction<C>,
-            NumberedPolynomialSpace<C, A>,
-            >,
-    PolynomialSpaceOfFractions<
-            C,
-            NumberedPolynomial<C>,
-            NumberedRationalFunction<C>,
-            >() {
-
-    /**
-     * Underlying polynomial ring. Its polynomial operations are inherited by local polynomial operations.
-     */
-    public override val polynomialRing : NumberedPolynomialSpace<C, A> = NumberedPolynomialSpace(ring)
-    /**
-     * Constructor of rational functions (of type [NumberedRationalFunction]) from numerator and denominator (of type [NumberedPolynomial]).
-     */
-    protected override fun constructRationalFunction(
-        numerator: NumberedPolynomial<C>,
-        denominator: NumberedPolynomial<C>
-    ): NumberedRationalFunction<C> =
-        NumberedRationalFunction(numerator, denominator)
-
-    /**
-     * Maximal index (ID) of variable occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `-1`.
-     */
-    public val NumberedPolynomial<C>.lastVariable: Int get() = polynomialRing { lastVariable }
-    /**
-     * List that associates indices of variables (that appear in the polynomial in positive exponents) with their most
-     * exponents in which the variables are appeared in the polynomial.
-     *
-     * As consequence all values in the list are non-negative integers. Also, if the polynomial is constant, the list is empty.
-     * And last index of the list is [lastVariable].
-     */
-    public val NumberedPolynomial<C>.degrees: List<UInt> get() = polynomialRing { degrees }
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variable: Int): UInt = polynomialRing { degreeBy(variable) }
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public fun NumberedPolynomial<C>.degreeBy(variables: Collection<Int>): UInt = polynomialRing { degreeBy(variables) }
-    /**
-     * Count of variables occurring in the polynomial with positive power. If there is no such variable,
-     * the result is `0`.
-     */
-    public val NumberedPolynomial<C>.countOfVariables: Int get() = polynomialRing { countOfVariables }
-
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public val NumberedRationalFunction<C>.lastVariable: Int
-        get() = polynomialRing { max(numerator.lastVariable, denominator.lastVariable) }
-    /**
-     * Count of variables occurring in the rational function with positive power. If there is no such variable,
-     * the result is `0`.
-     */
-    public val NumberedRationalFunction<C>.countOfVariables: Int
-        get() =
-            MutableList(lastVariable + 1) { false }.apply {
-                numerator.coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        if (deg != 0u) this[index] = true
-                    }
-                }
-                denominator.coefficients.entries.forEach { (degs, _) ->
-                    degs.forEachIndexed { index, deg ->
-                        if (deg != 0u) this[index] = true
-                    }
-                }
-            }.count { it }
-
-    // TODO: When context receivers will be ready move all of this substitutions and invocations to utilities with
-    //  [ListPolynomialSpace] as a context receiver
-    /**
-     * Substitutes provided constant [argument] into [this] polynomial.
-     */
-    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, C>): NumberedPolynomial<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided polynomial [argument] into [this] polynomial.
-     */
-    @JvmName("substitutePolynomial")
-    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided rational function [argument] into [this] polynomial.
-     */
-    @JvmName("substituteRationalFunction")
-    public inline fun NumberedPolynomial<C>.substitute(argument: Map<Int, NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided constant [argument] into [this] rational function.
-     */
-    public inline fun NumberedRationalFunction<C>.substitute(argument: Map<Int, C>): NumberedRationalFunction<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided polynomial [argument] into [this] rational function.
-     */
-    @JvmName("substitutePolynomial")
-    public inline fun NumberedRationalFunction<C>.substitute(argument: Map<Int, NumberedPolynomial<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided rational function [argument] into [this] rational function.
-     */
-    @JvmName("substituteRationalFunction")
-    public inline fun NumberedRationalFunction<C>.substitute(argument: Map<Int, NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided constant [argument] into [this] polynomial.
-     */
-    public inline fun NumberedPolynomial<C>.substitute(argument: Buffer<C>): NumberedPolynomial<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided polynomial [argument] into [this] polynomial.
-     */
-    @JvmName("substitutePolynomial")
-    public inline fun NumberedPolynomial<C>.substitute(argument: Buffer<NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided rational function [argument] into [this] polynomial.
-     */
-    @JvmName("substituteRationalFunction")
-    public inline fun NumberedPolynomial<C>.substitute(argument: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided constant [argument] into [this] rational function.
-     */
-    public inline fun NumberedRationalFunction<C>.substitute(argument: Buffer<C>): NumberedRationalFunction<C> = substitute(ring, argument)
-    /**
-     * Substitutes provided polynomial [arguments] into [this] rational function.
-     */
-    @JvmName("substitutePolynomial")
-    public inline fun NumberedRationalFunction<C>.substitute(arguments: Buffer<NumberedPolynomial<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
-    /**
-     * Substitutes provided rational function [arguments] into [this] rational function.
-     */
-    @JvmName("substituteRationalFunction")
-    public inline fun NumberedRationalFunction<C>.substitute(arguments: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
-    /**
-     * Substitutes provided constant [arguments] into [this] polynomial.
-     */
-    public inline fun NumberedPolynomial<C>.substituteFully(arguments: Buffer<C>): C = substituteFully(ring, arguments)
-
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun NumberedPolynomial<C>.asFunction(): (Buffer<C>) -> C = asFunctionOver(ring)
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun NumberedPolynomial<C>.asFunctionOfConstant(): (Buffer<C>) -> C = asFunctionOfConstantOver(ring)
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun NumberedPolynomial<C>.asFunctionOfPolynomial(): (Buffer<NumberedPolynomial<C>>) -> NumberedPolynomial<C> = asFunctionOfPolynomialOver(ring)
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun NumberedPolynomial<C>.asFunctionOfRationalFunction(): (Buffer<NumberedRationalFunction<C>>) -> NumberedRationalFunction<C> = asFunctionOfRationalFunctionOver(ring)
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun NumberedRationalFunction<C>.asFunctionOfPolynomial(): (Buffer<NumberedPolynomial<C>>) -> NumberedRationalFunction<C> = asFunctionOfPolynomialOver(ring)
-    /**
-     * Represent [this] polynomial as a regular context-less function.
-     */
-    public inline fun NumberedRationalFunction<C>.asFunctionOfRationalFunction(): (Buffer<NumberedRationalFunction<C>>) -> NumberedRationalFunction<C> = asFunctionOfRationalFunctionOver(ring)
-
-    /**
-     * Evaluates value of [this] polynomial on provided [arguments].
-     */
-    public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<C>): C = substituteFully(ring, arguments)
-    /**
-     * Substitutes provided [arguments] into [this] polynomial.
-     */
-    @JvmName("invokePolynomial")
-    public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<NumberedPolynomial<C>>): NumberedPolynomial<C> = substitute(ring, arguments)
-    /**
-     * Substitutes provided [arguments] into [this] polynomial.
-     */
-    @JvmName("invokeRationalFunction")
-    public inline operator fun NumberedPolynomial<C>.invoke(arguments: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
-    /**
-     * Substitutes provided [arguments] into [this] rational function.
-     */
-    @JvmName("invokePolynomial")
-    public inline operator fun NumberedRationalFunction<C>.invoke(arguments: Buffer<NumberedPolynomial<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
-    /**
-     * Substitutes provided [arguments] into [this] rational function.
-     */
-    @JvmName("invokeRationalFunction")
-    public inline operator fun NumberedRationalFunction<C>.invoke(arguments: Buffer<NumberedRationalFunction<C>>): NumberedRationalFunction<C> = substitute(ring, arguments)
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
deleted file mode 100644
index 7140ba70e..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-import kotlin.js.JsName
-import kotlin.jvm.JvmName
-
-
-/**
- * Abstraction of ring of polynomials of type [P] over ring of constants of type [C].
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials.
- */
-@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
-public interface PolynomialSpace<C, P> : Ring<P> {
-    /**
-     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
-     */
-    @JvmName("plusConstantInt")
-    public operator fun C.plus(other: Int): C
-    /**
-     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
-     */
-    @JvmName("minusConstantInt")
-    public operator fun C.minus(other: Int): C
-    /**
-     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    @JvmName("timesConstantInt")
-    public operator fun C.times(other: Int): C
-
-    /**
-     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
-     */
-    @JvmName("plusIntConstant")
-    public operator fun Int.plus(other: C): C
-    /**
-     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
-     */
-    @JvmName("minusIntConstant")
-    public operator fun Int.minus(other: C): C
-    /**
-     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    @JvmName("timesIntConstant")
-    public operator fun Int.times(other: C): C
-
-    /**
-     * Converts the integer [value] to constant.
-     */
-    public fun constantNumber(value: Int): C = constantOne * value
-    /**
-     * Converts the integer to constant.
-     */
-    public fun Int.asConstant(): C = constantNumber(this)
-
-    /**
-     * Returns sum of the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public operator fun P.plus(other: Int): P = addMultipliedByDoubling(this, one, other)
-    /**
-     * Returns difference between the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public operator fun P.minus(other: Int): P = addMultipliedByDoubling(this, one, -other)
-    /**
-     * Returns product of the polynomial and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public operator fun P.times(other: Int): P = multiplyByDoubling(this, other)
-
-    /**
-     * Returns sum of the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public operator fun Int.plus(other: P): P = addMultipliedByDoubling(other, one, this)
-    /**
-     * Returns difference between the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public operator fun Int.minus(other: P): P = addMultipliedByDoubling(-other, one, this)
-    /**
-     * Returns product of the integer represented as a polynomial and the polynomial.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public operator fun Int.times(other: P): P = multiplyByDoubling(other, this)
-
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public fun number(value: Int): P = number(constantNumber(value))
-    /**
-     * Converts the integer to polynomial.
-     */
-    public fun Int.asPolynomial(): P = number(this)
-
-    /**
-     * Returns the same constant.
-     */
-    @JvmName("unaryPlusConstant")
-    @JsName("unaryPlusConstant")
-    public operator fun C.unaryPlus(): C = this
-    /**
-     * Returns negation of the constant.
-     */
-    @JvmName("unaryMinusConstant")
-    @JsName("unaryMinusConstant")
-    public operator fun C.unaryMinus(): C
-    /**
-     * Returns sum of the constants.
-     */
-    @JvmName("plusConstantConstant")
-    @JsName("plusConstantConstant")
-    public operator fun C.plus(other: C): C
-    /**
-     * Returns difference of the constants.
-     */
-    @JvmName("minusConstantConstant")
-    @JsName("minusConstantConstant")
-    public operator fun C.minus(other: C): C
-    /**
-     * Returns product of the constants.
-     */
-    @JvmName("timesConstantConstant")
-    @JsName("timesConstantConstant")
-    public operator fun C.times(other: C): C
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("powerConstant")
-    @JsName("powerConstant")
-    public fun power(arg: C, exponent: UInt) : C
-
-    /**
-     * Instance of zero constant (zero of the underlying ring).
-     */
-    public val constantZero: C
-    /**
-     * Instance of unit constant (unit of the underlying ring).
-     */
-    public val constantOne: C
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("plusConstantPolynomial")
-    public operator fun C.plus(other: P): P
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("minusConstantPolynomial")
-    public operator fun C.minus(other: P): P
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("timesConstantPolynomial")
-    public operator fun C.times(other: P): P
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("plusPolynomialConstant")
-    public operator fun P.plus(other: C): P
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("minusPolynomialConstant")
-    public operator fun P.minus(other: C): P
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("timesPolynomialConstant")
-    public operator fun P.times(other: C): P
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public fun number(value: C): P = one * value
-    /**
-     * Converts the constant to polynomial.
-     */
-    public fun C.asPolynomial(): P = number(this)
-
-    /**
-     * Returns the same polynomial.
-     */
-    public override operator fun P.unaryPlus(): P = this
-    /**
-     * Returns negation of the polynomial.
-     */
-    public override operator fun P.unaryMinus(): P
-    /**
-     * Returns sum of the polynomials.
-     */
-    public override operator fun P.plus(other: P): P
-    /**
-     * Returns difference of the polynomials.
-     */
-    public override operator fun P.minus(other: P): P
-    /**
-     * Returns product of the polynomials.
-     */
-    public override operator fun P.times(other: P): P
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    public override fun power(arg: P, exponent: UInt) : P = exponentiateBySquaring(arg, exponent)
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    public override val zero: P
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    public override val one: P
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    public val P.degree: Int
-
-    override fun add(left: P, right: P): P = left + right
-    override fun multiply(left: P, right: P): P = left * right
-}
-
-/**
- * Abstraction of ring of polynomials of type [P] over ring of constants of type [C]. It also assumes that there is
- * provided [ring] (of type [A]), that provides constant-wise operations.
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials.
- * @param A the type of algebraic structure (precisely, of ring) provided for constants.
- */
-@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface PolynomialSpaceOverRing<C, P, out A: Ring<C>> : PolynomialSpace<C, P> {
-
-    /**
-     * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
-     */
-    public val ring: A
-
-    /**
-     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
-     */
-    @JvmName("plusConstantInt")
-    public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
-    /**
-     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
-     */
-    @JvmName("minusConstantInt")
-    public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
-    /**
-     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    @JvmName("timesConstantInt")
-    public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
-
-    /**
-     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
-     */
-    @JvmName("plusIntConstant")
-    public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
-    /**
-     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
-     */
-    @JvmName("minusIntConstant")
-    public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
-    /**
-     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    @JvmName("timesIntConstant")
-    public override operator fun Int.times(other: C): C = ring { multiplyByDoubling(other, this@times) }
-
-    /**
-     * Returns negation of the constant.
-     */
-    @JvmName("unaryMinusConstant")
-    public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
-    /**
-     * Returns sum of the constants.
-     */
-    @JvmName("plusConstantConstant")
-    public override operator fun C.plus(other: C): C = ring { this@plus + other }
-    /**
-     * Returns difference of the constants.
-     */
-    @JvmName("minusConstantConstant")
-    public override operator fun C.minus(other: C): C = ring { this@minus - other }
-    /**
-     * Returns product of the constants.
-     */
-    @JvmName("timesConstantConstant")
-    public override operator fun C.times(other: C): C = ring { this@times * other }
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("powerConstant")
-    override fun power(arg: C, exponent: UInt): C = ring { power(arg, exponent) }
-
-    /**
-     * Instance of zero constant (zero of the underlying ring).
-     */
-    public override val constantZero: C get() = ring.zero
-    /**
-     * Instance of unit constant (unit of the underlying ring).
-     */
-    public override val constantOne: C get() = ring.one
-}
-
-/**
- * Abstraction of ring of polynomials of type [P] of variables of type [V] and over ring of constants of type [C].
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param V the type of variables. Polynomials have them in representations of terms.
- * @param P the type of polynomials.
- */
-@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface MultivariatePolynomialSpace<C, V, P>: PolynomialSpace<C, P> {
-    /**
-     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    @JvmName("plusVariableInt")
-    @JsName("plusVariableInt")
-    public operator fun V.plus(other: Int): P
-    /**
-     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    @JvmName("minusVariableInt")
-    @JsName("minusVariableInt")
-    public operator fun V.minus(other: Int): P
-    /**
-     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    @JvmName("timesVariableInt")
-    @JsName("timesVariableInt")
-    public operator fun V.times(other: Int): P
-
-    /**
-     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("plusIntVariable")
-    @JsName("plusIntVariable")
-    public operator fun Int.plus(other: V): P
-    /**
-     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("minusIntVariable")
-    @JsName("minusIntVariable")
-    public operator fun Int.minus(other: V): P
-    /**
-     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("timesIntVariable")
-    @JsName("timesIntVariable")
-    public operator fun Int.times(other: V): P
-
-    /**
-     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    @JvmName("plusVariableConstant")
-    @JsName("plusVariableConstant")
-    public operator fun V.plus(other: C): P
-    /**
-     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    @JvmName("minusVariableConstant")
-    @JsName("minusVariableConstant")
-    public operator fun V.minus(other: C): P
-    /**
-     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    @JvmName("timesVariableConstant")
-    @JsName("timesVariableConstant")
-    public operator fun V.times(other: C): P
-
-    /**
-     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("plusConstantVariable")
-    @JsName("plusConstantVariable")
-    public operator fun C.plus(other: V): P
-    /**
-     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("minusConstantVariable")
-    @JsName("minusConstantVariable")
-    public operator fun C.minus(other: V): P
-    /**
-     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("timesConstantVariable")
-    @JsName("timesConstantVariable")
-    public operator fun C.times(other: V): P
-
-    /**
-     * Represents the variable as a monic monomial.
-     */
-    @JvmName("unaryPlusVariable")
-    public operator fun V.unaryPlus(): P
-    /**
-     * Returns negation of representation of the variable as a monic monomial.
-     */
-    @JvmName("unaryMinusVariable")
-    public operator fun V.unaryMinus(): P
-    /**
-     * Returns sum of the variables represented as monic monomials.
-     */
-    @JvmName("plusVariableVariable")
-    public operator fun V.plus(other: V): P
-    /**
-     * Returns difference between the variables represented as monic monomials.
-     */
-    @JvmName("minusVariableVariable")
-    public operator fun V.minus(other: V): P
-    /**
-     * Returns product of the variables represented as monic monomials.
-     */
-    @JvmName("timesVariableVariable")
-    public operator fun V.times(other: V): P
-
-    /**
-     * Represents the [variable] as a monic monomial.
-     */
-    @JvmName("numberVariable")
-    public fun number(variable: V): P = +variable
-    /**
-     * Represents the variable as a monic monomial.
-     */
-    @JvmName("asPolynomialVariable")
-    public fun V.asPolynomial(): P = number(this)
-
-    /**
-     * Returns sum of the variable represented as a monic monomial and the polynomial.
-     */
-    @JvmName("plusVariablePolynomial")
-    public operator fun V.plus(other: P): P
-    /**
-     * Returns difference between the variable represented as a monic monomial and the polynomial.
-     */
-    @JvmName("minusVariablePolynomial")
-    public operator fun V.minus(other: P): P
-    /**
-     * Returns product of the variable represented as a monic monomial and the polynomial.
-     */
-    @JvmName("timesVariablePolynomial")
-    public operator fun V.times(other: P): P
-
-    /**
-     * Returns sum of the polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("plusPolynomialVariable")
-    public operator fun P.plus(other: V): P
-    /**
-     * Returns difference between the polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("minusPolynomialVariable")
-    public operator fun P.minus(other: V): P
-    /**
-     * Returns product of the polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("timesPolynomialVariable")
-    public operator fun P.times(other: V): P
-
-    /**
-     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
-     * in which they are appeared in the polynomial.
-     *
-     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
-     * And keys of the map is the same as in [variables].
-     */
-    public val P.degrees: Map<V, UInt>
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public fun P.degreeBy(variable: V): UInt = degrees.getOrElse(variable) { 0u }
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public fun P.degreeBy(variables: Collection<V>): UInt
-    /**
-     * Set of all variables that appear in the polynomial in positive exponents.
-     */
-    public val P.variables: Set<V> get() = degrees.keys
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public val P.countOfVariables: Int get() = variables.size
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
deleted file mode 100644
index 766d9ce98..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt
+++ /dev/null
@@ -1,1689 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-import kotlin.js.JsName
-import kotlin.jvm.JvmName
-
-
-/**
- * Abstraction of rational function.
- */
-public interface RationalFunction<C, P> {
-    public val numerator: P
-    public val denominator: P
-    public operator fun component1(): P = numerator
-    public operator fun component2(): P = denominator
-}
-
-/**
- * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
- * [C].
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators.
- * @param R the type of rational functions.
- */
-@Suppress("INAPPLICABLE_JVM_NAME", "PARAMETER_NAME_CHANGED_ON_OVERRIDE") // FIXME: Waiting for KT-31420
-public interface RationalFunctionSpace<C, P, R: RationalFunction<C, P>> : Ring<R> {
-    /**
-     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
-     */
-    @JvmName("plusConstantInt")
-    public operator fun C.plus(other: Int): C
-    /**
-     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
-     */
-    @JvmName("minusConstantInt")
-    public operator fun C.minus(other: Int): C
-    /**
-     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    @JvmName("timesConstantInt")
-    public operator fun C.times(other: Int): C
-
-    /**
-     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
-     */
-    @JvmName("plusIntConstant")
-    public operator fun Int.plus(other: C): C
-    /**
-     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
-     */
-    @JvmName("minusIntConstant")
-    public operator fun Int.minus(other: C): C
-    /**
-     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    @JvmName("timesIntConstant")
-    public operator fun Int.times(other: C): C
-
-    /**
-     * Converts the integer [value] to constant.
-     */
-    public fun constantNumber(value: Int): C = constantOne * value
-    /**
-     * Converts the integer to constant.
-     */
-    public fun Int.asConstant(): C = constantNumber(this)
-
-    /**
-     * Returns sum of the constant and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    @JvmName("plusPolynomialInt")
-    public operator fun P.plus(other: Int): P
-    /**
-     * Returns difference between the constant and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    @JvmName("minusPolynomialInt")
-    public operator fun P.minus(other: Int): P
-    /**
-     * Returns product of the constant and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    @JvmName("timesPolynomialInt")
-    public operator fun P.times(other: Int): P
-
-    /**
-     * Returns sum of the integer represented as a polynomial and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    @JvmName("plusIntPolynomial")
-    public operator fun Int.plus(other: P): P
-    /**
-     * Returns difference between the integer represented as a polynomial and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    @JvmName("minusIntPolynomial")
-    public operator fun Int.minus(other: P): P
-    /**
-     * Returns product of the integer represented as a polynomial and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    @JvmName("timesIntPolynomial")
-    public operator fun Int.times(other: P): P
-
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public fun polynomialNumber(value: Int): P = polynomialOne * value
-    /**
-     * Converts the integer to polynomial.
-     */
-    public fun Int.asPolynomial(): P = polynomialNumber(this)
-
-    /**
-     * Returns sum of the rational function and the integer represented as a rational function.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public operator fun R.plus(other: Int): R = addMultipliedByDoubling(this, one, other)
-    /**
-     * Returns difference between the rational function and the integer represented as a rational function.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public operator fun R.minus(other: Int): R = addMultipliedByDoubling(this, one, -other)
-    /**
-     * Returns product of the rational function and the integer represented as a rational function.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public operator fun R.times(other: Int): R = multiplyByDoubling(this, other)
-    /**
-     * Returns quotient of the rational function and the integer represented as a rational function.
-     *
-     * The operation is equivalent to creating a new rational function by preserving numerator of [this] and
-     * multiplication denominator of [this] to [other].
-     */
-    public operator fun R.div(other: Int): R = this / multiplyByDoubling(one, other)
-
-    /**
-     * Returns sum of the integer represented as a rational function and the rational function.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public operator fun Int.plus(other: R): R = addMultipliedByDoubling(other, one, this)
-    /**
-     * Returns difference between the integer represented as a rational function and the rational function.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public operator fun Int.minus(other: R): R = addMultipliedByDoubling(-other, one, this)
-    /**
-     * Returns product of the integer represented as a rational function and the rational function.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public operator fun Int.times(other: R): R = multiplyByDoubling(other, this)
-    /**
-     * Returns quotient of the integer represented as a rational function and the rational function.
-     *
-     * The operation is equivalent to creating a new rational function which numerator is [this] times denominator of
-     * [other] and which denominator is [other]'s numerator.
-     */
-    public operator fun Int.div(other: R): R = multiplyByDoubling(one / other, this)
-
-    /**
-     * Converts the integer [value] to rational function.
-     */
-    public fun number(value: Int): R = one * value
-    /**
-     * Converts the integer to rational function.
-     */
-    public fun Int.asRationalFunction(): R = number(this)
-
-    /**
-     * Returns the same constant.
-     */
-    @JvmName("unaryPlusConstant")
-    @JsName("unaryPlusConstant")
-    public operator fun C.unaryPlus(): C = this
-    /**
-     * Returns negation of the constant.
-     */
-    @JvmName("unaryMinusConstant")
-    @JsName("unaryMinusConstant")
-    public operator fun C.unaryMinus(): C
-    /**
-     * Returns sum of the constants.
-     */
-    @JvmName("plusConstantConstant")
-    @JsName("plusConstantConstant")
-    public operator fun C.plus(other: C): C
-    /**
-     * Returns difference of the constants.
-     */
-    @JvmName("minusConstantConstant")
-    @JsName("minusConstantConstant")
-    public operator fun C.minus(other: C): C
-    /**
-     * Returns product of the constants.
-     */
-    @JvmName("timesConstantConstant")
-    @JsName("timesConstantConstant")
-    public operator fun C.times(other: C): C
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("powerConstant")
-    @JsName("powerConstant")
-    public fun power(arg: C, exponent: UInt) : C
-
-    /**
-     * Instance of zero constant (zero of the underlying ring).
-     */
-    public val constantZero: C
-    /**
-     * Instance of unit constant (unit of the underlying ring).
-     */
-    public val constantOne: C
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("plusConstantPolynomial")
-    public operator fun C.plus(other: P): P
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("minusConstantPolynomial")
-    public operator fun C.minus(other: P): P
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("timesConstantPolynomial")
-    public operator fun C.times(other: P): P
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("plusPolynomialConstant")
-    public operator fun P.plus(other: C): P
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("minusPolynomialConstant")
-    public operator fun P.minus(other: C): P
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("timesPolynomialConstant")
-    public operator fun P.times(other: C): P
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public fun polynomialNumber(value: C): P = polynomialOne * value
-    /**
-     * Converts the constant to polynomial.
-     */
-    public fun C.asPolynomial(): P = polynomialNumber(this)
-
-    /**
-     * Returns the same polynomial.
-     */
-    @JvmName("unaryPlusPolynomial")
-    public operator fun P.unaryPlus(): P = this
-    /**
-     * Returns negation of the polynomial.
-     */
-    @JvmName("unaryMinusPolynomial")
-    public operator fun P.unaryMinus(): P
-    /**
-     * Returns sum of the polynomials.
-     */
-    @JvmName("plusPolynomialPolynomial")
-    public operator fun P.plus(other: P): P
-    /**
-     * Returns difference of the polynomials.
-     */
-    @JvmName("minusPolynomialPolynomial")
-    public operator fun P.minus(other: P): P
-    /**
-     * Returns product of the polynomials.
-     */
-    @JvmName("timesPolynomialPolynomial")
-    public operator fun P.times(other: P): P
-    /**
-     * Returns quotient of the polynomials as rational function.
-     */
-    @JvmName("divPolynomialPolynomial")
-    public operator fun P.div(other: P): R
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("powerPolynomial")
-    public fun power(arg: P, exponent: UInt) : P
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    public val polynomialZero: P
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    public val polynomialOne: P
-
-    /**
-     * Returns sum of the constant represented as a rational function and the rational function.
-     */
-    @JvmName("plusConstantRational")
-    public operator fun C.plus(other: R): R
-    /**
-     * Returns difference between the constant represented as a polynomial and the rational function.
-     */
-    @JvmName("minusConstantRational")
-    public operator fun C.minus(other: R): R
-    /**
-     * Returns product of the constant represented as a polynomial and the rational function.
-     */
-    @JvmName("timesConstantRational")
-    public operator fun C.times(other: R): R
-    /**
-     * Returns quotient of the constant represented as a polynomial and the rational function.
-     */
-    @JvmName("divConstantRational")
-    public operator fun C.div(other: R): R
-
-    /**
-     * Returns sum of the rational function and the constant represented as a rational function.
-     */
-    @JvmName("plusRationalConstant")
-    public operator fun R.plus(other: C): R
-    /**
-     * Returns difference between the rational function and the constant represented as a rational function.
-     */
-    @JvmName("minusRationalConstant")
-    public operator fun R.minus(other: C): R
-    /**
-     * Returns product of the rational function and the constant represented as a rational function.
-     */
-    @JvmName("timesRationalConstant")
-    public operator fun R.times(other: C): R
-    /**
-     * Returns quotient of the rational function and the constant represented as a rational function.
-     */
-    @JvmName("divRationalConstant")
-    public operator fun R.div(other: C): R
-
-    /**
-     * Converts the constant [value] to rational function.
-     */
-    @JvmName("numberConstant")
-    public fun number(value: C): R = one * value
-    /**
-     * Converts the constant to rational function.
-     */
-    @JvmName("asRationalFunctionConstant")
-    public fun C.asRationalFunction(): R = number(this)
-
-    /**
-     * Returns sum of the polynomial represented as a rational function and the rational function.
-     */
-    @JvmName("plusPolynomialRational")
-    public operator fun P.plus(other: R): R
-    /**
-     * Returns difference between the polynomial represented as a polynomial and the rational function.
-     */
-    @JvmName("minusPolynomialRational")
-    public operator fun P.minus(other: R): R
-    /**
-     * Returns product of the polynomial represented as a polynomial and the rational function.
-     */
-    @JvmName("timesPolynomialRational")
-    public operator fun P.times(other: R): R
-    /**
-     * Returns quotient of the polynomial represented as a polynomial and the rational function.
-     */
-    @JvmName("divPolynomialRational")
-    public operator fun P.div(other: R): R
-
-    /**
-     * Returns sum of the rational function and the polynomial represented as a rational function.
-     */
-    @JvmName("plusRationalPolynomial")
-    public operator fun R.plus(other: P): R
-    /**
-     * Returns difference between the rational function and the polynomial represented as a rational function.
-     */
-    @JvmName("minusRationalPolynomial")
-    public operator fun R.minus(other: P): R
-    /**
-     * Returns product of the rational function and the polynomial represented as a rational function.
-     */
-    @JvmName("timesRationalPolynomial")
-    public operator fun R.times(other: P): R
-    /**
-     * Returns quotient of the rational function and the polynomial represented as a rational function.
-     */
-    @JvmName("divRationalPolynomial")
-    public operator fun R.div(other: P): R
-
-    /**
-     * Converts the polynomial [value] to rational function.
-     */
-    @JvmName("numberPolynomial")
-    public fun number(value: P): R = one * value
-    /**
-     * Converts the polynomial to rational function.
-     */
-    @JvmName("asRationalFunctionPolynomial")
-    public fun P.asRationalFunction(): R = number(this)
-
-    /**
-     * Returns the same rational function.
-     */
-    public override operator fun R.unaryPlus(): R = this
-    /**
-     * Returns negation of the rational function.
-     */
-    public override operator fun R.unaryMinus(): R
-    /**
-     * Returns sum of the rational functions.
-     */
-    public override operator fun R.plus(other: R): R
-    /**
-     * Returns difference of the rational functions.
-     */
-    public override operator fun R.minus(other: R): R
-    /**
-     * Returns product of the rational functions.
-     */
-    public override operator fun R.times(other: R): R
-    /**
-     * Returns quotient of the rational functions.
-     */
-    public operator fun R.div(other: R): R
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    public override fun power(arg: R, exponent: UInt) : R = exponentiateBySquaring(arg, exponent)
-
-    /**
-     * Instance of zero rational function (zero of the rational functions ring).
-     */
-    public override val zero: R
-    /**
-     * Instance of unit polynomial (unit of the rational functions ring).
-     */
-    public override val one: R
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    public val P.degree: Int
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    public val R.numeratorDegree: Int get() = numerator.degree
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    public val R.denominatorDegree: Int get() = denominator.degree
-
-    override fun add(left: R, right: R): R = left + right
-    override fun multiply(left: R, right: R): R = left * right
-}
-
-/**
- * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
- * [C]. It also assumes that there is provided [ring] (of type [A]), that provides constant-wise operations.
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
- * @param R the type of rational functions.
- * @param A the type of algebraic structure (precisely, of ring) provided for constants.
- */
-@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface RationalFunctionSpaceOverRing<
-        C,
-        P,
-        R: RationalFunction<C, P>,
-        out A: Ring<C>
-        > : RationalFunctionSpace<C, P, R> {
-
-    /**
-     * Underlying ring of constants. Its operations on constants are inherited by local operations on constants.
-     */
-    public val ring: A
-
-    /**
-     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
-     */
-    @JvmName("plusConstantInt")
-    public override operator fun C.plus(other: Int): C = ring { addMultipliedByDoubling(this@plus, one, other) }
-    /**
-     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
-     */
-    @JvmName("minusConstantInt")
-    public override operator fun C.minus(other: Int): C = ring { addMultipliedByDoubling(this@minus, one, -other) }
-    /**
-     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    @JvmName("timesConstantInt")
-    public override operator fun C.times(other: Int): C = ring { multiplyByDoubling(this@times, other) }
-
-    /**
-     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
-     */
-    @JvmName("plusIntConstant")
-    public override operator fun Int.plus(other: C): C = ring { addMultipliedByDoubling(other, one, this@plus) }
-    /**
-     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
-     */
-    @JvmName("minusIntConstant")
-    public override operator fun Int.minus(other: C): C = ring { addMultipliedByDoubling(-other, one, this@minus) }
-    /**
-     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    @JvmName("timesIntConstant")
-    public override operator fun Int.times(other: C): C = ring { multiplyByDoubling(other, this@times) }
-
-    /**
-     * Returns the same constant.
-     */
-    @JvmName("unaryPlusConstant")
-    public override operator fun C.unaryPlus(): C = ring { +this@unaryPlus }
-    /**
-     * Returns negation of the constant.
-     */
-    @JvmName("unaryMinusConstant")
-    public override operator fun C.unaryMinus(): C = ring { -this@unaryMinus }
-    /**
-     * Returns sum of the constants.
-     */
-    @JvmName("plusConstantConstant")
-    public override operator fun C.plus(other: C): C = ring { this@plus + other }
-    /**
-     * Returns difference of the constants.
-     */
-    @JvmName("minusConstantConstant")
-    public override operator fun C.minus(other: C): C = ring { this@minus - other }
-    /**
-     * Returns product of the constants.
-     */
-    @JvmName("timesConstantConstant")
-    public override operator fun C.times(other: C): C = ring { this@times * other }
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("powerConstant")
-    public override fun power(arg: C, exponent: UInt) : C = ring { power(arg, exponent) }
-
-    /**
-     * Instance of zero constant (zero of the underlying ring).
-     */
-    public override val constantZero: C get() = ring.zero
-    /**
-     * Instance of unit constant (unit of the underlying ring).
-     */
-    public override val constantOne: C get() = ring.one
-}
-
-/**
- * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
- * [C]. It also assumes that there is provided [polynomialRing] (of type [AP]), that provides constant- and
- * polynomial-wise operations.
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
- * @param R the type of rational functions.
- * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
- */
-@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface RationalFunctionSpaceOverPolynomialSpace<
-        C,
-        P,
-        R: RationalFunction<C, P>,
-        out AP: PolynomialSpace<C, P>,
-        > : RationalFunctionSpace<C, P, R> {
-
-    /**
-     * Underlying polynomial ring. Its polynomial operations are inherited by local polynomial operations.
-     */
-    public val polynomialRing: AP
-
-    /**
-     * Returns sum of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to adding [other] copies of unit of underlying ring to [this].
-     */
-    @JvmName("plusConstantInt")
-    public override operator fun C.plus(other: Int): C = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to subtraction [other] copies of unit of underlying ring from [this].
-     */
-    @JvmName("minusConstantInt")
-    public override operator fun C.minus(other: Int): C = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the constant and the integer represented as a constant (member of underlying ring).
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    @JvmName("timesConstantInt")
-    public override operator fun C.times(other: Int): C = polynomialRing { this@times * other }
-
-    /**
-     * Returns sum of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit of underlying ring to [other].
-     */
-    @JvmName("plusIntConstant")
-    public override operator fun Int.plus(other: C): C = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit of underlying ring from [other].
-     */
-    @JvmName("minusIntConstant")
-    public override operator fun Int.minus(other: C): C = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the integer represented as a constant (member of underlying ring) and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    @JvmName("timesIntConstant")
-    public override operator fun Int.times(other: C): C = polynomialRing { this@times * other }
-
-    /**
-     * Converts the integer [value] to constant.
-     */
-    public override fun constantNumber(value: Int): C = polynomialRing { constantNumber(value) }
-    /**
-     * Converts the integer to constant.
-     */
-    override fun Int.asConstant(): C = polynomialRing { asConstant() }
-
-    /**
-     * Returns sum of the constant and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    @JvmName("plusPolynomialInt")
-    public override operator fun P.plus(other: Int): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the constant and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    @JvmName("minusPolynomialInt")
-    public override operator fun P.minus(other: Int): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the constant and the integer represented as a polynomial.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    @JvmName("timesPolynomialInt")
-    public override operator fun P.times(other: Int): P = polynomialRing { this@times * other }
-
-    /**
-     * Returns sum of the integer represented as a polynomial and the constant.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    @JvmName("plusIntPolynomial")
-    public override operator fun Int.plus(other: P): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the integer represented as a polynomial and the constant.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    @JvmName("minusIntPolynomial")
-    public override operator fun Int.minus(other: P): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the integer represented as a polynomial and the constant.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    @JvmName("timesIntPolynomial")
-    public override operator fun Int.times(other: P): P = polynomialRing { this@times * other }
-
-    /**
-     * Converts the integer [value] to polynomial.
-     */
-    public override fun polynomialNumber(value: Int): P = polynomialRing { number(value) }
-    /**
-     * Converts the integer to polynomial.
-     */
-    public override fun Int.asPolynomial(): P = polynomialRing { asPolynomial() }
-
-    /**
-     * Returns the same constant.
-     */
-    @JvmName("unaryPlusConstant")
-    public override operator fun C.unaryPlus(): C = polynomialRing { +this@unaryPlus }
-    /**
-     * Returns negation of the constant.
-     */
-    @JvmName("unaryMinusConstant")
-    public override operator fun C.unaryMinus(): C = polynomialRing { -this@unaryMinus }
-    /**
-     * Returns sum of the constants.
-     */
-    @JvmName("plusConstantConstant")
-    public override operator fun C.plus(other: C): C = polynomialRing { this@plus + other }
-    /**
-     * Returns difference of the constants.
-     */
-    @JvmName("minusConstantConstant")
-    public override operator fun C.minus(other: C): C = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the constants.
-     */
-    @JvmName("timesConstantConstant")
-    public override operator fun C.times(other: C): C = polynomialRing { this@times * other }
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("powerConstant")
-    public override fun power(arg: C, exponent: UInt) : C = polynomialRing { power(arg, exponent) }
-
-    /**
-     * Instance of zero constant (zero of the underlying ring).
-     */
-    public override val constantZero: C get() = polynomialRing.constantZero
-    /**
-     * Instance of unit constant (unit of the underlying ring).
-     */
-    public override val constantOne: C get() = polynomialRing.constantOne
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("plusConstantPolynomial")
-    public override operator fun C.plus(other: P): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("minusConstantPolynomial")
-    public override operator fun C.minus(other: P): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("timesConstantPolynomial")
-    public override operator fun C.times(other: P): P = polynomialRing { this@times * other }
-
-    /**
-     * Returns sum of the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("plusPolynomialConstant")
-    public override operator fun P.plus(other: C): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("minusPolynomialConstant")
-    public override operator fun P.minus(other: C): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the constant represented as a polynomial and the polynomial.
-     */
-    @JvmName("timesPolynomialConstant")
-    public override operator fun P.times(other: C): P = polynomialRing { this@times * other }
-
-    /**
-     * Converts the constant [value] to polynomial.
-     */
-    public override fun polynomialNumber(value: C): P = polynomialRing { number(value) }
-    /**
-     * Converts the constant to polynomial.
-     */
-    public override fun C.asPolynomial(): P = polynomialRing { asPolynomial() }
-
-    /**
-     * Returns the same polynomial.
-     */
-    @JvmName("unaryPlusPolynomial")
-    public override operator fun P.unaryPlus(): P = polynomialRing { +this@unaryPlus }
-    /**
-     * Returns negation of the polynomial.
-     */
-    @JvmName("unaryMinusPolynomial")
-    public override operator fun P.unaryMinus(): P = polynomialRing { -this@unaryMinus }
-    /**
-     * Returns sum of the polynomials.
-     */
-    @JvmName("plusPolynomialPolynomial")
-    public override operator fun P.plus(other: P): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference of the polynomials.
-     */
-    @JvmName("minusPolynomialPolynomial")
-    public override operator fun P.minus(other: P): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the polynomials.
-     */
-    @JvmName("timesPolynomialPolynomial")
-    public override operator fun P.times(other: P): P = polynomialRing { this@times * other }
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    @JvmName("powerPolynomial")
-    public override fun power(arg: P, exponent: UInt) : P = polynomialRing { power(arg, exponent) }
-
-    /**
-     * Instance of zero polynomial (zero of the polynomial ring).
-     */
-    public override val polynomialZero: P get() = polynomialRing.zero
-    /**
-     * Instance of unit polynomial (unit of the polynomial ring).
-     */
-    public override val polynomialOne: P get() = polynomialRing.one
-
-    /**
-     * Degree of the polynomial, [see also](https://en.wikipedia.org/wiki/Degree_of_a_polynomial). If the polynomial is
-     * zero, degree is -1.
-     */
-    public override val P.degree: Int get() = polynomialRing { this@degree.degree }
-}
-
-/**
- * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] and constants of type
- * [C]. It also assumes that there is provided constructor [constructRationalFunction] of rational functions from
- * polynomial numerator and denominator.
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
- * @param R the type of rational functions.
- */
-@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public abstract class PolynomialSpaceOfFractions<
-        C,
-        P,
-        R: RationalFunction<C, P>,
-        > : RationalFunctionSpace<C, P, R> {
-
-    /**
-     * Constructor of rational functions (of type [R]) from numerator and denominator (of type [P]).
-     */
-    protected abstract fun constructRationalFunction(numerator: P, denominator: P = polynomialOne) : R
-
-    /**
-     * Returns sum of the rational function and the integer represented as a rational function.
-     *
-     * The operation is equivalent to adding [other] copies of unit polynomial to [this].
-     */
-    public override operator fun R.plus(other: Int): R =
-        constructRationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the rational function and the integer represented as a rational function.
-     *
-     * The operation is equivalent to subtraction [other] copies of unit polynomial from [this].
-     */
-    public override operator fun R.minus(other: Int): R =
-        constructRationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the rational function and the integer represented as a rational function.
-     *
-     * The operation is equivalent to sum of [other] copies of [this].
-     */
-    public override operator fun R.times(other: Int): R =
-        constructRationalFunction(
-            numerator * other,
-            denominator
-        )
-    /**
-     * Returns quotient of the rational function and the integer represented as a rational function.
-     *
-     * The operation is equivalent to creating a new rational function by preserving numerator of [this] and
-     * multiplication denominator of [this] to [other].
-     */
-    public override operator fun R.div(other: Int): R =
-        constructRationalFunction(
-            numerator,
-            denominator * other
-        )
-
-    /**
-     * Returns sum of the integer represented as a rational function and the rational function.
-     *
-     * The operation is equivalent to adding [this] copies of unit polynomial to [other].
-     */
-    public override operator fun Int.plus(other: R): R =
-        constructRationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the integer represented as a rational function and the rational function.
-     *
-     * The operation is equivalent to subtraction [this] copies of unit polynomial from [other].
-     */
-    public override operator fun Int.minus(other: R): R =
-        constructRationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the integer represented as a rational function and the rational function.
-     *
-     * The operation is equivalent to sum of [this] copies of [other].
-     */
-    public override operator fun Int.times(other: R): R =
-        constructRationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns quotient of the integer represented as a rational function and the rational function.
-     *
-     * The operation is equivalent to creating a new rational function which numerator is [this] times denominator of
-     * [other] and which denominator is [other]'s numerator.
-     */
-    public override operator fun Int.div(other: R): R =
-        constructRationalFunction(
-            this * other.denominator,
-            other.numerator
-        )
-
-    /**
-     * Converts the integer [value] to rational function.
-     */
-    public override fun number(value: Int): R = constructRationalFunction(polynomialNumber(value))
-
-    /**
-     * Returns quotient of the polynomials as rational function.
-     */
-    @JvmName("divPolynomialPolynomial")
-    public override operator fun P.div(other: P): R = constructRationalFunction(this, other)
-
-    /**
-     * Returns sum of the constant represented as a rational function and the rational function.
-     */
-    @JvmName("plusConstantRational")
-    public override operator fun C.plus(other: R): R =
-        constructRationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the constant represented as a polynomial and the rational function.
-     */
-    @JvmName("minusConstantRational")
-    public override operator fun C.minus(other: R): R =
-        constructRationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the constant represented as a polynomial and the rational function.
-     */
-    @JvmName("timesConstantRational")
-    public override operator fun C.times(other: R): R =
-        constructRationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns quotient of the constant represented as a polynomial and the rational function.
-     */
-    @JvmName("divConstantRational")
-    public override operator fun C.div(other: R): R =
-        constructRationalFunction(
-            this * other.denominator,
-            other.numerator
-        )
-
-    /**
-     * Returns sum of the constant represented as a rational function and the rational function.
-     */
-    @JvmName("plusRationalConstant")
-    public override operator fun R.plus(other: C): R =
-        constructRationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the constant represented as a rational function and the rational function.
-     */
-    @JvmName("minusRationalConstant")
-    public override operator fun R.minus(other: C): R =
-        constructRationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the constant represented as a rational function and the rational function.
-     */
-    @JvmName("timesRationalConstant")
-    public override operator fun R.times(other: C): R =
-        constructRationalFunction(
-            numerator * other,
-            denominator
-        )
-    /**
-     * Returns quotient of the rational function and the constant represented as a rational function.
-     */
-    @JvmName("divRationalConstant")
-    public override operator fun R.div(other: C): R =
-        constructRationalFunction(
-            numerator,
-            denominator * other
-        )
-
-    /**
-     * Converts the constant [value] to rational function.
-     */
-    @JvmName("numberConstant")
-    public override fun number(value: C): R = constructRationalFunction(polynomialNumber(value))
-
-    /**
-     * Returns sum of the polynomial represented as a rational function and the rational function.
-     */
-    @JvmName("plusPolynomialRational")
-    public override operator fun P.plus(other: R): R =
-        constructRationalFunction(
-            other.denominator * this + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the polynomial represented as a polynomial and the rational function.
-     */
-    @JvmName("minusPolynomialRational")
-    public override operator fun P.minus(other: R): R =
-        constructRationalFunction(
-            other.denominator * this - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the polynomial represented as a polynomial and the rational function.
-     */
-    @JvmName("timesPolynomialRational")
-    public override operator fun P.times(other: R): R =
-        constructRationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns quotient of the polynomial represented as a polynomial and the rational function.
-     */
-    @JvmName("divPolynomialRational")
-    public override operator fun P.div(other: R): R =
-        constructRationalFunction(
-            this * other.denominator,
-            other.numerator
-        )
-
-    /**
-     * Returns sum of the polynomial represented as a rational function and the rational function.
-     */
-    @JvmName("plusRationalPolynomial")
-    public override operator fun R.plus(other: P): R =
-        constructRationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the polynomial represented as a rational function and the rational function.
-     */
-    @JvmName("minusRationalPolynomial")
-    public override operator fun R.minus(other: P): R =
-        constructRationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the polynomial represented as a rational function and the rational function.
-     */
-    @JvmName("timesRationalPolynomial")
-    public override operator fun R.times(other: P): R =
-        constructRationalFunction(
-            numerator * other,
-            denominator
-        )
-    /**
-     * Returns quotient of the rational function and the polynomial represented as a rational function.
-     */
-    @JvmName("divRationalPolynomial")
-    public override operator fun R.div(other: P): R =
-        constructRationalFunction(
-            numerator,
-            denominator * other
-        )
-
-    /**
-     * Converts the polynomial [value] to rational function.
-     */
-    @JvmName("numberPolynomial")
-    public override fun number(value: P): R = constructRationalFunction(value)
-
-    /**
-     * Returns negation of the rational function.
-     */
-    public override operator fun R.unaryMinus(): R = constructRationalFunction(-numerator, denominator)
-    /**
-     * Returns sum of the rational functions.
-     */
-    public override operator fun R.plus(other: R): R =
-        constructRationalFunction(
-            numerator * other.denominator + denominator * other.numerator,
-            denominator * other.denominator
-        )
-    /**
-     * Returns difference of the rational functions.
-     */
-    public override operator fun R.minus(other: R): R =
-        constructRationalFunction(
-            numerator * other.denominator - denominator * other.numerator,
-            denominator * other.denominator
-        )
-    /**
-     * Returns product of the rational functions.
-     */
-    public override operator fun R.times(other: R): R =
-        constructRationalFunction(
-            numerator * other.numerator,
-            denominator * other.denominator
-        )
-    /**
-     * Returns quotient of the rational functions.
-     */
-    public override operator fun R.div(other: R): R =
-        constructRationalFunction(
-            numerator * other.denominator,
-            denominator * other.numerator
-        )
-    /**
-     * Raises [arg] to the integer power [exponent].
-     */
-    public override fun power(arg: R, exponent: UInt): R =
-        constructRationalFunction(
-            power(arg.numerator, exponent),
-            power(arg.denominator, exponent),
-        )
-
-    /**
-     * Instance of zero rational function (zero of the rational functions ring).
-     */
-    public override val zero: R by lazy { constructRationalFunction(polynomialZero) }
-
-    /**
-     * Instance of unit polynomial (unit of the rational functions ring).
-     */
-    public override val one: R by lazy { constructRationalFunction(polynomialOne) }
-}
-
-/**
- * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] of variables of type
- * [V] and over ring of constants of type [C].
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param V the type of variables. Polynomials have them in representations of terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
- * @param R the type of rational functions.
- */
-@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface MultivariateRationalFunctionSpace<
-        C,
-        V,
-        P,
-        R: RationalFunction<C, P>
-        >: RationalFunctionSpace<C, P, R> {
-    /**
-     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    @JvmName("plusVariableInt")
-    @JsName("plusVariableInt")
-    public operator fun V.plus(other: Int): P
-    /**
-     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    @JvmName("minusVariableInt")
-    @JsName("minusVariableInt")
-    public operator fun V.minus(other: Int): P
-    /**
-     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    @JvmName("timesVariableInt")
-    @JsName("timesVariableInt")
-    public operator fun V.times(other: Int): P
-
-    /**
-     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("plusIntVariable")
-    @JsName("plusIntVariable")
-    public operator fun Int.plus(other: V): P
-    /**
-     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("minusIntVariable")
-    @JsName("minusIntVariable")
-    public operator fun Int.minus(other: V): P
-    /**
-     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("timesIntVariable")
-    @JsName("timesIntVariable")
-    public operator fun Int.times(other: V): P
-
-    /**
-     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    @JvmName("plusVariableConstant")
-    @JsName("plusVariableConstant")
-    public operator fun V.plus(other: C): P
-    /**
-     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    @JvmName("minusVariableConstant")
-    @JsName("minusVariableConstant")
-    public operator fun V.minus(other: C): P
-    /**
-     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    @JvmName("timesVariableConstant")
-    @JsName("timesVariableConstant")
-    public operator fun V.times(other: C): P
-
-    /**
-     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("plusConstantVariable")
-    @JsName("plusConstantVariable")
-    public operator fun C.plus(other: V): P
-    /**
-     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("minusConstantVariable")
-    @JsName("minusConstantVariable")
-    public operator fun C.minus(other: V): P
-    /**
-     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("timesConstantVariable")
-    @JsName("timesConstantVariable")
-    public operator fun C.times(other: V): P
-
-    /**
-     * Represents the variable as a monic monomial.
-     */
-    @JvmName("unaryPlusVariable")
-    @JsName("unaryPlusVariable")
-    public operator fun V.unaryPlus(): P
-    /**
-     * Returns negation of representation of the variable as a monic monomial.
-     */
-    @JvmName("unaryMinusVariable")
-    @JsName("unaryMinusVariable")
-    public operator fun V.unaryMinus(): P
-    /**
-     * Returns sum of the variables represented as monic monomials.
-     */
-    @JvmName("plusVariableVariable")
-    @JsName("plusVariableVariable")
-    public operator fun V.plus(other: V): P
-    /**
-     * Returns difference between the variables represented as monic monomials.
-     */
-    @JvmName("minusVariableVariable")
-    @JsName("minusVariableVariable")
-    public operator fun V.minus(other: V): P
-    /**
-     * Returns product of the variables represented as monic monomials.
-     */
-    @JvmName("timesVariableVariable")
-    @JsName("timesVariableVariable")
-    public operator fun V.times(other: V): P
-
-    /**
-     * Represents the [variable] as a monic monomial.
-     */
-    @JvmName("polynomialNumberVariable")
-    public fun polynomialNumber(variable: V): P = +variable
-    /**
-     * Represents the variable as a monic monomial.
-     */
-    @JvmName("asPolynomialVariable")
-    public fun V.asPolynomial(): P = polynomialNumber(this)
-
-    /**
-     * Represents the [variable] as a rational function.
-     */
-    @JvmName("numberVariable")
-    @JsName("numberVariable")
-    public fun number(variable: V): R = number(polynomialNumber(variable))
-    /**
-     * Represents the variable as a rational function.
-     */
-    @JvmName("asRationalFunctionVariable")
-    @JsName("asRationalFunctionVariable")
-    public fun V.asRationalFunction(): R = number(this)
-
-    /**
-     * Returns sum of the variable represented as a monic monomial and the polynomial.
-     */
-    @JvmName("plusVariablePolynomial")
-    public operator fun V.plus(other: P): P
-    /**
-     * Returns difference between the variable represented as a monic monomial and the polynomial.
-     */
-    @JvmName("minusVariablePolynomial")
-    public operator fun V.minus(other: P): P
-    /**
-     * Returns product of the variable represented as a monic monomial and the polynomial.
-     */
-    @JvmName("timesVariablePolynomial")
-    public operator fun V.times(other: P): P
-
-    /**
-     * Returns sum of the polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("plusPolynomialVariable")
-    public operator fun P.plus(other: V): P
-    /**
-     * Returns difference between the polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("minusPolynomialVariable")
-    public operator fun P.minus(other: V): P
-    /**
-     * Returns product of the polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("timesPolynomialVariable")
-    public operator fun P.times(other: V): P
-
-    /**
-     * Returns sum of the variable represented as a rational function and the rational function.
-     */
-    @JvmName("plusVariableRational")
-    public operator fun V.plus(other: R): R
-    /**
-     * Returns difference between the variable represented as a rational function and the rational function.
-     */
-    @JvmName("minusVariableRational")
-    public operator fun V.minus(other: R): R
-    /**
-     * Returns product of the variable represented as a rational function and the rational function.
-     */
-    @JvmName("timesVariableRational")
-    public operator fun V.times(other: R): R
-
-    /**
-     * Returns sum of the rational function and the variable represented as a rational function.
-     */
-    @JvmName("plusRationalVariable")
-    public operator fun R.plus(other: V): R
-    /**
-     * Returns difference between the rational function and the variable represented as a rational function.
-     */
-    @JvmName("minusRationalVariable")
-    public operator fun R.minus(other: V): R
-    /**
-     * Returns product of the rational function and the variable represented as a rational function.
-     */
-    @JvmName("timesRationalVariable")
-    public operator fun R.times(other: V): R
-
-    /**
-     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
-     * in which they are appeared in the polynomial.
-     *
-     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
-     * And keys of the map is the same as in [variables].
-     */
-    public val P.degrees: Map<V, UInt>
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public fun P.degreeBy(variable: V): UInt = degrees.getOrElse(variable) { 0u }
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public fun P.degreeBy(variables: Collection<V>): UInt
-    /**
-     * Set of all variables that appear in the polynomial in positive exponents.
-     */
-    public val P.variables: Set<V> get() = degrees.keys
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public val P.countOfVariables: Int get() = variables.size
-
-    /**
-     * Set of all variables that appear in the polynomial in positive exponents.
-     */
-    public val R.variables: Set<V> get() = numerator.variables union denominator.variables
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public val R.countOfVariables: Int get() = variables.size
-}
-
-/**
- * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] of variables of type
- * [V] and over ring of constants of type [C]. It also assumes that there is provided [polynomialRing] (of type [AP]),
- * that provides constant-, variable- and polynomial-wise operations.
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param V the type of variables. Polynomials have them in representations of terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
- * @param R the type of rational functions.
- * @param AP the type of algebraic structure (precisely, of ring) provided for polynomials.
- */
-@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public interface MultivariateRationalFunctionSpaceOverMultivariatePolynomialSpace<
-        C,
-        V,
-        P,
-        R: RationalFunction<C, P>,
-        out AP: MultivariatePolynomialSpace<C, V, P>,
-        > : RationalFunctionSpaceOverPolynomialSpace<C, P, R, AP>, MultivariateRationalFunctionSpace<C, V, P, R> {
-    /**
-     * Returns sum of the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    @JvmName("plusVariableInt")
-    public override operator fun V.plus(other: Int): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    @JvmName("minusVariableInt")
-    public override operator fun V.minus(other: Int): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the variable represented as a monic monomial and the integer represented as a constant polynomial.
-     */
-    @JvmName("timesVariableInt")
-    public override operator fun V.times(other: Int): P = polynomialRing { this@times * other }
-
-    /**
-     * Returns sum of the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("plusIntVariable")
-    public override operator fun Int.plus(other: V): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("minusIntVariable")
-    public override operator fun Int.minus(other: V): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the integer represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("timesIntVariable")
-    public override operator fun Int.times(other: V): P = polynomialRing { this@times * other }
-
-    /**
-     * Returns sum of the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    @JvmName("plusVariableConstant")
-    public override operator fun V.plus(other: C): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    @JvmName("minusVariableConstant")
-    public override operator fun V.minus(other: C): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the variable represented as a monic monomial and the constant represented as a constant polynomial.
-     */
-    @JvmName("timesVariableConstant")
-    public override operator fun V.times(other: C): P = polynomialRing { this@times * other }
-
-    /**
-     * Returns sum of the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("plusConstantVariable")
-    public override operator fun C.plus(other: V): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("minusConstantVariable")
-    public override operator fun C.minus(other: V): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the constant represented as a constant polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("timesConstantVariable")
-    public override operator fun C.times(other: V): P = polynomialRing { this@times * other }
-
-    /**
-     * Represents the variable as a monic monomial.
-     */
-    @JvmName("unaryPlusVariable")
-    public override operator fun V.unaryPlus(): P = polynomialRing { +this@unaryPlus }
-    /**
-     * Returns negation of representation of the variable as a monic monomial.
-     */
-    @JvmName("unaryMinusVariable")
-    public override operator fun V.unaryMinus(): P = polynomialRing { -this@unaryMinus }
-    /**
-     * Returns sum of the variables represented as monic monomials.
-     */
-    @JvmName("plusVariableVariable")
-    public override operator fun V.plus(other: V): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the variables represented as monic monomials.
-     */
-    @JvmName("minusVariableVariable")
-    public override operator fun V.minus(other: V): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the variables represented as monic monomials.
-     */
-    @JvmName("timesVariableVariable")
-    public override operator fun V.times(other: V): P = polynomialRing { this@times * other }
-
-    /**
-     * Represents the [variable] as a monic monomial.
-     */
-    @JvmName("polynomialNumberVariable")
-    public override fun polynomialNumber(variable: V): P = polynomialRing { number(variable) }
-    /**
-     * Represents the variable as a monic monomial.
-     */
-    @JvmName("asPolynomialVariable")
-    public override fun V.asPolynomial(): P = polynomialRing { this@asPolynomial.asPolynomial() }
-
-    /**
-     * Returns sum of the variable represented as a monic monomial and the polynomial.
-     */
-    @JvmName("plusVariablePolynomial")
-    public override operator fun V.plus(other: P): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the variable represented as a monic monomial and the polynomial.
-     */
-    @JvmName("minusVariablePolynomial")
-    public override operator fun V.minus(other: P): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the variable represented as a monic monomial and the polynomial.
-     */
-    @JvmName("timesVariablePolynomial")
-    public override operator fun V.times(other: P): P = polynomialRing { this@times * other }
-
-    /**
-     * Returns sum of the polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("plusPolynomialVariable")
-    public override operator fun P.plus(other: V): P = polynomialRing { this@plus + other }
-    /**
-     * Returns difference between the polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("minusPolynomialVariable")
-    public override operator fun P.minus(other: V): P = polynomialRing { this@minus - other }
-    /**
-     * Returns product of the polynomial and the variable represented as a monic monomial.
-     */
-    @JvmName("timesPolynomialVariable")
-    public override operator fun P.times(other: V): P = polynomialRing { this@times * other }
-
-    /**
-     * Map that associates variables (that appear in the polynomial in positive exponents) with their most exponents
-     * in which they are appeared in the polynomial.
-     *
-     * As consequence all values in the map are positive integers. Also, if the polynomial is constant, the map is empty.
-     * And keys of the map is the same as in [variables].
-     */
-    public override val P.degrees: Map<V, UInt> get() = polynomialRing { degrees }
-    /**
-     * Counts degree of the polynomial by the specified [variable].
-     */
-    public override fun P.degreeBy(variable: V): UInt = polynomialRing { degreeBy(variable) }
-    /**
-     * Counts degree of the polynomial by the specified [variables].
-     */
-    public override fun P.degreeBy(variables: Collection<V>): UInt = polynomialRing { degreeBy(variables) }
-    /**
-     * Set of all variables that appear in the polynomial in positive exponents.
-     */
-    public override val P.variables: Set<V> get() = polynomialRing { variables }
-    /**
-     * Count of all variables that appear in the polynomial in positive exponents.
-     */
-    public override val P.countOfVariables: Int get() = polynomialRing { countOfVariables }
-}
-
-/**
- * Abstraction of field of rational functions of type [R] with respect to polynomials of type [P] of variables of type
- * [V] and over ring of constants of type [C]. It also assumes that there is provided constructor
- * [constructRationalFunction] of rational functions from polynomial numerator and denominator.
- *
- * @param C the type of constants. Polynomials have them as coefficients in their terms.
- * @param V the type of variables. Polynomials have them in representations of terms.
- * @param P the type of polynomials. Rational functions have them as numerators and denominators in them.
- * @param R the type of rational functions.
- */
-@Suppress("INAPPLICABLE_JVM_NAME") // FIXME: Waiting for KT-31420
-public abstract class MultivariatePolynomialSpaceOfFractions<
-        C,
-        V,
-        P,
-        R: RationalFunction<C, P>,
-        > : MultivariateRationalFunctionSpace<C, V, P, R>,  PolynomialSpaceOfFractions<C, P, R>() {
-    /**
-     * Returns sum of the variable represented as a rational function and the rational function.
-     */
-    @JvmName("plusVariableRational")
-    public override operator fun V.plus(other: R): R =
-        constructRationalFunction(
-            this * other.denominator + other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns difference between the variable represented as a rational function and the rational function.
-     */
-    @JvmName("minusVariableRational")
-    public override operator fun V.minus(other: R): R =
-        constructRationalFunction(
-            this * other.denominator - other.numerator,
-            other.denominator
-        )
-    /**
-     * Returns product of the variable represented as a rational function and the rational function.
-     */
-    @JvmName("timesVariableRational")
-    public override operator fun V.times(other: R): R =
-        constructRationalFunction(
-            this * other.numerator,
-            other.denominator
-        )
-
-    /**
-     * Returns sum of the rational function and the variable represented as a rational function.
-     */
-    @JvmName("plusRationalVariable")
-    public override operator fun R.plus(other: V): R =
-        constructRationalFunction(
-            numerator + denominator * other,
-            denominator
-        )
-    /**
-     * Returns difference between the rational function and the variable represented as a rational function.
-     */
-    @JvmName("minusRationalVariable")
-    public override operator fun R.minus(other: V): R =
-        constructRationalFunction(
-            numerator - denominator * other,
-            denominator
-        )
-    /**
-     * Returns product of the rational function and the variable represented as a rational function.
-     */
-    public override operator fun R.times(other: V): R =
-        constructRationalFunction(
-            numerator * other,
-            denominator
-        )
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
deleted file mode 100644
index 80bf6ec53..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/algebraicStub.kt
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.*
-
-
-// TODO: All of this should be moved to algebraic structures' place for utilities
-// FIXME: Move receiver to context receiver
-/**
- * Returns product of [arg] and integer [multiplier].
- *
- * @param arg the multiplicand.
- * @param multiplier the integer multiplier.
- * @return product of the multiplicand [arg] and the multiplier [multiplier].
- * @author Gleb Minaev
- */
-internal fun <C> Group<C>.multiplyByDoubling(arg: C, multiplier: Int): C =
-    if (multiplier >= 0) multiplyByDoubling(arg, multiplier.toUInt())
-    else multiplyByDoubling(-arg, (-multiplier).toUInt())
-
-// FIXME: Move receiver to context receiver
-/**
- * Adds product of [arg] and [multiplier] to [base].
- *
- * @param base the augend.
- * @param arg the multiplicand.
- * @param multiplier the integer multiplier.
- * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
- * @author Gleb Minaev
- */
-internal fun <C> GroupOps<C>.addMultipliedByDoubling(base: C, arg: C, multiplier: Int): C =
-    if (multiplier >= 0) addMultipliedByDoubling(base, arg, multiplier.toUInt())
-    else addMultipliedByDoubling(base, -arg, (-multiplier).toUInt())
-
-// FIXME: Move receiver to context receiver
-/**
- * Returns product of [arg] and integer [multiplier].
- *
- * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
- *
- * @param arg the multiplicand.
- * @param multiplier the integer multiplier.
- * @return product of the multiplicand [arg] and the multiplier [multiplier].
- * @author Gleb Minaev
- */
-internal tailrec fun <C> Group<C>.multiplyByDoubling(arg: C, multiplier: UInt): C =
-    when {
-        multiplier == 0u -> zero
-        multiplier == 1u -> arg
-        multiplier and 1u == 0u -> multiplyByDoubling(arg + arg, multiplier shr 1)
-        multiplier and 1u == 1u -> addMultipliedByDoubling(arg, arg + arg, multiplier shr 1)
-        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
-    }
-
-// FIXME: Move receiver to context receiver
-/**
- * Adds product of [arg] and [multiplier] to [base].
- *
- * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
- *
- * @param base the augend.
- * @param arg the multiplicand.
- * @param multiplier the integer multiplier.
- * @return sum of the augend [base] and product of the multiplicand [arg] and the multiplier [multiplier].
- * @author Gleb Minaev
- */
-internal tailrec fun <C> GroupOps<C>.addMultipliedByDoubling(base: C, arg: C, multiplier: UInt): C =
-    when {
-        multiplier == 0u -> base
-        multiplier == 1u -> base + arg
-        multiplier and 1u == 0u -> addMultipliedByDoubling(base, arg + arg, multiplier shr 1)
-        multiplier and 1u == 1u -> addMultipliedByDoubling(base + arg, arg + arg, multiplier shr 1)
-        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
-    }
-
-// FIXME: Move receiver to context receiver
-/**
- * Raises [arg] to the integer power [exponent].
- *
- * @param arg the base of the power.
- * @param exponent the exponent of the power.
- * @return [arg] raised to the power [exponent].
- * @author Gleb Minaev
- */
-internal fun <C> Field<C>.exponentiateBySquaring(arg: C, exponent: Int): C =
-    if (exponent >= 0) exponentiateBySquaring(arg, exponent.toUInt())
-    else exponentiateBySquaring(one / arg, (-exponent).toUInt())
-
-// FIXME: Move receiver to context receiver
-/**
- * Multiplies [base] and [arg] raised to the integer power [exponent].
- *
- * @param base the multiplicand.
- * @param arg the base of the power.
- * @param exponent the exponent of the power.
- * @return product of [base] and [arg] raised to the power [exponent].
- * @author Gleb Minaev
- */
-internal fun <C> Field<C>.multiplyExponentiatedBySquaring(base: C, arg: C, exponent: Int): C =
-    if (exponent >= 0) multiplyExponentiatedBySquaring(base, arg, exponent.toUInt())
-    else multiplyExponentiatedBySquaring(base, one / arg, (-exponent).toUInt())
-
-// FIXME: Move receiver to context receiver
-/**
- * Raises [arg] to the integer power [exponent].
- *
- * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
- *
- * @param arg the base of the power.
- * @param exponent the exponent of the power.
- * @return [arg] raised to the power [exponent].
- * @author Gleb Minaev
- */
-internal tailrec fun <C> Ring<C>.exponentiateBySquaring(arg: C, exponent: UInt): C =
-    when {
-        exponent == 0u -> zero
-        exponent == 1u -> arg
-        exponent and 1u == 0u -> exponentiateBySquaring(arg * arg, exponent shr 1)
-        exponent and 1u == 1u -> multiplyExponentiatedBySquaring(arg, arg * arg, exponent shr 1)
-        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
-    }
-
-// FIXME: Move receiver to context receiver
-/**
- * Multiplies [base] and [arg] raised to the integer power [exponent].
- *
- * This is implementation of variation of [exponentiation by squaring](https://en.wikipedia.org/wiki/Exponentiation_by_squaring)
- *
- * @param base the multiplicand.
- * @param arg the base of the power.
- * @param exponent the exponent of the power.
- * @return product of [base] and [arg] raised to the power [exponent].
- * @author Gleb Minaev
- */
-internal tailrec fun <C> RingOps<C>.multiplyExponentiatedBySquaring(base: C, arg: C, exponent: UInt): C =
-    when {
-        exponent == 0u -> base
-        exponent == 1u -> base * arg
-        exponent and 1u == 0u -> multiplyExponentiatedBySquaring(base, arg * arg, exponent shr 1)
-        exponent and 1u == 1u -> multiplyExponentiatedBySquaring(base * arg, arg * arg, exponent shr 1)
-        else -> error("Error in multiplication group instant by unsigned integer: got reminder by division by 2 different from 0 and 1")
-    }
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
deleted file mode 100644
index e294f3533..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/collectionUtils.kt
+++ /dev/null
@@ -1,906 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import kotlin.contracts.InvocationKind.*
-import kotlin.contracts.contract
-
-
-/**
- * Computes the given lambda [compute] on value corresponding to the provided [key] or `null` if the key is not present.
- *
- * @param key key which corresponding value will be used if it's present.
- * @param compute lambda that is computed on the received value.
- * @return result of the computation of the lambda.
- */
-internal inline fun <K, V, R> Map<in K, V>.computeOn(key: K, compute: (V?) -> R): R {
-    contract {
-        callsInPlace(compute, EXACTLY_ONCE)
-    }
-    return compute(get(key))
-}
-
-/**
- * Computes the given lambda [compute] on value corresponding to the provided [key] or computes the given lambda
- * [defaultResult] if the key is not present.
- *
- * @param key key which corresponding value will be used if it's present.
- * @param compute lambda that is computed on the value corresponding to the [key].
- * @param defaultResult lambda that is computed if the [key] is not present.
- * @return result of [compute] lambda if the [key] is present or result of [defaultResult] otherwise.
- */
-internal inline fun <K, V, R> Map<K, V>.computeOnOrElse(key: K, defaultResult: () -> R, compute: (value: V) -> R): R {
-    contract {
-        callsInPlace(defaultResult, AT_MOST_ONCE)
-        callsInPlace(compute, AT_MOST_ONCE)
-    }
-    @Suppress("UNCHECKED_CAST")
-    return (if (key !in this) defaultResult() else compute(get(key) as V))
-}
-
-/**
- * Computes the given lambda [compute] on value corresponding to the provided [key] or computes the given lambda
- * [defaultResult] if the key is not present.
- *
- * @param key key which corresponding value will be used if it's present.
- * @param compute lambda that is computed on the value corresponding to the [key].
- * @param defaultResult default result that is returned in case of the [key]'s absence.
- * @return result of [compute] lambda if the [key] is present or [defaultResult] otherwise.
- */
-internal inline fun <K, V, R> Map<K, V>.computeOnOrElse(key: K, defaultResult: R, compute: (value: V) -> R): R {
-    contract {
-        callsInPlace(compute, AT_MOST_ONCE)
-    }
-    return computeOnOrElse(key, { defaultResult }, compute)
-}
-
-/**
- * Computes the given lambda [compute] on value corresponding to the provided [key] or computes the given lambda
- * [defaultResult] if the key is not present.
- *
- * @param key key which corresponding value will be used if it's present.
- * @param compute lambda that is computed on the value corresponding to the [key].
- * @param defaultResult default result that is returned in case of the [key]'s absence.
- * @return result of [compute] lambda if the [key] is present or [defaultResult] otherwise.
- */
-internal inline fun <K, V, R> Map<K, V>.computeOnOrElse(key: K, defaultResult: R, compute: (key: K, value: V) -> R): R {
-    contract {
-        callsInPlace(compute, AT_MOST_ONCE)
-    }
-    return computeOnOrElse(key, { defaultResult }, { it -> compute(key, it) })
-}
-
-/**
- * Applies the [transformation][transform] to the value corresponding to the given [key] or null instead if it's not
- * present.
- *
- * @param key key to check.
- * @param transform transformation to apply.
- * @return result of the transformation
- */
-internal inline fun <K, V> MutableMap<in K, V>.applyToKey(key: K, transform: (currentValue: V?) -> V): V {
-    contract {
-        callsInPlace(transform, EXACTLY_ONCE)
-    }
-    return computeOn(key, transform).also { this[key] = it }
-}
-
-/**
- * Depending on presence of value corresponding to the given [key] either puts new value calculated by [valueOnPut] or
- * changes the present value with [transformOnChange].
- *
- * @param key key to check.
- * @param valueOnPut lazily calculated value to put in case of absence of the [key].
- * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
- * current value as a parameter.
- * @return result value corresponding to the [key].
- */
-internal inline fun <K, V> MutableMap<K, V>.putOrChange(key: K, valueOnPut: () -> V, transformOnChange: (currentValue: V) -> V): V {
-    contract {
-        callsInPlace(valueOnPut, AT_MOST_ONCE)
-        callsInPlace(transformOnChange, AT_MOST_ONCE)
-    }
-    return computeOnOrElse(key, valueOnPut, transformOnChange).also { this[key] = it }
-}
-
-/**
- * Depending on presence of value corresponding to the given [key] either puts new value [valueOnPut] or
- * changes the present value with [transformOnChange].
- *
- * @param key key to check.
- * @param valueOnPut value to put in case of absence of the [key].
- * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
- * current value as a parameter.
- * @return result value corresponding to the [key].
- */
-internal inline fun <K, V> MutableMap<K, V>.putOrChange(key: K, valueOnPut: V, transformOnChange: (currentValue: V) -> V): V {
-    contract {
-        callsInPlace(transformOnChange, AT_MOST_ONCE)
-    }
-    return putOrChange<K, V>(key, { valueOnPut }, transformOnChange)
-}
-
-/**
- * Depending on presence of value corresponding to the given [key] either puts new value [valueOnPut] or
- * changes the present value with [transformOnChange].
- *
- * @param key key to check.
- * @param valueOnPut value to put in case of absence of the [key].
- * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
- * current value and new value as parameters.
- * @return result value corresponding to the [key].
- */
-internal inline fun <K, V> MutableMap<K, V>.putOrChange(key: K, valueOnPut: V, transformOnChange: (currentValue: V, newValue: V) -> V): V {
-    contract {
-        callsInPlace(transformOnChange, AT_MOST_ONCE)
-    }
-    return putOrChange<K, V>(key, { valueOnPut }, { transformOnChange(it, valueOnPut) })
-}
-
-/**
- * Depending on presence of value corresponding to the given [key] either puts new value [valueOnPut] or
- * changes the present value with [transformOnChange].
- *
- * @param key key to check.
- * @param valueOnPut value to put in case of absence of the [key].
- * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
- * the [key], current value, and new value as parameters.
- * @return result value corresponding to the [key].
- */
-internal inline fun <K, V> MutableMap<K, V>.putOrChange(key: K, valueOnPut: V, transformOnChange: (key: K, currentValue: V, newValue: V) -> V): V {
-    contract {
-        callsInPlace(transformOnChange, AT_MOST_ONCE)
-    }
-    return putOrChange<K, V>(key, { valueOnPut }, { transformOnChange(key, it, valueOnPut) })
-}
-
-/**
- * Creates copy of [the map][this] and applies the [transformation][transform] to the value corresponding to the given
- * [key] in the copy or null instead if it's not present.
- *
- * @param key key to check.
- * @param transform transformation to apply.
- * @return the copy of [the map][this].
- */
-internal inline fun <K, V> Map<in K, V>.withAppliedToKey(key: K, transform: (currentValue: V?) -> V): Map<K, V> {
-    contract {
-        callsInPlace(transform, EXACTLY_ONCE)
-    }
-    return buildMap(size) {
-        putAll(this)
-        applyToKey(key, transform)
-    }
-}
-
-/**
- * Creates copy of [the map][this] and depending on presence of value corresponding to the given [key] either puts new
- * value calculated by [valueOnPut] or changes the present value with [transformOnChange].
- *
- * @param key key to check.
- * @param valueOnPut lazily calculated value to put in case of absence of the [key].
- * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
- * current value as a parameter.
- * @return the copy of [the map][this].
- */
-internal inline fun <K, V> Map<K, V>.withPutOrChanged(key: K, valueOnPut: () -> V, transformOnChange: (currentValue: V) -> V): Map<K, V> {
-    contract {
-        callsInPlace(valueOnPut, AT_MOST_ONCE)
-        callsInPlace(transformOnChange, AT_MOST_ONCE)
-    }
-    return buildMap(size + 1) {
-        putAll(this@withPutOrChanged)
-        putOrChange(key, valueOnPut, transformOnChange)
-    }
-}
-
-/**
- * Creates copy of [the map][this] and depending on presence of value corresponding to the given [key] either puts new
- * value [valueOnPut] or changes the present value with [transformOnChange].
- *
- * @param key key to check.
- * @param valueOnPut value to put in case of absence of the [key].
- * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
- * current value as a parameter.
- * @return the copy of [the map][this].
- */
-internal inline fun <K, V> Map<K, V>.withPutOrChanged(key: K, valueOnPut: V, transformOnChange: (currentValue: V) -> V): Map<K, V> {
-    contract {
-        callsInPlace(transformOnChange, AT_MOST_ONCE)
-    }
-    return withPutOrChanged<K, V>(key, { valueOnPut }, transformOnChange)
-}
-
-/**
- * Creates copy of [the map][this] and depending on presence of value corresponding to the given [key] either puts new
- * value [valueOnPut] or changes the present value with [transformOnChange].
- *
- * @param key key to check.
- * @param valueOnPut value to put in case of absence of the [key].
- * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
- * current value and new value as parameters.
- * @return the copy of [the map][this].
- */
-internal inline fun <K, V> Map<K, V>.withPutOrChanged(key: K, valueOnPut: V, transformOnChange: (currentValue: V, newValue: V) -> V): Map<K, V> {
-    contract {
-        callsInPlace(transformOnChange, AT_MOST_ONCE)
-    }
-    return withPutOrChanged<K, V>(key, { valueOnPut }, { transformOnChange(it, valueOnPut) })
-}
-
-/**
- * Creates copy of [the map][this] and depending on presence of value corresponding to the given [key] either puts new
- * value [valueOnPut] or changes the present value with [transformOnChange].
- *
- * @param key key to check.
- * @param valueOnPut value to put in case of absence of the [key].
- * @param transformOnChange transform to apply to current value corresponding to the [key] in case of its presence. Uses
- * the [key], current value, and new value as parameters.
- * @return the copy of [the map][this].
- */
-internal inline fun <K, V> Map<K, V>.withPutOrChanged(key: K, valueOnPut: V, transformOnChange: (key: K, currentValue: V, newValue: V) -> V): Map<K, V> {
-    contract {
-        callsInPlace(transformOnChange, AT_MOST_ONCE)
-    }
-    return withPutOrChanged<K, V>(key, { valueOnPut }, { transformOnChange(key, it, valueOnPut) })
-}
-
-/**
- * Copies entries of [this map][this] to the [destination] map overriding present ones if needed.
- *
- * @receiver map to be copied.
- * @param destination map to receive copies.
- * @return the [destination].
- */
-internal fun <K, V, D: MutableMap<K, V>> Map<K, V>.copyTo(destination: D): D {
-    for ((key, value) in this) {
-        destination[key] = value
-    }
-    return destination
-}
-
-/**
- * Copies entries of [this map][this] to the [destination] map merging present entries with new ones using [resolve]
- * lambda.
- *
- * @receiver map to be copied.
- * @param destination map to receive copies.
- * @param resolve lambda function that resolves overriding. It takes a key, current value corresponding to the key, and
- * a new one and returns value to associate to the key.
- * @return the [destination].
- */
-internal inline fun <K, V: W, W, D: MutableMap<K, W>> Map<out K, V>.copyToBy(destination: D, resolve: (key: K, currentValue: W, newValue: V) -> W): D {
-    for ((key, value) in this) {
-        destination.putOrChange(key, value) { it -> resolve(key, it, value) }
-    }
-    return destination
-}
-
-/**
- * Copies entries of [this map][this] to the [destination] map merging present entries with new ones using [resolve]
- * lambda.
- *
- * @receiver map to be copied.
- * @param destination map to receive copies.
- * @param resolve lambda function that resolves overriding. It takes current value corresponding to some key, and
- * a new one and returns value to associate to the key.
- * @return the [destination].
- */
-internal inline fun <K, V: W, W, D: MutableMap<K, W>> Map<out K, V>.copyToBy(destination: D, resolve: (currentValue: W, newValue: V) -> W): D =
-    copyToBy(destination) { _, currentValue, newValue -> resolve(currentValue, newValue) }
-
-/**
- * Transforms values of entries of [this map][this] with [the given transformation][transform] and copies resulting
- * entries to the [destination] map overriding present ones if needed. Is equivalent to
- * ```kotlin
- * this.mapValues(transform).copyTo(destination)
- * ```
- *
- * @receiver map to be transformed and copied.
- * @param destination map to receive copies.
- * @param transform generates value of transformed entry using initial entry as an argument. Key of transformed entry is
- * the same as initial entry.
- * @return the [destination].
- */
-internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapTo(destination: D, transform: (Map.Entry<K, V>) -> W): D {
-    for (entry in this) {
-        destination[entry.key] = transform(entry)
-    }
-    return destination
-}
-
-/**
- * Transforms values of entries of [this map][this] with [the given transformation][transform] and copies resulting
- * entries to the [destination] map overriding present ones if needed. Is equivalent to
- * ```kotlin
- * this.mapValues(transform).copyTo(destination)
- * ```
- *
- * @receiver map to be transformed and copied.
- * @param destination map to receive copies.
- * @param transform generates value of transformed entry using initial entry as an argument. Key of transformed entry is
- * the same as initial entry.
- * @return the [destination].
- */
-internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapTo(destination: D, transform: (key: K, value: V) -> W): D =
-    copyMapTo(destination) { (key, value) -> transform(key, value) }
-
-/**
- * Transforms values of entries of [this map][this] with [the given transformation][transform] and copies resulting
- * entries to the [destination] map merging present entries with new ones using [resolve] lambda. Is equivalent to
- * ```kotlin
- * this.mapValues(transform).copyToBy(destination, resolve)
- * ```
- *
- * @receiver map to be transformed and copied.
- * @param destination map to receive copies.
- * @param transform generates value of transformed entry using initial entry as an argument. Key of transformed entry is
- * the same as initial entry.
- * @param resolve lambda function that resolves overriding. It takes a key, current value corresponding to the key, and
- * a new one and returns value to associate to the key.
- * @return the [destination].
- */
-internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapToBy(destination: D, transform: (Map.Entry<K, V>) -> W, resolve: (key: K, currentValue: W, newValue: V) -> W): D {
-    for (entry in this) {
-        val (key, value) = entry
-        destination.putOrChange(key, transform(entry)) { it -> resolve(key, it, value) }
-    }
-    return destination
-}
-
-/**
- * Transforms values of entries of [this map][this] with [the given transformation][transform] and copies resulting
- * entries to the [destination] map merging present entries with new ones using [resolve] lambda. Is equivalent to
- * ```kotlin
- * this.mapValues(transform).copyToBy(destination, resolve)
- * ```
- *
- * @receiver map to be transformed and copied.
- * @param destination map to receive copies.
- * @param transform generates value of transformed entry using initial entry as an argument. Key of transformed entry is
- * the same as initial entry.
- * @param resolve lambda function that resolves overriding. It takes a key, current value corresponding to the key, and
- * a new one and returns value to associate to the key.
- * @return the [destination].
- */
-internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapToBy(destination: D, transform: (key: K, value: V) -> W, resolve: (key: K, currentValue: W, newValue: V) -> W): D =
-    copyMapToBy(destination, { (key, value) -> transform(key, value) }, resolve)
-
-/**
- * Transforms values of entries of [this map][this] with [the given transformation][transform] and copies resulting
- * entries to the [destination] map merging present entries with new ones using [resolve] lambda. Is equivalent to
- * ```kotlin
- * this.mapValues(transform).copyToBy(destination, resolve)
- * ```
- *
- * @receiver map to be transformed and copied.
- * @param destination map to receive copies.
- * @param transform generates value of transformed entry using initial entry as an argument. Key of transformed entry is
- * the same as initial entry.
- * @param resolve lambda function that resolves overriding. It takes current value corresponding to some key, and
- * a new one and returns value to associate to the key.
- * @return the [destination].
- */
-internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapToBy(destination: D, transform: (Map.Entry<K, V>) -> W, resolve: (currentValue: W, newValue: V) -> W): D =
-    copyMapToBy(destination, transform, { _, currentValue, newValue -> resolve(currentValue, newValue) })
-
-/**
- * Transforms values of entries of [this map][this] with [the given transformation][transform] and copies resulting
- * entries to the [destination] map merging present entries with new ones using [resolve] lambda. Is equivalent to
- * ```kotlin
- * this.mapValues(transform).copyToBy(destination, resolve)
- * ```
- *
- * @receiver map to be transformed and copied.
- * @param destination map to receive copies.
- * @param transform generates value of transformed entry using initial entry as an argument. Key of transformed entry is
- * the same as initial entry.
- * @param resolve lambda function that resolves overriding. It takes current value corresponding to some key, and
- * a new one and returns value to associate to the key.
- * @return the [destination].
- */
-internal inline fun <K, V, W, D: MutableMap<K, W>> Map<out K, V>.copyMapToBy(destination: D, transform: (key: K, value: V) -> W, resolve: (currentValue: W, newValue: V) -> W): D =
-    copyMapToBy(destination, { (key, value) -> transform(key, value) }, { _, currentValue, newValue -> resolve(currentValue, newValue) })
-
-/**
- * Merges [the first map][map1] and [the second map][map2] prioritising the second one, puts result to the [destination]
- * and returns the [destination].
- *
- * Precisely, corresponding keys and values of the received maps are put into the destination overriding existing values
- * in the [destination] if needed. For every key appearing in both maps corresponding value from the second map is
- * chosen.
- *
- * @param map1 the first (less prioritised) map to merge.
- * @param map2 the second (more prioritised) map to merge.
- * @param destination the map where result of the merge is put.
- * @return the destination.
- */
-internal fun <K, V, D: MutableMap<in K, in V>> mergeTo(map1: Map<out K, V>, map2: Map<out K, V>, destination: D): D {
-    for ((key, value) in map1) {
-        destination.put(key, value)
-    }
-    for ((key, value) in map2) {
-        destination.put(key, value)
-    }
-    return destination
-}
-
-/**
- * Merges [the first map][map1] and [the second map][map2] resolving conflicts with [resolve] lambda, puts result to the
- * [destination] and returns the [destination].
- *
- * Precisely, corresponding keys and values of the received maps are put into the destination overriding existing values
- * in the [destination] if needed. For every key appearing in both maps corresponding value is a result of the [resolve]
- * lambda calculated on the key and its corresponding values from the merged maps.
- *
- * @param map1 the first (less prioritised) map to merge.
- * @param map2 the second (more prioritised) map to merge.
- * @param resolve lambda function that resolves merge conflicts.
- * @param destination the map where result of the merge is put.
- * @return the destination.
- */
-internal inline fun <K, V1: W, V2: W, W, D: MutableMap<K, W>> mergeToBy(map1: Map<out K, V1>, map2: Map<out K, V2>, destination: D, resolve: (key: K, value1: V1, value2: V2) -> W): D {
-    for (key in map2.keys) {
-        destination.remove(key)
-    }
-    for ((key, value) in map1) {
-        destination.put(key, value)
-    }
-    for ((key, value) in map2) {
-        @Suppress("UNCHECKED_CAST")
-        destination.putOrChange(key, value) { it -> resolve(key, it as V1, value) }
-    }
-    return destination
-}
-
-/**
- * Merges [the first map][map1] and [the second map][map2] resolving conflicts with [resolve] lambda, puts result to the
- * [destination] and returns the [destination].
- *
- * Precisely, corresponding keys and values of the received maps are put into the destination overriding existing values
- * in the [destination] if needed. For every key appearing in both maps corresponding value is a result of the [resolve]
- * lambda calculated on the key's corresponding values from the merged maps.
- *
- * @param map1 the first (less prioritised) map to merge.
- * @param map2 the second (more prioritised) map to merge.
- * @param resolve lambda function that resolves merge conflicts.
- * @param destination the map where result of the merge is put.
- * @return the destination.
- */
-internal inline fun <K, V1: W, V2: W, W, D: MutableMap<K, W>> mergeToBy(map1: Map<K, V1>, map2: Map<K, V2>, destination: D, resolve: (value1: V1, value2: V2) -> W): D =
-    mergeToBy(map1, map2, destination) { _, value1, value2 -> resolve(value1, value2) }
-
-/**
- * Merges [the first map][map1] and [the second map][map2] prioritising the second one.
- *
- * Precisely, corresponding keys and values of the received maps are put into a new empty map which is returned after
- * afterwards. For every key appearing in both maps corresponding value from the second map is chosen.
- *
- * @param map1 the first (less prioritised) map to merge.
- * @param map2 the second (more prioritised) map to merge.
- * @return the result of the merge.
- */
-internal fun <K, V1: W, V2: W, W> merge(map1: Map<K, V1>, map2: Map<K, V2>): Map<K, W> {
-    val result = LinkedHashMap<K, W>(map1.size + map2.size)
-    return mergeTo(map1, map2, result)
-}
-
-/**
- * Merges [the first map][map1] and [the second map][map2] resolving conflicts with [resolve] lambda.
- *
- * Precisely, corresponding keys and values of the received maps are put into a new empty map which is returned after
- * afterwards. For every key appearing in both maps corresponding value is a result of the [resolve] lambda calculated
- * on the key and its corresponding values from the merged maps.
- *
- * @param map1 the first (less prioritised) map to merge.
- * @param map2 the second (more prioritised) map to merge.
- * @param resolve lambda function that resolves merge conflicts.
- * @return the result of the merge.
- */
-internal inline fun <K, V1: W, V2: W, W> mergeBy(map1: Map<K, V1>, map2: Map<K, V2>, resolve: (key: K, value1: V1, value2: V2) -> W): Map<K, W> {
-    val result = LinkedHashMap<K, W>(map1.size + map2.size)
-    return mergeToBy(map1, map2, result, resolve)
-}
-
-/**
- * Merges [the first map][map1] and [the second map][map2] resolving conflicts with [resolve] lambda.
- *
- * Precisely, corresponding keys and values of the received maps are put into a new empty map which is returned after
- * afterwards. For every key appearing in both maps corresponding value is a result of the [resolve] lambda calculated
- * on the key's corresponding values from the merged maps.
- *
- * @param map1 the first (less prioritised) map to merge.
- * @param map2 the second (more prioritised) map to merge.
- * @param resolve lambda function that resolves merge conflicts.
- * @return the result of the merge.
- */
-internal inline fun <K, V1: W, V2: W, W> mergeBy(map1: Map<K, V1>, map2: Map<K, V2>, resolve: (value1: V1, value2: V2) -> W): Map<K, W> =
-    mergeBy(map1, map2) { _, value1, value2 -> resolve(value1, value2) }
-
-/**
- * Populates the [destination] map with key-value pairs provided by [transform] function applied to each element of the
- * given collection resolving conflicts with [resolve] function and returns the [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param transform function which transforms each element to key-value.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the [destination].
- */
-internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateTo(destination: D, transform: (T) -> Pair<K, V>, resolve: (key: K, currentValue: V, newValue: V) -> V): D {
-    for (element in this) {
-        val (key, value) = transform(element)
-        destination.putOrChange(key, value, resolve)
-    }
-    return destination
-}
-
-/**
- * Populates the [destination] map with key-value pairs, where key is provided by [keySelector] function and value is
- * provided by [valueTransform] applied to each element of the given collection, resolving conflicts with [resolve]
- * function and returns the [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param keySelector lambda functions that generates keys for the key-value pairs.
- * @param valueTransform lambda functions that generates value for the key-value pairs.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the [destination].
- */
-internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateByTo(destination: D, keySelector: (T) -> K, valueTransform: (T) -> V, resolve: (key: K, currentValue: V, newValue: V) -> V): D {
-    for (element in this) {
-        val key = keySelector(element)
-        val value = valueTransform(element)
-        destination.putOrChange(key, value, resolve)
-    }
-    return destination
-}
-
-/**
- * Populates the [destination] map with key-value pairs, where key is provided by [keySelector] function applied to each
- * element of the given collection and value is the element itself, resolving conflicts with [resolve] function and
- * returns the [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param keySelector lambda functions that generates keys for the key-value pairs.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the [destination].
- */
-internal inline fun <T, K, D : MutableMap<K, T>> Iterable<T>.associateByTo(destination: D, keySelector: (T) -> K, resolve: (key: K, currentValue: T, newValue: T) -> T): D {
-    for (element in this) {
-        val key = keySelector(element)
-        destination.putOrChange(key, element, resolve)
-    }
-    return destination
-}
-
-/**
- * Populates the [destination] map with key-value pairs provided by [transform] function applied to each element of the
- * given collection resolving conflicts with [resolve] function and returns the [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param transform function which transforms each element to key-value pair.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the [destination].
- */
-internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateTo(destination: D, transform: (T) -> Pair<K, V>, resolve: (currentValue: V, newValue: V) -> V): D =
-    associateTo(destination, transform) { _, currentValue, newValue -> resolve(currentValue, newValue) }
-
-/**
- * Populates the [destination] map with key-value pairs, where key is provided by [keySelector] function and value is
- * provided by [valueTransform] applied to each element of the given collection, resolving conflicts with [resolve]
- * function and returns the [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param keySelector lambda functions that generates keys for the key-value pairs.
- * @param valueTransform lambda functions that generates value for the key-value pairs.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the [destination].
- */
-internal inline fun <T, K, V, D : MutableMap<K, V>> Iterable<T>.associateByTo(destination: D, keySelector: (T) -> K, valueTransform: (T) -> V, resolve: (currentValue: V, newValue: V) -> V): D =
-    associateByTo(destination, keySelector, valueTransform) { _, currentValue, newValue -> resolve(currentValue, newValue) }
-
-/**
- * Populates the [destination] map with key-value pairs, where key is provided by [keySelector] function applied to each
- * element of the given collection and value is the element itself, resolving conflicts with [resolve] function and
- * returns the [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param keySelector lambda functions that generates keys for the key-value pairs.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the [destination].
- */
-internal inline fun <T, K, D : MutableMap<K, T>> Iterable<T>.associateByTo(destination: D, keySelector: (T) -> K, resolve: (currentValue: T, newValue: T) -> T): D =
-    associateByTo(destination, keySelector) { _, currentValue, newValue -> resolve(currentValue, newValue) }
-
-/**
- * Returns a map containing key-value pairs provided by [transform] function applied to elements of the given collection.
- *
- * All pairs are added in order of iteration. If some key is already added to the map, adding new key-value pair with the
- * key is resolved with [resolve] function which takes the key, current value corresponding to the key, and new value
- * from the pair.
- *
- * @param transform function which transforms each element to key-value pair.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the result map.
- */
-internal inline fun <T, K, V> Iterable<T>.associate(transform: (T) -> Pair<K, V>, resolve: (key: K, currentValue: V, newValue: V) -> V): Map<K, V> =
-    associateTo(LinkedHashMap(), transform, resolve)
-
-/**
- * Returns a map containing the values provided by [valueTransform] and indexed by [keySelector] functions applied to
- * elements of the given collection.
- *
- * All pairs are added in order of iteration. If some key is already added to the map, adding new key-value pair with
- * the key is resolved with [resolve] function which takes the key, current value corresponding to the key, and new
- * value from the pair.
- *
- * @param keySelector lambda functions that generates keys for the key-value pairs.
- * @param valueTransform lambda functions that generates value for the key-value pairs.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the result map.
- */
-internal inline fun <T, K, V> Iterable<T>.associateBy(keySelector: (T) -> K, valueTransform: (T) -> V, resolve: (key: K, currentValue: V, newValue: V) -> V): Map<K, V> =
-    associateByTo(LinkedHashMap(), keySelector, valueTransform, resolve)
-
-/**
- * Returns a map containing the elements from the given collection indexed by the key returned from [keySelector]
- * function applied to each element.
- *
- * All pairs are added in order of iteration. If some key is already added to the map, adding new key-value pair with
- * the key is resolved with [resolve] function which takes the key, current value corresponding to the key, and new
- * value from the pair.
- *
- * @param keySelector lambda functions that generates keys for the key-value pairs.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the result map.
- */
-internal inline fun <T, K> Iterable<T>.associateBy(keySelector: (T) -> K, resolve: (key: K, currentValue: T, newValue: T) -> T): Map<K, T> =
-    associateByTo(LinkedHashMap(), keySelector, resolve)
-
-/**
- * Returns a map containing key-value pairs provided by [transform] function applied to elements of the given collection.
- *
- * All pairs are added in order of iteration. If some key is already added to the map, adding new key-value pair with
- * the key is resolved with [resolve] function which takes current value corresponding to the key and new value from the
- * pair.
- *
- * @param transform function which transforms each element to key-value pair.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the result map.
- */
-internal inline fun <T, K, V> Iterable<T>.associate(transform: (T) -> Pair<K, V>, resolve: (currentValue: V, newValue: V) -> V): Map<K, V> =
-    associateTo(LinkedHashMap(), transform, resolve)
-
-/**
- * Returns a map containing the values provided by [valueTransform] and indexed by [keySelector] functions applied to
- * elements of the given collection.
- *
- * All pairs are added in order of iteration. If some key is already added to the map, adding new key-value pair with
- * the key is resolved with [resolve] function which takes current value corresponding to the key and new value from the
- * pair.
- *
- * @param keySelector lambda functions that generates keys for the key-value pairs.
- * @param valueTransform lambda functions that generates value for the key-value pairs.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the result map.
- */
-internal inline fun <T, K, V> Iterable<T>.associateBy(keySelector: (T) -> K, valueTransform: (T) -> V, resolve: (currentValue: V, newValue: V) -> V): Map<K, V> =
-    associateByTo(LinkedHashMap(), keySelector, valueTransform, resolve)
-
-/**
- * Returns a map containing the elements from the given collection indexed by the key returned from [keySelector]
- * function applied to each element.
- *
- * All pairs are added in order of iteration. If some key is already added to the map, adding new key-value pair with
- * the key is resolved with [resolve] function which takes current value corresponding to the key and new value from the
- * pair.
- *
- * @param keySelector lambda functions that generates keys for the key-value pairs.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the result map.
- */
-internal inline fun <T, K> Iterable<T>.associateBy(keySelector: (T) -> K, resolve: (currentValue: T, newValue: T) -> T): Map<K, T> =
-    associateByTo(LinkedHashMap(), keySelector, resolve)
-
-/**
- * Populates the given [destination] map with entries having the keys of this map and the values obtained
- * by applying the [transform] function to each entry in this map resolving conflicts with [resolve] function and
- * returns the [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param transform function which transforms each key-value pair to new value.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the [destination].
- */
-internal inline fun <K, V, W, D : MutableMap<K, W>> Map<out K, V>.mapValuesTo(destination: D, transform: (Map.Entry<K, V>) -> W, resolve: (key: K, currentValue: W, newValue: W) -> W): D =
-    entries.associateByTo(destination, { it.key }, transform, resolve)
-
-/**
- * Populates the given [destination] map with entries having the keys of this map and the values obtained
- * by applying the [transform] function to each entry in this map resolving conflicts with [resolve] function and
- * returns the [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param transform function which transforms each key-value pair to new value.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the [destination].
- */
-internal inline fun <K, V, W, D : MutableMap<K, W>> Map<out K, V>.mapValuesTo(destination: D, transform: (key: K, value: V) -> W, resolve: (key: K, currentValue: W, newValue: W) -> W): D =
-    entries.associateByTo(destination, { it.key }, { (key, value) -> transform(key, value) }, resolve)
-
-/**
- * Populates the given [destination] map with entries having the keys of this map and the values obtained
- * by applying the [transform] function to each entry in this map resolving conflicts with [resolve] function and
- * returns the [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param transform function which transforms each key-value pair to new value.
- * @param resolve lambda function that resolves merge conflicts which current and new values corresponding to some key.
- * @return the [destination].
- */
-internal inline fun <K, V, W, D : MutableMap<K, W>> Map<out K, V>.mapValuesTo(destination: D, transform: (Map.Entry<K, V>) -> W, resolve: (currentValue: W, newValue: W) -> W): D =
-    entries.associateByTo(destination, { it.key }, transform, resolve)
-
-/**
- * Populates the given [destination] map with entries having the keys of this map and the values obtained
- * by applying the [transform] function to each entry in this map resolving conflicts with [resolve] function and
- * returns the [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param transform function which transforms each key-value pair to new value.
- * @param resolve lambda function that resolves merge conflicts which current and new values corresponding to some key.
- * @return the [destination].
- */
-internal inline fun <K, V, W, D : MutableMap<K, W>> Map<out K, V>.mapValuesTo(destination: D, transform: (key: K, value: V) -> W, resolve: (currentValue: W, newValue: W) -> W): D =
-    entries.associateByTo(destination, { it.key }, { (key, value) -> transform(key, value) }, resolve)
-
-/**
- * Populates the given [destination] map with entries having the keys obtained by applying the [transform] function to
- * each entry in this map and the values of this map, resolving conflicts with [resolve] function and returns the
- * [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param transform function which transforms each key-value pair to new key.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the [destination].
- */
-internal inline fun <K, V, L, D : MutableMap<L, V>> Map<out K, V>.mapKeysTo(destination: D, transform: (Map.Entry<K, V>) -> L, resolve: (key: L, currentValue: V, newValue: V) -> V): D =
-    entries.associateByTo(destination, transform, { it.value }, resolve)
-
-/**
- * Populates the given [destination] map with entries having the keys obtained by applying the [transform] function to
- * each entry in this map and the values of this map, resolving conflicts with [resolve] function and returns the
- * [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param transform function which transforms each key-value pair to new key.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the [destination].
- */
-internal inline fun <K, V, L, D : MutableMap<L, V>> Map<out K, V>.mapKeysTo(destination: D, transform: (key: K, value: V) -> L, resolve: (key: L, currentValue: V, newValue: V) -> V): D =
-    entries.associateByTo(destination, { (key, value) -> transform(key, value) }, { it.value }, resolve)
-
-/**
- * Populates the given [destination] map with entries having the keys obtained by applying the [transform] function to
- * each entry in this map and the values of this map, resolving conflicts with [resolve] function and returns the
- * [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param transform function which transforms each key-value pair to new key.
- * @param resolve lambda function that resolves merge conflicts which current and new values corresponding to some key.
- * @return the [destination].
- */
-internal inline fun <K, V, L, D : MutableMap<L, V>> Map<out K, V>.mapKeysTo(destination: D, transform: (Map.Entry<K, V>) -> L, resolve: (currentValue: V, newValue: V) -> V): D =
-    entries.associateByTo(destination, transform, { it.value }, resolve)
-
-/**
- * Populates the given [destination] map with entries having the keys obtained by applying the [transform] function to
- * each entry in this map and the values of this map, resolving conflicts with [resolve] function and returns the
- * [destination].
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param destination the destination of the generated key-value pairs.
- * @param transform function which transforms each key-value pair to new key.
- * @param resolve lambda function that resolves merge conflicts which current and new values corresponding to some key.
- * @return the [destination].
- */
-internal inline fun <K, V, L, D : MutableMap<L, V>> Map<out K, V>.mapKeysTo(destination: D, transform: (key: K, value: V) -> L, resolve: (currentValue: V, newValue: V) -> V): D =
-    entries.associateByTo(destination, { (key, value) -> transform(key, value) }, { it.value }, resolve)
-
-/**
- * Returns a new map with entries having the keys obtained by applying the [transform] function to each entry in this
- * map and the values of this map and resolving conflicts with [resolve] function.
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param transform function which transforms each key-value pair to new key.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the result map.
- */
-internal inline fun <K, V, L> Map<out K, V>.mapKeys(transform: (Map.Entry<K, V>) -> L, resolve: (key: L, currentValue: V, newValue: V) -> V): Map<L, V> =
-    mapKeysTo(LinkedHashMap(size), transform, resolve)
-
-/**
- * Returns a new map with entries having the keys obtained by applying the [transform] function to each entry in this
- * map and the values of this map and resolving conflicts with [resolve] function.
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param transform function which transforms each key-value pair to new key.
- * @param resolve lambda function that resolves merge conflicts which receives some key, its current, and new
- * corresponding values.
- * @return the result map.
- */
-internal inline fun <K, V, L> Map<out K, V>.mapKeys(transform: (key: K, value: V) -> L, resolve: (key: L, currentValue: V, newValue: V) -> V): Map<L, V> =
-    mapKeysTo(LinkedHashMap(size), transform, resolve)
-
-/**
- * Returns a new map with entries having the keys obtained by applying the [transform] function to each entry in this
- * map and the values of this map and resolving conflicts with [resolve] function.
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param transform function which transforms each key-value pair to new key.
- * @param resolve lambda function that resolves merge conflicts which current and new values corresponding to some key.
- * @return the result map.
- */
-internal inline fun <K, V, L> Map<out K, V>.mapKeys(transform: (Map.Entry<K, V>) -> L, resolve: (currentValue: V, newValue: V) -> V): Map<L, V> =
-    mapKeysTo(LinkedHashMap(size), transform, resolve)
-
-/**
- * Returns a new map with entries having the keys obtained by applying the [transform] function to each entry in this
- * map and the values of this map and resolving conflicts with [resolve] function.
- *
- * All pairs are added and resolved in order of iteration.
- *
- * @param transform function which transforms each key-value pair to new key.
- * @param resolve lambda function that resolves merge conflicts which current and new values corresponding to some key.
- * @return the result map.
- */
-internal inline fun <K, V, L> Map<out K, V>.mapKeys(transform: (key: K, value: V) -> L, resolve: (currentValue: V, newValue: V) -> V): Map<L, V> =
-    mapKeysTo(LinkedHashMap(size), transform, resolve)
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
deleted file mode 100644
index 78bb3b290..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt
+++ /dev/null
@@ -1,779 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("FunctionName", "NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.invoke
-
-
-/**
- * Returns the same degrees' description of the monomial, but without zero degrees.
- */
-internal fun Map<Symbol, UInt>.cleanUp() = filterValues { it > 0U }
-
-/**
- * Constructs [LabeledPolynomial] with provided coefficients map [coefs]. The map is used as is.
- */
-@PublishedApi
-internal inline fun <C> LabeledPolynomialAsIs(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial<C>(coefs)
-
-/**
- * Constructs [LabeledPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
- * The collections will be transformed to map with [toMap] and then will be used as is.
- */
-@PublishedApi
-internal inline fun <C> LabeledPolynomialAsIs(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial<C>(pairs.toMap())
-
-/**
- * Constructs [LabeledPolynomial] with provided array of [pairs] of pairs "term's signature &mdash; term's coefficient".
- * The array will be transformed to map with [toMap] and then will be used as is.
- */
-@PublishedApi
-internal inline fun <C> LabeledPolynomialAsIs(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial<C>(pairs.toMap())
-
-/**
- * Constructs [LabeledPolynomial] with provided coefficients map [coefs]. The map is used as is.
- *
- * **Be sure you read description of [LabeledPolynomial.coefficients]. Otherwise, you may make a mistake that will
- * cause wrong computation result or even runtime error.**
- */
-@DelicatePolynomialAPI
-public inline fun <C> LabeledPolynomialWithoutCheck(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial<C>(coefs)
-
-/**
- * Constructs [LabeledPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
- * The collections will be transformed to map with [toMap] and then will be used as is.
- *
- * **Be sure you read description of [LabeledPolynomial.coefficients]. Otherwise, you may make a mistake that will
- * cause wrong computation result or even runtime error.**
- */
-@DelicatePolynomialAPI
-public inline fun <C> LabeledPolynomialWithoutCheck(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial<C>(pairs.toMap())
-
-/**
- * Constructs [LabeledPolynomial] with provided array of [pairs] of pairs "term's signature &mdash; term's coefficient".
- * The array will be transformed to map with [toMap] and then will be used as is.
- *
- * **Be sure you read description of [LabeledPolynomial.coefficients]. Otherwise, you may make a mistake that will
- * cause wrong computation result or even runtime error.**
- */
-@DelicatePolynomialAPI
-public inline fun <C> LabeledPolynomialWithoutCheck(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial<C>(pairs.toMap())
-
-/**
- * Constructs [LabeledPolynomial] with provided coefficients map [coefs].
- *
- * [coefs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see LabeledPolynomialWithoutCheck
- */
-public fun <C> LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>, add: (C, C) -> C) : LabeledPolynomial<C> =
-    LabeledPolynomialAsIs(
-        coefs.mapKeys({ key, _ -> key.cleanUp() }, add)
-    )
-
-/**
- * Constructs [LabeledPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see LabeledPolynomialWithoutCheck
- */
-public fun <C> LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>, add: (C, C) -> C) : LabeledPolynomial<C> =
-    LabeledPolynomialAsIs(
-        pairs.associateBy({ it.first.cleanUp() }, { it.second }, add)
-    )
-
-/**
- * Constructs [LabeledPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see LabeledPolynomialWithoutCheck
- */
-public fun <C> LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>, add: (C, C) -> C) : LabeledPolynomial<C> =
-    LabeledPolynomialAsIs(
-        pairs.asIterable().associateBy({ it.first.cleanUp() }, { it.second }, add)
-    )
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-/**
- * Constructs [LabeledPolynomial] with provided coefficients map [coefs].
- *
- * [coefs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see LabeledPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> A.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs, ::add)
-/**
- * Constructs [LabeledPolynomial] with provided coefficients map [coefs].
- *
- * [coefs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see LabeledPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs) { left: C, right: C -> left + right }
-
-/**
- * Constructs [LabeledPolynomial] with provided coefficients map [coefs].
- *
- * [coefs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see LabeledPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(coefs: Map<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(coefs) { left: C, right: C -> left + right }
-
-/**
- * Constructs [LabeledPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see LabeledPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> A.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs, ::add)
-
-/**
- * Constructs [LabeledPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see LabeledPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs) { left: C, right: C -> left + right }
-/**
- * Constructs [LabeledPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see LabeledPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(pairs: Collection<Pair<Map<Symbol, UInt>, C>>) : LabeledPolynomial<C> = LabeledPolynomial(pairs) { left: C, right: C -> left + right }
-
-/**
- * Constructs [LabeledPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see LabeledPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> A.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs) { left: C, right: C -> left + right }
-/**
- * Constructs [LabeledPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see LabeledPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs) { left: C, right: C -> left + right }
-/**
- * Constructs [LabeledPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see LabeledPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomial(vararg pairs: Pair<Map<Symbol, UInt>, C>) : LabeledPolynomial<C> = LabeledPolynomial(*pairs) { left: C, right: C -> left + right }
-
-/**
- * Converts [this] constant to [LabeledPolynomial].
- */
-public inline fun <C> C.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this))
-
-///**
-//// * Converts [this] variable to [LabeledPolynomial].
-//// */
-//context(A)
-//public inline fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to one))
-///**
-// * Converts [this] variable to [LabeledPolynomial].
-// */
-//context(LabeledPolynomialSpace<C, A>)
-//public inline fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
-///**
-// * Converts [this] variable to [LabeledPolynomial].
-// */
-//context(LabeledRationalFunctionSpace<C, A>)
-//public inline fun <C, A: Ring<C>> Symbol.asLabeledPolynomial() : LabeledPolynomial<C> = LabeledPolynomial<C>(mapOf(mapOf(this to 1u) to constantOne))
-
-/**
- * Marks DSL that allows to more simply create [LabeledPolynomial]s with good performance.
- *
- * For example, polynomial \(5 a^2 c^3 - 6 b\) can be described as
- * ```
- * Int.algebra {
- *     val labeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomialDSL1 {
- *         5 { a inPowerOf 2u; c inPowerOf 3u } // 5 a^2 c^3 +
- *         (-6) { b inPowerOf 1u }              // (-6) b^1
- *     }
- * }
- * ```
- * @usesMathJax
- */
-@DslMarker
-@UnstableKMathAPI
-internal annotation class LabeledPolynomialConstructorDSL1
-
-/**
- * Builder of [LabeledPolynomial] signature. It should be used as an implicit context for lambdas that describe term signature.
- */
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL1
-public class DSL1LabeledPolynomialTermSignatureBuilder {
-    /**
-     * Signature storage. Any declaration of any variable's power updates the storage by increasing corresponding value.
-     * Afterward the storage will be used as a resulting signature.
-     */
-    private val signature: MutableMap<Symbol, UInt> = LinkedHashMap()
-
-    /**
-     * Builds the resulting signature.
-     *
-     * In fact, it just returns [signature] as regular signature of type `List<UInt>`.
-     */
-    @PublishedApi
-    internal fun build(): Map<Symbol, UInt> = signature
-
-    /**
-     * Declares power of [this] variable of degree [deg].
-     *
-     * Declaring another power of the same variable will increase its degree by received degree.
-     */
-    public infix fun Symbol.inPowerOf(deg: UInt) {
-        if (deg == 0u) return
-        signature.putOrChange(this, deg) { it -> it + deg }
-    }
-    /**
-     * Declares power of [this] variable of degree [deg].
-     *
-     * Declaring another power of the same variable will increase its degree by received degree.
-     */
-    public inline infix fun Symbol.pow(deg: UInt): Unit = this inPowerOf deg
-    /**
-     * Declares power of [this] variable of degree [deg].
-     *
-     * Declaring another power of the same variable will increase its degree by received degree.
-     */
-    public inline infix fun Symbol.`in`(deg: UInt): Unit = this inPowerOf deg
-    /**
-     * Declares power of [this] variable of degree [deg].
-     *
-     * Declaring another power of the same variable will increase its degree by received degree.
-     */
-    public inline infix fun Symbol.of(deg: UInt): Unit = this inPowerOf deg
-}
-
-/**
- * Builder of [LabeledPolynomial]. It should be used as an implicit context for lambdas that describe [LabeledPolynomial].
- */
-@UnstableKMathAPI
-@LabeledPolynomialConstructorDSL1
-public class DSL1LabeledPolynomialBuilder<C>(
-    /**
-     * Summation operation that will be used to sum coefficients of monomials of same signatures.
-     */
-    private val add: (C, C) -> C,
-    /**
-     * Initial capacity of coefficients map.
-     */
-    initialCapacity: Int? = null
-) {
-    /**
-     * Coefficients storage. Any declaration of any monomial updates the storage.
-     * Afterward the storage will be used as a resulting coefficients map.
-     */
-    private val coefficients: MutableMap<Map<Symbol, UInt>, C> = if (initialCapacity != null) LinkedHashMap(initialCapacity) else LinkedHashMap()
-
-    /**
-     * Builds the resulting coefficients map.
-     *
-     * In fact, it just returns [coefficients] as regular coefficients map of type `Map<Map<Symbol, UInt>, C>`.
-     */
-    @PublishedApi
-    internal fun build(): LabeledPolynomial<C> = LabeledPolynomial<C>(coefficients)
-
-    /**
-     * Declares monomial with [this] coefficient and provided [signature].
-     *
-     * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
-     * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
-     */
-    public infix fun C.with(signature: Map<Symbol, UInt>) {
-        coefficients.putOrChange(signature, this@with, add)
-    }
-    /**
-     * Declares monomial with [this] coefficient and signature constructed by [block].
-     *
-     * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
-     * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
-     */
-    public inline infix fun C.with(noinline block: DSL1LabeledPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
-    /**
-     * Declares monomial with [this] coefficient and signature constructed by [block].
-     *
-     * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
-     * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
-     */
-    public inline operator fun C.invoke(block: DSL1LabeledPolynomialTermSignatureBuilder.() -> Unit): Unit =
-        this with DSL1LabeledPolynomialTermSignatureBuilder().apply(block).build()
-}
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-///**
-// * Creates [LabeledPolynomial] with lambda [block] in context of [this] ring of constants.
-// *
-// * For example, polynomial \(5 a^2 c^3 - 6 b\) can be described as
-// * ```
-// * Int.algebra {
-// *     val labeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomialDSL1 {
-// *         5 { a inPowerOf 2u; c inPowerOf 3u } // 5 a^2 c^3 +
-// *         (-6) { b inPowerOf 1u }              // (-6) b^1
-// *     }
-// * }
-// * ```
-// * @usesMathJax
-// */
-// FIXME: For now this fabric does not let next two fabrics work. (See KT-52803.) Possible feature solutions:
-//  1. `LowPriorityInOverloadResolution` becomes public. Then it should be applied to this function.
-//  2. Union types are implemented. Then all three functions should be rewritten
-//     as one with single union type as a (context) receiver.
-//@UnstableKMathAPI
-//public inline fun <C, A: Ring<C>> A.LabeledPolynomialDSL1(initialCapacity: Int? = null, block: LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = LabeledPolynomialBuilder(::add, initialCapacity).apply(block).build()
-/**
- * Creates [LabeledPolynomial] with lambda [block] in context of [this] ring of [LabeledPolynomial]s.
- *
- * For example, polynomial \(5 a^2 c^3 - 6 b\) can be described as
- * ```
- * Int.algebra {
- *     val labeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomialDSL1 {
- *         5 { a inPowerOf 2u; c inPowerOf 3u } // 5 a^2 c^3 +
- *         (-6) { b inPowerOf 1u }              // (-6) b^1
- *     }
- * }
- * ```
- * @usesMathJax
- */
-@UnstableKMathAPI
-public inline fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomialDSL1(initialCapacity: Int? = null, block: DSL1LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = DSL1LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
-/**
- * Creates [LabeledPolynomial] with lambda [block] in context of [this] field of [LabeledRationalFunction]s.
- *
- * For example, polynomial \(5 a^2 c^3 - 6 b\) can be described as
- * ```
- * Int.algebra {
- *     val labeledPolynomial : LabeledPolynomial<Int> = LabeledPolynomialDSL1 {
- *         5 { a inPowerOf 2u; c inPowerOf 3u } // 5 a^2 c^3 +
- *         (-6) { b inPowerOf 1u }              // (-6) b^1
- *     }
- * }
- * ```
- * @usesMathJax
- */
-@UnstableKMathAPI
-public inline fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomialDSL1(initialCapacity: Int? = null, block: DSL1LabeledPolynomialBuilder<C>.() -> Unit) : LabeledPolynomial<C> = DSL1LabeledPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
-
-/**
- * Marks DSL that allows to more simply create [LabeledPolynomial]s with good performance.
- *
- * For example, polynomial \(5 a^2 c^3 - 6 b\) can be described as
- * ```
- * Int.algebra {
- *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
- *         5 { a inPowerOf 2u; c inPowerOf 3u } // 5 a^2 c^3 +
- *         (-6) { b inPowerOf 1u }              // (-6) b^1
- *     }
- * }
- * ```
- * @usesMathJax
- */
-@DslMarker
-@UnstableKMathAPI
-internal annotation class LabeledPolynomialBuilderDSL2
-
-/**
- * Builder of [LabeledPolynomial]. It should be used as an implicit context for lambdas that describe [LabeledPolynomial].
- */
-@UnstableKMathAPI
-@LabeledPolynomialBuilderDSL2
-public class DSL2LabeledPolynomialBuilder<C>(
-    private val ring: Ring<C>,
-    /**
-     * Initial capacity of coefficients map.
-     */
-    initialCapacity: Int? = null
-) {
-    /**
-     * Coefficients storage. Any declaration of any monomial updates the storage.
-     * Afterward the storage will be used as a resulting coefficients map.
-     */
-    private val coefficients: MutableMap<Map<Symbol, UInt>, C> = if (initialCapacity != null) LinkedHashMap(initialCapacity) else LinkedHashMap()
-
-    /**
-     * Builds the resulting coefficients map.
-     *
-     * In fact, it just returns [coefficients] as regular coefficients map of type `Map<Map<Symbol, UInt>, C>`.
-     */
-    @PublishedApi
-    internal fun build(): LabeledPolynomial<C> = LabeledPolynomial<C>(coefficients)
-
-    public inner class Term internal constructor(
-        internal val signature: Map<Symbol, UInt> = HashMap(),
-        internal val coefficient: C
-    )
-
-    private inline fun submit(signature: Map<Symbol, UInt>, onPut: Ring<C>.() -> C, onChange: Ring<C>.(C) -> C) {
-        coefficients.putOrChange<_, C>(signature, { ring.onPut() }, { ring.onChange(it) })
-    }
-
-    private inline fun submit(signature: Map<Symbol, UInt>, lazyCoefficient: Ring<C>.() -> C) {
-        submit(signature, lazyCoefficient) { it + lazyCoefficient() }
-    }
-
-    private fun submit(signature: Map<Symbol, UInt>, coefficient: C) {
-        submit(signature) { coefficient }
-    }
-
-    // TODO: `@submit` will be resolved differently. Change it to `@C`.
-    private fun C.submitSelf() = submit(emptyMap()) { this@submitSelf }
-
-    private fun Symbol.submit() = submit(mapOf(this to 1u)) { one }
-
-    private fun Term.submit(): Submit {
-        submit(signature, coefficient)
-        return Submit
-    }
-
-    public object Submit
-
-    public operator fun C.unaryPlus(): Submit {
-        submitSelf()
-        return Submit
-    }
-
-    public operator fun C.unaryMinus(): Submit {
-        submit(emptyMap(), { -this@unaryMinus }, { it - this@unaryMinus })
-        return Submit
-    }
-
-    public operator fun C.plus(other: C): Submit {
-        submit(emptyMap()) { this@plus + other }
-        return Submit
-    }
-
-    public operator fun C.minus(other: C): Submit {
-        submit(emptyMap()) { this@minus - other }
-        return Submit
-    }
-
-    public operator fun C.times(other: C): C = ring { this@times * other }
-
-    public operator fun C.plus(other: Symbol): Submit {
-        submit(emptyMap(), this)
-        submit(mapOf(other to 1u), ring.one)
-        return Submit
-    }
-
-    public operator fun C.minus(other: Symbol): Submit {
-        submit(emptyMap(), this)
-        submit(mapOf(other to 1u), { -one }, { it - one })
-        return Submit
-    }
-
-    public operator fun C.times(other: Symbol): Term = Term(mapOf(other to 1u), this)
-
-    public operator fun C.plus(other: Term): Submit {
-        submit(emptyMap(), this)
-        other.submit()
-        return Submit
-    }
-
-    public operator fun C.minus(other: Term): Submit {
-        submit(emptyMap(), this)
-        submit(other.signature, { -other.coefficient }, { it - other.coefficient })
-        return Submit
-    }
-
-    public operator fun C.times(other: Term): Term = Term(other.signature, ring { this@times * other.coefficient })
-
-    public operator fun Symbol.plus(other: C): Submit {
-        this.submit()
-        other.submitSelf()
-        return Submit
-    }
-
-    public operator fun Symbol.minus(other: C): Submit {
-        this.submit()
-        submit(emptyMap(), { -other }, { it - other })
-        return Submit
-    }
-
-    public operator fun Symbol.times(other: C): Term = Term(mapOf(this to 1u), other)
-
-    public operator fun Symbol.unaryPlus(): Submit {
-        this.submit()
-        return Submit
-    }
-
-    public operator fun Symbol.unaryMinus(): Submit {
-        submit(mapOf(this to 1u), { -one }, { it - one })
-        return Submit
-    }
-
-    public operator fun Symbol.plus(other: Symbol): Submit {
-        this.submit()
-        other.submit()
-        return Submit
-    }
-
-    public operator fun Symbol.minus(other: Symbol): Submit {
-        this.submit()
-        submit(mapOf(other to 1u), { -one }, { it - one })
-        return Submit
-    }
-
-    public operator fun Symbol.times(other: Symbol): Term =
-        if (this == other) Term(mapOf(this to 2u), ring.one)
-        else Term(mapOf(this to 1u, other to 1u), ring.one)
-
-    public operator fun Symbol.plus(other: Term): Submit {
-        this.submit()
-        other.submit()
-        return Submit
-    }
-
-    public operator fun Symbol.minus(other: Term): Submit {
-        this.submit()
-        submit(other.signature, { -other.coefficient }, { it - other.coefficient })
-        return Submit
-    }
-
-    public operator fun Symbol.times(other: Term): Term =
-        Term(
-            other.signature.withPutOrChanged(this, 1u) { it -> it + 1u },
-            other.coefficient
-        )
-
-    public operator fun Term.plus(other: C): Submit {
-        this.submit()
-        other.submitSelf()
-        return Submit
-    }
-
-    public operator fun Term.minus(other: C): Submit {
-        this.submit()
-        submit(emptyMap(), { -other }, { it - other })
-        return Submit
-    }
-
-    public operator fun Term.times(other: C): Term =
-        Term(
-            signature,
-            ring { coefficient * other }
-        )
-
-    public operator fun Term.plus(other: Symbol): Submit {
-        this.submit()
-        other.submit()
-        return Submit
-    }
-
-    public operator fun Term.minus(other: Symbol): Submit {
-        this.submit()
-        submit(mapOf(other to 1u), { -one }, { it - one })
-        return Submit
-    }
-
-    public operator fun Term.times(other: Symbol): Term =
-        Term(
-            signature.withPutOrChanged(other, 1u) { it -> it + 1u },
-            coefficient
-        )
-
-    public operator fun Term.unaryPlus(): Submit {
-        this.submit()
-        return Submit
-    }
-
-    public operator fun Term.unaryMinus(): Submit {
-        submit(signature, { -coefficient }, { it - coefficient })
-        return Submit
-    }
-
-    public operator fun Term.plus(other: Term): Submit {
-        this.submit()
-        other.submit()
-        return Submit
-    }
-
-    public operator fun Term.minus(other: Term): Submit {
-        this.submit()
-        submit(other.signature, { -other.coefficient }, { it - other.coefficient })
-        return Submit
-    }
-
-    public operator fun Term.times(other: Term): Term =
-        Term(
-            mergeBy(signature, other.signature) { deg1, deg2 -> deg1 + deg2 },
-            ring { coefficient * other.coefficient }
-        )
-}
-
-//@UnstableKMathAPI
-//public fun <C> Ring<C>.LabeledPolynomialDSL2(initialCapacity: Int? = null, block: DSL2LabeledPolynomialBuilder<C>.() -> Unit): LabeledPolynomial<C> = DSL2LabeledPolynomialBuilder(this, initialCapacity).apply(block).build()
-
-@UnstableKMathAPI
-public fun <C, A: Ring<C>> LabeledPolynomialSpace<C, A>.LabeledPolynomialDSL2(initialCapacity: Int? = null, block: DSL2LabeledPolynomialBuilder<C>.() -> Unit): LabeledPolynomial<C> = DSL2LabeledPolynomialBuilder(ring, initialCapacity).apply(block).build()
-
-@UnstableKMathAPI
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledPolynomialDSL2(initialCapacity: Int? = null, block: DSL2LabeledPolynomialBuilder<C>.() -> Unit): LabeledPolynomial<C> = DSL2LabeledPolynomialBuilder(ring, initialCapacity).apply(block).build()
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-/**
- * Constructs [LabeledRationalFunction] with provided coefficients maps [numeratorCoefficients] and [denominatorCoefficients].
- *
- * The maps will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. the maps' keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- */
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients),
-        LabeledPolynomial(denominatorCoefficients)
-    )
-/**
- * Constructs [LabeledRationalFunction] with provided coefficients maps [numeratorCoefficients] and [denominatorCoefficients].
- *
- * The maps will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. the maps' keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- */
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>, denominatorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients),
-        LabeledPolynomial(denominatorCoefficients)
-    )
-
-/**
- * Constructs [LabeledRationalFunction] with provided [numerator] and unit denominator.
- */
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(numerator, LabeledPolynomial(mapOf(emptyMap<Symbol, UInt>() to one)))
-/**
- * Constructs [LabeledRationalFunction] with provided [numerator] and unit denominator.
- */
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numerator: LabeledPolynomial<C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(numerator, polynomialOne)
-
-/**
- * Constructs [LabeledRationalFunction] with provided coefficients map [numeratorCoefficients] for numerator and unit
- * denominator.
- *
- * [numeratorCoefficients] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [numeratorCoefficients]'s keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- */
-public fun <C, A: Ring<C>> LabeledRationalFunctionSpace<C, A>.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients),
-        polynomialOne
-    )
-/**
- * Constructs [LabeledRationalFunction] with provided coefficients map [numeratorCoefficients] for numerator and unit
- * denominator.
- *
- * [numeratorCoefficients] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [numeratorCoefficients]'s keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- */
-public fun <C, A: Ring<C>> A.LabeledRationalFunction(numeratorCoefficients: Map<Map<Symbol, UInt>, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction<C>(
-        LabeledPolynomial(numeratorCoefficients),
-        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to one))
-    )
-
-///**
-// * Converts [this] constant to [LabeledRationalFunction].
-// */
-//context(A)
-//public fun <C, A: Ring<C>> C.asLabeledRationalFunction() : LabeledRationalFunction<C> =
-//    LabeledRationalFunction(
-//        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this)),
-//        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to one))
-//    )
-///**
-// * Converts [this] constant to [LabeledRationalFunction].
-// */
-//context(LabeledRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> C.asLabeledRationalFunction() : LabeledRationalFunction<C> =
-//    LabeledRationalFunction(
-//        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to this)),
-//        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to constantOne))
-//    )
-
-///**
-// * Converts [this] variable to [LabeledRationalFunction].
-// */
-//context(A)
-//public fun <C, A: Ring<C>> Symbol.asLabeledRationalFunction() : LabeledRationalFunction<C> =
-//    LabeledRationalFunction(
-//        LabeledPolynomialAsIs(mapOf(mapOf(this to 1u) to one)),
-//        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to one))
-//    )
-///**
-// * Converts [this] variable to [LabeledRationalFunction].
-// */
-//context(LabeledRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> Symbol.asLabeledRationalFunction() : LabeledRationalFunction<C> =
-//    LabeledRationalFunction(
-//        LabeledPolynomialAsIs(mapOf(mapOf(this to 1u) to constantOne)),
-//        LabeledPolynomialAsIs(mapOf(emptyMap<Symbol, UInt>() to constantOne))
-//    )
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
deleted file mode 100644
index 188240bf7..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.jvm.JvmName
-
-
-/**
- * Creates a [LabeledPolynomialSpace] over a received ring.
- */
-public inline val <C, A : Ring<C>> A.labeledPolynomialSpace: LabeledPolynomialSpace<C, A>
-    get() = LabeledPolynomialSpace(this)
-
-/**
- * Creates a [LabeledPolynomialSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.labeledPolynomialSpace(block: LabeledPolynomialSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return LabeledPolynomialSpace(this).block()
-}
-/**
- * Creates a [LabeledRationalFunctionSpace] over a received ring.
- */
-public inline val <C, A : Ring<C>> A.labeledRationalFunctionSpace: LabeledRationalFunctionSpace<C, A>
-    get() = LabeledRationalFunctionSpace(this)
-
-/**
- * Creates a [LabeledRationalFunctionSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.labeledRationalFunctionSpace(block: LabeledRationalFunctionSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return LabeledRationalFunctionSpace(this).block()
-}
-
-/**
- * Substitutes provided Double arguments [args] into [this] Double polynomial.
- */
-public fun LabeledPolynomial<Double>.substitute(args: Map<Symbol, Double>): LabeledPolynomial<Double> = Double.algebra {
-    if (coefficients.isEmpty()) return this@substitute
-    LabeledPolynomial<Double>(
-        buildMap {
-            coefficients.forEach { (degs, c) ->
-                val newDegs = degs.filterKeys { it !in args }
-                val newC = args.entries.fold(c) { product, (variable, substitution) ->
-                    val deg = degs.getOrElse(variable) { 0u }
-                    if (deg == 0u) product else product * power(substitution, deg)
-                }
-                putOrChange(newDegs, newC, ::add)
-            }
-        }
-    )
-}
-
-/**
- * Substitutes provided arguments [args] into [this] polynomial.
- */
-public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Symbol, C>): LabeledPolynomial<C> = ring {
-    if (coefficients.isEmpty()) return this@substitute
-    LabeledPolynomial<C>(
-        buildMap {
-            coefficients.forEach { (degs, c) ->
-                val newDegs = degs.filterKeys { it !in args }
-                val newC = args.entries.fold(c) { product, (variable, substitution) ->
-                    val deg = degs.getOrElse(variable) { 0u }
-                    if (deg == 0u) product else product * power(substitution, deg)
-                }
-                putOrChange(newDegs, newC, ::add)
-            }
-        }
-    )
-}
-
-/**
- * Substitutes provided arguments [args] into [this] polynomial.
- */ // TODO: To optimize boxing
-@JvmName("substitutePolynomial")
-public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Symbol, LabeledPolynomial<C>>) : LabeledPolynomial<C> =
-    ring.labeledPolynomialSpace {
-        coefficients.entries.fold(zero) { acc, (degs, c) ->
-            val newDegs = degs.filterKeys { it !in args }
-            acc + args.entries.fold(LabeledPolynomial<C>(mapOf(newDegs to c))) { product, (variable, substitution) ->
-                val deg = degs.getOrElse(variable) { 0u }
-                if (deg == 0u) product else product * power(substitution, deg)
-            }
-        }
-    }
-
-/**
- * Substitutes provided arguments [args] into [this] polynomial.
- */ // TODO: To optimize boxing
-@JvmName("substituteRationalFunction")
-public fun <C> LabeledPolynomial<C>.substitute(ring: Ring<C>, args: Map<Symbol, LabeledRationalFunction<C>>) : LabeledRationalFunction<C> =
-    ring.labeledRationalFunctionSpace {
-        coefficients.entries.fold(zero) { acc, (degs, c) ->
-            val newDegs = degs.filterKeys { it !in args }
-            acc + args.entries.fold(LabeledRationalFunction(LabeledPolynomial<C>(mapOf(newDegs to c)))) { product, (variable, substitution) ->
-                val deg = degs.getOrElse(variable) { 0u }
-                if (deg == 0u) product else product * power(substitution, deg)
-            }
-        }
-    }
-
-/**
- * Substitutes provided Double arguments [args] into [this] Double rational function.
- */
-public fun LabeledRationalFunction<Double>.substitute(args: Map<Symbol, Double>): LabeledRationalFunction<Double> =
-    LabeledRationalFunction(numerator.substitute(args), denominator.substitute(args))
-
-/**
- * Substitutes provided arguments [args] into [this] rational function.
- */
-public fun <C> LabeledRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Symbol, C>): LabeledRationalFunction<C> =
-    LabeledRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
-
-/**
- * Substitutes provided arguments [args] into [this] rational function.
- */ // TODO: To optimize calculation
-@JvmName("substitutePolynomial")
-public fun <C> LabeledRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Symbol, LabeledPolynomial<C>>) : LabeledRationalFunction<C> =
-    LabeledRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
-
-/**
- * Substitutes provided arguments [args] into [this] rational function.
- */ // TODO: To optimize calculation
-@JvmName("substituteRationalFunction")
-public fun <C> LabeledRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Symbol, LabeledRationalFunction<C>>) : LabeledRationalFunction<C> =
-    ring.labeledRationalFunctionSpace {
-        numerator.substitute(ring, args) / denominator.substitute(ring, args)
-    }
-
-/**
- * Returns algebraic derivative of received polynomial with respect to provided variable.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.derivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-): LabeledPolynomial<C> = algebra {
-    LabeledPolynomial<C>(
-        buildMap(coefficients.count { it.key.getOrElse(variable) { 0u } >= 1u }) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (variable !in degs) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                when {
-                                    vari != variable -> put(vari, deg)
-                                    deg > 1u -> put(vari, deg - 1u)
-                                }
-                            }
-                        },
-                        multiplyByDoubling(c, degs[variable]!!)
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial with respect to provided variable of specified order.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-    order: UInt
-): LabeledPolynomial<C> = algebra {
-    if (order == 0u) return this@nthDerivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.count { it.key.getOrElse(variable) { 0u } >= order }) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.getOrElse(variable) { 0u } < order) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                when {
-                                    vari != variable -> put(vari, deg)
-                                    deg > order -> put(vari, deg - order)
-                                }
-                            }
-                        },
-                        degs[variable]!!.let { deg ->
-                            (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> multiplyByDoubling(acc, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial with respect to provided variables of specified orders.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> LabeledPolynomial<C>.nthDerivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Symbol, UInt>,
-): LabeledPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(
-            coefficients.count {
-                variablesAndOrders.all { (variable, order) ->
-                    it.key.getOrElse(variable) { 0u } >= order
-                }
-            }
-        ) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (filteredVariablesAndOrders.any { (variable, order) -> degs.getOrElse(variable) { 0u } < order }) return@forEach
-                    put(
-                        buildMap {
-                            degs.forEach { (vari, deg) ->
-                                if (vari !in filteredVariablesAndOrders) put(vari, deg)
-                                else {
-                                    val order = filteredVariablesAndOrders[vari]!!
-                                    if (deg > order) put(vari, deg - order)
-                                }
-                            }
-                        },
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            degs[index]!!.let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> multiplyByDoubling(acc2, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial with respect to provided variable.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.antiderivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-): LabeledPolynomial<C> = algebra {
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = degs.withPutOrChanged(variable, 1u) { it -> it + 1u }
-                    put(
-                        newDegs,
-                        c / multiplyByDoubling(one, newDegs[variable]!!)
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial with respect to provided variable of specified order.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variable: Symbol,
-    order: UInt
-): LabeledPolynomial<C> = algebra {
-    if (order == 0u) return this@nthAntiderivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = degs.withPutOrChanged(variable, order) { it -> it + order }
-                    put(
-                        newDegs,
-                        newDegs[variable]!!.let { deg ->
-                            (deg downTo  deg - order + 1u)
-                                .fold(c) { acc, ord -> acc / multiplyByDoubling(one, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial with respect to provided variables of specified orders.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> LabeledPolynomial<C>.nthAntiderivativeWithRespectTo(
-    algebra: A,
-    variablesAndOrders: Map<Symbol, UInt>,
-): LabeledPolynomial<C> = algebra {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthAntiderivativeWithRespectTo
-    LabeledPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    val newDegs = mergeBy(degs, filteredVariablesAndOrders) { deg, order -> deg + order }
-                    put(
-                        newDegs,
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            newDegs[index]!!.let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> acc2 / multiplyByDoubling(one, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
deleted file mode 100644
index 30b1e2fe4..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.operations.Ring
-
-
-/**
- * Constructs a [ListPolynomial] instance with provided [coefficients]. The collection of coefficients will be reversed
- * if [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C> ListPolynomial(coefficients: List<C>, reverse: Boolean = false): ListPolynomial<C> =
-    ListPolynomial(with(coefficients) { if (reverse) reversed() else this })
-
-/**
- * Constructs a [ListPolynomial] instance with provided [coefficients]. The collection of coefficients will be reversed
- * if [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C> ListPolynomial(vararg coefficients: C, reverse: Boolean = false): ListPolynomial<C> =
-    ListPolynomial(with(coefficients) { if (reverse) reversed() else toList() })
-
-/**
- * Represents [this] constant as a [ListPolynomial].
- */
-public fun <C> C.asListPolynomial() : ListPolynomial<C> = ListPolynomial(listOf(this))
-
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-/**
- * Constructs [ListRationalFunction] instance with numerator and denominator constructed with provided
- * [numeratorCoefficients] and [denominatorCoefficients]. The both collections of coefficients will be reversed if
- * [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C> ListRationalFunction(numeratorCoefficients: List<C>, denominatorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        ListPolynomial( with(denominatorCoefficients) { if (reverse) reversed() else this } )
-    )
-/**
- * Constructs [ListRationalFunction] instance with provided [numerator] and unit denominator.
- */
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
-    ListRationalFunction<C>(numerator, ListPolynomial(listOf(one)))
-/**
- * Constructs [ListRationalFunction] instance with provided [numerator] and unit denominator.
- */
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numerator: ListPolynomial<C>): ListRationalFunction<C> =
-    ListRationalFunction<C>(numerator, polynomialOne)
-/**
- * Constructs [ListRationalFunction] instance with numerator constructed with provided [numeratorCoefficients] and unit
- * denominator. The collection of numerator coefficients will be reversed if [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> A.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        ListPolynomial(listOf(one))
-    )
-/**
- * Constructs [ListRationalFunction] instance with numerator constructed with provided [numeratorCoefficients] and unit
- * denominator. The collection of numerator coefficients will be reversed if [reverse] parameter is true.
- */
-@Suppress("FunctionName")
-public fun <C, A: Ring<C>> ListRationalFunctionSpace<C, A>.ListRationalFunction(numeratorCoefficients: List<C>, reverse: Boolean = false): ListRationalFunction<C> =
-    ListRationalFunction<C>(
-        ListPolynomial( with(numeratorCoefficients) { if (reverse) reversed() else this } ),
-        polynomialOne
-    )
-
-/**
- * Represents [this] constant as a rational function.
- */ // FIXME: When context receivers will be ready, delete this function and uncomment the following two
-public fun <C, A: Ring<C>> C.asListRationalFunction(ring: A) : ListRationalFunction<C> = ring.ListRationalFunction(asListPolynomial())
-///**
-// * Represents [this] constant as a rational function.
-// */
-//context(A)
-//public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
-///**
-// * Represents [this] constant as a rational function.
-// */
-//context(ListRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> C.asListRationalFunction() : ListRationalFunction<C> = ListRationalFunction(asListPolynomial())
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
deleted file mode 100644
index e7c11f5ea..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.*
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.math.max
-import kotlin.math.pow
-
-
-/**
- * Creates a [ListPolynomialSpace] over a received ring.
- */
-public inline val <C, A : Ring<C>> A.listPolynomialSpace: ListPolynomialSpace<C, A>
-    get() = ListPolynomialSpace(this)
-
-/**
- * Creates a [ListPolynomialSpace]'s scope over a received ring.
- */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
-public inline fun <C, A : Ring<C>, R> A.listPolynomialSpace(block: ListPolynomialSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ListPolynomialSpace(this).block()
-}
-
-/**
- * Creates a [ScalableListPolynomialSpace] over a received scalable ring.
- */
-public inline val <C, A> A.scalableListPolynomialSpace: ScalableListPolynomialSpace<C, A> where A : Ring<C>, A : ScaleOperations<C>
-    get() = ScalableListPolynomialSpace(this)
-
-/**
- * Creates a [ScalableListPolynomialSpace]'s scope over a received scalable ring.
- */ // TODO: When context will be ready move [ListPolynomialSpace] and add [A] to context receivers of [block]
-public inline fun <C, A, R> A.scalableListPolynomialSpace(block: ScalableListPolynomialSpace<C, A>.() -> R): R where A : Ring<C>, A : ScaleOperations<C> {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ScalableListPolynomialSpace(this).block()
-}
-
-/**
- * Creates a [ListRationalFunctionSpace] over a received ring.
- */
-public inline val <C, A : Ring<C>> A.listRationalFunctionSpace: ListRationalFunctionSpace<C, A>
-    get() = ListRationalFunctionSpace(this)
-
-/**
- * Creates a [ListRationalFunctionSpace]'s scope over a received ring.
- */ // TODO: When context will be ready move [ListRationalFunctionSpace] and add [A] to context receivers of [block]
-public inline fun <C, A : Ring<C>, R> A.listRationalFunctionSpace(block: ListRationalFunctionSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return ListRationalFunctionSpace(this).block()
-}
-
-
-/**
- * Evaluates value of [this] Double polynomial on provided Double argument.
- */
-public fun ListPolynomial<Double>.substitute(arg: Double): Double =
-    coefficients.reduceIndexedOrNull { index, acc, c ->
-        acc + c * arg.pow(index)
-    } ?: .0
-
-/**
- * Evaluates value of [this] polynomial on provided argument.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */
-public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: C): C = ring {
-    if (coefficients.isEmpty()) return zero
-    var result: C = coefficients.last()
-    for (j in coefficients.size - 2 downTo 0) {
-        result = (arg * result) + coefficients[j]
-    }
-    return result
-}
-
-/**
- * Substitutes provided polynomial [arg] into [this] polynomial.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */ // TODO: To optimize boxing
-public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListPolynomial<C> =
-    ring.listPolynomialSpace {
-        if (coefficients.isEmpty()) return zero
-        var result: ListPolynomial<C> = coefficients.last().asPolynomial()
-        for (j in coefficients.size - 2 downTo 0) {
-            result = (arg * result) + coefficients[j]
-        }
-        return result
-    }
-
-/**
- * Substitutes provided rational function [arg] into [this] polynomial.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */ // TODO: To optimize boxing
-public fun <C> ListPolynomial<C>.substitute(ring: Ring<C>, arg: ListRationalFunction<C>) : ListRationalFunction<C> =
-    ring.listRationalFunctionSpace {
-        if (coefficients.isEmpty()) return zero
-        var result: ListRationalFunction<C> = coefficients.last().asRationalFunction()
-        for (j in coefficients.size - 2 downTo 0) {
-            result = (arg * result) + coefficients[j]
-        }
-        return result
-    }
-
-/**
- * Evaluates value of [this] Double rational function in provided Double argument.
- */
-public fun ListRationalFunction<Double>.substitute(arg: Double): Double =
-    numerator.substitute(arg) / denominator.substitute(arg)
-
-/**
- * Evaluates value of [this] polynomial for provided argument.
- *
- * It is an implementation of [Horner's method](https://en.wikipedia.org/wiki/Horner%27s_method).
- */
-public fun <C> ListRationalFunction<C>.substitute(ring: Field<C>, arg: C): C = ring {
-    numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
-}
-
-/**
- * Substitutes provided polynomial [arg] into [this] rational function.
- */ // TODO: To optimize boxing
-public fun <C> ListRationalFunction<C>.substitute(ring: Ring<C>, arg: ListPolynomial<C>) : ListRationalFunction<C> =
-    ring.listRationalFunctionSpace {
-        numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
-    }
-
-/**
- * Substitutes provided rational function [arg] into [this] rational function.
- */ // TODO: To optimize boxing
-public fun <C> ListRationalFunction<C>.substitute(ring: Ring<C>, arg: ListRationalFunction<C>) : ListRationalFunction<C> =
-    ring.listRationalFunctionSpace {
-        numerator.substitute(ring, arg) / denominator.substitute(ring, arg)
-    }
-
-/**
- * Represent [this] polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOver(ring: A): (C) -> C = { substitute(ring, it) }
-
-/**
- * Represent [this] polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfConstantOver(ring: A): (C) -> C = { substitute(ring, it) }
-
-/**
- * Represent [this] polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfPolynomialOver(ring: A): (ListPolynomial<C>) -> ListPolynomial<C> = { substitute(ring, it) }
-
-/**
- * Represent [this] polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListPolynomial<C>.asFunctionOfRationalFunctionOver(ring: A): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
-
-/**
- * Represent [this] rational function as a regular context-less function.
- */
-public fun <C, A : Field<C>> ListRationalFunction<C>.asFunctionOver(ring: A): (C) -> C = { substitute(ring, it) }
-
-/**
- * Represent [this] rational function as a regular context-less function.
- */
-public fun <C, A : Field<C>> ListRationalFunction<C>.asFunctionOfConstantOver(ring: A): (C) -> C = { substitute(ring, it) }
-
-/**
- * Represent [this] rational function as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListRationalFunction<C>.asFunctionOfPolynomialOver(ring: A): (ListPolynomial<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
-
-/**
- * Represent [this] rational function as a regular context-less function.
- */
-public fun <C, A : Ring<C>> ListRationalFunction<C>.asFunctionOfRationalFunctionOver(ring: A): (ListRationalFunction<C>) -> ListRationalFunction<C> = { substitute(ring, it) }
-
-/**
- * Returns algebraic derivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.derivative(
-    ring: A,
-): ListPolynomial<C> where  A : Ring<C>, A : NumericAlgebra<C> = ring {
-    ListPolynomial(
-        buildList(max(0, coefficients.size - 1)) {
-            for (deg in 1 .. coefficients.lastIndex) add(number(deg) * coefficients[deg])
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial of specified [order]. The [order] should be non-negative integer.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.nthDerivative(
-    ring: A,
-    order: Int,
-): ListPolynomial<C> where A : Ring<C>, A : NumericAlgebra<C> = ring {
-    require(order >= 0) { "Order of derivative must be non-negative" }
-    ListPolynomial(
-        buildList(max(0, coefficients.size - order)) {
-            for (deg in order.. coefficients.lastIndex)
-                add((deg - order + 1 .. deg).fold(coefficients[deg]) { acc, d -> acc * number(d) })
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.antiderivative(
-    ring: A,
-): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = ring {
-    ListPolynomial(
-        buildList(coefficients.size + 1) {
-            add(zero)
-            coefficients.mapIndexedTo(this) { index, t -> t / number(index + 1) }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial of specified [order]. The [order] should be non-negative integer.
- */
-@UnstableKMathAPI
-public fun <C, A> ListPolynomial<C>.nthAntiderivative(
-    ring: A,
-    order: Int,
-): ListPolynomial<C> where  A : Field<C>, A : NumericAlgebra<C> = ring {
-    require(order >= 0) { "Order of antiderivative must be non-negative" }
-    ListPolynomial(
-        buildList(coefficients.size + order) {
-            repeat(order) { add(zero) }
-            coefficients.mapIndexedTo(this) { index, c -> (1..order).fold(c) { acc, i -> acc / number(index + i) } }
-        }
-    )
-}
-
-/**
- * Computes a definite integral of [this] polynomial in the specified [range].
- */
-@UnstableKMathAPI
-public fun <C : Comparable<C>> ListPolynomial<C>.integrate(
-    ring: Field<C>,
-    range: ClosedRange<C>,
-): C = ring {
-    val antiderivative = antiderivative(ring)
-    antiderivative.substitute(ring, range.endInclusive) - antiderivative.substitute(ring, range.start)
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
deleted file mode 100644
index 0a251b3b7..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/misc.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-
-/**
- * Marks declarations that give access to internal entities of polynomials delicate structure. Thus, it allows to
- * optimize performance a bit by skipping standard steps, but such skips may cause critical errors if something is
- * implemented badly. Make sure you fully read and understand documentation and don't break internal contracts.
- */
-@RequiresOptIn(
-    message = "This declaration gives access to delicate internal structure of polynomials. " +
-            "It allows to optimize performance by skipping unnecessary arguments check. " +
-            "But at the same time makes it easy to make a mistake " +
-            "that will cause wrong computation result or even runtime error. " +
-            "Make sure you fully read and understand documentation.",
-    level = RequiresOptIn.Level.ERROR
-)
-public annotation class DelicatePolynomialAPI
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
deleted file mode 100644
index df4afbd12..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("FunctionName", "NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Ring
-
-
-/**
- * Returns the same degrees' description of the monomial, but without extra zero degrees on the end.
- */
-internal fun List<UInt>.cleanUp() = subList(0, indexOfLast { it != 0U } + 1)
-
-/**
- * Constructs [NumberedPolynomial] with provided coefficients map [coefs]. The map is used as is.
- */
-@PublishedApi
-internal inline fun <C> NumberedPolynomialAsIs(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial<C>(coefs)
-
-/**
- * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
- * The collections will be transformed to map with [toMap] and then will be used as is.
- */
-@PublishedApi
-internal inline fun <C> NumberedPolynomialAsIs(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial<C>(pairs.toMap())
-
-/**
- * Constructs [NumberedPolynomial] with provided array of [pairs] of pairs "term's signature &mdash; term's coefficient".
- * The array will be transformed to map with [toMap] and then will be used as is.
- */
-@PublishedApi
-internal inline fun <C> NumberedPolynomialAsIs(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial<C>(pairs.toMap())
-
-/**
- * Constructs [NumberedPolynomial] with provided coefficients map [coefs]. The map is used as is.
- *
- * **Be sure you read description of [NumberedPolynomial.coefficients]. Otherwise, you may make a mistake that will
- * cause wrong computation result or even runtime error.**
- */
-@DelicatePolynomialAPI
-public inline fun <C> NumberedPolynomialWithoutCheck(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial<C>(coefs)
-
-/**
- * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
- * The collections will be transformed to map with [toMap] and then will be used as is.
- *
- * **Be sure you read description of [NumberedPolynomial.coefficients]. Otherwise, you may make a mistake that will
- * cause wrong computation result or even runtime error.**
- */
-@DelicatePolynomialAPI
-public inline fun <C> NumberedPolynomialWithoutCheck(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial<C>(pairs.toMap())
-
-/**
- * Constructs [NumberedPolynomial] with provided array of [pairs] of pairs "term's signature &mdash; term's coefficient".
- * The array will be transformed to map with [toMap] and then will be used as is.
- *
- * **Be sure you read description of [NumberedPolynomial.coefficients]. Otherwise, you may make a mistake that will
- * cause wrong computation result or even runtime error.**
- */
-@DelicatePolynomialAPI
-public inline fun <C> NumberedPolynomialWithoutCheck(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial<C>(pairs.toMap())
-
-/**
- * Constructs [NumberedPolynomial] with provided coefficients map [coefs].
- *
- * [coefs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see NumberedPolynomialWithoutCheck
- */
-public fun <C> NumberedPolynomial(coefs: Map<List<UInt>, C>, add: (C, C) -> C) : NumberedPolynomial<C> =
-    NumberedPolynomialAsIs(
-        coefs.mapKeys({ key, _ -> key.cleanUp() }, add)
-    )
-
-/**
- * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see NumberedPolynomialWithoutCheck
- */
-public fun <C> NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>, add: (C, C) -> C) : NumberedPolynomial<C> =
-    NumberedPolynomialAsIs(
-        pairs.associateBy({ it.first.cleanUp() }, { it.second }, add)
-    )
-
-/**
- * Constructs [NumberedPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see NumberedPolynomialWithoutCheck
- */
-public fun <C> NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>, add: (C, C) -> C) : NumberedPolynomial<C> =
-    NumberedPolynomialAsIs(
-        pairs.asIterable().associateBy({ it.first.cleanUp() }, { it.second }, add)
-    )
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-/**
- * Constructs [NumberedPolynomial] with provided coefficients map [coefs].
- *
- * [coefs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see NumberedPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> A.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs, ::add)
-/**
- * Constructs [NumberedPolynomial] with provided coefficients map [coefs].
- *
- * [coefs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see NumberedPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs) { left: C, right: C -> left + right }
-
-/**
- * Constructs [NumberedPolynomial] with provided coefficients map [coefs].
- *
- * [coefs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [coefs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see NumberedPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(coefs: Map<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(coefs) { left: C, right: C -> left + right }
-
-/**
- * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see NumberedPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> A.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs, ::add)
-
-/**
- * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see NumberedPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs) { left: C, right: C -> left + right }
-/**
- * Constructs [NumberedPolynomial] with provided collection of [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- */
-public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(pairs: Collection<Pair<List<UInt>, C>>) : NumberedPolynomial<C> = NumberedPolynomial(pairs) { left: C, right: C -> left + right }
-
-/**
- * Constructs [NumberedPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see NumberedPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> A.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs) { left: C, right: C -> left + right }
-/**
- * Constructs [NumberedPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see NumberedPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs) { left: C, right: C -> left + right }
-/**
- * Constructs [NumberedPolynomial] with provided array [pairs] of pairs "term's signature &mdash; term's coefficient".
- *
- * [pairs] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [pairs] keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- *
- * @see NumberedPolynomialWithoutCheck
- */
-public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomial(vararg pairs: Pair<List<UInt>, C>) : NumberedPolynomial<C> = NumberedPolynomial(*pairs) { left: C, right: C -> left + right }
-
-/**
- * Converts [this] constant to [NumberedPolynomial].
- */
-public inline fun <C> C.asNumberedPolynomial() : NumberedPolynomial<C> = NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to this))
-
-/**
- * Marks DSL that allows to more simply create [NumberedPolynomial]s with good performance.
- *
- * For example, polynomial \(5 x_0^2 x_2^3 - 6 x_1\) can be described as
- * ```
- * Int.algebra {
- *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
- *         5 { 0 inPowerOf 2u; 2 inPowerOf 3u } // 5 x_0^2 x_2^3 +
- *         (-6) { 1 inPowerOf 1u }              // (-6) x_1^1
- *     }
- * }
- * ```
- * @usesMathJax
- */
-@DslMarker
-@UnstableKMathAPI
-internal annotation class NumberedPolynomialConstructorDSL1
-
-/**
- * Builder of [NumberedPolynomial] signature. It should be used as an implicit context for lambdas that describe term signature.
- */
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL1
-public class DSL1NumberedPolynomialTermSignatureBuilder {
-    /**
-     * Signature storage. Any declaration of any variable's power updates the storage by increasing corresponding value.
-     * Afterward the storage will be used as a resulting signature.
-     */
-    private val signature: MutableList<UInt> = ArrayList()
-
-    /**
-     * Builds the resulting signature.
-     *
-     * In fact, it just returns [signature] as regular signature of type `List<UInt>`.
-     */
-    @PublishedApi
-    internal fun build(): List<UInt> = signature
-
-    /**
-     * Declares power of variable #[this] of degree [deg].
-     *
-     * Declaring another power of the same variable will increase its degree by received degree.
-     */
-    public infix fun Int.inPowerOf(deg: UInt) {
-        if (deg == 0u) return
-        val index = this
-        if (index > signature.lastIndex) {
-            signature.addAll(List(index - signature.lastIndex - 1) { 0u })
-            signature.add(deg)
-        } else {
-            signature[index] += deg
-        }
-    }
-    /**
-     * Declares power of variable #[this] of degree [deg].
-     *
-     * Declaring another power of the same variable will increase its degree by received degree.
-     */
-    public inline infix fun Int.pow(deg: UInt): Unit = this inPowerOf deg
-    /**
-     * Declares power of variable #[this] of degree [deg].
-     *
-     * Declaring another power of the same variable will increase its degree by received degree.
-     */
-    public inline infix fun Int.`in`(deg: UInt): Unit = this inPowerOf deg
-    /**
-     * Declares power of variable #[this] of degree [deg].
-     *
-     * Declaring another power of the same variable will increase its degree by received degree.
-     */
-    public inline infix fun Int.of(deg: UInt): Unit = this inPowerOf deg
-}
-
-/**
- * Builder of [NumberedPolynomial]. It should be used as an implicit context for lambdas that describe [NumberedPolynomial].
- */
-@UnstableKMathAPI
-@NumberedPolynomialConstructorDSL1
-public class DSL1NumberedPolynomialBuilder<C>(
-    /**
-     * Summation operation that will be used to sum coefficients of monomials of same signatures.
-     */
-    private val add: (C, C) -> C,
-    /**
-     * Initial capacity of coefficients map.
-     */
-    initialCapacity: Int? = null
-) {
-    /**
-     * Coefficients storage. Any declaration of any monomial updates the storage.
-     * Afterward the storage will be used as a resulting coefficients map.
-     */
-    private val coefficients: MutableMap<List<UInt>, C> = if (initialCapacity != null) LinkedHashMap(initialCapacity) else LinkedHashMap()
-
-    /**
-     * Builds the resulting coefficients map.
-     *
-     * In fact, it just returns [coefficients] as regular coefficients map of type `Map<List<UInt>, C>`.
-     */
-    @PublishedApi
-    internal fun build(): NumberedPolynomial<C> = NumberedPolynomial<C>(coefficients)
-
-    /**
-     * Declares monomial with [this] coefficient and provided [signature].
-     *
-     * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
-     * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
-     */
-    public infix fun C.with(signature: List<UInt>) {
-        coefficients.putOrChange(signature, this@with, add)
-    }
-    /**
-     * Declares monomial with [this] coefficient and signature constructed by [block].
-     *
-     * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
-     * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
-     */
-    public inline infix fun C.with(noinline block: DSL1NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit = this.invoke(block)
-    /**
-     * Declares monomial with [this] coefficient and signature constructed by [block].
-     *
-     * Declaring another monomial with the same signature will add [this] coefficient to existing one. If the sum of such
-     * coefficients is zero at any moment the monomial won't be removed but will be left as it is.
-     */
-    public inline operator fun C.invoke(block: DSL1NumberedPolynomialTermSignatureBuilder.() -> Unit): Unit =
-        this with DSL1NumberedPolynomialTermSignatureBuilder().apply(block).build()
-}
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-///**
-// * Creates [NumberedPolynomial] with lambda [block] in context of [this] ring of constants.
-// *
-// * For example, polynomial \(5 x_0^2 x_2^3 - 6 x_1\) can be described as
-// * ```
-// * Int.algebra {
-// *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
-// *         5 { 0 inPowerOf 2u; 2 inPowerOf 3u } // 5 x_0^2 x_2^3 +
-// *         (-6) { 1 inPowerOf 1u }              // (-6) x_1^1
-// *     }
-// * }
-// * ```
-// * @usesMathJax
-// */
-// FIXME: For now this fabric does not let next two fabrics work. (See KT-52803.) Possible feature solutions:
-//  1. `LowPriorityInOverloadResolution` becomes public. Then it should be applied to this function.
-//  2. Union types are implemented. Then all three functions should be rewritten
-//     as one with single union type as a (context) receiver.
-//@UnstableKMathAPI
-//public inline fun <C, A: Ring<C>> A.NumberedPolynomialDSL1(initialCapacity: Int? = null, block: NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = NumberedPolynomialBuilder(::add, initialCapacity).apply(block).build()
-/**
- * Creates [NumberedPolynomial] with lambda [block] in context of [this] ring of [NumberedPolynomial]s.
- *
- * For example, polynomial \(5 x_0^2 x_2^3 - 6 x_1\) can be described as
- * ```
- * Int.algebra {
- *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
- *         5 { 0 inPowerOf 2u; 2 inPowerOf 3u } // 5 x_0^2 x_2^3 +
- *         (-6) { 1 inPowerOf 1u }              // (-6) x_1^1
- *     }
- * }
- * ```
- * @usesMathJax
- */
-@UnstableKMathAPI
-public inline fun <C, A: Ring<C>> NumberedPolynomialSpace<C, A>.NumberedPolynomialDSL1(initialCapacity: Int? = null, block: DSL1NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = DSL1NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
-/**
- * Creates [NumberedPolynomial] with lambda [block] in context of [this] field of [NumberedRationalFunction]s.
- *
- * For example, polynomial \(5 x_0^2 x_2^3 - 6 x_1\) can be described as
- * ```
- * Int.algebra {
- *     val numberedPolynomial : NumberedPolynomial<Int> = NumberedPolynomial {
- *         5 { 0 inPowerOf 2u; 2 inPowerOf 3u } // 5 x_0^2 x_2^3 +
- *         (-6) { 1 inPowerOf 1u }              // (-6) x_1^1
- *     }
- * }
- * ```
- * @usesMathJax
- */
-@UnstableKMathAPI
-public inline fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedPolynomialDSL1(initialCapacity: Int? = null, block: DSL1NumberedPolynomialBuilder<C>.() -> Unit) : NumberedPolynomial<C> = DSL1NumberedPolynomialBuilder({ left: C, right: C -> left + right }, initialCapacity).apply(block).build()
-
-// Waiting for context receivers :( FIXME: Replace with context receivers when they will be available
-
-/**
- * Constructs [NumberedRationalFunction] with provided coefficients maps [numeratorCoefficients] and [denominatorCoefficients].
- *
- * The maps will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. the maps' keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- */
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients),
-        NumberedPolynomial(denominatorCoefficients)
-    )
-/**
- * Constructs [NumberedRationalFunction] with provided coefficients maps [numeratorCoefficients] and [denominatorCoefficients].
- *
- * The maps will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. the maps' keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- */
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>, denominatorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients),
-        NumberedPolynomial(denominatorCoefficients)
-    )
-
-/**
- * Constructs [NumberedRationalFunction] with provided [numerator] and unit denominator.
- */
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(numerator, NumberedPolynomial(mapOf(emptyList<UInt>() to one)))
-/**
- * Constructs [NumberedRationalFunction] with provided [numerator] and unit denominator.
- */
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numerator: NumberedPolynomial<C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(numerator, polynomialOne)
-
-/**
- * Constructs [NumberedRationalFunction] with provided coefficients map [numeratorCoefficients] for numerator and unit
- * denominator.
- *
- * [numeratorCoefficients] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [numeratorCoefficients]'s keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- */
-public fun <C, A: Ring<C>> NumberedRationalFunctionSpace<C, A>.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients),
-        polynomialOne
-    )
-/**
- * Constructs [NumberedRationalFunction] with provided coefficients map [numeratorCoefficients] for numerator and unit
- * denominator.
- *
- * [numeratorCoefficients] will be "cleaned up":
- * 1. Zeros at the ends of terms' signatures (e.g. [numeratorCoefficients]'s keys) will be removed. (See [cleanUp].)
- * 1. Terms that happen to have the same signature will be summed up.
- * 1. New map will be formed of resulting terms.
- */
-public fun <C, A: Ring<C>> A.NumberedRationalFunction(numeratorCoefficients: Map<List<UInt>, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction<C>(
-        NumberedPolynomial(numeratorCoefficients),
-        NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to one))
-    )
-
-///**
-// * Converts [this] constant to [NumberedRationalFunction].
-// */
-//context(A)
-//public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> =
-//    NumberedRationalFunction(
-//        NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to this)),
-//        NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to one))
-//    )
-///**
-// * Converts [this] constant to [NumberedRationalFunction].
-// */
-//context(NumberedRationalFunctionSpace<C, A>)
-//public fun <C, A: Ring<C>> C.asNumberedRationalFunction() : NumberedRationalFunction<C> =
-//    NumberedRationalFunction(
-//        NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to this)),
-//        NumberedPolynomialAsIs(mapOf(emptyList<UInt>() to constantOne))
-//    )
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt b/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
deleted file mode 100644
index 88424d23c..000000000
--- a/kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.Ring
-import space.kscience.kmath.operations.algebra
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.structures.Buffer
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.jvm.JvmName
-import kotlin.math.max
-import kotlin.math.min
-
-
-/**
- * Creates a [NumberedPolynomialSpace] over a received ring.
- */
-public inline val <C, A : Ring<C>> A.numberedPolynomialSpace: NumberedPolynomialSpace<C, A>
-    get() = NumberedPolynomialSpace(this)
-
-/**
- * Creates a [NumberedPolynomialSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.numberedPolynomialSpace(block: NumberedPolynomialSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return NumberedPolynomialSpace(this).block()
-}
-
-/**
- * Creates a [NumberedRationalFunctionSpace] over a received ring.
- */
-public inline val <C, A : Ring<C>> A.numberedRationalFunctionSpace: NumberedRationalFunctionSpace<C, A>
-    get() = NumberedRationalFunctionSpace(this)
-
-/**
- * Creates a [NumberedRationalFunctionSpace]'s scope over a received ring.
- */
-public inline fun <C, A : Ring<C>, R> A.numberedRationalFunctionSpace(block: NumberedRationalFunctionSpace<C, A>.() -> R): R {
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    return NumberedRationalFunctionSpace(this).block()
-}
-
-/**
- * Substitutes provided Double arguments [args] into [this] Double polynomial.
- */
-public fun NumberedPolynomial<Double>.substitute(args: Map<Int, Double>): NumberedPolynomial<Double> = Double.algebra {
-    NumberedPolynomial<Double>(
-        buildMap(coefficients.size) {
-            for ((degs, c) in coefficients) {
-                val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-                val newC = args.entries.fold(c) { product, (variable, substitution) ->
-                    val deg = degs.getOrElse(variable) { 0u }
-                    if (deg == 0u) product else product * substitution.pow(deg.toInt())
-                }
-                putOrChange(newDegs, newC) { it -> it + newC }
-            }
-        }
-    )
-}
-
-/**
- * Substitutes provided arguments [args] into [this] polynomial.
- */
-public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedPolynomial<C> = ring {
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            for ((degs, c) in coefficients) {
-                val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-                val newC = args.entries.fold(c) { product, (variable, substitution) ->
-                    val deg = degs.getOrElse(variable) { 0u }
-                    if (deg == 0u) product else product * power(substitution, deg)
-                }
-                putOrChange(newDegs, newC) { it -> it + newC }
-            }
-        }
-    )
-}
-
-/**
- * Substitutes provided arguments [args] into [this] polynomial.
- */ // TODO: To optimize boxing
-@JvmName("substitutePolynomial")
-public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedPolynomial<C>>) : NumberedPolynomial<C> =
-    ring.numberedPolynomialSpace {
-        coefficients.entries.fold(zero) { acc, (degs, c) ->
-            val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-            acc + args.entries.fold(NumberedPolynomial<C>(mapOf(newDegs to c))) { product, (variable, substitution) ->
-                val deg = degs.getOrElse(variable) { 0u }
-                if (deg == 0u) product else product * power(substitution, deg)
-            }
-        }
-    }
-
-/**
- * Substitutes provided arguments [args] into [this] polynomial.
- */ // TODO: To optimize boxing
-@JvmName("substituteRationalFunction")
-public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedRationalFunction<C>>) : NumberedRationalFunction<C> =
-    ring.numberedRationalFunctionSpace {
-        coefficients.entries.fold(zero) { acc, (degs, c) ->
-            val newDegs = degs.mapIndexed { index, deg -> if (index !in args) deg else 0u }.cleanUp()
-            acc + args.entries.fold(NumberedRationalFunction(NumberedPolynomial<C>(mapOf(newDegs to c)))) { product, (variable, substitution) ->
-                val deg = degs.getOrElse(variable) { 0u }
-                if (deg == 0u) product else product * power(substitution, deg)
-            }
-        }
-    }
-
-/**
- * Substitutes provided Double arguments [args] into [this] Double rational function.
- */
-public fun NumberedRationalFunction<Double>.substitute(args: Map<Int, Double>): NumberedRationalFunction<Double> =
-    NumberedRationalFunction(numerator.substitute(args), denominator.substitute(args))
-
-/**
- * Substitutes provided arguments [args] into [this] rational function.
- */
-public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Int, C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
-
-/**
- * Substitutes provided arguments [args] into [this] rational function.
- */ // TODO: To optimize calculation
-@JvmName("substitutePolynomial")
-public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedPolynomial<C>>) : NumberedRationalFunction<C> =
-    NumberedRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
-
-/**
- * Substitutes provided arguments [args] into [this] rational function.
- */ // TODO: To optimize calculation
-@JvmName("substituteRationalFunction")
-public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Map<Int, NumberedRationalFunction<C>>) : NumberedRationalFunction<C> =
-    ring.numberedRationalFunctionSpace {
-        numerator.substitute(ring, args) / denominator.substitute(ring, args)
-    }
-
-/**
- * Substitutes provided Double arguments [args] into [this] Double polynomial.
- */
-public fun NumberedPolynomial<Double>.substitute(args: Buffer<Double>): NumberedPolynomial<Double> = Double.algebra {
-    val lastSubstitutionVariable = args.size - 1
-    NumberedPolynomial<Double>(
-        buildMap(coefficients.size) {
-            for ((degs, c) in coefficients) {
-                val lastDegsIndex = degs.lastIndex
-                val newDegs =
-                    if (lastDegsIndex <= lastSubstitutionVariable) emptyList()
-                    else degs.toMutableList().apply {
-                        for (i in 0..lastSubstitutionVariable) this[i] = 0u
-                    }
-                val newC = (0..min(lastDegsIndex, lastSubstitutionVariable)).fold(c) { product, variable ->
-                    val deg = degs[variable]
-                    if (deg == 0u) product else product * args[variable].pow(deg.toInt())
-                }
-                putOrChange(newDegs, newC) { it -> it + newC }
-            }
-        }
-    )
-}
-
-/**
- * Substitutes provided arguments [args] into [this] polynomial.
- */
-public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Buffer<C>): NumberedPolynomial<C> = ring {
-    val lastSubstitutionVariable = args.size - 1
-    NumberedPolynomial<C>(
-        buildMap<List<UInt>, C>(coefficients.size) {
-            for ((degs, c) in coefficients) {
-                val lastDegsIndex = degs.lastIndex
-                val newDegs =
-                    if (lastDegsIndex <= lastSubstitutionVariable) emptyList()
-                    else degs.toMutableList().apply {
-                        for (i in 0..lastSubstitutionVariable) this[i] = 0u
-                    }
-                val newC = (0..min(lastDegsIndex, lastSubstitutionVariable)).fold(c) { product, variable ->
-                    val deg = degs[variable]
-                    if (deg == 0u) product else product * power(args[variable], deg)
-                }
-                putOrChange(newDegs, newC) { it -> it + newC }
-            }
-        }
-    )
-}
-
-/**
- * Substitutes provided arguments [args] into [this] polynomial.
- */ // TODO: To optimize boxing
-@JvmName("substitutePolynomial")
-public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Buffer<NumberedPolynomial<C>>) : NumberedPolynomial<C> =
-    ring.numberedPolynomialSpace {
-        val lastSubstitutionVariable = args.size - 1
-        coefficients.entries.fold(zero) { acc, (degs, c) ->
-            val lastDegsIndex = degs.lastIndex
-            val newDegs =
-                if (lastDegsIndex <= lastSubstitutionVariable) emptyList()
-                else degs.toMutableList().apply {
-                    for (i in 0..lastSubstitutionVariable) this[i] = 0u
-                }
-            acc + (0..min(lastDegsIndex, lastSubstitutionVariable))
-                .fold(NumberedPolynomial<C>(mapOf(newDegs to c))) { product, variable ->
-                    val deg = degs[variable]
-                    if (deg == 0u) product else product * power(args[variable], deg)
-                }
-        }
-    }
-
-/**
- * Substitutes provided arguments [args] into [this] polynomial.
- */ // TODO: To optimize boxing
-@JvmName("substituteRationalFunction")
-public fun <C> NumberedPolynomial<C>.substitute(ring: Ring<C>, args: Buffer<NumberedRationalFunction<C>>) : NumberedRationalFunction<C> =
-    ring.numberedRationalFunctionSpace {
-        val lastSubstitutionVariable = args.size - 1
-        coefficients.entries.fold(zero) { acc, (degs, c) ->
-            val lastDegsIndex = degs.lastIndex
-            val newDegs =
-                if (lastDegsIndex <= lastSubstitutionVariable) emptyList()
-                else degs.toMutableList().apply {
-                    for (i in 0..lastSubstitutionVariable) this[i] = 0u
-                }
-            acc + (0..min(lastDegsIndex, lastSubstitutionVariable))
-                .fold(NumberedRationalFunction(NumberedPolynomial<C>(mapOf(newDegs to c)))) { product, variable ->
-                    val deg = degs[variable]
-                    if (deg == 0u) product else product * power(args[variable], deg)
-                }
-        }
-    }
-
-/**
- * Substitutes provided Double arguments [args] into [this] Double rational function.
- */
-public fun NumberedRationalFunction<Double>.substitute(args: Buffer<Double>): NumberedRationalFunction<Double> =
-    NumberedRationalFunction(numerator.substitute(args), denominator.substitute(args))
-
-/**
- * Substitutes provided arguments [args] into [this] rational function.
- */
-public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Buffer<C>): NumberedRationalFunction<C> =
-    NumberedRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
-
-/**
- * Substitutes provided arguments [args] into [this] rational function.
- */ // TODO: To optimize calculation
-@JvmName("substitutePolynomial")
-public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Buffer<NumberedPolynomial<C>>) : NumberedRationalFunction<C> =
-    NumberedRationalFunction(numerator.substitute(ring, args), denominator.substitute(ring, args))
-
-/**
- * Substitutes provided arguments [args] into [this] rational function.
- */ // TODO: To optimize calculation
-@JvmName("substituteRationalFunction")
-public fun <C> NumberedRationalFunction<C>.substitute(ring: Ring<C>, args: Buffer<NumberedRationalFunction<C>>) : NumberedRationalFunction<C> =
-    ring.numberedRationalFunctionSpace {
-        numerator.substitute(ring, args) / denominator.substitute(ring, args)
-    }
-
-internal const val fullSubstitutionExceptionMessage: String = "Fully substituting buffer should cover all variables of the polynomial."
-
-/**
- * Substitutes provided Double arguments [args] into [this] Double polynomial.
- */
-public fun NumberedPolynomial<Double>.substituteFully(args: Buffer<Double>): Double = Double.algebra {
-    val lastSubstitutionVariable = args.size - 1
-    require(coefficients.keys.all { it.lastIndex <= lastSubstitutionVariable }) { fullSubstitutionExceptionMessage }
-    coefficients.entries.fold(.0) { acc, (degs, c) ->
-        acc + degs.foldIndexed(c) { variable, product, deg ->
-            if (deg == 0u) product else product * args[variable].pow(deg.toInt())
-        }
-    }
-}
-
-/**
- * Substitutes provided arguments [args] into [this] polynomial.
- */
-public fun <C> NumberedPolynomial<C>.substituteFully(ring: Ring<C>, args: Buffer<C>): C = ring {
-    val lastSubstitutionVariable = args.size - 1
-    require(coefficients.keys.all { it.lastIndex <= lastSubstitutionVariable }) { fullSubstitutionExceptionMessage }
-    coefficients.entries.fold(zero) { acc, (degs, c) ->
-        acc + degs.foldIndexed(c) { variable, product, deg ->
-            if (deg == 0u) product else product * power(args[variable], deg)
-        }
-    }
-}
-
-/**
- * Substitutes provided Double arguments [args] into [this] Double rational function.
- */
-public fun NumberedRationalFunction<Double>.substituteFully(args: Buffer<Double>): Double =
-    numerator.substituteFully(args) / denominator.substituteFully(args)
-
-/**
- * Substitutes provided arguments [args] into [this] rational function.
- */
-public fun <C> NumberedRationalFunction<C>.substituteFully(ring: Field<C>, args: Buffer<C>): C = ring {
-    numerator.substituteFully(ring, args) / denominator.substituteFully(ring, args)
-}
-
-/**
- * Represent [this] polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunctionOver(ring: A): (Buffer<C>) -> C = { substituteFully(ring, it) }
-
-/**
- * Represent [this] polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunctionOfConstantOver(ring: A): (Buffer<C>) -> C = { substituteFully(ring, it) }
-
-/**
- * Represent [this] polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunctionOfPolynomialOver(ring: A): (Buffer<NumberedPolynomial<C>>) -> NumberedPolynomial<C> = { substitute(ring, it) }
-
-/**
- * Represent [this] polynomial as a regular context-less function.
- */
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.asFunctionOfRationalFunctionOver(ring: A): (Buffer<NumberedRationalFunction<C>>) -> NumberedRationalFunction<C> = { substitute(ring, it) }
-
-/**
- * Represent [this] rational function as a regular context-less function.
- */
-public fun <C, A : Field<C>> NumberedRationalFunction<C>.asFunctionOver(ring: A): (Buffer<C>) -> C = { substituteFully(ring, it) }
-
-/**
- * Represent [this] rational function as a regular context-less function.
- */
-public fun <C, A : Field<C>> NumberedRationalFunction<C>.asFunctionOfConstantOver(ring: A): (Buffer<C>) -> C = { substituteFully(ring, it) }
-
-/**
- * Represent [this] rational function as a regular context-less function.
- */
-public fun <C, A : Ring<C>> NumberedRationalFunction<C>.asFunctionOfPolynomialOver(ring: A): (Buffer<NumberedPolynomial<C>>) -> NumberedRationalFunction<C> = { substitute(ring, it) }
-
-/**
- * Represent [this] rational function as a regular context-less function.
- */
-public fun <C, A : Ring<C>> NumberedRationalFunction<C>.asFunctionOfRationalFunctionOver(ring: A): (Buffer<NumberedRationalFunction<C>>) -> NumberedRationalFunction<C> = { substitute(ring, it) }
-
-/**
- * Returns algebraic derivative of received polynomial with respect to provided variable.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.derivativeWithRespectTo(
-    ring: A,
-    variable: Int,
-): NumberedPolynomial<C> = ring {
-    NumberedPolynomial<C>(
-        buildMap(coefficients.count { it.key.getOrElse(variable) { 0u } >= 1u }) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.lastIndex < variable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            when {
-                                index != variable -> deg
-                                deg > 0u -> deg - 1u
-                                else -> return@forEach
-                            }
-                        }.cleanUp(),
-                        multiplyByDoubling(c, degs[variable])
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial with respect to provided variable of specified order.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
-    ring: A,
-    variable: Int,
-    order: UInt
-): NumberedPolynomial<C> = ring {
-    if (order == 0u) return this@nthDerivativeWithRespectTo
-    NumberedPolynomial<C>(
-        buildMap(coefficients.count { it.key.getOrElse(variable) { 0u } >= order }) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.lastIndex < variable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            when {
-                                index != variable -> deg
-                                deg >= order -> deg - order
-                                else -> return@forEach
-                            }
-                        }.cleanUp(),
-                        degs[variable].let { deg ->
-                            (deg downTo deg - order + 1u)
-                                .fold(c) { acc, ord -> multiplyByDoubling(acc, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial with respect to provided variables of specified orders.
- */
-@UnstableKMathAPI
-public fun <C, A : Ring<C>> NumberedPolynomial<C>.nthDerivativeWithRespectTo(
-    ring: A,
-    variablesAndOrders: Map<Int, UInt>,
-): NumberedPolynomial<C> = ring {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthDerivativeWithRespectTo
-    val maxRespectedVariable = filteredVariablesAndOrders.keys.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    if (degs.lastIndex < maxRespectedVariable) return@forEach
-                    put(
-                        degs.mapIndexed { index, deg ->
-                            if (index !in filteredVariablesAndOrders) return@mapIndexed deg
-                            val order = filteredVariablesAndOrders[index]!!
-                            if (deg >= order) deg - order else return@forEach
-                        }.cleanUp(),
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (index, order) ->
-                            degs[index].let { deg ->
-                                (deg downTo deg - order + 1u)
-                                    .fold(acc1) { acc2, ord -> multiplyByDoubling(acc2, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial with respect to provided variable.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.antiderivativeWithRespectTo(
-    ring: A,
-    variable: Int,
-): NumberedPolynomial<C> = ring {
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(variable + 1, degs.size)) { degs.getOrElse(it) { 0u } + if (it != variable) 0u else 1u },
-                        c / multiplyByDoubling(one, degs.getOrElse(variable) { 0u } + 1u)
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic antiderivative of received polynomial with respect to provided variable of specified order.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectTo(
-    ring: A,
-    variable: Int,
-    order: UInt
-): NumberedPolynomial<C> = ring {
-    if (order == 0u) return this@nthAntiderivativeWithRespectTo
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(variable + 1, degs.size)) { degs.getOrElse(it) { 0u } + if (it != variable) 0u else order },
-                        degs.getOrElse(variable) { 0u }.let { deg ->
-                            (deg + 1u .. deg + order)
-                                .fold(c) { acc, ord -> acc / multiplyByDoubling(one, ord) }
-                        }
-                    )
-                }
-        }
-    )
-}
-
-/**
- * Returns algebraic derivative of received polynomial with respect to provided variables of specified orders.
- */
-@UnstableKMathAPI
-public fun <C, A : Field<C>> NumberedPolynomial<C>.nthAntiderivativeWithRespectTo(
-    ring: A,
-    variablesAndOrders: Map<Int, UInt>,
-): NumberedPolynomial<C> = ring {
-    val filteredVariablesAndOrders = variablesAndOrders.filterValues { it != 0u }
-    if (filteredVariablesAndOrders.isEmpty()) return this@nthAntiderivativeWithRespectTo
-    val maxRespectedVariable = filteredVariablesAndOrders.keys.maxOrNull()!!
-    NumberedPolynomial<C>(
-        buildMap(coefficients.size) {
-            coefficients
-                .forEach { (degs, c) ->
-                    put(
-                        List(max(maxRespectedVariable + 1, degs.size)) { degs.getOrElse(it) { 0u } + filteredVariablesAndOrders.getOrElse(it) { 0u } },
-                        filteredVariablesAndOrders.entries.fold(c) { acc1, (variable, order) ->
-                            degs.getOrElse(variable) { 0u }.let { deg ->
-                                (deg + 1u .. deg + order)
-                                    .fold(acc1) { acc, ord -> acc / multiplyByDoubling(one, ord) }
-                            }
-                        }
-                    )
-                }
-        }
-    )
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
deleted file mode 100644
index 9dd2bb743..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/AlgebraicStubTest.kt
+++ /dev/null
@@ -1,589 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-
-import space.kscience.kmath.operations.invoke
-import space.kscience.kmath.operations.Field
-import kotlin.jvm.JvmInline
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-@JvmInline
-value class Expr(val expr: String)
-
-object ExprRing : Field<Expr> {
-    override fun Expr.unaryMinus(): Expr = Expr("-${expr}")
-    override fun add(left: Expr, right: Expr): Expr = Expr("(${left.expr} + ${right.expr})")
-    override fun multiply(left: Expr, right: Expr): Expr = Expr("(${left.expr} * ${right.expr})")
-    override val zero: Expr = Expr("0")
-    override val one: Expr = Expr("1")
-    override fun divide(left: Expr, right: Expr): Expr = Expr("(${left.expr} / ${right.expr})")
-    override fun scale(a: Expr, value: Double): Expr = Expr("(${a.expr} / $value)")
-}
-
-class AlgebraicStubTest {
-    @Test
-    fun test_addMultipliedBySquaring_for_UInt() {
-        ExprRing {
-            assertEquals(
-                "57",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 0u).expr,
-                "tried addMultipliedBySquaring(57, 179, 0u)"
-            )
-            assertEquals(
-                "(57 + 179)",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 1u).expr,
-                "tried addMultipliedBySquaring(57, 179, 1u)"
-            )
-            assertEquals(
-                "(57 + (179 + 179))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 2u).expr,
-                "tried addMultipliedBySquaring(57, 179, 2u)"
-            )
-            assertEquals(
-                "((57 + 179) + (179 + 179))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 3u).expr,
-                "tried addMultipliedBySquaring(57, 179, 3u)"
-            )
-            assertEquals(
-                "(57 + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 4u).expr,
-                "tried addMultipliedBySquaring(57, 179, 4u)"
-            )
-            assertEquals(
-                "((57 + 179) + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 5u).expr,
-                "tried addMultipliedBySquaring(57, 179, 5u)"
-            )
-            assertEquals(
-                "((57 + (179 + 179)) + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 6u).expr,
-                "tried addMultipliedBySquaring(57, 179, 6u)"
-            )
-            assertEquals(
-                "(((57 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 7u).expr,
-                "tried addMultipliedBySquaring(57, 179, 7u)"
-            )
-            assertEquals(
-                "(57 + (((179 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179))))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 8u).expr,
-                "tried addMultipliedBySquaring(57, 179, 8u)"
-            )
-        }
-    }
-    @Test
-    fun test_multiplyBySquaring_for_UInt() {
-        ExprRing {
-            assertEquals(
-                "0",
-                multiplyByDoubling(Expr("57"), 0u).expr,
-                "tried multiplyBySquaring(57, 0u)"
-            )
-            assertEquals(
-                "57",
-                multiplyByDoubling(Expr("57"), 1u).expr,
-                "tried multiplyBySquaring(57, 1u)"
-            )
-            assertEquals(
-                "(57 + 57)",
-                multiplyByDoubling(Expr("57"), 2u).expr,
-                "tried multiplyBySquaring(57, 2u)"
-            )
-            assertEquals(
-                "(57 + (57 + 57))",
-                multiplyByDoubling(Expr("57"), 3u).expr,
-                "tried multiplyBySquaring(57, 3u)"
-            )
-            assertEquals(
-                "((57 + 57) + (57 + 57))",
-                multiplyByDoubling(Expr("57"), 4u).expr,
-                "tried multiplyBySquaring(57, 4u)"
-            )
-            assertEquals(
-                "(57 + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 5u).expr,
-                "tried multiplyBySquaring(57, 5u)"
-            )
-            assertEquals(
-                "((57 + 57) + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 6u).expr,
-                "tried multiplyBySquaring(57, 6u)"
-            )
-            assertEquals(
-                "((57 + (57 + 57)) + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 7u).expr,
-                "tried multiplyBySquaring(57, 7u)"
-            )
-            assertEquals(
-                "(((57 + 57) + (57 + 57)) + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 8u).expr,
-                "tried multiplyBySquaring(57, 8u)"
-            )
-        }
-    }
-    @Test
-    fun test_addMultipliedBySquaring_for_Int() {
-        ExprRing {
-            assertEquals(
-                "57",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 0).expr,
-                "tried addMultipliedBySquaring(57, 179, 0)"
-            )
-            assertEquals(
-                "(57 + 179)",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 1).expr,
-                "tried addMultipliedBySquaring(57, 179, 1)"
-            )
-            assertEquals(
-                "(57 + -179)",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -1).expr,
-                "tried addMultipliedBySquaring(57, 179, -1)"
-            )
-            assertEquals(
-                "(57 + (179 + 179))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 2).expr,
-                "tried addMultipliedBySquaring(57, 179, 2)"
-            )
-            assertEquals(
-                "(57 + (-179 + -179))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -2).expr,
-                "tried addMultipliedBySquaring(57, 179, -2)"
-            )
-            assertEquals(
-                "((57 + 179) + (179 + 179))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 3).expr,
-                "tried addMultipliedBySquaring(57, 179, 3)"
-            )
-            assertEquals(
-                "((57 + -179) + (-179 + -179))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -3).expr,
-                "tried addMultipliedBySquaring(57, 179, -3)"
-            )
-            assertEquals(
-                "(57 + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 4).expr,
-                "tried addMultipliedBySquaring(57, 179, 4)"
-            )
-            assertEquals(
-                "(57 + ((-179 + -179) + (-179 + -179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -4).expr,
-                "tried addMultipliedBySquaring(57, 179, -4)"
-            )
-            assertEquals(
-                "((57 + 179) + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 5).expr,
-                "tried addMultipliedBySquaring(57, 179, 5)"
-            )
-            assertEquals(
-                "((57 + -179) + ((-179 + -179) + (-179 + -179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -5).expr,
-                "tried addMultipliedBySquaring(57, 179, -5)"
-            )
-            assertEquals(
-                "((57 + (179 + 179)) + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 6).expr,
-                "tried addMultipliedBySquaring(57, 179, 6)"
-            )
-            assertEquals(
-                "((57 + (-179 + -179)) + ((-179 + -179) + (-179 + -179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -6).expr,
-                "tried addMultipliedBySquaring(57, 179, -6)"
-            )
-            assertEquals(
-                "(((57 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 7).expr,
-                "tried addMultipliedBySquaring(57, 179, 7)"
-            )
-            assertEquals(
-                "(((57 + -179) + (-179 + -179)) + ((-179 + -179) + (-179 + -179)))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -7).expr,
-                "tried addMultipliedBySquaring(57, 179, -7)"
-            )
-            assertEquals(
-                "(57 + (((179 + 179) + (179 + 179)) + ((179 + 179) + (179 + 179))))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), 8).expr,
-                "tried addMultipliedBySquaring(57, 179, 8)"
-            )
-            assertEquals(
-                "(57 + (((-179 + -179) + (-179 + -179)) + ((-179 + -179) + (-179 + -179))))",
-                addMultipliedByDoubling(Expr("57"), Expr("179"), -8).expr,
-                "tried addMultipliedBySquaring(57, 179, -8)"
-            )
-        }
-    }
-    @Test
-    fun test_multiplyBySquaring_for_Int() {
-        ExprRing {
-            assertEquals(
-                "0",
-                multiplyByDoubling(Expr("57"), 0).expr,
-                "tried multiplyBySquaring(57, 0)"
-            )
-            assertEquals(
-                "57",
-                multiplyByDoubling(Expr("57"), 1).expr,
-                "tried multiplyBySquaring(57, 1)"
-            )
-            assertEquals(
-                "-57",
-                multiplyByDoubling(Expr("57"), -1).expr,
-                "tried multiplyBySquaring(57, -1)"
-            )
-            assertEquals(
-                "(57 + 57)",
-                multiplyByDoubling(Expr("57"), 2).expr,
-                "tried multiplyBySquaring(57, 2)"
-            )
-            assertEquals(
-                "(-57 + -57)",
-                multiplyByDoubling(Expr("57"), -2).expr,
-                "tried multiplyBySquaring(57, -2)"
-            )
-            assertEquals(
-                "(57 + (57 + 57))",
-                multiplyByDoubling(Expr("57"), 3).expr,
-                "tried multiplyBySquaring(57, 3)"
-            )
-            assertEquals(
-                "(-57 + (-57 + -57))",
-                multiplyByDoubling(Expr("57"), -3).expr,
-                "tried multiplyBySquaring(57, -3)"
-            )
-            assertEquals(
-                "((57 + 57) + (57 + 57))",
-                multiplyByDoubling(Expr("57"), 4).expr,
-                "tried multiplyBySquaring(57, 4)"
-            )
-            assertEquals(
-                "((-57 + -57) + (-57 + -57))",
-                multiplyByDoubling(Expr("57"), -4).expr,
-                "tried multiplyBySquaring(57, -4)"
-            )
-            assertEquals(
-                "(57 + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 5).expr,
-                "tried multiplyBySquaring(57, 5)"
-            )
-            assertEquals(
-                "(-57 + ((-57 + -57) + (-57 + -57)))",
-                multiplyByDoubling(Expr("57"), -5).expr,
-                "tried multiplyBySquaring(57, -5)"
-            )
-            assertEquals(
-                "((57 + 57) + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 6).expr,
-                "tried multiplyBySquaring(57, 6)"
-            )
-            assertEquals(
-                "((-57 + -57) + ((-57 + -57) + (-57 + -57)))",
-                multiplyByDoubling(Expr("57"), -6).expr,
-                "tried multiplyBySquaring(57, -6)"
-            )
-            assertEquals(
-                "((57 + (57 + 57)) + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 7).expr,
-                "tried multiplyBySquaring(57, 7)"
-            )
-            assertEquals(
-                "((-57 + (-57 + -57)) + ((-57 + -57) + (-57 + -57)))",
-                multiplyByDoubling(Expr("57"), -7).expr,
-                "tried multiplyBySquaring(57, -7)"
-            )
-            assertEquals(
-                "(((57 + 57) + (57 + 57)) + ((57 + 57) + (57 + 57)))",
-                multiplyByDoubling(Expr("57"), 8).expr,
-                "tried multiplyBySquaring(57, 8)"
-            )
-            assertEquals(
-                "(((-57 + -57) + (-57 + -57)) + ((-57 + -57) + (-57 + -57)))",
-                multiplyByDoubling(Expr("57"), -8).expr,
-                "tried multiplyBySquaring(57, -8)"
-            )
-        }
-    }
-    @Test
-    fun test_multiplyExponentiationBySquaring_for_UInt() {
-        ExprRing {
-            assertEquals(
-                "57",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 0u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 0u)"
-            )
-            assertEquals(
-                "(57 * 179)",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 1u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 1u)"
-            )
-            assertEquals(
-                "(57 * (179 * 179))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 2u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 2u)"
-            )
-            assertEquals(
-                "((57 * 179) * (179 * 179))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 3u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 3u)"
-            )
-            assertEquals(
-                "(57 * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 4u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 4u)"
-            )
-            assertEquals(
-                "((57 * 179) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 5u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 5u)"
-            )
-            assertEquals(
-                "((57 * (179 * 179)) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 6u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 6u)"
-            )
-            assertEquals(
-                "(((57 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 7u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 7u)"
-            )
-            assertEquals(
-                "(57 * (((179 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 8u).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 8u)"
-            )
-        }
-    }
-    @Test
-    fun test_exponentiationBySquaring_for_UInt() {
-        ExprRing {
-            assertEquals(
-                "0",
-                exponentiateBySquaring(Expr("57"), 0u).expr,
-                "tried exponentiationBySquaring(57, 0u)"
-            )
-            assertEquals(
-                "57",
-                exponentiateBySquaring(Expr("57"), 1u).expr,
-                "tried exponentiationBySquaring(57, 1u)"
-            )
-            assertEquals(
-                "(57 * 57)",
-                exponentiateBySquaring(Expr("57"), 2u).expr,
-                "tried exponentiationBySquaring(57, 2u)"
-            )
-            assertEquals(
-                "(57 * (57 * 57))",
-                exponentiateBySquaring(Expr("57"), 3u).expr,
-                "tried exponentiationBySquaring(57, 3u)"
-            )
-            assertEquals(
-                "((57 * 57) * (57 * 57))",
-                exponentiateBySquaring(Expr("57"), 4u).expr,
-                "tried exponentiationBySquaring(57, 4u)"
-            )
-            assertEquals(
-                "(57 * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 5u).expr,
-                "tried exponentiationBySquaring(57, 5u)"
-            )
-            assertEquals(
-                "((57 * 57) * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 6u).expr,
-                "tried exponentiationBySquaring(57, 6u)"
-            )
-            assertEquals(
-                "((57 * (57 * 57)) * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 7u).expr,
-                "tried exponentiationBySquaring(57, 7u)"
-            )
-            assertEquals(
-                "(((57 * 57) * (57 * 57)) * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 8u).expr,
-                "tried exponentiationBySquaring(57, 8u)"
-            )
-        }
-    }
-    @Test
-    fun test_multiplyExponentiationBySquaring_for_Int() {
-        ExprRing {
-            assertEquals(
-                "57",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 0).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 0)"
-            )
-            assertEquals(
-                "(57 * 179)",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 1).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 1)"
-            )
-            assertEquals(
-                "(57 * (1 / 179))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -1).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -1)"
-            )
-            assertEquals(
-                "(57 * (179 * 179))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 2).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 2)"
-            )
-            assertEquals(
-                "(57 * ((1 / 179) * (1 / 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -2).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -2)"
-            )
-            assertEquals(
-                "((57 * 179) * (179 * 179))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 3).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 3)"
-            )
-            assertEquals(
-                "((57 * (1 / 179)) * ((1 / 179) * (1 / 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -3).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -3)"
-            )
-            assertEquals(
-                "(57 * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 4).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 4)"
-            )
-            assertEquals(
-                "(57 * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -4).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -4)"
-            )
-            assertEquals(
-                "((57 * 179) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 5).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 5)"
-            )
-            assertEquals(
-                "((57 * (1 / 179)) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -5).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -5)"
-            )
-            assertEquals(
-                "((57 * (179 * 179)) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 6).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 6)"
-            )
-            assertEquals(
-                "((57 * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -6).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -6)"
-            )
-            assertEquals(
-                "(((57 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179)))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 7).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 7)"
-            )
-            assertEquals(
-                "(((57 * (1 / 179)) * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -7).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -7)"
-            )
-            assertEquals(
-                "(57 * (((179 * 179) * (179 * 179)) * ((179 * 179) * (179 * 179))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), 8).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, 8)"
-            )
-            assertEquals(
-                "(57 * ((((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179))) * (((1 / 179) * (1 / 179)) * ((1 / 179) * (1 / 179)))))",
-                multiplyExponentiatedBySquaring(Expr("57"), Expr("179"), -8).expr,
-                "tried multiplyExponentiationBySquaring(57, 179, -8)"
-            )
-        }
-    }
-    @Test
-    fun test_exponentiationBySquaring_for_Int() {
-        ExprRing {
-            assertEquals(
-                "0",
-                exponentiateBySquaring(Expr("57"), 0).expr,
-                "tried exponentiationBySquaring(57, 0)"
-            )
-            assertEquals(
-                "57",
-                exponentiateBySquaring(Expr("57"), 1).expr,
-                "tried exponentiationBySquaring(57, 1)"
-            )
-            assertEquals(
-                "(1 / 57)",
-                exponentiateBySquaring(Expr("57"), -1).expr,
-                "tried exponentiationBySquaring(57, -1)"
-            )
-            assertEquals(
-                "(57 * 57)",
-                exponentiateBySquaring(Expr("57"), 2).expr,
-                "tried exponentiationBySquaring(57, 2)"
-            )
-            assertEquals(
-                "((1 / 57) * (1 / 57))",
-                exponentiateBySquaring(Expr("57"), -2).expr,
-                "tried exponentiationBySquaring(57, -2)"
-            )
-            assertEquals(
-                "(57 * (57 * 57))",
-                exponentiateBySquaring(Expr("57"), 3).expr,
-                "tried exponentiationBySquaring(57, 3)"
-            )
-            assertEquals(
-                "((1 / 57) * ((1 / 57) * (1 / 57)))",
-                exponentiateBySquaring(Expr("57"), -3).expr,
-                "tried exponentiationBySquaring(57, -3)"
-            )
-            assertEquals(
-                "((57 * 57) * (57 * 57))",
-                exponentiateBySquaring(Expr("57"), 4).expr,
-                "tried exponentiationBySquaring(57, 4)"
-            )
-            assertEquals(
-                "(((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57)))",
-                exponentiateBySquaring(Expr("57"), -4).expr,
-                "tried exponentiationBySquaring(57, -4)"
-            )
-            assertEquals(
-                "(57 * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 5).expr,
-                "tried exponentiationBySquaring(57, 5)"
-            )
-            assertEquals(
-                "((1 / 57) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
-                exponentiateBySquaring(Expr("57"), -5).expr,
-                "tried exponentiationBySquaring(57, -5)"
-            )
-            assertEquals(
-                "((57 * 57) * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 6).expr,
-                "tried exponentiationBySquaring(57, 6)"
-            )
-            assertEquals(
-                "(((1 / 57) * (1 / 57)) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
-                exponentiateBySquaring(Expr("57"), -6).expr,
-                "tried exponentiationBySquaring(57, -6)"
-            )
-            assertEquals(
-                "((57 * (57 * 57)) * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 7).expr,
-                "tried exponentiationBySquaring(57, 7)"
-            )
-            assertEquals(
-                "(((1 / 57) * ((1 / 57) * (1 / 57))) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
-                exponentiateBySquaring(Expr("57"), -7).expr,
-                "tried exponentiationBySquaring(57, -7)"
-            )
-            assertEquals(
-                "(((57 * 57) * (57 * 57)) * ((57 * 57) * (57 * 57)))",
-                exponentiateBySquaring(Expr("57"), 8).expr,
-                "tried exponentiationBySquaring(57, 8)"
-            )
-            assertEquals(
-                "((((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))) * (((1 / 57) * (1 / 57)) * ((1 / 57) * (1 / 57))))",
-                exponentiateBySquaring(Expr("57"), -8).expr,
-                "tried exponentiationBySquaring(57, -8)"
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
deleted file mode 100644
index 054f0dc4c..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledConstructorsTest.kt
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.functions.testUtils.t
-import space.kscience.kmath.functions.testUtils.x
-import space.kscience.kmath.functions.testUtils.y
-import space.kscience.kmath.functions.testUtils.z
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.algebra
-import space.kscience.kmath.operations.invoke
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class LabeledConstructorsTest {
-    @Test
-    @UnstableKMathAPI
-    fun testDSL1() {
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 2u, z to 3u) to 5,
-                mapOf(y to 1u) to -6,
-            ),
-            Int.algebra.labeledPolynomialSpace {
-                LabeledPolynomialDSL1 {
-                    5 { x pow 2u; z pow 3u }
-                    (-6) { y pow 1u }
-                }
-            },
-            "test 1"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to -1,
-            ),
-            Int.algebra.labeledPolynomialSpace {
-                LabeledPolynomialDSL1 {
-                    5 { }
-                    (-6) { }
-                }
-            },
-            "test 2"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 2u) to -1,
-            ),
-            Int.algebra.labeledPolynomialSpace {
-                LabeledPolynomialDSL1 {
-                    5 { x pow 1u; x pow 1u }
-                    (-6) { x pow 2u }
-                }
-            },
-            "test 3"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 2u) to -1,
-            ),
-            Int.algebra.labeledPolynomialSpace {
-                LabeledPolynomialDSL1 {
-                    5 { x pow 1u; x pow 1u }
-                    (-6) { x pow 2u; z pow 0u }
-                }
-            },
-            "test 3"
-        )
-    }
-    @Test
-    @UnstableKMathAPI
-    fun testFabric() {
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 2u, z to 3u) to 5,
-                mapOf(y to 1u) to -6,
-            ),
-            Int.algebra {
-                LabeledPolynomial(
-                    mapOf(x to 2u, z to 3u) to 5,
-                    mapOf(y to 1u) to -6,
-                )
-            },
-            "test 1"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 2u, z to 3u) to 5,
-                mapOf(y to 1u) to -6,
-            ),
-            Int.algebra {
-                LabeledPolynomial(
-                    mapOf(x to 2u, y to 0u, z to 3u, t to 0u) to 5,
-                    mapOf(x to 0u, y to 1u, z to 0u, t to 0u) to -6,
-                )
-            },
-            "test 2"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to -1,
-            ),
-            Int.algebra {
-                LabeledPolynomial(
-                    mapOf(x to 0u) to 5,
-                    mapOf(y to 0u, z to 0u) to -6,
-                )
-            },
-            "test 3"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 0,
-            ),
-            Int.algebra {
-                LabeledPolynomial(
-                    mapOf(x to 0u) to 5,
-                    mapOf(z to 0u, t to 0u) to -5,
-                )
-            },
-            "test 4"
-        )
-    }
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
deleted file mode 100644
index bb30f7742..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialTest.kt
+++ /dev/null
@@ -1,2555 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("LocalVariableName")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.functions.testUtils.IntModuloRing
-import space.kscience.kmath.functions.testUtils.Rational
-import space.kscience.kmath.functions.testUtils.RationalField
-import space.kscience.kmath.functions.testUtils.iota
-import space.kscience.kmath.functions.testUtils.m
-import space.kscience.kmath.functions.testUtils.o
-import space.kscience.kmath.functions.testUtils.s
-import space.kscience.kmath.functions.testUtils.t
-import space.kscience.kmath.functions.testUtils.x
-import space.kscience.kmath.functions.testUtils.y
-import space.kscience.kmath.functions.testUtils.z
-import kotlin.test.*
-
-
-// TODO: Тесты на конвертацию.
-class LabeledPolynomialTest {
-    @Test
-    fun test_Variable_Int_plus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5),
-                    mapOf(x to 1u) to Rational(1),
-                ),
-                x + 5,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(1),
-                ),
-                x + 0,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Variable_Int_minus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-5),
-                    mapOf(x to 1u) to Rational(1),
-                ),
-                x - 5,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(1),
-                ),
-                x - 0,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Variable_Int_times() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(5),
-                ),
-                x * 5,
-                "test 1"
-            )
-            assertSame(
-                zero,
-                x * 0,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Variable_plus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5),
-                    mapOf(x to 1u) to Rational(1),
-                ),
-                5 + x,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(1),
-                ),
-                0 + x,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Variable_minus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5),
-                    mapOf(x to 1u) to Rational(-1),
-                ),
-                5 - x,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(-1),
-                ),
-                0 - x,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Variable_times() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(5),
-                ),
-                5 * x,
-                "test 1"
-            )
-            assertSame(
-                zero,
-                0 * x,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Int_plus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(5, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) + -3,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-3, 1),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) + -3,
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 1),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) + -3,
-                "test 3"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ) + -3,
-                "test 4"
-            )
-            val polynomial_5 = LabeledPolynomial(
-                mapOf<Symbol, UInt>() to Rational(-22, 9),
-                mapOf(x to 3u) to Rational(-8, 9),
-                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_5,
-                polynomial_5 + 0,
-                "test 5"
-            )
-            val polynomial_6 = LabeledPolynomial(
-                mapOf<Symbol, UInt>() to Rational(0, 9),
-                mapOf(x to 3u) to Rational(-8, 9),
-                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_6,
-                polynomial_6 + 0,
-                "test 6"
-            )
-            val polynomial_7 = LabeledPolynomial(
-                mapOf(x to 3u) to Rational(-8, 9),
-                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_7,
-                polynomial_7 + 0,
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Int_minus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(5, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) - 3,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-3, 1),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) - 3,
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 1),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) - 3,
-                "test 3"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ) - 3,
-                "test 4"
-            )
-            val polynomial_5 = LabeledPolynomial(
-                mapOf<Symbol, UInt>() to Rational(-22, 9),
-                mapOf(x to 3u) to Rational(-8, 9),
-                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_5,
-                polynomial_5 - 0,
-                "test 5"
-            )
-            val polynomial_6 = LabeledPolynomial(
-                mapOf<Symbol, UInt>() to Rational(0, 9),
-                mapOf(x to 3u) to Rational(-8, 9),
-                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_6,
-                polynomial_6 - 0,
-                "test 6"
-            )
-            val polynomial_7 = LabeledPolynomial(
-                mapOf(x to 3u) to Rational(-8, 9),
-                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_7,
-                polynomial_7 - 0,
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Int_times() {
-        IntModuloRing(35).labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(34),
-                    mapOf(x to 3u) to m(2),
-                    mapOf(x to 0u, y to 1u) to m(1),
-                    mapOf(x to 1u) to m(20),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(2),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(22),
-                    mapOf(x to 3u) to m(26),
-                    mapOf(x to 0u, y to 1u) to m(13),
-                    mapOf(x to 1u) to m(15),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
-                ) * 27,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(0),
-                    mapOf(x to 3u) to m(0),
-                    mapOf(x to 0u, y to 1u) to m(0),
-                    mapOf(x to 1u) to m(0),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(7),
-                    mapOf(x to 3u) to m(0),
-                    mapOf(x to 0u, y to 1u) to m(49),
-                    mapOf(x to 1u) to m(21),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(14),
-                ) * 15,
-                "test 2"
-            )
-            val polynomial = LabeledPolynomial(
-                mapOf<Symbol, UInt>() to m(22),
-                mapOf(x to 3u) to m(26),
-                mapOf(x to 0u, y to 1u) to m(13),
-                mapOf(x to 1u) to m(15),
-                mapOf(x to 0u, y to 0u, z to 2u) to m(26),
-            )
-            assertSame(
-                zero,
-                polynomial * 0,
-                "test 3"
-            )
-            assertSame(
-                polynomial,
-                polynomial * 1,
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_plus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                -3 + LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(5, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-3, 1),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                -3 + LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                -3 + LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ),
-                -3 + LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ),
-                "test 4"
-            )
-            val polynomial_5 = LabeledPolynomial(
-                mapOf<Symbol, UInt>() to Rational(-22, 9),
-                mapOf(x to 3u) to Rational(-8, 9),
-                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_5,
-                0 + polynomial_5,
-                "test 5"
-            )
-            val polynomial_6 = LabeledPolynomial(
-                mapOf<Symbol, UInt>() to Rational(0, 9),
-                mapOf(x to 3u) to Rational(-8, 9),
-                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_6,
-                0 + polynomial_6,
-                "test 6"
-            )
-            val polynomial_7 = LabeledPolynomial(
-                mapOf(x to 3u) to Rational(-8, 9),
-                mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_7,
-                0 + polynomial_7,
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_minus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(22, 9),
-                    mapOf(x to 3u) to Rational(8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
-                ),
-                3 - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(5, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(3, 1),
-                    mapOf(x to 3u) to Rational(8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
-                ),
-                3 - LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 1),
-                    mapOf(x to 3u) to Rational(8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
-                ),
-                3 - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ),
-                3 - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ),
-                "test 4"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(22, 9),
-                    mapOf(x to 3u) to Rational(8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
-                ),
-                0 - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 5"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 9),
-                    mapOf(x to 3u) to Rational(8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
-                ),
-                0 - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 6"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
-                ),
-                0 - LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_times() {
-        IntModuloRing(35).labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(34),
-                    mapOf(x to 3u) to m(2),
-                    mapOf(x to 0u, y to 1u) to m(1),
-                    mapOf(x to 1u) to m(20),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(2),
-                ),
-                27 * LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(22),
-                    mapOf(x to 3u) to m(26),
-                    mapOf(x to 0u, y to 1u) to m(13),
-                    mapOf(x to 1u) to m(15),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(0),
-                    mapOf(x to 3u) to m(0),
-                    mapOf(x to 0u, y to 1u) to m(0),
-                    mapOf(x to 1u) to m(0),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
-                ),
-                15 * LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(7),
-                    mapOf(x to 3u) to m(0),
-                    mapOf(x to 0u, y to 1u) to m(49),
-                    mapOf(x to 1u) to m(21),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(14),
-                ),
-                "test 2"
-            )
-            val polynomial = LabeledPolynomial(
-                mapOf<Symbol, UInt>() to m(22),
-                mapOf(x to 3u) to m(26),
-                mapOf(x to 0u, y to 1u) to m(13),
-                mapOf(x to 1u) to m(15),
-                mapOf(x to 0u, y to 0u, z to 2u) to m(26),
-            )
-            assertSame(
-                zero,
-                0 * polynomial,
-                "test 3"
-            )
-            assertSame(
-                polynomial,
-                1 * polynomial,
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Variable_Constant_plus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5),
-                    mapOf(x to 1u) to Rational(1),
-                ),
-                x + Rational(5),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 1u) to Rational(1),
-                ),
-                x + Rational(0),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Variable_Constant_minus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-5),
-                    mapOf(x to 1u) to Rational(1),
-                ),
-                x - Rational(5),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 1u) to Rational(1),
-                ),
-                x - Rational(0),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Variable_Constant_times() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(5),
-                ),
-                x * Rational(5),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(0),
-                ),
-                x * Rational(0),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Variable_plus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5),
-                    mapOf(x to 1u) to Rational(1),
-                ),
-                Rational(5) + x,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 1u) to Rational(1),
-                ),
-                Rational(0) + x,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Variable_minus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5),
-                    mapOf(x to 1u) to Rational(-1),
-                ),
-                Rational(5) - x,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 1u) to Rational(-1),
-                ),
-                Rational(0) - x,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Variable_times() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(5),
-                ),
-                Rational(5) * x,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(0),
-                ),
-                Rational(0) * x,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_plus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(5, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) + Rational(-3),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-3, 1),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) + Rational(-3),
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 1),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) + Rational(-3),
-                "test 3"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ) + Rational(-3),
-                "test 4"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) + Rational(0),
-                "test 5"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) + Rational(0),
-                "test 6"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) + Rational(0),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_minus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(5, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) - Rational(3),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-3, 1),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) - Rational(3),
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 1),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) - Rational(3),
-                "test 3"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ) - Rational(3),
-                "test 4"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) - Rational(0),
-                "test 5"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) - Rational(0),
-                "test 6"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ) - Rational(0),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_times() {
-        IntModuloRing(35).labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(34),
-                    mapOf(x to 3u) to m(2),
-                    mapOf(x to 0u, y to 1u) to m(1),
-                    mapOf(x to 1u) to m(20),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(2),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(22),
-                    mapOf(x to 3u) to m(26),
-                    mapOf(x to 0u, y to 1u) to m(13),
-                    mapOf(x to 1u) to m(15),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
-                ) * m(27),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(0),
-                    mapOf(x to 3u) to m(0),
-                    mapOf(x to 0u, y to 1u) to m(0),
-                    mapOf(x to 1u) to m(0),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(7),
-                    mapOf(x to 3u) to m(0),
-                    mapOf(x to 0u, y to 1u) to m(49),
-                    mapOf(x to 1u) to m(21),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(14),
-                ) * m(15),
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(0),
-                    mapOf(x to 3u) to m(0),
-                    mapOf(x to 0u, y to 1u) to m(0),
-                    mapOf(x to 1u) to m(0),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(22),
-                    mapOf(x to 3u) to m(26),
-                    mapOf(x to 0u, y to 1u) to m(13),
-                    mapOf(x to 1u) to m(15),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
-                ) * m(0),
-                "test 3"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(22),
-                    mapOf(x to 3u) to m(26),
-                    mapOf(x to 0u, y to 1u) to m(13),
-                    mapOf(x to 1u) to m(15),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(22),
-                    mapOf(x to 3u) to m(26),
-                    mapOf(x to 0u, y to 1u) to m(13),
-                    mapOf(x to 1u) to m(15),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
-                ) * m(1),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_plus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                Rational(-3) + LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(5, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-3, 1),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                Rational(-3) + LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 1),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                Rational(-3) + LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ),
-                Rational(-3) + LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ),
-                "test 4"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                Rational(0) + LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 5"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                Rational(0) + LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 6"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                Rational(0) + LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_minus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(22, 9),
-                    mapOf(x to 3u) to Rational(8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
-                ),
-                Rational(3) - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(5, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(3, 1),
-                    mapOf(x to 3u) to Rational(8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
-                ),
-                Rational(3) - LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 1),
-                    mapOf(x to 3u) to Rational(8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
-                ),
-                Rational(3) - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ),
-                Rational(3) - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(27, 9),
-                    mapOf(x to 3u) to Rational(0),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                ),
-                "test 4"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(22, 9),
-                    mapOf(x to 3u) to Rational(8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
-                ),
-                Rational(0) - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-22, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 5"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 9),
-                    mapOf(x to 3u) to Rational(8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
-                ),
-                Rational(0) - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0, 9),
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 6"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 3u) to Rational(8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(8, 7),
-                ),
-                Rational(0) - LabeledPolynomial(
-                    mapOf(x to 3u) to Rational(-8, 9),
-                    mapOf(x to 0u, y to 4u) to Rational(-8, 7),
-                ),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_times() {
-        IntModuloRing(35).labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(34),
-                    mapOf(x to 3u) to m(2),
-                    mapOf(x to 0u, y to 1u) to m(1),
-                    mapOf(x to 1u) to m(20),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(2),
-                ),
-                m(27) * LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(22),
-                    mapOf(x to 3u) to m(26),
-                    mapOf(x to 0u, y to 1u) to m(13),
-                    mapOf(x to 1u) to m(15),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(0),
-                    mapOf(x to 3u) to m(0),
-                    mapOf(x to 0u, y to 1u) to m(0),
-                    mapOf(x to 1u) to m(0),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
-                ),
-                m(15) * LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(7),
-                    mapOf(x to 3u) to m(0),
-                    mapOf(x to 0u, y to 1u) to m(49),
-                    mapOf(x to 1u) to m(21),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(14),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(0),
-                    mapOf(x to 3u) to m(0),
-                    mapOf(x to 0u, y to 1u) to m(0),
-                    mapOf(x to 1u) to m(0),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
-                ),
-                m(0) * LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(22),
-                    mapOf(x to 3u) to m(26),
-                    mapOf(x to 0u, y to 1u) to m(13),
-                    mapOf(x to 1u) to m(15),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(22),
-                    mapOf(x to 3u) to m(26),
-                    mapOf(x to 0u, y to 1u) to m(13),
-                    mapOf(x to 1u) to m(15),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
-                ),
-                m(1) * LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to m(22),
-                    mapOf(x to 3u) to m(26),
-                    mapOf(x to 0u, y to 1u) to m(13),
-                    mapOf(x to 1u) to m(15),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(26),
-                ),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Variable_unaryPlus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(1),
-                ),
-                +x
-            )
-        }
-    }
-    @Test
-    fun test_Variable_unaryMinus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(-1),
-                ),
-                -x
-            )
-        }
-    }
-    @Test
-    fun test_Variable_Variable_plus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(1),
-                    mapOf(y to 1u) to Rational(1),
-                ),
-                x + y,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(2),
-                ),
-                x + x,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Variable_Variable_minus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(1),
-                    mapOf(y to 1u) to Rational(-1),
-                ),
-                x - y,
-                "test 1"
-            )
-            assertSame(
-                zero,
-                x - x,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Variable_Variable_times() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u, y to 1u) to Rational(1),
-                ),
-                x * y,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 2u) to Rational(1),
-                ),
-                x * x,
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Variable_Polynomial_plus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(7, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                x + LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(6, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                y + LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                    mapOf(iota to 1u) to Rational(1),
-                ),
-                iota + LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                "test 3"
-            )
-        }
-    }
-    @Test
-    fun test_Variable_Polynomial_minus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(16, 4),
-                    mapOf(x to 1u) to Rational(-1, 3),
-                    mapOf(x to 2u) to Rational(-3, 8),
-                    mapOf(y to 1u) to Rational(1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(-6, 5),
-                    mapOf(y to 2u) to Rational(13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 8),
-                ),
-                x - LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(16, 4),
-                    mapOf(x to 1u) to Rational(-4, 3),
-                    mapOf(x to 2u) to Rational(-3, 8),
-                    mapOf(y to 1u) to Rational(8, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(-6, 5),
-                    mapOf(y to 2u) to Rational(13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 8),
-                ),
-                y - LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(16, 4),
-                    mapOf(x to 1u) to Rational(-4, 3),
-                    mapOf(x to 2u) to Rational(-3, 8),
-                    mapOf(y to 1u) to Rational(1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(-6, 5),
-                    mapOf(y to 2u) to Rational(13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 8),
-                    mapOf(iota to 1u) to Rational(1),
-                ),
-                iota - LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                "test 3"
-            )
-        }
-    }
-    @Test
-    fun test_Variable_Polynomial_times() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(-16, 4),
-                    mapOf(x to 2u) to Rational(4, 3),
-                    mapOf(x to 3u) to Rational(3, 8),
-                    mapOf(x to 1u, y to 1u) to Rational(-1, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 3u, y to 1u) to Rational(6, 5),
-                    mapOf(x to 1u, y to 2u) to Rational(-13, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 3u, y to 2u) to Rational(11, 8),
-                ),
-                x * LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(y to 1u) to Rational(-16, 4),
-                    mapOf(x to 1u, y to 1u) to Rational(4, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(3, 8),
-                    mapOf(y to 2u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(6, 5),
-                    mapOf(y to 3u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 3u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 3u) to Rational(11, 8),
-                ),
-                y * LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(iota to 1u) to Rational(-16, 4),
-                    mapOf(x to 1u, iota to 1u) to Rational(4, 3),
-                    mapOf(x to 2u, iota to 1u) to Rational(3, 8),
-                    mapOf(y to 1u, iota to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u, iota to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u, iota to 1u) to Rational(6, 5),
-                    mapOf(y to 2u, iota to 1u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u, iota to 1u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u, iota to 1u) to Rational(11, 8),
-                ),
-                iota * LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                "test 3"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Variable_plus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(7, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ) + x,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(6, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ) + y,
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                    mapOf(iota to 1u) to Rational(1),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ) + iota,
-                "test 3"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Variable_minus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(1, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ) - x,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-8, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ) - y,
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                    mapOf(iota to 1u) to Rational(-1),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ) - iota,
-                "test 3"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Variable_times() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(-16, 4),
-                    mapOf(x to 2u) to Rational(4, 3),
-                    mapOf(x to 3u) to Rational(3, 8),
-                    mapOf(x to 1u, y to 1u) to Rational(-1, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 3u, y to 1u) to Rational(6, 5),
-                    mapOf(x to 1u, y to 2u) to Rational(-13, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 3u, y to 2u) to Rational(11, 8),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ) * x,
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(y to 1u) to Rational(-16, 4),
-                    mapOf(x to 1u, y to 1u) to Rational(4, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(3, 8),
-                    mapOf(y to 2u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(6, 5),
-                    mapOf(y to 3u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 3u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 3u) to Rational(11, 8),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ) * y,
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomialAsIs(
-                    mapOf(iota to 1u) to Rational(-16, 4),
-                    mapOf(x to 1u, iota to 1u) to Rational(4, 3),
-                    mapOf(x to 2u, iota to 1u) to Rational(3, 8),
-                    mapOf(y to 1u, iota to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u, iota to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u, iota to 1u) to Rational(6, 5),
-                    mapOf(y to 2u, iota to 1u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u, iota to 1u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u, iota to 1u) to Rational(11, 8),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-16, 4),
-                    mapOf(x to 1u) to Rational(4, 3),
-                    mapOf(x to 2u) to Rational(3, 8),
-                    mapOf(y to 1u) to Rational(-1, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-15, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 5),
-                    mapOf(y to 2u) to Rational(-13, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(13, 4),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 8),
-                ) * iota,
-                "test 3"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_unaryMinus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf(x to 5u) to Rational(-5, 9),
-                    mapOf<Symbol, UInt>() to Rational(8, 9),
-                    mapOf(iota to 13u) to Rational(8, 7),
-                ),
-                -LabeledPolynomial(
-                    mapOf(x to 5u) to Rational(5, 9),
-                    mapOf<Symbol, UInt>() to Rational(-8, 9),
-                    mapOf(iota to 13u) to Rational(-8, 7),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf(x to 5u) to Rational(-5, 9),
-                    mapOf<Symbol, UInt>() to Rational(8, 9),
-                    mapOf(iota to 13u) to Rational(8, 7),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                    mapOf(x to 5u) to Rational(0),
-                ),
-                -LabeledPolynomial(
-                    mapOf(x to 5u) to Rational(5, 9),
-                    mapOf<Symbol, UInt>() to Rational(-8, 9),
-                    mapOf(iota to 13u) to Rational(-8, 7),
-                    mapOf(x to 0u, y to 4u) to Rational(0),
-                    mapOf(x to 5u) to Rational(0),
-                ),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_plus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-17, 2),
-                    mapOf(x to 1u) to Rational(-1, 3),
-                    mapOf(x to 2u) to Rational(-25, 21),
-                    mapOf(x to 0u, y to 1u) to Rational(146, 63),
-                    mapOf(x to 1u, y to 1u) to Rational(-3, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(61, 15),
-                    mapOf(x to 0u, y to 2u) to Rational(157, 63),
-                    mapOf(x to 1u, y to 2u) to Rational(-55, 21),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 24),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(6, 4),
-                    mapOf(x to 1u) to Rational(-2, 6),
-                    mapOf(x to 2u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 1u) to Rational(17, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-7, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 5),
-                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
-                ) + LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-20, 2),
-                    mapOf(x to 1u) to Rational(0, 9),
-                    mapOf(x to 2u) to Rational(-20, 7),
-                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(7, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(5, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(-2, 3),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-17, 2),
-                    mapOf(x to 1u) to Rational(-1, 3),
-                    mapOf(x to 2u) to Rational(-25, 21),
-                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(157, 63),
-                    mapOf(x to 1u, y to 2u) to Rational(-55, 21),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 24),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(6, 4),
-                    mapOf(x to 1u) to Rational(-2, 6),
-                    mapOf(x to 2u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
-                ) + LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-20, 2),
-                    mapOf(x to 1u) to Rational(0, 9),
-                    mapOf(x to 2u) to Rational(-20, 7),
-                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(7, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(5, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(-2, 3),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-17, 2),
-                    mapOf(x to 1u) to Rational(-1, 3),
-                    mapOf(x to 2u) to Rational(-25, 21),
-                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(6, 4),
-                    mapOf(x to 1u) to Rational(-2, 6),
-                    mapOf(x to 2u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
-                ) + LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-20, 2),
-                    mapOf(x to 1u) to Rational(0, 9),
-                    mapOf(x to 2u) to Rational(-20, 7),
-                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(0),
-                    mapOf(x to 1u, y to 2u) to Rational(0),
-                    mapOf(x to 2u, y to 2u) to Rational(0),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 1u) to Rational(0),
-                    mapOf(x to 2u) to Rational(0),
-                    mapOf(x to 0u, y to 1u) to Rational(0),
-                    mapOf(x to 1u, y to 1u) to Rational(0),
-                    mapOf(x to 2u, y to 1u) to Rational(0),
-                    mapOf(x to 0u, y to 2u) to Rational(0),
-                    mapOf(x to 1u, y to 2u) to Rational(0),
-                    mapOf(x to 2u, y to 2u) to Rational(0),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(6, 4),
-                    mapOf(x to 1u) to Rational(-2, 6),
-                    mapOf(x to 2u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 1u) to Rational(17, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-7, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 5),
-                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
-                ) + LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-6, 4),
-                    mapOf(x to 1u) to Rational(2, 6),
-                    mapOf(x to 2u) to Rational(-10, 6),
-                    mapOf(x to 0u, y to 1u) to Rational(-17, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(7, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(-12, 5),
-                    mapOf(x to 0u, y to 2u) to Rational(-12, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(10, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(-9, 8),
-                ),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_minus() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-17, 2),
-                    mapOf(x to 1u) to Rational(-1, 3),
-                    mapOf(x to 2u) to Rational(-25, 21),
-                    mapOf(x to 0u, y to 1u) to Rational(146, 63),
-                    mapOf(x to 1u, y to 1u) to Rational(-3, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(61, 15),
-                    mapOf(x to 0u, y to 2u) to Rational(157, 63),
-                    mapOf(x to 1u, y to 2u) to Rational(-55, 21),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 24),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(6, 4),
-                    mapOf(x to 1u) to Rational(-2, 6),
-                    mapOf(x to 2u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 1u) to Rational(17, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-7, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 5),
-                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
-                ) - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(20, 2),
-                    mapOf(x to 1u) to Rational(0, 9),
-                    mapOf(x to 2u) to Rational(20, 7),
-                    mapOf(x to 0u, y to 1u) to Rational(1, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(-2, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(-10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(-7, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(-5, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(2, 3),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-17, 2),
-                    mapOf(x to 1u) to Rational(-1, 3),
-                    mapOf(x to 2u) to Rational(-25, 21),
-                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(157, 63),
-                    mapOf(x to 1u, y to 2u) to Rational(-55, 21),
-                    mapOf(x to 2u, y to 2u) to Rational(11, 24),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(6, 4),
-                    mapOf(x to 1u) to Rational(-2, 6),
-                    mapOf(x to 2u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
-                ) - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(20, 2),
-                    mapOf(x to 1u) to Rational(0, 9),
-                    mapOf(x to 2u) to Rational(20, 7),
-                    mapOf(x to 0u, y to 1u) to Rational(1, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(-2, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(-10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(-7, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(-5, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(2, 3),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(-17, 2),
-                    mapOf(x to 1u) to Rational(-1, 3),
-                    mapOf(x to 2u) to Rational(-25, 21),
-                    mapOf(x to 0u, y to 1u) to Rational(-1, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(2, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(6, 4),
-                    mapOf(x to 1u) to Rational(-2, 6),
-                    mapOf(x to 2u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
-                ) - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(20, 2),
-                    mapOf(x to 1u) to Rational(0, 9),
-                    mapOf(x to 2u) to Rational(20, 7),
-                    mapOf(x to 0u, y to 1u) to Rational(1, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(-2, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(-10, 6),
-                    mapOf(x to 0u, y to 2u) to Rational(0),
-                    mapOf(x to 1u, y to 2u) to Rational(0),
-                    mapOf(x to 2u, y to 2u) to Rational(0),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(0),
-                    mapOf(x to 1u) to Rational(0),
-                    mapOf(x to 2u) to Rational(0),
-                    mapOf(x to 0u, y to 1u) to Rational(0),
-                    mapOf(x to 1u, y to 1u) to Rational(0),
-                    mapOf(x to 2u, y to 1u) to Rational(0),
-                    mapOf(x to 0u, y to 2u) to Rational(0),
-                    mapOf(x to 1u, y to 2u) to Rational(0),
-                    mapOf(x to 2u, y to 2u) to Rational(0),
-                ),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(6, 4),
-                    mapOf(x to 1u) to Rational(-2, 6),
-                    mapOf(x to 2u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 1u) to Rational(17, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-7, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 5),
-                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
-                ) - LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to Rational(6, 4),
-                    mapOf(x to 1u) to Rational(-2, 6),
-                    mapOf(x to 2u) to Rational(10, 6),
-                    mapOf(x to 0u, y to 1u) to Rational(17, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-7, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 5),
-                    mapOf(x to 0u, y to 2u) to Rational(12, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-10, 3),
-                    mapOf(x to 2u, y to 2u) to Rational(9, 8),
-                ),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_times() {
-        IntModuloRing(35).labeledPolynomialSpace {
-            // (p + q + r) * (p^2 + q^2 + r^2 - pq - pr - qr) = p^3 + q^3 + r^3 - 3pqr
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf(x to 3u) to m(1),
-                    mapOf(x to 0u, y to 3u) to m(1),
-                    mapOf(x to 0u, y to 0u, z to 3u) to m(1),
-                    mapOf(x to 1u, y to 2u) to m(0),
-                    mapOf(x to 0u, y to 1u, z to 2u) to m(0),
-                    mapOf(x to 2u, y to 0u, z to 1u) to m(0),
-                    mapOf(x to 1u, y to 0u, z to 2u) to m(0),
-                    mapOf(x to 2u, y to 1u) to m(0),
-                    mapOf(x to 0u, y to 2u, z to 1u) to m(0),
-                    mapOf(x to 1u, y to 1u, z to 1u) to m(-3),
-                ),
-                LabeledPolynomial(
-                    mapOf(x to 1u) to m(1),
-                    mapOf(x to 0u, y to 1u) to m(1),
-                    mapOf(x to 0u, y to 0u, z to 1u) to m(1),
-                ) * LabeledPolynomial(
-                    mapOf(x to 2u) to m(1),
-                    mapOf(x to 0u, y to 2u) to m(1),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(1),
-                    mapOf(x to 1u, y to 1u) to m(-1),
-                    mapOf(x to 0u, y to 1u, z to 1u) to m(-1),
-                    mapOf(x to 1u, y to 0u, z to 1u) to m(-1),
-                ),
-                "test 1"
-            )
-            // Spoiler: 5 * 7 = 0
-            assertEquals(
-                LabeledPolynomial(
-                    mapOf(x to 2u) to m(0),
-                    mapOf(x to 0u, y to 2u) to m(0),
-                    mapOf(x to 0u, y to 0u, z to 2u) to m(0),
-                    mapOf(x to 1u, y to 1u) to m(0),
-                    mapOf(x to 0u, y to 1u, z to 1u) to m(0),
-                    mapOf(x to 1u, y to 0u, z to 1u) to m(0),
-                ),
-                LabeledPolynomial(
-                    mapOf(x to 1u) to m(5),
-                    mapOf(x to 0u, y to 1u) to m(-25),
-                    mapOf(x to 0u, y to 0u, z to 1u) to m(10),
-                ) * LabeledPolynomial(
-                    mapOf(x to 1u) to m(21),
-                    mapOf(x to 0u, y to 1u) to m(14),
-                    mapOf(x to 0u, y to 0u, z to 1u) to m(-7),
-                ),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_degree() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                -1,
-                LabeledPolynomial().degree,
-                "test 1"
-            )
-            assertEquals(
-                0,
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o
-                ).degree,
-                "test 2"
-            )
-            assertEquals(
-                6,
-                LabeledPolynomial(
-                    mapOf(x to 1u, y to 2u, z to 3u) to o
-                ).degree,
-                "test 3"
-            )
-            assertEquals(
-                4,
-                LabeledPolynomial(
-                    mapOf(x to 0u, y to 1u, z to 2u, t to 1u, s to 0u) to o
-                ).degree,
-                "test 4"
-            )
-            assertEquals(
-                3,
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o,
-                    mapOf(x to 0u, y to 1u) to o,
-                    mapOf(x to 2u, y to 0u, z to 1u) to o,
-                ).degree,
-                "test 5"
-            )
-            assertEquals(
-                4,
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o,
-                    mapOf(x to 0u, y to 1u) to o,
-                    mapOf(x to 2u, y to 0u, z to 1u) to o,
-                    mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
-                ).degree,
-                "test 6"
-            )
-        }
-    }
-    @Test
-    fun test_degrees() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                mapOf(),
-                LabeledPolynomial().degrees,
-                "test 1"
-            )
-            assertEquals(
-                mapOf(),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o
-                ).degrees,
-                "test 2"
-            )
-            assertEquals(
-                mapOf(x to 1u, y to 2u, z to 3u),
-                LabeledPolynomial(
-                    mapOf(x to 1u, y to 2u, z to 3u) to o
-                ).degrees,
-                "test 3"
-            )
-            assertEquals(
-                mapOf(y to 1u, z to 2u, t to 1u),
-                LabeledPolynomial(
-                    mapOf(x to 0u, y to 1u, z to 2u, t to 1u, s to 0u) to o
-                ).degrees,
-                "test 4"
-            )
-            assertEquals(
-                mapOf(x to 2u, y to 1u, z to 1u),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o,
-                    mapOf(x to 0u, y to 1u) to o,
-                    mapOf(x to 2u, y to 0u, z to 1u) to o,
-                ).degrees,
-                "test 5"
-            )
-            assertEquals(
-                mapOf(x to 2u, y to 2u, z to 2u, t to 4u),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o,
-                    mapOf(x to 1u, y to 2u) to o,
-                    mapOf(x to 0u, y to 1u, z to 2u) to o,
-                    mapOf(x to 2u, y to 0u, z to 1u) to o,
-                    mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
-                ).degrees,
-                "test 6"
-            )
-        }
-    }
-    @Test
-    fun test_degreeBy() {
-        RationalField.labeledPolynomialSpace {
-            fun LabeledPolynomial<Rational>.collectDegrees(variables: Set<Symbol> = this.variables + iota): Map<Symbol, UInt> = variables.associateWith { degreeBy(it) }
-            assertEquals(
-                mapOf(iota to 0u),
-                LabeledPolynomial().collectDegrees(),
-                "test 1"
-            )
-            assertEquals(
-                mapOf(iota to 0u),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o
-                ).collectDegrees(),
-                "test 2"
-            )
-            assertEquals(
-                mapOf(x to 1u, y to 2u, z to 3u, iota to 0u),
-                LabeledPolynomial(
-                    mapOf(x to 1u, y to 2u, z to 3u) to o
-                ).collectDegrees(),
-                "test 3"
-            )
-            assertEquals(
-                mapOf(y to 1u, z to 2u, t to 1u, iota to 0u),
-                LabeledPolynomial(
-                    mapOf(x to 0u, y to 1u, z to 2u, t to 1u, s to 0u) to o
-                ).collectDegrees(),
-                "test 4"
-            )
-            assertEquals(
-                mapOf(x to 2u, y to 1u, z to 1u, iota to 0u),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o,
-                    mapOf(x to 0u, y to 1u) to o,
-                    mapOf(x to 2u, y to 0u, z to 1u) to o,
-                ).collectDegrees(),
-                "test 5"
-            )
-            assertEquals(
-                mapOf(x to 2u, y to 2u, z to 2u, t to 4u, iota to 0u),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o,
-                    mapOf(x to 1u, y to 2u) to o,
-                    mapOf(x to 0u, y to 1u, z to 2u) to o,
-                    mapOf(x to 2u, y to 0u, z to 1u) to o,
-                    mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
-                ).collectDegrees(),
-                "test 6"
-            )
-        }
-    }
-    @Test
-    fun test_degreeBy_Collection() {
-        RationalField.labeledPolynomialSpace {
-            fun LabeledPolynomial<Rational>.checkDegreeBy(message: String? = null) {
-                val variables = variables.toList() + iota
-                val variablesCollectionSequence: Sequence<List<Symbol>> = sequence {
-                    val appearances = MutableList(variables.size) { 0 }
-                    while (true) {
-                        yield(
-                            buildList {
-                                for ((variableIndex, count) in appearances.withIndex()) repeat(count) { add(variables[variableIndex]) }
-                            }
-                        )
-                        val indexChange = appearances.indexOfFirst { it < 4 }
-                        if (indexChange == -1) break
-                        appearances[indexChange] += 1
-                        for (index in 0 until indexChange) appearances[index] = 0
-                    }
-                }
-                for (variablesCollection in variablesCollectionSequence) {
-                    val expected = coefficients.keys.maxOfOrNull { degs -> degs.filterKeys { it in variablesCollection }.values.sum() } ?: 0u
-                    val actual = degreeBy(variablesCollection)
-                    if (actual != expected)
-                        fail("${message ?: ""} Incorrect answer for variable collection $variablesCollection: expected $expected, actual $actual")
-                }
-            }
-            LabeledPolynomial().checkDegreeBy("test 1")
-            LabeledPolynomial(
-                mapOf<Symbol, UInt>() to o
-            ).checkDegreeBy("test 2")
-            LabeledPolynomial(
-                mapOf(x to 1u, y to 2u, z to 3u) to o
-            ).checkDegreeBy("test 3")
-            LabeledPolynomial(
-                mapOf(x to 0u, y to 1u, z to 2u, t to 1u, s to 0u) to o
-            ).checkDegreeBy("test 4")
-            LabeledPolynomial(
-                mapOf<Symbol, UInt>() to o,
-                mapOf(x to 0u, y to 1u) to o,
-                mapOf(x to 2u, y to 0u, z to 1u) to o,
-            ).checkDegreeBy("test 5")
-            LabeledPolynomial(
-                mapOf<Symbol, UInt>() to o,
-                mapOf(x to 1u, y to 2u) to o,
-                mapOf(x to 0u, y to 1u, z to 2u) to o,
-                mapOf(x to 2u, y to 0u, z to 1u) to o,
-                mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
-            ).checkDegreeBy("test 6")
-        }
-    }
-    @Test
-    fun test_variables() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                setOf(),
-                LabeledPolynomial().variables,
-                "test 1"
-            )
-            assertEquals(
-                setOf(),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o
-                ).variables,
-                "test 2"
-            )
-            assertEquals(
-                setOf(x, y, z),
-                LabeledPolynomial(
-                    mapOf(x to 1u, y to 2u, z to 3u) to o
-                ).variables,
-                "test 3"
-            )
-            assertEquals(
-                setOf(y, z, t),
-                LabeledPolynomial(
-                    mapOf(x to 0u, y to 1u, z to 2u, t to 1u, s to 0u) to o
-                ).variables,
-                "test 4"
-            )
-            assertEquals(
-                setOf(x, y, z),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o,
-                    mapOf(x to 0u, y to 1u) to o,
-                    mapOf(x to 2u, y to 0u, z to 1u) to o,
-                ).variables,
-                "test 5"
-            )
-            assertEquals(
-                setOf(x, y, z, t),
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o,
-                    mapOf(x to 1u, y to 2u) to o,
-                    mapOf(x to 0u, y to 1u, z to 2u) to o,
-                    mapOf(x to 2u, y to 0u, z to 1u) to o,
-                    mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
-                ).variables,
-                "test 6"
-            )
-        }
-    }
-    @Test
-    fun test_countOfVariables() {
-        RationalField.labeledPolynomialSpace {
-            assertEquals(
-                0,
-                LabeledPolynomial().countOfVariables,
-                "test 1"
-            )
-            assertEquals(
-                0,
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o
-                ).countOfVariables,
-                "test 2"
-            )
-            assertEquals(
-                3,
-                LabeledPolynomial(
-                    mapOf(x to 1u, y to 2u, z to 3u) to o
-                ).countOfVariables,
-                "test 3"
-            )
-            assertEquals(
-                3,
-                LabeledPolynomial(
-                    mapOf(x to 0u, y to 1u, z to 2u, t to 1u, s to 0u) to o
-                ).countOfVariables,
-                "test 4"
-            )
-            assertEquals(
-                3,
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o,
-                    mapOf(x to 0u, y to 1u) to o,
-                    mapOf(x to 2u, y to 0u, z to 1u) to o,
-                ).countOfVariables,
-                "test 5"
-            )
-            assertEquals(
-                4,
-                LabeledPolynomial(
-                    mapOf<Symbol, UInt>() to o,
-                    mapOf(x to 1u, y to 2u) to o,
-                    mapOf(x to 0u, y to 1u, z to 2u) to o,
-                    mapOf(x to 2u, y to 0u, z to 1u) to o,
-                    mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
-                ).countOfVariables,
-                "test 6"
-            )
-        }
-    }
-    @Test
-    fun test_RF_countOfVariables() {
-        RationalField.labeledRationalFunctionSpace {
-            assertEquals(
-                0,
-                LabeledRationalFunction(
-                    LabeledPolynomial()
-                ).countOfVariables,
-                "test 1"
-            )
-            assertEquals(
-                0,
-                LabeledRationalFunction(
-                    LabeledPolynomial(),
-                    LabeledPolynomial()
-                ).countOfVariables,
-                "test 2"
-            )
-            assertEquals(
-                0,
-                LabeledRationalFunction(
-                    LabeledPolynomial(
-                        mapOf<Symbol, UInt>() to o
-                    )
-                ).countOfVariables,
-                "test 3"
-            )
-            assertEquals(
-                3,
-                LabeledRationalFunction(
-                    LabeledPolynomial(
-                        mapOf(x to 1u, y to 2u, z to 3u) to o
-                    )
-                ).countOfVariables,
-                "test 4"
-            )
-            assertEquals(
-                3,
-                LabeledRationalFunction(
-                    LabeledPolynomial(
-                        mapOf(x to 0u, y to 1u, z to 0u, t to 1u) to o
-                    ),
-                    LabeledPolynomial(
-                        mapOf(x to 0u, y to 0u, z to 2u) to o
-                    )
-                ).countOfVariables,
-                "test 5"
-            )
-            assertEquals(
-                3,
-                LabeledRationalFunction(
-                    LabeledPolynomial(
-                        mapOf<Symbol, UInt>() to o,
-                        mapOf(x to 0u, y to 1u) to o,
-                        mapOf(x to 2u, y to 0u, z to 1u) to o,
-                    )
-                ).countOfVariables,
-                "test 6"
-            )
-            assertEquals(
-                4,
-                LabeledRationalFunction(
-                    LabeledPolynomial(
-                        mapOf<Symbol, UInt>() to o,
-                        mapOf(x to 1u, y to 2u) to o,
-                        mapOf(x to 2u, y to 0u, z to 1u) to o,
-                    ), LabeledPolynomial(
-                        mapOf(x to 0u, y to 1u, z to 2u) to o,
-                        mapOf(x to 0u, y to 0u, z to 0u, t to 4u) to o,
-                    )
-                ).countOfVariables,
-                "test 7"
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
deleted file mode 100644
index 637981b66..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/LabeledPolynomialUtilTest.kt
+++ /dev/null
@@ -1,8222 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.functions.testUtils.assertEquals
-import space.kscience.kmath.functions.testUtils.Rational
-import space.kscience.kmath.functions.testUtils.RationalField
-import space.kscience.kmath.functions.testUtils.iota
-import space.kscience.kmath.functions.testUtils.x
-import space.kscience.kmath.functions.testUtils.y
-import space.kscience.kmath.misc.UnstableKMathAPI
-import kotlin.test.Ignore
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class LabeledPolynomialUtilTest {
-    @Test
-    fun test_Polynomial_substitute_Double() {
-        assertEquals(
-            LabeledPolynomialAsIs(emptyMap<Symbol, UInt>() to 0.0),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 1.0,
-                mapOf(x to 1u) to -2.0,
-                mapOf(x to 2u) to 1.0,
-            ).substitute(mapOf(
-                x to 1.0
-            )),
-            0.001,
-            "test 1"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 0.8597048543814783,
-                mapOf(x to 1u) to 0.22997637465889875,
-                mapOf(x to 2u) to 0.32675302591924016,
-                mapOf(y to 1u) to 0.4561746111587508,
-                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
-                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
-                mapOf(y to 2u) to 0.2700930201481795,
-                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
-                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 0.8597048543814783,
-                mapOf(x to 1u) to 0.22997637465889875,
-                mapOf(x to 2u) to 0.32675302591924016,
-                mapOf(y to 1u) to 0.4561746111587508,
-                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
-                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
-                mapOf(y to 2u) to 0.2700930201481795,
-                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
-                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
-            ).substitute(mapOf()),
-            0.001,
-            "test 2"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 0.8597048543814783,
-                mapOf(x to 1u) to 0.22997637465889875,
-                mapOf(x to 2u) to 0.32675302591924016,
-                mapOf(y to 1u) to 0.4561746111587508,
-                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
-                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
-                mapOf(y to 2u) to 0.2700930201481795,
-                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
-                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 0.8597048543814783,
-                mapOf(x to 1u) to 0.22997637465889875,
-                mapOf(x to 2u) to 0.32675302591924016,
-                mapOf(y to 1u) to 0.4561746111587508,
-                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
-                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
-                mapOf(y to 2u) to 0.2700930201481795,
-                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
-                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                iota to 0.9211194782050933
-            )),
-            0.001,
-            "test 2'"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 0.8597048543814783,
-                mapOf(y to 1u) to 0.4561746111587508,
-                mapOf(y to 2u) to 0.2700930201481795,
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 0.8597048543814783,
-                mapOf(x to 1u) to 0.22997637465889875,
-                mapOf(x to 2u) to 0.32675302591924016,
-                mapOf(y to 1u) to 0.4561746111587508,
-                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
-                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
-                mapOf(y to 2u) to 0.2700930201481795,
-                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
-                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                x to 0.0
-            )),
-            0.001,
-            "test 3"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 0.8597048543814783,
-                mapOf(y to 1u) to 0.4561746111587508,
-                mapOf(y to 2u) to 0.2700930201481795,
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 0.8597048543814783,
-                mapOf(x to 1u) to 0.22997637465889875,
-                mapOf(x to 2u) to 0.32675302591924016,
-                mapOf(y to 1u) to 0.4561746111587508,
-                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
-                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
-                mapOf(y to 2u) to 0.2700930201481795,
-                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
-                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                x to 0.0,
-                iota to 0.9211194782050933
-            )),
-            0.001,
-            "test 3'"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 1.433510890645169,
-                mapOf(x to 1u) to 0.6264844682514724,
-                mapOf(x to 2u) to 0.8405727903771333,
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 0.8597048543814783,
-                mapOf(x to 1u) to 0.22997637465889875,
-                mapOf(x to 2u) to 0.32675302591924016,
-                mapOf(y to 1u) to 0.4561746111587508,
-                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
-                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
-                mapOf(y to 2u) to 0.2700930201481795,
-                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
-                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                y to 0.8400458576651112
-            )),
-            0.001,
-            "test 4"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 1.433510890645169,
-                mapOf(x to 1u) to 0.6264844682514724,
-                mapOf(x to 2u) to 0.8405727903771333,
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 0.8597048543814783,
-                mapOf(x to 1u) to 0.22997637465889875,
-                mapOf(x to 2u) to 0.32675302591924016,
-                mapOf(y to 1u) to 0.4561746111587508,
-                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
-                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
-                mapOf(y to 2u) to 0.2700930201481795,
-                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
-                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                y to 0.8400458576651112,
-                iota to 0.9211194782050933
-            )),
-            0.001,
-            "test 4'"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 1.934530767358133,
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 0.8597048543814783,
-                mapOf(x to 1u) to 0.22997637465889875,
-                mapOf(x to 2u) to 0.32675302591924016,
-                mapOf(y to 1u) to 0.4561746111587508,
-                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
-                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
-                mapOf(y to 2u) to 0.2700930201481795,
-                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
-                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                x to 0.4846192734143442,
-                y to 0.8400458576651112,
-            )),
-            0.001,
-            "test 5"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 1.934530767358133,
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to 0.8597048543814783,
-                mapOf(x to 1u) to 0.22997637465889875,
-                mapOf(x to 2u) to 0.32675302591924016,
-                mapOf(y to 1u) to 0.4561746111587508,
-                mapOf(x to 1u, y to 1u) to 0.5304946210170756,
-                mapOf(x to 2u, y to 1u) to 0.6244313712888998,
-                mapOf(y to 2u) to 0.2700930201481795,
-                mapOf(x to 1u, y to 2u) to -0.06962351375204712,
-                mapOf(x to 2u, y to 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                x to 0.4846192734143442,
-                y to 0.8400458576651112,
-                iota to 0.9211194782050933
-            )),
-            0.001,
-            "test 5'"
-        )
-    }
-    @Test
-    fun test_Polynomial_substitute_Constant_Map() {
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0)
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1)
-            ).substitute(RationalField, mapOf(
-                x to Rational(1)
-            )),
-            "test 1"
-        )
-        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5%2C+y+%3D+12%2F9
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(143, 150)
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                x to Rational(-2, 5),
-                y to Rational(12, 9),
-            )),
-            "test 2"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(143, 150)
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                x to Rational(-2, 5),
-                y to Rational(12, 9),
-                iota to Rational(57, 179),
-            )),
-            "test 2'"
-        )
-        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+y+%3D+12%2F9
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-67, 18),
-                mapOf(x to 1u) to Rational(-70, 9),
-                mapOf(x to 2u) to Rational(88, 9),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                y to Rational(12, 9),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-67, 18),
-                mapOf(x to 1u) to Rational(-70, 9),
-                mapOf(x to 2u) to Rational(88, 9),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                y to Rational(12, 9),
-                iota to Rational(57, 179),
-            )),
-            "test 3'"
-        )
-        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-83, 50),
-                mapOf(y to 1u) to Rational(29, 25),
-                mapOf(y to 2u) to Rational(3, 5),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                x to Rational(-2, 5),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-83, 50),
-                mapOf(y to 1u) to Rational(29, 25),
-                mapOf(y to 2u) to Rational(3, 5),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                x to Rational(-2, 5),
-                iota to Rational(57, 179),
-            )),
-            "test 4'"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf<Symbol, Rational>()),
-            "test 5"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                iota to Rational(57, 179),
-            )),
-            "test 5'"
-        )
-        // https://www.wolframalpha.com/input?i=%28%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2%29+p%5E8+where+x+%3D+q%2Fp%2C+y+%3D+x%5E3%2C+p+%3D+-2%2F5%2C+q+%3D+12%2F9
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(47639065216, 2562890625)
-            ),
-            LabeledPolynomialAsIs(
-                mapOf(x to 8u) to Rational(-3, 2),
-                mapOf(x to 7u, y to 1u) to Rational(8, 6),
-                mapOf(x to 6u, y to 2u) to Rational(14, 6),
-                mapOf(x to 5u, y to 3u) to Rational(-3, 1),
-                mapOf(x to 4u, y to 4u) to Rational(-19, 2),
-                mapOf(x to 3u, y to 5u) to Rational(9, 4),
-                mapOf(x to 2u, y to 6u) to Rational(5, 5),
-                mapOf(x to 1u, y to 7u) to Rational(18, 9),
-                mapOf(y to 8u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                x to Rational(-2, 5),
-                y to Rational(12, 9),
-            )),
-            "test 6"
-        )
-    }
-    @Test
-    fun test_Polynomial_substitute_Polynomial_Map() {
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0)
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1)
-            ).substitute(RationalField, mapOf(
-                x to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1)
-                )
-            )),
-            "test 1"
-        )
-        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-5%2F1+s+%2B+2%2F8+t%2C+y+%3D+11%2F7+t
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(y to 1u) to Rational(-92, 21),
-                mapOf(y to 2u) to Rational(-2627, 2352),
-                mapOf(y to 3u) to Rational(4565, 3136),
-                mapOf(y to 4u) to Rational(605, 1568),
-                mapOf(x to 1u) to Rational(-20, 3),
-                mapOf(x to 1u, y to 1u) to Rational(1445, 21),
-                mapOf(x to 1u, y to 2u) to Rational(-13145, 392),
-                mapOf(x to 1u, y to 3u) to Rational(-3025, 196),
-                mapOf(x to 2u) to Rational(175, 3),
-                mapOf(x to 2u, y to 1u) to Rational(2475, 28),
-                mapOf(x to 2u, y to 2u) to Rational(15125, 98),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                x to LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(-5, 1),
-                    mapOf(y to 1u) to Rational(2, 8),
-                ),
-                y to LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(0, 5),
-                    mapOf(y to 1u) to Rational(11, 7),
-                ),
-            )),
-            "test 2"
-        )
-        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = (0/6 + 14/8 s + -14/2 s^2) + (-3/5 + 11/1 s + 3/7 s^2) t + (-3/7 + -18/5 s + -9/1 s^2) t^2, y = (-9/2 + 2/7 s + 9/1 s^2) + (13/1 + -1/8 s + 2/8 s^2) t + (19/4 + 15/7 s + -19/4 s^2) t^2
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(129, 4),
-                mapOf(x to 1u) to Rational(48583, 336),
-                mapOf(x to 2u) to Rational(-913477, 1568),
-                mapOf(x to 3u) to Rational(-967567, 672),
-                mapOf(x to 4u) to Rational(4722043, 1344),
-                mapOf(x to 5u) to Rational(8855, 2),
-                mapOf(x to 6u) to Rational(-311971, 32),
-                mapOf(x to 7u) to Rational(-17325, 4),
-                mapOf(x to 8u) to Rational(19845, 2),
-                mapOf(y to 1u) to Rational(-827, 4),
-                mapOf(x to 1u, y to 1u) to Rational(191927, 840),
-                mapOf(x to 2u, y to 1u) to Rational(9592627, 2352),
-                mapOf(x to 3u, y to 1u) to Rational(-105400711, 53760),
-                mapOf(x to 4u, y to 1u) to Rational(-10054101459, 439040),
-                mapOf(x to 5u, y to 1u) to Rational(2127351, 128),
-                mapOf(x to 6u, y to 1u) to Rational(116680973, 3136),
-                mapOf(x to 7u, y to 1u) to Rational(-220445, 7),
-                mapOf(x to 8u, y to 1u) to Rational(-2655, 4),
-                mapOf(y to 2u) to Rational(30567, 100),
-                mapOf(x to 1u, y to 2u) to Rational(-156284953, 39200),
-                mapOf(x to 2u, y to 2u) to Rational(-57661541711, 6585600),
-                mapOf(x to 3u, y to 2u) to Rational(131931579, 3136),
-                mapOf(x to 4u, y to 2u) to Rational(98818124791, 3512320),
-                mapOf(x to 5u, y to 2u) to Rational(-94458855053, 878080),
-                mapOf(x to 6u, y to 2u) to Rational(13937705305, 1229312),
-                mapOf(x to 7u, y to 2u) to Rational(335706887, 21952),
-                mapOf(x to 8u, y to 2u) to Rational(23549165, 1568),
-                mapOf(y to 3u) to Rational(111367, 1400),
-                mapOf(x to 1u, y to 3u) to Rational(4937369, 700),
-                mapOf(x to 2u, y to 3u) to Rational(-4449423711, 274400),
-                mapOf(x to 3u, y to 3u) to Rational(-351873325703, 4390400),
-                mapOf(x to 4u, y to 3u) to Rational(23495875029, 307328),
-                mapOf(x to 5u, y to 3u) to Rational(17576300919, 878080),
-                mapOf(x to 6u, y to 3u) to Rational(230316993, 12544),
-                mapOf(x to 7u, y to 3u) to Rational(-191130515, 21952),
-                mapOf(x to 8u, y to 3u) to Rational(332435, 392),
-                mapOf(y to 4u) to Rational(-275084, 1225),
-                mapOf(x to 1u, y to 4u) to Rational(-266774603, 137200),
-                mapOf(x to 2u, y to 4u) to Rational(2176279167121, 30732800),
-                mapOf(x to 3u, y to 4u) to Rational(10904913303, 2195200),
-                mapOf(x to 4u, y to 4u) to Rational(-10769286147, 2195200),
-                mapOf(x to 5u, y to 4u) to Rational(-26277119793, 439040),
-                mapOf(x to 6u, y to 4u) to Rational(25859735869, 6146560),
-                mapOf(x to 7u, y to 4u) to Rational(38906289, 2744),
-                mapOf(x to 8u, y to 4u) to Rational(-3072025, 392),
-                mapOf(y to 5u) to Rational(9573, 98),
-                mapOf(x to 1u, y to 5u) to Rational(-4154651399, 548800),
-                mapOf(x to 2u, y to 5u) to Rational(3446069019, 548800),
-                mapOf(x to 3u, y to 5u) to Rational(-7851500623, 137200),
-                mapOf(x to 4u, y to 5u) to Rational(-53205142903, 1920800),
-                mapOf(x to 5u, y to 5u) to Rational(-31953611, 3430),
-                mapOf(x to 6u, y to 5u) to Rational(1447380313, 109760),
-                mapOf(x to 7u, y to 5u) to Rational(764158625, 21952),
-                mapOf(x to 8u, y to 5u) to Rational(1153515, 784),
-                mapOf(y to 6u) to Rational(1722351, 7840),
-                mapOf(x to 1u, y to 6u) to Rational(-164554821, 109760),
-                mapOf(x to 2u, y to 6u) to Rational(-79096147243, 7683200),
-                mapOf(x to 3u, y to 6u) to Rational(-624721089, 15680),
-                mapOf(x to 4u, y to 6u) to Rational(11147305567, 548800),
-                mapOf(x to 5u, y to 6u) to Rational(8318333679, 109760),
-                mapOf(x to 6u, y to 6u) to Rational(32981871553, 1536640),
-                mapOf(x to 7u, y to 6u) to Rational(-225359619, 21952),
-                mapOf(x to 8u, y to 6u) to Rational(-3973995, 392),
-                mapOf(y to 7u) to Rational(67203, 784),
-                mapOf(x to 1u, y to 7u) to Rational(39281469, 54880),
-                mapOf(x to 2u, y to 7u) to Rational(70162551, 27440),
-                mapOf(x to 3u, y to 7u) to Rational(413630709, 54880),
-                mapOf(x to 4u, y to 7u) to Rational(4640410269, 192080),
-                mapOf(x to 5u, y to 7u) to Rational(802712247, 54880),
-                mapOf(x to 6u, y to 7u) to Rational(-473517603, 27440),
-                mapOf(x to 7u, y to 7u) to Rational(-17055459, 1568),
-                mapOf(x to 8u, y to 7u) to Rational(-12825, 14),
-                mapOf(y to 8u) to Rational(16245, 1568),
-                mapOf(x to 1u, y to 8u) to Rational(503253, 2744),
-                mapOf(x to 2u, y to 8u) to Rational(125292591, 96040),
-                mapOf(x to 3u, y to 8u) to Rational(12033171, 2744),
-                mapOf(x to 4u, y to 8u) to Rational(154352673, 27440),
-                mapOf(x to 5u, y to 8u) to Rational(-1302291, 392),
-                mapOf(x to 6u, y to 8u) to Rational(-20265741, 1960),
-                mapOf(x to 7u, y to 8u) to Rational(-26163, 56),
-                mapOf(x to 8u, y to 8u) to Rational(146205, 32),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                x to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(0, 6),
-                    mapOf(x to 1u) to Rational(14, 8),
-                    mapOf(x to 2u) to Rational(-14, 2),
-                    mapOf(y to 1u) to Rational(-3, 5),
-                    mapOf(x to 1u, y to 1u) to Rational(11, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(3, 7),
-                    mapOf(y to 2u) to Rational(-3, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-18, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-9, 1),
-                ),
-                y to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-9, 2),
-                    mapOf(x to 1u) to Rational(2, 7),
-                    mapOf(x to 2u) to Rational(9, 1),
-                    mapOf(y to 1u) to Rational(13, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(-1, 8),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 8),
-                    mapOf(y to 2u) to Rational(19, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(15, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(-19, 4),
-                ),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(129, 4),
-                mapOf(x to 1u) to Rational(48583, 336),
-                mapOf(x to 2u) to Rational(-913477, 1568),
-                mapOf(x to 3u) to Rational(-967567, 672),
-                mapOf(x to 4u) to Rational(4722043, 1344),
-                mapOf(x to 5u) to Rational(8855, 2),
-                mapOf(x to 6u) to Rational(-311971, 32),
-                mapOf(x to 7u) to Rational(-17325, 4),
-                mapOf(x to 8u) to Rational(19845, 2),
-                mapOf(y to 1u) to Rational(-827, 4),
-                mapOf(x to 1u, y to 1u) to Rational(191927, 840),
-                mapOf(x to 2u, y to 1u) to Rational(9592627, 2352),
-                mapOf(x to 3u, y to 1u) to Rational(-105400711, 53760),
-                mapOf(x to 4u, y to 1u) to Rational(-10054101459, 439040),
-                mapOf(x to 5u, y to 1u) to Rational(2127351, 128),
-                mapOf(x to 6u, y to 1u) to Rational(116680973, 3136),
-                mapOf(x to 7u, y to 1u) to Rational(-220445, 7),
-                mapOf(x to 8u, y to 1u) to Rational(-2655, 4),
-                mapOf(y to 2u) to Rational(30567, 100),
-                mapOf(x to 1u, y to 2u) to Rational(-156284953, 39200),
-                mapOf(x to 2u, y to 2u) to Rational(-57661541711, 6585600),
-                mapOf(x to 3u, y to 2u) to Rational(131931579, 3136),
-                mapOf(x to 4u, y to 2u) to Rational(98818124791, 3512320),
-                mapOf(x to 5u, y to 2u) to Rational(-94458855053, 878080),
-                mapOf(x to 6u, y to 2u) to Rational(13937705305, 1229312),
-                mapOf(x to 7u, y to 2u) to Rational(335706887, 21952),
-                mapOf(x to 8u, y to 2u) to Rational(23549165, 1568),
-                mapOf(y to 3u) to Rational(111367, 1400),
-                mapOf(x to 1u, y to 3u) to Rational(4937369, 700),
-                mapOf(x to 2u, y to 3u) to Rational(-4449423711, 274400),
-                mapOf(x to 3u, y to 3u) to Rational(-351873325703, 4390400),
-                mapOf(x to 4u, y to 3u) to Rational(23495875029, 307328),
-                mapOf(x to 5u, y to 3u) to Rational(17576300919, 878080),
-                mapOf(x to 6u, y to 3u) to Rational(230316993, 12544),
-                mapOf(x to 7u, y to 3u) to Rational(-191130515, 21952),
-                mapOf(x to 8u, y to 3u) to Rational(332435, 392),
-                mapOf(y to 4u) to Rational(-275084, 1225),
-                mapOf(x to 1u, y to 4u) to Rational(-266774603, 137200),
-                mapOf(x to 2u, y to 4u) to Rational(2176279167121, 30732800),
-                mapOf(x to 3u, y to 4u) to Rational(10904913303, 2195200),
-                mapOf(x to 4u, y to 4u) to Rational(-10769286147, 2195200),
-                mapOf(x to 5u, y to 4u) to Rational(-26277119793, 439040),
-                mapOf(x to 6u, y to 4u) to Rational(25859735869, 6146560),
-                mapOf(x to 7u, y to 4u) to Rational(38906289, 2744),
-                mapOf(x to 8u, y to 4u) to Rational(-3072025, 392),
-                mapOf(y to 5u) to Rational(9573, 98),
-                mapOf(x to 1u, y to 5u) to Rational(-4154651399, 548800),
-                mapOf(x to 2u, y to 5u) to Rational(3446069019, 548800),
-                mapOf(x to 3u, y to 5u) to Rational(-7851500623, 137200),
-                mapOf(x to 4u, y to 5u) to Rational(-53205142903, 1920800),
-                mapOf(x to 5u, y to 5u) to Rational(-31953611, 3430),
-                mapOf(x to 6u, y to 5u) to Rational(1447380313, 109760),
-                mapOf(x to 7u, y to 5u) to Rational(764158625, 21952),
-                mapOf(x to 8u, y to 5u) to Rational(1153515, 784),
-                mapOf(y to 6u) to Rational(1722351, 7840),
-                mapOf(x to 1u, y to 6u) to Rational(-164554821, 109760),
-                mapOf(x to 2u, y to 6u) to Rational(-79096147243, 7683200),
-                mapOf(x to 3u, y to 6u) to Rational(-624721089, 15680),
-                mapOf(x to 4u, y to 6u) to Rational(11147305567, 548800),
-                mapOf(x to 5u, y to 6u) to Rational(8318333679, 109760),
-                mapOf(x to 6u, y to 6u) to Rational(32981871553, 1536640),
-                mapOf(x to 7u, y to 6u) to Rational(-225359619, 21952),
-                mapOf(x to 8u, y to 6u) to Rational(-3973995, 392),
-                mapOf(y to 7u) to Rational(67203, 784),
-                mapOf(x to 1u, y to 7u) to Rational(39281469, 54880),
-                mapOf(x to 2u, y to 7u) to Rational(70162551, 27440),
-                mapOf(x to 3u, y to 7u) to Rational(413630709, 54880),
-                mapOf(x to 4u, y to 7u) to Rational(4640410269, 192080),
-                mapOf(x to 5u, y to 7u) to Rational(802712247, 54880),
-                mapOf(x to 6u, y to 7u) to Rational(-473517603, 27440),
-                mapOf(x to 7u, y to 7u) to Rational(-17055459, 1568),
-                mapOf(x to 8u, y to 7u) to Rational(-12825, 14),
-                mapOf(y to 8u) to Rational(16245, 1568),
-                mapOf(x to 1u, y to 8u) to Rational(503253, 2744),
-                mapOf(x to 2u, y to 8u) to Rational(125292591, 96040),
-                mapOf(x to 3u, y to 8u) to Rational(12033171, 2744),
-                mapOf(x to 4u, y to 8u) to Rational(154352673, 27440),
-                mapOf(x to 5u, y to 8u) to Rational(-1302291, 392),
-                mapOf(x to 6u, y to 8u) to Rational(-20265741, 1960),
-                mapOf(x to 7u, y to 8u) to Rational(-26163, 56),
-                mapOf(x to 8u, y to 8u) to Rational(146205, 32),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                x to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(0, 6),
-                    mapOf(x to 1u) to Rational(14, 8),
-                    mapOf(x to 2u) to Rational(-14, 2),
-                    mapOf(y to 1u) to Rational(-3, 5),
-                    mapOf(x to 1u, y to 1u) to Rational(11, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(3, 7),
-                    mapOf(y to 2u) to Rational(-3, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-18, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-9, 1),
-                ),
-                y to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-9, 2),
-                    mapOf(x to 1u) to Rational(2, 7),
-                    mapOf(x to 2u) to Rational(9, 1),
-                    mapOf(y to 1u) to Rational(13, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(-1, 8),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 8),
-                    mapOf(y to 2u) to Rational(19, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(15, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(-19, 4),
-                ),
-                iota to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 3),
-                    mapOf(x to 1u) to Rational(5, 2),
-                    mapOf(x to 2u) to Rational(13, 7),
-                    mapOf(y to 1u) to Rational(16, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 1),
-                    mapOf(y to 2u) to Rational(-14, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-2, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            )),
-            "test 3'"
-        )
-        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = s, y = (-9/2 + 2/7 s + 9/1 s^2) + (13/1 + -1/8 s + 2/8 s^2) t + (19/4 + 15/7 s + -19/4 s^2) t^2
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(129, 4),
-                mapOf(x to 1u) to Rational(6817, 84),
-                mapOf(x to 2u) to Rational(-21445, 294),
-                mapOf(x to 3u) to Rational(-12151, 49),
-                mapOf(x to 4u) to Rational(-17789, 196),
-                mapOf(x to 5u) to Rational(1224, 7),
-                mapOf(x to 6u) to Rational(405, 2),
-                mapOf(y to 1u) to Rational(-156),
-                mapOf(x to 1u, y to 1u) to Rational(-2440, 7),
-                mapOf(x to 2u, y to 1u) to Rational(-1571, 112),
-                mapOf(x to 3u, y to 1u) to Rational(107515, 224),
-                mapOf(x to 4u, y to 1u) to Rational(64965, 112),
-                mapOf(x to 5u, y to 1u) to Rational(209, 56),
-                mapOf(x to 6u, y to 1u) to Rational(45, 4),
-                mapOf(y to 2u) to Rational(112),
-                mapOf(x to 1u, y to 2u) to Rational(1449, 8),
-                mapOf(x to 2u, y to 2u) to Rational(1306309, 3136),
-                mapOf(x to 3u, y to 2u) to Rational(483207, 1568),
-                mapOf(x to 4u, y to 2u) to Rational(1978437, 6272),
-                mapOf(x to 5u, y to 2u) to Rational(-18231, 224),
-                mapOf(x to 6u, y to 2u) to Rational(-6835, 32),
-                mapOf(y to 3u) to Rational(247, 2),
-                mapOf(x to 1u, y to 3u) to Rational(33771, 112),
-                mapOf(x to 2u, y to 3u) to Rational(2073, 7),
-                mapOf(x to 3u, y to 3u) to Rational(-23463, 224),
-                mapOf(x to 4u, y to 3u) to Rational(-33825, 112),
-                mapOf(x to 5u, y to 3u) to Rational(201, 224),
-                mapOf(x to 6u, y to 3u) to Rational(-95, 16),
-                mapOf(y to 4u) to Rational(361, 16),
-                mapOf(x to 1u, y to 4u) to Rational(3667, 56),
-                mapOf(x to 2u, y to 4u) to Rational(88729, 1568),
-                mapOf(x to 3u, y to 4u) to Rational(-2476, 49),
-                mapOf(x to 4u, y to 4u) to Rational(-23419, 196),
-                mapOf(x to 5u, y to 4u) to Rational(-323, 56),
-                mapOf(x to 6u, y to 4u) to Rational(1805, 32),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                y to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-9, 2),
-                    mapOf(x to 1u) to Rational(2, 7),
-                    mapOf(x to 2u) to Rational(9, 1),
-                    mapOf(y to 1u) to Rational(13, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(-1, 8),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 8),
-                    mapOf(y to 2u) to Rational(19, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(15, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(-19, 4),
-                ),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(129, 4),
-                mapOf(x to 1u) to Rational(6817, 84),
-                mapOf(x to 2u) to Rational(-21445, 294),
-                mapOf(x to 3u) to Rational(-12151, 49),
-                mapOf(x to 4u) to Rational(-17789, 196),
-                mapOf(x to 5u) to Rational(1224, 7),
-                mapOf(x to 6u) to Rational(405, 2),
-                mapOf(y to 1u) to Rational(-156),
-                mapOf(x to 1u, y to 1u) to Rational(-2440, 7),
-                mapOf(x to 2u, y to 1u) to Rational(-1571, 112),
-                mapOf(x to 3u, y to 1u) to Rational(107515, 224),
-                mapOf(x to 4u, y to 1u) to Rational(64965, 112),
-                mapOf(x to 5u, y to 1u) to Rational(209, 56),
-                mapOf(x to 6u, y to 1u) to Rational(45, 4),
-                mapOf(y to 2u) to Rational(112),
-                mapOf(x to 1u, y to 2u) to Rational(1449, 8),
-                mapOf(x to 2u, y to 2u) to Rational(1306309, 3136),
-                mapOf(x to 3u, y to 2u) to Rational(483207, 1568),
-                mapOf(x to 4u, y to 2u) to Rational(1978437, 6272),
-                mapOf(x to 5u, y to 2u) to Rational(-18231, 224),
-                mapOf(x to 6u, y to 2u) to Rational(-6835, 32),
-                mapOf(y to 3u) to Rational(247, 2),
-                mapOf(x to 1u, y to 3u) to Rational(33771, 112),
-                mapOf(x to 2u, y to 3u) to Rational(2073, 7),
-                mapOf(x to 3u, y to 3u) to Rational(-23463, 224),
-                mapOf(x to 4u, y to 3u) to Rational(-33825, 112),
-                mapOf(x to 5u, y to 3u) to Rational(201, 224),
-                mapOf(x to 6u, y to 3u) to Rational(-95, 16),
-                mapOf(y to 4u) to Rational(361, 16),
-                mapOf(x to 1u, y to 4u) to Rational(3667, 56),
-                mapOf(x to 2u, y to 4u) to Rational(88729, 1568),
-                mapOf(x to 3u, y to 4u) to Rational(-2476, 49),
-                mapOf(x to 4u, y to 4u) to Rational(-23419, 196),
-                mapOf(x to 5u, y to 4u) to Rational(-323, 56),
-                mapOf(x to 6u, y to 4u) to Rational(1805, 32),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                y to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-9, 2),
-                    mapOf(x to 1u) to Rational(2, 7),
-                    mapOf(x to 2u) to Rational(9, 1),
-                    mapOf(y to 1u) to Rational(13, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(-1, 8),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 8),
-                    mapOf(y to 2u) to Rational(19, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(15, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(-19, 4),
-                ),
-                iota to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 3),
-                    mapOf(x to 1u) to Rational(5, 2),
-                    mapOf(x to 2u) to Rational(13, 7),
-                    mapOf(y to 1u) to Rational(16, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 1),
-                    mapOf(y to 2u) to Rational(-14, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-2, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            )),
-            "test 4'"
-        )
-        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = (0/6 + 14/8 s + -14/2 s^2) + (-3/5 + 11/1 s + 3/7 s^2) t + (-3/7 + -18/5 s + -9/1 s^2) t^2, y = t
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(7, 3),
-                mapOf(x to 2u) to Rational(-35, 16),
-                mapOf(x to 3u) to Rational(-343, 6),
-                mapOf(x to 4u) to Rational(343, 3),
-                mapOf(y to 1u) to Rational(-19, 5),
-                mapOf(x to 1u, y to 1u) to Rational(-823, 120),
-                mapOf(x to 2u, y to 1u) to Rational(1232417, 6720),
-                mapOf(x to 3u, y to 1u) to Rational(-9863, 24),
-                mapOf(x to 4u, y to 1u) to Rational(385, 4),
-                mapOf(y to 2u) to Rational(2439, 350),
-                mapOf(x to 1u, y to 2u) to Rational(-5793, 40),
-                mapOf(x to 2u, y to 2u) to Rational(1172113, 3360),
-                mapOf(x to 3u, y to 2u) to Rational(-13531, 40),
-                mapOf(x to 4u, y to 2u) to Rational(2824, 7),
-                mapOf(y to 3u) to Rational(3417, 700),
-                mapOf(x to 1u, y to 3u) to Rational(1191, 200),
-                mapOf(x to 2u, y to 3u) to Rational(8383, 28),
-                mapOf(x to 3u, y to 3u) to Rational(-220279, 280),
-                mapOf(x to 4u, y to 3u) to Rational(49179, 196),
-                mapOf(y to 4u) to Rational(57, 35),
-                mapOf(x to 1u, y to 4u) to Rational(-33771, 700),
-                mapOf(x to 2u, y to 4u) to Rational(196279, 1225),
-                mapOf(x to 3u, y to 4u) to Rational(-32259, 140),
-                mapOf(x to 4u, y to 4u) to Rational(23868, 49),
-                mapOf(y to 5u) to Rational(333, 196),
-                mapOf(x to 1u, y to 5u) to Rational(-204, 35),
-                mapOf(x to 2u, y to 5u) to Rational(-307233, 2450),
-                mapOf(x to 3u, y to 5u) to Rational(-12492, 35),
-                mapOf(x to 4u, y to 5u) to Rational(4563, 28),
-                mapOf(y to 6u) to Rational(45, 98),
-                mapOf(x to 1u, y to 6u) to Rational(54, 7),
-                mapOf(x to 2u, y to 6u) to Rational(1809, 35),
-                mapOf(x to 3u, y to 6u) to Rational(162),
-                mapOf(x to 4u, y to 6u) to Rational(405, 2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                x to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(0, 6),
-                    mapOf(x to 1u) to Rational(14, 8),
-                    mapOf(x to 2u) to Rational(-14, 2),
-                    mapOf(y to 1u) to Rational(-3, 5),
-                    mapOf(x to 1u, y to 1u) to Rational(11, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(3, 7),
-                    mapOf(y to 2u) to Rational(-3, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-18, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-9, 1),
-                ),
-            )),
-            "test 5"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(7, 3),
-                mapOf(x to 2u) to Rational(-35, 16),
-                mapOf(x to 3u) to Rational(-343, 6),
-                mapOf(x to 4u) to Rational(343, 3),
-                mapOf(y to 1u) to Rational(-19, 5),
-                mapOf(x to 1u, y to 1u) to Rational(-823, 120),
-                mapOf(x to 2u, y to 1u) to Rational(1232417, 6720),
-                mapOf(x to 3u, y to 1u) to Rational(-9863, 24),
-                mapOf(x to 4u, y to 1u) to Rational(385, 4),
-                mapOf(y to 2u) to Rational(2439, 350),
-                mapOf(x to 1u, y to 2u) to Rational(-5793, 40),
-                mapOf(x to 2u, y to 2u) to Rational(1172113, 3360),
-                mapOf(x to 3u, y to 2u) to Rational(-13531, 40),
-                mapOf(x to 4u, y to 2u) to Rational(2824, 7),
-                mapOf(y to 3u) to Rational(3417, 700),
-                mapOf(x to 1u, y to 3u) to Rational(1191, 200),
-                mapOf(x to 2u, y to 3u) to Rational(8383, 28),
-                mapOf(x to 3u, y to 3u) to Rational(-220279, 280),
-                mapOf(x to 4u, y to 3u) to Rational(49179, 196),
-                mapOf(y to 4u) to Rational(57, 35),
-                mapOf(x to 1u, y to 4u) to Rational(-33771, 700),
-                mapOf(x to 2u, y to 4u) to Rational(196279, 1225),
-                mapOf(x to 3u, y to 4u) to Rational(-32259, 140),
-                mapOf(x to 4u, y to 4u) to Rational(23868, 49),
-                mapOf(y to 5u) to Rational(333, 196),
-                mapOf(x to 1u, y to 5u) to Rational(-204, 35),
-                mapOf(x to 2u, y to 5u) to Rational(-307233, 2450),
-                mapOf(x to 3u, y to 5u) to Rational(-12492, 35),
-                mapOf(x to 4u, y to 5u) to Rational(4563, 28),
-                mapOf(y to 6u) to Rational(45, 98),
-                mapOf(x to 1u, y to 6u) to Rational(54, 7),
-                mapOf(x to 2u, y to 6u) to Rational(1809, 35),
-                mapOf(x to 3u, y to 6u) to Rational(162),
-                mapOf(x to 4u, y to 6u) to Rational(405, 2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                x to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(0, 6),
-                    mapOf(x to 1u) to Rational(14, 8),
-                    mapOf(x to 2u) to Rational(-14, 2),
-                    mapOf(y to 1u) to Rational(-3, 5),
-                    mapOf(x to 1u, y to 1u) to Rational(11, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(3, 7),
-                    mapOf(y to 2u) to Rational(-3, 7),
-                    mapOf(x to 1u, y to 2u) to Rational(-18, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-9, 1),
-                ),
-                iota to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 3),
-                    mapOf(x to 1u) to Rational(5, 2),
-                    mapOf(x to 2u) to Rational(13, 7),
-                    mapOf(y to 1u) to Rational(16, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 1),
-                    mapOf(y to 2u) to Rational(-14, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-2, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            )),
-            "test 5'"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf<Symbol, LabeledPolynomial<Rational>>()),
-            "test 6"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-3, 2),
-                mapOf(x to 1u) to Rational(8, 6),
-                mapOf(x to 2u) to Rational(14, 6),
-                mapOf(y to 1u) to Rational(-3, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-19, 2),
-                mapOf(x to 2u, y to 1u) to Rational(9, 4),
-                mapOf(y to 2u) to Rational(5, 5),
-                mapOf(x to 1u, y to 2u) to Rational(18, 9),
-                mapOf(x to 2u, y to 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                iota to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 3),
-                    mapOf(x to 1u) to Rational(5, 2),
-                    mapOf(x to 2u) to Rational(13, 7),
-                    mapOf(y to 1u) to Rational(16, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(6, 1),
-                    mapOf(y to 2u) to Rational(-14, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-2, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            )),
-            "test 6'"
-        )
-    }
-    @Test
-    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
-            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
-    fun test_Polynomial_substitute_RationalFunction_Map() {
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(0)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1)
-                )
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1)
-            ).substitute(RationalField, mapOf(
-                x to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(1)
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(1)
-                    )
-                )
-            )),
-            "test 1"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 4u) to Rational(-194071, 4900),
-                    mapOf(x to 3u, y to 1u) to Rational(394811, 225),
-                    mapOf(x to 2u, y to 2u) to Rational(-444183161, 66150),
-                    mapOf(x to 1u, y to 3u) to Rational(70537618, 59535),
-                    mapOf(y to 4u) to Rational(9655504, 2835),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf(x to 4u) to Rational(9, 1),
-                    mapOf(x to 3u, y to 1u) to Rational(61, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(2137, 36),
-                    mapOf(x to 1u, y to 3u) to Rational(-1342, 9),
-                    mapOf(y to 4u) to Rational(484, 9),
-                )
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(15, 7),
-                mapOf(x to 1u) to Rational(1, 5),
-                mapOf(x to 2u) to Rational(-7, 4),
-                mapOf(y to 1u) to Rational(-1, 9),
-                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
-                mapOf(x to 2u, y to 1u) to Rational(17, 3),
-                mapOf(y to 2u) to Rational(2, 6),
-                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                x to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf(x to 1u) to Rational(17, 7),
-                        mapOf(y to 1u) to Rational(-13, 1),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf(x to 1u) to Rational(-18, 6),
-                        mapOf(y to 1u) to Rational(11, 6),
-                    )
-                ),
-                y to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf(x to 1u) to Rational(18, 5),
-                        mapOf(y to 1u) to Rational(-16, 3),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf(x to 1u) to Rational(-1, 1),
-                        mapOf(y to 1u) to Rational(-4, 1),
-                    )
-                ),
-            )),
-            "test 2"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-6443599, 10000),
-                    mapOf(x to 1u) to Rational(166251223, 210000),
-                    mapOf(x to 2u) to Rational(-4606805099, 3528000),
-                    mapOf(x to 3u) to Rational(51204379, 19600),
-                    mapOf(x to 4u) to Rational(-529045460659, 277830000),
-                    mapOf(x to 5u) to Rational(2630836709, 1488375),
-                    mapOf(x to 6u) to Rational(-42675691369, 25004700),
-                    mapOf(x to 7u) to Rational(495825223, 1250235),
-                    mapOf(x to 8u) to Rational(-22531756, 1750329),
-                    mapOf(y to 1u) to Rational(-2526552797, 420000),
-                    mapOf(x to 1u, y to 1u) to Rational(31108840471, 2520000),
-                    mapOf(x to 2u, y to 1u) to Rational(-4789740847, 1102500),
-                    mapOf(x to 3u, y to 1u) to Rational(186594307807, 11340000),
-                    mapOf(x to 4u, y to 1u) to Rational(-11677815943, 1488375),
-                    mapOf(x to 5u, y to 1u) to Rational(-181118486447, 27783000),
-                    mapOf(x to 6u, y to 1u) to Rational(-16123292162, 14586075),
-                    mapOf(x to 7u, y to 1u) to Rational(-140339343808, 26254935),
-                    mapOf(x to 8u, y to 1u) to Rational(4570171616, 5250987),
-                    mapOf(y to 2u) to Rational(-181436530573, 10080000),
-                    mapOf(x to 1u, y to 2u) to Rational(6700437957491, 105840000),
-                    mapOf(x to 2u, y to 2u) to Rational(-3527267461, 1417500),
-                    mapOf(x to 3u, y to 2u) to Rational(-38084563451, 5556600),
-                    mapOf(x to 4u, y to 2u) to Rational(-565662040631, 13891500),
-                    mapOf(x to 5u, y to 2u) to Rational(-35479071126397, 583443000),
-                    mapOf(x to 6u, y to 2u) to Rational(-11717559078469, 525098700),
-                    mapOf(x to 7u, y to 2u) to Rational(-2043385293517, 225042300),
-                    mapOf(x to 8u, y to 2u) to Rational(-3644439630451, 551353635),
-                    mapOf(y to 3u) to Rational(-1760423269, 126000),
-                    mapOf(x to 1u, y to 3u) to Rational(310176758299, 2352000),
-                    mapOf(x to 2u, y to 3u) to Rational(-907229584837, 21168000),
-                    mapOf(x to 3u, y to 3u) to Rational(-16717135885963, 95256000),
-                    mapOf(x to 4u, y to 3u) to Rational(-43762928025353, 333396000),
-                    mapOf(x to 5u, y to 3u) to Rational(-328427480571607, 3000564000),
-                    mapOf(x to 6u, y to 3u) to Rational(-7722675917197, 210039480),
-                    mapOf(x to 7u, y to 3u) to Rational(1713350137019, 1225230300),
-                    mapOf(x to 8u, y to 3u) to Rational(156695935643, 31505922),
-                    mapOf(y to 4u) to Rational(18362364269, 1008000),
-                    mapOf(x to 1u, y to 4u) to Rational(955674858553, 10584000),
-                    mapOf(x to 2u, y to 4u) to Rational(-71937470607371, 444528000),
-                    mapOf(x to 3u, y to 4u) to Rational(-34097985615163, 95256000),
-                    mapOf(x to 4u, y to 4u) to Rational(-340736178775883, 2000376000),
-                    mapOf(x to 5u, y to 4u) to Rational(-511324523441897, 10501974000),
-                    mapOf(x to 6u, y to 4u) to Rational(-125375649409151, 8821658160),
-                    mapOf(x to 7u, y to 4u) to Rational(-2813518533421, 1575296100),
-                    mapOf(x to 8u, y to 4u) to Rational(-17044089109, 5250987),
-                    mapOf(y to 5u) to Rational(600086461, 20160),
-                    mapOf(x to 1u, y to 5u) to Rational(-18959931367, 423360),
-                    mapOf(x to 2u, y to 5u) to Rational(-9178804929607, 44452800),
-                    mapOf(x to 3u, y to 5u) to Rational(-1460114275979, 5334336),
-                    mapOf(x to 4u, y to 5u) to Rational(-342533479090169, 4200789600),
-                    mapOf(x to 5u, y to 5u) to Rational(20335453022963, 4200789600),
-                    mapOf(x to 6u, y to 5u) to Rational(-21649775090197, 6301184400),
-                    mapOf(x to 7u, y to 5u) to Rational(-197301716069, 131274675),
-                    mapOf(x to 8u, y to 5u) to Rational(18711357470, 15752961),
-                    mapOf(y to 6u) to Rational(621417991, 100800),
-                    mapOf(x to 1u, y to 6u) to Rational(-159236792977, 2116800),
-                    mapOf(x to 2u, y to 6u) to Rational(-6602528890883, 66679200),
-                    mapOf(x to 3u, y to 6u) to Rational(-1086091664047, 19051200),
-                    mapOf(x to 4u, y to 6u) to Rational(3769375009003, 1680315840),
-                    mapOf(x to 5u, y to 6u) to Rational(-12920385574769, 1050197400),
-                    mapOf(x to 6u, y to 6u) to Rational(-90219591809287, 6301184400),
-                    mapOf(x to 7u, y to 6u) to Rational(656361553391, 1575296100),
-                    mapOf(x to 8u, y to 6u) to Rational(757900793, 2250423),
-                    mapOf(y to 7u) to Rational(-100770017, 15120),
-                    mapOf(x to 1u, y to 7u) to Rational(-316364851, 17640),
-                    mapOf(x to 2u, y to 7u) to Rational(-85118560057, 6667920),
-                    mapOf(x to 3u, y to 7u) to Rational(6286563719, 416745),
-                    mapOf(x to 4u, y to 7u) to Rational(26803885301, 1714608),
-                    mapOf(x to 5u, y to 7u) to Rational(-13767154393, 4286520),
-                    mapOf(x to 6u, y to 7u) to Rational(-3875138933, 1224720),
-                    mapOf(x to 7u, y to 7u) to Rational(65193755, 333396),
-                    mapOf(x to 8u, y to 7u) to Rational(90974351, 2500470),
-                    mapOf(y to 8u) to Rational(-3182197, 1260),
-                    mapOf(x to 1u, y to 8u) to Rational(24899923, 8820),
-                    mapOf(x to 2u, y to 8u) to Rational(-19999556, 19845),
-                    mapOf(x to 3u, y to 8u) to Rational(3276587, 3969),
-                    mapOf(x to 4u, y to 8u) to Rational(13719549239, 5000940),
-                    mapOf(x to 5u, y to 8u) to Rational(-961839938, 1250235),
-                    mapOf(x to 6u, y to 8u) to Rational(-198184871, 833490),
-                    mapOf(x to 7u, y to 8u) to Rational(230659711, 5000940),
-                    mapOf(x to 8u, y to 8u) to Rational(292447, 35721)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(9, 100),
-                    mapOf(x to 1u) to Rational(-21, 50),
-                    mapOf(x to 2u) to Rational(293, 700),
-                    mapOf(x to 3u) to Rational(29, 210),
-                    mapOf(x to 4u) to Rational(3233, 8820),
-                    mapOf(x to 5u) to Rational(-289, 441),
-                    mapOf(x to 6u) to Rational(-1, 9),
-                    mapOf(x to 7u) to Rational(-20, 441),
-                    mapOf(x to 8u) to Rational(100, 441),
-                    mapOf(y to 1u) to Rational(-57, 80),
-                    mapOf(x to 1u, y to 1u) to Rational(-121, 400),
-                    mapOf(x to 2u, y to 1u) to Rational(37117, 8400),
-                    mapOf(x to 3u, y to 1u) to Rational(-4853, 3150),
-                    mapOf(x to 4u, y to 1u) to Rational(1166203, 132300),
-                    mapOf(x to 5u, y to 1u) to Rational(-2708, 567),
-                    mapOf(x to 6u, y to 1u) to Rational(-287159, 416745),
-                    mapOf(x to 7u, y to 1u) to Rational(-478204, 83349),
-                    mapOf(x to 8u, y to 1u) to Rational(176320, 83349),
-                    mapOf(y to 2u) to Rational(-6239, 6400),
-                    mapOf(x to 1u, y to 2u) to Rational(264211, 11200),
-                    mapOf(x to 2u, y to 2u) to Rational(-1591999, 100800),
-                    mapOf(x to 3u, y to 2u) to Rational(12450091, 529200),
-                    mapOf(x to 4u, y to 2u) to Rational(9230759, 226800),
-                    mapOf(x to 5u, y to 2u) to Rational(18995554, 2083725),
-                    mapOf(x to 6u, y to 2u) to Rational(136706258, 6251175),
-                    mapOf(x to 7u, y to 2u) to Rational(-120907496, 3750705),
-                    mapOf(x to 8u, y to 2u) to Rational(117200176, 15752961),
-                    mapOf(y to 3u) to Rational(5653, 320),
-                    mapOf(x to 1u, y to 3u) to Rational(-130853, 8400),
-                    mapOf(x to 2u, y to 3u) to Rational(-20939327, 151200),
-                    mapOf(x to 3u, y to 3u) to Rational(2566691, 25200),
-                    mapOf(x to 4u, y to 3u) to Rational(-68441519, 476280),
-                    mapOf(x to 5u, y to 3u) to Rational(2462904247, 12502350),
-                    mapOf(x to 6u, y to 3u) to Rational(353667161, 18753525),
-                    mapOf(x to 7u, y to 3u) to Rational(-1689134372, 26254935),
-                    mapOf(x to 8u, y to 3u) to Rational(35084104, 2250423),
-                    mapOf(y to 4u) to Rational(-3587, 300),
-                    mapOf(x to 1u, y to 4u) to Rational(-10513243, 33600),
-                    mapOf(x to 2u, y to 4u) to Rational(30766733, 176400),
-                    mapOf(x to 3u, y to 4u) to Rational(-65680021, 198450),
-                    mapOf(x to 4u, y to 4u) to Rational(-8108910547, 20003760),
-                    mapOf(x to 5u, y to 4u) to Rational(2922125159, 6251175),
-                    mapOf(x to 6u, y to 4u) to Rational(-4245279943, 131274675),
-                    mapOf(x to 7u, y to 4u) to Rational(-371946872, 3750705),
-                    mapOf(x to 8u, y to 4u) to Rational(61286752, 2250423),
-                    mapOf(y to 5u) to Rational(-20477, 160),
-                    mapOf(x to 1u, y to 5u) to Rational(215741, 1120),
-                    mapOf(x to 2u, y to 5u) to Rational(30785843, 31752),
-                    mapOf(x to 3u, y to 5u) to Rational(-357495959, 317520),
-                    mapOf(x to 4u, y to 5u) to Rational(-1611242993, 10001880),
-                    mapOf(x to 5u, y to 5u) to Rational(345925495, 500094),
-                    mapOf(x to 6u, y to 5u) to Rational(-755948411, 3750705),
-                    mapOf(x to 7u, y to 5u) to Rational(-108643496, 1250235),
-                    mapOf(x to 8u, y to 5u) to Rational(1122512, 35721),
-                    mapOf(y to 6u) to Rational(358037, 2880),
-                    mapOf(x to 1u, y to 6u) to Rational(3895837, 3360),
-                    mapOf(x to 2u, y to 6u) to Rational(359419201, 1270080),
-                    mapOf(x to 3u, y to 6u) to Rational(-158522587, 105840),
-                    mapOf(x to 4u, y to 6u) to Rational(10909002599, 20003760),
-                    mapOf(x to 5u, y to 6u) to Rational(76846972, 138915),
-                    mapOf(x to 6u, y to 6u) to Rational(-327696553, 1250235),
-                    mapOf(x to 7u, y to 6u) to Rational(-1687328, 35721),
-                    mapOf(x to 8u, y to 6u) to Rational(1016836, 35721),
-                    mapOf(y to 7u) to Rational(658, 3),
-                    mapOf(x to 1u, y to 7u) to Rational(48035, 168),
-                    mapOf(x to 2u, y to 7u) to Rational(-5777875, 5292),
-                    mapOf(x to 3u, y to 7u) to Rational(-7893899, 10584),
-                    mapOf(x to 4u, y to 7u) to Rational(10191652, 11907),
-                    mapOf(x to 5u, y to 7u) to Rational(2920121, 23814),
-                    mapOf(x to 6u, y to 7u) to Rational(-2699780, 11907),
-                    mapOf(x to 7u, y to 7u) to Rational(4556, 441),
-                    mapOf(x to 8u, y to 7u) to Rational(3440, 189),
-                    mapOf(y to 8u) to Rational(64, 1),
-                    mapOf(x to 1u, y to 8u) to Rational(-808, 7),
-                    mapOf(x to 2u, y to 8u) to Rational(-360895, 1764),
-                    mapOf(x to 3u, y to 8u) to Rational(257657, 882),
-                    mapOf(x to 4u, y to 8u) to Rational(3779917, 15876),
-                    mapOf(x to 5u, y to 8u) to Rational(-610279, 3969),
-                    mapOf(x to 6u, y to 8u) to Rational(-25091, 441),
-                    mapOf(x to 7u, y to 8u) to Rational(9560, 567),
-                    mapOf(x to 8u, y to 8u) to Rational(400, 81)
-                )
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(15, 7),
-                mapOf(x to 1u) to Rational(1, 5),
-                mapOf(x to 2u) to Rational(-7, 4),
-                mapOf(y to 1u) to Rational(-1, 9),
-                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
-                mapOf(x to 2u, y to 1u) to Rational(17, 3),
-                mapOf(y to 2u) to Rational(2, 6),
-                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                x to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(17, 5),
-                        mapOf(x to 1u) to Rational(11, 6),
-                        mapOf(x to 2u) to Rational(14, 3),
-                        mapOf(y to 1u) to Rational(17, 1),
-                        mapOf(x to 1u, y to 1u) to Rational(12, 3),
-                        mapOf(x to 2u, y to 1u) to Rational(-6, 2),
-                        mapOf(y to 2u) to Rational(17, 1),
-                        mapOf(x to 1u, y to 2u) to Rational(-4, 3),
-                        mapOf(x to 2u, y to 2u) to Rational(2, 6),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(3, 5),
-                        mapOf(x to 1u) to Rational(3, 5),
-                        mapOf(x to 2u) to Rational(3, 7),
-                        mapOf(y to 1u) to Rational(-3, 8),
-                        mapOf(x to 1u, y to 1u) to Rational(-1, 1),
-                        mapOf(x to 2u, y to 1u) to Rational(17, 9),
-                        mapOf(y to 2u) to Rational(-8, 1),
-                        mapOf(x to 1u, y to 2u) to Rational(6, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(10, 9),
-                    )
-                ),
-                y to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(18, 5),
-                        mapOf(x to 1u) to Rational(-17, 5),
-                        mapOf(x to 2u) to Rational(-2, 7),
-                        mapOf(y to 1u) to Rational(6, 5),
-                        mapOf(x to 1u, y to 1u) to Rational(-5, 1),
-                        mapOf(x to 2u, y to 1u) to Rational(-9, 1),
-                        mapOf(y to 2u) to Rational(-8, 8),
-                        mapOf(x to 1u, y to 2u) to Rational(2, 7),
-                        mapOf(x to 2u, y to 2u) to Rational(-13, 7),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-4, 8),
-                        mapOf(x to 1u) to Rational(15, 9),
-                        mapOf(x to 2u) to Rational(-10, 9),
-                        mapOf(y to 1u) to Rational(5, 3),
-                        mapOf(x to 1u, y to 1u) to Rational(4, 1),
-                        mapOf(x to 2u, y to 1u) to Rational(-2, 7),
-                        mapOf(y to 2u) to Rational(2, 2),
-                        mapOf(x to 1u, y to 2u) to Rational(-5, 7),
-                        mapOf(x to 2u, y to 2u) to Rational(-18, 9),
-                    )
-                ),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-6443599, 10000),
-                    mapOf(x to 1u) to Rational(166251223, 210000),
-                    mapOf(x to 2u) to Rational(-4606805099, 3528000),
-                    mapOf(x to 3u) to Rational(51204379, 19600),
-                    mapOf(x to 4u) to Rational(-529045460659, 277830000),
-                    mapOf(x to 5u) to Rational(2630836709, 1488375),
-                    mapOf(x to 6u) to Rational(-42675691369, 25004700),
-                    mapOf(x to 7u) to Rational(495825223, 1250235),
-                    mapOf(x to 8u) to Rational(-22531756, 1750329),
-                    mapOf(y to 1u) to Rational(-2526552797, 420000),
-                    mapOf(x to 1u, y to 1u) to Rational(31108840471, 2520000),
-                    mapOf(x to 2u, y to 1u) to Rational(-4789740847, 1102500),
-                    mapOf(x to 3u, y to 1u) to Rational(186594307807, 11340000),
-                    mapOf(x to 4u, y to 1u) to Rational(-11677815943, 1488375),
-                    mapOf(x to 5u, y to 1u) to Rational(-181118486447, 27783000),
-                    mapOf(x to 6u, y to 1u) to Rational(-16123292162, 14586075),
-                    mapOf(x to 7u, y to 1u) to Rational(-140339343808, 26254935),
-                    mapOf(x to 8u, y to 1u) to Rational(4570171616, 5250987),
-                    mapOf(y to 2u) to Rational(-181436530573, 10080000),
-                    mapOf(x to 1u, y to 2u) to Rational(6700437957491, 105840000),
-                    mapOf(x to 2u, y to 2u) to Rational(-3527267461, 1417500),
-                    mapOf(x to 3u, y to 2u) to Rational(-38084563451, 5556600),
-                    mapOf(x to 4u, y to 2u) to Rational(-565662040631, 13891500),
-                    mapOf(x to 5u, y to 2u) to Rational(-35479071126397, 583443000),
-                    mapOf(x to 6u, y to 2u) to Rational(-11717559078469, 525098700),
-                    mapOf(x to 7u, y to 2u) to Rational(-2043385293517, 225042300),
-                    mapOf(x to 8u, y to 2u) to Rational(-3644439630451, 551353635),
-                    mapOf(y to 3u) to Rational(-1760423269, 126000),
-                    mapOf(x to 1u, y to 3u) to Rational(310176758299, 2352000),
-                    mapOf(x to 2u, y to 3u) to Rational(-907229584837, 21168000),
-                    mapOf(x to 3u, y to 3u) to Rational(-16717135885963, 95256000),
-                    mapOf(x to 4u, y to 3u) to Rational(-43762928025353, 333396000),
-                    mapOf(x to 5u, y to 3u) to Rational(-328427480571607, 3000564000),
-                    mapOf(x to 6u, y to 3u) to Rational(-7722675917197, 210039480),
-                    mapOf(x to 7u, y to 3u) to Rational(1713350137019, 1225230300),
-                    mapOf(x to 8u, y to 3u) to Rational(156695935643, 31505922),
-                    mapOf(y to 4u) to Rational(18362364269, 1008000),
-                    mapOf(x to 1u, y to 4u) to Rational(955674858553, 10584000),
-                    mapOf(x to 2u, y to 4u) to Rational(-71937470607371, 444528000),
-                    mapOf(x to 3u, y to 4u) to Rational(-34097985615163, 95256000),
-                    mapOf(x to 4u, y to 4u) to Rational(-340736178775883, 2000376000),
-                    mapOf(x to 5u, y to 4u) to Rational(-511324523441897, 10501974000),
-                    mapOf(x to 6u, y to 4u) to Rational(-125375649409151, 8821658160),
-                    mapOf(x to 7u, y to 4u) to Rational(-2813518533421, 1575296100),
-                    mapOf(x to 8u, y to 4u) to Rational(-17044089109, 5250987),
-                    mapOf(y to 5u) to Rational(600086461, 20160),
-                    mapOf(x to 1u, y to 5u) to Rational(-18959931367, 423360),
-                    mapOf(x to 2u, y to 5u) to Rational(-9178804929607, 44452800),
-                    mapOf(x to 3u, y to 5u) to Rational(-1460114275979, 5334336),
-                    mapOf(x to 4u, y to 5u) to Rational(-342533479090169, 4200789600),
-                    mapOf(x to 5u, y to 5u) to Rational(20335453022963, 4200789600),
-                    mapOf(x to 6u, y to 5u) to Rational(-21649775090197, 6301184400),
-                    mapOf(x to 7u, y to 5u) to Rational(-197301716069, 131274675),
-                    mapOf(x to 8u, y to 5u) to Rational(18711357470, 15752961),
-                    mapOf(y to 6u) to Rational(621417991, 100800),
-                    mapOf(x to 1u, y to 6u) to Rational(-159236792977, 2116800),
-                    mapOf(x to 2u, y to 6u) to Rational(-6602528890883, 66679200),
-                    mapOf(x to 3u, y to 6u) to Rational(-1086091664047, 19051200),
-                    mapOf(x to 4u, y to 6u) to Rational(3769375009003, 1680315840),
-                    mapOf(x to 5u, y to 6u) to Rational(-12920385574769, 1050197400),
-                    mapOf(x to 6u, y to 6u) to Rational(-90219591809287, 6301184400),
-                    mapOf(x to 7u, y to 6u) to Rational(656361553391, 1575296100),
-                    mapOf(x to 8u, y to 6u) to Rational(757900793, 2250423),
-                    mapOf(y to 7u) to Rational(-100770017, 15120),
-                    mapOf(x to 1u, y to 7u) to Rational(-316364851, 17640),
-                    mapOf(x to 2u, y to 7u) to Rational(-85118560057, 6667920),
-                    mapOf(x to 3u, y to 7u) to Rational(6286563719, 416745),
-                    mapOf(x to 4u, y to 7u) to Rational(26803885301, 1714608),
-                    mapOf(x to 5u, y to 7u) to Rational(-13767154393, 4286520),
-                    mapOf(x to 6u, y to 7u) to Rational(-3875138933, 1224720),
-                    mapOf(x to 7u, y to 7u) to Rational(65193755, 333396),
-                    mapOf(x to 8u, y to 7u) to Rational(90974351, 2500470),
-                    mapOf(y to 8u) to Rational(-3182197, 1260),
-                    mapOf(x to 1u, y to 8u) to Rational(24899923, 8820),
-                    mapOf(x to 2u, y to 8u) to Rational(-19999556, 19845),
-                    mapOf(x to 3u, y to 8u) to Rational(3276587, 3969),
-                    mapOf(x to 4u, y to 8u) to Rational(13719549239, 5000940),
-                    mapOf(x to 5u, y to 8u) to Rational(-961839938, 1250235),
-                    mapOf(x to 6u, y to 8u) to Rational(-198184871, 833490),
-                    mapOf(x to 7u, y to 8u) to Rational(230659711, 5000940),
-                    mapOf(x to 8u, y to 8u) to Rational(292447, 35721)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(9, 100),
-                    mapOf(x to 1u) to Rational(-21, 50),
-                    mapOf(x to 2u) to Rational(293, 700),
-                    mapOf(x to 3u) to Rational(29, 210),
-                    mapOf(x to 4u) to Rational(3233, 8820),
-                    mapOf(x to 5u) to Rational(-289, 441),
-                    mapOf(x to 6u) to Rational(-1, 9),
-                    mapOf(x to 7u) to Rational(-20, 441),
-                    mapOf(x to 8u) to Rational(100, 441),
-                    mapOf(y to 1u) to Rational(-57, 80),
-                    mapOf(x to 1u, y to 1u) to Rational(-121, 400),
-                    mapOf(x to 2u, y to 1u) to Rational(37117, 8400),
-                    mapOf(x to 3u, y to 1u) to Rational(-4853, 3150),
-                    mapOf(x to 4u, y to 1u) to Rational(1166203, 132300),
-                    mapOf(x to 5u, y to 1u) to Rational(-2708, 567),
-                    mapOf(x to 6u, y to 1u) to Rational(-287159, 416745),
-                    mapOf(x to 7u, y to 1u) to Rational(-478204, 83349),
-                    mapOf(x to 8u, y to 1u) to Rational(176320, 83349),
-                    mapOf(y to 2u) to Rational(-6239, 6400),
-                    mapOf(x to 1u, y to 2u) to Rational(264211, 11200),
-                    mapOf(x to 2u, y to 2u) to Rational(-1591999, 100800),
-                    mapOf(x to 3u, y to 2u) to Rational(12450091, 529200),
-                    mapOf(x to 4u, y to 2u) to Rational(9230759, 226800),
-                    mapOf(x to 5u, y to 2u) to Rational(18995554, 2083725),
-                    mapOf(x to 6u, y to 2u) to Rational(136706258, 6251175),
-                    mapOf(x to 7u, y to 2u) to Rational(-120907496, 3750705),
-                    mapOf(x to 8u, y to 2u) to Rational(117200176, 15752961),
-                    mapOf(y to 3u) to Rational(5653, 320),
-                    mapOf(x to 1u, y to 3u) to Rational(-130853, 8400),
-                    mapOf(x to 2u, y to 3u) to Rational(-20939327, 151200),
-                    mapOf(x to 3u, y to 3u) to Rational(2566691, 25200),
-                    mapOf(x to 4u, y to 3u) to Rational(-68441519, 476280),
-                    mapOf(x to 5u, y to 3u) to Rational(2462904247, 12502350),
-                    mapOf(x to 6u, y to 3u) to Rational(353667161, 18753525),
-                    mapOf(x to 7u, y to 3u) to Rational(-1689134372, 26254935),
-                    mapOf(x to 8u, y to 3u) to Rational(35084104, 2250423),
-                    mapOf(y to 4u) to Rational(-3587, 300),
-                    mapOf(x to 1u, y to 4u) to Rational(-10513243, 33600),
-                    mapOf(x to 2u, y to 4u) to Rational(30766733, 176400),
-                    mapOf(x to 3u, y to 4u) to Rational(-65680021, 198450),
-                    mapOf(x to 4u, y to 4u) to Rational(-8108910547, 20003760),
-                    mapOf(x to 5u, y to 4u) to Rational(2922125159, 6251175),
-                    mapOf(x to 6u, y to 4u) to Rational(-4245279943, 131274675),
-                    mapOf(x to 7u, y to 4u) to Rational(-371946872, 3750705),
-                    mapOf(x to 8u, y to 4u) to Rational(61286752, 2250423),
-                    mapOf(y to 5u) to Rational(-20477, 160),
-                    mapOf(x to 1u, y to 5u) to Rational(215741, 1120),
-                    mapOf(x to 2u, y to 5u) to Rational(30785843, 31752),
-                    mapOf(x to 3u, y to 5u) to Rational(-357495959, 317520),
-                    mapOf(x to 4u, y to 5u) to Rational(-1611242993, 10001880),
-                    mapOf(x to 5u, y to 5u) to Rational(345925495, 500094),
-                    mapOf(x to 6u, y to 5u) to Rational(-755948411, 3750705),
-                    mapOf(x to 7u, y to 5u) to Rational(-108643496, 1250235),
-                    mapOf(x to 8u, y to 5u) to Rational(1122512, 35721),
-                    mapOf(y to 6u) to Rational(358037, 2880),
-                    mapOf(x to 1u, y to 6u) to Rational(3895837, 3360),
-                    mapOf(x to 2u, y to 6u) to Rational(359419201, 1270080),
-                    mapOf(x to 3u, y to 6u) to Rational(-158522587, 105840),
-                    mapOf(x to 4u, y to 6u) to Rational(10909002599, 20003760),
-                    mapOf(x to 5u, y to 6u) to Rational(76846972, 138915),
-                    mapOf(x to 6u, y to 6u) to Rational(-327696553, 1250235),
-                    mapOf(x to 7u, y to 6u) to Rational(-1687328, 35721),
-                    mapOf(x to 8u, y to 6u) to Rational(1016836, 35721),
-                    mapOf(y to 7u) to Rational(658, 3),
-                    mapOf(x to 1u, y to 7u) to Rational(48035, 168),
-                    mapOf(x to 2u, y to 7u) to Rational(-5777875, 5292),
-                    mapOf(x to 3u, y to 7u) to Rational(-7893899, 10584),
-                    mapOf(x to 4u, y to 7u) to Rational(10191652, 11907),
-                    mapOf(x to 5u, y to 7u) to Rational(2920121, 23814),
-                    mapOf(x to 6u, y to 7u) to Rational(-2699780, 11907),
-                    mapOf(x to 7u, y to 7u) to Rational(4556, 441),
-                    mapOf(x to 8u, y to 7u) to Rational(3440, 189),
-                    mapOf(y to 8u) to Rational(64, 1),
-                    mapOf(x to 1u, y to 8u) to Rational(-808, 7),
-                    mapOf(x to 2u, y to 8u) to Rational(-360895, 1764),
-                    mapOf(x to 3u, y to 8u) to Rational(257657, 882),
-                    mapOf(x to 4u, y to 8u) to Rational(3779917, 15876),
-                    mapOf(x to 5u, y to 8u) to Rational(-610279, 3969),
-                    mapOf(x to 6u, y to 8u) to Rational(-25091, 441),
-                    mapOf(x to 7u, y to 8u) to Rational(9560, 567),
-                    mapOf(x to 8u, y to 8u) to Rational(400, 81)
-                )
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(15, 7),
-                mapOf(x to 1u) to Rational(1, 5),
-                mapOf(x to 2u) to Rational(-7, 4),
-                mapOf(y to 1u) to Rational(-1, 9),
-                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
-                mapOf(x to 2u, y to 1u) to Rational(17, 3),
-                mapOf(y to 2u) to Rational(2, 6),
-                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                x to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(17, 5),
-                        mapOf(x to 1u) to Rational(11, 6),
-                        mapOf(x to 2u) to Rational(14, 3),
-                        mapOf(y to 1u) to Rational(17, 1),
-                        mapOf(x to 1u, y to 1u) to Rational(12, 3),
-                        mapOf(x to 2u, y to 1u) to Rational(-6, 2),
-                        mapOf(y to 2u) to Rational(17, 1),
-                        mapOf(x to 1u, y to 2u) to Rational(-4, 3),
-                        mapOf(x to 2u, y to 2u) to Rational(2, 6),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(3, 5),
-                        mapOf(x to 1u) to Rational(3, 5),
-                        mapOf(x to 2u) to Rational(3, 7),
-                        mapOf(y to 1u) to Rational(-3, 8),
-                        mapOf(x to 1u, y to 1u) to Rational(-1, 1),
-                        mapOf(x to 2u, y to 1u) to Rational(17, 9),
-                        mapOf(y to 2u) to Rational(-8, 1),
-                        mapOf(x to 1u, y to 2u) to Rational(6, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(10, 9),
-                    )
-                ),
-                y to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(18, 5),
-                        mapOf(x to 1u) to Rational(-17, 5),
-                        mapOf(x to 2u) to Rational(-2, 7),
-                        mapOf(y to 1u) to Rational(6, 5),
-                        mapOf(x to 1u, y to 1u) to Rational(-5, 1),
-                        mapOf(x to 2u, y to 1u) to Rational(-9, 1),
-                        mapOf(y to 2u) to Rational(-8, 8),
-                        mapOf(x to 1u, y to 2u) to Rational(2, 7),
-                        mapOf(x to 2u, y to 2u) to Rational(-13, 7),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-4, 8),
-                        mapOf(x to 1u) to Rational(15, 9),
-                        mapOf(x to 2u) to Rational(-10, 9),
-                        mapOf(y to 1u) to Rational(5, 3),
-                        mapOf(x to 1u, y to 1u) to Rational(4, 1),
-                        mapOf(x to 2u, y to 1u) to Rational(-2, 7),
-                        mapOf(y to 2u) to Rational(2, 2),
-                        mapOf(x to 1u, y to 2u) to Rational(-5, 7),
-                        mapOf(x to 2u, y to 2u) to Rational(-18, 9),
-                    )
-                ),
-                iota to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-2, 9),
-                        mapOf(x to 1u) to Rational(-6, 3),
-                        mapOf(x to 2u) to Rational(10, 9),
-                        mapOf(y to 1u) to Rational(13, 3),
-                        mapOf(x to 1u, y to 1u) to Rational(-12, 4),
-                        mapOf(x to 2u, y to 1u) to Rational(3, 6),
-                        mapOf(y to 2u) to Rational(2, 9),
-                        mapOf(x to 1u, y to 2u) to Rational(7, 3),
-                        mapOf(x to 2u, y to 2u) to Rational(16, 5),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-6, 2),
-                        mapOf(x to 1u) to Rational(6, 2),
-                        mapOf(x to 2u) to Rational(2, 7),
-                        mapOf(y to 1u) to Rational(-18, 1),
-                        mapOf(x to 1u, y to 1u) to Rational(-11, 3),
-                        mapOf(x to 2u, y to 1u) to Rational(7, 5),
-                        mapOf(y to 2u) to Rational(8, 1),
-                        mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                        mapOf(x to 2u, y to 2u) to Rational(17, 4),
-                    )
-                )
-            )),
-            "test 3'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-66677, 3500),
-                    mapOf(x to 1u) to Rational(-206281, 10500),
-                    mapOf(x to 2u) to Rational(-412567, 7056),
-                    mapOf(x to 3u) to Rational(-310081, 11025),
-                    mapOf(x to 4u) to Rational(-575996, 15435),
-                    mapOf(y to 1u) to Rational(-573701, 4200),
-                    mapOf(x to 1u, y to 1u) to Rational(-2239001, 25200),
-                    mapOf(x to 2u, y to 1u) to Rational(-8817889, 132300),
-                    mapOf(x to 3u, y to 1u) to Rational(2317919, 44100),
-                    mapOf(x to 4u, y to 1u) to Rational(1169471, 6615),
-                    mapOf(y to 2u) to Rational(-4057819, 33600),
-                    mapOf(x to 1u, y to 2u) to Rational(1373311, 12600),
-                    mapOf(x to 2u, y to 2u) to Rational(32433493, 52920),
-                    mapOf(x to 3u, y to 2u) to Rational(4998053, 33075),
-                    mapOf(x to 4u, y to 2u) to Rational(-2147779, 8820),
-                    mapOf(y to 3u) to Rational(2018481, 2240),
-                    mapOf(x to 1u, y to 3u) to Rational(941713, 1440),
-                    mapOf(x to 2u, y to 3u) to Rational(183749, 6615),
-                    mapOf(x to 3u, y to 3u) to Rational(-4631023, 15876),
-                    mapOf(x to 4u, y to 3u) to Rational(25609336, 178605),
-                    mapOf(y to 4u) to Rational(11886431, 6720),
-                    mapOf(x to 1u, y to 4u) to Rational(18433, 504),
-                    mapOf(x to 2u, y to 4u) to Rational(-39613331, 45360),
-                    mapOf(x to 3u, y to 4u) to Rational(681619, 5670),
-                    mapOf(x to 4u, y to 4u) to Rational(-864841, 20412),
-                    mapOf(y to 5u) to Rational(343535, 1008),
-                    mapOf(x to 1u, y to 5u) to Rational(-33583, 72),
-                    mapOf(x to 2u, y to 5u) to Rational(1194625, 9072),
-                    mapOf(x to 3u, y to 5u) to Rational(-62917, 2268),
-                    mapOf(x to 4u, y to 5u) to Rational(157645, 10206),
-                    mapOf(y to 6u) to Rational(-1381, 3),
-                    mapOf(x to 1u, y to 6u) to Rational(919, 36),
-                    mapOf(x to 2u, y to 6u) to Rational(-3053, 36),
-                    mapOf(x to 3u, y to 6u) to Rational(2125, 324),
-                    mapOf(x to 4u, y to 6u) to Rational(-236, 243)
-                ),
-                LabeledPolynomialAsIs(mapOf<Symbol, UInt>() to Rational(0, 1),
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-5, 3),
-                    mapOf(x to 2u) to Rational(35, 9),
-                    mapOf(x to 3u) to Rational(-100, 27),
-                    mapOf(x to 4u) to Rational(100, 81),
-                    mapOf(y to 1u) to Rational(-5, 3),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 9),
-                    mapOf(x to 2u, y to 1u) to Rational(1874, 189),
-                    mapOf(x to 3u, y to 1u) to Rational(-620, 63),
-                    mapOf(x to 4u, y to 1u) to Rational(40, 63),
-                    mapOf(y to 2u) to Rational(16, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(365, 21),
-                    mapOf(x to 2u, y to 2u) to Rational(112, 9),
-                    mapOf(x to 3u, y to 2u) to Rational(-464, 63),
-                    mapOf(x to 4u, y to 2u) to Rational(1996, 441),
-                    mapOf(y to 3u) to Rational(10, 3),
-                    mapOf(x to 1u, y to 3u) to Rational(118, 21),
-                    mapOf(x to 2u, y to 3u) to Rational(-272, 21),
-                    mapOf(x to 3u, y to 3u) to Rational(-764, 49),
-                    mapOf(x to 4u, y to 3u) to Rational(8, 7),
-                    mapOf(y to 4u) to Rational(1, 1),
-                    mapOf(x to 1u, y to 4u) to Rational(-10, 7),
-                    mapOf(x to 2u, y to 4u) to Rational(-171, 49),
-                    mapOf(x to 3u, y to 4u) to Rational(20, 7),
-                    mapOf(x to 4u, y to 4u) to Rational(4, 1)
-                )
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(15, 7),
-                mapOf(x to 1u) to Rational(1, 5),
-                mapOf(x to 2u) to Rational(-7, 4),
-                mapOf(y to 1u) to Rational(-1, 9),
-                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
-                mapOf(x to 2u, y to 1u) to Rational(17, 3),
-                mapOf(y to 2u) to Rational(2, 6),
-                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                x to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(17, 5),
-                        mapOf(x to 1u) to Rational(11, 6),
-                        mapOf(x to 2u) to Rational(14, 3),
-                        mapOf(y to 1u) to Rational(17, 1),
-                        mapOf(x to 1u, y to 1u) to Rational(12, 3),
-                        mapOf(x to 2u, y to 1u) to Rational(-6, 2),
-                        mapOf(y to 2u) to Rational(17, 1),
-                        mapOf(x to 1u, y to 2u) to Rational(-4, 3),
-                        mapOf(x to 2u, y to 2u) to Rational(2, 6),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(3, 5),
-                        mapOf(x to 1u) to Rational(3, 5),
-                        mapOf(x to 2u) to Rational(3, 7),
-                        mapOf(y to 1u) to Rational(-3, 8),
-                        mapOf(x to 1u, y to 1u) to Rational(-1, 1),
-                        mapOf(x to 2u, y to 1u) to Rational(17, 9),
-                        mapOf(y to 2u) to Rational(-8, 1),
-                        mapOf(x to 1u, y to 2u) to Rational(6, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(10, 9),
-                    )
-                ),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-66677, 3500),
-                    mapOf(x to 1u) to Rational(-206281, 10500),
-                    mapOf(x to 2u) to Rational(-412567, 7056),
-                    mapOf(x to 3u) to Rational(-310081, 11025),
-                    mapOf(x to 4u) to Rational(-575996, 15435),
-                    mapOf(y to 1u) to Rational(-573701, 4200),
-                    mapOf(x to 1u, y to 1u) to Rational(-2239001, 25200),
-                    mapOf(x to 2u, y to 1u) to Rational(-8817889, 132300),
-                    mapOf(x to 3u, y to 1u) to Rational(2317919, 44100),
-                    mapOf(x to 4u, y to 1u) to Rational(1169471, 6615),
-                    mapOf(y to 2u) to Rational(-4057819, 33600),
-                    mapOf(x to 1u, y to 2u) to Rational(1373311, 12600),
-                    mapOf(x to 2u, y to 2u) to Rational(32433493, 52920),
-                    mapOf(x to 3u, y to 2u) to Rational(4998053, 33075),
-                    mapOf(x to 4u, y to 2u) to Rational(-2147779, 8820),
-                    mapOf(y to 3u) to Rational(2018481, 2240),
-                    mapOf(x to 1u, y to 3u) to Rational(941713, 1440),
-                    mapOf(x to 2u, y to 3u) to Rational(183749, 6615),
-                    mapOf(x to 3u, y to 3u) to Rational(-4631023, 15876),
-                    mapOf(x to 4u, y to 3u) to Rational(25609336, 178605),
-                    mapOf(y to 4u) to Rational(11886431, 6720),
-                    mapOf(x to 1u, y to 4u) to Rational(18433, 504),
-                    mapOf(x to 2u, y to 4u) to Rational(-39613331, 45360),
-                    mapOf(x to 3u, y to 4u) to Rational(681619, 5670),
-                    mapOf(x to 4u, y to 4u) to Rational(-864841, 20412),
-                    mapOf(y to 5u) to Rational(343535, 1008),
-                    mapOf(x to 1u, y to 5u) to Rational(-33583, 72),
-                    mapOf(x to 2u, y to 5u) to Rational(1194625, 9072),
-                    mapOf(x to 3u, y to 5u) to Rational(-62917, 2268),
-                    mapOf(x to 4u, y to 5u) to Rational(157645, 10206),
-                    mapOf(y to 6u) to Rational(-1381, 3),
-                    mapOf(x to 1u, y to 6u) to Rational(919, 36),
-                    mapOf(x to 2u, y to 6u) to Rational(-3053, 36),
-                    mapOf(x to 3u, y to 6u) to Rational(2125, 324),
-                    mapOf(x to 4u, y to 6u) to Rational(-236, 243)
-                ),
-                LabeledPolynomialAsIs(mapOf<Symbol, UInt>() to Rational(0, 1),
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-5, 3),
-                    mapOf(x to 2u) to Rational(35, 9),
-                    mapOf(x to 3u) to Rational(-100, 27),
-                    mapOf(x to 4u) to Rational(100, 81),
-                    mapOf(y to 1u) to Rational(-5, 3),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 9),
-                    mapOf(x to 2u, y to 1u) to Rational(1874, 189),
-                    mapOf(x to 3u, y to 1u) to Rational(-620, 63),
-                    mapOf(x to 4u, y to 1u) to Rational(40, 63),
-                    mapOf(y to 2u) to Rational(16, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(365, 21),
-                    mapOf(x to 2u, y to 2u) to Rational(112, 9),
-                    mapOf(x to 3u, y to 2u) to Rational(-464, 63),
-                    mapOf(x to 4u, y to 2u) to Rational(1996, 441),
-                    mapOf(y to 3u) to Rational(10, 3),
-                    mapOf(x to 1u, y to 3u) to Rational(118, 21),
-                    mapOf(x to 2u, y to 3u) to Rational(-272, 21),
-                    mapOf(x to 3u, y to 3u) to Rational(-764, 49),
-                    mapOf(x to 4u, y to 3u) to Rational(8, 7),
-                    mapOf(y to 4u) to Rational(1, 1),
-                    mapOf(x to 1u, y to 4u) to Rational(-10, 7),
-                    mapOf(x to 2u, y to 4u) to Rational(-171, 49),
-                    mapOf(x to 3u, y to 4u) to Rational(20, 7),
-                    mapOf(x to 4u, y to 4u) to Rational(4, 1)
-                )
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(15, 7),
-                mapOf(x to 1u) to Rational(1, 5),
-                mapOf(x to 2u) to Rational(-7, 4),
-                mapOf(y to 1u) to Rational(-1, 9),
-                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
-                mapOf(x to 2u, y to 1u) to Rational(17, 3),
-                mapOf(y to 2u) to Rational(2, 6),
-                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                x to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(17, 5),
-                        mapOf(x to 1u) to Rational(11, 6),
-                        mapOf(x to 2u) to Rational(14, 3),
-                        mapOf(y to 1u) to Rational(17, 1),
-                        mapOf(x to 1u, y to 1u) to Rational(12, 3),
-                        mapOf(x to 2u, y to 1u) to Rational(-6, 2),
-                        mapOf(y to 2u) to Rational(17, 1),
-                        mapOf(x to 1u, y to 2u) to Rational(-4, 3),
-                        mapOf(x to 2u, y to 2u) to Rational(2, 6),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(3, 5),
-                        mapOf(x to 1u) to Rational(3, 5),
-                        mapOf(x to 2u) to Rational(3, 7),
-                        mapOf(y to 1u) to Rational(-3, 8),
-                        mapOf(x to 1u, y to 1u) to Rational(-1, 1),
-                        mapOf(x to 2u, y to 1u) to Rational(17, 9),
-                        mapOf(y to 2u) to Rational(-8, 1),
-                        mapOf(x to 1u, y to 2u) to Rational(6, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(10, 9),
-                    )
-                ),
-                iota to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-2, 9),
-                        mapOf(x to 1u) to Rational(-6, 3),
-                        mapOf(x to 2u) to Rational(10, 9),
-                        mapOf(y to 1u) to Rational(13, 3),
-                        mapOf(x to 1u, y to 1u) to Rational(-12, 4),
-                        mapOf(x to 2u, y to 1u) to Rational(3, 6),
-                        mapOf(y to 2u) to Rational(2, 9),
-                        mapOf(x to 1u, y to 2u) to Rational(7, 3),
-                        mapOf(x to 2u, y to 2u) to Rational(16, 5),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-6, 2),
-                        mapOf(x to 1u) to Rational(6, 2),
-                        mapOf(x to 2u) to Rational(2, 7),
-                        mapOf(y to 1u) to Rational(-18, 1),
-                        mapOf(x to 1u, y to 1u) to Rational(-11, 3),
-                        mapOf(x to 2u, y to 1u) to Rational(7, 5),
-                        mapOf(y to 2u) to Rational(8, 1),
-                        mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                        mapOf(x to 2u, y to 2u) to Rational(17, 4),
-                    )
-                )
-            )),
-            "test 4'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(3539, 700),
-                    mapOf(x to 1u) to Rational(-307079, 6300),
-                    mapOf(x to 2u) to Rational(451609, 15120),
-                    mapOf(x to 3u) to Rational(35287733, 396900),
-                    mapOf(x to 4u) to Rational(-37242617, 396900),
-                    mapOf(x to 5u) to Rational(382747, 19845),
-                    mapOf(x to 6u) to Rational(-2407, 3969),
-                    mapOf(y to 1u) to Rational(-226, 175),
-                    mapOf(x to 1u, y to 1u) to Rational(-74113, 1890),
-                    mapOf(x to 2u, y to 1u) to Rational(250931, 1764),
-                    mapOf(x to 3u, y to 1u) to Rational(30071473, 99225),
-                    mapOf(x to 4u, y to 1u) to Rational(-286466, 1323),
-                    mapOf(x to 5u, y to 1u) to Rational(-2285282, 9261),
-                    mapOf(x to 6u, y to 1u) to Rational(17900, 441),
-                    mapOf(y to 2u) to Rational(3817, 3150),
-                    mapOf(x to 1u, y to 2u) to Rational(577568, 11025),
-                    mapOf(x to 2u, y to 2u) to Rational(9073553, 99225),
-                    mapOf(x to 3u, y to 2u) to Rational(-1415849, 79380),
-                    mapOf(x to 4u, y to 2u) to Rational(-124715629, 277830),
-                    mapOf(x to 5u, y to 2u) to Rational(-1328953, 1890),
-                    mapOf(x to 6u, y to 2u) to Rational(-297148, 1323),
-                    mapOf(y to 3u) to Rational(6043, 945),
-                    mapOf(x to 1u, y to 3u) to Rational(160381, 6615),
-                    mapOf(x to 2u, y to 3u) to Rational(-673249, 13230),
-                    mapOf(x to 3u, y to 3u) to Rational(-319255, 2058),
-                    mapOf(x to 4u, y to 3u) to Rational(-98144, 1029),
-                    mapOf(x to 5u, y to 3u) to Rational(-320239, 5145),
-                    mapOf(x to 6u, y to 3u) to Rational(400, 147),
-                    mapOf(y to 4u) to Rational(163, 63),
-                    mapOf(x to 1u, y to 4u) to Rational(-25183, 4410),
-                    mapOf(x to 2u, y to 4u) to Rational(-21369, 1372),
-                    mapOf(x to 3u, y to 4u) to Rational(127499, 30870),
-                    mapOf(x to 4u, y to 4u) to Rational(86971, 12348),
-                    mapOf(x to 5u, y to 4u) to Rational(-11129, 1470),
-                    mapOf(x to 6u, y to 4u) to Rational(544, 147)
-                ),
-                LabeledPolynomialAsIs(mapOf<Symbol, UInt>() to Rational(0, 1),
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-5, 3),
-                    mapOf(x to 2u) to Rational(35, 9),
-                    mapOf(x to 3u) to Rational(-100, 27),
-                    mapOf(x to 4u) to Rational(100, 81),
-                    mapOf(y to 1u) to Rational(-5, 3),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 9),
-                    mapOf(x to 2u, y to 1u) to Rational(1874, 189),
-                    mapOf(x to 3u, y to 1u) to Rational(-620, 63),
-                    mapOf(x to 4u, y to 1u) to Rational(40, 63),
-                    mapOf(y to 2u) to Rational(16, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(365, 21),
-                    mapOf(x to 2u, y to 2u) to Rational(112, 9),
-                    mapOf(x to 3u, y to 2u) to Rational(-464, 63),
-                    mapOf(x to 4u, y to 2u) to Rational(1996, 441),
-                    mapOf(y to 3u) to Rational(10, 3),
-                    mapOf(x to 1u, y to 3u) to Rational(118, 21),
-                    mapOf(x to 2u, y to 3u) to Rational(-272, 21),
-                    mapOf(x to 3u, y to 3u) to Rational(-764, 49),
-                    mapOf(x to 4u, y to 3u) to Rational(8, 7),
-                    mapOf(y to 4u) to Rational(1, 1),
-                    mapOf(x to 1u, y to 4u) to Rational(-10, 7),
-                    mapOf(x to 2u, y to 4u) to Rational(-171, 49),
-                    mapOf(x to 3u, y to 4u) to Rational(20, 7),
-                    mapOf(x to 4u, y to 4u) to Rational(4, 1)
-                )
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(15, 7),
-                mapOf(x to 1u) to Rational(1, 5),
-                mapOf(x to 2u) to Rational(-7, 4),
-                mapOf(y to 1u) to Rational(-1, 9),
-                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
-                mapOf(x to 2u, y to 1u) to Rational(17, 3),
-                mapOf(y to 2u) to Rational(2, 6),
-                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                y to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(18, 5),
-                        mapOf(x to 1u) to Rational(-17, 5),
-                        mapOf(x to 2u) to Rational(-2, 7),
-                        mapOf(y to 1u) to Rational(6, 5),
-                        mapOf(x to 1u, y to 1u) to Rational(-5, 1),
-                        mapOf(x to 2u, y to 1u) to Rational(-9, 1),
-                        mapOf(y to 2u) to Rational(-8, 8),
-                        mapOf(x to 1u, y to 2u) to Rational(2, 7),
-                        mapOf(x to 2u, y to 2u) to Rational(-13, 7),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-4, 8),
-                        mapOf(x to 1u) to Rational(15, 9),
-                        mapOf(x to 2u) to Rational(-10, 9),
-                        mapOf(y to 1u) to Rational(5, 3),
-                        mapOf(x to 1u, y to 1u) to Rational(4, 1),
-                        mapOf(x to 2u, y to 1u) to Rational(-2, 7),
-                        mapOf(y to 2u) to Rational(2, 2),
-                        mapOf(x to 1u, y to 2u) to Rational(-5, 7),
-                        mapOf(x to 2u, y to 2u) to Rational(-18, 9),
-                    )
-                ),
-            )),
-            "test 5"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(3539, 700),
-                    mapOf(x to 1u) to Rational(-307079, 6300),
-                    mapOf(x to 2u) to Rational(451609, 15120),
-                    mapOf(x to 3u) to Rational(35287733, 396900),
-                    mapOf(x to 4u) to Rational(-37242617, 396900),
-                    mapOf(x to 5u) to Rational(382747, 19845),
-                    mapOf(x to 6u) to Rational(-2407, 3969),
-                    mapOf(y to 1u) to Rational(-226, 175),
-                    mapOf(x to 1u, y to 1u) to Rational(-74113, 1890),
-                    mapOf(x to 2u, y to 1u) to Rational(250931, 1764),
-                    mapOf(x to 3u, y to 1u) to Rational(30071473, 99225),
-                    mapOf(x to 4u, y to 1u) to Rational(-286466, 1323),
-                    mapOf(x to 5u, y to 1u) to Rational(-2285282, 9261),
-                    mapOf(x to 6u, y to 1u) to Rational(17900, 441),
-                    mapOf(y to 2u) to Rational(3817, 3150),
-                    mapOf(x to 1u, y to 2u) to Rational(577568, 11025),
-                    mapOf(x to 2u, y to 2u) to Rational(9073553, 99225),
-                    mapOf(x to 3u, y to 2u) to Rational(-1415849, 79380),
-                    mapOf(x to 4u, y to 2u) to Rational(-124715629, 277830),
-                    mapOf(x to 5u, y to 2u) to Rational(-1328953, 1890),
-                    mapOf(x to 6u, y to 2u) to Rational(-297148, 1323),
-                    mapOf(y to 3u) to Rational(6043, 945),
-                    mapOf(x to 1u, y to 3u) to Rational(160381, 6615),
-                    mapOf(x to 2u, y to 3u) to Rational(-673249, 13230),
-                    mapOf(x to 3u, y to 3u) to Rational(-319255, 2058),
-                    mapOf(x to 4u, y to 3u) to Rational(-98144, 1029),
-                    mapOf(x to 5u, y to 3u) to Rational(-320239, 5145),
-                    mapOf(x to 6u, y to 3u) to Rational(400, 147),
-                    mapOf(y to 4u) to Rational(163, 63),
-                    mapOf(x to 1u, y to 4u) to Rational(-25183, 4410),
-                    mapOf(x to 2u, y to 4u) to Rational(-21369, 1372),
-                    mapOf(x to 3u, y to 4u) to Rational(127499, 30870),
-                    mapOf(x to 4u, y to 4u) to Rational(86971, 12348),
-                    mapOf(x to 5u, y to 4u) to Rational(-11129, 1470),
-                    mapOf(x to 6u, y to 4u) to Rational(544, 147)
-                ),
-                LabeledPolynomialAsIs(mapOf<Symbol, UInt>() to Rational(0, 1),
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-5, 3),
-                    mapOf(x to 2u) to Rational(35, 9),
-                    mapOf(x to 3u) to Rational(-100, 27),
-                    mapOf(x to 4u) to Rational(100, 81),
-                    mapOf(y to 1u) to Rational(-5, 3),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 9),
-                    mapOf(x to 2u, y to 1u) to Rational(1874, 189),
-                    mapOf(x to 3u, y to 1u) to Rational(-620, 63),
-                    mapOf(x to 4u, y to 1u) to Rational(40, 63),
-                    mapOf(y to 2u) to Rational(16, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(365, 21),
-                    mapOf(x to 2u, y to 2u) to Rational(112, 9),
-                    mapOf(x to 3u, y to 2u) to Rational(-464, 63),
-                    mapOf(x to 4u, y to 2u) to Rational(1996, 441),
-                    mapOf(y to 3u) to Rational(10, 3),
-                    mapOf(x to 1u, y to 3u) to Rational(118, 21),
-                    mapOf(x to 2u, y to 3u) to Rational(-272, 21),
-                    mapOf(x to 3u, y to 3u) to Rational(-764, 49),
-                    mapOf(x to 4u, y to 3u) to Rational(8, 7),
-                    mapOf(y to 4u) to Rational(1, 1),
-                    mapOf(x to 1u, y to 4u) to Rational(-10, 7),
-                    mapOf(x to 2u, y to 4u) to Rational(-171, 49),
-                    mapOf(x to 3u, y to 4u) to Rational(20, 7),
-                    mapOf(x to 4u, y to 4u) to Rational(4, 1)
-                )
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(15, 7),
-                mapOf(x to 1u) to Rational(1, 5),
-                mapOf(x to 2u) to Rational(-7, 4),
-                mapOf(y to 1u) to Rational(-1, 9),
-                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
-                mapOf(x to 2u, y to 1u) to Rational(17, 3),
-                mapOf(y to 2u) to Rational(2, 6),
-                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                y to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(18, 5),
-                        mapOf(x to 1u) to Rational(-17, 5),
-                        mapOf(x to 2u) to Rational(-2, 7),
-                        mapOf(y to 1u) to Rational(6, 5),
-                        mapOf(x to 1u, y to 1u) to Rational(-5, 1),
-                        mapOf(x to 2u, y to 1u) to Rational(-9, 1),
-                        mapOf(y to 2u) to Rational(-8, 8),
-                        mapOf(x to 1u, y to 2u) to Rational(2, 7),
-                        mapOf(x to 2u, y to 2u) to Rational(-13, 7),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-4, 8),
-                        mapOf(x to 1u) to Rational(15, 9),
-                        mapOf(x to 2u) to Rational(-10, 9),
-                        mapOf(y to 1u) to Rational(5, 3),
-                        mapOf(x to 1u, y to 1u) to Rational(4, 1),
-                        mapOf(x to 2u, y to 1u) to Rational(-2, 7),
-                        mapOf(y to 2u) to Rational(2, 2),
-                        mapOf(x to 1u, y to 2u) to Rational(-5, 7),
-                        mapOf(x to 2u, y to 2u) to Rational(-18, 9),
-                    )
-                ),
-                iota to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-2, 9),
-                        mapOf(x to 1u) to Rational(-6, 3),
-                        mapOf(x to 2u) to Rational(10, 9),
-                        mapOf(y to 1u) to Rational(13, 3),
-                        mapOf(x to 1u, y to 1u) to Rational(-12, 4),
-                        mapOf(x to 2u, y to 1u) to Rational(3, 6),
-                        mapOf(y to 2u) to Rational(2, 9),
-                        mapOf(x to 1u, y to 2u) to Rational(7, 3),
-                        mapOf(x to 2u, y to 2u) to Rational(16, 5),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-6, 2),
-                        mapOf(x to 1u) to Rational(6, 2),
-                        mapOf(x to 2u) to Rational(2, 7),
-                        mapOf(y to 1u) to Rational(-18, 1),
-                        mapOf(x to 1u, y to 1u) to Rational(-11, 3),
-                        mapOf(x to 2u, y to 1u) to Rational(7, 5),
-                        mapOf(y to 2u) to Rational(8, 1),
-                        mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                        mapOf(x to 2u, y to 2u) to Rational(17, 4),
-                    )
-                )
-            )),
-            "test 5'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(15, 7),
-                    mapOf(x to 1u) to Rational(1, 5),
-                    mapOf(x to 2u) to Rational(-7, 4),
-                    mapOf(y to 1u) to Rational(-1, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(-2, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(17, 3),
-                    mapOf(y to 2u) to Rational(2, 6),
-                    mapOf(x to 1u, y to 2u) to Rational(-17, 6),
-                    mapOf(x to 2u, y to 2u) to Rational(-6, 2),
-                ),
-                LabeledPolynomialAsIs(mapOf<Symbol, UInt>() to Rational(0, 1),
-                    mapOf<Symbol, UInt>() to Rational(0, 1)
-                )
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(15, 7),
-                mapOf(x to 1u) to Rational(1, 5),
-                mapOf(x to 2u) to Rational(-7, 4),
-                mapOf(y to 1u) to Rational(-1, 9),
-                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
-                mapOf(x to 2u, y to 1u) to Rational(17, 3),
-                mapOf(y to 2u) to Rational(2, 6),
-                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf<Symbol, LabeledRationalFunction<Rational>>()),
-            "test 6"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(15, 7),
-                    mapOf(x to 1u) to Rational(1, 5),
-                    mapOf(x to 2u) to Rational(-7, 4),
-                    mapOf(y to 1u) to Rational(-1, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(-2, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(17, 3),
-                    mapOf(y to 2u) to Rational(2, 6),
-                    mapOf(x to 1u, y to 2u) to Rational(-17, 6),
-                    mapOf(x to 2u, y to 2u) to Rational(-6, 2),
-                ),
-                LabeledPolynomialAsIs(mapOf<Symbol, UInt>() to Rational(0, 1),
-                    mapOf<Symbol, UInt>() to Rational(0, 1)
-                )
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(15, 7),
-                mapOf(x to 1u) to Rational(1, 5),
-                mapOf(x to 2u) to Rational(-7, 4),
-                mapOf(y to 1u) to Rational(-1, 9),
-                mapOf(x to 1u, y to 1u) to Rational(-2, 7),
-                mapOf(x to 2u, y to 1u) to Rational(17, 3),
-                mapOf(y to 2u) to Rational(2, 6),
-                mapOf(x to 1u, y to 2u) to Rational(-17, 6),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                iota to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-2, 9),
-                        mapOf(x to 1u) to Rational(-6, 3),
-                        mapOf(x to 2u) to Rational(10, 9),
-                        mapOf(y to 1u) to Rational(13, 3),
-                        mapOf(x to 1u, y to 1u) to Rational(-12, 4),
-                        mapOf(x to 2u, y to 1u) to Rational(3, 6),
-                        mapOf(y to 2u) to Rational(2, 9),
-                        mapOf(x to 1u, y to 2u) to Rational(7, 3),
-                        mapOf(x to 2u, y to 2u) to Rational(16, 5),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-6, 2),
-                        mapOf(x to 1u) to Rational(6, 2),
-                        mapOf(x to 2u) to Rational(2, 7),
-                        mapOf(y to 1u) to Rational(-18, 1),
-                        mapOf(x to 1u, y to 1u) to Rational(-11, 3),
-                        mapOf(x to 2u, y to 1u) to Rational(7, 5),
-                        mapOf(y to 2u) to Rational(8, 1),
-                        mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                        mapOf(x to 2u, y to 2u) to Rational(17, 4),
-                    )
-                )
-            )),
-            "test 6'"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Double_Map() {
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(emptyMap<Symbol, UInt>() to 0.0),
-                LabeledPolynomialAsIs(emptyMap<Symbol, UInt>() to 1.0),
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 1.0,
-                    mapOf(x to 1u) to -2.0,
-                    mapOf(x to 2u) to 1.0,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 1.0,
-                )
-            ).substitute(mapOf(
-                x to 1.0
-            )),
-            0.001,
-            "test 1"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 6.593754860231304,
-                    mapOf(x to 1u) to -7.853302571550634,
-                    mapOf(x to 2u) to 1.2265042281530025,
-                    mapOf(y to 1u) to 3.762648877294904,
-                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
-                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
-                    mapOf(y to 2u) to 7.359794483988782,
-                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
-                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 9.533292132172562,
-                    mapOf(x to 1u) to -1.982814534018857,
-                    mapOf(x to 2u) to -5.974248303415283,
-                    mapOf(y to 1u) to 1.5876716499288879,
-                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
-                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
-                    mapOf(y to 2u) to -5.242030058021028,
-                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
-                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 6.593754860231304,
-                    mapOf(x to 1u) to -7.853302571550634,
-                    mapOf(x to 2u) to 1.2265042281530025,
-                    mapOf(y to 1u) to 3.762648877294904,
-                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
-                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
-                    mapOf(y to 2u) to 7.359794483988782,
-                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
-                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 9.533292132172562,
-                    mapOf(x to 1u) to -1.982814534018857,
-                    mapOf(x to 2u) to -5.974248303415283,
-                    mapOf(y to 1u) to 1.5876716499288879,
-                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
-                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
-                    mapOf(y to 2u) to -5.242030058021028,
-                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
-                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf()),
-            0.001,
-            "test 2"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 6.593754860231304,
-                    mapOf(x to 1u) to -7.853302571550634,
-                    mapOf(x to 2u) to 1.2265042281530025,
-                    mapOf(y to 1u) to 3.762648877294904,
-                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
-                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
-                    mapOf(y to 2u) to 7.359794483988782,
-                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
-                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 9.533292132172562,
-                    mapOf(x to 1u) to -1.982814534018857,
-                    mapOf(x to 2u) to -5.974248303415283,
-                    mapOf(y to 1u) to 1.5876716499288879,
-                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
-                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
-                    mapOf(y to 2u) to -5.242030058021028,
-                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
-                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 6.593754860231304,
-                    mapOf(x to 1u) to -7.853302571550634,
-                    mapOf(x to 2u) to 1.2265042281530025,
-                    mapOf(y to 1u) to 3.762648877294904,
-                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
-                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
-                    mapOf(y to 2u) to 7.359794483988782,
-                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
-                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 9.533292132172562,
-                    mapOf(x to 1u) to -1.982814534018857,
-                    mapOf(x to 2u) to -5.974248303415283,
-                    mapOf(y to 1u) to 1.5876716499288879,
-                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
-                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
-                    mapOf(y to 2u) to -5.242030058021028,
-                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
-                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                iota to 0.9211194782050933
-            )),
-            0.001,
-            "test 2'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 151.1502229133916,
-                    mapOf(y to 1u) to -262.3790170577034,
-                    mapOf(y to 2u) to 102.5097937392923,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to -367.9969733169944,
-                    mapOf(y to 1u) to 112.4911133334554,
-                    mapOf(y to 2u) to -469.755906895345,
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 6.593754860231304,
-                    mapOf(x to 1u) to -7.853302571550634,
-                    mapOf(x to 2u) to 1.2265042281530025,
-                    mapOf(y to 1u) to 3.762648877294904,
-                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
-                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
-                    mapOf(y to 2u) to 7.359794483988782,
-                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
-                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 9.533292132172562,
-                    mapOf(x to 1u) to -1.982814534018857,
-                    mapOf(x to 2u) to -5.974248303415283,
-                    mapOf(y to 1u) to 1.5876716499288879,
-                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
-                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
-                    mapOf(y to 2u) to -5.242030058021028,
-                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
-                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                x to -8.11707689492641,
-            )),
-            0.001,
-            "test 3"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 151.1502229133916,
-                    mapOf(y to 1u) to -262.3790170577034,
-                    mapOf(y to 2u) to 102.5097937392923,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to -367.9969733169944,
-                    mapOf(y to 1u) to 112.4911133334554,
-                    mapOf(y to 2u) to -469.755906895345,
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 6.593754860231304,
-                    mapOf(x to 1u) to -7.853302571550634,
-                    mapOf(x to 2u) to 1.2265042281530025,
-                    mapOf(y to 1u) to 3.762648877294904,
-                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
-                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
-                    mapOf(y to 2u) to 7.359794483988782,
-                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
-                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 9.533292132172562,
-                    mapOf(x to 1u) to -1.982814534018857,
-                    mapOf(x to 2u) to -5.974248303415283,
-                    mapOf(y to 1u) to 1.5876716499288879,
-                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
-                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
-                    mapOf(y to 2u) to -5.242030058021028,
-                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
-                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                x to -8.11707689492641,
-                iota to 0.9211194782050933
-            )),
-            0.001,
-            "test 3'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 14.24074356896978,
-                    mapOf(x to 1u) to -17.71987055153461,
-                    mapOf(x to 2u) to -2.288056483312383,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 7.480604285873397,
-                    mapOf(x to 1u) to -8.43478016688617,
-                    mapOf(x to 2u) to -9.88934943900592,
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 6.593754860231304,
-                    mapOf(x to 1u) to -7.853302571550634,
-                    mapOf(x to 2u) to 1.2265042281530025,
-                    mapOf(y to 1u) to 3.762648877294904,
-                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
-                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
-                    mapOf(y to 2u) to 7.359794483988782,
-                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
-                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 9.533292132172562,
-                    mapOf(x to 1u) to -1.982814534018857,
-                    mapOf(x to 2u) to -5.974248303415283,
-                    mapOf(y to 1u) to 1.5876716499288879,
-                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
-                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
-                    mapOf(y to 2u) to -5.242030058021028,
-                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
-                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                y to 0.795265651276015,
-            )),
-            0.001,
-            "test 4"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 14.24074356896978,
-                    mapOf(x to 1u) to -17.71987055153461,
-                    mapOf(x to 2u) to -2.288056483312383,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 7.480604285873397,
-                    mapOf(x to 1u) to -8.43478016688617,
-                    mapOf(x to 2u) to -9.88934943900592,
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 6.593754860231304,
-                    mapOf(x to 1u) to -7.853302571550634,
-                    mapOf(x to 2u) to 1.2265042281530025,
-                    mapOf(y to 1u) to 3.762648877294904,
-                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
-                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
-                    mapOf(y to 2u) to 7.359794483988782,
-                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
-                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 9.533292132172562,
-                    mapOf(x to 1u) to -1.982814534018857,
-                    mapOf(x to 2u) to -5.974248303415283,
-                    mapOf(y to 1u) to 1.5876716499288879,
-                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
-                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
-                    mapOf(y to 2u) to -5.242030058021028,
-                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
-                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                y to 0.795265651276015,
-                iota to 0.9211194782050933
-            )),
-            0.001,
-            "test 4'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 7.321261307532708,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to -575.6325831127576,
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 6.593754860231304,
-                    mapOf(x to 1u) to -7.853302571550634,
-                    mapOf(x to 2u) to 1.2265042281530025,
-                    mapOf(y to 1u) to 3.762648877294904,
-                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
-                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
-                    mapOf(y to 2u) to 7.359794483988782,
-                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
-                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 9.533292132172562,
-                    mapOf(x to 1u) to -1.982814534018857,
-                    mapOf(x to 2u) to -5.974248303415283,
-                    mapOf(y to 1u) to 1.5876716499288879,
-                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
-                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
-                    mapOf(y to 2u) to -5.242030058021028,
-                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
-                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                x to -8.11707689492641,
-                y to 0.795265651276015,
-            )),
-            0.001,
-            "test 5"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 7.321261307532708,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to -575.6325831127576,
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 6.593754860231304,
-                    mapOf(x to 1u) to -7.853302571550634,
-                    mapOf(x to 2u) to 1.2265042281530025,
-                    mapOf(y to 1u) to 3.762648877294904,
-                    mapOf(x to 1u, y to 1u) to -8.945144619305292,
-                    mapOf(x to 2u, y to 1u) to -5.141384718042281,
-                    mapOf(y to 2u) to 7.359794483988782,
-                    mapOf(x to 1u, y to 2u) to -4.3526172680518815,
-                    mapOf(x to 2u, y to 2u) to 0.907910924854372,
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to 9.533292132172562,
-                    mapOf(x to 1u) to -1.982814534018857,
-                    mapOf(x to 2u) to -5.974248303415283,
-                    mapOf(y to 1u) to 1.5876716499288879,
-                    mapOf(x to 1u, y to 1u) to -7.535152566659664,
-                    mapOf(x to 2u, y to 1u) to 0.7549300500153517,
-                    mapOf(y to 2u) to -5.242030058021028,
-                    mapOf(x to 1u, y to 2u) to -0.7265704289690582,
-                    mapOf(x to 2u, y to 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                x to -8.11707689492641,
-                y to 0.795265651276015,
-                iota to 0.9211194782050933
-            )),
-            0.001,
-            "test 5'"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Constant_Map() {
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(0)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1),
-                    mapOf(x to 1u) to Rational(-2),
-                    mapOf(x to 2u) to Rational(1)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1)
-                )
-            ).substitute(RationalField, mapOf(
-                x to Rational(1)
-            )),
-            "test 1"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(22047, 2450),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-2204953, 147000),
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-3, 5),
-                    mapOf(x to 1u) to Rational(-18, 4),
-                    mapOf(x to 2u) to Rational(9, 8),
-                    mapOf(y to 1u) to Rational(-11, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
-                    mapOf(y to 2u) to Rational(5, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(11, 1),
-                    mapOf(x to 1u) to Rational(4, 1),
-                    mapOf(x to 2u) to Rational(-18, 3),
-                    mapOf(y to 1u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
-                    mapOf(y to 2u) to Rational(-4, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                x to Rational(7, 5),
-                y to Rational(-13, 7),
-            )),
-            "test 2"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(22047, 2450),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-2204953, 147000),
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-3, 5),
-                    mapOf(x to 1u) to Rational(-18, 4),
-                    mapOf(x to 2u) to Rational(9, 8),
-                    mapOf(y to 1u) to Rational(-11, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
-                    mapOf(y to 2u) to Rational(5, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(11, 1),
-                    mapOf(x to 1u) to Rational(4, 1),
-                    mapOf(x to 2u) to Rational(-18, 3),
-                    mapOf(y to 1u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
-                    mapOf(y to 2u) to Rational(-4, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                x to Rational(7, 5),
-                y to Rational(-13, 7),
-                iota to Rational(-16, 4),
-            )),
-            "test 2'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(4191, 490),
-                    mapOf(x to 1u) to Rational(14975, 1176),
-                    mapOf(x to 2u) to Rational(-10429, 1176)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-775, 147),
-                    mapOf(x to 1u) to Rational(-155, 49),
-                    mapOf(x to 2u) to Rational(-757, 280)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-3, 5),
-                    mapOf(x to 1u) to Rational(-18, 4),
-                    mapOf(x to 2u) to Rational(9, 8),
-                    mapOf(y to 1u) to Rational(-11, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
-                    mapOf(y to 2u) to Rational(5, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(11, 1),
-                    mapOf(x to 1u) to Rational(4, 1),
-                    mapOf(x to 2u) to Rational(-18, 3),
-                    mapOf(y to 1u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
-                    mapOf(y to 2u) to Rational(-4, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                y to Rational(-13, 7),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(4191, 490),
-                    mapOf(x to 1u) to Rational(14975, 1176),
-                    mapOf(x to 2u) to Rational(-10429, 1176)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-775, 147),
-                    mapOf(x to 1u) to Rational(-155, 49),
-                    mapOf(x to 2u) to Rational(-757, 280)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-3, 5),
-                    mapOf(x to 1u) to Rational(-18, 4),
-                    mapOf(x to 2u) to Rational(9, 8),
-                    mapOf(y to 1u) to Rational(-11, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
-                    mapOf(y to 2u) to Rational(5, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(11, 1),
-                    mapOf(x to 1u) to Rational(4, 1),
-                    mapOf(x to 2u) to Rational(-18, 3),
-                    mapOf(y to 1u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
-                    mapOf(y to 2u) to Rational(-4, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                y to Rational(-13, 7),
-                iota to Rational(-16, 4),
-            )),
-            "test 3'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-939, 200),
-                    mapOf(y to 1u) to Rational(123, 50),
-                    mapOf(y to 2u) to Rational(1059, 200)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(121, 25),
-                    mapOf(y to 1u) to Rational(-949, 375),
-                    mapOf(y to 2u) to Rational(-1423, 200)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-3, 5),
-                    mapOf(x to 1u) to Rational(-18, 4),
-                    mapOf(x to 2u) to Rational(9, 8),
-                    mapOf(y to 1u) to Rational(-11, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
-                    mapOf(y to 2u) to Rational(5, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(11, 1),
-                    mapOf(x to 1u) to Rational(4, 1),
-                    mapOf(x to 2u) to Rational(-18, 3),
-                    mapOf(y to 1u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
-                    mapOf(y to 2u) to Rational(-4, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                x to Rational(7, 5),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-939, 200),
-                    mapOf(y to 1u) to Rational(123, 50),
-                    mapOf(y to 2u) to Rational(1059, 200)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(121, 25),
-                    mapOf(y to 1u) to Rational(-949, 375),
-                    mapOf(y to 2u) to Rational(-1423, 200)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-3, 5),
-                    mapOf(x to 1u) to Rational(-18, 4),
-                    mapOf(x to 2u) to Rational(9, 8),
-                    mapOf(y to 1u) to Rational(-11, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
-                    mapOf(y to 2u) to Rational(5, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(11, 1),
-                    mapOf(x to 1u) to Rational(4, 1),
-                    mapOf(x to 2u) to Rational(-18, 3),
-                    mapOf(y to 1u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
-                    mapOf(y to 2u) to Rational(-4, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                x to Rational(7, 5),
-                iota to Rational(-16, 4),
-            )),
-            "test 4'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-3, 5),
-                    mapOf(x to 1u) to Rational(-18, 4),
-                    mapOf(x to 2u) to Rational(9, 8),
-                    mapOf(y to 1u) to Rational(-11, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
-                    mapOf(y to 2u) to Rational(5, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(11, 1),
-                    mapOf(x to 1u) to Rational(4, 1),
-                    mapOf(x to 2u) to Rational(-18, 3),
-                    mapOf(y to 1u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
-                    mapOf(y to 2u) to Rational(-4, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-3, 5),
-                    mapOf(x to 1u) to Rational(-18, 4),
-                    mapOf(x to 2u) to Rational(9, 8),
-                    mapOf(y to 1u) to Rational(-11, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
-                    mapOf(y to 2u) to Rational(5, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(11, 1),
-                    mapOf(x to 1u) to Rational(4, 1),
-                    mapOf(x to 2u) to Rational(-18, 3),
-                    mapOf(y to 1u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
-                    mapOf(y to 2u) to Rational(-4, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf<Symbol, Rational>()),
-            "test 5"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-3, 5),
-                    mapOf(x to 1u) to Rational(-18, 4),
-                    mapOf(x to 2u) to Rational(9, 8),
-                    mapOf(y to 1u) to Rational(-11, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
-                    mapOf(y to 2u) to Rational(5, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(11, 1),
-                    mapOf(x to 1u) to Rational(4, 1),
-                    mapOf(x to 2u) to Rational(-18, 3),
-                    mapOf(y to 1u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
-                    mapOf(y to 2u) to Rational(-4, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-3, 5),
-                    mapOf(x to 1u) to Rational(-18, 4),
-                    mapOf(x to 2u) to Rational(9, 8),
-                    mapOf(y to 1u) to Rational(-11, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(12, 2),
-                    mapOf(y to 2u) to Rational(5, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 8),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(11, 1),
-                    mapOf(x to 1u) to Rational(4, 1),
-                    mapOf(x to 2u) to Rational(-18, 3),
-                    mapOf(y to 1u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(14, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(-17, 5),
-                    mapOf(y to 2u) to Rational(-4, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(-5, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                iota to Rational(-16, 4),
-            )),
-            "test 5'"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Polynomial_Map() {
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(0)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1),
-                    mapOf(x to 1u) to Rational(-2),
-                    mapOf(x to 2u) to Rational(1)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1)
-                )
-            ).substitute(RationalField, mapOf(
-                x to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1)
-                )
-            )),
-            "test 1"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5, 6),
-                    mapOf(x to 1u) to Rational(211, 4),
-                    mapOf(x to 2u) to Rational(88, 3),
-                    mapOf(x to 3u) to Rational(-63, 8),
-                    mapOf(x to 4u) to Rational(441, 16),
-                    mapOf(y to 1u) to Rational(-671, 15),
-                    mapOf(x to 1u, y to 1u) to Rational(-551, 21),
-                    mapOf(x to 2u, y to 1u) to Rational(279, 25),
-                    mapOf(x to 3u, y to 1u) to Rational(231, 20),
-                    mapOf(y to 2u) to Rational(-1436, 1575),
-                    mapOf(x to 1u, y to 2u) to Rational(2471, 250),
-                    mapOf(x to 2u, y to 2u) to Rational(-4919, 100),
-                    mapOf(y to 3u) to Rational(-1464, 125),
-                    mapOf(x to 1u, y to 3u) to Rational(-264, 25),
-                    mapOf(y to 4u) to Rational(576, 25),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 9),
-                    mapOf(x to 1u) to Rational(-9, 4),
-                    mapOf(x to 2u) to Rational(943, 8),
-                    mapOf(x to 3u) to Rational(117, 8),
-                    mapOf(x to 4u) to Rational(147, 16),
-                    mapOf(y to 1u) to Rational(289, 90),
-                    mapOf(x to 1u, y to 1u) to Rational(-2692, 15),
-                    mapOf(x to 2u, y to 1u) to Rational(-1629, 140),
-                    mapOf(x to 3u, y to 1u) to Rational(77, 20),
-                    mapOf(y to 2u) to Rational(6187, 75),
-                    mapOf(x to 1u, y to 2u) to Rational(-2879, 175),
-                    mapOf(x to 2u, y to 2u) to Rational(-4919, 300),
-                    mapOf(y to 3u) to Rational(336, 25),
-                    mapOf(x to 1u, y to 3u) to Rational(-88, 25),
-                    mapOf(y to 4u) to Rational(192, 25),
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5, 6),
-                    mapOf(x to 1u) to Rational(1, 6),
-                    mapOf(x to 2u) to Rational(-2, 9),
-                    mapOf(y to 1u) to Rational(15, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
-                    mapOf(y to 2u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 9),
-                    mapOf(x to 1u) to Rational(4, 9),
-                    mapOf(x to 2u) to Rational(11, 6),
-                    mapOf(y to 1u) to Rational(-5, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
-                    mapOf(y to 2u) to Rational(9, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                x to LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(3, 2),
-                    mapOf(y to 1u) to Rational(8, 5),
-                ),
-                y to LabeledPolynomialAsIs(
-                    mapOf(x to 1u) to Rational(7, 2),
-                    mapOf(y to 1u) to Rational(-3, 1),
-                )
-            )),
-            "test 2"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1202861, 210),
-                    mapOf(x to 1u) to Rational(-215117, 45),
-                    mapOf(x to 2u) to Rational(10889651, 19845),
-                    mapOf(x to 3u) to Rational(-3503956, 6615),
-                    mapOf(x to 4u) to Rational(809066, 2205),
-                    mapOf(x to 5u) to Rational(-9056, 735),
-                    mapOf(x to 6u) to Rational(5396, 315),
-                    mapOf(x to 7u) to Rational(-752, 147),
-                    mapOf(x to 8u) to Rational(16, 49),
-                    mapOf(y to 1u) to Rational(1738469, 1470),
-                    mapOf(x to 1u, y to 1u) to Rational(-926238703, 52920),
-                    mapOf(x to 2u, y to 1u) to Rational(-44113982, 6615),
-                    mapOf(x to 3u, y to 1u) to Rational(10423519, 5292),
-                    mapOf(x to 4u, y to 1u) to Rational(3769712, 2205),
-                    mapOf(x to 5u, y to 1u) to Rational(8905046, 6615),
-                    mapOf(x to 6u, y to 1u) to Rational(1186972, 6615),
-                    mapOf(x to 7u, y to 1u) to Rational(22124, 441),
-                    mapOf(x to 8u, y to 1u) to Rational(-1504, 147),
-                    mapOf(y to 2u) to Rational(-54723628, 2205),
-                    mapOf(x to 1u, y to 2u) to Rational(70109407, 1323),
-                    mapOf(x to 2u, y to 2u) to Rational(151072591, 17640),
-                    mapOf(x to 3u, y to 2u) to Rational(1216428107, 52920),
-                    mapOf(x to 4u, y to 2u) to Rational(2587873193, 317520),
-                    mapOf(x to 5u, y to 2u) to Rational(393536369, 79380),
-                    mapOf(x to 6u, y to 2u) to Rational(137614937, 79380),
-                    mapOf(x to 7u, y to 2u) to Rational(566866, 1323),
-                    mapOf(x to 8u, y to 2u) to Rational(41848, 441),
-                    mapOf(y to 3u) to Rational(-19470406, 2205),
-                    mapOf(x to 1u, y to 3u) to Rational(72514195, 882),
-                    mapOf(x to 2u, y to 3u) to Rational(-78090707, 1764),
-                    mapOf(x to 3u, y to 3u) to Rational(-1988237707, 26460),
-                    mapOf(x to 4u, y to 3u) to Rational(-802137919, 17640),
-                    mapOf(x to 5u, y to 3u) to Rational(-139989463, 5880),
-                    mapOf(x to 6u, y to 3u) to Rational(-26066641, 3780),
-                    mapOf(x to 7u, y to 3u) to Rational(-2363369, 1323),
-                    mapOf(x to 8u, y to 3u) to Rational(-108280, 441),
-                    mapOf(y to 4u) to Rational(14878516, 441),
-                    mapOf(x to 1u, y to 4u) to Rational(-253416724, 2205),
-                    mapOf(x to 2u, y to 4u) to Rational(16699157, 840),
-                    mapOf(x to 3u, y to 4u) to Rational(-105220979, 13230),
-                    mapOf(x to 4u, y to 4u) to Rational(208266383, 5880),
-                    mapOf(x to 5u, y to 4u) to Rational(650135309, 26460),
-                    mapOf(x to 6u, y to 4u) to Rational(123808663, 11760),
-                    mapOf(x to 7u, y to 4u) to Rational(8563385, 2646),
-                    mapOf(x to 8u, y to 4u) to Rational(19721, 49),
-                    mapOf(y to 5u) to Rational(675645, 49),
-                    mapOf(x to 1u, y to 5u) to Rational(-70554077, 588),
-                    mapOf(x to 2u, y to 5u) to Rational(157884029, 980),
-                    mapOf(x to 3u, y to 5u) to Rational(489548623, 4410),
-                    mapOf(x to 4u, y to 5u) to Rational(148540519, 17640),
-                    mapOf(x to 5u, y to 5u) to Rational(-5559551, 392),
-                    mapOf(x to 6u, y to 5u) to Rational(-18335711, 1470),
-                    mapOf(x to 7u, y to 5u) to Rational(-38437, 9),
-                    mapOf(x to 8u, y to 5u) to Rational(-29620, 63),
-                    mapOf(y to 6u) to Rational(-727625, 49),
-                    mapOf(x to 1u, y to 6u) to Rational(7046685, 98),
-                    mapOf(x to 2u, y to 6u) to Rational(-334814231, 7056),
-                    mapOf(x to 3u, y to 6u) to Rational(-243971737, 17640),
-                    mapOf(x to 4u, y to 6u) to Rational(-571116659, 35280),
-                    mapOf(x to 5u, y to 6u) to Rational(567538, 315),
-                    mapOf(x to 6u, y to 6u) to Rational(3199768, 315),
-                    mapOf(x to 7u, y to 6u) to Rational(227744, 63),
-                    mapOf(x to 8u, y to 6u) to Rational(23116, 63),
-                    mapOf(y to 7u) to Rational(-27500, 7),
-                    mapOf(x to 1u, y to 7u) to Rational(120125, 3),
-                    mapOf(x to 2u, y to 7u) to Rational(-279200, 3),
-                    mapOf(x to 3u, y to 7u) to Rational(-100160, 7),
-                    mapOf(x to 4u, y to 7u) to Rational(920452, 21),
-                    mapOf(x to 5u, y to 7u) to Rational(226481, 21),
-                    mapOf(x to 6u, y to 7u) to Rational(-34428, 7),
-                    mapOf(x to 7u, y to 7u) to Rational(-6232, 3),
-                    mapOf(x to 8u, y to 7u) to Rational(-608, 3),
-                    mapOf(y to 8u) to Rational(2500, 1),
-                    mapOf(x to 1u, y to 8u) to Rational(-19000, 1),
-                    mapOf(x to 2u, y to 8u) to Rational(37900, 1),
-                    mapOf(x to 3u, y to 8u) to Rational(-1840, 1),
-                    mapOf(x to 4u, y to 8u) to Rational(-17876, 1),
-                    mapOf(x to 5u, y to 8u) to Rational(-1240, 1),
-                    mapOf(x to 6u, y to 8u) to Rational(2788, 1),
-                    mapOf(x to 7u, y to 8u) to Rational(800, 1),
-                    mapOf(x to 8u, y to 8u) to Rational(64, 1)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(162487, 63),
-                    mapOf(x to 1u) to Rational(-92713, 54),
-                    mapOf(x to 2u) to Rational(802436, 1323),
-                    mapOf(x to 3u) to Rational(-55088, 441),
-                    mapOf(x to 4u) to Rational(1404034, 9261),
-                    mapOf(x to 5u) to Rational(-5804, 1029),
-                    mapOf(x to 6u) to Rational(51556, 9261),
-                    mapOf(x to 7u) to Rational(-752, 441),
-                    mapOf(x to 8u) to Rational(16, 147),
-                    mapOf(y to 1u) to Rational(296071, 441),
-                    mapOf(x to 1u, y to 1u) to Rational(-4991281, 882),
-                    mapOf(x to 2u, y to 1u) to Rational(-18702811, 9261),
-                    mapOf(x to 3u, y to 1u) to Rational(40759043, 27783),
-                    mapOf(x to 4u, y to 1u) to Rational(19768501, 27783),
-                    mapOf(x to 5u, y to 1u) to Rational(14307337, 27783),
-                    mapOf(x to 6u, y to 1u) to Rational(1655684, 27783),
-                    mapOf(x to 7u, y to 1u) to Rational(22124, 1323),
-                    mapOf(x to 8u, y to 1u) to Rational(-1504, 441),
-                    mapOf(y to 2u) to Rational(-27667474, 3087),
-                    mapOf(x to 1u, y to 2u) to Rational(265605901, 12348),
-                    mapOf(x to 2u, y to 2u) to Rational(160360775, 98784),
-                    mapOf(x to 3u, y to 2u) to Rational(1169992093, 148176),
-                    mapOf(x to 4u, y to 2u) to Rational(3978014077, 1333584),
-                    mapOf(x to 5u, y to 2u) to Rational(567058123, 333396),
-                    mapOf(x to 6u, y to 2u) to Rational(205132579, 333396),
-                    mapOf(x to 7u, y to 2u) to Rational(566866, 3969),
-                    mapOf(x to 8u, y to 2u) to Rational(41848, 1323),
-                    mapOf(y to 3u) to Rational(-2228822, 1029),
-                    mapOf(x to 1u, y to 3u) to Rational(80179390, 3087),
-                    mapOf(x to 2u, y to 3u) to Rational(-1378630487, 74088),
-                    mapOf(x to 3u, y to 3u) to Rational(-3385811693, 111132),
-                    mapOf(x to 4u, y to 3u) to Rational(-820686977, 49392),
-                    mapOf(x to 5u, y to 3u) to Rational(-89101027, 10584),
-                    mapOf(x to 6u, y to 3u) to Rational(-37847387, 15876),
-                    mapOf(x to 7u, y to 3u) to Rational(-2363369, 3969),
-                    mapOf(x to 8u, y to 3u) to Rational(-108280, 1323),
-                    mapOf(y to 4u) to Rational(12619982, 1029),
-                    mapOf(x to 1u, y to 4u) to Rational(-277723177, 6174),
-                    mapOf(x to 2u, y to 4u) to Rational(649414169, 49392),
-                    mapOf(x to 3u, y to 4u) to Rational(14457595, 63504),
-                    mapOf(x to 4u, y to 4u) to Rational(139270339, 10584),
-                    mapOf(x to 5u, y to 4u) to Rational(140367961, 15876),
-                    mapOf(x to 6u, y to 4u) to Rational(25467083, 7056),
-                    mapOf(x to 7u, y to 4u) to Rational(8563385, 7938),
-                    mapOf(x to 8u, y to 4u) to Rational(19721, 147),
-                    mapOf(y to 5u) to Rational(643850, 147),
-                    mapOf(x to 1u, y to 5u) to Rational(-11818025, 294),
-                    mapOf(x to 2u, y to 5u) to Rational(33963203, 588),
-                    mapOf(x to 3u, y to 5u) to Rational(207216235, 5292),
-                    mapOf(x to 4u, y to 5u) to Rational(2861021, 1512),
-                    mapOf(x to 5u, y to 5u) to Rational(-6302335, 1176),
-                    mapOf(x to 6u, y to 5u) to Rational(-3738587, 882),
-                    mapOf(x to 7u, y to 5u) to Rational(-38437, 27),
-                    mapOf(x to 8u, y to 5u) to Rational(-29620, 189),
-                    mapOf(y to 6u) to Rational(-248725, 49),
-                    mapOf(x to 1u, y to 6u) to Rational(2478535, 98),
-                    mapOf(x to 2u, y to 6u) to Rational(-399721367, 21168),
-                    mapOf(x to 3u, y to 6u) to Rational(-54309317, 10584),
-                    mapOf(x to 4u, y to 6u) to Rational(-95398327, 21168),
-                    mapOf(x to 5u, y to 6u) to Rational(173750, 189),
-                    mapOf(x to 6u, y to 6u) to Rational(92216, 27),
-                    mapOf(x to 7u, y to 6u) to Rational(227744, 189),
-                    mapOf(x to 8u, y to 6u) to Rational(23116, 189),
-                    mapOf(y to 7u) to Rational(-27500, 21),
-                    mapOf(x to 1u, y to 7u) to Rational(120125, 9),
-                    mapOf(x to 2u, y to 7u) to Rational(-279200, 9),
-                    mapOf(x to 3u, y to 7u) to Rational(-100160, 21),
-                    mapOf(x to 4u, y to 7u) to Rational(920452, 63),
-                    mapOf(x to 5u, y to 7u) to Rational(226481, 63),
-                    mapOf(x to 6u, y to 7u) to Rational(-11476, 7),
-                    mapOf(x to 7u, y to 7u) to Rational(-6232, 9),
-                    mapOf(x to 8u, y to 7u) to Rational(-608, 9),
-                    mapOf(y to 8u) to Rational(2500, 3),
-                    mapOf(x to 1u, y to 8u) to Rational(-19000, 3),
-                    mapOf(x to 2u, y to 8u) to Rational(37900, 3),
-                    mapOf(x to 3u, y to 8u) to Rational(-1840, 3),
-                    mapOf(x to 4u, y to 8u) to Rational(-17876, 3),
-                    mapOf(x to 5u, y to 8u) to Rational(-1240, 3),
-                    mapOf(x to 6u, y to 8u) to Rational(2788, 3),
-                    mapOf(x to 7u, y to 8u) to Rational(800, 3),
-                    mapOf(x to 8u, y to 8u) to Rational(64, 3)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5, 6),
-                    mapOf(x to 1u) to Rational(1, 6),
-                    mapOf(x to 2u) to Rational(-2, 9),
-                    mapOf(y to 1u) to Rational(15, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
-                    mapOf(y to 2u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 9),
-                    mapOf(x to 1u) to Rational(4, 9),
-                    mapOf(x to 2u) to Rational(11, 6),
-                    mapOf(y to 1u) to Rational(-5, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
-                    mapOf(y to 2u) to Rational(9, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                x to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(18, 1),
-                    mapOf(x to 1u) to Rational(16, 3),
-                    mapOf(x to 2u) to Rational(12, 6),
-                    mapOf(y to 1u) to Rational(13, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(-11, 4),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 1),
-                    mapOf(y to 2u) to Rational(-10, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(2, 1),
-                ),
-                y to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(8, 2),
-                    mapOf(x to 1u) to Rational(-15, 5),
-                    mapOf(x to 2u) to Rational(2, 7),
-                    mapOf(y to 1u) to Rational(-18, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-13, 3),
-                    mapOf(y to 2u) to Rational(-5, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(8, 2),
-                ),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1202861, 210),
-                    mapOf(x to 1u) to Rational(-215117, 45),
-                    mapOf(x to 2u) to Rational(10889651, 19845),
-                    mapOf(x to 3u) to Rational(-3503956, 6615),
-                    mapOf(x to 4u) to Rational(809066, 2205),
-                    mapOf(x to 5u) to Rational(-9056, 735),
-                    mapOf(x to 6u) to Rational(5396, 315),
-                    mapOf(x to 7u) to Rational(-752, 147),
-                    mapOf(x to 8u) to Rational(16, 49),
-                    mapOf(y to 1u) to Rational(1738469, 1470),
-                    mapOf(x to 1u, y to 1u) to Rational(-926238703, 52920),
-                    mapOf(x to 2u, y to 1u) to Rational(-44113982, 6615),
-                    mapOf(x to 3u, y to 1u) to Rational(10423519, 5292),
-                    mapOf(x to 4u, y to 1u) to Rational(3769712, 2205),
-                    mapOf(x to 5u, y to 1u) to Rational(8905046, 6615),
-                    mapOf(x to 6u, y to 1u) to Rational(1186972, 6615),
-                    mapOf(x to 7u, y to 1u) to Rational(22124, 441),
-                    mapOf(x to 8u, y to 1u) to Rational(-1504, 147),
-                    mapOf(y to 2u) to Rational(-54723628, 2205),
-                    mapOf(x to 1u, y to 2u) to Rational(70109407, 1323),
-                    mapOf(x to 2u, y to 2u) to Rational(151072591, 17640),
-                    mapOf(x to 3u, y to 2u) to Rational(1216428107, 52920),
-                    mapOf(x to 4u, y to 2u) to Rational(2587873193, 317520),
-                    mapOf(x to 5u, y to 2u) to Rational(393536369, 79380),
-                    mapOf(x to 6u, y to 2u) to Rational(137614937, 79380),
-                    mapOf(x to 7u, y to 2u) to Rational(566866, 1323),
-                    mapOf(x to 8u, y to 2u) to Rational(41848, 441),
-                    mapOf(y to 3u) to Rational(-19470406, 2205),
-                    mapOf(x to 1u, y to 3u) to Rational(72514195, 882),
-                    mapOf(x to 2u, y to 3u) to Rational(-78090707, 1764),
-                    mapOf(x to 3u, y to 3u) to Rational(-1988237707, 26460),
-                    mapOf(x to 4u, y to 3u) to Rational(-802137919, 17640),
-                    mapOf(x to 5u, y to 3u) to Rational(-139989463, 5880),
-                    mapOf(x to 6u, y to 3u) to Rational(-26066641, 3780),
-                    mapOf(x to 7u, y to 3u) to Rational(-2363369, 1323),
-                    mapOf(x to 8u, y to 3u) to Rational(-108280, 441),
-                    mapOf(y to 4u) to Rational(14878516, 441),
-                    mapOf(x to 1u, y to 4u) to Rational(-253416724, 2205),
-                    mapOf(x to 2u, y to 4u) to Rational(16699157, 840),
-                    mapOf(x to 3u, y to 4u) to Rational(-105220979, 13230),
-                    mapOf(x to 4u, y to 4u) to Rational(208266383, 5880),
-                    mapOf(x to 5u, y to 4u) to Rational(650135309, 26460),
-                    mapOf(x to 6u, y to 4u) to Rational(123808663, 11760),
-                    mapOf(x to 7u, y to 4u) to Rational(8563385, 2646),
-                    mapOf(x to 8u, y to 4u) to Rational(19721, 49),
-                    mapOf(y to 5u) to Rational(675645, 49),
-                    mapOf(x to 1u, y to 5u) to Rational(-70554077, 588),
-                    mapOf(x to 2u, y to 5u) to Rational(157884029, 980),
-                    mapOf(x to 3u, y to 5u) to Rational(489548623, 4410),
-                    mapOf(x to 4u, y to 5u) to Rational(148540519, 17640),
-                    mapOf(x to 5u, y to 5u) to Rational(-5559551, 392),
-                    mapOf(x to 6u, y to 5u) to Rational(-18335711, 1470),
-                    mapOf(x to 7u, y to 5u) to Rational(-38437, 9),
-                    mapOf(x to 8u, y to 5u) to Rational(-29620, 63),
-                    mapOf(y to 6u) to Rational(-727625, 49),
-                    mapOf(x to 1u, y to 6u) to Rational(7046685, 98),
-                    mapOf(x to 2u, y to 6u) to Rational(-334814231, 7056),
-                    mapOf(x to 3u, y to 6u) to Rational(-243971737, 17640),
-                    mapOf(x to 4u, y to 6u) to Rational(-571116659, 35280),
-                    mapOf(x to 5u, y to 6u) to Rational(567538, 315),
-                    mapOf(x to 6u, y to 6u) to Rational(3199768, 315),
-                    mapOf(x to 7u, y to 6u) to Rational(227744, 63),
-                    mapOf(x to 8u, y to 6u) to Rational(23116, 63),
-                    mapOf(y to 7u) to Rational(-27500, 7),
-                    mapOf(x to 1u, y to 7u) to Rational(120125, 3),
-                    mapOf(x to 2u, y to 7u) to Rational(-279200, 3),
-                    mapOf(x to 3u, y to 7u) to Rational(-100160, 7),
-                    mapOf(x to 4u, y to 7u) to Rational(920452, 21),
-                    mapOf(x to 5u, y to 7u) to Rational(226481, 21),
-                    mapOf(x to 6u, y to 7u) to Rational(-34428, 7),
-                    mapOf(x to 7u, y to 7u) to Rational(-6232, 3),
-                    mapOf(x to 8u, y to 7u) to Rational(-608, 3),
-                    mapOf(y to 8u) to Rational(2500, 1),
-                    mapOf(x to 1u, y to 8u) to Rational(-19000, 1),
-                    mapOf(x to 2u, y to 8u) to Rational(37900, 1),
-                    mapOf(x to 3u, y to 8u) to Rational(-1840, 1),
-                    mapOf(x to 4u, y to 8u) to Rational(-17876, 1),
-                    mapOf(x to 5u, y to 8u) to Rational(-1240, 1),
-                    mapOf(x to 6u, y to 8u) to Rational(2788, 1),
-                    mapOf(x to 7u, y to 8u) to Rational(800, 1),
-                    mapOf(x to 8u, y to 8u) to Rational(64, 1)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(162487, 63),
-                    mapOf(x to 1u) to Rational(-92713, 54),
-                    mapOf(x to 2u) to Rational(802436, 1323),
-                    mapOf(x to 3u) to Rational(-55088, 441),
-                    mapOf(x to 4u) to Rational(1404034, 9261),
-                    mapOf(x to 5u) to Rational(-5804, 1029),
-                    mapOf(x to 6u) to Rational(51556, 9261),
-                    mapOf(x to 7u) to Rational(-752, 441),
-                    mapOf(x to 8u) to Rational(16, 147),
-                    mapOf(y to 1u) to Rational(296071, 441),
-                    mapOf(x to 1u, y to 1u) to Rational(-4991281, 882),
-                    mapOf(x to 2u, y to 1u) to Rational(-18702811, 9261),
-                    mapOf(x to 3u, y to 1u) to Rational(40759043, 27783),
-                    mapOf(x to 4u, y to 1u) to Rational(19768501, 27783),
-                    mapOf(x to 5u, y to 1u) to Rational(14307337, 27783),
-                    mapOf(x to 6u, y to 1u) to Rational(1655684, 27783),
-                    mapOf(x to 7u, y to 1u) to Rational(22124, 1323),
-                    mapOf(x to 8u, y to 1u) to Rational(-1504, 441),
-                    mapOf(y to 2u) to Rational(-27667474, 3087),
-                    mapOf(x to 1u, y to 2u) to Rational(265605901, 12348),
-                    mapOf(x to 2u, y to 2u) to Rational(160360775, 98784),
-                    mapOf(x to 3u, y to 2u) to Rational(1169992093, 148176),
-                    mapOf(x to 4u, y to 2u) to Rational(3978014077, 1333584),
-                    mapOf(x to 5u, y to 2u) to Rational(567058123, 333396),
-                    mapOf(x to 6u, y to 2u) to Rational(205132579, 333396),
-                    mapOf(x to 7u, y to 2u) to Rational(566866, 3969),
-                    mapOf(x to 8u, y to 2u) to Rational(41848, 1323),
-                    mapOf(y to 3u) to Rational(-2228822, 1029),
-                    mapOf(x to 1u, y to 3u) to Rational(80179390, 3087),
-                    mapOf(x to 2u, y to 3u) to Rational(-1378630487, 74088),
-                    mapOf(x to 3u, y to 3u) to Rational(-3385811693, 111132),
-                    mapOf(x to 4u, y to 3u) to Rational(-820686977, 49392),
-                    mapOf(x to 5u, y to 3u) to Rational(-89101027, 10584),
-                    mapOf(x to 6u, y to 3u) to Rational(-37847387, 15876),
-                    mapOf(x to 7u, y to 3u) to Rational(-2363369, 3969),
-                    mapOf(x to 8u, y to 3u) to Rational(-108280, 1323),
-                    mapOf(y to 4u) to Rational(12619982, 1029),
-                    mapOf(x to 1u, y to 4u) to Rational(-277723177, 6174),
-                    mapOf(x to 2u, y to 4u) to Rational(649414169, 49392),
-                    mapOf(x to 3u, y to 4u) to Rational(14457595, 63504),
-                    mapOf(x to 4u, y to 4u) to Rational(139270339, 10584),
-                    mapOf(x to 5u, y to 4u) to Rational(140367961, 15876),
-                    mapOf(x to 6u, y to 4u) to Rational(25467083, 7056),
-                    mapOf(x to 7u, y to 4u) to Rational(8563385, 7938),
-                    mapOf(x to 8u, y to 4u) to Rational(19721, 147),
-                    mapOf(y to 5u) to Rational(643850, 147),
-                    mapOf(x to 1u, y to 5u) to Rational(-11818025, 294),
-                    mapOf(x to 2u, y to 5u) to Rational(33963203, 588),
-                    mapOf(x to 3u, y to 5u) to Rational(207216235, 5292),
-                    mapOf(x to 4u, y to 5u) to Rational(2861021, 1512),
-                    mapOf(x to 5u, y to 5u) to Rational(-6302335, 1176),
-                    mapOf(x to 6u, y to 5u) to Rational(-3738587, 882),
-                    mapOf(x to 7u, y to 5u) to Rational(-38437, 27),
-                    mapOf(x to 8u, y to 5u) to Rational(-29620, 189),
-                    mapOf(y to 6u) to Rational(-248725, 49),
-                    mapOf(x to 1u, y to 6u) to Rational(2478535, 98),
-                    mapOf(x to 2u, y to 6u) to Rational(-399721367, 21168),
-                    mapOf(x to 3u, y to 6u) to Rational(-54309317, 10584),
-                    mapOf(x to 4u, y to 6u) to Rational(-95398327, 21168),
-                    mapOf(x to 5u, y to 6u) to Rational(173750, 189),
-                    mapOf(x to 6u, y to 6u) to Rational(92216, 27),
-                    mapOf(x to 7u, y to 6u) to Rational(227744, 189),
-                    mapOf(x to 8u, y to 6u) to Rational(23116, 189),
-                    mapOf(y to 7u) to Rational(-27500, 21),
-                    mapOf(x to 1u, y to 7u) to Rational(120125, 9),
-                    mapOf(x to 2u, y to 7u) to Rational(-279200, 9),
-                    mapOf(x to 3u, y to 7u) to Rational(-100160, 21),
-                    mapOf(x to 4u, y to 7u) to Rational(920452, 63),
-                    mapOf(x to 5u, y to 7u) to Rational(226481, 63),
-                    mapOf(x to 6u, y to 7u) to Rational(-11476, 7),
-                    mapOf(x to 7u, y to 7u) to Rational(-6232, 9),
-                    mapOf(x to 8u, y to 7u) to Rational(-608, 9),
-                    mapOf(y to 8u) to Rational(2500, 3),
-                    mapOf(x to 1u, y to 8u) to Rational(-19000, 3),
-                    mapOf(x to 2u, y to 8u) to Rational(37900, 3),
-                    mapOf(x to 3u, y to 8u) to Rational(-1840, 3),
-                    mapOf(x to 4u, y to 8u) to Rational(-17876, 3),
-                    mapOf(x to 5u, y to 8u) to Rational(-1240, 3),
-                    mapOf(x to 6u, y to 8u) to Rational(2788, 3),
-                    mapOf(x to 7u, y to 8u) to Rational(800, 3),
-                    mapOf(x to 8u, y to 8u) to Rational(64, 3)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5, 6),
-                    mapOf(x to 1u) to Rational(1, 6),
-                    mapOf(x to 2u) to Rational(-2, 9),
-                    mapOf(y to 1u) to Rational(15, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
-                    mapOf(y to 2u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 9),
-                    mapOf(x to 1u) to Rational(4, 9),
-                    mapOf(x to 2u) to Rational(11, 6),
-                    mapOf(y to 1u) to Rational(-5, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
-                    mapOf(y to 2u) to Rational(9, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                x to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(18, 1),
-                    mapOf(x to 1u) to Rational(16, 3),
-                    mapOf(x to 2u) to Rational(12, 6),
-                    mapOf(y to 1u) to Rational(13, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(-11, 4),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 1),
-                    mapOf(y to 2u) to Rational(-10, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(2, 1),
-                ),
-                y to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(8, 2),
-                    mapOf(x to 1u) to Rational(-15, 5),
-                    mapOf(x to 2u) to Rational(2, 7),
-                    mapOf(y to 1u) to Rational(-18, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-13, 3),
-                    mapOf(y to 2u) to Rational(-5, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(8, 2),
-                ),
-                iota to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-6, 1),
-                    mapOf(x to 1u) to Rational(-9, 8),
-                    mapOf(x to 2u) to Rational(17, 5),
-                    mapOf(y to 1u) to Rational(-2, 3),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(-11, 7),
-                    mapOf(y to 2u) to Rational(13, 6),
-                    mapOf(x to 1u, y to 2u) to Rational(-15, 2),
-                    mapOf(x to 2u, y to 2u) to Rational(-14, 4),
-                )
-            )),
-            "test 3'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(493, 6),
-                    mapOf(x to 1u) to Rational(-15991, 210),
-                    mapOf(x to 2u) to Rational(2734, 63),
-                    mapOf(x to 3u) to Rational(-8213, 245),
-                    mapOf(x to 4u) to Rational(1843, 147),
-                    mapOf(x to 5u) to Rational(-432, 245),
-                    mapOf(x to 6u) to Rational(4, 49),
-                    mapOf(y to 1u) to Rational(-66, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(-92924, 2205),
-                    mapOf(x to 2u, y to 1u) to Rational(-257461, 2205),
-                    mapOf(x to 3u, y to 1u) to Rational(58658, 2205),
-                    mapOf(x to 4u, y to 1u) to Rational(-87884, 2205),
-                    mapOf(x to 5u, y to 1u) to Rational(2726, 105),
-                    mapOf(x to 6u, y to 1u) to Rational(-52, 21),
-                    mapOf(y to 2u) to Rational(-17569, 147),
-                    mapOf(x to 1u, y to 2u) to Rational(368819, 735),
-                    mapOf(x to 2u, y to 2u) to Rational(-644626, 6615),
-                    mapOf(x to 3u, y to 2u) to Rational(221738, 945),
-                    mapOf(x to 4u, y to 2u) to Rational(-18022, 945),
-                    mapOf(x to 5u, y to 2u) to Rational(-1201, 315),
-                    mapOf(x to 6u, y to 2u) to Rational(1327, 63),
-                    mapOf(y to 3u) to Rational(240, 7),
-                    mapOf(x to 1u, y to 3u) to Rational(-868, 9),
-                    mapOf(x to 2u, y to 3u) to Rational(-8936, 315),
-                    mapOf(x to 3u, y to 3u) to Rational(-77146, 315),
-                    mapOf(x to 4u, y to 3u) to Rational(-4072, 315),
-                    mapOf(x to 5u, y to 3u) to Rational(-2218, 15),
-                    mapOf(x to 6u, y to 3u) to Rational(-104, 3),
-                    mapOf(y to 4u) to Rational(100, 3),
-                    mapOf(x to 1u, y to 4u) to Rational(-725, 3),
-                    mapOf(x to 2u, y to 4u) to Rational(459, 1),
-                    mapOf(x to 3u, y to 4u) to Rational(-2071, 15),
-                    mapOf(x to 4u, y to 4u) to Rational(2831, 15),
-                    mapOf(x to 5u, y to 4u) to Rational(632, 5),
-                    mapOf(x to 6u, y to 4u) to Rational(16, 1)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1255, 9),
-                    mapOf(x to 1u) to Rational(-24781, 126),
-                    mapOf(x to 2u) to Rational(1195, 14),
-                    mapOf(x to 3u) to Rational(-1931, 147),
-                    mapOf(x to 4u) to Rational(439, 147),
-                    mapOf(x to 5u) to Rational(-172, 343),
-                    mapOf(x to 6u) to Rational(4, 147),
-                    mapOf(y to 1u) to Rational(-183, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(-30988, 441),
-                    mapOf(x to 2u, y to 1u) to Rational(-56137, 294),
-                    mapOf(x to 3u, y to 1u) to Rational(204308, 1029),
-                    mapOf(x to 4u, y to 1u) to Rational(-3263, 441),
-                    mapOf(x to 5u, y to 1u) to Rational(2662, 441),
-                    mapOf(x to 6u, y to 1u) to Rational(-52, 63),
-                    mapOf(y to 2u) to Rational(-87119, 294),
-                    mapOf(x to 1u, y to 2u) to Rational(1077919, 686),
-                    mapOf(x to 2u, y to 2u) to Rational(-35209, 147),
-                    mapOf(x to 3u, y to 2u) to Rational(15041, 147),
-                    mapOf(x to 4u, y to 2u) to Rational(240889, 1323),
-                    mapOf(x to 5u, y to 2u) to Rational(27778, 1323),
-                    mapOf(x to 6u, y to 2u) to Rational(1327, 189),
-                    mapOf(y to 3u) to Rational(1620, 7),
-                    mapOf(x to 1u, y to 3u) to Rational(-25716, 49),
-                    mapOf(x to 2u, y to 3u) to Rational(-32078, 49),
-                    mapOf(x to 3u, y to 3u) to Rational(-704038, 441),
-                    mapOf(x to 4u, y to 3u) to Rational(-30190, 63),
-                    mapOf(x to 5u, y to 3u) to Rational(-5414, 63),
-                    mapOf(x to 6u, y to 3u) to Rational(-104, 9),
-                    mapOf(y to 4u) to Rational(225, 1),
-                    mapOf(x to 1u, y to 4u) to Rational(-10560, 7),
-                    mapOf(x to 2u, y to 4u) to Rational(44176, 21),
-                    mapOf(x to 3u, y to 4u) to Rational(28996, 21),
-                    mapOf(x to 4u, y to 4u) to Rational(2405, 7),
-                    mapOf(x to 5u, y to 4u) to Rational(1240, 21),
-                    mapOf(x to 6u, y to 4u) to Rational(16, 3)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5, 6),
-                    mapOf(x to 1u) to Rational(1, 6),
-                    mapOf(x to 2u) to Rational(-2, 9),
-                    mapOf(y to 1u) to Rational(15, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
-                    mapOf(y to 2u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 9),
-                    mapOf(x to 1u) to Rational(4, 9),
-                    mapOf(x to 2u) to Rational(11, 6),
-                    mapOf(y to 1u) to Rational(-5, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
-                    mapOf(y to 2u) to Rational(9, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                y to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(8, 2),
-                    mapOf(x to 1u) to Rational(-15, 5),
-                    mapOf(x to 2u) to Rational(2, 7),
-                    mapOf(y to 1u) to Rational(-18, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-13, 3),
-                    mapOf(y to 2u) to Rational(-5, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(8, 2),
-                ),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(493, 6),
-                    mapOf(x to 1u) to Rational(-15991, 210),
-                    mapOf(x to 2u) to Rational(2734, 63),
-                    mapOf(x to 3u) to Rational(-8213, 245),
-                    mapOf(x to 4u) to Rational(1843, 147),
-                    mapOf(x to 5u) to Rational(-432, 245),
-                    mapOf(x to 6u) to Rational(4, 49),
-                    mapOf(y to 1u) to Rational(-66, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(-92924, 2205),
-                    mapOf(x to 2u, y to 1u) to Rational(-257461, 2205),
-                    mapOf(x to 3u, y to 1u) to Rational(58658, 2205),
-                    mapOf(x to 4u, y to 1u) to Rational(-87884, 2205),
-                    mapOf(x to 5u, y to 1u) to Rational(2726, 105),
-                    mapOf(x to 6u, y to 1u) to Rational(-52, 21),
-                    mapOf(y to 2u) to Rational(-17569, 147),
-                    mapOf(x to 1u, y to 2u) to Rational(368819, 735),
-                    mapOf(x to 2u, y to 2u) to Rational(-644626, 6615),
-                    mapOf(x to 3u, y to 2u) to Rational(221738, 945),
-                    mapOf(x to 4u, y to 2u) to Rational(-18022, 945),
-                    mapOf(x to 5u, y to 2u) to Rational(-1201, 315),
-                    mapOf(x to 6u, y to 2u) to Rational(1327, 63),
-                    mapOf(y to 3u) to Rational(240, 7),
-                    mapOf(x to 1u, y to 3u) to Rational(-868, 9),
-                    mapOf(x to 2u, y to 3u) to Rational(-8936, 315),
-                    mapOf(x to 3u, y to 3u) to Rational(-77146, 315),
-                    mapOf(x to 4u, y to 3u) to Rational(-4072, 315),
-                    mapOf(x to 5u, y to 3u) to Rational(-2218, 15),
-                    mapOf(x to 6u, y to 3u) to Rational(-104, 3),
-                    mapOf(y to 4u) to Rational(100, 3),
-                    mapOf(x to 1u, y to 4u) to Rational(-725, 3),
-                    mapOf(x to 2u, y to 4u) to Rational(459, 1),
-                    mapOf(x to 3u, y to 4u) to Rational(-2071, 15),
-                    mapOf(x to 4u, y to 4u) to Rational(2831, 15),
-                    mapOf(x to 5u, y to 4u) to Rational(632, 5),
-                    mapOf(x to 6u, y to 4u) to Rational(16, 1)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1255, 9),
-                    mapOf(x to 1u) to Rational(-24781, 126),
-                    mapOf(x to 2u) to Rational(1195, 14),
-                    mapOf(x to 3u) to Rational(-1931, 147),
-                    mapOf(x to 4u) to Rational(439, 147),
-                    mapOf(x to 5u) to Rational(-172, 343),
-                    mapOf(x to 6u) to Rational(4, 147),
-                    mapOf(y to 1u) to Rational(-183, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(-30988, 441),
-                    mapOf(x to 2u, y to 1u) to Rational(-56137, 294),
-                    mapOf(x to 3u, y to 1u) to Rational(204308, 1029),
-                    mapOf(x to 4u, y to 1u) to Rational(-3263, 441),
-                    mapOf(x to 5u, y to 1u) to Rational(2662, 441),
-                    mapOf(x to 6u, y to 1u) to Rational(-52, 63),
-                    mapOf(y to 2u) to Rational(-87119, 294),
-                    mapOf(x to 1u, y to 2u) to Rational(1077919, 686),
-                    mapOf(x to 2u, y to 2u) to Rational(-35209, 147),
-                    mapOf(x to 3u, y to 2u) to Rational(15041, 147),
-                    mapOf(x to 4u, y to 2u) to Rational(240889, 1323),
-                    mapOf(x to 5u, y to 2u) to Rational(27778, 1323),
-                    mapOf(x to 6u, y to 2u) to Rational(1327, 189),
-                    mapOf(y to 3u) to Rational(1620, 7),
-                    mapOf(x to 1u, y to 3u) to Rational(-25716, 49),
-                    mapOf(x to 2u, y to 3u) to Rational(-32078, 49),
-                    mapOf(x to 3u, y to 3u) to Rational(-704038, 441),
-                    mapOf(x to 4u, y to 3u) to Rational(-30190, 63),
-                    mapOf(x to 5u, y to 3u) to Rational(-5414, 63),
-                    mapOf(x to 6u, y to 3u) to Rational(-104, 9),
-                    mapOf(y to 4u) to Rational(225, 1),
-                    mapOf(x to 1u, y to 4u) to Rational(-10560, 7),
-                    mapOf(x to 2u, y to 4u) to Rational(44176, 21),
-                    mapOf(x to 3u, y to 4u) to Rational(28996, 21),
-                    mapOf(x to 4u, y to 4u) to Rational(2405, 7),
-                    mapOf(x to 5u, y to 4u) to Rational(1240, 21),
-                    mapOf(x to 6u, y to 4u) to Rational(16, 3)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5, 6),
-                    mapOf(x to 1u) to Rational(1, 6),
-                    mapOf(x to 2u) to Rational(-2, 9),
-                    mapOf(y to 1u) to Rational(15, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
-                    mapOf(y to 2u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 9),
-                    mapOf(x to 1u) to Rational(4, 9),
-                    mapOf(x to 2u) to Rational(11, 6),
-                    mapOf(y to 1u) to Rational(-5, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
-                    mapOf(y to 2u) to Rational(9, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                y to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(8, 2),
-                    mapOf(x to 1u) to Rational(-15, 5),
-                    mapOf(x to 2u) to Rational(2, 7),
-                    mapOf(y to 1u) to Rational(-18, 7),
-                    mapOf(x to 1u, y to 1u) to Rational(-16, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-13, 3),
-                    mapOf(y to 2u) to Rational(-5, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(8, 2),
-                ),
-                iota to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-6, 1),
-                    mapOf(x to 1u) to Rational(-9, 8),
-                    mapOf(x to 2u) to Rational(17, 5),
-                    mapOf(y to 1u) to Rational(-2, 3),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(-11, 7),
-                    mapOf(y to 2u) to Rational(13, 6),
-                    mapOf(x to 1u, y to 2u) to Rational(-15, 2),
-                    mapOf(x to 2u, y to 2u) to Rational(-14, 4),
-                )
-            )),
-            "test 4'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-409, 6),
-                    mapOf(x to 1u) to Rational(-376, 9),
-                    mapOf(x to 2u) to Rational(-1781, 81),
-                    mapOf(x to 3u) to Rational(-128, 27),
-                    mapOf(x to 4u) to Rational(-8, 9),
-                    mapOf(y to 1u) to Rational(18701, 210),
-                    mapOf(x to 1u, y to 1u) to Rational(614183, 7560),
-                    mapOf(x to 2u, y to 1u) to Rational(90941, 1890),
-                    mapOf(x to 3u, y to 1u) to Rational(1802, 135),
-                    mapOf(x to 4u, y to 1u) to Rational(112, 45),
-                    mapOf(y to 2u) to Rational(181421, 315),
-                    mapOf(x to 1u, y to 2u) to Rational(77813, 378),
-                    mapOf(x to 2u, y to 2u) to Rational(598583, 7560),
-                    mapOf(x to 3u, y to 2u) to Rational(85, 27),
-                    mapOf(x to 4u, y to 2u) to Rational(2, 5),
-                    mapOf(y to 3u) to Rational(130997, 315),
-                    mapOf(x to 1u, y to 3u) to Rational(1093, 420),
-                    mapOf(x to 2u, y to 3u) to Rational(9551, 2520),
-                    mapOf(x to 3u, y to 3u) to Rational(-14, 45),
-                    mapOf(x to 4u, y to 3u) to Rational(22, 45),
-                    mapOf(y to 4u) to Rational(-2801, 9),
-                    mapOf(x to 1u, y to 4u) to Rational(4033, 90),
-                    mapOf(x to 2u, y to 4u) to Rational(6429, 80),
-                    mapOf(x to 3u, y to 4u) to Rational(2851, 90),
-                    mapOf(x to 4u, y to 4u) to Rational(293, 45),
-                    mapOf(y to 5u) to Rational(-220, 1),
-                    mapOf(x to 1u, y to 5u) to Rational(127, 1),
-                    mapOf(x to 2u, y to 5u) to Rational(202, 5),
-                    mapOf(x to 3u, y to 5u) to Rational(-63, 5),
-                    mapOf(x to 4u, y to 5u) to Rational(-12, 5),
-                    mapOf(y to 6u) to Rational(100, 1),
-                    mapOf(x to 1u, y to 6u) to Rational(-80, 1),
-                    mapOf(x to 2u, y to 6u) to Rational(-24, 1),
-                    mapOf(x to 3u, y to 6u) to Rational(16, 1),
-                    mapOf(x to 4u, y to 6u) to Rational(4, 1)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5407, 9),
-                    mapOf(x to 1u) to Rational(9568, 27),
-                    mapOf(x to 2u) to Rational(4996, 27),
-                    mapOf(x to 3u) to Rational(352, 9),
-                    mapOf(x to 4u) to Rational(22, 3),
-                    mapOf(y to 1u) to Rational(104411, 126),
-                    mapOf(x to 1u, y to 1u) to Rational(6001, 126),
-                    mapOf(x to 2u, y to 1u) to Rational(-796, 21),
-                    mapOf(x to 3u, y to 1u) to Rational(-5389, 126),
-                    mapOf(x to 4u, y to 1u) to Rational(-166, 21),
-                    mapOf(y to 2u) to Rational(-35327, 126),
-                    mapOf(x to 1u, y to 2u) to Rational(53, 252),
-                    mapOf(x to 2u, y to 2u) to Rational(849197, 6048),
-                    mapOf(x to 3u, y to 2u) to Rational(22361, 252),
-                    mapOf(x to 4u, y to 2u) to Rational(773, 42),
-                    mapOf(y to 3u) to Rational(-6067, 21),
-                    mapOf(x to 1u, y to 3u) to Rational(39049, 126),
-                    mapOf(x to 2u, y to 3u) to Rational(80303, 1008),
-                    mapOf(x to 3u, y to 3u) to Rational(-3035, 63),
-                    mapOf(x to 4u, y to 3u) to Rational(-209, 21),
-                    mapOf(y to 4u) to Rational(3113, 21),
-                    mapOf(x to 1u, y to 4u) to Rational(-22345, 126),
-                    mapOf(x to 2u, y to 4u) to Rational(-30931, 1008),
-                    mapOf(x to 3u, y to 4u) to Rational(5837, 126),
-                    mapOf(x to 4u, y to 4u) to Rational(229, 21),
-                    mapOf(y to 5u) to Rational(-2120, 21),
-                    mapOf(x to 1u, y to 5u) to Rational(451, 7),
-                    mapOf(x to 2u, y to 5u) to Rational(422, 21),
-                    mapOf(x to 3u, y to 5u) to Rational(-181, 21),
-                    mapOf(x to 4u, y to 5u) to Rational(-40, 21),
-                    mapOf(y to 6u) to Rational(100, 3),
-                    mapOf(x to 1u, y to 6u) to Rational(-80, 3),
-                    mapOf(x to 2u, y to 6u) to Rational(-8, 1),
-                    mapOf(x to 3u, y to 6u) to Rational(16, 3),
-                    mapOf(x to 4u, y to 6u) to Rational(4, 3)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5, 6),
-                    mapOf(x to 1u) to Rational(1, 6),
-                    mapOf(x to 2u) to Rational(-2, 9),
-                    mapOf(y to 1u) to Rational(15, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
-                    mapOf(y to 2u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 9),
-                    mapOf(x to 1u) to Rational(4, 9),
-                    mapOf(x to 2u) to Rational(11, 6),
-                    mapOf(y to 1u) to Rational(-5, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
-                    mapOf(y to 2u) to Rational(9, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                x to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(18, 1),
-                    mapOf(x to 1u) to Rational(16, 3),
-                    mapOf(x to 2u) to Rational(12, 6),
-                    mapOf(y to 1u) to Rational(13, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(-11, 4),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 1),
-                    mapOf(y to 2u) to Rational(-10, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(2, 1),
-                ),
-            )),
-            "test 5"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-409, 6),
-                    mapOf(x to 1u) to Rational(-376, 9),
-                    mapOf(x to 2u) to Rational(-1781, 81),
-                    mapOf(x to 3u) to Rational(-128, 27),
-                    mapOf(x to 4u) to Rational(-8, 9),
-                    mapOf(y to 1u) to Rational(18701, 210),
-                    mapOf(x to 1u, y to 1u) to Rational(614183, 7560),
-                    mapOf(x to 2u, y to 1u) to Rational(90941, 1890),
-                    mapOf(x to 3u, y to 1u) to Rational(1802, 135),
-                    mapOf(x to 4u, y to 1u) to Rational(112, 45),
-                    mapOf(y to 2u) to Rational(181421, 315),
-                    mapOf(x to 1u, y to 2u) to Rational(77813, 378),
-                    mapOf(x to 2u, y to 2u) to Rational(598583, 7560),
-                    mapOf(x to 3u, y to 2u) to Rational(85, 27),
-                    mapOf(x to 4u, y to 2u) to Rational(2, 5),
-                    mapOf(y to 3u) to Rational(130997, 315),
-                    mapOf(x to 1u, y to 3u) to Rational(1093, 420),
-                    mapOf(x to 2u, y to 3u) to Rational(9551, 2520),
-                    mapOf(x to 3u, y to 3u) to Rational(-14, 45),
-                    mapOf(x to 4u, y to 3u) to Rational(22, 45),
-                    mapOf(y to 4u) to Rational(-2801, 9),
-                    mapOf(x to 1u, y to 4u) to Rational(4033, 90),
-                    mapOf(x to 2u, y to 4u) to Rational(6429, 80),
-                    mapOf(x to 3u, y to 4u) to Rational(2851, 90),
-                    mapOf(x to 4u, y to 4u) to Rational(293, 45),
-                    mapOf(y to 5u) to Rational(-220, 1),
-                    mapOf(x to 1u, y to 5u) to Rational(127, 1),
-                    mapOf(x to 2u, y to 5u) to Rational(202, 5),
-                    mapOf(x to 3u, y to 5u) to Rational(-63, 5),
-                    mapOf(x to 4u, y to 5u) to Rational(-12, 5),
-                    mapOf(y to 6u) to Rational(100, 1),
-                    mapOf(x to 1u, y to 6u) to Rational(-80, 1),
-                    mapOf(x to 2u, y to 6u) to Rational(-24, 1),
-                    mapOf(x to 3u, y to 6u) to Rational(16, 1),
-                    mapOf(x to 4u, y to 6u) to Rational(4, 1)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5407, 9),
-                    mapOf(x to 1u) to Rational(9568, 27),
-                    mapOf(x to 2u) to Rational(4996, 27),
-                    mapOf(x to 3u) to Rational(352, 9),
-                    mapOf(x to 4u) to Rational(22, 3),
-                    mapOf(y to 1u) to Rational(104411, 126),
-                    mapOf(x to 1u, y to 1u) to Rational(6001, 126),
-                    mapOf(x to 2u, y to 1u) to Rational(-796, 21),
-                    mapOf(x to 3u, y to 1u) to Rational(-5389, 126),
-                    mapOf(x to 4u, y to 1u) to Rational(-166, 21),
-                    mapOf(y to 2u) to Rational(-35327, 126),
-                    mapOf(x to 1u, y to 2u) to Rational(53, 252),
-                    mapOf(x to 2u, y to 2u) to Rational(849197, 6048),
-                    mapOf(x to 3u, y to 2u) to Rational(22361, 252),
-                    mapOf(x to 4u, y to 2u) to Rational(773, 42),
-                    mapOf(y to 3u) to Rational(-6067, 21),
-                    mapOf(x to 1u, y to 3u) to Rational(39049, 126),
-                    mapOf(x to 2u, y to 3u) to Rational(80303, 1008),
-                    mapOf(x to 3u, y to 3u) to Rational(-3035, 63),
-                    mapOf(x to 4u, y to 3u) to Rational(-209, 21),
-                    mapOf(y to 4u) to Rational(3113, 21),
-                    mapOf(x to 1u, y to 4u) to Rational(-22345, 126),
-                    mapOf(x to 2u, y to 4u) to Rational(-30931, 1008),
-                    mapOf(x to 3u, y to 4u) to Rational(5837, 126),
-                    mapOf(x to 4u, y to 4u) to Rational(229, 21),
-                    mapOf(y to 5u) to Rational(-2120, 21),
-                    mapOf(x to 1u, y to 5u) to Rational(451, 7),
-                    mapOf(x to 2u, y to 5u) to Rational(422, 21),
-                    mapOf(x to 3u, y to 5u) to Rational(-181, 21),
-                    mapOf(x to 4u, y to 5u) to Rational(-40, 21),
-                    mapOf(y to 6u) to Rational(100, 3),
-                    mapOf(x to 1u, y to 6u) to Rational(-80, 3),
-                    mapOf(x to 2u, y to 6u) to Rational(-8, 1),
-                    mapOf(x to 3u, y to 6u) to Rational(16, 3),
-                    mapOf(x to 4u, y to 6u) to Rational(4, 3)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5, 6),
-                    mapOf(x to 1u) to Rational(1, 6),
-                    mapOf(x to 2u) to Rational(-2, 9),
-                    mapOf(y to 1u) to Rational(15, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
-                    mapOf(y to 2u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 9),
-                    mapOf(x to 1u) to Rational(4, 9),
-                    mapOf(x to 2u) to Rational(11, 6),
-                    mapOf(y to 1u) to Rational(-5, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
-                    mapOf(y to 2u) to Rational(9, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                x to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(18, 1),
-                    mapOf(x to 1u) to Rational(16, 3),
-                    mapOf(x to 2u) to Rational(12, 6),
-                    mapOf(y to 1u) to Rational(13, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(-11, 4),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 1),
-                    mapOf(y to 2u) to Rational(-10, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(2, 1),
-                ),
-                iota to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-6, 1),
-                    mapOf(x to 1u) to Rational(-9, 8),
-                    mapOf(x to 2u) to Rational(17, 5),
-                    mapOf(y to 1u) to Rational(-2, 3),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(-11, 7),
-                    mapOf(y to 2u) to Rational(13, 6),
-                    mapOf(x to 1u, y to 2u) to Rational(-15, 2),
-                    mapOf(x to 2u, y to 2u) to Rational(-14, 4),
-                )
-            )),
-            "test 5'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5, 6),
-                    mapOf(x to 1u) to Rational(1, 6),
-                    mapOf(x to 2u) to Rational(-2, 9),
-                    mapOf(y to 1u) to Rational(15, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
-                    mapOf(y to 2u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 9),
-                    mapOf(x to 1u) to Rational(4, 9),
-                    mapOf(x to 2u) to Rational(11, 6),
-                    mapOf(y to 1u) to Rational(-5, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
-                    mapOf(y to 2u) to Rational(9, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5, 6),
-                    mapOf(x to 1u) to Rational(1, 6),
-                    mapOf(x to 2u) to Rational(-2, 9),
-                    mapOf(y to 1u) to Rational(15, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
-                    mapOf(y to 2u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 9),
-                    mapOf(x to 1u) to Rational(4, 9),
-                    mapOf(x to 2u) to Rational(11, 6),
-                    mapOf(y to 1u) to Rational(-5, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
-                    mapOf(y to 2u) to Rational(9, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf<Symbol, LabeledPolynomial<Rational>>()),
-            "test 6"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5, 6),
-                    mapOf(x to 1u) to Rational(1, 6),
-                    mapOf(x to 2u) to Rational(-2, 9),
-                    mapOf(y to 1u) to Rational(15, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
-                    mapOf(y to 2u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 9),
-                    mapOf(x to 1u) to Rational(4, 9),
-                    mapOf(x to 2u) to Rational(11, 6),
-                    mapOf(y to 1u) to Rational(-5, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
-                    mapOf(y to 2u) to Rational(9, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(5, 6),
-                    mapOf(x to 1u) to Rational(1, 6),
-                    mapOf(x to 2u) to Rational(-2, 9),
-                    mapOf(y to 1u) to Rational(15, 1),
-                    mapOf(x to 1u, y to 1u) to Rational(18, 7),
-                    mapOf(x to 2u, y to 1u) to Rational(2, 5),
-                    mapOf(y to 2u) to Rational(12, 9),
-                    mapOf(x to 1u, y to 2u) to Rational(-3, 5),
-                    mapOf(x to 2u, y to 2u) to Rational(4, 4),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-11, 9),
-                    mapOf(x to 1u) to Rational(4, 9),
-                    mapOf(x to 2u) to Rational(11, 6),
-                    mapOf(y to 1u) to Rational(-5, 6),
-                    mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                    mapOf(x to 2u, y to 1u) to Rational(-1, 7),
-                    mapOf(y to 2u) to Rational(9, 1),
-                    mapOf(x to 1u, y to 2u) to Rational(6, 7),
-                    mapOf(x to 2u, y to 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                iota to LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-6, 1),
-                    mapOf(x to 1u) to Rational(-9, 8),
-                    mapOf(x to 2u) to Rational(17, 5),
-                    mapOf(y to 1u) to Rational(-2, 3),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 5),
-                    mapOf(x to 2u, y to 1u) to Rational(-11, 7),
-                    mapOf(y to 2u) to Rational(13, 6),
-                    mapOf(x to 1u, y to 2u) to Rational(-15, 2),
-                    mapOf(x to 2u, y to 2u) to Rational(-14, 4),
-                )
-            )),
-            "test 6'"
-        )
-    }
-    @Test
-    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
-            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
-    fun test_RationalFunction_substitute_RationalFunction_Map() {
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(0)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1),
-                    mapOf(x to 1u) to Rational(-2),
-                    mapOf(x to 2u) to Rational(1)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1)
-                ),
-            ).substitute(RationalField, mapOf(
-                x to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(1)
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(1)
-                    )
-                )
-            )),
-            "test 1"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf(x to 4u) to Rational(-17166109, 793800),
-                    mapOf(x to 3u, y to 1u) to Rational(-930960143, 5556600),
-                    mapOf(x to 2u, y to 2u) to Rational(-144665109691, 350065800),
-                    mapOf(x to 1u, y to 3u) to Rational(-17232577, 52920),
-                    mapOf(y to 4u) to Rational(-68141, 1323),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf(x to 4u) to Rational(-57522533, 14288400),
-                    mapOf(x to 3u, y to 1u) to Rational(-13085162953, 300056400),
-                    mapOf(x to 2u, y to 2u) to Rational(-92093367341, 525098700),
-                    mapOf(x to 1u, y to 3u) to Rational(-1979342797, 6667920),
-                    mapOf(y to 4u) to Rational(-3082727, 21168),
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(10, 2),
-                    mapOf(x to 1u) to Rational(6, 7),
-                    mapOf(x to 2u) to Rational(-16, 1),
-                    mapOf(y to 1u) to Rational(13, 8),
-                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
-                    mapOf(y to 2u) to Rational(10, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-17, 4),
-                    mapOf(x to 2u) to Rational(-14, 8),
-                    mapOf(y to 1u) to Rational(17, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
-                    mapOf(y to 2u) to Rational(16, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                x to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf(x to 1u) to Rational(11, 5),
-                        mapOf(y to 1u) to Rational(8, 4),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf(x to 1u) to Rational(1, 9),
-                        mapOf(y to 1u) to Rational(11, 7),
-                    )
-                ),
-                y to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf(x to 1u) to Rational(-2, 7),
-                        mapOf(y to 1u) to Rational(-4, 3),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf(x to 1u) to Rational(3, 6),
-                        mapOf(y to 1u) to Rational(12, 8),
-                    )
-                ),
-            )),
-            "test 2"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-130778291, 76800),
-                    mapOf(x to 1u) to Rational(-445270919, 230400),
-                    mapOf(x to 2u) to Rational(44578444937, 14515200),
-                    mapOf(x to 3u) to Rational(17329402153, 1555200),
-                    mapOf(x to 4u) to Rational(89239926809, 2332800),
-                    mapOf(x to 5u) to Rational(2808812267, 145152),
-                    mapOf(x to 6u) to Rational(-21362661007, 725760),
-                    mapOf(x to 7u) to Rational(-258455443, 2016),
-                    mapOf(x to 8u) to Rational(-21454693, 96),
-                    mapOf(y to 1u) to Rational(-1002137, 15360),
-                    mapOf(x to 1u, y to 1u) to Rational(-1704849697, 430080),
-                    mapOf(x to 2u, y to 1u) to Rational(-57657676789, 4838400),
-                    mapOf(x to 3u, y to 1u) to Rational(-101331731, 89600),
-                    mapOf(x to 4u, y to 1u) to Rational(5362280079329, 130636800),
-                    mapOf(x to 5u, y to 1u) to Rational(4069896167053, 130636800),
-                    mapOf(x to 6u, y to 1u) to Rational(12011514569, 544320),
-                    mapOf(x to 7u, y to 1u) to Rational(138293195623, 725760),
-                    mapOf(x to 8u, y to 1u) to Rational(6228779419, 48384),
-                    mapOf(y to 2u) to Rational(-32395872823, 8064000),
-                    mapOf(x to 1u, y to 2u) to Rational(-7398505523, 2304000),
-                    mapOf(x to 2u, y to 2u) to Rational(95217051699521, 3048192000),
-                    mapOf(x to 3u, y to 2u) to Rational(198026968812079, 3657830400),
-                    mapOf(x to 4u, y to 2u) to Rational(4291645618499, 228614400),
-                    mapOf(x to 5u, y to 2u) to Rational(-33211690942439, 914457600),
-                    mapOf(x to 6u, y to 2u) to Rational(-637385538163153, 1371686400),
-                    mapOf(x to 7u, y to 2u) to Rational(-138671528276273, 182891520),
-                    mapOf(x to 8u, y to 2u) to Rational(-14566368751, 217728),
-                    mapOf(y to 3u) to Rational(-10538718719, 2016000),
-                    mapOf(x to 1u, y to 3u) to Rational(-1844485375199, 84672000),
-                    mapOf(x to 2u, y to 3u) to Rational(103968665891, 12096000),
-                    mapOf(x to 3u, y to 3u) to Rational(175402107278351, 1828915200),
-                    mapOf(x to 4u, y to 3u) to Rational(8020699588879, 114307200),
-                    mapOf(x to 5u, y to 3u) to Rational(3414841894991, 38102400),
-                    mapOf(x to 6u, y to 3u) to Rational(1848405591611, 4665600),
-                    mapOf(x to 7u, y to 3u) to Rational(39486708738989, 137168640),
-                    mapOf(x to 8u, y to 3u) to Rational(255926289517, 9144576),
-                    mapOf(y to 4u) to Rational(-655379564629, 105840000),
-                    mapOf(x to 1u, y to 4u) to Rational(-208336039441, 127008000),
-                    mapOf(x to 2u, y to 4u) to Rational(40173146771411, 1143072000),
-                    mapOf(x to 3u, y to 4u) to Rational(150473493581239, 2667168000),
-                    mapOf(x to 4u, y to 4u) to Rational(38833783990483, 1143072000),
-                    mapOf(x to 5u, y to 4u) to Rational(-1963676248203053, 4800902400),
-                    mapOf(x to 6u, y to 4u) to Rational(-2598759412825747, 3200601600),
-                    mapOf(x to 7u, y to 4u) to Rational(-192895352019667, 1280240640),
-                    mapOf(x to 8u, y to 4u) to Rational(3737382679, 6858432),
-                    mapOf(y to 5u) to Rational(-16959378721, 1890000),
-                    mapOf(x to 1u, y to 5u) to Rational(-1864802244743, 79380000),
-                    mapOf(x to 2u, y to 5u) to Rational(13449261536489, 666792000),
-                    mapOf(x to 3u, y to 5u) to Rational(215272234137329, 2667168000),
-                    mapOf(x to 4u, y to 5u) to Rational(6040691379277, 83349000),
-                    mapOf(x to 5u, y to 5u) to Rational(153687143525887, 800150400),
-                    mapOf(x to 6u, y to 5u) to Rational(475602854903563, 2400451200),
-                    mapOf(x to 7u, y to 5u) to Rational(27315599358749, 640120320),
-                    mapOf(x to 8u, y to 5u) to Rational(-2630413357, 10668672),
-                    mapOf(y to 6u) to Rational(-6654999511, 2646000),
-                    mapOf(x to 1u, y to 6u) to Rational(-67885252327, 15876000),
-                    mapOf(x to 2u, y to 6u) to Rational(5786776220983, 2667168000),
-                    mapOf(x to 3u, y to 6u) to Rational(60615922629083, 1143072000),
-                    mapOf(x to 4u, y to 6u) to Rational(-34703539637627407, 672126336000),
-                    mapOf(x to 5u, y to 6u) to Rational(-744694192134101, 2240421120),
-                    mapOf(x to 6u, y to 6u) to Rational(-1782470617231, 14817600),
-                    mapOf(x to 7u, y to 6u) to Rational(59123208433, 8890560),
-                    mapOf(x to 8u, y to 6u) to Rational(-141653, 5292),
-                    mapOf(y to 7u) to Rational(-338051969, 441000),
-                    mapOf(x to 1u, y to 7u) to Rational(468850013, 1764000),
-                    mapOf(x to 2u, y to 7u) to Rational(2102343426101, 222264000),
-                    mapOf(x to 3u, y to 7u) to Rational(7836130602007, 1333584000),
-                    mapOf(x to 4u, y to 7u) to Rational(16239111865997, 746807040),
-                    mapOf(x to 5u, y to 7u) to Rational(3824649185383, 88905600),
-                    mapOf(x to 6u, y to 7u) to Rational(56058614459, 3457440),
-                    mapOf(x to 7u, y to 7u) to Rational(-396766339, 493920),
-                    mapOf(x to 8u, y to 7u) to Rational(-165147, 2744),
-                    mapOf(y to 8u) to Rational(-3088619, 58800),
-                    mapOf(x to 1u, y to 8u) to Rational(155343347, 88200),
-                    mapOf(x to 2u, y to 8u) to Rational(100098736469, 7408800),
-                    mapOf(x to 3u, y to 8u) to Rational(109725511381, 7408800),
-                    mapOf(x to 4u, y to 8u) to Rational(-2431199641013, 59270400),
-                    mapOf(x to 5u, y to 8u) to Rational(-102872383249, 3457440),
-                    mapOf(x to 6u, y to 8u) to Rational(1449461309, 576240),
-                    mapOf(x to 7u, y to 8u) to Rational(812775, 1372),
-                    mapOf(x to 8u, y to 8u) to Rational(-16461, 343)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(164202773, 230400),
-                    mapOf(x to 1u) to Rational(-70345303, 518400),
-                    mapOf(x to 2u) to Rational(-4229702731, 4665600),
-                    mapOf(x to 3u) to Rational(3262171027, 6998400),
-                    mapOf(x to 4u) to Rational(-25423104169, 13996800),
-                    mapOf(x to 5u) to Rational(64061869, 349920),
-                    mapOf(x to 6u) to Rational(-1655878091, 116640),
-                    mapOf(x to 7u) to Rational(-7991441, 648),
-                    mapOf(x to 8u) to Rational(-502591, 18),
-                    mapOf(y to 1u) to Rational(-8780429, 3840),
-                    mapOf(x to 1u, y to 1u) to Rational(434272361, 115200),
-                    mapOf(x to 2u, y to 1u) to Rational(429825727, 41472),
-                    mapOf(x to 3u, y to 1u) to Rational(-10066790339, 6998400),
-                    mapOf(x to 4u, y to 1u) to Rational(70022035471, 20995200),
-                    mapOf(x to 5u, y to 1u) to Rational(-32070283493, 1399680),
-                    mapOf(x to 6u, y to 1u) to Rational(-22051101001, 1399680),
-                    mapOf(x to 7u, y to 1u) to Rational(-126493427, 12960),
-                    mapOf(x to 8u, y to 1u) to Rational(3050245, 864),
-                    mapOf(y to 2u) to Rational(-1194654631, 345600),
-                    mapOf(x to 1u, y to 2u) to Rational(-542961452671, 31104000),
-                    mapOf(x to 2u, y to 2u) to Rational(-234000873607, 48988800),
-                    mapOf(x to 3u, y to 2u) to Rational(140520538087, 3628800),
-                    mapOf(x to 4u, y to 2u) to Rational(9215088876563, 130636800),
-                    mapOf(x to 5u, y to 2u) to Rational(27590569647253, 293932800),
-                    mapOf(x to 6u, y to 2u) to Rational(5129057792891, 97977600),
-                    mapOf(x to 7u, y to 2u) to Rational(-106334191, 5103),
-                    mapOf(x to 8u, y to 2u) to Rational(-1024113911, 435456),
-                    mapOf(y to 3u) to Rational(76223843, 6000),
-                    mapOf(x to 1u, y to 3u) to Rational(57425857357, 2592000),
-                    mapOf(x to 2u, y to 3u) to Rational(-2044736497573, 46656000),
-                    mapOf(x to 3u, y to 3u) to Rational(-26155810120031, 293932800),
-                    mapOf(x to 4u, y to 3u) to Rational(-1064419459813, 6998400),
-                    mapOf(x to 5u, y to 3u) to Rational(-753782018389, 4082400),
-                    mapOf(x to 6u, y to 3u) to Rational(-291973360873, 2799360),
-                    mapOf(x to 7u, y to 3u) to Rational(-46372122599, 816480),
-                    mapOf(x to 8u, y to 3u) to Rational(3579859657, 653184),
-                    mapOf(y to 4u) to Rational(-13374241901, 4320000),
-                    mapOf(x to 1u, y to 4u) to Rational(306606499811, 54432000),
-                    mapOf(x to 2u, y to 4u) to Rational(964267124745437, 13716864000),
-                    mapOf(x to 3u, y to 4u) to Rational(21603809415373, 182891520),
-                    mapOf(x to 4u, y to 4u) to Rational(1097860214654027, 6858432000),
-                    mapOf(x to 5u, y to 4u) to Rational(161615254570669, 914457600),
-                    mapOf(x to 6u, y to 4u) to Rational(758415239461, 22861440),
-                    mapOf(x to 7u, y to 4u) to Rational(2585568355471, 274337280),
-                    mapOf(x to 8u, y to 4u) to Rational(-70433747863, 9144576),
-                    mapOf(y to 5u) to Rational(-9582586217, 2520000),
-                    mapOf(x to 1u, y to 5u) to Rational(-19093471394171, 635040000),
-                    mapOf(x to 2u, y to 5u) to Rational(-13010261944411, 381024000),
-                    mapOf(x to 3u, y to 5u) to Rational(-259039825301861, 4572288000),
-                    mapOf(x to 4u, y to 5u) to Rational(-305081119071079, 2286144000),
-                    mapOf(x to 5u, y to 5u) to Rational(-1923114383311, 19595520),
-                    mapOf(x to 6u, y to 5u) to Rational(-14181787253231, 228614400),
-                    mapOf(x to 7u, y to 5u) to Rational(-3959584789, 4354560),
-                    mapOf(x to 8u, y to 5u) to Rational(4691742523, 762048),
-                    mapOf(y to 6u) to Rational(-588323437, 180000),
-                    mapOf(x to 1u, y to 6u) to Rational(5952234691, 52920000),
-                    mapOf(x to 2u, y to 6u) to Rational(21001851056959, 1088640000),
-                    mapOf(x to 3u, y to 6u) to Rational(84668034357563, 2133734400),
-                    mapOf(x to 4u, y to 6u) to Rational(2029754605811557, 25604812800),
-                    mapOf(x to 5u, y to 6u) to Rational(11721216739823, 426746880),
-                    mapOf(x to 6u, y to 6u) to Rational(-8275903187003, 2133734400),
-                    mapOf(x to 7u, y to 6u) to Rational(-4730447299, 2540160),
-                    mapOf(x to 8u, y to 6u) to Rational(-46069985, 21168),
-                    mapOf(y to 7u) to Rational(-75711301, 117600),
-                    mapOf(x to 1u, y to 7u) to Rational(32430417413, 7056000),
-                    mapOf(x to 2u, y to 7u) to Rational(677988533153, 98784000),
-                    mapOf(x to 3u, y to 7u) to Rational(-948417645827, 71124480),
-                    mapOf(x to 4u, y to 7u) to Rational(-11320265215207, 711244800),
-                    mapOf(x to 5u, y to 7u) to Rational(-676438627783, 50803200),
-                    mapOf(x to 6u, y to 7u) to Rational(-7382274253, 1975680),
-                    mapOf(x to 7u, y to 7u) to Rational(6505733, 2205),
-                    mapOf(x to 8u, y to 7u) to Rational(450137, 882),
-                    mapOf(y to 8u) to Rational(-8368253, 78400),
-                    mapOf(x to 1u, y to 8u) to Rational(6833783, 117600),
-                    mapOf(x to 2u, y to 8u) to Rational(4528971133, 5927040),
-                    mapOf(x to 3u, y to 8u) to Rational(146252636617, 29635200),
-                    mapOf(x to 4u, y to 8u) to Rational(8321882556889, 1659571200),
-                    mapOf(x to 5u, y to 8u) to Rational(-4686033011, 1975680),
-                    mapOf(x to 6u, y to 8u) to Rational(-1074445963, 987840),
-                    mapOf(x to 7u, y to 8u) to Rational(-142313, 588),
-                    mapOf(x to 8u, y to 8u) to Rational(-4281, 49)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(10, 2),
-                    mapOf(x to 1u) to Rational(6, 7),
-                    mapOf(x to 2u) to Rational(-16, 1),
-                    mapOf(y to 1u) to Rational(13, 8),
-                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
-                    mapOf(y to 2u) to Rational(10, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-17, 4),
-                    mapOf(x to 2u) to Rational(-14, 8),
-                    mapOf(y to 1u) to Rational(17, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
-                    mapOf(y to 2u) to Rational(16, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                x to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-17, 5),
-                        mapOf(x to 1u) to Rational(2, 6),
-                        mapOf(x to 2u) to Rational(14, 1),
-                        mapOf(y to 1u) to Rational(-6, 6),
-                        mapOf(x to 1u, y to 1u) to Rational(-7, 3),
-                        mapOf(x to 2u, y to 1u) to Rational(-2, 9),
-                        mapOf(y to 2u) to Rational(-9, 6),
-                        mapOf(x to 1u, y to 2u) to Rational(17, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(2, 1),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(5, 4),
-                        mapOf(x to 1u) to Rational(-5, 9),
-                        mapOf(x to 2u) to Rational(-3, 6),
-                        mapOf(y to 1u) to Rational(6, 5),
-                        mapOf(x to 1u, y to 1u) to Rational(14, 5),
-                        mapOf(x to 2u, y to 1u) to Rational(5, 2),
-                        mapOf(y to 2u) to Rational(-18, 7),
-                        mapOf(x to 1u, y to 2u) to Rational(-8, 2),
-                        mapOf(x to 2u, y to 2u) to Rational(18, 9),
-                    )
-                ),
-                y to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(14, 4),
-                        mapOf(x to 1u) to Rational(7, 6),
-                        mapOf(x to 2u) to Rational(7, 2),
-                        mapOf(y to 1u) to Rational(-15, 2),
-                        mapOf(x to 1u, y to 1u) to Rational(-13, 8),
-                        mapOf(x to 2u, y to 1u) to Rational(-14, 3),
-                        mapOf(y to 2u) to Rational(-7, 6),
-                        mapOf(x to 1u, y to 2u) to Rational(7, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(9, 7),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-7, 4),
-                        mapOf(x to 1u) to Rational(-6, 3),
-                        mapOf(x to 2u) to Rational(-16, 2),
-                        mapOf(y to 1u) to Rational(-15, 5),
-                        mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                        mapOf(x to 2u, y to 1u) to Rational(5, 4),
-                        mapOf(y to 2u) to Rational(-12, 5),
-                        mapOf(x to 1u, y to 2u) to Rational(-18, 2),
-                        mapOf(x to 2u, y to 2u) to Rational(6, 7),
-                    )
-                ),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-130778291, 76800),
-                    mapOf(x to 1u) to Rational(-445270919, 230400),
-                    mapOf(x to 2u) to Rational(44578444937, 14515200),
-                    mapOf(x to 3u) to Rational(17329402153, 1555200),
-                    mapOf(x to 4u) to Rational(89239926809, 2332800),
-                    mapOf(x to 5u) to Rational(2808812267, 145152),
-                    mapOf(x to 6u) to Rational(-21362661007, 725760),
-                    mapOf(x to 7u) to Rational(-258455443, 2016),
-                    mapOf(x to 8u) to Rational(-21454693, 96),
-                    mapOf(y to 1u) to Rational(-1002137, 15360),
-                    mapOf(x to 1u, y to 1u) to Rational(-1704849697, 430080),
-                    mapOf(x to 2u, y to 1u) to Rational(-57657676789, 4838400),
-                    mapOf(x to 3u, y to 1u) to Rational(-101331731, 89600),
-                    mapOf(x to 4u, y to 1u) to Rational(5362280079329, 130636800),
-                    mapOf(x to 5u, y to 1u) to Rational(4069896167053, 130636800),
-                    mapOf(x to 6u, y to 1u) to Rational(12011514569, 544320),
-                    mapOf(x to 7u, y to 1u) to Rational(138293195623, 725760),
-                    mapOf(x to 8u, y to 1u) to Rational(6228779419, 48384),
-                    mapOf(y to 2u) to Rational(-32395872823, 8064000),
-                    mapOf(x to 1u, y to 2u) to Rational(-7398505523, 2304000),
-                    mapOf(x to 2u, y to 2u) to Rational(95217051699521, 3048192000),
-                    mapOf(x to 3u, y to 2u) to Rational(198026968812079, 3657830400),
-                    mapOf(x to 4u, y to 2u) to Rational(4291645618499, 228614400),
-                    mapOf(x to 5u, y to 2u) to Rational(-33211690942439, 914457600),
-                    mapOf(x to 6u, y to 2u) to Rational(-637385538163153, 1371686400),
-                    mapOf(x to 7u, y to 2u) to Rational(-138671528276273, 182891520),
-                    mapOf(x to 8u, y to 2u) to Rational(-14566368751, 217728),
-                    mapOf(y to 3u) to Rational(-10538718719, 2016000),
-                    mapOf(x to 1u, y to 3u) to Rational(-1844485375199, 84672000),
-                    mapOf(x to 2u, y to 3u) to Rational(103968665891, 12096000),
-                    mapOf(x to 3u, y to 3u) to Rational(175402107278351, 1828915200),
-                    mapOf(x to 4u, y to 3u) to Rational(8020699588879, 114307200),
-                    mapOf(x to 5u, y to 3u) to Rational(3414841894991, 38102400),
-                    mapOf(x to 6u, y to 3u) to Rational(1848405591611, 4665600),
-                    mapOf(x to 7u, y to 3u) to Rational(39486708738989, 137168640),
-                    mapOf(x to 8u, y to 3u) to Rational(255926289517, 9144576),
-                    mapOf(y to 4u) to Rational(-655379564629, 105840000),
-                    mapOf(x to 1u, y to 4u) to Rational(-208336039441, 127008000),
-                    mapOf(x to 2u, y to 4u) to Rational(40173146771411, 1143072000),
-                    mapOf(x to 3u, y to 4u) to Rational(150473493581239, 2667168000),
-                    mapOf(x to 4u, y to 4u) to Rational(38833783990483, 1143072000),
-                    mapOf(x to 5u, y to 4u) to Rational(-1963676248203053, 4800902400),
-                    mapOf(x to 6u, y to 4u) to Rational(-2598759412825747, 3200601600),
-                    mapOf(x to 7u, y to 4u) to Rational(-192895352019667, 1280240640),
-                    mapOf(x to 8u, y to 4u) to Rational(3737382679, 6858432),
-                    mapOf(y to 5u) to Rational(-16959378721, 1890000),
-                    mapOf(x to 1u, y to 5u) to Rational(-1864802244743, 79380000),
-                    mapOf(x to 2u, y to 5u) to Rational(13449261536489, 666792000),
-                    mapOf(x to 3u, y to 5u) to Rational(215272234137329, 2667168000),
-                    mapOf(x to 4u, y to 5u) to Rational(6040691379277, 83349000),
-                    mapOf(x to 5u, y to 5u) to Rational(153687143525887, 800150400),
-                    mapOf(x to 6u, y to 5u) to Rational(475602854903563, 2400451200),
-                    mapOf(x to 7u, y to 5u) to Rational(27315599358749, 640120320),
-                    mapOf(x to 8u, y to 5u) to Rational(-2630413357, 10668672),
-                    mapOf(y to 6u) to Rational(-6654999511, 2646000),
-                    mapOf(x to 1u, y to 6u) to Rational(-67885252327, 15876000),
-                    mapOf(x to 2u, y to 6u) to Rational(5786776220983, 2667168000),
-                    mapOf(x to 3u, y to 6u) to Rational(60615922629083, 1143072000),
-                    mapOf(x to 4u, y to 6u) to Rational(-34703539637627407, 672126336000),
-                    mapOf(x to 5u, y to 6u) to Rational(-744694192134101, 2240421120),
-                    mapOf(x to 6u, y to 6u) to Rational(-1782470617231, 14817600),
-                    mapOf(x to 7u, y to 6u) to Rational(59123208433, 8890560),
-                    mapOf(x to 8u, y to 6u) to Rational(-141653, 5292),
-                    mapOf(y to 7u) to Rational(-338051969, 441000),
-                    mapOf(x to 1u, y to 7u) to Rational(468850013, 1764000),
-                    mapOf(x to 2u, y to 7u) to Rational(2102343426101, 222264000),
-                    mapOf(x to 3u, y to 7u) to Rational(7836130602007, 1333584000),
-                    mapOf(x to 4u, y to 7u) to Rational(16239111865997, 746807040),
-                    mapOf(x to 5u, y to 7u) to Rational(3824649185383, 88905600),
-                    mapOf(x to 6u, y to 7u) to Rational(56058614459, 3457440),
-                    mapOf(x to 7u, y to 7u) to Rational(-396766339, 493920),
-                    mapOf(x to 8u, y to 7u) to Rational(-165147, 2744),
-                    mapOf(y to 8u) to Rational(-3088619, 58800),
-                    mapOf(x to 1u, y to 8u) to Rational(155343347, 88200),
-                    mapOf(x to 2u, y to 8u) to Rational(100098736469, 7408800),
-                    mapOf(x to 3u, y to 8u) to Rational(109725511381, 7408800),
-                    mapOf(x to 4u, y to 8u) to Rational(-2431199641013, 59270400),
-                    mapOf(x to 5u, y to 8u) to Rational(-102872383249, 3457440),
-                    mapOf(x to 6u, y to 8u) to Rational(1449461309, 576240),
-                    mapOf(x to 7u, y to 8u) to Rational(812775, 1372),
-                    mapOf(x to 8u, y to 8u) to Rational(-16461, 343)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(164202773, 230400),
-                    mapOf(x to 1u) to Rational(-70345303, 518400),
-                    mapOf(x to 2u) to Rational(-4229702731, 4665600),
-                    mapOf(x to 3u) to Rational(3262171027, 6998400),
-                    mapOf(x to 4u) to Rational(-25423104169, 13996800),
-                    mapOf(x to 5u) to Rational(64061869, 349920),
-                    mapOf(x to 6u) to Rational(-1655878091, 116640),
-                    mapOf(x to 7u) to Rational(-7991441, 648),
-                    mapOf(x to 8u) to Rational(-502591, 18),
-                    mapOf(y to 1u) to Rational(-8780429, 3840),
-                    mapOf(x to 1u, y to 1u) to Rational(434272361, 115200),
-                    mapOf(x to 2u, y to 1u) to Rational(429825727, 41472),
-                    mapOf(x to 3u, y to 1u) to Rational(-10066790339, 6998400),
-                    mapOf(x to 4u, y to 1u) to Rational(70022035471, 20995200),
-                    mapOf(x to 5u, y to 1u) to Rational(-32070283493, 1399680),
-                    mapOf(x to 6u, y to 1u) to Rational(-22051101001, 1399680),
-                    mapOf(x to 7u, y to 1u) to Rational(-126493427, 12960),
-                    mapOf(x to 8u, y to 1u) to Rational(3050245, 864),
-                    mapOf(y to 2u) to Rational(-1194654631, 345600),
-                    mapOf(x to 1u, y to 2u) to Rational(-542961452671, 31104000),
-                    mapOf(x to 2u, y to 2u) to Rational(-234000873607, 48988800),
-                    mapOf(x to 3u, y to 2u) to Rational(140520538087, 3628800),
-                    mapOf(x to 4u, y to 2u) to Rational(9215088876563, 130636800),
-                    mapOf(x to 5u, y to 2u) to Rational(27590569647253, 293932800),
-                    mapOf(x to 6u, y to 2u) to Rational(5129057792891, 97977600),
-                    mapOf(x to 7u, y to 2u) to Rational(-106334191, 5103),
-                    mapOf(x to 8u, y to 2u) to Rational(-1024113911, 435456),
-                    mapOf(y to 3u) to Rational(76223843, 6000),
-                    mapOf(x to 1u, y to 3u) to Rational(57425857357, 2592000),
-                    mapOf(x to 2u, y to 3u) to Rational(-2044736497573, 46656000),
-                    mapOf(x to 3u, y to 3u) to Rational(-26155810120031, 293932800),
-                    mapOf(x to 4u, y to 3u) to Rational(-1064419459813, 6998400),
-                    mapOf(x to 5u, y to 3u) to Rational(-753782018389, 4082400),
-                    mapOf(x to 6u, y to 3u) to Rational(-291973360873, 2799360),
-                    mapOf(x to 7u, y to 3u) to Rational(-46372122599, 816480),
-                    mapOf(x to 8u, y to 3u) to Rational(3579859657, 653184),
-                    mapOf(y to 4u) to Rational(-13374241901, 4320000),
-                    mapOf(x to 1u, y to 4u) to Rational(306606499811, 54432000),
-                    mapOf(x to 2u, y to 4u) to Rational(964267124745437, 13716864000),
-                    mapOf(x to 3u, y to 4u) to Rational(21603809415373, 182891520),
-                    mapOf(x to 4u, y to 4u) to Rational(1097860214654027, 6858432000),
-                    mapOf(x to 5u, y to 4u) to Rational(161615254570669, 914457600),
-                    mapOf(x to 6u, y to 4u) to Rational(758415239461, 22861440),
-                    mapOf(x to 7u, y to 4u) to Rational(2585568355471, 274337280),
-                    mapOf(x to 8u, y to 4u) to Rational(-70433747863, 9144576),
-                    mapOf(y to 5u) to Rational(-9582586217, 2520000),
-                    mapOf(x to 1u, y to 5u) to Rational(-19093471394171, 635040000),
-                    mapOf(x to 2u, y to 5u) to Rational(-13010261944411, 381024000),
-                    mapOf(x to 3u, y to 5u) to Rational(-259039825301861, 4572288000),
-                    mapOf(x to 4u, y to 5u) to Rational(-305081119071079, 2286144000),
-                    mapOf(x to 5u, y to 5u) to Rational(-1923114383311, 19595520),
-                    mapOf(x to 6u, y to 5u) to Rational(-14181787253231, 228614400),
-                    mapOf(x to 7u, y to 5u) to Rational(-3959584789, 4354560),
-                    mapOf(x to 8u, y to 5u) to Rational(4691742523, 762048),
-                    mapOf(y to 6u) to Rational(-588323437, 180000),
-                    mapOf(x to 1u, y to 6u) to Rational(5952234691, 52920000),
-                    mapOf(x to 2u, y to 6u) to Rational(21001851056959, 1088640000),
-                    mapOf(x to 3u, y to 6u) to Rational(84668034357563, 2133734400),
-                    mapOf(x to 4u, y to 6u) to Rational(2029754605811557, 25604812800),
-                    mapOf(x to 5u, y to 6u) to Rational(11721216739823, 426746880),
-                    mapOf(x to 6u, y to 6u) to Rational(-8275903187003, 2133734400),
-                    mapOf(x to 7u, y to 6u) to Rational(-4730447299, 2540160),
-                    mapOf(x to 8u, y to 6u) to Rational(-46069985, 21168),
-                    mapOf(y to 7u) to Rational(-75711301, 117600),
-                    mapOf(x to 1u, y to 7u) to Rational(32430417413, 7056000),
-                    mapOf(x to 2u, y to 7u) to Rational(677988533153, 98784000),
-                    mapOf(x to 3u, y to 7u) to Rational(-948417645827, 71124480),
-                    mapOf(x to 4u, y to 7u) to Rational(-11320265215207, 711244800),
-                    mapOf(x to 5u, y to 7u) to Rational(-676438627783, 50803200),
-                    mapOf(x to 6u, y to 7u) to Rational(-7382274253, 1975680),
-                    mapOf(x to 7u, y to 7u) to Rational(6505733, 2205),
-                    mapOf(x to 8u, y to 7u) to Rational(450137, 882),
-                    mapOf(y to 8u) to Rational(-8368253, 78400),
-                    mapOf(x to 1u, y to 8u) to Rational(6833783, 117600),
-                    mapOf(x to 2u, y to 8u) to Rational(4528971133, 5927040),
-                    mapOf(x to 3u, y to 8u) to Rational(146252636617, 29635200),
-                    mapOf(x to 4u, y to 8u) to Rational(8321882556889, 1659571200),
-                    mapOf(x to 5u, y to 8u) to Rational(-4686033011, 1975680),
-                    mapOf(x to 6u, y to 8u) to Rational(-1074445963, 987840),
-                    mapOf(x to 7u, y to 8u) to Rational(-142313, 588),
-                    mapOf(x to 8u, y to 8u) to Rational(-4281, 49)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(10, 2),
-                    mapOf(x to 1u) to Rational(6, 7),
-                    mapOf(x to 2u) to Rational(-16, 1),
-                    mapOf(y to 1u) to Rational(13, 8),
-                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
-                    mapOf(y to 2u) to Rational(10, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-17, 4),
-                    mapOf(x to 2u) to Rational(-14, 8),
-                    mapOf(y to 1u) to Rational(17, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
-                    mapOf(y to 2u) to Rational(16, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                x to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-17, 5),
-                        mapOf(x to 1u) to Rational(2, 6),
-                        mapOf(x to 2u) to Rational(14, 1),
-                        mapOf(y to 1u) to Rational(-6, 6),
-                        mapOf(x to 1u, y to 1u) to Rational(-7, 3),
-                        mapOf(x to 2u, y to 1u) to Rational(-2, 9),
-                        mapOf(y to 2u) to Rational(-9, 6),
-                        mapOf(x to 1u, y to 2u) to Rational(17, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(2, 1),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(5, 4),
-                        mapOf(x to 1u) to Rational(-5, 9),
-                        mapOf(x to 2u) to Rational(-3, 6),
-                        mapOf(y to 1u) to Rational(6, 5),
-                        mapOf(x to 1u, y to 1u) to Rational(14, 5),
-                        mapOf(x to 2u, y to 1u) to Rational(5, 2),
-                        mapOf(y to 2u) to Rational(-18, 7),
-                        mapOf(x to 1u, y to 2u) to Rational(-8, 2),
-                        mapOf(x to 2u, y to 2u) to Rational(18, 9),
-                    )
-                ),
-                y to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(14, 4),
-                        mapOf(x to 1u) to Rational(7, 6),
-                        mapOf(x to 2u) to Rational(7, 2),
-                        mapOf(y to 1u) to Rational(-15, 2),
-                        mapOf(x to 1u, y to 1u) to Rational(-13, 8),
-                        mapOf(x to 2u, y to 1u) to Rational(-14, 3),
-                        mapOf(y to 2u) to Rational(-7, 6),
-                        mapOf(x to 1u, y to 2u) to Rational(7, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(9, 7),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-7, 4),
-                        mapOf(x to 1u) to Rational(-6, 3),
-                        mapOf(x to 2u) to Rational(-16, 2),
-                        mapOf(y to 1u) to Rational(-15, 5),
-                        mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                        mapOf(x to 2u, y to 1u) to Rational(5, 4),
-                        mapOf(y to 2u) to Rational(-12, 5),
-                        mapOf(x to 1u, y to 2u) to Rational(-18, 2),
-                        mapOf(x to 2u, y to 2u) to Rational(6, 7),
-                    )
-                ),
-                iota to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(5, 8),
-                        mapOf(x to 1u) to Rational(-12, 6),
-                        mapOf(x to 2u) to Rational(7, 6),
-                        mapOf(y to 1u) to Rational(-10, 4),
-                        mapOf(x to 1u, y to 1u) to Rational(-7, 6),
-                        mapOf(x to 2u, y to 1u) to Rational(8, 9),
-                        mapOf(y to 2u) to Rational(16, 3),
-                        mapOf(x to 1u, y to 2u) to Rational(-13, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(5, 1),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(10, 6),
-                        mapOf(x to 1u) to Rational(-18, 6),
-                        mapOf(x to 2u) to Rational(5, 1),
-                        mapOf(y to 1u) to Rational(17, 7),
-                        mapOf(x to 1u, y to 1u) to Rational(8, 4),
-                        mapOf(x to 2u, y to 1u) to Rational(-4, 9),
-                        mapOf(y to 2u) to Rational(-6, 5),
-                        mapOf(x to 1u, y to 2u) to Rational(-15, 8),
-                        mapOf(x to 2u, y to 2u) to Rational(-18, 5),
-                    )
-                ),
-            )),
-            "test 3'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(2303, 64),
-                    mapOf(x to 1u) to Rational(31843, 192),
-                    mapOf(x to 2u) to Rational(118891, 576),
-                    mapOf(x to 3u) to Rational(94453, 168),
-                    mapOf(x to 4u) to Rational(-179203, 1512),
-                    mapOf(x to 5u) to Rational(-16979, 126),
-                    mapOf(x to 6u) to Rational(-13499, 12),
-                    mapOf(y to 1u) to Rational(-4767, 64),
-                    mapOf(x to 1u, y to 1u) to Rational(-58689, 256),
-                    mapOf(x to 2u, y to 1u) to Rational(-757333, 4032),
-                    mapOf(x to 3u, y to 1u) to Rational(-4921205, 4032),
-                    mapOf(x to 4u, y to 1u) to Rational(-2930815, 4032),
-                    mapOf(x to 5u, y to 1u) to Rational(-398803, 1512),
-                    mapOf(x to 6u, y to 1u) to Rational(18835, 36),
-                    mapOf(y to 2u) to Rational(224101, 960),
-                    mapOf(x to 1u, y to 2u) to Rational(9139699, 40320),
-                    mapOf(x to 2u, y to 2u) to Rational(3848803, 5760),
-                    mapOf(x to 3u, y to 2u) to Rational(93102371, 241920),
-                    mapOf(x to 4u, y to 2u) to Rational(-65821229, 141120),
-                    mapOf(x to 5u, y to 2u) to Rational(-15675899, 7056),
-                    mapOf(x to 6u, y to 2u) to Rational(10459, 189),
-                    mapOf(y to 3u) to Rational(2411, 16),
-                    mapOf(x to 1u, y to 3u) to Rational(1294543, 10080),
-                    mapOf(x to 2u, y to 3u) to Rational(-1740199, 1440),
-                    mapOf(x to 3u, y to 3u) to Rational(-266994841, 282240),
-                    mapOf(x to 4u, y to 3u) to Rational(-41261893, 211680),
-                    mapOf(x to 5u, y to 3u) to Rational(1717357, 3528),
-                    mapOf(x to 6u, y to 3u) to Rational(69, 14),
-                    mapOf(y to 4u) to Rational(13231, 360),
-                    mapOf(x to 1u, y to 4u) to Rational(4858831, 25200),
-                    mapOf(x to 2u, y to 4u) to Rational(15565759, 75600),
-                    mapOf(x to 3u, y to 4u) to Rational(-15583391, 35280),
-                    mapOf(x to 4u, y to 4u) to Rational(-13345747, 11760),
-                    mapOf(x to 5u, y to 4u) to Rational(140103, 686),
-                    mapOf(x to 6u, y to 4u) to Rational(-765, 49)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(31409, 576),
-                    mapOf(x to 1u) to Rational(-337099, 1728),
-                    mapOf(x to 2u) to Rational(-211429, 1728),
-                    mapOf(x to 3u) to Rational(-259241, 432),
-                    mapOf(x to 4u) to Rational(-13777, 36),
-                    mapOf(x to 5u) to Rational(-41389, 72),
-                    mapOf(x to 6u) to Rational(-7679, 48),
-                    mapOf(y to 1u) to Rational(-3269, 12),
-                    mapOf(x to 1u, y to 1u) to Rational(629569, 864),
-                    mapOf(x to 2u, y to 1u) to Rational(53867, 324),
-                    mapOf(x to 3u, y to 1u) to Rational(2290577, 1728),
-                    mapOf(x to 4u, y to 1u) to Rational(101507, 216),
-                    mapOf(x to 5u, y to 1u) to Rational(213109, 288),
-                    mapOf(x to 6u, y to 1u) to Rational(17927, 144),
-                    mapOf(y to 2u) to Rational(314587, 1080),
-                    mapOf(x to 1u, y to 2u) to Rational(-109771, 144),
-                    mapOf(x to 2u, y to 2u) to Rational(-6469, 16),
-                    mapOf(x to 3u, y to 2u) to Rational(-298291681, 181440),
-                    mapOf(x to 4u, y to 2u) to Rational(-59147357, 48384),
-                    mapOf(x to 5u, y to 2u) to Rational(-4982365, 6048),
-                    mapOf(x to 6u, y to 2u) to Rational(-18727, 576),
-                    mapOf(y to 3u) to Rational(12379, 90),
-                    mapOf(x to 1u, y to 3u) to Rational(-542911, 1620),
-                    mapOf(x to 2u, y to 3u) to Rational(143123, 1260),
-                    mapOf(x to 3u, y to 3u) to Rational(9859177, 30240),
-                    mapOf(x to 4u, y to 3u) to Rational(9312529, 20160),
-                    mapOf(x to 5u, y to 3u) to Rational(207001, 672),
-                    mapOf(x to 6u, y to 3u) to Rational(203, 24),
-                    mapOf(y to 4u) to Rational(9442, 675),
-                    mapOf(x to 1u, y to 4u) to Rational(-13729, 300),
-                    mapOf(x to 2u, y to 4u) to Rational(-3490471, 25200),
-                    mapOf(x to 3u, y to 4u) to Rational(-333031, 840),
-                    mapOf(x to 4u, y to 4u) to Rational(-7572211, 47040),
-                    mapOf(x to 5u, y to 4u) to Rational(-1189, 56),
-                    mapOf(x to 6u, y to 4u) to Rational(-405, 196)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(10, 2),
-                    mapOf(x to 1u) to Rational(6, 7),
-                    mapOf(x to 2u) to Rational(-16, 1),
-                    mapOf(y to 1u) to Rational(13, 8),
-                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
-                    mapOf(y to 2u) to Rational(10, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-17, 4),
-                    mapOf(x to 2u) to Rational(-14, 8),
-                    mapOf(y to 1u) to Rational(17, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
-                    mapOf(y to 2u) to Rational(16, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                y to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(14, 4),
-                        mapOf(x to 1u) to Rational(7, 6),
-                        mapOf(x to 2u) to Rational(7, 2),
-                        mapOf(y to 1u) to Rational(-15, 2),
-                        mapOf(x to 1u, y to 1u) to Rational(-13, 8),
-                        mapOf(x to 2u, y to 1u) to Rational(-14, 3),
-                        mapOf(y to 2u) to Rational(-7, 6),
-                        mapOf(x to 1u, y to 2u) to Rational(7, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(9, 7),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-7, 4),
-                        mapOf(x to 1u) to Rational(-6, 3),
-                        mapOf(x to 2u) to Rational(-16, 2),
-                        mapOf(y to 1u) to Rational(-15, 5),
-                        mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                        mapOf(x to 2u, y to 1u) to Rational(5, 4),
-                        mapOf(y to 2u) to Rational(-12, 5),
-                        mapOf(x to 1u, y to 2u) to Rational(-18, 2),
-                        mapOf(x to 2u, y to 2u) to Rational(6, 7),
-                    )
-                ),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(2303, 64),
-                    mapOf(x to 1u) to Rational(31843, 192),
-                    mapOf(x to 2u) to Rational(118891, 576),
-                    mapOf(x to 3u) to Rational(94453, 168),
-                    mapOf(x to 4u) to Rational(-179203, 1512),
-                    mapOf(x to 5u) to Rational(-16979, 126),
-                    mapOf(x to 6u) to Rational(-13499, 12),
-                    mapOf(y to 1u) to Rational(-4767, 64),
-                    mapOf(x to 1u, y to 1u) to Rational(-58689, 256),
-                    mapOf(x to 2u, y to 1u) to Rational(-757333, 4032),
-                    mapOf(x to 3u, y to 1u) to Rational(-4921205, 4032),
-                    mapOf(x to 4u, y to 1u) to Rational(-2930815, 4032),
-                    mapOf(x to 5u, y to 1u) to Rational(-398803, 1512),
-                    mapOf(x to 6u, y to 1u) to Rational(18835, 36),
-                    mapOf(y to 2u) to Rational(224101, 960),
-                    mapOf(x to 1u, y to 2u) to Rational(9139699, 40320),
-                    mapOf(x to 2u, y to 2u) to Rational(3848803, 5760),
-                    mapOf(x to 3u, y to 2u) to Rational(93102371, 241920),
-                    mapOf(x to 4u, y to 2u) to Rational(-65821229, 141120),
-                    mapOf(x to 5u, y to 2u) to Rational(-15675899, 7056),
-                    mapOf(x to 6u, y to 2u) to Rational(10459, 189),
-                    mapOf(y to 3u) to Rational(2411, 16),
-                    mapOf(x to 1u, y to 3u) to Rational(1294543, 10080),
-                    mapOf(x to 2u, y to 3u) to Rational(-1740199, 1440),
-                    mapOf(x to 3u, y to 3u) to Rational(-266994841, 282240),
-                    mapOf(x to 4u, y to 3u) to Rational(-41261893, 211680),
-                    mapOf(x to 5u, y to 3u) to Rational(1717357, 3528),
-                    mapOf(x to 6u, y to 3u) to Rational(69, 14),
-                    mapOf(y to 4u) to Rational(13231, 360),
-                    mapOf(x to 1u, y to 4u) to Rational(4858831, 25200),
-                    mapOf(x to 2u, y to 4u) to Rational(15565759, 75600),
-                    mapOf(x to 3u, y to 4u) to Rational(-15583391, 35280),
-                    mapOf(x to 4u, y to 4u) to Rational(-13345747, 11760),
-                    mapOf(x to 5u, y to 4u) to Rational(140103, 686),
-                    mapOf(x to 6u, y to 4u) to Rational(-765, 49)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(31409, 576),
-                    mapOf(x to 1u) to Rational(-337099, 1728),
-                    mapOf(x to 2u) to Rational(-211429, 1728),
-                    mapOf(x to 3u) to Rational(-259241, 432),
-                    mapOf(x to 4u) to Rational(-13777, 36),
-                    mapOf(x to 5u) to Rational(-41389, 72),
-                    mapOf(x to 6u) to Rational(-7679, 48),
-                    mapOf(y to 1u) to Rational(-3269, 12),
-                    mapOf(x to 1u, y to 1u) to Rational(629569, 864),
-                    mapOf(x to 2u, y to 1u) to Rational(53867, 324),
-                    mapOf(x to 3u, y to 1u) to Rational(2290577, 1728),
-                    mapOf(x to 4u, y to 1u) to Rational(101507, 216),
-                    mapOf(x to 5u, y to 1u) to Rational(213109, 288),
-                    mapOf(x to 6u, y to 1u) to Rational(17927, 144),
-                    mapOf(y to 2u) to Rational(314587, 1080),
-                    mapOf(x to 1u, y to 2u) to Rational(-109771, 144),
-                    mapOf(x to 2u, y to 2u) to Rational(-6469, 16),
-                    mapOf(x to 3u, y to 2u) to Rational(-298291681, 181440),
-                    mapOf(x to 4u, y to 2u) to Rational(-59147357, 48384),
-                    mapOf(x to 5u, y to 2u) to Rational(-4982365, 6048),
-                    mapOf(x to 6u, y to 2u) to Rational(-18727, 576),
-                    mapOf(y to 3u) to Rational(12379, 90),
-                    mapOf(x to 1u, y to 3u) to Rational(-542911, 1620),
-                    mapOf(x to 2u, y to 3u) to Rational(143123, 1260),
-                    mapOf(x to 3u, y to 3u) to Rational(9859177, 30240),
-                    mapOf(x to 4u, y to 3u) to Rational(9312529, 20160),
-                    mapOf(x to 5u, y to 3u) to Rational(207001, 672),
-                    mapOf(x to 6u, y to 3u) to Rational(203, 24),
-                    mapOf(y to 4u) to Rational(9442, 675),
-                    mapOf(x to 1u, y to 4u) to Rational(-13729, 300),
-                    mapOf(x to 2u, y to 4u) to Rational(-3490471, 25200),
-                    mapOf(x to 3u, y to 4u) to Rational(-333031, 840),
-                    mapOf(x to 4u, y to 4u) to Rational(-7572211, 47040),
-                    mapOf(x to 5u, y to 4u) to Rational(-1189, 56),
-                    mapOf(x to 6u, y to 4u) to Rational(-405, 196)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(10, 2),
-                    mapOf(x to 1u) to Rational(6, 7),
-                    mapOf(x to 2u) to Rational(-16, 1),
-                    mapOf(y to 1u) to Rational(13, 8),
-                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
-                    mapOf(y to 2u) to Rational(10, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-17, 4),
-                    mapOf(x to 2u) to Rational(-14, 8),
-                    mapOf(y to 1u) to Rational(17, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
-                    mapOf(y to 2u) to Rational(16, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                y to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(14, 4),
-                        mapOf(x to 1u) to Rational(7, 6),
-                        mapOf(x to 2u) to Rational(7, 2),
-                        mapOf(y to 1u) to Rational(-15, 2),
-                        mapOf(x to 1u, y to 1u) to Rational(-13, 8),
-                        mapOf(x to 2u, y to 1u) to Rational(-14, 3),
-                        mapOf(y to 2u) to Rational(-7, 6),
-                        mapOf(x to 1u, y to 2u) to Rational(7, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(9, 7),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-7, 4),
-                        mapOf(x to 1u) to Rational(-6, 3),
-                        mapOf(x to 2u) to Rational(-16, 2),
-                        mapOf(y to 1u) to Rational(-15, 5),
-                        mapOf(x to 1u, y to 1u) to Rational(4, 6),
-                        mapOf(x to 2u, y to 1u) to Rational(5, 4),
-                        mapOf(y to 2u) to Rational(-12, 5),
-                        mapOf(x to 1u, y to 2u) to Rational(-18, 2),
-                        mapOf(x to 2u, y to 2u) to Rational(6, 7),
-                    )
-                ),
-                iota to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(5, 8),
-                        mapOf(x to 1u) to Rational(-12, 6),
-                        mapOf(x to 2u) to Rational(7, 6),
-                        mapOf(y to 1u) to Rational(-10, 4),
-                        mapOf(x to 1u, y to 1u) to Rational(-7, 6),
-                        mapOf(x to 2u, y to 1u) to Rational(8, 9),
-                        mapOf(y to 2u) to Rational(16, 3),
-                        mapOf(x to 1u, y to 2u) to Rational(-13, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(5, 1),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(10, 6),
-                        mapOf(x to 1u) to Rational(-18, 6),
-                        mapOf(x to 2u) to Rational(5, 1),
-                        mapOf(y to 1u) to Rational(17, 7),
-                        mapOf(x to 1u, y to 1u) to Rational(8, 4),
-                        mapOf(x to 2u, y to 1u) to Rational(-4, 9),
-                        mapOf(y to 2u) to Rational(-6, 5),
-                        mapOf(x to 1u, y to 2u) to Rational(-15, 8),
-                        mapOf(x to 2u, y to 2u) to Rational(-18, 5),
-                    )
-                ),
-            )),
-            "test 4'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-506213, 2800),
-                    mapOf(x to 1u) to Rational(9859, 315),
-                    mapOf(x to 2u) to Rational(17384377, 11340),
-                    mapOf(x to 3u) to Rational(-9662, 63),
-                    mapOf(x to 4u) to Rational(-12563, 4),
-                    mapOf(y to 1u) to Rational(-486293, 22400),
-                    mapOf(x to 1u, y to 1u) to Rational(-6530947, 25200),
-                    mapOf(x to 2u, y to 1u) to Rational(866125, 18144),
-                    mapOf(x to 3u, y to 1u) to Rational(2948747, 2520),
-                    mapOf(x to 4u, y to 1u) to Rational(1196611, 2016),
-                    mapOf(y to 2u) to Rational(-20266021, 117600),
-                    mapOf(x to 1u, y to 2u) to Rational(26656339, 44100),
-                    mapOf(x to 2u, y to 2u) to Rational(19499183, 18144),
-                    mapOf(x to 3u, y to 2u) to Rational(-19801849, 7560),
-                    mapOf(x to 4u, y to 2u) to Rational(-2639635, 1296),
-                    mapOf(y to 3u) to Rational(-5017697, 29400),
-                    mapOf(x to 1u, y to 3u) to Rational(-606007, 1575),
-                    mapOf(x to 2u, y to 3u) to Rational(127494487, 132300),
-                    mapOf(x to 3u, y to 3u) to Rational(166567, 105),
-                    mapOf(x to 4u, y to 3u) to Rational(486403, 18144),
-                    mapOf(y to 4u) to Rational(-32182, 735),
-                    mapOf(x to 1u, y to 4u) to Rational(2420671, 8820),
-                    mapOf(x to 2u, y to 4u) to Rational(-12619193, 26460),
-                    mapOf(x to 3u, y to 4u) to Rational(-6823067, 5670),
-                    mapOf(x to 4u, y to 4u) to Rational(-2311693, 13608),
-                    mapOf(y to 5u) to Rational(-13324, 245),
-                    mapOf(x to 1u, y to 5u) to Rational(1966, 35),
-                    mapOf(x to 2u, y to 5u) to Rational(1052719, 2520),
-                    mapOf(x to 3u, y to 5u) to Rational(19153, 270),
-                    mapOf(x to 4u, y to 5u) to Rational(701, 54),
-                    mapOf(y to 6u) to Rational(4647, 196),
-                    mapOf(x to 1u, y to 6u) to Rational(2197, 28),
-                    mapOf(x to 2u, y to 6u) to Rational(-43853, 336),
-                    mapOf(x to 3u, y to 6u) to Rational(-301, 3),
-                    mapOf(x to 4u, y to 6u) to Rational(34, 3)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-2843, 1600),
-                    mapOf(x to 1u) to Rational(-1483, 240),
-                    mapOf(x to 2u) to Rational(110623, 1296),
-                    mapOf(x to 3u) to Rational(1265, 72),
-                    mapOf(x to 4u) to Rational(-5011, 16),
-                    mapOf(y to 1u) to Rational(47743, 1800),
-                    mapOf(x to 1u, y to 1u) to Rational(619229, 32400),
-                    mapOf(x to 2u, y to 1u) to Rational(-5978369, 58320),
-                    mapOf(x to 3u, y to 1u) to Rational(-86081, 1620),
-                    mapOf(x to 4u, y to 1u) to Rational(6325, 72),
-                    mapOf(y to 2u) to Rational(110951, 3360),
-                    mapOf(x to 1u, y to 2u) to Rational(-9550649, 302400),
-                    mapOf(x to 2u, y to 2u) to Rational(6542933, 85050),
-                    mapOf(x to 3u, y to 2u) to Rational(4708291, 38880),
-                    mapOf(x to 4u, y to 2u) to Rational(-433327, 1296),
-                    mapOf(y to 3u) to Rational(56143, 600),
-                    mapOf(x to 1u, y to 3u) to Rational(94243, 720),
-                    mapOf(x to 2u, y to 3u) to Rational(-46779139, 226800),
-                    mapOf(x to 3u, y to 3u) to Rational(-6948253, 12960),
-                    mapOf(x to 4u, y to 3u) to Rational(-260261, 486),
-                    mapOf(y to 4u) to Rational(-3205317, 19600),
-                    mapOf(x to 1u, y to 4u) to Rational(-201253, 1050),
-                    mapOf(x to 2u, y to 4u) to Rational(332192677, 302400),
-                    mapOf(x to 3u, y to 4u) to Rational(351511, 360),
-                    mapOf(x to 4u, y to 4u) to Rational(-40547, 81),
-                    mapOf(y to 5u) to Rational(-65421, 1960),
-                    mapOf(x to 1u, y to 5u) to Rational(-10118, 35),
-                    mapOf(x to 2u, y to 5u) to Rational(-4341709, 10080),
-                    mapOf(x to 3u, y to 5u) to Rational(-91703, 360),
-                    mapOf(x to 4u, y to 5u) to Rational(-85, 9),
-                    mapOf(y to 6u) to Rational(-25965, 784),
-                    mapOf(x to 1u, y to 6u) to Rational(3351, 16),
-                    mapOf(x to 2u, y to 6u) to Rational(595159, 1344),
-                    mapOf(x to 3u, y to 6u) to Rational(-1381, 12),
-                    mapOf(x to 4u, y to 6u) to Rational(-155, 3)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(10, 2),
-                    mapOf(x to 1u) to Rational(6, 7),
-                    mapOf(x to 2u) to Rational(-16, 1),
-                    mapOf(y to 1u) to Rational(13, 8),
-                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
-                    mapOf(y to 2u) to Rational(10, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-17, 4),
-                    mapOf(x to 2u) to Rational(-14, 8),
-                    mapOf(y to 1u) to Rational(17, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
-                    mapOf(y to 2u) to Rational(16, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                x to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-17, 5),
-                        mapOf(x to 1u) to Rational(2, 6),
-                        mapOf(x to 2u) to Rational(14, 1),
-                        mapOf(y to 1u) to Rational(-6, 6),
-                        mapOf(x to 1u, y to 1u) to Rational(-7, 3),
-                        mapOf(x to 2u, y to 1u) to Rational(-2, 9),
-                        mapOf(y to 2u) to Rational(-9, 6),
-                        mapOf(x to 1u, y to 2u) to Rational(17, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(2, 1),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(5, 4),
-                        mapOf(x to 1u) to Rational(-5, 9),
-                        mapOf(x to 2u) to Rational(-3, 6),
-                        mapOf(y to 1u) to Rational(6, 5),
-                        mapOf(x to 1u, y to 1u) to Rational(14, 5),
-                        mapOf(x to 2u, y to 1u) to Rational(5, 2),
-                        mapOf(y to 2u) to Rational(-18, 7),
-                        mapOf(x to 1u, y to 2u) to Rational(-8, 2),
-                        mapOf(x to 2u, y to 2u) to Rational(18, 9),
-                    )
-                ),
-            )),
-            "test 5"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-506213, 2800),
-                    mapOf(x to 1u) to Rational(9859, 315),
-                    mapOf(x to 2u) to Rational(17384377, 11340),
-                    mapOf(x to 3u) to Rational(-9662, 63),
-                    mapOf(x to 4u) to Rational(-12563, 4),
-                    mapOf(y to 1u) to Rational(-486293, 22400),
-                    mapOf(x to 1u, y to 1u) to Rational(-6530947, 25200),
-                    mapOf(x to 2u, y to 1u) to Rational(866125, 18144),
-                    mapOf(x to 3u, y to 1u) to Rational(2948747, 2520),
-                    mapOf(x to 4u, y to 1u) to Rational(1196611, 2016),
-                    mapOf(y to 2u) to Rational(-20266021, 117600),
-                    mapOf(x to 1u, y to 2u) to Rational(26656339, 44100),
-                    mapOf(x to 2u, y to 2u) to Rational(19499183, 18144),
-                    mapOf(x to 3u, y to 2u) to Rational(-19801849, 7560),
-                    mapOf(x to 4u, y to 2u) to Rational(-2639635, 1296),
-                    mapOf(y to 3u) to Rational(-5017697, 29400),
-                    mapOf(x to 1u, y to 3u) to Rational(-606007, 1575),
-                    mapOf(x to 2u, y to 3u) to Rational(127494487, 132300),
-                    mapOf(x to 3u, y to 3u) to Rational(166567, 105),
-                    mapOf(x to 4u, y to 3u) to Rational(486403, 18144),
-                    mapOf(y to 4u) to Rational(-32182, 735),
-                    mapOf(x to 1u, y to 4u) to Rational(2420671, 8820),
-                    mapOf(x to 2u, y to 4u) to Rational(-12619193, 26460),
-                    mapOf(x to 3u, y to 4u) to Rational(-6823067, 5670),
-                    mapOf(x to 4u, y to 4u) to Rational(-2311693, 13608),
-                    mapOf(y to 5u) to Rational(-13324, 245),
-                    mapOf(x to 1u, y to 5u) to Rational(1966, 35),
-                    mapOf(x to 2u, y to 5u) to Rational(1052719, 2520),
-                    mapOf(x to 3u, y to 5u) to Rational(19153, 270),
-                    mapOf(x to 4u, y to 5u) to Rational(701, 54),
-                    mapOf(y to 6u) to Rational(4647, 196),
-                    mapOf(x to 1u, y to 6u) to Rational(2197, 28),
-                    mapOf(x to 2u, y to 6u) to Rational(-43853, 336),
-                    mapOf(x to 3u, y to 6u) to Rational(-301, 3),
-                    mapOf(x to 4u, y to 6u) to Rational(34, 3)
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(-2843, 1600),
-                    mapOf(x to 1u) to Rational(-1483, 240),
-                    mapOf(x to 2u) to Rational(110623, 1296),
-                    mapOf(x to 3u) to Rational(1265, 72),
-                    mapOf(x to 4u) to Rational(-5011, 16),
-                    mapOf(y to 1u) to Rational(47743, 1800),
-                    mapOf(x to 1u, y to 1u) to Rational(619229, 32400),
-                    mapOf(x to 2u, y to 1u) to Rational(-5978369, 58320),
-                    mapOf(x to 3u, y to 1u) to Rational(-86081, 1620),
-                    mapOf(x to 4u, y to 1u) to Rational(6325, 72),
-                    mapOf(y to 2u) to Rational(110951, 3360),
-                    mapOf(x to 1u, y to 2u) to Rational(-9550649, 302400),
-                    mapOf(x to 2u, y to 2u) to Rational(6542933, 85050),
-                    mapOf(x to 3u, y to 2u) to Rational(4708291, 38880),
-                    mapOf(x to 4u, y to 2u) to Rational(-433327, 1296),
-                    mapOf(y to 3u) to Rational(56143, 600),
-                    mapOf(x to 1u, y to 3u) to Rational(94243, 720),
-                    mapOf(x to 2u, y to 3u) to Rational(-46779139, 226800),
-                    mapOf(x to 3u, y to 3u) to Rational(-6948253, 12960),
-                    mapOf(x to 4u, y to 3u) to Rational(-260261, 486),
-                    mapOf(y to 4u) to Rational(-3205317, 19600),
-                    mapOf(x to 1u, y to 4u) to Rational(-201253, 1050),
-                    mapOf(x to 2u, y to 4u) to Rational(332192677, 302400),
-                    mapOf(x to 3u, y to 4u) to Rational(351511, 360),
-                    mapOf(x to 4u, y to 4u) to Rational(-40547, 81),
-                    mapOf(y to 5u) to Rational(-65421, 1960),
-                    mapOf(x to 1u, y to 5u) to Rational(-10118, 35),
-                    mapOf(x to 2u, y to 5u) to Rational(-4341709, 10080),
-                    mapOf(x to 3u, y to 5u) to Rational(-91703, 360),
-                    mapOf(x to 4u, y to 5u) to Rational(-85, 9),
-                    mapOf(y to 6u) to Rational(-25965, 784),
-                    mapOf(x to 1u, y to 6u) to Rational(3351, 16),
-                    mapOf(x to 2u, y to 6u) to Rational(595159, 1344),
-                    mapOf(x to 3u, y to 6u) to Rational(-1381, 12),
-                    mapOf(x to 4u, y to 6u) to Rational(-155, 3)
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(10, 2),
-                    mapOf(x to 1u) to Rational(6, 7),
-                    mapOf(x to 2u) to Rational(-16, 1),
-                    mapOf(y to 1u) to Rational(13, 8),
-                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
-                    mapOf(y to 2u) to Rational(10, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-17, 4),
-                    mapOf(x to 2u) to Rational(-14, 8),
-                    mapOf(y to 1u) to Rational(17, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
-                    mapOf(y to 2u) to Rational(16, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                x to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(-17, 5),
-                        mapOf(x to 1u) to Rational(2, 6),
-                        mapOf(x to 2u) to Rational(14, 1),
-                        mapOf(y to 1u) to Rational(-6, 6),
-                        mapOf(x to 1u, y to 1u) to Rational(-7, 3),
-                        mapOf(x to 2u, y to 1u) to Rational(-2, 9),
-                        mapOf(y to 2u) to Rational(-9, 6),
-                        mapOf(x to 1u, y to 2u) to Rational(17, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(2, 1),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(5, 4),
-                        mapOf(x to 1u) to Rational(-5, 9),
-                        mapOf(x to 2u) to Rational(-3, 6),
-                        mapOf(y to 1u) to Rational(6, 5),
-                        mapOf(x to 1u, y to 1u) to Rational(14, 5),
-                        mapOf(x to 2u, y to 1u) to Rational(5, 2),
-                        mapOf(y to 2u) to Rational(-18, 7),
-                        mapOf(x to 1u, y to 2u) to Rational(-8, 2),
-                        mapOf(x to 2u, y to 2u) to Rational(18, 9),
-                    )
-                ),
-                iota to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(5, 8),
-                        mapOf(x to 1u) to Rational(-12, 6),
-                        mapOf(x to 2u) to Rational(7, 6),
-                        mapOf(y to 1u) to Rational(-10, 4),
-                        mapOf(x to 1u, y to 1u) to Rational(-7, 6),
-                        mapOf(x to 2u, y to 1u) to Rational(8, 9),
-                        mapOf(y to 2u) to Rational(16, 3),
-                        mapOf(x to 1u, y to 2u) to Rational(-13, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(5, 1),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(10, 6),
-                        mapOf(x to 1u) to Rational(-18, 6),
-                        mapOf(x to 2u) to Rational(5, 1),
-                        mapOf(y to 1u) to Rational(17, 7),
-                        mapOf(x to 1u, y to 1u) to Rational(8, 4),
-                        mapOf(x to 2u, y to 1u) to Rational(-4, 9),
-                        mapOf(y to 2u) to Rational(-6, 5),
-                        mapOf(x to 1u, y to 2u) to Rational(-15, 8),
-                        mapOf(x to 2u, y to 2u) to Rational(-18, 5),
-                    )
-                ),
-            )),
-            "test 5'"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(10, 2),
-                    mapOf(x to 1u) to Rational(6, 7),
-                    mapOf(x to 2u) to Rational(-16, 1),
-                    mapOf(y to 1u) to Rational(13, 8),
-                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
-                    mapOf(y to 2u) to Rational(10, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-17, 4),
-                    mapOf(x to 2u) to Rational(-14, 8),
-                    mapOf(y to 1u) to Rational(17, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
-                    mapOf(y to 2u) to Rational(16, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(10, 2),
-                    mapOf(x to 1u) to Rational(6, 7),
-                    mapOf(x to 2u) to Rational(-16, 1),
-                    mapOf(y to 1u) to Rational(13, 8),
-                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
-                    mapOf(y to 2u) to Rational(10, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-17, 4),
-                    mapOf(x to 2u) to Rational(-14, 8),
-                    mapOf(y to 1u) to Rational(17, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
-                    mapOf(y to 2u) to Rational(16, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf<Symbol, LabeledRationalFunction<Rational>>()),
-            "test 6"
-        )
-        assertEquals(
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(10, 2),
-                    mapOf(x to 1u) to Rational(6, 7),
-                    mapOf(x to 2u) to Rational(-16, 1),
-                    mapOf(y to 1u) to Rational(13, 8),
-                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
-                    mapOf(y to 2u) to Rational(10, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-17, 4),
-                    mapOf(x to 2u) to Rational(-14, 8),
-                    mapOf(y to 1u) to Rational(17, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
-                    mapOf(y to 2u) to Rational(16, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            ),
-            LabeledRationalFunction(
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(10, 2),
-                    mapOf(x to 1u) to Rational(6, 7),
-                    mapOf(x to 2u) to Rational(-16, 1),
-                    mapOf(y to 1u) to Rational(13, 8),
-                    mapOf(x to 1u, y to 1u) to Rational(-12, 1),
-                    mapOf(x to 2u, y to 1u) to Rational(16, 8),
-                    mapOf(y to 2u) to Rational(10, 4),
-                    mapOf(x to 1u, y to 2u) to Rational(4, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-11, 3),
-                ),
-                LabeledPolynomialAsIs(
-                    mapOf<Symbol, UInt>() to Rational(1, 4),
-                    mapOf(x to 1u) to Rational(-17, 4),
-                    mapOf(x to 2u) to Rational(-14, 8),
-                    mapOf(y to 1u) to Rational(17, 9),
-                    mapOf(x to 1u, y to 1u) to Rational(1, 3),
-                    mapOf(x to 2u, y to 1u) to Rational(7, 6),
-                    mapOf(y to 2u) to Rational(16, 3),
-                    mapOf(x to 1u, y to 2u) to Rational(-17, 1),
-                    mapOf(x to 2u, y to 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                iota to LabeledRationalFunction(
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(5, 8),
-                        mapOf(x to 1u) to Rational(-12, 6),
-                        mapOf(x to 2u) to Rational(7, 6),
-                        mapOf(y to 1u) to Rational(-10, 4),
-                        mapOf(x to 1u, y to 1u) to Rational(-7, 6),
-                        mapOf(x to 2u, y to 1u) to Rational(8, 9),
-                        mapOf(y to 2u) to Rational(16, 3),
-                        mapOf(x to 1u, y to 2u) to Rational(-13, 4),
-                        mapOf(x to 2u, y to 2u) to Rational(5, 1),
-                    ),
-                    LabeledPolynomialAsIs(
-                        mapOf<Symbol, UInt>() to Rational(10, 6),
-                        mapOf(x to 1u) to Rational(-18, 6),
-                        mapOf(x to 2u) to Rational(5, 1),
-                        mapOf(y to 1u) to Rational(17, 7),
-                        mapOf(x to 1u, y to 1u) to Rational(8, 4),
-                        mapOf(x to 2u, y to 1u) to Rational(-4, 9),
-                        mapOf(y to 2u) to Rational(-6, 5),
-                        mapOf(x to 1u, y to 2u) to Rational(-15, 8),
-                        mapOf(x to 2u, y to 2u) to Rational(-18, 5),
-                    )
-                ),
-            )),
-            "test 6'"
-        )
-    }
-    @Test
-    @OptIn(UnstableKMathAPI::class)
-    fun test_Polynomial_derivativeWithRespectTo_variable() {
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-2),
-                mapOf(x to 1u) to Rational(2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).derivativeWithRespectTo(RationalField, x),
-            "test 1"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-2, 3),
-                mapOf(x to 1u) to Rational(1, 1),
-                mapOf(x to 2u) to Rational(-33, 8),
-                mapOf(x to 3u) to Rational(72, 1),
-                mapOf(y to 1u) to Rational(2, 3),
-                mapOf(x to 1u, y to 1u) to Rational(-22, 1),
-                mapOf(x to 2u, y to 1u) to Rational(-1, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-36, 1),
-                mapOf(y to 2u) to Rational(-8, 5),
-                mapOf(x to 1u, y to 2u) to Rational(-1, 4),
-                mapOf(x to 2u, y to 2u) to Rational(12, 7),
-                mapOf(x to 3u, y to 2u) to Rational(-2, 1),
-                mapOf(y to 3u) to Rational(16, 8),
-                mapOf(x to 1u, y to 3u) to Rational(-4, 1),
-                mapOf(x to 2u, y to 3u) to Rational(9, 2),
-                mapOf(x to 3u, y to 3u) to Rational(20, 9),
-                mapOf(y to 4u) to Rational(-10, 1),
-                mapOf(x to 1u, y to 4u) to Rational(-14, 1),
-                mapOf(x to 2u, y to 4u) to Rational(3, 7),
-                mapOf(x to 3u, y to 4u) to Rational(20, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).derivativeWithRespectTo(RationalField, x),
-            "test 2a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-18, 3),
-                mapOf(x to 1u) to Rational(2, 3),
-                mapOf(x to 2u) to Rational(-11, 1),
-                mapOf(x to 3u) to Rational(-1, 3),
-                mapOf(x to 4u) to Rational(-18, 2),
-                mapOf(y to 1u) to Rational(-20, 3),
-                mapOf(x to 1u, y to 1u) to Rational(-16, 5),
-                mapOf(x to 2u, y to 1u) to Rational(-1, 4),
-                mapOf(x to 3u, y to 1u) to Rational(8, 7),
-                mapOf(x to 4u, y to 1u) to Rational(-1, 1),
-                mapOf(y to 2u) to Rational(9, 7),
-                mapOf(x to 1u, y to 2u) to Rational(6, 1),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 1),
-                mapOf(x to 3u, y to 2u) to Rational(9, 2),
-                mapOf(x to 4u, y to 2u) to Rational(5, 3),
-                mapOf(y to 3u) to Rational(-9, 1),
-                mapOf(x to 1u, y to 3u) to Rational(-40, 1),
-                mapOf(x to 2u, y to 3u) to Rational(-28, 1),
-                mapOf(x to 3u, y to 3u) to Rational(4, 7),
-                mapOf(x to 4u, y to 3u) to Rational(20, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).derivativeWithRespectTo(RationalField, y),
-            "test 2b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(-1, 4),
-                mapOf(x to 2u, y to 2u) to Rational(12, 7),
-                mapOf(x to 3u, y to 2u) to Rational(-2, 1),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(-4, 1),
-                mapOf(x to 2u, y to 3u) to Rational(9, 2),
-                mapOf(x to 3u, y to 3u) to Rational(20, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(-14, 1),
-                mapOf(x to 2u, y to 4u) to Rational(3, 7),
-                mapOf(x to 3u, y to 4u) to Rational(20, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).derivativeWithRespectTo(RationalField, x),
-            "test 3a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(-1, 4),
-                mapOf(x to 3u, y to 1u) to Rational(8, 7),
-                mapOf(x to 4u, y to 1u) to Rational(-1, 1),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 1),
-                mapOf(x to 3u, y to 2u) to Rational(9, 2),
-                mapOf(x to 4u, y to 2u) to Rational(5, 3),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-28, 1),
-                mapOf(x to 3u, y to 3u) to Rational(4, 7),
-                mapOf(x to 4u, y to 3u) to Rational(20, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).derivativeWithRespectTo(RationalField, y),
-            "test 3b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-2, 3),
-                mapOf(x to 1u) to Rational(1, 1),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(y to 1u) to Rational(2, 3),
-                mapOf(x to 1u, y to 1u) to Rational(-22, 1),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-8, 5),
-                mapOf(x to 1u, y to 2u) to Rational(-1, 4),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).derivativeWithRespectTo(RationalField, x),
-            "test 4a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-18, 3),
-                mapOf(x to 1u) to Rational(2, 3),
-                mapOf(x to 2u) to Rational(-11, 1),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-20, 3),
-                mapOf(x to 1u, y to 1u) to Rational(-16, 5),
-                mapOf(x to 2u, y to 1u) to Rational(-1, 4),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).derivativeWithRespectTo(RationalField, y),
-            "test 4b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).derivativeWithRespectTo(RationalField, iota),
-            "test 5"
-        )
-    }
-    @Test
-    @OptIn(UnstableKMathAPI::class)
-    fun test_Polynomial_nthDerivativeWithRespectTo_variable_order() {
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-2),
-                mapOf(x to 1u) to Rational(2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, x, 1u),
-            "test 1"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, x, 0u),
-            "test 2"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, x, 2u),
-            "test 3"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, x, 3u),
-            "test 4"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, x, 4u),
-            "test 5"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, y, 0u),
-            "test 6"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, y, 1u),
-            "test 7"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, y, 2u),
-            "test 8"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1, 1),
-                mapOf(x to 1u) to Rational(-33, 4),
-                mapOf(x to 2u) to Rational(216, 1),
-                mapOf(y to 1u) to Rational(-22, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-2, 1),
-                mapOf(x to 2u, y to 1u) to Rational(-108, 1),
-                mapOf(y to 2u) to Rational(-1, 4),
-                mapOf(x to 1u, y to 2u) to Rational(24, 7),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 1),
-                mapOf(y to 3u) to Rational(-4, 1),
-                mapOf(x to 1u, y to 3u) to Rational(9, 1),
-                mapOf(x to 2u, y to 3u) to Rational(20, 3),
-                mapOf(y to 4u) to Rational(-14, 1),
-                mapOf(x to 1u, y to 4u) to Rational(6, 7),
-                mapOf(x to 2u, y to 4u) to Rational(60, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, x, 2u),
-            "test 9a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-20, 3),
-                mapOf(x to 1u) to Rational(-16, 5),
-                mapOf(x to 2u) to Rational(-1, 4),
-                mapOf(x to 3u) to Rational(8, 7),
-                mapOf(x to 4u) to Rational(-1, 1),
-                mapOf(y to 1u) to Rational(18, 7),
-                mapOf(x to 1u, y to 1u) to Rational(12, 1),
-                mapOf(x to 2u, y to 1u) to Rational(-12, 1),
-                mapOf(x to 3u, y to 1u) to Rational(9, 1),
-                mapOf(x to 4u, y to 1u) to Rational(10, 3),
-                mapOf(y to 2u) to Rational(-27, 1),
-                mapOf(x to 1u, y to 2u) to Rational(-120, 1),
-                mapOf(x to 2u, y to 2u) to Rational(-84, 1),
-                mapOf(x to 3u, y to 2u) to Rational(12, 7),
-                mapOf(x to 4u, y to 2u) to Rational(60, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, y, 2u),
-            "test 9b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-1, 4),
-                mapOf(x to 1u, y to 2u) to Rational(24, 7),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 1),
-                mapOf(y to 3u) to Rational(-4, 1),
-                mapOf(x to 1u, y to 3u) to Rational(9, 1),
-                mapOf(x to 2u, y to 3u) to Rational(20, 3),
-                mapOf(y to 4u) to Rational(-14, 1),
-                mapOf(x to 1u, y to 4u) to Rational(6, 7),
-                mapOf(x to 2u, y to 4u) to Rational(60, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, x, 2u),
-            "test 10a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(-1, 4),
-                mapOf(x to 3u) to Rational(8, 7),
-                mapOf(x to 4u) to Rational(-1, 1),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(-12, 1),
-                mapOf(x to 3u, y to 1u) to Rational(9, 1),
-                mapOf(x to 4u, y to 1u) to Rational(10, 3),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-84, 1),
-                mapOf(x to 3u, y to 2u) to Rational(12, 7),
-                mapOf(x to 4u, y to 2u) to Rational(60, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, y, 2u),
-            "test 10b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1, 1),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(y to 1u) to Rational(-22, 1),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-1, 4),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).nthDerivativeWithRespectTo(RationalField, x, 2u),
-            "test 11a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-20, 3),
-                mapOf(x to 1u) to Rational(-16, 5),
-                mapOf(x to 2u) to Rational(-1, 4),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).nthDerivativeWithRespectTo(RationalField, y, 2u),
-            "test 11b"
-        )
-    }
-    @Test
-    @OptIn(UnstableKMathAPI::class)
-    fun test_Polynomial_nthDerivativeWithRespectTo_variablesAndOrders() {
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-2),
-                mapOf(x to 1u) to Rational(2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 1u)),
-            "test 1"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 0u)),
-            "test 2"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 2u)),
-            "test 3"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 3u)),
-            "test 4"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 4u)),
-            "test 5"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(y to 0u)),
-            "test 6"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(y to 1u)),
-            "test 7"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(y to 2u)),
-            "test 8"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf()),
-            "test 9"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-2),
-                mapOf(x to 1u) to Rational(2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(
-                x to 1u,
-                y to 0u
-            )),
-            "test 10"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(
-                x to 0u,
-                y to 1u
-            )),
-            "test 11"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1, 1),
-                mapOf(x to 1u) to Rational(-33, 4),
-                mapOf(x to 2u) to Rational(216, 1),
-                mapOf(y to 1u) to Rational(-22, 1),
-                mapOf(x to 1u, y to 1u) to Rational(-2, 1),
-                mapOf(x to 2u, y to 1u) to Rational(-108, 1),
-                mapOf(y to 2u) to Rational(-1, 4),
-                mapOf(x to 1u, y to 2u) to Rational(24, 7),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 1),
-                mapOf(y to 3u) to Rational(-4, 1),
-                mapOf(x to 1u, y to 3u) to Rational(9, 1),
-                mapOf(x to 2u, y to 3u) to Rational(20, 3),
-                mapOf(y to 4u) to Rational(-14, 1),
-                mapOf(x to 1u, y to 4u) to Rational(6, 7),
-                mapOf(x to 2u, y to 4u) to Rational(60, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 2u)),
-            "test 12a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(2, 3),
-                mapOf(x to 1u) to Rational(-22, 1),
-                mapOf(x to 2u) to Rational(-1, 1),
-                mapOf(x to 3u) to Rational(-36, 1),
-                mapOf(y to 1u) to Rational(-16, 5),
-                mapOf(x to 1u, y to 1u) to Rational(-1, 2),
-                mapOf(x to 2u, y to 1u) to Rational(24, 7),
-                mapOf(x to 3u, y to 1u) to Rational(-4, 1),
-                mapOf(y to 2u) to Rational(6, 1),
-                mapOf(x to 1u, y to 2u) to Rational(-12, 1),
-                mapOf(x to 2u, y to 2u) to Rational(27, 2),
-                mapOf(x to 3u, y to 2u) to Rational(20, 3),
-                mapOf(y to 3u) to Rational(-40, 1),
-                mapOf(x to 1u, y to 3u) to Rational(-56, 1),
-                mapOf(x to 2u, y to 3u) to Rational(12, 7),
-                mapOf(x to 3u, y to 3u) to Rational(80, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 1u, y to 1u)),
-            "test 12b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-20, 3),
-                mapOf(x to 1u) to Rational(-16, 5),
-                mapOf(x to 2u) to Rational(-1, 4),
-                mapOf(x to 3u) to Rational(8, 7),
-                mapOf(x to 4u) to Rational(-1, 1),
-                mapOf(y to 1u) to Rational(18, 7),
-                mapOf(x to 1u, y to 1u) to Rational(12, 1),
-                mapOf(x to 2u, y to 1u) to Rational(-12, 1),
-                mapOf(x to 3u, y to 1u) to Rational(9, 1),
-                mapOf(x to 4u, y to 1u) to Rational(10, 3),
-                mapOf(y to 2u) to Rational(-27, 1),
-                mapOf(x to 1u, y to 2u) to Rational(-120, 1),
-                mapOf(x to 2u, y to 2u) to Rational(-84, 1),
-                mapOf(x to 3u, y to 2u) to Rational(12, 7),
-                mapOf(x to 4u, y to 2u) to Rational(60, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(y to 2u)),
-            "test 12c"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-1, 4),
-                mapOf(x to 1u, y to 2u) to Rational(24, 7),
-                mapOf(x to 2u, y to 2u) to Rational(-6, 1),
-                mapOf(y to 3u) to Rational(-4, 1),
-                mapOf(x to 1u, y to 3u) to Rational(9, 1),
-                mapOf(x to 2u, y to 3u) to Rational(20, 3),
-                mapOf(y to 4u) to Rational(-14, 1),
-                mapOf(x to 1u, y to 4u) to Rational(6, 7),
-                mapOf(x to 2u, y to 4u) to Rational(60, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 2u)),
-            "test 13a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(-1, 2),
-                mapOf(x to 2u, y to 1u) to Rational(24, 7),
-                mapOf(x to 3u, y to 1u) to Rational(-4, 1),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(-12, 1),
-                mapOf(x to 2u, y to 2u) to Rational(27, 2),
-                mapOf(x to 3u, y to 2u) to Rational(20, 3),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(-56, 1),
-                mapOf(x to 2u, y to 3u) to Rational(12, 7),
-                mapOf(x to 3u, y to 3u) to Rational(80, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 1u, y to 1u)),
-            "test 13b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(-1, 4),
-                mapOf(x to 3u) to Rational(8, 7),
-                mapOf(x to 4u) to Rational(-1, 1),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(-12, 1),
-                mapOf(x to 3u, y to 1u) to Rational(9, 1),
-                mapOf(x to 4u, y to 1u) to Rational(10, 3),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-84, 1),
-                mapOf(x to 3u, y to 2u) to Rational(12, 7),
-                mapOf(x to 4u, y to 2u) to Rational(60, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(y to 2u)),
-            "test 13c"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1, 1),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(y to 1u) to Rational(-22, 1),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-1, 4),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 2u)),
-            "test 14a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(2, 3),
-                mapOf(x to 1u) to Rational(-22, 1),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(y to 1u) to Rational(-16, 5),
-                mapOf(x to 1u, y to 1u) to Rational(-1, 2),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(x to 1u, y to 1u)),
-            "test 14b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-20, 3),
-                mapOf(x to 1u) to Rational(-16, 5),
-                mapOf(x to 2u) to Rational(-1, 4),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(y to 2u)),
-            "test 14c"
-        )
-    }
-    @Test
-    @OptIn(UnstableKMathAPI::class)
-    fun test_Polynomial_antiderivativeWithRespectTo_variable() {
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 1u) to Rational(1),
-                mapOf(x to 2u) to Rational(-1),
-                mapOf(x to 3u) to Rational(1, 3),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).antiderivativeWithRespectTo(RationalField, x),
-            "test 1"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 1u) to Rational(-6, 8),
-                mapOf(x to 2u) to Rational(-1, 3),
-                mapOf(x to 3u) to Rational(1, 6),
-                mapOf(x to 4u) to Rational(-11, 32),
-                mapOf(x to 5u) to Rational(18, 5),
-                mapOf(x to 1u, y to 1u) to Rational(-18, 3),
-                mapOf(x to 2u, y to 1u) to Rational(1, 3),
-                mapOf(x to 3u, y to 1u) to Rational(-11, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-1, 12),
-                mapOf(x to 5u, y to 1u) to Rational(-18, 10),
-                mapOf(x to 1u, y to 2u) to Rational(-10, 3),
-                mapOf(x to 2u, y to 2u) to Rational(-4, 5),
-                mapOf(x to 3u, y to 2u) to Rational(-1, 24),
-                mapOf(x to 4u, y to 2u) to Rational(1, 7),
-                mapOf(x to 5u, y to 2u) to Rational(-1, 10),
-                mapOf(x to 1u, y to 3u) to Rational(3, 7),
-                mapOf(x to 2u, y to 3u) to Rational(1, 1),
-                mapOf(x to 3u, y to 3u) to Rational(-2, 3),
-                mapOf(x to 4u, y to 3u) to Rational(3, 8),
-                mapOf(x to 5u, y to 3u) to Rational(1, 9),
-                mapOf(x to 1u, y to 4u) to Rational(-18, 8),
-                mapOf(x to 2u, y to 4u) to Rational(-5, 1),
-                mapOf(x to 3u, y to 4u) to Rational(-7, 3),
-                mapOf(x to 4u, y to 4u) to Rational(1, 28),
-                mapOf(x to 5u, y to 4u) to Rational(1, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).antiderivativeWithRespectTo(RationalField, x),
-            "test 2a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 1u) to Rational(-6, 8),
-                mapOf(x to 1u, y to 1u) to Rational(-2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(1, 2),
-                mapOf(x to 3u, y to 1u) to Rational(-11, 8),
-                mapOf(x to 4u, y to 1u) to Rational(18, 1),
-                mapOf(y to 2u) to Rational(-9, 3),
-                mapOf(x to 1u, y to 2u) to Rational(1, 3),
-                mapOf(x to 2u, y to 2u) to Rational(-11, 2),
-                mapOf(x to 3u, y to 2u) to Rational(-1, 6),
-                mapOf(x to 4u, y to 2u) to Rational(-9, 2),
-                mapOf(y to 3u) to Rational(-10, 9),
-                mapOf(x to 1u, y to 3u) to Rational(-8, 15),
-                mapOf(x to 2u, y to 3u) to Rational(-1, 24),
-                mapOf(x to 3u, y to 3u) to Rational(4, 21),
-                mapOf(x to 4u, y to 3u) to Rational(-1, 6),
-                mapOf(y to 4u) to Rational(3, 28),
-                mapOf(x to 1u, y to 4u) to Rational(1, 2),
-                mapOf(x to 2u, y to 4u) to Rational(-1, 2),
-                mapOf(x to 3u, y to 4u) to Rational(3, 8),
-                mapOf(x to 4u, y to 4u) to Rational(5, 36),
-                mapOf(y to 5u) to Rational(-9, 20),
-                mapOf(x to 1u, y to 5u) to Rational(-2, 1),
-                mapOf(x to 2u, y to 5u) to Rational(-7, 5),
-                mapOf(x to 3u, y to 5u) to Rational(1, 35),
-                mapOf(x to 4u, y to 5u) to Rational(1, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).antiderivativeWithRespectTo(RationalField, y),
-            "test 2b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(x to 5u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(x to 5u, y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(x to 3u, y to 2u) to Rational(-1, 24),
-                mapOf(x to 4u, y to 2u) to Rational(1, 7),
-                mapOf(x to 5u, y to 2u) to Rational(-1, 10),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(-2, 3),
-                mapOf(x to 4u, y to 3u) to Rational(3, 8),
-                mapOf(x to 5u, y to 3u) to Rational(1, 9),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(-7, 3),
-                mapOf(x to 4u, y to 4u) to Rational(1, 28),
-                mapOf(x to 5u, y to 4u) to Rational(1, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).antiderivativeWithRespectTo(RationalField, x),
-            "test 3a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-1, 24),
-                mapOf(x to 3u, y to 3u) to Rational(4, 21),
-                mapOf(x to 4u, y to 3u) to Rational(-1, 6),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-1, 2),
-                mapOf(x to 3u, y to 4u) to Rational(3, 8),
-                mapOf(x to 4u, y to 4u) to Rational(5, 36),
-                mapOf(y to 5u) to Rational(0),
-                mapOf(x to 1u, y to 5u) to Rational(0),
-                mapOf(x to 2u, y to 5u) to Rational(-7, 5),
-                mapOf(x to 3u, y to 5u) to Rational(1, 35),
-                mapOf(x to 4u, y to 5u) to Rational(1, 1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).antiderivativeWithRespectTo(RationalField, y),
-            "test 3b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 1u) to Rational(-6, 8),
-                mapOf(x to 2u) to Rational(-1, 3),
-                mapOf(x to 3u) to Rational(1, 6),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(x to 5u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(-18, 3),
-                mapOf(x to 2u, y to 1u) to Rational(1, 3),
-                mapOf(x to 3u, y to 1u) to Rational(-11, 3),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(x to 5u, y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(-10, 3),
-                mapOf(x to 2u, y to 2u) to Rational(-4, 5),
-                mapOf(x to 3u, y to 2u) to Rational(-1, 24),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(x to 5u, y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(x to 5u, y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-                mapOf(x to 5u, y to 4u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).antiderivativeWithRespectTo(RationalField, x),
-            "test 4a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 1u) to Rational(-6, 8),
-                mapOf(x to 1u, y to 1u) to Rational(-2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(1, 2),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-9, 3),
-                mapOf(x to 1u, y to 2u) to Rational(1, 3),
-                mapOf(x to 2u, y to 2u) to Rational(-11, 2),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(-10, 9),
-                mapOf(x to 1u, y to 3u) to Rational(-8, 15),
-                mapOf(x to 2u, y to 3u) to Rational(-1, 24),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-                mapOf(y to 5u) to Rational(0),
-                mapOf(x to 1u, y to 5u) to Rational(0),
-                mapOf(x to 2u, y to 5u) to Rational(0),
-                mapOf(x to 3u, y to 5u) to Rational(0),
-                mapOf(x to 4u, y to 5u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).antiderivativeWithRespectTo(RationalField, y),
-            "test 4b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(iota to 1u) to Rational(-6, 8),
-                mapOf(x to 1u, iota to 1u) to Rational(-2, 3),
-                mapOf(x to 2u, iota to 1u) to Rational(1, 2),
-                mapOf(x to 3u, iota to 1u) to Rational(-11, 8),
-                mapOf(x to 4u, iota to 1u) to Rational(18, 1),
-                mapOf(y to 1u, iota to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u, iota to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u, iota to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u, iota to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u, iota to 1u) to Rational(-18, 2),
-                mapOf(y to 2u, iota to 1u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u, iota to 1u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u, iota to 1u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u, iota to 1u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u, iota to 1u) to Rational(-4, 8),
-                mapOf(y to 3u, iota to 1u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u, iota to 1u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u, iota to 1u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u, iota to 1u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u, iota to 1u) to Rational(5, 9),
-                mapOf(y to 4u, iota to 1u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u, iota to 1u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u, iota to 1u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u, iota to 1u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u, iota to 1u) to Rational(15, 3),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).antiderivativeWithRespectTo(RationalField, iota),
-            "test 5"
-        )
-    }
-    @Test
-    @OptIn(UnstableKMathAPI::class)
-    fun test_Polynomial_nthAntiderivativeWithRespectTo_variable_order() {
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 1u) to Rational(1),
-                mapOf(x to 2u) to Rational(-1),
-                mapOf(x to 3u) to Rational(1, 3),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, x, 1u),
-            "test 1"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, x, 0u),
-            "test 2"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-1, 3),
-                mapOf(x to 4u) to Rational(1, 12),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, x, 2u),
-            "test 3"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 3u) to Rational(1, 6),
-                mapOf(x to 4u) to Rational(-1, 12),
-                mapOf(x to 5u) to Rational(1, 60),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, x, 3u),
-            "test 4"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 4u) to Rational(1, 24),
-                mapOf(x to 5u) to Rational(-1, 60),
-                mapOf(x to 6u) to Rational(1, 360),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, x, 4u),
-            "test 5"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, y, 0u),
-            "test 6"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 1u) to Rational(1),
-                mapOf(x to 1u, y to 1u) to Rational(-2),
-                mapOf(x to 2u, y to 1u) to Rational(1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, y, 1u),
-            "test 7"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 2u) to Rational(1, 2),
-                mapOf(x to 1u, y to 2u) to Rational(-1),
-                mapOf(x to 2u, y to 2u) to Rational(1, 2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, y, 2u),
-            "test 8"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 2u) to Rational(-3, 8),
-                mapOf(x to 3u) to Rational(-1, 9),
-                mapOf(x to 4u) to Rational(1, 24),
-                mapOf(x to 5u) to Rational(-11, 160),
-                mapOf(x to 6u) to Rational(3, 5),
-                mapOf(x to 2u, y to 1u) to Rational(-9, 3),
-                mapOf(x to 3u, y to 1u) to Rational(1, 9),
-                mapOf(x to 4u, y to 1u) to Rational(-11, 12),
-                mapOf(x to 5u, y to 1u) to Rational(-1, 60),
-                mapOf(x to 6u, y to 1u) to Rational(-3, 10),
-                mapOf(x to 2u, y to 2u) to Rational(-5, 3),
-                mapOf(x to 3u, y to 2u) to Rational(-4, 15),
-                mapOf(x to 4u, y to 2u) to Rational(-1, 96),
-                mapOf(x to 5u, y to 2u) to Rational(1, 35),
-                mapOf(x to 6u, y to 2u) to Rational(-1, 60),
-                mapOf(x to 2u, y to 3u) to Rational(3, 14),
-                mapOf(x to 3u, y to 3u) to Rational(1, 3),
-                mapOf(x to 4u, y to 3u) to Rational(-1, 6),
-                mapOf(x to 5u, y to 3u) to Rational(3, 40),
-                mapOf(x to 6u, y to 3u) to Rational(1, 54),
-                mapOf(x to 2u, y to 4u) to Rational(-9, 8),
-                mapOf(x to 3u, y to 4u) to Rational(-5, 3),
-                mapOf(x to 4u, y to 4u) to Rational(-7, 12),
-                mapOf(x to 5u, y to 4u) to Rational(1, 140),
-                mapOf(x to 6u, y to 4u) to Rational(1, 6),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, x, 2u),
-            "test 9a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 2u) to Rational(-3, 8),
-                mapOf(x to 1u, y to 2u) to Rational(-1, 3),
-                mapOf(x to 2u, y to 2u) to Rational(1, 4),
-                mapOf(x to 3u, y to 2u) to Rational(-11, 16),
-                mapOf(x to 4u, y to 2u) to Rational(9, 1),
-                mapOf(y to 3u) to Rational(-1, 1),
-                mapOf(x to 1u, y to 3u) to Rational(1, 9),
-                mapOf(x to 2u, y to 3u) to Rational(-11, 6),
-                mapOf(x to 3u, y to 3u) to Rational(-1, 18),
-                mapOf(x to 4u, y to 3u) to Rational(-9, 6),
-                mapOf(y to 4u) to Rational(-5, 18),
-                mapOf(x to 1u, y to 4u) to Rational(-2, 15),
-                mapOf(x to 2u, y to 4u) to Rational(-1, 96),
-                mapOf(x to 3u, y to 4u) to Rational(1, 21),
-                mapOf(x to 4u, y to 4u) to Rational(-1, 24),
-                mapOf(y to 5u) to Rational(3, 140),
-                mapOf(x to 1u, y to 5u) to Rational(1, 10),
-                mapOf(x to 2u, y to 5u) to Rational(-1, 10),
-                mapOf(x to 3u, y to 5u) to Rational(3, 40),
-                mapOf(x to 4u, y to 5u) to Rational(1, 36),
-                mapOf(y to 6u) to Rational(-3, 40),
-                mapOf(x to 1u, y to 6u) to Rational(-1, 3),
-                mapOf(x to 2u, y to 6u) to Rational(-7, 30),
-                mapOf(x to 3u, y to 6u) to Rational(1, 210),
-                mapOf(x to 4u, y to 6u) to Rational(1, 6),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, y, 2u),
-            "test 9b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(x to 5u) to Rational(0),
-                mapOf(x to 6u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(x to 5u, y to 1u) to Rational(0),
-                mapOf(x to 6u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(-1, 96),
-                mapOf(x to 5u, y to 2u) to Rational(1, 35),
-                mapOf(x to 6u, y to 2u) to Rational(-1, 60),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(-1, 6),
-                mapOf(x to 5u, y to 3u) to Rational(3, 40),
-                mapOf(x to 6u, y to 3u) to Rational(1, 54),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(-7, 12),
-                mapOf(x to 5u, y to 4u) to Rational(1, 140),
-                mapOf(x to 6u, y to 4u) to Rational(1, 6),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, x, 2u),
-            "test 10a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-1, 96),
-                mapOf(x to 3u, y to 4u) to Rational(1, 21),
-                mapOf(x to 4u, y to 4u) to Rational(-1, 24),
-                mapOf(y to 5u) to Rational(0),
-                mapOf(x to 1u, y to 5u) to Rational(0),
-                mapOf(x to 2u, y to 5u) to Rational(-1, 10),
-                mapOf(x to 3u, y to 5u) to Rational(3, 40),
-                mapOf(x to 4u, y to 5u) to Rational(1, 36),
-                mapOf(y to 6u) to Rational(0),
-                mapOf(x to 1u, y to 6u) to Rational(0),
-                mapOf(x to 2u, y to 6u) to Rational(-7, 30),
-                mapOf(x to 3u, y to 6u) to Rational(1, 210),
-                mapOf(x to 4u, y to 6u) to Rational(1, 6),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, y, 2u),
-            "test 10b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 2u) to Rational(-3, 8),
-                mapOf(x to 3u) to Rational(-1, 9),
-                mapOf(x to 4u) to Rational(1, 24),
-                mapOf(x to 5u) to Rational(0),
-                mapOf(x to 6u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(-9, 3),
-                mapOf(x to 3u, y to 1u) to Rational(1, 9),
-                mapOf(x to 4u, y to 1u) to Rational(-11, 12),
-                mapOf(x to 5u, y to 1u) to Rational(0),
-                mapOf(x to 6u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-5, 3),
-                mapOf(x to 3u, y to 2u) to Rational(-4, 15),
-                mapOf(x to 4u, y to 2u) to Rational(-1, 96),
-                mapOf(x to 5u, y to 2u) to Rational(0),
-                mapOf(x to 6u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(x to 5u, y to 3u) to Rational(0),
-                mapOf(x to 6u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-                mapOf(x to 5u, y to 4u) to Rational(0),
-                mapOf(x to 6u, y to 4u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).nthAntiderivativeWithRespectTo(RationalField, x, 2u),
-            "test 11a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 2u) to Rational(-3, 8),
-                mapOf(x to 1u, y to 2u) to Rational(-1, 3),
-                mapOf(x to 2u, y to 2u) to Rational(1, 4),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(-1, 1),
-                mapOf(x to 1u, y to 3u) to Rational(1, 9),
-                mapOf(x to 2u, y to 3u) to Rational(-11, 6),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(-5, 18),
-                mapOf(x to 1u, y to 4u) to Rational(-2, 15),
-                mapOf(x to 2u, y to 4u) to Rational(-1, 96),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-                mapOf(y to 5u) to Rational(0),
-                mapOf(x to 1u, y to 5u) to Rational(0),
-                mapOf(x to 2u, y to 5u) to Rational(0),
-                mapOf(x to 3u, y to 5u) to Rational(0),
-                mapOf(x to 4u, y to 5u) to Rational(0),
-                mapOf(y to 6u) to Rational(0),
-                mapOf(x to 1u, y to 6u) to Rational(0),
-                mapOf(x to 2u, y to 6u) to Rational(0),
-                mapOf(x to 3u, y to 6u) to Rational(0),
-                mapOf(x to 4u, y to 6u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).nthAntiderivativeWithRespectTo(RationalField, y, 2u),
-            "test 11b"
-        )
-    }
-    @Test
-    @OptIn(UnstableKMathAPI::class)
-    fun test_Polynomial_nthAntiderivativeWithRespectTo_variablesAndOrders() {
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 1u) to Rational(1),
-                mapOf(x to 2u) to Rational(-1),
-                mapOf(x to 3u) to Rational(1, 3),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 1u)),
-            "test 1"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, x, 0u),
-            "test 2"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-1, 3),
-                mapOf(x to 4u) to Rational(1, 12),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, x, 2u),
-            "test 3"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 3u) to Rational(1, 6),
-                mapOf(x to 4u) to Rational(-1, 12),
-                mapOf(x to 5u) to Rational(1, 60),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, x, 3u),
-            "test 4"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 4u) to Rational(1, 24),
-                mapOf(x to 5u) to Rational(-1, 60),
-                mapOf(x to 6u) to Rational(1, 360),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, x, 4u),
-            "test 5"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, y, 0u),
-            "test 6"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 1u) to Rational(1),
-                mapOf(x to 1u, y to 1u) to Rational(-2),
-                mapOf(x to 2u, y to 1u) to Rational(1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, y, 1u),
-            "test 7"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 2u) to Rational(1, 2),
-                mapOf(x to 1u, y to 2u) to Rational(-1),
-                mapOf(x to 2u, y to 2u) to Rational(1, 2),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, y, 2u),
-            "test 8"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf()),
-            "test 9"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 1u) to Rational(1),
-                mapOf(x to 2u) to Rational(-1),
-                mapOf(x to 3u) to Rational(1, 3),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(
-                x to 1u,
-                y to 0u
-            )),
-            "test 10"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 1u) to Rational(1),
-                mapOf(x to 1u, y to 1u) to Rational(-2),
-                mapOf(x to 2u, y to 1u) to Rational(1),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(1),
-                mapOf(x to 1u) to Rational(-2),
-                mapOf(x to 2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(
-                x to 0u,
-                y to 1u
-            )),
-            "test 11"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 2u) to Rational(-3, 8),
-                mapOf(x to 3u) to Rational(-1, 9),
-                mapOf(x to 4u) to Rational(1, 24),
-                mapOf(x to 5u) to Rational(-11, 160),
-                mapOf(x to 6u) to Rational(3, 5),
-                mapOf(x to 2u, y to 1u) to Rational(-9, 3),
-                mapOf(x to 3u, y to 1u) to Rational(1, 9),
-                mapOf(x to 4u, y to 1u) to Rational(-11, 12),
-                mapOf(x to 5u, y to 1u) to Rational(-1, 60),
-                mapOf(x to 6u, y to 1u) to Rational(-3, 10),
-                mapOf(x to 2u, y to 2u) to Rational(-5, 3),
-                mapOf(x to 3u, y to 2u) to Rational(-4, 15),
-                mapOf(x to 4u, y to 2u) to Rational(-1, 96),
-                mapOf(x to 5u, y to 2u) to Rational(1, 35),
-                mapOf(x to 6u, y to 2u) to Rational(-1, 60),
-                mapOf(x to 2u, y to 3u) to Rational(3, 14),
-                mapOf(x to 3u, y to 3u) to Rational(1, 3),
-                mapOf(x to 4u, y to 3u) to Rational(-1, 6),
-                mapOf(x to 5u, y to 3u) to Rational(3, 40),
-                mapOf(x to 6u, y to 3u) to Rational(1, 54),
-                mapOf(x to 2u, y to 4u) to Rational(-9, 8),
-                mapOf(x to 3u, y to 4u) to Rational(-5, 3),
-                mapOf(x to 4u, y to 4u) to Rational(-7, 12),
-                mapOf(x to 5u, y to 4u) to Rational(1, 140),
-                mapOf(x to 6u, y to 4u) to Rational(1, 6),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 2u)),
-            "test 12a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 1u, y to 1u) to Rational(-6, 8),
-                mapOf(x to 2u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 3u, y to 1u) to Rational(1, 6),
-                mapOf(x to 4u, y to 1u) to Rational(-11, 32),
-                mapOf(x to 5u, y to 1u) to Rational(18, 5),
-                mapOf(x to 1u, y to 2u) to Rational(-9, 3),
-                mapOf(x to 2u, y to 2u) to Rational(1, 6),
-                mapOf(x to 3u, y to 2u) to Rational(-11, 6),
-                mapOf(x to 4u, y to 2u) to Rational(-1, 24),
-                mapOf(x to 5u, y to 2u) to Rational(-9, 10),
-                mapOf(x to 1u, y to 3u) to Rational(-10, 9),
-                mapOf(x to 2u, y to 3u) to Rational(-4, 15),
-                mapOf(x to 3u, y to 3u) to Rational(-1, 72),
-                mapOf(x to 4u, y to 3u) to Rational(1, 21),
-                mapOf(x to 5u, y to 3u) to Rational(-1, 30),
-                mapOf(x to 1u, y to 4u) to Rational(3, 28),
-                mapOf(x to 2u, y to 4u) to Rational(1, 4),
-                mapOf(x to 3u, y to 4u) to Rational(-1, 6),
-                mapOf(x to 4u, y to 4u) to Rational(3, 32),
-                mapOf(x to 5u, y to 4u) to Rational(1, 36),
-                mapOf(x to 1u, y to 5u) to Rational(-9, 20),
-                mapOf(x to 2u, y to 5u) to Rational(-1, 1),
-                mapOf(x to 3u, y to 5u) to Rational(-7, 15),
-                mapOf(x to 4u, y to 5u) to Rational(1, 140),
-                mapOf(x to 5u, y to 5u) to Rational(1, 5),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 1u, y to 1u)),
-            "test 12b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 2u) to Rational(-3, 8),
-                mapOf(x to 1u, y to 2u) to Rational(-1, 3),
-                mapOf(x to 2u, y to 2u) to Rational(1, 4),
-                mapOf(x to 3u, y to 2u) to Rational(-11, 16),
-                mapOf(x to 4u, y to 2u) to Rational(9, 1),
-                mapOf(y to 3u) to Rational(-1, 1),
-                mapOf(x to 1u, y to 3u) to Rational(1, 9),
-                mapOf(x to 2u, y to 3u) to Rational(-11, 6),
-                mapOf(x to 3u, y to 3u) to Rational(-1, 18),
-                mapOf(x to 4u, y to 3u) to Rational(-9, 6),
-                mapOf(y to 4u) to Rational(-5, 18),
-                mapOf(x to 1u, y to 4u) to Rational(-2, 15),
-                mapOf(x to 2u, y to 4u) to Rational(-1, 96),
-                mapOf(x to 3u, y to 4u) to Rational(1, 21),
-                mapOf(x to 4u, y to 4u) to Rational(-1, 24),
-                mapOf(y to 5u) to Rational(3, 140),
-                mapOf(x to 1u, y to 5u) to Rational(1, 10),
-                mapOf(x to 2u, y to 5u) to Rational(-1, 10),
-                mapOf(x to 3u, y to 5u) to Rational(3, 40),
-                mapOf(x to 4u, y to 5u) to Rational(1, 36),
-                mapOf(y to 6u) to Rational(-3, 40),
-                mapOf(x to 1u, y to 6u) to Rational(-1, 3),
-                mapOf(x to 2u, y to 6u) to Rational(-7, 30),
-                mapOf(x to 3u, y to 6u) to Rational(1, 210),
-                mapOf(x to 4u, y to 6u) to Rational(1, 6),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(-11, 8),
-                mapOf(x to 4u) to Rational(18, 1),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 4u, y to 1u) to Rational(-18, 2),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(3, 7),
-                mapOf(x to 1u, y to 3u) to Rational(16, 8),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(-18, 8),
-                mapOf(x to 1u, y to 4u) to Rational(-10, 1),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(y to 2u)),
-            "test 12c"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(x to 5u) to Rational(0),
-                mapOf(x to 6u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(x to 5u, y to 1u) to Rational(0),
-                mapOf(x to 6u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(-1, 96),
-                mapOf(x to 5u, y to 2u) to Rational(1, 35),
-                mapOf(x to 6u, y to 2u) to Rational(-1, 60),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(-1, 6),
-                mapOf(x to 5u, y to 3u) to Rational(3, 40),
-                mapOf(x to 6u, y to 3u) to Rational(1, 54),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(-7, 12),
-                mapOf(x to 5u, y to 4u) to Rational(1, 140),
-                mapOf(x to 6u, y to 4u) to Rational(1, 6),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 2u)),
-            "test 13a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(x to 5u, y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(x to 5u, y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(-1, 72),
-                mapOf(x to 4u, y to 3u) to Rational(1, 21),
-                mapOf(x to 5u, y to 3u) to Rational(-1, 30),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(-1, 6),
-                mapOf(x to 4u, y to 4u) to Rational(3, 32),
-                mapOf(x to 5u, y to 4u) to Rational(1, 36),
-                mapOf(x to 1u, y to 5u) to Rational(0),
-                mapOf(x to 2u, y to 5u) to Rational(0),
-                mapOf(x to 3u, y to 5u) to Rational(-7, 15),
-                mapOf(x to 4u, y to 5u) to Rational(1, 140),
-                mapOf(x to 5u, y to 5u) to Rational(1, 5),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 1u, y to 1u)),
-            "test 13b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(0),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-1, 96),
-                mapOf(x to 3u, y to 4u) to Rational(1, 21),
-                mapOf(x to 4u, y to 4u) to Rational(-1, 24),
-                mapOf(y to 5u) to Rational(0),
-                mapOf(x to 1u, y to 5u) to Rational(0),
-                mapOf(x to 2u, y to 5u) to Rational(-1, 10),
-                mapOf(x to 3u, y to 5u) to Rational(3, 40),
-                mapOf(x to 4u, y to 5u) to Rational(1, 36),
-                mapOf(y to 6u) to Rational(0),
-                mapOf(x to 1u, y to 6u) to Rational(0),
-                mapOf(x to 2u, y to 6u) to Rational(-7, 30),
-                mapOf(x to 3u, y to 6u) to Rational(1, 210),
-                mapOf(x to 4u, y to 6u) to Rational(1, 6),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(0),
-                mapOf(x to 1u) to Rational(0),
-                mapOf(x to 2u) to Rational(0),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(0),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(4, 7),
-                mapOf(x to 4u, y to 2u) to Rational(-4, 8),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(-16, 8),
-                mapOf(x to 3u, y to 3u) to Rational(12, 8),
-                mapOf(x to 4u, y to 3u) to Rational(5, 9),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(-14, 2),
-                mapOf(x to 3u, y to 4u) to Rational(1, 7),
-                mapOf(x to 4u, y to 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(y to 2u)),
-            "test 13c"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 2u) to Rational(-3, 8),
-                mapOf(x to 3u) to Rational(-1, 9),
-                mapOf(x to 4u) to Rational(1, 24),
-                mapOf(x to 5u) to Rational(0),
-                mapOf(x to 6u) to Rational(0),
-                mapOf(x to 2u, y to 1u) to Rational(-9, 3),
-                mapOf(x to 3u, y to 1u) to Rational(1, 9),
-                mapOf(x to 4u, y to 1u) to Rational(-11, 12),
-                mapOf(x to 5u, y to 1u) to Rational(0),
-                mapOf(x to 6u, y to 1u) to Rational(0),
-                mapOf(x to 2u, y to 2u) to Rational(-5, 3),
-                mapOf(x to 3u, y to 2u) to Rational(-4, 15),
-                mapOf(x to 4u, y to 2u) to Rational(-1, 96),
-                mapOf(x to 5u, y to 2u) to Rational(0),
-                mapOf(x to 6u, y to 2u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(x to 5u, y to 3u) to Rational(0),
-                mapOf(x to 6u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-                mapOf(x to 5u, y to 4u) to Rational(0),
-                mapOf(x to 6u, y to 4u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 2u)),
-            "test 14a"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(x to 1u, y to 1u) to Rational(-6, 8),
-                mapOf(x to 2u, y to 1u) to Rational(-1, 3),
-                mapOf(x to 3u, y to 1u) to Rational(1, 6),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(x to 5u, y to 1u) to Rational(0),
-                mapOf(x to 1u, y to 2u) to Rational(-9, 3),
-                mapOf(x to 2u, y to 2u) to Rational(1, 6),
-                mapOf(x to 3u, y to 2u) to Rational(-11, 6),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(x to 5u, y to 2u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(-10, 9),
-                mapOf(x to 2u, y to 3u) to Rational(-4, 15),
-                mapOf(x to 3u, y to 3u) to Rational(-1, 72),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(x to 5u, y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-                mapOf(x to 5u, y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 5u) to Rational(0),
-                mapOf(x to 2u, y to 5u) to Rational(0),
-                mapOf(x to 3u, y to 5u) to Rational(0),
-                mapOf(x to 4u, y to 5u) to Rational(0),
-                mapOf(x to 5u, y to 5u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(x to 1u, y to 1u)),
-            "test 14b"
-        )
-        assertEquals(
-            LabeledPolynomialAsIs(
-                mapOf(y to 2u) to Rational(-3, 8),
-                mapOf(x to 1u, y to 2u) to Rational(-1, 3),
-                mapOf(x to 2u, y to 2u) to Rational(1, 4),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(-1, 1),
-                mapOf(x to 1u, y to 3u) to Rational(1, 9),
-                mapOf(x to 2u, y to 3u) to Rational(-11, 6),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(-5, 18),
-                mapOf(x to 1u, y to 4u) to Rational(-2, 15),
-                mapOf(x to 2u, y to 4u) to Rational(-1, 96),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-                mapOf(y to 5u) to Rational(0),
-                mapOf(x to 1u, y to 5u) to Rational(0),
-                mapOf(x to 2u, y to 5u) to Rational(0),
-                mapOf(x to 3u, y to 5u) to Rational(0),
-                mapOf(x to 4u, y to 5u) to Rational(0),
-                mapOf(y to 6u) to Rational(0),
-                mapOf(x to 1u, y to 6u) to Rational(0),
-                mapOf(x to 2u, y to 6u) to Rational(0),
-                mapOf(x to 3u, y to 6u) to Rational(0),
-                mapOf(x to 4u, y to 6u) to Rational(0),
-            ),
-            LabeledPolynomialAsIs(
-                mapOf<Symbol, UInt>() to Rational(-6, 8),
-                mapOf(x to 1u) to Rational(-2, 3),
-                mapOf(x to 2u) to Rational(1, 2),
-                mapOf(x to 3u) to Rational(0),
-                mapOf(x to 4u) to Rational(0),
-                mapOf(y to 1u) to Rational(-18, 3),
-                mapOf(x to 1u, y to 1u) to Rational(2, 3),
-                mapOf(x to 2u, y to 1u) to Rational(-11, 1),
-                mapOf(x to 3u, y to 1u) to Rational(0),
-                mapOf(x to 4u, y to 1u) to Rational(0),
-                mapOf(y to 2u) to Rational(-10, 3),
-                mapOf(x to 1u, y to 2u) to Rational(-8, 5),
-                mapOf(x to 2u, y to 2u) to Rational(-1, 8),
-                mapOf(x to 3u, y to 2u) to Rational(0),
-                mapOf(x to 4u, y to 2u) to Rational(0),
-                mapOf(y to 3u) to Rational(0),
-                mapOf(x to 1u, y to 3u) to Rational(0),
-                mapOf(x to 2u, y to 3u) to Rational(0),
-                mapOf(x to 3u, y to 3u) to Rational(0),
-                mapOf(x to 4u, y to 3u) to Rational(0),
-                mapOf(y to 4u) to Rational(0),
-                mapOf(x to 1u, y to 4u) to Rational(0),
-                mapOf(x to 2u, y to 4u) to Rational(0),
-                mapOf(x to 3u, y to 4u) to Rational(0),
-                mapOf(x to 4u, y to 4u) to Rational(0),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(y to 2u)),
-            "test 14c"
-        )
-    }
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
deleted file mode 100644
index 5f7e1a95b..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialTest.kt
+++ /dev/null
@@ -1,544 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("LocalVariableName")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.functions.testUtils.IntModuloRing
-import space.kscience.kmath.functions.testUtils.ListPolynomial
-import space.kscience.kmath.functions.testUtils.Rational
-import space.kscience.kmath.functions.testUtils.RationalField
-import kotlin.test.*
-
-
-class ListPolynomialTest {
-    @Test
-    fun test_Polynomial_Int_plus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + -3,
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 2,
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(-2)) + 2,
-                "test 3"
-            )
-            val polynomial_4 = ListPolynomial<Rational>()
-            assertSame(
-                polynomial_4,
-                polynomial_4 + 0,
-                "test 4"
-            )
-            val polynomial_5 = ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7))
-            assertSame(
-                polynomial_5,
-                polynomial_5 + 0,
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + 1,
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1)),
-                ListPolynomial(Rational(-2)) + 1,
-                "test 7"
-            )
-            assertEquals(
-                ListPolynomial(Rational(2)),
-                ListPolynomial<Rational>() + 2,
-                "test 8"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Int_minus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - -3,
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 2,
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(2)) - 2,
-                "test 3"
-            )
-            val polynomial_4 = ListPolynomial<Rational>()
-            assertSame(
-                polynomial_4,
-                polynomial_4 - 0,
-                "test 4"
-            )
-            val polynomial_5 = ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7))
-            assertEquals(
-                polynomial_5,
-                polynomial_5 - 0,
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - 1,
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1)),
-                ListPolynomial(Rational(2)) - 1,
-                "test 7"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-2)),
-                ListPolynomial<Rational>() - 2,
-                "test 8"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Int_times() {
-        IntModuloRing(35).listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(34, 2, 1, 20, 2),
-                ListPolynomial(22, 26, 13, 15, 26) * 27,
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                ListPolynomial(7, 0, 49, 21, 14) * 15,
-                "test 2"
-            )
-            val polynomial = ListPolynomial(22, 26, 13, 15, 26)
-            assertSame(
-                zero,
-                polynomial * 0,
-                "test 3"
-            )
-            assertSame(
-                polynomial,
-                polynomial * 1,
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_plus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                -3 + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                2 + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                2 + ListPolynomial(Rational(-2)),
-                "test 3"
-            )
-            val polynomial_4 = ListPolynomial<Rational>()
-            assertSame(
-                polynomial_4,
-                0 + polynomial_4,
-                "test 4"
-            )
-            val polynomial_5 = ListPolynomial<Rational>(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7))
-            assertSame(
-                polynomial_5,
-                0 + polynomial_5,
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                1 + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1)),
-                1 + ListPolynomial(Rational(-2)),
-                "test 7"
-            )
-            assertEquals(
-                ListPolynomial(Rational(2)),
-                2 + ListPolynomial(),
-                "test 8"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_minus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                3 - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                -2 - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                -2 - ListPolynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-32, 9), Rational(-8, -9), Rational(8, 7)),
-                0 - ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(),
-                0 - ListPolynomial(),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                -1 - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1)),
-                -1 - ListPolynomial(Rational(-2)),
-                "test 7"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-2)),
-                -2 - ListPolynomial(),
-                "test 8"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_times() {
-        IntModuloRing(35).listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(34, 2, 1, 20, 2),
-                27 * ListPolynomial(22, 26, 13, 15, 26),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                15 * ListPolynomial(7, 0, 49, 21, 14),
-                "test 2"
-            )
-            val polynomial = ListPolynomial(22, 26, 13, 15, 26)
-            assertSame(
-                zero,
-                0 * polynomial,
-                "test 3"
-            )
-            assertSame(
-                polynomial,
-                1 * polynomial,
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_plus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) + Rational(-3),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(2),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(-2)) + Rational(2),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial<Rational>() + Rational(0),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)) + Rational(1),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1)),
-                ListPolynomial(Rational(-2)) + Rational(1),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(2)),
-                ListPolynomial<Rational>() + Rational(2),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_minus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) - Rational(-3),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(2),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(2)) - Rational(2),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                ListPolynomial<Rational>() - Rational(0),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(2), Rational(0), Rational(0), Rational(0)) - Rational(1),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1)),
-                ListPolynomial(Rational(2)) - Rational(1),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-2)),
-                ListPolynomial<Rational>() - Rational(2),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_times() {
-        IntModuloRing(35).listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(34, 2, 1, 20, 2),
-                ListPolynomial(22, 26, 13, 15, 26) * 27.asConstant(),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                ListPolynomial(7, 0, 49, 21, 14) * 15.asConstant(),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_plus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(-22, 9), Rational(-8, 9), Rational(-8, 7)),
-                Rational(-3) + ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                Rational(2) + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                Rational(2) + ListPolynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                Rational(0) + ListPolynomial(),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1), Rational(0), Rational(0), Rational(0)),
-                Rational(1) + ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-1)),
-                Rational(1) + ListPolynomial(Rational(-2)),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(2)),
-                Rational(2) + ListPolynomial(),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_minus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(32, 9), Rational(-8, 9), Rational(-8, 7)),
-                Rational(3) - ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0)),
-                Rational(-2) - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 2"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                Rational(-2) - ListPolynomial(Rational(-2)),
-                "test 3"
-            )
-            assertEquals(
-                ListPolynomial(Rational(0)),
-                Rational(0) - ListPolynomial(),
-                "test 4"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1), Rational(0), Rational(0), Rational(0)),
-                Rational(-1) - ListPolynomial(Rational(-2), Rational(0), Rational(0), Rational(0)),
-                "test 5"
-            )
-            assertEquals(
-                ListPolynomial(Rational(1)),
-                Rational(-1) - ListPolynomial(Rational(-2)),
-                "test 6"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-2)),
-                Rational(-2) - ListPolynomial(),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_times() {
-        IntModuloRing(35).listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(34, 2, 1, 20, 2),
-                27 * ListPolynomial(22, 26, 13, 15, 26),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                15 * ListPolynomial(7, 0, 49, 21, 14),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_unaryMinus() {
-        RationalField.listPolynomialSpace {
-            assertEquals(
-                ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7)),
-                -ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)),
-                "test 1"
-            )
-            assertEquals(
-                ListPolynomial(Rational(-5, 9), Rational(8, 9), Rational(8, 7), Rational(0), Rational(0)),
-                -ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7), Rational(0), Rational(0)),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_plus() {
-        RationalField.listPolynomialSpace {
-            // (5/9 - 8/9 x - 8/7 x^2) + (-5/7 + 5/1 x + 5/8 x^2) ?= -10/63 + 37/9 x - 29/56 x^2
-            assertEquals(
-                ListPolynomial(Rational(-10, 63), Rational(37, 9), Rational(-29, 56)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) +
-                        ListPolynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
-                "test 1"
-            )
-            // (-2/9 - 8/3 x) + (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 5/12 x + 2/4 x^2
-            assertEquals(
-                ListPolynomial(Rational(-2, 9), Rational(-5, 12), Rational(2, 4)),
-                ListPolynomial(Rational(-2, 9), Rational(-8, 3)) +
-                        ListPolynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
-                "test 2"
-            )
-            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) + (-6/3 - 7/2 x + 2/3 x^2) ?= -18/7 - 23/6 x + 2/3 x^2
-            assertEquals(
-                ListPolynomial(Rational(-18, 7), Rational(-23, 6), Rational(2, 3), Rational(0)),
-                ListPolynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) +
-                        ListPolynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
-                "test 3"
-            )
-            // (-2/4 - 6/9 x - 4/9 x^2) + (2/4 + 6/9 x + 4/9 x^2) ?= 0
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) +
-                        ListPolynomial(Rational(2, 4), Rational(6, 9), Rational(4, 9)),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_minus() {
-        RationalField.listPolynomialSpace {
-            // (5/9 - 8/9 x - 8/7 x^2) - (-5/7 + 5/1 x + 5/8 x^2) ?= 80/63 - 53/9 x - 99/56 x^2
-            assertEquals(
-                ListPolynomial(Rational(80, 63), Rational(-53, 9), Rational(-99, 56)),
-                ListPolynomial(Rational(5, 9), Rational(-8, 9), Rational(-8, 7)) -
-                        ListPolynomial(Rational(-5, 7), Rational(5, 1), Rational(5, 8)),
-                "test 1"
-            )
-            // (-2/9 - 8/3 x) - (0 + 9/4 x + 2/4 x^2) ?= -2/9 - 59/12 x - 2/4 x^2
-            assertEquals(
-                ListPolynomial(Rational(-2, 9), Rational(-59, 12), Rational(-2, 4)),
-                ListPolynomial(Rational(-2, 9), Rational(-8, 3)) -
-                        ListPolynomial(Rational(0), Rational(9, 4), Rational(2, 4)),
-                "test 2"
-            )
-            // (-4/7 - 2/6 x + 0 x^2 + 0 x^3) - (-6/3 - 7/2 x + 2/3 x^2) ?= 10/7 + 19/6 x - 2/3 x^2
-            assertEquals(
-                ListPolynomial(Rational(10, 7), Rational(19, 6), Rational(-2, 3), Rational(0)),
-                ListPolynomial(Rational(-4, 7), Rational(-2, 6), Rational(0), Rational(0)) -
-                        ListPolynomial(Rational(-6, 3), Rational(-7, 2), Rational(2, 3)),
-                "test 3"
-            )
-            // (-2/4 - 6/9 x - 4/9 x^2) - (-2/4 - 6/9 x - 4/9 x^2) ?= 0
-            assertEquals(
-                ListPolynomial(Rational(0), Rational(0), Rational(0)),
-                ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)) -
-                        ListPolynomial(Rational(-2, 4), Rational(-6, 9), Rational(-4, 9)),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_times() {
-        IntModuloRing(35).listPolynomialSpace {
-            // (1 + x + x^2) * (1 - x + x^2) ?= 1 + x^2 + x^4
-            assertEquals(
-                ListPolynomial(1, 0, 1, 0, 1),
-                ListPolynomial(1, -1, 1) * ListPolynomial(1, 1, 1),
-                "test 1"
-            )
-            // Spoiler: 5 * 7 = 0
-            assertEquals(
-                ListPolynomial(0, 0, 0, 0, 0),
-                ListPolynomial(5, -25, 10) * ListPolynomial(21, 14, -7),
-                "test 2"
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
deleted file mode 100644
index 48ea89a46..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/ListPolynomialUtilTest.kt
+++ /dev/null
@@ -1,982 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.functions.testUtils.Rational
-import space.kscience.kmath.functions.testUtils.RationalField
-import space.kscience.kmath.functions.testUtils.assertFailsWithTypeAndMessage
-import kotlin.test.Ignore
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-
-@OptIn(UnstableKMathAPI::class)
-class ListPolynomialUtilTest {
-    @Test
-    fun test_Polynomial_substitute_Double() {
-        assertEquals(
-            0.0,
-            ListPolynomial(1.0, -2.0, 1.0).substitute(1.0),
-            0.001,
-            "test 1"
-        )
-        assertEquals(
-            0.0,
-            ListPolynomial(1.0, -2.0, 1.0).substitute(1.0),
-            0.001,
-            "test 1"
-        )
-        assertEquals(
-            1.1931904761904761,
-            ListPolynomial(0.625, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
-            0.001,
-            "test 2"
-        )
-        assertEquals(
-            0.5681904761904762,
-            ListPolynomial(0.0, 2.6666666666666665, 0.5714285714285714, 1.5).substitute(0.2),
-            0.001,
-            "test 3"
-        )
-        assertEquals(
-            1.1811904761904761,
-            ListPolynomial(0.625, 2.6666666666666665, 0.5714285714285714, 0.0).substitute(0.2),
-            0.001,
-            "test 4"
-        )
-        assertEquals(
-            1.1703333333333332,
-            ListPolynomial(0.625, 2.6666666666666665, 0.0, 1.5).substitute(0.2),
-            0.001,
-            "test 5"
-        )
-    }
-    @Test
-    fun test_Polynomial_substitute_Constant() {
-        assertEquals(
-            Rational(0),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, Rational(1)),
-            "test 1"
-        )
-        assertEquals(
-            Rational(25057, 21000),
-            ListPolynomial(Rational(5, 8), Rational(8, 3), Rational(4, 7), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 2"
-        )
-        assertEquals(
-            Rational(2983, 5250),
-            ListPolynomial(Rational(0), Rational(8, 3), Rational(4, 7), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 3"
-        )
-        assertEquals(
-            Rational(4961, 4200),
-            ListPolynomial(Rational(5, 8), Rational(8, 3), Rational(4, 7), Rational(0))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 4"
-        )
-        assertEquals(
-            Rational(3511, 3000),
-            ListPolynomial(Rational(5, 8), Rational(8, 3), Rational(0), Rational(3, 2))
-                .substitute(RationalField, Rational(1, 5)),
-            "test 5"
-        )
-    }
-    @Test
-    fun test_Polynomial_substitute_Polynomial() {
-        assertEquals(
-            ListPolynomial(Rational(0)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).substitute(RationalField, ListPolynomial(Rational(1))),
-            "test 1"
-        )
-        assertEquals(
-            ListPolynomial(Rational(709, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
-            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(2, 7))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
-            "test 2"
-        )
-        assertEquals(
-            ListPolynomial(Rational(655, 378), Rational(155, 252), Rational(19, 525), Rational(2, 875)),
-            ListPolynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(2, 7))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(677, 378), Rational(97, 180), Rational(1, 75), Rational(0)),
-            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(1, 3), Rational(0))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
-            "test 4"
-        )
-        assertEquals(
-            ListPolynomial(Rational(653, 378), Rational(221, 420), Rational(4, 175), Rational(2, 875)),
-            ListPolynomial(Rational(1, 7), Rational(9, 4), Rational(0), Rational(2, 7))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(1, 5))),
-            "test 5"
-        )
-        assertEquals(
-            ListPolynomial(Rational(89, 54), Rational(0), Rational(0), Rational(0)),
-            ListPolynomial(Rational(0), Rational(9, 4), Rational(1, 3), Rational(0))
-                .substitute(RationalField, ListPolynomial(Rational(6, 9), Rational(0))),
-            "test 6"
-        )
-    }
-    @Test
-    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
-            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
-    fun test_Polynomial_substitute_RationalFunction() {
-        assertEquals(
-            ListRationalFunction(ListPolynomial(Rational(0)), ListPolynomial(Rational(1))),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1))
-                .substitute(RationalField, ListRationalFunction(ListPolynomial(Rational(1)), ListPolynomial(Rational(1)))),
-            "test 1"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(66349, 243),
-                    Rational(-17873, 405),
-                    Rational(173533, 3780),
-                    Rational(-91141, 567),
-                    Rational(5773909, 105840),
-                    Rational(-23243, 630),
-                    Rational(1573, 27)
-                ),
-                ListPolynomial(
-                    Rational(169, 81),
-                    Rational(-130, 27),
-                    Rational(115, 18),
-                    Rational(-797, 54),
-                    Rational(1985, 144),
-                    Rational(-55, 6),
-                    Rational(121, 9)
-                )
-            ),
-            ListPolynomial(
-                Rational(13, 3),
-                Rational(-9, 5),
-                Rational(5, 5)
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(15, 1),
-                        Rational(6, 9),
-                        Rational(-3, 7)
-                    ),
-                    ListPolynomial(
-                        Rational(-13, 9),
-                        Rational(10, 6),
-                        Rational(-10, 8),
-                        Rational(11, 3)
-                    )
-                )
-            ),
-            "test 2"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(-14, 9),
-                    Rational(31, 14),
-                    Rational(-5077, 980),
-                    Rational(99, 35)
-                ),
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(25, 9),
-                    Rational(-25, 6),
-                    Rational(1985, 144),
-                    Rational(-55, 6),
-                    Rational(121, 9)
-                )
-            ),
-            ListPolynomial(
-                Rational(0),
-                Rational(-9, 5),
-                Rational(5, 5)
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(0),
-                        Rational(6, 9),
-                        Rational(-3, 7)
-                    ),
-                    ListPolynomial(
-                        Rational(0),
-                        Rational(10, 6),
-                        Rational(-10, 8),
-                        Rational(11, 3)
-                    )
-                )
-            ),
-            "test 3"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(-898, 27),
-                    Rational(271, 45),
-                    Rational(-65, 12) ,
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0)
-                ),
-                ListPolynomial(
-                    Rational(-13, 9),
-                    Rational(5, 3),
-                    Rational(-5, 4),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0)
-                )
-            ),
-            ListPolynomial(
-                Rational(13, 3),
-                Rational(-9, 5),
-                Rational(0)
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(15, 1),
-                        Rational(6, 9),
-                        Rational(0)
-                    ),
-                    ListPolynomial(
-                        Rational(-13, 9),
-                        Rational(10, 6),
-                        Rational(-10, 8),
-                        Rational(0)
-                    )
-                )
-            ),
-            "test 4"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(56872, 243),
-                    Rational(0, 1),
-                    Rational(-90, 7),
-                    Rational(-3718, 81),
-                    Rational(9, 49),
-                    Rational(0, 1),
-                    Rational(1573, 27)
-                ),
-                ListPolynomial(
-                    Rational(169, 81),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(-286, 27),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(121, 9)
-                )
-            ),
-            ListPolynomial(
-                Rational(13, 3),
-                Rational(0),
-                Rational(5, 5)
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(15, 1),
-                        Rational(0),
-                        Rational(-3, 7)
-                    ),
-                    ListPolynomial(
-                        Rational(-13, 9),
-                        Rational(0),
-                        Rational(0),
-                        Rational(11, 3)
-                    )
-                )
-            ),
-            "test 5"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Double() {
-        assertEquals(
-            0.0,
-            ListRationalFunction(
-                ListPolynomial(1.0, -2.0, 1.0),
-                ListPolynomial(-6.302012278484357, 5.831971885376948, -9.271604788393432, 5.494387848015814, -3.7187384450880785)
-            ).substitute(1.0),
-            0.001,
-            "test 1"
-        )
-        assertEquals(
-            2.693702616649797,
-            ListRationalFunction(
-                ListPolynomial(-5.848840571263625, -1.660411278951134, -3.793740946372443, -9.624569269490076),
-                ListPolynomial(-2.9680680215311073, -1.862973627119981, 4.776550592888336, -2.7320154512368466)
-            ).substitute(-7.53452770353279),
-            0.001,
-            "test 2"
-        )
-        assertEquals(
-            2.692226268901378,
-            ListRationalFunction(
-                ListPolynomial(0.0, -1.660411278951134, -3.793740946372443, -9.624569269490076),
-                ListPolynomial(0.0, -1.862973627119981, 4.776550592888336, -2.7320154512368466)
-            ).substitute(-7.53452770353279),
-            0.001,
-            "test 3"
-        )
-        assertEquals(
-            -0.7394904842099175,
-            ListRationalFunction(
-                ListPolynomial(-5.848840571263625, -1.660411278951134, -3.793740946372443, 0.0),
-                ListPolynomial(-2.9680680215311073, -1.862973627119981, 4.776550592888336, 0.0)
-            ).substitute(-7.53452770353279),
-            0.001,
-            "test 4"
-        )
-        assertEquals(
-            3.526835209398159,
-            ListRationalFunction(
-                ListPolynomial(-5.848840571263625, 0.0, 0.0, -9.624569269490076),
-                ListPolynomial(-2.9680680215311073, 0.0, 0.0, -2.7320154512368466)
-            ).substitute(-7.53452770353279),
-            0.001,
-            "test 5"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Constant() {
-        assertEquals(
-            Rational(0),
-            ListRationalFunction(
-                ListPolynomial(Rational(1), Rational(-2), Rational(1)),
-                ListPolynomial(Rational(1)),
-            ).substitute(RationalField, Rational(1)),
-            "test 1"
-        )
-        assertEquals(
-            Rational(1149615, 61306),
-            ListRationalFunction(
-                ListPolynomial(Rational(17, 7), Rational(18, 3), Rational(18, 8), Rational(9, 1)),
-                ListPolynomial(Rational(11, 9), Rational(-6, 5), Rational(-12, 7), Rational(2, 1)),
-            ).substitute(RationalField, Rational(-7, 8)),
-            "test 2"
-        )
-        assertEquals(
-            Rational(3495, 586),
-            ListRationalFunction(
-                ListPolynomial(Rational(0), Rational(18, 3), Rational(18, 8), Rational(9, 1)),
-                ListPolynomial(Rational(0), Rational(-6, 5), Rational(-12, 7), Rational(2, 1)),
-            ).substitute(RationalField, Rational(-7, 8)),
-            "test 3"
-        )
-        assertEquals(
-            Rational(-88605, 77392),
-            ListRationalFunction(
-                ListPolynomial(Rational(17, 7), Rational(18, 3), Rational(18, 8), Rational(0)),
-                ListPolynomial(Rational(11, 9), Rational(-6, 5), Rational(-12, 7), Rational(0)),
-            ).substitute(RationalField, Rational(-7, 8)),
-            "test 4"
-        )
-        assertEquals(
-            Rational(116145, 3794),
-            ListRationalFunction(
-                ListPolynomial(Rational(17, 7), Rational(0), Rational(0), Rational(9, 1)),
-                ListPolynomial(Rational(11, 9), Rational(0), Rational(0), Rational(2, 1)),
-            ).substitute(RationalField, Rational(-7, 8)),
-            "test 5"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Polynomial() {
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(1))
-            ),
-            ListRationalFunction(
-                ListPolynomial(Rational(1), Rational(-2), Rational(1)),
-                ListPolynomial(Rational(1)),
-            ).substitute(RationalField, ListPolynomial(Rational(1))),
-            "test 1"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(-283303, 36),
-                    Rational(-23593, 24),
-                    Rational(368713, 192),
-                    Rational(1455, 8),
-                    Rational(-272171, 1536),
-                    Rational(-2149, 192),
-                    Rational(469, 64),
-                    Rational(11, 48),
-                    Rational(-11, 96)
-                ),
-                ListPolynomial(
-                    Rational(5797, 12),
-                    Rational(595, 16),
-                    Rational(-5285, 72),
-                    Rational(-745, 192),
-                    Rational(1105, 288),
-                    Rational(5, 48),
-                    Rational(-5, 72)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(2, 9),
-                    Rational(11, 3),
-                    Rational(-9, 4),
-                    Rational(-6, 1),
-                    Rational(-11, 6)
-                ),
-                ListPolynomial(
-                    Rational(-2, 3),
-                    Rational(-15, 4),
-                    Rational(5, 9),
-                    Rational(-5, 9)
-                )
-            ).substitute(RationalField,
-                ListPolynomial(
-                    Rational(-9, 1),
-                    Rational(-1, 4),
-                    Rational(2, 4)
-                )
-            ),
-            "test 2"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(-11, 12),
-                    Rational(325, 192),
-                    Rational(21, 32),
-                    Rational(-1739, 1536),
-                    Rational(227, 192),
-                    Rational(-59, 64),
-                    Rational(11, 48),
-                    Rational(-11, 96)
-                ),
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(15, 16),
-                    Rational(-265, 144),
-                    Rational(-25, 192),
-                    Rational(25, 288),
-                    Rational(5, 48),
-                    Rational(-5, 72)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(0, 9),
-                    Rational(11, 3),
-                    Rational(-9, 4),
-                    Rational(-6, 1),
-                    Rational(-11, 6)
-                ),
-                ListPolynomial(
-                    Rational(0, 3),
-                    Rational(-15, 4),
-                    Rational(5, 9),
-                    Rational(-5, 9)
-                )
-            ).substitute(RationalField,
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(-1, 4),
-                    Rational(2, 4)
-                )
-            ),
-            "test 3"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(149723, 36),
-                    Rational(8483, 24),
-                    Rational(639, 64),
-                    Rational(3, 32),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0)
-                ),
-                ListPolynomial(
-                    Rational(937, 12),
-                    Rational(55, 16),
-                    Rational(5, 144),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(2, 9),
-                    Rational(11, 3),
-                    Rational(-9, 4),
-                    Rational(-6, 1),
-                    Rational(0)
-                ),
-                ListPolynomial(
-                    Rational(-2, 3),
-                    Rational(-15, 4),
-                    Rational(5, 9),
-                    Rational(0)
-                )
-            ).substitute(RationalField,
-                ListPolynomial(
-                    Rational(-9, 1),
-                    Rational(-1, 4),
-                    Rational(0)
-                )
-            ),
-            "test 4"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(-216509, 18),
-                    Rational(0, 1),
-                    Rational(2673, 1),
-                    Rational(0, 1),
-                    Rational(-891, 4),
-                    Rational(0, 1),
-                    Rational(33, 4),
-                    Rational(0, 1),
-                    Rational(-11, 96)
-                ),
-                ListPolynomial(
-                    Rational(1213, 3),
-                    Rational(0, 1),
-                    Rational(-135, 2),
-                    Rational(0, 1),
-                    Rational(15, 4),
-                    Rational(0, 1),
-                    Rational(-5, 72)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(2, 9),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(-11, 6)
-                ),
-                ListPolynomial(
-                    Rational(-2, 3),
-                    Rational(0),
-                    Rational(0),
-                    Rational(-5, 9)
-                )
-            ).substitute(RationalField,
-                ListPolynomial(
-                    Rational(-9, 1),
-                    Rational(0),
-                    Rational(2, 4)
-                )
-            ),
-            "test 5"
-        )
-    }
-    @Test
-    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
-            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
-    fun test_RationalFunction_substitute_RationalFunction() {
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(Rational(0)),
-                ListPolynomial(Rational(1))
-            ),
-            ListRationalFunction(
-                ListPolynomial(Rational(1), Rational(-2), Rational(1)),
-                ListPolynomial(Rational(1))
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(Rational(1)),
-                    ListPolynomial(Rational(1))
-                )
-            ),
-            "test 1"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(130087, 3888),
-                    Rational(-2866333, 65610),
-                    Rational(-5076229, 97200),
-                    Rational(222136997, 3280500),
-                    Rational(754719329, 20995200),
-                    Rational(-12010283, 324000),
-                    Rational(-2011967, 172800),
-                    Rational(18607, 2880),
-                    Rational(4705, 4096)
-                ),
-                ListPolynomial(
-                    Rational(-143820355, 3779136),
-                    Rational(73886869, 1574640),
-                    Rational(1440175193, 15746400),
-                    Rational(-5308968857, 52488000),
-                    Rational(-186910083731, 2099520000),
-                    Rational(125043463, 1555200),
-                    Rational(5299123, 388800),
-                    Rational(-213757, 15360),
-                    Rational(1380785, 147456)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(1, 1),
-                    Rational(-10, 5),
-                    Rational(18, 8),
-                    Rational(-8, 8)
-                ),
-                ListPolynomial(
-                    Rational(-14, 8),
-                    Rational(-14, 8),
-                    Rational(-19, 6),
-                    Rational(14, 3),
-                    Rational(8, 9)
-                )
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(14, 9),
-                        Rational(-2, 5),
-                        Rational(-14, 7)
-                    ),
-                    ListPolynomial(
-                        Rational(-6, 4),
-                        Rational(5, 9),
-                        Rational(1, 8)
-                    )
-                )
-            ),
-            "test 2"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(5173, 18225),
-                    Rational(904291, 364500),
-                    Rational(283127, 43200),
-                    Rational(37189, 5760),
-                    Rational(147, 128)
-                ),
-                ListPolynomial(
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(-163589, 911250),
-                    Rational(-881831, 291600),
-                    Rational(-10722229, 777600),
-                    Rational(-640921, 46080),
-                    Rational(86303, 9216)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(0),
-                    Rational(-10, 5),
-                    Rational(18, 8),
-                    Rational(-8, 8)
-                ),
-                ListPolynomial(
-                    Rational(0),
-                    Rational(-14, 8),
-                    Rational(-19, 6),
-                    Rational(14, 3),
-                    Rational(8, 9)
-                )
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(0),
-                        Rational(-2, 5),
-                        Rational(-14, 7)
-                    ),
-                    ListPolynomial(
-                        Rational(0),
-                        Rational(5, 9),
-                        Rational(1, 8)
-                    )
-                )
-            ),
-            "test 3"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(445, 16),
-                    Rational(-2011, 54),
-                    Rational(1359199, 72900),
-                    Rational(-135733, 32805),
-                    Rational(2254, 6561),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1)
-                ),
-                ListPolynomial(
-                    Rational(-2018387, 46656),
-                    Rational(82316437, 1574640),
-                    Rational(-9335047, 393660),
-                    Rational(15765889, 3280500),
-                    Rational(-242089, 656100),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1),
-                    Rational(0, 1)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(1, 1),
-                    Rational(-10, 5),
-                    Rational(18, 8),
-                    Rational(0)
-                ),
-                ListPolynomial(
-                    Rational(-14, 8),
-                    Rational(-14, 8),
-                    Rational(-19, 6),
-                    Rational(14, 3),
-                    Rational(0)
-                )
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(14, 9),
-                        Rational(-2, 5),
-                        Rational(0)
-                    ),
-                    ListPolynomial(
-                        Rational(-6, 4),
-                        Rational(5, 9),
-                        Rational(0)
-                    )
-                )
-            ),
-            "test 4"
-        )
-        assertEquals(
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(41635, 3888),
-                    Rational(0, 1),
-                    Rational(-279187, 11664),
-                    Rational(0, 1),
-                    Rational(103769, 3456),
-                    Rational(0, 1),
-                    Rational(-11017, 768),
-                    Rational(0, 1),
-                    Rational(4097, 4096)
-                ),
-                ListPolynomial(
-                    Rational(-13811791, 3779136),
-                    Rational(0, 1),
-                    Rational(-9999395, 419904),
-                    Rational(0, 1),
-                    Rational(6376601, 124416),
-                    Rational(0, 1),
-                    Rational(-3668315, 82944),
-                    Rational(0, 1),
-                    Rational(2097089, 147456)
-                )
-            ),
-            ListRationalFunction(
-                ListPolynomial(
-                    Rational(1, 1),
-                    Rational(0),
-                    Rational(0),
-                    Rational(-8, 8)
-                ),
-                ListPolynomial(
-                    Rational(-14, 8),
-                    Rational(0),
-                    Rational(0),
-                    Rational(0),
-                    Rational(8, 9)
-                )
-            ).substitute(RationalField,
-                ListRationalFunction(
-                    ListPolynomial(
-                        Rational(14, 9),
-                        Rational(0),
-                        Rational(-14, 7)
-                    ),
-                    ListPolynomial(
-                        Rational(-6, 4),
-                        Rational(0),
-                        Rational(1, 8)
-                    )
-                )
-            ),
-            "test 5"
-        )
-    }
-    @Test
-    fun test_Polynomial_derivative() {
-        assertEquals(
-            ListPolynomial(Rational(-2), Rational(2)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).derivative(RationalField),
-            "test 1"
-        )
-        assertEquals(
-            ListPolynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
-            "test 2"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(8, 9), Rational(15, 7), Rational(-20, 9)),
-            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).derivative(RationalField),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(-8, 3), Rational(8, 9), Rational(15, 7), Rational(0)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).derivative(RationalField),
-            "test 4"
-        )
-    }
-    @Test
-    fun test_Polynomial_nthDerivative() {
-        assertEquals(
-            ListPolynomial(Rational(-2), Rational(2)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 1),
-            "test 1"
-        )
-        assertFailsWithTypeAndMessage<IllegalArgumentException>(
-            "Order of derivative must be non-negative",
-            "test2"
-        ) {
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, -1)
-        }
-        assertEquals(
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 0),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(2)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 2),
-            "test 4"
-        )
-        assertEquals(
-            ListPolynomial(),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 3),
-            "test 5"
-        )
-        assertEquals(
-            ListPolynomial(),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthDerivative(RationalField, 4),
-            "test 6"
-        )
-        assertEquals(
-            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
-            "test 7"
-        )
-        assertEquals(
-            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(-20, 3)),
-            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthDerivative(RationalField, 2),
-            "test 8"
-        )
-        assertEquals(
-            ListPolynomial(Rational(8, 9), Rational(30, 7), Rational(0)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthDerivative(RationalField, 2),
-            "test 9"
-        )
-    }
-    @Test
-    fun test_Polynomial_antiderivative() {
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).antiderivative(RationalField),
-            "test 1"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
-            "test 2"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(4, 27), Rational(5, 28), Rational(-1, 9)),
-            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).antiderivative(RationalField),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(1, 5), Rational(-4, 3), Rational(4, 27), Rational(5, 28), Rational(0)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).antiderivative(RationalField),
-            "test 4"
-        )
-    }
-    @Test
-    fun test_Polynomial_nthAntiderivative() {
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(1), Rational(-1), Rational(1, 3)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 1),
-            "test 1"
-        )
-        assertFailsWithTypeAndMessage<IllegalArgumentException>(
-            "Order of antiderivative must be non-negative",
-            "test2"
-        ) {
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, -1)
-        }
-        assertEquals(
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 0),
-            "test 3"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(1, 2), Rational(-1, 3), Rational(1, 12)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 2),
-            "test 4"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(1, 6), Rational(-1, 12), Rational(1, 60)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 3),
-            "test 5"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 24), Rational(-1, 60), Rational(1, 360)),
-            ListPolynomial(Rational(1), Rational(-2), Rational(1)).nthAntiderivative(RationalField, 4),
-            "test 6"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
-            "test 7"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(0), Rational(0), Rational(1, 27), Rational(1, 28), Rational(-1, 54)),
-            ListPolynomial(Rational(0), Rational(0), Rational(4, 9), Rational(5, 7), Rational(-5, 9)).nthAntiderivative(RationalField, 2),
-            "test 8"
-        )
-        assertEquals(
-            ListPolynomial(Rational(0), Rational(0), Rational(1, 10), Rational(-4, 9), Rational(1, 27), Rational(1, 28), Rational(0)),
-            ListPolynomial(Rational(1, 5), Rational(-8, 3), Rational(4, 9), Rational(5, 7), Rational(0)).nthAntiderivative(RationalField, 2),
-            "test 9"
-        )
-    }
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
deleted file mode 100644
index ad6240fb9..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedConstructorsTest.kt
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.algebra
-import space.kscience.kmath.operations.invoke
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-
-class NumberedConstructorsTest {
-    @Test
-    @UnstableKMathAPI
-    fun testDSL1() {
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(2u, 0u, 3u) to 5,
-                listOf(0u, 1u) to -6,
-            ),
-            Int.algebra.numberedPolynomialSpace {
-                NumberedPolynomialDSL1 {
-                    5 { 0 pow 2u; 2 pow 3u }
-                    (-6) { 1 pow 1u }
-                }
-            },
-            "test 1"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to -1,
-            ),
-            Int.algebra.numberedPolynomialSpace {
-                NumberedPolynomialDSL1 {
-                    5 { }
-                    (-6) { }
-                }
-            },
-            "test 2"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(2u) to -1,
-            ),
-            Int.algebra.numberedPolynomialSpace {
-                NumberedPolynomialDSL1 {
-                    5 { 0 pow 1u; 0 pow 1u }
-                    (-6) { 0 pow 2u }
-                }
-            },
-            "test 3"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(2u) to -1,
-            ),
-            Int.algebra.numberedPolynomialSpace {
-                NumberedPolynomialDSL1 {
-                    5 { 0 pow 1u; 0 pow 1u }
-                    (-6) { 0 pow 2u; 2 pow 0u }
-                }
-            },
-            "test 3"
-        )
-    }
-    @Test
-    @UnstableKMathAPI
-    fun testFabric() {
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(2u, 0u, 3u) to 5,
-                listOf(0u, 1u) to -6,
-            ),
-            Int.algebra {
-                NumberedPolynomial(
-                    listOf(2u, 0u, 3u) to 5,
-                    listOf(0u, 1u) to -6,
-                )
-            },
-            "test 1"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(2u, 0u, 3u) to 5,
-                listOf(0u, 1u) to -6,
-            ),
-            Int.algebra {
-                NumberedPolynomial(
-                    listOf(2u, 0u, 3u, 0u) to 5,
-                    listOf(0u, 1u, 0u, 0u) to -6,
-                )
-            },
-            "test 2"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to -1,
-            ),
-            Int.algebra {
-                NumberedPolynomial(
-                    listOf(0u) to 5,
-                    listOf(0u, 0u) to -6,
-                )
-            },
-            "test 3"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0,
-            ),
-            Int.algebra {
-                NumberedPolynomial(
-                    listOf(0u) to 5,
-                    listOf(0u, 0u) to -5,
-                )
-            },
-            "test 4"
-        )
-    }
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
deleted file mode 100644
index c2f86198c..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialTest.kt
+++ /dev/null
@@ -1,1740 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("LocalVariableName")
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.functions.testUtils.IntModuloRing
-import space.kscience.kmath.functions.testUtils.Rational
-import space.kscience.kmath.functions.testUtils.RationalField
-import space.kscience.kmath.functions.testUtils.m
-import space.kscience.kmath.functions.testUtils.o
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertSame
-import kotlin.test.fail
-
-
-class NumberedPolynomialTest {
-    @Test
-    fun test_Polynomial_Int_plus() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(5, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) + -3,
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-3, 1),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) + -3,
-                "test 2"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 1),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) + -3,
-                "test 3"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ) + -3,
-                "test 4"
-            )
-            val polynomial_5 = NumberedPolynomial(
-                listOf<UInt>() to Rational(-22, 9),
-                listOf(3u) to Rational(-8, 9),
-                listOf(0u, 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_5,
-                polynomial_5 + 0,
-                "test 5"
-            )
-            val polynomial_6 = NumberedPolynomial(
-                listOf<UInt>() to Rational(0, 9),
-                listOf(3u) to Rational(-8, 9),
-                listOf(0u, 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_6,
-                polynomial_6 + 0,
-                "test 6"
-            )
-            val polynomial_7 = NumberedPolynomial(
-                listOf(3u) to Rational(-8, 9),
-                listOf(0u, 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_7,
-                polynomial_7 + 0,
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Int_minus() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(5, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) - 3,
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-3, 1),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) - 3,
-                "test 2"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 1),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) - 3,
-                "test 3"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ) - 3,
-                "test 4"
-            )
-            val polynomial_5 = NumberedPolynomial(
-                listOf<UInt>() to Rational(-22, 9),
-                listOf(3u) to Rational(-8, 9),
-                listOf(0u, 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_5,
-                polynomial_5 - 0,
-                "test 5"
-            )
-            val polynomial_6 = NumberedPolynomial(
-                listOf<UInt>() to Rational(0, 9),
-                listOf(3u) to Rational(-8, 9),
-                listOf(0u, 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_6,
-                polynomial_6 - 0,
-                "test 6"
-            )
-            val polynomial_7 = NumberedPolynomial(
-                listOf(3u) to Rational(-8, 9),
-                listOf(0u, 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_7,
-                polynomial_7 - 0,
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Int_times() {
-        IntModuloRing(35).numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to m(34),
-                    listOf(3u) to m(2),
-                    listOf(0u, 1u) to m(1),
-                    listOf(1u) to m(20),
-                    listOf(0u, 0u, 2u) to m(2),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to m(22),
-                    listOf(3u) to m(26),
-                    listOf(0u, 1u) to m(13),
-                    listOf(1u) to m(15),
-                    listOf(0u, 0u, 2u) to m(26),
-                ) * 27,
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to m(0),
-                    listOf(3u) to m(0),
-                    listOf(0u, 1u) to m(0),
-                    listOf(1u) to m(0),
-                    listOf(0u, 0u, 2u) to m(0),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to m(7),
-                    listOf(3u) to m(0),
-                    listOf(0u, 1u) to m(49),
-                    listOf(1u) to m(21),
-                    listOf(0u, 0u, 2u) to m(14),
-                ) * 15,
-                "test 2"
-            )
-            val polynomial = NumberedPolynomial(
-                listOf<UInt>() to m(22),
-                listOf(3u) to m(26),
-                listOf(0u, 1u) to m(13),
-                listOf(1u) to m(15),
-                listOf(0u, 0u, 2u) to m(26),
-            )
-            assertSame(
-                zero,
-                polynomial * 0,
-                "test 3"
-            )
-            assertSame(
-                polynomial,
-                polynomial * 1,
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_plus() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                -3 + NumberedPolynomial(
-                    listOf<UInt>() to Rational(5, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-3, 1),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                -3 + NumberedPolynomial(
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                -3 + NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ),
-                -3 + NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ),
-                "test 4"
-            )
-            val polynomial_5 = NumberedPolynomial(
-                listOf<UInt>() to Rational(-22, 9),
-                listOf(3u) to Rational(-8, 9),
-                listOf(0u, 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_5,
-                0 + polynomial_5,
-                "test 5"
-            )
-            val polynomial_6 = NumberedPolynomial(
-                listOf<UInt>() to Rational(0, 9),
-                listOf(3u) to Rational(-8, 9),
-                listOf(0u, 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_6,
-                0 + polynomial_6,
-                "test 6"
-            )
-            val polynomial_7 = NumberedPolynomial(
-                listOf(3u) to Rational(-8, 9),
-                listOf(0u, 4u) to Rational(-8, 7),
-            )
-            assertSame(
-                polynomial_7,
-                0 + polynomial_7,
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_minus() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(22, 9),
-                    listOf(3u) to Rational(8, 9),
-                    listOf(0u, 4u) to Rational(8, 7),
-                ),
-                3 - NumberedPolynomial(
-                    listOf<UInt>() to Rational(5, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(3, 1),
-                    listOf(3u) to Rational(8, 9),
-                    listOf(0u, 4u) to Rational(8, 7),
-                ),
-                3 - NumberedPolynomial(
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 1),
-                    listOf(3u) to Rational(8, 9),
-                    listOf(0u, 4u) to Rational(8, 7),
-                ),
-                3 - NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ),
-                3 - NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ),
-                "test 4"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(22, 9),
-                    listOf(3u) to Rational(8, 9),
-                    listOf(0u, 4u) to Rational(8, 7),
-                ),
-                0 - NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 5"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 9),
-                    listOf(3u) to Rational(8, 9),
-                    listOf(0u, 4u) to Rational(8, 7),
-                ),
-                0 - NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 6"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf(3u) to Rational(8, 9),
-                    listOf(0u, 4u) to Rational(8, 7),
-                ),
-                0 - NumberedPolynomial(
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Int_Polynomial_times() {
-        IntModuloRing(35).numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to m(34),
-                    listOf(3u) to m(2),
-                    listOf(0u, 1u) to m(1),
-                    listOf(1u) to m(20),
-                    listOf(0u, 0u, 2u) to m(2),
-                ),
-                27 * NumberedPolynomial(
-                    listOf<UInt>() to m(22),
-                    listOf(3u) to m(26),
-                    listOf(0u, 1u) to m(13),
-                    listOf(1u) to m(15),
-                    listOf(0u, 0u, 2u) to m(26),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to m(0),
-                    listOf(3u) to m(0),
-                    listOf(0u, 1u) to m(0),
-                    listOf(1u) to m(0),
-                    listOf(0u, 0u, 2u) to m(0),
-                ),
-                15 * NumberedPolynomial(
-                    listOf<UInt>() to m(7),
-                    listOf(3u) to m(0),
-                    listOf(0u, 1u) to m(49),
-                    listOf(1u) to m(21),
-                    listOf(0u, 0u, 2u) to m(14),
-                ),
-                "test 2"
-            )
-            val polynomial = NumberedPolynomial(
-                listOf<UInt>() to m(22),
-                listOf(3u) to m(26),
-                listOf(0u, 1u) to m(13),
-                listOf(1u) to m(15),
-                listOf(0u, 0u, 2u) to m(26),
-            )
-            assertSame(
-                zero,
-                0 * polynomial,
-                "test 3"
-            )
-            assertSame(
-                polynomial,
-                1 * polynomial,
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_plus() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(5, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) + Rational(-3),
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-3, 1),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) + Rational(-3),
-                "test 2"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 1),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) + Rational(-3),
-                "test 3"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ) + Rational(-3),
-                "test 4"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) + Rational(0),
-                "test 5"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) + Rational(0),
-                "test 6"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) + Rational(0),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_minus() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(5, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) - Rational(3),
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-3, 1),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) - Rational(3),
-                "test 2"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 1),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) - Rational(3),
-                "test 3"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ) - Rational(3),
-                "test 4"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) - Rational(0),
-                "test 5"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) - Rational(0),
-                "test 6"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                NumberedPolynomial(
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ) - Rational(0),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Constant_times() {
-        IntModuloRing(35).numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to m(34),
-                    listOf(3u) to m(2),
-                    listOf(0u, 1u) to m(1),
-                    listOf(1u) to m(20),
-                    listOf(0u, 0u, 2u) to m(2),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to m(22),
-                    listOf(3u) to m(26),
-                    listOf(0u, 1u) to m(13),
-                    listOf(1u) to m(15),
-                    listOf(0u, 0u, 2u) to m(26),
-                ) * m(27),
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to m(0),
-                    listOf(3u) to m(0),
-                    listOf(0u, 1u) to m(0),
-                    listOf(1u) to m(0),
-                    listOf(0u, 0u, 2u) to m(0),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to m(7),
-                    listOf(3u) to m(0),
-                    listOf(0u, 1u) to m(49),
-                    listOf(1u) to m(21),
-                    listOf(0u, 0u, 2u) to m(14),
-                ) * m(15),
-                "test 2"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to m(0),
-                    listOf(3u) to m(0),
-                    listOf(0u, 1u) to m(0),
-                    listOf(1u) to m(0),
-                    listOf(0u, 0u, 2u) to m(0),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to m(22),
-                    listOf(3u) to m(26),
-                    listOf(0u, 1u) to m(13),
-                    listOf(1u) to m(15),
-                    listOf(0u, 0u, 2u) to m(26),
-                ) * m(0),
-                "test 3"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to m(22),
-                    listOf(3u) to m(26),
-                    listOf(0u, 1u) to m(13),
-                    listOf(1u) to m(15),
-                    listOf(0u, 0u, 2u) to m(26),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to m(22),
-                    listOf(3u) to m(26),
-                    listOf(0u, 1u) to m(13),
-                    listOf(1u) to m(15),
-                    listOf(0u, 0u, 2u) to m(26),
-                ) * m(1),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_plus() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                Rational(-3) + NumberedPolynomial(
-                    listOf<UInt>() to Rational(5, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-3, 1),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                Rational(-3) + NumberedPolynomial(
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 1),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                Rational(-3) + NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ),
-                Rational(-3) + NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ),
-                "test 4"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                Rational(0) + NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 5"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                Rational(0) + NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 6"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                Rational(0) + NumberedPolynomial(
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_minus() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(22, 9),
-                    listOf(3u) to Rational(8, 9),
-                    listOf(0u, 4u) to Rational(8, 7),
-                ),
-                Rational(3) - NumberedPolynomial(
-                    listOf<UInt>() to Rational(5, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(3, 1),
-                    listOf(3u) to Rational(8, 9),
-                    listOf(0u, 4u) to Rational(8, 7),
-                ),
-                Rational(3) - NumberedPolynomial(
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 1),
-                    listOf(3u) to Rational(8, 9),
-                    listOf(0u, 4u) to Rational(8, 7),
-                ),
-                Rational(3) - NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ),
-                Rational(3) - NumberedPolynomial(
-                    listOf<UInt>() to Rational(27, 9),
-                    listOf(3u) to Rational(0),
-                    listOf(0u, 4u) to Rational(0),
-                ),
-                "test 4"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(22, 9),
-                    listOf(3u) to Rational(8, 9),
-                    listOf(0u, 4u) to Rational(8, 7),
-                ),
-                Rational(0) - NumberedPolynomial(
-                    listOf<UInt>() to Rational(-22, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 5"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 9),
-                    listOf(3u) to Rational(8, 9),
-                    listOf(0u, 4u) to Rational(8, 7),
-                ),
-                Rational(0) - NumberedPolynomial(
-                    listOf<UInt>() to Rational(0, 9),
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 6"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(3u) to Rational(8, 9),
-                    listOf(0u, 4u) to Rational(8, 7),
-                ),
-                Rational(0) - NumberedPolynomial(
-                    listOf(3u) to Rational(-8, 9),
-                    listOf(0u, 4u) to Rational(-8, 7),
-                ),
-                "test 7"
-            )
-        }
-    }
-    @Test
-    fun test_Constant_Polynomial_times() {
-        IntModuloRing(35).numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to m(34),
-                    listOf(3u) to m(2),
-                    listOf(0u, 1u) to m(1),
-                    listOf(1u) to m(20),
-                    listOf(0u, 0u, 2u) to m(2),
-                ),
-                m(27) * NumberedPolynomial(
-                    listOf<UInt>() to m(22),
-                    listOf(3u) to m(26),
-                    listOf(0u, 1u) to m(13),
-                    listOf(1u) to m(15),
-                    listOf(0u, 0u, 2u) to m(26),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to m(0),
-                    listOf(3u) to m(0),
-                    listOf(0u, 1u) to m(0),
-                    listOf(1u) to m(0),
-                    listOf(0u, 0u, 2u) to m(0),
-                ),
-                m(15) * NumberedPolynomial(
-                    listOf<UInt>() to m(7),
-                    listOf(3u) to m(0),
-                    listOf(0u, 1u) to m(49),
-                    listOf(1u) to m(21),
-                    listOf(0u, 0u, 2u) to m(14),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to m(0),
-                    listOf(3u) to m(0),
-                    listOf(0u, 1u) to m(0),
-                    listOf(1u) to m(0),
-                    listOf(0u, 0u, 2u) to m(0),
-                ),
-                m(0) * NumberedPolynomial(
-                    listOf<UInt>() to m(22),
-                    listOf(3u) to m(26),
-                    listOf(0u, 1u) to m(13),
-                    listOf(1u) to m(15),
-                    listOf(0u, 0u, 2u) to m(26),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to m(22),
-                    listOf(3u) to m(26),
-                    listOf(0u, 1u) to m(13),
-                    listOf(1u) to m(15),
-                    listOf(0u, 0u, 2u) to m(26),
-                ),
-                m(1) * NumberedPolynomial(
-                    listOf<UInt>() to m(22),
-                    listOf(3u) to m(26),
-                    listOf(0u, 1u) to m(13),
-                    listOf(1u) to m(15),
-                    listOf(0u, 0u, 2u) to m(26),
-                ),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_unaryMinus() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf(5u) to Rational(-5, 9),
-                    listOf<UInt>() to Rational(8, 9),
-                    listOf(0u, 0u, 0u, 0u, 0u, 0u, 13u) to Rational(8, 7),
-                ),
-                -NumberedPolynomial(
-                    listOf(5u) to Rational(5, 9),
-                    listOf<UInt>() to Rational(-8, 9),
-                    listOf(0u, 0u, 0u, 0u, 0u, 0u, 13u) to Rational(-8, 7),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf(5u) to Rational(-5, 9),
-                    listOf<UInt>() to Rational(8, 9),
-                    listOf(0u, 0u, 0u, 0u, 0u, 0u, 13u) to Rational(8, 7),
-                    listOf(0u, 4u) to Rational(0),
-                    listOf(5u) to Rational(0),
-                ),
-                -NumberedPolynomial(
-                    listOf(5u) to Rational(5, 9),
-                    listOf<UInt>() to Rational(-8, 9),
-                    listOf(0u, 0u, 0u, 0u, 0u, 0u, 13u) to Rational(-8, 7),
-                    listOf(0u, 4u) to Rational(0),
-                    listOf(5u) to Rational(0),
-                ),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_plus() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-17, 2),
-                    listOf(1u) to Rational(-1, 3),
-                    listOf(2u) to Rational(-25, 21),
-                    listOf(0u, 1u) to Rational(146, 63),
-                    listOf(1u, 1u) to Rational(-3, 5),
-                    listOf(2u, 1u) to Rational(61, 15),
-                    listOf(0u, 2u) to Rational(157, 63),
-                    listOf(1u, 2u) to Rational(-55, 21),
-                    listOf(2u, 2u) to Rational(11, 24),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(6, 4),
-                    listOf(1u) to Rational(-2, 6),
-                    listOf(2u) to Rational(10, 6),
-                    listOf(0u, 1u) to Rational(17, 7),
-                    listOf(1u, 1u) to Rational(-7, 7),
-                    listOf(2u, 1u) to Rational(12, 5),
-                    listOf(0u, 2u) to Rational(12, 7),
-                    listOf(1u, 2u) to Rational(-10, 3),
-                    listOf(2u, 2u) to Rational(9, 8),
-                ) + NumberedPolynomial(
-                    listOf<UInt>() to Rational(-20, 2),
-                    listOf(1u) to Rational(0, 9),
-                    listOf(2u) to Rational(-20, 7),
-                    listOf(0u, 1u) to Rational(-1, 9),
-                    listOf(1u, 1u) to Rational(2, 5),
-                    listOf(2u, 1u) to Rational(10, 6),
-                    listOf(0u, 2u) to Rational(7, 9),
-                    listOf(1u, 2u) to Rational(5, 7),
-                    listOf(2u, 2u) to Rational(-2, 3),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-17, 2),
-                    listOf(1u) to Rational(-1, 3),
-                    listOf(2u) to Rational(-25, 21),
-                    listOf(0u, 1u) to Rational(-1, 9),
-                    listOf(1u, 1u) to Rational(2, 5),
-                    listOf(2u, 1u) to Rational(10, 6),
-                    listOf(0u, 2u) to Rational(157, 63),
-                    listOf(1u, 2u) to Rational(-55, 21),
-                    listOf(2u, 2u) to Rational(11, 24),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(6, 4),
-                    listOf(1u) to Rational(-2, 6),
-                    listOf(2u) to Rational(10, 6),
-                    listOf(0u, 2u) to Rational(12, 7),
-                    listOf(1u, 2u) to Rational(-10, 3),
-                    listOf(2u, 2u) to Rational(9, 8),
-                ) + NumberedPolynomial(
-                    listOf<UInt>() to Rational(-20, 2),
-                    listOf(1u) to Rational(0, 9),
-                    listOf(2u) to Rational(-20, 7),
-                    listOf(0u, 1u) to Rational(-1, 9),
-                    listOf(1u, 1u) to Rational(2, 5),
-                    listOf(2u, 1u) to Rational(10, 6),
-                    listOf(0u, 2u) to Rational(7, 9),
-                    listOf(1u, 2u) to Rational(5, 7),
-                    listOf(2u, 2u) to Rational(-2, 3),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-17, 2),
-                    listOf(1u) to Rational(-1, 3),
-                    listOf(2u) to Rational(-25, 21),
-                    listOf(0u, 1u) to Rational(-1, 9),
-                    listOf(1u, 1u) to Rational(2, 5),
-                    listOf(2u, 1u) to Rational(10, 6),
-                    listOf(0u, 2u) to Rational(12, 7),
-                    listOf(1u, 2u) to Rational(-10, 3),
-                    listOf(2u, 2u) to Rational(9, 8),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(6, 4),
-                    listOf(1u) to Rational(-2, 6),
-                    listOf(2u) to Rational(10, 6),
-                    listOf(0u, 2u) to Rational(12, 7),
-                    listOf(1u, 2u) to Rational(-10, 3),
-                    listOf(2u, 2u) to Rational(9, 8),
-                ) + NumberedPolynomial(
-                    listOf<UInt>() to Rational(-20, 2),
-                    listOf(1u) to Rational(0, 9),
-                    listOf(2u) to Rational(-20, 7),
-                    listOf(0u, 1u) to Rational(-1, 9),
-                    listOf(1u, 1u) to Rational(2, 5),
-                    listOf(2u, 1u) to Rational(10, 6),
-                    listOf(0u, 2u) to Rational(0),
-                    listOf(1u, 2u) to Rational(0),
-                    listOf(2u, 2u) to Rational(0),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(1u) to Rational(0),
-                    listOf(2u) to Rational(0),
-                    listOf(0u, 1u) to Rational(0),
-                    listOf(1u, 1u) to Rational(0),
-                    listOf(2u, 1u) to Rational(0),
-                    listOf(0u, 2u) to Rational(0),
-                    listOf(1u, 2u) to Rational(0),
-                    listOf(2u, 2u) to Rational(0),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(6, 4),
-                    listOf(1u) to Rational(-2, 6),
-                    listOf(2u) to Rational(10, 6),
-                    listOf(0u, 1u) to Rational(17, 7),
-                    listOf(1u, 1u) to Rational(-7, 7),
-                    listOf(2u, 1u) to Rational(12, 5),
-                    listOf(0u, 2u) to Rational(12, 7),
-                    listOf(1u, 2u) to Rational(-10, 3),
-                    listOf(2u, 2u) to Rational(9, 8),
-                ) + NumberedPolynomial(
-                    listOf<UInt>() to Rational(-6, 4),
-                    listOf(1u) to Rational(2, 6),
-                    listOf(2u) to Rational(-10, 6),
-                    listOf(0u, 1u) to Rational(-17, 7),
-                    listOf(1u, 1u) to Rational(7, 7),
-                    listOf(2u, 1u) to Rational(-12, 5),
-                    listOf(0u, 2u) to Rational(-12, 7),
-                    listOf(1u, 2u) to Rational(10, 3),
-                    listOf(2u, 2u) to Rational(-9, 8),
-                ),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_minus() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-17, 2),
-                    listOf(1u) to Rational(-1, 3),
-                    listOf(2u) to Rational(-25, 21),
-                    listOf(0u, 1u) to Rational(146, 63),
-                    listOf(1u, 1u) to Rational(-3, 5),
-                    listOf(2u, 1u) to Rational(61, 15),
-                    listOf(0u, 2u) to Rational(157, 63),
-                    listOf(1u, 2u) to Rational(-55, 21),
-                    listOf(2u, 2u) to Rational(11, 24),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(6, 4),
-                    listOf(1u) to Rational(-2, 6),
-                    listOf(2u) to Rational(10, 6),
-                    listOf(0u, 1u) to Rational(17, 7),
-                    listOf(1u, 1u) to Rational(-7, 7),
-                    listOf(2u, 1u) to Rational(12, 5),
-                    listOf(0u, 2u) to Rational(12, 7),
-                    listOf(1u, 2u) to Rational(-10, 3),
-                    listOf(2u, 2u) to Rational(9, 8),
-                ) - NumberedPolynomial(
-                    listOf<UInt>() to Rational(20, 2),
-                    listOf(1u) to Rational(0, 9),
-                    listOf(2u) to Rational(20, 7),
-                    listOf(0u, 1u) to Rational(1, 9),
-                    listOf(1u, 1u) to Rational(-2, 5),
-                    listOf(2u, 1u) to Rational(-10, 6),
-                    listOf(0u, 2u) to Rational(-7, 9),
-                    listOf(1u, 2u) to Rational(-5, 7),
-                    listOf(2u, 2u) to Rational(2, 3),
-                ),
-                "test 1"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-17, 2),
-                    listOf(1u) to Rational(-1, 3),
-                    listOf(2u) to Rational(-25, 21),
-                    listOf(0u, 1u) to Rational(-1, 9),
-                    listOf(1u, 1u) to Rational(2, 5),
-                    listOf(2u, 1u) to Rational(10, 6),
-                    listOf(0u, 2u) to Rational(157, 63),
-                    listOf(1u, 2u) to Rational(-55, 21),
-                    listOf(2u, 2u) to Rational(11, 24),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(6, 4),
-                    listOf(1u) to Rational(-2, 6),
-                    listOf(2u) to Rational(10, 6),
-                    listOf(0u, 2u) to Rational(12, 7),
-                    listOf(1u, 2u) to Rational(-10, 3),
-                    listOf(2u, 2u) to Rational(9, 8),
-                ) - NumberedPolynomial(
-                    listOf<UInt>() to Rational(20, 2),
-                    listOf(1u) to Rational(0, 9),
-                    listOf(2u) to Rational(20, 7),
-                    listOf(0u, 1u) to Rational(1, 9),
-                    listOf(1u, 1u) to Rational(-2, 5),
-                    listOf(2u, 1u) to Rational(-10, 6),
-                    listOf(0u, 2u) to Rational(-7, 9),
-                    listOf(1u, 2u) to Rational(-5, 7),
-                    listOf(2u, 2u) to Rational(2, 3),
-                ),
-                "test 2"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(-17, 2),
-                    listOf(1u) to Rational(-1, 3),
-                    listOf(2u) to Rational(-25, 21),
-                    listOf(0u, 1u) to Rational(-1, 9),
-                    listOf(1u, 1u) to Rational(2, 5),
-                    listOf(2u, 1u) to Rational(10, 6),
-                    listOf(0u, 2u) to Rational(12, 7),
-                    listOf(1u, 2u) to Rational(-10, 3),
-                    listOf(2u, 2u) to Rational(9, 8),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(6, 4),
-                    listOf(1u) to Rational(-2, 6),
-                    listOf(2u) to Rational(10, 6),
-                    listOf(0u, 2u) to Rational(12, 7),
-                    listOf(1u, 2u) to Rational(-10, 3),
-                    listOf(2u, 2u) to Rational(9, 8),
-                ) - NumberedPolynomial(
-                    listOf<UInt>() to Rational(20, 2),
-                    listOf(1u) to Rational(0, 9),
-                    listOf(2u) to Rational(20, 7),
-                    listOf(0u, 1u) to Rational(1, 9),
-                    listOf(1u, 1u) to Rational(-2, 5),
-                    listOf(2u, 1u) to Rational(-10, 6),
-                    listOf(0u, 2u) to Rational(0),
-                    listOf(1u, 2u) to Rational(0),
-                    listOf(2u, 2u) to Rational(0),
-                ),
-                "test 3"
-            )
-            assertEquals(
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(0),
-                    listOf(1u) to Rational(0),
-                    listOf(2u) to Rational(0),
-                    listOf(0u, 1u) to Rational(0),
-                    listOf(1u, 1u) to Rational(0),
-                    listOf(2u, 1u) to Rational(0),
-                    listOf(0u, 2u) to Rational(0),
-                    listOf(1u, 2u) to Rational(0),
-                    listOf(2u, 2u) to Rational(0),
-                ),
-                NumberedPolynomial(
-                    listOf<UInt>() to Rational(6, 4),
-                    listOf(1u) to Rational(-2, 6),
-                    listOf(2u) to Rational(10, 6),
-                    listOf(0u, 1u) to Rational(17, 7),
-                    listOf(1u, 1u) to Rational(-7, 7),
-                    listOf(2u, 1u) to Rational(12, 5),
-                    listOf(0u, 2u) to Rational(12, 7),
-                    listOf(1u, 2u) to Rational(-10, 3),
-                    listOf(2u, 2u) to Rational(9, 8),
-                ) - NumberedPolynomial(
-                    listOf<UInt>() to Rational(6, 4),
-                    listOf(1u) to Rational(-2, 6),
-                    listOf(2u) to Rational(10, 6),
-                    listOf(0u, 1u) to Rational(17, 7),
-                    listOf(1u, 1u) to Rational(-7, 7),
-                    listOf(2u, 1u) to Rational(12, 5),
-                    listOf(0u, 2u) to Rational(12, 7),
-                    listOf(1u, 2u) to Rational(-10, 3),
-                    listOf(2u, 2u) to Rational(9, 8),
-                ),
-                "test 4"
-            )
-        }
-    }
-    @Test
-    fun test_Polynomial_Polynomial_times() {
-        IntModuloRing(35).numberedPolynomialSpace {
-            // (p + q + r) * (p^2 + q^2 + r^2 - pq - pr - qr) = p^3 + q^3 + r^3 - 3pqr
-            assertEquals(
-                NumberedPolynomial(
-                    listOf(3u) to m(1),
-                    listOf(0u, 3u) to m(1),
-                    listOf(0u, 0u, 3u) to m(1),
-                    listOf(1u, 2u) to m(0),
-                    listOf(0u, 1u, 2u) to m(0),
-                    listOf(2u, 0u, 1u) to m(0),
-                    listOf(1u, 0u, 2u) to m(0),
-                    listOf(2u, 1u) to m(0),
-                    listOf(0u, 2u, 1u) to m(0),
-                    listOf(1u, 1u, 1u) to m(-3),
-                ),
-                NumberedPolynomial(
-                    listOf(1u) to m(1),
-                    listOf(0u, 1u) to m(1),
-                    listOf(0u, 0u, 1u) to m(1),
-                ) * NumberedPolynomial(
-                    listOf(2u) to m(1),
-                    listOf(0u, 2u) to m(1),
-                    listOf(0u, 0u, 2u) to m(1),
-                    listOf(1u, 1u) to m(-1),
-                    listOf(0u, 1u, 1u) to m(-1),
-                    listOf(1u, 0u, 1u) to m(-1),
-                ),
-                "test 1"
-            )
-            // Spoiler: 5 * 7 = 0
-            assertEquals(
-                NumberedPolynomial(
-                    listOf(2u) to m(0),
-                    listOf(0u, 2u) to m(0),
-                    listOf(0u, 0u, 2u) to m(0),
-                    listOf(1u, 1u) to m(0),
-                    listOf(0u, 1u, 1u) to m(0),
-                    listOf(1u, 0u, 1u) to m(0),
-                ),
-                NumberedPolynomial(
-                    listOf(1u) to m(5),
-                    listOf(0u, 1u) to m(-25),
-                    listOf(0u, 0u, 1u) to m(10),
-                ) * NumberedPolynomial(
-                    listOf(1u) to m(21),
-                    listOf(0u, 1u) to m(14),
-                    listOf(0u, 0u, 1u) to m(-7),
-                ),
-                "test 2"
-            )
-        }
-    }
-    @Test
-    fun test_lastVariable() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                -1,
-                NumberedPolynomial().lastVariable,
-                "test 1"
-            )
-            assertEquals(
-                -1,
-                NumberedPolynomial(
-                    listOf<UInt>() to o
-                ).lastVariable,
-                "test 2"
-            )
-            assertEquals(
-                2,
-                NumberedPolynomial(
-                    listOf(1u, 2u, 3u) to o
-                ).lastVariable,
-                "test 3"
-            )
-            assertEquals(
-                3,
-                NumberedPolynomial(
-                    listOf(0u, 1u, 2u, 1u, 0u) to o
-                ).also { println(it) }.lastVariable,
-                "test 4"
-            )
-            assertEquals(
-                2,
-                NumberedPolynomial(
-                    listOf<UInt>() to o,
-                    listOf(0u, 1u) to o,
-                    listOf(2u, 0u, 1u) to o,
-                ).lastVariable,
-                "test 5"
-            )
-        }
-    }
-    @Test
-    fun test_degree() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                -1,
-                NumberedPolynomial().degree,
-                "test 1"
-            )
-            assertEquals(
-                0,
-                NumberedPolynomial(
-                    listOf<UInt>() to o
-                ).degree,
-                "test 2"
-            )
-            assertEquals(
-                6,
-                NumberedPolynomial(
-                    listOf(1u, 2u, 3u) to o
-                ).degree,
-                "test 3"
-            )
-            assertEquals(
-                4,
-                NumberedPolynomial(
-                    listOf(0u, 1u, 2u, 1u, 0u) to o
-                ).degree,
-                "test 4"
-            )
-            assertEquals(
-                3,
-                NumberedPolynomial(
-                    listOf<UInt>() to o,
-                    listOf(0u, 1u) to o,
-                    listOf(2u, 0u, 1u) to o,
-                ).degree,
-                "test 5"
-            )
-            assertEquals(
-                4,
-                NumberedPolynomial(
-                    listOf<UInt>() to o,
-                    listOf(0u, 1u) to o,
-                    listOf(2u, 0u, 1u) to o,
-                    listOf(0u, 0u, 0u, 4u) to o,
-                ).degree,
-                "test 6"
-            )
-        }
-    }
-    @Test
-    fun test_degrees() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                listOf(),
-                NumberedPolynomial().degrees,
-                "test 1"
-            )
-            assertEquals(
-                listOf(),
-                NumberedPolynomial(
-                    listOf<UInt>() to o
-                ).degrees,
-                "test 2"
-            )
-            assertEquals(
-                listOf(1u, 2u, 3u),
-                NumberedPolynomial(
-                    listOf(1u, 2u, 3u) to o
-                ).degrees,
-                "test 3"
-            )
-            assertEquals(
-                listOf(0u, 1u, 2u, 1u),
-                NumberedPolynomial(
-                    listOf(0u, 1u, 2u, 1u, 0u) to o
-                ).degrees,
-                "test 4"
-            )
-            assertEquals(
-                listOf(2u, 1u, 1u),
-                NumberedPolynomial(
-                    listOf<UInt>() to o,
-                    listOf(0u, 1u) to o,
-                    listOf(2u, 0u, 1u) to o,
-                ).degrees,
-                "test 5"
-            )
-            assertEquals(
-                listOf(2u, 2u, 2u, 4u),
-                NumberedPolynomial(
-                    listOf<UInt>() to o,
-                    listOf(1u, 2u) to o,
-                    listOf(0u, 1u, 2u) to o,
-                    listOf(2u, 0u, 1u) to o,
-                    listOf(0u, 0u, 0u, 4u) to o,
-                ).degrees,
-                "test 6"
-            )
-        }
-    }
-    @Test
-    fun test_degreeBy() {
-        RationalField.numberedPolynomialSpace {
-            fun NumberedPolynomial<Rational>.collectDegrees(limit: Int = lastVariable + 2): List<UInt> = List(limit) { degreeBy(it) }
-            assertEquals(
-                listOf(0u),
-                NumberedPolynomial().collectDegrees(),
-                "test 1"
-            )
-            assertEquals(
-                listOf(0u),
-                NumberedPolynomial(
-                    listOf<UInt>() to o
-                ).collectDegrees(),
-                "test 2"
-            )
-            assertEquals(
-                listOf(1u, 2u, 3u, 0u),
-                NumberedPolynomial(
-                    listOf(1u, 2u, 3u) to o
-                ).collectDegrees(),
-                "test 3"
-            )
-            assertEquals(
-                listOf(0u, 1u, 2u, 1u, 0u),
-                NumberedPolynomial(
-                    listOf(0u, 1u, 2u, 1u, 0u) to o
-                ).collectDegrees(),
-                "test 4"
-            )
-            assertEquals(
-                listOf(2u, 1u, 1u, 0u),
-                NumberedPolynomial(
-                    listOf<UInt>() to o,
-                    listOf(0u, 1u) to o,
-                    listOf(2u, 0u, 1u) to o,
-                ).collectDegrees(),
-                "test 5"
-            )
-            assertEquals(
-                listOf(2u, 2u, 2u, 4u, 0u),
-                NumberedPolynomial(
-                    listOf<UInt>() to o,
-                    listOf(1u, 2u) to o,
-                    listOf(0u, 1u, 2u) to o,
-                    listOf(2u, 0u, 1u) to o,
-                    listOf(0u, 0u, 0u, 4u) to o,
-                ).collectDegrees(),
-                "test 6"
-            )
-        }
-    }
-    @Test
-    fun test_degreeBy_Collection() {
-        RationalField.numberedPolynomialSpace {
-            fun NumberedPolynomial<Rational>.checkDegreeBy(message: String? = null) {
-                val lastVariable = lastVariable
-                val indexCollectionSequence: Sequence<List<Int>> = sequence {
-                    val appearances = MutableList(lastVariable + 2) { 0 }
-                    while (true) {
-                        yield(
-                            buildList {
-                                for ((variable, count) in appearances.withIndex()) repeat(count) { add(variable) }
-                            }
-                        )
-                        val indexChange = appearances.indexOfFirst { it < 4 }
-                        if (indexChange == -1) break
-                        appearances[indexChange] += 1
-                        for (index in 0 until indexChange) appearances[index] = 0
-                    }
-                }
-                for (indexCollection in indexCollectionSequence) {
-                    val expected = coefficients.keys.maxOfOrNull { degs -> degs.slice(indexCollection.distinct().filter { it in degs.indices }).sum() } ?: 0u
-                    val actual = degreeBy(indexCollection)
-                    if (actual != expected)
-                        fail("${message ?: ""} Incorrect answer for variable collection $indexCollection: expected $expected, actual $actual")
-                }
-            }
-            NumberedPolynomial().checkDegreeBy("test 1")
-            NumberedPolynomial(
-                listOf<UInt>() to o
-            ).checkDegreeBy("test 2")
-            NumberedPolynomial(
-                listOf(1u, 2u, 3u) to o
-            ).checkDegreeBy("test 3")
-            NumberedPolynomial(
-                listOf(0u, 1u, 2u, 1u, 0u) to o
-            ).checkDegreeBy("test 4")
-            NumberedPolynomial(
-                listOf<UInt>() to o,
-                listOf(0u, 1u) to o,
-                listOf(2u, 0u, 1u) to o,
-            ).checkDegreeBy("test 5")
-            NumberedPolynomial(
-                listOf<UInt>() to o,
-                listOf(1u, 2u) to o,
-                listOf(0u, 1u, 2u) to o,
-                listOf(2u, 0u, 1u) to o,
-                listOf(0u, 0u, 0u, 4u) to o,
-            ).checkDegreeBy("test 6")
-        }
-    }
-    @Test
-    fun test_countOfVariables() {
-        RationalField.numberedPolynomialSpace {
-            assertEquals(
-                0,
-                NumberedPolynomial().countOfVariables,
-                "test 1"
-            )
-            assertEquals(
-                0,
-                NumberedPolynomial(
-                    listOf<UInt>() to o
-                ).countOfVariables,
-                "test 2"
-            )
-            assertEquals(
-                3,
-                NumberedPolynomial(
-                    listOf(1u, 2u, 3u) to o
-                ).countOfVariables,
-                "test 3"
-            )
-            assertEquals(
-                3,
-                NumberedPolynomial(
-                    listOf(0u, 1u, 2u, 1u, 0u) to o
-                ).countOfVariables,
-                "test 4"
-            )
-            assertEquals(
-                3,
-                NumberedPolynomial(
-                    listOf<UInt>() to o,
-                    listOf(0u, 1u) to o,
-                    listOf(2u, 0u, 1u) to o,
-                ).countOfVariables,
-                "test 5"
-            )
-            assertEquals(
-                4,
-                NumberedPolynomial(
-                    listOf<UInt>() to o,
-                    listOf(1u, 2u) to o,
-                    listOf(0u, 1u, 2u) to o,
-                    listOf(2u, 0u, 1u) to o,
-                    listOf(0u, 0u, 0u, 4u) to o,
-                ).countOfVariables,
-                "test 6"
-            )
-        }
-    }
-    @Test
-    fun test_RF_countOfVariables() {
-        RationalField.numberedRationalFunctionSpace {
-            assertEquals(
-                0,
-                NumberedRationalFunction(
-                    NumberedPolynomial()
-                ).countOfVariables,
-                "test 1"
-            )
-            assertEquals(
-                0,
-                NumberedRationalFunction(
-                    NumberedPolynomial(),
-                    NumberedPolynomial()
-                ).countOfVariables,
-                "test 2"
-            )
-            assertEquals(
-                0,
-                NumberedRationalFunction(
-                    NumberedPolynomial(
-                        listOf<UInt>() to o
-                    )
-                ).countOfVariables,
-                "test 3"
-            )
-            assertEquals(
-                3,
-                NumberedRationalFunction(
-                    NumberedPolynomial(
-                        listOf(1u, 2u, 3u) to o
-                    )
-                ).countOfVariables,
-                "test 4"
-            )
-            assertEquals(
-                3,
-                NumberedRationalFunction(
-                    NumberedPolynomial(
-                        listOf(0u, 1u, 0u, 1u) to o
-                    ),
-                    NumberedPolynomial(
-                        listOf(0u, 0u, 2u) to o
-                    )
-                ).countOfVariables,
-                "test 5"
-            )
-            assertEquals(
-                3,
-                NumberedRationalFunction(
-                    NumberedPolynomial(
-                        listOf<UInt>() to o,
-                        listOf(0u, 1u) to o,
-                        listOf(2u, 0u, 1u) to o,
-                    )
-                ).countOfVariables,
-                "test 6"
-            )
-            assertEquals(
-                4,
-                NumberedRationalFunction(
-                    NumberedPolynomial(
-                        listOf<UInt>() to o,
-                        listOf(1u, 2u) to o,
-                        listOf(2u, 0u, 1u) to o,
-                    ), NumberedPolynomial(
-                        listOf(0u, 1u, 2u) to o,
-                        listOf(0u, 0u, 0u, 4u) to o,
-                    )
-                ).countOfVariables,
-                "test 7"
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
deleted file mode 100644
index e5d1ddf48..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/NumberedPolynomialUtilTest.kt
+++ /dev/null
@@ -1,12021 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.functions.testUtils.Rational
-import space.kscience.kmath.functions.testUtils.RationalField
-import space.kscience.kmath.functions.testUtils.assertFailsWithTypeAndMessage
-import kotlin.test.Ignore
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import space.kscience.kmath.functions.testUtils.bufferOf
-import space.kscience.kmath.functions.testUtils.assertEquals
-
-
-class NumberedPolynomialUtilTest {
-    @Test
-    fun test_Polynomial_substitute_Double_Map() {
-        assertEquals(
-            NumberedPolynomialAsIs(emptyList<UInt>() to 0.0),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 1.0,
-                listOf(1u) to -2.0,
-                listOf(2u) to 1.0,
-            ).substitute(mapOf(
-                0 to 1.0
-            )),
-            0.001,
-            "test 1"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(mapOf()),
-            0.001,
-            "test 2"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                5 to 0.9211194782050933
-            )),
-            0.001,
-            "test 2'"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(0u, 2u) to 0.2700930201481795,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                0 to 0.0
-            )),
-            0.001,
-            "test 3"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(0u, 2u) to 0.2700930201481795,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                0 to 0.0,
-                5 to 0.9211194782050933
-            )),
-            0.001,
-            "test 3'"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 1.433510890645169,
-                listOf(1u) to 0.6264844682514724,
-                listOf(2u) to 0.8405727903771333,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                1 to 0.8400458576651112
-            )),
-            0.001,
-            "test 4"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 1.433510890645169,
-                listOf(1u) to 0.6264844682514724,
-                listOf(2u) to 0.8405727903771333,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                1 to 0.8400458576651112,
-                5 to 0.9211194782050933
-            )),
-            0.001,
-            "test 4'"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 1.934530767358133,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                0 to 0.4846192734143442,
-                1 to 0.8400458576651112,
-            )),
-            0.001,
-            "test 5"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 1.934530767358133,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(mapOf(
-                0 to 0.4846192734143442,
-                1 to 0.8400458576651112,
-                5 to 0.9211194782050933
-            )),
-            0.001,
-            "test 5'"
-        )
-    }
-    @Test
-    fun test_Polynomial_substitute_Constant_Map() {
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0)
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1)
-            ).substitute(RationalField, mapOf(
-                0 to Rational(1)
-            )),
-            "test 1"
-        )
-        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5%2C+y+%3D+12%2F9
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(143, 150)
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                0 to Rational(-2, 5),
-                1 to Rational(12, 9),
-            )),
-            "test 2"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(143, 150)
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                0 to Rational(-2, 5),
-                1 to Rational(12, 9),
-                5 to Rational(57, 179),
-            )),
-            "test 2'"
-        )
-        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+y+%3D+12%2F9
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-67, 18),
-                listOf(1u) to Rational(-70, 9),
-                listOf(2u) to Rational(88, 9),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                1 to Rational(12, 9),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-67, 18),
-                listOf(1u) to Rational(-70, 9),
-                listOf(2u) to Rational(88, 9),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                1 to Rational(12, 9),
-                5 to Rational(57, 179),
-            )),
-            "test 3'"
-        )
-        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-83, 50),
-                listOf(0u, 1u) to Rational(29, 25),
-                listOf(0u, 2u) to Rational(3, 5),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                0 to Rational(-2, 5),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-83, 50),
-                listOf(0u, 1u) to Rational(29, 25),
-                listOf(0u, 2u) to Rational(3, 5),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                0 to Rational(-2, 5),
-                5 to Rational(57, 179),
-            )),
-            "test 4'"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf<Int, Rational>()),
-            "test 5"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                5 to Rational(57, 179),
-            )),
-            "test 5'"
-        )
-        // https://www.wolframalpha.com/input?i=%28%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2%29+p%5E8+where+x+%3D+q%2Fp%2C+y+%3D+x%5E3%2C+p+%3D+-2%2F5%2C+q+%3D+12%2F9
-        assertEquals(
-            NumberedPolynomialAsIs(
-            listOf<UInt>() to Rational(47639065216, 2562890625)
-            ),
-            NumberedPolynomialAsIs(
-                listOf(8u) to Rational(-3, 2),
-                listOf(7u, 1u) to Rational(8, 6),
-                listOf(6u, 2u) to Rational(14, 6),
-                listOf(5u, 3u) to Rational(-3, 1),
-                listOf(4u, 4u) to Rational(-19, 2),
-                listOf(3u, 5u) to Rational(9, 4),
-                listOf(2u, 6u) to Rational(5, 5),
-                listOf(1u, 7u) to Rational(18, 9),
-                listOf(0u, 8u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                0 to Rational(-2, 5),
-                1 to Rational(12, 9),
-            )),
-            "test 6"
-        )
-    }
-    @Test
-    fun test_Polynomial_substitute_Polynomial_Map() {
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0)
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1)
-            ).substitute(RationalField, mapOf(
-                0 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            )),
-            "test 1"
-        )
-        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-5%2F1+s+%2B+2%2F8+t%2C+y+%3D+11%2F7+t
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(0u, 1u) to Rational(-92, 21),
-                listOf(0u, 2u) to Rational(-2627, 2352),
-                listOf(0u, 3u) to Rational(4565, 3136),
-                listOf(0u, 4u) to Rational(605, 1568),
-                listOf(1u) to Rational(-20, 3),
-                listOf(1u, 1u) to Rational(1445, 21),
-                listOf(1u, 2u) to Rational(-13145, 392),
-                listOf(1u, 3u) to Rational(-3025, 196),
-                listOf(2u) to Rational(175, 3),
-                listOf(2u, 1u) to Rational(2475, 28),
-                listOf(2u, 2u) to Rational(15125, 98),
-                listOf(3u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                0 to NumberedPolynomialAsIs(
-                    listOf(1u) to Rational(-5, 1),
-                    listOf(0u, 1u) to Rational(2, 8),
-                ),
-                1 to NumberedPolynomialAsIs(
-                    listOf(1u) to Rational(0, 5),
-                    listOf(0u, 1u) to Rational(11, 7),
-                ),
-            )),
-            "test 2"
-        )
-        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = (0/6 + 14/8 s + -14/2 s^2) + (-3/5 + 11/1 s + 3/7 s^2) t + (-3/7 + -18/5 s + -9/1 s^2) t^2, y = (-9/2 + 2/7 s + 9/1 s^2) + (13/1 + -1/8 s + 2/8 s^2) t + (19/4 + 15/7 s + -19/4 s^2) t^2
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(129, 4),
-                listOf(1u) to Rational(48583, 336),
-                listOf(2u) to Rational(-913477, 1568),
-                listOf(3u) to Rational(-967567, 672),
-                listOf(4u) to Rational(4722043, 1344),
-                listOf(5u) to Rational(8855, 2),
-                listOf(6u) to Rational(-311971, 32),
-                listOf(7u) to Rational(-17325, 4),
-                listOf(8u) to Rational(19845, 2),
-                listOf(0u, 1u) to Rational(-827, 4),
-                listOf(1u, 1u) to Rational(191927, 840),
-                listOf(2u, 1u) to Rational(9592627, 2352),
-                listOf(3u, 1u) to Rational(-105400711, 53760),
-                listOf(4u, 1u) to Rational(-10054101459, 439040),
-                listOf(5u, 1u) to Rational(2127351, 128),
-                listOf(6u, 1u) to Rational(116680973, 3136),
-                listOf(7u, 1u) to Rational(-220445, 7),
-                listOf(8u, 1u) to Rational(-2655, 4),
-                listOf(0u, 2u) to Rational(30567, 100),
-                listOf(1u, 2u) to Rational(-156284953, 39200),
-                listOf(2u, 2u) to Rational(-57661541711, 6585600),
-                listOf(3u, 2u) to Rational(131931579, 3136),
-                listOf(4u, 2u) to Rational(98818124791, 3512320),
-                listOf(5u, 2u) to Rational(-94458855053, 878080),
-                listOf(6u, 2u) to Rational(13937705305, 1229312),
-                listOf(7u, 2u) to Rational(335706887, 21952),
-                listOf(8u, 2u) to Rational(23549165, 1568),
-                listOf(0u, 3u) to Rational(111367, 1400),
-                listOf(1u, 3u) to Rational(4937369, 700),
-                listOf(2u, 3u) to Rational(-4449423711, 274400),
-                listOf(3u, 3u) to Rational(-351873325703, 4390400),
-                listOf(4u, 3u) to Rational(23495875029, 307328),
-                listOf(5u, 3u) to Rational(17576300919, 878080),
-                listOf(6u, 3u) to Rational(230316993, 12544),
-                listOf(7u, 3u) to Rational(-191130515, 21952),
-                listOf(8u, 3u) to Rational(332435, 392),
-                listOf(0u, 4u) to Rational(-275084, 1225),
-                listOf(1u, 4u) to Rational(-266774603, 137200),
-                listOf(2u, 4u) to Rational(2176279167121, 30732800),
-                listOf(3u, 4u) to Rational(10904913303, 2195200),
-                listOf(4u, 4u) to Rational(-10769286147, 2195200),
-                listOf(5u, 4u) to Rational(-26277119793, 439040),
-                listOf(6u, 4u) to Rational(25859735869, 6146560),
-                listOf(7u, 4u) to Rational(38906289, 2744),
-                listOf(8u, 4u) to Rational(-3072025, 392),
-                listOf(0u, 5u) to Rational(9573, 98),
-                listOf(1u, 5u) to Rational(-4154651399, 548800),
-                listOf(2u, 5u) to Rational(3446069019, 548800),
-                listOf(3u, 5u) to Rational(-7851500623, 137200),
-                listOf(4u, 5u) to Rational(-53205142903, 1920800),
-                listOf(5u, 5u) to Rational(-31953611, 3430),
-                listOf(6u, 5u) to Rational(1447380313, 109760),
-                listOf(7u, 5u) to Rational(764158625, 21952),
-                listOf(8u, 5u) to Rational(1153515, 784),
-                listOf(0u, 6u) to Rational(1722351, 7840),
-                listOf(1u, 6u) to Rational(-164554821, 109760),
-                listOf(2u, 6u) to Rational(-79096147243, 7683200),
-                listOf(3u, 6u) to Rational(-624721089, 15680),
-                listOf(4u, 6u) to Rational(11147305567, 548800),
-                listOf(5u, 6u) to Rational(8318333679, 109760),
-                listOf(6u, 6u) to Rational(32981871553, 1536640),
-                listOf(7u, 6u) to Rational(-225359619, 21952),
-                listOf(8u, 6u) to Rational(-3973995, 392),
-                listOf(0u, 7u) to Rational(67203, 784),
-                listOf(1u, 7u) to Rational(39281469, 54880),
-                listOf(2u, 7u) to Rational(70162551, 27440),
-                listOf(3u, 7u) to Rational(413630709, 54880),
-                listOf(4u, 7u) to Rational(4640410269, 192080),
-                listOf(5u, 7u) to Rational(802712247, 54880),
-                listOf(6u, 7u) to Rational(-473517603, 27440),
-                listOf(7u, 7u) to Rational(-17055459, 1568),
-                listOf(8u, 7u) to Rational(-12825, 14),
-                listOf(0u, 8u) to Rational(16245, 1568),
-                listOf(1u, 8u) to Rational(503253, 2744),
-                listOf(2u, 8u) to Rational(125292591, 96040),
-                listOf(3u, 8u) to Rational(12033171, 2744),
-                listOf(4u, 8u) to Rational(154352673, 27440),
-                listOf(5u, 8u) to Rational(-1302291, 392),
-                listOf(6u, 8u) to Rational(-20265741, 1960),
-                listOf(7u, 8u) to Rational(-26163, 56),
-                listOf(8u, 8u) to Rational(146205, 32),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                0 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0, 6),
-                    listOf(1u) to Rational(14, 8),
-                    listOf(2u) to Rational(-14, 2),
-                    listOf(0u, 1u) to Rational(-3, 5),
-                    listOf(1u, 1u) to Rational(11, 1),
-                    listOf(2u, 1u) to Rational(3, 7),
-                    listOf(0u, 2u) to Rational(-3, 7),
-                    listOf(1u, 2u) to Rational(-18, 5),
-                    listOf(2u, 2u) to Rational(-9, 1),
-                ),
-                1 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-9, 2),
-                    listOf(1u) to Rational(2, 7),
-                    listOf(2u) to Rational(9, 1),
-                    listOf(0u, 1u) to Rational(13, 1),
-                    listOf(1u, 1u) to Rational(-1, 8),
-                    listOf(2u, 1u) to Rational(2, 8),
-                    listOf(0u, 2u) to Rational(19, 4),
-                    listOf(1u, 2u) to Rational(15, 7),
-                    listOf(2u, 2u) to Rational(-19, 4),
-                ),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(129, 4),
-                listOf(1u) to Rational(48583, 336),
-                listOf(2u) to Rational(-913477, 1568),
-                listOf(3u) to Rational(-967567, 672),
-                listOf(4u) to Rational(4722043, 1344),
-                listOf(5u) to Rational(8855, 2),
-                listOf(6u) to Rational(-311971, 32),
-                listOf(7u) to Rational(-17325, 4),
-                listOf(8u) to Rational(19845, 2),
-                listOf(0u, 1u) to Rational(-827, 4),
-                listOf(1u, 1u) to Rational(191927, 840),
-                listOf(2u, 1u) to Rational(9592627, 2352),
-                listOf(3u, 1u) to Rational(-105400711, 53760),
-                listOf(4u, 1u) to Rational(-10054101459, 439040),
-                listOf(5u, 1u) to Rational(2127351, 128),
-                listOf(6u, 1u) to Rational(116680973, 3136),
-                listOf(7u, 1u) to Rational(-220445, 7),
-                listOf(8u, 1u) to Rational(-2655, 4),
-                listOf(0u, 2u) to Rational(30567, 100),
-                listOf(1u, 2u) to Rational(-156284953, 39200),
-                listOf(2u, 2u) to Rational(-57661541711, 6585600),
-                listOf(3u, 2u) to Rational(131931579, 3136),
-                listOf(4u, 2u) to Rational(98818124791, 3512320),
-                listOf(5u, 2u) to Rational(-94458855053, 878080),
-                listOf(6u, 2u) to Rational(13937705305, 1229312),
-                listOf(7u, 2u) to Rational(335706887, 21952),
-                listOf(8u, 2u) to Rational(23549165, 1568),
-                listOf(0u, 3u) to Rational(111367, 1400),
-                listOf(1u, 3u) to Rational(4937369, 700),
-                listOf(2u, 3u) to Rational(-4449423711, 274400),
-                listOf(3u, 3u) to Rational(-351873325703, 4390400),
-                listOf(4u, 3u) to Rational(23495875029, 307328),
-                listOf(5u, 3u) to Rational(17576300919, 878080),
-                listOf(6u, 3u) to Rational(230316993, 12544),
-                listOf(7u, 3u) to Rational(-191130515, 21952),
-                listOf(8u, 3u) to Rational(332435, 392),
-                listOf(0u, 4u) to Rational(-275084, 1225),
-                listOf(1u, 4u) to Rational(-266774603, 137200),
-                listOf(2u, 4u) to Rational(2176279167121, 30732800),
-                listOf(3u, 4u) to Rational(10904913303, 2195200),
-                listOf(4u, 4u) to Rational(-10769286147, 2195200),
-                listOf(5u, 4u) to Rational(-26277119793, 439040),
-                listOf(6u, 4u) to Rational(25859735869, 6146560),
-                listOf(7u, 4u) to Rational(38906289, 2744),
-                listOf(8u, 4u) to Rational(-3072025, 392),
-                listOf(0u, 5u) to Rational(9573, 98),
-                listOf(1u, 5u) to Rational(-4154651399, 548800),
-                listOf(2u, 5u) to Rational(3446069019, 548800),
-                listOf(3u, 5u) to Rational(-7851500623, 137200),
-                listOf(4u, 5u) to Rational(-53205142903, 1920800),
-                listOf(5u, 5u) to Rational(-31953611, 3430),
-                listOf(6u, 5u) to Rational(1447380313, 109760),
-                listOf(7u, 5u) to Rational(764158625, 21952),
-                listOf(8u, 5u) to Rational(1153515, 784),
-                listOf(0u, 6u) to Rational(1722351, 7840),
-                listOf(1u, 6u) to Rational(-164554821, 109760),
-                listOf(2u, 6u) to Rational(-79096147243, 7683200),
-                listOf(3u, 6u) to Rational(-624721089, 15680),
-                listOf(4u, 6u) to Rational(11147305567, 548800),
-                listOf(5u, 6u) to Rational(8318333679, 109760),
-                listOf(6u, 6u) to Rational(32981871553, 1536640),
-                listOf(7u, 6u) to Rational(-225359619, 21952),
-                listOf(8u, 6u) to Rational(-3973995, 392),
-                listOf(0u, 7u) to Rational(67203, 784),
-                listOf(1u, 7u) to Rational(39281469, 54880),
-                listOf(2u, 7u) to Rational(70162551, 27440),
-                listOf(3u, 7u) to Rational(413630709, 54880),
-                listOf(4u, 7u) to Rational(4640410269, 192080),
-                listOf(5u, 7u) to Rational(802712247, 54880),
-                listOf(6u, 7u) to Rational(-473517603, 27440),
-                listOf(7u, 7u) to Rational(-17055459, 1568),
-                listOf(8u, 7u) to Rational(-12825, 14),
-                listOf(0u, 8u) to Rational(16245, 1568),
-                listOf(1u, 8u) to Rational(503253, 2744),
-                listOf(2u, 8u) to Rational(125292591, 96040),
-                listOf(3u, 8u) to Rational(12033171, 2744),
-                listOf(4u, 8u) to Rational(154352673, 27440),
-                listOf(5u, 8u) to Rational(-1302291, 392),
-                listOf(6u, 8u) to Rational(-20265741, 1960),
-                listOf(7u, 8u) to Rational(-26163, 56),
-                listOf(8u, 8u) to Rational(146205, 32),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                0 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0, 6),
-                    listOf(1u) to Rational(14, 8),
-                    listOf(2u) to Rational(-14, 2),
-                    listOf(0u, 1u) to Rational(-3, 5),
-                    listOf(1u, 1u) to Rational(11, 1),
-                    listOf(2u, 1u) to Rational(3, 7),
-                    listOf(0u, 2u) to Rational(-3, 7),
-                    listOf(1u, 2u) to Rational(-18, 5),
-                    listOf(2u, 2u) to Rational(-9, 1),
-                ),
-                1 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-9, 2),
-                    listOf(1u) to Rational(2, 7),
-                    listOf(2u) to Rational(9, 1),
-                    listOf(0u, 1u) to Rational(13, 1),
-                    listOf(1u, 1u) to Rational(-1, 8),
-                    listOf(2u, 1u) to Rational(2, 8),
-                    listOf(0u, 2u) to Rational(19, 4),
-                    listOf(1u, 2u) to Rational(15, 7),
-                    listOf(2u, 2u) to Rational(-19, 4),
-                ),
-                5 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 3),
-                    listOf(1u) to Rational(5, 2),
-                    listOf(2u) to Rational(13, 7),
-                    listOf(0u, 1u) to Rational(16, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(6, 1),
-                    listOf(0u, 2u) to Rational(-14, 3),
-                    listOf(1u, 2u) to Rational(-2, 7),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            )),
-            "test 3'"
-        )
-        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = s, y = (-9/2 + 2/7 s + 9/1 s^2) + (13/1 + -1/8 s + 2/8 s^2) t + (19/4 + 15/7 s + -19/4 s^2) t^2
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(129, 4),
-                listOf(1u) to Rational(6817, 84),
-                listOf(2u) to Rational(-21445, 294),
-                listOf(3u) to Rational(-12151, 49),
-                listOf(4u) to Rational(-17789, 196),
-                listOf(5u) to Rational(1224, 7),
-                listOf(6u) to Rational(405, 2),
-                listOf(0u, 1u) to Rational(-156),
-                listOf(1u, 1u) to Rational(-2440, 7),
-                listOf(2u, 1u) to Rational(-1571, 112),
-                listOf(3u, 1u) to Rational(107515, 224),
-                listOf(4u, 1u) to Rational(64965, 112),
-                listOf(5u, 1u) to Rational(209, 56),
-                listOf(6u, 1u) to Rational(45, 4),
-                listOf(0u, 2u) to Rational(112),
-                listOf(1u, 2u) to Rational(1449, 8),
-                listOf(2u, 2u) to Rational(1306309, 3136),
-                listOf(3u, 2u) to Rational(483207, 1568),
-                listOf(4u, 2u) to Rational(1978437, 6272),
-                listOf(5u, 2u) to Rational(-18231, 224),
-                listOf(6u, 2u) to Rational(-6835, 32),
-                listOf(0u, 3u) to Rational(247, 2),
-                listOf(1u, 3u) to Rational(33771, 112),
-                listOf(2u, 3u) to Rational(2073, 7),
-                listOf(3u, 3u) to Rational(-23463, 224),
-                listOf(4u, 3u) to Rational(-33825, 112),
-                listOf(5u, 3u) to Rational(201, 224),
-                listOf(6u, 3u) to Rational(-95, 16),
-                listOf(0u, 4u) to Rational(361, 16),
-                listOf(1u, 4u) to Rational(3667, 56),
-                listOf(2u, 4u) to Rational(88729, 1568),
-                listOf(3u, 4u) to Rational(-2476, 49),
-                listOf(4u, 4u) to Rational(-23419, 196),
-                listOf(5u, 4u) to Rational(-323, 56),
-                listOf(6u, 4u) to Rational(1805, 32),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                1 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-9, 2),
-                    listOf(1u) to Rational(2, 7),
-                    listOf(2u) to Rational(9, 1),
-                    listOf(0u, 1u) to Rational(13, 1),
-                    listOf(1u, 1u) to Rational(-1, 8),
-                    listOf(2u, 1u) to Rational(2, 8),
-                    listOf(0u, 2u) to Rational(19, 4),
-                    listOf(1u, 2u) to Rational(15, 7),
-                    listOf(2u, 2u) to Rational(-19, 4),
-                ),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(129, 4),
-                listOf(1u) to Rational(6817, 84),
-                listOf(2u) to Rational(-21445, 294),
-                listOf(3u) to Rational(-12151, 49),
-                listOf(4u) to Rational(-17789, 196),
-                listOf(5u) to Rational(1224, 7),
-                listOf(6u) to Rational(405, 2),
-                listOf(0u, 1u) to Rational(-156),
-                listOf(1u, 1u) to Rational(-2440, 7),
-                listOf(2u, 1u) to Rational(-1571, 112),
-                listOf(3u, 1u) to Rational(107515, 224),
-                listOf(4u, 1u) to Rational(64965, 112),
-                listOf(5u, 1u) to Rational(209, 56),
-                listOf(6u, 1u) to Rational(45, 4),
-                listOf(0u, 2u) to Rational(112),
-                listOf(1u, 2u) to Rational(1449, 8),
-                listOf(2u, 2u) to Rational(1306309, 3136),
-                listOf(3u, 2u) to Rational(483207, 1568),
-                listOf(4u, 2u) to Rational(1978437, 6272),
-                listOf(5u, 2u) to Rational(-18231, 224),
-                listOf(6u, 2u) to Rational(-6835, 32),
-                listOf(0u, 3u) to Rational(247, 2),
-                listOf(1u, 3u) to Rational(33771, 112),
-                listOf(2u, 3u) to Rational(2073, 7),
-                listOf(3u, 3u) to Rational(-23463, 224),
-                listOf(4u, 3u) to Rational(-33825, 112),
-                listOf(5u, 3u) to Rational(201, 224),
-                listOf(6u, 3u) to Rational(-95, 16),
-                listOf(0u, 4u) to Rational(361, 16),
-                listOf(1u, 4u) to Rational(3667, 56),
-                listOf(2u, 4u) to Rational(88729, 1568),
-                listOf(3u, 4u) to Rational(-2476, 49),
-                listOf(4u, 4u) to Rational(-23419, 196),
-                listOf(5u, 4u) to Rational(-323, 56),
-                listOf(6u, 4u) to Rational(1805, 32),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                1 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-9, 2),
-                    listOf(1u) to Rational(2, 7),
-                    listOf(2u) to Rational(9, 1),
-                    listOf(0u, 1u) to Rational(13, 1),
-                    listOf(1u, 1u) to Rational(-1, 8),
-                    listOf(2u, 1u) to Rational(2, 8),
-                    listOf(0u, 2u) to Rational(19, 4),
-                    listOf(1u, 2u) to Rational(15, 7),
-                    listOf(2u, 2u) to Rational(-19, 4),
-                ),
-                5 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 3),
-                    listOf(1u) to Rational(5, 2),
-                    listOf(2u) to Rational(13, 7),
-                    listOf(0u, 1u) to Rational(16, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(6, 1),
-                    listOf(0u, 2u) to Rational(-14, 3),
-                    listOf(1u, 2u) to Rational(-2, 7),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            )),
-            "test 4'"
-        )
-        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = (0/6 + 14/8 s + -14/2 s^2) + (-3/5 + 11/1 s + 3/7 s^2) t + (-3/7 + -18/5 s + -9/1 s^2) t^2, y = t
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(7, 3),
-                listOf(2u) to Rational(-35, 16),
-                listOf(3u) to Rational(-343, 6),
-                listOf(4u) to Rational(343, 3),
-                listOf(0u, 1u) to Rational(-19, 5),
-                listOf(1u, 1u) to Rational(-823, 120),
-                listOf(2u, 1u) to Rational(1232417, 6720),
-                listOf(3u, 1u) to Rational(-9863, 24),
-                listOf(4u, 1u) to Rational(385, 4),
-                listOf(0u, 2u) to Rational(2439, 350),
-                listOf(1u, 2u) to Rational(-5793, 40),
-                listOf(2u, 2u) to Rational(1172113, 3360),
-                listOf(3u, 2u) to Rational(-13531, 40),
-                listOf(4u, 2u) to Rational(2824, 7),
-                listOf(0u, 3u) to Rational(3417, 700),
-                listOf(1u, 3u) to Rational(1191, 200),
-                listOf(2u, 3u) to Rational(8383, 28),
-                listOf(3u, 3u) to Rational(-220279, 280),
-                listOf(4u, 3u) to Rational(49179, 196),
-                listOf(0u, 4u) to Rational(57, 35),
-                listOf(1u, 4u) to Rational(-33771, 700),
-                listOf(2u, 4u) to Rational(196279, 1225),
-                listOf(3u, 4u) to Rational(-32259, 140),
-                listOf(4u, 4u) to Rational(23868, 49),
-                listOf(0u, 5u) to Rational(333, 196),
-                listOf(1u, 5u) to Rational(-204, 35),
-                listOf(2u, 5u) to Rational(-307233, 2450),
-                listOf(3u, 5u) to Rational(-12492, 35),
-                listOf(4u, 5u) to Rational(4563, 28),
-                listOf(0u, 6u) to Rational(45, 98),
-                listOf(1u, 6u) to Rational(54, 7),
-                listOf(2u, 6u) to Rational(1809, 35),
-                listOf(3u, 6u) to Rational(162),
-                listOf(4u, 6u) to Rational(405, 2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                0 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0, 6),
-                    listOf(1u) to Rational(14, 8),
-                    listOf(2u) to Rational(-14, 2),
-                    listOf(0u, 1u) to Rational(-3, 5),
-                    listOf(1u, 1u) to Rational(11, 1),
-                    listOf(2u, 1u) to Rational(3, 7),
-                    listOf(0u, 2u) to Rational(-3, 7),
-                    listOf(1u, 2u) to Rational(-18, 5),
-                    listOf(2u, 2u) to Rational(-9, 1),
-                ),
-            )),
-            "test 5"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(7, 3),
-                listOf(2u) to Rational(-35, 16),
-                listOf(3u) to Rational(-343, 6),
-                listOf(4u) to Rational(343, 3),
-                listOf(0u, 1u) to Rational(-19, 5),
-                listOf(1u, 1u) to Rational(-823, 120),
-                listOf(2u, 1u) to Rational(1232417, 6720),
-                listOf(3u, 1u) to Rational(-9863, 24),
-                listOf(4u, 1u) to Rational(385, 4),
-                listOf(0u, 2u) to Rational(2439, 350),
-                listOf(1u, 2u) to Rational(-5793, 40),
-                listOf(2u, 2u) to Rational(1172113, 3360),
-                listOf(3u, 2u) to Rational(-13531, 40),
-                listOf(4u, 2u) to Rational(2824, 7),
-                listOf(0u, 3u) to Rational(3417, 700),
-                listOf(1u, 3u) to Rational(1191, 200),
-                listOf(2u, 3u) to Rational(8383, 28),
-                listOf(3u, 3u) to Rational(-220279, 280),
-                listOf(4u, 3u) to Rational(49179, 196),
-                listOf(0u, 4u) to Rational(57, 35),
-                listOf(1u, 4u) to Rational(-33771, 700),
-                listOf(2u, 4u) to Rational(196279, 1225),
-                listOf(3u, 4u) to Rational(-32259, 140),
-                listOf(4u, 4u) to Rational(23868, 49),
-                listOf(0u, 5u) to Rational(333, 196),
-                listOf(1u, 5u) to Rational(-204, 35),
-                listOf(2u, 5u) to Rational(-307233, 2450),
-                listOf(3u, 5u) to Rational(-12492, 35),
-                listOf(4u, 5u) to Rational(4563, 28),
-                listOf(0u, 6u) to Rational(45, 98),
-                listOf(1u, 6u) to Rational(54, 7),
-                listOf(2u, 6u) to Rational(1809, 35),
-                listOf(3u, 6u) to Rational(162),
-                listOf(4u, 6u) to Rational(405, 2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                0 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0, 6),
-                    listOf(1u) to Rational(14, 8),
-                    listOf(2u) to Rational(-14, 2),
-                    listOf(0u, 1u) to Rational(-3, 5),
-                    listOf(1u, 1u) to Rational(11, 1),
-                    listOf(2u, 1u) to Rational(3, 7),
-                    listOf(0u, 2u) to Rational(-3, 7),
-                    listOf(1u, 2u) to Rational(-18, 5),
-                    listOf(2u, 2u) to Rational(-9, 1),
-                ),
-                5 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 3),
-                    listOf(1u) to Rational(5, 2),
-                    listOf(2u) to Rational(13, 7),
-                    listOf(0u, 1u) to Rational(16, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(6, 1),
-                    listOf(0u, 2u) to Rational(-14, 3),
-                    listOf(1u, 2u) to Rational(-2, 7),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            )),
-            "test 5'"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf<Int, NumberedPolynomial<Rational>>()),
-            "test 6"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, mapOf(
-                5 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 3),
-                    listOf(1u) to Rational(5, 2),
-                    listOf(2u) to Rational(13, 7),
-                    listOf(0u, 1u) to Rational(16, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(6, 1),
-                    listOf(0u, 2u) to Rational(-14, 3),
-                    listOf(1u, 2u) to Rational(-2, 7),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            )),
-            "test 6'"
-        )
-    }
-    @Test
-    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
-            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
-    fun test_Polynomial_substitute_RationalFunction_Map() {
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1)
-            ).substitute(RationalField, mapOf(
-                0 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(1)
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(1)
-                    )
-                )
-            )),
-            "test 1"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf(4u) to Rational(-194071, 4900),
-                    listOf(3u, 1u) to Rational(394811, 225),
-                    listOf(2u, 2u) to Rational(-444183161, 66150),
-                    listOf(1u, 3u) to Rational(70537618, 59535),
-                    listOf(0u, 4u) to Rational(9655504, 2835),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf(4u) to Rational(9, 1),
-                    listOf(3u, 1u) to Rational(61, 1),
-                    listOf(2u, 2u) to Rational(2137, 36),
-                    listOf(1u, 3u) to Rational(-1342, 9),
-                    listOf(0u, 4u) to Rational(484, 9),
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                0 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(17, 7),
-                        listOf(0u, 1u) to Rational(-13, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(-18, 6),
-                        listOf(0u, 1u) to Rational(11, 6),
-                    )
-                ),
-                1 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(18, 5),
-                        listOf(0u, 1u) to Rational(-16, 3),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(-1, 1),
-                        listOf(0u, 1u) to Rational(-4, 1),
-                    )
-                ),
-            )),
-            "test 2"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-6443599, 10000),
-                    listOf(1u) to Rational(166251223, 210000),
-                    listOf(2u) to Rational(-4606805099, 3528000),
-                    listOf(3u) to Rational(51204379, 19600),
-                    listOf(4u) to Rational(-529045460659, 277830000),
-                    listOf(5u) to Rational(2630836709, 1488375),
-                    listOf(6u) to Rational(-42675691369, 25004700),
-                    listOf(7u) to Rational(495825223, 1250235),
-                    listOf(8u) to Rational(-22531756, 1750329),
-                    listOf(0u, 1u) to Rational(-2526552797, 420000),
-                    listOf(1u, 1u) to Rational(31108840471, 2520000),
-                    listOf(2u, 1u) to Rational(-4789740847, 1102500),
-                    listOf(3u, 1u) to Rational(186594307807, 11340000),
-                    listOf(4u, 1u) to Rational(-11677815943, 1488375),
-                    listOf(5u, 1u) to Rational(-181118486447, 27783000),
-                    listOf(6u, 1u) to Rational(-16123292162, 14586075),
-                    listOf(7u, 1u) to Rational(-140339343808, 26254935),
-                    listOf(8u, 1u) to Rational(4570171616, 5250987),
-                    listOf(0u, 2u) to Rational(-181436530573, 10080000),
-                    listOf(1u, 2u) to Rational(6700437957491, 105840000),
-                    listOf(2u, 2u) to Rational(-3527267461, 1417500),
-                    listOf(3u, 2u) to Rational(-38084563451, 5556600),
-                    listOf(4u, 2u) to Rational(-565662040631, 13891500),
-                    listOf(5u, 2u) to Rational(-35479071126397, 583443000),
-                    listOf(6u, 2u) to Rational(-11717559078469, 525098700),
-                    listOf(7u, 2u) to Rational(-2043385293517, 225042300),
-                    listOf(8u, 2u) to Rational(-3644439630451, 551353635),
-                    listOf(0u, 3u) to Rational(-1760423269, 126000),
-                    listOf(1u, 3u) to Rational(310176758299, 2352000),
-                    listOf(2u, 3u) to Rational(-907229584837, 21168000),
-                    listOf(3u, 3u) to Rational(-16717135885963, 95256000),
-                    listOf(4u, 3u) to Rational(-43762928025353, 333396000),
-                    listOf(5u, 3u) to Rational(-328427480571607, 3000564000),
-                    listOf(6u, 3u) to Rational(-7722675917197, 210039480),
-                    listOf(7u, 3u) to Rational(1713350137019, 1225230300),
-                    listOf(8u, 3u) to Rational(156695935643, 31505922),
-                    listOf(0u, 4u) to Rational(18362364269, 1008000),
-                    listOf(1u, 4u) to Rational(955674858553, 10584000),
-                    listOf(2u, 4u) to Rational(-71937470607371, 444528000),
-                    listOf(3u, 4u) to Rational(-34097985615163, 95256000),
-                    listOf(4u, 4u) to Rational(-340736178775883, 2000376000),
-                    listOf(5u, 4u) to Rational(-511324523441897, 10501974000),
-                    listOf(6u, 4u) to Rational(-125375649409151, 8821658160),
-                    listOf(7u, 4u) to Rational(-2813518533421, 1575296100),
-                    listOf(8u, 4u) to Rational(-17044089109, 5250987),
-                    listOf(0u, 5u) to Rational(600086461, 20160),
-                    listOf(1u, 5u) to Rational(-18959931367, 423360),
-                    listOf(2u, 5u) to Rational(-9178804929607, 44452800),
-                    listOf(3u, 5u) to Rational(-1460114275979, 5334336),
-                    listOf(4u, 5u) to Rational(-342533479090169, 4200789600),
-                    listOf(5u, 5u) to Rational(20335453022963, 4200789600),
-                    listOf(6u, 5u) to Rational(-21649775090197, 6301184400),
-                    listOf(7u, 5u) to Rational(-197301716069, 131274675),
-                    listOf(8u, 5u) to Rational(18711357470, 15752961),
-                    listOf(0u, 6u) to Rational(621417991, 100800),
-                    listOf(1u, 6u) to Rational(-159236792977, 2116800),
-                    listOf(2u, 6u) to Rational(-6602528890883, 66679200),
-                    listOf(3u, 6u) to Rational(-1086091664047, 19051200),
-                    listOf(4u, 6u) to Rational(3769375009003, 1680315840),
-                    listOf(5u, 6u) to Rational(-12920385574769, 1050197400),
-                    listOf(6u, 6u) to Rational(-90219591809287, 6301184400),
-                    listOf(7u, 6u) to Rational(656361553391, 1575296100),
-                    listOf(8u, 6u) to Rational(757900793, 2250423),
-                    listOf(0u, 7u) to Rational(-100770017, 15120),
-                    listOf(1u, 7u) to Rational(-316364851, 17640),
-                    listOf(2u, 7u) to Rational(-85118560057, 6667920),
-                    listOf(3u, 7u) to Rational(6286563719, 416745),
-                    listOf(4u, 7u) to Rational(26803885301, 1714608),
-                    listOf(5u, 7u) to Rational(-13767154393, 4286520),
-                    listOf(6u, 7u) to Rational(-3875138933, 1224720),
-                    listOf(7u, 7u) to Rational(65193755, 333396),
-                    listOf(8u, 7u) to Rational(90974351, 2500470),
-                    listOf(0u, 8u) to Rational(-3182197, 1260),
-                    listOf(1u, 8u) to Rational(24899923, 8820),
-                    listOf(2u, 8u) to Rational(-19999556, 19845),
-                    listOf(3u, 8u) to Rational(3276587, 3969),
-                    listOf(4u, 8u) to Rational(13719549239, 5000940),
-                    listOf(5u, 8u) to Rational(-961839938, 1250235),
-                    listOf(6u, 8u) to Rational(-198184871, 833490),
-                    listOf(7u, 8u) to Rational(230659711, 5000940),
-                    listOf(8u, 8u) to Rational(292447, 35721)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(9, 100),
-                    listOf(1u) to Rational(-21, 50),
-                    listOf(2u) to Rational(293, 700),
-                    listOf(3u) to Rational(29, 210),
-                    listOf(4u) to Rational(3233, 8820),
-                    listOf(5u) to Rational(-289, 441),
-                    listOf(6u) to Rational(-1, 9),
-                    listOf(7u) to Rational(-20, 441),
-                    listOf(8u) to Rational(100, 441),
-                    listOf(0u, 1u) to Rational(-57, 80),
-                    listOf(1u, 1u) to Rational(-121, 400),
-                    listOf(2u, 1u) to Rational(37117, 8400),
-                    listOf(3u, 1u) to Rational(-4853, 3150),
-                    listOf(4u, 1u) to Rational(1166203, 132300),
-                    listOf(5u, 1u) to Rational(-2708, 567),
-                    listOf(6u, 1u) to Rational(-287159, 416745),
-                    listOf(7u, 1u) to Rational(-478204, 83349),
-                    listOf(8u, 1u) to Rational(176320, 83349),
-                    listOf(0u, 2u) to Rational(-6239, 6400),
-                    listOf(1u, 2u) to Rational(264211, 11200),
-                    listOf(2u, 2u) to Rational(-1591999, 100800),
-                    listOf(3u, 2u) to Rational(12450091, 529200),
-                    listOf(4u, 2u) to Rational(9230759, 226800),
-                    listOf(5u, 2u) to Rational(18995554, 2083725),
-                    listOf(6u, 2u) to Rational(136706258, 6251175),
-                    listOf(7u, 2u) to Rational(-120907496, 3750705),
-                    listOf(8u, 2u) to Rational(117200176, 15752961),
-                    listOf(0u, 3u) to Rational(5653, 320),
-                    listOf(1u, 3u) to Rational(-130853, 8400),
-                    listOf(2u, 3u) to Rational(-20939327, 151200),
-                    listOf(3u, 3u) to Rational(2566691, 25200),
-                    listOf(4u, 3u) to Rational(-68441519, 476280),
-                    listOf(5u, 3u) to Rational(2462904247, 12502350),
-                    listOf(6u, 3u) to Rational(353667161, 18753525),
-                    listOf(7u, 3u) to Rational(-1689134372, 26254935),
-                    listOf(8u, 3u) to Rational(35084104, 2250423),
-                    listOf(0u, 4u) to Rational(-3587, 300),
-                    listOf(1u, 4u) to Rational(-10513243, 33600),
-                    listOf(2u, 4u) to Rational(30766733, 176400),
-                    listOf(3u, 4u) to Rational(-65680021, 198450),
-                    listOf(4u, 4u) to Rational(-8108910547, 20003760),
-                    listOf(5u, 4u) to Rational(2922125159, 6251175),
-                    listOf(6u, 4u) to Rational(-4245279943, 131274675),
-                    listOf(7u, 4u) to Rational(-371946872, 3750705),
-                    listOf(8u, 4u) to Rational(61286752, 2250423),
-                    listOf(0u, 5u) to Rational(-20477, 160),
-                    listOf(1u, 5u) to Rational(215741, 1120),
-                    listOf(2u, 5u) to Rational(30785843, 31752),
-                    listOf(3u, 5u) to Rational(-357495959, 317520),
-                    listOf(4u, 5u) to Rational(-1611242993, 10001880),
-                    listOf(5u, 5u) to Rational(345925495, 500094),
-                    listOf(6u, 5u) to Rational(-755948411, 3750705),
-                    listOf(7u, 5u) to Rational(-108643496, 1250235),
-                    listOf(8u, 5u) to Rational(1122512, 35721),
-                    listOf(0u, 6u) to Rational(358037, 2880),
-                    listOf(1u, 6u) to Rational(3895837, 3360),
-                    listOf(2u, 6u) to Rational(359419201, 1270080),
-                    listOf(3u, 6u) to Rational(-158522587, 105840),
-                    listOf(4u, 6u) to Rational(10909002599, 20003760),
-                    listOf(5u, 6u) to Rational(76846972, 138915),
-                    listOf(6u, 6u) to Rational(-327696553, 1250235),
-                    listOf(7u, 6u) to Rational(-1687328, 35721),
-                    listOf(8u, 6u) to Rational(1016836, 35721),
-                    listOf(0u, 7u) to Rational(658, 3),
-                    listOf(1u, 7u) to Rational(48035, 168),
-                    listOf(2u, 7u) to Rational(-5777875, 5292),
-                    listOf(3u, 7u) to Rational(-7893899, 10584),
-                    listOf(4u, 7u) to Rational(10191652, 11907),
-                    listOf(5u, 7u) to Rational(2920121, 23814),
-                    listOf(6u, 7u) to Rational(-2699780, 11907),
-                    listOf(7u, 7u) to Rational(4556, 441),
-                    listOf(8u, 7u) to Rational(3440, 189),
-                    listOf(0u, 8u) to Rational(64, 1),
-                    listOf(1u, 8u) to Rational(-808, 7),
-                    listOf(2u, 8u) to Rational(-360895, 1764),
-                    listOf(3u, 8u) to Rational(257657, 882),
-                    listOf(4u, 8u) to Rational(3779917, 15876),
-                    listOf(5u, 8u) to Rational(-610279, 3969),
-                    listOf(6u, 8u) to Rational(-25091, 441),
-                    listOf(7u, 8u) to Rational(9560, 567),
-                    listOf(8u, 8u) to Rational(400, 81)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                0 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(17, 5),
-                        listOf(1u) to Rational(11, 6),
-                        listOf(2u) to Rational(14, 3),
-                        listOf(0u, 1u) to Rational(17, 1),
-                        listOf(1u, 1u) to Rational(12, 3),
-                        listOf(2u, 1u) to Rational(-6, 2),
-                        listOf(0u, 2u) to Rational(17, 1),
-                        listOf(1u, 2u) to Rational(-4, 3),
-                        listOf(2u, 2u) to Rational(2, 6),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(3, 5),
-                        listOf(1u) to Rational(3, 5),
-                        listOf(2u) to Rational(3, 7),
-                        listOf(0u, 1u) to Rational(-3, 8),
-                        listOf(1u, 1u) to Rational(-1, 1),
-                        listOf(2u, 1u) to Rational(17, 9),
-                        listOf(0u, 2u) to Rational(-8, 1),
-                        listOf(1u, 2u) to Rational(6, 4),
-                        listOf(2u, 2u) to Rational(10, 9),
-                    )
-                ),
-                1 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(18, 5),
-                        listOf(1u) to Rational(-17, 5),
-                        listOf(2u) to Rational(-2, 7),
-                        listOf(0u, 1u) to Rational(6, 5),
-                        listOf(1u, 1u) to Rational(-5, 1),
-                        listOf(2u, 1u) to Rational(-9, 1),
-                        listOf(0u, 2u) to Rational(-8, 8),
-                        listOf(1u, 2u) to Rational(2, 7),
-                        listOf(2u, 2u) to Rational(-13, 7),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-4, 8),
-                        listOf(1u) to Rational(15, 9),
-                        listOf(2u) to Rational(-10, 9),
-                        listOf(0u, 1u) to Rational(5, 3),
-                        listOf(1u, 1u) to Rational(4, 1),
-                        listOf(2u, 1u) to Rational(-2, 7),
-                        listOf(0u, 2u) to Rational(2, 2),
-                        listOf(1u, 2u) to Rational(-5, 7),
-                        listOf(2u, 2u) to Rational(-18, 9),
-                    )
-                ),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-6443599, 10000),
-                    listOf(1u) to Rational(166251223, 210000),
-                    listOf(2u) to Rational(-4606805099, 3528000),
-                    listOf(3u) to Rational(51204379, 19600),
-                    listOf(4u) to Rational(-529045460659, 277830000),
-                    listOf(5u) to Rational(2630836709, 1488375),
-                    listOf(6u) to Rational(-42675691369, 25004700),
-                    listOf(7u) to Rational(495825223, 1250235),
-                    listOf(8u) to Rational(-22531756, 1750329),
-                    listOf(0u, 1u) to Rational(-2526552797, 420000),
-                    listOf(1u, 1u) to Rational(31108840471, 2520000),
-                    listOf(2u, 1u) to Rational(-4789740847, 1102500),
-                    listOf(3u, 1u) to Rational(186594307807, 11340000),
-                    listOf(4u, 1u) to Rational(-11677815943, 1488375),
-                    listOf(5u, 1u) to Rational(-181118486447, 27783000),
-                    listOf(6u, 1u) to Rational(-16123292162, 14586075),
-                    listOf(7u, 1u) to Rational(-140339343808, 26254935),
-                    listOf(8u, 1u) to Rational(4570171616, 5250987),
-                    listOf(0u, 2u) to Rational(-181436530573, 10080000),
-                    listOf(1u, 2u) to Rational(6700437957491, 105840000),
-                    listOf(2u, 2u) to Rational(-3527267461, 1417500),
-                    listOf(3u, 2u) to Rational(-38084563451, 5556600),
-                    listOf(4u, 2u) to Rational(-565662040631, 13891500),
-                    listOf(5u, 2u) to Rational(-35479071126397, 583443000),
-                    listOf(6u, 2u) to Rational(-11717559078469, 525098700),
-                    listOf(7u, 2u) to Rational(-2043385293517, 225042300),
-                    listOf(8u, 2u) to Rational(-3644439630451, 551353635),
-                    listOf(0u, 3u) to Rational(-1760423269, 126000),
-                    listOf(1u, 3u) to Rational(310176758299, 2352000),
-                    listOf(2u, 3u) to Rational(-907229584837, 21168000),
-                    listOf(3u, 3u) to Rational(-16717135885963, 95256000),
-                    listOf(4u, 3u) to Rational(-43762928025353, 333396000),
-                    listOf(5u, 3u) to Rational(-328427480571607, 3000564000),
-                    listOf(6u, 3u) to Rational(-7722675917197, 210039480),
-                    listOf(7u, 3u) to Rational(1713350137019, 1225230300),
-                    listOf(8u, 3u) to Rational(156695935643, 31505922),
-                    listOf(0u, 4u) to Rational(18362364269, 1008000),
-                    listOf(1u, 4u) to Rational(955674858553, 10584000),
-                    listOf(2u, 4u) to Rational(-71937470607371, 444528000),
-                    listOf(3u, 4u) to Rational(-34097985615163, 95256000),
-                    listOf(4u, 4u) to Rational(-340736178775883, 2000376000),
-                    listOf(5u, 4u) to Rational(-511324523441897, 10501974000),
-                    listOf(6u, 4u) to Rational(-125375649409151, 8821658160),
-                    listOf(7u, 4u) to Rational(-2813518533421, 1575296100),
-                    listOf(8u, 4u) to Rational(-17044089109, 5250987),
-                    listOf(0u, 5u) to Rational(600086461, 20160),
-                    listOf(1u, 5u) to Rational(-18959931367, 423360),
-                    listOf(2u, 5u) to Rational(-9178804929607, 44452800),
-                    listOf(3u, 5u) to Rational(-1460114275979, 5334336),
-                    listOf(4u, 5u) to Rational(-342533479090169, 4200789600),
-                    listOf(5u, 5u) to Rational(20335453022963, 4200789600),
-                    listOf(6u, 5u) to Rational(-21649775090197, 6301184400),
-                    listOf(7u, 5u) to Rational(-197301716069, 131274675),
-                    listOf(8u, 5u) to Rational(18711357470, 15752961),
-                    listOf(0u, 6u) to Rational(621417991, 100800),
-                    listOf(1u, 6u) to Rational(-159236792977, 2116800),
-                    listOf(2u, 6u) to Rational(-6602528890883, 66679200),
-                    listOf(3u, 6u) to Rational(-1086091664047, 19051200),
-                    listOf(4u, 6u) to Rational(3769375009003, 1680315840),
-                    listOf(5u, 6u) to Rational(-12920385574769, 1050197400),
-                    listOf(6u, 6u) to Rational(-90219591809287, 6301184400),
-                    listOf(7u, 6u) to Rational(656361553391, 1575296100),
-                    listOf(8u, 6u) to Rational(757900793, 2250423),
-                    listOf(0u, 7u) to Rational(-100770017, 15120),
-                    listOf(1u, 7u) to Rational(-316364851, 17640),
-                    listOf(2u, 7u) to Rational(-85118560057, 6667920),
-                    listOf(3u, 7u) to Rational(6286563719, 416745),
-                    listOf(4u, 7u) to Rational(26803885301, 1714608),
-                    listOf(5u, 7u) to Rational(-13767154393, 4286520),
-                    listOf(6u, 7u) to Rational(-3875138933, 1224720),
-                    listOf(7u, 7u) to Rational(65193755, 333396),
-                    listOf(8u, 7u) to Rational(90974351, 2500470),
-                    listOf(0u, 8u) to Rational(-3182197, 1260),
-                    listOf(1u, 8u) to Rational(24899923, 8820),
-                    listOf(2u, 8u) to Rational(-19999556, 19845),
-                    listOf(3u, 8u) to Rational(3276587, 3969),
-                    listOf(4u, 8u) to Rational(13719549239, 5000940),
-                    listOf(5u, 8u) to Rational(-961839938, 1250235),
-                    listOf(6u, 8u) to Rational(-198184871, 833490),
-                    listOf(7u, 8u) to Rational(230659711, 5000940),
-                    listOf(8u, 8u) to Rational(292447, 35721)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(9, 100),
-                    listOf(1u) to Rational(-21, 50),
-                    listOf(2u) to Rational(293, 700),
-                    listOf(3u) to Rational(29, 210),
-                    listOf(4u) to Rational(3233, 8820),
-                    listOf(5u) to Rational(-289, 441),
-                    listOf(6u) to Rational(-1, 9),
-                    listOf(7u) to Rational(-20, 441),
-                    listOf(8u) to Rational(100, 441),
-                    listOf(0u, 1u) to Rational(-57, 80),
-                    listOf(1u, 1u) to Rational(-121, 400),
-                    listOf(2u, 1u) to Rational(37117, 8400),
-                    listOf(3u, 1u) to Rational(-4853, 3150),
-                    listOf(4u, 1u) to Rational(1166203, 132300),
-                    listOf(5u, 1u) to Rational(-2708, 567),
-                    listOf(6u, 1u) to Rational(-287159, 416745),
-                    listOf(7u, 1u) to Rational(-478204, 83349),
-                    listOf(8u, 1u) to Rational(176320, 83349),
-                    listOf(0u, 2u) to Rational(-6239, 6400),
-                    listOf(1u, 2u) to Rational(264211, 11200),
-                    listOf(2u, 2u) to Rational(-1591999, 100800),
-                    listOf(3u, 2u) to Rational(12450091, 529200),
-                    listOf(4u, 2u) to Rational(9230759, 226800),
-                    listOf(5u, 2u) to Rational(18995554, 2083725),
-                    listOf(6u, 2u) to Rational(136706258, 6251175),
-                    listOf(7u, 2u) to Rational(-120907496, 3750705),
-                    listOf(8u, 2u) to Rational(117200176, 15752961),
-                    listOf(0u, 3u) to Rational(5653, 320),
-                    listOf(1u, 3u) to Rational(-130853, 8400),
-                    listOf(2u, 3u) to Rational(-20939327, 151200),
-                    listOf(3u, 3u) to Rational(2566691, 25200),
-                    listOf(4u, 3u) to Rational(-68441519, 476280),
-                    listOf(5u, 3u) to Rational(2462904247, 12502350),
-                    listOf(6u, 3u) to Rational(353667161, 18753525),
-                    listOf(7u, 3u) to Rational(-1689134372, 26254935),
-                    listOf(8u, 3u) to Rational(35084104, 2250423),
-                    listOf(0u, 4u) to Rational(-3587, 300),
-                    listOf(1u, 4u) to Rational(-10513243, 33600),
-                    listOf(2u, 4u) to Rational(30766733, 176400),
-                    listOf(3u, 4u) to Rational(-65680021, 198450),
-                    listOf(4u, 4u) to Rational(-8108910547, 20003760),
-                    listOf(5u, 4u) to Rational(2922125159, 6251175),
-                    listOf(6u, 4u) to Rational(-4245279943, 131274675),
-                    listOf(7u, 4u) to Rational(-371946872, 3750705),
-                    listOf(8u, 4u) to Rational(61286752, 2250423),
-                    listOf(0u, 5u) to Rational(-20477, 160),
-                    listOf(1u, 5u) to Rational(215741, 1120),
-                    listOf(2u, 5u) to Rational(30785843, 31752),
-                    listOf(3u, 5u) to Rational(-357495959, 317520),
-                    listOf(4u, 5u) to Rational(-1611242993, 10001880),
-                    listOf(5u, 5u) to Rational(345925495, 500094),
-                    listOf(6u, 5u) to Rational(-755948411, 3750705),
-                    listOf(7u, 5u) to Rational(-108643496, 1250235),
-                    listOf(8u, 5u) to Rational(1122512, 35721),
-                    listOf(0u, 6u) to Rational(358037, 2880),
-                    listOf(1u, 6u) to Rational(3895837, 3360),
-                    listOf(2u, 6u) to Rational(359419201, 1270080),
-                    listOf(3u, 6u) to Rational(-158522587, 105840),
-                    listOf(4u, 6u) to Rational(10909002599, 20003760),
-                    listOf(5u, 6u) to Rational(76846972, 138915),
-                    listOf(6u, 6u) to Rational(-327696553, 1250235),
-                    listOf(7u, 6u) to Rational(-1687328, 35721),
-                    listOf(8u, 6u) to Rational(1016836, 35721),
-                    listOf(0u, 7u) to Rational(658, 3),
-                    listOf(1u, 7u) to Rational(48035, 168),
-                    listOf(2u, 7u) to Rational(-5777875, 5292),
-                    listOf(3u, 7u) to Rational(-7893899, 10584),
-                    listOf(4u, 7u) to Rational(10191652, 11907),
-                    listOf(5u, 7u) to Rational(2920121, 23814),
-                    listOf(6u, 7u) to Rational(-2699780, 11907),
-                    listOf(7u, 7u) to Rational(4556, 441),
-                    listOf(8u, 7u) to Rational(3440, 189),
-                    listOf(0u, 8u) to Rational(64, 1),
-                    listOf(1u, 8u) to Rational(-808, 7),
-                    listOf(2u, 8u) to Rational(-360895, 1764),
-                    listOf(3u, 8u) to Rational(257657, 882),
-                    listOf(4u, 8u) to Rational(3779917, 15876),
-                    listOf(5u, 8u) to Rational(-610279, 3969),
-                    listOf(6u, 8u) to Rational(-25091, 441),
-                    listOf(7u, 8u) to Rational(9560, 567),
-                    listOf(8u, 8u) to Rational(400, 81)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                0 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(17, 5),
-                        listOf(1u) to Rational(11, 6),
-                        listOf(2u) to Rational(14, 3),
-                        listOf(0u, 1u) to Rational(17, 1),
-                        listOf(1u, 1u) to Rational(12, 3),
-                        listOf(2u, 1u) to Rational(-6, 2),
-                        listOf(0u, 2u) to Rational(17, 1),
-                        listOf(1u, 2u) to Rational(-4, 3),
-                        listOf(2u, 2u) to Rational(2, 6),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(3, 5),
-                        listOf(1u) to Rational(3, 5),
-                        listOf(2u) to Rational(3, 7),
-                        listOf(0u, 1u) to Rational(-3, 8),
-                        listOf(1u, 1u) to Rational(-1, 1),
-                        listOf(2u, 1u) to Rational(17, 9),
-                        listOf(0u, 2u) to Rational(-8, 1),
-                        listOf(1u, 2u) to Rational(6, 4),
-                        listOf(2u, 2u) to Rational(10, 9),
-                    )
-                ),
-                1 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(18, 5),
-                        listOf(1u) to Rational(-17, 5),
-                        listOf(2u) to Rational(-2, 7),
-                        listOf(0u, 1u) to Rational(6, 5),
-                        listOf(1u, 1u) to Rational(-5, 1),
-                        listOf(2u, 1u) to Rational(-9, 1),
-                        listOf(0u, 2u) to Rational(-8, 8),
-                        listOf(1u, 2u) to Rational(2, 7),
-                        listOf(2u, 2u) to Rational(-13, 7),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-4, 8),
-                        listOf(1u) to Rational(15, 9),
-                        listOf(2u) to Rational(-10, 9),
-                        listOf(0u, 1u) to Rational(5, 3),
-                        listOf(1u, 1u) to Rational(4, 1),
-                        listOf(2u, 1u) to Rational(-2, 7),
-                        listOf(0u, 2u) to Rational(2, 2),
-                        listOf(1u, 2u) to Rational(-5, 7),
-                        listOf(2u, 2u) to Rational(-18, 9),
-                    )
-                ),
-                5 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-2, 9),
-                        listOf(1u) to Rational(-6, 3),
-                        listOf(2u) to Rational(10, 9),
-                        listOf(0u, 1u) to Rational(13, 3),
-                        listOf(1u, 1u) to Rational(-12, 4),
-                        listOf(2u, 1u) to Rational(3, 6),
-                        listOf(0u, 2u) to Rational(2, 9),
-                        listOf(1u, 2u) to Rational(7, 3),
-                        listOf(2u, 2u) to Rational(16, 5),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-6, 2),
-                        listOf(1u) to Rational(6, 2),
-                        listOf(2u) to Rational(2, 7),
-                        listOf(0u, 1u) to Rational(-18, 1),
-                        listOf(1u, 1u) to Rational(-11, 3),
-                        listOf(2u, 1u) to Rational(7, 5),
-                        listOf(0u, 2u) to Rational(8, 1),
-                        listOf(1u, 2u) to Rational(6, 7),
-                        listOf(2u, 2u) to Rational(17, 4),
-                    )
-                )
-            )),
-            "test 3'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-66677, 3500),
-                    listOf(1u) to Rational(-206281, 10500),
-                    listOf(2u) to Rational(-412567, 7056),
-                    listOf(3u) to Rational(-310081, 11025),
-                    listOf(4u) to Rational(-575996, 15435),
-                    listOf(0u, 1u) to Rational(-573701, 4200),
-                    listOf(1u, 1u) to Rational(-2239001, 25200),
-                    listOf(2u, 1u) to Rational(-8817889, 132300),
-                    listOf(3u, 1u) to Rational(2317919, 44100),
-                    listOf(4u, 1u) to Rational(1169471, 6615),
-                    listOf(0u, 2u) to Rational(-4057819, 33600),
-                    listOf(1u, 2u) to Rational(1373311, 12600),
-                    listOf(2u, 2u) to Rational(32433493, 52920),
-                    listOf(3u, 2u) to Rational(4998053, 33075),
-                    listOf(4u, 2u) to Rational(-2147779, 8820),
-                    listOf(0u, 3u) to Rational(2018481, 2240),
-                    listOf(1u, 3u) to Rational(941713, 1440),
-                    listOf(2u, 3u) to Rational(183749, 6615),
-                    listOf(3u, 3u) to Rational(-4631023, 15876),
-                    listOf(4u, 3u) to Rational(25609336, 178605),
-                    listOf(0u, 4u) to Rational(11886431, 6720),
-                    listOf(1u, 4u) to Rational(18433, 504),
-                    listOf(2u, 4u) to Rational(-39613331, 45360),
-                    listOf(3u, 4u) to Rational(681619, 5670),
-                    listOf(4u, 4u) to Rational(-864841, 20412),
-                    listOf(0u, 5u) to Rational(343535, 1008),
-                    listOf(1u, 5u) to Rational(-33583, 72),
-                    listOf(2u, 5u) to Rational(1194625, 9072),
-                    listOf(3u, 5u) to Rational(-62917, 2268),
-                    listOf(4u, 5u) to Rational(157645, 10206),
-                    listOf(0u, 6u) to Rational(-1381, 3),
-                    listOf(1u, 6u) to Rational(919, 36),
-                    listOf(2u, 6u) to Rational(-3053, 36),
-                    listOf(3u, 6u) to Rational(2125, 324),
-                    listOf(4u, 6u) to Rational(-236, 243)
-                ),
-                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-5, 3),
-                    listOf(2u) to Rational(35, 9),
-                    listOf(3u) to Rational(-100, 27),
-                    listOf(4u) to Rational(100, 81),
-                    listOf(0u, 1u) to Rational(-5, 3),
-                    listOf(1u, 1u) to Rational(14, 9),
-                    listOf(2u, 1u) to Rational(1874, 189),
-                    listOf(3u, 1u) to Rational(-620, 63),
-                    listOf(4u, 1u) to Rational(40, 63),
-                    listOf(0u, 2u) to Rational(16, 9),
-                    listOf(1u, 2u) to Rational(365, 21),
-                    listOf(2u, 2u) to Rational(112, 9),
-                    listOf(3u, 2u) to Rational(-464, 63),
-                    listOf(4u, 2u) to Rational(1996, 441),
-                    listOf(0u, 3u) to Rational(10, 3),
-                    listOf(1u, 3u) to Rational(118, 21),
-                    listOf(2u, 3u) to Rational(-272, 21),
-                    listOf(3u, 3u) to Rational(-764, 49),
-                    listOf(4u, 3u) to Rational(8, 7),
-                    listOf(0u, 4u) to Rational(1, 1),
-                    listOf(1u, 4u) to Rational(-10, 7),
-                    listOf(2u, 4u) to Rational(-171, 49),
-                    listOf(3u, 4u) to Rational(20, 7),
-                    listOf(4u, 4u) to Rational(4, 1)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                0 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(17, 5),
-                        listOf(1u) to Rational(11, 6),
-                        listOf(2u) to Rational(14, 3),
-                        listOf(0u, 1u) to Rational(17, 1),
-                        listOf(1u, 1u) to Rational(12, 3),
-                        listOf(2u, 1u) to Rational(-6, 2),
-                        listOf(0u, 2u) to Rational(17, 1),
-                        listOf(1u, 2u) to Rational(-4, 3),
-                        listOf(2u, 2u) to Rational(2, 6),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(3, 5),
-                        listOf(1u) to Rational(3, 5),
-                        listOf(2u) to Rational(3, 7),
-                        listOf(0u, 1u) to Rational(-3, 8),
-                        listOf(1u, 1u) to Rational(-1, 1),
-                        listOf(2u, 1u) to Rational(17, 9),
-                        listOf(0u, 2u) to Rational(-8, 1),
-                        listOf(1u, 2u) to Rational(6, 4),
-                        listOf(2u, 2u) to Rational(10, 9),
-                    )
-                ),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-66677, 3500),
-                    listOf(1u) to Rational(-206281, 10500),
-                    listOf(2u) to Rational(-412567, 7056),
-                    listOf(3u) to Rational(-310081, 11025),
-                    listOf(4u) to Rational(-575996, 15435),
-                    listOf(0u, 1u) to Rational(-573701, 4200),
-                    listOf(1u, 1u) to Rational(-2239001, 25200),
-                    listOf(2u, 1u) to Rational(-8817889, 132300),
-                    listOf(3u, 1u) to Rational(2317919, 44100),
-                    listOf(4u, 1u) to Rational(1169471, 6615),
-                    listOf(0u, 2u) to Rational(-4057819, 33600),
-                    listOf(1u, 2u) to Rational(1373311, 12600),
-                    listOf(2u, 2u) to Rational(32433493, 52920),
-                    listOf(3u, 2u) to Rational(4998053, 33075),
-                    listOf(4u, 2u) to Rational(-2147779, 8820),
-                    listOf(0u, 3u) to Rational(2018481, 2240),
-                    listOf(1u, 3u) to Rational(941713, 1440),
-                    listOf(2u, 3u) to Rational(183749, 6615),
-                    listOf(3u, 3u) to Rational(-4631023, 15876),
-                    listOf(4u, 3u) to Rational(25609336, 178605),
-                    listOf(0u, 4u) to Rational(11886431, 6720),
-                    listOf(1u, 4u) to Rational(18433, 504),
-                    listOf(2u, 4u) to Rational(-39613331, 45360),
-                    listOf(3u, 4u) to Rational(681619, 5670),
-                    listOf(4u, 4u) to Rational(-864841, 20412),
-                    listOf(0u, 5u) to Rational(343535, 1008),
-                    listOf(1u, 5u) to Rational(-33583, 72),
-                    listOf(2u, 5u) to Rational(1194625, 9072),
-                    listOf(3u, 5u) to Rational(-62917, 2268),
-                    listOf(4u, 5u) to Rational(157645, 10206),
-                    listOf(0u, 6u) to Rational(-1381, 3),
-                    listOf(1u, 6u) to Rational(919, 36),
-                    listOf(2u, 6u) to Rational(-3053, 36),
-                    listOf(3u, 6u) to Rational(2125, 324),
-                    listOf(4u, 6u) to Rational(-236, 243)
-                ),
-                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-5, 3),
-                    listOf(2u) to Rational(35, 9),
-                    listOf(3u) to Rational(-100, 27),
-                    listOf(4u) to Rational(100, 81),
-                    listOf(0u, 1u) to Rational(-5, 3),
-                    listOf(1u, 1u) to Rational(14, 9),
-                    listOf(2u, 1u) to Rational(1874, 189),
-                    listOf(3u, 1u) to Rational(-620, 63),
-                    listOf(4u, 1u) to Rational(40, 63),
-                    listOf(0u, 2u) to Rational(16, 9),
-                    listOf(1u, 2u) to Rational(365, 21),
-                    listOf(2u, 2u) to Rational(112, 9),
-                    listOf(3u, 2u) to Rational(-464, 63),
-                    listOf(4u, 2u) to Rational(1996, 441),
-                    listOf(0u, 3u) to Rational(10, 3),
-                    listOf(1u, 3u) to Rational(118, 21),
-                    listOf(2u, 3u) to Rational(-272, 21),
-                    listOf(3u, 3u) to Rational(-764, 49),
-                    listOf(4u, 3u) to Rational(8, 7),
-                    listOf(0u, 4u) to Rational(1, 1),
-                    listOf(1u, 4u) to Rational(-10, 7),
-                    listOf(2u, 4u) to Rational(-171, 49),
-                    listOf(3u, 4u) to Rational(20, 7),
-                    listOf(4u, 4u) to Rational(4, 1)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                0 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(17, 5),
-                        listOf(1u) to Rational(11, 6),
-                        listOf(2u) to Rational(14, 3),
-                        listOf(0u, 1u) to Rational(17, 1),
-                        listOf(1u, 1u) to Rational(12, 3),
-                        listOf(2u, 1u) to Rational(-6, 2),
-                        listOf(0u, 2u) to Rational(17, 1),
-                        listOf(1u, 2u) to Rational(-4, 3),
-                        listOf(2u, 2u) to Rational(2, 6),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(3, 5),
-                        listOf(1u) to Rational(3, 5),
-                        listOf(2u) to Rational(3, 7),
-                        listOf(0u, 1u) to Rational(-3, 8),
-                        listOf(1u, 1u) to Rational(-1, 1),
-                        listOf(2u, 1u) to Rational(17, 9),
-                        listOf(0u, 2u) to Rational(-8, 1),
-                        listOf(1u, 2u) to Rational(6, 4),
-                        listOf(2u, 2u) to Rational(10, 9),
-                    )
-                ),
-                5 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-2, 9),
-                        listOf(1u) to Rational(-6, 3),
-                        listOf(2u) to Rational(10, 9),
-                        listOf(0u, 1u) to Rational(13, 3),
-                        listOf(1u, 1u) to Rational(-12, 4),
-                        listOf(2u, 1u) to Rational(3, 6),
-                        listOf(0u, 2u) to Rational(2, 9),
-                        listOf(1u, 2u) to Rational(7, 3),
-                        listOf(2u, 2u) to Rational(16, 5),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-6, 2),
-                        listOf(1u) to Rational(6, 2),
-                        listOf(2u) to Rational(2, 7),
-                        listOf(0u, 1u) to Rational(-18, 1),
-                        listOf(1u, 1u) to Rational(-11, 3),
-                        listOf(2u, 1u) to Rational(7, 5),
-                        listOf(0u, 2u) to Rational(8, 1),
-                        listOf(1u, 2u) to Rational(6, 7),
-                        listOf(2u, 2u) to Rational(17, 4),
-                    )
-                )
-            )),
-            "test 4'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(3539, 700),
-                    listOf(1u) to Rational(-307079, 6300),
-                    listOf(2u) to Rational(451609, 15120),
-                    listOf(3u) to Rational(35287733, 396900),
-                    listOf(4u) to Rational(-37242617, 396900),
-                    listOf(5u) to Rational(382747, 19845),
-                    listOf(6u) to Rational(-2407, 3969),
-                    listOf(0u, 1u) to Rational(-226, 175),
-                    listOf(1u, 1u) to Rational(-74113, 1890),
-                    listOf(2u, 1u) to Rational(250931, 1764),
-                    listOf(3u, 1u) to Rational(30071473, 99225),
-                    listOf(4u, 1u) to Rational(-286466, 1323),
-                    listOf(5u, 1u) to Rational(-2285282, 9261),
-                    listOf(6u, 1u) to Rational(17900, 441),
-                    listOf(0u, 2u) to Rational(3817, 3150),
-                    listOf(1u, 2u) to Rational(577568, 11025),
-                    listOf(2u, 2u) to Rational(9073553, 99225),
-                    listOf(3u, 2u) to Rational(-1415849, 79380),
-                    listOf(4u, 2u) to Rational(-124715629, 277830),
-                    listOf(5u, 2u) to Rational(-1328953, 1890),
-                    listOf(6u, 2u) to Rational(-297148, 1323),
-                    listOf(0u, 3u) to Rational(6043, 945),
-                    listOf(1u, 3u) to Rational(160381, 6615),
-                    listOf(2u, 3u) to Rational(-673249, 13230),
-                    listOf(3u, 3u) to Rational(-319255, 2058),
-                    listOf(4u, 3u) to Rational(-98144, 1029),
-                    listOf(5u, 3u) to Rational(-320239, 5145),
-                    listOf(6u, 3u) to Rational(400, 147),
-                    listOf(0u, 4u) to Rational(163, 63),
-                    listOf(1u, 4u) to Rational(-25183, 4410),
-                    listOf(2u, 4u) to Rational(-21369, 1372),
-                    listOf(3u, 4u) to Rational(127499, 30870),
-                    listOf(4u, 4u) to Rational(86971, 12348),
-                    listOf(5u, 4u) to Rational(-11129, 1470),
-                    listOf(6u, 4u) to Rational(544, 147)
-                ),
-                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-5, 3),
-                    listOf(2u) to Rational(35, 9),
-                    listOf(3u) to Rational(-100, 27),
-                    listOf(4u) to Rational(100, 81),
-                    listOf(0u, 1u) to Rational(-5, 3),
-                    listOf(1u, 1u) to Rational(14, 9),
-                    listOf(2u, 1u) to Rational(1874, 189),
-                    listOf(3u, 1u) to Rational(-620, 63),
-                    listOf(4u, 1u) to Rational(40, 63),
-                    listOf(0u, 2u) to Rational(16, 9),
-                    listOf(1u, 2u) to Rational(365, 21),
-                    listOf(2u, 2u) to Rational(112, 9),
-                    listOf(3u, 2u) to Rational(-464, 63),
-                    listOf(4u, 2u) to Rational(1996, 441),
-                    listOf(0u, 3u) to Rational(10, 3),
-                    listOf(1u, 3u) to Rational(118, 21),
-                    listOf(2u, 3u) to Rational(-272, 21),
-                    listOf(3u, 3u) to Rational(-764, 49),
-                    listOf(4u, 3u) to Rational(8, 7),
-                    listOf(0u, 4u) to Rational(1, 1),
-                    listOf(1u, 4u) to Rational(-10, 7),
-                    listOf(2u, 4u) to Rational(-171, 49),
-                    listOf(3u, 4u) to Rational(20, 7),
-                    listOf(4u, 4u) to Rational(4, 1)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                1 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(18, 5),
-                        listOf(1u) to Rational(-17, 5),
-                        listOf(2u) to Rational(-2, 7),
-                        listOf(0u, 1u) to Rational(6, 5),
-                        listOf(1u, 1u) to Rational(-5, 1),
-                        listOf(2u, 1u) to Rational(-9, 1),
-                        listOf(0u, 2u) to Rational(-8, 8),
-                        listOf(1u, 2u) to Rational(2, 7),
-                        listOf(2u, 2u) to Rational(-13, 7),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-4, 8),
-                        listOf(1u) to Rational(15, 9),
-                        listOf(2u) to Rational(-10, 9),
-                        listOf(0u, 1u) to Rational(5, 3),
-                        listOf(1u, 1u) to Rational(4, 1),
-                        listOf(2u, 1u) to Rational(-2, 7),
-                        listOf(0u, 2u) to Rational(2, 2),
-                        listOf(1u, 2u) to Rational(-5, 7),
-                        listOf(2u, 2u) to Rational(-18, 9),
-                    )
-                ),
-            )),
-            "test 5"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(3539, 700),
-                    listOf(1u) to Rational(-307079, 6300),
-                    listOf(2u) to Rational(451609, 15120),
-                    listOf(3u) to Rational(35287733, 396900),
-                    listOf(4u) to Rational(-37242617, 396900),
-                    listOf(5u) to Rational(382747, 19845),
-                    listOf(6u) to Rational(-2407, 3969),
-                    listOf(0u, 1u) to Rational(-226, 175),
-                    listOf(1u, 1u) to Rational(-74113, 1890),
-                    listOf(2u, 1u) to Rational(250931, 1764),
-                    listOf(3u, 1u) to Rational(30071473, 99225),
-                    listOf(4u, 1u) to Rational(-286466, 1323),
-                    listOf(5u, 1u) to Rational(-2285282, 9261),
-                    listOf(6u, 1u) to Rational(17900, 441),
-                    listOf(0u, 2u) to Rational(3817, 3150),
-                    listOf(1u, 2u) to Rational(577568, 11025),
-                    listOf(2u, 2u) to Rational(9073553, 99225),
-                    listOf(3u, 2u) to Rational(-1415849, 79380),
-                    listOf(4u, 2u) to Rational(-124715629, 277830),
-                    listOf(5u, 2u) to Rational(-1328953, 1890),
-                    listOf(6u, 2u) to Rational(-297148, 1323),
-                    listOf(0u, 3u) to Rational(6043, 945),
-                    listOf(1u, 3u) to Rational(160381, 6615),
-                    listOf(2u, 3u) to Rational(-673249, 13230),
-                    listOf(3u, 3u) to Rational(-319255, 2058),
-                    listOf(4u, 3u) to Rational(-98144, 1029),
-                    listOf(5u, 3u) to Rational(-320239, 5145),
-                    listOf(6u, 3u) to Rational(400, 147),
-                    listOf(0u, 4u) to Rational(163, 63),
-                    listOf(1u, 4u) to Rational(-25183, 4410),
-                    listOf(2u, 4u) to Rational(-21369, 1372),
-                    listOf(3u, 4u) to Rational(127499, 30870),
-                    listOf(4u, 4u) to Rational(86971, 12348),
-                    listOf(5u, 4u) to Rational(-11129, 1470),
-                    listOf(6u, 4u) to Rational(544, 147)
-                ),
-                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-5, 3),
-                    listOf(2u) to Rational(35, 9),
-                    listOf(3u) to Rational(-100, 27),
-                    listOf(4u) to Rational(100, 81),
-                    listOf(0u, 1u) to Rational(-5, 3),
-                    listOf(1u, 1u) to Rational(14, 9),
-                    listOf(2u, 1u) to Rational(1874, 189),
-                    listOf(3u, 1u) to Rational(-620, 63),
-                    listOf(4u, 1u) to Rational(40, 63),
-                    listOf(0u, 2u) to Rational(16, 9),
-                    listOf(1u, 2u) to Rational(365, 21),
-                    listOf(2u, 2u) to Rational(112, 9),
-                    listOf(3u, 2u) to Rational(-464, 63),
-                    listOf(4u, 2u) to Rational(1996, 441),
-                    listOf(0u, 3u) to Rational(10, 3),
-                    listOf(1u, 3u) to Rational(118, 21),
-                    listOf(2u, 3u) to Rational(-272, 21),
-                    listOf(3u, 3u) to Rational(-764, 49),
-                    listOf(4u, 3u) to Rational(8, 7),
-                    listOf(0u, 4u) to Rational(1, 1),
-                    listOf(1u, 4u) to Rational(-10, 7),
-                    listOf(2u, 4u) to Rational(-171, 49),
-                    listOf(3u, 4u) to Rational(20, 7),
-                    listOf(4u, 4u) to Rational(4, 1)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                1 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(18, 5),
-                        listOf(1u) to Rational(-17, 5),
-                        listOf(2u) to Rational(-2, 7),
-                        listOf(0u, 1u) to Rational(6, 5),
-                        listOf(1u, 1u) to Rational(-5, 1),
-                        listOf(2u, 1u) to Rational(-9, 1),
-                        listOf(0u, 2u) to Rational(-8, 8),
-                        listOf(1u, 2u) to Rational(2, 7),
-                        listOf(2u, 2u) to Rational(-13, 7),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-4, 8),
-                        listOf(1u) to Rational(15, 9),
-                        listOf(2u) to Rational(-10, 9),
-                        listOf(0u, 1u) to Rational(5, 3),
-                        listOf(1u, 1u) to Rational(4, 1),
-                        listOf(2u, 1u) to Rational(-2, 7),
-                        listOf(0u, 2u) to Rational(2, 2),
-                        listOf(1u, 2u) to Rational(-5, 7),
-                        listOf(2u, 2u) to Rational(-18, 9),
-                    )
-                ),
-                5 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-2, 9),
-                        listOf(1u) to Rational(-6, 3),
-                        listOf(2u) to Rational(10, 9),
-                        listOf(0u, 1u) to Rational(13, 3),
-                        listOf(1u, 1u) to Rational(-12, 4),
-                        listOf(2u, 1u) to Rational(3, 6),
-                        listOf(0u, 2u) to Rational(2, 9),
-                        listOf(1u, 2u) to Rational(7, 3),
-                        listOf(2u, 2u) to Rational(16, 5),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-6, 2),
-                        listOf(1u) to Rational(6, 2),
-                        listOf(2u) to Rational(2, 7),
-                        listOf(0u, 1u) to Rational(-18, 1),
-                        listOf(1u, 1u) to Rational(-11, 3),
-                        listOf(2u, 1u) to Rational(7, 5),
-                        listOf(0u, 2u) to Rational(8, 1),
-                        listOf(1u, 2u) to Rational(6, 7),
-                        listOf(2u, 2u) to Rational(17, 4),
-                    )
-                )
-            )),
-            "test 5'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(15, 7),
-                    listOf(1u) to Rational(1, 5),
-                    listOf(2u) to Rational(-7, 4),
-                    listOf(0u, 1u) to Rational(-1, 9),
-                    listOf(1u, 1u) to Rational(-2, 7),
-                    listOf(2u, 1u) to Rational(17, 3),
-                    listOf(0u, 2u) to Rational(2, 6),
-                    listOf(1u, 2u) to Rational(-17, 6),
-                    listOf(2u, 2u) to Rational(-6, 2),
-                ),
-                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
-                    listOf<UInt>() to Rational(0, 1)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf<Int, NumberedRationalFunction<Rational>>()),
-            "test 6"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(15, 7),
-                    listOf(1u) to Rational(1, 5),
-                    listOf(2u) to Rational(-7, 4),
-                    listOf(0u, 1u) to Rational(-1, 9),
-                    listOf(1u, 1u) to Rational(-2, 7),
-                    listOf(2u, 1u) to Rational(17, 3),
-                    listOf(0u, 2u) to Rational(2, 6),
-                    listOf(1u, 2u) to Rational(-17, 6),
-                    listOf(2u, 2u) to Rational(-6, 2),
-                ),
-                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
-                    listOf<UInt>() to Rational(0, 1)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, mapOf(
-                5 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-2, 9),
-                        listOf(1u) to Rational(-6, 3),
-                        listOf(2u) to Rational(10, 9),
-                        listOf(0u, 1u) to Rational(13, 3),
-                        listOf(1u, 1u) to Rational(-12, 4),
-                        listOf(2u, 1u) to Rational(3, 6),
-                        listOf(0u, 2u) to Rational(2, 9),
-                        listOf(1u, 2u) to Rational(7, 3),
-                        listOf(2u, 2u) to Rational(16, 5),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-6, 2),
-                        listOf(1u) to Rational(6, 2),
-                        listOf(2u) to Rational(2, 7),
-                        listOf(0u, 1u) to Rational(-18, 1),
-                        listOf(1u, 1u) to Rational(-11, 3),
-                        listOf(2u, 1u) to Rational(7, 5),
-                        listOf(0u, 2u) to Rational(8, 1),
-                        listOf(1u, 2u) to Rational(6, 7),
-                        listOf(2u, 2u) to Rational(17, 4),
-                    )
-                )
-            )),
-            "test 6'"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Double_Map() {
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(emptyList<UInt>() to 0.0),
-                NumberedPolynomialAsIs(emptyList<UInt>() to 1.0),
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 1.0,
-                    listOf(1u) to -2.0,
-                    listOf(2u) to 1.0,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 1.0,
-                )
-            ).substitute(mapOf(
-                0 to 1.0
-            )),
-            0.001,
-            "test 1"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf()),
-            0.001,
-            "test 2"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                5 to 0.9211194782050933
-            )),
-            0.001,
-            "test 2'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 151.1502229133916,
-                    listOf(0u, 1u) to -262.3790170577034,
-                    listOf(0u, 2u) to 102.5097937392923,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to -367.9969733169944,
-                    listOf(0u, 1u) to 112.4911133334554,
-                    listOf(0u, 2u) to -469.755906895345,
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                0 to -8.11707689492641,
-            )),
-            0.001,
-            "test 3"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 151.1502229133916,
-                    listOf(0u, 1u) to -262.3790170577034,
-                    listOf(0u, 2u) to 102.5097937392923,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to -367.9969733169944,
-                    listOf(0u, 1u) to 112.4911133334554,
-                    listOf(0u, 2u) to -469.755906895345,
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                0 to -8.11707689492641,
-                5 to 0.9211194782050933
-            )),
-            0.001,
-            "test 3'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 14.24074356896978,
-                    listOf(1u) to -17.71987055153461,
-                    listOf(2u) to -2.288056483312383,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 7.480604285873397,
-                    listOf(1u) to -8.43478016688617,
-                    listOf(2u) to -9.88934943900592,
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                1 to 0.795265651276015,
-            )),
-            0.001,
-            "test 4"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 14.24074356896978,
-                    listOf(1u) to -17.71987055153461,
-                    listOf(2u) to -2.288056483312383,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 7.480604285873397,
-                    listOf(1u) to -8.43478016688617,
-                    listOf(2u) to -9.88934943900592,
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                1 to 0.795265651276015,
-                5 to 0.9211194782050933
-            )),
-            0.001,
-            "test 4'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 7.321261307532708,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to -575.6325831127576,
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                0 to -8.11707689492641,
-                1 to 0.795265651276015,
-            )),
-            0.001,
-            "test 5"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 7.321261307532708,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to -575.6325831127576,
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substitute(mapOf(
-                0 to -8.11707689492641,
-                1 to 0.795265651276015,
-                5 to 0.9211194782050933
-            )),
-            0.001,
-            "test 5'"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Constant_Map() {
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1),
-                    listOf(1u) to Rational(-2),
-                    listOf(2u) to Rational(1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            ).substitute(RationalField, mapOf(
-                0 to Rational(1)
-            )),
-            "test 1"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(22047, 2450),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-2204953, 147000),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to Rational(7, 5),
-                1 to Rational(-13, 7),
-            )),
-            "test 2"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(22047, 2450),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-2204953, 147000),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to Rational(7, 5),
-                1 to Rational(-13, 7),
-                5 to Rational(-16, 4),
-            )),
-            "test 2'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(4191, 490),
-                    listOf(1u) to Rational(14975, 1176),
-                    listOf(2u) to Rational(-10429, 1176)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-775, 147),
-                    listOf(1u) to Rational(-155, 49),
-                    listOf(2u) to Rational(-757, 280)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                1 to Rational(-13, 7),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(4191, 490),
-                    listOf(1u) to Rational(14975, 1176),
-                    listOf(2u) to Rational(-10429, 1176)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-775, 147),
-                    listOf(1u) to Rational(-155, 49),
-                    listOf(2u) to Rational(-757, 280)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                1 to Rational(-13, 7),
-                5 to Rational(-16, 4),
-            )),
-            "test 3'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-939, 200),
-                    listOf(0u, 1u) to Rational(123, 50),
-                    listOf(0u, 2u) to Rational(1059, 200)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(121, 25),
-                    listOf(0u, 1u) to Rational(-949, 375),
-                    listOf(0u, 2u) to Rational(-1423, 200)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to Rational(7, 5),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-939, 200),
-                    listOf(0u, 1u) to Rational(123, 50),
-                    listOf(0u, 2u) to Rational(1059, 200)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(121, 25),
-                    listOf(0u, 1u) to Rational(-949, 375),
-                    listOf(0u, 2u) to Rational(-1423, 200)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to Rational(7, 5),
-                5 to Rational(-16, 4),
-            )),
-            "test 4'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf<Int, Rational>()),
-            "test 5"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                5 to Rational(-16, 4),
-            )),
-            "test 5'"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Polynomial_Map() {
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1),
-                    listOf(1u) to Rational(-2),
-                    listOf(2u) to Rational(1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            ).substitute(RationalField, mapOf(
-                0 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            )),
-            "test 1"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(211, 4),
-                    listOf(2u) to Rational(88, 3),
-                    listOf(3u) to Rational(-63, 8),
-                    listOf(4u) to Rational(441, 16),
-                    listOf(0u, 1u) to Rational(-671, 15),
-                    listOf(1u, 1u) to Rational(-551, 21),
-                    listOf(2u, 1u) to Rational(279, 25),
-                    listOf(3u, 1u) to Rational(231, 20),
-                    listOf(0u, 2u) to Rational(-1436, 1575),
-                    listOf(1u, 2u) to Rational(2471, 250),
-                    listOf(2u, 2u) to Rational(-4919, 100),
-                    listOf(0u, 3u) to Rational(-1464, 125),
-                    listOf(1u, 3u) to Rational(-264, 25),
-                    listOf(0u, 4u) to Rational(576, 25),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(-9, 4),
-                    listOf(2u) to Rational(943, 8),
-                    listOf(3u) to Rational(117, 8),
-                    listOf(4u) to Rational(147, 16),
-                    listOf(0u, 1u) to Rational(289, 90),
-                    listOf(1u, 1u) to Rational(-2692, 15),
-                    listOf(2u, 1u) to Rational(-1629, 140),
-                    listOf(3u, 1u) to Rational(77, 20),
-                    listOf(0u, 2u) to Rational(6187, 75),
-                    listOf(1u, 2u) to Rational(-2879, 175),
-                    listOf(2u, 2u) to Rational(-4919, 300),
-                    listOf(0u, 3u) to Rational(336, 25),
-                    listOf(1u, 3u) to Rational(-88, 25),
-                    listOf(0u, 4u) to Rational(192, 25),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to NumberedPolynomialAsIs(
-                    listOf(1u) to Rational(3, 2),
-                    listOf(0u, 1u) to Rational(8, 5),
-                ),
-                1 to NumberedPolynomialAsIs(
-                    listOf(1u) to Rational(7, 2),
-                    listOf(0u, 1u) to Rational(-3, 1),
-                )
-            )),
-            "test 2"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1202861, 210),
-                    listOf(1u) to Rational(-215117, 45),
-                    listOf(2u) to Rational(10889651, 19845),
-                    listOf(3u) to Rational(-3503956, 6615),
-                    listOf(4u) to Rational(809066, 2205),
-                    listOf(5u) to Rational(-9056, 735),
-                    listOf(6u) to Rational(5396, 315),
-                    listOf(7u) to Rational(-752, 147),
-                    listOf(8u) to Rational(16, 49),
-                    listOf(0u, 1u) to Rational(1738469, 1470),
-                    listOf(1u, 1u) to Rational(-926238703, 52920),
-                    listOf(2u, 1u) to Rational(-44113982, 6615),
-                    listOf(3u, 1u) to Rational(10423519, 5292),
-                    listOf(4u, 1u) to Rational(3769712, 2205),
-                    listOf(5u, 1u) to Rational(8905046, 6615),
-                    listOf(6u, 1u) to Rational(1186972, 6615),
-                    listOf(7u, 1u) to Rational(22124, 441),
-                    listOf(8u, 1u) to Rational(-1504, 147),
-                    listOf(0u, 2u) to Rational(-54723628, 2205),
-                    listOf(1u, 2u) to Rational(70109407, 1323),
-                    listOf(2u, 2u) to Rational(151072591, 17640),
-                    listOf(3u, 2u) to Rational(1216428107, 52920),
-                    listOf(4u, 2u) to Rational(2587873193, 317520),
-                    listOf(5u, 2u) to Rational(393536369, 79380),
-                    listOf(6u, 2u) to Rational(137614937, 79380),
-                    listOf(7u, 2u) to Rational(566866, 1323),
-                    listOf(8u, 2u) to Rational(41848, 441),
-                    listOf(0u, 3u) to Rational(-19470406, 2205),
-                    listOf(1u, 3u) to Rational(72514195, 882),
-                    listOf(2u, 3u) to Rational(-78090707, 1764),
-                    listOf(3u, 3u) to Rational(-1988237707, 26460),
-                    listOf(4u, 3u) to Rational(-802137919, 17640),
-                    listOf(5u, 3u) to Rational(-139989463, 5880),
-                    listOf(6u, 3u) to Rational(-26066641, 3780),
-                    listOf(7u, 3u) to Rational(-2363369, 1323),
-                    listOf(8u, 3u) to Rational(-108280, 441),
-                    listOf(0u, 4u) to Rational(14878516, 441),
-                    listOf(1u, 4u) to Rational(-253416724, 2205),
-                    listOf(2u, 4u) to Rational(16699157, 840),
-                    listOf(3u, 4u) to Rational(-105220979, 13230),
-                    listOf(4u, 4u) to Rational(208266383, 5880),
-                    listOf(5u, 4u) to Rational(650135309, 26460),
-                    listOf(6u, 4u) to Rational(123808663, 11760),
-                    listOf(7u, 4u) to Rational(8563385, 2646),
-                    listOf(8u, 4u) to Rational(19721, 49),
-                    listOf(0u, 5u) to Rational(675645, 49),
-                    listOf(1u, 5u) to Rational(-70554077, 588),
-                    listOf(2u, 5u) to Rational(157884029, 980),
-                    listOf(3u, 5u) to Rational(489548623, 4410),
-                    listOf(4u, 5u) to Rational(148540519, 17640),
-                    listOf(5u, 5u) to Rational(-5559551, 392),
-                    listOf(6u, 5u) to Rational(-18335711, 1470),
-                    listOf(7u, 5u) to Rational(-38437, 9),
-                    listOf(8u, 5u) to Rational(-29620, 63),
-                    listOf(0u, 6u) to Rational(-727625, 49),
-                    listOf(1u, 6u) to Rational(7046685, 98),
-                    listOf(2u, 6u) to Rational(-334814231, 7056),
-                    listOf(3u, 6u) to Rational(-243971737, 17640),
-                    listOf(4u, 6u) to Rational(-571116659, 35280),
-                    listOf(5u, 6u) to Rational(567538, 315),
-                    listOf(6u, 6u) to Rational(3199768, 315),
-                    listOf(7u, 6u) to Rational(227744, 63),
-                    listOf(8u, 6u) to Rational(23116, 63),
-                    listOf(0u, 7u) to Rational(-27500, 7),
-                    listOf(1u, 7u) to Rational(120125, 3),
-                    listOf(2u, 7u) to Rational(-279200, 3),
-                    listOf(3u, 7u) to Rational(-100160, 7),
-                    listOf(4u, 7u) to Rational(920452, 21),
-                    listOf(5u, 7u) to Rational(226481, 21),
-                    listOf(6u, 7u) to Rational(-34428, 7),
-                    listOf(7u, 7u) to Rational(-6232, 3),
-                    listOf(8u, 7u) to Rational(-608, 3),
-                    listOf(0u, 8u) to Rational(2500, 1),
-                    listOf(1u, 8u) to Rational(-19000, 1),
-                    listOf(2u, 8u) to Rational(37900, 1),
-                    listOf(3u, 8u) to Rational(-1840, 1),
-                    listOf(4u, 8u) to Rational(-17876, 1),
-                    listOf(5u, 8u) to Rational(-1240, 1),
-                    listOf(6u, 8u) to Rational(2788, 1),
-                    listOf(7u, 8u) to Rational(800, 1),
-                    listOf(8u, 8u) to Rational(64, 1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(162487, 63),
-                    listOf(1u) to Rational(-92713, 54),
-                    listOf(2u) to Rational(802436, 1323),
-                    listOf(3u) to Rational(-55088, 441),
-                    listOf(4u) to Rational(1404034, 9261),
-                    listOf(5u) to Rational(-5804, 1029),
-                    listOf(6u) to Rational(51556, 9261),
-                    listOf(7u) to Rational(-752, 441),
-                    listOf(8u) to Rational(16, 147),
-                    listOf(0u, 1u) to Rational(296071, 441),
-                    listOf(1u, 1u) to Rational(-4991281, 882),
-                    listOf(2u, 1u) to Rational(-18702811, 9261),
-                    listOf(3u, 1u) to Rational(40759043, 27783),
-                    listOf(4u, 1u) to Rational(19768501, 27783),
-                    listOf(5u, 1u) to Rational(14307337, 27783),
-                    listOf(6u, 1u) to Rational(1655684, 27783),
-                    listOf(7u, 1u) to Rational(22124, 1323),
-                    listOf(8u, 1u) to Rational(-1504, 441),
-                    listOf(0u, 2u) to Rational(-27667474, 3087),
-                    listOf(1u, 2u) to Rational(265605901, 12348),
-                    listOf(2u, 2u) to Rational(160360775, 98784),
-                    listOf(3u, 2u) to Rational(1169992093, 148176),
-                    listOf(4u, 2u) to Rational(3978014077, 1333584),
-                    listOf(5u, 2u) to Rational(567058123, 333396),
-                    listOf(6u, 2u) to Rational(205132579, 333396),
-                    listOf(7u, 2u) to Rational(566866, 3969),
-                    listOf(8u, 2u) to Rational(41848, 1323),
-                    listOf(0u, 3u) to Rational(-2228822, 1029),
-                    listOf(1u, 3u) to Rational(80179390, 3087),
-                    listOf(2u, 3u) to Rational(-1378630487, 74088),
-                    listOf(3u, 3u) to Rational(-3385811693, 111132),
-                    listOf(4u, 3u) to Rational(-820686977, 49392),
-                    listOf(5u, 3u) to Rational(-89101027, 10584),
-                    listOf(6u, 3u) to Rational(-37847387, 15876),
-                    listOf(7u, 3u) to Rational(-2363369, 3969),
-                    listOf(8u, 3u) to Rational(-108280, 1323),
-                    listOf(0u, 4u) to Rational(12619982, 1029),
-                    listOf(1u, 4u) to Rational(-277723177, 6174),
-                    listOf(2u, 4u) to Rational(649414169, 49392),
-                    listOf(3u, 4u) to Rational(14457595, 63504),
-                    listOf(4u, 4u) to Rational(139270339, 10584),
-                    listOf(5u, 4u) to Rational(140367961, 15876),
-                    listOf(6u, 4u) to Rational(25467083, 7056),
-                    listOf(7u, 4u) to Rational(8563385, 7938),
-                    listOf(8u, 4u) to Rational(19721, 147),
-                    listOf(0u, 5u) to Rational(643850, 147),
-                    listOf(1u, 5u) to Rational(-11818025, 294),
-                    listOf(2u, 5u) to Rational(33963203, 588),
-                    listOf(3u, 5u) to Rational(207216235, 5292),
-                    listOf(4u, 5u) to Rational(2861021, 1512),
-                    listOf(5u, 5u) to Rational(-6302335, 1176),
-                    listOf(6u, 5u) to Rational(-3738587, 882),
-                    listOf(7u, 5u) to Rational(-38437, 27),
-                    listOf(8u, 5u) to Rational(-29620, 189),
-                    listOf(0u, 6u) to Rational(-248725, 49),
-                    listOf(1u, 6u) to Rational(2478535, 98),
-                    listOf(2u, 6u) to Rational(-399721367, 21168),
-                    listOf(3u, 6u) to Rational(-54309317, 10584),
-                    listOf(4u, 6u) to Rational(-95398327, 21168),
-                    listOf(5u, 6u) to Rational(173750, 189),
-                    listOf(6u, 6u) to Rational(92216, 27),
-                    listOf(7u, 6u) to Rational(227744, 189),
-                    listOf(8u, 6u) to Rational(23116, 189),
-                    listOf(0u, 7u) to Rational(-27500, 21),
-                    listOf(1u, 7u) to Rational(120125, 9),
-                    listOf(2u, 7u) to Rational(-279200, 9),
-                    listOf(3u, 7u) to Rational(-100160, 21),
-                    listOf(4u, 7u) to Rational(920452, 63),
-                    listOf(5u, 7u) to Rational(226481, 63),
-                    listOf(6u, 7u) to Rational(-11476, 7),
-                    listOf(7u, 7u) to Rational(-6232, 9),
-                    listOf(8u, 7u) to Rational(-608, 9),
-                    listOf(0u, 8u) to Rational(2500, 3),
-                    listOf(1u, 8u) to Rational(-19000, 3),
-                    listOf(2u, 8u) to Rational(37900, 3),
-                    listOf(3u, 8u) to Rational(-1840, 3),
-                    listOf(4u, 8u) to Rational(-17876, 3),
-                    listOf(5u, 8u) to Rational(-1240, 3),
-                    listOf(6u, 8u) to Rational(2788, 3),
-                    listOf(7u, 8u) to Rational(800, 3),
-                    listOf(8u, 8u) to Rational(64, 3)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(18, 1),
-                    listOf(1u) to Rational(16, 3),
-                    listOf(2u) to Rational(12, 6),
-                    listOf(0u, 1u) to Rational(13, 1),
-                    listOf(1u, 1u) to Rational(-11, 4),
-                    listOf(2u, 1u) to Rational(-1, 1),
-                    listOf(0u, 2u) to Rational(-10, 1),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(2, 1),
-                ),
-                1 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(8, 2),
-                    listOf(1u) to Rational(-15, 5),
-                    listOf(2u) to Rational(2, 7),
-                    listOf(0u, 1u) to Rational(-18, 7),
-                    listOf(1u, 1u) to Rational(-16, 6),
-                    listOf(2u, 1u) to Rational(-13, 3),
-                    listOf(0u, 2u) to Rational(-5, 1),
-                    listOf(1u, 2u) to Rational(17, 1),
-                    listOf(2u, 2u) to Rational(8, 2),
-                ),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1202861, 210),
-                    listOf(1u) to Rational(-215117, 45),
-                    listOf(2u) to Rational(10889651, 19845),
-                    listOf(3u) to Rational(-3503956, 6615),
-                    listOf(4u) to Rational(809066, 2205),
-                    listOf(5u) to Rational(-9056, 735),
-                    listOf(6u) to Rational(5396, 315),
-                    listOf(7u) to Rational(-752, 147),
-                    listOf(8u) to Rational(16, 49),
-                    listOf(0u, 1u) to Rational(1738469, 1470),
-                    listOf(1u, 1u) to Rational(-926238703, 52920),
-                    listOf(2u, 1u) to Rational(-44113982, 6615),
-                    listOf(3u, 1u) to Rational(10423519, 5292),
-                    listOf(4u, 1u) to Rational(3769712, 2205),
-                    listOf(5u, 1u) to Rational(8905046, 6615),
-                    listOf(6u, 1u) to Rational(1186972, 6615),
-                    listOf(7u, 1u) to Rational(22124, 441),
-                    listOf(8u, 1u) to Rational(-1504, 147),
-                    listOf(0u, 2u) to Rational(-54723628, 2205),
-                    listOf(1u, 2u) to Rational(70109407, 1323),
-                    listOf(2u, 2u) to Rational(151072591, 17640),
-                    listOf(3u, 2u) to Rational(1216428107, 52920),
-                    listOf(4u, 2u) to Rational(2587873193, 317520),
-                    listOf(5u, 2u) to Rational(393536369, 79380),
-                    listOf(6u, 2u) to Rational(137614937, 79380),
-                    listOf(7u, 2u) to Rational(566866, 1323),
-                    listOf(8u, 2u) to Rational(41848, 441),
-                    listOf(0u, 3u) to Rational(-19470406, 2205),
-                    listOf(1u, 3u) to Rational(72514195, 882),
-                    listOf(2u, 3u) to Rational(-78090707, 1764),
-                    listOf(3u, 3u) to Rational(-1988237707, 26460),
-                    listOf(4u, 3u) to Rational(-802137919, 17640),
-                    listOf(5u, 3u) to Rational(-139989463, 5880),
-                    listOf(6u, 3u) to Rational(-26066641, 3780),
-                    listOf(7u, 3u) to Rational(-2363369, 1323),
-                    listOf(8u, 3u) to Rational(-108280, 441),
-                    listOf(0u, 4u) to Rational(14878516, 441),
-                    listOf(1u, 4u) to Rational(-253416724, 2205),
-                    listOf(2u, 4u) to Rational(16699157, 840),
-                    listOf(3u, 4u) to Rational(-105220979, 13230),
-                    listOf(4u, 4u) to Rational(208266383, 5880),
-                    listOf(5u, 4u) to Rational(650135309, 26460),
-                    listOf(6u, 4u) to Rational(123808663, 11760),
-                    listOf(7u, 4u) to Rational(8563385, 2646),
-                    listOf(8u, 4u) to Rational(19721, 49),
-                    listOf(0u, 5u) to Rational(675645, 49),
-                    listOf(1u, 5u) to Rational(-70554077, 588),
-                    listOf(2u, 5u) to Rational(157884029, 980),
-                    listOf(3u, 5u) to Rational(489548623, 4410),
-                    listOf(4u, 5u) to Rational(148540519, 17640),
-                    listOf(5u, 5u) to Rational(-5559551, 392),
-                    listOf(6u, 5u) to Rational(-18335711, 1470),
-                    listOf(7u, 5u) to Rational(-38437, 9),
-                    listOf(8u, 5u) to Rational(-29620, 63),
-                    listOf(0u, 6u) to Rational(-727625, 49),
-                    listOf(1u, 6u) to Rational(7046685, 98),
-                    listOf(2u, 6u) to Rational(-334814231, 7056),
-                    listOf(3u, 6u) to Rational(-243971737, 17640),
-                    listOf(4u, 6u) to Rational(-571116659, 35280),
-                    listOf(5u, 6u) to Rational(567538, 315),
-                    listOf(6u, 6u) to Rational(3199768, 315),
-                    listOf(7u, 6u) to Rational(227744, 63),
-                    listOf(8u, 6u) to Rational(23116, 63),
-                    listOf(0u, 7u) to Rational(-27500, 7),
-                    listOf(1u, 7u) to Rational(120125, 3),
-                    listOf(2u, 7u) to Rational(-279200, 3),
-                    listOf(3u, 7u) to Rational(-100160, 7),
-                    listOf(4u, 7u) to Rational(920452, 21),
-                    listOf(5u, 7u) to Rational(226481, 21),
-                    listOf(6u, 7u) to Rational(-34428, 7),
-                    listOf(7u, 7u) to Rational(-6232, 3),
-                    listOf(8u, 7u) to Rational(-608, 3),
-                    listOf(0u, 8u) to Rational(2500, 1),
-                    listOf(1u, 8u) to Rational(-19000, 1),
-                    listOf(2u, 8u) to Rational(37900, 1),
-                    listOf(3u, 8u) to Rational(-1840, 1),
-                    listOf(4u, 8u) to Rational(-17876, 1),
-                    listOf(5u, 8u) to Rational(-1240, 1),
-                    listOf(6u, 8u) to Rational(2788, 1),
-                    listOf(7u, 8u) to Rational(800, 1),
-                    listOf(8u, 8u) to Rational(64, 1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(162487, 63),
-                    listOf(1u) to Rational(-92713, 54),
-                    listOf(2u) to Rational(802436, 1323),
-                    listOf(3u) to Rational(-55088, 441),
-                    listOf(4u) to Rational(1404034, 9261),
-                    listOf(5u) to Rational(-5804, 1029),
-                    listOf(6u) to Rational(51556, 9261),
-                    listOf(7u) to Rational(-752, 441),
-                    listOf(8u) to Rational(16, 147),
-                    listOf(0u, 1u) to Rational(296071, 441),
-                    listOf(1u, 1u) to Rational(-4991281, 882),
-                    listOf(2u, 1u) to Rational(-18702811, 9261),
-                    listOf(3u, 1u) to Rational(40759043, 27783),
-                    listOf(4u, 1u) to Rational(19768501, 27783),
-                    listOf(5u, 1u) to Rational(14307337, 27783),
-                    listOf(6u, 1u) to Rational(1655684, 27783),
-                    listOf(7u, 1u) to Rational(22124, 1323),
-                    listOf(8u, 1u) to Rational(-1504, 441),
-                    listOf(0u, 2u) to Rational(-27667474, 3087),
-                    listOf(1u, 2u) to Rational(265605901, 12348),
-                    listOf(2u, 2u) to Rational(160360775, 98784),
-                    listOf(3u, 2u) to Rational(1169992093, 148176),
-                    listOf(4u, 2u) to Rational(3978014077, 1333584),
-                    listOf(5u, 2u) to Rational(567058123, 333396),
-                    listOf(6u, 2u) to Rational(205132579, 333396),
-                    listOf(7u, 2u) to Rational(566866, 3969),
-                    listOf(8u, 2u) to Rational(41848, 1323),
-                    listOf(0u, 3u) to Rational(-2228822, 1029),
-                    listOf(1u, 3u) to Rational(80179390, 3087),
-                    listOf(2u, 3u) to Rational(-1378630487, 74088),
-                    listOf(3u, 3u) to Rational(-3385811693, 111132),
-                    listOf(4u, 3u) to Rational(-820686977, 49392),
-                    listOf(5u, 3u) to Rational(-89101027, 10584),
-                    listOf(6u, 3u) to Rational(-37847387, 15876),
-                    listOf(7u, 3u) to Rational(-2363369, 3969),
-                    listOf(8u, 3u) to Rational(-108280, 1323),
-                    listOf(0u, 4u) to Rational(12619982, 1029),
-                    listOf(1u, 4u) to Rational(-277723177, 6174),
-                    listOf(2u, 4u) to Rational(649414169, 49392),
-                    listOf(3u, 4u) to Rational(14457595, 63504),
-                    listOf(4u, 4u) to Rational(139270339, 10584),
-                    listOf(5u, 4u) to Rational(140367961, 15876),
-                    listOf(6u, 4u) to Rational(25467083, 7056),
-                    listOf(7u, 4u) to Rational(8563385, 7938),
-                    listOf(8u, 4u) to Rational(19721, 147),
-                    listOf(0u, 5u) to Rational(643850, 147),
-                    listOf(1u, 5u) to Rational(-11818025, 294),
-                    listOf(2u, 5u) to Rational(33963203, 588),
-                    listOf(3u, 5u) to Rational(207216235, 5292),
-                    listOf(4u, 5u) to Rational(2861021, 1512),
-                    listOf(5u, 5u) to Rational(-6302335, 1176),
-                    listOf(6u, 5u) to Rational(-3738587, 882),
-                    listOf(7u, 5u) to Rational(-38437, 27),
-                    listOf(8u, 5u) to Rational(-29620, 189),
-                    listOf(0u, 6u) to Rational(-248725, 49),
-                    listOf(1u, 6u) to Rational(2478535, 98),
-                    listOf(2u, 6u) to Rational(-399721367, 21168),
-                    listOf(3u, 6u) to Rational(-54309317, 10584),
-                    listOf(4u, 6u) to Rational(-95398327, 21168),
-                    listOf(5u, 6u) to Rational(173750, 189),
-                    listOf(6u, 6u) to Rational(92216, 27),
-                    listOf(7u, 6u) to Rational(227744, 189),
-                    listOf(8u, 6u) to Rational(23116, 189),
-                    listOf(0u, 7u) to Rational(-27500, 21),
-                    listOf(1u, 7u) to Rational(120125, 9),
-                    listOf(2u, 7u) to Rational(-279200, 9),
-                    listOf(3u, 7u) to Rational(-100160, 21),
-                    listOf(4u, 7u) to Rational(920452, 63),
-                    listOf(5u, 7u) to Rational(226481, 63),
-                    listOf(6u, 7u) to Rational(-11476, 7),
-                    listOf(7u, 7u) to Rational(-6232, 9),
-                    listOf(8u, 7u) to Rational(-608, 9),
-                    listOf(0u, 8u) to Rational(2500, 3),
-                    listOf(1u, 8u) to Rational(-19000, 3),
-                    listOf(2u, 8u) to Rational(37900, 3),
-                    listOf(3u, 8u) to Rational(-1840, 3),
-                    listOf(4u, 8u) to Rational(-17876, 3),
-                    listOf(5u, 8u) to Rational(-1240, 3),
-                    listOf(6u, 8u) to Rational(2788, 3),
-                    listOf(7u, 8u) to Rational(800, 3),
-                    listOf(8u, 8u) to Rational(64, 3)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(18, 1),
-                    listOf(1u) to Rational(16, 3),
-                    listOf(2u) to Rational(12, 6),
-                    listOf(0u, 1u) to Rational(13, 1),
-                    listOf(1u, 1u) to Rational(-11, 4),
-                    listOf(2u, 1u) to Rational(-1, 1),
-                    listOf(0u, 2u) to Rational(-10, 1),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(2, 1),
-                ),
-                1 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(8, 2),
-                    listOf(1u) to Rational(-15, 5),
-                    listOf(2u) to Rational(2, 7),
-                    listOf(0u, 1u) to Rational(-18, 7),
-                    listOf(1u, 1u) to Rational(-16, 6),
-                    listOf(2u, 1u) to Rational(-13, 3),
-                    listOf(0u, 2u) to Rational(-5, 1),
-                    listOf(1u, 2u) to Rational(17, 1),
-                    listOf(2u, 2u) to Rational(8, 2),
-                ),
-                5 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-6, 1),
-                    listOf(1u) to Rational(-9, 8),
-                    listOf(2u) to Rational(17, 5),
-                    listOf(0u, 1u) to Rational(-2, 3),
-                    listOf(1u, 1u) to Rational(1, 5),
-                    listOf(2u, 1u) to Rational(-11, 7),
-                    listOf(0u, 2u) to Rational(13, 6),
-                    listOf(1u, 2u) to Rational(-15, 2),
-                    listOf(2u, 2u) to Rational(-14, 4),
-                )
-            )),
-            "test 3'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(493, 6),
-                    listOf(1u) to Rational(-15991, 210),
-                    listOf(2u) to Rational(2734, 63),
-                    listOf(3u) to Rational(-8213, 245),
-                    listOf(4u) to Rational(1843, 147),
-                    listOf(5u) to Rational(-432, 245),
-                    listOf(6u) to Rational(4, 49),
-                    listOf(0u, 1u) to Rational(-66, 1),
-                    listOf(1u, 1u) to Rational(-92924, 2205),
-                    listOf(2u, 1u) to Rational(-257461, 2205),
-                    listOf(3u, 1u) to Rational(58658, 2205),
-                    listOf(4u, 1u) to Rational(-87884, 2205),
-                    listOf(5u, 1u) to Rational(2726, 105),
-                    listOf(6u, 1u) to Rational(-52, 21),
-                    listOf(0u, 2u) to Rational(-17569, 147),
-                    listOf(1u, 2u) to Rational(368819, 735),
-                    listOf(2u, 2u) to Rational(-644626, 6615),
-                    listOf(3u, 2u) to Rational(221738, 945),
-                    listOf(4u, 2u) to Rational(-18022, 945),
-                    listOf(5u, 2u) to Rational(-1201, 315),
-                    listOf(6u, 2u) to Rational(1327, 63),
-                    listOf(0u, 3u) to Rational(240, 7),
-                    listOf(1u, 3u) to Rational(-868, 9),
-                    listOf(2u, 3u) to Rational(-8936, 315),
-                    listOf(3u, 3u) to Rational(-77146, 315),
-                    listOf(4u, 3u) to Rational(-4072, 315),
-                    listOf(5u, 3u) to Rational(-2218, 15),
-                    listOf(6u, 3u) to Rational(-104, 3),
-                    listOf(0u, 4u) to Rational(100, 3),
-                    listOf(1u, 4u) to Rational(-725, 3),
-                    listOf(2u, 4u) to Rational(459, 1),
-                    listOf(3u, 4u) to Rational(-2071, 15),
-                    listOf(4u, 4u) to Rational(2831, 15),
-                    listOf(5u, 4u) to Rational(632, 5),
-                    listOf(6u, 4u) to Rational(16, 1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1255, 9),
-                    listOf(1u) to Rational(-24781, 126),
-                    listOf(2u) to Rational(1195, 14),
-                    listOf(3u) to Rational(-1931, 147),
-                    listOf(4u) to Rational(439, 147),
-                    listOf(5u) to Rational(-172, 343),
-                    listOf(6u) to Rational(4, 147),
-                    listOf(0u, 1u) to Rational(-183, 1),
-                    listOf(1u, 1u) to Rational(-30988, 441),
-                    listOf(2u, 1u) to Rational(-56137, 294),
-                    listOf(3u, 1u) to Rational(204308, 1029),
-                    listOf(4u, 1u) to Rational(-3263, 441),
-                    listOf(5u, 1u) to Rational(2662, 441),
-                    listOf(6u, 1u) to Rational(-52, 63),
-                    listOf(0u, 2u) to Rational(-87119, 294),
-                    listOf(1u, 2u) to Rational(1077919, 686),
-                    listOf(2u, 2u) to Rational(-35209, 147),
-                    listOf(3u, 2u) to Rational(15041, 147),
-                    listOf(4u, 2u) to Rational(240889, 1323),
-                    listOf(5u, 2u) to Rational(27778, 1323),
-                    listOf(6u, 2u) to Rational(1327, 189),
-                    listOf(0u, 3u) to Rational(1620, 7),
-                    listOf(1u, 3u) to Rational(-25716, 49),
-                    listOf(2u, 3u) to Rational(-32078, 49),
-                    listOf(3u, 3u) to Rational(-704038, 441),
-                    listOf(4u, 3u) to Rational(-30190, 63),
-                    listOf(5u, 3u) to Rational(-5414, 63),
-                    listOf(6u, 3u) to Rational(-104, 9),
-                    listOf(0u, 4u) to Rational(225, 1),
-                    listOf(1u, 4u) to Rational(-10560, 7),
-                    listOf(2u, 4u) to Rational(44176, 21),
-                    listOf(3u, 4u) to Rational(28996, 21),
-                    listOf(4u, 4u) to Rational(2405, 7),
-                    listOf(5u, 4u) to Rational(1240, 21),
-                    listOf(6u, 4u) to Rational(16, 3)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                1 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(8, 2),
-                    listOf(1u) to Rational(-15, 5),
-                    listOf(2u) to Rational(2, 7),
-                    listOf(0u, 1u) to Rational(-18, 7),
-                    listOf(1u, 1u) to Rational(-16, 6),
-                    listOf(2u, 1u) to Rational(-13, 3),
-                    listOf(0u, 2u) to Rational(-5, 1),
-                    listOf(1u, 2u) to Rational(17, 1),
-                    listOf(2u, 2u) to Rational(8, 2),
-                ),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(493, 6),
-                    listOf(1u) to Rational(-15991, 210),
-                    listOf(2u) to Rational(2734, 63),
-                    listOf(3u) to Rational(-8213, 245),
-                    listOf(4u) to Rational(1843, 147),
-                    listOf(5u) to Rational(-432, 245),
-                    listOf(6u) to Rational(4, 49),
-                    listOf(0u, 1u) to Rational(-66, 1),
-                    listOf(1u, 1u) to Rational(-92924, 2205),
-                    listOf(2u, 1u) to Rational(-257461, 2205),
-                    listOf(3u, 1u) to Rational(58658, 2205),
-                    listOf(4u, 1u) to Rational(-87884, 2205),
-                    listOf(5u, 1u) to Rational(2726, 105),
-                    listOf(6u, 1u) to Rational(-52, 21),
-                    listOf(0u, 2u) to Rational(-17569, 147),
-                    listOf(1u, 2u) to Rational(368819, 735),
-                    listOf(2u, 2u) to Rational(-644626, 6615),
-                    listOf(3u, 2u) to Rational(221738, 945),
-                    listOf(4u, 2u) to Rational(-18022, 945),
-                    listOf(5u, 2u) to Rational(-1201, 315),
-                    listOf(6u, 2u) to Rational(1327, 63),
-                    listOf(0u, 3u) to Rational(240, 7),
-                    listOf(1u, 3u) to Rational(-868, 9),
-                    listOf(2u, 3u) to Rational(-8936, 315),
-                    listOf(3u, 3u) to Rational(-77146, 315),
-                    listOf(4u, 3u) to Rational(-4072, 315),
-                    listOf(5u, 3u) to Rational(-2218, 15),
-                    listOf(6u, 3u) to Rational(-104, 3),
-                    listOf(0u, 4u) to Rational(100, 3),
-                    listOf(1u, 4u) to Rational(-725, 3),
-                    listOf(2u, 4u) to Rational(459, 1),
-                    listOf(3u, 4u) to Rational(-2071, 15),
-                    listOf(4u, 4u) to Rational(2831, 15),
-                    listOf(5u, 4u) to Rational(632, 5),
-                    listOf(6u, 4u) to Rational(16, 1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1255, 9),
-                    listOf(1u) to Rational(-24781, 126),
-                    listOf(2u) to Rational(1195, 14),
-                    listOf(3u) to Rational(-1931, 147),
-                    listOf(4u) to Rational(439, 147),
-                    listOf(5u) to Rational(-172, 343),
-                    listOf(6u) to Rational(4, 147),
-                    listOf(0u, 1u) to Rational(-183, 1),
-                    listOf(1u, 1u) to Rational(-30988, 441),
-                    listOf(2u, 1u) to Rational(-56137, 294),
-                    listOf(3u, 1u) to Rational(204308, 1029),
-                    listOf(4u, 1u) to Rational(-3263, 441),
-                    listOf(5u, 1u) to Rational(2662, 441),
-                    listOf(6u, 1u) to Rational(-52, 63),
-                    listOf(0u, 2u) to Rational(-87119, 294),
-                    listOf(1u, 2u) to Rational(1077919, 686),
-                    listOf(2u, 2u) to Rational(-35209, 147),
-                    listOf(3u, 2u) to Rational(15041, 147),
-                    listOf(4u, 2u) to Rational(240889, 1323),
-                    listOf(5u, 2u) to Rational(27778, 1323),
-                    listOf(6u, 2u) to Rational(1327, 189),
-                    listOf(0u, 3u) to Rational(1620, 7),
-                    listOf(1u, 3u) to Rational(-25716, 49),
-                    listOf(2u, 3u) to Rational(-32078, 49),
-                    listOf(3u, 3u) to Rational(-704038, 441),
-                    listOf(4u, 3u) to Rational(-30190, 63),
-                    listOf(5u, 3u) to Rational(-5414, 63),
-                    listOf(6u, 3u) to Rational(-104, 9),
-                    listOf(0u, 4u) to Rational(225, 1),
-                    listOf(1u, 4u) to Rational(-10560, 7),
-                    listOf(2u, 4u) to Rational(44176, 21),
-                    listOf(3u, 4u) to Rational(28996, 21),
-                    listOf(4u, 4u) to Rational(2405, 7),
-                    listOf(5u, 4u) to Rational(1240, 21),
-                    listOf(6u, 4u) to Rational(16, 3)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                1 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(8, 2),
-                    listOf(1u) to Rational(-15, 5),
-                    listOf(2u) to Rational(2, 7),
-                    listOf(0u, 1u) to Rational(-18, 7),
-                    listOf(1u, 1u) to Rational(-16, 6),
-                    listOf(2u, 1u) to Rational(-13, 3),
-                    listOf(0u, 2u) to Rational(-5, 1),
-                    listOf(1u, 2u) to Rational(17, 1),
-                    listOf(2u, 2u) to Rational(8, 2),
-                ),
-                5 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-6, 1),
-                    listOf(1u) to Rational(-9, 8),
-                    listOf(2u) to Rational(17, 5),
-                    listOf(0u, 1u) to Rational(-2, 3),
-                    listOf(1u, 1u) to Rational(1, 5),
-                    listOf(2u, 1u) to Rational(-11, 7),
-                    listOf(0u, 2u) to Rational(13, 6),
-                    listOf(1u, 2u) to Rational(-15, 2),
-                    listOf(2u, 2u) to Rational(-14, 4),
-                )
-            )),
-            "test 4'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-409, 6),
-                    listOf(1u) to Rational(-376, 9),
-                    listOf(2u) to Rational(-1781, 81),
-                    listOf(3u) to Rational(-128, 27),
-                    listOf(4u) to Rational(-8, 9),
-                    listOf(0u, 1u) to Rational(18701, 210),
-                    listOf(1u, 1u) to Rational(614183, 7560),
-                    listOf(2u, 1u) to Rational(90941, 1890),
-                    listOf(3u, 1u) to Rational(1802, 135),
-                    listOf(4u, 1u) to Rational(112, 45),
-                    listOf(0u, 2u) to Rational(181421, 315),
-                    listOf(1u, 2u) to Rational(77813, 378),
-                    listOf(2u, 2u) to Rational(598583, 7560),
-                    listOf(3u, 2u) to Rational(85, 27),
-                    listOf(4u, 2u) to Rational(2, 5),
-                    listOf(0u, 3u) to Rational(130997, 315),
-                    listOf(1u, 3u) to Rational(1093, 420),
-                    listOf(2u, 3u) to Rational(9551, 2520),
-                    listOf(3u, 3u) to Rational(-14, 45),
-                    listOf(4u, 3u) to Rational(22, 45),
-                    listOf(0u, 4u) to Rational(-2801, 9),
-                    listOf(1u, 4u) to Rational(4033, 90),
-                    listOf(2u, 4u) to Rational(6429, 80),
-                    listOf(3u, 4u) to Rational(2851, 90),
-                    listOf(4u, 4u) to Rational(293, 45),
-                    listOf(0u, 5u) to Rational(-220, 1),
-                    listOf(1u, 5u) to Rational(127, 1),
-                    listOf(2u, 5u) to Rational(202, 5),
-                    listOf(3u, 5u) to Rational(-63, 5),
-                    listOf(4u, 5u) to Rational(-12, 5),
-                    listOf(0u, 6u) to Rational(100, 1),
-                    listOf(1u, 6u) to Rational(-80, 1),
-                    listOf(2u, 6u) to Rational(-24, 1),
-                    listOf(3u, 6u) to Rational(16, 1),
-                    listOf(4u, 6u) to Rational(4, 1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5407, 9),
-                    listOf(1u) to Rational(9568, 27),
-                    listOf(2u) to Rational(4996, 27),
-                    listOf(3u) to Rational(352, 9),
-                    listOf(4u) to Rational(22, 3),
-                    listOf(0u, 1u) to Rational(104411, 126),
-                    listOf(1u, 1u) to Rational(6001, 126),
-                    listOf(2u, 1u) to Rational(-796, 21),
-                    listOf(3u, 1u) to Rational(-5389, 126),
-                    listOf(4u, 1u) to Rational(-166, 21),
-                    listOf(0u, 2u) to Rational(-35327, 126),
-                    listOf(1u, 2u) to Rational(53, 252),
-                    listOf(2u, 2u) to Rational(849197, 6048),
-                    listOf(3u, 2u) to Rational(22361, 252),
-                    listOf(4u, 2u) to Rational(773, 42),
-                    listOf(0u, 3u) to Rational(-6067, 21),
-                    listOf(1u, 3u) to Rational(39049, 126),
-                    listOf(2u, 3u) to Rational(80303, 1008),
-                    listOf(3u, 3u) to Rational(-3035, 63),
-                    listOf(4u, 3u) to Rational(-209, 21),
-                    listOf(0u, 4u) to Rational(3113, 21),
-                    listOf(1u, 4u) to Rational(-22345, 126),
-                    listOf(2u, 4u) to Rational(-30931, 1008),
-                    listOf(3u, 4u) to Rational(5837, 126),
-                    listOf(4u, 4u) to Rational(229, 21),
-                    listOf(0u, 5u) to Rational(-2120, 21),
-                    listOf(1u, 5u) to Rational(451, 7),
-                    listOf(2u, 5u) to Rational(422, 21),
-                    listOf(3u, 5u) to Rational(-181, 21),
-                    listOf(4u, 5u) to Rational(-40, 21),
-                    listOf(0u, 6u) to Rational(100, 3),
-                    listOf(1u, 6u) to Rational(-80, 3),
-                    listOf(2u, 6u) to Rational(-8, 1),
-                    listOf(3u, 6u) to Rational(16, 3),
-                    listOf(4u, 6u) to Rational(4, 3)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(18, 1),
-                    listOf(1u) to Rational(16, 3),
-                    listOf(2u) to Rational(12, 6),
-                    listOf(0u, 1u) to Rational(13, 1),
-                    listOf(1u, 1u) to Rational(-11, 4),
-                    listOf(2u, 1u) to Rational(-1, 1),
-                    listOf(0u, 2u) to Rational(-10, 1),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(2, 1),
-                ),
-            )),
-            "test 5"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-409, 6),
-                    listOf(1u) to Rational(-376, 9),
-                    listOf(2u) to Rational(-1781, 81),
-                    listOf(3u) to Rational(-128, 27),
-                    listOf(4u) to Rational(-8, 9),
-                    listOf(0u, 1u) to Rational(18701, 210),
-                    listOf(1u, 1u) to Rational(614183, 7560),
-                    listOf(2u, 1u) to Rational(90941, 1890),
-                    listOf(3u, 1u) to Rational(1802, 135),
-                    listOf(4u, 1u) to Rational(112, 45),
-                    listOf(0u, 2u) to Rational(181421, 315),
-                    listOf(1u, 2u) to Rational(77813, 378),
-                    listOf(2u, 2u) to Rational(598583, 7560),
-                    listOf(3u, 2u) to Rational(85, 27),
-                    listOf(4u, 2u) to Rational(2, 5),
-                    listOf(0u, 3u) to Rational(130997, 315),
-                    listOf(1u, 3u) to Rational(1093, 420),
-                    listOf(2u, 3u) to Rational(9551, 2520),
-                    listOf(3u, 3u) to Rational(-14, 45),
-                    listOf(4u, 3u) to Rational(22, 45),
-                    listOf(0u, 4u) to Rational(-2801, 9),
-                    listOf(1u, 4u) to Rational(4033, 90),
-                    listOf(2u, 4u) to Rational(6429, 80),
-                    listOf(3u, 4u) to Rational(2851, 90),
-                    listOf(4u, 4u) to Rational(293, 45),
-                    listOf(0u, 5u) to Rational(-220, 1),
-                    listOf(1u, 5u) to Rational(127, 1),
-                    listOf(2u, 5u) to Rational(202, 5),
-                    listOf(3u, 5u) to Rational(-63, 5),
-                    listOf(4u, 5u) to Rational(-12, 5),
-                    listOf(0u, 6u) to Rational(100, 1),
-                    listOf(1u, 6u) to Rational(-80, 1),
-                    listOf(2u, 6u) to Rational(-24, 1),
-                    listOf(3u, 6u) to Rational(16, 1),
-                    listOf(4u, 6u) to Rational(4, 1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5407, 9),
-                    listOf(1u) to Rational(9568, 27),
-                    listOf(2u) to Rational(4996, 27),
-                    listOf(3u) to Rational(352, 9),
-                    listOf(4u) to Rational(22, 3),
-                    listOf(0u, 1u) to Rational(104411, 126),
-                    listOf(1u, 1u) to Rational(6001, 126),
-                    listOf(2u, 1u) to Rational(-796, 21),
-                    listOf(3u, 1u) to Rational(-5389, 126),
-                    listOf(4u, 1u) to Rational(-166, 21),
-                    listOf(0u, 2u) to Rational(-35327, 126),
-                    listOf(1u, 2u) to Rational(53, 252),
-                    listOf(2u, 2u) to Rational(849197, 6048),
-                    listOf(3u, 2u) to Rational(22361, 252),
-                    listOf(4u, 2u) to Rational(773, 42),
-                    listOf(0u, 3u) to Rational(-6067, 21),
-                    listOf(1u, 3u) to Rational(39049, 126),
-                    listOf(2u, 3u) to Rational(80303, 1008),
-                    listOf(3u, 3u) to Rational(-3035, 63),
-                    listOf(4u, 3u) to Rational(-209, 21),
-                    listOf(0u, 4u) to Rational(3113, 21),
-                    listOf(1u, 4u) to Rational(-22345, 126),
-                    listOf(2u, 4u) to Rational(-30931, 1008),
-                    listOf(3u, 4u) to Rational(5837, 126),
-                    listOf(4u, 4u) to Rational(229, 21),
-                    listOf(0u, 5u) to Rational(-2120, 21),
-                    listOf(1u, 5u) to Rational(451, 7),
-                    listOf(2u, 5u) to Rational(422, 21),
-                    listOf(3u, 5u) to Rational(-181, 21),
-                    listOf(4u, 5u) to Rational(-40, 21),
-                    listOf(0u, 6u) to Rational(100, 3),
-                    listOf(1u, 6u) to Rational(-80, 3),
-                    listOf(2u, 6u) to Rational(-8, 1),
-                    listOf(3u, 6u) to Rational(16, 3),
-                    listOf(4u, 6u) to Rational(4, 3)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(18, 1),
-                    listOf(1u) to Rational(16, 3),
-                    listOf(2u) to Rational(12, 6),
-                    listOf(0u, 1u) to Rational(13, 1),
-                    listOf(1u, 1u) to Rational(-11, 4),
-                    listOf(2u, 1u) to Rational(-1, 1),
-                    listOf(0u, 2u) to Rational(-10, 1),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(2, 1),
-                ),
-                5 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-6, 1),
-                    listOf(1u) to Rational(-9, 8),
-                    listOf(2u) to Rational(17, 5),
-                    listOf(0u, 1u) to Rational(-2, 3),
-                    listOf(1u, 1u) to Rational(1, 5),
-                    listOf(2u, 1u) to Rational(-11, 7),
-                    listOf(0u, 2u) to Rational(13, 6),
-                    listOf(1u, 2u) to Rational(-15, 2),
-                    listOf(2u, 2u) to Rational(-14, 4),
-                )
-            )),
-            "test 5'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf<Int, NumberedPolynomial<Rational>>()),
-            "test 6"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, mapOf(
-                5 to NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-6, 1),
-                    listOf(1u) to Rational(-9, 8),
-                    listOf(2u) to Rational(17, 5),
-                    listOf(0u, 1u) to Rational(-2, 3),
-                    listOf(1u, 1u) to Rational(1, 5),
-                    listOf(2u, 1u) to Rational(-11, 7),
-                    listOf(0u, 2u) to Rational(13, 6),
-                    listOf(1u, 2u) to Rational(-15, 2),
-                    listOf(2u, 2u) to Rational(-14, 4),
-                )
-            )),
-            "test 6'"
-        )
-    }
-    @Test
-    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
-            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
-    fun test_RationalFunction_substitute_RationalFunction_Map() {
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1),
-                    listOf(1u) to Rational(-2),
-                    listOf(2u) to Rational(1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                ),
-            ).substitute(RationalField, mapOf(
-                0 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(1)
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(1)
-                    )
-                )
-            )),
-            "test 1"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf(4u) to Rational(-17166109, 793800),
-                    listOf(3u, 1u) to Rational(-930960143, 5556600),
-                    listOf(2u, 2u) to Rational(-144665109691, 350065800),
-                    listOf(1u, 3u) to Rational(-17232577, 52920),
-                    listOf(0u, 4u) to Rational(-68141, 1323),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf(4u) to Rational(-57522533, 14288400),
-                    listOf(3u, 1u) to Rational(-13085162953, 300056400),
-                    listOf(2u, 2u) to Rational(-92093367341, 525098700),
-                    listOf(1u, 3u) to Rational(-1979342797, 6667920),
-                    listOf(0u, 4u) to Rational(-3082727, 21168),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(11, 5),
-                        listOf(0u, 1u) to Rational(8, 4),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(1, 9),
-                        listOf(0u, 1u) to Rational(11, 7),
-                    )
-                ),
-                1 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(-2, 7),
-                        listOf(0u, 1u) to Rational(-4, 3),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(3, 6),
-                        listOf(0u, 1u) to Rational(12, 8),
-                    )
-                ),
-            )),
-            "test 2"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-130778291, 76800),
-                    listOf(1u) to Rational(-445270919, 230400),
-                    listOf(2u) to Rational(44578444937, 14515200),
-                    listOf(3u) to Rational(17329402153, 1555200),
-                    listOf(4u) to Rational(89239926809, 2332800),
-                    listOf(5u) to Rational(2808812267, 145152),
-                    listOf(6u) to Rational(-21362661007, 725760),
-                    listOf(7u) to Rational(-258455443, 2016),
-                    listOf(8u) to Rational(-21454693, 96),
-                    listOf(0u, 1u) to Rational(-1002137, 15360),
-                    listOf(1u, 1u) to Rational(-1704849697, 430080),
-                    listOf(2u, 1u) to Rational(-57657676789, 4838400),
-                    listOf(3u, 1u) to Rational(-101331731, 89600),
-                    listOf(4u, 1u) to Rational(5362280079329, 130636800),
-                    listOf(5u, 1u) to Rational(4069896167053, 130636800),
-                    listOf(6u, 1u) to Rational(12011514569, 544320),
-                    listOf(7u, 1u) to Rational(138293195623, 725760),
-                    listOf(8u, 1u) to Rational(6228779419, 48384),
-                    listOf(0u, 2u) to Rational(-32395872823, 8064000),
-                    listOf(1u, 2u) to Rational(-7398505523, 2304000),
-                    listOf(2u, 2u) to Rational(95217051699521, 3048192000),
-                    listOf(3u, 2u) to Rational(198026968812079, 3657830400),
-                    listOf(4u, 2u) to Rational(4291645618499, 228614400),
-                    listOf(5u, 2u) to Rational(-33211690942439, 914457600),
-                    listOf(6u, 2u) to Rational(-637385538163153, 1371686400),
-                    listOf(7u, 2u) to Rational(-138671528276273, 182891520),
-                    listOf(8u, 2u) to Rational(-14566368751, 217728),
-                    listOf(0u, 3u) to Rational(-10538718719, 2016000),
-                    listOf(1u, 3u) to Rational(-1844485375199, 84672000),
-                    listOf(2u, 3u) to Rational(103968665891, 12096000),
-                    listOf(3u, 3u) to Rational(175402107278351, 1828915200),
-                    listOf(4u, 3u) to Rational(8020699588879, 114307200),
-                    listOf(5u, 3u) to Rational(3414841894991, 38102400),
-                    listOf(6u, 3u) to Rational(1848405591611, 4665600),
-                    listOf(7u, 3u) to Rational(39486708738989, 137168640),
-                    listOf(8u, 3u) to Rational(255926289517, 9144576),
-                    listOf(0u, 4u) to Rational(-655379564629, 105840000),
-                    listOf(1u, 4u) to Rational(-208336039441, 127008000),
-                    listOf(2u, 4u) to Rational(40173146771411, 1143072000),
-                    listOf(3u, 4u) to Rational(150473493581239, 2667168000),
-                    listOf(4u, 4u) to Rational(38833783990483, 1143072000),
-                    listOf(5u, 4u) to Rational(-1963676248203053, 4800902400),
-                    listOf(6u, 4u) to Rational(-2598759412825747, 3200601600),
-                    listOf(7u, 4u) to Rational(-192895352019667, 1280240640),
-                    listOf(8u, 4u) to Rational(3737382679, 6858432),
-                    listOf(0u, 5u) to Rational(-16959378721, 1890000),
-                    listOf(1u, 5u) to Rational(-1864802244743, 79380000),
-                    listOf(2u, 5u) to Rational(13449261536489, 666792000),
-                    listOf(3u, 5u) to Rational(215272234137329, 2667168000),
-                    listOf(4u, 5u) to Rational(6040691379277, 83349000),
-                    listOf(5u, 5u) to Rational(153687143525887, 800150400),
-                    listOf(6u, 5u) to Rational(475602854903563, 2400451200),
-                    listOf(7u, 5u) to Rational(27315599358749, 640120320),
-                    listOf(8u, 5u) to Rational(-2630413357, 10668672),
-                    listOf(0u, 6u) to Rational(-6654999511, 2646000),
-                    listOf(1u, 6u) to Rational(-67885252327, 15876000),
-                    listOf(2u, 6u) to Rational(5786776220983, 2667168000),
-                    listOf(3u, 6u) to Rational(60615922629083, 1143072000),
-                    listOf(4u, 6u) to Rational(-34703539637627407, 672126336000),
-                    listOf(5u, 6u) to Rational(-744694192134101, 2240421120),
-                    listOf(6u, 6u) to Rational(-1782470617231, 14817600),
-                    listOf(7u, 6u) to Rational(59123208433, 8890560),
-                    listOf(8u, 6u) to Rational(-141653, 5292),
-                    listOf(0u, 7u) to Rational(-338051969, 441000),
-                    listOf(1u, 7u) to Rational(468850013, 1764000),
-                    listOf(2u, 7u) to Rational(2102343426101, 222264000),
-                    listOf(3u, 7u) to Rational(7836130602007, 1333584000),
-                    listOf(4u, 7u) to Rational(16239111865997, 746807040),
-                    listOf(5u, 7u) to Rational(3824649185383, 88905600),
-                    listOf(6u, 7u) to Rational(56058614459, 3457440),
-                    listOf(7u, 7u) to Rational(-396766339, 493920),
-                    listOf(8u, 7u) to Rational(-165147, 2744),
-                    listOf(0u, 8u) to Rational(-3088619, 58800),
-                    listOf(1u, 8u) to Rational(155343347, 88200),
-                    listOf(2u, 8u) to Rational(100098736469, 7408800),
-                    listOf(3u, 8u) to Rational(109725511381, 7408800),
-                    listOf(4u, 8u) to Rational(-2431199641013, 59270400),
-                    listOf(5u, 8u) to Rational(-102872383249, 3457440),
-                    listOf(6u, 8u) to Rational(1449461309, 576240),
-                    listOf(7u, 8u) to Rational(812775, 1372),
-                    listOf(8u, 8u) to Rational(-16461, 343)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(164202773, 230400),
-                    listOf(1u) to Rational(-70345303, 518400),
-                    listOf(2u) to Rational(-4229702731, 4665600),
-                    listOf(3u) to Rational(3262171027, 6998400),
-                    listOf(4u) to Rational(-25423104169, 13996800),
-                    listOf(5u) to Rational(64061869, 349920),
-                    listOf(6u) to Rational(-1655878091, 116640),
-                    listOf(7u) to Rational(-7991441, 648),
-                    listOf(8u) to Rational(-502591, 18),
-                    listOf(0u, 1u) to Rational(-8780429, 3840),
-                    listOf(1u, 1u) to Rational(434272361, 115200),
-                    listOf(2u, 1u) to Rational(429825727, 41472),
-                    listOf(3u, 1u) to Rational(-10066790339, 6998400),
-                    listOf(4u, 1u) to Rational(70022035471, 20995200),
-                    listOf(5u, 1u) to Rational(-32070283493, 1399680),
-                    listOf(6u, 1u) to Rational(-22051101001, 1399680),
-                    listOf(7u, 1u) to Rational(-126493427, 12960),
-                    listOf(8u, 1u) to Rational(3050245, 864),
-                    listOf(0u, 2u) to Rational(-1194654631, 345600),
-                    listOf(1u, 2u) to Rational(-542961452671, 31104000),
-                    listOf(2u, 2u) to Rational(-234000873607, 48988800),
-                    listOf(3u, 2u) to Rational(140520538087, 3628800),
-                    listOf(4u, 2u) to Rational(9215088876563, 130636800),
-                    listOf(5u, 2u) to Rational(27590569647253, 293932800),
-                    listOf(6u, 2u) to Rational(5129057792891, 97977600),
-                    listOf(7u, 2u) to Rational(-106334191, 5103),
-                    listOf(8u, 2u) to Rational(-1024113911, 435456),
-                    listOf(0u, 3u) to Rational(76223843, 6000),
-                    listOf(1u, 3u) to Rational(57425857357, 2592000),
-                    listOf(2u, 3u) to Rational(-2044736497573, 46656000),
-                    listOf(3u, 3u) to Rational(-26155810120031, 293932800),
-                    listOf(4u, 3u) to Rational(-1064419459813, 6998400),
-                    listOf(5u, 3u) to Rational(-753782018389, 4082400),
-                    listOf(6u, 3u) to Rational(-291973360873, 2799360),
-                    listOf(7u, 3u) to Rational(-46372122599, 816480),
-                    listOf(8u, 3u) to Rational(3579859657, 653184),
-                    listOf(0u, 4u) to Rational(-13374241901, 4320000),
-                    listOf(1u, 4u) to Rational(306606499811, 54432000),
-                    listOf(2u, 4u) to Rational(964267124745437, 13716864000),
-                    listOf(3u, 4u) to Rational(21603809415373, 182891520),
-                    listOf(4u, 4u) to Rational(1097860214654027, 6858432000),
-                    listOf(5u, 4u) to Rational(161615254570669, 914457600),
-                    listOf(6u, 4u) to Rational(758415239461, 22861440),
-                    listOf(7u, 4u) to Rational(2585568355471, 274337280),
-                    listOf(8u, 4u) to Rational(-70433747863, 9144576),
-                    listOf(0u, 5u) to Rational(-9582586217, 2520000),
-                    listOf(1u, 5u) to Rational(-19093471394171, 635040000),
-                    listOf(2u, 5u) to Rational(-13010261944411, 381024000),
-                    listOf(3u, 5u) to Rational(-259039825301861, 4572288000),
-                    listOf(4u, 5u) to Rational(-305081119071079, 2286144000),
-                    listOf(5u, 5u) to Rational(-1923114383311, 19595520),
-                    listOf(6u, 5u) to Rational(-14181787253231, 228614400),
-                    listOf(7u, 5u) to Rational(-3959584789, 4354560),
-                    listOf(8u, 5u) to Rational(4691742523, 762048),
-                    listOf(0u, 6u) to Rational(-588323437, 180000),
-                    listOf(1u, 6u) to Rational(5952234691, 52920000),
-                    listOf(2u, 6u) to Rational(21001851056959, 1088640000),
-                    listOf(3u, 6u) to Rational(84668034357563, 2133734400),
-                    listOf(4u, 6u) to Rational(2029754605811557, 25604812800),
-                    listOf(5u, 6u) to Rational(11721216739823, 426746880),
-                    listOf(6u, 6u) to Rational(-8275903187003, 2133734400),
-                    listOf(7u, 6u) to Rational(-4730447299, 2540160),
-                    listOf(8u, 6u) to Rational(-46069985, 21168),
-                    listOf(0u, 7u) to Rational(-75711301, 117600),
-                    listOf(1u, 7u) to Rational(32430417413, 7056000),
-                    listOf(2u, 7u) to Rational(677988533153, 98784000),
-                    listOf(3u, 7u) to Rational(-948417645827, 71124480),
-                    listOf(4u, 7u) to Rational(-11320265215207, 711244800),
-                    listOf(5u, 7u) to Rational(-676438627783, 50803200),
-                    listOf(6u, 7u) to Rational(-7382274253, 1975680),
-                    listOf(7u, 7u) to Rational(6505733, 2205),
-                    listOf(8u, 7u) to Rational(450137, 882),
-                    listOf(0u, 8u) to Rational(-8368253, 78400),
-                    listOf(1u, 8u) to Rational(6833783, 117600),
-                    listOf(2u, 8u) to Rational(4528971133, 5927040),
-                    listOf(3u, 8u) to Rational(146252636617, 29635200),
-                    listOf(4u, 8u) to Rational(8321882556889, 1659571200),
-                    listOf(5u, 8u) to Rational(-4686033011, 1975680),
-                    listOf(6u, 8u) to Rational(-1074445963, 987840),
-                    listOf(7u, 8u) to Rational(-142313, 588),
-                    listOf(8u, 8u) to Rational(-4281, 49)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-17, 5),
-                        listOf(1u) to Rational(2, 6),
-                        listOf(2u) to Rational(14, 1),
-                        listOf(0u, 1u) to Rational(-6, 6),
-                        listOf(1u, 1u) to Rational(-7, 3),
-                        listOf(2u, 1u) to Rational(-2, 9),
-                        listOf(0u, 2u) to Rational(-9, 6),
-                        listOf(1u, 2u) to Rational(17, 4),
-                        listOf(2u, 2u) to Rational(2, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(5, 4),
-                        listOf(1u) to Rational(-5, 9),
-                        listOf(2u) to Rational(-3, 6),
-                        listOf(0u, 1u) to Rational(6, 5),
-                        listOf(1u, 1u) to Rational(14, 5),
-                        listOf(2u, 1u) to Rational(5, 2),
-                        listOf(0u, 2u) to Rational(-18, 7),
-                        listOf(1u, 2u) to Rational(-8, 2),
-                        listOf(2u, 2u) to Rational(18, 9),
-                    )
-                ),
-                1 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(14, 4),
-                        listOf(1u) to Rational(7, 6),
-                        listOf(2u) to Rational(7, 2),
-                        listOf(0u, 1u) to Rational(-15, 2),
-                        listOf(1u, 1u) to Rational(-13, 8),
-                        listOf(2u, 1u) to Rational(-14, 3),
-                        listOf(0u, 2u) to Rational(-7, 6),
-                        listOf(1u, 2u) to Rational(7, 4),
-                        listOf(2u, 2u) to Rational(9, 7),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-7, 4),
-                        listOf(1u) to Rational(-6, 3),
-                        listOf(2u) to Rational(-16, 2),
-                        listOf(0u, 1u) to Rational(-15, 5),
-                        listOf(1u, 1u) to Rational(4, 6),
-                        listOf(2u, 1u) to Rational(5, 4),
-                        listOf(0u, 2u) to Rational(-12, 5),
-                        listOf(1u, 2u) to Rational(-18, 2),
-                        listOf(2u, 2u) to Rational(6, 7),
-                    )
-                ),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-130778291, 76800),
-                    listOf(1u) to Rational(-445270919, 230400),
-                    listOf(2u) to Rational(44578444937, 14515200),
-                    listOf(3u) to Rational(17329402153, 1555200),
-                    listOf(4u) to Rational(89239926809, 2332800),
-                    listOf(5u) to Rational(2808812267, 145152),
-                    listOf(6u) to Rational(-21362661007, 725760),
-                    listOf(7u) to Rational(-258455443, 2016),
-                    listOf(8u) to Rational(-21454693, 96),
-                    listOf(0u, 1u) to Rational(-1002137, 15360),
-                    listOf(1u, 1u) to Rational(-1704849697, 430080),
-                    listOf(2u, 1u) to Rational(-57657676789, 4838400),
-                    listOf(3u, 1u) to Rational(-101331731, 89600),
-                    listOf(4u, 1u) to Rational(5362280079329, 130636800),
-                    listOf(5u, 1u) to Rational(4069896167053, 130636800),
-                    listOf(6u, 1u) to Rational(12011514569, 544320),
-                    listOf(7u, 1u) to Rational(138293195623, 725760),
-                    listOf(8u, 1u) to Rational(6228779419, 48384),
-                    listOf(0u, 2u) to Rational(-32395872823, 8064000),
-                    listOf(1u, 2u) to Rational(-7398505523, 2304000),
-                    listOf(2u, 2u) to Rational(95217051699521, 3048192000),
-                    listOf(3u, 2u) to Rational(198026968812079, 3657830400),
-                    listOf(4u, 2u) to Rational(4291645618499, 228614400),
-                    listOf(5u, 2u) to Rational(-33211690942439, 914457600),
-                    listOf(6u, 2u) to Rational(-637385538163153, 1371686400),
-                    listOf(7u, 2u) to Rational(-138671528276273, 182891520),
-                    listOf(8u, 2u) to Rational(-14566368751, 217728),
-                    listOf(0u, 3u) to Rational(-10538718719, 2016000),
-                    listOf(1u, 3u) to Rational(-1844485375199, 84672000),
-                    listOf(2u, 3u) to Rational(103968665891, 12096000),
-                    listOf(3u, 3u) to Rational(175402107278351, 1828915200),
-                    listOf(4u, 3u) to Rational(8020699588879, 114307200),
-                    listOf(5u, 3u) to Rational(3414841894991, 38102400),
-                    listOf(6u, 3u) to Rational(1848405591611, 4665600),
-                    listOf(7u, 3u) to Rational(39486708738989, 137168640),
-                    listOf(8u, 3u) to Rational(255926289517, 9144576),
-                    listOf(0u, 4u) to Rational(-655379564629, 105840000),
-                    listOf(1u, 4u) to Rational(-208336039441, 127008000),
-                    listOf(2u, 4u) to Rational(40173146771411, 1143072000),
-                    listOf(3u, 4u) to Rational(150473493581239, 2667168000),
-                    listOf(4u, 4u) to Rational(38833783990483, 1143072000),
-                    listOf(5u, 4u) to Rational(-1963676248203053, 4800902400),
-                    listOf(6u, 4u) to Rational(-2598759412825747, 3200601600),
-                    listOf(7u, 4u) to Rational(-192895352019667, 1280240640),
-                    listOf(8u, 4u) to Rational(3737382679, 6858432),
-                    listOf(0u, 5u) to Rational(-16959378721, 1890000),
-                    listOf(1u, 5u) to Rational(-1864802244743, 79380000),
-                    listOf(2u, 5u) to Rational(13449261536489, 666792000),
-                    listOf(3u, 5u) to Rational(215272234137329, 2667168000),
-                    listOf(4u, 5u) to Rational(6040691379277, 83349000),
-                    listOf(5u, 5u) to Rational(153687143525887, 800150400),
-                    listOf(6u, 5u) to Rational(475602854903563, 2400451200),
-                    listOf(7u, 5u) to Rational(27315599358749, 640120320),
-                    listOf(8u, 5u) to Rational(-2630413357, 10668672),
-                    listOf(0u, 6u) to Rational(-6654999511, 2646000),
-                    listOf(1u, 6u) to Rational(-67885252327, 15876000),
-                    listOf(2u, 6u) to Rational(5786776220983, 2667168000),
-                    listOf(3u, 6u) to Rational(60615922629083, 1143072000),
-                    listOf(4u, 6u) to Rational(-34703539637627407, 672126336000),
-                    listOf(5u, 6u) to Rational(-744694192134101, 2240421120),
-                    listOf(6u, 6u) to Rational(-1782470617231, 14817600),
-                    listOf(7u, 6u) to Rational(59123208433, 8890560),
-                    listOf(8u, 6u) to Rational(-141653, 5292),
-                    listOf(0u, 7u) to Rational(-338051969, 441000),
-                    listOf(1u, 7u) to Rational(468850013, 1764000),
-                    listOf(2u, 7u) to Rational(2102343426101, 222264000),
-                    listOf(3u, 7u) to Rational(7836130602007, 1333584000),
-                    listOf(4u, 7u) to Rational(16239111865997, 746807040),
-                    listOf(5u, 7u) to Rational(3824649185383, 88905600),
-                    listOf(6u, 7u) to Rational(56058614459, 3457440),
-                    listOf(7u, 7u) to Rational(-396766339, 493920),
-                    listOf(8u, 7u) to Rational(-165147, 2744),
-                    listOf(0u, 8u) to Rational(-3088619, 58800),
-                    listOf(1u, 8u) to Rational(155343347, 88200),
-                    listOf(2u, 8u) to Rational(100098736469, 7408800),
-                    listOf(3u, 8u) to Rational(109725511381, 7408800),
-                    listOf(4u, 8u) to Rational(-2431199641013, 59270400),
-                    listOf(5u, 8u) to Rational(-102872383249, 3457440),
-                    listOf(6u, 8u) to Rational(1449461309, 576240),
-                    listOf(7u, 8u) to Rational(812775, 1372),
-                    listOf(8u, 8u) to Rational(-16461, 343)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(164202773, 230400),
-                    listOf(1u) to Rational(-70345303, 518400),
-                    listOf(2u) to Rational(-4229702731, 4665600),
-                    listOf(3u) to Rational(3262171027, 6998400),
-                    listOf(4u) to Rational(-25423104169, 13996800),
-                    listOf(5u) to Rational(64061869, 349920),
-                    listOf(6u) to Rational(-1655878091, 116640),
-                    listOf(7u) to Rational(-7991441, 648),
-                    listOf(8u) to Rational(-502591, 18),
-                    listOf(0u, 1u) to Rational(-8780429, 3840),
-                    listOf(1u, 1u) to Rational(434272361, 115200),
-                    listOf(2u, 1u) to Rational(429825727, 41472),
-                    listOf(3u, 1u) to Rational(-10066790339, 6998400),
-                    listOf(4u, 1u) to Rational(70022035471, 20995200),
-                    listOf(5u, 1u) to Rational(-32070283493, 1399680),
-                    listOf(6u, 1u) to Rational(-22051101001, 1399680),
-                    listOf(7u, 1u) to Rational(-126493427, 12960),
-                    listOf(8u, 1u) to Rational(3050245, 864),
-                    listOf(0u, 2u) to Rational(-1194654631, 345600),
-                    listOf(1u, 2u) to Rational(-542961452671, 31104000),
-                    listOf(2u, 2u) to Rational(-234000873607, 48988800),
-                    listOf(3u, 2u) to Rational(140520538087, 3628800),
-                    listOf(4u, 2u) to Rational(9215088876563, 130636800),
-                    listOf(5u, 2u) to Rational(27590569647253, 293932800),
-                    listOf(6u, 2u) to Rational(5129057792891, 97977600),
-                    listOf(7u, 2u) to Rational(-106334191, 5103),
-                    listOf(8u, 2u) to Rational(-1024113911, 435456),
-                    listOf(0u, 3u) to Rational(76223843, 6000),
-                    listOf(1u, 3u) to Rational(57425857357, 2592000),
-                    listOf(2u, 3u) to Rational(-2044736497573, 46656000),
-                    listOf(3u, 3u) to Rational(-26155810120031, 293932800),
-                    listOf(4u, 3u) to Rational(-1064419459813, 6998400),
-                    listOf(5u, 3u) to Rational(-753782018389, 4082400),
-                    listOf(6u, 3u) to Rational(-291973360873, 2799360),
-                    listOf(7u, 3u) to Rational(-46372122599, 816480),
-                    listOf(8u, 3u) to Rational(3579859657, 653184),
-                    listOf(0u, 4u) to Rational(-13374241901, 4320000),
-                    listOf(1u, 4u) to Rational(306606499811, 54432000),
-                    listOf(2u, 4u) to Rational(964267124745437, 13716864000),
-                    listOf(3u, 4u) to Rational(21603809415373, 182891520),
-                    listOf(4u, 4u) to Rational(1097860214654027, 6858432000),
-                    listOf(5u, 4u) to Rational(161615254570669, 914457600),
-                    listOf(6u, 4u) to Rational(758415239461, 22861440),
-                    listOf(7u, 4u) to Rational(2585568355471, 274337280),
-                    listOf(8u, 4u) to Rational(-70433747863, 9144576),
-                    listOf(0u, 5u) to Rational(-9582586217, 2520000),
-                    listOf(1u, 5u) to Rational(-19093471394171, 635040000),
-                    listOf(2u, 5u) to Rational(-13010261944411, 381024000),
-                    listOf(3u, 5u) to Rational(-259039825301861, 4572288000),
-                    listOf(4u, 5u) to Rational(-305081119071079, 2286144000),
-                    listOf(5u, 5u) to Rational(-1923114383311, 19595520),
-                    listOf(6u, 5u) to Rational(-14181787253231, 228614400),
-                    listOf(7u, 5u) to Rational(-3959584789, 4354560),
-                    listOf(8u, 5u) to Rational(4691742523, 762048),
-                    listOf(0u, 6u) to Rational(-588323437, 180000),
-                    listOf(1u, 6u) to Rational(5952234691, 52920000),
-                    listOf(2u, 6u) to Rational(21001851056959, 1088640000),
-                    listOf(3u, 6u) to Rational(84668034357563, 2133734400),
-                    listOf(4u, 6u) to Rational(2029754605811557, 25604812800),
-                    listOf(5u, 6u) to Rational(11721216739823, 426746880),
-                    listOf(6u, 6u) to Rational(-8275903187003, 2133734400),
-                    listOf(7u, 6u) to Rational(-4730447299, 2540160),
-                    listOf(8u, 6u) to Rational(-46069985, 21168),
-                    listOf(0u, 7u) to Rational(-75711301, 117600),
-                    listOf(1u, 7u) to Rational(32430417413, 7056000),
-                    listOf(2u, 7u) to Rational(677988533153, 98784000),
-                    listOf(3u, 7u) to Rational(-948417645827, 71124480),
-                    listOf(4u, 7u) to Rational(-11320265215207, 711244800),
-                    listOf(5u, 7u) to Rational(-676438627783, 50803200),
-                    listOf(6u, 7u) to Rational(-7382274253, 1975680),
-                    listOf(7u, 7u) to Rational(6505733, 2205),
-                    listOf(8u, 7u) to Rational(450137, 882),
-                    listOf(0u, 8u) to Rational(-8368253, 78400),
-                    listOf(1u, 8u) to Rational(6833783, 117600),
-                    listOf(2u, 8u) to Rational(4528971133, 5927040),
-                    listOf(3u, 8u) to Rational(146252636617, 29635200),
-                    listOf(4u, 8u) to Rational(8321882556889, 1659571200),
-                    listOf(5u, 8u) to Rational(-4686033011, 1975680),
-                    listOf(6u, 8u) to Rational(-1074445963, 987840),
-                    listOf(7u, 8u) to Rational(-142313, 588),
-                    listOf(8u, 8u) to Rational(-4281, 49)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-17, 5),
-                        listOf(1u) to Rational(2, 6),
-                        listOf(2u) to Rational(14, 1),
-                        listOf(0u, 1u) to Rational(-6, 6),
-                        listOf(1u, 1u) to Rational(-7, 3),
-                        listOf(2u, 1u) to Rational(-2, 9),
-                        listOf(0u, 2u) to Rational(-9, 6),
-                        listOf(1u, 2u) to Rational(17, 4),
-                        listOf(2u, 2u) to Rational(2, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(5, 4),
-                        listOf(1u) to Rational(-5, 9),
-                        listOf(2u) to Rational(-3, 6),
-                        listOf(0u, 1u) to Rational(6, 5),
-                        listOf(1u, 1u) to Rational(14, 5),
-                        listOf(2u, 1u) to Rational(5, 2),
-                        listOf(0u, 2u) to Rational(-18, 7),
-                        listOf(1u, 2u) to Rational(-8, 2),
-                        listOf(2u, 2u) to Rational(18, 9),
-                    )
-                ),
-                1 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(14, 4),
-                        listOf(1u) to Rational(7, 6),
-                        listOf(2u) to Rational(7, 2),
-                        listOf(0u, 1u) to Rational(-15, 2),
-                        listOf(1u, 1u) to Rational(-13, 8),
-                        listOf(2u, 1u) to Rational(-14, 3),
-                        listOf(0u, 2u) to Rational(-7, 6),
-                        listOf(1u, 2u) to Rational(7, 4),
-                        listOf(2u, 2u) to Rational(9, 7),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-7, 4),
-                        listOf(1u) to Rational(-6, 3),
-                        listOf(2u) to Rational(-16, 2),
-                        listOf(0u, 1u) to Rational(-15, 5),
-                        listOf(1u, 1u) to Rational(4, 6),
-                        listOf(2u, 1u) to Rational(5, 4),
-                        listOf(0u, 2u) to Rational(-12, 5),
-                        listOf(1u, 2u) to Rational(-18, 2),
-                        listOf(2u, 2u) to Rational(6, 7),
-                    )
-                ),
-                5 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(5, 8),
-                        listOf(1u) to Rational(-12, 6),
-                        listOf(2u) to Rational(7, 6),
-                        listOf(0u, 1u) to Rational(-10, 4),
-                        listOf(1u, 1u) to Rational(-7, 6),
-                        listOf(2u, 1u) to Rational(8, 9),
-                        listOf(0u, 2u) to Rational(16, 3),
-                        listOf(1u, 2u) to Rational(-13, 4),
-                        listOf(2u, 2u) to Rational(5, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(10, 6),
-                        listOf(1u) to Rational(-18, 6),
-                        listOf(2u) to Rational(5, 1),
-                        listOf(0u, 1u) to Rational(17, 7),
-                        listOf(1u, 1u) to Rational(8, 4),
-                        listOf(2u, 1u) to Rational(-4, 9),
-                        listOf(0u, 2u) to Rational(-6, 5),
-                        listOf(1u, 2u) to Rational(-15, 8),
-                        listOf(2u, 2u) to Rational(-18, 5),
-                    )
-                ),
-            )),
-            "test 3'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(2303, 64),
-                    listOf(1u) to Rational(31843, 192),
-                    listOf(2u) to Rational(118891, 576),
-                    listOf(3u) to Rational(94453, 168),
-                    listOf(4u) to Rational(-179203, 1512),
-                    listOf(5u) to Rational(-16979, 126),
-                    listOf(6u) to Rational(-13499, 12),
-                    listOf(0u, 1u) to Rational(-4767, 64),
-                    listOf(1u, 1u) to Rational(-58689, 256),
-                    listOf(2u, 1u) to Rational(-757333, 4032),
-                    listOf(3u, 1u) to Rational(-4921205, 4032),
-                    listOf(4u, 1u) to Rational(-2930815, 4032),
-                    listOf(5u, 1u) to Rational(-398803, 1512),
-                    listOf(6u, 1u) to Rational(18835, 36),
-                    listOf(0u, 2u) to Rational(224101, 960),
-                    listOf(1u, 2u) to Rational(9139699, 40320),
-                    listOf(2u, 2u) to Rational(3848803, 5760),
-                    listOf(3u, 2u) to Rational(93102371, 241920),
-                    listOf(4u, 2u) to Rational(-65821229, 141120),
-                    listOf(5u, 2u) to Rational(-15675899, 7056),
-                    listOf(6u, 2u) to Rational(10459, 189),
-                    listOf(0u, 3u) to Rational(2411, 16),
-                    listOf(1u, 3u) to Rational(1294543, 10080),
-                    listOf(2u, 3u) to Rational(-1740199, 1440),
-                    listOf(3u, 3u) to Rational(-266994841, 282240),
-                    listOf(4u, 3u) to Rational(-41261893, 211680),
-                    listOf(5u, 3u) to Rational(1717357, 3528),
-                    listOf(6u, 3u) to Rational(69, 14),
-                    listOf(0u, 4u) to Rational(13231, 360),
-                    listOf(1u, 4u) to Rational(4858831, 25200),
-                    listOf(2u, 4u) to Rational(15565759, 75600),
-                    listOf(3u, 4u) to Rational(-15583391, 35280),
-                    listOf(4u, 4u) to Rational(-13345747, 11760),
-                    listOf(5u, 4u) to Rational(140103, 686),
-                    listOf(6u, 4u) to Rational(-765, 49)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(31409, 576),
-                    listOf(1u) to Rational(-337099, 1728),
-                    listOf(2u) to Rational(-211429, 1728),
-                    listOf(3u) to Rational(-259241, 432),
-                    listOf(4u) to Rational(-13777, 36),
-                    listOf(5u) to Rational(-41389, 72),
-                    listOf(6u) to Rational(-7679, 48),
-                    listOf(0u, 1u) to Rational(-3269, 12),
-                    listOf(1u, 1u) to Rational(629569, 864),
-                    listOf(2u, 1u) to Rational(53867, 324),
-                    listOf(3u, 1u) to Rational(2290577, 1728),
-                    listOf(4u, 1u) to Rational(101507, 216),
-                    listOf(5u, 1u) to Rational(213109, 288),
-                    listOf(6u, 1u) to Rational(17927, 144),
-                    listOf(0u, 2u) to Rational(314587, 1080),
-                    listOf(1u, 2u) to Rational(-109771, 144),
-                    listOf(2u, 2u) to Rational(-6469, 16),
-                    listOf(3u, 2u) to Rational(-298291681, 181440),
-                    listOf(4u, 2u) to Rational(-59147357, 48384),
-                    listOf(5u, 2u) to Rational(-4982365, 6048),
-                    listOf(6u, 2u) to Rational(-18727, 576),
-                    listOf(0u, 3u) to Rational(12379, 90),
-                    listOf(1u, 3u) to Rational(-542911, 1620),
-                    listOf(2u, 3u) to Rational(143123, 1260),
-                    listOf(3u, 3u) to Rational(9859177, 30240),
-                    listOf(4u, 3u) to Rational(9312529, 20160),
-                    listOf(5u, 3u) to Rational(207001, 672),
-                    listOf(6u, 3u) to Rational(203, 24),
-                    listOf(0u, 4u) to Rational(9442, 675),
-                    listOf(1u, 4u) to Rational(-13729, 300),
-                    listOf(2u, 4u) to Rational(-3490471, 25200),
-                    listOf(3u, 4u) to Rational(-333031, 840),
-                    listOf(4u, 4u) to Rational(-7572211, 47040),
-                    listOf(5u, 4u) to Rational(-1189, 56),
-                    listOf(6u, 4u) to Rational(-405, 196)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                1 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(14, 4),
-                        listOf(1u) to Rational(7, 6),
-                        listOf(2u) to Rational(7, 2),
-                        listOf(0u, 1u) to Rational(-15, 2),
-                        listOf(1u, 1u) to Rational(-13, 8),
-                        listOf(2u, 1u) to Rational(-14, 3),
-                        listOf(0u, 2u) to Rational(-7, 6),
-                        listOf(1u, 2u) to Rational(7, 4),
-                        listOf(2u, 2u) to Rational(9, 7),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-7, 4),
-                        listOf(1u) to Rational(-6, 3),
-                        listOf(2u) to Rational(-16, 2),
-                        listOf(0u, 1u) to Rational(-15, 5),
-                        listOf(1u, 1u) to Rational(4, 6),
-                        listOf(2u, 1u) to Rational(5, 4),
-                        listOf(0u, 2u) to Rational(-12, 5),
-                        listOf(1u, 2u) to Rational(-18, 2),
-                        listOf(2u, 2u) to Rational(6, 7),
-                    )
-                ),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(2303, 64),
-                    listOf(1u) to Rational(31843, 192),
-                    listOf(2u) to Rational(118891, 576),
-                    listOf(3u) to Rational(94453, 168),
-                    listOf(4u) to Rational(-179203, 1512),
-                    listOf(5u) to Rational(-16979, 126),
-                    listOf(6u) to Rational(-13499, 12),
-                    listOf(0u, 1u) to Rational(-4767, 64),
-                    listOf(1u, 1u) to Rational(-58689, 256),
-                    listOf(2u, 1u) to Rational(-757333, 4032),
-                    listOf(3u, 1u) to Rational(-4921205, 4032),
-                    listOf(4u, 1u) to Rational(-2930815, 4032),
-                    listOf(5u, 1u) to Rational(-398803, 1512),
-                    listOf(6u, 1u) to Rational(18835, 36),
-                    listOf(0u, 2u) to Rational(224101, 960),
-                    listOf(1u, 2u) to Rational(9139699, 40320),
-                    listOf(2u, 2u) to Rational(3848803, 5760),
-                    listOf(3u, 2u) to Rational(93102371, 241920),
-                    listOf(4u, 2u) to Rational(-65821229, 141120),
-                    listOf(5u, 2u) to Rational(-15675899, 7056),
-                    listOf(6u, 2u) to Rational(10459, 189),
-                    listOf(0u, 3u) to Rational(2411, 16),
-                    listOf(1u, 3u) to Rational(1294543, 10080),
-                    listOf(2u, 3u) to Rational(-1740199, 1440),
-                    listOf(3u, 3u) to Rational(-266994841, 282240),
-                    listOf(4u, 3u) to Rational(-41261893, 211680),
-                    listOf(5u, 3u) to Rational(1717357, 3528),
-                    listOf(6u, 3u) to Rational(69, 14),
-                    listOf(0u, 4u) to Rational(13231, 360),
-                    listOf(1u, 4u) to Rational(4858831, 25200),
-                    listOf(2u, 4u) to Rational(15565759, 75600),
-                    listOf(3u, 4u) to Rational(-15583391, 35280),
-                    listOf(4u, 4u) to Rational(-13345747, 11760),
-                    listOf(5u, 4u) to Rational(140103, 686),
-                    listOf(6u, 4u) to Rational(-765, 49)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(31409, 576),
-                    listOf(1u) to Rational(-337099, 1728),
-                    listOf(2u) to Rational(-211429, 1728),
-                    listOf(3u) to Rational(-259241, 432),
-                    listOf(4u) to Rational(-13777, 36),
-                    listOf(5u) to Rational(-41389, 72),
-                    listOf(6u) to Rational(-7679, 48),
-                    listOf(0u, 1u) to Rational(-3269, 12),
-                    listOf(1u, 1u) to Rational(629569, 864),
-                    listOf(2u, 1u) to Rational(53867, 324),
-                    listOf(3u, 1u) to Rational(2290577, 1728),
-                    listOf(4u, 1u) to Rational(101507, 216),
-                    listOf(5u, 1u) to Rational(213109, 288),
-                    listOf(6u, 1u) to Rational(17927, 144),
-                    listOf(0u, 2u) to Rational(314587, 1080),
-                    listOf(1u, 2u) to Rational(-109771, 144),
-                    listOf(2u, 2u) to Rational(-6469, 16),
-                    listOf(3u, 2u) to Rational(-298291681, 181440),
-                    listOf(4u, 2u) to Rational(-59147357, 48384),
-                    listOf(5u, 2u) to Rational(-4982365, 6048),
-                    listOf(6u, 2u) to Rational(-18727, 576),
-                    listOf(0u, 3u) to Rational(12379, 90),
-                    listOf(1u, 3u) to Rational(-542911, 1620),
-                    listOf(2u, 3u) to Rational(143123, 1260),
-                    listOf(3u, 3u) to Rational(9859177, 30240),
-                    listOf(4u, 3u) to Rational(9312529, 20160),
-                    listOf(5u, 3u) to Rational(207001, 672),
-                    listOf(6u, 3u) to Rational(203, 24),
-                    listOf(0u, 4u) to Rational(9442, 675),
-                    listOf(1u, 4u) to Rational(-13729, 300),
-                    listOf(2u, 4u) to Rational(-3490471, 25200),
-                    listOf(3u, 4u) to Rational(-333031, 840),
-                    listOf(4u, 4u) to Rational(-7572211, 47040),
-                    listOf(5u, 4u) to Rational(-1189, 56),
-                    listOf(6u, 4u) to Rational(-405, 196)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                1 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(14, 4),
-                        listOf(1u) to Rational(7, 6),
-                        listOf(2u) to Rational(7, 2),
-                        listOf(0u, 1u) to Rational(-15, 2),
-                        listOf(1u, 1u) to Rational(-13, 8),
-                        listOf(2u, 1u) to Rational(-14, 3),
-                        listOf(0u, 2u) to Rational(-7, 6),
-                        listOf(1u, 2u) to Rational(7, 4),
-                        listOf(2u, 2u) to Rational(9, 7),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-7, 4),
-                        listOf(1u) to Rational(-6, 3),
-                        listOf(2u) to Rational(-16, 2),
-                        listOf(0u, 1u) to Rational(-15, 5),
-                        listOf(1u, 1u) to Rational(4, 6),
-                        listOf(2u, 1u) to Rational(5, 4),
-                        listOf(0u, 2u) to Rational(-12, 5),
-                        listOf(1u, 2u) to Rational(-18, 2),
-                        listOf(2u, 2u) to Rational(6, 7),
-                    )
-                ),
-                5 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(5, 8),
-                        listOf(1u) to Rational(-12, 6),
-                        listOf(2u) to Rational(7, 6),
-                        listOf(0u, 1u) to Rational(-10, 4),
-                        listOf(1u, 1u) to Rational(-7, 6),
-                        listOf(2u, 1u) to Rational(8, 9),
-                        listOf(0u, 2u) to Rational(16, 3),
-                        listOf(1u, 2u) to Rational(-13, 4),
-                        listOf(2u, 2u) to Rational(5, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(10, 6),
-                        listOf(1u) to Rational(-18, 6),
-                        listOf(2u) to Rational(5, 1),
-                        listOf(0u, 1u) to Rational(17, 7),
-                        listOf(1u, 1u) to Rational(8, 4),
-                        listOf(2u, 1u) to Rational(-4, 9),
-                        listOf(0u, 2u) to Rational(-6, 5),
-                        listOf(1u, 2u) to Rational(-15, 8),
-                        listOf(2u, 2u) to Rational(-18, 5),
-                    )
-                ),
-            )),
-            "test 4'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-506213, 2800),
-                    listOf(1u) to Rational(9859, 315),
-                    listOf(2u) to Rational(17384377, 11340),
-                    listOf(3u) to Rational(-9662, 63),
-                    listOf(4u) to Rational(-12563, 4),
-                    listOf(0u, 1u) to Rational(-486293, 22400),
-                    listOf(1u, 1u) to Rational(-6530947, 25200),
-                    listOf(2u, 1u) to Rational(866125, 18144),
-                    listOf(3u, 1u) to Rational(2948747, 2520),
-                    listOf(4u, 1u) to Rational(1196611, 2016),
-                    listOf(0u, 2u) to Rational(-20266021, 117600),
-                    listOf(1u, 2u) to Rational(26656339, 44100),
-                    listOf(2u, 2u) to Rational(19499183, 18144),
-                    listOf(3u, 2u) to Rational(-19801849, 7560),
-                    listOf(4u, 2u) to Rational(-2639635, 1296),
-                    listOf(0u, 3u) to Rational(-5017697, 29400),
-                    listOf(1u, 3u) to Rational(-606007, 1575),
-                    listOf(2u, 3u) to Rational(127494487, 132300),
-                    listOf(3u, 3u) to Rational(166567, 105),
-                    listOf(4u, 3u) to Rational(486403, 18144),
-                    listOf(0u, 4u) to Rational(-32182, 735),
-                    listOf(1u, 4u) to Rational(2420671, 8820),
-                    listOf(2u, 4u) to Rational(-12619193, 26460),
-                    listOf(3u, 4u) to Rational(-6823067, 5670),
-                    listOf(4u, 4u) to Rational(-2311693, 13608),
-                    listOf(0u, 5u) to Rational(-13324, 245),
-                    listOf(1u, 5u) to Rational(1966, 35),
-                    listOf(2u, 5u) to Rational(1052719, 2520),
-                    listOf(3u, 5u) to Rational(19153, 270),
-                    listOf(4u, 5u) to Rational(701, 54),
-                    listOf(0u, 6u) to Rational(4647, 196),
-                    listOf(1u, 6u) to Rational(2197, 28),
-                    listOf(2u, 6u) to Rational(-43853, 336),
-                    listOf(3u, 6u) to Rational(-301, 3),
-                    listOf(4u, 6u) to Rational(34, 3)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-2843, 1600),
-                    listOf(1u) to Rational(-1483, 240),
-                    listOf(2u) to Rational(110623, 1296),
-                    listOf(3u) to Rational(1265, 72),
-                    listOf(4u) to Rational(-5011, 16),
-                    listOf(0u, 1u) to Rational(47743, 1800),
-                    listOf(1u, 1u) to Rational(619229, 32400),
-                    listOf(2u, 1u) to Rational(-5978369, 58320),
-                    listOf(3u, 1u) to Rational(-86081, 1620),
-                    listOf(4u, 1u) to Rational(6325, 72),
-                    listOf(0u, 2u) to Rational(110951, 3360),
-                    listOf(1u, 2u) to Rational(-9550649, 302400),
-                    listOf(2u, 2u) to Rational(6542933, 85050),
-                    listOf(3u, 2u) to Rational(4708291, 38880),
-                    listOf(4u, 2u) to Rational(-433327, 1296),
-                    listOf(0u, 3u) to Rational(56143, 600),
-                    listOf(1u, 3u) to Rational(94243, 720),
-                    listOf(2u, 3u) to Rational(-46779139, 226800),
-                    listOf(3u, 3u) to Rational(-6948253, 12960),
-                    listOf(4u, 3u) to Rational(-260261, 486),
-                    listOf(0u, 4u) to Rational(-3205317, 19600),
-                    listOf(1u, 4u) to Rational(-201253, 1050),
-                    listOf(2u, 4u) to Rational(332192677, 302400),
-                    listOf(3u, 4u) to Rational(351511, 360),
-                    listOf(4u, 4u) to Rational(-40547, 81),
-                    listOf(0u, 5u) to Rational(-65421, 1960),
-                    listOf(1u, 5u) to Rational(-10118, 35),
-                    listOf(2u, 5u) to Rational(-4341709, 10080),
-                    listOf(3u, 5u) to Rational(-91703, 360),
-                    listOf(4u, 5u) to Rational(-85, 9),
-                    listOf(0u, 6u) to Rational(-25965, 784),
-                    listOf(1u, 6u) to Rational(3351, 16),
-                    listOf(2u, 6u) to Rational(595159, 1344),
-                    listOf(3u, 6u) to Rational(-1381, 12),
-                    listOf(4u, 6u) to Rational(-155, 3)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-17, 5),
-                        listOf(1u) to Rational(2, 6),
-                        listOf(2u) to Rational(14, 1),
-                        listOf(0u, 1u) to Rational(-6, 6),
-                        listOf(1u, 1u) to Rational(-7, 3),
-                        listOf(2u, 1u) to Rational(-2, 9),
-                        listOf(0u, 2u) to Rational(-9, 6),
-                        listOf(1u, 2u) to Rational(17, 4),
-                        listOf(2u, 2u) to Rational(2, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(5, 4),
-                        listOf(1u) to Rational(-5, 9),
-                        listOf(2u) to Rational(-3, 6),
-                        listOf(0u, 1u) to Rational(6, 5),
-                        listOf(1u, 1u) to Rational(14, 5),
-                        listOf(2u, 1u) to Rational(5, 2),
-                        listOf(0u, 2u) to Rational(-18, 7),
-                        listOf(1u, 2u) to Rational(-8, 2),
-                        listOf(2u, 2u) to Rational(18, 9),
-                    )
-                ),
-            )),
-            "test 5"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-506213, 2800),
-                    listOf(1u) to Rational(9859, 315),
-                    listOf(2u) to Rational(17384377, 11340),
-                    listOf(3u) to Rational(-9662, 63),
-                    listOf(4u) to Rational(-12563, 4),
-                    listOf(0u, 1u) to Rational(-486293, 22400),
-                    listOf(1u, 1u) to Rational(-6530947, 25200),
-                    listOf(2u, 1u) to Rational(866125, 18144),
-                    listOf(3u, 1u) to Rational(2948747, 2520),
-                    listOf(4u, 1u) to Rational(1196611, 2016),
-                    listOf(0u, 2u) to Rational(-20266021, 117600),
-                    listOf(1u, 2u) to Rational(26656339, 44100),
-                    listOf(2u, 2u) to Rational(19499183, 18144),
-                    listOf(3u, 2u) to Rational(-19801849, 7560),
-                    listOf(4u, 2u) to Rational(-2639635, 1296),
-                    listOf(0u, 3u) to Rational(-5017697, 29400),
-                    listOf(1u, 3u) to Rational(-606007, 1575),
-                    listOf(2u, 3u) to Rational(127494487, 132300),
-                    listOf(3u, 3u) to Rational(166567, 105),
-                    listOf(4u, 3u) to Rational(486403, 18144),
-                    listOf(0u, 4u) to Rational(-32182, 735),
-                    listOf(1u, 4u) to Rational(2420671, 8820),
-                    listOf(2u, 4u) to Rational(-12619193, 26460),
-                    listOf(3u, 4u) to Rational(-6823067, 5670),
-                    listOf(4u, 4u) to Rational(-2311693, 13608),
-                    listOf(0u, 5u) to Rational(-13324, 245),
-                    listOf(1u, 5u) to Rational(1966, 35),
-                    listOf(2u, 5u) to Rational(1052719, 2520),
-                    listOf(3u, 5u) to Rational(19153, 270),
-                    listOf(4u, 5u) to Rational(701, 54),
-                    listOf(0u, 6u) to Rational(4647, 196),
-                    listOf(1u, 6u) to Rational(2197, 28),
-                    listOf(2u, 6u) to Rational(-43853, 336),
-                    listOf(3u, 6u) to Rational(-301, 3),
-                    listOf(4u, 6u) to Rational(34, 3)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-2843, 1600),
-                    listOf(1u) to Rational(-1483, 240),
-                    listOf(2u) to Rational(110623, 1296),
-                    listOf(3u) to Rational(1265, 72),
-                    listOf(4u) to Rational(-5011, 16),
-                    listOf(0u, 1u) to Rational(47743, 1800),
-                    listOf(1u, 1u) to Rational(619229, 32400),
-                    listOf(2u, 1u) to Rational(-5978369, 58320),
-                    listOf(3u, 1u) to Rational(-86081, 1620),
-                    listOf(4u, 1u) to Rational(6325, 72),
-                    listOf(0u, 2u) to Rational(110951, 3360),
-                    listOf(1u, 2u) to Rational(-9550649, 302400),
-                    listOf(2u, 2u) to Rational(6542933, 85050),
-                    listOf(3u, 2u) to Rational(4708291, 38880),
-                    listOf(4u, 2u) to Rational(-433327, 1296),
-                    listOf(0u, 3u) to Rational(56143, 600),
-                    listOf(1u, 3u) to Rational(94243, 720),
-                    listOf(2u, 3u) to Rational(-46779139, 226800),
-                    listOf(3u, 3u) to Rational(-6948253, 12960),
-                    listOf(4u, 3u) to Rational(-260261, 486),
-                    listOf(0u, 4u) to Rational(-3205317, 19600),
-                    listOf(1u, 4u) to Rational(-201253, 1050),
-                    listOf(2u, 4u) to Rational(332192677, 302400),
-                    listOf(3u, 4u) to Rational(351511, 360),
-                    listOf(4u, 4u) to Rational(-40547, 81),
-                    listOf(0u, 5u) to Rational(-65421, 1960),
-                    listOf(1u, 5u) to Rational(-10118, 35),
-                    listOf(2u, 5u) to Rational(-4341709, 10080),
-                    listOf(3u, 5u) to Rational(-91703, 360),
-                    listOf(4u, 5u) to Rational(-85, 9),
-                    listOf(0u, 6u) to Rational(-25965, 784),
-                    listOf(1u, 6u) to Rational(3351, 16),
-                    listOf(2u, 6u) to Rational(595159, 1344),
-                    listOf(3u, 6u) to Rational(-1381, 12),
-                    listOf(4u, 6u) to Rational(-155, 3)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                0 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-17, 5),
-                        listOf(1u) to Rational(2, 6),
-                        listOf(2u) to Rational(14, 1),
-                        listOf(0u, 1u) to Rational(-6, 6),
-                        listOf(1u, 1u) to Rational(-7, 3),
-                        listOf(2u, 1u) to Rational(-2, 9),
-                        listOf(0u, 2u) to Rational(-9, 6),
-                        listOf(1u, 2u) to Rational(17, 4),
-                        listOf(2u, 2u) to Rational(2, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(5, 4),
-                        listOf(1u) to Rational(-5, 9),
-                        listOf(2u) to Rational(-3, 6),
-                        listOf(0u, 1u) to Rational(6, 5),
-                        listOf(1u, 1u) to Rational(14, 5),
-                        listOf(2u, 1u) to Rational(5, 2),
-                        listOf(0u, 2u) to Rational(-18, 7),
-                        listOf(1u, 2u) to Rational(-8, 2),
-                        listOf(2u, 2u) to Rational(18, 9),
-                    )
-                ),
-                5 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(5, 8),
-                        listOf(1u) to Rational(-12, 6),
-                        listOf(2u) to Rational(7, 6),
-                        listOf(0u, 1u) to Rational(-10, 4),
-                        listOf(1u, 1u) to Rational(-7, 6),
-                        listOf(2u, 1u) to Rational(8, 9),
-                        listOf(0u, 2u) to Rational(16, 3),
-                        listOf(1u, 2u) to Rational(-13, 4),
-                        listOf(2u, 2u) to Rational(5, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(10, 6),
-                        listOf(1u) to Rational(-18, 6),
-                        listOf(2u) to Rational(5, 1),
-                        listOf(0u, 1u) to Rational(17, 7),
-                        listOf(1u, 1u) to Rational(8, 4),
-                        listOf(2u, 1u) to Rational(-4, 9),
-                        listOf(0u, 2u) to Rational(-6, 5),
-                        listOf(1u, 2u) to Rational(-15, 8),
-                        listOf(2u, 2u) to Rational(-18, 5),
-                    )
-                ),
-            )),
-            "test 5'"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf<Int, NumberedRationalFunction<Rational>>()),
-            "test 6"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, mapOf(
-                5 to NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(5, 8),
-                        listOf(1u) to Rational(-12, 6),
-                        listOf(2u) to Rational(7, 6),
-                        listOf(0u, 1u) to Rational(-10, 4),
-                        listOf(1u, 1u) to Rational(-7, 6),
-                        listOf(2u, 1u) to Rational(8, 9),
-                        listOf(0u, 2u) to Rational(16, 3),
-                        listOf(1u, 2u) to Rational(-13, 4),
-                        listOf(2u, 2u) to Rational(5, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(10, 6),
-                        listOf(1u) to Rational(-18, 6),
-                        listOf(2u) to Rational(5, 1),
-                        listOf(0u, 1u) to Rational(17, 7),
-                        listOf(1u, 1u) to Rational(8, 4),
-                        listOf(2u, 1u) to Rational(-4, 9),
-                        listOf(0u, 2u) to Rational(-6, 5),
-                        listOf(1u, 2u) to Rational(-15, 8),
-                        listOf(2u, 2u) to Rational(-18, 5),
-                    )
-                ),
-            )),
-            "test 6'"
-        )
-    }
-    @Test
-    fun test_Polynomial_substitute_Double_Buffer() {
-        assertEquals(
-            NumberedPolynomialAsIs(emptyList<UInt>() to 0.0),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 1.0,
-                listOf(1u) to -2.0,
-                listOf(2u) to 1.0,
-            ).substitute(bufferOf(
-                1.0
-            )),
-            0.001,
-            "test 1"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(bufferOf()),
-            0.001,
-            "test 2"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(0u, 2u) to 0.2700930201481795,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(bufferOf(
-                0.0,
-            )),
-            0.001,
-            "test 3"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 1.047895694399743,
-                listOf(0u, 1u) to 0.859913883275481,
-                listOf(0u, 2u) to 0.2327806735363575,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(bufferOf(
-                0.4846192734143442,
-            )),
-            0.001,
-            "test 4"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 1.934530767358133,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(bufferOf(
-                0.4846192734143442,
-                0.8400458576651112,
-            )),
-            0.001,
-            "test 5"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 1.934530767358133,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(bufferOf(
-                0.4846192734143442,
-                0.8400458576651112,
-                0.9211194782050933
-            )),
-            0.001,
-            "test 6"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 1.934530767358133,
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substitute(bufferOf(
-                0.4846192734143442,
-                0.8400458576651112,
-                0.9211194782050933,
-                0.4752854632152105
-            )),
-            0.001,
-            "test 7"
-        )
-    }
-    @Test
-    fun test_Polynomial_substitute_Constant_Buffer() {
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0)
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1)
-            ).substitute(RationalField, bufferOf(
-                Rational(1)
-            )),
-            "test 1"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, bufferOf<Rational>()),
-            "test 2"
-        )
-        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-83, 50),
-                listOf(0u, 1u) to Rational(29, 25),
-                listOf(0u, 2u) to Rational(3, 5),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, bufferOf(
-                Rational(-2, 5),
-            )),
-            "test 3"
-        )
-        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5%2C+y+%3D+12%2F9
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(143, 150)
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, bufferOf(
-                Rational(-2, 5),
-                Rational(12, 9),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(143, 150)
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, bufferOf(
-                Rational(-2, 5),
-                Rational(12, 9),
-                Rational(57, 179),
-            )),
-            "test 5"
-        )
-        // https://www.wolframalpha.com/input?i=%28%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2%29+p%5E8+where+x+%3D+q%2Fp%2C+y+%3D+x%5E3%2C+p+%3D+-2%2F5%2C+q+%3D+12%2F9
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(47639065216, 2562890625)
-            ),
-            NumberedPolynomialAsIs(
-                listOf(8u) to Rational(-3, 2),
-                listOf(7u, 1u) to Rational(8, 6),
-                listOf(6u, 2u) to Rational(14, 6),
-                listOf(5u, 3u) to Rational(-3, 1),
-                listOf(4u, 4u) to Rational(-19, 2),
-                listOf(3u, 5u) to Rational(9, 4),
-                listOf(2u, 6u) to Rational(5, 5),
-                listOf(1u, 7u) to Rational(18, 9),
-                listOf(0u, 8u) to Rational(5, 2),
-            ).substitute(RationalField, bufferOf(
-                Rational(-2, 5),
-                Rational(12, 9),
-            )),
-            "test 6"
-        )
-    }
-    @Test
-    fun test_Polynomial_substitute_Polynomial_Buffer() {
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0)
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1)
-            ).substitute(RationalField, bufferOf(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            )),
-            "test 1"
-        )
-        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-5%2F1+s+%2B+2%2F8+t%2C+y+%3D+11%2F7+t
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(0u, 1u) to Rational(-92, 21),
-                listOf(0u, 2u) to Rational(-2627, 2352),
-                listOf(0u, 3u) to Rational(4565, 3136),
-                listOf(0u, 4u) to Rational(605, 1568),
-                listOf(1u) to Rational(-20, 3),
-                listOf(1u, 1u) to Rational(1445, 21),
-                listOf(1u, 2u) to Rational(-13145, 392),
-                listOf(1u, 3u) to Rational(-3025, 196),
-                listOf(2u) to Rational(175, 3),
-                listOf(2u, 1u) to Rational(2475, 28),
-                listOf(2u, 2u) to Rational(15125, 98),
-                listOf(3u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, bufferOf(
-                NumberedPolynomialAsIs(
-                    listOf(1u) to Rational(-5, 1),
-                    listOf(0u, 1u) to Rational(2, 8),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf(1u) to Rational(0, 5),
-                    listOf(0u, 1u) to Rational(11, 7),
-                ),
-            )),
-            "test 2"
-        )
-        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = (0/6 + 14/8 s + -14/2 s^2) + (-3/5 + 11/1 s + 3/7 s^2) t + (-3/7 + -18/5 s + -9/1 s^2) t^2, y = (-9/2 + 2/7 s + 9/1 s^2) + (13/1 + -1/8 s + 2/8 s^2) t + (19/4 + 15/7 s + -19/4 s^2) t^2
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(129, 4),
-                listOf(1u) to Rational(48583, 336),
-                listOf(2u) to Rational(-913477, 1568),
-                listOf(3u) to Rational(-967567, 672),
-                listOf(4u) to Rational(4722043, 1344),
-                listOf(5u) to Rational(8855, 2),
-                listOf(6u) to Rational(-311971, 32),
-                listOf(7u) to Rational(-17325, 4),
-                listOf(8u) to Rational(19845, 2),
-                listOf(0u, 1u) to Rational(-827, 4),
-                listOf(1u, 1u) to Rational(191927, 840),
-                listOf(2u, 1u) to Rational(9592627, 2352),
-                listOf(3u, 1u) to Rational(-105400711, 53760),
-                listOf(4u, 1u) to Rational(-10054101459, 439040),
-                listOf(5u, 1u) to Rational(2127351, 128),
-                listOf(6u, 1u) to Rational(116680973, 3136),
-                listOf(7u, 1u) to Rational(-220445, 7),
-                listOf(8u, 1u) to Rational(-2655, 4),
-                listOf(0u, 2u) to Rational(30567, 100),
-                listOf(1u, 2u) to Rational(-156284953, 39200),
-                listOf(2u, 2u) to Rational(-57661541711, 6585600),
-                listOf(3u, 2u) to Rational(131931579, 3136),
-                listOf(4u, 2u) to Rational(98818124791, 3512320),
-                listOf(5u, 2u) to Rational(-94458855053, 878080),
-                listOf(6u, 2u) to Rational(13937705305, 1229312),
-                listOf(7u, 2u) to Rational(335706887, 21952),
-                listOf(8u, 2u) to Rational(23549165, 1568),
-                listOf(0u, 3u) to Rational(111367, 1400),
-                listOf(1u, 3u) to Rational(4937369, 700),
-                listOf(2u, 3u) to Rational(-4449423711, 274400),
-                listOf(3u, 3u) to Rational(-351873325703, 4390400),
-                listOf(4u, 3u) to Rational(23495875029, 307328),
-                listOf(5u, 3u) to Rational(17576300919, 878080),
-                listOf(6u, 3u) to Rational(230316993, 12544),
-                listOf(7u, 3u) to Rational(-191130515, 21952),
-                listOf(8u, 3u) to Rational(332435, 392),
-                listOf(0u, 4u) to Rational(-275084, 1225),
-                listOf(1u, 4u) to Rational(-266774603, 137200),
-                listOf(2u, 4u) to Rational(2176279167121, 30732800),
-                listOf(3u, 4u) to Rational(10904913303, 2195200),
-                listOf(4u, 4u) to Rational(-10769286147, 2195200),
-                listOf(5u, 4u) to Rational(-26277119793, 439040),
-                listOf(6u, 4u) to Rational(25859735869, 6146560),
-                listOf(7u, 4u) to Rational(38906289, 2744),
-                listOf(8u, 4u) to Rational(-3072025, 392),
-                listOf(0u, 5u) to Rational(9573, 98),
-                listOf(1u, 5u) to Rational(-4154651399, 548800),
-                listOf(2u, 5u) to Rational(3446069019, 548800),
-                listOf(3u, 5u) to Rational(-7851500623, 137200),
-                listOf(4u, 5u) to Rational(-53205142903, 1920800),
-                listOf(5u, 5u) to Rational(-31953611, 3430),
-                listOf(6u, 5u) to Rational(1447380313, 109760),
-                listOf(7u, 5u) to Rational(764158625, 21952),
-                listOf(8u, 5u) to Rational(1153515, 784),
-                listOf(0u, 6u) to Rational(1722351, 7840),
-                listOf(1u, 6u) to Rational(-164554821, 109760),
-                listOf(2u, 6u) to Rational(-79096147243, 7683200),
-                listOf(3u, 6u) to Rational(-624721089, 15680),
-                listOf(4u, 6u) to Rational(11147305567, 548800),
-                listOf(5u, 6u) to Rational(8318333679, 109760),
-                listOf(6u, 6u) to Rational(32981871553, 1536640),
-                listOf(7u, 6u) to Rational(-225359619, 21952),
-                listOf(8u, 6u) to Rational(-3973995, 392),
-                listOf(0u, 7u) to Rational(67203, 784),
-                listOf(1u, 7u) to Rational(39281469, 54880),
-                listOf(2u, 7u) to Rational(70162551, 27440),
-                listOf(3u, 7u) to Rational(413630709, 54880),
-                listOf(4u, 7u) to Rational(4640410269, 192080),
-                listOf(5u, 7u) to Rational(802712247, 54880),
-                listOf(6u, 7u) to Rational(-473517603, 27440),
-                listOf(7u, 7u) to Rational(-17055459, 1568),
-                listOf(8u, 7u) to Rational(-12825, 14),
-                listOf(0u, 8u) to Rational(16245, 1568),
-                listOf(1u, 8u) to Rational(503253, 2744),
-                listOf(2u, 8u) to Rational(125292591, 96040),
-                listOf(3u, 8u) to Rational(12033171, 2744),
-                listOf(4u, 8u) to Rational(154352673, 27440),
-                listOf(5u, 8u) to Rational(-1302291, 392),
-                listOf(6u, 8u) to Rational(-20265741, 1960),
-                listOf(7u, 8u) to Rational(-26163, 56),
-                listOf(8u, 8u) to Rational(146205, 32),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, bufferOf(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0, 6),
-                    listOf(1u) to Rational(14, 8),
-                    listOf(2u) to Rational(-14, 2),
-                    listOf(0u, 1u) to Rational(-3, 5),
-                    listOf(1u, 1u) to Rational(11, 1),
-                    listOf(2u, 1u) to Rational(3, 7),
-                    listOf(0u, 2u) to Rational(-3, 7),
-                    listOf(1u, 2u) to Rational(-18, 5),
-                    listOf(2u, 2u) to Rational(-9, 1),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-9, 2),
-                    listOf(1u) to Rational(2, 7),
-                    listOf(2u) to Rational(9, 1),
-                    listOf(0u, 1u) to Rational(13, 1),
-                    listOf(1u, 1u) to Rational(-1, 8),
-                    listOf(2u, 1u) to Rational(2, 8),
-                    listOf(0u, 2u) to Rational(19, 4),
-                    listOf(1u, 2u) to Rational(15, 7),
-                    listOf(2u, 2u) to Rational(-19, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 3),
-                    listOf(1u) to Rational(5, 2),
-                    listOf(2u) to Rational(13, 7),
-                    listOf(0u, 1u) to Rational(16, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(6, 1),
-                    listOf(0u, 2u) to Rational(-14, 3),
-                    listOf(1u, 2u) to Rational(-2, 7),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            )),
-            "test 3"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(129, 4),
-                listOf(1u) to Rational(48583, 336),
-                listOf(2u) to Rational(-913477, 1568),
-                listOf(3u) to Rational(-967567, 672),
-                listOf(4u) to Rational(4722043, 1344),
-                listOf(5u) to Rational(8855, 2),
-                listOf(6u) to Rational(-311971, 32),
-                listOf(7u) to Rational(-17325, 4),
-                listOf(8u) to Rational(19845, 2),
-                listOf(0u, 1u) to Rational(-827, 4),
-                listOf(1u, 1u) to Rational(191927, 840),
-                listOf(2u, 1u) to Rational(9592627, 2352),
-                listOf(3u, 1u) to Rational(-105400711, 53760),
-                listOf(4u, 1u) to Rational(-10054101459, 439040),
-                listOf(5u, 1u) to Rational(2127351, 128),
-                listOf(6u, 1u) to Rational(116680973, 3136),
-                listOf(7u, 1u) to Rational(-220445, 7),
-                listOf(8u, 1u) to Rational(-2655, 4),
-                listOf(0u, 2u) to Rational(30567, 100),
-                listOf(1u, 2u) to Rational(-156284953, 39200),
-                listOf(2u, 2u) to Rational(-57661541711, 6585600),
-                listOf(3u, 2u) to Rational(131931579, 3136),
-                listOf(4u, 2u) to Rational(98818124791, 3512320),
-                listOf(5u, 2u) to Rational(-94458855053, 878080),
-                listOf(6u, 2u) to Rational(13937705305, 1229312),
-                listOf(7u, 2u) to Rational(335706887, 21952),
-                listOf(8u, 2u) to Rational(23549165, 1568),
-                listOf(0u, 3u) to Rational(111367, 1400),
-                listOf(1u, 3u) to Rational(4937369, 700),
-                listOf(2u, 3u) to Rational(-4449423711, 274400),
-                listOf(3u, 3u) to Rational(-351873325703, 4390400),
-                listOf(4u, 3u) to Rational(23495875029, 307328),
-                listOf(5u, 3u) to Rational(17576300919, 878080),
-                listOf(6u, 3u) to Rational(230316993, 12544),
-                listOf(7u, 3u) to Rational(-191130515, 21952),
-                listOf(8u, 3u) to Rational(332435, 392),
-                listOf(0u, 4u) to Rational(-275084, 1225),
-                listOf(1u, 4u) to Rational(-266774603, 137200),
-                listOf(2u, 4u) to Rational(2176279167121, 30732800),
-                listOf(3u, 4u) to Rational(10904913303, 2195200),
-                listOf(4u, 4u) to Rational(-10769286147, 2195200),
-                listOf(5u, 4u) to Rational(-26277119793, 439040),
-                listOf(6u, 4u) to Rational(25859735869, 6146560),
-                listOf(7u, 4u) to Rational(38906289, 2744),
-                listOf(8u, 4u) to Rational(-3072025, 392),
-                listOf(0u, 5u) to Rational(9573, 98),
-                listOf(1u, 5u) to Rational(-4154651399, 548800),
-                listOf(2u, 5u) to Rational(3446069019, 548800),
-                listOf(3u, 5u) to Rational(-7851500623, 137200),
-                listOf(4u, 5u) to Rational(-53205142903, 1920800),
-                listOf(5u, 5u) to Rational(-31953611, 3430),
-                listOf(6u, 5u) to Rational(1447380313, 109760),
-                listOf(7u, 5u) to Rational(764158625, 21952),
-                listOf(8u, 5u) to Rational(1153515, 784),
-                listOf(0u, 6u) to Rational(1722351, 7840),
-                listOf(1u, 6u) to Rational(-164554821, 109760),
-                listOf(2u, 6u) to Rational(-79096147243, 7683200),
-                listOf(3u, 6u) to Rational(-624721089, 15680),
-                listOf(4u, 6u) to Rational(11147305567, 548800),
-                listOf(5u, 6u) to Rational(8318333679, 109760),
-                listOf(6u, 6u) to Rational(32981871553, 1536640),
-                listOf(7u, 6u) to Rational(-225359619, 21952),
-                listOf(8u, 6u) to Rational(-3973995, 392),
-                listOf(0u, 7u) to Rational(67203, 784),
-                listOf(1u, 7u) to Rational(39281469, 54880),
-                listOf(2u, 7u) to Rational(70162551, 27440),
-                listOf(3u, 7u) to Rational(413630709, 54880),
-                listOf(4u, 7u) to Rational(4640410269, 192080),
-                listOf(5u, 7u) to Rational(802712247, 54880),
-                listOf(6u, 7u) to Rational(-473517603, 27440),
-                listOf(7u, 7u) to Rational(-17055459, 1568),
-                listOf(8u, 7u) to Rational(-12825, 14),
-                listOf(0u, 8u) to Rational(16245, 1568),
-                listOf(1u, 8u) to Rational(503253, 2744),
-                listOf(2u, 8u) to Rational(125292591, 96040),
-                listOf(3u, 8u) to Rational(12033171, 2744),
-                listOf(4u, 8u) to Rational(154352673, 27440),
-                listOf(5u, 8u) to Rational(-1302291, 392),
-                listOf(6u, 8u) to Rational(-20265741, 1960),
-                listOf(7u, 8u) to Rational(-26163, 56),
-                listOf(8u, 8u) to Rational(146205, 32),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, bufferOf(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0, 6),
-                    listOf(1u) to Rational(14, 8),
-                    listOf(2u) to Rational(-14, 2),
-                    listOf(0u, 1u) to Rational(-3, 5),
-                    listOf(1u, 1u) to Rational(11, 1),
-                    listOf(2u, 1u) to Rational(3, 7),
-                    listOf(0u, 2u) to Rational(-3, 7),
-                    listOf(1u, 2u) to Rational(-18, 5),
-                    listOf(2u, 2u) to Rational(-9, 1),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-9, 2),
-                    listOf(1u) to Rational(2, 7),
-                    listOf(2u) to Rational(9, 1),
-                    listOf(0u, 1u) to Rational(13, 1),
-                    listOf(1u, 1u) to Rational(-1, 8),
-                    listOf(2u, 1u) to Rational(2, 8),
-                    listOf(0u, 2u) to Rational(19, 4),
-                    listOf(1u, 2u) to Rational(15, 7),
-                    listOf(2u, 2u) to Rational(-19, 4),
-                ),
-            )),
-            "test 4"
-        )
-        // (-3/2 + 8/6 x + 14/6 x^2) + (-3/1 + -19/2 x + 9/4 x^2) y + (5/5 + 18/9 x + 5/2 x^2) y^2 where x = (0/6 + 14/8 s + -14/2 s^2) + (-3/5 + 11/1 s + 3/7 s^2) t + (-3/7 + -18/5 s + -9/1 s^2) t^2, y = t
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(7, 3),
-                listOf(2u) to Rational(-35, 16),
-                listOf(3u) to Rational(-343, 6),
-                listOf(4u) to Rational(343, 3),
-                listOf(0u, 1u) to Rational(-19, 5),
-                listOf(1u, 1u) to Rational(-823, 120),
-                listOf(2u, 1u) to Rational(1232417, 6720),
-                listOf(3u, 1u) to Rational(-9863, 24),
-                listOf(4u, 1u) to Rational(385, 4),
-                listOf(0u, 2u) to Rational(2439, 350),
-                listOf(1u, 2u) to Rational(-5793, 40),
-                listOf(2u, 2u) to Rational(1172113, 3360),
-                listOf(3u, 2u) to Rational(-13531, 40),
-                listOf(4u, 2u) to Rational(2824, 7),
-                listOf(0u, 3u) to Rational(3417, 700),
-                listOf(1u, 3u) to Rational(1191, 200),
-                listOf(2u, 3u) to Rational(8383, 28),
-                listOf(3u, 3u) to Rational(-220279, 280),
-                listOf(4u, 3u) to Rational(49179, 196),
-                listOf(0u, 4u) to Rational(57, 35),
-                listOf(1u, 4u) to Rational(-33771, 700),
-                listOf(2u, 4u) to Rational(196279, 1225),
-                listOf(3u, 4u) to Rational(-32259, 140),
-                listOf(4u, 4u) to Rational(23868, 49),
-                listOf(0u, 5u) to Rational(333, 196),
-                listOf(1u, 5u) to Rational(-204, 35),
-                listOf(2u, 5u) to Rational(-307233, 2450),
-                listOf(3u, 5u) to Rational(-12492, 35),
-                listOf(4u, 5u) to Rational(4563, 28),
-                listOf(0u, 6u) to Rational(45, 98),
-                listOf(1u, 6u) to Rational(54, 7),
-                listOf(2u, 6u) to Rational(1809, 35),
-                listOf(3u, 6u) to Rational(162),
-                listOf(4u, 6u) to Rational(405, 2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, bufferOf(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0, 6),
-                    listOf(1u) to Rational(14, 8),
-                    listOf(2u) to Rational(-14, 2),
-                    listOf(0u, 1u) to Rational(-3, 5),
-                    listOf(1u, 1u) to Rational(11, 1),
-                    listOf(2u, 1u) to Rational(3, 7),
-                    listOf(0u, 2u) to Rational(-3, 7),
-                    listOf(1u, 2u) to Rational(-18, 5),
-                    listOf(2u, 2u) to Rational(-9, 1),
-                ),
-            )),
-            "test 5"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substitute(RationalField, bufferOf<NumberedPolynomial<Rational>>()),
-            "test 6"
-        )
-    }
-    @Test
-    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
-            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
-    fun test_Polynomial_substitute_RationalFunction_Buffer() {
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1)
-            ).substitute(RationalField, bufferOf(
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(1)
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(1)
-                    )
-                )
-            )),
-            "test 1"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf(4u) to Rational(-194071, 4900),
-                    listOf(3u, 1u) to Rational(394811, 225),
-                    listOf(2u, 2u) to Rational(-444183161, 66150),
-                    listOf(1u, 3u) to Rational(70537618, 59535),
-                    listOf(0u, 4u) to Rational(9655504, 2835),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf(4u) to Rational(9, 1),
-                    listOf(3u, 1u) to Rational(61, 1),
-                    listOf(2u, 2u) to Rational(2137, 36),
-                    listOf(1u, 3u) to Rational(-1342, 9),
-                    listOf(0u, 4u) to Rational(484, 9),
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, bufferOf(
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(17, 7),
-                        listOf(0u, 1u) to Rational(-13, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(-18, 6),
-                        listOf(0u, 1u) to Rational(11, 6),
-                    )
-                ),
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(18, 5),
-                        listOf(0u, 1u) to Rational(-16, 3),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(-1, 1),
-                        listOf(0u, 1u) to Rational(-4, 1),
-                    )
-                ),
-            )),
-            "test 2"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-6443599, 10000),
-                    listOf(1u) to Rational(166251223, 210000),
-                    listOf(2u) to Rational(-4606805099, 3528000),
-                    listOf(3u) to Rational(51204379, 19600),
-                    listOf(4u) to Rational(-529045460659, 277830000),
-                    listOf(5u) to Rational(2630836709, 1488375),
-                    listOf(6u) to Rational(-42675691369, 25004700),
-                    listOf(7u) to Rational(495825223, 1250235),
-                    listOf(8u) to Rational(-22531756, 1750329),
-                    listOf(0u, 1u) to Rational(-2526552797, 420000),
-                    listOf(1u, 1u) to Rational(31108840471, 2520000),
-                    listOf(2u, 1u) to Rational(-4789740847, 1102500),
-                    listOf(3u, 1u) to Rational(186594307807, 11340000),
-                    listOf(4u, 1u) to Rational(-11677815943, 1488375),
-                    listOf(5u, 1u) to Rational(-181118486447, 27783000),
-                    listOf(6u, 1u) to Rational(-16123292162, 14586075),
-                    listOf(7u, 1u) to Rational(-140339343808, 26254935),
-                    listOf(8u, 1u) to Rational(4570171616, 5250987),
-                    listOf(0u, 2u) to Rational(-181436530573, 10080000),
-                    listOf(1u, 2u) to Rational(6700437957491, 105840000),
-                    listOf(2u, 2u) to Rational(-3527267461, 1417500),
-                    listOf(3u, 2u) to Rational(-38084563451, 5556600),
-                    listOf(4u, 2u) to Rational(-565662040631, 13891500),
-                    listOf(5u, 2u) to Rational(-35479071126397, 583443000),
-                    listOf(6u, 2u) to Rational(-11717559078469, 525098700),
-                    listOf(7u, 2u) to Rational(-2043385293517, 225042300),
-                    listOf(8u, 2u) to Rational(-3644439630451, 551353635),
-                    listOf(0u, 3u) to Rational(-1760423269, 126000),
-                    listOf(1u, 3u) to Rational(310176758299, 2352000),
-                    listOf(2u, 3u) to Rational(-907229584837, 21168000),
-                    listOf(3u, 3u) to Rational(-16717135885963, 95256000),
-                    listOf(4u, 3u) to Rational(-43762928025353, 333396000),
-                    listOf(5u, 3u) to Rational(-328427480571607, 3000564000),
-                    listOf(6u, 3u) to Rational(-7722675917197, 210039480),
-                    listOf(7u, 3u) to Rational(1713350137019, 1225230300),
-                    listOf(8u, 3u) to Rational(156695935643, 31505922),
-                    listOf(0u, 4u) to Rational(18362364269, 1008000),
-                    listOf(1u, 4u) to Rational(955674858553, 10584000),
-                    listOf(2u, 4u) to Rational(-71937470607371, 444528000),
-                    listOf(3u, 4u) to Rational(-34097985615163, 95256000),
-                    listOf(4u, 4u) to Rational(-340736178775883, 2000376000),
-                    listOf(5u, 4u) to Rational(-511324523441897, 10501974000),
-                    listOf(6u, 4u) to Rational(-125375649409151, 8821658160),
-                    listOf(7u, 4u) to Rational(-2813518533421, 1575296100),
-                    listOf(8u, 4u) to Rational(-17044089109, 5250987),
-                    listOf(0u, 5u) to Rational(600086461, 20160),
-                    listOf(1u, 5u) to Rational(-18959931367, 423360),
-                    listOf(2u, 5u) to Rational(-9178804929607, 44452800),
-                    listOf(3u, 5u) to Rational(-1460114275979, 5334336),
-                    listOf(4u, 5u) to Rational(-342533479090169, 4200789600),
-                    listOf(5u, 5u) to Rational(20335453022963, 4200789600),
-                    listOf(6u, 5u) to Rational(-21649775090197, 6301184400),
-                    listOf(7u, 5u) to Rational(-197301716069, 131274675),
-                    listOf(8u, 5u) to Rational(18711357470, 15752961),
-                    listOf(0u, 6u) to Rational(621417991, 100800),
-                    listOf(1u, 6u) to Rational(-159236792977, 2116800),
-                    listOf(2u, 6u) to Rational(-6602528890883, 66679200),
-                    listOf(3u, 6u) to Rational(-1086091664047, 19051200),
-                    listOf(4u, 6u) to Rational(3769375009003, 1680315840),
-                    listOf(5u, 6u) to Rational(-12920385574769, 1050197400),
-                    listOf(6u, 6u) to Rational(-90219591809287, 6301184400),
-                    listOf(7u, 6u) to Rational(656361553391, 1575296100),
-                    listOf(8u, 6u) to Rational(757900793, 2250423),
-                    listOf(0u, 7u) to Rational(-100770017, 15120),
-                    listOf(1u, 7u) to Rational(-316364851, 17640),
-                    listOf(2u, 7u) to Rational(-85118560057, 6667920),
-                    listOf(3u, 7u) to Rational(6286563719, 416745),
-                    listOf(4u, 7u) to Rational(26803885301, 1714608),
-                    listOf(5u, 7u) to Rational(-13767154393, 4286520),
-                    listOf(6u, 7u) to Rational(-3875138933, 1224720),
-                    listOf(7u, 7u) to Rational(65193755, 333396),
-                    listOf(8u, 7u) to Rational(90974351, 2500470),
-                    listOf(0u, 8u) to Rational(-3182197, 1260),
-                    listOf(1u, 8u) to Rational(24899923, 8820),
-                    listOf(2u, 8u) to Rational(-19999556, 19845),
-                    listOf(3u, 8u) to Rational(3276587, 3969),
-                    listOf(4u, 8u) to Rational(13719549239, 5000940),
-                    listOf(5u, 8u) to Rational(-961839938, 1250235),
-                    listOf(6u, 8u) to Rational(-198184871, 833490),
-                    listOf(7u, 8u) to Rational(230659711, 5000940),
-                    listOf(8u, 8u) to Rational(292447, 35721)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(9, 100),
-                    listOf(1u) to Rational(-21, 50),
-                    listOf(2u) to Rational(293, 700),
-                    listOf(3u) to Rational(29, 210),
-                    listOf(4u) to Rational(3233, 8820),
-                    listOf(5u) to Rational(-289, 441),
-                    listOf(6u) to Rational(-1, 9),
-                    listOf(7u) to Rational(-20, 441),
-                    listOf(8u) to Rational(100, 441),
-                    listOf(0u, 1u) to Rational(-57, 80),
-                    listOf(1u, 1u) to Rational(-121, 400),
-                    listOf(2u, 1u) to Rational(37117, 8400),
-                    listOf(3u, 1u) to Rational(-4853, 3150),
-                    listOf(4u, 1u) to Rational(1166203, 132300),
-                    listOf(5u, 1u) to Rational(-2708, 567),
-                    listOf(6u, 1u) to Rational(-287159, 416745),
-                    listOf(7u, 1u) to Rational(-478204, 83349),
-                    listOf(8u, 1u) to Rational(176320, 83349),
-                    listOf(0u, 2u) to Rational(-6239, 6400),
-                    listOf(1u, 2u) to Rational(264211, 11200),
-                    listOf(2u, 2u) to Rational(-1591999, 100800),
-                    listOf(3u, 2u) to Rational(12450091, 529200),
-                    listOf(4u, 2u) to Rational(9230759, 226800),
-                    listOf(5u, 2u) to Rational(18995554, 2083725),
-                    listOf(6u, 2u) to Rational(136706258, 6251175),
-                    listOf(7u, 2u) to Rational(-120907496, 3750705),
-                    listOf(8u, 2u) to Rational(117200176, 15752961),
-                    listOf(0u, 3u) to Rational(5653, 320),
-                    listOf(1u, 3u) to Rational(-130853, 8400),
-                    listOf(2u, 3u) to Rational(-20939327, 151200),
-                    listOf(3u, 3u) to Rational(2566691, 25200),
-                    listOf(4u, 3u) to Rational(-68441519, 476280),
-                    listOf(5u, 3u) to Rational(2462904247, 12502350),
-                    listOf(6u, 3u) to Rational(353667161, 18753525),
-                    listOf(7u, 3u) to Rational(-1689134372, 26254935),
-                    listOf(8u, 3u) to Rational(35084104, 2250423),
-                    listOf(0u, 4u) to Rational(-3587, 300),
-                    listOf(1u, 4u) to Rational(-10513243, 33600),
-                    listOf(2u, 4u) to Rational(30766733, 176400),
-                    listOf(3u, 4u) to Rational(-65680021, 198450),
-                    listOf(4u, 4u) to Rational(-8108910547, 20003760),
-                    listOf(5u, 4u) to Rational(2922125159, 6251175),
-                    listOf(6u, 4u) to Rational(-4245279943, 131274675),
-                    listOf(7u, 4u) to Rational(-371946872, 3750705),
-                    listOf(8u, 4u) to Rational(61286752, 2250423),
-                    listOf(0u, 5u) to Rational(-20477, 160),
-                    listOf(1u, 5u) to Rational(215741, 1120),
-                    listOf(2u, 5u) to Rational(30785843, 31752),
-                    listOf(3u, 5u) to Rational(-357495959, 317520),
-                    listOf(4u, 5u) to Rational(-1611242993, 10001880),
-                    listOf(5u, 5u) to Rational(345925495, 500094),
-                    listOf(6u, 5u) to Rational(-755948411, 3750705),
-                    listOf(7u, 5u) to Rational(-108643496, 1250235),
-                    listOf(8u, 5u) to Rational(1122512, 35721),
-                    listOf(0u, 6u) to Rational(358037, 2880),
-                    listOf(1u, 6u) to Rational(3895837, 3360),
-                    listOf(2u, 6u) to Rational(359419201, 1270080),
-                    listOf(3u, 6u) to Rational(-158522587, 105840),
-                    listOf(4u, 6u) to Rational(10909002599, 20003760),
-                    listOf(5u, 6u) to Rational(76846972, 138915),
-                    listOf(6u, 6u) to Rational(-327696553, 1250235),
-                    listOf(7u, 6u) to Rational(-1687328, 35721),
-                    listOf(8u, 6u) to Rational(1016836, 35721),
-                    listOf(0u, 7u) to Rational(658, 3),
-                    listOf(1u, 7u) to Rational(48035, 168),
-                    listOf(2u, 7u) to Rational(-5777875, 5292),
-                    listOf(3u, 7u) to Rational(-7893899, 10584),
-                    listOf(4u, 7u) to Rational(10191652, 11907),
-                    listOf(5u, 7u) to Rational(2920121, 23814),
-                    listOf(6u, 7u) to Rational(-2699780, 11907),
-                    listOf(7u, 7u) to Rational(4556, 441),
-                    listOf(8u, 7u) to Rational(3440, 189),
-                    listOf(0u, 8u) to Rational(64, 1),
-                    listOf(1u, 8u) to Rational(-808, 7),
-                    listOf(2u, 8u) to Rational(-360895, 1764),
-                    listOf(3u, 8u) to Rational(257657, 882),
-                    listOf(4u, 8u) to Rational(3779917, 15876),
-                    listOf(5u, 8u) to Rational(-610279, 3969),
-                    listOf(6u, 8u) to Rational(-25091, 441),
-                    listOf(7u, 8u) to Rational(9560, 567),
-                    listOf(8u, 8u) to Rational(400, 81)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, bufferOf(
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(17, 5),
-                        listOf(1u) to Rational(11, 6),
-                        listOf(2u) to Rational(14, 3),
-                        listOf(0u, 1u) to Rational(17, 1),
-                        listOf(1u, 1u) to Rational(12, 3),
-                        listOf(2u, 1u) to Rational(-6, 2),
-                        listOf(0u, 2u) to Rational(17, 1),
-                        listOf(1u, 2u) to Rational(-4, 3),
-                        listOf(2u, 2u) to Rational(2, 6),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(3, 5),
-                        listOf(1u) to Rational(3, 5),
-                        listOf(2u) to Rational(3, 7),
-                        listOf(0u, 1u) to Rational(-3, 8),
-                        listOf(1u, 1u) to Rational(-1, 1),
-                        listOf(2u, 1u) to Rational(17, 9),
-                        listOf(0u, 2u) to Rational(-8, 1),
-                        listOf(1u, 2u) to Rational(6, 4),
-                        listOf(2u, 2u) to Rational(10, 9),
-                    )
-                ),
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(18, 5),
-                        listOf(1u) to Rational(-17, 5),
-                        listOf(2u) to Rational(-2, 7),
-                        listOf(0u, 1u) to Rational(6, 5),
-                        listOf(1u, 1u) to Rational(-5, 1),
-                        listOf(2u, 1u) to Rational(-9, 1),
-                        listOf(0u, 2u) to Rational(-8, 8),
-                        listOf(1u, 2u) to Rational(2, 7),
-                        listOf(2u, 2u) to Rational(-13, 7),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-4, 8),
-                        listOf(1u) to Rational(15, 9),
-                        listOf(2u) to Rational(-10, 9),
-                        listOf(0u, 1u) to Rational(5, 3),
-                        listOf(1u, 1u) to Rational(4, 1),
-                        listOf(2u, 1u) to Rational(-2, 7),
-                        listOf(0u, 2u) to Rational(2, 2),
-                        listOf(1u, 2u) to Rational(-5, 7),
-                        listOf(2u, 2u) to Rational(-18, 9),
-                    )
-                ),
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-2, 9),
-                        listOf(1u) to Rational(-6, 3),
-                        listOf(2u) to Rational(10, 9),
-                        listOf(0u, 1u) to Rational(13, 3),
-                        listOf(1u, 1u) to Rational(-12, 4),
-                        listOf(2u, 1u) to Rational(3, 6),
-                        listOf(0u, 2u) to Rational(2, 9),
-                        listOf(1u, 2u) to Rational(7, 3),
-                        listOf(2u, 2u) to Rational(16, 5),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-6, 2),
-                        listOf(1u) to Rational(6, 2),
-                        listOf(2u) to Rational(2, 7),
-                        listOf(0u, 1u) to Rational(-18, 1),
-                        listOf(1u, 1u) to Rational(-11, 3),
-                        listOf(2u, 1u) to Rational(7, 5),
-                        listOf(0u, 2u) to Rational(8, 1),
-                        listOf(1u, 2u) to Rational(6, 7),
-                        listOf(2u, 2u) to Rational(17, 4),
-                    )
-                )
-            )),
-            "test 3"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-6443599, 10000),
-                    listOf(1u) to Rational(166251223, 210000),
-                    listOf(2u) to Rational(-4606805099, 3528000),
-                    listOf(3u) to Rational(51204379, 19600),
-                    listOf(4u) to Rational(-529045460659, 277830000),
-                    listOf(5u) to Rational(2630836709, 1488375),
-                    listOf(6u) to Rational(-42675691369, 25004700),
-                    listOf(7u) to Rational(495825223, 1250235),
-                    listOf(8u) to Rational(-22531756, 1750329),
-                    listOf(0u, 1u) to Rational(-2526552797, 420000),
-                    listOf(1u, 1u) to Rational(31108840471, 2520000),
-                    listOf(2u, 1u) to Rational(-4789740847, 1102500),
-                    listOf(3u, 1u) to Rational(186594307807, 11340000),
-                    listOf(4u, 1u) to Rational(-11677815943, 1488375),
-                    listOf(5u, 1u) to Rational(-181118486447, 27783000),
-                    listOf(6u, 1u) to Rational(-16123292162, 14586075),
-                    listOf(7u, 1u) to Rational(-140339343808, 26254935),
-                    listOf(8u, 1u) to Rational(4570171616, 5250987),
-                    listOf(0u, 2u) to Rational(-181436530573, 10080000),
-                    listOf(1u, 2u) to Rational(6700437957491, 105840000),
-                    listOf(2u, 2u) to Rational(-3527267461, 1417500),
-                    listOf(3u, 2u) to Rational(-38084563451, 5556600),
-                    listOf(4u, 2u) to Rational(-565662040631, 13891500),
-                    listOf(5u, 2u) to Rational(-35479071126397, 583443000),
-                    listOf(6u, 2u) to Rational(-11717559078469, 525098700),
-                    listOf(7u, 2u) to Rational(-2043385293517, 225042300),
-                    listOf(8u, 2u) to Rational(-3644439630451, 551353635),
-                    listOf(0u, 3u) to Rational(-1760423269, 126000),
-                    listOf(1u, 3u) to Rational(310176758299, 2352000),
-                    listOf(2u, 3u) to Rational(-907229584837, 21168000),
-                    listOf(3u, 3u) to Rational(-16717135885963, 95256000),
-                    listOf(4u, 3u) to Rational(-43762928025353, 333396000),
-                    listOf(5u, 3u) to Rational(-328427480571607, 3000564000),
-                    listOf(6u, 3u) to Rational(-7722675917197, 210039480),
-                    listOf(7u, 3u) to Rational(1713350137019, 1225230300),
-                    listOf(8u, 3u) to Rational(156695935643, 31505922),
-                    listOf(0u, 4u) to Rational(18362364269, 1008000),
-                    listOf(1u, 4u) to Rational(955674858553, 10584000),
-                    listOf(2u, 4u) to Rational(-71937470607371, 444528000),
-                    listOf(3u, 4u) to Rational(-34097985615163, 95256000),
-                    listOf(4u, 4u) to Rational(-340736178775883, 2000376000),
-                    listOf(5u, 4u) to Rational(-511324523441897, 10501974000),
-                    listOf(6u, 4u) to Rational(-125375649409151, 8821658160),
-                    listOf(7u, 4u) to Rational(-2813518533421, 1575296100),
-                    listOf(8u, 4u) to Rational(-17044089109, 5250987),
-                    listOf(0u, 5u) to Rational(600086461, 20160),
-                    listOf(1u, 5u) to Rational(-18959931367, 423360),
-                    listOf(2u, 5u) to Rational(-9178804929607, 44452800),
-                    listOf(3u, 5u) to Rational(-1460114275979, 5334336),
-                    listOf(4u, 5u) to Rational(-342533479090169, 4200789600),
-                    listOf(5u, 5u) to Rational(20335453022963, 4200789600),
-                    listOf(6u, 5u) to Rational(-21649775090197, 6301184400),
-                    listOf(7u, 5u) to Rational(-197301716069, 131274675),
-                    listOf(8u, 5u) to Rational(18711357470, 15752961),
-                    listOf(0u, 6u) to Rational(621417991, 100800),
-                    listOf(1u, 6u) to Rational(-159236792977, 2116800),
-                    listOf(2u, 6u) to Rational(-6602528890883, 66679200),
-                    listOf(3u, 6u) to Rational(-1086091664047, 19051200),
-                    listOf(4u, 6u) to Rational(3769375009003, 1680315840),
-                    listOf(5u, 6u) to Rational(-12920385574769, 1050197400),
-                    listOf(6u, 6u) to Rational(-90219591809287, 6301184400),
-                    listOf(7u, 6u) to Rational(656361553391, 1575296100),
-                    listOf(8u, 6u) to Rational(757900793, 2250423),
-                    listOf(0u, 7u) to Rational(-100770017, 15120),
-                    listOf(1u, 7u) to Rational(-316364851, 17640),
-                    listOf(2u, 7u) to Rational(-85118560057, 6667920),
-                    listOf(3u, 7u) to Rational(6286563719, 416745),
-                    listOf(4u, 7u) to Rational(26803885301, 1714608),
-                    listOf(5u, 7u) to Rational(-13767154393, 4286520),
-                    listOf(6u, 7u) to Rational(-3875138933, 1224720),
-                    listOf(7u, 7u) to Rational(65193755, 333396),
-                    listOf(8u, 7u) to Rational(90974351, 2500470),
-                    listOf(0u, 8u) to Rational(-3182197, 1260),
-                    listOf(1u, 8u) to Rational(24899923, 8820),
-                    listOf(2u, 8u) to Rational(-19999556, 19845),
-                    listOf(3u, 8u) to Rational(3276587, 3969),
-                    listOf(4u, 8u) to Rational(13719549239, 5000940),
-                    listOf(5u, 8u) to Rational(-961839938, 1250235),
-                    listOf(6u, 8u) to Rational(-198184871, 833490),
-                    listOf(7u, 8u) to Rational(230659711, 5000940),
-                    listOf(8u, 8u) to Rational(292447, 35721)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(9, 100),
-                    listOf(1u) to Rational(-21, 50),
-                    listOf(2u) to Rational(293, 700),
-                    listOf(3u) to Rational(29, 210),
-                    listOf(4u) to Rational(3233, 8820),
-                    listOf(5u) to Rational(-289, 441),
-                    listOf(6u) to Rational(-1, 9),
-                    listOf(7u) to Rational(-20, 441),
-                    listOf(8u) to Rational(100, 441),
-                    listOf(0u, 1u) to Rational(-57, 80),
-                    listOf(1u, 1u) to Rational(-121, 400),
-                    listOf(2u, 1u) to Rational(37117, 8400),
-                    listOf(3u, 1u) to Rational(-4853, 3150),
-                    listOf(4u, 1u) to Rational(1166203, 132300),
-                    listOf(5u, 1u) to Rational(-2708, 567),
-                    listOf(6u, 1u) to Rational(-287159, 416745),
-                    listOf(7u, 1u) to Rational(-478204, 83349),
-                    listOf(8u, 1u) to Rational(176320, 83349),
-                    listOf(0u, 2u) to Rational(-6239, 6400),
-                    listOf(1u, 2u) to Rational(264211, 11200),
-                    listOf(2u, 2u) to Rational(-1591999, 100800),
-                    listOf(3u, 2u) to Rational(12450091, 529200),
-                    listOf(4u, 2u) to Rational(9230759, 226800),
-                    listOf(5u, 2u) to Rational(18995554, 2083725),
-                    listOf(6u, 2u) to Rational(136706258, 6251175),
-                    listOf(7u, 2u) to Rational(-120907496, 3750705),
-                    listOf(8u, 2u) to Rational(117200176, 15752961),
-                    listOf(0u, 3u) to Rational(5653, 320),
-                    listOf(1u, 3u) to Rational(-130853, 8400),
-                    listOf(2u, 3u) to Rational(-20939327, 151200),
-                    listOf(3u, 3u) to Rational(2566691, 25200),
-                    listOf(4u, 3u) to Rational(-68441519, 476280),
-                    listOf(5u, 3u) to Rational(2462904247, 12502350),
-                    listOf(6u, 3u) to Rational(353667161, 18753525),
-                    listOf(7u, 3u) to Rational(-1689134372, 26254935),
-                    listOf(8u, 3u) to Rational(35084104, 2250423),
-                    listOf(0u, 4u) to Rational(-3587, 300),
-                    listOf(1u, 4u) to Rational(-10513243, 33600),
-                    listOf(2u, 4u) to Rational(30766733, 176400),
-                    listOf(3u, 4u) to Rational(-65680021, 198450),
-                    listOf(4u, 4u) to Rational(-8108910547, 20003760),
-                    listOf(5u, 4u) to Rational(2922125159, 6251175),
-                    listOf(6u, 4u) to Rational(-4245279943, 131274675),
-                    listOf(7u, 4u) to Rational(-371946872, 3750705),
-                    listOf(8u, 4u) to Rational(61286752, 2250423),
-                    listOf(0u, 5u) to Rational(-20477, 160),
-                    listOf(1u, 5u) to Rational(215741, 1120),
-                    listOf(2u, 5u) to Rational(30785843, 31752),
-                    listOf(3u, 5u) to Rational(-357495959, 317520),
-                    listOf(4u, 5u) to Rational(-1611242993, 10001880),
-                    listOf(5u, 5u) to Rational(345925495, 500094),
-                    listOf(6u, 5u) to Rational(-755948411, 3750705),
-                    listOf(7u, 5u) to Rational(-108643496, 1250235),
-                    listOf(8u, 5u) to Rational(1122512, 35721),
-                    listOf(0u, 6u) to Rational(358037, 2880),
-                    listOf(1u, 6u) to Rational(3895837, 3360),
-                    listOf(2u, 6u) to Rational(359419201, 1270080),
-                    listOf(3u, 6u) to Rational(-158522587, 105840),
-                    listOf(4u, 6u) to Rational(10909002599, 20003760),
-                    listOf(5u, 6u) to Rational(76846972, 138915),
-                    listOf(6u, 6u) to Rational(-327696553, 1250235),
-                    listOf(7u, 6u) to Rational(-1687328, 35721),
-                    listOf(8u, 6u) to Rational(1016836, 35721),
-                    listOf(0u, 7u) to Rational(658, 3),
-                    listOf(1u, 7u) to Rational(48035, 168),
-                    listOf(2u, 7u) to Rational(-5777875, 5292),
-                    listOf(3u, 7u) to Rational(-7893899, 10584),
-                    listOf(4u, 7u) to Rational(10191652, 11907),
-                    listOf(5u, 7u) to Rational(2920121, 23814),
-                    listOf(6u, 7u) to Rational(-2699780, 11907),
-                    listOf(7u, 7u) to Rational(4556, 441),
-                    listOf(8u, 7u) to Rational(3440, 189),
-                    listOf(0u, 8u) to Rational(64, 1),
-                    listOf(1u, 8u) to Rational(-808, 7),
-                    listOf(2u, 8u) to Rational(-360895, 1764),
-                    listOf(3u, 8u) to Rational(257657, 882),
-                    listOf(4u, 8u) to Rational(3779917, 15876),
-                    listOf(5u, 8u) to Rational(-610279, 3969),
-                    listOf(6u, 8u) to Rational(-25091, 441),
-                    listOf(7u, 8u) to Rational(9560, 567),
-                    listOf(8u, 8u) to Rational(400, 81)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, bufferOf(
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(17, 5),
-                        listOf(1u) to Rational(11, 6),
-                        listOf(2u) to Rational(14, 3),
-                        listOf(0u, 1u) to Rational(17, 1),
-                        listOf(1u, 1u) to Rational(12, 3),
-                        listOf(2u, 1u) to Rational(-6, 2),
-                        listOf(0u, 2u) to Rational(17, 1),
-                        listOf(1u, 2u) to Rational(-4, 3),
-                        listOf(2u, 2u) to Rational(2, 6),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(3, 5),
-                        listOf(1u) to Rational(3, 5),
-                        listOf(2u) to Rational(3, 7),
-                        listOf(0u, 1u) to Rational(-3, 8),
-                        listOf(1u, 1u) to Rational(-1, 1),
-                        listOf(2u, 1u) to Rational(17, 9),
-                        listOf(0u, 2u) to Rational(-8, 1),
-                        listOf(1u, 2u) to Rational(6, 4),
-                        listOf(2u, 2u) to Rational(10, 9),
-                    )
-                ),
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(18, 5),
-                        listOf(1u) to Rational(-17, 5),
-                        listOf(2u) to Rational(-2, 7),
-                        listOf(0u, 1u) to Rational(6, 5),
-                        listOf(1u, 1u) to Rational(-5, 1),
-                        listOf(2u, 1u) to Rational(-9, 1),
-                        listOf(0u, 2u) to Rational(-8, 8),
-                        listOf(1u, 2u) to Rational(2, 7),
-                        listOf(2u, 2u) to Rational(-13, 7),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-4, 8),
-                        listOf(1u) to Rational(15, 9),
-                        listOf(2u) to Rational(-10, 9),
-                        listOf(0u, 1u) to Rational(5, 3),
-                        listOf(1u, 1u) to Rational(4, 1),
-                        listOf(2u, 1u) to Rational(-2, 7),
-                        listOf(0u, 2u) to Rational(2, 2),
-                        listOf(1u, 2u) to Rational(-5, 7),
-                        listOf(2u, 2u) to Rational(-18, 9),
-                    )
-                ),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-66677, 3500),
-                    listOf(1u) to Rational(-206281, 10500),
-                    listOf(2u) to Rational(-412567, 7056),
-                    listOf(3u) to Rational(-310081, 11025),
-                    listOf(4u) to Rational(-575996, 15435),
-                    listOf(0u, 1u) to Rational(-573701, 4200),
-                    listOf(1u, 1u) to Rational(-2239001, 25200),
-                    listOf(2u, 1u) to Rational(-8817889, 132300),
-                    listOf(3u, 1u) to Rational(2317919, 44100),
-                    listOf(4u, 1u) to Rational(1169471, 6615),
-                    listOf(0u, 2u) to Rational(-4057819, 33600),
-                    listOf(1u, 2u) to Rational(1373311, 12600),
-                    listOf(2u, 2u) to Rational(32433493, 52920),
-                    listOf(3u, 2u) to Rational(4998053, 33075),
-                    listOf(4u, 2u) to Rational(-2147779, 8820),
-                    listOf(0u, 3u) to Rational(2018481, 2240),
-                    listOf(1u, 3u) to Rational(941713, 1440),
-                    listOf(2u, 3u) to Rational(183749, 6615),
-                    listOf(3u, 3u) to Rational(-4631023, 15876),
-                    listOf(4u, 3u) to Rational(25609336, 178605),
-                    listOf(0u, 4u) to Rational(11886431, 6720),
-                    listOf(1u, 4u) to Rational(18433, 504),
-                    listOf(2u, 4u) to Rational(-39613331, 45360),
-                    listOf(3u, 4u) to Rational(681619, 5670),
-                    listOf(4u, 4u) to Rational(-864841, 20412),
-                    listOf(0u, 5u) to Rational(343535, 1008),
-                    listOf(1u, 5u) to Rational(-33583, 72),
-                    listOf(2u, 5u) to Rational(1194625, 9072),
-                    listOf(3u, 5u) to Rational(-62917, 2268),
-                    listOf(4u, 5u) to Rational(157645, 10206),
-                    listOf(0u, 6u) to Rational(-1381, 3),
-                    listOf(1u, 6u) to Rational(919, 36),
-                    listOf(2u, 6u) to Rational(-3053, 36),
-                    listOf(3u, 6u) to Rational(2125, 324),
-                    listOf(4u, 6u) to Rational(-236, 243)
-                ),
-                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-5, 3),
-                    listOf(2u) to Rational(35, 9),
-                    listOf(3u) to Rational(-100, 27),
-                    listOf(4u) to Rational(100, 81),
-                    listOf(0u, 1u) to Rational(-5, 3),
-                    listOf(1u, 1u) to Rational(14, 9),
-                    listOf(2u, 1u) to Rational(1874, 189),
-                    listOf(3u, 1u) to Rational(-620, 63),
-                    listOf(4u, 1u) to Rational(40, 63),
-                    listOf(0u, 2u) to Rational(16, 9),
-                    listOf(1u, 2u) to Rational(365, 21),
-                    listOf(2u, 2u) to Rational(112, 9),
-                    listOf(3u, 2u) to Rational(-464, 63),
-                    listOf(4u, 2u) to Rational(1996, 441),
-                    listOf(0u, 3u) to Rational(10, 3),
-                    listOf(1u, 3u) to Rational(118, 21),
-                    listOf(2u, 3u) to Rational(-272, 21),
-                    listOf(3u, 3u) to Rational(-764, 49),
-                    listOf(4u, 3u) to Rational(8, 7),
-                    listOf(0u, 4u) to Rational(1, 1),
-                    listOf(1u, 4u) to Rational(-10, 7),
-                    listOf(2u, 4u) to Rational(-171, 49),
-                    listOf(3u, 4u) to Rational(20, 7),
-                    listOf(4u, 4u) to Rational(4, 1)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, bufferOf(
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(17, 5),
-                        listOf(1u) to Rational(11, 6),
-                        listOf(2u) to Rational(14, 3),
-                        listOf(0u, 1u) to Rational(17, 1),
-                        listOf(1u, 1u) to Rational(12, 3),
-                        listOf(2u, 1u) to Rational(-6, 2),
-                        listOf(0u, 2u) to Rational(17, 1),
-                        listOf(1u, 2u) to Rational(-4, 3),
-                        listOf(2u, 2u) to Rational(2, 6),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(3, 5),
-                        listOf(1u) to Rational(3, 5),
-                        listOf(2u) to Rational(3, 7),
-                        listOf(0u, 1u) to Rational(-3, 8),
-                        listOf(1u, 1u) to Rational(-1, 1),
-                        listOf(2u, 1u) to Rational(17, 9),
-                        listOf(0u, 2u) to Rational(-8, 1),
-                        listOf(1u, 2u) to Rational(6, 4),
-                        listOf(2u, 2u) to Rational(10, 9),
-                    )
-                ),
-            )),
-            "test 5"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(15, 7),
-                    listOf(1u) to Rational(1, 5),
-                    listOf(2u) to Rational(-7, 4),
-                    listOf(0u, 1u) to Rational(-1, 9),
-                    listOf(1u, 1u) to Rational(-2, 7),
-                    listOf(2u, 1u) to Rational(17, 3),
-                    listOf(0u, 2u) to Rational(2, 6),
-                    listOf(1u, 2u) to Rational(-17, 6),
-                    listOf(2u, 2u) to Rational(-6, 2),
-                ),
-                NumberedPolynomialAsIs(listOf<UInt>() to Rational(0, 1),
-                    listOf<UInt>() to Rational(0, 1)
-                )
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(15, 7),
-                listOf(1u) to Rational(1, 5),
-                listOf(2u) to Rational(-7, 4),
-                listOf(0u, 1u) to Rational(-1, 9),
-                listOf(1u, 1u) to Rational(-2, 7),
-                listOf(2u, 1u) to Rational(17, 3),
-                listOf(0u, 2u) to Rational(2, 6),
-                listOf(1u, 2u) to Rational(-17, 6),
-                listOf(2u, 2u) to Rational(-6, 2),
-            ).substitute(RationalField, bufferOf<NumberedRationalFunction<Rational>>()),
-            "test 6"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Double_Buffer() {
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(emptyList<UInt>() to 0.0),
-                NumberedPolynomialAsIs(emptyList<UInt>() to 1.0),
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 1.0,
-                    listOf(1u) to -2.0,
-                    listOf(2u) to 1.0,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 1.0,
-                )
-            ).substitute(bufferOf(
-                1.0
-            )),
-            0.001,
-            "test 1"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substitute(bufferOf()),
-            0.001,
-            "test 2"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 151.1502229133916,
-                    listOf(0u, 1u) to -262.3790170577034,
-                    listOf(0u, 2u) to 102.5097937392923,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to -367.9969733169944,
-                    listOf(0u, 1u) to 112.4911133334554,
-                    listOf(0u, 2u) to -469.755906895345,
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substitute(bufferOf(
-                -8.11707689492641,
-            )),
-            0.001,
-            "test 3"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 7.321261307532708,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to -575.6325831127576,
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substitute(bufferOf(
-                -8.11707689492641,
-                0.795265651276015,
-            )),
-            0.001,
-            "test 4"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 7.321261307532708,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to -575.6325831127576,
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substitute(bufferOf(
-                -8.11707689492641,
-                0.795265651276015,
-                0.9211194782050933
-            )),
-            0.001,
-            "test 5"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Constant_Buffer() {
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1),
-                    listOf(1u) to Rational(-2),
-                    listOf(2u) to Rational(1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            ).substitute(RationalField, bufferOf(
-                Rational(1)
-            )),
-            "test 1"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(22047, 2450),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-2204953, 147000),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, bufferOf(
-                Rational(7, 5),
-                Rational(-13, 7),
-                Rational(-16, 4),
-            )),
-            "test 2"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(22047, 2450),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-2204953, 147000),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, bufferOf(
-                Rational(7, 5),
-                Rational(-13, 7),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-939, 200),
-                    listOf(0u, 1u) to Rational(123, 50),
-                    listOf(0u, 2u) to Rational(1059, 200)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(121, 25),
-                    listOf(0u, 1u) to Rational(-949, 375),
-                    listOf(0u, 2u) to Rational(-1423, 200)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, bufferOf(
-                Rational(7, 5),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substitute(RationalField, bufferOf<Rational>()),
-            "test 5"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substitute_Polynomial_Buffer() {
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1),
-                    listOf(1u) to Rational(-2),
-                    listOf(2u) to Rational(1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            ).substitute(RationalField, bufferOf(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            )),
-            "test 1"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(211, 4),
-                    listOf(2u) to Rational(88, 3),
-                    listOf(3u) to Rational(-63, 8),
-                    listOf(4u) to Rational(441, 16),
-                    listOf(0u, 1u) to Rational(-671, 15),
-                    listOf(1u, 1u) to Rational(-551, 21),
-                    listOf(2u, 1u) to Rational(279, 25),
-                    listOf(3u, 1u) to Rational(231, 20),
-                    listOf(0u, 2u) to Rational(-1436, 1575),
-                    listOf(1u, 2u) to Rational(2471, 250),
-                    listOf(2u, 2u) to Rational(-4919, 100),
-                    listOf(0u, 3u) to Rational(-1464, 125),
-                    listOf(1u, 3u) to Rational(-264, 25),
-                    listOf(0u, 4u) to Rational(576, 25),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(-9, 4),
-                    listOf(2u) to Rational(943, 8),
-                    listOf(3u) to Rational(117, 8),
-                    listOf(4u) to Rational(147, 16),
-                    listOf(0u, 1u) to Rational(289, 90),
-                    listOf(1u, 1u) to Rational(-2692, 15),
-                    listOf(2u, 1u) to Rational(-1629, 140),
-                    listOf(3u, 1u) to Rational(77, 20),
-                    listOf(0u, 2u) to Rational(6187, 75),
-                    listOf(1u, 2u) to Rational(-2879, 175),
-                    listOf(2u, 2u) to Rational(-4919, 300),
-                    listOf(0u, 3u) to Rational(336, 25),
-                    listOf(1u, 3u) to Rational(-88, 25),
-                    listOf(0u, 4u) to Rational(192, 25),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, bufferOf(
-                NumberedPolynomialAsIs(
-                    listOf(1u) to Rational(3, 2),
-                    listOf(0u, 1u) to Rational(8, 5),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf(1u) to Rational(7, 2),
-                    listOf(0u, 1u) to Rational(-3, 1),
-                )
-            )),
-            "test 2"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1202861, 210),
-                    listOf(1u) to Rational(-215117, 45),
-                    listOf(2u) to Rational(10889651, 19845),
-                    listOf(3u) to Rational(-3503956, 6615),
-                    listOf(4u) to Rational(809066, 2205),
-                    listOf(5u) to Rational(-9056, 735),
-                    listOf(6u) to Rational(5396, 315),
-                    listOf(7u) to Rational(-752, 147),
-                    listOf(8u) to Rational(16, 49),
-                    listOf(0u, 1u) to Rational(1738469, 1470),
-                    listOf(1u, 1u) to Rational(-926238703, 52920),
-                    listOf(2u, 1u) to Rational(-44113982, 6615),
-                    listOf(3u, 1u) to Rational(10423519, 5292),
-                    listOf(4u, 1u) to Rational(3769712, 2205),
-                    listOf(5u, 1u) to Rational(8905046, 6615),
-                    listOf(6u, 1u) to Rational(1186972, 6615),
-                    listOf(7u, 1u) to Rational(22124, 441),
-                    listOf(8u, 1u) to Rational(-1504, 147),
-                    listOf(0u, 2u) to Rational(-54723628, 2205),
-                    listOf(1u, 2u) to Rational(70109407, 1323),
-                    listOf(2u, 2u) to Rational(151072591, 17640),
-                    listOf(3u, 2u) to Rational(1216428107, 52920),
-                    listOf(4u, 2u) to Rational(2587873193, 317520),
-                    listOf(5u, 2u) to Rational(393536369, 79380),
-                    listOf(6u, 2u) to Rational(137614937, 79380),
-                    listOf(7u, 2u) to Rational(566866, 1323),
-                    listOf(8u, 2u) to Rational(41848, 441),
-                    listOf(0u, 3u) to Rational(-19470406, 2205),
-                    listOf(1u, 3u) to Rational(72514195, 882),
-                    listOf(2u, 3u) to Rational(-78090707, 1764),
-                    listOf(3u, 3u) to Rational(-1988237707, 26460),
-                    listOf(4u, 3u) to Rational(-802137919, 17640),
-                    listOf(5u, 3u) to Rational(-139989463, 5880),
-                    listOf(6u, 3u) to Rational(-26066641, 3780),
-                    listOf(7u, 3u) to Rational(-2363369, 1323),
-                    listOf(8u, 3u) to Rational(-108280, 441),
-                    listOf(0u, 4u) to Rational(14878516, 441),
-                    listOf(1u, 4u) to Rational(-253416724, 2205),
-                    listOf(2u, 4u) to Rational(16699157, 840),
-                    listOf(3u, 4u) to Rational(-105220979, 13230),
-                    listOf(4u, 4u) to Rational(208266383, 5880),
-                    listOf(5u, 4u) to Rational(650135309, 26460),
-                    listOf(6u, 4u) to Rational(123808663, 11760),
-                    listOf(7u, 4u) to Rational(8563385, 2646),
-                    listOf(8u, 4u) to Rational(19721, 49),
-                    listOf(0u, 5u) to Rational(675645, 49),
-                    listOf(1u, 5u) to Rational(-70554077, 588),
-                    listOf(2u, 5u) to Rational(157884029, 980),
-                    listOf(3u, 5u) to Rational(489548623, 4410),
-                    listOf(4u, 5u) to Rational(148540519, 17640),
-                    listOf(5u, 5u) to Rational(-5559551, 392),
-                    listOf(6u, 5u) to Rational(-18335711, 1470),
-                    listOf(7u, 5u) to Rational(-38437, 9),
-                    listOf(8u, 5u) to Rational(-29620, 63),
-                    listOf(0u, 6u) to Rational(-727625, 49),
-                    listOf(1u, 6u) to Rational(7046685, 98),
-                    listOf(2u, 6u) to Rational(-334814231, 7056),
-                    listOf(3u, 6u) to Rational(-243971737, 17640),
-                    listOf(4u, 6u) to Rational(-571116659, 35280),
-                    listOf(5u, 6u) to Rational(567538, 315),
-                    listOf(6u, 6u) to Rational(3199768, 315),
-                    listOf(7u, 6u) to Rational(227744, 63),
-                    listOf(8u, 6u) to Rational(23116, 63),
-                    listOf(0u, 7u) to Rational(-27500, 7),
-                    listOf(1u, 7u) to Rational(120125, 3),
-                    listOf(2u, 7u) to Rational(-279200, 3),
-                    listOf(3u, 7u) to Rational(-100160, 7),
-                    listOf(4u, 7u) to Rational(920452, 21),
-                    listOf(5u, 7u) to Rational(226481, 21),
-                    listOf(6u, 7u) to Rational(-34428, 7),
-                    listOf(7u, 7u) to Rational(-6232, 3),
-                    listOf(8u, 7u) to Rational(-608, 3),
-                    listOf(0u, 8u) to Rational(2500, 1),
-                    listOf(1u, 8u) to Rational(-19000, 1),
-                    listOf(2u, 8u) to Rational(37900, 1),
-                    listOf(3u, 8u) to Rational(-1840, 1),
-                    listOf(4u, 8u) to Rational(-17876, 1),
-                    listOf(5u, 8u) to Rational(-1240, 1),
-                    listOf(6u, 8u) to Rational(2788, 1),
-                    listOf(7u, 8u) to Rational(800, 1),
-                    listOf(8u, 8u) to Rational(64, 1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(162487, 63),
-                    listOf(1u) to Rational(-92713, 54),
-                    listOf(2u) to Rational(802436, 1323),
-                    listOf(3u) to Rational(-55088, 441),
-                    listOf(4u) to Rational(1404034, 9261),
-                    listOf(5u) to Rational(-5804, 1029),
-                    listOf(6u) to Rational(51556, 9261),
-                    listOf(7u) to Rational(-752, 441),
-                    listOf(8u) to Rational(16, 147),
-                    listOf(0u, 1u) to Rational(296071, 441),
-                    listOf(1u, 1u) to Rational(-4991281, 882),
-                    listOf(2u, 1u) to Rational(-18702811, 9261),
-                    listOf(3u, 1u) to Rational(40759043, 27783),
-                    listOf(4u, 1u) to Rational(19768501, 27783),
-                    listOf(5u, 1u) to Rational(14307337, 27783),
-                    listOf(6u, 1u) to Rational(1655684, 27783),
-                    listOf(7u, 1u) to Rational(22124, 1323),
-                    listOf(8u, 1u) to Rational(-1504, 441),
-                    listOf(0u, 2u) to Rational(-27667474, 3087),
-                    listOf(1u, 2u) to Rational(265605901, 12348),
-                    listOf(2u, 2u) to Rational(160360775, 98784),
-                    listOf(3u, 2u) to Rational(1169992093, 148176),
-                    listOf(4u, 2u) to Rational(3978014077, 1333584),
-                    listOf(5u, 2u) to Rational(567058123, 333396),
-                    listOf(6u, 2u) to Rational(205132579, 333396),
-                    listOf(7u, 2u) to Rational(566866, 3969),
-                    listOf(8u, 2u) to Rational(41848, 1323),
-                    listOf(0u, 3u) to Rational(-2228822, 1029),
-                    listOf(1u, 3u) to Rational(80179390, 3087),
-                    listOf(2u, 3u) to Rational(-1378630487, 74088),
-                    listOf(3u, 3u) to Rational(-3385811693, 111132),
-                    listOf(4u, 3u) to Rational(-820686977, 49392),
-                    listOf(5u, 3u) to Rational(-89101027, 10584),
-                    listOf(6u, 3u) to Rational(-37847387, 15876),
-                    listOf(7u, 3u) to Rational(-2363369, 3969),
-                    listOf(8u, 3u) to Rational(-108280, 1323),
-                    listOf(0u, 4u) to Rational(12619982, 1029),
-                    listOf(1u, 4u) to Rational(-277723177, 6174),
-                    listOf(2u, 4u) to Rational(649414169, 49392),
-                    listOf(3u, 4u) to Rational(14457595, 63504),
-                    listOf(4u, 4u) to Rational(139270339, 10584),
-                    listOf(5u, 4u) to Rational(140367961, 15876),
-                    listOf(6u, 4u) to Rational(25467083, 7056),
-                    listOf(7u, 4u) to Rational(8563385, 7938),
-                    listOf(8u, 4u) to Rational(19721, 147),
-                    listOf(0u, 5u) to Rational(643850, 147),
-                    listOf(1u, 5u) to Rational(-11818025, 294),
-                    listOf(2u, 5u) to Rational(33963203, 588),
-                    listOf(3u, 5u) to Rational(207216235, 5292),
-                    listOf(4u, 5u) to Rational(2861021, 1512),
-                    listOf(5u, 5u) to Rational(-6302335, 1176),
-                    listOf(6u, 5u) to Rational(-3738587, 882),
-                    listOf(7u, 5u) to Rational(-38437, 27),
-                    listOf(8u, 5u) to Rational(-29620, 189),
-                    listOf(0u, 6u) to Rational(-248725, 49),
-                    listOf(1u, 6u) to Rational(2478535, 98),
-                    listOf(2u, 6u) to Rational(-399721367, 21168),
-                    listOf(3u, 6u) to Rational(-54309317, 10584),
-                    listOf(4u, 6u) to Rational(-95398327, 21168),
-                    listOf(5u, 6u) to Rational(173750, 189),
-                    listOf(6u, 6u) to Rational(92216, 27),
-                    listOf(7u, 6u) to Rational(227744, 189),
-                    listOf(8u, 6u) to Rational(23116, 189),
-                    listOf(0u, 7u) to Rational(-27500, 21),
-                    listOf(1u, 7u) to Rational(120125, 9),
-                    listOf(2u, 7u) to Rational(-279200, 9),
-                    listOf(3u, 7u) to Rational(-100160, 21),
-                    listOf(4u, 7u) to Rational(920452, 63),
-                    listOf(5u, 7u) to Rational(226481, 63),
-                    listOf(6u, 7u) to Rational(-11476, 7),
-                    listOf(7u, 7u) to Rational(-6232, 9),
-                    listOf(8u, 7u) to Rational(-608, 9),
-                    listOf(0u, 8u) to Rational(2500, 3),
-                    listOf(1u, 8u) to Rational(-19000, 3),
-                    listOf(2u, 8u) to Rational(37900, 3),
-                    listOf(3u, 8u) to Rational(-1840, 3),
-                    listOf(4u, 8u) to Rational(-17876, 3),
-                    listOf(5u, 8u) to Rational(-1240, 3),
-                    listOf(6u, 8u) to Rational(2788, 3),
-                    listOf(7u, 8u) to Rational(800, 3),
-                    listOf(8u, 8u) to Rational(64, 3)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, bufferOf(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(18, 1),
-                    listOf(1u) to Rational(16, 3),
-                    listOf(2u) to Rational(12, 6),
-                    listOf(0u, 1u) to Rational(13, 1),
-                    listOf(1u, 1u) to Rational(-11, 4),
-                    listOf(2u, 1u) to Rational(-1, 1),
-                    listOf(0u, 2u) to Rational(-10, 1),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(2, 1),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(8, 2),
-                    listOf(1u) to Rational(-15, 5),
-                    listOf(2u) to Rational(2, 7),
-                    listOf(0u, 1u) to Rational(-18, 7),
-                    listOf(1u, 1u) to Rational(-16, 6),
-                    listOf(2u, 1u) to Rational(-13, 3),
-                    listOf(0u, 2u) to Rational(-5, 1),
-                    listOf(1u, 2u) to Rational(17, 1),
-                    listOf(2u, 2u) to Rational(8, 2),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-6, 1),
-                    listOf(1u) to Rational(-9, 8),
-                    listOf(2u) to Rational(17, 5),
-                    listOf(0u, 1u) to Rational(-2, 3),
-                    listOf(1u, 1u) to Rational(1, 5),
-                    listOf(2u, 1u) to Rational(-11, 7),
-                    listOf(0u, 2u) to Rational(13, 6),
-                    listOf(1u, 2u) to Rational(-15, 2),
-                    listOf(2u, 2u) to Rational(-14, 4),
-                )
-            )),
-            "test 3"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1202861, 210),
-                    listOf(1u) to Rational(-215117, 45),
-                    listOf(2u) to Rational(10889651, 19845),
-                    listOf(3u) to Rational(-3503956, 6615),
-                    listOf(4u) to Rational(809066, 2205),
-                    listOf(5u) to Rational(-9056, 735),
-                    listOf(6u) to Rational(5396, 315),
-                    listOf(7u) to Rational(-752, 147),
-                    listOf(8u) to Rational(16, 49),
-                    listOf(0u, 1u) to Rational(1738469, 1470),
-                    listOf(1u, 1u) to Rational(-926238703, 52920),
-                    listOf(2u, 1u) to Rational(-44113982, 6615),
-                    listOf(3u, 1u) to Rational(10423519, 5292),
-                    listOf(4u, 1u) to Rational(3769712, 2205),
-                    listOf(5u, 1u) to Rational(8905046, 6615),
-                    listOf(6u, 1u) to Rational(1186972, 6615),
-                    listOf(7u, 1u) to Rational(22124, 441),
-                    listOf(8u, 1u) to Rational(-1504, 147),
-                    listOf(0u, 2u) to Rational(-54723628, 2205),
-                    listOf(1u, 2u) to Rational(70109407, 1323),
-                    listOf(2u, 2u) to Rational(151072591, 17640),
-                    listOf(3u, 2u) to Rational(1216428107, 52920),
-                    listOf(4u, 2u) to Rational(2587873193, 317520),
-                    listOf(5u, 2u) to Rational(393536369, 79380),
-                    listOf(6u, 2u) to Rational(137614937, 79380),
-                    listOf(7u, 2u) to Rational(566866, 1323),
-                    listOf(8u, 2u) to Rational(41848, 441),
-                    listOf(0u, 3u) to Rational(-19470406, 2205),
-                    listOf(1u, 3u) to Rational(72514195, 882),
-                    listOf(2u, 3u) to Rational(-78090707, 1764),
-                    listOf(3u, 3u) to Rational(-1988237707, 26460),
-                    listOf(4u, 3u) to Rational(-802137919, 17640),
-                    listOf(5u, 3u) to Rational(-139989463, 5880),
-                    listOf(6u, 3u) to Rational(-26066641, 3780),
-                    listOf(7u, 3u) to Rational(-2363369, 1323),
-                    listOf(8u, 3u) to Rational(-108280, 441),
-                    listOf(0u, 4u) to Rational(14878516, 441),
-                    listOf(1u, 4u) to Rational(-253416724, 2205),
-                    listOf(2u, 4u) to Rational(16699157, 840),
-                    listOf(3u, 4u) to Rational(-105220979, 13230),
-                    listOf(4u, 4u) to Rational(208266383, 5880),
-                    listOf(5u, 4u) to Rational(650135309, 26460),
-                    listOf(6u, 4u) to Rational(123808663, 11760),
-                    listOf(7u, 4u) to Rational(8563385, 2646),
-                    listOf(8u, 4u) to Rational(19721, 49),
-                    listOf(0u, 5u) to Rational(675645, 49),
-                    listOf(1u, 5u) to Rational(-70554077, 588),
-                    listOf(2u, 5u) to Rational(157884029, 980),
-                    listOf(3u, 5u) to Rational(489548623, 4410),
-                    listOf(4u, 5u) to Rational(148540519, 17640),
-                    listOf(5u, 5u) to Rational(-5559551, 392),
-                    listOf(6u, 5u) to Rational(-18335711, 1470),
-                    listOf(7u, 5u) to Rational(-38437, 9),
-                    listOf(8u, 5u) to Rational(-29620, 63),
-                    listOf(0u, 6u) to Rational(-727625, 49),
-                    listOf(1u, 6u) to Rational(7046685, 98),
-                    listOf(2u, 6u) to Rational(-334814231, 7056),
-                    listOf(3u, 6u) to Rational(-243971737, 17640),
-                    listOf(4u, 6u) to Rational(-571116659, 35280),
-                    listOf(5u, 6u) to Rational(567538, 315),
-                    listOf(6u, 6u) to Rational(3199768, 315),
-                    listOf(7u, 6u) to Rational(227744, 63),
-                    listOf(8u, 6u) to Rational(23116, 63),
-                    listOf(0u, 7u) to Rational(-27500, 7),
-                    listOf(1u, 7u) to Rational(120125, 3),
-                    listOf(2u, 7u) to Rational(-279200, 3),
-                    listOf(3u, 7u) to Rational(-100160, 7),
-                    listOf(4u, 7u) to Rational(920452, 21),
-                    listOf(5u, 7u) to Rational(226481, 21),
-                    listOf(6u, 7u) to Rational(-34428, 7),
-                    listOf(7u, 7u) to Rational(-6232, 3),
-                    listOf(8u, 7u) to Rational(-608, 3),
-                    listOf(0u, 8u) to Rational(2500, 1),
-                    listOf(1u, 8u) to Rational(-19000, 1),
-                    listOf(2u, 8u) to Rational(37900, 1),
-                    listOf(3u, 8u) to Rational(-1840, 1),
-                    listOf(4u, 8u) to Rational(-17876, 1),
-                    listOf(5u, 8u) to Rational(-1240, 1),
-                    listOf(6u, 8u) to Rational(2788, 1),
-                    listOf(7u, 8u) to Rational(800, 1),
-                    listOf(8u, 8u) to Rational(64, 1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(162487, 63),
-                    listOf(1u) to Rational(-92713, 54),
-                    listOf(2u) to Rational(802436, 1323),
-                    listOf(3u) to Rational(-55088, 441),
-                    listOf(4u) to Rational(1404034, 9261),
-                    listOf(5u) to Rational(-5804, 1029),
-                    listOf(6u) to Rational(51556, 9261),
-                    listOf(7u) to Rational(-752, 441),
-                    listOf(8u) to Rational(16, 147),
-                    listOf(0u, 1u) to Rational(296071, 441),
-                    listOf(1u, 1u) to Rational(-4991281, 882),
-                    listOf(2u, 1u) to Rational(-18702811, 9261),
-                    listOf(3u, 1u) to Rational(40759043, 27783),
-                    listOf(4u, 1u) to Rational(19768501, 27783),
-                    listOf(5u, 1u) to Rational(14307337, 27783),
-                    listOf(6u, 1u) to Rational(1655684, 27783),
-                    listOf(7u, 1u) to Rational(22124, 1323),
-                    listOf(8u, 1u) to Rational(-1504, 441),
-                    listOf(0u, 2u) to Rational(-27667474, 3087),
-                    listOf(1u, 2u) to Rational(265605901, 12348),
-                    listOf(2u, 2u) to Rational(160360775, 98784),
-                    listOf(3u, 2u) to Rational(1169992093, 148176),
-                    listOf(4u, 2u) to Rational(3978014077, 1333584),
-                    listOf(5u, 2u) to Rational(567058123, 333396),
-                    listOf(6u, 2u) to Rational(205132579, 333396),
-                    listOf(7u, 2u) to Rational(566866, 3969),
-                    listOf(8u, 2u) to Rational(41848, 1323),
-                    listOf(0u, 3u) to Rational(-2228822, 1029),
-                    listOf(1u, 3u) to Rational(80179390, 3087),
-                    listOf(2u, 3u) to Rational(-1378630487, 74088),
-                    listOf(3u, 3u) to Rational(-3385811693, 111132),
-                    listOf(4u, 3u) to Rational(-820686977, 49392),
-                    listOf(5u, 3u) to Rational(-89101027, 10584),
-                    listOf(6u, 3u) to Rational(-37847387, 15876),
-                    listOf(7u, 3u) to Rational(-2363369, 3969),
-                    listOf(8u, 3u) to Rational(-108280, 1323),
-                    listOf(0u, 4u) to Rational(12619982, 1029),
-                    listOf(1u, 4u) to Rational(-277723177, 6174),
-                    listOf(2u, 4u) to Rational(649414169, 49392),
-                    listOf(3u, 4u) to Rational(14457595, 63504),
-                    listOf(4u, 4u) to Rational(139270339, 10584),
-                    listOf(5u, 4u) to Rational(140367961, 15876),
-                    listOf(6u, 4u) to Rational(25467083, 7056),
-                    listOf(7u, 4u) to Rational(8563385, 7938),
-                    listOf(8u, 4u) to Rational(19721, 147),
-                    listOf(0u, 5u) to Rational(643850, 147),
-                    listOf(1u, 5u) to Rational(-11818025, 294),
-                    listOf(2u, 5u) to Rational(33963203, 588),
-                    listOf(3u, 5u) to Rational(207216235, 5292),
-                    listOf(4u, 5u) to Rational(2861021, 1512),
-                    listOf(5u, 5u) to Rational(-6302335, 1176),
-                    listOf(6u, 5u) to Rational(-3738587, 882),
-                    listOf(7u, 5u) to Rational(-38437, 27),
-                    listOf(8u, 5u) to Rational(-29620, 189),
-                    listOf(0u, 6u) to Rational(-248725, 49),
-                    listOf(1u, 6u) to Rational(2478535, 98),
-                    listOf(2u, 6u) to Rational(-399721367, 21168),
-                    listOf(3u, 6u) to Rational(-54309317, 10584),
-                    listOf(4u, 6u) to Rational(-95398327, 21168),
-                    listOf(5u, 6u) to Rational(173750, 189),
-                    listOf(6u, 6u) to Rational(92216, 27),
-                    listOf(7u, 6u) to Rational(227744, 189),
-                    listOf(8u, 6u) to Rational(23116, 189),
-                    listOf(0u, 7u) to Rational(-27500, 21),
-                    listOf(1u, 7u) to Rational(120125, 9),
-                    listOf(2u, 7u) to Rational(-279200, 9),
-                    listOf(3u, 7u) to Rational(-100160, 21),
-                    listOf(4u, 7u) to Rational(920452, 63),
-                    listOf(5u, 7u) to Rational(226481, 63),
-                    listOf(6u, 7u) to Rational(-11476, 7),
-                    listOf(7u, 7u) to Rational(-6232, 9),
-                    listOf(8u, 7u) to Rational(-608, 9),
-                    listOf(0u, 8u) to Rational(2500, 3),
-                    listOf(1u, 8u) to Rational(-19000, 3),
-                    listOf(2u, 8u) to Rational(37900, 3),
-                    listOf(3u, 8u) to Rational(-1840, 3),
-                    listOf(4u, 8u) to Rational(-17876, 3),
-                    listOf(5u, 8u) to Rational(-1240, 3),
-                    listOf(6u, 8u) to Rational(2788, 3),
-                    listOf(7u, 8u) to Rational(800, 3),
-                    listOf(8u, 8u) to Rational(64, 3)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, bufferOf(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(18, 1),
-                    listOf(1u) to Rational(16, 3),
-                    listOf(2u) to Rational(12, 6),
-                    listOf(0u, 1u) to Rational(13, 1),
-                    listOf(1u, 1u) to Rational(-11, 4),
-                    listOf(2u, 1u) to Rational(-1, 1),
-                    listOf(0u, 2u) to Rational(-10, 1),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(2, 1),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(8, 2),
-                    listOf(1u) to Rational(-15, 5),
-                    listOf(2u) to Rational(2, 7),
-                    listOf(0u, 1u) to Rational(-18, 7),
-                    listOf(1u, 1u) to Rational(-16, 6),
-                    listOf(2u, 1u) to Rational(-13, 3),
-                    listOf(0u, 2u) to Rational(-5, 1),
-                    listOf(1u, 2u) to Rational(17, 1),
-                    listOf(2u, 2u) to Rational(8, 2),
-                ),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-409, 6),
-                    listOf(1u) to Rational(-376, 9),
-                    listOf(2u) to Rational(-1781, 81),
-                    listOf(3u) to Rational(-128, 27),
-                    listOf(4u) to Rational(-8, 9),
-                    listOf(0u, 1u) to Rational(18701, 210),
-                    listOf(1u, 1u) to Rational(614183, 7560),
-                    listOf(2u, 1u) to Rational(90941, 1890),
-                    listOf(3u, 1u) to Rational(1802, 135),
-                    listOf(4u, 1u) to Rational(112, 45),
-                    listOf(0u, 2u) to Rational(181421, 315),
-                    listOf(1u, 2u) to Rational(77813, 378),
-                    listOf(2u, 2u) to Rational(598583, 7560),
-                    listOf(3u, 2u) to Rational(85, 27),
-                    listOf(4u, 2u) to Rational(2, 5),
-                    listOf(0u, 3u) to Rational(130997, 315),
-                    listOf(1u, 3u) to Rational(1093, 420),
-                    listOf(2u, 3u) to Rational(9551, 2520),
-                    listOf(3u, 3u) to Rational(-14, 45),
-                    listOf(4u, 3u) to Rational(22, 45),
-                    listOf(0u, 4u) to Rational(-2801, 9),
-                    listOf(1u, 4u) to Rational(4033, 90),
-                    listOf(2u, 4u) to Rational(6429, 80),
-                    listOf(3u, 4u) to Rational(2851, 90),
-                    listOf(4u, 4u) to Rational(293, 45),
-                    listOf(0u, 5u) to Rational(-220, 1),
-                    listOf(1u, 5u) to Rational(127, 1),
-                    listOf(2u, 5u) to Rational(202, 5),
-                    listOf(3u, 5u) to Rational(-63, 5),
-                    listOf(4u, 5u) to Rational(-12, 5),
-                    listOf(0u, 6u) to Rational(100, 1),
-                    listOf(1u, 6u) to Rational(-80, 1),
-                    listOf(2u, 6u) to Rational(-24, 1),
-                    listOf(3u, 6u) to Rational(16, 1),
-                    listOf(4u, 6u) to Rational(4, 1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5407, 9),
-                    listOf(1u) to Rational(9568, 27),
-                    listOf(2u) to Rational(4996, 27),
-                    listOf(3u) to Rational(352, 9),
-                    listOf(4u) to Rational(22, 3),
-                    listOf(0u, 1u) to Rational(104411, 126),
-                    listOf(1u, 1u) to Rational(6001, 126),
-                    listOf(2u, 1u) to Rational(-796, 21),
-                    listOf(3u, 1u) to Rational(-5389, 126),
-                    listOf(4u, 1u) to Rational(-166, 21),
-                    listOf(0u, 2u) to Rational(-35327, 126),
-                    listOf(1u, 2u) to Rational(53, 252),
-                    listOf(2u, 2u) to Rational(849197, 6048),
-                    listOf(3u, 2u) to Rational(22361, 252),
-                    listOf(4u, 2u) to Rational(773, 42),
-                    listOf(0u, 3u) to Rational(-6067, 21),
-                    listOf(1u, 3u) to Rational(39049, 126),
-                    listOf(2u, 3u) to Rational(80303, 1008),
-                    listOf(3u, 3u) to Rational(-3035, 63),
-                    listOf(4u, 3u) to Rational(-209, 21),
-                    listOf(0u, 4u) to Rational(3113, 21),
-                    listOf(1u, 4u) to Rational(-22345, 126),
-                    listOf(2u, 4u) to Rational(-30931, 1008),
-                    listOf(3u, 4u) to Rational(5837, 126),
-                    listOf(4u, 4u) to Rational(229, 21),
-                    listOf(0u, 5u) to Rational(-2120, 21),
-                    listOf(1u, 5u) to Rational(451, 7),
-                    listOf(2u, 5u) to Rational(422, 21),
-                    listOf(3u, 5u) to Rational(-181, 21),
-                    listOf(4u, 5u) to Rational(-40, 21),
-                    listOf(0u, 6u) to Rational(100, 3),
-                    listOf(1u, 6u) to Rational(-80, 3),
-                    listOf(2u, 6u) to Rational(-8, 1),
-                    listOf(3u, 6u) to Rational(16, 3),
-                    listOf(4u, 6u) to Rational(4, 3)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, bufferOf(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(18, 1),
-                    listOf(1u) to Rational(16, 3),
-                    listOf(2u) to Rational(12, 6),
-                    listOf(0u, 1u) to Rational(13, 1),
-                    listOf(1u, 1u) to Rational(-11, 4),
-                    listOf(2u, 1u) to Rational(-1, 1),
-                    listOf(0u, 2u) to Rational(-10, 1),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(2, 1),
-                ),
-            )),
-            "test 5"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(5, 6),
-                    listOf(1u) to Rational(1, 6),
-                    listOf(2u) to Rational(-2, 9),
-                    listOf(0u, 1u) to Rational(15, 1),
-                    listOf(1u, 1u) to Rational(18, 7),
-                    listOf(2u, 1u) to Rational(2, 5),
-                    listOf(0u, 2u) to Rational(12, 9),
-                    listOf(1u, 2u) to Rational(-3, 5),
-                    listOf(2u, 2u) to Rational(4, 4),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-11, 9),
-                    listOf(1u) to Rational(4, 9),
-                    listOf(2u) to Rational(11, 6),
-                    listOf(0u, 1u) to Rational(-5, 6),
-                    listOf(1u, 1u) to Rational(4, 6),
-                    listOf(2u, 1u) to Rational(-1, 7),
-                    listOf(0u, 2u) to Rational(9, 1),
-                    listOf(1u, 2u) to Rational(6, 7),
-                    listOf(2u, 2u) to Rational(1, 3),
-                )
-            ).substitute(RationalField, bufferOf<NumberedPolynomial<Rational>>()),
-            "test 6"
-        )
-    }
-    @Test
-    @Ignore // FIXME: This tests work only for sane realisations of the substitutions. Currently, it is not.
-            //  Sane algorithm for substitution p(q/r) (p, q, and r are polynomials) should return denominator r^deg(p),
-            //  not r^(deg(p)(deg(p)+1)/2) as it is now.
-    fun test_RationalFunction_substitute_RationalFunction_Buffer() {
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(0)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1),
-                    listOf(1u) to Rational(-2),
-                    listOf(2u) to Rational(1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                ),
-            ).substitute(RationalField, bufferOf(
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(1)
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(1)
-                    )
-                )
-            )),
-            "test 1"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf(4u) to Rational(-17166109, 793800),
-                    listOf(3u, 1u) to Rational(-930960143, 5556600),
-                    listOf(2u, 2u) to Rational(-144665109691, 350065800),
-                    listOf(1u, 3u) to Rational(-17232577, 52920),
-                    listOf(0u, 4u) to Rational(-68141, 1323),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf(4u) to Rational(-57522533, 14288400),
-                    listOf(3u, 1u) to Rational(-13085162953, 300056400),
-                    listOf(2u, 2u) to Rational(-92093367341, 525098700),
-                    listOf(1u, 3u) to Rational(-1979342797, 6667920),
-                    listOf(0u, 4u) to Rational(-3082727, 21168),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, bufferOf(
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(11, 5),
-                        listOf(0u, 1u) to Rational(8, 4),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(1, 9),
-                        listOf(0u, 1u) to Rational(11, 7),
-                    )
-                ),
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(-2, 7),
-                        listOf(0u, 1u) to Rational(-4, 3),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf(1u) to Rational(3, 6),
-                        listOf(0u, 1u) to Rational(12, 8),
-                    )
-                ),
-            )),
-            "test 2"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-130778291, 76800),
-                    listOf(1u) to Rational(-445270919, 230400),
-                    listOf(2u) to Rational(44578444937, 14515200),
-                    listOf(3u) to Rational(17329402153, 1555200),
-                    listOf(4u) to Rational(89239926809, 2332800),
-                    listOf(5u) to Rational(2808812267, 145152),
-                    listOf(6u) to Rational(-21362661007, 725760),
-                    listOf(7u) to Rational(-258455443, 2016),
-                    listOf(8u) to Rational(-21454693, 96),
-                    listOf(0u, 1u) to Rational(-1002137, 15360),
-                    listOf(1u, 1u) to Rational(-1704849697, 430080),
-                    listOf(2u, 1u) to Rational(-57657676789, 4838400),
-                    listOf(3u, 1u) to Rational(-101331731, 89600),
-                    listOf(4u, 1u) to Rational(5362280079329, 130636800),
-                    listOf(5u, 1u) to Rational(4069896167053, 130636800),
-                    listOf(6u, 1u) to Rational(12011514569, 544320),
-                    listOf(7u, 1u) to Rational(138293195623, 725760),
-                    listOf(8u, 1u) to Rational(6228779419, 48384),
-                    listOf(0u, 2u) to Rational(-32395872823, 8064000),
-                    listOf(1u, 2u) to Rational(-7398505523, 2304000),
-                    listOf(2u, 2u) to Rational(95217051699521, 3048192000),
-                    listOf(3u, 2u) to Rational(198026968812079, 3657830400),
-                    listOf(4u, 2u) to Rational(4291645618499, 228614400),
-                    listOf(5u, 2u) to Rational(-33211690942439, 914457600),
-                    listOf(6u, 2u) to Rational(-637385538163153, 1371686400),
-                    listOf(7u, 2u) to Rational(-138671528276273, 182891520),
-                    listOf(8u, 2u) to Rational(-14566368751, 217728),
-                    listOf(0u, 3u) to Rational(-10538718719, 2016000),
-                    listOf(1u, 3u) to Rational(-1844485375199, 84672000),
-                    listOf(2u, 3u) to Rational(103968665891, 12096000),
-                    listOf(3u, 3u) to Rational(175402107278351, 1828915200),
-                    listOf(4u, 3u) to Rational(8020699588879, 114307200),
-                    listOf(5u, 3u) to Rational(3414841894991, 38102400),
-                    listOf(6u, 3u) to Rational(1848405591611, 4665600),
-                    listOf(7u, 3u) to Rational(39486708738989, 137168640),
-                    listOf(8u, 3u) to Rational(255926289517, 9144576),
-                    listOf(0u, 4u) to Rational(-655379564629, 105840000),
-                    listOf(1u, 4u) to Rational(-208336039441, 127008000),
-                    listOf(2u, 4u) to Rational(40173146771411, 1143072000),
-                    listOf(3u, 4u) to Rational(150473493581239, 2667168000),
-                    listOf(4u, 4u) to Rational(38833783990483, 1143072000),
-                    listOf(5u, 4u) to Rational(-1963676248203053, 4800902400),
-                    listOf(6u, 4u) to Rational(-2598759412825747, 3200601600),
-                    listOf(7u, 4u) to Rational(-192895352019667, 1280240640),
-                    listOf(8u, 4u) to Rational(3737382679, 6858432),
-                    listOf(0u, 5u) to Rational(-16959378721, 1890000),
-                    listOf(1u, 5u) to Rational(-1864802244743, 79380000),
-                    listOf(2u, 5u) to Rational(13449261536489, 666792000),
-                    listOf(3u, 5u) to Rational(215272234137329, 2667168000),
-                    listOf(4u, 5u) to Rational(6040691379277, 83349000),
-                    listOf(5u, 5u) to Rational(153687143525887, 800150400),
-                    listOf(6u, 5u) to Rational(475602854903563, 2400451200),
-                    listOf(7u, 5u) to Rational(27315599358749, 640120320),
-                    listOf(8u, 5u) to Rational(-2630413357, 10668672),
-                    listOf(0u, 6u) to Rational(-6654999511, 2646000),
-                    listOf(1u, 6u) to Rational(-67885252327, 15876000),
-                    listOf(2u, 6u) to Rational(5786776220983, 2667168000),
-                    listOf(3u, 6u) to Rational(60615922629083, 1143072000),
-                    listOf(4u, 6u) to Rational(-34703539637627407, 672126336000),
-                    listOf(5u, 6u) to Rational(-744694192134101, 2240421120),
-                    listOf(6u, 6u) to Rational(-1782470617231, 14817600),
-                    listOf(7u, 6u) to Rational(59123208433, 8890560),
-                    listOf(8u, 6u) to Rational(-141653, 5292),
-                    listOf(0u, 7u) to Rational(-338051969, 441000),
-                    listOf(1u, 7u) to Rational(468850013, 1764000),
-                    listOf(2u, 7u) to Rational(2102343426101, 222264000),
-                    listOf(3u, 7u) to Rational(7836130602007, 1333584000),
-                    listOf(4u, 7u) to Rational(16239111865997, 746807040),
-                    listOf(5u, 7u) to Rational(3824649185383, 88905600),
-                    listOf(6u, 7u) to Rational(56058614459, 3457440),
-                    listOf(7u, 7u) to Rational(-396766339, 493920),
-                    listOf(8u, 7u) to Rational(-165147, 2744),
-                    listOf(0u, 8u) to Rational(-3088619, 58800),
-                    listOf(1u, 8u) to Rational(155343347, 88200),
-                    listOf(2u, 8u) to Rational(100098736469, 7408800),
-                    listOf(3u, 8u) to Rational(109725511381, 7408800),
-                    listOf(4u, 8u) to Rational(-2431199641013, 59270400),
-                    listOf(5u, 8u) to Rational(-102872383249, 3457440),
-                    listOf(6u, 8u) to Rational(1449461309, 576240),
-                    listOf(7u, 8u) to Rational(812775, 1372),
-                    listOf(8u, 8u) to Rational(-16461, 343)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(164202773, 230400),
-                    listOf(1u) to Rational(-70345303, 518400),
-                    listOf(2u) to Rational(-4229702731, 4665600),
-                    listOf(3u) to Rational(3262171027, 6998400),
-                    listOf(4u) to Rational(-25423104169, 13996800),
-                    listOf(5u) to Rational(64061869, 349920),
-                    listOf(6u) to Rational(-1655878091, 116640),
-                    listOf(7u) to Rational(-7991441, 648),
-                    listOf(8u) to Rational(-502591, 18),
-                    listOf(0u, 1u) to Rational(-8780429, 3840),
-                    listOf(1u, 1u) to Rational(434272361, 115200),
-                    listOf(2u, 1u) to Rational(429825727, 41472),
-                    listOf(3u, 1u) to Rational(-10066790339, 6998400),
-                    listOf(4u, 1u) to Rational(70022035471, 20995200),
-                    listOf(5u, 1u) to Rational(-32070283493, 1399680),
-                    listOf(6u, 1u) to Rational(-22051101001, 1399680),
-                    listOf(7u, 1u) to Rational(-126493427, 12960),
-                    listOf(8u, 1u) to Rational(3050245, 864),
-                    listOf(0u, 2u) to Rational(-1194654631, 345600),
-                    listOf(1u, 2u) to Rational(-542961452671, 31104000),
-                    listOf(2u, 2u) to Rational(-234000873607, 48988800),
-                    listOf(3u, 2u) to Rational(140520538087, 3628800),
-                    listOf(4u, 2u) to Rational(9215088876563, 130636800),
-                    listOf(5u, 2u) to Rational(27590569647253, 293932800),
-                    listOf(6u, 2u) to Rational(5129057792891, 97977600),
-                    listOf(7u, 2u) to Rational(-106334191, 5103),
-                    listOf(8u, 2u) to Rational(-1024113911, 435456),
-                    listOf(0u, 3u) to Rational(76223843, 6000),
-                    listOf(1u, 3u) to Rational(57425857357, 2592000),
-                    listOf(2u, 3u) to Rational(-2044736497573, 46656000),
-                    listOf(3u, 3u) to Rational(-26155810120031, 293932800),
-                    listOf(4u, 3u) to Rational(-1064419459813, 6998400),
-                    listOf(5u, 3u) to Rational(-753782018389, 4082400),
-                    listOf(6u, 3u) to Rational(-291973360873, 2799360),
-                    listOf(7u, 3u) to Rational(-46372122599, 816480),
-                    listOf(8u, 3u) to Rational(3579859657, 653184),
-                    listOf(0u, 4u) to Rational(-13374241901, 4320000),
-                    listOf(1u, 4u) to Rational(306606499811, 54432000),
-                    listOf(2u, 4u) to Rational(964267124745437, 13716864000),
-                    listOf(3u, 4u) to Rational(21603809415373, 182891520),
-                    listOf(4u, 4u) to Rational(1097860214654027, 6858432000),
-                    listOf(5u, 4u) to Rational(161615254570669, 914457600),
-                    listOf(6u, 4u) to Rational(758415239461, 22861440),
-                    listOf(7u, 4u) to Rational(2585568355471, 274337280),
-                    listOf(8u, 4u) to Rational(-70433747863, 9144576),
-                    listOf(0u, 5u) to Rational(-9582586217, 2520000),
-                    listOf(1u, 5u) to Rational(-19093471394171, 635040000),
-                    listOf(2u, 5u) to Rational(-13010261944411, 381024000),
-                    listOf(3u, 5u) to Rational(-259039825301861, 4572288000),
-                    listOf(4u, 5u) to Rational(-305081119071079, 2286144000),
-                    listOf(5u, 5u) to Rational(-1923114383311, 19595520),
-                    listOf(6u, 5u) to Rational(-14181787253231, 228614400),
-                    listOf(7u, 5u) to Rational(-3959584789, 4354560),
-                    listOf(8u, 5u) to Rational(4691742523, 762048),
-                    listOf(0u, 6u) to Rational(-588323437, 180000),
-                    listOf(1u, 6u) to Rational(5952234691, 52920000),
-                    listOf(2u, 6u) to Rational(21001851056959, 1088640000),
-                    listOf(3u, 6u) to Rational(84668034357563, 2133734400),
-                    listOf(4u, 6u) to Rational(2029754605811557, 25604812800),
-                    listOf(5u, 6u) to Rational(11721216739823, 426746880),
-                    listOf(6u, 6u) to Rational(-8275903187003, 2133734400),
-                    listOf(7u, 6u) to Rational(-4730447299, 2540160),
-                    listOf(8u, 6u) to Rational(-46069985, 21168),
-                    listOf(0u, 7u) to Rational(-75711301, 117600),
-                    listOf(1u, 7u) to Rational(32430417413, 7056000),
-                    listOf(2u, 7u) to Rational(677988533153, 98784000),
-                    listOf(3u, 7u) to Rational(-948417645827, 71124480),
-                    listOf(4u, 7u) to Rational(-11320265215207, 711244800),
-                    listOf(5u, 7u) to Rational(-676438627783, 50803200),
-                    listOf(6u, 7u) to Rational(-7382274253, 1975680),
-                    listOf(7u, 7u) to Rational(6505733, 2205),
-                    listOf(8u, 7u) to Rational(450137, 882),
-                    listOf(0u, 8u) to Rational(-8368253, 78400),
-                    listOf(1u, 8u) to Rational(6833783, 117600),
-                    listOf(2u, 8u) to Rational(4528971133, 5927040),
-                    listOf(3u, 8u) to Rational(146252636617, 29635200),
-                    listOf(4u, 8u) to Rational(8321882556889, 1659571200),
-                    listOf(5u, 8u) to Rational(-4686033011, 1975680),
-                    listOf(6u, 8u) to Rational(-1074445963, 987840),
-                    listOf(7u, 8u) to Rational(-142313, 588),
-                    listOf(8u, 8u) to Rational(-4281, 49)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, bufferOf(
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-17, 5),
-                        listOf(1u) to Rational(2, 6),
-                        listOf(2u) to Rational(14, 1),
-                        listOf(0u, 1u) to Rational(-6, 6),
-                        listOf(1u, 1u) to Rational(-7, 3),
-                        listOf(2u, 1u) to Rational(-2, 9),
-                        listOf(0u, 2u) to Rational(-9, 6),
-                        listOf(1u, 2u) to Rational(17, 4),
-                        listOf(2u, 2u) to Rational(2, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(5, 4),
-                        listOf(1u) to Rational(-5, 9),
-                        listOf(2u) to Rational(-3, 6),
-                        listOf(0u, 1u) to Rational(6, 5),
-                        listOf(1u, 1u) to Rational(14, 5),
-                        listOf(2u, 1u) to Rational(5, 2),
-                        listOf(0u, 2u) to Rational(-18, 7),
-                        listOf(1u, 2u) to Rational(-8, 2),
-                        listOf(2u, 2u) to Rational(18, 9),
-                    )
-                ),
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(14, 4),
-                        listOf(1u) to Rational(7, 6),
-                        listOf(2u) to Rational(7, 2),
-                        listOf(0u, 1u) to Rational(-15, 2),
-                        listOf(1u, 1u) to Rational(-13, 8),
-                        listOf(2u, 1u) to Rational(-14, 3),
-                        listOf(0u, 2u) to Rational(-7, 6),
-                        listOf(1u, 2u) to Rational(7, 4),
-                        listOf(2u, 2u) to Rational(9, 7),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-7, 4),
-                        listOf(1u) to Rational(-6, 3),
-                        listOf(2u) to Rational(-16, 2),
-                        listOf(0u, 1u) to Rational(-15, 5),
-                        listOf(1u, 1u) to Rational(4, 6),
-                        listOf(2u, 1u) to Rational(5, 4),
-                        listOf(0u, 2u) to Rational(-12, 5),
-                        listOf(1u, 2u) to Rational(-18, 2),
-                        listOf(2u, 2u) to Rational(6, 7),
-                    )
-                ),
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(5, 8),
-                        listOf(1u) to Rational(-12, 6),
-                        listOf(2u) to Rational(7, 6),
-                        listOf(0u, 1u) to Rational(-10, 4),
-                        listOf(1u, 1u) to Rational(-7, 6),
-                        listOf(2u, 1u) to Rational(8, 9),
-                        listOf(0u, 2u) to Rational(16, 3),
-                        listOf(1u, 2u) to Rational(-13, 4),
-                        listOf(2u, 2u) to Rational(5, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(10, 6),
-                        listOf(1u) to Rational(-18, 6),
-                        listOf(2u) to Rational(5, 1),
-                        listOf(0u, 1u) to Rational(17, 7),
-                        listOf(1u, 1u) to Rational(8, 4),
-                        listOf(2u, 1u) to Rational(-4, 9),
-                        listOf(0u, 2u) to Rational(-6, 5),
-                        listOf(1u, 2u) to Rational(-15, 8),
-                        listOf(2u, 2u) to Rational(-18, 5),
-                    )
-                ),
-            )),
-            "test 3"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-130778291, 76800),
-                    listOf(1u) to Rational(-445270919, 230400),
-                    listOf(2u) to Rational(44578444937, 14515200),
-                    listOf(3u) to Rational(17329402153, 1555200),
-                    listOf(4u) to Rational(89239926809, 2332800),
-                    listOf(5u) to Rational(2808812267, 145152),
-                    listOf(6u) to Rational(-21362661007, 725760),
-                    listOf(7u) to Rational(-258455443, 2016),
-                    listOf(8u) to Rational(-21454693, 96),
-                    listOf(0u, 1u) to Rational(-1002137, 15360),
-                    listOf(1u, 1u) to Rational(-1704849697, 430080),
-                    listOf(2u, 1u) to Rational(-57657676789, 4838400),
-                    listOf(3u, 1u) to Rational(-101331731, 89600),
-                    listOf(4u, 1u) to Rational(5362280079329, 130636800),
-                    listOf(5u, 1u) to Rational(4069896167053, 130636800),
-                    listOf(6u, 1u) to Rational(12011514569, 544320),
-                    listOf(7u, 1u) to Rational(138293195623, 725760),
-                    listOf(8u, 1u) to Rational(6228779419, 48384),
-                    listOf(0u, 2u) to Rational(-32395872823, 8064000),
-                    listOf(1u, 2u) to Rational(-7398505523, 2304000),
-                    listOf(2u, 2u) to Rational(95217051699521, 3048192000),
-                    listOf(3u, 2u) to Rational(198026968812079, 3657830400),
-                    listOf(4u, 2u) to Rational(4291645618499, 228614400),
-                    listOf(5u, 2u) to Rational(-33211690942439, 914457600),
-                    listOf(6u, 2u) to Rational(-637385538163153, 1371686400),
-                    listOf(7u, 2u) to Rational(-138671528276273, 182891520),
-                    listOf(8u, 2u) to Rational(-14566368751, 217728),
-                    listOf(0u, 3u) to Rational(-10538718719, 2016000),
-                    listOf(1u, 3u) to Rational(-1844485375199, 84672000),
-                    listOf(2u, 3u) to Rational(103968665891, 12096000),
-                    listOf(3u, 3u) to Rational(175402107278351, 1828915200),
-                    listOf(4u, 3u) to Rational(8020699588879, 114307200),
-                    listOf(5u, 3u) to Rational(3414841894991, 38102400),
-                    listOf(6u, 3u) to Rational(1848405591611, 4665600),
-                    listOf(7u, 3u) to Rational(39486708738989, 137168640),
-                    listOf(8u, 3u) to Rational(255926289517, 9144576),
-                    listOf(0u, 4u) to Rational(-655379564629, 105840000),
-                    listOf(1u, 4u) to Rational(-208336039441, 127008000),
-                    listOf(2u, 4u) to Rational(40173146771411, 1143072000),
-                    listOf(3u, 4u) to Rational(150473493581239, 2667168000),
-                    listOf(4u, 4u) to Rational(38833783990483, 1143072000),
-                    listOf(5u, 4u) to Rational(-1963676248203053, 4800902400),
-                    listOf(6u, 4u) to Rational(-2598759412825747, 3200601600),
-                    listOf(7u, 4u) to Rational(-192895352019667, 1280240640),
-                    listOf(8u, 4u) to Rational(3737382679, 6858432),
-                    listOf(0u, 5u) to Rational(-16959378721, 1890000),
-                    listOf(1u, 5u) to Rational(-1864802244743, 79380000),
-                    listOf(2u, 5u) to Rational(13449261536489, 666792000),
-                    listOf(3u, 5u) to Rational(215272234137329, 2667168000),
-                    listOf(4u, 5u) to Rational(6040691379277, 83349000),
-                    listOf(5u, 5u) to Rational(153687143525887, 800150400),
-                    listOf(6u, 5u) to Rational(475602854903563, 2400451200),
-                    listOf(7u, 5u) to Rational(27315599358749, 640120320),
-                    listOf(8u, 5u) to Rational(-2630413357, 10668672),
-                    listOf(0u, 6u) to Rational(-6654999511, 2646000),
-                    listOf(1u, 6u) to Rational(-67885252327, 15876000),
-                    listOf(2u, 6u) to Rational(5786776220983, 2667168000),
-                    listOf(3u, 6u) to Rational(60615922629083, 1143072000),
-                    listOf(4u, 6u) to Rational(-34703539637627407, 672126336000),
-                    listOf(5u, 6u) to Rational(-744694192134101, 2240421120),
-                    listOf(6u, 6u) to Rational(-1782470617231, 14817600),
-                    listOf(7u, 6u) to Rational(59123208433, 8890560),
-                    listOf(8u, 6u) to Rational(-141653, 5292),
-                    listOf(0u, 7u) to Rational(-338051969, 441000),
-                    listOf(1u, 7u) to Rational(468850013, 1764000),
-                    listOf(2u, 7u) to Rational(2102343426101, 222264000),
-                    listOf(3u, 7u) to Rational(7836130602007, 1333584000),
-                    listOf(4u, 7u) to Rational(16239111865997, 746807040),
-                    listOf(5u, 7u) to Rational(3824649185383, 88905600),
-                    listOf(6u, 7u) to Rational(56058614459, 3457440),
-                    listOf(7u, 7u) to Rational(-396766339, 493920),
-                    listOf(8u, 7u) to Rational(-165147, 2744),
-                    listOf(0u, 8u) to Rational(-3088619, 58800),
-                    listOf(1u, 8u) to Rational(155343347, 88200),
-                    listOf(2u, 8u) to Rational(100098736469, 7408800),
-                    listOf(3u, 8u) to Rational(109725511381, 7408800),
-                    listOf(4u, 8u) to Rational(-2431199641013, 59270400),
-                    listOf(5u, 8u) to Rational(-102872383249, 3457440),
-                    listOf(6u, 8u) to Rational(1449461309, 576240),
-                    listOf(7u, 8u) to Rational(812775, 1372),
-                    listOf(8u, 8u) to Rational(-16461, 343)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(164202773, 230400),
-                    listOf(1u) to Rational(-70345303, 518400),
-                    listOf(2u) to Rational(-4229702731, 4665600),
-                    listOf(3u) to Rational(3262171027, 6998400),
-                    listOf(4u) to Rational(-25423104169, 13996800),
-                    listOf(5u) to Rational(64061869, 349920),
-                    listOf(6u) to Rational(-1655878091, 116640),
-                    listOf(7u) to Rational(-7991441, 648),
-                    listOf(8u) to Rational(-502591, 18),
-                    listOf(0u, 1u) to Rational(-8780429, 3840),
-                    listOf(1u, 1u) to Rational(434272361, 115200),
-                    listOf(2u, 1u) to Rational(429825727, 41472),
-                    listOf(3u, 1u) to Rational(-10066790339, 6998400),
-                    listOf(4u, 1u) to Rational(70022035471, 20995200),
-                    listOf(5u, 1u) to Rational(-32070283493, 1399680),
-                    listOf(6u, 1u) to Rational(-22051101001, 1399680),
-                    listOf(7u, 1u) to Rational(-126493427, 12960),
-                    listOf(8u, 1u) to Rational(3050245, 864),
-                    listOf(0u, 2u) to Rational(-1194654631, 345600),
-                    listOf(1u, 2u) to Rational(-542961452671, 31104000),
-                    listOf(2u, 2u) to Rational(-234000873607, 48988800),
-                    listOf(3u, 2u) to Rational(140520538087, 3628800),
-                    listOf(4u, 2u) to Rational(9215088876563, 130636800),
-                    listOf(5u, 2u) to Rational(27590569647253, 293932800),
-                    listOf(6u, 2u) to Rational(5129057792891, 97977600),
-                    listOf(7u, 2u) to Rational(-106334191, 5103),
-                    listOf(8u, 2u) to Rational(-1024113911, 435456),
-                    listOf(0u, 3u) to Rational(76223843, 6000),
-                    listOf(1u, 3u) to Rational(57425857357, 2592000),
-                    listOf(2u, 3u) to Rational(-2044736497573, 46656000),
-                    listOf(3u, 3u) to Rational(-26155810120031, 293932800),
-                    listOf(4u, 3u) to Rational(-1064419459813, 6998400),
-                    listOf(5u, 3u) to Rational(-753782018389, 4082400),
-                    listOf(6u, 3u) to Rational(-291973360873, 2799360),
-                    listOf(7u, 3u) to Rational(-46372122599, 816480),
-                    listOf(8u, 3u) to Rational(3579859657, 653184),
-                    listOf(0u, 4u) to Rational(-13374241901, 4320000),
-                    listOf(1u, 4u) to Rational(306606499811, 54432000),
-                    listOf(2u, 4u) to Rational(964267124745437, 13716864000),
-                    listOf(3u, 4u) to Rational(21603809415373, 182891520),
-                    listOf(4u, 4u) to Rational(1097860214654027, 6858432000),
-                    listOf(5u, 4u) to Rational(161615254570669, 914457600),
-                    listOf(6u, 4u) to Rational(758415239461, 22861440),
-                    listOf(7u, 4u) to Rational(2585568355471, 274337280),
-                    listOf(8u, 4u) to Rational(-70433747863, 9144576),
-                    listOf(0u, 5u) to Rational(-9582586217, 2520000),
-                    listOf(1u, 5u) to Rational(-19093471394171, 635040000),
-                    listOf(2u, 5u) to Rational(-13010261944411, 381024000),
-                    listOf(3u, 5u) to Rational(-259039825301861, 4572288000),
-                    listOf(4u, 5u) to Rational(-305081119071079, 2286144000),
-                    listOf(5u, 5u) to Rational(-1923114383311, 19595520),
-                    listOf(6u, 5u) to Rational(-14181787253231, 228614400),
-                    listOf(7u, 5u) to Rational(-3959584789, 4354560),
-                    listOf(8u, 5u) to Rational(4691742523, 762048),
-                    listOf(0u, 6u) to Rational(-588323437, 180000),
-                    listOf(1u, 6u) to Rational(5952234691, 52920000),
-                    listOf(2u, 6u) to Rational(21001851056959, 1088640000),
-                    listOf(3u, 6u) to Rational(84668034357563, 2133734400),
-                    listOf(4u, 6u) to Rational(2029754605811557, 25604812800),
-                    listOf(5u, 6u) to Rational(11721216739823, 426746880),
-                    listOf(6u, 6u) to Rational(-8275903187003, 2133734400),
-                    listOf(7u, 6u) to Rational(-4730447299, 2540160),
-                    listOf(8u, 6u) to Rational(-46069985, 21168),
-                    listOf(0u, 7u) to Rational(-75711301, 117600),
-                    listOf(1u, 7u) to Rational(32430417413, 7056000),
-                    listOf(2u, 7u) to Rational(677988533153, 98784000),
-                    listOf(3u, 7u) to Rational(-948417645827, 71124480),
-                    listOf(4u, 7u) to Rational(-11320265215207, 711244800),
-                    listOf(5u, 7u) to Rational(-676438627783, 50803200),
-                    listOf(6u, 7u) to Rational(-7382274253, 1975680),
-                    listOf(7u, 7u) to Rational(6505733, 2205),
-                    listOf(8u, 7u) to Rational(450137, 882),
-                    listOf(0u, 8u) to Rational(-8368253, 78400),
-                    listOf(1u, 8u) to Rational(6833783, 117600),
-                    listOf(2u, 8u) to Rational(4528971133, 5927040),
-                    listOf(3u, 8u) to Rational(146252636617, 29635200),
-                    listOf(4u, 8u) to Rational(8321882556889, 1659571200),
-                    listOf(5u, 8u) to Rational(-4686033011, 1975680),
-                    listOf(6u, 8u) to Rational(-1074445963, 987840),
-                    listOf(7u, 8u) to Rational(-142313, 588),
-                    listOf(8u, 8u) to Rational(-4281, 49)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, bufferOf(
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-17, 5),
-                        listOf(1u) to Rational(2, 6),
-                        listOf(2u) to Rational(14, 1),
-                        listOf(0u, 1u) to Rational(-6, 6),
-                        listOf(1u, 1u) to Rational(-7, 3),
-                        listOf(2u, 1u) to Rational(-2, 9),
-                        listOf(0u, 2u) to Rational(-9, 6),
-                        listOf(1u, 2u) to Rational(17, 4),
-                        listOf(2u, 2u) to Rational(2, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(5, 4),
-                        listOf(1u) to Rational(-5, 9),
-                        listOf(2u) to Rational(-3, 6),
-                        listOf(0u, 1u) to Rational(6, 5),
-                        listOf(1u, 1u) to Rational(14, 5),
-                        listOf(2u, 1u) to Rational(5, 2),
-                        listOf(0u, 2u) to Rational(-18, 7),
-                        listOf(1u, 2u) to Rational(-8, 2),
-                        listOf(2u, 2u) to Rational(18, 9),
-                    )
-                ),
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(14, 4),
-                        listOf(1u) to Rational(7, 6),
-                        listOf(2u) to Rational(7, 2),
-                        listOf(0u, 1u) to Rational(-15, 2),
-                        listOf(1u, 1u) to Rational(-13, 8),
-                        listOf(2u, 1u) to Rational(-14, 3),
-                        listOf(0u, 2u) to Rational(-7, 6),
-                        listOf(1u, 2u) to Rational(7, 4),
-                        listOf(2u, 2u) to Rational(9, 7),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-7, 4),
-                        listOf(1u) to Rational(-6, 3),
-                        listOf(2u) to Rational(-16, 2),
-                        listOf(0u, 1u) to Rational(-15, 5),
-                        listOf(1u, 1u) to Rational(4, 6),
-                        listOf(2u, 1u) to Rational(5, 4),
-                        listOf(0u, 2u) to Rational(-12, 5),
-                        listOf(1u, 2u) to Rational(-18, 2),
-                        listOf(2u, 2u) to Rational(6, 7),
-                    )
-                ),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-506213, 2800),
-                    listOf(1u) to Rational(9859, 315),
-                    listOf(2u) to Rational(17384377, 11340),
-                    listOf(3u) to Rational(-9662, 63),
-                    listOf(4u) to Rational(-12563, 4),
-                    listOf(0u, 1u) to Rational(-486293, 22400),
-                    listOf(1u, 1u) to Rational(-6530947, 25200),
-                    listOf(2u, 1u) to Rational(866125, 18144),
-                    listOf(3u, 1u) to Rational(2948747, 2520),
-                    listOf(4u, 1u) to Rational(1196611, 2016),
-                    listOf(0u, 2u) to Rational(-20266021, 117600),
-                    listOf(1u, 2u) to Rational(26656339, 44100),
-                    listOf(2u, 2u) to Rational(19499183, 18144),
-                    listOf(3u, 2u) to Rational(-19801849, 7560),
-                    listOf(4u, 2u) to Rational(-2639635, 1296),
-                    listOf(0u, 3u) to Rational(-5017697, 29400),
-                    listOf(1u, 3u) to Rational(-606007, 1575),
-                    listOf(2u, 3u) to Rational(127494487, 132300),
-                    listOf(3u, 3u) to Rational(166567, 105),
-                    listOf(4u, 3u) to Rational(486403, 18144),
-                    listOf(0u, 4u) to Rational(-32182, 735),
-                    listOf(1u, 4u) to Rational(2420671, 8820),
-                    listOf(2u, 4u) to Rational(-12619193, 26460),
-                    listOf(3u, 4u) to Rational(-6823067, 5670),
-                    listOf(4u, 4u) to Rational(-2311693, 13608),
-                    listOf(0u, 5u) to Rational(-13324, 245),
-                    listOf(1u, 5u) to Rational(1966, 35),
-                    listOf(2u, 5u) to Rational(1052719, 2520),
-                    listOf(3u, 5u) to Rational(19153, 270),
-                    listOf(4u, 5u) to Rational(701, 54),
-                    listOf(0u, 6u) to Rational(4647, 196),
-                    listOf(1u, 6u) to Rational(2197, 28),
-                    listOf(2u, 6u) to Rational(-43853, 336),
-                    listOf(3u, 6u) to Rational(-301, 3),
-                    listOf(4u, 6u) to Rational(34, 3)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-2843, 1600),
-                    listOf(1u) to Rational(-1483, 240),
-                    listOf(2u) to Rational(110623, 1296),
-                    listOf(3u) to Rational(1265, 72),
-                    listOf(4u) to Rational(-5011, 16),
-                    listOf(0u, 1u) to Rational(47743, 1800),
-                    listOf(1u, 1u) to Rational(619229, 32400),
-                    listOf(2u, 1u) to Rational(-5978369, 58320),
-                    listOf(3u, 1u) to Rational(-86081, 1620),
-                    listOf(4u, 1u) to Rational(6325, 72),
-                    listOf(0u, 2u) to Rational(110951, 3360),
-                    listOf(1u, 2u) to Rational(-9550649, 302400),
-                    listOf(2u, 2u) to Rational(6542933, 85050),
-                    listOf(3u, 2u) to Rational(4708291, 38880),
-                    listOf(4u, 2u) to Rational(-433327, 1296),
-                    listOf(0u, 3u) to Rational(56143, 600),
-                    listOf(1u, 3u) to Rational(94243, 720),
-                    listOf(2u, 3u) to Rational(-46779139, 226800),
-                    listOf(3u, 3u) to Rational(-6948253, 12960),
-                    listOf(4u, 3u) to Rational(-260261, 486),
-                    listOf(0u, 4u) to Rational(-3205317, 19600),
-                    listOf(1u, 4u) to Rational(-201253, 1050),
-                    listOf(2u, 4u) to Rational(332192677, 302400),
-                    listOf(3u, 4u) to Rational(351511, 360),
-                    listOf(4u, 4u) to Rational(-40547, 81),
-                    listOf(0u, 5u) to Rational(-65421, 1960),
-                    listOf(1u, 5u) to Rational(-10118, 35),
-                    listOf(2u, 5u) to Rational(-4341709, 10080),
-                    listOf(3u, 5u) to Rational(-91703, 360),
-                    listOf(4u, 5u) to Rational(-85, 9),
-                    listOf(0u, 6u) to Rational(-25965, 784),
-                    listOf(1u, 6u) to Rational(3351, 16),
-                    listOf(2u, 6u) to Rational(595159, 1344),
-                    listOf(3u, 6u) to Rational(-1381, 12),
-                    listOf(4u, 6u) to Rational(-155, 3)
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, bufferOf(
-                NumberedRationalFunction(
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(-17, 5),
-                        listOf(1u) to Rational(2, 6),
-                        listOf(2u) to Rational(14, 1),
-                        listOf(0u, 1u) to Rational(-6, 6),
-                        listOf(1u, 1u) to Rational(-7, 3),
-                        listOf(2u, 1u) to Rational(-2, 9),
-                        listOf(0u, 2u) to Rational(-9, 6),
-                        listOf(1u, 2u) to Rational(17, 4),
-                        listOf(2u, 2u) to Rational(2, 1),
-                    ),
-                    NumberedPolynomialAsIs(
-                        listOf<UInt>() to Rational(5, 4),
-                        listOf(1u) to Rational(-5, 9),
-                        listOf(2u) to Rational(-3, 6),
-                        listOf(0u, 1u) to Rational(6, 5),
-                        listOf(1u, 1u) to Rational(14, 5),
-                        listOf(2u, 1u) to Rational(5, 2),
-                        listOf(0u, 2u) to Rational(-18, 7),
-                        listOf(1u, 2u) to Rational(-8, 2),
-                        listOf(2u, 2u) to Rational(18, 9),
-                    )
-                ),
-            )),
-            "test 5"
-        )
-        assertEquals(
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(10, 2),
-                    listOf(1u) to Rational(6, 7),
-                    listOf(2u) to Rational(-16, 1),
-                    listOf(0u, 1u) to Rational(13, 8),
-                    listOf(1u, 1u) to Rational(-12, 1),
-                    listOf(2u, 1u) to Rational(16, 8),
-                    listOf(0u, 2u) to Rational(10, 4),
-                    listOf(1u, 2u) to Rational(4, 1),
-                    listOf(2u, 2u) to Rational(-11, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1, 4),
-                    listOf(1u) to Rational(-17, 4),
-                    listOf(2u) to Rational(-14, 8),
-                    listOf(0u, 1u) to Rational(17, 9),
-                    listOf(1u, 1u) to Rational(1, 3),
-                    listOf(2u, 1u) to Rational(7, 6),
-                    listOf(0u, 2u) to Rational(16, 3),
-                    listOf(1u, 2u) to Rational(-17, 1),
-                    listOf(2u, 2u) to Rational(-10, 8),
-                )
-            ).substitute(RationalField, bufferOf<NumberedRationalFunction<Rational>>()),
-            "test 6"
-        )
-    }
-    @Test
-    fun test_Polynomial_substituteFully_Double_Buffer() {
-        assertEquals(
-            0.0,
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 1.0,
-                listOf(1u) to -2.0,
-                listOf(2u) to 1.0,
-            ).substituteFully(bufferOf(
-                1.0
-            )),
-            0.001,
-            "test 1"
-        )
-        assertFailsWithTypeAndMessage<IllegalArgumentException>(
-            fullSubstitutionExceptionMessage,
-            "test 2"
-        ) {
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substituteFully(bufferOf())
-        }
-        assertFailsWithTypeAndMessage<IllegalArgumentException>(
-            fullSubstitutionExceptionMessage,
-            "test 3"
-        ) {
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substituteFully(bufferOf(
-                0.0,
-            ))
-        }
-        assertFailsWithTypeAndMessage<IllegalArgumentException>(
-            fullSubstitutionExceptionMessage,
-            "test 4"
-        ) {
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substituteFully(bufferOf(
-                0.4846192734143442,
-            ))
-        }
-        assertEquals(
-            1.934530767358133,
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substituteFully(bufferOf(
-                0.4846192734143442,
-                0.8400458576651112,
-            )),
-            0.001,
-            "test 5"
-        )
-        assertEquals(
-            1.934530767358133,
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substituteFully(bufferOf(
-                0.4846192734143442,
-                0.8400458576651112,
-                0.9211194782050933
-            )),
-            0.001,
-            "test 6"
-        )
-        assertEquals(
-            1.934530767358133,
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to 0.8597048543814783,
-                listOf(1u) to 0.22997637465889875,
-                listOf(2u) to 0.32675302591924016,
-                listOf(0u, 1u) to 0.4561746111587508,
-                listOf(1u, 1u) to 0.5304946210170756,
-                listOf(2u, 1u) to 0.6244313712888998,
-                listOf(0u, 2u) to 0.2700930201481795,
-                listOf(1u, 2u) to -0.06962351375204712,
-                listOf(2u, 2u) to -0.015206988092131501,
-            ).substituteFully(bufferOf(
-                0.4846192734143442,
-                0.8400458576651112,
-                0.9211194782050933,
-                0.4752854632152105
-            )),
-            0.001,
-            "test 7"
-        )
-    }
-    @Test
-    fun test_Polynomial_substituteFully_Constant_Buffer() {
-        assertEquals(
-            Rational(0),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1)
-            ).substituteFully(RationalField, bufferOf(
-                Rational(1)
-            )),
-            "test 1"
-        )
-        assertFailsWithTypeAndMessage<IllegalArgumentException>(
-            fullSubstitutionExceptionMessage,
-            "test 2"
-        ) {
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substituteFully(RationalField, bufferOf())
-        }
-        assertFailsWithTypeAndMessage<IllegalArgumentException>(
-            fullSubstitutionExceptionMessage,
-            "test 3"
-        ) {
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substituteFully(
-                RationalField, bufferOf(
-                    Rational(-2, 5),
-                )
-            )
-        }
-        // https://www.wolframalpha.com/input?i=%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2+where+x+%3D+-2%2F5%2C+y+%3D+12%2F9
-        assertEquals(
-            Rational(143, 150),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substituteFully(RationalField, bufferOf(
-                Rational(-2, 5),
-                Rational(12, 9),
-            )),
-            "test 4"
-        )
-        assertEquals(
-            Rational(143, 150),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-3, 2),
-                listOf(1u) to Rational(8, 6),
-                listOf(2u) to Rational(14, 6),
-                listOf(0u, 1u) to Rational(-3, 1),
-                listOf(1u, 1u) to Rational(-19, 2),
-                listOf(2u, 1u) to Rational(9, 4),
-                listOf(0u, 2u) to Rational(5, 5),
-                listOf(1u, 2u) to Rational(18, 9),
-                listOf(2u, 2u) to Rational(5, 2),
-            ).substituteFully(RationalField, bufferOf(
-                Rational(-2, 5),
-                Rational(12, 9),
-                Rational(57, 179),
-            )),
-            "test 5"
-        )
-        // https://www.wolframalpha.com/input?i=%28%28-3%2F2+%2B+8%2F6+x+%2B+14%2F6+x%5E2%29+%2B+%28-3%2F1+%2B+-19%2F2+x+%2B+9%2F4+x%5E2%29+y+%2B+%285%2F5+%2B+18%2F9+x+%2B+5%2F2+x%5E2%29+y%5E2%29+p%5E8+where+x+%3D+q%2Fp%2C+y+%3D+x%5E3%2C+p+%3D+-2%2F5%2C+q+%3D+12%2F9
-        assertEquals(
-            Rational(47639065216, 2562890625),
-            NumberedPolynomialAsIs(
-                listOf(8u) to Rational(-3, 2),
-                listOf(7u, 1u) to Rational(8, 6),
-                listOf(6u, 2u) to Rational(14, 6),
-                listOf(5u, 3u) to Rational(-3, 1),
-                listOf(4u, 4u) to Rational(-19, 2),
-                listOf(3u, 5u) to Rational(9, 4),
-                listOf(2u, 6u) to Rational(5, 5),
-                listOf(1u, 7u) to Rational(18, 9),
-                listOf(0u, 8u) to Rational(5, 2),
-            ).substituteFully(RationalField, bufferOf(
-                Rational(-2, 5),
-                Rational(12, 9),
-            )),
-            "test 6"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substituteFully_Double_Buffer() {
-        assertEquals(
-            0.0,
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 1.0,
-                    listOf(1u) to -2.0,
-                    listOf(2u) to 1.0,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 1.0,
-                )
-            ).substituteFully(bufferOf(
-                1.0
-            )),
-            0.001,
-            "test 1"
-        )
-        assertFailsWithTypeAndMessage<IllegalArgumentException>(
-            fullSubstitutionExceptionMessage,
-            "test 2"
-        ) {
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substituteFully(bufferOf())
-        }
-        assertFailsWithTypeAndMessage<IllegalArgumentException>(
-            fullSubstitutionExceptionMessage,
-            "test 3"
-        ) {
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substituteFully(
-                bufferOf(
-                    -8.11707689492641,
-                )
-            )
-        }
-        assertEquals(
-            -0.012718636022899672,
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substituteFully(bufferOf(
-                -8.11707689492641,
-                0.795265651276015,
-            )),
-            0.001,
-            "test 4"
-        )
-        assertEquals(
-            -0.012718636022899672,
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 6.593754860231304,
-                    listOf(1u) to -7.853302571550634,
-                    listOf(2u) to 1.2265042281530025,
-                    listOf(0u, 1u) to 3.762648877294904,
-                    listOf(1u, 1u) to -8.945144619305292,
-                    listOf(2u, 1u) to -5.141384718042281,
-                    listOf(0u, 2u) to 7.359794483988782,
-                    listOf(1u, 2u) to -4.3526172680518815,
-                    listOf(2u, 2u) to 0.907910924854372,
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to 9.533292132172562,
-                    listOf(1u) to -1.982814534018857,
-                    listOf(2u) to -5.974248303415283,
-                    listOf(0u, 1u) to 1.5876716499288879,
-                    listOf(1u, 1u) to -7.535152566659664,
-                    listOf(2u, 1u) to 0.7549300500153517,
-                    listOf(0u, 2u) to -5.242030058021028,
-                    listOf(1u, 2u) to -0.7265704289690582,
-                    listOf(2u, 2u) to -7.139677818189821,
-                )
-            ).substituteFully(bufferOf(
-                -8.11707689492641,
-                0.795265651276015,
-                0.9211194782050933
-            )),
-            0.001,
-            "test 5"
-        )
-    }
-    @Test
-    fun test_RationalFunction_substituteFully_Constant_Buffer() {
-        assertEquals(
-            Rational(0),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1),
-                    listOf(1u) to Rational(-2),
-                    listOf(2u) to Rational(1)
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(1)
-                )
-            ).substituteFully(RationalField, bufferOf(
-                Rational(1)
-            )),
-            "test 1"
-        )
-        assertEquals(
-            Rational(-1322820, 2204953),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substituteFully(RationalField, bufferOf(
-                Rational(7, 5),
-                Rational(-13, 7),
-                Rational(-16, 4),
-            )),
-            "test 2"
-        )
-        assertEquals(
-            Rational(-1322820, 2204953),
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substituteFully(RationalField, bufferOf(
-                Rational(7, 5),
-                Rational(-13, 7),
-            )),
-            "test 3"
-        )
-        assertFailsWithTypeAndMessage<IllegalArgumentException>(
-            fullSubstitutionExceptionMessage,
-            "test 4"
-        ) {
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substituteFully(
-                RationalField, bufferOf(
-                    Rational(7, 5),
-                )
-            )
-        }
-        assertFailsWithTypeAndMessage<IllegalArgumentException>(
-            fullSubstitutionExceptionMessage,
-            "test 5"
-        ) {
-            NumberedRationalFunction(
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(-3, 5),
-                    listOf(1u) to Rational(-18, 4),
-                    listOf(2u) to Rational(9, 8),
-                    listOf(0u, 1u) to Rational(-11, 6),
-                    listOf(1u, 1u) to Rational(-16, 3),
-                    listOf(2u, 1u) to Rational(12, 2),
-                    listOf(0u, 2u) to Rational(5, 3),
-                    listOf(1u, 2u) to Rational(17, 8),
-                    listOf(2u, 2u) to Rational(1, 3),
-                ),
-                NumberedPolynomialAsIs(
-                    listOf<UInt>() to Rational(11, 1),
-                    listOf(1u) to Rational(4, 1),
-                    listOf(2u) to Rational(-18, 3),
-                    listOf(0u, 1u) to Rational(12, 9),
-                    listOf(1u, 1u) to Rational(14, 7),
-                    listOf(2u, 1u) to Rational(-17, 5),
-                    listOf(0u, 2u) to Rational(-4, 1),
-                    listOf(1u, 2u) to Rational(-5, 5),
-                    listOf(2u, 2u) to Rational(-7, 8),
-                )
-            ).substituteFully(RationalField, bufferOf())
-        }
-    }
-    @Test
-    @OptIn(UnstableKMathAPI::class)
-    fun test_Polynomial_derivativeWithRespectTo_variable() {
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-2),
-                listOf(1u) to Rational(2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).derivativeWithRespectTo(RationalField, 0),
-            "test 1"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-2, 3),
-                listOf(1u) to Rational(1, 1),
-                listOf(2u) to Rational(-33, 8),
-                listOf(3u) to Rational(72, 1),
-                listOf(0u, 1u) to Rational(2, 3),
-                listOf(1u, 1u) to Rational(-22, 1),
-                listOf(2u, 1u) to Rational(-1, 1),
-                listOf(3u, 1u) to Rational(-36, 1),
-                listOf(0u, 2u) to Rational(-8, 5),
-                listOf(1u, 2u) to Rational(-1, 4),
-                listOf(2u, 2u) to Rational(12, 7),
-                listOf(3u, 2u) to Rational(-2, 1),
-                listOf(0u, 3u) to Rational(16, 8),
-                listOf(1u, 3u) to Rational(-4, 1),
-                listOf(2u, 3u) to Rational(9, 2),
-                listOf(3u, 3u) to Rational(20, 9),
-                listOf(0u, 4u) to Rational(-10, 1),
-                listOf(1u, 4u) to Rational(-14, 1),
-                listOf(2u, 4u) to Rational(3, 7),
-                listOf(3u, 4u) to Rational(20, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).derivativeWithRespectTo(RationalField, 0),
-            "test 2a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-18, 3),
-                listOf(1u) to Rational(2, 3),
-                listOf(2u) to Rational(-11, 1),
-                listOf(3u) to Rational(-1, 3),
-                listOf(4u) to Rational(-18, 2),
-                listOf(0u, 1u) to Rational(-20, 3),
-                listOf(1u, 1u) to Rational(-16, 5),
-                listOf(2u, 1u) to Rational(-1, 4),
-                listOf(3u, 1u) to Rational(8, 7),
-                listOf(4u, 1u) to Rational(-1, 1),
-                listOf(0u, 2u) to Rational(9, 7),
-                listOf(1u, 2u) to Rational(6, 1),
-                listOf(2u, 2u) to Rational(-6, 1),
-                listOf(3u, 2u) to Rational(9, 2),
-                listOf(4u, 2u) to Rational(5, 3),
-                listOf(0u, 3u) to Rational(-9, 1),
-                listOf(1u, 3u) to Rational(-40, 1),
-                listOf(2u, 3u) to Rational(-28, 1),
-                listOf(3u, 3u) to Rational(4, 7),
-                listOf(4u, 3u) to Rational(20, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).derivativeWithRespectTo(RationalField, 1),
-            "test 2b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(-1, 4),
-                listOf(2u, 2u) to Rational(12, 7),
-                listOf(3u, 2u) to Rational(-2, 1),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(-4, 1),
-                listOf(2u, 3u) to Rational(9, 2),
-                listOf(3u, 3u) to Rational(20, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(-14, 1),
-                listOf(2u, 4u) to Rational(3, 7),
-                listOf(3u, 4u) to Rational(20, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).derivativeWithRespectTo(RationalField, 0),
-            "test 3a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(-1, 4),
-                listOf(3u, 1u) to Rational(8, 7),
-                listOf(4u, 1u) to Rational(-1, 1),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-6, 1),
-                listOf(3u, 2u) to Rational(9, 2),
-                listOf(4u, 2u) to Rational(5, 3),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-28, 1),
-                listOf(3u, 3u) to Rational(4, 7),
-                listOf(4u, 3u) to Rational(20, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).derivativeWithRespectTo(RationalField, 1),
-            "test 3b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-2, 3),
-                listOf(1u) to Rational(1, 1),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(0u, 1u) to Rational(2, 3),
-                listOf(1u, 1u) to Rational(-22, 1),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-8, 5),
-                listOf(1u, 2u) to Rational(-1, 4),
-                listOf(2u, 2u) to Rational(0),
-                listOf(3u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).derivativeWithRespectTo(RationalField, 0),
-            "test 4a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-18, 3),
-                listOf(1u) to Rational(2, 3),
-                listOf(2u) to Rational(-11, 1),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-20, 3),
-                listOf(1u, 1u) to Rational(-16, 5),
-                listOf(2u, 1u) to Rational(-1, 4),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(0),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).derivativeWithRespectTo(RationalField, 1),
-            "test 4b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).derivativeWithRespectTo(RationalField, 5),
-            "test 5"
-        )
-    }
-    @Test
-    @OptIn(UnstableKMathAPI::class)
-    fun test_Polynomial_nthDerivativeWithRespectTo_variable_order() {
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-2),
-                listOf(1u) to Rational(2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, 0, 1u),
-            "test 1"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, 0, 0u),
-            "test 2"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, 0, 2u),
-            "test 3"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, 0, 3u),
-            "test 4"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, 0, 4u),
-            "test 5"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, 1, 0u),
-            "test 6"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, 1, 1u),
-            "test 7"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, 1, 2u),
-            "test 8"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1, 1),
-                listOf(1u) to Rational(-33, 4),
-                listOf(2u) to Rational(216, 1),
-                listOf(0u, 1u) to Rational(-22, 1),
-                listOf(1u, 1u) to Rational(-2, 1),
-                listOf(2u, 1u) to Rational(-108, 1),
-                listOf(0u, 2u) to Rational(-1, 4),
-                listOf(1u, 2u) to Rational(24, 7),
-                listOf(2u, 2u) to Rational(-6, 1),
-                listOf(0u, 3u) to Rational(-4, 1),
-                listOf(1u, 3u) to Rational(9, 1),
-                listOf(2u, 3u) to Rational(20, 3),
-                listOf(0u, 4u) to Rational(-14, 1),
-                listOf(1u, 4u) to Rational(6, 7),
-                listOf(2u, 4u) to Rational(60, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, 0, 2u),
-            "test 9a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-20, 3),
-                listOf(1u) to Rational(-16, 5),
-                listOf(2u) to Rational(-1, 4),
-                listOf(3u) to Rational(8, 7),
-                listOf(4u) to Rational(-1, 1),
-                listOf(0u, 1u) to Rational(18, 7),
-                listOf(1u, 1u) to Rational(12, 1),
-                listOf(2u, 1u) to Rational(-12, 1),
-                listOf(3u, 1u) to Rational(9, 1),
-                listOf(4u, 1u) to Rational(10, 3),
-                listOf(0u, 2u) to Rational(-27, 1),
-                listOf(1u, 2u) to Rational(-120, 1),
-                listOf(2u, 2u) to Rational(-84, 1),
-                listOf(3u, 2u) to Rational(12, 7),
-                listOf(4u, 2u) to Rational(60, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, 1, 2u),
-            "test 9b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-1, 4),
-                listOf(1u, 2u) to Rational(24, 7),
-                listOf(2u, 2u) to Rational(-6, 1),
-                listOf(0u, 3u) to Rational(-4, 1),
-                listOf(1u, 3u) to Rational(9, 1),
-                listOf(2u, 3u) to Rational(20, 3),
-                listOf(0u, 4u) to Rational(-14, 1),
-                listOf(1u, 4u) to Rational(6, 7),
-                listOf(2u, 4u) to Rational(60, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, 0, 2u),
-            "test 10a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(-1, 4),
-                listOf(3u) to Rational(8, 7),
-                listOf(4u) to Rational(-1, 1),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(-12, 1),
-                listOf(3u, 1u) to Rational(9, 1),
-                listOf(4u, 1u) to Rational(10, 3),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-84, 1),
-                listOf(3u, 2u) to Rational(12, 7),
-                listOf(4u, 2u) to Rational(60, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, 1, 2u),
-            "test 10b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1, 1),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(0u, 1u) to Rational(-22, 1),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-1, 4),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).nthDerivativeWithRespectTo(RationalField, 0, 2u),
-            "test 11a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-20, 3),
-                listOf(1u) to Rational(-16, 5),
-                listOf(2u) to Rational(-1, 4),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(0),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).nthDerivativeWithRespectTo(RationalField, 1, 2u),
-            "test 11b"
-        )
-    }
-    @Test
-    @OptIn(UnstableKMathAPI::class)
-    fun test_Polynomial_nthDerivativeWithRespectTo_variablesAndOrders() {
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-2),
-                listOf(1u) to Rational(2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 1u)),
-            "test 1"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 0u)),
-            "test 2"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
-            "test 3"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 3u)),
-            "test 4"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 4u)),
-            "test 5"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(1 to 0u)),
-            "test 6"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(1 to 1u)),
-            "test 7"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
-            "test 8"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf()),
-            "test 9"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-2),
-                listOf(1u) to Rational(2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(
-                0 to 1u,
-                1 to 0u
-            )),
-            "test 10"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(
-                0 to 0u,
-                1 to 1u
-            )),
-            "test 11"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1, 1),
-                listOf(1u) to Rational(-33, 4),
-                listOf(2u) to Rational(216, 1),
-                listOf(0u, 1u) to Rational(-22, 1),
-                listOf(1u, 1u) to Rational(-2, 1),
-                listOf(2u, 1u) to Rational(-108, 1),
-                listOf(0u, 2u) to Rational(-1, 4),
-                listOf(1u, 2u) to Rational(24, 7),
-                listOf(2u, 2u) to Rational(-6, 1),
-                listOf(0u, 3u) to Rational(-4, 1),
-                listOf(1u, 3u) to Rational(9, 1),
-                listOf(2u, 3u) to Rational(20, 3),
-                listOf(0u, 4u) to Rational(-14, 1),
-                listOf(1u, 4u) to Rational(6, 7),
-                listOf(2u, 4u) to Rational(60, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
-            "test 12a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(2, 3),
-                listOf(1u) to Rational(-22, 1),
-                listOf(2u) to Rational(-1, 1),
-                listOf(3u) to Rational(-36, 1),
-                listOf(0u, 1u) to Rational(-16, 5),
-                listOf(1u, 1u) to Rational(-1, 2),
-                listOf(2u, 1u) to Rational(24, 7),
-                listOf(3u, 1u) to Rational(-4, 1),
-                listOf(0u, 2u) to Rational(6, 1),
-                listOf(1u, 2u) to Rational(-12, 1),
-                listOf(2u, 2u) to Rational(27, 2),
-                listOf(3u, 2u) to Rational(20, 3),
-                listOf(0u, 3u) to Rational(-40, 1),
-                listOf(1u, 3u) to Rational(-56, 1),
-                listOf(2u, 3u) to Rational(12, 7),
-                listOf(3u, 3u) to Rational(80, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 1u, 1 to 1u)),
-            "test 12b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-20, 3),
-                listOf(1u) to Rational(-16, 5),
-                listOf(2u) to Rational(-1, 4),
-                listOf(3u) to Rational(8, 7),
-                listOf(4u) to Rational(-1, 1),
-                listOf(0u, 1u) to Rational(18, 7),
-                listOf(1u, 1u) to Rational(12, 1),
-                listOf(2u, 1u) to Rational(-12, 1),
-                listOf(3u, 1u) to Rational(9, 1),
-                listOf(4u, 1u) to Rational(10, 3),
-                listOf(0u, 2u) to Rational(-27, 1),
-                listOf(1u, 2u) to Rational(-120, 1),
-                listOf(2u, 2u) to Rational(-84, 1),
-                listOf(3u, 2u) to Rational(12, 7),
-                listOf(4u, 2u) to Rational(60, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
-            "test 12c"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-1, 4),
-                listOf(1u, 2u) to Rational(24, 7),
-                listOf(2u, 2u) to Rational(-6, 1),
-                listOf(0u, 3u) to Rational(-4, 1),
-                listOf(1u, 3u) to Rational(9, 1),
-                listOf(2u, 3u) to Rational(20, 3),
-                listOf(0u, 4u) to Rational(-14, 1),
-                listOf(1u, 4u) to Rational(6, 7),
-                listOf(2u, 4u) to Rational(60, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
-            "test 13a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(-1, 2),
-                listOf(2u, 1u) to Rational(24, 7),
-                listOf(3u, 1u) to Rational(-4, 1),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(-12, 1),
-                listOf(2u, 2u) to Rational(27, 2),
-                listOf(3u, 2u) to Rational(20, 3),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(-56, 1),
-                listOf(2u, 3u) to Rational(12, 7),
-                listOf(3u, 3u) to Rational(80, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 1u, 1 to 1u)),
-            "test 13b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(-1, 4),
-                listOf(3u) to Rational(8, 7),
-                listOf(4u) to Rational(-1, 1),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(-12, 1),
-                listOf(3u, 1u) to Rational(9, 1),
-                listOf(4u, 1u) to Rational(10, 3),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-84, 1),
-                listOf(3u, 2u) to Rational(12, 7),
-                listOf(4u, 2u) to Rational(60, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
-            "test 13c"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1, 1),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(0u, 1u) to Rational(-22, 1),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-1, 4),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
-            "test 14a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(2, 3),
-                listOf(1u) to Rational(-22, 1),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(0u, 1u) to Rational(-16, 5),
-                listOf(1u, 1u) to Rational(-1, 2),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(0),
-                listOf(3u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(0 to 1u, 1 to 1u)),
-            "test 14b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-20, 3),
-                listOf(1u) to Rational(-16, 5),
-                listOf(2u) to Rational(-1, 4),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(0),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).nthDerivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
-            "test 14c"
-        )
-    }
-    @Test
-    @OptIn(UnstableKMathAPI::class)
-    fun test_Polynomial_antiderivativeWithRespectTo_variable() {
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(1u) to Rational(1),
-                listOf(2u) to Rational(-1),
-                listOf(3u) to Rational(1, 3),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).antiderivativeWithRespectTo(RationalField, 0),
-            "test 1"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(1u) to Rational(-6, 8),
-                listOf(2u) to Rational(-1, 3),
-                listOf(3u) to Rational(1, 6),
-                listOf(4u) to Rational(-11, 32),
-                listOf(5u) to Rational(18, 5),
-                listOf(1u, 1u) to Rational(-18, 3),
-                listOf(2u, 1u) to Rational(1, 3),
-                listOf(3u, 1u) to Rational(-11, 3),
-                listOf(4u, 1u) to Rational(-1, 12),
-                listOf(5u, 1u) to Rational(-18, 10),
-                listOf(1u, 2u) to Rational(-10, 3),
-                listOf(2u, 2u) to Rational(-4, 5),
-                listOf(3u, 2u) to Rational(-1, 24),
-                listOf(4u, 2u) to Rational(1, 7),
-                listOf(5u, 2u) to Rational(-1, 10),
-                listOf(1u, 3u) to Rational(3, 7),
-                listOf(2u, 3u) to Rational(1, 1),
-                listOf(3u, 3u) to Rational(-2, 3),
-                listOf(4u, 3u) to Rational(3, 8),
-                listOf(5u, 3u) to Rational(1, 9),
-                listOf(1u, 4u) to Rational(-18, 8),
-                listOf(2u, 4u) to Rational(-5, 1),
-                listOf(3u, 4u) to Rational(-7, 3),
-                listOf(4u, 4u) to Rational(1, 28),
-                listOf(5u, 4u) to Rational(1, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).antiderivativeWithRespectTo(RationalField, 0),
-            "test 2a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 1u) to Rational(-6, 8),
-                listOf(1u, 1u) to Rational(-2, 3),
-                listOf(2u, 1u) to Rational(1, 2),
-                listOf(3u, 1u) to Rational(-11, 8),
-                listOf(4u, 1u) to Rational(18, 1),
-                listOf(0u, 2u) to Rational(-9, 3),
-                listOf(1u, 2u) to Rational(1, 3),
-                listOf(2u, 2u) to Rational(-11, 2),
-                listOf(3u, 2u) to Rational(-1, 6),
-                listOf(4u, 2u) to Rational(-9, 2),
-                listOf(0u, 3u) to Rational(-10, 9),
-                listOf(1u, 3u) to Rational(-8, 15),
-                listOf(2u, 3u) to Rational(-1, 24),
-                listOf(3u, 3u) to Rational(4, 21),
-                listOf(4u, 3u) to Rational(-1, 6),
-                listOf(0u, 4u) to Rational(3, 28),
-                listOf(1u, 4u) to Rational(1, 2),
-                listOf(2u, 4u) to Rational(-1, 2),
-                listOf(3u, 4u) to Rational(3, 8),
-                listOf(4u, 4u) to Rational(5, 36),
-                listOf(0u, 5u) to Rational(-9, 20),
-                listOf(1u, 5u) to Rational(-2, 1),
-                listOf(2u, 5u) to Rational(-7, 5),
-                listOf(3u, 5u) to Rational(1, 35),
-                listOf(4u, 5u) to Rational(1, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).antiderivativeWithRespectTo(RationalField, 1),
-            "test 2b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(5u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(5u, 1u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(0),
-                listOf(3u, 2u) to Rational(-1, 24),
-                listOf(4u, 2u) to Rational(1, 7),
-                listOf(5u, 2u) to Rational(-1, 10),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(-2, 3),
-                listOf(4u, 3u) to Rational(3, 8),
-                listOf(5u, 3u) to Rational(1, 9),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(-7, 3),
-                listOf(4u, 4u) to Rational(1, 28),
-                listOf(5u, 4u) to Rational(1, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).antiderivativeWithRespectTo(RationalField, 0),
-            "test 3a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(0),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-1, 24),
-                listOf(3u, 3u) to Rational(4, 21),
-                listOf(4u, 3u) to Rational(-1, 6),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-1, 2),
-                listOf(3u, 4u) to Rational(3, 8),
-                listOf(4u, 4u) to Rational(5, 36),
-                listOf(0u, 5u) to Rational(0),
-                listOf(1u, 5u) to Rational(0),
-                listOf(2u, 5u) to Rational(-7, 5),
-                listOf(3u, 5u) to Rational(1, 35),
-                listOf(4u, 5u) to Rational(1, 1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).antiderivativeWithRespectTo(RationalField, 1),
-            "test 3b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(1u) to Rational(-6, 8),
-                listOf(2u) to Rational(-1, 3),
-                listOf(3u) to Rational(1, 6),
-                listOf(4u) to Rational(0),
-                listOf(5u) to Rational(0),
-                listOf(1u, 1u) to Rational(-18, 3),
-                listOf(2u, 1u) to Rational(1, 3),
-                listOf(3u, 1u) to Rational(-11, 3),
-                listOf(4u, 1u) to Rational(0),
-                listOf(5u, 1u) to Rational(0),
-                listOf(1u, 2u) to Rational(-10, 3),
-                listOf(2u, 2u) to Rational(-4, 5),
-                listOf(3u, 2u) to Rational(-1, 24),
-                listOf(4u, 2u) to Rational(0),
-                listOf(5u, 2u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(5u, 3u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-                listOf(5u, 4u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).antiderivativeWithRespectTo(RationalField, 0),
-            "test 4a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 1u) to Rational(-6, 8),
-                listOf(1u, 1u) to Rational(-2, 3),
-                listOf(2u, 1u) to Rational(1, 2),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-9, 3),
-                listOf(1u, 2u) to Rational(1, 3),
-                listOf(2u, 2u) to Rational(-11, 2),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(-10, 9),
-                listOf(1u, 3u) to Rational(-8, 15),
-                listOf(2u, 3u) to Rational(-1, 24),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-                listOf(0u, 5u) to Rational(0),
-                listOf(1u, 5u) to Rational(0),
-                listOf(2u, 5u) to Rational(0),
-                listOf(3u, 5u) to Rational(0),
-                listOf(4u, 5u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).antiderivativeWithRespectTo(RationalField, 1),
-            "test 4b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 0u, 0u, 0u, 0u, 1u) to Rational(-6, 8),
-                listOf(1u, 0u, 0u, 0u, 0u, 1u) to Rational(-2, 3),
-                listOf(2u, 0u, 0u, 0u, 0u, 1u) to Rational(1, 2),
-                listOf(3u, 0u, 0u, 0u, 0u, 1u) to Rational(-11, 8),
-                listOf(4u, 0u, 0u, 0u, 0u, 1u) to Rational(18, 1),
-                listOf(0u, 1u, 0u, 0u, 0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u, 0u, 0u, 0u, 1u) to Rational(2, 3),
-                listOf(2u, 1u, 0u, 0u, 0u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u, 0u, 0u, 0u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u, 0u, 0u, 0u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u, 0u, 0u, 0u, 1u) to Rational(-10, 3),
-                listOf(1u, 2u, 0u, 0u, 0u, 1u) to Rational(-8, 5),
-                listOf(2u, 2u, 0u, 0u, 0u, 1u) to Rational(-1, 8),
-                listOf(3u, 2u, 0u, 0u, 0u, 1u) to Rational(4, 7),
-                listOf(4u, 2u, 0u, 0u, 0u, 1u) to Rational(-4, 8),
-                listOf(0u, 3u, 0u, 0u, 0u, 1u) to Rational(3, 7),
-                listOf(1u, 3u, 0u, 0u, 0u, 1u) to Rational(16, 8),
-                listOf(2u, 3u, 0u, 0u, 0u, 1u) to Rational(-16, 8),
-                listOf(3u, 3u, 0u, 0u, 0u, 1u) to Rational(12, 8),
-                listOf(4u, 3u, 0u, 0u, 0u, 1u) to Rational(5, 9),
-                listOf(0u, 4u, 0u, 0u, 0u, 1u) to Rational(-18, 8),
-                listOf(1u, 4u, 0u, 0u, 0u, 1u) to Rational(-10, 1),
-                listOf(2u, 4u, 0u, 0u, 0u, 1u) to Rational(-14, 2),
-                listOf(3u, 4u, 0u, 0u, 0u, 1u) to Rational(1, 7),
-                listOf(4u, 4u, 0u, 0u, 0u, 1u) to Rational(15, 3),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).antiderivativeWithRespectTo(RationalField, 5),
-            "test 5"
-        )
-    }
-    @Test
-    @OptIn(UnstableKMathAPI::class)
-    fun test_Polynomial_nthAntiderivativeWithRespectTo_variable_order() {
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(1u) to Rational(1),
-                listOf(2u) to Rational(-1),
-                listOf(3u) to Rational(1, 3),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 0, 1u),
-            "test 1"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 0, 0u),
-            "test 2"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-1, 3),
-                listOf(4u) to Rational(1, 12),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 0, 2u),
-            "test 3"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(3u) to Rational(1, 6),
-                listOf(4u) to Rational(-1, 12),
-                listOf(5u) to Rational(1, 60),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 0, 3u),
-            "test 4"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(4u) to Rational(1, 24),
-                listOf(5u) to Rational(-1, 60),
-                listOf(6u) to Rational(1, 360),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 0, 4u),
-            "test 5"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 1, 0u),
-            "test 6"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 1u) to Rational(1),
-                listOf(1u, 1u) to Rational(-2),
-                listOf(2u, 1u) to Rational(1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 1, 1u),
-            "test 7"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 2u) to Rational(1, 2),
-                listOf(1u, 2u) to Rational(-1),
-                listOf(2u, 2u) to Rational(1, 2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 1, 2u),
-            "test 8"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(2u) to Rational(-3, 8),
-                listOf(3u) to Rational(-1, 9),
-                listOf(4u) to Rational(1, 24),
-                listOf(5u) to Rational(-11, 160),
-                listOf(6u) to Rational(3, 5),
-                listOf(2u, 1u) to Rational(-9, 3),
-                listOf(3u, 1u) to Rational(1, 9),
-                listOf(4u, 1u) to Rational(-11, 12),
-                listOf(5u, 1u) to Rational(-1, 60),
-                listOf(6u, 1u) to Rational(-3, 10),
-                listOf(2u, 2u) to Rational(-5, 3),
-                listOf(3u, 2u) to Rational(-4, 15),
-                listOf(4u, 2u) to Rational(-1, 96),
-                listOf(5u, 2u) to Rational(1, 35),
-                listOf(6u, 2u) to Rational(-1, 60),
-                listOf(2u, 3u) to Rational(3, 14),
-                listOf(3u, 3u) to Rational(1, 3),
-                listOf(4u, 3u) to Rational(-1, 6),
-                listOf(5u, 3u) to Rational(3, 40),
-                listOf(6u, 3u) to Rational(1, 54),
-                listOf(2u, 4u) to Rational(-9, 8),
-                listOf(3u, 4u) to Rational(-5, 3),
-                listOf(4u, 4u) to Rational(-7, 12),
-                listOf(5u, 4u) to Rational(1, 140),
-                listOf(6u, 4u) to Rational(1, 6),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, 0, 2u),
-            "test 9a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 2u) to Rational(-3, 8),
-                listOf(1u, 2u) to Rational(-1, 3),
-                listOf(2u, 2u) to Rational(1, 4),
-                listOf(3u, 2u) to Rational(-11, 16),
-                listOf(4u, 2u) to Rational(9, 1),
-                listOf(0u, 3u) to Rational(-1, 1),
-                listOf(1u, 3u) to Rational(1, 9),
-                listOf(2u, 3u) to Rational(-11, 6),
-                listOf(3u, 3u) to Rational(-1, 18),
-                listOf(4u, 3u) to Rational(-9, 6),
-                listOf(0u, 4u) to Rational(-5, 18),
-                listOf(1u, 4u) to Rational(-2, 15),
-                listOf(2u, 4u) to Rational(-1, 96),
-                listOf(3u, 4u) to Rational(1, 21),
-                listOf(4u, 4u) to Rational(-1, 24),
-                listOf(0u, 5u) to Rational(3, 140),
-                listOf(1u, 5u) to Rational(1, 10),
-                listOf(2u, 5u) to Rational(-1, 10),
-                listOf(3u, 5u) to Rational(3, 40),
-                listOf(4u, 5u) to Rational(1, 36),
-                listOf(0u, 6u) to Rational(-3, 40),
-                listOf(1u, 6u) to Rational(-1, 3),
-                listOf(2u, 6u) to Rational(-7, 30),
-                listOf(3u, 6u) to Rational(1, 210),
-                listOf(4u, 6u) to Rational(1, 6),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, 1, 2u),
-            "test 9b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(5u) to Rational(0),
-                listOf(6u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(5u, 1u) to Rational(0),
-                listOf(6u, 1u) to Rational(0),
-                listOf(2u, 2u) to Rational(0),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(-1, 96),
-                listOf(5u, 2u) to Rational(1, 35),
-                listOf(6u, 2u) to Rational(-1, 60),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(-1, 6),
-                listOf(5u, 3u) to Rational(3, 40),
-                listOf(6u, 3u) to Rational(1, 54),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(-7, 12),
-                listOf(5u, 4u) to Rational(1, 140),
-                listOf(6u, 4u) to Rational(1, 6),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, 0, 2u),
-            "test 10a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(0),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-1, 96),
-                listOf(3u, 4u) to Rational(1, 21),
-                listOf(4u, 4u) to Rational(-1, 24),
-                listOf(0u, 5u) to Rational(0),
-                listOf(1u, 5u) to Rational(0),
-                listOf(2u, 5u) to Rational(-1, 10),
-                listOf(3u, 5u) to Rational(3, 40),
-                listOf(4u, 5u) to Rational(1, 36),
-                listOf(0u, 6u) to Rational(0),
-                listOf(1u, 6u) to Rational(0),
-                listOf(2u, 6u) to Rational(-7, 30),
-                listOf(3u, 6u) to Rational(1, 210),
-                listOf(4u, 6u) to Rational(1, 6),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, 1, 2u),
-            "test 10b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(2u) to Rational(-3, 8),
-                listOf(3u) to Rational(-1, 9),
-                listOf(4u) to Rational(1, 24),
-                listOf(5u) to Rational(0),
-                listOf(6u) to Rational(0),
-                listOf(2u, 1u) to Rational(-9, 3),
-                listOf(3u, 1u) to Rational(1, 9),
-                listOf(4u, 1u) to Rational(-11, 12),
-                listOf(5u, 1u) to Rational(0),
-                listOf(6u, 1u) to Rational(0),
-                listOf(2u, 2u) to Rational(-5, 3),
-                listOf(3u, 2u) to Rational(-4, 15),
-                listOf(4u, 2u) to Rational(-1, 96),
-                listOf(5u, 2u) to Rational(0),
-                listOf(6u, 2u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(5u, 3u) to Rational(0),
-                listOf(6u, 3u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-                listOf(5u, 4u) to Rational(0),
-                listOf(6u, 4u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).nthAntiderivativeWithRespectTo(RationalField, 0, 2u),
-            "test 11a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 2u) to Rational(-3, 8),
-                listOf(1u, 2u) to Rational(-1, 3),
-                listOf(2u, 2u) to Rational(1, 4),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(-1, 1),
-                listOf(1u, 3u) to Rational(1, 9),
-                listOf(2u, 3u) to Rational(-11, 6),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(-5, 18),
-                listOf(1u, 4u) to Rational(-2, 15),
-                listOf(2u, 4u) to Rational(-1, 96),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-                listOf(0u, 5u) to Rational(0),
-                listOf(1u, 5u) to Rational(0),
-                listOf(2u, 5u) to Rational(0),
-                listOf(3u, 5u) to Rational(0),
-                listOf(4u, 5u) to Rational(0),
-                listOf(0u, 6u) to Rational(0),
-                listOf(1u, 6u) to Rational(0),
-                listOf(2u, 6u) to Rational(0),
-                listOf(3u, 6u) to Rational(0),
-                listOf(4u, 6u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).nthAntiderivativeWithRespectTo(RationalField, 1, 2u),
-            "test 11b"
-        )
-    }
-    @Test
-    @OptIn(UnstableKMathAPI::class)
-    fun test_Polynomial_nthAntiderivativeWithRespectTo_variablesAndOrders() {
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(1u) to Rational(1),
-                listOf(2u) to Rational(-1),
-                listOf(3u) to Rational(1, 3),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 1u)),
-            "test 1"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 0, 0u),
-            "test 2"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-1, 3),
-                listOf(4u) to Rational(1, 12),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 0, 2u),
-            "test 3"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(3u) to Rational(1, 6),
-                listOf(4u) to Rational(-1, 12),
-                listOf(5u) to Rational(1, 60),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 0, 3u),
-            "test 4"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(4u) to Rational(1, 24),
-                listOf(5u) to Rational(-1, 60),
-                listOf(6u) to Rational(1, 360),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 0, 4u),
-            "test 5"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 1, 0u),
-            "test 6"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 1u) to Rational(1),
-                listOf(1u, 1u) to Rational(-2),
-                listOf(2u, 1u) to Rational(1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 1, 1u),
-            "test 7"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 2u) to Rational(1, 2),
-                listOf(1u, 2u) to Rational(-1),
-                listOf(2u, 2u) to Rational(1, 2),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, 1, 2u),
-            "test 8"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf()),
-            "test 9"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(1u) to Rational(1),
-                listOf(2u) to Rational(-1),
-                listOf(3u) to Rational(1, 3),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(
-                0 to 1u,
-                1 to 0u
-            )),
-            "test 10"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 1u) to Rational(1),
-                listOf(1u, 1u) to Rational(-2),
-                listOf(2u, 1u) to Rational(1),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(1),
-                listOf(1u) to Rational(-2),
-                listOf(2u) to Rational(1),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(
-                0 to 0u,
-                1 to 1u
-            )),
-            "test 11"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(2u) to Rational(-3, 8),
-                listOf(3u) to Rational(-1, 9),
-                listOf(4u) to Rational(1, 24),
-                listOf(5u) to Rational(-11, 160),
-                listOf(6u) to Rational(3, 5),
-                listOf(2u, 1u) to Rational(-9, 3),
-                listOf(3u, 1u) to Rational(1, 9),
-                listOf(4u, 1u) to Rational(-11, 12),
-                listOf(5u, 1u) to Rational(-1, 60),
-                listOf(6u, 1u) to Rational(-3, 10),
-                listOf(2u, 2u) to Rational(-5, 3),
-                listOf(3u, 2u) to Rational(-4, 15),
-                listOf(4u, 2u) to Rational(-1, 96),
-                listOf(5u, 2u) to Rational(1, 35),
-                listOf(6u, 2u) to Rational(-1, 60),
-                listOf(2u, 3u) to Rational(3, 14),
-                listOf(3u, 3u) to Rational(1, 3),
-                listOf(4u, 3u) to Rational(-1, 6),
-                listOf(5u, 3u) to Rational(3, 40),
-                listOf(6u, 3u) to Rational(1, 54),
-                listOf(2u, 4u) to Rational(-9, 8),
-                listOf(3u, 4u) to Rational(-5, 3),
-                listOf(4u, 4u) to Rational(-7, 12),
-                listOf(5u, 4u) to Rational(1, 140),
-                listOf(6u, 4u) to Rational(1, 6),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
-            "test 12a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(1u, 1u) to Rational(-6, 8),
-                listOf(2u, 1u) to Rational(-1, 3),
-                listOf(3u, 1u) to Rational(1, 6),
-                listOf(4u, 1u) to Rational(-11, 32),
-                listOf(5u, 1u) to Rational(18, 5),
-                listOf(1u, 2u) to Rational(-9, 3),
-                listOf(2u, 2u) to Rational(1, 6),
-                listOf(3u, 2u) to Rational(-11, 6),
-                listOf(4u, 2u) to Rational(-1, 24),
-                listOf(5u, 2u) to Rational(-9, 10),
-                listOf(1u, 3u) to Rational(-10, 9),
-                listOf(2u, 3u) to Rational(-4, 15),
-                listOf(3u, 3u) to Rational(-1, 72),
-                listOf(4u, 3u) to Rational(1, 21),
-                listOf(5u, 3u) to Rational(-1, 30),
-                listOf(1u, 4u) to Rational(3, 28),
-                listOf(2u, 4u) to Rational(1, 4),
-                listOf(3u, 4u) to Rational(-1, 6),
-                listOf(4u, 4u) to Rational(3, 32),
-                listOf(5u, 4u) to Rational(1, 36),
-                listOf(1u, 5u) to Rational(-9, 20),
-                listOf(2u, 5u) to Rational(-1, 1),
-                listOf(3u, 5u) to Rational(-7, 15),
-                listOf(4u, 5u) to Rational(1, 140),
-                listOf(5u, 5u) to Rational(1, 5),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 1u, 1 to 1u)),
-            "test 12b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 2u) to Rational(-3, 8),
-                listOf(1u, 2u) to Rational(-1, 3),
-                listOf(2u, 2u) to Rational(1, 4),
-                listOf(3u, 2u) to Rational(-11, 16),
-                listOf(4u, 2u) to Rational(9, 1),
-                listOf(0u, 3u) to Rational(-1, 1),
-                listOf(1u, 3u) to Rational(1, 9),
-                listOf(2u, 3u) to Rational(-11, 6),
-                listOf(3u, 3u) to Rational(-1, 18),
-                listOf(4u, 3u) to Rational(-9, 6),
-                listOf(0u, 4u) to Rational(-5, 18),
-                listOf(1u, 4u) to Rational(-2, 15),
-                listOf(2u, 4u) to Rational(-1, 96),
-                listOf(3u, 4u) to Rational(1, 21),
-                listOf(4u, 4u) to Rational(-1, 24),
-                listOf(0u, 5u) to Rational(3, 140),
-                listOf(1u, 5u) to Rational(1, 10),
-                listOf(2u, 5u) to Rational(-1, 10),
-                listOf(3u, 5u) to Rational(3, 40),
-                listOf(4u, 5u) to Rational(1, 36),
-                listOf(0u, 6u) to Rational(-3, 40),
-                listOf(1u, 6u) to Rational(-1, 3),
-                listOf(2u, 6u) to Rational(-7, 30),
-                listOf(3u, 6u) to Rational(1, 210),
-                listOf(4u, 6u) to Rational(1, 6),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(-11, 8),
-                listOf(4u) to Rational(18, 1),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(-1, 3),
-                listOf(4u, 1u) to Rational(-18, 2),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(3, 7),
-                listOf(1u, 3u) to Rational(16, 8),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(-18, 8),
-                listOf(1u, 4u) to Rational(-10, 1),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
-            "test 12c"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(5u) to Rational(0),
-                listOf(6u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(5u, 1u) to Rational(0),
-                listOf(6u, 1u) to Rational(0),
-                listOf(2u, 2u) to Rational(0),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(-1, 96),
-                listOf(5u, 2u) to Rational(1, 35),
-                listOf(6u, 2u) to Rational(-1, 60),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(-1, 6),
-                listOf(5u, 3u) to Rational(3, 40),
-                listOf(6u, 3u) to Rational(1, 54),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(-7, 12),
-                listOf(5u, 4u) to Rational(1, 140),
-                listOf(6u, 4u) to Rational(1, 6),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
-            "test 13a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(5u, 1u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(0),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(5u, 2u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(-1, 72),
-                listOf(4u, 3u) to Rational(1, 21),
-                listOf(5u, 3u) to Rational(-1, 30),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(-1, 6),
-                listOf(4u, 4u) to Rational(3, 32),
-                listOf(5u, 4u) to Rational(1, 36),
-                listOf(1u, 5u) to Rational(0),
-                listOf(2u, 5u) to Rational(0),
-                listOf(3u, 5u) to Rational(-7, 15),
-                listOf(4u, 5u) to Rational(1, 140),
-                listOf(5u, 5u) to Rational(1, 5),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 1u, 1 to 1u)),
-            "test 13b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(0),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-1, 96),
-                listOf(3u, 4u) to Rational(1, 21),
-                listOf(4u, 4u) to Rational(-1, 24),
-                listOf(0u, 5u) to Rational(0),
-                listOf(1u, 5u) to Rational(0),
-                listOf(2u, 5u) to Rational(-1, 10),
-                listOf(3u, 5u) to Rational(3, 40),
-                listOf(4u, 5u) to Rational(1, 36),
-                listOf(0u, 6u) to Rational(0),
-                listOf(1u, 6u) to Rational(0),
-                listOf(2u, 6u) to Rational(-7, 30),
-                listOf(3u, 6u) to Rational(1, 210),
-                listOf(4u, 6u) to Rational(1, 6),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(0),
-                listOf(1u) to Rational(0),
-                listOf(2u) to Rational(0),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(0),
-                listOf(1u, 1u) to Rational(0),
-                listOf(2u, 1u) to Rational(0),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(0),
-                listOf(1u, 2u) to Rational(0),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(4, 7),
-                listOf(4u, 2u) to Rational(-4, 8),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(-16, 8),
-                listOf(3u, 3u) to Rational(12, 8),
-                listOf(4u, 3u) to Rational(5, 9),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(-14, 2),
-                listOf(3u, 4u) to Rational(1, 7),
-                listOf(4u, 4u) to Rational(15, 3),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
-            "test 13c"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(2u) to Rational(-3, 8),
-                listOf(3u) to Rational(-1, 9),
-                listOf(4u) to Rational(1, 24),
-                listOf(5u) to Rational(0),
-                listOf(6u) to Rational(0),
-                listOf(2u, 1u) to Rational(-9, 3),
-                listOf(3u, 1u) to Rational(1, 9),
-                listOf(4u, 1u) to Rational(-11, 12),
-                listOf(5u, 1u) to Rational(0),
-                listOf(6u, 1u) to Rational(0),
-                listOf(2u, 2u) to Rational(-5, 3),
-                listOf(3u, 2u) to Rational(-4, 15),
-                listOf(4u, 2u) to Rational(-1, 96),
-                listOf(5u, 2u) to Rational(0),
-                listOf(6u, 2u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(5u, 3u) to Rational(0),
-                listOf(6u, 3u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-                listOf(5u, 4u) to Rational(0),
-                listOf(6u, 4u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 2u)),
-            "test 14a"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(1u, 1u) to Rational(-6, 8),
-                listOf(2u, 1u) to Rational(-1, 3),
-                listOf(3u, 1u) to Rational(1, 6),
-                listOf(4u, 1u) to Rational(0),
-                listOf(5u, 1u) to Rational(0),
-                listOf(1u, 2u) to Rational(-9, 3),
-                listOf(2u, 2u) to Rational(1, 6),
-                listOf(3u, 2u) to Rational(-11, 6),
-                listOf(4u, 2u) to Rational(0),
-                listOf(5u, 2u) to Rational(0),
-                listOf(1u, 3u) to Rational(-10, 9),
-                listOf(2u, 3u) to Rational(-4, 15),
-                listOf(3u, 3u) to Rational(-1, 72),
-                listOf(4u, 3u) to Rational(0),
-                listOf(5u, 3u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-                listOf(5u, 4u) to Rational(0),
-                listOf(1u, 5u) to Rational(0),
-                listOf(2u, 5u) to Rational(0),
-                listOf(3u, 5u) to Rational(0),
-                listOf(4u, 5u) to Rational(0),
-                listOf(5u, 5u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(0 to 1u, 1 to 1u)),
-            "test 14b"
-        )
-        assertEquals(
-            NumberedPolynomialAsIs(
-                listOf(0u, 2u) to Rational(-3, 8),
-                listOf(1u, 2u) to Rational(-1, 3),
-                listOf(2u, 2u) to Rational(1, 4),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(-1, 1),
-                listOf(1u, 3u) to Rational(1, 9),
-                listOf(2u, 3u) to Rational(-11, 6),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(-5, 18),
-                listOf(1u, 4u) to Rational(-2, 15),
-                listOf(2u, 4u) to Rational(-1, 96),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-                listOf(0u, 5u) to Rational(0),
-                listOf(1u, 5u) to Rational(0),
-                listOf(2u, 5u) to Rational(0),
-                listOf(3u, 5u) to Rational(0),
-                listOf(4u, 5u) to Rational(0),
-                listOf(0u, 6u) to Rational(0),
-                listOf(1u, 6u) to Rational(0),
-                listOf(2u, 6u) to Rational(0),
-                listOf(3u, 6u) to Rational(0),
-                listOf(4u, 6u) to Rational(0),
-            ),
-            NumberedPolynomialAsIs(
-                listOf<UInt>() to Rational(-6, 8),
-                listOf(1u) to Rational(-2, 3),
-                listOf(2u) to Rational(1, 2),
-                listOf(3u) to Rational(0),
-                listOf(4u) to Rational(0),
-                listOf(0u, 1u) to Rational(-18, 3),
-                listOf(1u, 1u) to Rational(2, 3),
-                listOf(2u, 1u) to Rational(-11, 1),
-                listOf(3u, 1u) to Rational(0),
-                listOf(4u, 1u) to Rational(0),
-                listOf(0u, 2u) to Rational(-10, 3),
-                listOf(1u, 2u) to Rational(-8, 5),
-                listOf(2u, 2u) to Rational(-1, 8),
-                listOf(3u, 2u) to Rational(0),
-                listOf(4u, 2u) to Rational(0),
-                listOf(0u, 3u) to Rational(0),
-                listOf(1u, 3u) to Rational(0),
-                listOf(2u, 3u) to Rational(0),
-                listOf(3u, 3u) to Rational(0),
-                listOf(4u, 3u) to Rational(0),
-                listOf(0u, 4u) to Rational(0),
-                listOf(1u, 4u) to Rational(0),
-                listOf(2u, 4u) to Rational(0),
-                listOf(3u, 4u) to Rational(0),
-                listOf(4u, 4u) to Rational(0),
-            ).nthAntiderivativeWithRespectTo(RationalField, mapOf(1 to 2u)),
-            "test 14c"
-        )
-    }
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
deleted file mode 100644
index ab912a464..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/BufferUtils.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions.testUtils
-
-import space.kscience.kmath.structures.Buffer
-import space.kscience.kmath.structures.asBuffer
-
-
-fun <T> bufferOf(vararg elements: T): Buffer<T> = elements.asBuffer()
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
deleted file mode 100644
index a037dcd18..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModulo.kt
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
-
-package space.kscience.kmath.functions.testUtils
-
-import space.kscience.kmath.operations.Ring
-
-
-class IntModulo {
-    val residue: Int
-    val modulus: Int
-
-    @PublishedApi
-    internal constructor(residue: Int, modulus: Int, toCheckInput: Boolean = true) {
-        if (toCheckInput) {
-            require(modulus != 0) { "modulus can not be zero" }
-            this.modulus = if (modulus < 0) -modulus else modulus
-            this.residue = residue.mod(this.modulus)
-        } else {
-            this.residue = residue
-            this.modulus = modulus
-        }
-    }
-
-    constructor(residue: Int, modulus: Int) : this(residue, modulus, true)
-
-    operator fun unaryPlus(): IntModulo = this
-    operator fun unaryMinus(): IntModulo =
-        IntModulo(
-            if (residue == 0) 0 else modulus - residue,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun plus(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not add two residue different modulo" }
-        return IntModulo(
-            (residue + other.residue) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun plus(other: Int): IntModulo =
-        IntModulo(
-            (residue + other) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun minus(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not subtract two residue different modulo" }
-        return IntModulo(
-            (residue - other.residue) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun minus(other: Int): IntModulo =
-        IntModulo(
-            (residue - other) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun times(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not multiply two residue different modulo" }
-        return IntModulo(
-            (residue * other.residue) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun times(other: Int): IntModulo =
-        IntModulo(
-            (residue * other) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    operator fun div(other: IntModulo): IntModulo {
-        require(modulus == other.modulus) { "can not divide two residue different modulo" }
-        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other.residue, modulus)
-        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
-        return IntModulo(
-            (residue * reciprocalCandidate) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    operator fun div(other: Int): IntModulo {
-        val (reciprocalCandidate, gcdOfOtherResidueAndModulus) = bezoutIdentityWithGCD(other, modulus)
-        require(gcdOfOtherResidueAndModulus == 1) { "can not divide to residue that has non-trivial GCD with modulo" }
-        return IntModulo(
-            (residue * reciprocalCandidate) % modulus,
-            modulus,
-            toCheckInput = false
-        )
-    }
-    override fun equals(other: Any?): Boolean =
-        when (other) {
-            is IntModulo -> residue == other.residue && modulus == other.modulus
-            else -> false
-        }
-
-    override fun hashCode(): Int = residue.hashCode()
-
-    override fun toString(): String = "$residue mod $modulus"
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
-class IntModuloRing : Ring<IntModulo> {
-
-    val modulus: Int
-
-    constructor(modulus: Int) {
-        require(modulus != 0) { "modulus can not be zero" }
-        this.modulus = if (modulus < 0) -modulus else modulus
-    }
-
-    override inline val zero: IntModulo get() = IntModulo(0, modulus, toCheckInput = false)
-    override inline val one: IntModulo get() = IntModulo(1, modulus, toCheckInput = false)
-
-    fun number(arg: Int): IntModulo = IntModulo(arg, modulus, toCheckInput = false)
-
-    override inline fun add(left: IntModulo, right: IntModulo): IntModulo = left + right
-    override inline fun multiply(left: IntModulo, right: IntModulo): IntModulo = left * right
-
-    override inline fun IntModulo.unaryMinus(): IntModulo = -this
-    override inline fun IntModulo.plus(arg: IntModulo): IntModulo = this + arg
-    override inline fun IntModulo.minus(arg: IntModulo): IntModulo = this - arg
-    override inline fun IntModulo.times(arg: IntModulo): IntModulo = this * arg
-    inline fun IntModulo.div(arg: IntModulo): IntModulo = this / arg
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
deleted file mode 100644
index 615523873..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/IntModuloUtils.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions.testUtils
-
-import space.kscience.kmath.functions.ListPolynomial
-import space.kscience.kmath.functions.ListPolynomialSpace
-import space.kscience.kmath.functions.PolynomialSpaceOverRing
-
-
-fun ListPolynomialSpace<IntModulo, IntModuloRing>.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
-    ListPolynomial(coefs.map { IntModulo(it, ring.modulus) })
-fun IntModuloRing.ListPolynomial(vararg coefs: Int): ListPolynomial<IntModulo> =
-    ListPolynomial(coefs.map { IntModulo(it, modulus) })
-
-fun IntModuloRing.m(arg: Int): IntModulo = IntModulo(arg, modulus)
-fun PolynomialSpaceOverRing<IntModulo, *, IntModuloRing>.m(arg: Int): IntModulo = IntModulo(arg, ring.modulus)
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt
deleted file mode 100644
index 61b50f128..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/NTMisc.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions.testUtils
-
-import kotlin.math.abs
-
-
-internal data class BezoutIdentityWithGCD<T>(val first: T, val second: T, val gcd: T)
-
-internal tailrec fun gcd(a: Long, b: Long): Long = if (a == 0L) abs(b) else gcd(b % a, a)
-
-internal fun bezoutIdentityWithGCD(a: Int, b: Int): BezoutIdentityWithGCD<Int> =
-    when {
-        a < 0 && b < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, -second, gcd) }
-        a < 0 -> with(bezoutIdentityWithGCDInternalLogic(-a, b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(-first, second, gcd) }
-        b < 0 -> with(bezoutIdentityWithGCDInternalLogic(a, -b, 1, 0, 0, 1)) { BezoutIdentityWithGCD(first, -second, gcd) }
-        else -> bezoutIdentityWithGCDInternalLogic(a, b, 1, 0, 0, 1)
-    }
-
-internal tailrec fun bezoutIdentityWithGCDInternalLogic(a: Int, b: Int, m1: Int, m2: Int, m3: Int, m4: Int): BezoutIdentityWithGCD<Int> =
-    if (b == 0) BezoutIdentityWithGCD(m1, m3, a)
-    else {
-        val quotient = a / b
-        val reminder = a % b
-        bezoutIdentityWithGCDInternalLogic(b, reminder, m2, m1 - quotient * m2, m4, m3 - quotient * m4)
-    }
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
deleted file mode 100644
index 0a3d00e96..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("NOTHING_TO_INLINE", "KotlinRedundantDiagnosticSuppress")
-
-package space.kscience.kmath.functions.testUtils
-
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.operations.Field
-import space.kscience.kmath.operations.NumbersAddOps
-
-@Suppress("NAME_SHADOWING")
-class Rational {
-    companion object {
-        val ZERO: Rational = Rational(0L)
-        val ONE: Rational = Rational(1L)
-    }
-
-    val numerator: Long
-    val denominator: Long
-
-    internal constructor(numerator: Long, denominator: Long, toCheckInput: Boolean = true) {
-        if (toCheckInput) {
-            if (denominator == 0L) throw ArithmeticException("/ by zero")
-
-            val greatestCommonDivider = gcd(numerator, denominator).let { if (denominator < 0L) -it else it }
-
-            this.numerator = numerator / greatestCommonDivider
-            this.denominator = denominator / greatestCommonDivider
-        } else {
-            this.numerator = numerator
-            this.denominator = denominator
-        }
-    }
-
-    constructor(numerator: Int, denominator: Int) : this(numerator.toLong(), denominator.toLong(), true)
-    constructor(numerator: Int, denominator: Long) : this(numerator.toLong(), denominator, true)
-    constructor(numerator: Long, denominator: Int) : this(numerator, denominator.toLong(), true)
-    constructor(numerator: Long, denominator: Long) : this(numerator, denominator, true)
-    constructor(numerator: Int) : this(numerator.toLong(), 1L, false)
-    constructor(numerator: Long) : this(numerator, 1L, false)
-
-    operator fun unaryPlus(): Rational = this
-    operator fun unaryMinus(): Rational = Rational(-this.numerator, this.denominator)
-    operator fun plus(other: Rational): Rational {
-        val denominatorsGcd = gcd(denominator, other.denominator)
-        val dividedThisDenominator = denominator / denominatorsGcd
-        val dividedOtherDenominator = other.denominator / denominatorsGcd
-        val numeratorCandidate = numerator * dividedOtherDenominator + dividedThisDenominator * other.numerator
-        val secondGcd = gcd(numeratorCandidate, denominatorsGcd)
-        return Rational(
-            numeratorCandidate / secondGcd,
-            dividedThisDenominator * (other.denominator / secondGcd),
-            toCheckInput = false
-        )
-    }
-    operator fun plus(other: Int): Rational =
-        Rational(
-            numerator + denominator * other.toLong(),
-            denominator,
-            toCheckInput = false
-        )
-    operator fun plus(other: Long): Rational =
-        Rational(
-            numerator + denominator * other,
-            denominator,
-            toCheckInput = false
-        )
-    operator fun minus(other: Rational): Rational {
-        val denominatorsGcd = gcd(denominator, other.denominator)
-        val dividedThisDenominator = denominator / denominatorsGcd
-        val dividedOtherDenominator = other.denominator / denominatorsGcd
-        val numeratorCandidate = numerator * dividedOtherDenominator - dividedThisDenominator * other.numerator
-        val secondGcd = gcd(numeratorCandidate, denominatorsGcd)
-        return Rational(
-            numeratorCandidate / secondGcd,
-            dividedThisDenominator * (other.denominator / secondGcd),
-            toCheckInput = false
-        )
-    }
-    operator fun minus(other: Int): Rational =
-        Rational(
-            numerator - denominator * other.toLong(),
-            denominator,
-            toCheckInput = false
-        )
-    operator fun minus(other: Long): Rational =
-        Rational(
-            numerator - denominator * other,
-            denominator,
-            toCheckInput = false
-        )
-    operator fun times(other: Rational): Rational {
-        val thisDenominatorAndOtherNumeratorGcd = gcd(denominator, other.numerator)
-        val otherDenominatorAndThisNumeratorGcd = gcd(other.denominator, numerator)
-        return Rational(
-            (numerator / otherDenominatorAndThisNumeratorGcd) * (other.numerator / thisDenominatorAndOtherNumeratorGcd),
-            (denominator / thisDenominatorAndOtherNumeratorGcd) * (other.denominator / otherDenominatorAndThisNumeratorGcd),
-            toCheckInput = false
-        )
-    }
-    operator fun times(other: Int): Rational {
-        val other = other.toLong()
-        val denominatorAndOtherGcd = gcd(denominator, other)
-        return Rational(
-            numerator * (other / denominatorAndOtherGcd),
-            denominator / denominatorAndOtherGcd,
-            toCheckInput = false
-        )
-    }
-    operator fun times(other: Long): Rational {
-        val denominatorAndOtherGcd = gcd(denominator, other)
-        return Rational(
-            numerator * (other / denominatorAndOtherGcd),
-            denominator / denominatorAndOtherGcd,
-            toCheckInput = false
-        )
-    }
-    operator fun div(other: Rational): Rational {
-        val denominatorsGcd = gcd(denominator, other.denominator)
-        val numeratorsGcd = gcd(numerator, other.numerator)
-        return Rational(
-            (numerator / numeratorsGcd) * (other.denominator / denominatorsGcd),
-            (denominator / denominatorsGcd) * (other.numerator / numeratorsGcd)
-        )
-    }
-    operator fun div(other: Int): Rational {
-        val other = other.toLong()
-        val numeratorAndOtherGcd = gcd(numerator, other)
-        return Rational(
-            numerator / numeratorAndOtherGcd,
-            denominator * (other / numeratorAndOtherGcd),
-            toCheckInput = false
-        )
-    }
-    operator fun div(other: Long): Rational {
-        val numeratorAndOtherGcd = gcd(numerator, other)
-        return Rational(
-            numerator / numeratorAndOtherGcd,
-            denominator * (other / numeratorAndOtherGcd),
-            toCheckInput = false
-        )
-    }
-    override fun equals(other: Any?): Boolean =
-        when (other) {
-            is Rational -> numerator == other.numerator && denominator == other.denominator
-            is Int -> numerator == other && denominator == 1L
-            is Long -> numerator == other && denominator == 1L
-            else -> false
-        }
-
-    override fun hashCode(): Int = 31 * numerator.hashCode() + denominator.hashCode()
-
-    override fun toString(): String = if (denominator == 1L) "$numerator" else "$numerator/$denominator"
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "OVERRIDE_BY_INLINE")
-@OptIn(UnstableKMathAPI::class)
-object RationalField : Field<Rational>, NumbersAddOps<Rational> {
-    override inline val zero: Rational get() = Rational.ZERO
-    override inline val one: Rational get() = Rational.ONE
-
-    override inline fun number(value: Number): Rational = Rational(value.toLong())
-
-    override inline fun add(left: Rational, right: Rational): Rational = left + right
-    override inline fun multiply(left: Rational, right: Rational): Rational = left * right
-    override inline fun divide(left: Rational, right: Rational): Rational = left / right
-    override inline fun scale(a: Rational, value: Double): Rational = a * number(value)
-
-    override inline fun Rational.unaryMinus(): Rational = -this
-    override inline fun Rational.plus(arg: Rational): Rational = this + arg
-    override inline fun Rational.minus(arg: Rational): Rational = this - arg
-    override inline fun Rational.times(arg: Rational): Rational = this * arg
-    override inline fun Rational.div(arg: Rational): Rational = this / arg
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
deleted file mode 100644
index c70c229ca..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/assertion.kt
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions.testUtils
-
-import space.kscience.kmath.functions.LabeledPolynomial
-import space.kscience.kmath.functions.LabeledRationalFunction
-import space.kscience.kmath.functions.NumberedPolynomial
-import space.kscience.kmath.functions.NumberedRationalFunction
-import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
-
-
-fun <T> assertContentEquals(
-    expected: Map<T, Double>,
-    actual: Map<T, Double>,
-    absoluteTolerance: Double,
-    message: String? = null
-) {
-    assertEquals(expected.keys, actual.keys, message)
-    for ((key, expectedValue) in expected) assertEquals(expectedValue, actual[key]!!, absoluteTolerance, message)
-}
-
-fun assertEquals(
-    expected: NumberedPolynomial<Double>,
-    actual: NumberedPolynomial<Double>,
-    absoluteTolerance: Double,
-    message: String? = null
-) {
-    assertContentEquals(
-        expected.coefficients,
-        actual.coefficients,
-        absoluteTolerance,
-        message
-    )
-}
-
-fun assertEquals(
-    expected: LabeledPolynomial<Double>,
-    actual: LabeledPolynomial<Double>,
-    absoluteTolerance: Double,
-    message: String? = null
-) {
-    assertContentEquals(
-        expected.coefficients,
-        actual.coefficients,
-        absoluteTolerance,
-        message
-    )
-}
-
-fun assertEquals(
-    expected: NumberedRationalFunction<Double>,
-    actual: NumberedRationalFunction<Double>,
-    absoluteTolerance: Double,
-    message: String? = null
-) {
-    assertEquals(
-        expected.numerator,
-        actual.numerator,
-        absoluteTolerance,
-        message
-    )
-    assertEquals(
-        expected.denominator,
-        actual.denominator,
-        absoluteTolerance,
-        message
-    )
-}
-
-fun assertEquals(
-    expected: LabeledRationalFunction<Double>,
-    actual: LabeledRationalFunction<Double>,
-    absoluteTolerance: Double,
-    message: String? = null
-) {
-    assertEquals(
-        expected.numerator,
-        actual.numerator,
-        absoluteTolerance,
-        message
-    )
-    assertEquals(
-        expected.denominator,
-        actual.denominator,
-        absoluteTolerance,
-        message
-    )
-}
-
-inline fun <reified T : Throwable> assertFailsWithTypeAndMessage(
-    expectedMessage: String? = null,
-    assertionMessage: String? = null,
-    block: () -> Unit
-) {
-    assertEquals(
-        expectedMessage,
-        assertFailsWith(T::class, assertionMessage, block).message,
-        assertionMessage
-    )
-}
\ No newline at end of file
diff --git a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt b/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
deleted file mode 100644
index 66e46c902..000000000
--- a/kmath-polynomial/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/misc.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.functions.testUtils
-
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.expressions.symbol
-
-
-val o: Rational = Rational(0)
-
-val x: Symbol by symbol
-val y: Symbol by symbol
-val z: Symbol by symbol
-val t: Symbol by symbol
-val s: Symbol by symbol
-val iota: Symbol by symbol
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f53232f44..23af18d31 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,7 +26,6 @@ include(
     ":kmath-core",
     ":kmath-coroutines",
     ":kmath-functions",
-    ":kmath-polynomial",
     ":kmath-histograms",
     ":kmath-commons",
     ":kmath-viktor",
-- 
2.34.1


From 991ab907d87536c636f2ab6830a0f4a28886c386 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 10 Dec 2022 11:09:55 +0300
Subject: [PATCH 633/713] Encapsulate internal constants in Expression

---
 benchmarks/build.gradle.kts                   |  9 ++-----
 .../kscience/kmath/expressions/Expression.kt  | 24 ++++++++++++-------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 9c8dc613a..5d2e4dac8 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -50,6 +50,8 @@ kotlin {
 
         val jvmMain by getting {
             dependencies {
+                implementation("org.openjdk.jmh:jmh-core:1.36")
+                implementation("org.openjdk.jmh:jmh-generator-annprocess:1.36")
                 implementation(project(":kmath-commons"))
                 implementation(project(":kmath-ejml"))
                 implementation(project(":kmath-nd4j"))
@@ -144,13 +146,6 @@ benchmark {
     }
 }
 
-// Fix kotlinx-benchmarks bug
-afterEvaluate {
-    val jvmBenchmarkJar by tasks.getting(org.gradle.jvm.tasks.Jar::class) {
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    }
-}
-
 kotlin.sourceSets.all {
     with(languageSettings) {
         optIn("kotlin.contracts.ExperimentalContracts")
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
index 9c769caa0..cf59efe71 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
@@ -48,6 +48,10 @@ public interface DoubleExpression : Expression<Double> {
      * @return the value.
      */
     public operator fun invoke(arguments: DoubleArray): Double
+
+    public companion object{
+        internal val EMPTY_DOUBLE_ARRAY = DoubleArray(0)
+    }
 }
 
 /**
@@ -73,6 +77,10 @@ public interface IntExpression : Expression<Int> {
      * @return the value.
      */
     public operator fun invoke(arguments: IntArray): Int
+
+    public companion object{
+        internal val EMPTY_INT_ARRAY = IntArray(0)
+    }
 }
 
 /**
@@ -98,6 +106,10 @@ public interface LongExpression : Expression<Long> {
      * @return the value.
      */
     public operator fun invoke(arguments: LongArray): Long
+
+    public companion object{
+        internal val EMPTY_LONG_ARRAY = LongArray(0)
+    }
 }
 
 /**
@@ -145,7 +157,7 @@ public operator fun <T> Expression<T>.invoke(vararg pairs: Pair<String, T>): T =
     }
 )
 
-private val EMPTY_DOUBLE_ARRAY = DoubleArray(0)
+
 
 /**
  * Calls this expression without providing any arguments.
@@ -153,7 +165,7 @@ private val EMPTY_DOUBLE_ARRAY = DoubleArray(0)
  * @return a value.
  */
 @UnstableKMathAPI
-public operator fun DoubleExpression.invoke(): Double = this(EMPTY_DOUBLE_ARRAY)
+public operator fun DoubleExpression.invoke(): Double = this(DoubleExpression.EMPTY_DOUBLE_ARRAY)
 
 /**
  * Calls this expression from arguments.
@@ -164,15 +176,13 @@ public operator fun DoubleExpression.invoke(): Double = this(EMPTY_DOUBLE_ARRAY)
 @UnstableKMathAPI
 public operator fun DoubleExpression.invoke(vararg arguments: Double): Double = this(arguments)
 
-private val EMPTY_INT_ARRAY = IntArray(0)
-
 /**
  * Calls this expression without providing any arguments.
  *
  * @return a value.
  */
 @UnstableKMathAPI
-public operator fun IntExpression.invoke(): Int = this(EMPTY_INT_ARRAY)
+public operator fun IntExpression.invoke(): Int = this(IntExpression.EMPTY_INT_ARRAY)
 
 /**
  * Calls this expression from arguments.
@@ -183,15 +193,13 @@ public operator fun IntExpression.invoke(): Int = this(EMPTY_INT_ARRAY)
 @UnstableKMathAPI
 public operator fun IntExpression.invoke(vararg arguments: Int): Int = this(arguments)
 
-private val EMPTY_LONG_ARRAY = LongArray(0)
-
 /**
  * Calls this expression without providing any arguments.
  *
  * @return a value.
  */
 @UnstableKMathAPI
-public operator fun LongExpression.invoke(): Long = this(EMPTY_LONG_ARRAY)
+public operator fun LongExpression.invoke(): Long = this(LongExpression.EMPTY_LONG_ARRAY)
 
 /**
  * Calls this expression from arguments.
-- 
2.34.1


From 29977650f10d0d1168a4f218b2b71e371b567653 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 10 Dec 2022 12:21:56 +0300
Subject: [PATCH 634/713] Naive classifier notebook

---
 .gitignore                                |   3 +-
 examples/notebooks/Naive classifier.ipynb | 418 ++++++++++++++++++++++
 2 files changed, 419 insertions(+), 2 deletions(-)
 create mode 100644 examples/notebooks/Naive classifier.ipynb

diff --git a/.gitignore b/.gitignore
index 5ddd846a8..34ddf3fd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,9 @@ build/
 out/
 
 .idea/
-
-
 .vscode/
 
+
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
 
diff --git a/examples/notebooks/Naive classifier.ipynb b/examples/notebooks/Naive classifier.ipynb
new file mode 100644
index 000000000..937f5b6c6
--- /dev/null
+++ b/examples/notebooks/Naive classifier.ipynb	
@@ -0,0 +1,418 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "source": [
+    "%use kmath(0.3.1-dev-5)\n",
+    "%use plotly(0.5.0)\n",
+    "@file:DependsOn(\"space.kscience:kmath-commons:0.3.1-dev-5\")"
+   ],
+   "execution_count": null,
+   "outputs": [],
+   "metadata": {
+    "datalore": {
+     "node_id": "lQbSB87rNAn9lV6poArVWW",
+     "type": "CODE",
+     "hide_input_from_viewers": false,
+     "hide_output_from_viewers": false
+    }
+   }
+  },
+  {
+   "cell_type": "code",
+   "source": [
+    "//Uncomment to work in Jupyter classic or DataLore\n",
+    "//Plotly.jupyter.notebook()"
+   ],
+   "execution_count": null,
+   "outputs": [],
+   "metadata": {
+    "datalore": {
+     "node_id": "0UP158hfccGgjQtHz0wAi6",
+     "type": "CODE",
+     "hide_input_from_viewers": false,
+     "hide_output_from_viewers": false
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "# The model\n",
+    "\n",
+    "Defining the input data format, the statistic abstraction and the statistic implementation based on a weighted sum of elements."
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "source": [
+    "class XYValues(val xValues: DoubleArray, val yValues: DoubleArray) {\n",
+    "    init {\n",
+    "        require(xValues.size == yValues.size)\n",
+    "    }\n",
+    "}\n",
+    "\n",
+    "fun interface XYStatistic {\n",
+    "    operator fun invoke(values: XYValues): Double\n",
+    "}\n",
+    "\n",
+    "class ConvolutionalXYStatistic(val weights: DoubleArray) : XYStatistic {\n",
+    "    override fun invoke(values: XYValues): Double {\n",
+    "        require(weights.size == values.yValues.size)\n",
+    "        val norm = values.yValues.sum()\n",
+    "        return values.yValues.zip(weights) { value, weight -> value * weight }.sum()/norm\n",
+    "    }\n",
+    "}"
+   ],
+   "execution_count": null,
+   "outputs": [],
+   "metadata": {
+    "datalore": {
+     "node_id": "Zhgz1Ui91PWz0meJiQpHol",
+     "type": "CODE",
+     "hide_input_from_viewers": false,
+     "hide_output_from_viewers": false
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "# Generator\n",
+    "Generate sample data for parabolas and hyperbolas"
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "outputs": [],
+   "source": [
+    "fun generateParabolas(xValues: DoubleArray, a: Double, b: Double, c: Double): XYValues {\n",
+    "    val yValues = xValues.map { x -> a * x * x + b * x + c }.toDoubleArray()\n",
+    "    return XYValues(xValues, yValues)\n",
+    "}\n",
+    "\n",
+    "fun generateHyperbols(xValues: DoubleArray, gamma: Double, x0: Double, y0: Double): XYValues {\n",
+    "    val yValues = xValues.map { x -> y0 + gamma / (x - x0) }.toDoubleArray()\n",
+    "    return XYValues(xValues, yValues)\n",
+    "}"
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "source": [
+    "val xValues = (1.0..10.0).step(1.0).toDoubleArray()\n",
+    "\n",
+    "val xy = generateHyperbols(xValues, 1.0, 0.0, 0.0)\n",
+    "\n",
+    "Plotly.plot {\n",
+    "    scatter {\n",
+    "        this.x.doubles = xValues\n",
+    "        this.y.doubles = xy.yValues\n",
+    "    }\n",
+    "}"
+   ],
+   "execution_count": null,
+   "outputs": [],
+   "metadata": {
+    "datalore": {
+     "node_id": "ZE2atNvFzQsCvpAF8KK4ch",
+     "type": "CODE",
+     "hide_input_from_viewers": false,
+     "hide_output_from_viewers": false
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "Create a default statistic with uniform weights"
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "source": [
+    "val statistic = ConvolutionalXYStatistic(DoubleArray(xValues.size){1.0})\n",
+    "statistic(xy)"
+   ],
+   "execution_count": null,
+   "outputs": [],
+   "metadata": {
+    "datalore": {
+     "node_id": "EA5HaydTddRKYrtAUwd29h",
+     "type": "CODE",
+     "hide_input_from_viewers": false,
+     "hide_output_from_viewers": false
+    }
+   }
+  },
+  {
+   "cell_type": "code",
+   "source": [
+    "import kotlin.random.Random\n",
+    "\n",
+    "val random = Random(1288)\n",
+    "\n",
+    "val parabolas = buildList{\n",
+    "    repeat(500){\n",
+    "        add(\n",
+    "            generateParabolas(\n",
+    "                xValues, \n",
+    "                random.nextDouble(), \n",
+    "                random.nextDouble(), \n",
+    "                random.nextDouble()\n",
+    "            )\n",
+    "        )\n",
+    "    }\n",
+    "}\n",
+    "\n",
+    "val hyperbolas: List<XYValues> =  buildList{\n",
+    "    repeat(500){\n",
+    "        add(\n",
+    "            generateHyperbols(\n",
+    "                xValues, \n",
+    "                random.nextDouble()*10, \n",
+    "                random.nextDouble(), \n",
+    "                random.nextDouble()\n",
+    "            )\n",
+    "        )\n",
+    "    }\n",
+    "}"
+   ],
+   "execution_count": null,
+   "outputs": [],
+   "metadata": {
+    "datalore": {
+     "node_id": "t5t6IYmD7Q1ykeo9uijFfQ",
+     "type": "CODE",
+     "hide_input_from_viewers": false,
+     "hide_output_from_viewers": false
+    }
+   }
+  },
+  {
+   "cell_type": "code",
+   "source": [
+    "Plotly.plot { \n",
+    "    scatter { \n",
+    "        x.doubles = xValues\n",
+    "        y.doubles = parabolas[257].yValues\n",
+    "    }\n",
+    "    scatter { \n",
+    "        x.doubles = xValues\n",
+    "        y.doubles = hyperbolas[252].yValues\n",
+    "    }\n",
+    " }"
+   ],
+   "execution_count": null,
+   "outputs": [],
+   "metadata": {
+    "datalore": {
+     "node_id": "oXB8lmju7YVYjMRXITKnhO",
+     "type": "CODE",
+     "hide_input_from_viewers": false,
+     "hide_output_from_viewers": false
+    }
+   }
+  },
+  {
+   "cell_type": "code",
+   "source": [
+    "Plotly.plot { \n",
+    "    histogram { \n",
+    "        name = \"parabolae\"\n",
+    "        x.numbers = parabolas.map { statistic(it) }\n",
+    "    }\n",
+    "    histogram { \n",
+    "        name = \"hyperbolae\"\n",
+    "        x.numbers = hyperbolas.map { statistic(it) }\n",
+    "    }\n",
+    "}"
+   ],
+   "execution_count": null,
+   "outputs": [],
+   "metadata": {
+    "datalore": {
+     "node_id": "8EIIecUZrt2NNrOkhxG5P0",
+     "type": "CODE",
+     "hide_input_from_viewers": false,
+     "hide_output_from_viewers": false
+    }
+   }
+  },
+  {
+   "cell_type": "code",
+   "source": [
+    "val lossFunction: (XYStatistic) -> Double = { statistic ->\n",
+    "    - abs(parabolas.sumOf { statistic(it) } - hyperbolas.sumOf { statistic(it) })\n",
+    "}"
+   ],
+   "execution_count": null,
+   "outputs": [],
+   "metadata": {
+    "datalore": {
+     "node_id": "h7UmglJW5zXkAfKHK40oIL",
+     "type": "CODE",
+     "hide_input_from_viewers": false,
+     "hide_output_from_viewers": false
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "Using commons-math optimizer to optimize weights"
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "source": [
+    "import org.apache.commons.math3.optim.*\n",
+    "import org.apache.commons.math3.optim.nonlinear.scalar.*\n",
+    "import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.*\n",
+    "\n",
+    "val optimizer = SimplexOptimizer(1e-1, Double.MAX_VALUE)\n",
+    "\n",
+    "val result = optimizer.optimize(\n",
+    "    ObjectiveFunction { point ->\n",
+    "        lossFunction(ConvolutionalXYStatistic(point))\n",
+    "    },\n",
+    "    NelderMeadSimplex(xValues.size),\n",
+    "    InitialGuess(DoubleArray(xValues.size){ 1.0 }),\n",
+    "    GoalType.MINIMIZE,\n",
+    "    MaxEval(100000)\n",
+    ")"
+   ],
+   "execution_count": null,
+   "outputs": [],
+   "metadata": {
+    "datalore": {
+     "node_id": "0EG3K4aCUciMlgGQKPvJ57",
+     "type": "CODE",
+     "hide_input_from_viewers": false,
+     "hide_output_from_viewers": false
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "Print resulting weights of optimization"
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "source": [
+    "result.point"
+   ],
+   "execution_count": null,
+   "outputs": [],
+   "metadata": {
+    "datalore": {
+     "node_id": "LelUlY0ZSlJEO9yC6SLk5B",
+     "type": "CODE",
+     "hide_input_from_viewers": false,
+     "hide_output_from_viewers": false
+    }
+   }
+  },
+  {
+   "cell_type": "code",
+   "source": [
+    "Plotly.plot { \n",
+    "    scatter { \n",
+    "        y.doubles = result.point\n",
+    "     }\n",
+    "}"
+   ],
+   "execution_count": null,
+   "outputs": [],
+   "metadata": {
+    "datalore": {
+     "node_id": "AuFOq5t9KpOIkGrOLsVXNf",
+     "type": "CODE",
+     "hide_input_from_viewers": false,
+     "hide_output_from_viewers": false
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "# The resulting statistic distribution"
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "source": [
+    "val resultStatistic = ConvolutionalXYStatistic(result.point)\n",
+    "Plotly.plot { \n",
+    "    histogram { \n",
+    "        name = \"parabolae\"\n",
+    "        x.numbers = parabolas.map { resultStatistic(it) }\n",
+    "    }\n",
+    "    histogram { \n",
+    "        name = \"hyperbolae\"\n",
+    "        x.numbers = hyperbolas.map { resultStatistic(it) }\n",
+    "    }\n",
+    "}"
+   ],
+   "execution_count": null,
+   "outputs": [],
+   "metadata": {
+    "datalore": {
+     "node_id": "zvmq42DRdM5mZ3SpzviHwI",
+     "type": "CODE",
+     "hide_input_from_viewers": false,
+     "hide_output_from_viewers": false
+    }
+   }
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "outputs": [],
+   "source": [],
+   "metadata": {
+    "collapsed": false
+   }
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Kotlin",
+   "language": "kotlin",
+   "name": "kotlin"
+  },
+  "datalore": {
+   "version": 1,
+   "computation_mode": "JUPYTER",
+   "package_manager": "pip",
+   "base_environment": "default",
+   "packages": []
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}
-- 
2.34.1


From 6d47c0ccecd4068cc4c6289741d5dc89931c4a13 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 10 Dec 2022 12:30:15 +0300
Subject: [PATCH 635/713] Ordered segments in trajectory

---
 .../kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
index 3fcf4365d..ffa23a537 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
@@ -102,7 +102,7 @@ public data class CircleTrajectory2D(
     }
 }
 
-public open class CompositeTrajectory2D(public val segments: Collection<Trajectory2D>) : Trajectory2D {
+public open class CompositeTrajectory2D(public val segments: List<Trajectory2D>) : Trajectory2D {
     override val length: Double get() = segments.sumOf { it.length }
 }
 
-- 
2.34.1


From 3f4fe9e43ba488b5d5de65aaf9b916159023724e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 31 Dec 2022 15:02:52 +0300
Subject: [PATCH 636/713] Migrate to 1.8. Use universal autodiffs

---
 benchmarks/build.gradle.kts                   |  4 +-
 build.gradle.kts                              |  2 +-
 buildSrc/build.gradle.kts                     | 13 +++--
 buildSrc/settings.gradle.kts                  |  2 +-
 .../kscience/kmath/benchmarks/JmhReport.kt    |  5 --
 .../benchmarks/addBenchmarkProperties.kt      |  9 ++--
 .../space/kscience/kmath/fit/chiSquared.kt    |  4 +-
 .../kotlin/space/kscience/kmath/fit/qowFit.kt |  4 +-
 .../kmath/stat/DistributionBenchmark.kt       |  4 +-
 gradle.properties                             |  3 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 ...ructureExpression.kt => CmDsExpression.kt} | 19 ++++---
 .../DerivativeStructureExpressionTest.kt      |  8 +--
 .../commons/optimization/OptimizeTest.kt      | 11 ++--
 .../kscience/kmath/expressions/DSAlgebra.kt   | 51 +++++++++++--------
 .../kscience/kmath/expressions/DSCompiler.kt  |  2 -
 .../kscience/kmath/expressions/DSTest.kt      |  5 +-
 kmath-functions/build.gradle.kts              |  2 +-
 kmath-histograms/build.gradle.kts             |  2 +-
 kmath-optimization/build.gradle.kts           |  2 +-
 kmath-stat/build.gradle.kts                   |  2 +-
 settings.gradle.kts                           |  2 +-
 22 files changed, 84 insertions(+), 74 deletions(-)
 rename kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/{DerivativeStructureExpression.kt => CmDsExpression.kt} (91%)

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 5d2e4dac8..ea2349d91 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -5,7 +5,7 @@ import space.kscience.kmath.benchmarks.addBenchmarkProperties
 
 plugins {
     kotlin("multiplatform")
-    kotlin("plugin.allopen")
+    alias(spclibs.plugins.kotlin.plugin.allopen)
     id("org.jetbrains.kotlinx.benchmark")
 }
 
@@ -44,7 +44,7 @@ kotlin {
                 implementation(project(":kmath-tensors"))
                 implementation(project(":kmath-multik"))
                 implementation("org.jetbrains.kotlinx:multik-default:$multikVersion")
-                implementation(npmlibs.kotlinx.benchmark.runtime)
+                implementation(spclibs.kotlinx.benchmark.runtime)
             }
         }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index e03bec9af..4efb6c802 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.1-dev-7"
+    version = "0.3.1-dev-8"
 }
 
 subprojects {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 0f95a7b3f..67df0aab4 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     `kotlin-dsl`
     `version-catalog`
-    kotlin("plugin.serialization") version "1.6.21"
 }
 
 java.targetCompatibility = JavaVersion.VERSION_11
@@ -13,18 +12,18 @@ repositories {
     gradlePluginPortal()
 }
 
-val toolsVersion = npmlibs.versions.tools.get()
-val kotlinVersion = npmlibs.versions.kotlin.asProvider().get()
-val benchmarksVersion = npmlibs.versions.kotlinx.benchmark.get()
+val toolsVersion = spclibs.versions.tools.get()
+val kotlinVersion = spclibs.versions.kotlin.asProvider().get()
+val benchmarksVersion = spclibs.versions.kotlinx.benchmark.get()
 
 dependencies {
     api("space.kscience:gradle-tools:$toolsVersion")
-    api(npmlibs.atomicfu.gradle)
     //plugins form benchmarks
     api("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:$benchmarksVersion")
-    api("org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion")
+    //api("org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion")
     //to be used inside build-script only
-    implementation(npmlibs.kotlinx.serialization.json)
+    //implementation(spclibs.kotlinx.serialization.json)
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.14.+")
 }
 
 kotlin.sourceSets.all {
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 403e0f52c..02111ba37 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -26,7 +26,7 @@ dependencyResolutionManagement {
     }
 
     versionCatalogs {
-        create("npmlibs") {
+        create("spclibs") {
             from("space.kscience:version-catalog:$toolsVersion")
         }
     }
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
index 62cf44915..3a4fcdc79 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/JmhReport.kt
@@ -5,9 +5,6 @@
 
 package space.kscience.kmath.benchmarks
 
-import kotlinx.serialization.Serializable
-
-@Serializable
 data class JmhReport(
     val jmhVersion: String,
     val benchmark: String,
@@ -37,7 +34,6 @@ data class JmhReport(
         val scoreUnit: String
     }
 
-    @Serializable
     data class PrimaryMetric(
         override val score: Double,
         override val scoreError: Double,
@@ -48,7 +44,6 @@ data class JmhReport(
         val rawData: List<List<Double>>? = null,
     ) : Metric
 
-    @Serializable
     data class SecondaryMetric(
         override val score: Double,
         override val scoreError: Double,
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
index 5c6a2ac83..61193790b 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.benchmarks
 
 import kotlinx.benchmark.gradle.BenchmarksExtension
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
 import org.gradle.api.Project
 import space.kscience.gradle.KScienceReadmeExtension
 import java.time.LocalDateTime
@@ -45,6 +45,8 @@ private val ISO_DATE_TIME: DateTimeFormatter = DateTimeFormatterBuilder().run {
 
 private fun noun(number: Number, singular: String, plural: String) = if (number.toLong() == 1L) singular else plural
 
+private val jsonMapper = jacksonObjectMapper()
+
 fun Project.addBenchmarkProperties() {
     val benchmarksProject = this
     rootProject.subprojects.forEach { p ->
@@ -60,8 +62,7 @@ fun Project.addBenchmarkProperties() {
                     if (resDirectory == null || !(resDirectory.resolve("jvm.json")).exists()) {
                         "> **Can't find appropriate benchmark data. Try generating readme files after running benchmarks**."
                     } else {
-                        val reports =
-                            Json.decodeFromString<List<JmhReport>>(resDirectory.resolve("jvm.json").readText())
+                        val reports: List<JmhReport> = jsonMapper.readValue<List<JmhReport>>(resDirectory.resolve("jvm.json"))
 
                         buildString {
                             appendLine("<details>")
diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
index febf55283..c5f694ce0 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
@@ -7,9 +7,9 @@ package space.kscience.kmath.fit
 
 import kotlinx.html.br
 import kotlinx.html.h3
-import space.kscience.kmath.commons.expressions.DSProcessor
 import space.kscience.kmath.commons.optimization.CMOptimizer
 import space.kscience.kmath.distributions.NormalDistribution
+import space.kscience.kmath.expressions.autodiff
 import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.operations.asIterable
@@ -67,7 +67,7 @@ suspend fun main() {
     val yErr = y.map { sqrt(it) }//RealVector.same(x.size, sigma)
 
     // compute differentiable chi^2 sum for given model ax^2 + bx + c
-    val chi2 = DSProcessor.chiSquaredExpression(x, y, yErr) { arg ->
+    val chi2 = Double.autodiff.chiSquaredExpression(x, y, yErr) { arg ->
         //bind variables to autodiff context
         val a = bindSymbol(a)
         val b = bindSymbol(b)
diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
index c7eefa6b9..9650fa630 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
@@ -7,10 +7,10 @@ package space.kscience.kmath.fit
 
 import kotlinx.html.br
 import kotlinx.html.h3
-import space.kscience.kmath.commons.expressions.DSProcessor
 import space.kscience.kmath.data.XYErrorColumnarData
 import space.kscience.kmath.distributions.NormalDistribution
 import space.kscience.kmath.expressions.Symbol
+import space.kscience.kmath.expressions.autodiff
 import space.kscience.kmath.expressions.binding
 import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.operations.asIterable
@@ -63,7 +63,7 @@ suspend fun main() {
 
     val result = XYErrorColumnarData.of(x, y, yErr).fitWith(
         QowOptimizer,
-        DSProcessor,
+        Double.autodiff,
         mapOf(a to 0.9, b to 1.2, c to 2.0)
     ) { arg ->
         //bind variables to autodiff context
diff --git a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
index 2576e9222..031955e15 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/stat/DistributionBenchmark.kt
@@ -36,7 +36,7 @@ private suspend fun runKMathChained(): Duration {
     return Duration.between(startTime, Instant.now())
 }
 
-private fun runApacheDirect(): Duration {
+private fun runCMDirect(): Duration {
     val rng = RandomSource.create(RandomSource.MT, 123L)
 
     val sampler = CMGaussianSampler.of(
@@ -65,7 +65,7 @@ private fun runApacheDirect(): Duration {
  * Comparing chain sampling performance with direct sampling performance
  */
 fun main(): Unit = runBlocking(Dispatchers.Default) {
-    val directJob = async { runApacheDirect() }
+    val directJob = async { runCMDirect() }
     val chainJob = async { runKMathChained() }
     println("KMath Chained: ${chainJob.await()}")
     println("Apache Direct: ${directJob.await()}")
diff --git a/gradle.properties b/gradle.properties
index da5867ea4..3016246b2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,12 +5,11 @@
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
-kotlin.incremental.js.ir=true
 
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.13.1-kotlin-1.7.20
+toolsVersion=0.13.4-kotlin-1.8.0
 
 
 org.gradle.parallel=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8049c684f..070cb702f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/CmDsExpression.kt
similarity index 91%
rename from kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
rename to kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/CmDsExpression.kt
index 6d756b15f..f2af49087 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/CmDsExpression.kt
@@ -18,7 +18,8 @@ import space.kscience.kmath.operations.NumbersAddOps
  * @param bindings The map of bindings values. All bindings are considered free parameters
  */
 @OptIn(UnstableKMathAPI::class)
-public class DerivativeStructureField(
+@Deprecated("Use generic DSAlgebra from the core")
+public class CmDsField(
     public val order: Int,
     bindings: Map<Symbol, Double>,
 ) : ExtendedField<DerivativeStructure>, ExpressionAlgebra<Double, DerivativeStructure>,
@@ -108,25 +109,27 @@ public class DerivativeStructureField(
 /**
  * Auto-diff processor based on Commons-math [DerivativeStructure]
  */
-public object DSProcessor : AutoDiffProcessor<Double, DerivativeStructure, DerivativeStructureField> {
+@Deprecated("Use generic DSAlgebra from the core")
+public object CmDsProcessor : AutoDiffProcessor<Double, DerivativeStructure, CmDsField> {
      override fun differentiate(
-        function: DerivativeStructureField.() -> DerivativeStructure,
-    ): DerivativeStructureExpression = DerivativeStructureExpression(function)
+         function: CmDsField.() -> DerivativeStructure,
+    ): CmDsExpression = CmDsExpression(function)
 }
 
 /**
  * A constructs that creates a derivative structure with required order on-demand
  */
-public class DerivativeStructureExpression(
-    public val function: DerivativeStructureField.() -> DerivativeStructure,
+@Deprecated("Use generic DSAlgebra from the core")
+public class CmDsExpression(
+    public val function: CmDsField.() -> DerivativeStructure,
 ) : DifferentiableExpression<Double> {
     override operator fun invoke(arguments: Map<Symbol, Double>): Double =
-        DerivativeStructureField(0, arguments).function().value
+        CmDsField(0, arguments).function().value
 
     /**
      * Get the derivative expression with given orders
      */
     override fun derivativeOrNull(symbols: List<Symbol>): Expression<Double> = Expression { arguments ->
-        with(DerivativeStructureField(symbols.size, arguments)) { function().derivative(symbols) }
+        with(CmDsField(symbols.size, arguments)) { function().derivative(symbols) }
     }
 }
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
index 40ba9fc7d..7c3c086ed 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/expressions/DerivativeStructureExpressionTest.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("DEPRECATION")
+
 package space.kscience.kmath.commons.expressions
 
 import space.kscience.kmath.expressions.*
@@ -15,10 +17,10 @@ import kotlin.test.assertFails
 internal inline fun diff(
     order: Int,
     vararg parameters: Pair<Symbol, Double>,
-    block: DerivativeStructureField.() -> Unit,
+    block: CmDsField.() -> Unit,
 ) {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    DerivativeStructureField(order, mapOf(*parameters)).run(block)
+    CmDsField(order, mapOf(*parameters)).run(block)
 }
 
 internal class AutoDiffTest {
@@ -41,7 +43,7 @@ internal class AutoDiffTest {
 
     @Test
     fun autoDifTest() {
-        val f = DerivativeStructureExpression {
+        val f = CmDsExpression {
             val x by binding
             val y by binding
             x.pow(2) + 2 * x * y + y.pow(2) + 1
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index 7c8ba7d27..8b4631fca 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -6,22 +6,25 @@
 package space.kscience.kmath.commons.optimization
 
 import kotlinx.coroutines.runBlocking
-import space.kscience.kmath.commons.expressions.DSProcessor
-import space.kscience.kmath.commons.expressions.DerivativeStructureExpression
 import space.kscience.kmath.distributions.NormalDistribution
+import space.kscience.kmath.expressions.DSFieldExpression
 import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.Symbol.Companion.y
+import space.kscience.kmath.expressions.autodiff
 import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
+import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleBufferOps.Companion.map
+import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.optimization.*
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
 import kotlin.test.Test
 
+@OptIn(UnstableKMathAPI::class)
 internal class OptimizeTest {
-    val normal = DerivativeStructureExpression {
+    val normal = DSFieldExpression(DoubleField) {
         exp(-bindSymbol(x).pow(2) / 2) + exp(-bindSymbol(y).pow(2) / 2)
     }
 
@@ -60,7 +63,7 @@ internal class OptimizeTest {
 
         val yErr = DoubleBuffer(x.size) { sigma }
 
-        val chi2 = DSProcessor.chiSquaredExpression(
+        val chi2 = Double.autodiff.chiSquaredExpression(
             x, y, yErr
         ) { arg ->
             val cWithDefault = bindSymbolOrNull(c) ?: one
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
index e7ade4f66..9e91ff26b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
@@ -80,7 +80,6 @@ public abstract class DSAlgebra<T, A : Ring<T>>(
     public val algebra: A,
     public val order: Int,
     bindings: Map<Symbol, T>,
-    public val valueBufferFactory: MutableBufferFactory<T> = algebra.bufferFactory,
 ) : ExpressionAlgebra<T, DS<T, A>>, SymbolIndexer {
 
     /**
@@ -116,7 +115,6 @@ public abstract class DSAlgebra<T, A : Ring<T>>(
 
                     newCache[p][o] = DSCompiler(
                         algebra,
-                        valueBufferFactory,
                         p,
                         o,
                         valueCompiler,
@@ -141,7 +139,7 @@ public abstract class DSAlgebra<T, A : Ring<T>>(
     override val symbols: List<Symbol> = bindings.map { it.key }
 
     private fun bufferForVariable(index: Int, value: T): Buffer<T> {
-        val buffer = valueBufferFactory(compiler.size) { algebra.zero }
+        val buffer = algebra.bufferFactory(compiler.size) { algebra.zero }
         buffer[0] = value
         if (compiler.order > 0) {
             // the derivative of the variable with respect to itself is 1.
@@ -207,7 +205,7 @@ public abstract class DSAlgebra<T, A : Ring<T>>(
     }
 
     public override fun const(value: T): DS<T, A> {
-        val buffer = valueBufferFactory(compiler.size) { algebra.zero }
+        val buffer = algebra.bufferFactory(compiler.size) { algebra.zero }
         buffer[0] = value
 
         return DS(buffer)
@@ -245,11 +243,14 @@ public open class DSRing<T, A>(
     algebra: A,
     order: Int,
     bindings: Map<Symbol, T>,
-    valueBufferFactory: MutableBufferFactory<T>,
-) : DSAlgebra<T, A>(algebra, order, bindings, valueBufferFactory),
-    Ring<DS<T, A>>, ScaleOperations<DS<T, A>>,
+) : DSAlgebra<T, A>(algebra, order, bindings),
+    Ring<DS<T, A>>,
+    ScaleOperations<DS<T, A>>,
     NumericAlgebra<DS<T, A>>,
-    NumbersAddOps<DS<T, A>> where A : Ring<T>, A : NumericAlgebra<T>, A : ScaleOperations<T> {
+    NumbersAddOps<DS<T, A>>
+        where A : Ring<T>, A : NumericAlgebra<T>, A : ScaleOperations<T> {
+
+    public val elementBufferFactory: MutableBufferFactory<T> = algebra.bufferFactory
 
     override fun bindSymbolOrNull(value: String): DSSymbol? =
         super<DSAlgebra>.bindSymbolOrNull(value)
@@ -261,14 +262,14 @@ public open class DSRing<T, A>(
      */
     protected inline fun DS<T, A>.transformDataBuffer(block: A.(MutableBuffer<T>) -> Unit): DS<T, A> {
         require(derivativeAlgebra == this@DSRing) { "All derivative operations should be done in the same algebra" }
-        val newData = valueBufferFactory(compiler.size) { data[it] }
+        val newData = elementBufferFactory(compiler.size) { data[it] }
         algebra.block(newData)
         return DS(newData)
     }
 
     protected fun DS<T, A>.mapData(block: A.(T) -> T): DS<T, A> {
         require(derivativeAlgebra == this@DSRing) { "All derivative operations should be done in the same algebra" }
-        val newData: Buffer<T> = data.mapToBuffer(valueBufferFactory) {
+        val newData: Buffer<T> = data.mapToBuffer(elementBufferFactory) {
             algebra.block(it)
         }
         return DS(newData)
@@ -276,7 +277,7 @@ public open class DSRing<T, A>(
 
     protected fun DS<T, A>.mapDataIndexed(block: (Int, T) -> T): DS<T, A> {
         require(derivativeAlgebra == this@DSRing) { "All derivative operations should be done in the same algebra" }
-        val newData: Buffer<T> = data.mapIndexedToBuffer(valueBufferFactory, block)
+        val newData: Buffer<T> = data.mapIndexedToBuffer(elementBufferFactory, block)
         return DS(newData)
     }
 
@@ -329,22 +330,21 @@ public class DerivativeStructureRingExpression<T, A>(
     public val function: DSRing<T, A>.() -> DS<T, A>,
 ) : DifferentiableExpression<T> where A : Ring<T>, A : ScaleOperations<T>, A : NumericAlgebra<T> {
     override operator fun invoke(arguments: Map<Symbol, T>): T =
-        DSRing(algebra, 0, arguments, elementBufferFactory).function().value
+        DSRing(algebra, 0, arguments).function().value
 
     override fun derivativeOrNull(symbols: List<Symbol>): Expression<T> = Expression { arguments ->
         with(
             DSRing(
                 algebra,
                 symbols.size,
-                arguments,
-                elementBufferFactory
+                arguments
             )
         ) { function().derivative(symbols) }
     }
 }
 
 /**
- * A field over commons-math [DerivativeStructure].
+ * A field over [DS].
  *
  * @property order The derivation order.
  * @param bindings The map of bindings values. All bindings are considered free parameters.
@@ -354,8 +354,7 @@ public class DSField<T, A : ExtendedField<T>>(
     algebra: A,
     order: Int,
     bindings: Map<Symbol, T>,
-    valueBufferFactory: MutableBufferFactory<T>,
-) : DSRing<T, A>(algebra, order, bindings, valueBufferFactory), ExtendedField<DS<T, A>> {
+) : DSRing<T, A>(algebra, order, bindings), ExtendedField<DS<T, A>> {
     override fun number(value: Number): DS<T, A> = const(algebra.number(value))
 
     override fun divide(left: DS<T, A>, right: DS<T, A>): DS<T, A> = left.transformDataBuffer { result ->
@@ -414,6 +413,7 @@ public class DSField<T, A : ExtendedField<T>>(
         is Int -> arg.transformDataBuffer { result ->
             compiler.pow(arg.data, 0, pow, result, 0)
         }
+
         else -> arg.transformDataBuffer { result ->
             compiler.pow(arg.data, 0, pow.toDouble(), result, 0)
         }
@@ -439,18 +439,29 @@ public class DSField<T, A : ExtendedField<T>>(
 @UnstableKMathAPI
 public class DSFieldExpression<T, A : ExtendedField<T>>(
     public val algebra: A,
-    private val valueBufferFactory: MutableBufferFactory<T> = algebra.bufferFactory,
     public val function: DSField<T, A>.() -> DS<T, A>,
 ) : DifferentiableExpression<T> {
     override operator fun invoke(arguments: Map<Symbol, T>): T =
-        DSField(algebra, 0, arguments, valueBufferFactory).function().value
+        DSField(algebra, 0, arguments).function().value
 
     override fun derivativeOrNull(symbols: List<Symbol>): Expression<T> = Expression { arguments ->
         DSField(
             algebra,
             symbols.size,
             arguments,
-            valueBufferFactory,
         ).run { function().derivative(symbols) }
     }
 }
+
+
+@UnstableKMathAPI
+public class DSFieldProcessor<T, A : ExtendedField<T>>(
+    public val algebra: A,
+) : AutoDiffProcessor<T, DS<T, A>, DSField<T, A>> {
+    override fun differentiate(
+        function: DSField<T, A>.() -> DS<T, A>,
+    ): DifferentiableExpression<T> = DSFieldExpression(algebra, function)
+}
+
+@UnstableKMathAPI
+public val Double.Companion.autodiff: DSFieldProcessor<Double, DoubleField> get() = DSFieldProcessor(DoubleField)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
index 6ab9b3d44..1da151d46 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSCompiler.kt
@@ -9,7 +9,6 @@ package space.kscience.kmath.expressions
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer
-import space.kscience.kmath.structures.MutableBufferFactory
 import kotlin.math.min
 
 internal fun <T> MutableBuffer<T>.fill(element: T, fromIndex: Int = 0, toIndex: Int = size) {
@@ -56,7 +55,6 @@ internal fun <T> MutableBuffer<T>.fill(element: T, fromIndex: Int = 0, toIndex:
  */
 public class DSCompiler<T, out A : Algebra<T>> internal constructor(
     public val algebra: A,
-    public val bufferFactory: MutableBufferFactory<T>,
     public val freeParameters: Int,
     public val order: Int,
     valueCompiler: DSCompiler<T, A>?,
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
index f46f3023d..0bfcb04a7 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
@@ -9,7 +9,6 @@ package space.kscience.kmath.expressions
 
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
-import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.test.Test
@@ -22,7 +21,7 @@ internal inline fun diff(
     block: DSField<Double, DoubleField>.() -> Unit,
 ) {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    DSField(DoubleField, order, mapOf(*parameters), ::DoubleBuffer).block()
+    DSField(DoubleField, order, mapOf(*parameters)).block()
 }
 
 internal class DSTest {
@@ -45,7 +44,7 @@ internal class DSTest {
 
     @Test
     fun dsExpressionTest() {
-        val f = DSFieldExpression(DoubleField, ::DoubleBuffer) {
+        val f = DSFieldExpression(DoubleField) {
             val x by binding
             val y by binding
             x.pow(2) + 2 * x * y + y.pow(2) + 1
diff --git a/kmath-functions/build.gradle.kts b/kmath-functions/build.gradle.kts
index 2e7b023c1..9c2cd8352 100644
--- a/kmath-functions/build.gradle.kts
+++ b/kmath-functions/build.gradle.kts
@@ -17,7 +17,7 @@ kotlin.sourceSets {
 }
 
 dependencies {
-    dokkaPlugin("org.jetbrains.dokka:mathjax-plugin:${npmlibs.versions.dokka.get()}")
+    dokkaPlugin("org.jetbrains.dokka:mathjax-plugin:${spclibs.versions.dokka.get()}")
 }
 
 readme {
diff --git a/kmath-histograms/build.gradle.kts b/kmath-histograms/build.gradle.kts
index d31526a74..9d7ac33e4 100644
--- a/kmath-histograms/build.gradle.kts
+++ b/kmath-histograms/build.gradle.kts
@@ -12,7 +12,7 @@ kotlin.sourceSets {
     commonMain {
         dependencies {
             api(project(":kmath-core"))
-            api(npmlibs.atomicfu)
+            api(spclibs.atomicfu)
         }
     }
     commonTest {
diff --git a/kmath-optimization/build.gradle.kts b/kmath-optimization/build.gradle.kts
index f4256b9aa..ba49d49bf 100644
--- a/kmath-optimization/build.gradle.kts
+++ b/kmath-optimization/build.gradle.kts
@@ -14,7 +14,7 @@ kotlin.sourceSets {
     commonMain {
         dependencies {
             api(project(":kmath-coroutines"))
-            api(npmlibs.atomicfu)
+            api(spclibs.atomicfu)
         }
     }
 }
diff --git a/kmath-stat/build.gradle.kts b/kmath-stat/build.gradle.kts
index f6ca54e17..bc98129a9 100644
--- a/kmath-stat/build.gradle.kts
+++ b/kmath-stat/build.gradle.kts
@@ -10,7 +10,7 @@ kotlin.sourceSets {
     commonMain {
         dependencies {
             api(project(":kmath-coroutines"))
-            implementation(npmlibs.atomicfu)
+            implementation(spclibs.atomicfu)
         }
     }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 23af18d31..7d92dc36e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,7 +13,7 @@ dependencyResolutionManagement {
     }
 
     versionCatalogs {
-        create("npmlibs") {
+        create("spclibs") {
             from("space.kscience:version-catalog:$toolsVersion")
         }
     }
-- 
2.34.1


From 2e4be2aa3a3678ee5fed7de029106bb793ed4c32 Mon Sep 17 00:00:00 2001
From: darksnake <altavir@gmail.com>
Date: Tue, 24 Jan 2023 11:36:53 +0300
Subject: [PATCH 637/713] A minor change to XYfit arguments

---
 .../kscience/kmath/optimization/XYFit.kt      | 67 ++++++++++++-------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
index d2182e91f..bba7a7113 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
@@ -30,7 +30,7 @@ public interface PointToCurveDistance : OptimizationFeature {
 
                 return object : DifferentiableExpression<Double> {
                     override fun derivativeOrNull(
-                        symbols: List<Symbol>
+                        symbols: List<Symbol>,
                     ): Expression<Double>? = problem.model.derivativeOrNull(symbols)?.let { derivExpression ->
                         Expression { arguments ->
                             derivExpression.invoke(arguments + (Symbol.x to x))
@@ -93,24 +93,15 @@ public fun XYFit.withFeature(vararg features: OptimizationFeature): XYFit {
     return XYFit(data, model, this.features.with(*features), pointToCurveDistance, pointWeight)
 }
 
-/**
- * Fit given dta with
- */
-public suspend fun <I : Any, A> XYColumnarData<Double, Double, Double>.fitWith(
+public suspend fun XYColumnarData<Double, Double, Double>.fitWith(
     optimizer: Optimizer<Double, XYFit>,
-    processor: AutoDiffProcessor<Double, I, A>,
+    modelExpression: DifferentiableExpression<Double>,
     startingPoint: Map<Symbol, Double>,
     vararg features: OptimizationFeature = emptyArray(),
     xSymbol: Symbol = Symbol.x,
     pointToCurveDistance: PointToCurveDistance = PointToCurveDistance.byY,
     pointWeight: PointWeight = PointWeight.byYSigma,
-    model: A.(I) -> I
-): XYFit where A : ExtendedField<I>, A : ExpressionAlgebra<Double, I> {
-    val modelExpression = processor.differentiate {
-        val x = bindSymbol(xSymbol)
-        model(x)
-    }
-
+): XYFit {
     var actualFeatures = FeatureSet.of(*features, OptimizationStartPoint(startingPoint))
 
     if (actualFeatures.getFeature<OptimizationLog>() == null) {
@@ -127,20 +118,50 @@ public suspend fun <I : Any, A> XYColumnarData<Double, Double, Double>.fitWith(
     return optimizer.optimize(problem)
 }
 
+/**
+ * Fit given data with a model provided as an expression
+ */
+public suspend fun <I : Any, A> XYColumnarData<Double, Double, Double>.fitWith(
+    optimizer: Optimizer<Double, XYFit>,
+    processor: AutoDiffProcessor<Double, I, A>,
+    startingPoint: Map<Symbol, Double>,
+    vararg features: OptimizationFeature = emptyArray(),
+    xSymbol: Symbol = Symbol.x,
+    pointToCurveDistance: PointToCurveDistance = PointToCurveDistance.byY,
+    pointWeight: PointWeight = PointWeight.byYSigma,
+    model: A.(I) -> I,
+): XYFit where A : ExtendedField<I>, A : ExpressionAlgebra<Double, I> {
+    val modelExpression: DifferentiableExpression<Double> = processor.differentiate {
+        val x = bindSymbol(xSymbol)
+        model(x)
+    }
+
+    return fitWith(
+        optimizer = optimizer,
+        modelExpression = modelExpression,
+        startingPoint = startingPoint,
+        features = features,
+        xSymbol = xSymbol,
+        pointToCurveDistance = pointToCurveDistance,
+        pointWeight = pointWeight
+    )
+}
+
 /**
  * Compute chi squared value for completed fit. Return null for incomplete fit
  */
-public val XYFit.chiSquaredOrNull: Double? get() {
-    val result = resultPointOrNull ?: return null
+public val XYFit.chiSquaredOrNull: Double?
+    get() {
+        val result = resultPointOrNull ?: return null
 
-    return data.indices.sumOf { index->
+        return data.indices.sumOf { index ->
 
-        val x = data.x[index]
-        val y = data.y[index]
-        val yErr = data[Symbol.yError]?.get(index) ?: 1.0
+            val x = data.x[index]
+            val y = data.y[index]
+            val yErr = data[Symbol.yError]?.get(index) ?: 1.0
 
-        val mu = model.invoke(result + (xSymbol to x) )
+            val mu = model.invoke(result + (xSymbol to x))
 
-        ((y - mu)/yErr).pow(2)
-    }
-}
\ No newline at end of file
+            ((y - mu) / yErr).pow(2)
+        }
+    }
\ No newline at end of file
-- 
2.34.1


From 7f4f4c7703275e80cb51e38af3a28a7672dbbf5f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 24 Jan 2023 21:01:26 +0300
Subject: [PATCH 638/713] Update of symbolic operations

---
 CHANGELOG.md                                  |   2 +
 build.gradle.kts                              |   2 +-
 .../space/kscience/kmath/fit/chiSquared.kt    |   2 +-
 .../kotlin/space/kscience/kmath/fit/qowFit.kt |  21 ++--
 .../expressions/ExpressionWithDefault.kt      |  31 +++++
 .../kscience/kmath/expressions/NamedMatrix.kt |  37 ++++++
 .../kmath/optimization/OptimizationProblem.kt |  17 ++-
 .../kmath/optimization/QowOptimizer.kt        | 116 ++++++++++--------
 .../kscience/kmath/optimization/XYFit.kt      |   7 +-
 .../kmath/stat/chiSquaredExpression.kt        |   7 +-
 10 files changed, 173 insertions(+), 69 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/ExpressionWithDefault.kt
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/NamedMatrix.kt
 rename kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt => kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/chiSquaredExpression.kt (87%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b3ab75fd..b8cb0d976 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 ### Added
+- `NamedMatrix` - matrix with symbol-based indexing
+- `Expression` with default arguments
 - Type-aliases for numbers like `Float64`
 - 2D optimal trajectory computation in a separate module `kmath-trajectory`
 - Autodiff for generic algebra elements in core!
diff --git a/build.gradle.kts b/build.gradle.kts
index 4efb6c802..8731dbc70 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.1-dev-8"
+    version = "0.3.1-dev-9"
 }
 
 subprojects {
diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
index c5f694ce0..258ed0c84 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/chiSquared.kt
@@ -10,7 +10,6 @@ import kotlinx.html.h3
 import space.kscience.kmath.commons.optimization.CMOptimizer
 import space.kscience.kmath.distributions.NormalDistribution
 import space.kscience.kmath.expressions.autodiff
-import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.operations.toList
@@ -22,6 +21,7 @@ import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.real.DoubleVector
 import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
+import space.kscience.kmath.stat.chiSquaredExpression
 import space.kscience.plotly.*
 import space.kscience.plotly.models.ScatterMode
 import space.kscience.plotly.models.TraceValues
diff --git a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
index 9650fa630..fe7f48b72 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/fit/qowFit.kt
@@ -15,10 +15,7 @@ import space.kscience.kmath.expressions.binding
 import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.operations.toList
-import space.kscience.kmath.optimization.QowOptimizer
-import space.kscience.kmath.optimization.chiSquaredOrNull
-import space.kscience.kmath.optimization.fitWith
-import space.kscience.kmath.optimization.resultPoint
+import space.kscience.kmath.optimization.*
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.real.map
 import space.kscience.kmath.real.step
@@ -32,6 +29,8 @@ import kotlin.math.sqrt
 private val a by symbol
 private val b by symbol
 private val c by symbol
+private val d by symbol
+private val e by symbol
 
 
 /**
@@ -64,16 +63,22 @@ suspend fun main() {
     val result = XYErrorColumnarData.of(x, y, yErr).fitWith(
         QowOptimizer,
         Double.autodiff,
-        mapOf(a to 0.9, b to 1.2, c to 2.0)
+        mapOf(a to 0.9, b to 1.2, c to 2.0, e to 1.0, d to 1.0, e to 0.0),
+        OptimizationParameters(a, b, c, d)
     ) { arg ->
         //bind variables to autodiff context
         val a by binding
         val b by binding
         //Include default value for c if it is not provided as a parameter
         val c = bindSymbolOrNull(c) ?: one
-        a * arg.pow(2) + b * arg + c
+        val d by binding
+        val e by binding
+
+        a * arg.pow(2) + b * arg + c + d * arg.pow(3) + e / arg
     }
 
+    println("Resulting chi2/dof: ${result.chiSquaredOrNull}/${result.dof}")
+
     //display a page with plot and numerical results
     val page = Plotly.page {
         plot {
@@ -89,7 +94,7 @@ suspend fun main() {
             scatter {
                 mode = ScatterMode.lines
                 x(x)
-                y(x.map { result.model(result.resultPoint + (Symbol.x to it)) })
+                y(x.map { result.model(result.startPoint + result.resultPoint + (Symbol.x to it)) })
                 name = "fit"
             }
         }
@@ -98,7 +103,7 @@ suspend fun main() {
             +"Fit result: ${result.resultPoint}"
         }
         h3 {
-            +"Chi2/dof = ${result.chiSquaredOrNull!! / (x.size - 3)}"
+            +"Chi2/dof = ${result.chiSquaredOrNull!! / result.dof}"
         }
     }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/ExpressionWithDefault.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/ExpressionWithDefault.kt
new file mode 100644
index 000000000..c802fe04c
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/ExpressionWithDefault.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.expressions
+
+public class ExpressionWithDefault<T>(
+    private val origin: Expression<T>,
+    private val defaultArgs: Map<Symbol, T>,
+) : Expression<T> {
+    override fun invoke(arguments: Map<Symbol, T>): T = origin.invoke(defaultArgs + arguments)
+}
+
+public fun <T> Expression<T>.withDefaultArgs(defaultArgs: Map<Symbol, T>): ExpressionWithDefault<T> =
+    ExpressionWithDefault(this, defaultArgs)
+
+
+public class DiffExpressionWithDefault<T>(
+    private val origin: DifferentiableExpression<T>,
+    private val defaultArgs: Map<Symbol, T>,
+) : DifferentiableExpression<T> {
+
+    override fun invoke(arguments: Map<Symbol, T>): T = origin.invoke(defaultArgs + arguments)
+
+    override fun derivativeOrNull(symbols: List<Symbol>): Expression<T>? =
+        origin.derivativeOrNull(symbols)?.withDefaultArgs(defaultArgs)
+}
+
+public fun <T> DifferentiableExpression<T>.withDefaultArgs(defaultArgs: Map<Symbol, T>): DiffExpressionWithDefault<T> =
+    DiffExpressionWithDefault(this, defaultArgs)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/NamedMatrix.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/NamedMatrix.kt
new file mode 100644
index 000000000..f0b27ffa2
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/NamedMatrix.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+@file:OptIn(UnstableKMathAPI::class)
+
+package space.kscience.kmath.expressions
+
+import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.structures.getOrNull
+
+public class NamedMatrix<T>(public val values: Matrix<T>, public val indexer: SymbolIndexer) : Matrix<T> by values {
+    public operator fun get(i: Symbol, j: Symbol): T = get(indexer.indexOf(i), indexer.indexOf(j))
+
+    public companion object {
+
+        public fun toStringWithSymbols(values: Matrix<*>, indexer: SymbolIndexer): String = buildString {
+            appendLine(indexer.symbols.joinToString(separator = "\t", prefix = "\t\t"))
+            indexer.symbols.forEach { i ->
+                append(i.identity + "\t")
+                values.rows.getOrNull(indexer.indexOf(i))?.let { row ->
+                    indexer.symbols.forEach { j ->
+                        append(row.getOrNull(indexer.indexOf(j)).toString())
+                        append("\t")
+                    }
+                    appendLine()
+                }
+            }
+        }
+    }
+}
+
+public fun <T> Matrix<T>.named(indexer: SymbolIndexer): NamedMatrix<T> = NamedMatrix(this, indexer)
+
+public fun <T> Matrix<T>.named(symbols: List<Symbol>): NamedMatrix<T> = named(SimpleSymbolIndexer(symbols))
\ No newline at end of file
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
index db154be42..9fdcfc53d 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationProblem.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.optimization
 
 import space.kscience.kmath.expressions.DifferentiableExpression
+import space.kscience.kmath.expressions.NamedMatrix
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.linear.Matrix
 import space.kscience.kmath.misc.*
 import kotlin.reflect.KClass
 
@@ -32,7 +32,10 @@ public interface OptimizationPrior<T> : OptimizationFeature, DifferentiableExpre
     override val key: FeatureKey<OptimizationFeature> get() = OptimizationPrior::class
 }
 
-public class OptimizationCovariance<T>(public val covariance: Matrix<T>) : OptimizationFeature {
+/**
+ * Covariance matrix for
+ */
+public class OptimizationCovariance<T>(public val covariance: NamedMatrix<T>) : OptimizationFeature {
     override fun toString(): String = "Covariance($covariance)"
 }
 
@@ -57,10 +60,20 @@ public class OptimizationLog(private val loggable: Loggable) : Loggable by logga
     override fun toString(): String = "Log($loggable)"
 }
 
+/**
+ * Free parameters of the optimization
+ */
 public class OptimizationParameters(public val symbols: List<Symbol>) : OptimizationFeature {
     public constructor(vararg symbols: Symbol) : this(listOf(*symbols))
 
     override fun toString(): String = "Parameters($symbols)"
 }
 
+/**
+ * Maximum allowed number of iterations
+ */
+public class OptimizationIterations(public val maxIterations: Int) : OptimizationFeature {
+    override fun toString(): String = "Iterations($maxIterations)"
+}
+
 
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
index 669860934..bbebec6af 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
@@ -5,10 +5,7 @@
 
 package space.kscience.kmath.optimization
 
-import space.kscience.kmath.expressions.DifferentiableExpression
-import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.expressions.SymbolIndexer
-import space.kscience.kmath.expressions.derivative
+import space.kscience.kmath.expressions.*
 import space.kscience.kmath.linear.*
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.misc.log
@@ -16,6 +13,7 @@ import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.DoubleL2Norm
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.structures.DoubleBuffer
+import kotlin.math.abs
 
 
 public class QowRuns(public val runs: Int) : OptimizationFeature {
@@ -40,18 +38,24 @@ public object QowOptimizer : Optimizer<Double, XYFit> {
     @OptIn(UnstableKMathAPI::class)
     private class QoWeight(
         val problem: XYFit,
-        val parameters: Map<Symbol, Double>,
-    ) : Map<Symbol, Double> by parameters, SymbolIndexer {
-        override val symbols: List<Symbol> = parameters.keys.toList()
+        val freeParameters: Map<Symbol, Double>,
+    ) : SymbolIndexer {
+        val size get() = freeParameters.size
+
+        override val symbols: List<Symbol> = freeParameters.keys.toList()
 
         val data get() = problem.data
 
+        val allParameters by lazy {
+            problem.startPoint + freeParameters
+        }
+
         /**
          * Derivatives of the spectrum over parameters. First index in the point number, second one - index of parameter
          */
         val derivs: Matrix<Double> by lazy {
             linearSpace.buildMatrix(problem.data.size, symbols.size) { d, s ->
-                problem.distance(d).derivative(symbols[s])(parameters)
+                problem.distance(d).derivative(symbols[s]).invoke(allParameters)
             }
         }
 
@@ -60,29 +64,31 @@ public object QowOptimizer : Optimizer<Double, XYFit> {
          */
         val dispersion: Point<Double> by lazy {
             DoubleBuffer(problem.data.size) { d ->
-                1.0/problem.weight(d).invoke(parameters)
+                1.0 / problem.weight(d).invoke(allParameters)
             }
         }
 
-        val prior: DifferentiableExpression<Double>? get() = problem.getFeature<OptimizationPrior<Double>>()
+        val prior: DifferentiableExpression<Double>?
+            get() = problem.getFeature<OptimizationPrior<Double>>()?.withDefaultArgs(allParameters)
 
-        override fun toString(): String = parameters.toString()
+        override fun toString(): String = freeParameters.toString()
     }
 
     /**
      * The signed distance from the model to the [d]-th point of data.
      */
-    private fun QoWeight.distance(d: Int, parameters: Map<Symbol, Double>): Double = problem.distance(d)(parameters)
+    private fun QoWeight.distance(d: Int, parameters: Map<Symbol, Double>): Double =
+        problem.distance(d)(allParameters + parameters)
 
 
     /**
      * The derivative of [distance]
      */
     private fun QoWeight.distanceDerivative(symbol: Symbol, d: Int, parameters: Map<Symbol, Double>): Double =
-        problem.distance(d).derivative(symbol)(parameters)
+        problem.distance(d).derivative(symbol).invoke(allParameters + parameters)
 
     /**
-     * Теоретическая ковариация весовых функций.
+     * Theoretical covariance of weight functions
      *
      * D(\phi)=E(\phi_k(\theta_0) \phi_l(\theta_0))= disDeriv_k * disDeriv_l /sigma^2
      */
@@ -92,7 +98,7 @@ public object QowOptimizer : Optimizer<Double, XYFit> {
         }
 
     /**
-     * Экспериментальная ковариация весов. Формула (22) из
+     * Experimental covariance Eq (22) from
      * http://arxiv.org/abs/physics/0604127
      */
     private fun QoWeight.covarFExp(theta: Map<Symbol, Double>): Matrix<Double> =
@@ -115,10 +121,9 @@ public object QowOptimizer : Optimizer<Double, XYFit> {
      * Equation derivatives for Newton run
      */
     private fun QoWeight.getEqDerivValues(
-        theta: Map<Symbol, Double> = parameters,
+        theta: Map<Symbol, Double> = freeParameters,
     ): Matrix<Double> = with(linearSpace) {
-        //Возвращает производную k-того Eq по l-тому параметру
-        //val res = Array(fitDim) { DoubleArray(fitDim) }
+        //Derivative of k Eq over l parameter
         val sderiv = buildMatrix(data.size, size) { d, s ->
             distanceDerivative(symbols[s], d, theta)
         }
@@ -140,16 +145,15 @@ public object QowOptimizer : Optimizer<Double, XYFit> {
 
 
     /**
-     * Значения уравнений метода квазиоптимальных весов
+     * Quasi optimal weights equations values
      */
-    private fun QoWeight.getEqValues(theta: Map<Symbol, Double> = this): Point<Double> {
+    private fun QoWeight.getEqValues(theta: Map<Symbol, Double>): Point<Double> {
         val distances = DoubleBuffer(data.size) { d -> distance(d, theta) }
-
         return DoubleBuffer(size) { s ->
             val base = (0 until data.size).sumOf { d -> distances[d] * derivs[d, s] / dispersion[d] }
-            //Поправка на априорную вероятность
+            //Prior probability correction
             prior?.let { prior ->
-                base - prior.derivative(symbols[s])(theta) / prior(theta)
+                base - prior.derivative(symbols[s]).invoke(theta) / prior(theta)
             } ?: base
         }
     }
@@ -157,15 +161,13 @@ public object QowOptimizer : Optimizer<Double, XYFit> {
 
     private fun QoWeight.newtonianStep(
         theta: Map<Symbol, Double>,
-        eqvalues: Point<Double>,
+        eqValues: Point<Double>,
     ): QoWeight = linearSpace {
-        with(this@newtonianStep) {
-            val start = theta.toPoint()
-            val invJacob = solver.inverse(this@newtonianStep.getEqDerivValues(theta))
+        val start = theta.toPoint()
+        val invJacob = solver.inverse(getEqDerivValues(theta))
 
-            val step = invJacob.dot(eqvalues)
-            return QoWeight(problem, theta + (start - step).toMap())
-        }
+        val step = invJacob.dot(eqValues)
+        return QoWeight(problem, theta + (start - step).toMap())
     }
 
     private fun QoWeight.newtonianRun(
@@ -177,10 +179,10 @@ public object QowOptimizer : Optimizer<Double, XYFit> {
         val logger = problem.getFeature<OptimizationLog>()
 
         var dis: Double //discrepancy value
-        // Working with the full set of parameters
-        var par = problem.startPoint
 
-        logger?.log { "Starting newtonian iteration from: \n\t$par" }
+        var par = freeParameters
+
+        logger?.log { "Starting newtonian iteration from: \n\t$allParameters" }
 
         var eqvalues = getEqValues(par) //Values of the weight functions
 
@@ -193,48 +195,48 @@ public object QowOptimizer : Optimizer<Double, XYFit> {
             logger?.log { "Starting step number $i" }
 
             val currentSolution = if (fast) {
-                //Берет значения матрицы в той точке, где считается вес
-                newtonianStep(this, eqvalues)
+                //Matrix values in the point of weight computation
+                newtonianStep(freeParameters, eqvalues)
             } else {
-                //Берет значения матрицы в точке par
+                //Matrix values in a current point
                 newtonianStep(par, eqvalues)
             }
             // здесь должен стоять учет границ параметров
             logger?.log { "Parameter values after step are: \n\t$currentSolution" }
 
-            eqvalues = getEqValues(currentSolution)
-            val currentDis = DoubleL2Norm.norm(eqvalues)// невязка после шага
+            eqvalues = getEqValues(currentSolution.freeParameters)
+            val currentDis = DoubleL2Norm.norm(eqvalues)// discrepancy after the step
 
             logger?.log { "The discrepancy after step is: $currentDis." }
 
             if (currentDis >= dis && i > 1) {
-                //дополнительно проверяем, чтобы был сделан хотя бы один шаг
+                //Check if one step is made
                 flag = true
                 logger?.log { "The discrepancy does not decrease. Stopping iteration." }
+            } else if (abs(dis - currentDis) <= tolerance) {
+                flag = true
+                par = currentSolution.freeParameters
+                logger?.log { "Relative discrepancy tolerance threshold is reached. Stopping iteration." }
             } else {
-                par = currentSolution
+                par = currentSolution.freeParameters
                 dis = currentDis
             }
             if (i >= maxSteps) {
                 flag = true
                 logger?.log { "Maximum number of iterations reached. Stopping iteration." }
             }
-            if (dis <= tolerance) {
-                flag = true
-                logger?.log { "Tolerance threshold is reached. Stopping iteration." }
-            }
         }
 
         return QoWeight(problem, par)
     }
 
-    private fun QoWeight.covariance(): Matrix<Double> {
+    private fun QoWeight.covariance(): NamedMatrix<Double> {
         val logger = problem.getFeature<OptimizationLog>()
 
         logger?.log {
             """
-            Starting errors estimation using quasioptimal weights method. The starting weight is:
-                ${problem.startPoint}
+            Starting errors estimation using quasi-optimal weights method. The starting weight is:
+                $allParameters
              """.trimIndent()
         }
 
@@ -248,19 +250,27 @@ public object QowOptimizer : Optimizer<Double, XYFit> {
 //                valid = false
 //            }
 //        }
-        return covar
+        logger?.log {
+            "Covariance matrix:" + "\n" + NamedMatrix.toStringWithSymbols(covar, this)
+        }
+        return covar.named(symbols)
     }
 
     override suspend fun optimize(problem: XYFit): XYFit {
         val qowRuns = problem.getFeature<QowRuns>()?.runs ?: 2
+        val iterations = problem.getFeature<OptimizationIterations>()?.maxIterations ?: 50
 
+        val freeParameters: Map<Symbol, Double> = problem.getFeature<OptimizationParameters>()?.let { op ->
+            problem.startPoint.filterKeys { it in op.symbols }
+        } ?: problem.startPoint
 
-        var qow = QoWeight(problem, problem.startPoint)
-        var res = qow.newtonianRun()
+        var qow = QoWeight(problem, freeParameters)
+        var res = qow.newtonianRun(maxSteps = iterations)
         repeat(qowRuns - 1) {
-            qow = QoWeight(problem, res.parameters)
-            res = qow.newtonianRun()
+            qow = QoWeight(problem, res.freeParameters)
+            res = qow.newtonianRun(maxSteps = iterations)
         }
-        return res.problem.withFeature(OptimizationResult(res.parameters))
+        val covariance = res.covariance()
+        return res.problem.withFeature(OptimizationResult(res.freeParameters), OptimizationCovariance(covariance))
     }
 }
\ No newline at end of file
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
index bba7a7113..5c28826ee 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
@@ -152,7 +152,7 @@ public suspend fun <I : Any, A> XYColumnarData<Double, Double, Double>.fitWith(
  */
 public val XYFit.chiSquaredOrNull: Double?
     get() {
-        val result = resultPointOrNull ?: return null
+        val result = startPoint + (resultPointOrNull ?: return null)
 
         return data.indices.sumOf { index ->
 
@@ -164,4 +164,7 @@ public val XYFit.chiSquaredOrNull: Double?
 
             ((y - mu) / yErr).pow(2)
         }
-    }
\ No newline at end of file
+    }
+
+public val XYFit.dof: Int
+    get() = data.size - (getFeature<OptimizationParameters>()?.symbols?.size ?: startPoint.size)
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/chiSquaredExpression.kt
similarity index 87%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
rename to kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/chiSquaredExpression.kt
index 59dfeb8ea..ca9755ad5 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/specialExpressions.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/chiSquaredExpression.kt
@@ -1,10 +1,13 @@
 /*
- * Copyright 2018-2022 KMath contributors.
+ * Copyright 2018-2023 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.expressions
+package space.kscience.kmath.stat
 
+import space.kscience.kmath.expressions.AutoDiffProcessor
+import space.kscience.kmath.expressions.DifferentiableExpression
+import space.kscience.kmath.expressions.ExpressionAlgebra
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.asIterable
 import space.kscience.kmath.structures.Buffer
-- 
2.34.1


From d97888f1350250e07d8c186714d58e05484a06a5 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 24 Jan 2023 21:22:25 +0300
Subject: [PATCH 639/713] Fix test

---
 .../space/kscience/kmath/commons/optimization/OptimizeTest.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index 8b4631fca..03b1426f5 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -11,13 +11,13 @@ import space.kscience.kmath.expressions.DSFieldExpression
 import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.Symbol.Companion.y
 import space.kscience.kmath.expressions.autodiff
-import space.kscience.kmath.expressions.chiSquaredExpression
 import space.kscience.kmath.expressions.symbol
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleBufferOps.Companion.map
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.optimization.*
 import space.kscience.kmath.random.RandomGenerator
+import space.kscience.kmath.stat.chiSquaredExpression
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
 import kotlin.test.Test
-- 
2.34.1


From db3091354225a8a054de7acc281216ef7f569d04 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 3 Feb 2023 19:32:53 +0300
Subject: [PATCH 640/713] Move to build tools 0.14

---
 benchmarks/build.gradle.kts                   |  7 +-
 .../kmath/benchmarks/IntegrationBenchmark.kt  | 40 +++++++++
 build.gradle.kts                              |  2 +-
 buildSrc/build.gradle.kts                     |  2 +-
 .../kscience/kmath/functions/integrate.kt     | 13 +++
 .../kmath/functions/matrixIntegration.kt      | 32 ++++---
 .../kscience/kmath/linear/dotPerformance.kt   |  6 +-
 .../space/kscience/kmath/series/analyzeDif.kt |  2 +-
 gradle.properties                             |  2 +-
 kmath-ast/build.gradle.kts                    | 89 +++++++++----------
 .../commons/expressions/CmDsExpression.kt     |  2 +
 kmath-complex/build.gradle.kts                | 10 +--
 .../space/kscience/kmath/complex/Complex.kt   |  2 +
 kmath-core/build.gradle.kts                   |  4 +-
 .../kscience/kmath/expressions/NamedMatrix.kt |  2 +
 .../kmath/operations/algebraExtensions.kt     | 11 +++
 kmath-coroutines/build.gradle.kts             | 25 ++----
 .../kmath/coroutines/coroutinesExtra.kt       |  2 +
 .../kscience/kmath/streaming/BufferFlow.kt    |  3 +
 kmath-dimensions/build.gradle.kts             | 24 +++--
 kmath-for-real/build.gradle.kts               |  6 +-
 kmath-functions/build.gradle.kts              |  2 +
 kmath-geometry/build.gradle.kts               |  6 +-
 kmath-histograms/build.gradle.kts             |  2 +
 kmath-jupyter/build.gradle.kts                |  5 +-
 kmath-memory/build.gradle.kts                 |  2 +
 kmath-multik/build.gradle.kts                 |  5 ++
 kmath-optimization/build.gradle.kts           |  2 +
 kmath-stat/build.gradle.kts                   |  4 +-
 kmath-tensors/build.gradle.kts                |  3 +
 kmath-trajectory/build.gradle.kts             |  6 +-
 test-utils/build.gradle.kts                   |  2 +
 32 files changed, 205 insertions(+), 120 deletions(-)
 create mode 100644 benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/IntegrationBenchmark.kt

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index ea2349d91..3a985cbb4 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -50,8 +50,6 @@ kotlin {
 
         val jvmMain by getting {
             dependencies {
-                implementation("org.openjdk.jmh:jmh-core:1.36")
-                implementation("org.openjdk.jmh:jmh-generator-annprocess:1.36")
                 implementation(project(":kmath-commons"))
                 implementation(project(":kmath-ejml"))
                 implementation(project(":kmath-nd4j"))
@@ -144,6 +142,11 @@ benchmark {
         commonConfiguration()
         include("ViktorLogBenchmark")
     }
+
+    configurations.register("integration") {
+        commonConfiguration()
+        include("IntegrationBenchmark")
+    }
 }
 
 kotlin.sourceSets.all {
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/IntegrationBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/IntegrationBenchmark.kt
new file mode 100644
index 000000000..6cc649fe9
--- /dev/null
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/IntegrationBenchmark.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.benchmarks
+
+import org.openjdk.jmh.annotations.Benchmark
+import org.openjdk.jmh.annotations.Scope
+import org.openjdk.jmh.annotations.State
+import org.openjdk.jmh.infra.Blackhole
+import space.kscience.kmath.complex.Complex
+import space.kscience.kmath.complex.algebra
+import space.kscience.kmath.integration.gaussIntegrator
+import space.kscience.kmath.integration.integrate
+import space.kscience.kmath.integration.value
+import space.kscience.kmath.operations.algebra
+
+
+@State(Scope.Benchmark)
+internal class IntegrationBenchmark {
+
+    @Benchmark
+    fun doubleIntegration(blackhole: Blackhole) {
+        val res = Double.algebra.gaussIntegrator.integrate(0.0..1.0, intervals = 1000) { x: Double ->
+            //sin(1 / x)
+            1/x
+        }.value
+        blackhole.consume(res)
+    }
+
+    @Benchmark
+    fun complexIntegration(blackhole: Blackhole) = with(Complex.algebra) {
+        val res = gaussIntegrator.integrate(0.0..1.0, intervals = 1000) { x: Double ->
+//            sin(1 / x) + i * cos(1 / x)
+            1/x - i/x
+        }.value
+        blackhole.consume(res)
+    }
+}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 8731dbc70..9b1101a22 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.1-dev-9"
+    version = "0.3.1-dev-10"
 }
 
 subprojects {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 67df0aab4..afa36ed1e 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -19,7 +19,7 @@ val benchmarksVersion = spclibs.versions.kotlinx.benchmark.get()
 dependencies {
     api("space.kscience:gradle-tools:$toolsVersion")
     //plugins form benchmarks
-    api("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:$benchmarksVersion")
+    api("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.4.7")
     //api("org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion")
     //to be used inside build-script only
     //implementation(spclibs.kotlinx.serialization.json)
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
index 28169f15a..e8534d002 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/integrate.kt
@@ -5,6 +5,11 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.complex.Complex
+import space.kscience.kmath.complex.ComplexField
+import space.kscience.kmath.complex.ComplexField.div
+import space.kscience.kmath.complex.ComplexField.minus
+import space.kscience.kmath.complex.algebra
 import space.kscience.kmath.integration.gaussIntegrator
 import space.kscience.kmath.integration.integrate
 import space.kscience.kmath.integration.value
@@ -20,4 +25,12 @@ fun main() {
 
     //the value is nullable because in some cases the integration could not succeed
     println(result.value)
+
+
+    repeat(100000) {
+        Complex.algebra.gaussIntegrator.integrate(0.0..1.0, intervals = 1000) { x: Double ->
+//            sin(1 / x) + i * cos(1 / x)
+            1 / x - ComplexField.i / x
+        }.value
+    }
 }
\ No newline at end of file
diff --git a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
index 1b578626d..baba2eb28 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/functions/matrixIntegration.kt
@@ -12,23 +12,21 @@ import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.structureND
 import space.kscience.kmath.nd.withNdAlgebra
 import space.kscience.kmath.operations.algebra
-import space.kscience.kmath.operations.invoke
+import kotlin.math.pow
 
-fun main(): Unit = Double.algebra {
-    withNdAlgebra(2, 2) {
+fun main(): Unit = Double.algebra.withNdAlgebra(2, 2) {
 
-        //Produce a diagonal StructureND
-        fun diagonal(v: Double) = structureND { (i, j) ->
-            if (i == j) v else 0.0
-        }
-
-        //Define a function in a nd space
-        val function: (Double) -> StructureND<Double> = { x: Double -> 3 * x.pow(2) + 2 * diagonal(x) + 1 }
-
-        //get the result of the integration
-        val result = gaussIntegrator.integrate(0.0..10.0, function = function)
-
-        //the value is nullable because in some cases the integration could not succeed
-        println(result.value)
+    //Produce a diagonal StructureND
+    fun diagonal(v: Double) = structureND { (i, j) ->
+        if (i == j) v else 0.0
     }
-}
\ No newline at end of file
+
+    //Define a function in a nd space
+    val function: (Double) -> StructureND<Double> = { x: Double -> 3 * x.pow(2) + 2 * diagonal(x) + 1 }
+
+    //get the result of the integration
+    val result = gaussIntegrator.integrate(0.0..10.0, function = function)
+
+    //the value is nullable because in some cases the integration could not succeed
+    println(result.value)
+}
diff --git a/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt b/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
index d9c3281f2..79eddc6c3 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/linear/dotPerformance.kt
@@ -7,8 +7,10 @@ package space.kscience.kmath.linear
 
 import space.kscience.kmath.operations.algebra
 import kotlin.random.Random
-import kotlin.system.measureTimeMillis
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTime
 
+@OptIn(ExperimentalTime::class)
 fun main() {
     val random = Random(12224)
     val dim = 1000
@@ -21,7 +23,7 @@ fun main() {
         if (i <= j) random.nextDouble() else 0.0
     }
 
-    val time = measureTimeMillis {
+    val time = measureTime {
         with(Double.algebra.linearSpace) {
             repeat(10) {
                 matrix1 dot matrix2
diff --git a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
index c1b0c056e..c94cb0e71 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
@@ -37,7 +37,7 @@ fun main() = with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
     val s3: Buffer<Double> = s1.zip(s2) { l, r -> l + r } //s1 + s2
     val s4 = DoubleBufferOps.ln(s3)
 
-    val kmTest: KMComparisonResult<Double> = ksComparisonStatistic(s1, s2)
+    @Suppress("UNUSED_VARIABLE") val kmTest: KMComparisonResult<Double> = ksComparisonStatistic(s1, s2)
 
     Plotly.page {
         h1 { +"This is my plot" }
diff --git a/gradle.properties b/gradle.properties
index 3016246b2..16cdd3551 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ kotlin.native.ignoreDisabledTargets=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.13.4-kotlin-1.8.0
+toolsVersion=0.14.0-kotlin-1.8.10
 
 
 org.gradle.parallel=true
diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index 7fd0f43f7..c60977862 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -3,65 +3,58 @@ plugins {
 }
 
 kscience{
+    jvm()
+    js()
     native()
+
+    dependencies {
+        api(projects.kmathCore)
+        api("com.github.h0tk3y.betterParse:better-parse:0.4.4")
+    }
+
+    testDependencies {
+        implementation(projects.kmathComplex)
+    }
+
+    dependencies(jsMain) {
+        implementation(npm("astring", "1.7.5"))
+        implementation(npm("binaryen", "101.0.0"))
+        implementation(npm("js-base64", "3.6.1"))
+    }
+
+    dependencies(jvmMain){
+        implementation("org.ow2.asm:asm-commons:9.2")
+    }
+
 }
 
-kotlin.js {
-    nodejs {
-        testTask {
-            useMocha().timeout = "0"
+kotlin {
+    js {
+        nodejs {
+            testTask {
+                useMocha().timeout = "0"
+            }
+        }
+
+        browser {
+            testTask {
+                useMocha().timeout = "0"
+            }
         }
     }
 
-    browser {
-        testTask {
-            useMocha().timeout = "0"
-        }
+    sourceSets {
+        filter { it.name.contains("test", true) }
+            .map(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::languageSettings)
+            .forEach { it.optIn("space.kscience.kmath.misc.UnstableKMathAPI") }
     }
 }
 
-kotlin.sourceSets {
-    filter { it.name.contains("test", true) }
-        .map(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::languageSettings)
-        .forEach { it.optIn("space.kscience.kmath.misc.UnstableKMathAPI") }
-
-    commonMain {
-        dependencies {
-            api("com.github.h0tk3y.betterParse:better-parse:0.4.4")
-            api(project(":kmath-core"))
-        }
-    }
-
-    commonTest {
-        dependencies {
-            implementation(project(":kmath-complex"))
-        }
-    }
-
-    jsMain {
-        dependencies {
-            implementation(npm("astring", "1.7.5"))
-            implementation(npm("binaryen", "101.0.0"))
-            implementation(npm("js-base64", "3.6.1"))
-        }
-    }
-
-    jvmMain {
-        dependencies {
-            implementation("org.ow2.asm:asm-commons:9.2")
-        }
-    }
-}
-
-//Workaround for https://github.com/Kotlin/dokka/issues/1455
-tasks.dokkaHtml {
-    dependsOn(tasks.build)
-}
-
-if (System.getProperty("space.kscience.kmath.ast.dump.generated.classes") == "1")
-    tasks.jvmTest {
+if (System.getProperty("space.kscience.kmath.ast.dump.generated.classes") == "1") {
+    tasks.withType<org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest> {
         jvmArgs("-Dspace.kscience.kmath.ast.dump.generated.classes=1")
     }
+}
 
 readme {
     maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/CmDsExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/CmDsExpression.kt
index f2af49087..cb7fb543f 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/CmDsExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/CmDsExpression.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("DEPRECATION")
+
 package space.kscience.kmath.commons.expressions
 
 import org.apache.commons.math3.analysis.differentiation.DerivativeStructure
diff --git a/kmath-complex/build.gradle.kts b/kmath-complex/build.gradle.kts
index b63def0a7..76d5a4c9a 100644
--- a/kmath-complex/build.gradle.kts
+++ b/kmath-complex/build.gradle.kts
@@ -3,14 +3,12 @@ plugins {
 }
 
 kscience {
+    jvm()
+    js()
     native()
-}
 
-kotlin.sourceSets {
-    commonMain {
-        dependencies {
-            api(project(":kmath-core"))
-        }
+    dependencies {
+        api(projects.kmathCore)
     }
 }
 
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index 7bf8af4e8..bb580989b 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -80,6 +80,8 @@ public object ComplexField :
     override fun add(left: Complex, right: Complex): Complex = Complex(left.re + right.re, left.im + right.im)
 //    override fun multiply(a: Complex, k: Number): Complex = Complex(a.re * k.toDouble(), a.im * k.toDouble())
 
+//    override fun Complex.minus(arg: Complex): Complex = Complex(re - arg.re, im - arg.im)
+
     override fun multiply(left: Complex, right: Complex): Complex =
         Complex(left.re * right.re - left.im * right.im, left.re * right.im + left.im * right.re)
 
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index f33d33324..0e4646bed 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -3,10 +3,12 @@ plugins {
 }
 
 kscience{
+    jvm()
+    js()
     native()
 
     dependencies {
-        api(project(":kmath-memory"))
+        api(projects.kmathMemory)
     }
 }
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/NamedMatrix.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/NamedMatrix.kt
index f0b27ffa2..24bdfce7e 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/NamedMatrix.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/NamedMatrix.kt
@@ -8,6 +8,7 @@
 package space.kscience.kmath.expressions
 
 import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.getOrNull
 
@@ -16,6 +17,7 @@ public class NamedMatrix<T>(public val values: Matrix<T>, public val indexer: Sy
 
     public companion object {
 
+        @OptIn(PerformancePitfall::class)
         public fun toStringWithSymbols(values: Matrix<*>, indexer: SymbolIndexer): String = buildString {
             appendLine(indexer.symbols.joinToString(separator = "\t", prefix = "\t\t"))
             indexer.symbols.forEach { i ->
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index f05ddafb8..84fb2ea41 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -92,6 +92,17 @@ public fun <T : Comparable<T>> Group<T>.abs(value: T): T = if (value > zero) val
  */
 public fun <T> Iterable<T>.sumWith(group: Group<T>): T = group.sum(this)
 
+/**
+ * Sum extracted elements of [Iterable] with given [group]
+ *
+ * @receiver the collection to sum up.
+ * @param group tha algebra that provides addition
+ * @param extractor the (inline) lambda function to extract value
+ */
+public inline fun <T, R> Iterable<T>.sumWithGroupOf(group: Group<R>, extractor: (T) -> R): R = this.fold(group.zero) { left: R, right: T ->
+    group.add(left, extractor(right))
+}
+
 /**
  * Returns the sum of all elements in the sequence in provided space.
  *
diff --git a/kmath-coroutines/build.gradle.kts b/kmath-coroutines/build.gradle.kts
index 529084619..9d5cfabe4 100644
--- a/kmath-coroutines/build.gradle.kts
+++ b/kmath-coroutines/build.gradle.kts
@@ -2,25 +2,14 @@ plugins {
     id("space.kscience.gradle.mpp")
 }
 
-kscience{
+kscience {
+    jvm()
+    js()
     native()
-}
-
-kotlin.sourceSets {
-    all {
-        with(languageSettings) {
-            optIn("kotlinx.coroutines.InternalCoroutinesApi")
-            optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
-            optIn("kotlinx.coroutines.FlowPreview")
-        }
-    }
-
-    commonMain {
-        dependencies {
-            api(project(":kmath-core"))
-            api(project(":kmath-complex"))
-            api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${space.kscience.gradle.KScienceVersions.coroutinesVersion}")
-        }
+    dependencies {
+        api(project(":kmath-core"))
+        api(project(":kmath-complex"))
+        api(spclibs.kotlinx.coroutines.core)
     }
 }
 
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
index 7bae388a8..2fd4f0057 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:OptIn(ExperimentalCoroutinesApi::class, FlowPreview::class)
+
 package space.kscience.kmath.coroutines
 
 import kotlinx.coroutines.*
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
index 8aa5a937c..ccd329064 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/streaming/BufferFlow.kt
@@ -3,8 +3,11 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:OptIn(FlowPreview::class)
+
 package space.kscience.kmath.streaming
 
+import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.flatMapConcat
diff --git a/kmath-dimensions/build.gradle.kts b/kmath-dimensions/build.gradle.kts
index 29c0eccb6..be1fc65a0 100644
--- a/kmath-dimensions/build.gradle.kts
+++ b/kmath-dimensions/build.gradle.kts
@@ -3,25 +3,21 @@ plugins {
 }
 
 kscience{
+    jvm()
+    js()
     native()
+
+    dependencies{
+        api(projects.kmathCore)
+    }
+
+    dependencies(jvmMain) {
+        api(kotlin("reflect"))
+    }
 }
 
 description = "A proof of concept module for adding type-safe dimensions to structures"
 
-kotlin.sourceSets {
-    commonMain {
-        dependencies {
-            api(project(":kmath-core"))
-        }
-    }
-
-    jvmMain {
-        dependencies {
-            api(kotlin("reflect"))
-        }
-    }
-}
-
 readme {
     maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }
diff --git a/kmath-for-real/build.gradle.kts b/kmath-for-real/build.gradle.kts
index 1e964d99c..99ce5903f 100644
--- a/kmath-for-real/build.gradle.kts
+++ b/kmath-for-real/build.gradle.kts
@@ -3,11 +3,15 @@ plugins {
 }
 
 kscience {
+    jvm()
+    js()
     native()
+
     dependencies {
         api(projects.kmathCore)
     }
-    dependencies("commonTest") {
+
+    testDependencies {
         implementation(projects.testUtils)
     }
 }
diff --git a/kmath-functions/build.gradle.kts b/kmath-functions/build.gradle.kts
index 9c2cd8352..08e76aef0 100644
--- a/kmath-functions/build.gradle.kts
+++ b/kmath-functions/build.gradle.kts
@@ -3,6 +3,8 @@ plugins {
 }
 
 kscience{
+    jvm()
+    js()
     native()
 }
 
diff --git a/kmath-geometry/build.gradle.kts b/kmath-geometry/build.gradle.kts
index 52d76d5d2..f248a1717 100644
--- a/kmath-geometry/build.gradle.kts
+++ b/kmath-geometry/build.gradle.kts
@@ -3,8 +3,12 @@ plugins {
 }
 
 kscience{
+    jvm()
+    js()
     native()
-    withContextReceivers()
+
+    useContextReceivers()
+    useSerialization()
     dependencies{
         api(projects.kmath.kmathComplex)
     }
diff --git a/kmath-histograms/build.gradle.kts b/kmath-histograms/build.gradle.kts
index 9d7ac33e4..33704c29e 100644
--- a/kmath-histograms/build.gradle.kts
+++ b/kmath-histograms/build.gradle.kts
@@ -3,6 +3,8 @@ plugins {
 }
 
 kscience{
+    jvm()
+    js()
     native()
 }
 
diff --git a/kmath-jupyter/build.gradle.kts b/kmath-jupyter/build.gradle.kts
index d92b6ca0d..a600261b3 100644
--- a/kmath-jupyter/build.gradle.kts
+++ b/kmath-jupyter/build.gradle.kts
@@ -4,15 +4,12 @@ plugins {
 }
 
 dependencies {
+    api(spclibs.kotlinx.html)
     api(project(":kmath-ast"))
     api(project(":kmath-complex"))
     api(project(":kmath-for-real"))
 }
 
-kscience {
-    useHtml()
-}
-
 readme {
     maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }
diff --git a/kmath-memory/build.gradle.kts b/kmath-memory/build.gradle.kts
index 50eb448a7..4f0f996b9 100644
--- a/kmath-memory/build.gradle.kts
+++ b/kmath-memory/build.gradle.kts
@@ -3,6 +3,8 @@ plugins {
 }
 
 kscience {
+    jvm()
+    js()
     native()
 }
 
diff --git a/kmath-multik/build.gradle.kts b/kmath-multik/build.gradle.kts
index 39c03ab9b..fc51d2c21 100644
--- a/kmath-multik/build.gradle.kts
+++ b/kmath-multik/build.gradle.kts
@@ -6,6 +6,11 @@ description = "JetBrains Multik connector"
 
 val multikVersion: String by rootProject.extra
 
+kscience {
+    jvm()
+    js()
+}
+
 kotlin{
     sourceSets{
         commonMain{
diff --git a/kmath-optimization/build.gradle.kts b/kmath-optimization/build.gradle.kts
index ba49d49bf..0a8e47728 100644
--- a/kmath-optimization/build.gradle.kts
+++ b/kmath-optimization/build.gradle.kts
@@ -3,6 +3,8 @@ plugins {
 }
 
 kscience{
+    jvm()
+    js()
     native()
 }
 
diff --git a/kmath-stat/build.gradle.kts b/kmath-stat/build.gradle.kts
index bc98129a9..267bfd0f3 100644
--- a/kmath-stat/build.gradle.kts
+++ b/kmath-stat/build.gradle.kts
@@ -3,6 +3,8 @@ plugins {
 }
 
 kscience{
+    jvm()
+    js()
     native()
 }
 
@@ -14,7 +16,7 @@ kotlin.sourceSets {
         }
     }
 
-    jvmMain {
+    getByName("jvmMain") {
         dependencies {
             api("org.apache.commons:commons-rng-sampling:1.3")
             api("org.apache.commons:commons-rng-simple:1.3")
diff --git a/kmath-tensors/build.gradle.kts b/kmath-tensors/build.gradle.kts
index 1060b37b4..d27faeeef 100644
--- a/kmath-tensors/build.gradle.kts
+++ b/kmath-tensors/build.gradle.kts
@@ -3,7 +3,10 @@ plugins {
 }
 
 kscience{
+    jvm()
+    js()
     native()
+
     dependencies {
         api(projects.kmathCore)
         api(projects.kmathStat)
diff --git a/kmath-trajectory/build.gradle.kts b/kmath-trajectory/build.gradle.kts
index 16a84b691..689c3265b 100644
--- a/kmath-trajectory/build.gradle.kts
+++ b/kmath-trajectory/build.gradle.kts
@@ -3,8 +3,12 @@ plugins {
 }
 
 kscience{
+    jvm()
+    js()
     native()
-    withContextReceivers()
+
+    useContextReceivers()
+    useSerialization()
     dependencies {
         api(projects.kmath.kmathGeometry)
     }
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index 98bd7328d..b860a62ec 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -3,6 +3,8 @@ plugins {
 }
 
 kscience{
+    jvm()
+    js()
     native()
 }
 
-- 
2.34.1


From 0366a69123fc45690d5b6983d83a3c90929d1084 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 3 Feb 2023 19:33:22 +0300
Subject: [PATCH 641/713] Refactor trajectory

---
 .../space/kscience/kmath/geometry/Circle2D.kt |   4 +-
 .../kmath/geometry/Euclidean2DSpace.kt        |  21 +++
 .../kmath/geometry/Euclidean3DSpace.kt        |  22 +++
 .../space/kscience/kmath/geometry/Line.kt     |  11 ++
 .../kscience/kmath/trajectory/DubinsPath.kt   | 173 ++++++++++--------
 .../kscience/kmath/trajectory/DubinsPose2D.kt |  41 ++++-
 .../kscience/kmath/trajectory/Trajectory2D.kt |  13 +-
 .../space/kscience/kmath/trajectory/route.kt  |  16 --
 .../kmath/trajectory/dubins/DubinsTests.kt    |  34 ++--
 9 files changed, 217 insertions(+), 118 deletions(-)
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
index 162130908..8beef6fee 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
@@ -5,13 +5,15 @@
 
 package space.kscience.kmath.geometry
 
+import kotlinx.serialization.Serializable
 import kotlin.math.PI
 
 /**
  * A circle in 2D space
  */
+@Serializable
 public data class Circle2D(
-    public val center: DoubleVector2D,
+    @Serializable(Euclidean2DSpace.VectorSerializer::class) public val center: DoubleVector2D,
     public val radius: Double
 )
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
index a8310503c..3df8dba7b 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
@@ -5,6 +5,12 @@
 
 package space.kscience.kmath.geometry
 
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.operations.Norm
 import space.kscience.kmath.operations.ScaleOperations
@@ -33,6 +39,7 @@ public operator fun <T> Vector2D<T>.component1(): T = x
 public operator fun <T> Vector2D<T>.component2(): T = y
 
 public typealias DoubleVector2D = Vector2D<Double>
+public typealias Float64Vector2D = Vector2D<Double>
 
 public val Vector2D<Double>.r: Double get() = Euclidean2DSpace.norm(this)
 
@@ -44,11 +51,25 @@ public object Euclidean2DSpace : GeometrySpace<DoubleVector2D>,
     ScaleOperations<DoubleVector2D>,
     Norm<DoubleVector2D, Double> {
 
+    @Serializable
+    @SerialName("Float64Vector2D")
     private data class Vector2DImpl(
         override val x: Double,
         override val y: Double,
     ) : DoubleVector2D
 
+    public object VectorSerializer : KSerializer<DoubleVector2D> {
+        private val proxySerializer = Vector2DImpl.serializer()
+        override val descriptor: SerialDescriptor get() = proxySerializer.descriptor
+
+        override fun deserialize(decoder: Decoder): DoubleVector2D = decoder.decodeSerializableValue(proxySerializer)
+
+        override fun serialize(encoder: Encoder, value: DoubleVector2D) {
+            val vector = value as? Vector2DImpl ?: Vector2DImpl(value.x, value.y)
+            encoder.encodeSerializableValue(proxySerializer, vector)
+        }
+    }
+
     public fun vector(x: Number, y: Number): DoubleVector2D = Vector2DImpl(x.toDouble(), y.toDouble())
 
     override val zero: DoubleVector2D by lazy { vector(0.0, 0.0) }
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index d214e4edf..cc641a3f1 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -5,6 +5,12 @@
 
 package space.kscience.kmath.geometry
 
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 import space.kscience.kmath.linear.Point
 import space.kscience.kmath.operations.Norm
 import space.kscience.kmath.operations.ScaleOperations
@@ -45,17 +51,33 @@ public fun <T> Buffer<T>.asVector3D(): Vector3D<T> = object : Vector3D<T> {
 }
 
 public typealias DoubleVector3D = Vector3D<Double>
+public typealias Float64Vector3D = Vector3D<Double>
 
 public val DoubleVector3D.r: Double get() = Euclidean3DSpace.norm(this)
 
 public object Euclidean3DSpace : GeometrySpace<DoubleVector3D>, ScaleOperations<DoubleVector3D>,
     Norm<DoubleVector3D, Double> {
+
+    @Serializable
+    @SerialName("Float64Vector3D")
     private data class Vector3DImpl(
         override val x: Double,
         override val y: Double,
         override val z: Double,
     ) : DoubleVector3D
 
+    public object VectorSerializer : KSerializer<DoubleVector3D> {
+        private val proxySerializer = Vector3DImpl.serializer()
+        override val descriptor: SerialDescriptor get() = proxySerializer.descriptor
+
+        override fun deserialize(decoder: Decoder): DoubleVector3D = decoder.decodeSerializableValue(proxySerializer)
+
+        override fun serialize(encoder: Encoder, value: DoubleVector3D) {
+            val vector = value as? Vector3DImpl ?: Vector3DImpl(value.x, value.y, value.z)
+            encoder.encodeSerializableValue(proxySerializer, vector)
+        }
+    }
+
     public fun vector(x: Number, y: Number, z: Number): DoubleVector3D =
         Vector3DImpl(x.toDouble(), y.toDouble(), z.toDouble())
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
index bf14d6d4a..ab322ddca 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
@@ -5,10 +5,13 @@
 
 package space.kscience.kmath.geometry
 
+import kotlinx.serialization.Serializable
+
 /**
  * A line formed by [base] vector of start and a [direction] vector. Direction vector is not necessarily normalized,
  * but its length does not affect line properties
  */
+@Serializable
 public data class Line<out V : Vector>(val base: V, val direction: V)
 
 public typealias Line2D = Line<DoubleVector2D>
@@ -17,4 +20,12 @@ public typealias Line3D = Line<DoubleVector3D>
 /**
  * A directed line segment between [begin] and [end]
  */
+@Serializable
 public data class LineSegment<out V : Vector>(val begin: V, val end: V)
+
+public fun <V : Vector> LineSegment<V>.line(algebra: GeometrySpace<V>): Line<V> = with(algebra) {
+    Line(begin, end - begin)
+}
+
+public typealias LineSegment2D = LineSegment<DoubleVector2D>
+public typealias LineSegment3D = LineSegment<DoubleVector3D>
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
index 1ba9936ee..6bbf3e55b 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
@@ -57,7 +57,11 @@ internal fun leftInnerTangent(base: Circle2D, direction: Circle2D): StraightTraj
 internal fun rightInnerTangent(base: Circle2D, direction: Circle2D): StraightTrajectory2D? =
     innerTangent(base, direction, CircleTrajectory2D.Direction.RIGHT)
 
-private fun innerTangent(base: Circle2D, direction: Circle2D, side: CircleTrajectory2D.Direction): StraightTrajectory2D? =
+private fun innerTangent(
+    base: Circle2D,
+    direction: Circle2D,
+    side: CircleTrajectory2D.Direction,
+): StraightTrajectory2D? =
     with(Euclidean2DSpace) {
         val centers = StraightTrajectory2D(base.center, direction.center)
         if (centers.length < base.radius * 2) return null
@@ -76,43 +80,49 @@ private fun innerTangent(base: Circle2D, direction: Circle2D, side: CircleTrajec
 
 internal fun theta(theta: Double): Double = (theta + (2 * PI)) % (2 * PI)
 
+
 @Suppress("DuplicatedCode")
-public class DubinsPath(
-    public val a: CircleTrajectory2D,
-    public val b: Trajectory2D,
-    public val c: CircleTrajectory2D,
-) : CompositeTrajectory2D(listOf(a, b, c)) {
+public object DubinsPath {
 
-    public val type: TYPE = TYPE.valueOf(
-        arrayOf(
-            a.direction.name[0],
-            if (b is CircleTrajectory2D) b.direction.name[0] else 'S',
-            c.direction.name[0]
-        ).toCharArray().concatToString()
-    )
-
-    public enum class TYPE {
+    public enum class Type {
         RLR, LRL, RSR, LSL, RSL, LSR
     }
 
-    public companion object {
-        public fun all(
-            start: DubinsPose2D,
-            end: DubinsPose2D,
-            turningRadius: Double,
-        ): List<DubinsPath> = listOfNotNull(
-            rlr(start, end, turningRadius),
-            lrl(start, end, turningRadius),
-            rsr(start, end, turningRadius),
-            lsl(start, end, turningRadius),
-            rsl(start, end, turningRadius),
-            lsr(start, end, turningRadius)
+    /**
+     * Return Dubins trajectory type or null if trajectory is not a Dubins path
+     */
+    public fun trajectoryTypeOf(trajectory2D: CompositeTrajectory2D): Type?{
+        if(trajectory2D.segments.size != 3) return null
+        val a = trajectory2D.segments.first() as? CircleTrajectory2D ?: return null
+        val b = trajectory2D.segments[1]
+        val c = trajectory2D.segments.last() as? CircleTrajectory2D ?: return null
+        return Type.valueOf(
+            arrayOf(
+                a.direction.name[0],
+                if (b is CircleTrajectory2D) b.direction.name[0] else 'S',
+                c.direction.name[0]
+            ).toCharArray().concatToString()
         )
+    }
 
-        public fun shortest(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath =
-            all(start, end, turningRadius).minBy { it.length }
+    public fun all(
+        start: DubinsPose2D,
+        end: DubinsPose2D,
+        turningRadius: Double,
+    ): List<CompositeTrajectory2D> = listOfNotNull(
+        rlr(start, end, turningRadius),
+        lrl(start, end, turningRadius),
+        rsr(start, end, turningRadius),
+        lsl(start, end, turningRadius),
+        rsl(start, end, turningRadius),
+        lsr(start, end, turningRadius)
+    )
 
-        public fun rlr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath? = with(Euclidean2DSpace) {
+    public fun shortest(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D =
+        all(start, end, turningRadius).minBy { it.length }
+
+    public fun rlr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D? =
+        with(Euclidean2DSpace) {
             val c1 = start.getRightCircle(turningRadius)
             val c2 = end.getRightCircle(turningRadius)
             val centers = StraightTrajectory2D(c1.center, c2.center)
@@ -132,7 +142,7 @@ public class DubinsPath(
                 val a1 = CircleTrajectory2D.of(c1.center, start, p1, CircleTrajectory2D.Direction.RIGHT)
                 val a2 = CircleTrajectory2D.of(e.center, p1, p2, CircleTrajectory2D.Direction.LEFT)
                 val a3 = CircleTrajectory2D.of(c2.center, p2, end, CircleTrajectory2D.Direction.RIGHT)
-                DubinsPath(a1, a2, a3)
+                CompositeTrajectory2D(a1, a2, a3)
             }
 
             val secondVariant = run {
@@ -149,13 +159,14 @@ public class DubinsPath(
                 val a1 = CircleTrajectory2D.of(c1.center, start, p1, CircleTrajectory2D.Direction.RIGHT)
                 val a2 = CircleTrajectory2D.of(e.center, p1, p2, CircleTrajectory2D.Direction.LEFT)
                 val a3 = CircleTrajectory2D.of(c2.center, p2, end, CircleTrajectory2D.Direction.RIGHT)
-                DubinsPath(a1, a2, a3)
+                CompositeTrajectory2D(a1, a2, a3)
             }
 
             return if (firstVariant.length < secondVariant.length) firstVariant else secondVariant
         }
 
-        public fun lrl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath? = with(Euclidean2DSpace) {
+    public fun lrl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D? =
+        with(Euclidean2DSpace) {
             val c1 = start.getLeftCircle(turningRadius)
             val c2 = end.getLeftCircle(turningRadius)
             val centers = StraightTrajectory2D(c1.center, c2.center)
@@ -175,10 +186,10 @@ public class DubinsPath(
                 val a1 = CircleTrajectory2D.of(c1.center, start, p1, CircleTrajectory2D.Direction.LEFT)
                 val a2 = CircleTrajectory2D.of(e.center, p1, p2, CircleTrajectory2D.Direction.RIGHT)
                 val a3 = CircleTrajectory2D.of(c2.center, p2, end, CircleTrajectory2D.Direction.LEFT)
-                DubinsPath(a1, a2, a3)
+                CompositeTrajectory2D(a1, a2, a3)
             }
 
-            val secondVariant = run{
+            val secondVariant = run {
                 var theta = theta(centers.bearing - acos(centers.length / (turningRadius * 4)))
                 var dX = turningRadius * sin(theta)
                 var dY = turningRadius * cos(theta)
@@ -192,50 +203,60 @@ public class DubinsPath(
                 val a1 = CircleTrajectory2D.of(c1.center, start, p1, CircleTrajectory2D.Direction.LEFT)
                 val a2 = CircleTrajectory2D.of(e.center, p1, p2, CircleTrajectory2D.Direction.RIGHT)
                 val a3 = CircleTrajectory2D.of(c2.center, p2, end, CircleTrajectory2D.Direction.LEFT)
-                DubinsPath(a1, a2, a3)
+                CompositeTrajectory2D(a1, a2, a3)
             }
 
             return if (firstVariant.length < secondVariant.length) firstVariant else secondVariant
         }
 
-        public fun rsr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath {
-            val c1 = start.getRightCircle(turningRadius)
-            val c2 = end.getRightCircle(turningRadius)
-            val s = leftOuterTangent(c1, c2)
-            val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.RIGHT)
-            val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.RIGHT)
-            return DubinsPath(a1, s, a3)
-        }
-
-        public fun lsl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath {
-            val c1 = start.getLeftCircle(turningRadius)
-            val c2 = end.getLeftCircle(turningRadius)
-            val s = rightOuterTangent(c1, c2)
-            val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.LEFT)
-            val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.LEFT)
-            return DubinsPath(a1, s, a3)
-        }
-
-        public fun rsl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath? {
-            val c1 = start.getRightCircle(turningRadius)
-            val c2 = end.getLeftCircle(turningRadius)
-            val s = rightInnerTangent(c1, c2)
-            if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
-
-            val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.RIGHT)
-            val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.LEFT)
-            return DubinsPath(a1, s, a3)
-        }
-
-        public fun lsr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): DubinsPath? {
-            val c1 = start.getLeftCircle(turningRadius)
-            val c2 = end.getRightCircle(turningRadius)
-            val s = leftInnerTangent(c1, c2)
-            if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
-
-            val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.LEFT)
-            val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.RIGHT)
-            return DubinsPath(a1, s, a3)
-        }
+    public fun rsr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D {
+        val c1 = start.getRightCircle(turningRadius)
+        val c2 = end.getRightCircle(turningRadius)
+        val s = leftOuterTangent(c1, c2)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.RIGHT)
+        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.RIGHT)
+        return CompositeTrajectory2D(a1, s, a3)
     }
-}
\ No newline at end of file
+
+    public fun lsl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D {
+        val c1 = start.getLeftCircle(turningRadius)
+        val c2 = end.getLeftCircle(turningRadius)
+        val s = rightOuterTangent(c1, c2)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.LEFT)
+        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.LEFT)
+        return CompositeTrajectory2D(a1, s, a3)
+    }
+
+    public fun rsl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D? {
+        val c1 = start.getRightCircle(turningRadius)
+        val c2 = end.getLeftCircle(turningRadius)
+        val s = rightInnerTangent(c1, c2)
+        if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
+
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.RIGHT)
+        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.LEFT)
+        return CompositeTrajectory2D(a1, s, a3)
+    }
+
+    public fun lsr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D? {
+        val c1 = start.getLeftCircle(turningRadius)
+        val c2 = end.getRightCircle(turningRadius)
+        val s = leftInnerTangent(c1, c2)
+        if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
+
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.LEFT)
+        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.RIGHT)
+        return CompositeTrajectory2D(a1, s, a3)
+    }
+}
+
+public fun interface MaxCurvature {
+    public fun compute(startPoint: PhaseVector2D): Double
+}
+
+public fun DubinsPath.shortest(
+    start: PhaseVector2D,
+    end: PhaseVector2D,
+    maxCurvature: MaxCurvature,
+): CompositeTrajectory2D = shortest(start, end, maxCurvature.compute(start))
+
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
index 5aa8c1455..ff2198bbb 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
@@ -2,35 +2,62 @@
  * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
-
+@file:UseSerializers(Euclidean2DSpace.VectorSerializer::class)
 package space.kscience.kmath.trajectory
 
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.UseSerializers
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 import space.kscience.kmath.geometry.DoubleVector2D
+import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.Vector
 import kotlin.math.atan2
 
 /**
  * Combination of [Vector] and its view angle (clockwise from positive y-axis direction)
  */
+@Serializable(DubinsPose2DSerializer::class)
 public interface DubinsPose2D : DoubleVector2D {
-    public val coordinate: DoubleVector2D
+    public val coordinates: DoubleVector2D
     public val bearing: Double
 }
 
+@Serializable
 public class PhaseVector2D(
-    override val coordinate: DoubleVector2D,
+    override val coordinates: DoubleVector2D,
     public val velocity: DoubleVector2D,
-) : DubinsPose2D, DoubleVector2D by coordinate {
+) : DubinsPose2D, DoubleVector2D by coordinates {
     override val bearing: Double get() = atan2(velocity.x, velocity.y)
 }
 
+@Serializable
+@SerialName("DubinsPose2D")
 private class DubinsPose2DImpl(
-    override val coordinate: DoubleVector2D,
+    override val coordinates: DoubleVector2D,
     override val bearing: Double,
-) : DubinsPose2D, DoubleVector2D by coordinate{
+) : DubinsPose2D, DoubleVector2D by coordinates{
 
-    override fun toString(): String = "Pose2D(x=$x, y=$y, bearing=$bearing)"
+    override fun toString(): String = "DubinsPose2D(x=$x, y=$y, bearing=$bearing)"
 }
 
+public object DubinsPose2DSerializer: KSerializer<DubinsPose2D>{
+    private val proxySerializer = DubinsPose2DImpl.serializer()
+
+    override val descriptor: SerialDescriptor
+        get() = proxySerializer.descriptor
+
+    override fun deserialize(decoder: Decoder): DubinsPose2D {
+        return decoder.decodeSerializableValue(proxySerializer)
+    }
+
+    override fun serialize(encoder: Encoder, value: DubinsPose2D) {
+        val pose = value as? DubinsPose2DImpl ?: DubinsPose2DImpl(value.coordinates, value.bearing)
+        encoder.encodeSerializableValue(proxySerializer, pose)
+    }
+}
 
 public fun DubinsPose2D(coordinate: DoubleVector2D, theta: Double): DubinsPose2D = DubinsPose2DImpl(coordinate, theta)
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
index ffa23a537..120bedf90 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
@@ -2,15 +2,19 @@
  * Copyright 2018-2022 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
-
+@file:UseSerializers(Euclidean2DSpace.VectorSerializer::class)
 package space.kscience.kmath.trajectory
 
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.UseSerializers
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.DoubleVector2D
+import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
 import kotlin.math.PI
 import kotlin.math.atan2
 
+@Serializable
 public sealed interface Trajectory2D {
     public val length: Double
 }
@@ -18,6 +22,7 @@ public sealed interface Trajectory2D {
 /**
  * Straight path segment. The order of start and end defines the direction
  */
+@Serializable
 public data class StraightTrajectory2D(
     public val start: DoubleVector2D,
     public val end: DoubleVector2D,
@@ -30,6 +35,7 @@ public data class StraightTrajectory2D(
 /**
  * An arc segment
  */
+@Serializable
 public data class CircleTrajectory2D(
     public val circle: Circle2D,
     public val start: DubinsPose2D,
@@ -102,7 +108,10 @@ public data class CircleTrajectory2D(
     }
 }
 
-public open class CompositeTrajectory2D(public val segments: List<Trajectory2D>) : Trajectory2D {
+@Serializable
+public class CompositeTrajectory2D(public val segments: List<Trajectory2D>) : Trajectory2D {
     override val length: Double get() = segments.sumOf { it.length }
 }
 
+public fun CompositeTrajectory2D(vararg segments: Trajectory2D): CompositeTrajectory2D = CompositeTrajectory2D(segments.toList())
+
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt
deleted file mode 100644
index 56350835d..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/route.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory
-
-public fun interface MaxCurvature {
-    public fun compute(startPoint: PhaseVector2D): Double
-}
-
-public fun DubinsPath.Companion.shortest(
-    start: PhaseVector2D,
-    end: PhaseVector2D,
-    maxCurvature: MaxCurvature,
-): DubinsPath = shortest(start, end, maxCurvature.compute(start))
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
index 5bbf8c294..0e14ae736 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -28,31 +28,33 @@ class DubinsTests {
         println("Absolute distance: $absoluteDistance")
 
         val expectedLengths = mapOf(
-            DubinsPath.TYPE.RLR to 13.067681939031397,
-            DubinsPath.TYPE.RSR to 12.28318530717957,
-            DubinsPath.TYPE.LSL to 32.84955592153878,
-            DubinsPath.TYPE.RSL to 23.37758938854081,
-            DubinsPath.TYPE.LSR to 23.37758938854081
+            DubinsPath.Type.RLR to 13.067681939031397,
+            DubinsPath.Type.RSR to 12.28318530717957,
+            DubinsPath.Type.LSL to 32.84955592153878,
+            DubinsPath.Type.RSL to 23.37758938854081,
+            DubinsPath.Type.LSR to 23.37758938854081
         )
 
         expectedLengths.forEach {
-            val path = dubins.find { p -> p.type === it.key }
+            val path = dubins.find { p -> DubinsPath.trajectoryTypeOf(p) === it.key }
             assertNotNull(path, "Path ${it.key} not found")
             println("${it.key}: ${path.length}")
             assertTrue(it.value.equalFloat(path.length))
 
-            assertTrue(start.equalsFloat(path.a.start))
-            assertTrue(end.equalsFloat(path.c.end))
+            val a = path.segments[0] as CircleTrajectory2D
+            val b = path.segments[1]
+            val c = path.segments[2] as CircleTrajectory2D
+
+            assertTrue(start.equalsFloat(a.start))
+            assertTrue(end.equalsFloat(c.end))
 
             // Not working, theta double precision inaccuracy
-            if (path.b is CircleTrajectory2D) {
-                val b = path.b as CircleTrajectory2D
-                assertTrue(path.a.end.equalsFloat(b.start))
-                assertTrue(path.c.start.equalsFloat(b.end))
-            } else if (path.b is StraightTrajectory2D) {
-                val b = path.b as StraightTrajectory2D
-                assertTrue(path.a.end.equalsFloat(DubinsPose2D(b.start, b.bearing)))
-                assertTrue(path.c.start.equalsFloat(DubinsPose2D(b.end, b.bearing)))
+            if (b is CircleTrajectory2D) {
+                assertTrue(a.end.equalsFloat(b.start))
+                assertTrue(c.start.equalsFloat(b.end))
+            } else if (b is StraightTrajectory2D) {
+                assertTrue(a.end.equalsFloat(DubinsPose2D(b.start, b.bearing)))
+                assertTrue(c.start.equalsFloat(DubinsPose2D(b.end, b.bearing)))
             }
         }
     }
-- 
2.34.1


From 2c6d1e89c512627f79c579e7305197d3a3ae98db Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 5 Feb 2023 20:05:53 +0300
Subject: [PATCH 642/713] Update type-safe angles

---
 CHANGELOG.md                                  |  1 +
 .../space/kscience/kmath/geometry/angles.kt   | 53 +++++++++++--------
 .../kscience/kmath/geometry/AngleTest.kt      | 16 ++++++
 .../kscience/kmath/trajectory/DubinsPath.kt   | 39 ++++++--------
 .../kscience/kmath/trajectory/DubinsPose2D.kt | 12 ++---
 .../kscience/kmath/trajectory/Trajectory2D.kt | 42 +++++++--------
 .../space/kscience/kmath/trajectory/math.kt   |  8 +--
 .../kmath/trajectory/segments/ArcTests.kt     |  6 +--
 .../kmath/trajectory/segments/LineTests.kt    | 12 ++---
 9 files changed, 104 insertions(+), 85 deletions(-)
 create mode 100644 kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/AngleTest.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8cb0d976..404366a03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Algebra now has an obligatory `bufferFactory` (#477).
 
 ### Changed
+- Trajectory use type-safe angles
 - Tensor operations switched to prefix notation
 - Row-wise and column-wise ND shapes in the core
 - Shape is read-only
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/angles.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/angles.kt
index e7b0afcda..45022ad05 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/angles.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/angles.kt
@@ -7,8 +7,9 @@ package space.kscience.kmath.geometry
 
 import kotlin.jvm.JvmInline
 import kotlin.math.PI
+import kotlin.math.floor
 
-public sealed interface Angle {
+public sealed interface Angle : Comparable<Angle> {
     public fun toRadians(): Radians
     public fun toDegrees(): Degrees
 
@@ -17,7 +18,15 @@ public sealed interface Angle {
 
     public operator fun times(other: Number): Angle
     public operator fun div(other: Number): Angle
+    public operator fun div(other: Angle): Double
     public operator fun unaryMinus(): Angle
+
+    public companion object {
+        public val zero: Radians = Radians(0.0)
+        public val pi: Radians = Radians(PI)
+        public val piTimes2: Radians = Radians(PI * 2)
+        public val piDiv2: Radians = Radians(PI / 2)
+    }
 }
 
 /**
@@ -28,12 +37,16 @@ public value class Radians(public val value: Double) : Angle {
     override fun toRadians(): Radians = this
     override fun toDegrees(): Degrees = Degrees(value * 180 / PI)
 
-    public override fun plus(other: Angle): Radians = Radians(value + other.toRadians().value)
-    public override fun minus(other: Angle): Radians = Radians(value - other.toRadians().value)
+    public override fun plus(other: Angle): Radians = Radians(value + other.radians)
+    public override fun minus(other: Angle): Radians = Radians(value - other.radians)
 
-    public override fun times(other: Number): Radians = Radians(value + other.toDouble())
+    public override fun times(other: Number): Radians = Radians(value * other.toDouble())
     public override fun div(other: Number): Radians = Radians(value / other.toDouble())
+    override fun div(other: Angle): Double = value / other.radians
+
     public override fun unaryMinus(): Radians = Radians(-value)
+
+    override fun compareTo(other: Angle): Int = value.compareTo(other.radians)
 }
 
 public fun sin(angle: Angle): Double = kotlin.math.sin(angle.toRadians().value)
@@ -42,6 +55,8 @@ public fun tan(angle: Angle): Double = kotlin.math.tan(angle.toRadians().value)
 
 public val Number.radians: Radians get() = Radians(toDouble())
 
+public val Angle.radians: Double get() = toRadians().value
+
 /**
  * Type safe degrees
  */
@@ -50,30 +65,26 @@ public value class Degrees(public val value: Double) : Angle {
     override fun toRadians(): Radians = Radians(value * PI / 180)
     override fun toDegrees(): Degrees = this
 
-    public override fun plus(other: Angle): Degrees = Degrees(value + other.toDegrees().value)
-    public override fun minus(other: Angle): Degrees = Degrees(value - other.toDegrees().value)
+    public override fun plus(other: Angle): Degrees = Degrees(value + other.degrees)
+    public override fun minus(other: Angle): Degrees = Degrees(value - other.degrees)
 
-    public override fun times(other: Number): Degrees = Degrees(value + other.toDouble())
+    public override fun times(other: Number): Degrees = Degrees(value * other.toDouble())
     public override fun div(other: Number): Degrees = Degrees(value / other.toDouble())
+    override fun div(other: Angle): Double = value / other.degrees
+
     public override fun unaryMinus(): Degrees = Degrees(-value)
+
+    override fun compareTo(other: Angle): Int = value.compareTo(other.degrees)
 }
 
 public val Number.degrees: Degrees get() = Degrees(toDouble())
 
+public val Angle.degrees: Double get() = toDegrees().value
+
 /**
- * A holder class for Pi representation in radians and degrees
+ * Normalized angle 2 PI range symmetric around [center]. By default, uses (0, 2PI) range.
  */
-public object Pi {
-    public val radians: Radians = Radians(PI)
-    public val degrees: Degrees = radians.toDegrees()
-}
+public fun Angle.normalized(center: Angle = Angle.pi): Angle =
+    this - Angle.piTimes2 * floor((radians + PI - center.radians) / PI / 2)
 
-public object PiTimes2 {
-    public val radians: Radians = Radians(2 * PI)
-    public val degrees: Degrees = radians.toDegrees()
-}
-
-public object PiDiv2 {
-    public val radians: Radians = Radians(PI / 2)
-    public val degrees: Degrees = radians.toDegrees()
-}
\ No newline at end of file
+public fun abs(angle: Angle): Angle = if (angle < Angle.zero) -angle else angle
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/AngleTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/AngleTest.kt
new file mode 100644
index 000000000..b8086eb75
--- /dev/null
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/AngleTest.kt
@@ -0,0 +1,16 @@
+package space.kscience.kmath.geometry
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class AngleTest {
+    @Test
+    fun normalization() {
+        assertEquals(30.degrees, 390.degrees.normalized())
+        assertEquals(30.degrees, (-330).degrees.normalized())
+        assertEquals(200.degrees, 200.degrees.normalized())
+        assertEquals(30.degrees, 390.degrees.normalized(Angle.zero))
+        assertEquals(30.degrees, (-330).degrees.normalized(Angle.zero))
+        assertEquals((-160).degrees, 200.degrees.normalized(Angle.zero))
+    }
+}
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
index 6bbf3e55b..568ef691a 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
@@ -5,13 +5,9 @@
 
 package space.kscience.kmath.trajectory
 
-import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.Euclidean2DSpace
+import space.kscience.kmath.geometry.*
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import kotlin.math.PI
 import kotlin.math.acos
-import kotlin.math.cos
-import kotlin.math.sin
 
 internal fun DubinsPose2D.getLeftCircle(radius: Double): Circle2D = getTangentCircles(radius).first
 
@@ -65,12 +61,11 @@ private fun innerTangent(
     with(Euclidean2DSpace) {
         val centers = StraightTrajectory2D(base.center, direction.center)
         if (centers.length < base.radius * 2) return null
-        val angle = theta(
-            when (side) {
-                CircleTrajectory2D.Direction.LEFT -> centers.bearing + acos(base.radius * 2 / centers.length)
-                CircleTrajectory2D.Direction.RIGHT -> centers.bearing - acos(base.radius * 2 / centers.length)
-            }
-        )
+        val angle = when (side) {
+            CircleTrajectory2D.Direction.LEFT -> centers.bearing + acos(base.radius * 2 / centers.length).radians
+            CircleTrajectory2D.Direction.RIGHT -> centers.bearing - acos(base.radius * 2 / centers.length).radians
+        }.normalized()
+
         val dX = base.radius * sin(angle)
         val dY = base.radius * cos(angle)
         val p1 = vector(base.center.x + dX, base.center.y + dY)
@@ -78,8 +73,6 @@ private fun innerTangent(
         return StraightTrajectory2D(p1, p2)
     }
 
-internal fun theta(theta: Double): Double = (theta + (2 * PI)) % (2 * PI)
-
 
 @Suppress("DuplicatedCode")
 public object DubinsPath {
@@ -91,8 +84,8 @@ public object DubinsPath {
     /**
      * Return Dubins trajectory type or null if trajectory is not a Dubins path
      */
-    public fun trajectoryTypeOf(trajectory2D: CompositeTrajectory2D): Type?{
-        if(trajectory2D.segments.size != 3) return null
+    public fun trajectoryTypeOf(trajectory2D: CompositeTrajectory2D): Type? {
+        if (trajectory2D.segments.size != 3) return null
         val a = trajectory2D.segments.first() as? CircleTrajectory2D ?: return null
         val b = trajectory2D.segments[1]
         val c = trajectory2D.segments.last() as? CircleTrajectory2D ?: return null
@@ -129,13 +122,13 @@ public object DubinsPath {
             if (centers.length > turningRadius * 4) return null
 
             val firstVariant = run {
-                var theta = theta(centers.bearing - acos(centers.length / (turningRadius * 4)))
+                var theta = (centers.bearing - acos(centers.length / (turningRadius * 4)).radians).normalized()
                 var dX = turningRadius * sin(theta)
                 var dY = turningRadius * cos(theta)
                 val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
                 val e = Circle2D(p, turningRadius)
                 val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-                theta = theta(centers.bearing + acos(centers.length / (turningRadius * 4)))
+                theta = (centers.bearing + acos(centers.length / (turningRadius * 4)).radians).normalized()
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
@@ -146,13 +139,13 @@ public object DubinsPath {
             }
 
             val secondVariant = run {
-                var theta = theta(centers.bearing + acos(centers.length / (turningRadius * 4)))
+                var theta = (centers.bearing + acos(centers.length / (turningRadius * 4)).radians).normalized()
                 var dX = turningRadius * sin(theta)
                 var dY = turningRadius * cos(theta)
                 val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
                 val e = Circle2D(p, turningRadius)
                 val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-                theta = theta(centers.bearing - acos(centers.length / (turningRadius * 4)))
+                theta = (centers.bearing - acos(centers.length / (turningRadius * 4)).radians).normalized()
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
@@ -173,13 +166,13 @@ public object DubinsPath {
             if (centers.length > turningRadius * 4) return null
 
             val firstVariant = run {
-                var theta = theta(centers.bearing + acos(centers.length / (turningRadius * 4)))
+                var theta = (centers.bearing + acos(centers.length / (turningRadius * 4)).radians).normalized()
                 var dX = turningRadius * sin(theta)
                 var dY = turningRadius * cos(theta)
                 val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
                 val e = Circle2D(p, turningRadius)
                 val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-                theta = theta(centers.bearing - acos(centers.length / (turningRadius * 4)))
+                theta = (centers.bearing - acos(centers.length / (turningRadius * 4)).radians).normalized()
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
@@ -190,13 +183,13 @@ public object DubinsPath {
             }
 
             val secondVariant = run {
-                var theta = theta(centers.bearing - acos(centers.length / (turningRadius * 4)))
+                var theta = (centers.bearing - acos(centers.length / (turningRadius * 4)).radians).normalized()
                 var dX = turningRadius * sin(theta)
                 var dY = turningRadius * cos(theta)
                 val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
                 val e = Circle2D(p, turningRadius)
                 val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-                theta = theta(centers.bearing + acos(centers.length / (turningRadius * 4)))
+                theta = (centers.bearing + acos(centers.length / (turningRadius * 4)).radians).normalized()
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
index ff2198bbb..8362d0cb5 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
@@ -12,9 +12,7 @@ import kotlinx.serialization.UseSerializers
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import space.kscience.kmath.geometry.DoubleVector2D
-import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.geometry.Vector
+import space.kscience.kmath.geometry.*
 import kotlin.math.atan2
 
 /**
@@ -23,7 +21,7 @@ import kotlin.math.atan2
 @Serializable(DubinsPose2DSerializer::class)
 public interface DubinsPose2D : DoubleVector2D {
     public val coordinates: DoubleVector2D
-    public val bearing: Double
+    public val bearing: Angle
 }
 
 @Serializable
@@ -31,14 +29,14 @@ public class PhaseVector2D(
     override val coordinates: DoubleVector2D,
     public val velocity: DoubleVector2D,
 ) : DubinsPose2D, DoubleVector2D by coordinates {
-    override val bearing: Double get() = atan2(velocity.x, velocity.y)
+    override val bearing: Angle get() = atan2(velocity.x, velocity.y).radians
 }
 
 @Serializable
 @SerialName("DubinsPose2D")
 private class DubinsPose2DImpl(
     override val coordinates: DoubleVector2D,
-    override val bearing: Double,
+    override val bearing: Angle,
 ) : DubinsPose2D, DoubleVector2D by coordinates{
 
     override fun toString(): String = "DubinsPose2D(x=$x, y=$y, bearing=$bearing)"
@@ -60,4 +58,4 @@ public object DubinsPose2DSerializer: KSerializer<DubinsPose2D>{
     }
 }
 
-public fun DubinsPose2D(coordinate: DoubleVector2D, theta: Double): DubinsPose2D = DubinsPose2DImpl(coordinate, theta)
\ No newline at end of file
+public fun DubinsPose2D(coordinate: DoubleVector2D, theta: Angle): DubinsPose2D = DubinsPose2DImpl(coordinate, theta)
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
index 120bedf90..b8916e748 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
@@ -3,15 +3,13 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 @file:UseSerializers(Euclidean2DSpace.VectorSerializer::class)
+
 package space.kscience.kmath.trajectory
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
-import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.DoubleVector2D
-import space.kscience.kmath.geometry.Euclidean2DSpace
+import space.kscience.kmath.geometry.*
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import kotlin.math.PI
 import kotlin.math.atan2
 
 @Serializable
@@ -29,7 +27,7 @@ public data class StraightTrajectory2D(
 ) : Trajectory2D {
     override val length: Double get() = start.distanceTo(end)
 
-    public val bearing: Double get() = theta(atan2(end.x - start.x, end.y - start.y))
+    public val bearing: Angle get() = (atan2(end.x - start.x, end.y - start.y).radians).normalized()
 }
 
 /**
@@ -49,26 +47,25 @@ public data class CircleTrajectory2D(
     /**
      * Arc length in radians
      */
-    val arcLength: Double
-        get() = theta(
-            if (direction == Direction.LEFT) {
-                start.bearing - end.bearing
-            } else {
-                end.bearing - start.bearing
-            }
-        )
+    val arcLength: Angle
+        get() = if (direction == Direction.LEFT) {
+            start.bearing - end.bearing
+        } else {
+            end.bearing - start.bearing
+        }.normalized()
+
 
     override val length: Double by lazy {
-        circle.radius * arcLength
+        circle.radius * arcLength.radians
     }
 
     public val direction: Direction by lazy {
         if (start.y < circle.center.y) {
-            if (start.bearing > PI) Direction.RIGHT else Direction.LEFT
+            if (start.bearing > Angle.pi) Direction.RIGHT else Direction.LEFT
         } else if (start.y > circle.center.y) {
-            if (start.bearing < PI) Direction.RIGHT else Direction.LEFT
+            if (start.bearing < Angle.pi) Direction.RIGHT else Direction.LEFT
         } else {
-            if (start.bearing == 0.0) {
+            if (start.bearing == Angle.zero) {
                 if (start.x < circle.center.x) Direction.RIGHT else Direction.LEFT
             } else {
                 if (start.x > circle.center.x) Direction.RIGHT else Direction.LEFT
@@ -85,13 +82,13 @@ public data class CircleTrajectory2D(
         ): CircleTrajectory2D {
             fun calculatePose(
                 vector: DoubleVector2D,
-                theta: Double,
+                theta: Angle,
                 direction: Direction,
             ): DubinsPose2D = DubinsPose2D(
                 vector,
                 when (direction) {
-                    Direction.LEFT -> theta(theta - PI / 2)
-                    Direction.RIGHT -> theta(theta + PI / 2)
+                    Direction.LEFT -> (theta - Angle.piDiv2).normalized()
+                    Direction.RIGHT -> (theta + Angle.piDiv2).normalized()
                 }
             )
 
@@ -100,7 +97,7 @@ public data class CircleTrajectory2D(
             val pose1 = calculatePose(start, s1.bearing, direction)
             val pose2 = calculatePose(end, s2.bearing, direction)
             val trajectory = CircleTrajectory2D(Circle2D(center, s1.length), pose1, pose2)
-            if(trajectory.direction != direction){
+            if (trajectory.direction != direction) {
                 error("Trajectory direction mismatch")
             }
             return trajectory
@@ -113,5 +110,6 @@ public class CompositeTrajectory2D(public val segments: List<Trajectory2D>) : Tr
     override val length: Double get() = segments.sumOf { it.length }
 }
 
-public fun CompositeTrajectory2D(vararg segments: Trajectory2D): CompositeTrajectory2D = CompositeTrajectory2D(segments.toList())
+public fun CompositeTrajectory2D(vararg segments: Trajectory2D): CompositeTrajectory2D =
+    CompositeTrajectory2D(segments.toList())
 
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
index 4599f30f8..c69ad24f1 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
@@ -6,19 +6,21 @@
 package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
+import space.kscience.kmath.geometry.radians
+import space.kscience.kmath.geometry.sin
 import kotlin.math.PI
 import kotlin.math.abs
-import kotlin.math.sin
 
 const val maxFloatDelta = 0.000001
 
 fun Double.radiansToDegrees() = this * 180 / PI
 
 fun Double.equalFloat(other: Double) = abs(this - other) < maxFloatDelta
-fun DubinsPose2D.equalsFloat(other: DubinsPose2D) = x.equalFloat(other.x) && y.equalFloat(other.y) && bearing.equalFloat(other.bearing)
+fun DubinsPose2D.equalsFloat(other: DubinsPose2D) =
+    x.equalFloat(other.x) && y.equalFloat(other.y) && bearing.radians.equalFloat(other.bearing.radians)
 
 fun StraightTrajectory2D.inverse() = StraightTrajectory2D(end, start)
-fun StraightTrajectory2D.shift(shift: Int, width: Double): StraightTrajectory2D = with(Euclidean2DSpace){
+fun StraightTrajectory2D.shift(shift: Int, width: Double): StraightTrajectory2D = with(Euclidean2DSpace) {
     val dX = width * sin(inverse().bearing)
     val dY = width * sin(bearing)
 
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
index af1444ade..643f9eaaa 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
@@ -8,8 +8,8 @@ package space.kscience.kmath.trajectory.segments
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.circumference
+import space.kscience.kmath.geometry.degrees
 import space.kscience.kmath.trajectory.CircleTrajectory2D
-import space.kscience.kmath.trajectory.radiansToDegrees
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -20,7 +20,7 @@ class ArcTests {
         val circle = Circle2D(vector(0.0, 0.0), 2.0)
         val arc = CircleTrajectory2D.of(circle.center, vector(-2.0, 0.0), vector(0.0, 2.0), CircleTrajectory2D.Direction.RIGHT)
         assertEquals(circle.circumference / 4, arc.length, 1.0)
-        assertEquals(0.0, arc.start.bearing.radiansToDegrees())
-        assertEquals(90.0, arc.end.bearing.radiansToDegrees())
+        assertEquals(0.0, arc.start.bearing.degrees)
+        assertEquals(90.0, arc.end.bearing.degrees)
     }
 }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
index 03320a3df..54deb2193 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.trajectory.segments
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
+import space.kscience.kmath.geometry.degrees
 import space.kscience.kmath.trajectory.StraightTrajectory2D
-import space.kscience.kmath.trajectory.radiansToDegrees
 import kotlin.math.pow
 import kotlin.math.sqrt
 import kotlin.test.Test
@@ -19,19 +19,19 @@ class LineTests {
     fun lineTest() = with(Euclidean2DSpace){
         val straight = StraightTrajectory2D(vector(0.0, 0.0), vector(100.0, 100.0))
         assertEquals(sqrt(100.0.pow(2) + 100.0.pow(2)), straight.length)
-        assertEquals(45.0, straight.bearing.radiansToDegrees())
+        assertEquals(45.0, straight.bearing.degrees)
     }
 
     @Test
     fun lineAngleTest() = with(Euclidean2DSpace){
         //val zero = Vector2D(0.0, 0.0)
         val north = StraightTrajectory2D(zero, vector(0.0, 2.0))
-        assertEquals(0.0, north.bearing.radiansToDegrees())
+        assertEquals(0.0, north.bearing.degrees)
         val east = StraightTrajectory2D(zero, vector(2.0, 0.0))
-        assertEquals(90.0, east.bearing.radiansToDegrees())
+        assertEquals(90.0, east.bearing.degrees)
         val south = StraightTrajectory2D(zero, vector(0.0, -2.0))
-        assertEquals(180.0, south.bearing.radiansToDegrees())
+        assertEquals(180.0, south.bearing.degrees)
         val west = StraightTrajectory2D(zero, vector(-2.0, 0.0))
-        assertEquals(270.0, west.bearing.radiansToDegrees())
+        assertEquals(270.0, west.bearing.degrees)
     }
 }
-- 
2.34.1


From 6deeaf057e64d0ccaba0abb3cab32c64a8e76455 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 11 Feb 2023 21:51:19 +0300
Subject: [PATCH 643/713] Add angle serializer

---
 .../space/kscience/kmath/geometry/angles.kt   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/angles.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/angles.kt
index 45022ad05..3855514fb 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/angles.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/angles.kt
@@ -5,10 +5,17 @@
 
 package space.kscience.kmath.geometry
 
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 import kotlin.jvm.JvmInline
 import kotlin.math.PI
 import kotlin.math.floor
 
+@Serializable(AngleSerializer::class)
 public sealed interface Angle : Comparable<Angle> {
     public fun toRadians(): Radians
     public fun toDegrees(): Degrees
@@ -29,9 +36,21 @@ public sealed interface Angle : Comparable<Angle> {
     }
 }
 
+
+public object AngleSerializer : KSerializer<Angle> {
+    override val descriptor: SerialDescriptor get() = Double.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): Angle = decoder.decodeDouble().degrees
+
+    override fun serialize(encoder: Encoder, value: Angle) {
+        encoder.encodeDouble(value.degrees)
+    }
+}
+
 /**
  * Type safe radians
  */
+@Serializable
 @JvmInline
 public value class Radians(public val value: Double) : Angle {
     override fun toRadians(): Radians = this
-- 
2.34.1


From 784d397ab12103bae441d770b8ee6c2f8e0c03c3 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 12 Feb 2023 10:40:53 +0300
Subject: [PATCH 644/713] Fix serial names for trajectory serializers

---
 .../kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
index b8916e748..7e0a8c1c0 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
@@ -6,6 +6,7 @@
 
 package space.kscience.kmath.trajectory
 
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
 import space.kscience.kmath.geometry.*
@@ -21,6 +22,7 @@ public sealed interface Trajectory2D {
  * Straight path segment. The order of start and end defines the direction
  */
 @Serializable
+@SerialName("straight")
 public data class StraightTrajectory2D(
     public val start: DoubleVector2D,
     public val end: DoubleVector2D,
@@ -34,6 +36,7 @@ public data class StraightTrajectory2D(
  * An arc segment
  */
 @Serializable
+@SerialName("arc")
 public data class CircleTrajectory2D(
     public val circle: Circle2D,
     public val start: DubinsPose2D,
@@ -106,6 +109,7 @@ public data class CircleTrajectory2D(
 }
 
 @Serializable
+@SerialName("composite")
 public class CompositeTrajectory2D(public val segments: List<Trajectory2D>) : Trajectory2D {
     override val length: Double get() = segments.sumOf { it.length }
 }
-- 
2.34.1


From 50579f4712695629d477eb1031f1a36e0d34f9af Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Mon, 13 Feb 2023 23:17:13 +0300
Subject: [PATCH 645/713] added tangent between two circles

---
 .../space/kscience/kmath/geometry/Tangent.kt  | 77 +++++++++++++++++++
 .../kscience/kmath/geometry/TangentTest.kt    | 39 ++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Tangent.kt
 create mode 100644 kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Tangent.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Tangent.kt
new file mode 100644
index 000000000..889debecb
--- /dev/null
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Tangent.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.geometry
+
+import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
+import space.kscience.kmath.linear.DoubleLinearSpace.plus
+import space.kscience.kmath.linear.Point
+import kotlin.math.absoluteValue
+import kotlin.math.atan2
+import kotlin.math.pow
+import kotlin.math.sign
+import kotlin.math.sin
+import kotlin.math.cos
+import space.kscience.kmath.geometry.Euclidean2DSpace.vector
+import space.kscience.kmath.geometry.Euclidean2DSpace.dot
+import space.kscience.kmath.geometry.Euclidean2DSpace.scale
+import space.kscience.kmath.geometry.Euclidean2DSpace.add
+
+
+public class Segment(
+    public val startPoint: DoubleVector2D,
+    public val terminalPoint: DoubleVector2D,
+    public val length: Double = startPoint.distanceTo(terminalPoint)
+) {
+    public override operator fun equals(other: Any?): Boolean {
+        return if (other is Segment) {
+            startPoint.x.equalFloat(other.startPoint.x) && startPoint.y.equalFloat(other.startPoint.y) &&
+                    terminalPoint.x.equalFloat(other.terminalPoint.x) && terminalPoint.y.equalFloat(other.terminalPoint.y)
+        } else {
+            false
+        }
+    }
+}
+
+public const val maxFloatDelta: Double = 0.000001
+public fun Double.equalFloat(other: Double): Boolean = kotlin.math.abs(this - other) < maxFloatDelta
+
+
+
+public fun tangentsToCircles(
+    startCircle: Circle2D,
+    terminalCircle: Circle2D
+): kotlin.collections.MutableMap<String, Segment> {
+    val R1 = startCircle.radius
+    val R2 = terminalCircle.radius
+    val d = Segment(startCircle.center, terminalCircle.center).length
+    val angle1 = atan2(terminalCircle.center.x - startCircle.center.x, terminalCircle.center.y - startCircle.center.y)
+    var r: Double
+    var angle2: Double
+    val routes = mapOf("RSR" to Pair(R1, R2),
+        "RSL" to Pair(R1, -R2),
+        "LSR" to Pair(-R1, R2),
+        "LSL" to Pair(-R1, -R2))
+    val segments = mutableMapOf<String, Segment>()
+    for ((route, r1r2) in routes) {
+        val r1 = r1r2.first
+        val r2 = r1r2.second
+        r = if (r1.sign == r2.sign) {
+            r1.absoluteValue - r2.absoluteValue
+        } else {
+            r1.absoluteValue + r2.absoluteValue
+        }
+        val L = (d * d - r * r).pow(0.5)
+        angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+            angle1 + r1.sign * atan2(r.absoluteValue, L)
+        } else {
+            angle1 - r2.sign * atan2(r.absoluteValue, L)
+        }
+        val W = vector(-cos(angle2), sin(angle2))
+        segments[route] = Segment(add(startCircle.center, scale(W, r1)),
+            add(terminalCircle.center, scale(W, r2)))
+    }
+    return segments
+}
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt
new file mode 100644
index 000000000..beac8d15f
--- /dev/null
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.geometry
+
+import space.kscience.kmath.geometry.Euclidean2DSpace.vector
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class TangentTest {
+    @Test
+    fun tangent() {
+        val c1 = Circle2D(vector(0.0, 0.0), 1.0)
+        val c2 = Circle2D(vector(4.0, 0.0), 1.0)
+        val routes = arrayListOf<String>("RSR", "RSL", "LSR", "LSL")
+        val segments = arrayListOf<Segment>(
+            Segment(startPoint = vector(0.0, 1.0),
+                terminalPoint = vector(4.0, 1.0)),
+            Segment(startPoint = vector(0.5, 0.8660254),
+                terminalPoint = vector(3.5, -0.8660254)),
+            Segment(startPoint = vector(0.5, -0.8660254),
+                terminalPoint = vector(3.5, 0.8660254)),
+            Segment(startPoint = vector(0.0, -1.0),
+                terminalPoint = vector(4.0, -1.0))
+        )
+
+        val tangentMap = tangentsToCircles(c1, c2)
+        val tangentMapKeys = tangentMap.keys.toList()
+        val tangentMapValues = tangentMap.values.toList()
+
+        assertEquals(routes, tangentMapKeys)
+        for (i in segments.indices) {
+            assertEquals(segments[i], tangentMapValues[i])
+        }
+//        assertEquals(segments, tangentMapValues)
+    }
+}
\ No newline at end of file
-- 
2.34.1


From bef317677c9a1c3496595dca8999a06ead1c3f85 Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Wed, 15 Feb 2023 14:36:58 +0300
Subject: [PATCH 646/713] tangentsToCircle fixed

---
 .../space/kscience/kmath/geometry/Circle2D.kt |  39 ++++++-
 .../space/kscience/kmath/geometry/Line.kt     |  10 ++
 .../space/kscience/kmath/geometry/Tangent.kt  | 108 +++++++++---------
 .../kscience/kmath/geometry/TangentTest.kt    |  24 ++--
 .../kscience/kmath/geometry/testUtils.kt      |   3 +
 5 files changed, 116 insertions(+), 68 deletions(-)

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
index 8beef6fee..a26a592da 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
@@ -6,7 +6,8 @@
 package space.kscience.kmath.geometry
 
 import kotlinx.serialization.Serializable
-import kotlin.math.PI
+import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
+import kotlin.math.*
 
 /**
  * A circle in 2D space
@@ -17,4 +18,40 @@ public data class Circle2D(
     public val radius: Double
 )
 
+public fun Circle2D.tangentsToCircle(other: Circle2D): kotlin.collections.MutableMap<String, LineSegment<DoubleVector2D>> {
+    val R1 = this.radius
+    val R2 = other.radius
+    val line = LineSegment(this.center, other.center)
+    val d = line.begin.distanceTo(line.end)
+    val angle1 = atan2(other.center.x - this.center.x, other.center.y - this.center.y)
+    var r: Double
+    var angle2: Double
+    val routes = mapOf("RSR" to Pair(R1, R2),
+        "RSL" to Pair(R1, -R2),
+        "LSR" to Pair(-R1, R2),
+        "LSL" to Pair(-R1, -R2))
+    val segments = mutableMapOf<String, LineSegment<DoubleVector2D>>()
+    for ((route, r1r2) in routes) {
+        val r1 = r1r2.first
+        val r2 = r1r2.second
+        r = if (r1.sign == r2.sign) {
+            r1.absoluteValue - r2.absoluteValue
+        } else {
+            r1.absoluteValue + r2.absoluteValue
+        }
+        val L = (d * d - r * r).pow(0.5)
+        angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+            angle1 + r1.sign * atan2(r.absoluteValue, L)
+        } else {
+            angle1 - r2.sign * atan2(r.absoluteValue, L)
+        }
+        val W = Euclidean2DSpace.vector(-cos(angle2), sin(angle2))
+        segments[route] = LineSegment(
+            Euclidean2DSpace.add(this.center, Euclidean2DSpace.scale(W, r1)),
+            Euclidean2DSpace.add(other.center, Euclidean2DSpace.scale(W, r2))
+        )
+    }
+    return segments
+}
+
 public val Circle2D.circumference: Double get() = radius * 2 * PI
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
index ab322ddca..bb03b5a93 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
@@ -27,5 +27,15 @@ public fun <V : Vector> LineSegment<V>.line(algebra: GeometrySpace<V>): Line<V>
     Line(begin, end - begin)
 }
 
+public fun equalLineSegments(line1: LineSegment<DoubleVector2D>, line2: LineSegment<DoubleVector2D>): Boolean {
+    val maxFloatDelta = 0.000001
+    return line1.begin.x.equalFloat(line2.begin.x) && line1.begin.y.equalFloat(line2.begin.y) &&
+            line1.end.x.equalFloat(line2.end.x) && line1.end.y.equalFloat(line2.end.y)
+//    return line1.begin == line2.begin && line1.end == line2.end
+}
+
+public fun Double.equalFloat(other: Double, maxFloatDelta: Double = 0.000001):
+        Boolean = kotlin.math.abs(this - other) < maxFloatDelta
+
 public typealias LineSegment2D = LineSegment<DoubleVector2D>
 public typealias LineSegment3D = LineSegment<DoubleVector3D>
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Tangent.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Tangent.kt
index 889debecb..cfcb78115 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Tangent.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Tangent.kt
@@ -5,9 +5,6 @@
 
 package space.kscience.kmath.geometry
 
-import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.linear.DoubleLinearSpace.plus
-import space.kscience.kmath.linear.Point
 import kotlin.math.absoluteValue
 import kotlin.math.atan2
 import kotlin.math.pow
@@ -15,63 +12,64 @@ import kotlin.math.sign
 import kotlin.math.sin
 import kotlin.math.cos
 import space.kscience.kmath.geometry.Euclidean2DSpace.vector
-import space.kscience.kmath.geometry.Euclidean2DSpace.dot
 import space.kscience.kmath.geometry.Euclidean2DSpace.scale
 import space.kscience.kmath.geometry.Euclidean2DSpace.add
+import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
 
 
-public class Segment(
-    public val startPoint: DoubleVector2D,
-    public val terminalPoint: DoubleVector2D,
-    public val length: Double = startPoint.distanceTo(terminalPoint)
-) {
-    public override operator fun equals(other: Any?): Boolean {
-        return if (other is Segment) {
-            startPoint.x.equalFloat(other.startPoint.x) && startPoint.y.equalFloat(other.startPoint.y) &&
-                    terminalPoint.x.equalFloat(other.terminalPoint.x) && terminalPoint.y.equalFloat(other.terminalPoint.y)
-        } else {
-            false
-        }
-    }
-}
+//public class Segment(
+//    public val startPoint: DoubleVector2D,
+//    public val terminalPoint: DoubleVector2D,
+//    public val length: Double = startPoint.distanceTo(terminalPoint)
+//) {
+//    public override operator fun equals(other: Any?): Boolean {
+//        return if (other is Segment) {
+//            startPoint.x.equalFloat(other.startPoint.x) && startPoint.y.equalFloat(other.startPoint.y) &&
+//                    terminalPoint.x.equalFloat(other.terminalPoint.x) && terminalPoint.y.equalFloat(other.terminalPoint.y)
+//        } else {
+//            false
+//        }
+//    }
+//}
 
-public const val maxFloatDelta: Double = 0.000001
-public fun Double.equalFloat(other: Double): Boolean = kotlin.math.abs(this - other) < maxFloatDelta
+//public const val maxFloatDelta: Double = 0.000001
+//public fun Double.equalFloat(other: Double): Boolean = kotlin.math.abs(this - other) < maxFloatDelta
 
 
 
-public fun tangentsToCircles(
-    startCircle: Circle2D,
-    terminalCircle: Circle2D
-): kotlin.collections.MutableMap<String, Segment> {
-    val R1 = startCircle.radius
-    val R2 = terminalCircle.radius
-    val d = Segment(startCircle.center, terminalCircle.center).length
-    val angle1 = atan2(terminalCircle.center.x - startCircle.center.x, terminalCircle.center.y - startCircle.center.y)
-    var r: Double
-    var angle2: Double
-    val routes = mapOf("RSR" to Pair(R1, R2),
-        "RSL" to Pair(R1, -R2),
-        "LSR" to Pair(-R1, R2),
-        "LSL" to Pair(-R1, -R2))
-    val segments = mutableMapOf<String, Segment>()
-    for ((route, r1r2) in routes) {
-        val r1 = r1r2.first
-        val r2 = r1r2.second
-        r = if (r1.sign == r2.sign) {
-            r1.absoluteValue - r2.absoluteValue
-        } else {
-            r1.absoluteValue + r2.absoluteValue
-        }
-        val L = (d * d - r * r).pow(0.5)
-        angle2 = if (r1.absoluteValue > r2.absoluteValue) {
-            angle1 + r1.sign * atan2(r.absoluteValue, L)
-        } else {
-            angle1 - r2.sign * atan2(r.absoluteValue, L)
-        }
-        val W = vector(-cos(angle2), sin(angle2))
-        segments[route] = Segment(add(startCircle.center, scale(W, r1)),
-            add(terminalCircle.center, scale(W, r2)))
-    }
-    return segments
-}
\ No newline at end of file
+//public fun tangentsToCircles(
+//    startCircle: Circle2D,
+//    terminalCircle: Circle2D
+//): kotlin.collections.MutableMap<String, LineSegment<DoubleVector2D>> {
+//    val R1 = startCircle.radius
+//    val R2 = terminalCircle.radius
+//    val line = LineSegment(startCircle.center, terminalCircle.center)
+//    val d = line.begin.distanceTo(line.end)
+//    val angle1 = atan2(terminalCircle.center.x - startCircle.center.x, terminalCircle.center.y - startCircle.center.y)
+//    var r: Double
+//    var angle2: Double
+//    val routes = mapOf("RSR" to Pair(R1, R2),
+//        "RSL" to Pair(R1, -R2),
+//        "LSR" to Pair(-R1, R2),
+//        "LSL" to Pair(-R1, -R2))
+//    val segments = mutableMapOf<String, LineSegment<DoubleVector2D>>()
+//    for ((route, r1r2) in routes) {
+//        val r1 = r1r2.first
+//        val r2 = r1r2.second
+//        r = if (r1.sign == r2.sign) {
+//            r1.absoluteValue - r2.absoluteValue
+//        } else {
+//            r1.absoluteValue + r2.absoluteValue
+//        }
+//        val L = (d * d - r * r).pow(0.5)
+//        angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+//            angle1 + r1.sign * atan2(r.absoluteValue, L)
+//        } else {
+//            angle1 - r2.sign * atan2(r.absoluteValue, L)
+//        }
+//        val W = vector(-cos(angle2), sin(angle2))
+//        segments[route] = LineSegment(add(startCircle.center, scale(W, r1)),
+//            add(terminalCircle.center, scale(W, r2)))
+//    }
+//    return segments
+//}
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt
index beac8d15f..fd3002e19 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt
@@ -8,6 +8,7 @@ package space.kscience.kmath.geometry
 import space.kscience.kmath.geometry.Euclidean2DSpace.vector
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 
 class TangentTest {
     @Test
@@ -15,25 +16,24 @@ class TangentTest {
         val c1 = Circle2D(vector(0.0, 0.0), 1.0)
         val c2 = Circle2D(vector(4.0, 0.0), 1.0)
         val routes = arrayListOf<String>("RSR", "RSL", "LSR", "LSL")
-        val segments = arrayListOf<Segment>(
-            Segment(startPoint = vector(0.0, 1.0),
-                terminalPoint = vector(4.0, 1.0)),
-            Segment(startPoint = vector(0.5, 0.8660254),
-                terminalPoint = vector(3.5, -0.8660254)),
-            Segment(startPoint = vector(0.5, -0.8660254),
-                terminalPoint = vector(3.5, 0.8660254)),
-            Segment(startPoint = vector(0.0, -1.0),
-                terminalPoint = vector(4.0, -1.0))
+        val segments = arrayListOf<LineSegment<DoubleVector2D>>(
+            LineSegment<DoubleVector2D>(begin = vector(0.0, 1.0),
+                end = vector(4.0, 1.0)),
+            LineSegment<DoubleVector2D>(begin = vector(0.5, 0.8660254),
+                end = vector(3.5, -0.8660254)),
+            LineSegment<DoubleVector2D>(begin = vector(0.5, -0.8660254),
+                end = vector(3.5, 0.8660254)),
+            LineSegment<DoubleVector2D>(begin = vector(0.0, -1.0),
+                end = vector(4.0, -1.0))
         )
 
-        val tangentMap = tangentsToCircles(c1, c2)
+        val tangentMap = c1.tangentsToCircle(c2)
         val tangentMapKeys = tangentMap.keys.toList()
         val tangentMapValues = tangentMap.values.toList()
 
         assertEquals(routes, tangentMapKeys)
         for (i in segments.indices) {
-            assertEquals(segments[i], tangentMapValues[i])
+            assertTrue(equalLineSegments(segments[i], tangentMapValues[i]))
         }
-//        assertEquals(segments, tangentMapValues)
     }
 }
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
index 89db22d45..c62af3cd3 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/testUtils.kt
@@ -44,3 +44,6 @@ fun <V : Vector> GeometrySpace<V>.isCollinear(a: V, b: V, absoluteTolerance: Dou
 
 fun <V : Vector> GeometrySpace<V>.isOrthogonal(a: V, b: V, absoluteTolerance: Double = 1e-6): Boolean =
     abs(a dot b) < absoluteTolerance
+
+fun Double.equalFloat(other: Double, maxFloatDelta: Double = 0.000001):
+        Boolean = kotlin.math.abs(this - other) < maxFloatDelta
\ No newline at end of file
-- 
2.34.1


From d535a2155f3171b538a2f6019dffad9ef83f2001 Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Wed, 15 Feb 2023 15:06:47 +0300
Subject: [PATCH 647/713] tangentsToCircle fixed

---
 .../space/kscience/kmath/geometry/Circle2D.kt | 17 +++--
 .../kmath/geometry/Euclidean2DSpace.kt        |  7 ++
 .../space/kscience/kmath/geometry/Line.kt     |  6 --
 .../space/kscience/kmath/geometry/Tangent.kt  | 75 -------------------
 .../kscience/kmath/geometry/TangentTest.kt    |  8 +-
 5 files changed, 25 insertions(+), 88 deletions(-)
 delete mode 100644 kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Tangent.kt

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
index a26a592da..df25dcbea 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
@@ -18,7 +18,11 @@ public data class Circle2D(
     public val radius: Double
 )
 
-public fun Circle2D.tangentsToCircle(other: Circle2D): kotlin.collections.MutableMap<String, LineSegment<DoubleVector2D>> {
+public enum class DubinsRoutes {
+    RSR, RSL, LSR, LSL
+}
+
+public fun Circle2D.tangentsToCircle(other: Circle2D): Map<DubinsRoutes, LineSegment<DoubleVector2D>> {
     val R1 = this.radius
     val R2 = other.radius
     val line = LineSegment(this.center, other.center)
@@ -26,11 +30,12 @@ public fun Circle2D.tangentsToCircle(other: Circle2D): kotlin.collections.Mutabl
     val angle1 = atan2(other.center.x - this.center.x, other.center.y - this.center.y)
     var r: Double
     var angle2: Double
-    val routes = mapOf("RSR" to Pair(R1, R2),
-        "RSL" to Pair(R1, -R2),
-        "LSR" to Pair(-R1, R2),
-        "LSL" to Pair(-R1, -R2))
-    val segments = mutableMapOf<String, LineSegment<DoubleVector2D>>()
+    val routes = mapOf(
+        DubinsRoutes.RSR to Pair(R1, R2),
+        DubinsRoutes.RSL to Pair(R1, -R2),
+        DubinsRoutes.LSR to Pair(-R1, R2),
+        DubinsRoutes.LSL to Pair(-R1, -R2))
+    val segments = mutableMapOf<DubinsRoutes, LineSegment<DoubleVector2D>>()
     for ((route, r1r2) in routes) {
         val r1 = r1r2.first
         val r2 = r1r2.second
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
index 3df8dba7b..dc05f6648 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
@@ -85,6 +85,13 @@ public object Euclidean2DSpace : GeometrySpace<DoubleVector2D>,
     override fun scale(a: DoubleVector2D, value: Double): DoubleVector2D = vector(a.x * value, a.y * value)
     override fun DoubleVector2D.dot(other: DoubleVector2D): Double = x * other.x + y * other.y
 
+    public fun equalLineSegments(line1: LineSegment<DoubleVector2D>, line2: LineSegment<DoubleVector2D>): Boolean {
+        val maxFloatDelta = 0.000001
+        return line1.begin.x.equalFloat(line2.begin.x) && line1.begin.y.equalFloat(line2.begin.y) &&
+                line1.end.x.equalFloat(line2.end.x) && line1.end.y.equalFloat(line2.end.y)
+    }
+
+
     public val xAxis: DoubleVector2D = vector(1.0, 0.0)
     public val yAxis: DoubleVector2D = vector(0.0, 1.0)
 }
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
index bb03b5a93..6413edce9 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
@@ -27,12 +27,6 @@ public fun <V : Vector> LineSegment<V>.line(algebra: GeometrySpace<V>): Line<V>
     Line(begin, end - begin)
 }
 
-public fun equalLineSegments(line1: LineSegment<DoubleVector2D>, line2: LineSegment<DoubleVector2D>): Boolean {
-    val maxFloatDelta = 0.000001
-    return line1.begin.x.equalFloat(line2.begin.x) && line1.begin.y.equalFloat(line2.begin.y) &&
-            line1.end.x.equalFloat(line2.end.x) && line1.end.y.equalFloat(line2.end.y)
-//    return line1.begin == line2.begin && line1.end == line2.end
-}
 
 public fun Double.equalFloat(other: Double, maxFloatDelta: Double = 0.000001):
         Boolean = kotlin.math.abs(this - other) < maxFloatDelta
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Tangent.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Tangent.kt
deleted file mode 100644
index cfcb78115..000000000
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Tangent.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2018-2023 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.geometry
-
-import kotlin.math.absoluteValue
-import kotlin.math.atan2
-import kotlin.math.pow
-import kotlin.math.sign
-import kotlin.math.sin
-import kotlin.math.cos
-import space.kscience.kmath.geometry.Euclidean2DSpace.vector
-import space.kscience.kmath.geometry.Euclidean2DSpace.scale
-import space.kscience.kmath.geometry.Euclidean2DSpace.add
-import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-
-
-//public class Segment(
-//    public val startPoint: DoubleVector2D,
-//    public val terminalPoint: DoubleVector2D,
-//    public val length: Double = startPoint.distanceTo(terminalPoint)
-//) {
-//    public override operator fun equals(other: Any?): Boolean {
-//        return if (other is Segment) {
-//            startPoint.x.equalFloat(other.startPoint.x) && startPoint.y.equalFloat(other.startPoint.y) &&
-//                    terminalPoint.x.equalFloat(other.terminalPoint.x) && terminalPoint.y.equalFloat(other.terminalPoint.y)
-//        } else {
-//            false
-//        }
-//    }
-//}
-
-//public const val maxFloatDelta: Double = 0.000001
-//public fun Double.equalFloat(other: Double): Boolean = kotlin.math.abs(this - other) < maxFloatDelta
-
-
-
-//public fun tangentsToCircles(
-//    startCircle: Circle2D,
-//    terminalCircle: Circle2D
-//): kotlin.collections.MutableMap<String, LineSegment<DoubleVector2D>> {
-//    val R1 = startCircle.radius
-//    val R2 = terminalCircle.radius
-//    val line = LineSegment(startCircle.center, terminalCircle.center)
-//    val d = line.begin.distanceTo(line.end)
-//    val angle1 = atan2(terminalCircle.center.x - startCircle.center.x, terminalCircle.center.y - startCircle.center.y)
-//    var r: Double
-//    var angle2: Double
-//    val routes = mapOf("RSR" to Pair(R1, R2),
-//        "RSL" to Pair(R1, -R2),
-//        "LSR" to Pair(-R1, R2),
-//        "LSL" to Pair(-R1, -R2))
-//    val segments = mutableMapOf<String, LineSegment<DoubleVector2D>>()
-//    for ((route, r1r2) in routes) {
-//        val r1 = r1r2.first
-//        val r2 = r1r2.second
-//        r = if (r1.sign == r2.sign) {
-//            r1.absoluteValue - r2.absoluteValue
-//        } else {
-//            r1.absoluteValue + r2.absoluteValue
-//        }
-//        val L = (d * d - r * r).pow(0.5)
-//        angle2 = if (r1.absoluteValue > r2.absoluteValue) {
-//            angle1 + r1.sign * atan2(r.absoluteValue, L)
-//        } else {
-//            angle1 - r2.sign * atan2(r.absoluteValue, L)
-//        }
-//        val W = vector(-cos(angle2), sin(angle2))
-//        segments[route] = LineSegment(add(startCircle.center, scale(W, r1)),
-//            add(terminalCircle.center, scale(W, r2)))
-//    }
-//    return segments
-//}
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt
index fd3002e19..214495dfe 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.geometry
 
+import space.kscience.kmath.geometry.Euclidean2DSpace.equalLineSegments
 import space.kscience.kmath.geometry.Euclidean2DSpace.vector
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -15,7 +16,12 @@ class TangentTest {
     fun tangent() {
         val c1 = Circle2D(vector(0.0, 0.0), 1.0)
         val c2 = Circle2D(vector(4.0, 0.0), 1.0)
-        val routes = arrayListOf<String>("RSR", "RSL", "LSR", "LSL")
+        val routes = arrayListOf<DubinsRoutes>(
+            DubinsRoutes.RSR,
+            DubinsRoutes.RSL,
+            DubinsRoutes.LSR,
+            DubinsRoutes.LSL
+        )
         val segments = arrayListOf<LineSegment<DoubleVector2D>>(
             LineSegment<DoubleVector2D>(begin = vector(0.0, 1.0),
                 end = vector(4.0, 1.0)),
-- 
2.34.1


From c342c5cd7835c92a7ccd26d07872b8018f7980f2 Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Wed, 15 Feb 2023 17:53:32 +0300
Subject: [PATCH 648/713] tangentsToCircle fixed

---
 .../space/kscience/kmath/geometry/Circle2D.kt | 40 ----------
 .../kscience/kmath/geometry/TangentTest.kt    | 80 +++++++++----------
 .../kscience/kmath/trajectory/Tangent.kt      | 55 +++++++++++++
 .../kmath/trajectory/segments/TangentTest.kt  | 48 +++++++++++
 4 files changed, 143 insertions(+), 80 deletions(-)
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Tangent.kt
 create mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/TangentTest.kt

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
index df25dcbea..d37ed45c0 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Circle2D.kt
@@ -18,45 +18,5 @@ public data class Circle2D(
     public val radius: Double
 )
 
-public enum class DubinsRoutes {
-    RSR, RSL, LSR, LSL
-}
-
-public fun Circle2D.tangentsToCircle(other: Circle2D): Map<DubinsRoutes, LineSegment<DoubleVector2D>> {
-    val R1 = this.radius
-    val R2 = other.radius
-    val line = LineSegment(this.center, other.center)
-    val d = line.begin.distanceTo(line.end)
-    val angle1 = atan2(other.center.x - this.center.x, other.center.y - this.center.y)
-    var r: Double
-    var angle2: Double
-    val routes = mapOf(
-        DubinsRoutes.RSR to Pair(R1, R2),
-        DubinsRoutes.RSL to Pair(R1, -R2),
-        DubinsRoutes.LSR to Pair(-R1, R2),
-        DubinsRoutes.LSL to Pair(-R1, -R2))
-    val segments = mutableMapOf<DubinsRoutes, LineSegment<DoubleVector2D>>()
-    for ((route, r1r2) in routes) {
-        val r1 = r1r2.first
-        val r2 = r1r2.second
-        r = if (r1.sign == r2.sign) {
-            r1.absoluteValue - r2.absoluteValue
-        } else {
-            r1.absoluteValue + r2.absoluteValue
-        }
-        val L = (d * d - r * r).pow(0.5)
-        angle2 = if (r1.absoluteValue > r2.absoluteValue) {
-            angle1 + r1.sign * atan2(r.absoluteValue, L)
-        } else {
-            angle1 - r2.sign * atan2(r.absoluteValue, L)
-        }
-        val W = Euclidean2DSpace.vector(-cos(angle2), sin(angle2))
-        segments[route] = LineSegment(
-            Euclidean2DSpace.add(this.center, Euclidean2DSpace.scale(W, r1)),
-            Euclidean2DSpace.add(other.center, Euclidean2DSpace.scale(W, r2))
-        )
-    }
-    return segments
-}
 
 public val Circle2D.circumference: Double get() = radius * 2 * PI
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt
index 214495dfe..4ffd4dcab 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt
@@ -3,43 +3,43 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.geometry
-
-import space.kscience.kmath.geometry.Euclidean2DSpace.equalLineSegments
-import space.kscience.kmath.geometry.Euclidean2DSpace.vector
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-class TangentTest {
-    @Test
-    fun tangent() {
-        val c1 = Circle2D(vector(0.0, 0.0), 1.0)
-        val c2 = Circle2D(vector(4.0, 0.0), 1.0)
-        val routes = arrayListOf<DubinsRoutes>(
-            DubinsRoutes.RSR,
-            DubinsRoutes.RSL,
-            DubinsRoutes.LSR,
-            DubinsRoutes.LSL
-        )
-        val segments = arrayListOf<LineSegment<DoubleVector2D>>(
-            LineSegment<DoubleVector2D>(begin = vector(0.0, 1.0),
-                end = vector(4.0, 1.0)),
-            LineSegment<DoubleVector2D>(begin = vector(0.5, 0.8660254),
-                end = vector(3.5, -0.8660254)),
-            LineSegment<DoubleVector2D>(begin = vector(0.5, -0.8660254),
-                end = vector(3.5, 0.8660254)),
-            LineSegment<DoubleVector2D>(begin = vector(0.0, -1.0),
-                end = vector(4.0, -1.0))
-        )
-
-        val tangentMap = c1.tangentsToCircle(c2)
-        val tangentMapKeys = tangentMap.keys.toList()
-        val tangentMapValues = tangentMap.values.toList()
-
-        assertEquals(routes, tangentMapKeys)
-        for (i in segments.indices) {
-            assertTrue(equalLineSegments(segments[i], tangentMapValues[i]))
-        }
-    }
-}
\ No newline at end of file
+//package space.kscience.kmath.geometry
+//
+//import space.kscience.kmath.geometry.Euclidean2DSpace.equalLineSegments
+//import space.kscience.kmath.geometry.Euclidean2DSpace.vector
+//import kotlin.test.Test
+//import kotlin.test.assertEquals
+//import kotlin.test.assertTrue
+//
+//class TangentTest {
+//    @Test
+//    fun tangent() {
+//        val c1 = Circle2D(vector(0.0, 0.0), 1.0)
+//        val c2 = Circle2D(vector(4.0, 0.0), 1.0)
+//        val routes = arrayListOf<DubinsRoutes>(
+//            DubinsRoutes.RSR,
+//            DubinsRoutes.RSL,
+//            DubinsRoutes.LSR,
+//            DubinsRoutes.LSL
+//        )
+//        val segments = arrayListOf<LineSegment<DoubleVector2D>>(
+//            LineSegment<DoubleVector2D>(begin = vector(0.0, 1.0),
+//                end = vector(4.0, 1.0)),
+//            LineSegment<DoubleVector2D>(begin = vector(0.5, 0.8660254),
+//                end = vector(3.5, -0.8660254)),
+//            LineSegment<DoubleVector2D>(begin = vector(0.5, -0.8660254),
+//                end = vector(3.5, 0.8660254)),
+//            LineSegment<DoubleVector2D>(begin = vector(0.0, -1.0),
+//                end = vector(4.0, -1.0))
+//        )
+//
+//        val tangentMap = c1.tangentsToCircle(c2)
+//        val tangentMapKeys = tangentMap.keys.toList()
+//        val tangentMapValues = tangentMap.values.toList()
+//
+//        assertEquals(routes, tangentMapKeys)
+//        for (i in segments.indices) {
+//            assertTrue(equalLineSegments(segments[i], tangentMapValues[i]))
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Tangent.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Tangent.kt
new file mode 100644
index 000000000..9546a8d64
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Tangent.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory
+
+import space.kscience.kmath.geometry.Circle2D
+import space.kscience.kmath.geometry.DoubleVector2D
+import space.kscience.kmath.geometry.Euclidean2DSpace
+import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
+import space.kscience.kmath.geometry.LineSegment
+import kotlin.math.*
+
+public enum class DubinsRoutes {
+    RSR, RSL, LSR, LSL
+}
+
+public fun Circle2D.tangentsToCircle(other: Circle2D): Map<DubinsRoutes, LineSegment<DoubleVector2D>> {
+    val R1 = this.radius
+    val R2 = other.radius
+    val line = LineSegment(this.center, other.center)
+    val d = line.begin.distanceTo(line.end)
+    val angle1 = atan2(other.center.x - this.center.x, other.center.y - this.center.y)
+    var r: Double
+    var angle2: Double
+    val routes = mapOf(
+        DubinsRoutes.RSR to Pair(R1, R2),
+        DubinsRoutes.RSL to Pair(R1, -R2),
+        DubinsRoutes.LSR to Pair(-R1, R2),
+        DubinsRoutes.LSL to Pair(-R1, -R2)
+    )
+    val segments = mutableMapOf<DubinsRoutes, LineSegment<DoubleVector2D>>()
+    for ((route, r1r2) in routes) {
+        val r1 = r1r2.first
+        val r2 = r1r2.second
+        r = if (r1.sign == r2.sign) {
+            r1.absoluteValue - r2.absoluteValue
+        } else {
+            r1.absoluteValue + r2.absoluteValue
+        }
+        val L = (d * d - r * r).pow(0.5)
+        angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+            angle1 + r1.sign * atan2(r.absoluteValue, L)
+        } else {
+            angle1 - r2.sign * atan2(r.absoluteValue, L)
+        }
+        val W = Euclidean2DSpace.vector(-cos(angle2), sin(angle2))
+        segments[route] = LineSegment(
+            Euclidean2DSpace.add(this.center, Euclidean2DSpace.scale(W, r1)),
+            Euclidean2DSpace.add(other.center, Euclidean2DSpace.scale(W, r2))
+        )
+    }
+    return segments
+}
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/TangentTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/TangentTest.kt
new file mode 100644
index 000000000..cfa2fa52b
--- /dev/null
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/TangentTest.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory
+
+import space.kscience.kmath.geometry.Circle2D
+import space.kscience.kmath.geometry.DoubleVector2D
+import space.kscience.kmath.geometry.Euclidean2DSpace.equalLineSegments
+import space.kscience.kmath.geometry.Euclidean2DSpace.vector
+import space.kscience.kmath.geometry.LineSegment
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class TangentTest {
+    @Test
+    fun tangent() {
+        val c1 = Circle2D(vector(0.0, 0.0), 1.0)
+        val c2 = Circle2D(vector(4.0, 0.0), 1.0)
+        val routes = arrayListOf<DubinsRoutes>(
+            DubinsRoutes.RSR,
+            DubinsRoutes.RSL,
+            DubinsRoutes.LSR,
+            DubinsRoutes.LSL
+        )
+        val segments = arrayListOf<LineSegment<DoubleVector2D>>(
+            LineSegment<DoubleVector2D>(begin = vector(0.0, 1.0),
+                end = vector(4.0, 1.0)),
+            LineSegment<DoubleVector2D>(begin = vector(0.5, 0.8660254),
+                end = vector(3.5, -0.8660254)),
+            LineSegment<DoubleVector2D>(begin = vector(0.5, -0.8660254),
+                end = vector(3.5, 0.8660254)),
+            LineSegment<DoubleVector2D>(begin = vector(0.0, -1.0),
+                end = vector(4.0, -1.0))
+        )
+
+        val tangentMap = c1.tangentsToCircle(c2)
+        val tangentMapKeys = tangentMap.keys.toList()
+        val tangentMapValues = tangentMap.values.toList()
+
+        assertEquals(routes, tangentMapKeys)
+        for (i in segments.indices) {
+            assertTrue(equalLineSegments(segments[i], tangentMapValues[i]))
+        }
+    }
+}
\ No newline at end of file
-- 
2.34.1


From 8998a394b34e6946f820d27521b40cd67ba3a33f Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Wed, 15 Feb 2023 17:55:39 +0300
Subject: [PATCH 649/713] tangentsToCircle fixed

---
 .../space/kscience/kmath/geometry/Line.kt     |  1 -
 .../kscience/kmath/geometry/TangentTest.kt    | 45 -------------------
 2 files changed, 46 deletions(-)
 delete mode 100644 kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
index 6413edce9..adc3a8b85 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
@@ -27,7 +27,6 @@ public fun <V : Vector> LineSegment<V>.line(algebra: GeometrySpace<V>): Line<V>
     Line(begin, end - begin)
 }
 
-
 public fun Double.equalFloat(other: Double, maxFloatDelta: Double = 0.000001):
         Boolean = kotlin.math.abs(this - other) < maxFloatDelta
 
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt
deleted file mode 100644
index 4ffd4dcab..000000000
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/TangentTest.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2018-2023 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-//package space.kscience.kmath.geometry
-//
-//import space.kscience.kmath.geometry.Euclidean2DSpace.equalLineSegments
-//import space.kscience.kmath.geometry.Euclidean2DSpace.vector
-//import kotlin.test.Test
-//import kotlin.test.assertEquals
-//import kotlin.test.assertTrue
-//
-//class TangentTest {
-//    @Test
-//    fun tangent() {
-//        val c1 = Circle2D(vector(0.0, 0.0), 1.0)
-//        val c2 = Circle2D(vector(4.0, 0.0), 1.0)
-//        val routes = arrayListOf<DubinsRoutes>(
-//            DubinsRoutes.RSR,
-//            DubinsRoutes.RSL,
-//            DubinsRoutes.LSR,
-//            DubinsRoutes.LSL
-//        )
-//        val segments = arrayListOf<LineSegment<DoubleVector2D>>(
-//            LineSegment<DoubleVector2D>(begin = vector(0.0, 1.0),
-//                end = vector(4.0, 1.0)),
-//            LineSegment<DoubleVector2D>(begin = vector(0.5, 0.8660254),
-//                end = vector(3.5, -0.8660254)),
-//            LineSegment<DoubleVector2D>(begin = vector(0.5, -0.8660254),
-//                end = vector(3.5, 0.8660254)),
-//            LineSegment<DoubleVector2D>(begin = vector(0.0, -1.0),
-//                end = vector(4.0, -1.0))
-//        )
-//
-//        val tangentMap = c1.tangentsToCircle(c2)
-//        val tangentMapKeys = tangentMap.keys.toList()
-//        val tangentMapValues = tangentMap.values.toList()
-//
-//        assertEquals(routes, tangentMapKeys)
-//        for (i in segments.indices) {
-//            assertTrue(equalLineSegments(segments[i], tangentMapValues[i]))
-//        }
-//    }
-//}
\ No newline at end of file
-- 
2.34.1


From 7d897ad8cb6758b57d9bc08d3ec7250caae944dc Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 16 Feb 2023 10:29:12 +0300
Subject: [PATCH 650/713] Cleanup after circle tangent changes

---
 .../kmath/geometry/Euclidean2DSpace.kt        |  7 ---
 .../space/kscience/kmath/geometry/Line.kt     |  3 -
 .../kscience/kmath/geometry/floatPrecision.kt | 38 +++++++++++++
 .../kscience/kmath/trajectory/Tangent.kt      | 55 ------------------
 .../kscience/kmath/trajectory/tangent.kt      | 53 ++++++++++++++++++
 .../kscience/kmath/trajectory/TangentTest.kt  | 56 +++++++++++++++++++
 .../kmath/trajectory/segments/TangentTest.kt  | 48 ----------------
 7 files changed, 147 insertions(+), 113 deletions(-)
 create mode 100644 kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/floatPrecision.kt
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Tangent.kt
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
 create mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
 delete mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/TangentTest.kt

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
index dc05f6648..3df8dba7b 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean2DSpace.kt
@@ -85,13 +85,6 @@ public object Euclidean2DSpace : GeometrySpace<DoubleVector2D>,
     override fun scale(a: DoubleVector2D, value: Double): DoubleVector2D = vector(a.x * value, a.y * value)
     override fun DoubleVector2D.dot(other: DoubleVector2D): Double = x * other.x + y * other.y
 
-    public fun equalLineSegments(line1: LineSegment<DoubleVector2D>, line2: LineSegment<DoubleVector2D>): Boolean {
-        val maxFloatDelta = 0.000001
-        return line1.begin.x.equalFloat(line2.begin.x) && line1.begin.y.equalFloat(line2.begin.y) &&
-                line1.end.x.equalFloat(line2.end.x) && line1.end.y.equalFloat(line2.end.y)
-    }
-
-
     public val xAxis: DoubleVector2D = vector(1.0, 0.0)
     public val yAxis: DoubleVector2D = vector(0.0, 1.0)
 }
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
index adc3a8b85..ab322ddca 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
@@ -27,8 +27,5 @@ public fun <V : Vector> LineSegment<V>.line(algebra: GeometrySpace<V>): Line<V>
     Line(begin, end - begin)
 }
 
-public fun Double.equalFloat(other: Double, maxFloatDelta: Double = 0.000001):
-        Boolean = kotlin.math.abs(this - other) < maxFloatDelta
-
 public typealias LineSegment2D = LineSegment<DoubleVector2D>
 public typealias LineSegment3D = LineSegment<DoubleVector3D>
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/floatPrecision.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/floatPrecision.kt
new file mode 100644
index 000000000..023355a0f
--- /dev/null
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/floatPrecision.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.geometry
+
+internal const val defaultPrecision = 1e-6
+
+public fun Double.equalsFloat(other: Double, precision: Double = defaultPrecision): Boolean =
+    kotlin.math.abs(this - other) < precision
+
+public fun Double.equalsFloat(other: Float, precision: Double = defaultPrecision): Boolean =
+    kotlin.math.abs(this - other) < precision
+
+public fun <V : Vector> V.equalsVector(
+    space: GeometrySpace<V>,
+    other: V,
+    precision: Double = defaultPrecision,
+): Boolean = with(space) {
+    norm(this@equalsVector - other) < precision
+}
+
+public fun Float64Vector2D.equalsVector(
+    other: Float64Vector2D,
+    precision: Double = defaultPrecision,
+): Boolean = equalsVector(Euclidean2DSpace, other, precision)
+
+public fun Float64Vector3D.equalsVector(
+    other: Float64Vector3D,
+    precision: Double = defaultPrecision,
+): Boolean = equalsVector(Euclidean3DSpace, other, precision)
+
+public fun <V : Vector> LineSegment<V>.equalsLine(
+    space: GeometrySpace<V>,
+    other: LineSegment<V>,
+    precision: Double = defaultPrecision,
+): Boolean = begin.equalsVector(space, other.begin, precision) && end.equalsVector(space, other.end, precision)
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Tangent.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Tangent.kt
deleted file mode 100644
index 9546a8d64..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Tangent.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2018-2023 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory
-
-import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.DoubleVector2D
-import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.geometry.LineSegment
-import kotlin.math.*
-
-public enum class DubinsRoutes {
-    RSR, RSL, LSR, LSL
-}
-
-public fun Circle2D.tangentsToCircle(other: Circle2D): Map<DubinsRoutes, LineSegment<DoubleVector2D>> {
-    val R1 = this.radius
-    val R2 = other.radius
-    val line = LineSegment(this.center, other.center)
-    val d = line.begin.distanceTo(line.end)
-    val angle1 = atan2(other.center.x - this.center.x, other.center.y - this.center.y)
-    var r: Double
-    var angle2: Double
-    val routes = mapOf(
-        DubinsRoutes.RSR to Pair(R1, R2),
-        DubinsRoutes.RSL to Pair(R1, -R2),
-        DubinsRoutes.LSR to Pair(-R1, R2),
-        DubinsRoutes.LSL to Pair(-R1, -R2)
-    )
-    val segments = mutableMapOf<DubinsRoutes, LineSegment<DoubleVector2D>>()
-    for ((route, r1r2) in routes) {
-        val r1 = r1r2.first
-        val r2 = r1r2.second
-        r = if (r1.sign == r2.sign) {
-            r1.absoluteValue - r2.absoluteValue
-        } else {
-            r1.absoluteValue + r2.absoluteValue
-        }
-        val L = (d * d - r * r).pow(0.5)
-        angle2 = if (r1.absoluteValue > r2.absoluteValue) {
-            angle1 + r1.sign * atan2(r.absoluteValue, L)
-        } else {
-            angle1 - r2.sign * atan2(r.absoluteValue, L)
-        }
-        val W = Euclidean2DSpace.vector(-cos(angle2), sin(angle2))
-        segments[route] = LineSegment(
-            Euclidean2DSpace.add(this.center, Euclidean2DSpace.scale(W, r1)),
-            Euclidean2DSpace.add(other.center, Euclidean2DSpace.scale(W, r2))
-        )
-    }
-    return segments
-}
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
new file mode 100644
index 000000000..70a1ac696
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory
+
+import space.kscience.kmath.geometry.Circle2D
+import space.kscience.kmath.geometry.DoubleVector2D
+import space.kscience.kmath.geometry.Euclidean2DSpace
+import space.kscience.kmath.geometry.LineSegment
+import kotlin.math.*
+
+public fun Circle2D.tangentsToCircle(
+    other: Circle2D,
+): Map<DubinsPath.Type, LineSegment<DoubleVector2D>> = with(Euclidean2DSpace) {
+    val line = LineSegment(center, other.center)
+    val d = line.begin.distanceTo(line.end)
+    val angle1 = atan2(other.center.x - center.x, other.center.y - center.y)
+    var r: Double
+    var angle2: Double
+    val routes = mapOf(
+        DubinsPath.Type.RSR to Pair(radius, other.radius),
+        DubinsPath.Type.RSL to Pair(radius, -other.radius),
+        DubinsPath.Type.LSR to Pair(-radius, other.radius),
+        DubinsPath.Type.LSL to Pair(-radius, -other.radius)
+    )
+    return buildMap {
+        for ((route, r1r2) in routes) {
+            val r1 = r1r2.first
+            val r2 = r1r2.second
+            r = if (r1.sign == r2.sign) {
+                r1.absoluteValue - r2.absoluteValue
+            } else {
+                r1.absoluteValue + r2.absoluteValue
+            }
+            val l = (d * d - r * r).pow(0.5)
+            angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+                angle1 + r1.sign * atan2(r.absoluteValue, l)
+            } else {
+                angle1 - r2.sign * atan2(r.absoluteValue, l)
+            }
+            val w = vector(-cos(angle2), sin(angle2))
+            put(
+                route,
+                LineSegment(
+                    center + w * r1,
+                    other.center + w * r2
+                )
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
new file mode 100644
index 000000000..c1cf2f800
--- /dev/null
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory
+
+import space.kscience.kmath.geometry.Circle2D
+import space.kscience.kmath.geometry.Euclidean2DSpace
+import space.kscience.kmath.geometry.Euclidean2DSpace.vector
+import space.kscience.kmath.geometry.LineSegment
+import space.kscience.kmath.geometry.equalsLine
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class TangentTest {
+    @Test
+    fun tangent() {
+        val c1 = Circle2D(vector(0.0, 0.0), 1.0)
+        val c2 = Circle2D(vector(4.0, 0.0), 1.0)
+        val routes = listOf(
+            DubinsPath.Type.RSR,
+            DubinsPath.Type.RSL,
+            DubinsPath.Type.LSR,
+            DubinsPath.Type.LSL
+        )
+        val segments = listOf(
+            LineSegment(
+                begin = vector(0.0, 1.0),
+                end = vector(4.0, 1.0)
+            ),
+            LineSegment(
+                begin = vector(0.5, 0.8660254),
+                end = vector(3.5, -0.8660254)
+            ),
+            LineSegment(
+                begin = vector(0.5, -0.8660254),
+                end = vector(3.5, 0.8660254)
+            ),
+            LineSegment(
+                begin = vector(0.0, -1.0),
+                end = vector(4.0, -1.0)
+            )
+        )
+
+        val tangentMap = c1.tangentsToCircle(c2)
+        val tangentMapKeys = tangentMap.keys.toList()
+        val tangentMapValues = tangentMap.values.toList()
+
+        assertEquals(routes, tangentMapKeys)
+        for (i in segments.indices) {
+            assertTrue(segments[i].equalsLine(Euclidean2DSpace, tangentMapValues[i]))
+        }
+    }
+}
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/TangentTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/TangentTest.kt
deleted file mode 100644
index cfa2fa52b..000000000
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/TangentTest.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2018-2023 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory
-
-import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.DoubleVector2D
-import space.kscience.kmath.geometry.Euclidean2DSpace.equalLineSegments
-import space.kscience.kmath.geometry.Euclidean2DSpace.vector
-import space.kscience.kmath.geometry.LineSegment
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-class TangentTest {
-    @Test
-    fun tangent() {
-        val c1 = Circle2D(vector(0.0, 0.0), 1.0)
-        val c2 = Circle2D(vector(4.0, 0.0), 1.0)
-        val routes = arrayListOf<DubinsRoutes>(
-            DubinsRoutes.RSR,
-            DubinsRoutes.RSL,
-            DubinsRoutes.LSR,
-            DubinsRoutes.LSL
-        )
-        val segments = arrayListOf<LineSegment<DoubleVector2D>>(
-            LineSegment<DoubleVector2D>(begin = vector(0.0, 1.0),
-                end = vector(4.0, 1.0)),
-            LineSegment<DoubleVector2D>(begin = vector(0.5, 0.8660254),
-                end = vector(3.5, -0.8660254)),
-            LineSegment<DoubleVector2D>(begin = vector(0.5, -0.8660254),
-                end = vector(3.5, 0.8660254)),
-            LineSegment<DoubleVector2D>(begin = vector(0.0, -1.0),
-                end = vector(4.0, -1.0))
-        )
-
-        val tangentMap = c1.tangentsToCircle(c2)
-        val tangentMapKeys = tangentMap.keys.toList()
-        val tangentMapValues = tangentMap.values.toList()
-
-        assertEquals(routes, tangentMapKeys)
-        for (i in segments.indices) {
-            assertTrue(equalLineSegments(segments[i], tangentMapValues[i]))
-        }
-    }
-}
\ No newline at end of file
-- 
2.34.1


From 67316c4a70cee2814ef2e65dece45077bef7c894 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 16 Feb 2023 10:39:25 +0300
Subject: [PATCH 651/713] Add documentation after circle tangent changes

---
 .../kscience/kmath/geometry/GeometrySpace.kt  |  7 ++++
 .../kscience/kmath/geometry/floatPrecision.kt | 32 +++++++++++++++----
 .../kscience/kmath/trajectory/tangent.kt      |  4 +++
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
index 854d84b65..d6d7e5725 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/GeometrySpace.kt
@@ -21,4 +21,11 @@ public interface GeometrySpace<V : Vector> : Group<V>, ScaleOperations<V>, Norm<
      * Scalar product
      */
     public infix fun V.dot(other: V): Double
+
+    public companion object{
+        /**
+         * Default precision for geometry objects comparison
+         */
+        internal const val DEFAULT_PRECISION = 1e-6
+    }
 }
\ No newline at end of file
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/floatPrecision.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/floatPrecision.kt
index 023355a0f..ea46ab90f 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/floatPrecision.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/floatPrecision.kt
@@ -5,34 +5,52 @@
 
 package space.kscience.kmath.geometry
 
-internal const val defaultPrecision = 1e-6
+import space.kscience.kmath.geometry.GeometrySpace.Companion.DEFAULT_PRECISION
 
-public fun Double.equalsFloat(other: Double, precision: Double = defaultPrecision): Boolean =
+/**
+ * Float equality within given [precision]
+ */
+public fun Double.equalsFloat(other: Double, precision: Double = DEFAULT_PRECISION): Boolean =
     kotlin.math.abs(this - other) < precision
 
-public fun Double.equalsFloat(other: Float, precision: Double = defaultPrecision): Boolean =
+/**
+ * Float equality within given [precision]
+ */
+public fun Double.equalsFloat(other: Float, precision: Double = DEFAULT_PRECISION): Boolean =
     kotlin.math.abs(this - other) < precision
 
+/**
+ * Vector equality within given [precision] (using [GeometrySpace.norm] provided by the space
+ */
 public fun <V : Vector> V.equalsVector(
     space: GeometrySpace<V>,
     other: V,
-    precision: Double = defaultPrecision,
+    precision: Double = DEFAULT_PRECISION,
 ): Boolean = with(space) {
     norm(this@equalsVector - other) < precision
 }
 
+/**
+ * Vector equality using Euclidian L2 norm and given [precision]
+ */
 public fun Float64Vector2D.equalsVector(
     other: Float64Vector2D,
-    precision: Double = defaultPrecision,
+    precision: Double = DEFAULT_PRECISION,
 ): Boolean = equalsVector(Euclidean2DSpace, other, precision)
 
+/**
+ * Vector equality using Euclidian L2 norm and given [precision]
+ */
 public fun Float64Vector3D.equalsVector(
     other: Float64Vector3D,
-    precision: Double = defaultPrecision,
+    precision: Double = DEFAULT_PRECISION,
 ): Boolean = equalsVector(Euclidean3DSpace, other, precision)
 
+/**
+ * Line equality using [GeometrySpace.norm] provided by the [space] and given [precision]
+ */
 public fun <V : Vector> LineSegment<V>.equalsLine(
     space: GeometrySpace<V>,
     other: LineSegment<V>,
-    precision: Double = defaultPrecision,
+    precision: Double = DEFAULT_PRECISION,
 ): Boolean = begin.equalsVector(space, other.begin, precision) && end.equalsVector(space, other.end, precision)
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
index 70a1ac696..cf5bcd11d 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
@@ -11,6 +11,10 @@ import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.LineSegment
 import kotlin.math.*
 
+/**
+ * Create inner and outer tangents between two circles.
+ * This method returns a map of segments using [DubinsPath] connection type notation.
+ */
 public fun Circle2D.tangentsToCircle(
     other: Circle2D,
 ): Map<DubinsPath.Type, LineSegment<DoubleVector2D>> = with(Euclidean2DSpace) {
-- 
2.34.1


From ed4aa47913c2cc982e9a325e3635774d00d01dec Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 16 Feb 2023 10:57:24 +0300
Subject: [PATCH 652/713] Minor refactoring of tangents

---
 .../space/kscience/kmath/trajectory/Trajectory2D.kt    |  4 +---
 .../space/kscience/kmath/trajectory/TangentTest.kt     |  2 +-
 .../kscience/kmath/trajectory/dubins/DubinsTests.kt    |  3 ++-
 .../kotlin/space/kscience/kmath/trajectory/math.kt     | 10 +++-------
 .../kscience/kmath/trajectory/segments/ArcTests.kt     |  7 ++++++-
 .../kscience/kmath/trajectory/segments/CircleTests.kt  |  3 +--
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
index 7e0a8c1c0..e5f60e025 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
@@ -100,9 +100,7 @@ public data class CircleTrajectory2D(
             val pose1 = calculatePose(start, s1.bearing, direction)
             val pose2 = calculatePose(end, s2.bearing, direction)
             val trajectory = CircleTrajectory2D(Circle2D(center, s1.length), pose1, pose2)
-            if (trajectory.direction != direction) {
-                error("Trajectory direction mismatch")
-            }
+            if (trajectory.direction != direction) error("Trajectory direction mismatch")
             return trajectory
         }
     }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
index c1cf2f800..42442a55f 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
@@ -16,7 +16,7 @@ import kotlin.test.assertTrue
 
 class TangentTest {
     @Test
-    fun tangent() {
+    fun tangents() {
         val c1 = Circle2D(vector(0.0, 0.0), 1.0)
         val c2 = Circle2D(vector(4.0, 0.0), 1.0)
         val routes = listOf(
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
index 0e14ae736..481ea4786 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.trajectory.dubins
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
+import space.kscience.kmath.geometry.equalsFloat
 import space.kscience.kmath.trajectory.*
 import kotlin.test.Test
 import kotlin.test.assertNotNull
@@ -39,7 +40,7 @@ class DubinsTests {
             val path = dubins.find { p -> DubinsPath.trajectoryTypeOf(p) === it.key }
             assertNotNull(path, "Path ${it.key} not found")
             println("${it.key}: ${path.length}")
-            assertTrue(it.value.equalFloat(path.length))
+            assertTrue(it.value.equalsFloat(path.length))
 
             val a = path.segments[0] as CircleTrajectory2D
             val b = path.segments[1]
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
index c69ad24f1..24685f528 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
@@ -6,20 +6,16 @@
 package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
+import space.kscience.kmath.geometry.equalsFloat
 import space.kscience.kmath.geometry.radians
 import space.kscience.kmath.geometry.sin
-import kotlin.math.PI
-import kotlin.math.abs
 
-const val maxFloatDelta = 0.000001
 
-fun Double.radiansToDegrees() = this * 180 / PI
-
-fun Double.equalFloat(other: Double) = abs(this - other) < maxFloatDelta
 fun DubinsPose2D.equalsFloat(other: DubinsPose2D) =
-    x.equalFloat(other.x) && y.equalFloat(other.y) && bearing.radians.equalFloat(other.bearing.radians)
+    x.equalsFloat(other.x) && y.equalsFloat(other.y) && bearing.radians.equalsFloat(other.bearing.radians)
 
 fun StraightTrajectory2D.inverse() = StraightTrajectory2D(end, start)
+
 fun StraightTrajectory2D.shift(shift: Int, width: Double): StraightTrajectory2D = with(Euclidean2DSpace) {
     val dX = width * sin(inverse().bearing)
     val dY = width * sin(bearing)
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
index 643f9eaaa..7594aa046 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
@@ -18,7 +18,12 @@ class ArcTests {
     @Test
     fun arcTest() = with(Euclidean2DSpace){
         val circle = Circle2D(vector(0.0, 0.0), 2.0)
-        val arc = CircleTrajectory2D.of(circle.center, vector(-2.0, 0.0), vector(0.0, 2.0), CircleTrajectory2D.Direction.RIGHT)
+        val arc = CircleTrajectory2D.of(
+            circle.center,
+            vector(-2.0, 0.0),
+            vector(0.0, 2.0),
+            CircleTrajectory2D.Direction.RIGHT
+        )
         assertEquals(circle.circumference / 4, arc.length, 1.0)
         assertEquals(0.0, arc.start.bearing.degrees)
         assertEquals(90.0, arc.end.bearing.degrees)
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
index 5321fb1a1..27434b874 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
@@ -8,7 +8,6 @@ package space.kscience.kmath.trajectory.segments
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.circumference
-import space.kscience.kmath.trajectory.maxFloatDelta
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -20,6 +19,6 @@ class CircleTests {
         val radius = 2.0
         val expectedCircumference = 12.56637
         val circle = Circle2D(center, radius)
-        assertEquals(expectedCircumference, circle.circumference, maxFloatDelta)
+        assertEquals(expectedCircumference, circle.circumference)
     }
 }
-- 
2.34.1


From cc0fb2a718a3981332328b75ce2a86b4610b161d Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Thu, 16 Feb 2023 18:47:42 +0300
Subject: [PATCH 653/713] non-existence of tangents throws exception

---
 .../kscience/kmath/trajectory/tangent.kt      | 31 +++++++++++--------
 .../kscience/kmath/trajectory/TangentTest.kt  | 25 +++++++++++++++
 2 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
index cf5bcd11d..945b140c2 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
@@ -38,20 +38,25 @@ public fun Circle2D.tangentsToCircle(
             } else {
                 r1.absoluteValue + r2.absoluteValue
             }
-            val l = (d * d - r * r).pow(0.5)
-            angle2 = if (r1.absoluteValue > r2.absoluteValue) {
-                angle1 + r1.sign * atan2(r.absoluteValue, l)
-            } else {
-                angle1 - r2.sign * atan2(r.absoluteValue, l)
-            }
-            val w = vector(-cos(angle2), sin(angle2))
-            put(
-                route,
-                LineSegment(
-                    center + w * r1,
-                    other.center + w * r2
+            if (d * d > r * r) {
+                val l = (d * d - r * r).pow(0.5)
+                angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+                    angle1 + r1.sign * atan2(r.absoluteValue, l)
+                } else {
+                    angle1 - r2.sign * atan2(r.absoluteValue, l)
+                }
+                val w = vector(-cos(angle2), sin(angle2))
+                put(
+                    route,
+                    LineSegment(
+                        center + w * r1,
+                        other.center + w * r2
+                    )
                 )
-            )
+            }
+            else {
+                throw Exception("Circles should not be")
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
index 42442a55f..3e87b47de 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
@@ -13,6 +13,7 @@ import space.kscience.kmath.geometry.equalsLine
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
+import kotlin.test.assertFailsWith
 
 class TangentTest {
     @Test
@@ -53,4 +54,28 @@ class TangentTest {
             assertTrue(segments[i].equalsLine(Euclidean2DSpace, tangentMapValues[i]))
         }
     }
+
+    @Test
+    fun nonExistingTangents() {
+        assertFailsWith<Exception> {
+            val c1 = Circle2D(vector(0.0, 0.0), 10.0)
+            val c2 = Circle2D(vector(0.0, 0.0), 1.0)
+            val segments = c1.tangentsToCircle(c2)
+        }
+        assertFailsWith<Exception> {
+            val c1 = Circle2D(vector(0.0, 0.0), 1.0)
+            val c2 = Circle2D(vector(0.0, 0.0), 10.0)
+            val segments = c1.tangentsToCircle(c2)
+        }
+        assertFailsWith<Exception> {
+            val c1 = Circle2D(vector(0.0, 0.0), 1.0)
+            val c2 = Circle2D(vector(2.0, 0.0), 1.0)
+            val segments = c1.tangentsToCircle(c2)
+        }
+        assertFailsWith<Exception> {
+            val c1 = Circle2D(vector(0.0, 0.0), 1.0)
+            val c2 = Circle2D(vector(0.5, 0.0), 1.0)
+            val segments = c1.tangentsToCircle(c2)
+        }
+    }
 }
\ No newline at end of file
-- 
2.34.1


From 04127fc3f2b781a2e66b95b8b2d63629dca15220 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 18 Feb 2023 18:53:03 +0300
Subject: [PATCH 654/713] Fix tests

---
 gradle.properties                             |  2 +-
 .../kscience/kmath/trajectory/tangent.kt      | 48 +++++++++----------
 .../kscience/kmath/trajectory/TangentTest.kt  | 40 +++++++---------
 .../kmath/trajectory/segments/CircleTests.kt  |  2 +-
 4 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 16cdd3551..cc44b5b02 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ kotlin.native.ignoreDisabledTargets=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.14.0-kotlin-1.8.10
+toolsVersion=0.14.1-kotlin-1.8.10
 
 
 org.gradle.parallel=true
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
index 945b140c2..d3165e162 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
@@ -5,10 +5,7 @@
 
 package space.kscience.kmath.trajectory
 
-import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.DoubleVector2D
-import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.geometry.LineSegment
+import space.kscience.kmath.geometry.*
 import kotlin.math.*
 
 /**
@@ -18,10 +15,14 @@ import kotlin.math.*
 public fun Circle2D.tangentsToCircle(
     other: Circle2D,
 ): Map<DubinsPath.Type, LineSegment<DoubleVector2D>> = with(Euclidean2DSpace) {
+    //return empty map for concentric circles
+    if(center.equalsVector(other.center)) return@tangentsToCircle emptyMap()
+
+    // A line connecting centers
     val line = LineSegment(center, other.center)
-    val d = line.begin.distanceTo(line.end)
+    // Distance between centers
+    val distance = line.begin.distanceTo(line.end)
     val angle1 = atan2(other.center.x - center.x, other.center.y - center.y)
-    var r: Double
     var angle2: Double
     val routes = mapOf(
         DubinsPath.Type.RSR to Pair(radius, other.radius),
@@ -33,30 +34,27 @@ public fun Circle2D.tangentsToCircle(
         for ((route, r1r2) in routes) {
             val r1 = r1r2.first
             val r2 = r1r2.second
-            r = if (r1.sign == r2.sign) {
+            val r = if (r1.sign == r2.sign) {
                 r1.absoluteValue - r2.absoluteValue
             } else {
                 r1.absoluteValue + r2.absoluteValue
             }
-            if (d * d > r * r) {
-                val l = (d * d - r * r).pow(0.5)
-                angle2 = if (r1.absoluteValue > r2.absoluteValue) {
-                    angle1 + r1.sign * atan2(r.absoluteValue, l)
-                } else {
-                    angle1 - r2.sign * atan2(r.absoluteValue, l)
-                }
-                val w = vector(-cos(angle2), sin(angle2))
-                put(
-                    route,
-                    LineSegment(
-                        center + w * r1,
-                        other.center + w * r2
-                    )
+            if (distance <= r) TODO("Intersecting circles are not supported yet")
+            val l = sqrt(distance * distance - r * r)
+            angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+                angle1 + r1.sign * atan2(r.absoluteValue, l)
+            } else {
+                angle1 - r2.sign * atan2(r.absoluteValue, l)
+            }
+            val w = vector(-cos(angle2), sin(angle2))
+            put(
+                route,
+                LineSegment(
+                    center + w * r1,
+                    other.center + w * r2
                 )
-            }
-            else {
-                throw Exception("Circles should not be")
-            }
+            )
+
         }
     }
 }
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
index 3e87b47de..6d4493124 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
@@ -13,7 +13,6 @@ import space.kscience.kmath.geometry.equalsLine
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
-import kotlin.test.assertFailsWith
 
 class TangentTest {
     @Test
@@ -56,26 +55,23 @@ class TangentTest {
     }
 
     @Test
-    fun nonExistingTangents() {
-        assertFailsWith<Exception> {
-            val c1 = Circle2D(vector(0.0, 0.0), 10.0)
-            val c2 = Circle2D(vector(0.0, 0.0), 1.0)
-            val segments = c1.tangentsToCircle(c2)
-        }
-        assertFailsWith<Exception> {
-            val c1 = Circle2D(vector(0.0, 0.0), 1.0)
-            val c2 = Circle2D(vector(0.0, 0.0), 10.0)
-            val segments = c1.tangentsToCircle(c2)
-        }
-        assertFailsWith<Exception> {
-            val c1 = Circle2D(vector(0.0, 0.0), 1.0)
-            val c2 = Circle2D(vector(2.0, 0.0), 1.0)
-            val segments = c1.tangentsToCircle(c2)
-        }
-        assertFailsWith<Exception> {
-            val c1 = Circle2D(vector(0.0, 0.0), 1.0)
-            val c2 = Circle2D(vector(0.5, 0.0), 1.0)
-            val segments = c1.tangentsToCircle(c2)
-        }
+    fun concentric(){
+        val c1 = Circle2D(vector(0.0, 0.0), 10.0)
+        val c2 = Circle2D(vector(0.0, 0.0), 1.0)
+        assertEquals(emptyMap(), c1.tangentsToCircle(c2))
     }
+//
+//    @Test
+//    fun nonExistingTangents() {
+//        assertFailsWith<NotImplementedError> {
+//            val c1 = Circle2D(vector(0.0, 0.0), 1.0)
+//            val c2 = Circle2D(vector(2.0, 0.0), 1.0)
+//            c1.tangentsToCircle(c2)
+//        }
+//        assertFailsWith<NotImplementedError> {
+//            val c1 = Circle2D(vector(0.0, 0.0), 1.0)
+//            val c2 = Circle2D(vector(0.5, 0.0), 1.0)
+//            c1.tangentsToCircle(c2)
+//        }
+//    }
 }
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
index 27434b874..c3fca06ec 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
@@ -19,6 +19,6 @@ class CircleTests {
         val radius = 2.0
         val expectedCircumference = 12.56637
         val circle = Circle2D(center, radius)
-        assertEquals(expectedCircumference, circle.circumference)
+        assertEquals(expectedCircumference, circle.circumference, 1e-4)
     }
 }
-- 
2.34.1


From db61f7144089056ae184fd1b28c1dd0db2c5fd6f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 18 Feb 2023 19:04:07 +0300
Subject: [PATCH 655/713] update build tools

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index cc44b5b02..c3f070c2d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ kotlin.native.ignoreDisabledTargets=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.14.1-kotlin-1.8.10
+toolsVersion=0.14.2-kotlin-1.8.10
 
 
 org.gradle.parallel=true
-- 
2.34.1


From 2c13386646a6f3f38523e9546eccf38343251163 Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Wed, 1 Mar 2023 10:40:54 +0300
Subject: [PATCH 656/713] search for shortest path algorithm

---
 .../space/kscience/kmath/geometry/Line.kt     |   1 +
 .../kmath/trajectory/DubinsObstacle.kt        | 413 ++++++++++++++++++
 .../kscience/kmath/trajectory/DubinsPath.kt   | 110 +++++
 .../kscience/kmath/trajectory/tangent.kt      |  66 ++-
 4 files changed, 583 insertions(+), 7 deletions(-)
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
index ab322ddca..e593150f1 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.geometry
 
 import kotlinx.serialization.Serializable
+import space.kscience.kmath.operations.DoubleField.pow
 
 /**
  * A line formed by [base] vector of start and a [direction] vector. Direction vector is not necessarily normalized,
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
new file mode 100644
index 000000000..56aa88e4a
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
@@ -0,0 +1,413 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory
+
+import space.kscience.kmath.geometry.*
+import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
+import space.kscience.kmath.geometry.Euclidean2DSpace.minus
+import space.kscience.kmath.geometry.Euclidean2DSpace.plus
+import space.kscience.kmath.geometry.Euclidean2DSpace.times
+import space.kscience.kmath.geometry.Euclidean2DSpace.vector
+import space.kscience.kmath.geometry.Euclidean2DSpace.norm
+import space.kscience.kmath.operations.DoubleField.pow
+import kotlin.math.*
+
+public fun LineSegment2D.length(): Double {
+    return ((end.y - begin.y).pow(2.0) + (end.x - begin.x).pow(2.0)).pow(0.5)
+}
+public class DubinsObstacle(
+    public val circles: List<Circle2D>
+) {
+    public val tangents: List<DubinsTangent> = boundaryTangents().first
+    public val boundaryRoute: DubinsPath.Type = boundaryTangents().second
+    public val center: Vector2D<Double> =
+        vector(this.circles.sumOf{it.center.x} / this.circles.size,
+               this.circles.sumOf{it.center.y} / this.circles.size)
+    private fun boundaryTangents(): Pair<List<DubinsTangent>, DubinsPath.Type> {
+        // outer tangents for a polygon circles can be either lsl or rsr
+
+        fun Circle2D.dubinsTangentsToCircles(
+            other: Circle2D,
+        ): Map<DubinsPath.Type, DubinsTangent> = with(Euclidean2DSpace) {
+            val line = LineSegment(center, other.center)
+            val d = line.begin.distanceTo(line.end)
+            val angle1 = atan2(other.center.x - center.x, other.center.y - center.y)
+            var r: Double
+            var angle2: Double
+            val routes = mapOf(
+                DubinsPath.Type.RSR to Pair(radius, other.radius),
+                DubinsPath.Type.RSL to Pair(radius, -other.radius),
+                DubinsPath.Type.LSR to Pair(-radius, other.radius),
+                DubinsPath.Type.LSL to Pair(-radius, -other.radius)
+            )
+            return buildMap {
+                for ((route, r1r2) in routes) {
+                    val r1 = r1r2.first
+                    val r2 = r1r2.second
+                    r = if (r1.sign == r2.sign) {
+                        r1.absoluteValue - r2.absoluteValue
+                    } else {
+                        r1.absoluteValue + r2.absoluteValue
+                    }
+                    if (d * d > r * r) {
+                        val l = (d * d - r * r).pow(0.5)
+                        angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+                            angle1 + r1.sign * atan2(r.absoluteValue, l)
+                        } else {
+                            angle1 - r2.sign * atan2(r.absoluteValue, l)
+                        }
+                        val w = vector(-cos(angle2), sin(angle2))
+                        put(route, DubinsTangent(Circle2D(center, radius),
+                            other,
+                            this@DubinsObstacle,
+                            this@DubinsObstacle,
+                            LineSegment2D(
+                                center + w * r1,
+                                other.center + w * r2
+                            ),
+                            DubinsPath.toSimpleTypes(route))
+                        )
+                    } else {
+                        throw Exception("Circles should not intersect")
+                    }
+                }
+            }
+        }
+        val firstCircles = this.circles.slice(-this.circles.size..-1)
+        val secondCircles = this.circles.slice(-this.circles.size+1..0)
+        val lslTangents = firstCircles.zip(secondCircles)
+        {a, b -> a.dubinsTangentsToCircles(b)[DubinsPath.Type.LSL]!!}
+        val rsrTangents = firstCircles.zip(secondCircles)
+        {a, b -> a.dubinsTangentsToCircles(b)[DubinsPath.Type.RSR]!!}
+        val center = vector(
+            this.circles.sumOf { it.center.x } / this.circles.size,
+            this.circles.sumOf { it.center.y } / this.circles.size
+        )
+        val lslToCenter = lslTangents.sumOf { it.lineSegment.begin.distanceTo(center) } +
+                lslTangents.sumOf { it.lineSegment.end.distanceTo(center) }
+        val rsrToCenter = rsrTangents.sumOf { it.lineSegment.begin.distanceTo(center) } +
+                rsrTangents.sumOf { it.lineSegment.end.distanceTo(center) }
+        return if (rsrToCenter >= lslToCenter) {
+            Pair(rsrTangents, DubinsPath.Type.RSR)
+        } else {
+            Pair(lslTangents, DubinsPath.Type.LSL)
+        }
+    }
+
+    public fun nextTangent(circle: Circle2D, route: DubinsPath.Type): DubinsTangent {
+        if (route == this.boundaryRoute) {
+            for (i in this.circles.indices) {
+                if (this.circles[i] == circle) {
+                    return this.tangents[i]
+                }
+            }
+        }
+        else {
+            for (i in this.circles.indices) {
+                if (this.circles[i] == circle) {
+                    return DubinsTangent(this.circles[i],
+                                         this.circles[i-1],
+                                         this,
+                                         this,
+                                         LineSegment2D(this.tangents[i-1].lineSegment.end,
+                                                        this.tangents[i-1].lineSegment.begin),
+                                         DubinsPath.toSimpleTypes(route))
+                }
+            }
+        }
+
+    error("next tangent not found")
+    }
+
+    public fun equals(other: DubinsObstacle): Boolean {
+        return this.circles == other.circles
+    }
+}
+
+public data class DubinsTangent(val startCircle: Circle2D,
+                                val endCircle: Circle2D,
+                                val startObstacle: DubinsObstacle,
+                                val endObstacle: DubinsObstacle,
+                                val lineSegment: LineSegment2D,
+                                val route: PathTypes)
+
+public fun LineSegment2D.intersectSegment(other: LineSegment2D): Boolean {
+    fun crossProduct(v1: DoubleVector2D, v2: DoubleVector2D): Double {
+        return v1.x * v2.y - v1.y * v2.x
+    }
+    if (crossProduct(other.begin - this.begin, other.end - this.begin).sign ==
+        crossProduct(other.begin - this.end, other.end - this.end).sign) {
+        return false
+    }
+    if (crossProduct(this.begin - other.begin, this.end - other.begin).sign ==
+        crossProduct(this.begin - other.end, this.end - other.end).sign) {
+        return false
+    }
+    return true
+}
+
+public fun LineSegment2D.intersectCircle(circle: Circle2D): Boolean {
+    val a = (this.begin.x - this.end.x).pow(2.0) + (this.begin.y - this.end.y).pow(2.0)
+    val b = 2 * ((this.begin.x - this.end.x) * (this.end.x - circle.center.x) +
+            (this.begin.y - this.end.y) * (this.end.y - circle.center.y))
+    val c = (this.end.x - circle.center.x).pow(2.0) + (this.end.y - circle.center.y) -
+            circle.radius.pow(2.0)
+    val d = b.pow(2.0) - 4 * a * c
+    if (d < 1e-6) {
+        return false
+    }
+    else {
+        val t1 = (-b - d.pow(0.5)) * 0.5 / a
+        val t2 = (-b + d.pow(0.5)) * 0.5 / a
+        if (((0 < t1) and (t1 < 1)) or ((0 < t2) and (t2 < 1))) {
+            return true
+        }
+    }
+    return false
+}
+
+public fun DubinsTangent.intersectObstacle(obstacle: DubinsObstacle): Boolean {
+    for (tangent in obstacle.tangents) {
+        if (this.lineSegment.intersectSegment(tangent.lineSegment)) {
+            return true
+        }
+    }
+    for (circle in obstacle.circles) {
+        if (this.lineSegment.intersectCircle(circle)) {
+            return true
+        }
+    }
+    return false
+}
+
+public fun outerTangents(first: DubinsObstacle, second: DubinsObstacle): MutableMap<DubinsPath.Type, DubinsTangent> {
+    return buildMap {
+        for (circle1 in first.circles) {
+            for (circle2 in second.circles) {
+                for (tangent in dubinsTangentsToCircles(circle1, circle2, first, second)) {
+                    if (!(tangent.value.intersectObstacle(first))
+                        and !(tangent.value.intersectObstacle(second))) {
+                        put(
+                            tangent.key,
+                            tangent.value
+                        )
+                    }
+                }
+            }
+        }
+    }.toMutableMap()
+}
+
+public fun arcLength(circle: Circle2D,
+                     point1: DoubleVector2D,
+                     point2: DoubleVector2D,
+                     route: DubinsPath.SimpleType): Double {
+    val phi1 = atan2(point1.y - circle.center.y, point1.x - circle.center.x)
+    val phi2 = atan2(point2.y - circle.center.y, point2.x - circle.center.x)
+    var angle = 0.0
+    when (route) {
+        DubinsPath.SimpleType.L -> {
+            angle = if (phi2 >= phi1) {
+                phi2 - phi1
+            } else {
+                2 * PI + phi2 - phi1
+            }
+        }
+        DubinsPath.SimpleType.R -> {
+            angle = if (phi2 >= phi1) {
+                2 * PI - (phi2 - phi1)
+            } else {
+                -(phi2 - phi1)
+            }
+        }
+        DubinsPath.SimpleType.S -> {
+            error("L or R route is expected")
+        }
+    }
+    return circle.radius * angle
+}
+
+public fun normalVectors(v: DoubleVector2D, r: Double): Pair<DoubleVector2D, DoubleVector2D> {
+    return Pair(
+        r * vector(v.y / norm(v), -v.x / norm(v)),
+        r * vector(-v.y / norm(v), v.x / norm(v))
+    )
+}
+
+public fun constructTangentCircles(point: DoubleVector2D,
+                                   direction: DoubleVector2D,
+                                   r: Double): Map<DubinsPath.SimpleType, Circle2D> {
+    val center1 = point + normalVectors(direction, r).first
+    val center2 = point + normalVectors(direction, r).second
+    val p1 = center1 - point
+    val p2 = center2 - point
+    return if (atan2(p1.y, p1.x) - atan2(p2.y, p2.x) in listOf(PI/2, -3*PI/2)) {
+        mapOf(DubinsPath.SimpleType.L to Circle2D(center1, r),
+            DubinsPath.SimpleType.R to Circle2D(center2, r))
+    }
+    else {
+        mapOf(DubinsPath.SimpleType.L to Circle2D(center2, r),
+            DubinsPath.SimpleType.R to Circle2D(center1, r))
+    }
+}
+
+public fun sortedObstacles(currentObstacle: DubinsObstacle,
+                           obstacles: List<DubinsObstacle>): List<DubinsObstacle> {
+    return obstacles.sortedBy {norm(it.center - currentObstacle.center)}.reversed()
+}
+
+public fun tangentsAlongTheObstacle(initialCircle: Circle2D,
+                                    initialRoute: DubinsPath.Type,
+                                    finalCircle: Circle2D,
+                                    obstacle: DubinsObstacle): MutableList<DubinsTangent> {
+    val dubinsTangents = mutableListOf<DubinsTangent>()
+    var tangent = obstacle.nextTangent(initialCircle, initialRoute)
+    dubinsTangents.add(tangent)
+    while (tangent.endCircle != finalCircle) {
+        tangent = obstacle.nextTangent(tangent.endCircle, initialRoute)
+        dubinsTangents.add(tangent)
+    }
+    return dubinsTangents
+}
+
+public fun allFinished(paths: List<List<DubinsTangent>>,
+                       finalObstacle: DubinsObstacle): Boolean {
+    for (path in paths) {
+        if (path[-1].endObstacle != finalObstacle) {
+            return false
+        }
+    }
+    return true
+}
+
+public fun pathLength(path: List<DubinsTangent>): Double {
+    val tangentsLength = path.sumOf{norm(it.lineSegment.end - it.lineSegment.begin)}
+    val arcsLength = buildList<Double>{
+        for (i in 1..path.size) {
+            add(arcLength(path[i].startCircle,
+                path[i-1].lineSegment.end,
+                path[i].lineSegment.begin,
+                path[i].route[0]))
+        }
+    }.sum()
+    return tangentsLength + arcsLength
+}
+
+public fun shortestPath(path: List<List<DubinsTangent>>): List<List<DubinsTangent>> {
+    return path.sortedBy { pathLength(it) }
+}
+
+public typealias Path = List<DubinsTangent>
+public fun findAllPaths(
+    startingPoint: DoubleVector2D,
+    startingDirection: DoubleVector2D,
+    startingRadius: Double,
+    finalPoint: DoubleVector2D,
+    finalDirection: DoubleVector2D,
+    finalRadius: Double,
+    obstacles: List<DubinsObstacle>
+) {
+    val initialCircles = constructTangentCircles(
+        startingPoint,
+        startingDirection,
+        startingRadius)
+    val finalCircles = constructTangentCircles(
+        finalPoint,
+        finalDirection,
+        finalRadius)
+    var outputTangents = mutableMapOf<PathTypes, List<Path>>()
+    for (i in listOf(DubinsPath.SimpleType.L, DubinsPath.SimpleType.R)) {
+        for (j in listOf(DubinsPath.SimpleType.L, DubinsPath.SimpleType.R)) {
+            val finalCircle = finalCircles[j]!!
+            val finalObstacle = DubinsObstacle(listOf(finalCircle))
+            outputTangents[listOf(i,
+                           DubinsPath.SimpleType.S,
+                           j)] = listOf(
+                                    listOf(DubinsTangent(
+                                        initialCircles[i]!!,
+                                        initialCircles[i]!!,
+                                        DubinsObstacle(listOf(initialCircles[i]!!)),
+                                        DubinsObstacle(listOf(initialCircles[i]!!)),
+                                        LineSegment2D(startingPoint, startingPoint),
+                                        listOf(i, DubinsPath.SimpleType.S, i)
+                                    )))
+            var currentObstacle = DubinsObstacle(listOf(initialCircles[i]!!))
+            while (!allFinished(outputTangents[listOf(i,
+                    DubinsPath.SimpleType.S,
+                    j)]!!, finalObstacle)) {
+                var newOutputTangents = listOf<Path>()
+                for (line in outputTangents[listOf(i,
+                    DubinsPath.SimpleType.S,
+                    j)]!!) {
+                    var currentCircle = line[-1].endCircle
+                    var currentDirection = line[-1].route[-1]
+                    var currentObstacle = line[-1].endObstacle
+                    var nextObstacle = DubinsObstacle(listOf())
+                    if (currentObstacle != finalObstacle) {
+                        var tangentToFinal = outerTangents(currentObstacle, finalObstacle)[DubinsPath.toType(listOf(
+                            currentDirection,
+                            DubinsPath.SimpleType.S,
+                            j)
+                        )]
+                        for (obstacle in sortedObstacles(currentObstacle, obstacles)) {
+                            if (tangentToFinal!!.intersectObstacle(obstacle)) {
+                                nextObstacle = obstacle
+                                break
+                            }
+                        }
+                        if (nextObstacle == DubinsObstacle(listOf())) {
+                            nextObstacle = finalObstacle
+                        }
+                        var nextTangents = outerTangents(currentObstacle, nextObstacle)
+//                        for (pathType in listOf(
+//                            listOf(DubinsPath.SimpleType.L,
+//                                DubinsPath.SimpleType.S,
+//                                DubinsPath.SimpleType.L),
+//                            listOf(DubinsPath.SimpleType.L,
+//                                DubinsPath.SimpleType.S,
+//                                DubinsPath.SimpleType.R),
+//                            listOf(DubinsPath.SimpleType.R,
+//                                DubinsPath.SimpleType.S,
+//                                DubinsPath.SimpleType.L),
+//                            listOf(DubinsPath.SimpleType.R,
+//                                DubinsPath.SimpleType.S,
+//                                DubinsPath.SimpleType.R)
+//                        )) {
+                        for (pathType in nextTangents.keys) {
+                            for (obstacle in obstacles) {
+                                // in Python code here try/except was used, but seems unneeded
+                                if (nextTangents[pathType]!!.intersectObstacle(obstacle)) {
+                                    nextTangents.remove(pathType)
+                                }
+
+                            }
+                        }
+                        if (nextObstacle == finalObstacle) {
+                            nextTangents =
+                                nextTangents.filter {(DubinsPath.toSimpleTypes(it.key)[0] == currentDirection) and
+                                    (DubinsPath.toSimpleTypes(it.key)[0] == j)}
+                                    as MutableMap<DubinsPath.Type, DubinsTangent>
+                        }
+                        else {
+                            nextTangents =
+                                nextTangents.filter {(DubinsPath.toSimpleTypes(it.key)[0] == currentDirection)}
+                                        as MutableMap<DubinsPath.Type, DubinsTangent>
+                        }
+                        TODO("rewrite fragment from Python")
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+
+
+
+
+
+
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
index 568ef691a..5654d10ae 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
@@ -77,10 +77,118 @@ private fun innerTangent(
 @Suppress("DuplicatedCode")
 public object DubinsPath {
 
+//    public class ArcType(private val type: Type){
+//        public val first: SimpleType
+//            get() {
+//                if (this.type in listOf(Type.RSR, Type.RSL, Type.RLR)) {
+//                    return SimpleType.R
+//                }
+//                else if (type in listOf(Type.LSL, Type.LSR, Type.LRL)) {
+//                    return SimpleType.L
+//                }
+//                error("Wrong DubinsPath.Type")
+//            }
+//
+//        public val last: SimpleType
+//            get() {
+//                if (type in listOf(Type.RSR, Type.LSR, Type.RLR)) {
+//                    return SimpleType.R
+//                }
+//                else if (type in listOf(Type.LSL, Type.RSL, Type.LRL)) {
+//                    return SimpleType.L
+//                }
+//                error("Wrong DubinsPath.Type")
+//            }
+//        public val intermediate: SimpleType
+//            get() {
+//                if (type == Type.RLR) {
+//                    return SimpleType.L
+//                }
+//                else if (type == Type.LRL) {
+//                    return SimpleType.R
+//                }
+//                error("This DubinsPath.Type doesn't contain intermediate arc")
+//            }
+//    }
+
+    public enum class SimpleType {
+        R, S, L
+    }
+
     public enum class Type {
         RLR, LRL, RSR, LSL, RSL, LSR
     }
 
+    public fun toSimpleTypes(type: Type): List<SimpleType> {
+        when (type) {
+            Type.RLR -> {
+                return listOf(SimpleType.R, SimpleType.L, SimpleType.R)
+            }
+            Type.LRL -> {
+                return listOf(SimpleType.L, SimpleType.R, SimpleType.L)
+            }
+            Type.RSR -> {
+                return listOf(SimpleType.R, SimpleType.S, SimpleType.R)
+            }
+            Type.LSL -> {
+                return listOf(SimpleType.L, SimpleType.S, SimpleType.L)
+            }
+            Type.RSL -> {
+                return listOf(SimpleType.R, SimpleType.S, SimpleType.L)
+            }
+            Type.LSR -> {
+                return listOf(SimpleType.L, SimpleType.S, SimpleType.R)
+            }
+            else -> error("This type doesn't exist")
+        }
+    }
+
+    public fun toType(types: List<SimpleType>): Type {
+        when (types) {
+            listOf(SimpleType.R, SimpleType.L, SimpleType.R) -> {
+                return Type.RLR
+            }
+            listOf(SimpleType.L, SimpleType.R, SimpleType.L) -> {
+                return Type.LRL
+            }
+            listOf(SimpleType.R, SimpleType.S, SimpleType.R) -> {
+                return Type.RSR
+            }
+            listOf(SimpleType.L, SimpleType.S, SimpleType.L) -> {
+                return Type.LSL
+            }
+            listOf(SimpleType.R, SimpleType.S, SimpleType.L) -> {
+                return Type.RSL
+            }
+            listOf(SimpleType.L, SimpleType.S, SimpleType.R) -> {
+                return Type.LSR
+            }
+            else -> error("This type doesn't exist")
+        }
+    }
+
+//    public class PathTypes(private val inputTypes: List<SimpleType>) {
+//        public val type: Type
+//            get() {
+//                when (this.inputTypes) {
+//                    listOf(SimpleType.R, SimpleType.S, SimpleType.R) -> {
+//                        return Type.RSR
+//                    }
+//                    listOf(SimpleType.R, SimpleType.S, SimpleType.L) -> {
+//                        return Type.RSL
+//                    }
+//                    listOf(SimpleType.L, SimpleType.S, SimpleType.R) -> {
+//                        return Type.LSR
+//                    }
+//                    listOf(SimpleType.L, SimpleType.S, SimpleType.L) -> {
+//                        return Type.LSL
+//                    }
+//                    else -> error("Wrong list of SimpleTypes")
+//                }
+//            }
+//        public val chain: List<SimpleType> = this.inputTypes
+//    }
+
     /**
      * Return Dubins trajectory type or null if trajectory is not a Dubins path
      */
@@ -243,6 +351,8 @@ public object DubinsPath {
     }
 }
 
+public typealias PathTypes = List<DubinsPath.SimpleType>
+
 public fun interface MaxCurvature {
     public fun compute(startPoint: PhaseVector2D): Double
 }
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
index 945b140c2..2d935aa00 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.trajectory
 
-import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.DoubleVector2D
-import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.geometry.LineSegment
+import space.kscience.kmath.geometry.*
+import space.kscience.kmath.geometry.Euclidean2DSpace.plus
+import space.kscience.kmath.geometry.Euclidean2DSpace.times
+import space.kscience.kmath.operations.DoubleField.pow
 import kotlin.math.*
 
 /**
@@ -17,7 +17,7 @@ import kotlin.math.*
  */
 public fun Circle2D.tangentsToCircle(
     other: Circle2D,
-): Map<DubinsPath.Type, LineSegment<DoubleVector2D>> = with(Euclidean2DSpace) {
+): Map<DubinsPath.Type, LineSegment2D> = with(Euclidean2DSpace) {
     val line = LineSegment(center, other.center)
     val d = line.begin.distanceTo(line.end)
     val angle1 = atan2(other.center.x - center.x, other.center.y - center.y)
@@ -48,14 +48,66 @@ public fun Circle2D.tangentsToCircle(
                 val w = vector(-cos(angle2), sin(angle2))
                 put(
                     route,
-                    LineSegment(
+                    LineSegment2D(
                         center + w * r1,
                         other.center + w * r2
                     )
                 )
             }
             else {
-                throw Exception("Circles should not be")
+                throw Exception("Circles should not intersect")
+            }
+        }
+    }
+}
+
+public fun dubinsTangentsToCircles(
+    firstCircle: Circle2D,
+    secondCircle: Circle2D,
+    firstObstacle: DubinsObstacle,
+    secondObstacle: DubinsObstacle
+): Map<DubinsPath.Type, DubinsTangent> = with(Euclidean2DSpace) {
+    val line = LineSegment(firstCircle.center, secondCircle.center)
+    val d = line.begin.distanceTo(line.end)
+    val angle1 = atan2(secondCircle.center.x - firstCircle.center.x,
+        secondCircle.center.y - firstCircle.center.y)
+    var r: Double
+    var angle2: Double
+    val routes = mapOf(
+        DubinsPath.Type.RSR to Pair(firstCircle.radius, secondCircle.radius),
+        DubinsPath.Type.RSL to Pair(firstCircle.radius, -secondCircle.radius),
+        DubinsPath.Type.LSR to Pair(-firstCircle.radius, secondCircle.radius),
+        DubinsPath.Type.LSL to Pair(-firstCircle.radius, -secondCircle.radius)
+    )
+    return buildMap {
+        for ((route, r1r2) in routes) {
+            val r1 = r1r2.first
+            val r2 = r1r2.second
+            r = if (r1.sign == r2.sign) {
+                r1.absoluteValue - r2.absoluteValue
+            } else {
+                r1.absoluteValue + r2.absoluteValue
+            }
+            if (d * d > r * r) {
+                val l = (d * d - r * r).pow(0.5)
+                angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+                    angle1 + r1.sign * atan2(r.absoluteValue, l)
+                } else {
+                    angle1 - r2.sign * atan2(r.absoluteValue, l)
+                }
+                val w = Euclidean2DSpace.vector(-cos(angle2), sin(angle2))
+                put(route, DubinsTangent(Circle2D(firstCircle.center, firstCircle.radius),
+                    secondCircle,
+                    firstObstacle,
+                    secondObstacle,
+                    LineSegment2D(
+                        firstCircle.center + w * r1,
+                        secondCircle.center + w * r2
+                    ),
+                    DubinsPath.toSimpleTypes(route))
+                )
+            } else {
+                throw Exception("Circles should not intersect")
             }
         }
     }
-- 
2.34.1


From 61d43ae5faa05f8c9d90d6519897a7f0ebd6b77a Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Sat, 4 Mar 2023 21:31:06 +0300
Subject: [PATCH 657/713] search for shortest path algorithm

---
 .../kmath/trajectory/DubinsObstacle.kt        | 144 ++++++++++++++----
 .../kscience/kmath/trajectory/tangent.kt      |  82 ++++++++--
 .../kscience/kmath/trajectory/DubinsTest.kt   |  39 +++++
 3 files changed, 225 insertions(+), 40 deletions(-)
 create mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
index 56aa88e4a..e1c967e2a 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
@@ -276,7 +276,7 @@ public fun tangentsAlongTheObstacle(initialCircle: Circle2D,
 public fun allFinished(paths: List<List<DubinsTangent>>,
                        finalObstacle: DubinsObstacle): Boolean {
     for (path in paths) {
-        if (path[-1].endObstacle != finalObstacle) {
+        if (path.last().endObstacle != finalObstacle) {
             return false
         }
     }
@@ -296,8 +296,8 @@ public fun pathLength(path: List<DubinsTangent>): Double {
     return tangentsLength + arcsLength
 }
 
-public fun shortestPath(path: List<List<DubinsTangent>>): List<List<DubinsTangent>> {
-    return path.sortedBy { pathLength(it) }
+public fun shortestPath(path: List<List<DubinsTangent>>): List<DubinsTangent> {
+    return path.sortedBy { pathLength(it) }[0]
 }
 
 public typealias Path = List<DubinsTangent>
@@ -309,7 +309,7 @@ public fun findAllPaths(
     finalDirection: DoubleVector2D,
     finalRadius: Double,
     obstacles: List<DubinsObstacle>
-) {
+): List<MutableList<DubinsTangent>> {
     val initialCircles = constructTangentCircles(
         startingPoint,
         startingDirection,
@@ -318,15 +318,15 @@ public fun findAllPaths(
         finalPoint,
         finalDirection,
         finalRadius)
-    var outputTangents = mutableMapOf<PathTypes, List<Path>>()
+    var outputTangents = mutableMapOf<PathTypes, MutableList<MutableList<DubinsTangent>>>()
     for (i in listOf(DubinsPath.SimpleType.L, DubinsPath.SimpleType.R)) {
         for (j in listOf(DubinsPath.SimpleType.L, DubinsPath.SimpleType.R)) {
             val finalCircle = finalCircles[j]!!
             val finalObstacle = DubinsObstacle(listOf(finalCircle))
             outputTangents[listOf(i,
                            DubinsPath.SimpleType.S,
-                           j)] = listOf(
-                                    listOf(DubinsTangent(
+                           j)] = mutableListOf(
+                                    mutableListOf(DubinsTangent(
                                         initialCircles[i]!!,
                                         initialCircles[i]!!,
                                         DubinsObstacle(listOf(initialCircles[i]!!)),
@@ -338,13 +338,13 @@ public fun findAllPaths(
             while (!allFinished(outputTangents[listOf(i,
                     DubinsPath.SimpleType.S,
                     j)]!!, finalObstacle)) {
-                var newOutputTangents = listOf<Path>()
+                var newOutputTangents = mutableListOf<MutableList<DubinsTangent>>()
                 for (line in outputTangents[listOf(i,
                     DubinsPath.SimpleType.S,
                     j)]!!) {
-                    var currentCircle = line[-1].endCircle
-                    var currentDirection = line[-1].route[-1]
-                    var currentObstacle = line[-1].endObstacle
+                    var currentCircle = line.last().endCircle
+                    var currentDirection = line.last().route.last()
+                    var currentObstacle = line.last().endObstacle
                     var nextObstacle = DubinsObstacle(listOf())
                     if (currentObstacle != finalObstacle) {
                         var tangentToFinal = outerTangents(currentObstacle, finalObstacle)[DubinsPath.toType(listOf(
@@ -362,20 +362,7 @@ public fun findAllPaths(
                             nextObstacle = finalObstacle
                         }
                         var nextTangents = outerTangents(currentObstacle, nextObstacle)
-//                        for (pathType in listOf(
-//                            listOf(DubinsPath.SimpleType.L,
-//                                DubinsPath.SimpleType.S,
-//                                DubinsPath.SimpleType.L),
-//                            listOf(DubinsPath.SimpleType.L,
-//                                DubinsPath.SimpleType.S,
-//                                DubinsPath.SimpleType.R),
-//                            listOf(DubinsPath.SimpleType.R,
-//                                DubinsPath.SimpleType.S,
-//                                DubinsPath.SimpleType.L),
-//                            listOf(DubinsPath.SimpleType.R,
-//                                DubinsPath.SimpleType.S,
-//                                DubinsPath.SimpleType.R)
-//                        )) {
+
                         for (pathType in nextTangents.keys) {
                             for (obstacle in obstacles) {
                                 // in Python code here try/except was used, but seems unneeded
@@ -396,12 +383,117 @@ public fun findAllPaths(
                                 nextTangents.filter {(DubinsPath.toSimpleTypes(it.key)[0] == currentDirection)}
                                         as MutableMap<DubinsPath.Type, DubinsTangent>
                         }
-                        TODO("rewrite fragment from Python")
+                        val tangentsAlong = mutableListOf<DubinsTangent>()
+                        for (tangent in nextTangents.values) {
+                            if (tangent.startCircle == line.last().endCircle) {
+                                val lengthMaxPossible = arcLength(
+                                    tangent.startCircle,
+                                    line.last().lineSegment.end,
+                                    tangent.startObstacle.nextTangent(
+                                        tangent.startCircle,
+                                        DubinsPath.toType(listOf(currentDirection, DubinsPath.SimpleType.S, currentDirection)),
+                                    ).lineSegment.begin,
+                                    currentDirection
+                                    )
+                                val lengthCalculated = arcLength(
+                                    tangent.startCircle,
+                                    line.last().lineSegment.end,
+                                    tangent.lineSegment.begin,
+                                    currentDirection)
+                                if (lengthCalculated > lengthMaxPossible) {
+                                    val tangentsAlong = tangentsAlongTheObstacle(
+                                        currentCircle,
+                                        DubinsPath.toType(listOf(
+                                            currentDirection,
+                                            DubinsPath.SimpleType.S,
+                                            currentDirection)),
+                                        tangent.startCircle,
+                                        currentObstacle
+                                    )
+                                }
+                                else {
+                                    val tangentsAlong = mutableListOf<DubinsTangent>()
+                                }
+                            }
+                            else {
+                                val tangentsAlong = tangentsAlongTheObstacle(
+                                    currentCircle,
+                                    DubinsPath.toType(listOf(
+                                        currentDirection,
+                                        DubinsPath.SimpleType.S,
+                                        currentDirection)),
+                                    tangent.startCircle,
+                                    currentObstacle
+                                )
+                            }
+                            newOutputTangents.add((line + tangentsAlong + listOf(tangent)).toMutableList())
+                        }
+                        outputTangents[listOf(
+                            i,
+                            DubinsPath.SimpleType.S,
+                            j
+                        )] = newOutputTangents
+                    }
+                    else {
+                        // minor changes from Python code
+                        newOutputTangents.add(line)
+                        outputTangents[listOf(
+                            i,
+                            DubinsPath.SimpleType.S,
+                            j
+                        )] = newOutputTangents
                     }
                 }
             }
+            for (lineId in outputTangents[listOf(
+                i,
+                DubinsPath.SimpleType.S,
+                j
+            )]!!.indices) {
+                val lastDirection = outputTangents[listOf(
+                    i,
+                    DubinsPath.SimpleType.S,
+                    j
+                )]!![lineId].last().route[2]
+                outputTangents[listOf(
+                    i,
+                    DubinsPath.SimpleType.S,
+                    j
+                )]!![lineId].add(DubinsTangent(
+                    finalCircles[j]!!,
+                    finalCircles[j]!!,
+                    DubinsObstacle(
+                        listOf(finalCircles[j]!!)
+                    ),
+                    DubinsObstacle(
+                        listOf(finalCircles[j]!!)
+                    ),
+                    LineSegment2D(finalPoint, finalPoint),
+                    listOf(
+                        lastDirection,
+                        DubinsPath.SimpleType.S,
+                        j
+                    )
+                ))
+            }
         }
     }
+    return outputTangents[listOf(
+        DubinsPath.SimpleType.L,
+        DubinsPath.SimpleType.S,
+        DubinsPath.SimpleType.L
+        )]!! + outputTangents[listOf(
+        DubinsPath.SimpleType.L,
+        DubinsPath.SimpleType.S,
+        DubinsPath.SimpleType.R
+        )]!! + outputTangents[listOf(
+        DubinsPath.SimpleType.R,
+        DubinsPath.SimpleType.S,
+        DubinsPath.SimpleType.L
+        )]!! + outputTangents[listOf(
+        DubinsPath.SimpleType.R,
+        DubinsPath.SimpleType.S,
+        DubinsPath.SimpleType.L)]!!
 }
 
 
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
index d3165e162..1a58d64cc 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
@@ -39,22 +39,76 @@ public fun Circle2D.tangentsToCircle(
             } else {
                 r1.absoluteValue + r2.absoluteValue
             }
-            if (distance <= r) TODO("Intersecting circles are not supported yet")
-            val l = sqrt(distance * distance - r * r)
-            angle2 = if (r1.absoluteValue > r2.absoluteValue) {
-                angle1 + r1.sign * atan2(r.absoluteValue, l)
-            } else {
-                angle1 - r2.sign * atan2(r.absoluteValue, l)
-            }
-            val w = vector(-cos(angle2), sin(angle2))
-            put(
-                route,
-                LineSegment(
-                    center + w * r1,
-                    other.center + w * r2
+            if (distance * distance >= r * r) {
+                val l = sqrt(distance * distance - r * r)
+                angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+                    angle1 + r1.sign * atan2(r.absoluteValue, l)
+                } else {
+                    angle1 - r2.sign * atan2(r.absoluteValue, l)
+                }
+                val w = Euclidean2DSpace.vector(-cos(angle2), sin(angle2))
+                put(
+                    route,
+                    LineSegment(
+                        center + w * r1,
+                        other.center + w * r2
+                    )
                 )
-            )
+            } else {
+                throw Exception("Circles should not intersect")
+            }
+        }
+    }
+}
 
+public fun dubinsTangentsToCircles(
+    firstCircle: Circle2D,
+    secondCircle: Circle2D,
+    firstObstacle: DubinsObstacle,
+    secondObstacle: DubinsObstacle
+): Map<DubinsPath.Type, DubinsTangent> = with(Euclidean2DSpace) {
+    val line = LineSegment(firstCircle.center, secondCircle.center)
+    val distance = line.begin.distanceTo(line.end)
+    val angle1 = atan2(secondCircle.center.x - firstCircle.center.x,
+        secondCircle.center.y - firstCircle.center.y)
+    var r: Double
+    var angle2: Double
+    val routes = mapOf(
+        DubinsPath.Type.RSR to Pair(firstCircle.radius, secondCircle.radius),
+        DubinsPath.Type.RSL to Pair(firstCircle.radius, -secondCircle.radius),
+        DubinsPath.Type.LSR to Pair(-firstCircle.radius, secondCircle.radius),
+        DubinsPath.Type.LSL to Pair(-firstCircle.radius, -secondCircle.radius)
+    )
+    return buildMap {
+        for ((route, r1r2) in routes) {
+            val r1 = r1r2.first
+            val r2 = r1r2.second
+            r = if (r1.sign == r2.sign) {
+                r1.absoluteValue - r2.absoluteValue
+            } else {
+                r1.absoluteValue + r2.absoluteValue
+            }
+            if (distance * distance >= r * r) {
+                val l = sqrt(distance * distance - r * r)
+                angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+                    angle1 + r1.sign * atan2(r.absoluteValue, l)
+                } else {
+                    angle1 - r2.sign * atan2(r.absoluteValue, l)
+                }
+                val w = Euclidean2DSpace.vector(-cos(angle2), sin(angle2))
+                put(route, DubinsTangent(Circle2D(firstCircle.center, firstCircle.radius),
+                    secondCircle,
+                    firstObstacle,
+                    secondObstacle,
+                    LineSegment2D(
+                        firstCircle.center + w * r1,
+                        secondCircle.center + w * r2
+                    ),
+                    DubinsPath.toSimpleTypes(route))
+                )
+            } else {
+                throw Exception("Circles should not intersect")
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
new file mode 100644
index 000000000..3eefbdaeb
--- /dev/null
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory
+
+import space.kscience.kmath.geometry.Circle2D
+import space.kscience.kmath.geometry.DoubleVector2D
+import space.kscience.kmath.geometry.Euclidean2DSpace.vector
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+class DubinsTest {
+    @Test
+    fun firstPath() {
+        val startPoint = vector(-5.0, -1.0)
+        val startDirection = vector(1.0, 1.0)
+        val startRadius = 0.5
+        val finalPoint = vector(20.0, 4.0)
+        val finalDirection = vector(1.0, -1.0)
+        val finalRadius = 0.5
+
+        val obstacles = listOf(DubinsObstacle(listOf(
+            Circle2D(vector(7.0, 1.0), 5.0))))
+
+        val outputTangents = findAllPaths(
+            startPoint,
+            startDirection,
+            startRadius,
+            finalPoint,
+            finalDirection,
+            finalRadius,
+            obstacles)
+        val length = pathLength(shortestPath(outputTangents))
+        TODO("fix negative indices in boundaryTangents and accomplish test")
+        assertTrue(false)
+    }
+}
\ No newline at end of file
-- 
2.34.1


From 1b6a41c728150bb9374625b06045c06f8073c524 Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Thu, 9 Mar 2023 08:39:20 +0300
Subject: [PATCH 658/713] search for shortest path algorithm

---
 .../kmath/trajectory/DubinsObstacle.kt        | 30 ++++++++---------
 .../kscience/kmath/trajectory/tangent.kt      |  2 +-
 .../kscience/kmath/trajectory/DubinsTest.kt   | 33 +++++++++++++++++++
 3 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
index e1c967e2a..d3ab13f26 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
@@ -39,8 +39,8 @@ public class DubinsObstacle(
             var angle2: Double
             val routes = mapOf(
                 DubinsPath.Type.RSR to Pair(radius, other.radius),
-                DubinsPath.Type.RSL to Pair(radius, -other.radius),
-                DubinsPath.Type.LSR to Pair(-radius, other.radius),
+//                DubinsPath.Type.RSL to Pair(radius, -other.radius),
+//                DubinsPath.Type.LSR to Pair(-radius, other.radius),
                 DubinsPath.Type.LSL to Pair(-radius, -other.radius)
             )
             return buildMap {
@@ -52,7 +52,7 @@ public class DubinsObstacle(
                     } else {
                         r1.absoluteValue + r2.absoluteValue
                     }
-                    if (d * d > r * r) {
+                    if (d * d >= r * r) {
                         val l = (d * d - r * r).pow(0.5)
                         angle2 = if (r1.absoluteValue > r2.absoluteValue) {
                             angle1 + r1.sign * atan2(r.absoluteValue, l)
@@ -76,8 +76,11 @@ public class DubinsObstacle(
                 }
             }
         }
-        val firstCircles = this.circles.slice(-this.circles.size..-1)
-        val secondCircles = this.circles.slice(-this.circles.size+1..0)
+//        val firstCircles = this.circles.slice(-this.circles.size..-1)
+//        val secondCircles = this.circles.slice(-this.circles.size+1..0)
+        val firstCircles = this.circles
+        val secondCircles = this.circles.slice(1..this.circles.lastIndex) +
+                this.circles[0]
         val lslTangents = firstCircles.zip(secondCircles)
         {a, b -> a.dubinsTangentsToCircles(b)[DubinsPath.Type.LSL]!!}
         val rsrTangents = firstCircles.zip(secondCircles)
@@ -345,7 +348,7 @@ public fun findAllPaths(
                     var currentCircle = line.last().endCircle
                     var currentDirection = line.last().route.last()
                     var currentObstacle = line.last().endObstacle
-                    var nextObstacle = DubinsObstacle(listOf())
+                    var nextObstacle: DubinsObstacle? = null
                     if (currentObstacle != finalObstacle) {
                         var tangentToFinal = outerTangents(currentObstacle, finalObstacle)[DubinsPath.toType(listOf(
                             currentDirection,
@@ -358,7 +361,7 @@ public fun findAllPaths(
                                 break
                             }
                         }
-                        if (nextObstacle == DubinsObstacle(listOf())) {
+                        if (nextObstacle == null) {
                             nextObstacle = finalObstacle
                         }
                         var nextTangents = outerTangents(currentObstacle, nextObstacle)
@@ -372,16 +375,13 @@ public fun findAllPaths(
 
                             }
                         }
-                        if (nextObstacle == finalObstacle) {
-                            nextTangents =
-                                nextTangents.filter {(DubinsPath.toSimpleTypes(it.key)[0] == currentDirection) and
+                        nextTangents = if (nextObstacle == finalObstacle) {
+                            nextTangents.filter {(DubinsPath.toSimpleTypes(it.key)[0] == currentDirection) and
                                     (DubinsPath.toSimpleTypes(it.key)[0] == j)}
                                     as MutableMap<DubinsPath.Type, DubinsTangent>
-                        }
-                        else {
-                            nextTangents =
-                                nextTangents.filter {(DubinsPath.toSimpleTypes(it.key)[0] == currentDirection)}
-                                        as MutableMap<DubinsPath.Type, DubinsTangent>
+                        } else {
+                            nextTangents.filter {(DubinsPath.toSimpleTypes(it.key)[0] == currentDirection)}
+                                    as MutableMap<DubinsPath.Type, DubinsTangent>
                         }
                         val tangentsAlong = mutableListOf<DubinsTangent>()
                         for (tangent in nextTangents.values) {
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
index 1a58d64cc..fb1c3927b 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
@@ -95,7 +95,7 @@ public fun dubinsTangentsToCircles(
                 } else {
                     angle1 - r2.sign * atan2(r.absoluteValue, l)
                 }
-                val w = Euclidean2DSpace.vector(-cos(angle2), sin(angle2))
+                val w = vector(-cos(angle2), sin(angle2))
                 put(route, DubinsTangent(Circle2D(firstCircle.center, firstCircle.radius),
                     secondCircle,
                     firstObstacle,
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
index 3eefbdaeb..a0697c59c 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
@@ -36,4 +36,37 @@ class DubinsTest {
         TODO("fix negative indices in boundaryTangents and accomplish test")
         assertTrue(false)
     }
+    @Test
+    fun outerTangentsTest1() {
+        // works incorrectly
+        val circles1 = listOf(
+            Circle2D(vector(0.0, 0.0), 1.0))
+        val circles2 = listOf(
+            Circle2D(vector(5.0, 5.0), 1.0)
+        )
+        println(outerTangents(DubinsObstacle(circles1), DubinsObstacle(circles2)))
+        assertTrue(false)
+    }
+    @Test
+    fun outerTangentsTest2() {
+        // works incorrectly
+        val circles1 = listOf(
+            Circle2D(vector(0.0, 0.0), 1.0),
+            Circle2D(vector( 2.0, 0.0), 1.0))
+        val circles2 = listOf(
+            Circle2D(vector(5.0, 5.0), 1.0),
+            Circle2D(vector(7.0, 5.0), 1.0)
+        )
+        println(outerTangents(DubinsObstacle(circles1), DubinsObstacle(circles2)))
+
+        for (circle1 in circles1) {
+            for (circle2 in circles2) {
+                for (tangent in dubinsTangentsToCircles(circle1, circle2,
+                    DubinsObstacle(circles1), DubinsObstacle(circles2))) {
+                    println(tangent)
+                }
+            }
+        }
+        assertTrue(false)
+    }
 }
\ No newline at end of file
-- 
2.34.1


From 2bce369c5dcdae8b4ba16f498fd19d31807b29df Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Thu, 9 Mar 2023 16:03:48 +0300
Subject: [PATCH 659/713] search for shortest path algorithm

---
 .../kmath/trajectory/DubinsObstacle.kt        | 38 ++++++++++++-------
 .../kscience/kmath/trajectory/DubinsTest.kt   | 37 +++++++++++++++++-
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
index d3ab13f26..6b247e55b 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
@@ -111,13 +111,24 @@ public class DubinsObstacle(
         else {
             for (i in this.circles.indices) {
                 if (this.circles[i] == circle) {
-                    return DubinsTangent(this.circles[i],
-                                         this.circles[i-1],
-                                         this,
-                                         this,
-                                         LineSegment2D(this.tangents[i-1].lineSegment.end,
-                                                        this.tangents[i-1].lineSegment.begin),
-                                         DubinsPath.toSimpleTypes(route))
+                    if (i > 0) {
+                        return DubinsTangent(this.circles[i],
+                            this.circles[i-1],
+                            this,
+                            this,
+                            LineSegment2D(this.tangents[i-1].lineSegment.end,
+                                this.tangents[i-1].lineSegment.begin),
+                            DubinsPath.toSimpleTypes(route))
+                    }
+                    else {
+                        return DubinsTangent(this.circles[0],
+                            this.circles.last(),
+                            this,
+                            this,
+                            LineSegment2D(this.tangents.last().lineSegment.end,
+                                this.tangents.last().lineSegment.begin),
+                            DubinsPath.toSimpleTypes(route))
+                    }
                 }
             }
         }
@@ -156,7 +167,7 @@ public fun LineSegment2D.intersectCircle(circle: Circle2D): Boolean {
     val a = (this.begin.x - this.end.x).pow(2.0) + (this.begin.y - this.end.y).pow(2.0)
     val b = 2 * ((this.begin.x - this.end.x) * (this.end.x - circle.center.x) +
             (this.begin.y - this.end.y) * (this.end.y - circle.center.y))
-    val c = (this.end.x - circle.center.x).pow(2.0) + (this.end.y - circle.center.y) -
+    val c = (this.end.x - circle.center.x).pow(2.0) + (this.end.y - circle.center.y).pow(2.0) -
             circle.radius.pow(2.0)
     val d = b.pow(2.0) - 4 * a * c
     if (d < 1e-6) {
@@ -289,7 +300,7 @@ public fun allFinished(paths: List<List<DubinsTangent>>,
 public fun pathLength(path: List<DubinsTangent>): Double {
     val tangentsLength = path.sumOf{norm(it.lineSegment.end - it.lineSegment.begin)}
     val arcsLength = buildList<Double>{
-        for (i in 1..path.size) {
+        for (i in 1..path.lastIndex) {
             add(arcLength(path[i].startCircle,
                 path[i-1].lineSegment.end,
                 path[i].lineSegment.begin,
@@ -366,13 +377,14 @@ public fun findAllPaths(
                         }
                         var nextTangents = outerTangents(currentObstacle, nextObstacle)
 
-                        for (pathType in nextTangents.keys) {
+                        for (pathType in DubinsPath.Type.values()) {
                             for (obstacle in obstacles) {
                                 // in Python code here try/except was used, but seems unneeded
-                                if (nextTangents[pathType]!!.intersectObstacle(obstacle)) {
-                                    nextTangents.remove(pathType)
+                                if (nextTangents.containsKey(pathType)) {
+                                    if (nextTangents[pathType]!!.intersectObstacle(obstacle)) {
+                                        nextTangents.remove(pathType)
+                                    }
                                 }
-
                             }
                         }
                         nextTangents = if (nextObstacle == finalObstacle) {
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
index a0697c59c..16d77c84d 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
@@ -33,8 +33,41 @@ class DubinsTest {
             finalRadius,
             obstacles)
         val length = pathLength(shortestPath(outputTangents))
-        TODO("fix negative indices in boundaryTangents and accomplish test")
-        assertTrue(false)
+        println(length)
+    }
+
+    @Test
+    fun secondPath() {
+        val startPoint = vector(-5.0, -1.0)
+        val startDirection = vector(1.0, 1.0)
+        val startRadius = 0.5
+        val finalPoint = vector(20.0, 4.0)
+        val finalDirection = vector(1.0, -1.0)
+        val finalRadius = 0.5
+
+        val obstacles = listOf(
+            DubinsObstacle(listOf(
+                Circle2D(vector(1.0, 6.5), 0.5),
+                Circle2D(vector(2.0, 1.0), 0.5),
+                Circle2D(vector(6.0, 0.0), 0.5),
+                Circle2D(vector(5.0, 5.0), 0.5)
+            )), DubinsObstacle(listOf(
+                Circle2D(vector(10.0, 1.0), 0.5),
+                Circle2D(vector(16.0, 0.0), 0.5),
+                Circle2D(vector(14.0, 6.0), 0.5),
+                Circle2D(vector(9.0, 4.0), 0.5)
+            ))
+        )
+        val outputTangents = findAllPaths(
+            startPoint,
+            startDirection,
+            startRadius,
+            finalPoint,
+            finalDirection,
+            finalRadius,
+            obstacles)
+        val length = pathLength(shortestPath(outputTangents))
+        println(length)
     }
     @Test
     fun outerTangentsTest1() {
-- 
2.34.1


From 4871baf0e5f4d45bf3c7d31916d4b84be187b689 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 10 Mar 2023 12:01:08 +0300
Subject: [PATCH 660/713] Add vector product to Euclidean3DSpace

---
 gradle.properties                             |  2 +-
 .../kmath/geometry/Euclidean3DSpace.kt        | 47 ++++++++++++++++++-
 .../kmath/geometry/Euclidean3DSpaceTest.kt    | 46 ++++++++++++------
 3 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c3f070c2d..048c9c9f3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ kotlin.native.ignoreDisabledTargets=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.14.2-kotlin-1.8.10
+toolsVersion=0.14.3-kotlin-1.8.20-RC
 
 
 org.gradle.parallel=true
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index cc641a3f1..f1cf0bad2 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -78,8 +78,11 @@ public object Euclidean3DSpace : GeometrySpace<DoubleVector3D>, ScaleOperations<
         }
     }
 
+    public fun vector(x: Double, y: Double, z: Double): DoubleVector3D =
+        Vector3DImpl(x, y, z)
+
     public fun vector(x: Number, y: Number, z: Number): DoubleVector3D =
-        Vector3DImpl(x.toDouble(), y.toDouble(), z.toDouble())
+        vector(x.toDouble(), y.toDouble(), z.toDouble())
 
     override val zero: DoubleVector3D by lazy { vector(0.0, 0.0, 0.0) }
 
@@ -100,6 +103,48 @@ public object Euclidean3DSpace : GeometrySpace<DoubleVector3D>, ScaleOperations<
     override fun DoubleVector3D.dot(other: DoubleVector3D): Double =
         x * other.x + y * other.y + z * other.z
 
+    private fun leviCivita(i: Int, j: Int, k: Int): Int = when {
+        // even permutation
+        i == 0 && j == 1 && k == 2 -> 1
+        i == 1 && j == 2 && k == 0 -> 1
+        i == 2 && j == 0 && k == 1 -> 1
+        // odd permutations
+        i == 2 && j == 1 && k == 0 -> -1
+        i == 0 && j == 2 && k == 1 -> -1
+        i == 1 && j == 0 && k == 2 -> -1
+
+        else -> 0
+    }
+
+    /**
+     * Compute vector product of [first] and [second]. The basis assumed to be right-handed if [rightBasis] is true and
+     * left-handed otherwise
+     */
+    public fun vectorProduct(
+        first: DoubleVector3D,
+        second: DoubleVector3D,
+        rightBasis: Boolean = true,
+    ): DoubleVector3D {
+        var x = 0.0
+        var y = 0.0
+        var z = 0.0
+
+        for (j in (0..2)) {
+            for (k in (0..2)) {
+                x += leviCivita(0, j, k) * first[j] * second[k]
+                y += leviCivita(1, j, k) * first[j] * second[k]
+                z += leviCivita(2, j, k) * first[j] * second[k]
+            }
+        }
+
+        return vector(x, y, z) * (if (rightBasis) 1 else -1)
+    }
+
+    /**
+     * Vector product with right basis
+     */
+    public infix fun DoubleVector3D.cross(other: DoubleVector3D): Vector3D<Double> = vectorProduct(this, other)
+
     public val xAxis: DoubleVector3D = vector(1.0, 0.0, 0.0)
     public val yAxis: DoubleVector3D = vector(0.0, 1.0, 0.0)
     public val zAxis: DoubleVector3D = vector(0.0, 0.0, 1.0)
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
index 6d9a169eb..291b0ad47 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
@@ -57,23 +57,39 @@ internal class Euclidean3DSpaceTest {
     }
 
     @Test
-    fun add() {
-        with(Euclidean3DSpace) {
-            assertVectorEquals(
-                vector(1.0, -2.0, 0.001),
-                vector(1.0, -2.0, 0.001) + zero
-            )
-            assertVectorEquals(
-                vector(8.0, -3.0, 3.001),
-                vector(1.0, 2.0, 3.0) + vector(7.0, -5.0, 0.001)
-            )
-        }
+    fun add() = with(Euclidean3DSpace) {
+        assertVectorEquals(
+            vector(1.0, -2.0, 0.001),
+            vector(1.0, -2.0, 0.001) + zero
+        )
+        assertVectorEquals(
+            vector(8.0, -3.0, 3.001),
+            vector(1.0, 2.0, 3.0) + vector(7.0, -5.0, 0.001)
+        )
     }
 
     @Test
-    fun multiply() {
-        with(Euclidean3DSpace) {
-            assertVectorEquals(vector(2.0, -4.0, 0.0), vector(1.0, -2.0, 0.0) * 2)
-        }
+    fun multiply() = with(Euclidean3DSpace) {
+        assertVectorEquals(vector(2.0, -4.0, 0.0), vector(1.0, -2.0, 0.0) * 2)
     }
+
+    @Test
+    fun vectorProduct() = with(Euclidean3DSpace) {
+        assertVectorEquals(zAxis, vectorProduct(xAxis, yAxis))
+        assertVectorEquals(zAxis, xAxis cross yAxis)
+        assertVectorEquals(-zAxis, vectorProduct(yAxis, xAxis))
+        assertVectorEquals(zAxis, vectorProduct(yAxis, xAxis, rightBasis = false))
+    }
+
+    @Test
+    fun doubleVectorProduct() = with(Euclidean3DSpace) {
+        val a = vector(1, 2, -3)
+        val b = vector(-1, 0, 1)
+        val c = vector(4, 5, 6)
+
+        val res = a cross (b cross c)
+        val expected = b * (a dot c) - c * (a dot b)
+        assertVectorEquals(expected, res)
+    }
+
 }
-- 
2.34.1


From a3963ac4f50b7042cf21c51c8b5f97c36877249e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 10 Mar 2023 21:40:14 +0300
Subject: [PATCH 661/713] Refactor series naming and docs

---
 .../kscience/kmath/series/SeriesAlgebra.kt    | 79 +++++++++++--------
 .../kscience/kmath/series/seriesExtensions.kt | 32 ++++----
 2 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index 3cd2212f6..45e392693 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -6,6 +6,7 @@ import space.kscience.kmath.operations.RingOps
 import space.kscience.kmath.stat.StatisticalAlgebra
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferView
+import space.kscience.kmath.structures.getOrNull
 import kotlin.math.max
 import kotlin.math.min
 
@@ -33,8 +34,6 @@ public interface Series<T> : Buffer<T> {
     public val position: Int
 }
 
-public val <T> Series<T>.absoluteIndices: IntRange get() = position until position + size
-
 /**
  * A [BufferView] with index offset (both positive and negative) and possible size change
  */
@@ -60,54 +59,68 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
     private val labelResolver: (Int) -> L,
 ) : RingOps<Buffer<T>>, StatisticalAlgebra<T, A, BA> {
 
-    public val Buffer<T>.indices: IntRange
+    /**
+     * A range of valid offset indices. In general, does not start with zero.
+     */
+    public val Buffer<T>.offsetIndices: IntRange
         get() = if (this is Series) {
-            absoluteIndices
+            position until position + size
         } else {
             0 until size
         }
 
     /**
-     * Get the value by absolute index in the series algebra or return null if index is out of range
+     * Get the value by absolute offset in the series algebra or return null if index is out of range
      */
-    public fun Buffer<T>.getAbsoluteOrNull(index: Int): T? = when {
-        index !in indices -> null
-        this is Series -> origin[index - position]
-        else -> get(index)
+    public fun Buffer<T>.getByOffsetOrNull(index: Int): T? = when {
+        index !in offsetIndices -> null
+        this is Series -> origin.getOrNull(index - position)
+        else -> getOrNull(index)
     }
 
     /**
      * Get the value by absolute index in the series algebra or throw [IndexOutOfBoundsException] if index is out of range
      */
-    public fun Buffer<T>.getAbsolute(index: Int): T =
-        getAbsoluteOrNull(index) ?: throw IndexOutOfBoundsException("Index $index is not in $indices")
+    public fun Buffer<T>.getByOffset(index: Int): T =
+        getByOffsetOrNull(index) ?: throw IndexOutOfBoundsException("Index $index is not in $offsetIndices")
 
     /**
-     * Create an offset series with index starting point at [index]
+     *  Zero-copy move [Buffer] or [Series] to given [position] ignoring series offset if it is present.
      */
-    public fun Buffer<T>.moveTo(index: Int): Series<T> = if (this is Series) {
-        SeriesImpl(origin, index, size)
+    public fun Buffer<T>.moveTo(position: Int): Series<T> = if (this is Series) {
+        SeriesImpl(origin, position, size)
     } else {
-        SeriesImpl(this, index, size)
+        SeriesImpl(this, position, size)
     }
 
-    public val Buffer<T>.offset: Int get() = if (this is Series) position else 0
+    /**
+     * Zero-copy move [Buffer] or [Series] by given [offset]. If it is [Series], sum intrinsic series position and the [offset].
+     */
+    public fun Buffer<T>.moveBy(offset: Int): Series<T> = if (this is Series) {
+        SeriesImpl(origin, position + offset, size)
+    } else {
+        SeriesImpl(this, offset, size)
+    }
 
     /**
-     * Build a new series
+     * An offset of the buffer start relative to [SeriesAlgebra] zero offset
      */
-    public fun series(size: Int, fromIndex: Int = 0, block: A.(label: L) -> T): Series<T> {
+    public val Buffer<T>.startOffset: Int get() = if (this is Series) position else 0
+
+    /**
+     * Build a new series positioned at [startOffset].
+     */
+    public fun series(size: Int, startOffset: Int = 0, block: A.(label: L) -> T): Series<T> {
         return elementAlgebra.bufferFactory(size) {
-            val index = it + fromIndex
+            val index = it + startOffset
             elementAlgebra.block(labelResolver(index))
-        }.moveTo(fromIndex)
+        }.moveTo(startOffset)
     }
 
     /**
      * Get a label buffer for given buffer.
      */
-    public val Buffer<T>.labels: List<L> get() = indices.map(labelResolver)
-
+    public val Buffer<T>.labels: List<L> get() = offsetIndices.map(labelResolver)
 
     /**
      * Try to resolve element by label and return null if element with a given label is not found
@@ -115,7 +128,7 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
     public operator fun Buffer<T>.get(label: L): T? {
         val index = labels.indexOf(label)
         if (index == -1) return null
-        return getAbsolute(index + offset)
+        return getByOffset(index + startOffset)
     }
 
     /**
@@ -123,9 +136,9 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
      */
     public inline fun Buffer<T>.map(crossinline transform: A.(T) -> T): Series<T> {
         val buf = elementAlgebra.bufferFactory(size) {
-            elementAlgebra.transform(getAbsolute(it))
+            elementAlgebra.transform(getByOffset(it))
         }
-        return buf.moveTo(indices.first)
+        return buf.moveTo(offsetIndices.first)
     }
 
     /**
@@ -134,22 +147,22 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
     public inline fun Buffer<T>.mapWithLabel(crossinline transform: A.(arg: T, label: L) -> T): Series<T> {
         val labels = labels
         val buf = elementAlgebra.bufferFactory(size) {
-            elementAlgebra.transform(getAbsolute(it), labels[it])
+            elementAlgebra.transform(getByOffset(it), labels[it])
         }
-        return buf.moveTo(indices.first)
+        return buf.moveTo(offsetIndices.first)
     }
 
     public inline fun <R> Buffer<T>.fold(initial: R, operation: A.(acc: R, T) -> R): R {
         var accumulator = initial
-        for (index in this.indices) accumulator = elementAlgebra.operation(accumulator, getAbsolute(index))
+        for (index in this.offsetIndices) accumulator = elementAlgebra.operation(accumulator, getByOffset(index))
         return accumulator
     }
 
     public inline fun <R> Buffer<T>.foldWithLabel(initial: R, operation: A.(acc: R, arg: T, label: L) -> R): R {
         val labels = labels
         var accumulator = initial
-        for (index in this.indices) accumulator =
-            elementAlgebra.operation(accumulator, getAbsolute(index), labels[index])
+        for (index in this.offsetIndices) accumulator =
+            elementAlgebra.operation(accumulator, getByOffset(index), labels[index])
         return accumulator
     }
 
@@ -160,11 +173,11 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
         other: Buffer<T>,
         crossinline operation: A.(left: T, right: T) -> T,
     ): Series<T> {
-        val newRange = indices.intersect(other.indices)
+        val newRange = offsetIndices.intersect(other.offsetIndices)
         return elementAlgebra.bufferFactory(newRange.size) {
             elementAlgebra.operation(
-                getAbsolute(it),
-                other.getAbsolute(it)
+                getByOffset(it),
+                other.getByOffset(it)
             )
         }.moveTo(newRange.first)
     }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/seriesExtensions.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/seriesExtensions.kt
index 882fa2c46..fa5e0addd 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/seriesExtensions.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/seriesExtensions.kt
@@ -12,32 +12,32 @@ import space.kscience.kmath.structures.Buffer
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.sin(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : TrigonometricOperations<Buffer<T>> =
-    bufferAlgebra.sin(arg).moveTo(arg.offset)
+    bufferAlgebra.sin(arg).moveTo(arg.startOffset)
 
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.cos(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : TrigonometricOperations<Buffer<T>> =
-    bufferAlgebra.cos(arg).moveTo(arg.offset)
+    bufferAlgebra.cos(arg).moveTo(arg.startOffset)
 
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.tan(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : TrigonometricOperations<Buffer<T>> =
-    bufferAlgebra.tan(arg).moveTo(arg.offset)
+    bufferAlgebra.tan(arg).moveTo(arg.startOffset)
 
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.asin(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : TrigonometricOperations<Buffer<T>> =
-    bufferAlgebra.asin(arg).moveTo(arg.offset)
+    bufferAlgebra.asin(arg).moveTo(arg.startOffset)
 
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.acos(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : TrigonometricOperations<Buffer<T>> =
-    bufferAlgebra.acos(arg).moveTo(arg.offset)
+    bufferAlgebra.acos(arg).moveTo(arg.startOffset)
 
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.atan(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : TrigonometricOperations<Buffer<T>> =
-    bufferAlgebra.atan(arg).moveTo(arg.offset)
+    bufferAlgebra.atan(arg).moveTo(arg.startOffset)
 
 
 //exponential
@@ -45,42 +45,42 @@ public fun <T, BA> SeriesAlgebra<T, *, BA, *>.atan(
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.exp(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
-    bufferAlgebra.exp(arg).moveTo(arg.offset)
+    bufferAlgebra.exp(arg).moveTo(arg.startOffset)
 
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.ln(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
-    bufferAlgebra.ln(arg).moveTo(arg.offset)
+    bufferAlgebra.ln(arg).moveTo(arg.startOffset)
 
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.sinh(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
-    bufferAlgebra.sinh(arg).moveTo(arg.offset)
+    bufferAlgebra.sinh(arg).moveTo(arg.startOffset)
 
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.cosh(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
-    bufferAlgebra.cosh(arg).moveTo(arg.offset)
+    bufferAlgebra.cosh(arg).moveTo(arg.startOffset)
 
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.tanh(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
-    bufferAlgebra.tanh(arg).moveTo(arg.offset)
+    bufferAlgebra.tanh(arg).moveTo(arg.startOffset)
 
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.asinh(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
-    bufferAlgebra.asinh(arg).moveTo(arg.offset)
+    bufferAlgebra.asinh(arg).moveTo(arg.startOffset)
 
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.acosh(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
-    bufferAlgebra.acosh(arg).moveTo(arg.offset)
+    bufferAlgebra.acosh(arg).moveTo(arg.startOffset)
 
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.atanh(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : ExponentialOperations<Buffer<T>> =
-    bufferAlgebra.atanh(arg).moveTo(arg.offset)
+    bufferAlgebra.atanh(arg).moveTo(arg.startOffset)
 
 
 //power
@@ -89,9 +89,9 @@ public fun <T, BA> SeriesAlgebra<T, *, BA, *>.power(
     arg: Buffer<T>,
     pow: Number,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : PowerOperations<Buffer<T>> =
-    bufferAlgebra.power(arg, pow).moveTo(arg.offset)
+    bufferAlgebra.power(arg, pow).moveTo(arg.startOffset)
 
 public fun <T, BA> SeriesAlgebra<T, *, BA, *>.sqrt(
     arg: Buffer<T>,
 ): Series<T> where BA : BufferAlgebra<T, *>, BA : PowerOperations<Buffer<T>> =
-    bufferAlgebra.sqrt(arg).moveTo(arg.offset)
\ No newline at end of file
+    bufferAlgebra.sqrt(arg).moveTo(arg.startOffset)
\ No newline at end of file
-- 
2.34.1


From 72c70302974a1cc568f32a6c6242d7180c77a9fd Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 10 Mar 2023 22:50:41 +0300
Subject: [PATCH 662/713] Add time series example stub

---
 examples/build.gradle.kts                     |  9 ++--
 .../kscience/kmath/stat/DateTimeSeries.kt     | 19 ++++++++
 .../kmath/series/MonotonicSeriesAlgebra.kt    | 47 +++++++++++++++++++
 .../kscience/kmath/series/SeriesAlgebra.kt    | 16 +++++--
 4 files changed, 82 insertions(+), 9 deletions(-)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/stat/DateTimeSeries.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/MonotonicSeriesAlgebra.kt

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index da645f012..f7b7794f3 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
+
 plugins {
     kotlin("jvm")
 }
@@ -33,6 +35,8 @@ dependencies {
     implementation(project(":kmath-multik"))
     implementation("org.jetbrains.kotlinx:multik-default:$multikVersion")
 
+    //datetime
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
     implementation("org.nd4j:nd4j-native:1.0.0-beta7")
 
@@ -46,9 +50,6 @@ dependencies {
 //    } else
     implementation("org.nd4j:nd4j-native-platform:1.0.0-beta7")
 
-    // multik implementation
-    implementation("org.jetbrains.kotlinx:multik-default:0.1.0")
-
     implementation("org.slf4j:slf4j-simple:1.7.32")
     // plotting
     implementation("space.kscience:plotlykt-server:0.5.0")
@@ -62,7 +63,7 @@ kotlin.sourceSets.all {
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
+tasks.withType<KotlinJvmCompile> {
     kotlinOptions {
         jvmTarget = "11"
         freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" + "-Xopt-in=kotlin.RequiresOptIn" + "-Xlambdas=indy"
diff --git a/examples/src/main/kotlin/space/kscience/kmath/stat/DateTimeSeries.kt b/examples/src/main/kotlin/space/kscience/kmath/stat/DateTimeSeries.kt
new file mode 100644
index 000000000..9836db6ea
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/stat/DateTimeSeries.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.stat
+
+import kotlinx.datetime.Instant
+import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.bufferAlgebra
+import space.kscience.kmath.series.MonotonicSeriesAlgebra
+import space.kscience.kmath.series.SeriesAlgebra
+import kotlin.time.Duration
+
+fun SeriesAlgebra.Companion.time(zero: Instant, step: Duration) = MonotonicSeriesAlgebra(
+    bufferAlgebra = Double.algebra.bufferAlgebra,
+    offsetToLabel = { zero + step * it },
+    labelToOffset = { (it - zero) / step }
+)
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/MonotonicSeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/MonotonicSeriesAlgebra.kt
new file mode 100644
index 000000000..2bc363934
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/MonotonicSeriesAlgebra.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.series
+
+import space.kscience.kmath.operations.BufferAlgebra
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.structures.Buffer
+import kotlin.math.ceil
+import kotlin.math.floor
+
+/**
+ * A [SeriesAlgebra] with reverse label to index transformation.
+ *
+ * @param [labelToOffset] returns floating point number that is used for index resolution.
+ */
+public class MonotonicSeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L : Comparable<L>>(
+    bufferAlgebra: BA,
+    offsetToLabel: (Int) -> L,
+    private val labelToOffset: (L) -> Double,
+) : SeriesAlgebra<T, A, BA, L>(bufferAlgebra, offsetToLabel) {
+
+    public val Buffer<T>.labelRange: ClosedRange<L> get() = offsetToLabel(startOffset)..offsetToLabel(startOffset + size)
+
+    /**
+     * An offset of the given [label] rounded down
+     */
+    public fun floorOffset(label: L): Int = floor(labelToOffset(label)).toInt()
+
+    /**
+     * An offset of the given [label] rounded up
+     */
+    public fun ceilOffset(label: L): Int = ceil(labelToOffset(label)).toInt()
+
+    /**
+     * Get value by label (rounded down) or return null if the value is outside series boundaries.
+     */
+    public fun Buffer<T>.getByLabelOrNull(label: L): T? = getByOffsetOrNull(floorOffset(label))
+
+    /**
+     * Get value by label (rounded down) or throw [IndexOutOfBoundsException] if the value is outside series boundaries.
+     */
+    public fun Buffer<T>.getByLabel(label: L): T = getByLabelOrNull(label)
+        ?: throw IndexOutOfBoundsException("Label $label is not in $labelRange")
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index 45e392693..1847e33b6 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -24,7 +24,9 @@ internal operator fun IntRange.contains(other: IntRange): Boolean = (other.first
 //TODO add permutation sort
 //TODO check rank statistics
 
-
+/**
+ * A [Buffer] with an offset relative to the [SeriesAlgebra] zero.
+ */
 public interface Series<T> : Buffer<T> {
     public val origin: Buffer<T>
 
@@ -54,9 +56,9 @@ private class SeriesImpl<T>(
 /**
  * A scope to operation on series
  */
-public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
+public open class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
     override val bufferAlgebra: BA,
-    private val labelResolver: (Int) -> L,
+    public val offsetToLabel: (Int) -> L,
 ) : RingOps<Buffer<T>>, StatisticalAlgebra<T, A, BA> {
 
     /**
@@ -107,20 +109,22 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
      */
     public val Buffer<T>.startOffset: Int get() = if (this is Series) position else 0
 
+    public val Buffer<T>.startLabel: L get() = offsetToLabel(startOffset)
+
     /**
      * Build a new series positioned at [startOffset].
      */
     public fun series(size: Int, startOffset: Int = 0, block: A.(label: L) -> T): Series<T> {
         return elementAlgebra.bufferFactory(size) {
             val index = it + startOffset
-            elementAlgebra.block(labelResolver(index))
+            elementAlgebra.block(offsetToLabel(index))
         }.moveTo(startOffset)
     }
 
     /**
      * Get a label buffer for given buffer.
      */
-    public val Buffer<T>.labels: List<L> get() = offsetIndices.map(labelResolver)
+    public val Buffer<T>.labels: List<L> get() = offsetIndices.map(offsetToLabel)
 
     /**
      * Try to resolve element by label and return null if element with a given label is not found
@@ -187,6 +191,8 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
     override fun add(left: Buffer<T>, right: Buffer<T>): Series<T> = left.zip(right) { l, r -> l + r }
 
     override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = left.zip(right) { l, r -> l * r }
+
+    public companion object
 }
 
 public fun <T, A : Ring<T>, BA : BufferAlgebra<T, A>, L> BA.seriesAlgebra(labels: Iterable<L>): SeriesAlgebra<T, A, BA, L> {
-- 
2.34.1


From 4c1ffdb6d9db3ea37ff159ad95958184bb8fd517 Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Tue, 14 Mar 2023 13:50:42 +0300
Subject: [PATCH 663/713] search for shortest path algorithm

---
 .../kmath/trajectory/DubinsObstacle.kt        | 24 +++++++-----
 .../kscience/kmath/trajectory/DubinsTest.kt   | 39 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
index 6b247e55b..3aea139ec 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
@@ -136,7 +136,8 @@ public class DubinsObstacle(
     error("next tangent not found")
     }
 
-    public fun equals(other: DubinsObstacle): Boolean {
+    override fun equals(other: Any?): Boolean {
+        if (other == null || other !is DubinsObstacle) return false
         return this.circles == other.circles
     }
 }
@@ -258,7 +259,7 @@ public fun constructTangentCircles(point: DoubleVector2D,
     val center2 = point + normalVectors(direction, r).second
     val p1 = center1 - point
     val p2 = center2 - point
-    return if (atan2(p1.y, p1.x) - atan2(p2.y, p2.x) in listOf(PI/2, -3*PI/2)) {
+    return if (atan2(p1.y, p1.x) - atan2(direction.y, direction.x) in listOf(PI/2, -3*PI/2)) {
         mapOf(DubinsPath.SimpleType.L to Circle2D(center1, r),
             DubinsPath.SimpleType.R to Circle2D(center2, r))
     }
@@ -270,7 +271,7 @@ public fun constructTangentCircles(point: DoubleVector2D,
 
 public fun sortedObstacles(currentObstacle: DubinsObstacle,
                            obstacles: List<DubinsObstacle>): List<DubinsObstacle> {
-    return obstacles.sortedBy {norm(it.center - currentObstacle.center)}.reversed()
+    return obstacles.sortedBy {norm(it.center - currentObstacle.center)}//.reversed()
 }
 
 public fun tangentsAlongTheObstacle(initialCircle: Circle2D,
@@ -389,13 +390,13 @@ public fun findAllPaths(
                         }
                         nextTangents = if (nextObstacle == finalObstacle) {
                             nextTangents.filter {(DubinsPath.toSimpleTypes(it.key)[0] == currentDirection) and
-                                    (DubinsPath.toSimpleTypes(it.key)[0] == j)}
+                                    (DubinsPath.toSimpleTypes(it.key)[2] == j)}
                                     as MutableMap<DubinsPath.Type, DubinsTangent>
                         } else {
                             nextTangents.filter {(DubinsPath.toSimpleTypes(it.key)[0] == currentDirection)}
                                     as MutableMap<DubinsPath.Type, DubinsTangent>
                         }
-                        val tangentsAlong = mutableListOf<DubinsTangent>()
+                        var tangentsAlong = mutableListOf<DubinsTangent>()
                         for (tangent in nextTangents.values) {
                             if (tangent.startCircle == line.last().endCircle) {
                                 val lengthMaxPossible = arcLength(
@@ -413,7 +414,7 @@ public fun findAllPaths(
                                     tangent.lineSegment.begin,
                                     currentDirection)
                                 if (lengthCalculated > lengthMaxPossible) {
-                                    val tangentsAlong = tangentsAlongTheObstacle(
+                                    tangentsAlong = tangentsAlongTheObstacle(
                                         currentCircle,
                                         DubinsPath.toType(listOf(
                                             currentDirection,
@@ -424,11 +425,11 @@ public fun findAllPaths(
                                     )
                                 }
                                 else {
-                                    val tangentsAlong = mutableListOf<DubinsTangent>()
+                                    tangentsAlong = mutableListOf<DubinsTangent>()
                                 }
                             }
                             else {
-                                val tangentsAlong = tangentsAlongTheObstacle(
+                                tangentsAlong = tangentsAlongTheObstacle(
                                     currentCircle,
                                     DubinsPath.toType(listOf(
                                         currentDirection,
@@ -456,6 +457,11 @@ public fun findAllPaths(
                         )] = newOutputTangents
                     }
                 }
+                outputTangents[listOf(
+                    i,
+                    DubinsPath.SimpleType.S,
+                    j
+                )] = newOutputTangents
             }
             for (lineId in outputTangents[listOf(
                 i,
@@ -505,7 +511,7 @@ public fun findAllPaths(
         )]!! + outputTangents[listOf(
         DubinsPath.SimpleType.R,
         DubinsPath.SimpleType.S,
-        DubinsPath.SimpleType.L)]!!
+        DubinsPath.SimpleType.R)]!!
 }
 
 
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
index 16d77c84d..b26b21737 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
@@ -7,6 +7,8 @@ package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.DoubleVector2D
+import space.kscience.kmath.geometry.Euclidean2DSpace
+import space.kscience.kmath.geometry.Euclidean2DSpace.minus
 import space.kscience.kmath.geometry.Euclidean2DSpace.vector
 import kotlin.test.Test
 import kotlin.test.assertTrue
@@ -68,6 +70,18 @@ class DubinsTest {
             obstacles)
         val length = pathLength(shortestPath(outputTangents))
         println(length)
+        for (path in outputTangents) {
+            println(pathLength(path))
+            println(path.size)
+            for (tangent in path) {
+//                println(tangent.route)
+//                println(tangent.startCircle)
+//                println(tangent.endCircle)
+//                println(Euclidean2DSpace.norm(tangent.lineSegment.end - tangent.lineSegment.begin))
+            }
+            println()
+            println()
+        }
     }
     @Test
     fun outerTangentsTest1() {
@@ -78,7 +92,6 @@ class DubinsTest {
             Circle2D(vector(5.0, 5.0), 1.0)
         )
         println(outerTangents(DubinsObstacle(circles1), DubinsObstacle(circles2)))
-        assertTrue(false)
     }
     @Test
     fun outerTangentsTest2() {
@@ -100,6 +113,28 @@ class DubinsTest {
                 }
             }
         }
-        assertTrue(false)
+    }
+    @Test
+    fun tangentsTest() {
+        val circle1 = Circle2D(vector(1.0, 6.5), 0.5)
+        val circle2 = Circle2D(vector(1.0, 6.5), 0.5)
+        val obstacle1 = DubinsObstacle(listOf(circle1))
+        val obstacle2 = DubinsObstacle(listOf(circle2))
+        val tangent = dubinsTangentsToCircles(circle1, circle2, obstacle1, obstacle2)
+        println(tangent)
+    }
+    @Test
+    fun equalCircles() {
+        val circle1 = Circle2D(vector(1.0, 6.5), 0.5)
+        val circle2 = Circle2D(vector(1.0, 6.5), 0.5)
+        println(circle1 == circle2)
+    }
+    @Test
+    fun equalObstacles() {
+        val circle1 = Circle2D(vector(1.0, 6.5), 0.5)
+        val circle2 = Circle2D(vector(1.0, 6.5), 0.5)
+        val obstacle1 = DubinsObstacle(listOf(circle1))
+        val obstacle2 = DubinsObstacle(listOf(circle2))
+        println(obstacle1 == obstacle2)
     }
 }
\ No newline at end of file
-- 
2.34.1


From 28b85b0f53ba5d6e5e82777ffa8d57a770860baa Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Tue, 14 Mar 2023 20:13:34 +0300
Subject: [PATCH 664/713] Remove the choice of left-handed product. Refactor
 `vectorProduct`. Remove `leviChivita` function.

---
 .../kmath/geometry/Euclidean3DSpace.kt        | 34 +++----------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index f1cf0bad2..38c252bc0 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -103,45 +103,21 @@ public object Euclidean3DSpace : GeometrySpace<DoubleVector3D>, ScaleOperations<
     override fun DoubleVector3D.dot(other: DoubleVector3D): Double =
         x * other.x + y * other.y + z * other.z
 
-    private fun leviCivita(i: Int, j: Int, k: Int): Int = when {
-        // even permutation
-        i == 0 && j == 1 && k == 2 -> 1
-        i == 1 && j == 2 && k == 0 -> 1
-        i == 2 && j == 0 && k == 1 -> 1
-        // odd permutations
-        i == 2 && j == 1 && k == 0 -> -1
-        i == 0 && j == 2 && k == 1 -> -1
-        i == 1 && j == 0 && k == 2 -> -1
-
-        else -> 0
-    }
-
     /**
-     * Compute vector product of [first] and [second]. The basis assumed to be right-handed if [rightBasis] is true and
-     * left-handed otherwise
+     * Compute vector product of [first] and [second]. The basis assumed to be right-handed.
      */
     public fun vectorProduct(
         first: DoubleVector3D,
         second: DoubleVector3D,
-        rightBasis: Boolean = true,
     ): DoubleVector3D {
-        var x = 0.0
-        var y = 0.0
-        var z = 0.0
+        val (x1, y1, z1) = first
+        val (x2, y2, z2) = second
 
-        for (j in (0..2)) {
-            for (k in (0..2)) {
-                x += leviCivita(0, j, k) * first[j] * second[k]
-                y += leviCivita(1, j, k) * first[j] * second[k]
-                z += leviCivita(2, j, k) * first[j] * second[k]
-            }
-        }
-
-        return vector(x, y, z) * (if (rightBasis) 1 else -1)
+        return vector(y1 * z2 - y2 * z2, z1 * x2 - z2 * x2, x1 * y2 - x2 * y2)
     }
 
     /**
-     * Vector product with right basis
+     * Vector product with a right basis
      */
     public infix fun DoubleVector3D.cross(other: DoubleVector3D): Vector3D<Double> = vectorProduct(this, other)
 
-- 
2.34.1


From cd2ade881add23d4ac9b3f4b4d5ea594b6ad6d63 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 16 Mar 2023 09:33:17 +0300
Subject: [PATCH 665/713] Revert "Remove the choice of left-handed product.
 Refactor `vectorProduct`. Remove `leviChivita` function."

This reverts commit 28b85b0f53ba5d6e5e82777ffa8d57a770860baa.
---
 .../kmath/geometry/Euclidean3DSpace.kt        | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index 38c252bc0..f1cf0bad2 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -103,21 +103,45 @@ public object Euclidean3DSpace : GeometrySpace<DoubleVector3D>, ScaleOperations<
     override fun DoubleVector3D.dot(other: DoubleVector3D): Double =
         x * other.x + y * other.y + z * other.z
 
+    private fun leviCivita(i: Int, j: Int, k: Int): Int = when {
+        // even permutation
+        i == 0 && j == 1 && k == 2 -> 1
+        i == 1 && j == 2 && k == 0 -> 1
+        i == 2 && j == 0 && k == 1 -> 1
+        // odd permutations
+        i == 2 && j == 1 && k == 0 -> -1
+        i == 0 && j == 2 && k == 1 -> -1
+        i == 1 && j == 0 && k == 2 -> -1
+
+        else -> 0
+    }
+
     /**
-     * Compute vector product of [first] and [second]. The basis assumed to be right-handed.
+     * Compute vector product of [first] and [second]. The basis assumed to be right-handed if [rightBasis] is true and
+     * left-handed otherwise
      */
     public fun vectorProduct(
         first: DoubleVector3D,
         second: DoubleVector3D,
+        rightBasis: Boolean = true,
     ): DoubleVector3D {
-        val (x1, y1, z1) = first
-        val (x2, y2, z2) = second
+        var x = 0.0
+        var y = 0.0
+        var z = 0.0
 
-        return vector(y1 * z2 - y2 * z2, z1 * x2 - z2 * x2, x1 * y2 - x2 * y2)
+        for (j in (0..2)) {
+            for (k in (0..2)) {
+                x += leviCivita(0, j, k) * first[j] * second[k]
+                y += leviCivita(1, j, k) * first[j] * second[k]
+                z += leviCivita(2, j, k) * first[j] * second[k]
+            }
+        }
+
+        return vector(x, y, z) * (if (rightBasis) 1 else -1)
     }
 
     /**
-     * Vector product with a right basis
+     * Vector product with right basis
      */
     public infix fun DoubleVector3D.cross(other: DoubleVector3D): Vector3D<Double> = vectorProduct(this, other)
 
-- 
2.34.1


From ef336af87ddb6df9acc8029e9633234ae5fe6851 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 16 Mar 2023 09:37:03 +0300
Subject: [PATCH 666/713] Fix vector product

---
 .gitignore                                    |  3 ++-
 CHANGELOG.md                                  |  1 +
 examples/build.gradle.kts                     | 14 +++++-----
 gradle.properties                             |  2 +-
 .../space/kscience/kmath/nd/BufferND.kt       | 26 +++++++++++++++++++
 .../integration/GaussIntegratorRuleFactory.kt |  2 --
 .../kmath/geometry/Euclidean3DSpace.kt        |  6 ++---
 .../kmath/geometry/Euclidean3DSpaceTest.kt    |  1 -
 8 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 34ddf3fd9..7713a9f96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,5 @@ out/
 
 !/.idea/copyright/
 !/.idea/scopes/
-/kotlin-js-store/yarn.lock
+/gradle/yarn.lock
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 404366a03..c5fa3f372 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 ### Added
+- Generic builders for `BufferND` and `MutableBufferND`
 - `NamedMatrix` - matrix with symbol-based indexing
 - `Expression` with default arguments
 - Type-aliases for numbers like `Float64`
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index f7b7794f3..50708eaa9 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -55,17 +55,19 @@ dependencies {
     implementation("space.kscience:plotlykt-server:0.5.0")
 }
 
-kotlin.sourceSets.all {
-    with(languageSettings) {
-        optIn("kotlin.contracts.ExperimentalContracts")
-        optIn("kotlin.ExperimentalUnsignedTypes")
-        optIn("space.kscience.kmath.misc.UnstableKMathAPI")
+kotlin {
+    jvmToolchain(11)
+    sourceSets.all {
+        with(languageSettings) {
+            optIn("kotlin.contracts.ExperimentalContracts")
+            optIn("kotlin.ExperimentalUnsignedTypes")
+            optIn("space.kscience.kmath.misc.UnstableKMathAPI")
+        }
     }
 }
 
 tasks.withType<KotlinJvmCompile> {
     kotlinOptions {
-        jvmTarget = "11"
         freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" + "-Xopt-in=kotlin.RequiresOptIn" + "-Xlambdas=indy"
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 048c9c9f3..cded5934c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ kotlin.native.ignoreDisabledTargets=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.14.3-kotlin-1.8.20-RC
+toolsVersion=0.14.4-kotlin-1.8.20-RC
 
 
 org.gradle.parallel=true
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index 55e8bbcf8..a6bab8be1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -7,7 +7,9 @@ package space.kscience.kmath.nd
 
 import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.MutableBuffer
+import space.kscience.kmath.structures.MutableBufferFactory
 
 /**
  * Represents [StructureND] over [Buffer].
@@ -29,6 +31,18 @@ public open class BufferND<out T>(
     override fun toString(): String = StructureND.toString(this)
 }
 
+/**
+ * Create a generic [BufferND] using provided [initializer]
+ */
+public fun <T> BufferND(
+    shape: ShapeND,
+    bufferFactory: BufferFactory<T> = BufferFactory.boxing(),
+    initializer: (IntArray) -> T,
+): BufferND<T> {
+    val strides = Strides(shape)
+    return BufferND(strides, bufferFactory(strides.linearSize) { initializer(strides.index(it)) })
+}
+
 ///**
 // * Transform structure to a new structure using provided [BufferFactory] and optimizing if argument is [BufferND]
 // */
@@ -67,6 +81,18 @@ public open class MutableBufferND<T>(
     }
 }
 
+/**
+ * Create a generic [BufferND] using provided [initializer]
+ */
+public fun <T> MutableBufferND(
+    shape: ShapeND,
+    bufferFactory: MutableBufferFactory<T> = MutableBufferFactory.boxing(),
+    initializer: (IntArray) -> T,
+): MutableBufferND<T> {
+    val strides = Strides(shape)
+    return MutableBufferND(strides, bufferFactory(strides.linearSize) { initializer(strides.index(it)) })
+}
+
 ///**
 // * Transform structure to a new structure using provided [MutableBufferFactory] and optimizing if argument is [MutableBufferND]
 // */
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
index fc76ea819..4ed4965c9 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegratorRuleFactory.kt
@@ -9,7 +9,6 @@ import space.kscience.kmath.operations.mapToBuffer
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.asBuffer
-import kotlin.jvm.Synchronized
 import kotlin.math.ulp
 import kotlin.native.concurrent.ThreadLocal
 
@@ -57,7 +56,6 @@ public object GaussLegendreRuleFactory : GaussIntegratorRuleFactory {
 
     private val cache = HashMap<Int, Pair<Buffer<Double>, Buffer<Double>>>()
 
-    @Synchronized
     private fun getOrBuildRule(numPoints: Int): Pair<Buffer<Double>, Buffer<Double>> =
         cache.getOrPut(numPoints) { buildRule(numPoints) }
 
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
index f1cf0bad2..3059cefe6 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Euclidean3DSpace.kt
@@ -117,13 +117,11 @@ public object Euclidean3DSpace : GeometrySpace<DoubleVector3D>, ScaleOperations<
     }
 
     /**
-     * Compute vector product of [first] and [second]. The basis assumed to be right-handed if [rightBasis] is true and
-     * left-handed otherwise
+     * Compute vector product of [first] and [second]. The basis assumed to be right-handed.
      */
     public fun vectorProduct(
         first: DoubleVector3D,
         second: DoubleVector3D,
-        rightBasis: Boolean = true,
     ): DoubleVector3D {
         var x = 0.0
         var y = 0.0
@@ -137,7 +135,7 @@ public object Euclidean3DSpace : GeometrySpace<DoubleVector3D>, ScaleOperations<
             }
         }
 
-        return vector(x, y, z) * (if (rightBasis) 1 else -1)
+        return vector(x, y, z)
     }
 
     /**
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
index 291b0ad47..20e112ad1 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/Euclidean3DSpaceTest.kt
@@ -78,7 +78,6 @@ internal class Euclidean3DSpaceTest {
         assertVectorEquals(zAxis, vectorProduct(xAxis, yAxis))
         assertVectorEquals(zAxis, xAxis cross yAxis)
         assertVectorEquals(-zAxis, vectorProduct(yAxis, xAxis))
-        assertVectorEquals(zAxis, vectorProduct(yAxis, xAxis, rightBasis = false))
     }
 
     @Test
-- 
2.34.1


From c36af3515e08adb3595a95a6470309eb149fc0c9 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 19 Mar 2023 18:39:27 +0300
Subject: [PATCH 667/713] Update trajectory description

---
 kmath-trajectory/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-trajectory/build.gradle.kts b/kmath-trajectory/build.gradle.kts
index 689c3265b..32b87bb06 100644
--- a/kmath-trajectory/build.gradle.kts
+++ b/kmath-trajectory/build.gradle.kts
@@ -15,7 +15,7 @@ kscience{
 }
 
 readme {
-    description = "Path and trajectory optimization"
-    maturity = space.kscience.gradle.Maturity.PROTOTYPE
+    description = "Path and trajectory optimization (to be moved to a separate project)"
+    maturity = space.kscience.gradle.Maturity.DEPRECATED
     propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
 }
-- 
2.34.1


From 62c8610a9ebb45d5c450ef283ce21ec5e0d4de3c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 19 Mar 2023 19:16:46 +0300
Subject: [PATCH 668/713] Update publishing CD

---
 .github/workflows/publish.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 794881b09..8087195c2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{matrix.os}}
     steps:
       - uses: actions/checkout@v3.0.0
-      - uses: actions/setup-java@v3.0.0
+      - uses: actions/setup-java@v3.10.0
         with:
           java-version: 11
           distribution: liberica
@@ -26,26 +26,24 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - uses: gradle/wrapper-validation-action@v1.0.4
       - name: Publish Windows Artifacts
         if: matrix.os == 'windows-latest'
-        uses: gradle/gradle-build-action@v2.1.5
+        uses: gradle/gradle-build-action@v2.4.0
         with:
           arguments: |
-            releaseAll
+            publishAllPublicationsToSpaceRepository
             -Ppublishing.enabled=true
-            -Ppublishing.sonatype=false
             -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
             -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
       - name: Publish Mac Artifacts
         if: matrix.os == 'macOS-latest'
-        uses: gradle/gradle-build-action@v2.1.5
+        uses: gradle/gradle-build-action@v2.4.0
         with:
           arguments: |
-            releaseMacosX64
-            releaseIosArm64
-            releaseIosX64
+            publishMacosX64PublicationsToSpaceRepository
+            publishIosX64PublicationsToSpaceRepository
+            publishIosArm64PublicationsToSpaceRepository
+            publishIosSimulatorArm64PublicationsToSpaceRepository
             -Ppublishing.enabled=true
-            -Ppublishing.sonatype=false            
             -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
             -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
-- 
2.34.1


From c442eb7e94ff562688b171cfcdf7deb829b71d47 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 19 Mar 2023 19:41:31 +0300
Subject: [PATCH 669/713] Fix publish task names

---
 .github/workflows/publish.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8087195c2..0ac8805e0 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -40,10 +40,10 @@ jobs:
         uses: gradle/gradle-build-action@v2.4.0
         with:
           arguments: |
-            publishMacosX64PublicationsToSpaceRepository
-            publishIosX64PublicationsToSpaceRepository
-            publishIosArm64PublicationsToSpaceRepository
-            publishIosSimulatorArm64PublicationsToSpaceRepository
+            publishMacosX64PublicationToSpaceRepository
+            publishIosX64PublicationToSpaceRepository
+            publishIosArm64PublicationToSpaceRepository
+            publishIosSimulatorArm64PublicationToSpaceRepository
             -Ppublishing.enabled=true
             -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
             -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
-- 
2.34.1


From 81213eb94340fc87ae6958d30e598d234439dc35 Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Tue, 21 Mar 2023 12:04:27 +0300
Subject: [PATCH 670/713] search for shortest path algorithm

---
 .../kmath/trajectory/DubinsObstacle.kt        | 87 +++++++++----------
 .../kscience/kmath/trajectory/DubinsTest.kt   | 50 +----------
 2 files changed, 45 insertions(+), 92 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
index 3aea139ec..896803fba 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
@@ -39,8 +39,6 @@ public class DubinsObstacle(
             var angle2: Double
             val routes = mapOf(
                 DubinsPath.Type.RSR to Pair(radius, other.radius),
-//                DubinsPath.Type.RSL to Pair(radius, -other.radius),
-//                DubinsPath.Type.LSR to Pair(-radius, other.radius),
                 DubinsPath.Type.LSL to Pair(-radius, -other.radius)
             )
             return buildMap {
@@ -76,8 +74,7 @@ public class DubinsObstacle(
                 }
             }
         }
-//        val firstCircles = this.circles.slice(-this.circles.size..-1)
-//        val secondCircles = this.circles.slice(-this.circles.size+1..0)
+
         val firstCircles = this.circles
         val secondCircles = this.circles.slice(1..this.circles.lastIndex) +
                 this.circles[0]
@@ -149,7 +146,7 @@ public data class DubinsTangent(val startCircle: Circle2D,
                                 val lineSegment: LineSegment2D,
                                 val route: PathTypes)
 
-public fun LineSegment2D.intersectSegment(other: LineSegment2D): Boolean {
+private fun LineSegment2D.intersectSegment(other: LineSegment2D): Boolean {
     fun crossProduct(v1: DoubleVector2D, v2: DoubleVector2D): Double {
         return v1.x * v2.y - v1.y * v2.x
     }
@@ -164,7 +161,7 @@ public fun LineSegment2D.intersectSegment(other: LineSegment2D): Boolean {
     return true
 }
 
-public fun LineSegment2D.intersectCircle(circle: Circle2D): Boolean {
+private fun LineSegment2D.intersectCircle(circle: Circle2D): Boolean {
     val a = (this.begin.x - this.end.x).pow(2.0) + (this.begin.y - this.end.y).pow(2.0)
     val b = 2 * ((this.begin.x - this.end.x) * (this.end.x - circle.center.x) +
             (this.begin.y - this.end.y) * (this.end.y - circle.center.y))
@@ -184,7 +181,7 @@ public fun LineSegment2D.intersectCircle(circle: Circle2D): Boolean {
     return false
 }
 
-public fun DubinsTangent.intersectObstacle(obstacle: DubinsObstacle): Boolean {
+private fun DubinsTangent.intersectObstacle(obstacle: DubinsObstacle): Boolean {
     for (tangent in obstacle.tangents) {
         if (this.lineSegment.intersectSegment(tangent.lineSegment)) {
             return true
@@ -198,7 +195,7 @@ public fun DubinsTangent.intersectObstacle(obstacle: DubinsObstacle): Boolean {
     return false
 }
 
-public fun outerTangents(first: DubinsObstacle, second: DubinsObstacle): MutableMap<DubinsPath.Type, DubinsTangent> {
+private fun outerTangents(first: DubinsObstacle, second: DubinsObstacle): MutableMap<DubinsPath.Type, DubinsTangent> {
     return buildMap {
         for (circle1 in first.circles) {
             for (circle2 in second.circles) {
@@ -216,7 +213,7 @@ public fun outerTangents(first: DubinsObstacle, second: DubinsObstacle): Mutable
     }.toMutableMap()
 }
 
-public fun arcLength(circle: Circle2D,
+private fun arcLength(circle: Circle2D,
                      point1: DoubleVector2D,
                      point2: DoubleVector2D,
                      route: DubinsPath.SimpleType): Double {
@@ -245,14 +242,14 @@ public fun arcLength(circle: Circle2D,
     return circle.radius * angle
 }
 
-public fun normalVectors(v: DoubleVector2D, r: Double): Pair<DoubleVector2D, DoubleVector2D> {
+private fun normalVectors(v: DoubleVector2D, r: Double): Pair<DoubleVector2D, DoubleVector2D> {
     return Pair(
         r * vector(v.y / norm(v), -v.x / norm(v)),
         r * vector(-v.y / norm(v), v.x / norm(v))
     )
 }
 
-public fun constructTangentCircles(point: DoubleVector2D,
+private fun constructTangentCircles(point: DoubleVector2D,
                                    direction: DoubleVector2D,
                                    r: Double): Map<DubinsPath.SimpleType, Circle2D> {
     val center1 = point + normalVectors(direction, r).first
@@ -269,12 +266,12 @@ public fun constructTangentCircles(point: DoubleVector2D,
     }
 }
 
-public fun sortedObstacles(currentObstacle: DubinsObstacle,
+private fun sortedObstacles(currentObstacle: DubinsObstacle,
                            obstacles: List<DubinsObstacle>): List<DubinsObstacle> {
     return obstacles.sortedBy {norm(it.center - currentObstacle.center)}//.reversed()
 }
 
-public fun tangentsAlongTheObstacle(initialCircle: Circle2D,
+private fun tangentsAlongTheObstacle(initialCircle: Circle2D,
                                     initialRoute: DubinsPath.Type,
                                     finalCircle: Circle2D,
                                     obstacle: DubinsObstacle): MutableList<DubinsTangent> {
@@ -288,7 +285,7 @@ public fun tangentsAlongTheObstacle(initialCircle: Circle2D,
     return dubinsTangents
 }
 
-public fun allFinished(paths: List<List<DubinsTangent>>,
+private fun allFinished(paths: List<List<DubinsTangent>>,
                        finalObstacle: DubinsObstacle): Boolean {
     for (path in paths) {
         if (path.last().endObstacle != finalObstacle) {
@@ -333,28 +330,28 @@ public fun findAllPaths(
         finalPoint,
         finalDirection,
         finalRadius)
-    var outputTangents = mutableMapOf<PathTypes, MutableList<MutableList<DubinsTangent>>>()
+    var path = mutableMapOf<PathTypes, MutableList<MutableList<DubinsTangent>>>()
     for (i in listOf(DubinsPath.SimpleType.L, DubinsPath.SimpleType.R)) {
         for (j in listOf(DubinsPath.SimpleType.L, DubinsPath.SimpleType.R)) {
             val finalCircle = finalCircles[j]!!
             val finalObstacle = DubinsObstacle(listOf(finalCircle))
-            outputTangents[listOf(i,
-                           DubinsPath.SimpleType.S,
-                           j)] = mutableListOf(
-                                    mutableListOf(DubinsTangent(
-                                        initialCircles[i]!!,
-                                        initialCircles[i]!!,
-                                        DubinsObstacle(listOf(initialCircles[i]!!)),
-                                        DubinsObstacle(listOf(initialCircles[i]!!)),
-                                        LineSegment2D(startingPoint, startingPoint),
-                                        listOf(i, DubinsPath.SimpleType.S, i)
-                                    )))
-            var currentObstacle = DubinsObstacle(listOf(initialCircles[i]!!))
-            while (!allFinished(outputTangents[listOf(i,
+            path[listOf(i,
+                        DubinsPath.SimpleType.S,
+                        j)] = mutableListOf(
+                                mutableListOf(DubinsTangent(
+                                    initialCircles[i]!!,
+                                    initialCircles[i]!!,
+                                    DubinsObstacle(listOf(initialCircles[i]!!)),
+                                    DubinsObstacle(listOf(initialCircles[i]!!)),
+                                    LineSegment2D(startingPoint, startingPoint),
+                                    listOf(i, DubinsPath.SimpleType.S, i)
+                                )))
+            //var currentObstacle = DubinsObstacle(listOf(initialCircles[i]!!))
+            while (!allFinished(path[listOf(i,
                     DubinsPath.SimpleType.S,
                     j)]!!, finalObstacle)) {
-                var newOutputTangents = mutableListOf<MutableList<DubinsTangent>>()
-                for (line in outputTangents[listOf(i,
+                var newPaths = mutableListOf<MutableList<DubinsTangent>>()
+                for (line in path[listOf(i,
                     DubinsPath.SimpleType.S,
                     j)]!!) {
                     var currentCircle = line.last().endCircle
@@ -439,41 +436,41 @@ public fun findAllPaths(
                                     currentObstacle
                                 )
                             }
-                            newOutputTangents.add((line + tangentsAlong + listOf(tangent)).toMutableList())
+                            newPaths.add((line + tangentsAlong + listOf(tangent)).toMutableList())
                         }
-                        outputTangents[listOf(
+                        path[listOf(
                             i,
                             DubinsPath.SimpleType.S,
                             j
-                        )] = newOutputTangents
+                        )] = newPaths
                     }
                     else {
                         // minor changes from Python code
-                        newOutputTangents.add(line)
-                        outputTangents[listOf(
+                        newPaths.add(line)
+                        path[listOf(
                             i,
                             DubinsPath.SimpleType.S,
                             j
-                        )] = newOutputTangents
+                        )] = newPaths
                     }
                 }
-                outputTangents[listOf(
+                path[listOf(
                     i,
                     DubinsPath.SimpleType.S,
                     j
-                )] = newOutputTangents
+                )] = newPaths
             }
-            for (lineId in outputTangents[listOf(
+            for (lineId in path[listOf(
                 i,
                 DubinsPath.SimpleType.S,
                 j
             )]!!.indices) {
-                val lastDirection = outputTangents[listOf(
+                val lastDirection = path[listOf(
                     i,
                     DubinsPath.SimpleType.S,
                     j
                 )]!![lineId].last().route[2]
-                outputTangents[listOf(
+                path[listOf(
                     i,
                     DubinsPath.SimpleType.S,
                     j
@@ -496,19 +493,19 @@ public fun findAllPaths(
             }
         }
     }
-    return outputTangents[listOf(
+    return path[listOf(
         DubinsPath.SimpleType.L,
         DubinsPath.SimpleType.S,
         DubinsPath.SimpleType.L
-        )]!! + outputTangents[listOf(
+        )]!! + path[listOf(
         DubinsPath.SimpleType.L,
         DubinsPath.SimpleType.S,
         DubinsPath.SimpleType.R
-        )]!! + outputTangents[listOf(
+        )]!! + path[listOf(
         DubinsPath.SimpleType.R,
         DubinsPath.SimpleType.S,
         DubinsPath.SimpleType.L
-        )]!! + outputTangents[listOf(
+        )]!! + path[listOf(
         DubinsPath.SimpleType.R,
         DubinsPath.SimpleType.S,
         DubinsPath.SimpleType.R)]!!
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
index b26b21737..a78a5317d 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
@@ -6,12 +6,8 @@
 package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.DoubleVector2D
-import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.geometry.Euclidean2DSpace.minus
 import space.kscience.kmath.geometry.Euclidean2DSpace.vector
 import kotlin.test.Test
-import kotlin.test.assertTrue
 
 class DubinsTest {
     @Test
@@ -60,7 +56,7 @@ class DubinsTest {
                 Circle2D(vector(9.0, 4.0), 0.5)
             ))
         )
-        val outputTangents = findAllPaths(
+        val paths = findAllPaths(
             startPoint,
             startDirection,
             startRadius,
@@ -68,9 +64,9 @@ class DubinsTest {
             finalDirection,
             finalRadius,
             obstacles)
-        val length = pathLength(shortestPath(outputTangents))
+        val length = pathLength(shortestPath(paths))
         println(length)
-        for (path in outputTangents) {
+        for (path in paths) {
             println(pathLength(path))
             println(path.size)
             for (tangent in path) {
@@ -84,46 +80,6 @@ class DubinsTest {
         }
     }
     @Test
-    fun outerTangentsTest1() {
-        // works incorrectly
-        val circles1 = listOf(
-            Circle2D(vector(0.0, 0.0), 1.0))
-        val circles2 = listOf(
-            Circle2D(vector(5.0, 5.0), 1.0)
-        )
-        println(outerTangents(DubinsObstacle(circles1), DubinsObstacle(circles2)))
-    }
-    @Test
-    fun outerTangentsTest2() {
-        // works incorrectly
-        val circles1 = listOf(
-            Circle2D(vector(0.0, 0.0), 1.0),
-            Circle2D(vector( 2.0, 0.0), 1.0))
-        val circles2 = listOf(
-            Circle2D(vector(5.0, 5.0), 1.0),
-            Circle2D(vector(7.0, 5.0), 1.0)
-        )
-        println(outerTangents(DubinsObstacle(circles1), DubinsObstacle(circles2)))
-
-        for (circle1 in circles1) {
-            for (circle2 in circles2) {
-                for (tangent in dubinsTangentsToCircles(circle1, circle2,
-                    DubinsObstacle(circles1), DubinsObstacle(circles2))) {
-                    println(tangent)
-                }
-            }
-        }
-    }
-    @Test
-    fun tangentsTest() {
-        val circle1 = Circle2D(vector(1.0, 6.5), 0.5)
-        val circle2 = Circle2D(vector(1.0, 6.5), 0.5)
-        val obstacle1 = DubinsObstacle(listOf(circle1))
-        val obstacle2 = DubinsObstacle(listOf(circle2))
-        val tangent = dubinsTangentsToCircles(circle1, circle2, obstacle1, obstacle2)
-        println(tangent)
-    }
-    @Test
     fun equalCircles() {
         val circle1 = Circle2D(vector(1.0, 6.5), 0.5)
         val circle2 = Circle2D(vector(1.0, 6.5), 0.5)
-- 
2.34.1


From 56bba749c026863a02ed6eb461d85d29d56e81e6 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 22 Mar 2023 10:54:24 +0300
Subject: [PATCH 671/713] Update publishing

---
 .github/workflows/publish.yml                                 | 4 ++--
 gradle.properties                                             | 2 +-
 .../kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0ac8805e0..471388364 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           arguments: |
             publishAllPublicationsToSpaceRepository
-            -Ppublishing.enabled=true
+            -Ppublishing.targets=all
             -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
             -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
       - name: Publish Mac Artifacts
@@ -44,6 +44,6 @@ jobs:
             publishIosX64PublicationToSpaceRepository
             publishIosArm64PublicationToSpaceRepository
             publishIosSimulatorArm64PublicationToSpaceRepository
-            -Ppublishing.enabled=true
+            -Ppublishing.targets=all
             -Ppublishing.space.user=${{ secrets.SPACE_APP_ID }}
             -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
diff --git a/gradle.properties b/gradle.properties
index cded5934c..262bcabfb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ kotlin.native.ignoreDisabledTargets=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.14.4-kotlin-1.8.20-RC
+toolsVersion=0.14.5-kotlin-1.8.20-RC
 
 
 org.gradle.parallel=true
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
index 2fd4f0057..48be93b87 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/coroutines/coroutinesExtra.kt
@@ -8,6 +8,7 @@
 package space.kscience.kmath.coroutines
 
 import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.ReceiveChannel
 import kotlinx.coroutines.channels.produce
 import kotlinx.coroutines.flow.*
 
@@ -57,7 +58,7 @@ public suspend fun <T> AsyncFlow<T>.collect(concurrency: Int, collector: FlowCol
 
     coroutineScope {
         //Starting up to N deferred coroutines ahead of time
-        val channel = produce(capacity = concurrency - 1) {
+        val channel: ReceiveChannel<LazyDeferred<T>> = produce(capacity = concurrency - 1) {
             deferredFlow.collect { value ->
                 value.start(this@coroutineScope)
                 send(value)
-- 
2.34.1


From d87eefcaa359f92a9a35c34784e196f767aa2836 Mon Sep 17 00:00:00 2001
From: SPC-code <112205870+SPC-code@users.noreply.github.com>
Date: Wed, 22 Mar 2023 18:04:16 +0300
Subject: [PATCH 672/713] Add macOsArm64 to publish.yml

---
 .github/workflows/publish.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 471388364..ab9243f15 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -41,6 +41,7 @@ jobs:
         with:
           arguments: |
             publishMacosX64PublicationToSpaceRepository
+            publishMacosArm64PublicationToSpaceRepository
             publishIosX64PublicationToSpaceRepository
             publishIosArm64PublicationToSpaceRepository
             publishIosSimulatorArm64PublicationToSpaceRepository
-- 
2.34.1


From ea5305c8d878e910128543f44453fe7e20294164 Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Fri, 24 Mar 2023 10:28:02 +0300
Subject: [PATCH 673/713] search for shortest path algorithm

---
 .../kscience/kmath/trajectory/DubinsTest.kt    | 18 ++++--------------
 .../kscience/kmath/trajectory/TangentTest.kt   | 15 +--------------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
index a78a5317d..fdc3bd3c7 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
@@ -7,7 +7,9 @@ package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace.vector
+import space.kscience.kmath.geometry.equalsFloat
 import kotlin.test.Test
+import kotlin.test.assertTrue
 
 class DubinsTest {
     @Test
@@ -31,7 +33,7 @@ class DubinsTest {
             finalRadius,
             obstacles)
         val length = pathLength(shortestPath(outputTangents))
-        println(length)
+        assertTrue(length.equalsFloat(27.2113183))
     }
 
     @Test
@@ -65,19 +67,7 @@ class DubinsTest {
             finalRadius,
             obstacles)
         val length = pathLength(shortestPath(paths))
-        println(length)
-        for (path in paths) {
-            println(pathLength(path))
-            println(path.size)
-            for (tangent in path) {
-//                println(tangent.route)
-//                println(tangent.startCircle)
-//                println(tangent.endCircle)
-//                println(Euclidean2DSpace.norm(tangent.lineSegment.end - tangent.lineSegment.begin))
-            }
-            println()
-            println()
-        }
+        assertTrue(length.equalsFloat(28.9678224))
     }
     @Test
     fun equalCircles() {
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
index 6d4493124..2ae89038c 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
@@ -12,6 +12,7 @@ import space.kscience.kmath.geometry.LineSegment
 import space.kscience.kmath.geometry.equalsLine
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
 
 class TangentTest {
@@ -60,18 +61,4 @@ class TangentTest {
         val c2 = Circle2D(vector(0.0, 0.0), 1.0)
         assertEquals(emptyMap(), c1.tangentsToCircle(c2))
     }
-//
-//    @Test
-//    fun nonExistingTangents() {
-//        assertFailsWith<NotImplementedError> {
-//            val c1 = Circle2D(vector(0.0, 0.0), 1.0)
-//            val c2 = Circle2D(vector(2.0, 0.0), 1.0)
-//            c1.tangentsToCircle(c2)
-//        }
-//        assertFailsWith<NotImplementedError> {
-//            val c1 = Circle2D(vector(0.0, 0.0), 1.0)
-//            val c2 = Circle2D(vector(0.5, 0.0), 1.0)
-//            c1.tangentsToCircle(c2)
-//        }
-//    }
 }
\ No newline at end of file
-- 
2.34.1


From 24c39c97cd4b9186a8445dedffff4c7fcc3e5ca1 Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Fri, 24 Mar 2023 10:30:13 +0300
Subject: [PATCH 674/713] search for shortest path algorithm

---
 .../kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
index 896803fba..ee0b58a15 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
@@ -255,7 +255,6 @@ private fun constructTangentCircles(point: DoubleVector2D,
     val center1 = point + normalVectors(direction, r).first
     val center2 = point + normalVectors(direction, r).second
     val p1 = center1 - point
-    val p2 = center2 - point
     return if (atan2(p1.y, p1.x) - atan2(direction.y, direction.x) in listOf(PI/2, -3*PI/2)) {
         mapOf(DubinsPath.SimpleType.L to Circle2D(center1, r),
             DubinsPath.SimpleType.R to Circle2D(center2, r))
-- 
2.34.1


From 11dd4088d977f5c2ecacfe264e77bf432a44a8e3 Mon Sep 17 00:00:00 2001
From: Artyom Degtyarev <artdegt98@mail.ru>
Date: Fri, 24 Mar 2023 10:39:51 +0300
Subject: [PATCH 675/713] search for shortest path algorithm

---
 .../kotlin/space/kscience/kmath/trajectory/DubinsTest.kt     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
index fdc3bd3c7..07e9861c7 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
@@ -9,6 +9,7 @@ import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace.vector
 import space.kscience.kmath.geometry.equalsFloat
 import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
 class DubinsTest {
@@ -33,7 +34,7 @@ class DubinsTest {
             finalRadius,
             obstacles)
         val length = pathLength(shortestPath(outputTangents))
-        assertTrue(length.equalsFloat(27.2113183))
+        assertEquals(length, 27.2113183, 1e-6)
     }
 
     @Test
@@ -67,7 +68,7 @@ class DubinsTest {
             finalRadius,
             obstacles)
         val length = pathLength(shortestPath(paths))
-        assertTrue(length.equalsFloat(28.9678224))
+        assertEquals(length,28.9678224, 1e-6)
     }
     @Test
     fun equalCircles() {
-- 
2.34.1


From f809e40791f73ab33bb05d3a23947fe8af310f98 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 4 Apr 2023 11:42:58 +0300
Subject: [PATCH 676/713] Disentangle obstacle code phase 1

---
 .../kmath/trajectory/DubinsObstacle.kt        | 519 ---------------
 .../kscience/kmath/trajectory/DubinsPath.kt   | 241 ++-----
 .../kscience/kmath/trajectory/Obstacle.kt     | 619 ++++++++++++++++++
 .../kscience/kmath/trajectory/Trajectory2D.kt |  34 +-
 .../kscience/kmath/trajectory/tangent.kt      | 114 ----
 .../trajectory/{dubins => }/DubinsTests.kt    |   7 +-
 .../{DubinsTest.kt => ObstacleTest.kt}        |  65 +-
 .../kmath/trajectory/segments/ArcTests.kt     |   3 +-
 8 files changed, 748 insertions(+), 854 deletions(-)
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
 create mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
 rename kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/{dubins => }/DubinsTests.kt (93%)
 rename kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/{DubinsTest.kt => ObstacleTest.kt} (55%)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
deleted file mode 100644
index ee0b58a15..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsObstacle.kt
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- * Copyright 2018-2023 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory
-
-import space.kscience.kmath.geometry.*
-import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.geometry.Euclidean2DSpace.minus
-import space.kscience.kmath.geometry.Euclidean2DSpace.plus
-import space.kscience.kmath.geometry.Euclidean2DSpace.times
-import space.kscience.kmath.geometry.Euclidean2DSpace.vector
-import space.kscience.kmath.geometry.Euclidean2DSpace.norm
-import space.kscience.kmath.operations.DoubleField.pow
-import kotlin.math.*
-
-public fun LineSegment2D.length(): Double {
-    return ((end.y - begin.y).pow(2.0) + (end.x - begin.x).pow(2.0)).pow(0.5)
-}
-public class DubinsObstacle(
-    public val circles: List<Circle2D>
-) {
-    public val tangents: List<DubinsTangent> = boundaryTangents().first
-    public val boundaryRoute: DubinsPath.Type = boundaryTangents().second
-    public val center: Vector2D<Double> =
-        vector(this.circles.sumOf{it.center.x} / this.circles.size,
-               this.circles.sumOf{it.center.y} / this.circles.size)
-    private fun boundaryTangents(): Pair<List<DubinsTangent>, DubinsPath.Type> {
-        // outer tangents for a polygon circles can be either lsl or rsr
-
-        fun Circle2D.dubinsTangentsToCircles(
-            other: Circle2D,
-        ): Map<DubinsPath.Type, DubinsTangent> = with(Euclidean2DSpace) {
-            val line = LineSegment(center, other.center)
-            val d = line.begin.distanceTo(line.end)
-            val angle1 = atan2(other.center.x - center.x, other.center.y - center.y)
-            var r: Double
-            var angle2: Double
-            val routes = mapOf(
-                DubinsPath.Type.RSR to Pair(radius, other.radius),
-                DubinsPath.Type.LSL to Pair(-radius, -other.radius)
-            )
-            return buildMap {
-                for ((route, r1r2) in routes) {
-                    val r1 = r1r2.first
-                    val r2 = r1r2.second
-                    r = if (r1.sign == r2.sign) {
-                        r1.absoluteValue - r2.absoluteValue
-                    } else {
-                        r1.absoluteValue + r2.absoluteValue
-                    }
-                    if (d * d >= r * r) {
-                        val l = (d * d - r * r).pow(0.5)
-                        angle2 = if (r1.absoluteValue > r2.absoluteValue) {
-                            angle1 + r1.sign * atan2(r.absoluteValue, l)
-                        } else {
-                            angle1 - r2.sign * atan2(r.absoluteValue, l)
-                        }
-                        val w = vector(-cos(angle2), sin(angle2))
-                        put(route, DubinsTangent(Circle2D(center, radius),
-                            other,
-                            this@DubinsObstacle,
-                            this@DubinsObstacle,
-                            LineSegment2D(
-                                center + w * r1,
-                                other.center + w * r2
-                            ),
-                            DubinsPath.toSimpleTypes(route))
-                        )
-                    } else {
-                        throw Exception("Circles should not intersect")
-                    }
-                }
-            }
-        }
-
-        val firstCircles = this.circles
-        val secondCircles = this.circles.slice(1..this.circles.lastIndex) +
-                this.circles[0]
-        val lslTangents = firstCircles.zip(secondCircles)
-        {a, b -> a.dubinsTangentsToCircles(b)[DubinsPath.Type.LSL]!!}
-        val rsrTangents = firstCircles.zip(secondCircles)
-        {a, b -> a.dubinsTangentsToCircles(b)[DubinsPath.Type.RSR]!!}
-        val center = vector(
-            this.circles.sumOf { it.center.x } / this.circles.size,
-            this.circles.sumOf { it.center.y } / this.circles.size
-        )
-        val lslToCenter = lslTangents.sumOf { it.lineSegment.begin.distanceTo(center) } +
-                lslTangents.sumOf { it.lineSegment.end.distanceTo(center) }
-        val rsrToCenter = rsrTangents.sumOf { it.lineSegment.begin.distanceTo(center) } +
-                rsrTangents.sumOf { it.lineSegment.end.distanceTo(center) }
-        return if (rsrToCenter >= lslToCenter) {
-            Pair(rsrTangents, DubinsPath.Type.RSR)
-        } else {
-            Pair(lslTangents, DubinsPath.Type.LSL)
-        }
-    }
-
-    public fun nextTangent(circle: Circle2D, route: DubinsPath.Type): DubinsTangent {
-        if (route == this.boundaryRoute) {
-            for (i in this.circles.indices) {
-                if (this.circles[i] == circle) {
-                    return this.tangents[i]
-                }
-            }
-        }
-        else {
-            for (i in this.circles.indices) {
-                if (this.circles[i] == circle) {
-                    if (i > 0) {
-                        return DubinsTangent(this.circles[i],
-                            this.circles[i-1],
-                            this,
-                            this,
-                            LineSegment2D(this.tangents[i-1].lineSegment.end,
-                                this.tangents[i-1].lineSegment.begin),
-                            DubinsPath.toSimpleTypes(route))
-                    }
-                    else {
-                        return DubinsTangent(this.circles[0],
-                            this.circles.last(),
-                            this,
-                            this,
-                            LineSegment2D(this.tangents.last().lineSegment.end,
-                                this.tangents.last().lineSegment.begin),
-                            DubinsPath.toSimpleTypes(route))
-                    }
-                }
-            }
-        }
-
-    error("next tangent not found")
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (other == null || other !is DubinsObstacle) return false
-        return this.circles == other.circles
-    }
-}
-
-public data class DubinsTangent(val startCircle: Circle2D,
-                                val endCircle: Circle2D,
-                                val startObstacle: DubinsObstacle,
-                                val endObstacle: DubinsObstacle,
-                                val lineSegment: LineSegment2D,
-                                val route: PathTypes)
-
-private fun LineSegment2D.intersectSegment(other: LineSegment2D): Boolean {
-    fun crossProduct(v1: DoubleVector2D, v2: DoubleVector2D): Double {
-        return v1.x * v2.y - v1.y * v2.x
-    }
-    if (crossProduct(other.begin - this.begin, other.end - this.begin).sign ==
-        crossProduct(other.begin - this.end, other.end - this.end).sign) {
-        return false
-    }
-    if (crossProduct(this.begin - other.begin, this.end - other.begin).sign ==
-        crossProduct(this.begin - other.end, this.end - other.end).sign) {
-        return false
-    }
-    return true
-}
-
-private fun LineSegment2D.intersectCircle(circle: Circle2D): Boolean {
-    val a = (this.begin.x - this.end.x).pow(2.0) + (this.begin.y - this.end.y).pow(2.0)
-    val b = 2 * ((this.begin.x - this.end.x) * (this.end.x - circle.center.x) +
-            (this.begin.y - this.end.y) * (this.end.y - circle.center.y))
-    val c = (this.end.x - circle.center.x).pow(2.0) + (this.end.y - circle.center.y).pow(2.0) -
-            circle.radius.pow(2.0)
-    val d = b.pow(2.0) - 4 * a * c
-    if (d < 1e-6) {
-        return false
-    }
-    else {
-        val t1 = (-b - d.pow(0.5)) * 0.5 / a
-        val t2 = (-b + d.pow(0.5)) * 0.5 / a
-        if (((0 < t1) and (t1 < 1)) or ((0 < t2) and (t2 < 1))) {
-            return true
-        }
-    }
-    return false
-}
-
-private fun DubinsTangent.intersectObstacle(obstacle: DubinsObstacle): Boolean {
-    for (tangent in obstacle.tangents) {
-        if (this.lineSegment.intersectSegment(tangent.lineSegment)) {
-            return true
-        }
-    }
-    for (circle in obstacle.circles) {
-        if (this.lineSegment.intersectCircle(circle)) {
-            return true
-        }
-    }
-    return false
-}
-
-private fun outerTangents(first: DubinsObstacle, second: DubinsObstacle): MutableMap<DubinsPath.Type, DubinsTangent> {
-    return buildMap {
-        for (circle1 in first.circles) {
-            for (circle2 in second.circles) {
-                for (tangent in dubinsTangentsToCircles(circle1, circle2, first, second)) {
-                    if (!(tangent.value.intersectObstacle(first))
-                        and !(tangent.value.intersectObstacle(second))) {
-                        put(
-                            tangent.key,
-                            tangent.value
-                        )
-                    }
-                }
-            }
-        }
-    }.toMutableMap()
-}
-
-private fun arcLength(circle: Circle2D,
-                     point1: DoubleVector2D,
-                     point2: DoubleVector2D,
-                     route: DubinsPath.SimpleType): Double {
-    val phi1 = atan2(point1.y - circle.center.y, point1.x - circle.center.x)
-    val phi2 = atan2(point2.y - circle.center.y, point2.x - circle.center.x)
-    var angle = 0.0
-    when (route) {
-        DubinsPath.SimpleType.L -> {
-            angle = if (phi2 >= phi1) {
-                phi2 - phi1
-            } else {
-                2 * PI + phi2 - phi1
-            }
-        }
-        DubinsPath.SimpleType.R -> {
-            angle = if (phi2 >= phi1) {
-                2 * PI - (phi2 - phi1)
-            } else {
-                -(phi2 - phi1)
-            }
-        }
-        DubinsPath.SimpleType.S -> {
-            error("L or R route is expected")
-        }
-    }
-    return circle.radius * angle
-}
-
-private fun normalVectors(v: DoubleVector2D, r: Double): Pair<DoubleVector2D, DoubleVector2D> {
-    return Pair(
-        r * vector(v.y / norm(v), -v.x / norm(v)),
-        r * vector(-v.y / norm(v), v.x / norm(v))
-    )
-}
-
-private fun constructTangentCircles(point: DoubleVector2D,
-                                   direction: DoubleVector2D,
-                                   r: Double): Map<DubinsPath.SimpleType, Circle2D> {
-    val center1 = point + normalVectors(direction, r).first
-    val center2 = point + normalVectors(direction, r).second
-    val p1 = center1 - point
-    return if (atan2(p1.y, p1.x) - atan2(direction.y, direction.x) in listOf(PI/2, -3*PI/2)) {
-        mapOf(DubinsPath.SimpleType.L to Circle2D(center1, r),
-            DubinsPath.SimpleType.R to Circle2D(center2, r))
-    }
-    else {
-        mapOf(DubinsPath.SimpleType.L to Circle2D(center2, r),
-            DubinsPath.SimpleType.R to Circle2D(center1, r))
-    }
-}
-
-private fun sortedObstacles(currentObstacle: DubinsObstacle,
-                           obstacles: List<DubinsObstacle>): List<DubinsObstacle> {
-    return obstacles.sortedBy {norm(it.center - currentObstacle.center)}//.reversed()
-}
-
-private fun tangentsAlongTheObstacle(initialCircle: Circle2D,
-                                    initialRoute: DubinsPath.Type,
-                                    finalCircle: Circle2D,
-                                    obstacle: DubinsObstacle): MutableList<DubinsTangent> {
-    val dubinsTangents = mutableListOf<DubinsTangent>()
-    var tangent = obstacle.nextTangent(initialCircle, initialRoute)
-    dubinsTangents.add(tangent)
-    while (tangent.endCircle != finalCircle) {
-        tangent = obstacle.nextTangent(tangent.endCircle, initialRoute)
-        dubinsTangents.add(tangent)
-    }
-    return dubinsTangents
-}
-
-private fun allFinished(paths: List<List<DubinsTangent>>,
-                       finalObstacle: DubinsObstacle): Boolean {
-    for (path in paths) {
-        if (path.last().endObstacle != finalObstacle) {
-            return false
-        }
-    }
-    return true
-}
-
-public fun pathLength(path: List<DubinsTangent>): Double {
-    val tangentsLength = path.sumOf{norm(it.lineSegment.end - it.lineSegment.begin)}
-    val arcsLength = buildList<Double>{
-        for (i in 1..path.lastIndex) {
-            add(arcLength(path[i].startCircle,
-                path[i-1].lineSegment.end,
-                path[i].lineSegment.begin,
-                path[i].route[0]))
-        }
-    }.sum()
-    return tangentsLength + arcsLength
-}
-
-public fun shortestPath(path: List<List<DubinsTangent>>): List<DubinsTangent> {
-    return path.sortedBy { pathLength(it) }[0]
-}
-
-public typealias Path = List<DubinsTangent>
-public fun findAllPaths(
-    startingPoint: DoubleVector2D,
-    startingDirection: DoubleVector2D,
-    startingRadius: Double,
-    finalPoint: DoubleVector2D,
-    finalDirection: DoubleVector2D,
-    finalRadius: Double,
-    obstacles: List<DubinsObstacle>
-): List<MutableList<DubinsTangent>> {
-    val initialCircles = constructTangentCircles(
-        startingPoint,
-        startingDirection,
-        startingRadius)
-    val finalCircles = constructTangentCircles(
-        finalPoint,
-        finalDirection,
-        finalRadius)
-    var path = mutableMapOf<PathTypes, MutableList<MutableList<DubinsTangent>>>()
-    for (i in listOf(DubinsPath.SimpleType.L, DubinsPath.SimpleType.R)) {
-        for (j in listOf(DubinsPath.SimpleType.L, DubinsPath.SimpleType.R)) {
-            val finalCircle = finalCircles[j]!!
-            val finalObstacle = DubinsObstacle(listOf(finalCircle))
-            path[listOf(i,
-                        DubinsPath.SimpleType.S,
-                        j)] = mutableListOf(
-                                mutableListOf(DubinsTangent(
-                                    initialCircles[i]!!,
-                                    initialCircles[i]!!,
-                                    DubinsObstacle(listOf(initialCircles[i]!!)),
-                                    DubinsObstacle(listOf(initialCircles[i]!!)),
-                                    LineSegment2D(startingPoint, startingPoint),
-                                    listOf(i, DubinsPath.SimpleType.S, i)
-                                )))
-            //var currentObstacle = DubinsObstacle(listOf(initialCircles[i]!!))
-            while (!allFinished(path[listOf(i,
-                    DubinsPath.SimpleType.S,
-                    j)]!!, finalObstacle)) {
-                var newPaths = mutableListOf<MutableList<DubinsTangent>>()
-                for (line in path[listOf(i,
-                    DubinsPath.SimpleType.S,
-                    j)]!!) {
-                    var currentCircle = line.last().endCircle
-                    var currentDirection = line.last().route.last()
-                    var currentObstacle = line.last().endObstacle
-                    var nextObstacle: DubinsObstacle? = null
-                    if (currentObstacle != finalObstacle) {
-                        var tangentToFinal = outerTangents(currentObstacle, finalObstacle)[DubinsPath.toType(listOf(
-                            currentDirection,
-                            DubinsPath.SimpleType.S,
-                            j)
-                        )]
-                        for (obstacle in sortedObstacles(currentObstacle, obstacles)) {
-                            if (tangentToFinal!!.intersectObstacle(obstacle)) {
-                                nextObstacle = obstacle
-                                break
-                            }
-                        }
-                        if (nextObstacle == null) {
-                            nextObstacle = finalObstacle
-                        }
-                        var nextTangents = outerTangents(currentObstacle, nextObstacle)
-
-                        for (pathType in DubinsPath.Type.values()) {
-                            for (obstacle in obstacles) {
-                                // in Python code here try/except was used, but seems unneeded
-                                if (nextTangents.containsKey(pathType)) {
-                                    if (nextTangents[pathType]!!.intersectObstacle(obstacle)) {
-                                        nextTangents.remove(pathType)
-                                    }
-                                }
-                            }
-                        }
-                        nextTangents = if (nextObstacle == finalObstacle) {
-                            nextTangents.filter {(DubinsPath.toSimpleTypes(it.key)[0] == currentDirection) and
-                                    (DubinsPath.toSimpleTypes(it.key)[2] == j)}
-                                    as MutableMap<DubinsPath.Type, DubinsTangent>
-                        } else {
-                            nextTangents.filter {(DubinsPath.toSimpleTypes(it.key)[0] == currentDirection)}
-                                    as MutableMap<DubinsPath.Type, DubinsTangent>
-                        }
-                        var tangentsAlong = mutableListOf<DubinsTangent>()
-                        for (tangent in nextTangents.values) {
-                            if (tangent.startCircle == line.last().endCircle) {
-                                val lengthMaxPossible = arcLength(
-                                    tangent.startCircle,
-                                    line.last().lineSegment.end,
-                                    tangent.startObstacle.nextTangent(
-                                        tangent.startCircle,
-                                        DubinsPath.toType(listOf(currentDirection, DubinsPath.SimpleType.S, currentDirection)),
-                                    ).lineSegment.begin,
-                                    currentDirection
-                                    )
-                                val lengthCalculated = arcLength(
-                                    tangent.startCircle,
-                                    line.last().lineSegment.end,
-                                    tangent.lineSegment.begin,
-                                    currentDirection)
-                                if (lengthCalculated > lengthMaxPossible) {
-                                    tangentsAlong = tangentsAlongTheObstacle(
-                                        currentCircle,
-                                        DubinsPath.toType(listOf(
-                                            currentDirection,
-                                            DubinsPath.SimpleType.S,
-                                            currentDirection)),
-                                        tangent.startCircle,
-                                        currentObstacle
-                                    )
-                                }
-                                else {
-                                    tangentsAlong = mutableListOf<DubinsTangent>()
-                                }
-                            }
-                            else {
-                                tangentsAlong = tangentsAlongTheObstacle(
-                                    currentCircle,
-                                    DubinsPath.toType(listOf(
-                                        currentDirection,
-                                        DubinsPath.SimpleType.S,
-                                        currentDirection)),
-                                    tangent.startCircle,
-                                    currentObstacle
-                                )
-                            }
-                            newPaths.add((line + tangentsAlong + listOf(tangent)).toMutableList())
-                        }
-                        path[listOf(
-                            i,
-                            DubinsPath.SimpleType.S,
-                            j
-                        )] = newPaths
-                    }
-                    else {
-                        // minor changes from Python code
-                        newPaths.add(line)
-                        path[listOf(
-                            i,
-                            DubinsPath.SimpleType.S,
-                            j
-                        )] = newPaths
-                    }
-                }
-                path[listOf(
-                    i,
-                    DubinsPath.SimpleType.S,
-                    j
-                )] = newPaths
-            }
-            for (lineId in path[listOf(
-                i,
-                DubinsPath.SimpleType.S,
-                j
-            )]!!.indices) {
-                val lastDirection = path[listOf(
-                    i,
-                    DubinsPath.SimpleType.S,
-                    j
-                )]!![lineId].last().route[2]
-                path[listOf(
-                    i,
-                    DubinsPath.SimpleType.S,
-                    j
-                )]!![lineId].add(DubinsTangent(
-                    finalCircles[j]!!,
-                    finalCircles[j]!!,
-                    DubinsObstacle(
-                        listOf(finalCircles[j]!!)
-                    ),
-                    DubinsObstacle(
-                        listOf(finalCircles[j]!!)
-                    ),
-                    LineSegment2D(finalPoint, finalPoint),
-                    listOf(
-                        lastDirection,
-                        DubinsPath.SimpleType.S,
-                        j
-                    )
-                ))
-            }
-        }
-    }
-    return path[listOf(
-        DubinsPath.SimpleType.L,
-        DubinsPath.SimpleType.S,
-        DubinsPath.SimpleType.L
-        )]!! + path[listOf(
-        DubinsPath.SimpleType.L,
-        DubinsPath.SimpleType.S,
-        DubinsPath.SimpleType.R
-        )]!! + path[listOf(
-        DubinsPath.SimpleType.R,
-        DubinsPath.SimpleType.S,
-        DubinsPath.SimpleType.L
-        )]!! + path[listOf(
-        DubinsPath.SimpleType.R,
-        DubinsPath.SimpleType.S,
-        DubinsPath.SimpleType.R)]!!
-}
-
-
-
-
-
-
-
-
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
index 5654d10ae..272cf9e5b 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
@@ -7,6 +7,8 @@ package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.*
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
+import space.kscience.kmath.trajectory.Trajectory2D.Type
+import space.kscience.kmath.trajectory.Trajectory2D.Type.*
 import kotlin.math.acos
 
 internal fun DubinsPose2D.getLeftCircle(radius: Double): Circle2D = getTangentCircles(radius).first
@@ -19,27 +21,21 @@ internal fun DubinsPose2D.getTangentCircles(radius: Double): Pair<Circle2D, Circ
     return Circle2D(vector(x - dX, y + dY), radius) to Circle2D(vector(x + dX, y - dY), radius)
 }
 
-internal fun leftOuterTangent(a: Circle2D, b: Circle2D): StraightTrajectory2D =
-    outerTangent(a, b, CircleTrajectory2D.Direction.LEFT)
-
-internal fun rightOuterTangent(a: Circle2D, b: Circle2D): StraightTrajectory2D = outerTangent(
-    a, b,
-    CircleTrajectory2D.Direction.RIGHT
-)
-
-private fun outerTangent(a: Circle2D, b: Circle2D, side: CircleTrajectory2D.Direction): StraightTrajectory2D =
+private fun outerTangent(from: Circle2D, to: Circle2D, direction: Type): StraightTrajectory2D =
     with(Euclidean2DSpace) {
-        val centers = StraightTrajectory2D(a.center, b.center)
-        val p1 = when (side) {
-            CircleTrajectory2D.Direction.LEFT -> vector(
-                a.center.x - a.radius * cos(centers.bearing),
-                a.center.y + a.radius * sin(centers.bearing)
+        val centers = StraightTrajectory2D(from.center, to.center)
+        val p1 = when (direction) {
+            L -> vector(
+                from.center.x - from.radius * cos(centers.bearing),
+                from.center.y + from.radius * sin(centers.bearing)
             )
 
-            CircleTrajectory2D.Direction.RIGHT -> vector(
-                a.center.x + a.radius * cos(centers.bearing),
-                a.center.y - a.radius * sin(centers.bearing)
+            R -> vector(
+                from.center.x + from.radius * cos(centers.bearing),
+                from.center.y - from.radius * sin(centers.bearing)
             )
+
+            else -> error("S trajectory type not allowed")
         }
         return StraightTrajectory2D(
             p1,
@@ -47,29 +43,25 @@ private fun outerTangent(a: Circle2D, b: Circle2D, side: CircleTrajectory2D.Dire
         )
     }
 
-internal fun leftInnerTangent(base: Circle2D, direction: Circle2D): StraightTrajectory2D? =
-    innerTangent(base, direction, CircleTrajectory2D.Direction.LEFT)
-
-internal fun rightInnerTangent(base: Circle2D, direction: Circle2D): StraightTrajectory2D? =
-    innerTangent(base, direction, CircleTrajectory2D.Direction.RIGHT)
 
 private fun innerTangent(
-    base: Circle2D,
-    direction: Circle2D,
-    side: CircleTrajectory2D.Direction,
+    from: Circle2D,
+    to: Circle2D,
+    direction: Type,
 ): StraightTrajectory2D? =
     with(Euclidean2DSpace) {
-        val centers = StraightTrajectory2D(base.center, direction.center)
-        if (centers.length < base.radius * 2) return null
-        val angle = when (side) {
-            CircleTrajectory2D.Direction.LEFT -> centers.bearing + acos(base.radius * 2 / centers.length).radians
-            CircleTrajectory2D.Direction.RIGHT -> centers.bearing - acos(base.radius * 2 / centers.length).radians
+        val centers = StraightTrajectory2D(from.center, to.center)
+        if (centers.length < from.radius * 2) return null
+        val angle = when (direction) {
+            L -> centers.bearing + acos(from.radius * 2 / centers.length).radians
+            R -> centers.bearing - acos(from.radius * 2 / centers.length).radians
+            else -> error("S trajectory type not allowed")
         }.normalized()
 
-        val dX = base.radius * sin(angle)
-        val dY = base.radius * cos(angle)
-        val p1 = vector(base.center.x + dX, base.center.y + dY)
-        val p2 = vector(direction.center.x - dX, direction.center.y - dY)
+        val dX = from.radius * sin(angle)
+        val dY = from.radius * cos(angle)
+        val p1 = vector(from.center.x + dX, from.center.y + dY)
+        val p2 = vector(to.center.x - dX, to.center.y - dY)
         return StraightTrajectory2D(p1, p2)
     }
 
@@ -77,118 +69,25 @@ private fun innerTangent(
 @Suppress("DuplicatedCode")
 public object DubinsPath {
 
-//    public class ArcType(private val type: Type){
-//        public val first: SimpleType
-//            get() {
-//                if (this.type in listOf(Type.RSR, Type.RSL, Type.RLR)) {
-//                    return SimpleType.R
-//                }
-//                else if (type in listOf(Type.LSL, Type.LSR, Type.LRL)) {
-//                    return SimpleType.L
-//                }
-//                error("Wrong DubinsPath.Type")
-//            }
-//
-//        public val last: SimpleType
-//            get() {
-//                if (type in listOf(Type.RSR, Type.LSR, Type.RLR)) {
-//                    return SimpleType.R
-//                }
-//                else if (type in listOf(Type.LSL, Type.RSL, Type.LRL)) {
-//                    return SimpleType.L
-//                }
-//                error("Wrong DubinsPath.Type")
-//            }
-//        public val intermediate: SimpleType
-//            get() {
-//                if (type == Type.RLR) {
-//                    return SimpleType.L
-//                }
-//                else if (type == Type.LRL) {
-//                    return SimpleType.R
-//                }
-//                error("This DubinsPath.Type doesn't contain intermediate arc")
-//            }
-//    }
+    public data class Type(
+        public val first: Trajectory2D.Type,
+        public val second: Trajectory2D.Type,
+        public val third: Trajectory2D.Type,
+    ) {
+        public fun toList(): List<Trajectory2D.Type> = listOf(first, second, third)
 
-    public enum class SimpleType {
-        R, S, L
-    }
+        override fun toString(): String = "${first.name}${second.name}${third.name}"
 
-    public enum class Type {
-        RLR, LRL, RSR, LSL, RSL, LSR
-    }
-
-    public fun toSimpleTypes(type: Type): List<SimpleType> {
-        when (type) {
-            Type.RLR -> {
-                return listOf(SimpleType.R, SimpleType.L, SimpleType.R)
-            }
-            Type.LRL -> {
-                return listOf(SimpleType.L, SimpleType.R, SimpleType.L)
-            }
-            Type.RSR -> {
-                return listOf(SimpleType.R, SimpleType.S, SimpleType.R)
-            }
-            Type.LSL -> {
-                return listOf(SimpleType.L, SimpleType.S, SimpleType.L)
-            }
-            Type.RSL -> {
-                return listOf(SimpleType.R, SimpleType.S, SimpleType.L)
-            }
-            Type.LSR -> {
-                return listOf(SimpleType.L, SimpleType.S, SimpleType.R)
-            }
-            else -> error("This type doesn't exist")
+        public companion object {
+            public val RLR: Type = Type(R, L, R)
+            public val LRL: Type = Type(L, R, L)
+            public val RSR: Type = Type(R, S, R)
+            public val LSL: Type = Type(L, S, L)
+            public val RSL: Type = Type(R, S, L)
+            public val LSR: Type = Type(L, S, R)
         }
     }
 
-    public fun toType(types: List<SimpleType>): Type {
-        when (types) {
-            listOf(SimpleType.R, SimpleType.L, SimpleType.R) -> {
-                return Type.RLR
-            }
-            listOf(SimpleType.L, SimpleType.R, SimpleType.L) -> {
-                return Type.LRL
-            }
-            listOf(SimpleType.R, SimpleType.S, SimpleType.R) -> {
-                return Type.RSR
-            }
-            listOf(SimpleType.L, SimpleType.S, SimpleType.L) -> {
-                return Type.LSL
-            }
-            listOf(SimpleType.R, SimpleType.S, SimpleType.L) -> {
-                return Type.RSL
-            }
-            listOf(SimpleType.L, SimpleType.S, SimpleType.R) -> {
-                return Type.LSR
-            }
-            else -> error("This type doesn't exist")
-        }
-    }
-
-//    public class PathTypes(private val inputTypes: List<SimpleType>) {
-//        public val type: Type
-//            get() {
-//                when (this.inputTypes) {
-//                    listOf(SimpleType.R, SimpleType.S, SimpleType.R) -> {
-//                        return Type.RSR
-//                    }
-//                    listOf(SimpleType.R, SimpleType.S, SimpleType.L) -> {
-//                        return Type.RSL
-//                    }
-//                    listOf(SimpleType.L, SimpleType.S, SimpleType.R) -> {
-//                        return Type.LSR
-//                    }
-//                    listOf(SimpleType.L, SimpleType.S, SimpleType.L) -> {
-//                        return Type.LSL
-//                    }
-//                    else -> error("Wrong list of SimpleTypes")
-//                }
-//            }
-//        public val chain: List<SimpleType> = this.inputTypes
-//    }
-
     /**
      * Return Dubins trajectory type or null if trajectory is not a Dubins path
      */
@@ -197,12 +96,10 @@ public object DubinsPath {
         val a = trajectory2D.segments.first() as? CircleTrajectory2D ?: return null
         val b = trajectory2D.segments[1]
         val c = trajectory2D.segments.last() as? CircleTrajectory2D ?: return null
-        return Type.valueOf(
-            arrayOf(
-                a.direction.name[0],
-                if (b is CircleTrajectory2D) b.direction.name[0] else 'S',
-                c.direction.name[0]
-            ).toCharArray().concatToString()
+        return Type(
+            a.direction,
+            if (b is CircleTrajectory2D) b.direction else Trajectory2D.Type.S,
+            c.direction
         )
     }
 
@@ -240,9 +137,9 @@ public object DubinsPath {
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory2D.of(c1.center, start, p1, CircleTrajectory2D.Direction.RIGHT)
-                val a2 = CircleTrajectory2D.of(e.center, p1, p2, CircleTrajectory2D.Direction.LEFT)
-                val a3 = CircleTrajectory2D.of(c2.center, p2, end, CircleTrajectory2D.Direction.RIGHT)
+                val a1 = CircleTrajectory2D.of(c1.center, start, p1, Trajectory2D.Type.R)
+                val a2 = CircleTrajectory2D.of(e.center, p1, p2, Trajectory2D.Type.L)
+                val a3 = CircleTrajectory2D.of(c2.center, p2, end, Trajectory2D.Type.R)
                 CompositeTrajectory2D(a1, a2, a3)
             }
 
@@ -257,9 +154,9 @@ public object DubinsPath {
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory2D.of(c1.center, start, p1, CircleTrajectory2D.Direction.RIGHT)
-                val a2 = CircleTrajectory2D.of(e.center, p1, p2, CircleTrajectory2D.Direction.LEFT)
-                val a3 = CircleTrajectory2D.of(c2.center, p2, end, CircleTrajectory2D.Direction.RIGHT)
+                val a1 = CircleTrajectory2D.of(c1.center, start, p1, Trajectory2D.Type.R)
+                val a2 = CircleTrajectory2D.of(e.center, p1, p2, Trajectory2D.Type.L)
+                val a3 = CircleTrajectory2D.of(c2.center, p2, end, Trajectory2D.Type.R)
                 CompositeTrajectory2D(a1, a2, a3)
             }
 
@@ -284,9 +181,9 @@ public object DubinsPath {
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory2D.of(c1.center, start, p1, CircleTrajectory2D.Direction.LEFT)
-                val a2 = CircleTrajectory2D.of(e.center, p1, p2, CircleTrajectory2D.Direction.RIGHT)
-                val a3 = CircleTrajectory2D.of(c2.center, p2, end, CircleTrajectory2D.Direction.LEFT)
+                val a1 = CircleTrajectory2D.of(c1.center, start, p1, Trajectory2D.Type.L)
+                val a2 = CircleTrajectory2D.of(e.center, p1, p2, Trajectory2D.Type.R)
+                val a3 = CircleTrajectory2D.of(c2.center, p2, end, Trajectory2D.Type.L)
                 CompositeTrajectory2D(a1, a2, a3)
             }
 
@@ -301,9 +198,9 @@ public object DubinsPath {
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory2D.of(c1.center, start, p1, CircleTrajectory2D.Direction.LEFT)
-                val a2 = CircleTrajectory2D.of(e.center, p1, p2, CircleTrajectory2D.Direction.RIGHT)
-                val a3 = CircleTrajectory2D.of(c2.center, p2, end, CircleTrajectory2D.Direction.LEFT)
+                val a1 = CircleTrajectory2D.of(c1.center, start, p1, Trajectory2D.Type.L)
+                val a2 = CircleTrajectory2D.of(e.center, p1, p2, Trajectory2D.Type.R)
+                val a3 = CircleTrajectory2D.of(c2.center, p2, end, Trajectory2D.Type.L)
                 CompositeTrajectory2D(a1, a2, a3)
             }
 
@@ -313,45 +210,45 @@ public object DubinsPath {
     public fun rsr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D {
         val c1 = start.getRightCircle(turningRadius)
         val c2 = end.getRightCircle(turningRadius)
-        val s = leftOuterTangent(c1, c2)
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.RIGHT)
-        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.RIGHT)
+        val s = outerTangent(c1, c2, L)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, Trajectory2D.Type.R)
+        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, Trajectory2D.Type.R)
         return CompositeTrajectory2D(a1, s, a3)
     }
 
     public fun lsl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D {
         val c1 = start.getLeftCircle(turningRadius)
         val c2 = end.getLeftCircle(turningRadius)
-        val s = rightOuterTangent(c1, c2)
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.LEFT)
-        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.LEFT)
+        val s = outerTangent(c1, c2, R)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, Trajectory2D.Type.L)
+        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, Trajectory2D.Type.L)
         return CompositeTrajectory2D(a1, s, a3)
     }
 
     public fun rsl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D? {
         val c1 = start.getRightCircle(turningRadius)
         val c2 = end.getLeftCircle(turningRadius)
-        val s = rightInnerTangent(c1, c2)
+        val s = innerTangent(c1, c2, R)
         if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
 
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.RIGHT)
-        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.LEFT)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, Trajectory2D.Type.R)
+        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, Trajectory2D.Type.L)
         return CompositeTrajectory2D(a1, s, a3)
     }
 
     public fun lsr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D? {
         val c1 = start.getLeftCircle(turningRadius)
         val c2 = end.getRightCircle(turningRadius)
-        val s = leftInnerTangent(c1, c2)
+        val s = innerTangent(c1, c2, L)
         if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
 
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, CircleTrajectory2D.Direction.LEFT)
-        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, CircleTrajectory2D.Direction.RIGHT)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, Trajectory2D.Type.L)
+        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, Trajectory2D.Type.R)
         return CompositeTrajectory2D(a1, s, a3)
     }
 }
 
-public typealias PathTypes = List<DubinsPath.SimpleType>
+public typealias PathTypes = List<Type>
 
 public fun interface MaxCurvature {
     public fun compute(startPoint: PhaseVector2D): Double
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
new file mode 100644
index 000000000..d5d04e1a4
--- /dev/null
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
@@ -0,0 +1,619 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.trajectory
+
+import space.kscience.kmath.geometry.*
+import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
+import space.kscience.kmath.geometry.Euclidean2DSpace.minus
+import space.kscience.kmath.geometry.Euclidean2DSpace.norm
+import space.kscience.kmath.geometry.Euclidean2DSpace.plus
+import space.kscience.kmath.geometry.Euclidean2DSpace.times
+import space.kscience.kmath.geometry.Euclidean2DSpace.vector
+import space.kscience.kmath.operations.DoubleField.pow
+import kotlin.math.*
+
+internal data class Tangent(
+    val startCircle: Circle2D,
+    val endCircle: Circle2D,
+    val startObstacle: Obstacle,
+    val endObstacle: Obstacle,
+    val lineSegment: LineSegment2D,
+    val trajectoryType: List<Trajectory2D.Type>,
+)
+
+private class TangentPath(val tangents: List<Tangent>) {
+    fun last() = tangents.last()
+}
+
+private fun TangentPath(vararg tangents: Tangent) = TangentPath(listOf(*tangents))
+
+/**
+ * Create inner and outer tangents between two circles.
+ * This method returns a map of segments using [DubinsPath] connection type notation.
+ */
+internal fun Circle2D.tangentsToCircle(
+    other: Circle2D,
+): Map<DubinsPath.Type, LineSegment2D> = with(Euclidean2DSpace) {
+    //return empty map for concentric circles
+    if (center.equalsVector(other.center)) return emptyMap()
+
+    // A line connecting centers
+    val line = LineSegment(center, other.center)
+    // Distance between centers
+    val distance = line.begin.distanceTo(line.end)
+    val angle1 = atan2(other.center.x - center.x, other.center.y - center.y)
+    var angle2: Double
+    val routes = mapOf(
+        DubinsPath.Type.RSR to Pair(radius, other.radius),
+        DubinsPath.Type.RSL to Pair(radius, -other.radius),
+        DubinsPath.Type.LSR to Pair(-radius, other.radius),
+        DubinsPath.Type.LSL to Pair(-radius, -other.radius)
+    )
+    return buildMap {
+        for ((route, r1r2) in routes) {
+            val r1 = r1r2.first
+            val r2 = r1r2.second
+            val r = if (r1.sign == r2.sign) {
+                r1.absoluteValue - r2.absoluteValue
+            } else {
+                r1.absoluteValue + r2.absoluteValue
+            }
+            if (distance * distance >= r * r) {
+                val l = sqrt(distance * distance - r * r)
+                angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+                    angle1 + r1.sign * atan2(r.absoluteValue, l)
+                } else {
+                    angle1 - r2.sign * atan2(r.absoluteValue, l)
+                }
+                val w = Euclidean2DSpace.vector(-cos(angle2), sin(angle2))
+                put(
+                    route,
+                    LineSegment(
+                        center + w * r1,
+                        other.center + w * r2
+                    )
+                )
+            } else {
+                throw Exception("Circles should not intersect")
+            }
+        }
+    }
+}
+
+private fun dubinsTangentsToCircles(
+    firstCircle: Circle2D,
+    secondCircle: Circle2D,
+    firstObstacle: Obstacle,
+    secondObstacle: Obstacle,
+): Map<DubinsPath.Type, Tangent> = with(Euclidean2DSpace) {
+    val line = LineSegment(firstCircle.center, secondCircle.center)
+    val distance = line.begin.distanceTo(line.end)
+    val angle1 = atan2(
+        secondCircle.center.x - firstCircle.center.x,
+        secondCircle.center.y - firstCircle.center.y
+    )
+    var r: Double
+    var angle2: Double
+    val routes = mapOf(
+        DubinsPath.Type.RSR to Pair(firstCircle.radius, secondCircle.radius),
+        DubinsPath.Type.RSL to Pair(firstCircle.radius, -secondCircle.radius),
+        DubinsPath.Type.LSR to Pair(-firstCircle.radius, secondCircle.radius),
+        DubinsPath.Type.LSL to Pair(-firstCircle.radius, -secondCircle.radius)
+    )
+    return buildMap {
+        for ((route: DubinsPath.Type, r1r2) in routes) {
+            val r1 = r1r2.first
+            val r2 = r1r2.second
+            r = if (r1.sign == r2.sign) {
+                r1.absoluteValue - r2.absoluteValue
+            } else {
+                r1.absoluteValue + r2.absoluteValue
+            }
+            if (distance * distance >= r * r) {
+                val l = sqrt(distance * distance - r * r)
+                angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+                    angle1 + r1.sign * atan2(r.absoluteValue, l)
+                } else {
+                    angle1 - r2.sign * atan2(r.absoluteValue, l)
+                }
+                val w = vector(-cos(angle2), sin(angle2))
+                put(
+                    route,
+                    Tangent(
+                        startCircle = Circle2D(firstCircle.center, firstCircle.radius),
+                        endCircle = secondCircle,
+                        startObstacle = firstObstacle,
+                        endObstacle = secondObstacle,
+                        lineSegment = LineSegment2D(
+                            firstCircle.center + w * r1,
+                            secondCircle.center + w * r2
+                        ),
+                        trajectoryType = route.toList()
+                    )
+                )
+            } else {
+                throw Exception("Circles should not intersect")
+            }
+        }
+    }
+}
+
+public class Obstacle(
+    public val circles: List<Circle2D>,
+) {
+    internal val tangents: List<Tangent> = boundaryTangents().first
+    public val boundaryRoute: DubinsPath.Type = boundaryTangents().second
+
+    public val center: Vector2D<Double> = vector(
+        circles.sumOf { it.center.x } / circles.size,
+        circles.sumOf { it.center.y } / circles.size
+    )
+
+    private fun boundaryTangents(): Pair<List<Tangent>, DubinsPath.Type> {
+        // outer tangents for a polygon circles can be either lsl or rsr
+
+        fun Circle2D.dubinsTangentsToCircles(
+            other: Circle2D,
+        ): Map<DubinsPath.Type, Tangent> = with(Euclidean2DSpace) {
+            val line = LineSegment(center, other.center)
+            val d = line.begin.distanceTo(line.end)
+            val angle1 = atan2(other.center.x - center.x, other.center.y - center.y)
+            var r: Double
+            var angle2: Double
+            val routes = mapOf(
+                DubinsPath.Type.RSR to Pair(radius, other.radius),
+                DubinsPath.Type.LSL to Pair(-radius, -other.radius)
+            )
+            return buildMap {
+                for ((routeType, r1r2) in routes) {
+                    val r1 = r1r2.first
+                    val r2 = r1r2.second
+                    r = if (r1.sign == r2.sign) {
+                        r1.absoluteValue - r2.absoluteValue
+                    } else {
+                        r1.absoluteValue + r2.absoluteValue
+                    }
+                    if (d * d >= r * r) {
+                        val l = (d * d - r * r).pow(0.5)
+                        angle2 = if (r1.absoluteValue > r2.absoluteValue) {
+                            angle1 + r1.sign * atan2(r.absoluteValue, l)
+                        } else {
+                            angle1 - r2.sign * atan2(r.absoluteValue, l)
+                        }
+                        val w = vector(-cos(angle2), sin(angle2))
+                        put(
+                            routeType, Tangent(
+                                Circle2D(center, radius),
+                                other,
+                                this@Obstacle,
+                                this@Obstacle,
+                                LineSegment2D(
+                                    center + w * r1,
+                                    other.center + w * r2
+                                ),
+                                routeType.toList()
+                            )
+                        )
+                    } else {
+                        throw Exception("Circles should not intersect")
+                    }
+                }
+            }
+        }
+
+        val firstCircles = circles
+        val secondCircles = circles.slice(1..circles.lastIndex) +
+                circles[0]
+        val lslTangents = firstCircles.zip(secondCircles)
+        { a, b -> a.dubinsTangentsToCircles(b)[DubinsPath.Type.LSL]!! }
+        val rsrTangents = firstCircles.zip(secondCircles)
+        { a, b -> a.dubinsTangentsToCircles(b)[DubinsPath.Type.RSR]!! }
+        val center = vector(
+            circles.sumOf { it.center.x } / circles.size,
+            circles.sumOf { it.center.y } / circles.size
+        )
+        val lslToCenter = lslTangents.sumOf { it.lineSegment.begin.distanceTo(center) } +
+                lslTangents.sumOf { it.lineSegment.end.distanceTo(center) }
+        val rsrToCenter = rsrTangents.sumOf { it.lineSegment.begin.distanceTo(center) } +
+                rsrTangents.sumOf { it.lineSegment.end.distanceTo(center) }
+        return if (rsrToCenter >= lslToCenter) {
+            Pair(rsrTangents, DubinsPath.Type.RSR)
+        } else {
+            Pair(lslTangents, DubinsPath.Type.LSL)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (other == null || other !is Obstacle) return false
+        return circles == other.circles
+    }
+
+    override fun hashCode(): Int {
+        return circles.hashCode()
+    }
+}
+
+private fun Obstacle.nextTangent(circle: Circle2D, routeType: DubinsPath.Type): Tangent {
+    if (routeType == boundaryRoute) {
+        for (i in circles.indices) {
+            if (circles[i] == circle) {
+                return tangents[i]
+            }
+        }
+    } else {
+        for (i in circles.indices) {
+            if (circles[i] == circle) {
+                if (i > 0) {
+                    return Tangent(
+                        circles[i],
+                        circles[i - 1],
+                        this,
+                        this,
+                        LineSegment2D(
+                            tangents[i - 1].lineSegment.end,
+                            tangents[i - 1].lineSegment.begin
+                        ),
+                        routeType.toList()
+                    )
+                } else {
+                    return Tangent(
+                        circles[0],
+                        circles.last(),
+                        this,
+                        this,
+                        LineSegment2D(
+                            tangents.last().lineSegment.end,
+                            tangents.last().lineSegment.begin
+                        ),
+                        routeType.toList()
+                    )
+                }
+            }
+        }
+    }
+
+    error("next tangent not found")
+}
+
+public fun Obstacle(vararg circles: Circle2D): Obstacle = Obstacle(listOf(*circles))
+
+private fun LineSegment2D.intersectSegment(other: LineSegment2D): Boolean {
+    fun crossProduct(v1: DoubleVector2D, v2: DoubleVector2D): Double {
+        return v1.x * v2.y - v1.y * v2.x
+    }
+    return if (crossProduct(other.begin - begin, other.end - begin).sign ==
+        crossProduct(other.begin - end, other.end - end).sign
+    ) {
+        false
+    } else {
+        crossProduct(begin - other.begin, end - other.begin).sign != crossProduct(
+            begin - other.end,
+            end - other.end
+        ).sign
+    }
+}
+
+private fun LineSegment2D.intersectCircle(circle: Circle2D): Boolean {
+    val a = (begin.x - end.x).pow(2.0) + (begin.y - end.y).pow(2.0)
+    val b = 2 * ((begin.x - end.x) * (end.x - circle.center.x) +
+            (begin.y - end.y) * (end.y - circle.center.y))
+    val c = (end.x - circle.center.x).pow(2.0) + (end.y - circle.center.y).pow(2.0) -
+            circle.radius.pow(2.0)
+    val d = b.pow(2.0) - 4 * a * c
+    if (d < 1e-6) {
+        return false
+    } else {
+        val t1 = (-b - d.pow(0.5)) * 0.5 / a
+        val t2 = (-b + d.pow(0.5)) * 0.5 / a
+        if (((0 < t1) and (t1 < 1)) or ((0 < t2) and (t2 < 1))) {
+            return true
+        }
+    }
+    return false
+}
+
+private fun Tangent.intersectObstacle(obstacle: Obstacle): Boolean {
+    for (tangent in obstacle.tangents) {
+        if (lineSegment.intersectSegment(tangent.lineSegment)) {
+            return true
+        }
+    }
+    for (circle in obstacle.circles) {
+        if (lineSegment.intersectCircle(circle)) {
+            return true
+        }
+    }
+    return false
+}
+
+private fun outerTangents(first: Obstacle, second: Obstacle): Map<DubinsPath.Type, Tangent> = buildMap {
+    for (circle1 in first.circles) {
+        for (circle2 in second.circles) {
+            for (tangent in dubinsTangentsToCircles(circle1, circle2, first, second)) {
+                if (!(tangent.value.intersectObstacle(first))
+                    and !(tangent.value.intersectObstacle(second))
+                ) {
+                    put(
+                        tangent.key,
+                        tangent.value
+                    )
+                }
+            }
+        }
+    }
+}
+
+private fun arcLength(
+    circle: Circle2D,
+    point1: DoubleVector2D,
+    point2: DoubleVector2D,
+    route: Trajectory2D.Type,
+): Double {
+    val phi1 = atan2(point1.y - circle.center.y, point1.x - circle.center.x)
+    val phi2 = atan2(point2.y - circle.center.y, point2.x - circle.center.x)
+    var angle = 0.0
+    when (route) {
+        Trajectory2D.Type.L -> {
+            angle = if (phi2 >= phi1) {
+                phi2 - phi1
+            } else {
+                2 * PI + phi2 - phi1
+            }
+        }
+
+        Trajectory2D.Type.R -> {
+            angle = if (phi2 >= phi1) {
+                2 * PI - (phi2 - phi1)
+            } else {
+                -(phi2 - phi1)
+            }
+        }
+
+        Trajectory2D.Type.S -> {
+            error("L or R route is expected")
+        }
+    }
+    return circle.radius * angle
+}
+
+private fun normalVectors(v: DoubleVector2D, r: Double): Pair<DoubleVector2D, DoubleVector2D> {
+    return Pair(
+        r * vector(v.y / norm(v), -v.x / norm(v)),
+        r * vector(-v.y / norm(v), v.x / norm(v))
+    )
+}
+
+private fun constructTangentCircles(
+    point: DoubleVector2D,
+    direction: DoubleVector2D,
+    r: Double,
+): Map<Trajectory2D.Type, Circle2D> {
+    val center1 = point + normalVectors(direction, r).first
+    val center2 = point + normalVectors(direction, r).second
+    val p1 = center1 - point
+    return if (atan2(p1.y, p1.x) - atan2(direction.y, direction.x) in listOf(PI / 2, -3 * PI / 2)) {
+        mapOf(
+            Trajectory2D.Type.L to Circle2D(center1, r),
+            Trajectory2D.Type.R to Circle2D(center2, r)
+        )
+    } else {
+        mapOf(
+            Trajectory2D.Type.L to Circle2D(center2, r),
+            Trajectory2D.Type.R to Circle2D(center1, r)
+        )
+    }
+}
+
+private fun sortedObstacles(
+    currentObstacle: Obstacle,
+    obstacles: List<Obstacle>,
+): List<Obstacle> {
+    return obstacles.sortedBy { norm(it.center - currentObstacle.center) }//.reversed()
+}
+
+private fun tangentsAlongTheObstacle(
+    initialCircle: Circle2D,
+    initialRoute: DubinsPath.Type,
+    finalCircle: Circle2D,
+    obstacle: Obstacle,
+): List<Tangent> {
+    val dubinsTangents = mutableListOf<Tangent>()
+    var tangent = obstacle.nextTangent(initialCircle, initialRoute)
+    dubinsTangents.add(tangent)
+    while (tangent.endCircle != finalCircle) {
+        tangent = obstacle.nextTangent(tangent.endCircle, initialRoute)
+        dubinsTangents.add(tangent)
+    }
+    return dubinsTangents
+}
+
+private fun allFinished(
+    paths: List<TangentPath>,
+    finalObstacle: Obstacle,
+): Boolean {
+    for (path in paths) {
+        if (path.last().endObstacle != finalObstacle) {
+            return false
+        }
+    }
+    return true
+}
+
+private fun LineSegment2D.toTrajectory() = StraightTrajectory2D(begin, end)
+
+
+private fun TangentPath.toTrajectory(): CompositeTrajectory2D = CompositeTrajectory2D(
+    buildList {
+        tangents.zipWithNext().forEach { (left, right) ->
+            add(left.lineSegment.toTrajectory())
+            add(
+                CircleTrajectory2D.of(
+                    right.startCircle.center,
+                    left.lineSegment.end,
+                    right.lineSegment.begin,
+                    right.trajectoryType.first()
+                )
+            )
+        }
+
+        add(tangents.last().lineSegment.toTrajectory())
+    }
+)
+
+internal fun findAllPaths(
+    startingPoint: DoubleVector2D,
+    startingDirection: DoubleVector2D,
+    startingRadius: Double,
+    finalPoint: DoubleVector2D,
+    finalDirection: DoubleVector2D,
+    finalRadius: Double,
+    obstacles: List<Obstacle>,
+): List<CompositeTrajectory2D> {
+    val initialCircles = constructTangentCircles(
+        startingPoint,
+        startingDirection,
+        startingRadius
+    )
+    val finalCircles = constructTangentCircles(
+        finalPoint,
+        finalDirection,
+        finalRadius
+    )
+    val trajectories = mutableListOf<CompositeTrajectory2D>()
+    for (i in listOf(Trajectory2D.Type.L, Trajectory2D.Type.R)) {
+        for (j in listOf(Trajectory2D.Type.L, Trajectory2D.Type.R)) {
+            val finalCircle = finalCircles[j]!!
+            val finalObstacle = Obstacle(listOf(finalCircle))
+            var currentPaths: List<TangentPath> = listOf(
+                TangentPath(
+                    Tangent(
+                        initialCircles[i]!!,
+                        initialCircles[i]!!,
+                        Obstacle(listOf(initialCircles[i]!!)),
+                        Obstacle(listOf(initialCircles[i]!!)),
+                        LineSegment2D(startingPoint, startingPoint),
+                        listOf(i, Trajectory2D.Type.S, i)
+                    )
+                )
+            )
+            while (!allFinished(currentPaths, finalObstacle)) {
+                val newPaths = mutableListOf<TangentPath>()
+                for (tangentPath: TangentPath in currentPaths) {
+                    val currentCircle = tangentPath.last().endCircle
+                    val currentDirection = tangentPath.last().trajectoryType.last()
+                    val currentObstacle = tangentPath.last().endObstacle
+                    var nextObstacle: Obstacle? = null
+                    if (currentObstacle != finalObstacle) {
+                        val tangentToFinal = outerTangents(currentObstacle, finalObstacle)[DubinsPath.Type(
+                            currentDirection,
+                            Trajectory2D.Type.S,
+                            j
+                        )]
+                        for (obstacle in sortedObstacles(currentObstacle, obstacles)) {
+                            if (tangentToFinal!!.intersectObstacle(obstacle)) {
+                                nextObstacle = obstacle
+                                break
+                            }
+                        }
+                        if (nextObstacle == null) {
+                            nextObstacle = finalObstacle
+                        }
+                        val nextTangents: Map<DubinsPath.Type, Tangent> = outerTangents(currentObstacle, nextObstacle)
+                            .filter { (key, tangent) ->
+                                obstacles.none { obstacle -> tangent.intersectObstacle(obstacle) } &&
+                                        key.first == currentDirection &&
+                                        (nextObstacle != finalObstacle || key.third == j)
+                            }
+
+                        var tangentsAlong: List<Tangent>
+                        for (tangent in nextTangents.values) {
+                            if (tangent.startCircle == tangentPath.last().endCircle) {
+                                val lengthMaxPossible = arcLength(
+                                    tangent.startCircle,
+                                    tangentPath.last().lineSegment.end,
+                                    tangent.startObstacle.nextTangent(
+                                        tangent.startCircle,
+                                        DubinsPath.Type(
+                                            currentDirection,
+                                            Trajectory2D.Type.S,
+                                            currentDirection
+                                        ),
+                                    ).lineSegment.begin,
+                                    currentDirection
+                                )
+                                val lengthCalculated = arcLength(
+                                    tangent.startCircle,
+                                    tangentPath.last().lineSegment.end,
+                                    tangent.lineSegment.begin,
+                                    currentDirection
+                                )
+                                tangentsAlong = if (lengthCalculated > lengthMaxPossible) {
+                                    tangentsAlongTheObstacle(
+                                        currentCircle,
+                                        DubinsPath.Type(
+                                            currentDirection,
+                                            Trajectory2D.Type.S,
+                                            currentDirection
+                                        ),
+                                        tangent.startCircle,
+                                        currentObstacle
+                                    )
+                                } else {
+                                    emptyList()
+                                }
+                            } else {
+                                tangentsAlong = tangentsAlongTheObstacle(
+                                    currentCircle,
+                                    DubinsPath.Type(
+                                        currentDirection,
+                                        Trajectory2D.Type.S,
+                                        currentDirection
+                                    ),
+                                    tangent.startCircle,
+                                    currentObstacle
+                                )
+                            }
+                            newPaths.add(TangentPath(tangentPath.tangents + tangentsAlong + tangent))
+                        }
+                    } else {
+                        // minor changes from Python code
+                        newPaths.add(tangentPath)
+                    }
+                }
+                currentPaths = newPaths
+            }
+
+            trajectories += currentPaths.map { tangentPath ->
+                val lastDirection: Trajectory2D.Type = tangentPath.last().trajectoryType[2]
+                val end = finalCircles[j]!!
+                TangentPath(
+                    tangentPath.tangents +
+                            Tangent(
+                                end,
+                                end,
+                                Obstacle(end),
+                                Obstacle(end),
+                                LineSegment2D(finalPoint, finalPoint),
+                                listOf(
+                                    lastDirection,
+                                    Trajectory2D.Type.S,
+                                    j
+                                )
+                            )
+                )
+            }.map { it.toTrajectory() }
+        }
+    }
+    return trajectories
+}
+
+
+
+
+
+
+
+
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
index e5f60e025..7bf17fc26 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
@@ -16,6 +16,12 @@ import kotlin.math.atan2
 @Serializable
 public sealed interface Trajectory2D {
     public val length: Double
+
+    public enum class Type {
+        R,
+        S,
+        L
+    }
 }
 
 /**
@@ -27,11 +33,14 @@ public data class StraightTrajectory2D(
     public val start: DoubleVector2D,
     public val end: DoubleVector2D,
 ) : Trajectory2D {
+
     override val length: Double get() = start.distanceTo(end)
 
     public val bearing: Angle get() = (atan2(end.x - start.x, end.y - start.y).radians).normalized()
 }
 
+public fun StraightTrajectory2D.toSegment(): LineSegment<Vector2D<Double>> = LineSegment2D(start, end)
+
 /**
  * An arc segment
  */
@@ -43,15 +52,11 @@ public data class CircleTrajectory2D(
     public val end: DubinsPose2D,
 ) : Trajectory2D {
 
-    public enum class Direction {
-        LEFT, RIGHT
-    }
-
     /**
      * Arc length in radians
      */
     val arcLength: Angle
-        get() = if (direction == Direction.LEFT) {
+        get() = if (direction == Trajectory2D.Type.L) {
             start.bearing - end.bearing
         } else {
             end.bearing - start.bearing
@@ -62,16 +67,16 @@ public data class CircleTrajectory2D(
         circle.radius * arcLength.radians
     }
 
-    public val direction: Direction by lazy {
+    public val direction: Trajectory2D.Type by lazy {
         if (start.y < circle.center.y) {
-            if (start.bearing > Angle.pi) Direction.RIGHT else Direction.LEFT
+            if (start.bearing > Angle.pi) Trajectory2D.Type.R else Trajectory2D.Type.L
         } else if (start.y > circle.center.y) {
-            if (start.bearing < Angle.pi) Direction.RIGHT else Direction.LEFT
+            if (start.bearing < Angle.pi) Trajectory2D.Type.R else Trajectory2D.Type.L
         } else {
             if (start.bearing == Angle.zero) {
-                if (start.x < circle.center.x) Direction.RIGHT else Direction.LEFT
+                if (start.x < circle.center.x) Trajectory2D.Type.R else Trajectory2D.Type.L
             } else {
-                if (start.x > circle.center.x) Direction.RIGHT else Direction.LEFT
+                if (start.x > circle.center.x) Trajectory2D.Type.R else Trajectory2D.Type.L
             }
         }
     }
@@ -81,17 +86,18 @@ public data class CircleTrajectory2D(
             center: DoubleVector2D,
             start: DoubleVector2D,
             end: DoubleVector2D,
-            direction: Direction,
+            direction: Trajectory2D.Type,
         ): CircleTrajectory2D {
             fun calculatePose(
                 vector: DoubleVector2D,
                 theta: Angle,
-                direction: Direction,
+                direction: Trajectory2D.Type,
             ): DubinsPose2D = DubinsPose2D(
                 vector,
                 when (direction) {
-                    Direction.LEFT -> (theta - Angle.piDiv2).normalized()
-                    Direction.RIGHT -> (theta + Angle.piDiv2).normalized()
+                    Trajectory2D.Type.L -> (theta - Angle.piDiv2).normalized()
+                    Trajectory2D.Type.R -> (theta + Angle.piDiv2).normalized()
+                    else -> error("S trajectory type is not allowed in circle constructor")
                 }
             )
 
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
deleted file mode 100644
index fb1c3927b..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/tangent.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2018-2023 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory
-
-import space.kscience.kmath.geometry.*
-import kotlin.math.*
-
-/**
- * Create inner and outer tangents between two circles.
- * This method returns a map of segments using [DubinsPath] connection type notation.
- */
-public fun Circle2D.tangentsToCircle(
-    other: Circle2D,
-): Map<DubinsPath.Type, LineSegment<DoubleVector2D>> = with(Euclidean2DSpace) {
-    //return empty map for concentric circles
-    if(center.equalsVector(other.center)) return@tangentsToCircle emptyMap()
-
-    // A line connecting centers
-    val line = LineSegment(center, other.center)
-    // Distance between centers
-    val distance = line.begin.distanceTo(line.end)
-    val angle1 = atan2(other.center.x - center.x, other.center.y - center.y)
-    var angle2: Double
-    val routes = mapOf(
-        DubinsPath.Type.RSR to Pair(radius, other.radius),
-        DubinsPath.Type.RSL to Pair(radius, -other.radius),
-        DubinsPath.Type.LSR to Pair(-radius, other.radius),
-        DubinsPath.Type.LSL to Pair(-radius, -other.radius)
-    )
-    return buildMap {
-        for ((route, r1r2) in routes) {
-            val r1 = r1r2.first
-            val r2 = r1r2.second
-            val r = if (r1.sign == r2.sign) {
-                r1.absoluteValue - r2.absoluteValue
-            } else {
-                r1.absoluteValue + r2.absoluteValue
-            }
-            if (distance * distance >= r * r) {
-                val l = sqrt(distance * distance - r * r)
-                angle2 = if (r1.absoluteValue > r2.absoluteValue) {
-                    angle1 + r1.sign * atan2(r.absoluteValue, l)
-                } else {
-                    angle1 - r2.sign * atan2(r.absoluteValue, l)
-                }
-                val w = Euclidean2DSpace.vector(-cos(angle2), sin(angle2))
-                put(
-                    route,
-                    LineSegment(
-                        center + w * r1,
-                        other.center + w * r2
-                    )
-                )
-            } else {
-                throw Exception("Circles should not intersect")
-            }
-        }
-    }
-}
-
-public fun dubinsTangentsToCircles(
-    firstCircle: Circle2D,
-    secondCircle: Circle2D,
-    firstObstacle: DubinsObstacle,
-    secondObstacle: DubinsObstacle
-): Map<DubinsPath.Type, DubinsTangent> = with(Euclidean2DSpace) {
-    val line = LineSegment(firstCircle.center, secondCircle.center)
-    val distance = line.begin.distanceTo(line.end)
-    val angle1 = atan2(secondCircle.center.x - firstCircle.center.x,
-        secondCircle.center.y - firstCircle.center.y)
-    var r: Double
-    var angle2: Double
-    val routes = mapOf(
-        DubinsPath.Type.RSR to Pair(firstCircle.radius, secondCircle.radius),
-        DubinsPath.Type.RSL to Pair(firstCircle.radius, -secondCircle.radius),
-        DubinsPath.Type.LSR to Pair(-firstCircle.radius, secondCircle.radius),
-        DubinsPath.Type.LSL to Pair(-firstCircle.radius, -secondCircle.radius)
-    )
-    return buildMap {
-        for ((route, r1r2) in routes) {
-            val r1 = r1r2.first
-            val r2 = r1r2.second
-            r = if (r1.sign == r2.sign) {
-                r1.absoluteValue - r2.absoluteValue
-            } else {
-                r1.absoluteValue + r2.absoluteValue
-            }
-            if (distance * distance >= r * r) {
-                val l = sqrt(distance * distance - r * r)
-                angle2 = if (r1.absoluteValue > r2.absoluteValue) {
-                    angle1 + r1.sign * atan2(r.absoluteValue, l)
-                } else {
-                    angle1 - r2.sign * atan2(r.absoluteValue, l)
-                }
-                val w = vector(-cos(angle2), sin(angle2))
-                put(route, DubinsTangent(Circle2D(firstCircle.center, firstCircle.radius),
-                    secondCircle,
-                    firstObstacle,
-                    secondObstacle,
-                    LineSegment2D(
-                        firstCircle.center + w * r1,
-                        secondCircle.center + w * r2
-                    ),
-                    DubinsPath.toSimpleTypes(route))
-                )
-            } else {
-                throw Exception("Circles should not intersect")
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt
similarity index 93%
rename from kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
rename to kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt
index 481ea4786..f5bfb884e 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/dubins/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt
@@ -1,13 +1,12 @@
 /*
- * Copyright 2018-2022 KMath contributors.
+ * Copyright 2018-2023 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.trajectory.dubins
+package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.equalsFloat
-import space.kscience.kmath.trajectory.*
 import kotlin.test.Test
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
@@ -37,7 +36,7 @@ class DubinsTests {
         )
 
         expectedLengths.forEach {
-            val path = dubins.find { p -> DubinsPath.trajectoryTypeOf(p) === it.key }
+            val path = dubins.find { p -> DubinsPath.trajectoryTypeOf(p) == it.key }
             assertNotNull(path, "Path ${it.key} not found")
             println("${it.key}: ${path.length}")
             assertTrue(it.value.equalsFloat(path.length))
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
similarity index 55%
rename from kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
rename to kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
index 07e9861c7..446e0a4d3 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTest.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
@@ -7,12 +7,10 @@ package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace.vector
-import space.kscience.kmath.geometry.equalsFloat
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.test.assertTrue
 
-class DubinsTest {
+class ObstacleTest {
     @Test
     fun firstPath() {
         val startPoint = vector(-5.0, -1.0)
@@ -22,8 +20,13 @@ class DubinsTest {
         val finalDirection = vector(1.0, -1.0)
         val finalRadius = 0.5
 
-        val obstacles = listOf(DubinsObstacle(listOf(
-            Circle2D(vector(7.0, 1.0), 5.0))))
+        val obstacles = listOf(
+            Obstacle(
+                listOf(
+                    Circle2D(vector(7.0, 1.0), 5.0)
+                )
+            )
+        )
 
         val outputTangents = findAllPaths(
             startPoint,
@@ -32,8 +35,9 @@ class DubinsTest {
             finalPoint,
             finalDirection,
             finalRadius,
-            obstacles)
-        val length = pathLength(shortestPath(outputTangents))
+            obstacles
+        )
+        val length = outputTangents.minOf { it.length }
         assertEquals(length, 27.2113183, 1e-6)
     }
 
@@ -47,17 +51,21 @@ class DubinsTest {
         val finalRadius = 0.5
 
         val obstacles = listOf(
-            DubinsObstacle(listOf(
-                Circle2D(vector(1.0, 6.5), 0.5),
-                Circle2D(vector(2.0, 1.0), 0.5),
-                Circle2D(vector(6.0, 0.0), 0.5),
-                Circle2D(vector(5.0, 5.0), 0.5)
-            )), DubinsObstacle(listOf(
-                Circle2D(vector(10.0, 1.0), 0.5),
-                Circle2D(vector(16.0, 0.0), 0.5),
-                Circle2D(vector(14.0, 6.0), 0.5),
-                Circle2D(vector(9.0, 4.0), 0.5)
-            ))
+            Obstacle(
+                listOf(
+                    Circle2D(vector(1.0, 6.5), 0.5),
+                    Circle2D(vector(2.0, 1.0), 0.5),
+                    Circle2D(vector(6.0, 0.0), 0.5),
+                    Circle2D(vector(5.0, 5.0), 0.5)
+                )
+            ), Obstacle(
+                listOf(
+                    Circle2D(vector(10.0, 1.0), 0.5),
+                    Circle2D(vector(16.0, 0.0), 0.5),
+                    Circle2D(vector(14.0, 6.0), 0.5),
+                    Circle2D(vector(9.0, 4.0), 0.5)
+                )
+            )
         )
         val paths = findAllPaths(
             startPoint,
@@ -66,22 +74,19 @@ class DubinsTest {
             finalPoint,
             finalDirection,
             finalRadius,
-            obstacles)
-        val length = pathLength(shortestPath(paths))
-        assertEquals(length,28.9678224, 1e-6)
-    }
-    @Test
-    fun equalCircles() {
-        val circle1 = Circle2D(vector(1.0, 6.5), 0.5)
-        val circle2 = Circle2D(vector(1.0, 6.5), 0.5)
-        println(circle1 == circle2)
+            obstacles
+        )
+        val length = paths.minOf { it.length }
+        assertEquals(length, 28.9678224, 1e-6)
     }
+
     @Test
     fun equalObstacles() {
         val circle1 = Circle2D(vector(1.0, 6.5), 0.5)
         val circle2 = Circle2D(vector(1.0, 6.5), 0.5)
-        val obstacle1 = DubinsObstacle(listOf(circle1))
-        val obstacle2 = DubinsObstacle(listOf(circle2))
-        println(obstacle1 == obstacle2)
+        assertEquals(circle1, circle2)
+        val obstacle1 = Obstacle(listOf(circle1))
+        val obstacle2 = Obstacle(listOf(circle2))
+        assertEquals(obstacle1, obstacle2)
     }
 }
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
index 7594aa046..f149004bb 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
@@ -10,6 +10,7 @@ import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.circumference
 import space.kscience.kmath.geometry.degrees
 import space.kscience.kmath.trajectory.CircleTrajectory2D
+import space.kscience.kmath.trajectory.Trajectory2D
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -22,7 +23,7 @@ class ArcTests {
             circle.center,
             vector(-2.0, 0.0),
             vector(0.0, 2.0),
-            CircleTrajectory2D.Direction.RIGHT
+            Trajectory2D.Type.R
         )
         assertEquals(circle.circumference / 4, arc.length, 1.0)
         assertEquals(0.0, arc.start.bearing.degrees)
-- 
2.34.1


From 109e050f03abc0b585a024dd8abd743aa434e8d1 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 4 Apr 2023 15:16:33 +0300
Subject: [PATCH 677/713] Hieraechy for trajectory types

---
 .../space/kscience/kmath/misc/Featured.kt     |  2 +-
 .../space/kscience/kmath/misc/collections.kt  | 22 +++++++
 .../kscience/kmath/trajectory/DubinsPath.kt   | 58 +++++++++----------
 .../kscience/kmath/trajectory/Trajectory2D.kt | 40 ++++++++-----
 .../kscience/kmath/trajectory/ObstacleTest.kt |  4 +-
 .../kmath/trajectory/segments/ArcTests.kt     |  2 +-
 6 files changed, 78 insertions(+), 50 deletions(-)
 create mode 100644 kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/collections.kt

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
index a752a8339..bdda674dc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/Featured.kt
@@ -9,7 +9,7 @@ import kotlin.jvm.JvmInline
 import kotlin.reflect.KClass
 
 /**
- * A entity that contains a set of features defined by their types
+ * An entity that contains a set of features defined by their types
  */
 public interface Featured<F : Any> {
     public fun <T : F> getFeature(type: FeatureKey<T>): T?
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/collections.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/collections.kt
new file mode 100644
index 000000000..90cc5bbfa
--- /dev/null
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/collections.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.misc
+
+/**
+ * The same as [zipWithNext], but includes link between last and first element
+ */
+public inline fun <T, R> List<T>.zipWithNextCircular(transform: (a: T, b: T) -> R): List<R> {
+    if (isEmpty()) return emptyList()
+    return indices.map { i ->
+        if (i == size - 1) {
+            transform(last(), first())
+        } else {
+            transform(get(i), get(i + 1))
+        }
+    }
+}
+
+public inline fun <T> List<T>.zipWithNextCircular(): List<Pair<T,T>> = zipWithNextCircular { l, r -> l to r  }
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
index 272cf9e5b..87ea52a69 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
@@ -7,8 +7,7 @@ package space.kscience.kmath.trajectory
 
 import space.kscience.kmath.geometry.*
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.trajectory.Trajectory2D.Type
-import space.kscience.kmath.trajectory.Trajectory2D.Type.*
+import space.kscience.kmath.trajectory.Trajectory2D.*
 import kotlin.math.acos
 
 internal fun DubinsPose2D.getLeftCircle(radius: Double): Circle2D = getTangentCircles(radius).first
@@ -21,7 +20,7 @@ internal fun DubinsPose2D.getTangentCircles(radius: Double): Pair<Circle2D, Circ
     return Circle2D(vector(x - dX, y + dY), radius) to Circle2D(vector(x + dX, y - dY), radius)
 }
 
-private fun outerTangent(from: Circle2D, to: Circle2D, direction: Type): StraightTrajectory2D =
+private fun outerTangent(from: Circle2D, to: Circle2D, direction: Direction): StraightTrajectory2D =
     with(Euclidean2DSpace) {
         val centers = StraightTrajectory2D(from.center, to.center)
         val p1 = when (direction) {
@@ -34,8 +33,6 @@ private fun outerTangent(from: Circle2D, to: Circle2D, direction: Type): Straigh
                 from.center.x + from.radius * cos(centers.bearing),
                 from.center.y - from.radius * sin(centers.bearing)
             )
-
-            else -> error("S trajectory type not allowed")
         }
         return StraightTrajectory2D(
             p1,
@@ -47,7 +44,7 @@ private fun outerTangent(from: Circle2D, to: Circle2D, direction: Type): Straigh
 private fun innerTangent(
     from: Circle2D,
     to: Circle2D,
-    direction: Type,
+    direction: Direction,
 ): StraightTrajectory2D? =
     with(Euclidean2DSpace) {
         val centers = StraightTrajectory2D(from.center, to.center)
@@ -55,7 +52,6 @@ private fun innerTangent(
         val angle = when (direction) {
             L -> centers.bearing + acos(from.radius * 2 / centers.length).radians
             R -> centers.bearing - acos(from.radius * 2 / centers.length).radians
-            else -> error("S trajectory type not allowed")
         }.normalized()
 
         val dX = from.radius * sin(angle)
@@ -70,13 +66,13 @@ private fun innerTangent(
 public object DubinsPath {
 
     public data class Type(
-        public val first: Trajectory2D.Type,
+        public val first: Direction,
         public val second: Trajectory2D.Type,
-        public val third: Trajectory2D.Type,
+        public val third: Direction,
     ) {
         public fun toList(): List<Trajectory2D.Type> = listOf(first, second, third)
 
-        override fun toString(): String = "${first.name}${second.name}${third.name}"
+        override fun toString(): String = "${first}${second}${third}"
 
         public companion object {
             public val RLR: Type = Type(R, L, R)
@@ -98,7 +94,7 @@ public object DubinsPath {
         val c = trajectory2D.segments.last() as? CircleTrajectory2D ?: return null
         return Type(
             a.direction,
-            if (b is CircleTrajectory2D) b.direction else Trajectory2D.Type.S,
+            if (b is CircleTrajectory2D) b.direction else S,
             c.direction
         )
     }
@@ -137,9 +133,9 @@ public object DubinsPath {
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory2D.of(c1.center, start, p1, Trajectory2D.Type.R)
-                val a2 = CircleTrajectory2D.of(e.center, p1, p2, Trajectory2D.Type.L)
-                val a3 = CircleTrajectory2D.of(c2.center, p2, end, Trajectory2D.Type.R)
+                val a1 = CircleTrajectory2D.of(c1.center, start, p1, R)
+                val a2 = CircleTrajectory2D.of(e.center, p1, p2, L)
+                val a3 = CircleTrajectory2D.of(c2.center, p2, end, R)
                 CompositeTrajectory2D(a1, a2, a3)
             }
 
@@ -154,9 +150,9 @@ public object DubinsPath {
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory2D.of(c1.center, start, p1, Trajectory2D.Type.R)
-                val a2 = CircleTrajectory2D.of(e.center, p1, p2, Trajectory2D.Type.L)
-                val a3 = CircleTrajectory2D.of(c2.center, p2, end, Trajectory2D.Type.R)
+                val a1 = CircleTrajectory2D.of(c1.center, start, p1, R)
+                val a2 = CircleTrajectory2D.of(e.center, p1, p2, L)
+                val a3 = CircleTrajectory2D.of(c2.center, p2, end, R)
                 CompositeTrajectory2D(a1, a2, a3)
             }
 
@@ -181,9 +177,9 @@ public object DubinsPath {
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory2D.of(c1.center, start, p1, Trajectory2D.Type.L)
-                val a2 = CircleTrajectory2D.of(e.center, p1, p2, Trajectory2D.Type.R)
-                val a3 = CircleTrajectory2D.of(c2.center, p2, end, Trajectory2D.Type.L)
+                val a1 = CircleTrajectory2D.of(c1.center, start, p1, L)
+                val a2 = CircleTrajectory2D.of(e.center, p1, p2, R)
+                val a3 = CircleTrajectory2D.of(c2.center, p2, end, L)
                 CompositeTrajectory2D(a1, a2, a3)
             }
 
@@ -198,9 +194,9 @@ public object DubinsPath {
                 dX = turningRadius * sin(theta)
                 dY = turningRadius * cos(theta)
                 val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory2D.of(c1.center, start, p1, Trajectory2D.Type.L)
-                val a2 = CircleTrajectory2D.of(e.center, p1, p2, Trajectory2D.Type.R)
-                val a3 = CircleTrajectory2D.of(c2.center, p2, end, Trajectory2D.Type.L)
+                val a1 = CircleTrajectory2D.of(c1.center, start, p1, L)
+                val a2 = CircleTrajectory2D.of(e.center, p1, p2, R)
+                val a3 = CircleTrajectory2D.of(c2.center, p2, end, L)
                 CompositeTrajectory2D(a1, a2, a3)
             }
 
@@ -211,8 +207,8 @@ public object DubinsPath {
         val c1 = start.getRightCircle(turningRadius)
         val c2 = end.getRightCircle(turningRadius)
         val s = outerTangent(c1, c2, L)
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, Trajectory2D.Type.R)
-        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, Trajectory2D.Type.R)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, R)
+        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, R)
         return CompositeTrajectory2D(a1, s, a3)
     }
 
@@ -220,8 +216,8 @@ public object DubinsPath {
         val c1 = start.getLeftCircle(turningRadius)
         val c2 = end.getLeftCircle(turningRadius)
         val s = outerTangent(c1, c2, R)
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, Trajectory2D.Type.L)
-        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, Trajectory2D.Type.L)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, L)
+        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, L)
         return CompositeTrajectory2D(a1, s, a3)
     }
 
@@ -231,8 +227,8 @@ public object DubinsPath {
         val s = innerTangent(c1, c2, R)
         if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
 
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, Trajectory2D.Type.R)
-        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, Trajectory2D.Type.L)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, R)
+        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, L)
         return CompositeTrajectory2D(a1, s, a3)
     }
 
@@ -242,8 +238,8 @@ public object DubinsPath {
         val s = innerTangent(c1, c2, L)
         if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
 
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, Trajectory2D.Type.L)
-        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, Trajectory2D.Type.R)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, L)
+        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, R)
         return CompositeTrajectory2D(a1, s, a3)
     }
 }
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
index 7bf17fc26..d6974b105 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
@@ -17,10 +17,21 @@ import kotlin.math.atan2
 public sealed interface Trajectory2D {
     public val length: Double
 
-    public enum class Type {
-        R,
-        S,
-        L
+
+    public sealed interface Type
+
+    public sealed interface Direction: Type
+
+    public object R : Direction {
+        override fun toString(): String = "R"
+    }
+
+    public object S : Type {
+        override fun toString(): String = "L"
+    }
+
+    public object L : Direction {
+        override fun toString(): String = "L"
     }
 }
 
@@ -56,7 +67,7 @@ public data class CircleTrajectory2D(
      * Arc length in radians
      */
     val arcLength: Angle
-        get() = if (direction == Trajectory2D.Type.L) {
+        get() = if (direction == Trajectory2D.L) {
             start.bearing - end.bearing
         } else {
             end.bearing - start.bearing
@@ -67,16 +78,16 @@ public data class CircleTrajectory2D(
         circle.radius * arcLength.radians
     }
 
-    public val direction: Trajectory2D.Type by lazy {
+    public val direction: Trajectory2D.Direction by lazy {
         if (start.y < circle.center.y) {
-            if (start.bearing > Angle.pi) Trajectory2D.Type.R else Trajectory2D.Type.L
+            if (start.bearing > Angle.pi) Trajectory2D.R else Trajectory2D.L
         } else if (start.y > circle.center.y) {
-            if (start.bearing < Angle.pi) Trajectory2D.Type.R else Trajectory2D.Type.L
+            if (start.bearing < Angle.pi) Trajectory2D.R else Trajectory2D.L
         } else {
             if (start.bearing == Angle.zero) {
-                if (start.x < circle.center.x) Trajectory2D.Type.R else Trajectory2D.Type.L
+                if (start.x < circle.center.x) Trajectory2D.R else Trajectory2D.L
             } else {
-                if (start.x > circle.center.x) Trajectory2D.Type.R else Trajectory2D.Type.L
+                if (start.x > circle.center.x) Trajectory2D.R else Trajectory2D.L
             }
         }
     }
@@ -86,18 +97,17 @@ public data class CircleTrajectory2D(
             center: DoubleVector2D,
             start: DoubleVector2D,
             end: DoubleVector2D,
-            direction: Trajectory2D.Type,
+            direction: Trajectory2D.Direction,
         ): CircleTrajectory2D {
             fun calculatePose(
                 vector: DoubleVector2D,
                 theta: Angle,
-                direction: Trajectory2D.Type,
+                direction: Trajectory2D.Direction,
             ): DubinsPose2D = DubinsPose2D(
                 vector,
                 when (direction) {
-                    Trajectory2D.Type.L -> (theta - Angle.piDiv2).normalized()
-                    Trajectory2D.Type.R -> (theta + Angle.piDiv2).normalized()
-                    else -> error("S trajectory type is not allowed in circle constructor")
+                    Trajectory2D.L -> (theta - Angle.piDiv2).normalized()
+                    Trajectory2D.R -> (theta + Angle.piDiv2).normalized()
                 }
             )
 
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
index 446e0a4d3..150b370d0 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
@@ -38,7 +38,7 @@ class ObstacleTest {
             obstacles
         )
         val length = outputTangents.minOf { it.length }
-        assertEquals(length, 27.2113183, 1e-6)
+        assertEquals(27.2113183, length, 1e-6)
     }
 
     @Test
@@ -77,7 +77,7 @@ class ObstacleTest {
             obstacles
         )
         val length = paths.minOf { it.length }
-        assertEquals(length, 28.9678224, 1e-6)
+        assertEquals(28.9678224, length, 1e-6)
     }
 
     @Test
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
index f149004bb..b3825b93b 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
@@ -23,7 +23,7 @@ class ArcTests {
             circle.center,
             vector(-2.0, 0.0),
             vector(0.0, 2.0),
-            Trajectory2D.Type.R
+            Trajectory2D.R
         )
         assertEquals(circle.circumference / 4, arc.length, 1.0)
         assertEquals(0.0, arc.start.bearing.degrees)
-- 
2.34.1


From fd35d7c6143a5f544788bfda005cc399dc3cb245 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 4 Apr 2023 15:28:02 +0300
Subject: [PATCH 678/713] [WIP] refactoring directions

---
 .../kscience/kmath/trajectory/Obstacle.kt     | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
index d5d04e1a4..b4ae04342 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
@@ -350,13 +350,13 @@ private fun arcLength(
     circle: Circle2D,
     point1: DoubleVector2D,
     point2: DoubleVector2D,
-    route: Trajectory2D.Type,
+    direction: Trajectory2D.Direction,
 ): Double {
     val phi1 = atan2(point1.y - circle.center.y, point1.x - circle.center.x)
     val phi2 = atan2(point2.y - circle.center.y, point2.x - circle.center.x)
     var angle = 0.0
-    when (route) {
-        Trajectory2D.Type.L -> {
+    when (direction) {
+        Trajectory2D.L -> {
             angle = if (phi2 >= phi1) {
                 phi2 - phi1
             } else {
@@ -364,17 +364,13 @@ private fun arcLength(
             }
         }
 
-        Trajectory2D.Type.R -> {
+        Trajectory2D.R -> {
             angle = if (phi2 >= phi1) {
                 2 * PI - (phi2 - phi1)
             } else {
                 -(phi2 - phi1)
             }
         }
-
-        Trajectory2D.Type.S -> {
-            error("L or R route is expected")
-        }
     }
     return circle.radius * angle
 }
@@ -396,13 +392,13 @@ private fun constructTangentCircles(
     val p1 = center1 - point
     return if (atan2(p1.y, p1.x) - atan2(direction.y, direction.x) in listOf(PI / 2, -3 * PI / 2)) {
         mapOf(
-            Trajectory2D.Type.L to Circle2D(center1, r),
-            Trajectory2D.Type.R to Circle2D(center2, r)
+            Trajectory2D.L to Circle2D(center1, r),
+            Trajectory2D.R to Circle2D(center2, r)
         )
     } else {
         mapOf(
-            Trajectory2D.Type.L to Circle2D(center2, r),
-            Trajectory2D.Type.R to Circle2D(center1, r)
+            Trajectory2D.L to Circle2D(center2, r),
+            Trajectory2D.R to Circle2D(center1, r)
         )
     }
 }
@@ -483,8 +479,8 @@ internal fun findAllPaths(
         finalRadius
     )
     val trajectories = mutableListOf<CompositeTrajectory2D>()
-    for (i in listOf(Trajectory2D.Type.L, Trajectory2D.Type.R)) {
-        for (j in listOf(Trajectory2D.Type.L, Trajectory2D.Type.R)) {
+    for (i in listOf(Trajectory2D.L, Trajectory2D.R)) {
+        for (j in listOf(Trajectory2D.L, Trajectory2D.R)) {
             val finalCircle = finalCircles[j]!!
             val finalObstacle = Obstacle(listOf(finalCircle))
             var currentPaths: List<TangentPath> = listOf(
@@ -495,7 +491,7 @@ internal fun findAllPaths(
                         Obstacle(listOf(initialCircles[i]!!)),
                         Obstacle(listOf(initialCircles[i]!!)),
                         LineSegment2D(startingPoint, startingPoint),
-                        listOf(i, Trajectory2D.Type.S, i)
+                        listOf(i, Trajectory2D.S, i)
                     )
                 )
             )
@@ -503,13 +499,13 @@ internal fun findAllPaths(
                 val newPaths = mutableListOf<TangentPath>()
                 for (tangentPath: TangentPath in currentPaths) {
                     val currentCircle = tangentPath.last().endCircle
-                    val currentDirection = tangentPath.last().trajectoryType.last()
+                    val currentDirection: Trajectory2D.Direction = tangentPath.last().trajectoryType.last()
                     val currentObstacle = tangentPath.last().endObstacle
                     var nextObstacle: Obstacle? = null
                     if (currentObstacle != finalObstacle) {
                         val tangentToFinal = outerTangents(currentObstacle, finalObstacle)[DubinsPath.Type(
                             currentDirection,
-                            Trajectory2D.Type.S,
+                            Trajectory2D.S,
                             j
                         )]
                         for (obstacle in sortedObstacles(currentObstacle, obstacles)) {
@@ -538,7 +534,7 @@ internal fun findAllPaths(
                                         tangent.startCircle,
                                         DubinsPath.Type(
                                             currentDirection,
-                                            Trajectory2D.Type.S,
+                                            Trajectory2D.S,
                                             currentDirection
                                         ),
                                     ).lineSegment.begin,
@@ -555,7 +551,7 @@ internal fun findAllPaths(
                                         currentCircle,
                                         DubinsPath.Type(
                                             currentDirection,
-                                            Trajectory2D.Type.S,
+                                            Trajectory2D.S,
                                             currentDirection
                                         ),
                                         tangent.startCircle,
@@ -569,7 +565,7 @@ internal fun findAllPaths(
                                     currentCircle,
                                     DubinsPath.Type(
                                         currentDirection,
-                                        Trajectory2D.Type.S,
+                                        Trajectory2D.S,
                                         currentDirection
                                     ),
                                     tangent.startCircle,
@@ -599,7 +595,7 @@ internal fun findAllPaths(
                                 LineSegment2D(finalPoint, finalPoint),
                                 listOf(
                                     lastDirection,
-                                    Trajectory2D.Type.S,
+                                    Trajectory2D.S,
                                     j
                                 )
                             )
-- 
2.34.1


From 1e46ffbd98809c43b14c5b8f4df65f9315d040c7 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 4 Apr 2023 16:50:30 +0300
Subject: [PATCH 679/713] refactoring directions

---
 .../kscience/kmath/trajectory/Obstacle.kt     | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
index b4ae04342..c4ff34295 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
@@ -21,7 +21,8 @@ internal data class Tangent(
     val startObstacle: Obstacle,
     val endObstacle: Obstacle,
     val lineSegment: LineSegment2D,
-    val trajectoryType: List<Trajectory2D.Type>,
+    val startDirection: Trajectory2D.Direction,
+    val endDirection: Trajectory2D.Direction = startDirection
 )
 
 private class TangentPath(val tangents: List<Tangent>) {
@@ -131,7 +132,8 @@ private fun dubinsTangentsToCircles(
                             firstCircle.center + w * r1,
                             secondCircle.center + w * r2
                         ),
-                        trajectoryType = route.toList()
+                        startDirection = route.first,
+                        endDirection = route.third
                     )
                 )
             } else {
@@ -194,7 +196,8 @@ public class Obstacle(
                                     center + w * r1,
                                     other.center + w * r2
                                 ),
-                                routeType.toList()
+                                startDirection = routeType.first,
+                                endDirection = routeType.third
                             )
                         )
                     } else {
@@ -256,7 +259,8 @@ private fun Obstacle.nextTangent(circle: Circle2D, routeType: DubinsPath.Type):
                             tangents[i - 1].lineSegment.end,
                             tangents[i - 1].lineSegment.begin
                         ),
-                        routeType.toList()
+                        startDirection = routeType.first,
+                        endDirection = routeType.third
                     )
                 } else {
                     return Tangent(
@@ -268,7 +272,8 @@ private fun Obstacle.nextTangent(circle: Circle2D, routeType: DubinsPath.Type):
                             tangents.last().lineSegment.end,
                             tangents.last().lineSegment.begin
                         ),
-                        routeType.toList()
+                        startDirection = routeType.first,
+                        endDirection = routeType.third
                     )
                 }
             }
@@ -450,7 +455,7 @@ private fun TangentPath.toTrajectory(): CompositeTrajectory2D = CompositeTraject
                     right.startCircle.center,
                     left.lineSegment.end,
                     right.lineSegment.begin,
-                    right.trajectoryType.first()
+                    right.startDirection
                 )
             )
         }
@@ -491,7 +496,7 @@ internal fun findAllPaths(
                         Obstacle(listOf(initialCircles[i]!!)),
                         Obstacle(listOf(initialCircles[i]!!)),
                         LineSegment2D(startingPoint, startingPoint),
-                        listOf(i, Trajectory2D.S, i)
+                        i
                     )
                 )
             )
@@ -499,7 +504,7 @@ internal fun findAllPaths(
                 val newPaths = mutableListOf<TangentPath>()
                 for (tangentPath: TangentPath in currentPaths) {
                     val currentCircle = tangentPath.last().endCircle
-                    val currentDirection: Trajectory2D.Direction = tangentPath.last().trajectoryType.last()
+                    val currentDirection: Trajectory2D.Direction = tangentPath.last().endDirection
                     val currentObstacle = tangentPath.last().endObstacle
                     var nextObstacle: Obstacle? = null
                     if (currentObstacle != finalObstacle) {
@@ -583,7 +588,7 @@ internal fun findAllPaths(
             }
 
             trajectories += currentPaths.map { tangentPath ->
-                val lastDirection: Trajectory2D.Type = tangentPath.last().trajectoryType[2]
+                val lastDirection: Trajectory2D.Direction = tangentPath.last().endDirection
                 val end = finalCircles[j]!!
                 TangentPath(
                     tangentPath.tangents +
@@ -593,11 +598,8 @@ internal fun findAllPaths(
                                 Obstacle(end),
                                 Obstacle(end),
                                 LineSegment2D(finalPoint, finalPoint),
-                                listOf(
-                                    lastDirection,
-                                    Trajectory2D.S,
-                                    j
-                                )
+                                startDirection = lastDirection,
+                                endDirection = j
                             )
                 )
             }.map { it.toTrajectory() }
-- 
2.34.1


From f5201b6be0c2cf784e2a192193d2f7130caac857 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 4 Apr 2023 17:42:40 +0300
Subject: [PATCH 680/713] refactoring directions

---
 .../kotlin/space/kscience/kmath/trajectory/Obstacle.kt       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
index c4ff34295..553ca0388 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
@@ -69,7 +69,7 @@ internal fun Circle2D.tangentsToCircle(
                 } else {
                     angle1 - r2.sign * atan2(r.absoluteValue, l)
                 }
-                val w = Euclidean2DSpace.vector(-cos(angle2), sin(angle2))
+                val w = vector(-cos(angle2), sin(angle2))
                 put(
                     route,
                     LineSegment(
@@ -412,7 +412,7 @@ private fun sortedObstacles(
     currentObstacle: Obstacle,
     obstacles: List<Obstacle>,
 ): List<Obstacle> {
-    return obstacles.sortedBy { norm(it.center - currentObstacle.center) }//.reversed()
+    return obstacles.sortedBy { norm(it.center - currentObstacle.center) }
 }
 
 private fun tangentsAlongTheObstacle(
@@ -580,7 +580,6 @@ internal fun findAllPaths(
                             newPaths.add(TangentPath(tangentPath.tangents + tangentsAlong + tangent))
                         }
                     } else {
-                        // minor changes from Python code
                         newPaths.add(tangentPath)
                     }
                 }
-- 
2.34.1


From 639a255aaf96c3b41a458774036b3f48efd86765 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 4 Apr 2023 18:50:17 +0300
Subject: [PATCH 681/713] refactoring directions

---
 .../kscience/kmath/trajectory/DubinsPose2D.kt | 18 +++++++++++++--
 .../kscience/kmath/trajectory/Obstacle.kt     | 22 +++++++++----------
 .../kscience/kmath/trajectory/ObstacleTest.kt | 12 ++++------
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
index 8362d0cb5..078e158ea 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
@@ -3,6 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 @file:UseSerializers(Euclidean2DSpace.VectorSerializer::class)
+
 package space.kscience.kmath.trajectory
 
 import kotlinx.serialization.KSerializer
@@ -22,6 +23,19 @@ import kotlin.math.atan2
 public interface DubinsPose2D : DoubleVector2D {
     public val coordinates: DoubleVector2D
     public val bearing: Angle
+
+    public companion object {
+        public fun bearingToVector(bearing: Angle): Vector2D<Double> =
+            Euclidean2DSpace.vector(cos(bearing), sin(bearing))
+
+        public fun vectorToBearing(vector2D: DoubleVector2D): Angle {
+            require(vector2D.x != 0.0 || vector2D.y != 0.0) { "Can't get bearing of zero vector" }
+            return atan2(vector2D.y, vector2D.x).radians
+        }
+
+        public fun of(point: DoubleVector2D, direction: DoubleVector2D): DubinsPose2D =
+            DubinsPose2D(point, vectorToBearing(direction))
+    }
 }
 
 @Serializable
@@ -37,12 +51,12 @@ public class PhaseVector2D(
 private class DubinsPose2DImpl(
     override val coordinates: DoubleVector2D,
     override val bearing: Angle,
-) : DubinsPose2D, DoubleVector2D by coordinates{
+) : DubinsPose2D, DoubleVector2D by coordinates {
 
     override fun toString(): String = "DubinsPose2D(x=$x, y=$y, bearing=$bearing)"
 }
 
-public object DubinsPose2DSerializer: KSerializer<DubinsPose2D>{
+public object DubinsPose2DSerializer : KSerializer<DubinsPose2D> {
     private val proxySerializer = DubinsPose2DImpl.serializer()
 
     override val descriptor: SerialDescriptor
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
index 553ca0388..a00fe24d4 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
@@ -22,7 +22,7 @@ internal data class Tangent(
     val endObstacle: Obstacle,
     val lineSegment: LineSegment2D,
     val startDirection: Trajectory2D.Direction,
-    val endDirection: Trajectory2D.Direction = startDirection
+    val endDirection: Trajectory2D.Direction = startDirection,
 )
 
 private class TangentPath(val tangents: List<Tangent>) {
@@ -465,22 +465,22 @@ private fun TangentPath.toTrajectory(): CompositeTrajectory2D = CompositeTraject
 )
 
 internal fun findAllPaths(
-    startingPoint: DoubleVector2D,
-    startingDirection: DoubleVector2D,
+    start: DubinsPose2D,
     startingRadius: Double,
-    finalPoint: DoubleVector2D,
-    finalDirection: DoubleVector2D,
+    finish: DubinsPose2D,
     finalRadius: Double,
     obstacles: List<Obstacle>,
 ): List<CompositeTrajectory2D> {
+    fun DubinsPose2D.direction() = vector(cos(bearing),sin(bearing))
+
     val initialCircles = constructTangentCircles(
-        startingPoint,
-        startingDirection,
+        start,
+        start.direction(),
         startingRadius
     )
     val finalCircles = constructTangentCircles(
-        finalPoint,
-        finalDirection,
+        finish,
+        finish.direction(),
         finalRadius
     )
     val trajectories = mutableListOf<CompositeTrajectory2D>()
@@ -495,7 +495,7 @@ internal fun findAllPaths(
                         initialCircles[i]!!,
                         Obstacle(listOf(initialCircles[i]!!)),
                         Obstacle(listOf(initialCircles[i]!!)),
-                        LineSegment2D(startingPoint, startingPoint),
+                        LineSegment2D(start, start),
                         i
                     )
                 )
@@ -596,7 +596,7 @@ internal fun findAllPaths(
                                 end,
                                 Obstacle(end),
                                 Obstacle(end),
-                                LineSegment2D(finalPoint, finalPoint),
+                                LineSegment2D(finish, finish),
                                 startDirection = lastDirection,
                                 endDirection = j
                             )
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
index 150b370d0..1a8c3a474 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
@@ -29,11 +29,9 @@ class ObstacleTest {
         )
 
         val outputTangents = findAllPaths(
-            startPoint,
-            startDirection,
+            DubinsPose2D.of(startPoint, startDirection),
             startRadius,
-            finalPoint,
-            finalDirection,
+            DubinsPose2D.of(finalPoint, finalDirection),
             finalRadius,
             obstacles
         )
@@ -68,11 +66,9 @@ class ObstacleTest {
             )
         )
         val paths = findAllPaths(
-            startPoint,
-            startDirection,
+            DubinsPose2D.of(startPoint, startDirection),
             startRadius,
-            finalPoint,
-            finalDirection,
+            DubinsPose2D.of(finalPoint, finalDirection),
             finalRadius,
             obstacles
         )
-- 
2.34.1


From 025cb5806030665550f0767bc7de8ecec7ad3c7a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 4 Apr 2023 19:02:24 +0300
Subject: [PATCH 682/713] refactoring directions

---
 .../kscience/kmath/trajectory/Obstacle.kt     | 112 ++++++++----------
 1 file changed, 49 insertions(+), 63 deletions(-)

diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
index a00fe24d4..f2768bbca 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
@@ -229,6 +229,48 @@ public class Obstacle(
         }
     }
 
+    internal fun nextTangent(circle: Circle2D, direction: Trajectory2D.Direction): Tangent {
+        if (direction == boundaryRoute.first) {
+            for (i in circles.indices) {
+                if (circles[i] == circle) {
+                    return tangents[i]
+                }
+            }
+        } else {
+            for (i in circles.indices) {
+                if (circles[i] == circle) {
+                    if (i > 0) {
+                        return Tangent(
+                            circles[i],
+                            circles[i - 1],
+                            this,
+                            this,
+                            LineSegment2D(
+                                tangents[i - 1].lineSegment.end,
+                                tangents[i - 1].lineSegment.begin
+                            ),
+                            direction
+                        )
+                    } else {
+                        return Tangent(
+                            circles[0],
+                            circles.last(),
+                            this,
+                            this,
+                            LineSegment2D(
+                                tangents.last().lineSegment.end,
+                                tangents.last().lineSegment.begin
+                            ),
+                            direction
+                        )
+                    }
+                }
+            }
+        }
+
+        error("next tangent not found")
+    }
+
     override fun equals(other: Any?): Boolean {
         if (other == null || other !is Obstacle) return false
         return circles == other.circles
@@ -239,50 +281,6 @@ public class Obstacle(
     }
 }
 
-private fun Obstacle.nextTangent(circle: Circle2D, routeType: DubinsPath.Type): Tangent {
-    if (routeType == boundaryRoute) {
-        for (i in circles.indices) {
-            if (circles[i] == circle) {
-                return tangents[i]
-            }
-        }
-    } else {
-        for (i in circles.indices) {
-            if (circles[i] == circle) {
-                if (i > 0) {
-                    return Tangent(
-                        circles[i],
-                        circles[i - 1],
-                        this,
-                        this,
-                        LineSegment2D(
-                            tangents[i - 1].lineSegment.end,
-                            tangents[i - 1].lineSegment.begin
-                        ),
-                        startDirection = routeType.first,
-                        endDirection = routeType.third
-                    )
-                } else {
-                    return Tangent(
-                        circles[0],
-                        circles.last(),
-                        this,
-                        this,
-                        LineSegment2D(
-                            tangents.last().lineSegment.end,
-                            tangents.last().lineSegment.begin
-                        ),
-                        startDirection = routeType.first,
-                        endDirection = routeType.third
-                    )
-                }
-            }
-        }
-    }
-
-    error("next tangent not found")
-}
-
 public fun Obstacle(vararg circles: Circle2D): Obstacle = Obstacle(listOf(*circles))
 
 private fun LineSegment2D.intersectSegment(other: LineSegment2D): Boolean {
@@ -417,15 +415,15 @@ private fun sortedObstacles(
 
 private fun tangentsAlongTheObstacle(
     initialCircle: Circle2D,
-    initialRoute: DubinsPath.Type,
+    direction: Trajectory2D.Direction,
     finalCircle: Circle2D,
     obstacle: Obstacle,
 ): List<Tangent> {
     val dubinsTangents = mutableListOf<Tangent>()
-    var tangent = obstacle.nextTangent(initialCircle, initialRoute)
+    var tangent = obstacle.nextTangent(initialCircle, direction)
     dubinsTangents.add(tangent)
     while (tangent.endCircle != finalCircle) {
-        tangent = obstacle.nextTangent(tangent.endCircle, initialRoute)
+        tangent = obstacle.nextTangent(tangent.endCircle, direction)
         dubinsTangents.add(tangent)
     }
     return dubinsTangents
@@ -471,7 +469,7 @@ internal fun findAllPaths(
     finalRadius: Double,
     obstacles: List<Obstacle>,
 ): List<CompositeTrajectory2D> {
-    fun DubinsPose2D.direction() = vector(cos(bearing),sin(bearing))
+    fun DubinsPose2D.direction() = vector(cos(bearing), sin(bearing))
 
     val initialCircles = constructTangentCircles(
         start,
@@ -537,11 +535,7 @@ internal fun findAllPaths(
                                     tangentPath.last().lineSegment.end,
                                     tangent.startObstacle.nextTangent(
                                         tangent.startCircle,
-                                        DubinsPath.Type(
-                                            currentDirection,
-                                            Trajectory2D.S,
-                                            currentDirection
-                                        ),
+                                        currentDirection
                                     ).lineSegment.begin,
                                     currentDirection
                                 )
@@ -554,11 +548,7 @@ internal fun findAllPaths(
                                 tangentsAlong = if (lengthCalculated > lengthMaxPossible) {
                                     tangentsAlongTheObstacle(
                                         currentCircle,
-                                        DubinsPath.Type(
-                                            currentDirection,
-                                            Trajectory2D.S,
-                                            currentDirection
-                                        ),
+                                        currentDirection,
                                         tangent.startCircle,
                                         currentObstacle
                                     )
@@ -568,11 +558,7 @@ internal fun findAllPaths(
                             } else {
                                 tangentsAlong = tangentsAlongTheObstacle(
                                     currentCircle,
-                                    DubinsPath.Type(
-                                        currentDirection,
-                                        Trajectory2D.S,
-                                        currentDirection
-                                    ),
+                                    currentDirection,
                                     tangent.startCircle,
                                     currentObstacle
                                 )
-- 
2.34.1


From a0e2ef1afc08765240f0e00ac39205a25bdc92e8 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 4 Apr 2023 19:33:43 +0300
Subject: [PATCH 683/713] refactor lines and segments

---
 .../space/kscience/kmath/geometry/Line.kt     | 27 ++++++++++++++++---
 .../kscience/kmath/geometry/projections.kt    |  2 +-
 .../kscience/kmath/trajectory/Obstacle.kt     | 14 +++++-----
 .../kscience/kmath/trajectory/Trajectory2D.kt |  2 +-
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
index e593150f1..a7f6ae35d 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Line.kt
@@ -5,15 +5,23 @@
 
 package space.kscience.kmath.geometry
 
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import space.kscience.kmath.operations.DoubleField.pow
 
 /**
- * A line formed by [base] vector of start and a [direction] vector. Direction vector is not necessarily normalized,
+ * A line formed by [start] vector of start and a [direction] vector. Direction vector is not necessarily normalized,
  * but its length does not affect line properties
  */
+public interface Line<out V : Vector> {
+    public val start: V
+    public val direction: V
+}
+
 @Serializable
-public data class Line<out V : Vector>(val base: V, val direction: V)
+@SerialName("Line")
+private data class LineImpl<out V : Vector>(override val start: V, override val direction: V): Line<V>
+
+public fun <V : Vector> Line(base: V, direction: V): Line<V> = LineImpl(base, direction)
 
 public typealias Line2D = Line<DoubleVector2D>
 public typealias Line3D = Line<DoubleVector3D>
@@ -21,8 +29,19 @@ public typealias Line3D = Line<DoubleVector3D>
 /**
  * A directed line segment between [begin] and [end]
  */
+public interface LineSegment<out V : Vector> {
+    public val begin: V
+    public val end: V
+}
+
+/**
+ * Basic implementation for [LineSegment]
+ */
 @Serializable
-public data class LineSegment<out V : Vector>(val begin: V, val end: V)
+@SerialName("LineSegment")
+private data class LineSegmentImpl<out V : Vector>(override val begin: V, override val end: V) : LineSegment<V>
+
+public fun <V : Vector> LineSegment(begin: V, end: V): LineSegment<V> = LineSegmentImpl(begin, end)
 
 public fun <V : Vector> LineSegment<V>.line(algebra: GeometrySpace<V>): Line<V> = with(algebra) {
     Line(begin, end - begin)
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/projections.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/projections.kt
index 6950abbdc..c5c3487a1 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/projections.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/projections.kt
@@ -13,7 +13,7 @@ package space.kscience.kmath.geometry
  * @param line line to which vector should be projected
  */
 public fun <V : Vector> GeometrySpace<V>.projectToLine(vector: V, line: Line<V>): V = with(line) {
-    base + (direction dot (vector - base)) / (direction dot direction) * direction
+    start + (direction dot (vector - start)) / (direction dot direction) * direction
 }
 
 /**
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
index f2768bbca..3819afb54 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
@@ -23,7 +23,7 @@ internal data class Tangent(
     val lineSegment: LineSegment2D,
     val startDirection: Trajectory2D.Direction,
     val endDirection: Trajectory2D.Direction = startDirection,
-)
+): LineSegment2D by lineSegment
 
 private class TangentPath(val tangents: List<Tangent>) {
     fun last() = tangents.last()
@@ -128,7 +128,7 @@ private fun dubinsTangentsToCircles(
                         endCircle = secondCircle,
                         startObstacle = firstObstacle,
                         endObstacle = secondObstacle,
-                        lineSegment = LineSegment2D(
+                        lineSegment = LineSegment(
                             firstCircle.center + w * r1,
                             secondCircle.center + w * r2
                         ),
@@ -192,7 +192,7 @@ public class Obstacle(
                                 other,
                                 this@Obstacle,
                                 this@Obstacle,
-                                LineSegment2D(
+                                LineSegment(
                                     center + w * r1,
                                     other.center + w * r2
                                 ),
@@ -245,7 +245,7 @@ public class Obstacle(
                             circles[i - 1],
                             this,
                             this,
-                            LineSegment2D(
+                            LineSegment(
                                 tangents[i - 1].lineSegment.end,
                                 tangents[i - 1].lineSegment.begin
                             ),
@@ -257,7 +257,7 @@ public class Obstacle(
                             circles.last(),
                             this,
                             this,
-                            LineSegment2D(
+                            LineSegment(
                                 tangents.last().lineSegment.end,
                                 tangents.last().lineSegment.begin
                             ),
@@ -493,7 +493,7 @@ internal fun findAllPaths(
                         initialCircles[i]!!,
                         Obstacle(listOf(initialCircles[i]!!)),
                         Obstacle(listOf(initialCircles[i]!!)),
-                        LineSegment2D(start, start),
+                        LineSegment(start, start),
                         i
                     )
                 )
@@ -582,7 +582,7 @@ internal fun findAllPaths(
                                 end,
                                 Obstacle(end),
                                 Obstacle(end),
-                                LineSegment2D(finish, finish),
+                                LineSegment(finish, finish),
                                 startDirection = lastDirection,
                                 endDirection = j
                             )
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
index d6974b105..8df0de237 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
@@ -50,7 +50,7 @@ public data class StraightTrajectory2D(
     public val bearing: Angle get() = (atan2(end.x - start.x, end.y - start.y).radians).normalized()
 }
 
-public fun StraightTrajectory2D.toSegment(): LineSegment<Vector2D<Double>> = LineSegment2D(start, end)
+public fun StraightTrajectory2D.toSegment(): LineSegment<Vector2D<Double>> = LineSegment(start, end)
 
 /**
  * An arc segment
-- 
2.34.1


From 00ce7d5a48e4736ec6d80a480327a2c550787425 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 5 Apr 2023 13:30:13 +0300
Subject: [PATCH 684/713] Obstacle avoidance finished

---
 .../space/kscience/kmath/geometry/Polygon.kt  | 14 +++++++++++++
 .../kmath/geometry/ProjectionOntoLineTest.kt  |  4 ++--
 .../kscience/kmath/trajectory/DubinsPath.kt   | 10 +++++-----
 .../kscience/kmath/trajectory/Obstacle.kt     | 20 +++++++++++++++----
 .../kscience/kmath/trajectory/Trajectory2D.kt | 12 +++++------
 .../kscience/kmath/trajectory/DubinsTests.kt  |  4 ++--
 .../space/kscience/kmath/trajectory/math.kt   |  4 ++--
 7 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Polygon.kt

diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Polygon.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Polygon.kt
new file mode 100644
index 000000000..20f4a031e
--- /dev/null
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/Polygon.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.geometry
+
+
+/**
+ * A closed polygon in 2D space
+ */
+public interface Polygon<T> {
+    public val points: List<Vector2D<T>>
+}
\ No newline at end of file
diff --git a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
index cdb8ea870..7c6c105cf 100644
--- a/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
+++ b/kmath-geometry/src/commonTest/kotlin/space/kscience/kmath/geometry/ProjectionOntoLineTest.kt
@@ -63,7 +63,7 @@ internal class ProjectionOntoLineTest {
 
     @Test
     fun projectionOntoLine3d() = with(Euclidean3DSpace) {
-        val line = Line3D(
+        val line = Line(
             base = vector(1.0, 3.5, 0.07),
             direction = vector(2.0, -0.0037, 11.1111)
         )
@@ -77,7 +77,7 @@ internal class ProjectionOntoLineTest {
                     val result = projectToLine(v, line)
 
                     // assert that result is on the line
-                    assertTrue(isCollinear(result - line.base, line.direction))
+                    assertTrue(isCollinear(result - line.start, line.direction))
                     // assert that PV vector is orthogonal to direction vector
                     assertTrue(isOrthogonal(v - result, line.direction))
                 }
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
index 87ea52a69..a1563b29c 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
@@ -36,7 +36,7 @@ private fun outerTangent(from: Circle2D, to: Circle2D, direction: Direction): St
         }
         return StraightTrajectory2D(
             p1,
-            vector(p1.x + (centers.end.x - centers.start.x), p1.y + (centers.end.y - centers.start.y))
+            vector(p1.x + (centers.end.x - centers.begin.x), p1.y + (centers.end.y - centers.begin.y))
         )
     }
 
@@ -207,7 +207,7 @@ public object DubinsPath {
         val c1 = start.getRightCircle(turningRadius)
         val c2 = end.getRightCircle(turningRadius)
         val s = outerTangent(c1, c2, L)
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, R)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.begin, R)
         val a3 = CircleTrajectory2D.of(c2.center, s.end, end, R)
         return CompositeTrajectory2D(a1, s, a3)
     }
@@ -216,7 +216,7 @@ public object DubinsPath {
         val c1 = start.getLeftCircle(turningRadius)
         val c2 = end.getLeftCircle(turningRadius)
         val s = outerTangent(c1, c2, R)
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, L)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.begin, L)
         val a3 = CircleTrajectory2D.of(c2.center, s.end, end, L)
         return CompositeTrajectory2D(a1, s, a3)
     }
@@ -227,7 +227,7 @@ public object DubinsPath {
         val s = innerTangent(c1, c2, R)
         if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
 
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, R)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.begin, R)
         val a3 = CircleTrajectory2D.of(c2.center, s.end, end, L)
         return CompositeTrajectory2D(a1, s, a3)
     }
@@ -238,7 +238,7 @@ public object DubinsPath {
         val s = innerTangent(c1, c2, L)
         if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
 
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.start, L)
+        val a1 = CircleTrajectory2D.of(c1.center, start, s.begin, L)
         val a3 = CircleTrajectory2D.of(c2.center, s.end, end, R)
         return CompositeTrajectory2D(a1, s, a3)
     }
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
index 3819afb54..32061efea 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
@@ -23,7 +23,7 @@ internal data class Tangent(
     val lineSegment: LineSegment2D,
     val startDirection: Trajectory2D.Direction,
     val endDirection: Trajectory2D.Direction = startDirection,
-): LineSegment2D by lineSegment
+) : LineSegment2D by lineSegment
 
 private class TangentPath(val tangents: List<Tangent>) {
     fun last() = tangents.last()
@@ -143,7 +143,7 @@ private fun dubinsTangentsToCircles(
     }
 }
 
-public class Obstacle(
+internal class Obstacle(
     public val circles: List<Circle2D>,
 ) {
     internal val tangents: List<Tangent> = boundaryTangents().first
@@ -281,7 +281,7 @@ public class Obstacle(
     }
 }
 
-public fun Obstacle(vararg circles: Circle2D): Obstacle = Obstacle(listOf(*circles))
+internal fun Obstacle(vararg circles: Circle2D): Obstacle = Obstacle(listOf(*circles))
 
 private fun LineSegment2D.intersectSegment(other: LineSegment2D): Boolean {
     fun crossProduct(v1: DoubleVector2D, v2: DoubleVector2D): Double {
@@ -594,7 +594,19 @@ internal fun findAllPaths(
 }
 
 
-
+public object Obstacles {
+    public fun allPathsAvoiding(
+        start: DubinsPose2D,
+        finish: DubinsPose2D,
+        trajectoryRadius: Double,
+        obstaclePolygons: List<Polygon<Double>>,
+    ): List<CompositeTrajectory2D> {
+        val obstacles: List<Obstacle> = obstaclePolygons.map { polygon ->
+            Obstacle(polygon.points.map { point -> Circle2D(point, trajectoryRadius) })
+        }
+        return findAllPaths(start, trajectoryRadius, finish, trajectoryRadius, obstacles)
+    }
+}
 
 
 
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
index 8df0de237..59a8e613a 100644
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
+++ b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
@@ -41,17 +41,15 @@ public sealed interface Trajectory2D {
 @Serializable
 @SerialName("straight")
 public data class StraightTrajectory2D(
-    public val start: DoubleVector2D,
-    public val end: DoubleVector2D,
-) : Trajectory2D {
+    override val begin: DoubleVector2D,
+    override val end: DoubleVector2D,
+) : Trajectory2D, LineSegment2D {
 
-    override val length: Double get() = start.distanceTo(end)
+    override val length: Double get() = begin.distanceTo(end)
 
-    public val bearing: Angle get() = (atan2(end.x - start.x, end.y - start.y).radians).normalized()
+    public val bearing: Angle get() = (atan2(end.x - begin.x, end.y - begin.y).radians).normalized()
 }
 
-public fun StraightTrajectory2D.toSegment(): LineSegment<Vector2D<Double>> = LineSegment(start, end)
-
 /**
  * An arc segment
  */
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt
index f5bfb884e..80f7173f1 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt
@@ -20,7 +20,7 @@ class DubinsTests {
         val lineP1 = straight.shift(1, 10.0).inverse()
 
         val start = DubinsPose2D(straight.end, straight.bearing)
-        val end = DubinsPose2D(lineP1.start, lineP1.bearing)
+        val end = DubinsPose2D(lineP1.begin, lineP1.bearing)
         val radius = 2.0
         val dubins = DubinsPath.all(start, end, radius)
 
@@ -53,7 +53,7 @@ class DubinsTests {
                 assertTrue(a.end.equalsFloat(b.start))
                 assertTrue(c.start.equalsFloat(b.end))
             } else if (b is StraightTrajectory2D) {
-                assertTrue(a.end.equalsFloat(DubinsPose2D(b.start, b.bearing)))
+                assertTrue(a.end.equalsFloat(DubinsPose2D(b.begin, b.bearing)))
                 assertTrue(c.start.equalsFloat(DubinsPose2D(b.end, b.bearing)))
             }
         }
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
index 24685f528..8b8ccf95e 100644
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
+++ b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
@@ -14,14 +14,14 @@ import space.kscience.kmath.geometry.sin
 fun DubinsPose2D.equalsFloat(other: DubinsPose2D) =
     x.equalsFloat(other.x) && y.equalsFloat(other.y) && bearing.radians.equalsFloat(other.bearing.radians)
 
-fun StraightTrajectory2D.inverse() = StraightTrajectory2D(end, start)
+fun StraightTrajectory2D.inverse() = StraightTrajectory2D(end, begin)
 
 fun StraightTrajectory2D.shift(shift: Int, width: Double): StraightTrajectory2D = with(Euclidean2DSpace) {
     val dX = width * sin(inverse().bearing)
     val dY = width * sin(bearing)
 
     return StraightTrajectory2D(
-        vector(start.x - dX * shift, start.y - dY * shift),
+        vector(begin.x - dX * shift, begin.y - dY * shift),
         vector(end.x - dX * shift, end.y - dY * shift)
     )
 }
-- 
2.34.1


From 7cc6a4be400bb7195dba6df50259a2c48cee849f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 5 Apr 2023 15:26:09 +0300
Subject: [PATCH 685/713] remove trajectory

---
 CHANGELOG.md                                  |   1 +
 build.gradle.kts                              |   2 +-
 gradle.properties                             |   2 +-
 kmath-trajectory/README.md                    |  34 -
 kmath-trajectory/build.gradle.kts             |  21 -
 kmath-trajectory/docs/README-TEMPLATE.md      |  13 -
 .../kscience/kmath/trajectory/DubinsPath.kt   | 258 --------
 .../kscience/kmath/trajectory/DubinsPose2D.kt |  75 ---
 .../kscience/kmath/trajectory/Obstacle.kt     | 614 ------------------
 .../kscience/kmath/trajectory/Trajectory2D.kt | 131 ----
 .../kscience/kmath/trajectory/DubinsTests.kt  |  61 --
 .../kscience/kmath/trajectory/ObstacleTest.kt |  88 ---
 .../kscience/kmath/trajectory/TangentTest.kt  |  64 --
 .../space/kscience/kmath/trajectory/math.kt   |  27 -
 .../kmath/trajectory/segments/ArcTests.kt     |  32 -
 .../kmath/trajectory/segments/CircleTests.kt  |  24 -
 .../kmath/trajectory/segments/LineTests.kt    |  37 --
 settings.gradle.kts                           |   1 -
 18 files changed, 3 insertions(+), 1482 deletions(-)
 delete mode 100644 kmath-trajectory/README.md
 delete mode 100644 kmath-trajectory/build.gradle.kts
 delete mode 100644 kmath-trajectory/docs/README-TEMPLATE.md
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
 delete mode 100644 kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
 delete mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt
 delete mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
 delete mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
 delete mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
 delete mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
 delete mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
 delete mode 100644 kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5fa3f372..24b592430 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 ### Deprecated
 
 ### Removed
+- Trajectory moved to https://github.com/SciProgCentre/maps-kt
 - Polynomials moved to https://github.com/SciProgCentre/kmath-polynomial
 
 ### Fixed
diff --git a/build.gradle.kts b/build.gradle.kts
index 9b1101a22..cd8dfb4a0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.1-dev-10"
+    version = "0.3.1-dev-11"
 }
 
 subprojects {
diff --git a/gradle.properties b/gradle.properties
index 262bcabfb..e33106c0c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ kotlin.native.ignoreDisabledTargets=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.14.5-kotlin-1.8.20-RC
+toolsVersion=0.14.6-kotlin-1.8.20
 
 
 org.gradle.parallel=true
diff --git a/kmath-trajectory/README.md b/kmath-trajectory/README.md
deleted file mode 100644
index ac2930b04..000000000
--- a/kmath-trajectory/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# kmath-trajectory
-
-
-
-
-## Artifact:
-
-The Maven coordinates of this project are `space.kscience:kmath-trajectory:0.3.1-dev-1`.
-
-**Gradle Groovy:**
-```groovy
-repositories {
-    maven { url 'https://repo.kotlin.link' }
-    mavenCentral()
-}
-
-dependencies {
-    implementation 'space.kscience:kmath-trajectory:0.3.1-dev-1'
-}
-```
-**Gradle Kotlin DSL:**
-```kotlin
-repositories {
-    maven("https://repo.kotlin.link")
-    mavenCentral()
-}
-
-dependencies {
-    implementation("space.kscience:kmath-trajectory:0.3.1-dev-1")
-}
-```
-
-## Contributors
-Erik Schouten (github: @ESchouten, email: erik-schouten@hotmail.nl)
diff --git a/kmath-trajectory/build.gradle.kts b/kmath-trajectory/build.gradle.kts
deleted file mode 100644
index 32b87bb06..000000000
--- a/kmath-trajectory/build.gradle.kts
+++ /dev/null
@@ -1,21 +0,0 @@
-plugins {
-    id("space.kscience.gradle.mpp")
-}
-
-kscience{
-    jvm()
-    js()
-    native()
-
-    useContextReceivers()
-    useSerialization()
-    dependencies {
-        api(projects.kmath.kmathGeometry)
-    }
-}
-
-readme {
-    description = "Path and trajectory optimization (to be moved to a separate project)"
-    maturity = space.kscience.gradle.Maturity.DEPRECATED
-    propertyByTemplate("artifact", rootProject.file("docs/templates/ARTIFACT-TEMPLATE.md"))
-}
diff --git a/kmath-trajectory/docs/README-TEMPLATE.md b/kmath-trajectory/docs/README-TEMPLATE.md
deleted file mode 100644
index eb8e4a0c0..000000000
--- a/kmath-trajectory/docs/README-TEMPLATE.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# kmath-trajectory
-
-
-${features}
-
-${artifact}
-
-## Author
-Erik Schouten
-
-Github: ESchouten
-
-Email: erik-schouten@hotmail.nl
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
deleted file mode 100644
index a1563b29c..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory
-
-import space.kscience.kmath.geometry.*
-import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.trajectory.Trajectory2D.*
-import kotlin.math.acos
-
-internal fun DubinsPose2D.getLeftCircle(radius: Double): Circle2D = getTangentCircles(radius).first
-
-internal fun DubinsPose2D.getRightCircle(radius: Double): Circle2D = getTangentCircles(radius).second
-
-internal fun DubinsPose2D.getTangentCircles(radius: Double): Pair<Circle2D, Circle2D> = with(Euclidean2DSpace) {
-    val dX = radius * cos(bearing)
-    val dY = radius * sin(bearing)
-    return Circle2D(vector(x - dX, y + dY), radius) to Circle2D(vector(x + dX, y - dY), radius)
-}
-
-private fun outerTangent(from: Circle2D, to: Circle2D, direction: Direction): StraightTrajectory2D =
-    with(Euclidean2DSpace) {
-        val centers = StraightTrajectory2D(from.center, to.center)
-        val p1 = when (direction) {
-            L -> vector(
-                from.center.x - from.radius * cos(centers.bearing),
-                from.center.y + from.radius * sin(centers.bearing)
-            )
-
-            R -> vector(
-                from.center.x + from.radius * cos(centers.bearing),
-                from.center.y - from.radius * sin(centers.bearing)
-            )
-        }
-        return StraightTrajectory2D(
-            p1,
-            vector(p1.x + (centers.end.x - centers.begin.x), p1.y + (centers.end.y - centers.begin.y))
-        )
-    }
-
-
-private fun innerTangent(
-    from: Circle2D,
-    to: Circle2D,
-    direction: Direction,
-): StraightTrajectory2D? =
-    with(Euclidean2DSpace) {
-        val centers = StraightTrajectory2D(from.center, to.center)
-        if (centers.length < from.radius * 2) return null
-        val angle = when (direction) {
-            L -> centers.bearing + acos(from.radius * 2 / centers.length).radians
-            R -> centers.bearing - acos(from.radius * 2 / centers.length).radians
-        }.normalized()
-
-        val dX = from.radius * sin(angle)
-        val dY = from.radius * cos(angle)
-        val p1 = vector(from.center.x + dX, from.center.y + dY)
-        val p2 = vector(to.center.x - dX, to.center.y - dY)
-        return StraightTrajectory2D(p1, p2)
-    }
-
-
-@Suppress("DuplicatedCode")
-public object DubinsPath {
-
-    public data class Type(
-        public val first: Direction,
-        public val second: Trajectory2D.Type,
-        public val third: Direction,
-    ) {
-        public fun toList(): List<Trajectory2D.Type> = listOf(first, second, third)
-
-        override fun toString(): String = "${first}${second}${third}"
-
-        public companion object {
-            public val RLR: Type = Type(R, L, R)
-            public val LRL: Type = Type(L, R, L)
-            public val RSR: Type = Type(R, S, R)
-            public val LSL: Type = Type(L, S, L)
-            public val RSL: Type = Type(R, S, L)
-            public val LSR: Type = Type(L, S, R)
-        }
-    }
-
-    /**
-     * Return Dubins trajectory type or null if trajectory is not a Dubins path
-     */
-    public fun trajectoryTypeOf(trajectory2D: CompositeTrajectory2D): Type? {
-        if (trajectory2D.segments.size != 3) return null
-        val a = trajectory2D.segments.first() as? CircleTrajectory2D ?: return null
-        val b = trajectory2D.segments[1]
-        val c = trajectory2D.segments.last() as? CircleTrajectory2D ?: return null
-        return Type(
-            a.direction,
-            if (b is CircleTrajectory2D) b.direction else S,
-            c.direction
-        )
-    }
-
-    public fun all(
-        start: DubinsPose2D,
-        end: DubinsPose2D,
-        turningRadius: Double,
-    ): List<CompositeTrajectory2D> = listOfNotNull(
-        rlr(start, end, turningRadius),
-        lrl(start, end, turningRadius),
-        rsr(start, end, turningRadius),
-        lsl(start, end, turningRadius),
-        rsl(start, end, turningRadius),
-        lsr(start, end, turningRadius)
-    )
-
-    public fun shortest(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D =
-        all(start, end, turningRadius).minBy { it.length }
-
-    public fun rlr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D? =
-        with(Euclidean2DSpace) {
-            val c1 = start.getRightCircle(turningRadius)
-            val c2 = end.getRightCircle(turningRadius)
-            val centers = StraightTrajectory2D(c1.center, c2.center)
-            if (centers.length > turningRadius * 4) return null
-
-            val firstVariant = run {
-                var theta = (centers.bearing - acos(centers.length / (turningRadius * 4)).radians).normalized()
-                var dX = turningRadius * sin(theta)
-                var dY = turningRadius * cos(theta)
-                val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
-                val e = Circle2D(p, turningRadius)
-                val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-                theta = (centers.bearing + acos(centers.length / (turningRadius * 4)).radians).normalized()
-                dX = turningRadius * sin(theta)
-                dY = turningRadius * cos(theta)
-                val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory2D.of(c1.center, start, p1, R)
-                val a2 = CircleTrajectory2D.of(e.center, p1, p2, L)
-                val a3 = CircleTrajectory2D.of(c2.center, p2, end, R)
-                CompositeTrajectory2D(a1, a2, a3)
-            }
-
-            val secondVariant = run {
-                var theta = (centers.bearing + acos(centers.length / (turningRadius * 4)).radians).normalized()
-                var dX = turningRadius * sin(theta)
-                var dY = turningRadius * cos(theta)
-                val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
-                val e = Circle2D(p, turningRadius)
-                val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-                theta = (centers.bearing - acos(centers.length / (turningRadius * 4)).radians).normalized()
-                dX = turningRadius * sin(theta)
-                dY = turningRadius * cos(theta)
-                val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory2D.of(c1.center, start, p1, R)
-                val a2 = CircleTrajectory2D.of(e.center, p1, p2, L)
-                val a3 = CircleTrajectory2D.of(c2.center, p2, end, R)
-                CompositeTrajectory2D(a1, a2, a3)
-            }
-
-            return if (firstVariant.length < secondVariant.length) firstVariant else secondVariant
-        }
-
-    public fun lrl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D? =
-        with(Euclidean2DSpace) {
-            val c1 = start.getLeftCircle(turningRadius)
-            val c2 = end.getLeftCircle(turningRadius)
-            val centers = StraightTrajectory2D(c1.center, c2.center)
-            if (centers.length > turningRadius * 4) return null
-
-            val firstVariant = run {
-                var theta = (centers.bearing + acos(centers.length / (turningRadius * 4)).radians).normalized()
-                var dX = turningRadius * sin(theta)
-                var dY = turningRadius * cos(theta)
-                val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
-                val e = Circle2D(p, turningRadius)
-                val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-                theta = (centers.bearing - acos(centers.length / (turningRadius * 4)).radians).normalized()
-                dX = turningRadius * sin(theta)
-                dY = turningRadius * cos(theta)
-                val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory2D.of(c1.center, start, p1, L)
-                val a2 = CircleTrajectory2D.of(e.center, p1, p2, R)
-                val a3 = CircleTrajectory2D.of(c2.center, p2, end, L)
-                CompositeTrajectory2D(a1, a2, a3)
-            }
-
-            val secondVariant = run {
-                var theta = (centers.bearing - acos(centers.length / (turningRadius * 4)).radians).normalized()
-                var dX = turningRadius * sin(theta)
-                var dY = turningRadius * cos(theta)
-                val p = vector(c1.center.x + dX * 2, c1.center.y + dY * 2)
-                val e = Circle2D(p, turningRadius)
-                val p1 = vector(c1.center.x + dX, c1.center.y + dY)
-                theta = (centers.bearing + acos(centers.length / (turningRadius * 4)).radians).normalized()
-                dX = turningRadius * sin(theta)
-                dY = turningRadius * cos(theta)
-                val p2 = vector(e.center.x + dX, e.center.y + dY)
-                val a1 = CircleTrajectory2D.of(c1.center, start, p1, L)
-                val a2 = CircleTrajectory2D.of(e.center, p1, p2, R)
-                val a3 = CircleTrajectory2D.of(c2.center, p2, end, L)
-                CompositeTrajectory2D(a1, a2, a3)
-            }
-
-            return if (firstVariant.length < secondVariant.length) firstVariant else secondVariant
-        }
-
-    public fun rsr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D {
-        val c1 = start.getRightCircle(turningRadius)
-        val c2 = end.getRightCircle(turningRadius)
-        val s = outerTangent(c1, c2, L)
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.begin, R)
-        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, R)
-        return CompositeTrajectory2D(a1, s, a3)
-    }
-
-    public fun lsl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D {
-        val c1 = start.getLeftCircle(turningRadius)
-        val c2 = end.getLeftCircle(turningRadius)
-        val s = outerTangent(c1, c2, R)
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.begin, L)
-        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, L)
-        return CompositeTrajectory2D(a1, s, a3)
-    }
-
-    public fun rsl(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D? {
-        val c1 = start.getRightCircle(turningRadius)
-        val c2 = end.getLeftCircle(turningRadius)
-        val s = innerTangent(c1, c2, R)
-        if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
-
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.begin, R)
-        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, L)
-        return CompositeTrajectory2D(a1, s, a3)
-    }
-
-    public fun lsr(start: DubinsPose2D, end: DubinsPose2D, turningRadius: Double): CompositeTrajectory2D? {
-        val c1 = start.getLeftCircle(turningRadius)
-        val c2 = end.getRightCircle(turningRadius)
-        val s = innerTangent(c1, c2, L)
-        if (s == null || c1.center.distanceTo(c2.center) < turningRadius * 2) return null
-
-        val a1 = CircleTrajectory2D.of(c1.center, start, s.begin, L)
-        val a3 = CircleTrajectory2D.of(c2.center, s.end, end, R)
-        return CompositeTrajectory2D(a1, s, a3)
-    }
-}
-
-public typealias PathTypes = List<Type>
-
-public fun interface MaxCurvature {
-    public fun compute(startPoint: PhaseVector2D): Double
-}
-
-public fun DubinsPath.shortest(
-    start: PhaseVector2D,
-    end: PhaseVector2D,
-    maxCurvature: MaxCurvature,
-): CompositeTrajectory2D = shortest(start, end, maxCurvature.compute(start))
-
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
deleted file mode 100644
index 078e158ea..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-@file:UseSerializers(Euclidean2DSpace.VectorSerializer::class)
-
-package space.kscience.kmath.trajectory
-
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import space.kscience.kmath.geometry.*
-import kotlin.math.atan2
-
-/**
- * Combination of [Vector] and its view angle (clockwise from positive y-axis direction)
- */
-@Serializable(DubinsPose2DSerializer::class)
-public interface DubinsPose2D : DoubleVector2D {
-    public val coordinates: DoubleVector2D
-    public val bearing: Angle
-
-    public companion object {
-        public fun bearingToVector(bearing: Angle): Vector2D<Double> =
-            Euclidean2DSpace.vector(cos(bearing), sin(bearing))
-
-        public fun vectorToBearing(vector2D: DoubleVector2D): Angle {
-            require(vector2D.x != 0.0 || vector2D.y != 0.0) { "Can't get bearing of zero vector" }
-            return atan2(vector2D.y, vector2D.x).radians
-        }
-
-        public fun of(point: DoubleVector2D, direction: DoubleVector2D): DubinsPose2D =
-            DubinsPose2D(point, vectorToBearing(direction))
-    }
-}
-
-@Serializable
-public class PhaseVector2D(
-    override val coordinates: DoubleVector2D,
-    public val velocity: DoubleVector2D,
-) : DubinsPose2D, DoubleVector2D by coordinates {
-    override val bearing: Angle get() = atan2(velocity.x, velocity.y).radians
-}
-
-@Serializable
-@SerialName("DubinsPose2D")
-private class DubinsPose2DImpl(
-    override val coordinates: DoubleVector2D,
-    override val bearing: Angle,
-) : DubinsPose2D, DoubleVector2D by coordinates {
-
-    override fun toString(): String = "DubinsPose2D(x=$x, y=$y, bearing=$bearing)"
-}
-
-public object DubinsPose2DSerializer : KSerializer<DubinsPose2D> {
-    private val proxySerializer = DubinsPose2DImpl.serializer()
-
-    override val descriptor: SerialDescriptor
-        get() = proxySerializer.descriptor
-
-    override fun deserialize(decoder: Decoder): DubinsPose2D {
-        return decoder.decodeSerializableValue(proxySerializer)
-    }
-
-    override fun serialize(encoder: Encoder, value: DubinsPose2D) {
-        val pose = value as? DubinsPose2DImpl ?: DubinsPose2DImpl(value.coordinates, value.bearing)
-        encoder.encodeSerializableValue(proxySerializer, pose)
-    }
-}
-
-public fun DubinsPose2D(coordinate: DoubleVector2D, theta: Angle): DubinsPose2D = DubinsPose2DImpl(coordinate, theta)
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
deleted file mode 100644
index 32061efea..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
+++ /dev/null
@@ -1,614 +0,0 @@
-/*
- * Copyright 2018-2023 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory
-
-import space.kscience.kmath.geometry.*
-import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.geometry.Euclidean2DSpace.minus
-import space.kscience.kmath.geometry.Euclidean2DSpace.norm
-import space.kscience.kmath.geometry.Euclidean2DSpace.plus
-import space.kscience.kmath.geometry.Euclidean2DSpace.times
-import space.kscience.kmath.geometry.Euclidean2DSpace.vector
-import space.kscience.kmath.operations.DoubleField.pow
-import kotlin.math.*
-
-internal data class Tangent(
-    val startCircle: Circle2D,
-    val endCircle: Circle2D,
-    val startObstacle: Obstacle,
-    val endObstacle: Obstacle,
-    val lineSegment: LineSegment2D,
-    val startDirection: Trajectory2D.Direction,
-    val endDirection: Trajectory2D.Direction = startDirection,
-) : LineSegment2D by lineSegment
-
-private class TangentPath(val tangents: List<Tangent>) {
-    fun last() = tangents.last()
-}
-
-private fun TangentPath(vararg tangents: Tangent) = TangentPath(listOf(*tangents))
-
-/**
- * Create inner and outer tangents between two circles.
- * This method returns a map of segments using [DubinsPath] connection type notation.
- */
-internal fun Circle2D.tangentsToCircle(
-    other: Circle2D,
-): Map<DubinsPath.Type, LineSegment2D> = with(Euclidean2DSpace) {
-    //return empty map for concentric circles
-    if (center.equalsVector(other.center)) return emptyMap()
-
-    // A line connecting centers
-    val line = LineSegment(center, other.center)
-    // Distance between centers
-    val distance = line.begin.distanceTo(line.end)
-    val angle1 = atan2(other.center.x - center.x, other.center.y - center.y)
-    var angle2: Double
-    val routes = mapOf(
-        DubinsPath.Type.RSR to Pair(radius, other.radius),
-        DubinsPath.Type.RSL to Pair(radius, -other.radius),
-        DubinsPath.Type.LSR to Pair(-radius, other.radius),
-        DubinsPath.Type.LSL to Pair(-radius, -other.radius)
-    )
-    return buildMap {
-        for ((route, r1r2) in routes) {
-            val r1 = r1r2.first
-            val r2 = r1r2.second
-            val r = if (r1.sign == r2.sign) {
-                r1.absoluteValue - r2.absoluteValue
-            } else {
-                r1.absoluteValue + r2.absoluteValue
-            }
-            if (distance * distance >= r * r) {
-                val l = sqrt(distance * distance - r * r)
-                angle2 = if (r1.absoluteValue > r2.absoluteValue) {
-                    angle1 + r1.sign * atan2(r.absoluteValue, l)
-                } else {
-                    angle1 - r2.sign * atan2(r.absoluteValue, l)
-                }
-                val w = vector(-cos(angle2), sin(angle2))
-                put(
-                    route,
-                    LineSegment(
-                        center + w * r1,
-                        other.center + w * r2
-                    )
-                )
-            } else {
-                throw Exception("Circles should not intersect")
-            }
-        }
-    }
-}
-
-private fun dubinsTangentsToCircles(
-    firstCircle: Circle2D,
-    secondCircle: Circle2D,
-    firstObstacle: Obstacle,
-    secondObstacle: Obstacle,
-): Map<DubinsPath.Type, Tangent> = with(Euclidean2DSpace) {
-    val line = LineSegment(firstCircle.center, secondCircle.center)
-    val distance = line.begin.distanceTo(line.end)
-    val angle1 = atan2(
-        secondCircle.center.x - firstCircle.center.x,
-        secondCircle.center.y - firstCircle.center.y
-    )
-    var r: Double
-    var angle2: Double
-    val routes = mapOf(
-        DubinsPath.Type.RSR to Pair(firstCircle.radius, secondCircle.radius),
-        DubinsPath.Type.RSL to Pair(firstCircle.radius, -secondCircle.radius),
-        DubinsPath.Type.LSR to Pair(-firstCircle.radius, secondCircle.radius),
-        DubinsPath.Type.LSL to Pair(-firstCircle.radius, -secondCircle.radius)
-    )
-    return buildMap {
-        for ((route: DubinsPath.Type, r1r2) in routes) {
-            val r1 = r1r2.first
-            val r2 = r1r2.second
-            r = if (r1.sign == r2.sign) {
-                r1.absoluteValue - r2.absoluteValue
-            } else {
-                r1.absoluteValue + r2.absoluteValue
-            }
-            if (distance * distance >= r * r) {
-                val l = sqrt(distance * distance - r * r)
-                angle2 = if (r1.absoluteValue > r2.absoluteValue) {
-                    angle1 + r1.sign * atan2(r.absoluteValue, l)
-                } else {
-                    angle1 - r2.sign * atan2(r.absoluteValue, l)
-                }
-                val w = vector(-cos(angle2), sin(angle2))
-                put(
-                    route,
-                    Tangent(
-                        startCircle = Circle2D(firstCircle.center, firstCircle.radius),
-                        endCircle = secondCircle,
-                        startObstacle = firstObstacle,
-                        endObstacle = secondObstacle,
-                        lineSegment = LineSegment(
-                            firstCircle.center + w * r1,
-                            secondCircle.center + w * r2
-                        ),
-                        startDirection = route.first,
-                        endDirection = route.third
-                    )
-                )
-            } else {
-                throw Exception("Circles should not intersect")
-            }
-        }
-    }
-}
-
-internal class Obstacle(
-    public val circles: List<Circle2D>,
-) {
-    internal val tangents: List<Tangent> = boundaryTangents().first
-    public val boundaryRoute: DubinsPath.Type = boundaryTangents().second
-
-    public val center: Vector2D<Double> = vector(
-        circles.sumOf { it.center.x } / circles.size,
-        circles.sumOf { it.center.y } / circles.size
-    )
-
-    private fun boundaryTangents(): Pair<List<Tangent>, DubinsPath.Type> {
-        // outer tangents for a polygon circles can be either lsl or rsr
-
-        fun Circle2D.dubinsTangentsToCircles(
-            other: Circle2D,
-        ): Map<DubinsPath.Type, Tangent> = with(Euclidean2DSpace) {
-            val line = LineSegment(center, other.center)
-            val d = line.begin.distanceTo(line.end)
-            val angle1 = atan2(other.center.x - center.x, other.center.y - center.y)
-            var r: Double
-            var angle2: Double
-            val routes = mapOf(
-                DubinsPath.Type.RSR to Pair(radius, other.radius),
-                DubinsPath.Type.LSL to Pair(-radius, -other.radius)
-            )
-            return buildMap {
-                for ((routeType, r1r2) in routes) {
-                    val r1 = r1r2.first
-                    val r2 = r1r2.second
-                    r = if (r1.sign == r2.sign) {
-                        r1.absoluteValue - r2.absoluteValue
-                    } else {
-                        r1.absoluteValue + r2.absoluteValue
-                    }
-                    if (d * d >= r * r) {
-                        val l = (d * d - r * r).pow(0.5)
-                        angle2 = if (r1.absoluteValue > r2.absoluteValue) {
-                            angle1 + r1.sign * atan2(r.absoluteValue, l)
-                        } else {
-                            angle1 - r2.sign * atan2(r.absoluteValue, l)
-                        }
-                        val w = vector(-cos(angle2), sin(angle2))
-                        put(
-                            routeType, Tangent(
-                                Circle2D(center, radius),
-                                other,
-                                this@Obstacle,
-                                this@Obstacle,
-                                LineSegment(
-                                    center + w * r1,
-                                    other.center + w * r2
-                                ),
-                                startDirection = routeType.first,
-                                endDirection = routeType.third
-                            )
-                        )
-                    } else {
-                        throw Exception("Circles should not intersect")
-                    }
-                }
-            }
-        }
-
-        val firstCircles = circles
-        val secondCircles = circles.slice(1..circles.lastIndex) +
-                circles[0]
-        val lslTangents = firstCircles.zip(secondCircles)
-        { a, b -> a.dubinsTangentsToCircles(b)[DubinsPath.Type.LSL]!! }
-        val rsrTangents = firstCircles.zip(secondCircles)
-        { a, b -> a.dubinsTangentsToCircles(b)[DubinsPath.Type.RSR]!! }
-        val center = vector(
-            circles.sumOf { it.center.x } / circles.size,
-            circles.sumOf { it.center.y } / circles.size
-        )
-        val lslToCenter = lslTangents.sumOf { it.lineSegment.begin.distanceTo(center) } +
-                lslTangents.sumOf { it.lineSegment.end.distanceTo(center) }
-        val rsrToCenter = rsrTangents.sumOf { it.lineSegment.begin.distanceTo(center) } +
-                rsrTangents.sumOf { it.lineSegment.end.distanceTo(center) }
-        return if (rsrToCenter >= lslToCenter) {
-            Pair(rsrTangents, DubinsPath.Type.RSR)
-        } else {
-            Pair(lslTangents, DubinsPath.Type.LSL)
-        }
-    }
-
-    internal fun nextTangent(circle: Circle2D, direction: Trajectory2D.Direction): Tangent {
-        if (direction == boundaryRoute.first) {
-            for (i in circles.indices) {
-                if (circles[i] == circle) {
-                    return tangents[i]
-                }
-            }
-        } else {
-            for (i in circles.indices) {
-                if (circles[i] == circle) {
-                    if (i > 0) {
-                        return Tangent(
-                            circles[i],
-                            circles[i - 1],
-                            this,
-                            this,
-                            LineSegment(
-                                tangents[i - 1].lineSegment.end,
-                                tangents[i - 1].lineSegment.begin
-                            ),
-                            direction
-                        )
-                    } else {
-                        return Tangent(
-                            circles[0],
-                            circles.last(),
-                            this,
-                            this,
-                            LineSegment(
-                                tangents.last().lineSegment.end,
-                                tangents.last().lineSegment.begin
-                            ),
-                            direction
-                        )
-                    }
-                }
-            }
-        }
-
-        error("next tangent not found")
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (other == null || other !is Obstacle) return false
-        return circles == other.circles
-    }
-
-    override fun hashCode(): Int {
-        return circles.hashCode()
-    }
-}
-
-internal fun Obstacle(vararg circles: Circle2D): Obstacle = Obstacle(listOf(*circles))
-
-private fun LineSegment2D.intersectSegment(other: LineSegment2D): Boolean {
-    fun crossProduct(v1: DoubleVector2D, v2: DoubleVector2D): Double {
-        return v1.x * v2.y - v1.y * v2.x
-    }
-    return if (crossProduct(other.begin - begin, other.end - begin).sign ==
-        crossProduct(other.begin - end, other.end - end).sign
-    ) {
-        false
-    } else {
-        crossProduct(begin - other.begin, end - other.begin).sign != crossProduct(
-            begin - other.end,
-            end - other.end
-        ).sign
-    }
-}
-
-private fun LineSegment2D.intersectCircle(circle: Circle2D): Boolean {
-    val a = (begin.x - end.x).pow(2.0) + (begin.y - end.y).pow(2.0)
-    val b = 2 * ((begin.x - end.x) * (end.x - circle.center.x) +
-            (begin.y - end.y) * (end.y - circle.center.y))
-    val c = (end.x - circle.center.x).pow(2.0) + (end.y - circle.center.y).pow(2.0) -
-            circle.radius.pow(2.0)
-    val d = b.pow(2.0) - 4 * a * c
-    if (d < 1e-6) {
-        return false
-    } else {
-        val t1 = (-b - d.pow(0.5)) * 0.5 / a
-        val t2 = (-b + d.pow(0.5)) * 0.5 / a
-        if (((0 < t1) and (t1 < 1)) or ((0 < t2) and (t2 < 1))) {
-            return true
-        }
-    }
-    return false
-}
-
-private fun Tangent.intersectObstacle(obstacle: Obstacle): Boolean {
-    for (tangent in obstacle.tangents) {
-        if (lineSegment.intersectSegment(tangent.lineSegment)) {
-            return true
-        }
-    }
-    for (circle in obstacle.circles) {
-        if (lineSegment.intersectCircle(circle)) {
-            return true
-        }
-    }
-    return false
-}
-
-private fun outerTangents(first: Obstacle, second: Obstacle): Map<DubinsPath.Type, Tangent> = buildMap {
-    for (circle1 in first.circles) {
-        for (circle2 in second.circles) {
-            for (tangent in dubinsTangentsToCircles(circle1, circle2, first, second)) {
-                if (!(tangent.value.intersectObstacle(first))
-                    and !(tangent.value.intersectObstacle(second))
-                ) {
-                    put(
-                        tangent.key,
-                        tangent.value
-                    )
-                }
-            }
-        }
-    }
-}
-
-private fun arcLength(
-    circle: Circle2D,
-    point1: DoubleVector2D,
-    point2: DoubleVector2D,
-    direction: Trajectory2D.Direction,
-): Double {
-    val phi1 = atan2(point1.y - circle.center.y, point1.x - circle.center.x)
-    val phi2 = atan2(point2.y - circle.center.y, point2.x - circle.center.x)
-    var angle = 0.0
-    when (direction) {
-        Trajectory2D.L -> {
-            angle = if (phi2 >= phi1) {
-                phi2 - phi1
-            } else {
-                2 * PI + phi2 - phi1
-            }
-        }
-
-        Trajectory2D.R -> {
-            angle = if (phi2 >= phi1) {
-                2 * PI - (phi2 - phi1)
-            } else {
-                -(phi2 - phi1)
-            }
-        }
-    }
-    return circle.radius * angle
-}
-
-private fun normalVectors(v: DoubleVector2D, r: Double): Pair<DoubleVector2D, DoubleVector2D> {
-    return Pair(
-        r * vector(v.y / norm(v), -v.x / norm(v)),
-        r * vector(-v.y / norm(v), v.x / norm(v))
-    )
-}
-
-private fun constructTangentCircles(
-    point: DoubleVector2D,
-    direction: DoubleVector2D,
-    r: Double,
-): Map<Trajectory2D.Type, Circle2D> {
-    val center1 = point + normalVectors(direction, r).first
-    val center2 = point + normalVectors(direction, r).second
-    val p1 = center1 - point
-    return if (atan2(p1.y, p1.x) - atan2(direction.y, direction.x) in listOf(PI / 2, -3 * PI / 2)) {
-        mapOf(
-            Trajectory2D.L to Circle2D(center1, r),
-            Trajectory2D.R to Circle2D(center2, r)
-        )
-    } else {
-        mapOf(
-            Trajectory2D.L to Circle2D(center2, r),
-            Trajectory2D.R to Circle2D(center1, r)
-        )
-    }
-}
-
-private fun sortedObstacles(
-    currentObstacle: Obstacle,
-    obstacles: List<Obstacle>,
-): List<Obstacle> {
-    return obstacles.sortedBy { norm(it.center - currentObstacle.center) }
-}
-
-private fun tangentsAlongTheObstacle(
-    initialCircle: Circle2D,
-    direction: Trajectory2D.Direction,
-    finalCircle: Circle2D,
-    obstacle: Obstacle,
-): List<Tangent> {
-    val dubinsTangents = mutableListOf<Tangent>()
-    var tangent = obstacle.nextTangent(initialCircle, direction)
-    dubinsTangents.add(tangent)
-    while (tangent.endCircle != finalCircle) {
-        tangent = obstacle.nextTangent(tangent.endCircle, direction)
-        dubinsTangents.add(tangent)
-    }
-    return dubinsTangents
-}
-
-private fun allFinished(
-    paths: List<TangentPath>,
-    finalObstacle: Obstacle,
-): Boolean {
-    for (path in paths) {
-        if (path.last().endObstacle != finalObstacle) {
-            return false
-        }
-    }
-    return true
-}
-
-private fun LineSegment2D.toTrajectory() = StraightTrajectory2D(begin, end)
-
-
-private fun TangentPath.toTrajectory(): CompositeTrajectory2D = CompositeTrajectory2D(
-    buildList {
-        tangents.zipWithNext().forEach { (left, right) ->
-            add(left.lineSegment.toTrajectory())
-            add(
-                CircleTrajectory2D.of(
-                    right.startCircle.center,
-                    left.lineSegment.end,
-                    right.lineSegment.begin,
-                    right.startDirection
-                )
-            )
-        }
-
-        add(tangents.last().lineSegment.toTrajectory())
-    }
-)
-
-internal fun findAllPaths(
-    start: DubinsPose2D,
-    startingRadius: Double,
-    finish: DubinsPose2D,
-    finalRadius: Double,
-    obstacles: List<Obstacle>,
-): List<CompositeTrajectory2D> {
-    fun DubinsPose2D.direction() = vector(cos(bearing), sin(bearing))
-
-    val initialCircles = constructTangentCircles(
-        start,
-        start.direction(),
-        startingRadius
-    )
-    val finalCircles = constructTangentCircles(
-        finish,
-        finish.direction(),
-        finalRadius
-    )
-    val trajectories = mutableListOf<CompositeTrajectory2D>()
-    for (i in listOf(Trajectory2D.L, Trajectory2D.R)) {
-        for (j in listOf(Trajectory2D.L, Trajectory2D.R)) {
-            val finalCircle = finalCircles[j]!!
-            val finalObstacle = Obstacle(listOf(finalCircle))
-            var currentPaths: List<TangentPath> = listOf(
-                TangentPath(
-                    Tangent(
-                        initialCircles[i]!!,
-                        initialCircles[i]!!,
-                        Obstacle(listOf(initialCircles[i]!!)),
-                        Obstacle(listOf(initialCircles[i]!!)),
-                        LineSegment(start, start),
-                        i
-                    )
-                )
-            )
-            while (!allFinished(currentPaths, finalObstacle)) {
-                val newPaths = mutableListOf<TangentPath>()
-                for (tangentPath: TangentPath in currentPaths) {
-                    val currentCircle = tangentPath.last().endCircle
-                    val currentDirection: Trajectory2D.Direction = tangentPath.last().endDirection
-                    val currentObstacle = tangentPath.last().endObstacle
-                    var nextObstacle: Obstacle? = null
-                    if (currentObstacle != finalObstacle) {
-                        val tangentToFinal = outerTangents(currentObstacle, finalObstacle)[DubinsPath.Type(
-                            currentDirection,
-                            Trajectory2D.S,
-                            j
-                        )]
-                        for (obstacle in sortedObstacles(currentObstacle, obstacles)) {
-                            if (tangentToFinal!!.intersectObstacle(obstacle)) {
-                                nextObstacle = obstacle
-                                break
-                            }
-                        }
-                        if (nextObstacle == null) {
-                            nextObstacle = finalObstacle
-                        }
-                        val nextTangents: Map<DubinsPath.Type, Tangent> = outerTangents(currentObstacle, nextObstacle)
-                            .filter { (key, tangent) ->
-                                obstacles.none { obstacle -> tangent.intersectObstacle(obstacle) } &&
-                                        key.first == currentDirection &&
-                                        (nextObstacle != finalObstacle || key.third == j)
-                            }
-
-                        var tangentsAlong: List<Tangent>
-                        for (tangent in nextTangents.values) {
-                            if (tangent.startCircle == tangentPath.last().endCircle) {
-                                val lengthMaxPossible = arcLength(
-                                    tangent.startCircle,
-                                    tangentPath.last().lineSegment.end,
-                                    tangent.startObstacle.nextTangent(
-                                        tangent.startCircle,
-                                        currentDirection
-                                    ).lineSegment.begin,
-                                    currentDirection
-                                )
-                                val lengthCalculated = arcLength(
-                                    tangent.startCircle,
-                                    tangentPath.last().lineSegment.end,
-                                    tangent.lineSegment.begin,
-                                    currentDirection
-                                )
-                                tangentsAlong = if (lengthCalculated > lengthMaxPossible) {
-                                    tangentsAlongTheObstacle(
-                                        currentCircle,
-                                        currentDirection,
-                                        tangent.startCircle,
-                                        currentObstacle
-                                    )
-                                } else {
-                                    emptyList()
-                                }
-                            } else {
-                                tangentsAlong = tangentsAlongTheObstacle(
-                                    currentCircle,
-                                    currentDirection,
-                                    tangent.startCircle,
-                                    currentObstacle
-                                )
-                            }
-                            newPaths.add(TangentPath(tangentPath.tangents + tangentsAlong + tangent))
-                        }
-                    } else {
-                        newPaths.add(tangentPath)
-                    }
-                }
-                currentPaths = newPaths
-            }
-
-            trajectories += currentPaths.map { tangentPath ->
-                val lastDirection: Trajectory2D.Direction = tangentPath.last().endDirection
-                val end = finalCircles[j]!!
-                TangentPath(
-                    tangentPath.tangents +
-                            Tangent(
-                                end,
-                                end,
-                                Obstacle(end),
-                                Obstacle(end),
-                                LineSegment(finish, finish),
-                                startDirection = lastDirection,
-                                endDirection = j
-                            )
-                )
-            }.map { it.toTrajectory() }
-        }
-    }
-    return trajectories
-}
-
-
-public object Obstacles {
-    public fun allPathsAvoiding(
-        start: DubinsPose2D,
-        finish: DubinsPose2D,
-        trajectoryRadius: Double,
-        obstaclePolygons: List<Polygon<Double>>,
-    ): List<CompositeTrajectory2D> {
-        val obstacles: List<Obstacle> = obstaclePolygons.map { polygon ->
-            Obstacle(polygon.points.map { point -> Circle2D(point, trajectoryRadius) })
-        }
-        return findAllPaths(start, trajectoryRadius, finish, trajectoryRadius, obstacles)
-    }
-}
-
-
-
-
-
diff --git a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt b/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
deleted file mode 100644
index 59a8e613a..000000000
--- a/kmath-trajectory/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-@file:UseSerializers(Euclidean2DSpace.VectorSerializer::class)
-
-package space.kscience.kmath.trajectory
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
-import space.kscience.kmath.geometry.*
-import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import kotlin.math.atan2
-
-@Serializable
-public sealed interface Trajectory2D {
-    public val length: Double
-
-
-    public sealed interface Type
-
-    public sealed interface Direction: Type
-
-    public object R : Direction {
-        override fun toString(): String = "R"
-    }
-
-    public object S : Type {
-        override fun toString(): String = "L"
-    }
-
-    public object L : Direction {
-        override fun toString(): String = "L"
-    }
-}
-
-/**
- * Straight path segment. The order of start and end defines the direction
- */
-@Serializable
-@SerialName("straight")
-public data class StraightTrajectory2D(
-    override val begin: DoubleVector2D,
-    override val end: DoubleVector2D,
-) : Trajectory2D, LineSegment2D {
-
-    override val length: Double get() = begin.distanceTo(end)
-
-    public val bearing: Angle get() = (atan2(end.x - begin.x, end.y - begin.y).radians).normalized()
-}
-
-/**
- * An arc segment
- */
-@Serializable
-@SerialName("arc")
-public data class CircleTrajectory2D(
-    public val circle: Circle2D,
-    public val start: DubinsPose2D,
-    public val end: DubinsPose2D,
-) : Trajectory2D {
-
-    /**
-     * Arc length in radians
-     */
-    val arcLength: Angle
-        get() = if (direction == Trajectory2D.L) {
-            start.bearing - end.bearing
-        } else {
-            end.bearing - start.bearing
-        }.normalized()
-
-
-    override val length: Double by lazy {
-        circle.radius * arcLength.radians
-    }
-
-    public val direction: Trajectory2D.Direction by lazy {
-        if (start.y < circle.center.y) {
-            if (start.bearing > Angle.pi) Trajectory2D.R else Trajectory2D.L
-        } else if (start.y > circle.center.y) {
-            if (start.bearing < Angle.pi) Trajectory2D.R else Trajectory2D.L
-        } else {
-            if (start.bearing == Angle.zero) {
-                if (start.x < circle.center.x) Trajectory2D.R else Trajectory2D.L
-            } else {
-                if (start.x > circle.center.x) Trajectory2D.R else Trajectory2D.L
-            }
-        }
-    }
-
-    public companion object {
-        public fun of(
-            center: DoubleVector2D,
-            start: DoubleVector2D,
-            end: DoubleVector2D,
-            direction: Trajectory2D.Direction,
-        ): CircleTrajectory2D {
-            fun calculatePose(
-                vector: DoubleVector2D,
-                theta: Angle,
-                direction: Trajectory2D.Direction,
-            ): DubinsPose2D = DubinsPose2D(
-                vector,
-                when (direction) {
-                    Trajectory2D.L -> (theta - Angle.piDiv2).normalized()
-                    Trajectory2D.R -> (theta + Angle.piDiv2).normalized()
-                }
-            )
-
-            val s1 = StraightTrajectory2D(center, start)
-            val s2 = StraightTrajectory2D(center, end)
-            val pose1 = calculatePose(start, s1.bearing, direction)
-            val pose2 = calculatePose(end, s2.bearing, direction)
-            val trajectory = CircleTrajectory2D(Circle2D(center, s1.length), pose1, pose2)
-            if (trajectory.direction != direction) error("Trajectory direction mismatch")
-            return trajectory
-        }
-    }
-}
-
-@Serializable
-@SerialName("composite")
-public class CompositeTrajectory2D(public val segments: List<Trajectory2D>) : Trajectory2D {
-    override val length: Double get() = segments.sumOf { it.length }
-}
-
-public fun CompositeTrajectory2D(vararg segments: Trajectory2D): CompositeTrajectory2D =
-    CompositeTrajectory2D(segments.toList())
-
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt
deleted file mode 100644
index 80f7173f1..000000000
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2018-2023 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory
-
-import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.geometry.equalsFloat
-import kotlin.test.Test
-import kotlin.test.assertNotNull
-import kotlin.test.assertTrue
-
-
-class DubinsTests {
-
-    @Test
-    fun dubinsTest() = with(Euclidean2DSpace){
-        val straight = StraightTrajectory2D(vector(0.0, 0.0), vector(100.0, 100.0))
-        val lineP1 = straight.shift(1, 10.0).inverse()
-
-        val start = DubinsPose2D(straight.end, straight.bearing)
-        val end = DubinsPose2D(lineP1.begin, lineP1.bearing)
-        val radius = 2.0
-        val dubins = DubinsPath.all(start, end, radius)
-
-        val absoluteDistance = start.distanceTo(end)
-        println("Absolute distance: $absoluteDistance")
-
-        val expectedLengths = mapOf(
-            DubinsPath.Type.RLR to 13.067681939031397,
-            DubinsPath.Type.RSR to 12.28318530717957,
-            DubinsPath.Type.LSL to 32.84955592153878,
-            DubinsPath.Type.RSL to 23.37758938854081,
-            DubinsPath.Type.LSR to 23.37758938854081
-        )
-
-        expectedLengths.forEach {
-            val path = dubins.find { p -> DubinsPath.trajectoryTypeOf(p) == it.key }
-            assertNotNull(path, "Path ${it.key} not found")
-            println("${it.key}: ${path.length}")
-            assertTrue(it.value.equalsFloat(path.length))
-
-            val a = path.segments[0] as CircleTrajectory2D
-            val b = path.segments[1]
-            val c = path.segments[2] as CircleTrajectory2D
-
-            assertTrue(start.equalsFloat(a.start))
-            assertTrue(end.equalsFloat(c.end))
-
-            // Not working, theta double precision inaccuracy
-            if (b is CircleTrajectory2D) {
-                assertTrue(a.end.equalsFloat(b.start))
-                assertTrue(c.start.equalsFloat(b.end))
-            } else if (b is StraightTrajectory2D) {
-                assertTrue(a.end.equalsFloat(DubinsPose2D(b.begin, b.bearing)))
-                assertTrue(c.start.equalsFloat(DubinsPose2D(b.end, b.bearing)))
-            }
-        }
-    }
-}
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
deleted file mode 100644
index 1a8c3a474..000000000
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2018-2023 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory
-
-import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.Euclidean2DSpace.vector
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class ObstacleTest {
-    @Test
-    fun firstPath() {
-        val startPoint = vector(-5.0, -1.0)
-        val startDirection = vector(1.0, 1.0)
-        val startRadius = 0.5
-        val finalPoint = vector(20.0, 4.0)
-        val finalDirection = vector(1.0, -1.0)
-        val finalRadius = 0.5
-
-        val obstacles = listOf(
-            Obstacle(
-                listOf(
-                    Circle2D(vector(7.0, 1.0), 5.0)
-                )
-            )
-        )
-
-        val outputTangents = findAllPaths(
-            DubinsPose2D.of(startPoint, startDirection),
-            startRadius,
-            DubinsPose2D.of(finalPoint, finalDirection),
-            finalRadius,
-            obstacles
-        )
-        val length = outputTangents.minOf { it.length }
-        assertEquals(27.2113183, length, 1e-6)
-    }
-
-    @Test
-    fun secondPath() {
-        val startPoint = vector(-5.0, -1.0)
-        val startDirection = vector(1.0, 1.0)
-        val startRadius = 0.5
-        val finalPoint = vector(20.0, 4.0)
-        val finalDirection = vector(1.0, -1.0)
-        val finalRadius = 0.5
-
-        val obstacles = listOf(
-            Obstacle(
-                listOf(
-                    Circle2D(vector(1.0, 6.5), 0.5),
-                    Circle2D(vector(2.0, 1.0), 0.5),
-                    Circle2D(vector(6.0, 0.0), 0.5),
-                    Circle2D(vector(5.0, 5.0), 0.5)
-                )
-            ), Obstacle(
-                listOf(
-                    Circle2D(vector(10.0, 1.0), 0.5),
-                    Circle2D(vector(16.0, 0.0), 0.5),
-                    Circle2D(vector(14.0, 6.0), 0.5),
-                    Circle2D(vector(9.0, 4.0), 0.5)
-                )
-            )
-        )
-        val paths = findAllPaths(
-            DubinsPose2D.of(startPoint, startDirection),
-            startRadius,
-            DubinsPose2D.of(finalPoint, finalDirection),
-            finalRadius,
-            obstacles
-        )
-        val length = paths.minOf { it.length }
-        assertEquals(28.9678224, length, 1e-6)
-    }
-
-    @Test
-    fun equalObstacles() {
-        val circle1 = Circle2D(vector(1.0, 6.5), 0.5)
-        val circle2 = Circle2D(vector(1.0, 6.5), 0.5)
-        assertEquals(circle1, circle2)
-        val obstacle1 = Obstacle(listOf(circle1))
-        val obstacle2 = Obstacle(listOf(circle2))
-        assertEquals(obstacle1, obstacle2)
-    }
-}
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
deleted file mode 100644
index 2ae89038c..000000000
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2018-2023 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory
-
-import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.geometry.Euclidean2DSpace.vector
-import space.kscience.kmath.geometry.LineSegment
-import space.kscience.kmath.geometry.equalsLine
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
-import kotlin.test.assertTrue
-
-class TangentTest {
-    @Test
-    fun tangents() {
-        val c1 = Circle2D(vector(0.0, 0.0), 1.0)
-        val c2 = Circle2D(vector(4.0, 0.0), 1.0)
-        val routes = listOf(
-            DubinsPath.Type.RSR,
-            DubinsPath.Type.RSL,
-            DubinsPath.Type.LSR,
-            DubinsPath.Type.LSL
-        )
-        val segments = listOf(
-            LineSegment(
-                begin = vector(0.0, 1.0),
-                end = vector(4.0, 1.0)
-            ),
-            LineSegment(
-                begin = vector(0.5, 0.8660254),
-                end = vector(3.5, -0.8660254)
-            ),
-            LineSegment(
-                begin = vector(0.5, -0.8660254),
-                end = vector(3.5, 0.8660254)
-            ),
-            LineSegment(
-                begin = vector(0.0, -1.0),
-                end = vector(4.0, -1.0)
-            )
-        )
-
-        val tangentMap = c1.tangentsToCircle(c2)
-        val tangentMapKeys = tangentMap.keys.toList()
-        val tangentMapValues = tangentMap.values.toList()
-
-        assertEquals(routes, tangentMapKeys)
-        for (i in segments.indices) {
-            assertTrue(segments[i].equalsLine(Euclidean2DSpace, tangentMapValues[i]))
-        }
-    }
-
-    @Test
-    fun concentric(){
-        val c1 = Circle2D(vector(0.0, 0.0), 10.0)
-        val c2 = Circle2D(vector(0.0, 0.0), 1.0)
-        assertEquals(emptyMap(), c1.tangentsToCircle(c2))
-    }
-}
\ No newline at end of file
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
deleted file mode 100644
index 8b8ccf95e..000000000
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory
-
-import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.geometry.equalsFloat
-import space.kscience.kmath.geometry.radians
-import space.kscience.kmath.geometry.sin
-
-
-fun DubinsPose2D.equalsFloat(other: DubinsPose2D) =
-    x.equalsFloat(other.x) && y.equalsFloat(other.y) && bearing.radians.equalsFloat(other.bearing.radians)
-
-fun StraightTrajectory2D.inverse() = StraightTrajectory2D(end, begin)
-
-fun StraightTrajectory2D.shift(shift: Int, width: Double): StraightTrajectory2D = with(Euclidean2DSpace) {
-    val dX = width * sin(inverse().bearing)
-    val dY = width * sin(bearing)
-
-    return StraightTrajectory2D(
-        vector(begin.x - dX * shift, begin.y - dY * shift),
-        vector(end.x - dX * shift, end.y - dY * shift)
-    )
-}
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
deleted file mode 100644
index b3825b93b..000000000
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory.segments
-
-import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.geometry.circumference
-import space.kscience.kmath.geometry.degrees
-import space.kscience.kmath.trajectory.CircleTrajectory2D
-import space.kscience.kmath.trajectory.Trajectory2D
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class ArcTests {
-
-    @Test
-    fun arcTest() = with(Euclidean2DSpace){
-        val circle = Circle2D(vector(0.0, 0.0), 2.0)
-        val arc = CircleTrajectory2D.of(
-            circle.center,
-            vector(-2.0, 0.0),
-            vector(0.0, 2.0),
-            Trajectory2D.R
-        )
-        assertEquals(circle.circumference / 4, arc.length, 1.0)
-        assertEquals(0.0, arc.start.bearing.degrees)
-        assertEquals(90.0, arc.end.bearing.degrees)
-    }
-}
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
deleted file mode 100644
index c3fca06ec..000000000
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory.segments
-
-import space.kscience.kmath.geometry.Circle2D
-import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.geometry.circumference
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class CircleTests {
-
-    @Test
-    fun arcTest() {
-        val center = Euclidean2DSpace.vector(0.0, 0.0)
-        val radius = 2.0
-        val expectedCircumference = 12.56637
-        val circle = Circle2D(center, radius)
-        assertEquals(expectedCircumference, circle.circumference, 1e-4)
-    }
-}
diff --git a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt b/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
deleted file mode 100644
index 54deb2193..000000000
--- a/kmath-trajectory/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2018-2022 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.trajectory.segments
-
-import space.kscience.kmath.geometry.Euclidean2DSpace
-import space.kscience.kmath.geometry.degrees
-import space.kscience.kmath.trajectory.StraightTrajectory2D
-import kotlin.math.pow
-import kotlin.math.sqrt
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class LineTests {
-
-    @Test
-    fun lineTest() = with(Euclidean2DSpace){
-        val straight = StraightTrajectory2D(vector(0.0, 0.0), vector(100.0, 100.0))
-        assertEquals(sqrt(100.0.pow(2) + 100.0.pow(2)), straight.length)
-        assertEquals(45.0, straight.bearing.degrees)
-    }
-
-    @Test
-    fun lineAngleTest() = with(Euclidean2DSpace){
-        //val zero = Vector2D(0.0, 0.0)
-        val north = StraightTrajectory2D(zero, vector(0.0, 2.0))
-        assertEquals(0.0, north.bearing.degrees)
-        val east = StraightTrajectory2D(zero, vector(2.0, 0.0))
-        assertEquals(90.0, east.bearing.degrees)
-        val south = StraightTrajectory2D(zero, vector(0.0, -2.0))
-        assertEquals(180.0, south.bearing.degrees)
-        val west = StraightTrajectory2D(zero, vector(-2.0, 0.0))
-        assertEquals(270.0, west.bearing.degrees)
-    }
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7d92dc36e..f158f3444 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,7 +44,6 @@ include(
     ":kmath-jupyter",
     ":kmath-symja",
     ":kmath-jafama",
-    ":kmath-trajectory",
     ":examples",
     ":benchmarks",
 )
-- 
2.34.1


From 1d7f4ed538efcbafe5527d5e26635f160d3a003a Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Thu, 6 Apr 2023 03:17:01 +0300
Subject: [PATCH 686/713] shiftOp and diff in SeriesAlgebra

---
 .../kscience/kmath/series/SeriesAlgebra.kt    | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index 3cd2212f6..bdd74c4fe 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -3,16 +3,21 @@ package space.kscience.kmath.series
 import space.kscience.kmath.operations.BufferAlgebra
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.RingOps
+import space.kscience.kmath.operations.reduce
 import space.kscience.kmath.stat.StatisticalAlgebra
 import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.BufferView
 import kotlin.math.max
 import kotlin.math.min
 
+
+// TODO: check if ranges are intersected
 @PublishedApi
 internal fun IntRange.intersect(other: IntRange): IntRange =
     max(first, other.first)..min(last, other.last)
 
+
 @PublishedApi
 internal val IntRange.size: Int
     get() = last - first + 1
@@ -33,11 +38,14 @@ public interface Series<T> : Buffer<T> {
     public val position: Int
 }
 
+
+
 public val <T> Series<T>.absoluteIndices: IntRange get() = position until position + size
 
 /**
  * A [BufferView] with index offset (both positive and negative) and possible size change
  */
+
 private class SeriesImpl<T>(
     override val origin: Buffer<T>,
     override val position: Int,
@@ -107,6 +115,8 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
      * Get a label buffer for given buffer.
      */
     public val Buffer<T>.labels: List<L> get() = indices.map(labelResolver)
+    // TODO: there can be troubles with label consistency after moving position argument
+    // TODO: so offset should be reflected in the labelResolver also
 
 
     /**
@@ -145,6 +155,17 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
         return accumulator
     }
 
+    // TODO: add fold with recorded accumulation
+//    public inline fun <R> Buffer<T>.traceFold(initial: R, operation: A.(acc: R, T) -> R): Buffer<R> {
+//        var tempBuffer = elementAlgebra.bufferFactory(this.size) {i -> getAbsolute(i)}
+//        var accumulator = initial
+//        for (index in this.indices) {
+//            accumulator = elementAlgebra.operation(accumulator, getAbsolute(index))
+//            tempBuffer.set(index, accumulator)
+//        }
+//        return elementAlgebra.bufferFactory(this.size) {i -> tempBuffer.getAbsolute(i)}
+//    }
+
     public inline fun <R> Buffer<T>.foldWithLabel(initial: R, operation: A.(acc: R, arg: T, label: L) -> R): R {
         val labels = labels
         var accumulator = initial
@@ -154,7 +175,7 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
     }
 
     /**
-     * Zip two buffers in the range whe they overlap
+     * Zip two buffers in the range where they overlap
      */
     public inline fun Buffer<T>.zip(
         other: Buffer<T>,
@@ -169,11 +190,24 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
         }.moveTo(newRange.first)
     }
 
+    /**
+     * Zip buffer with itself, but shifted
+     * */
+    public inline fun Buffer<T>.shiftOp(
+        shift: Int = 1,
+        crossinline operation: A.(left: T, right: T) -> T
+    ): Buffer<T> {
+        val shifted = this.moveTo(this.offset+shift)
+        return zip(shifted, operation)
+    }
+
     override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
 
     override fun add(left: Buffer<T>, right: Buffer<T>): Series<T> = left.zip(right) { l, r -> l + r }
 
     override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = left.zip(right) { l, r -> l * r }
+
+    public inline fun Buffer<T>.diff(): Buffer<T> = this.shiftOp {l, r -> r - l}
 }
 
 public fun <T, A : Ring<T>, BA : BufferAlgebra<T, A>, L> BA.seriesAlgebra(labels: Iterable<L>): SeriesAlgebra<T, A, BA, L> {
-- 
2.34.1


From ba26c7020e76a5b2384f37d515471f287a37617c Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Thu, 6 Apr 2023 17:58:29 +0300
Subject: [PATCH 687/713] started TimeSeriesAlgebra

---
 .../kscience/kmath/series/SeriesAlgebra.kt    | 11 ------
 .../kmath/series/TimeSeriesAlgebra.kt         | 37 +++++++++++++++++++
 2 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/TimeSeriesAlgebra.kt

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index bdd74c4fe..b6d952955 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -155,17 +155,6 @@ public class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>, L>(
         return accumulator
     }
 
-    // TODO: add fold with recorded accumulation
-//    public inline fun <R> Buffer<T>.traceFold(initial: R, operation: A.(acc: R, T) -> R): Buffer<R> {
-//        var tempBuffer = elementAlgebra.bufferFactory(this.size) {i -> getAbsolute(i)}
-//        var accumulator = initial
-//        for (index in this.indices) {
-//            accumulator = elementAlgebra.operation(accumulator, getAbsolute(index))
-//            tempBuffer.set(index, accumulator)
-//        }
-//        return elementAlgebra.bufferFactory(this.size) {i -> tempBuffer.getAbsolute(i)}
-//    }
-
     public inline fun <R> Buffer<T>.foldWithLabel(initial: R, operation: A.(acc: R, arg: T, label: L) -> R): R {
         val labels = labels
         var accumulator = initial
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/TimeSeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/TimeSeriesAlgebra.kt
new file mode 100644
index 000000000..37abe710e
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/TimeSeriesAlgebra.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.series
+
+import space.kscience.kmath.structures.Buffer
+
+
+
+public interface TimeSeries<R, T>: Series<R> {
+    public override val origin: Buffer<R>
+    public override val position: Int
+
+    // TODO: Specify the types of DateTime that can be contained in timeStamp Buffer
+    public val timeStamp: Buffer<T> // Buffer of some datetime instances like: Instant, LocalDate, LocalTime...
+}
+
+private class TimeSeriesImpl<R, T>(
+    override val origin: Buffer<R>,
+    override val timeStamp: Buffer<T>,
+    override val position: Int,
+    override val size: Int = origin.size,
+) : TimeSeries<R, T> by origin { // TODO: manage with delegation
+
+    init {
+        require(size > 0) { "Size must be positive" }
+        require(size <= origin.size) { "Slice size is larger than the original buffer" }
+        require(size <= timeStamp.size) { "Slice size is larger than the timeStamp buffer" }
+    }
+
+//    override fun toString(): String = "$origin-->${position}"
+}
+
+
+// TODO: add conversion to Buffer of Pairs ?
-- 
2.34.1


From 4db091d8984d269cc8abb08dc369277ef78bb942 Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Fri, 7 Apr 2023 12:39:30 +0300
Subject: [PATCH 688/713] deleted TimeSeriesAlgebra

---
 .../kmath/series/TimeSeriesAlgebra.kt         | 37 -------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/TimeSeriesAlgebra.kt

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/TimeSeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/TimeSeriesAlgebra.kt
deleted file mode 100644
index 37abe710e..000000000
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/TimeSeriesAlgebra.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2018-2023 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.series
-
-import space.kscience.kmath.structures.Buffer
-
-
-
-public interface TimeSeries<R, T>: Series<R> {
-    public override val origin: Buffer<R>
-    public override val position: Int
-
-    // TODO: Specify the types of DateTime that can be contained in timeStamp Buffer
-    public val timeStamp: Buffer<T> // Buffer of some datetime instances like: Instant, LocalDate, LocalTime...
-}
-
-private class TimeSeriesImpl<R, T>(
-    override val origin: Buffer<R>,
-    override val timeStamp: Buffer<T>,
-    override val position: Int,
-    override val size: Int = origin.size,
-) : TimeSeries<R, T> by origin { // TODO: manage with delegation
-
-    init {
-        require(size > 0) { "Size must be positive" }
-        require(size <= origin.size) { "Slice size is larger than the original buffer" }
-        require(size <= timeStamp.size) { "Slice size is larger than the timeStamp buffer" }
-    }
-
-//    override fun toString(): String = "$origin-->${position}"
-}
-
-
-// TODO: add conversion to Buffer of Pairs ?
-- 
2.34.1


From ce388fed44205fa813028facb29eee0ef3cc59c6 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 7 Apr 2023 19:55:34 +0300
Subject: [PATCH 689/713] Move annotations to base package. Fix series

---
 CHANGELOG.md                                  |  1 +
 README.md                                     | 29 +-------
 .../ExpressionsInterpretersBenchmark.kt       |  3 +-
 .../kmath/benchmarks/BigIntBenchmark.kt       |  2 +-
 .../kmath/benchmarks/NDFieldBenchmark.kt      |  2 +-
 build.gradle.kts                              |  2 +-
 .../kmath/ejml/codegen/ejmlCodegen.kt         |  2 +-
 .../kmath/{stat => series}/DateTimeSeries.kt  |  4 +-
 .../space/kscience/kmath/series/analyzeDif.kt | 55 +++++++++-------
 .../kmath/structures/StreamDoubleFieldND.kt   |  2 +-
 .../structures/StructureReadBenchmark.kt      |  2 +-
 kmath-ast/README.md                           |  6 +-
 .../space/kscience/kmath/ast/TypedMst.kt      |  2 +-
 .../kscience/kmath/ast/evaluateConstants.kt   |  2 +-
 .../ast/rendering/LatexSyntaxRenderer.kt      |  2 +-
 .../ast/rendering/MathMLSyntaxRenderer.kt     |  2 +-
 .../kmath/ast/rendering/MathRenderer.kt       |  2 +-
 .../kmath/ast/rendering/MathSyntax.kt         |  2 +-
 .../kmath/ast/rendering/SyntaxRenderer.kt     |  2 +-
 .../kscience/kmath/ast/rendering/features.kt  |  2 +-
 .../kscience/kmath/ast/rendering/phases.kt    |  2 +-
 .../space/kscience/kmath/estree/estree.kt     |  2 +-
 .../kmath/wasm/internal/WasmBuilder.kt        |  2 +-
 .../kotlin/space/kscience/kmath/wasm/wasm.kt  |  2 +-
 .../kotlin/space/kscience/kmath/asm/asm.kt    |  2 +-
 .../kmath/asm/internal/PrimitiveAsmBuilder.kt |  2 +-
 kmath-commons/README.md                       |  6 +-
 .../commons/expressions/CmDsExpression.kt     |  2 +-
 .../kmath/commons/integration/CMIntegrator.kt |  2 +-
 .../kscience/kmath/commons/linear/CMMatrix.kt |  2 +-
 .../kmath/commons/optimization/CMOptimizer.kt |  2 +-
 .../commons/integration/IntegrationTest.kt    |  2 +-
 .../commons/optimization/OptimizeTest.kt      |  2 +-
 kmath-complex/README.md                       |  6 +-
 .../space/kscience/kmath/complex/Complex.kt   |  2 +-
 .../kscience/kmath/complex/ComplexFieldND.kt  |  4 +-
 .../kscience/kmath/complex/Quaternion.kt      |  2 +-
 kmath-core/README.md                          |  6 +-
 kmath-core/build.gradle.kts                   |  1 +
 .../space/kscience/kmath/data/ColumnarData.kt |  4 +-
 .../kscience/kmath/data/XYColumnarData.kt     |  4 +-
 .../kmath/data/XYErrorColumnarData.kt         |  2 +-
 .../kscience/kmath/data/XYZColumnarData.kt    |  2 +-
 .../space/kscience/kmath/domains/Domain1D.kt  |  2 +-
 .../kscience/kmath/domains/DoubleDomain.kt    |  2 +-
 .../kmath/domains/HyperSquareDomain.kt        |  2 +-
 .../kmath/domains/UnconstrainedDomain.kt      |  2 +-
 .../kscience/kmath/expressions/DSAlgebra.kt   |  2 +-
 .../kscience/kmath/expressions/Expression.kt  |  2 +-
 .../kscience/kmath/expressions/MstAlgebra.kt  |  2 +-
 .../kscience/kmath/expressions/NamedMatrix.kt |  4 +-
 .../kmath/expressions/SimpleAutoDiff.kt       |  2 +-
 .../kmath/expressions/SymbolIndexer.kt        |  2 +-
 .../kmath/linear/BufferedLinearSpace.kt       |  2 +-
 .../kmath/linear/DoubleLinearSpace.kt         |  2 +-
 .../kscience/kmath/linear/LinearSpace.kt      |  2 +-
 .../kscience/kmath/linear/LupDecomposition.kt |  2 +-
 .../kscience/kmath/linear/MatrixBuilder.kt    |  2 +-
 .../kscience/kmath/linear/MatrixWrapper.kt    |  2 +-
 .../space/kscience/kmath/misc/collections.kt  |  2 +-
 .../space/kscience/kmath/misc/sorting.kt      |  1 +
 .../space/kscience/kmath/nd/AlgebraND.kt      |  4 +-
 .../kscience/kmath/nd/BufferAlgebraND.kt      |  4 +-
 .../space/kscience/kmath/nd/BufferND.kt       |  2 +-
 .../space/kscience/kmath/nd/DoubleFieldND.kt  |  4 +-
 .../space/kscience/kmath/nd/IntRingND.kt      |  2 +-
 .../kscience/kmath/nd/PermutedStructureND.kt  |  2 +-
 .../kotlin/space/kscience/kmath/nd/ShapeND.kt |  2 +-
 .../space/kscience/kmath/nd/ShortRingND.kt    |  2 +-
 .../space/kscience/kmath/nd/Structure1D.kt    |  2 +-
 .../space/kscience/kmath/nd/Structure2D.kt    |  2 +-
 .../space/kscience/kmath/nd/StructureND.kt    |  2 +-
 .../kscience/kmath/nd/VirtualStructureND.kt   |  4 +-
 .../space/kscience/kmath/nd/operationsND.kt   |  2 +-
 .../kscience/kmath/nd/primitiveStructureND.kt |  2 +-
 .../kscience/kmath/operations/Algebra.kt      |  2 +-
 .../space/kscience/kmath/operations/BigInt.kt |  2 +-
 .../kmath/operations/DoubleBufferOps.kt       |  5 +-
 .../kscience/kmath/operations/LogicAlgebra.kt |  2 +-
 .../kmath/operations/NumericAlgebra.kt        |  2 +-
 .../kmath/operations/algebraExtensions.kt     |  2 +-
 .../kscience/kmath/structures/BufferView.kt   |  2 +-
 .../kscience/kmath/structures/MemoryBuffer.kt |  4 +-
 .../kmath/structures/bufferExtensions.kt      |  2 +-
 .../kmath/structures/bufferPrimitiveAccess.kt |  2 +-
 .../kscience/kmath/expressions/DSTest.kt      |  2 +-
 .../kmath/expressions/InterpretTest.kt        |  2 +-
 .../kmath/linear/DoubleLUSolverTest.kt        |  4 +-
 .../space/kscience/kmath/linear/MatrixTest.kt |  4 +-
 .../kmath/operations/BigIntAlgebraTest.kt     |  2 +-
 .../kmath/structures/NumberNDFieldTest.kt     |  9 ++-
 .../space/kscience/kmath/misc/numbers.kt      | 12 ++++
 .../kscience/kmath/operations/isInteger.kt    | 12 ++++
 kmath-coroutines/README.md                    |  6 +-
 .../space/kscience/kmath/chains/Chain.kt      |  2 +-
 .../kmath/structures/LazyStructureND.kt       |  2 +-
 kmath-dimensions/README.md                    |  6 +-
 kmath-ejml/README.md                          |  6 +-
 .../kscience/kmath/ejml/EjmlLinearSpace.kt    |  2 +-
 .../space/kscience/kmath/ejml/_generated.kt   |  2 +-
 .../kscience/kmath/ejml/EjmlMatrixTest.kt     |  4 +-
 kmath-for-real/README.md                      |  6 +-
 .../space/kscience/kmath/real/DoubleVector.kt |  2 +-
 .../space/kscience/kmath/real/RealMatrix.kt   |  4 +-
 .../kotlin/space/kscience/kmath/real/grids.kt |  2 +-
 .../kscience/kmath/real/DoubleMatrixTest.kt   |  4 +-
 .../space/kscience/kmath/real/GridTest.kt     |  6 +-
 kmath-functions/README.md                     |  6 +-
 .../kscience/kmath/functions/Piecewise.kt     |  2 +-
 .../kmath/functions/polynomialUtil.kt         |  2 +-
 .../kmath/integration/GaussIntegrator.kt      |  2 +-
 .../kmath/integration/SimpsonIntegrator.kt    |  2 +-
 .../kmath/integration/SplineIntegrator.kt     |  4 +-
 .../kmath/integration/UnivariateIntegrand.kt  |  2 +-
 .../kmath/interpolation/Interpolator.kt       |  2 +-
 .../kmath/interpolation/LinearInterpolator.kt |  2 +-
 .../kmath/interpolation/SplineInterpolator.kt |  2 +-
 .../kmath/functions/PolynomialUtilTest.kt     |  2 +-
 .../kmath/functions/testUtils/Rational.kt     |  2 +-
 .../kmath/integration/GaussIntegralTest.kt    |  2 +-
 .../kmath/integration/SimpsonIntegralTest.kt  |  2 +-
 .../kmath/integration/SplineIntegralTest.kt   |  2 +-
 kmath-geometry/README.md                      |  6 +-
 .../kscience/kmath/geometry/rotations3D.kt    |  7 +-
 kmath-histograms/README.md                    |  6 +-
 .../kscience/kmath/histogram/Histogram1D.kt   |  2 +-
 .../kscience/kmath/histogram/HistogramND.kt   |  2 +-
 .../kmath/histogram/UniformHistogram1D.kt     |  2 +-
 .../histogram/UniformHistogramGroupND.kt      |  4 +-
 .../histogram/MultivariateHistogramTest.kt    |  4 +-
 .../kmath/histogram/UniformHistogram1DTest.kt |  2 +-
 .../kmath/histogram/TreeHistogramGroup.kt     |  2 +-
 .../kmath/histogram/TreeHistogramTest.kt      |  2 +-
 kmath-jafama/README.md                        |  6 +-
 kmath-jupyter/README.md                       |  6 +-
 .../kscience/kmath/jupyter/KMathJupyter.kt    |  2 +-
 kmath-kotlingrad/README.md                    |  6 +-
 kmath-memory/README.md                        |  6 +-
 kmath-memory/build.gradle.kts                 |  1 +
 .../space/kscience/kmath}/annotations.kt      |  4 +-
 .../space/kscience/kmath/memory/Memory.kt     | 15 ++---
 .../kscience/kmath/memory/DataViewMemory.kt   |  4 +-
 .../kscience/kmath/memory/ByteBufferMemory.kt |  4 +-
 .../kscience/kmath/memory/NativeMemory.kt     |  4 +-
 .../space/kscience/kmath/memory/WasmMemory.kt | 66 +++++++++++++++++++
 kmath-multik/README.md                        |  6 +-
 .../kmath/multik/MultikDoubleAlgebra.kt       |  2 +-
 .../kscience/kmath/multik/MultikTensor.kt     |  2 +-
 .../kmath/multik/MultikTensorAlgebra.kt       |  7 +-
 .../kscience/kmath/multik/MultikNDTest.kt     |  2 +-
 kmath-nd4j/README.md                          |  6 +-
 .../kscience/kmath/nd4j/Nd4jArrayAlgebra.kt   |  6 +-
 .../kscience/kmath/nd4j/Nd4jArrayStructure.kt |  2 +-
 .../kscience/kmath/nd4j/Nd4jTensorAlgebra.kt  |  4 +-
 .../kmath/nd4j/Nd4jArrayAlgebraTest.kt        |  2 +-
 .../kmath/nd4j/Nd4jArrayStructureTest.kt      |  2 +-
 kmath-optimization/README.md                  |  6 +-
 .../kmath/optimization/QowOptimizer.kt        |  2 +-
 .../kscience/kmath/optimization/XYFit.kt      |  2 +-
 .../kmath/optimization/logLikelihood.kt       |  2 +-
 kmath-stat/README.md                          |  6 +-
 kmath-stat/build.gradle.kts                   |  2 +-
 .../space/kscience/kmath/samplers/Sampler.kt  |  2 +-
 .../kmath/series/MonotonicSeriesAlgebra.kt    |  8 +--
 .../kscience/kmath/series/SeriesAlgebra.kt    | 39 +++++++----
 .../space/kscience/kmath/series/resampling.kt | 22 +++++++
 .../kscience/kmath/stat/StatisticalAlgebra.kt |  4 +-
 .../space/kscience/kmath/series/TestSeries.kt | 28 ++++++++
 kmath-symja/README.md                         |  6 +-
 kmath-tensorflow/README.md                    |  6 +-
 .../tensorflow/DoubleTensorFlowAlgebra.kt     |  4 +-
 .../kmath/tensorflow/TensorFlowAlgebra.kt     |  6 +-
 .../kmath/tensorflow/DoubleTensorFlowOps.kt   |  2 +-
 kmath-tensors/README.md                       |  6 +-
 .../core/BroadcastDoubleTensorAlgebra.kt      |  2 +-
 .../kmath/tensors/core/BufferedTensor.kt      |  2 +-
 .../kmath/tensors/core/DoubleTensor.kt        |  7 +-
 .../kmath/tensors/core/DoubleTensor1D.kt      |  2 +-
 .../kmath/tensors/core/DoubleTensor2D.kt      |  2 +-
 .../kmath/tensors/core/DoubleTensorAlgebra.kt | 11 ++--
 .../kscience/kmath/tensors/core/IntTensor.kt  |  2 +-
 .../kmath/tensors/core/IntTensorAlgebra.kt    |  2 +-
 .../tensors/core/internal/broadcastUtils.kt   |  2 +-
 .../kmath/tensors/core/internal/utils.kt      |  2 +-
 .../tensors/core/tensorAlgebraExtensions.kt   |  2 +-
 .../kmath/tensors/core/TestDoubleTensor.kt    |  3 +-
 kmath-viktor/README.md                        |  6 +-
 .../kscience/kmath/viktor/ViktorFieldOpsND.kt |  6 +-
 .../kmath/viktor/ViktorStructureND.kt         |  2 +-
 test-utils/build.gradle.kts                   |  1 +
 190 files changed, 485 insertions(+), 350 deletions(-)
 rename examples/src/main/kotlin/space/kscience/kmath/{stat => series}/DateTimeSeries.kt (79%)
 create mode 100644 kmath-core/src/wasmMain/kotlin/space/kscience/kmath/misc/numbers.kt
 create mode 100644 kmath-core/src/wasmMain/kotlin/space/kscience/kmath/operations/isInteger.kt
 rename {kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc => kmath-memory/src/commonMain/kotlin/space/kscience/kmath}/annotations.kt (95%)
 create mode 100644 kmath-memory/src/wasmMain/kotlin/space/kscience/kmath/memory/WasmMemory.kt
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/resampling.kt
 create mode 100644 kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestSeries.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24b592430..0d4e6123b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@
 
 
 ### Changed
+- Annotations moved to `space.kscience.kmath` 
 - Exponential operations merged with hyperbolic functions
 - Space is replaced by Group. Space is reserved for vector spaces.
 - VectorSpace is now a vector space
diff --git a/README.md b/README.md
index 03e803180..dbd670264 100644
--- a/README.md
+++ b/README.md
@@ -214,28 +214,6 @@ One can still use generic algebras though.
 >
 > **Maturity**: EXPERIMENTAL
 
-### [kmath-polynomial](kmath-polynomial)
-> 
->
-> **Maturity**: PROTOTYPE
->
-> **Features:**
-> - [polynomial abstraction](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/Polynomial.kt) : Abstraction for polynomial spaces.
-> - [rational function abstraction](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/RationalFunction.kt) : Abstraction for rational functions spaces.
-> - ["list" polynomials](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListRationalFunction.kt) : List implementation of univariate polynomials.
-> - ["list" rational functions](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/ListPolynomial.kt) : List implementation of univariate rational functions.
-> - ["list" polynomials and rational functions constructors](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listConstructors.kt) : Constructors for list polynomials and rational functions.
-> - ["list" polynomials and rational functions utilities](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/listUtil.kt) : Utilities for list polynomials and rational functions.
-> - ["numbered" polynomials](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedRationalFunction.kt) : Numbered implementation of multivariate polynomials.
-> - ["numbered" rational functions](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/NumberedPolynomial.kt) : Numbered implementation of multivariate rational functions.
-> - ["numbered" polynomials and rational functions constructors](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedConstructors.kt) : Constructors for numbered polynomials and rational functions.
-> - ["numbered" polynomials and rational functions utilities](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/numberedUtil.kt) : Utilities for numbered polynomials and rational functions.
-> - ["labeled" polynomials](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledRationalFunction.kt) : Labeled implementation of multivariate polynomials.
-> - ["labeled" rational functions](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/LabeledPolynomial.kt) : Labeled implementation of multivariate rational functions.
-> - ["labeled" polynomials and rational functions constructors](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledConstructors.kt) : Constructors for labeled polynomials and rational functions.
-> - ["labeled" polynomials and rational functions utilities](kmath-polynomial/src/commonMain/kotlin/space/kscience/kmath/functions/labeledUtil.kt) : Utilities for labeled polynomials and rational functions.
-
-
 ### [kmath-stat](kmath-stat)
 > 
 >
@@ -262,11 +240,6 @@ One can still use generic algebras though.
 > - [linear algebra operations](kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/api/LinearOpsTensorAlgebra.kt) : Advanced linear algebra operations like LU decomposition, SVD, etc.
 
 
-### [kmath-trajectory](kmath-trajectory)
-> Path and trajectory optimization
->
-> **Maturity**: PROTOTYPE
-
 ### [kmath-viktor](kmath-viktor)
 > 
 >
@@ -325,4 +298,4 @@ Gradle `6.0+` is required for multiplatform artifacts.
 The project requires a lot of additional work. The most important thing we need is a feedback about what features are
 required the most. Feel free to create feature requests. We are also welcome to code contributions, especially in issues
 marked with
-[waiting for a hero](https://github.com/SciProgCentre/kmath/labels/waiting%20for%20a%20hero) label.
\ No newline at end of file
+[waiting for a hero](https://github.com/mipt-npm/kmath/labels/waiting%20for%20a%20hero) label.
\ No newline at end of file
diff --git a/benchmarks/src/jsMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt b/benchmarks/src/jsMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
index fd1b4307a..cb07e489a 100644
--- a/benchmarks/src/jsMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
+++ b/benchmarks/src/jsMain/kotlin/space/kscience/kmath/benchmarks/ExpressionsInterpretersBenchmark.kt
@@ -9,8 +9,8 @@ import kotlinx.benchmark.Benchmark
 import kotlinx.benchmark.Blackhole
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.State
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.bindSymbol
 import space.kscience.kmath.operations.invoke
@@ -94,6 +94,7 @@ class ExpressionsInterpretersBenchmark {
         }
 
         private val mst = node.toExpression(DoubleField)
+        @OptIn(UnstableKMathAPI::class)
         private val wasm = node.wasmCompileToExpression(DoubleField)
         private val estree = node.estreeCompileToExpression(DoubleField)
 
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
index 19795b9eb..d07b7b4df 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/BigIntBenchmark.kt
@@ -10,7 +10,7 @@ import kotlinx.benchmark.Blackhole
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.BigIntField
 import space.kscience.kmath.operations.JBigIntegerField
 import space.kscience.kmath.operations.invoke
diff --git a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
index 3d39e89a5..fb8d845e8 100644
--- a/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
+++ b/benchmarks/src/jvmMain/kotlin/space/kscience/kmath/benchmarks/NDFieldBenchmark.kt
@@ -13,7 +13,7 @@ import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.ones
 import org.jetbrains.kotlinx.multik.ndarray.data.DN
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
-import space.kscience.kmath.misc.UnsafeKMathAPI
+import space.kscience.kmath.UnsafeKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.nd4j.nd4j
 import space.kscience.kmath.operations.DoubleField
diff --git a/build.gradle.kts b/build.gradle.kts
index cd8dfb4a0..2eea9c47b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.1-dev-11"
+    version = "0.4.0-dev-1"
 }
 
 subprojects {
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
index 183510232..d973ebae4 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/ejml/codegen/ejmlCodegen.kt
@@ -385,7 +385,7 @@ import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
 import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
 import space.kscience.kmath.linear.*
 import space.kscience.kmath.linear.Matrix
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureFeature
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.FloatField
diff --git a/examples/src/main/kotlin/space/kscience/kmath/stat/DateTimeSeries.kt b/examples/src/main/kotlin/space/kscience/kmath/series/DateTimeSeries.kt
similarity index 79%
rename from examples/src/main/kotlin/space/kscience/kmath/stat/DateTimeSeries.kt
rename to examples/src/main/kotlin/space/kscience/kmath/series/DateTimeSeries.kt
index 9836db6ea..ca10fc290 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/stat/DateTimeSeries.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/series/DateTimeSeries.kt
@@ -3,13 +3,11 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.stat
+package space.kscience.kmath.series
 
 import kotlinx.datetime.Instant
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.bufferAlgebra
-import space.kscience.kmath.series.MonotonicSeriesAlgebra
-import space.kscience.kmath.series.SeriesAlgebra
 import kotlin.time.Duration
 
 fun SeriesAlgebra.Companion.time(zero: Instant, step: Duration) = MonotonicSeriesAlgebra(
diff --git a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
index c94cb0e71..0e10f1a9a 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/series/analyzeDif.kt
@@ -1,9 +1,8 @@
 package space.kscience.kmath.series
 
 
-import kotlinx.html.FlowContent
 import kotlinx.html.h1
-import space.kscience.kmath.operations.DoubleBufferOps
+import kotlinx.html.p
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.bufferAlgebra
 import space.kscience.kmath.operations.toList
@@ -15,35 +14,43 @@ import space.kscience.plotly.*
 import kotlin.math.PI
 
 fun main() = with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
-    fun FlowContent.plotSeries(buffer: Buffer<Double>) {
-        val ls = buffer.labels
-        plot {
-            scatter {
-                x.numbers = ls
-                y.numbers = buffer.toList()
-            }
+
+
+    fun Plot.plotSeries(name: String, buffer: Buffer<Double>) {
+        scatter {
+            this.name = name
+            x.numbers = buffer.labels
+            y.numbers = buffer.toList()
+        }
+    }
+
+
+    val s1 = series(100) { sin(2 * PI * it / 100) + 1.0 }
+
+    val s2 = s1.slice(20..50).moveTo(40)
+
+    val s3: Buffer<Double> = s1.zip(s2) { l, r -> l + r } //s1 + s2
+    val s4 = s3.map { ln(it) }
+
+    val kmTest: KMComparisonResult<Double> = ksComparisonStatistic(s1, s2)
+
+    Plotly.page {
+        h1 { +"This is my plot" }
+        p{
+            +"Kolmogorov-smirnov test for s1 and s2: ${kmTest.value}"
+        }
+        plot{
+            plotSeries("s1", s1)
+            plotSeries("s2", s2)
+            plotSeries("s3", s3)
+            plotSeries("s4", s4)
             layout {
                 xaxis {
                     range(0.0..100.0)
                 }
             }
         }
-    }
 
-
-    val s1 = series(100) { sin(2 * PI * it / 100) + 1.0 }
-    val s2 = s1.slice(20..50).moveTo(40)
-
-    val s3: Buffer<Double> = s1.zip(s2) { l, r -> l + r } //s1 + s2
-    val s4 = DoubleBufferOps.ln(s3)
-
-    @Suppress("UNUSED_VARIABLE") val kmTest: KMComparisonResult<Double> = ksComparisonStatistic(s1, s2)
-
-    Plotly.page {
-        h1 { +"This is my plot" }
-        plotSeries(s1)
-        plotSeries(s2)
-        plotSeries(s4)
     }.makeFile()
 
 }
\ No newline at end of file
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
index 67c9b421f..2ce2c21a6 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StreamDoubleFieldND.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.structures
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.ExtendedField
diff --git a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
index e3e7daaae..e6ff0ee28 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/structures/StructureReadBenchmark.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.structures
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.BufferND
 import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.ShapeND
diff --git a/kmath-ast/README.md b/kmath-ast/README.md
index c6da64982..d85a18e1c 100644
--- a/kmath-ast/README.md
+++ b/kmath-ast/README.md
@@ -10,7 +10,7 @@ Extensions to MST API: transformations, dynamic compilation and visualization.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ast:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-ast:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ast:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-ast:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ast:0.3.1-dev-1")
+    implementation("space.kscience:kmath-ast:0.4.0-dev-1")
 }
 ```
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt
index 6458dc123..e211259af 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt
@@ -5,9 +5,9 @@
 
 package space.kscience.kmath.ast
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.NumericAlgebra
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt
index e411cd251..fb0c9b872 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt
@@ -5,9 +5,9 @@
 
 package space.kscience.kmath.ast
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.NumericAlgebra
 import space.kscience.kmath.operations.bindSymbolOrNull
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
index 13806703c..50162a4f5 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.ast.rendering
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 
 /**
  * [SyntaxRenderer] implementation for LaTeX.
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
index bd941745b..bb49c5df4 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.ast.rendering
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 
 /**
  * [SyntaxRenderer] implementation for MathML.
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
index dd8ed3457..afa25febe 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.ast.rendering
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.MST
-import space.kscience.kmath.misc.UnstableKMathAPI
 
 /**
  * Renders [MST] to [MathSyntax].
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
index 14df5ad8d..887469164 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.ast.rendering
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 
 /**
  * Syntax node for mathematical typography.
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
index e19a9722e..7669be664 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.ast.rendering
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 
 /**
  * Abstraction of writing [MathSyntax] as a string of an actual markup language. Typical implementation should
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index c1a895015..8bb7e3585 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.ast.rendering
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.ast.rendering.FeaturedMathRenderer.RenderFeature
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import kotlin.reflect.KClass
 
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
index f42237ba6..2399e8f68 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.ast.rendering
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.ast.rendering.FeaturedMathRendererWithPostProcess.PostProcessPhase
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.FieldOps
 import space.kscience.kmath.operations.GroupOps
 import space.kscience.kmath.operations.PowerOperations
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
index 853f5f983..87c2df2d2 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/estree/estree.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.estree
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.ast.TypedMst
 import space.kscience.kmath.ast.evaluateConstants
 import space.kscience.kmath.estree.internal.ESTreeBuilder
@@ -13,7 +14,6 @@ import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.invoke
 import space.kscience.kmath.internal.estree.BaseExpression
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Algebra
 
 /**
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
index d29fbde55..1908f0659 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/internal/WasmBuilder.kt
@@ -5,11 +5,11 @@
 
 package space.kscience.kmath.wasm.internal
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.ast.TypedMst
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.internal.binaryen.*
 import space.kscience.kmath.internal.webassembly.Instance
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.internal.binaryen.Module as BinaryenModule
 import space.kscience.kmath.internal.webassembly.Module as WasmModule
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
index 6a20da799..acb26f918 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/wasm/wasm.kt
@@ -7,10 +7,10 @@
 
 package space.kscience.kmath.wasm
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.ast.TypedMst
 import space.kscience.kmath.ast.evaluateConstants
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.wasm.internal.DoubleWasmBuilder
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
index 59a26af7d..7094d0442 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/asm.kt
@@ -7,11 +7,11 @@
 
 package space.kscience.kmath.asm
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.asm.internal.*
 import space.kscience.kmath.ast.TypedMst
 import space.kscience.kmath.ast.evaluateConstants
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.IntRing
diff --git a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
index d50318cd1..a3e5b7522 100644
--- a/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
+++ b/kmath-ast/src/jvmMain/kotlin/space/kscience/kmath/asm/internal/PrimitiveAsmBuilder.kt
@@ -11,9 +11,9 @@ import org.objectweb.asm.Opcodes.*
 import org.objectweb.asm.Type
 import org.objectweb.asm.Type.*
 import org.objectweb.asm.commons.InstructionAdapter
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.ast.TypedMst
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import java.lang.invoke.MethodHandles
 import java.lang.invoke.MethodType
diff --git a/kmath-commons/README.md b/kmath-commons/README.md
index 89f1f6c9f..47b61c409 100644
--- a/kmath-commons/README.md
+++ b/kmath-commons/README.md
@@ -6,7 +6,7 @@ Commons math binding for kmath
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-commons:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-commons:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-commons:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-commons:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-commons:0.3.1-dev-1")
+    implementation("space.kscience:kmath-commons:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/CmDsExpression.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/CmDsExpression.kt
index cb7fb543f..38eaf8868 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/CmDsExpression.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/expressions/CmDsExpression.kt
@@ -8,8 +8,8 @@
 package space.kscience.kmath.commons.expressions
 
 import org.apache.commons.math3.analysis.differentiation.DerivativeStructure
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.*
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.NumbersAddOps
 
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
index 4839518e6..c3e581d31 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/integration/CMIntegrator.kt
@@ -7,8 +7,8 @@ package space.kscience.kmath.commons.integration
 
 import org.apache.commons.math3.analysis.integration.IterativeLegendreGaussIntegrator
 import org.apache.commons.math3.analysis.integration.SimpsonIntegrator
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.integration.*
-import space.kscience.kmath.misc.UnstableKMathAPI
 
 /**
  * Integration wrapper for Common-maths UnivariateIntegrator
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
index e95c9115d..d19bd1be0 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/linear/CMMatrix.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.commons.linear
 
 import org.apache.commons.math3.linear.*
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.*
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureFeature
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.structures.Buffer
diff --git a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
index 46baa7d50..c4dafb6a6 100644
--- a/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
+++ b/kmath-commons/src/main/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
@@ -13,11 +13,11 @@ import org.apache.commons.math3.optim.nonlinear.scalar.ObjectiveFunctionGradient
 import org.apache.commons.math3.optim.nonlinear.scalar.gradient.NonLinearConjugateGradientOptimizer
 import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.NelderMeadSimplex
 import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.SimplexOptimizer
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.SymbolIndexer
 import space.kscience.kmath.expressions.derivative
 import space.kscience.kmath.expressions.withSymbols
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.misc.log
 import space.kscience.kmath.optimization.*
 import kotlin.collections.set
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
index 308f504af..6541736ce 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/integration/IntegrationTest.kt
@@ -6,9 +6,9 @@
 package space.kscience.kmath.commons.integration
 
 import org.junit.jupiter.api.Test
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.integration.integrate
 import space.kscience.kmath.integration.value
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField.sin
 import kotlin.math.PI
 import kotlin.math.abs
diff --git a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
index 03b1426f5..d2e86bb40 100644
--- a/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
+++ b/kmath-commons/src/test/kotlin/space/kscience/kmath/commons/optimization/OptimizeTest.kt
@@ -6,13 +6,13 @@
 package space.kscience.kmath.commons.optimization
 
 import kotlinx.coroutines.runBlocking
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.distributions.NormalDistribution
 import space.kscience.kmath.expressions.DSFieldExpression
 import space.kscience.kmath.expressions.Symbol.Companion.x
 import space.kscience.kmath.expressions.Symbol.Companion.y
 import space.kscience.kmath.expressions.autodiff
 import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleBufferOps.Companion.map
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.optimization.*
diff --git a/kmath-complex/README.md b/kmath-complex/README.md
index f00952065..4e800b7ac 100644
--- a/kmath-complex/README.md
+++ b/kmath-complex/README.md
@@ -8,7 +8,7 @@ Complex and hypercomplex number systems in KMath.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-complex:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-complex:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-complex:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-complex:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-complex:0.3.1-dev-1")
+    implementation("space.kscience:kmath-complex:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
index bb580989b..b5f1aabe7 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Complex.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.complex
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.memory.MemoryReader
 import space.kscience.kmath.memory.MemorySpec
 import space.kscience.kmath.memory.MemoryWriter
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.*
 import kotlin.math.*
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
index 06f6cad85..90a6b3253 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/ComplexFieldND.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.complex
 
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
diff --git a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
index e9b42118f..d4259c4dc 100644
--- a/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
+++ b/kmath-complex/src/commonMain/kotlin/space/kscience/kmath/complex/Quaternion.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.complex
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.memory.MemoryReader
 import space.kscience.kmath.memory.MemorySpec
 import space.kscience.kmath.memory.MemoryWriter
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MemoryBuffer
diff --git a/kmath-core/README.md b/kmath-core/README.md
index e84ca38d7..b58105d2f 100644
--- a/kmath-core/README.md
+++ b/kmath-core/README.md
@@ -15,7 +15,7 @@ performance calculations to code generation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-core:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-core:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-core:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-core:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -36,6 +36,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-core:0.3.1-dev-1")
+    implementation("space.kscience:kmath-core:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index 0e4646bed..b6a955b12 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -6,6 +6,7 @@ kscience{
     jvm()
     js()
     native()
+//    wasm()
 
     dependencies {
         api(projects.kmathMemory)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
index d09228e96..49e2ee8d0 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/ColumnarData.kt
@@ -5,9 +5,9 @@
 
 package space.kscience.kmath.data
 
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.structures.Buffer
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
index a3c3a2eda..de7e6f79b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYColumnarData.kt
@@ -5,9 +5,9 @@
 
 package space.kscience.kmath.data
 
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.structures.Buffer
 import kotlin.math.max
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
index dd0e35bc8..797a25443 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYErrorColumnarData.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.data
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
index 3dc1bb99b..846bbad62 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/data/XYZColumnarData.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.data
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
index 10755e633..d619883b4 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/Domain1D.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.domains
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
 
 @UnstableKMathAPI
 public abstract class Domain1D<T : Comparable<T>>(public val range: ClosedRange<T>) : Domain<T> {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt
index b0803f3e1..e56173624 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/DoubleDomain.kt
@@ -4,7 +4,7 @@
  */
 package space.kscience.kmath.domains
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 
 /**
  * n-dimensional volume
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
index 7d5843a97..1049a251a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/HyperSquareDomain.kt
@@ -4,8 +4,8 @@
  */
 package space.kscience.kmath.domains
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.structures.indices
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
index e8b867fac..5351a295d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/domains/UnconstrainedDomain.kt
@@ -4,8 +4,8 @@
  */
 package space.kscience.kmath.domains
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
 
 @UnstableKMathAPI
 public class UnconstrainedDomain(override val dimension: Int) : DoubleDomain {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
index 9e91ff26b..8c7cb0cf1 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/DSAlgebra.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.expressions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
index cf59efe71..f350303bc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/Expression.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.expressions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.Algebra
 import kotlin.jvm.JvmName
 import kotlin.properties.ReadOnlyProperty
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
index a75940cca..c894cf00a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/MstAlgebra.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.expressions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/NamedMatrix.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/NamedMatrix.kt
index 24bdfce7e..5d047d5b7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/NamedMatrix.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/NamedMatrix.kt
@@ -7,9 +7,9 @@
 
 package space.kscience.kmath.expressions
 
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.Matrix
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.getOrNull
 
 public class NamedMatrix<T>(public val values: Matrix<T>, public val indexer: SymbolIndexer) : Matrix<T> by values {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
index f00e6d3f3..2bb5043b7 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SimpleAutoDiff.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.expressions
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.asBuffer
 import kotlin.contracts.InvocationKind
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
index e5f92efc9..7112e921a 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/expressions/SymbolIndexer.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.expressions
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.DoubleBuffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
index 5976b67b1..4bba47a91 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/BufferedLinearSpace.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.linear
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
index 4e7ab55ef..940af4a86 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/DoubleLinearSpace.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.linear
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleBufferOps
 import space.kscience.kmath.operations.DoubleField
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
index 757752115..a82bafe57 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LinearSpace.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.linear
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.nd.StructureFeature
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
index 0ee7c8828..650e7be5c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/LupDecomposition.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.linear
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.BufferAccessor2D
 import space.kscience.kmath.structures.DoubleBuffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
index d0105e4cd..4d2f01e68 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixBuilder.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.linear
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.structures.BufferAccessor2D
 import space.kscience.kmath.structures.MutableBuffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
index feea26b40..46454a584 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/linear/MatrixWrapper.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.linear
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.misc.FeatureSet
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureFeature
 import space.kscience.kmath.operations.Ring
 import kotlin.reflect.KClass
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/collections.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/collections.kt
index 90cc5bbfa..afa76d2a9 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/collections.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/collections.kt
@@ -19,4 +19,4 @@ public inline fun <T, R> List<T>.zipWithNextCircular(transform: (a: T, b: T) ->
     }
 }
 
-public inline fun <T> List<T>.zipWithNextCircular(): List<Pair<T,T>> = zipWithNextCircular { l, r -> l to r  }
\ No newline at end of file
+public fun <T> List<T>.zipWithNextCircular(): List<Pair<T,T>> = zipWithNextCircular { l, r -> l to r  }
\ No newline at end of file
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
index daf5e1eff..31b8c0037 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/sorting.kt
@@ -6,6 +6,7 @@
 
 package space.kscience.kmath.misc
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.VirtualBuffer
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
index d53f5488a..91e26cc1b 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/AlgebraND.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import kotlin.reflect.KClass
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
index 781d2e367..74c63e6e2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferAlgebraND.kt
@@ -7,8 +7,8 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 
 public interface BufferAlgebraND<T, out A : Algebra<T>> : AlgebraND<T, A> {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
index a6bab8be1..9217f6fdc 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/BufferND.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
 import space.kscience.kmath.structures.MutableBuffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
index b5ed64108..265d1eec8 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/DoubleFieldND.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.contracts.InvocationKind
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt
index f46defeee..1491950d6 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/IntRingND.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.operations.NumbersAddOps
 import space.kscience.kmath.operations.bufferAlgebra
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/PermutedStructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/PermutedStructureND.kt
index e4ba72cec..6c35e2f44 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/PermutedStructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/PermutedStructureND.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 
 
 public class PermutedStructureND<T>(
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeND.kt
index 63728e94f..d43ebaf1c 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeND.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.UnsafeKMathAPI
+import space.kscience.kmath.UnsafeKMathAPI
 import kotlin.jvm.JvmInline
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
index 34d748b3f..1b4647146 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShortRingND.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.NumbersAddOps
 import space.kscience.kmath.operations.ShortRing
 import space.kscience.kmath.operations.bufferAlgebra
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
index ba48e25ce..984b5ad0f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure1D.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
index a9c6c2748..e006d09eb 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/Structure2D.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer
 import space.kscience.kmath.structures.MutableListBuffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
index c96843651..e643186ba 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/StructureND.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.nd
 
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.misc.Feature
 import space.kscience.kmath.misc.Featured
-import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.Buffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
index 4932dca41..606b9a631 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/VirtualStructureND.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 
 public open class VirtualStructureND<T>(
     override val shape: ShapeND,
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt
index 424081738..40db5187f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/operationsND.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 
 @OptIn(PerformancePitfall::class)
 public fun <T> StructureND<T>.roll(axis: Int, step: Int = 1): StructureND<T> {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/primitiveStructureND.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/primitiveStructureND.kt
index f50233ecc..28e32363f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/primitiveStructureND.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/primitiveStructureND.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.nd
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 
 public interface StructureNDOfDouble : StructureND<Double> {
     /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
index a7a5bc5fd..0960ab023 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/Algebra.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.operations
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring.Companion.optimizedPower
 import space.kscience.kmath.structures.MutableBufferFactory
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
index 8730ff163..34a6d4a80 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/BigInt.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.operations
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.BufferedRingOpsND
 import space.kscience.kmath.operations.BigInt.Companion.BASE
 import space.kscience.kmath.operations.BigInt.Companion.BASE_SIZE
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
index 7ba1a7066..74b41be9d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/DoubleBufferOps.kt
@@ -5,10 +5,11 @@
 
 package space.kscience.kmath.operations
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.*
-import kotlin.math.*
+import kotlin.math.pow
+import kotlin.math.sqrt
 
 /**
  * [ExtendedFieldOps] over [DoubleBuffer].
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
index 5cf98c7d5..7aa5aed80 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/LogicAlgebra.kt
@@ -5,9 +5,9 @@
 
 package space.kscience.kmath.operations
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.symbol
-import space.kscience.kmath.misc.UnstableKMathAPI
 
 /**
  * An algebra for generic boolean logic
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
index 5c2747686..9bcfb00a2 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/NumericAlgebra.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.operations
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import kotlin.math.E
 import kotlin.math.PI
 
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index 84fb2ea41..ddf599240 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.operations
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.structures.Buffer
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
index 697939bdf..02fd2600d 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/BufferView.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.structures
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 
 /**
  * A buffer that wraps an original buffer
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
index 80d5033c4..cbfd6b9cd 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/MemoryBuffer.kt
@@ -17,9 +17,7 @@ import space.kscience.kmath.memory.*
 public open class MemoryBuffer<T : Any>(protected val memory: Memory, protected val spec: MemorySpec<T>) : Buffer<T> {
     override val size: Int get() = memory.size / spec.objectSize
 
-    private val reader: MemoryReader = memory.reader()
-
-    override operator fun get(index: Int): T = reader.read(spec, spec.objectSize * index)
+    override operator fun get(index: Int): T = memory.read { read(spec, spec.objectSize * index) }
     override operator fun iterator(): Iterator<T> = (0 until size).asSequence().map { get(it) }.iterator()
 
     override fun toString(): String = Buffer.toString(this)
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferExtensions.kt
index 0a475187f..6a7b6d836 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferExtensions.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.operations
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.structures.*
 
 /**
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
index 2f2cc80b3..791d7d16f 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.structures
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 
 /**
  * Non-boxing access to primitive [Double]
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
index 0bfcb04a7..871119f48 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/DSTest.kt
@@ -7,7 +7,7 @@
 
 package space.kscience.kmath.expressions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
index 6f207eab3..83f00ce6c 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/expressions/InterpretTest.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.expressions
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol.Companion.x
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.BooleanAlgebra
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.invoke
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
index 25e29f3d6..4d05f9043 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/DoubleLUSolverTest.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.linear
 
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.algebra
 import kotlin.test.Test
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
index fe5ea3642..531aee259 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/linear/MatrixTest.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.linear
 
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.as2D
 import space.kscience.kmath.operations.algebra
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
index f4f7b1a51..06a9ab439 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/operations/BigIntAlgebraTest.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.operations
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.testutils.RingVerifier
 import kotlin.math.pow
 import kotlin.test.Test
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index 147488273..1572db816 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -5,13 +5,18 @@
 
 package space.kscience.kmath.structures
 
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.linear.linearSpace
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.nd.*
+import space.kscience.kmath.nd.StructureND
+import space.kscience.kmath.nd.get
+import space.kscience.kmath.nd.ndAlgebra
+import space.kscience.kmath.nd.structureND
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Norm
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.invoke
+import kotlin.collections.component1
+import kotlin.collections.component2
 import kotlin.math.abs
 import kotlin.math.pow
 import kotlin.test.Test
diff --git a/kmath-core/src/wasmMain/kotlin/space/kscience/kmath/misc/numbers.kt b/kmath-core/src/wasmMain/kotlin/space/kscience/kmath/misc/numbers.kt
new file mode 100644
index 000000000..e320f350e
--- /dev/null
+++ b/kmath-core/src/wasmMain/kotlin/space/kscience/kmath/misc/numbers.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.misc
+
+public actual fun Long.toIntExact(): Int {
+    val i = toInt()
+    if (i.toLong() == this) throw ArithmeticException("integer overflow")
+    return i
+}
diff --git a/kmath-core/src/wasmMain/kotlin/space/kscience/kmath/operations/isInteger.kt b/kmath-core/src/wasmMain/kotlin/space/kscience/kmath/operations/isInteger.kt
new file mode 100644
index 000000000..11c82bf9e
--- /dev/null
+++ b/kmath-core/src/wasmMain/kotlin/space/kscience/kmath/operations/isInteger.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.operations
+
+/**
+ * Check if number is an integer from platform point of view
+ */
+public actual fun Number.isInteger(): Boolean =
+    (this is Int) || (this is Long) || (this is Short) || (this.toDouble() % 1 == 0.0)
\ No newline at end of file
diff --git a/kmath-coroutines/README.md b/kmath-coroutines/README.md
index 337d8e037..21831e514 100644
--- a/kmath-coroutines/README.md
+++ b/kmath-coroutines/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-coroutines:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-coroutines:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-coroutines:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-coroutines:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-coroutines:0.3.1-dev-1")
+    implementation("space.kscience:kmath-coroutines:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
index ed0283630..977346e68 100644
--- a/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
+++ b/kmath-coroutines/src/commonMain/kotlin/space/kscience/kmath/chains/Chain.kt
@@ -10,7 +10,7 @@ import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 
 /**
  * A not-necessary-Markov chain of some type
diff --git a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
index 1f717658e..22c2ac3ff 100644
--- a/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
+++ b/kmath-coroutines/src/jvmMain/kotlin/space/kscience/kmath/structures/LazyStructureND.kt
@@ -6,8 +6,8 @@
 package space.kscience.kmath.structures
 
 import kotlinx.coroutines.*
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.coroutines.Math
-import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
diff --git a/kmath-dimensions/README.md b/kmath-dimensions/README.md
index 12aa2a7fa..2e7250b51 100644
--- a/kmath-dimensions/README.md
+++ b/kmath-dimensions/README.md
@@ -6,7 +6,7 @@ A proof of concept module for adding type-safe dimensions to structures
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-dimensions:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-dimensions:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-dimensions:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-dimensions:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-dimensions:0.3.1-dev-1")
+    implementation("space.kscience:kmath-dimensions:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-ejml/README.md b/kmath-ejml/README.md
index 2d6c661e4..ad80ba183 100644
--- a/kmath-ejml/README.md
+++ b/kmath-ejml/README.md
@@ -9,7 +9,7 @@ EJML based linear algebra implementation.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-ejml:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-ejml:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-ejml:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-ejml:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-ejml:0.3.1-dev-1")
+    implementation("space.kscience:kmath-ejml:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
index beb79fc0e..8925fb045 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/EjmlLinearSpace.kt
@@ -5,11 +5,11 @@
 
 package space.kscience.kmath.ejml
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.InverseMatrixFeature
 import space.kscience.kmath.linear.LinearSpace
 import space.kscience.kmath.linear.Matrix
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.operations.Ring
 
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
index aac327a84..c56583fa8 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
@@ -19,9 +19,9 @@ import org.ejml.sparse.csc.factory.DecompositionFactory_DSCC
 import org.ejml.sparse.csc.factory.DecompositionFactory_FSCC
 import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
 import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.*
 import space.kscience.kmath.linear.Matrix
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureFeature
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.FloatField
diff --git a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
index d1ae80ef9..e89810e0d 100644
--- a/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
+++ b/kmath-ejml/src/test/kotlin/space/kscience/kmath/ejml/EjmlMatrixTest.kt
@@ -11,9 +11,9 @@ import org.ejml.data.DMatrixRMaj
 import org.ejml.dense.row.CommonOps_DDRM
 import org.ejml.dense.row.RandomMatrices_DDRM
 import org.ejml.dense.row.factory.DecompositionFactory_DDRM
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.*
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.toArray
 import space.kscience.kmath.operations.algebra
diff --git a/kmath-for-real/README.md b/kmath-for-real/README.md
index 5a8376976..638b15bfa 100644
--- a/kmath-for-real/README.md
+++ b/kmath-for-real/README.md
@@ -9,7 +9,7 @@ Specialization of KMath APIs for Double numbers.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-for-real:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-for-real:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-for-real:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-for-real:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-for-real:0.3.1-dev-1")
+    implementation("space.kscience:kmath-for-real:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/DoubleVector.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/DoubleVector.kt
index e607786fb..411a35188 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/DoubleVector.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/DoubleVector.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.real
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleL2Norm
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.MutableBuffer.Companion.double
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
index cfa59bf32..40e4a91f1 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/RealMatrix.kt
@@ -8,9 +8,9 @@
 
 package space.kscience.kmath.real
 
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.*
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.asIterable
diff --git a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
index 6403cf509..adb62b173 100644
--- a/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
+++ b/kmath-for-real/src/commonMain/kotlin/space/kscience/kmath/real/grids.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.real
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 import kotlin.math.floor
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
index 0d016116d..c00cd84d1 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/DoubleMatrixTest.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.real
 
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.linearSpace
 import space.kscience.kmath.linear.matrix
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.testutils.contentEquals
diff --git a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
index 31be9a452..35c53f9d6 100644
--- a/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
+++ b/kmath-for-real/src/commonTest/kotlin/space/kscience/kmath/real/GridTest.kt
@@ -5,11 +5,7 @@
 
 package space.kscience.kmath.real
 
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.real.DoubleVector
-import space.kscience.kmath.real.minus
-import space.kscience.kmath.real.norm
-import space.kscience.kmath.real.step
+import space.kscience.kmath.UnstableKMathAPI
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
diff --git a/kmath-functions/README.md b/kmath-functions/README.md
index 1292424b5..929fd9172 100644
--- a/kmath-functions/README.md
+++ b/kmath-functions/README.md
@@ -11,7 +11,7 @@ Functions and interpolations.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-functions:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-functions:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-functions:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-functions:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -32,6 +32,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-functions:0.3.1-dev-1")
+    implementation("space.kscience:kmath-functions:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
index a9f51f7b0..a9e75e456 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/Piecewise.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.operations.Ring
 
 /**
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
index 5effe566a..0d4b93f03 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/functions/polynomialUtil.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.functions
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
index 603f0503a..f2ac0a296 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/GaussIntegrator.kt
@@ -4,7 +4,7 @@
  */
 package space.kscience.kmath.integration
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asBuffer
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
index 7e4ff0f8b..73a3cc25b 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SimpsonIntegrator.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.integration
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.invoke
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
index c66674fbb..993812b29 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/SplineIntegrator.kt
@@ -5,13 +5,13 @@
 
 package space.kscience.kmath.integration
 
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.functions.PiecewisePolynomial
 import space.kscience.kmath.functions.integrate
 import space.kscience.kmath.interpolation.PolynomialInterpolator
 import space.kscience.kmath.interpolation.SplineInterpolator
 import space.kscience.kmath.interpolation.interpolatePolynomials
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
index af8c858fa..f18e86b80 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.integration
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.misc.FeatureSet
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.DoubleBuffer
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
index 52e8991b1..191e7dfd9 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/Interpolator.kt
@@ -7,11 +7,11 @@
 
 package space.kscience.kmath.interpolation
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.functions.PiecewisePolynomial
 import space.kscience.kmath.functions.asFunction
 import space.kscience.kmath.functions.value
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.asBuffer
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
index 49d7fd1ca..5c56e406a 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/LinearInterpolator.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.interpolation
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.functions.PiecewisePolynomial
 import space.kscience.kmath.functions.Polynomial
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.invoke
 
diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
index a63142be4..a3cc17954 100644
--- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
+++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/interpolation/SplineInterpolator.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.interpolation
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.functions.PiecewisePolynomial
 import space.kscience.kmath.functions.Polynomial
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.invoke
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
index c1b1008ae..48e641335 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/PolynomialUtilTest.kt
@@ -5,9 +5,9 @@
 
 package space.kscience.kmath.functions
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.functions.testUtils.Rational
 import space.kscience.kmath.functions.testUtils.RationalField
-import space.kscience.kmath.misc.UnstableKMathAPI
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
index 0a3d00e96..ff05805da 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
@@ -7,7 +7,7 @@
 
 package space.kscience.kmath.functions.testUtils
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.Field
 import space.kscience.kmath.operations.NumbersAddOps
 
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
index 32fc08ae4..7424f3566 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/GaussIntegralTest.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.integration
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import kotlin.math.PI
 import kotlin.math.sin
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
index 188f8d15f..7b699ebbc 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SimpsonIntegralTest.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.integration
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import kotlin.math.PI
 import kotlin.math.sin
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
index 4a15e96c3..b17d21abf 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/integration/SplineIntegralTest.kt
@@ -5,9 +5,9 @@
 
 package space.kscience.kmath.integration
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.functions.Polynomial
 import space.kscience.kmath.functions.integrate
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import kotlin.math.PI
 import kotlin.math.sin
diff --git a/kmath-geometry/README.md b/kmath-geometry/README.md
index 72d275697..480945c4f 100644
--- a/kmath-geometry/README.md
+++ b/kmath-geometry/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-geometry:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-geometry:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-geometry:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-geometry:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-geometry:0.3.1-dev-1")
+    implementation("space.kscience:kmath-geometry:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
index 487af7e50..1f3850c7c 100644
--- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
+++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/rotations3D.kt
@@ -5,12 +5,15 @@
 
 package space.kscience.kmath.geometry
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.complex.Quaternion
 import space.kscience.kmath.complex.QuaternionField
 import space.kscience.kmath.complex.normalized
 import space.kscience.kmath.complex.reciprocal
-import space.kscience.kmath.linear.*
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.linear.LinearSpace
+import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.linear.linearSpace
+import space.kscience.kmath.linear.matrix
 import space.kscience.kmath.operations.DoubleField
 import kotlin.math.pow
 import kotlin.math.sqrt
diff --git a/kmath-histograms/README.md b/kmath-histograms/README.md
index 5fd91ee0c..bc7f0fa5b 100644
--- a/kmath-histograms/README.md
+++ b/kmath-histograms/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-histograms:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-histograms:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-histograms:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-histograms:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-histograms:0.3.1-dev-1")
+    implementation("space.kscience:kmath-histograms:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
index f9ca6a486..f50610a17 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt
@@ -5,10 +5,10 @@
 
 package space.kscience.kmath.histogram
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.domains.Domain1D
 import space.kscience.kmath.domains.center
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.structures.Buffer
 
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
index 623452422..5fdc2ffb0 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/HistogramND.kt
@@ -5,9 +5,9 @@
 
 package space.kscience.kmath.histogram
 
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.domains.Domain
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.FieldOpsND
 import space.kscience.kmath.nd.ShapeND
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
index 3c687d2df..154d35350 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogram1D.kt
@@ -5,8 +5,8 @@
 
 package space.kscience.kmath.histogram
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.domains.DoubleDomain1D
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.Group
 import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.operations.ScaleOperations
diff --git a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
index b62780ed5..61ce450a7 100644
--- a/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
+++ b/kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt
@@ -7,10 +7,10 @@
 
 package space.kscience.kmath.histogram
 
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.domains.HyperSquareDomain
 import space.kscience.kmath.linear.Point
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.*
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
index 64cc4f203..54806c9fa 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/MultivariateHistogramTest.kt
@@ -7,8 +7,8 @@
 
 package space.kscience.kmath.histogram
 
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.real.DoubleVector
diff --git a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
index c4554b575..fa129fad6 100644
--- a/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/space/kscience/kmath/histogram/UniformHistogram1DTest.kt
@@ -7,8 +7,8 @@ package space.kscience.kmath.histogram
 
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.distributions.NormalDistribution
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.stat.nextBuffer
diff --git a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramGroup.kt b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramGroup.kt
index a7d34ff71..772db7df3 100644
--- a/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramGroup.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/space/kscience/kmath/histogram/TreeHistogramGroup.kt
@@ -7,9 +7,9 @@
 
 package space.kscience.kmath.histogram
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.domains.DoubleDomain1D
 import space.kscience.kmath.domains.center
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.misc.sorted
 import space.kscience.kmath.operations.Group
 import space.kscience.kmath.operations.Ring
diff --git a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
index 77dc189ee..b7c1f34ba 100644
--- a/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
+++ b/kmath-histograms/src/jvmTest/kotlin/space/kscience/kmath/histogram/TreeHistogramTest.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.histogram
 
 import org.junit.jupiter.api.Test
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.real.step
 import kotlin.random.Random
diff --git a/kmath-jafama/README.md b/kmath-jafama/README.md
index c008c76ca..47142f174 100644
--- a/kmath-jafama/README.md
+++ b/kmath-jafama/README.md
@@ -7,7 +7,7 @@ Integration with [Jafama](https://github.com/jeffhain/jafama).
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-jafama:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-jafama:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-jafama:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-jafama:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-jafama:0.3.1-dev-1")
+    implementation("space.kscience:kmath-jafama:0.4.0-dev-1")
 }
 ```
 
diff --git a/kmath-jupyter/README.md b/kmath-jupyter/README.md
index 3c9832625..2b26878dc 100644
--- a/kmath-jupyter/README.md
+++ b/kmath-jupyter/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-jupyter:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-jupyter:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-jupyter:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-jupyter:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-jupyter:0.3.1-dev-1")
+    implementation("space.kscience:kmath-jupyter:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
index 1fe9fe92f..2d32dd609 100644
--- a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -12,6 +12,7 @@ import kotlinx.html.unsafe
 import org.jetbrains.kotlinx.jupyter.api.DisplayResult
 import org.jetbrains.kotlinx.jupyter.api.HTML
 import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.ast.rendering.FeaturedMathRendererWithPostProcess
 import space.kscience.kmath.ast.rendering.MathMLSyntaxRenderer
 import space.kscience.kmath.ast.rendering.renderWithStringBuilder
@@ -19,7 +20,6 @@ import space.kscience.kmath.complex.Complex
 import space.kscience.kmath.complex.Quaternion
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.MstRing
-import space.kscience.kmath.misc.PerformancePitfall
 import space.kscience.kmath.nd.Structure2D
 import space.kscience.kmath.operations.asSequence
 import space.kscience.kmath.operations.invoke
diff --git a/kmath-kotlingrad/README.md b/kmath-kotlingrad/README.md
index 457652aaf..f1a918b4b 100644
--- a/kmath-kotlingrad/README.md
+++ b/kmath-kotlingrad/README.md
@@ -8,7 +8,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-kotlingrad:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-kotlingrad:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-kotlingrad:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -29,6 +29,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-kotlingrad:0.3.1-dev-1")
+    implementation("space.kscience:kmath-kotlingrad:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-memory/README.md b/kmath-memory/README.md
index 536d7f145..594588ecf 100644
--- a/kmath-memory/README.md
+++ b/kmath-memory/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-memory:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-memory:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-memory:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-memory:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-memory:0.3.1-dev-1")
+    implementation("space.kscience:kmath-memory:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-memory/build.gradle.kts b/kmath-memory/build.gradle.kts
index 4f0f996b9..d8af1e3a2 100644
--- a/kmath-memory/build.gradle.kts
+++ b/kmath-memory/build.gradle.kts
@@ -6,6 +6,7 @@ kscience {
     jvm()
     js()
     native()
+//    wasm()
 }
 
 readme {
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/annotations.kt
similarity index 95%
rename from kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
rename to kmath-memory/src/commonMain/kotlin/space/kscience/kmath/annotations.kt
index 7da333a45..a95b166cf 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/annotations.kt
+++ b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/annotations.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2018-2022 KMath contributors.
+ * Copyright 2018-2023 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.misc
+package space.kscience.kmath
 
 /**
  * Marks declarations that are still experimental in the KMath APIs, which means that the design of the corresponding
diff --git a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
index 006d57c5f..a63753015 100644
--- a/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
+++ b/kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
@@ -43,7 +43,7 @@ public interface Memory {
 /**
  * The interface to read primitive types in this memory.
  */
-public interface MemoryReader {
+public interface MemoryReader: AutoCloseable {
     /**
      * The underlying memory.
      */
@@ -82,7 +82,7 @@ public interface MemoryReader {
     /**
      * Disposes this reader if needed.
      */
-    public fun release()
+    override fun close()
 }
 
 /**
@@ -90,16 +90,13 @@ public interface MemoryReader {
  */
 public inline fun <R> Memory.read(block: MemoryReader.() -> R): R {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    val reader = reader()
-    val result = reader.block()
-    reader.release()
-    return result
+    return reader().use(block)
 }
 
 /**
  * The interface to write primitive types into this memory.
  */
-public interface MemoryWriter {
+public interface MemoryWriter: AutoCloseable {
     /**
      * The underlying memory.
      */
@@ -138,7 +135,7 @@ public interface MemoryWriter {
     /**
      * Disposes this writer if needed.
      */
-    public fun release()
+    override fun close()
 }
 
 /**
@@ -146,7 +143,7 @@ public interface MemoryWriter {
  */
 public inline fun Memory.write(block: MemoryWriter.() -> Unit) {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-    writer().apply(block).release()
+    writer().use(block)
 }
 
 /**
diff --git a/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt b/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
index 40ba84c10..f8bcef010 100644
--- a/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
+++ b/kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
@@ -41,7 +41,7 @@ private class DataViewMemory(val view: DataView) : Memory {
         override fun readLong(offset: Int): Long =
             view.getInt32(offset, false).toLong() shl 32 or view.getInt32(offset + 4, false).toLong()
 
-        override fun release() {
+        override fun close() {
             // does nothing on JS
         }
     }
@@ -76,7 +76,7 @@ private class DataViewMemory(val view: DataView) : Memory {
             view.setInt32(offset + 4, (value and 0xffffffffL).toInt(), littleEndian = false)
         }
 
-        override fun release() {
+        override fun close() {
             // does nothing on JS
         }
     }
diff --git a/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt b/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
index 84f7ea412..19910a396 100644
--- a/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
+++ b/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
@@ -53,7 +53,7 @@ internal class ByteBufferMemory(
 
         override fun readLong(offset: Int) = buffer.getLong(position(offset))
 
-        override fun release() {
+        override fun close() {
             // does nothing on JVM
         }
     }
@@ -87,7 +87,7 @@ internal class ByteBufferMemory(
             buffer.putLong(position(offset), value)
         }
 
-        override fun release() {
+        override fun close() {
             // does nothing on JVM
         }
     }
diff --git a/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt b/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
index b224383e4..32bc8d6a5 100644
--- a/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
+++ b/kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
@@ -41,7 +41,7 @@ internal class NativeMemory(
 
         override fun readLong(offset: Int) = array.getLongAt(position(offset))
 
-        override fun release() {
+        override fun close() {
             // does nothing on JVM
         }
     }
@@ -75,7 +75,7 @@ internal class NativeMemory(
             array.setLongAt(position(offset), value)
         }
 
-        override fun release() {
+        override fun close() {
             // does nothing on JVM
         }
     }
diff --git a/kmath-memory/src/wasmMain/kotlin/space/kscience/kmath/memory/WasmMemory.kt b/kmath-memory/src/wasmMain/kotlin/space/kscience/kmath/memory/WasmMemory.kt
new file mode 100644
index 000000000..7c2be19cc
--- /dev/null
+++ b/kmath-memory/src/wasmMain/kotlin/space/kscience/kmath/memory/WasmMemory.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.memory
+
+import kotlin.wasm.unsafe.Pointer
+import kotlin.wasm.unsafe.UnsafeWasmMemoryApi
+
+@OptIn(UnsafeWasmMemoryApi::class)
+public class WasmMemory private constructor(
+    public val pointer: Pointer,
+    override val size: Int,
+) : Memory {
+
+    override fun view(offset: Int, length: Int): Memory {
+        TODO("Not yet implemented")
+    }
+
+    override fun copy(): Memory {
+        TODO("Not yet implemented")
+    }
+
+    override fun reader(): MemoryReader = object : MemoryReader {
+        override val memory: Memory
+            get() = this@WasmMemory
+
+        override fun readDouble(offset: Int): Double {
+            return Double.fromBits(pointer.plus(offset).loadLong())
+        }
+
+        override fun readFloat(offset: Int): Float {
+            return Float.fromBits(pointer.plus(offset).loadInt())
+        }
+
+        override fun readByte(offset: Int): Byte {
+            return pointer.plus(offset).loadByte()
+        }
+
+        override fun readShort(offset: Int): Short {
+            return pointer.plus(offset).loadShort()
+        }
+
+        override fun readInt(offset: Int): Int {
+            return pointer.plus(offset).loadInt()
+        }
+
+        override fun readLong(offset: Int): Long {
+            return pointer.plus(offset).loadLong()
+        }
+
+        override fun close() {
+            TODO()
+        }
+
+    }
+
+    override fun writer(): MemoryWriter = TODO()
+}
+
+public actual fun Memory.Companion.allocate(length: Int): Memory {
+    TODO()
+}
+
+public actual fun Memory.Companion.wrap(array: ByteArray): Memory = TODO()
\ No newline at end of file
diff --git a/kmath-multik/README.md b/kmath-multik/README.md
index 0f5b65b4c..127b12a49 100644
--- a/kmath-multik/README.md
+++ b/kmath-multik/README.md
@@ -6,7 +6,7 @@ JetBrains Multik connector
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-multik:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-multik:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-multik:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-multik:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-multik:0.3.1-dev-1")
+    implementation("space.kscience:kmath-multik:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
index 989ebcd5d..beab5c18b 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikDoubleAlgebra.kt
@@ -9,7 +9,7 @@ import org.jetbrains.kotlinx.multik.api.Engine
 import org.jetbrains.kotlinx.multik.api.Multik
 import org.jetbrains.kotlinx.multik.api.ndarrayOf
 import org.jetbrains.kotlinx.multik.ndarray.data.DataType
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.ExponentialOperations
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
index ae526873d..59a9a1bf3 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensor.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.multik
 
 import org.jetbrains.kotlinx.multik.ndarray.data.*
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.tensors.api.Tensor
 import kotlin.jvm.JvmInline
diff --git a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
index 1736b48e3..c3a82b167 100644
--- a/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
+++ b/kmath-multik/src/commonMain/kotlin/space/kscience/kmath/multik/MultikTensorAlgebra.kt
@@ -13,10 +13,11 @@ import org.jetbrains.kotlinx.multik.api.math.Math
 import org.jetbrains.kotlinx.multik.api.stat.Statistics
 import org.jetbrains.kotlinx.multik.ndarray.data.*
 import org.jetbrains.kotlinx.multik.ndarray.operations.*
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnsafeKMathAPI
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnsafeKMathAPI
 import space.kscience.kmath.nd.*
-import space.kscience.kmath.operations.*
+import space.kscience.kmath.operations.Field
+import space.kscience.kmath.operations.Ring
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.api.TensorAlgebra
 import space.kscience.kmath.tensors.api.TensorPartialDivisionAlgebra
diff --git a/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
index d52420fc6..1a130aa92 100644
--- a/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
+++ b/kmath-multik/src/commonTest/kotlin/space/kscience/kmath/multik/MultikNDTest.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.multik
 
 import org.jetbrains.kotlinx.multik.default.DefaultEngine
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.one
diff --git a/kmath-nd4j/README.md b/kmath-nd4j/README.md
index bb065a300..b299c1b37 100644
--- a/kmath-nd4j/README.md
+++ b/kmath-nd4j/README.md
@@ -9,7 +9,7 @@ ND4J based implementations of KMath abstractions.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-nd4j:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-nd4j:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-nd4j:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-nd4j:0.3.1-dev-1")
+    implementation("space.kscience:kmath-nd4j:0.4.0-dev-1")
 }
 ```
 
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
index 6f01233d7..0eb147b6f 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebra.kt
@@ -10,9 +10,9 @@ import org.nd4j.linalg.api.ops.impl.transforms.strict.ACosh
 import org.nd4j.linalg.api.ops.impl.transforms.strict.ASinh
 import org.nd4j.linalg.factory.Nd4j
 import org.nd4j.linalg.ops.transforms.Transforms
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnsafeKMathAPI
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnsafeKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.*
 
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
index a1405ccfb..93fbc8f85 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructure.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.nd4j
 
 import org.nd4j.linalg.api.ndarray.INDArray
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.*
 
 /**
diff --git a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
index ef7b7f257..5905739f8 100644
--- a/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
+++ b/kmath-nd4j/src/main/kotlin/space/kscience/kmath/nd4j/Nd4jTensorAlgebra.kt
@@ -12,8 +12,8 @@ import org.nd4j.linalg.api.ops.impl.transforms.strict.ASinh
 import org.nd4j.linalg.factory.Nd4j
 import org.nd4j.linalg.factory.ops.NDBase
 import org.nd4j.linalg.ops.transforms.Transforms
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnsafeKMathAPI
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnsafeKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.Field
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
index 9f1022fd9..708778e77 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayAlgebraTest.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.nd4j
 
 import org.nd4j.linalg.factory.Nd4j
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.one
 import space.kscience.kmath.nd.structureND
diff --git a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
index 25c3fe23f..d57eb2e2d 100644
--- a/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
+++ b/kmath-nd4j/src/test/kotlin/space/kscience/kmath/nd4j/Nd4jArrayStructureTest.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.nd4j
 
 import org.nd4j.linalg.factory.Nd4j
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.asList
 import space.kscience.kmath.nd.get
 import kotlin.test.Test
diff --git a/kmath-optimization/README.md b/kmath-optimization/README.md
index d7441ebd1..79a4f5d24 100644
--- a/kmath-optimization/README.md
+++ b/kmath-optimization/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-optimization:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-optimization:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-optimization:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-optimization:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-optimization:0.3.1-dev-1")
+    implementation("space.kscience:kmath-optimization:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
index bbebec6af..b698584aa 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/QowOptimizer.kt
@@ -5,9 +5,9 @@
 
 package space.kscience.kmath.optimization
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.linear.*
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.misc.log
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.DoubleL2Norm
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
index 5c28826ee..9e5396491 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt
@@ -6,12 +6,12 @@
 
 package space.kscience.kmath.optimization
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.data.indices
 import space.kscience.kmath.expressions.*
 import space.kscience.kmath.misc.FeatureSet
 import space.kscience.kmath.misc.Loggable
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.operations.ExtendedField
 import space.kscience.kmath.operations.bindSymbol
 import kotlin.math.pow
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt
index e0eeb339c..8ab9de48d 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/logLikelihood.kt
@@ -5,13 +5,13 @@
 
 package space.kscience.kmath.optimization
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.data.indices
 import space.kscience.kmath.expressions.DifferentiableExpression
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.expressions.derivative
-import space.kscience.kmath.misc.UnstableKMathAPI
 import kotlin.math.PI
 import kotlin.math.ln
 import kotlin.math.pow
diff --git a/kmath-stat/README.md b/kmath-stat/README.md
index 7ed20fcf4..e7e0a4d92 100644
--- a/kmath-stat/README.md
+++ b/kmath-stat/README.md
@@ -6,7 +6,7 @@
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-stat:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-stat:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-stat:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-stat:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-stat:0.3.1-dev-1")
+    implementation("space.kscience:kmath-stat:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-stat/build.gradle.kts b/kmath-stat/build.gradle.kts
index 267bfd0f3..1426e913a 100644
--- a/kmath-stat/build.gradle.kts
+++ b/kmath-stat/build.gradle.kts
@@ -12,7 +12,7 @@ kotlin.sourceSets {
     commonMain {
         dependencies {
             api(project(":kmath-coroutines"))
-            implementation(spclibs.atomicfu)
+            //implementation(spclibs.atomicfu)
         }
     }
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt
index 52e400bf1..b87a429df 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/samplers/Sampler.kt
@@ -6,9 +6,9 @@
 package space.kscience.kmath.stat
 
 import kotlinx.coroutines.flow.first
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.chains.Chain
 import space.kscience.kmath.chains.combine
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.structures.Buffer
 import space.kscience.kmath.structures.BufferFactory
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/MonotonicSeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/MonotonicSeriesAlgebra.kt
index 2bc363934..ed6f4e07b 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/MonotonicSeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/MonotonicSeriesAlgebra.kt
@@ -37,11 +37,5 @@ public class MonotonicSeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T
     /**
      * Get value by label (rounded down) or return null if the value is outside series boundaries.
      */
-    public fun Buffer<T>.getByLabelOrNull(label: L): T? = getByOffsetOrNull(floorOffset(label))
-
-    /**
-     * Get value by label (rounded down) or throw [IndexOutOfBoundsException] if the value is outside series boundaries.
-     */
-    public fun Buffer<T>.getByLabel(label: L): T = getByLabelOrNull(label)
-        ?: throw IndexOutOfBoundsException("Label $label is not in $labelRange")
+    override fun Buffer<T>.getByLabelOrNull(label: L): T? = getByOffsetOrNull(floorOffset(label))
 }
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index 1847e33b6..3ccbca5a1 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -112,14 +112,21 @@ public open class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>
     public val Buffer<T>.startLabel: L get() = offsetToLabel(startOffset)
 
     /**
-     * Build a new series positioned at [startOffset].
+     * Build a new series by offset positioned at [startOffset].
      */
-    public fun series(size: Int, startOffset: Int = 0, block: A.(label: L) -> T): Series<T> {
-        return elementAlgebra.bufferFactory(size) {
-            val index = it + startOffset
-            elementAlgebra.block(offsetToLabel(index))
-        }.moveTo(startOffset)
-    }
+    public inline fun seriesByOffset(
+        size: Int,
+        startOffset: Int = 0,
+        crossinline block: A.(offset: Int) -> T,
+    ): Series<T> = elementAlgebra.bufferFactory(size) {
+        elementAlgebra.block(it + startOffset)
+    }.moveTo(startOffset)
+
+    /**
+     * Build a new series by label positioned at [startOffset].
+     */
+    public inline fun series(size: Int, startOffset: Int = 0, crossinline block: A.(label: L) -> T): Series<T> =
+        seriesByOffset(size, startOffset) { offset -> block(offsetToLabel(offset)) }
 
     /**
      * Get a label buffer for given buffer.
@@ -129,18 +136,24 @@ public open class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>
     /**
      * Try to resolve element by label and return null if element with a given label is not found
      */
-    public operator fun Buffer<T>.get(label: L): T? {
+    public open fun Buffer<T>.getByLabelOrNull(label: L): T? {
         val index = labels.indexOf(label)
         if (index == -1) return null
         return getByOffset(index + startOffset)
     }
 
+    /**
+     * Get value by label (rounded down) or throw [IndexOutOfBoundsException] if the value is outside series boundaries.
+     */
+    public open fun Buffer<T>.getByLabel(label: L): T = getByLabelOrNull(label)
+        ?: throw IndexOutOfBoundsException("Label $label is not in ${labels.first()}..${labels.last()}")
+
     /**
      * Map a series to another series of the same size
      */
     public inline fun Buffer<T>.map(crossinline transform: A.(T) -> T): Series<T> {
         val buf = elementAlgebra.bufferFactory(size) {
-            elementAlgebra.transform(getByOffset(it))
+            elementAlgebra.transform(get(it))
         }
         return buf.moveTo(offsetIndices.first)
     }
@@ -178,12 +191,12 @@ public open class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>
         crossinline operation: A.(left: T, right: T) -> T,
     ): Series<T> {
         val newRange = offsetIndices.intersect(other.offsetIndices)
-        return elementAlgebra.bufferFactory(newRange.size) {
+        return seriesByOffset(startOffset = newRange.first, size = newRange.last - newRange.first) { offset ->
             elementAlgebra.operation(
-                getByOffset(it),
-                other.getByOffset(it)
+                getByOffset(offset),
+                other.getByOffset(offset)
             )
-        }.moveTo(newRange.first)
+        }
     }
 
     override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/resampling.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/resampling.kt
new file mode 100644
index 000000000..dc21fe6d9
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/resampling.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.series
+
+import space.kscience.kmath.operations.BufferAlgebra
+import space.kscience.kmath.operations.Ring
+import space.kscience.kmath.operations.sumWithGroupOf
+
+public fun <T, A : Ring<T>, BA : BufferAlgebra<T, A>, L : Comparable<L>> MonotonicSeriesAlgebra<T, A, BA, L>.import(
+    data: List<Pair<L, T>>,
+): Series<T> {
+    val groupedData: Map<Int, List<Pair<L, T>>> = data.groupBy { floorOffset(it.first) }
+    val minIndex = groupedData.minOf { it.key }
+    val maxIndex = groupedData.maxOf { it.key }
+    return elementAlgebra.bufferFactory(maxIndex - minIndex) { relativeIndex ->
+        val index = relativeIndex + minIndex
+        groupedData[index]?.sumWithGroupOf(elementAlgebra) { it.second } ?: elementAlgebra.zero
+    }.moveTo(minIndex)
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt
index f36826c28..cce61519b 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/stat/StatisticalAlgebra.kt
@@ -1,6 +1,6 @@
 package space.kscience.kmath.stat
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.misc.sorted
 import space.kscience.kmath.operations.*
 import space.kscience.kmath.structures.Buffer
@@ -33,7 +33,7 @@ public data class KMComparisonResult<T : Comparable<T>>(val n: Int, val m: Int,
 public fun <T : Comparable<T>, A, BA : BufferAlgebra<T, A>> StatisticalAlgebra<T, A, BA>.ksComparisonStatistic(
     x: Buffer<T>,
     y: Buffer<T>,
-): KMComparisonResult<T> where A : Group<T>, A : NumericAlgebra<T> = elementAlgebra.invoke {
+): KMComparisonResult<T> where A : Group<T>, A : NumericAlgebra<T> = with(elementAlgebra) {
     // Copy and sort the sample arrays
     val sx = x.sorted()
     val sy = y.sorted()
diff --git a/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestSeries.kt b/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestSeries.kt
new file mode 100644
index 000000000..d83abb3f4
--- /dev/null
+++ b/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestSeries.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.series
+
+import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.bufferAlgebra
+import space.kscience.kmath.structures.Buffer
+import space.kscience.kmath.structures.slice
+import kotlin.math.PI
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class TestSeries {
+
+    @Test
+    fun zip() = with(Double.algebra.bufferAlgebra.seriesAlgebra()){
+        val s1 = series(100) { sin(2 * PI * it / 100) + 1.0 }
+
+        val s2 = s1.slice(20..50).moveTo(40)
+
+        val s3: Buffer<Double> = s1.zip(s2) { l, r -> l + r } //s1 + s2
+
+        assertEquals(s3.getByOffset(40),s1.getByOffset(40) + s1.getByOffset(20))
+    }
+}
\ No newline at end of file
diff --git a/kmath-symja/README.md b/kmath-symja/README.md
index a96b0e835..8672c6a71 100644
--- a/kmath-symja/README.md
+++ b/kmath-symja/README.md
@@ -6,7 +6,7 @@ Symja integration module
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-symja:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-symja:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-symja:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-symja:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-symja:0.3.1-dev-1")
+    implementation("space.kscience:kmath-symja:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-tensorflow/README.md b/kmath-tensorflow/README.md
index 83f2eb315..a5b48de4d 100644
--- a/kmath-tensorflow/README.md
+++ b/kmath-tensorflow/README.md
@@ -6,7 +6,7 @@ Google tensorflow connector
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensorflow:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-tensorflow:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensorflow:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-tensorflow:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensorflow:0.3.1-dev-1")
+    implementation("space.kscience:kmath-tensorflow:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
index 27a20aafe..41c7c0b68 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowAlgebra.kt
@@ -10,9 +10,9 @@ import org.tensorflow.Output
 import org.tensorflow.ndarray.NdArray
 import org.tensorflow.op.core.Constant
 import org.tensorflow.types.TFloat64
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Symbol
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
diff --git a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
index bc5fb9616..73b36cd67 100644
--- a/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
+++ b/kmath-tensorflow/src/main/kotlin/space/kscience/kmath/tensorflow/TensorFlowAlgebra.kt
@@ -17,9 +17,9 @@ import org.tensorflow.op.core.*
 import org.tensorflow.types.TInt32
 import org.tensorflow.types.family.TNumber
 import org.tensorflow.types.family.TType
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnsafeKMathAPI
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnsafeKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.nd.asArray
diff --git a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
index af754f841..730feede6 100644
--- a/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
+++ b/kmath-tensorflow/src/test/kotlin/space/kscience/kmath/tensorflow/DoubleTensorFlowOps.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.tensorflow
 
 import org.junit.jupiter.api.Test
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.get
 import space.kscience.kmath.nd.structureND
diff --git a/kmath-tensors/README.md b/kmath-tensors/README.md
index 4208cd83d..80f751ffe 100644
--- a/kmath-tensors/README.md
+++ b/kmath-tensors/README.md
@@ -9,7 +9,7 @@ Common linear algebra operations on tensors.
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-tensors:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-tensors:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-tensors:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-tensors:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -30,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-tensors:0.3.1-dev-1")
+    implementation("space.kscience:kmath-tensors:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
index f337a2175..7db91722f 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BroadcastDoubleTensorAlgebra.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureND
 import space.kscience.kmath.structures.DoubleBuffer
 import space.kscience.kmath.tensors.api.Tensor
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
index a7283e4c8..eaec43e2c 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/BufferedTensor.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.RowStrides
 import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.Strides
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
index 4eed7a2a8..d2c2e9d5d 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor.kt
@@ -5,9 +5,10 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
-import space.kscience.kmath.nd.*
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
+import space.kscience.kmath.nd.MutableStructureNDOfDouble
+import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.structures.*
 import space.kscience.kmath.tensors.core.internal.toPrettyString
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor1D.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor1D.kt
index e74f73800..d2066e404 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor1D.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor1D.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.MutableStructure1D
 import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.structures.MutableBuffer
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor2D.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor2D.kt
index 7c84b91e1..fa142afa0 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor2D.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensor2D.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.MutableStructure2D
 import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.nd.linearSize
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
index 997c0a316..70a3ef7e2 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/DoubleTensorAlgebra.kt
@@ -8,8 +8,7 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleBufferOps
 import space.kscience.kmath.operations.DoubleField
@@ -18,7 +17,10 @@ import space.kscience.kmath.tensors.api.AnalyticTensorAlgebra
 import space.kscience.kmath.tensors.api.LinearOpsTensorAlgebra
 import space.kscience.kmath.tensors.api.Tensor
 import space.kscience.kmath.tensors.core.internal.*
-import kotlin.math.*
+import kotlin.math.abs
+import kotlin.math.ceil
+import kotlin.math.floor
+import kotlin.math.sqrt
 
 /**
  * Implementation of basic operations over double tensors and basic algebra operations on them.
@@ -349,7 +351,6 @@ public open class DoubleTensorAlgebra :
      * @param other tensor to be multiplied.
      * @return a mathematical product of two tensors.
      */
-    @UnstableKMathAPI
     public infix fun StructureND<Double>.matmul(other: StructureND<Double>): DoubleTensor {
         if (shape.size == 1 && other.shape.size == 1) {
             return DoubleTensor(ShapeND(1), DoubleBuffer(times(other).sum()))
@@ -411,7 +412,7 @@ public open class DoubleTensorAlgebra :
     }
 
     override fun StructureND<Double>.dot(other: StructureND<Double>): DoubleTensor {
-        return if (dimension in 0..2 && other.dimension in 0..2) matmul(other)
+        return if (dimension in 0..2 && other.dimension in 0..2) this.matmul(other)
         else error("Only vectors and matrices are allowed in non-broadcasting dot operation")
     }
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
index a77c4de4c..f028e2cbb 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensor.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.ShapeND
 import space.kscience.kmath.structures.*
 
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
index 429b3ffa9..d1cdc68d4 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/IntTensorAlgebra.kt
@@ -8,7 +8,7 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.IntRing
 import space.kscience.kmath.structures.*
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
index 0b0325a85..1e87e6620 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/broadcastUtils.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core.internal
 
-import space.kscience.kmath.misc.UnsafeKMathAPI
+import space.kscience.kmath.UnsafeKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.structures.asBuffer
 import space.kscience.kmath.tensors.core.DoubleTensor
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
index 91fcc90ee..2709ac474 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/internal/utils.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core.internal
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.asList
 import space.kscience.kmath.nd.last
 import space.kscience.kmath.operations.DoubleBufferOps.Companion.map
diff --git a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
index 1733c1a7e..e2b7c23e6 100644
--- a/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
+++ b/kmath-tensors/src/commonMain/kotlin/space/kscience/kmath/tensors/core/tensorAlgebraExtensions.kt
@@ -7,7 +7,7 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.ShapeND
 import kotlin.jvm.JvmName
 
diff --git a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
index d01ae124b..811fc1117 100644
--- a/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
+++ b/kmath-tensors/src/commonTest/kotlin/space/kscience/kmath/tensors/core/TestDoubleTensor.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.tensors.core
 
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.invoke
 import space.kscience.kmath.structures.DoubleBuffer
@@ -16,6 +16,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
+@OptIn(PerformancePitfall::class)
 internal class TestDoubleTensor {
 
     @Test
diff --git a/kmath-viktor/README.md b/kmath-viktor/README.md
index abff20427..8a781af4c 100644
--- a/kmath-viktor/README.md
+++ b/kmath-viktor/README.md
@@ -6,7 +6,7 @@ Binding for https://github.com/JetBrains-Research/viktor
 
 ## Artifact:
 
-The Maven coordinates of this project are `space.kscience:kmath-viktor:0.3.1-dev-1`.
+The Maven coordinates of this project are `space.kscience:kmath-viktor:0.4.0-dev-1`.
 
 **Gradle Groovy:**
 ```groovy
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'space.kscience:kmath-viktor:0.3.1-dev-1'
+    implementation 'space.kscience:kmath-viktor:0.4.0-dev-1'
 }
 ```
 **Gradle Kotlin DSL:**
@@ -27,6 +27,6 @@ repositories {
 }
 
 dependencies {
-    implementation("space.kscience:kmath-viktor:0.3.1-dev-1")
+    implementation("space.kscience:kmath-viktor:0.4.0-dev-1")
 }
 ```
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
index 8533c9d32..8c7d6d199 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorFieldOpsND.kt
@@ -8,9 +8,9 @@
 package space.kscience.kmath.viktor
 
 import org.jetbrains.bio.viktor.F64Array
-import space.kscience.kmath.misc.PerformancePitfall
-import space.kscience.kmath.misc.UnsafeKMathAPI
-import space.kscience.kmath.misc.UnstableKMathAPI
+import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnsafeKMathAPI
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.ExtendedFieldOps
diff --git a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
index 085790355..7c0c02086 100644
--- a/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
+++ b/kmath-viktor/src/main/kotlin/space/kscience/kmath/viktor/ViktorStructureND.kt
@@ -6,7 +6,7 @@
 package space.kscience.kmath.viktor
 
 import org.jetbrains.bio.viktor.F64Array
-import space.kscience.kmath.misc.PerformancePitfall
+import space.kscience.kmath.PerformancePitfall
 import space.kscience.kmath.nd.ColumnStrides
 import space.kscience.kmath.nd.MutableStructureND
 import space.kscience.kmath.nd.ShapeND
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index b860a62ec..31c57aca7 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -6,6 +6,7 @@ kscience{
     jvm()
     js()
     native()
+//    wasm()
 }
 
 kotlin.sourceSets {
-- 
2.34.1


From b2746e5c0ef6c31d89640f6cfe7f41e3c2c74930 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 9 Apr 2023 10:55:58 +0300
Subject: [PATCH 690/713] Wasm support

---
 CHANGELOG.md                                  |   1 +
 build.gradle.kts                              |  14 +--
 .../space/kscience/kmath/ast/TypedMst.kt      |   5 -
 .../kscience/kmath/ast/evaluateConstants.kt   |   2 -
 .../ast/rendering/LatexSyntaxRenderer.kt      |   3 -
 .../ast/rendering/MathMLSyntaxRenderer.kt     |   3 -
 .../kmath/ast/rendering/MathRenderer.kt       |   4 -
 .../kmath/ast/rendering/MathSyntax.kt         |  25 -----
 .../kmath/ast/rendering/SyntaxRenderer.kt     |   4 -
 .../kscience/kmath/ast/rendering/features.kt  |  22 ----
 .../kscience/kmath/ast/rendering/phases.kt    |   5 -
 kmath-complex/build.gradle.kts                |  22 ++++
 kmath-core/build.gradle.kts                   |  22 +++-
 .../space/kscience/kmath/misc/PermSortTest.kt |   2 +
 .../kmath/structures/NumberNDFieldTest.kt     |   1 +
 kmath-coroutines/build.gradle.kts             |   1 +
 kmath-functions/build.gradle.kts              |  30 +++--
 kmath-geometry/build.gradle.kts               |   5 +
 .../kscience/kmath/jupyter/KMathJupyter.kt    |   2 +
 kmath-memory/build.gradle.kts                 |  18 ++-
 .../space/kscience/kmath/memory/MemoryTest.kt |  37 +++++++
 .../kscience/kmath/memory/ByteBufferMemory.kt |   5 +-
 .../kmath/memory/WasmDataViewMemory.kt        | 103 ++++++++++++++++++
 .../space/kscience/kmath/memory/WasmMemory.kt |  66 -----------
 .../kmath/optimization/OptimizationBuilder.kt |   3 +
 kmath-stat/build.gradle.kts                   |   2 +-
 test-utils/build.gradle.kts                   |   2 +-
 27 files changed, 242 insertions(+), 167 deletions(-)
 create mode 100644 kmath-memory/src/commonTest/kotlin/space/kscience/kmath/memory/MemoryTest.kt
 create mode 100644 kmath-memory/src/wasmMain/kotlin/space/kscience/kmath/memory/WasmDataViewMemory.kt
 delete mode 100644 kmath-memory/src/wasmMain/kotlin/space/kscience/kmath/memory/WasmMemory.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d4e6123b..08b72f0d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 ### Added
+- Wasm support for `memory`, `core`, `complex` and `functions` modules.
 - Generic builders for `BufferND` and `MutableBufferND`
 - `NamedMatrix` - matrix with symbol-based indexing
 - `Expression` with default arguments
diff --git a/build.gradle.kts b/build.gradle.kts
index 2eea9c47b..ec67eaa54 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.4.0-dev-1"
+    version = "0.3.1-dev-RC"
 }
 
 subprojects {
@@ -55,18 +55,6 @@ subprojects {
             }
         }
     }
-
-    plugins.withId("org.jetbrains.kotlin.multiplatform") {
-        configure<org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension> {
-            sourceSets {
-                val commonTest by getting {
-                    dependencies {
-                        implementation(projects.testUtils)
-                    }
-                }
-            }
-        }
-    }
 }
 
 readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md")
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt
index e211259af..e82f7a3ab 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/TypedMst.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.ast
 
-import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.Algebra
@@ -16,7 +15,6 @@ import space.kscience.kmath.operations.NumericAlgebra
  *
  * @param T the type.
  */
-@UnstableKMathAPI
 public sealed interface TypedMst<T> {
     /**
      * A node containing a unary operation.
@@ -133,7 +131,6 @@ public sealed interface TypedMst<T> {
 /**
  * Interprets the [TypedMst] node with this [Algebra] and [arguments].
  */
-@UnstableKMathAPI
 public fun <T> TypedMst<T>.interpret(algebra: Algebra<T>, arguments: Map<Symbol, T>): T = when (this) {
     is TypedMst.Unary -> algebra.unaryOperation(operation, interpret(algebra, arguments))
 
@@ -158,7 +155,6 @@ public fun <T> TypedMst<T>.interpret(algebra: Algebra<T>, arguments: Map<Symbol,
 /**
  * Interprets the [TypedMst] node with this [Algebra] and optional [arguments].
  */
-@UnstableKMathAPI
 public fun <T> TypedMst<T>.interpret(algebra: Algebra<T>, vararg arguments: Pair<Symbol, T>): T = interpret(
     algebra,
     when (arguments.size) {
@@ -171,7 +167,6 @@ public fun <T> TypedMst<T>.interpret(algebra: Algebra<T>, vararg arguments: Pair
 /**
  * Interpret this [TypedMst] node as expression.
  */
-@UnstableKMathAPI
 public fun <T : Any> TypedMst<T>.toExpression(algebra: Algebra<T>): Expression<T> = Expression { arguments ->
     interpret(algebra, arguments)
 }
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt
index fb0c9b872..8fc5a6aaf 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/evaluateConstants.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.ast
 
-import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.Algebra
@@ -15,7 +14,6 @@ import space.kscience.kmath.operations.bindSymbolOrNull
 /**
  * Evaluates constants in given [MST] for given [algebra] at the same time with converting to [TypedMst].
  */
-@UnstableKMathAPI
 public fun <T> MST.evaluateConstants(algebra: Algebra<T>): TypedMst<T> = when (this) {
     is MST.Numeric -> TypedMst.Constant(
         (algebra as? NumericAlgebra<T>)?.number(value) ?: error("Numeric nodes are not supported by $algebra"),
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
index 50162a4f5..5a338afed 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/LatexSyntaxRenderer.kt
@@ -5,8 +5,6 @@
 
 package space.kscience.kmath.ast.rendering
 
-import space.kscience.kmath.UnstableKMathAPI
-
 /**
  * [SyntaxRenderer] implementation for LaTeX.
  *
@@ -25,7 +23,6 @@ import space.kscience.kmath.UnstableKMathAPI
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public object LatexSyntaxRenderer : SyntaxRenderer {
     override fun render(node: MathSyntax, output: Appendable): Unit = output.run {
         fun render(syntax: MathSyntax) = render(syntax, output)
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
index bb49c5df4..bfd9aeef9 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathMLSyntaxRenderer.kt
@@ -5,8 +5,6 @@
 
 package space.kscience.kmath.ast.rendering
 
-import space.kscience.kmath.UnstableKMathAPI
-
 /**
  * [SyntaxRenderer] implementation for MathML.
  *
@@ -14,7 +12,6 @@ import space.kscience.kmath.UnstableKMathAPI
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public object MathMLSyntaxRenderer : SyntaxRenderer {
     override fun render(node: MathSyntax, output: Appendable) {
         output.append("<math xmlns=\"https://www.w3.org/1998/Math/MathML\"><mrow>")
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
index afa25febe..f88a5b319 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathRenderer.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.ast.rendering
 
-import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.MST
 
 /**
@@ -13,7 +12,6 @@ import space.kscience.kmath.expressions.MST
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public fun interface MathRenderer {
     /**
      * Renders [MST] to [MathSyntax].
@@ -27,7 +25,6 @@ public fun interface MathRenderer {
  * @property features The applied features.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public open class FeaturedMathRenderer(public val features: List<RenderFeature>) : MathRenderer {
     override fun render(mst: MST): MathSyntax {
         for (feature in features) feature.render(this, mst)?.let { return it }
@@ -51,7 +48,6 @@ public open class FeaturedMathRenderer(public val features: List<RenderFeature>)
  * @property stages The applied stages.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public open class FeaturedMathRendererWithPostProcess(
     features: List<RenderFeature>,
     public val stages: List<PostProcessPhase>,
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
index 887469164..0196be3b6 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/MathSyntax.kt
@@ -5,14 +5,11 @@
 
 package space.kscience.kmath.ast.rendering
 
-import space.kscience.kmath.UnstableKMathAPI
-
 /**
  * Syntax node for mathematical typography.
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public sealed class MathSyntax {
     /**
      * The parent node of this syntax node.
@@ -25,7 +22,6 @@ public sealed class MathSyntax {
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public sealed class TerminalSyntax : MathSyntax()
 
 /**
@@ -33,7 +29,6 @@ public sealed class TerminalSyntax : MathSyntax()
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public sealed class OperationSyntax : MathSyntax() {
     /**
      * The operation token.
@@ -46,7 +41,6 @@ public sealed class OperationSyntax : MathSyntax() {
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public sealed class UnarySyntax : OperationSyntax() {
     /**
      * The operand of this node.
@@ -59,7 +53,6 @@ public sealed class UnarySyntax : OperationSyntax() {
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public sealed class BinarySyntax : OperationSyntax() {
     /**
      * The left-hand side operand.
@@ -78,7 +71,6 @@ public sealed class BinarySyntax : OperationSyntax() {
  * @property string The digits of number.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class NumberSyntax(public var string: String) : TerminalSyntax()
 
 /**
@@ -87,7 +79,6 @@ public data class NumberSyntax(public var string: String) : TerminalSyntax()
  * @property string The symbol.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class SymbolSyntax(public var string: String) : TerminalSyntax()
 
 /**
@@ -98,7 +89,6 @@ public data class SymbolSyntax(public var string: String) : TerminalSyntax()
  * @see UnaryOperatorSyntax
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class OperatorNameSyntax(public var name: String) : TerminalSyntax()
 
 /**
@@ -107,7 +97,6 @@ public data class OperatorNameSyntax(public var name: String) : TerminalSyntax()
  * @property kind The kind of symbol.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class SpecialSymbolSyntax(public var kind: Kind) : TerminalSyntax() {
     /**
      * The kind of symbol.
@@ -132,7 +121,6 @@ public data class SpecialSymbolSyntax(public var kind: Kind) : TerminalSyntax()
  * @property parentheses Whether the operand should be wrapped with parentheses.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class OperandSyntax(
     public val operand: MathSyntax,
     public var parentheses: Boolean,
@@ -148,7 +136,6 @@ public data class OperandSyntax(
  * @property prefix The prefix.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class UnaryOperatorSyntax(
     override val operation: String,
     public var prefix: MathSyntax,
@@ -164,7 +151,6 @@ public data class UnaryOperatorSyntax(
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class UnaryPlusSyntax(
     override val operation: String,
     override val operand: OperandSyntax,
@@ -179,7 +165,6 @@ public data class UnaryPlusSyntax(
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class UnaryMinusSyntax(
     override val operation: String,
     override val operand: OperandSyntax,
@@ -195,7 +180,6 @@ public data class UnaryMinusSyntax(
  * @property operand The radicand.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class RadicalSyntax(
     override val operation: String,
     override val operand: MathSyntax,
@@ -213,7 +197,6 @@ public data class RadicalSyntax(
  * (*e<sup>x</sup>*).
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class ExponentSyntax(
     override val operation: String,
     override val operand: OperandSyntax,
@@ -231,7 +214,6 @@ public data class ExponentSyntax(
  * @property right The superscript.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class SuperscriptSyntax(
     override val operation: String,
     override val left: MathSyntax,
@@ -250,7 +232,6 @@ public data class SuperscriptSyntax(
  * @property right The subscript.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class SubscriptSyntax(
     override val operation: String,
     override val left: MathSyntax,
@@ -268,7 +249,6 @@ public data class SubscriptSyntax(
  * @property prefix The prefix.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class BinaryOperatorSyntax(
     override val operation: String,
     public var prefix: MathSyntax,
@@ -288,7 +268,6 @@ public data class BinaryOperatorSyntax(
  * @param right The addend.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class BinaryPlusSyntax(
     override val operation: String,
     override val left: OperandSyntax,
@@ -307,7 +286,6 @@ public data class BinaryPlusSyntax(
  * @param right The subtrahend.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class BinaryMinusSyntax(
     override val operation: String,
     override val left: OperandSyntax,
@@ -327,7 +305,6 @@ public data class BinaryMinusSyntax(
  * @property infix Whether infix (*1 / 2*) or normal (*&frac12;*) fraction should be made.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class FractionSyntax(
     override val operation: String,
     override val left: OperandSyntax,
@@ -347,7 +324,6 @@ public data class FractionSyntax(
  * @property right The radicand.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class RadicalWithIndexSyntax(
     override val operation: String,
     override val left: MathSyntax,
@@ -367,7 +343,6 @@ public data class RadicalWithIndexSyntax(
  * @property times Whether the times (&times;) symbol should be used.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public data class MultiplicationSyntax(
     override val operation: String,
     override val left: OperandSyntax,
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
index 7669be664..16957bdd2 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/SyntaxRenderer.kt
@@ -5,15 +5,12 @@
 
 package space.kscience.kmath.ast.rendering
 
-import space.kscience.kmath.UnstableKMathAPI
-
 /**
  * Abstraction of writing [MathSyntax] as a string of an actual markup language. Typical implementation should
  * involve traversal of MathSyntax with handling each subtype.
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public fun interface SyntaxRenderer {
     /**
      * Renders the [MathSyntax] to [output].
@@ -26,7 +23,6 @@ public fun interface SyntaxRenderer {
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public fun SyntaxRenderer.renderWithStringBuilder(node: MathSyntax): String {
     val sb = StringBuilder()
     render(node, sb)
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
index 8bb7e3585..4deffc83c 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/features.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.ast.rendering
 
-import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.ast.rendering.FeaturedMathRenderer.RenderFeature
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.Symbol
@@ -17,7 +16,6 @@ import kotlin.reflect.KClass
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public val PrintSymbol: RenderFeature = RenderFeature { _, node ->
     if (node !is Symbol) null
     else SymbolSyntax(string = node.identity)
@@ -28,7 +26,6 @@ public val PrintSymbol: RenderFeature = RenderFeature { _, node ->
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public val PrintNumeric: RenderFeature = RenderFeature { _, node ->
     if (node !is MST.Numeric)
         null
@@ -36,7 +33,6 @@ public val PrintNumeric: RenderFeature = RenderFeature { _, node ->
         NumberSyntax(string = node.value.toString())
 }
 
-@UnstableKMathAPI
 private fun printSignedNumberString(s: String): MathSyntax = if (s.startsWith('-'))
     UnaryMinusSyntax(
         operation = GroupOps.MINUS_OPERATION,
@@ -55,7 +51,6 @@ else
  * @property types The suitable types.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class PrettyPrintFloats(public val types: Set<KClass<out Number>>) : RenderFeature {
     override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? {
         if (node !is MST.Numeric || node.value::class !in types) return null
@@ -115,7 +110,6 @@ public class PrettyPrintFloats(public val types: Set<KClass<out Number>>) : Rend
  * @property types The suitable types.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class PrettyPrintIntegers(public val types: Set<KClass<out Number>>) : RenderFeature {
     override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? =
         if (node !is MST.Numeric || node.value::class !in types)
@@ -138,7 +132,6 @@ public class PrettyPrintIntegers(public val types: Set<KClass<out Number>>) : Re
  * @property symbols The allowed symbols.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class PrettyPrintPi(public val symbols: Set<String>) : RenderFeature {
     override fun render(renderer: FeaturedMathRenderer, node: MST): MathSyntax? =
         if (node !is Symbol || node.identity !in symbols)
@@ -161,7 +154,6 @@ public class PrettyPrintPi(public val symbols: Set<String>) : RenderFeature {
  * @param operations the allowed operations. If `null`, any operation is accepted.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public abstract class Unary(public val operations: Collection<String>?) : RenderFeature {
     /**
      * The actual render function specialized for [MST.Unary].
@@ -182,7 +174,6 @@ public abstract class Unary(public val operations: Collection<String>?) : Render
  * @property operations the allowed operations. If `null`, any operation is accepted.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public abstract class Binary(public val operations: Collection<String>?) : RenderFeature {
     /**
      * The actual render function specialized for [MST.Binary].
@@ -200,7 +191,6 @@ public abstract class Binary(public val operations: Collection<String>?) : Rende
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class BinaryPlus(operations: Collection<String>?) : Binary(operations) {
     override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         BinaryPlusSyntax(
@@ -222,7 +212,6 @@ public class BinaryPlus(operations: Collection<String>?) : Binary(operations) {
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class BinaryMinus(operations: Collection<String>?) : Binary(operations) {
     override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         BinaryMinusSyntax(
@@ -244,7 +233,6 @@ public class BinaryMinus(operations: Collection<String>?) : Binary(operations) {
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class UnaryPlus(operations: Collection<String>?) : Unary(operations) {
     override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = UnaryPlusSyntax(
         operation = node.operation,
@@ -264,7 +252,6 @@ public class UnaryPlus(operations: Collection<String>?) : Unary(operations) {
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class UnaryMinus(operations: Collection<String>?) : Unary(operations) {
     override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = UnaryMinusSyntax(
         operation = node.operation,
@@ -284,7 +271,6 @@ public class UnaryMinus(operations: Collection<String>?) : Unary(operations) {
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class Fraction(operations: Collection<String>?) : Binary(operations) {
     override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax = FractionSyntax(
         operation = node.operation,
@@ -306,7 +292,6 @@ public class Fraction(operations: Collection<String>?) : Binary(operations) {
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class BinaryOperator(operations: Collection<String>?) : Binary(operations) {
     override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         BinaryOperatorSyntax(
@@ -329,7 +314,6 @@ public class BinaryOperator(operations: Collection<String>?) : Binary(operations
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class UnaryOperator(operations: Collection<String>?) : Unary(operations) {
     override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
         UnaryOperatorSyntax(
@@ -351,7 +335,6 @@ public class UnaryOperator(operations: Collection<String>?) : Unary(operations)
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class Power(operations: Collection<String>?) : Binary(operations) {
     override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         SuperscriptSyntax(
@@ -371,7 +354,6 @@ public class Power(operations: Collection<String>?) : Binary(operations) {
 /**
  * Handles binary nodes by producing [RadicalSyntax] with no index.
  */
-@UnstableKMathAPI
 public class SquareRoot(operations: Collection<String>?) : Unary(operations) {
     override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
         RadicalSyntax(operation = node.operation, operand = parent.render(node.value))
@@ -389,7 +371,6 @@ public class SquareRoot(operations: Collection<String>?) : Unary(operations) {
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class Exponent(operations: Collection<String>?) : Unary(operations) {
     override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax = ExponentSyntax(
         operation = node.operation,
@@ -410,7 +391,6 @@ public class Exponent(operations: Collection<String>?) : Unary(operations) {
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class Multiplication(operations: Collection<String>?) : Binary(operations) {
     override fun renderBinary(parent: FeaturedMathRenderer, node: MST.Binary): MathSyntax =
         MultiplicationSyntax(
@@ -433,7 +413,6 @@ public class Multiplication(operations: Collection<String>?) : Binary(operations
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class InverseTrigonometricOperations(operations: Collection<String>?) : Unary(operations) {
     override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
         UnaryOperatorSyntax(
@@ -460,7 +439,6 @@ public class InverseTrigonometricOperations(operations: Collection<String>?) : U
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class InverseHyperbolicOperations(operations: Collection<String>?) : Unary(operations) {
     override fun renderUnary(parent: FeaturedMathRenderer, node: MST.Unary): MathSyntax =
         UnaryOperatorSyntax(
diff --git a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
index 2399e8f68..0d26621d3 100644
--- a/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
+++ b/kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/rendering/phases.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.ast.rendering
 
-import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.ast.rendering.FeaturedMathRendererWithPostProcess.PostProcessPhase
 import space.kscience.kmath.operations.FieldOps
 import space.kscience.kmath.operations.GroupOps
@@ -17,7 +16,6 @@ import space.kscience.kmath.operations.RingOps
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public val BetterMultiplication: PostProcessPhase = PostProcessPhase { node ->
     fun perform(node: MathSyntax): Unit = when (node) {
         is NumberSyntax -> Unit
@@ -91,7 +89,6 @@ public val BetterMultiplication: PostProcessPhase = PostProcessPhase { node ->
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public val BetterFraction: PostProcessPhase = PostProcessPhase { node ->
     fun perform(node: MathSyntax, infix: Boolean = false): Unit = when (node) {
         is NumberSyntax -> Unit
@@ -162,7 +159,6 @@ public val BetterFraction: PostProcessPhase = PostProcessPhase { node ->
  *
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public val BetterExponent: PostProcessPhase = PostProcessPhase { node ->
     fun perform(node: MathSyntax): Boolean {
         return when (node) {
@@ -202,7 +198,6 @@ public val BetterExponent: PostProcessPhase = PostProcessPhase { node ->
  * @property precedenceFunction Returns the precedence number for syntax node. Higher number is lower priority.
  * @author Iaroslav Postovalov
  */
-@UnstableKMathAPI
 public class SimplifyParentheses(public val precedenceFunction: (MathSyntax) -> Int) :
     PostProcessPhase {
     override fun perform(node: MathSyntax): Unit = when (node) {
diff --git a/kmath-complex/build.gradle.kts b/kmath-complex/build.gradle.kts
index 76d5a4c9a..0611e9aae 100644
--- a/kmath-complex/build.gradle.kts
+++ b/kmath-complex/build.gradle.kts
@@ -7,9 +7,31 @@ kscience {
     js()
     native()
 
+    wasm{
+        browser {
+            testTask {
+                useKarma {
+                    this.webpackConfig.experiments.add("topLevelAwait")
+                    useChromeHeadless()
+                    useConfigDirectory(project.projectDir.resolve("karma.config.d").resolve("wasm"))
+                }
+            }
+        }
+    }
+
+    wasmTest{
+        dependencies {
+            implementation(kotlin("test"))
+        }
+    }
+
     dependencies {
         api(projects.kmathCore)
     }
+
+    testDependencies {
+        implementation(projects.testUtils)
+    }
 }
 
 readme {
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index b6a955b12..08411be59 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -6,11 +6,31 @@ kscience{
     jvm()
     js()
     native()
-//    wasm()
+    wasm{
+        browser {
+            testTask {
+                useKarma {
+                    this.webpackConfig.experiments.add("topLevelAwait")
+                    useChromeHeadless()
+                    useConfigDirectory(project.projectDir.resolve("karma.config.d").resolve("wasm"))
+                }
+            }
+        }
+    }
+
+    wasmTest{
+        dependencies {
+            implementation(kotlin("test"))
+        }
+    }
 
     dependencies {
         api(projects.kmathMemory)
     }
+
+    testDependencies {
+        implementation(projects.testUtils)
+    }
 }
 
 kotlin.sourceSets {
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
index 4f3469ea2..dd97df1e8 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/misc/PermSortTest.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.misc
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.misc.PermSortTest.Platform.*
 import space.kscience.kmath.structures.IntBuffer
 import space.kscience.kmath.structures.asBuffer
@@ -14,6 +15,7 @@ import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
+@OptIn(UnstableKMathAPI::class)
 class PermSortTest {
 
     private enum class Platform {
diff --git a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
index 1572db816..993fb089f 100644
--- a/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
+++ b/kmath-core/src/commonTest/kotlin/space/kscience/kmath/structures/NumberNDFieldTest.kt
@@ -22,6 +22,7 @@ import kotlin.math.pow
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
+@OptIn(PerformancePitfall::class)
 @Suppress("UNUSED_VARIABLE")
 class NumberNDFieldTest {
     val algebra = DoubleField.ndAlgebra
diff --git a/kmath-coroutines/build.gradle.kts b/kmath-coroutines/build.gradle.kts
index 9d5cfabe4..1e901ca98 100644
--- a/kmath-coroutines/build.gradle.kts
+++ b/kmath-coroutines/build.gradle.kts
@@ -6,6 +6,7 @@ kscience {
     jvm()
     js()
     native()
+
     dependencies {
         api(project(":kmath-core"))
         api(project(":kmath-complex"))
diff --git a/kmath-functions/build.gradle.kts b/kmath-functions/build.gradle.kts
index 08e76aef0..acabd1eb9 100644
--- a/kmath-functions/build.gradle.kts
+++ b/kmath-functions/build.gradle.kts
@@ -6,18 +6,32 @@ kscience{
     jvm()
     js()
     native()
+
+    wasm{
+        browser {
+            testTask {
+                useKarma {
+                    this.webpackConfig.experiments.add("topLevelAwait")
+                    useChromeHeadless()
+                    useConfigDirectory(project.projectDir.resolve("karma.config.d").resolve("wasm"))
+                }
+            }
+        }
+    }
+
+    wasmTest{
+        dependencies {
+            implementation(kotlin("test"))
+        }
+    }
+
+    dependencies {
+        api(projects.kmathCore)
+    }
 }
 
 description = "Functions, integration and interpolation"
 
-kotlin.sourceSets {
-    commonMain {
-        dependencies {
-            api(project(":kmath-core"))
-        }
-    }
-}
-
 dependencies {
     dokkaPlugin("org.jetbrains.dokka:mathjax-plugin:${spclibs.versions.dokka.get()}")
 }
diff --git a/kmath-geometry/build.gradle.kts b/kmath-geometry/build.gradle.kts
index f248a1717..32926db7e 100644
--- a/kmath-geometry/build.gradle.kts
+++ b/kmath-geometry/build.gradle.kts
@@ -12,6 +12,11 @@ kscience{
     dependencies{
         api(projects.kmath.kmathComplex)
     }
+
+    testDependencies {
+        implementation(projects.testUtils)
+    }
+
 }
 
 readme {
diff --git a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
index 2d32dd609..944666c9e 100644
--- a/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
+++ b/kmath-jupyter/src/main/kotlin/space/kscience/kmath/jupyter/KMathJupyter.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlinx.jupyter.api.DisplayResult
 import org.jetbrains.kotlinx.jupyter.api.HTML
 import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
 import space.kscience.kmath.PerformancePitfall
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.ast.rendering.FeaturedMathRendererWithPostProcess
 import space.kscience.kmath.ast.rendering.MathMLSyntaxRenderer
 import space.kscience.kmath.ast.rendering.renderWithStringBuilder
@@ -30,6 +31,7 @@ import space.kscience.kmath.structures.Buffer
  */
 public fun Number.toMst(): MST.Numeric = MST.Numeric(this)
 
+@OptIn(UnstableKMathAPI::class)
 internal class KMathJupyter : JupyterIntegration() {
     private val mathRender = FeaturedMathRendererWithPostProcess.Default
     private val syntaxRender = MathMLSyntaxRenderer
diff --git a/kmath-memory/build.gradle.kts b/kmath-memory/build.gradle.kts
index d8af1e3a2..4e5370c0f 100644
--- a/kmath-memory/build.gradle.kts
+++ b/kmath-memory/build.gradle.kts
@@ -6,7 +6,23 @@ kscience {
     jvm()
     js()
     native()
-//    wasm()
+    wasm{
+        browser {
+            testTask {
+                useKarma {
+                    this.webpackConfig.experiments.add("topLevelAwait")
+                    useChromeHeadless()
+                    useConfigDirectory(project.projectDir.resolve("karma.config.d").resolve("wasm"))
+                }
+            }
+        }
+    }
+
+    wasmTest{
+        dependencies {
+            implementation(kotlin("test"))
+        }
+    }
 }
 
 readme {
diff --git a/kmath-memory/src/commonTest/kotlin/space/kscience/kmath/memory/MemoryTest.kt b/kmath-memory/src/commonTest/kotlin/space/kscience/kmath/memory/MemoryTest.kt
new file mode 100644
index 000000000..3726ddbb7
--- /dev/null
+++ b/kmath-memory/src/commonTest/kotlin/space/kscience/kmath/memory/MemoryTest.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.memory
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class MemoryTest {
+    @Test
+    fun memoryWriteRead() {
+        val memorySize = 60
+        val data = buildList {
+            for (i in 0 until (memorySize / 4)) {
+                add(i)
+            }
+        }
+        val memory = Memory.allocate(memorySize)
+        memory.write {
+            for (i in 0 until (memory.size / 4)) {
+                writeInt(i*4, data[i])
+            }
+        }
+
+        val result = memory.read {
+            buildList {
+                for (i in 0 until (memory.size / 4)) {
+                    add(readInt(i*4))
+                }
+            }
+        }
+
+        assertEquals(data,result)
+    }
+}
\ No newline at end of file
diff --git a/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt b/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
index 19910a396..d022cab23 100644
--- a/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
+++ b/kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
@@ -20,8 +20,7 @@ internal class ByteBufferMemory(
     val startOffset: Int = 0,
     override val size: Int = buffer.limit(),
 ) : Memory {
-    @Suppress("NOTHING_TO_INLINE")
-    private inline fun position(o: Int): Int = startOffset + o
+    private fun position(offset: Int): Int = startOffset + offset
 
     override fun view(offset: Int, length: Int): Memory {
         require(offset >= 0) { "offset shouldn't be negative: $offset" }
@@ -120,7 +119,7 @@ public fun ByteBuffer.asMemory(startOffset: Int = 0, size: Int = limit()): Memor
     ByteBufferMemory(this, startOffset, size)
 
 /**
- * Uses direct memory-mapped buffer from file to read something and close it afterwards.
+ * Uses direct memory-mapped buffer from file to read something and close it afterward.
  */
 @Throws(IOException::class)
 public inline fun <R> Path.readAsMemory(position: Long = 0, size: Long = Files.size(this), block: Memory.() -> R): R {
diff --git a/kmath-memory/src/wasmMain/kotlin/space/kscience/kmath/memory/WasmDataViewMemory.kt b/kmath-memory/src/wasmMain/kotlin/space/kscience/kmath/memory/WasmDataViewMemory.kt
new file mode 100644
index 000000000..0cff551fa
--- /dev/null
+++ b/kmath-memory/src/wasmMain/kotlin/space/kscience/kmath/memory/WasmDataViewMemory.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2018-2022 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.memory
+
+import org.khronos.webgl.ArrayBuffer
+import org.khronos.webgl.DataView
+import org.khronos.webgl.Int8Array
+
+private class WasmDataViewMemory(val view: DataView) : Memory {
+    override val size: Int get() = view.byteLength
+
+    override fun view(offset: Int, length: Int): Memory {
+        require(offset >= 0) { "offset shouldn't be negative: $offset" }
+        require(length >= 0) { "length shouldn't be negative: $length" }
+        require(offset + length <= size) { "Can't view memory outside the parent region." }
+
+        if (offset + length > size)
+            throw IndexOutOfBoundsException("offset + length > size: $offset + $length > $size")
+
+        return WasmDataViewMemory(DataView(view.buffer, view.byteOffset + offset, length))
+    }
+
+    override fun copy(): Memory = WasmDataViewMemory(DataView(view.buffer.slice(0)))
+
+    private val reader: MemoryReader = object : MemoryReader {
+        override val memory: Memory get() = this@WasmDataViewMemory
+
+        override fun readDouble(offset: Int): Double = view.getFloat64(offset, false)
+
+        override fun readFloat(offset: Int): Float = view.getFloat32(offset, false)
+
+        override fun readByte(offset: Int): Byte = view.getInt8(offset)
+
+        override fun readShort(offset: Int): Short = view.getInt16(offset, false)
+
+        override fun readInt(offset: Int): Int = view.getInt32(offset, false)
+
+        override fun readLong(offset: Int): Long =
+            view.getInt32(offset, false).toLong() shl 32 or view.getInt32(offset + 4, false).toLong()
+
+        override fun close() {
+            // does nothing on JS
+        }
+    }
+
+    override fun reader(): MemoryReader = reader
+
+    private val writer: MemoryWriter = object : MemoryWriter {
+        override val memory: Memory get() = this@WasmDataViewMemory
+
+        override fun writeDouble(offset: Int, value: Double) {
+            view.setFloat64(offset, value, false)
+        }
+
+        override fun writeFloat(offset: Int, value: Float) {
+            view.setFloat32(offset, value, false)
+        }
+
+        override fun writeByte(offset: Int, value: Byte) {
+            view.setInt8(offset, value)
+        }
+
+        override fun writeShort(offset: Int, value: Short) {
+            view.setUint16(offset, value, false)
+        }
+
+        override fun writeInt(offset: Int, value: Int) {
+            view.setInt32(offset, value, false)
+        }
+
+        override fun writeLong(offset: Int, value: Long) {
+            view.setInt32(offset, (value shr 32).toInt(), littleEndian = false)
+            view.setInt32(offset + 4, (value and 0xffffffffL).toInt(), littleEndian = false)
+        }
+
+        override fun close() {
+            // does nothing on JS
+        }
+    }
+
+    override fun writer(): MemoryWriter = writer
+
+}
+
+/**
+ * Allocates memory based on a [DataView].
+ */
+public actual fun Memory.Companion.allocate(length: Int): Memory {
+    val buffer = ArrayBuffer(length)
+    return WasmDataViewMemory(DataView(buffer, 0, length))
+}
+
+/**
+ * Wraps a [Memory] around existing [ByteArray]. This operation is unsafe since the array is not copied
+ * and could be mutated independently of the resulting [Memory].
+ */
+public actual fun Memory.Companion.wrap(array: ByteArray): Memory {
+    @Suppress("CAST_NEVER_SUCCEEDS") val int8Array = array as Int8Array
+    return WasmDataViewMemory(DataView(int8Array.buffer, int8Array.byteOffset, int8Array.length))
+}
diff --git a/kmath-memory/src/wasmMain/kotlin/space/kscience/kmath/memory/WasmMemory.kt b/kmath-memory/src/wasmMain/kotlin/space/kscience/kmath/memory/WasmMemory.kt
deleted file mode 100644
index 7c2be19cc..000000000
--- a/kmath-memory/src/wasmMain/kotlin/space/kscience/kmath/memory/WasmMemory.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2018-2023 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.memory
-
-import kotlin.wasm.unsafe.Pointer
-import kotlin.wasm.unsafe.UnsafeWasmMemoryApi
-
-@OptIn(UnsafeWasmMemoryApi::class)
-public class WasmMemory private constructor(
-    public val pointer: Pointer,
-    override val size: Int,
-) : Memory {
-
-    override fun view(offset: Int, length: Int): Memory {
-        TODO("Not yet implemented")
-    }
-
-    override fun copy(): Memory {
-        TODO("Not yet implemented")
-    }
-
-    override fun reader(): MemoryReader = object : MemoryReader {
-        override val memory: Memory
-            get() = this@WasmMemory
-
-        override fun readDouble(offset: Int): Double {
-            return Double.fromBits(pointer.plus(offset).loadLong())
-        }
-
-        override fun readFloat(offset: Int): Float {
-            return Float.fromBits(pointer.plus(offset).loadInt())
-        }
-
-        override fun readByte(offset: Int): Byte {
-            return pointer.plus(offset).loadByte()
-        }
-
-        override fun readShort(offset: Int): Short {
-            return pointer.plus(offset).loadShort()
-        }
-
-        override fun readInt(offset: Int): Int {
-            return pointer.plus(offset).loadInt()
-        }
-
-        override fun readLong(offset: Int): Long {
-            return pointer.plus(offset).loadLong()
-        }
-
-        override fun close() {
-            TODO()
-        }
-
-    }
-
-    override fun writer(): MemoryWriter = TODO()
-}
-
-public actual fun Memory.Companion.allocate(length: Int): Memory {
-    TODO()
-}
-
-public actual fun Memory.Companion.wrap(array: ByteArray): Memory = TODO()
\ No newline at end of file
diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
index d1ceccf1a..0459d46ee 100644
--- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
+++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/OptimizationBuilder.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.optimization
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.data.XYColumnarData
 import space.kscience.kmath.expressions.DifferentiableExpression
 import space.kscience.kmath.expressions.Symbol
@@ -69,6 +70,7 @@ public suspend fun <T> DifferentiableExpression<T>.optimizeWith(
 }
 
 
+@OptIn(UnstableKMathAPI::class)
 public class XYOptimizationBuilder(
     public val data: XYColumnarData<Double, Double, Double>,
     public val model: DifferentiableExpression<Double>,
@@ -86,6 +88,7 @@ public class XYOptimizationBuilder(
     )
 }
 
+@OptIn(UnstableKMathAPI::class)
 public fun XYOptimization(
     data: XYColumnarData<Double, Double, Double>,
     model: DifferentiableExpression<Double>,
diff --git a/kmath-stat/build.gradle.kts b/kmath-stat/build.gradle.kts
index 1426e913a..000280def 100644
--- a/kmath-stat/build.gradle.kts
+++ b/kmath-stat/build.gradle.kts
@@ -11,7 +11,7 @@ kscience{
 kotlin.sourceSets {
     commonMain {
         dependencies {
-            api(project(":kmath-coroutines"))
+            api(projects.kmathCoroutines)
             //implementation(spclibs.atomicfu)
         }
     }
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index 31c57aca7..b03059eaf 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -6,7 +6,7 @@ kscience{
     jvm()
     js()
     native()
-//    wasm()
+    wasm()
 }
 
 kotlin.sourceSets {
-- 
2.34.1


From 8ac7567afdd5c94526bf12b153d5fdf11b2a6b60 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 9 Apr 2023 11:08:39 +0300
Subject: [PATCH 691/713] Patch changelog

---
 CHANGELOG.md | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08b72f0d0..e42fe61f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,27 @@
 # KMath
 
-## [Unreleased]
+## Unreleased
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## 0.3.1-dev-RC - 2023-04-09
+
 ### Added
 - Wasm support for `memory`, `core`, `complex` and `functions` modules.
 - Generic builders for `BufferND` and `MutableBufferND`
 - `NamedMatrix` - matrix with symbol-based indexing
 - `Expression` with default arguments
 - Type-aliases for numbers like `Float64`
-- 2D optimal trajectory computation in a separate module `kmath-trajectory`
 - Autodiff for generic algebra elements in core!
 - Algebra now has an obligatory `bufferFactory` (#477).
 
@@ -17,22 +31,17 @@
 - Row-wise and column-wise ND shapes in the core
 - Shape is read-only
 - Major refactor of tensors (only minor API changes)
-- Kotlin 1.7.20
+- Kotlin 1.8.20
 - `LazyStructure` `deffered` -> `async` to comply with coroutines code style
 - Default `dot` operation in tensor algebra no longer support broadcasting. Instead `matmul` operation is added to `DoubleTensorAlgebra`.
 - Multik went MPP
 
-### Deprecated
-
 ### Removed
 - Trajectory moved to https://github.com/SciProgCentre/maps-kt
 - Polynomials moved to https://github.com/SciProgCentre/kmath-polynomial
 
-### Fixed
+## 0.3.0
 
-### Security
-
-## [0.3.0]
 ### Added
 - `ScaleOperations` interface
 - `Field` extends `ScaleOperations`
@@ -57,9 +66,8 @@
 - `contentEquals` with tolerance: #364
 - Compilation to TeX for MST: #254
 
-
 ### Changed
-- Annotations moved to `space.kscience.kmath` 
+- Annotations moved to `space.kscience.kmath`
 - Exponential operations merged with hyperbolic functions
 - Space is replaced by Group. Space is reserved for vector spaces.
 - VectorSpace is now a vector space
@@ -91,11 +99,9 @@
 - Rework of histograms.
 - `UnivariateFunction` -> `Function1D`, `MultivariateFunction` -> `FunctionND`
 
-
 ### Deprecated
 - Specialized `DoubleBufferAlgebra`
 
-
 ### Removed
 - Nearest in Domain. To be implemented in geometry package.
 - Number multiplication and division in main Algebra chain
@@ -106,15 +112,12 @@
 - Second generic from DifferentiableExpression
 - Algebra elements are completely removed. Use algebra contexts instead.
 
-
 ### Fixed
 - Ring inherits RingOperations, not GroupOperations
 - Univariate histogram filling
 
+## 0.2.0
 
-### Security
-
-## [0.2.0]
 ### Added
 - `fun` annotation for SAM interfaces in library
 - Explicit `public` visibility for all public APIs
@@ -134,7 +137,6 @@
 - New `MatrixFeature` interfaces for matrix decompositions
 - Basic Quaternion vector support in `kmath-complex`.
 
-
 ### Changed
 - Package changed from `scientifik` to `space.kscience`
 - Gradle version: 6.6 -> 6.8.2
@@ -159,7 +161,6 @@
 - `symbol` method in `Algebra` renamed to `bindSymbol` to avoid ambiguity
 - Add `out` projection to `Buffer` generic
 
-
 ### Removed
 - `kmath-koma` module because it doesn't support Kotlin 1.4.
 - Support of `legacy` JS backend (we will support only IR)
@@ -168,11 +169,11 @@
 - `Real` class
 - StructureND identity and equals
 
-
 ### Fixed
 - `symbol` method in `MstExtendedField` (https://github.com/mipt-npm/kmath/pull/140)
 
-## [0.1.4]
+## 0.1.4
+
 ### Added
 - Functional Expressions API
 - Mathematical Syntax Tree, its interpreter and API
@@ -190,7 +191,6 @@
 - Full hyperbolic functions support and default implementations within `ExtendedField`
 - Norm support for `Complex`
 
-
 ### Changed
 - `readAsMemory` now has `throws IOException` in JVM signature.
 - Several functions taking functional types were made `inline`.
@@ -202,10 +202,9 @@
 - Gradle version: 6.3 -> 6.6
 - Moved probability distributions to commons-rng and to `kmath-prob`
 
-
 ### Fixed
 - Missing copy method in Memory implementation on JS (https://github.com/mipt-npm/kmath/pull/106)
 - D3.dim value in `kmath-dimensions`
 - Multiplication in integer rings in `kmath-core` (https://github.com/mipt-npm/kmath/pull/101)
 - Commons RNG compatibility (https://github.com/mipt-npm/kmath/issues/93)
-- Multiplication of BigInt by scalar
\ No newline at end of file
+- Multiplication of BigInt by scalar
-- 
2.34.1


From e1d5409c0d1148b2ba9e8221d09cb514c22e7fb9 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 9 Apr 2023 11:12:04 +0300
Subject: [PATCH 692/713] Patch changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e42fe61f3..998e6daae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,7 @@
 - Algebra now has an obligatory `bufferFactory` (#477).
 
 ### Changed
-- Trajectory use type-safe angles
+- Geometry uses type-safe angles
 - Tensor operations switched to prefix notation
 - Row-wise and column-wise ND shapes in the core
 - Shape is read-only
-- 
2.34.1


From 31d1cc774af7ce56a8d401691ecb08e9a24a2b1c Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Tue, 11 Apr 2023 20:31:04 +0300
Subject: [PATCH 693/713] added shiftOperartion and diff

---
 .../space/kscience/kmath/series/SeriesAlgebra.kt    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index 3ccbca5a1..4b7f8b83a 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -199,12 +199,25 @@ public open class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>
         }
     }
 
+    /**
+     * Zip buffer with itself, but shifted
+     * */
+    public inline fun Buffer<T>.shiftOp(
+        shift: Int = 1,
+        crossinline operation: A.(left: T, right: T) -> T
+    ): Buffer<T> {
+        val shifted = this.moveTo(this.startOffset+shift)
+        return zip(shifted, operation)
+    }
+
     override fun Buffer<T>.unaryMinus(): Buffer<T> = map { -it }
 
     override fun add(left: Buffer<T>, right: Buffer<T>): Series<T> = left.zip(right) { l, r -> l + r }
 
     override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = left.zip(right) { l, r -> l * r }
 
+    public inline fun Buffer<T>.diff(): Buffer<T> = this.shiftOp {l, r -> r - l}
+
     public companion object
 }
 
-- 
2.34.1


From e76d8e0774c2e3fe4a194e81403790d2850f4193 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 12 Apr 2023 11:40:27 +0300
Subject: [PATCH 694/713] fix zipWithNextCircular on single element

---
 .../kotlin/space/kscience/kmath/misc/collections.kt           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/collections.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/collections.kt
index afa76d2a9..f630055fa 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/collections.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/misc/collections.kt
@@ -9,7 +9,7 @@ package space.kscience.kmath.misc
  * The same as [zipWithNext], but includes link between last and first element
  */
 public inline fun <T, R> List<T>.zipWithNextCircular(transform: (a: T, b: T) -> R): List<R> {
-    if (isEmpty()) return emptyList()
+    if (size < 2) return emptyList()
     return indices.map { i ->
         if (i == size - 1) {
             transform(last(), first())
@@ -19,4 +19,4 @@ public inline fun <T, R> List<T>.zipWithNextCircular(transform: (a: T, b: T) ->
     }
 }
 
-public fun <T> List<T>.zipWithNextCircular(): List<Pair<T,T>> = zipWithNextCircular { l, r -> l to r  }
\ No newline at end of file
+public fun <T> List<T>.zipWithNextCircular(): List<Pair<T, T>> = zipWithNextCircular { l, r -> l to r }
\ No newline at end of file
-- 
2.34.1


From 2b83560da8ff62b58d0df8bb334a76f3db3ccf09 Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Wed, 12 Apr 2023 22:24:48 +0300
Subject: [PATCH 695/713] Variance Ratio function

---
 .../kscience/kmath/series/VarianceRatio.kt    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatio.kt

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatio.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatio.kt
new file mode 100644
index 000000000..aa616487b
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatio.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.series
+
+import space.kscience.kmath.operations.DoubleBufferOps.Companion.map
+import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.bufferAlgebra
+import space.kscience.kmath.operations.fold
+
+
+fun varianceRatio(series: Series<Double>, shift: Int): Double {
+    val mean = series.fold(0.0) {acc, value -> acc + value} / series.size
+    val demeanedSquares = series.map { power(it - mean, 2) }
+    val variance = demeanedSquares.fold(0.0) {acc, value -> acc + value}
+
+    with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
+        val seriesAgg = series
+        for (i in -1..-shift + 1) {
+            seriesAgg.shiftOp(i) { v1, v2 -> v1 + v2 }
+        }
+
+        val demeanedSquaresAgg = seriesAgg.map { power(it - shift * mean, 2) }
+        val varianceAgg = demeanedSquaresAgg.fold(0.0) { acc, value -> acc + value }
+
+        return varianceAgg * (series.size - 1) / variance / (series.size - shift + 1) / (1 - shift / series.size)
+    }
+}
-- 
2.34.1


From a68ebef26dda77e015c1d8144999c40083ee303f Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Thu, 13 Apr 2023 03:38:10 +0300
Subject: [PATCH 696/713] zScore for variance Ratio Test

---
 .../kscience/kmath/series/VarianceRatio.kt    | 42 ++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatio.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatio.kt
index aa616487b..2dfcd6b00 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatio.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatio.kt
@@ -5,26 +5,48 @@
 
 package space.kscience.kmath.series
 
+import space.kscience.kmath.distributions.NormalDistribution
 import space.kscience.kmath.operations.DoubleBufferOps.Companion.map
+import space.kscience.kmath.operations.DoubleField.pow
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.bufferAlgebra
 import space.kscience.kmath.operations.fold
 
 
-fun varianceRatio(series: Series<Double>, shift: Int): Double {
-    val mean = series.fold(0.0) {acc, value -> acc + value} / series.size
+// TODO: add p-value
+public data class VarianceRatioTestResult(val varianceRatio: Double, val zScore: Double)
+
+public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic: Boolean): VarianceRatioTestResult {
+
+    val sum = { x: Double, y: Double -> x + y }
+
+    val mean = series.fold(0.0, sum) / series.size
     val demeanedSquares = series.map { power(it - mean, 2) }
-    val variance = demeanedSquares.fold(0.0) {acc, value -> acc + value}
+    val variance = demeanedSquares.fold(0.0, sum)
 
     with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
-        val seriesAgg = series
-        for (i in -1..-shift + 1) {
-            seriesAgg.shiftOp(i) { v1, v2 -> v1 + v2 }
+        for (i in -1..-shift + 1) { series.shiftOp(i) { v1, v2 -> v1 + v2 } }
+        val demeanedSquaresAgg = series.map { power(it - shift * mean, 2) }
+        val varianceAgg = demeanedSquaresAgg.fold(0.0, sum)
+
+        val varianceRatio =
+            varianceAgg * (series.size - 1) / variance / (series.size - shift + 1) / (1 - shift / series.size)
+
+
+        // calculating asymptotic variance
+        var phi: Double
+        if (homoscedastic) {  // under homoscedastic null hypothesis
+            phi = 2 * (2 * shift - 1.0) * (shift - 1.0) / (3 * shift * series.size)
+        } else { // under homoscedastic null hypothesis
+            phi = 0.0
+            for (j in 1..<shift) {
+                val shiftedProd = demeanedSquares.shiftOp(j) { v1, v2 -> v1 * v2 }
+                val delta = series.size * shiftedProd.fold(0.0, sum) / variance.pow(2)
+                phi += delta * 4 * (shift - j) * (shift - j) / shift / shift // TODO: refactor with square
+            }
         }
 
-        val demeanedSquaresAgg = seriesAgg.map { power(it - shift * mean, 2) }
-        val varianceAgg = demeanedSquaresAgg.fold(0.0) { acc, value -> acc + value }
-
-        return varianceAgg * (series.size - 1) / variance / (series.size - shift + 1) / (1 - shift / series.size)
+        val zScore = (varianceRatio - 1) / phi.pow(0.5)
+        return VarianceRatioTestResult(varianceRatio, zScore)
     }
 }
-- 
2.34.1


From 0ce1861ab4724912e796ffa92aa940fdaa0735a0 Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Thu, 13 Apr 2023 03:47:36 +0300
Subject: [PATCH 697/713] refactoring

---
 .../series/{VarianceRatio.kt => VarianceRatioTest.kt}      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
 rename kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/{VarianceRatio.kt => VarianceRatioTest.kt} (90%)

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatio.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
similarity index 90%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatio.kt
rename to kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
index 2dfcd6b00..77163f638 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatio.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
@@ -5,7 +5,6 @@
 
 package space.kscience.kmath.series
 
-import space.kscience.kmath.distributions.NormalDistribution
 import space.kscience.kmath.operations.DoubleBufferOps.Companion.map
 import space.kscience.kmath.operations.DoubleField.pow
 import space.kscience.kmath.operations.algebra
@@ -18,6 +17,12 @@ public data class VarianceRatioTestResult(val varianceRatio: Double, val zScore:
 
 public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic: Boolean): VarianceRatioTestResult {
 
+    /**
+     * Calculate the Z statistic and the p-value for the Lo and MacKinlay's Variance Ratio test (1987)
+     * under Homoscedastic or Heteroscedstic assumptions
+     * 	https://ssrn.com/abstract=346975
+     * **/
+
     val sum = { x: Double, y: Double -> x + y }
 
     val mean = series.fold(0.0, sum) / series.size
-- 
2.34.1


From a91b43a52db60388a4947c1a277e6b26bd3e6997 Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Thu, 13 Apr 2023 17:52:14 +0300
Subject: [PATCH 698/713] tests for varianceRatio

---
 .../kmath/series/VarianceRatioTest.kt         |  4 +-
 .../kmath/series/TestVarianceRatioTest.kt     | 51 +++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
index 77163f638..b769d78a3 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
@@ -24,10 +24,10 @@ public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic:
      * **/
 
     val sum = { x: Double, y: Double -> x + y }
-
+    //TODO: catch if shift is too large
     val mean = series.fold(0.0, sum) / series.size
     val demeanedSquares = series.map { power(it - mean, 2) }
-    val variance = demeanedSquares.fold(0.0, sum)
+    val variance = demeanedSquares.fold(0.0, sum) // TODO: catch if variance is zero
 
     with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
         for (i in -1..-shift + 1) { series.shiftOp(i) { v1, v2 -> v1 + v2 } }
diff --git a/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt b/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
new file mode 100644
index 000000000..7c31663bc
--- /dev/null
+++ b/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.series
+
+import space.kscience.kmath.operations.algebra
+import space.kscience.kmath.operations.bufferAlgebra
+import kotlin.math.PI
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class TestVarianceRatioTest {
+
+    @Test
+    fun volatileData() {
+        with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
+            val volatileData = series(10) { sin(PI * it + PI/2) + 1.0}
+            val resultHomo = varianceRatioTest(volatileData, 2, homoscedastic = true)
+            assertEquals(0.0, resultHomo.varianceRatio, 1e-6)
+            // homoscedastic zScore
+            assertEquals(-3.162277, resultHomo.zScore, 1e-6)
+            val resultHetero = varianceRatioTest(volatileData, 2, homoscedastic = false)
+            // heteroscedastic zScore
+            assertEquals(-3.535533, resultHetero.zScore, 1e-6)
+        }
+    }
+
+    @Test
+    fun negativeData() {
+        with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
+            val volatileData = series(10) { sin(PI * it)}
+            val resultHomo = varianceRatioTest(volatileData, 2, homoscedastic = true)
+            assertEquals(1.142857, resultHomo.varianceRatio, 1e-6)
+            // homoscedastic zScore
+            assertEquals(0.451753, resultHomo.zScore, 1e-6)
+            val resultHetero = varianceRatioTest(volatileData, 2, homoscedastic = false)
+            // heteroscedastic zScore
+            assertEquals(2.462591, resultHetero.zScore, 1e-6)
+        }
+    }
+
+//    @Test
+//    fun zeroVolatility() {
+//        with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
+//            val volatileData = series(10) { 1.0 }
+//            val result = varianceRatioTest(volatileData, 2, homoscedastic = true)
+//        }
+//    }
+}
\ No newline at end of file
-- 
2.34.1


From 5b95923bb9072c3437e8a3f0b65449aa90b896ef Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Fri, 14 Apr 2023 06:36:20 +0300
Subject: [PATCH 699/713] fixed zip in SereiesAlgebra + tests for VarianceRatio

---
 .../kscience/kmath/series/SeriesAlgebra.kt    |  2 +-
 .../kmath/series/VarianceRatioTest.kt         | 22 ++++++----
 .../kmath/series/TestVarianceRatioTest.kt     | 40 +++++++++++++------
 3 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index 4b7f8b83a..9efbd629c 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -191,7 +191,7 @@ public open class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>
         crossinline operation: A.(left: T, right: T) -> T,
     ): Series<T> {
         val newRange = offsetIndices.intersect(other.offsetIndices)
-        return seriesByOffset(startOffset = newRange.first, size = newRange.last - newRange.first) { offset ->
+        return seriesByOffset(startOffset = newRange.first, size = newRange.last + 1 - newRange.first) { offset ->
             elementAlgebra.operation(
                 getByOffset(offset),
                 other.getByOffset(offset)
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
index b769d78a3..9a00b1be2 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
@@ -25,17 +25,22 @@ public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic:
 
     val sum = { x: Double, y: Double -> x + y }
     //TODO: catch if shift is too large
-    val mean = series.fold(0.0, sum) / series.size
-    val demeanedSquares = series.map { power(it - mean, 2) }
-    val variance = demeanedSquares.fold(0.0, sum) // TODO: catch if variance is zero
-
     with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
-        for (i in -1..-shift + 1) { series.shiftOp(i) { v1, v2 -> v1 + v2 } }
-        val demeanedSquaresAgg = series.map { power(it - shift * mean, 2) }
+        val mean = series.fold(0.0, sum) / series.size
+        val demeanedSquares = series.map { power(it - mean, 2) }
+        val variance = demeanedSquares.fold(0.0, sum) // TODO: catch if variance is zero
+
+
+        var seriesAgg = series
+        for (i in 1..<shift) {
+            seriesAgg = seriesAgg.zip(series.moveTo(i)) { v1, v2 -> v1 + v2 }
+        }
+
+        val demeanedSquaresAgg = seriesAgg.map { power(it - shift * mean, 2) }
         val varianceAgg = demeanedSquaresAgg.fold(0.0, sum)
 
         val varianceRatio =
-            varianceAgg * (series.size - 1) / variance / (series.size - shift + 1) / (1 - shift / series.size)
+            varianceAgg * (series.size.toDouble() - 1) / variance / (series.size.toDouble() - shift.toDouble() + 1) / (1 - shift.toDouble()/series.size.toDouble()) / shift.toDouble()
 
 
         // calculating asymptotic variance
@@ -44,8 +49,9 @@ public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic:
             phi = 2 * (2 * shift - 1.0) * (shift - 1.0) / (3 * shift * series.size)
         } else { // under homoscedastic null hypothesis
             phi = 0.0
+            var shiftedProd = demeanedSquares
             for (j in 1..<shift) {
-                val shiftedProd = demeanedSquares.shiftOp(j) { v1, v2 -> v1 * v2 }
+                shiftedProd = shiftedProd.zip(demeanedSquares.moveTo(j)) { v1, v2 -> v1 * v2 }
                 val delta = series.size * shiftedProd.fold(0.0, sum) / variance.pow(2)
                 phi += delta * 4 * (shift - j) * (shift - j) / shift / shift // TODO: refactor with square
             }
diff --git a/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt b/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
index 7c31663bc..8dcdb3a14 100644
--- a/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
+++ b/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
@@ -13,6 +13,21 @@ import kotlin.test.assertEquals
 
 class TestVarianceRatioTest {
 
+    // TODO: refactor Heteroscedastic zScore
+    @Test
+    fun monotonicData() {
+        with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
+            val monotonicData = series(10) { it * 1.0 }
+            val resultHomo = varianceRatioTest(monotonicData, 2, homoscedastic = true)
+            assertEquals(1.818181, resultHomo.varianceRatio, 1e-6)
+            // homoscedastic zScore
+            assertEquals(2.587318, resultHomo.zScore, 1e-6)
+//            val resultHetero = varianceRatioTest(monotonicData, 2, homoscedastic = false)
+//            // heteroscedastic zScore
+//            assertEquals(3.253248, resultHetero.zScore, 1e-6)
+        }
+    }
+
     @Test
     fun volatileData() {
         with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
@@ -21,31 +36,32 @@ class TestVarianceRatioTest {
             assertEquals(0.0, resultHomo.varianceRatio, 1e-6)
             // homoscedastic zScore
             assertEquals(-3.162277, resultHomo.zScore, 1e-6)
-            val resultHetero = varianceRatioTest(volatileData, 2, homoscedastic = false)
-            // heteroscedastic zScore
-            assertEquals(-3.535533, resultHetero.zScore, 1e-6)
+//            val resultHetero = varianceRatioTest(volatileData, 2, homoscedastic = false)
+//            // heteroscedastic zScore
+//            assertEquals(-3.535533, resultHetero.zScore, 1e-6)
         }
     }
 
     @Test
     fun negativeData() {
         with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
-            val volatileData = series(10) { sin(PI * it)}
-            val resultHomo = varianceRatioTest(volatileData, 2, homoscedastic = true)
-            assertEquals(1.142857, resultHomo.varianceRatio, 1e-6)
+            val negativeData = series(10) { sin(it * 1.2)}
+            val resultHomo = varianceRatioTest(negativeData, 3, homoscedastic = true)
+            assertEquals(1.240031, resultHomo.varianceRatio, 1e-6)
             // homoscedastic zScore
-            assertEquals(0.451753, resultHomo.zScore, 1e-6)
-            val resultHetero = varianceRatioTest(volatileData, 2, homoscedastic = false)
-            // heteroscedastic zScore
-            assertEquals(2.462591, resultHetero.zScore, 1e-6)
+            assertEquals(0.509183, resultHomo.zScore, 1e-6)
+//            val resultHetero = varianceRatioTest(negativeData, 3, homoscedastic = false)
+//            // heteroscedastic zScore
+//            assertEquals(0.661798, resultHetero.zScore, 1e-6)
         }
     }
 
+    //TODO: add zero volatility Test, logReturns test, big shift Test
 //    @Test
 //    fun zeroVolatility() {
 //        with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
-//            val volatileData = series(10) { 1.0 }
-//            val result = varianceRatioTest(volatileData, 2, homoscedastic = true)
+//            val zeroVolData = series(10) { 1.0 }
+//            val result = varianceRatioTest(zeroVolData, 2, homoscedastic = true)
 //        }
 //    }
 }
\ No newline at end of file
-- 
2.34.1


From 85395ff82ed76f480a67b36827397ecdd66c4728 Mon Sep 17 00:00:00 2001
From: Gleb Minaev <43728100+lounres@users.noreply.github.com>
Date: Fri, 14 Apr 2023 21:17:44 +0300
Subject: [PATCH 700/713] Add autodiff example

---
 .../kscience/kmath/expressions/autodiff.kt    | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 examples/src/main/kotlin/space/kscience/kmath/expressions/autodiff.kt

diff --git a/examples/src/main/kotlin/space/kscience/kmath/expressions/autodiff.kt b/examples/src/main/kotlin/space/kscience/kmath/expressions/autodiff.kt
new file mode 100644
index 000000000..b1e14591a
--- /dev/null
+++ b/examples/src/main/kotlin/space/kscience/kmath/expressions/autodiff.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.expressions
+
+import space.kscience.kmath.UnstableKMathAPI
+// Only kmath-core is needed.
+
+// Let's declare some variables
+val x by symbol
+val y by symbol
+val z by symbol
+
+@OptIn(UnstableKMathAPI::class)
+fun main() {
+    // Let's define some random expression.
+    val someExpression = Double.autodiff.differentiate {
+        // We bind variables `x` and `y` to the builder scope,
+        val x = bindSymbol(x)
+        val y = bindSymbol(y)
+
+        // Then we use the bindings to define expression `xy + x + y - 1`
+        x * y + x + y - 1
+    }
+
+    // Then we can evaluate it at any point ((-1, -1) in the case):
+    println(someExpression(mapOf(x to -1.0, y to -1.0)))
+    // >>> -2.0
+
+    // We can also construct its partial derivatives:
+    val dxExpression = someExpression.derivative(x) // ∂/∂x. Must be `y+1`
+    val dyExpression = someExpression.derivative(y) // ∂/∂y. Must be `x+1`
+    val dxdxExpression = someExpression.derivative(x, x) // ∂^2/∂x^2. Must be `0`
+
+    // We can evaluate them as well
+    println(dxExpression(mapOf(x to 57.0, y to 6.0)))
+    // >>> 7.0
+    println(dyExpression(mapOf(x to -1.0, y to 179.0)))
+    // >>> 0.0
+    println(dxdxExpression(mapOf(x to 239.0, y to 30.0)))
+    // >>> 0.0
+
+    // You can also provide extra arguments that obviously won't affect the result:
+    println(dxExpression(mapOf(x to 57.0, y to 6.0, z to 42.0)))
+    // >>> 7.0
+    println(dyExpression(mapOf(x to -1.0, y to 179.0, z to 0.0)))
+    // >>> 0.0
+    println(dxdxExpression(mapOf(x to 239.0, y to 30.0, z to 100_000.0)))
+    // >>> 0.0
+
+    // But in case you forgot to specify bound symbol's value, exception is thrown:
+    println( runCatching { someExpression(mapOf(z to 4.0)) } )
+    // >>> Failure(java.lang.IllegalStateException: Symbol 'x' is not supported in ...)
+
+    // The reason is that the expression is evaluated lazily,
+    // and each `bindSymbol` operation actually substitutes the provided symbol with the corresponding value.
+
+    // For example, let there be an expression
+    val simpleExpression = Double.autodiff.differentiate {
+        val x = bindSymbol(x)
+        x pow 2
+    }
+    // When you evaluate it via
+    simpleExpression(mapOf(x to 1.0, y to 57.0, z to 179.0))
+    // lambda above has the context of map `{x: 1.0, y: 57.0, z: 179.0}`.
+    // When x is bound, you can think of it as substitution `x -> 1.0`.
+    // Other values are unused which does not make any problem to us.
+    // But in the case the corresponding value is not provided,
+    // we cannot bind the variable. Thus, exception is thrown.
+
+    // There is also a function `bindSymbolOrNull` that fixes the problem:
+    val fixedExpression = Double.autodiff.differentiate {
+        val x = bindSymbolOrNull(x) ?: const(8.0)
+        x pow -2
+    }
+    println(fixedExpression())
+    // >>> 0.015625
+    // It works!
+
+    // The expression provides a bunch of operations:
+    // 1. Constant bindings (via `const` and `number`).
+    // 2. Variable bindings (via `bindVariable`, `bindVariableOrNull`).
+    // 3. Arithmetic operations (via `+`, `-`, `*`, and `-`).
+    // 4. Exponentiation (via `pow` or `power`).
+    // 5. `exp` and `ln`.
+    // 6. Trigonometrical functions (`sin`, `cos`, `tan`, `cot`).
+    // 7. Inverse trigonometrical functions (`asin`, `acos`, `atan`, `acot`).
+    // 8. Hyperbolic functions and inverse hyperbolic functions.
+}
-- 
2.34.1


From e6da61c52a7c7b38cabe5621014993eef5bdf2d2 Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Tue, 18 Apr 2023 01:53:07 +0300
Subject: [PATCH 701/713] refactoring

---
 .../kscience/kmath/series/SeriesAlgebra.kt     |  6 +++---
 .../kscience/kmath/series/VarianceRatioTest.kt | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index 9efbd629c..72b9ca7a2 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -202,11 +202,11 @@ public open class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>
     /**
      * Zip buffer with itself, but shifted
      * */
-    public inline fun Buffer<T>.shiftOp(
+    public inline fun Buffer<T>.zipWithShift(
         shift: Int = 1,
         crossinline operation: A.(left: T, right: T) -> T
     ): Buffer<T> {
-        val shifted = this.moveTo(this.startOffset+shift)
+        val shifted = this.moveBy(shift)
         return zip(shifted, operation)
     }
 
@@ -216,7 +216,7 @@ public open class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>
 
     override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = left.zip(right) { l, r -> l * r }
 
-    public inline fun Buffer<T>.diff(): Buffer<T> = this.shiftOp {l, r -> r - l}
+    public fun Buffer<T>.diff(shift: Int=1): Buffer<T> = this.zipWithShift(shift) {l, r -> r - l}
 
     public companion object
 }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
index 9a00b1be2..45bc836fe 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
@@ -12,10 +12,14 @@ import space.kscience.kmath.operations.bufferAlgebra
 import space.kscience.kmath.operations.fold
 
 
-// TODO: add p-value
+// TODO: add p-value with formula: 2*(1 - cdf(|zScore|))
 public data class VarianceRatioTestResult(val varianceRatio: Double, val zScore: Double)
+    /**
+     * Container class for Variance Ratio Test result:
+     * ratio itself, corresponding Z-score, also it's p-value
+     * **/
 
-public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic: Boolean): VarianceRatioTestResult {
+public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic: Boolean=true): VarianceRatioTestResult {
 
     /**
      * Calculate the Z statistic and the p-value for the Lo and MacKinlay's Variance Ratio test (1987)
@@ -44,17 +48,17 @@ public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic:
 
 
         // calculating asymptotic variance
-        var phi: Double
-        if (homoscedastic) {  // under homoscedastic null hypothesis
-            phi = 2 * (2 * shift - 1.0) * (shift - 1.0) / (3 * shift * series.size)
+        val phi = if (homoscedastic) {  // under homoscedastic null hypothesis
+            2 * (2 * shift - 1.0) * (shift - 1.0) / (3 * shift * series.size)
         } else { // under homoscedastic null hypothesis
-            phi = 0.0
+            var accumulator = 0.0
             var shiftedProd = demeanedSquares
             for (j in 1..<shift) {
                 shiftedProd = shiftedProd.zip(demeanedSquares.moveTo(j)) { v1, v2 -> v1 * v2 }
                 val delta = series.size * shiftedProd.fold(0.0, sum) / variance.pow(2)
-                phi += delta * 4 * (shift - j) * (shift - j) / shift / shift // TODO: refactor with square
+                accumulator += delta * 4 * (shift - j) * (shift - j) / shift / shift // TODO: refactor with square
             }
+            accumulator
         }
 
         val zScore = (varianceRatio - 1) / phi.pow(0.5)
-- 
2.34.1


From 98781c83adcbb62ea0a83f5c905b6bf6a85ea59c Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Tue, 18 Apr 2023 19:16:10 +0300
Subject: [PATCH 702/713] fixed bug with heteroscedastic z-score in Variance
 Ratio Test

---
 .../kmath/series/VarianceRatioTest.kt         | 13 ++++++-------
 .../kmath/series/TestVarianceRatioTest.kt     | 19 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
index 45bc836fe..8afc01c81 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
@@ -5,11 +5,11 @@
 
 package space.kscience.kmath.series
 
-import space.kscience.kmath.operations.DoubleBufferOps.Companion.map
 import space.kscience.kmath.operations.DoubleField.pow
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.bufferAlgebra
 import space.kscience.kmath.operations.fold
+import space.kscience.kmath.structures.slice
 
 
 // TODO: add p-value with formula: 2*(1 - cdf(|zScore|))
@@ -22,7 +22,7 @@ public data class VarianceRatioTestResult(val varianceRatio: Double, val zScore:
 public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic: Boolean=true): VarianceRatioTestResult {
 
     /**
-     * Calculate the Z statistic and the p-value for the Lo and MacKinlay's Variance Ratio test (1987)
+     * Calculates the Z-statistic and the p-value for the Lo and MacKinlay's Variance Ratio test (1987)
      * under Homoscedastic or Heteroscedstic assumptions
      * 	https://ssrn.com/abstract=346975
      * **/
@@ -50,13 +50,12 @@ public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic:
         // calculating asymptotic variance
         val phi = if (homoscedastic) {  // under homoscedastic null hypothesis
             2 * (2 * shift - 1.0) * (shift - 1.0) / (3 * shift * series.size)
-        } else { // under homoscedastic null hypothesis
+        } else { // under heteroscedastic null hypothesis
             var accumulator = 0.0
-            var shiftedProd = demeanedSquares
             for (j in 1..<shift) {
-                shiftedProd = shiftedProd.zip(demeanedSquares.moveTo(j)) { v1, v2 -> v1 * v2 }
-                val delta = series.size * shiftedProd.fold(0.0, sum) / variance.pow(2)
-                accumulator += delta * 4 * (shift - j) * (shift - j) / shift / shift // TODO: refactor with square
+                var temp = demeanedSquares
+                val delta = series.size * temp.zipWithShift(j) { v1, v2 -> v1 * v2 }.fold(0.0, sum) / variance.pow(2)
+                accumulator += delta * 4 * (shift - j).toDouble().pow(2) / shift.toDouble().pow(2)
             }
             accumulator
         }
diff --git a/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt b/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
index 8dcdb3a14..0ece143eb 100644
--- a/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
+++ b/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
@@ -13,7 +13,6 @@ import kotlin.test.assertEquals
 
 class TestVarianceRatioTest {
 
-    // TODO: refactor Heteroscedastic zScore
     @Test
     fun monotonicData() {
         with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
@@ -22,9 +21,9 @@ class TestVarianceRatioTest {
             assertEquals(1.818181, resultHomo.varianceRatio, 1e-6)
             // homoscedastic zScore
             assertEquals(2.587318, resultHomo.zScore, 1e-6)
-//            val resultHetero = varianceRatioTest(monotonicData, 2, homoscedastic = false)
-//            // heteroscedastic zScore
-//            assertEquals(3.253248, resultHetero.zScore, 1e-6)
+            val resultHetero = varianceRatioTest(monotonicData, 2, homoscedastic = false)
+            // heteroscedastic zScore
+            assertEquals(0.819424, resultHetero.zScore, 1e-6)
         }
     }
 
@@ -36,9 +35,9 @@ class TestVarianceRatioTest {
             assertEquals(0.0, resultHomo.varianceRatio, 1e-6)
             // homoscedastic zScore
             assertEquals(-3.162277, resultHomo.zScore, 1e-6)
-//            val resultHetero = varianceRatioTest(volatileData, 2, homoscedastic = false)
-//            // heteroscedastic zScore
-//            assertEquals(-3.535533, resultHetero.zScore, 1e-6)
+            val resultHetero = varianceRatioTest(volatileData, 2, homoscedastic = false)
+            // heteroscedastic zScore
+            assertEquals(-1.0540925, resultHetero.zScore, 1e-6)
         }
     }
 
@@ -50,9 +49,9 @@ class TestVarianceRatioTest {
             assertEquals(1.240031, resultHomo.varianceRatio, 1e-6)
             // homoscedastic zScore
             assertEquals(0.509183, resultHomo.zScore, 1e-6)
-//            val resultHetero = varianceRatioTest(negativeData, 3, homoscedastic = false)
-//            // heteroscedastic zScore
-//            assertEquals(0.661798, resultHetero.zScore, 1e-6)
+            val resultHetero = varianceRatioTest(negativeData, 3, homoscedastic = false)
+            // heteroscedastic zScore
+            assertEquals(0.209202, resultHetero.zScore, 1e-6)
         }
     }
 
-- 
2.34.1


From 0193349f9413a79fb1b06e05a437b8e609e0a6c3 Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Wed, 19 Apr 2023 01:36:54 +0300
Subject: [PATCH 703/713] requirements, default parameters, new Test for
 varianceRatioTest

---
 .../space/kscience/kmath/ejml/_generated.kt   |  2 +-
 .../kmath/series/VarianceRatioTest.kt         | 12 ++++++-----
 .../kmath/series/TestVarianceRatioTest.kt     | 21 ++++++++++---------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
index c56583fa8..8ad7f7293 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
@@ -19,9 +19,9 @@ import org.ejml.sparse.csc.factory.DecompositionFactory_DSCC
 import org.ejml.sparse.csc.factory.DecompositionFactory_FSCC
 import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
 import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
-import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.*
 import space.kscience.kmath.linear.Matrix
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureFeature
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.FloatField
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
index 8afc01c81..d81a6c317 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
@@ -9,11 +9,10 @@ import space.kscience.kmath.operations.DoubleField.pow
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.bufferAlgebra
 import space.kscience.kmath.operations.fold
-import space.kscience.kmath.structures.slice
 
 
 // TODO: add p-value with formula: 2*(1 - cdf(|zScore|))
-public data class VarianceRatioTestResult(val varianceRatio: Double, val zScore: Double)
+public data class VarianceRatioTestResult(val varianceRatio: Double=1.0, val zScore: Double=0.0)
     /**
      * Container class for Variance Ratio Test result:
      * ratio itself, corresponding Z-score, also it's p-value
@@ -27,12 +26,15 @@ public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic:
      * 	https://ssrn.com/abstract=346975
      * **/
 
+    require(shift > 1) {"Shift must be greater than one"}
+    require(shift < series.size) {"Shift must be smaller than sample size"}
     val sum = { x: Double, y: Double -> x + y }
-    //TODO: catch if shift is too large
+
     with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
         val mean = series.fold(0.0, sum) / series.size
         val demeanedSquares = series.map { power(it - mean, 2) }
-        val variance = demeanedSquares.fold(0.0, sum) // TODO: catch if variance is zero
+        val variance = demeanedSquares.fold(0.0, sum)
+        if (variance == 0.0) return VarianceRatioTestResult()
 
 
         var seriesAgg = series
@@ -53,7 +55,7 @@ public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic:
         } else { // under heteroscedastic null hypothesis
             var accumulator = 0.0
             for (j in 1..<shift) {
-                var temp = demeanedSquares
+                val temp = demeanedSquares
                 val delta = series.size * temp.zipWithShift(j) { v1, v2 -> v1 * v2 }.fold(0.0, sum) / variance.pow(2)
                 accumulator += delta * 4 * (shift - j).toDouble().pow(2) / shift.toDouble().pow(2)
             }
diff --git a/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt b/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
index 0ece143eb..8e559276c 100644
--- a/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
+++ b/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
@@ -31,7 +31,7 @@ class TestVarianceRatioTest {
     fun volatileData() {
         with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
             val volatileData = series(10) { sin(PI * it + PI/2) + 1.0}
-            val resultHomo = varianceRatioTest(volatileData, 2, homoscedastic = true)
+            val resultHomo = varianceRatioTest(volatileData, 2)
             assertEquals(0.0, resultHomo.varianceRatio, 1e-6)
             // homoscedastic zScore
             assertEquals(-3.162277, resultHomo.zScore, 1e-6)
@@ -45,7 +45,7 @@ class TestVarianceRatioTest {
     fun negativeData() {
         with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
             val negativeData = series(10) { sin(it * 1.2)}
-            val resultHomo = varianceRatioTest(negativeData, 3, homoscedastic = true)
+            val resultHomo = varianceRatioTest(negativeData, 3)
             assertEquals(1.240031, resultHomo.varianceRatio, 1e-6)
             // homoscedastic zScore
             assertEquals(0.509183, resultHomo.zScore, 1e-6)
@@ -55,12 +55,13 @@ class TestVarianceRatioTest {
         }
     }
 
-    //TODO: add zero volatility Test, logReturns test, big shift Test
-//    @Test
-//    fun zeroVolatility() {
-//        with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
-//            val zeroVolData = series(10) { 1.0 }
-//            val result = varianceRatioTest(zeroVolData, 2, homoscedastic = true)
-//        }
-//    }
+    @Test
+    fun zeroVolatility() {
+        with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
+            val zeroVolData = series(10) { 0.0 }
+            val result = varianceRatioTest(zeroVolData, 4)
+            assertEquals(1.0, result.varianceRatio, 1e-6)
+            assertEquals(0.0, result.zScore, 1e-6)
+        }
+    }
 }
\ No newline at end of file
-- 
2.34.1


From 1e27af9cf577478a2b6b582e9882022f91e36610 Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Wed, 19 Apr 2023 17:13:47 +0300
Subject: [PATCH 704/713] - Zelen-Severo CDF aproximation - p-value for
 varianceRatioTest

---
 .../kmath/series/VarianceRatioTest.kt         | 11 +++++++--
 .../kscience/kmath/series/zSNormalCdf.kt      | 24 +++++++++++++++++++
 .../kmath/series/TestVarianceRatioTest.kt     |  5 ++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/zSNormalCdf.kt

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
index d81a6c317..280a9db64 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
@@ -9,10 +9,11 @@ import space.kscience.kmath.operations.DoubleField.pow
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.bufferAlgebra
 import space.kscience.kmath.operations.fold
+import kotlin.math.absoluteValue
 
 
 // TODO: add p-value with formula: 2*(1 - cdf(|zScore|))
-public data class VarianceRatioTestResult(val varianceRatio: Double=1.0, val zScore: Double=0.0)
+public data class VarianceRatioTestResult(val varianceRatio: Double=1.0, val zScore: Double=0.0, val pValue: Double=0.5)
     /**
      * Container class for Variance Ratio Test result:
      * ratio itself, corresponding Z-score, also it's p-value
@@ -23,6 +24,7 @@ public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic:
     /**
      * Calculates the Z-statistic and the p-value for the Lo and MacKinlay's Variance Ratio test (1987)
      * under Homoscedastic or Heteroscedstic assumptions
+     * with two-sided p-value test
      * 	https://ssrn.com/abstract=346975
      * **/
 
@@ -63,6 +65,11 @@ public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic:
         }
 
         val zScore = (varianceRatio - 1) / phi.pow(0.5)
-        return VarianceRatioTestResult(varianceRatio, zScore)
+        val pValue = 2*(1 - zSNormalCDF(zScore.absoluteValue))
+        return VarianceRatioTestResult(varianceRatio, zScore, pValue)
     }
 }
+
+
+
+
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/zSNormalCdf.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/zSNormalCdf.kt
new file mode 100644
index 000000000..1eb733ea9
--- /dev/null
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/zSNormalCdf.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2018-2023 KMath contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package space.kscience.kmath.series
+
+import space.kscience.kmath.operations.DoubleField.pow
+import kotlin.math.PI
+import kotlin.math.absoluteValue
+import kotlin.math.exp
+
+public fun zSNormalCDF(x: Double): Double {
+
+    /**
+     * Zelen & Severo approximation for the standard normal CDF.
+     * The error is bounded by 7.5 * 10e-8.
+     * */
+
+    val t = 1 / (1 + 0.2316419 * x.absoluteValue)
+    val summ = 0.319381530*t - 0.356563782*t.pow(2) + 1.781477937*t.pow(3) - 1.821255978*t.pow(4) + 1.330274429*t.pow(5)
+    val temp = summ * exp(-x.absoluteValue.pow(2) / 2) / (2 * PI).pow(0.5)
+    return if (x >= 0)  1 - temp else temp
+}
\ No newline at end of file
diff --git a/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt b/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
index 8e559276c..afc0d541d 100644
--- a/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
+++ b/kmath-stat/src/commonTest/kotlin/space/kscience/kmath/series/TestVarianceRatioTest.kt
@@ -21,9 +21,11 @@ class TestVarianceRatioTest {
             assertEquals(1.818181, resultHomo.varianceRatio, 1e-6)
             // homoscedastic zScore
             assertEquals(2.587318, resultHomo.zScore, 1e-6)
+            assertEquals(.0096, resultHomo.pValue, 1e-4)
             val resultHetero = varianceRatioTest(monotonicData, 2, homoscedastic = false)
             // heteroscedastic zScore
             assertEquals(0.819424, resultHetero.zScore, 1e-6)
+            assertEquals(.4125, resultHetero.pValue, 1e-4)
         }
     }
 
@@ -35,9 +37,11 @@ class TestVarianceRatioTest {
             assertEquals(0.0, resultHomo.varianceRatio, 1e-6)
             // homoscedastic zScore
             assertEquals(-3.162277, resultHomo.zScore, 1e-6)
+            assertEquals(.0015, resultHomo.pValue, 1e-4)
             val resultHetero = varianceRatioTest(volatileData, 2, homoscedastic = false)
             // heteroscedastic zScore
             assertEquals(-1.0540925, resultHetero.zScore, 1e-6)
+            assertEquals(.2918, resultHetero.pValue, 1e-4)
         }
     }
 
@@ -62,6 +66,7 @@ class TestVarianceRatioTest {
             val result = varianceRatioTest(zeroVolData, 4)
             assertEquals(1.0, result.varianceRatio, 1e-6)
             assertEquals(0.0, result.zScore, 1e-6)
+            assertEquals(0.5, result.pValue, 1e-4)
         }
     }
 }
\ No newline at end of file
-- 
2.34.1


From 0c565c6056b5c2a8d1eb0aacb3ac49929232dc52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 May 2023 13:50:29 +0000
Subject: [PATCH 705/713] Bump gradle/gradle-build-action in /.github/workflows

Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.1.5 to 2.4.2.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/v2.1.5...v2.4.2)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/pages.yml   | 2 +-
 .github/workflows/publish.yml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20d5f9a68..6ad294e18 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,6 +19,6 @@ jobs:
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1.0.4
       - name: Gradle Build
-        uses: gradle/gradle-build-action@v2.3.2
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: test jvmTest
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 2abaf0b9f..ba1f5d1e3 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -22,7 +22,7 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - uses: gradle/gradle-build-action@v2.1.5
+      - uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: dokkaHtmlMultiModule --no-parallel
       - uses: JamesIves/github-pages-deploy-action@v4.3.0
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ab9243f15..31d539cdd 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -28,7 +28,7 @@ jobs:
             ${{ runner.os }}-gradle-
       - name: Publish Windows Artifacts
         if: matrix.os == 'windows-latest'
-        uses: gradle/gradle-build-action@v2.4.0
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: |
             publishAllPublicationsToSpaceRepository
@@ -37,7 +37,7 @@ jobs:
             -Ppublishing.space.token=${{ secrets.SPACE_APP_SECRET }}
       - name: Publish Mac Artifacts
         if: matrix.os == 'macOS-latest'
-        uses: gradle/gradle-build-action@v2.4.0
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: |
             publishMacosX64PublicationToSpaceRepository
-- 
2.34.1


From 16385b5f4e8e15fcb27774ff41b5443be0cd9642 Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Fri, 5 May 2023 18:45:54 +0300
Subject: [PATCH 706/713] -- refactoring

---
 .../{series => distributions}/zSNormalCdf.kt  | 12 +--
 .../kscience/kmath/series/SeriesAlgebra.kt    |  2 +-
 .../kmath/series/VarianceRatioTest.kt         | 89 +++++++++----------
 3 files changed, 51 insertions(+), 52 deletions(-)
 rename kmath-stat/src/commonMain/kotlin/space/kscience/kmath/{series => distributions}/zSNormalCdf.kt (79%)

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/zSNormalCdf.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/zSNormalCdf.kt
similarity index 79%
rename from kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/zSNormalCdf.kt
rename to kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/zSNormalCdf.kt
index 1eb733ea9..adfbbc9cd 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/zSNormalCdf.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/zSNormalCdf.kt
@@ -3,19 +3,19 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.series
+package space.kscience.kmath.distributions
 
 import space.kscience.kmath.operations.DoubleField.pow
 import kotlin.math.PI
 import kotlin.math.absoluteValue
 import kotlin.math.exp
 
-public fun zSNormalCDF(x: Double): Double {
 
-    /**
-     * Zelen & Severo approximation for the standard normal CDF.
-     * The error is bounded by 7.5 * 10e-8.
-     * */
+/**
+ * Zelen & Severo approximation for the standard normal CDF.
+ * The error is bounded by 7.5 * 10e-8.
+ * */
+public fun zSNormalCDF(x: Double): Double {
 
     val t = 1 / (1 + 0.2316419 * x.absoluteValue)
     val summ = 0.319381530*t - 0.356563782*t.pow(2) + 1.781477937*t.pow(3) - 1.821255978*t.pow(4) + 1.330274429*t.pow(5)
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
index 72b9ca7a2..cabff25e6 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/SeriesAlgebra.kt
@@ -216,7 +216,7 @@ public open class SeriesAlgebra<T, out A : Ring<T>, out BA : BufferAlgebra<T, A>
 
     override fun multiply(left: Buffer<T>, right: Buffer<T>): Buffer<T> = left.zip(right) { l, r -> l * r }
 
-    public fun Buffer<T>.diff(shift: Int=1): Buffer<T> = this.zipWithShift(shift) {l, r -> r - l}
+    public fun Buffer<T>.difference(shift: Int=1): Buffer<T> = this.zipWithShift(shift) {l, r -> r - l}
 
     public companion object
 }
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
index 280a9db64..3c6747ed2 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.series
 
+import space.kscience.kmath.distributions.zSNormalCDF
 import space.kscience.kmath.operations.DoubleField.pow
 import space.kscience.kmath.operations.algebra
 import space.kscience.kmath.operations.bufferAlgebra
@@ -12,62 +13,60 @@ import space.kscience.kmath.operations.fold
 import kotlin.math.absoluteValue
 
 
-// TODO: add p-value with formula: 2*(1 - cdf(|zScore|))
+/**
+ * Container class for Variance Ratio Test result:
+ * ratio itself, corresponding Z-score, also it's p-value
+ * **/
 public data class VarianceRatioTestResult(val varianceRatio: Double=1.0, val zScore: Double=0.0, val pValue: Double=0.5)
-    /**
-     * Container class for Variance Ratio Test result:
-     * ratio itself, corresponding Z-score, also it's p-value
-     * **/
 
-public fun varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic: Boolean=true): VarianceRatioTestResult {
 
-    /**
-     * Calculates the Z-statistic and the p-value for the Lo and MacKinlay's Variance Ratio test (1987)
-     * under Homoscedastic or Heteroscedstic assumptions
-     * with two-sided p-value test
-     * 	https://ssrn.com/abstract=346975
-     * **/
+/**
+ * Calculates the Z-statistic and the p-value for the Lo and MacKinlay's Variance Ratio test (1987)
+ * under Homoscedastic or Heteroscedstic assumptions
+ * with two-sided p-value test
+ * 	https://ssrn.com/abstract=346975
+ * **/
+public fun SeriesAlgebra<Double, *, *, *>.varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic: Boolean=true): VarianceRatioTestResult {
 
     require(shift > 1) {"Shift must be greater than one"}
     require(shift < series.size) {"Shift must be smaller than sample size"}
     val sum = { x: Double, y: Double -> x + y }
 
-    with(Double.algebra.bufferAlgebra.seriesAlgebra()) {
-        val mean = series.fold(0.0, sum) / series.size
-        val demeanedSquares = series.map { power(it - mean, 2) }
-        val variance = demeanedSquares.fold(0.0, sum)
-        if (variance == 0.0) return VarianceRatioTestResult()
+
+    val mean = series.fold(0.0, sum) / series.size
+    val demeanedSquares = series.map { (it - mean).pow(2) }
+    val variance = demeanedSquares.fold(0.0, sum)
+    if (variance == 0.0) return VarianceRatioTestResult()
 
 
-        var seriesAgg = series
-        for (i in 1..<shift) {
-            seriesAgg = seriesAgg.zip(series.moveTo(i)) { v1, v2 -> v1 + v2 }
-        }
-
-        val demeanedSquaresAgg = seriesAgg.map { power(it - shift * mean, 2) }
-        val varianceAgg = demeanedSquaresAgg.fold(0.0, sum)
-
-        val varianceRatio =
-            varianceAgg * (series.size.toDouble() - 1) / variance / (series.size.toDouble() - shift.toDouble() + 1) / (1 - shift.toDouble()/series.size.toDouble()) / shift.toDouble()
-
-
-        // calculating asymptotic variance
-        val phi = if (homoscedastic) {  // under homoscedastic null hypothesis
-            2 * (2 * shift - 1.0) * (shift - 1.0) / (3 * shift * series.size)
-        } else { // under heteroscedastic null hypothesis
-            var accumulator = 0.0
-            for (j in 1..<shift) {
-                val temp = demeanedSquares
-                val delta = series.size * temp.zipWithShift(j) { v1, v2 -> v1 * v2 }.fold(0.0, sum) / variance.pow(2)
-                accumulator += delta * 4 * (shift - j).toDouble().pow(2) / shift.toDouble().pow(2)
-            }
-            accumulator
-        }
-
-        val zScore = (varianceRatio - 1) / phi.pow(0.5)
-        val pValue = 2*(1 - zSNormalCDF(zScore.absoluteValue))
-        return VarianceRatioTestResult(varianceRatio, zScore, pValue)
+    var seriesAgg = series
+    for (i in 1..<shift) {
+        seriesAgg = seriesAgg.zip(series.moveTo(i)) { v1, v2 -> v1 + v2 }
     }
+
+    val demeanedSquaresAgg = seriesAgg.map { (it - shift * mean).pow(2) }
+    val varianceAgg = demeanedSquaresAgg.fold(0.0, sum)
+
+    val varianceRatio =
+        varianceAgg * (series.size.toDouble() - 1) / variance / (series.size.toDouble() - shift.toDouble() + 1) / (1 - shift.toDouble()/series.size.toDouble()) / shift.toDouble()
+
+
+    // calculating asymptotic variance
+    val phi = if (homoscedastic) {  // under homoscedastic null hypothesis
+        2 * (2 * shift - 1.0) * (shift - 1.0) / (3 * shift * series.size)
+    } else { // under heteroscedastic null hypothesis
+        var accumulator = 0.0
+        for (j in 1..<shift) {
+            val temp = demeanedSquares
+            val delta = series.size * temp.zipWithShift(j) { v1, v2 -> v1 * v2 }.fold(0.0, sum) / variance.pow(2)
+            accumulator += delta * 4 * (shift - j).toDouble().pow(2) / shift.toDouble().pow(2)
+        }
+        accumulator
+    }
+
+    val zScore = (varianceRatio - 1) / phi.pow(0.5)
+    val pValue = 2*(1 - zSNormalCDF(zScore.absoluteValue))
+    return VarianceRatioTestResult(varianceRatio, zScore, pValue)
 }
 
 
-- 
2.34.1


From f44039e30915530e260c1de6fb9d955c3b76d73b Mon Sep 17 00:00:00 2001
From: mrFendel <novikov.ivan@phystech.edu>
Date: Fri, 5 May 2023 18:50:10 +0300
Subject: [PATCH 707/713] -- refactoring

---
 .../kotlin/space/kscience/kmath/series/VarianceRatioTest.kt     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
index 3c6747ed2..6a2f5e426 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
@@ -7,8 +7,6 @@ package space.kscience.kmath.series
 
 import space.kscience.kmath.distributions.zSNormalCDF
 import space.kscience.kmath.operations.DoubleField.pow
-import space.kscience.kmath.operations.algebra
-import space.kscience.kmath.operations.bufferAlgebra
 import space.kscience.kmath.operations.fold
 import kotlin.math.absoluteValue
 
-- 
2.34.1


From 8eb25596a0c0847c5330bb5f3c780a3710052304 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 9 May 2023 19:22:39 +0300
Subject: [PATCH 708/713] Variance test post-merge cleanup

---
 .space.kts                                    |  4 +--
 build.gradle.kts                              |  2 +-
 .../space/kscience/kmath/ejml/_generated.kt   |  2 +-
 .../kmath/distributions/NormalDistribution.kt | 18 +++++++++++-
 .../kmath/distributions/zSNormalCdf.kt        | 24 ----------------
 .../kmath/series/VarianceRatioTest.kt         | 28 +++++++++++++------
 6 files changed, 40 insertions(+), 38 deletions(-)
 delete mode 100644 kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/zSNormalCdf.kt

diff --git a/.space.kts b/.space.kts
index c9500e967..e4d7522e3 100644
--- a/.space.kts
+++ b/.space.kts
@@ -1,3 +1,3 @@
-job("Build") {
-    gradlew("openjdk:11", "build")
+job("Build and run tests") {
+    gradlew("amazoncorretto:17-alpine", "build")
 }
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index ec67eaa54..40ae9f210 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.3.1-dev-RC"
+    version = "0.3.1"
 }
 
 subprojects {
diff --git a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
index 8ad7f7293..c56583fa8 100644
--- a/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
+++ b/kmath-ejml/src/main/kotlin/space/kscience/kmath/ejml/_generated.kt
@@ -19,9 +19,9 @@ import org.ejml.sparse.csc.factory.DecompositionFactory_DSCC
 import org.ejml.sparse.csc.factory.DecompositionFactory_FSCC
 import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
 import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.linear.*
 import space.kscience.kmath.linear.Matrix
-import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.nd.StructureFeature
 import space.kscience.kmath.operations.DoubleField
 import space.kscience.kmath.operations.FloatField
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
index ca3537005..ae814254b 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/NormalDistribution.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.distributions
 
 import space.kscience.kmath.chains.Chain
+import space.kscience.kmath.operations.DoubleField.pow
 import space.kscience.kmath.random.RandomGenerator
 import space.kscience.kmath.samplers.GaussianSampler
 import space.kscience.kmath.samplers.InternalErf
@@ -34,8 +35,23 @@ public class NormalDistribution(public val sampler: GaussianSampler) : Distribut
         }
     }
 
-    private companion object {
+    public companion object {
         private val SQRT2 = sqrt(2.0)
+
+        /**
+         * Zelen & Severo approximation for the standard normal CDF.
+         * The error upper boundary by 7.5 * 10e-8.
+         */
+        public fun zSNormalCDF(x: Double): Double {
+            val t = 1 / (1 + 0.2316419 * abs(x))
+            val sum = 0.319381530 * t -
+                    0.356563782 * t.pow(2) +
+                    1.781477937 * t.pow(3) -
+                    1.821255978 * t.pow(4) +
+                    1.330274429 * t.pow(5)
+            val temp = sum * exp(-abs(x).pow(2) / 2) / (2 * PI).pow(0.5)
+            return if (x >= 0) 1 - temp else temp
+        }
     }
 }
 
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/zSNormalCdf.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/zSNormalCdf.kt
deleted file mode 100644
index adfbbc9cd..000000000
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/distributions/zSNormalCdf.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2018-2023 KMath contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package space.kscience.kmath.distributions
-
-import space.kscience.kmath.operations.DoubleField.pow
-import kotlin.math.PI
-import kotlin.math.absoluteValue
-import kotlin.math.exp
-
-
-/**
- * Zelen & Severo approximation for the standard normal CDF.
- * The error is bounded by 7.5 * 10e-8.
- * */
-public fun zSNormalCDF(x: Double): Double {
-
-    val t = 1 / (1 + 0.2316419 * x.absoluteValue)
-    val summ = 0.319381530*t - 0.356563782*t.pow(2) + 1.781477937*t.pow(3) - 1.821255978*t.pow(4) + 1.330274429*t.pow(5)
-    val temp = summ * exp(-x.absoluteValue.pow(2) / 2) / (2 * PI).pow(0.5)
-    return if (x >= 0)  1 - temp else temp
-}
\ No newline at end of file
diff --git a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
index 6a2f5e426..4becb3413 100644
--- a/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
+++ b/kmath-stat/src/commonMain/kotlin/space/kscience/kmath/series/VarianceRatioTest.kt
@@ -5,7 +5,7 @@
 
 package space.kscience.kmath.series
 
-import space.kscience.kmath.distributions.zSNormalCDF
+import space.kscience.kmath.distributions.NormalDistribution
 import space.kscience.kmath.operations.DoubleField.pow
 import space.kscience.kmath.operations.fold
 import kotlin.math.absoluteValue
@@ -14,8 +14,12 @@ import kotlin.math.absoluteValue
 /**
  * Container class for Variance Ratio Test result:
  * ratio itself, corresponding Z-score, also it's p-value
- * **/
-public data class VarianceRatioTestResult(val varianceRatio: Double=1.0, val zScore: Double=0.0, val pValue: Double=0.5)
+ */
+public data class VarianceRatioTestResult(
+    val varianceRatio: Double = 1.0,
+    val zScore: Double = 0.0,
+    val pValue: Double = 0.5,
+)
 
 
 /**
@@ -23,11 +27,17 @@ public data class VarianceRatioTestResult(val varianceRatio: Double=1.0, val zSc
  * under Homoscedastic or Heteroscedstic assumptions
  * with two-sided p-value test
  * 	https://ssrn.com/abstract=346975
- * **/
-public fun SeriesAlgebra<Double, *, *, *>.varianceRatioTest(series: Series<Double>, shift: Int, homoscedastic: Boolean=true): VarianceRatioTestResult {
+ *
+ * 	@author https://github.com/mrFendel
+ */
+public fun SeriesAlgebra<Double, *, *, *>.varianceRatioTest(
+    series: Series<Double>,
+    shift: Int,
+    homoscedastic: Boolean = true,
+): VarianceRatioTestResult {
 
-    require(shift > 1) {"Shift must be greater than one"}
-    require(shift < series.size) {"Shift must be smaller than sample size"}
+    require(shift > 1) { "Shift must be greater than one" }
+    require(shift < series.size) { "Shift must be smaller than sample size" }
     val sum = { x: Double, y: Double -> x + y }
 
 
@@ -46,7 +56,7 @@ public fun SeriesAlgebra<Double, *, *, *>.varianceRatioTest(series: Series<Doubl
     val varianceAgg = demeanedSquaresAgg.fold(0.0, sum)
 
     val varianceRatio =
-        varianceAgg * (series.size.toDouble() - 1) / variance / (series.size.toDouble() - shift.toDouble() + 1) / (1 - shift.toDouble()/series.size.toDouble()) / shift.toDouble()
+        varianceAgg * (series.size.toDouble() - 1) / variance / (series.size.toDouble() - shift.toDouble() + 1) / (1 - shift.toDouble() / series.size.toDouble()) / shift.toDouble()
 
 
     // calculating asymptotic variance
@@ -63,7 +73,7 @@ public fun SeriesAlgebra<Double, *, *, *>.varianceRatioTest(series: Series<Doubl
     }
 
     val zScore = (varianceRatio - 1) / phi.pow(0.5)
-    val pValue = 2*(1 - zSNormalCDF(zScore.absoluteValue))
+    val pValue = 2 * (1 - NormalDistribution.zSNormalCDF(zScore.absoluteValue))
     return VarianceRatioTestResult(varianceRatio, zScore, pValue)
 }
 
-- 
2.34.1


From 4ab1b7d0d47ed46946533be20bc42d6a08e9adf8 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 9 May 2023 19:28:38 +0300
Subject: [PATCH 709/713] update space automation

---
 .gitignore           |  1 +
 .space.kts           | 49 ++++++++++++++++++++++++++++++++++++++++++--
 test-utils/README.md |  4 ++++
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 test-utils/README.md

diff --git a/.gitignore b/.gitignore
index 7713a9f96..96a556ae1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ out/
 
 .idea/
 .vscode/
+.fleet/
 
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
diff --git a/.space.kts b/.space.kts
index e4d7522e3..ce52a2f5c 100644
--- a/.space.kts
+++ b/.space.kts
@@ -1,3 +1,48 @@
-job("Build and run tests") {
-    gradlew("amazoncorretto:17-alpine", "build")
+import kotlin.io.path.readText
+
+val projectName = "kmath"
+
+job("Build") {
+    //Perform only jvm tests
+    gradlew("spc.registry.jetbrains.space/p/sci/containers/kotlin-ci:1.0.3", "test", "jvmTest")
+}
+
+job("Publish") {
+    startOn {
+        gitPush { enabled = false }
+    }
+    container("spc.registry.jetbrains.space/p/sci/containers/kotlin-ci:1.0.3") {
+        env["SPACE_USER"] = "{{ project:space_user }}"
+        env["SPACE_TOKEN"] = "{{ project:space_token }}"
+        kotlinScript { api ->
+
+            val spaceUser = System.getenv("SPACE_USER")
+            val spaceToken = System.getenv("SPACE_TOKEN")
+
+            // write the version to the build directory
+            api.gradlew("version")
+
+            //read the version from build file
+            val version = java.nio.file.Path.of("build/project-version.txt").readText()
+
+            val revisionSuffix = if (version.endsWith("SNAPSHOT")) {
+                "-" + api.gitRevision().take(7)
+            } else {
+                ""
+            }
+
+            api.space().projects.automation.deployments.start(
+                project = api.projectIdentifier(),
+                targetIdentifier = TargetIdentifier.Key(projectName),
+                version = version+revisionSuffix,
+                // automatically update deployment status based on the status of a job
+                syncWithAutomationJob = true
+            )
+            api.gradlew(
+                "publishAllPublicationsToSpaceRepository",
+                "-Ppublishing.space.user=\"$spaceUser\"",
+                "-Ppublishing.space.token=\"$spaceToken\"",
+            )
+        }
+    }
 }
\ No newline at end of file
diff --git a/test-utils/README.md b/test-utils/README.md
new file mode 100644
index 000000000..6ff8b98e8
--- /dev/null
+++ b/test-utils/README.md
@@ -0,0 +1,4 @@
+# Module test-utils
+
+
+
-- 
2.34.1


From 4ab2244ac93662ac24b64b3ff860b3367a13ef60 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 9 May 2023 19:44:39 +0300
Subject: [PATCH 710/713] update space automation

---
 CHANGELOG.md                                  |   2 +-
 .../kotlin/space/kscience/kmath/ast/utils.kt  |   2 +
 kmath-core/api/kmath-core.api                 | 893 ++++++++++++++++--
 .../kmath/structures/bufferPrimitiveAccess.kt |   1 -
 kmath-memory/api/kmath-memory.api             |  19 +-
 kmath-viktor/api/kmath-viktor.api             |   8 +-
 6 files changed, 821 insertions(+), 104 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 998e6daae..2f011881f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@
 
 ### Security
 
-## 0.3.1-dev-RC - 2023-04-09
+## 0.3.1 - 2023-04-09
 
 ### Added
 - Wasm support for `memory`, `core`, `complex` and `functions` modules.
diff --git a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
index 9f0fb33ab..be890273d 100644
--- a/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.ast
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.Symbol
@@ -30,6 +31,7 @@ private object GenericAsmCompilerTestContext : CompilerTestContext {
         asmCompile(algebra as Algebra<Double>, arguments)
 }
 
+@OptIn(UnstableKMathAPI::class)
 private object PrimitiveAsmCompilerTestContext : CompilerTestContext {
     override fun MST.compileToExpression(algebra: IntRing): Expression<Int> = asmCompileToExpression(algebra)
     override fun MST.compile(algebra: IntRing, arguments: Map<Symbol, Int>): Int = asmCompile(algebra, arguments)
diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index 737d33f1c..e3c33e8c6 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -1,27 +1,100 @@
+public abstract interface class space/kscience/kmath/data/ColumnarData {
+	public abstract fun get (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/structures/Buffer;
+	public abstract fun getSize ()I
+}
+
 public final class space/kscience/kmath/data/ColumnarDataKt {
+	public static final fun asColumnarData (Lspace/kscience/kmath/nd/Structure2D;Ljava/util/Map;)Lspace/kscience/kmath/data/ColumnarData;
 	public static final fun getIndices (Lspace/kscience/kmath/data/ColumnarData;)Lkotlin/ranges/IntRange;
 }
 
+public abstract interface class space/kscience/kmath/data/XYColumnarData : space/kscience/kmath/data/ColumnarData {
+	public static final field Companion Lspace/kscience/kmath/data/XYColumnarData$Companion;
+	public fun get (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/structures/Buffer;
+	public abstract fun getX ()Lspace/kscience/kmath/structures/Buffer;
+	public abstract fun getY ()Lspace/kscience/kmath/structures/Buffer;
+}
+
 public final class space/kscience/kmath/data/XYColumnarData$Companion {
+	public final fun of (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/data/XYColumnarData;
 }
 
 public final class space/kscience/kmath/data/XYColumnarDataKt {
+	public static final fun asXYData (Lspace/kscience/kmath/data/ColumnarData;Lspace/kscience/kmath/expressions/Symbol;Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/data/XYColumnarData;
+	public static final fun asXYData (Lspace/kscience/kmath/nd/Structure2D;II)Lspace/kscience/kmath/data/XYColumnarData;
 	public static synthetic fun asXYData$default (Lspace/kscience/kmath/nd/Structure2D;IIILjava/lang/Object;)Lspace/kscience/kmath/data/XYColumnarData;
 }
 
+public abstract interface class space/kscience/kmath/data/XYErrorColumnarData : space/kscience/kmath/data/XYColumnarData {
+	public static final field Companion Lspace/kscience/kmath/data/XYErrorColumnarData$Companion;
+	public fun get (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/structures/Buffer;
+	public abstract fun getYErr ()Lspace/kscience/kmath/structures/Buffer;
+}
+
 public final class space/kscience/kmath/data/XYErrorColumnarData$Companion {
 	public final fun of (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/data/XYErrorColumnarData;
 }
 
+public abstract interface class space/kscience/kmath/data/XYZColumnarData : space/kscience/kmath/data/XYColumnarData {
+	public fun get (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/structures/Buffer;
+	public abstract fun getZ ()Lspace/kscience/kmath/structures/Buffer;
+}
+
 public abstract interface class space/kscience/kmath/domains/Domain {
 	public abstract fun contains (Lspace/kscience/kmath/structures/Buffer;)Z
 	public abstract fun getDimension ()I
 }
 
+public abstract class space/kscience/kmath/domains/Domain1D : space/kscience/kmath/domains/Domain {
+	public fun <init> (Lkotlin/ranges/ClosedRange;)V
+	public final fun contains (Ljava/lang/Comparable;)Z
+	public fun contains (Lspace/kscience/kmath/structures/Buffer;)Z
+	public fun getDimension ()I
+	public final fun getRange ()Lkotlin/ranges/ClosedRange;
+}
+
 public final class space/kscience/kmath/domains/Domain1DKt {
 	public static final fun getCenter (Lspace/kscience/kmath/domains/Domain1D;)D
 }
 
+public abstract interface class space/kscience/kmath/domains/DoubleDomain : space/kscience/kmath/domains/Domain {
+	public abstract fun getLowerBound (I)D
+	public abstract fun getUpperBound (I)D
+	public abstract fun volume ()D
+}
+
+public final class space/kscience/kmath/domains/DoubleDomain1D : space/kscience/kmath/domains/Domain1D, space/kscience/kmath/domains/DoubleDomain {
+	public fun <init> (Lkotlin/ranges/ClosedFloatingPointRange;)V
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getDoubleRange ()Lkotlin/ranges/ClosedFloatingPointRange;
+	public fun getLowerBound (I)D
+	public fun getUpperBound (I)D
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+	public fun volume ()D
+}
+
+public final class space/kscience/kmath/domains/HyperSquareDomain : space/kscience/kmath/domains/DoubleDomain {
+	public fun <init> (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)V
+	public fun contains (Lspace/kscience/kmath/structures/Buffer;)Z
+	public final fun getCenter-Dv3HvWU ()[D
+	public fun getDimension ()I
+	public final fun getLower ()Lspace/kscience/kmath/structures/Buffer;
+	public fun getLowerBound (I)D
+	public final fun getUpper ()Lspace/kscience/kmath/structures/Buffer;
+	public fun getUpperBound (I)D
+	public fun volume ()D
+}
+
+public final class space/kscience/kmath/domains/UnconstrainedDomain : space/kscience/kmath/domains/DoubleDomain {
+	public fun <init> (I)V
+	public fun contains (Lspace/kscience/kmath/structures/Buffer;)Z
+	public fun getDimension ()I
+	public fun getLowerBound (I)D
+	public fun getUpperBound (I)D
+	public fun volume ()D
+}
+
 public abstract interface class space/kscience/kmath/expressions/AutoDiffProcessor {
 	public abstract fun differentiate (Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/DifferentiableExpression;
 }
@@ -31,6 +104,140 @@ public class space/kscience/kmath/expressions/AutoDiffValue {
 	public final fun getValue ()Ljava/lang/Object;
 }
 
+public abstract interface class space/kscience/kmath/expressions/DS {
+	public abstract fun getData ()Lspace/kscience/kmath/structures/Buffer;
+	public abstract fun getDerivativeAlgebra ()Lspace/kscience/kmath/expressions/DSAlgebra;
+}
+
+public abstract class space/kscience/kmath/expressions/DSAlgebra : space/kscience/kmath/expressions/ExpressionAlgebra, space/kscience/kmath/expressions/SymbolIndexer {
+	public fun <init> (Lspace/kscience/kmath/operations/Ring;ILjava/util/Map;)V
+	protected final fun DS (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun bindSymbol (Ljava/lang/String;)Ljava/lang/Object;
+	public fun bindSymbol (Ljava/lang/String;)Lspace/kscience/kmath/expressions/DSAlgebra$DSSymbol;
+	public final fun bindSymbol (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/expressions/DSAlgebra$DSSymbol;
+	public synthetic fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
+	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/DSAlgebra$DSSymbol;
+	public final fun bindSymbolOrNull (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/expressions/DSAlgebra$DSSymbol;
+	public synthetic fun const (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun const (Ljava/lang/Object;)Lspace/kscience/kmath/expressions/DS;
+	public final fun derivative (Lspace/kscience/kmath/expressions/DS;Ljava/util/List;)Ljava/lang/Object;
+	public final fun derivative (Lspace/kscience/kmath/expressions/DS;[Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
+	public final fun getAlgebra ()Lspace/kscience/kmath/operations/Ring;
+	public final fun getCompiler ()Lspace/kscience/kmath/expressions/DSCompiler;
+	public final fun getOrder ()I
+	public fun getSymbols ()Ljava/util/List;
+	public final fun ofDerivatives ([Ljava/lang/Object;)Lspace/kscience/kmath/expressions/DS;
+	public final fun variable (ILjava/lang/Object;)Lspace/kscience/kmath/expressions/DS;
+}
+
+public final class space/kscience/kmath/expressions/DSAlgebra$DSSymbol : space/kscience/kmath/expressions/DS, space/kscience/kmath/expressions/Symbol {
+	public fun getData ()Lspace/kscience/kmath/structures/Buffer;
+	public fun getDerivativeAlgebra ()Lspace/kscience/kmath/expressions/DSAlgebra;
+	public fun getIdentity ()Ljava/lang/String;
+}
+
+public final class space/kscience/kmath/expressions/DSAlgebraKt {
+	public static final fun derivative (Lspace/kscience/kmath/expressions/DS;Ljava/util/List;)Ljava/lang/Object;
+	public static final fun derivative (Lspace/kscience/kmath/expressions/DS;[Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
+	public static final fun getAutodiff (Lkotlin/jvm/internal/DoubleCompanionObject;)Lspace/kscience/kmath/expressions/DSFieldProcessor;
+	public static final fun getValue (Lspace/kscience/kmath/expressions/DS;)Ljava/lang/Object;
+}
+
+public final class space/kscience/kmath/expressions/DSCompiler {
+	public final fun getAlgebra ()Lspace/kscience/kmath/operations/Algebra;
+	public final fun getFreeParameters ()I
+	public final fun getOrder ()I
+	public final fun getPartialDerivativeIndex ([I)I
+	public final fun getPartialDerivativeOrders (I)[I
+	public final fun getSize ()I
+	public final fun getSizes ()[[I
+}
+
+public final class space/kscience/kmath/expressions/DSField : space/kscience/kmath/expressions/DSRing, space/kscience/kmath/operations/ExtendedField {
+	public fun <init> (Lspace/kscience/kmath/operations/ExtendedField;ILjava/util/Map;)V
+	public synthetic fun acos (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun acos (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun acosh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun acosh (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun asin (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun asin (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun asinh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun asinh (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun atan (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun atan (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun atanh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun atanh (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun cos (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun cos (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun cosh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun cosh (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun divide (Lspace/kscience/kmath/expressions/DS;Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun exp (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun exp (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun ln (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun ln (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
+	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun power (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
+	public fun power (Lspace/kscience/kmath/expressions/DS;Ljava/lang/Number;)Lspace/kscience/kmath/expressions/DS;
+	public final fun power (Lspace/kscience/kmath/expressions/DS;Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun sin (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun sin (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun sinh (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun sqrt (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun sqrt (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun tan (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun tan (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun tanh (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun tanh (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+}
+
+public final class space/kscience/kmath/expressions/DSFieldExpression : space/kscience/kmath/expressions/DifferentiableExpression {
+	public fun <init> (Lspace/kscience/kmath/operations/ExtendedField;Lkotlin/jvm/functions/Function1;)V
+	public fun derivativeOrNull (Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
+	public final fun getAlgebra ()Lspace/kscience/kmath/operations/ExtendedField;
+	public final fun getFunction ()Lkotlin/jvm/functions/Function1;
+	public fun invoke (Ljava/util/Map;)Ljava/lang/Object;
+}
+
+public final class space/kscience/kmath/expressions/DSFieldProcessor : space/kscience/kmath/expressions/AutoDiffProcessor {
+	public fun <init> (Lspace/kscience/kmath/operations/ExtendedField;)V
+	public fun differentiate (Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/DifferentiableExpression;
+	public final fun getAlgebra ()Lspace/kscience/kmath/operations/ExtendedField;
+}
+
+public class space/kscience/kmath/expressions/DSRing : space/kscience/kmath/expressions/DSAlgebra, space/kscience/kmath/operations/NumbersAddOps, space/kscience/kmath/operations/NumericAlgebra, space/kscience/kmath/operations/Ring, space/kscience/kmath/operations/ScaleOperations {
+	public fun <init> (Lspace/kscience/kmath/operations/Ring;ILjava/util/Map;)V
+	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun add (Lspace/kscience/kmath/expressions/DS;Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
+	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/DSAlgebra$DSSymbol;
+	public final fun getElementBufferFactory ()Lspace/kscience/kmath/structures/MutableBufferFactory;
+	public synthetic fun getOne ()Ljava/lang/Object;
+	public fun getOne ()Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun getZero ()Ljava/lang/Object;
+	public fun getZero ()Lspace/kscience/kmath/expressions/DS;
+	protected final fun mapData (Lspace/kscience/kmath/expressions/DS;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/expressions/DS;
+	protected final fun mapDataIndexed (Lspace/kscience/kmath/expressions/DS;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun minus (Ljava/lang/Number;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun minus (Ljava/lang/Number;Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun multiply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun multiply (Lspace/kscience/kmath/expressions/DS;Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
+	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun plus (Ljava/lang/Number;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun plus (Ljava/lang/Number;Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun plus (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
+	public fun plus (Lspace/kscience/kmath/expressions/DS;Ljava/lang/Number;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object;
+	public fun scale (Lspace/kscience/kmath/expressions/DS;D)Lspace/kscience/kmath/expressions/DS;
+	protected final fun transformDataBuffer (Lspace/kscience/kmath/expressions/DS;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/expressions/DS;
+	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun unaryMinus (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
+}
+
 public final class space/kscience/kmath/expressions/DerivationResult {
 	public fun <init> (Ljava/lang/Object;Ljava/util/Map;Lspace/kscience/kmath/operations/Field;)V
 	public final fun derivative (Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
@@ -39,6 +246,22 @@ public final class space/kscience/kmath/expressions/DerivationResult {
 	public final fun getValue ()Ljava/lang/Object;
 }
 
+public final class space/kscience/kmath/expressions/DerivativeStructureRingExpression : space/kscience/kmath/expressions/DifferentiableExpression {
+	public fun <init> (Lspace/kscience/kmath/operations/Ring;Lspace/kscience/kmath/structures/MutableBufferFactory;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Lspace/kscience/kmath/operations/Ring;Lspace/kscience/kmath/structures/MutableBufferFactory;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun derivativeOrNull (Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
+	public final fun getAlgebra ()Lspace/kscience/kmath/operations/Ring;
+	public final fun getElementBufferFactory ()Lspace/kscience/kmath/structures/MutableBufferFactory;
+	public final fun getFunction ()Lkotlin/jvm/functions/Function1;
+	public fun invoke (Ljava/util/Map;)Ljava/lang/Object;
+}
+
+public final class space/kscience/kmath/expressions/DiffExpressionWithDefault : space/kscience/kmath/expressions/DifferentiableExpression {
+	public fun <init> (Lspace/kscience/kmath/expressions/DifferentiableExpression;Ljava/util/Map;)V
+	public fun derivativeOrNull (Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
+	public fun invoke (Ljava/util/Map;)Ljava/lang/Object;
+}
+
 public abstract interface class space/kscience/kmath/expressions/DifferentiableExpression : space/kscience/kmath/expressions/Expression {
 	public abstract fun derivativeOrNull (Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
 }
@@ -52,6 +275,17 @@ public final class space/kscience/kmath/expressions/DifferentiableExpressionKt {
 	public static final fun derivative (Lspace/kscience/kmath/expressions/SpecialDifferentiableExpression;[Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/expressions/Expression;
 }
 
+public abstract interface class space/kscience/kmath/expressions/DoubleExpression : space/kscience/kmath/expressions/Expression {
+	public static final field Companion Lspace/kscience/kmath/expressions/DoubleExpression$Companion;
+	public abstract fun getIndexer ()Lspace/kscience/kmath/expressions/SymbolIndexer;
+	public fun invoke (Ljava/util/Map;)Ljava/lang/Double;
+	public synthetic fun invoke (Ljava/util/Map;)Ljava/lang/Object;
+	public abstract fun invoke ([D)D
+}
+
+public final class space/kscience/kmath/expressions/DoubleExpression$Companion {
+}
+
 public abstract interface class space/kscience/kmath/expressions/Expression {
 	public abstract fun invoke (Ljava/util/Map;)Ljava/lang/Object;
 }
@@ -64,7 +298,23 @@ public final class space/kscience/kmath/expressions/ExpressionKt {
 	public static final fun callByString (Lspace/kscience/kmath/expressions/Expression;[Lkotlin/Pair;)Ljava/lang/Object;
 	public static final fun callBySymbol (Lspace/kscience/kmath/expressions/Expression;[Lkotlin/Pair;)Ljava/lang/Object;
 	public static final fun getBinding (Lspace/kscience/kmath/expressions/ExpressionAlgebra;)Lkotlin/properties/ReadOnlyProperty;
+	public static final fun invoke (Lspace/kscience/kmath/expressions/DoubleExpression;)D
+	public static final fun invoke (Lspace/kscience/kmath/expressions/DoubleExpression;[D)D
 	public static final fun invoke (Lspace/kscience/kmath/expressions/Expression;)Ljava/lang/Object;
+	public static final fun invoke (Lspace/kscience/kmath/expressions/IntExpression;)I
+	public static final fun invoke (Lspace/kscience/kmath/expressions/IntExpression;[I)I
+	public static final fun invoke (Lspace/kscience/kmath/expressions/LongExpression;)J
+	public static final fun invoke (Lspace/kscience/kmath/expressions/LongExpression;[J)J
+}
+
+public final class space/kscience/kmath/expressions/ExpressionWithDefault : space/kscience/kmath/expressions/Expression {
+	public fun <init> (Lspace/kscience/kmath/expressions/Expression;Ljava/util/Map;)V
+	public fun invoke (Ljava/util/Map;)Ljava/lang/Object;
+}
+
+public final class space/kscience/kmath/expressions/ExpressionWithDefaultKt {
+	public static final fun withDefaultArgs (Lspace/kscience/kmath/expressions/DifferentiableExpression;Ljava/util/Map;)Lspace/kscience/kmath/expressions/DiffExpressionWithDefault;
+	public static final fun withDefaultArgs (Lspace/kscience/kmath/expressions/Expression;Ljava/util/Map;)Lspace/kscience/kmath/expressions/ExpressionWithDefault;
 }
 
 public abstract class space/kscience/kmath/expressions/FirstDerivativeExpression : space/kscience/kmath/expressions/DifferentiableExpression {
@@ -160,6 +410,28 @@ public class space/kscience/kmath/expressions/FunctionalExpressionRing : space/k
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
 }
 
+public abstract interface class space/kscience/kmath/expressions/IntExpression : space/kscience/kmath/expressions/Expression {
+	public static final field Companion Lspace/kscience/kmath/expressions/IntExpression$Companion;
+	public abstract fun getIndexer ()Lspace/kscience/kmath/expressions/SymbolIndexer;
+	public fun invoke (Ljava/util/Map;)Ljava/lang/Integer;
+	public synthetic fun invoke (Ljava/util/Map;)Ljava/lang/Object;
+	public abstract fun invoke ([I)I
+}
+
+public final class space/kscience/kmath/expressions/IntExpression$Companion {
+}
+
+public abstract interface class space/kscience/kmath/expressions/LongExpression : space/kscience/kmath/expressions/Expression {
+	public static final field Companion Lspace/kscience/kmath/expressions/LongExpression$Companion;
+	public abstract fun getIndexer ()Lspace/kscience/kmath/expressions/SymbolIndexer;
+	public fun invoke (Ljava/util/Map;)Ljava/lang/Long;
+	public synthetic fun invoke (Ljava/util/Map;)Ljava/lang/Object;
+	public abstract fun invoke ([J)J
+}
+
+public final class space/kscience/kmath/expressions/LongExpression$Companion {
+}
+
 public abstract interface class space/kscience/kmath/expressions/MST {
 }
 
@@ -318,6 +590,22 @@ public final class space/kscience/kmath/expressions/MstGroup : space/kscience/km
 	public fun unaryPlus (Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Unary;
 }
 
+public final class space/kscience/kmath/expressions/MstLogicAlgebra : space/kscience/kmath/operations/LogicAlgebra {
+	public static final field INSTANCE Lspace/kscience/kmath/expressions/MstLogicAlgebra;
+	public synthetic fun and (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun and (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST;
+	public synthetic fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
+	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/MST;
+	public synthetic fun const (Z)Ljava/lang/Object;
+	public fun const (Z)Lspace/kscience/kmath/expressions/Symbol;
+	public synthetic fun not (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun not (Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST;
+	public synthetic fun or (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun or (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST;
+	public synthetic fun xor (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun xor (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST;
+}
+
 public final class space/kscience/kmath/expressions/MstNumericAlgebra : space/kscience/kmath/operations/NumericAlgebra {
 	public static final field INSTANCE Lspace/kscience/kmath/expressions/MstNumericAlgebra;
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
@@ -356,6 +644,35 @@ public final class space/kscience/kmath/expressions/MstRing : space/kscience/kma
 	public fun unaryPlus (Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Unary;
 }
 
+public final class space/kscience/kmath/expressions/NamedMatrix : space/kscience/kmath/nd/Structure2D {
+	public static final field Companion Lspace/kscience/kmath/expressions/NamedMatrix$Companion;
+	public fun <init> (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/expressions/SymbolIndexer;)V
+	public fun elements ()Lkotlin/sequences/Sequence;
+	public fun get (II)Ljava/lang/Object;
+	public final fun get (Lspace/kscience/kmath/expressions/Symbol;Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
+	public fun get ([I)Ljava/lang/Object;
+	public fun getColNum ()I
+	public fun getColumns ()Ljava/util/List;
+	public fun getDimension ()I
+	public synthetic fun getFeature (Lkotlin/reflect/KClass;)Ljava/lang/Object;
+	public fun getFeature (Lkotlin/reflect/KClass;)Lspace/kscience/kmath/nd/StructureFeature;
+	public final fun getIndexer ()Lspace/kscience/kmath/expressions/SymbolIndexer;
+	public fun getIndices ()Lspace/kscience/kmath/nd/ShapeIndexer;
+	public fun getRowNum ()I
+	public fun getRows ()Ljava/util/List;
+	public fun getShape-IIYLAfE ()[I
+	public final fun getValues ()Lspace/kscience/kmath/nd/Structure2D;
+}
+
+public final class space/kscience/kmath/expressions/NamedMatrix$Companion {
+	public final fun toStringWithSymbols (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/expressions/SymbolIndexer;)Ljava/lang/String;
+}
+
+public final class space/kscience/kmath/expressions/NamedMatrixKt {
+	public static final fun named (Lspace/kscience/kmath/nd/Structure2D;Ljava/util/List;)Lspace/kscience/kmath/expressions/NamedMatrix;
+	public static final fun named (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/expressions/SymbolIndexer;)Lspace/kscience/kmath/expressions/NamedMatrix;
+}
+
 public final class space/kscience/kmath/expressions/SimpleAutoDiffExpression : space/kscience/kmath/expressions/FirstDerivativeExpression {
 	public fun <init> (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function1;)V
 	public fun derivativeOrNull (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/expressions/Expression;
@@ -461,13 +778,22 @@ public final class space/kscience/kmath/expressions/SimpleAutoDiffKt {
 	public static final fun tanh (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 }
 
-public abstract interface class space/kscience/kmath/expressions/SpecialDifferentiableExpression : space/kscience/kmath/expressions/DifferentiableExpression {
-	public abstract fun derivativeOrNull (Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
+public final class space/kscience/kmath/expressions/SimpleSymbolIndexer : space/kscience/kmath/expressions/SymbolIndexer {
+	public static final synthetic fun box-impl (Ljava/util/List;)Lspace/kscience/kmath/expressions/SimpleSymbolIndexer;
+	public static fun constructor-impl (Ljava/util/List;)Ljava/util/List;
+	public fun equals (Ljava/lang/Object;)Z
+	public static fun equals-impl (Ljava/util/List;Ljava/lang/Object;)Z
+	public static final fun equals-impl0 (Ljava/util/List;Ljava/util/List;)Z
+	public fun getSymbols ()Ljava/util/List;
+	public fun hashCode ()I
+	public static fun hashCode-impl (Ljava/util/List;)I
+	public fun toString ()Ljava/lang/String;
+	public static fun toString-impl (Ljava/util/List;)Ljava/lang/String;
+	public final synthetic fun unbox-impl ()Ljava/util/List;
 }
 
-public final class space/kscience/kmath/expressions/SpecialExpressionsKt {
-	public static final fun chiSquaredExpression (Lspace/kscience/kmath/expressions/AutoDiffProcessor;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/expressions/DifferentiableExpression;
-	public static final fun genericChiSquaredExpression (Lspace/kscience/kmath/expressions/AutoDiffProcessor;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/expressions/DifferentiableExpression;
+public abstract interface class space/kscience/kmath/expressions/SpecialDifferentiableExpression : space/kscience/kmath/expressions/DifferentiableExpression {
+	public abstract fun derivativeOrNull (Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
 }
 
 public abstract interface class space/kscience/kmath/expressions/Symbol : space/kscience/kmath/expressions/MST {
@@ -484,7 +810,25 @@ public final class space/kscience/kmath/expressions/Symbol$Companion {
 	public final fun getZError ()Lspace/kscience/kmath/expressions/Symbol;
 }
 
+public abstract interface class space/kscience/kmath/expressions/SymbolIndexer {
+	public fun get (Ljava/util/List;Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
+	public fun get (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/expressions/Symbol;Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
+	public fun get (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
+	public fun get ([DLspace/kscience/kmath/expressions/Symbol;)D
+	public fun get ([Ljava/lang/Object;Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
+	public abstract fun getSymbols ()Ljava/util/List;
+	public fun indexOf (Lspace/kscience/kmath/expressions/Symbol;)I
+	public fun toDoubleArray (Ljava/util/Map;)[D
+	public fun toList (Ljava/util/Map;)Ljava/util/List;
+	public fun toMap (Lspace/kscience/kmath/structures/Buffer;)Ljava/util/Map;
+	public fun toMap ([D)Ljava/util/Map;
+	public fun toPoint (Ljava/util/Map;Lspace/kscience/kmath/structures/BufferFactory;)Lspace/kscience/kmath/structures/Buffer;
+	public fun toPoint-Udx-57Q (Ljava/util/Map;)[D
+}
+
 public final class space/kscience/kmath/expressions/SymbolIndexerKt {
+	public static final fun withSymbols (Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public static final fun withSymbols ([Lspace/kscience/kmath/expressions/Symbol;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
 public final class space/kscience/kmath/expressions/SymbolKt {
@@ -510,7 +854,7 @@ public final class space/kscience/kmath/linear/BufferedLinearSpace : space/kscie
 }
 
 public final class space/kscience/kmath/linear/BufferedLinearSpaceKt {
-	public static final fun linearSpace (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/linear/BufferedLinearSpace;
+	public static final fun getLinearSpace (Lspace/kscience/kmath/operations/Ring;)Lspace/kscience/kmath/linear/BufferedLinearSpace;
 }
 
 public abstract interface class space/kscience/kmath/linear/CholeskyDecompositionFeature : space/kscience/kmath/linear/MatrixFeature {
@@ -581,6 +925,7 @@ public abstract interface class space/kscience/kmath/linear/LinearSpace {
 	public static final field Companion Lspace/kscience/kmath/linear/LinearSpace$Companion;
 	public abstract fun buildMatrix (IILkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/Structure2D;
 	public abstract fun buildVector (ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/structures/Buffer;
+	public fun computeFeature (Lspace/kscience/kmath/nd/Structure2D;Lkotlin/reflect/KClass;)Lspace/kscience/kmath/nd/StructureFeature;
 	public fun dot (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
 	public fun dot (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
 	public abstract fun getElementAlgebra ()Lspace/kscience/kmath/operations/Ring;
@@ -597,9 +942,7 @@ public abstract interface class space/kscience/kmath/linear/LinearSpace {
 }
 
 public final class space/kscience/kmath/linear/LinearSpace$Companion {
-	public final fun buffered (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/linear/LinearSpace;
-	public static synthetic fun buffered$default (Lspace/kscience/kmath/linear/LinearSpace$Companion;Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lspace/kscience/kmath/linear/LinearSpace;
-	public final fun getDouble ()Lspace/kscience/kmath/linear/LinearSpace;
+	public final fun buffered (Lspace/kscience/kmath/operations/Ring;)Lspace/kscience/kmath/linear/LinearSpace;
 }
 
 public final class space/kscience/kmath/linear/LinearSpaceKt {
@@ -628,11 +971,11 @@ public abstract interface class space/kscience/kmath/linear/LupDecompositionFeat
 
 public final class space/kscience/kmath/linear/LupDecompositionKt {
 	public static final fun abs (Lspace/kscience/kmath/linear/LinearSpace;Ljava/lang/Comparable;)Ljava/lang/Comparable;
-	public static final fun lup (Lspace/kscience/kmath/linear/LinearSpace;Lkotlin/jvm/functions/Function2;Lspace/kscience/kmath/nd/Structure2D;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/linear/LupDecomposition;
 	public static final fun lup (Lspace/kscience/kmath/linear/LinearSpace;Lspace/kscience/kmath/nd/Structure2D;D)Lspace/kscience/kmath/linear/LupDecomposition;
+	public static final fun lup (Lspace/kscience/kmath/linear/LinearSpace;Lspace/kscience/kmath/structures/MutableBufferFactory;Lspace/kscience/kmath/nd/Structure2D;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/linear/LupDecomposition;
 	public static synthetic fun lup$default (Lspace/kscience/kmath/linear/LinearSpace;Lspace/kscience/kmath/nd/Structure2D;DILjava/lang/Object;)Lspace/kscience/kmath/linear/LupDecomposition;
 	public static final fun lupSolver (Lspace/kscience/kmath/linear/LinearSpace;D)Lspace/kscience/kmath/linear/LinearSolver;
-	public static final fun lupSolver (Lspace/kscience/kmath/linear/LinearSpace;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/linear/LinearSolver;
+	public static final fun lupSolver (Lspace/kscience/kmath/linear/LinearSpace;Lspace/kscience/kmath/structures/MutableBufferFactory;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/linear/LinearSolver;
 	public static synthetic fun lupSolver$default (Lspace/kscience/kmath/linear/LinearSpace;DILjava/lang/Object;)Lspace/kscience/kmath/linear/LinearSolver;
 }
 
@@ -647,9 +990,11 @@ public final class space/kscience/kmath/linear/MatrixBuilder {
 public final class space/kscience/kmath/linear/MatrixBuilderKt {
 	public static final fun column (Lspace/kscience/kmath/linear/LinearSpace;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/Structure2D;
 	public static final fun column (Lspace/kscience/kmath/linear/LinearSpace;[Ljava/lang/Object;)Lspace/kscience/kmath/nd/Structure2D;
+	public static final fun matrix (Lspace/kscience/kmath/linear/LinearSpace;II)Lspace/kscience/kmath/linear/MatrixBuilder;
 	public static final fun row (Lspace/kscience/kmath/linear/LinearSpace;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/Structure2D;
 	public static final fun row (Lspace/kscience/kmath/linear/LinearSpace;[Ljava/lang/Object;)Lspace/kscience/kmath/nd/Structure2D;
 	public static final fun symmetric (Lspace/kscience/kmath/linear/MatrixBuilder;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/Structure2D;
+	public static final fun vector (Lspace/kscience/kmath/linear/LinearSpace;[Ljava/lang/Object;)Lspace/kscience/kmath/structures/Buffer;
 }
 
 public abstract interface class space/kscience/kmath/linear/MatrixFeature : space/kscience/kmath/nd/StructureFeature {
@@ -673,7 +1018,7 @@ public final class space/kscience/kmath/linear/MatrixWrapper : space/kscience/km
 	public final fun getOrigin ()Lspace/kscience/kmath/nd/Structure2D;
 	public fun getRowNum ()I
 	public fun getRows ()Ljava/util/List;
-	public fun getShape ()[I
+	public fun getShape-IIYLAfE ()[I
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -726,7 +1071,7 @@ public final class space/kscience/kmath/linear/VirtualMatrix : space/kscience/km
 	public fun getColNum ()I
 	public final fun getGenerator ()Lkotlin/jvm/functions/Function2;
 	public fun getRowNum ()I
-	public fun getShape ()[I
+	public fun getShape-IIYLAfE ()[I
 }
 
 public final class space/kscience/kmath/linear/VirtualMatrixKt {
@@ -737,6 +1082,11 @@ public final class space/kscience/kmath/linear/ZeroFeature : space/kscience/kmat
 	public static final field INSTANCE Lspace/kscience/kmath/linear/ZeroFeature;
 }
 
+public final class space/kscience/kmath/misc/CollectionsKt {
+	public static final fun zipWithNextCircular (Ljava/util/List;)Ljava/util/List;
+	public static final fun zipWithNextCircular (Ljava/util/List;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
+}
+
 public final class space/kscience/kmath/misc/CumulativeKt {
 	public static final fun cumulative (Ljava/lang/Iterable;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Iterable;
 	public static final fun cumulative (Ljava/util/Iterator;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/util/Iterator;
@@ -745,6 +1095,7 @@ public final class space/kscience/kmath/misc/CumulativeKt {
 	public static final fun cumulativeSum (Ljava/lang/Iterable;Lspace/kscience/kmath/operations/Ring;)Ljava/lang/Iterable;
 	public static final fun cumulativeSum (Ljava/util/List;Lspace/kscience/kmath/operations/Ring;)Ljava/util/List;
 	public static final fun cumulativeSum (Lkotlin/sequences/Sequence;Lspace/kscience/kmath/operations/Ring;)Lkotlin/sequences/Sequence;
+	public static final fun cumulativeSum (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/operations/Ring;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun cumulativeSumOfDouble (Ljava/lang/Iterable;)Ljava/lang/Iterable;
 	public static final fun cumulativeSumOfDouble (Ljava/util/List;)Ljava/util/List;
 	public static final fun cumulativeSumOfDouble (Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
@@ -811,11 +1162,12 @@ public final class space/kscience/kmath/misc/NumbersJVMKt {
 	public static final fun toIntExact (J)I
 }
 
-public abstract interface annotation class space/kscience/kmath/misc/PerformancePitfall : java/lang/annotation/Annotation {
-	public abstract fun message ()Ljava/lang/String;
-}
-
 public final class space/kscience/kmath/misc/SortingKt {
+	public static final fun indicesSorted (Lspace/kscience/kmath/structures/Buffer;)[I
+	public static final fun indicesSortedBy (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function1;)[I
+	public static final fun indicesSortedByDescending (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function1;)[I
+	public static final fun indicesSortedDescending (Lspace/kscience/kmath/structures/Buffer;)[I
+	public static final fun indicesSortedWith (Lspace/kscience/kmath/structures/Buffer;Ljava/util/Comparator;)[I
 	public static final fun requireSorted (Lspace/kscience/kmath/structures/Buffer;)V
 	public static final fun sorted (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun sortedBy (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
@@ -823,16 +1175,14 @@ public final class space/kscience/kmath/misc/SortingKt {
 	public static final fun sortedDescending (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
 }
 
-public abstract interface annotation class space/kscience/kmath/misc/UnstableKMathAPI : java/lang/annotation/Annotation {
-}
-
 public abstract interface class space/kscience/kmath/nd/AlgebraND : space/kscience/kmath/operations/Algebra {
 	public static final field Companion Lspace/kscience/kmath/nd/AlgebraND$Companion;
 	public abstract fun getElementAlgebra ()Lspace/kscience/kmath/operations/Algebra;
+	public fun getFeature (Lspace/kscience/kmath/nd/StructureND;Lkotlin/reflect/KClass;)Lspace/kscience/kmath/nd/StructureFeature;
 	public fun invoke (Lkotlin/jvm/functions/Function1;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
 	public fun map (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
 	public fun mapIndexed (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
-	public abstract fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+	public abstract fun structureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
 	public fun zip (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
 }
 
@@ -840,17 +1190,13 @@ public final class space/kscience/kmath/nd/AlgebraND$Companion {
 }
 
 public final class space/kscience/kmath/nd/AlgebraNDExtentionsKt {
-	public static final fun one (Lspace/kscience/kmath/nd/AlgebraND;[I)Lspace/kscience/kmath/nd/StructureND;
+	public static final fun one-waz_sdI (Lspace/kscience/kmath/nd/AlgebraND;[I)Lspace/kscience/kmath/nd/StructureND;
 	public static final fun oneVarArg (Lspace/kscience/kmath/nd/AlgebraND;I[I)Lspace/kscience/kmath/nd/StructureND;
 	public static final fun structureND (Lspace/kscience/kmath/nd/AlgebraND;I[ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
-	public static final fun zero (Lspace/kscience/kmath/nd/AlgebraND;[I)Lspace/kscience/kmath/nd/StructureND;
+	public static final fun zero-waz_sdI (Lspace/kscience/kmath/nd/AlgebraND;[I)Lspace/kscience/kmath/nd/StructureND;
 	public static final fun zeroVarArg (Lspace/kscience/kmath/nd/AlgebraND;I[I)Lspace/kscience/kmath/nd/StructureND;
 }
 
-public final class space/kscience/kmath/nd/AlgebraNDKt {
-	public static final fun Shape (I[I)[I
-}
-
 public abstract interface class space/kscience/kmath/nd/BufferAlgebraND : space/kscience/kmath/nd/AlgebraND {
 	public static final field Companion Lspace/kscience/kmath/nd/BufferAlgebraND$Companion;
 	public abstract fun getBufferAlgebra ()Lspace/kscience/kmath/operations/BufferAlgebra;
@@ -860,8 +1206,8 @@ public abstract interface class space/kscience/kmath/nd/BufferAlgebraND : space/
 	public synthetic fun map (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
 	public fun mapIndexed (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/BufferND;
 	public synthetic fun mapIndexed (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
-	public fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
-	public synthetic fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+	public fun structureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
+	public synthetic fun structureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
 	public fun toBufferND (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/BufferND;
 	public fun zip (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/BufferND;
 	public synthetic fun zip (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
@@ -885,19 +1231,22 @@ public class space/kscience/kmath/nd/BufferND : space/kscience/kmath/nd/Structur
 	public fun get ([I)Ljava/lang/Object;
 	public fun getBuffer ()Lspace/kscience/kmath/structures/Buffer;
 	public fun getIndices ()Lspace/kscience/kmath/nd/ShapeIndexer;
-	public fun getShape ()[I
+	public fun getShape-IIYLAfE ()[I
 	public fun toString ()Ljava/lang/String;
 }
 
 public final class space/kscience/kmath/nd/BufferNDKt {
-	public static final fun mapToBuffer (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/BufferND;
+	public static final fun BufferND-bYNkpeI ([ILspace/kscience/kmath/structures/BufferFactory;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/BufferND;
+	public static synthetic fun BufferND-bYNkpeI$default ([ILspace/kscience/kmath/structures/BufferFactory;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/kmath/nd/BufferND;
+	public static final fun MutableBufferND-bYNkpeI ([ILspace/kscience/kmath/structures/MutableBufferFactory;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/MutableBufferND;
+	public static synthetic fun MutableBufferND-bYNkpeI$default ([ILspace/kscience/kmath/structures/MutableBufferFactory;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/kmath/nd/MutableBufferND;
 }
 
 public class space/kscience/kmath/nd/BufferedFieldOpsND : space/kscience/kmath/nd/BufferedRingOpsND, space/kscience/kmath/nd/FieldOpsND {
 	public fun <init> (Lspace/kscience/kmath/operations/BufferAlgebra;Lkotlin/jvm/functions/Function1;)V
 	public synthetic fun <init> (Lspace/kscience/kmath/operations/BufferAlgebra;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object;
 	public fun scale (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/nd/StructureND;
 }
@@ -916,29 +1265,30 @@ public class space/kscience/kmath/nd/BufferedRingOpsND : space/kscience/kmath/nd
 	public synthetic fun <init> (Lspace/kscience/kmath/operations/BufferAlgebra;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
-public final class space/kscience/kmath/nd/DefaultStrides : space/kscience/kmath/nd/Strides {
-	public static final field Companion Lspace/kscience/kmath/nd/DefaultStrides$Companion;
+public final class space/kscience/kmath/nd/ColumnStrides : space/kscience/kmath/nd/Strides {
+	public static final field Companion Lspace/kscience/kmath/nd/ColumnStrides$Companion;
 	public synthetic fun <init> ([ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getLinearSize ()I
-	public fun getShape ()[I
-	public fun getStrides ()[I
+	public fun getShape-IIYLAfE ()[I
 	public fun hashCode ()I
 	public fun index (I)[I
 }
 
-public final class space/kscience/kmath/nd/DefaultStrides$Companion {
-	public final fun invoke ([I)Lspace/kscience/kmath/nd/Strides;
+public final class space/kscience/kmath/nd/ColumnStrides$Companion {
 }
 
-public final class space/kscience/kmath/nd/DoubleBufferND : space/kscience/kmath/nd/BufferND {
+public final class space/kscience/kmath/nd/DoubleBufferND : space/kscience/kmath/nd/MutableBufferND, space/kscience/kmath/nd/MutableStructureNDOfDouble {
 	public synthetic fun <init> (Lspace/kscience/kmath/nd/ShapeIndexer;[DLkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun getBuffer ()Lspace/kscience/kmath/structures/Buffer;
+	public synthetic fun getBuffer ()Lspace/kscience/kmath/structures/MutableBuffer;
 	public fun getBuffer-Dv3HvWU ()[D
+	public fun getDouble ([I)D
+	public fun setDouble ([ID)V
 }
 
 public final class space/kscience/kmath/nd/DoubleFieldND : space/kscience/kmath/nd/DoubleFieldOpsND, space/kscience/kmath/nd/FieldND, space/kscience/kmath/operations/ExtendedField, space/kscience/kmath/operations/NumbersAddOps {
-	public fun <init> ([I)V
+	public synthetic fun <init> ([ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun acosh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun acosh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public synthetic fun asinh (Ljava/lang/Object;)Ljava/lang/Object;
@@ -947,13 +1297,14 @@ public final class space/kscience/kmath/nd/DoubleFieldND : space/kscience/kmath/
 	public fun atanh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public synthetic fun cosh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun cosh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
-	public fun getShape ()[I
+	public fun getShape-IIYLAfE ()[I
 	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
 	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public synthetic fun power (Ljava/lang/Object;I)Ljava/lang/Object;
 	public synthetic fun power (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
 	public fun power (Lspace/kscience/kmath/nd/StructureND;I)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public fun power (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Number;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun power (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Number;)Lspace/kscience/kmath/nd/StructureND;
 	public synthetic fun power-Qn1smSk (Ljava/lang/Object;I)Ljava/lang/Object;
 	public fun power-Qn1smSk (Lspace/kscience/kmath/nd/StructureND;I)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
@@ -965,6 +1316,8 @@ public final class space/kscience/kmath/nd/DoubleFieldND : space/kscience/kmath/
 public final class space/kscience/kmath/nd/DoubleFieldNDKt {
 	public static final fun getNdAlgebra (Lspace/kscience/kmath/operations/DoubleField;)Lspace/kscience/kmath/nd/DoubleFieldOpsND;
 	public static final fun ndAlgebra (Lspace/kscience/kmath/operations/DoubleField;[I)Lspace/kscience/kmath/nd/DoubleFieldND;
+	public static final fun ndAlgebra-waz_sdI (Lspace/kscience/kmath/operations/DoubleField;[I)Lspace/kscience/kmath/nd/DoubleFieldND;
+	public static final fun withNdAlgebra (Lspace/kscience/kmath/operations/DoubleField;[ILkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
 public abstract class space/kscience/kmath/nd/DoubleFieldOpsND : space/kscience/kmath/nd/BufferedFieldOpsND, space/kscience/kmath/operations/ExtendedFieldOps, space/kscience/kmath/operations/ScaleOperations {
@@ -1021,6 +1374,8 @@ public abstract class space/kscience/kmath/nd/DoubleFieldOpsND : space/kscience/
 	public fun plus (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public synthetic fun plus (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Object;)Lspace/kscience/kmath/nd/StructureND;
 	public fun plus (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun power (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
+	public fun power (Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Number;)Lspace/kscience/kmath/nd/StructureND;
 	public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object;
 	public fun scale (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public synthetic fun scale (Lspace/kscience/kmath/nd/StructureND;D)Lspace/kscience/kmath/nd/StructureND;
@@ -1028,9 +1383,9 @@ public abstract class space/kscience/kmath/nd/DoubleFieldOpsND : space/kscience/
 	public fun sin (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun sinh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
-	public synthetic fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
-	public fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/DoubleBufferND;
-	public synthetic fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+	public synthetic fun structureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
+	public fun structureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/DoubleBufferND;
+	public synthetic fun structureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
 	public synthetic fun tan (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun tan (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/DoubleBufferND;
 	public synthetic fun tanh (Ljava/lang/Object;)Ljava/lang/Object;
@@ -1087,7 +1442,41 @@ public abstract interface class space/kscience/kmath/nd/GroupOpsND : space/kscie
 public final class space/kscience/kmath/nd/GroupOpsND$Companion {
 }
 
-public final class space/kscience/kmath/nd/MutableBufferND : space/kscience/kmath/nd/BufferND, space/kscience/kmath/nd/MutableStructureND {
+public final class space/kscience/kmath/nd/IndexOutOfShapeException : java/lang/RuntimeException {
+	public synthetic fun <init> ([I[ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getIndex ()[I
+	public final fun getShape-IIYLAfE ()[I
+}
+
+public final class space/kscience/kmath/nd/IntBufferND : space/kscience/kmath/nd/MutableBufferND {
+	public synthetic fun <init> (Lspace/kscience/kmath/nd/ShapeIndexer;[ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun getBuffer ()Lspace/kscience/kmath/structures/Buffer;
+	public synthetic fun getBuffer ()Lspace/kscience/kmath/structures/MutableBuffer;
+	public fun getBuffer-ir4F4A8 ()[I
+}
+
+public final class space/kscience/kmath/nd/IntRingND : space/kscience/kmath/nd/IntRingOpsND, space/kscience/kmath/nd/RingND, space/kscience/kmath/operations/NumbersAddOps {
+	public synthetic fun <init> ([ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getShape-IIYLAfE ()[I
+	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
+	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/nd/BufferND;
+}
+
+public final class space/kscience/kmath/nd/IntRingNDKt {
+	public static final fun withNdAlgebra (Lspace/kscience/kmath/operations/IntRing;[ILkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+}
+
+public abstract class space/kscience/kmath/nd/IntRingOpsND : space/kscience/kmath/nd/BufferedRingOpsND {
+	public static final field Companion Lspace/kscience/kmath/nd/IntRingOpsND$Companion;
+	public synthetic fun structureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/BufferND;
+	public fun structureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/IntBufferND;
+	public synthetic fun structureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+}
+
+public final class space/kscience/kmath/nd/IntRingOpsND$Companion : space/kscience/kmath/nd/IntRingOpsND {
+}
+
+public class space/kscience/kmath/nd/MutableBufferND : space/kscience/kmath/nd/BufferND, space/kscience/kmath/nd/MutableStructureND {
 	public fun <init> (Lspace/kscience/kmath/nd/ShapeIndexer;Lspace/kscience/kmath/structures/MutableBuffer;)V
 	public synthetic fun getBuffer ()Lspace/kscience/kmath/structures/Buffer;
 	public fun getBuffer ()Lspace/kscience/kmath/structures/MutableBuffer;
@@ -1108,6 +1497,46 @@ public abstract interface class space/kscience/kmath/nd/MutableStructureND : spa
 	public abstract fun set ([ILjava/lang/Object;)V
 }
 
+public abstract interface class space/kscience/kmath/nd/MutableStructureNDOfDouble : space/kscience/kmath/nd/MutableStructureND, space/kscience/kmath/nd/StructureNDOfDouble {
+	public abstract fun setDouble ([ID)V
+}
+
+public final class space/kscience/kmath/nd/OperationsNDKt {
+	public static final fun roll (Lspace/kscience/kmath/nd/StructureND;II)Lspace/kscience/kmath/nd/StructureND;
+	public static final fun roll (Lspace/kscience/kmath/nd/StructureND;Lkotlin/Pair;[Lkotlin/Pair;)Lspace/kscience/kmath/nd/StructureND;
+	public static synthetic fun roll$default (Lspace/kscience/kmath/nd/StructureND;IIILjava/lang/Object;)Lspace/kscience/kmath/nd/StructureND;
+}
+
+public final class space/kscience/kmath/nd/PermutedMutableStructureND : space/kscience/kmath/nd/MutableStructureND {
+	public synthetic fun <init> (Lspace/kscience/kmath/nd/MutableStructureND;[ILkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Lspace/kscience/kmath/nd/MutableStructureND;[ILkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun get ([I)Ljava/lang/Object;
+	public final fun getOrigin ()Lspace/kscience/kmath/nd/MutableStructureND;
+	public final fun getPermutation ()Lkotlin/jvm/functions/Function1;
+	public fun getShape-IIYLAfE ()[I
+	public fun set ([ILjava/lang/Object;)V
+}
+
+public final class space/kscience/kmath/nd/PermutedStructureND : space/kscience/kmath/nd/StructureND {
+	public fun <init> (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function1;)V
+	public fun get ([I)Ljava/lang/Object;
+	public final fun getOrigin ()Lspace/kscience/kmath/nd/StructureND;
+	public final fun getPermutation ()Lkotlin/jvm/functions/Function1;
+	public fun getShape-IIYLAfE ()[I
+}
+
+public final class space/kscience/kmath/nd/PermutedStructureNDKt {
+	public static final fun permute (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/PermutedStructureND;
+	public static final fun permute-_A0By-k (Lspace/kscience/kmath/nd/MutableStructureND;[ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/PermutedMutableStructureND;
+	public static synthetic fun permute-_A0By-k$default (Lspace/kscience/kmath/nd/MutableStructureND;[ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/kmath/nd/PermutedMutableStructureND;
+}
+
+public final class space/kscience/kmath/nd/PrimitiveStructureNDKt {
+	public static final fun getDouble (Lspace/kscience/kmath/nd/MutableStructureND;[I)D
+	public static final fun getDouble (Lspace/kscience/kmath/nd/StructureND;[I)D
+	public static final fun getInt (Lspace/kscience/kmath/nd/StructureND;[I)I
+}
+
 public abstract interface class space/kscience/kmath/nd/RingND : space/kscience/kmath/nd/GroupND, space/kscience/kmath/nd/RingOpsND, space/kscience/kmath/nd/WithShape, space/kscience/kmath/operations/Ring {
 	public synthetic fun getOne ()Ljava/lang/Object;
 	public fun getOne ()Lspace/kscience/kmath/nd/StructureND;
@@ -1124,26 +1553,84 @@ public abstract interface class space/kscience/kmath/nd/RingOpsND : space/kscien
 public final class space/kscience/kmath/nd/RingOpsND$Companion {
 }
 
+public final class space/kscience/kmath/nd/RowStrides : space/kscience/kmath/nd/Strides {
+	public static final field Companion Lspace/kscience/kmath/nd/RowStrides$Companion;
+	public synthetic fun <init> ([ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getLinearSize ()I
+	public fun getShape-IIYLAfE ()[I
+	public fun hashCode ()I
+	public fun index (I)[I
+}
+
+public final class space/kscience/kmath/nd/RowStrides$Companion {
+}
+
 public abstract interface class space/kscience/kmath/nd/ShapeIndexer : java/lang/Iterable, kotlin/jvm/internal/markers/KMappedMarker {
 	public abstract fun asSequence ()Lkotlin/sequences/Sequence;
 	public abstract fun equals (Ljava/lang/Object;)Z
 	public abstract fun getLinearSize ()I
-	public abstract fun getShape ()[I
+	public abstract fun getShape-IIYLAfE ()[I
 	public abstract fun hashCode ()I
 	public abstract fun index (I)[I
 	public fun iterator ()Ljava/util/Iterator;
 	public abstract fun offset ([I)I
 }
 
+public final class space/kscience/kmath/nd/ShapeIndicesKt {
+	public static final fun Strides-dNlrn20 ([I)Lspace/kscience/kmath/nd/Strides;
+}
+
 public final class space/kscience/kmath/nd/ShapeMismatchException : java/lang/RuntimeException {
-	public fun <init> ([I[I)V
-	public final fun getActual ()[I
-	public final fun getExpected ()[I
+	public synthetic fun <init> ([I[ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getActual-IIYLAfE ()[I
+	public final fun getExpected-IIYLAfE ()[I
+}
+
+public final class space/kscience/kmath/nd/ShapeND {
+	public static final synthetic fun box-impl ([I)Lspace/kscience/kmath/nd/ShapeND;
+	public static fun constructor-impl ([I)[I
+	public fun equals (Ljava/lang/Object;)Z
+	public static fun equals-impl ([ILjava/lang/Object;)Z
+	public static final fun equals-impl0 ([I[I)Z
+	public static final fun get-impl ([II)I
+	public static final fun getSize-impl ([I)I
+	public fun hashCode ()I
+	public static fun hashCode-impl ([I)I
+	public fun toString ()Ljava/lang/String;
+	public static fun toString-impl ([I)Ljava/lang/String;
+	public final synthetic fun unbox-impl ()[I
+}
+
+public final class space/kscience/kmath/nd/ShapeNDKt {
+	public static final fun ShapeND (I[I)[I
+	public static final fun asArray-dNlrn20 ([I)[I
+	public static final fun asList-dNlrn20 ([I)Ljava/util/List;
+	public static final fun component1-dNlrn20 ([I)I
+	public static final fun component2-dNlrn20 ([I)I
+	public static final fun component3-dNlrn20 ([I)I
+	public static final fun contentEquals-9Nqdy04 ([I[I)Z
+	public static final fun contentHashCode-dNlrn20 ([I)I
+	public static final fun first-dNlrn20 ([I)I
+	public static final fun first-qL90JFI ([II)[I
+	public static final fun forEach-qL90JFI ([ILkotlin/jvm/functions/Function1;)V
+	public static final fun forEachIndexed-qL90JFI ([ILkotlin/jvm/functions/Function2;)V
+	public static final fun getIndices-dNlrn20 ([I)Lkotlin/ranges/IntRange;
+	public static final fun getLinearSize-dNlrn20 ([I)I
+	public static final fun isEmpty-dNlrn20 ([I)Z
+	public static final fun isNotEmpty-dNlrn20 ([I)Z
+	public static final fun last-dNlrn20 ([I)I
+	public static final fun last-qL90JFI ([II)[I
+	public static final fun plus-9Nqdy04 ([I[I)[I
+	public static final fun plus-qL90JFI ([I[I)[I
+	public static final fun slice-qL90JFI ([ILkotlin/ranges/IntRange;)[I
+	public static final fun toArray-dNlrn20 ([I)[I
+	public static final fun transposed-bYNkpeI ([III)[I
 }
 
 public final class space/kscience/kmath/nd/ShortRingND : space/kscience/kmath/nd/ShortRingOpsND, space/kscience/kmath/nd/RingND, space/kscience/kmath/operations/NumbersAddOps {
-	public fun <init> ([I)V
-	public fun getShape ()[I
+	public synthetic fun <init> ([ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getShape-IIYLAfE ()[I
 	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
 	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/nd/BufferND;
 }
@@ -1162,7 +1649,6 @@ public final class space/kscience/kmath/nd/ShortRingOpsND$Companion : space/ksci
 public abstract class space/kscience/kmath/nd/Strides : space/kscience/kmath/nd/ShapeIndexer {
 	public fun <init> ()V
 	public fun asSequence ()Lkotlin/sequences/Sequence;
-	public abstract fun getStrides ()[I
 	public fun offset ([I)I
 }
 
@@ -1191,7 +1677,7 @@ public abstract interface class space/kscience/kmath/nd/Structure2D : space/ksci
 	public fun getColumns ()Ljava/util/List;
 	public abstract fun getRowNum ()I
 	public fun getRows ()Ljava/util/List;
-	public fun getShape ()[I
+	public fun getShape-IIYLAfE ()[I
 }
 
 public final class space/kscience/kmath/nd/Structure2D$Companion {
@@ -1212,16 +1698,16 @@ public abstract interface class space/kscience/kmath/nd/StructureND : space/ksci
 	public fun getDimension ()I
 	public synthetic fun getFeature (Lkotlin/reflect/KClass;)Ljava/lang/Object;
 	public fun getFeature (Lkotlin/reflect/KClass;)Lspace/kscience/kmath/nd/StructureFeature;
-	public abstract fun getShape ()[I
+	public abstract fun getShape-IIYLAfE ()[I
 }
 
 public final class space/kscience/kmath/nd/StructureND$Companion {
 	public final fun auto (Lkotlin/reflect/KClass;Lspace/kscience/kmath/nd/Strides;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/BufferND;
 	public final fun auto (Lkotlin/reflect/KClass;[ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/BufferND;
-	public final fun buffered (Lspace/kscience/kmath/nd/Strides;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/BufferND;
-	public final fun buffered ([ILkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/BufferND;
-	public static synthetic fun buffered$default (Lspace/kscience/kmath/nd/StructureND$Companion;Lspace/kscience/kmath/nd/Strides;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/kmath/nd/BufferND;
-	public static synthetic fun buffered$default (Lspace/kscience/kmath/nd/StructureND$Companion;[ILkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/kmath/nd/BufferND;
+	public final fun buffered (Lspace/kscience/kmath/nd/Strides;Lspace/kscience/kmath/structures/BufferFactory;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/BufferND;
+	public static synthetic fun buffered$default (Lspace/kscience/kmath/nd/StructureND$Companion;Lspace/kscience/kmath/nd/Strides;Lspace/kscience/kmath/structures/BufferFactory;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/kmath/nd/BufferND;
+	public final fun buffered-bYNkpeI ([ILspace/kscience/kmath/structures/BufferFactory;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/BufferND;
+	public static synthetic fun buffered-bYNkpeI$default (Lspace/kscience/kmath/nd/StructureND$Companion;[ILspace/kscience/kmath/structures/BufferFactory;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/kmath/nd/BufferND;
 	public final fun contentEquals (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Z
 	public final fun contentEquals (Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;D)Z
 	public static synthetic fun contentEquals$default (Lspace/kscience/kmath/nd/StructureND$Companion;Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;DILjava/lang/Object;)Z
@@ -1233,13 +1719,38 @@ public final class space/kscience/kmath/nd/StructureNDKt {
 	public static final fun contentEquals (Lspace/kscience/kmath/linear/LinearSpace;Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Comparable;)Z
 	public static final fun contentEquals (Lspace/kscience/kmath/nd/AlgebraND;Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;)Z
 	public static final fun contentEquals (Lspace/kscience/kmath/nd/GroupOpsND;Lspace/kscience/kmath/nd/StructureND;Lspace/kscience/kmath/nd/StructureND;Ljava/lang/Comparable;)Z
+	public static final fun get (Lspace/kscience/kmath/nd/StructureND;[I)D
+	public static final fun get (Lspace/kscience/kmath/nd/StructureND;[I)I
 	public static final fun get (Lspace/kscience/kmath/nd/StructureND;[I)Ljava/lang/Object;
-	public static final fun mapInPlace (Lspace/kscience/kmath/nd/MutableStructureND;Lkotlin/jvm/functions/Function2;)V
+	public static final fun set (Lspace/kscience/kmath/nd/MutableStructureND;[ILjava/lang/Object;)V
+}
+
+public abstract interface class space/kscience/kmath/nd/StructureNDOfDouble : space/kscience/kmath/nd/StructureND {
+	public abstract fun getDouble ([I)D
+}
+
+public abstract interface class space/kscience/kmath/nd/StructureNDOfInt : space/kscience/kmath/nd/StructureND {
+	public abstract fun getInt ([I)I
+}
+
+public final class space/kscience/kmath/nd/VirtualDoubleStructureND : space/kscience/kmath/nd/VirtualStructureND {
+	public synthetic fun <init> ([ILkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class space/kscience/kmath/nd/VirtualIntStructureND : space/kscience/kmath/nd/VirtualStructureND {
+	public synthetic fun <init> ([ILkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public class space/kscience/kmath/nd/VirtualStructureND : space/kscience/kmath/nd/StructureND {
+	public synthetic fun <init> ([ILkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun get ([I)Ljava/lang/Object;
+	public final fun getProducer ()Lkotlin/jvm/functions/Function1;
+	public fun getShape-IIYLAfE ()[I
 }
 
 public abstract interface class space/kscience/kmath/nd/WithShape {
 	public fun getIndices ()Lspace/kscience/kmath/nd/ShapeIndexer;
-	public abstract fun getShape ()[I
+	public abstract fun getShape-IIYLAfE ()[I
 }
 
 public abstract interface class space/kscience/kmath/operations/Algebra {
@@ -1247,6 +1758,8 @@ public abstract interface class space/kscience/kmath/operations/Algebra {
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
 	public fun bindSymbol (Ljava/lang/String;)Ljava/lang/Object;
 	public fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
+	public fun export (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun getBufferFactory ()Lspace/kscience/kmath/structures/MutableBufferFactory;
 	public fun unaryOperation (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
 }
@@ -1255,12 +1768,15 @@ public final class space/kscience/kmath/operations/AlgebraExtensionsKt {
 	public static final fun abs (Lspace/kscience/kmath/operations/Group;Ljava/lang/Comparable;)Ljava/lang/Comparable;
 	public static final fun average (Lspace/kscience/kmath/operations/Group;Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun average (Lspace/kscience/kmath/operations/Group;Lkotlin/sequences/Sequence;)Ljava/lang/Object;
+	public static final fun average (Lspace/kscience/kmath/operations/Group;Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Object;
 	public static final fun averageWith (Ljava/lang/Iterable;Lspace/kscience/kmath/operations/Group;)Ljava/lang/Object;
 	public static final fun averageWith (Lkotlin/sequences/Sequence;Lspace/kscience/kmath/operations/Group;)Ljava/lang/Object;
 	public static final fun sum (Lspace/kscience/kmath/operations/Group;Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun sum (Lspace/kscience/kmath/operations/Group;Lkotlin/sequences/Sequence;)Ljava/lang/Object;
+	public static final fun sum (Lspace/kscience/kmath/operations/Group;Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Object;
 	public static final fun sumWith (Ljava/lang/Iterable;Lspace/kscience/kmath/operations/Group;)Ljava/lang/Object;
 	public static final fun sumWith (Lkotlin/sequences/Sequence;Lspace/kscience/kmath/operations/Group;)Ljava/lang/Object;
+	public static final fun sumWithGroupOf (Ljava/lang/Iterable;Lspace/kscience/kmath/operations/Group;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
 public final class space/kscience/kmath/operations/AlgebraKt {
@@ -1327,12 +1843,10 @@ public final class space/kscience/kmath/operations/BigIntField : space/kscience/
 
 public final class space/kscience/kmath/operations/BigIntKt {
 	public static final fun abs (Lspace/kscience/kmath/operations/BigInt;)Lspace/kscience/kmath/operations/BigInt;
-	public static final fun bigInt (Lspace/kscience/kmath/structures/Buffer$Companion;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
-	public static final fun bigInt (Lspace/kscience/kmath/structures/MutableBuffer$Companion;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/MutableBuffer;
 	public static final fun buffer (Lspace/kscience/kmath/operations/BigInt$Companion;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun getAlgebra (Lspace/kscience/kmath/operations/BigInt;)Lspace/kscience/kmath/operations/BigIntField;
 	public static final fun getNd (Lspace/kscience/kmath/operations/BigIntField;)Lspace/kscience/kmath/nd/BufferedRingOpsND;
-	public static final fun mutableBuffer (Lspace/kscience/kmath/operations/BigInt;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun mutableBuffer (Lspace/kscience/kmath/operations/BigInt$Companion;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun parseBigInteger (Ljava/lang/String;)Lspace/kscience/kmath/operations/BigInt;
 	public static final fun toBigInt (I)Lspace/kscience/kmath/operations/BigInt;
 	public static final fun toBigInt (J)Lspace/kscience/kmath/operations/BigInt;
@@ -1341,11 +1855,25 @@ public final class space/kscience/kmath/operations/BigIntKt {
 	public static final fun toBigInt-WZ4Q5Ns (I)Lspace/kscience/kmath/operations/BigInt;
 }
 
+public final class space/kscience/kmath/operations/BooleanAlgebra : space/kscience/kmath/operations/LogicAlgebra {
+	public static final field INSTANCE Lspace/kscience/kmath/operations/BooleanAlgebra;
+	public synthetic fun and (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun and (ZZ)Ljava/lang/Boolean;
+	public fun const (Z)Ljava/lang/Boolean;
+	public synthetic fun const (Z)Ljava/lang/Object;
+	public synthetic fun not (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun not (Z)Ljava/lang/Boolean;
+	public synthetic fun or (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun or (ZZ)Ljava/lang/Boolean;
+	public synthetic fun xor (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun xor (ZZ)Ljava/lang/Boolean;
+}
+
 public abstract interface class space/kscience/kmath/operations/BufferAlgebra : space/kscience/kmath/operations/Algebra {
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
 	public fun buffer (I[Ljava/lang/Object;)Lspace/kscience/kmath/structures/Buffer;
-	public abstract fun getBufferFactory ()Lkotlin/jvm/functions/Function2;
 	public abstract fun getElementAlgebra ()Lspace/kscience/kmath/operations/Algebra;
+	public fun getElementBufferFactory ()Lspace/kscience/kmath/structures/BufferFactory;
 	public fun map (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/structures/Buffer;
 	public fun mapIndexed (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/structures/Buffer;
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
@@ -1362,11 +1890,11 @@ public final class space/kscience/kmath/operations/BufferAlgebraKt {
 	public static final fun buffer (Lspace/kscience/kmath/operations/BufferAlgebra;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun buffer (Lspace/kscience/kmath/operations/BufferAlgebra;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun buffer (Lspace/kscience/kmath/operations/BufferField;[Ljava/lang/Number;)Lspace/kscience/kmath/structures/Buffer;
-	public static final fun bufferAlgebra (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/operations/BufferFieldOps;
 	public static final fun cos (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun cosh (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun exp (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
-	public static final fun getBufferAlgebra (Lspace/kscience/kmath/operations/DoubleField;)Lspace/kscience/kmath/operations/BufferFieldOps;
+	public static final fun getBufferAlgebra (Lspace/kscience/kmath/operations/Field;)Lspace/kscience/kmath/operations/BufferFieldOps;
+	public static final fun getBufferAlgebra (Lspace/kscience/kmath/operations/IntRing;)Lspace/kscience/kmath/operations/BufferRingOps;
 	public static final fun getBufferAlgebra (Lspace/kscience/kmath/operations/ShortRing;)Lspace/kscience/kmath/operations/BufferRingOps;
 	public static final fun ln (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun pow (Lspace/kscience/kmath/operations/BufferAlgebra;Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Number;)Lspace/kscience/kmath/structures/Buffer;
@@ -1377,8 +1905,21 @@ public final class space/kscience/kmath/operations/BufferAlgebraKt {
 	public static final fun withSize (Lspace/kscience/kmath/operations/BufferFieldOps;I)Lspace/kscience/kmath/operations/BufferField;
 }
 
+public final class space/kscience/kmath/operations/BufferExtensionsKt {
+	public static final fun asIterable (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Iterable;
+	public static final fun asSequence (Lspace/kscience/kmath/structures/Buffer;)Lkotlin/sequences/Sequence;
+	public static final fun combineToBuffer (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/BufferFactory;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun fold (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+	public static final fun foldIndexed (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)Ljava/lang/Object;
+	public static final fun mapIndexedToBuffer (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/BufferFactory;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun mapToBuffer (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/BufferFactory;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
+	public static final fun reduce (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+	public static final fun toList (Lspace/kscience/kmath/structures/Buffer;)Ljava/util/List;
+	public static final fun toMutableList (Lspace/kscience/kmath/structures/Buffer;)Ljava/util/List;
+}
+
 public final class space/kscience/kmath/operations/BufferField : space/kscience/kmath/operations/BufferFieldOps, space/kscience/kmath/operations/Field, space/kscience/kmath/operations/WithSize {
-	public fun <init> (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function2;I)V
+	public fun <init> (Lspace/kscience/kmath/operations/Field;I)V
 	public synthetic fun getOne ()Ljava/lang/Object;
 	public fun getOne ()Lspace/kscience/kmath/structures/Buffer;
 	public fun getSize ()I
@@ -1387,7 +1928,7 @@ public final class space/kscience/kmath/operations/BufferField : space/kscience/
 }
 
 public class space/kscience/kmath/operations/BufferFieldOps : space/kscience/kmath/operations/BufferRingOps, space/kscience/kmath/operations/BufferAlgebra, space/kscience/kmath/operations/FieldOps, space/kscience/kmath/operations/ScaleOperations {
-	public fun <init> (Lspace/kscience/kmath/operations/Field;Lkotlin/jvm/functions/Function2;)V
+	public fun <init> (Lspace/kscience/kmath/operations/Field;)V
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
 	public synthetic fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun divide (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
@@ -1397,20 +1938,11 @@ public class space/kscience/kmath/operations/BufferFieldOps : space/kscience/kma
 	public fun unaryMinus (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
 }
 
-public final class space/kscience/kmath/operations/BufferOperationKt {
-	public static final fun asIterable (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Iterable;
-	public static final fun asSequence (Lspace/kscience/kmath/structures/Buffer;)Lkotlin/sequences/Sequence;
-	public static final fun fold (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-	public static final fun map (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
-	public static final fun toList (Lspace/kscience/kmath/structures/Buffer;)Ljava/util/List;
-}
-
 public class space/kscience/kmath/operations/BufferRingOps : space/kscience/kmath/operations/BufferAlgebra, space/kscience/kmath/operations/RingOps {
-	public fun <init> (Lspace/kscience/kmath/operations/Ring;Lkotlin/jvm/functions/Function2;)V
+	public fun <init> (Lspace/kscience/kmath/operations/Ring;)V
 	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun add (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
-	public fun getBufferFactory ()Lkotlin/jvm/functions/Function2;
 	public synthetic fun getElementAlgebra ()Lspace/kscience/kmath/operations/Algebra;
 	public fun getElementAlgebra ()Lspace/kscience/kmath/operations/Ring;
 	public synthetic fun multiply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -1420,10 +1952,15 @@ public class space/kscience/kmath/operations/BufferRingOps : space/kscience/kmat
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
 }
 
+public abstract interface class space/kscience/kmath/operations/BufferTransform {
+	public abstract fun transform (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+}
+
 public final class space/kscience/kmath/operations/ByteRing : space/kscience/kmath/operations/Norm, space/kscience/kmath/operations/NumericAlgebra, space/kscience/kmath/operations/Ring {
 	public static final field INSTANCE Lspace/kscience/kmath/operations/ByteRing;
 	public fun add (BB)Ljava/lang/Byte;
 	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun getBufferFactory ()Lspace/kscience/kmath/structures/MutableBufferFactory;
 	public fun getOne ()Ljava/lang/Byte;
 	public synthetic fun getOne ()Ljava/lang/Object;
 	public fun getZero ()Ljava/lang/Byte;
@@ -1460,6 +1997,7 @@ public final class space/kscience/kmath/operations/DoubleBufferField : space/ksc
 	public synthetic fun getZero ()Ljava/lang/Object;
 	public fun getZero ()Lspace/kscience/kmath/structures/Buffer;
 	public synthetic fun power (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
+	public synthetic fun power (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Number;)Lspace/kscience/kmath/structures/Buffer;
 	public fun power-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Number;)[D
 	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun sinh-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
@@ -1494,13 +2032,16 @@ public abstract class space/kscience/kmath/operations/DoubleBufferOps : space/ks
 	public fun divide-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
 	public synthetic fun exp (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun exp-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
-	public fun getBufferFactory ()Lkotlin/jvm/functions/Function2;
 	public synthetic fun getElementAlgebra ()Lspace/kscience/kmath/operations/Algebra;
 	public fun getElementAlgebra ()Lspace/kscience/kmath/operations/DoubleField;
+	public synthetic fun getElementBufferFactory ()Lspace/kscience/kmath/structures/BufferFactory;
+	public fun getElementBufferFactory ()Lspace/kscience/kmath/structures/MutableBufferFactory;
 	public synthetic fun ln (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun ln-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
 	public synthetic fun map (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/structures/Buffer;
-	public fun map-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;)[D
+	public final fun map-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;)[D
+	public synthetic fun mapIndexed (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/structures/Buffer;
+	public final fun mapIndexed-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function3;)[D
 	public synthetic fun minus (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun minus-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
 	public synthetic fun multiply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -1509,6 +2050,8 @@ public abstract class space/kscience/kmath/operations/DoubleBufferOps : space/ks
 	public fun norm (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Double;
 	public synthetic fun plus (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun plus-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
+	public synthetic fun power (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
+	public fun power (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Number;)Lspace/kscience/kmath/structures/Buffer;
 	public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object;
 	public fun scale-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;D)[D
 	public synthetic fun sin (Ljava/lang/Object;)Ljava/lang/Object;
@@ -1522,10 +2065,21 @@ public abstract class space/kscience/kmath/operations/DoubleBufferOps : space/ks
 	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun unaryMinus-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+	public synthetic fun zip (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/structures/Buffer;
+	public final fun zip-XquIszc (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function3;)[D
 }
 
 public final class space/kscience/kmath/operations/DoubleBufferOps$Companion : space/kscience/kmath/operations/DoubleBufferOps {
-	public final fun mapInline-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function1;)[D
+}
+
+public final class space/kscience/kmath/operations/DoubleBufferOpsKt {
+	public static final fun average (Lspace/kscience/kmath/operations/DoubleBufferOps;Lspace/kscience/kmath/structures/Buffer;)D
+	public static final fun averageOf (Lspace/kscience/kmath/operations/DoubleBufferOps;Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function1;)D
+	public static final fun covariance (Lspace/kscience/kmath/operations/DoubleBufferOps;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)D
+	public static final fun dispersion (Lspace/kscience/kmath/operations/DoubleBufferOps;Lspace/kscience/kmath/structures/Buffer;)D
+	public static final fun std (Lspace/kscience/kmath/operations/DoubleBufferOps;Lspace/kscience/kmath/structures/Buffer;)D
+	public static final fun sum (Lspace/kscience/kmath/operations/DoubleBufferOps;Lspace/kscience/kmath/structures/Buffer;)D
+	public static final fun sumOf (Lspace/kscience/kmath/operations/DoubleBufferOps;Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function1;)D
 }
 
 public final class space/kscience/kmath/operations/DoubleField : space/kscience/kmath/operations/ExtendedField, space/kscience/kmath/operations/Norm, space/kscience/kmath/operations/ScaleOperations {
@@ -1555,6 +2109,7 @@ public final class space/kscience/kmath/operations/DoubleField : space/kscience/
 	public synthetic fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun exp (D)Ljava/lang/Double;
 	public synthetic fun exp (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun getBufferFactory ()Lspace/kscience/kmath/structures/MutableBufferFactory;
 	public fun getOne ()Ljava/lang/Double;
 	public synthetic fun getOne ()Ljava/lang/Object;
 	public fun getZero ()Ljava/lang/Double;
@@ -1628,7 +2183,7 @@ public final class space/kscience/kmath/operations/ExponentialOperations$Compani
 	public static final field TANH_OPERATION Ljava/lang/String;
 }
 
-public abstract interface class space/kscience/kmath/operations/ExtendedField : space/kscience/kmath/operations/ExtendedFieldOps, space/kscience/kmath/operations/Field, space/kscience/kmath/operations/NumericAlgebra, space/kscience/kmath/operations/PowerOperations {
+public abstract interface class space/kscience/kmath/operations/ExtendedField : space/kscience/kmath/operations/ExtendedFieldOps, space/kscience/kmath/operations/Field, space/kscience/kmath/operations/NumericAlgebra {
 	public fun acosh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun asinh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun atanh (Ljava/lang/Object;)Ljava/lang/Object;
@@ -1639,7 +2194,7 @@ public abstract interface class space/kscience/kmath/operations/ExtendedField :
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
 }
 
-public abstract interface class space/kscience/kmath/operations/ExtendedFieldOps : space/kscience/kmath/operations/ExponentialOperations, space/kscience/kmath/operations/FieldOps, space/kscience/kmath/operations/ScaleOperations, space/kscience/kmath/operations/TrigonometricOperations {
+public abstract interface class space/kscience/kmath/operations/ExtendedFieldOps : space/kscience/kmath/operations/ExponentialOperations, space/kscience/kmath/operations/FieldOps, space/kscience/kmath/operations/PowerOperations, space/kscience/kmath/operations/ScaleOperations, space/kscience/kmath/operations/TrigonometricOperations {
 	public fun tan (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun tanh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
@@ -1693,6 +2248,7 @@ public final class space/kscience/kmath/operations/FloatField : space/kscience/k
 	public synthetic fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun exp (F)Ljava/lang/Float;
 	public synthetic fun exp (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun getBufferFactory ()Lspace/kscience/kmath/structures/MutableBufferFactory;
 	public fun getOne ()Ljava/lang/Float;
 	public synthetic fun getOne ()Ljava/lang/Object;
 	public fun getZero ()Ljava/lang/Float;
@@ -1755,6 +2311,7 @@ public final class space/kscience/kmath/operations/IntRing : space/kscience/kmat
 	public static final field INSTANCE Lspace/kscience/kmath/operations/IntRing;
 	public fun add (II)Ljava/lang/Integer;
 	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun getBufferFactory ()Lspace/kscience/kmath/structures/MutableBufferFactory;
 	public fun getOne ()Ljava/lang/Integer;
 	public synthetic fun getOne ()Ljava/lang/Object;
 	public fun getZero ()Ljava/lang/Integer;
@@ -1833,7 +2390,18 @@ public final class space/kscience/kmath/operations/JBigIntegerField : space/ksci
 	public fun unaryMinus (Ljava/math/BigInteger;)Ljava/math/BigInteger;
 }
 
-public abstract interface annotation class space/kscience/kmath/operations/KMathContext : java/lang/annotation/Annotation {
+public abstract interface class space/kscience/kmath/operations/LogicAlgebra : space/kscience/kmath/operations/Algebra {
+	public static final field Companion Lspace/kscience/kmath/operations/LogicAlgebra$Companion;
+	public abstract fun and (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun binaryOperation (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
+	public fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
+	public abstract fun const (Z)Ljava/lang/Object;
+	public abstract fun not (Ljava/lang/Object;)Ljava/lang/Object;
+	public abstract fun or (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun unaryOperation (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+	public abstract fun xor (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 }
 
 public final class space/kscience/kmath/operations/LogicAlgebra$Companion {
@@ -1845,6 +2413,7 @@ public final class space/kscience/kmath/operations/LongRing : space/kscience/kma
 	public static final field INSTANCE Lspace/kscience/kmath/operations/LongRing;
 	public fun add (JJ)Ljava/lang/Long;
 	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun getBufferFactory ()Lspace/kscience/kmath/structures/MutableBufferFactory;
 	public fun getOne ()Ljava/lang/Long;
 	public synthetic fun getOne ()Ljava/lang/Object;
 	public fun getZero ()Ljava/lang/Long;
@@ -1869,6 +2438,13 @@ public abstract interface class space/kscience/kmath/operations/Norm {
 	public abstract fun norm (Ljava/lang/Object;)Ljava/lang/Object;
 }
 
+public abstract interface class space/kscience/kmath/operations/NumbersAddOps : space/kscience/kmath/operations/NumericAlgebra, space/kscience/kmath/operations/RingOps {
+	public fun minus (Ljava/lang/Number;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun minus (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
+	public fun plus (Ljava/lang/Number;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun plus (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
+}
+
 public final class space/kscience/kmath/operations/NumbersKt {
 	public static final fun getAlgebra (Lkotlin/jvm/internal/ByteCompanionObject;)Lspace/kscience/kmath/operations/ByteRing;
 	public static final fun getAlgebra (Lkotlin/jvm/internal/DoubleCompanionObject;)Lspace/kscience/kmath/operations/DoubleField;
@@ -1938,6 +2514,7 @@ public final class space/kscience/kmath/operations/ShortRing : space/kscience/km
 	public static final field INSTANCE Lspace/kscience/kmath/operations/ShortRing;
 	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun add (SS)Ljava/lang/Short;
+	public fun getBufferFactory ()Lspace/kscience/kmath/structures/MutableBufferFactory;
 	public synthetic fun getOne ()Ljava/lang/Object;
 	public fun getOne ()Ljava/lang/Short;
 	public synthetic fun getZero ()Ljava/lang/Object;
@@ -2001,11 +2578,11 @@ public final class space/kscience/kmath/structures/ArrayBufferKt {
 	public static final fun asBuffer ([Ljava/lang/Object;)Lspace/kscience/kmath/structures/ArrayBuffer;
 }
 
-public abstract interface class space/kscience/kmath/structures/Buffer {
+public abstract interface class space/kscience/kmath/structures/Buffer : space/kscience/kmath/operations/WithSize {
 	public static final field Companion Lspace/kscience/kmath/structures/Buffer$Companion;
 	public abstract fun get (I)Ljava/lang/Object;
 	public abstract fun getSize ()I
-	public abstract fun iterator ()Ljava/util/Iterator;
+	public fun iterator ()Ljava/util/Iterator;
 	public abstract fun toString ()Ljava/lang/String;
 }
 
@@ -2016,14 +2593,100 @@ public final class space/kscience/kmath/structures/Buffer$Companion {
 	public final fun toString (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/String;
 }
 
+public final class space/kscience/kmath/structures/BufferExpanded : space/kscience/kmath/structures/BufferView {
+	public fun <init> (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Object;II)V
+	public synthetic fun <init> (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Object;IIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun get (I)Ljava/lang/Object;
+	public final fun getOffset ()I
+	public fun getOrigin ()Lspace/kscience/kmath/structures/Buffer;
+	public fun getSize ()I
+	public fun originIndex (I)I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract interface class space/kscience/kmath/structures/BufferFactory {
+	public static final field Companion Lspace/kscience/kmath/structures/BufferFactory$Companion;
+	public abstract fun invoke (ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
+}
+
+public final class space/kscience/kmath/structures/BufferFactory$Companion {
+	public final fun boxing ()Lspace/kscience/kmath/structures/BufferFactory;
+}
+
 public final class space/kscience/kmath/structures/BufferKt {
 	public static final fun asReadOnly (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun first (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Object;
+	public static final fun get-Qn1smSk (Lspace/kscience/kmath/structures/Buffer;I)Ljava/lang/Object;
 	public static final fun getIndices (Lspace/kscience/kmath/structures/Buffer;)Lkotlin/ranges/IntRange;
+	public static final fun getOrNull (Lspace/kscience/kmath/structures/Buffer;I)Ljava/lang/Object;
 	public static final fun last (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Object;
 }
 
-public final class space/kscience/kmath/structures/DoubleBuffer : space/kscience/kmath/structures/MutableBuffer {
+public final class space/kscience/kmath/structures/BufferPrimitiveAccessKt {
+	public static final fun getDouble (Lspace/kscience/kmath/structures/Buffer;I)D
+	public static final fun getInt (Lspace/kscience/kmath/structures/Buffer;I)I
+}
+
+public final class space/kscience/kmath/structures/BufferSlice : space/kscience/kmath/structures/BufferView {
+	public fun <init> (Lspace/kscience/kmath/structures/Buffer;II)V
+	public synthetic fun <init> (Lspace/kscience/kmath/structures/Buffer;IIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun get (I)Ljava/lang/Object;
+	public final fun getOffset ()I
+	public fun getOrigin ()Lspace/kscience/kmath/structures/Buffer;
+	public fun getSize ()I
+	public fun iterator ()Ljava/util/Iterator;
+	public fun originIndex (I)I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract interface class space/kscience/kmath/structures/BufferView : space/kscience/kmath/structures/Buffer {
+	public fun get (I)Ljava/lang/Object;
+	public abstract fun getOrigin ()Lspace/kscience/kmath/structures/Buffer;
+	public abstract fun originIndex (I)I
+}
+
+public final class space/kscience/kmath/structures/BufferViewKt {
+	public static final fun expand (Lspace/kscience/kmath/structures/Buffer;Lkotlin/ranges/IntRange;Ljava/lang/Object;)Lspace/kscience/kmath/structures/BufferView;
+	public static final fun permute (Lspace/kscience/kmath/structures/Buffer;[I)Lspace/kscience/kmath/structures/PermutedBuffer;
+	public static final fun permute (Lspace/kscience/kmath/structures/MutableBuffer;[I)Lspace/kscience/kmath/structures/PermutedMutableBuffer;
+	public static final fun slice (Lspace/kscience/kmath/structures/Buffer;Lkotlin/ranges/IntRange;)Lspace/kscience/kmath/structures/BufferView;
+}
+
+public final class space/kscience/kmath/structures/ByteBuffer : space/kscience/kmath/structures/MutableBuffer {
+	public static final synthetic fun box-impl ([B)Lspace/kscience/kmath/structures/ByteBuffer;
+	public static fun constructor-impl ([B)[B
+	public fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
+	public static fun copy-impl ([B)Lspace/kscience/kmath/structures/MutableBuffer;
+	public fun equals (Ljava/lang/Object;)Z
+	public static fun equals-impl ([BLjava/lang/Object;)Z
+	public static final fun equals-impl0 ([B[B)Z
+	public fun get (I)Ljava/lang/Byte;
+	public synthetic fun get (I)Ljava/lang/Object;
+	public static fun get-impl ([BI)Ljava/lang/Byte;
+	public final fun getArray ()[B
+	public fun getSize ()I
+	public static fun getSize-impl ([B)I
+	public fun hashCode ()I
+	public static fun hashCode-impl ([B)I
+	public synthetic fun iterator ()Ljava/util/Iterator;
+	public fun iterator ()Lkotlin/collections/ByteIterator;
+	public static fun iterator-impl ([B)Lkotlin/collections/ByteIterator;
+	public fun set (IB)V
+	public synthetic fun set (ILjava/lang/Object;)V
+	public static fun set-impl ([BIB)V
+	public fun toString ()Ljava/lang/String;
+	public static fun toString-impl ([B)Ljava/lang/String;
+	public final synthetic fun unbox-impl ()[B
+}
+
+public final class space/kscience/kmath/structures/ByteBufferKt {
+	public static final fun ByteBuffer (ILkotlin/jvm/functions/Function1;)[B
+	public static final fun ByteBuffer ([B)[B
+	public static final fun asBuffer ([B)[B
+	public static final fun toByteArray (Lspace/kscience/kmath/structures/Buffer;)[B
+}
+
+public final class space/kscience/kmath/structures/DoubleBuffer : space/kscience/kmath/structures/PrimitiveBuffer {
 	public static final field Companion Lspace/kscience/kmath/structures/DoubleBuffer$Companion;
 	public static final synthetic fun box-impl ([D)Lspace/kscience/kmath/structures/DoubleBuffer;
 	public static fun constructor-impl ([D)[D
@@ -2060,8 +2723,14 @@ public final class space/kscience/kmath/structures/DoubleBufferKt {
 	public static final fun DoubleBuffer (ILkotlin/jvm/functions/Function1;)[D
 	public static final fun DoubleBuffer ([D)[D
 	public static final fun asBuffer ([D)[D
-	public static final fun contentEquals-2c9zdjM ([D[D)Z
 	public static final fun toDoubleArray (Lspace/kscience/kmath/structures/Buffer;)[D
+	public static final fun toDoubleBuffer (Lspace/kscience/kmath/structures/Buffer;)[D
+}
+
+public abstract interface class space/kscience/kmath/structures/DoubleBufferTransform : space/kscience/kmath/operations/BufferTransform {
+	public synthetic fun transform (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
+	public abstract fun transform-7Zdoou4 ([D)[D
+	public fun transform-Udx-57Q (Lspace/kscience/kmath/structures/Buffer;)[D
 }
 
 public abstract interface class space/kscience/kmath/structures/FlaggedBuffer : space/kscience/kmath/structures/Buffer {
@@ -2087,7 +2756,7 @@ public final class space/kscience/kmath/structures/FlaggedDoubleBuffer : space/k
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class space/kscience/kmath/structures/FloatBuffer : space/kscience/kmath/structures/MutableBuffer {
+public final class space/kscience/kmath/structures/FloatBuffer : space/kscience/kmath/structures/PrimitiveBuffer {
 	public static final synthetic fun box-impl ([F)Lspace/kscience/kmath/structures/FloatBuffer;
 	public static fun constructor-impl ([F)[F
 	public fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
@@ -2121,11 +2790,12 @@ public final class space/kscience/kmath/structures/FloatBufferKt {
 	public static final fun toFloatArray (Lspace/kscience/kmath/structures/Buffer;)[F
 }
 
-public final class space/kscience/kmath/structures/IntBuffer : space/kscience/kmath/structures/MutableBuffer {
+public final class space/kscience/kmath/structures/IntBuffer : space/kscience/kmath/structures/PrimitiveBuffer {
 	public static final synthetic fun box-impl ([I)Lspace/kscience/kmath/structures/IntBuffer;
 	public static fun constructor-impl ([I)[I
-	public fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
-	public static fun copy-impl ([I)Lspace/kscience/kmath/structures/MutableBuffer;
+	public synthetic fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
+	public fun copy-ir4F4A8 ()[I
+	public static fun copy-ir4F4A8 ([I)[I
 	public fun equals (Ljava/lang/Object;)Z
 	public static fun equals-impl ([ILjava/lang/Object;)Z
 	public static final fun equals-impl0 ([I[I)Z
@@ -2170,7 +2840,7 @@ public final class space/kscience/kmath/structures/ListBufferKt {
 	public static final fun asMutableBuffer (Ljava/util/List;)Ljava/util/List;
 }
 
-public final class space/kscience/kmath/structures/LongBuffer : space/kscience/kmath/structures/MutableBuffer {
+public final class space/kscience/kmath/structures/LongBuffer : space/kscience/kmath/structures/PrimitiveBuffer {
 	public static final synthetic fun box-impl ([J)Lspace/kscience/kmath/structures/LongBuffer;
 	public static fun constructor-impl ([J)[J
 	public fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
@@ -2236,6 +2906,15 @@ public final class space/kscience/kmath/structures/MutableBuffer$Companion {
 	public final fun short-1yRgbGw (ILkotlin/jvm/functions/Function1;)[S
 }
 
+public abstract interface class space/kscience/kmath/structures/MutableBufferFactory : space/kscience/kmath/structures/BufferFactory {
+	public static final field Companion Lspace/kscience/kmath/structures/MutableBufferFactory$Companion;
+	public abstract fun invoke (ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/MutableBuffer;
+}
+
+public final class space/kscience/kmath/structures/MutableBufferFactory$Companion {
+	public final fun boxing ()Lspace/kscience/kmath/structures/MutableBufferFactory;
+}
+
 public final class space/kscience/kmath/structures/MutableListBuffer : space/kscience/kmath/structures/MutableBuffer {
 	public static final synthetic fun box-impl (Ljava/util/List;)Lspace/kscience/kmath/structures/MutableListBuffer;
 	public static fun constructor-impl (ILkotlin/jvm/functions/Function1;)Ljava/util/List;
@@ -2273,6 +2952,32 @@ public final class space/kscience/kmath/structures/MutableMemoryBuffer$Companion
 	public final fun create (Lspace/kscience/kmath/memory/MemorySpec;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/MutableMemoryBuffer;
 }
 
+public final class space/kscience/kmath/structures/PermutedBuffer : space/kscience/kmath/structures/BufferView {
+	public fun <init> (Lspace/kscience/kmath/structures/Buffer;[I)V
+	public fun get (I)Ljava/lang/Object;
+	public fun getOrigin ()Lspace/kscience/kmath/structures/Buffer;
+	public fun getSize ()I
+	public fun iterator ()Ljava/util/Iterator;
+	public fun originIndex (I)I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class space/kscience/kmath/structures/PermutedMutableBuffer : space/kscience/kmath/structures/BufferView, space/kscience/kmath/structures/MutableBuffer {
+	public fun <init> (Lspace/kscience/kmath/structures/MutableBuffer;[I)V
+	public fun copy ()Lspace/kscience/kmath/structures/MutableBuffer;
+	public fun get (I)Ljava/lang/Object;
+	public synthetic fun getOrigin ()Lspace/kscience/kmath/structures/Buffer;
+	public fun getOrigin ()Lspace/kscience/kmath/structures/MutableBuffer;
+	public fun getSize ()I
+	public fun iterator ()Ljava/util/Iterator;
+	public fun originIndex (I)I
+	public fun set (ILjava/lang/Object;)V
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract interface class space/kscience/kmath/structures/PrimitiveBuffer : space/kscience/kmath/structures/MutableBuffer {
+}
+
 public final class space/kscience/kmath/structures/ReadOnlyBuffer : space/kscience/kmath/structures/Buffer {
 	public static final synthetic fun box-impl (Lspace/kscience/kmath/structures/MutableBuffer;)Lspace/kscience/kmath/structures/ReadOnlyBuffer;
 	public static fun constructor-impl (Lspace/kscience/kmath/structures/MutableBuffer;)Lspace/kscience/kmath/structures/MutableBuffer;
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
index 791d7d16f..353892105 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/structures/bufferPrimitiveAccess.kt
@@ -5,7 +5,6 @@ import space.kscience.kmath.UnstableKMathAPI
 /**
  * Non-boxing access to primitive [Double]
  */
-
 @UnstableKMathAPI
 public fun Buffer<Double>.getDouble(index: Int): Double = if (this is BufferView) {
     val originIndex = originIndex(index)
diff --git a/kmath-memory/api/kmath-memory.api b/kmath-memory/api/kmath-memory.api
index 9c9641461..cebb04af2 100644
--- a/kmath-memory/api/kmath-memory.api
+++ b/kmath-memory/api/kmath-memory.api
@@ -1,3 +1,14 @@
+public abstract interface annotation class space/kscience/kmath/PerformancePitfall : java/lang/annotation/Annotation {
+	public abstract fun message ()Ljava/lang/String;
+}
+
+public abstract interface annotation class space/kscience/kmath/UnsafeKMathAPI : java/lang/annotation/Annotation {
+	public abstract fun message ()Ljava/lang/String;
+}
+
+public abstract interface annotation class space/kscience/kmath/UnstableKMathAPI : java/lang/annotation/Annotation {
+}
+
 public final class space/kscience/kmath/memory/ByteBufferMemory : space/kscience/kmath/memory/Memory {
 	public fun <init> (Ljava/nio/ByteBuffer;II)V
 	public synthetic fun <init> (Ljava/nio/ByteBuffer;IIILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -36,7 +47,8 @@ public final class space/kscience/kmath/memory/MemoryKt {
 	public static final fun write (Lspace/kscience/kmath/memory/Memory;Lkotlin/jvm/functions/Function1;)V
 }
 
-public abstract interface class space/kscience/kmath/memory/MemoryReader {
+public abstract interface class space/kscience/kmath/memory/MemoryReader : java/lang/AutoCloseable {
+	public abstract fun close ()V
 	public abstract fun getMemory ()Lspace/kscience/kmath/memory/Memory;
 	public abstract fun readByte (I)B
 	public abstract fun readDouble (I)D
@@ -44,7 +56,6 @@ public abstract interface class space/kscience/kmath/memory/MemoryReader {
 	public abstract fun readInt (I)I
 	public abstract fun readLong (I)J
 	public abstract fun readShort (I)S
-	public abstract fun release ()V
 }
 
 public abstract interface class space/kscience/kmath/memory/MemorySpec {
@@ -59,9 +70,9 @@ public final class space/kscience/kmath/memory/MemorySpecKt {
 	public static final fun writeArray (Lspace/kscience/kmath/memory/MemoryWriter;Lspace/kscience/kmath/memory/MemorySpec;I[Ljava/lang/Object;)V
 }
 
-public abstract interface class space/kscience/kmath/memory/MemoryWriter {
+public abstract interface class space/kscience/kmath/memory/MemoryWriter : java/lang/AutoCloseable {
+	public abstract fun close ()V
 	public abstract fun getMemory ()Lspace/kscience/kmath/memory/Memory;
-	public abstract fun release ()V
 	public abstract fun writeByte (IB)V
 	public abstract fun writeDouble (ID)V
 	public abstract fun writeFloat (IF)V
diff --git a/kmath-viktor/api/kmath-viktor.api b/kmath-viktor/api/kmath-viktor.api
index 3bb7c3b21..39ae1f84c 100644
--- a/kmath-viktor/api/kmath-viktor.api
+++ b/kmath-viktor/api/kmath-viktor.api
@@ -29,7 +29,7 @@ public class space/kscience/kmath/viktor/ViktorFieldND : space/kscience/kmath/vi
 	public synthetic fun getOne ()Ljava/lang/Object;
 	public synthetic fun getOne ()Lspace/kscience/kmath/nd/StructureND;
 	public fun getOne ()Lspace/kscience/kmath/viktor/ViktorStructureND;
-	public fun getShape ()[I
+	public fun getShape-IIYLAfE ()[I
 	public synthetic fun getZero ()Ljava/lang/Object;
 	public synthetic fun getZero ()Lspace/kscience/kmath/nd/StructureND;
 	public fun getZero ()Lspace/kscience/kmath/viktor/ViktorStructureND;
@@ -85,8 +85,8 @@ public class space/kscience/kmath/viktor/ViktorFieldOpsND : space/kscience/kmath
 	public fun sin (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun sinh (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
-	public synthetic fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
-	public fun structureND ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/viktor/ViktorStructureND;
+	public synthetic fun structureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
+	public fun structureND-qL90JFI ([ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun tan (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun tan (Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/viktor/ViktorStructureND;
 	public synthetic fun times (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
@@ -112,7 +112,7 @@ public final class space/kscience/kmath/viktor/ViktorStructureND : space/kscienc
 	public fun get ([I)Ljava/lang/Double;
 	public synthetic fun get ([I)Ljava/lang/Object;
 	public final fun getF64Buffer ()Lorg/jetbrains/bio/viktor/F64Array;
-	public fun getShape ()[I
+	public fun getShape-IIYLAfE ()[I
 	public fun set ([ID)V
 	public synthetic fun set ([ILjava/lang/Object;)V
 }
-- 
2.34.1


From 8cdbc8dbbe0ece37356f55c385185acac32a6b29 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 9 May 2023 20:12:18 +0300
Subject: [PATCH 711/713] Add opt-ins

---
 kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt  | 3 +++
 .../kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt       | 2 ++
 .../kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt    | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
index c6b241e5c..7c397d5a0 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/ast/utils.kt
@@ -3,8 +3,11 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:OptIn(UnstableKMathAPI::class)
+
 package space.kscience.kmath.ast
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.Expression
 import space.kscience.kmath.expressions.MST
 import space.kscience.kmath.expressions.Symbol
diff --git a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
index 0a85d5f24..132f9f1bd 100644
--- a/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
+++ b/kmath-ast/src/jsTest/kotlin/space/kscience/kmath/wasm/TestWasmSpecific.kt
@@ -5,6 +5,7 @@
 
 package space.kscience.kmath.wasm
 
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.expressions.MstExtendedField
 import space.kscience.kmath.expressions.MstRing
 import space.kscience.kmath.expressions.invoke
@@ -15,6 +16,7 @@ import space.kscience.kmath.operations.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
+@OptIn(UnstableKMathAPI::class)
 internal class TestWasmSpecific {
     @Test
     fun int() {
diff --git a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
index 042777c8a..ccd89f063 100644
--- a/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
+++ b/kmath-kotlingrad/src/test/kotlin/space/kscience/kmath/kotlingrad/AdaptingTests.kt
@@ -6,6 +6,7 @@
 package space.kscience.kmath.kotlingrad
 
 import ai.hypergraph.kotlingrad.api.*
+import space.kscience.kmath.UnstableKMathAPI
 import space.kscience.kmath.asm.compileToExpression
 import space.kscience.kmath.ast.parseMath
 import space.kscience.kmath.expressions.MstNumericAlgebra
@@ -17,6 +18,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import kotlin.test.fail
 
+@OptIn(UnstableKMathAPI::class)
 internal class AdaptingTests {
     @Test
     fun symbol() {
-- 
2.34.1


From debcef4c9afbe7a2a517799750c89d7ed58d5dc6 Mon Sep 17 00:00:00 2001
From: SPC-code <112205870+SPC-code@users.noreply.github.com>
Date: Tue, 9 May 2023 20:34:29 +0300
Subject: [PATCH 712/713] Update README.md

change space shield address
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 03e803180..c61bc946f 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![DOI](https://zenodo.org/badge/129486382.svg)](https://zenodo.org/badge/latestdoi/129486382)
 ![Gradle build](https://github.com/SciProgCentre/kmath/workflows/Gradle%20build/badge.svg)
 [![Maven Central](https://img.shields.io/maven-central/v/space.kscience/kmath-core.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22space.kscience%22)
-[![Space](https://img.shields.io/badge/dynamic/xml?color=orange&label=Space&query=//metadata/versioning/latest&url=https%3A%2F%2Fmaven.pkg.jetbrains.space%2Fmipt-npm%2Fp%2Fsci%2Fmaven%2Fspace%2Fkscience%2Fkmath-core%2Fmaven-metadata.xml)](https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven/space/kscience/)
+[![Space](https://img.shields.io/badge/dynamic/xml?color=orange&label=Space&query=//metadata/versioning/latest&url=https%3A%2F%2Fmaven.pkg.jetbrains.space%2Fmipt-npm%2Fp%2Fsci%2Fmaven%2Fspace%2Fkscience%2Fkmath-core%2Fmaven-metadata.xml)](https://maven.pkg.jetbrains.space/spc/p/sci/maven/space/kscience/)
 
 # KMath
 
@@ -325,4 +325,4 @@ Gradle `6.0+` is required for multiplatform artifacts.
 The project requires a lot of additional work. The most important thing we need is a feedback about what features are
 required the most. Feel free to create feature requests. We are also welcome to code contributions, especially in issues
 marked with
-[waiting for a hero](https://github.com/SciProgCentre/kmath/labels/waiting%20for%20a%20hero) label.
\ No newline at end of file
+[waiting for a hero](https://github.com/SciProgCentre/kmath/labels/waiting%20for%20a%20hero) label.
-- 
2.34.1


From 378180ba09863160074b2296793bd8547c310a88 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 12 May 2023 20:57:55 +0300
Subject: [PATCH 713/713] Pre-release fixes

---
 benchmarks/build.gradle.kts                   |   5 +-
 build.gradle.kts                              |   2 +-
 buildSrc/build.gradle.kts                     |  11 +-
 buildSrc/settings.gradle.kts                  |   1 +
 .../benchmarks/addBenchmarkProperties.kt      |   5 +-
 examples/build.gradle.kts                     |   4 +-
 .../kscience/kmath/expressions/autodiff.kt    |  18 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 kmath-ast/build.gradle.kts                    |   2 +-
 kmath-core/api/kmath-core.api                 | 350 ------------------
 kmath-core/build.gradle.kts                   |  12 +-
 kmath-jafama/build.gradle.kts                 |   6 +-
 kmath-jupyter/build.gradle.kts                |   4 -
 kmath-kotlingrad/build.gradle.kts             |   2 +-
 kmath-memory/build.gradle.kts                 |   3 +-
 kmath-optimization/build.gradle.kts           |   3 -
 kmath-tensors/build.gradle.kts                |   7 -
 test-utils/api/test-utils.api                 |  32 ++
 18 files changed, 65 insertions(+), 404 deletions(-)
 create mode 100644 test-utils/api/test-utils.api

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 3a985cbb4..24471a9e4 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -29,6 +29,9 @@ kotlin {
         all {
             languageSettings {
                 progressiveMode = true
+                optIn("kotlin.contracts.ExperimentalContracts")
+                optIn("kotlin.ExperimentalUnsignedTypes")
+                optIn("space.kscience.kmath.UnstableKMathAPI")
             }
         }
 
@@ -153,7 +156,7 @@ kotlin.sourceSets.all {
     with(languageSettings) {
         optIn("kotlin.contracts.ExperimentalContracts")
         optIn("kotlin.ExperimentalUnsignedTypes")
-        optIn("space.kscience.kmath.misc.UnstableKMathAPI")
+        optIn("space.kscience.kmath.UnstableKMathAPI")
     }
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 40ae9f210..fb2f7d8c7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -75,6 +75,6 @@ ksciencePublish {
     sonatype()
 }
 
-apiValidation.nonPublicMarkers.add("space.kscience.kmath.misc.UnstableKMathAPI")
+apiValidation.nonPublicMarkers.add("space.kscience.kmath.UnstableKMathAPI")
 
 val multikVersion by extra("0.2.0")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index afa36ed1e..734f60091 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -3,8 +3,6 @@ plugins {
     `version-catalog`
 }
 
-java.targetCompatibility = JavaVersion.VERSION_11
-
 repositories {
     mavenLocal()
     maven("https://repo.kotlin.link")
@@ -26,6 +24,11 @@ dependencies {
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.14.+")
 }
 
-kotlin.sourceSets.all {
-    languageSettings.optIn("kotlin.OptIn")
+kotlin{
+    jvmToolchain{
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+    sourceSets.all {
+        languageSettings.optIn("kotlin.OptIn")
+    }
 }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 02111ba37..e6b69b0b3 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -2,6 +2,7 @@
  * Copyright 2018-2021 KMath contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
+rootProject.name = "kmath"
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
diff --git a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
index 61193790b..a3a475885 100644
--- a/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
+++ b/buildSrc/src/main/kotlin/space/kscience/kmath/benchmarks/addBenchmarkProperties.kt
@@ -5,9 +5,9 @@
 
 package space.kscience.kmath.benchmarks
 
-import kotlinx.benchmark.gradle.BenchmarksExtension
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
+import kotlinx.benchmark.gradle.BenchmarksExtension
 import org.gradle.api.Project
 import space.kscience.gradle.KScienceReadmeExtension
 import java.time.LocalDateTime
@@ -16,6 +16,7 @@ import java.time.format.DateTimeFormatter
 import java.time.format.DateTimeFormatterBuilder
 import java.time.format.SignStyle
 import java.time.temporal.ChronoField.*
+import java.util.*
 
 private val ISO_DATE_TIME: DateTimeFormatter = DateTimeFormatterBuilder().run {
     parseCaseInsensitive()
@@ -52,7 +53,7 @@ fun Project.addBenchmarkProperties() {
     rootProject.subprojects.forEach { p ->
         p.extensions.findByType(KScienceReadmeExtension::class.java)?.run {
             benchmarksProject.extensions.findByType(BenchmarksExtension::class.java)?.configurations?.forEach { cfg ->
-                property("benchmark${cfg.name.capitalize()}") {
+                property("benchmark${cfg.name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}") {
                     val launches = benchmarksProject.buildDir.resolve("reports/benchmarks/${cfg.name}")
 
                     val resDirectory = launches.listFiles()?.maxByOrNull {
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 50708eaa9..7f2abc852 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -58,10 +58,10 @@ dependencies {
 kotlin {
     jvmToolchain(11)
     sourceSets.all {
-        with(languageSettings) {
+        languageSettings {
             optIn("kotlin.contracts.ExperimentalContracts")
             optIn("kotlin.ExperimentalUnsignedTypes")
-            optIn("space.kscience.kmath.misc.UnstableKMathAPI")
+            optIn("space.kscience.kmath.UnstableKMathAPI")
         }
     }
 }
diff --git a/examples/src/main/kotlin/space/kscience/kmath/expressions/autodiff.kt b/examples/src/main/kotlin/space/kscience/kmath/expressions/autodiff.kt
index b1e14591a..863d6be7a 100644
--- a/examples/src/main/kotlin/space/kscience/kmath/expressions/autodiff.kt
+++ b/examples/src/main/kotlin/space/kscience/kmath/expressions/autodiff.kt
@@ -26,7 +26,7 @@ fun main() {
     }
 
     // Then we can evaluate it at any point ((-1, -1) in the case):
-    println(someExpression(mapOf(x to -1.0, y to -1.0)))
+    println(someExpression(x to -1.0, y to -1.0))
     // >>> -2.0
 
     // We can also construct its partial derivatives:
@@ -35,23 +35,23 @@ fun main() {
     val dxdxExpression = someExpression.derivative(x, x) // ∂^2/∂x^2. Must be `0`
 
     // We can evaluate them as well
-    println(dxExpression(mapOf(x to 57.0, y to 6.0)))
+    println(dxExpression(x to 57.0, y to 6.0))
     // >>> 7.0
-    println(dyExpression(mapOf(x to -1.0, y to 179.0)))
+    println(dyExpression(x to -1.0, y to 179.0))
     // >>> 0.0
-    println(dxdxExpression(mapOf(x to 239.0, y to 30.0)))
+    println(dxdxExpression(x to 239.0, y to 30.0))
     // >>> 0.0
 
     // You can also provide extra arguments that obviously won't affect the result:
-    println(dxExpression(mapOf(x to 57.0, y to 6.0, z to 42.0)))
+    println(dxExpression(x to 57.0, y to 6.0, z to 42.0))
     // >>> 7.0
-    println(dyExpression(mapOf(x to -1.0, y to 179.0, z to 0.0)))
+    println(dyExpression(x to -1.0, y to 179.0, z to 0.0))
     // >>> 0.0
-    println(dxdxExpression(mapOf(x to 239.0, y to 30.0, z to 100_000.0)))
+    println(dxdxExpression(x to 239.0, y to 30.0, z to 100_000.0))
     // >>> 0.0
 
     // But in case you forgot to specify bound symbol's value, exception is thrown:
-    println( runCatching { someExpression(mapOf(z to 4.0)) } )
+    println( runCatching { someExpression(z to 4.0) } )
     // >>> Failure(java.lang.IllegalStateException: Symbol 'x' is not supported in ...)
 
     // The reason is that the expression is evaluated lazily,
@@ -63,7 +63,7 @@ fun main() {
         x pow 2
     }
     // When you evaluate it via
-    simpleExpression(mapOf(x to 1.0, y to 57.0, z to 179.0))
+    simpleExpression(x to 1.0, y to 57.0, z to 179.0)
     // lambda above has the context of map `{x: 1.0, y: 57.0, z: 179.0}`.
     // When x is bound, you can think of it as substitution `x -> 1.0`.
     // Other values are unused which does not make any problem to us.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 070cb702f..fae08049a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kmath-ast/build.gradle.kts b/kmath-ast/build.gradle.kts
index c60977862..7cdb745f0 100644
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@@ -46,7 +46,7 @@ kotlin {
     sourceSets {
         filter { it.name.contains("test", true) }
             .map(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::languageSettings)
-            .forEach { it.optIn("space.kscience.kmath.misc.UnstableKMathAPI") }
+            .forEach { it.optIn("space.kscience.kmath.UnstableKMathAPI") }
     }
 }
 
diff --git a/kmath-core/api/kmath-core.api b/kmath-core/api/kmath-core.api
index e3c33e8c6..42d8277bd 100644
--- a/kmath-core/api/kmath-core.api
+++ b/kmath-core/api/kmath-core.api
@@ -1,98 +1,22 @@
-public abstract interface class space/kscience/kmath/data/ColumnarData {
-	public abstract fun get (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/structures/Buffer;
-	public abstract fun getSize ()I
-}
-
 public final class space/kscience/kmath/data/ColumnarDataKt {
-	public static final fun asColumnarData (Lspace/kscience/kmath/nd/Structure2D;Ljava/util/Map;)Lspace/kscience/kmath/data/ColumnarData;
-	public static final fun getIndices (Lspace/kscience/kmath/data/ColumnarData;)Lkotlin/ranges/IntRange;
-}
-
-public abstract interface class space/kscience/kmath/data/XYColumnarData : space/kscience/kmath/data/ColumnarData {
-	public static final field Companion Lspace/kscience/kmath/data/XYColumnarData$Companion;
-	public fun get (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/structures/Buffer;
-	public abstract fun getX ()Lspace/kscience/kmath/structures/Buffer;
-	public abstract fun getY ()Lspace/kscience/kmath/structures/Buffer;
 }
 
 public final class space/kscience/kmath/data/XYColumnarData$Companion {
-	public final fun of (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/data/XYColumnarData;
 }
 
 public final class space/kscience/kmath/data/XYColumnarDataKt {
-	public static final fun asXYData (Lspace/kscience/kmath/data/ColumnarData;Lspace/kscience/kmath/expressions/Symbol;Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/data/XYColumnarData;
-	public static final fun asXYData (Lspace/kscience/kmath/nd/Structure2D;II)Lspace/kscience/kmath/data/XYColumnarData;
-	public static synthetic fun asXYData$default (Lspace/kscience/kmath/nd/Structure2D;IIILjava/lang/Object;)Lspace/kscience/kmath/data/XYColumnarData;
-}
-
-public abstract interface class space/kscience/kmath/data/XYErrorColumnarData : space/kscience/kmath/data/XYColumnarData {
-	public static final field Companion Lspace/kscience/kmath/data/XYErrorColumnarData$Companion;
-	public fun get (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/structures/Buffer;
-	public abstract fun getYErr ()Lspace/kscience/kmath/structures/Buffer;
 }
 
 public final class space/kscience/kmath/data/XYErrorColumnarData$Companion {
 	public final fun of (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/data/XYErrorColumnarData;
 }
 
-public abstract interface class space/kscience/kmath/data/XYZColumnarData : space/kscience/kmath/data/XYColumnarData {
-	public fun get (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/structures/Buffer;
-	public abstract fun getZ ()Lspace/kscience/kmath/structures/Buffer;
-}
-
 public abstract interface class space/kscience/kmath/domains/Domain {
 	public abstract fun contains (Lspace/kscience/kmath/structures/Buffer;)Z
 	public abstract fun getDimension ()I
 }
 
-public abstract class space/kscience/kmath/domains/Domain1D : space/kscience/kmath/domains/Domain {
-	public fun <init> (Lkotlin/ranges/ClosedRange;)V
-	public final fun contains (Ljava/lang/Comparable;)Z
-	public fun contains (Lspace/kscience/kmath/structures/Buffer;)Z
-	public fun getDimension ()I
-	public final fun getRange ()Lkotlin/ranges/ClosedRange;
-}
-
 public final class space/kscience/kmath/domains/Domain1DKt {
-	public static final fun getCenter (Lspace/kscience/kmath/domains/Domain1D;)D
-}
-
-public abstract interface class space/kscience/kmath/domains/DoubleDomain : space/kscience/kmath/domains/Domain {
-	public abstract fun getLowerBound (I)D
-	public abstract fun getUpperBound (I)D
-	public abstract fun volume ()D
-}
-
-public final class space/kscience/kmath/domains/DoubleDomain1D : space/kscience/kmath/domains/Domain1D, space/kscience/kmath/domains/DoubleDomain {
-	public fun <init> (Lkotlin/ranges/ClosedFloatingPointRange;)V
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDoubleRange ()Lkotlin/ranges/ClosedFloatingPointRange;
-	public fun getLowerBound (I)D
-	public fun getUpperBound (I)D
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-	public fun volume ()D
-}
-
-public final class space/kscience/kmath/domains/HyperSquareDomain : space/kscience/kmath/domains/DoubleDomain {
-	public fun <init> (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)V
-	public fun contains (Lspace/kscience/kmath/structures/Buffer;)Z
-	public final fun getCenter-Dv3HvWU ()[D
-	public fun getDimension ()I
-	public final fun getLower ()Lspace/kscience/kmath/structures/Buffer;
-	public fun getLowerBound (I)D
-	public final fun getUpper ()Lspace/kscience/kmath/structures/Buffer;
-	public fun getUpperBound (I)D
-	public fun volume ()D
-}
-
-public final class space/kscience/kmath/domains/UnconstrainedDomain : space/kscience/kmath/domains/DoubleDomain {
-	public fun <init> (I)V
-	public fun contains (Lspace/kscience/kmath/structures/Buffer;)Z
-	public fun getDimension ()I
-	public fun getLowerBound (I)D
-	public fun getUpperBound (I)D
-	public fun volume ()D
 }
 
 public abstract interface class space/kscience/kmath/expressions/AutoDiffProcessor {
@@ -104,43 +28,7 @@ public class space/kscience/kmath/expressions/AutoDiffValue {
 	public final fun getValue ()Ljava/lang/Object;
 }
 
-public abstract interface class space/kscience/kmath/expressions/DS {
-	public abstract fun getData ()Lspace/kscience/kmath/structures/Buffer;
-	public abstract fun getDerivativeAlgebra ()Lspace/kscience/kmath/expressions/DSAlgebra;
-}
-
-public abstract class space/kscience/kmath/expressions/DSAlgebra : space/kscience/kmath/expressions/ExpressionAlgebra, space/kscience/kmath/expressions/SymbolIndexer {
-	public fun <init> (Lspace/kscience/kmath/operations/Ring;ILjava/util/Map;)V
-	protected final fun DS (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun bindSymbol (Ljava/lang/String;)Ljava/lang/Object;
-	public fun bindSymbol (Ljava/lang/String;)Lspace/kscience/kmath/expressions/DSAlgebra$DSSymbol;
-	public final fun bindSymbol (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/expressions/DSAlgebra$DSSymbol;
-	public synthetic fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
-	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/DSAlgebra$DSSymbol;
-	public final fun bindSymbolOrNull (Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/expressions/DSAlgebra$DSSymbol;
-	public synthetic fun const (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun const (Ljava/lang/Object;)Lspace/kscience/kmath/expressions/DS;
-	public final fun derivative (Lspace/kscience/kmath/expressions/DS;Ljava/util/List;)Ljava/lang/Object;
-	public final fun derivative (Lspace/kscience/kmath/expressions/DS;[Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
-	public final fun getAlgebra ()Lspace/kscience/kmath/operations/Ring;
-	public final fun getCompiler ()Lspace/kscience/kmath/expressions/DSCompiler;
-	public final fun getOrder ()I
-	public fun getSymbols ()Ljava/util/List;
-	public final fun ofDerivatives ([Ljava/lang/Object;)Lspace/kscience/kmath/expressions/DS;
-	public final fun variable (ILjava/lang/Object;)Lspace/kscience/kmath/expressions/DS;
-}
-
-public final class space/kscience/kmath/expressions/DSAlgebra$DSSymbol : space/kscience/kmath/expressions/DS, space/kscience/kmath/expressions/Symbol {
-	public fun getData ()Lspace/kscience/kmath/structures/Buffer;
-	public fun getDerivativeAlgebra ()Lspace/kscience/kmath/expressions/DSAlgebra;
-	public fun getIdentity ()Ljava/lang/String;
-}
-
 public final class space/kscience/kmath/expressions/DSAlgebraKt {
-	public static final fun derivative (Lspace/kscience/kmath/expressions/DS;Ljava/util/List;)Ljava/lang/Object;
-	public static final fun derivative (Lspace/kscience/kmath/expressions/DS;[Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
-	public static final fun getAutodiff (Lkotlin/jvm/internal/DoubleCompanionObject;)Lspace/kscience/kmath/expressions/DSFieldProcessor;
-	public static final fun getValue (Lspace/kscience/kmath/expressions/DS;)Ljava/lang/Object;
 }
 
 public final class space/kscience/kmath/expressions/DSCompiler {
@@ -153,91 +41,6 @@ public final class space/kscience/kmath/expressions/DSCompiler {
 	public final fun getSizes ()[[I
 }
 
-public final class space/kscience/kmath/expressions/DSField : space/kscience/kmath/expressions/DSRing, space/kscience/kmath/operations/ExtendedField {
-	public fun <init> (Lspace/kscience/kmath/operations/ExtendedField;ILjava/util/Map;)V
-	public synthetic fun acos (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun acos (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun acosh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun acosh (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun asin (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun asin (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun asinh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun asinh (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun atan (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun atan (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun atanh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun atanh (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun cos (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun cos (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun cosh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun cosh (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun divide (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun divide (Lspace/kscience/kmath/expressions/DS;Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun exp (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun exp (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun ln (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun ln (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
-	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun power (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
-	public fun power (Lspace/kscience/kmath/expressions/DS;Ljava/lang/Number;)Lspace/kscience/kmath/expressions/DS;
-	public final fun power (Lspace/kscience/kmath/expressions/DS;Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun sin (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun sin (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun sinh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun sinh (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun sqrt (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun sqrt (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun tan (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun tan (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun tanh (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun tanh (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-}
-
-public final class space/kscience/kmath/expressions/DSFieldExpression : space/kscience/kmath/expressions/DifferentiableExpression {
-	public fun <init> (Lspace/kscience/kmath/operations/ExtendedField;Lkotlin/jvm/functions/Function1;)V
-	public fun derivativeOrNull (Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
-	public final fun getAlgebra ()Lspace/kscience/kmath/operations/ExtendedField;
-	public final fun getFunction ()Lkotlin/jvm/functions/Function1;
-	public fun invoke (Ljava/util/Map;)Ljava/lang/Object;
-}
-
-public final class space/kscience/kmath/expressions/DSFieldProcessor : space/kscience/kmath/expressions/AutoDiffProcessor {
-	public fun <init> (Lspace/kscience/kmath/operations/ExtendedField;)V
-	public fun differentiate (Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/expressions/DifferentiableExpression;
-	public final fun getAlgebra ()Lspace/kscience/kmath/operations/ExtendedField;
-}
-
-public class space/kscience/kmath/expressions/DSRing : space/kscience/kmath/expressions/DSAlgebra, space/kscience/kmath/operations/NumbersAddOps, space/kscience/kmath/operations/NumericAlgebra, space/kscience/kmath/operations/Ring, space/kscience/kmath/operations/ScaleOperations {
-	public fun <init> (Lspace/kscience/kmath/operations/Ring;ILjava/util/Map;)V
-	public synthetic fun add (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun add (Lspace/kscience/kmath/expressions/DS;Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
-	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/DSAlgebra$DSSymbol;
-	public final fun getElementBufferFactory ()Lspace/kscience/kmath/structures/MutableBufferFactory;
-	public synthetic fun getOne ()Ljava/lang/Object;
-	public fun getOne ()Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun getZero ()Ljava/lang/Object;
-	public fun getZero ()Lspace/kscience/kmath/expressions/DS;
-	protected final fun mapData (Lspace/kscience/kmath/expressions/DS;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/expressions/DS;
-	protected final fun mapDataIndexed (Lspace/kscience/kmath/expressions/DS;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun minus (Ljava/lang/Number;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun minus (Ljava/lang/Number;Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun multiply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun multiply (Lspace/kscience/kmath/expressions/DS;Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun number (Ljava/lang/Number;)Ljava/lang/Object;
-	public fun number (Ljava/lang/Number;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun plus (Ljava/lang/Number;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun plus (Ljava/lang/Number;Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun plus (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
-	public fun plus (Lspace/kscience/kmath/expressions/DS;Ljava/lang/Number;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun scale (Ljava/lang/Object;D)Ljava/lang/Object;
-	public fun scale (Lspace/kscience/kmath/expressions/DS;D)Lspace/kscience/kmath/expressions/DS;
-	protected final fun transformDataBuffer (Lspace/kscience/kmath/expressions/DS;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/expressions/DS;
-	public synthetic fun unaryMinus (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun unaryMinus (Lspace/kscience/kmath/expressions/DS;)Lspace/kscience/kmath/expressions/DS;
-}
-
 public final class space/kscience/kmath/expressions/DerivationResult {
 	public fun <init> (Ljava/lang/Object;Ljava/util/Map;Lspace/kscience/kmath/operations/Field;)V
 	public final fun derivative (Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
@@ -246,16 +49,6 @@ public final class space/kscience/kmath/expressions/DerivationResult {
 	public final fun getValue ()Ljava/lang/Object;
 }
 
-public final class space/kscience/kmath/expressions/DerivativeStructureRingExpression : space/kscience/kmath/expressions/DifferentiableExpression {
-	public fun <init> (Lspace/kscience/kmath/operations/Ring;Lspace/kscience/kmath/structures/MutableBufferFactory;Lkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Lspace/kscience/kmath/operations/Ring;Lspace/kscience/kmath/structures/MutableBufferFactory;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun derivativeOrNull (Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
-	public final fun getAlgebra ()Lspace/kscience/kmath/operations/Ring;
-	public final fun getElementBufferFactory ()Lspace/kscience/kmath/structures/MutableBufferFactory;
-	public final fun getFunction ()Lkotlin/jvm/functions/Function1;
-	public fun invoke (Ljava/util/Map;)Ljava/lang/Object;
-}
-
 public final class space/kscience/kmath/expressions/DiffExpressionWithDefault : space/kscience/kmath/expressions/DifferentiableExpression {
 	public fun <init> (Lspace/kscience/kmath/expressions/DifferentiableExpression;Ljava/util/Map;)V
 	public fun derivativeOrNull (Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
@@ -275,14 +68,6 @@ public final class space/kscience/kmath/expressions/DifferentiableExpressionKt {
 	public static final fun derivative (Lspace/kscience/kmath/expressions/SpecialDifferentiableExpression;[Lspace/kscience/kmath/expressions/Symbol;)Lspace/kscience/kmath/expressions/Expression;
 }
 
-public abstract interface class space/kscience/kmath/expressions/DoubleExpression : space/kscience/kmath/expressions/Expression {
-	public static final field Companion Lspace/kscience/kmath/expressions/DoubleExpression$Companion;
-	public abstract fun getIndexer ()Lspace/kscience/kmath/expressions/SymbolIndexer;
-	public fun invoke (Ljava/util/Map;)Ljava/lang/Double;
-	public synthetic fun invoke (Ljava/util/Map;)Ljava/lang/Object;
-	public abstract fun invoke ([D)D
-}
-
 public final class space/kscience/kmath/expressions/DoubleExpression$Companion {
 }
 
@@ -298,13 +83,7 @@ public final class space/kscience/kmath/expressions/ExpressionKt {
 	public static final fun callByString (Lspace/kscience/kmath/expressions/Expression;[Lkotlin/Pair;)Ljava/lang/Object;
 	public static final fun callBySymbol (Lspace/kscience/kmath/expressions/Expression;[Lkotlin/Pair;)Ljava/lang/Object;
 	public static final fun getBinding (Lspace/kscience/kmath/expressions/ExpressionAlgebra;)Lkotlin/properties/ReadOnlyProperty;
-	public static final fun invoke (Lspace/kscience/kmath/expressions/DoubleExpression;)D
-	public static final fun invoke (Lspace/kscience/kmath/expressions/DoubleExpression;[D)D
 	public static final fun invoke (Lspace/kscience/kmath/expressions/Expression;)Ljava/lang/Object;
-	public static final fun invoke (Lspace/kscience/kmath/expressions/IntExpression;)I
-	public static final fun invoke (Lspace/kscience/kmath/expressions/IntExpression;[I)I
-	public static final fun invoke (Lspace/kscience/kmath/expressions/LongExpression;)J
-	public static final fun invoke (Lspace/kscience/kmath/expressions/LongExpression;[J)J
 }
 
 public final class space/kscience/kmath/expressions/ExpressionWithDefault : space/kscience/kmath/expressions/Expression {
@@ -410,25 +189,9 @@ public class space/kscience/kmath/expressions/FunctionalExpressionRing : space/k
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
 }
 
-public abstract interface class space/kscience/kmath/expressions/IntExpression : space/kscience/kmath/expressions/Expression {
-	public static final field Companion Lspace/kscience/kmath/expressions/IntExpression$Companion;
-	public abstract fun getIndexer ()Lspace/kscience/kmath/expressions/SymbolIndexer;
-	public fun invoke (Ljava/util/Map;)Ljava/lang/Integer;
-	public synthetic fun invoke (Ljava/util/Map;)Ljava/lang/Object;
-	public abstract fun invoke ([I)I
-}
-
 public final class space/kscience/kmath/expressions/IntExpression$Companion {
 }
 
-public abstract interface class space/kscience/kmath/expressions/LongExpression : space/kscience/kmath/expressions/Expression {
-	public static final field Companion Lspace/kscience/kmath/expressions/LongExpression$Companion;
-	public abstract fun getIndexer ()Lspace/kscience/kmath/expressions/SymbolIndexer;
-	public fun invoke (Ljava/util/Map;)Ljava/lang/Long;
-	public synthetic fun invoke (Ljava/util/Map;)Ljava/lang/Object;
-	public abstract fun invoke ([J)J
-}
-
 public final class space/kscience/kmath/expressions/LongExpression$Companion {
 }
 
@@ -590,22 +353,6 @@ public final class space/kscience/kmath/expressions/MstGroup : space/kscience/km
 	public fun unaryPlus (Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST$Unary;
 }
 
-public final class space/kscience/kmath/expressions/MstLogicAlgebra : space/kscience/kmath/operations/LogicAlgebra {
-	public static final field INSTANCE Lspace/kscience/kmath/expressions/MstLogicAlgebra;
-	public synthetic fun and (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun and (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST;
-	public synthetic fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
-	public fun bindSymbolOrNull (Ljava/lang/String;)Lspace/kscience/kmath/expressions/MST;
-	public synthetic fun const (Z)Ljava/lang/Object;
-	public fun const (Z)Lspace/kscience/kmath/expressions/Symbol;
-	public synthetic fun not (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun not (Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST;
-	public synthetic fun or (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun or (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST;
-	public synthetic fun xor (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun xor (Lspace/kscience/kmath/expressions/MST;Lspace/kscience/kmath/expressions/MST;)Lspace/kscience/kmath/expressions/MST;
-}
-
 public final class space/kscience/kmath/expressions/MstNumericAlgebra : space/kscience/kmath/operations/NumericAlgebra {
 	public static final field INSTANCE Lspace/kscience/kmath/expressions/MstNumericAlgebra;
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
@@ -778,20 +525,6 @@ public final class space/kscience/kmath/expressions/SimpleAutoDiffKt {
 	public static final fun tanh (Lspace/kscience/kmath/expressions/SimpleAutoDiffField;Lspace/kscience/kmath/expressions/AutoDiffValue;)Lspace/kscience/kmath/expressions/AutoDiffValue;
 }
 
-public final class space/kscience/kmath/expressions/SimpleSymbolIndexer : space/kscience/kmath/expressions/SymbolIndexer {
-	public static final synthetic fun box-impl (Ljava/util/List;)Lspace/kscience/kmath/expressions/SimpleSymbolIndexer;
-	public static fun constructor-impl (Ljava/util/List;)Ljava/util/List;
-	public fun equals (Ljava/lang/Object;)Z
-	public static fun equals-impl (Ljava/util/List;Ljava/lang/Object;)Z
-	public static final fun equals-impl0 (Ljava/util/List;Ljava/util/List;)Z
-	public fun getSymbols ()Ljava/util/List;
-	public fun hashCode ()I
-	public static fun hashCode-impl (Ljava/util/List;)I
-	public fun toString ()Ljava/lang/String;
-	public static fun toString-impl (Ljava/util/List;)Ljava/lang/String;
-	public final synthetic fun unbox-impl ()Ljava/util/List;
-}
-
 public abstract interface class space/kscience/kmath/expressions/SpecialDifferentiableExpression : space/kscience/kmath/expressions/DifferentiableExpression {
 	public abstract fun derivativeOrNull (Ljava/util/List;)Lspace/kscience/kmath/expressions/Expression;
 }
@@ -810,25 +543,7 @@ public final class space/kscience/kmath/expressions/Symbol$Companion {
 	public final fun getZError ()Lspace/kscience/kmath/expressions/Symbol;
 }
 
-public abstract interface class space/kscience/kmath/expressions/SymbolIndexer {
-	public fun get (Ljava/util/List;Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
-	public fun get (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/expressions/Symbol;Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
-	public fun get (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
-	public fun get ([DLspace/kscience/kmath/expressions/Symbol;)D
-	public fun get ([Ljava/lang/Object;Lspace/kscience/kmath/expressions/Symbol;)Ljava/lang/Object;
-	public abstract fun getSymbols ()Ljava/util/List;
-	public fun indexOf (Lspace/kscience/kmath/expressions/Symbol;)I
-	public fun toDoubleArray (Ljava/util/Map;)[D
-	public fun toList (Ljava/util/Map;)Ljava/util/List;
-	public fun toMap (Lspace/kscience/kmath/structures/Buffer;)Ljava/util/Map;
-	public fun toMap ([D)Ljava/util/Map;
-	public fun toPoint (Ljava/util/Map;Lspace/kscience/kmath/structures/BufferFactory;)Lspace/kscience/kmath/structures/Buffer;
-	public fun toPoint-Udx-57Q (Ljava/util/Map;)[D
-}
-
 public final class space/kscience/kmath/expressions/SymbolIndexerKt {
-	public static final fun withSymbols (Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
-	public static final fun withSymbols ([Lspace/kscience/kmath/expressions/Symbol;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
 public final class space/kscience/kmath/expressions/SymbolKt {
@@ -925,7 +640,6 @@ public abstract interface class space/kscience/kmath/linear/LinearSpace {
 	public static final field Companion Lspace/kscience/kmath/linear/LinearSpace$Companion;
 	public abstract fun buildMatrix (IILkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/Structure2D;
 	public abstract fun buildVector (ILkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/structures/Buffer;
-	public fun computeFeature (Lspace/kscience/kmath/nd/Structure2D;Lkotlin/reflect/KClass;)Lspace/kscience/kmath/nd/StructureFeature;
 	public fun dot (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
 	public fun dot (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
 	public abstract fun getElementAlgebra ()Lspace/kscience/kmath/operations/Ring;
@@ -990,11 +704,9 @@ public final class space/kscience/kmath/linear/MatrixBuilder {
 public final class space/kscience/kmath/linear/MatrixBuilderKt {
 	public static final fun column (Lspace/kscience/kmath/linear/LinearSpace;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/Structure2D;
 	public static final fun column (Lspace/kscience/kmath/linear/LinearSpace;[Ljava/lang/Object;)Lspace/kscience/kmath/nd/Structure2D;
-	public static final fun matrix (Lspace/kscience/kmath/linear/LinearSpace;II)Lspace/kscience/kmath/linear/MatrixBuilder;
 	public static final fun row (Lspace/kscience/kmath/linear/LinearSpace;ILkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/nd/Structure2D;
 	public static final fun row (Lspace/kscience/kmath/linear/LinearSpace;[Ljava/lang/Object;)Lspace/kscience/kmath/nd/Structure2D;
 	public static final fun symmetric (Lspace/kscience/kmath/linear/MatrixBuilder;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/Structure2D;
-	public static final fun vector (Lspace/kscience/kmath/linear/LinearSpace;[Ljava/lang/Object;)Lspace/kscience/kmath/structures/Buffer;
 }
 
 public abstract interface class space/kscience/kmath/linear/MatrixFeature : space/kscience/kmath/nd/StructureFeature {
@@ -1023,7 +735,6 @@ public final class space/kscience/kmath/linear/MatrixWrapper : space/kscience/km
 }
 
 public final class space/kscience/kmath/linear/MatrixWrapperKt {
-	public static final fun getOrigin (Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
 	public static final fun one (Lspace/kscience/kmath/linear/LinearSpace;II)Lspace/kscience/kmath/nd/Structure2D;
 	public static final fun plus (Lspace/kscience/kmath/nd/Structure2D;Lspace/kscience/kmath/linear/MatrixFeature;)Lspace/kscience/kmath/linear/MatrixWrapper;
 	public static final fun transpose (Lspace/kscience/kmath/nd/Structure2D;)Lspace/kscience/kmath/nd/Structure2D;
@@ -1163,11 +874,6 @@ public final class space/kscience/kmath/misc/NumbersJVMKt {
 }
 
 public final class space/kscience/kmath/misc/SortingKt {
-	public static final fun indicesSorted (Lspace/kscience/kmath/structures/Buffer;)[I
-	public static final fun indicesSortedBy (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function1;)[I
-	public static final fun indicesSortedByDescending (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function1;)[I
-	public static final fun indicesSortedDescending (Lspace/kscience/kmath/structures/Buffer;)[I
-	public static final fun indicesSortedWith (Lspace/kscience/kmath/structures/Buffer;Ljava/util/Comparator;)[I
 	public static final fun requireSorted (Lspace/kscience/kmath/structures/Buffer;)V
 	public static final fun sorted (Lspace/kscience/kmath/structures/Buffer;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun sortedBy (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
@@ -1178,7 +884,6 @@ public final class space/kscience/kmath/misc/SortingKt {
 public abstract interface class space/kscience/kmath/nd/AlgebraND : space/kscience/kmath/operations/Algebra {
 	public static final field Companion Lspace/kscience/kmath/nd/AlgebraND$Companion;
 	public abstract fun getElementAlgebra ()Lspace/kscience/kmath/operations/Algebra;
-	public fun getFeature (Lspace/kscience/kmath/nd/StructureND;Lkotlin/reflect/KClass;)Lspace/kscience/kmath/nd/StructureFeature;
 	public fun invoke (Lkotlin/jvm/functions/Function1;Lspace/kscience/kmath/nd/StructureND;)Lspace/kscience/kmath/nd/StructureND;
 	public fun map (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/nd/StructureND;
 	public fun mapIndexed (Lspace/kscience/kmath/nd/StructureND;Lkotlin/jvm/functions/Function3;)Lspace/kscience/kmath/nd/StructureND;
@@ -1317,7 +1022,6 @@ public final class space/kscience/kmath/nd/DoubleFieldNDKt {
 	public static final fun getNdAlgebra (Lspace/kscience/kmath/operations/DoubleField;)Lspace/kscience/kmath/nd/DoubleFieldOpsND;
 	public static final fun ndAlgebra (Lspace/kscience/kmath/operations/DoubleField;[I)Lspace/kscience/kmath/nd/DoubleFieldND;
 	public static final fun ndAlgebra-waz_sdI (Lspace/kscience/kmath/operations/DoubleField;[I)Lspace/kscience/kmath/nd/DoubleFieldND;
-	public static final fun withNdAlgebra (Lspace/kscience/kmath/operations/DoubleField;[ILkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
 public abstract class space/kscience/kmath/nd/DoubleFieldOpsND : space/kscience/kmath/nd/BufferedFieldOpsND, space/kscience/kmath/operations/ExtendedFieldOps, space/kscience/kmath/operations/ScaleOperations {
@@ -1733,14 +1437,6 @@ public abstract interface class space/kscience/kmath/nd/StructureNDOfInt : space
 	public abstract fun getInt ([I)I
 }
 
-public final class space/kscience/kmath/nd/VirtualDoubleStructureND : space/kscience/kmath/nd/VirtualStructureND {
-	public synthetic fun <init> ([ILkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
-public final class space/kscience/kmath/nd/VirtualIntStructureND : space/kscience/kmath/nd/VirtualStructureND {
-	public synthetic fun <init> ([ILkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
 public class space/kscience/kmath/nd/VirtualStructureND : space/kscience/kmath/nd/StructureND {
 	public synthetic fun <init> ([ILkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun get ([I)Ljava/lang/Object;
@@ -1758,7 +1454,6 @@ public abstract interface class space/kscience/kmath/operations/Algebra {
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
 	public fun bindSymbol (Ljava/lang/String;)Ljava/lang/Object;
 	public fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
-	public fun export (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun getBufferFactory ()Lspace/kscience/kmath/structures/MutableBufferFactory;
 	public fun unaryOperation (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
@@ -1855,20 +1550,6 @@ public final class space/kscience/kmath/operations/BigIntKt {
 	public static final fun toBigInt-WZ4Q5Ns (I)Lspace/kscience/kmath/operations/BigInt;
 }
 
-public final class space/kscience/kmath/operations/BooleanAlgebra : space/kscience/kmath/operations/LogicAlgebra {
-	public static final field INSTANCE Lspace/kscience/kmath/operations/BooleanAlgebra;
-	public synthetic fun and (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun and (ZZ)Ljava/lang/Boolean;
-	public fun const (Z)Ljava/lang/Boolean;
-	public synthetic fun const (Z)Ljava/lang/Object;
-	public synthetic fun not (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun not (Z)Ljava/lang/Boolean;
-	public synthetic fun or (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun or (ZZ)Ljava/lang/Boolean;
-	public synthetic fun xor (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun xor (ZZ)Ljava/lang/Boolean;
-}
-
 public abstract interface class space/kscience/kmath/operations/BufferAlgebra : space/kscience/kmath/operations/Algebra {
 	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
 	public fun buffer (I[Ljava/lang/Object;)Lspace/kscience/kmath/structures/Buffer;
@@ -1908,14 +1589,12 @@ public final class space/kscience/kmath/operations/BufferAlgebraKt {
 public final class space/kscience/kmath/operations/BufferExtensionsKt {
 	public static final fun asIterable (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Iterable;
 	public static final fun asSequence (Lspace/kscience/kmath/structures/Buffer;)Lkotlin/sequences/Sequence;
-	public static final fun combineToBuffer (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/BufferFactory;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun fold (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 	public static final fun foldIndexed (Lspace/kscience/kmath/structures/Buffer;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)Ljava/lang/Object;
 	public static final fun mapIndexedToBuffer (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/BufferFactory;Lkotlin/jvm/functions/Function2;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun mapToBuffer (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/BufferFactory;Lkotlin/jvm/functions/Function1;)Lspace/kscience/kmath/structures/Buffer;
 	public static final fun reduce (Lspace/kscience/kmath/structures/Buffer;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 	public static final fun toList (Lspace/kscience/kmath/structures/Buffer;)Ljava/util/List;
-	public static final fun toMutableList (Lspace/kscience/kmath/structures/Buffer;)Ljava/util/List;
 }
 
 public final class space/kscience/kmath/operations/BufferField : space/kscience/kmath/operations/BufferFieldOps, space/kscience/kmath/operations/Field, space/kscience/kmath/operations/WithSize {
@@ -2045,7 +1724,6 @@ public abstract class space/kscience/kmath/operations/DoubleBufferOps : space/ks
 	public synthetic fun minus (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun minus-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
 	public synthetic fun multiply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun multiply-CZ9oacQ (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;)[D
 	public synthetic fun norm (Ljava/lang/Object;)Ljava/lang/Object;
 	public fun norm (Lspace/kscience/kmath/structures/Buffer;)Ljava/lang/Double;
 	public synthetic fun plus (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -2390,20 +2068,6 @@ public final class space/kscience/kmath/operations/JBigIntegerField : space/ksci
 	public fun unaryMinus (Ljava/math/BigInteger;)Ljava/math/BigInteger;
 }
 
-public abstract interface class space/kscience/kmath/operations/LogicAlgebra : space/kscience/kmath/operations/Algebra {
-	public static final field Companion Lspace/kscience/kmath/operations/LogicAlgebra$Companion;
-	public abstract fun and (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun binaryOperation (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun binaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function2;
-	public fun bindSymbolOrNull (Ljava/lang/String;)Ljava/lang/Object;
-	public abstract fun const (Z)Ljava/lang/Object;
-	public abstract fun not (Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun or (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun unaryOperation (Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun unaryOperationFunction (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
-	public abstract fun xor (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-}
-
 public final class space/kscience/kmath/operations/LogicAlgebra$Companion {
 	public final fun getFALSE ()Lspace/kscience/kmath/expressions/Symbol;
 	public final fun getTRUE ()Lspace/kscience/kmath/expressions/Symbol;
@@ -2438,13 +2102,6 @@ public abstract interface class space/kscience/kmath/operations/Norm {
 	public abstract fun norm (Ljava/lang/Object;)Ljava/lang/Object;
 }
 
-public abstract interface class space/kscience/kmath/operations/NumbersAddOps : space/kscience/kmath/operations/NumericAlgebra, space/kscience/kmath/operations/RingOps {
-	public fun minus (Ljava/lang/Number;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun minus (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
-	public fun plus (Ljava/lang/Number;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun plus (Ljava/lang/Object;Ljava/lang/Number;)Ljava/lang/Object;
-}
-
 public final class space/kscience/kmath/operations/NumbersKt {
 	public static final fun getAlgebra (Lkotlin/jvm/internal/ByteCompanionObject;)Lspace/kscience/kmath/operations/ByteRing;
 	public static final fun getAlgebra (Lkotlin/jvm/internal/DoubleCompanionObject;)Lspace/kscience/kmath/operations/DoubleField;
@@ -2600,7 +2257,6 @@ public final class space/kscience/kmath/structures/BufferExpanded : space/kscien
 	public final fun getOffset ()I
 	public fun getOrigin ()Lspace/kscience/kmath/structures/Buffer;
 	public fun getSize ()I
-	public fun originIndex (I)I
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -2623,8 +2279,6 @@ public final class space/kscience/kmath/structures/BufferKt {
 }
 
 public final class space/kscience/kmath/structures/BufferPrimitiveAccessKt {
-	public static final fun getDouble (Lspace/kscience/kmath/structures/Buffer;I)D
-	public static final fun getInt (Lspace/kscience/kmath/structures/Buffer;I)I
 }
 
 public final class space/kscience/kmath/structures/BufferSlice : space/kscience/kmath/structures/BufferView {
@@ -2635,14 +2289,12 @@ public final class space/kscience/kmath/structures/BufferSlice : space/kscience/
 	public fun getOrigin ()Lspace/kscience/kmath/structures/Buffer;
 	public fun getSize ()I
 	public fun iterator ()Ljava/util/Iterator;
-	public fun originIndex (I)I
 	public fun toString ()Ljava/lang/String;
 }
 
 public abstract interface class space/kscience/kmath/structures/BufferView : space/kscience/kmath/structures/Buffer {
 	public fun get (I)Ljava/lang/Object;
 	public abstract fun getOrigin ()Lspace/kscience/kmath/structures/Buffer;
-	public abstract fun originIndex (I)I
 }
 
 public final class space/kscience/kmath/structures/BufferViewKt {
@@ -2958,7 +2610,6 @@ public final class space/kscience/kmath/structures/PermutedBuffer : space/kscien
 	public fun getOrigin ()Lspace/kscience/kmath/structures/Buffer;
 	public fun getSize ()I
 	public fun iterator ()Ljava/util/Iterator;
-	public fun originIndex (I)I
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -2970,7 +2621,6 @@ public final class space/kscience/kmath/structures/PermutedMutableBuffer : space
 	public fun getOrigin ()Lspace/kscience/kmath/structures/MutableBuffer;
 	public fun getSize ()I
 	public fun iterator ()Ljava/util/Iterator;
-	public fun originIndex (I)I
 	public fun set (ILjava/lang/Object;)V
 	public fun toString ()Ljava/lang/String;
 }
diff --git a/kmath-core/build.gradle.kts b/kmath-core/build.gradle.kts
index 08411be59..8c622e8b0 100644
--- a/kmath-core/build.gradle.kts
+++ b/kmath-core/build.gradle.kts
@@ -10,9 +10,8 @@ kscience{
         browser {
             testTask {
                 useKarma {
-                    this.webpackConfig.experiments.add("topLevelAwait")
+                    webpackConfig.experiments.add("topLevelAwait")
                     useChromeHeadless()
-                    useConfigDirectory(project.projectDir.resolve("karma.config.d").resolve("wasm"))
                 }
             }
         }
@@ -33,15 +32,6 @@ kscience{
     }
 }
 
-kotlin.sourceSets {
-    filter { it.name.contains("test", true) }
-        .map(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::languageSettings)
-        .forEach {
-            it.optIn("space.kscience.kmath.misc.PerformancePitfall")
-            it.optIn("space.kscience.kmath.misc.UnstableKMathAPI")
-        }
-}
-
 readme {
     description = "Core classes, algebra definitions, basic linear algebra"
     maturity = space.kscience.gradle.Maturity.DEVELOPMENT
diff --git a/kmath-jafama/build.gradle.kts b/kmath-jafama/build.gradle.kts
index da77f469d..5a77a97ed 100644
--- a/kmath-jafama/build.gradle.kts
+++ b/kmath-jafama/build.gradle.kts
@@ -20,8 +20,4 @@ readme {
     feature("jafama-double", "src/main/kotlin/space/kscience/kmath/jafama/") {
         "Double ExtendedField implementations based on Jafama"
     }
-}
-
-kotlin.sourceSets.all {
-    languageSettings.optIn("space.kscience.kmath.misc.UnstableKMathAPI")
-}
+}
\ No newline at end of file
diff --git a/kmath-jupyter/build.gradle.kts b/kmath-jupyter/build.gradle.kts
index a600261b3..a0e217177 100644
--- a/kmath-jupyter/build.gradle.kts
+++ b/kmath-jupyter/build.gradle.kts
@@ -14,10 +14,6 @@ readme {
     maturity = space.kscience.gradle.Maturity.PROTOTYPE
 }
 
-kotlin.sourceSets.all {
-    languageSettings.optIn("space.kscience.kmath.misc.UnstableKMathAPI")
-}
-
 tasks.processJupyterApiResources {
     libraryProducers = listOf("space.kscience.kmath.jupyter.KMathJupyter")
 }
diff --git a/kmath-kotlingrad/build.gradle.kts b/kmath-kotlingrad/build.gradle.kts
index cf4a4bc1d..56e191360 100644
--- a/kmath-kotlingrad/build.gradle.kts
+++ b/kmath-kotlingrad/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 kotlin.sourceSets
     .filter { it.name.contains("test", true) }
     .map(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::languageSettings)
-    .forEach { it.optIn("space.kscience.kmath.misc.UnstableKMathAPI") }
+    .forEach { it.optIn("space.kscience.kmath.UnstableKMathAPI") }
 
 description = "Kotlin∇ integration module"
 
diff --git a/kmath-memory/build.gradle.kts b/kmath-memory/build.gradle.kts
index 4e5370c0f..8c1e63cb7 100644
--- a/kmath-memory/build.gradle.kts
+++ b/kmath-memory/build.gradle.kts
@@ -10,9 +10,8 @@ kscience {
         browser {
             testTask {
                 useKarma {
-                    this.webpackConfig.experiments.add("topLevelAwait")
+                    webpackConfig.experiments.add("topLevelAwait")
                     useChromeHeadless()
-                    useConfigDirectory(project.projectDir.resolve("karma.config.d").resolve("wasm"))
                 }
             }
         }
diff --git a/kmath-optimization/build.gradle.kts b/kmath-optimization/build.gradle.kts
index 0a8e47728..7250d1f72 100644
--- a/kmath-optimization/build.gradle.kts
+++ b/kmath-optimization/build.gradle.kts
@@ -9,9 +9,6 @@ kscience{
 }
 
 kotlin.sourceSets {
-    all {
-        languageSettings.optIn("space.kscience.kmath.misc.UnstableKMathAPI")
-    }
 
     commonMain {
         dependencies {
diff --git a/kmath-tensors/build.gradle.kts b/kmath-tensors/build.gradle.kts
index d27faeeef..79c39bae7 100644
--- a/kmath-tensors/build.gradle.kts
+++ b/kmath-tensors/build.gradle.kts
@@ -14,13 +14,6 @@ kscience{
 }
 
 kotlin.sourceSets {
-    all {
-        languageSettings.optIn("space.kscience.kmath.misc.UnstableKMathAPI")
-    }
-
-    filter { it.name.contains("test", true) }
-        .map(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::languageSettings)
-        .forEach { it.optIn("space.kscience.kmath.misc.PerformancePitfall") }
 
     commonMain {
         dependencies {
diff --git a/test-utils/api/test-utils.api b/test-utils/api/test-utils.api
new file mode 100644
index 000000000..fc812a9a6
--- /dev/null
+++ b/test-utils/api/test-utils.api
@@ -0,0 +1,32 @@
+public final class space/kscience/kmath/testutils/AssertsKt {
+	public static final fun assertBufferEquals (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;D)V
+	public static synthetic fun assertBufferEquals$default (Lspace/kscience/kmath/structures/Buffer;Lspace/kscience/kmath/structures/Buffer;DILjava/lang/Object;)V
+}
+
+public final class space/kscience/kmath/testutils/BufferEqualityKt {
+	public static final fun contentEquals-2c9zdjM ([D[D)Z
+	public static final fun contentEqualsArray ([D[D)Z
+	public static final fun contentEqualsBuffer ([D[D)Z
+}
+
+public final class space/kscience/kmath/testutils/FieldVerifier : space/kscience/kmath/testutils/RingVerifier {
+	public fun <init> (Lspace/kscience/kmath/operations/Field;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Number;)V
+	public fun verify ()V
+}
+
+public class space/kscience/kmath/testutils/RingVerifier : space/kscience/kmath/testutils/SpaceVerifier {
+	public fun <init> (Lspace/kscience/kmath/operations/Ring;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Number;)V
+	public fun verify ()V
+}
+
+public class space/kscience/kmath/testutils/SpaceVerifier : space/kscience/kmath/testutils/AlgebraicVerifier {
+	public fun <init> (Lspace/kscience/kmath/operations/Ring;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Number;)V
+	public final fun getA ()Ljava/lang/Object;
+	public synthetic fun getAlgebra ()Lspace/kscience/kmath/operations/Algebra;
+	public fun getAlgebra ()Lspace/kscience/kmath/operations/Ring;
+	public final fun getB ()Ljava/lang/Object;
+	public final fun getC ()Ljava/lang/Object;
+	public final fun getX ()Ljava/lang/Number;
+	public fun verify ()V
+}
+
-- 
2.34.1